cpp.js 1.0.0-beta.7 → 1.0.1

package/src/{functions → actions}/run.js

@@ -1,11 +1,12 @@
-import fs from 'fs';
-import { execFileSync } from 'child_process';
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
 import pullDockerImage, { getDockerImage } from '../utils/pullDockerImage.js';
 import getOsUserAndGroupId from '../utils/getOsUserAndGroupId.js';
-import getBaseInfo from '../utils/getBaseInfo.js';
-import getPathInfo from '../utils/getPathInfo.js';
+import { getContentHash } from '../utils/hash.js';
+import state from '../state/index.js';
 
-const CROSSCOMPILER = 'aarch64-linux-android33';
+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 t = `${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin`;
 const t2 = `${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64`;
@@ -15,11 +16,23 @@ const iosBinPath = `${iOSDevPath}/Toolchains/XcodeDefault.xctoolchain/usr/bin`;
 const iosSdkPath = `${iOSDevPath}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk`;
 const iosSimSdkPath = `${iOSDevPath}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk`;
 
-const androidParams = [
+const androidParamsArm64 = [
     '-e', `AR=${t}/llvm-ar`,
     '-e', `AS=${t}/llvm-as`,
-    '-e', `CC=${t}/${CROSSCOMPILER}-clang`,
-    '-e', `CXX=${t}/${CROSSCOMPILER}-clang++`,
+    '-e', `CC=${t}/${CROSSCOMPILER_ARM64}-clang`,
+    '-e', `CXX=${t}/${CROSSCOMPILER_ARM64}-clang++`,
+    '-e', `LD=${t}/ld`,
+    '-e', `RANLIB=${t}/llvm-ranlib`,
+    '-e', `STRIP=${t}/llvm-strip`,
+    '-e', `NM=${t}/nm`,
+    '-e', `CFLAGS=--sysroot=${t2}/sysroot`,
+];
+
+const androidParamsX86_64 = [
+    '-e', `AR=${t}/llvm-ar`,
+    '-e', `AS=${t}/llvm-as`,
+    '-e', `CC=${t}/${CROSSCOMPILER_x86_64}-clang`,
+    '-e', `CXX=${t}/${CROSSCOMPILER_x86_64}-clang++`,
     '-e', `LD=${t}/ld`,
     '-e', `RANLIB=${t}/llvm-ranlib`,
     '-e', `STRIP=${t}/llvm-strip`,
@@ -66,22 +79,17 @@ const iosParams = [
     '-e', `LDFLAGS="${IOS_HOST_FLAGS}"`,
 ]; */
 
-function getParentPath(path) {
-    const pathArray = path.split('/');
-    pathArray.pop();
-    return pathArray.join('/');
-}
+export default function run(program, params = [], platformPrefix = null, platform = null, dockerOptions = {}) {
+    const buildPath = platformPrefix ? `${state.config.paths.build}/${platformPrefix}/${platform}` : state.config.paths.build;
+    if (!fs.existsSync(buildPath)) {
+        fs.mkdirSync(buildPath, { recursive: true });
+    }
 
-export default function run(compiler, program, params = [], dockerOptions = {}) {
-    const [basePlatform, ...arch] = (compiler.platform || 'unknown-unknown').split('-'); // Emscripten-x86_64, Android-arm64-v8a, iOS-iphoneos, iOS-iphonesimulator
+    const [basePlatform, ...arch] = (platform || 'unknown-unknown').split('-'); // Emscripten-x86_64, Android-arm64-v8a, iOS-iphoneos, iOS-iphonesimulator
     if (basePlatform !== 'iOS' || program !== null) {
         pullDockerImage();
     }
 
-    const base = getBaseInfo(compiler.config.paths.base);
-    const temp = getPathInfo(compiler.config.paths.temp, compiler.config.paths.base);
-
-    const cMakeParentPath = getParentPath(compiler.config.paths.cmake);
     let dProgram = program;
     let dParams = params;
     let platformParams = [];
@@ -96,11 +104,12 @@ export default function run(compiler, program, params = [], dockerOptions = {})
                 break;
             case 'Android':
                 [dProgram, ...dParams] = params;
-                platformParams = androidParams;
+                platformParams = arch[0] === 'x86_64' ? androidParamsX86_64 : androidParamsArm64;
                 if (dProgram === 'cmake') {
                     dParams = [
                         ...dParams,
-                        '-DCMAKE_SYSTEM_NAME=Android', '-DCMAKE_SYSTEM_VERSION=33', '-DCMAKE_ANDROID_ARCH_ABI=arm64-v8a',
+                        '-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}`,
                     ];
                 }
@@ -118,14 +127,14 @@ export default function run(compiler, program, params = [], dockerOptions = {})
                             '-DFRAMEWORK=TRUE',
                             '-DCMAKE_OSX_DEPLOYMENT_TARGET=13.0',
                             '-DCMAKE_SYSTEM_NAME=iOS',
-                            `-DMACOSX_FRAMEWORK_IDENTIFIER=org.js.cpp.${compiler.config.general.name}`,
-                            `-DCMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER=org.js.cpp.${compiler.config.general.name}`,
+                            `-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_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\'',
-                            '-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=7ZZLDWBUVT',
+                            `-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=${state.config.system.XCODE_DEVELOPMENT_TEAM}`,
                         ];
                     }
                 } else if (dProgram === 'ios-cmake') {
@@ -134,7 +143,7 @@ export default function run(compiler, program, params = [], dockerOptions = {})
                     if (dParams[0] !== '--build' && dParams[0] !== '--install') {
                         dParams = [
                             ...dParams,
-                            `-DCMAKE_TOOLCHAIN_FILE='${compiler.config.paths.cli}/assets/ios.toolchain.cmake'`,
+                            `-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'}`,
                             '-DENABLE_BITCODE=TRUE',
@@ -142,14 +151,14 @@ export default function run(compiler, program, params = [], dockerOptions = {})
                             '-DFRAMEWORK=TRUE',
                             '-DCMAKE_OSX_DEPLOYMENT_TARGET=13.0',
                             '-DCMAKE_SYSTEM_NAME=iOS',
-                            `-DMACOSX_FRAMEWORK_IDENTIFIER=org.js.cpp.${compiler.config.general.name}`,
-                            `-DCMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER=org.js.cpp.${compiler.config.general.name}`,
+                            `-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_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\'',
-                            '-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=7ZZLDWBUVT',
+                            `-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=${state.config.system.XCODE_DEVELOPMENT_TEAM}`,
                         ];
                     }
                 }
@@ -157,64 +166,109 @@ export default function run(compiler, program, params = [], dockerOptions = {})
             default:
         }
     }
-    if (basePlatform === 'iOS' && program === null) {
+
+    const env = {};
+    let runner = 'DOCKER';
+    if ((basePlatform === 'iOS' && program === null) || state.config.system.RUNNER === 'LOCAL') {
+        runner = 'LOCAL';
+    }
+
+    if (runner === 'LOCAL') {
         const allowedEnv = [
             '^PWD$', '^SHELL$', '^LC_CTYPE$', '^PATH$', '^HOME$', '^TMPDIR$', '^USER$',
             '^PODS_*', '^CONFIGURATION_BUILD_DIR$', '^UNLOCALIZED_RESOURCES_FOLDER_PATH$',
         ];
-        const env = {};
         Object.entries(process.env).forEach(([key, value]) => {
             if (allowedEnv.some((e) => key.match(e))) {
                 env[key] = value;
             }
         });
-        const pParams = [...platformParams, ...(dockerOptions.params || [])];
-        for (let i = 0; i < pParams.length; i += 2) {
-            if (pParams[i] === '-e') {
-                const [key, ...rest] = pParams[i + 1].split('=');
-                const value = rest.join('=');
-                if (['CFLAGS', 'CXXFLAGS', 'LDFLAGS'].includes(key)) {
-                    let v = value;
-                    if (v.startsWith('\'') || v.startsWith('"')) {
-                        v = v.substring(1, v.length - 1);
-                    }
-                    if (env[key]) env[key] += ` ${v}`;
-                    else env[key] = v;
-                } else {
-                    env[key] = value;
+    }
+
+    const pParams = [...platformParams, ...(dockerOptions.params || [])];
+    for (let i = 0; i < pParams.length; i += 2) {
+        if (pParams[i] === '-e') {
+            const [key, ...rest] = pParams[i + 1].split('=');
+            const value = rest.join('=');
+            if (['CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS'].includes(key)) {
+                let v = value;
+                if (v.startsWith('\'') || v.startsWith('"')) {
+                    v = v.substring(1, v.length - 1);
                 }
+                if (env[key]) env[key] += ` ${v}`;
+                else env[key] = v;
+            } else {
+                env[key] = value;
             }
         }
+    }
 
+    let fileExecParams;
+    if (runner === 'LOCAL') {
         env.PATH = `/opt/homebrew/bin:${env.PATH}`;
 
         const options = {
-            cwd: dockerOptions.workdir || `/tmp/cppjs/live/${temp.relative}`,
-            stdio: dockerOptions.console ? 'inherit' : 'pipe',
+            cwd: dockerOptions.workdir || buildPath,
+            stdio: dockerOptions.console ? 'inherit' : ['ignore', 'pipe', 'pipe'],
             env,
         };
+        fileExecParams = [dProgram, dParams, options];
+    } else if (runner === 'DOCKER') {
+        const dockerEnv = [];
+        Object.entries(env).forEach(([key, value]) => {
+            dockerEnv.push('-e', `${key}=${value}`);
+        });
+        const options = { cwd: buildPath, stdio: dockerOptions.console ? 'inherit' : ['ignore', 'pipe', 'pipe'] };
 
-        if (!fs.existsSync('/tmp/cppjs')) fs.mkdirSync('/tmp/cppjs');
-        if (fs.existsSync('/tmp/cppjs/live')) fs.unlinkSync('/tmp/cppjs/live');
-        fs.symlinkSync(base.withoutSlash, '/tmp/cppjs/live');
-        if (!fs.existsSync('/tmp/cppjs/cli')) fs.symlinkSync(compiler.config.paths.cli, '/tmp/cppjs/cli');
-        if (!fs.existsSync('/tmp/cppjs/cmake')) fs.symlinkSync(cMakeParentPath, '/tmp/cppjs/cmake');
+        let runnerParams = [];
+        let imageOrContainer = null;
+        if (state.config.system.RUNNER === 'DOCKER_RUN') {
+            imageOrContainer = getDockerImage();
+            runnerParams = ['run', '--rm', '-v', `${state.config.paths.base}:/tmp/cppjs/live`];
+        } else if (state.config.system.RUNNER === 'DOCKER_EXEC') {
+            imageOrContainer = `${getDockerImage()}-${getContentHash(state.config.paths.base)}`.replace('/', '-').replace(':', '-');
+            runnerParams = ['exec'];
+        } else {
+            throw new Error(`The runner ${state.config.system.RUNNER} is invalid.`);
+        }
 
-        execFileSync(dProgram, dParams, options);
-    } else {
-        const options = { cwd: temp.absolute, stdio: dockerOptions.console ? 'inherit' : 'pipe' };
         const args = [
-            'run',
+            ...runnerParams,
             '--user', getOsUserAndGroupId(),
-            '-v', `${base.withoutSlash}:/tmp/cppjs/live`,
-            '-v', `${compiler.config.paths.cli}:/tmp/cppjs/cli`,
-            '-v', `${cMakeParentPath}:/tmp/cppjs/cmake`,
-            '--workdir', dockerOptions.workdir || `/tmp/cppjs/live/${temp.relative}`,
-            ...platformParams,
-            ...(dockerOptions.params || []),
-            getDockerImage(),
-            dProgram, ...dParams,
+            '--workdir', replaceBasePathForDocker(dockerOptions.workdir || buildPath),
+            ...replaceBasePathForDocker(dockerEnv),
+            // '-e', replaceBasePathForDocker(`CCACHE_DIR=${state.config.paths.build}/ccache`),
+            imageOrContainer,
+            replaceBasePathForDocker(dProgram),
+            ...replaceBasePathForDocker(dParams),
         ];
-        execFileSync('docker', args, options);
+        fileExecParams = ['docker', args, options];
+    } else {
+        throw new Error(`The runner ${state.config.system.RUNNER} or command is invalid.`);
+    }
+
+    try {
+        execFileSync(...fileExecParams);
+    } catch (e) {
+        console.log(e?.stdout?.toString() || 'stdout is empty');
+        console.error(e?.stderr?.toString() || 'stderr is empty');
+        console.error('An error occurred while running the application. Please check the logs for more details.');
+        process.exit();
+    }
+}
+
+function replaceBasePathForDocker(data) {
+    if (typeof data === 'string' || data instanceof String) {
+        return data.replaceAll(state.config.paths.base, '/tmp/cppjs/live');
+    }
+    if (Array.isArray(data)) {
+        return data.map((d) => replaceBasePathForDocker(d));
+    }
+    if (typeof value === 'object' && data !== null) {
+        const newData = {};
+        Object.entries(data).forEach(([key, value]) => {
+            newData[key] = replaceBasePathForDocker(value);
+        });
     }
+    return data;
 }

package/src/assets/CMakeLists.txt

@@ -26,10 +26,12 @@ if (BUILD_SOURCE)
 endif(BUILD_SOURCE)
 
 if (BUILD_BRIDGE)
-    file(GLOB BRIDGE_SRC_FILES "${BRIDGE_DIR}/*.i.cpp")
+    file(GLOB BRIDGE_SRC_FILES "${BRIDGE_DIR}/*.i.cpp;${EXTERNAL_BRIDGE_GLOB}")
 endif(BUILD_BRIDGE)
 
-set(SRC_FILES "${BUILD_SRC_FILES}" "${BRIDGE_SRC_FILES}")
+file(GLOB_RECURSE EXTERNAL_SRC_FILES ${EXTERNAL_NATIVE_GLOB})
+
+set(SRC_FILES "${BUILD_SRC_FILES}" "${BRIDGE_SRC_FILES}" "${EXTERNAL_SRC_FILES}")
 add_library("${PROJECT_NAME}" "${BUILD_TYPE}" ${SRC_FILES})
 
 set(EXTRA_LINK_LIBRARIES "")
@@ -44,15 +46,17 @@ endif()
 file(GLOB_RECURSE HEADER_FILES ${HEADER_GLOB})
 target_include_directories("${PROJECT_NAME}" PUBLIC "${HEADER_DIR}")
 
+install(TARGETS "${PROJECT_NAME}" DESTINATION "lib")
+if(NOT "${HEADER_FILES}" STREQUAL "")
+    target_sources("${PROJECT_NAME}"
+        PUBLIC FILE_SET HEADERS
+        BASE_DIRS "${HEADER_DIR}"
+        FILES "${HEADER_FILES}")
+    install(TARGETS "${PROJECT_NAME}" FILE_SET HEADERS DESTINATION "include")
+endif()
+
 if (BUILD_SOURCE)
-    install(TARGETS "${PROJECT_NAME}" DESTINATION "lib")
-    if(NOT "${HEADER_FILES}" STREQUAL "")
-        target_sources("${PROJECT_NAME}"
-            PUBLIC FILE_SET HEADERS
-            BASE_DIRS "${HEADER_DIR}"
-            FILES "${HEADER_FILES}")
-        install(TARGETS "${PROJECT_NAME}" FILE_SET HEADERS DESTINATION "include")
-    endif()
+
 endif(BUILD_SOURCE)
 unset(BUILD_SOURCE CACHE)
 

package/src/assets/commonBridges.cpp

@@ -0,0 +1,16 @@
+#include <emscripten/bind.h>
+
+EMSCRIPTEN_BINDINGS(CommonBridges) {
+    emscripten::register_vector<char>("VectorChar");
+    emscripten::register_vector<short>("VectorShort");
+    emscripten::register_vector<int>("VectorInt");
+    emscripten::register_vector<int64_t>("VectorInt64");
+    emscripten::register_vector<float>("VectorFloat");
+    emscripten::register_vector<double>("VectorDouble");
+    emscripten::register_vector<std::string>("VectorString");
+
+    emscripten::register_map<int,int>("MapIntInt");
+    emscripten::register_map<int,std::string>("MapIntString");
+    emscripten::register_map<std::string,std::string>("MapStringString");
+    emscripten::register_map<std::string,int>("MapStringInt");
+}

package/src/assets/dist.cmake

@@ -9,7 +9,7 @@ if(ANDROID)
     set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
 elseif(APPLE)
     if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
-        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}")
+        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")

package/src/assets/ios.toolchain.cmake

@@ -168,7 +168,7 @@ list(APPEND _supported_platforms
         "TVOS" "TVOSCOMBINED" "SIMULATOR_TVOS" "SIMULATORARM64_TVOS"
         "WATCHOS" "WATCHOSCOMBINED" "SIMULATOR_WATCHOS" "SIMULATORARM64_WATCHOS"
         "MAC" "MAC_ARM64" "MAC_UNIVERSAL"
-        "VISIONOS" "SIMULATOR_VISIONOS" "VISIONOSCOMBINED" 
+        "VISIONOS" "SIMULATOR_VISIONOS" "VISIONOSCOMBINED"
         "MAC_CATALYST" "MAC_CATALYST_ARM64" "MAC_CATALYST_UNIVERSAL")
 
 # Cache what generator is used
@@ -316,7 +316,7 @@ if(PLATFORM_INT STREQUAL "OS")
     set(ARCHS armv7 armv7s arm64)
     set(APPLE_TARGET_TRIPLE_INT arm-apple-ios${DEPLOYMENT_TARGET})
   else()
-    set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET})  
+    set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET})
   endif()
 elseif(PLATFORM_INT STREQUAL "OS64")
   set(SDK_NAME iphoneos)
@@ -1049,7 +1049,7 @@ set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
 )
 
 if(NAMED_LANGUAGE_SUPPORT_INT)
-  list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES 
+  list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
         CMAKE_OBJC_FLAGS
         CMAKE_OBJC_DEBUG
         CMAKE_OBJC_MINSIZEREL
@@ -1087,7 +1087,7 @@ IF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
 ENDIF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
 
 # Set up the default search directories for frameworks.
-if(PLATFORM_INT MATCHES "^MAC_CATALYST") 
+if(PLATFORM_INT MATCHES "^MAC_CATALYST")
   set(CMAKE_FRAMEWORK_PATH
           ${CMAKE_DEVELOPER_ROOT}/Library/PrivateFrameworks
           ${CMAKE_OSX_SYSROOT_INT}/System/Library/Frameworks