capiumbrowser 1.1.2 → 1.1.4

package/lib/download.js

@@ -106,6 +106,17 @@ function destRoot() {
   return process.env.CAPIUM_HOME || path.join(os.homedir(), '.capium');
 }
 
+/**
+ * True if `binPath` lives under the canonical install root (~/.capium or CAPIUM_HOME). A
+ * same-version binary found OUTSIDE it (a legacy install elsewhere) is NOT reused -- we reinstall
+ * into the root so everything lands under one folder next to the license.
+ */
+function inRoot(binPath, root) {
+  const d = path.resolve(path.dirname(binPath));
+  const r = path.resolve(root);
+  return d === r || d.startsWith(r + path.sep);
+}
+
 /**
  * Extract a distro archive, sniffing gzip/zip/tar so the server can ship any of them.
  *
@@ -334,12 +345,13 @@ async function ensureBinary({ version = null, licenseKey = null, server = null }
   else revision = binaryRevisionFor(tag);
   const bid = buildId(version, revision);
 
-  // Reuse the cached binary ONLY if it's already this exact build (version + revision). A
-  // different build -- e.g. after `npm install capiumbrowser@latest` bumps this OS's pinned build
-  // or re-spin -- falls through to fetch the new one and drop the old.
+  // Reuse the cached binary ONLY if it's already this exact build (version + revision) AND it
+  // lives in the canonical root (~/.capium or CAPIUM_HOME). A different build -- or a same-build
+  // binary in a LEGACY location -- falls through so we (re)install into ~/.capium, keeping the
+  // browser under one folder next to the license.
   try {
     const existing = config.findBinary();
-    if (readInstalledVersion(existing) === bid) return existing;
+    if (readInstalledVersion(existing) === bid && inRoot(existing, destRoot())) return existing;
   } catch {}
 
   let url;
@@ -407,6 +419,7 @@ module.exports = {
   downloadTag,
   distroPath,
   destRoot,
+  inRoot,
   ensureBinary,
   installedVersion,
   expectedBuildId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capiumbrowser",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Drop-in stealth browser SDK on top of Playwright or Puppeteer (Capium Chromium).",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Capzy (https://capzy.ai)",

package/playwright.js

@@ -20,6 +20,7 @@
  */
 'use strict';
 
+const path = require('path');
 const config = require('./lib/config');
 const download = require('./lib/download');
 const human = require('./lib/human');
@@ -50,11 +51,19 @@ async function resolveBinary(binary, licenseKey) {
   const want = download.expectedBuildId();
   try {
     const found = config.findBinary();
+    if (want === null) return found; // can't determine target (unsupported/manifest) -- trust it
     const have = download.installedVersion(found);
-    if (want === null || have === want) return found;
-    process.stderr.write(
-      `capium: ignoring stale binary at ${found} (build ${have}; current target ${want}) and ` +
-        `fetching the current build. Delete it or set CAPIUM_BINARY to silence this.\n`);
+    const atRoot = download.inRoot(found, download.destRoot());
+    if (have === want && atRoot) return found;
+    if (have === want && !atRoot) {
+      process.stderr.write(
+        `capium: moving the browser out of ${path.dirname(found)} into ~/.capium (the shared ` +
+          `capium home). Set CAPIUM_BINARY to pin a location.\n`);
+    } else {
+      process.stderr.write(
+        `capium: ignoring stale binary at ${found} (build ${have}; current target ${want}) and ` +
+          `fetching the current build. Delete it or set CAPIUM_BINARY to silence this.\n`);
+    }
   } catch (e) {
     if (e.code !== 'ENOENT') throw e;
   }

package/puppeteer.js

@@ -24,6 +24,7 @@
  */
 'use strict';
 
+const path = require('path');
 const config = require('./lib/config');
 const download = require('./lib/download');
 const human = require('./lib/human');
@@ -53,11 +54,19 @@ async function resolveBinary(binary, licenseKey) {
   const want = download.expectedBuildId();
   try {
     const found = config.findBinary();
+    if (want === null) return found; // can't determine target (unsupported/manifest) -- trust it
     const have = download.installedVersion(found);
-    if (want === null || have === want) return found;
-    process.stderr.write(
-      `capium: ignoring stale binary at ${found} (build ${have}; current target ${want}) and ` +
-        `fetching the current build. Delete it or set CAPIUM_BINARY to silence this.\n`);
+    const atRoot = download.inRoot(found, download.destRoot());
+    if (have === want && atRoot) return found;
+    if (have === want && !atRoot) {
+      process.stderr.write(
+        `capium: moving the browser out of ${path.dirname(found)} into ~/.capium (the shared ` +
+          `capium home). Set CAPIUM_BINARY to pin a location.\n`);
+    } else {
+      process.stderr.write(
+        `capium: ignoring stale binary at ${found} (build ${have}; current target ${want}) and ` +
+          `fetching the current build. Delete it or set CAPIUM_BINARY to silence this.\n`);
+    }
   } catch (e) {
     if (e.code !== 'ENOENT') throw e;
   }