specrails-hub 1.61.1 → 1.61.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "specrails-hub",
-  "version": "1.61.1",
+  "version": "1.61.2",
   "license": "MIT",
   "repository": {
     "type": "git",

package/server/dist/chromium-resolver.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundledChromiumCandidates = bundledChromiumCandidates;
+exports.discoverChromiumExecutable = discoverChromiumExecutable;
 exports.resolveBundledChromiumPath = resolveBundledChromiumPath;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -11,23 +11,20 @@ const path_1 = __importDefault(require("path"));
  * Resolve the Chromium executable the browser-capture feature should launch.
  *
  * Mirrors the bundled-runtime resolution used by `path-resolver.ts` for node/git:
- * in desktop mode (`SPECRAILS_IS_DESKTOP=1`) we existence-gate a bundled Chromium
- * shipped under `<runtimes>/chromium/` (declared in tauri.conf.json via the
- * `runtimes/**` glob, codesigned in CI before `tauri build`). When the bundled
- * binary is absent (dev, a runtimes-less build, or a partial extraction) we return
- * `null` so Playwright falls back to its own managed Chromium download — never
- * dead-ending the feature.
+ * in desktop mode (`SPECRAILS_IS_DESKTOP=1`) we DISCOVER a bundled Chromium shipped
+ * under `<runtimes>/chromium/` (declared in tauri.conf.json via the `runtimes/**`
+ * glob, codesigned in CI before `tauri build`). When no bundle is present (dev, a
+ * runtimes-less build, or a partial extraction) we return `null` so Playwright
+ * falls back to its own managed browser — never dead-ending the feature.
  *
- * Layout (matches the CI assembly + smoke test):
- *   macOS/Linux: runtimes/chromium/chrome-<plat>/Chromium.app/Contents/MacOS/Chromium
- *                or runtimes/chromium/bin/chromium
- *   Windows:     runtimes/chromium/chrome-win/chrome.exe
- *                or runtimes/chromium/bin/chromium.exe
- *
- * Multiple candidate paths are probed so the exact Playwright tarball layout
- * (which nests under chrome-<platform>/) and a flattened bin/ layout both work.
+ * We DISCOVER rather than hard-code the path because Playwright's layout changes
+ * across versions (e.g. `chrome-mac/Chromium.app` → `chrome-mac-arm64/Google Chrome
+ * for Testing.app`, `chrome-win/chrome.exe`, `chrome-linux/chrome`). The CI assembly
+ * copies Playwright's platform folder verbatim under `<runtimes>/chromium/`; this
+ * walks that tree to find the real executable.
  */
-function fileExists(p) {
+const MAX_DEPTH = 6;
+function isFile(p) {
     try {
         return fs_1.default.statSync(p).isFile();
     }
@@ -35,28 +32,81 @@ function fileExists(p) {
         return false;
     }
 }
-function bundledChromiumCandidates(runtimesPath) {
-    const root = path_1.default.join(runtimesPath, 'chromium');
+/** Depth-bounded search for the first file whose basename satisfies `match`. */
+function findFirstFile(root, match, depth = 0) {
+    if (depth > MAX_DEPTH)
+        return null;
+    let entries;
+    try {
+        entries = fs_1.default.readdirSync(root, { withFileTypes: true });
+    }
+    catch {
+        return null;
+    }
+    // Files first (cheap), then recurse into dirs.
+    for (const e of entries) {
+        if (e.isFile() && match(e.name))
+            return path_1.default.join(root, e.name);
+    }
+    for (const e of entries) {
+        if (e.isDirectory()) {
+            const hit = findFirstFile(path_1.default.join(root, e.name), match, depth + 1);
+            if (hit)
+                return hit;
+        }
+    }
+    return null;
+}
+/** On macOS: locate the main executable inside the first `*.app` under `root`. */
+function findMacAppExecutable(root, depth = 0) {
+    if (depth > MAX_DEPTH)
+        return null;
+    let entries;
+    try {
+        entries = fs_1.default.readdirSync(root, { withFileTypes: true });
+    }
+    catch {
+        return null;
+    }
+    for (const e of entries) {
+        if (e.isDirectory() && e.name.endsWith('.app')) {
+            const macosDir = path_1.default.join(root, e.name, 'Contents', 'MacOS');
+            // The main binary is conventionally named like the app (sans ".app");
+            // fall back to the first regular file in MacOS/.
+            const preferred = path_1.default.join(macosDir, e.name.slice(0, -'.app'.length));
+            if (isFile(preferred))
+                return preferred;
+            try {
+                for (const inner of fs_1.default.readdirSync(macosDir, { withFileTypes: true })) {
+                    if (inner.isFile())
+                        return path_1.default.join(macosDir, inner.name);
+                }
+            }
+            catch { /* keep searching */ }
+        }
+    }
+    for (const e of entries) {
+        if (e.isDirectory() && !e.name.endsWith('.app')) {
+            const hit = findMacAppExecutable(path_1.default.join(root, e.name), depth + 1);
+            if (hit)
+                return hit;
+        }
+    }
+    return null;
+}
+/** Find the bundled Chromium executable under `<chromiumRoot>`, or null. */
+function discoverChromiumExecutable(chromiumRoot) {
+    if (!fs_1.default.existsSync(chromiumRoot))
+        return null;
     if (process.platform === 'win32') {
-        return [
-            path_1.default.join(root, 'bin', 'chromium.exe'),
-            path_1.default.join(root, 'chrome-win', 'chrome.exe'),
-            path_1.default.join(root, 'chrome.exe'),
-        ];
+        return findFirstFile(chromiumRoot, (n) => n === 'chrome.exe' || n === 'chromium.exe');
     }
     if (process.platform === 'darwin') {
-        return [
-            path_1.default.join(root, 'bin', 'chromium'),
-            path_1.default.join(root, 'chrome-mac', 'Chromium.app', 'Contents', 'MacOS', 'Chromium'),
-            path_1.default.join(root, 'Chromium.app', 'Contents', 'MacOS', 'Chromium'),
-        ];
+        return (findMacAppExecutable(chromiumRoot) ??
+            findFirstFile(chromiumRoot, (n) => n === 'Chromium' || n === 'chromium' || n === 'chrome'));
     }
     // linux
-    return [
-        path_1.default.join(root, 'bin', 'chromium'),
-        path_1.default.join(root, 'chrome-linux', 'chrome'),
-        path_1.default.join(root, 'chrome'),
-    ];
+    return findFirstFile(chromiumRoot, (n) => n === 'chrome' || n === 'chromium' || n === 'chrome-wrapper');
 }
 /**
  * Returns the absolute path to the bundled Chromium binary, or `null` when no
@@ -68,9 +118,10 @@ function resolveBundledChromiumPath() {
     const runtimesPath = process.env.SPECRAILS_BUNDLED_RUNTIMES_PATH;
     if (!runtimesPath)
         return null;
-    for (const candidate of bundledChromiumCandidates(runtimesPath)) {
-        if (fileExists(candidate))
-            return candidate;
+    try {
+        return discoverChromiumExecutable(path_1.default.join(runtimesPath, 'chromium'));
+    }
+    catch {
+        return null;
     }
-    return null;
 }