@xmanrui/dsh-im 1.4.0 → 1.5.0

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

@@ -31,15 +31,10 @@ import {
   inboundFileUserMessage,
 } from '../shared/inbound-file.mjs';
 import { rememberConnectionTestTarget } from '../shared/connection-test.mjs';
+import { trackOutboundArtifactProviderPromise } from '../shared/semantic/artifact.mjs';
+import { deliverOutboundArtifacts } from '../shared/semantic/artifact-delivery.mjs';
 import {
-  materializeOutboundArtifact,
-  releaseOutboundArtifact,
-  trackOutboundArtifactProviderPromise,
-} from '../shared/semantic/artifact.mjs';
-import {
-  createArtifactFailureReceipt,
   createDeliveryReceipt,
-  mergeDeliveryReceipts,
 } from '../shared/semantic/delivery.mjs';
 
 const DEFAULT_FILE_UPLOAD_TIMEOUT_MS = 120_000;
@@ -353,6 +348,71 @@ function wecomArtifactError(error, { dispatched = false } = {}) {
   return wrapped;
 }
 
+async function sendWecomMedia(
+  client,
+  chatId,
+  file,
+  mediaType,
+  { signal, timeoutMs = DEFAULT_FILE_UPLOAD_TIMEOUT_MS } = {},
+) {
+  signal?.throwIfAborted();
+  if (typeof client?.uploadMedia !== 'function'
+    || typeof client?.sendMediaMessage !== 'function') {
+    const unavailable = new Error(`Enterprise WeChat ${mediaType} delivery is unavailable`);
+    unavailable.code = 'artifact-provider-unavailable';
+    throw unavailable;
+  }
+
+  const timeout = AbortSignal.timeout(timeoutMs);
+  const waitSignal = signal ? AbortSignal.any([signal, timeout]) : timeout;
+  let uploaded;
+  try {
+    const pending = client.uploadMedia(file.bytes, {
+      type: mediaType,
+      filename: file.fileName,
+    });
+    trackOutboundArtifactProviderPromise(file, pending);
+    uploaded = await waitWithSignal(pending, waitSignal);
+  } catch (error) {
+    if (signal?.aborted) throw abortReason(signal);
+    throw wecomArtifactError(error);
+  }
+
+  signal?.throwIfAborted();
+  const mediaId = nonEmptyString(uploaded?.media_id);
+  if (!mediaId) {
+    const rejected = new Error(`Enterprise WeChat ${mediaType} upload returned no media id`);
+    rejected.code = 'artifact-provider-rejected';
+    throw rejected;
+  }
+
+  let sent;
+  try {
+    const pending = client.sendMediaMessage(chatId, mediaType, mediaId);
+    trackOutboundArtifactProviderPromise(file, pending);
+    sent = await waitWithSignal(pending, waitSignal);
+  } catch (error) {
+    if (signal?.aborted) throw abortReason(signal);
+    throw wecomArtifactError(error, { dispatched: true });
+  }
+
+  signal?.throwIfAborted();
+  const providerCode = Number(sent?.body?.errcode ?? sent?.errcode);
+  if (Number.isFinite(providerCode) && providerCode !== 0) {
+    throw wecomArtifactError({ providerCode });
+  }
+  return sent;
+}
+
+/** Send one materialized artifact through Enterprise WeChat's native image message. */
+export function sendWecomImage(client, chatId, file, options) {
+  return sendWecomMedia(client, chatId, file, 'image', options);
+}
+
+function sendWecomFile(client, chatId, file, options) {
+  return sendWecomMedia(client, chatId, file, 'file', options);
+}
+
 function answerTextForDelivery(answer, artifacts) {
   if (typeof answer === 'string' && answer.trim()) return answer;
   return artifacts.length > 0 ? '结果文件已生成。' : '任务已完成，但没有生成可显示的文本。';
@@ -650,98 +710,35 @@ export class WecomHarnessBridge {
     if (artifacts.length === 0) {
       return { receipt: baseReceipt, failureNoticeVisible: false };
     }
-    const receipts = baseReceipt ? [baseReceipt] : [];
-    let failureNoticeVisible = false;
-    for (const artifact of artifacts) {
-      this.#signal?.throwIfAborted();
-      try {
-        if (typeof this.#client.uploadMedia !== 'function'
-          || typeof this.#client.sendMediaMessage !== 'function') {
-          const unavailable = new Error('Enterprise WeChat file delivery is unavailable');
-          unavailable.code = 'artifact-provider-unavailable';
-          throw unavailable;
-        }
-        const file = await materializeOutboundArtifact(artifact, {
-          signal: this.#signal,
-        });
-        this.#signal?.throwIfAborted();
-        const timeout = AbortSignal.timeout(this.#fileUploadTimeoutMs);
-        const waitSignal = this.#signal ? AbortSignal.any([this.#signal, timeout]) : timeout;
-        let uploaded;
-        try {
-          const pending = this.#client.uploadMedia(file.bytes, {
-            type: 'file',
-            filename: file.fileName,
-          });
-          trackOutboundArtifactProviderPromise(file, pending);
-          uploaded = await waitWithSignal(pending, waitSignal);
-        } catch (error) {
-          if (this.#signal?.aborted) throw abortReason(this.#signal);
-          throw wecomArtifactError(error);
-        }
-        this.#signal?.throwIfAborted();
-        const mediaId = nonEmptyString(uploaded?.media_id);
-        if (!mediaId) {
-          const rejected = new Error('Enterprise WeChat upload returned no media id');
-          rejected.code = 'artifact-provider-rejected';
-          throw rejected;
-        }
-        let sent;
-        try {
-          const pending = this.#client.sendMediaMessage(chatId, 'file', mediaId);
-          trackOutboundArtifactProviderPromise(file, pending);
-          sent = await waitWithSignal(pending, waitSignal);
-        } catch (error) {
-          if (this.#signal?.aborted) throw abortReason(this.#signal);
-          throw wecomArtifactError(error, { dispatched: true });
-        }
-        this.#signal?.throwIfAborted();
-        const providerCode = Number(sent?.body?.errcode ?? sent?.errcode);
-        if (Number.isFinite(providerCode) && providerCode !== 0) {
-          throw wecomArtifactError({ providerCode });
-        }
-        const messageId = providerMessageId(sent);
-        receipts.push(createDeliveryReceipt({
-          deliveryId: file.deliveryKey,
-          presentation: 'wecom-file',
-          providerMessageIds: messageId ? [messageId] : [],
-          artifacts: [{ artifactId: file.artifactId, outcome: 'sent' }],
-        }));
-        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-im:wecom] result file delivery failed (${error?.code ?? 'unknown'})`,
-        );
-        let providerMessageIds = [];
-        try {
-          providerMessageIds = await this.#sendActive(
-            chatId,
-            artifactFailureText(artifact?.fileName, error),
-          );
-          failureNoticeVisible = true;
-        } catch (noticeError) {
-          if (this.#signal?.aborted) throw noticeError;
-          this.#logger.warn?.('[dsh-im:wecom] unable to send the safe result-file failure notice');
-        }
-        receipts.push(createArtifactFailureReceipt({
-          artifactId: artifact?.artifactId ?? 'unknown',
-          deliveryId: artifact?.deliveryKey ?? artifact?.artifactId ?? 'unknown',
-          error,
-          providerMessageIds,
-        }));
-      } finally {
-        releaseOutboundArtifact(artifact);
-      }
-    }
-    return {
-      receipt: mergeDeliveryReceipts({
-        deliveryId: replyTo,
-        presentation: baseReceipt ? 'wecom-text-and-files' : 'wecom-files',
-        receipts,
+    const delivery = await deliverOutboundArtifacts({
+      artifacts,
+      baseReceipt,
+      deliveryId: replyTo,
+      aggregatePresentation: baseReceipt ? 'wecom-text-and-files' : 'wecom-files',
+      alwaysMerge: true,
+      channelKey: 'wecom',
+      signal: this.#signal,
+      sendImage: (file) => sendWecomImage(this.#client, chatId, file, {
+        signal: this.#signal,
+        timeoutMs: this.#fileUploadTimeoutMs,
       }),
-      failureNoticeVisible,
+      sendFile: (file) => sendWecomFile(this.#client, chatId, file, {
+        signal: this.#signal,
+        timeoutMs: this.#fileUploadTimeoutMs,
+      }),
+      sendFailureNotice: (artifact, error) => this.#sendActive(
+        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;
+    return {
+      receipt: delivery.receipt,
+      failureNoticeVisible: delivery.failureNoticeVisible,
     };
   }
 

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

@@ -457,6 +457,123 @@ function validateLoginResponse(value) {
 export function createWeixinApi({ fetchImpl = fetch } = {}) {
   if (typeof fetchImpl !== 'function') throw new TypeError('fetchImpl must be a function');
 
+  async function sendArtifact({
+    baseUrl,
+    token,
+    toUserId,
+    file,
+    contextToken,
+    runId,
+    signal,
+  }, { mediaType, createItem }) {
+    const recipient = nonEmptyString(toUserId);
+    if (!recipient || !file || typeof file !== 'object'
+      || typeof file.fileName !== 'string' || !file.fileName
+      || !Buffer.isBuffer(file.bytes)) {
+      throw new TypeError('toUserId and a file are required');
+    }
+    signal?.throwIfAborted();
+    const fileKey = randomBytes(16).toString('hex');
+    const aesKey = randomBytes(16);
+    const rawMd5 = createHash('md5').update(file.bytes).digest('hex');
+    let upload;
+    try {
+      upload = await requestJson(fetchImpl, {
+        method: 'POST',
+        baseUrl,
+        endpoint: 'ilink/bot/getuploadurl',
+        token,
+        signal,
+        body: {
+          filekey: fileKey,
+          media_type: mediaType,
+          to_user_id: recipient,
+          rawsize: file.bytes.byteLength,
+          rawfilemd5: rawMd5,
+          filesize: aesEcbPaddedSize(file.bytes.byteLength),
+          no_need_thumb: true,
+          aeskey: aesKey.toString('hex'),
+          base_info: baseInfo(),
+        },
+      });
+    } 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 weixinArtifactError(error, { fallback });
+    }
+    const uploadRejection = rejectedProviderResponse(upload);
+    if (uploadRejection) {
+      throw weixinArtifactError(new WeixinApiError(
+        'upload-url-rejected',
+        '微信服务拒绝了文件上传请求。',
+        { providerCode: uploadRejection },
+      ));
+    }
+    const uploadUrl = weixinCdnUploadUrl(upload, fileKey);
+    const ciphertext = encryptWeixinUpload(file.bytes, aesKey);
+    let downloadParam;
+    try {
+      downloadParam = await uploadWeixinCdn(fetchImpl, uploadUrl, ciphertext, { signal });
+    } catch (error) {
+      if (signal?.aborted) throw abortError(signal);
+      const status = Number(error?.status);
+      const fallback = error?.code === 'upload-rejected' || (status >= 400 && status < 500)
+        ? 'artifact-provider-rejected'
+        : 'artifact-provider-failed';
+      throw weixinArtifactError(error, { fallback });
+    }
+    signal?.throwIfAborted();
+    const deliverySeed = nonEmptyString(file.deliveryKey) ?? nonEmptyString(file.artifactId)
+      ?? randomUUID();
+    const clientIdSeed = mediaType === 3 ? deliverySeed : `${deliverySeed}\u0000${mediaType}`;
+    const clientId = `dsh-weixin-${createHash('sha256')
+      .update(clientIdSeed)
+      .digest('hex')
+      .slice(0, 32)}`;
+    const media = {
+      encrypt_query_param: downloadParam,
+      aes_key: Buffer.from(aesKey.toString('hex')).toString('base64'),
+      encrypt_type: 1,
+    };
+    let response;
+    try {
+      response = await requestJson(fetchImpl, {
+        method: 'POST',
+        baseUrl,
+        endpoint: 'ilink/bot/sendmessage',
+        token,
+        signal,
+        body: {
+          msg: {
+            from_user_id: '',
+            to_user_id: recipient,
+            client_id: clientId,
+            message_type: 2,
+            message_state: 2,
+            item_list: [createItem({ file, media, ciphertextSize: ciphertext.byteLength })],
+            ...(nonEmptyString(contextToken) ? { context_token: contextToken.trim() } : {}),
+            ...(nonEmptyString(runId) ? { run_id: runId.trim() } : {}),
+          },
+          base_info: baseInfo(),
+        },
+      });
+    } catch (error) {
+      throw classifyWeixinFinalDeliveryError(error, signal);
+    }
+    const sendRejection = rejectedProviderResponse(response);
+    if (sendRejection) {
+      throw weixinArtifactError(new WeixinApiError(
+        'send-rejected',
+        '微信服务拒绝了文件消息。',
+        { providerCode: sendRejection },
+      ));
+    }
+    return { messageId: clientId };
+  }
+
   return Object.freeze({
     inboundImages(message) {
       return extractWeixinImages(message, { fetchImpl });
@@ -549,115 +666,31 @@ export function createWeixinApi({ fetchImpl = fetch } = {}) {
       return true;
     },
 
-    async sendFile({ baseUrl, token, toUserId, file, contextToken, runId, signal }) {
-      const recipient = nonEmptyString(toUserId);
-      if (!recipient || !file || typeof file !== 'object'
-        || typeof file.fileName !== 'string' || !file.fileName
-        || !Buffer.isBuffer(file.bytes)) {
-        throw new TypeError('toUserId and a file are required');
-      }
-      signal?.throwIfAborted();
-      const fileKey = randomBytes(16).toString('hex');
-      const aesKey = randomBytes(16);
-      const rawMd5 = createHash('md5').update(file.bytes).digest('hex');
-      let upload;
-      try {
-        upload = await requestJson(fetchImpl, {
-          method: 'POST',
-          baseUrl,
-          endpoint: 'ilink/bot/getuploadurl',
-          token,
-          signal,
-          body: {
-            filekey: fileKey,
-            media_type: 3,
-            to_user_id: recipient,
-            rawsize: file.bytes.byteLength,
-            rawfilemd5: rawMd5,
-            filesize: aesEcbPaddedSize(file.bytes.byteLength),
-            no_need_thumb: true,
-            aeskey: aesKey.toString('hex'),
-            base_info: baseInfo(),
+    async sendFile(request) {
+      return sendArtifact(request, {
+        mediaType: 3,
+        createItem: ({ file, media }) => ({
+          type: 4,
+          file_item: {
+            media,
+            file_name: file.fileName,
+            len: String(file.bytes.byteLength),
           },
-        });
-      } 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 weixinArtifactError(error, { fallback });
-      }
-      const uploadRejection = rejectedProviderResponse(upload);
-      if (uploadRejection) {
-        throw weixinArtifactError(new WeixinApiError(
-          'upload-url-rejected',
-          '微信服务拒绝了文件上传请求。',
-          { providerCode: uploadRejection },
-        ));
-      }
-      const uploadUrl = weixinCdnUploadUrl(upload, fileKey);
-      const ciphertext = encryptWeixinUpload(file.bytes, aesKey);
-      let downloadParam;
-      try {
-        downloadParam = await uploadWeixinCdn(fetchImpl, uploadUrl, ciphertext, { signal });
-      } catch (error) {
-        if (signal?.aborted) throw abortError(signal);
-        const status = Number(error?.status);
-        const fallback = error?.code === 'upload-rejected' || (status >= 400 && status < 500)
-          ? 'artifact-provider-rejected'
-          : 'artifact-provider-failed';
-        throw weixinArtifactError(error, { fallback });
-      }
-      signal?.throwIfAborted();
-      const deliverySeed = nonEmptyString(file.deliveryKey) ?? nonEmptyString(file.artifactId)
-        ?? randomUUID();
-      const clientId = `dsh-weixin-${createHash('sha256').update(deliverySeed).digest('hex').slice(0, 32)}`;
-      let response;
-      try {
-        response = await requestJson(fetchImpl, {
-          method: 'POST',
-          baseUrl,
-          endpoint: 'ilink/bot/sendmessage',
-          token,
-          signal,
-          body: {
-            msg: {
-              from_user_id: '',
-              to_user_id: recipient,
-              client_id: clientId,
-              message_type: 2,
-              message_state: 2,
-              item_list: [{
-                type: 4,
-                file_item: {
-                  media: {
-                    encrypt_query_param: downloadParam,
-                    aes_key: Buffer.from(aesKey.toString('hex')).toString('base64'),
-                    encrypt_type: 1,
-                  },
-                  file_name: file.fileName,
-                  len: String(file.bytes.byteLength),
-                },
-              }],
-              ...(nonEmptyString(contextToken) ? { context_token: contextToken.trim() } : {}),
-              ...(nonEmptyString(runId) ? { run_id: runId.trim() } : {}),
-            },
-            base_info: baseInfo(),
+        }),
+      });
+    },
+
+    async sendImage(request) {
+      return sendArtifact(request, {
+        mediaType: 1,
+        createItem: ({ media, ciphertextSize }) => ({
+          type: 2,
+          image_item: {
+            media,
+            mid_size: ciphertextSize,
           },
-        });
-      } catch (error) {
-        throw classifyWeixinFinalDeliveryError(error, signal);
-      }
-      const sendRejection = rejectedProviderResponse(response);
-      if (sendRejection) {
-        throw weixinArtifactError(new WeixinApiError(
-          'send-rejected',
-          '微信服务拒绝了文件消息。',
-          { providerCode: sendRejection },
-        ));
-      }
-      return { messageId: clientId };
+        }),
+      });
     },
 
     async notifyStart({ baseUrl, token, signal }) {

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

@@ -38,14 +38,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';
 
@@ -869,73 +864,40 @@ export class WeixinHarnessBridge {
   }
 
   async #deliverArtifacts(toUserId, replyTo, artifacts, contextToken, runId, 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('Weixin 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({
-          baseUrl: this.#baseUrl,
-          token: this.#token,
-          toUserId,
-          file,
-          contextToken,
-          runId,
-          signal: this.#signal,
-        });
-        receipts.push(createDeliveryReceipt({
-          deliveryId: file.deliveryKey,
-          presentation: 'weixin-file',
-          providerMessageIds: providerMessageIdsFor(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-weixin] result file delivery failed (${error?.code ?? 'unknown'})`,
-        );
-        let noticeSent = false;
-        const providerMessageIds = await this.#send(
-          toUserId,
-          artifactFailureText(artifact?.fileName, error),
-          contextToken,
-          runId,
-        ).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 ? 'weixin-text-and-files' : 'weixin-files',
-            receipts,
-          });
-    return { receipt, userVisible };
+    const sendArtifact = (method, file) => this.#api[method]({
+      baseUrl: this.#baseUrl,
+      token: this.#token,
+      toUserId,
+      file,
+      contextToken,
+      runId,
+      signal: this.#signal,
+    });
+    const delivery = await deliverOutboundArtifacts({
+      artifacts,
+      baseReceipt,
+      deliveryId: replyTo,
+      aggregatePresentation: baseReceipt ? 'weixin-text-and-files' : 'weixin-files',
+      channelKey: 'weixin',
+      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(
+        toUserId,
+        artifactFailureText(artifact?.fileName, error),
+        contextToken,
+        runId,
+      ),
+      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 };
   }
 }