wechaty-puppet-matrix 0.0.53 → 0.0.55

package/dist/esm/src/matrix/service/request.js

@@ -97,6 +97,10 @@ export var WechatMessageType;
     WechatMessageType[WechatMessageType["Sys"] = 10000] = "Sys";
     WechatMessageType[WechatMessageType["SysTemplate"] = 10002] = "SysTemplate";
 })(WechatMessageType || (WechatMessageType = {}));
+export function parseSizeMismatch(errmsg) {
+    const match = typeof errmsg === 'string' ? errmsg.match(/size differs: expected \d+, got (\d+)/) : null;
+    return match && Number(match[1]) > 0 ? match[1] : undefined;
+}
 export var FriendshipType;
 (function (FriendshipType) {
     FriendshipType[FriendshipType["Unknown"] = 0] = "Unknown";
@@ -1349,8 +1353,7 @@ class Client extends EventEmitter {
             },
         });
     }
-    async retryDownload(fn) {
-        const maxRetries = 5;
+    async retryDownload(fn, maxRetries = 5) {
         const delayMs = 5000;
         for (let attempt = 1; attempt <= maxRetries; attempt++) {
             try {
@@ -1359,6 +1362,9 @@ class Client extends EventEmitter {
                     return res;
                 }
                 log.warn(PRE, 'download attempt %d/%d failed (no url in response): %s', attempt, maxRetries, JSON.stringify(res));
+                if (parseSizeMismatch(res?.errmsg)) {
+                    return res;
+                }
             }
             catch (e) {
                 log.warn(PRE, 'download attempt %d/%d error: %s', attempt, maxRetries, e);
@@ -1369,21 +1375,51 @@ class Client extends EventEmitter {
         }
         return null;
     }
+    async cdnDownloadWithFallback(label, baseParams, candidates) {
+        const queue = [...candidates];
+        const tried = new Set();
+        const retriesPerCandidate = candidates.length > 1 ? 2 : 5;
+        while (queue.length) {
+            const candidate = queue.shift();
+            const key = `${candidate.file_id}|${candidate.file_size}|${candidate.aes_key || ''}`;
+            if (!candidate.file_id || tried.has(key)) {
+                continue;
+            }
+            tried.add(key);
+            const params = {
+                ...baseParams,
+                file_id: candidate.file_id,
+                file_size: candidate.file_size,
+                ...(candidate.aes_key ? { aes_key: candidate.aes_key } : {}),
+            };
+            const res = await this.retryDownload(() => this.postData({ path: '/cloud/cdn_download', data: params }), retriesPerCandidate);
+            if (res?.url) {
+                if (tried.size > 1) {
+                    log.info(PRE, '%s succeeded with fallback, file_size: %s', label, candidate.file_size);
+                }
+                return encodeURI(res.url) || '';
+            }
+            const actualSize = parseSizeMismatch(res?.errmsg);
+            if (actualSize) {
+                log.warn(PRE, '%s size mismatch (xml %s, actual %s), retry with actual size', label, candidate.file_size, actualSize);
+                queue.unshift({ ...candidate, file_size: actualSize });
+                continue;
+            }
+            log.warn(PRE, '%s candidate failed, params: %s', label, JSON.stringify(params));
+        }
+        log.error(PRE, '%s failed for all candidates: %s', label, JSON.stringify(candidates));
+        return '';
+    }
     async downloadImage(imageInfo) {
-        const params = {
+        const candidates = imageInfo.candidates?.length
+            ? imageInfo.candidates
+            : [{ file_id: imageInfo.file_id, file_size: imageInfo.file_size || '' }];
+        return this.cdnDownloadWithFallback('downloadImage', {
             log_response: true,
             file_type: 2,
-            file_id: imageInfo.file_id,
             aes_key: imageInfo.aes_key,
-            file_size: imageInfo.file_size,
             file_name: `/微信图片_${format(new Date(), 'yyyyMMddHHmmss')}.png`,
-        };
-        const res = await this.retryDownload(() => this.postData({ path: '/cloud/cdn_download', data: params }));
-        if (res?.url) {
-            return encodeURI(res.url) || '';
-        }
-        log.error(PRE, 'downloadImage failed after %d retries, params: %s', 5, JSON.stringify(params));
-        return '';
+        }, candidates);
     }
     async downloadWWMedia(imageInfo, type) {
         const typeNameMap = {
@@ -1407,20 +1443,12 @@ class Client extends EventEmitter {
         return '';
     }
     async downloadFile(imageInfo) {
-        const params = {
+        return this.cdnDownloadWithFallback('downloadFile', {
             log_response: true,
             file_type: 5,
-            file_id: imageInfo.file_id.replace('@cdn_', ''),
             aes_key: imageInfo.aes_key,
-            file_size: imageInfo.file_size,
             file_name: '/' + sanitizeFilename(imageInfo.file_name),
-        };
-        const res = await this.retryDownload(() => this.postData({ path: '/cloud/cdn_download', data: params }));
-        if (res?.url) {
-            return encodeURI(res.url) || '';
-        }
-        log.error(PRE, 'downloadFile failed after %d retries, params: %s', 5, JSON.stringify(params));
-        return '';
+        }, [{ file_id: imageInfo.file_id.replace('@cdn_', ''), file_size: imageInfo.file_size || '' }]);
     }
     async downloadAudio(msgId, voiceInfo, roomId) {
         const params = {
@@ -1450,6 +1478,7 @@ class Client extends EventEmitter {
         return await this.postData({ path: '/msg/get_voice_trans', data: { voice_id: voiceId } });
     }
     async voiceToText(msgId, length, timeoutMs = 20000) {
+        const brief = (res) => JSON.stringify(res, (k, v) => (k === 'buffer' ? undefined : v));
         try {
             const idRes = await this.newVoiceTransId();
             const voiceId = idRes?.voice_id;
@@ -1457,15 +1486,24 @@ class Client extends EventEmitter {
                 log.warn(PRE, 'voiceToText: no voice_id: %s', JSON.stringify(idRes));
                 return '';
             }
-            const checkRes = await this.checkVoiceTrans(voiceId, msgId, length);
-            if (checkRes?.baseResponse?.ret !== 0) {
-                log.warn(PRE, 'voiceToText: check failed: %s', JSON.stringify(checkRes));
-                return '';
-            }
-            const uploadRes = await this.uploadVoiceTrans(voiceId, msgId, length);
-            if (uploadRes?.baseResponse?.ret !== 0) {
-                log.warn(PRE, 'voiceToText: upload failed: %s', JSON.stringify(uploadRes));
-                return '';
+            let checkRes;
+            for (let round = 0; round < 20; round++) {
+                checkRes = await this.checkVoiceTrans(voiceId, msgId, length);
+                log.verbose(PRE, 'voiceToText check#%d(length=%d): %s', round, length, brief(checkRes));
+                if (checkRes?.baseResponse?.ret !== 0) {
+                    log.warn(PRE, 'voiceToText: check failed: %s', brief(checkRes));
+                    return '';
+                }
+                const ctx = checkRes?.uploadCtx;
+                if (!ctx?.dataLen) {
+                    break;
+                }
+                const uploadRes = await this.uploadVoiceTrans(voiceId, msgId, length);
+                log.verbose(PRE, 'voiceToText upload#%d: %s', round, brief(uploadRes));
+                if (uploadRes?.baseResponse?.ret !== 0) {
+                    log.warn(PRE, 'voiceToText: upload failed: %s', brief(uploadRes));
+                    return '';
+                }
             }
             const interval = (checkRes?.queryCtx?.interval || 2) * 1000;
             const deadline = Date.now() + timeoutMs;
@@ -1473,7 +1511,7 @@ class Client extends EventEmitter {
                 await new Promise(resolve => setTimeout(resolve, interval));
                 const res = await this.getVoiceTrans(voiceId);
                 if (res?.baseResponse?.ret !== 0) {
-                    log.warn(PRE, 'voiceToText: get result failed: %s', JSON.stringify(res));
+                    log.warn(PRE, 'voiceToText: get result failed: %s', brief(res));
                     return '';
                 }
                 if (res?.transRes?.endFlag === 1) {
@@ -1488,19 +1526,14 @@ class Client extends EventEmitter {
         return '';
     }
     async downloadVideo(videoInfo) {
-        const params = {
+        const candidates = videoInfo.candidates?.length
+            ? videoInfo.candidates
+            : [{ file_id: videoInfo.file_id, file_size: videoInfo.file_size }];
+        return this.cdnDownloadWithFallback('downloadVideo', {
             file_type: 4,
-            file_id: videoInfo.file_id,
             aes_key: videoInfo.aes_key,
-            file_size: videoInfo.file_size,
             file_name: `/微信视频_${format(new Date(), 'yyyyMMddHHmmss')}.mp4`,
-        };
-        const res = await this.retryDownload(() => this.postData({ path: '/cloud/cdn_download', data: params }));
-        if (res?.url) {
-            return encodeURI(res.url) || '';
-        }
-        log.error(PRE, 'downloadVideo failed after %d retries, params: %s', 5, JSON.stringify(params));
-        return '';
+        }, candidates);
     }
     async sendUrlImg(contactId, url, selfId) {
         try {

package/dist/esm/src/matrix/utils/file-type.d.ts

@@ -0,0 +1,4 @@
+export declare function detectImageExt(head: Buffer): string | undefined;
+export declare function fetchRemoteHead(url: string, bytes?: number, timeoutMs?: number): Promise<Buffer | undefined>;
+export declare function replaceExt(fileName: string, ext: string): string;
+//# sourceMappingURL=file-type.d.ts.map

package/dist/esm/src/matrix/utils/file-type.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-type.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/utils/file-type.ts"],"names":[],"mappings":"AAKA,wBAAgB,cAAc,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA0BhE;AAKD,wBAAsB,eAAe,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,SAAK,EAAE,SAAS,SAAO,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7G;AAKD,wBAAgB,UAAU,CAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAIjE"}

package/dist/esm/src/matrix/utils/file-type.js

@@ -0,0 +1,47 @@
+import axios from 'axios';
+export function detectImageExt(head) {
+    if (head.length >= 3 && head[0] === 0xff && head[1] === 0xd8 && head[2] === 0xff) {
+        return 'jpg';
+    }
+    if (head.length >= 8 && head.subarray(0, 8).equals(Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]))) {
+        return 'png';
+    }
+    if (head.length >= 6 && ['GIF87a', 'GIF89a'].includes(head.subarray(0, 6).toString('ascii'))) {
+        return 'gif';
+    }
+    if (head.length >= 12 && head.subarray(0, 4).toString('ascii') === 'RIFF' && head.subarray(8, 12).toString('ascii') === 'WEBP') {
+        return 'webp';
+    }
+    if (head.length >= 2 && head[0] === 0x42 && head[1] === 0x4d) {
+        return 'bmp';
+    }
+    if (head.length >= 12 && head.subarray(4, 8).toString('ascii') === 'ftyp') {
+        const brand = head.subarray(8, 12).toString('ascii');
+        if (['heic', 'heix', 'hevc', 'hevx', 'mif1', 'msf1'].includes(brand)) {
+            return 'heic';
+        }
+        if (['avif', 'avis'].includes(brand)) {
+            return 'avif';
+        }
+    }
+    return undefined;
+}
+export async function fetchRemoteHead(url, bytes = 32, timeoutMs = 5000) {
+    try {
+        const res = await axios.get(url, {
+            headers: { Range: `bytes=0-${bytes - 1}` },
+            responseType: 'arraybuffer',
+            timeout: timeoutMs,
+            maxContentLength: 50 * 1024 * 1024,
+        });
+        return Buffer.from(res.data).subarray(0, bytes);
+    }
+    catch {
+        return undefined;
+    }
+}
+export function replaceExt(fileName, ext) {
+    const dot = fileName.lastIndexOf('.');
+    const base = dot > 0 ? fileName.slice(0, dot) : fileName;
+    return `${base}.${ext}`;
+}

package/dist/esm/src/matrix/utils/file-type.spec.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env -S node -r ts-node/register
+export {};
+//# sourceMappingURL=file-type.spec.d.ts.map

package/dist/esm/src/matrix/utils/file-type.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-type.spec.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/utils/file-type.spec.ts"],"names":[],"mappings":""}

package/dist/esm/src/matrix/utils/file-type.spec.js

@@ -0,0 +1,23 @@
+#!/usr/bin/env -S node -r ts-node/register
+import { test } from 'tstest';
+import { detectImageExt, replaceExt } from './file-type.js';
+const hex = (s) => Buffer.from(s, 'hex');
+test('detectImageExt recognizes common image headers', async (t) => {
+    t.equal(detectImageExt(hex('ffd8fffe00104c61766335392e33372e')), 'jpg', 'jpeg');
+    t.equal(detectImageExt(hex('89504e470d0a1a0a0000000d49484452')), 'png', 'png');
+    t.equal(detectImageExt(Buffer.from('GIF89a......')), 'gif', 'gif');
+    t.equal(detectImageExt(Buffer.concat([Buffer.from('RIFF'), hex('00000000'), Buffer.from('WEBPVP8 ')])), 'webp', 'webp');
+    t.equal(detectImageExt(hex('424d000000000000')), 'bmp', 'bmp');
+    t.equal(detectImageExt(Buffer.concat([hex('00000018'), Buffer.from('ftypheic'), hex('00000000')])), 'heic', 'heic');
+    t.equal(detectImageExt(Buffer.concat([hex('0000001c'), Buffer.from('ftypavif'), hex('00000000')])), 'avif', 'avif');
+});
+test('detectImageExt returns undefined for unknown or short data', async (t) => {
+    t.equal(detectImageExt(hex('0000001c667479706d703432')), undefined, 'mp4 is not an image');
+    t.equal(detectImageExt(Buffer.from('<html>')), undefined, 'html');
+    t.equal(detectImageExt(Buffer.alloc(0)), undefined, 'empty');
+});
+test('replaceExt replaces or appends extension', async (t) => {
+    t.equal(replaceExt('微信图片_20261105234022.png', 'jpg'), '微信图片_20261105234022.jpg', 'replace');
+    t.equal(replaceExt('image', 'gif'), 'image.gif', 'append');
+    t.equal(replaceExt('.hidden', 'jpg'), '.hidden.jpg', 'dotfile');
+});

package/dist/esm/src/puppet-matrix.d.ts

@@ -126,6 +126,7 @@ declare class PuppetMatrix extends PUPPET.Puppet {
     private _stopPuppetHeart;
     private _fileBoxFromUrl;
     private _getMessageImageFileBox;
+    private _imageNameByHead;
     private _getMessageAudioFileBox;
     private _getMessageVideoFileBox;
     private _getMessageFileFileBox;

package/dist/esm/src/puppet-matrix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"puppet-matrix.d.ts","sourceRoot":"","sources":["../../../src/puppet-matrix.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"puppet-matrix.d.ts","sourceRoot":"","sources":["../../../src/puppet-matrix.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/puppet-matrix.js

@@ -5,6 +5,7 @@ import { WechatMessageType } from './matrix/types.js';
 import Client from './matrix/service/request.js';
 import { getUnixTime } from 'date-fns';
 import { mergeWithFallback } from './matrix/utils/index.js';
+import { detectImageExt, fetchRemoteHead, replaceExt } from './matrix/utils/file-type.js';
 import path from 'path';
 import { CacheManager } from './matrix/cache-manager.js';
 import { isIMContactId, isRoomId } from './matrix/utils/is-type.js';
@@ -1288,7 +1289,7 @@ class PuppetMatrix extends PUPPET.Puppet {
         }
         try {
             const audio = await parseAudioMessagePayload(message);
-            const length = parseInt(audio.voicelength, 10);
+            const length = parseInt(audio.length, 10);
             if (!length) {
                 return;
             }
@@ -1456,7 +1457,21 @@ class PuppetMatrix extends PUPPET.Puppet {
             log.error(`Can not get file for message: ${messageId}`);
         }
         const url = imageInfo.is_ww ? await this._client?.downloadWWMedia(imageInfo, 1) : await this._client?.downloadImage(imageInfo);
-        return this._fileBoxFromUrl(url, messageId);
+        return this._fileBoxFromUrl(url, messageId, url ? await this._imageNameByHead(url) : undefined);
+    }
+    async _imageNameByHead(url) {
+        const head = await fetchRemoteHead(url);
+        const ext = head && detectImageExt(head);
+        if (!ext) {
+            return undefined;
+        }
+        let rawName = 'image';
+        try {
+            rawName = decodeURIComponent(new URL(url).pathname.split('/').pop() || rawName);
+        }
+        catch {
+        }
+        return replaceExt(rawName, ext);
     }
     async _getMessageAudioFileBox(messageId, messagePayload) {
         const audioInfo = await parseAudioMessagePayload(messagePayload);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-matrix",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "description": "Puppet matrix for Wechaty",
   "type": "module",
   "typings": "./dist/esm/src/mod.d.ts",

package/src/matrix/messages/message-image.spec.ts

@@ -0,0 +1,107 @@
+#!/usr/bin/env -S node -r ts-node/register
+import { test } from 'tstest'
+
+import type { MessagePayload } from '../../engine-schema.js'
+import { parseImageMessagePayload } from './message-image.js'
+
+const buildPayload = (imgAttrs: string): MessagePayload => ({
+  msg: `<?xml version="1.0"?>\n<msg>\n\t<img ${imgAttrs}>\n\t</img>\n</msg>\n`,
+} as unknown as MessagePayload)
+
+test('parseImageMessagePayload uses hevc_mid_size when downloading mid image', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" cdnmidimgurl="mid-url" length="157626" md5="md5" hevc_mid_size="53274"',
+  ))
+
+  t.equal(payload.file_id, 'mid-url', 'should use mid image url')
+  t.equal(payload.file_size, '53274', 'size should match the mid image, not the origin length')
+  t.equal(payload.is_ww, false, 'should not be ww image')
+})
+
+test('parseImageMessagePayload prefers cdnmidimgurl_size', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" cdnmidimgurl="mid-url" length="157626" hevc_mid_size="53274" cdnmidimgurl_size="60000"',
+  ))
+
+  t.equal(payload.file_size, '60000', 'cdnmidimgurl_size should win')
+})
+
+test('parseImageMessagePayload falls back to length for legacy xml', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" cdnmidimgurl="mid-url" length="12345" hevc_mid_size="0"',
+  ))
+
+  t.equal(payload.file_size, '12345', 'length should be used when no mid size is available')
+})
+
+test('parseImageMessagePayload falls back to length when mid size attrs are absent', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" cdnmidimgurl="mid-url" length="12345" md5="md5"',
+  ))
+
+  t.equal(payload.file_size, '12345', 'length should be used when hevc_mid_size is missing')
+})
+
+test('parseImageMessagePayload uses big image url when mid size is missing', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" cdnmidimgurl="mid-url" cdnbigimgurl="big-url" length="157626"',
+  ))
+
+  t.equal(payload.file_id, 'big-url', 'should switch to origin image url')
+  t.equal(payload.file_size, '157626', 'size should be origin length')
+})
+
+test('parseImageMessagePayload keeps mid url for legacy xml with hdlength', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" cdnmidimgurl="mid-url" cdnbigimgurl="big-url" length="12345" hdlength="99999"',
+  ))
+
+  t.equal(payload.file_id, 'mid-url', 'legacy xml should still use mid url')
+  t.equal(payload.file_size, '12345', 'legacy length is mid image size')
+})
+
+test('parseImageMessagePayload keeps length for ww image', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" tpurl="tp-url" tpauthkey="auth" length="888" hevc_mid_size="111"',
+  ))
+
+  t.equal(payload.is_ww, true, 'should be ww image')
+  t.equal(payload.file_id, 'tp-url', 'should use tpurl')
+  t.equal(payload.file_size, '888', 'ww image should keep length')
+})
+
+test('parseImageMessagePayload builds fallback candidates for new xml', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" cdnmidimgurl="mid-url" cdnbigimgurl="big-url" length="157626" hevc_mid_size="53274"',
+  ))
+
+  t.same(payload.candidates, [
+    { file_id: 'mid-url', file_size: '53274' },
+    { file_id: 'big-url', file_size: '157626' },
+    { file_id: 'mid-url', file_size: '157626' },
+  ], 'should try mid size first, then origin, then legacy combination')
+  t.equal(payload.file_id, payload.candidates?.[0]?.file_id, 'file_id should be first candidate')
+  t.equal(payload.file_size, payload.candidates?.[0]?.file_size, 'file_size should be first candidate')
+})
+
+test('parseImageMessagePayload builds fallback candidates for legacy xml', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" cdnmidimgurl="mid-url" cdnbigimgurl="big-url" length="12345" hdlength="99999"',
+  ))
+
+  t.same(payload.candidates, [
+    { file_id: 'mid-url', file_size: '12345' },
+    { file_id: 'big-url', file_size: '99999' },
+  ], 'legacy xml should try mid + length, then big + hdlength')
+})
+
+test('parseImageMessagePayload dedupes candidates', async t => {
+  const payload = await parseImageMessagePayload(buildPayload(
+    'aeskey="key" cdnmidimgurl="mid-url" length="157626" hevc_mid_size="53274" cdnmidimgurl_size="53274"',
+  ))
+
+  t.same(payload.candidates, [
+    { file_id: 'mid-url', file_size: '53274' },
+    { file_id: 'mid-url', file_size: '157626' },
+  ], 'same url + size should only appear once')
+})

