@xmanrui/dsh-im 1.3.0 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "把九种 IM 机器人和公网 AI Office 接入本机 DeepSeek Harness。 Connect nine IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",

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

@@ -540,6 +540,93 @@ export function createDingtalkApi({
     return true;
   }
 
+  async function sendArtifact({
+    clientId,
+    clientSecret,
+    target,
+    file,
+    signal,
+  }, { uploadType, messageKey, createMessageParams }) {
+    if (!file || typeof file !== 'object'
+      || typeof file.fileName !== 'string' || !file.fileName
+      || !Buffer.isBuffer(file.bytes)) {
+      throw new TypeError('A DingTalk file is required');
+    }
+    const normalizedTarget = normalizeFileTarget(target);
+    let token;
+    try {
+      token = await accessToken({ clientId, clientSecret, signal });
+    } catch (error) {
+      if (signal?.aborted) throw abortError(signal);
+      const status = Number(error?.status);
+      const fallback = error?.code === 'http-error' && status >= 400 && status < 500
+        ? 'artifact-provider-rejected'
+        : 'artifact-provider-failed';
+      throw dingtalkArtifactError(error, { fallback });
+    }
+    const uploadUrl = new URL('media/upload', DINGTALK_REGISTRATION_BASE_URL);
+    uploadUrl.searchParams.set('access_token', token);
+    uploadUrl.searchParams.set('type', uploadType);
+    const form = new FormData();
+    form.append(
+      'media',
+      new Blob([file.bytes], { type: file.mediaType ?? 'application/octet-stream' }),
+      file.fileName,
+    );
+    let uploaded;
+    try {
+      uploaded = await requestMultipart(fetchImpl, uploadUrl, { body: form, signal });
+    } catch (error) {
+      if (signal?.aborted) throw abortError(signal);
+      const status = Number(error?.status);
+      const fallback = error?.code === 'http-error' && status >= 400 && status < 500
+        ? 'artifact-provider-rejected'
+        : 'artifact-provider-failed';
+      throw dingtalkArtifactError(error, { fallback });
+    }
+    const uploadRejection = rejectedProviderResponse(uploaded);
+    const mediaId = nonEmptyString(uploaded?.media_id);
+    if (uploadRejection || !mediaId) {
+      throw dingtalkArtifactError(new DingtalkApiError(
+        'upload-rejected',
+        '钉钉服务拒绝了文件上传。',
+        { providerCode: uploadRejection ?? 'missing-media-id' },
+      ));
+    }
+    signal?.throwIfAborted();
+    const messageBody = {
+      robotCode: normalizedTarget.robotCode,
+      msgKey: messageKey,
+      msgParam: JSON.stringify(createMessageParams(mediaId, file)),
+      ...(normalizedTarget.type === 'group'
+        ? { openConversationId: normalizedTarget.openConversationId }
+        : { userIds: [normalizedTarget.userId] }),
+    };
+    const pathname = normalizedTarget.type === 'group'
+      ? 'v1.0/robot/groupMessages/send'
+      : 'v1.0/robot/oToMessages/batchSend';
+    let response;
+    try {
+      response = await requestJson(fetchImpl, endpoint(apiBase, pathname), {
+        body: messageBody,
+        headers: { 'x-acs-dingtalk-access-token': token },
+        signal,
+        action: '文件消息发送',
+      });
+    } catch (error) {
+      throw classifyDingtalkFinalDeliveryError(error, signal);
+    }
+    const sendRejection = rejectedProviderResponse(response);
+    if (sendRejection) {
+      throw dingtalkArtifactError(new DingtalkApiError(
+        'send-rejected',
+        '钉钉服务拒绝了文件消息。',
+        { providerCode: sendRejection },
+      ));
+    }
+    return response;
+  }
+
   return Object.freeze({
     async beginRegistration({ signal } = {}) {
       const initialized = assertRegistrationOk(await requestJson(
@@ -842,89 +929,24 @@ export function createDingtalkApi({
       return true;
     },
 
-    async sendFile({ clientId, clientSecret, target, file, signal }) {
-      if (!file || typeof file !== 'object'
-        || typeof file.fileName !== 'string' || !file.fileName
-        || !Buffer.isBuffer(file.bytes)) {
-        throw new TypeError('A DingTalk file is required');
-      }
-      const normalizedTarget = normalizeFileTarget(target);
-      const fileType = dingtalkFileType(file.fileName);
-      let token;
-      try {
-        token = await accessToken({ clientId, clientSecret, signal });
-      } catch (error) {
-        if (signal?.aborted) throw abortError(signal);
-        const status = Number(error?.status);
-        const fallback = error?.code === 'http-error' && status >= 400 && status < 500
-          ? 'artifact-provider-rejected'
-          : 'artifact-provider-failed';
-        throw dingtalkArtifactError(error, { fallback });
-      }
-      const uploadUrl = new URL('media/upload', DINGTALK_REGISTRATION_BASE_URL);
-      uploadUrl.searchParams.set('access_token', token);
-      uploadUrl.searchParams.set('type', 'file');
-      const form = new FormData();
-      form.append(
-        'media',
-        new Blob([file.bytes], { type: file.mediaType ?? 'application/octet-stream' }),
-        file.fileName,
-      );
-      let uploaded;
-      try {
-        uploaded = await requestMultipart(fetchImpl, uploadUrl, { body: form, signal });
-      } catch (error) {
-        if (signal?.aborted) throw abortError(signal);
-        const status = Number(error?.status);
-        const fallback = error?.code === 'http-error' && status >= 400 && status < 500
-          ? 'artifact-provider-rejected'
-          : 'artifact-provider-failed';
-        throw dingtalkArtifactError(error, { fallback });
-      }
-      const uploadRejection = rejectedProviderResponse(uploaded);
-      if (uploadRejection || !nonEmptyString(uploaded?.media_id)) {
-        throw dingtalkArtifactError(new DingtalkApiError(
-          'upload-rejected',
-          '钉钉服务拒绝了文件上传。',
-          { providerCode: uploadRejection ?? 'missing-media-id' },
-        ));
-      }
-      signal?.throwIfAborted();
-      const messageBody = {
-        robotCode: normalizedTarget.robotCode,
-        msgKey: 'sampleFile',
-        msgParam: JSON.stringify({
-          mediaId: uploaded.media_id,
+    async sendFile(request) {
+      return sendArtifact(request, {
+        uploadType: 'file',
+        messageKey: 'sampleFile',
+        createMessageParams: (mediaId, file) => ({
+          mediaId,
           fileName: file.fileName,
-          fileType,
+          fileType: dingtalkFileType(file.fileName),
         }),
-        ...(normalizedTarget.type === 'group'
-          ? { openConversationId: normalizedTarget.openConversationId }
-          : { userIds: [normalizedTarget.userId] }),
-      };
-      const pathname = normalizedTarget.type === 'group'
-        ? 'v1.0/robot/groupMessages/send'
-        : 'v1.0/robot/oToMessages/batchSend';
-      let response;
-      try {
-        response = await requestJson(fetchImpl, endpoint(apiBase, pathname), {
-          body: messageBody,
-          headers: { 'x-acs-dingtalk-access-token': token },
-          signal,
-          action: '文件消息发送',
-        });
-      } catch (error) {
-        throw classifyDingtalkFinalDeliveryError(error, signal);
-      }
-      const sendRejection = rejectedProviderResponse(response);
-      if (sendRejection) {
-        throw dingtalkArtifactError(new DingtalkApiError(
-          'send-rejected',
-          '钉钉服务拒绝了文件消息。',
-          { providerCode: sendRejection },
-        ));
-      }
-      return response;
+      });
+    },
+
+    async sendImage(request) {
+      return sendArtifact(request, {
+        uploadType: 'image',
+        messageKey: 'sampleImageMsg',
+        createMessageParams: (mediaId) => ({ photoURL: mediaId }),
+      });
     },
 
     clearAccessToken(clientId) {

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

@@ -35,14 +35,9 @@ import {
   prefetchInboundFiles,
 } from '../shared/inbound-file.mjs';
 import { rememberConnectionTestTarget } from '../shared/connection-test.mjs';
+import { deliverOutboundArtifacts } from '../shared/semantic/artifact-delivery.mjs';
 import {
-  materializeOutboundArtifact,
-  releaseOutboundArtifact,
-} from '../shared/semantic/artifact.mjs';
-import {
-  createArtifactFailureReceipt,
   createDeliveryReceipt,
-  mergeDeliveryReceipts,
   providerMessageIdsFor,
 } from '../shared/semantic/delivery.mjs';
 
@@ -1084,70 +1079,39 @@ export class DingtalkHarnessBridge {
   }
 
   async #deliverArtifacts(target, sessionWebhook, replyTo, artifacts, baseReceipt) {
-    const receipts = baseReceipt ? [baseReceipt] : [];
-    let userVisible = Boolean(baseReceipt);
-    for (const artifact of artifacts) {
-      this.#signal?.throwIfAborted();
-      try {
-        if (typeof this.#api.sendFile !== 'function') {
-          const unavailable = new Error('DingTalk file delivery is unavailable');
-          unavailable.code = 'artifact-provider-unavailable';
-          throw unavailable;
-        }
-        const file = await materializeOutboundArtifact(artifact, {
-          signal: this.#signal,
-        });
-        const result = await this.#api.sendFile({
-          clientId: this.#clientId,
-          clientSecret: this.#clientSecret,
-          target,
-          file,
-          signal: this.#signal,
-        });
-        receipts.push(createDeliveryReceipt({
-          deliveryId: file.deliveryKey,
-          presentation: 'dingtalk-file',
-          providerMessageIds: dingtalkFileProviderIds(result),
-          artifacts: [{ artifactId: file.artifactId, outcome: 'sent' }],
-        }));
-        userVisible = true;
-        this.#status.artifactsSent = (this.#status.artifactsSent ?? 0) + 1;
-      } catch (error) {
-        if (this.#signal?.aborted) throw error;
-        this.#status.artifactSendErrors = (this.#status.artifactSendErrors ?? 0) + 1;
-        this.#logger.warn?.(
-          `[dsh-dingtalk] result file delivery failed (${error?.code ?? 'unknown'})`,
-        );
-        let noticeSent = false;
-        const providerMessageIds = await this.#send(
-          sessionWebhook,
-          artifactFailureText(artifact?.fileName, error),
-        ).then((ids) => {
-          noticeSent = true;
-          return ids;
-        }).catch(() => []);
-        const failureReceipt = createArtifactFailureReceipt({
-          artifactId: artifact?.artifactId ?? 'unknown',
-          deliveryId: artifact?.deliveryKey ?? artifact?.artifactId ?? 'unknown',
-          error,
-          providerMessageIds,
-        });
-        receipts.push(failureReceipt);
-        if (noticeSent || failureReceipt.artifacts[0]?.outcome === 'unknown') userVisible = true;
-      } finally {
-        releaseOutboundArtifact(artifact);
-      }
-    }
-    const receipt = receipts.length === 0
-      ? null
-      : receipts.length === 1
-        ? receipts[0]
-        : mergeDeliveryReceipts({
-            deliveryId: replyTo,
-            presentation: baseReceipt ? 'dingtalk-text-and-files' : 'dingtalk-files',
-            receipts,
-          });
-    return { receipt, userVisible };
+    const sendArtifact = async (method, file) => dingtalkFileProviderIds(
+      await this.#api[method]({
+        clientId: this.#clientId,
+        clientSecret: this.#clientSecret,
+        target,
+        file,
+        signal: this.#signal,
+      }),
+    );
+    const delivery = await deliverOutboundArtifacts({
+      artifacts,
+      baseReceipt,
+      deliveryId: replyTo,
+      aggregatePresentation: baseReceipt ? 'dingtalk-text-and-files' : 'dingtalk-files',
+      channelKey: 'dingtalk',
+      signal: this.#signal,
+      sendImage: typeof this.#api.sendImage === 'function'
+        ? (file) => sendArtifact('sendImage', file)
+        : undefined,
+      sendFile: typeof this.#api.sendFile === 'function'
+        ? (file) => sendArtifact('sendFile', file)
+        : undefined,
+      sendFailureNotice: (artifact, error) => this.#send(
+        sessionWebhook,
+        artifactFailureText(artifact?.fileName, error),
+      ),
+      logger: this.#logger,
+    });
+    this.#status.artifactsSent = (this.#status.artifactsSent ?? 0)
+      + delivery.artifactsSent;
+    this.#status.artifactSendErrors = (this.#status.artifactSendErrors ?? 0)
+      + delivery.artifactSendErrors;
+    return { receipt: delivery.receipt, userVisible: delivery.userVisible };
   }
 }
 

package/src/channels/feishu/bridge.mjs

@@ -38,14 +38,9 @@ import {
 } from '../shared/preset-command.mjs';
 import { runWorkspaceCommand, resolveSessionListWorkspace, workspacePathSnapshot } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
+import { deliverOutboundArtifacts } from '../shared/semantic/artifact-delivery.mjs';
 import {
-  materializeOutboundArtifact,
-  releaseOutboundArtifact,
-} from '../shared/semantic/artifact.mjs';
-import {
-  createArtifactFailureReceipt,
   createDeliveryReceipt,
-  mergeDeliveryReceipts,
 } from '../shared/semantic/delivery.mjs';
 import {
   MENU_PAGE_SIZE,
@@ -1641,64 +1636,50 @@ export class FeishuHarnessBridge {
   }
 
   async #deliverArtifacts(chatId, replyTo, artifacts = [], baseReceipt) {
-    const receipts = baseReceipt ? [baseReceipt] : [];
-    let failureNoticeVisible = false;
-    for (const artifact of artifacts) {
-      this.#signal?.throwIfAborted();
-      try {
-        if (typeof this.#channel?.sendFile !== 'function') {
-          const unavailable = new Error('Feishu file delivery is unavailable');
-          unavailable.code = 'artifact-provider-unavailable';
-          throw unavailable;
-        }
-        const file = await materializeOutboundArtifact(artifact, {
-          signal: this.#signal,
-        });
-        receipts.push(await this.#channel.sendFile(chatId, file, {
-          replyTo,
-          signal: this.#signal,
-        }));
-        this.#status.artifactsSent = (this.#status.artifactsSent ?? 0) + 1;
-      } catch (error) {
-        if (this.#signal?.aborted) throw error;
-        this.#status.artifactSendErrors = (this.#status.artifactSendErrors ?? 0) + 1;
-        this.#logger.warn?.(
-          `[dsh-feishu] result file delivery failed (${error?.code ?? 'unknown'})`,
-        );
-        let noticeMessageId = null;
-        try {
-          noticeMessageId = await this.#send(chatId, artifactFailureText(artifact?.fileName, error));
-          failureNoticeVisible = true;
-        } catch {
-          this.#logger.warn?.('[dsh-feishu] unable to send the safe result-file failure notice');
-        }
-        receipts.push(createArtifactFailureReceipt({
-          artifactId: artifact?.artifactId ?? 'unknown',
-          deliveryId: artifact?.deliveryKey ?? artifact?.artifactId ?? 'unknown',
-          error,
-          providerMessageIds: noticeMessageId ? [noticeMessageId] : [],
-        }));
-      } finally {
-        releaseOutboundArtifact(artifact);
-      }
-    }
-    if (receipts.length === 0) {
+    const delivery = await deliverOutboundArtifacts({
+      artifacts,
+      baseReceipt,
+      deliveryId: baseReceipt?.deliveryId ?? artifacts[0]?.deliveryKey ?? replyTo,
+      aggregatePresentation: baseReceipt ? 'feishu-text-and-files' : 'feishu-files',
+      channelKey: 'feishu',
+      signal: this.#signal,
+      sendImage: typeof this.#channel?.sendImage === 'function'
+        ? (file) => this.#channel.sendImage(chatId, file, {
+            replyTo,
+            signal: this.#signal,
+          })
+        : undefined,
+      sendFile: typeof this.#channel?.sendFile === 'function'
+        ? (file) => this.#channel.sendFile(chatId, file, {
+            replyTo,
+            signal: this.#signal,
+          })
+        : undefined,
+      sendFailureNotice: async (artifact, error) => ({
+        messageId: await this.#send(
+          chatId,
+          artifactFailureText(artifact?.fileName, error),
+        ),
+      }),
+      logger: this.#logger,
+    });
+    this.#status.artifactsSent = (this.#status.artifactsSent ?? 0)
+      + delivery.artifactsSent;
+    this.#status.artifactSendErrors = (this.#status.artifactSendErrors ?? 0)
+      + delivery.artifactSendErrors;
+    if (!delivery.receipt) {
       return {
         receipt: createDeliveryReceipt({
           deliveryId: replyTo,
           presentation: 'feishu-files',
         }),
-        failureNoticeVisible,
+        failureNoticeVisible: delivery.failureNoticeVisible,
       };
     }
