@browserbridge/bbx 1.0.0 → 1.1.0

package/packages/native-host/bin/bridge-daemon.js

@@ -1,12 +1,40 @@
 #!/usr/bin/env node
 // @ts-check
 import { BridgeDaemon } from '../src/daemon.js';
-import { getSocketPath } from '../src/config.js';
+import {
+  applyWindowsTcpTransportDefaults,
+  formatBridgeTransport,
+  getBridgeTransport,
+} from '../src/config.js';
+import { clearDaemonPidFile, writeDaemonPidFile } from '../src/daemon-process.js';
 
-const daemon = new BridgeDaemon({ socketPath: getSocketPath() });
-await daemon.start();
+applyWindowsTcpTransportDefaults();
+const transport = getBridgeTransport();
+const daemon = new BridgeDaemon({ transport });
 
-process.stdout.write(`Browser Bridge daemon listening on ${getSocketPath()}\n`);
+/**
+ * @param {unknown} error
+ * @returns {boolean}
+ */
+function isExistingDaemonError(error) {
+  return (
+    error instanceof Error && error.message.startsWith('Another daemon is already running on ')
+  );
+}
+
+try {
+  await daemon.start();
+  await writeDaemonPidFile(process.pid);
+} catch (error) {
+  if (isExistingDaemonError(error)) {
+    process.stdout.write(`${error.message}\n`);
+    process.exit(0);
+  }
+  process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+}
+
+process.stdout.write(`Browser Bridge daemon listening on ${formatBridgeTransport(transport)}\n`);
 
 let shuttingDown = false;
 
