@aptove/bridge 0.1.7 → 0.1.9

package/bin/bridge

@@ -1,12 +1,6 @@
 #!/usr/bin/env node
 
-/**
- * bridge - ACP bridge
- *
- * This script finds and executes the platform-specific binary.
- */
-
-const { execFileSync } = require('child_process');
+const { spawnSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
@@ -18,56 +12,46 @@ const PLATFORM_PACKAGES = {
   'win32-x64':    '@aptove/bridge-win32-x64',
 };
 
-function getBinaryPath() {
-  const platformKey = `${process.platform}-${process.arch}`;
-  const packageName = PLATFORM_PACKAGES[platformKey];
+const platformKey = `${process.platform}-${process.arch}`;
+const packageName = PLATFORM_PACKAGES[platformKey];
 
-  if (!packageName) {
-    console.error(`Unsupported platform: ${platformKey}`);
-    console.error('Supported platforms: darwin-arm64, darwin-x64, linux-arm64, linux-x64, win32-x64');
-    process.exit(1);
-  }
+if (!packageName) {
+  console.error(`bridge: unsupported platform ${platformKey}`);
+  console.error('Supported: darwin-arm64, darwin-x64, linux-arm64, linux-x64, win32-x64');
+  process.exit(1);
+}
 
-  const binaryName = process.platform === 'win32' ? 'bridge.exe' : 'bridge';
+const binaryName = process.platform === 'win32' ? 'bridge.exe' : 'bridge';
 
-  const possiblePaths = [
-    path.join(__dirname, '..', packageName, 'bin', binaryName),
-    path.join(__dirname, '..', '..', packageName, 'bin', binaryName),
-    path.join(__dirname, '..', 'node_modules', packageName, 'bin', binaryName),
-  ];
+// Both @aptove/bridge and @aptove/bridge-<platform> live under the same
+// @aptove scope directory, so the platform package is always a sibling:
+//   __dirname = .../node_modules/@aptove/bridge/bin
+//   platform  = .../node_modules/@aptove/bridge-darwin-arm64/bin/bridge
+const shortName = packageName.split('/')[1]; // e.g. "bridge-darwin-arm64"
+const siblingPath = path.join(__dirname, '..', '..', shortName, 'bin', binaryName);
 
-  for (const binaryPath of possiblePaths) {
-    if (fs.existsSync(binaryPath)) {
-      return binaryPath;
-    }
-  }
+let binaryPath = fs.existsSync(siblingPath) ? siblingPath : null;
 
+// Fallback: require.resolve handles pnpm virtual stores and other layouts
+if (!binaryPath) {
   try {
-    const packagePath = require.resolve(`${packageName}/package.json`);
-    const binaryPath = path.join(path.dirname(packagePath), 'bin', binaryName);
-    if (fs.existsSync(binaryPath)) {
-      return binaryPath;
+    const pkgJson = require.resolve(`${packageName}/package.json`);
+    const candidate = path.join(path.dirname(pkgJson), 'bin', binaryName);
+    if (fs.existsSync(candidate)) {
+      binaryPath = candidate;
     }
   } catch (e) {
-    // Package not found
+    // not found
   }
+}
 
-  console.error(`Could not find bridge binary for ${platformKey}`);
-  console.error(`Please ensure ${packageName} is installed.`);
+if (!binaryPath) {
+  console.error(`bridge: platform package not installed for ${platformKey}`);
   console.error('');
-  console.error('Try reinstalling with:');
-  console.error('  npm install -g @aptove/bridge');
+  console.error('Run:');
+  console.error(`  npm install -g ${packageName}`);
   process.exit(1);
 }
 
-const binaryPath = getBinaryPath();
-const args = process.argv.slice(2);
-
-try {
-  execFileSync(binaryPath, args, { stdio: 'inherit' });
-} catch (error) {
-  if (error.status !== undefined) {
-    process.exit(error.status);
-  }
-  throw error;
-}
+const result = spawnSync(binaryPath, process.argv.slice(2), { stdio: 'inherit' });
+process.exit(result.status ?? 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptove/bridge",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "ACP bridge — connects ACP agents to mobile and desktop clients over WebSocket",
   "license": "MIT",
   "repository": {
@@ -33,10 +33,10 @@
     "node": ">=16"
   },
   "optionalDependencies": {
-    "@aptove/bridge-darwin-arm64": "0.1.7",
-    "@aptove/bridge-darwin-x64": "0.1.7",
-    "@aptove/bridge-linux-arm64": "0.1.7",
-    "@aptove/bridge-linux-x64": "0.1.7",
-    "@aptove/bridge-win32-x64": "0.1.7"
+    "@aptove/bridge-darwin-arm64": "0.1.9",
+    "@aptove/bridge-darwin-x64": "0.1.9",
+    "@aptove/bridge-linux-arm64": "0.1.9",
+    "@aptove/bridge-linux-x64": "0.1.9",
+    "@aptove/bridge-win32-x64": "0.1.9"
   }
 }

package/postinstall.js

@@ -1,11 +1,11 @@
 /**
  * bridge postinstall script
  *
- * Verifies the correct platform-specific package was installed
- * and the binary is executable.
+ * Checks whether the platform-specific binary package was installed.
+ * npm sometimes skips optional dependencies during global installs.
+ * If so, prints the exact command to complete installation.
  */
 
-const { execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
@@ -17,44 +17,31 @@ const PLATFORM_PACKAGES = {
   'win32-x64':    '@aptove/bridge-win32-x64',
 };
 
-function main() {
-  const platformKey = `${process.platform}-${process.arch}`;
-  const packageName = PLATFORM_PACKAGES[platformKey];
+const platformKey = `${process.platform}-${process.arch}`;
+const packageName = PLATFORM_PACKAGES[platformKey];
 
-  if (!packageName) {
-    console.warn(`⚠️  bridge: Unsupported platform ${platformKey}`);
-    console.warn('   Supported platforms: darwin-arm64, darwin-x64, linux-arm64, linux-x64, win32-x64');
-    return;
-  }
-
-  try {
-    const packagePath = require.resolve(`${packageName}/package.json`);
-    const binaryName = process.platform === 'win32' ? 'bridge.exe' : 'bridge';
-    const binaryPath = path.join(path.dirname(packagePath), 'bin', binaryName);
-
-    if (!fs.existsSync(binaryPath)) {
-      console.warn(`⚠️  bridge: Binary not found at ${binaryPath}`);
-      return;
-    }
+if (!packageName) {
+  console.warn(`⚠️  bridge: unsupported platform ${platformKey}`);
+  process.exit(0);
+}
 
-    if (process.platform !== 'win32') {
-      try {
-        fs.chmodSync(binaryPath, 0o755);
-      } catch (e) {
-        // Not critical
-      }
-    }
+const binaryName = process.platform === 'win32' ? 'bridge.exe' : 'bridge';
+let installed = false;
 
-    try {
-      execSync(`"${binaryPath}" --version`, { stdio: 'pipe' });
-      console.log(`✓ bridge installed successfully for ${platformKey}`);
-    } catch (e) {
-      console.warn(`⚠️  bridge: Binary exists but failed to execute on ${platformKey}`);
-    }
-  } catch (e) {
-    console.warn(`⚠️  bridge: Platform package ${packageName} not installed`);
-    console.warn('   This is expected on CI or unsupported platforms');
-  }
+try {
+  const packageJsonPath = require.resolve(`${packageName}/package.json`);
+  const binaryPath = path.join(path.dirname(packageJsonPath), 'bin', binaryName);
+  installed = fs.existsSync(binaryPath);
+} catch (e) {
+  // package not installed
 }
 
-main();
+if (installed) {
+  console.log(`✓ bridge installed successfully for ${platformKey}`);
+} else {
+  console.log('');
+  console.log(`⚠️  bridge: platform binary not found (npm skipped optional dependency)`);
+  console.log(`   To complete installation, run:`);
+  console.log(`     npm install -g ${packageName}`);
+  console.log('');
+}