@michengai/dsh-im-connect 0.1.37 → 0.1.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +17 -1
- package/CHANGELOG.zh-CN.md +17 -1
- package/README.en.md +60 -65
- package/README.md +60 -65
- package/SECURITY.md +7 -2
- package/client.js +31 -298
- package/lib/channels/channel-image-download.d.ts +22 -0
- package/lib/channels/channel-image-download.d.ts.map +1 -0
- package/lib/channels/channel-image-download.js +179 -0
- package/lib/channels/channel-image-download.js.map +1 -0
- package/lib/channels/dingtalk-token-cache.d.ts +18 -0
- package/lib/channels/dingtalk-token-cache.d.ts.map +1 -0
- package/lib/channels/dingtalk-token-cache.js +48 -0
- package/lib/channels/dingtalk-token-cache.js.map +1 -0
- package/lib/channels/dingtalk.d.ts +17 -4
- package/lib/channels/dingtalk.d.ts.map +1 -1
- package/lib/channels/dingtalk.js +111 -18
- package/lib/channels/dingtalk.js.map +1 -1
- package/lib/channels/factory.d.ts.map +1 -1
- package/lib/channels/factory.js +6 -3
- package/lib/channels/factory.js.map +1 -1
- package/lib/channels/feishu.d.ts +30 -2
- package/lib/channels/feishu.d.ts.map +1 -1
- package/lib/channels/feishu.js +141 -26
- package/lib/channels/feishu.js.map +1 -1
- package/lib/channels/image-host-policy.d.ts +4 -0
- package/lib/channels/image-host-policy.d.ts.map +1 -0
- package/lib/channels/image-host-policy.js +24 -0
- package/lib/channels/image-host-policy.js.map +1 -0
- package/lib/channels/qq.d.ts +1 -0
- package/lib/channels/qq.d.ts.map +1 -1
- package/lib/channels/qq.js +89 -18
- package/lib/channels/qq.js.map +1 -1
- package/lib/channels/telegram.d.ts.map +1 -1
- package/lib/channels/telegram.js +121 -16
- package/lib/channels/telegram.js.map +1 -1
- package/lib/channels/wecom.d.ts +8 -2
- package/lib/channels/wecom.d.ts.map +1 -1
- package/lib/channels/wecom.js +60 -11
- package/lib/channels/wecom.js.map +1 -1
- package/lib/channels/weixin.d.ts.map +1 -1
- package/lib/channels/weixin.js +169 -17
- package/lib/channels/weixin.js.map +1 -1
- package/lib/client.js +31 -298
- package/lib/engine/gateway.d.ts +2 -0
- package/lib/engine/gateway.d.ts.map +1 -1
- package/lib/engine/gateway.js +48 -11
- package/lib/engine/gateway.js.map +1 -1
- package/lib/engine/image-input.d.ts +8 -0
- package/lib/engine/image-input.d.ts.map +1 -0
- package/lib/engine/image-input.js +31 -0
- package/lib/engine/image-input.js.map +1 -0
- package/lib/engine/router.d.ts.map +1 -1
- package/lib/engine/router.js +29 -19
- package/lib/engine/router.js.map +1 -1
- package/lib/manager.d.ts +0 -10
- package/lib/manager.d.ts.map +1 -1
- package/lib/manager.js +231 -203
- package/lib/manager.js.map +1 -1
- package/package.json +1 -1
- package/src/channels/channel-image-download.ts +154 -0
- package/src/channels/dingtalk-token-cache.ts +39 -0
- package/src/channels/dingtalk.ts +106 -27
- package/src/channels/factory.ts +6 -3
- package/src/channels/feishu.ts +126 -24
- package/src/channels/image-host-policy.ts +21 -0
- package/src/channels/qq.ts +80 -26
- package/src/channels/telegram.ts +105 -16
- package/src/channels/wecom.ts +57 -12
- package/src/channels/weixin.ts +124 -14
- package/src/engine/gateway.ts +35 -6
- package/src/engine/image-input.ts +26 -0
- package/src/engine/router.ts +28 -18
- package/src/manager.ts +116 -84
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/** 缓存归固定凭据的单个适配器所有,不按 clientId 跨实例共享。 */
|
|
2
|
+
export class DingtalkTokenCache {
|
|
3
|
+
load;
|
|
4
|
+
now;
|
|
5
|
+
cached;
|
|
6
|
+
pending;
|
|
7
|
+
generation = 0;
|
|
8
|
+
clear() {
|
|
9
|
+
this.generation++;
|
|
10
|
+
this.cached = undefined;
|
|
11
|
+
this.pending = undefined;
|
|
12
|
+
}
|
|
13
|
+
constructor(load, now = Date.now) {
|
|
14
|
+
this.load = load;
|
|
15
|
+
this.now = now;
|
|
16
|
+
}
|
|
17
|
+
async get(signal) {
|
|
18
|
+
signal.throwIfAborted();
|
|
19
|
+
if (this.cached && this.now() < this.cached.expiresAt)
|
|
20
|
+
return this.cached.token;
|
|
21
|
+
if (this.pending)
|
|
22
|
+
return this.pending;
|
|
23
|
+
const pending = this.fetch(signal);
|
|
24
|
+
this.pending = pending;
|
|
25
|
+
try {
|
|
26
|
+
return await pending;
|
|
27
|
+
}
|
|
28
|
+
finally {
|
|
29
|
+
if (this.pending === pending)
|
|
30
|
+
this.pending = undefined;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
async fetch(signal) {
|
|
34
|
+
const startedAt = this.now();
|
|
35
|
+
const generation = this.generation;
|
|
36
|
+
const auth = await this.load(signal);
|
|
37
|
+
signal.throwIfAborted();
|
|
38
|
+
if (generation !== this.generation)
|
|
39
|
+
throw new Error('钉钉图片鉴权已取消');
|
|
40
|
+
if (typeof auth.accessToken !== 'string' || !auth.accessToken.trim())
|
|
41
|
+
throw new Error('钉钉图片鉴权失败');
|
|
42
|
+
const ttl = typeof auth.expireIn === 'number' && Number.isFinite(auth.expireIn) ? auth.expireIn * 1000 : 0;
|
|
43
|
+
const expiresAt = startedAt + ttl - Math.min(60_000, Math.max(5_000, ttl * 0.1));
|
|
44
|
+
this.cached = Number.isFinite(expiresAt) && expiresAt > this.now() ? { token: auth.accessToken, expiresAt } : undefined;
|
|
45
|
+
return auth.accessToken;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=dingtalk-token-cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dingtalk-token-cache.js","sourceRoot":"","sources":["../../src/channels/dingtalk-token-cache.ts"],"names":[],"mappings":"AAEA,yCAAyC;AACzC,MAAM,OAAO,kBAAkB;IAYA;IAAwE;IAX7F,MAAM,CAAuC;IAE7C,OAAO,CAAkB;IACzB,UAAU,GAAG,CAAC,CAAA;IAEtB,KAAK;QACH,IAAI,CAAC,UAAU,EAAE,CAAA;QACjB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;IAC1B,CAAC;IAED,YAA6B,IAAqD,EAAmB,MAAM,IAAI,CAAC,GAAG;QAAtF,SAAI,GAAJ,IAAI,CAAiD;QAAmB,QAAG,GAAH,GAAG,CAAW;IAAG,CAAC;IAEvH,KAAK,CAAC,GAAG,CAAC,MAAmB;QAC3B,MAAM,CAAC,cAAc,EAAE,CAAA;QACvB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAA;QAC/E,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC,OAAO,CAAA;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC;YAAC,OAAO,MAAM,OAAO,CAAA;QAAC,CAAC;gBAAS,CAAC;YAAC,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO;gBAAE,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;QAAC,CAAC;IACjG,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,MAAmB;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;QAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpC,MAAM,CAAC,cAAc,EAAE,CAAA;QACvB,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAA;QAChE,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAA;QACjG,MAAM,GAAG,GAAG,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1G,MAAM,SAAS,GAAG,SAAS,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC,CAAA;QAChF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;QACvH,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;CACF"}
|
|
@@ -1,9 +1,19 @@
|
|
|
1
|
-
import type { ChannelAdapter } from '../engine/types.js';
|
|
1
|
+
import type { ChannelAdapter, ImMedia } from '../engine/types.js';
|
|
2
2
|
export interface DingtalkConfig {
|
|
3
3
|
clientId?: string;
|
|
4
4
|
clientSecret?: string;
|
|
5
|
+
additionalImageHosts?: readonly string[];
|
|
5
6
|
}
|
|
6
|
-
export
|
|
7
|
+
export interface DingtalkRobotPayload {
|
|
8
|
+
msgtype?: string;
|
|
9
|
+
content?: {
|
|
10
|
+
downloadCode?: string;
|
|
11
|
+
richText?: Array<{
|
|
12
|
+
type?: string;
|
|
13
|
+
text?: string;
|
|
14
|
+
downloadCode?: string;
|
|
15
|
+
}>;
|
|
16
|
+
};
|
|
7
17
|
text?: {
|
|
8
18
|
content?: string;
|
|
9
19
|
};
|
|
@@ -15,12 +25,15 @@ export declare function parseDingtalkRobotEvent(payload: {
|
|
|
15
25
|
msgId?: string;
|
|
16
26
|
msgid?: string;
|
|
17
27
|
msgIdEnc?: string;
|
|
18
|
-
}
|
|
28
|
+
}
|
|
29
|
+
export declare function parseDingtalkRobotEvent(payload: DingtalkRobotPayload): {
|
|
19
30
|
chatId: string;
|
|
20
31
|
userId: string;
|
|
21
32
|
text: string;
|
|
22
33
|
kind: 'dm' | 'group';
|
|
23
34
|
messageId?: string;
|
|
24
35
|
} | undefined;
|
|
25
|
-
export declare function createDingtalkChannel(config: DingtalkConfig, log: (line: string) => void
|
|
36
|
+
export declare function createDingtalkChannel(config: DingtalkConfig, log: (line: string) => void, dependencies?: {
|
|
37
|
+
downloadImage?: (downloadCode: string) => Promise<ImMedia>;
|
|
38
|
+
}): ChannelAdapter | undefined;
|
|
26
39
|
//# sourceMappingURL=dingtalk.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dingtalk.d.ts","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"dingtalk.d.ts","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAa,OAAO,EAAe,MAAM,oBAAoB,CAAA;AAkCzF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,oBAAoB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CACzC;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,YAAY,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAA;IAC9G,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;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,oBAAoB,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,CAgB7K;AACD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAAE,YAAY,GAAE;IACvG,aAAa,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CACtD,GAAG,cAAc,GAAG,SAAS,CAyJlC"}
|
package/lib/channels/dingtalk.js
CHANGED
|
@@ -1,7 +1,40 @@
|
|
|
1
1
|
import { DingtalkCardClient, openDingtalkCardStream } from './dingtalk-card.js';
|
|
2
|
+
import { validateAdditionalImageHosts } from './image-host-policy.js';
|
|
3
|
+
import { DingtalkTokenCache } from './dingtalk-token-cache.js';
|
|
2
4
|
import { timeoutSignal } from '../engine/abort.js';
|
|
5
|
+
import { requestChannelBytes, imageMedia, MAX_CHANNEL_IMAGES, channelImageFailureReason, channelImageDownloadHost } from './channel-image-download.js';
|
|
6
|
+
async function postDingtalk(path, body, signal, headers = {}) {
|
|
7
|
+
const bytes = await requestChannelBytes(`https://api.dingtalk.com/v1.0/${path}`, {
|
|
8
|
+
method: 'POST', headers: { 'content-type': 'application/json', ...headers },
|
|
9
|
+
body: JSON.stringify(body), maxBytes: 64 * 1024, signal,
|
|
10
|
+
});
|
|
11
|
+
return JSON.parse(bytes.toString());
|
|
12
|
+
}
|
|
13
|
+
async function downloadDingtalkImage(clientId, tokens, downloadCode, signal, additionalImageHosts, log) {
|
|
14
|
+
if (typeof downloadCode !== 'string' || !downloadCode.trim())
|
|
15
|
+
throw new Error('图片缺少 downloadCode');
|
|
16
|
+
const token = await tokens.get(signal);
|
|
17
|
+
const file = await postDingtalk('robot/messageFiles/download', { robotCode: clientId, downloadCode }, signal, {
|
|
18
|
+
'x-acs-dingtalk-access-token': token,
|
|
19
|
+
});
|
|
20
|
+
if (typeof file.downloadUrl !== 'string' || !file.downloadUrl)
|
|
21
|
+
throw new Error('钉钉没有返回图片下载地址');
|
|
22
|
+
const mediaUrl = new URL(file.downloadUrl);
|
|
23
|
+
const sourceProtocol = mediaUrl.protocol;
|
|
24
|
+
// DingTalk can return an HTTP-signed OSS URL. Upgrade this exact platform
|
|
25
|
+
// origin without altering its opaque path/query; never allow plaintext media.
|
|
26
|
+
if (mediaUrl.protocol === 'http:'
|
|
27
|
+
&& (mediaUrl.hostname === 'wukong-file-im-zjk.oss-cn-zhangjiakou.aliyuncs.com' || additionalImageHosts.includes(mediaUrl.hostname))
|
|
28
|
+
&& !mediaUrl.username && !mediaUrl.password && !mediaUrl.port)
|
|
29
|
+
mediaUrl.protocol = 'https:';
|
|
30
|
+
log(`[dingtalk] 图片下载 host=${channelImageDownloadHost(mediaUrl.href)} sourceProtocol=${sourceProtocol} protocol=${mediaUrl.protocol} port=${mediaUrl.port || 'default'} userinfo=${Boolean(mediaUrl.username || mediaUrl.password)}`);
|
|
31
|
+
// The temporary media URL must never receive the app secret or access token.
|
|
32
|
+
return imageMedia(await requestChannelBytes(mediaUrl.href, { signal, additionalTrustedHosts: additionalImageHosts }));
|
|
33
|
+
}
|
|
3
34
|
export function parseDingtalkRobotEvent(payload) {
|
|
4
|
-
const text = payload.
|
|
35
|
+
const text = payload.msgtype === 'richText' && Array.isArray(payload.content?.richText)
|
|
36
|
+
? payload.content.richText.filter(item => typeof item?.text === 'string').map(item => item.text).join('\n').trim()
|
|
37
|
+
: payload.text?.content?.trim() ?? '';
|
|
5
38
|
const sender = payload.senderStaffId ?? payload.senderId ?? '';
|
|
6
39
|
const group = String(payload.conversationType) === '2';
|
|
7
40
|
const chatId = group ? (payload.conversationId ?? '') : sender;
|
|
@@ -16,14 +49,19 @@ export function parseDingtalkRobotEvent(payload) {
|
|
|
16
49
|
messageId,
|
|
17
50
|
};
|
|
18
51
|
}
|
|
19
|
-
export function createDingtalkChannel(config, log) {
|
|
52
|
+
export function createDingtalkChannel(config, log, dependencies = {}) {
|
|
20
53
|
const clientId = config.clientId?.trim();
|
|
21
54
|
const clientSecret = config.clientSecret?.trim();
|
|
22
55
|
if (!clientId || !clientSecret)
|
|
23
56
|
return undefined;
|
|
57
|
+
const additionalImageHosts = validateAdditionalImageHosts(config.additionalImageHosts);
|
|
24
58
|
let handler;
|
|
25
59
|
let client;
|
|
26
60
|
let statusText = '未连接';
|
|
61
|
+
let generation = 0;
|
|
62
|
+
let lifecycle = new AbortController();
|
|
63
|
+
const tokens = new DingtalkTokenCache(signal => postDingtalk('oauth2/accessToken', { appKey: clientId, appSecret: clientSecret }, signal));
|
|
64
|
+
const receiving = new Map();
|
|
27
65
|
const webhooks = new Map();
|
|
28
66
|
const targets = new Map();
|
|
29
67
|
const cards = new DingtalkCardClient(clientId, clientSecret, log);
|
|
@@ -41,9 +79,22 @@ export function createDingtalkChannel(config, log) {
|
|
|
41
79
|
label: '钉钉',
|
|
42
80
|
maxMessageLength: 4000,
|
|
43
81
|
async start() {
|
|
82
|
+
const startedGeneration = ++generation;
|
|
83
|
+
lifecycle.abort();
|
|
84
|
+
lifecycle = new AbortController();
|
|
85
|
+
const signal = lifecycle.signal;
|
|
86
|
+
tokens.clear();
|
|
87
|
+
receiving.clear();
|
|
88
|
+
webhooks.clear();
|
|
89
|
+
targets.clear();
|
|
90
|
+
client?.disconnect();
|
|
91
|
+
client = undefined;
|
|
44
92
|
try {
|
|
45
93
|
const sdk = await import('dingtalk-stream');
|
|
46
|
-
|
|
94
|
+
if (generation !== startedGeneration)
|
|
95
|
+
return;
|
|
96
|
+
const startedClient = new sdk.DWClient({ clientId, clientSecret, autoReconnect: true });
|
|
97
|
+
client = startedClient;
|
|
47
98
|
client.registerCallbackListener(sdk.TOPIC_ROBOT, (res) => {
|
|
48
99
|
let payload;
|
|
49
100
|
try {
|
|
@@ -53,36 +104,78 @@ export function createDingtalkChannel(config, log) {
|
|
|
53
104
|
return;
|
|
54
105
|
}
|
|
55
106
|
const parsed = parseDingtalkRobotEvent(payload);
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
107
|
+
const images = payload.msgtype === 'picture' ? [payload.content?.downloadCode ?? '']
|
|
108
|
+
: payload.msgtype === 'richText' && Array.isArray(payload.content?.richText)
|
|
109
|
+
? payload.content.richText.filter(item => item && (item.type === 'picture' || 'downloadCode' in item)).map(item => item.downloadCode ?? '') : [];
|
|
110
|
+
if (!parsed?.chatId || (!parsed.text && !images.length))
|
|
111
|
+
return { status: 'SUCCESS' };
|
|
112
|
+
const work = (receiving.get(parsed.chatId) ?? Promise.resolve()).then(async () => {
|
|
113
|
+
if (generation !== startedGeneration)
|
|
114
|
+
return;
|
|
115
|
+
// Advance reply targets only when this message reaches the head of its chat queue.
|
|
116
|
+
if (payload.sessionWebhook)
|
|
117
|
+
remember(webhooks, parsed.chatId, payload.sessionWebhook);
|
|
59
118
|
remember(targets, parsed.chatId, parsed.kind === 'group'
|
|
60
119
|
? { type: 'group', openConversationId: payload.conversationId ?? parsed.chatId }
|
|
61
120
|
: { type: 'user', userId: parsed.userId });
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
121
|
+
const media = [];
|
|
122
|
+
try {
|
|
123
|
+
if (images.length > MAX_CHANNEL_IMAGES)
|
|
124
|
+
throw new Error('图片数量超过限制');
|
|
125
|
+
for (const code of images) {
|
|
126
|
+
if (generation !== startedGeneration)
|
|
127
|
+
return;
|
|
128
|
+
media.push(await (dependencies.downloadImage
|
|
129
|
+
? dependencies.downloadImage(code) : downloadDingtalkImage(clientId, tokens, code, signal, additionalImageHosts, log)));
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
catch (error) {
|
|
133
|
+
if (generation !== startedGeneration)
|
|
134
|
+
return;
|
|
135
|
+
const reason = channelImageFailureReason(error);
|
|
136
|
+
log(`[dingtalk] 图片读取失败: ${reason}`);
|
|
137
|
+
if (!payload.sessionWebhook)
|
|
138
|
+
throw new Error('没有可回复的图片回调 webhook');
|
|
139
|
+
await requestChannelBytes(payload.sessionWebhook, {
|
|
140
|
+
method: 'POST', headers: { 'content-type': 'application/json' }, maxBytes: 64 * 1024, signal,
|
|
141
|
+
body: JSON.stringify({ msgtype: 'text', text: { content: `图片读取失败:${reason}。请重试;若仍失败请管理员检查网络和机器人文件下载权限。` } }),
|
|
142
|
+
});
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
if (generation !== startedGeneration)
|
|
146
|
+
return;
|
|
147
|
+
await handler?.({ ...parsed, media, addressed: true });
|
|
148
|
+
}).catch(error => { log(`[dingtalk] 消息处理或图片错误提示发送失败: ${channelImageFailureReason(error)}`); });
|
|
149
|
+
receiving.set(parsed.chatId, work);
|
|
150
|
+
void work.finally(() => { if (receiving.get(parsed.chatId) === work)
|
|
151
|
+
receiving.delete(parsed.chatId); });
|
|
73
152
|
return { status: 'SUCCESS' };
|
|
74
153
|
});
|
|
75
|
-
await
|
|
154
|
+
await startedClient.connect();
|
|
155
|
+
if (generation !== startedGeneration) {
|
|
156
|
+
startedClient.disconnect();
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
76
159
|
statusText = 'Stream 已连接';
|
|
77
160
|
log('[dingtalk] Stream 已连接');
|
|
78
161
|
}
|
|
79
162
|
catch (error) {
|
|
163
|
+
if (generation !== startedGeneration)
|
|
164
|
+
return;
|
|
165
|
+
lifecycle.abort();
|
|
166
|
+
tokens.clear();
|
|
167
|
+
client?.disconnect();
|
|
168
|
+
client = undefined;
|
|
80
169
|
const message = error instanceof Error ? error.message : String(error);
|
|
81
170
|
const missing = /Cannot find package ['"]dingtalk-stream['"]/i.test(message);
|
|
82
171
|
throw new Error(missing ? '缺少依赖 dingtalk-stream' : `钉钉连接失败: ${message}`);
|
|
83
172
|
}
|
|
84
173
|
},
|
|
85
174
|
async stop() {
|
|
175
|
+
generation++;
|
|
176
|
+
lifecycle.abort();
|
|
177
|
+
tokens.clear();
|
|
178
|
+
receiving.clear();
|
|
86
179
|
client?.disconnect();
|
|
87
180
|
client = undefined;
|
|
88
181
|
webhooks.clear();
|
|
@@ -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;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAOlD,MAAM,UAAU,uBAAuB,CAAC,OAUvC;IACC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IAChD,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAA;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,GAAG,CAAA;IACtD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IAC9D,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAA;IAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAA;IACpE,OAAO;QACL,MAAM;QACN,MAAM,EAAE,MAAM;QACd,IAAI;QACJ,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QAC5B,SAAS;KACV,CAAA;AACH,CAAC;AACD,MAAM,UAAU,qBAAqB,CAAC,MAAsB,EAAE,GAA2B;IACvF,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAA;IACxC,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,CAAA;IAChD,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY;QAAE,OAAO,SAAS,CAAA;IAEhD,IAAI,OAA+D,CAAA;IACnE,IAAI,MAA2J,CAAA;IAC/J,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAA;IAC1C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAsB,CAAA;IAC7C,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,CAAA;IACjE,MAAM,QAAQ,GAAG,CAAI,GAAmB,EAAE,GAAW,EAAE,KAAQ,EAAE,EAAE;QACjE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACf,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACnB,IAAI,GAAG,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;YACpB,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAA;YACtC,IAAI,MAAM,KAAK,SAAS;gBAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC9C,CAAC;IACH,CAAC,CAAA;IAED,OAAO;QACL,EAAE,EAAE,UAAU;QACd,KAAK,EAAE,IAAI;QACX,gBAAgB,EAAE,IAAI;QACtB,KAAK,CAAC,KAAK;YACT,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAGzC,CAAA;gBACD,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;gBAC1E,MAAM,CAAC,wBAAwB,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE;oBACvD,IAAI,OAOH,CAAA;oBACD,IAAI,CAAC;wBAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAmB,CAAA;oBAAC,CAAC;oBAAC,MAAM,CAAC;wBAAC,OAAM;oBAAC,CAAC;oBACzE,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAA;oBAC/C,IAAI,OAAO,CAAC,cAAc,IAAI,MAAM,EAAE,MAAM;wBAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;oBACvG,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;wBACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,KAAK,OAAO;4BACtD,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,EAAE,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,EAAE;4BAChF,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;oBAC9C,CAAC;oBACD,IAAI,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI;wBAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;oBACjE,KAAK,OAAO,EAAE,CAAC;wBACb,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,SAAS,EAAE,IAAI;wBACf,SAAS,EAAE,MAAM,CAAC,SAAS;qBAC5B,CAAC,CAAA;oBACF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;gBAC9B,CAAC,CAAC,CAAA;gBACF,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;gBACtB,UAAU,GAAG,YAAY,CAAA;gBACzB,GAAG,CAAC,uBAAuB,CAAC,CAAA;YAC9B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACtE,MAAM,OAAO,GAAG,8CAA8C,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC5E,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,WAAW,OAAO,EAAE,CAAC,CAAA;YAC1E,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI;YACR,MAAM,EAAE,UAAU,EAAE,CAAA;YACpB,MAAM,GAAG,SAAS,CAAA;YAClB,QAAQ,CAAC,KAAK,EAAE,CAAA;YAChB,OAAO,CAAC,KAAK,EAAE,CAAA;YACf,UAAU,GAAG,KAAK,CAAA;QACpB,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI;YACrB,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACpC,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACrE,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE;gBAC/B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;gBAChF,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC;aAC9B,CAAC,CAAA;YACF,IAAI,CAAC,GAAG,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;QAClE,CAAC;QACD,KAAK,CAAC,UAAU,CAAC,MAAM;YACrB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAClC,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;YACnD,IAAI,CAAC;gBACH,OAAO,MAAM,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;YACzD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,GAAG,CAAC,mCAAmC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;gBAChG,MAAM,QAAQ,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;oBACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;oBACpC,IAAI,CAAC,OAAO;wBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;oBACzD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE;wBAC/B,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;wBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;wBAChF,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC;qBAC9B,CAAC,CAAA;oBACF,IAAI,CAAC,GAAG,CAAC,EAAE;wBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;gBAClE,CAAC,CAAA;gBACD,OAAO;oBACL,KAAK,CAAC,MAAM,KAAqB,CAAC;oBAClC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAA,CAAC,CAAC;iBAC5C,CAAA;YACH,CAAC;QACH,CAAC;QACD,iBAAiB,CAAC,CAAC,IAAI,OAAO,GAAG,CAAC,CAAA,CAAC,CAAC;QACpC,MAAM,KAAK,OAAO,UAAU,CAAA,CAAC,CAAC;KAC/B,CAAA;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"dingtalk.js","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/channels/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/channels/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AASxD,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,GAC9H,cAAc,GAAG,SAAS,CA4B5B"}
|
package/lib/channels/factory.js
CHANGED
|
@@ -4,8 +4,11 @@ import { createTelegramChannel } from './telegram.js';
|
|
|
4
4
|
import { createWecomChannel } from './wecom.js';
|
|
5
5
|
import { createWeixinChannel } from './weixin.js';
|
|
6
6
|
import { createQqChannel } from './qq.js';
|
|
7
|
+
import { parseAdditionalImageHosts } from './image-host-policy.js';
|
|
7
8
|
export function createChannelAdapter(id, config, log, stateDir, options) {
|
|
8
9
|
let adapter;
|
|
10
|
+
const imageOptions = ['qq', 'wecom', 'dingtalk'].includes(id)
|
|
11
|
+
? { additionalImageHosts: parseAdditionalImageHosts(config.additionalImageHosts) } : {};
|
|
9
12
|
switch (id) {
|
|
10
13
|
case 'telegram':
|
|
11
14
|
adapter = createTelegramChannel({ token: config.token, stateDir }, log);
|
|
@@ -20,13 +23,13 @@ export function createChannelAdapter(id, config, log, stateDir, options) {
|
|
|
20
23
|
adapter = createWeixinChannel({ enabled: true, stateDir, botToken: config.botToken, onBotToken: options?.onWeixinBotToken }, log, stateDir);
|
|
21
24
|
break;
|
|
22
25
|
case 'wecom':
|
|
23
|
-
adapter = createWecomChannel({ botId: config.botId, secret: config.secret }, log);
|
|
26
|
+
adapter = createWecomChannel({ botId: config.botId, secret: config.secret, ...imageOptions }, log);
|
|
24
27
|
break;
|
|
25
28
|
case 'dingtalk':
|
|
26
|
-
adapter = createDingtalkChannel({ clientId: config.clientId, clientSecret: config.clientSecret }, log);
|
|
29
|
+
adapter = createDingtalkChannel({ clientId: config.clientId, clientSecret: config.clientSecret, ...imageOptions }, log);
|
|
27
30
|
break;
|
|
28
31
|
case 'qq':
|
|
29
|
-
adapter = createQqChannel({ appId: config.appId, appSecret: config.appSecret }, log);
|
|
32
|
+
adapter = createQqChannel({ appId: config.appId, appSecret: config.appSecret, ...imageOptions }, log);
|
|
30
33
|
break;
|
|
31
34
|
default:
|
|
32
35
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/channels/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/channels/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAElE,MAAM,UAAU,oBAAoB,CAClC,EAAa,EACb,MAA8B,EAC9B,GAA2B,EAC3B,QAAgB,EAChB,OAA+H;IAE/H,IAAI,OAAmC,CAAA;IACvC,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3D,CAAC,CAAC,EAAE,oBAAoB,EAAE,yBAAyB,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACzF,QAAQ,EAAE,EAAE,CAAC;QACX,KAAK,UAAU;YACb,OAAO,GAAG,qBAAqB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;YAAC,MAAK;QAChF,KAAK,QAAQ;YACX,OAAO,GAAG,mBAAmB,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,CAAC,CAAC;YAAC,MAAK;QAC3G,KAAK,MAAM;YACT,OAAO,GAAG,mBAAmB,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;YAAC,MAAK;QACzH,KAAK,QAAQ;YACX,OAAO,GAAG,mBAAmB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;YAAC,MAAK;QACpJ,KAAK,OAAO;YACV,OAAO,GAAG,kBAAkB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;YAAC,MAAK;QAC3G,KAAK,UAAU;YACb,OAAO,GAAG,qBAAqB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,GAAG,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;YAAC,MAAK;QAChI,KAAK,IAAI;YACP,OAAO,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;YAAC,MAAK;QAC9G;YACE,OAAO,SAAS,CAAA;IACpB,CAAC;IACD,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAC9B,OAAO;QACL,GAAG,OAAO;QACV,EAAE,EAAE,OAAO,EAAE,SAAS,IAAI,OAAO,CAAC,EAAE;QACpC,KAAK,EAAE,OAAO,EAAE,YAAY,IAAI,OAAO,CAAC,KAAK;KAC9C,CAAA;AACH,CAAC"}
|
package/lib/channels/feishu.d.ts
CHANGED
|
@@ -1,4 +1,32 @@
|
|
|
1
|
-
import type { ChannelAdapter } from '../engine/types.js';
|
|
1
|
+
import type { ChannelAdapter, ImMedia } from '../engine/types.js';
|
|
2
|
+
interface FeishuContentMessage {
|
|
3
|
+
message_id?: string;
|
|
4
|
+
message_type?: string;
|
|
5
|
+
content?: string;
|
|
6
|
+
}
|
|
7
|
+
interface ResourceClient {
|
|
8
|
+
im: {
|
|
9
|
+
messageResource: {
|
|
10
|
+
get(opts: {
|
|
11
|
+
path: {
|
|
12
|
+
message_id: string;
|
|
13
|
+
file_key: string;
|
|
14
|
+
};
|
|
15
|
+
params: {
|
|
16
|
+
type: string;
|
|
17
|
+
};
|
|
18
|
+
}): Promise<{
|
|
19
|
+
getReadableStream(): import('node:stream').Readable;
|
|
20
|
+
headers?: Record<string, string>;
|
|
21
|
+
}>;
|
|
22
|
+
};
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
/** SDK messageResource.get is the receive-side API, not im.image.get. */
|
|
26
|
+
export declare function resolveFeishuContent(client: ResourceClient, message: FeishuContentMessage, signal?: AbortSignal): Promise<{
|
|
27
|
+
text: string;
|
|
28
|
+
media: ImMedia[];
|
|
29
|
+
}>;
|
|
2
30
|
export interface FeishuConfig {
|
|
3
31
|
appId?: string;
|
|
4
32
|
appSecret?: string;
|
|
@@ -12,6 +40,6 @@ interface FeishuMention {
|
|
|
12
40
|
}
|
|
13
41
|
/** 群消息只有明确 mention 当前机器人本身才算 addressed;@ 其他成员不触发。 */
|
|
14
42
|
export declare function isFeishuBotMentioned(mentions: FeishuMention[] | undefined, botOpenId: string): boolean;
|
|
15
|
-
export declare function createFeishuChannel(id: 'feishu' | 'lark', config: FeishuConfig, log: (line: string) => void): ChannelAdapter | undefined;
|
|
43
|
+
export declare function createFeishuChannel(id: 'feishu' | 'lark', config: FeishuConfig, log: (line: string) => void, loadSdk?: () => Promise<typeof import('@larksuiteoapi/node-sdk')>): ChannelAdapter | undefined;
|
|
16
44
|
export {};
|
|
17
45
|
//# 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;
|
|
1
|
+
{"version":3,"file":"feishu.d.ts","sourceRoot":"","sources":["../../src/channels/feishu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAa,MAAM,oBAAoB,CAAA;AAM5E,UAAU,oBAAoB;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AACD,UAAU,cAAc;IACtB,EAAE,EAAE;QAAE,eAAe,EAAE;YAAE,GAAG,CAAC,IAAI,EAAE;gBAAE,IAAI,EAAE;oBAAE,UAAU,EAAE,MAAM,CAAC;oBAAC,QAAQ,EAAE,MAAM,CAAA;iBAAE,CAAC;gBAAC,MAAM,EAAE;oBAAE,IAAI,EAAE,MAAM,CAAA;iBAAE,CAAA;aAAE,GAAG,OAAO,CAAC;gBAAE,iBAAiB,IAAI,OAAO,aAAa,EAAE,QAAQ,CAAC;gBAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;aAAE,CAAC,CAAA;SAAE,CAAA;KAAE,CAAA;CACzN;AAKD,yEAAyE;AACzE,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAE,WAAyC,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC,CAiEhM;AAED,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,EAAE,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,cAAc,yBAAyB,CAAC,CAAC,GAAG,cAAc,GAAG,SAAS,CAuG3M"}
|
package/lib/channels/feishu.js
CHANGED
|
@@ -1,11 +1,106 @@
|
|
|
1
1
|
import { quietSdkLogger } from '../engine/quiet-logger.js';
|
|
2
|
+
import { KeyedSerialQueue } from '../engine/keyed-queue.js';
|
|
3
|
+
import { timeoutSignal } from '../engine/abort.js';
|
|
4
|
+
import { MAX_CHANNEL_IMAGES } from './channel-image-download.js';
|
|
5
|
+
const MAX_IMAGE_BYTES = 20 * 1024 * 1024;
|
|
6
|
+
// Shared across all images in one message, not renewed for each resource.
|
|
7
|
+
const MAX_MESSAGE_IMAGE_BYTES = MAX_IMAGE_BYTES;
|
|
8
|
+
/** SDK messageResource.get is the receive-side API, not im.image.get. */
|
|
9
|
+
export async function resolveFeishuContent(client, message, signal = AbortSignal.timeout(30_000)) {
|
|
10
|
+
const content = JSON.parse(message.content ?? '{}');
|
|
11
|
+
const keys = [];
|
|
12
|
+
const texts = [];
|
|
13
|
+
if (message.message_type === 'text')
|
|
14
|
+
texts.push(content.text ?? '');
|
|
15
|
+
else if (message.message_type === 'image') {
|
|
16
|
+
if (!content.image_key)
|
|
17
|
+
throw new Error('图片资源缺失');
|
|
18
|
+
keys.push(content.image_key);
|
|
19
|
+
}
|
|
20
|
+
else if (message.message_type === 'post') {
|
|
21
|
+
const post = content.content ? content : content.zh_cn ?? content.en_us ?? Object.values(content)[0];
|
|
22
|
+
if (!post || !Array.isArray(post.content))
|
|
23
|
+
throw new Error('富文本内容无效');
|
|
24
|
+
if (post.title)
|
|
25
|
+
texts.push(post.title);
|
|
26
|
+
for (const row of post.content) {
|
|
27
|
+
for (const item of row) {
|
|
28
|
+
if (item.tag === 'img') {
|
|
29
|
+
if (!item.image_key)
|
|
30
|
+
throw new Error('图片资源缺失');
|
|
31
|
+
keys.push(item.image_key);
|
|
32
|
+
}
|
|
33
|
+
else if (typeof item.text === 'string')
|
|
34
|
+
texts.push(item.text);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
else
|
|
39
|
+
throw new Error('暂不支持该消息类型,请发送文字或图片。');
|
|
40
|
+
if (keys.length > MAX_CHANNEL_IMAGES)
|
|
41
|
+
throw new Error('图片数量超过上限');
|
|
42
|
+
const media = [];
|
|
43
|
+
let totalBytes = 0;
|
|
44
|
+
for (const key of keys) {
|
|
45
|
+
if (totalBytes >= MAX_MESSAGE_IMAGE_BYTES)
|
|
46
|
+
throw new Error('图片累计大小超过上限');
|
|
47
|
+
if (!message.message_id)
|
|
48
|
+
throw new Error('图片消息 ID 缺失');
|
|
49
|
+
signal.throwIfAborted();
|
|
50
|
+
let stream;
|
|
51
|
+
let abort = () => { };
|
|
52
|
+
const aborted = new Promise((_, reject) => {
|
|
53
|
+
abort = () => { stream?.destroy(new Error('图片下载已取消或超时')); reject(new Error('图片下载已取消或超时')); };
|
|
54
|
+
signal.addEventListener('abort', abort, { once: true });
|
|
55
|
+
});
|
|
56
|
+
try {
|
|
57
|
+
const resource = await Promise.race([
|
|
58
|
+
client.im.messageResource.get({ path: { message_id: message.message_id, file_key: key }, params: { type: 'image' } }).then(resource => {
|
|
59
|
+
stream = resource.getReadableStream();
|
|
60
|
+
if (signal.aborted) {
|
|
61
|
+
stream.destroy();
|
|
62
|
+
throw new Error('图片下载已取消或超时');
|
|
63
|
+
}
|
|
64
|
+
return resource;
|
|
65
|
+
}), aborted,
|
|
66
|
+
]);
|
|
67
|
+
const consume = async () => {
|
|
68
|
+
const chunks = [];
|
|
69
|
+
let size = 0;
|
|
70
|
+
if (Number(resource.headers?.['content-length']) > MAX_IMAGE_BYTES)
|
|
71
|
+
throw new Error('图片超过 20 MB 上限');
|
|
72
|
+
if (Number(resource.headers?.['content-length']) > MAX_MESSAGE_IMAGE_BYTES - totalBytes)
|
|
73
|
+
throw new Error('图片累计大小超过上限');
|
|
74
|
+
for await (const chunk of stream) {
|
|
75
|
+
const bytes = Buffer.from(chunk);
|
|
76
|
+
size += bytes.length;
|
|
77
|
+
totalBytes += bytes.length;
|
|
78
|
+
if (totalBytes > MAX_MESSAGE_IMAGE_BYTES)
|
|
79
|
+
throw new Error('图片累计大小超过上限');
|
|
80
|
+
if (size > MAX_IMAGE_BYTES)
|
|
81
|
+
throw new Error('图片超过 20 MB 上限');
|
|
82
|
+
chunks.push(bytes);
|
|
83
|
+
}
|
|
84
|
+
if (!size)
|
|
85
|
+
throw new Error('图片为空');
|
|
86
|
+
return { kind: 'image', data: Buffer.concat(chunks), mediaType: resource.headers?.['content-type']?.split(';')[0] };
|
|
87
|
+
};
|
|
88
|
+
media.push(await Promise.race([consume(), aborted]));
|
|
89
|
+
}
|
|
90
|
+
finally {
|
|
91
|
+
signal.removeEventListener('abort', abort);
|
|
92
|
+
stream?.destroy();
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return { text: texts.join('\n'), media };
|
|
96
|
+
}
|
|
2
97
|
/** 群消息只有明确 mention 当前机器人本身才算 addressed;@ 其他成员不触发。 */
|
|
3
98
|
export function isFeishuBotMentioned(mentions, botOpenId) {
|
|
4
99
|
if (!botOpenId || !Array.isArray(mentions))
|
|
5
100
|
return false;
|
|
6
101
|
return mentions.some((mention) => mention.id?.open_id === botOpenId);
|
|
7
102
|
}
|
|
8
|
-
export function createFeishuChannel(id, config, log) {
|
|
103
|
+
export function createFeishuChannel(id, config, log, loadSdk) {
|
|
9
104
|
const appId = config.appId?.trim();
|
|
10
105
|
const appSecret = config.appSecret?.trim();
|
|
11
106
|
if (!appId || !appSecret)
|
|
@@ -14,57 +109,75 @@ export function createFeishuChannel(id, config, log) {
|
|
|
14
109
|
let client;
|
|
15
110
|
let ws;
|
|
16
111
|
let statusText = '未连接';
|
|
112
|
+
let lifecycle;
|
|
17
113
|
const label = id === 'lark' ? 'Lark' : '飞书';
|
|
18
114
|
return {
|
|
19
115
|
id,
|
|
20
116
|
label,
|
|
21
117
|
maxMessageLength: 4000,
|
|
22
118
|
async start() {
|
|
119
|
+
lifecycle?.abort();
|
|
120
|
+
const generation = new AbortController();
|
|
121
|
+
lifecycle = generation;
|
|
122
|
+
const current = () => lifecycle === generation && !generation.signal.aborted;
|
|
123
|
+
const incoming = new KeyedSerialQueue();
|
|
23
124
|
let sdk;
|
|
24
125
|
try {
|
|
25
|
-
sdk = await import('@larksuiteoapi/node-sdk');
|
|
126
|
+
sdk = await (loadSdk ? loadSdk() : import('@larksuiteoapi/node-sdk'));
|
|
26
127
|
}
|
|
27
128
|
catch {
|
|
28
129
|
throw new Error('缺少依赖 @larksuiteoapi/node-sdk');
|
|
29
130
|
}
|
|
30
131
|
const domain = id === 'lark' || config.domain === 'lark' ? 'https://open.larksuite.com' : undefined;
|
|
31
|
-
const logger = quietSdkLogger(log, id);
|
|
132
|
+
const logger = quietSdkLogger(() => log(`[${id}] SDK 请求或连接异常(敏感详情已隐藏)`), id);
|
|
32
133
|
const loggerLevel = sdk.LoggerLevel?.error ?? 1;
|
|
33
|
-
|
|
134
|
+
const httpInstance = Object.create(sdk.defaultHttpInstance);
|
|
135
|
+
httpInstance.request = (opts) => sdk.defaultHttpInstance.request({ ...opts, timeout: 30_000, maxRedirects: 0 });
|
|
136
|
+
client = new sdk.Client({ appId, appSecret, logger, loggerLevel, httpInstance, ...(domain ? { domain } : {}) });
|
|
34
137
|
const identity = await client.request({ url: '/open-apis/bot/v3/info', method: 'GET' });
|
|
35
138
|
const botOpenId = identity.bot?.open_id?.trim() ?? '';
|
|
36
139
|
if (!botOpenId)
|
|
37
140
|
throw new Error(`${id}: 无法获取机器人 open_id`);
|
|
38
141
|
const dispatcher = new sdk.EventDispatcher({}).register({
|
|
39
|
-
'im.message.receive_v1': (data) => {
|
|
142
|
+
'im.message.receive_v1': async (data) => {
|
|
40
143
|
const message = data.message;
|
|
41
144
|
if (!message)
|
|
42
145
|
return;
|
|
43
146
|
const group = message.chat_type === 'group';
|
|
44
147
|
const addressed = !group || isFeishuBotMentioned(message.mentions, botOpenId);
|
|
45
|
-
if (message.
|
|
46
|
-
|
|
47
|
-
|
|
148
|
+
if (!addressed || !message.chat_id || !current())
|
|
149
|
+
return;
|
|
150
|
+
const chatId = message.chat_id;
|
|
151
|
+
return incoming.run(chatId, async () => {
|
|
152
|
+
if (!current())
|
|
153
|
+
return;
|
|
154
|
+
let resolved;
|
|
155
|
+
try {
|
|
156
|
+
resolved = await resolveFeishuContent(client, message, timeoutSignal(30_000, generation.signal));
|
|
157
|
+
}
|
|
158
|
+
catch {
|
|
159
|
+
if (!current())
|
|
160
|
+
return;
|
|
161
|
+
log(`[${id}] 图片或消息读取失败`);
|
|
162
|
+
await client?.im.message.create({
|
|
48
163
|
params: { receive_id_type: 'chat_id' },
|
|
49
|
-
data: { receive_id: message.chat_id, msg_type: 'text', content: JSON.stringify({ text: '
|
|
50
|
-
}).catch((
|
|
164
|
+
data: { receive_id: message.chat_id, msg_type: 'text', content: JSON.stringify({ text: '图片或消息读取失败,请重发图片或发送文字。' }) },
|
|
165
|
+
}).catch(() => log(`[${id}] 媒体提示发送失败`));
|
|
166
|
+
return;
|
|
51
167
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
kind: group ? 'group' : 'dm',
|
|
66
|
-
addressed,
|
|
67
|
-
});
|
|
168
|
+
if (!current())
|
|
169
|
+
return;
|
|
170
|
+
await handler?.({
|
|
171
|
+
chatId,
|
|
172
|
+
userId: data.sender?.sender_id?.open_id,
|
|
173
|
+
text: resolved.text,
|
|
174
|
+
...(resolved.media.length ? { media: resolved.media } : {}),
|
|
175
|
+
messageId: message.message_id,
|
|
176
|
+
kind: group ? 'group' : 'dm',
|
|
177
|
+
addressed,
|
|
178
|
+
});
|
|
179
|
+
}).catch(() => { if (current())
|
|
180
|
+
log(`[${id}] 消息处理失败`); });
|
|
68
181
|
},
|
|
69
182
|
});
|
|
70
183
|
const wsClient = new sdk.WSClient({ appId, appSecret, logger, loggerLevel, ...(domain ? { domain } : {}) });
|
|
@@ -74,6 +187,8 @@ export function createFeishuChannel(id, config, log) {
|
|
|
74
187
|
log(`[${id}] WebSocket 长连接已启动`);
|
|
75
188
|
},
|
|
76
189
|
async stop() {
|
|
190
|
+
lifecycle?.abort();
|
|
191
|
+
lifecycle = undefined;
|
|
77
192
|
ws?.close({ force: true });
|
|
78
193
|
ws = undefined;
|
|
79
194
|
statusText = '已停止';
|