@xmanrui/dsh-im 1.1.0 → 1.3.0

package/src/channels/dingtalk/dingtalk-api.mjs

@@ -435,6 +435,48 @@ export function createDingtalkApi({
     return request;
   }
 
+  async function messageFileDownloadUrl({
+    clientId,
+    clientSecret,
+    robotCode,
+    downloadCode,
+    signal,
+    kind,
+  }) {
+    const botCode = nonEmptyString(robotCode);
+    const fileCode = nonEmptyString(downloadCode);
+    if (!botCode || !fileCode) throw new TypeError('robotCode and downloadCode are required');
+    const token = await accessToken({ clientId, clientSecret, signal });
+    let response;
+    try {
+      response = await requestJson(
+        fetchImpl,
+        endpoint(apiBase, 'v1.0/robot/messageFiles/download'),
+        {
+          body: { downloadCode: fileCode, robotCode: botCode },
+          headers: { 'x-acs-dingtalk-access-token': token },
+          signal,
+          action: `${kind === 'image' ? '图片' : '文件'}下载地址`,
+        },
+      );
+    } catch (error) {
+      if (signal?.aborted) throw error;
+      throw new DingtalkApiError(
+        `${kind}-download-address-failed`,
+        `钉钉${kind === 'image' ? '图片' : '文件'}下载地址获取失败。`,
+        { cause: error, status: error?.status, providerCode: error?.providerCode },
+      );
+    }
+    const downloadUrl = nonEmptyString(response?.downloadUrl ?? response?.download_url);
+    if (!downloadUrl) {
+      throw new DingtalkApiError(
+        `invalid-${kind}-download`,
+        `钉钉服务没有返回${kind === 'image' ? '图片' : '文件'}下载地址。`,
+      );
+    }
+    return secureDingtalkDownloadUrl(downloadUrl);
+  }
+
   function acquireCardRequestSlot(signal) {
     const acquire = async () => {
       const waitMs = Math.max(0, nextCardRequestAt - now());
@@ -568,45 +610,69 @@ export function createDingtalkApi({
       signal,
       maxBytes,
     }) {
-      const botCode = nonEmptyString(robotCode);
-      const fileCode = nonEmptyString(downloadCode);
-      if (!botCode || !fileCode) throw new TypeError('robotCode and downloadCode are required');
-      const token = await accessToken({ clientId, clientSecret, signal });
-      let response;
+      const downloadUrl = await messageFileDownloadUrl({
+        clientId,
+        clientSecret,
+        robotCode,
+        downloadCode,
+        signal,
+        kind: 'image',
+      });
       try {
-        response = await requestJson(
+        return await fetchImageBuffer(downloadUrl, {
           fetchImpl,
-          endpoint(apiBase, 'v1.0/robot/messageFiles/download'),
-          {
-            body: { downloadCode: fileCode, robotCode: botCode },
-            headers: { 'x-acs-dingtalk-access-token': token },
-            signal,
-            action: '图片下载地址',
-          },
-        );
+          signal,
+          maxBytes,
+        });
       } catch (error) {
-        if (signal?.aborted) throw error;
+        if (signal?.aborted || error instanceof ImagePromptError) throw error;
         throw new DingtalkApiError(
-          'image-download-address-failed',
-          '钉钉图片下载地址获取失败。',
-          { cause: error, status: error?.status, providerCode: error?.providerCode },
+          'image-content-download-failed',
+          '钉钉图片内容下载失败。',
+          { cause: error },
         );
       }
-      const downloadUrl = nonEmptyString(response?.downloadUrl ?? response?.download_url);
-      if (!downloadUrl) {
-        throw new DingtalkApiError('invalid-image-download', '钉钉服务没有返回图片下载地址。');
+    },
+
+    async downloadFile({
+      clientId,
+      clientSecret,
+      robotCode,
+      downloadCode,
+      signal,
+    }) {
+      const downloadUrl = await messageFileDownloadUrl({
+        clientId,
+        clientSecret,
+        robotCode,
+        downloadCode,
+        signal,
+        kind: 'file',
+      });
+      if (downloadUrl.protocol !== 'https:') {
+        throw new DingtalkApiError('invalid-file-download', '钉钉服务返回了无效的文件下载地址。');
       }
       try {
-        return await fetchImageBuffer(secureDingtalkDownloadUrl(downloadUrl), {
-          fetchImpl,
+        const response = await fetchImpl(downloadUrl, {
+          method: 'GET',
+          redirect: 'follow',
           signal,
-          maxBytes,
         });
+        if (!response?.ok) {
+          await response?.body?.cancel?.().catch?.(() => undefined);
+          throw new DingtalkApiError(
+            'file-content-download-failed',
+            `钉钉文件内容下载失败（HTTP ${response?.status ?? 'unknown'}）。`,
+            { status: response?.status },
+          );
+        }
+        return Buffer.from(await response.arrayBuffer());
       } catch (error) {
-        if (signal?.aborted || error instanceof ImagePromptError) throw error;
+        if (signal?.aborted) throw abortError(signal);
+        if (error instanceof DingtalkApiError) throw error;
         throw new DingtalkApiError(
-          'image-content-download-failed',
-          '钉钉图片内容下载失败。',
+          'file-content-download-failed',
+          '钉钉文件内容下载失败。',
           { cause: error },
         );
       }

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

@@ -29,6 +29,11 @@ import {
   imagePromptUserMessage,
   promptContentForMessage,
 } from '../shared/image-prompt.mjs';
+import {
+  hasInboundFiles,
+  inboundFileUserMessage,
+  prefetchInboundFiles,
+} from '../shared/inbound-file.mjs';
 import { rememberConnectionTestTarget } from '../shared/connection-test.mjs';
 import {
   materializeOutboundArtifact,
@@ -48,7 +53,7 @@ const INTERACTION_RESOLVED_TEXT = '这个问题已在其他客户端处理，无
 const HELP_TEXT = [
   '钉钉机器人已连接 DeepSeek Harness。',
   '',
-  '直接发送文字或图片即可继续当前会话。',
+  '直接发送文字、图片或文件即可继续当前会话。',
   '/new  开启一个全新会话',
   '/compact  压缩当前会话的较早上下文',
   '/workspace 工作区绝对路径  切换工作区',
@@ -175,6 +180,7 @@ export function dingtalkInboundMessage(message, {
       if (code) imageCodes.push(code);
     }
   }
+  const fileCode = msgtype === 'file' ? downloadCodeFor(content) : null;
   return {
     content: text,
     images: imageCodes.map((downloadCode, index) => ({
@@ -193,6 +199,21 @@ export function dingtalkInboundMessage(message, {
         });
       },
     })),
+    files: fileCode ? [{
+      name: nonEmptyString(content?.fileName ?? content?.file_name) ?? 'file',
+      load: ({ signal } = {}) => {
+        if (typeof api?.downloadFile !== 'function') {
+          throw new Error('DingTalk API does not support file downloads');
+        }
+        return api.downloadFile({
+          clientId,
+          clientSecret,
+          robotCode: message?.robotCode,
+          downloadCode: fileCode,
+          signal,
+        });
+      },
+    }] : [],
   };
 }
 
@@ -393,7 +414,7 @@ export class DingtalkHarnessBridge {
       clientSecret: this.#clientSecret,
     });
     const commandText = nonEmptyString(promptMessage.content) ?? '';
-    const commandRunner = isControlCommand(commandText)
+    const commandRunner = hasInboundFiles(promptMessage) ? null : isControlCommand(commandText)
       ? runControlCommand
       : (isModelCommand(commandText)
           ? runModelCommand
@@ -499,10 +520,28 @@ export class DingtalkHarnessBridge {
     releaseMessageId = true,
     alreadyRecorded = false,
   } = {}) {
+    let hasSafeReplyRoute = false;
+    try {
+      normalizeDingtalkSessionWebhook(message.sessionWebhook);
+      hasSafeReplyRoute = true;
+    } catch {
+      // Keep the existing rejection path without downloading an unusable file.
+    }
+    const addressed = String(message.conversationType) !== '2' || message.isInAtList === true;
+    const preparedMessage = hasSafeReplyRoute && addressed
+      ? prefetchInboundFiles(dingtalkInboundMessage(message, {
+          api: this.#api,
+          clientId: this.#clientId,
+          clientSecret: this.#clientSecret,
+        }), { signal: this.#signal })
+      : undefined;
     const previous = this.#queues.get(key) ?? Promise.resolve();
     const current = previous
       .catch(() => undefined)
-      .then(() => this.#process(message, messageId, sender, key, { alreadyRecorded }))
+      .then(() => this.#process(message, messageId, sender, key, {
+        alreadyRecorded,
+        preparedMessage,
+      }))
       .finally(() => {
         if (releaseMessageId) this.#acceptedMessageIds.delete(messageId);
         if (this.#queues.get(key) === current) this.#queues.delete(key);
@@ -536,6 +575,7 @@ export class DingtalkHarnessBridge {
       {
         signal: this.#signal,
         hasImages: hasInboundImages(prompt),
+        hasFiles: hasInboundFiles(prompt),
         pendingInteraction: this.#pendingInteractions.has(key)
           || this.#approvals.hasPending(key),
         control: { owner: this, key },
@@ -553,7 +593,10 @@ export class DingtalkHarnessBridge {
     this.#status.lastError = null;
   }
 
-  async #process(message, messageId, sender, key, { alreadyRecorded = false } = {}) {
+  async #process(message, messageId, sender, key, {
+    alreadyRecorded = false,
+    preparedMessage,
+  } = {}) {
     this.#signal?.throwIfAborted();
     if (!alreadyRecorded) {
       if (this.#state.hasSeen(messageId)) return;
@@ -577,38 +620,39 @@ export class DingtalkHarnessBridge {
       return;
     }
 
-    const promptMessage = dingtalkInboundMessage(message, {
+    const promptMessage = preparedMessage ?? dingtalkInboundMessage(message, {
       api: this.#api,
       clientId: this.#clientId,
       clientSecret: this.#clientSecret,
     });
     const text = promptMessage.content;
     const hasImages = hasInboundImages(promptMessage);
+    const hasFiles = hasInboundFiles(promptMessage);
     const isPlainText = String(message?.msgtype).toLowerCase() === 'text';
     let cardStream = null;
     let cardStarted = false;
     try {
-      if (!text && !hasImages) {
-        await this.#send(sessionWebhook, '目前支持文字和图片消息。');
+      if (!text && !hasImages && !hasFiles) {
+        await this.#send(sessionWebhook, '目前支持文字、图片和文件消息。');
         return;
       }
 
       const command = text.toLowerCase();
-      if (isPlainText && !hasImages && command === '/help') {
+      if (isPlainText && !hasImages && !hasFiles && command === '/help') {
         await this.#send(sessionWebhook, HELP_TEXT);
         return;
       }
-      if (isPlainText && !hasImages && command === '/status') {
+      if (isPlainText && !hasImages && !hasFiles && command === '/status') {
         await this.#harness.ensureRunning({ signal: this.#signal });
         await this.#send(sessionWebhook, '钉钉机器人与 DeepSeek Harness 连接正常。');
         return;
       }
-      if (isPlainText && !hasImages && command === '/new') {
+      if (isPlainText && !hasImages && !hasFiles && command === '/new') {
         await this.#state.clearSession(key);
         await this.#send(sessionWebhook, '已开启新会话。请发送你的问题。');
         return;
       }
-      const workspaceCommand = isPlainText && !hasImages
+      const workspaceCommand = isPlainText && !hasImages && !hasFiles
         ? await runWorkspaceCommand(text, this.#harness, key)
         : null;
       if (workspaceCommand) {
@@ -617,7 +661,7 @@ export class DingtalkHarnessBridge {
         }
         return;
       }
-      const compactCommand = isPlainText && !hasImages
+      const compactCommand = isPlainText && !hasImages && !hasFiles
         ? await runCompactCommand(
             text,
             this.#harness,
@@ -668,6 +712,7 @@ export class DingtalkHarnessBridge {
             requiresMention: String(message.conversationType) === '2',
           }),
           onInteractionResolved: (resolution) => this.#handleInteractionResolved(resolution),
+          files: promptMessage.files,
         },
       });
       const answerText = typeof answer === 'string' && answer.trim()
@@ -717,7 +762,9 @@ export class DingtalkHarnessBridge {
         safeErrorDiagnostic(error),
       );
       try {
-        const errorText = dingtalkImageErrorUserMessage(error) ?? CARD_ERROR_TEXT;
+        const errorText = inboundFileUserMessage(error)
+          ?? dingtalkImageErrorUserMessage(error)
+          ?? CARD_ERROR_TEXT;
         const streamed = cardStarted && await cardStream.finish(errorText);
         if (!streamed) await this.#send(sessionWebhook, errorText);
       } catch {

package/src/channels/discord/discord-runtime.mjs

@@ -1,4 +1,5 @@
 import { createEditableMessageStream, splitMessageText } from '../shared/editable-message-stream.mjs';
+import { fetchFileStream } from '../shared/file-download.mjs';
 import { fetchImageBuffer } from '../shared/image-prompt.mjs';
 import { DiscordApi } from './discord-api.mjs';
 import { createDiscordBridgeStatus, DiscordHarnessBridge } from './discord-bridge.mjs';
@@ -88,6 +89,25 @@ function discordImageSource(attachment, fetchImpl) {
   };
 }
 
+function discordFileSource(attachment, fetchImpl) {
+  if (attachmentMediaType(attachment) || typeof attachment?.url !== 'string' || !attachment.url) {
+    return null;
+  }
+  const mediaType = typeof attachment.content_type === 'string' && attachment.content_type
+    ? attachment.content_type.split(';', 1)[0].trim().toLowerCase() : undefined;
+  return {
+    name: typeof attachment.filename === 'string' && attachment.filename
+      ? attachment.filename : String(attachment.id ?? 'discord-file'),
+    ...(mediaType ? { mediaType } : {}),
+    size: attachmentSize(attachment.size),
+    load: ({ signal } = {}) => fetchFileStream(attachment.url, {
+      fetchImpl,
+      signal,
+      allowedHosts: DISCORD_IMAGE_HOSTS,
+    }),
+  };
+}
+
 export function normalizeDiscordMessage(message, botId, { fetchImpl = fetch } = {}) {
   if (!message?.id || !message?.channel_id || !message?.author?.id) return null;
   const direct = !message.guild_id;
@@ -103,6 +123,9 @@ export function normalizeDiscordMessage(message, botId, { fetchImpl = fetch } =
     images: Array.isArray(message.attachments)
       ? message.attachments.map((attachment) => discordImageSource(attachment, fetchImpl)).filter(Boolean)
       : [],
+    files: Array.isArray(message.attachments)
+      ? message.attachments.map((attachment) => discordFileSource(attachment, fetchImpl)).filter(Boolean)
+      : [],
     addressed,
     replyTarget: {
       channelId: String(message.channel_id),

package/src/channels/feishu/bridge.mjs

@@ -12,6 +12,10 @@ import {
   imagePromptUserMessage,
   promptContentForMessage,
 } from '../shared/image-prompt.mjs';
+import {
+  hasInboundFiles,
+  inboundFileUserMessage,
+} from '../shared/inbound-file.mjs';
 import {
   harnessAnswerForQuestion,
   harnessQuestionText,
@@ -91,7 +95,7 @@ const REPAIR_URL_HOSTS = new Set([
 const HELP_TEXT = [
   '北汇星河 AIOS 已连接 DeepSeek Harness。',
   '',
-  '直接发送文字或图片即可继续当前会话。',
+  '直接发送文字、图片或文件即可继续当前会话。',
   '/new  开启一个全新会话',
   '/compact  压缩当前会话的较早上下文',
   '/workspace 工作区绝对路径  切换工作区',
@@ -431,7 +435,7 @@ export class FeishuHarnessBridge {
     const processingReaction = this.#addReaction(messageId, 'OnIt');
     const commandMessage = extractInboundMessage(event, this.#client);
     const commandText = nonEmptyString(commandMessage.content) ?? '';
-    const commandRunner = isControlCommand(commandText)
+    const commandRunner = hasInboundFiles(commandMessage) ? null : isControlCommand(commandText)
       ? runControlCommand
       : (isModelCommand(commandText)
           ? runModelCommand
@@ -610,7 +614,8 @@ export class FeishuHarnessBridge {
     await this.#finishReaction(messageId, processingReaction, 'ERROR');
     await this.#send(
       event.message.chat_id,
-      imagePromptUserMessage(error)
+      inboundFileUserMessage(error)
+        ?? imagePromptUserMessage(error)
         ?? '处理失败，请稍后重试。如果问题持续，请在 DeepSeek Harness 的飞书插件页面检查连接状态。',
     ).catch(() => undefined);
   }
@@ -641,6 +646,7 @@ export class FeishuHarnessBridge {
       {
         signal: this.#signal,
         hasImages: hasInboundImages(message),
+        hasFiles: hasInboundFiles(message),
         pendingInteraction: this.#pendingInteractions.has(key)
           || this.#approvals.hasPending(key),
         control: { owner: this, key },
@@ -671,9 +677,10 @@ export class FeishuHarnessBridge {
     const message = extractInboundMessage(event, this.#client);
     const text = message.content;
     const hasImages = hasInboundImages(message);
-    const commandText = event.message.message_type === 'text' && !hasImages ? text : null;
-    if (!text && !hasImages) {
-      await this.#send(event.message.chat_id, '目前支持文字和图片消息。');
+    const hasFiles = hasInboundFiles(message);
+    const commandText = event.message.message_type === 'text' && !hasImages && !hasFiles ? text : null;
+    if (!text && !hasImages && !hasFiles) {
+      await this.#send(event.message.chat_id, '目前支持文字、图片和文件消息。');
       return;
     }
 
@@ -1603,7 +1610,7 @@ export class FeishuHarnessBridge {
     }
   }
 
-  #interactionAskOptions(event, key) {
+  #interactionAskOptions(event, key, files) {
     return {
       timeoutMs: this.#replyTimeoutMs,
       signal: this.#signal,
@@ -1615,6 +1622,7 @@ export class FeishuHarnessBridge {
         requiresMention: event.message.chat_type !== 'p2p',
       }),
       onInteractionResolved: (resolution) => this.#handleInteractionResolved(resolution),
+      files,
     };
   }
 
@@ -1709,7 +1717,7 @@ export class FeishuHarnessBridge {
         content,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },
-        askOptions: this.#interactionAskOptions(event, key),
+        askOptions: this.#interactionAskOptions(event, key, message.files),
       });
       let textReceipt;
       let textSendError = null;
@@ -1749,7 +1757,7 @@ export class FeishuHarnessBridge {
         markdown: async (controller) => {
           promptStarted = true;
           const askOptions = {
-            ...this.#interactionAskOptions(event, key),
+            ...this.#interactionAskOptions(event, key, message.files),
             onUpdate: async (update) => {
               await controller.setContent(this.#progressText(update));
               this.#status.streamUpdates = (this.#status.streamUpdates ?? 0) + 1;
@@ -1821,7 +1829,7 @@ export class FeishuHarnessBridge {
         content,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },
-        askOptions: this.#interactionAskOptions(event, key),
+        askOptions: this.#interactionAskOptions(event, key, message.files),
       });
       let textReceipt;
       let textSendError = null;

package/src/channels/feishu/message-utils.mjs

@@ -125,6 +125,31 @@ async function readBoundedStream(stream, { signal, maxBytes }) {
   }
 }
 
+async function readStream(stream, { signal }) {
+  if (!stream || typeof stream[Symbol.asyncIterator] !== 'function') {
+    throw new Error('Feishu file download returned no readable stream');
+  }
+  signal?.throwIfAborted();
+  const abort = () => stream.destroy?.(
+    signal.reason ?? new DOMException('Feishu file download aborted', 'AbortError'),
+  );
+  signal?.addEventListener('abort', abort, { once: true });
+  const chunks = [];
+  let size = 0;
+  try {
+    for await (const chunk of stream) {
+      signal?.throwIfAborted();
+      const data = Buffer.from(chunk);
+      size += data.length;
+      chunks.push(data);
+    }
+    signal?.throwIfAborted();
+    return Buffer.concat(chunks, size);
+  } finally {
+    signal?.removeEventListener('abort', abort);
+  }
+}
+
 function providerCode(value) {
   if (!value || typeof value !== 'object') return null;
   const code = value.code ?? value.error?.code;
@@ -232,6 +257,26 @@ function feishuImageSource(event, client, key) {
   };
 }
 
+function feishuFileSource(event, client, file) {
+  const key = nonEmptyString(file?.file_key);
+  if (!key) return null;
+  return {
+    name: nonEmptyString(file?.file_name) ?? 'file',
+    async load({ signal } = {}) {
+      signal?.throwIfAborted();
+      const resource = await client?.im?.v1?.messageResource?.get?.({
+        path: {
+          message_id: event.message.message_id,
+          file_key: key,
+        },
+        params: { type: 'file' },
+      });
+      signal?.throwIfAborted();
+      return readStream(resource?.getReadableStream?.(), { signal });
+    },
+  };
+}
+
 export function extractInboundMessage(event, client) {
   const messageType = event?.message?.message_type;
   const parsed = parsedMessageContent(event);
@@ -240,9 +285,11 @@ export function extractInboundMessage(event, client) {
     ? nonEmptyString(parsed?.image_key)
     : null;
   const imageKeys = standaloneImageKey ? [standaloneImageKey] : post?.imageKeys ?? [];
+  const file = messageType === 'file' ? feishuFileSource(event, client, parsed) : null;
   return {
     content: messageType === 'text' ? extractText(event) ?? '' : post?.text ?? '',
     images: imageKeys.map((key) => feishuImageSource(event, client, key)),
+    files: file ? [file] : [],
   };
 }