@cli-remote/local 0.0.2 → 0.0.3

package/dist/index.cjs

@@ -9940,6 +9940,8 @@ var require_lib = __commonJS({
 
 // src/index.ts
 var import_node_fs2 = require("node:fs");
+var import_node_child_process2 = require("node:child_process");
+var import_node_os5 = require("node:os");
 var import_node_path5 = require("node:path");
 var import_node_url = require("node:url");
 
@@ -9978,6 +9980,7 @@ var ACCESS_TOKEN_TTL_MS = 60 * 6e4;
 var REFRESH_TOKEN_TTL_MS = 30 * 24 * 60 * 6e4;
 var REFRESH_MARGIN_MS = 5 * 6e4;
 var OUTPUT_BUFFER_SIZE = 500;
+var RECONNECT_DELAYS_MS = [1e3, 2e3, 4e3, 8e3, 16e3, 3e4];
 var DEFAULT_CONFIG_DIR = ".cli-remote";
 var CREDENTIALS_FILE = "credentials.json";
 var CONFIG_FILE = "config.json";
@@ -10211,6 +10214,10 @@ var SessionLogger = class {
     if (this.closed) return;
     this.write({ ts: Date.now(), event: "rejected", cmd, reason, dangerous });
   }
+  logForced(cmd) {
+    if (this.closed) return;
+    this.write({ ts: Date.now(), event: "forced", cmd });
+  }
   logExit(code) {
     if (this.closed) return;
     this.write({ ts: Date.now(), event: "exit", code });
@@ -10600,23 +10607,17 @@ async function startLocal(opts = {}) {
   console.log(`[local] connecting to ${url}`);
   console.log(`[local] deviceId=${credentials.deviceId}`);
   console.log(`[local] whitelist: ${whitelist.size} commands`);
-  const ws = new wrapper_default(url);
+  let ws = null;
   let heartbeatTimer = null;
-  function cleanup(code = 0) {
-    pty.killAll();
-    for (const [, logger] of loggers) logger.logExit(-1);
-    loggers.clear();
-    lineBuffers.clear();
+  let reconnectTimer = null;
+  let reconnectAttempts = 0;
+  let userExitCode = null;
+  function stopHeartbeat() {
     if (heartbeatTimer) clearInterval(heartbeatTimer);
-    try {
-      ws.close();
-    } catch {
-    }
-    process.exit(code);
+    heartbeatTimer = null;
   }
-  ws.on("open", () => {
-    console.log("[local] connected");
-    ws.send(
+  function sendAuth() {
+    ws?.send(
       encodeFrame({
         t: "auth",
         role: "bridge",
@@ -10624,13 +10625,73 @@ async function startLocal(opts = {}) {
         token: credentials.accessToken
       })
     );
-    heartbeatTimer = setInterval(() => {
-      if (ws.readyState === wrapper_default.OPEN) {
-        ws.send(encodeFrame({ t: "ping" }));
-      }
-    }, HEARTBEAT_INTERVAL_MS);
-  });
-  ws.on("message", (raw) => {
+  }
+  function connect() {
+    if (userExitCode !== null) return;
+    const sock = new wrapper_default(url);
+    ws = sock;
+    sock.on("open", () => {
+      console.log("[local] connected");
+      sendAuth();
+      stopHeartbeat();
+      heartbeatTimer = setInterval(() => {
+        if (sock.readyState === wrapper_default.OPEN) {
+          sock.send(encodeFrame({ t: "ping" }));
+        }
+      }, HEARTBEAT_INTERVAL_MS);
+    });
+    sock.on("message", (raw) => handleFrame(sock, raw));
+    sock.on("close", () => {
+      stopHeartbeat();
+      if (ws === sock) ws = null;
+      if (userExitCode !== null) {
+        process.exit(userExitCode);
+      }
+      console.log("[local] disconnected; PTY sessions kept alive, reconnecting\u2026");
+      scheduleReconnect();
+    });
+    sock.on("error", (err) => {
+      console.error("[local] ws error:", err.message);
+    });
+  }
+  async function scheduleReconnect() {
+    if (reconnectTimer || userExitCode !== null) return;
+    const idx = Math.min(reconnectAttempts, RECONNECT_DELAYS_MS.length - 1);
+    const delay = RECONNECT_DELAYS_MS[idx];
+    reconnectAttempts++;
+    console.log(`[local] reconnecting in ${Math.round(delay / 1e3)}s (attempt ${reconnectAttempts})`);
+    reconnectTimer = setTimeout(() => {
+      reconnectTimer = null;
+      ensureFreshAccessToken(baseUrl, credentials).then((creds) => {
+        credentials = creds;
+        connect();
+      }).catch(async (e) => {
+        await clearCredentials();
+        console.error(`[local] ${e.message}`);
+        console.error("[local] \u51ED\u8BC1\u5DF2\u5931\u6548\u5E76\u6E05\u9664\uFF1B\u8BF7\u91CD\u65B0\u8FD0\u884C cli-local \u5B8C\u6210\u6388\u6743");
+        exitProcess(1);
+      });
+    }, delay);
+  }
+  function exitProcess(code) {
+    userExitCode = code;
+    if (reconnectTimer) clearTimeout(reconnectTimer);
+    reconnectTimer = null;
+    pty.killAll();
+    for (const [, logger] of loggers) logger.logExit(-1);
+    loggers.clear();
+    lineBuffers.clear();
+    stopHeartbeat();
+    try {
+      ws?.close();
+    } catch {
+    }
+    process.exit(code);
+  }
+  function cleanup(code = 0) {
+    exitProcess(code);
+  }
+  function handleFrame(sock, raw) {
     let frame;
     try {
       frame = decodeFrame(toUint8(raw));
@@ -10639,6 +10700,10 @@ async function startLocal(opts = {}) {
     }
     switch (frame.t) {
       case "auth-ok":
+        if (reconnectAttempts > 0) {
+          console.log(`[local] reconnected after ${reconnectAttempts} attempt(s); ${pty.list().length} PTY session(s) alive`);
+        }
+        reconnectAttempts = 0;
         console.log(`[local] auth ok, deviceId=${frame.channelId}`);
         break;
       case "auth-err":
@@ -10664,20 +10729,13 @@ async function startLocal(opts = {}) {
       default:
         console.log("[local] unhandled frame:", frame.t);
     }
-  });
+  }
   async function handleAuthErr(reason) {
     if (reason === "access token expired") {
       try {
         credentials = await ensureFreshAccessToken(baseUrl, credentials);
         console.log("[local] token refreshed, retrying auth");
-        ws.send(
-          encodeFrame({
-            t: "auth",
-            role: "bridge",
-            deviceId: credentials.deviceId,
-            token: credentials.accessToken
-          })
-        );
+        sendAuth();
         return;
       } catch (e) {
         console.error(`[local] ${e.message}`);
@@ -10686,7 +10744,7 @@ async function startLocal(opts = {}) {
     await clearCredentials();
     console.error("[local] auth failed:", reason);
     console.error("[local] \u51ED\u8BC1\u5DF2\u6E05\u9664\uFF0C\u8BF7\u91CD\u65B0\u8FD0\u884C cli-local \u5B8C\u6210\u6388\u6743");
-    cleanup(1);
+    exitProcess(1);
   }
   function handleSpawn(frame) {
     const sessionId = frame.sessionId;
@@ -10742,6 +10800,15 @@ async function startLocal(opts = {}) {
     const logger = loggers.get(sessionId);
     const session = pty.get(sessionId);
     if (!session || !logger) return;
+    if (frame.force) {
+      const line = new TextDecoder().decode(frame.data);
+      ptyWriteChar(sessionId, line + "\r");
+      logger.logInput(new TextEncoder().encode(line + "\r"));
+      logger.logForced(line);
+      lineBuffers.set(sessionId, "");
+      console.log(`[local] forced execution in ${sessionId}: ${line}`);
+      return;
+    }
     if (session.cmd === "shell" && !session.inAltScreen) {
       handleShellInput(sessionId, frame.data, logger);
     } else {
@@ -10816,23 +10883,13 @@ async function startLocal(opts = {}) {
     );
   }
   function safeSend(data) {
-    if (ws.readyState === wrapper_default.OPEN) {
+    if (ws && ws.readyState === wrapper_default.OPEN) {
       ws.send(data);
     }
   }
-  ws.on("close", () => {
-    if (heartbeatTimer) clearInterval(heartbeatTimer);
-    pty.killAll();
-    for (const [, logger] of loggers) logger.logExit(-1);
-    loggers.clear();
-    lineBuffers.clear();
-    console.log("[local] disconnected");
-  });
-  ws.on("error", (err) => {
-    console.error("[local] error:", err.message);
-  });
   process.on("SIGINT", () => cleanup(0));
   process.on("SIGTERM", () => cleanup(0));
+  connect();
 }
 function toUint8(raw) {
   if (raw instanceof Buffer) return new Uint8Array(raw.buffer, raw.byteOffset, raw.byteLength);
@@ -10897,6 +10954,8 @@ if (argUrl && !argMatch && (argUrl === "-h" || argUrl === "--help" || argUrl ===
 
 usage:
   cli-local [HUB_URL]
+  cli-local install [HUB_URL]      \u5B89\u88C5 macOS launchd \u5E38\u9A7B\u670D\u52A1\uFF08\u5F00\u673A\u81EA\u542F + \u65AD\u7EBF\u81EA\u52A8\u91CD\u8FDE\uFF09
+  cli-local uninstall              \u5378\u8F7D launchd \u5E38\u9A7B\u670D\u52A1
 
 \u9996\u6B21\u8FD0\u884C\uFF08\u65E0\u914D\u7F6E\uFF09\u4F1A\u8FDB\u5165\u5F15\u5BFC\uFF1A
   1. \u63D0\u793A hub \u5730\u5740\uFF08\u56DE\u8F66\u7528\u9ED8\u8BA4\uFF09
@@ -10905,6 +10964,8 @@ usage:
   4. \u968F\u540E\u8D70 OAuth Device Flow\uFF08RFC 8628\uFF09\uFF1A\u81EA\u52A8\u6253\u5F00\u6388\u6743\u9875 \u2192 \u6279\u51C6\u672C\u8BBE\u5907
   5. \u51ED\u8BC1\u5B58\u5165 ~/.cli-remote/credentials.json\uFF080600\uFF09\uFF0C\u4E4B\u540E\u81EA\u52A8\u7EED\u671F
 
+\u65AD\u7EBF\u81EA\u52A8\u91CD\u8FDE\uFF1Ahub \u91CD\u542F/\u7F51\u7EDC\u95EA\u65AD\u540E\u8FDB\u7A0B\u4E0D\u9000\u51FA\uFF0CPTY \u4F1A\u8BDD\u4FDD\u6D3B\u5E76\u81EA\u52A8\u91CD\u8FDE\u3002
+
 environment:
   RELAY_URL                 hub ws url (overrides argv and config)
   REGISTRATION_KEY          registration key (fallback of config.json)
@@ -10919,7 +10980,119 @@ config (~/.cli-remote/config.json):
   }
 
 example:
-  cli-local wss://cli-remote.mkjs.net/ws`);
+  cli-local wss://cli-remote.mkjs.net/ws
+  cli-local install                # \u914D\u7F6E\u5E76\u6388\u6743\u540E\uFF0C\u5B89\u88C5\u5E38\u9A7B\u670D\u52A1`);
+  process.exit(0);
+}
+var LAUNCHD_LABEL = "net.cli-remote.local";
+function launchdPlistPath() {
+  return (0, import_node_path5.join)((0, import_node_os5.homedir)(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
+}
+function entryScript() {
+  const a1 = process.argv[1];
+  if (!a1 || a1.endsWith(".ts")) return null;
+  try {
+    return (0, import_node_fs2.realpathSync)(a1);
+  } catch {
+    return a1;
+  }
+}
+function run(cmd, args, okToFail = false) {
+  try {
+    return (0, import_node_child_process2.execFileSync)(cmd, args, { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] });
+  } catch (e) {
+    if (okToFail) return null;
+    throw e;
+  }
+}
+function launchdInstall(urlArg) {
+  if (process.platform !== "darwin") {
+    console.error(`[local] launchd \u5E38\u9A7B\u4EC5\u652F\u6301 macOS\uFF08\u5F53\u524D ${process.platform}\uFF09\uFF1BLinux \u8BF7\u7528 systemd --user \u81EA\u884C\u6258\u7BA1`);
+    process.exit(1);
+  }
+  const home = (0, import_node_os5.homedir)();
+  const entry = entryScript();
+  if (!entry) {
+    console.error("[local] \u5F53\u524D\u4EE5\u6E90\u7801\uFF08tsx\uFF09\u6A21\u5F0F\u8FD0\u884C\uFF0C\u65E0\u6CD5\u5B89\u88C5\u5E38\u9A7B\u670D\u52A1\u3002");
+    console.error("[local] \u8BF7\u5148\u901A\u8FC7 npm \u5B89\u88C5\uFF1Anpm i -g @cli-remote/local\uFF0C\u518D\u7528\u5B89\u88C5\u7248\u6267\u884C install\u3002");
+    process.exit(1);
+  }
+  if (urlArg) {
+    const cfgDir = (0, import_node_path5.join)(home, DEFAULT_CONFIG_DIR);
+    (0, import_node_fs2.mkdirSync)(cfgDir, { recursive: true });
+    const cfgPath = (0, import_node_path5.join)(cfgDir, "config.json");
+    let cfg = {};
+    try {
+      cfg = JSON.parse((0, import_node_fs2.readFileSync)(cfgPath, "utf-8"));
+    } catch {
+    }
+    cfg.relayUrl = urlArg;
+    (0, import_node_fs2.writeFileSync)(cfgPath, JSON.stringify(cfg, null, 2) + "\n");
+    console.log(`[local] relayUrl \u5DF2\u5199\u5165 ${cfgPath}`);
+  }
+  const credPath = (0, import_node_path5.join)(home, DEFAULT_CONFIG_DIR, CREDENTIALS_FILE);
+  if (!(0, import_node_fs2.existsSync)(credPath)) {
+    console.error("[local] \u5C1A\u672A\u6388\u6743\uFF08\u627E\u4E0D\u5230 credentials.json\uFF09\u3002");
+    console.error("[local] \u8BF7\u5148\u4EA4\u4E92\u5F0F\u8FD0\u884C\u4E00\u6B21 cli-local \u5B8C\u6210\u914D\u7F6E\u4E0E\u6388\u6743\uFF0C\u518D\u5B89\u88C5\u5E38\u9A7B\u670D\u52A1\u3002");
+    process.exit(1);
+  }
+  const plist = launchdPlistPath();
+  const logDir = (0, import_node_path5.join)(home, DEFAULT_CONFIG_DIR, "logs");
+  (0, import_node_fs2.mkdirSync)((0, import_node_path5.dirname)(plist), { recursive: true });
+  (0, import_node_fs2.mkdirSync)(logDir, { recursive: true });
+  const xml = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key><string>${LAUNCHD_LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${process.execPath}</string>
+    <string>${entry}</string>
+  </array>
+  <key>RunAtLoad</key><true/>
+  <key>KeepAlive</key><true/>
+  <key>ThrottleInterval</key><integer>30</integer>
+  <key>StandardOutPath</key><string>${(0, import_node_path5.join)(logDir, "daemon.out.log")}</string>
+  <key>StandardErrorPath</key><string>${(0, import_node_path5.join)(logDir, "daemon.err.log")}</string>
+</dict>
+</plist>
+`;
+  (0, import_node_fs2.writeFileSync)(plist, xml);
+  const uid = process.getuid?.();
+  if (uid === void 0) {
+    console.error("[local] \u65E0\u6CD5\u786E\u5B9A uid\uFF0Claunchd \u5B89\u88C5\u5931\u8D25");
+    process.exit(1);
+  }
+  const guiDomain = `gui/${uid}`;
+  run("launchctl", ["bootout", guiDomain, plist], true);
+  run("launchctl", ["unload", "-w", plist], true);
+  run("launchctl", ["bootstrap", guiDomain, plist]);
+  run("launchctl", ["enable", `${guiDomain}/${LAUNCHD_LABEL}`], true);
+  console.log(`[local] launchd \u670D\u52A1\u5DF2\u5B89\u88C5\u5E76\u542F\u52A8\uFF1A${LAUNCHD_LABEL}`);
+  console.log(`[local]   plist: ${plist}`);
+  console.log("[local]   \u65E5\u5FD7: ~/.cli-remote/logs/daemon.out.log / daemon.err.log");
+  console.log("[local]   \u7BA1\u7406\u670D\u52A1: launchctl kickstart -k, bootout, \u6216 cli-local uninstall");
+}
+function launchdUninstall() {
+  const plist = launchdPlistPath();
+  if (!(0, import_node_fs2.existsSync)(plist)) {
+    console.log("[local] \u672A\u627E\u5230\u5DF2\u5B89\u88C5\u7684\u5E38\u9A7B\u670D\u52A1\uFF08nothing to uninstall\uFF09");
+    process.exit(0);
+  }
+  const uid = process.getuid?.();
+  const guiDomain = `gui/${uid ?? 0}`;
+  run("launchctl", ["bootout", guiDomain, plist], true);
+  run("launchctl", ["unload", "-w", plist], true);
+  (0, import_node_fs2.rmSync)(plist);
+  console.log(`[local] launchd \u670D\u52A1\u5DF2\u505C\u6B62\u5E76\u5378\u8F7D\uFF1A${LAUNCHD_LABEL}`);
+}
+if (argUrl && !argMatch && argUrl === "install") {
+  launchdInstall(process.argv[3]);
+  process.exit(0);
+}
+if (argUrl && !argMatch && argUrl === "uninstall") {
+  launchdUninstall();
   process.exit(0);
 }
 startLocal(argMatch ? { url: argUrl } : {}).catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cli-remote/local",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Local PTY agent for cli-remote — exposes your local CLI tools (claude/codex/kimi-cli/shell) to the mobile web client via a self-hosted hub.",
   "license": "MIT",
   "repository": {