brosh 0.1.2 → 0.1.4

package/packages/desktop-electron/package.json

@@ -12,19 +12,22 @@
   "main": "dist/main/index.js",
   "type": "module",
   "scripts": {
-    "dev": "ELECTRON_DEV=true npm run build:main && concurrently \"npm run watch:main\" \"npm run watch:renderer\" \"ELECTRON_DEV=true npm run electron\"",
+    "dev": "ELECTRON_DEV=true npm run build:main:dev && concurrently \"npm run watch:main\" \"npm run watch:renderer\" \"ELECTRON_DEV=true npm run electron\"",
     "build": "npm run build:main && npm run build:renderer",
-    "build:main": "tsc -p tsconfig.main.json && cp src/main/preload.cjs dist/main/",
+    "build:main": "tsc -p tsconfig.main.json --noEmit && node scripts/bundle-main.mjs",
+    "build:main:bytecode": "tsc -p tsconfig.main.json --noEmit && node scripts/bundle-main.mjs --bytecode",
+    "build:bytecode": "npm run build:main:bytecode && npm run build:renderer",
+    "build:main:dev": "tsc -p tsconfig.main.json && cp src/main/preload.cjs dist/main/",
     "build:renderer": "vite build",
     "watch:main": "tsc -p tsconfig.main.json --watch",
     "watch:renderer": "vite build --watch",
     "electron": "electron .",
     "start": "npm run build && electron .",
     "prepackage": "node scripts/prepare-sandbox-bins.js && rm -rf node_modules/brosh && mkdir -p node_modules/brosh && cp -r ../../dist ../../package.json node_modules/brosh/",
-    "package": "npm run prepackage && npm run build && electron-builder",
-    "package:mac": "npm run prepackage && npm run build && electron-builder --mac",
-    "package:win": "npm run prepackage && npm run build && electron-builder --win",
-    "package:linux": "npm run prepackage && npm run build && electron-builder --linux",
+    "package": "npm run prepackage && npm run build:bytecode && electron-builder",
+    "package:mac": "npm run prepackage && npm run build:bytecode && electron-builder --mac -c.extraMetadata.localBuild=true",
+    "package:win": "npm run prepackage && npm run build:bytecode && electron-builder --win -c.extraMetadata.localBuild=true",
+    "package:linux": "npm run prepackage && npm run build:bytecode && electron-builder --linux -c.extraMetadata.localBuild=true",
     "postpackage": "rm -rf node_modules/brosh && npm install",
     "download-models": "node scripts/download-models.js",
     "prepare-sandbox-bins": "node scripts/prepare-sandbox-bins.js",
@@ -57,6 +60,7 @@
     "@xterm/addon-webgl": "^0.18.0",
     "@xterm/xterm": "^5.5.0",
     "brosh": "file:../..",
+    "bytenode": "^1.5.7",
     "chokidar": "^5.0.0",
     "cli-highlight": "^2.1.11",
     "electron-store": "^10.0.0",
@@ -79,6 +83,7 @@
     "concurrently": "^8.2.0",
     "electron": "^33.4.11",
     "electron-builder": "^25.0.0",
+    "esbuild": "^0.25.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.0.0",
@@ -88,6 +93,7 @@
   "build": {
     "appId": "com.ellery.brosh",
     "productName": "brosh",
+    "asar": false,
     "afterPack": "./build/afterPack.cjs",
     "directories": {
       "output": "release"

package/packages/desktop-electron/scripts/bundle-main.mjs

@@ -0,0 +1,97 @@
+import { build } from "esbuild";
+import { cpSync, existsSync, writeFileSync, unlinkSync } from "fs";
+import { execFileSync } from "child_process";
+import { createRequire } from "module";
+
+const bytecode = process.argv.includes("--bytecode");
+
+if (bytecode) {
+  // Bytecode path: bundle as CJS → compile with Electron's V8 → ESM loader stub
+  await build({
+    entryPoints: ["src/main/index.ts"],
+    bundle: true,
+    outfile: "dist/main/bundle.cjs",
+    platform: "node",
+    format: "cjs",
+    target: "node20",
+    sourcemap: false,
+    // Bytecode externals differ from ESM: CJS can't require() ESM-only packages,
+    // so we inline them (electron-store, chokidar, brosh) and let esbuild convert
+    // to CJS. node-pty stays external (native addon).
+    external: [
+      "electron",
+      "electron-updater",
+      "node-pty",
+      "ws",
+      "posthog-node",
+      "@huggingface/transformers",
+      "cli-highlight",
+      "bytenode",
+    ],
+    // Convert import() → require() so no dynamic imports in bytecode (vm.Script
+    // doesn't support import() without --experimental-vm-modules).
+    supported: { "dynamic-import": false },
+  });
+
+  // Compile CJS bundle to V8 bytecode using Electron's V8
+  const require = createRequire(import.meta.url);
+  const electronPath = require("electron");
+  execFileSync(electronPath, ["scripts/bytecode-compiler.cjs", "dist/main/bundle.cjs"], {
+    env: { ...process.env, ELECTRON_RUN_AS_NODE: "1" },
+    stdio: "inherit",
+  });
+
+  // Write ESM loader stub
+  writeFileSync(
+    "dist/main/index.js",
+    [
+      `import { createRequire } from 'module';`,
+      `import v8 from 'v8';`,
+      `v8.setFlagsFromString('--no-lazy');`,
+      `v8.setFlagsFromString('--no-flush-bytecode');`,
+      `const require = createRequire(import.meta.url);`,
+      `require('bytenode');`,
+      `require('./bundle.jsc');`,
+      ``,
+    ].join("\n"),
+  );
+
+  // Clean up intermediate CJS bundle and stale sourcemap from previous ESM builds
+  unlinkSync("dist/main/bundle.cjs");
+  if (existsSync("dist/main/index.js.map")) {
+    unlinkSync("dist/main/index.js.map");
+  }
+} else {
+  // Standard ESM bundle path
+  await build({
+    entryPoints: ["src/main/index.ts"],
+    bundle: true,
+    outfile: "dist/main/index.js",
+    platform: "node",
+    format: "esm",
+    target: "node20",
+    sourcemap: true,
+    external: [
+      "electron",
+      "electron-store",
+      "electron-updater",
+      "brosh",
+      "ws",
+      "posthog-node",
+      "@huggingface/transformers",
+      "chokidar",
+      "cli-highlight",
+    ],
+    banner: {
+      js: [
+        `import { fileURLToPath as _bundled_fileURLToPath } from 'url';`,
+        `import { dirname as _bundled_dirname } from 'path';`,
+        `const __filename = _bundled_fileURLToPath(import.meta.url);`,
+        `const __dirname = _bundled_dirname(__filename);`,
+      ].join("\n"),
+    },
+  });
+}
+
+// Preload script is CJS, loaded separately by Electron — just copy it
+cpSync("src/main/preload.cjs", "dist/main/preload.cjs");

package/packages/desktop-electron/scripts/bytecode-compiler.cjs

@@ -0,0 +1,3 @@
+require("bytenode");
+const bytenode = require("bytenode");
+bytenode.compileFile(process.argv[2]);

package/website/install.sh.asc

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEX8WeGtXPO7P8xoFftW8bjWv2UfkFAmmYfkUACgkQtW8bjWv2
-Ufnt6Q//bThoYQ4xKlFvjdQArIdtYlL737WNJlmm4CT/yw4OJ3WMKo9sDzBIfowT
-WdHbblCzpDZ7E4quj2HARKcE5YtakoJGRdEKM2YAW1faIHJfSg8Ki/Ix0g5/f+d/
-F5FxKnPDUOWI3bJZqqq+cfqA8iMr/qo1RVyq+ueWnLAn2gWwLEss6FdLJfxHFNF9
-TJ/iKNDZYjxSMytO039hR6ixfIfzlnN9yyaLEWwCmST8nxcRX64Jg7aSdApeJhZq
-+bE7F7WCGewd49Y6DvLSgYLoEPBU3OlhHtzZLnyb9CJIduVpeoNJjqtHS6wnPEGu
-pT7/16bZ/BfmA/sr8Fq644lFJbtMCBYvN07DVL6dm9Q0GZHzhSR5clNZzGzyNGXw
-Fo/OVQYziGB6R0V5pHlpPIosGnQgWlWXK0EStOhK4ZDedlDyWyvHBcXWQUg+Q8hN
-/tLRgkOfgUUNf38O5KNC+IeShW3399kEGjn0ZC2rHDOZFji2i41+keVyORYOA6tt
-dVrYSIL2glQ2e+31/IZ9Qvkmj2RHbo/Ck6GMTMTG8+scsBGBd7DMby7T5JXBy0Wr
-Rxpv77VOIsH110+mU7SwcD5daQRdEqtPPD+g1MxyBZtofzHX1JqQjqgoxbJ1VXyI
-QKtbeRCggfVlkbfLD/gTmqh3sj2QUJOGIAR/5HT9QlBRuW80/D4=
-=Zl2Y
+iQIzBAABCgAdFiEEX8WeGtXPO7P8xoFftW8bjWv2UfkFAmmaIE0ACgkQtW8bjWv2
+Ufk3LBAA613qi4AgnMOlAwzKhZNiqFw0cLCRh4IZgoxdaoXiZNf6N5BkM8iRPKXV
+30qpEqp3gKAG6V319aMOE5q6jmWV0ElcJ6jpJVwfmaM2sUnFBt1fPdd/3Qfdn2oQ
+ow7NAQVs8z5dVnuNTvfC8swwRmqIGlbP2MApyC0QAf41bdQhZ7T/PaiFVYM0iHmZ
+w97WCYyGCilB2rt3rgdwz3h/lvWNb1Ss9FQfo1rzv1EtksLPvvfdYC3GAQc7K147
+Z9mimB06o3kSuTYY3jeCPPolEhdoXytf1hhT03VODYKM68Wcb5aRckJE5WdBUsEC
+MrWEerCOGlNNAkmjP67Lkd2bJdN3a6kDGHr7yNyi91GwgQSL/KBSs7rgawfmPrX5
+gg4N4bQ9neHT1mcU+pg6IO5LeX/wsLAZGzObqIUJtbIRgYZFDDYdQ2H/CFJe6Omf
+Sxb1TYNHNi562I91aOtgQ7cU+mbUv8PyoyTY5ShdUyNkzQNeqn/oii0yuVK0Jjk9
+a8MWuT9JcbBlCUCf6qbgV440dtcQkWGFagtiTAP5wMnPLnWBU+q5bspZdAMstsY7
+dKjPIb5/B3Z0bjX5Tr/OYQPO9Bxytqi5maUmdHA6lTc3qSDinrLAO56gYygZrtUt
+XqSjBYxS+dc/ePCo+rIHWKZa3+gYuMjBcWLXJWP9Eax3em8qOcM=
+=R2Pr
 -----END PGP SIGNATURE-----