wechaty-puppet-matrix 0.0.30 → 0.0.32

package/src/matrix/utils/index.ts

@@ -94,3 +94,49 @@ export function generateCustomRandomString (prefix: string, length: number) {
 
   return prefix + remainingPart
 }
+
+function isPlainObject (value: unknown): value is Record<string, unknown> {
+  return Object.prototype.toString.call(value) === '[object Object]'
+}
+
+/**
+ * 合并两个对象：
+ * - 如果新对象的属性为 null、undefined、''，则用旧对象的值
+ * - 如果是嵌套对象，递归合并
+ * - 其他情况用新对象的值
+ */
+export function mergeWithFallback<T extends Record<string, any>> (
+  oldObj: T,
+  newObj: Partial<T>,
+): T {
+  const result = Array.isArray(oldObj) ? ([ ...oldObj ] as any) : { ...oldObj }
+
+  for (const key in newObj) {
+    const newVal = newObj[key]
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    const oldVal = oldObj ? oldObj[key] : undefined
+
+    // 如果两个都是数组
+    if (Array.isArray(newVal) && Array.isArray(oldVal)) {
+      result[key] = newVal as any
+      continue
+    }
+
+    // 如果是普通对象，递归
+    if (isPlainObject(newVal) && isPlainObject(oldVal)) {
+      result[key] = mergeWithFallback(oldVal, newVal as any)
+      // eslint-disable-next-line brace-style
+    }
+    // 如果新值为空，则用旧值
+    else if (newVal === null || newVal === undefined || newVal === '' || newVal === 0) {
+      result[key] = oldVal
+      // eslint-disable-next-line brace-style
+    }
+    // 其他情况直接用新值
+    else {
+      result[key] = newVal as any
+    }
+  }
+
+  return result as T
+}

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 } from './matrix/utils/index.js'
+import { delay, mergeWithFallback } from './matrix/utils/index.js'
 import path from 'path'
 // 参考
 import { CacheManager, RoomMemberMap } from './matrix/cache-manager.js'
@@ -415,6 +415,7 @@ 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)
@@ -795,7 +796,12 @@ class PuppetMatrix extends PUPPET.Puppet {
         return this._getMessageFileFileBox(messageId, messagePayload)
       case PUPPET.types.Message.Emoticon: {
         const emotionPayload = await parseEmotionMessagePayload(messagePayload)
-        const emoticonBox = FileBox.fromUrl(emotionPayload.cdnurl, { name: `message-${messageId}-emoticon.jpg` })
+        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) : FileBox.fromUrl(emotionPayload.cdnurl, { name: `message-${messageId}-emoticon.jpg` })
 
         emoticonBox.metadata = {
           payload: emotionPayload,
@@ -1523,7 +1529,7 @@ class PuppetMatrix extends PUPPET.Puppet {
       const roomId = contact.wxid
       let finalPayload: ContactPayload = contact
       if (oldRoomPayload) {
-        finalPayload = { ...oldRoomPayload, ...contact }
+        finalPayload = mergeWithFallback(oldRoomPayload, contact)
       }
       await this._cacheMgr!.setRoom(roomId, finalPayload)
 
@@ -1535,7 +1541,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     } else {
       const oldContactPaylod = await this._cacheMgr!.getContact(contact.wxid)
       if (oldContactPaylod) {
-        await this._cacheMgr!.setContact(contact.wxid, { ...oldContactPaylod, ...contact })
+        await this._cacheMgr!.setContact(contact.wxid, mergeWithFallback(oldContactPaylod, contact))
       } else {
         await this._cacheMgr!.setContact(contact.wxid, contact)
       }
@@ -1707,7 +1713,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     if (!imageInfo.file_id) {
       log.error(`Can not get file for message: ${messageId}`)
     }
-    const url = await this._client?.downloadImage(imageInfo)
+    const url = imageInfo.is_ww ? await this._client?.downloadWWMedia(imageInfo, 1) : await this._client?.downloadImage(imageInfo)
     return FileBox.fromUrl(url)
   }
 
@@ -1725,7 +1731,7 @@ class PuppetMatrix extends PUPPET.Puppet {
     if (!videoInfo.file_id) {
       log.error(`Can not get file for message: ${messageId}`)
     }
-    const url = await this._client?.downloadVideo(videoInfo)
+    const url = videoInfo.is_ww ? await this._client?.downloadWWMedia(videoInfo, 2) : await this._client?.downloadVideo(videoInfo)
     log.info(PRE, '_getMessageVideoFileBox(): %s', url)
     return FileBox.fromUrl(url)
   }
@@ -1743,13 +1749,14 @@ class PuppetMatrix extends PUPPET.Puppet {
     }
     const appattach = appPayload.appattach
     const params = {
+      auth_key: appattach?.authkey || '',
       aes_key: appattach?.aeskey || '',
       file_id: appattach?.attachid || '',
       file_name: appPayload.title,
       file_size: appattach?.totallen || '',
     }
 
-    const url = await this._client?.downloadFile(params)
+    const url = appattach?.is_ww ? await this._client?.downloadWWMedia(params, 3) : await this._client?.downloadFile(params)
 
     if (!url) {
       log.error(`Can not get file url: ${JSON.stringify(params)}`)
@@ -1765,6 +1772,12 @@ class PuppetMatrix extends PUPPET.Puppet {
     }
     log.info('syncContact')
     await this._client!.syncContact()
+    await this._client?.getContactList(1, 100)
+    await this._client?.getOpenImContactList(1, 100)
+    await delay(300)
+    await this._client?.getGroupList(1, 100)
+    await delay(300)
+    await this._client?.getOfficeList(1, 100)
   }
 
 }