wechaty-puppet-matrix 0.0.54 → 0.0.56

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

@@ -44,6 +44,7 @@ const types_js_1 = require("./matrix/types.js");
 const request_js_1 = __importDefault(require("./matrix/service/request.js"));
 const date_fns_1 = require("date-fns");
 const index_js_1 = require("./matrix/utils/index.js");
+const file_type_js_1 = require("./matrix/utils/file-type.js");
 const path_1 = __importDefault(require("path"));
 const cache_manager_js_1 = require("./matrix/cache-manager.js");
 const is_type_js_1 = require("./matrix/utils/is-type.js");
@@ -55,6 +56,7 @@ const message_image_js_1 = require("./matrix/messages/message-image.js");
 const message_audio_js_1 = require("./matrix/messages/message-audio.js");
 const message_video_js_1 = require("./matrix/messages/message-video.js");
 const message_location_js_1 = require("./matrix/messages/message-location.js");
+const message_contact_card_js_1 = require("./matrix/messages/message-contact-card.js");
 const cached_promise_js_1 = require("./matrix/utils/cached-promise.js");
 const message_js_1 = require("./matrix/schema-mapper/message.js");
 const contact_js_1 = require("./matrix/schema-mapper/contact.js");
@@ -62,7 +64,6 @@ const room_js_1 = require("./matrix/schema-mapper/room.js");
 const mod_js_1 = require("./matrix/events/mod.js");
 const cleanup_js_1 = require("./cleanup.js");
 const package_json_js_1 = require("./package-json.js");
-const xml_to_json_js_1 = require("./matrix/utils/xml-to-json.js");
 const VERSION = package_json_js_1.packageJson.version || '0.0.0';
 exports.VERSION = VERSION;
 const PRE = '[PuppetMatrix]';
@@ -560,7 +561,7 @@ class PuppetMatrix extends PUPPET.Puppet {
                 hello = option.hello;
             }
         }
