@xmanrui/dsh-im 4.21.0 → 4.21.1

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

@@ -21,6 +21,8 @@ const ILINK_CLIENT_VERSION = (2 << 16) | (4 << 8) | 6;
 const DEFAULT_TIMEOUT_MS = 15_000;
 const DEFAULT_LONG_POLL_TIMEOUT_MS = 35_000;
 const WEIXIN_CDN_UPLOAD_RETRIES = 3;
+const WEIXIN_CDN_UPLOAD_IDLE_TIMEOUT_MS = 60_000;
+const WEIXIN_CDN_UPLOAD_CHUNK_BYTES = 64 * 1024;
 const WEIXIN_MESSAGE_ID_TIMESTAMP_SHIFT = 22n;
 const WEIXIN_MESSAGE_ID_MIN_TIMESTAMP_MS = Date.UTC(2020, 0, 1);
 const WEIXIN_MESSAGE_ID_MAX_FUTURE_MS = 24 * 60 * 60 * 1_000;
@@ -79,6 +81,9 @@ function weixinArtifactError(cause, { fallback = 'artifact-provider-rejected' }
     || /(?:rate.?limit|too.?many)/i.test(providerText)) {
     code = 'artifact-rate-limited';
     message = 'Weixin rate-limited file delivery.';
+  } else if (cause?.code === 'upload-timeout') {
+    code = 'artifact-upload-timeout';
+    message = 'Weixin file upload stalled; the file message was not sent.';
   } else if (fallback === 'artifact-provider-rejected') {
     message = 'Weixin rejected the file message.';
   }
@@ -339,25 +344,54 @@ function weixinCdnUploadUrl(response, fileKey) {
   return trustedWeixinCdnUploadUrl(url);
 }
 
