crossbind 2.0.0-beta.74 → 2.0.0-beta.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crossbind",
-  "version": "2.0.0-beta.74",
+  "version": "2.0.0-beta.76",
   "license": "MIT",
   "homepage": "https://crossbind.dev",
   "repository": {
@@ -38,7 +38,7 @@
     "vitest": "^5.0.1"
   },
   "dependencies": {
-    "@crossbind/extension-conan": "2.0.0-beta.74",
+    "@crossbind/extension-conan": "2.0.0-beta.76",
     "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
@@ -55,7 +55,7 @@
     "upath": "^3.0.8"
   },
   "optionalDependencies": {
-    "@crossbind/bridge-tools": "2.0.0-beta.74"
+    "@crossbind/bridge-tools": "2.0.0-beta.76"
   },
   "keywords": [
     "webassembly",

package/src/actions/androidGradle.js

@@ -119,9 +119,15 @@ export function packageAndroidRelease(project) {
     const key = machineUploadKey();
     const env = key ? { ...process.env, ...uploadKeyEnv(key) } : process.env;
     const signing = releaseSigning(env);
+    const workdir = inContainer(project);
     pullDockerImage(ROLE, PLATFORM);
-    docker(['run', '--rm', ...containerArgs(signing, isOnline(project)), '-w', inContainer(project), getDockerImage(ROLE, PLATFORM),
-        ...gradleOf(project), '--no-daemon', 'assembleRelease', ...(signing ? ['bundleRelease'] : [])], `packaging ${path.basename(project)}`, env);
+    removeOrphanedDevContainers();
+    try {
+        docker(['run', '--rm', ...containerArgs(signing, isOnline(project)), '-w', workdir, getDockerImage(ROLE, PLATFORM),
+            ...gradleOf(project), '--no-daemon', 'assembleRelease', ...(signing ? ['bundleRelease'] : [])], `packaging ${path.basename(project)}`, env);
+    } catch (error) {
+        throw withCacheHolders(error);
+    }
     const outputs = `${project}/app/build/outputs`;
     fs.copyFileSync(`${outputs}/apk/release/app-release.apk`, `${project}.apk`);
     fs.rmSync(`${project}.aab`, { force: true });
@@ -138,6 +144,42 @@ export function packageAndroidRelease(project) {
     }
 }
 
+// Every Android build on this machine shares Gradle's caches, which a development container's daemon holds until the
+// container goes: Gradle cannot hand them to another container. A development container carries the PID of the session it
+// serves, so that one a session left behind without its exit hooks, as a crash or a SIGKILL leaves, goes before the next
+// build instead of stopping it.
+const SESSION_LABEL = 'dev.crossbind.android-app.session';
+
+const isRunning = (pid) => {
+    try {
+        process.kill(pid, 0);
+        return true;
+    } catch (error) {
+        return error.code === 'EPERM';
+    }
+};
+
+function removeOrphanedDevContainers() {
+    const ps = spawnSync('docker', ['ps', '--all', '--filter', `label=${SESSION_LABEL}`, '--format', `{{.Names}} {{.Label "${SESSION_LABEL}"}}`], { encoding: 'utf8' });
+    if (ps.status !== 0) return;
+    for (const line of ps.stdout.split('\n')) {
+        const [name, pid] = line.trim().split(' ');
+        if (!name || !/^\d+$/.test(pid ?? '') || isRunning(Number(pid))) continue;
+        console.warn(`crossbind: removing ${name}, the Android development container of a session that has ended.`);
+        spawnSync('docker', ['rm', '--force', name], { stdio: 'ignore' });
+    }
+}
+
+// What holds Gradle's caches when a release cannot take them: the containers of development sessions that run, and those of
+// a crossbind before the label, which name no session.
+function withCacheHolders(error) {
+    if (!error.message.includes('Timeout waiting to lock')) return error;
+    const ps = spawnSync('docker', ['ps', '--filter', 'name=crossbind-android-app-', '--format', '{{.Names}}'], { encoding: 'utf8' });
+    const names = ps.status === 0 ? ps.stdout.split('\n').map((name) => name.trim()).filter(Boolean) : [];
+    if (names.length === 0) return error;
+    return new Error(`${error.message}\ncrossbind: Gradle's caches are held by ${names.join(', ')}, the container ${names.length > 1 ? 'each ' : ''}of a \`crossbind app dev\`: end that session, or run \`docker rm --force ${names.join(' ')}\` if none is running.`, { cause: error });
+}
+
 // During development one container per project, whose Gradle daemon stays warm from one build to the next; it goes with
 // the process, and comes anew when the project comes to need the network, or no longer does.
 let devContainer = null;
@@ -145,10 +187,11 @@ let devContainer = null;
 function startDevContainer(isNetworked) {
     const name = `crossbind-android-app-${getContentHash(state.config.paths.project).slice(0, 12)}`;
     pullDockerImage(ROLE, PLATFORM);
+    removeOrphanedDevContainers();
     // One a crashed session, or the project's need of the network before, left behind holds the name.
     spawnSync('docker', ['rm', '--force', name], { stdio: 'ignore' });
-    docker(['run', '--detach', '--rm', '--init', '--name', name, ...containerArgs(null, isNetworked), getDockerImage(ROLE, PLATFORM), 'sleep', 'infinity'],
-        'starting the development container');
+    docker(['run', '--detach', '--rm', '--init', '--name', name, '--label', `${SESSION_LABEL}=${process.pid}`, ...containerArgs(null, isNetworked),
+        getDockerImage(ROLE, PLATFORM), 'sleep', 'infinity'], 'starting the development container');
     if (!devContainer) {
         process.once('exit', () => spawnSync('docker', ['rm', '--force', name], { stdio: 'ignore' }));
         // A closed terminal ends the session through its exit hooks, as Ctrl-C does.

package/src/actions/buildApp.js

@@ -10,7 +10,8 @@ import run from './run.js';
 import createLib from './createLib.js';
 import getData from './getData.js';
 import getEnv from './getEnv.js';
-import { copyWindowsNotices, filesUnder, linkInputs } from './buildNode.js';
+import { filesUnder, linkInputs } from './buildNode.js';
+import copyNativeNotices from './nativeNotices.js';
 import { suppressNodeBuiltinWarnings } from './buildJs.js';
 import { isNativeSourceNewerThan } from './isSourceNewer.js';
 import { createNativeBridges } from './nativeBridges.js';
@@ -180,7 +181,7 @@ async function hostInputs(target) {
     assertAppRunner(target);
     const inputs = [getDockerImage(imageRoleFor(target), target.platform === 'android' ? 'linux/amd64' : undefined)];
     if (target.platform === 'android') {
-        return { hermes: `${IMAGE_HERMES}/android`, cmakeArgs: ['-DANDROID_STL=c++_shared'], inputs };
+        return { hermes: `${IMAGE_HERMES}/android`, cmakeArgs: [], inputs };
     }
     if (target.platform === 'win32') {
         return { hermes: `${IMAGE_HERMES}/win32-${target.arch}`, cmakeArgs: ['-DCROSSBIND_WEBVIEW2_INCLUDE=/opt/crossbind/webview2/include'], inputs };
@@ -667,7 +668,7 @@ export default async function buildApp(target, { bridges = [], force = false } =
         ...cmakeArgs,
     ], platformPrefix, target);
     run(null, ['cmake', '--build', '.', '-j', String(cpuCount)], platformPrefix, target, { exclusive: true });
-    if (target.platform === 'win32') copyWindowsNotices(target);
+    copyNativeNotices(target);
 
     const systemConfig = `export default ${JSON.stringify({ env: getEnv(target) })};`;
     await bundle(`${appHostRoot}/js/host.js`, `${workDir}/host.js`, [

package/src/actions/buildNode.js

@@ -19,10 +19,9 @@ import resolveEmbindNapiRoot, { resolveEmbindJsiRoot } from '../utils/resolveEmb
 import scopedEmbind from '../utils/scopedEmbind.js';
 import resolveEmbindRustRoot from '../utils/resolveEmbindRust.js';
 import { rustStdLibsFor } from '../utils/cargoTarget.js';
-import toolchainNoticesDir from '../utils/toolchainNotices.js';
+import copyNativeNotices from './nativeNotices.js';
 
 const cpuCount = Math.max(1, os.cpus().length - 1);
-const WINDOWS_IMAGE_NOTICES = '/opt/licenses/llvm-mingw';
 
 // What a build's output, a package's own packages and a repository's history hold, which no build reads.
 const UNREAD_FOLDERS = ['.crossbind', 'node_modules', '.git'];
@@ -124,13 +123,6 @@ export function bundleNodeLoader(target) {
     return bundleLoader(target, resolveEmbindNapiRoot(), nodeLoaderConfig(target));
 }
 
-// The mingw-w64 runtime and winpthreads in a Windows addon or app ask for their notices in binary
-// distributions. The windows image carries them; a host toolchain may not.
-export function copyWindowsNotices(target) {
-    const notices = toolchainNoticesDir('win32');
-    run(null, ['sh', '-c', `if [ -d ${WINDOWS_IMAGE_NOTICES} ]; then mkdir -p ${notices} && cp ${WINDOWS_IMAGE_NOTICES}/* ${notices}/; fi`], null, target);
-}
-
 // Links one Node-API addon from the project's archives and bundles the loader that picks the
 // addon matching the running process.
 export default async function buildNode(target, options = {}) {
@@ -185,7 +177,7 @@ export default async function buildNode(target, options = {}) {
         `-DCROSSBIND_LINK_DEPENDS=${libs.join(';')}`,
     ], platformPrefix, target);
     run(null, ['cmake', '--build', '.', '-j', String(cpuCount)], platformPrefix, target, { exclusive: true });
-    if (target.platform === 'win32') copyWindowsNotices(target);
+    copyNativeNotices(target);
     fs.copyFileSync(`${build}/${platformPrefix}/${target.path}/${target.addonName}`, `${build}/${target.addonName}`);
     logger.doneStep(target, 'addon');
 

package/src/actions/buildWasm.js

@@ -6,6 +6,7 @@ import getLinkInputs from './getLinkInputs.js';
 import getData from './getData.js';
 import getEnv from './getEnv.js';
 import buildJs from './buildJs.js';
+import copyWasmNotices, { hasWasmNotices } from './wasmNotices.js';
 import state from '../state/index.js';
 import resolveEmbindRustRoot from '../utils/resolveEmbindRust.js';
 import logger from '../utils/logger.js';
@@ -15,9 +16,10 @@ import { guardBigIntArguments, guardEmbindArguments } from '../utils/embindArgum
 import { separateCallArguments } from '../utils/embindCallArguments.js';
 import { queueJspiCalls } from '../utils/embindJspiQueue.js';
 import { releaseOwnedHandles } from '../utils/embindObjectLifetime.js';
+import { keepPointerOwners } from '../utils/embindPointerOwners.js';
 import { spawnPthreadsFromMainScript } from '../utils/pthreadMainScript.js';
 
-const GLUE_REWRITES = ['../utils/embindArgumentGuards.js', '../utils/embindCallArguments.js', '../utils/embindJspiQueue.js', '../utils/embindObjectLifetime.js', '../utils/pthreadMainScript.js']
+const GLUE_REWRITES = ['../utils/embindArgumentGuards.js', '../utils/embindCallArguments.js', '../utils/embindJspiQueue.js', '../utils/embindObjectLifetime.js', '../utils/embindPointerOwners.js', '../utils/pthreadMainScript.js']
     .map((file) => fileURLToPath(new URL(file, import.meta.url)));
 
 // embind's bigint converter turns any Number into a BigInt, so 2^53+1 silently becomes 2^53.
@@ -76,6 +78,17 @@ function releaseOwnedObjects(target) {
     }
 }
 
+// A pointer a member hands out outlived the object it points into once JavaScript freed that object
+// (utils/embindPointerOwners.js); each runtimeEnv links its own glue, so each one calls this after its link.
+function keepPointerOwnersAlive(target) {
+    const gluePath = `${state.config.paths.build}/${target.rawJsName}`;
+    const { text, missed } = keepPointerOwners(fs.readFileSync(gluePath, 'utf8'));
+    fs.writeFileSync(gluePath, text);
+    if (missed) {
+        logger.error('embind pointer owner rewrite missed (emscripten glue format changed?): a pointer a method returns can outlive the object it points into');
+    }
+}
+
 // A direct-mode mt init in a browser spawns its pthreads from "/undefined" (utils/pthreadMainScript.js).
 function pointPthreadSpawn(target) {
     const gluePath = `${state.config.paths.build}/${target.rawJsName}`;
@@ -192,9 +205,12 @@ export default async function buildWasm(target, options = {}) {
         || fs.readFileSync(linkFingerprintFile, { encoding: 'utf8' }) !== linkFingerprint;
 
     if (!options.force && !linkChanged && fs.existsSync(`${state.config.paths.build}/${target.jsName}`) && fs.existsSync(`${state.config.paths.build}/${target.wasmName}`)) {
+        // A build made before crossbind kept the toolchain's notices has none.
+        if (!hasWasmNotices()) copyWasmNotices(target);
         logger.cachedStep(target, 'wasm+js');
         return false;
     }
+    copyWasmNotices(target);
 
     if (target.runtimeEnv === 'browser') {
         logger.startStep(target, 'wasm');
@@ -244,6 +260,7 @@ export default async function buildWasm(target, options = {}) {
         separateEmbindCalls(target);
         queueJspiEmbindCalls(target);
         releaseOwnedObjects(target);
+        keepPointerOwnersAlive(target);
         await buildJs(target);
         // 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`);
@@ -286,6 +303,7 @@ export default async function buildWasm(target, options = {}) {
         separateEmbindCalls(target);
         queueJspiEmbindCalls(target);
         releaseOwnedObjects(target);
+        keepPointerOwnersAlive(target);
         await buildJs(target);
         logger.doneStep(target, 'js');
     }
@@ -323,6 +341,7 @@ export default async function buildWasm(target, options = {}) {
         separateEmbindCalls(target);
         queueJspiEmbindCalls(target);
         releaseOwnedObjects(target);
+        keepPointerOwnersAlive(target);
         await buildJs(target);
         if (emccFlags.includes('FETCH')) {
             fs.appendFileSync(`${state.config.paths.build}/${target.jsName}`, 'var XMLHttpRequest = require(\'xhr2\');\n');