Integate CLI build into the real app build itself

Previously it was run manually only, and was Linux only - should now
work cross-platform (in theory).

Author: pimterry

build-setup/build-cli.ts

@@ -1,9 +1,10 @@
-import { execFileSync, execSync } from 'child_process';
+import { execFileSync } from 'child_process';
+import { copyFileSync } from 'fs';
 
 const SEA_CONFIG = 'src/cli/sea-config.json';
-const CLI_BINARY = 'httptoolkit-cli';
 const SEA_BLOB = 'build/cli/cli.blob';
 const SENTINEL_FUSE = 'NODE_SEA_FUSE_fce680ab2cc467b6e072b8b5df1996b2';
+const CLI_BINARY = 'httptoolkit-cli' + (process.platform === 'win32' ? '.exe' : '');
 
 // Generate the single-executable-application blob from the compiled CLI JS:
 console.log('Generating SEA blob...');
@@ -13,17 +14,30 @@ execFileSync(process.execPath, ['--experimental-sea-config', SEA_CONFIG], {
 
 // Copy the current Node binary to use as the CLI executable:
 console.log('Copying node binary...');
-const nodePath = execSync('which node', { encoding: 'utf8' }).trim();
-execFileSync('cp', [nodePath, CLI_BINARY]);
+copyFileSync(process.execPath, CLI_BINARY);
+
+// On macOS, remove the ad-hoc signature before injection:
+if (process.platform === 'darwin') {
+    console.log('Removing macOS ad-hoc signature...');
+    execFileSync('codesign', ['--remove-signature', CLI_BINARY]);
+}
 
 // Inject the SEA blob into the copied binary:
 console.log('Injecting SEA blob...');
-execFileSync('npx', [
+const postjectArgs = [
     'postject', CLI_BINARY,
     'NODE_SEA_BLOB', SEA_BLOB,
     '--sentinel-fuse', SENTINEL_FUSE
-], {
-    stdio: 'inherit'
-});
+];
+if (process.platform === 'darwin') {
+    postjectArgs.push('--macho-segment-name', 'NODE_SEA');
+}
+execFileSync('npx', postjectArgs, { stdio: 'inherit' });
+
+// On macOS, re-apply an ad-hoc signature so the binary is valid:
+if (process.platform === 'darwin') {
+    console.log('Re-signing macOS binary...');
+    execFileSync('codesign', ['--sign', '-', CLI_BINARY]);
+}
 
 console.log('CLI build completed.');

package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
     "server:setup": "tsx ./build-setup/setup-server.ts",
-    "build": "npm run build:src && npm run build:electron",
+    "build": "npm run build:src && npm run build:cli && npm run build:electron",
     "build:src": "tsc",
     "postbuild:src": "tsx ./build-setup/strip-preload-map.ts",
     "build:electron": "npm run server:setup && electron-builder build --config ./build-setup/electron-builder.config.cjs",
@@ -61,7 +61,7 @@
     ],
     "extraResources": [
       "httptoolkit-server/**/*",
-      "httptoolkit-cli"
+      "httptoolkit-cli{,.*}"
     ],
     "artifactName": "HttpToolkit-${version}-${arch}.${ext}",
     "mac": {
@@ -172,6 +172,7 @@
     "targz": "^1.0.1",
     "tsc-watch": "^4.2.9",
     "tsx": "^4.16.2",
+    "postject": "1.0.0-alpha.6",
     "typescript": "~5.9"
   },
   "engines": {