@xmanrui/dsh-im 1.2.0 → 1.4.0

package/src/channels/qq/qq-bridge.mjs

@@ -26,6 +26,11 @@ import {
   imagePromptUserMessage,
   promptContentForMessage,
 } from '../shared/image-prompt.mjs';
+import {
+  hasInboundFiles,
+  inboundFileUserMessage,
+  prefetchInboundFiles,
+} from '../shared/inbound-file.mjs';
 import {
   materializeOutboundArtifact,
   releaseOutboundArtifact,
@@ -37,6 +42,7 @@ import {
   mergeDeliveryReceipts,
   providerMessageIdsFor,
 } from '../shared/semantic/delivery.mjs';
+import { sendMarkdownReply } from './markdown-reply.mjs';
 
 const INTERACTION_RESOLVED_TEXT = '这个问题已在其他客户端处理，无需再次回答。';
 const DEFAULT_FILE_UPLOAD_TIMEOUT_MS = 120_000;
@@ -55,7 +61,7 @@ const QQ_IMAGE_FILENAME = /\.(?:gif|jpe?g|png|webp)$/i;
 const HELP_TEXT = [
   'QQ 机器人已连接 DeepSeek Harness。',
   '',
-  '直接发送文字或图片即可继续当前会话。',
+  '直接发送文字、图片或文件即可继续当前会话。',
   '/new  开启一个全新会话',
   '/compact  压缩当前会话的较早上下文',
   '/workspace 工作区绝对路径  切换工作区',
@@ -100,32 +106,63 @@ function hasQqImageAttachments(message) {
     && message.attachments.some(isQqImageAttachment);
 }
 
+function hasQqFileAttachments(message) {
+  return Array.isArray(message?.attachments)
+    && message.attachments.some((attachment) => !isQqImageAttachment(attachment));
+}
+
+async function fetchQqFileBuffer(url, { fetchImpl, signal }) {
+  const normalizedUrl = url.startsWith('//') ? `https:${url}` : url;
+  const response = await fetchImpl(new URL(normalizedUrl), {
+    method: 'GET',
+    signal,
+    redirect: 'follow',
+  });
+  if (!response?.ok) {
+    await response?.body?.cancel?.().catch?.(() => undefined);
+    throw new Error(`QQ file download failed with HTTP ${response?.status ?? 'unknown'}`);
+  }
+  return Buffer.from(await response.arrayBuffer());
+}
+
 /** Convert QQ's attachment metadata into lazily downloaded image references. */
 export function qqInboundMessage(message, { fetchImpl = fetch } = {}) {
   if (typeof fetchImpl !== 'function') throw new TypeError('fetchImpl must be a function');
   const images = [];
+  const files = [];
   for (const attachment of message?.attachments ?? []) {
-    if (!isQqImageAttachment(attachment)) continue;
     const url = nonEmptyString(attachment?.url);
     const name = nonEmptyString(attachment?.filename) ?? undefined;
     const mediaType = attachmentMediaType(attachment);
     const declaredSize = Number(attachment?.size);
-    images.push({
-      ...(name ? { name } : {}),
-      ...(mediaType?.startsWith('image/') ? { mediaType } : {}),
+    if (isQqImageAttachment(attachment)) {
+      images.push({
+        ...(name ? { name } : {}),
+        ...(mediaType?.startsWith('image/') ? { mediaType } : {}),
+        ...(Number.isFinite(declaredSize) && declaredSize >= 0 ? { size: declaredSize } : {}),
+        load: ({ signal, maxBytes }) => {
+          if (!url) throw new Error('QQ image attachment has no download URL');
+          return fetchImageBuffer(url, {
+            fetchImpl,
+            signal,
+            maxBytes,
+            allowedHosts: QQ_IMAGE_HOSTS,
+          });
+        },
+      });
+      continue;
+    }
+    files.push({
+      name: name ?? (files.length === 0 ? 'file' : `file-${files.length + 1}`),
+      ...(mediaType?.includes('/') ? { mediaType } : {}),
       ...(Number.isFinite(declaredSize) && declaredSize >= 0 ? { size: declaredSize } : {}),
-      load: ({ signal, maxBytes }) => {
-        if (!url) throw new Error('QQ image attachment has no download URL');
-        return fetchImageBuffer(url, {
-          fetchImpl,
-          signal,
-          maxBytes,
-          allowedHosts: QQ_IMAGE_HOSTS,
-        });
+      load: ({ signal } = {}) => {
+        if (!url) throw new Error('QQ file attachment has no download URL');
+        return fetchQqFileBuffer(url, { fetchImpl, signal });
       },
     });
   }
-  return { content: safeText(message), images };
+  return { content: safeText(message), images, files };
 }
 
 function nonEmptyString(value) {
@@ -213,6 +250,7 @@ function canClaimInteractionReply(message, pending) {
     && nonEmptyString(message?.senderId) === pending.actor
     && (message.kind !== 'group' || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE')
     && !hasQqImageAttachments(message)
+    && !hasQqFileAttachments(message)
     && nonEmptyString(safeText(message));
 }
 
@@ -303,7 +341,7 @@ export class QqHarnessBridge {
     }
     const pending = this.#pendingInteractions.get(key);
     const commandText = safeText(message);
-    const commandRunner = isControlCommand(commandText)
+    const commandRunner = hasQqFileAttachments(message) ? null : isControlCommand(commandText)
       ? runControlCommand
       : (isModelCommand(commandText)
           ? runModelCommand
@@ -336,7 +374,7 @@ export class QqHarnessBridge {
       key,
       actor: sender,
       messageId,
-      text: hasQqImageAttachments(message) ? '' : safeText(message),
+      text: hasQqImageAttachments(message) || hasQqFileAttachments(message) ? '' : safeText(message),
       addressed: message.kind !== 'group' || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE',
       hasPendingQuestion: Boolean(pending),
       questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
@@ -391,10 +429,19 @@ export class QqHarnessBridge {
     releaseMessageId = true,
     alreadyRecorded = false,
   } = {}) {
+    const allowed = this.#ownerUserOpenid === '*' || message.senderId === this.#ownerUserOpenid;
+    const addressed = message.kind !== 'group'
+      || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE';
+    const preparedMessage = allowed && addressed
+      ? prefetchInboundFiles(
+          qqInboundMessage(message, { fetchImpl: this.#fetchImpl }),
+          { signal: this.#signal },
+        )
+      : undefined;
     const previous = this.#queues.get(key) ?? Promise.resolve();
     const current = previous
       .catch(() => undefined)
-      .then(() => this.#process(message, key, { alreadyRecorded }))
+      .then(() => this.#process(message, key, { alreadyRecorded, preparedMessage }))
       .finally(() => {
         if (releaseMessageId) this.#acceptedMessageIds.delete(messageId);
         if (this.#queues.get(key) === current) this.#queues.delete(key);
@@ -423,6 +470,7 @@ export class QqHarnessBridge {
     const result = await runner(text, this.#harness, this.#state, key, {
       signal: this.#signal,
       hasImages: hasQqImageAttachments(message),
+      hasFiles: hasQqFileAttachments(message),
       pendingInteraction: this.#pendingInteractions.has(key)
         || this.#approvals.hasPending(key),
       control: { owner: this, key },
@@ -520,7 +568,7 @@ export class QqHarnessBridge {
     };
   }
 
-  async #process(message, key, { alreadyRecorded = false } = {}) {
+  async #process(message, key, { alreadyRecorded = false, preparedMessage } = {}) {
     if (this.#signal?.aborted) return;
     const messageId = nonEmptyString(message?.messageId);
     const sender = nonEmptyString(message?.senderId);
@@ -539,35 +587,37 @@ export class QqHarnessBridge {
     if (message.kind === 'group' && message.rawEventType !== 'GROUP_AT_MESSAGE_CREATE') return;
 
     const target = message.replyTarget;
-    const promptMessage = qqInboundMessage(message, { fetchImpl: this.#fetchImpl });
+    const promptMessage = preparedMessage
+      ?? qqInboundMessage(message, { fetchImpl: this.#fetchImpl });
     const text = promptMessage.content;
     const hasImages = hasInboundImages(promptMessage);
+    const hasFiles = hasInboundFiles(promptMessage);
     let stream = null;
     try {
-      if (!text && !hasImages) {
-        await this.#bot.sendText(target, '目前支持文字和图片消息。');
+      if (!text && !hasImages && !hasFiles) {
+        await this.#bot.sendText(target, '目前支持文字、图片和文件消息。');
         await this.#state.markSeen(messageId);
         return;
       }
       const command = text.toLowerCase();
-      if (!hasImages && command === '/help') {
+      if (!hasImages && !hasFiles && command === '/help') {
         await this.#bot.sendText(target, HELP_TEXT);
         await this.#state.markSeen(messageId);
         return;
       }
-      if (!hasImages && command === '/status') {
+      if (!hasImages && !hasFiles && command === '/status') {
         await this.#harness.ensureRunning({ signal: this.#signal });
         await this.#bot.sendText(target, 'QQ 机器人与 DeepSeek Harness 连接正常。');
         await this.#state.markSeen(messageId);
         return;
       }
-      if (!hasImages && command === '/new') {
+      if (!hasImages && !hasFiles && command === '/new') {
         await this.#state.clearSession(key);
         await this.#bot.sendText(target, '已开启新会话。请发送你的问题。');
         await this.#state.markSeen(messageId);
         return;
       }
-      const workspaceCommand = hasImages
+      const workspaceCommand = hasImages || hasFiles
         ? null
         : await runWorkspaceCommand(text, this.#harness, key);
       if (workspaceCommand) {
@@ -577,7 +627,7 @@ export class QqHarnessBridge {
         await this.#state.markSeen(messageId);
         return;
       }
-      const compactCommand = hasImages
+      const compactCommand = hasImages || hasFiles
         ? null
         : await runCompactCommand(
             text,
@@ -595,14 +645,17 @@ export class QqHarnessBridge {
       const content = hasImages
         ? await promptContentForMessage(promptMessage, { signal: this.#signal })
         : undefined;
-      let streamFinished = false;
+      // QQ C2C keeps one stream bubble. Progress is collected but never submitted:
+      // some clients reject replacing an already visible stream frame, which would
+      // otherwise leave a stale progress bubble plus a separate fallback answer.
       if (message.kind === 'c2c' && target?.msgId && typeof this.#bot.openStream === 'function') {
         try {
           stream = this.#bot.openStream({ target });
         } catch (error) {
-          this.#logger.warn?.('[dsh-im:qq] unable to start a QQ stream; using a text reply:', error);
+          this.#logger.warn?.('[dsh-im:qq] unable to start a QQ stream; using markdown fallback:', error);
         }
       }
+      const toolErrors = [];
       let answer;
       let artifacts = [];
       try {
@@ -617,14 +670,15 @@ export class QqHarnessBridge {
             timeoutMs: this.#replyTimeoutMs,
             signal: this.#signal,
             control: { owner: this, key },
-            onUpdate: stream ? async (update) => {
-              const progress = update.type === 'text'
-                ? update.text
-                : update.type === 'tool'
-                  ? `正在使用${update.name}…`
-                  : update.text;
-              if (progress) await stream.update(progress);
-            } : undefined,
+            progressMode: 'all',
+            onUpdate: (update) => {
+              if (update.error) {
+                const label = nonEmptyString(update.toolName)
+                  ? `Tool call ${update.toolName}` : 'Tool call';
+                const text = `${label}\nError: ${update.error}`;
+                toolErrors.push(text);
+              }
+            },
             onInteraction: (interaction) => this.#handleInteraction(interaction, {
               key,
               actor: sender,
@@ -632,6 +686,7 @@ export class QqHarnessBridge {
               requiresMention: message.kind === 'group',
             }),
             onInteractionResolved: (resolution) => this.#handleInteractionResolved(resolution),
+            files: promptMessage.files,
           },
         }));
       } finally {
@@ -641,31 +696,41 @@ export class QqHarnessBridge {
         ]);
       }
       this.#signal?.throwIfAborted();
-      const displayAnswer = answerTextForDelivery(answer, artifacts);
+      const answerText = answerTextForDelivery(answer, artifacts);
+      const displayAnswer = toolErrors.length > 0
+        ? `${answerText}\n\n---\n\n${toolErrors.join('\n\n')}`
+        : answerText;
       let textReceipt = null;
       let textSendError = null;
       try {
+        let streamFinished = false;
         if (stream) {
           try {
             await stream.update(displayAnswer);
-            await stream.complete();
             streamFinished = true;
             textReceipt = createDeliveryReceipt({
               deliveryId: messageId,
               presentation: 'qq-text',
               providerMessageIds: providerMessageIdsFor(stream),
             });
+            try {
+              await stream.complete();
+            } catch (error) {
+              this.#logger.warn?.('[dsh-im:qq] QQ stream completion failed after visible final content:', error);
+            }
           } catch (error) {
             stream.cancel?.();
-            this.#logger.warn?.('[dsh-im:qq] QQ stream finalization failed; using a text reply:', error);
+            this.#logger.warn?.('[dsh-im:qq] QQ stream update failed; using markdown fallback:', error);
           }
         }
         if (!streamFinished) {
-          const sent = await this.#bot.sendText(target, displayAnswer);
+          const deliveries = await sendMarkdownReply(this.#bot, target, displayAnswer, {
+            logger: this.#logger,
+          });
           textReceipt = createDeliveryReceipt({
             deliveryId: messageId,
             presentation: 'qq-text',
-            providerMessageIds: providerMessageIdsFor(sent),
+            providerMessageIds: deliveries.flatMap((delivery) => providerMessageIdsFor(delivery)),
           });
         }
       } catch (error) {
@@ -686,29 +751,33 @@ export class QqHarnessBridge {
       return delivery.receipt;
     } catch (error) {
       if (error?.code === 'turn-stopped') {
-        if (stream) {
-          try {
-            await stream.cancel?.();
-          } catch (streamError) {
-            this.#logger.warn?.('[dsh-im:qq] unable to cancel a stopped QQ stream:', streamError);
-          }
-          try {
-            await this.#bot.sendText(target, '已停止。');
-          } catch (sendError) {
-            this.#logger.warn?.('[dsh-im:qq] unable to announce a stopped QQ turn:', sendError);
-          }
+        try {
+          stream?.cancel?.();
+        } catch (streamError) {
+          this.#logger.warn?.('[dsh-im:qq] unable to cancel a stopped QQ stream:', streamError);
+        }
+        try {
+          await this.#bot.sendText(target, '已停止。');
+        } catch (sendError) {
+          this.#logger.warn?.('[dsh-im:qq] unable to announce a stopped QQ turn:', sendError);
         }
         await this.#state.markSeen(messageId);
         return;
       }
-      stream?.cancel?.();
+      try {
+        stream?.cancel?.();
+      } catch (streamError) {
+        this.#logger.warn?.('[dsh-im:qq] unable to cancel a failed QQ stream:', streamError);
+      }
       if (this.#signal?.aborted) return;
       this.#status.lastError = error?.message ?? String(error);
       this.#logger.error?.('[dsh-im:qq] failed to process an inbound message:', error);
       try {
         await this.#bot.sendText(
           target,
-          imagePromptUserMessage(error) ?? '消息处理失败，请稍后重试。',
+          inboundFileUserMessage(error)
+            ?? imagePromptUserMessage(error)
+            ?? '消息处理失败，请稍后重试。',
         );
         await this.#state.markSeen(messageId);
       } catch (sendError) {
@@ -734,7 +803,7 @@ export class QqHarnessBridge {
 
     if (message.kind === 'group' && message.rawEventType !== 'GROUP_AT_MESSAGE_CREATE') return;
     const text = nonEmptyString(safeText(message));
-    if (!text || hasQqImageAttachments(message)) {
+    if (!text || hasQqImageAttachments(message) || hasQqFileAttachments(message)) {
       await this.#bot.sendText(message.replyTarget, '请用文字回答当前问题。');
       return;
     }

package/src/channels/shared/file-download.mjs

@@ -0,0 +1,64 @@
+async function cancelResponseBody(response) {
+  try {
+    await response?.body?.cancel?.();
+  } catch {
+    // Preserve the original download failure.
+  }
+}
+
+function hostedByMessagingPlatform(target, allowedHosts) {
+  return !Array.isArray(allowedHosts) || allowedHosts.some((rule) => (
+    typeof rule === 'string'
+    && (target.hostname === rule
+      || (rule.startsWith('.')
+        && (target.hostname === rule.slice(1) || target.hostname.endsWith(rule))))
+  ));
+}
+
+/**
+ * Open a channel-hosted ordinary file as a stream.
+ *
+ * This deliberately has no plugin-defined size, type, count, or download-time
+ * limit. The caller owns cancellation through its AbortSignal and the channel
+ * remains the authority for its own file limits.
+ */
+export async function fetchFileStream(url, {
+  fetchImpl = fetch,
+  headers,
+  signal,
+  allowedHosts,
+} = {}) {
+  const target = new URL(url);
+  if (target.protocol !== 'https:') throw new Error('File download URL must use HTTPS');
+  if (!hostedByMessagingPlatform(target, allowedHosts)) {
+    throw new Error('File download URL is not hosted by the messaging platform');
+  }
+
+  const response = await fetchImpl(target, {
+    method: 'GET',
+    headers,
+    signal,
+    redirect: 'manual',
+  });
+  if (Number.isInteger(response?.status) && response.status >= 300 && response.status < 400) {
+    await cancelResponseBody(response);
+    const error = new Error(`File download redirect was blocked (HTTP ${response.status})`);
+    error.code = 'file-redirect-blocked';
+    throw error;
+  }
+  if (!response?.ok) {
+    await cancelResponseBody(response);
+    const error = new Error(`File download failed with HTTP ${response?.status ?? 'unknown'}`);
+    error.code = 'file-http-error';
+    error.status = response?.status;
+    throw error;
+  }
+  if (response.body?.[Symbol.asyncIterator]) return { stream: response.body };
+  if (typeof response.arrayBuffer === 'function') {
+    const data = Buffer.from(await response.arrayBuffer());
+    return {
+      stream: (async function* fileBody() { yield data; }()),
+    };
+  }
+  throw new Error('File download returned no readable body');
+}