vibelet 1.2.184 → 1.2.185

package/dist/runtime-version.cjs

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

package/dist/vibelet.mjs

@@ -12369,7 +12369,7 @@ function canUseSystemdUserManager({ spawnSyncImpl = node_child_process__WEBPACK_
 
 /***/ }),
 
-/***/ 636:
+/***/ 2629:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
 
@@ -12422,6 +12422,112 @@ var websocket_server = __nccwpck_require__(3261);
 
 /* harmony default export */ const wrapper = (websocket);
 
+;// CONCATENATED MODULE: ./bin/terminal-process-tree.mjs
+
+
+const TAKEOVER_STOP_TIMEOUT_MS = 3000;
+
+function terminal_process_tree_sendSignal(child, signal) {
+  if (!child.pid || child.exitCode !== null || child.signalCode !== null) return;
+  try {
+    process.kill(child.pid, signal);
+  } catch {
+    // Already exited.
+  }
+}
+
+function isPidAlive(pid) {
+  if (!pid) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function collectProcessTreePids(rootPid) {
+  if (!rootPid) return [];
+  let rows;
+  try {
+    rows = (0,external_node_child_process_.execFileSync)('ps', ['-axo', 'pid=,ppid='], {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    });
+  } catch {
+    return [rootPid];
+  }
+  const childrenByParent = new Map();
+  for (const line of rows.split('\n')) {
+    const [pidText, ppidText] = line.trim().split(/\s+/);
+    const pid = Number(pidText);
+    const ppid = Number(ppidText);
+    if (!Number.isFinite(pid) || !Number.isFinite(ppid)) continue;
+    const children = childrenByParent.get(ppid) ?? [];
+    children.push(pid);
+    childrenByParent.set(ppid, children);
+  }
+  const out = [];
+  const visit = (pid) => {
+    out.push(pid);
+    for (const childPid of childrenByParent.get(pid) ?? []) {
+      visit(childPid);
+    }
+  };
+  visit(rootPid);
+  return out;
+}
+
+function sendSignalToPids(pids, signal) {
+  for (const pid of [...pids].reverse()) {
+    try {
+      process.kill(pid, signal);
+    } catch {
+      // Already exited.
+    }
+  }
+}
+
+async function waitForProcessTreeExit(pids, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  while ([...pids].some(isPidAlive)) {
+    const remainingMs = deadline - Date.now();
+    if (remainingMs <= 0) return false;
+    await new Promise((resolve) => setTimeout(resolve, Math.min(remainingMs, 10)));
+  }
+  return true;
+}
+
+async function waitForExitOrTimeout(childExit, timeoutMs) {
+  let timer;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(() => resolve(null), timeoutMs);
+  });
+  const result = await Promise.race([childExit, timeout]);
+  clearTimeout(timer);
+  return result;
+}
+
+async function stopNativeChild(
+  child,
+  childExit,
+  { interruptTimeoutMs = TAKEOVER_STOP_TIMEOUT_MS, terminateTimeoutMs = 1000, killTimeoutMs = 1000 } = {},
+) {
+  if (child.exitCode !== null || child.signalCode !== null) return true;
+  const trackedPids = new Set(collectProcessTreePids(child.pid));
+  terminal_process_tree_sendSignal(child, 'SIGINT');
+  await waitForExitOrTimeout(childExit, interruptTimeoutMs);
+  if (await waitForProcessTreeExit(trackedPids, 0)) return true;
+
+  for (const pid of collectProcessTreePids(child.pid)) trackedPids.add(pid);
+  sendSignalToPids(trackedPids, 'SIGTERM');
+  if (await waitForProcessTreeExit(trackedPids, terminateTimeoutMs)) return true;
+
+  for (const pid of collectProcessTreePids(child.pid)) trackedPids.add(pid);
+  sendSignalToPids(trackedPids, 'SIGKILL');
+  return waitForProcessTreeExit(trackedPids, killTimeoutMs);
+}
+
 ;// CONCATENATED MODULE: ./bin/terminal-wrapper.mjs
 
 
@@ -12430,10 +12536,13 @@ var websocket_server = __nccwpck_require__(3261);
 
 
 
+
+
+
 const terminalControlTokenPath = (0,external_node_path_.join)((0,external_node_os_.homedir)(), '.vibelet', 'runtime', 'terminal-control-token');
 
-const TAKEOVER_STOP_TIMEOUT_MS = 3000;
-const TAKEOVER_MODE_SETTLE_TIMEOUT_MS = TAKEOVER_STOP_TIMEOUT_MS + 2000;
+const terminal_wrapper_TAKEOVER_STOP_TIMEOUT_MS = 3000;
+const TAKEOVER_MODE_SETTLE_TIMEOUT_MS = terminal_wrapper_TAKEOVER_STOP_TIMEOUT_MS + 2000;
 const SWITCHBACK_RESTORE_NOTICE_MS = 1200;
 const SWITCHBACK_BUSY_RETRY_DELAY_MS = 750;
 const TERMINAL_CONTROL_RECONNECT_DELAY_MS = 1000;
