@michengai/dsh-im-connect 0.1.20 → 0.1.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. package/README.en.md +2 -2
  2. package/README.md +2 -2
  3. package/SECURITY.md +1 -1
  4. package/lib/channels/dingtalk-card.d.ts.map +1 -1
  5. package/lib/channels/dingtalk-card.js +3 -0
  6. package/lib/channels/dingtalk-card.js.map +1 -1
  7. package/lib/channels/dingtalk.d.ts.map +1 -1
  8. package/lib/channels/dingtalk.js +6 -1
  9. package/lib/channels/dingtalk.js.map +1 -1
  10. package/lib/channels/feishu.d.ts +9 -0
  11. package/lib/channels/feishu.d.ts.map +1 -1
  12. package/lib/channels/feishu.js +23 -6
  13. package/lib/channels/feishu.js.map +1 -1
  14. package/lib/channels/qq.d.ts.map +1 -1
  15. package/lib/channels/qq.js +17 -1
  16. package/lib/channels/qq.js.map +1 -1
  17. package/lib/channels/telegram.d.ts.map +1 -1
  18. package/lib/channels/telegram.js +17 -4
  19. package/lib/channels/telegram.js.map +1 -1
  20. package/lib/channels/wecom.d.ts +7 -1
  21. package/lib/channels/wecom.d.ts.map +1 -1
  22. package/lib/channels/wecom.js +44 -11
  23. package/lib/channels/wecom.js.map +1 -1
  24. package/lib/channels/weixin.d.ts +3 -0
  25. package/lib/channels/weixin.d.ts.map +1 -1
  26. package/lib/channels/weixin.js +68 -15
  27. package/lib/channels/weixin.js.map +1 -1
  28. package/lib/engine/abort.d.ts +4 -0
  29. package/lib/engine/abort.d.ts.map +1 -0
  30. package/lib/engine/abort.js +26 -0
  31. package/lib/engine/abort.js.map +1 -0
  32. package/lib/engine/atomic-file.d.ts +5 -0
  33. package/lib/engine/atomic-file.d.ts.map +1 -0
  34. package/lib/engine/atomic-file.js +46 -0
  35. package/lib/engine/atomic-file.js.map +1 -0
  36. package/lib/engine/json-state.d.ts.map +1 -1
  37. package/lib/engine/json-state.js +7 -5
  38. package/lib/engine/json-state.js.map +1 -1
  39. package/lib/engine/secure-file.d.ts.map +1 -1
  40. package/lib/engine/secure-file.js +2 -12
  41. package/lib/engine/secure-file.js.map +1 -1
  42. package/lib/engine/seen-store.d.ts.map +1 -1
  43. package/lib/engine/seen-store.js +4 -4
  44. package/lib/engine/seen-store.js.map +1 -1
  45. package/lib/engine/session-store.d.ts.map +1 -1
  46. package/lib/engine/session-store.js +7 -5
  47. package/lib/engine/session-store.js.map +1 -1
  48. package/lib/manager.d.ts.map +1 -1
  49. package/lib/manager.js +4 -9
  50. package/lib/manager.js.map +1 -1
  51. package/package.json +1 -1
  52. package/src/channels/dingtalk-card.ts +195 -192
  53. package/src/channels/dingtalk.ts +144 -140
  54. package/src/channels/feishu.ts +92 -66
  55. package/src/channels/qq.ts +303 -288
  56. package/src/channels/telegram.ts +170 -158
  57. package/src/channels/wecom.ts +209 -177
  58. package/src/channels/weixin.ts +158 -112
  59. package/src/engine/abort.ts +25 -0
  60. package/src/engine/access.ts +34 -34
  61. package/src/engine/atomic-file.ts +36 -0
  62. package/src/engine/json-state.ts +16 -15
  63. package/src/engine/secure-file.ts +7 -13
  64. package/src/engine/seen-store.ts +39 -39
  65. package/src/engine/session-store.ts +40 -39
  66. package/src/manager.ts +346 -350
@@ -1,198 +1,201 @@
1
1
  import { randomUUID } from 'node:crypto'
2
2
  import type { ReplyStream } from '../engine/types.js'
