@vibelet/cli 1.0.15 → 1.0.16

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

package/dist/vibelet.mjs

@@ -6491,6 +6491,57 @@ function canUseSystemdUserManager({ spawnSyncImpl = node_child_process__WEBPACK_
 }
 
 
+/***/ }),
+
+/***/ 3428:
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
+
+/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
+/* harmony export */   AW: () => (/* binding */ readNpmConfigFlag),
+/* harmony export */   PC: () => (/* binding */ consumeFlag),
+/* harmony export */   nE: () => (/* binding */ parseNamedArg)
+/* harmony export */ });
+/* unused harmony export readNpmConfigArg */
+function consumeFlag(argv, name) {
+  const idx = argv.indexOf(`--${name}`);
+  if (idx === -1) return false;
+  argv.splice(idx, 1);
+  return true;
+}
+
+function readNpmConfigFlag(name, env = process.env) {
+  const value = env[`npm_config_${name.replace(/-/g, '_')}`];
+  return value === '' || value === 'true';
+}
+
+function readNpmConfigArg(name, env = process.env) {
+  const value = env[`npm_config_${name.replace(/-/g, '_')}`];
+  return typeof value === 'string' ? value : null;
+}
+
+function parseNamedArg(argv, name, errorHint, fail, env = process.env) {
+  const inlinePrefix = `--${name}=`;
+  const inlineArg = argv.find((arg) => arg.startsWith(inlinePrefix));
+  if (inlineArg) {
+    const idx = argv.indexOf(inlineArg);
+    argv.splice(idx, 1);
+    return inlineArg.slice(inlinePrefix.length);
+  }
+
+  const idx = argv.indexOf(`--${name}`);
+  if (idx !== -1) {
+    const value = argv[idx + 1];
+    if (!value || value.startsWith('-')) {
+      fail(`--${name} requires an argument${errorHint ? ` (e.g. --${name} ${errorHint})` : ''}`);
+    }
+    argv.splice(idx, 2);
+    return value;
+  }
+
+  return readNpmConfigArg(name, env);
+}
+
+
 /***/ }),
 
 /***/ 6067:
@@ -6524,16 +6575,23 @@ function doesHealthMatchRequestedConnectionConfig({
     return currentRelayUrl === relayUrl;
   }
 
-  if (localMode) {
-    return currentRelayUrl === '';
+  const directConnectionRequested = localMode || Boolean(canonicalHost) || Boolean(fallbackHosts);
+  if (directConnectionRequested && currentRelayUrl !== '') {
+    return false;
   }
 
-  if (canonicalHost) {
-    if (fallbackHosts) return false;
-    return currentRelayUrl === '' && health.canonicalHost === canonicalHost;
+  if (canonicalHost && health.canonicalHost !== canonicalHost) {
+    return false;
+  }
+
+  if (fallbackHosts) {
+    return false;
+  }
+
+  if (localMode || canonicalHost) {
+    return true;
   }
 
-  if (fallbackHosts) return false;
   return currentRelayUrl === '';
 }
 
@@ -6550,10 +6608,12 @@ __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 _cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(1932);
+/* 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 _cloudflared_resolver_mjs__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(3006);
 /* harmony import */ var _linux_systemd_mjs__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(5400);
-/* harmony import */ var _vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(6067);
+/* harmony import */ var _vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(6067);
+
 
 
 
@@ -6574,6 +6634,7 @@ const daemonDistDir = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.resolve)(rootDir
 const daemonEntryPath = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.resolve)(daemonDistDir, 'index.cjs');
 const vibeletDir = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.join)((0,node_os__WEBPACK_IMPORTED_MODULE_2__.homedir)(), '.vibelet');
 const pairingQrPngPath = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.join)(vibeletDir, 'pairing-qr.png');
+const pairingCodePath = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.join)(vibeletDir, 'pairing-code.txt');
 const logDir = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.join)(vibeletDir, 'logs');
 const runtimeDir = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.join)(vibeletDir, 'runtime');
 const runtimeCurrentDir = (0,node_path__WEBPACK_IMPORTED_MODULE_3__.join)(runtimeDir, 'current');
@@ -7476,8 +7537,13 @@ function formatConnectionSummary(target) {
   return `${target.host}:${target.port} [${formatConnectionSourceLabel(target.source)}, ${stabilityLabel}]`;
 }
 
