@wu529778790/open-im 1.11.4-beta.17 → 1.11.4-beta.19

package/dist/clawbot/client.js

@@ -12,7 +12,8 @@ import { createLogger } from '../logger.js';
 import { jitteredDelay, isFatalReconnectError, SLOW_PROBE_MS } from '../shared/reconnect.js';
 import { cacheContextToken } from './message-sender.js';
 import { setClawbotContextToken, clearClawbotContextToken } from '../shared/active-chats.js';
-import { decryptAes256CbcMedia, createMediaTargetPath } from '../shared/media-storage.js';
+import { 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,37 +262,48 @@ async function extractImages(msg) {
             log.warn('Image item missing full_url/cdn_url');
             continue;
         }
-        // AES key: media.aes_key 是 base64 编码，decodeAesKey 会解码为 32 字节
-        const aesKey = media?.aes_key;
         try {
-            // Download from CDN
+            // 直接从 full_url 下载图片（CDN 返回的是已解密的图片数据）
             const response = await fetch(imageUrl, { signal: AbortSignal.timeout(30_000) });
             if (!response.ok) {
                 log.warn(`Image download failed: HTTP ${response.status}`);
                 continue;
             }
             const buffer = Buffer.from(await response.arrayBuffer());
-            // 解密：使用 media.aes_key（base64 编码的 32 字节密钥）
-            let decrypted;
-            if (aesKey) {
-                try {
-                    decrypted = decryptAes256CbcMedia(buffer, aesKey);
-                }
-                catch {
-                    // AES-256 解密失败，直接用原始数据
-                    log.info('AES decryption failed, using raw image data');
-                    decrypted = buffer;
-                }
+            // 检查是否是有效图片
+            const first4 = buffer.subarray(0, 4).toString('hex');
+            const isJpeg = first4 === 'ffd8ffe0' || first4 === 'ffd8ffe1';
+            const isPng = first4 === '89504e47';
+            let finalBuffer;
+            if (isJpeg || isPng) {
+                // CDN 返回的是有效图片，直接使用
+                finalBuffer = buffer;
             }
             else {
-                decrypted = buffer;
+                // CDN 返回的是加密数据，尝试解密
+                const aesKeyHex = imageItem?.aeskey;
+                if (aesKeyHex && aesKeyHex.length === 32) {
+                    try {
+                        const keyBuf = Buffer.from(aesKeyHex, 'hex');
+                        const iv = keyBuf.subarray(0, 16);
+                        const decipher = createDecipheriv('aes-128-cbc', keyBuf, iv);
+                        finalBuffer = Buffer.concat([decipher.update(buffer), decipher.final()]);
+                    }
+                    catch {
+                        log.info('AES decryption failed, using raw image data');
+                        finalBuffer = buffer;
+                    }
+                }
+                else {
+                    finalBuffer = buffer;
+                }
             }
             // Save to disk
             const targetPath = createMediaTargetPath('.jpg', `clawbot-${Date.now()}`);
             const { writeFile } = await import('node:fs/promises');
             const { mkdir } = await import('node:fs/promises');
             await mkdir('/tmp/t/open-im-images', { recursive: true });
-            await writeFile(targetPath, decrypted);
+            await writeFile(targetPath, finalBuffer);
             paths.push(targetPath);
             log.info(`ClawBot image saved: ${targetPath}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.11.4-beta.17",
+  "version": "1.11.4-beta.19",
   "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",