@juzi/wechaty 1.0.86 → 1.0.89

package/src/user-modules/room.ts

@@ -255,6 +255,46 @@ class RoomMixin extends MixinBase implements SayableSayer {
     return undefined
   }
 
+  static async batchLoadRooms (roomIdList: string[]) {
+    let continuousErrorCount = 0
+    let totalErrorCount = 0
+    const totalErrorThreshold = Math.round(roomIdList.length / 5)
+
+    const idToRoom = async (id: string) => {
+      if (!this.wechaty.isLoggedIn) {
+        throw new Error('wechaty not logged in')
+      }
+      const result = await this.wechaty.Room.find({ id }).catch(e => {
+        this.wechaty.emitError(e)
+        continuousErrorCount++
+        totalErrorCount++
+        if (continuousErrorCount > 5) {
+          throw new Error('5 continuous errors!')
+        }
+        if (totalErrorCount > totalErrorThreshold) {
+          throw new Error(`${totalErrorThreshold} total errors!`)
+        }
+      })
+      continuousErrorCount = 0
+      return result
+    }
+
+    /**
+     * we need to use concurrencyExecuter to reduce the parallel number of the requests
+     */
+    const CONCURRENCY = 17
+    const roomIterator = concurrencyExecuter(CONCURRENCY)(idToRoom)(roomIdList)
+
+    const roomList: RoomInterface[] = []
+
+    for await (const room of roomIterator) {
+      if (room) {
+        roomList.push(room)
+      }
+    }
+    return roomList
+  }
+
   /**      const roomList: RoomInterface[] = []
 
    * @ignore

package/src/user-modules/wecom.ts

@@ -5,6 +5,7 @@ import { validationMixin } from '../user-mixins/validation.js'
 import {
   wechatifyMixinBase,
 }                       from '../user-mixins/wechatify.js'
+import type { RoomAntiSpamStrategy } from '@juzi/wechaty-puppet/types'
 
 class WecomMixin extends wechatifyMixinBase() {
 
@@ -18,6 +19,34 @@ class WecomMixin extends wechatifyMixinBase() {
     )
   }
 
+  static async getRoomAntiSpamStrategyList (): Promise<RoomAntiSpamStrategy[]> {
+    return this.wechaty.puppet.getRoomAntiSpamStrategyList()
+  }
+
+  static async getRoomAntiSpamStrategyEffectRoomList (
+    strategyId: string,
+  ): Promise<string[]> {
+    return this.wechaty.puppet.getRoomAntiSpamStrategyEffectRoomList(strategyId)
+  }
+
+  static async applyRoomAntiSpamStrategy (
+    strategyId: string,
+    roomIds: string[],
+    active: boolean,
+  ): Promise<void> {
+    const rawRoomIdSet = new Set(roomIds)
+    const rooms = (await this.wechaty.Room.batchLoadRooms(Array.from(rawRoomIdSet))).filter(room => room.owner()?.self())
+
+    const actualRoomIdSet = new Set(rooms.map(room => room.id))
+    const filteredRoomIds = Array.from(rawRoomIdSet).filter(id => !actualRoomIdSet.has(id))
+
+    if (filteredRoomIds.length) {
+      log.warn(`these rooms cannot be applied with anti-spam strategy: ${filteredRoomIds}`)
+    }
+
+    return this.wechaty.puppet.applyRoomAntiSpamStrategy(strategyId, Array.from(actualRoomIdSet), active)
+  }
+
   /*
    * @hideconstructor
    */

package/src/wechaty-mixins/puppet-mixin.ts

@@ -542,7 +542,8 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
           case 'scan':
             puppet.on('scan', async payload => {
               this.__readyState.inactive(true)
-              this.emit('scan', payload.qrcode || '', payload.status, payload.data || '', payload.type || ScanType.Unknown)
+              const date = timestampToDate(payload.timestamp || 0)
+              this.emit('scan', payload.qrcode || '', payload.status, payload.data || '', payload.type || ScanType.Unknown, date)
             })
             break