+function buildPairingDeepLink(pairingPayloadText) {
+  return `vibelet://pair?data=${encodeURIComponent(pairingPayloadText)}`;
+}
+
 async function printPairingQr(pairingPayload) {
   const payload = JSON.stringify(createCompactPairingPayload(pairingPayload));
+  const deepLink = buildPairingDeepLink(payload);
   (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync)(vibeletDir, { recursive: true });
   await qrcode__WEBPACK_IMPORTED_MODULE_5__.toFile(pairingQrPngPath, payload, {
     type: 'png',
@@ -7490,8 +7556,12 @@ async function printPairingQr(pairingPayload) {
     small: true,
     errorCorrectionLevel: 'M',
   });
+  (0,node_fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync)(pairingCodePath, `${payload}\n`, 'utf8');
   process.stdout.write(`\nScan this QR code with the Vibelet app:\n\n${qr}\n`);
   process.stdout.write(`If Vibelet app can't scan the terminal QR, open this PNG instead:\n${pairingQrPngPath}\n`);
+  process.stdout.write(`If this device can't scan, paste this pairing code in Vibelet:\n${payload}\n`);
+  process.stdout.write(`Pairing code saved to:\n${pairingCodePath}\n`);
+  process.stdout.write(`Or open this deep link on a device with Vibelet installed:\n${deepLink}\n`);
 }
 
 // ─── Commands ───────────────────────────────────────────────────────────────────
@@ -7560,35 +7630,8 @@ function printHelp() {
   process.stdout.write(`  npx ${packageJson.name} --host=<tailscale-ip>\n`);
 }
 
-function consumeFlag(name) {
-  const idx = process.argv.indexOf(`--${name}`);
-  if (idx === -1) return false;
-  process.argv.splice(idx, 1);
-  return true;
-}
-
-function readNpmConfigFlag(name) {
-  const value = process.env[`npm_config_${name.replace(/-/g, '_')}`];
-  return value === '' || value === 'true';
-}
-
 function parseNamedArg(name, errorHint) {
-  const inlinePrefix = `--${name}=`;
-  const inlineArg = process.argv.find((arg) => arg.startsWith(inlinePrefix));
-  if (inlineArg) {
-    const idx = process.argv.indexOf(inlineArg);
-    process.argv.splice(idx, 1);
-    return inlineArg.slice(inlinePrefix.length);
-  }
-
-  const idx = process.argv.indexOf(`--${name}`);
-  if (idx === -1) return null;
-  const value = process.argv[idx + 1];
-  if (!value || value.startsWith('-')) {
-    fail(`--${name} requires an argument${errorHint ? ` (e.g. --${name} ${errorHint})` : ''}`);
-  }
-  process.argv.splice(idx, 2);
-  return value;
+  return (0,_vibelet_cli_args_mjs__WEBPACK_IMPORTED_MODULE_8__/* .parseNamedArg */ .nE)(process.argv, name, errorHint, fail);
 }
 
 function parseRelayArg() {
@@ -7723,7 +7766,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_8__/* .extractQuickTunnelUrl */ .k)(content);
+        const tunnelUrl = (0,_cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_9__/* .extractQuickTunnelUrl */ .k)(content);
         if (tunnelUrl) {
           url = tunnelUrl;
           saveTunnelState(pid, url);
@@ -7745,7 +7788,7 @@ function startTunnel() {
       childExited = true;
       if (!url) {
         const content = readCloudflaredLog(logPath);
-        const tunnelUrl = (0,_cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_8__/* .extractQuickTunnelUrl */ .k)(content);
+        const tunnelUrl = (0,_cloudflared_quick_tunnel_mjs__WEBPACK_IMPORTED_MODULE_9__/* .extractQuickTunnelUrl */ .k)(content);
         if (tunnelUrl) {
           url = tunnelUrl;
           saveTunnelState(pid, url);
@@ -7784,9 +7827,9 @@ async function main() {
     process.env.VIBE_PORT = String(portArg);
   }
 
-  consumeFlag('remote') || consumeFlag('tunnel') || readNpmConfigFlag('remote') || readNpmConfigFlag('tunnel');
-  const localFlag = consumeFlag('local') || readNpmConfigFlag('local');
-  const forceFlag = consumeFlag('force') || readNpmConfigFlag('force');
+  (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');
   const relayArg = parseRelayArg();
   const hostArg = parseNamedArg('host', '100.x.x.x');
   const fallbackHostsArg = parseNamedArg('fallback-hosts', '100.x.x.x,192.168.1.x');
@@ -7927,7 +7970,7 @@ async function main() {
 
   if (command === 'reset') {
     const healthyDaemon = await probeHealth(1_500);
-    const hasExplicitConfigOverrides = !(0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_9__/* .doesHealthMatchRequestedConnectionConfig */ .n)({
+    const hasExplicitConfigOverrides = !(0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_10__/* .doesHealthMatchRequestedConnectionConfig */ .n)({
       health: healthyDaemon,
       relayUrl,
       canonicalHost: hostArg || '',
@@ -7953,14 +7996,14 @@ async function main() {
   }
 
   const healthyDaemon = await probeHealth(1_500);
-  const hasExplicitConfigOverrides = !(0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_9__/* .doesHealthMatchRequestedConnectionConfig */ .n)({
+  const hasExplicitConfigOverrides = !(0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_10__/* .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_9__/* .shouldReuseHealthyDaemon */ .Z)({
+  const existingHealth = (0,_vibelet_runtime_policy_mjs__WEBPACK_IMPORTED_MODULE_10__/* .shouldReuseHealthyDaemon */ .Z)({
     command,
     daemonHealthy: Boolean(healthyDaemon),
     hasExplicitConfigOverrides,

package/package.json

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