lightclawbot 1.0.3 → 1.0.4
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/README.md +241 -1
- package/dist/public/data/scripts/check-update.9c4e848e.sh +138 -0
- package/dist/public/data/scripts/check-update.sh +138 -0
- package/dist/public/data/scripts/manifest.json +21 -0
- package/dist/public/data/scripts/preflight.7c5a27cd.sh +86 -0
- package/dist/public/data/scripts/preflight.sh +86 -0
- package/dist/public/data/scripts/upgrade.bd220b70.sh +214 -0
- package/dist/public/data/scripts/upgrade.sh +214 -0
- package/dist/src/channel.d.ts.map +1 -1
- package/dist/src/channel.js +34 -17
- package/dist/src/channel.js.map +1 -1
- package/dist/src/config.d.ts +34 -1
- package/dist/src/config.d.ts.map +1 -1
- package/dist/src/config.js +104 -6
- package/dist/src/config.js.map +1 -1
- package/dist/src/download-tool.d.ts.map +1 -1
- package/dist/src/download-tool.js +16 -16
- package/dist/src/download-tool.js.map +1 -1
- package/dist/src/file-storage.d.ts.map +1 -1
- package/dist/src/file-storage.js +3 -5
- package/dist/src/file-storage.js.map +1 -1
- package/dist/src/format-urls.d.ts +26 -0
- package/dist/src/format-urls.d.ts.map +1 -0
- package/dist/src/format-urls.js +53 -0
- package/dist/src/format-urls.js.map +1 -0
- package/dist/src/gateway.d.ts.map +1 -1
- package/dist/src/gateway.js +89 -39
- package/dist/src/gateway.js.map +1 -1
- package/dist/src/history/session-store.d.ts +4 -0
- package/dist/src/history/session-store.d.ts.map +1 -1
- package/dist/src/history/session-store.js +41 -0
- package/dist/src/history/session-store.js.map +1 -1
- package/dist/src/inbound.d.ts.map +1 -1
- package/dist/src/inbound.js +38 -15
- package/dist/src/inbound.js.map +1 -1
- package/dist/src/outbound.d.ts.map +1 -1
- package/dist/src/outbound.js +5 -3
- package/dist/src/outbound.js.map +1 -1
- package/dist/src/socket-handlers.d.ts.map +1 -1
- package/dist/src/socket-handlers.js +1 -0
- package/dist/src/socket-handlers.js.map +1 -1
- package/dist/src/types.d.ts +6 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/upload-tool.d.ts.map +1 -1
- package/dist/src/upload-tool.js +14 -19
- package/dist/src/upload-tool.js.map +1 -1
- package/package.json +6 -3
- package/skills/lightclaw-media/SKILL.md +330 -0
package/dist/src/gateway.js
CHANGED
|
@@ -12,53 +12,98 @@
|
|
|
12
12
|
* 媒体文件处理 → media.ts
|
|
13
13
|
*/
|
|
14
14
|
import { io } from "socket.io-client";
|
|
15
|
-
import { CHANNEL_KEY, WS_URL, API_BASE_URL, SOCKET_PATH, SOCKET_RECONNECTION_DELAY, SOCKET_RECONNECTION_DELAY_MAX, SOCKET_RECONNECTION_ATTEMPTS, API_PATH_USER_CURRENT, EVENT_MESSAGE_PRIVATE, MESSAGE_QUEUE_SIZE, MESSAGE_QUEUE_WARN_THRESHOLD, QUEUE_POLL_INTERVAL, HEALTH_HEARTBEAT_INTERVAL, buildAuthHeaders, } from "./config.js";
|
|
15
|
+
import { CHANNEL_KEY, WS_URL, API_BASE_URL, SOCKET_PATH, SOCKET_RECONNECTION_DELAY, SOCKET_RECONNECTION_DELAY_MAX, SOCKET_RECONNECTION_ATTEMPTS, API_PATH_USER_CURRENT, EVENT_MESSAGE_PRIVATE, MESSAGE_QUEUE_SIZE, MESSAGE_QUEUE_WARN_THRESHOLD, QUEUE_POLL_INTERVAL, HEALTH_HEARTBEAT_INTERVAL, buildAuthHeaders, buildMultiAuthHeaders, setApiKeyMap, } from "./config.js";
|
|
16
16
|
import { generateMsgId } from "./dedup.js";
|
|
17
17
|
import { createInboundHandler } from "./inbound.js";
|
|
18
18
|
import { bindSocketHandlers } from "./socket-handlers.js";
|
|
19
19
|
import { registerSocket, unregisterSocket, flushPendingMessages } from "./socket-registry.js";
|
|
20
|
+
import { formatCosUrls } from "./format-urls.js";
|
|
20
21
|
// ============================================================
|
|
21
22
|
// Gateway 实例追踪(防止同一 accountId 创建多个连接)
|
|
22
23
|
// ============================================================
|
|
23
24
|
/** accountId → cleanup function */
|
|
24
25
|
const activeGateways = new Map();
|
|
25
|
-
|
|
26
|
+
/**
|
|
27
|
+
* 对每个 apiKey 调 /user/current,一次性获取 botClientId 和 uin→apiKey 映射。
|
|
28
|
+
*
|
|
29
|
+
* 所有 key 共享同一个 botId(来自 data.client.extra),
|
|
30
|
+
* 但每个 key 对应不同的 uin(= data.id)。
|
|
31
|
+
*
|
|
32
|
+
* 映射表大小 = apiKeys 数量(静态、固定),不会随消息增多而增长。
|
|
33
|
+
*/
|
|
34
|
+
async function resolveApiKeyIdentities(allApiKeys, log) {
|
|
26
35
|
const url = `${API_BASE_URL}${API_PATH_USER_CURRENT}`;
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
36
|
+
const apiKeyMap = new Map();
|
|
37
|
+
let botClientId = "";
|
|
38
|
+
for (const key of allApiKeys) {
|
|
39
|
+
try {
|
|
40
|
+
const resp = await fetch(url, {
|
|
41
|
+
method: "GET",
|
|
42
|
+
headers: buildAuthHeaders(key),
|
|
43
|
+
});
|
|
44
|
+
if (!resp.ok) {
|
|
45
|
+
const body = await resp.text().catch(() => "");
|
|
46
|
+
const msg = `HTTP ${resp.status} ${resp.statusText}${body ? ` — ${body}` : ""}`;
|
|
47
|
+
// 第一个 key 必须成功(用于获取 botId),后续 key 失败可降级
|
|
48
|
+
if (!botClientId) {
|
|
49
|
+
throw new Error(`Failed to fetch botId from apiKey ***${key.slice(-4)}: ${msg}`);
|
|
50
|
+
}
|
|
51
|
+
log?.warn(`[${CHANNEL_KEY}] Failed to resolve uin for apiKey ***${key.slice(-4)}: ${msg}`);
|
|
52
|
+
continue;
|
|
53
|
+
}
|
|
54
|
+
const result = (await resp.json());
|
|
55
|
+
if (result.code !== 0) {
|
|
56
|
+
const msg = `code=${result.code}, message=${result.message ?? "unknown"}`;
|
|
57
|
+
if (!botClientId) {
|
|
58
|
+
throw new Error(`Failed to fetch botId from apiKey ***${key.slice(-4)}: ${msg}`);
|
|
59
|
+
}
|
|
60
|
+
log?.warn(`[${CHANNEL_KEY}] Failed to resolve uin for apiKey ***${key.slice(-4)}: ${msg}`);
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
// 提取 uin
|
|
64
|
+
const uin = result.data?.id;
|
|
65
|
+
if (uin) {
|
|
66
|
+
apiKeyMap.set(uin, key);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
log?.warn(`[${CHANNEL_KEY}] Missing data.id for apiKey ***${key.slice(-4)}`);
|
|
70
|
+
}
|
|
71
|
+
// 提取 botId(只需从第一个成功的 key 中获取一次)
|
|
72
|
+
if (!botClientId) {
|
|
73
|
+
const extra = result.data?.client?.extra;
|
|
74
|
+
if (!extra) {
|
|
75
|
+
throw new Error("Invalid response: missing data.client.extra");
|
|
76
|
+
}
|
|
77
|
+
let parsed;
|
|
78
|
+
try {
|
|
79
|
+
parsed = JSON.parse(extra);
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
throw new Error(`Invalid response: data.client.extra is not valid JSON: ${extra}`);
|
|
83
|
+
}
|
|
84
|
+
if (!parsed.botId) {
|
|
85
|
+
throw new Error(`Invalid response: missing botId in data.client.extra: ${extra}`);
|
|
86
|
+
}
|
|
87
|
+
botClientId = parsed.botId;
|
|
88
|
+
}
|
|
89
|
+
log?.info(`[${CHANNEL_KEY}] Mapped uin=${uin} → apiKey=***${key.slice(-4)}`);
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
// 如果还没拿到 botId,向上抛出
|
|
93
|
+
if (!botClientId)
|
|
94
|
+
throw err;
|
|
95
|
+
log?.warn(`[${CHANNEL_KEY}] Failed to resolve uin for apiKey ***${key.slice(-4)}: ${err}`);
|
|
96
|
+
}
|
|
52
97
|
}
|
|
53
|
-
return
|
|
98
|
+
return { botClientId, apiKeyMap };
|
|
54
99
|
}
|
|
55
100
|
// ============================================================
|
|
56
101
|
// 核心:启动 Gateway
|
|
57
102
|
// ============================================================
|
|
58
103
|
export async function startGateway(ctx) {
|
|
59
104
|
const { account, abortSignal, onReady, onDisconnect, onEvent, log } = ctx;
|
|
60
|
-
if (!account.
|
|
61
|
-
throw new Error(`[${CHANNEL_KEY}] Missing
|
|
105
|
+
if (!account.allApiKeys.length) {
|
|
106
|
+
throw new Error(`[${CHANNEL_KEY}] Missing apiKeys in config`);
|
|
62
107
|
}
|
|
63
108
|
// 防重入:如果同一 accountId 已有活跃 gateway,先销毁
|
|
64
109
|
const existingCleanup = activeGateways.get(account.accountId);
|
|
@@ -66,10 +111,12 @@ export async function startGateway(ctx) {
|
|
|
66
111
|
log?.warn(`[${CHANNEL_KEY}] Destroying existing gateway for account ${account.accountId} before creating new one`);
|
|
67
112
|
existingCleanup();
|
|
68
113
|
}
|
|
69
|
-
// 通过 HTTP 接口获取 Bot 身份
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
114
|
+
// 通过 HTTP 接口获取 Bot 身份 & uin→apiKey 映射(一次性完成)
|
|
115
|
+
const { allApiKeys } = account;
|
|
116
|
+
log?.info(`[${CHANNEL_KEY}] Resolving identities for ${allApiKeys.length} apiKey(s)...`);
|
|
117
|
+
const { botClientId, apiKeyMap } = await resolveApiKeyIdentities(allApiKeys, log);
|
|
118
|
+
log?.info(`[${CHANNEL_KEY}] Bot clientId: ${botClientId}, apiKey map: ${apiKeyMap.size} entries`);
|
|
119
|
+
setApiKeyMap(apiKeyMap, account.apiKey);
|
|
73
120
|
let isAborted = false;
|
|
74
121
|
let currentSocket = null;
|
|
75
122
|
let healthHeartbeatTimer = null;
|
|
@@ -88,12 +135,13 @@ export async function startGateway(ctx) {
|
|
|
88
135
|
}
|
|
89
136
|
};
|
|
90
137
|
const sendReply = (targetId, text, replyToMsgId) => {
|
|
91
|
-
|
|
138
|
+
const formatted = formatCosUrls(text);
|
|
139
|
+
log?.info(`[${CHANNEL_KEY}] sendReply: ${formatted} to ${targetId} (replyTo: ${replyToMsgId || "none"})`);
|
|
92
140
|
return emit({
|
|
93
141
|
msgId: generateMsgId(),
|
|
94
142
|
from: botClientId,
|
|
95
143
|
to: targetId,
|
|
96
|
-
content:
|
|
144
|
+
content: formatted,
|
|
97
145
|
timestamp: Date.now(),
|
|
98
146
|
replyToMsgId,
|
|
99
147
|
});
|
|
@@ -103,7 +151,7 @@ export async function startGateway(ctx) {
|
|
|
103
151
|
msgId: generateMsgId(),
|
|
104
152
|
from: botClientId,
|
|
105
153
|
to: targetId,
|
|
106
|
-
content: text,
|
|
154
|
+
content: formatCosUrls(text),
|
|
107
155
|
timestamp: Date.now(),
|
|
108
156
|
files,
|
|
109
157
|
replyToMsgId,
|
|
@@ -179,9 +227,11 @@ export async function startGateway(ctx) {
|
|
|
179
227
|
};
|
|
180
228
|
activeGateways.set(account.accountId, cleanup);
|
|
181
229
|
// ---- Socket.IO 连接 ----
|
|
182
|
-
log?.info(`[${CHANNEL_KEY}] Connecting to ${WS_URL}
|
|
230
|
+
log?.info(`[${CHANNEL_KEY}] Connecting to ${WS_URL},apiKey=${account.apiKey},apikeys=${allApiKeys.join(",")}`);
|
|
183
231
|
const socket = io(WS_URL, {
|
|
184
|
-
auth:
|
|
232
|
+
auth: allApiKeys.length > 1
|
|
233
|
+
? buildMultiAuthHeaders(allApiKeys)
|
|
234
|
+
: buildAuthHeaders(account.apiKey),
|
|
185
235
|
path: SOCKET_PATH,
|
|
186
236
|
forceNew: true,
|
|
187
237
|
reconnection: true,
|
package/dist/src/gateway.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/gateway.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,EAAE,EAAe,MAAM,kBAAkB,CAAC;AAOnD,OAAO,EACL,WAAW,EACX,MAAM,EACN,YAAY,EACZ,WAAW,EACX,yBAAyB,EACzB,6BAA6B,EAC7B,4BAA4B,EAC5B,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/gateway.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,EAAE,EAAe,MAAM,kBAAkB,CAAC;AAOnD,OAAO,EACL,WAAW,EACX,MAAM,EACN,YAAY,EACZ,WAAW,EACX,yBAAyB,EACzB,6BAA6B,EAC7B,4BAA4B,EAC5B,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,GACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAsB,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,+DAA+D;AAC/D,sCAAsC;AACtC,+DAA+D;AAE/D,mCAAmC;AACnC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAsB,CAAC;AA0BrD;;;;;;;GAOG;AACH,KAAK,UAAU,uBAAuB,CACpC,UAAoB,EACpB,GAA2B;IAE3B,MAAM,GAAG,GAAG,GAAG,YAAY,GAAG,qBAAqB,EAAE,CAAC;IACtD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,IAAI,WAAW,GAAG,EAAE,CAAC;IAErB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAC5B,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC;aAC/B,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;gBACb,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC/C,MAAM,GAAG,GAAG,QAAQ,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBAChF,wCAAwC;gBACxC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;gBACnF,CAAC;gBACD,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,yCAAyC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;gBAC3F,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAwB,CAAC;YAC1D,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAM,GAAG,GAAG,QAAQ,MAAM,CAAC,IAAI,aAAa,MAAM,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;gBAC1E,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;gBACnF,CAAC;gBACD,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,yCAAyC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;gBAC3F,SAAS;YACX,CAAC;YAED,SAAS;YACT,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5B,IAAI,GAAG,EAAE,CAAC;gBACR,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,mCAAmC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC/E,CAAC;YAED,gCAAgC;YAChC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC;gBACzC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,CAAC;gBACD,IAAI,MAA0B,CAAC;gBAC/B,IAAI,CAAC;oBACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC;gBAAC,MAAM,CAAC;oBACP,MAAM,IAAI,KAAK,CAAC,0DAA0D,KAAK,EAAE,CAAC,CAAC;gBACrF,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;oBAClB,MAAM,IAAI,KAAK,CAAC,yDAAyD,KAAK,EAAE,CAAC,CAAC;gBACpF,CAAC;gBACD,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;YAC7B,CAAC;YAED,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,gBAAgB,GAAG,gBAAgB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,oBAAoB;YACpB,IAAI,CAAC,WAAW;gBAAE,MAAM,GAAG,CAAC;YAC5B,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,yCAAyC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IAED,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;AACpC,CAAC;AAED,+DAA+D;AAC/D,gBAAgB;AAChB,+DAA+D;AAE/D,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,GAAmB;IACpD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAE1E,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,IAAI,WAAW,6BAA6B,CAAC,CAAC;IAChE,CAAC;IAED,sCAAsC;IACtC,MAAM,eAAe,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC9D,IAAI,eAAe,EAAE,CAAC;QACpB,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,6CAA6C,OAAO,CAAC,SAAS,0BAA0B,CAAC,CAAC;QACnH,eAAe,EAAE,CAAC;IACpB,CAAC;IAED,6CAA6C;IAC7C,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC/B,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,8BAA8B,UAAU,CAAC,MAAM,eAAe,CAAC,CAAC;IACzF,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,uBAAuB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAClF,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,mBAAmB,WAAW,iBAAiB,SAAS,CAAC,IAAI,UAAU,CAAC,CAAC;IAClG,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAExC,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,aAAa,GAAkB,IAAI,CAAC;IACxC,IAAI,oBAAoB,GAA0C,IAAI,CAAC;IAEvE,2BAA2B;IAE3B,MAAM,IAAI,GAAG,CAAC,IAAwB,EAAW,EAAE;QACjD,IAAI,CAAC,aAAa,EAAE,SAAS;YAAE,OAAO,KAAK,CAAC;QAC5C,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,WAAW,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC;YACH,aAAa,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;YAChD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,EAAE,KAAK,CAAC,IAAI,WAAW,iBAAiB,GAAG,EAAE,CAAC,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAE,YAAqB,EAAW,EAAE;QACnF,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QACtC,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,gBAAgB,SAAS,OAAO,QAAQ,cAAc,YAAY,IAAI,MAAM,GAAG,CAAC,CAAC;QAC1G,OAAO,IAAI,CAAC;YACV,KAAK,EAAE,aAAa,EAAE;YACtB,IAAI,EAAE,WAAW;YACjB,EAAE,EAAE,QAAQ;YACZ,OAAO,EAAE,SAAS;YAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,YAAY;SACb,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAE,KAAuB,EAAE,YAAqB,EAAW,EAAE;QAC5G,OAAO,IAAI,CAAC;YACV,KAAK,EAAE,aAAa,EAAE;YACtB,IAAI,EAAE,WAAW;YACjB,EAAE,EAAE,QAAQ;YACZ,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC;YAC5B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,KAAK;YACL,YAAY;SACb,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,OAAO,GAAkB,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IAE3E,oBAAoB;IAEpB,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAEzE,iBAAiB;IAEjB,MAAM,YAAY,GAAoB,EAAE,CAAC;IACzC,IAAI,uBAAuB,GAAG,KAAK,CAAC;IACpC,IAAI,WAAW,GAAwB,IAAI,CAAC;IAE5C,MAAM,cAAc,GAAG,CAAC,GAAkB,EAAQ,EAAE;QAClD,IAAI,YAAY,CAAC,MAAM,IAAI,kBAAkB,EAAE,CAAC;YAC9C,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;YACrC,GAAG,EAAE,KAAK,CAAC,IAAI,WAAW,sCAAsC,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,IAAI,4BAA4B,EAAE,CAAC;YACxD,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,iBAAiB,YAAY,CAAC,MAAM,IAAI,kBAAkB,EAAE,CAAC,CAAC;QACzF,CAAC;QACD,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvB,QAAQ;QACR,WAAW,EAAE,EAAE,CAAC;IAClB,CAAC,CAAC;IAEF,uBAAuB;IACvB,MAAM,cAAc,GAAG,GAAkB,EAAE;QACzC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QACtD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,WAAW,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;YACxF,WAAW,GAAG,GAAG,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,qBAAqB,GAAG,GAAS,EAAE;QACvC,IAAI,uBAAuB;YAAE,OAAO;QACpC,uBAAuB,GAAG,IAAI,CAAC;QAE/B,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;YACtB,OAAO,CAAC,SAAS,EAAE,CAAC;gBAClB,MAAM,cAAc,EAAE,CAAC;gBACvB,OAAO,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBAC7C,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,EAAG,CAAC;oBAClC,IAAI,CAAC;wBACH,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;oBAClC,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,GAAG,EAAE,KAAK,CAAC,IAAI,WAAW,4BAA4B,GAAG,EAAE,CAAC,CAAC;oBAC/D,CAAC;gBACH,CAAC;YACH,CAAC;YACD,uBAAuB,GAAG,KAAK,CAAC;QAClC,CAAC,CAAC;QAEF,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,GAAG,EAAE,KAAK,CAAC,IAAI,WAAW,gCAAgC,GAAG,EAAE,CAAC,CAAC;YACjE,uBAAuB,GAAG,KAAK,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,iBAAiB;IAEjB,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,SAAS,GAAG,IAAI,CAAC;QACjB,IAAI,oBAAoB,EAAE,CAAC;YACzB,aAAa,CAAC,oBAAoB,CAAC,CAAC;YACpC,oBAAoB,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,aAAa,EAAE,CAAC;YAClB,aAAa,CAAC,kBAAkB,EAAE,CAAC;YACnC,aAAa,CAAC,UAAU,EAAE,CAAC;YAC3B,aAAa,GAAG,IAAI,CAAC;QACvB,CAAC;QACD,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,sBAAsB,CAAC,CAAC;IACnD,CAAC,CAAC;IAEF,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAE/C,yBAAyB;IAEzB,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,mBAAmB,MAAM,WAAW,OAAO,CAAC,MAAM,YAAY,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAE/G,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE;QACxB,IAAI,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC;YACzB,CAAC,CAAC,qBAAqB,CAAC,UAAU,CAAC;YACnC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,IAAI;QAClB,oBAAoB,EAAE,4BAA4B;QAClD,iBAAiB,EAAE,yBAAyB;QAC5C,oBAAoB,EAAE,6BAA6B;QACnD,UAAU,EAAE,CAAC,WAAW,CAAC;KAC1B,CAAC,CAAC;IAEH,aAAa,GAAG,MAAM,CAAC;IAEvB,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACxB,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,mBAAmB,MAAM,CAAC,EAAE,iBAAiB,WAAW,GAAG,CAAC,CAAC;QACtF,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;QACvD,qBAAqB,EAAE,CAAC;QAExB,gCAAgC;QAChC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACtE,IAAI,IAAI,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,8CAA8C,IAAI,YAAY,MAAM,EAAE,CAAC,CAAC;QACnG,CAAC;QAED,8DAA8D;QAC9D,IAAI,oBAAoB;YAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC;QAC9D,oBAAoB,GAAG,WAAW,CAAC,GAAG,EAAE;YACtC,IAAI,aAAa,EAAE,SAAS,EAAE,CAAC;gBAC7B,OAAO,EAAE,EAAE,CAAC;gBACZ,GAAG,EAAE,KAAK,EAAE,CAAC,IAAI,WAAW,yBAAyB,CAAC,CAAC;YACzD,CAAC;QACH,CAAC,EAAE,yBAAyB,CAAC,CAAC;QAE9B,OAAO,EAAE,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,YAAY;IACZ,kBAAkB,CAAC,MAAM,EAAE;QACzB,OAAO;QACP,WAAW;QACX,GAAG;QACH,cAAc;QACd,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,EAAE;QACjC,GAAG,EAAE,KAAK,CAAC,IAAI,WAAW,oBAAoB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE;QACjC,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,mBAAmB,MAAM,EAAE,CAAC,CAAC;QACtD,wBAAwB;QACxB,IAAI,oBAAoB,EAAE,CAAC;YACzB,aAAa,CAAC,oBAAoB,CAAC,CAAC;YACpC,oBAAoB,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,0DAA0D;QAC1D,+CAA+C;QAC/C,YAAY,EAAE,EAAE,CAAC;QACjB,IAAI,MAAM,KAAK,sBAAsB,EAAE,CAAC;YACtC,iBAAiB;YACjB,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,4DAA4D,CAAC,CAAC;YACvF,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,kCAAkC;IAClC,wEAAwE;IACxE,iDAAiD;IACjD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QACnC,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YACzC,OAAO,EAAE,CAAC;YACV,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,mBAAmB,CAAC,CAAC;YAC9C,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -33,6 +33,10 @@ export declare function getStoreDir(): string | null;
|
|
|
33
33
|
* 1. entry.sessionFile — 绝对路径 / 相对于 sessionsDir 的路径
|
|
34
34
|
* 2. sessionsDir/<sessionId>.jsonl — 标准 OPENCLAW_HOME 目录
|
|
35
35
|
* 3. storeDir/<sessionId>.jsonl — sessions.json 同级目录(离线分析场景)
|
|
36
|
+
* 4. 归档文件回退 — 查找 <sessionId>.jsonl.deleted.* / .reset.*
|
|
37
|
+
* (Cron Session Reaper 会将已完成的 cron run session 文件重命名为
|
|
38
|
+
* <sessionId>.jsonl.deleted.<timestamp>,导致标准路径找不到。
|
|
39
|
+
* 尤其是 deleteAfterRun=true 的一次性 cron 任务,执行后几乎立即被归档。)
|
|
36
40
|
*/
|
|
37
41
|
export declare function resolveTranscriptPath(sessionKey: string, agentId?: string): string | null;
|
|
38
42
|
//# sourceMappingURL=session-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/history/session-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AASpD,uBAAuB;AACvB,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAI3D;AAcD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAgBpF;AAiBD;;GAEG;AACH,wBAAgB,WAAW,IAAI,MAAM,GAAG,IAAI,CAE3C;AAMD
|
|
1
|
+
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/history/session-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AASpD,uBAAuB;AACvB,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAI3D;AAcD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAgBpF;AAiBD;;GAEG;AACH,wBAAgB,WAAW,IAAI,MAAM,GAAG,IAAI,CAE3C;AAMD;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA+CzF"}
|
|
@@ -93,6 +93,10 @@ export function getStoreDir() {
|
|
|
93
93
|
* 1. entry.sessionFile — 绝对路径 / 相对于 sessionsDir 的路径
|
|
94
94
|
* 2. sessionsDir/<sessionId>.jsonl — 标准 OPENCLAW_HOME 目录
|
|
95
95
|
* 3. storeDir/<sessionId>.jsonl — sessions.json 同级目录(离线分析场景)
|
|
96
|
+
* 4. 归档文件回退 — 查找 <sessionId>.jsonl.deleted.* / .reset.*
|
|
97
|
+
* (Cron Session Reaper 会将已完成的 cron run session 文件重命名为
|
|
98
|
+
* <sessionId>.jsonl.deleted.<timestamp>,导致标准路径找不到。
|
|
99
|
+
* 尤其是 deleteAfterRun=true 的一次性 cron 任务,执行后几乎立即被归档。)
|
|
96
100
|
*/
|
|
97
101
|
export function resolveTranscriptPath(sessionKey, agentId) {
|
|
98
102
|
const store = loadSessionStore(agentId);
|
|
@@ -126,6 +130,43 @@ export function resolveTranscriptPath(sessionKey, agentId) {
|
|
|
126
130
|
if (fs.existsSync(siblingPath))
|
|
127
131
|
return siblingPath;
|
|
128
132
|
}
|
|
133
|
+
// 第4层:查找被 Cron Session Reaper 归档的文件
|
|
134
|
+
// 格式:<sessionId>.jsonl.deleted.<timestamp> 或 <sessionId>.jsonl.reset.<timestamp>
|
|
135
|
+
// 在标准目录和 storeDir 中都尝试查找
|
|
136
|
+
const archivedPath = _findArchivedTranscript(sessionsDir, jsonlFileName);
|
|
137
|
+
if (archivedPath)
|
|
138
|
+
return archivedPath;
|
|
139
|
+
if (storeDir && storeDir !== sessionsDir) {
|
|
140
|
+
const archivedInStore = _findArchivedTranscript(storeDir, jsonlFileName);
|
|
141
|
+
if (archivedInStore)
|
|
142
|
+
return archivedInStore;
|
|
143
|
+
}
|
|
144
|
+
return null;
|
|
145
|
+
}
|
|
146
|
+
/**
|
|
147
|
+
* 在指定目录中查找归档的 transcript 文件
|
|
148
|
+
*
|
|
149
|
+
* 归档文件命名规则:<sessionId>.jsonl.<reason>.<ISO-timestamp>
|
|
150
|
+
* 例如:bac16e65-xxx.jsonl.deleted.2026-03-14T02-18-02.812Z
|
|
151
|
+
*
|
|
152
|
+
* 如果存在多个归档文件(理论上不会),返回最新的那个。
|
|
153
|
+
*/
|
|
154
|
+
function _findArchivedTranscript(dir, jsonlFileName) {
|
|
155
|
+
try {
|
|
156
|
+
const files = fs.readdirSync(dir);
|
|
157
|
+
// 匹配 <sessionId>.jsonl.deleted.* 或 <sessionId>.jsonl.reset.* 等归档后缀
|
|
158
|
+
const prefix = jsonlFileName + ".";
|
|
159
|
+
const archived = files
|
|
160
|
+
.filter((f) => f.startsWith(prefix) && /\.(deleted|reset)\.\d{4}-/.test(f))
|
|
161
|
+
.sort() // 按字母排序,时间戳越新越靠后
|
|
162
|
+
.pop(); // 取最新的
|
|
163
|
+
if (archived) {
|
|
164
|
+
return path.join(dir, archived);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
catch {
|
|
168
|
+
// 目录不存在或无权读取
|
|
169
|
+
}
|
|
129
170
|
return null;
|
|
130
171
|
}
|
|
131
172
|
//# sourceMappingURL=session-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/history/session-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,YAAY;AACZ,oDAAoD;AAEpD,+DAA+D;AAC/D,OAAO;AACP,+DAA+D;AAE/D,uBAAuB;AACvB,MAAM,UAAU,mBAAmB;IACjC,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,CAAC;AAC3E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAgB;IACjD,MAAM,IAAI,GAAG,mBAAmB,EAAE,CAAC;IACnC,MAAM,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC;IACrC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;AACnD,CAAC;AAED,+DAA+D;AAC/D,mBAAmB;AACnB,+DAA+D;AAE/D;;;;;GAKG;AACH,IAAI,kBAAkB,GAAkB,IAAI,CAAC;AAE7C;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC;IAC5E,kGAAkG;IAChG,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;IACxC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,kDAAkD;IAClD,WAAW;IACX,MAAM,IAAI,GAAG,mBAAmB,EAAE,CAAC;IACnC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;IACnE,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;QAChD,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC;IACpC,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,aAAa,CAAC,SAAiB;IACtC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAChD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YAAE,OAAO,IAAI,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACnE,kBAAkB,GAAG,SAAS,CAAC;YAC/B,OAAO,MAA2C,CAAC;QACrD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,aAAa;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW;IACzB,OAAO,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACtE,CAAC;AAED,+DAA+D;AAC/D,oBAAoB;AACpB,+DAA+D;AAE/D
|
|
1
|
+
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/history/session-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,YAAY;AACZ,oDAAoD;AAEpD,+DAA+D;AAC/D,OAAO;AACP,+DAA+D;AAE/D,uBAAuB;AACvB,MAAM,UAAU,mBAAmB;IACjC,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,CAAC;AAC3E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAgB;IACjD,MAAM,IAAI,GAAG,mBAAmB,EAAE,CAAC;IACnC,MAAM,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC;IACrC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;AACnD,CAAC;AAED,+DAA+D;AAC/D,mBAAmB;AACnB,+DAA+D;AAE/D;;;;;GAKG;AACH,IAAI,kBAAkB,GAAkB,IAAI,CAAC;AAE7C;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC;IAC5E,kGAAkG;IAChG,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;IACxC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,kDAAkD;IAClD,WAAW;IACX,MAAM,IAAI,GAAG,mBAAmB,EAAE,CAAC;IACnC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;IACnE,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;QAChD,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC;IACpC,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,aAAa,CAAC,SAAiB;IACtC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAChD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YAAE,OAAO,IAAI,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACnE,kBAAkB,GAAG,SAAS,CAAC;YAC/B,OAAO,MAA2C,CAAC;QACrD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,aAAa;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW;IACzB,OAAO,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACtE,CAAC;AAED,+DAA+D;AAC/D,oBAAoB;AACpB,+DAA+D;AAE/D;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,qBAAqB,CAAC,UAAkB,EAAE,OAAgB;IACxE,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAEtD,8BAA8B;IAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC;WAC1B,KAAK,CAAC,aAAa,CAAC;WACpB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEjF,IAAI,CAAC,KAAK,EAAE,SAAS;QAAE,OAAO,IAAI,CAAC;IAEnC,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,GAAG,KAAK,CAAC,SAAS,QAAQ,CAAC;IAEjD,iCAAiC;IACjC,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QACtB,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC;YACxD,CAAC,CAAC,KAAK,CAAC,WAAW;YACnB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;QAC9C,IAAI,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC;YAAE,OAAO,eAAe,CAAC;QAC3D,wCAAwC;IAC1C,CAAC;IAED,2CAA2C;IAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAC1D,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO,WAAW,CAAC;IAEnD,4BAA4B;IAC5B,iCAAiC;IACjC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,IAAI,QAAQ,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;QACzC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QACvD,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,OAAO,WAAW,CAAC;IACrD,CAAC;IAED,oCAAoC;IACpC,iFAAiF;IACjF,yBAAyB;IACzB,MAAM,YAAY,GAAG,uBAAuB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACzE,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC;IAEtC,IAAI,QAAQ,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;QACzC,MAAM,eAAe,GAAG,uBAAuB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QACzE,IAAI,eAAe;YAAE,OAAO,eAAe,CAAC;IAC9C,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,uBAAuB,CAAC,GAAW,EAAE,aAAqB;IACjE,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAClC,mEAAmE;QACnE,MAAM,MAAM,GAAG,aAAa,GAAG,GAAG,CAAC;QACnC,MAAM,QAAQ,GAAG,KAAK;aACnB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,2BAA2B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAC1E,IAAI,EAAE,CAAC,iBAAiB;aACxB,GAAG,EAAE,CAAC,CAAC,OAAO;QAEjB,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,aAAa;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound.d.ts","sourceRoot":"","sources":["../../src/inbound.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,cAAc,EACf,MAAM,YAAY,CAAC;AAQpB,oDAAoD;AACpD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,OAAO,CAAC;IAC5C,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9E,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACvG,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,EAClC,OAAO,EAAE,aAAa,EACtB,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,IAEb,KAAK,aAAa,KAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"inbound.d.ts","sourceRoot":"","sources":["../../src/inbound.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,cAAc,EACf,MAAM,YAAY,CAAC;AAQpB,oDAAoD;AACpD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,OAAO,CAAC;IAC5C,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9E,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACvG,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,EAClC,OAAO,EAAE,aAAa,EACtB,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,IAEb,KAAK,aAAa,KAAG,OAAO,CAAC,IAAI,CAAC,CAmWjD"}
|
package/dist/src/inbound.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* 接收用户消息 → 文件处理 → 路由 → AI 分发 → 回复
|
|
5
5
|
*/
|
|
6
6
|
import { getAssistantRuntime } from "./runtime.js";
|
|
7
|
-
import { CHANNEL_KEY, REPLY_TIMEOUT, MEDIA_MAX_BYTES } from "./config.js";
|
|
7
|
+
import { CHANNEL_KEY, REPLY_TIMEOUT, MEDIA_MAX_BYTES, resolveEffectiveApiKey, setSessionApiKey } from "./config.js";
|
|
8
8
|
import { createReplyPrefixOptions } from "openclaw/plugin-sdk";
|
|
9
9
|
import { generateMsgId } from "./dedup.js";
|
|
10
10
|
import { parseDataUrl, formatFileSize, mediaUrlsToFiles } from "./media.js";
|
|
@@ -16,8 +16,12 @@ export function createInboundHandler(account, emitter, log) {
|
|
|
16
16
|
return async (msg) => {
|
|
17
17
|
const pluginRuntime = getAssistantRuntime();
|
|
18
18
|
const currentCfg = pluginRuntime.config.loadConfig();
|
|
19
|
+
// 根据 senderId(=uin) 获取对应的 apiKey(多 key 模式下按 uin 选 key,单 key 模式下 fallback 到主 key)
|
|
20
|
+
const effectiveApiKey = resolveEffectiveApiKey({ senderId: msg.senderId });
|
|
21
|
+
log?.info(`[${CHANNEL_KEY}] Effective API key for uin ${msg.senderId}: ${effectiveApiKey.slice(0, 8)}...`);
|
|
19
22
|
// 1. 确定地址和会话 Key
|
|
20
|
-
|
|
23
|
+
// 使用标准 user: 前缀,与 normalizeTarget 输出格式一致
|
|
24
|
+
const fromAddress = `user:${msg.senderId}`;
|
|
21
25
|
// 2. 路由解析
|
|
22
26
|
const route = pluginRuntime.channel.routing.resolveAgentRoute({
|
|
23
27
|
cfg: currentCfg,
|
|
@@ -27,6 +31,13 @@ export function createInboundHandler(account, emitter, log) {
|
|
|
27
31
|
});
|
|
28
32
|
// 3. 权限检查
|
|
29
33
|
const commandAuthorized = checkAuth(account.allowFrom, account.dmPolicy, msg.senderId);
|
|
34
|
+
// 3.5 记录 sessionKey → apiKey 映射(tool 执行时通过 ctx.sessionKey 直接获取对应 apiKey)
|
|
35
|
+
// 注意:只写入 per-channel-peer 的 sessionKey,不写入 mainSessionKey。
|
|
36
|
+
// mainSessionKey(= "agent:main:main")是全局共享的,所有用户消息都会覆盖它,
|
|
37
|
+
// 导致最后一个用户的 apiKey 覆盖前一个用户,产生并发安全问题。
|
|
38
|
+
if (route?.sessionKey) {
|
|
39
|
+
setSessionApiKey(route.sessionKey, effectiveApiKey);
|
|
40
|
+
}
|
|
30
41
|
// 4. 处理文件附件(files[] → 本地存储)
|
|
31
42
|
const localMediaPaths = [];
|
|
32
43
|
const localMediaTypes = [];
|
|
@@ -49,7 +60,7 @@ export function createInboundHandler(account, emitter, log) {
|
|
|
49
60
|
else if (file.uri) {
|
|
50
61
|
// 远程 URI(COS 地址),下载获取内容
|
|
51
62
|
log?.info(`[${CHANNEL_KEY}] File has URI, downloading from COS: ${file.uri}`);
|
|
52
|
-
const downloaded = await downloadFileFromCos(file.uri, { apiKey:
|
|
63
|
+
const downloaded = await downloadFileFromCos(file.uri, { apiKey: effectiveApiKey });
|
|
53
64
|
buffer = downloaded.buffer;
|
|
54
65
|
mimeType = downloaded.contentType || file.mimeType;
|
|
55
66
|
// 保留原始 COS 公网 URL,用于 session 历史中持久化引用
|
|
@@ -72,7 +83,7 @@ export function createInboundHandler(account, emitter, log) {
|
|
|
72
83
|
else {
|
|
73
84
|
// data URL 来源的文件:上传到 COS 以获取公网 URL
|
|
74
85
|
try {
|
|
75
|
-
const uploadResult = await uploadFileToCos(saved.path, { apiKey:
|
|
86
|
+
const uploadResult = await uploadFileToCos(saved.path, { apiKey: effectiveApiKey });
|
|
76
87
|
publicMediaUrls.push(uploadResult.url || `file://${saved.path}`);
|
|
77
88
|
log?.info(`[${CHANNEL_KEY}] Uploaded inbound file to COS: ${saved.path} → ${uploadResult.url}`);
|
|
78
89
|
}
|
|
@@ -178,12 +189,14 @@ export function createInboundHandler(account, emitter, log) {
|
|
|
178
189
|
let hasResponse = false;
|
|
179
190
|
let idleSent = false;
|
|
180
191
|
let timeoutId = null;
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
192
|
+
let timeoutFired = false;
|
|
193
|
+
// 超时仅记录日志,不中断 dispatch(AI 可能仍在处理中)
|
|
194
|
+
timeoutId = setTimeout(() => {
|
|
195
|
+
if (!hasResponse) {
|
|
196
|
+
timeoutFired = true;
|
|
197
|
+
log?.warn(`[${CHANNEL_KEY}] AI reply not received within ${REPLY_TIMEOUT}ms, still waiting...`);
|
|
198
|
+
}
|
|
199
|
+
}, REPLY_TIMEOUT);
|
|
187
200
|
// 同一条消息的流式回复(typing_start / stream_chunk / typing_stop)共用同一个 msgId
|
|
188
201
|
const replyMsgId = generateMsgId();
|
|
189
202
|
const dispatchPromise = pluginRuntime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
|
|
@@ -225,7 +238,7 @@ export function createInboundHandler(account, emitter, log) {
|
|
|
225
238
|
// 尝试将文件上传到 COS 获取公网链接
|
|
226
239
|
const publicUrls = [];
|
|
227
240
|
const storageConfig = {
|
|
228
|
-
apiKey:
|
|
241
|
+
apiKey: effectiveApiKey,
|
|
229
242
|
};
|
|
230
243
|
for (const mediaUrl of mediaList) {
|
|
231
244
|
try {
|
|
@@ -246,11 +259,17 @@ export function createInboundHandler(account, emitter, log) {
|
|
|
246
259
|
log?.warn(`[${CHANNEL_KEY}] COS upload failed for ${mediaUrl}: ${uploadErr}`);
|
|
247
260
|
}
|
|
248
261
|
}
|
|
249
|
-
// 将公网 URL
|
|
262
|
+
// 将公网 URL 追加到回复文本中(Markdown 链接格式)
|
|
250
263
|
let enrichedText = replyText;
|
|
251
264
|
if (publicUrls.length > 0) {
|
|
252
265
|
const urlSection = publicUrls
|
|
253
|
-
.map((url, i) =>
|
|
266
|
+
.map((url, i) => {
|
|
267
|
+
// 从 URL 中提取文件名
|
|
268
|
+
const match = url.match(/filePath=([^&]+)/);
|
|
269
|
+
const filePath = match ? decodeURIComponent(match[1]) : "";
|
|
270
|
+
const fileName = filePath.split("/").pop() || `file${publicUrls.length > 1 ? ` (${i + 1})` : ""}`;
|
|
271
|
+
return `📎 [${fileName}](${url})`;
|
|
272
|
+
})
|
|
254
273
|
.join("\n");
|
|
255
274
|
enrichedText = enrichedText
|
|
256
275
|
? `${enrichedText}\n\n${urlSection}`
|
|
@@ -302,18 +321,22 @@ export function createInboundHandler(account, emitter, log) {
|
|
|
302
321
|
replyOptions: { onModelSelected, disableBlockStreaming: false },
|
|
303
322
|
});
|
|
304
323
|
try {
|
|
305
|
-
await
|
|
324
|
+
await dispatchPromise;
|
|
306
325
|
}
|
|
307
326
|
catch (err) {
|
|
308
327
|
const errMsg = err instanceof Error ? err.message : String(err);
|
|
309
328
|
log?.error(`[${CHANNEL_KEY}] Dispatch error: ${errMsg}`);
|
|
310
|
-
|
|
329
|
+
// 只发送通用提示,不暴露内部错误细节给用户
|
|
330
|
+
emitter.sendReply(targetId, '抱歉,处理您的消息时出现了问题,请稍后重试', msg.messageId);
|
|
311
331
|
}
|
|
312
332
|
finally {
|
|
313
333
|
if (timeoutId) {
|
|
314
334
|
clearTimeout(timeoutId);
|
|
315
335
|
timeoutId = null;
|
|
316
336
|
}
|
|
337
|
+
if (timeoutFired) {
|
|
338
|
+
log?.info(`[${CHANNEL_KEY}] Note: dispatch completed after timeout warning (${hasResponse ? 'with' : 'without'} response)`);
|
|
339
|
+
}
|
|
317
340
|
}
|
|
318
341
|
};
|
|
319
342
|
}
|
package/dist/src/inbound.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound.js","sourceRoot":"","sources":["../../src/inbound.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"inbound.js","sourceRoot":"","sources":["../../src/inbound.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbound.d.ts","sourceRoot":"","sources":["../../src/outbound.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"outbound.d.ts","sourceRoot":"","sources":["../../src/outbound.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AA6ElE;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,sBAAsB;;;GA0CzD;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,sBAAsB;;;GAmD1D"}
|
package/dist/src/outbound.js
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
import { resolveAccount, CHANNEL_KEY, DEFAULT_ACCOUNT_ID, EVENT_MESSAGE_PRIVATE } from "./config.js";
|
|
12
12
|
import { getAssistantRuntime } from "./runtime.js";
|
|
13
13
|
import { getSocket, bufferMessage, hasEntry, getBotClientId } from "./socket-registry.js";
|
|
14
|
+
import { formatCosUrls } from "./format-urls.js";
|
|
14
15
|
/** 获取日志器 */
|
|
15
16
|
function getLogger() {
|
|
16
17
|
return getAssistantRuntime().logging.getChildLogger({ module: "outbound" });
|
|
@@ -24,12 +25,13 @@ function generateOutboundMsgId() {
|
|
|
24
25
|
return `ob-${ts}-${rand}-${seq}`;
|
|
25
26
|
}
|
|
26
27
|
/**
|
|
27
|
-
* 解析目标用户 ID
|
|
28
|
+
* 解析目标用户 ID:去掉各种前缀,提取纯 ID
|
|
29
|
+
* 支持格式: user:xxx, channel:xxx, lightclawbot:dm:xxx, lightclawbot:group:xxx, dm:xxx, 纯ID
|
|
28
30
|
*/
|
|
29
31
|
function resolveTarget(to) {
|
|
30
32
|
return to
|
|
31
33
|
.replace(new RegExp(`^${CHANNEL_KEY}:`, "i"), "")
|
|
32
|
-
.replace(/^(dm|group):/, "");
|
|
34
|
+
.replace(/^(user|channel|dm|group):/, "");
|
|
33
35
|
}
|
|
34
36
|
/**
|
|
35
37
|
* 通过 WS 发送消息。
|
|
@@ -47,7 +49,7 @@ function sendViaSocket(accountId, target, text, replyToId) {
|
|
|
47
49
|
msgId,
|
|
48
50
|
from: entry?.botClientId ?? getBotClientId(resolvedAccountId) ?? "",
|
|
49
51
|
to: target,
|
|
50
|
-
content: text,
|
|
52
|
+
content: formatCosUrls(text),
|
|
51
53
|
timestamp: Date.now(),
|
|
52
54
|
replyToMsgId: replyToId ?? undefined,
|
|
53
55
|
};
|
package/dist/src/outbound.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbound.js","sourceRoot":"","sources":["../../src/outbound.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"outbound.js","sourceRoot":"","sources":["../../src/outbound.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-handlers.d.ts","sourceRoot":"","sources":["../../src/socket-handlers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAC;AAcpF,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;IAC5B,cAAc,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C,mCAAmC;IACnC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"socket-handlers.d.ts","sourceRoot":"","sources":["../../src/socket-handlers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAC;AAcpF,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;IAC5B,cAAc,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C,mCAAmC;IACnC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,IAAI,CA4HhF"}
|
|
@@ -15,6 +15,7 @@ export function bindSocketHandlers(socket, deps) {
|
|
|
15
15
|
const { account, botClientId, log, enqueueMessage, onEvent } = deps;
|
|
16
16
|
// ---- 接收用户消息 ----
|
|
17
17
|
socket.on(EVENT_MESSAGE_PRIVATE, (data) => {
|
|
18
|
+
log?.info(`[${CHANNEL_KEY}] Received private message: ${JSON.stringify(data)},botClientId:${botClientId}`);
|
|
18
19
|
// 回环防御:过滤自身发出的消息
|
|
19
20
|
if (data.from === botClientId)
|
|
20
21
|
return;
|