-    const receipt = receipts.length === 1
-      ? receipts[0]
-      : mergeDeliveryReceipts({
-          deliveryId: baseReceipt?.deliveryId ?? artifacts[0]?.deliveryKey ?? replyTo,
-          presentation: baseReceipt ? 'feishu-text-and-files' : 'feishu-files',
-          receipts,
-        });
-    return { receipt, failureNoticeVisible };
+    return {
+      receipt: delivery.receipt,
+      failureNoticeVisible: delivery.failureNoticeVisible,
+    };
   }
 
   async #answerWithStream(event, key, message) {

package/src/channels/feishu/feishu-channel.mjs

@@ -114,9 +114,10 @@ function waitForFileOperation(operation, { signal, timeoutMs, stage }) {
   });
 }
 
-function deliveryUuid(file, chatId) {
+function deliveryUuid(file, chatId, messageType) {
+  const seed = `${file.deliveryKey}\u0000${chatId}`;
   const digest = createHash('sha256')
-    .update(`${file.deliveryKey}\u0000${chatId}`)
+    .update(messageType === 'file' ? seed : `${seed}\u0000${messageType}`)
     .digest('hex')
     .slice(0, 40);
   return `dshim_${digest}`;
@@ -230,6 +231,29 @@ export class VerifiedFeishuChannel {
   }
 
   async sendFile(chatId, file, { replyTo, signal } = {}) {
+    return this.#sendArtifact(chatId, file, {
+      replyTo,
+      signal,
+      messageType: 'file',
+      presentation: 'feishu-file',
+    });
+  }
+
+  async sendImage(chatId, file, { replyTo, signal } = {}) {
+    return this.#sendArtifact(chatId, file, {
+      replyTo,
+      signal,
+      messageType: 'image',
+      presentation: 'feishu-image',
+    });
+  }
+
+  async #sendArtifact(chatId, file, {
+    replyTo,
+    signal,
+    messageType,
+    presentation,
+  }) {
     signal?.throwIfAborted();
     if (typeof chatId !== 'string' || !chatId) throw new TypeError('chatId is required');
     if (!file || typeof file !== 'object'
@@ -243,13 +267,20 @@ export class VerifiedFeishuChannel {
     try {
       uploaded = await waitForFileOperation((operationSignal) => {
         operationSignal.throwIfAborted();
-        const pending = this.#client.im.v1.file.create({
-          data: {
-            file_type: 'stream',
-            file_name: file.fileName,
-            file: file.bytes,
-          },
-        });
+        const pending = messageType === 'image'
+          ? this.#client.im.v1.image.create({
+              data: {
+                image_type: 'message',
+                image: file.bytes,
+              },
+            })
+          : this.#client.im.v1.file.create({
+              data: {
+                file_type: 'stream',
+                file_name: file.fileName,
+                file: file.bytes,
+              },
+            });
         trackOutboundArtifactProviderPromise(file, pending);
         return pending;
       }, {
@@ -262,21 +293,25 @@ export class VerifiedFeishuChannel {
       throw fileDeliveryError('upload', error);
     }
     signal?.throwIfAborted();
-    const fileKey = uploaded?.file_key;
-    if (typeof fileKey !== 'string' || !fileKey) {
+    const resourceKey = messageType === 'image'
+      ? uploaded?.image_key ?? uploaded?.data?.image_key
+      : uploaded?.file_key ?? uploaded?.data?.file_key;
+    if (typeof resourceKey !== 'string' || !resourceKey) {
       throw fileDeliveryError('upload', undefined, uploaded?.code);
     }
 
-    const uuid = deliveryUuid(file, chatId);
-    const content = JSON.stringify({ file_key: fileKey });
+    const uuid = deliveryUuid(file, chatId, messageType);
+    const content = JSON.stringify(messageType === 'image'
+      ? { image_key: resourceKey }
+      : { file_key: resourceKey });
     const request = replyTo
       ? {
           path: { message_id: replyTo },
-          data: { msg_type: 'file', content, uuid },
+          data: { msg_type: messageType, content, uuid },
         }
       : {
           params: { receive_id_type: 'chat_id' },
-          data: { receive_id: chatId, msg_type: 'file', content, uuid },
+          data: { receive_id: chatId, msg_type: messageType, content, uuid },
         };
     const send = () => {
       const pending = replyTo
@@ -300,7 +335,7 @@ export class VerifiedFeishuChannel {
         operationSignal.throwIfAborted();
 
         // Feishu documents 230049 as an uncertain asynchronous send result.
-        // Reuse the same file_key and UUID once so the provider can deduplicate.
+        // Reuse the same resource key and UUID once so the provider can deduplicate.
         if (Number(result?.code) === 230049) {
           result = await send();
           operationSignal.throwIfAborted();
@@ -324,7 +359,7 @@ export class VerifiedFeishuChannel {
     }
     return createDeliveryReceipt({
       deliveryId: file.deliveryKey,
-      presentation: 'feishu-file',
+      presentation,
       providerMessageIds: [messageId],
       artifacts: [{
         artifactId: file.artifactId,