@yach.zhiyinlou.com/yach 2.16.0 → 2.16.1-beta.0
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/src/core/authorization-flow.js +157 -0
- package/dist/src/core/authorization-flow.js.map +1 -0
- package/dist/src/core/execution-context.js +73 -0
- package/dist/src/core/execution-context.js.map +1 -0
- package/dist/src/tools/index.js +25 -1
- package/dist/src/tools/index.js.map +1 -1
- package/dist/src/webchat/auth.js +142 -0
- package/dist/src/webchat/auth.js.map +1 -0
- package/dist/src/webchat/gateway.js +136 -0
- package/dist/src/webchat/gateway.js.map +1 -0
- package/dist/src/webchat/service.js +312 -0
- package/dist/src/webchat/service.js.map +1 -0
- package/dist/src/webchat/types.js +7 -0
- package/dist/src/webchat/types.js.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
export function createWebAuthorizationWaiter(binding, scopes, trace = () => { }) {
|
|
3
|
+
return {
|
|
4
|
+
key: `webchat:${binding.sessionKey}:${binding.requestId}`,
|
|
5
|
+
isActive: () => binding.isActive(),
|
|
6
|
+
register: (id, detach) => binding.defer(id, "authorization", detach),
|
|
7
|
+
pending(id, silent) {
|
|
8
|
+
trace("authorization.waiting");
|
|
9
|
+
binding.publish({
|
|
10
|
+
type: "authorization", status: "waiting",
|
|
11
|
+
text: silent ? undefined : "请在知音楼完成授权,完成后将继续当前网页操作。",
|
|
12
|
+
data: { flowId: id, scopes: [...scopes], silent },
|
|
13
|
+
});
|
|
14
|
+
},
|
|
15
|
+
async authorized(id) {
|
|
16
|
+
trace("authorization.authorized");
|
|
17
|
+
binding.publish({ type: "authorization", status: "authorized", data: { flowId: id } });
|
|
18
|
+
binding.settle(id);
|
|
19
|
+
try {
|
|
20
|
+
await binding.resume(`用户授权已完成。请只继续 Web 请求 ${JSON.stringify(binding.requestId)} 中尚未完成的操作,不重复已完成步骤,其他请求另行处理。`, `authorization:${id}`);
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
trace("authorization.resume.failed");
|
|
24
|
+
binding.settle(id, "authorization_resume_failed");
|
|
25
|
+
}
|
|
26
|
+
},
|
|
27
|
+
async failed(id, failure) {
|
|
28
|
+
trace("authorization.failed");
|
|
29
|
+
binding.publish({ type: "authorization", status: "failed", text: failure.message, data: { flowId: id, error: failure.error } });
|
|
30
|
+
binding.settle(id, failure.error);
|
|
31
|
+
},
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
function abortable(promise, signal) {
|
|
35
|
+
return new Promise((resolve, reject) => {
|
|
36
|
+
const onAbort = () => {
|
|
37
|
+
signal.removeEventListener("abort", onAbort);
|
|
38
|
+
reject(signal.reason);
|
|
39
|
+
};
|
|
40
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
41
|
+
if (signal.aborted)
|
|
42
|
+
onAbort();
|
|
43
|
+
promise.then((result) => { signal.removeEventListener("abort", onAbort); resolve(result); }, (error) => { signal.removeEventListener("abort", onAbort); reject(error); });
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
/** 授权按用户/scopes 合并,操作等待者独立保存,取消不影响其他入口。 */
|
|
47
|
+
export function createAuthorizationFlows() {
|
|
48
|
+
const flows = new Map();
|
|
49
|
+
function cleanup(key, flow) {
|
|
50
|
+
if (flows.get(key) === flow)
|
|
51
|
+
flows.delete(key);
|
|
52
|
+
if (flow.timer)
|
|
53
|
+
clearTimeout(flow.timer);
|
|
54
|
+
flow.controller.abort();
|
|
55
|
+
}
|
|
56
|
+
async function finish(key, flow, failure) {
|
|
57
|
+
if (flows.get(key) !== flow)
|
|
58
|
+
return;
|
|
59
|
+
const waiters = [...flow.waiters.values()];
|
|
60
|
+
flow.failure = failure;
|
|
61
|
+
flow.waiters.clear();
|
|
62
|
+
cleanup(key, flow);
|
|
63
|
+
const notices = new Set();
|
|
64
|
+
const claimNotice = (noticeKey) => {
|
|
65
|
+
if (notices.has(noticeKey))
|
|
66
|
+
return false;
|
|
67
|
+
notices.add(noticeKey);
|
|
68
|
+
return true;
|
|
69
|
+
};
|
|
70
|
+
await Promise.allSettled(waiters.filter((waiter) => waiter.isActive()).map((waiter) => failure ? waiter.failed(flow.id, failure, flow.silent, claimNotice) : waiter.authorized(flow.id, flow.silent, claimNotice)));
|
|
71
|
+
}
|
|
72
|
+
function add(key, flow, waiter) {
|
|
73
|
+
if (flow.waiters.has(waiter.key))
|
|
74
|
+
return true;
|
|
75
|
+
if (!waiter.isActive())
|
|
76
|
+
return false;
|
|
77
|
+
const detach = () => {
|
|
78
|
+
flow.waiters.delete(waiter.key);
|
|
79
|
+
if (!flow.waiters.size)
|
|
80
|
+
cleanup(key, flow);
|
|
81
|
+
};
|
|
82
|
+
if (!waiter.register(flow.id, detach))
|
|
83
|
+
return false;
|
|
84
|
+
flow.waiters.set(waiter.key, waiter);
|
|
85
|
+
if (flow.ready)
|
|
86
|
+
waiter.pending(flow.id, flow.silent);
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
89
|
+
return {
|
|
90
|
+
async start(key, waiter, setup) {
|
|
91
|
+
const existing = flows.get(key);
|
|
92
|
+
if (existing) {
|
|
93
|
+
if (!add(key, existing, waiter)) {
|
|
94
|
+
return { flowId: existing.id, reused: true, failure: { error: "cancelled", message: "请求已失效。" } };
|
|
95
|
+
}
|
|
96
|
+
return { flowId: existing.id, reused: true };
|
|
97
|
+
}
|
|
98
|
+
const flow = {
|
|
99
|
+
id: randomUUID(), controller: new AbortController(), waiters: new Map(), silent: false, ready: false,
|
|
100
|
+
};
|
|
101
|
+
flows.set(key, flow);
|
|
102
|
+
if (!add(key, flow, waiter)) {
|
|
103
|
+
cleanup(key, flow);
|
|
104
|
+
return { flowId: flow.id, reused: false, failure: { error: "cancelled", message: "请求已失效。" } };
|
|
105
|
+
}
|
|
106
|
+
let deviceDeadlineArmed = false;
|
|
107
|
+
const scheduleDeadline = (expiresIn) => {
|
|
108
|
+
if (flow.timer)
|
|
109
|
+
clearTimeout(flow.timer);
|
|
110
|
+
flow.timer = setTimeout(() => {
|
|
111
|
+
void finish(key, flow, { error: "expired_token", message: "授权超时,请重新发起。" });
|
|
112
|
+
}, (expiresIn + 30) * 1000);
|
|
113
|
+
flow.timer.unref?.();
|
|
114
|
+
};
|
|
115
|
+
const armDeadline = (expiresIn) => {
|
|
116
|
+
if (flows.get(key) !== flow || flow.controller.signal.aborted)
|
|
117
|
+
return;
|
|
118
|
+
deviceDeadlineArmed = true;
|
|
119
|
+
scheduleDeadline(expiresIn);
|
|
120
|
+
};
|
|
121
|
+
// 初始化网络请求也有上界;拿到设备码后立即改为设备码有效期,不能等发卡返回。
|
|
122
|
+
scheduleDeadline(60);
|
|
123
|
+
try {
|
|
124
|
+
const prepared = await abortable(setup(flow.controller.signal, flow.id, armDeadline), flow.controller.signal);
|
|
125
|
+
if (flows.get(key) !== flow) {
|
|
126
|
+
return { flowId: flow.id, reused: false, failure: { error: "cancelled", message: "请求已失效。" } };
|
|
127
|
+
}
|
|
128
|
+
flow.silent = prepared.silent;
|
|
129
|
+
flow.ready = true;
|
|
130
|
+
for (const waiting of flow.waiters.values()) {
|
|
131
|
+
if (waiting.isActive())
|
|
132
|
+
waiting.pending(flow.id, flow.silent);
|
|
133
|
+
}
|
|
134
|
+
if (!deviceDeadlineArmed)
|
|
135
|
+
armDeadline(prepared.expiresIn);
|
|
136
|
+
void prepared.poll(flow.controller.signal).then((result) => finish(key, flow, result.ok ? undefined : result), () => finish(key, flow, { error: "device_flow_failed", message: "授权轮询失败,请重新发起。" }));
|
|
137
|
+
return { flowId: flow.id, reused: false };
|
|
138
|
+
}
|
|
139
|
+
catch (err) {
|
|
140
|
+
const aborted = err instanceof Error && err.name === "AbortError";
|
|
141
|
+
const failure = flow.failure ?? {
|
|
142
|
+
error: aborted ? "cancelled" : err instanceof Error && err.name === "YachAppScopeError" ? "app_scope_missing" : "device_flow_failed",
|
|
143
|
+
message: aborted ? "授权请求已失效。" : err instanceof Error && err.name === "YachAppScopeError"
|
|
144
|
+
? "应用尚未开通所需权限。" : "无法发起授权流程,请稍后重试。",
|
|
145
|
+
setup: true,
|
|
146
|
+
};
|
|
147
|
+
await finish(key, flow, failure);
|
|
148
|
+
return { flowId: flow.id, reused: false, failure };
|
|
149
|
+
}
|
|
150
|
+
},
|
|
151
|
+
clear() {
|
|
152
|
+
for (const [key, flow] of flows)
|
|
153
|
+
cleanup(key, flow);
|
|
154
|
+
},
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
//# sourceMappingURL=authorization-flow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authorization-flow.js","sourceRoot":"","sources":["../../../src/core/authorization-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from "node:async_hooks";
|
|
2
|
+
const storage = new AsyncLocalStorage();
|
|
3
|
+
const webchatTurns = new Map();
|
|
4
|
+
/** 核心可能隔离工具的异步上下文,仅保留本次已验签且仍在执行的会话绑定。 */
|
|
5
|
+
export async function withWebchatTurn(binding, fn) {
|
|
6
|
+
if (webchatTurns.has(binding.sessionKey))
|
|
7
|
+
throw new Error("同一 Web 会话不能并发派发。");
|
|
8
|
+
webchatTurns.set(binding.sessionKey, binding);
|
|
9
|
+
try {
|
|
10
|
+
return await withExecutionContext({ source: "webchat", binding, sessionKey: binding.sessionKey }, fn);
|
|
11
|
+
}
|
|
12
|
+
finally {
|
|
13
|
+
if (webchatTurns.get(binding.sessionKey) === binding)
|
|
14
|
+
webchatTurns.delete(binding.sessionKey);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export function getExecutionContext() {
|
|
18
|
+
return storage.getStore();
|
|
19
|
+
}
|
|
20
|
+
export function withExecutionContext(context, fn) {
|
|
21
|
+
return storage.run(Object.freeze(context), fn);
|
|
22
|
+
}
|
|
23
|
+
export function resolveMessageSource(ctx) {
|
|
24
|
+
const channel = ctx?.messageChannel ?? ctx?.deliveryContext?.channel;
|
|
25
|
+
return channel === "yach" || channel === "webchat" ? channel : "unknown";
|
|
26
|
+
}
|
|
27
|
+
/** 本轮来源优先于外层 ALS,避免 Web 工具继承到旧的 IM 身份或投递目标。 */
|
|
28
|
+
export function resolveToolExecutionContext(ctx, ticket) {
|
|
29
|
+
const current = getExecutionContext();
|
|
30
|
+
const hasSource = Boolean(ctx?.messageChannel || ctx?.deliveryContext?.channel);
|
|
31
|
+
const source = hasSource ? resolveMessageSource(ctx) : (current?.source ?? "unknown");
|
|
32
|
+
const trace = {
|
|
33
|
+
sessionKey: ctx?.sessionKey ?? current?.sessionKey,
|
|
34
|
+
sessionId: ctx?.sessionId ?? current?.sessionId,
|
|
35
|
+
toolCallId: current?.toolCallId,
|
|
36
|
+
toolName: current?.toolName,
|
|
37
|
+
};
|
|
38
|
+
if (source === "webchat") {
|
|
39
|
+
const binding = (current?.source === "webchat" ? current.binding : undefined) ??
|
|
40
|
+
(ctx?.sessionKey ? webchatTurns.get(ctx.sessionKey) : undefined);
|
|
41
|
+
const matches = binding?.isActive() &&
|
|
42
|
+
(!ctx || (ctx.sessionKey === binding.sessionKey && ctx.requesterSenderId === binding.senderId));
|
|
43
|
+
return { ...trace, source, binding: matches ? binding : undefined };
|
|
44
|
+
}
|
|
45
|
+
if (source === "yach" && ticket &&
|
|
46
|
+
(!ctx?.requesterSenderId || ctx.requesterSenderId === ticket.senderId)) {
|
|
47
|
+
return { ...trace, source, ticket };
|
|
48
|
+
}
|
|
49
|
+
return { ...trace, source: "unknown" };
|
|
50
|
+
}
|
|
51
|
+
export function executionIdentity(context = getExecutionContext()) {
|
|
52
|
+
if (context?.source === "yach")
|
|
53
|
+
return context.ticket;
|
|
54
|
+
if (context?.source === "webchat" && context.binding?.isActive())
|
|
55
|
+
return context.binding;
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
export function executionTrace(context = getExecutionContext()) {
|
|
59
|
+
const ticket = context?.source === "yach" ? context.ticket : undefined;
|
|
60
|
+
const binding = context?.source === "webchat" ? context.binding : undefined;
|
|
61
|
+
const identity = ticket ?? binding;
|
|
62
|
+
return {
|
|
63
|
+
source: context?.source ?? "unknown",
|
|
64
|
+
sessionKey: context?.sessionKey ?? ticket?.sessionKey ?? binding?.sessionKey,
|
|
65
|
+
sessionId: context?.sessionId,
|
|
66
|
+
accountId: identity?.accountId,
|
|
67
|
+
msgId: ticket?.msgId,
|
|
68
|
+
requestId: binding?.requestId,
|
|
69
|
+
toolCallId: context?.toolCallId,
|
|
70
|
+
toolName: context?.toolName,
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=execution-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execution-context.js","sourceRoot":"","sources":["../../../src/core/execution-context.ts"],"names":[],"mappings":"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"}
|
package/dist/src/tools/index.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { runToolWithContext } from "../core/yach-ticket.js";
|
|
2
|
+
import { yachLogger } from "../core/yach-logger.js";
|
|
3
|
+
const log = yachLogger("tools/source");
|
|
2
4
|
import { registerCalendarTools } from "./calendar/index.js";
|
|
3
5
|
import { registerDocTools } from "./doc/index.js";
|
|
4
6
|
import { registerSpaceTools } from "./space/space-node.js";
|
|
@@ -26,6 +28,25 @@ function wrapToolContext(api) {
|
|
|
26
28
|
originalRegisterTool((ctx) => withToolContext(ctx, tool), opts);
|
|
27
29
|
};
|
|
28
30
|
}
|
|
31
|
+
/**
|
|
32
|
+
* 来源诊断日志:区分知音楼入站(yach)与 Dashboard 直连(webchat)。
|
|
33
|
+
* channelType 取本轮核心下发的真实渠道,缺省回退 deliveryContext.channel;
|
|
34
|
+
* 两者都没有时标记 unknown,不从 sessionKey 猜测。
|
|
35
|
+
*/
|
|
36
|
+
function logToolSource(ctx, toolName) {
|
|
37
|
+
log.info("工具调用来源", {
|
|
38
|
+
stage: "tool.source",
|
|
39
|
+
tool: toolName,
|
|
40
|
+
channelType: ctx.messageChannel ?? ctx.deliveryContext?.channel ?? "unknown",
|
|
41
|
+
messageChannel: ctx.messageChannel,
|
|
42
|
+
deliveryChannel: ctx.deliveryContext?.channel,
|
|
43
|
+
deliveryAccountId: ctx.deliveryContext?.accountId,
|
|
44
|
+
agentAccountId: ctx.agentAccountId,
|
|
45
|
+
agentId: ctx.agentId,
|
|
46
|
+
sessionKey: ctx.sessionKey,
|
|
47
|
+
senderId: ctx.requesterSenderId,
|
|
48
|
+
});
|
|
49
|
+
}
|
|
29
50
|
function withToolContext(ctx, tool) {
|
|
30
51
|
const execute = tool.execute;
|
|
31
52
|
// 返回新实例(浅拷贝 + 替换 execute),绝不动原 tool 对象:
|
|
@@ -33,7 +54,10 @@ function withToolContext(ctx, tool) {
|
|
|
33
54
|
// 多会话并发 run 会互相覆盖 execute 闭包导致 ctx 串台。
|
|
34
55
|
return {
|
|
35
56
|
...tool,
|
|
36
|
-
execute: (async (...args) =>
|
|
57
|
+
execute: (async (...args) => {
|
|
58
|
+
logToolSource(ctx, tool.name);
|
|
59
|
+
return runToolWithContext(ctx, () => execute(...args));
|
|
60
|
+
}),
|
|
37
61
|
};
|
|
38
62
|
}
|
|
39
63
|
export function registerYachTools(api) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
import { createHash, createHmac, timingSafeEqual } from "node:crypto";
|
|
2
|
+
import { WEBCHAT_METHODS } from "./types.js";
|
|
3
|
+
const MAX_LIFETIME_MS = 5 * 60_000;
|
|
4
|
+
const ID_FIELDS = ["accountId", "tenantId", "senderId", "agentId", "conversationId", "requestId", "nonce"];
|
|
5
|
+
export class WebchatRequestError extends Error {
|
|
6
|
+
code;
|
|
7
|
+
constructor(code, message) {
|
|
8
|
+
super(message);
|
|
9
|
+
this.code = code;
|
|
10
|
+
this.name = "WebchatRequestError";
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
function fail(code = "WEBCHAT_INVALID_REQUEST", message = "网页聊天请求格式无效") {
|
|
14
|
+
throw new WebchatRequestError(code, message);
|
|
15
|
+
}
|
|
16
|
+
/** 仅接受普通对象的自有数据属性,不执行访问器,也不接纳未签名字段。 */
|
|
17
|
+
function record(value, allowed) {
|
|
18
|
+
try {
|
|
19
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
20
|
+
fail();
|
|
21
|
+
const prototype = Object.getPrototypeOf(value);
|
|
22
|
+
if (prototype !== Object.prototype && prototype !== null)
|
|
23
|
+
fail();
|
|
24
|
+
const descriptors = Object.getOwnPropertyDescriptors(value);
|
|
25
|
+
const entries = Reflect.ownKeys(descriptors).map((key) => {
|
|
26
|
+
if (typeof key !== "string" || !allowed.includes(key))
|
|
27
|
+
fail();
|
|
28
|
+
const descriptor = descriptors[key];
|
|
29
|
+
if (!descriptor.enumerable || !("value" in descriptor))
|
|
30
|
+
fail();
|
|
31
|
+
return [key, descriptor.value];
|
|
32
|
+
});
|
|
33
|
+
return Object.fromEntries(entries);
|
|
34
|
+
}
|
|
35
|
+
catch {
|
|
36
|
+
return fail();
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
function checkSecret(secret) {
|
|
40
|
+
const bytes = typeof secret === "string" ? Buffer.byteLength(secret, "utf8")
|
|
41
|
+
: secret instanceof Uint8Array ? secret.byteLength : 0;
|
|
42
|
+
if (bytes < 32)
|
|
43
|
+
fail("WEBCHAT_INVALID_SECRET", "网页聊天签名密钥配置无效");
|
|
44
|
+
}
|
|
45
|
+
function checkMethod(method) {
|
|
46
|
+
if (!WEBCHAT_METHODS.includes(method))
|
|
47
|
+
fail();
|
|
48
|
+
}
|
|
49
|
+
function copyClaims(method, value) {
|
|
50
|
+
checkMethod(method);
|
|
51
|
+
const fields = [...ID_FIELDS, "expiresAt", ...(method === "yach.webchat.send" ? ["message"] : [])];
|
|
52
|
+
const payload = record(value, fields);
|
|
53
|
+
for (const field of ID_FIELDS) {
|
|
54
|
+
const id = payload[field];
|
|
55
|
+
if (typeof id !== "string" || !id.trim() || id.length > 256 || /[\u0000-\u001f\u007f-\u009f]/u.test(id))
|
|
56
|
+
fail();
|
|
57
|
+
}
|
|
58
|
+
if (!Number.isSafeInteger(payload.expiresAt))
|
|
59
|
+
fail();
|
|
60
|
+
if (method === "yach.webchat.send") {
|
|
61
|
+
const message = payload.message;
|
|
62
|
+
if (typeof message !== "string" || !message.trim() || message.length > 32_000)
|
|
63
|
+
fail();
|
|
64
|
+
}
|
|
65
|
+
return payload;
|
|
66
|
+
}
|
|
67
|
+
function checkExpiry(expiresAt, now, lifetime = MAX_LIFETIME_MS) {
|
|
68
|
+
if (!Number.isSafeInteger(now) || now < 0 || !Number.isSafeInteger(expiresAt))
|
|
69
|
+
fail();
|
|
70
|
+
if (expiresAt <= now)
|
|
71
|
+
fail("WEBCHAT_EXPIRED", "网页聊天请求已过期");
|
|
72
|
+
if (expiresAt - now > lifetime)
|
|
73
|
+
fail("WEBCHAT_INVALID_REQUEST", "网页聊天请求有效期无效");
|
|
74
|
+
}
|
|
75
|
+
// 摘要覆盖 JSON 编码后的全文,避免孤立代理字符被 UTF-8 替换后出现相同摘要。
|
|
76
|
+
function hash(value) {
|
|
77
|
+
return createHash("sha256").update(JSON.stringify(value), "utf8").digest("hex");
|
|
78
|
+
}
|
|
79
|
+
function signature(method, payload, secret) {
|
|
80
|
+
const canonical = JSON.stringify({
|
|
81
|
+
method, accountId: payload.accountId, tenantId: payload.tenantId, senderId: payload.senderId,
|
|
82
|
+
agentId: payload.agentId, conversationId: payload.conversationId, requestId: payload.requestId,
|
|
83
|
+
nonce: payload.nonce, expiresAt: payload.expiresAt,
|
|
84
|
+
messageHash: payload.message === undefined ? null : hash(payload.message),
|
|
85
|
+
});
|
|
86
|
+
return createHmac("sha256", secret).update(canonical, "utf8").digest("hex");
|
|
87
|
+
}
|
|
88
|
+
/** 仅供受信宿主后端使用;身份必须来自服务端登录态,秘密不可交给浏览器。 */
|
|
89
|
+
export function createWebchatSignature(method, payload, secret) {
|
|
90
|
+
checkSecret(secret);
|
|
91
|
+
return signature(method, copyClaims(method, payload), secret);
|
|
92
|
+
}
|
|
93
|
+
/** 只验证宿主签名,不替代 Yach 鉴权;返回已知字段副本,不修改原始请求。 */
|
|
94
|
+
export function verifyWebchatRequest(method, raw, secret, now = Date.now()) {
|
|
95
|
+
checkSecret(secret);
|
|
96
|
+
const wrapper = record(raw, ["payload", "signature"]);
|
|
97
|
+
if (typeof wrapper.signature !== "string" || !/^[a-fA-F0-9]{64}$/u.test(wrapper.signature)) {
|
|
98
|
+
fail("WEBCHAT_INVALID_SIGNATURE", "网页聊天请求签名无效");
|
|
99
|
+
}
|
|
100
|
+
const request = { payload: copyClaims(method, wrapper.payload), signature: wrapper.signature };
|
|
101
|
+
checkExpiry(request.payload.expiresAt, now);
|
|
102
|
+
const expected = Buffer.from(signature(method, request.payload, secret), "hex");
|
|
103
|
+
if (!timingSafeEqual(expected, Buffer.from(request.signature, "hex"))) {
|
|
104
|
+
fail("WEBCHAT_INVALID_SIGNATURE", "网页聊天请求签名无效");
|
|
105
|
+
}
|
|
106
|
+
return request.payload;
|
|
107
|
+
}
|
|
108
|
+
/** 用固定字段数组编码边界,避免身份中的分隔符引起所有权碰撞。 */
|
|
109
|
+
export function webchatOwnerKey(claims) {
|
|
110
|
+
return hash(["webchat.owner", claims.accountId, claims.tenantId, claims.senderId, claims.agentId, claims.conversationId]);
|
|
111
|
+
}
|
|
112
|
+
/** 同一消息重试可更换 nonce 和有效期,但身份、请求号与正文不可更换。 */
|
|
113
|
+
export function webchatRequestFingerprint(claims) {
|
|
114
|
+
return hash(["webchat.request", webchatOwnerKey(claims), claims.requestId, claims.message === undefined ? null : hash(claims.message)]);
|
|
115
|
+
}
|
|
116
|
+
export function createWebchatNonceGuard(options = {}) {
|
|
117
|
+
const { now = Date.now, maxEntries = 10_000, ttlMs = MAX_LIFETIME_MS } = options;
|
|
118
|
+
if (typeof now !== "function" || !Number.isSafeInteger(maxEntries) || maxEntries < 1
|
|
119
|
+
|| !Number.isSafeInteger(ttlMs) || ttlMs < 1)
|
|
120
|
+
fail("WEBCHAT_INVALID_CONFIG", "网页聊天防重放配置无效");
|
|
121
|
+
const entries = new Map();
|
|
122
|
+
return {
|
|
123
|
+
// 调用方必须先验签。ttlMs 限制可接纳的剩余有效期,绝不提前释放仍有效的 nonce。
|
|
124
|
+
consume(claims) {
|
|
125
|
+
const timestamp = now();
|
|
126
|
+
if (!Number.isSafeInteger(timestamp) || timestamp < 0)
|
|
127
|
+
fail();
|
|
128
|
+
for (const [key, expiresAt] of entries)
|
|
129
|
+
if (expiresAt <= timestamp)
|
|
130
|
+
entries.delete(key);
|
|
131
|
+
checkExpiry(claims.expiresAt, timestamp, ttlMs);
|
|
132
|
+
const key = hash(["webchat.nonce", claims.accountId, claims.tenantId, claims.senderId, claims.nonce]);
|
|
133
|
+
if (entries.has(key))
|
|
134
|
+
fail("WEBCHAT_REPLAY", "网页聊天请求不可重复使用");
|
|
135
|
+
if (entries.size >= maxEntries)
|
|
136
|
+
fail("WEBCHAT_NONCE_CAPACITY", "网页聊天请求过多,请稍后重试");
|
|
137
|
+
entries.set(key, claims.expiresAt);
|
|
138
|
+
},
|
|
139
|
+
clear() { entries.clear(); },
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
//# sourceMappingURL=auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/webchat/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { listYachAccountIds, resolveYachAccount } from "../accounts/index.js";
|
|
3
|
+
import { withExecutionContext, withWebchatTurn } from "../core/execution-context.js";
|
|
4
|
+
import { getYachConfig, getYachRuntime } from "../core/runtime.js";
|
|
5
|
+
import { yachLogger } from "../core/yach-logger.js";
|
|
6
|
+
import { WebchatRequestError } from "./auth.js";
|
|
7
|
+
import { createWebchatService } from "./service.js";
|
|
8
|
+
import { WEBCHAT_METHODS } from "./types.js";
|
|
9
|
+
const log = yachLogger("webchat");
|
|
10
|
+
const DEFAULT_SECRET_ENV = "YACH_WEBCHAT_SIGNING_SECRET";
|
|
11
|
+
export async function dispatchWebchatTurn(params) {
|
|
12
|
+
const { runtime, cfg, claims, binding, message } = params;
|
|
13
|
+
const account = resolveYachAccount({ cfg, accountId: claims.accountId });
|
|
14
|
+
await withWebchatTurn(binding, async () => {
|
|
15
|
+
const ctx = runtime.channel.reply.finalizeInboundContext({
|
|
16
|
+
Body: message, BodyForAgent: message, RawBody: message, CommandBody: message,
|
|
17
|
+
CommandAuthorized: false, From: binding.senderId, To: binding.sessionKey,
|
|
18
|
+
SessionKey: binding.sessionKey, AccountId: account.appKey,
|
|
19
|
+
Provider: "webchat", Surface: "webchat", ChatType: "direct",
|
|
20
|
+
// requestId 用于业务幂等;每次续接必须有新消息 ID,避免被核心入站去重丢弃。
|
|
21
|
+
SenderId: binding.senderId, MessageSid: `webchat:${binding.requestId}:${randomUUID()}`, Timestamp: Date.now(),
|
|
22
|
+
OriginatingChannel: "webchat", OriginatingTo: binding.sessionKey,
|
|
23
|
+
OwnerAllowFrom: [],
|
|
24
|
+
});
|
|
25
|
+
let partialText = "";
|
|
26
|
+
const { dispatcher, replyOptions, markDispatchIdle } = runtime.channel.reply.createReplyDispatcherWithTyping({
|
|
27
|
+
responsePrefix: "", responsePrefixContextProvider: () => ({}),
|
|
28
|
+
humanDelay: runtime.channel.reply.resolveHumanDelayConfig(cfg, claims.agentId),
|
|
29
|
+
onReplyStart: () => { }, onIdle: () => { }, onCleanup: () => { },
|
|
30
|
+
deliver: async (payload, info) => {
|
|
31
|
+
if (!binding.isActive())
|
|
32
|
+
return;
|
|
33
|
+
const data = { kind: info.kind };
|
|
34
|
+
if (payload.mediaUrl)
|
|
35
|
+
data.mediaUrl = payload.mediaUrl;
|
|
36
|
+
if (payload.mediaUrls?.length)
|
|
37
|
+
data.mediaUrls = payload.mediaUrls;
|
|
38
|
+
const presentation = payload.presentation;
|
|
39
|
+
if (presentation !== undefined)
|
|
40
|
+
data.presentation = presentation;
|
|
41
|
+
if (payload.text && payload.text !== partialText) {
|
|
42
|
+
binding.publish({ type: "reply", text: payload.text, replace: true, data });
|
|
43
|
+
partialText = payload.text;
|
|
44
|
+
}
|
|
45
|
+
else if (Object.keys(data).length > 1) {
|
|
46
|
+
binding.publish({ type: "reply", data });
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
});
|
|
50
|
+
await runtime.channel.reply.withReplyDispatcher({
|
|
51
|
+
dispatcher, onSettled: markDispatchIdle,
|
|
52
|
+
run: () => runtime.channel.reply.dispatchReplyFromConfig({
|
|
53
|
+
ctx, cfg, dispatcher,
|
|
54
|
+
replyOptions: {
|
|
55
|
+
...replyOptions, disableBlockStreaming: true,
|
|
56
|
+
suppressDefaultToolProgressMessages: true,
|
|
57
|
+
onPartialReply: (payload) => {
|
|
58
|
+
const next = typeof payload.text === "string" ? payload.text :
|
|
59
|
+
(payload.replace ? "" : partialText) + (payload.delta ?? "");
|
|
60
|
+
if (next === partialText || !binding.isActive())
|
|
61
|
+
return;
|
|
62
|
+
partialText = next;
|
|
63
|
+
binding.publish({ type: "reply", text: partialText, replace: true });
|
|
64
|
+
},
|
|
65
|
+
},
|
|
66
|
+
}),
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
export function registerWebchatGateway(api) {
|
|
71
|
+
const getConfig = () => getYachConfig();
|
|
72
|
+
const getSecret = () => {
|
|
73
|
+
const webchat = getConfig().channels?.yach?.webchat;
|
|
74
|
+
if (webchat?.enabled !== true) {
|
|
75
|
+
throw new WebchatRequestError("WEBCHAT_DISABLED", "插件 Web 接入未启用。");
|
|
76
|
+
}
|
|
77
|
+
const envName = webchat.signingSecretEnv ?? DEFAULT_SECRET_ENV;
|
|
78
|
+
if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(envName)) {
|
|
79
|
+
throw new WebchatRequestError("WEBCHAT_CONFIG_INVALID", "Web 签名密钥环境变量名不合法。");
|
|
80
|
+
}
|
|
81
|
+
const secret = process.env[envName];
|
|
82
|
+
if (!secret)
|
|
83
|
+
throw new WebchatRequestError("WEBCHAT_SECRET_MISSING", "服务端 Web 签名密钥未配置。");
|
|
84
|
+
return secret;
|
|
85
|
+
};
|
|
86
|
+
const service = createWebchatService({
|
|
87
|
+
getSecret,
|
|
88
|
+
validateTarget(claims) {
|
|
89
|
+
getSecret();
|
|
90
|
+
const cfg = getConfig();
|
|
91
|
+
if (!listYachAccountIds(cfg).includes(claims.accountId)) {
|
|
92
|
+
throw new WebchatRequestError("WEBCHAT_ACCOUNT_INVALID", "目标知音楼账号不存在。");
|
|
93
|
+
}
|
|
94
|
+
const account = resolveYachAccount({ cfg, accountId: claims.accountId });
|
|
95
|
+
if (!account.configured || !account.enabled) {
|
|
96
|
+
throw new WebchatRequestError("WEBCHAT_ACCOUNT_INVALID", "目标知音楼账号未配置或已停用。");
|
|
97
|
+
}
|
|
98
|
+
const agents = cfg.agents?.list?.map((agent) => agent.id) ?? [];
|
|
99
|
+
const allowed = agents.length ? agents : ["main"];
|
|
100
|
+
if (!/^[a-z0-9][a-z0-9_-]{0,127}$/.test(claims.agentId) || !allowed.includes(claims.agentId)) {
|
|
101
|
+
throw new WebchatRequestError("WEBCHAT_AGENT_INVALID", "目标 Agent 不存在。");
|
|
102
|
+
}
|
|
103
|
+
},
|
|
104
|
+
dispatch: (claims, binding, message) => dispatchWebchatTurn({
|
|
105
|
+
runtime: getYachRuntime(), cfg: getConfig(), claims, binding, message,
|
|
106
|
+
}),
|
|
107
|
+
log: (stage, meta) => withExecutionContext({
|
|
108
|
+
source: "webchat", sessionKey: typeof meta.sessionKey === "string" ? meta.sessionKey : undefined,
|
|
109
|
+
}, () => log.info("Web 链路状态", { ...meta, stage })),
|
|
110
|
+
});
|
|
111
|
+
for (const method of WEBCHAT_METHODS) {
|
|
112
|
+
api.registerGatewayMethod(method, async ({ params, client, context, respond }) => {
|
|
113
|
+
await withExecutionContext({ source: "webchat" }, async () => {
|
|
114
|
+
try {
|
|
115
|
+
const connId = client?.connId;
|
|
116
|
+
const subscriber = connId && typeof context.broadcastToConnIds === "function" ? {
|
|
117
|
+
connId,
|
|
118
|
+
send: (payload) => context.broadcastToConnIds("plugin.yach.webchat.update", payload, new Set([connId])),
|
|
119
|
+
} : undefined;
|
|
120
|
+
const result = service.handle(method, params, subscriber);
|
|
121
|
+
respond(true, result);
|
|
122
|
+
}
|
|
123
|
+
catch (err) {
|
|
124
|
+
const reasonCode = err instanceof WebchatRequestError ? err.code : "WEBCHAT_INTERNAL_ERROR";
|
|
125
|
+
log.warn("Web 接入请求被拒绝", { stage: "webchat.request.rejected", method, reasonCode });
|
|
126
|
+
respond(false, undefined, {
|
|
127
|
+
code: "INVALID_REQUEST",
|
|
128
|
+
message: err instanceof WebchatRequestError ? err.message : "Web 请求处理失败。",
|
|
129
|
+
details: { reasonCode },
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
}, { scope: "operator.write" });
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
//# sourceMappingURL=gateway.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../src/webchat/gateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,312 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { createWebchatNonceGuard, verifyWebchatRequest, webchatOwnerKey, webchatRequestFingerprint, WebchatRequestError, } from "./auth.js";
|
|
3
|
+
const REQUEST_TTL_MS = 30 * 60_000;
|
|
4
|
+
const MAX_REQUESTS = 1000;
|
|
5
|
+
const MAX_SUBSCRIBERS = 32;
|
|
6
|
+
const MAX_TEXT_LENGTH = 256_000;
|
|
7
|
+
function isTerminal(request) {
|
|
8
|
+
return request.status === "completed" || request.status === "failed" || request.status === "cancelled";
|
|
9
|
+
}
|
|
10
|
+
export function buildWebchatSessionKey(claims) {
|
|
11
|
+
const peer = createHash("sha256").update(webchatOwnerKey(claims)).digest("hex");
|
|
12
|
+
return `agent:${claims.agentId}:yach-webchat:${peer}`;
|
|
13
|
+
}
|
|
14
|
+
/** 进程内有界状态;签名只用于接入,接受后的操作按独立 TTL 管理。 */
|
|
15
|
+
export function createWebchatService(options) {
|
|
16
|
+
const now = options.now ?? Date.now;
|
|
17
|
+
const requests = new Map();
|
|
18
|
+
const queues = new Map();
|
|
19
|
+
const nonces = createWebchatNonceGuard({ now });
|
|
20
|
+
const requestKey = (claims) => `${webchatOwnerKey(claims)}:${claims.requestId}`;
|
|
21
|
+
const trace = (request) => ({
|
|
22
|
+
source: "webchat", accountId: request.claims.accountId,
|
|
23
|
+
requestId: request.claims.requestId, sessionKey: request.sessionKey,
|
|
24
|
+
});
|
|
25
|
+
function snapshot(request) {
|
|
26
|
+
return {
|
|
27
|
+
requestId: request.claims.requestId, sessionKey: request.sessionKey,
|
|
28
|
+
status: request.status, sequence: request.sequence,
|
|
29
|
+
text: [request.text, request.turnText].filter(Boolean).join("\n\n"),
|
|
30
|
+
error: request.error, createdAt: request.createdAt, expiresAt: request.expiresAt,
|
|
31
|
+
notices: request.notices.map((notice) => ({ ...notice, data: notice.data && { ...notice.data } })),
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
function emit(request, notice, includeSnapshot = false) {
|
|
35
|
+
request.sequence++;
|
|
36
|
+
// 增量事件不反复携带全部正文;重连订阅及 status 查询才返回完整快照。
|
|
37
|
+
const payload = includeSnapshot ? { ...snapshot(request), notice } : {
|
|
38
|
+
requestId: request.claims.requestId, sessionKey: request.sessionKey,
|
|
39
|
+
status: request.status, sequence: request.sequence, error: request.error, notice,
|
|
40
|
+
};
|
|
41
|
+
for (const subscriber of request.subscribers.values()) {
|
|
42
|
+
try {
|
|
43
|
+
subscriber.send(payload);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
options.log("webchat.delivery.failed", { ...trace(request), reasonCode: "delivery_failed" });
|
|
47
|
+
request.subscribers.delete(subscriber.connId);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
function terminate(request, status, error) {
|
|
52
|
+
if (isTerminal(request))
|
|
53
|
+
return;
|
|
54
|
+
request.status = status;
|
|
55
|
+
request.error = error;
|
|
56
|
+
request.generation++;
|
|
57
|
+
request.resumeMessages = [];
|
|
58
|
+
const pending = [...request.deferred.values()];
|
|
59
|
+
request.deferred.clear();
|
|
60
|
+
for (const operation of pending) {
|
|
61
|
+
try {
|
|
62
|
+
operation.cancel();
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
options.log("webchat.cancel.failed", trace(request));
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
options.log(`webchat.${status}`, { ...trace(request), reasonCode: error });
|
|
69
|
+
emit(request);
|
|
70
|
+
}
|
|
71
|
+
function forget(key, request) {
|
|
72
|
+
if (request.expiryTimer)
|
|
73
|
+
clearTimeout(request.expiryTimer);
|
|
74
|
+
if (requests.get(key) === request)
|
|
75
|
+
requests.delete(key);
|
|
76
|
+
}
|
|
77
|
+
function prune() {
|
|
78
|
+
for (const [key, request] of requests) {
|
|
79
|
+
if (request.expiresAt > now())
|
|
80
|
+
continue;
|
|
81
|
+
terminate(request, "failed", "webchat_request_expired");
|
|
82
|
+
// 正在执行的请求保留幂等记录,不能因 TTL 到期又接受同一业务操作。
|
|
83
|
+
if (request.running === 0 && request.queued === 0)
|
|
84
|
+
forget(key, request);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
function active(request, generation) {
|
|
88
|
+
if (generation !== request.generation || isTerminal(request))
|
|
89
|
+
return false;
|
|
90
|
+
if (request.expiresAt <= now()) {
|
|
91
|
+
terminate(request, "failed", "webchat_request_expired");
|
|
92
|
+
return false;
|
|
93
|
+
}
|
|
94
|
+
try {
|
|
95
|
+
options.validateTarget(request.claims);
|
|
96
|
+
}
|
|
97
|
+
catch {
|
|
98
|
+
terminate(request, "failed", "webchat_binding_invalid");
|
|
99
|
+
return false;
|
|
100
|
+
}
|
|
101
|
+
return true;
|
|
102
|
+
}
|
|
103
|
+
function subscribe(request, subscriber) {
|
|
104
|
+
if (!request.subscribers.has(subscriber.connId) && request.subscribers.size >= MAX_SUBSCRIBERS) {
|
|
105
|
+
throw new WebchatRequestError("WEBCHAT_SUBSCRIBER_LIMIT", "当前请求的订阅连接过多。");
|
|
106
|
+
}
|
|
107
|
+
request.subscribers.set(subscriber.connId, subscriber);
|
|
108
|
+
}
|
|
109
|
+
function appendText(request, text) {
|
|
110
|
+
if (text)
|
|
111
|
+
request.text = [request.text, text].filter(Boolean).join("\n\n").slice(-MAX_TEXT_LENGTH);
|
|
112
|
+
}
|
|
113
|
+
function bindingFor(request) {
|
|
114
|
+
const generation = request.generation;
|
|
115
|
+
const turn = request.turn;
|
|
116
|
+
const binding = {
|
|
117
|
+
requestId: request.claims.requestId, accountId: request.claims.accountId,
|
|
118
|
+
senderId: request.claims.senderId, sessionKey: request.sessionKey,
|
|
119
|
+
isActive: () => active(request, generation),
|
|
120
|
+
publish(notice) {
|
|
121
|
+
if (!active(request, generation))
|
|
122
|
+
return;
|
|
123
|
+
if (notice.type === "reply") {
|
|
124
|
+
// 旧 turn 的增量回调不能覆盖授权后新一轮的回复。
|
|
125
|
+
if (turn !== request.turn)
|
|
126
|
+
return;
|
|
127
|
+
request.turnText = notice.replace
|
|
128
|
+
? (notice.text ?? "").slice(-MAX_TEXT_LENGTH)
|
|
129
|
+
: [request.turnText, notice.text].filter(Boolean).join("\n\n").slice(-MAX_TEXT_LENGTH);
|
|
130
|
+
}
|
|
131
|
+
else if (notice.text) {
|
|
132
|
+
appendText(request, notice.text);
|
|
133
|
+
}
|
|
134
|
+
if (notice.type !== "reply" || notice.data) {
|
|
135
|
+
request.notices.push({ ...notice });
|
|
136
|
+
if (request.notices.length > 20)
|
|
137
|
+
request.notices.shift();
|
|
138
|
+
}
|
|
139
|
+
emit(request, notice);
|
|
140
|
+
},
|
|
141
|
+
defer(id, kind, onCancel) {
|
|
142
|
+
if (!active(request, generation))
|
|
143
|
+
return false;
|
|
144
|
+
request.deferred.set(id, { kind, cancel: onCancel });
|
|
145
|
+
request.status = kind === "authorization" ? "awaiting_authorization" : "pending_task";
|
|
146
|
+
emit(request);
|
|
147
|
+
return true;
|
|
148
|
+
},
|
|
149
|
+
settle(id, error) {
|
|
150
|
+
if (!active(request, generation))
|
|
151
|
+
return;
|
|
152
|
+
request.deferred.delete(id);
|
|
153
|
+
if (error)
|
|
154
|
+
terminate(request, "failed", error);
|
|
155
|
+
},
|
|
156
|
+
async resume(message, operationId) {
|
|
157
|
+
if (!active(request, generation))
|
|
158
|
+
return;
|
|
159
|
+
if (operationId && request.resumedOperations.has(operationId))
|
|
160
|
+
return;
|
|
161
|
+
if (operationId)
|
|
162
|
+
request.resumedOperations.add(operationId);
|
|
163
|
+
if (!request.resumeMessages.includes(message))
|
|
164
|
+
request.resumeMessages.push(message);
|
|
165
|
+
// 不同后台完成事件合并到排队的续接,不能因已有续接而丢掉后来的消息。
|
|
166
|
+
if ([...request.deferred.values()].some((operation) => operation.kind === "authorization"))
|
|
167
|
+
return;
|
|
168
|
+
if (request.resumeQueued)
|
|
169
|
+
return;
|
|
170
|
+
request.resumeQueued = true;
|
|
171
|
+
options.log("webchat.resume.queued", trace(request));
|
|
172
|
+
await enqueue(request, "", true);
|
|
173
|
+
},
|
|
174
|
+
};
|
|
175
|
+
return Object.freeze(binding);
|
|
176
|
+
}
|
|
177
|
+
function enqueue(request, message, resuming = false) {
|
|
178
|
+
const generation = request.generation;
|
|
179
|
+
request.queued++;
|
|
180
|
+
if (request.running === 0)
|
|
181
|
+
request.status = "queued";
|
|
182
|
+
const previous = queues.get(request.sessionKey) ?? Promise.resolve();
|
|
183
|
+
const work = previous.catch(() => { }).then(async () => {
|
|
184
|
+
request.queued--;
|
|
185
|
+
if (!active(request, generation)) {
|
|
186
|
+
if (request.error === "webchat_request_expired" && request.running === 0 && request.queued === 0) {
|
|
187
|
+
forget(requestKey(request.claims), request);
|
|
188
|
+
}
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
if (resuming) {
|
|
192
|
+
request.resumeQueued = false;
|
|
193
|
+
if ([...request.deferred.values()].some((operation) => operation.kind === "authorization")) {
|
|
194
|
+
request.status = "awaiting_authorization";
|
|
195
|
+
emit(request);
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
message = request.resumeMessages.splice(0).join("\n\n");
|
|
199
|
+
}
|
|
200
|
+
request.running++;
|
|
201
|
+
request.turn++;
|
|
202
|
+
request.status = "running";
|
|
203
|
+
options.log(resuming ? "webchat.resume.started" : "webchat.turn.started", trace(request));
|
|
204
|
+
emit(request);
|
|
205
|
+
try {
|
|
206
|
+
await options.dispatch(request.claims, bindingFor(request), message);
|
|
207
|
+
}
|
|
208
|
+
catch {
|
|
209
|
+
terminate(request, "failed", "webchat_dispatch_failed");
|
|
210
|
+
}
|
|
211
|
+
finally {
|
|
212
|
+
appendText(request, request.turnText);
|
|
213
|
+
request.turnText = "";
|
|
214
|
+
request.running--;
|
|
215
|
+
if (!isTerminal(request)) {
|
|
216
|
+
const pending = [...request.deferred.values()];
|
|
217
|
+
request.status = pending.some((operation) => operation.kind === "authorization")
|
|
218
|
+
? "awaiting_authorization"
|
|
219
|
+
: pending.length ? "pending_task" : request.queued ? "queued" : "completed";
|
|
220
|
+
}
|
|
221
|
+
options.log("webchat.turn.settled", { ...trace(request), status: request.status });
|
|
222
|
+
emit(request);
|
|
223
|
+
if (request.error === "webchat_request_expired" && request.running === 0 && request.queued === 0) {
|
|
224
|
+
forget(requestKey(request.claims), request);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
});
|
|
228
|
+
const tracked = work.finally(() => {
|
|
229
|
+
if (queues.get(request.sessionKey) === tracked)
|
|
230
|
+
queues.delete(request.sessionKey);
|
|
231
|
+
});
|
|
232
|
+
queues.set(request.sessionKey, tracked);
|
|
233
|
+
return tracked;
|
|
234
|
+
}
|
|
235
|
+
return {
|
|
236
|
+
handle(method, raw, subscriber) {
|
|
237
|
+
const claims = Object.freeze(verifyWebchatRequest(method, raw, options.getSecret(), now()));
|
|
238
|
+
options.validateTarget(claims);
|
|
239
|
+
prune();
|
|
240
|
+
const key = requestKey(claims);
|
|
241
|
+
const existing = requests.get(key);
|
|
242
|
+
if (method === "yach.webchat.send" && existing) {
|
|
243
|
+
if (existing.fingerprint !== webchatRequestFingerprint(claims)) {
|
|
244
|
+
throw new WebchatRequestError("WEBCHAT_REQUEST_CONFLICT", "同一 requestId 不能用于不同消息。");
|
|
245
|
+
}
|
|
246
|
+
if (subscriber)
|
|
247
|
+
subscribe(existing, subscriber);
|
|
248
|
+
options.log("webchat.request.reused", trace(existing));
|
|
249
|
+
return snapshot(existing);
|
|
250
|
+
}
|
|
251
|
+
nonces.consume(claims);
|
|
252
|
+
if (method === "yach.webchat.send") {
|
|
253
|
+
if (requests.size >= (options.maxRequests ?? MAX_REQUESTS)) {
|
|
254
|
+
throw new WebchatRequestError("WEBCHAT_REQUEST_LIMIT", "待处理请求过多,请稍后重试。");
|
|
255
|
+
}
|
|
256
|
+
const createdAt = now();
|
|
257
|
+
const request = {
|
|
258
|
+
claims, fingerprint: webchatRequestFingerprint(claims),
|
|
259
|
+
sessionKey: buildWebchatSessionKey(claims), status: "queued", sequence: 0,
|
|
260
|
+
text: "", turnText: "", notices: [], createdAt,
|
|
261
|
+
expiresAt: createdAt + (options.requestTtlMs ?? REQUEST_TTL_MS),
|
|
262
|
+
generation: 0, turn: 0, running: 0, queued: 0, resumeQueued: false,
|
|
263
|
+
resumeMessages: [], resumedOperations: new Set(),
|
|
264
|
+
deferred: new Map(), subscribers: new Map(),
|
|
265
|
+
};
|
|
266
|
+
if (subscriber)
|
|
267
|
+
subscribe(request, subscriber);
|
|
268
|
+
requests.set(key, request);
|
|
269
|
+
request.expiryTimer = setTimeout(() => {
|
|
270
|
+
terminate(request, "failed", "webchat_request_expired");
|
|
271
|
+
if (request.running === 0 && request.queued === 0)
|
|
272
|
+
forget(key, request);
|
|
273
|
+
}, request.expiresAt - createdAt);
|
|
274
|
+
request.expiryTimer.unref?.();
|
|
275
|
+
options.log("webchat.request.accepted", trace(request));
|
|
276
|
+
// RPC 立即返回接受状态,模型执行和授权等待不占用 RPC 响应。
|
|
277
|
+
void enqueue(request, claims.message).catch(() => terminate(request, "failed", "webchat_dispatch_failed"));
|
|
278
|
+
return snapshot(request);
|
|
279
|
+
}
|
|
280
|
+
if (!existing) {
|
|
281
|
+
throw new WebchatRequestError("WEBCHAT_REQUEST_NOT_FOUND", "请求不存在或已过期;插件重启后需重新建立请求。");
|
|
282
|
+
}
|
|
283
|
+
if (method === "yach.webchat.subscribe") {
|
|
284
|
+
if (!subscriber)
|
|
285
|
+
throw new WebchatRequestError("WEBCHAT_CONNECTION_REQUIRED", "订阅需要有效的 Gateway 连接。");
|
|
286
|
+
subscribe(existing, subscriber);
|
|
287
|
+
emit(existing, undefined, true);
|
|
288
|
+
}
|
|
289
|
+
else if (method === "yach.webchat.cancel") {
|
|
290
|
+
if (existing.running > 0) {
|
|
291
|
+
throw new WebchatRequestError("WEBCHAT_REQUEST_RUNNING", "请求正在执行,无法撤回已经开始的业务操作。");
|
|
292
|
+
}
|
|
293
|
+
terminate(existing, "cancelled");
|
|
294
|
+
}
|
|
295
|
+
return snapshot(existing);
|
|
296
|
+
},
|
|
297
|
+
async drain() {
|
|
298
|
+
while (queues.size)
|
|
299
|
+
await Promise.allSettled([...queues.values()]);
|
|
300
|
+
},
|
|
301
|
+
clear() {
|
|
302
|
+
for (const request of requests.values()) {
|
|
303
|
+
if (request.expiryTimer)
|
|
304
|
+
clearTimeout(request.expiryTimer);
|
|
305
|
+
terminate(request, "cancelled");
|
|
306
|
+
}
|
|
307
|
+
requests.clear();
|
|
308
|
+
nonces.clear();
|
|
309
|
+
},
|
|
310
|
+
};
|
|
311
|
+
}
|
|
312
|
+
//# sourceMappingURL=service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/webchat/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/webchat/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,mBAAmB;IACnB,qBAAqB;IACrB,wBAAwB;IACxB,qBAAqB;CACb,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yach.zhiyinlou.com/yach",
|
|
3
|
-
"version": "2.16.0",
|
|
3
|
+
"version": "2.16.1-beta.0",
|
|
4
4
|
"description": "OpenClaw Yach (知音楼) channel plugin",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"order": 80
|
|
67
67
|
},
|
|
68
68
|
"install": {
|
|
69
|
-
"npmSpec": "@yach.zhiyinlou.com/yach@2.16.0",
|
|
69
|
+
"npmSpec": "@yach.zhiyinlou.com/yach@2.16.1-beta.0",
|
|
70
70
|
"defaultChoice": "npm",
|
|
71
71
|
"minHostVersion": ">=2026.3.22"
|
|
72
72
|
}
|