@vibelet/cli 1.0.25 → 1.0.26

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.25"}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.26"}var i=p();process.stdout.write(`${i}
 `);

package/dist/vibelet.mjs

@@ -6268,12 +6268,15 @@ 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 getNpmFallbackCommand(platform = process.platform) {
+  return platform === 'win32' ? 'npx.cmd' : 'npx';
+}
+
 function defaultResolveCloudflaredPackageJsonPath() {
   if (process.env.VIBELET_CLOUDFLARED_PACKAGE_JSON) {
     return process.env.VIBELET_CLOUDFLARED_PACKAGE_JSON;
@@ -6281,8 +6284,8 @@ function defaultResolveCloudflaredPackageJsonPath() {
   return cloudflared_resolver_require.resolve('cloudflared/package.json');
 }
 
-function getExecutableCandidates(name, pathExtValue = process.env.PATHEXT ?? '') {
-  if (process.platform !== 'win32') {
+function getExecutableCandidates(name, pathExtValue = process.env.PATHEXT ?? '', platform = process.platform) {
+  if (platform !== 'win32') {
     return [name];
   }
 
@@ -6299,6 +6302,7 @@ function getExecutableCandidates(name, pathExtValue = process.env.PATHEXT ?? '')
 function findExecutablesInPath(name, {
   pathValue = process.env.PATH ?? '',
   pathExtValue = process.env.PATHEXT ?? '',
+  platform = process.platform,
 } = {}) {
   if (!pathValue) return [];
 
@@ -6306,7 +6310,7 @@ function findExecutablesInPath(name, {
 
   for (const dir of pathValue.split(external_node_path_.delimiter)) {
     if (!dir) continue;
-    for (const candidate of getExecutableCandidates(name, pathExtValue)) {
+    for (const candidate of getExecutableCandidates(name, pathExtValue, platform)) {
       const candidatePath = (0,external_node_path_.join)(dir, candidate);
       if ((0,external_node_fs_.existsSync)(candidatePath)) {
         results.push(candidatePath);
@@ -6327,6 +6331,10 @@ function isNodeModulesBinPath(candidatePath) {
     && /(?:^|[\\/])node_modules[\\/]\.bin(?:[\\/]|$)/u.test(candidatePath);
 }
 
+function isWindowsCommandScript(candidatePath, platform = process.platform) {
+  return platform === 'win32' && /\.(?:cmd|bat)$/iu.test(candidatePath);
+}
+
 function resolveInstalledCloudflaredCliPath({
   resolvePackageJsonPath = defaultResolveCloudflaredPackageJsonPath,
 } = {}) {
@@ -6362,9 +6370,10 @@ function resolveInstalledCloudflaredCliPath({
 function resolveCloudflaredLaunchSpec({
   pathValue = process.env.PATH ?? '',
   pathExtValue = process.env.PATHEXT ?? '',
+  platform = process.platform,
   resolvePackageJsonPath,
 } = {}) {
-  const directPathCandidates = findExecutablesInPath('cloudflared', { pathValue, pathExtValue });
+  const directPathCandidates = findExecutablesInPath('cloudflared', { pathValue, pathExtValue, platform });
   const directPath = directPathCandidates.find((candidatePath) => !isNodeModulesBinPath(candidatePath))
     ?? directPathCandidates[0]
     ?? null;
@@ -6374,6 +6383,7 @@ function resolveCloudflaredLaunchSpec({
       args: [],
       source: 'path',
       description: directPath,
+      ...(isWindowsCommandScript(directPath, platform) ? { shell: true } : {}),
       urlTimeoutMs: defaultUrlTimeoutMs,
     };
   }
@@ -6390,10 +6400,11 @@ function resolveCloudflaredLaunchSpec({
   }
 
   return {
-    command: npmFallbackCommand,
+    command: getNpmFallbackCommand(platform),
     args: [...npmFallbackArgs],
     source: 'npm',
     description: npmFallbackDescription,
+    ...(platform === 'win32' ? { shell: true } : {}),
     urlTimeoutMs: defaultUrlTimeoutMs,
   };
 }
@@ -7827,20 +7838,38 @@ function startTunnel() {
     // then tail the log to capture the URL.
     // Truncate log so we don't match a stale URL from a previous run.
     (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync)(logPath, '', 'utf8');
-    const logFd = (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.openSync)(logPath, 'a');
-    const child = (0,node_child_process__WEBPACK_IMPORTED_MODULE_0__.spawn)(launchSpec.command, [
-      ...launchSpec.args,
-      'tunnel',
-      '--protocol',
-      'http2',
-      '--url',
-      `http://localhost:${port}`,
-    ], {
-      detached: true,
-      stdio: ['ignore', logFd, logFd],
-    });
+    const stdoutLogFd = (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.openSync)(logPath, 'a');
+    const stderrLogFd = (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.openSync)(logPath, 'a');
+    let child;
+    try {
+      child = (0,node_child_process__WEBPACK_IMPORTED_MODULE_0__.spawn)(launchSpec.command, [
+        ...launchSpec.args,
+        'tunnel',
+        '--protocol',
+        'http2',
+        '--url',
+        `http://localhost:${port}`,
+      ], {
+        detached: true,
+        stdio: ['ignore', stdoutLogFd, stderrLogFd],
+        windowsHide: true,
+        ...(launchSpec.shell ? { shell: true } : {}),
+      });
+    } catch (err) {
+      try { (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.closeSync)(stdoutLogFd); } catch { /* */ }
+      try { (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.closeSync)(stderrLogFd); } catch { /* */ }
+      reject(new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
+        launchSpec,
+        logContent: readCloudflaredLog(logPath),
+        logPath,
+        err,
+        phase: 'spawn',
+      })));
+      return;
+    }
     child.unref();
-    try { (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.closeSync)(logFd); } catch { /* */ }
+    try { (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.closeSync)(stdoutLogFd); } catch { /* */ }
+    try { (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.closeSync)(stderrLogFd); } catch { /* */ }
 
     const pid = child.pid;
     let url = null;
@@ -7940,6 +7969,7 @@ async function main() {
   const relayArg = parseRelayArg();
   const hostArg = parseNamedArg('host', '100.x.x.x');
   const fallbackHostsArg = parseNamedArg('fallback-hosts', '100.x.x.x,192.168.1.x');
+  let managedTunnelFailed = false;
   const command = process.argv[2] ?? 'default';
   const startCommand = isDaemonStartCommand(command);
   // --remote/--tunnel remain accepted for compatibility, but startup commands
@@ -7973,7 +8003,12 @@ async function main() {
         process.stdout.write(`Tunnel ready: ${tunnel.url}\n`);
         saveRelayConfig(tunnel.url);
       } catch (err) {
-        fail(err.message);
+        managedTunnelFailed = true;
+        clearTunnelState();
+        clearRelayConfig();
+        const message = err instanceof Error ? err.message : String(err);
+        process.stderr.write(`${message}\n`);
+        process.stderr.write('Continuing with LAN/local pairing. Use `npx vibelet --force` after fixing Cloudflare Tunnel, or pass `--relay=<url>` for a custom tunnel.\n');
       }
     }
   }
@@ -7986,7 +8021,7 @@ async function main() {
       clearRelayConfig();
     }
   }
-  const shouldIgnoreSavedRelay = relayArg === null && (localFlag || Boolean(hostArg) || Boolean(fallbackHostsArg));
+  const shouldIgnoreSavedRelay = relayArg === null && (localFlag || Boolean(hostArg) || Boolean(fallbackHostsArg) || managedTunnelFailed);
   const relayUrl = relayArg !== null
     ? relayArg
     : (shouldIgnoreSavedRelay ? '' : loadRelayConfig());
@@ -8117,9 +8152,31 @@ async function main() {
   }) ? healthyDaemon : null;
 
   if (existingHealth) {
-    process.stdout.write('Vibelet daemon is already running.\n');
-    process.stdout.write('Reusing the current runtime so active sessions stay alive.\n');
-    process.stdout.write('Run `npx vibelet restart` to force a full restart.\n\n');
+    const runningVersion = typeof existingHealth.version === 'string' ? existingHealth.version : '';
+    const activeSessions = typeof existingHealth.activeSessions === 'number' ? existingHealth.activeSessions : 0;
+    const isOutdated = runningVersion && compareVersions(runningVersion, packageJson.version) < 0;
+    if (isOutdated && activeSessions === 0) {
+      process.stdout.write(
+        `Daemon is running v${runningVersion}, CLI is v${packageJson.version}. Restarting daemon to upgrade...\n`,
+      );
+      await stopRunningDaemon(backend);
+      process.stdout.write('Daemon stopped. Starting...\n');
+      ensureRuntimeInstalled();
+      backend.install();
+      backend.start();
+      await printPairingSummary();
+      return;
+    }
+    if (isOutdated) {
+      process.stdout.write(
+        `Daemon is running v${runningVersion}, CLI is v${packageJson.version}, but ${activeSessions} active session(s) would be interrupted.\n`,
+      );
+      process.stdout.write('Run `npx vibelet restart` once those sessions are idle to upgrade the daemon.\n');
+    } else {
+      process.stdout.write('Vibelet daemon is already running.\n');
+      process.stdout.write('Reusing the current runtime so active sessions stay alive.\n');
+      process.stdout.write('Run `npx vibelet restart` to force a full restart.\n\n');
+    }
     await printPairingSummary(existingHealth);
     return;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vibelet/cli",
-  "version": "1.0.25",
-  "description": "macOS CLI for installing and running the Vibelet daemon",
+  "version": "1.0.26",
+  "description": "Cross-platform CLI for installing and running the Vibelet daemon",
   "homepage": "https://vibelet.icu",
   "private": false,
   "files": [