wechaty-puppet-matrix 0.0.36 → 0.0.38

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

@@ -4,7 +4,7 @@ import { EventEmitter } from 'events';
 import * as PUPPET from '@juzi/wechaty-puppet';
 import { format, getUnixTime } from 'date-fns';
 import { xmlToJson } from '../utils/xml-to-json.js';
-import { isRoomId } from '../utils/is-type.js';
+import { isRoomId, getContactType } from '../utils/is-type.js';
 import imageSize from 'image-size';
 import fs from 'fs-extra';
 import os from 'os';
@@ -34,6 +34,11 @@ export var NotifyTypeEnum;
     NotifyTypeEnum[NotifyTypeEnum["RoomMemberUpdate"] = 1047] = "RoomMemberUpdate";
     NotifyTypeEnum[NotifyTypeEnum["RoomMemberDel"] = 1048] = "RoomMemberDel";
     NotifyTypeEnum[NotifyTypeEnum["SyncMsgFailed"] = 2006] = "SyncMsgFailed";
+    NotifyTypeEnum[NotifyTypeEnum["WxNotifyTypeCmdIdModContact"] = 1200] = "WxNotifyTypeCmdIdModContact";
+    NotifyTypeEnum[NotifyTypeEnum["WxNotifyTypeCmdIdDelContact"] = 1201] = "WxNotifyTypeCmdIdDelContact";
+    NotifyTypeEnum[NotifyTypeEnum["WxNotifyTypeOpenImContactAdd"] = 1202] = "WxNotifyTypeOpenImContactAdd";
+    NotifyTypeEnum[NotifyTypeEnum["WxNotifyTypeOpenImContactDel"] = 1203] = "WxNotifyTypeOpenImContactDel";
+    NotifyTypeEnum[NotifyTypeEnum["WxNotifyTypeOpenImRoomContactChange"] = 1204] = "WxNotifyTypeOpenImRoomContactChange";
 })(NotifyTypeEnum || (NotifyTypeEnum = {}));
 var ContactGender;
 (function (ContactGender) {
@@ -315,6 +320,7 @@ class Client extends EventEmitter {
     server;
     tokenInfo;
     hasEmitLogout;
+    lastInitSeqInfo;
     emit(event, ...args) {
         return super.emit(event, ...args);
     }
@@ -333,6 +339,7 @@ class Client extends EventEmitter {
         this.restoreTimes = 0;
         this.maxRestoreTimes = 1;
         this.hasExpired = false;
+        this.lastInitSeqInfo = { contactSeq: 0, roomSeq: 0 };
     }
     destroy() {
         log.verbose(PRE, 'destroy()');
@@ -402,10 +409,12 @@ class Client extends EventEmitter {
         const client = mqtt.connect(this.tokenInfo.mqServer, {
             username: this.tokenInfo.mqUser,
             password: this.tokenInfo.mqPsd,
-            keepalive: 60,
-            reconnectPeriod: 100,
+            keepalive: 120,
+            reconnectPeriod: 3000,
             connectTimeout: 60 * 1000,
-            clientId: this.tokenInfo.guid + randomRange(1, 10000),
+            clean: true,
+            family: 4,
+            clientId: this.tokenInfo.guid,
         });
         client.on('connect', () => {
             this.connectionStatus.status = 'connected';
@@ -532,24 +541,6 @@ class Client extends EventEmitter {
                 this.emit('logout', data.errmsg);
                 break;
             case NotifyTypeEnum.RoomMemberAdd:
-                this.emit('room-join', {
-                    roomId: data.room_username,
-                    inviterId: data.member_list[0]?.invite_username,
-                    joinIds: data.member_list.map((item) => item.username),
-                    joinUsers: data.member_list.map((data) => ({
-                        wxNum: data?.alias,
-                        wxid: data?.username || '',
-                        name: data?.nickname || '',
-                        sex: data?.sex,
-                        alias: '',
-                        province: data?.province || '',
-                        city: data?.city || '',
-                        country: data?.country || '',
-                        avatar: data?.big_headimg_url || data?.small_headimg_url || '',
-                        description: '',
-                        labelIdlist: data?.labelid_list,
-                    })),
-                });
                 break;
             case NotifyTypeEnum.RoomMemberDel:
                 this.emit('room-leave', {
@@ -562,6 +553,11 @@ class Client extends EventEmitter {
                     void this.restore();
                 }
                 break;
+            case NotifyTypeEnum.WxNotifyTypeCmdIdModContact:
+            case NotifyTypeEnum.WxNotifyTypeCmdIdDelContact:
+                log.info('contact change sync start');
+                await this.syncContact(false);
+                break;
             default:
                 log.info('other data', JSON.stringify(data));
         }
@@ -891,6 +887,7 @@ class Client extends EventEmitter {
                 if (contactInfo) {
                     const contact = contactInfo.contact;
                     return {
+                        contactType: getContactType(contact?.userName?.string || '', contact?.bitVal, contact?.verifyFlag),
                         wxNum: contact.alias,
                         wxid: contact?.userName?.string || '',
                         name: contact?.nickName?.string || '',
@@ -902,6 +899,8 @@ class Client extends EventEmitter {
                         avatar: contact?.bigHeadImgUrl || contact?.smallHeadImgUrl || '',
                         description: contact?.description,
                         labelIdlist: contact?.labelIdlist,
+                        chatroomInfoVersion: contactInfo?.chatroomInfoVersion,
+                        chatroomVersion: contactInfo?.chatroomVersion,
                     };
                 }
                 return undefined;
@@ -910,6 +909,7 @@ class Client extends EventEmitter {
                 const contacts = res.contactList?.map((contactInfo) => {
                     const contact = contactInfo.contact;
                     return {
+                        contactType: getContactType(contact?.userName?.string || '', contact?.bitVal, contact?.verifyFlag),
                         wxNum: contact.alias,
                         wxid: contact?.userName?.string || '',
                         name: contact?.nickName?.string || '',
@@ -921,6 +921,8 @@ class Client extends EventEmitter {
                         avatar: contact?.bigHeadImgUrl || contact?.smallHeadImgUrl || '',
                         description: contact?.description,
                         labelIdlist: contact?.labelIdlist,
+                        chatroomInfoVersion: contactInfo?.chatroomInfoVersion,
+                        chatroomVersion: contactInfo?.chatroomVersion,
                     };
                 }) || [];
                 return contacts;
@@ -1043,18 +1045,30 @@ class Client extends EventEmitter {
             };
         }
     }
-    async syncContact() {
+    async syncContact(init) {
         try {
+            if (init) {
+                this.lastInitSeqInfo = { contactSeq: 0, roomSeq: 0 };
+            }
             const res = await this.postData({
                 path: '/contact/init_contact',
                 data: {
-                    contact_seq: 0,
-                    room_seq: 0,
+                    contact_seq: this.lastInitSeqInfo.contactSeq || 0,
+                    room_seq: this.lastInitSeqInfo.roomSeq || 0,
                 },
             });
-            const contactUsernameList = res.contactUsernameList || [];
-            const contactsInfo = (await this.searchContact(contactUsernameList));
-            this.emit('update-contacts', contactsInfo || []);
+            const currentWxcontactSeq = res?.currentWxcontactSeq || 0;
+            const currentRoomSeq = res?.currentChatRoomContactSeq || 0;
+            const continueFlag = res?.continueFlag || false;
+            this.lastInitSeqInfo = { contactSeq: currentWxcontactSeq, roomSeq: currentRoomSeq };
+            const contactUsernameList = res?.contactUsernameList || [];
+            if (contactUsernameList.length) {
+                const contactsInfo = await this.searchContact(contactUsernameList);
+                this.emit('update-contacts', contactsInfo || []);
+            }
+            if (continueFlag) {
+                await this.syncContact();
+            }
         }
         catch (e) {
             log.error(PRE, 'syncContact(): %s', e);
@@ -1175,15 +1189,17 @@ class Client extends EventEmitter {
                     version: 0,
                 },
             });
-            const memeberIdList = res?.allMemberUserNameList.map((item) => item.string) || [];
+            const memeberIdList = res?.allMemberUserNameList?.map((item) => item.string) || [];
             const allMemberCount = res.allMemberCount;
             const ownerId = res.chatRoomOwner;
-            const adminIdList = res?.adminUserNameList.map((item) => item.string) || [];
+            const adminIdList = res?.adminUserNameList?.map((item) => item.string) || [];
             const memberList = res?.newChatroomData?.chatRoomMember
-                .filter((item) => item.username)
+                ?.filter((item) => item.userName)
                 .map((item) => ({
-                wxid: item.username,
-                groupNick: item?.nickname,
+                wxid: item.userName,
+                name: item?.nickName,
+                displayName: item?.displayName,
+                groupNick: item?.nickName,
                 avatarMinUrl: item?.smallHeadImgUrl,
                 avatarMaxUrl: item?.bigHeadImgUrl,
                 avatar: item?.bigHeadImgUrl || item?.smallHeadImgUrl,
@@ -1198,49 +1214,8 @@ class Client extends EventEmitter {
             };
         }
         catch (e) {
-            log.error(PRE, 'getGroupMembers(%s): %s', roomId, e);
-            return [];
-        }
-    }
-    async getGroupMembers(roomId, page = 1, pageSize = 100) {
-        try {
-            const res = await this.postData({
-                path: '/room/get_chatroom_members',
-                data: {
-                    room_username: roomId,
-                    page_num: page,
-                    page_size: pageSize,
-                },
-            });
-            const totalPage = res.total_page || 1;
-            const memberList = res.room_list
-                .filter((item) => item.username)
-                .map((item) => ({
-                wxid: item.username,
-                groupNick: item?.nickname,
-                avatarMinUrl: item?.small_headimg_url,
-                avatarMaxUrl: item?.big_headimg_url,
-                avatar: item?.big_headimg_url || item?.small_headimg_url,
-                inviterUserName: item?.invite_username,
-                country: item?.country,
-                province: item?.province,
-                city: item?.city,
-                displayName: item?.display_name,
-                sex: item?.sex,
-                wxNum: item?.alias,
-                alias: item?.remark,
-            }));
-            if (page < totalPage) {
-                const nextPageContacts = await this.getGroupMembers(roomId, page + 1, pageSize);
-                return memberList.concat(nextPageContacts);
-            }
-            else {
-                return memberList;
-            }
-        }
-        catch (e) {
-            log.error(PRE, 'getGroupMembers(%s): %s', roomId, e);
-            return [];
+            log.error(PRE, 'getGroupMembersDetail(%s): %s', roomId, e);
+            return {};
         }
     }
     async getOfficeList(page = 1, pageSize = 100) {

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

@@ -6,4 +6,12 @@ export declare function isContactOfficialId(id?: string): boolean;
 export declare function isStrangerV1(strangerId?: string): boolean;
 export declare function isStrangerV2(strangerId?: string): boolean;
 export declare function isPayload(payload?: object): boolean;
+export declare enum ContactType {
+    Stranger = 0,
+    System = 1,
+    Friend = 2,
+    Mp = 3,
+    ChatRoom = 4
+}
+export declare function getContactType(username: string, bitVal?: number, verifyFlag?: number): ContactType;
 //# sourceMappingURL=is-type.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"is-type.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/utils/is-type.ts"],"names":[],"mappings":"AAcA,wBAAgB,QAAQ,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAK9C;AAED,wBAAgB,UAAU,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAKhD;AAED,wBAAgB,WAAW,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAKjD;AAED,wBAAgB,aAAa,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAKnD;AAED,wBAAgB,mBAAmB,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAMzD;AAED,wBAAgB,YAAY,CAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAM1D;AAED,wBAAgB,YAAY,CAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAM1D;AAED,wBAAgB,SAAS,CAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAKpD"}
+{"version":3,"file":"is-type.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/utils/is-type.ts"],"names":[],"mappings":"AAcA,wBAAgB,QAAQ,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAK9C;AAED,wBAAgB,UAAU,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAKhD;AAED,wBAAgB,WAAW,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAKjD;AAED,wBAAgB,aAAa,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAKnD;AAED,wBAAgB,mBAAmB,CAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAMzD;AAED,wBAAgB,YAAY,CAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAM1D;AAED,wBAAgB,YAAY,CAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAM1D;AAED,wBAAgB,SAAS,CAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAKpD;AAED,oBAAY,WAAW;IACrB,QAAQ,IAAI;IACZ,MAAM,IAAI;IACV,MAAM,IAAI;IACV,EAAE,IAAI;IACN,QAAQ,IAAI;CACb;AAED,wBAAgB,cAAc,CAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAI,EAAE,UAAU,SAAI,eAwB3E"}

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

@@ -60,3 +60,26 @@ export function isPayload(payload) {
     }
     return false;
 }
+export var ContactType;
+(function (ContactType) {
+    ContactType[ContactType["Stranger"] = 0] = "Stranger";
+    ContactType[ContactType["System"] = 1] = "System";
+    ContactType[ContactType["Friend"] = 2] = "Friend";
+    ContactType[ContactType["Mp"] = 3] = "Mp";
+    ContactType[ContactType["ChatRoom"] = 4] = "ChatRoom";
+})(ContactType || (ContactType = {}));
+export function getContactType(username, bitVal = 0, verifyFlag = 0) {
+    if (username.includes('@chatroom')) {
+        return ContactType.ChatRoom;
+    }
+    if (verifyFlag !== 0) {
+        return ContactType.Mp;
+    }
+    if (officeWxid.includes(username)) {
+        return ContactType.System;
+    }
+    if ((bitVal & 1) === 1) {
+        return ContactType.Friend;
+    }
+    return ContactType.Stranger;
+}

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

@@ -97,6 +97,7 @@ declare class PuppetMatrix extends PUPPET.Puppet {
     roomRawPayloadParser(payload: ContactPayload): Promise<PUPPET.payloads.Room>;
     roomRawPayload(id: string): Promise<ContactPayload | undefined>;
     roomMemberRawPayload(roomId: string, contactId: string): Promise<ContactPayload>;
+    private _searchRoomMemberInfo;
     roomMemberRawPayloadParser(rawPayload: ContactPayload): Promise<PUPPET.payloads.RoomMember>;
     roomInvitationRawPayload(roomInvitationId: string): Promise<any>;
     roomInvitationRawPayloadParser(rawPayload: any): Promise<PUPPET.payloads.RoomInvitation>;
@@ -116,6 +117,7 @@ declare class PuppetMatrix extends PUPPET.Puppet {
     _updateRoom(roomId: string): Promise<void>;
     private _onPushContact;
     private _onPushMessage;
+    private _refreshRoomInfo;
     private _refreshContact;
     private _startPuppetHeart;
     private _stopPuppetHeart;
@@ -123,7 +125,7 @@ declare class PuppetMatrix extends PUPPET.Puppet {
     private _getMessageAudioFileBox;
     private _getMessageVideoFileBox;
     private _getMessageFileFileBox;
-    syncContact(): Promise<void>;
+    syncContact(init?: boolean): Promise<void>;
 }
 export { PuppetMatrix, VERSION };
 export default PuppetMatrix;

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

@@ -3,7 +3,7 @@ import * as PUPPET from '@juzi/wechaty-puppet';
 import { FileBox, FileBoxType, } from 'file-box';
 import Client from './matrix/service/request.js';
 import { getUnixTime } from 'date-fns';
-import { delay, mergeWithFallback } from './matrix/utils/index.js';
+import { mergeWithFallback } from './matrix/utils/index.js';
 import path from 'path';
 import { CacheManager } from './matrix/cache-manager.js';
 import { isIMContactId, isRoomId } from './matrix/utils/is-type.js';
@@ -105,14 +105,6 @@ class PuppetMatrix extends PUPPET.Puppet {
                     removerId: this._self?.wxid,
                     timestamp: getUnixTime(Date.now()),
                 };
-                for (const leaveId of leaveIds) {
-                    await this._cacheMgr?.deleteSingleRoomMember(roomId, leaveId);
-                    const roomInfo = await this._cacheMgr?.getRoom(roomId);
-                    if (roomInfo && roomInfo.chatroommemberList) {
-                        roomInfo.chatroommemberList = roomInfo.chatroommemberList.filter(member => member !== leaveId);
-                        await this._cacheMgr?.setRoom(roomId, roomInfo);
-                    }
-                }
                 this.emit('room-leave', payload);
             }));
             this._client.on('room-join', this.wrapAsync(async ({ roomId, inviterId, joinIds, joinUsers }) => {
@@ -349,11 +341,10 @@ class PuppetMatrix extends PUPPET.Puppet {
     async ready() {
         try {
             await this._client?.getContactList(1, 100);
-            await this._client?.getOpenImContactList(1, 100);
-            await delay(2000);
             await this._client?.getGroupList(1, 100);
-            await delay(2000);
+            await this._client?.getOpenImContactList(1, 100);
             await this._client?.getOfficeList(1, 100);
+            await this.syncContact(true);
             log.silly(PRE, 'on ready');
             setTimeout(() => {
                 this.emit('ready', {
@@ -943,6 +934,20 @@ class PuppetMatrix extends PUPPET.Puppet {
             return memberInfo;
         }
     }
+    async _searchRoomMemberInfo(roomId, name) {
+        const localRes = await this.roomMemberSearch(roomId, name);
+        if (localRes.length > 0) {
+            return localRes[0];
+        }
+        const roomMemberMap = await this._getRoomMemberList(roomId);
+        const searchMember = Object.values(roomMemberMap).find((member) => {
+            if (member.name === name || member.alias === name || member.remark === name || member.displayName === name) {
+                return true;
+            }
+            return false;
+        });
+        return searchMember?.wxid || '';
+    }
     async roomMemberRawPayloadParser(rawPayload) {
         return engineRoomMemberToWechaty(rawPayload);
     }
@@ -1058,7 +1063,8 @@ class PuppetMatrix extends PUPPET.Puppet {
         }
         let ret = await this._cacheMgr.getRoomMember(roomId);
         if (!ret || (ret && !Object.keys(ret).length) || force) {
-            const resMembers = await this._client?.getGroupMembers(roomId) || [];
+            const roomMemberDetail = await this._client?.getGroupMembersDetail(roomId);
+            const resMembers = roomMemberDetail?.memberList || [];
             const roomMemberMap = {};
             for (const roomMember of resMembers) {
                 const hasContact = await this._cacheMgr.hasContact(roomMember.wxid);
@@ -1070,6 +1076,7 @@ class PuppetMatrix extends PUPPET.Puppet {
                 }
                 else {
                     MemberInfo = await this._cacheMgr.getContact(roomMember.wxid);
+                    MemberInfo = mergeWithFallback(MemberInfo, roomMember);
                     roomMemberMap[roomMember.wxid] = MemberInfo;
                 }
             }
@@ -1234,7 +1241,6 @@ class PuppetMatrix extends PUPPET.Puppet {
             }
             case EventType.RoomJoin: {
                 const roomJoin = event.payload;
-                await this._updateRoomMember(roomJoin.roomId);
                 for (const joinId of roomJoin.inviteeIdList) {
                     if (this._roomJoinTemp[`${roomJoin.roomId}-${joinId}`]) {
                         roomJoin.inviteeIdList = roomJoin.inviteeIdList.filter(id => id !== joinId);
@@ -1251,16 +1257,46 @@ class PuppetMatrix extends PUPPET.Puppet {
                 break;
             }
             case EventType.RoomLeave: {
+                const roomLeave = event.payload;
+                this.emit('room-leave', roomLeave);
                 break;
             }
             case EventType.RoomTopic: {
                 const roomTopic = event.payload;
                 this.emit('room-topic', roomTopic);
+                await this._refreshContact(roomTopic.roomId);
                 break;
             }
         }
     }
+    async _refreshRoomInfo(roomId) {
+        const roomDetail = await this._client?.searchContact([roomId]);
+        if (roomDetail && roomDetail.wxid) {
+            await this._updateContactCache(roomDetail);
+            return roomDetail;
+        }
+        return {
+            wxNum: '',
+            wxid: roomId || '',
+            name: '',
+            sex: 0,
+            alias: '',
+            province: '',
+            city: '',
+            country: '',
+            avatar: '',
+            description: '',
+            labelIdlist: '',
+            scene: '',
+            sign: '',
+            snsBgImg: '',
+        };
+    }
     async _refreshContact(wxid, isFriend) {
+        if (isRoomId(wxid)) {
+            const res = await this._refreshRoomInfo(wxid);
+            return res;
+        }
         const contact = await this._client?.searchContactDetail([wxid]);
         if (contact && !contact.wxid) {
             contact.wxid = wxid;
@@ -1348,16 +1384,12 @@ class PuppetMatrix extends PUPPET.Puppet {
         }
         return FileBox.fromUrl(url, { name: appPayload.title });
     }
-    async syncContact() {
+    async syncContact(init) {
         if (!this.currentUserId) {
             throw new Error('Can not sync contact before login');
         }
         log.info('syncContact');
-        await this._client.syncContact();
-        await this._client?.getGroupList(1, 100);
-        await this._client?.getContactList(1, 100);
-        await this._client?.getOpenImContactList(1, 100);
-        await this._client?.getOfficeList(1, 100);
+        await this._client.syncContact(init);
     }
 }
 export { PuppetMatrix, VERSION };

package/dist/esm/src/utils/normalize-filebox.d.ts

@@ -1,6 +1,4 @@
-import type { FileBox } from 'file-box';
 import { FileBoxInterface } from 'file-box';
 declare const canPassthrough: (fileBox: FileBoxInterface) => boolean;
-declare const normalizeFileBoxUuid: (FileBoxUuid: typeof FileBox) => (fileBox: FileBoxInterface) => Promise<FileBoxInterface | FileBox>;
-export { canPassthrough, normalizeFileBoxUuid, };
+export { canPassthrough, };
 //# sourceMappingURL=normalize-filebox.d.ts.map

package/dist/esm/src/utils/normalize-filebox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-filebox.d.ts","sourceRoot":"","sources":["../../../../src/utils/normalize-filebox.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACR,MAA0B,UAAU,CAAA;AACrC,OAAO,EAEL,gBAAgB,EACjB,MAA0B,UAAU,CAAA;AA4BrC,QAAA,MAAM,cAAc,GAAI,SAAS,gBAAgB,YA8BhD,CAAA;AAED,QAAA,MAAM,oBAAoB,GAAI,aAAa,OAAO,OAAO,MAAY,SAAS,gBAAgB,wCAkB7F,CAAA;AAED,OAAO,EACL,cAAc,EACd,oBAAoB,GACrB,CAAA"}
+{"version":3,"file":"normalize-filebox.d.ts","sourceRoot":"","sources":["../../../../src/utils/normalize-filebox.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EACjB,MAA0B,UAAU,CAAA;AA4BrC,QAAA,MAAM,cAAc,GAAI,SAAS,gBAAgB,YA8BhD,CAAA;AAED,OAAO,EACL,cAAc,GACf,CAAA"}

package/dist/esm/src/utils/normalize-filebox.js

@@ -24,19 +24,4 @@ const canPassthrough = (fileBox) => {
         return true;
     }
 };
-const normalizeFileBoxUuid = (FileBoxUuid) => async (fileBox) => {
-    if (canPassthrough(fileBox)) {
-        return fileBox;
-    }
-    const stream = await fileBox.toStream();
-    const uuid = await FileBoxUuid
-        .fromStream(stream, fileBox.name)
-        .toUuid();
-    const uuidFileBox = FileBoxUuid.fromUuid(uuid, {
-        md5: fileBox.md5,
-        name: fileBox.name,
-        size: fileBox.size,
-    });
-    return uuidFileBox;
-};
-export { canPassthrough, normalizeFileBoxUuid, };
+export { canPassthrough, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-matrix",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "Puppet matrix for Wechaty",
   "type": "module",
   "typings": "./dist/esm/src/mod.d.ts",
@@ -56,6 +56,7 @@
     "@types/xml2js": "^0.4.11",
     "cross-env": "^7.0.3",
     "eslint-plugin-n": "^15.6.1",
+    "markdownlint": "^0.40.0",
     "npm-run-all": "^4.1.5",
     "pkg-jq": "^0.2.11",
     "qrcode-terminal": "^0.12.0",
@@ -74,12 +75,14 @@
     "cuid": "^2.1.8",
     "date-fns": "^3.6.0",
     "file-box": "^1.4.15",
+    "flash-store": "^1.0.6",
     "fs-extra": "^10.1.0",
     "image-size": "^1.1.1",
     "lru-cache": "^6.0.0",
     "mqtt": "^5.10.4",
     "node-cleanup": "^2.1.2",
-    "wechaty-web-panel": "^1.6.76",
+    "type-fest": "^5.3.1",
+    "wechaty-web-panel": "^1.6.109",
     "ws": "^8.18.0",
     "xml2js": "^0.5.0"
   },

package/src/engine-schema.ts

@@ -148,7 +148,8 @@ export interface ContactPayload {
   /**
    * 群公告
    */
-  announcement?: string
+  announcement?: string,
+  displayName?: string,
 }
 
 export interface MessageRevokeInfo {

package/src/matrix/events/event-room-join-no-xml.ts

@@ -54,8 +54,6 @@ export default async (puppet: PUPPET.Puppet, message: MessagePayload): Promise<E
     return null
   }
 
-  // @ts-ignore
-  await puppet._updateRoom(roomId)
   /**
    * 1. You Invite Other to join the Room
    * (including other join var qr code you shared)
@@ -68,8 +66,11 @@ export default async (puppet: PUPPET.Puppet, message: MessagePayload): Promise<E
 
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (matches) {
+      // @ts-ignore
+      await puppet._updateRoom(roomId)
       const inviteName = matches[1]!
-      const inviteeId = (await puppet.roomMemberSearch(roomId, inviteName))[0]!
+      // @ts-ignore
+      const inviteeId = await puppet._searchRoomMemberInfo(roomId, inviteName)
 
       return {
         inviteeIdList: [ inviteeId ],
@@ -90,8 +91,11 @@ export default async (puppet: PUPPET.Puppet, message: MessagePayload): Promise<E
     OTHER_INVITE_YOU_REGEX_LIST.some((re) => !!(matches = message.msg.match(re)))
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (matches) {
+      // @ts-ignore
+      await puppet._updateRoom(roomId)
       const inviteName = matches[1]!
-      const inviterId = (await puppet.roomMemberSearch(roomId, inviteName))[0]!
+      // @ts-ignore
+      const inviterId = await puppet._searchRoomMemberInfo(roomId, inviteName)
 
       return {
         inviteeIdList: [ puppet.currentUserId ],
@@ -113,11 +117,16 @@ export default async (puppet: PUPPET.Puppet, message: MessagePayload): Promise<E
     [ ...OTHER_INVITE_YOU_AND_OTHER_REGEX_LIST, ...OTHER_INVITE_OTHER_REGEX_LIST ].some((re) => !!(matches = message.msg.match(re)))
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (matches) {
+      // @ts-ignore
+      await puppet._updateRoom(roomId)
       const inviteeIdList = []
       const inviterName = matches[1]
-      const inviterId = (await puppet.roomMemberSearch(roomId, inviterName))[0]
+      // @ts-ignore
+      const inviterId = await puppet._searchRoomMemberInfo(roomId, inviterName)
       const inviteeName = matches[2]
-      const inviteeId = (await puppet.roomMemberSearch(roomId, inviteeName))[0]
+      // @ts-ignore
+      const inviteeId = await puppet._searchRoomMemberInfo(roomId, inviteeName)
+
       // 如果包含ni则把机器人的id放进去
       if (message.msg.includes('你')) {
         inviteeIdList.push(puppet.currentUserId)
@@ -142,14 +151,18 @@ export default async (puppet: PUPPET.Puppet, message: MessagePayload): Promise<E
     OTHER_JOIN_VIA_OTHER_QRCODE_REGEX_LIST.some((re) => !!(matches = message.msg.match(re)))
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (matches) {
+      // @ts-ignore
+      await puppet._updateRoom(roomId)
       const inviteeIdList = []
 
       const inviteeName = matches[1]!
-      const inviteeId = (await puppet.roomMemberSearch(roomId, inviteeName))[0]!
+      // @ts-ignore
+      const inviteeId = await puppet._searchRoomMemberInfo(roomId, inviteeName)
       inviteeIdList.push(inviteeId)
 
       const inviterName = matches[2]
-      const inviterId = (await puppet.roomMemberSearch(roomId, inviterName))[0]!
+      // @ts-ignore
+      const inviterId = await puppet._searchRoomMemberInfo(roomId, inviterName)
       return {
         inviteeIdList,
         inviterId,

package/src/matrix/events/event-room-join.ts

@@ -46,9 +46,6 @@ export default async (puppet: PUPPET.Puppet, message: MessagePayload): Promise<E
     return null
   }
 
-  // @ts-ignore
-  await puppet._updateRoom(roomId)
-
   const jsonPayload = await xmlToJson(message.msg)
   if (
     !jsonPayload
@@ -122,7 +119,8 @@ export default async (puppet: PUPPET.Puppet, message: MessagePayload): Promise<E
   if (!matches) {
     return null
   }
-
+  // @ts-ignore
+  await puppet._updateRoom(roomId)
   const checkString = (inviteeIdList: string | string[]) => {
     return typeof inviteeIdList !== 'string'
       ? inviteeIdList