package/src/matrix/messages/message-image.ts

@@ -20,6 +20,9 @@ export interface ImageXmlSchema {
                 length: string
                 cdnbigimgurl: string
                 hdlength: string
+                // 新版 XML 中 length 是原图大小，中图大小单独给出
+                hevc_mid_size?: string
+                cdnmidimgurl_size?: string
                 md5: string
                 tpurl?: string
                 tpauthkey?: string
@@ -28,6 +31,11 @@ export interface ImageXmlSchema {
     }
 }
 
+export interface ImageFileCandidate {
+  file_id: string,
+  file_size: string,
+}
+
 export interface ImageMessagePayload {
   aes_key: string,
   auth_key: string,
@@ -35,18 +43,71 @@ export interface ImageMessagePayload {
   file_size: string,
   file_name: string,
   is_ww: boolean,
+  /**
+   * 按优先级排列的 (file_id, file_size) 组合，第一项即 file_id/file_size。
+   * 下载失败时按顺序回落到下一项，避免在错误的 size 上反复重试。
+   */
+  candidates?: ImageFileCandidate[],
 }
 
 export async function parseImageMessagePayload (rawPayload: MessagePayload): Promise<ImageMessagePayload> {
   const imageXml: ImageXmlSchema = await xmlToJson(rawPayload.msg)
   const schema = imageXml.msg.img.$
 
+  const candidates = buildImageCandidates(schema)
+  const primary = candidates[0] || { file_id: schema.cdnmidimgurl || schema.tpurl || '', file_size: schema.length }
+
   return {
     is_ww: !!schema.tpurl,
     aes_key: schema.aeskey,
     auth_key: schema.tpauthkey || '',
-    file_id: schema.cdnmidimgurl || schema.tpurl || '',
-    file_size: schema.length,
+    file_id: primary.file_id,
+    file_size: primary.file_size,
     file_name: '',
+    candidates: candidates.length ? candidates : [ primary ],
+  }
+}
+
+const isPositiveSize = (size?: string): size is string => !!size && Number(size) > 0
+
+/**
+ * file_id 和 file_size 必须指向同一张图，否则下载端按错误的 size 做 Range/断点会失败。
+ * 候选优先级：
+ * 1. 企业微信 (tpurl)：保持原逻辑，只有一个候选，size 用 length
+ * 2. cdnmidimgurl + 中图大小 (cdnmidimgurl_size，其次 hevc_mid_size)
+ * 3. 旧版 XML (有 hdlength，length 是中图大小)：cdnmidimgurl + length，其次 cdnbigimgurl + hdlength
+ *    新版 XML (无 hdlength，length 是原图大小)：cdnbigimgurl + length，其次 cdnmidimgurl + length
+ */
+export function buildImageCandidates (schema: ImageXmlSchema['msg']['img']['$']): ImageFileCandidate[] {
+  if (schema.tpurl) {
+    return [ { file_id: schema.cdnmidimgurl || schema.tpurl, file_size: schema.length } ]
+  }
+
+  const midUrl = schema.cdnmidimgurl
+  const bigUrl = schema.cdnbigimgurl
+  const list: Array<[string | undefined, string | undefined]> = [
+    [ midUrl, schema.cdnmidimgurl_size ],
+    [ midUrl, schema.hevc_mid_size ],
+  ]
+
+  if (isPositiveSize(schema.hdlength)) {
+    list.push([ midUrl, schema.length ], [ bigUrl, schema.hdlength ])
+  } else {
+    list.push([ bigUrl, schema.length ], [ midUrl, schema.length ])
+  }
+
+  const seen = new Set<string>()
+  const candidates: ImageFileCandidate[] = []
+  for (const [ fileId, fileSize ] of list) {
+    if (!fileId || !isPositiveSize(fileSize)) {
+      continue
+    }
+    const key = `${fileId}|${fileSize}`
+    if (seen.has(key)) {
+      continue
+    }
+    seen.add(key)
+    candidates.push({ file_id: fileId, file_size: fileSize })
   }
+  return candidates
 }

package/src/matrix/messages/message-video.spec.ts

@@ -0,0 +1,37 @@
+#!/usr/bin/env -S node -r ts-node/register
+import { test } from 'tstest'
+
+import type { MessagePayload } from '../../engine-schema.js'
+import { parseVideoMessagePayload } from './message-video.js'
+import { parseSizeMismatch } from '../service/request.js'
+
+const buildPayload = (attrs: string): MessagePayload => ({
+  msg: `<?xml version="1.0"?>\n<msg>\n\t<videomsg ${attrs} />\n</msg>\n`,
+} as unknown as MessagePayload)
+
+test('parseVideoMessagePayload adds raw video as fallback candidate', async t => {
+  const payload = await parseVideoMessagePayload(buildPayload(
+    'aeskey="key" cdnvideourl="video-url" length="766838" playlength="5" rawlength="769445" cdnrawvideourl="raw-url" cdnrawvideoaeskey="raw-key"',
+  ))
+
+  t.equal(payload.file_id, 'video-url', 'primary file_id unchanged')
+  t.equal(payload.file_size, '766838', 'primary file_size unchanged')
+  t.same(payload.candidates, [
+    { file_id: 'video-url', file_size: '766838' },
+    { file_id: 'raw-url', file_size: '769445', aes_key: 'raw-key' },
+  ], 'raw video should be second candidate with its own aes key')
+})
+
+test('parseVideoMessagePayload skips empty raw video', async t => {
+  const payload = await parseVideoMessagePayload(buildPayload(
+    'aeskey="key" cdnvideourl="video-url" length="766838" playlength="5" rawlength="0" cdnrawvideourl="" cdnrawvideoaeskey=""',
+  ))
+
+  t.same(payload.candidates, [ { file_id: 'video-url', file_size: '766838' } ], 'only cdn video candidate')
+})
+
+test('parseSizeMismatch extracts actual size from backend error', async t => {
+  t.equal(parseSizeMismatch('download plaintext size differs: expected 766838, got 1228708'), '1228708', 'should return actual size')
+  t.equal(parseSizeMismatch('timeout'), undefined, 'other errors return undefined')
+  t.equal(parseSizeMismatch(undefined), undefined, 'undefined returns undefined')
+})