lightclawbot 1.0.7 → 1.0.8
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 +47 -213
- package/dist/src/config.d.ts +5 -5
- package/dist/src/config.d.ts.map +1 -1
- package/dist/src/config.js +5 -5
- package/dist/src/config.js.map +1 -1
- package/dist/src/download-tool.d.ts +1 -1
- package/dist/src/download-tool.js +9 -9
- package/dist/src/download-tool.js.map +1 -1
- package/dist/src/file-storage.d.ts +9 -9
- package/dist/src/file-storage.d.ts.map +1 -1
- package/dist/src/file-storage.js +10 -10
- package/dist/src/file-storage.js.map +1 -1
- package/dist/src/format-urls.d.ts +5 -5
- package/dist/src/format-urls.js +8 -8
- package/dist/src/format-urls.js.map +1 -1
- package/dist/src/gateway.js +3 -3
- package/dist/src/gateway.js.map +1 -1
- package/dist/src/inbound.d.ts.map +1 -1
- package/dist/src/inbound.js +17 -18
- package/dist/src/inbound.js.map +1 -1
- package/dist/src/socket/handlers.d.ts +26 -0
- package/dist/src/socket/handlers.d.ts.map +1 -0
- package/dist/src/socket/handlers.js +130 -0
- package/dist/src/socket/handlers.js.map +1 -0
- package/dist/src/socket/index.d.ts +11 -0
- package/dist/src/socket/index.d.ts.map +1 -0
- package/dist/src/socket/index.js +9 -0
- package/dist/src/socket/index.js.map +1 -0
- package/dist/src/socket/registry.d.ts +59 -0
- package/dist/src/socket/registry.d.ts.map +1 -0
- package/dist/src/socket/registry.js +125 -0
- package/dist/src/socket/registry.js.map +1 -0
- package/dist/src/socket/reliable-emitter.d.ts +79 -0
- package/dist/src/socket/reliable-emitter.d.ts.map +1 -0
- package/dist/src/socket/reliable-emitter.js +213 -0
- package/dist/src/socket/reliable-emitter.js.map +1 -0
- package/dist/src/types.d.ts +2 -2
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/upload-tool.d.ts +1 -1
- package/dist/src/upload-tool.js +3 -3
- package/dist/src/upload-tool.js.map +1 -1
- package/package.json +1 -1
- package/skills/lightclaw-media/SKILL.md +22 -102
- package/dist/public/data/scripts/manifest.json +0 -11
- package/dist/public/data/scripts/upgrade.211d7e4c.sh +0 -266
- package/dist/public/data/scripts/upgrade.sh +0 -266
- package/dist/src/session-history.d.ts +0 -88
- package/dist/src/session-history.d.ts.map +0 -1
- package/dist/src/session-history.js +0 -598
- package/dist/src/session-history.js.map +0 -1
- package/dist/src/streaming/delta-tracker.d.ts +0 -34
- package/dist/src/streaming/delta-tracker.d.ts.map +0 -1
- package/dist/src/streaming/delta-tracker.js +0 -145
- package/dist/src/streaming/delta-tracker.js.map +0 -1
- package/dist/src/streaming/index.d.ts +0 -12
- package/dist/src/streaming/index.d.ts.map +0 -1
- package/dist/src/streaming/index.js +0 -13
- package/dist/src/streaming/index.js.map +0 -1
- package/dist/src/streaming/stream-reply-sink.d.ts +0 -59
- package/dist/src/streaming/stream-reply-sink.d.ts.map +0 -1
- package/dist/src/streaming/stream-reply-sink.js +0 -293
- package/dist/src/streaming/stream-reply-sink.js.map +0 -1
- package/dist/src/streaming/types.d.ts +0 -45
- package/dist/src/streaming/types.d.ts.map +0 -1
- package/dist/src/streaming/types.js +0 -7
- package/dist/src/streaming/types.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/socket/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAM7D,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB;IAClB,eAAe,EAAE,kBAAkB,EAAE,CAAC;IACtC,6BAA6B;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AASD,iCAAiC;AACjC,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,eAAe,GAChC,IAAI,CAUN;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAExD;AAMD,qCAAqC;AACrC,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,aAAa,CAAC,GAAG,SAAS,CAIpG;AAED,8CAA8C;AAC9C,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,6CAA6C;AAC7C,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEpE;AAED,cAAc;AACd,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAEjF;AAMD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAUrF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,GAAG,CAAC,EAAE;IAAE,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,GACjE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAqClC;AAED,uBAAuB;AACvB,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEzD"}
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* LightClaw — Socket 注册表
|
|
3
|
+
*
|
|
4
|
+
* 让 gateway 启动时注册 socket 实例,
|
|
5
|
+
* outbound 在需要发送消息时可以通过 WS 连接直接发送,
|
|
6
|
+
* 无需走 REST API。
|
|
7
|
+
*
|
|
8
|
+
* 断线缓冲:
|
|
9
|
+
* 当 socket 暂时断开(Socket.IO 自动重连中)时,outbound 消息
|
|
10
|
+
* 会被缓冲在 pendingMessages 队列中,重连后自动 flush 发送。
|
|
11
|
+
* 仅在 gateway 彻底销毁(cleanup)时才删除 entry。
|
|
12
|
+
*/
|
|
13
|
+
import { MAX_PENDING_MESSAGES, EVENT_MESSAGE_PRIVATE } from "../config.js";
|
|
14
|
+
/** accountId → SocketEntry */
|
|
15
|
+
const registry = new Map();
|
|
16
|
+
// ============================================================
|
|
17
|
+
// 注册 / 注销
|
|
18
|
+
// ============================================================
|
|
19
|
+
/** 注册 socket(gateway 首次连接时调用) */
|
|
20
|
+
export function registerSocket(accountId, socket, botClientId, reliableEmitter) {
|
|
21
|
+
const existing = registry.get(accountId);
|
|
22
|
+
if (existing) {
|
|
23
|
+
// 重连场景:更新 socket 引用,保留 pending 队列
|
|
24
|
+
existing.socket = socket;
|
|
25
|
+
existing.botClientId = botClientId;
|
|
26
|
+
existing.reliableEmitter = reliableEmitter;
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
registry.set(accountId, { socket, botClientId, pendingMessages: [], reliableEmitter });
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* 注销 socket(gateway 彻底销毁时调用)。
|
|
34
|
+
* 注意:普通断线重连不应调用此函数,只在 cleanup 时调用。
|
|
35
|
+
*/
|
|
36
|
+
export function unregisterSocket(accountId) {
|
|
37
|
+
registry.delete(accountId);
|
|
38
|
+
}
|
|
39
|
+
// ============================================================
|
|
40
|
+
// 查询
|
|
41
|
+
// ============================================================
|
|
42
|
+
/** 获取可用的 socket(仅在 connected 时返回) */
|
|
43
|
+
export function getSocket(accountId) {
|
|
44
|
+
const entry = registry.get(accountId);
|
|
45
|
+
if (entry && entry.socket.connected)
|
|
46
|
+
return entry;
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
/** 检查 account 是否有注册的 entry(不管是否 connected) */
|
|
50
|
+
export function hasEntry(accountId) {
|
|
51
|
+
return registry.has(accountId);
|
|
52
|
+
}
|
|
53
|
+
/** 获取 botClientId(不管 socket 是否 connected) */
|
|
54
|
+
export function getBotClientId(accountId) {
|
|
55
|
+
return registry.get(accountId)?.botClientId;
|
|
56
|
+
}
|
|
57
|
+
/** 获取可靠发送器 */
|
|
58
|
+
export function getReliableEmitter(accountId) {
|
|
59
|
+
return registry.get(accountId)?.reliableEmitter;
|
|
60
|
+
}
|
|
61
|
+
// ============================================================
|
|
62
|
+
// 断线缓冲
|
|
63
|
+
// ============================================================
|
|
64
|
+
/**
|
|
65
|
+
* 缓冲一条消息(socket 断开期间由 outbound 调用)。
|
|
66
|
+
* 返回 true 表示成功缓冲,false 表示该 account 没有注册的 entry。
|
|
67
|
+
*/
|
|
68
|
+
export function bufferMessage(accountId, message) {
|
|
69
|
+
const entry = registry.get(accountId);
|
|
70
|
+
if (!entry)
|
|
71
|
+
return false;
|
|
72
|
+
if (entry.pendingMessages.length >= MAX_PENDING_MESSAGES) {
|
|
73
|
+
// 队列满了,丢弃最早的消息
|
|
74
|
+
entry.pendingMessages.shift();
|
|
75
|
+
}
|
|
76
|
+
entry.pendingMessages.push(message);
|
|
77
|
+
return true;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* flush 所有缓冲消息(重连成功后由 gateway 调用)。
|
|
81
|
+
* 如果有 ReliableEmitter,走可靠发送;否则 fallback 直接 emit。
|
|
82
|
+
* 返回发送成功 / 失败的计数。
|
|
83
|
+
*/
|
|
84
|
+
export function flushPendingMessages(accountId, log) {
|
|
85
|
+
const entry = registry.get(accountId);
|
|
86
|
+
if (!entry)
|
|
87
|
+
return { sent: 0, failed: 0 };
|
|
88
|
+
const pending = entry.pendingMessages.splice(0); // 取出全部并清空
|
|
89
|
+
if (pending.length === 0)
|
|
90
|
+
return { sent: 0, failed: 0 };
|
|
91
|
+
let sent = 0;
|
|
92
|
+
let failed = 0;
|
|
93
|
+
for (const msg of pending) {
|
|
94
|
+
if (!entry.socket.connected) {
|
|
95
|
+
// socket 又断了,把剩余消息放回去
|
|
96
|
+
entry.pendingMessages.unshift(...pending.slice(sent + failed));
|
|
97
|
+
break;
|
|
98
|
+
}
|
|
99
|
+
if (entry.reliableEmitter) {
|
|
100
|
+
// 通过可靠发送器发送
|
|
101
|
+
entry.reliableEmitter.emitWithAck(EVENT_MESSAGE_PRIVATE, msg, msg.msgId);
|
|
102
|
+
sent++;
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
// fallback: 直接 emit(不应该走到这里)
|
|
106
|
+
try {
|
|
107
|
+
entry.socket.emit(EVENT_MESSAGE_PRIVATE, msg);
|
|
108
|
+
sent++;
|
|
109
|
+
}
|
|
110
|
+
catch {
|
|
111
|
+
failed++;
|
|
112
|
+
log?.warn(`[socket-registry] Failed to flush buffered message: msgId=${msg.msgId}`);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
if (sent > 0 || failed > 0) {
|
|
117
|
+
log?.info(`[socket-registry] Flushed pending messages: sent=${sent}, failed=${failed}`);
|
|
118
|
+
}
|
|
119
|
+
return { sent, failed };
|
|
120
|
+
}
|
|
121
|
+
/** 获取缓冲队列长度(调试/监控用) */
|
|
122
|
+
export function getPendingCount(accountId) {
|
|
123
|
+
return registry.get(accountId)?.pendingMessages.length ?? 0;
|
|
124
|
+
}
|
|
125
|
+
//# sourceMappingURL=registry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/socket/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* LightClaw — 可靠发送器
|
|
3
|
+
*
|
|
4
|
+
* 所有出站 socket.emit 都通过此模块,利用 Socket.IO 原生 ACK + timeout 机制:
|
|
5
|
+
* socket.timeout(ms).emit(event, data, (err, ...args) => { ... })
|
|
6
|
+
* 超时由 Socket.IO 原生处理,回调第一个参数为 Error(超时)或 null(成功)。
|
|
7
|
+
*
|
|
8
|
+
* 未收到 ACK 则指数退避重试,断线期间暂停重试、重连后立即重发。
|
|
9
|
+
*/
|
|
10
|
+
import type { Socket } from "socket.io-client";
|
|
11
|
+
export interface EmitterStats {
|
|
12
|
+
totalEmitted: number;
|
|
13
|
+
totalConfirmed: number;
|
|
14
|
+
totalRetries: number;
|
|
15
|
+
totalFailed: number;
|
|
16
|
+
currentPending: number;
|
|
17
|
+
}
|
|
18
|
+
type LogFn = {
|
|
19
|
+
info: (msg: string) => void;
|
|
20
|
+
warn: (msg: string) => void;
|
|
21
|
+
error: (msg: string) => void;
|
|
22
|
+
};
|
|
23
|
+
export declare class ReliableEmitter {
|
|
24
|
+
private getSocket;
|
|
25
|
+
private log?;
|
|
26
|
+
private pending;
|
|
27
|
+
private paused;
|
|
28
|
+
private idCounter;
|
|
29
|
+
private stats;
|
|
30
|
+
constructor(getSocket: () => Socket | null, log?: LogFn | undefined);
|
|
31
|
+
/**
|
|
32
|
+
* 可靠发送 — 带 ACK 确认 + 自动重试。
|
|
33
|
+
*
|
|
34
|
+
* 每次调用都是独立的发送请求,不会因相同 msgId 被合并。
|
|
35
|
+
* msgId 仅用于日志追踪,内部使用自增 emitId 作为 pending key。
|
|
36
|
+
*
|
|
37
|
+
* @param event Socket.IO 事件名
|
|
38
|
+
* @param data 消息体
|
|
39
|
+
* @param msgId 业务层消息 ID(仅用于日志追踪,可选)
|
|
40
|
+
* @returns true = server 已确认, false = 重试耗尽未确认
|
|
41
|
+
*/
|
|
42
|
+
emitWithAck(event: string, data: unknown, msgId?: string): Promise<boolean>;
|
|
43
|
+
/**
|
|
44
|
+
* 断线时调用 — 暂停所有重试计时器
|
|
45
|
+
*/
|
|
46
|
+
pause(): void;
|
|
47
|
+
/**
|
|
48
|
+
* 重连时调用 — 立即重发所有待确认消息
|
|
49
|
+
*/
|
|
50
|
+
resume(): void;
|
|
51
|
+
/**
|
|
52
|
+
* 销毁 — 清除所有定时器,resolve 所有 pending 为 false
|
|
53
|
+
*/
|
|
54
|
+
destroy(): void;
|
|
55
|
+
/** 当前待确认消息数 */
|
|
56
|
+
get pendingCount(): number;
|
|
57
|
+
/** 获取统计信息 */
|
|
58
|
+
getStats(): EmitterStats;
|
|
59
|
+
/**
|
|
60
|
+
* 通过 socket.timeout(ms).emit(event, data, callback) 发送消息。
|
|
61
|
+
*
|
|
62
|
+
* - 超时由 Socket.IO 原生 .timeout() 处理,无需手动 setTimeout
|
|
63
|
+
* - 回调签名为 (err: Error | null, ...args),err 非空说明超时或出错
|
|
64
|
+
* - socket.emit 是异步的,不会抛同步异常,无需 try-catch
|
|
65
|
+
*/
|
|
66
|
+
private doEmit;
|
|
67
|
+
private confirm;
|
|
68
|
+
private scheduleRetry;
|
|
69
|
+
/**
|
|
70
|
+
* 指数退避 + 随机抖动
|
|
71
|
+
* delay = min(base * 2^(retryCount-1) + jitter, maxDelay)
|
|
72
|
+
*/
|
|
73
|
+
private getRetryDelay;
|
|
74
|
+
/** 队列满时淘汰最早的 pending 消息 */
|
|
75
|
+
private evictIfNeeded;
|
|
76
|
+
private generateEmitId;
|
|
77
|
+
}
|
|
78
|
+
export {};
|
|
79
|
+
//# sourceMappingURL=reliable-emitter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reliable-emitter.d.ts","sourceRoot":"","sources":["../../../src/socket/reliable-emitter.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAwB/C,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5B,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5B,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B,CAAC;AAMF,qBAAa,eAAe;IAcxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG,CAAC;IAdd,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAK;IAGtB,OAAO,CAAC,KAAK,CAKX;gBAGQ,SAAS,EAAE,MAAM,MAAM,GAAG,IAAI,EAC9B,GAAG,CAAC,EAAE,KAAK,YAAA;IAOrB;;;;;;;;;;OAUG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+B3E;;OAEG;IACH,KAAK,IAAI,IAAI;IAYb;;OAEG;IACH,MAAM,IAAI,IAAI;IASd;;OAEG;IACH,OAAO,IAAI,IAAI;IASf,eAAe;IACf,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,aAAa;IACb,QAAQ,IAAI,YAAY;IAQxB;;;;;;OAMG;IACH,OAAO,CAAC,MAAM;IAuBd,OAAO,CAAC,OAAO;IAaf,OAAO,CAAC,aAAa;IA4BrB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAMrB,2BAA2B;IAC3B,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,cAAc;CAGvB"}
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* LightClaw — 可靠发送器
|
|
3
|
+
*
|
|
4
|
+
* 所有出站 socket.emit 都通过此模块,利用 Socket.IO 原生 ACK + timeout 机制:
|
|
5
|
+
* socket.timeout(ms).emit(event, data, (err, ...args) => { ... })
|
|
6
|
+
* 超时由 Socket.IO 原生处理,回调第一个参数为 Error(超时)或 null(成功)。
|
|
7
|
+
*
|
|
8
|
+
* 未收到 ACK 则指数退避重试,断线期间暂停重试、重连后立即重发。
|
|
9
|
+
*/
|
|
10
|
+
import { EMIT_ACK_TIMEOUT, EMIT_MAX_RETRIES, EMIT_RETRY_BASE_DELAY, EMIT_RETRY_MAX_DELAY, EMIT_PENDING_MAX, } from "../config.js";
|
|
11
|
+
// ============================================================
|
|
12
|
+
// ReliableEmitter
|
|
13
|
+
// ============================================================
|
|
14
|
+
export class ReliableEmitter {
|
|
15
|
+
getSocket;
|
|
16
|
+
log;
|
|
17
|
+
pending = new Map();
|
|
18
|
+
paused = false;
|
|
19
|
+
idCounter = 0;
|
|
20
|
+
// 统计
|
|
21
|
+
stats = {
|
|
22
|
+
totalEmitted: 0,
|
|
23
|
+
totalConfirmed: 0,
|
|
24
|
+
totalRetries: 0,
|
|
25
|
+
totalFailed: 0,
|
|
26
|
+
};
|
|
27
|
+
constructor(getSocket, log) {
|
|
28
|
+
this.getSocket = getSocket;
|
|
29
|
+
this.log = log;
|
|
30
|
+
}
|
|
31
|
+
// ----------------------------------------------------------
|
|
32
|
+
// 公开 API
|
|
33
|
+
// ----------------------------------------------------------
|
|
34
|
+
/**
|
|
35
|
+
* 可靠发送 — 带 ACK 确认 + 自动重试。
|
|
36
|
+
*
|
|
37
|
+
* 每次调用都是独立的发送请求,不会因相同 msgId 被合并。
|
|
38
|
+
* msgId 仅用于日志追踪,内部使用自增 emitId 作为 pending key。
|
|
39
|
+
*
|
|
40
|
+
* @param event Socket.IO 事件名
|
|
41
|
+
* @param data 消息体
|
|
42
|
+
* @param msgId 业务层消息 ID(仅用于日志追踪,可选)
|
|
43
|
+
* @returns true = server 已确认, false = 重试耗尽未确认
|
|
44
|
+
*/
|
|
45
|
+
emitWithAck(event, data, msgId) {
|
|
46
|
+
// 每次调用生成唯一的内部 ID,确保同一 msgId 的多次 emit 不会互相覆盖
|
|
47
|
+
const emitId = this.generateEmitId();
|
|
48
|
+
this.stats.totalEmitted++;
|
|
49
|
+
// 队列满时淘汰最早的
|
|
50
|
+
this.evictIfNeeded();
|
|
51
|
+
return new Promise((resolve) => {
|
|
52
|
+
const entry = {
|
|
53
|
+
id: emitId,
|
|
54
|
+
msgId,
|
|
55
|
+
event,
|
|
56
|
+
data,
|
|
57
|
+
retryCount: 0,
|
|
58
|
+
createdAt: Date.now(),
|
|
59
|
+
retryTimer: null,
|
|
60
|
+
resolve,
|
|
61
|
+
};
|
|
62
|
+
this.pending.set(emitId, entry);
|
|
63
|
+
if (this.paused) {
|
|
64
|
+
// 断线中,先挂着,resume 时统一重发
|
|
65
|
+
this.log?.info(`[ReliableEmitter] Queued while paused: emitId=${emitId}, msgId=${msgId}`);
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
this.doEmit(entry);
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* 断线时调用 — 暂停所有重试计时器
|
|
73
|
+
*/
|
|
74
|
+
pause() {
|
|
75
|
+
if (this.paused)
|
|
76
|
+
return;
|
|
77
|
+
this.paused = true;
|
|
78
|
+
for (const entry of this.pending.values()) {
|
|
79
|
+
if (entry.retryTimer) {
|
|
80
|
+
clearTimeout(entry.retryTimer);
|
|
81
|
+
entry.retryTimer = null;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
this.log?.info(`[ReliableEmitter] Paused, ${this.pending.size} message(s) pending`);
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* 重连时调用 — 立即重发所有待确认消息
|
|
88
|
+
*/
|
|
89
|
+
resume() {
|
|
90
|
+
if (!this.paused)
|
|
91
|
+
return;
|
|
92
|
+
this.paused = false;
|
|
93
|
+
this.log?.info(`[ReliableEmitter] Resumed, re-emitting ${this.pending.size} pending message(s)`);
|
|
94
|
+
for (const entry of this.pending.values()) {
|
|
95
|
+
this.doEmit(entry);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* 销毁 — 清除所有定时器,resolve 所有 pending 为 false
|
|
100
|
+
*/
|
|
101
|
+
destroy() {
|
|
102
|
+
for (const entry of this.pending.values()) {
|
|
103
|
+
if (entry.retryTimer)
|
|
104
|
+
clearTimeout(entry.retryTimer);
|
|
105
|
+
entry.resolve(false);
|
|
106
|
+
}
|
|
107
|
+
this.pending.clear();
|
|
108
|
+
this.log?.info(`[ReliableEmitter] Destroyed`);
|
|
109
|
+
}
|
|
110
|
+
/** 当前待确认消息数 */
|
|
111
|
+
get pendingCount() {
|
|
112
|
+
return this.pending.size;
|
|
113
|
+
}
|
|
114
|
+
/** 获取统计信息 */
|
|
115
|
+
getStats() {
|
|
116
|
+
return { ...this.stats, currentPending: this.pending.size };
|
|
117
|
+
}
|
|
118
|
+
// ----------------------------------------------------------
|
|
119
|
+
// 内部方法
|
|
120
|
+
// ----------------------------------------------------------
|
|
121
|
+
/**
|
|
122
|
+
* 通过 socket.timeout(ms).emit(event, data, callback) 发送消息。
|
|
123
|
+
*
|
|
124
|
+
* - 超时由 Socket.IO 原生 .timeout() 处理,无需手动 setTimeout
|
|
125
|
+
* - 回调签名为 (err: Error | null, ...args),err 非空说明超时或出错
|
|
126
|
+
* - socket.emit 是异步的,不会抛同步异常,无需 try-catch
|
|
127
|
+
*/
|
|
128
|
+
doEmit(entry) {
|
|
129
|
+
const socket = this.getSocket();
|
|
130
|
+
if (!socket?.connected) {
|
|
131
|
+
// socket 不可用,等 resume 时重发(不计重试次数)
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
socket.timeout(EMIT_ACK_TIMEOUT).emit(entry.event, entry.data, (err) => {
|
|
135
|
+
// 已被 destroy 或 confirm
|
|
136
|
+
if (!this.pending.has(entry.id))
|
|
137
|
+
return;
|
|
138
|
+
if (err) {
|
|
139
|
+
// 超时或服务端回传了错误
|
|
140
|
+
this.log?.warn(`[ReliableEmitter] ACK error: emitId=${entry.id}, msgId=${entry.msgId}, err=${err.message}, retryCount=${entry.retryCount}`);
|
|
141
|
+
this.scheduleRetry(entry);
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
this.log?.info(`[ReliableEmitter] ACK success: emitId=${entry.id}, msgId=${entry.msgId}, retryCount=${entry.retryCount}`);
|
|
145
|
+
// 服务端已确认
|
|
146
|
+
this.confirm(entry.id);
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
confirm(id) {
|
|
151
|
+
const entry = this.pending.get(id);
|
|
152
|
+
if (!entry)
|
|
153
|
+
return; // 已被 confirm 或 destroy
|
|
154
|
+
if (entry.retryTimer) {
|
|
155
|
+
clearTimeout(entry.retryTimer);
|
|
156
|
+
entry.retryTimer = null;
|
|
157
|
+
}
|
|
158
|
+
this.pending.delete(id);
|
|
159
|
+
this.stats.totalConfirmed++;
|
|
160
|
+
entry.resolve(true);
|
|
161
|
+
}
|
|
162
|
+
scheduleRetry(entry) {
|
|
163
|
+
// 断线中不重试
|
|
164
|
+
if (this.paused)
|
|
165
|
+
return;
|
|
166
|
+
if (entry.retryCount >= EMIT_MAX_RETRIES) {
|
|
167
|
+
// 重试耗尽
|
|
168
|
+
this.pending.delete(entry.id);
|
|
169
|
+
this.stats.totalFailed++;
|
|
170
|
+
this.log?.error(`[ReliableEmitter] Gave up after ${entry.retryCount} retries: emitId=${entry.id}, msgId=${entry.msgId}, ` +
|
|
171
|
+
`elapsed=${Date.now() - entry.createdAt}ms`);
|
|
172
|
+
entry.resolve(false);
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
entry.retryCount++;
|
|
176
|
+
this.stats.totalRetries++;
|
|
177
|
+
const delay = this.getRetryDelay(entry.retryCount);
|
|
178
|
+
this.log?.info(`[ReliableEmitter] Retry #${entry.retryCount} in ${delay}ms: emitId=${entry.id}, msgId=${entry.msgId}`);
|
|
179
|
+
entry.retryTimer = setTimeout(() => {
|
|
180
|
+
entry.retryTimer = null;
|
|
181
|
+
if (this.paused)
|
|
182
|
+
return; // 重试期间断线了
|
|
183
|
+
this.doEmit(entry);
|
|
184
|
+
}, delay);
|
|
185
|
+
}
|
|
186
|
+
/**
|
|
187
|
+
* 指数退避 + 随机抖动
|
|
188
|
+
* delay = min(base * 2^(retryCount-1) + jitter, maxDelay)
|
|
189
|
+
*/
|
|
190
|
+
getRetryDelay(retryCount) {
|
|
191
|
+
const base = EMIT_RETRY_BASE_DELAY * Math.pow(2, retryCount - 1);
|
|
192
|
+
const jitter = Math.random() * 1000;
|
|
193
|
+
return Math.min(base + jitter, EMIT_RETRY_MAX_DELAY);
|
|
194
|
+
}
|
|
195
|
+
/** 队列满时淘汰最早的 pending 消息 */
|
|
196
|
+
evictIfNeeded() {
|
|
197
|
+
while (this.pending.size >= EMIT_PENDING_MAX) {
|
|
198
|
+
const oldest = this.pending.values().next().value;
|
|
199
|
+
if (!oldest)
|
|
200
|
+
break;
|
|
201
|
+
if (oldest.retryTimer)
|
|
202
|
+
clearTimeout(oldest.retryTimer);
|
|
203
|
+
this.pending.delete(oldest.id);
|
|
204
|
+
this.stats.totalFailed++;
|
|
205
|
+
this.log?.warn(`[ReliableEmitter] Evicted oldest pending: emitId=${oldest.id}, msgId=${oldest.msgId}`);
|
|
206
|
+
oldest.resolve(false);
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
generateEmitId() {
|
|
210
|
+
return `_re_${Date.now().toString(36)}_${(this.idCounter++).toString(36)}`;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
//# sourceMappingURL=reliable-emitter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reliable-emitter.js","sourceRoot":"","sources":["../../../src/socket/reliable-emitter.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export interface FileAttachment {
|
|
|
14
14
|
mimeType: string;
|
|
15
15
|
/** base64 data URL(如 "data:text/plain;base64,...") */
|
|
16
16
|
bytes?: string;
|
|
17
|
-
/** 远程文件 URI
|
|
17
|
+
/** 远程文件 URI(如云端下载地址),与 bytes 二选一 */
|
|
18
18
|
uri?: string;
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
@@ -63,7 +63,7 @@ export interface AssistantAccountConfig {
|
|
|
63
63
|
/** 解析后的完整账户(含默认值和环境变量 fallback) */
|
|
64
64
|
export interface ResolvedAssistantAccount {
|
|
65
65
|
accountId: string;
|
|
66
|
-
/** 主 apiKey(获取 botId
|
|
66
|
+
/** 主 apiKey(获取 botId、默认文件操作等) */
|
|
67
67
|
apiKey: string;
|
|
68
68
|
/** 所有 apiKey(含主 key),用于 WS 多 key 认证 */
|
|
69
69
|
allApiKeys: string[];
|
package/dist/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,8BAA8B;AAC9B,MAAM,WAAW,cAAc;IAC7B,UAAU;IACV,IAAI,EAAE,MAAM,CAAC;IACb,cAAc;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/src/upload-tool.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* LightClaw — 文件上传工具
|
|
3
3
|
*
|
|
4
|
-
* 注册为 OpenClaw Agent Tool,允许 AI
|
|
4
|
+
* 注册为 OpenClaw Agent Tool,允许 AI 将本地文件上传到云端存储,
|
|
5
5
|
* 获得公网可访问的 URL,方便用户直接下载。
|
|
6
6
|
*
|
|
7
7
|
* 工具名: lightclaw_upload_file
|
|
@@ -39,7 +39,7 @@ export function registerUploadTool(api) {
|
|
|
39
39
|
const sessionKey = ctx.sessionKey;
|
|
40
40
|
return {
|
|
41
41
|
name: UPLOAD_TOOL_NAME,
|
|
42
|
-
description: "Upload local files to
|
|
42
|
+
description: "Upload local files to cloud storage and return publicly accessible download URLs. " +
|
|
43
43
|
"Use this tool whenever you have generated or produced files (reports, images, documents, etc.) " +
|
|
44
44
|
"that the user needs to download. This is the primary way to deliver file outputs to users. " +
|
|
45
45
|
"Supports up to 5 files at once. Returns a public download URL for each uploaded file.",
|
|
@@ -47,7 +47,7 @@ export function registerUploadTool(api) {
|
|
|
47
47
|
async execute(_toolCallId, params) {
|
|
48
48
|
// 每次 execute 时动态解析 apiKey(多 key 模式下通过 sessionKey 直接获取)
|
|
49
49
|
const apiKey = resolveEffectiveApiKey({ sessionKey });
|
|
50
|
-
log.warn(`[lightclaw_upload_file] resolved apiKey="${apiKey?.slice(0, 8)}..."`);
|
|
50
|
+
// log.warn(`[lightclaw_upload_file] resolved apiKey="${apiKey?.slice(0, 8)}..."`);
|
|
51
51
|
const { paths } = params;
|
|
52
52
|
// 参数校验
|
|
53
53
|
if (!Array.isArray(paths) || paths.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-tool.js","sourceRoot":"","sources":["../../src/upload-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,+DAA+D;AAC/D,8BAA8B;AAC9B,+DAA+D;AAE/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AAExD,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,QAAiB;IACvB,UAAU,EAAE;QACV,KAAK,EAAE;YACL,IAAI,EAAE,OAAgB;YACtB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAiB,EAAE;YAClC,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,8BAA8B;SAC5C;KACF;IACD,QAAQ,EAAE,CAAC,OAAO,CAAU;CAC7B,CAAC;AAEF,+DAA+D;AAC/D,iBAAiB;AACjB,+DAA+D;AAE/D,MAAM,UAAU,kBAAkB,CAAC,GAAsB;IACvD,qCAAqC;IACrC,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;IAEvB,GAAG,CAAC,YAAY,CACd,CAAC,GAAG,EAAE,EAAE;QACN,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC;QAC5C,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QAClC,OAAO;YACL,IAAI,EAAE,gBAAgB;YACtB,WAAW,EACT,
|
|
1
|
+
{"version":3,"file":"upload-tool.js","sourceRoot":"","sources":["../../src/upload-tool.ts"],"names":[],"mappings":"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"}
|