openclaw-weixin 3.1.5 → 3.2.0
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/CHANGELOG.md +36 -0
- package/CHANGELOG_EN.md +46 -0
- package/NOTICE +2 -1
- package/README.md +16 -21
- package/README_EN.md +21 -27
- package/assets/icon.png +0 -0
- package/dist/src/api/api.js +40 -35
- package/dist/src/api/api.js.map +1 -1
- package/dist/src/api/config-cache.js +3 -2
- package/dist/src/api/config-cache.js.map +1 -1
- package/dist/src/api/session-guard.js +3 -2
- package/dist/src/api/session-guard.js.map +1 -1
- package/dist/src/auth/accounts.js +14 -16
- package/dist/src/auth/accounts.js.map +1 -1
- package/dist/src/auth/login-qr.js +20 -21
- package/dist/src/auth/login-qr.js.map +1 -1
- package/dist/src/auth/pairing.js +2 -1
- package/dist/src/auth/pairing.js.map +1 -1
- package/dist/src/cdn/cdn-upload.js +17 -10
- package/dist/src/cdn/cdn-upload.js.map +1 -1
- package/dist/src/cdn/pic-decrypt.js +15 -7
- package/dist/src/cdn/pic-decrypt.js.map +1 -1
- package/dist/src/cdn/upload.js +7 -7
- package/dist/src/cdn/upload.js.map +1 -1
- package/dist/src/channel.js +57 -135
- package/dist/src/channel.js.map +1 -1
- package/dist/src/config/block-streaming.js +8 -0
- package/dist/src/config/block-streaming.js.map +1 -0
- package/dist/src/config/config-schema.js +10 -0
- package/dist/src/config/config-schema.js.map +1 -1
- package/dist/src/media/media-download.js +15 -14
- package/dist/src/media/media-download.js.map +1 -1
- package/dist/src/media/silk-transcode.js +2 -1
- package/dist/src/media/silk-transcode.js.map +1 -1
- package/dist/src/messaging/debug-mode.js +2 -1
- package/dist/src/messaging/debug-mode.js.map +1 -1
- package/dist/src/messaging/error-notice.js +3 -3
- package/dist/src/messaging/error-notice.js.map +1 -1
- package/dist/src/messaging/inbound-dedupe.js +2 -1
- package/dist/src/messaging/inbound-dedupe.js.map +1 -1
- package/dist/src/messaging/inbound-turn.js +102 -0
- package/dist/src/messaging/inbound-turn.js.map +1 -0
- package/dist/src/messaging/inbound.js +6 -5
- package/dist/src/messaging/inbound.js.map +1 -1
- package/dist/src/messaging/outbound-hooks.js +36 -3
- package/dist/src/messaging/outbound-hooks.js.map +1 -1
- package/dist/src/messaging/process-message.js +124 -193
- package/dist/src/messaging/process-message.js.map +1 -1
- package/dist/src/messaging/reply-progress-sender.js +3 -2
- package/dist/src/messaging/reply-progress-sender.js.map +1 -1
- package/dist/src/messaging/send-media.js +7 -6
- package/dist/src/messaging/send-media.js.map +1 -1
- package/dist/src/messaging/send.js +5 -5
- package/dist/src/messaging/send.js.map +1 -1
- package/dist/src/messaging/slash-commands.js +5 -3
- package/dist/src/messaging/slash-commands.js.map +1 -1
- package/dist/src/monitor/monitor.js +16 -16
- package/dist/src/monitor/monitor.js.map +1 -1
- package/dist/src/util/logger.js +3 -2
- package/dist/src/util/logger.js.map +1 -1
- package/dist/src/util/redact.js +64 -17
- package/dist/src/util/redact.js.map +1 -1
- package/docs/en/architecture.md +22 -8
- package/docs/en/guide.md +77 -15
- package/docs/zh-CN/architecture.md +18 -8
- package/docs/zh-CN/guide.md +72 -13
- package/openclaw.plugin.json +6 -2
- package/package.json +8 -14
|
@@ -9,15 +9,17 @@ import { MessageItemType, TypingStatus } from "../api/types.js";
|
|
|
9
9
|
import { loadWeixinAccount } from "../auth/accounts.js";
|
|
10
10
|
import { readFrameworkAllowFromList } from "../auth/pairing.js";
|
|
11
11
|
import { downloadRemoteImageToTemp } from "../cdn/upload.js";
|
|
12
|
+
import { resolveWeixinBlockStreamingEnabled } from "../config/block-streaming.js";
|
|
12
13
|
import { resolveReplyProgressMessagesEnabled } from "../config/reply-progress.js";
|
|
13
14
|
import { downloadMediaFromItem } from "../media/media-download.js";
|
|
14
15
|
import { logger } from "../util/logger.js";
|
|
15
|
-
import {
|
|
16
|
+
import { redactError, redactToken } from "../util/redact.js";
|
|
16
17
|
import { isDebugMode } from "./debug-mode.js";
|
|
17
18
|
import { sendWeixinErrorNotice } from "./error-notice.js";
|
|
18
19
|
import { getContextTokenFromMsgContext, isMediaItem, weixinMessageToMsgContext } from "./inbound.js";
|
|
20
|
+
import { dispatchWeixinInboundTurn } from "./inbound-turn.js";
|
|
19
21
|
import { StreamingMarkdownFilter } from "./markdown-filter.js";
|
|
20
|
-
import {
|
|
22
|
+
import { sendWeixinWithHooks } from "./outbound-hooks.js";
|
|
21
23
|
import { WeixinReplyProgressSender } from "./reply-progress-sender.js";
|
|
22
24
|
import { sendMessageWeixin } from "./send.js";
|
|
23
25
|
import { sendWeixinMediaFile } from "./send-media.js";
|
|
@@ -45,7 +47,7 @@ function extractTextBody(itemList) {
|
|
|
45
47
|
*/
|
|
46
48
|
export async function processOneMessage(full, deps) {
|
|
47
49
|
if (!deps?.channelRuntime) {
|
|
48
|
-
logger.error(`processOneMessage: channelRuntime is undefined, skipping message from=${full.from_user_id}`);
|
|
50
|
+
logger.error(`processOneMessage: channelRuntime is undefined, skipping message from=${redactToken(full.from_user_id)}`);
|
|
49
51
|
deps.errLog("processOneMessage: channelRuntime is undefined, skip");
|
|
50
52
|
return;
|
|
51
53
|
}
|
|
@@ -71,7 +73,7 @@ export async function processOneMessage(full, deps) {
|
|
|
71
73
|
}
|
|
72
74
|
if (debug) {
|
|
73
75
|
const itemTypes = full.item_list?.map((i) => i.type).join(",") ?? "none";
|
|
74
|
-
debugTrace.push("── 收消息 ──", `│
|
|
76
|
+
debugTrace.push("── 收消息 ──", `│ hasSeq=${full.seq !== undefined} hasMsgId=${full.message_id !== undefined} from=${redactToken(full.from_user_id, 6)}`, `│ bodyLen=${textBody.length} itemTypes=[${itemTypes}]`, `│ hasSessionId=${Boolean(full.session_id)} contextToken=${full.context_token ? "present" : "none"}`);
|
|
75
77
|
}
|
|
76
78
|
// Resolve the agent route early so downloadMedia can place the file under a
|
|
77
79
|
// per-agent subdirectory in the framework media store. Authorization still
|
|
@@ -84,9 +86,9 @@ export async function processOneMessage(full, deps) {
|
|
|
84
86
|
accountId: routeAccountId,
|
|
85
87
|
peer: { kind: "direct", id: senderId },
|
|
86
88
|
});
|
|
87
|
-
logger.debug(`resolveAgentRoute: agentId=${route.agentId
|
|
89
|
+
logger.debug(`resolveAgentRoute: agentId=${redactToken(route.agentId, 6)} sessionKey=${redactToken(route.sessionKey, 6)} mainSessionKey=${redactToken(route.mainSessionKey, 6)}`);
|
|
88
90
|
if (!route.agentId) {
|
|
89
|
-
logger.error(`resolveAgentRoute: no agentId resolved for peer=${senderId}
|
|
91
|
+
logger.error(`resolveAgentRoute: no agentId resolved for peer=${redactToken(senderId)} account=${redactToken(deps.accountId)} — message will not be dispatched`);
|
|
90
92
|
}
|
|
91
93
|
// Sanitize the agentId into a portable, filesystem-safe path component before
|
|
92
94
|
// embedding it under the media store. OpenClaw's media store rejects path
|
|
@@ -101,9 +103,9 @@ export async function processOneMessage(full, deps) {
|
|
|
101
103
|
// gate that case above and emit the legacy `inbound` subdir instead.
|
|
102
104
|
const sanitizedAgentId = route.agentId ? normalizeAgentId(route.agentId) : "";
|
|
103
105
|
const mediaSubdir = sanitizedAgentId ? `weixin/${sanitizedAgentId}/inbound` : "inbound";
|
|
104
|
-
logger.debug(`mediaSubdir:
|
|
106
|
+
logger.debug(`mediaSubdir: agentScoped=${Boolean(sanitizedAgentId)}`);
|
|
105
107
|
if (debug) {
|
|
106
|
-
debugTrace.push("── 路由 ──", `│ route: agent=${route.agentId
|
|
108
|
+
debugTrace.push("── 路由 ──", `│ route: agent=${redactToken(route.agentId, 6)} session=${redactToken(route.sessionKey, 6)}`);
|
|
107
109
|
}
|
|
108
110
|
const mediaOpts = {};
|
|
109
111
|
// Find the first downloadable media item (priority: IMAGE > VIDEO > FILE > VOICE).
|
|
@@ -140,7 +142,6 @@ export async function processOneMessage(full, deps) {
|
|
|
140
142
|
const ctx = weixinMessageToMsgContext(full, deps.accountId, mediaOpts);
|
|
141
143
|
// --- Framework command authorization ---
|
|
142
144
|
const rawBody = textBody.trim() || (ctx.Body?.trim() ?? "");
|
|
143
|
-
ctx.CommandBody = rawBody;
|
|
144
145
|
const { senderAllowedForCommands, commandAuthorized } = await resolveSenderCommandAuthorizationWithRuntime({
|
|
145
146
|
cfg: deps.config,
|
|
146
147
|
rawBody,
|
|
@@ -166,199 +167,126 @@ export async function processOneMessage(full, deps) {
|
|
|
166
167
|
senderAllowedForCommands,
|
|
167
168
|
});
|
|
168
169
|
if (directDmOutcome === "disabled" || directDmOutcome === "unauthorized") {
|
|
169
|
-
logger.info(`authorization: dropping message from=${senderId} outcome=${directDmOutcome}`);
|
|
170
|
+
logger.info(`authorization: dropping message from=${redactToken(senderId)} outcome=${directDmOutcome}`);
|
|
170
171
|
return;
|
|
171
172
|
}
|
|
172
|
-
|
|
173
|
-
logger.debug(`authorization: senderId=${senderId} commandAuthorized=${String(commandAuthorized)} senderAllowed=${String(senderAllowedForCommands)}`);
|
|
173
|
+
logger.debug(`authorization: senderId=${redactToken(senderId, 6)} commandAuthorized=${String(commandAuthorized)} senderAllowed=${String(senderAllowedForCommands)}`);
|
|
174
174
|
if (debug) {
|
|
175
175
|
debugTrace.push("── 鉴权 ──", `│ auth: cmdAuthorized=${String(commandAuthorized)} senderAllowed=${String(senderAllowedForCommands)}`);
|
|
176
176
|
debugTs.preDispatch = Date.now();
|
|
177
177
|
}
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
// the correct session (matching the dmScope from config) instead of falling back
|
|
183
|
-
// to agent:main:main.
|
|
184
|
-
ctx.SessionKey = route.sessionKey;
|
|
185
|
-
const storePath = deps.channelRuntime.session.resolveStorePath(deps.config.session?.store, {
|
|
178
|
+
if (typeof deps.channelRuntime.inbound?.buildContext !== "function") {
|
|
179
|
+
throw new Error("weixin: host inbound.buildContext is missing");
|
|
180
|
+
}
|
|
181
|
+
const contextRoute = {
|
|
186
182
|
agentId: route.agentId,
|
|
183
|
+
routeSessionKey: route.sessionKey,
|
|
184
|
+
...("dmScope" in route ? { dmScope: route.dmScope } : {}),
|
|
185
|
+
};
|
|
186
|
+
const finalized = deps.channelRuntime.inbound.buildContext({
|
|
187
|
+
channel: "openclaw-weixin",
|
|
188
|
+
accountId: deps.accountId,
|
|
189
|
+
from: ctx.From,
|
|
190
|
+
sender: { id: senderId },
|
|
191
|
+
conversation: { kind: "direct", id: ctx.To },
|
|
192
|
+
route: contextRoute,
|
|
193
|
+
reply: { to: ctx.To },
|
|
194
|
+
message: { body: ctx.Body, rawBody: ctx.Body, bodyForAgent: ctx.Body, commandBody: rawBody },
|
|
195
|
+
messageId: ctx.MessageSid,
|
|
196
|
+
timestamp: ctx.Timestamp,
|
|
197
|
+
access: { commands: { authorized: commandAuthorized === true } },
|
|
198
|
+
media: ctx.MediaPath || ctx.MediaUrl
|
|
199
|
+
? [{ path: ctx.MediaPath, url: ctx.MediaUrl, contentType: ctx.MediaType }]
|
|
200
|
+
: undefined,
|
|
187
201
|
});
|
|
188
|
-
|
|
189
|
-
...ctx,
|
|
190
|
-
BodyForAgent: ctx.Body,
|
|
191
|
-
});
|
|
192
|
-
logger.info(`inbound: from=${finalized.From} to=${finalized.To} bodyLen=${(finalized.Body ?? "").length} hasMedia=${Boolean(finalized.MediaPath ?? finalized.MediaUrl)}`);
|
|
193
|
-
logger.debug(`inbound context: ${redactBody(JSON.stringify(finalized))}`);
|
|
194
|
-
await deps.channelRuntime.session.recordInboundSession({
|
|
195
|
-
storePath,
|
|
196
|
-
sessionKey: route.sessionKey,
|
|
197
|
-
ctx: finalized,
|
|
198
|
-
updateLastRoute: {
|
|
199
|
-
sessionKey: route.mainSessionKey,
|
|
200
|
-
channel: "openclaw-weixin",
|
|
201
|
-
to: ctx.To,
|
|
202
|
-
accountId: deps.accountId,
|
|
203
|
-
},
|
|
204
|
-
onRecordError: (err) => deps.errLog(`recordInboundSession: ${String(err)}`),
|
|
205
|
-
});
|
|
206
|
-
logger.debug(`recordInboundSession: done storePath=${storePath} sessionKey=${route.sessionKey ?? "(none)"}`);
|
|
202
|
+
logger.info(`inbound: from=${redactToken(finalized.From)} to=${redactToken(finalized.To)} bodyLen=${(finalized.Body ?? "").length} hasMedia=${Boolean(ctx.MediaPath ?? ctx.MediaUrl)}`);
|
|
207
203
|
const contextToken = getContextTokenFromMsgContext(ctx);
|
|
208
204
|
const runId = randomUUID();
|
|
205
|
+
const sendOptions = { baseUrl: deps.baseUrl, token: deps.token, contextToken, runId };
|
|
206
|
+
const humanDelay = deps.channelRuntime.reply.resolveHumanDelayConfig(deps.config, route.agentId);
|
|
207
|
+
const typingTicket = deps.typingTicket;
|
|
208
|
+
const updateTyping = async (status) => {
|
|
209
|
+
if (typingTicket) {
|
|
210
|
+
await sendTyping({
|
|
211
|
+
baseUrl: deps.baseUrl,
|
|
212
|
+
token: deps.token,
|
|
213
|
+
body: { ilink_user_id: ctx.To, typing_ticket: typingTicket, status },
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
};
|
|
217
|
+
const typingCallbacks = createTypingCallbacks({
|
|
218
|
+
start: () => updateTyping(TypingStatus.TYPING),
|
|
219
|
+
stop: () => updateTyping(TypingStatus.CANCEL),
|
|
220
|
+
onStartError: (err) => deps.log(`[weixin] typing send error: ${redactError(err)}`),
|
|
221
|
+
onStopError: (err) => deps.log(`[weixin] typing cancel error: ${redactError(err)}`),
|
|
222
|
+
keepaliveIntervalMs: 5000,
|
|
223
|
+
});
|
|
209
224
|
const replyProgressSender = resolveReplyProgressMessagesEnabled(deps.config)
|
|
210
225
|
? new WeixinReplyProgressSender({
|
|
211
226
|
runId,
|
|
212
227
|
to: ctx.To,
|
|
213
228
|
accountId: deps.accountId,
|
|
214
|
-
opts:
|
|
215
|
-
baseUrl: deps.baseUrl,
|
|
216
|
-
token: deps.token,
|
|
217
|
-
contextToken,
|
|
218
|
-
},
|
|
229
|
+
opts: sendOptions,
|
|
219
230
|
})
|
|
220
231
|
: undefined;
|
|
221
|
-
const humanDelay = deps.channelRuntime.reply.resolveHumanDelayConfig(deps.config, route.agentId);
|
|
222
|
-
const typingTicket = deps.typingTicket;
|
|
223
|
-
const typingCallbacks = createTypingCallbacks({
|
|
224
|
-
start: typingTicket
|
|
225
|
-
? () => sendTyping({
|
|
226
|
-
baseUrl: deps.baseUrl,
|
|
227
|
-
token: deps.token,
|
|
228
|
-
body: {
|
|
229
|
-
ilink_user_id: ctx.To,
|
|
230
|
-
typing_ticket: typingTicket,
|
|
231
|
-
status: TypingStatus.TYPING,
|
|
232
|
-
},
|
|
233
|
-
})
|
|
234
|
-
: async () => { },
|
|
235
|
-
stop: typingTicket
|
|
236
|
-
? () => sendTyping({
|
|
237
|
-
baseUrl: deps.baseUrl,
|
|
238
|
-
token: deps.token,
|
|
239
|
-
body: {
|
|
240
|
-
ilink_user_id: ctx.To,
|
|
241
|
-
typing_ticket: typingTicket,
|
|
242
|
-
status: TypingStatus.CANCEL,
|
|
243
|
-
},
|
|
244
|
-
})
|
|
245
|
-
: async () => { },
|
|
246
|
-
onStartError: (err) => deps.log(`[weixin] typing send error: ${String(err)}`),
|
|
247
|
-
onStopError: (err) => deps.log(`[weixin] typing cancel error: ${String(err)}`),
|
|
248
|
-
keepaliveIntervalMs: 5000,
|
|
249
|
-
});
|
|
250
232
|
/** Delivery records populated synchronously at deliver() entry, safe to read in finally. */
|
|
251
233
|
const debugDeliveries = [];
|
|
252
|
-
const
|
|
253
|
-
|
|
254
|
-
|
|
234
|
+
const delivery = {
|
|
235
|
+
preparePayload: (payload) => {
|
|
236
|
+
const filter = new StreamingMarkdownFilter();
|
|
237
|
+
return { ...payload, text: filter.feed(payload.text ?? "") + filter.flush() };
|
|
238
|
+
},
|
|
255
239
|
deliver: async (payload) => {
|
|
256
|
-
const
|
|
257
|
-
let text = (() => {
|
|
258
|
-
const f = new StreamingMarkdownFilter();
|
|
259
|
-
return f.feed(rawText) + f.flush();
|
|
260
|
-
})();
|
|
240
|
+
const text = payload.text ?? "";
|
|
261
241
|
const mediaUrl = payload.mediaUrl ?? payload.mediaUrls?.[0];
|
|
262
|
-
logger.
|
|
263
|
-
logger.info(`outbound: to=${ctx.To} contextToken=${redactToken(contextToken)} textLen=${text.length} mediaUrl=${mediaUrl ? "present" : "none"}`);
|
|
242
|
+
logger.info(`outbound: to=${redactToken(ctx.To)} contextToken=${redactToken(contextToken)} textLen=${text.length} mediaUrl=${mediaUrl ? "present" : "none"}`);
|
|
264
243
|
if (debug) {
|
|
265
244
|
debugDeliveries.push({
|
|
266
245
|
textLen: text.length,
|
|
267
246
|
media: mediaUrl ? "present" : "none",
|
|
268
|
-
preview: `${text.slice(0, 60)}${text.length > 60 ? "…" : ""}`,
|
|
269
247
|
ts: Date.now(),
|
|
270
248
|
});
|
|
271
249
|
}
|
|
272
|
-
const sendingResult = await applyWeixinMessageSendingHook({
|
|
273
|
-
to: ctx.To,
|
|
274
|
-
text,
|
|
275
|
-
accountId: deps.accountId,
|
|
276
|
-
mediaUrl,
|
|
277
|
-
runId,
|
|
278
|
-
});
|
|
279
|
-
if (sendingResult.cancelled) {
|
|
280
|
-
logger.info(`outbound: cancelled by message_sending hook to=${ctx.To}`);
|
|
281
|
-
return;
|
|
282
|
-
}
|
|
283
|
-
text = sendingResult.text;
|
|
284
250
|
try {
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
else if (!path.isAbsolute(mediaUrl)) {
|
|
292
|
-
filePath = path.resolve(mediaUrl);
|
|
293
|
-
logger.debug(`outbound: resolved relative path ${mediaUrl} -> ${filePath}`);
|
|
294
|
-
}
|
|
295
|
-
else {
|
|
296
|
-
filePath = mediaUrl;
|
|
297
|
-
}
|
|
298
|
-
logger.debug(`outbound: local file path resolved filePath=${filePath}`);
|
|
299
|
-
}
|
|
300
|
-
else if (mediaUrl.startsWith("http://") || mediaUrl.startsWith("https://")) {
|
|
301
|
-
logger.debug(`outbound: downloading remote mediaUrl=${mediaUrl.slice(0, 80)}...`);
|
|
251
|
+
const remote = mediaUrl?.startsWith("http://") || mediaUrl?.startsWith("https://");
|
|
252
|
+
let result;
|
|
253
|
+
if (mediaUrl && (!mediaUrl.includes("://") || mediaUrl.startsWith("file://") || remote)) {
|
|
254
|
+
let filePath = mediaUrl;
|
|
255
|
+
if (remote) {
|
|
256
|
+
logger.debug("outbound: downloading remote media");
|
|
302
257
|
filePath = await downloadRemoteImageToTemp(mediaUrl, MEDIA_OUTBOUND_TEMP_DIR);
|
|
303
|
-
logger.debug(
|
|
258
|
+
logger.debug("outbound: remote media downloaded");
|
|
259
|
+
}
|
|
260
|
+
else if (mediaUrl.startsWith("file://")) {
|
|
261
|
+
filePath = new URL(mediaUrl).pathname;
|
|
304
262
|
}
|
|
305
|
-
else {
|
|
306
|
-
|
|
307
|
-
await sendMessageWeixin({
|
|
308
|
-
to: ctx.To,
|
|
309
|
-
text,
|
|
310
|
-
opts: {
|
|
311
|
-
baseUrl: deps.baseUrl,
|
|
312
|
-
token: deps.token,
|
|
313
|
-
contextToken,
|
|
314
|
-
runId,
|
|
315
|
-
},
|
|
316
|
-
});
|
|
317
|
-
emitWeixinMessageSent({ to: ctx.To, content: text, success: true, accountId: deps.accountId, runId });
|
|
318
|
-
logger.info(`outbound: text sent to=${ctx.To}`);
|
|
319
|
-
return;
|
|
263
|
+
else if (!path.isAbsolute(mediaUrl)) {
|
|
264
|
+
filePath = path.resolve(mediaUrl);
|
|
320
265
|
}
|
|
321
|
-
await sendWeixinMediaFile({
|
|
266
|
+
result = await sendWeixinMediaFile({
|
|
322
267
|
filePath,
|
|
323
268
|
to: ctx.To,
|
|
324
269
|
text,
|
|
325
|
-
opts:
|
|
270
|
+
opts: sendOptions,
|
|
326
271
|
cdnBaseUrl: deps.cdnBaseUrl,
|
|
327
272
|
});
|
|
328
|
-
|
|
329
|
-
logger.info(`outbound: media sent OK to=${ctx.To}`);
|
|
273
|
+
logger.info(`outbound: media sent OK to=${redactToken(ctx.To)}`);
|
|
330
274
|
}
|
|
331
275
|
else {
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
opts: {
|
|
337
|
-
baseUrl: deps.baseUrl,
|
|
338
|
-
token: deps.token,
|
|
339
|
-
contextToken,
|
|
340
|
-
runId,
|
|
341
|
-
},
|
|
342
|
-
});
|
|
343
|
-
emitWeixinMessageSent({ to: ctx.To, content: text, success: true, accountId: deps.accountId, runId });
|
|
344
|
-
logger.info(`outbound: text sent OK to=${ctx.To}`);
|
|
276
|
+
if (mediaUrl)
|
|
277
|
+
logger.warn("outbound: unrecognized media URL scheme, sending text only");
|
|
278
|
+
result = await sendMessageWeixin({ to: ctx.To, text, opts: sendOptions });
|
|
279
|
+
logger.info(`outbound: text sent OK to=${redactToken(ctx.To)}`);
|
|
345
280
|
}
|
|
281
|
+
return { messageIds: [result.messageId], content: text };
|
|
346
282
|
}
|
|
347
283
|
catch (err) {
|
|
348
|
-
|
|
349
|
-
to: ctx.To,
|
|
350
|
-
content: text,
|
|
351
|
-
success: false,
|
|
352
|
-
error: String(err),
|
|
353
|
-
accountId: deps.accountId,
|
|
354
|
-
runId,
|
|
355
|
-
});
|
|
356
|
-
logger.error(`outbound: FAILED to=${ctx.To} mediaUrl=${mediaUrl ?? "none"} err=${String(err)} stack=${err.stack ?? ""}`);
|
|
284
|
+
logger.error(`outbound: FAILED to=${redactToken(ctx.To)} hasMedia=${Boolean(mediaUrl)} err=${redactError(err)}`);
|
|
357
285
|
throw err;
|
|
358
286
|
}
|
|
359
287
|
},
|
|
360
288
|
onError: (err, info) => {
|
|
361
|
-
deps.errLog(`weixin reply ${info.kind}: ${
|
|
289
|
+
deps.errLog(`weixin reply ${info.kind}: ${redactError(err)}`);
|
|
362
290
|
const errMsg = err instanceof Error ? err.message : String(err);
|
|
363
291
|
let notice;
|
|
364
292
|
if (errMsg.includes("remote media download failed") || errMsg.includes("fetch")) {
|
|
@@ -368,7 +296,7 @@ export async function processOneMessage(full, deps) {
|
|
|
368
296
|
notice = `⚠️ 媒体文件上传失败,请稍后重试。`;
|
|
369
297
|
}
|
|
370
298
|
else {
|
|
371
|
-
notice = `⚠️
|
|
299
|
+
notice = `⚠️ 消息发送失败,请稍后重试。`;
|
|
372
300
|
}
|
|
373
301
|
void sendWeixinErrorNotice({
|
|
374
302
|
to: ctx.To,
|
|
@@ -380,45 +308,49 @@ export async function processOneMessage(full, deps) {
|
|
|
380
308
|
errLog: deps.errLog,
|
|
381
309
|
});
|
|
382
310
|
},
|
|
383
|
-
}
|
|
311
|
+
};
|
|
384
312
|
let queuedFollowup = false;
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
313
|
+
try {
|
|
314
|
+
logger.debug(`inbound.dispatch: starting agentId=${redactToken(route.agentId, 6)}`);
|
|
315
|
+
await dispatchWeixinInboundTurn({
|
|
316
|
+
channelRuntime: deps.channelRuntime,
|
|
317
|
+
channel: "openclaw-weixin",
|
|
318
|
+
accountId: deps.accountId,
|
|
319
|
+
cfg: deps.config,
|
|
320
|
+
route,
|
|
321
|
+
ctxPayload: finalized,
|
|
322
|
+
record: {
|
|
323
|
+
updateLastRoute: {
|
|
324
|
+
sessionKey: route.mainSessionKey,
|
|
325
|
+
channel: "openclaw-weixin",
|
|
326
|
+
to: ctx.To,
|
|
327
|
+
accountId: deps.accountId,
|
|
328
|
+
},
|
|
329
|
+
onRecordError: (err) => deps.errLog(`recordInboundSession: ${redactError(err)}`),
|
|
330
|
+
},
|
|
331
|
+
delivery,
|
|
332
|
+
dispatcherOptions: { humanDelay, typingCallbacks },
|
|
333
|
+
replyOptions: {
|
|
334
|
+
...(replyProgressSender?.replyOptions ?? {}),
|
|
335
|
+
runId,
|
|
336
|
+
disableBlockStreaming: !resolveWeixinBlockStreamingEnabled(deps.config, routeAccountId, deps.accountId),
|
|
337
|
+
},
|
|
338
|
+
onReplyAdmitted: deps.onReplyAdmitted,
|
|
339
|
+
onReplyDeferred: () => {
|
|
391
340
|
queuedFollowup = true;
|
|
392
|
-
deps.onReplyAdmitted?.();
|
|
393
341
|
},
|
|
394
|
-
|
|
395
|
-
},
|
|
396
|
-
onAgentRunStart: () => deps.onReplyAdmitted?.(),
|
|
397
|
-
onTurnAdopted: deps.onReplyAdmitted,
|
|
398
|
-
disableBlockStreaming: true,
|
|
399
|
-
};
|
|
400
|
-
logger.debug(`dispatchReplyFromConfig: starting agentId=${route.agentId ?? "(none)"}`);
|
|
401
|
-
try {
|
|
402
|
-
await deps.channelRuntime.reply.withReplyDispatcher({
|
|
403
|
-
dispatcher,
|
|
404
|
-
run: () => deps.channelRuntime.reply.dispatchReplyFromConfig({
|
|
405
|
-
ctx: finalized,
|
|
406
|
-
cfg: deps.config,
|
|
407
|
-
dispatcher,
|
|
408
|
-
replyOptions: dispatchReplyOptions,
|
|
409
|
-
}),
|
|
342
|
+
onDeferredComplete: () => void replyProgressSender?.finalize(),
|
|
410
343
|
});
|
|
411
|
-
logger.debug(`
|
|
344
|
+
logger.debug(`inbound.dispatch: done agentId=${redactToken(route.agentId, 6)}`);
|
|
412
345
|
}
|
|
413
346
|
catch (err) {
|
|
414
|
-
logger.error(`
|
|
347
|
+
logger.error(`inbound.dispatch: error agentId=${redactToken(route.agentId)} err=${redactError(err)}`);
|
|
415
348
|
throw err;
|
|
416
349
|
}
|
|
417
350
|
finally {
|
|
418
|
-
markDispatchIdle();
|
|
419
351
|
if (!queuedFollowup)
|
|
420
352
|
await replyProgressSender?.finalize();
|
|
421
|
-
logger.info(`debug-check:
|
|
353
|
+
logger.info(`debug-check: account=${redactToken(deps.accountId)} debug=${String(debug)} hasContextToken=${Boolean(contextToken)}`);
|
|
422
354
|
if (debug && contextToken) {
|
|
423
355
|
const dispatchDoneAt = Date.now();
|
|
424
356
|
const eventTs = full.create_time_ms ?? 0;
|
|
@@ -429,7 +361,7 @@ export async function processOneMessage(full, deps) {
|
|
|
429
361
|
if (debugDeliveries.length > 0) {
|
|
430
362
|
debugTrace.push("── 回复 ──");
|
|
431
363
|
for (const d of debugDeliveries) {
|
|
432
|
-
debugTrace.push(`│ textLen=${d.textLen} media=${d.media}
|
|
364
|
+
debugTrace.push(`│ textLen=${d.textLen} media=${d.media}`);
|
|
433
365
|
}
|
|
434
366
|
const firstTs = debugDeliveries[0].ts;
|
|
435
367
|
debugTrace.push(`│ deliver耗时: ${dispatchDoneAt - firstTs}ms`);
|
|
@@ -439,17 +371,16 @@ export async function processOneMessage(full, deps) {
|
|
|
439
371
|
}
|
|
440
372
|
debugTrace.push("── 耗时 ──", `├ 平台→插件: ${platformDelay}`, `├ 入站处理(auth+route+media): ${inboundProcessMs}ms (mediaDownload: ${mediaDownloadMs}ms)`, `├ AI生成+回复: ${aiMs}ms`, `├ 总耗时: ${totalTime}`, `└ eventTime: ${eventTs > 0 ? new Date(eventTs).toISOString() : "N/A"}`);
|
|
441
373
|
const timingText = `⏱ Debug 全链路\n${debugTrace.join("\n")}`;
|
|
442
|
-
logger.info(`debug-timing: sending to=${ctx.To}`);
|
|
374
|
+
logger.info(`debug-timing: sending to=${redactToken(ctx.To)}`);
|
|
443
375
|
try {
|
|
444
|
-
await
|
|
445
|
-
to: ctx.To,
|
|
446
|
-
text: timingText,
|
|
447
|
-
opts: { baseUrl: deps.baseUrl, token: deps.token, contextToken, runId },
|
|
376
|
+
const result = await sendWeixinWithHooks({ to: ctx.To, text: timingText, accountId: deps.accountId, runId }, async (text) => {
|
|
377
|
+
await sendMessageWeixin({ to: ctx.To, text, opts: sendOptions });
|
|
448
378
|
});
|
|
449
|
-
|
|
379
|
+
if (result?.visibleReplySent !== false)
|
|
380
|
+
logger.info(`debug-timing: sent OK`);
|
|
450
381
|
}
|
|
451
382
|
catch (debugErr) {
|
|
452
|
-
logger.error(`debug-timing: send FAILED err=${
|
|
383
|
+
logger.error(`debug-timing: send FAILED err=${redactError(debugErr)}`);
|
|
453
384
|
}
|
|
454
385
|
}
|
|
455
386
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-message.js","sourceRoot":"","sources":["../../../src/messaging/process-message.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"process-message.js","sourceRoot":"","sources":["../../../src/messaging/process-message.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { MessageItemType } from "../api/types.js";
|
|
2
2
|
import { logger } from "../util/logger.js";
|
|
3
|
+
import { redactError, redactToken } from "../util/redact.js";
|
|
3
4
|
import { sendMessageItemWeixin } from "./send.js";
|
|
4
5
|
function normalizeToolStatus(status) {
|
|
5
6
|
if (status === "completed")
|
|
@@ -42,7 +43,7 @@ export class WeixinReplyProgressSender {
|
|
|
42
43
|
});
|
|
43
44
|
})
|
|
44
45
|
.catch((err) => {
|
|
45
|
-
logger.warn(`${label}: failed to=${this.to}
|
|
46
|
+
logger.warn(`${label}: failed to=${redactToken(this.to)} account=${redactToken(this.accountId)} runId=${this.runId} err=${redactError(err)}`);
|
|
46
47
|
});
|
|
47
48
|
}
|
|
48
49
|
handleToolItemEvent(payload) {
|
|
@@ -86,7 +87,7 @@ export class WeixinReplyProgressSender {
|
|
|
86
87
|
await this.sendChain;
|
|
87
88
|
}
|
|
88
89
|
catch (err) {
|
|
89
|
-
logger.warn(`WeixinReplyProgressSender.finalize: send drain failed runId=${this.runId} err=${
|
|
90
|
+
logger.warn(`WeixinReplyProgressSender.finalize: send drain failed runId=${this.runId} err=${redactError(err)}`);
|
|
90
91
|
}
|
|
91
92
|
}
|
|
92
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-progress-sender.js","sourceRoot":"","sources":["../../../src/messaging/reply-progress-sender.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"reply-progress-sender.js","sourceRoot":"","sources":["../../../src/messaging/reply-progress-sender.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAqBlD,SAAS,mBAAmB,CAAC,MAAe;IAC1C,IAAI,MAAM,KAAK,WAAW;QAAE,OAAO,WAAW,CAAC;IAC/C,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACzC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,OAAO,yBAAyB;IAC3B,KAAK,CAAS;IAEN,EAAE,CAAS;IACX,SAAS,CAAS;IAClB,IAAI,CAAwC;IACrD,SAAS,GAAG,KAAK,CAAC;IAClB,SAAS,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAErD,YAAY,IAAmC;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;IAClD,CAAC;IAED,IAAI,YAAY;QACd,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,WAAW,EAAE,CAAC,OAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;SAClF,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,IAAiB,EAAE,KAAa;QACrD,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;aAC5B,IAAI,CAAC,KAAK,IAAI,EAAE;YACf,MAAM,qBAAqB,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI;gBACJ,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK;aACN,CAAC,CAAC;QACL,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,MAAM,CAAC,IAAI,CACT,GAAG,KAAK,eAAe,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,KAAK,QAAQ,WAAW,CAAC,GAAG,CAAC,EAAE,CACjI,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,mBAAmB,CAAC,OAA6B;QACvD,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAC3B,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO;QACpC,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK;YAAE,OAAO;QAEjE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC;QACzE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;QAEvD,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YAC9B,IAAI,CAAC,cAAc,CACjB;gBACE,IAAI,EAAE,eAAe,CAAC,eAAe;gBACrC,cAAc,EAAE,GAAG;gBACnB,YAAY,EAAE,KAAK;gBACnB,oBAAoB,EAAE;oBACpB,SAAS,EAAE,QAAQ;oBACnB,YAAY,EAAE,UAAU;iBACzB;aACF,EACD,0BAA0B,CAC3B,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,cAAc,CACjB;YACE,IAAI,EAAE,eAAe,CAAC,gBAAgB;YACtC,cAAc,EAAE,GAAG;YACnB,YAAY,EAAE,IAAI;YAClB,qBAAqB,EAAE;gBACrB,SAAS,EAAE,QAAQ;gBACnB,YAAY,EAAE,UAAU;gBACxB,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC;aAC5C;SACF,EACD,2BAA2B,CAC5B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC,+DAA+D,IAAI,CAAC,KAAK,QAAQ,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnH,CAAC;IACH,CAAC;CACF"}
|
|
@@ -2,6 +2,7 @@ import path from "node:path";
|
|
|
2
2
|
import { uploadFileAttachmentToWeixin, uploadFileToWeixin, uploadVideoToWeixin } from "../cdn/upload.js";
|
|
3
3
|
import { getMimeFromFilename } from "../media/mime.js";
|
|
4
4
|
import { logger } from "../util/logger.js";
|
|
5
|
+
import { redactToken } from "../util/redact.js";
|
|
5
6
|
import { sendFileMessageWeixin, sendImageMessageWeixin, sendVideoMessageWeixin } from "./send.js";
|
|
6
7
|
/**
|
|
7
8
|
* Upload a local file and send it as a weixin message, routing by MIME type:
|
|
@@ -17,30 +18,30 @@ export async function sendWeixinMediaFile(params) {
|
|
|
17
18
|
const mime = getMimeFromFilename(filePath);
|
|
18
19
|
const uploadOpts = { baseUrl: opts.baseUrl, token: opts.token };
|
|
19
20
|
if (mime.startsWith("video/")) {
|
|
20
|
-
logger.info(`[weixin] sendWeixinMediaFile: uploading video
|
|
21
|
+
logger.info(`[weixin] sendWeixinMediaFile: uploading video to=${redactToken(to)}`);
|
|
21
22
|
const uploaded = await uploadVideoToWeixin({
|
|
22
23
|
filePath,
|
|
23
24
|
toUserId: to,
|
|
24
25
|
opts: uploadOpts,
|
|
25
26
|
cdnBaseUrl,
|
|
26
27
|
});
|
|
27
|
-
logger.info(`[weixin] sendWeixinMediaFile: video upload done filekey=${uploaded.filekey} size=${uploaded.fileSize}`);
|
|
28
|
+
logger.info(`[weixin] sendWeixinMediaFile: video upload done filekey=${redactToken(uploaded.filekey)} size=${uploaded.fileSize}`);
|
|
28
29
|
return sendVideoMessageWeixin({ to, text, uploaded, opts });
|
|
29
30
|
}
|
|
30
31
|
if (mime.startsWith("image/")) {
|
|
31
|
-
logger.info(`[weixin] sendWeixinMediaFile: uploading image
|
|
32
|
+
logger.info(`[weixin] sendWeixinMediaFile: uploading image to=${redactToken(to)}`);
|
|
32
33
|
const uploaded = await uploadFileToWeixin({
|
|
33
34
|
filePath,
|
|
34
35
|
toUserId: to,
|
|
35
36
|
opts: uploadOpts,
|
|
36
37
|
cdnBaseUrl,
|
|
37
38
|
});
|
|
38
|
-
logger.info(`[weixin] sendWeixinMediaFile: image upload done filekey=${uploaded.filekey} size=${uploaded.fileSize}`);
|
|
39
|
+
logger.info(`[weixin] sendWeixinMediaFile: image upload done filekey=${redactToken(uploaded.filekey)} size=${uploaded.fileSize}`);
|
|
39
40
|
return sendImageMessageWeixin({ to, text, uploaded, opts });
|
|
40
41
|
}
|
|
41
42
|
// File attachment: pdf, doc, zip, etc.
|
|
42
43
|
const fileName = path.basename(filePath);
|
|
43
|
-
logger.info(`[weixin] sendWeixinMediaFile: uploading file attachment
|
|
44
|
+
logger.info(`[weixin] sendWeixinMediaFile: uploading file attachment to=${redactToken(to)}`);
|
|
44
45
|
const uploaded = await uploadFileAttachmentToWeixin({
|
|
45
46
|
filePath,
|
|
46
47
|
fileName,
|
|
@@ -48,7 +49,7 @@ export async function sendWeixinMediaFile(params) {
|
|
|
48
49
|
opts: uploadOpts,
|
|
49
50
|
cdnBaseUrl,
|
|
50
51
|
});
|
|
51
|
-
logger.info(`[weixin] sendWeixinMediaFile: file upload done filekey=${uploaded.filekey} size=${uploaded.fileSize}`);
|
|
52
|
+
logger.info(`[weixin] sendWeixinMediaFile: file upload done filekey=${redactToken(uploaded.filekey)} size=${uploaded.fileSize}`);
|
|
52
53
|
return sendFileMessageWeixin({ to, text, fileName, uploaded, opts });
|
|
53
54
|
}
|
|
54
55
|
//# sourceMappingURL=send-media.js.map
|