@juzi/wechaty 1.0.7 → 1.0.10

package/src/user-modules/room.spec.ts

@@ -24,7 +24,7 @@ import {
 }             from 'tstest'
 
 import type * as PUPPET from '@juzi/wechaty-puppet'
-import { PuppetMock }   from 'wechaty-puppet-mock'
+import { PuppetMock }   from '@juzi/wechaty-puppet-mock'
 
 import { WechatyBuilder } from '../wechaty-builder.js'
 import type {
@@ -45,6 +45,7 @@ test('findAll()', async t => {
   await wechaty.start()
 
   sandbox.stub(puppet, 'roomSearch').resolves(EXPECTED_ROOM_ID_LIST)
+  sandbox.stub(puppet, 'roomMemberList').resolves([])
   sandbox.stub(puppet, 'roomPayload').callsFake(async () => {
     await new Promise(resolve => setImmediate(resolve))
     return {
@@ -64,7 +65,7 @@ test('room.say() smoke testing', async () => {
   const sandbox = sinon.createSandbox()
   const callback = sinon.spy()
 
-  const puppet = new PuppetMock() as any
+  const puppet = new PuppetMock()
   const wechaty = WechatyBuilder.build({ puppet })
 
   const bot = puppet.mocker.createContact()
@@ -74,6 +75,10 @@ test('room.say() smoke testing', async () => {
 
   const EXPECTED_ROOM_ID         = 'roomId'
   const EXPECTED_ROOM_TOPIC      = 'test-topic'
+  const EXPECTED_ROOM_ADDITIONAL_INFO = {
+    subjectA: 'A',
+    subjectB: 'B',
+  }
   const EXPECTED_CONTACT_1_ID    = 'contact1'
   const EXPECTED_CONTACT_1_ALIAS = 'little1'
   const EXPECTED_CONTACT_2_ID    = 'contact2'
@@ -93,6 +98,7 @@ test('room.say() smoke testing', async () => {
     await new Promise(resolve => setImmediate(resolve))
     return {
       topic: EXPECTED_ROOM_TOPIC,
+      additionalInfo: JSON.stringify(EXPECTED_ROOM_ADDITIONAL_INFO),
     } as PUPPET.payloads.Room
   })
   sandbox.stub(puppet, 'contactPayload').callsFake(async (contactId) => {
@@ -103,6 +109,7 @@ test('room.say() smoke testing', async () => {
   })
   // sandbox.spy(puppet, 'messageSendText')
   sandbox.stub(puppet, 'messageSendText').callsFake(callback)
+  sandbox.stub(puppet, 'roomMemberList').resolves([])
 
   const fakeIdSearcher = async (...args: any[]) => {
     await new Promise(setImmediate)
@@ -122,6 +129,13 @@ test('room.say() smoke testing', async () => {
   // await contact2.sync()
   // await room.sync()
 
+  test('room additional info', async t => {
+    callback.resetHistory()
+    const additionalInfo = room.additionalInfo()
+
+    t.same(additionalInfo, EXPECTED_ROOM_ADDITIONAL_INFO, 'additional info should be matched')
+  })
+
   test('say with Tagged Template', async t => {
     callback.resetHistory()
     await room.say`To be ${contact1} or not to be ${contact2}`

package/src/user-modules/room.ts

@@ -300,7 +300,7 @@ class RoomMixin extends MixinBase implements SayableSayer {
    */
   async sync (): Promise<void> {
     await this.wechaty.puppet.roomPayloadDirty(this.id)
-    await this.wechaty.puppet.roomMemberPayloadDirty(this.id)
+    // await this.wechaty.puppet.roomMemberPayloadDirty(this.id)
     await this.ready(true)
   }
 
@@ -330,6 +330,7 @@ class RoomMixin extends MixinBase implements SayableSayer {
 
     const doReady = async (id: string): Promise<void> => {
       try {
+        await this.wechaty.puppet.roomMemberPayloadDirty(id)
         await this.wechaty.Contact.find({ id })
       } catch (e) {
         this.wechaty.emitError(e)
@@ -1155,6 +1156,18 @@ class RoomMixin extends MixinBase implements SayableSayer {
     return this.wechaty.puppet.roomAvatar(this.id)
   }
 
+  additionalInfo (): undefined | any {
+    let additionalInfoObj = {}
+    if (this.payload?.additionalInfo) {
+      try {
+        additionalInfoObj = JSON.parse(this.payload.additionalInfo)
+      } catch (e) {
+        log.warn('Room', 'additionalInfo() parse failed, additionalInfo: %s', this.payload.additionalInfo)
+      }
+    }
+    return additionalInfoObj
+  }
+
 }
 
 class RoomImpl extends validationMixin(RoomMixin)<RoomImplInterface>() {}

package/src/wechaty/wechaty-base.spec.ts

@@ -24,7 +24,7 @@ import {
 }              from 'tstest'
 
 import { MemoryCard } from 'memory-card'
-import { PuppetMock } from 'wechaty-puppet-mock'
+import { PuppetMock } from '@juzi/wechaty-puppet-mock'
 
 /**
  * Huan(202111): must import `./wechaty-impl.js`
@@ -59,7 +59,7 @@ test('static VERSION', async t => {
 })
 
 test('event:start/stop', async t => {
-  const wechaty = new WechatyBase({ puppet: 'wechaty-puppet-mock' })
+  const wechaty = new WechatyBase({ puppet: '@juzi/wechaty-puppet-mock' })
 
   const startSpy = sinon.spy()
   const stopSpy  = sinon.spy()

package/src/wechaty/wechaty-impl.spec.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S node --no-warnings --loader ts-node/esm
 import { test } from 'tstest'
-import PuppetMock from 'wechaty-puppet-mock'
+import PuppetMock from '@juzi/wechaty-puppet-mock'
 
 import { WechatyEventEmitter } from '../schemas/wechaty-events.js'
 

package/src/wechaty-builder.spec.ts

@@ -21,7 +21,7 @@
 
 import { test }  from 'tstest'
 
-import { PuppetMock } from 'wechaty-puppet-mock'
+import { PuppetMock } from '@juzi/wechaty-puppet-mock'
 
 import { WechatyBuilder } from './wechaty-builder.js'
 
@@ -34,7 +34,7 @@ test('WechatyBuilder class', async t => {
   const singleton2 = WechatyBuilder.singleton()
   t.equal(singleton1, singleton2, 'should get the same singleton instance')
 
-  const wechaty = WechatyBuilder.build({ puppet: 'wechaty-puppet-mock' })
+  const wechaty = WechatyBuilder.build({ puppet: '@juzi/wechaty-puppet-mock' })
   await wechaty.start()
   t.ok(PuppetMock.validInstance(wechaty.puppet), 'should set options.puppet to mock')
   await wechaty.stop()
@@ -72,7 +72,7 @@ test('WechatyBuilder class static', async t => {
   const singleton2 = WechatyBuilder.singleton()
   t.equal(singleton1, singleton2, 'should get the same singleton instance')
 
-  const wechaty = WechatyBuilder.build({ puppet: 'wechaty-puppet-mock' })
+  const wechaty = WechatyBuilder.build({ puppet: '@juzi/wechaty-puppet-mock' })
   await wechaty.start()
   t.ok(PuppetMock.validInstance(wechaty.puppet), 'should set options.puppet to mock')
   await wechaty.stop()

package/src/wechaty-mixins/plugin-mixin.spec.ts

@@ -70,7 +70,7 @@ test('PluginMixin smoke testing', async t => {
     return () => wechaty.counter--
   }
 
-  const pluginMixinTest = new PluginMixinTest({ puppet: 'wechaty-puppet-mock' })
+  const pluginMixinTest = new PluginMixinTest({ puppet: '@juzi/wechaty-puppet-mock' })
   let future
 
   const unuse = pluginMixinTest.use(Plugin)

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

@@ -387,7 +387,7 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
                 // issue #254
                 if (payload.removeeIdList.includes(puppet.currentUserId)) {
                   await puppet.roomPayloadDirty(payload.roomId)
-                  await puppet.roomMemberPayloadDirty(payload.roomId)
+                  // await puppet.roomMemberPayloadDirty(payload.roomId)
                 }
               } catch (e) {
                 this.emit('error', GError.from(e))