crossbind 2.0.0-beta.64 → 2.0.0-beta.66

package/src/utils/plist.js

@@ -0,0 +1,42 @@
+// Property lists as Apple's tools read them: XML for an Info.plist, the older text form for an Xcode project.
+
+const XML_INDENT = '    ';
+const escapeXml = (text) => String(text).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+
+function xmlLines(value, indent) {
+    if (typeof value === 'boolean') return [`${indent}<${value}/>`];
+    const inner = indent + XML_INDENT;
+    if (Array.isArray(value)) return [`${indent}<array>`, ...value.flatMap((item) => xmlLines(item, inner)), `${indent}</array>`];
+    if (typeof value === 'object') {
+        const entries = Object.entries(value);
+        if (entries.length === 0) return [`${indent}<dict/>`];
+        return [
+            `${indent}<dict>`,
+            ...entries.flatMap(([key, item]) => [`${inner}<key>${escapeXml(key)}</key>`, ...xmlLines(item, inner)]),
+            `${indent}</dict>`,
+        ];
+    }
+    return [`${indent}<string>${escapeXml(value)}</string>`];
+}
+
+export function xmlPlist(dict) {
+    return '<?xml version="1.0" encoding="UTF-8"?>\n'
+        + '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n'
+        + `<plist version="1.0">\n${xmlLines(dict, '').join('\n')}\n</plist>\n`;
+}
+
+// Every value of the text form is a string, quoted here whatever it holds.
+const quote = (text) => `"${String(text).replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
+
+function textValue(value, indent) {
+    const inner = `${indent}\t`;
+    if (Array.isArray(value)) return `(\n${value.map((item) => `${inner}${textValue(item, inner)},\n`).join('')}${indent})`;
+    if (typeof value === 'object') {
+        return `{\n${Object.entries(value).map(([key, item]) => `${inner}${quote(key)} = ${textValue(item, inner)};\n`).join('')}${indent}}`;
+    }
+    return quote(value);
+}
+
+export function textPlist(root) {
+    return `// !$*UTF8*$!\n${textValue(root, '')}\n`;
+}

package/src/utils/pullDockerImage.js

