@cli-remote/local 0.0.1 → 0.0.2

package/dist/index.cjs

@@ -9955,6 +9955,7 @@ var import_websocket_server = __toESM(require_websocket_server(), 1);
 var wrapper_default = import_websocket.default;
 
 // src/client.ts
+var import_node_readline = require("node:readline");
 var import_promises2 = require("node:fs/promises");
 var import_node_os4 = require("node:os");
 var import_node_path4 = require("node:path");
@@ -10380,13 +10381,24 @@ function openBrowser(url) {
   } catch {
   }
 }
+async function mergeLocalConfig(patch) {
+  const dir = (0, import_node_path3.join)((0, import_node_os3.homedir)(), DEFAULT_CONFIG_DIR);
+  const path = (0, import_node_path3.join)(dir, CONFIG_FILE);
+  let existing = {};
+  try {
+    existing = JSON.parse(await (0, import_promises.readFile)(path, "utf-8"));
+  } catch {
+  }
+  await (0, import_promises.mkdir)(dir, { recursive: true });
+  await (0, import_promises.writeFile)(path, JSON.stringify({ ...existing, ...patch }, null, 2) + "\n");
+}
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var AuthError = class extends Error {
 };
 async function deviceFlowAuthorize(baseUrl, registrationKey, deviceId) {
   if (!registrationKey) {
     throw new AuthError(
-      "\u7F3A\u5C11 registrationKey\uFF1A\u8BF7\u5728 ~/.cli-remote/config.json \u8BBE\u7F6E\uFF0C\u6216\u7528\u73AF\u5883\u53D8\u91CF REGISTRATION_KEY"
+      "\u7F3A\u5C11 registrationKey\uFF1A\u5199\u5165 ~/.cli-remote/config.json \u6216\u8BBE\u7F6E REGISTRATION_KEY \u540E\u91CD\u8BD5"
     );
   }
   const res = await postJson(`${baseUrl}/oauth/device_authorization`, {
@@ -10508,12 +10520,79 @@ function buildWhitelist(cfg) {
   cfg.whitelist?.remove?.forEach((c) => set.delete(c));
   return set;
 }
+function isTTY() {
+  return process.stdin.isTTY === true;
+}
+async function readInput(prompt) {
+  const rl = (0, import_node_readline.createInterface)({ input: process.stdin, output: process.stdout });
+  try {
+    return await new Promise((resolve) => rl.question(prompt, (answer) => resolve(answer)));
+  } finally {
+    rl.close();
+  }
+}
+function toWsUrl(input) {
+  let s = input.trim();
+  if (/^wss?:\/\//i.test(s)) {
+    return s.replace(/\/+$/, "").replace(/\/ws$/, "") + "/ws";
+  }
+  if (/^https:\/\//i.test(s)) s = "wss://" + s.slice("https://".length);
+  else if (/^http:\/\//i.test(s)) s = "ws://" + s.slice("http://".length);
+  else s = "wss://" + s;
+  return s.replace(/\/+$/, "") + "/ws";
+}
+var DEFAULT_HUB = "wss://cli-remote.mkjs.net/ws";
+async function setupWizard(config, opts) {
+  let url = opts.url ?? process.env.RELAY_URL ?? config.relayUrl ?? void 0;
+  let registrationKey = config.registrationKey ?? process.env.REGISTRATION_KEY ?? process.env.BRIDGE_REGISTRATION_KEY ?? void 0;
+  let changed = false;
+  if (!url) {
+    if (!isTTY()) {
+      console.log("[local] \u7F3A\u5C11 hub \u5730\u5740\uFF0C\u4E14\u5F53\u524D\u975E\u4EA4\u4E92\u7EC8\u7AEF\u3002");
+      console.log("[local] \u7528\u6CD5: cli-local wss://your-hub/ws");
+      console.log('[local] \u6216\u5199\u5165 ~/.cli-remote/config.json: { "relayUrl": "wss://your-hub/ws" }');
+      return null;
+    }
+    const ans = (await readInput(`hub \u5730\u5740\uFF08\u56DE\u8F66\u4F7F\u7528\u9ED8\u8BA4 ${DEFAULT_HUB}\uFF09: `)).trim();
+    url = ans ? toWsUrl(ans) : DEFAULT_HUB;
+    changed = true;
+  }
+  if (!registrationKey) {
+    const base = baseUrlFromWsUrl(url);
+    console.log("");
+    console.log("[local] \u7F3A\u5C11 registrationKey\u3002");
+    console.log(`[local] \u5DF2\u6253\u5F00\u6D4F\u89C8\u5668\uFF0C\u8BF7\u767B\u5F55 ${base} \u5E76\u5728\u300C\u6211\u7684\u8BBE\u5907\u300D\u9875\u590D\u5236 registrationKey`);
+    openBrowser(base);
+    if (!isTTY()) {
+      console.log("[local] \u5F53\u524D\u975E\u4EA4\u4E92\u7EC8\u7AEF\uFF1A\u62FF\u5230 key \u540E\u5199\u5165 ~/.cli-remote/config.json \u518D\u8FD0\u884C\u3002");
+      return null;
+    }
+    const ans = (await readInput("\u7C98\u8D34 registrationKey: ")).trim();
+    if (!ans) {
+      console.log("[local] \u672A\u63D0\u4F9B registrationKey\uFF0C\u9000\u51FA\u3002");
+      return null;
+    }
+    registrationKey = ans;
+    changed = true;
+  }
+  if (changed) {
+    await mergeLocalConfig({ relayUrl: url, registrationKey });
+    console.log("[local] \u914D\u7F6E\u5DF2\u4FDD\u5B58\u5230 ~/.cli-remote/config.json");
+  }
+  return { url, registrationKey };
+}
 async function startLocal(opts = {}) {
   const config = await loadConfig();
-  const url = opts.url ?? process.env.RELAY_URL ?? config.relayUrl ?? "ws://127.0.0.1:8080/ws";
+  let url = opts.url ?? process.env.RELAY_URL ?? config.relayUrl ?? "ws://127.0.0.1:8080/ws";
+  let registrationKey = config.registrationKey ?? process.env.REGISTRATION_KEY ?? process.env.BRIDGE_REGISTRATION_KEY;
+  if (!config.relayUrl && !process.env.RELAY_URL && !opts.url || !registrationKey) {
+    const setup = await setupWizard(config, opts);
+    if (!setup) return;
+    url = setup.url;
+    registrationKey = setup.registrationKey;
+  }
   const baseUrl = baseUrlFromWsUrl(url);
   const whitelist = buildWhitelist(config);
-  const registrationKey = config.registrationKey ?? process.env.REGISTRATION_KEY ?? process.env.BRIDGE_REGISTRATION_KEY;
   const pty = new PtyManager();
   const loggers = /* @__PURE__ */ new Map();
   const lineBuffers = /* @__PURE__ */ new Map();
@@ -10819,14 +10898,17 @@ if (argUrl && !argMatch && (argUrl === "-h" || argUrl === "--help" || argUrl ===
 usage:
   cli-local [HUB_URL]
 
-\u9996\u6B21\u8FD0\u884C\u4F1A\u8D70 OAuth Device Flow\uFF08RFC 8628\uFF09\uFF1A
-  1. \u5728 ~/.cli-remote/config.json \u914D\u7F6E registrationKey\uFF08\u4ECE web\u300C\u6211\u7684\u8BBE\u5907\u300D\u9875\u590D\u5236\uFF09
-  2. \u8FD0\u884C cli-local \u2192 \u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668 \u2192 \u767B\u5F55\u5E76\u6279\u51C6\u672C\u8BBE\u5907
-  3. \u51ED\u8BC1\u5B58\u5165 ~/.cli-remote/credentials.json\uFF080600\uFF09\uFF0C\u4E4B\u540E\u81EA\u52A8\u7EED\u671F
+\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
+  2. \u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668 \u2192 \u767B\u5F55 hub\uFF0C\u4ECE\u300C\u6211\u7684\u8BBE\u5907\u300D\u9875\u590D\u5236 registrationKey
+  3. \u56DE\u5230\u7EC8\u7AEF\u7C98\u8D34 key \u2192 \u81EA\u52A8\u5199\u5165 ~/.cli-remote/config.json
+  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
 
 environment:
   RELAY_URL                 hub ws url (overrides argv and config)
   REGISTRATION_KEY          registration key (fallback of config.json)
+  CLI_LOCAL_NO_BROWSER=1    \u4E0D\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\uFF08\u53EA\u6253\u5370\u94FE\u63A5\uFF09
   HOME                      where ~/.cli-remote/ lives
 
 config (~/.cli-remote/config.json):
@@ -10841,7 +10923,11 @@ example:
   process.exit(0);
 }
 startLocal(argMatch ? { url: argUrl } : {}).catch((err) => {
-  console.error("[local] fatal:", err);
+  if (err instanceof AuthError) {
+    console.error(`[local] ${err.message}`);
+  } else {
+    console.error("[local] fatal:", err);
+  }
   process.exit(1);
 });
 process.on("SIGINT", () => process.exit(0));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cli-remote/local",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "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": {