@dsh-overdrive/gateway 0.1.3 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapter.d.ts +7 -1
- package/dist/adapters/cli.d.ts +4 -1
- package/dist/adapters/cli.js +1 -1
- package/dist/adapters/cli.js.map +1 -1
- package/dist/adapters/dingtalk.d.ts +30 -1
- package/dist/adapters/dingtalk.js +97 -12
- package/dist/adapters/dingtalk.js.map +1 -1
- package/dist/adapters/discord.d.ts +4 -1
- package/dist/adapters/discord.js +4 -1
- package/dist/adapters/discord.js.map +1 -1
- package/dist/adapters/feishu.d.ts +13 -1
- package/dist/adapters/feishu.js +71 -11
- package/dist/adapters/feishu.js.map +1 -1
- package/dist/adapters/slack.d.ts +4 -1
- package/dist/adapters/slack.js +8 -3
- package/dist/adapters/slack.js.map +1 -1
- package/dist/adapters/telegram.d.ts +11 -2
- package/dist/adapters/telegram.js +22 -5
- package/dist/adapters/telegram.js.map +1 -1
- package/dist/adapters/wecom.d.ts +6 -1
- package/dist/adapters/wecom.js +12 -9
- package/dist/adapters/wecom.js.map +1 -1
- package/dist/adapters/whatsapp.d.ts +5 -2
- package/dist/adapters/whatsapp.js +16 -13
- package/dist/adapters/whatsapp.js.map +1 -1
- package/dist/asr.d.ts +19 -0
- package/dist/asr.js +63 -0
- package/dist/asr.js.map +1 -0
- package/dist/commands.d.ts +5 -0
- package/dist/commands.js +7 -0
- package/dist/commands.js.map +1 -1
- package/dist/config.d.ts +3 -0
- package/dist/config.js +3 -0
- package/dist/config.js.map +1 -1
- package/dist/index.d.ts +5 -0
- package/dist/index.js +45 -3
- package/dist/index.js.map +1 -1
- package/dist/pending-buttons.d.ts +19 -0
- package/dist/pending-buttons.js +40 -0
- package/dist/pending-buttons.js.map +1 -0
- package/dist/session.d.ts +6 -2
- package/dist/session.js +8 -3
- package/dist/session.js.map +1 -1
- package/package.json +3 -3
- package/src/adapter.ts +8 -1
- package/src/adapters/cli.ts +3 -3
- package/src/adapters/dingtalk.ts +108 -13
- package/src/adapters/discord.ts +6 -3
- package/src/adapters/feishu.ts +77 -12
- package/src/adapters/slack.ts +14 -4
- package/src/adapters/telegram.ts +29 -8
- package/src/adapters/wecom.ts +13 -11
- package/src/adapters/whatsapp.ts +18 -15
- package/src/asr.ts +83 -0
- package/src/commands.ts +8 -1
- package/src/config.ts +6 -0
- package/src/index.ts +49 -3
- package/src/pending-buttons.ts +45 -0
- package/src/session.ts +9 -3
- package/test/adapters.dingtalk.test.ts +40 -1
- package/test/adapters.feishu.test.ts +37 -1
- package/test/asr.test.ts +77 -0
- package/test/commands.test.ts +6 -0
- package/test/multi.test.ts +29 -8
- package/test/pending-buttons.test.ts +61 -0
- package/test/session.test.ts +7 -2
- package/test/streaming.test.ts +162 -162
package/dist/adapter.d.ts
CHANGED
|
@@ -17,6 +17,11 @@ export interface OutboundPayload {
|
|
|
17
17
|
text: string;
|
|
18
18
|
buttons?: OutboundButton[];
|
|
19
19
|
}
|
|
20
|
+
/** 按钮回执的点击者身份(用于白名单校验)。chatId 在个别平台回调中可能缺失,缺失时按未授权处理(fail-closed)。 */
|
|
21
|
+
export interface ReplySender {
|
|
22
|
+
chatId: string;
|
|
23
|
+
userId: string;
|
|
24
|
+
}
|
|
20
25
|
/** 平台适配器契约:M2/M3 的 WhatsApp/Telegram/… 都实现它。 */
|
|
21
26
|
export interface Adapter {
|
|
22
27
|
readonly id: string;
|
|
@@ -29,5 +34,6 @@ export interface Adapter {
|
|
|
29
34
|
connected: boolean;
|
|
30
35
|
};
|
|
31
36
|
onMessage(cb: (msg: NormalizedMessage) => void): void;
|
|
32
|
-
|
|
37
|
+
/** 按钮点击回执:buttonId + 点击者身份。身份缺失即传空字符串,由上层按未授权处理。 */
|
|
38
|
+
onReply(cb: (buttonId: string, sender: ReplySender) => void): void;
|
|
33
39
|
}
|
package/dist/adapters/cli.d.ts
CHANGED
|
@@ -8,7 +8,10 @@ export declare class CliAdapter implements Adapter {
|
|
|
8
8
|
connect(): Promise<void>;
|
|
9
9
|
send(_chatId: string, payload: OutboundPayload): Promise<void>;
|
|
10
10
|
onMessage(cb: (msg: NormalizedMessage) => void): void;
|
|
11
|
-
onReply(cb: (buttonId: string
|
|
11
|
+
onReply(cb: (buttonId: string, sender: {
|
|
12
|
+
chatId: string;
|
|
13
|
+
userId: string;
|
|
14
|
+
}) => void): void;
|
|
12
15
|
/** CLI 是本地进程内适配器:恒为已连接。 */
|
|
13
16
|
status(): {
|
|
14
17
|
connected: boolean;
|
package/dist/adapters/cli.js
CHANGED
|
@@ -13,7 +13,7 @@ export class CliAdapter {
|
|
|
13
13
|
return;
|
|
14
14
|
const btn = trimmed.match(/^\/btn\s+(\S+)$/i);
|
|
15
15
|
if (btn) {
|
|
16
|
-
this.replyCb?.(btn[1]);
|
|
16
|
+
this.replyCb?.(btn[1], { chatId: 'cli', userId: 'local' });
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
19
|
this.messageCb?.({ chatId: 'cli', userId: 'local', text: trimmed });
|
package/dist/adapters/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/adapters/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,2CAA2C;AAC3C,MAAM,OAAO,UAAU;IACZ,EAAE,GAAG,KAAK,CAAC;IACZ,SAAS,CAAoC;IAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/adapters/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,2CAA2C;AAC3C,MAAM,OAAO,UAAU;IACZ,EAAE,GAAG,KAAK,CAAC;IACZ,SAAS,CAAoC;IAC7C,OAAO,CAA0E;IACjF,EAAE,CAAsC;IAEhD,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,EAAE,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,OAAO;gBAAE,OAAO;YACrB,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC9C,IAAI,GAAG,EAAE,CAAC;gBACR,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC3D,OAAO;YACT,CAAC;YACD,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAe,EAAE,OAAwB;QAClD,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,cAAc,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,SAAS,CAAC,EAAoC,IAAU,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;IAC9E,OAAO,CAAC,EAA0E,IAAU,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;IAChH,2BAA2B;IAC3B,MAAM,KAA6B,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;CACjE"}
|
|
@@ -15,6 +15,32 @@ export declare function buildReplyBody(text: string): {
|
|
|
15
15
|
};
|
|
16
16
|
export declare function buildNumberedText(text: string, buttons: OutboundButton[]): string;
|
|
17
17
|
export declare function matchNumberedButton(text: string, buttons: OutboundButton[]): OutboundButton | undefined;
|
|
18
|
+
/** 按钮 id("approve:<reqId>" / "reject:<reqId>")→ 卡片回调载荷 JSON 字符串。 */
|
|
19
|
+
export declare function buttonCallbackData(button: OutboundButton): string;
|
|
20
|
+
/** 钉钉 actionCard 消息体(Roadmap v0.2)。按钮回调经 TOPIC_CARD 走 Stream 返回。 */
|
|
21
|
+
export declare function buildActionCard(text: string, buttons: OutboundButton[]): {
|
|
22
|
+
msgtype: 'actionCard';
|
|
23
|
+
actionCard: {
|
|
24
|
+
title: string;
|
|
25
|
+
text: string;
|
|
26
|
+
btnOrientation: string;
|
|
27
|
+
btns: Array<{
|
|
28
|
+
title: string;
|
|
29
|
+
actionURL: string;
|
|
30
|
+
}>;
|
|
31
|
+
};
|
|
32
|
+
};
|
|
33
|
+
export interface CardCallbackResult {
|
|
34
|
+
buttonId: string;
|
|
35
|
+
chatId?: string;
|
|
36
|
+
userId?: string;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* 钉钉卡片回调载荷 → { buttonId, chatId?, userId? }。
|
|
40
|
+
* Stream 模式下回调 JSON 的字段名(cardCallbackData / params / cardActionData,以及会话/用户字段)
|
|
41
|
+
* 在不同卡片版本有差异,这里做多路径深度兜底解析;真机验证后可按实际字段收敛。找不到返回 null。
|
|
42
|
+
*/
|
|
43
|
+
export declare function parseCardCallback(raw: unknown): CardCallbackResult | null;
|
|
18
44
|
export interface DingTalkAdapterOptions {
|
|
19
45
|
clientId: string;
|
|
20
46
|
clientSecret: string;
|
|
@@ -33,7 +59,10 @@ export declare class DingTalkAdapter implements Adapter {
|
|
|
33
59
|
connect(): Promise<void>;
|
|
34
60
|
send(chatId: string, payload: OutboundPayload): Promise<void>;
|
|
35
61
|
onMessage(cb: (msg: NormalizedMessage) => void): void;
|
|
36
|
-
onReply(cb: (buttonId: string
|
|
62
|
+
onReply(cb: (buttonId: string, sender: {
|
|
63
|
+
chatId: string;
|
|
64
|
+
userId: string;
|
|
65
|
+
}) => void): void;
|
|
37
66
|
status(): {
|
|
38
67
|
connected: boolean;
|
|
39
68
|
};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { PendingButtons } from '../pending-buttons.js';
|
|
2
|
+
import { DWClient, TOPIC_CARD, TOPIC_ROBOT } from 'dingtalk-stream-sdk-nodejs';
|
|
2
3
|
export function parseBotMessage(data) {
|
|
3
4
|
if (data.msgtype !== 'text' || !data.text?.content)
|
|
4
5
|
return null;
|
|
@@ -26,6 +27,66 @@ export function matchNumberedButton(text, buttons) {
|
|
|
26
27
|
return undefined;
|
|
27
28
|
return buttons[n - 1];
|
|
28
29
|
}
|
|
30
|
+
/** 按钮 id("approve:<reqId>" / "reject:<reqId>")→ 卡片回调载荷 JSON 字符串。 */
|
|
31
|
+
export function buttonCallbackData(button) {
|
|
32
|
+
const idx = button.id.indexOf(':');
|
|
33
|
+
return JSON.stringify({
|
|
34
|
+
action: idx >= 0 ? button.id.slice(0, idx) : button.id,
|
|
35
|
+
reqId: idx >= 0 ? button.id.slice(idx + 1) : '',
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
/** 钉钉 actionCard 消息体(Roadmap v0.2)。按钮回调经 TOPIC_CARD 走 Stream 返回。 */
|
|
39
|
+
export function buildActionCard(text, buttons) {
|
|
40
|
+
return {
|
|
41
|
+
msgtype: 'actionCard',
|
|
42
|
+
actionCard: {
|
|
43
|
+
title: '需要批准',
|
|
44
|
+
text,
|
|
45
|
+
btnOrientation: '1',
|
|
46
|
+
btns: buttons.map((b) => ({
|
|
47
|
+
title: b.label,
|
|
48
|
+
actionURL: `dingtalk://dingtalkclient/action/openapp?cardCallbackData=${encodeURIComponent(buttonCallbackData(b))}`,
|
|
49
|
+
})),
|
|
50
|
+
},
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* 钉钉卡片回调载荷 → { buttonId, chatId?, userId? }。
|
|
55
|
+
* Stream 模式下回调 JSON 的字段名(cardCallbackData / params / cardActionData,以及会话/用户字段)
|
|
56
|
+
* 在不同卡片版本有差异,这里做多路径深度兜底解析;真机验证后可按实际字段收敛。找不到返回 null。
|
|
57
|
+
*/
|
|
58
|
+
export function parseCardCallback(raw) {
|
|
59
|
+
let buttonId = null;
|
|
60
|
+
let chatId;
|
|
61
|
+
let userId;
|
|
62
|
+
const visit = (obj, depth) => {
|
|
63
|
+
if (depth > 5 || !obj || typeof obj !== 'object')
|
|
64
|
+
return;
|
|
65
|
+
for (const [key, value] of Object.entries(obj)) {
|
|
66
|
+
if (!buttonId && typeof value === 'string' && (key === 'cardCallbackData' || key === 'params' || key === 'cardActionData')) {
|
|
67
|
+
try {
|
|
68
|
+
const parsed = JSON.parse(value);
|
|
69
|
+
if ((parsed.action === 'approve' || parsed.action === 'reject') && typeof parsed.reqId === 'string' && parsed.reqId) {
|
|
70
|
+
buttonId = `${parsed.action}:${parsed.reqId}`;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
/* 该字段不是 JSON 载荷,继续往下找 */
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
if (!chatId && typeof value === 'string' && (key === 'conversationId' || key === 'conversation_id') && value) {
|
|
78
|
+
chatId = value;
|
|
79
|
+
}
|
|
80
|
+
if (!userId && typeof value === 'string' && (key === 'senderStaffId' || key === 'senderId' || key === 'userid' || key === 'userId') && value) {
|
|
81
|
+
userId = value;
|
|
82
|
+
}
|
|
83
|
+
if (typeof value === 'object')
|
|
84
|
+
visit(value, depth + 1);
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
visit(raw, 0);
|
|
88
|
+
return buttonId ? { buttonId, chatId, userId } : null;
|
|
89
|
+
}
|
|
29
90
|
export class DingTalkAdapter {
|
|
30
91
|
opts;
|
|
31
92
|
id = 'dingtalk';
|
|
@@ -33,7 +94,7 @@ export class DingTalkAdapter {
|
|
|
33
94
|
connected = false;
|
|
34
95
|
messageCb;
|
|
35
96
|
replyCb;
|
|
36
|
-
pendingButtons = new
|
|
97
|
+
pendingButtons = new PendingButtons();
|
|
37
98
|
/** conversationId → 最近的 sessionWebhook(回复通道,过期由钉钉侧管理) */
|
|
38
99
|
webhooks = new Map();
|
|
39
100
|
constructor(opts) {
|
|
@@ -54,17 +115,30 @@ export class DingTalkAdapter {
|
|
|
54
115
|
if (!parsed)
|
|
55
116
|
return;
|
|
56
117
|
this.webhooks.set(parsed.chatId, parsed.sessionWebhook);
|
|
57
|
-
const
|
|
58
|
-
if (
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
this.pendingButtons.delete(parsed.chatId);
|
|
62
|
-
this.replyCb?.(button.id);
|
|
63
|
-
return;
|
|
64
|
-
}
|
|
118
|
+
const button = this.pendingButtons.match(parsed.chatId, parsed.text);
|
|
119
|
+
if (button) {
|
|
120
|
+
this.replyCb?.(button.id, { chatId: parsed.chatId, userId: parsed.userId });
|
|
121
|
+
return;
|
|
65
122
|
}
|
|
66
123
|
this.messageCb?.({ chatId: parsed.chatId, userId: parsed.userId, text: parsed.text });
|
|
67
124
|
});
|
|
125
|
+
// 原生 actionCard 按钮回调(Stream 模式,Roadmap v0.2)
|
|
126
|
+
client.registerCallbackListener(TOPIC_CARD, (msg) => {
|
|
127
|
+
let data;
|
|
128
|
+
try {
|
|
129
|
+
data = JSON.parse(msg.data);
|
|
130
|
+
}
|
|
131
|
+
catch {
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
const result = parseCardCallback(data);
|
|
135
|
+
if (result) {
|
|
136
|
+
this.replyCb?.(result.buttonId, {
|
|
137
|
+
chatId: result.chatId ?? result.userId ?? '',
|
|
138
|
+
userId: result.userId ?? '',
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
});
|
|
68
142
|
await client.connect();
|
|
69
143
|
this.connected = true;
|
|
70
144
|
console.log('[dingtalk] 钉钉 Stream 已连接');
|
|
@@ -73,8 +147,19 @@ export class DingTalkAdapter {
|
|
|
73
147
|
const webhook = this.webhooks.get(chatId);
|
|
74
148
|
if (!webhook)
|
|
75
149
|
throw new Error(`钉钉会话 ${chatId} 无可用 sessionWebhook(先让用户发一条消息)`);
|
|
76
|
-
if (payload.buttons?.length)
|
|
77
|
-
this.pendingButtons.set(chatId, payload.buttons);
|
|
150
|
+
if (payload.buttons?.length) {
|
|
151
|
+
this.pendingButtons.set(chatId, payload.buttons); // 卡片之外仍支持编号回复兜底
|
|
152
|
+
const res = await fetch(webhook, {
|
|
153
|
+
method: 'POST',
|
|
154
|
+
headers: { 'content-type': 'application/json' },
|
|
155
|
+
body: JSON.stringify(buildActionCard(payload.text, payload.buttons)),
|
|
156
|
+
});
|
|
157
|
+
if (!res.ok) {
|
|
158
|
+
const body = await res.text();
|
|
159
|
+
throw new Error(`钉钉回发失败 ${res.status}: ${body.slice(0, 200)}`);
|
|
160
|
+
}
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
78
163
|
const text = buildNumberedText(payload.text, payload.buttons ?? []);
|
|
79
164
|
const res = await fetch(webhook, {
|
|
80
165
|
method: 'POST',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dingtalk.js","sourceRoot":"","sources":["../../src/adapters/dingtalk.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAqB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"dingtalk.js","sourceRoot":"","sources":["../../src/adapters/dingtalk.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,10 @@ export declare class DiscordAdapter implements Adapter {
|
|
|
31
31
|
connect(): Promise<void>;
|
|
32
32
|
send(chatId: string, payload: OutboundPayload): Promise<void>;
|
|
33
33
|
onMessage(cb: (msg: NormalizedMessage) => void): void;
|
|
34
|
-
onReply(cb: (buttonId: string
|
|
34
|
+
onReply(cb: (buttonId: string, sender: {
|
|
35
|
+
chatId: string;
|
|
36
|
+
userId: string;
|
|
37
|
+
}) => void): void;
|
|
35
38
|
status(): {
|
|
36
39
|
connected: boolean;
|
|
37
40
|
};
|
package/dist/adapters/discord.js
CHANGED
|
@@ -65,7 +65,10 @@ export class DiscordAdapter {
|
|
|
65
65
|
return;
|
|
66
66
|
const button = interaction;
|
|
67
67
|
await button.deferUpdate().catch(() => undefined);
|
|
68
|
-
this.replyCb?.(button.customId
|
|
68
|
+
this.replyCb?.(button.customId, {
|
|
69
|
+
chatId: button.channelId,
|
|
70
|
+
userId: button.user.id,
|
|
71
|
+
});
|
|
69
72
|
});
|
|
70
73
|
}
|
|
71
74
|
async send(chatId, payload) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discord.js","sourceRoot":"","sources":["../../src/adapters/discord.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,WAAW,EACX,MAAM,EACN,MAAM,EACN,iBAAiB,GAGlB,MAAM,YAAY,CAAC;AAYpB,kEAAkE;AAClE,MAAM,UAAU,oBAAoB,CAAC,GAAsB;IACzD,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;AACnC,CAAC;AAID,SAAS,iBAAiB,CAAC,IAAa;IACtC,IAAI,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/C,IAAI,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/C,IAAI,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAsB;IAC5D,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACrE,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;IAC/B,MAAM,GAAG,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAC/B,MAAM,GAAG,GAAsB,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC;IACtF,IAAI,GAAG;QAAE,GAAG,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC;IACzF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAyB;IACzD,OAAO,CAAC;YACN,IAAI,EAAE,CAAC;YACP,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC9B,IAAI,EAAE,CAAC;gBACP,SAAS,EAAE,CAAC,CAAC,EAAE;gBACf,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,KAAK,EAAE,CAAC,EAAE,sBAAsB;aACjC,CAAC,CAAC;SACJ,CAAC,CAAC;AACL,CAAC;AAMD,MAAM,OAAO,cAAc;IAChB,EAAE,GAAG,SAAS,CAAC;IACP,MAAM,CAAS;IACxB,SAAS,GAAG,KAAK,CAAC;IAClB,SAAS,CAAoC;IAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"discord.js","sourceRoot":"","sources":["../../src/adapters/discord.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,15 @@ export interface FeishuReceivePayload {
|
|
|
17
17
|
export declare function parseFeishuTextMessage(payload: FeishuReceivePayload): NormalizedMessage | null;
|
|
18
18
|
export declare function buildNumberedText(text: string, buttons: OutboundButton[]): string;
|
|
19
19
|
export declare function matchNumberedButton(text: string, buttons: OutboundButton[]): OutboundButton | undefined;
|
|
20
|
+
/** 按钮 id("approve:<reqId>" / "reject:<reqId>")→ 卡片按钮 value。 */
|
|
21
|
+
export declare function buttonValue(button: OutboundButton): {
|
|
22
|
+
action: string;
|
|
23
|
+
reqId: string;
|
|
24
|
+
};
|
|
25
|
+
/** 交互卡片 JSON(msg_type: interactive)。原生按钮点击走 card.action.trigger 回调。 */
|
|
26
|
+
export declare function buildApprovalCard(text: string, buttons: OutboundButton[]): string;
|
|
27
|
+
/** 卡片回调 value → 按钮 id("approve:<reqId>");缺字段返回 null。 */
|
|
28
|
+
export declare function cardActionToButtonId(value: unknown): string | null;
|
|
20
29
|
export interface FeishuAdapterOptions {
|
|
21
30
|
appId: string;
|
|
22
31
|
appSecret: string;
|
|
@@ -36,7 +45,10 @@ export declare class FeishuAdapter implements Adapter {
|
|
|
36
45
|
connect(): Promise<void>;
|
|
37
46
|
send(chatId: string, payload: OutboundPayload): Promise<void>;
|
|
38
47
|
onMessage(cb: (msg: NormalizedMessage) => void): void;
|
|
39
|
-
onReply(cb: (buttonId: string
|
|
48
|
+
onReply(cb: (buttonId: string, sender: {
|
|
49
|
+
chatId: string;
|
|
50
|
+
userId: string;
|
|
51
|
+
}) => void): void;
|
|
40
52
|
status(): {
|
|
41
53
|
connected: boolean;
|
|
42
54
|
};
|
package/dist/adapters/feishu.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import lark from '@larksuiteoapi/node-sdk';
|
|
2
|
+
import { PendingButtons } from '../pending-buttons.js';
|
|
2
3
|
// @larksuiteoapi/node-sdk 是 CommonJS 包(main=lib/index.js,无 "type":"module"):
|
|
3
4
|
// Node 原生 ESM 下必须 default 导入后解构(同 M2b 的 @slack/bolt 处理)。
|
|
4
5
|
const { Client, WSClient, EventDispatcher } = lark;
|
|
@@ -32,6 +33,41 @@ export function matchNumberedButton(text, buttons) {
|
|
|
32
33
|
return undefined;
|
|
33
34
|
return buttons[n - 1];
|
|
34
35
|
}
|
|
36
|
+
/** 按钮 id("approve:<reqId>" / "reject:<reqId>")→ 卡片按钮 value。 */
|
|
37
|
+
export function buttonValue(button) {
|
|
38
|
+
const idx = button.id.indexOf(':');
|
|
39
|
+
return {
|
|
40
|
+
action: idx >= 0 ? button.id.slice(0, idx) : button.id,
|
|
41
|
+
reqId: idx >= 0 ? button.id.slice(idx + 1) : '',
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
/** 交互卡片 JSON(msg_type: interactive)。原生按钮点击走 card.action.trigger 回调。 */
|
|
45
|
+
export function buildApprovalCard(text, buttons) {
|
|
46
|
+
const actions = buttons.map((b) => ({
|
|
47
|
+
tag: 'button',
|
|
48
|
+
text: { tag: 'plain_text', content: b.label },
|
|
49
|
+
type: b.id.startsWith('approve:') ? 'primary' : 'default',
|
|
50
|
+
value: buttonValue(b),
|
|
51
|
+
}));
|
|
52
|
+
const card = {
|
|
53
|
+
config: { wide_screen_mode: true },
|
|
54
|
+
header: { title: { tag: 'plain_text', content: text.slice(0, 60) }, template: 'blue' },
|
|
55
|
+
elements: [
|
|
56
|
+
{ tag: 'div', text: { tag: 'lark_md', content: text } },
|
|
57
|
+
{ tag: 'action', actions },
|
|
58
|
+
],
|
|
59
|
+
};
|
|
60
|
+
return JSON.stringify(card);
|
|
61
|
+
}
|
|
62
|
+
/** 卡片回调 value → 按钮 id("approve:<reqId>");缺字段返回 null。 */
|
|
63
|
+
export function cardActionToButtonId(value) {
|
|
64
|
+
if (!value || typeof value !== 'object')
|
|
65
|
+
return null;
|
|
66
|
+
const { action, reqId } = value;
|
|
67
|
+
if ((action !== 'approve' && action !== 'reject') || typeof reqId !== 'string' || !reqId)
|
|
68
|
+
return null;
|
|
69
|
+
return `${action}:${reqId}`;
|
|
70
|
+
}
|
|
35
71
|
export class FeishuAdapter {
|
|
36
72
|
opts;
|
|
37
73
|
id = 'feishu';
|
|
@@ -40,7 +76,7 @@ export class FeishuAdapter {
|
|
|
40
76
|
connected = false;
|
|
41
77
|
messageCb;
|
|
42
78
|
replyCb;
|
|
43
|
-
pendingButtons = new
|
|
79
|
+
pendingButtons = new PendingButtons();
|
|
44
80
|
/** chatId → 最近一条入站消息的 message_id(send 优先 reply,缺失则 create 兜底) */
|
|
45
81
|
lastMessageIds = new Map();
|
|
46
82
|
constructor(opts) {
|
|
@@ -58,17 +94,25 @@ export class FeishuAdapter {
|
|
|
58
94
|
if (!normalized)
|
|
59
95
|
return;
|
|
60
96
|
const chatId = normalized.chatId;
|
|
61
|
-
const
|
|
62
|
-
if (
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
this.pendingButtons.delete(chatId);
|
|
66
|
-
this.replyCb?.(button.id);
|
|
67
|
-
return;
|
|
68
|
-
}
|
|
97
|
+
const button = this.pendingButtons.match(chatId, normalized.text);
|
|
98
|
+
if (button) {
|
|
99
|
+
this.replyCb?.(button.id, { chatId, userId: normalized.userId });
|
|
100
|
+
return;
|
|
69
101
|
}
|
|
70
102
|
this.messageCb?.(normalized);
|
|
71
103
|
},
|
|
104
|
+
// 原生交互卡片按钮回调 → 审批应答(Roadmap v0.2)
|
|
105
|
+
// 载荷字段(operator.open_id / context.open_chat_id)取自官方卡片回调事件;
|
|
106
|
+
// 个别版本字段名可能不同 —— 拿不到身份时上层按未授权处理(fail-closed),编号回复兜底不受影响。
|
|
107
|
+
'card.action.trigger': async (data) => {
|
|
108
|
+
const buttonId = cardActionToButtonId(data?.action?.value);
|
|
109
|
+
if (buttonId) {
|
|
110
|
+
this.replyCb?.(buttonId, {
|
|
111
|
+
chatId: data?.context?.open_chat_id ?? '',
|
|
112
|
+
userId: data?.operator?.open_id ?? '',
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
},
|
|
72
116
|
});
|
|
73
117
|
this.ws = new WSClient({
|
|
74
118
|
appId: this.opts.appId,
|
|
@@ -80,8 +124,24 @@ export class FeishuAdapter {
|
|
|
80
124
|
console.log('[feishu] 飞书长连接已建立');
|
|
81
125
|
}
|
|
82
126
|
async send(chatId, payload) {
|
|
83
|
-
if (payload.buttons?.length)
|
|
84
|
-
this.pendingButtons.set(chatId, payload.buttons);
|
|
127
|
+
if (payload.buttons?.length) {
|
|
128
|
+
this.pendingButtons.set(chatId, payload.buttons); // 卡片之外仍支持编号回复兜底
|
|
129
|
+
const content = buildApprovalCard(payload.text, payload.buttons);
|
|
130
|
+
const messageId = this.lastMessageIds.get(chatId);
|
|
131
|
+
if (messageId) {
|
|
132
|
+
await this.client.im.message.reply({
|
|
133
|
+
path: { message_id: messageId },
|
|
134
|
+
data: { msg_type: 'interactive', content },
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
await this.client.im.message.create({
|
|
139
|
+
params: { receive_id_type: 'chat_id' },
|
|
140
|
+
data: { receive_id: chatId, msg_type: 'interactive', content },
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
85
145
|
const text = buildNumberedText(payload.text, payload.buttons ?? []);
|
|
86
146
|
const content = JSON.stringify({ text });
|
|
87
147
|
const messageId = this.lastMessageIds.get(chatId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feishu.js","sourceRoot":"","sources":["../../src/adapters/feishu.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"feishu.js","sourceRoot":"","sources":["../../src/adapters/feishu.ts"],"names":[],"mappings":"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"}
|
package/dist/adapters/slack.d.ts
CHANGED
|
@@ -28,7 +28,10 @@ export declare class SlackAdapter implements Adapter {
|
|
|
28
28
|
connect(): Promise<void>;
|
|
29
29
|
send(chatId: string, payload: OutboundPayload): Promise<void>;
|
|
30
30
|
onMessage(cb: (msg: NormalizedMessage) => void): void;
|
|
31
|
-
onReply(cb: (buttonId: string
|
|
31
|
+
onReply(cb: (buttonId: string, sender: {
|
|
32
|
+
chatId: string;
|
|
33
|
+
userId: string;
|
|
34
|
+
}) => void): void;
|
|
32
35
|
status(): {
|
|
33
36
|
connected: boolean;
|
|
34
37
|
};
|
package/dist/adapters/slack.js
CHANGED
|
@@ -60,9 +60,14 @@ export class SlackAdapter {
|
|
|
60
60
|
});
|
|
61
61
|
this.app.action(/^approve:|^reject:/, async ({ ack, body, respond }) => {
|
|
62
62
|
await ack();
|
|
63
|
-
const
|
|
64
|
-
|
|
65
|
-
|
|
63
|
+
const b = body;
|
|
64
|
+
const action = b.actions?.[0];
|
|
65
|
+
if (action?.value) {
|
|
66
|
+
this.replyCb?.(action.value, {
|
|
67
|
+
chatId: b.channel?.id ?? '',
|
|
68
|
+
userId: b.user?.id ?? '',
|
|
69
|
+
});
|
|
70
|
+
}
|
|
66
71
|
await respond({ text: '处理中…', replace_original: false }).catch(() => undefined);
|
|
67
72
|
});
|
|
68
73
|
await this.app.start(0); // Socket Mode 不需要端口;start(0) 仅建立连接
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slack.js","sourceRoot":"","sources":["../../src/adapters/slack.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAG/B,kEAAkE;AAClE,oEAAoE;AACpE,oBAAoB;AACpB,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAarB,+DAA+D;AAC/D,MAAM,UAAU,YAAY,CAAC,GAAoB;IAC/C,OAAO,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC;AACrC,CAAC;AAID,SAAS,iBAAiB,CAAC,IAAa;IACtC,IAAI,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/C,IAAI,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/C,IAAI,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAoB;IACxD,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,KAAK,aAAa,IAAI,GAAG,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAC1F,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;IAC5B,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAC/B,MAAM,GAAG,GAAsB,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IAC/E,IAAI,GAAG;QAAE,GAAG,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IAChF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,OAAyB;IACjE,MAAM,MAAM,GAAc,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAChF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC5B,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,CAAC,CAAC,EAAE;gBACX,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE;aAC5C,CAAC,CAAC;SACJ,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AASD,MAAM,OAAO,YAAY;IACd,EAAE,GAAG,OAAO,CAAC;IACtB,wDAAwD;IACvC,GAAG,CAA2B;IACvC,SAAS,GAAG,KAAK,CAAC;IAClB,SAAS,CAAoC;IAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"slack.js","sourceRoot":"","sources":["../../src/adapters/slack.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,11 @@ export interface RawTelegramMessage {
|
|
|
14
14
|
}>;
|
|
15
15
|
voice?: {
|
|
16
16
|
file_id?: string;
|
|
17
|
+
mime_type?: string;
|
|
17
18
|
};
|
|
18
19
|
audio?: {
|
|
19
20
|
file_id?: string;
|
|
21
|
+
mime_type?: string;
|
|
20
22
|
};
|
|
21
23
|
video?: {
|
|
22
24
|
file_id?: string;
|
|
@@ -30,6 +32,10 @@ export interface RawTelegramMessage {
|
|
|
30
32
|
export declare function telegramPhotoFileId(photo: Array<{
|
|
31
33
|
file_id?: string;
|
|
32
34
|
}>): string | undefined;
|
|
35
|
+
/** 纯函数:语音消息的 file_id(voice 或 audio);无返回 undefined。 */
|
|
36
|
+
export declare function telegramVoiceFileId(raw: RawTelegramMessage): string | undefined;
|
|
37
|
+
/** 纯函数:语音消息的 MIME(voice 优先,audio 兜底)。 */
|
|
38
|
+
export declare function telegramVoiceMime(raw: RawTelegramMessage): string | undefined;
|
|
33
39
|
/** 纯函数:Telegram 文件下载 URL 模板。file_path 需 getFile(file_id) 换取(真实调用在 adapter 薄层)。 */
|
|
34
40
|
export declare function telegramImageUrl(token: string, filePath: string): string;
|
|
35
41
|
export declare function normalizeTelegramMessage(raw: RawTelegramMessage): NormalizedMessage | null;
|
|
@@ -46,11 +52,14 @@ export declare class TelegramAdapter implements Adapter {
|
|
|
46
52
|
private replyCb?;
|
|
47
53
|
constructor(opts: TelegramAdapterOptions);
|
|
48
54
|
connect(): Promise<void>;
|
|
49
|
-
/** 薄层:photo → getFile(file_id) 换 file_path → 下载 URL 填充 msg.media.url(纯函数只做模板)。 */
|
|
55
|
+
/** 薄层:photo/voice/audio → getFile(file_id) 换 file_path → 下载 URL 填充 msg.media.url(纯函数只做模板)。 */
|
|
50
56
|
private handleMessage;
|
|
51
57
|
send(chatId: string, payload: OutboundPayload): Promise<void>;
|
|
52
58
|
onMessage(cb: (msg: NormalizedMessage) => void): void;
|
|
53
|
-
onReply(cb: (buttonId: string
|
|
59
|
+
onReply(cb: (buttonId: string, sender: {
|
|
60
|
+
chatId: string;
|
|
61
|
+
userId: string;
|
|
62
|
+
}) => void): void;
|
|
54
63
|
status(): {
|
|
55
64
|
connected: boolean;
|
|
56
65
|
};
|
|
@@ -3,6 +3,14 @@ import { Bot, InlineKeyboard } from 'grammy';
|
|
|
3
3
|
export function telegramPhotoFileId(photo) {
|
|
4
4
|
return photo[photo.length - 1]?.file_id;
|
|
5
5
|
}
|
|
6
|
+
/** 纯函数:语音消息的 file_id(voice 或 audio);无返回 undefined。 */
|
|
7
|
+
export function telegramVoiceFileId(raw) {
|
|
8
|
+
return raw.message?.voice?.file_id ?? raw.message?.audio?.file_id;
|
|
9
|
+
}
|
|
10
|
+
/** 纯函数:语音消息的 MIME(voice 优先,audio 兜底)。 */
|
|
11
|
+
export function telegramVoiceMime(raw) {
|
|
12
|
+
return raw.message?.voice?.mime_type ?? raw.message?.audio?.mime_type;
|
|
13
|
+
}
|
|
6
14
|
/** 纯函数:Telegram 文件下载 URL 模板。file_path 需 getFile(file_id) 换取(真实调用在 adapter 薄层)。 */
|
|
7
15
|
export function telegramImageUrl(token, filePath) {
|
|
8
16
|
return `https://api.telegram.org/file/bot${token}/${filePath}`;
|
|
@@ -17,8 +25,9 @@ export function normalizeTelegramMessage(raw) {
|
|
|
17
25
|
let media;
|
|
18
26
|
if (msg.photo?.length)
|
|
19
27
|
media = { kind: 'image' }; // url 由 adapter getFile 薄层填充
|
|
20
|
-
else if (msg.voice || msg.audio)
|
|
21
|
-
media = { kind: 'voice' };
|
|
28
|
+
else if (msg.voice || msg.audio) {
|
|
29
|
+
media = { kind: 'voice', mime: telegramVoiceMime(raw) }; // url 由 adapter getFile 薄层填充(ASR 用)
|
|
30
|
+
}
|
|
22
31
|
else if (msg.video)
|
|
23
32
|
media = { kind: 'video' };
|
|
24
33
|
else if (msg.document)
|
|
@@ -54,17 +63,25 @@ export class TelegramAdapter {
|
|
|
54
63
|
this.bot.on('callback_query:data', async (ctx) => {
|
|
55
64
|
const data = ctx.callbackQuery.data;
|
|
56
65
|
await ctx.answerCallbackQuery().catch(() => undefined);
|
|
57
|
-
|
|
66
|
+
const chat = ctx.callbackQuery.message?.chat;
|
|
67
|
+
this.replyCb?.(data, {
|
|
68
|
+
chatId: String(chat?.id ?? ''),
|
|
69
|
+
userId: String(ctx.callbackQuery.from.id),
|
|
70
|
+
});
|
|
58
71
|
});
|
|
59
72
|
this.bot.catch((err) => console.error('[telegram]', err));
|
|
60
73
|
void this.bot.start(); // 长轮询(自托管无需 webhook)
|
|
61
74
|
}
|
|
62
|
-
/** 薄层:photo → getFile(file_id) 换 file_path → 下载 URL 填充 msg.media.url(纯函数只做模板)。 */
|
|
75
|
+
/** 薄层:photo/voice/audio → getFile(file_id) 换 file_path → 下载 URL 填充 msg.media.url(纯函数只做模板)。 */
|
|
63
76
|
async handleMessage(raw) {
|
|
64
77
|
const msg = normalizeTelegramMessage(raw);
|
|
65
78
|
if (!msg)
|
|
66
79
|
return;
|
|
67
|
-
const fileId = msg.media?.kind === 'image'
|
|
80
|
+
const fileId = msg.media?.kind === 'image'
|
|
81
|
+
? telegramPhotoFileId(raw.message?.photo ?? [])
|
|
82
|
+
: msg.media?.kind === 'voice'
|
|
83
|
+
? telegramVoiceFileId(raw)
|
|
84
|
+
: undefined;
|
|
68
85
|
if (fileId) {
|
|
69
86
|
try {
|
|
70
87
|
const file = await this.bot.api.getFile(fileId);
|