vibelet 1.2.77 → 1.2.79

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

package/dist/vibelet.mjs

@@ -6224,12 +6224,27 @@ module.exports = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("zlib");
 
 /***/ }),
 
-/***/ 1932:
+/***/ 2155:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
-/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
-/* harmony export */   k: () => (/* binding */ extractQuickTunnelUrl)
-/* harmony export */ });
+
+// EXPORTS
+__nccwpck_require__.d(__webpack_exports__, {
+  vD: () => (/* binding */ clearTunnelState),
+  QQ: () => (/* binding */ getAliveTunnel),
+  DH: () => (/* binding */ startTunnel),
+  HM: () => (/* binding */ stopTunnel)
+});
+
+// UNUSED EXPORTS: isProcessAlive, loadTunnelState, readCloudflaredLog, saveTunnelState
+
+// EXTERNAL MODULE: external "node:child_process"
+var external_node_child_process_ = __nccwpck_require__(1421);
+// EXTERNAL MODULE: external "node:fs"
+var external_node_fs_ = __nccwpck_require__(3024);
+// EXTERNAL MODULE: external "node:path"
+var external_node_path_ = __nccwpck_require__(6760);
+;// CONCATENATED MODULE: ./bin/cloudflared-quick-tunnel.mjs
 const QUICK_TUNNEL_URL_PATTERN = /https:\/\/[a-z0-9-]+\.trycloudflare\.com(?=$|[\s"',)\]])/g;
 
 function extractQuickTunnelUrl(logContent) {
@@ -6242,27 +6257,8 @@ function extractQuickTunnelUrl(logContent) {
   return match?.[0] ?? null;
 }
 
-
-/***/ }),
-
-/***/ 3006:
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
-
-
-// EXPORTS
-__nccwpck_require__.d(__webpack_exports__, {
-  Ic: () => (/* binding */ formatCloudflaredFailureMessage),
-  Wo: () => (/* binding */ resolveCloudflaredLaunchSpec)
-});
-
-// UNUSED EXPORTS: findExecutableInPath, findExecutablesInPath, resolveInstalledCloudflaredCliPath, summarizeCloudflaredLog
-
 ;// CONCATENATED MODULE: external "node:module"
 const external_node_module_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:module");
-// EXTERNAL MODULE: external "node:fs"
-var external_node_fs_ = __nccwpck_require__(3024);
-// EXTERNAL MODULE: external "node:path"
-var external_node_path_ = __nccwpck_require__(6760);
 ;// CONCATENATED MODULE: ./bin/cloudflared-resolver.mjs
 
 
@@ -6463,6 +6459,199 @@ function formatCloudflaredFailureMessage({
   return `cloudflared exited before producing a tunnel URL${launchSuffix}. Check ${logPath}.`;
 }
 
+;// CONCATENATED MODULE: ./bin/cloudflared-tunnel-manager.mjs
+
+
+
+
+
+
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function loadTunnelState({ tunnelStatePath }) {
+  try {
+    return JSON.parse((0,external_node_fs_.readFileSync)(tunnelStatePath, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+function saveTunnelState({ tunnelStatePath, pid, url }) {
+  (0,external_node_fs_.mkdirSync)((0,external_node_path_.dirname)(tunnelStatePath), { recursive: true });
+  (0,external_node_fs_.writeFileSync)(tunnelStatePath, JSON.stringify({ pid, url }, null, 2) + '\n', 'utf8');
+}
+
+function clearTunnelState({ tunnelStatePath }) {
+  (0,external_node_fs_.rmSync)(tunnelStatePath, { force: true });
+}
+
+function stopTunnel({
+  tunnelStatePath,
+  isAlive = isProcessAlive,
+  killProcess = process.kill,
+}) {
+  const state = loadTunnelState({ tunnelStatePath });
+  if (state?.pid && isAlive(state.pid)) {
+    try { killProcess(state.pid, 'SIGTERM'); } catch { /* already dead */ }
+  }
+  clearTunnelState({ tunnelStatePath });
+}
+
+function getAliveTunnel({
+  tunnelStatePath,
+  isAlive = isProcessAlive,
+}) {
+  const state = loadTunnelState({ tunnelStatePath });
+  if (state?.pid && state?.url && isAlive(state.pid)) {
+    return state;
+  }
+  return null;
+}
+
+function readCloudflaredLog(logPath) {
+  try {
+    return (0,external_node_fs_.readFileSync)(logPath, 'utf8');
+  } catch {
+    return '';
+  }
+}
+
+function startTunnel({
+  port,
+  logDir,
+  tunnelStatePath,
+  resolveLaunchSpec = resolveCloudflaredLaunchSpec,
+}) {
+  return new Promise((resolve, reject) => {
+    const logPath = (0,external_node_path_.join)(logDir, 'tunnel.stderr.log');
+    (0,external_node_fs_.mkdirSync)(logDir, { recursive: true });
+
+    const launchSpec = resolveLaunchSpec();
+
+    // Truncate first so URL polling cannot match a stale quick-tunnel URL.
+    (0,external_node_fs_.writeFileSync)(logPath, '', 'utf8');
+    const stdoutLogFd = (0,external_node_fs_.openSync)(logPath, 'a');
+    const stderrLogFd = (0,external_node_fs_.openSync)(logPath, 'a');
+    let child;
+    try {
+      child = (0,external_node_child_process_.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,external_node_fs_.closeSync)(stdoutLogFd); } catch { /* */ }
+      try { (0,external_node_fs_.closeSync)(stderrLogFd); } catch { /* */ }
+      reject(new Error(formatCloudflaredFailureMessage({
+        launchSpec,
+        logContent: readCloudflaredLog(logPath),
+        logPath,
+        err,
+        phase: 'spawn',
+      })));
+      return;
+    }
+    child.unref();
+    try { (0,external_node_fs_.closeSync)(stdoutLogFd); } catch { /* */ }
+    try { (0,external_node_fs_.closeSync)(stderrLogFd); } catch { /* */ }
+
+    const pid = child.pid;
+    let url = null;
+    let settled = false;
+    let childExited = false;
+    let poll;
+    let timeout;
+
+    function settle(callback, value) {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      clearInterval(poll);
+      clearTimeout(timeout);
+      callback(value);
+    }
+
+    timeout = setTimeout(() => {
+      if (!url) {
+        try { process.kill(pid, 'SIGTERM'); } catch { /* */ }
+        settle(reject, new Error(formatCloudflaredFailureMessage({
+          launchSpec,
+          logContent: readCloudflaredLog(logPath),
+          logPath,
+          phase: 'timeout',
+        })));
+      }
+    }, launchSpec.urlTimeoutMs);
+
+    poll = setInterval(() => {
+      try {
+        const content = (0,external_node_fs_.readFileSync)(logPath, 'utf8');
+        const tunnelUrl = extractQuickTunnelUrl(content);
+        if (tunnelUrl) {
+          url = tunnelUrl;
+          saveTunnelState({ tunnelStatePath, pid, url });
+          settle(resolve, { pid, url });
+          return;
+        }
+        if (childExited) {
+          settle(reject, new Error(formatCloudflaredFailureMessage({
+            launchSpec,
+            logContent: content,
+            logPath,
+            phase: 'exit',
+          })));
+        }
+      } catch { /* file not ready yet */ }
+    }, 300);
+
+    child.once('exit', () => {
+      childExited = true;
+      if (!url) {
+        const content = readCloudflaredLog(logPath);
+        const tunnelUrl = extractQuickTunnelUrl(content);
+        if (tunnelUrl) {
+          url = tunnelUrl;
+          saveTunnelState({ tunnelStatePath, pid, url });
+          settle(resolve, { pid, url });
+          return;
+        }
+        settle(reject, new Error(formatCloudflaredFailureMessage({
+          launchSpec,
+          logContent: content,
+          logPath,
+          phase: 'exit',
+        })));
+      }
+    });
+
+    child.on('error', (err) => {
+      settle(reject, new Error(formatCloudflaredFailureMessage({
+        launchSpec,
+        logContent: readCloudflaredLog(logPath),
+        logPath,
+        err,
+        phase: 'spawn',
+      })));
+    });
+  });
+}
+
 
 /***/ }),
 
@@ -7027,8 +7216,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var node_url__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(3136);
 /* harmony import */ var qrcode__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(1302);
 /* harmony import */ var _vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(3428);
-/* harmony import */ var _cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(1932);
-/* harmony import */ var _cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(3006);
+/* harmony import */ var _cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(2155);
 /* harmony import */ var _vibelet_launchd_mjs__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(2927);
 /* harmony import */ var _linux_systemd_mjs__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(5400);
 /* harmony import */ var _vibelet_stop_logic_mjs__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(9917);
@@ -7049,7 +7237,6 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 
 
 
-
 // ─── Paths & constants ─────────────────────────────────────────────────────────
 
 const rootDir = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.resolve)((0,node_path__WEBPACK_IMPORTED_MODULE_3__.dirname)((0,node_url__WEBPACK_IMPORTED_MODULE_4__.fileURLToPath)(import.meta.url)), '..');
@@ -7960,170 +8147,8 @@ function clearRelayConfig() {
 
 // ─── Tunnel management ──────────────────────────────────────────────────────────
 
-function loadTunnelState() {
-  try {
-    return JSON.parse((0,node_fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync)(tunnelStatePath, 'utf8'));
-  } catch {
-    return null;
-  }
-}
-
-function saveTunnelState(pid, url) {
-  (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync)(vibeletDir, { recursive: true });
-  (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync)(tunnelStatePath, JSON.stringify({ pid, url }, null, 2) + '\n', 'utf8');
-}
-
-function clearTunnelState() {
-  (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.rmSync)(tunnelStatePath, { force: true });
-}
-
-function stopTunnel() {
-  const state = loadTunnelState();
-  if (state?.pid && isProcessAlive(state.pid)) {
-    try { process.kill(state.pid, 'SIGTERM'); } catch { /* already dead */ }
-  }
-  clearTunnelState();
-}
-
-function getAliveTunnel() {
-  const state = loadTunnelState();
-  if (state?.pid && state?.url && isProcessAlive(state.pid)) {
-    return state;
-  }
-  return null;
-}
-
-function readCloudflaredLog(logPath) {
-  try {
-    return (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync)(logPath, 'utf8');
-  } catch {
-    return '';
-  }
-}
-
-function startTunnel() {
-  return new Promise((resolve, reject) => {
-    const logPath = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.join)(logDir, 'tunnel.stderr.log');
-    (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync)(logDir, { recursive: true });
-
-    const launchSpec = (0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .resolveCloudflaredLaunchSpec */ .Wo)();
-
-    // Strategy: start cloudflared with output to log files (so it survives detach),
-    // 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 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)(stdoutLogFd); } catch { /* */ }
-    try { (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.closeSync)(stderrLogFd); } 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 { /* */ }
-        settle(reject, new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
-          launchSpec,
-          logContent: readCloudflaredLog(logPath),
-          logPath,
-          phase: 'timeout',
-        })));
-      }
-    }, launchSpec.urlTimeoutMs);
-
-    // Poll the log file for the tunnel URL
-    const poll = setInterval(() => {
-      try {
-        const content = (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync)(logPath, 'utf8');
-        const tunnelUrl = (0,_cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_13__/* .extractQuickTunnelUrl */ .k)(content);
-        if (tunnelUrl) {
-          url = tunnelUrl;
-          saveTunnelState(pid, url);
-          settle(resolve, { pid, url });
-          return;
-        }
-        if (childExited) {
-          settle(reject, new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
-            launchSpec,
-            logContent: content,
-            logPath,
-            phase: 'exit',
-          })));
-        }
-      } 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_13__/* .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) => {
-      settle(reject, new Error((0,_cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__/* .formatCloudflaredFailureMessage */ .Ic)({
-        launchSpec,
-        logContent: readCloudflaredLog(logPath),
-        logPath,
-        err,
-        phase: 'spawn',
-      })));
-    });
-  });
+function getTunnelManagerOptions() {
+  return { tunnelStatePath, isAlive: isProcessAlive };
 }
 
 async function main() {
@@ -8171,20 +8196,20 @@ async function main() {
   }
 
   if (shouldManageTunnel) {
-    const existing = forceFlag ? null : getAliveTunnel();
+    const existing = forceFlag ? null : (0,_cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__/* .getAliveTunnel */ .QQ)(getTunnelManagerOptions());
     if (existing) {
       process.stdout.write(`Reusing tunnel: ${existing.url} (pid ${existing.pid})\n`);
       saveRelayConfig(existing.url);
     } else {
-      if (forceFlag) stopTunnel();
+      if (forceFlag) (0,_cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__/* .stopTunnel */ .HM)(getTunnelManagerOptions());
       process.stdout.write('Starting Cloudflare Tunnel...\n');
       try {
-        const tunnel = await startTunnel();
+        const tunnel = await (0,_cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__/* .startTunnel */ .DH)({ port, logDir, tunnelStatePath });
         process.stdout.write(`Tunnel ready: ${tunnel.url}\n`);
         saveRelayConfig(tunnel.url);
       } catch (err) {
         managedTunnelFailed = true;
-        clearTunnelState();
+        (0,_cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__/* .clearTunnelState */ .vD)({ tunnelStatePath });
         clearRelayConfig();
         const message = err instanceof Error ? err.message : String(err);
         process.stderr.write(`${message}\n`);
@@ -8229,9 +8254,9 @@ async function main() {
     // close sessions and flush logs before the service manager kills it.
     await stopRunningDaemon(backend);
     // Also stop tunnel if running
-    const tunnelState = getAliveTunnel();
+    const tunnelState = (0,_cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__/* .getAliveTunnel */ .QQ)(getTunnelManagerOptions());
     if (tunnelState) {
-      stopTunnel();
+      (0,_cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__/* .stopTunnel */ .HM)(getTunnelManagerOptions());
       process.stdout.write('Tunnel stopped.\n');
     }
     process.stdout.write('Daemon stopped.\n');
@@ -8241,7 +8266,7 @@ async function main() {
   if (command === 'status') {
     process.stdout.write(`Service (${backend.name}): ${backend.statusLabel()}\n`);
     process.stdout.write(`Runtime: ${(0,node_fs__WEBPACK_IMPORTED_MODULE_1__.existsSync)(runtimeDaemonEntryPath) ? runtimeDaemonEntryPath : 'not installed'}\n`);
-    const tunnelState = getAliveTunnel();
+    const tunnelState = (0,_cloudflared_tunnel_manager_mjs__WEBPACK_IMPORTED_MODULE_6__/* .getAliveTunnel */ .QQ)(getTunnelManagerOptions());
     if (tunnelState) {
       process.stdout.write(`Tunnel: ${tunnelState.url} (pid ${tunnelState.pid})\n`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibelet",
-  "version": "1.2.77",
+  "version": "1.2.79",
   "description": "Cross-platform CLI for installing and running the Vibelet daemon",
   "homepage": "https://vibelet.icu",
   "files": [