@@ -12765,94 +12874,6 @@ function waitForChildExit(child) {
   });
 }
 
-function sendSignal(child, signal) {
-  if (!child.pid || child.exitCode !== null || child.signalCode !== null) return;
-  try {
-    process.kill(child.pid, signal);
-  } catch {
-    // Already exited.
-  }
-}
-
-function isPidAlive(pid) {
-  if (!pid) return false;
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function collectProcessTreePids(rootPid) {
-  if (!rootPid) return [];
-  let rows;
-  try {
-    rows = (0,external_node_child_process_.execFileSync)('ps', ['-axo', 'pid=,ppid='], {
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'ignore'],
-    });
-  } catch {
-    return [rootPid];
-  }
-  const childrenByParent = new Map();
-  for (const line of rows.split('\n')) {
-    const [pidText, ppidText] = line.trim().split(/\s+/);
-    const pid = Number(pidText);
-    const ppid = Number(ppidText);
-    if (!Number.isFinite(pid) || !Number.isFinite(ppid)) continue;
-    const children = childrenByParent.get(ppid) ?? [];
-    children.push(pid);
-    childrenByParent.set(ppid, children);
-  }
-  const out = [];
-  const visit = (pid) => {
-    out.push(pid);
-    for (const childPid of childrenByParent.get(pid) ?? []) {
-      visit(childPid);
-    }
-  };
-  visit(rootPid);
-  return out;
-}
-
-function sendSignalToProcessTree(child, signal) {
-  if (!child.pid || child.exitCode !== null || child.signalCode !== null) return;
-  const pids = collectProcessTreePids(child.pid);
-  for (const pid of pids.reverse()) {
-    try {
-      process.kill(pid, signal);
-    } catch {
-      // Already exited.
-    }
-  }
-}
-
-async function waitForExitOrTimeout(childExit, timeoutMs) {
-  let timer;
-  const timeout = new Promise((resolve) => {
-    timer = setTimeout(() => resolve(null), timeoutMs);
-  });
-  const result = await Promise.race([childExit, timeout]);
-  clearTimeout(timer);
-  return result;
-}
-
-async function stopNativeChild(
-  child,
-  childExit,
-  { interruptTimeoutMs = TAKEOVER_STOP_TIMEOUT_MS, terminateTimeoutMs = 1000, killTimeoutMs = 1000 } = {},
-) {
-  if (child.exitCode !== null || child.signalCode !== null) return true;
-  sendSignal(child, 'SIGINT');
-  if (await waitForExitOrTimeout(childExit, interruptTimeoutMs)) return true;
-  sendSignalToProcessTree(child, 'SIGTERM');
-  if (await waitForExitOrTimeout(childExit, terminateTimeoutMs)) return true;
-  sendSignalToProcessTree(child, 'SIGKILL');
-  if (await waitForExitOrTimeout(childExit, killTimeoutMs)) return true;
-  return !isPidAlive(child.pid);
-}
-
 function waitMs(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
@@ -14845,7 +14866,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var _vibelet_help_mjs__WEBPACK_IMPORTED_MODULE_16__ = __nccwpck_require__(4162);
 /* harmony import */ var _vibelet_tailcat_config_mjs__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(5798);
 /* harmony import */ var _vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(4);
-/* harmony import */ var _terminal_wrapper_mjs__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(636);
+/* harmony import */ var _terminal_wrapper_mjs__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(2629);
 /* harmony import */ var _vibelet_pairing_connections_mjs__WEBPACK_IMPORTED_MODULE_15__ = __nccwpck_require__(7721);
 
 
@@ -15706,9 +15727,7 @@ async function ensureDaemonForTerminalControl(backend) {
   const healthyDaemon = await probeHealth(1_500);
   const tokenReady = (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.existsSync)(runtimeTerminalControlTokenPath);
   const terminalControlReady = healthyDaemon && tokenReady && (0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_12__/* .doesHealthSupportTerminalControl */ .iX)(healthyDaemon);
-  if (terminalControlReady) {
-    return healthyDaemon;
-  }
+  if (terminalControlReady) return healthyDaemon;
 
   if (healthyDaemon && !terminalControlReady) {
     const activeSessions = typeof healthyDaemon.activeSessions === 'number' ? healthyDaemon.activeSessions : 0;
@@ -15744,7 +15763,7 @@ async function printPairingQr(pairingPayload) {
     type: 'png',
     errorCorrectionLevel: 'M',
     margin: 1,
-    scale: 8,
+    scale: 4,
   });
   const qr = await qrcode__WEBPACK_IMPORTED_MODULE_6__.toString(payload, {
     type: 'terminal',

package/package.json

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