@vibelet/cli 1.0.17 → 1.0.18

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

package/dist/vibelet.mjs

@@ -6542,6 +6542,64 @@ function parseNamedArg(argv, name, errorHint, fail, env = process.env) {
 }
 
 
+/***/ }),
+
+/***/ 2927:
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
+
+/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
+/* harmony export */   B: () => (/* binding */ bootoutLaunchdService),
+/* harmony export */   N: () => (/* binding */ describeLaunchctlResult)
+/* harmony export */ });
+function launchctlResultText(result) {
+  return [result?.stderr, result?.stdout]
+    .filter((value) => typeof value === 'string' && value.trim().length > 0)
+    .join('\n')
+    .trim();
+}
+
+function isMissingLaunchdServiceResult(result) {
+  if (!result || result.status === 0) return false;
+  const text = launchctlResultText(result).toLowerCase();
+  return text.includes('could not find service')
+    || text.includes('service could not be found')
+    || text.includes('service not loaded')
+    || text.includes('no such process')
+    || text.includes('no such file or directory');
+}
+
+function bootoutLaunchdService({
+  launchctl,
+  launchDomain,
+  label,
+  plistPath,
+}) {
+  const attempts = [
+    ['bootout', launchDomain, plistPath],
+    ['bootout', `${launchDomain}/${label}`],
+  ];
+  let lastMissingResult = null;
+
+  for (const args of attempts) {
+    const result = launchctl(args);
+    if (result.status === 0) {
+      return { ok: true, result };
+    }
+    if (isMissingLaunchdServiceResult(result)) {
+      lastMissingResult = result;
+      continue;
+    }
+    return { ok: false, result };
+  }
+
+  return { ok: true, result: lastMissingResult };
+}
+
+function describeLaunchctlResult(result) {
+  return launchctlResultText(result);
+}
+
+
 /***/ }),
 
 /***/ 6067:
@@ -6596,6 +6654,36 @@ function doesHealthMatchRequestedConnectionConfig({
 }
 
 
+/***/ }),
+
+/***/ 9917:
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
+
+/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
+/* harmony export */   v: () => (/* binding */ stopDaemonWithHooks)
+/* harmony export */ });
+async function stopDaemonWithHooks({
+  requestShutdown,
+  backendStop,
+  waitForDaemonExit,
+  timeoutMs = 5_000,
+}) {
+  const gracefullyStopped = await requestShutdown();
+  backendStop();
+
+  const diedAfterBackendStop = await waitForDaemonExit(timeoutMs);
+  if (diedAfterBackendStop) {
+    return;
+  }
+
+  if (gracefullyStopped) {
+    throw new Error('Daemon exited briefly but started responding again before the service manager fully unloaded it.');
+  }
+
+  throw new Error('Daemon did not stop in time.');
+}
+
+
 /***/ }),
 
 /***/ 6327:
@@ -6608,11 +6696,15 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var node_path__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(6760);
 /* 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_8__ = __nccwpck_require__(3428);
-/* harmony import */ var _cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(1932);
+/* harmony import */ var _vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(3428);
+/* harmony import */ var _cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(1932);
 /* harmony import */ var _cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(3006);
+/* harmony import */ var _vibelet_launchd_mjs__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(2927);
 /* harmony import */ var _linux_systemd_mjs__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(5400);
-/* harmony import */ var _vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(6067);
+/* harmony import */ var _vibelet_stop_logic_mjs__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(9917);
+/* harmony import */ var _vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(6067);
+
+
 
 
 
@@ -6932,6 +7024,15 @@ function createDarwinBackend() {
     return (0,node_child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync)('launchctl', args, { encoding: 'utf8' });
   }
 
+  function bootoutService() {
+    return (0,_vibelet_launchd_mjs__WEBPACK_IMPORTED_MODULE_8__/* .bootoutLaunchdService */ .B)({
+      launchctl,
+      launchDomain,
+      label,
+      plistPath,
+    });
+  }
+
   function plistContents() {
     // Prefer a stable node path — fnm_multishells shims disappear when the
     // installing shell exits, leaving launchd unable to respawn the daemon.
@@ -7004,14 +7105,16 @@ ${envSection}
         (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync)(plistPath, nextContents, 'utf8');
       }
 
-      if (changed && serviceLoaded) {
-        launchctl(['bootout', `${launchDomain}/${label}`]);
-      }
-
       if (changed || !serviceLoaded) {
+        const bootoutResult = bootoutService();
         const result = launchctl(['bootstrap', launchDomain, plistPath]);
         if (result.status !== 0) {
-          fail('Failed to bootstrap vibelet launch agent.', result.stderr || result.stdout);
+          fail(
+            'Failed to bootstrap vibelet launch agent.',
+            [(0,_vibelet_launchd_mjs__WEBPACK_IMPORTED_MODULE_8__/* .describeLaunchctlResult */ .N)(bootoutResult.result), (0,_vibelet_launchd_mjs__WEBPACK_IMPORTED_MODULE_8__/* .describeLaunchctlResult */ .N)(result)]
+              .filter(Boolean)
+              .join('\n'),
+          );
         }
       }
     },
