cpp.js 1.0.2 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,16 +1,16 @@
 # cpp.js
 
-## 1.0.2
+## 1.0.4
 
 ### Patch Changes
 
-- fix: workaround for race condition with turbomodule in android. In the future, it will be completely resolved by removing support for the old architecture.
+- 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
+- fix: include prebuilt/_/_config.general.name_/_.h in dependency header search paths
 
 ## 1.0.0
 

package/package.json

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

package/src/actions/buildJs.js

@@ -14,6 +14,7 @@ const nodeLibs = {
     buffer: 'export default {};',
     crypto: 'export default {};',
     stream: 'export default {};',
+    ws: 'export default {};',
 };
 
 const options = {
@@ -42,7 +43,8 @@ export default async function buildJS(input, type) {
         env: ${env},
         paths: {
             wasm: '${state.config.general.name}.wasm',
-            data: '${state.config.general.name}.data.txt'
+            data: '${state.config.general.name}.data.txt',
+            worker: '${state.config.general.name}.js',
         }
     }`;
     let file = input;

package/src/actions/buildWasm.js

@@ -1,8 +1,10 @@
 import fs from 'node:fs';
+import replace from 'replace';
 import run from './run.js';
 import getDependLibs from './getDependLibs.js';
 import getData from './getData.js';
 import buildJs from './buildJs.js';
+import triggerExtensions from './extensions.js';
 import state from '../state/index.js';
 
 export default async function buildWasm(type, isProd = false) {
@@ -13,42 +15,99 @@ export default async function buildWasm(type, isProd = false) {
         `${state.config.paths.build}/Bridge-${buildType}/Emscripten-x86_64/lib${state.config.general.name}.a`,
     ];
 
+    const binary = getData('binary', 'Emscripten-x86_64');
+
     if (type === 'browser') {
         console.log('wasm compiling for browser...');
         const t0 = performance.now();
+        const emccFlags = [
+            ...(binary?.emccFlags || []),
+            ...(getData('binary', 'Emscripten-x86_64', 'browser')?.emccFlags || []),
+        ];
+
+        triggerExtensions('buildWasm', 'beforeBuildBrowser', [emccFlags]);
+
+        if (state.config.build.usePthread && !emccFlags.includes('-pthread')) {
+            emccFlags.push('-pthread');
+            emccFlags.push('-sPTHREAD_POOL_SIZE=4');
+        }
+
         const data = Object.entries(getData('data', 'Emscripten-x86_64', 'browser')).map(([key, value]) => ['--preload-file', `${key.replaceAll('@', '@@')}@${value}`]).flat();
         run('emcc', [
             '-lembind', '-Wl,--whole-archive',
+            ...emccFlags,
+            // '-lwebsocket.js', '-sPROXY_POSIX_SOCKETS', '-sWEBSOCKET_DEBUG=1', '-sJSPI', '-g', '-sWASMFS',
+            '-sWASM_BIGINT=1', '-s', 'FORCE_FILESYSTEM=1',
+            '-sEXPORT_NAME=Module2', // '-pthread', '-sPTHREAD_POOL_SIZE=5',
             ...libs, ...(isProd ? ['-O3'] : []),
             '-s', 'WASM=1', '-s', 'MODULARIZE=1', '-s', 'DYNAMIC_EXECUTION=0',
-            '-s', 'RESERVED_FUNCTION_POINTERS=200', '-s', 'DISABLE_EXCEPTION_CATCHING=0', '-s', 'FORCE_FILESYSTEM=1',
-            '-s', 'ALLOW_MEMORY_GROWTH=1',
+            /* '-s', 'RESERVED_FUNCTION_POINTERS=200',*/ // '-s', 'FORCE_FILESYSTEM=1',
+            //            '-s', 'ALLOW_MEMORY_GROWTH=1',
             '-s', 'EXPORTED_RUNTIME_METHODS=["FS", "ENV"]',
+            '-fwasm-exceptions',
             '-o', `${state.config.paths.build}/${state.config.general.name}.js`,
             ...data,
         ]);
         const t1 = performance.now();
         console.log('wasm compiled for browser...', Math.round(t1 - t0));
         console.log('js compiling for browser...');
+        replace({
+            regex: 'var _scriptName = ',
+            replacement: `var _scriptName = 'cpp.worker.js'; //`,
+            paths: [`${state.config.paths.build}/${state.config.general.name}.js`],
+            recursive: false,
+            silent: true,
+        });
+        /* replace({
+            regex: 'val === 10',
+            replacement: 'false',
+            paths: [`${state.config.paths.build}/${state.config.general.name}.js`],
+            recursive: false,
+            silent: true,
+        }); */
         await buildJs(`${state.config.paths.build}/${state.config.general.name}.js`, 'browser');
