@codebolt/narrative 1.12.53 → 1.12.57

package/dist/binary.d.ts

@@ -5,6 +5,7 @@
  * 1. Explicit path passed as argument
  * 2. CODEBOLT_NARRATIVE_BINARY env var
  * 3. Platform-specific npm package (@codebolt/narrative-{os}-{arch})
- * 4. PATH lookup via `which`
+ * 4. Workspace / Electron bundled binary locations
+ * 5. PATH lookup via `which`
  */
 export declare function resolveBinary(explicitPath?: string): string;

package/dist/binary.js

@@ -12,7 +12,8 @@ const BINARY_NAME = process.platform === 'win32' ? 'codebolt-narrative.exe' : 'c
  * 1. Explicit path passed as argument
  * 2. CODEBOLT_NARRATIVE_BINARY env var
  * 3. Platform-specific npm package (@codebolt/narrative-{os}-{arch})
- * 4. PATH lookup via `which`
+ * 4. Workspace / Electron bundled binary locations
+ * 5. PATH lookup via `which`
  */
 function resolveBinary(explicitPath) {
     // 1. Explicit path
@@ -35,7 +36,12 @@ function resolveBinary(explicitPath) {
     if (platformPath) {
         return platformPath;
     }
-    // 4. PATH lookup
+    // 4. Workspace / Electron bundled binary locations
+    const localPath = resolveLocalBinary();
+    if (localPath) {
+        return localPath;
+    }
+    // 5. PATH lookup
     const pathResult = resolveFromPath();
     if (pathResult) {
         return pathResult;
@@ -57,9 +63,7 @@ function resolvePlatformPackage() {
         // Binaries inside an ASAR can't be executed directly, so we rewrite the
         // path to the unpacked copy that electron-builder extracts automatically
         // when the file matches an `asarUnpack` glob.
-        if (binaryPath.includes('app.asar')) {
-            binaryPath = binaryPath.replace('app.asar', 'app.asar.unpacked');
-        }
+        binaryPath = normalizeAsarPath(binaryPath);
         if ((0, fs_1.existsSync)(binaryPath)) {
             return binaryPath;
         }
@@ -69,6 +73,54 @@ function resolvePlatformPackage() {
     }
     return null;
 }
+function resolveLocalBinary() {
+    const platformKey = `${process.platform}-${process.arch}`;
+    const platformPackage = `@codebolt/narrative-${platformKey}`;
+    const candidates = [];
+    for (const root of collectSearchRoots()) {
+        candidates.push((0, path_1.join)(root, 'node_modules', platformPackage, 'bin', BINARY_NAME), (0, path_1.join)(root, 'packages', 'codeboltNarrative', 'npm', platformKey, 'bin', BINARY_NAME), (0, path_1.join)(root, 'codeboltNarrative', 'npm', platformKey, 'bin', BINARY_NAME));
+    }
+    for (const candidate of Array.from(new Set(candidates.map(normalizeAsarPath)))) {
+        if ((0, fs_1.existsSync)(candidate)) {
+            return candidate;
+        }
+    }
+    return null;
+}
+function collectSearchRoots() {
+    const roots = [];
+    const addRoot = (root) => {
+        if (root)
+            roots.push(root);
+    };
+    addRoot(__dirname);
+    addRoot(process.cwd());
+    addRoot(require.main?.filename ? (0, path_1.dirname)(require.main.filename) : undefined);
+    const resourcesPath = process.resourcesPath;
+    if (resourcesPath) {
+        addRoot(resourcesPath);
+        addRoot((0, path_1.join)(resourcesPath, 'app'));
+        addRoot((0, path_1.join)(resourcesPath, 'app.asar'));
+        addRoot((0, path_1.join)(resourcesPath, 'app.asar.unpacked'));
+    }
+    const parentRoots = [];
+    for (const root of roots) {
+        let current = normalizeAsarPath(root);
+        for (let i = 0; i < 10; i += 1) {
+            parentRoots.push(current);
+            const parent = (0, path_1.dirname)(current);
+            if (parent === current)
+                break;
+            current = parent;
+        }
+    }
+    return Array.from(new Set(parentRoots));
+}
+function normalizeAsarPath(pathValue) {
+    return pathValue.includes('app.asar') && !pathValue.includes('app.asar.unpacked')
+        ? pathValue.replace('app.asar', 'app.asar.unpacked')
+        : pathValue;
+}
 function resolveFromPath() {
     try {
         const cmd = process.platform === 'win32' ? 'where' : 'which';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebolt/narrative",
-  "version": "1.12.53",
+  "version": "1.12.57",
   "description": "TypeScript client for the Codebolt Narrative Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,11 +17,11 @@
     "dist/**/*"
   ],
   "optionalDependencies": {
-    "@codebolt/narrative-darwin-arm64": "1.12.53",
-    "@codebolt/narrative-darwin-x64": "1.12.53",
-    "@codebolt/narrative-linux-x64": "1.12.53",
-    "@codebolt/narrative-linux-arm64": "1.12.53",
-    "@codebolt/narrative-win32-x64": "1.12.53"
+    "@codebolt/narrative-darwin-arm64": "1.12.57",
+    "@codebolt/narrative-darwin-x64": "1.12.57",
+    "@codebolt/narrative-linux-x64": "1.12.57",
+    "@codebolt/narrative-linux-arm64": "1.12.57",
+    "@codebolt/narrative-win32-x64": "1.12.57"
   },
   "license": "MIT"
 }