3
-
4
- const API = 'https://api.dingtalk.com/'
5
- const TEMPLATE_ID = '02fcf2f4-5e02-4a85-b672-46d1f715543e.schema'
6
- const UPDATE_INTERVAL_MS = 500
7
-
8
- export type CardTarget =
9
- | { type: 'user'; userId: string }
10
- | { type: 'group'; openConversationId: string }
11
-
12
- export function normalizeDingtalkCardMarkdown(value: string): string {
13
- const text = value.replace(/\r\n?/g, '\n')
14
- const lines = text.split('\n')
15
- let inCode = false
16
- return lines.map((line, index) => {
17
- const fenced = /^\s{0,3}```/.test(line)
18
- const wasInCode = inCode
19
- if (fenced) inCode = !inCode
20
- if (index === lines.length - 1) return line
21
- if (wasInCode || fenced || inCode || !line || !lines[index + 1]) return `${line}\n`
22
- if (/^\s{0,3}(?:[-*+] |\d+[.)] |#{1,6} |\||> )/.test(lines[index + 1] ?? '')) return `${line}\n`
23
- return `${line}<br>`
24
- }).join('')
25
- }
26
-
27
- function cardData(text: string, flowStatus: string) {
28
- return {
29
- cardParamMap: {
30
- flowStatus,
31
- msgContent: normalizeDingtalkCardMarkdown(text),
32
- staticMsgContent: '',
33
- sys_full_json_obj: JSON.stringify({ order: ['msgContent'] }),
34
- config: JSON.stringify({ autoLayout: true }),
35
- },
36
- }
37
- }
38
-
39
- function deliverBody(cardInstanceId: string, target: CardTarget, robotCode: string) {
40
- if (target.type === 'group') {
41
- return {
42
- outTrackId: cardInstanceId,
43
- userIdType: 1,
44
- openSpaceId: `dtv1.card//IM_GROUP.${target.openConversationId}`,
45
- imGroupOpenDeliverModel: { robotCode },
46
- }
47
- }
48
- return {
49
- outTrackId: cardInstanceId,
50
- userIdType: 1,
51
- openSpaceId: `dtv1.card//IM_ROBOT.${target.userId}`,
52
- imRobotOpenDeliverModel: {
53
- spaceType: 'IM_ROBOT',
54
- robotCode,
55
- extension: { dynamicSummary: 'true' },
56
- },
57
- }
58
- }
59
-
60
- export class DingtalkCardClient {
61
- private token = ''
62
- private tokenExpiresAt = 0
63
-
64
- constructor(
65
- private readonly clientId: string,
66
- private readonly clientSecret: string,
67
- private readonly log: (line: string) => void = () => undefined,
68
- ) {}
69
-
70
- async create(target: CardTarget, initialText: string): Promise<string> {
71
- const token = await this.accessToken()
72
- const cardInstanceId = `imc_${randomUUID()}`
73
- const headers = { 'x-acs-dingtalk-access-token': token }
74
- await this.request('v1.0/card/instances', {
75
- cardTemplateId: TEMPLATE_ID,
76
- outTrackId: cardInstanceId,
77
- cardData: { cardParamMap: { config: JSON.stringify({ autoLayout: true }) } },
78
- callbackType: 'STREAM',
79
- imGroupOpenSpaceModel: { supportForward: true },
80
- imRobotOpenSpaceModel: { supportForward: true },
81
- }, headers)
82
- await this.request('v1.0/card/instances/deliver', deliverBody(cardInstanceId, target, this.clientId), headers)
83
- await this.request('v1.0/card/instances', {
84
- outTrackId: cardInstanceId,
85
- cardData: cardData(initialText, '2'),
86
- }, headers, 'PUT')
87
- await this.stream(cardInstanceId, initialText, false, headers)
88
- return cardInstanceId
89
- }
90
-
91
- async update(cardInstanceId: string, text: string): Promise<void> {
92
- const token = await this.accessToken()
93
- await this.stream(cardInstanceId, text, false, { 'x-acs-dingtalk-access-token': token })
94
- }
95
-
96
- async finish(cardInstanceId: string, text: string): Promise<void> {
97
- const token = await this.accessToken()
98
- const headers = { 'x-acs-dingtalk-access-token': token }
99
- await this.stream(cardInstanceId, text, true, headers)
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
- }
109
- }
110
-
111
- private async stream(cardInstanceId: string, text: string, finalize: boolean, headers: Record<string, string>): Promise<void> {
112
- await this.request('v1.0/card/streaming', {
113
- outTrackId: cardInstanceId,
114
- guid: randomUUID(),
115
- key: 'msgContent',
116
- content: finalize ? normalizeDingtalkCardMarkdown(text) : normalizeDingtalkCardMarkdown(text).replace(/\n+$/, ''),
117
- isFull: true,
118
- isFinalize: finalize,
119
- isError: false,
120
- }, headers, 'PUT')
121
- }
122
-
123
- private async accessToken(): Promise<string> {
124
- if (this.token && Date.now() < this.tokenExpiresAt) return this.token
125
- const res = await fetch(new URL('v1.0/oauth2/accessToken', API), {
126
- method: 'POST',
3
+ import { timeoutSignal } from '../engine/abort.js'
4
+
5
+ const API = 'https://api.dingtalk.com/'
6
+ const TEMPLATE_ID = '02fcf2f4-5e02-4a85-b672-46d1f715543e.schema'
7
+ const UPDATE_INTERVAL_MS = 500
8
+
9
+ export type CardTarget =
10
+ | { type: 'user'; userId: string }
11
+ | { type: 'group'; openConversationId: string }
12
+
13
+ export function normalizeDingtalkCardMarkdown(value: string): string {
14
+ const text = value.replace(/\r\n?/g, '\n')
15
+ const lines = text.split('\n')
16
+ let inCode = false
17
+ return lines.map((line, index) => {
18
+ const fenced = /^\s{0,3}```/.test(line)
19
+ const wasInCode = inCode
20
+ if (fenced) inCode = !inCode
21
+ if (index === lines.length - 1) return line
22
+ if (wasInCode || fenced || inCode || !line || !lines[index + 1]) return `${line}\n`
23
+ if (/^\s{0,3}(?:[-*+] |\d+[.)] |#{1,6} |\||> )/.test(lines[index + 1] ?? '')) return `${line}\n`
24
+ return `${line}<br>`
25
+ }).join('')
26
+ }
27
+
28
+ function cardData(text: string, flowStatus: string) {
29
+ return {
30
+ cardParamMap: {
31
+ flowStatus,
32
+ msgContent: normalizeDingtalkCardMarkdown(text),
33
+ staticMsgContent: '',
34
+ sys_full_json_obj: JSON.stringify({ order: ['msgContent'] }),
35
+ config: JSON.stringify({ autoLayout: true }),
36
+ },
37
+ }
38
+ }
39
+
40
+ function deliverBody(cardInstanceId: string, target: CardTarget, robotCode: string) {
41
+ if (target.type === 'group') {
42
+ return {
43
+ outTrackId: cardInstanceId,
44
+ userIdType: 1,
45
+ openSpaceId: `dtv1.card//IM_GROUP.${target.openConversationId}`,
46
+ imGroupOpenDeliverModel: { robotCode },
47
+ }
48
+ }
49
+ return {
50
+ outTrackId: cardInstanceId,
51
+ userIdType: 1,
52
+ openSpaceId: `dtv1.card//IM_ROBOT.${target.userId}`,
53
+ imRobotOpenDeliverModel: {
54
+ spaceType: 'IM_ROBOT',
55
+ robotCode,
56
+ extension: { dynamicSummary: 'true' },
57
+ },
58
+ }
59
+ }
60
+
61
+ export class DingtalkCardClient {
62
+ private token = ''
63
+ private tokenExpiresAt = 0
64
+
65
+ constructor(
66
+ private readonly clientId: string,
67
+ private readonly clientSecret: string,
68
+ private readonly log: (line: string) => void = () => undefined,
69
+ ) {}
70
+
71
+ async create(target: CardTarget, initialText: string): Promise<string> {
72
+ const token = await this.accessToken()
73
+ const cardInstanceId = `imc_${randomUUID()}`
74
+ const headers = { 'x-acs-dingtalk-access-token': token }
75
+ await this.request('v1.0/card/instances', {
76
+ cardTemplateId: TEMPLATE_ID,
77
+ outTrackId: cardInstanceId,
78
+ cardData: { cardParamMap: { config: JSON.stringify({ autoLayout: true }) } },
79
+ callbackType: 'STREAM',
80
+ imGroupOpenSpaceModel: { supportForward: true },
81
+ imRobotOpenSpaceModel: { supportForward: true },
82
+ }, headers)
83
+ await this.request('v1.0/card/instances/deliver', deliverBody(cardInstanceId, target, this.clientId), headers)
84
+ await this.request('v1.0/card/instances', {
85
+ outTrackId: cardInstanceId,
86
+ cardData: cardData(initialText, '2'),
87
+ }, headers, 'PUT')
88
+ await this.stream(cardInstanceId, initialText, false, headers)
89
+ return cardInstanceId
90
+ }
91
+
92
+ async update(cardInstanceId: string, text: string): Promise<void> {
93
+ const token = await this.accessToken()
94
+ await this.stream(cardInstanceId, text, false, { 'x-acs-dingtalk-access-token': token })
95
+ }
96
+
97
+ async finish(cardInstanceId: string, text: string): Promise<void> {
98
+ const token = await this.accessToken()
99
+ const headers = { 'x-acs-dingtalk-access-token': token }
100
+ await this.stream(cardInstanceId, text, true, headers)
101
+ try {
102
+ await this.request('v1.0/card/instances', {
103
+ outTrackId: cardInstanceId,
104
+ cardData: cardData(text, '3'),
105
+ }, headers, 'PUT')
106
+ } catch (error) {
107
+ // 流式已经把全文写进卡片,收口 PUT 失败不再抛,避免上层再 webhook 发一条;但要留日志便于排障
108
+ this.log(`[dingtalk-card] 收口 PUT 失败(卡片仍以流式全文收尾): ${error instanceof Error ? error.message : String(error)}`)
109
+ }
110
+ }
111
+
112
+ private async stream(cardInstanceId: string, text: string, finalize: boolean, headers: Record<string, string>): Promise<void> {
113
+ await this.request('v1.0/card/streaming', {
114
+ outTrackId: cardInstanceId,
115
+ guid: randomUUID(),
116
+ key: 'msgContent',
117
+ content: finalize ? normalizeDingtalkCardMarkdown(text) : normalizeDingtalkCardMarkdown(text).replace(/\n+$/, ''),
118
+ isFull: true,
119
+ isFinalize: finalize,
120
+ isError: false,
121
+ }, headers, 'PUT')
122
+ }
123
+
124
+ private async accessToken(): Promise<string> {
125
+ if (this.token && Date.now() < this.tokenExpiresAt) return this.token
126
+ const res = await fetch(new URL('v1.0/oauth2/accessToken', API), {
127
+ method: 'POST',
127
128
  headers: { 'content-type': 'application/json' },
128
129
  body: JSON.stringify({ appKey: this.clientId, appSecret: this.clientSecret }),
129
- })
130
- const data = await res.json() as { accessToken?: string; expireIn?: number }
131
- if (!data.accessToken) throw new Error('钉钉没有返回 accessToken')
132
- this.token = data.accessToken
133
- this.tokenExpiresAt = Date.now() + Math.max(1000, ((data.expireIn ?? 7200) - 60) * 1000)
134
- return this.token
135
- }
136
-
137
- private async request(path: string, body: unknown, headers: Record<string, string>, method = 'POST'): Promise<void> {
138
- const res = await fetch(new URL(path, API), {
139
- method,
130
+ signal: timeoutSignal(30_000),
131
+ })
132
+ const data = await res.json() as { accessToken?: string; expireIn?: number }
133
+ if (!data.accessToken) throw new Error('钉钉没有返回 accessToken')
134
+ this.token = data.accessToken
135
+ this.tokenExpiresAt = Date.now() + Math.max(1000, ((data.expireIn ?? 7200) - 60) * 1000)
136
+ return this.token
137
+ }
138
+
139
+ private async request(path: string, body: unknown, headers: Record<string, string>, method = 'POST'): Promise<void> {
140
+ const res = await fetch(new URL(path, API), {
141
+ method,
140
142
  headers: { 'content-type': 'application/json', ...headers },
141
143
  body: JSON.stringify(body),
142
- })
143
- if (!res.ok) {
144
- const text = await res.text().catch(() => '')
145
- throw new Error(`钉钉 ${path} HTTP ${res.status} ${text.slice(0, 200)}`)
146
- }
147
- }
148
- }
149
-
150
- export async function openDingtalkCardStream(
151
- client: DingtalkCardClient,
152
- target: CardTarget,
153
- log: (line: string) => void,
154
- ): Promise<ReplyStream> {
155
- const cardInstanceId = await client.create(target, '正在思考…')
156
- let pending: string | null = null
157
- let timer: NodeJS.Timeout | null = null
158
- let last = 0
159
- let closed = false
160
-
161
- const flush = async (text: string) => {
162
- if (closed) return
163
- pending = null
164
- await client.update(cardInstanceId, text)
165
- last = Date.now()
166
- }
167
-
168
- return {
169
- async update(text) {
170
- if (closed || !text.trim()) return
171
- pending = text
172
- const wait = Math.max(0, last + UPDATE_INTERVAL_MS - Date.now())
173
- if (timer) return
174
- timer = setTimeout(() => {
175
- timer = null
176
- const next = pending
177
- if (next) void flush(next).catch((error) => {
178
- log(`[dingtalk] AI Card 更新失败: ${error instanceof Error ? error.message : String(error)}`)
179
- })
180
- }, wait)
181
- timer.unref?.()
182
- },
183
- async finish(text) {
184
- if (closed) return
185
- closed = true
186
- if (timer) clearTimeout(timer)
187
- timer = null
188
- try {
189
- await client.finish(cardInstanceId, text || '(无文本回复)')
190
- } catch (error) {
191
- log(`[dingtalk] AI Card 收口失败: ${error instanceof Error ? error.message : String(error)}`)
192
- throw error
193
- }
194
- },
195
- }
196
- }
197
-
198
-
144
+ signal: timeoutSignal(30_000),
145
+ })
146
+ if (!res.ok) {
147
+ const text = await res.text().catch(() => '')
148
+ throw new Error(`钉钉 ${path} HTTP ${res.status} ${text.slice(0, 200)}`)
149
+ }
150
+ }
151
+ }
152
+
153
+ export async function openDingtalkCardStream(
154
+ client: DingtalkCardClient,
155
+ target: CardTarget,
156
+ log: (line: string) => void,
157
+ ): Promise<ReplyStream> {
158
+ const cardInstanceId = await client.create(target, '正在思考…')
159
+ let pending: string | null = null
160
+ let timer: NodeJS.Timeout | null = null
161
+ let last = 0
162
+ let closed = false
163
+
164
+ const flush = async (text: string) => {
165
+ if (closed) return
166
+ pending = null
167
+ await client.update(cardInstanceId, text)
168
+ last = Date.now()
169
+ }
170
+
171
+ return {
172
+ async update(text) {
173
+ if (closed || !text.trim()) return
174
+ pending = text
175
+ const wait = Math.max(0, last + UPDATE_INTERVAL_MS - Date.now())
176
+ if (timer) return
177
+ timer = setTimeout(() => {
178
+ timer = null
179
+ const next = pending
180
+ if (next) void flush(next).catch((error) => {
181
+ log(`[dingtalk] AI Card 更新失败: ${error instanceof Error ? error.message : String(error)}`)
182
+ })
183
+ }, wait)
184
+ timer.unref?.()
185
+ },
186
+ async finish(text) {
187
+ if (closed) return
188
+ closed = true
189
+ if (timer) clearTimeout(timer)
190
+ timer = null
191
+ try {
192
+ await client.finish(cardInstanceId, text || '(无文本回复)')
193
+ } catch (error) {
194
+ log(`[dingtalk] AI Card 收口失败: ${error instanceof Error ? error.message : String(error)}`)
195
+ throw error
196
+ }
197
+ },
198
+ }
199
+ }
200
+
201
+