-function encryptWeixinUpload(bytes, key) {
+async function* encryptWeixinUpload(bytes, key, { signal, onProgress }) {
   const cipher = createCipheriv('aes-128-ecb', key, null);
-  return Buffer.concat([cipher.update(bytes), cipher.final()]);
+  // Let fetch backpressure drive encryption, without keeping whole-file
+  // ciphertext copies alongside a potentially large artifact buffer.
+  for (let offset = 0; offset < bytes.byteLength; offset += WEIXIN_CDN_UPLOAD_CHUNK_BYTES) {
+    signal.throwIfAborted();
+    const chunk = cipher.update(bytes.subarray(offset, offset + WEIXIN_CDN_UPLOAD_CHUNK_BYTES));
+    onProgress();
+    if (chunk.byteLength) yield chunk;
+  }
+  signal.throwIfAborted();
+  onProgress();
+  yield cipher.final();
 }
 
-async function uploadWeixinCdn(fetchImpl, url, ciphertext, { signal } = {}) {
+async function uploadWeixinCdn(fetchImpl, url, bytes, key, { signal } = {}) {
   let lastError;
   for (let attempt = 1; attempt <= WEIXIN_CDN_UPLOAD_RETRIES; attempt += 1) {
     signal?.throwIfAborted();
+    const idleController = new AbortController();
+    const uploadSignal = signal
+      ? AbortSignal.any([signal, idleController.signal])
+      : idleController.signal;
+    let timer;
+    let active = true;
+    const onProgress = () => {
+      if (!active) return;
+      clearTimeout(timer);
+      timer = setTimeout(() => idleController.abort(new WeixinApiError(
+        'upload-timeout', '微信文件上传长时间没有进展，已超时。',
+      )), WEIXIN_CDN_UPLOAD_IDLE_TIMEOUT_MS);
+    };
+    const body = encryptWeixinUpload(bytes, key, { signal: uploadSignal, onProgress });
+    let response;
+    onProgress();
     try {
-      const response = await fetchImpl(url, {
+      response = await fetchImpl(url, {
         method: 'POST',
-        headers: { 'content-type': 'application/octet-stream' },
-        body: ciphertext,
-        signal: signal
-          ? AbortSignal.any([signal, AbortSignal.timeout(60_000)])
-          : AbortSignal.timeout(60_000),
+        headers: {
+          'content-type': 'application/octet-stream',
+          'content-length': String(aesEcbPaddedSize(bytes.byteLength)),
+        },
+        body,
+        duplex: 'half',
+        signal: uploadSignal,
         redirect: 'error',
       });
+      uploadSignal.throwIfAborted();
       if (response.status >= 400 && response.status < 500) {
         throw new WeixinApiError(
           'upload-rejected',
@@ -373,16 +407,21 @@ async function uploadWeixinCdn(fetchImpl, url, ciphertext, { signal } = {}) {
         );
       }
       const downloadParam = nonEmptyString(response.headers.get('x-encrypted-param'));
-      await response.body?.cancel?.().catch(() => undefined);
       if (!downloadParam) {
         throw new WeixinApiError('invalid-upload-response', '微信文件上传响应缺少下载参数。');
       }
       return downloadParam;
     } catch (error) {
       if (signal?.aborted) throw abortError(signal);
+      if (idleController.signal.aborted) error = idleController.signal.reason;
       if (error instanceof WeixinApiError
         && (error.code === 'upload-rejected' || error.status < 500)) throw error;
       lastError = error;
+    } finally {
+      active = false;
+      clearTimeout(timer);
+      await body.return();
+      await response?.body?.cancel?.().catch(() => undefined);
     }
   }
   if (lastError instanceof WeixinApiError) throw lastError;
@@ -524,10 +563,10 @@ export function createWeixinApi({ fetchImpl = fetch } = {}) {
       ));
     }
     const uploadUrl = weixinCdnUploadUrl(upload, fileKey);
-    const ciphertext = encryptWeixinUpload(file.bytes, aesKey);
+    const ciphertextSize = aesEcbPaddedSize(file.bytes.byteLength);
     let downloadParam;
     try {
-      downloadParam = await uploadWeixinCdn(fetchImpl, uploadUrl, ciphertext, { signal });
+      downloadParam = await uploadWeixinCdn(fetchImpl, uploadUrl, file.bytes, aesKey, { signal });
     } catch (error) {
       if (signal?.aborted) throw abortError(signal);
       const status = Number(error?.status);
@@ -564,7 +603,7 @@ export function createWeixinApi({ fetchImpl = fetch } = {}) {
             client_id: clientId,
             message_type: 2,
             message_state: 2,
-            item_list: [createItem({ file, media, ciphertextSize: ciphertext.byteLength })],
+            item_list: [createItem({ file, media, ciphertextSize })],
             ...(nonEmptyString(contextToken) ? { context_token: contextToken.trim() } : {}),
             ...(nonEmptyString(runId) ? { run_id: runId.trim() } : {}),
           },

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

@@ -36,7 +36,11 @@ import {
 } from '../shared/preset-command.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
-import { captureContextEnhancement, enhanceContextContent } from '../shared/context-enhancement.mjs';
+import {
+  captureContextEnhancement,
+  captureContextEnhancementSource,
+  enhanceContextContent,
+} from '../shared/context-enhancement.mjs';
 import {
   hasInboundImages,
   imagePromptDiagnostic,
@@ -262,6 +266,8 @@ function artifactFailureText(fileName, error) {
       return t('结果文件「{name}」已生成，但微信机器人当前没有文件消息发送权限，请检查机器人文件消息能力。', { name });
     case 'artifact-too-large':
       return t('结果文件「{name}」超过当前微信会话可发送的文件大小，未发送。', { name });
+    case 'artifact-upload-timeout':
+      return t('结果文件「{name}」上传微信时长时间没有进展，已超时，文件尚未发送。请检查网络后重试，或压缩、拆分文件后发送。', { name });
     case 'artifact-rate-limited':
       return t('结果文件「{name}」暂时被微信限流，未能发送，请稍后重试。', { name });
     case 'artifact-provider-rejected':
@@ -707,6 +713,11 @@ export class WeixinHarnessBridge {
         || this.#approvals.hasPending(key),
       control: { owner: this, key },
       deferredDelivery: this.#deferred,
+      enhancement: captureContextEnhancementSource(
+        this.#contextEnhancement,
+        'direct',
+        () => ({ channel: 'weixin', senderId: sender, chatId: sender }),
+      ),
     });
     if (result?.stopped) {
       await Promise.allSettled([
@@ -826,6 +837,7 @@ export class WeixinHarnessBridge {
           text,
           content,
           titleText: batchSubmission?.title,
+          sourceGuidance: snapshot?.config?.guidance,
           contextEnhanced,
           createOptions: { signal: this.#signal },
           existsOptions: { signal: this.#signal },