+        // fs.rmSync(`${state.config.paths.build}/${state.config.general.name}.js`);
+        // fs.copyFileSync(`${state.config.paths.build}/${state.config.general.name}.browser.js`, `${state.config.paths.build}/${state.config.general.name}.js`);
+        // fs.renameSync(`${state.config.paths.build}/${state.config.general.name}.js`, `${state.config.paths.build}/${state.config.general.name}.worker.browser.js`);
         const t2 = performance.now();
         console.log('js compiled for browser...', Math.round(t2 - t1));
     }
 
     if (type === 'node') {
         console.log('wasm compiling for node...');
+        const emccFlags = [
+            ...(binary?.emccFlags || []),
+            ...(getData('binary', 'Emscripten-x86_64', 'node')?.emccFlags || []),
+        ];
+
+        triggerExtensions('buildWasm', 'beforeBuildNodeJS', [emccFlags]);
+
+        if (state.config.build.usePthread && !emccFlags.includes('-pthread')) {
+            emccFlags.push('-pthread');
+            emccFlags.push('-sPTHREAD_POOL_SIZE=4');
+        }
+
         run('emcc', [
             '-lembind', '-Wl,--whole-archive', '-lnodefs.js',
+            ...emccFlags,
+            // '-s', 'FETCH', '-sJSPI', '-sWASM_BIGINT=1', '-pthread', '-sPTHREAD_POOL_SIZE=5',
+            '-sWASM_BIGINT=1', '-s', 'FORCE_FILESYSTEM=1',
             ...libs, ...(isProd ? ['-O3'] : []),
             '-s', 'WASM=1', '-s', 'MODULARIZE=1', '-s', 'DYNAMIC_EXECUTION=0',
-            '-s', 'RESERVED_FUNCTION_POINTERS=200', '-s', 'DISABLE_EXCEPTION_CATCHING=0', '-s', 'FORCE_FILESYSTEM=1', '-s', 'NODERAWFS',
-            '-s', 'ALLOW_MEMORY_GROWTH=1',
+            // '-s', 'RESERVED_FUNCTION_POINTERS=200', '-s', 'DISABLE_EXCEPTION_CATCHING=0', '-s', 'FORCE_FILESYSTEM=1',
+            // '-s', 'ALLOW_MEMORY_GROWTH=1',
+            '-s', 'NODERAWFS',
             '-s', 'EXPORTED_RUNTIME_METHODS=["FS", "ENV", "NODEFS"]',
+            '-fwasm-exceptions',
             '-o', `${state.config.paths.build}/${state.config.general.name}.js`,
         ]);
         console.log('wasm compiled for node...');
         console.log('js compiling for node...');
         await buildJs(`${state.config.paths.build}/${state.config.general.name}.js`, 'node');
+        if (emccFlags.includes('FETCH')) {
+            fs.appendFileSync(`${state.config.paths.build}/${state.config.general.name}.node.js`, 'var XMLHttpRequest = require(\'xhr2\');\n');
+        }
+        // fs.renameSync(`${state.config.paths.build}/${state.config.general.name}.js`, `${state.config.paths.build}/${state.config.general.name}.worker.node.js`);
         console.log('js compiled for node...');
 
         Object.entries(getData('data', 'Emscripten-x86_64', 'node')).forEach(([key, value]) => {

package/src/actions/createLib.js

@@ -1,8 +1,10 @@
 import os from 'node:os';
 import fs from 'node:fs';
 import replace from 'replace';
+import getData from './getData.js';
 import run from './run.js';
 import getCmakeParameters from './getCmakeParameters.js';
+import triggerExtensions from './extensions.js';
 import state from '../state/index.js';
 
 const cpuCount = os.cpus().length - 1;
@@ -26,8 +28,8 @@ export default function createLib(platform, fileType, options = {}) {
     const buildEnv = { params: [] };
     let buildParams;
     const depPaths = state.config.allDependencyPaths[platform];
-    if (state.config.build) {
-        const { getBuildParams, getExtraLibs } = state.config.build;
+    if (state.config.build.withBuildConfig) {
+        const { getBuildParams, getExtraLibs, usePthread } = state.config.build;
         buildEnv.console = true;
         const ext = sharedPlatforms.includes(basePlatform) ? 'so' : 'a';
         buildParams = getBuildParams ? getBuildParams(platform, depPaths, ext, buildPath) : [];
@@ -36,30 +38,49 @@ export default function createLib(platform, fileType, options = {}) {
             buildParams.push(`-DCMAKE_PREFIX_PATH=${libdir}`, `-DCMAKE_FIND_ROOT_PATH=${libdir}`, `-DBUILD_TYPE=${cmakeBuildType}`);
         }
 
-        const cFlags = Object.values(depPaths).map((d) => `-I${d.header}`).join(' ');
-        const ldFlags = Object.values(depPaths).map((d) => `-L${d.libPath}`).join(' ');
+        const cFlags = Object.values(depPaths).filter(d => d.header).map((d) => `-I${d.header}`);
+        const ldFlags = Object.values(depPaths).filter(d => d.libPath).map((d) => `-L${d.libPath}`);
         let dependLibs = '';
         if (state.config.build?.buildType === 'configure') {
-            dependLibs = Object.keys(depPaths).map((d) => `-l${d}`).join(' ');
+            dependLibs = Object.keys(depPaths).filter(d => d).map((d) => `-l${d}`).join(' ');
         }
 
         const extraLibs = getExtraLibs ? getExtraLibs(platform) : [];
 
-        buildEnv.params.push('-e', `CFLAGS=${cFlags}`);
-        buildEnv.params.push('-e', `CPPFLAGS=${cFlags}`);
-        buildEnv.params.push('-e', `LDFLAGS=${ldFlags} ${extraLibs.join(' ')}`);
+        triggerExtensions('createLib', 'setFlagWithBuildConfig', [buildEnv, cFlags, ldFlags]);
+
+        if (usePthread) {
+            cFlags.push('-pthread');
+            ldFlags.push('-pthread');
+        }
+
+        buildEnv.params.push('-e', `CFLAGS=${cFlags.join(' ')}`);
+        buildEnv.params.push('-e', `CXXFLAGS=${cFlags.join(' ')}`);
+        buildEnv.params.push('-e', `LDFLAGS=${ldFlags.join(' ')} ${extraLibs.join(' ')}`);
         // buildEnv.params.push('-e', `LIBS=${dependLibs} ${extraLibs.join(' ')}`);
 
-        state.config.build.env?.forEach((e) => {
+        let configBuildEnv = state.config.build.env;
+        if (configBuildEnv && typeof configBuildEnv === 'function') {
+            configBuildEnv = configBuildEnv(platform);
+        }
+        configBuildEnv?.forEach((e) => {
             buildEnv.params.push('-e', e);
         });
     } else {
         buildParams = getCmakeParameters(platform, options);
+
+        triggerExtensions('createLib', 'setFlagWithoutBuildConfig', [buildEnv]);
+
+        if (state.config.build.usePthread) {
+            buildEnv.params.push('-e', `CFLAGS=-pthread`);
+            buildEnv.params.push('-e', `CXXFLAGS=-pthread`);
+            buildEnv.params.push('-e', `LDFLAGS=-pthread`);
+        }
     }
 
     console.log(`${platform} is compiling...`);
     const t0 = performance.now();
-    const cmakeDir = state.config.build ? `${state.config.paths.build}/source` : state.config.paths.cmakeDir;
+    const cmakeDir = state.config.build.withBuildConfig ? `${state.config.paths.build}/source` : state.config.paths.cmakeDir;
 
     if (state.config.build?.beforeRun) {
         const dataList = state.config.build?.beforeRun(cmakeDir);

package/src/actions/createXCFramework.js

@@ -3,6 +3,10 @@ import upath from 'upath';
 import { execFileSync } from 'node:child_process';
 import state from '../state/index.js';
 
+const iOSDevPath = '/Applications/Xcode.app/Contents/Developer';
+const iosBinPath = `${iOSDevPath}/Toolchains/XcodeDefault.xctoolchain/usr/bin`;
+const iosRanLibBin = `${iosBinPath}/ranlib`;
+
 export default function createXCFramework(overrideConfig = null) {
     if (process.platform !== 'darwin') {
         return;
@@ -26,6 +30,8 @@ export default function createXCFramework(overrideConfig = null) {
 
     libName.forEach((fileName) => {
         if (!fs.existsSync(`${projectPath}/${fileName}.xcframework`)) {
+            execFileSync(iosRanLibBin, [`${relativeOutput}/prebuilt/iOS-iphoneos/lib/lib${fileName}.a`], options);
+            execFileSync(iosRanLibBin, [`${relativeOutput}/prebuilt/iOS-iphonesimulator/lib/lib${fileName}.a`], options);
             const params = [
                 '-create-xcframework',
                 '-library', `${relativeOutput}/prebuilt/iOS-iphoneos/lib/lib${fileName}.a`,

package/src/actions/extensions.js

@@ -0,0 +1,7 @@
+import state from '../state/index.js';
+
+export default function triggerExtensions(fileName, hook, params = []) {
+    state.config.extensions?.forEach(e => {
+        e?.[fileName]?.[hook](state, ...params);
+    });
+}

package/src/actions/getCmakeParameters.js

@@ -1,4 +1,6 @@
+import fs from 'node:fs';
 import state from '../state/index.js';
+import getData from './getData.js';
 
 export default function getCmakeParameters(platform, options = {}) {
     if (!options || typeof options !== 'object' || Array.isArray(options)) {
@@ -35,6 +37,19 @@ export default function getCmakeParameters(platform, options = {}) {
     const buildType = sharedPlatforms.includes(basePlatform) ? 'SHARED' : 'STATIC';
     const otherBuildType = buildType === 'STATIC' ? 'SHARED' : 'STATIC';
 
+    const cmakeCompileOptions = [...new Set(getData('cmake', platform)?.compileOptions || [])];
+
+    const pathsOfCmakeDepends = dependParams.pathsOfCmakeDepends.split(';');
+    const nameOfCmakeDepends = dependParams.nameOfCmakeDepends.split(';');
+    const pathsOfCmakeDependsFilteredByPlatform = [];
+    const nameOfCmakeDependsFilteredByPlatform = nameOfCmakeDepends;
+    pathsOfCmakeDepends.forEach((d, i) => {
+        if (fs.existsSync(`${d}/${platform}`)) {
+            pathsOfCmakeDependsFilteredByPlatform.push(d);
+            // nameOfCmakeDependsFilteredByPlatform.push(nameOfCmakeDepends[i]);
+        }
+    });
+
     params.push(...[
         `-DPROJECT_NAME=${options.name || state.config.general.name}`,
         `-DBASE_DIR=${state.config.paths.project}`,
@@ -43,11 +58,12 @@ export default function getCmakeParameters(platform, options = {}) {
         `-DNATIVE_GLOB=${nativeGlob.join(';')}`,
         `-DHEADER_GLOB=${headerGlob.join(';')}`,
         `-DHEADER_DIR=${headerDirs.join(';')}`,
-        `-DDEPENDS_CMAKE_PATHS=${dependParams.pathsOfCmakeDepends}`,
-        `-DDEPENDS_CMAKE_NAMES=${dependParams.nameOfCmakeDepends}`,
+        `-DDEPENDS_CMAKE_PATHS=${pathsOfCmakeDependsFilteredByPlatform.join(';')}`,
+        `-DDEPENDS_CMAKE_NAMES=${nameOfCmakeDependsFilteredByPlatform.join(';')}`,
         `-DBRIDGE_DIR=${state.config.paths.build}/bridge`,
         `-DBUILD_TYPE=${buildType}`,
         `-DBUILD_${otherBuildType}_LIBS=OFF`,
+        `-DCOMPILE_OPTIONS=${cmakeCompileOptions.join(';')}`,
         // '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache',
         ...(options.buildSource !== false ? ['-DBUILD_SOURCE=TRUE'] : []),
     ]);

package/src/actions/getData.js

@@ -10,7 +10,13 @@ function getRecursiveData(obj, config, dependency, field, platform, subPlatform)
                 const key = `${dependency.paths.project}/dist/prebuilt/${platform}/${dKey}`;
                 obj[key] = value;
             } else {
-                obj[dKey] = value;
+                if (typeof value === 'object' && Array.isArray(value)) {
+                    obj[dKey] = [...(obj[dKey] || []), ...value];
+                } else if (typeof value === 'object') {
+                    obj[dKey] = {...(obj[dKey] || {}), ...value};
+                } else {
+                    obj[dKey] = value;
+                }
             }
         });
     }

package/src/actions/run.js

@@ -7,7 +7,7 @@ import state from '../state/index.js';
 
 const CROSSCOMPILER_ARM64 = 'aarch64-linux-android33';
 const CROSSCOMPILER_x86_64 = 'x86_64-linux-android33';
-const ANDROID_NDK = '/opt/android-sdk/ndk/25.2.9519653';
+const ANDROID_NDK = '/opt/android-sdk/ndk/27.3.13750724';
 const t = `${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin`;
 const t2 = `${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64`;
 
@@ -41,7 +41,7 @@ const androidParamsX86_64 = [
 ];
 
 const IOS_HOST_FLAGS = `-arch arm64 -arch arm64e -isysroot ${iosSdkPath} -fembed-bitcode`;
-const IOS_SIM_HOST_FLAGS = `-arch x86_64 -arch arm64 -arch arm64e -isysroot ${iosSimSdkPath} -fembed-bitcode`;
+const IOS_SIM_HOST_FLAGS = `-arch x86_64 -arch arm64 -isysroot ${iosSimSdkPath} -fembed-bitcode`;
 const IOS_IPHONE_PARAMS = [
     '-e', `CFLAGS="${IOS_HOST_FLAGS}"`,
     '-e', `CXXFLAGS="${IOS_HOST_FLAGS}"`,
@@ -96,7 +96,7 @@ export default function run(program, params = [], platformPrefix = null, platfor
     if (program === null) {
         switch (basePlatform) {
             case 'Emscripten':
-                platformParams = ['-e', 'CXXFLAGS=-fexceptions', '-e', 'CFLAGS=-fexceptions'];
+                platformParams = ['-e', 'CXXFLAGS=-fwasm-exceptions', '-e', 'CFLAGS=-fwasm-exceptions'];
                 if (params[0].includes('configure')) dProgram = 'emconfigure';
                 else if (params[0] === 'make') dProgram = 'emmake';
                 else if (params[0] === 'cmake') dProgram = 'emcmake';
@@ -111,6 +111,7 @@ export default function run(program, params = [], platformPrefix = null, platfor
                         '-DCMAKE_SYSTEM_NAME=Android', '-DCMAKE_SYSTEM_VERSION=33',
                         `-DCMAKE_ANDROID_ARCH_ABI=${arch[0] === 'x86_64' ? 'x86_64' : 'arm64-v8a'}`,
                         `-DCMAKE_ANDROID_NDK=${ANDROID_NDK}`,
+                        `-DANDROID_NDK=${ANDROID_NDK}`,
                     ];
                 }
                 break;
@@ -130,7 +131,7 @@ export default function run(program, params = [], platformPrefix = null, platfor
                             `-DMACOSX_FRAMEWORK_IDENTIFIER=org.js.cpp.${state.config.general.name}`,
                             `-DCMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER=org.js.cpp.${state.config.general.name}`,
                             `-DCMAKE_OSX_SYSROOT='${arch[0] === 'iphoneos' ? iosSdkPath : iosSimSdkPath}'`,
-                            `-DCMAKE_OSX_ARCHITECTURES=${arch[0] === 'iphoneos' ? 'arm64;arm64e' : 'arm64;arm64e;x86_64'}`,
+                            `-DCMAKE_OSX_ARCHITECTURES=${arch[0] === 'iphoneos' ? 'arm64;arm64e' : 'arm64;x86_64'}`,
                             `-DCMAKE_C_FLAGS=${arch[0] === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
                             `-DCMAKE_CXX_FLAGS=${arch[0] === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
                             '-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY=\'iPhone Developer\'',
@@ -145,7 +146,7 @@ export default function run(program, params = [], platformPrefix = null, platfor
                             ...dParams,
                             `-DCMAKE_TOOLCHAIN_FILE='${state.config.paths.cli}/assets/ios.toolchain.cmake'`,
                             `-DPLATFORM=${arch[0] === 'iphoneos' ? 'OS64' : 'SIMULATORARM64'}`,
-                            `-DARCHS=${arch[0] === 'iphoneos' ? 'arm64;arm64e' : 'arm64;arm64e;x86_64'}`,
+                            `-DARCHS=${arch[0] === 'iphoneos' ? 'arm64;arm64e' : 'arm64;x86_64'}`,
                             '-DENABLE_BITCODE=TRUE',
                             '-DBUILD_SHARED_LIBS=OFF',
                             '-DFRAMEWORK=TRUE',
@@ -154,7 +155,7 @@ export default function run(program, params = [], platformPrefix = null, platfor
                             `-DMACOSX_FRAMEWORK_IDENTIFIER=org.js.cpp.${state.config.general.name}`,
                             `-DCMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER=org.js.cpp.${state.config.general.name}`,
                             `-DCMAKE_OSX_SYSROOT='${arch[0] === 'iphoneos' ? iosSdkPath : iosSimSdkPath}'`,
-                            `-DCMAKE_OSX_ARCHITECTURES=${arch[0] === 'iphoneos' ? 'arm64;arm64e' : 'arm64;arm64e;x86_64'}`,
+                            `-DCMAKE_OSX_ARCHITECTURES=${arch[0] === 'iphoneos' ? 'arm64;arm64e' : 'arm64;x86_64'}`,
                             `-DCMAKE_C_FLAGS=${arch[0] === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
                             `-DCMAKE_CXX_FLAGS=${arch[0] === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
                             '-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY=\'iPhone Developer\'',

package/src/assets/CMakeLists.txt

@@ -39,6 +39,10 @@ if(ANDROID)
     set(EXTRA_LINK_LIBRARIES "log")
 endif()
 
+if (NOT ${COMPILE_OPTIONS} STREQUAL "")
+    target_compile_options("${PROJECT_NAME}" PUBLIC "${COMPILE_OPTIONS}")
+endif()
+
 if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "")
     target_link_libraries("${PROJECT_NAME}" "${DEPENDS_CMAKE_NAMES}" "${EXTRA_LINK_LIBRARIES}")
 endif()

package/src/assets/browser.js

@@ -36,6 +36,27 @@ function initCppJs(userConfig = {}) {
 
     const config = mergeDeep(systemConfig, userConfig);
 
+    const locateFile = (fileName) => {
+        let path = fileName;
+        if (config.paths && config.paths.wasm && fileName.endsWith('.wasm')) {
+            path = config.paths.wasm;
+        } else if (config.paths && config.paths.data && (fileName.endsWith('.data.txt') || fileName.endsWith('.data'))) {
+            path = config.paths.data;
+        }
+
+        let prefix = '';
+        if (config.path) {
+            prefix = config.path;
+            if (prefix.slice(-1) !== '/') prefix += '/';
+        }
+
+        let output = prefix + path;
+        if (output.endsWith('.data')) output += '.txt';
+        if (output.substring(0, 4) !== 'http' && output[0] !== '/') output = `/${output}`;
+
+        return output;
+    };
+
     cppJsPromise = new Promise((resolve, reject) => {
         const m = {
             print(text) {
@@ -52,26 +73,8 @@ function initCppJs(userConfig = {}) {
                     console.error(`wasm stderr: ${text}`);
                 }
             },
-            locateFile(fileName) {
-                let path = fileName;
-                if (config.paths && config.paths.wasm && fileName.endsWith('.wasm')) {
-                    path = config.paths.wasm;
-                } else if (config.paths && config.paths.data && (fileName.endsWith('.data.txt') || fileName.endsWith('.data'))) {
-                    path = config.paths.data;
-                }
-
-                let prefix = '';
-                if (config.path) {
-                    prefix = config.path;
-                    if (prefix.slice(-1) !== '/') prefix += '/';
-                }
-
-                let output = prefix + path;
-                if (output.endsWith('.data')) output += '.txt';
-                if (output.substring(0, 4) !== 'http' && output[0] !== '/') output = `/${output}`;
-                return output;
-            },
-
+            mainScriptUrlOrBlob: locateFile(config.paths.worker === 'cpp.js' ? 'cpp.js' : config.paths.worker.replace('.js', '.browser.js')),
+            locateFile,
             preRun: [
                 ({ ENV }) => {
                     if (ENV && config && config.env) {
@@ -83,8 +86,8 @@ function initCppJs(userConfig = {}) {
                 },
             ],
             onRuntimeInitialized() {
-                m.FS.mkdir(VIRTUAL_PATH);
-                m.FS.mkdir(AUTO_MOUNTED_PATH);
+                // m.FS.mkdir(VIRTUAL_PATH);
+                // m.FS.mkdir(AUTO_MOUNTED_PATH);
                 if (config.onRuntimeInitialized) config.onRuntimeInitialized(m);
             },
             generateVirtualPath() {

package/src/assets/dist.cmake

@@ -1,9 +1,3 @@
-cmake_minimum_required(VERSION 3.28)
-set(CMAKE_CXX_STANDARD 11)
-set(PROJECT_NAME "___PROJECT_NAME___")
-set(PROJECT_LIBS "___PROJECT_LIBS___")
-project("${PROJECT_NAME}")
-
 if(ANDROID)
     set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_ANDROID_ARCH_ABI}")
     set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
@@ -22,23 +16,51 @@ else()
     set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
 endif()
 
-set(PROJECT_LIBS_DIR)
-foreach(L IN LISTS PROJECT_LIBS)
-    SET(FOUND_LIB "FOUND_LIB-NOTFOUND")
-    find_library(FOUND_LIB
-        NAMES "${L}"
-        PATHS "${PACKAGE_DIR}"
-        NO_CACHE
-        NO_DEFAULT_PATH
-        NO_CMAKE_FIND_ROOT_PATH
-        REQUIRED
-    )
-    LIST(APPEND PROJECT_LIBS_DIR ${FOUND_LIB})
-endforeach()
+set(MY_LIST "___PROJECT_HOST___")
+LIST(FIND MY_LIST "${PACKAGE_HOST}" PACKAGE_HOST_INDEX)
+if(NOT PACKAGE_HOST_INDEX EQUAL -1)
+    cmake_minimum_required(VERSION 3.28)
+    set(CMAKE_CXX_STANDARD 11)
+    set(PROJECT_NAME "___PROJECT_NAME___")
+    set(PROJECT_LIBS "___PROJECT_LIBS___")
+    project("${PROJECT_NAME}")
 
-add_library("${PROJECT_NAME}" INTERFACE)
-target_link_libraries("${PROJECT_NAME}" INTERFACE "${PROJECT_LIBS_DIR}")
+    if(ANDROID)
+        set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_ANDROID_ARCH_ABI}")
+        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
+    elseif(APPLE)
+        if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
+            set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/../..")
+        else()
+            set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
+            set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
+        endif()
+    elseif(UNIX)
+        set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
+        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
+    else()
+        set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
+        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
+    endif()
+
+    set(PROJECT_LIBS_DIR)
+    foreach(L IN LISTS PROJECT_LIBS)
+        SET(FOUND_LIB "FOUND_LIB-NOTFOUND")
+        find_library(FOUND_LIB
+            NAMES "${L}"
+            PATHS "${PACKAGE_DIR}"
+            NO_CACHE
+            NO_DEFAULT_PATH
+            NO_CMAKE_FIND_ROOT_PATH
+            REQUIRED
+        )
+        LIST(APPEND PROJECT_LIBS_DIR ${FOUND_LIB})
+    endforeach()
 
-if(NOT APPLE)
-target_include_directories("${PROJECT_NAME}" INTERFACE "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/include")
+    add_library("${PROJECT_NAME}" INTERFACE)
+    target_link_libraries("${PROJECT_NAME}" INTERFACE "${PROJECT_LIBS_DIR}")
+
+    if(NOT APPLE)
+    target_include_directories("${PROJECT_NAME}" INTERFACE "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/include")
+    endif()
 endif()

package/src/assets/ios.toolchain.cmake

@@ -74,6 +74,7 @@
 #    WATCHOSCOMBINED = Build for armv7k arm64_32 x86_64 watchOS + watchOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step)
 #    SIMULATOR_WATCHOS = Build for x86_64 for watchOS Simulator.
 #    SIMULATORARM64_WATCHOS = Build for arm64 for watchOS Simulator.
+#    SIMULATOR_WATCHOSCOMBINED = Build for arm64 x86_64 for watchOS Simulator. Combined into FAT STATIC lib (supported on 3.14+ of CMakewith "-G Xcode" argument ONLY)
 #    MAC = Build for x86_64 macOS.
 #    MAC_ARM64 = Build for Apple Silicon macOS.
 #    MAC_UNIVERSAL = Combined build for x86_64 and Apple Silicon on macOS.
@@ -166,7 +167,7 @@ set(ENV{_IOS_TOOLCHAIN_HAS_RUN} true)
 list(APPEND _supported_platforms
         "OS" "OS64" "OS64COMBINED" "SIMULATOR" "SIMULATOR64" "SIMULATORARM64" "SIMULATOR64COMBINED"
         "TVOS" "TVOSCOMBINED" "SIMULATOR_TVOS" "SIMULATORARM64_TVOS"
-        "WATCHOS" "WATCHOSCOMBINED" "SIMULATOR_WATCHOS" "SIMULATORARM64_WATCHOS"
+        "WATCHOS" "WATCHOSCOMBINED" "SIMULATOR_WATCHOS" "SIMULATORARM64_WATCHOS" "SIMULATOR_WATCHOSCOMBINED"
         "MAC" "MAC_ARM64" "MAC_UNIVERSAL"
         "VISIONOS" "SIMULATOR_VISIONOS" "VISIONOSCOMBINED"
         "MAC_CATALYST" "MAC_CATALYST_ARM64" "MAC_CATALYST_UNIVERSAL")
@@ -461,12 +462,12 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
   if(MODERN_CMAKE)
     if(NOT ARCHS)
       if (XCODE_VERSION_INT VERSION_GREATER 10.0)
-        set(ARCHS armv7k arm64_32 i386)
-        set(APPLE_TARGET_TRIPLE_INT arm64_32-i386-apple-watchos${DEPLOYMENT_TARGET})
+        set(ARCHS armv7k arm64_32 x86_64)
+        set(APPLE_TARGET_TRIPLE_INT arm64_32-x86_64-apple-watchos${DEPLOYMENT_TARGET})
         set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "armv7k arm64_32")
-        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386")
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "x86_64")
         set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "armv7k arm64_32")
-        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "x86_64")
       else()
         set(ARCHS armv7k i386)
         set(APPLE_TARGET_TRIPLE_INT arm-i386-apple-watchos${DEPLOYMENT_TARGET})
@@ -484,8 +485,13 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
 elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOS")
   set(SDK_NAME watchsimulator)
   if(NOT ARCHS)
-    set(ARCHS i386)
-    set(APPLE_TARGET_TRIPLE_INT i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
+    if (XCODE_VERSION_INT VERSION_GREATER 10.0)
+      set(ARCHS x86_64)
+      set(APPLE_TARGET_TRIPLE_INT x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator)
+    else()
+      set(ARCHS i386)
+      set(APPLE_TARGET_TRIPLE_INT i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
+    endif()
   else()
     set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
   endif()
@@ -497,6 +503,31 @@ elseif(PLATFORM_INT STREQUAL "SIMULATORARM64_WATCHOS")
   else()
     set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
   endif()
+elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOSCOMBINED")
+  set(SDK_NAME watchsimulator)
+  if(MODERN_CMAKE)
+    if(NOT ARCHS)
+      if (XCODE_VERSION_INT VERSION_GREATER 12.0)
+        set(ARCHS arm64 x86_64)
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "")
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "arm64 x86_64")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "arm64 x86_64")
+        set(APPLE_TARGET_TRIPLE_INT arm64_x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator)
+      else()
+        set(ARCHS arm64 i386)
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "")
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386")
+        set(APPLE_TARGET_TRIPLE_INT arm64_i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
+      endif()
+    else()
+      set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
+    endif()
+  else()
+    message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the SIMULATOR_WATCHOSCOMBINED setting work")
+  endif()
 elseif(PLATFORM_INT STREQUAL "SIMULATOR_VISIONOS")
   set(SDK_NAME xrsimulator)
   if(NOT ARCHS)

package/src/bin.js

@@ -55,7 +55,7 @@ program.parse(process.argv);
 switch (program.args[0]) {
     case 'build': {
         const { platform } = commandBuild.opts();
-        if (state.config.build) {
+        if (state.config.build.withBuildConfig) {
             buildExternal(platform);
         } else {
             build(platform);
@@ -228,7 +228,7 @@ async function buildExternal(platform) {
         return;
     }
 
-    const { getURL, replaceList, copyToSource } = state.config.build;
+    const { getURL, replaceList, copyToSource, copyToDist } = state.config.build;
     const isNewlyCreated = await downloadAndExtractFile(getURL(version), state.config.paths.build);
     const sourcePath = `${state.config.paths.build}/source`;
     if (isNewlyCreated && replaceList) {
@@ -246,6 +246,23 @@ async function buildExternal(platform) {
     }
 
     buildLib(platform);
+
+    if (copyToDist) {
+        Object.entries(copyToDist).forEach(([key, value]) => {
+            const values = [];
+            if (Array.isArray(value)) {
+                values.push(...value);
+            } else {
+                values.push(value);
+            }
+            values.forEach(v => {
+                const targetPath = `${state.config.paths.output}/prebuilt/${v}`;
+                if (!fs.existsSync(targetPath)) {
+                    fs.copyFileSync(`${state.config.paths.project}/${key}`, targetPath);
+                }
+            });
+        });
+    }
 }
 
 async function build(platform) {
@@ -256,6 +273,7 @@ async function build(platform) {
 }
 
 function buildLib(platform) {
+    let isChanged = false;
     state.platforms[platform].forEach((p) => {
         if (!fs.existsSync(`${state.config.paths.output}/prebuilt/${p}/lib`)) {
             createLib(p, 'Source', { isProd: true, buildSource: true });
@@ -272,17 +290,22 @@ function buildLib(platform) {
                 const fileName = modulePath.split('/').at(-1);
                 fs.copyFileSync(modulePath, `${state.config.paths.output}/prebuilt/${p}/swig/${fileName}`);
             });
+            isChanged = true;
         } else {
             console.log(`${state.config.general.name} is already compiled to ${p} architecture.`);
         }
     });
 
-    fs.cpSync(`${state.config.paths.build}/Source-Release/prebuilt`, `${state.config.paths.output}/prebuilt`, { recursive: true, dereference: true });
+    if (isChanged && fs.existsSync(`${state.config.paths.build}/Source-Release/prebuilt`)) {
+        fs.cpSync(`${state.config.paths.build}/Source-Release/prebuilt`, `${state.config.paths.output}/prebuilt`, { recursive: true, dereference: true });
+    }
 
     createXCFramework();
 
     const distCmakeContent = fs.readFileSync(`${state.config.paths.cli}/assets/dist.cmake`, { encoding: 'utf8', flag: 'r' })
-        .replace('___PROJECT_NAME___', state.config.general.name).replace('___PROJECT_LIBS___', state.config.export.libName.join(';'));
+        .replace('___PROJECT_NAME___', state.config.general.name)
+        .replace('___PROJECT_HOST___', state.platforms[platform].join(';'))
+        .replace('___PROJECT_LIBS___', state.config.export.libName.join(';'));
     fs.writeFileSync(`${state.config.paths.output}/prebuilt/CMakeLists.txt`, distCmakeContent);
 }
 
@@ -323,4 +346,7 @@ async function createWasmJs() {
     if (fs.existsSync(`${state.config.paths.build}/${state.config.general.name}.data.txt`)) {
         fs.copyFileSync(`${state.config.paths.build}/${state.config.general.name}.data.txt`, `${state.config.paths.output}/${state.config.general.name}.data.txt`);
     }
+    /* if (fs.existsSync(`${state.config.paths.build}/${state.config.general.name}.js`)) {
+        fs.copyFileSync(`${state.config.paths.build}/${state.config.general.name}.js`, `${state.config.paths.output}/${state.config.general.name}.js`);
+    } */
 }

package/src/integration/getCppJsScript.js

@@ -36,7 +36,7 @@ export default function getCppJsScript(platform, bridgePath = null) {
 
 function getReactNativeScript(env, modulePrefix) {
     return `
-        import { NativeModules, Platform } from 'react-native';
+        import { NativeModules } from 'react-native';
         import Module from '@cpp.js/core-embind-jsi';
 
         const { RNJsiLib } = NativeModules;
@@ -46,20 +46,18 @@ function getReactNativeScript(env, modulePrefix) {
             const CPPJS_DATA_PATH = Module.CppJS.getEnv('CPPJS_DATA_PATH');
 
             Object.entries(env).forEach(([key, value]) => {
-                Module.CppJS.setEnv(key, value.replace('_CPPJS_DATA_PATH_', CPPJS_DATA_PATH), true);
+                Module.CppJS.setEnv(key, value.replace('_CPPJS_DATA_PATH_', CPPJS_DATA_PATH), false);
             });
         }
 
         export function initCppJs(config = {}) {
-            return new Promise((resolve, reject) => {
+            return new Promise(async (resolve, reject) => {
                 if (RNJsiLib && RNJsiLib.start) {
-                    RNJsiLib.start();
-                    setTimeout(() => {
-                        setEnv();
-                        const m = Module;
-                        ${modulePrefix}
-                        resolve(Module);
-                    }, Platform.OS === 'android' ? 2000 : 0);
+                    await RNJsiLib.start();
+                    setEnv();
+                    const m = Module;
+                    ${modulePrefix}
+                    resolve(Module);
                 } else {
                     reject('Module failed to initialise.');
                 }
@@ -74,7 +72,8 @@ function getWebScript(env, modulePrefix) {
         env: {...${env}, ...config.env},
         paths: {
             wasm: 'cpp.wasm',
-            data: 'cpp.data.txt'
+            data: 'cpp.data.txt',
+            worker: 'cpp.js'
         }
     }`;
 

package/src/state/index.js

@@ -45,19 +45,22 @@ function setAllDependecyPaths() {
     state.config.allDependencyPaths = {};
     state.platforms.All.forEach((platform) => {
         const basePlatform = platform.split('-', 1)[0];
-        state.config.allDependencyPaths[platform] = {};
+        state.config.allDependencyPaths[platform] = { cmake: {} };
         state.config.allDependencies.forEach((d) => {
+            state.config.allDependencyPaths[platform].cmake[d.general.name] = `${d.paths.output}/prebuilt`;
             d.export.libName.forEach((name) => {
                 state.config.allDependencyPaths[platform][name] = {
                     root: `${d.paths.output}/prebuilt/${platform}`,
                 };
+                const platformConfig = d.platform[platform] || {};
+                const isDynamicLib = basePlatform === 'Android' && platformConfig.libType !== 'static';
                 const dep = state.config.allDependencyPaths[platform][name];
                 if (basePlatform === 'iOS') {
                     let xcRoot;
                     if (platform === 'iOS-iphoneos') {
                         xcRoot = `${d.paths.project}/${name}.xcframework/ios-arm64_arm64e`;
                     } else if (platform === 'iOS-iphonesimulator') {
-                        xcRoot = `${d.paths.project}/${name}.xcframework/ios-arm64_arm64e_x86_64-simulator`;
+                        xcRoot = `${d.paths.project}/${name}.xcframework/ios-arm64_x86_64-simulator`;
                     }
                     dep.header = `${xcRoot}/Headers`;
                     dep.libPath = xcRoot;
@@ -66,7 +69,7 @@ function setAllDependecyPaths() {
                 } else {
                     dep.header = `${dep.root}/include`;
                     dep.libPath = `${dep.root}/lib`;
-                    dep.lib = `${dep.libPath}/lib${name}.${basePlatform === 'Android' ? 'so' : 'a'}`;
+                    dep.lib = `${dep.libPath}/lib${name}.${isDynamicLib ? 'so' : 'a'}`;
                     dep.bin = `${dep.root}/bin`;
                 }
             });

package/src/state/loadConfig.js

@@ -12,7 +12,12 @@ import calculateDependencyParameters from './calculateDependencyParameters.js';
 export default async function loadConfig(configDir = process.cwd(), configName = 'cppjs.config') {
     const config = await loadJs(configDir, configName) || {};
     const output = getFilledConfig(config);
-    output.build = await loadJs(configDir, 'cppjs.build');
+    const build = await loadJs(configDir, 'cppjs.build');
+
+    if (build) {
+        build.withBuildConfig = true;
+    }
+    output.build = { ...build, ...output.build };
 
     output.paths.systemConfig = `${os.homedir()}/.cppjs.json`;
     output.system = loadJson(output.paths.systemConfig) || {};
@@ -34,6 +39,8 @@ function getFilledConfig(config, options = { isDepend: false }) {
         ext: config.ext || {},
         export: config.export || {},
         platform: config.platform || {},
+        build: config.build || {},
+        extensions: config.extensions || [],
         package: null,
     };
 
@@ -97,6 +104,16 @@ function getFilledConfig(config, options = { isDepend: false }) {
         return Object.values(output);
     })();
 
+    newConfig.extensions?.forEach(e => {
+        e?.loadConfig?.after(newConfig);
+    });
+
+    newConfig.build.usePthread = newConfig.build.usePthread || false;
+
+    if (!newConfig.build.usePthread) {
+        newConfig.build.usePthread = newConfig.allDependencies.some((d) => d?.build?.usePthread);
+    }
+
     newConfig.dependencyParameters = calculateDependencyParameters(newConfig);
     // newConfig.cmakeParameters = getCmakeParameters(newConfig);
 

package/src/utils/downloadAndExtractFile.js

@@ -23,7 +23,16 @@ function downloadFile(url, folder) {
             return;
         }
 
-        fr.https.get(url, (res) => {
+        const parsedUrl = new URL(url);
+        const options = {
+            hostname: parsedUrl.hostname,
+            path: parsedUrl.pathname + parsedUrl.search,
+            headers: {
+                'User-Agent': 'curl/8.7.1',
+            },
+        };
+
+        fr.https.get(options, (res) => {
             const fileStream = fs.createWriteStream(`${folder}/${filename}`);
             res.pipe(fileStream);
 

package/src/utils/findFiles.js

@@ -1,5 +1,5 @@
 import { glob } from 'glob';
 
 export default function findFiles(regex, options = {}) {
-    return glob.sync(regex, { absolute: true, posix: true, ...options }).map(p => p.replace('//?/', ''));
+    return glob.sync(regex, { absolute: true, posix: true, follow: true, ...options }).map(p => p.replace('//?/', ''));
 }

package/src/utils/pullDockerImage.js

@@ -3,7 +3,7 @@ import { execFileSync } from 'node:child_process';
 let isDockerImageAvailable = false;
 
 export function getDockerImage() {
-    return 'bugra9/cpp.js:0.2.8';
+    return 'bugra9/cpp.js:0.3.0';
 }
 
 export default function pullDockerImage() {