@@ -7024,8 +7127,10 @@ ${envSection}
     },
 
     stop() {
-      if (!this.isServiceInstalled()) return;
-      launchctl(['bootout', `${launchDomain}/${label}`]);
+      const bootoutResult = bootoutService();
+      if (!bootoutResult.ok) {
+        fail('Failed to unload vibelet launch agent.', (0,_vibelet_launchd_mjs__WEBPACK_IMPORTED_MODULE_8__/* .describeLaunchctlResult */ .N)(bootoutResult.result));
+      }
       // bootout returns before launchd actually finishes unloading. Poll
       // until the service is gone so a follow-up install() doesn't see a
       // stale registration, skip bootstrap, and leave the daemon down.
@@ -7350,12 +7455,14 @@ function isDaemonStartCommand(command) {
 }
 
 async function stopRunningDaemon(backend) {
-  const gracefullyStopped = await requestShutdown();
-  backend.stop();
-  if (gracefullyStopped) return;
-  const died = await waitForDaemonExit(5_000);
-  if (!died) {
-    fail('Daemon did not stop in time.');
+  try {
+    await (0,_vibelet_stop_logic_mjs__WEBPACK_IMPORTED_MODULE_9__/* .stopDaemonWithHooks */ .v)({
+      requestShutdown,
+      backendStop: () => backend.stop(),
+      waitForDaemonExit,
+    });
+  } catch (error) {
+    fail(error instanceof Error ? error.message : String(error));
   }
 }
 
@@ -7631,7 +7738,7 @@ function printHelp() {
 }
 
 function parseNamedArg(name, errorHint) {
-  return (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .parseNamedArg */ .nE)(process.argv, name, errorHint, fail);
+  return (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__/* .parseNamedArg */ .nE)(process.argv, name, errorHint, fail);
 }
 
 function parseRelayArg() {
@@ -7766,7 +7873,7 @@ function startTunnel() {
     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_9__/* .extractQuickTunnelUrl */ .k)(content);
+        const tunnelUrl = (0,_cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_11__/* .extractQuickTunnelUrl */ .k)(content);
         if (tunnelUrl) {
           url = tunnelUrl;
           saveTunnelState(pid, url);
@@ -7788,7 +7895,7 @@ function startTunnel() {
       childExited = true;
       if (!url) {
         const content = readCloudflaredLog(logPath);
-        const tunnelUrl = (0,_cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_9__/* .extractQuickTunnelUrl */ .k)(content);
+        const tunnelUrl = (0,_cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_11__/* .extractQuickTunnelUrl */ .k)(content);
         if (tunnelUrl) {
           url = tunnelUrl;
           saveTunnelState(pid, url);
@@ -7827,9 +7934,9 @@ async function main() {
     process.env.VIBE_PORT = String(portArg);
   }
 
-  (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .consumeFlag */ .PC)(process.argv, 'remote') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .consumeFlag */ .PC)(process.argv, 'tunnel') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .readNpmConfigFlag */ .AW)('remote') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .readNpmConfigFlag */ .AW)('tunnel');
-  const localFlag = (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .consumeFlag */ .PC)(process.argv, 'local') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .readNpmConfigFlag */ .AW)('local');
-  const forceFlag = (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .consumeFlag */ .PC)(process.argv, 'force') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .readNpmConfigFlag */ .AW)('force');
+  (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__/* .consumeFlag */ .PC)(process.argv, 'remote') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__/* .consumeFlag */ .PC)(process.argv, 'tunnel') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__/* .readNpmConfigFlag */ .AW)('remote') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__/* .readNpmConfigFlag */ .AW)('tunnel');
+  const localFlag = (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__/* .consumeFlag */ .PC)(process.argv, 'local') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__/* .readNpmConfigFlag */ .AW)('local');
+  const forceFlag = (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__/* .consumeFlag */ .PC)(process.argv, 'force') || (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_10__/* .readNpmConfigFlag */ .AW)('force');
   const relayArg = parseRelayArg();
   const hostArg = parseNamedArg('host', '100.x.x.x');
   const fallbackHostsArg = parseNamedArg('fallback-hosts', '100.x.x.x,192.168.1.x');
@@ -7970,7 +8077,7 @@ async function main() {
 
   if (command === 'reset') {
     const healthyDaemon = await probeHealth(1_500);
-    const hasExplicitConfigOverrides = !(0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_10__/* .doesHealthMatchRequestedConnectionConfig */ .n)({
+    const hasExplicitConfigOverrides = !(0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_12__/* .doesHealthMatchRequestedConnectionConfig */ .n)({
       health: healthyDaemon,
       relayUrl,
       canonicalHost: hostArg || '',
@@ -7996,14 +8103,14 @@ async function main() {
   }
 
   const healthyDaemon = await probeHealth(1_500);
-  const hasExplicitConfigOverrides = !(0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_10__/* .doesHealthMatchRequestedConnectionConfig */ .n)({
+  const hasExplicitConfigOverrides = !(0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_12__/* .doesHealthMatchRequestedConnectionConfig */ .n)({
     health: healthyDaemon,
     relayUrl,
     canonicalHost: hostArg || '',
     fallbackHosts: fallbackHostsArg || '',
     localMode: localFlag,
   }) && (localFlag || Boolean(relayUrl) || Boolean(hostArg) || Boolean(fallbackHostsArg));
-  const existingHealth = (0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_10__/* .shouldReuseHealthyDaemon */ .Z)({
+  const existingHealth = (0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_12__/* .shouldReuseHealthyDaemon */ .Z)({
     command,
     daemonHealthy: Boolean(healthyDaemon),
     hasExplicitConfigOverrides,

package/package.json

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