@@ -8,7 +8,11 @@ const table = createRequire(import.meta.url)('../assets/toolchain-digests.json')
 const REGISTRY = table.registry;
 const IMAGE_VERSION = table.version;
 const OVERRIDE_KEYS = {
-    web: 'CROSSBIND_IMAGE_WEB', android: 'CROSSBIND_IMAGE_ANDROID', linux: 'CROSSBIND_IMAGE_LINUX', windows: 'CROSSBIND_IMAGE_WINDOWS',
+    web: 'CROSSBIND_IMAGE_WEB',
+    android: 'CROSSBIND_IMAGE_ANDROID',
+    'android-app': 'CROSSBIND_IMAGE_ANDROID_APP',
+    linux: 'CROSSBIND_IMAGE_LINUX',
+    windows: 'CROSSBIND_IMAGE_WINDOWS',
 };
 const IMAGES = Object.fromEntries(
     Object.keys(OVERRIDE_KEYS).map((role) => [
@@ -21,9 +25,11 @@ const IMAGES = Object.fromEntries(
 );
 
 // Which image a target compiles in: wasm and wasi share the web image, linux and linuxmusl the linux
-// image, ios and darwin never reach docker.
+// image, ios and darwin never reach docker. An Android app builds in android-app, the android image with
+// what packages the app.
 export function imageRoleFor(target) {
-    if (target?.platform === 'android' || target?.platform === 'linux') return target.platform;
+    if (target?.platform === 'android') return target.runtimeEnv === 'app' ? 'android-app' : 'android';
+    if (target?.platform === 'linux') return 'linux';
     if (target?.platform === 'linuxmusl') return 'linux';
     if (target?.platform === 'win32') return 'windows';
     return 'web';

package/src/utils/replaceBasePathForDocker.js

@@ -1,5 +1,13 @@
+import path from 'node:path';
+
 export const DOCKER_BASE = '/tmp/crossbind/live';
 
+// Whether a container, which sees the project's base alone, sees dir.
+export function isUnderBase(dir, basePath) {
+    const relative = path.relative(basePath, path.resolve(dir));
+    return !/^\.\.(?:[\\/]|$)/.test(relative) && !path.isAbsolute(relative);
+}
+
 export default function replaceBasePathForDocker(data, basePath) {
     if (typeof data === 'string' || data instanceof String) {
         return data.replaceAll(basePath, DOCKER_BASE);

package/src/utils/resolveAppHost.js

@@ -0,0 +1,21 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import createCompanionResolver from './resolveCompanionPackage.js';
+
+const PKG = '@crossbind/core-app-host';
+
+const resolveAppHostRoot = createCompanionResolver({
+    pkg: PKG,
+    siblingDir: 'app-host',
+    siblingMarker: 'cpp/src/main.cpp',
+    missingMessage: `crossbind: apps need ${PKG} - add it to your devDependencies.`,
+});
+
+export default resolveAppHostRoot;
+
+// The embind runtime ships in @crossbind/core-embind-jsi, a dependency of the app host package.
+export function resolveAppEmbindJsiRoot() {
+    const req = createRequire(path.join(resolveAppHostRoot(), 'package.json'));
+    return path.dirname(fs.realpathSync(req.resolve('@crossbind/core-embind-jsi/package.json')));
+}

package/src/utils/selectRunner.js

@@ -7,7 +7,7 @@ const SYSTEM_CONFIG = '~/.crossbind.json';
 const SHARED = { key: 'REMOTE_URL', url: 'CROSSBIND_REMOTE_URL', token: 'CROSSBIND_TOKEN' };
 
 export const remoteVariables = (role) => {
-    const suffix = `_${role.toUpperCase()}`;
+    const suffix = `_${role.toUpperCase().replaceAll('-', '_')}`;
     return { key: `${SHARED.key}${suffix}`, url: `${SHARED.url}${suffix}`, token: `${SHARED.token}${suffix}` };
 };
 

package/src/utils/systemKeys.js

@@ -48,6 +48,10 @@ const systemKeys = {
         description: 'Image reference used for android builds instead of the pinned one. A reference without the release digest disables the reproducibility guarantee. The CROSSBIND_IMAGE_ANDROID environment variable overrides it.',
         default: '',
     },
+    DOCKER_IMAGE_ANDROID_APP: {
+        description: 'Image reference used for Android apps instead of the pinned one. A reference without the release digest disables the reproducibility guarantee. The CROSSBIND_IMAGE_ANDROID_APP environment variable overrides it.',
+        default: '',
+    },
     DOCKER_IMAGE_LINUX: {
         description: 'Image reference used for linux (Node.js addon) builds instead of the pinned one. A reference without the release digest disables the reproducibility guarantee. The CROSSBIND_IMAGE_LINUX environment variable overrides it.',
         default: '',

package/src/utils/targets.js

@@ -148,12 +148,17 @@ const BASE_TARGETS = [
     },
 ];
 
-// A native executable links the same archives as the Node-API addon of its platform and arch.
+// A native executable links the same archives as the Node-API addon of its platform and arch, and so does an app's
+// host on macOS, glibc Linux and Windows. An iOS or Android app links the archives React Native does, one target per
+// SDK or ABI.
 export const TARGETS = [
     ...BASE_TARGETS,
     ...BASE_TARGETS
         .filter((target) => target.runtimeEnv === 'node' && target.platform !== 'wasm')
         .map((target) => ({ ...target, runtimeEnv: 'native' })),
+    ...BASE_TARGETS
+        .filter((target) => (target.runtimeEnv === 'node' && ['darwin', 'linux', 'win32'].includes(target.platform)) || ['ios', 'android'].includes(target.platform))
+        .map((target) => ({ ...target, runtimeEnv: 'app' })),
 ];
 
 // Built only when named with -p: a plain `crossbind build` keeps producing what it did before
@@ -163,8 +168,8 @@ export const OPT_IN_PLATFORMS = ['darwin', 'linux', 'linuxmusl', 'win32'];
 // Built on the host itself: Apple's linker and SDKs exist in no toolchain image.
 export const HOST_BUILT_PLATFORMS = ['ios', 'darwin'];
 
-// The runtime environment names the binary a build makes; android and ios have none, since
-// React Native links them.
+// The runtime environment names the binary a build makes; on android and ios React Native links
+// the archives, and the app is the one binary.
 export const runtimeEnvsOf = (platform) => [
     ...new Set(TARGETS.filter((target) => target.platform === platform && target.runtimeEnv).map((target) => target.runtimeEnv)),
 ];
@@ -203,6 +208,17 @@ export const wasiNamesOf = (target, projectName) => ({
     wasmName: `${projectName}-${targetPathOf(target)}${target.runtimeEnv === 'http' ? '.http' : ''}.wasm`,
 });
 
+// One app per platform, arch and build type, and one page runtime per build type for all of them. A macOS app is a
+// bundle; a Linux app a directory; an iOS or Android one what its SDK or ABI brings to the app's Xcode or Gradle
+// project.
+export function appNamesOf(target, projectName) {
+    const suffix = target.buildType === 'debug' ? '.debug' : '';
+    return {
+        appName: `${projectName}.${target.platform}-${target.arch}${suffix}${target.platform === 'darwin' ? '.app' : ''}`,
+        appJsName: `${projectName}.app${suffix}.js`,
+    };
+}
+
 // One executable per platform, arch and build type, named like the addons it replaces.
 export function nativeCommandNamesOf(target, projectName) {
     const suffix = target.buildType === 'debug' ? '.debug' : '';

package/src/utils/writeIfChanged.js

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 
 export default function writeIfChanged(file, content) {
-    if (fs.existsSync(file) && fs.readFileSync(file, 'utf8') === content) return;
+    if (fs.existsSync(file) && fs.readFileSync(file).equals(Buffer.from(content))) return;
     fs.mkdirSync(path.dirname(file), { recursive: true });
     fs.writeFileSync(file, content);
 }

package/vitest.config.js

@@ -1,6 +1,11 @@
+import { fileURLToPath } from 'node:url';
 import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
+    // The app host package's scripts import crossbind's runtime modules the way buildApp bundles them.
+    resolve: {
+        alias: [{ find: /^crossbind\/runtime\//, replacement: fileURLToPath(new URL('./src/assets/js-runtime/', import.meta.url)) }],
+    },
     // loadJs/loadConfig dynamically import config files written to os.tmpdir()
     // during tests. Vite 6 tightened server.fs.allow and rejects those out-of-root
     // paths ("Does the file exist?"); relax the fs check for the test runner.
@@ -22,6 +27,20 @@ export default defineConfig({
             CROSSBIND_REMOTE_URL_LINUX: '',
             CROSSBIND_REMOTE_URL_WINDOWS: '',
             CROSSBIND_CLOUD_URL: 'http://127.0.0.1:9',
+            // Nor their signing keys: a macOS app here is signed ad hoc, and a Windows app not at all, unless a test names
+            // a key.
+            CROSSBIND_APPLE_SIGNING_IDENTITY: '',
+            CROSSBIND_APPLE_API_KEY: '',
+            CROSSBIND_APPLE_API_KEY_ID: '',
+            CROSSBIND_APPLE_API_ISSUER: '',
+            CROSSBIND_WINDOWS_SIGNING_STORETYPE: '',
+            CROSSBIND_WINDOWS_SIGNING_KEYSTORE: '',
+            CROSSBIND_WINDOWS_SIGNING_ALIAS: '',
+            CROSSBIND_WINDOWS_SIGNING_STOREPASS: '',
+            CROSSBIND_WINDOWS_SIGNING_KEYPASS: '',
+            CROSSBIND_WINDOWS_SIGNING_CERTFILE: '',
+            CROSSBIND_WINDOWS_SIGNING_TSAURL: '',
+            CROSSBIND_UPDATER_PRIVATE_KEY: '',
         },
         coverage: {
             provider: 'v8',