v2

Author: bugra9

packages/cpp.js/CHANGELOG.md cppjs-core/cpp.js/CHANGELOG.mdpackages/cpp.js/CHANGELOG.md renamed to cppjs-core/cpp.js/CHANGELOG.md

@@ -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;

packages/cpp.js/README.md cppjs-core/cpp.js/README.mdpackages/cpp.js/README.md renamed to cppjs-core/cpp.js/README.md

@@ -0,0 +1,127 @@
+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) {
+    const buildType = isProd ? 'Release' : 'Debug';
+    const libs = [
+        ...getDependLibs(),
+        `${state.config.paths.build}/Source-${buildType}/Emscripten-x86_64/lib${state.config.general.name}.a`,
+        `${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', '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', '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]) => {
+            if (fs.existsSync(key)) {
+                const dAssetPath = `${state.config.paths.build}/data/${value}`;
+                if (!fs.existsSync(dAssetPath)) {
+                    fs.mkdirSync(dAssetPath, { recursive: true });
+                    fs.cpSync(key, dAssetPath, { recursive: true });
+                }
+            }
+        });
+    }
+
+    if (fs.existsSync(`${state.config.paths.build}/${state.config.general.name}.data`)) {
+        fs.renameSync(`${state.config.paths.build}/${state.config.general.name}.data`, `${state.config.paths.build}/${state.config.general.name}.data.txt`);
+    }
+}

packages/cpp.js/package.json cppjs-core/cpp.js/package.jsonpackages/cpp.js/package.json renamed to cppjs-core/cpp.js/package.json

@@ -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);

packages/cpp.js/src/actions/buildJs.js cppjs-core/cpp.js/src/actions/buildJs.jspackages/cpp.js/src/actions/buildJs.js renamed to cppjs-core/cpp.js/src/actions/buildJs.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);
+    });
+}