engine7 7.1.24 → 7.1.26

package/dist/cli.mjs

@@ -575,6 +575,157 @@ import * as path2 from "node:path";
 import * as fs2 from "node:fs";
 import * as readline from "node:readline";
 import { fileURLToPath } from "node:url";
+
+// src/feishu-quick-register.ts
+var ACCOUNTS_URL = {
+  feishu: "https://accounts.feishu.cn",
+  lark: "https://accounts.larksuite.com"
+};
+var REGISTRATION_PATH = "/oauth/v1/app/registration";
+var REQUEST_TIMEOUT_MS = 1e4;
+var DEFAULT_POLL_INTERVAL = 5;
+async function postRegistration(domain, body) {
+  const url = `${ACCOUNTS_URL[domain]}${REGISTRATION_PATH}`;
+  const res = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams(body).toString(),
+    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
+  });
+  if (!res.ok) {
+    throw new Error(`\u98DE\u4E66\u6CE8\u518C\u63A5\u53E3\u8FD4\u56DE ${res.status}: ${await res.text()}`);
+  }
+  return res.json();
+}
+async function initRegistration(domain) {
+  const res = await postRegistration(domain, { action: "init" });
+  if (!res.supported_auth_methods?.includes("client_secret")) {
+    throw new Error("\u5F53\u524D\u98DE\u4E66\u73AF\u5883\u4E0D\u652F\u6301 client_secret \u8BA4\u8BC1\uFF0C\u65E0\u6CD5\u81EA\u52A8\u6CE8\u518C");
+  }
+}
+async function beginRegistration(domain) {
+  const res = await postRegistration(domain, {
+    action: "begin",
+    archetype: "PersonalAgent",
+    auth_method: "client_secret",
+    request_user_info: "open_id"
+  });
+  if (!res.device_code || !res.verification_uri_complete) {
+    throw new Error(`\u98DE\u4E66\u6CE8\u518C\u5931\u8D25: \u672A\u8FD4\u56DE device_code
+${JSON.stringify(res)}`);
+  }
+  return {
+    deviceCode: res.device_code,
+    qrUrl: res.verification_uri_complete,
+    userCode: res.user_code,
+    interval: res.interval ?? DEFAULT_POLL_INTERVAL,
+    expireIn: res.expire_in ?? 300
+  };
+}
+async function pollRegistration(domain, deviceCode, interval, deadline, onLog, signal) {
+  let currentInterval = interval;
+  let currentDomain = domain;
+  while (Date.now() < deadline) {
+    if (signal?.aborted) return null;
+    let res;
+    try {
+      res = await postRegistration(currentDomain, {
+        action: "poll",
+        device_code: deviceCode
+      });
+    } catch {
+      await sleep(currentInterval * 1e3);
+      continue;
+    }
+    if (res.user_info?.tenant_brand === "lark" && currentDomain === "feishu") {
+      currentDomain = "lark";
+      onLog?.("\u68C0\u6D4B\u5230 Lark \u8D26\u53F7\uFF0C\u5207\u6362\u57DF\u540D...");
+      continue;
+    }
+    if (res.client_id && res.client_secret) {
+      return {
+        appId: res.client_id,
+        appSecret: res.client_secret,
+        openId: res.user_info?.open_id,
+        domain: currentDomain
+      };
+    }
+    if (res.error) {
+      if (res.error === "authorization_pending") {
+      } else if (res.error === "slow_down") {
+        currentInterval += 5;
+      } else if (res.error === "access_denied") {
+        throw new Error("\u7528\u6237\u62D2\u7EDD\u4E86\u6388\u6743");
+      } else if (res.error === "expired_token") {
+        throw new Error("\u4E8C\u7EF4\u7801\u5DF2\u8FC7\u671F");
+      } else {
+        throw new Error(`\u98DE\u4E66\u6CE8\u518C\u9519\u8BEF: ${res.error} \u2014 ${res.error_description ?? ""}`);
+      }
+    }
+    await sleep(currentInterval * 1e3);
+  }
+  return null;
+}
+async function registerFeishuApp(options = {}) {
+  const domain = options.domain ?? "feishu";
+  const timeoutSec = options.timeoutSec ?? 300;
+  const log = options.onLog ?? (() => {
+  });
+  log("\u68C0\u67E5\u98DE\u4E66\u73AF\u5883...");
+  await initRegistration(domain);
+  log("\u751F\u6210\u4E8C\u7EF4\u7801...");
+  const { deviceCode, qrUrl, interval, expireIn } = await beginRegistration(domain);
+  options.onQrCode?.(qrUrl);
+  log(`\u8BF7\u7528\u98DE\u4E66 App \u626B\u63CF\u4E8C\u7EF4\u7801\uFF08${expireIn}\u79D2\u540E\u8FC7\u671F\uFF09...`);
+  const deadline = Date.now() + Math.min(expireIn, timeoutSec) * 1e3;
+  const result = await pollRegistration(domain, deviceCode, interval, deadline, log, options.signal);
+  if (result) {
+    log(`\u2705 \u6CE8\u518C\u6210\u529F\uFF01App ID: ${result.appId}`);
+  } else {
+    log("\u23F0 \u4E8C\u7EF4\u7801\u5DF2\u8FC7\u671F");
+  }
+  return result;
+}
+function sleep(ms) {
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
+}
+
+// src/qr-render.ts
+var qrcodeModule = null;
+async function getQrModule() {
+  if (qrcodeModule) return qrcodeModule;
+  try {
+    qrcodeModule = await import("qrcode-terminal");
+  } catch {
+    try {
+      qrcodeModule = await import("qrcode");
+    } catch {
+      throw new Error("\u8BF7\u5148\u5B89\u88C5 qrcode-terminal: npm install qrcode-terminal");
+    }
+  }
+  return qrcodeModule;
+}
+async function renderQrTerminal(url, options) {
+  const mod = await getQrModule();
+  return new Promise((resolve2, reject) => {
+    try {
+      if (mod.generate) {
+        mod.generate(url, { small: options?.small ?? true }, (output) => {
+          resolve2(output);
+        });
+      } else if (mod.toString) {
+        const output = mod.toString(url, { type: "terminal", small: options?.small ?? true });
+        resolve2(output);
+      } else {
+        reject(new Error("\u4E0D\u652F\u6301\u7684\u4E8C\u7EF4\u7801\u5E93"));
+      }
+    } catch (err) {
+      reject(err);
+    }
+  });
+}
+
+// src/cli-init.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path2.dirname(__filename);
 var SCHEMA_VERSION = 1;
