moltbot-dingtalk-stream 1.0.6 → 1.0.8
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/clawdbot.plugin.json +4 -1
- package/dist/clawdbot.plugin.json +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +14 -5
- package/dist/index.js.map +1 -1
- package/dist/package.json +1 -1
- package/package.json +1 -1
- package/src/index.ts +14 -5
package/clawdbot.plugin.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"id": "moltbot-dingtalk-stream",
|
|
3
3
|
"name": "DingTalk Stream Channel",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.8",
|
|
5
5
|
"description": "Custom channel for integrating Moltbot with DingTalk (Stream Mode)",
|
|
6
6
|
"author": "Jack",
|
|
7
7
|
"license": "MIT",
|
|
@@ -10,6 +10,9 @@
|
|
|
10
10
|
"./dist/index.js"
|
|
11
11
|
]
|
|
12
12
|
},
|
|
13
|
+
"channels": [
|
|
14
|
+
"moltbot-dingtalk-stream"
|
|
15
|
+
],
|
|
13
16
|
"configSchema": {
|
|
14
17
|
"type": "object",
|
|
15
18
|
"properties": {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"id": "moltbot-dingtalk-stream",
|
|
3
3
|
"name": "DingTalk Stream Channel",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.7",
|
|
5
5
|
"description": "Custom channel for integrating Moltbot with DingTalk (Stream Mode)",
|
|
6
6
|
"author": "Jack",
|
|
7
7
|
"license": "MIT",
|
|
@@ -10,6 +10,9 @@
|
|
|
10
10
|
"./index.js"
|
|
11
11
|
]
|
|
12
12
|
},
|
|
13
|
+
"channels": [
|
|
14
|
+
"moltbot-dingtalk-stream"
|
|
15
|
+
],
|
|
13
16
|
"configSchema": {
|
|
14
17
|
"type": "object",
|
|
15
18
|
"properties": {
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,UAAU,iBAAiB;IACzB,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,eAAe,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,GAAG,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7C,eAAe,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;CACrC;AAED,UAAU,cAAc;IACtB,QAAQ,CAAC,EAAE;QACT,yBAAyB,CAAC,EAAE;YAC1B,QAAQ,CAAC,EAAE;gBACT,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;aACtC,CAAC;SACH,CAAC;QACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,UAAU,qBAAqB;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,UAAU,iBAAiB;IACzB,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,eAAe,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,GAAG,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7C,eAAe,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;CACrC;AAED,UAAU,cAAc;IACtB,QAAQ,CAAC,EAAE;QACT,yBAAyB,CAAC,EAAE;YAC1B,QAAQ,CAAC,EAAE;gBACT,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;aACtC,CAAC;SACH,CAAC;QACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,UAAU,qBAAqB;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAiVD,QAAA,MAAM,MAAM;;;;;;;;kBAQI,iBAAiB;CAIhC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -123,24 +123,33 @@ const dingTalkChannelPlugin = {
|
|
|
123
123
|
if (pluginRuntime?.runtime?.channel?.reply) {
|
|
124
124
|
const replyModule = pluginRuntime.runtime.channel.reply;
|
|
125
125
|
const chatType = String(message.conversationType) === '2' ? 'group' : 'direct';
|
|
126
|
-
|
|
126
|
+
// From 地址: 用于标识发送者
|
|
127
|
+
// - 群聊: channel:group:<groupId>:<senderId>
|
|
128
|
+
// - 私聊: channel:<senderId>
|
|
129
|
+
const fromAddress = chatType === 'group'
|
|
130
|
+
? `moltbot-dingtalk-stream:group:${convoId}:${senderId}`
|
|
131
|
+
: `moltbot-dingtalk-stream:${senderId}`;
|
|
127
132
|
const ctxPayload = {
|
|
128
133
|
Body: cleanedText,
|
|
129
134
|
RawBody: textContent,
|
|
130
135
|
CommandBody: cleanedText,
|
|
131
136
|
From: fromAddress,
|
|
132
137
|
To: 'bot',
|
|
133
|
-
SessionKey
|
|
138
|
+
// SessionKey 根据 chatType 设置:
|
|
139
|
+
// - 群聊: 使用 group:<conversationId> 格式让所有群成员共享上下文
|
|
140
|
+
// - 私聊: 使用 dm:<senderId> 格式让每个用户有独立的会话上下文
|
|
141
|
+
SessionKey: chatType === 'group' ? `group:${convoId}` : `dm:${senderId}`,
|
|
134
142
|
AccountId: accountId,
|
|
135
143
|
ChatType: chatType,
|
|
136
144
|
SenderName: message.senderNick,
|
|
137
145
|
SenderId: senderId,
|
|
138
|
-
Provider: 'dingtalk',
|
|
139
|
-
Surface: 'dingtalk',
|
|
146
|
+
Provider: 'moltbot-dingtalk-stream',
|
|
147
|
+
Surface: 'moltbot-dingtalk-stream',
|
|
140
148
|
MessageSid: message.msgId,
|
|
141
149
|
Timestamp: message.createAt,
|
|
142
|
-
//
|
|
150
|
+
// 群聊相关元数据
|
|
143
151
|
GroupSubject: chatType === 'group' ? (message.conversationId) : undefined,
|
|
152
|
+
ConversationLabel: chatType === 'group' ? `钉钉群:${convoId}` : `钉钉私聊:${message.senderNick || senderId}`,
|
|
144
153
|
};
|
|
145
154
|
const finalizedCtx = replyModule.finalizeInboundContext(ctxPayload);
|
|
146
155
|
let replyBuffer = "";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -187,7 +187,12 @@ const dingTalkChannelPlugin = {
|
|
|
187
187
|
if (pluginRuntime?.runtime?.channel?.reply) {
|
|
188
188
|
const replyModule = pluginRuntime.runtime.channel.reply;
|
|
189
189
|
const chatType = String(message.conversationType) === '2' ? 'group' : 'direct';
|
|
190
|
-
|
|
190
|
+
// From 地址: 用于标识发送者
|
|
191
|
+
// - 群聊: channel:group:<groupId>:<senderId>
|
|
192
|
+
// - 私聊: channel:<senderId>
|
|
193
|
+
const fromAddress = chatType === 'group'
|
|
194
|
+
? `moltbot-dingtalk-stream:group:${convoId}:${senderId}`
|
|
195
|
+
: `moltbot-dingtalk-stream:${senderId}`;
|
|
191
196
|
|
|
192
197
|
const ctxPayload = {
|
|
193
198
|
Body: cleanedText,
|
|
@@ -195,17 +200,21 @@ const dingTalkChannelPlugin = {
|
|
|
195
200
|
CommandBody: cleanedText,
|
|
196
201
|
From: fromAddress,
|
|
197
202
|
To: 'bot',
|
|
198
|
-
SessionKey
|
|
203
|
+
// SessionKey 根据 chatType 设置:
|
|
204
|
+
// - 群聊: 使用 group:<conversationId> 格式让所有群成员共享上下文
|
|
205
|
+
// - 私聊: 使用 dm:<senderId> 格式让每个用户有独立的会话上下文
|
|
206
|
+
SessionKey: chatType === 'group' ? `group:${convoId}` : `dm:${senderId}`,
|
|
199
207
|
AccountId: accountId,
|
|
200
208
|
ChatType: chatType,
|
|
201
209
|
SenderName: message.senderNick,
|
|
202
210
|
SenderId: senderId,
|
|
203
|
-
Provider: 'dingtalk',
|
|
204
|
-
Surface: 'dingtalk',
|
|
211
|
+
Provider: 'moltbot-dingtalk-stream',
|
|
212
|
+
Surface: 'moltbot-dingtalk-stream',
|
|
205
213
|
MessageSid: message.msgId,
|
|
206
214
|
Timestamp: message.createAt,
|
|
207
|
-
//
|
|
215
|
+
// 群聊相关元数据
|
|
208
216
|
GroupSubject: chatType === 'group' ? (message.conversationId) : undefined,
|
|
217
|
+
ConversationLabel: chatType === 'group' ? `钉钉群:${convoId}` : `钉钉私聊:${message.senderNick || senderId}`,
|
|
209
218
|
};
|
|
210
219
|
|
|
211
220
|
const finalizedCtx = replyModule.finalizeInboundContext(ctxPayload);
|