@vibelet/cli 1.0.13 → 1.0.14

package/dist/runtime-version.cjs

@@ -1,2 +1,2 @@
-var s=require("node:fs"),n=require("node:path"),c="@vibelet/cli";function a(e){try{let r=JSON.parse((0,s.readFileSync)(e,"utf8"));if(r.name===c&&typeof r.version=="string"&&r.version.length>0)return r.version}catch{}return null}function p(){return"1.0.13"}var i=p();process.stdout.write(`${i}
+var s=require("node:fs"),n=require("node:path"),c="@vibelet/cli";function a(e){try{let r=JSON.parse((0,s.readFileSync)(e,"utf8"));if(r.name===c&&typeof r.version=="string"&&r.version.length>0)return r.version}catch{}return null}function p(){return"1.0.14"}var i=p();process.stdout.write(`${i}
 `);

package/dist/vibelet.mjs

@@ -6255,7 +6255,7 @@ __nccwpck_require__.d(__webpack_exports__, {
   Wo: () => (/* binding */ resolveCloudflaredLaunchSpec)
 });
 
-// UNUSED EXPORTS: findExecutableInPath, resolveInstalledCloudflaredCliPath, summarizeCloudflaredLog
+// UNUSED EXPORTS: findExecutableInPath, findExecutablesInPath, resolveInstalledCloudflaredCliPath, summarizeCloudflaredLog
 
 ;// CONCATENATED MODULE: external "node:module"
 const external_node_module_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:module");
@@ -6271,6 +6271,7 @@ var external_node_path_ = __nccwpck_require__(6760);
 const npmFallbackCommand = process.platform === 'win32' ? 'npx.cmd' : 'npx';
 const npmFallbackArgs = ['--yes', '--package=cloudflared', 'cloudflared'];
 const npmFallbackDescription = `npx ${npmFallbackArgs.join(' ')}`;
+const defaultUrlTimeoutMs = 90_000;
 const cloudflared_resolver_require = (0,external_node_module_namespaceObject.createRequire)(import.meta.url);
 
 function defaultResolveCloudflaredPackageJsonPath() {
@@ -6295,23 +6296,35 @@ function getExecutableCandidates(name, pathExtValue = process.env.PATHEXT ?? '')
   return [name, ...extensions.map((entry) => `${name}${entry}`)];
 }
 
-function findExecutableInPath(name, {
+function findExecutablesInPath(name, {
   pathValue = process.env.PATH ?? '',
   pathExtValue = process.env.PATHEXT ?? '',
 } = {}) {
-  if (!pathValue) return null;
+  if (!pathValue) return [];
+
+  const results = [];
 
   for (const dir of pathValue.split(external_node_path_.delimiter)) {
     if (!dir) continue;
     for (const candidate of getExecutableCandidates(name, pathExtValue)) {
       const candidatePath = (0,external_node_path_.join)(dir, candidate);
       if ((0,external_node_fs_.existsSync)(candidatePath)) {
-        return candidatePath;
+        results.push(candidatePath);
+        break;
       }
     }
   }
 
-  return null;
+  return results;
+}
+
+function findExecutableInPath(name, options = {}) {
+  return findExecutablesInPath(name, options)[0] ?? null;
+}
+
+function isNodeModulesBinPath(candidatePath) {
+  return typeof candidatePath === 'string'
+    && /(?:^|[\\/])node_modules[\\/]\.bin(?:[\\/]|$)/u.test(candidatePath);
 }
 
 function resolveInstalledCloudflaredCliPath({
@@ -6351,14 +6364,17 @@ function resolveCloudflaredLaunchSpec({
   pathExtValue = process.env.PATHEXT ?? '',
   resolvePackageJsonPath,
 } = {}) {
-  const directPath = findExecutableInPath('cloudflared', { pathValue, pathExtValue });
+  const directPathCandidates = findExecutablesInPath('cloudflared', { pathValue, pathExtValue });
+  const directPath = directPathCandidates.find((candidatePath) => !isNodeModulesBinPath(candidatePath))
+    ?? directPathCandidates[0]
+    ?? null;
   if (directPath) {
     return {
       command: directPath,
       args: [],
       source: 'path',
       description: directPath,
-      urlTimeoutMs: 30_000,
+      urlTimeoutMs: defaultUrlTimeoutMs,
     };
   }
 
@@ -6369,7 +6385,7 @@ function resolveCloudflaredLaunchSpec({
       args: [dependencyCliPath],
       source: 'dependency',
       description: dependencyCliPath,
-      urlTimeoutMs: 90_000,
+      urlTimeoutMs: defaultUrlTimeoutMs,
     };
   }
 
@@ -6378,7 +6394,7 @@ function resolveCloudflaredLaunchSpec({
     args: [...npmFallbackArgs],
     source: 'npm',
     description: npmFallbackDescription,
-    urlTimeoutMs: 90_000,
+    urlTimeoutMs: defaultUrlTimeoutMs,
   };
 }
 
@@ -7674,14 +7690,27 @@ function startTunnel() {
       stdio: ['ignore', logFd, logFd],
     });
     child.unref();
+    try { (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.closeSync)(logFd); } catch { /* */ }
 
     const pid = child.pid;
     let url = null;
+    let settled = false;
+    let childExited = false;
+
+    function settle(callback, value) {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      clearInterval(poll);
+      clearTimeout(timeout);
+      callback(value);
+    }
 
     const timeout = setTimeout(() => {
       if (!url) {
         try { process.kill(pid, 'SIGTERM'); } catch { /* */ }
-        reject(new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
+        settle(reject, new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
           launchSpec,
           logContent: readCloudflaredLog(logPath),
           logPath,
@@ -7697,17 +7726,12 @@ function startTunnel() {
         const tunnelUrl = (0,_cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_8__/* .extractQuickTunnelUrl */ .k)(content);
         if (tunnelUrl) {
           url = tunnelUrl;
-          clearInterval(poll);
-          clearTimeout(timeout);
           saveTunnelState(pid, url);
-          resolve({ pid, url });
+          settle(resolve, { pid, url });
           return;
         }
-        // Check if process died before producing URL
-        if (!isProcessAlive(pid)) {
-          clearInterval(poll);
-          clearTimeout(timeout);
-          reject(new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
+        if (childExited) {
+          settle(reject, new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
             launchSpec,
             logContent: content,
             logPath,
@@ -7717,10 +7741,28 @@ function startTunnel() {
       } catch { /* file not ready yet */ }
     }, 300);
 
+    child.once('exit', () => {
+      childExited = true;
+      if (!url) {
+        const content = readCloudflaredLog(logPath);
+        const tunnelUrl = (0,_cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_8__/* .extractQuickTunnelUrl */ .k)(content);
+        if (tunnelUrl) {
+          url = tunnelUrl;
+          saveTunnelState(pid, url);
+          settle(resolve, { pid, url });
+          return;
+        }
+        settle(reject, new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
+          launchSpec,
+          logContent: content,
+          logPath,
+          phase: 'exit',
+        })));
+      }
+    });
+
     child.on('error', (err) => {
-      clearInterval(poll);
-      clearTimeout(timeout);
-      reject(new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
+      settle(reject, new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
         launchSpec,
         logContent: readCloudflaredLog(logPath),
         logPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibelet/cli",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "macOS CLI for installing and running the Vibelet daemon",
   "homepage": "https://vibelet.icu",
   "files": [