-        await this._client?.addFriendByWxid({ content: hello, ticket, scene: addContactScene, wxid: contactId });
+        await this._client?.addFriendByWxid({ content: hello, ticket, scene: addContactScene, wxid: cachedContactSearch?.wxid || contactId });
     }
     async friendshipSearchPhone(phone) {
         return this._friendshipSearch(phone, '15');
@@ -597,7 +598,58 @@ class PuppetMatrix extends PUPPET.Puppet {
     }
     async messageContact(messageId) {
         wechaty_puppet_1.log.verbose('PuppetWeChat', 'messageContact(%s)', messageId);
-        return PUPPET.throwUnsupportedError(messageId);
+        const rawPayload = await this.messageRawPayload(messageId);
+        if (rawPayload.msgType !== types_js_1.WechatMessageType.ShareCard) {
+            throw new Error(`message ${messageId} is not a contact card`);
+        }
+        const card = await (0, message_contact_card_js_1.parseContactCardMessagePayload)(rawPayload.msg);
+        if (!card) {
+            throw new Error(`can not parse contact card from message ${messageId}`);
+        }
+        if (!card.username.includes(STRANGER_SUFFIX)) {
+            return card.username;
+        }
+        const friendId = await this._findFriendByCard(card);
+        if (friendId) {
+            wechaty_puppet_1.log.verbose(PRE, 'messageContact(%s) matched friend %s', messageId, friendId);
+            return friendId;
+        }
+        const searchId = `${SEARCH_CONTACT_PREFIX}${card.username}`;
+        await this._cacheMgr.setContactSearch(searchId, {
+            alias: '',
+            avatar: card.avatar,
+            city: card.city,
+            country: '',
+            isFriend: 0,
+            name: card.nickname,
+            province: card.province,
+            scene: card.scene,
+            sex: card.sex,
+            sign: card.sign,
+            ticket: card.antispamticket,
+            wxNum: card.alias,
+            wxid: card.username,
+        });
+        return searchId;
+    }
+    async _findFriendByCard(card) {
+        const avatarKey = (url) => (url || '').replace(/^https?:\/\//, '').replace(/\/\d+$/, '');
+        const cardAvatar = avatarKey(card.avatar);
+        const contacts = (await this._cacheMgr.getAllContacts())
+            .filter(c => c.wxid && !(0, is_type_js_1.isRoomId)(c.wxid) && !c.wxid.includes(STRANGER_SUFFIX) && c.isFriend !== 0);
+        if (cardAvatar) {
+            const byAvatar = contacts.find(c => avatarKey(c.avatar) === cardAvatar);
+            if (byAvatar) {
+                return byAvatar.wxid;
+            }
+        }
+        if (card.nickname) {
+            const byName = contacts.filter(c => c.name === card.nickname);
+            if (byName.length === 1) {
+                return byName[0].wxid;
+            }
+        }
+        return undefined;
     }
     async messageChannel(messageId) {
         wechaty_puppet_1.log.verbose('PuppetService', 'messageChannel(%s)', messageId);
@@ -636,12 +688,20 @@ class PuppetMatrix extends PUPPET.Puppet {
                 return this._getMessageFileFileBox(messageId, messagePayload);
             case PUPPET.types.Message.Emoticon: {
                 const emotionPayload = await (0, message_emotion_js_1.parseEmotionMessagePayload)(messagePayload);
-                const emoticonBox = emotionPayload.is_ww ? await this._client?.downloadWWMedia({
-                    aes_key: emotionPayload.aeskey || '',
-                    auth_key: emotionPayload.authkey || '',
-                    file_id: emotionPayload.cdnurl || '',
-                    file_name: `message-${messageId}-emoticon.jpg`,
-                }, 3) : file_box_1.FileBox.fromUrl(emotionPayload.cdnurl, { name: `message-${messageId}-emoticon.jpg` });
+                const url = emotionPayload.is_ww
+                    ? (await this._client?.downloadWWMedia({
+                        aes_key: emotionPayload.aeskey || '',
+                        auth_key: emotionPayload.authkey || '',
+                        file_id: emotionPayload.cdnurl || '',
+                        file_name: `message-${messageId}-emoticon.gif`,
+                    }, 3)) || ''
+                    : emotionPayload.cdnurl;
+                if (!url) {
+                    throw new Error(`Can not get emoticon url for message: ${messageId}`);
+                }
+                const head = await (0, file_type_js_1.fetchRemoteHead)(url);
+                const ext = (head && (0, file_type_js_1.detectImageExt)(head)) || (emotionPayload.type === 2 && !emotionPayload.game ? 'gif' : 'png');
+                const emoticonBox = file_box_1.FileBox.fromUrl(url, { name: `message-${messageId}-emoticon.${ext}` });
                 emoticonBox.metadata = {
                     payload: emotionPayload,
                     type: 'emoticon',
@@ -776,28 +836,14 @@ class PuppetMatrix extends PUPPET.Puppet {
         }
     }
     async messageSendContact(toUserId, contactId) {
-        wechaty_puppet_1.log.verbose('PuppetWeChat', 'messageSend("%s", %s)', toUserId, contactId);
+        wechaty_puppet_1.log.verbose('PuppetWeChat', 'messageSendContact("%s", %s)', toUserId, contactId);
         const contactPayload = await this.contactRawPayload(contactId);
-        const xmlObj = {
-            msg: {
-                antispamticket: '',
-                bigheadimgurl: contactPayload?.avatar,
-                brandFlags: '0',
-                certflag: '0',
-                city: contactPayload?.city,
-                fullpy: contactPayload?.name,
-                imagestatus: '3',
-                nickname: contactPayload?.name,
-                province: contactPayload?.province,
-                regionCode: 'CN_Shanghai',
-                scene: '17',
-                sex: contactPayload?.sex,
-                smallheadimgurl: contactPayload?.avatar,
-                username: contactPayload?.ticket,
-            },
-        };
-        const xml = (0, xml_to_json_js_1.JsonToXml)(xmlObj);
-        const res = await this._client?.sendContactCard(toUserId, xml, this._self?.wxid);
+        const res = await this._client?.sendContact({
+            shareHeadImg: contactPayload?.avatar,
+            shareId: contactPayload?.wxid || contactId,
+            shareNickname: contactPayload?.name,
+            toId: toUserId,
+        }, this._self?.wxid);
         if (res) {
             await this._cacheMgr?.setMessage(res.id, res);
             return res.id;
@@ -810,7 +856,16 @@ class PuppetMatrix extends PUPPET.Puppet {
             : path_1.default.extname(fileBox.name);
         const fileUrl = fileBox.remoteUrl || '';
         if (metadata.type === 'emoticon') {
-            PUPPET.throwUnsupportedError(conversationId, fileBox);
+            const emoji = metadata.payload;
+            const byMd5 = emoji?.md5 && emoji.len
+                ? await this._client?.sendEmojiMd5(conversationId, emoji.md5, emoji.len, this._self?.wxid)
+                : undefined;
+            const msgInfo = byMd5 || (fileUrl ? await this._client?.sendEmojiUrl(conversationId, fileUrl, this._self?.wxid) : undefined);
+            if (!msgInfo) {
+                throw new Error(`send emoticon failed: ${fileBox.name}`);
+            }
+            await this._cacheMgr?.setMessage(msgInfo.id, msgInfo);
+            return msgInfo.id;
         }
         else if (fileBox.mediaType.startsWith('image/')) {
             if (fileUrl) {
@@ -915,8 +970,27 @@ class PuppetMatrix extends PUPPET.Puppet {
             throw new Error(`Wrong Post!!! please check your Post payload to make sure it right ${conversationId}`);
         }
     }
+    async sendPat(conversationId, contactId) {
+        wechaty_puppet_1.log.verbose(PRE, 'sendPat(%s, %s)', conversationId, contactId);
+        const patted = contactId || conversationId;
+        if ((0, is_type_js_1.isRoomId)(patted)) {
+            throw new Error('sendPat: contactId is required in room');
+        }
+        return (await this._client?.sendPat(conversationId, patted)) || false;
+    }
     async messageRecall(messageId) {
-        return PUPPET.throwUnsupportedError(messageId);
+        wechaty_puppet_1.log.verbose(PRE, 'messageRecall(%s)', messageId);
+        const payload = await this._cacheMgr?.getMessage(messageId);
+        if (!payload) {
+            wechaty_puppet_1.log.warn(PRE, 'messageRecall(%s): message not found in cache', messageId);
+            return false;
+        }
+        const toId = payload.listenerId || payload.fromWxid || '';
+        if (!toId) {
+            wechaty_puppet_1.log.warn(PRE, 'messageRecall(%s): can not find conversation id', messageId);
+            return false;
+        }
+        return (await this._client?.revokeMsg(toId, messageId, payload.clientMsgId)) || false;
     }
     async messageForward(toUserName, messageId) {
         const messagePayload = await this.messageRawPayload(messageId);
@@ -1496,7 +1570,21 @@ class PuppetMatrix extends PUPPET.Puppet {
             wechaty_puppet_1.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 (0, file_type_js_1.fetchRemoteHead)(url);
+        const ext = head && (0, file_type_js_1.detectImageExt)(head);
+        if (!ext) {
+            return undefined;
+        }
+        let rawName = 'image';
+        try {
+            rawName = decodeURIComponent(new URL(url).pathname.split('/').pop() || rawName);
+        }
+        catch {
+        }
+        return (0, file_type_js_1.replaceExt)(rawName, ext);
     }
     async _getMessageAudioFileBox(messageId, messagePayload) {
         const audioInfo = await (0, message_audio_js_1.parseAudioMessagePayload)(messagePayload);

package/dist/esm/src/engine-schema.d.ts

@@ -10,6 +10,7 @@ export interface MessagePayload {
     msg: string;
     listenerId: string;
     voiceText?: string;
+    clientMsgId?: number;
 }
 export interface ChatRoomMember {
     wxid: string;

package/dist/esm/src/engine-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine-schema.d.ts","sourceRoot":"","sources":["../../../src/engine-schema.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAGD,oBAAY,OAAO;IACjB,GAAG,IAAI;IACP,MAAM,IAAI;CACX;AAKD,aAAK,aAAa;IAChB,OAAO,IAAI;IACX,IAAI,IAAI;IACR,MAAM,IAAI;CACX;AAED,MAAM,WAAW,cAAc;IAI7B,MAAM,EAAE,MAAM,CAAC;IAIf,IAAI,EAAE,MAAM,CAAC;IAIb,OAAO,EAAE,MAAM,CAAC;IAIhB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAIhC,IAAI,EAAE,MAAM,CAAC;IAIb,KAAK,EAAE,MAAM,CAAC;IAId,QAAQ,EAAE,MAAM,CAAC;IAIjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAIhB,GAAG,EAAE,aAAa,CAAC;IAInB,IAAI,CAAC,EAAE,MAAM,CAAC;IAKd,MAAM,CAAC,EAAE,MAAM,CAAC;IAIhB,IAAI,EAAE,MAAM,CAAC;IAIb,KAAK,EAAE,MAAM,CAAC;IAId,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAI9B,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IAItB,QAAQ,CAAC,EAAE,MAAM,CAAA;IAIjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAKlB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAC,MAAM,CAAC;IACX,OAAO,EAAC,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB"}
+{"version":3,"file":"engine-schema.d.ts","sourceRoot":"","sources":["../../../src/engine-schema.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AACD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAGD,oBAAY,OAAO;IACjB,GAAG,IAAI;IACP,MAAM,IAAI;CACX;AAKD,aAAK,aAAa;IAChB,OAAO,IAAI;IACX,IAAI,IAAI;IACR,MAAM,IAAI;CACX;AAED,MAAM,WAAW,cAAc;IAI7B,MAAM,EAAE,MAAM,CAAC;IAIf,IAAI,EAAE,MAAM,CAAC;IAIb,OAAO,EAAE,MAAM,CAAC;IAIhB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAIhC,IAAI,EAAE,MAAM,CAAC;IAIb,KAAK,EAAE,MAAM,CAAC;IAId,QAAQ,EAAE,MAAM,CAAC;IAIjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAIhB,GAAG,EAAE,aAAa,CAAC;IAInB,IAAI,CAAC,EAAE,MAAM,CAAC;IAKd,MAAM,CAAC,EAAE,MAAM,CAAC;IAIhB,IAAI,EAAE,MAAM,CAAC;IAIb,KAAK,EAAE,MAAM,CAAC;IAId,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAI9B,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IAItB,QAAQ,CAAC,EAAE,MAAM,CAAA;IAIjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAKlB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAC,MAAM,CAAC;IACX,OAAO,EAAC,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB"}

package/dist/esm/src/matrix/messages/message-contact-card.d.ts

@@ -0,0 +1,16 @@
+export interface ContactCardPayload {
+    username: string;
+    nickname: string;
+    alias: string;
+    avatar: string;
+    province: string;
+    city: string;
+    sex: number;
+    sign: string;
+    scene: string;
+    antispamticket: string;
+    brandType: number;
+    certflag: number;
+}
+export declare function parseContactCardMessagePayload(content: string): Promise<ContactCardPayload | undefined>;
+//# sourceMappingURL=message-contact-card.d.ts.map

package/dist/esm/src/matrix/messages/message-contact-card.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-contact-card.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/messages/message-contact-card.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,kBAAkB;IAEjC,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAEhB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IAEb,cAAc,EAAE,MAAM,CAAA;IAEtB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,wBAAsB,8BAA8B,CAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAoB9G"}

package/dist/esm/src/matrix/messages/message-contact-card.js

@@ -0,0 +1,22 @@
+import { xmlToJson } from '../utils/xml-to-json.js';
+export async function parseContactCardMessagePayload(content) {
+    const json = await xmlToJson(content);
+    const attrs = json?.msg?.$;
+    if (!attrs?.username) {
+        return undefined;
+    }
+    return {
+        alias: attrs.alias || '',
+        antispamticket: attrs.antispamticket || '',
+        avatar: attrs.bigheadimgurl || attrs.smallheadimgurl || '',
+        brandType: parseInt(attrs.brandType, 10) || 0,
+        certflag: parseInt(attrs.certflag, 10) || 0,
+        city: attrs.city || '',
+        nickname: attrs.nickname || '',
+        province: attrs.province || '',
+        scene: attrs.scene || '17',
+        sex: parseInt(attrs.sex, 10) || 0,
+        sign: attrs.sign || '',
+        username: attrs.username,
+    };
+}

package/dist/esm/src/matrix/messages/message-emotion.d.ts

@@ -1,4 +1,10 @@
 import type { MessagePayload } from '../../engine-schema.js';
+export interface EmojiGamePayload {
+    kind: 'rps' | 'dice';
+    value: string | number;
+    text: string;
+}
+export declare function parseEmojiGame(type: number, content: number): EmojiGamePayload | undefined;
 export interface EmojiMessagePayload {
     type: number;
     len: number;
@@ -7,6 +13,7 @@ export interface EmojiMessagePayload {
     width: number;
     height: number;
     gameext?: string;
+    game?: EmojiGamePayload;
     aeskey?: string;
     authkey?: string;
     is_ww: boolean;

package/dist/esm/src/matrix/messages/message-emotion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-emotion.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/messages/message-emotion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AA2B5D,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,0BAA0B,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA6BvG;AAED,wBAAgB,sBAAsB,CAAE,mBAAmB,EAAE,mBAAmB,GAAG,MAAM,CAIxF"}
+{"version":3,"file":"message-emotion.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/messages/message-emotion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAgC5D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAErB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAEvB,IAAI,EAAE,MAAM,CAAC;CACd;AAQD,wBAAgB,cAAc,CAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAU3F;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,0BAA0B,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAgCvG;AAED,wBAAgB,sBAAsB,CAAE,mBAAmB,EAAE,mBAAmB,GAAG,MAAM,CAIxF"}

package/dist/esm/src/matrix/messages/message-emotion.js

@@ -1,4 +1,20 @@
 import { xmlToJson } from '../utils/xml-to-json.js';
+const RPS = {
+    1: ['scissors', '剪刀'],
+    2: ['rock', '石头'],
+    3: ['paper', '布'],
+};
+export function parseEmojiGame(type, content) {
+    if (type === 1 && RPS[content]) {
+        const [value, text] = RPS[content];
+        return { kind: 'rps', text, value };
+    }
+    if (type === 2 && content >= 4 && content <= 9) {
+        const point = content - 3;
+        return { kind: 'dice', text: `${point}点`, value: point };
+    }
+    return undefined;
+}
 export async function parseEmotionMessagePayload(message) {
     const jsonPayload = await xmlToJson(message.msg);
     const len = parseInt(jsonPayload.msg.emoji.$.len, 10) || 0;
@@ -8,16 +24,19 @@ export async function parseEmotionMessagePayload(message) {
     const type = parseInt(jsonPayload.msg.emoji.$.type, 10) || 0;
     const md5 = jsonPayload.msg.emoji.$.md5;
     let gameext;
+    let game;
     if (jsonPayload.msg.gameext) {
         const gameextType = parseInt(jsonPayload.msg.gameext.$.type, 10) || 0;
         const gameextContent = parseInt(jsonPayload.msg.gameext.$.content, 10) || 0;
         gameext = `<gameext type="${gameextType}" content="${gameextContent}" ></gameext>`;
+        game = parseEmojiGame(gameextType, gameextContent);
     }
     return {
         authkey: jsonPayload.msg.emoji.$?.tpauthkey,
         aeskey: jsonPayload.msg.emoji.$?.aeskey,
         is_ww: !!jsonPayload.msg.emoji.$?.tpurl,
         cdnurl,
+        game,
         gameext,
         height,
         len,

package/dist/esm/src/matrix/messages/message-image.d.ts

@@ -18,6 +18,8 @@ export interface ImageXmlSchema {
                 length: string;
                 cdnbigimgurl: string;
                 hdlength: string;
+                hevc_mid_size?: string;
+                cdnmidimgurl_size?: string;
                 md5: string;
                 tpurl?: string;
                 tpauthkey?: string;
@@ -25,6 +27,10 @@ export interface ImageXmlSchema {
         };
     };
 }
+export interface ImageFileCandidate {
+    file_id: string;
+    file_size: string;
+}
 export interface ImageMessagePayload {
     aes_key: string;
     auth_key: string;
@@ -32,6 +38,8 @@ export interface ImageMessagePayload {
     file_size: string;
     file_name: string;
     is_ww: boolean;
+    candidates?: ImageFileCandidate[];
 }
 export declare function parseImageMessagePayload(rawPayload: MessagePayload): Promise<ImageMessagePayload>;
+export declare function buildImageCandidates(schema: ImageXmlSchema['msg']['img']['$']): ImageFileCandidate[];
 //# sourceMappingURL=message-image.d.ts.map

package/dist/esm/src/matrix/messages/message-image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-image.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/messages/message-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAGvD,MAAM,WAAW,cAAc;IAC3B,GAAG,EAAE;QACD,GAAG,EAAE;YACD,CAAC,EAAE;gBACC,MAAM,EAAE,MAAM,CAAA;gBACd,QAAQ,EAAE,MAAM,CAAA;gBAChB,cAAc,EAAE,MAAM,CAAA;gBACtB,WAAW,EAAE,MAAM,CAAA;gBACnB,cAAc,EAAE,MAAM,CAAA;gBACtB,cAAc,EAAE,MAAM,CAAA;gBACtB,aAAa,EAAE,MAAM,CAAA;gBACrB,YAAY,EAAE,MAAM,CAAA;gBACpB,WAAW,EAAE,MAAM,CAAA;gBACnB,WAAW,EAAE,MAAM,CAAA;gBACnB,UAAU,EAAE,MAAM,CAAA;gBAClB,YAAY,EAAE,MAAM,CAAA;gBACpB,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;gBACpB,QAAQ,EAAE,MAAM,CAAA;gBAChB,GAAG,EAAE,MAAM,CAAA;gBACX,KAAK,CAAC,EAAE,MAAM,CAAA;gBACd,SAAS,CAAC,EAAE,MAAM,CAAA;aACrB,CAAA;SACJ,CAAA;KACJ,CAAA;CACJ;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,wBAAwB,CAAE,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAYxG"}
+{"version":3,"file":"message-image.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/messages/message-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAGvD,MAAM,WAAW,cAAc;IAC3B,GAAG,EAAE;QACD,GAAG,EAAE;YACD,CAAC,EAAE;gBACC,MAAM,EAAE,MAAM,CAAA;gBACd,QAAQ,EAAE,MAAM,CAAA;gBAChB,cAAc,EAAE,MAAM,CAAA;gBACtB,WAAW,EAAE,MAAM,CAAA;gBACnB,cAAc,EAAE,MAAM,CAAA;gBACtB,cAAc,EAAE,MAAM,CAAA;gBACtB,aAAa,EAAE,MAAM,CAAA;gBACrB,YAAY,EAAE,MAAM,CAAA;gBACpB,WAAW,EAAE,MAAM,CAAA;gBACnB,WAAW,EAAE,MAAM,CAAA;gBACnB,UAAU,EAAE,MAAM,CAAA;gBAClB,YAAY,EAAE,MAAM,CAAA;gBACpB,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;gBACpB,QAAQ,EAAE,MAAM,CAAA;gBAEhB,aAAa,CAAC,EAAE,MAAM,CAAA;gBACtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;gBAC1B,GAAG,EAAE,MAAM,CAAA;gBACX,KAAK,CAAC,EAAE,MAAM,CAAA;gBACd,SAAS,CAAC,EAAE,MAAM,CAAA;aACrB,CAAA;SACJ,CAAA;KACJ,CAAA;CACJ;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IAKf,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACnC;AAED,wBAAsB,wBAAwB,CAAE,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAgBxG;AAYD,wBAAgB,oBAAoB,CAAE,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,kBAAkB,EAAE,CAgCrG"}

package/dist/esm/src/matrix/messages/message-image.js

@@ -2,12 +2,47 @@ import { xmlToJson } from '../utils/xml-to-json.js';
 export async function parseImageMessagePayload(rawPayload) {
     const imageXml = 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) => !!size && Number(size) > 0;
+export function buildImageCandidates(schema) {
+    if (schema.tpurl) {
+        return [{ file_id: schema.cdnmidimgurl || schema.tpurl, file_size: schema.length }];
+    }
+    const midUrl = schema.cdnmidimgurl;
+    const bigUrl = schema.cdnbigimgurl;
+    const list = [
+        [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();
+    const candidates = [];
+    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/dist/esm/src/matrix/messages/message-image.spec.d.ts

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

package/dist/esm/src/matrix/messages/message-image.spec.d.ts.map

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

package/dist/esm/src/matrix/messages/message-image.spec.js

@@ -0,0 +1,64 @@
+#!/usr/bin/env -S node -r ts-node/register
+import { test } from 'tstest';
+import { parseImageMessagePayload } from './message-image.js';
+const buildPayload = (imgAttrs) => ({
+    msg: `<?xml version="1.0"?>\n<msg>\n\t<img ${imgAttrs}>\n\t</img>\n</msg>\n`,
+});
+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/dist/esm/src/matrix/messages/message-video.d.ts

@@ -48,6 +48,12 @@ export interface VideoMessagePayload {
     thumb_width: string;
     thumb_height: string;
     file_name: '';
+    candidates?: Array<{
+        file_id: string;
+        file_size: string;
+        aes_key?: string;
+    }>;
 }
 export declare function parseVideoMessagePayload(rawPayload: MessagePayload): Promise<VideoMessagePayload>;
+export declare function buildVideoCandidates(schema: VideoXmlSchema['msg']['videomsg']['$']): VideoMessagePayload['candidates'];
 //# sourceMappingURL=message-video.d.ts.map

package/dist/esm/src/matrix/messages/message-video.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-video.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/messages/message-video.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAGvD,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE;QACD,QAAQ,EAAE;YACN,CAAC,EAAE;gBACC,MAAM,EAAE,MAAM,CAAA;gBACd,WAAW,EAAE,MAAM,CAAA;gBACnB,cAAc,EAAE,MAAM,CAAA;gBACtB,WAAW,EAAE,MAAM,CAAA;gBACnB,MAAM,EAAE,MAAM,CAAA;gBACd,UAAU,EAAE,MAAM,CAAA;gBAClB,cAAc,EAAE,MAAM,CAAA;gBACtB,aAAa,EAAE,MAAM,CAAA;gBACrB,cAAc,EAAE,MAAM,CAAA;gBACtB,YAAY,EAAE,MAAM,CAAA;gBACpB,GAAG,EAAE,MAAM,CAAA;gBACX,MAAM,EAAE,MAAM,CAAA;gBACd,aAAa,EAAE,MAAM,CAAA;gBACrB,MAAM,EAAE,MAAM,CAAA;gBACd,SAAS,EAAE,MAAM,CAAA;gBACjB,cAAc,EAAE,MAAM,CAAA;gBACtB,iBAAiB,EAAE,MAAM,CAAA;gBACzB,iBAAiB,EAAE,MAAM,CAAA;gBACzB,eAAe,EAAE,MAAM,CAAA;gBACvB,IAAI,EAAE,MAAM,CAAA;gBACZ,UAAU,CAAC,EAAE,MAAM,CAAA;gBACnB,SAAS,CAAC,EAAE,MAAM,CAAA;gBAClB,UAAU,CAAC,EAAE,MAAM,CAAA;gBACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,aAAa,CAAC,EAAE,MAAM,CAAA;gBACtB,YAAY,CAAC,EAAE,MAAM,CAAA;gBACrB,aAAa,CAAC,EAAE,MAAM,CAAA;gBACtB,aAAa,CAAC,EAAE,MAAM,CAAA;aACzB,CAAA;SACJ,CAAA;KACJ,CAAA;CACF;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,EAAE,CAAA;CACd;AAED,wBAAsB,wBAAwB,CAAE,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAkBxG"}
+{"version":3,"file":"message-video.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/messages/message-video.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAGvD,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE;QACD,QAAQ,EAAE;YACN,CAAC,EAAE;gBACC,MAAM,EAAE,MAAM,CAAA;gBACd,WAAW,EAAE,MAAM,CAAA;gBACnB,cAAc,EAAE,MAAM,CAAA;gBACtB,WAAW,EAAE,MAAM,CAAA;gBACnB,MAAM,EAAE,MAAM,CAAA;gBACd,UAAU,EAAE,MAAM,CAAA;gBAClB,cAAc,EAAE,MAAM,CAAA;gBACtB,aAAa,EAAE,MAAM,CAAA;gBACrB,cAAc,EAAE,MAAM,CAAA;gBACtB,YAAY,EAAE,MAAM,CAAA;gBACpB,GAAG,EAAE,MAAM,CAAA;gBACX,MAAM,EAAE,MAAM,CAAA;gBACd,aAAa,EAAE,MAAM,CAAA;gBACrB,MAAM,EAAE,MAAM,CAAA;gBACd,SAAS,EAAE,MAAM,CAAA;gBACjB,cAAc,EAAE,MAAM,CAAA;gBACtB,iBAAiB,EAAE,MAAM,CAAA;gBACzB,iBAAiB,EAAE,MAAM,CAAA;gBACzB,eAAe,EAAE,MAAM,CAAA;gBACvB,IAAI,EAAE,MAAM,CAAA;gBACZ,UAAU,CAAC,EAAE,MAAM,CAAA;gBACnB,SAAS,CAAC,EAAE,MAAM,CAAA;gBAClB,UAAU,CAAC,EAAE,MAAM,CAAA;gBACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,aAAa,CAAC,EAAE,MAAM,CAAA;gBACtB,YAAY,CAAC,EAAE,MAAM,CAAA;gBACrB,aAAa,CAAC,EAAE,MAAM,CAAA;gBACtB,aAAa,CAAC,EAAE,MAAM,CAAA;aACzB,CAAA;SACJ,CAAA;KACJ,CAAA;CACF;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,EAAE,CAAC;IAMd,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC9E;AAID,wBAAsB,wBAAwB,CAAE,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmBxG;AAED,wBAAgB,oBAAoB,CAAE,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAgBvH"}

package/dist/esm/src/matrix/messages/message-video.js

@@ -1,4 +1,5 @@
 import { xmlToJson } from '../utils/xml-to-json.js';
+const isPositiveSize = (size) => !!size && Number(size) > 0;
 export async function parseVideoMessagePayload(rawPayload) {
     const videoXml = await xmlToJson(rawPayload.msg);
     const videoSchema = videoXml.msg.videomsg.$;
@@ -15,5 +16,23 @@ export async function parseVideoMessagePayload(rawPayload) {
         thumb_width: videoSchema.cdnthumbwidth || videoSchema.tpthumbwidth || '',
         thumb_height: videoSchema.cdnthumbheight || videoSchema.tpthumbheight || '',
         file_name: '',
+        candidates: buildVideoCandidates(videoSchema),
     };
 }
+export function buildVideoCandidates(schema) {
+    if (schema.tpvideourl) {
+        return undefined;
+    }
+    const candidates = [];
+    if (schema.cdnvideourl && isPositiveSize(schema.length)) {
+        candidates.push({ file_id: schema.cdnvideourl, file_size: schema.length });
+    }
+    if (schema.cdnrawvideourl && isPositiveSize(schema.rawlength)) {
+        candidates.push({
+            file_id: schema.cdnrawvideourl,
+            file_size: schema.rawlength,
+            aes_key: schema.cdnrawvideoaeskey || schema.aeskey,
+        });
+    }
+    return candidates.length ? candidates : undefined;
+}

package/dist/esm/src/matrix/messages/message-video.spec.d.ts

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

package/dist/esm/src/matrix/messages/message-video.spec.d.ts.map

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

package/dist/esm/src/matrix/messages/message-video.spec.js

@@ -0,0 +1,25 @@
+#!/usr/bin/env -S node -r ts-node/register
+import { test } from 'tstest';
+import { parseVideoMessagePayload } from './message-video.js';
+import { parseSizeMismatch } from '../service/request.js';
+const buildPayload = (attrs) => ({
+    msg: `<?xml version="1.0"?>\n<msg>\n\t<videomsg ${attrs} />\n</msg>\n`,
+});
+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');
+});