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

package/dist/clawbot/client.js

@@ -12,8 +12,7 @@ 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, saveBufferMedia, createMediaTargetPath } from '../shared/media-storage.js';
-import { createDecipheriv } from 'node:crypto';
+import { decryptAes256CbcMedia, createMediaTargetPath } from '../shared/media-storage.js';
 import { CLAWBOT_POLL_INTERVAL_MS } from '../constants.js';
 const log = createLogger('ClawBot');
 const RECONNECT_DELAYS_MS = [3000, 5000, 10000, 20000, 30000];
@@ -262,7 +261,8 @@ async function extractImages(msg) {
             log.warn('Image item missing full_url/cdn_url');
             continue;
         }
-        const aesKey = imageItem?.aeskey;
+        // AES key: media.aes_key 是 base64 编码，decodeAesKey 会解码为 32 字节
+        const aesKey = media?.aes_key;
         try {
             // Download from CDN
             const response = await fetch(imageUrl, { signal: AbortSignal.timeout(30_000) });
@@ -271,25 +271,16 @@ async function extractImages(msg) {
                 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 解密失败，尝试 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;
-                    }
+                    // AES-256 解密失败，直接用原始数据
+                    log.info('AES decryption failed, using raw image data');
+                    decrypted = buffer;
                 }
             }
             else {
@@ -297,7 +288,10 @@ async function extractImages(msg) {
             }
             // Save to disk
             const targetPath = createMediaTargetPath('.jpg', `clawbot-${Date.now()}`);
-            await saveBufferMedia(decrypted, targetPath);
+            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);
             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.15",
+  "version": "1.11.4-beta.17",
   "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",