@michengai/dsh-im-connect 0.1.20 → 0.1.21
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.en.md +2 -2
- package/README.md +2 -2
- package/SECURITY.md +1 -1
- package/lib/channels/dingtalk-card.d.ts.map +1 -1
- package/lib/channels/dingtalk-card.js +3 -0
- package/lib/channels/dingtalk-card.js.map +1 -1
- package/lib/channels/dingtalk.d.ts.map +1 -1
- package/lib/channels/dingtalk.js +6 -1
- package/lib/channels/dingtalk.js.map +1 -1
- package/lib/channels/feishu.d.ts +9 -0
- package/lib/channels/feishu.d.ts.map +1 -1
- package/lib/channels/feishu.js +23 -6
- package/lib/channels/feishu.js.map +1 -1
- package/lib/channels/qq.d.ts.map +1 -1
- package/lib/channels/qq.js +17 -1
- package/lib/channels/qq.js.map +1 -1
- package/lib/channels/telegram.d.ts.map +1 -1
- package/lib/channels/telegram.js +17 -4
- package/lib/channels/telegram.js.map +1 -1
- package/lib/channels/wecom.d.ts +7 -1
- package/lib/channels/wecom.d.ts.map +1 -1
- package/lib/channels/wecom.js +44 -11
- package/lib/channels/wecom.js.map +1 -1
- package/lib/channels/weixin.d.ts +3 -0
- package/lib/channels/weixin.d.ts.map +1 -1
- package/lib/channels/weixin.js +68 -15
- package/lib/channels/weixin.js.map +1 -1
- package/lib/engine/abort.d.ts +4 -0
- package/lib/engine/abort.d.ts.map +1 -0
- package/lib/engine/abort.js +26 -0
- package/lib/engine/abort.js.map +1 -0
- package/lib/engine/atomic-file.d.ts +5 -0
- package/lib/engine/atomic-file.d.ts.map +1 -0
- package/lib/engine/atomic-file.js +46 -0
- package/lib/engine/atomic-file.js.map +1 -0
- package/lib/engine/json-state.d.ts.map +1 -1
- package/lib/engine/json-state.js +7 -5
- package/lib/engine/json-state.js.map +1 -1
- package/lib/engine/secure-file.d.ts.map +1 -1
- package/lib/engine/secure-file.js +2 -12
- package/lib/engine/secure-file.js.map +1 -1
- package/lib/engine/seen-store.d.ts.map +1 -1
- package/lib/engine/seen-store.js +4 -4
- package/lib/engine/seen-store.js.map +1 -1
- package/lib/engine/session-store.d.ts.map +1 -1
- package/lib/engine/session-store.js +7 -5
- package/lib/engine/session-store.js.map +1 -1
- package/lib/manager.d.ts.map +1 -1
- package/lib/manager.js +4 -9
- package/lib/manager.js.map +1 -1
- package/package.json +1 -1
- package/src/channels/dingtalk-card.ts +195 -192
- package/src/channels/dingtalk.ts +144 -140
- package/src/channels/feishu.ts +92 -66
- package/src/channels/qq.ts +303 -288
- package/src/channels/telegram.ts +170 -158
- package/src/channels/wecom.ts +209 -177
- package/src/channels/weixin.ts +158 -112
- package/src/engine/abort.ts +25 -0
- package/src/engine/access.ts +34 -34
- package/src/engine/atomic-file.ts +36 -0
- package/src/engine/json-state.ts +16 -15
- package/src/engine/secure-file.ts +7 -13
- package/src/engine/seen-store.ts +39 -39
- package/src/engine/session-store.ts +40 -39
- package/src/manager.ts +346 -350
package/README.en.md
CHANGED
|
@@ -36,8 +36,8 @@ Inbound messages are identified before commands, tool approvals, or injection.
|
|
|
36
36
|
|
|
37
37
|
| Case | Behavior |
|
|
38
38
|
|---|---|
|
|
39
|
-
| Group without
|
|
40
|
-
| Group
|
|
39
|
+
| Group without a mention of this bot | Ignored; mentioning someone else also does not trigger it |
|
|
40
|
+
| Group explicitly mentioning this bot | No binding. Anyone can send work |
|
|
41
41
|
| DM from the QR scanner | WeChat / Feishu / Lark scanners are allowlisted automatically |
|
|
42
42
|
| DM from anyone else | Appears on the settings pending list until approved |
|
|
43
43
|
| DM on credential-only channels | Telegram, and DingTalk / WeCom / QQ bound with secrets only, require approval for every DM |
|
package/README.md
CHANGED
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
|
|
37
37
|
| 场景 | 行为 |
|
|
38
38
|
|---|---|
|
|
39
|
-
| 群聊未 @ |
|
|
40
|
-
|
|
|
39
|
+
| 群聊未 @ 当前机器人 | 忽略,不回复、不进待批准;只 @ 其他成员也不触发 |
|
|
40
|
+
| 群聊已准确 @ 当前机器人 | 不用绑定,任何人都可以下任务 |
|
|
41
41
|
| 私聊 · 扫码用户 | 微信 / 飞书 / Lark 扫码者自动进白名单,可直接对话 |
|
|
42
42
|
| 私聊 · 其他人 | 进入设置页待批准;不批准就不能驱动助手 |
|
|
43
43
|
| 私聊 · 无扫码用户的渠道 | Telegram、以及只填凭据的钉钉 / 企微 / QQ,所有私聊都要先批准 |
|
package/SECURITY.md
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
2. **私聊未配置即拒绝**:私聊白名单为空,或消息没有 `userId`,不处理。
|
|
9
9
|
3. **群聊不用绑定**:群聊只需 @ 机器人;不进待批准、不查白名单。
|
|
10
10
|
4. **私聊只有扫码用户免批**:微信扫码用户和飞书 / Lark 扫码用户自动进入白名单;其他私聊用户必须在设置页批准。
|
|
11
|
-
5. **群聊仍需
|
|
11
|
+
5. **群聊仍需 @ 当前机器人**:未 @ 机器人、或只 @ 其他成员的群消息直接忽略,也不会写入待批准;准确 @ 机器人后默认放行。
|
|
12
12
|
6. **工具审批更严**:回复「批准 / 拒绝」只在私聊且发送者已在白名单时生效。群聊里的批准词不会授予 harness 权限。
|
|
13
13
|
7. **不恢复开放模式**:不再提供 `allowAllUsers` 或钉钉「配对 / 开放模式」。安全路径必须是默认路径。
|
|
14
14
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dingtalk-card.d.ts","sourceRoot":"","sources":["../../src/channels/dingtalk-card.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"dingtalk-card.d.ts","sourceRoot":"","sources":["../../src/channels/dingtalk-card.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAOrD,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE,CAAA;AAEjD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAanE;AAmCD,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG;IANtB,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,cAAc,CAAI;gBAGP,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,GAAG,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAsB;IAG1D,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBhE,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3D,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAenD,MAAM;YAYN,WAAW;YAeX,OAAO;CAYtB;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC1B,OAAO,CAAC,WAAW,CAAC,CA0CtB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { timeoutSignal } from '../engine/abort.js';
|
|
2
3
|
const API = 'https://api.dingtalk.com/';
|
|
3
4
|
const TEMPLATE_ID = '02fcf2f4-5e02-4a85-b672-46d1f715543e.schema';
|
|
4
5
|
const UPDATE_INTERVAL_MS = 500;
|
|
@@ -119,6 +120,7 @@ export class DingtalkCardClient {
|
|
|
119
120
|
method: 'POST',
|
|
120
121
|
headers: { 'content-type': 'application/json' },
|
|
121
122
|
body: JSON.stringify({ appKey: this.clientId, appSecret: this.clientSecret }),
|
|
123
|
+
signal: timeoutSignal(30_000),
|
|
122
124
|
});
|
|
123
125
|
const data = await res.json();
|
|
124
126
|
if (!data.accessToken)
|
|
@@ -132,6 +134,7 @@ export class DingtalkCardClient {
|
|
|
132
134
|
method,
|
|
133
135
|
headers: { 'content-type': 'application/json', ...headers },
|
|
134
136
|
body: JSON.stringify(body),
|
|
137
|
+
signal: timeoutSignal(30_000),
|
|
135
138
|
});
|
|
136
139
|
if (!res.ok) {
|
|
137
140
|
const text = await res.text().catch(() => '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dingtalk-card.js","sourceRoot":"","sources":["../../src/channels/dingtalk-card.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"dingtalk-card.js","sourceRoot":"","sources":["../../src/channels/dingtalk-card.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dingtalk.d.ts","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"dingtalk.d.ts","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;AAIhF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAczG;AACD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,CAiHrH"}
|
package/lib/channels/dingtalk.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DingtalkCardClient, openDingtalkCardStream } from './dingtalk-card.js';
|
|
2
|
+
import { timeoutSignal } from '../engine/abort.js';
|
|
2
3
|
export function parseDingtalkRobotEvent(payload) {
|
|
3
4
|
const text = payload.text?.content?.trim() ?? '';
|
|
4
5
|
const sender = payload.senderStaffId ?? payload.senderId ?? '';
|
|
@@ -96,6 +97,7 @@ export function createDingtalkChannel(config, log) {
|
|
|
96
97
|
method: 'POST',
|
|
97
98
|
headers: { 'content-type': 'application/json' },
|
|
98
99
|
body: JSON.stringify({ msgtype: 'markdown', markdown: { title: 'IM助理', text } }),
|
|
100
|
+
signal: timeoutSignal(30_000),
|
|
99
101
|
});
|
|
100
102
|
if (!res.ok)
|
|
101
103
|
throw new Error(`dingtalk send HTTP ${res.status}`);
|
|
@@ -113,11 +115,14 @@ export function createDingtalkChannel(config, log) {
|
|
|
113
115
|
const webhook = webhooks.get(chatId);
|
|
114
116
|
if (!webhook)
|
|
115
117
|
throw new Error('dingtalk: 没有可回复的 webhook');
|
|
116
|
-
await fetch(webhook, {
|
|
118
|
+
const res = await fetch(webhook, {
|
|
117
119
|
method: 'POST',
|
|
118
120
|
headers: { 'content-type': 'application/json' },
|
|
119
121
|
body: JSON.stringify({ msgtype: 'markdown', markdown: { title: 'IM助理', text } }),
|
|
122
|
+
signal: timeoutSignal(30_000),
|
|
120
123
|
});
|
|
124
|
+
if (!res.ok)
|
|
125
|
+
throw new Error(`dingtalk send HTTP ${res.status}`);
|
|
121
126
|
};
|
|
122
127
|
return {
|
|
123
128
|
async update() { },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dingtalk.js","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAmB,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"dingtalk.js","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"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"}
|
package/lib/channels/feishu.d.ts
CHANGED
|
@@ -4,5 +4,14 @@ export interface FeishuConfig {
|
|
|
4
4
|
appSecret?: string;
|
|
5
5
|
domain?: 'feishu' | 'lark';
|
|
6
6
|
}
|
|
7
|
+
interface FeishuMention {
|
|
8
|
+
key?: string;
|
|
9
|
+
id?: {
|
|
10
|
+
open_id?: string;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
/** 群消息只有明确 mention 当前机器人本身才算 addressed;@ 其他成员不触发。 */
|
|
14
|
+
export declare function isFeishuBotMentioned(mentions: FeishuMention[] | undefined, botOpenId: string): boolean;
|
|
7
15
|
export declare function createFeishuChannel(id: 'feishu' | 'lark', config: FeishuConfig, log: (line: string) => void): ChannelAdapter | undefined;
|
|
16
|
+
export {};
|
|
8
17
|
//# sourceMappingURL=feishu.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feishu.d.ts","sourceRoot":"","sources":["../../src/channels/feishu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAa,MAAM,oBAAoB,CAAA;AAGnE,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAA;CAC3B;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"feishu.d.ts","sourceRoot":"","sources":["../../src/channels/feishu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAa,MAAM,oBAAoB,CAAA;AAGnE,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAA;CAC3B;AAED,UAAU,aAAa;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,EAAE,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC1B;AAED,qDAAqD;AACrD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAGtG;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,CAoFxI"}
|
package/lib/channels/feishu.js
CHANGED
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
import { quietSdkLogger } from '../engine/quiet-logger.js';
|
|
2
|
+
/** 群消息只有明确 mention 当前机器人本身才算 addressed;@ 其他成员不触发。 */
|
|
3
|
+
export function isFeishuBotMentioned(mentions, botOpenId) {
|
|
4
|
+
if (!botOpenId || !Array.isArray(mentions))
|
|
5
|
+
return false;
|
|
6
|
+
return mentions.some((mention) => mention.id?.open_id === botOpenId);
|
|
7
|
+
}
|
|
2
8
|
export function createFeishuChannel(id, config, log) {
|
|
3
9
|
const appId = config.appId?.trim();
|
|
4
10
|
const appSecret = config.appSecret?.trim();
|
|
@@ -25,11 +31,26 @@ export function createFeishuChannel(id, config, log) {
|
|
|
25
31
|
const logger = quietSdkLogger(log, id);
|
|
26
32
|
const loggerLevel = sdk.LoggerLevel?.error ?? 1;
|
|
27
33
|
client = new sdk.Client({ appId, appSecret, logger, loggerLevel, ...(domain ? { domain } : {}) });
|
|
34
|
+
const identity = await client.request({ url: '/open-apis/bot/v3/info', method: 'GET' });
|
|
35
|
+
const botOpenId = identity.bot?.open_id?.trim() ?? '';
|
|
36
|
+
if (!botOpenId)
|
|
37
|
+
throw new Error(`${id}: 无法获取机器人 open_id`);
|
|
28
38
|
const dispatcher = new sdk.EventDispatcher({}).register({
|
|
29
39
|
'im.message.receive_v1': (data) => {
|
|
30
40
|
const message = data.message;
|
|
31
|
-
if (!message
|
|
41
|
+
if (!message)
|
|
42
|
+
return;
|
|
43
|
+
const group = message.chat_type === 'group';
|
|
44
|
+
const addressed = !group || isFeishuBotMentioned(message.mentions, botOpenId);
|
|
45
|
+
if (message.message_type !== 'text') {
|
|
46
|
+
if (addressed && message.chat_id) {
|
|
47
|
+
void client?.im.message.create({
|
|
48
|
+
params: { receive_id_type: 'chat_id' },
|
|
49
|
+
data: { receive_id: message.chat_id, msg_type: 'text', content: JSON.stringify({ text: '暂不支持该消息类型,请发送文字。' }) },
|
|
50
|
+
}).catch((error) => log(`[${id}] 非文本提示发送失败: ${error instanceof Error ? error.message : String(error)}`));
|
|
51
|
+
}
|
|
32
52
|
return;
|
|
53
|
+
}
|
|
33
54
|
let text = '';
|
|
34
55
|
try {
|
|
35
56
|
text = JSON.parse(message.content ?? '{}').text ?? '';
|
|
@@ -37,16 +58,12 @@ export function createFeishuChannel(id, config, log) {
|
|
|
37
58
|
catch {
|
|
38
59
|
text = message.content ?? '';
|
|
39
60
|
}
|
|
40
|
-
const group = message.chat_type === 'group';
|
|
41
|
-
if (group && Array.isArray(message.mentions) === false) {
|
|
42
|
-
/* 群聊未带 mentions 时仍交给引擎,由 addressed 默认 true 以免漏消息;有 mentions 再判断 */
|
|
43
|
-
}
|
|
44
61
|
void handler?.({
|
|
45
62
|
chatId: message.chat_id ?? '',
|
|
46
63
|
userId: data.sender?.sender_id?.open_id,
|
|
47
64
|
text,
|
|
48
65
|
kind: group ? 'group' : 'dm',
|
|
49
|
-
addressed
|
|
66
|
+
addressed,
|
|
50
67
|
});
|
|
51
68
|
},
|
|
52
69
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feishu.js","sourceRoot":"","sources":["../../src/channels/feishu.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"feishu.js","sourceRoot":"","sources":["../../src/channels/feishu.ts"],"names":[],"mappings":"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"}
|
package/lib/channels/qq.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qq.d.ts","sourceRoot":"","sources":["../../src/channels/qq.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"qq.d.ts","sourceRoot":"","sources":["../../src/channels/qq.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;AAGhF,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAiCD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,CAgRhH"}
|
package/lib/channels/qq.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { timeoutSignal } from '../engine/abort.js';
|
|
1
2
|
const TOKEN_URL = 'https://bots.qq.com/app/getAppAccessToken';
|
|
2
3
|
const API = 'https://api.sgroup.qq.com';
|
|
3
4
|
const GATEWAY_PATH = '/gateway';
|
|
@@ -22,6 +23,7 @@ export function createQqChannel(config, log) {
|
|
|
22
23
|
// 提前 5 分钟刷新;WebSocket 靠心跳可长期在线,不主动换 token 会在两小时后全线 401
|
|
23
24
|
let tokenExpireAt = 0;
|
|
24
25
|
let statusText = '未连接';
|
|
26
|
+
let lifecycle;
|
|
25
27
|
const targets = new Map();
|
|
26
28
|
function scheduleReconnect() {
|
|
27
29
|
if (stopped || reconnectTimer)
|
|
@@ -45,6 +47,7 @@ export function createQqChannel(config, log) {
|
|
|
45
47
|
method: 'POST',
|
|
46
48
|
headers: { 'content-type': 'application/json' },
|
|
47
49
|
body: JSON.stringify({ appId, clientSecret: appSecret }),
|
|
50
|
+
signal: timeoutSignal(30_000, lifecycle?.signal),
|
|
48
51
|
});
|
|
49
52
|
const body = await res.text();
|
|
50
53
|
let data;
|
|
@@ -69,6 +72,7 @@ export function createQqChannel(config, log) {
|
|
|
69
72
|
'content-type': 'application/json',
|
|
70
73
|
...(init?.headers ?? {}),
|
|
71
74
|
},
|
|
75
|
+
signal: timeoutSignal(30_000, lifecycle?.signal),
|
|
72
76
|
});
|
|
73
77
|
await ensureToken();
|
|
74
78
|
let res = await request();
|
|
@@ -233,7 +237,15 @@ export function createQqChannel(config, log) {
|
|
|
233
237
|
const path = kind === 'group'
|
|
234
238
|
? `/v2/groups/${openid}/messages`
|
|
235
239
|
: `/v2/users/${openid}/messages`;
|
|
236
|
-
|
|
240
|
+
try {
|
|
241
|
+
await qqFetch(path, { method: 'POST', body: JSON.stringify(body) });
|
|
242
|
+
}
|
|
243
|
+
catch (error) {
|
|
244
|
+
if (!target?.lastMsgId) {
|
|
245
|
+
throw new Error(`QQ 发送失败,当前没有可用的被动回复 msg_id;请让用户重新发送一条消息。${error instanceof Error ? ` ${error.message}` : ''}`, { cause: error });
|
|
246
|
+
}
|
|
247
|
+
throw error;
|
|
248
|
+
}
|
|
237
249
|
}
|
|
238
250
|
return {
|
|
239
251
|
id: 'qq',
|
|
@@ -242,6 +254,8 @@ export function createQqChannel(config, log) {
|
|
|
242
254
|
async start() {
|
|
243
255
|
if (!stopped && (ws || reconnectTimer))
|
|
244
256
|
return;
|
|
257
|
+
lifecycle?.abort();
|
|
258
|
+
lifecycle = new AbortController();
|
|
245
259
|
stopped = false;
|
|
246
260
|
reconnectAttempts = 0;
|
|
247
261
|
try {
|
|
@@ -255,6 +269,8 @@ export function createQqChannel(config, log) {
|
|
|
255
269
|
},
|
|
256
270
|
async stop() {
|
|
257
271
|
stopped = true;
|
|
272
|
+
lifecycle?.abort();
|
|
273
|
+
lifecycle = undefined;
|
|
258
274
|
clearInterval(heartbeat);
|
|
259
275
|
clearTimeout(reconnectTimer);
|
|
260
276
|
reconnectTimer = undefined;
|
package/lib/channels/qq.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qq.js","sourceRoot":"","sources":["../../src/channels/qq.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"qq.js","sourceRoot":"","sources":["../../src/channels/qq.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telegram.d.ts","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"telegram.d.ts","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;AAIhF,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAiBD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,CAkKrH"}
|
package/lib/channels/telegram.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { JsonStateFile } from '../engine/json-state.js';
|
|
2
|
+
import { sleepWithSignal, timeoutSignal } from '../engine/abort.js';
|
|
2
3
|
const API = 'https://api.telegram.org';
|
|
3
4
|
export function createTelegramChannel(config, log) {
|
|
4
5
|
const token = config.token?.trim();
|
|
@@ -12,11 +13,14 @@ export function createTelegramChannel(config, log) {
|
|
|
12
13
|
let lastError = '';
|
|
13
14
|
let botId = '';
|
|
14
15
|
let username = '';
|
|
15
|
-
|
|
16
|
+
let lifecycle;
|
|
17
|
+
let pollTask;
|
|
18
|
+
async function api(method, body, timeoutMs = 30_000) {
|
|
16
19
|
const res = await fetch(`${API}/bot${token}/${method}`, {
|
|
17
20
|
method: 'POST',
|
|
18
21
|
headers: { 'content-type': 'application/json' },
|
|
19
22
|
body: JSON.stringify(body),
|
|
23
|
+
signal: timeoutSignal(timeoutMs, lifecycle?.signal),
|
|
20
24
|
});
|
|
21
25
|
const data = (await res.json());
|
|
22
26
|
if (!data.ok) {
|
|
@@ -43,7 +47,7 @@ export function createTelegramChannel(config, log) {
|
|
|
43
47
|
offset,
|
|
44
48
|
timeout: 25,
|
|
45
49
|
allowed_updates: ['message'],
|
|
46
|
-
});
|
|
50
|
+
}, 35_000);
|
|
47
51
|
lastError = '';
|
|
48
52
|
for (const update of updates) {
|
|
49
53
|
// Telegram offset 是 at-most-once 取舍:先确认游标可避免崩溃重启后重复驱动 agent,代价是极端情况下丢一条未完成消息。
|
|
@@ -78,7 +82,7 @@ export function createTelegramChannel(config, log) {
|
|
|
78
82
|
log(`[telegram] 轮询错误: ${lastError}`);
|
|
79
83
|
if (stopped)
|
|
80
84
|
break;
|
|
81
|
-
await
|
|
85
|
+
await sleepWithSignal(3000, lifecycle?.signal).catch(() => undefined);
|
|
82
86
|
}
|
|
83
87
|
}
|
|
84
88
|
}
|
|
@@ -87,6 +91,8 @@ export function createTelegramChannel(config, log) {
|
|
|
87
91
|
label: 'Telegram',
|
|
88
92
|
maxMessageLength: 4000,
|
|
89
93
|
async start() {
|
|
94
|
+
lifecycle?.abort();
|
|
95
|
+
lifecycle = new AbortController();
|
|
90
96
|
stopped = false;
|
|
91
97
|
const me = await api('getMe', {});
|
|
92
98
|
botId = String(me.id);
|
|
@@ -95,10 +101,17 @@ export function createTelegramChannel(config, log) {
|
|
|
95
101
|
if (hook.url)
|
|
96
102
|
throw Object.assign(new Error('该 Telegram 机器人已配置 Webhook,请先在原服务中移除。'), { code: 'webhook-configured' });
|
|
97
103
|
log('[telegram] 开始长轮询');
|
|
98
|
-
|
|
104
|
+
pollTask = pollLoop().catch((error) => {
|
|
105
|
+
if (!stopped)
|
|
106
|
+
log(`[telegram] 轮询循环退出: ${error instanceof Error ? error.message : String(error)}`);
|
|
107
|
+
});
|
|
99
108
|
},
|
|
100
109
|
async stop() {
|
|
101
110
|
stopped = true;
|
|
111
|
+
lifecycle?.abort();
|
|
112
|
+
await pollTask?.catch(() => undefined);
|
|
113
|
+
pollTask = undefined;
|
|
114
|
+
lifecycle = undefined;
|
|
102
115
|
if (persist)
|
|
103
116
|
cursorFile.write({ offset });
|
|
104
117
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telegram.js","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"telegram.js","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"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"}
|
package/lib/channels/wecom.d.ts
CHANGED
|
@@ -17,11 +17,17 @@ export declare class WecomReplyBroker {
|
|
|
17
17
|
private readonly client;
|
|
18
18
|
private readonly log;
|
|
19
19
|
private readonly newStreamId;
|
|
20
|
+
private readonly ttlMs;
|
|
20
21
|
private readonly pending;
|
|
21
|
-
|
|
22
|
+
private readonly sweepTimer;
|
|
23
|
+
constructor(client: Pick<WecomSdkClient, 'replyStream' | 'sendMessage'>, log: (line: string) => void, newStreamId?: () => string, ttlMs?: number);
|
|
24
|
+
private prune;
|
|
25
|
+
private pruneAll;
|
|
22
26
|
remember(chatId: string, frame: unknown): string;
|
|
23
27
|
private shift;
|
|
24
28
|
startThinking(chatId: string): Promise<void>;
|
|
29
|
+
pendingCount(): number;
|
|
30
|
+
dispose(): void;
|
|
25
31
|
send(chatId: string, text: string): Promise<void>;
|
|
26
32
|
beginReply(chatId: string): Promise<ReplyStream>;
|
|
27
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wecom.d.ts","sourceRoot":"","sources":["../../src/channels/wecom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAa,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGhF,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAClG,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5D,OAAO,IAAI,OAAO,CAAA;IAClB,UAAU,IAAI,IAAI,CAAA;IAClB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI,CAAA;CACzD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGjE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAYjE;AAED,wDAAwD;AACxD,qBAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"wecom.d.ts","sourceRoot":"","sources":["../../src/channels/wecom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAa,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGhF,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAClG,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5D,OAAO,IAAI,OAAO,CAAA;IAClB,UAAU,IAAI,IAAI,CAAA;IAClB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI,CAAA;CACzD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGjE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAYjE;AAED,wDAAwD;AACxD,qBAAa,gBAAgB;IAMzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsG;IAC9H,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgC;gBAGxC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,aAAa,GAAG,aAAa,CAAC,EAC3D,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,WAAW,GAAE,MAAM,MAAgF,EACnG,KAAK,SAAU;IAMlC,OAAO,CAAC,KAAK;IAMb,OAAO,CAAC,QAAQ;IAKhB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM;IAWhD,OAAO,CAAC,KAAK;IASP,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASlD,YAAY,IAAI,MAAM;IAOtB,OAAO,IAAI,IAAI;IAKT,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CAqBvD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,CA2F/G"}
|