wechaty-puppet-matrix 0.0.35 → 0.0.37

package/src/puppet-matrix.ts

@@ -10,7 +10,7 @@ import type { FileBoxMetadataMessage } from './matrix/types.js'
 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, RoomMemberMap } from './matrix/cache-manager.js'
@@ -144,15 +144,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 }: { roomId: string, inviterId: string, joinIds: string[], joinUsers: ContactPayload[] }) => {
@@ -415,12 +406,10 @@ class PuppetMatrix extends PUPPET.Puppet {
   public async ready (): Promise<void> {
     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(() => {
@@ -1273,6 +1262,22 @@ class PuppetMatrix extends PUPPET.Puppet {
     }
   }
 
+  // @ts-ignore
+  private async _searchRoomMemberInfo (roomId: string, name: string): Promise<string | undefined> {
+    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: ContactPayload) => {
+      if (member.name === name || member.alias === name || member.remark === name || member.displayName === name) {
+        return true
+      }
+      return false
+    })
+    return searchMember?.wxid || ''
+  }
+
   /**
    * 解析群成员信息
    * @param rawPayload
@@ -1446,7 +1451,8 @@ class PuppetMatrix extends PUPPET.Puppet {
 
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     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: RoomMemberMap = {}
       for (const roomMember of resMembers) {
@@ -1459,6 +1465,7 @@ class PuppetMatrix extends PUPPET.Puppet {
           roomMemberMap[roomMember.wxid] = MemberInfo
         } else {
           MemberInfo = await this._cacheMgr!.getContact(roomMember.wxid) as ContactPayload
+          MemberInfo = mergeWithFallback(MemberInfo, roomMember)
           roomMemberMap[roomMember.wxid] = MemberInfo
         }
       }
@@ -1534,7 +1541,6 @@ class PuppetMatrix extends PUPPET.Puppet {
 
     if (isRoomId(contact.wxid)) {
       const oldRoomPayload = await this._cacheMgr!.getRoom(contact.wxid)
-
       const roomId = contact.wxid
       let finalPayload: ContactPayload = contact
       if (oldRoomPayload) {
@@ -1644,7 +1650,6 @@ class PuppetMatrix extends PUPPET.Puppet {
       }
       case EventType.RoomJoin: {
         const roomJoin: PUPPET.payloads.EventRoomJoin = 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)
@@ -1660,22 +1665,49 @@ class PuppetMatrix extends PUPPET.Puppet {
         break
       }
       case EventType.RoomLeave: {
-        // const roomLeave: PUPPET.payloads.EventRoomLeave = event.payload
-        // this.emit('room-leave', roomLeave)
-
-        // await this._updateRoomMember(roomLeave.roomId)
+        const roomLeave: PUPPET.payloads.EventRoomLeave = event.payload
+        this.emit('room-leave', roomLeave)
         break
       }
       case EventType.RoomTopic: {
         const roomTopic: PUPPET.payloads.EventRoomTopic = event.payload
         this.emit('room-topic', roomTopic)
+        await this._refreshContact(roomTopic.roomId)
         break
       }
     }
   }
 
+  private async _refreshRoomInfo (roomId: string): Promise<ContactPayload | undefined> {
+    const roomDetail = await this._client?.searchContact([ roomId ]) as ContactPayload | undefined
+    if (roomDetail && roomDetail.wxid) {
+      await this._updateContactCache(roomDetail as ContactPayload)
+      return roomDetail
+    }
+    return {
+      wxNum: '',
+      wxid: roomId || '',
+      name: '',
+      sex: 0,
+      alias: '',
+      province: '',
+      city: '',
+      country: '',
+      avatar: '',
+      description: '',
+      labelIdlist: '',
+      scene: '',
+      sign: '',
+      snsBgImg: '',
+    }
+  }
+
   // 刷新用户信息
   private async _refreshContact (wxid: string, isFriend?: number): Promise<ContactPayload | undefined> {
+    if (isRoomId(wxid)) {
+      const res = await this._refreshRoomInfo(wxid)
+      return res
+    }
     const contact = await this._client?.searchContactDetail([ wxid ]) as ContactPayload | undefined
     // may return contact with empty payload, empty username, nickname, etc.
     if (contact && !contact.wxid) {
@@ -1790,16 +1822,12 @@ class PuppetMatrix extends PUPPET.Puppet {
   }
 
   // @ts-ignore
-  public async syncContact () {
+  public async syncContact (init?: boolean) {
     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)
   }
 
 }

package/src/utils/normalize-filebox.ts

@@ -1,6 +1,3 @@
-import type {
-  FileBox,
-}                     from 'file-box'
 import {
   FileBoxType,
   FileBoxInterface,
@@ -64,27 +61,6 @@ const canPassthrough = (fileBox: FileBoxInterface) => {
 
 }
 
-const normalizeFileBoxUuid = (FileBoxUuid: typeof FileBox) => async (fileBox: FileBoxInterface) => {
-  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,
 }