aai-lark-bridge 0.2.38 → 0.2.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.js CHANGED
@@ -4,7 +4,7 @@ import { Command } from "commander";
4
4
  // package.json
5
5
  var package_default = {
6
6
  name: "aai-lark-bridge",
7
- version: "0.2.38",
7
+ version: "0.2.39",
8
8
  description: "Lark AI Native Bridge - Lark\u57FA\u7840\u8BBE\u65BD\u5C42\u548CCLI\u96C6\u6210",
9
9
  type: "module",
10
10
  main: "./dist/index.js",
@@ -7116,6 +7116,7 @@ var LOGOUT_TEXT = "\u9000\u51FA Claude \u767B\u5F55";
7116
7116
  var MIN_TOKEN_LEFT_MS = 2 * 60 * 6e4;
7117
7117
  var MIN_AFTER_REFRESH_MS = 10 * 6e4;
7118
7118
  var REFRESH_COOLDOWN_MS = 30 * 6e4;
7119
+ var REFRESH_RETRY_DELAY_MS = 5e3;
7119
7120
  var READY_NUDGE_MS = 60 * 6e4;
7120
7121
  var LOGIN_MAX_MS = 10 * 6e4;
7121
7122
  var SUBMIT_MAX_MS = 3e4;
@@ -7246,13 +7247,36 @@ function createClaudeSeat(opts) {
7246
7247
  if (!c) return nudge2 ? { status: await startLogin(openId) } : { status: "need_login" };
7247
7248
  const recent = now() - (refreshedAt.get(openId) ?? -Infinity) < REFRESH_COOLDOWN_MS && c.expiresAt - now() >= MIN_AFTER_REFRESH_MS;
7248
7249
  if (c.expiresAt - now() < MIN_TOKEN_LEFT_MS && !recent) {
7249
- const ok = await opts.cli.refresh(dir).catch(() => false);
7250
- c = readCredentials(dir);
7251
- const left = c ? c.expiresAt - now() : 0;
7252
- if (!ok || !c || left < MIN_AFTER_REFRESH_MS) {
7253
- log.warn("user-gateway", "claude.refresh-failed", { sender: tail62(openId), proof, runId });
7254
- return { status: "refresh_failed" };
7250
+ const attempt = async (n) => {
7251
+ const r = normalizeRefresh(await opts.cli.refresh(dir).catch((err) => ({ ok: false, spawnError: scrubOutput(String(err)) })));
7252
+ const cur = readCredentials(dir);
7253
+ const left = cur ? cur.expiresAt - now() : 0;
7254
+ const good = r.ok && !!cur && left >= MIN_AFTER_REFRESH_MS;
7255
+ if (!good) {
7256
+ log.warn("user-gateway", "claude.refresh-failed", {
7257
+ sender: tail62(openId),
7258
+ proof,
7259
+ runId,
7260
+ attempt: n,
7261
+ exitCode: r.exitCode ?? null,
7262
+ signal: r.signal ?? null,
7263
+ timedOut: r.timedOut ?? false,
7264
+ durationMs: r.durationMs ?? null,
7265
+ credentials: cur ? `left-${Math.round(left / 6e4)}min` : "unreadable",
7266
+ stdoutTail: r.stdoutTail ?? "",
7267
+ stderrTail: r.stderrTail ?? "",
7268
+ spawnError: r.spawnError ?? ""
7269
+ });
7270
+ }
7271
+ return { good, cur };
7272
+ };
7273
+ let res = await attempt(1);
7274
+ if (!res.good) {
7275
+ await sleep2(opts.refreshRetryDelayMs ?? REFRESH_RETRY_DELAY_MS);
7276
+ res = await attempt(2);
7255
7277
  }
7278
+ c = res.cur;
7279
+ if (!res.good || !c) return { status: "refresh_failed" };
7256
7280
  refreshedAt.set(openId, now());
7257
7281
  log.info("user-gateway", "claude.refreshed", { sender: tail62(openId), proof, runId });
7258
7282
  }
@@ -7349,21 +7373,48 @@ function scrub(text, code) {
7349
7373
  for (const part of code.trim().split("#")) if (part.length >= 6) t = t.split(part).join("<code>");
7350
7374
  return t.replace(/[A-Za-z0-9_-]{40,}/g, "<long>").replace(/\s+/g, " ").trim().slice(0, 300);
7351
7375
  }
7376
+ var sleep2 = (ms) => ms > 0 ? new Promise((r) => setTimeout(r, ms)) : Promise.resolve();
7377
+ function normalizeRefresh(r) {
7378
+ return typeof r === "boolean" ? { ok: r } : r;
7379
+ }
7380
+ function scrubOutput(text) {
7381
+ const t = text.replace(/"(access|refresh)_?token"\s*:\s*"[^"]*"/gi, '"$1Token":"<redacted>"').replace(/sk-ant-[A-Za-z0-9_-]+/g, "<token>").replace(/\b(Bearer\s+)[A-Za-z0-9._\-+/=]+/gi, "$1<token>").replace(/[A-Za-z0-9_\-.]{32,}/g, "<long>").replace(/\s+/g, " ").trim();
7382
+ return t.length > 400 ? `\u2026${t.slice(-400)}` : t;
7383
+ }
7352
7384
  function realClaudeCli(binary = process.env.SDLC_REAL_CLAUDE || "claude") {
7353
7385
  const baseEnv = (dir) => {
7354
7386
  const keep = Object.fromEntries(Object.entries(process.env).filter(([k]) => /^(PATH|LANG|https?_proxy|no_proxy|HTTPS?_PROXY|NO_PROXY)$/.test(k)));
7355
7387
  return { ...keep, HOME: dir, CLAUDE_CONFIG_DIR: dir };
7356
7388
  };
7389
+ const OUT_KEEP = 4e3;
7357
7390
  const run2 = (args, dir, timeoutMs) => new Promise((resolve3) => {
7358
7391
  void mkdtemp(join19(tmpdir4(), "claude-seat-")).then((cwd) => {
7359
- const p3 = spawn(binary, args, { cwd, env: baseEnv(dir), stdio: ["ignore", "ignore", "ignore"] });
7360
- const t = setTimeout(() => p3.kill("SIGTERM"), timeoutMs).unref();
7361
- p3.on("close", (code) => {
7362
- clearTimeout(t);
7392
+ const started = Date.now();
7393
+ let stdout = "";
7394
+ let stderr = "";
7395
+ let timedOut = false;
7396
+ let settled = false;
7397
+ const finish = (r) => {
7398
+ if (settled) return;
7399
+ settled = true;
7363
7400
  void rm11(cwd, { recursive: true, force: true });
7364
- resolve3(code ?? 1);
7401
+ resolve3({ ...r, durationMs: Date.now() - started, stdoutTail: scrubOutput(stdout), stderrTail: scrubOutput(stderr) });
7402
+ };
7403
+ const p3 = spawn(binary, args, { cwd, env: baseEnv(dir), stdio: ["ignore", "pipe", "pipe"] });
7404
+ p3.stdout.on("data", (d) => stdout = (stdout + d.toString()).slice(-OUT_KEEP));
7405
+ p3.stderr.on("data", (d) => stderr = (stderr + d.toString()).slice(-OUT_KEEP));
7406
+ const t = setTimeout(() => {
7407
+ timedOut = true;
7408
+ p3.kill("SIGTERM");
7409
+ }, timeoutMs).unref();
7410
+ p3.on("close", (code, signal) => {
7411
+ clearTimeout(t);
7412
+ finish({ ok: code === 0, exitCode: code, signal, timedOut });
7413
+ });
7414
+ p3.on("error", (err) => {
7415
+ clearTimeout(t);
7416
+ finish({ ok: false, exitCode: null, spawnError: scrubOutput(String(err)) });
7365
7417
  });
7366
- p3.on("error", () => resolve3(1));
7367
7418
  });
7368
7419
  });
7369
7420
  return {
@@ -7435,7 +7486,7 @@ function realClaudeCli(binary = process.env.SDLC_REAL_CLAUDE || "claude") {
7435
7486
  };
7436
7487
  },
7437
7488
  async refresh(dir) {
7438
- return await run2(["-p", "\u53EA\u56DE\u590D\u6570\u5B571", "--model", "haiku", "--output-format", "json"], dir, 12e4) === 0;
7489
+ return run2(["-p", "\u53EA\u56DE\u590D\u6570\u5B571", "--model", "haiku", "--output-format", "json"], dir, 12e4);
7439
7490
  },
7440
7491
  async logout(dir) {
7441
7492
  await run2(["auth", "logout"], dir, 3e4);
@@ -15326,7 +15377,7 @@ function installStreamResilience(channel, opts = {}) {
15326
15377
  const s = sender;
15327
15378
  const maxAttempts = opts.maxAttempts ?? DEFAULT_MAX_ATTEMPTS;
15328
15379
  const baseDelayMs = opts.baseDelayMs ?? DEFAULT_BASE_DELAY_MS;
15329
- const sleep2 = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
15380
+ const sleep3 = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
15330
15381
  const tracker = {
15331
15382
  streamOptsByCard: /* @__PURE__ */ new Map(),
15332
15383
  lostStreams: /* @__PURE__ */ new WeakSet(),
@@ -15347,7 +15398,7 @@ function installStreamResilience(channel, opts = {}) {
15347
15398
  status: raw?.response?.status,
15348
15399
  code: raw?.response?.data?.code
15349
15400
  });
15350
- await sleep2(baseDelayMs * 3 ** (attempt - 1));
15401
+ await sleep3(baseDelayMs * 3 ** (attempt - 1));
15351
15402
  }
15352
15403
  }
15353
15404
  }
@@ -19958,6 +20009,7 @@ var READ_APIS = ["search-messages", "get-message", "list-chat-messages", "search
19958
20009
  var HANDLE_TTL_MS = 5 * 6e4;
19959
20010
  var MESSAGE_MAX_AGE_MS = 2 * 6e4;
19960
20011
  var CLOCK_SKEW_MS = 3e4;
20012
+ var MAX_HANDLES_PER_MESSAGE = 5;
19961
20013
  var USED_TTL_MS = MESSAGE_MAX_AGE_MS + CLOCK_SKEW_MS + 6e4;
19962
20014
  var AUTH_POLL_MS = 5e3;
19963
20015
  var AUTH_MAX_MS = 10 * 6e4;
@@ -20070,9 +20122,10 @@ function isReadApi(api) {
20070
20122
  }
20071
20123
  function createGateway(opts) {
20072
20124
  const now = opts.now ?? Date.now;
20073
- const sleep2 = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms).unref()));
20125
+ const sleep3 = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms).unref()));
20074
20126
  const handles = /* @__PURE__ */ new Map();
20075
20127
  const used = /* @__PURE__ */ new Map();
20128
+ const issuedFor = /* @__PURE__ */ new Map();
20076
20129
  const inFlight = /* @__PURE__ */ new Set();
20077
20130
  const pendingAuth = /* @__PURE__ */ new Map();
20078
20131
  const tokenRoot = join29(opts.stateDir, "user-tokens", opts.appId);
@@ -20117,7 +20170,7 @@ function createGateway(opts) {
20117
20170
  for (const wait of RATE_LIMIT_BACKOFF_MS) {
20118
20171
  if (r.code === 0 || !isRateLimited(r)) break;
20119
20172
  log.warn("user-gateway", "lark.rate-limited", { api: args.slice(0, 3).join(" "), retryInMs: wait });
20120
- await sleep2(wait);
20173
+ await sleep3(wait);
20121
20174
  r = await opts.exec(args, await appEnv(), timeoutMs);
20122
20175
  }
20123
20176
  return r;
@@ -20126,6 +20179,7 @@ function createGateway(opts) {
20126
20179
  const t = now();
20127
20180
  for (const [h, v] of handles) if (v.expiresAt <= t) handles.delete(h);
20128
20181
  for (const [m, until] of used) if (until <= t) used.delete(m);
20182
+ for (const [m, v] of issuedFor) if (v.until <= t) issuedFor.delete(m);
20129
20183
  }
20130
20184
  async function verify(messageId, purpose, requireP2p = true) {
20131
20185
  sweep();
@@ -20148,6 +20202,31 @@ function createGateway(opts) {
20148
20202
  inFlight.delete(key);
20149
20203
  }
20150
20204
  }
20205
+ async function verifyHandle(messageId) {
20206
+ const v = await verify(messageId, "handle", false);
20207
+ if (typeof v !== "string") {
20208
+ issuedFor.set(messageId, { openId: v.openId, n: 1, until: now() + USED_TTL_MS });
20209
+ return v;
20210
+ }
20211
+ const prev = issuedFor.get(messageId);
20212
+ if (v !== "used" || !prev || prev.n >= MAX_HANDLES_PER_MESSAGE) return v;
20213
+ const key = `handle-again:${messageId}`;
20214
+ if (inFlight.has(key)) return "used";
20215
+ inFlight.add(key);
20216
+ try {
20217
+ const again = await check2(messageId);
20218
+ if (typeof again === "string") return again;
20219
+ if (again.openId !== prev.openId) return "used";
20220
+ prev.n += 1;
20221
+ log.info("user-gateway", "identity.reissue", { messageId, sender: tail6(again.openId), n: prev.n });
20222
+ return again;
20223
+ } catch (err) {
20224
+ log.warn("user-gateway", "verify.failed", { messageId, detail: String(err) });
20225
+ return "lark_error";
20226
+ } finally {
20227
+ inFlight.delete(key);
20228
+ }
20229
+ }
20151
20230
  async function check2(messageId) {
20152
20231
  const msg = await asApp(["api", "GET", `/open-apis/im/v1/messages/${messageId}`, "--as", "bot"]);
20153
20232
  const mjson = parseJson4(msg.stdout);
@@ -20244,7 +20323,8 @@ function createGateway(opts) {
20244
20323
  cli: opts.claudeCli ?? realClaudeCli(),
20245
20324
  sendCard,
20246
20325
  updateCard,
20247
- now
20326
+ now,
20327
+ refreshRetryDelayMs: opts.claudeRefreshRetryDelayMs
20248
20328
  });
20249
20329
  async function startAuth(openId) {
20250
20330
  if (pendingAuth.has(openId)) return;
@@ -20286,7 +20366,7 @@ function createGateway(opts) {
20286
20366
  return async () => {
20287
20367
  const deadline = now() + AUTH_MAX_MS;
20288
20368
  while (now() < deadline) {
20289
- await sleep2(AUTH_POLL_MS);
20369
+ await sleep3(AUTH_POLL_MS);
20290
20370
  const r = await opts.exec(["auth", "login", "--device-code", deviceCode, "--json"], env(dir), 3e4);
20291
20371
  if (r.code === 0) {
20292
20372
  await writeFile9(authorizedMark(openId), `${new Date(now()).toISOString()}
@@ -20308,7 +20388,7 @@ function createGateway(opts) {
20308
20388
  } catch {
20309
20389
  return { status: "bad_request" };
20310
20390
  }
20311
- const v = await verify(messageId, "handle", false);
20391
+ const v = await verifyHandle(messageId);
20312
20392
  if (typeof v === "string") {
20313
20393
  log.info("user-gateway", "handle.refused", { messageId, runId, result: v });
20314
20394
  return { status: v };