aai-lark-bridge 0.2.28 → 0.2.30

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.28",
7
+ version: "0.2.30",
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",
@@ -59,7 +59,8 @@ var package_default = {
59
59
  author: "Ariseai",
60
60
  repository: {
61
61
  type: "git",
62
- url: "https://gitlab.ariseai.co.th/ariseai/ai-infra"
62
+ url: "git+https://github.com/AriseAIEnterprise/ai-infra.git",
63
+ directory: "packages/aai-lark-bridge"
63
64
  },
64
65
  bin: {
65
66
  "aai-lark-bridge": "./bin/aai-lark-bridge.mjs",
@@ -7268,14 +7269,19 @@ function createClaudeSeat(opts) {
7268
7269
  return "stale_card";
7269
7270
  }
7270
7271
  logins.delete(openId);
7271
- const ok = await withLock(openId, () => l.proc.submit(code.trim())).catch(() => false);
7272
- if (ok && readCredentials(dirOf(openId))) {
7272
+ const r = await withLock(openId, () => l.proc.submit(code.trim())).catch(() => "failed");
7273
+ if (r === "retry") {
7274
+ logins.set(openId, l);
7275
+ log.info("user-gateway", "claude.login-code-retry", { sender: tail62(openId) });
7276
+ return "retry_code";
7277
+ }
7278
+ if (r === "ok" && readCredentials(dirOf(openId))) {
7273
7279
  log.info("user-gateway", "claude.login-completed", { sender: tail62(openId) });
7274
7280
  closeCard(l.card, "\u5DF2\u767B\u5F55\u3002\u4E4B\u540E\u63D0\u95EE\u4F1A\u7528\u4F60\u81EA\u5DF1\u7684 Claude \u5E2D\u4F4D\u3002");
7275
7281
  return "logged_in";
7276
7282
  }
7277
7283
  log.warn("user-gateway", "claude.login-failed", { sender: tail62(openId) });
7278
- closeCard(l.card, "\u6388\u6743\u7801\u4E0D\u5BF9\uFF0C\u8FD9\u5F20\u5361\u7247\u5DF2\u4F5C\u5E9F\uFF0C\u5DF2\u7ED9\u4F60\u53D1\u4E86\u65B0\u5361\u7247\u3002");
7284
+ closeCard(l.card, "\u6388\u6743\u7801\u88AB\u62D2\u7EDD\uFF08\u8FC7\u671F\u6216\u5DF2\u7528\u8FC7\uFF09\uFF0C\u8FD9\u5F20\u5361\u7247\u5DF2\u4F5C\u5E9F\uFF0C\u5DF2\u7ED9\u4F60\u53D1\u4E86\u65B0\u5361\u7247\uFF1A\u8BF7\u70B9\u65B0\u5361\u7247\u7684\u300C\u53BB\u6388\u6743\u300D\u91CD\u65B0\u83B7\u53D6\u6388\u6743\u7801\uFF0C\u65E7\u7801\u4E0D\u80FD\u518D\u7528\u3002");
7279
7285
  await startLogin(openId);
7280
7286
  return "wrong_code";
7281
7287
  }
@@ -7304,6 +7310,17 @@ function seatFromEnv(env) {
7304
7310
  const list = (env.SDLC_CLAUDE_SEAT_LIST ?? "").split(",").map((s) => s.trim()).filter((s) => /^ou_[A-Za-z0-9_-]{1,100}$/.test(s));
7305
7311
  return { mode, list };
7306
7312
  }
7313
+ function normalizeCode(raw, state) {
7314
+ const c = raw.replace(/[\s\u200b-\u200d\u2060\ufeff]/g, "").replace(/^["'`“”‘’]+|["'`“”‘’]+$/g, "");
7315
+ return state && c && !c.includes("#") ? `${c}#${state}` : c;
7316
+ }
7317
+ function stateOfUrl(url) {
7318
+ try {
7319
+ return new URL(url).searchParams.get("state") || void 0;
7320
+ } catch {
7321
+ return void 0;
7322
+ }
7323
+ }
7307
7324
  function codeShape(code) {
7308
7325
  const c = code.trim();
7309
7326
  const i = c.indexOf("#");
@@ -7334,6 +7351,8 @@ function realClaudeCli(binary = process.env.SDLC_REAL_CLAUDE || "claude") {
7334
7351
  return {
7335
7352
  async startLogin(dir) {
7336
7353
  const p3 = spawn(binary, ["auth", "login", "--claudeai"], { cwd: dir, env: baseEnv(dir), stdio: ["pipe", "pipe", "pipe"] });
7354
+ p3.stdin.on("error", () => {
7355
+ });
7337
7356
  const timer = setTimeout(() => p3.kill("SIGTERM"), LOGIN_MAX_MS + 6e4).unref();
7338
7357
  let out = "";
7339
7358
  const exited = new Promise((resolve3) => {
@@ -7355,33 +7374,41 @@ function realClaudeCli(binary = process.env.SDLC_REAL_CLAUDE || "claude") {
7355
7374
  p3.kill("SIGTERM");
7356
7375
  throw err;
7357
7376
  });
7377
+ const state = stateOfUrl(url);
7358
7378
  return {
7359
7379
  url,
7360
- async submit(code) {
7380
+ async submit(raw) {
7381
+ const code = normalizeCode(raw, state);
7382
+ if (code !== raw.trim()) log.info("user-gateway", "claude.login-code-normalized", { before: codeShape(raw), after: codeShape(code) });
7361
7383
  const before = out.length;
7362
- p3.stdin.end(`${code}
7384
+ p3.stdin.write(`${code}
7363
7385
  `);
7364
7386
  const verdict = await new Promise((resolve3) => {
7365
7387
  const check2 = () => {
7366
- if (/Invalid code/i.test(out.slice(before))) resolve3("invalid");
7388
+ if (/Invalid code/i.test(out.slice(before))) done("invalid");
7389
+ };
7390
+ const to = setTimeout(() => done("timeout"), SUBMIT_MAX_MS);
7391
+ const done = (v) => {
7392
+ clearTimeout(to);
7393
+ p3.stdout.off("data", check2);
7394
+ p3.stderr.off("data", check2);
7395
+ resolve3(v);
7367
7396
  };
7368
7397
  p3.stdout.on("data", check2);
7369
7398
  p3.stderr.on("data", check2);
7370
7399
  check2();
7371
- void exited.then(resolve3);
7372
- setTimeout(() => resolve3("invalid"), SUBMIT_MAX_MS).unref();
7400
+ void exited.then(done);
7373
7401
  });
7402
+ if (verdict === "invalid") return "retry";
7374
7403
  clearTimeout(timer);
7375
- const ok = verdict !== "invalid" && verdict === 0 && /Login successful/i.test(out);
7376
- if (!ok) {
7377
- log.warn("user-gateway", "claude.login-submit-failed", {
7378
- verdict: verdict === "invalid" ? "invalid-or-timeout" : `exit-${verdict}`,
7379
- codeShape: codeShape(code),
7380
- cliOutput: scrub(out.slice(before), code)
7381
- });
7382
- }
7383
- if (verdict === "invalid") p3.kill("SIGTERM");
7384
- return ok;
7404
+ if (verdict === 0 && /Login successful/i.test(out)) return "ok";
7405
+ log.warn("user-gateway", "claude.login-submit-failed", {
7406
+ verdict: verdict === "timeout" ? "timeout" : `exit-${verdict}`,
7407
+ codeShape: codeShape(code),
7408
+ cliOutput: scrub(out.slice(before), code)
7409
+ });
7410
+ if (verdict === "timeout") p3.kill("SIGTERM");
7411
+ return "failed";
7385
7412
  },
7386
7413
  cancel() {
7387
7414
  clearTimeout(timer);
@@ -7502,7 +7529,9 @@ var SEAT_TEXT = {
7502
7529
  needLogin: "\u4F60\u8FD8\u6CA1\u767B\u5F55 Claude \u8D26\u53F7\u3002\u6211\u5DF2\u79C1\u804A\u53D1\u4F60\u4E00\u5F20\u767B\u5F55\u5361\u7247\uFF1A\u70B9\u5361\u7247\u6388\u6743\uFF0C\u628A\u6388\u6743\u7801\u586B\u8FDB\u5361\u7247\u91CC\u7684\u8F93\u5165\u6846\u63D0\u4EA4\uFF0C\u518D\u91CD\u65B0\u63D0\u95EE\u3002\u6388\u6743\u7801\u4E0D\u8981\u53D1\u5728\u804A\u5929\u91CC\u3002",
7503
7530
  pending: "\u4F60\u7684 Claude \u767B\u5F55\u8FD8\u6CA1\u5B8C\u6210\uFF1A\u8BF7\u628A\u6388\u6743\u7801\u586B\u8FDB\u79C1\u804A\u91CC\u90A3\u5F20\u767B\u5F55\u5361\u7247\u7684\u8F93\u5165\u6846\u63D0\u4EA4\uFF0C\u518D\u91CD\u65B0\u63D0\u95EE\u3002\u6388\u6743\u7801\u4E0D\u8981\u53D1\u5728\u804A\u5929\u91CC\u3002",
7504
7531
  loggedIn: "Claude \u767B\u5F55\u6210\u529F\uFF0C\u8BF7\u91CD\u65B0\u63D0\u95EE\u3002",
7505
- wrongCode: "\u6388\u6743\u7801\u4E0D\u5BF9\u3002\u6211\u79C1\u804A\u53D1\u4E86\u4E00\u5F20\u65B0\u5361\u7247\uFF0C\u8BF7\u91CD\u65B0\u70B9\u5361\u7247\u767B\u5F55\u3002",
7532
+ badCode: "\u6CA1\u6536\u5230\u6709\u6548\u7684\u6388\u6743\u7801\uFF08\u7A7A\u7684\uFF0C\u6216\u5E26\u4E86\u7A7A\u683C\u3001\u6362\u884C\uFF09\u3002\u8FD9\u5F20\u5361\u7247\u8FD8\u80FD\u7528\uFF1A\u8BF7\u91CD\u65B0\u590D\u5236\u6388\u6743\u9875\u4E0A\u7684\u5B8C\u6574\u6388\u6743\u7801\uFF0C\u7C98\u8D34\u8FDB\u8F93\u5165\u6846\u518D\u63D0\u4EA4\u3002",
7533
+ retryCode: "\u6388\u6743\u7801\u683C\u5F0F\u4E0D\u5BF9\u3002\u8FD9\u5F20\u5361\u7247\u8FD8\u80FD\u7528\uFF1A\u8BF7\u56DE\u6388\u6743\u9875\u70B9\u300C\u590D\u5236\u300D\u6309\u94AE\u590D\u5236\u5B8C\u6574\u6388\u6743\u7801\uFF08\u542B # \u540E\u9762\u7684\u90E8\u5206\uFF09\uFF0C\u7C98\u8D34\u8FDB\u8F93\u5165\u6846\u518D\u63D0\u4EA4\u3002",
7534
+ wrongCode: "\u6388\u6743\u7801\u88AB\u62D2\u7EDD\uFF08\u8FC7\u671F\u6216\u5DF2\u7528\u8FC7\uFF09\u3002\u6211\u79C1\u804A\u53D1\u4E86\u4E00\u5F20\u65B0\u5361\u7247\uFF1A\u8BF7\u70B9\u65B0\u5361\u7247\u7684\u300C\u53BB\u6388\u6743\u300D\u91CD\u65B0\u83B7\u53D6\u6388\u6743\u7801\uFF0C\u65E7\u7801\u4E0D\u80FD\u518D\u7528\u3002",
7506
7535
  staleCard: "\u8FD9\u5F20\u767B\u5F55\u5361\u7247\u5DF2\u7ECF\u8FC7\u671F\u6216\u4F5C\u5E9F\u4E86\uFF0C\u8BF7\u7528\u6700\u65B0\u7684\u90A3\u5F20\uFF1B\u6CA1\u6709\u7684\u8BDD\u518D\u63D0\u95EE\u4E00\u6B21\u4F1A\u6536\u5230\u65B0\u5361\u7247\u3002",
7507
7536
  loginFailed: "Claude \u767B\u5F55\u5361\u7247\u6682\u65F6\u53D1\u4E0D\u51FA\uFF0C\u8BF7\u7A0D\u540E\u518D\u95EE\u3002",
7508
7537
  refreshFailed: `Claude \u767B\u5F55\u7EED\u671F\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u518D\u95EE\uFF1B\u4E00\u76F4\u4E0D\u884C\u5C31\u79C1\u804A\u6211\u53D1\u300C${LOGOUT_TEXT}\u300D\uFF0C\u518D\u91CD\u65B0\u767B\u5F55\u3002`,
@@ -7569,6 +7598,10 @@ async function submitClaudeLogin(cfg, sub, deps = {}) {
7569
7598
  switch (r.status) {
7570
7599
  case "logged_in":
7571
7600
  return SEAT_TEXT.loggedIn;
7601
+ case "bad_code":
7602
+ return SEAT_TEXT.badCode;
7603
+ case "retry_code":
7604
+ return SEAT_TEXT.retryCode;
7572
7605
  case "wrong_code":
7573
7606
  return SEAT_TEXT.wrongCode;
7574
7607
  case "not_pending":
@@ -12765,16 +12798,24 @@ async function handleCardAction(deps) {
12765
12798
  }
12766
12799
  function handleClaudeLogin(deps, value) {
12767
12800
  const cfg = deps.controls.profileConfig.larkCli.claudeSeat;
12768
- if (!cfg) return;
12801
+ if (!cfg) {
12802
+ log.warn("cardAction", "claude-login-no-seat-config", { messageId: deps.evt.messageId });
12803
+ return;
12804
+ }
12769
12805
  const raw = deps.evt.raw;
12770
12806
  const code = raw?.action?.form_value?.code;
12771
12807
  const chatId = deps.evt.chatId;
12808
+ log.info("cardAction", "claude-login-received", {
12809
+ messageId: deps.evt.messageId,
12810
+ codeShape: typeof code === "string" ? codeShape(code) : `type=${typeof code}`
12811
+ });
12772
12812
  void submitClaudeLogin(cfg, {
12773
12813
  operatorId: deps.evt.operator.openId,
12774
12814
  cardMessageId: deps.evt.messageId,
12775
12815
  nonce: value[LOGIN_CARD_KEY],
12776
12816
  code
12777
12817
  }).then((text) => deps.channel.send(chatId, { markdown: text })).catch((err) => log.fail("cardAction", err, { step: "claude-login" }));
12818
+ return { toast: { type: "info", content: "\u5DF2\u6536\u5230\u6388\u6743\u7801\uFF0C\u6B63\u5728\u9A8C\u8BC1\uFF0C\u7ED3\u679C\u4F1A\u79C1\u804A\u53D1\u4F60\u3002" } };
12778
12819
  }
12779
12820
  async function resolveScope(deps) {
12780
12821
  const chatId = deps.evt.chatId;
@@ -15645,8 +15686,8 @@ async function startChannel(deps) {
15645
15686
  },
15646
15687
  cardAction: async (evt) => {
15647
15688
  markInbound("card-action");
15648
- await withTrace({ chatId: evt.chatId, msgId: evt.messageId }, async () => {
15649
- await handleCardAction({
15689
+ return await withTrace({ chatId: evt.chatId, msgId: evt.messageId }, async () => {
15690
+ return await handleCardAction({
15650
15691
  channel,
15651
15692
  evt,
15652
15693
  sessions: sessions2,
@@ -20046,7 +20087,7 @@ function createGateway(opts) {
20046
20087
  */
20047
20088
  async claudeLoginSubmit(input) {
20048
20089
  let openId, card, nonce;
20049
- const code = typeof input.code === "string" ? input.code.trim() : "";
20090
+ const code = typeof input.code === "string" ? normalizeCode(input.code) : "";
20050
20091
  try {
20051
20092
  openId = str2(input, "openId", OPEN_ID2);
20052
20093
  card = str2(input, "cardMessageId", MESSAGE_ID);
@@ -20054,7 +20095,11 @@ function createGateway(opts) {
20054
20095
  } catch {
20055
20096
  return { status: "bad_request" };
20056
20097
  }
20057
- if (!code || code.length > 500 || /\s/.test(code)) return { status: "wrong_code" };
20098
+ if (!code || code.length > 500) {
20099
+ const why = !code ? "empty" : "too-long";
20100
+ log.warn("user-gateway", "claude.login-submit-rejected", { sender: openId.slice(-6), why, codeShape: codeShape(code) });
20101
+ return { status: "bad_code" };
20102
+ }
20058
20103
  if (!seat.covers(openId)) return { status: "off" };
20059
20104
  return { status: await seat.submitCode(openId, code, { card, nonce }) };
20060
20105
  },