@juzi/wechaty 1.0.159 → 1.0.161

package/src/user-modules/mini-program.ts

@@ -20,7 +20,6 @@
 import type * as PUPPET  from '@juzi/wechaty-puppet'
 
 import type { Constructor } from 'clone-class'
-import { log } from '../config.js'
 
 import { validationMixin } from '../user-mixins/validation.js'
 
@@ -37,7 +36,7 @@ class MiniProgramMixin extends wechatifyMixinBase() {
    *
    */
   static async create (): Promise<MiniProgramInterface> {
-    log.verbose('MiniProgram', 'create()')
+    this.log.verbose('MiniProgram', 'create()')
 
     // TODO: get appid and username from wechat
     const payload: PUPPET.payloads.MiniProgram = {
@@ -60,7 +59,7 @@ class MiniProgramMixin extends wechatifyMixinBase() {
     public readonly payload: PUPPET.payloads.MiniProgram,
   ) {
     super()
-    log.verbose('MiniProgram', 'constructor()')
+    this.log.verbose('MiniProgram', 'constructor()')
     // Huan(202110): it is ok to create a raw one without wechaty instance
     // guardWechatifyClass.call(this, MiniProgram)
   }

package/src/user-modules/moment.ts

@@ -17,7 +17,6 @@
  *   limitations under the License.
  *
  */
-import { log } from '@juzi/wechaty-puppet'
 import type { Constructor } from 'clone-class'
 
 import type { ContactInterface } from './contact.js'
@@ -47,19 +46,19 @@ class MomentMixin extends wechatifyMixinBase() {
   }
 
   static async signature (signature?: string): Promise<void | string> {
-    log.verbose('Moment', 'signature(%s)', signature)
+    this.log.verbose('Moment', 'signature(%s)', signature)
 
     return this.wechaty.puppet.momentSignature(signature)
   }
 
   static async coverage (coverage?: FileBoxInterface): Promise<void | FileBoxInterface> {
-    log.verbose('Moment', 'coverage(%s)', JSON.stringify(coverage))
+    this.log.verbose('Moment', 'coverage(%s)', JSON.stringify(coverage))
 
     return this.wechaty.puppet.momentCoverage(coverage)
   }
 
   static async visibleList (): Promise<ContactInterface[]> {
-    log.verbose('Moment', 'visibleList()')
+    this.log.verbose('Moment', 'visibleList()')
 
     try {
       const contactIdList: string[] = await this.wechaty.puppet.momentVisibleList()
@@ -84,7 +83,7 @@ class MomentMixin extends wechatifyMixinBase() {
 
     } catch (e) {
       this.wechaty.emitError(e)
-      log.error('Moment', 'this.wechaty.puppet.momentVisibleList() rejected: %s', (e as Error).message)
+      this.log.error('Moment', 'this.wechaty.puppet.momentVisibleList() rejected: %s', (e as Error).message)
       return []
     }
   }
@@ -94,7 +93,7 @@ class MomentMixin extends wechatifyMixinBase() {
    */
   constructor () {
     super()
-    log.verbose('Moment', 'constructor()')
+    this.log.verbose('Moment', 'constructor()')
   }
 
 }

package/src/user-modules/post.ts

@@ -135,13 +135,13 @@ class PostMixin extends wechatifyMixinBase() {
   static create (
     payload: PUPPET.payloads.PostClient,
   ): PostInterface {
-    log.verbose('Post', 'create()')
+    this.log.verbose('Post', 'create()')
 
     return new this(payload)
   }
 
   static load (id: string): PostInterface {
-    log.verbose('Post', 'static load(%s)', id)
+    this.log.verbose('Post', 'static load(%s)', id)
 
     /**
      * Must NOT use `Post` at here
@@ -157,7 +157,7 @@ class PostMixin extends wechatifyMixinBase() {
   static async find (
     filter: PUPPET.filters.Post,
   ): Promise<undefined | PostInterface> {
-    log.verbose('Post', 'find(%s)',
+    this.log.verbose('Post', 'find(%s)',
       JSON.stringify(filter),
     )
 
@@ -181,7 +181,7 @@ class PostMixin extends wechatifyMixinBase() {
     postList       : PostInterface[],
     nextPageToken? : string,
   ]> {
-    log.verbose('Post', 'findAll(%s%s)',
+    this.log.verbose('Post', 'findAll(%s%s)',
       JSON.stringify(filter),
       pagination ? ', ' + JSON.stringify(pagination) : '',
     )
@@ -231,7 +231,7 @@ class PostMixin extends wechatifyMixinBase() {
     idOrPayload: string | PUPPET.payloads.Post,
   ) {
     super()
-    log.verbose('Post', 'constructor(%s)',
+    this.log.verbose('Post', 'constructor(%s)',
       typeof idOrPayload === 'string'
         ? idOrPayload
         : JSON.stringify(idOrPayload.id),
@@ -255,7 +255,7 @@ class PostMixin extends wechatifyMixinBase() {
   }
 
   async author (): Promise<ContactInterface> {
-    log.silly('Post', 'author()')
+    this.log.silly('Post', 'author()')
 
     if (PUPPET.payloads.isPostClient(this.payload)) {
       return this.wechaty.currentUser
@@ -269,7 +269,7 @@ class PostMixin extends wechatifyMixinBase() {
   }
 
   async root (): Promise<undefined | PostInterface> {
-    log.silly('Post', 'root()')
+    this.log.silly('Post', 'root()')
 
     if (!this.payload.rootId) {
       return undefined
@@ -281,7 +281,7 @@ class PostMixin extends wechatifyMixinBase() {
   }
 
   async parent (): Promise<undefined | PostInterface> {
-    log.silly('Post', 'parent()')
+    this.log.silly('Post', 'parent()')
     if (!this.payload.parentId) {
       return undefined
     }
@@ -292,7 +292,7 @@ class PostMixin extends wechatifyMixinBase() {
   }
 
   async sync (): Promise<void> {
-    log.silly('Post', 'sync()')
+    this.log.silly('Post', 'sync()')
 
     if (!this.id) {
       throw new Error('no post id found')
@@ -302,7 +302,7 @@ class PostMixin extends wechatifyMixinBase() {
   }
 
   async ready (): Promise<void> {
-    log.silly('Post', 'ready()')
+    this.log.silly('Post', 'ready()')
 
     if (!this.id) {
       throw new Error('no post id found')
@@ -316,7 +316,7 @@ class PostMixin extends wechatifyMixinBase() {
   }
 
   async * [Symbol.asyncIterator] (): AsyncIterableIterator<Sayable> {
-    log.verbose('Post', '[Symbol.asyncIterator]()')
+    this.log.verbose('Post', '[Symbol.asyncIterator]()')
 
     const payloadToSayable = payloadToSayableWechaty(this.wechaty)
 
@@ -341,7 +341,7 @@ class PostMixin extends wechatifyMixinBase() {
   }
 
   async getSayableWithIndex (sayableIndex: number) {
-    log.verbose('Post', 'getSayableWithIndex(%s)', sayableIndex)
+    this.log.verbose('Post', 'getSayableWithIndex(%s)', sayableIndex)
 
     const payloadToSayable = payloadToSayableWechaty(this.wechaty)
 
@@ -361,7 +361,7 @@ class PostMixin extends wechatifyMixinBase() {
   }
 
   async getSayableWithId (id: string) {
-    log.verbose('Post', 'getSayableWithId(%s)', id)
+    this.log.verbose('Post', 'getSayableWithId(%s)', id)
 
     if (PUPPET.payloads.isPostServer(this.payload)) {
       const payloadToSayable = payloadToSayableWechaty(this.wechaty)
@@ -376,7 +376,7 @@ class PostMixin extends wechatifyMixinBase() {
   async * children (
     filter: PUPPET.filters.Post = {},
   ): AsyncIterableIterator<PostInterface> {
-    log.verbose('Post', '*children(%s)', Object.keys(filter).length ? JSON.stringify(filter) : '')
+    this.log.verbose('Post', '*children(%s)', Object.keys(filter).length ? JSON.stringify(filter) : '')
 
     const pagination: PUPPET.filters.PaginationRequest = {
       pageSize: 100,
@@ -413,7 +413,7 @@ class PostMixin extends wechatifyMixinBase() {
   async * descendants (
     filter: PUPPET.filters.Post = {},
   ): AsyncIterableIterator<PostInterface> {
-    log.verbose('Post', '*descendants(%s)', Object.keys(filter).length ? JSON.stringify(filter) : '')
+    this.log.verbose('Post', '*descendants(%s)', Object.keys(filter).length ? JSON.stringify(filter) : '')
 
     for await (const post of this.children(filter)) {
       yield post
@@ -424,7 +424,7 @@ class PostMixin extends wechatifyMixinBase() {
   async * likes (
     filter: PUPPET.filters.Post = {},
   ): AsyncIterableIterator<Tap> {
-    log.verbose('Post', '*likes(%s)', Object.keys(filter).length ? JSON.stringify(filter) : '')
+    this.log.verbose('Post', '*likes(%s)', Object.keys(filter).length ? JSON.stringify(filter) : '')
     return this.taps({
       ...filter,
       type: PUPPET.types.Tap.Like,
@@ -434,7 +434,7 @@ class PostMixin extends wechatifyMixinBase() {
   async * taps (
     filter: PUPPET.filters.Tap = {},
   ): AsyncIterableIterator<Tap> {
-    log.verbose('Post', '*taps(%s)', Object.keys(filter).length ? JSON.stringify(filter) : '')
+    this.log.verbose('Post', '*taps(%s)', Object.keys(filter).length ? JSON.stringify(filter) : '')
 
     const pagination: PUPPET.filters.PaginationRequest = {}
 
@@ -463,7 +463,7 @@ class PostMixin extends wechatifyMixinBase() {
       | Exclude<Sayable, PostInterface>
       | Exclude<Sayable, PostInterface>[],
   ): Promise<void | PostInterface> {
-    log.verbose('Post', 'reply(%s)', sayable)
+    this.log.verbose('Post', 'reply(%s)', sayable)
 
     if (!this.id) {
       console.error('You can only call `reply()` on received posts, but it seems that you are trying to call reply on a post created from local.')
@@ -495,7 +495,7 @@ class PostMixin extends wechatifyMixinBase() {
   async like ()                : Promise<boolean>
 
   async like (status?: boolean): Promise<void | boolean> {
-    log.verbose('Post', 'like(%s)', typeof status === 'undefined' ? '' : status)
+    this.log.verbose('Post', 'like(%s)', typeof status === 'undefined' ? '' : status)
 
     if (typeof status === 'undefined') {
       return this.tap(
@@ -519,7 +519,7 @@ class PostMixin extends wechatifyMixinBase() {
     type    : PUPPET.types.Tap,
     status? : boolean,
   ): Promise<void | boolean> {
-    log.verbose('Post', 'tap(%s%s)',
+    this.log.verbose('Post', 'tap(%s%s)',
       PUPPET.types.Tap[type],
       typeof status === 'undefined'
         ? ''
@@ -540,7 +540,7 @@ class PostMixin extends wechatifyMixinBase() {
     tapList        : Tap[],
     nextPageToken? : string,
   ]> {
-    log.verbose('Post', 'tapFind()')
+    this.log.verbose('Post', 'tapFind()')
 
     if (!this.id) {
       throw new Error('can not get tapFind for client created post')
@@ -560,7 +560,7 @@ class PostMixin extends wechatifyMixinBase() {
       for (const [ i, contactId ] of data.contactId.entries()) {
         const contact = await this.wechaty.Contact.find({ id: contactId })
         if (!contact) {
-          log.warn('Post', 'tapFind() contact not found for id: %s', contactId)
+          this.log.warn('Post', 'tapFind() contact not found for id: %s', contactId)
           continue
         }
 
@@ -579,17 +579,17 @@ class PostMixin extends wechatifyMixinBase() {
   }
 
   location (): LocationInterface | undefined {
-    log.verbose('Post', 'location()')
+    this.log.verbose('Post', 'location()')
 
     if (!this.payload.location) {
-      log.warn('this post has no location info')
+      this.log.warn('this post has no location info')
       return
     }
     return new this.wechaty.Location(this.payload.location)
   }
 
   async visibleList (): Promise<ContactInterface[]> {
-    log.verbose('Post', 'visibleList()')
+    this.log.verbose('Post', 'visibleList()')
 
     if (!this.payload.visibleList) {
       return []

package/src/user-modules/premium-online-appointment-card.ts

@@ -1,7 +1,6 @@
 import type * as PUPPET from '@juzi/wechaty-puppet'
 
 import type { Constructor } from 'clone-class'
-import { log } from '../config.js'
 
 import { validationMixin } from '../user-mixins/validation.js'
 
@@ -14,7 +13,7 @@ class PremiumOnlineAppointmentCardMixin extends wechatifyMixinBase() {
     public readonly payload: PUPPET.payloads.PremiumOnlineAppointmentCard,
   ) {
     super()
-    log.verbose('PremiumOnlineAppointmentCard', 'constructor()')
+    this.log.verbose('PremiumOnlineAppointmentCard', 'constructor()')
   }
 
   static async findAll (query: {
@@ -22,7 +21,7 @@ class PremiumOnlineAppointmentCardMixin extends wechatifyMixinBase() {
     page?: number,
     pageSize?: number
   }): Promise<PremiumOnlineAppointmentCardInterface[]> {
-    log.verbose('PremiumOnlineAppointmentCard', 'findAll(%s)', JSON.stringify(query))
+    this.log.verbose('PremiumOnlineAppointmentCard', 'findAll(%s)', JSON.stringify(query))
 
     const params = {
       cardType: query.cardType || 'card',

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

@@ -19,7 +19,6 @@
  */
 import type * as PUPPET          from '@juzi/wechaty-puppet'
 
-import { log } from '../config.js'
 import type { Constructor } from 'clone-class'
 
 import type {
@@ -66,7 +65,7 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
     public readonly id: string,
   ) {
     super()
-    log.verbose('RoomInvitation', 'constructor(id=%s)', id)
+    this.log.verbose('RoomInvitation', 'constructor(id=%s)', id)
   }
 
   override toString () {
@@ -110,7 +109,7 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
    * .start()
    */
   async accept (): Promise<void> {
-    log.verbose('RoomInvitation', 'accept()')
+    this.log.verbose('RoomInvitation', 'accept()')
 
     try {
       await this.wechaty.puppet.roomInvitationAccept(this.id)
@@ -118,13 +117,13 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
       const inviter = await this.inviter()
       const topic   = await this.topic()
 
-      log.verbose('RoomInvitation', 'accept() with room(%s) & inviter(%s) ready()',
+      this.log.verbose('RoomInvitation', 'accept() with room(%s) & inviter(%s) ready()',
         topic,
         inviter,
       )
     } catch (e) {
       this.wechaty.emitError(e)
-      log.warn('RoomInvitation', 'accept() rejection: %s',
+      this.log.warn('RoomInvitation', 'accept() rejection: %s',
         (e && (e as Error).message) || e,
       )
     }
@@ -144,7 +143,7 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
    * .start()
    */
   async inviter (): Promise<ContactInterface> {
-    log.verbose('RoomInvitation', 'inviter()')
+    this.log.verbose('RoomInvitation', 'inviter()')
 
     const payload = await this.wechaty.puppet.roomInvitationPayload(this.id)
     const inviter = await this.wechaty.Contact.find({ id: payload.inviterId })
@@ -174,7 +173,7 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
   }
 
   async memberCount (): Promise<number> {
-    log.verbose('RoomInvitation', 'memberCount()')
+    this.log.verbose('RoomInvitation', 'memberCount()')
 
     const payload = await this.wechaty.puppet.roomInvitationPayload(this.id)
 
@@ -186,7 +185,7 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
     * @ignore
    */
   async memberList (): Promise<ContactInterface[]> {
-    log.verbose('RoomInvitation', 'roomMemberList()')
+    this.log.verbose('RoomInvitation', 'roomMemberList()')
 
     const payload = await this.wechaty.puppet.roomInvitationPayload(this.id)
 
@@ -208,7 +207,7 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
    * @returns {Promise<Date>}
    */
   async date (): Promise<Date> {
-    log.verbose('RoomInvitation', 'date()')
+    this.log.verbose('RoomInvitation', 'date()')
 
     const payload = await this.wechaty.puppet.roomInvitationPayload(this.id)
     return timestampToDate(payload.timestamp)
@@ -244,7 +243,7 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
   static async fromJSON (
     payload: string | PUPPET.payloads.RoomInvitation,
   ): Promise<RoomInvitationInterface> {
-    log.verbose('RoomInvitation', 'fromJSON(%s)',
+    this.log.verbose('RoomInvitation', 'fromJSON(%s)',
       typeof payload === 'string'
         ? payload
         : JSON.stringify(payload),
@@ -273,7 +272,7 @@ class RoomInvitationMixin extends wechatifyMixinBase() implements Accepter {
    * .start()
    */
   async toJSON (): Promise<string> {
-    log.verbose('RoomInvitation', 'toJSON()')
+    this.log.verbose('RoomInvitation', 'toJSON()')
     const payload = await this.wechaty.puppet.roomInvitationPayload(this.id)
     return JSON.stringify(payload)
   }