@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
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/** QQ 扫码:官方 @tencent-connect/qqbot-connector。 */
|
|
2
|
+
import { startQrConnect } from '@tencent-connect/qqbot-connector'
|
|
3
|
+
import { cleanString, type PairingBegin, type PairingPoll } from './shared.js'
|
|
4
|
+
|
|
5
|
+
export interface QqQrCallbacks {
|
|
6
|
+
onQrDisplayed?: (url: string) => void
|
|
7
|
+
onQrExpired?: () => void
|
|
8
|
+
onSuccess: (credentials: unknown) => void
|
|
9
|
+
onFailure: (error: unknown) => void
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export type QqQrStart = (
|
|
13
|
+
callbacks: QqQrCallbacks,
|
|
14
|
+
options: { displayQrCodeToConsole: boolean; source: string; signal?: AbortSignal },
|
|
15
|
+
) => (() => void) | Promise<() => void>
|
|
16
|
+
|
|
17
|
+
export function parseQqQrSuccess(raw: unknown): { appId: string; appSecret: string } | undefined {
|
|
18
|
+
const first = Array.isArray(raw) ? raw[0] : raw
|
|
19
|
+
if (!first || typeof first !== 'object') return undefined
|
|
20
|
+
const rec = first as Record<string, unknown>
|
|
21
|
+
const appId = cleanString(rec.appId)
|
|
22
|
+
const appSecret = cleanString(rec.appSecret)
|
|
23
|
+
if (!appId || !appSecret) return undefined
|
|
24
|
+
return { appId, appSecret }
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export async function beginQqQr(signal?: AbortSignal, start: QqQrStart = startQrConnect, firstQrTimeoutMs = 15_000): Promise<PairingBegin> {
|
|
28
|
+
let status: PairingPoll = { status: 'waiting' }
|
|
29
|
+
let qrUrl = ''
|
|
30
|
+
let firstQrResolve: ((url: string) => void) | undefined
|
|
31
|
+
let firstQrReject: ((error: unknown) => void) | undefined
|
|
32
|
+
const firstQr = new Promise<string>((resolve, reject) => {
|
|
33
|
+
firstQrResolve = resolve
|
|
34
|
+
firstQrReject = reject
|
|
35
|
+
})
|
|
36
|
+
const dispose = await start({
|
|
37
|
+
onQrDisplayed: (url) => {
|
|
38
|
+
const next = cleanString(url)
|
|
39
|
+
if (!next) return
|
|
40
|
+
qrUrl = next
|
|
41
|
+
if (status.status === 'expired' || status.status === 'waiting') {
|
|
42
|
+
status = { status: 'waiting', qrUrl: next }
|
|
43
|
+
}
|
|
44
|
+
firstQrResolve?.(next)
|
|
45
|
+
},
|
|
46
|
+
onQrExpired: () => {
|
|
47
|
+
status = { status: 'waiting', qrUrl, error: '二维码已过期,正在刷新' }
|
|
48
|
+
},
|
|
49
|
+
onSuccess: (raw) => {
|
|
50
|
+
const creds = parseQqQrSuccess(raw)
|
|
51
|
+
status = creds
|
|
52
|
+
? { status: 'success', credentials: creds }
|
|
53
|
+
: { status: 'failed', error: 'QQ 授权结果缺少 AppID 或 AppSecret' }
|
|
54
|
+
},
|
|
55
|
+
onFailure: (error) => {
|
|
56
|
+
const message = error instanceof Error ? error.message : 'QQ 扫码服务暂时不可用,请重新生成二维码'
|
|
57
|
+
status = { status: 'failed', error: message }
|
|
58
|
+
firstQrReject?.(error instanceof Error ? error : new Error(message))
|
|
59
|
+
},
|
|
60
|
+
}, { displayQrCodeToConsole: false, source: 'dsh-im-connect', signal })
|
|
61
|
+
if (signal?.aborted) {
|
|
62
|
+
if (typeof dispose === 'function') dispose()
|
|
63
|
+
throw new Error('扫码已取消')
|
|
64
|
+
}
|
|
65
|
+
let timer: ReturnType<typeof setTimeout> | undefined
|
|
66
|
+
let shown: string
|
|
67
|
+
try {
|
|
68
|
+
shown = await Promise.race([
|
|
69
|
+
firstQr,
|
|
70
|
+
new Promise<string>((_, reject) => {
|
|
71
|
+
timer = setTimeout(() => reject(new Error('无法生成 QQ 二维码')), firstQrTimeoutMs)
|
|
72
|
+
signal?.addEventListener('abort', () => {
|
|
73
|
+
reject(new Error('扫码已取消'))
|
|
74
|
+
}, { once: true })
|
|
75
|
+
}),
|
|
76
|
+
])
|
|
77
|
+
} catch (error) {
|
|
78
|
+
// 首帧超时/取消也要释放连接器,否则它会在后台继续轮询生成二维码
|
|
79
|
+
if (typeof dispose === 'function') dispose()
|
|
80
|
+
throw error
|
|
81
|
+
} finally {
|
|
82
|
+
if (timer) clearTimeout(timer)
|
|
83
|
+
}
|
|
84
|
+
return {
|
|
85
|
+
qrUrl: shown || qrUrl,
|
|
86
|
+
expiresAt: Date.now() + 5 * 60_000,
|
|
87
|
+
pollIntervalMs: 1500,
|
|
88
|
+
poll: async () => ({ ...status, qrUrl: status.qrUrl || qrUrl }),
|
|
89
|
+
dispose: typeof dispose === 'function' ? dispose : undefined,
|
|
90
|
+
}
|
|
91
|
+
}
|
|
@@ -59,6 +59,7 @@ export interface PairingBegin {
|
|
|
59
59
|
expiresAt?: number
|
|
60
60
|
pollIntervalMs: number
|
|
61
61
|
poll: (signal?: AbortSignal) => Promise<PairingPoll>
|
|
62
|
+
dispose?: () => void
|
|
62
63
|
}
|
|
63
64
|
|
|
64
65
|
export interface PairingPoll {
|
|
@@ -66,6 +67,8 @@ export interface PairingPoll {
|
|
|
66
67
|
credentials?: Record<string, string>
|
|
67
68
|
error?: string
|
|
68
69
|
pollIntervalMs?: number
|
|
70
|
+
qrUrl?: string
|
|
71
|
+
qrImage?: string
|
|
69
72
|
}
|
|
70
73
|
export function isRasterQr(value?: string): boolean {
|
|
71
74
|
if (!value) return false
|
|
@@ -78,3 +81,4 @@ export function qrPayloadOf(begun: { qrUrl?: string; qrImage?: string }): { qrUr
|
|
|
78
81
|
return { qrUrl, qrImage: undefined }
|
|
79
82
|
}
|
|
80
83
|
|
|
84
|
+
|
package/src/channels/telegram.ts
CHANGED
|
@@ -124,22 +124,52 @@ export function createTelegramChannel(config: TelegramConfig, log: (line: string
|
|
|
124
124
|
async beginReply(chatId): Promise<ReplyStream> {
|
|
125
125
|
const first = await api<{ message_id: number }>('sendMessage', { chat_id: Number(chatId), text: '…' })
|
|
126
126
|
let last = '…'
|
|
127
|
+
let timer: ReturnType<typeof setTimeout> | undefined
|
|
128
|
+
let pending: string | undefined
|
|
129
|
+
let inflight = Promise.resolve()
|
|
130
|
+
|
|
131
|
+
const flush = async (text: string, allowSend: boolean) => {
|
|
132
|
+
const next = text.slice(0, 4000) || '…'
|
|
133
|
+
if (next === last) return
|
|
134
|
+
// last 只在发送成功后更新:失败时保留旧值,finish 才能靠 sendMessage 兜底送出全文
|
|
135
|
+
try {
|
|
136
|
+
await api('editMessageText', { chat_id: Number(chatId), message_id: first.message_id, text: next })
|
|
137
|
+
last = next
|
|
138
|
+
} catch (error) {
|
|
139
|
+
const detail = error instanceof Error ? error.message : String(error)
|
|
140
|
+
if (detail.includes('message is not modified')) {
|
|
141
|
+
last = next
|
|
142
|
+
return
|
|
143
|
+
}
|
|
144
|
+
if (!allowSend) return
|
|
145
|
+
await api('sendMessage', { chat_id: Number(chatId), text: next })
|
|
146
|
+
last = next
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
|
|
127
150
|
return {
|
|
128
151
|
async update(text) {
|
|
129
|
-
|
|
130
|
-
if (
|
|
131
|
-
|
|
132
|
-
|
|
152
|
+
pending = text
|
|
153
|
+
if (timer) return
|
|
154
|
+
timer = setTimeout(() => {
|
|
155
|
+
timer = undefined
|
|
156
|
+
const next = pending
|
|
157
|
+
pending = undefined
|
|
158
|
+
if (next !== undefined) inflight = inflight.then(() => flush(next, false))
|
|
159
|
+
}, 400)
|
|
133
160
|
},
|
|
134
161
|
async finish(text) {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
}
|
|
162
|
+
if (timer) {
|
|
163
|
+
clearTimeout(timer)
|
|
164
|
+
timer = undefined
|
|
165
|
+
}
|
|
166
|
+
await inflight.catch(() => undefined)
|
|
167
|
+
await flush(text || pending || last, true)
|
|
139
168
|
},
|
|
140
169
|
}
|
|
141
170
|
},
|
|
142
171
|
setMessageHandler(h) { handler = h },
|
|
143
172
|
status() { return stopped ? '已停止' : lastError ? `轮询中(${lastError})` : '轮询中' },
|
|
144
173
|
}
|
|
145
|
-
}
|
|
174
|
+
}
|
|
175
|
+
|
package/src/channels/wecom.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ChannelAdapter, ImMessage, ReplyStream } from '../engine/types.js'
|
|
2
|
+
import { quietSdkLogger } from '../engine/quiet-logger.js'
|
|
2
3
|
|
|
3
4
|
export interface WecomConfig {
|
|
4
5
|
botId?: string
|
|
@@ -34,7 +35,8 @@ export function messageText(body: Record<string, unknown>): string {
|
|
|
34
35
|
|
|
35
36
|
/** 企业微信智能机器人必须按回调帧 replyStream,主动 sendMessage 用户看不到。 */
|
|
36
37
|
export class WecomReplyBroker {
|
|
37
|
-
|
|
38
|
+
// 同一聊天可能连续来多条消息,每条都有独立的回调帧,必须排队而不是单槽覆盖
|
|
39
|
+
private readonly pending = new Map<string, Array<{ frame: unknown; streamId: string; started: boolean }>>()
|
|
38
40
|
|
|
39
41
|
constructor(
|
|
40
42
|
private readonly client: Pick<WecomSdkClient, 'replyStream' | 'sendMessage'>,
|
|
@@ -43,28 +45,39 @@ export class WecomReplyBroker {
|
|
|
43
45
|
) {}
|
|
44
46
|
|
|
45
47
|
remember(chatId: string, frame: unknown): string {
|
|
48
|
+
const list = this.pending.get(chatId) ?? []
|
|
46
49
|
const streamId = this.newStreamId()
|
|
47
|
-
|
|
50
|
+
list.push({ frame, streamId, started: false })
|
|
51
|
+
this.pending.set(chatId, list)
|
|
48
52
|
return streamId
|
|
49
53
|
}
|
|
50
54
|
|
|
55
|
+
private shift(chatId: string): { frame: unknown; streamId: string; started: boolean } | undefined {
|
|
56
|
+
const list = this.pending.get(chatId)
|
|
57
|
+
if (!list?.length) return undefined
|
|
58
|
+
return list.shift()
|
|
59
|
+
}
|
|
60
|
+
|
|
51
61
|
async startThinking(chatId: string): Promise<void> {
|
|
52
|
-
const item
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
62
|
+
for (const item of this.pending.get(chatId) ?? []) {
|
|
63
|
+
if (item.started) continue
|
|
64
|
+
await this.client.replyStream(item.frame, item.streamId, '正在思考中…', false)
|
|
65
|
+
item.started = true
|
|
66
|
+
}
|
|
56
67
|
}
|
|
57
68
|
|
|
58
69
|
async send(chatId: string, text: string): Promise<void> {
|
|
59
|
-
const item = this.
|
|
70
|
+
const item = this.shift(chatId)
|
|
60
71
|
if (item) {
|
|
61
72
|
try {
|
|
62
73
|
await this.client.replyStream(item.frame, item.streamId, text, true)
|
|
63
|
-
this.pending.delete(chatId)
|
|
64
74
|
this.log(`[wecom] 已通过回调回复 ${chatId}`)
|
|
65
75
|
return
|
|
66
76
|
} catch (error) {
|
|
67
77
|
this.log(`[wecom] 回调回复失败,改走主动推送:${error instanceof Error ? error.message : String(error)}`)
|
|
78
|
+
// 帧先放回去,后续回复仍可尝试回调通道
|
|
79
|
+
const list = this.pending.get(chatId)
|
|
80
|
+
if (list) list.unshift(item)
|
|
68
81
|
}
|
|
69
82
|
}
|
|
70
83
|
await this.client.sendMessage(chatId, { msgtype: 'markdown', markdown: { content: text } })
|
|
@@ -72,15 +85,22 @@ export class WecomReplyBroker {
|
|
|
72
85
|
}
|
|
73
86
|
|
|
74
87
|
async beginReply(chatId: string): Promise<ReplyStream> {
|
|
75
|
-
const item = this.
|
|
88
|
+
const item = this.shift(chatId)
|
|
76
89
|
if (!item) throw new Error('wecom: 没有待回复的回调帧')
|
|
77
|
-
if (!item.started)
|
|
90
|
+
if (!item.started) {
|
|
91
|
+
await this.client.replyStream(item.frame, item.streamId, '正在思考中…', false)
|
|
92
|
+
item.started = true
|
|
93
|
+
}
|
|
78
94
|
return {
|
|
79
95
|
// 企业微信客户端会把未完成分片渲染成一条条气泡,这里只收最终全文。
|
|
80
96
|
update: async () => undefined,
|
|
81
97
|
finish: async (text) => {
|
|
82
|
-
|
|
83
|
-
|
|
98
|
+
try {
|
|
99
|
+
await this.client.replyStream(item.frame, item.streamId, text, true)
|
|
100
|
+
} catch (error) {
|
|
101
|
+
this.log(`[wecom] 回调收口失败,改走主动推送:${error instanceof Error ? error.message : String(error)}`)
|
|
102
|
+
await this.client.sendMessage(chatId, { msgtype: 'markdown', markdown: { content: text } })
|
|
103
|
+
}
|
|
84
104
|
this.log(`[wecom] 已通过回调回复 ${chatId}`)
|
|
85
105
|
},
|
|
86
106
|
}
|
|
@@ -104,7 +124,7 @@ export function createWecomChannel(config: WecomConfig, log: (line: string) => v
|
|
|
104
124
|
skipMerge: true,
|
|
105
125
|
async start() {
|
|
106
126
|
let sdk: {
|
|
107
|
-
WSClient: new (opts: { botId: string; secret: string }) => WecomSdkClient
|
|
127
|
+
WSClient: new (opts: { botId: string; secret: string; maxAuthFailureAttempts?: number; logger?: { debug: Function; info: Function; warn: Function; error: Function } }) => WecomSdkClient
|
|
108
128
|
generateReqId?: (prefix: string) => string
|
|
109
129
|
}
|
|
110
130
|
try {
|
|
@@ -112,7 +132,7 @@ export function createWecomChannel(config: WecomConfig, log: (line: string) => v
|
|
|
112
132
|
} catch {
|
|
113
133
|
throw new Error('缺少依赖 @wecom/aibot-node-sdk')
|
|
114
134
|
}
|
|
115
|
-
client = new sdk.WSClient({ botId, secret })
|
|
135
|
+
client = new sdk.WSClient({ botId, secret, maxAuthFailureAttempts: 1, logger: quietSdkLogger(log, 'wecom') })
|
|
116
136
|
const newStreamId = sdk.generateReqId
|
|
117
137
|
? () => sdk.generateReqId!('stream')
|
|
118
138
|
: () => `stream_${Date.now()}_${Math.random().toString(16).slice(2, 10)}`
|
|
@@ -161,7 +181,6 @@ export function createWecomChannel(config: WecomConfig, log: (line: string) => v
|
|
|
161
181
|
client.connect()
|
|
162
182
|
await ready
|
|
163
183
|
statusText = '长连接已建立'
|
|
164
|
-
log('[wecom] WebSocket 已连接')
|
|
165
184
|
},
|
|
166
185
|
async stop() {
|
|
167
186
|
client?.disconnect()
|
|
@@ -179,4 +198,6 @@ export function createWecomChannel(config: WecomConfig, log: (line: string) => v
|
|
|
179
198
|
setMessageHandler(h) { handler = h },
|
|
180
199
|
status() { return statusText },
|
|
181
200
|
}
|
|
182
|
-
}
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
|
package/src/channels/weixin.ts
CHANGED
|
@@ -253,13 +253,6 @@ export function createWeixinChannel(config: WeixinChannelConfig, log: (line: str
|
|
|
253
253
|
state.botToken = token
|
|
254
254
|
const newBaseUrl = pickStr(st, 'baseurl', 'base_url')
|
|
255
255
|
if (newBaseUrl) state.baseUrl = newBaseUrl
|
|
256
|
-
if (!state.allowedUserId) {
|
|
257
|
-
state.allowedUserId = userId
|
|
258
|
-
log(`[weixin] 已绑定白名单用户 ${userId}(仅该用户可驱动)`)
|
|
259
|
-
} else if (state.allowedUserId !== userId) {
|
|
260
|
-
log(`[weixin] 扫码用户 ${userId} 不在白名单(白名单=${state.allowedUserId})`)
|
|
261
|
-
return false
|
|
262
|
-
}
|
|
263
256
|
flush()
|
|
264
257
|
statusText = '已登录'
|
|
265
258
|
currentLoginUrl = undefined
|
|
@@ -466,8 +459,13 @@ export function createWeixinChannel(config: WeixinChannelConfig, log: (line: str
|
|
|
466
459
|
const parsed = parseInbound(raw)
|
|
467
460
|
if (!parsed) continue
|
|
468
461
|
if (parsed.contextToken) state.contextTokens[parsed.fromUserId] = parsed.contextToken
|
|
469
|
-
|
|
470
|
-
const
|
|
462
|
+
// 单个媒体失败只降级丢媒体,不再连累文本整条丢弃
|
|
463
|
+
const settled = await Promise.allSettled(parsed.media)
|
|
464
|
+
const media = []
|
|
465
|
+
for (const item of settled) {
|
|
466
|
+
if (item.status === 'fulfilled') media.push(item.value)
|
|
467
|
+
else log(`[weixin] 媒体下载失败,降级为纯文本: ${item.reason instanceof Error ? item.reason.message : String(item.reason)}`)
|
|
468
|
+
}
|
|
471
469
|
if (parsed.text === '' && media.length === 0) continue
|
|
472
470
|
void handler?.({
|
|
473
471
|
chatId: parsed.fromUserId,
|
|
@@ -653,12 +651,6 @@ export function createWeixinChannel(config: WeixinChannelConfig, log: (line: str
|
|
|
653
651
|
loginUrl() {
|
|
654
652
|
return currentLoginUrl
|
|
655
653
|
},
|
|
656
|
-
authorizes(userId: string) {
|
|
657
|
-
// 已绑定扫码白名单:仅放行该用户(其余在轮询层已过滤)
|
|
658
|
-
if (state.allowedUserId) return state.allowedUserId === userId
|
|
659
|
-
// 尚未登录/未绑定白名单:交给网关全局白名单决定
|
|
660
|
-
return undefined
|
|
661
|
-
},
|
|
662
654
|
setMessageHandler(h) {
|
|
663
655
|
handler = h
|
|
664
656
|
},
|
|
@@ -672,41 +664,41 @@ function sleep(ms: number): Promise<void> {
|
|
|
672
664
|
return new Promise((resolve) => setTimeout(resolve, ms))
|
|
673
665
|
}
|
|
674
666
|
|
|
675
|
-
|
|
676
|
-
export function weixinStatePath(stateDir: string): string {
|
|
677
|
-
return join(stateDir, 'wechat-state.json')
|
|
678
|
-
}
|
|
679
|
-
|
|
680
|
-
export function persistWeixinLogin(stateDir: string, data: { botToken: string; allowedUserId?: string; baseUrl?: string }): void {
|
|
681
|
-
mkdirSync(stateDir, { recursive: true })
|
|
682
|
-
const file = weixinStatePath(stateDir)
|
|
683
|
-
let prev: WechatState = { contextTokens: {} }
|
|
684
|
-
try {
|
|
685
|
-
const parsed = JSON.parse(readFileSync(file, 'utf8')) as Partial<WechatState>
|
|
686
|
-
prev = {
|
|
687
|
-
allowedUserId: parsed.allowedUserId,
|
|
688
|
-
contextTokens: parsed.contextTokens ?? {},
|
|
689
|
-
botToken: parsed.botToken,
|
|
690
|
-
baseUrl: parsed.baseUrl,
|
|
691
|
-
syncBuf: parsed.syncBuf,
|
|
692
|
-
}
|
|
693
|
-
} catch { /* 首次写入 */ }
|
|
694
|
-
const next: WechatState = {
|
|
695
|
-
...prev,
|
|
696
|
-
botToken: data.botToken,
|
|
697
|
-
allowedUserId: data.allowedUserId || prev.allowedUserId,
|
|
698
|
-
baseUrl: data.baseUrl || prev.baseUrl,
|
|
699
|
-
}
|
|
700
|
-
writeFileSync(file, `${JSON.stringify(next, null, 2)}\n`, 'utf8')
|
|
701
|
-
}
|
|
702
|
-
|
|
703
|
-
export function clearWeixinLogin(stateDir: string): void {
|
|
704
|
-
const file = weixinStatePath(stateDir)
|
|
705
|
-
try {
|
|
706
|
-
const parsed = JSON.parse(readFileSync(file, 'utf8')) as Partial<WechatState>
|
|
707
|
-
writeFileSync(file, `${JSON.stringify({
|
|
708
|
-
allowedUserId: parsed.allowedUserId,
|
|
709
|
-
contextTokens: parsed.contextTokens ?? {},
|
|
710
|
-
}, null, 2)}\n`, 'utf8')
|
|
711
|
-
} catch { /* 无登录态 */ }
|
|
667
|
+
|
|
668
|
+
export function weixinStatePath(stateDir: string): string {
|
|
669
|
+
return join(stateDir, 'wechat-state.json')
|
|
670
|
+
}
|
|
671
|
+
|
|
672
|
+
export function persistWeixinLogin(stateDir: string, data: { botToken: string; allowedUserId?: string; baseUrl?: string }): void {
|
|
673
|
+
mkdirSync(stateDir, { recursive: true })
|
|
674
|
+
const file = weixinStatePath(stateDir)
|
|
675
|
+
let prev: WechatState = { contextTokens: {} }
|
|
676
|
+
try {
|
|
677
|
+
const parsed = JSON.parse(readFileSync(file, 'utf8')) as Partial<WechatState>
|
|
678
|
+
prev = {
|
|
679
|
+
allowedUserId: parsed.allowedUserId,
|
|
680
|
+
contextTokens: parsed.contextTokens ?? {},
|
|
681
|
+
botToken: parsed.botToken,
|
|
682
|
+
baseUrl: parsed.baseUrl,
|
|
683
|
+
syncBuf: parsed.syncBuf,
|
|
684
|
+
}
|
|
685
|
+
} catch { /* 首次写入 */ }
|
|
686
|
+
const next: WechatState = {
|
|
687
|
+
...prev,
|
|
688
|
+
botToken: data.botToken,
|
|
689
|
+
allowedUserId: data.allowedUserId || prev.allowedUserId,
|
|
690
|
+
baseUrl: data.baseUrl || prev.baseUrl,
|
|
691
|
+
}
|
|
692
|
+
writeFileSync(file, `${JSON.stringify(next, null, 2)}\n`, 'utf8')
|
|
693
|
+
}
|
|
694
|
+
|
|
695
|
+
export function clearWeixinLogin(stateDir: string): void {
|
|
696
|
+
const file = weixinStatePath(stateDir)
|
|
697
|
+
try {
|
|
698
|
+
const parsed = JSON.parse(readFileSync(file, 'utf8')) as Partial<WechatState>
|
|
699
|
+
writeFileSync(file, `${JSON.stringify({
|
|
700
|
+
allowedUserId: parsed.allowedUserId,
|
|
701
|
+
contextTokens: parsed.contextTokens ?? {},
|
|
702
|
+
}, null, 2)}\n`, 'utf8')
|
|
703
|
+
} catch { /* 无登录态 */ }
|
|
712
704
|
}
|