feat: switch to embind instead of idl

Signed-off-by: Gordon Smith <[email protected]>

Author: GordonSmith

packages/base91/src-cpp/CMakeLists.txt

@@ -10,23 +10,13 @@ set(EM_LINK_FLAGS
     "-sEXPORT_NAME='${CMAKE_PROJECT_NAME}'"
     "-sEXPORTED_FUNCTIONS=\"['_malloc']\""
     "-sEXPORTED_RUNTIME_METHODS=\"['UTF8ToString', 'HEAPU8']\""
-    "--post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js"
+    "-lembind"
     "--emit-tsd ${CMAKE_CURRENT_BINARY_DIR}/base91lib.d.ts"
 )
 string(REPLACE ";" " " LINK_FLAGS "${EM_LINK_FLAGS}")
 
-#  Generate Glue from IDL file  ---
-add_custom_command(
-    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/main.idl
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.cpp
-    COMMAND python3 ${CMAKE_BINARY_DIR}/../emsdk/upstream/emscripten/tools/webidl_binder.py ${CMAKE_CURRENT_SOURCE_DIR}/main.idl ${CMAKE_CURRENT_BINARY_DIR}/main_glue
-)
-set_property(SOURCE main.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/main_glue.cpp)
-#  ---  ---  ---
-
 include_directories(
     ${VCPKG_INCLUDE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 add_executable(base91lib

packages/base91/src-cpp/main.cpp

@@ -1,6 +1,9 @@
 #include <string>
+#include <cstdint>
 #include <base91.hpp>
 
+#include <emscripten/bind.h>
+
 const char *const version = "0.6.0";
 
 class CBasE91
@@ -14,17 +17,17 @@ class CBasE91
         reset();
     }
 
-    static void *malloc(size_t __size)
+    uintptr_t malloc(size_t __size)
     {
-        return ::malloc(__size);
+        return reinterpret_cast<uintptr_t>(::malloc(__size));
     }
 
-    static void free(void *__ptr)
+    void free(uintptr_t __ptr)
     {
-        ::free(__ptr);
+        ::free(reinterpret_cast<void *>(__ptr));
     }
 
-    const char *version()
+    std::string version() const
     {
         return ::version;
     }
@@ -34,26 +37,37 @@ class CBasE91
         basE91_init(&m_basE91);
     }
 
-    size_t encode(const void *data, size_t dataLen, void *dataOut)
+    size_t encode(uintptr_t data, size_t dataLen, uintptr_t dataOut)
     {
-        return basE91_encode(&m_basE91, data, dataLen, dataOut);
+        return basE91_encode(&m_basE91, reinterpret_cast<const void *>(data), dataLen, reinterpret_cast<void *>(dataOut));
     }
 
-    size_t encode_end(void *dataOut)
+    size_t encode_end(uintptr_t dataOut)
     {
-        return basE91_encode_end(&m_basE91, dataOut);
+        return basE91_encode_end(&m_basE91, reinterpret_cast<void *>(dataOut));
     }
 
-    size_t decode(const void *data, size_t dataLen, void *dataOut)
+    size_t decode(uintptr_t data, size_t dataLen, uintptr_t dataOut)
     {
-        return basE91_decode(&m_basE91, data, dataLen, dataOut);
+        return basE91_decode(&m_basE91, reinterpret_cast<const void *>(data), dataLen, reinterpret_cast<void *>(dataOut));
     }
 
-    size_t decode_end(void *dataOut)
+    size_t decode_end(uintptr_t dataOut)
     {
-        return basE91_decode_end(&m_basE91, dataOut);
+        return basE91_decode_end(&m_basE91, reinterpret_cast<void *>(dataOut));
     }
 };
 
-//  Include JS Glue  ---
-#include "main_glue.cpp"
+EMSCRIPTEN_BINDINGS(base91lib_bindings)
+{
+    emscripten::class_<CBasE91>("CBasE91")
+        .constructor<>()
+        .function("malloc", &CBasE91::malloc)
+        .function("free", &CBasE91::free)
+        .function("version", &CBasE91::version)
+        .function("reset", &CBasE91::reset)
+        .function("encode", &CBasE91::encode)
+        .function("encode_end", &CBasE91::encode_end)
+        .function("decode", &CBasE91::decode)
+        .function("decode_end", &CBasE91::decode_end);
+}

packages/base91/src-cpp/main.idl

@@ -1 +1,31 @@
-add_subdirectory(expatlib)
+project(expatlib)
+
+find_package(expat CONFIG REQUIRED)
+
+# See:  https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
+string(REPLACE ";" " " CPP_FLAGS "${EM_CPP_FLAGS}")
+
+set(EM_LINK_FLAGS 
+    ${EM_LINK_FLAGS}
+    "-sEXPORT_NAME='${CMAKE_PROJECT_NAME}'"
+    "-sEXPORTED_FUNCTIONS=\"['_malloc']\""
+    "-sEXPORTED_RUNTIME_METHODS=\"[UTF8ToString]\""
+    "-lembind"
+    "--emit-tsd ${CMAKE_CURRENT_BINARY_DIR}/expatlib.d.ts"
+)
+string(REPLACE ";" " " LINK_FLAGS "${EM_LINK_FLAGS}")
+
+include_directories(
+    ${VCPKG_INCLUDE_DIR}
+)
+
+add_executable(expatlib
+    main.cpp
+)
+
+set_target_properties(expatlib PROPERTIES COMPILE_FLAGS "${CPP_FLAGS}")
+set_target_properties(expatlib PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
+
+target_link_libraries(expatlib
+    expat::expat
+)