@@ -747,9 +898,47 @@ async function interactiveConfig(rl, defaults) {
   const feishuAns = await ask(rl, "\u542F\u7528\u98DE\u4E66? (y/n)", "n");
   v.feishuEnabled = feishuAns.toLowerCase() === "y";
   if (v.feishuEnabled) {
-    v.feishuAppId = await ask(rl, "\u98DE\u4E66 App ID");
-    v.feishuAppSecret = await ask(rl, "\u98DE\u4E66 App Secret");
-    v.feishuOpenId = await ask(rl, "\u4F60\u7684\u98DE\u4E66 open_id");
+    console.log("\n  \u98DE\u4E66\u914D\u7F6E\u65B9\u5F0F\uFF1A");
+    console.log("  1. \u626B\u7801\u81EA\u52A8\u521B\u5EFA\uFF08\u63A8\u8350\uFF0C30\u79D2\u641E\u5B9A\uFF09");
+    console.log("  2. \u624B\u52A8\u8F93\u5165 App ID / App Secret");
+    const feishuMode = await ask(rl, "\u9009\u62E9 (1/2)", "1");
+    if (feishuMode === "1") {
+      console.log("\n\u{1F4DD} \u6B63\u5728\u751F\u6210\u98DE\u4E66\u4E8C\u7EF4\u7801...\n");
+      const result = await registerFeishuApp({
+        onLog: (msg) => console.log(`  ${msg}`),
+        onQrCode: async (url) => {
+          try {
+            const qr = await renderQrTerminal(url, { small: true });
+            console.log(qr);
+          } catch {
+            console.log(`
+  \u8BF7\u5728\u624B\u673A\u6D4F\u89C8\u5668\u6253\u5F00\u6B64\u94FE\u63A5\u626B\u7801\uFF1A
+  ${url}
+`);
+          }
+        }
+      });
+      if (result) {
+        v.feishuAppId = result.appId;
+        v.feishuAppSecret = result.appSecret;
+        v.feishuOpenId = result.openId || "";
+        console.log(`
+  \u2705 App ID: ${result.appId}`);
+        console.log(`  \u2705 App Secret: ${result.appSecret.slice(0, 6)}...`);
+        if (result.openId) {
+          console.log(`  \u2705 Open ID: ${result.openId}`);
+        }
+      } else {
+        console.log("\n  \u26A0\uFE0F \u626B\u7801\u8D85\u65F6\u6216\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u8F93\u5165");
+        v.feishuAppId = await ask(rl, "\u98DE\u4E66 App ID");
+        v.feishuAppSecret = await ask(rl, "\u98DE\u4E66 App Secret");
+        v.feishuOpenId = await ask(rl, "\u4F60\u7684\u98DE\u4E66 open_id\uFF08\u56DE\u8F66\u8DF3\u8FC7\uFF09", "");
+      }
+    } else {
+      v.feishuAppId = await ask(rl, "\u98DE\u4E66 App ID");
+      v.feishuAppSecret = await ask(rl, "\u98DE\u4E66 App Secret");
+      v.feishuOpenId = await ask(rl, "\u4F60\u7684\u98DE\u4E66 open_id\uFF08\u56DE\u8F66\u8DF3\u8FC7\uFF09", "");
+    }
   }
   const tavilyKey = await ask(rl, "Tavily API Key\uFF08\u8054\u7F51\u641C\u7D22\uFF0C\u56DE\u8F66\u8DF3\u8FC7\uFF09", "");
   v.tavilyKey = tavilyKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engine7",
-  "version": "7.1.24",
+  "version": "7.1.26",
   "type": "module",
   "description": "Engine 7 — Self-hosted AI agent engine",
   "main": "dist/main.mjs",
@@ -35,6 +35,7 @@
     "chokidar": "^5.0.0",
     "croner": "^10.0.1",
     "discord.js": "^14.26.4",
+    "qrcode-terminal": "^0.12.0",
     "sharp": "^0.34.5",
     "sqlite-vec": "^0.1.9",
     "turndown": "^7.2.4",