fix: workaround for race condition with turbomodule in android.

fix(cpp.js): include prebuilt/_/{config.general.name}/_.h in dependency header search paths

Author: bugra9

packages/cpp.js/CHANGELOG.md

@@ -1,5 +1,17 @@
 # cpp.js
 
+## 1.0.4
+
+### Patch Changes
+
+- fix: workaround for race condition with turbomodule in android.
+
+## 1.0.1
+
+### Patch Changes
+
+- fix: include prebuilt/_/{config.general.name}/_.h in dependency header search paths
+
 ## 1.0.0
 
 ### Major Changes

packages/cpp.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cpp.js",
-    "version": "1.0.0",
+    "version": "1.0.4",
     "license": "MIT",
     "homepage": "https://cpp.js.org",
     "repository": "https://github.com/bugra9/cpp.js.git",

packages/cpp.js/src/integration/getCppJsScript.js

@@ -51,9 +51,9 @@ function getReactNativeScript(env, modulePrefix) {
         }
 
         export function initCppJs(config = {}) {
-            return new Promise((resolve, reject) => {
+            return new Promise(async (resolve, reject) => {
                 if (RNJsiLib && RNJsiLib.start) {
-                    RNJsiLib.start();
+                    await RNJsiLib.start();
                     setEnv();
                     const m = Module;
                     ${modulePrefix}

packages/cpp.js/src/integration/getDependFilePath.js

@@ -8,6 +8,7 @@ export default function getDependFilePath(source, platform) {
     const dependPackage = state.config.allDependencies.find((d) => source.startsWith(d.package.name));
     if (dependPackage) {
         const depName = dependPackage.package.name;
+        const configName = dependPackage.general.name;
         const filePath = source.substring(depName.length + 1);
 
         let path;
@@ -19,7 +20,9 @@ export default function getDependFilePath(source, platform) {
             path = `${dependPackage.paths.output}/prebuilt/${platform}`;
         }
 
-        if (fs.existsSync(`${path}/${depName}/${filePath}`)) {
+        if (fs.existsSync(`${path}/${configName}/${filePath}`)) {
+            path = `${path}/${configName}/${filePath}`;
+        } else if (fs.existsSync(`${path}/${depName}/${filePath}`)) {
             path = `${path}/${depName}/${filePath}`;
         } else if (fs.existsSync(`${path}/${filePath}`)) {
             path = `${path}/${filePath}`;

packages/cppjs-core-create-app/CHANGELOG.md

@@ -1,5 +1,21 @@
 # create-cpp.js
 
+## 1.0.2
+
+### Patch Changes
+
+- Updated dependencies
+  - cpp.js@1.0.4
+  - @cpp.js/sample-backend-nodejs-wasm@1.0.1
+  - @cpp.js/sample-cloud-cloudflare-worker@1.0.1
+  - @cpp.js/sample-mobile-reactnative-cli@1.0.1
+  - @cpp.js/sample-mobile-reactnative-expo@1.0.1
+  - @cpp.js/sample-web-react-rspack@1.0.1
+  - @cpp.js/sample-web-react-vite@1.0.1
+  - @cpp.js/sample-web-svelte-vite@1.0.1
+  - @cpp.js/sample-web-vanilla@1.0.1
+  - @cpp.js/sample-web-vue-vite@1.0.1
+
 ## 1.0.1
 
 ### Major Changes

packages/cppjs-core-create-app/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-cpp.js",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Create Cpp.js Applications",
     "homepage": "https://github.com/bugra9/cpp.js/tree/main/packages/cppjs-core-create-app#readme",
     "repository": "https://github.com/bugra9/cpp.js.git",
@@ -21,7 +21,7 @@
         "@cpp.js/sample-backend-nodejs-wasm": "workspace:^",
         "@cpp.js/sample-cloud-cloudflare-worker": "workspace:^",
         "@cpp.js/sample-mobile-reactnative-cli": "workspace:^",
-        "@cpp.js/sample-mobile-reactnative-expo": "1.0.0",
+        "@cpp.js/sample-mobile-reactnative-expo": "1.0.1",
         "fs-extra": "^11.2.0",
         "kleur": "^4.1.5",
         "prompts": "^2.4.2",

packages/cppjs-core-embind-jsi/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @cpp.js/core-embind-jsi
 
+## 1.0.3
+
+### Patch Changes
+
+- fix: workaround for race condition with turbomodule in android.
+
 ## 1.0.0
 
 ### Major Changes

packages/cppjs-core-embind-jsi/cpp/src/emscripten/bind.cpp

@@ -21,6 +21,9 @@
 #include <unordered_map>
 #include <stdlib.h>
 
+#ifdef __ANDROID__
+#include <unistd.h>
+#endif
 
 using namespace emscripten;
 using namespace internal;
@@ -915,6 +918,10 @@ namespace emscripten {
             CppJS::setEnv("CPPJS_DATA_PATH", path, false);
             jsRuntime = &rt;
 
+#ifdef __ANDROID__
+            sleep(2);
+#endif
+
             char* name = "M";
             uint64_t namePtrNumber = reinterpret_cast<uint64_t>(name);
             // uint64_t offset = (namePtrNumber >> 32) << 32;

packages/cppjs-core-embind-jsi/js/embind.js

@@ -4748,7 +4748,6 @@ globalThis.Module['ASSERTIONS'] = true;
 export default globalThis.Module;
 
 function toArray(vector) {
-    console.log('aaaaa', vector);
     const output = [];
     for (let i = 0; i < vector.size(); i += 1) {
         output.push(vector.get(i));

packages/cppjs-core-embind-jsi/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cpp.js/core-embind-jsi",
-    "version": "1.0.0",
+    "version": "1.0.3",
     "description": "The Embind JSI integration tool enables seamless C++ integration with React Native and Expo.",
     "homepage": "https://github.com/bugra9/cpp.js/tree/main/packages/cppjs-core-embind-jsi#readme",
     "repository": "https://github.com/bugra9/cpp.js.git",