@michengai/dsh-im-connect 0.1.0 → 0.1.2
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 +224 -0
- package/README.md +204 -19
- package/assets/branding/dsh-banner.png +0 -0
- package/assets/screenshots/dingtalk-chat.jpg +0 -0
- package/assets/screenshots/feishu-chat.jpg +0 -0
- package/assets/screenshots/qq-chat.jpg +0 -0
- package/assets/screenshots/settings-channels.png +0 -0
- package/assets/screenshots/telegram-chat.jpg +0 -0
- package/assets/screenshots/wecom-chat.jpg +0 -0
- package/assets/screenshots/wecom-qr.png +0 -0
- package/assets/screenshots/weixin-chat.jpg +0 -0
- package/assets/screenshots/workspace-channels.png +0 -0
- package/client.js +158 -82
- package/lib/channels/dingtalk-card.d.ts +2 -1
- package/lib/channels/dingtalk-card.d.ts.map +1 -1
- package/lib/channels/dingtalk-card.js +13 -5
- package/lib/channels/dingtalk-card.js.map +1 -1
- package/lib/channels/dingtalk.d.ts +19 -0
- package/lib/channels/dingtalk.d.ts.map +1 -1
- package/lib/channels/dingtalk.js +30 -16
- package/lib/channels/dingtalk.js.map +1 -1
- package/lib/channels/factory.d.ts.map +1 -1
- package/lib/channels/factory.js +3 -0
- package/lib/channels/factory.js.map +1 -1
- package/lib/channels/feishu.d.ts.map +1 -1
- package/lib/channels/feishu.js +5 -2
- package/lib/channels/feishu.js.map +1 -1
- package/lib/channels/meta.d.ts.map +1 -1
- package/lib/channels/meta.js +11 -0
- package/lib/channels/meta.js.map +1 -1
- package/lib/channels/qq.d.ts +9 -0
- package/lib/channels/qq.d.ts.map +1 -0
- package/lib/channels/qq.js +279 -0
- package/lib/channels/qq.js.map +1 -0
- package/lib/channels/qr/hub.d.ts +4 -1
- package/lib/channels/qr/hub.d.ts.map +1 -1
- package/lib/channels/qr/hub.js +27 -0
- package/lib/channels/qr/hub.js.map +1 -1
- package/lib/channels/qr/qq.d.ts +18 -0
- package/lib/channels/qr/qq.d.ts.map +1 -0
- package/lib/channels/qr/qq.js +86 -0
- package/lib/channels/qr/qq.js.map +1 -0
- package/lib/channels/qr/shared.d.ts +3 -0
- package/lib/channels/qr/shared.d.ts.map +1 -1
- package/lib/channels/qr/shared.js.map +1 -1
- package/lib/channels/telegram.d.ts.map +1 -1
- package/lib/channels/telegram.js +39 -8
- package/lib/channels/telegram.js.map +1 -1
- package/lib/channels/wecom.d.ts +1 -0
- package/lib/channels/wecom.d.ts.map +1 -1
- package/lib/channels/wecom.js +35 -15
- package/lib/channels/wecom.js.map +1 -1
- package/lib/channels/weixin.d.ts.map +1 -1
- package/lib/channels/weixin.js +9 -18
- package/lib/channels/weixin.js.map +1 -1
- package/lib/client.js +158 -82
- package/lib/engine/gateway.d.ts +3 -10
- package/lib/engine/gateway.d.ts.map +1 -1
- package/lib/engine/gateway.js +54 -65
- package/lib/engine/gateway.js.map +1 -1
- package/lib/engine/quiet-logger.d.ts +9 -0
- package/lib/engine/quiet-logger.d.ts.map +1 -0
- package/lib/engine/quiet-logger.js +26 -0
- package/lib/engine/quiet-logger.js.map +1 -0
- package/lib/engine/reply-stream.d.ts +25 -0
- package/lib/engine/reply-stream.d.ts.map +1 -0
- package/lib/engine/reply-stream.js +62 -0
- package/lib/engine/reply-stream.js.map +1 -0
- package/lib/engine/session-id.d.ts +1 -1
- package/lib/engine/session-id.d.ts.map +1 -1
- package/lib/engine/session-id.js +1 -1
- package/lib/engine/session-id.js.map +1 -1
- package/lib/engine/types.d.ts +0 -2
- package/lib/engine/types.d.ts.map +1 -1
- package/lib/index.d.ts +0 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +0 -2
- package/lib/index.js.map +1 -1
- package/lib/manager.d.ts +1 -12
- package/lib/manager.d.ts.map +1 -1
- package/lib/manager.js +165 -167
- package/lib/manager.js.map +1 -1
- package/package.json +15 -4
- package/src/channels/dingtalk-card.ts +13 -6
- package/src/channels/dingtalk.ts +43 -18
- package/src/channels/factory.ts +8 -2
- package/src/channels/feishu.ts +6 -2
- package/src/channels/meta.ts +13 -0
- package/src/channels/qq.ts +302 -0
- package/src/channels/qr/hub.ts +27 -3
- package/src/channels/qr/qq.ts +91 -0
- package/src/channels/qr/shared.ts +4 -0
- package/src/channels/telegram.ts +39 -9
- package/src/channels/wecom.ts +37 -16
- package/src/channels/weixin.ts +44 -52
- package/src/engine/gateway.ts +316 -325
- package/src/engine/quiet-logger.ts +23 -0
- package/src/engine/reply-stream.ts +67 -0
- package/src/engine/session-id.ts +3 -2
- package/src/engine/types.ts +1 -3
- package/src/index.ts +2 -5
- package/src/manager.ts +542 -569
- package/src/engine/access.ts +0 -17
|
@@ -64,6 +64,7 @@ export class DingtalkCardClient {
|
|
|
64
64
|
constructor(
|
|
65
65
|
private readonly clientId: string,
|
|
66
66
|
private readonly clientSecret: string,
|
|
67
|
+
private readonly log: (line: string) => void = () => undefined,
|
|
67
68
|
) {}
|
|
68
69
|
|
|
69
70
|
async create(target: CardTarget, initialText: string): Promise<string> {
|
|
@@ -96,10 +97,15 @@ export class DingtalkCardClient {
|
|
|
96
97
|
const token = await this.accessToken()
|
|
97
98
|
const headers = { 'x-acs-dingtalk-access-token': token }
|
|
98
99
|
await this.stream(cardInstanceId, text, true, headers)
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
100
|
+
try {
|
|
101
|
+
await this.request('v1.0/card/instances', {
|
|
102
|
+
outTrackId: cardInstanceId,
|
|
103
|
+
cardData: cardData(text, '3'),
|
|
104
|
+
}, headers, 'PUT')
|
|
105
|
+
} catch (error) {
|
|
106
|
+
// 流式已经把全文写进卡片,收口 PUT 失败不再抛,避免上层再 webhook 发一条;但要留日志便于排障
|
|
107
|
+
this.log(`[dingtalk-card] 收口 PUT 失败(卡片仍以流式全文收尾): ${error instanceof Error ? error.message : String(error)}`)
|
|
108
|
+
}
|
|
103
109
|
}
|
|
104
110
|
|
|
105
111
|
private async stream(cardInstanceId: string, text: string, finalize: boolean, headers: Record<string, string>): Promise<void> {
|
|
@@ -187,5 +193,6 @@ export async function openDingtalkCardStream(
|
|
|
187
193
|
}
|
|
188
194
|
},
|
|
189
195
|
}
|
|
190
|
-
}
|
|
191
|
-
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
|
package/src/channels/dingtalk.ts
CHANGED
|
@@ -6,6 +6,31 @@ export interface DingtalkConfig {
|
|
|
6
6
|
clientSecret?: string
|
|
7
7
|
}
|
|
8
8
|
|
|
9
|
+
export function parseDingtalkRobotEvent(payload: {
|
|
10
|
+
text?: { content?: string }
|
|
11
|
+
senderStaffId?: string
|
|
12
|
+
senderId?: string
|
|
13
|
+
conversationId?: string
|
|
14
|
+
conversationType?: string
|
|
15
|
+
sessionWebhook?: string
|
|
16
|
+
msgId?: string
|
|
17
|
+
msgid?: string
|
|
18
|
+
msgIdEnc?: string
|
|
19
|
+
}): { chatId: string; userId: string; text: string; kind: 'dm' | 'group'; messageId?: string } | undefined {
|
|
20
|
+
const text = payload.text?.content?.trim() ?? ''
|
|
21
|
+
const sender = payload.senderStaffId ?? payload.senderId ?? ''
|
|
22
|
+
const group = String(payload.conversationType) === '2'
|
|
23
|
+
const chatId = group ? (payload.conversationId ?? '') : sender
|
|
24
|
+
if (!chatId) return undefined
|
|
25
|
+
const messageId = payload.msgId || payload.msgid || payload.msgIdEnc
|
|
26
|
+
return {
|
|
27
|
+
chatId,
|
|
28
|
+
userId: sender,
|
|
29
|
+
text,
|
|
30
|
+
kind: group ? 'group' : 'dm',
|
|
31
|
+
messageId,
|
|
32
|
+
}
|
|
33
|
+
}
|
|
9
34
|
export function createDingtalkChannel(config: DingtalkConfig, log: (line: string) => void): ChannelAdapter | undefined {
|
|
10
35
|
const clientId = config.clientId?.trim()
|
|
11
36
|
const clientSecret = config.clientSecret?.trim()
|
|
@@ -16,7 +41,7 @@ export function createDingtalkChannel(config: DingtalkConfig, log: (line: string
|
|
|
16
41
|
let statusText = '未连接'
|
|
17
42
|
const webhooks = new Map<string, string>()
|
|
18
43
|
const targets = new Map<string, CardTarget>()
|
|
19
|
-
const cards = new DingtalkCardClient(clientId, clientSecret)
|
|
44
|
+
const cards = new DingtalkCardClient(clientId, clientSecret, log)
|
|
20
45
|
|
|
21
46
|
return {
|
|
22
47
|
id: 'dingtalk',
|
|
@@ -39,23 +64,21 @@ export function createDingtalkChannel(config: DingtalkConfig, log: (line: string
|
|
|
39
64
|
sessionWebhook?: string
|
|
40
65
|
}
|
|
41
66
|
try { payload = JSON.parse(res.data) as typeof payload } catch { return }
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
targets.set(chatId, group
|
|
49
|
-
? { type: 'group', openConversationId: payload.conversationId ?? chatId }
|
|
50
|
-
: { type: 'user', userId: sender })
|
|
67
|
+
const parsed = parseDingtalkRobotEvent(payload)
|
|
68
|
+
if (payload.sessionWebhook && parsed?.chatId) webhooks.set(parsed.chatId, payload.sessionWebhook)
|
|
69
|
+
if (parsed?.chatId) {
|
|
70
|
+
targets.set(parsed.chatId, parsed.kind === 'group'
|
|
71
|
+
? { type: 'group', openConversationId: payload.conversationId ?? parsed.chatId }
|
|
72
|
+
: { type: 'user', userId: parsed.userId })
|
|
51
73
|
}
|
|
52
|
-
if (!chatId || !text) return { status: 'SUCCESS' }
|
|
74
|
+
if (!parsed?.chatId || !parsed.text) return { status: 'SUCCESS' }
|
|
53
75
|
void handler?.({
|
|
54
|
-
chatId,
|
|
55
|
-
userId:
|
|
56
|
-
text,
|
|
57
|
-
kind:
|
|
76
|
+
chatId: parsed.chatId,
|
|
77
|
+
userId: parsed.userId,
|
|
78
|
+
text: parsed.text,
|
|
79
|
+
kind: parsed.kind,
|
|
58
80
|
addressed: true,
|
|
81
|
+
messageId: parsed.messageId,
|
|
59
82
|
})
|
|
60
83
|
return { status: 'SUCCESS' }
|
|
61
84
|
})
|
|
@@ -108,6 +131,8 @@ export function createDingtalkChannel(config: DingtalkConfig, log: (line: string
|
|
|
108
131
|
setMessageHandler(h) { handler = h },
|
|
109
132
|
status() { return statusText },
|
|
110
133
|
}
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
|
|
137
|
+
|
|
138
|
+
|
package/src/channels/factory.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { createFeishuChannel } from './feishu.js'
|
|
|
5
5
|
import { createTelegramChannel } from './telegram.js'
|
|
6
6
|
import { createWecomChannel } from './wecom.js'
|
|
7
7
|
import { createWeixinChannel } from './weixin.js'
|
|
8
|
+
import { createQqChannel } from './qq.js'
|
|
8
9
|
|
|
9
10
|
export function createChannelAdapter(
|
|
10
11
|
id: ChannelId,
|
|
@@ -25,8 +26,13 @@ export function createChannelAdapter(
|
|
|
25
26
|
return createWecomChannel({ botId: config.botId, secret: config.secret }, log)
|
|
26
27
|
case 'dingtalk':
|
|
27
28
|
return createDingtalkChannel({ clientId: config.clientId, clientSecret: config.clientSecret }, log)
|
|
29
|
+
case 'qq':
|
|
30
|
+
return createQqChannel({ appId: config.appId, appSecret: config.appSecret }, log)
|
|
28
31
|
default:
|
|
29
32
|
return undefined
|
|
30
33
|
}
|
|
31
|
-
}
|
|
32
|
-
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
package/src/channels/feishu.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ChannelAdapter, ImMessage } from '../engine/types.js'
|
|
2
|
+
import { quietSdkLogger } from '../engine/quiet-logger.js'
|
|
2
3
|
|
|
3
4
|
export interface FeishuConfig {
|
|
4
5
|
appId?: string
|
|
@@ -29,7 +30,9 @@ export function createFeishuChannel(id: 'feishu' | 'lark', config: FeishuConfig,
|
|
|
29
30
|
throw new Error('缺少依赖 @larksuiteoapi/node-sdk')
|
|
30
31
|
}
|
|
31
32
|
const domain = id === 'lark' || config.domain === 'lark' ? 'https://open.larksuite.com' : undefined
|
|
32
|
-
|
|
33
|
+
const logger = quietSdkLogger(log, id)
|
|
34
|
+
const loggerLevel = sdk.LoggerLevel?.error ?? 1
|
|
35
|
+
client = new sdk.Client({ appId, appSecret, logger, loggerLevel, ...(domain ? { domain } : {}) }) as unknown as typeof client
|
|
33
36
|
const dispatcher = new sdk.EventDispatcher({}).register({
|
|
34
37
|
'im.message.receive_v1': (data: {
|
|
35
38
|
sender?: { sender_id?: { open_id?: string } }
|
|
@@ -52,7 +55,7 @@ export function createFeishuChannel(id: 'feishu' | 'lark', config: FeishuConfig,
|
|
|
52
55
|
})
|
|
53
56
|
},
|
|
54
57
|
})
|
|
55
|
-
const wsClient = new sdk.WSClient({ appId, appSecret, ...(domain ? { domain } : {}) })
|
|
58
|
+
const wsClient = new sdk.WSClient({ appId, appSecret, logger, loggerLevel, ...(domain ? { domain } : {}) })
|
|
56
59
|
ws = wsClient
|
|
57
60
|
await wsClient.start({ eventDispatcher: dispatcher })
|
|
58
61
|
statusText = '长连接已建立'
|
|
@@ -75,3 +78,4 @@ export function createFeishuChannel(id: 'feishu' | 'lark', config: FeishuConfig,
|
|
|
75
78
|
}
|
|
76
79
|
}
|
|
77
80
|
|
|
81
|
+
|
package/src/channels/meta.ts
CHANGED
|
@@ -23,6 +23,7 @@ export const CHANNEL_ORDER: ChannelId[] = [
|
|
|
23
23
|
'lark',
|
|
24
24
|
'weixin',
|
|
25
25
|
'wecom',
|
|
26
|
+
'qq',
|
|
26
27
|
'telegram',
|
|
27
28
|
]
|
|
28
29
|
|
|
@@ -68,6 +69,17 @@ export const CHANNEL_META: Record<ChannelId, ChannelMeta> = {
|
|
|
68
69
|
{ key: 'secret', label: 'Secret', secret: true },
|
|
69
70
|
],
|
|
70
71
|
},
|
|
72
|
+
|
|
73
|
+
qq: {
|
|
74
|
+
id: 'qq',
|
|
75
|
+
label: 'QQ',
|
|
76
|
+
description: '通过 QQ 开放平台机器人接收并回复用户消息',
|
|
77
|
+
kind: 'qr-or-credentials',
|
|
78
|
+
fields: [
|
|
79
|
+
{ key: 'appId', label: 'AppID' },
|
|
80
|
+
{ key: 'appSecret', label: 'AppSecret', secret: true },
|
|
81
|
+
],
|
|
82
|
+
},
|
|
71
83
|
telegram: {
|
|
72
84
|
id: 'telegram',
|
|
73
85
|
label: 'Telegram',
|
|
@@ -87,3 +99,4 @@ export function supportsQr(id: ChannelId): boolean {
|
|
|
87
99
|
const kind = CHANNEL_META[id]?.kind
|
|
88
100
|
return kind === 'qr' || kind === 'qr-or-credentials'
|
|
89
101
|
}
|
|
102
|
+
|
|
@@ -0,0 +1,302 @@
|
|
|
1
|
+
/** QQ 开放平台机器人:官方 WebSocket 网关,不是个人 QQ 号。 */
|
|
2
|
+
import type { ChannelAdapter, ImMessage, ReplyStream } from '../engine/types.js'
|
|
3
|
+
|
|
4
|
+
export interface QqChannelConfig {
|
|
5
|
+
appId?: string
|
|
6
|
+
appSecret?: string
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
interface GatewayPayload {
|
|
10
|
+
op: number
|
|
11
|
+
d?: unknown
|
|
12
|
+
s?: number
|
|
13
|
+
t?: string
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
interface QQMessage {
|
|
17
|
+
id: string
|
|
18
|
+
content?: string
|
|
19
|
+
attachments?: unknown[]
|
|
20
|
+
author?: {
|
|
21
|
+
id?: string
|
|
22
|
+
user_openid?: string
|
|
23
|
+
member_openid?: string
|
|
24
|
+
username?: string
|
|
25
|
+
}
|
|
26
|
+
group_openid?: string
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
interface ChatTarget {
|
|
30
|
+
kind: 'dm' | 'group'
|
|
31
|
+
lastMsgId?: string
|
|
32
|
+
seq: number
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const TOKEN_URL = 'https://bots.qq.com/app/getAppAccessToken'
|
|
36
|
+
const API = 'https://api.sgroup.qq.com'
|
|
37
|
+
const GATEWAY_PATH = '/gateway'
|
|
38
|
+
const GROUP_AND_C2C_INTENT = 1 << 25
|
|
39
|
+
|
|
40
|
+
export function cleanQqText(text: string): string {
|
|
41
|
+
return text.replace(/<@!?\w+>/g, '').replace(/^\s*@\S+\s+/, '').trim()
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export function createQqChannel(config: QqChannelConfig, log: (line: string) => void): ChannelAdapter | undefined {
|
|
45
|
+
const appId = config.appId?.trim()
|
|
46
|
+
const appSecret = config.appSecret?.trim()
|
|
47
|
+
if (!appId || !appSecret) return undefined
|
|
48
|
+
|
|
49
|
+
let handler: ((msg: ImMessage) => void | Promise<void>) | undefined
|
|
50
|
+
let ws: WebSocket | undefined
|
|
51
|
+
let heartbeat: ReturnType<typeof setInterval> | undefined
|
|
52
|
+
let reconnectTimer: ReturnType<typeof setTimeout> | undefined
|
|
53
|
+
let stableTimer: ReturnType<typeof setTimeout> | undefined
|
|
54
|
+
let reconnectAttempts = 0
|
|
55
|
+
let stopped = false
|
|
56
|
+
let seq: number | null = null
|
|
57
|
+
let accessToken = ''
|
|
58
|
+
// 提前 5 分钟刷新;WebSocket 靠心跳可长期在线,不主动换 token 会在两小时后全线 401
|
|
59
|
+
let tokenExpireAt = 0
|
|
60
|
+
let statusText = '未连接'
|
|
61
|
+
const targets = new Map<string, ChatTarget>()
|
|
62
|
+
|
|
63
|
+
function scheduleReconnect(): void {
|
|
64
|
+
if (stopped || reconnectTimer) return
|
|
65
|
+
const delay = Math.min(3000 * (2 ** reconnectAttempts), 60_000)
|
|
66
|
+
reconnectAttempts += 1
|
|
67
|
+
log(`[qq] ${Math.ceil(delay / 1000)}s 后重连`)
|
|
68
|
+
reconnectTimer = setTimeout(() => {
|
|
69
|
+
reconnectTimer = undefined
|
|
70
|
+
void connect().catch((err) => {
|
|
71
|
+
statusText = '重连失败'
|
|
72
|
+
log(`[qq] 重连失败: ${err instanceof Error ? err.message : String(err)}`)
|
|
73
|
+
scheduleReconnect()
|
|
74
|
+
})
|
|
75
|
+
}, delay)
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
async function ensureToken(): Promise<void> {
|
|
79
|
+
if (accessToken && Date.now() < tokenExpireAt) return
|
|
80
|
+
const res = await fetch(TOKEN_URL, {
|
|
81
|
+
method: 'POST',
|
|
82
|
+
headers: { 'content-type': 'application/json' },
|
|
83
|
+
body: JSON.stringify({ appId, clientSecret: appSecret }),
|
|
84
|
+
})
|
|
85
|
+
const body = await res.text()
|
|
86
|
+
let data: { access_token?: string; expires_in?: number; message?: string }
|
|
87
|
+
try {
|
|
88
|
+
data = JSON.parse(body) as typeof data
|
|
89
|
+
} catch {
|
|
90
|
+
throw new Error(`qq getAppAccessToken: HTTP ${res.status} ${body.slice(0, 200)}`)
|
|
91
|
+
}
|
|
92
|
+
if (!res.ok || !data.access_token) {
|
|
93
|
+
throw new Error(`qq getAppAccessToken: HTTP ${res.status} ${data.message ?? 'no token'}`)
|
|
94
|
+
}
|
|
95
|
+
accessToken = data.access_token
|
|
96
|
+
const ttl = Math.max(60, (data.expires_in ?? 7200) - 300)
|
|
97
|
+
tokenExpireAt = Date.now() + ttl * 1000
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
async function qqFetch<T>(path: string, init?: RequestInit): Promise<T> {
|
|
101
|
+
const request = () => fetch(`${API}${path}`, {
|
|
102
|
+
...init,
|
|
103
|
+
headers: {
|
|
104
|
+
Authorization: `QQBot ${accessToken}`,
|
|
105
|
+
'content-type': 'application/json',
|
|
106
|
+
...(init?.headers ?? {}),
|
|
107
|
+
},
|
|
108
|
+
})
|
|
109
|
+
await ensureToken()
|
|
110
|
+
let res = await request()
|
|
111
|
+
if (res.status === 401) {
|
|
112
|
+
// token 可能被吊销或时钟漂移提前过期:清缓存强制重取后再试一次
|
|
113
|
+
accessToken = ''
|
|
114
|
+
tokenExpireAt = 0
|
|
115
|
+
await ensureToken()
|
|
116
|
+
res = await request()
|
|
117
|
+
}
|
|
118
|
+
if (!res.ok) {
|
|
119
|
+
const body = await res.text().catch(() => '')
|
|
120
|
+
throw new Error(`qq ${path}: HTTP ${res.status} ${body.slice(0, 200)}`)
|
|
121
|
+
}
|
|
122
|
+
return res.json() as Promise<T>
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
function remember(chatId: string, kind: 'dm' | 'group', messageId?: string): void {
|
|
126
|
+
const prev = targets.get(chatId)
|
|
127
|
+
targets.set(chatId, {
|
|
128
|
+
kind,
|
|
129
|
+
lastMsgId: messageId || prev?.lastMsgId,
|
|
130
|
+
seq: prev?.seq ?? 0,
|
|
131
|
+
})
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
async function connect(): Promise<void> {
|
|
135
|
+
if (stopped) return
|
|
136
|
+
await ensureToken()
|
|
137
|
+
if (stopped) return
|
|
138
|
+
const { url } = await qqFetch<{ url: string }>(GATEWAY_PATH)
|
|
139
|
+
if (!url) throw new Error('qq gateway: missing websocket url')
|
|
140
|
+
if (stopped) return
|
|
141
|
+
|
|
142
|
+
const socket = new WebSocket(url)
|
|
143
|
+
ws = socket
|
|
144
|
+
statusText = '连接中'
|
|
145
|
+
socket.onopen = () => {
|
|
146
|
+
if (ws === socket) statusText = '等待网关握手'
|
|
147
|
+
}
|
|
148
|
+
socket.onmessage = (ev) => {
|
|
149
|
+
let payload: GatewayPayload
|
|
150
|
+
try {
|
|
151
|
+
payload = JSON.parse(String(ev.data)) as GatewayPayload
|
|
152
|
+
} catch {
|
|
153
|
+
log('[qq] 收到无法解析的网关消息')
|
|
154
|
+
return
|
|
155
|
+
}
|
|
156
|
+
if (payload.s !== undefined) seq = payload.s
|
|
157
|
+
switch (payload.op) {
|
|
158
|
+
case 10: {
|
|
159
|
+
const hello = payload.d as { heartbeat_interval: number }
|
|
160
|
+
socket.send(JSON.stringify({
|
|
161
|
+
op: 2,
|
|
162
|
+
d: {
|
|
163
|
+
token: `QQBot ${accessToken}`,
|
|
164
|
+
intents: GROUP_AND_C2C_INTENT,
|
|
165
|
+
shard: [0, 1],
|
|
166
|
+
},
|
|
167
|
+
}))
|
|
168
|
+
clearInterval(heartbeat)
|
|
169
|
+
heartbeat = setInterval(() => {
|
|
170
|
+
if (ws === socket) socket.send(JSON.stringify({ op: 1, d: seq }))
|
|
171
|
+
}, hello.heartbeat_interval)
|
|
172
|
+
statusText = '鉴权中'
|
|
173
|
+
log('[qq] 已收到 Hello,正在鉴权')
|
|
174
|
+
break
|
|
175
|
+
}
|
|
176
|
+
case 0: {
|
|
177
|
+
const t = payload.t
|
|
178
|
+
if (t === 'READY') {
|
|
179
|
+
clearTimeout(stableTimer)
|
|
180
|
+
stableTimer = setTimeout(() => { reconnectAttempts = 0 }, 60_000)
|
|
181
|
+
statusText = '已连接'
|
|
182
|
+
log('[qq] 网关就绪')
|
|
183
|
+
break
|
|
184
|
+
}
|
|
185
|
+
if (t === 'C2C_MESSAGE_CREATE' || t === 'GROUP_AT_MESSAGE_CREATE') {
|
|
186
|
+
const msg = payload.d as QQMessage
|
|
187
|
+
if (!msg?.author) return
|
|
188
|
+
const text = cleanQqText(msg.content ?? '')
|
|
189
|
+
const isGroup = t === 'GROUP_AT_MESSAGE_CREATE'
|
|
190
|
+
const userId = isGroup
|
|
191
|
+
? (msg.author.member_openid ?? msg.author.id)
|
|
192
|
+
: (msg.author.user_openid ?? msg.author.id)
|
|
193
|
+
const chatId = isGroup
|
|
194
|
+
// 群 chatId 带 g: 前缀自描述类型,渠道重启丢内存后发送仍能路由回群接口
|
|
195
|
+
? `g:${msg.group_openid ?? ''}`
|
|
196
|
+
: (msg.author.user_openid ?? msg.author.id ?? '')
|
|
197
|
+
if (!chatId || !userId) return
|
|
198
|
+
if (!text) {
|
|
199
|
+
// 纯图片/文件消息静默丢弃会让用户以为机器人没收到,回一条文字提示
|
|
200
|
+
if (Array.isArray(msg.attachments) && msg.attachments.length > 0) {
|
|
201
|
+
remember(chatId, isGroup ? 'group' : 'dm', msg.id)
|
|
202
|
+
void sendText(chatId, '暂不支持图片/文件,请发送文字。').catch((error) => {
|
|
203
|
+
log(`[qq] 媒体提示发送失败: ${error instanceof Error ? error.message : String(error)}`)
|
|
204
|
+
})
|
|
205
|
+
}
|
|
206
|
+
return
|
|
207
|
+
}
|
|
208
|
+
remember(chatId, isGroup ? 'group' : 'dm', msg.id)
|
|
209
|
+
void handler?.({
|
|
210
|
+
chatId,
|
|
211
|
+
userId,
|
|
212
|
+
username: msg.author.username,
|
|
213
|
+
text,
|
|
214
|
+
kind: isGroup ? 'group' : 'dm',
|
|
215
|
+
addressed: true,
|
|
216
|
+
messageId: msg.id,
|
|
217
|
+
context: { messageId: msg.id, messageType: isGroup ? 'group' : 'c2c' },
|
|
218
|
+
})
|
|
219
|
+
}
|
|
220
|
+
break
|
|
221
|
+
}
|
|
222
|
+
case 7:
|
|
223
|
+
// 服务端要求重连:立即断开旧连接,交给 onclose 走统一重连,不能只改状态等对端关
|
|
224
|
+
log('[qq] 网关要求重连,主动断开旧连接')
|
|
225
|
+
statusText = '重连中'
|
|
226
|
+
socket.close(4000, 'reconnect')
|
|
227
|
+
break
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
socket.onclose = (ev) => {
|
|
231
|
+
if (ws !== socket) return
|
|
232
|
+
clearInterval(heartbeat)
|
|
233
|
+
heartbeat = undefined
|
|
234
|
+
clearTimeout(stableTimer)
|
|
235
|
+
stableTimer = undefined
|
|
236
|
+
ws = undefined
|
|
237
|
+
statusText = `已断开(code ${ev.code})`
|
|
238
|
+
if (!stopped) {
|
|
239
|
+
const detail = ev.code === 4004 ? ':鉴权失败,将刷新 AccessToken' : ''
|
|
240
|
+
log(`[qq] 连接断开(${ev.code}${detail})`)
|
|
241
|
+
scheduleReconnect()
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
socket.onerror = () => {
|
|
245
|
+
if (ws === socket) statusText = '连接错误'
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
async function sendText(chatId: string, text: string): Promise<void> {
|
|
250
|
+
const target = targets.get(chatId)
|
|
251
|
+
const kind = target?.kind ?? (chatId.startsWith('g:') ? 'group' : 'dm')
|
|
252
|
+
const openid = kind === 'group' ? chatId.replace(/^g:/, '') : chatId
|
|
253
|
+
const nextSeq = (target?.seq ?? 0) + 1
|
|
254
|
+
if (target) target.seq = nextSeq
|
|
255
|
+
else remember(chatId, kind)
|
|
256
|
+
const body: Record<string, unknown> = { content: text, msg_type: 0, msg_seq: nextSeq }
|
|
257
|
+
if (target?.lastMsgId) body.msg_id = target.lastMsgId
|
|
258
|
+
const path = kind === 'group'
|
|
259
|
+
? `/v2/groups/${openid}/messages`
|
|
260
|
+
: `/v2/users/${openid}/messages`
|
|
261
|
+
await qqFetch(path, { method: 'POST', body: JSON.stringify(body) })
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
return {
|
|
265
|
+
id: 'qq',
|
|
266
|
+
label: 'QQ',
|
|
267
|
+
maxMessageLength: 2000,
|
|
268
|
+
async start() {
|
|
269
|
+
if (!stopped && (ws || reconnectTimer)) return
|
|
270
|
+
stopped = false
|
|
271
|
+
reconnectAttempts = 0
|
|
272
|
+
try {
|
|
273
|
+
await connect()
|
|
274
|
+
} catch (err) {
|
|
275
|
+
statusText = '连接失败'
|
|
276
|
+
log(`[qq] 连接失败: ${err instanceof Error ? err.message : String(err)}`)
|
|
277
|
+
scheduleReconnect()
|
|
278
|
+
}
|
|
279
|
+
},
|
|
280
|
+
async stop() {
|
|
281
|
+
stopped = true
|
|
282
|
+
clearInterval(heartbeat)
|
|
283
|
+
clearTimeout(reconnectTimer)
|
|
284
|
+
reconnectTimer = undefined
|
|
285
|
+
clearTimeout(stableTimer)
|
|
286
|
+
stableTimer = undefined
|
|
287
|
+
ws?.close(1000, 'shutdown')
|
|
288
|
+
ws = undefined
|
|
289
|
+
},
|
|
290
|
+
async send(chatId, text) {
|
|
291
|
+
await sendText(chatId, text)
|
|
292
|
+
},
|
|
293
|
+
async beginReply(chatId): Promise<ReplyStream> {
|
|
294
|
+
return {
|
|
295
|
+
async update() { /* QQ 不能按 Telegram 那样原地改气泡,避免每个 token 新发一条 */ },
|
|
296
|
+
async finish(text) { await sendText(chatId, text) },
|
|
297
|
+
}
|
|
298
|
+
},
|
|
299
|
+
setMessageHandler(h) { handler = h },
|
|
300
|
+
status() { return statusText },
|
|
301
|
+
}
|
|
302
|
+
}
|
package/src/channels/qr/hub.ts
CHANGED
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
/** 渠道扫码会话:同一渠道同时只保留一次尝试。 */
|
|
2
2
|
import type { ChannelId } from '../../engine/session-id.js'
|
|
3
3
|
import { CHANNEL_META } from '../meta.js'
|
|
4
|
-
import { qrPayloadOf, remainingSeconds, sleep, type PairingBegin, type PairingPhase, type PairingView } from './shared.js'
|
|
4
|
+
import { qrPayloadOf, remainingSeconds, sleep, type PairingBegin, type PairingPhase, type PairingView } from './shared.js'
|
|
5
5
|
import { renderQrDataUrl } from './render.js'
|
|
6
6
|
import { beginDingtalkQr } from './dingtalk.js'
|
|
7
7
|
import { beginFeishuQr } from './feishu.js'
|
|
8
8
|
import { beginWecomQr } from './wecom.js'
|
|
9
9
|
import { beginWeixinQr } from './weixin.js'
|
|
10
|
+
import { beginQqQr } from './qq.js'
|
|
10
11
|
|
|
11
12
|
export interface PairingHubOptions {
|
|
12
13
|
onSuccess?: (channelId: ChannelId, credentials: Record<string, string>) => Promise<void>
|
|
13
14
|
log?: (line: string) => void
|
|
15
|
+
/** 测试注入:替换真实扫码连接器的创建过程。 */
|
|
16
|
+
beginFn?: (channelId: ChannelId, signal: AbortSignal) => Promise<PairingBegin>
|
|
14
17
|
}
|
|
15
18
|
|
|
16
19
|
interface Session {
|
|
@@ -19,6 +22,7 @@ interface Session {
|
|
|
19
22
|
qrUrl?: string
|
|
20
23
|
qrImage?: string
|
|
21
24
|
expiresAt?: number
|
|
25
|
+
expiryWindowMs?: number
|
|
22
26
|
pollIntervalMs: number
|
|
23
27
|
hint?: string
|
|
24
28
|
error?: string
|
|
@@ -30,10 +34,12 @@ interface Session {
|
|
|
30
34
|
export class PairingHub {
|
|
31
35
|
private readonly sessions = new Map<string, Session>()
|
|
32
36
|
private readonly onSuccess?: PairingHubOptions['onSuccess']
|
|
37
|
+
private readonly beginFn?: PairingHubOptions['beginFn']
|
|
33
38
|
private readonly log: (line: string) => void
|
|
34
39
|
|
|
35
40
|
constructor(options: PairingHubOptions = {}) {
|
|
36
41
|
this.onSuccess = options.onSuccess
|
|
42
|
+
this.beginFn = options.beginFn
|
|
37
43
|
this.log = options.log ?? (() => undefined)
|
|
38
44
|
}
|
|
39
45
|
|
|
@@ -79,6 +85,9 @@ export class PairingHub {
|
|
|
79
85
|
try { session.qrImage = await renderQrDataUrl(session.qrUrl) } catch { /* 前端再兜底 */ }
|
|
80
86
|
}
|
|
81
87
|
session.expiresAt = begun.expiresAt
|
|
88
|
+
// 记住初始有效期窗口:连接器自动换码时按同一窗口顺延,而不是被固定 5 分钟误杀
|
|
89
|
+
const windowMs = (begun.expiresAt ?? 0) - Date.now()
|
|
90
|
+
if (windowMs > 0) session.expiryWindowMs = windowMs
|
|
82
91
|
session.pollIntervalMs = begun.pollIntervalMs
|
|
83
92
|
session.status = 'waiting'
|
|
84
93
|
session.hint = hintOf(id)
|
|
@@ -101,6 +110,7 @@ export class PairingHub {
|
|
|
101
110
|
cancel(id: ChannelId): PairingView {
|
|
102
111
|
const session = this.sessions.get(id)
|
|
103
112
|
if (!session) return this.view(id)
|
|
113
|
+
session.begin?.dispose?.()
|
|
104
114
|
session.controller.abort()
|
|
105
115
|
if (session.status !== 'success') {
|
|
106
116
|
session.status = 'cancelled'
|
|
@@ -116,6 +126,7 @@ export class PairingHub {
|
|
|
116
126
|
}
|
|
117
127
|
|
|
118
128
|
private async begin(id: ChannelId, signal: AbortSignal): Promise<PairingBegin> {
|
|
129
|
+
if (this.beginFn) return this.beginFn(id, signal)
|
|
119
130
|
switch (id) {
|
|
120
131
|
case 'wecom':
|
|
121
132
|
return beginWecomQr(signal)
|
|
@@ -127,6 +138,8 @@ export class PairingHub {
|
|
|
127
138
|
return beginFeishuQr('lark', signal)
|
|
128
139
|
case 'weixin':
|
|
129
140
|
return beginWeixinQr(signal)
|
|
141
|
+
case 'qq':
|
|
142
|
+
return beginQqQr(signal)
|
|
130
143
|
default:
|
|
131
144
|
throw new Error(`${id} 不支持扫码绑定`)
|
|
132
145
|
}
|
|
@@ -141,10 +154,16 @@ export class PairingHub {
|
|
|
141
154
|
session.error = '二维码已过期'
|
|
142
155
|
session.qrUrl = undefined
|
|
143
156
|
session.qrImage = undefined
|
|
157
|
+
session.begin?.dispose?.()
|
|
144
158
|
return
|
|
145
159
|
}
|
|
146
160
|
try {
|
|
147
161
|
const polled = await begun.poll(session.controller.signal)
|
|
162
|
+
if (polled.qrUrl && polled.qrUrl !== session.qrUrl) {
|
|
163
|
+
session.qrUrl = polled.qrUrl
|
|
164
|
+
if (session.expiryWindowMs) session.expiresAt = Date.now() + session.expiryWindowMs
|
|
165
|
+
try { session.qrImage = await renderQrDataUrl(polled.qrUrl) } catch { session.qrImage = undefined }
|
|
166
|
+
}
|
|
148
167
|
if (this.sessions.get(session.channelId) !== session) return
|
|
149
168
|
if (polled.pollIntervalMs) session.pollIntervalMs = polled.pollIntervalMs
|
|
150
169
|
if (polled.status === 'success' && polled.credentials) {
|
|
@@ -170,6 +189,7 @@ export class PairingHub {
|
|
|
170
189
|
session.error = polled.error
|
|
171
190
|
session.qrUrl = undefined
|
|
172
191
|
session.qrImage = undefined
|
|
192
|
+
session.begin?.dispose?.()
|
|
173
193
|
return
|
|
174
194
|
} else if (session.status !== 'scanned') {
|
|
175
195
|
session.status = 'waiting'
|
|
@@ -199,8 +219,12 @@ function hintOf(id: ChannelId): string {
|
|
|
199
219
|
return '请使用企业微信扫描二维码,快捷绑定机器人'
|
|
200
220
|
case 'dingtalk':
|
|
201
221
|
return '请使用钉钉扫描二维码,自动创建机器人'
|
|
222
|
+
case 'qq':
|
|
223
|
+
return '请使用手机 QQ 扫描二维码,创建开放平台机器人'
|
|
202
224
|
default:
|
|
203
225
|
return '请使用对应 App 扫描二维码'
|
|
204
226
|
}
|
|
205
|
-
}
|
|
206
|
-
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
|
|
230
|
+
|