aai-lark-bridge 0.2.37 → 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 +148 -66
- package/dist/cli.js.map +1 -1
- package/package.json +1 -1
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.
|
|
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
|
|
7250
|
-
|
|
7251
|
-
|
|
7252
|
-
|
|
7253
|
-
|
|
7254
|
-
|
|
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
|
|
7360
|
-
|
|
7361
|
-
|
|
7362
|
-
|
|
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(
|
|
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
|
|
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);
|
|
@@ -7497,17 +7548,17 @@ async function requestUserRead(cfg, messageId, deps = {}) {
|
|
|
7497
7548
|
const gatewayRunId = randomUUID();
|
|
7498
7549
|
try {
|
|
7499
7550
|
const r = await callGateway(cfg, "POST", "/handles", { messageId, runId: gatewayRunId }, deps);
|
|
7551
|
+
const withDb = (base) => r.db === true && cfg.dbPrompt ? `${base}
|
|
7552
|
+
|
|
7553
|
+
${cfg.dbPrompt}` : base;
|
|
7554
|
+
const env = (handle2) => ({ [HANDLE_ENV]: handle2, [GATEWAY_ENV]: cfg.gatewayUrl });
|
|
7500
7555
|
if (r.status === "ok" && typeof r.handle === "string") {
|
|
7501
7556
|
log.info("user-read", "handle", { messageId, gatewayRunId });
|
|
7502
|
-
return {
|
|
7503
|
-
|
|
7504
|
-
|
|
7505
|
-
|
|
7506
|
-
|
|
7507
|
-
prompt: r.db === true && cfg.dbPrompt ? `${PROMPT_TOOL}
|
|
7508
|
-
|
|
7509
|
-
${cfg.dbPrompt}` : PROMPT_TOOL
|
|
7510
|
-
};
|
|
7557
|
+
return { kind: "handle", gatewayRunId, env: env(r.handle), prompt: withDb(PROMPT_TOOL) };
|
|
7558
|
+
}
|
|
7559
|
+
if ((r.status === "need_auth" || r.status === "auth_failed") && typeof r.handle === "string") {
|
|
7560
|
+
log.info("user-read", "handle", { messageId, gatewayRunId, authorized: false });
|
|
7561
|
+
return { kind: "handle", gatewayRunId, env: env(r.handle), prompt: withDb(r.status === "need_auth" ? PROMPT_NEED_AUTH : PROMPT_AUTH_FAILED) };
|
|
7511
7562
|
}
|
|
7512
7563
|
log.info("user-read", "no-handle", { messageId, status: String(r.status) });
|
|
7513
7564
|
if (r.status === "need_auth") return { kind: "need_auth", prompt: PROMPT_NEED_AUTH };
|
|
@@ -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
|
|
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
|
|
15401
|
+
await sleep3(baseDelayMs * 3 ** (attempt - 1));
|
|
15351
15402
|
}
|
|
15352
15403
|
}
|
|
15353
15404
|
}
|
|
@@ -16446,12 +16497,13 @@ async function runUserReadBatch(deps) {
|
|
|
16446
16497
|
const first = deps.batch[0];
|
|
16447
16498
|
const last = deps.batch[deps.batch.length - 1];
|
|
16448
16499
|
const cfg = deps.controls.profileConfig.larkCli.perSenderUser;
|
|
16449
|
-
if (!first || !last ||
|
|
16500
|
+
if (!first || !last || !cfg?.enabled || deps.controls.profileConfig.agentKind !== "claude") {
|
|
16450
16501
|
return runAgentBatchInner(deps);
|
|
16451
16502
|
}
|
|
16452
|
-
const
|
|
16453
|
-
|
|
16454
|
-
|
|
16503
|
+
const isP2p = first.chatType === "p2p";
|
|
16504
|
+
const preBinding = deps.preBinding ?? (isP2p ? { result: dmBinding(deps.controls, first, deps.scope) } : void 0);
|
|
16505
|
+
const bound2 = preBinding?.result?.kind === "bound";
|
|
16506
|
+
if (isP2p && !bound2 && deps.batch.length === 1 && isRevokeRequest(last.content)) {
|
|
16455
16507
|
const text = await revokeUserRead(cfg, last.messageId);
|
|
16456
16508
|
await deps.channel.send(first.chatId, { markdown: text }, { replyTo: last.messageId });
|
|
16457
16509
|
return;
|
|
@@ -16460,7 +16512,7 @@ async function runUserReadBatch(deps) {
|
|
|
16460
16512
|
try {
|
|
16461
16513
|
await runAgentBatchInner({
|
|
16462
16514
|
...deps,
|
|
16463
|
-
preBinding,
|
|
16515
|
+
...preBinding ? { preBinding } : {},
|
|
16464
16516
|
userRead: { ...outcome.kind === "handle" ? { extraEnv: outcome.env } : {}, instruction: outcome.prompt }
|
|
16465
16517
|
});
|
|
16466
16518
|
} finally {
|
|
@@ -19785,13 +19837,9 @@ var TASK_HANDLE_TTL_MS = 150 * 6e4;
|
|
|
19785
19837
|
var SQL_LOG_MAX = 2e3;
|
|
19786
19838
|
var LOCK_WAIT_SEC = 60;
|
|
19787
19839
|
var DB_NAME = /^[a-z0-9_-]{1,40}$/;
|
|
19788
|
-
var OPEN_ID = /^ou_[A-Za-z0-9_-]{1,100}$/;
|
|
19789
|
-
var ALL = "*";
|
|
19790
|
-
var isDbReader = (db, openId) => db.readers.includes(ALL) || db.readers.includes(openId);
|
|
19791
19840
|
function dbFromEnv(env, cmd = "") {
|
|
19792
19841
|
const argv = cmd.trim() ? cmd.trim().split(/\s+/) : [];
|
|
19793
|
-
|
|
19794
|
-
return { enabled: (env.SDLC_DB_GATEWAY ?? "").trim() === "on" && argv.length > 0, readers, cmd: argv };
|
|
19842
|
+
return { enabled: (env.SDLC_DB_GATEWAY ?? "").trim() === "on" && argv.length > 0, cmd: argv };
|
|
19795
19843
|
}
|
|
19796
19844
|
function realDbRunner(cmd) {
|
|
19797
19845
|
return (args, timeoutMs) => new Promise((resolve3) => {
|
|
@@ -19961,6 +20009,7 @@ var READ_APIS = ["search-messages", "get-message", "list-chat-messages", "search
|
|
|
19961
20009
|
var HANDLE_TTL_MS = 5 * 6e4;
|
|
19962
20010
|
var MESSAGE_MAX_AGE_MS = 2 * 6e4;
|
|
19963
20011
|
var CLOCK_SKEW_MS = 3e4;
|
|
20012
|
+
var MAX_HANDLES_PER_MESSAGE = 5;
|
|
19964
20013
|
var USED_TTL_MS = MESSAGE_MAX_AGE_MS + CLOCK_SKEW_MS + 6e4;
|
|
19965
20014
|
var AUTH_POLL_MS = 5e3;
|
|
19966
20015
|
var AUTH_MAX_MS = 10 * 6e4;
|
|
@@ -19968,7 +20017,7 @@ var RATE_LIMIT_BACKOFF_MS = [2e3, 5e3, 1e4];
|
|
|
19968
20017
|
var REVOKE_TEXT2 = "\u64A4\u9500\u6388\u6743";
|
|
19969
20018
|
var MESSAGE_ID = /^om_[A-Za-z0-9_-]{1,100}$/;
|
|
19970
20019
|
var CHAT_ID = /^oc_[A-Za-z0-9_-]{1,100}$/;
|
|
19971
|
-
var
|
|
20020
|
+
var OPEN_ID = /^ou_[A-Za-z0-9_-]{1,100}$/;
|
|
19972
20021
|
var RUN_ID = /^[A-Za-z0-9._:-]{1,200}$/;
|
|
19973
20022
|
var NONCE = /^[0-9a-f]{32}$/;
|
|
19974
20023
|
var TASK_GUID = /^[A-Za-z0-9-]{8,100}$/;
|
|
@@ -20073,9 +20122,10 @@ function isReadApi(api) {
|
|
|
20073
20122
|
}
|
|
20074
20123
|
function createGateway(opts) {
|
|
20075
20124
|
const now = opts.now ?? Date.now;
|
|
20076
|
-
const
|
|
20125
|
+
const sleep3 = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms).unref()));
|
|
20077
20126
|
const handles = /* @__PURE__ */ new Map();
|
|
20078
20127
|
const used = /* @__PURE__ */ new Map();
|
|
20128
|
+
const issuedFor = /* @__PURE__ */ new Map();
|
|
20079
20129
|
const inFlight = /* @__PURE__ */ new Set();
|
|
20080
20130
|
const pendingAuth = /* @__PURE__ */ new Map();
|
|
20081
20131
|
const tokenRoot = join29(opts.stateDir, "user-tokens", opts.appId);
|
|
@@ -20120,7 +20170,7 @@ function createGateway(opts) {
|
|
|
20120
20170
|
for (const wait of RATE_LIMIT_BACKOFF_MS) {
|
|
20121
20171
|
if (r.code === 0 || !isRateLimited(r)) break;
|
|
20122
20172
|
log.warn("user-gateway", "lark.rate-limited", { api: args.slice(0, 3).join(" "), retryInMs: wait });
|
|
20123
|
-
await
|
|
20173
|
+
await sleep3(wait);
|
|
20124
20174
|
r = await opts.exec(args, await appEnv(), timeoutMs);
|
|
20125
20175
|
}
|
|
20126
20176
|
return r;
|
|
@@ -20129,6 +20179,7 @@ function createGateway(opts) {
|
|
|
20129
20179
|
const t = now();
|
|
20130
20180
|
for (const [h, v] of handles) if (v.expiresAt <= t) handles.delete(h);
|
|
20131
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);
|
|
20132
20183
|
}
|
|
20133
20184
|
async function verify(messageId, purpose, requireP2p = true) {
|
|
20134
20185
|
sweep();
|
|
@@ -20151,6 +20202,31 @@ function createGateway(opts) {
|
|
|
20151
20202
|
inFlight.delete(key);
|
|
20152
20203
|
}
|
|
20153
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
|
+
}
|
|
20154
20230
|
async function check2(messageId) {
|
|
20155
20231
|
const msg = await asApp(["api", "GET", `/open-apis/im/v1/messages/${messageId}`, "--as", "bot"]);
|
|
20156
20232
|
const mjson = parseJson4(msg.stdout);
|
|
@@ -20160,7 +20236,7 @@ function createGateway(opts) {
|
|
|
20160
20236
|
return msg.code === 0 ? "not_found" : "lark_error";
|
|
20161
20237
|
}
|
|
20162
20238
|
const sender = isRecord6(item.sender) ? item.sender : {};
|
|
20163
|
-
if (sender.sender_type !== "user" || sender.id_type !== "open_id" || typeof sender.id !== "string" || !
|
|
20239
|
+
if (sender.sender_type !== "user" || sender.id_type !== "open_id" || typeof sender.id !== "string" || !OPEN_ID.test(sender.id)) {
|
|
20164
20240
|
return "not_user";
|
|
20165
20241
|
}
|
|
20166
20242
|
const created = Number(item.create_time);
|
|
@@ -20238,7 +20314,7 @@ function createGateway(opts) {
|
|
|
20238
20314
|
const members = Array.isArray(task.members) ? task.members : [];
|
|
20239
20315
|
return members.filter((m) => isRecord6(m) && m.role === "assignee" && typeof m.id === "string").map((m) => m.id);
|
|
20240
20316
|
}
|
|
20241
|
-
const db = opts.db ?? { enabled: false,
|
|
20317
|
+
const db = opts.db ?? { enabled: false, cmd: [] };
|
|
20242
20318
|
const runDb = opts.dbRunner ?? realDbRunner(db.cmd);
|
|
20243
20319
|
const seat = createClaudeSeat({
|
|
20244
20320
|
stateDir: opts.stateDir,
|
|
@@ -20247,7 +20323,8 @@ function createGateway(opts) {
|
|
|
20247
20323
|
cli: opts.claudeCli ?? realClaudeCli(),
|
|
20248
20324
|
sendCard,
|
|
20249
20325
|
updateCard,
|
|
20250
|
-
now
|
|
20326
|
+
now,
|
|
20327
|
+
refreshRetryDelayMs: opts.claudeRefreshRetryDelayMs
|
|
20251
20328
|
});
|
|
20252
20329
|
async function startAuth(openId) {
|
|
20253
20330
|
if (pendingAuth.has(openId)) return;
|
|
@@ -20289,7 +20366,7 @@ function createGateway(opts) {
|
|
|
20289
20366
|
return async () => {
|
|
20290
20367
|
const deadline = now() + AUTH_MAX_MS;
|
|
20291
20368
|
while (now() < deadline) {
|
|
20292
|
-
await
|
|
20369
|
+
await sleep3(AUTH_POLL_MS);
|
|
20293
20370
|
const r = await opts.exec(["auth", "login", "--device-code", deviceCode, "--json"], env(dir), 3e4);
|
|
20294
20371
|
if (r.code === 0) {
|
|
20295
20372
|
await writeFile9(authorizedMark(openId), `${new Date(now()).toISOString()}
|
|
@@ -20302,7 +20379,7 @@ function createGateway(opts) {
|
|
|
20302
20379
|
};
|
|
20303
20380
|
}
|
|
20304
20381
|
return {
|
|
20305
|
-
/** POST /handles
|
|
20382
|
+
/** POST /handles:核实提问人(私聊或群里的消息),发句柄;没授权就发卡片并返回 need_auth,查库开着时同一轮仍带只能查库的句柄(intent 0068)。 */
|
|
20306
20383
|
async requestHandle(input) {
|
|
20307
20384
|
let messageId, runId;
|
|
20308
20385
|
try {
|
|
@@ -20311,27 +20388,33 @@ function createGateway(opts) {
|
|
|
20311
20388
|
} catch {
|
|
20312
20389
|
return { status: "bad_request" };
|
|
20313
20390
|
}
|
|
20314
|
-
const v = await
|
|
20391
|
+
const v = await verifyHandle(messageId);
|
|
20315
20392
|
if (typeof v === "string") {
|
|
20316
20393
|
log.info("user-gateway", "handle.refused", { messageId, runId, result: v });
|
|
20317
20394
|
return { status: v };
|
|
20318
20395
|
}
|
|
20396
|
+
const issue = (read) => {
|
|
20397
|
+
const handle2 = randomBytes10(32).toString("base64url");
|
|
20398
|
+
const expiresAt = now() + HANDLE_TTL_MS;
|
|
20399
|
+
handles.set(handle2, { openId: v.openId, messageId, runId, expiresAt, kind: "dm", db: db.enabled, read });
|
|
20400
|
+
log.info("user-gateway", "handle.issued", { identity: "user", sender: tail6(v.openId), messageId, runId, db: db.enabled, read });
|
|
20401
|
+
return { handle: handle2, expiresAt };
|
|
20402
|
+
};
|
|
20319
20403
|
if (!isAuthorized(v.openId)) {
|
|
20404
|
+
let started = true;
|
|
20320
20405
|
try {
|
|
20321
20406
|
await startAuth(v.openId);
|
|
20322
20407
|
} catch (err) {
|
|
20408
|
+
started = false;
|
|
20323
20409
|
log.warn("user-gateway", "auth.start-failed", { sender: tail6(v.openId), messageId, runId, detail: String(err) });
|
|
20324
|
-
return { status: "auth_failed" };
|
|
20325
20410
|
}
|
|
20326
|
-
log.info("user-gateway", "handle.need-auth", { sender: tail6(v.openId), messageId, runId });
|
|
20327
|
-
|
|
20411
|
+
if (started) log.info("user-gateway", "handle.need-auth", { sender: tail6(v.openId), messageId, runId });
|
|
20412
|
+
const h2 = db.enabled ? issue(false) : void 0;
|
|
20413
|
+
const extra = h2 ? { handle: h2.handle, expiresAt: h2.expiresAt, db: true } : {};
|
|
20414
|
+
return started ? { status: "need_auth", ...extra } : { status: "auth_failed", ...extra };
|
|
20328
20415
|
}
|
|
20329
|
-
const
|
|
20330
|
-
|
|
20331
|
-
const canDb = db.enabled && isDbReader(db, v.openId);
|
|
20332
|
-
handles.set(handle2, { openId: v.openId, messageId, runId, expiresAt, kind: "dm", db: canDb });
|
|
20333
|
-
log.info("user-gateway", "handle.issued", { identity: "user", sender: tail6(v.openId), messageId, runId, db: canDb });
|
|
20334
|
-
return { status: "ok", handle: handle2, expiresAt, db: canDb };
|
|
20416
|
+
const h = issue(true);
|
|
20417
|
+
return { status: "ok", handle: h.handle, expiresAt: h.expiresAt, db: db.enabled };
|
|
20335
20418
|
},
|
|
20336
20419
|
/** DELETE /handles/{runId}:运行结束,作废这次运行的句柄。 */
|
|
20337
20420
|
dropHandles(runId) {
|
|
@@ -20350,6 +20433,10 @@ function createGateway(opts) {
|
|
|
20350
20433
|
sweep();
|
|
20351
20434
|
const h = handles.get(handle2);
|
|
20352
20435
|
if (!h || h.kind !== "dm") return { status: "expired" };
|
|
20436
|
+
if (!h.read) {
|
|
20437
|
+
log.info("user-gateway", "read.need-auth", { identity: "user", sender: tail6(h.openId), messageId: h.messageId, runId: h.runId, api, detail: "handle-without-read" });
|
|
20438
|
+
return { status: "need_auth" };
|
|
20439
|
+
}
|
|
20353
20440
|
let args;
|
|
20354
20441
|
try {
|
|
20355
20442
|
args = readArgs(api, input);
|
|
@@ -20423,7 +20510,7 @@ function createGateway(opts) {
|
|
|
20423
20510
|
let taskGuid, openId, runId;
|
|
20424
20511
|
try {
|
|
20425
20512
|
taskGuid = str2(input, "taskGuid", TASK_GUID);
|
|
20426
|
-
openId = str2(input, "openId",
|
|
20513
|
+
openId = str2(input, "openId", OPEN_ID);
|
|
20427
20514
|
runId = str2(input, "runId", RUN_ID);
|
|
20428
20515
|
} catch {
|
|
20429
20516
|
return { status: "bad_request" };
|
|
@@ -20445,7 +20532,7 @@ function createGateway(opts) {
|
|
|
20445
20532
|
async claudeReady(input) {
|
|
20446
20533
|
let openId;
|
|
20447
20534
|
try {
|
|
20448
|
-
openId = str2(input, "openId",
|
|
20535
|
+
openId = str2(input, "openId", OPEN_ID);
|
|
20449
20536
|
} catch {
|
|
20450
20537
|
return { status: "bad_request" };
|
|
20451
20538
|
}
|
|
@@ -20473,7 +20560,7 @@ function createGateway(opts) {
|
|
|
20473
20560
|
let openId, card, nonce;
|
|
20474
20561
|
const code = typeof input.code === "string" ? normalizeCode(input.code) : "";
|
|
20475
20562
|
try {
|
|
20476
|
-
openId = str2(input, "openId",
|
|
20563
|
+
openId = str2(input, "openId", OPEN_ID);
|
|
20477
20564
|
card = str2(input, "cardMessageId", MESSAGE_ID);
|
|
20478
20565
|
nonce = str2(input, "nonce", NONCE);
|
|
20479
20566
|
} catch {
|
|
@@ -20503,25 +20590,20 @@ function createGateway(opts) {
|
|
|
20503
20590
|
/**
|
|
20504
20591
|
* POST /db/task-handle:调度的只读运行(只读分析、出文档、补报告)起 claude 前凭任务申请查库句柄(intent 0049 R-04)。
|
|
20505
20592
|
* 负责人得是这个任务的 assignee(网关向飞书核对,同 0048 的 /claude/task-token);不看私聊查库名单(spec D-3)。
|
|
20506
|
-
* 评测(intent 0050,带 eval: true):评测的任务号不是真飞书任务,不带 taskGuid
|
|
20593
|
+
* 评测(intent 0050,带 eval: true):评测的任务号不是真飞书任务,不带 taskGuid,只看查库总开关(intent 0068 起没有名单),日志记 task=eval。
|
|
20507
20594
|
*/
|
|
20508
20595
|
async dbTaskHandle(input) {
|
|
20509
20596
|
const isEval = input.eval === true;
|
|
20510
20597
|
let taskGuid = null, openId, runId;
|
|
20511
20598
|
try {
|
|
20512
20599
|
if (!isEval) taskGuid = str2(input, "taskGuid", TASK_GUID);
|
|
20513
|
-
openId = str2(input, "openId",
|
|
20600
|
+
openId = str2(input, "openId", OPEN_ID);
|
|
20514
20601
|
runId = str2(input, "runId", RUN_ID);
|
|
20515
20602
|
} catch {
|
|
20516
20603
|
return { status: "bad_request" };
|
|
20517
20604
|
}
|
|
20518
20605
|
if (!db.enabled) return { status: "off" };
|
|
20519
|
-
if (taskGuid
|
|
20520
|
-
if (!isDbReader(db, openId)) {
|
|
20521
|
-
log.warn("user-gateway", "db.handle-refused", { sender: tail6(openId), runId, task: "eval", result: "not_reader" });
|
|
20522
|
-
return { status: "not_reader" };
|
|
20523
|
-
}
|
|
20524
|
-
} else {
|
|
20606
|
+
if (taskGuid !== null) {
|
|
20525
20607
|
const assignees = await taskAssignees(taskGuid);
|
|
20526
20608
|
if (assignees === "lark_error") return { status: "lark_error" };
|
|
20527
20609
|
if (!assignees.includes(openId)) {
|
|
@@ -20531,7 +20613,7 @@ function createGateway(opts) {
|
|
|
20531
20613
|
}
|
|
20532
20614
|
const handle2 = randomBytes10(32).toString("base64url");
|
|
20533
20615
|
const expiresAt = now() + TASK_HANDLE_TTL_MS;
|
|
20534
|
-
handles.set(handle2, { openId, messageId: "", runId, expiresAt, kind: "task", db: true });
|
|
20616
|
+
handles.set(handle2, { openId, messageId: "", runId, expiresAt, kind: "task", db: true, read: false });
|
|
20535
20617
|
log.info("user-gateway", "db.handle-issued", { sender: tail6(openId), runId, task: taskGuid ?? "eval" });
|
|
20536
20618
|
return { status: "ok", handle: handle2, expiresAt };
|
|
20537
20619
|
},
|
|
@@ -20683,7 +20765,7 @@ async function runUserGateway(opts) {
|
|
|
20683
20765
|
exec: defaultExec,
|
|
20684
20766
|
// Claude 席位开关(intent 0048):容器的 SDLC_CLAUDE_SEAT、SDLC_CLAUDE_SEAT_LIST,缺省关
|
|
20685
20767
|
seat: seatFromEnv(process.env),
|
|
20686
|
-
// 查库开关(intent 0049):容器的 SDLC_DB_GATEWAY
|
|
20768
|
+
// 查库开关(intent 0049):容器的 SDLC_DB_GATEWAY,缺省关;开了谁都能查,没有名单(intent 0068)
|
|
20687
20769
|
db: dbFromEnv(process.env, opts.dbCmd)
|
|
20688
20770
|
});
|
|
20689
20771
|
const pass = fetchToken(opts.tokenCmd);
|