@@ -21,6 +49,7 @@ async function shutdown() {
   shuttingDown = true;
   try {
     await daemon.stop();
+    await clearDaemonPidFile({ pid: process.pid });
     process.exit(0);
   } catch (error) {
     process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
@@ -35,10 +64,14 @@ for (const signal of ['SIGINT', 'SIGTERM', 'SIGHUP']) {
 }
 
 process.on('unhandledRejection', (reason) => {
-  process.stderr.write(`Unhandled rejection: ${reason instanceof Error ? reason.stack : String(reason)}\n`);
+  process.stderr.write(
+    `Unhandled rejection: ${reason instanceof Error ? reason.stack : String(reason)}\n`
+  );
 });
 
 process.on('uncaughtException', (error) => {
-  process.stderr.write(`Uncaught exception: ${error instanceof Error ? error.stack : String(error)}\n`);
+  process.stderr.write(
+    `Uncaught exception: ${error instanceof Error ? error.stack : String(error)}\n`
+  );
   void shutdown();
 });

package/packages/native-host/bin/install-manifest.js

@@ -3,22 +3,31 @@
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-import { installNativeManifest, parseExtensionId } from '../src/install-manifest.js';
+import {
+  installNativeManifest,
+  parseExtensionId,
+  uninstallNativeManifest,
+} from '../src/install-manifest.js';
 import { SUPPORTED_BROWSERS } from '../src/config.js';
 
 /** @typedef {import('../src/config.js').SupportedBrowser} SupportedBrowser */
 
+const USAGE = 'Usage: bbx-install [<extension-id>] [--browser <browser>] [--all] [--uninstall]\n';
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(__dirname, '../../..');
 
 const args = process.argv.slice(2);
 let extensionIdArg = /** @type {string | undefined} */ (undefined);
 let installAll = false;
+let uninstall = false;
 const browsers = /** @type {SupportedBrowser[]} */ ([]);
 
 for (let i = 0; i < args.length; i++) {
   if (args[i] === '--all') {
     installAll = true;
+  } else if (args[i] === '--uninstall') {
+    uninstall = true;
   } else if (args[i] === '--browser' && args[i + 1]) {
     const candidate = args[i + 1];
     if (!SUPPORTED_BROWSERS.includes(/** @type {SupportedBrowser} */ (candidate))) {
@@ -34,10 +43,15 @@ for (let i = 0; i < args.length; i++) {
   }
 }
 
+if (uninstall && extensionIdArg) {
+  process.stderr.write(USAGE);
+  process.exit(1);
+}
+
 if (extensionIdArg && !parseExtensionId(extensionIdArg)) {
   process.stderr.write(
     `Invalid extension ID: ${extensionIdArg}\n` +
-    'Expected 32 lowercase letters (e.g. abcdefghijklmnopabcdefghijklmnop)\n'
+      'Expected 32 lowercase letters (e.g. abcdefghijklmnopabcdefghijklmnop)\n'
   );
   process.exit(1);
 }
@@ -48,10 +62,18 @@ const targets = installAll
     ? browsers
     : [/** @type {SupportedBrowser} */ ('chrome')];
 
-for (const target of targets) {
+for (const [index, target] of targets.entries()) {
+  if (uninstall) {
+    await uninstallNativeManifest({
+      browser: target,
+      removeBridgeDir: index === targets.length - 1,
+    });
+    continue;
+  }
+
   await installNativeManifest({
     repoRoot,
     extensionIdArg,
-    browser: target
+    browser: target,
   });
 }

package/packages/native-host/bin/postinstall.js

@@ -16,10 +16,12 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(__dirname, '../../..');
 
 try {
-  await installNativeManifest({ repoRoot });
+  await installNativeManifest({ repoRoot, preserveCustomExtensionId: true });
   process.stdout.write('Browser Bridge: native host installed. Run `bbx doctor` to verify.\n');
 } catch (err) {
   // Non-fatal - user can run `bbx install` manually.
   const message = err instanceof Error ? err.message : String(err);
-  process.stderr.write(`Browser Bridge: native host auto-install skipped (${message}).\nRun \`bbx install\` manually if needed.\n`);
+  process.stderr.write(
+    `Browser Bridge: native host auto-install skipped (${message}).\nRun \`bbx install\` manually if needed.\n`
+  );
 }

package/packages/native-host/src/config.js

@@ -5,6 +5,10 @@ import path from 'node:path';
 
 export const APP_NAME = 'com.browserbridge.browser_bridge';
 export const BRIDGE_HOME_ENV = 'BROWSER_BRIDGE_HOME';
+export const BRIDGE_TCP_PORT_ENV = 'BBX_TCP_PORT';
+export const DEFAULT_WINDOWS_TCP_PORT = 9223;
+
+/** @typedef {{ type: 'socket', socketPath: string, label: string } | { type: 'tcp', host: string, port: number, label: string }} BridgeTransport */
 
 /**
  * The official Chrome Web Store extension ID used when callers do not provide
@@ -15,10 +19,11 @@ export const BRIDGE_HOME_ENV = 'BROWSER_BRIDGE_HOME';
 export const PUBLISHED_EXTENSION_ID = 'jjjkmmcdkpcgamlopogicbnnhdgebhie';
 
 /**
+ * @param {NodeJS.ProcessEnv} [env=process.env]
  * @returns {string}
  */
-export function getBridgeDir() {
-  const override = process.env[BRIDGE_HOME_ENV];
+export function getBridgeDir(env = process.env) {
+  const override = env[BRIDGE_HOME_ENV];
   if (override) {
     return override;
   }
@@ -31,28 +36,146 @@ export function getBridgeDir() {
   }
 
   if (platform === 'win32') {
-    const localAppData = process.env.LOCALAPPDATA || path.join(home, 'AppData', 'Local');
+    const localAppData = env.LOCALAPPDATA || path.join(home, 'AppData', 'Local');
     return path.join(localAppData, 'Browser Bridge');
   }
 
-  const xdgDataHome = process.env.XDG_DATA_HOME || path.join(home, '.local', 'share');
+  const xdgDataHome = env.XDG_DATA_HOME || path.join(home, '.local', 'share');
   return path.join(xdgDataHome, 'browser-bridge');
 }
 
 /**
+ * Resolve the IPC endpoint the daemon listens on and the CLI / native host
+ * connect to. On Windows we use a Named Pipe by default because Node's AF_UNIX
+ * support fails with EACCES on listen() under recent Node + Windows 11
+ * combinations, while Named Pipes are the historical and reliable Windows IPC
+ * mechanism. An explicit bridge-home override keeps the legacy socket path so
+ * callers can opt into custom test or compatibility setups.
+ *
+ * @param {NodeJS.ProcessEnv} [env=process.env]
+ * @returns {string}
+ */
+export function getSocketPath(env = process.env) {
+  if (os.platform() === 'win32' && !env[BRIDGE_HOME_ENV]) {
+    return `\\\\.\\pipe\\${APP_NAME}`;
+  }
+  return path.join(getBridgeDir(env), 'bridge.sock');
+}
+
+/**
+ * @param {string} socketPath
+ * @returns {BridgeTransport}
+ */
+export function createSocketBridgeTransport(socketPath) {
+  return {
+    type: 'socket',
+    socketPath,
+    label: socketPath,
+  };
+}
+
+/**
+ * @param {number} port
+ * @param {string} [host='127.0.0.1']
+ * @returns {BridgeTransport}
+ */
+export function createTcpBridgeTransport(port, host = '127.0.0.1') {
+  return {
+    type: 'tcp',
+    host,
+    port,
+    label: `${host}:${port}`,
+  };
+}
+
+/**
+ * @param {NodeJS.ProcessEnv} [env=process.env]
+ * @returns {number | null}
+ */
+export function getBridgeTcpPort(env = process.env) {
+  const raw = env[BRIDGE_TCP_PORT_ENV];
+  if (raw == null || raw === '') {
+    return null;
+  }
+
+  const port = Number.parseInt(raw, 10);
+  if (!Number.isInteger(port) || String(port) !== String(raw).trim() || port < 1 || port > 65535) {
+    throw new Error(
+      `${BRIDGE_TCP_PORT_ENV} must be an integer between 1 and 65535 (got ${JSON.stringify(raw)}).`
+    );
+  }
+
+  return port;
+}
+
+/**
+ * Align Windows CLI/daemon entrypoints with the installed native-host launcher,
+ * which uses TCP by default. Preserve explicit overrides and custom bridge-home
+ * test setups that rely on the socket transport.
+ *
+ * @param {NodeJS.ProcessEnv} [env=process.env]
+ * @returns {boolean}
+ */
+export function applyWindowsTcpTransportDefaults(env = process.env) {
+  if (os.platform() !== 'win32') {
+    return false;
+  }
+  if (env[BRIDGE_TCP_PORT_ENV] != null && env[BRIDGE_TCP_PORT_ENV] !== '') {
+    return false;
+  }
+  if (env[BRIDGE_HOME_ENV]) {
+    return false;
+  }
+
+  env[BRIDGE_TCP_PORT_ENV] = String(DEFAULT_WINDOWS_TCP_PORT);
+  return true;
+}
+
+/**
+ * @param {NodeJS.ProcessEnv} [env=process.env]
+ * @returns {BridgeTransport}
+ */
+export function getBridgeTransport(env = process.env) {
+  const tcpPort = getBridgeTcpPort(env);
+  if (tcpPort !== null) {
+    return createTcpBridgeTransport(tcpPort);
+  }
+
+  return createSocketBridgeTransport(getSocketPath(env));
+}
+
+/**
+ * @param {BridgeTransport} [transport=getBridgeTransport()]
+ * @returns {import('node:net').ListenOptions | string}
+ */
+export function getBridgeListenTarget(transport = getBridgeTransport()) {
+  if (transport.type === 'tcp') {
+    return { host: transport.host, port: transport.port };
+  }
+  return transport.socketPath;
+}
+
+/**
+ * @param {BridgeTransport} [transport=getBridgeTransport()]
+ * @returns {string}
+ */
+export function formatBridgeTransport(transport = getBridgeTransport()) {
+  return transport.label;
+}
+
+/**
+ * @param {NodeJS.ProcessEnv} [env=process.env]
  * @returns {string}
  */
-export function getSocketPath() {
-  return path.join(getBridgeDir(), 'bridge.sock');
+export function getDaemonPidPath(env = process.env) {
+  return path.join(getBridgeDir(env), 'daemon.pid');
 }
 
 /**
  * @returns {string}
  */
 export function getLauncherFilename() {
-  return os.platform() === 'win32'
-    ? 'native-host-launcher.cmd'
-    : 'native-host-launcher.sh';
+  return os.platform() === 'win32' ? 'native-host-launcher.cmd' : 'native-host-launcher.sh';
 }
 
 /**
@@ -84,7 +207,7 @@ export function getManifestInstallDir(browser = 'chrome') {
       edge: path.join(macBase, 'Microsoft Edge', 'NativeMessagingHosts'),
       brave: path.join(macBase, 'BraveSoftware', 'Brave-Browser', 'NativeMessagingHosts'),
       chromium: path.join(macBase, 'Chromium', 'NativeMessagingHosts'),
-      arc: path.join(macBase, 'Arc', 'User Data', 'NativeMessagingHosts')
+      arc: path.join(macBase, 'Arc', 'User Data', 'NativeMessagingHosts'),
     };
     return macPaths[browser] ?? macPaths.chrome;
   }
@@ -94,9 +217,15 @@ export function getManifestInstallDir(browser = 'chrome') {
     const winPaths = {
       chrome: path.join(winBase, 'Google', 'Chrome', 'User Data', 'NativeMessagingHosts'),
       edge: path.join(winBase, 'Microsoft', 'Edge', 'User Data', 'NativeMessagingHosts'),
-      brave: path.join(winBase, 'BraveSoftware', 'Brave-Browser', 'User Data', 'NativeMessagingHosts'),
+      brave: path.join(
+        winBase,
+        'BraveSoftware',
+        'Brave-Browser',
+        'User Data',
+        'NativeMessagingHosts'
+      ),
       chromium: path.join(winBase, 'Chromium', 'User Data', 'NativeMessagingHosts'),
-      arc: path.join(winBase, 'Arc', 'User Data', 'NativeMessagingHosts')
+      arc: path.join(winBase, 'Arc', 'User Data', 'NativeMessagingHosts'),
     };
     return winPaths[browser] ?? winPaths.chrome;
   }
@@ -107,7 +236,7 @@ export function getManifestInstallDir(browser = 'chrome') {
     edge: path.join(home, '.config', 'microsoft-edge', 'NativeMessagingHosts'),
     brave: path.join(home, '.config', 'BraveSoftware', 'Brave-Browser', 'NativeMessagingHosts'),
     chromium: path.join(home, '.config', 'chromium', 'NativeMessagingHosts'),
-    arc: path.join(home, '.config', 'Arc', 'User Data', 'NativeMessagingHosts')
+    arc: path.join(home, '.config', 'Arc', 'User Data', 'NativeMessagingHosts'),
   };
   return linuxPaths[browser] ?? linuxPaths.chrome;
 }