@ryantest/openclaw-qqbot 0.0.3 → 1.6.6-alpha.0

package/dist/src/outbound-deliver.js

@@ -6,12 +6,12 @@
  * 2. sendPlainReply — 处理不含媒体标签的普通回复（markdown 图片/纯文本+图片）
  */
 import { sendC2CMessage, sendGroupMessage, sendChannelMessage, sendC2CImageMessage, sendGroupImageMessage } from "./api.js";
-import { sendPhoto, sendVoice, sendVideoMsg, sendDocument, sendMedia as sendMediaAuto } from "./outbound.js";
+import { sendPhoto, sendMedia as sendMediaAuto } from "./outbound.js";
 import { chunkText, TEXT_CHUNK_LIMIT } from "./channel.js";
 import { getQQBotRuntime } from "./runtime.js";
 import { getImageSize, formatQQBotMarkdownImage, hasQQBotImageSize } from "./utils/image-size.js";
-import { normalizeMediaTags } from "./utils/media-tags.js";
-import { normalizePath, isLocalPath as isLocalFilePath } from "./utils/platform.js";
+import { parseMediaTagsToSendQueue, executeSendQueue } from "./utils/media-send.js";
+import { isLocalPath as isLocalFilePath } from "./utils/platform.js";
 import { filterInternalMarkers } from "./utils/text-parsing.js";
 // ============ 1. 媒体标签解析 + 发送 ============
 /**
@@ -22,42 +22,13 @@ import { filterInternalMarkers } from "./utils/text-parsing.js";
 export async function parseAndSendMediaTags(replyText, event, actx, sendWithRetry, consumeQuoteRef) {
     const { account, log } = actx;
     const prefix = `[qqbot:${account.accountId}]`;
-    // 预处理：纠正小模型常见的标签拼写错误和格式问题
-    const text = normalizeMediaTags(replyText);
-    const mediaTagRegex = /<(qqimg|qqvoice|qqvideo|qqfile|qqmedia)>([^<>]+)<\/(?:qqimg|qqvoice|qqvideo|qqfile|qqmedia|img)>/gi;
-    const mediaTagMatches = [...text.matchAll(mediaTagRegex)];
-    if (mediaTagMatches.length === 0) {
-        return { handled: false, normalizedText: text };
-    }
-    const tagCounts = mediaTagMatches.reduce((acc, m) => { const t = m[1].toLowerCase(); acc[t] = (acc[t] ?? 0) + 1; return acc; }, {});
-    log?.info(`${prefix} Detected media tags: ${Object.entries(tagCounts).map(([k, v]) => `${v} <${k}>`).join(", ")}`);
-    const sendQueue = [];
-    let lastIndex = 0;
-    const regex2 = /<(qqimg|qqvoice|qqvideo|qqfile|qqmedia)>([^<>]+)<\/(?:qqimg|qqvoice|qqvideo|qqfile|qqmedia|img)>/gi;
-    let match;
-    while ((match = regex2.exec(text)) !== null) {
-        const textBefore = text.slice(lastIndex, match.index).replace(/\n{3,}/g, "\n\n").trim();
-        if (textBefore) {
-            sendQueue.push({ type: "text", content: filterInternalMarkers(textBefore) });
-        }
-        const tagName = match[1].toLowerCase();
-        let mediaPath = decodeMediaPath(match[2]?.trim() ?? "", log, prefix);
-        if (mediaPath) {
-            const typeMap = {
-                qqmedia: "media", qqvoice: "voice", qqvideo: "video", qqfile: "file",
-            };
-            const itemType = typeMap[tagName] ?? "image";
-            sendQueue.push({ type: itemType, content: mediaPath });
-            log?.info(`${prefix} Found ${itemType} in <${tagName}>: ${mediaPath}`);
-        }
-        lastIndex = match.index + match[0].length;
-    }
-    const textAfter = text.slice(lastIndex).replace(/\n{3,}/g, "\n\n").trim();
-    if (textAfter) {
-        sendQueue.push({ type: "text", content: filterInternalMarkers(textAfter) });
+    // 使用 media-send.ts 的统一解析器（内含 normalizeMediaTags + 路径编码修复）
+    const { hasMediaTags: hasMedia, sendQueue } = parseMediaTagsToSendQueue(replyText, log);
+    if (!hasMedia || sendQueue.length === 0) {
+        return { handled: false, normalizedText: replyText };
     }
     log?.info(`${prefix} Send queue: ${sendQueue.map(item => item.type).join(" -> ")}`);
-    // 按顺序发送
+    // 构建统一的媒体发送上下文
     const mediaTarget = {
         targetType: event.type === "c2c" ? "c2c" : event.type === "group" ? "group" : "channel",
         targetId: event.type === "c2c" ? event.senderId : event.type === "group" ? event.groupOpenid : event.channelId,
@@ -65,42 +36,20 @@ export async function parseAndSendMediaTags(replyText, event, actx, sendWithRetr
         replyToId: event.messageId,
         logPrefix: prefix,
     };
-    for (const item of sendQueue) {
-        if (item.type === "text") {
-            await sendTextChunks(item.content, event, actx, sendWithRetry, consumeQuoteRef);
-        }
-        else if (item.type === "image") {
-            const result = await sendPhoto(mediaTarget, item.content);
-            if (result.error)
-                log?.error(`${prefix} sendPhoto error: ${result.error}`);
-        }
-        else if (item.type === "voice") {
-            await sendVoiceWithTimeout(mediaTarget, item.content, account, log, prefix);
-        }
-        else if (item.type === "video") {
-            const result = await sendVideoMsg(mediaTarget, item.content);
-            if (result.error)
-                log?.error(`${prefix} sendVideoMsg error: ${result.error}`);
-        }
-        else if (item.type === "file") {
-            const result = await sendDocument(mediaTarget, item.content);
-            if (result.error)
-                log?.error(`${prefix} sendDocument error: ${result.error}`);
-        }
-        else if (item.type === "media") {
-            const result = await sendMediaAuto({
-                to: actx.qualifiedTarget,
-                text: "",
-                mediaUrl: item.content,
-                accountId: account.accountId,
-                replyToId: event.messageId,
-                account,
-            });
-            if (result.error)
-                log?.error(`${prefix} sendMedia(auto) error: ${result.error}`);
-        }
-    }
-    return { handled: true, normalizedText: text };
+    const mediaSendCtx = {
+        mediaTarget,
+        qualifiedTarget: actx.qualifiedTarget,
+        account,
+        replyToId: event.messageId,
+        log,
+    };
+    // 使用 media-send.ts 的统一执行器
+    await executeSendQueue(sendQueue, mediaSendCtx, {
+        onSendText: async (textContent) => {
+            await sendTextChunks(filterInternalMarkers(textContent), event, actx, sendWithRetry, consumeQuoteRef);
+        },
+    });
+    return { handled: true, normalizedText: replyText };
 }
 /**
  * 发送不含媒体标签的普通回复。
@@ -109,6 +58,25 @@ export async function parseAndSendMediaTags(replyText, event, actx, sendWithRetr
 export async function sendPlainReply(payload, replyText, event, actx, sendWithRetry, consumeQuoteRef, toolMediaUrls) {
     const { account, qualifiedTarget, log } = actx;
     const prefix = `[qqbot:${account.accountId}]`;
+    // 预去重：把 payload 自带的媒体 URL 从 toolMediaUrls 中移除，
+    // 防止同一个文件既被 payload.mediaUrl/mediaUrls 发送，又被 toolMediaUrls 重复发送
+    if (toolMediaUrls.length > 0) {
+        const payloadUrls = new Set();
+        if (payload.mediaUrl)
+            payloadUrls.add(payload.mediaUrl);
+        if (payload.mediaUrls)
+            for (const u of payload.mediaUrls)
+                payloadUrls.add(u);
+        if (payloadUrls.size > 0) {
+            const before = toolMediaUrls.length;
+            const filtered = toolMediaUrls.filter(url => !payloadUrls.has(url));
+            if (filtered.length < before) {
+                log?.info(`${prefix} Pre-dedup: removed ${before - filtered.length} payload media URL(s) from toolMediaUrls`);
+                toolMediaUrls.length = 0;
+                toolMediaUrls.push(...filtered);
+            }
+        }
+    }
     const collectedImageUrls = [];
     const localMediaToSend = [];
     const collectImageUrl = (url) => {
@@ -184,78 +152,52 @@ export async function sendPlainReply(payload, replyText, event, actx, sendWithRe
                     to: qualifiedTarget, text: "", mediaUrl: mediaPath,
                     accountId: account.accountId, replyToId: event.messageId, account,
                 });
-                if (result.error)
+                if (result.error) {
                     log?.error(`${prefix} sendMedia(auto) error for ${mediaPath}: ${result.error}`);
-                else
+                    await sendTextChunks(result.error, event, actx, sendWithRetry, consumeQuoteRef);
+                }
+                else {
                     log?.info(`${prefix} Sent local media: ${mediaPath}`);
+                }
             }
             catch (err) {
                 log?.error(`${prefix} sendMedia(auto) failed for ${mediaPath}: ${err}`);
+                await sendTextChunks(`发送媒体失败：${err}`, event, actx, sendWithRetry, consumeQuoteRef);
             }
         }
     }
-    // 转发 tool 阶段收集的媒体
+    // 转发 tool 阶段收集的媒体（去重：跳过已在 localMediaToSend 或 collectedImageUrls 中发送过的路径）
     if (toolMediaUrls.length > 0) {
-        log?.info(`${prefix} Forwarding ${toolMediaUrls.length} tool-collected media URL(s) after block deliver`);
-        for (const mediaUrl of toolMediaUrls) {
-            try {
-                const result = await sendMediaAuto({
-                    to: qualifiedTarget, text: "", mediaUrl,
-                    accountId: account.accountId, replyToId: event.messageId, account,
-                });
-                if (result.error)
-                    log?.error(`${prefix} Tool media forward error: ${result.error}`);
-                else
-                    log?.info(`${prefix} Forwarded tool media: ${mediaUrl.slice(0, 80)}...`);
-            }
-            catch (err) {
-                log?.error(`${prefix} Tool media forward failed: ${err}`);
-            }
+        const alreadySent = new Set([...localMediaToSend, ...collectedImageUrls]);
+        const dedupedToolMedia = toolMediaUrls.filter(url => !alreadySent.has(url));
+        if (dedupedToolMedia.length < toolMediaUrls.length) {
+            log?.info(`${prefix} Deduped tool media: ${toolMediaUrls.length} → ${dedupedToolMedia.length} (skipped ${toolMediaUrls.length - dedupedToolMedia.length} already sent via localMedia/collectedImages)`);
         }
-        toolMediaUrls.length = 0;
-    }
-}
-// ============ 内部辅助函数 ============
-/** 解码媒体路径：剥离 MEDIA: 前缀、展开 ~、修复转义 */
-function decodeMediaPath(raw, log, prefix) {
-    let mediaPath = raw;
-    if (mediaPath.startsWith("MEDIA:")) {
-        mediaPath = mediaPath.slice("MEDIA:".length);
-    }
-    mediaPath = normalizePath(mediaPath);
-    mediaPath = mediaPath.replace(/\\\\/g, "\\");
-    try {
-        const hasOctal = /\\[0-7]{1,3}/.test(mediaPath);
-        const hasNonASCII = /[\u0080-\u00FF]/.test(mediaPath);
-        if (hasOctal || hasNonASCII) {
-            log?.debug?.(`${prefix} Decoding path with mixed encoding: ${mediaPath}`);
-            let decoded = mediaPath.replace(/\\([0-7]{1,3})/g, (_, octal) => {
-                return String.fromCharCode(parseInt(octal, 8));
-            });
-            const bytes = [];
-            for (let i = 0; i < decoded.length; i++) {
-                const code = decoded.charCodeAt(i);
-                if (code <= 0xFF) {
-                    bytes.push(code);
+        if (dedupedToolMedia.length > 0) {
+            log?.info(`${prefix} Forwarding ${dedupedToolMedia.length} tool-collected media URL(s) after block deliver`);
+            for (const mediaUrl of dedupedToolMedia) {
+                try {
+                    const result = await sendMediaAuto({
+                        to: qualifiedTarget, text: "", mediaUrl,
+                        accountId: account.accountId, replyToId: event.messageId, account,
+                    });
+                    if (result.error) {
+                        log?.error(`${prefix} Tool media forward error: ${result.error}`);
+                        await sendTextChunks(result.error, event, actx, sendWithRetry, consumeQuoteRef);
+                    }
+                    else {
+                        log?.info(`${prefix} Forwarded tool media: ${mediaUrl.slice(0, 80)}...`);
+                    }
                 }
-                else {
-                    const charBytes = Buffer.from(decoded[i], "utf8");
-                    bytes.push(...charBytes);
+                catch (err) {
+                    log?.error(`${prefix} Tool media forward failed: ${err}`);
                 }
             }
-            const buffer = Buffer.from(bytes);
-            const utf8Decoded = buffer.toString("utf8");
-            if (!utf8Decoded.includes("\uFFFD") || utf8Decoded.length < decoded.length) {
-                mediaPath = utf8Decoded;
-                log?.debug?.(`${prefix} Successfully decoded path: ${mediaPath}`);
-            }
         }
+        toolMediaUrls.length = 0;
     }
-    catch (decodeErr) {
-        log?.error(`${prefix} Path decode error: ${decodeErr}`);
-    }
-    return mediaPath;
 }
+// ============ 内部辅助函数 ============
 /** 发送文本分块（共用逻辑） */
 async function sendTextChunks(text, event, actx, sendWithRetry, consumeQuoteRef) {
     const { account, log } = actx;
@@ -282,23 +224,6 @@ async function sendTextChunks(text, event, actx, sendWithRetry, consumeQuoteRef)
         }
     }
 }
-/** 语音发送（带 45s 超时保护） */
-async function sendVoiceWithTimeout(target, voicePath, account, log, prefix) {
-    const uploadFormats = account.config?.audioFormatPolicy?.uploadDirectFormats ?? account.config?.voiceDirectUploadFormats;
-    const transcodeEnabled = account.config?.audioFormatPolicy?.transcodeEnabled !== false;
-    const voiceTimeout = 45000;
-    try {
-        const result = await Promise.race([
-            sendVoice(target, voicePath, uploadFormats, transcodeEnabled),
-            new Promise((resolve) => setTimeout(() => resolve({ channel: "qqbot", error: "语音发送超时，已跳过" }), voiceTimeout)),
-        ]);
-        if (result.error)
-            log?.error(`${prefix} sendVoice error: ${result.error}`);
-    }
-    catch (err) {
-        log?.error(`${prefix} sendVoice unexpected error: ${err}`);
-    }
-}
 /** Markdown 模式发送 */
 async function sendMarkdownReply(textWithoutImages, imageUrls, mdMatches, bareUrlMatches, event, actx, sendWithRetry, consumeQuoteRef) {
     const { account, log } = actx;
@@ -428,13 +353,17 @@ async function sendPlainTextReply(textWithoutImages, imageUrls, mdMatches, bareU
         for (const imageUrl of imageUrls) {
             try {
                 const imgResult = await sendPhoto(imgMediaTarget, imageUrl);
-                if (imgResult.error)
+                if (imgResult.error) {
                     log?.error(`${prefix} Failed to send image: ${imgResult.error}`);
-                else
+                    await sendTextChunks(`发送图片失败：${imgResult.error}`, event, actx, sendWithRetry, consumeQuoteRef);
+                }
+                else {
                     log?.info(`${prefix} Sent image via sendPhoto: ${imageUrl.slice(0, 80)}...`);
+                }
             }
             catch (imgErr) {
                 log?.error(`${prefix} Failed to send image: ${imgErr}`);
+                await sendTextChunks(`发送图片失败：${imgErr}`, event, actx, sendWithRetry, consumeQuoteRef);
             }
         }
         if (result.trim()) {

package/dist/src/outbound.d.ts

@@ -78,11 +78,13 @@ export interface MediaTargetContext {
  * sendPhoto — 发送图片消息（对齐 Telegram sendPhoto）
  *
  * 支持三种来源：
- * - 本地文件路径（自动读取转 Base64）
- * - 公网 HTTP/HTTPS URL（urlDirectUpload=true 时先直传平台，失败自动下载重试；=false 时直接下载）
- * - Base64 Data URL
+ * - 本地文件路径 → 分片上传
+ * - 公网 HTTP/HTTPS URL → 下载到本地 → 分片上传（失败发文本链接兜底）
+ * - Base64 Data URL → 直传 QQ API
  */
-export declare function sendPhoto(ctx: MediaTargetContext, imagePath: string): Promise<OutboundResult>;
+export declare function sendPhoto(ctx: MediaTargetContext, imagePath: string, 
+/** 原始来源 URL（仅 fallback 路径使用，记录到引用索引） */
+sourceUrl?: string): Promise<OutboundResult>;
 /**
  * sendVoice — 发送语音消息（对齐 Telegram sendVoice）
  *