replica-bridge 0.3.3 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replica-bridge",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Lets the ChatReplica iPhone app use Codex on this computer through a relay, end-to-end encrypted.",
   "type": "module",
   "bin": {

package/src/bridge/install.js

@@ -165,11 +165,24 @@ function serviceEnv()                         {
  * The script the service runs. From npx (inside node_modules) a copy of this version is installed under
  * ~/.config/replica-bridge/app, since npm may clear its npx cache; from a working copy, the working copy itself.
  */
-function installedScript(say                        )         {
-  const current = process.argv[1] ? fs.realpathSync(process.argv[1]) : "";
-  if (!current.split(path.sep).includes("node_modules")) return current;
+export function installedScript(say                        , current = process.argv[1] ? fs.realpathSync(process.argv[1]) : "")         {
+  const parts = current.split(path.sep);
+  const at = parts.lastIndexOf("node_modules");
+  if (at < 0) return current;
   const app = path.join(bridgeHome(), "app");
-  const spec = process.env.REPLICA_BRIDGE_PACKAGE ?? `replica-bridge@${PACKAGE_VERSION}`;
+  if (!process.env.REPLICA_BRIDGE_PACKAGE) {
+    // Copy what npx already installed (this package and its dependencies) rather than asking npm again: npx may have
+    // used a registry the second npm would not (`npx --registry`, or a company feed without this package).
+    const from = parts.slice(0, at + 1).join(path.sep);
+    say(`Copying replica-bridge ${PACKAGE_VERSION} to ${app}…`);
+    const next = `${app}.${process.pid}.part`;
+    fs.rmSync(next, { recursive: true, force: true });
+    fs.cpSync(from, path.join(next, "node_modules"), { recursive: true, dereference: true });
+    fs.rmSync(app, { recursive: true, force: true });
+    fs.renameSync(next, app);
+    return path.join(app, "node_modules", ...parts.slice(at + 1));
+  }
+  const spec = process.env.REPLICA_BRIDGE_PACKAGE;
   say(`Installing ${spec} in ${app}…`);
   fs.mkdirSync(app, { recursive: true });
   // npx's own npm_* settings (a temporary prefix, for one) must not leak into this install.