@wu529778790/open-im 1.11.4-beta.13 → 1.11.4-beta.15

package/dist/clawbot/client.js

@@ -13,6 +13,7 @@ import { jitteredDelay, isFatalReconnectError, SLOW_PROBE_MS } from '../shared/r
 import { cacheContextToken } from './message-sender.js';
 import { setClawbotContextToken, clearClawbotContextToken } from '../shared/active-chats.js';
 import { decryptAes256CbcMedia, saveBufferMedia, createMediaTargetPath } from '../shared/media-storage.js';
+import { createDecipheriv } from 'node:crypto';
 import { CLAWBOT_POLL_INTERVAL_MS } from '../constants.js';
 const log = createLogger('ClawBot');
 const RECONNECT_DELAYS_MS = [3000, 5000, 10000, 20000, 30000];
@@ -261,8 +262,7 @@ async function extractImages(msg) {
             log.warn('Image item missing full_url/cdn_url');
             continue;
         }
-        // AES key: 优先 media.aes_key (base64)，其次 aeskey (hex)
-        const aesKey = media?.aes_key || imageItem?.aeskey;
+        const aesKey = imageItem?.aeskey;
         try {
             // Download from CDN
             const response = await fetch(imageUrl, { signal: AbortSignal.timeout(30_000) });
@@ -271,10 +271,26 @@ async function extractImages(msg) {
                 continue;
             }
             const buffer = Buffer.from(await response.arrayBuffer());
-            // Decrypt if AES key provided
+            // 尝试解密，失败则直接使用原始数据
             let decrypted;
             if (aesKey) {
-                decrypted = decryptAes256CbcMedia(buffer, aesKey);
+                try {
+                    decrypted = decryptAes256CbcMedia(buffer, aesKey);
+                }
+                catch {
+                    // AES-256 解密失败，尝试 AES-128 (16字节 hex key)
+                    try {
+                        const keyBuf = Buffer.from(aesKey, 'hex');
+                        const iv = keyBuf.subarray(0, 16);
+                        const decipher = createDecipheriv('aes-128-cbc', keyBuf, iv);
+                        decrypted = Buffer.concat([decipher.update(buffer), decipher.final()]);
+                    }
+                    catch {
+                        // 都失败了，直接用原始数据
+                        log.info('AES decryption failed, using raw image data');
+                        decrypted = buffer;
+                    }
+                }
             }
             else {
                 decrypted = buffer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.11.4-beta.13",
+  "version": "1.11.4-beta.15",
   "description": "Your AI coding assistant, in every chat app. Multi-platform IM bridge for Claude Code, Codex, and CodeBuddy.",
   "type": "module",
   "main": "dist/index.js",