@juzi/wechaty 1.0.159 → 1.0.160

package/dist/esm/src/wechaty-mixins/plugin-mixin.js

@@ -27,13 +27,13 @@ const pluginMixin = (mixinBase) => {
          */
         use(...plugins) {
             const pluginList = plugins.flat();
-            log.verbose('WechatyPluginMixin', 'use() total %d plugins', pluginList.length);
+            this.log.verbose('WechatyPluginMixin', 'use() total %d plugins', pluginList.length);
             const uninstallerList = [];
             for (const plugin of pluginList) {
-                log.verbose('WechatyPluginMixin', 'use() installing Plugin %s on Wechaty %s ...', plugin.name, this.name());
+                this.log.verbose('WechatyPluginMixin', 'use() installing Plugin %s on Wechaty %s ...', plugin.name, this.name());
                 const uninstaller = plugin(this); // <- Huan(202110): TODO: remove any
                 if (isWechatyPluginUninstaller(uninstaller)) {
-                    log.verbose('WechatyPluginMixin', 'use() saving uninstaller for Plugin %s on Wechaty %s ...', plugin.name, this.name());
+                    this.log.verbose('WechatyPluginMixin', 'use() saving uninstaller for Plugin %s on Wechaty %s ...', plugin.name, this.name());
                     uninstallerList.push(uninstaller);
                 }
             }
@@ -41,9 +41,9 @@ const pluginMixin = (mixinBase) => {
              * Return the function to uninstall all plugins
              */
             return () => uninstallerList.forEach(uninstaller => {
-                log.verbose('WechatyPluginMixin', 'use() uninstalling Plugin %s on Wechaty %s ...', uninstaller.name, this.name());
+                this.log.verbose('WechatyPluginMixin', 'use() uninstalling Plugin %s on Wechaty %s ...', uninstaller.name, this.name());
                 uninstaller();
-                log.verbose('WechatyPluginMixin', 'use() uninstalling Plugin %s on Wechaty %s ... done', uninstaller.name, this.name());
+                this.log.verbose('WechatyPluginMixin', 'use() uninstalling Plugin %s on Wechaty %s ... done', uninstaller.name, this.name());
             });
         }
     }

package/dist/esm/src/wechaty-mixins/plugin-mixin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-mixin.js","sourceRoot":"","sources":["../../../../src/wechaty-mixins/plugin-mixin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAmB,sBAAsB,CAAA;AAMvD,OAAO,EACL,0BAA0B,GAC3B,MAAkC,cAAc,CAAA;AAkBjD,MAAM,WAAW,GAAG,CAAsE,SAAoB,EAAE,EAAE;IAChH,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;IAEpE,MAAe,WAAY,SAAQ,SAAS;QAE1C,YAAa,GAAG,IAAW;YACzB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;QAChB,CAAC;QAED;;;;;;;;;;;;;;;;;;WAkBG;QACH,GAAG,CACD,GAAG,OAEA;YAEH,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;YACjC,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,wBAAwB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;YAE9E,MAAM,eAAe,GAA+B,EAAE,CAAA;YAEtD,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;gBAC/B,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,8CAA8C,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;gBAE3G,MAAM,WAAW,GAAG,MAAM,CAAC,IAAW,CAAC,CAAA,CAAC,oCAAoC;gBAC5E,IAAI,0BAA0B,CAAC,WAAW,CAAC,EAAE;oBAC3C,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,0DAA0D,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;oBACvH,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;iBAClC;aACF;YAED;;eAEG;YACH,OAAO,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBACjD,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,gDAAgD,EAAE,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;gBAClH,WAAW,EAAE,CAAA;gBACb,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,qDAAqD,EAAE,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YACzH,CAAC,CAAC,CAAA;QACJ,CAAC;KAEF;IAED,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAMD,OAAO,EAIL,WAAW,GACZ,CAAA"}
+{"version":3,"file":"plugin-mixin.js","sourceRoot":"","sources":["../../../../src/wechaty-mixins/plugin-mixin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAmB,sBAAsB,CAAA;AAMvD,OAAO,EACL,0BAA0B,GAC3B,MAAkC,cAAc,CAAA;AAkBjD,MAAM,WAAW,GAAG,CAAsE,SAAoB,EAAE,EAAE;IAChH,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;IAEpE,MAAe,WAAY,SAAQ,SAAS;QAE1C,YAAa,GAAG,IAAW;YACzB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;QAChB,CAAC;QAED;;;;;;;;;;;;;;;;;;WAkBG;QACH,GAAG,CACD,GAAG,OAEA;YAEH,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;YACjC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,wBAAwB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;YAEnF,MAAM,eAAe,GAA+B,EAAE,CAAA;YAEtD,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;gBAC/B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,8CAA8C,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;gBAEhH,MAAM,WAAW,GAAG,MAAM,CAAC,IAAW,CAAC,CAAA,CAAC,oCAAoC;gBAC5E,IAAI,0BAA0B,CAAC,WAAW,CAAC,EAAE;oBAC3C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,0DAA0D,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;oBAC5H,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;iBAClC;aACF;YAED;;eAEG;YACH,OAAO,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBACjD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,gDAAgD,EAAE,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;gBACvH,WAAW,EAAE,CAAA;gBACb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,qDAAqD,EAAE,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YAC9H,CAAC,CAAC,CAAA;QACJ,CAAC;KAEF;IAED,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAMD,OAAO,EAIL,WAAW,GACZ,CAAA"}

package/dist/esm/src/wechaty-mixins/puppet-mixin.d.ts

@@ -30,16 +30,7 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     __wechatifiedChannelCard?: import("../user-modules/channel-card.js").ChannelCardConstructor | undefined;
     __wechatifiedConsultCard?: import("../user-modules/consult-card.js").ConsultCardConstructor | undefined;
     __wechatifiedPremiumOnlineAppointmentCard?: import("../user-modules/premium-online-appointment-card.js").PremiumOnlineAppointmentCardConstructor | undefined;
-    __wechatifiedMoment?: import("../user-modules/moment.js").MomentConstructor | undefined; /**
-     * Huan(202111):
-     *
-     *  We should throw the Timeout error when the puppet.start() can not be finished in time.
-     *  However, we need to compatible with some buggy puppet implementations which will not resolve the promise.
-     *
-     * TODO: throw the Timeout error when the puppet.start() can not be finished in time.
-     *
-     * e.g. after resolve @issue https://github.com/padlocal/wechaty-puppet-padlocal/issues/116
-     */
+    __wechatifiedMoment?: import("../user-modules/moment.js").MomentConstructor | undefined;
     __wechatifiedCallRecord?: import("../user-modules/call.js").CallRecordConstructor | undefined;
     __wechatifiedChatHistory?: import("../user-modules/chat-history.js").ChatHistoryConstructor | undefined;
     __wechatifiedWecom?: import("../user-modules/wecom.js").WecomConstructor | undefined;
@@ -63,9 +54,7 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     readonly Tag: import("../user-modules/tag.js").TagConstructor;
     readonly TagGroup: import("../user-modules/tag-group.js").TagGroupConstructor;
     readonly UrlLink: import("../user-modules/url-link.js").UrlLinkConstructor;
-    readonly Channel: import("../user-modules/channel.js").ChannelConstructor; /**
-     * Propagate Puppet Events to Wechaty
-     */
+    readonly Channel: import("../user-modules/channel.js").ChannelConstructor;
     readonly ChannelCard: import("../user-modules/channel-card.js").ChannelCardConstructor;
     readonly ConsultCard: import("../user-modules/consult-card.js").ConsultCardConstructor;
     readonly PremiumOnlineAppointmentCard: import("../user-modules/premium-online-appointment-card.js").PremiumOnlineAppointmentCardConstructor;
@@ -78,7 +67,8 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     readonly WxxdProduct: import("../user-modules/wxxd-product.js").WxxdProductConstructor;
     readonly WxxdOrder: import("../user-modules/wxxd-order.js").WxxdOrderConstructor;
     init(): Promise<void>;
-    readonly log: import("brolog/dist/esm/src/logger.js").Loggable;
+    __log: PUPPET.LoggerLike;
+    readonly log: PUPPET.LoggerLike;
     readonly id: string;
     __memory?: import("memory-card").MemoryCard | undefined;
     readonly memory: import("memory-card").MemoryCard;
@@ -99,15 +89,16 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     listeners<E_9 extends keyof import("../schemas/wechaty-events.js").WechatyEventListeners>(event: E_9): Function[];
     listenerCount<E_10 extends keyof import("../schemas/wechaty-events.js").WechatyEventListeners>(event: E_10): number;
     getMaxListeners(): number;
-    setMaxListeners(maxListeners: number): any;
+    setMaxListeners(maxListeners: number): any; /** Registry of active Call instances keyed by callId. */
     __events: import("../schemas/wechaty-events.js").WechatyEventListeners;
 }) & {
-    readonly log: import("brolog/dist/esm/src/logger.js").Loggable;
+    readonly log: PUPPET.LoggerLike;
 }) & typeof import("../wechaty/wechaty-skeleton.js").WechatySkeleton & ((abstract new (...args: any[]) => {
     wrapAsync: import("gerror/dist/esm/src/wrap-async-error/wrap-async-error.js").WrapAsync;
     emitError(e: any): void;
     emit(event: any, ...args: any): boolean;
-    readonly log: import("brolog/dist/esm/src/logger.js").Loggable;
+    __log: PUPPET.LoggerLike;
+    readonly log: PUPPET.LoggerLike;
     readonly id: string;
     __memory?: import("memory-card").MemoryCard | undefined;
     readonly memory: import("memory-card").MemoryCard;
@@ -128,17 +119,18 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     listeners<E_9 extends keyof import("../schemas/wechaty-events.js").WechatyEventListeners>(event: E_9): Function[];
     listenerCount<E_10 extends keyof import("../schemas/wechaty-events.js").WechatyEventListeners>(event: E_10): number;
     getMaxListeners(): number;
-    setMaxListeners(maxListeners: number): any;
+    setMaxListeners(maxListeners: number): any; /** Registry of active Call instances keyed by callId. */
     __events: import("../schemas/wechaty-events.js").WechatyEventListeners;
 }) & {
-    readonly log: import("brolog/dist/esm/src/logger.js").Loggable;
+    readonly log: PUPPET.LoggerLike;
 }) & ((abstract new (...args: any[]) => {
     __io?: import("../io.js").Io | undefined;
     readonly io: import("../io.js").Io;
     __ioToken?: string | undefined;
     start(): Promise<void>;
     stop(): Promise<void>;
-    readonly log: import("brolog/dist/esm/src/logger.js").Loggable;
+    __log: PUPPET.LoggerLike;
+    readonly log: PUPPET.LoggerLike;
     readonly id: string;
     __memory?: import("memory-card").MemoryCard | undefined;
     readonly memory: import("memory-card").MemoryCard;
@@ -158,12 +150,12 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     listeners<E_9 extends keyof import("../schemas/wechaty-events.js").WechatyEventListeners>(event: E_9): Function[];
     listenerCount<E_10 extends keyof import("../schemas/wechaty-events.js").WechatyEventListeners>(event: E_10): number;
     getMaxListeners(): number;
-    setMaxListeners(maxListeners: number): any;
+    setMaxListeners(maxListeners: number): any; /** Registry of active Call instances keyed by callId. */
     __events: import("../schemas/wechaty-events.js").WechatyEventListeners;
     wrapAsync: import("gerror/dist/esm/src/wrap-async-error/wrap-async-error.js").WrapAsync;
     emitError(e: any): void;
 }) & {
-    readonly log: import("brolog/dist/esm/src/logger.js").Loggable;
+    readonly log: PUPPET.LoggerLike;
 })>(mixinBase: MixinBase) => ((abstract new (...args: any[]) => {
     __puppet?: PUPPET.impls.PuppetInterface | undefined;
     /** Registry of active Call instances keyed by callId. */
@@ -224,16 +216,7 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     __wechatifiedChannelCard?: import("../user-modules/channel-card.js").ChannelCardConstructor | undefined;
     __wechatifiedConsultCard?: import("../user-modules/consult-card.js").ConsultCardConstructor | undefined;
     __wechatifiedPremiumOnlineAppointmentCard?: import("../user-modules/premium-online-appointment-card.js").PremiumOnlineAppointmentCardConstructor | undefined;
-    __wechatifiedMoment?: import("../user-modules/moment.js").MomentConstructor | undefined; /**
-     * Huan(202111):
-     *
-     *  We should throw the Timeout error when the puppet.start() can not be finished in time.
-     *  However, we need to compatible with some buggy puppet implementations which will not resolve the promise.
-     *
-     * TODO: throw the Timeout error when the puppet.start() can not be finished in time.
-     *
-     * e.g. after resolve @issue https://github.com/padlocal/wechaty-puppet-padlocal/issues/116
-     */
+    __wechatifiedMoment?: import("../user-modules/moment.js").MomentConstructor | undefined;
     __wechatifiedCallRecord?: import("../user-modules/call.js").CallRecordConstructor | undefined;
     __wechatifiedChatHistory?: import("../user-modules/chat-history.js").ChatHistoryConstructor | undefined;
     __wechatifiedWecom?: import("../user-modules/wecom.js").WecomConstructor | undefined;
@@ -257,9 +240,7 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     readonly Tag: import("../user-modules/tag.js").TagConstructor;
     readonly TagGroup: import("../user-modules/tag-group.js").TagGroupConstructor;
     readonly UrlLink: import("../user-modules/url-link.js").UrlLinkConstructor;
-    readonly Channel: import("../user-modules/channel.js").ChannelConstructor; /**
-     * Propagate Puppet Events to Wechaty
-     */
+    readonly Channel: import("../user-modules/channel.js").ChannelConstructor;
     readonly ChannelCard: import("../user-modules/channel-card.js").ChannelCardConstructor;
     readonly ConsultCard: import("../user-modules/consult-card.js").ConsultCardConstructor;
     readonly PremiumOnlineAppointmentCard: import("../user-modules/premium-online-appointment-card.js").PremiumOnlineAppointmentCardConstructor;
@@ -271,7 +252,8 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     readonly ImSpecific: import("../user-modules/im-specific.js").ImSpecificConstructor;
     readonly WxxdProduct: import("../user-modules/wxxd-product.js").WxxdProductConstructor;
     readonly WxxdOrder: import("../user-modules/wxxd-order.js").WxxdOrderConstructor;
-    readonly log: import("brolog/dist/esm/src/logger.js").Loggable;
+    __log: PUPPET.LoggerLike;
+    readonly log: PUPPET.LoggerLike;
     readonly id: string;
     __memory?: import("memory-card").MemoryCard | undefined;
     readonly memory: import("memory-card").MemoryCard;
@@ -290,7 +272,7 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     listeners<E_9 extends keyof import("../schemas/wechaty-events.js").WechatyEventListeners>(event: E_9): Function[];
     listenerCount<E_10 extends keyof import("../schemas/wechaty-events.js").WechatyEventListeners>(event: E_10): number;
     getMaxListeners(): number;
-    setMaxListeners(maxListeners: number): any;
+    setMaxListeners(maxListeners: number): any; /** Registry of active Call instances keyed by callId. */
     __events: import("../schemas/wechaty-events.js").WechatyEventListeners;
     wrapAsync: import("gerror/dist/esm/src/wrap-async-error/wrap-async-error.js").WrapAsync;
     emitError(e: any): void;
@@ -298,7 +280,7 @@ declare const puppetMixin: <MixinBase extends ((abstract new (...args: any[]) =>
     readonly io: import("../io.js").Io;
     __ioToken?: string | undefined;
 }) & {
-    readonly log: import("brolog/dist/esm/src/logger.js").Loggable;
+    readonly log: PUPPET.LoggerLike;
 }) & MixinBase;
 declare type PuppetMixin = ReturnType<typeof puppetMixin>;
 declare type ProtectedPropertyPuppetMixin = '__puppet' | '__callPool' | '__readyState' | '__setupPuppetEvents' | '__finalizeIfEnded' | '__loginIndicator';

package/dist/esm/src/wechaty-mixins/puppet-mixin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"puppet-mixin.d.ts","sourceRoot":"","sources":["../../../../src/wechaty-mixins/puppet-mixin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAW,sBAAsB,CAAA;AAQnD,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,EACrB,MAAO,cAAc,CAAA;AAItB,OAAO,KAAK,EACV,QAAQ,EAKT,MAAoC,wBAAwB,CAAA;AAa7D;;;;;;;GAOG;AACH,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;6FAgEL;;;;;;;;;OASG;;;;;;;;;;;;;;;;;;;;;;;;+EAuET;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sDA1HiB,GAAG,EAAE;;IAjB3B,yDAAyD;gBAC7C,IAAI,MAAM,EAAE,QAAQ,CAAC;;2BAUT,oBAAoB;sBAE1B,gBAAgB;;aAmBT,QAAQ,IAAI,CAAC;YA+Cd,QAAQ,IAAI,CAAC;aAyBrB,QAAQ,IAAI,CAAC;YAML,QAAQ,IAAI,CAAC;gCA8CR,OAAO,KAAK,CAAC,eAAe,GAAG,IAAI;IAgtBhE;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;4BAC4B,QAAQ,oBAAkB,QAAQ,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;6FA70B9D;;;;;;;;;OASG;;;;;;;;;;;;;;;;;;;;;;;;+EAuET;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAuzBR,CAAA;AAED,aAAK,WAAW,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAA;AAEjD,aAAK,4BAA4B,GAC7B,UAAU,GACV,YAAY,GACZ,cAAc,GACd,qBAAqB,GACrB,mBAAmB,GACnB,kBAAkB,CAAA;AAEtB,YAAY,EACV,WAAW,EACX,4BAA4B,GAC7B,CAAA;AACD,OAAO,EACL,WAAW,GACZ,CAAA"}
+{"version":3,"file":"puppet-mixin.d.ts","sourceRoot":"","sources":["../../../../src/wechaty-mixins/puppet-mixin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAW,sBAAsB,CAAA;AAQnD,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,EACrB,MAAO,cAAc,CAAA;AAItB,OAAO,KAAK,EACV,QAAQ,EAKT,MAAoC,wBAAwB,CAAA;AAa7D;;;;;;;GAOG;AACH,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gDAOb,yDAAyD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gDAAzD,yDAAyD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gDAAzD,yDAAyD;;;;;;sDAiBnC,GAAG,EAAE;;IAjB3B,yDAAyD;gBAC7C,IAAI,MAAM,EAAE,QAAQ,CAAC;;2BAUT,oBAAoB;sBAE1B,gBAAgB;;aAmBT,QAAQ,IAAI,CAAC;YA+Cd,QAAQ,IAAI,CAAC;aAyBrB,QAAQ,IAAI,CAAC;YAML,QAAQ,IAAI,CAAC;gCA0ER,OAAO,KAAK,CAAC,eAAe,GAAG,IAAI;IAgtBhE;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;4BAC4B,QAAQ,oBAAkB,QAAQ,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gDAl6BtE,yDAAyD;;;;;;;;;cA89B5D,CAAA;AAED,aAAK,WAAW,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAA;AAEjD,aAAK,4BAA4B,GAC7B,UAAU,GACV,YAAY,GACZ,cAAc,GACd,qBAAqB,GACrB,mBAAmB,GACnB,kBAAkB,CAAA;AAEtB,YAAY,EACV,WAAW,EACX,4BAA4B,GAC7B,CAAA;AACD,OAAO,EACL,WAAW,GACZ,CAAA"}

package/dist/esm/src/wechaty-mixins/puppet-mixin.js

@@ -43,10 +43,10 @@ const puppetMixin = (mixinBase) => {
             });
         }
         async start() {
-            log.verbose('WechatyPuppetMixin', 'start()');
-            log.verbose('WechatyPuppetMixin', 'start() super.start() ...');
+            this.log.verbose('WechatyPuppetMixin', 'start()');
+            this.log.verbose('WechatyPuppetMixin', 'start() super.start() ...');
             await super.start();
-            log.verbose('WechatyPuppetMixin', 'start() super.start() ... done');
+            this.log.verbose('WechatyPuppetMixin', 'start() super.start() ... done');
             try {
                 /**
                  * reset the `wechaty.ready()` state
@@ -56,9 +56,9 @@ const puppetMixin = (mixinBase) => {
                     this.__readyState.inactive(true);
                 }
                 try {
-                    log.verbose('WechatyPuppetMixin', 'start() starting puppet ...');
+                    this.log.verbose('WechatyPuppetMixin', 'start() starting puppet ...');
                     await timeoutPromise(this.puppet.start(), 15 * 1000);
-                    log.verbose('WechatyPuppetMixin', 'start() starting puppet ... done');
+                    this.log.verbose('WechatyPuppetMixin', 'start() starting puppet ... done');
                 }
                 catch (e) {
                     if (e instanceof TimeoutPromiseGError) {
@@ -72,8 +72,8 @@ const puppetMixin = (mixinBase) => {
                          *
                          * e.g. after resolve @issue https://github.com/padlocal/wechaty-puppet-padlocal/issues/116
                          */
-                        log.warn('WechatyPuppetMixin', 'start() starting puppet ... timeout');
-                        log.warn('WechatyPuppetMixin', 'start() puppet info: %s', this.puppet);
+                        this.log.warn('WechatyPuppetMixin', 'start() starting puppet ... timeout');
+                        this.log.warn('WechatyPuppetMixin', 'start() puppet info: %s', this.puppet);
                     }
                     else {
                         throw e;
@@ -85,73 +85,99 @@ const puppetMixin = (mixinBase) => {
             }
         }
         async stop() {
-            log.verbose('WechatyPuppetMixin', 'stop()');
+            this.log.verbose('WechatyPuppetMixin', 'stop()');
             try {
-                log.verbose('WechatyPuppetMixin', 'stop() stopping puppet ...');
+                this.log.verbose('WechatyPuppetMixin', 'stop() stopping puppet ...');
                 await timeoutPromise(this.puppet.stop(), 15 * 1000);
-                log.verbose('WechatyPuppetMixin', 'stop() stopping puppet ... done');
+                this.log.verbose('WechatyPuppetMixin', 'stop() stopping puppet ... done');
             }
             catch (e) {
                 if (e instanceof TimeoutPromiseGError) {
-                    log.warn('WechatyPuppetMixin', 'stop() stopping puppet ... timeout');
-                    log.warn('WechatyPuppetMixin', 'stop() puppet info: %s', this.puppet);
+                    this.log.warn('WechatyPuppetMixin', 'stop() stopping puppet ... timeout');
+                    this.log.warn('WechatyPuppetMixin', 'stop() puppet info: %s', this.puppet);
                 }
                 this.emitError(e);
             }
-            log.verbose('WechatyPuppetMixin', 'stop() super.stop() ...');
+            this.log.verbose('WechatyPuppetMixin', 'stop() super.stop() ...');
             await super.stop();
-            log.verbose('WechatyPuppetMixin', 'stop() super.stop() ... done');
+            this.log.verbose('WechatyPuppetMixin', 'stop() super.stop() ... done');
             this.__callPool.clear();
         }
         async ready() {
-            log.verbose('WechatyPuppetMixin', 'ready()');
+            this.log.verbose('WechatyPuppetMixin', 'ready()');
             await this.__readyState.stable('active');
-            log.silly('WechatyPuppetMixin', 'ready() this.readyState.stable(on) resolved');
+            this.log.silly('WechatyPuppetMixin', 'ready() this.readyState.stable(on) resolved');
         }
         async init() {
-            log.verbose('WechatyPuppetMixin', 'init()');
+            this.log.verbose('WechatyPuppetMixin', 'init()');
             await super.init();
             if (this.__puppetMixinInited) {
-                log.verbose('WechatyPuppetMixin', 'init() skipped because this puppet has already been inited before.');
+                this.log.verbose('WechatyPuppetMixin', 'init() skipped because this puppet has already been inited before.');
                 return;
             }
             this.__puppetMixinInited = true;
-            log.verbose('WechatyPuppetMixin', 'init() instanciating puppet instance ...');
+            this.log.verbose('WechatyPuppetMixin', 'init() instanciating puppet instance ...');
+            /**
+             * Forward `WechatyOptions.logger` down into `PuppetOptions.logger` so
+             * that the puppet layer emits logs through the same logger the caller
+             * supplied to Wechaty.
+             */
+            const basePuppetOptions = 'puppetOptions' in this.__options
+                ? this.__options.puppetOptions
+                : undefined;
+            const mergedPuppetOptions = this.__options.logger
+                ? { ...(basePuppetOptions ?? {}), logger: this.__options.logger }
+                : basePuppetOptions;
             const puppetInstance = await PUPPET.helpers.resolvePuppet({
                 puppet: this.__options.puppet || config.systemPuppetName(),
-                puppetOptions: 'puppetOptions' in this.__options
-                    ? this.__options.puppetOptions
-                    : undefined,
+                puppetOptions: mergedPuppetOptions,
             });
-            log.verbose('WechatyPuppetMixin', 'init() instanciating puppet instance ... done');
+            /**
+             * Adopt the puppet's effective logger onto the Wechaty side, so that
+             * `wechaty.log` and, via the accessory chain, every user module
+             * (`Contact.log`, `Message.log`, ...) route through it. `PuppetInterface`
+             * hides `log` (via `PuppetSkeletonProtectedProperty`), so a structural
+             * cast is required. The `??` guards third-party puppets that never
+             * adopted the pluggable logger — those fall back to the brolog `log`
+             * already assigned in WechatySkeleton.
+             *
+             * Adopted immediately after `resolvePuppet` so the rest of init() —
+             * setMemory / setupPuppetEvents / the sync `emit('puppet')` listeners —
+             * all route through the caller-supplied logger, not brolog.
+             */
+            const puppetLog = puppetInstance.log;
+            if (puppetLog) {
+                this.__log = puppetLog;
+            }
+            this.log.verbose('WechatyPuppetMixin', 'init() instanciating puppet instance ... done');
             /**
              * Plug the Memory Card to Puppet
              */
-            log.verbose('WechatyPuppetMixin', 'init() setting memory ...');
+            this.log.verbose('WechatyPuppetMixin', 'init() setting memory ...');
             const puppetMemory = this.memory.multiplex(PUPPET_MEMORY_NAME);
             puppetInstance.setMemory(puppetMemory);
-            log.verbose('WechatyPuppetMixin', 'init() setting memory ... done');
+            this.log.verbose('WechatyPuppetMixin', 'init() setting memory ... done');
             /**
              * Propagate Puppet Events to Wechaty
              */
-            log.verbose('WechatyPuppetMixin', 'init() setting up events ...');
+            this.log.verbose('WechatyPuppetMixin', 'init() setting up events ...');
             this.__setupPuppetEvents(puppetInstance);
-            log.verbose('WechatyPuppetMixin', 'init() setting up events ... done');
+            this.log.verbose('WechatyPuppetMixin', 'init() setting up events ... done');
             /**
               * Private Event
               *   - Huan(202005): emit puppet when set
               *   - Huan(202110): @see https://github.com/wechaty/redux/blob/16af0ae01f72e37f0ee286b49fa5ccf69850323d/src/wechaty-redux.ts#L82-L98
               */
-            log.verbose('WechatyPuppetMixin', 'init() emitting "puppet" event ...');
+            this.log.verbose('WechatyPuppetMixin', 'init() emitting "puppet" event ...');
             this.emit('puppet', puppetInstance);
-            log.verbose('WechatyPuppetMixin', 'init() emitting "puppet" event ... done');
+            this.log.verbose('WechatyPuppetMixin', 'init() emitting "puppet" event ... done');
             this.__puppet = puppetInstance;
         }
         __setupPuppetEvents(puppet) {
-            log.verbose('WechatyPuppetMixin', '__setupPuppetEvents(%s)', puppet);
+            this.log.verbose('WechatyPuppetMixin', '__setupPuppetEvents(%s)', puppet);
             const eventNameList = Object.keys(PUPPET.types.PUPPET_EVENT_DICT);
             for (const eventName of eventNameList) {
-                log.verbose('PuppetMixin', '__setupPuppetEvents() puppet.on(%s) (listenerCount:%s) registering...', eventName, puppet.listenerCount(eventName));
+                this.log.verbose('PuppetMixin', '__setupPuppetEvents() puppet.on(%s) (listenerCount:%s) registering...', eventName, puppet.listenerCount(eventName));
                 switch (eventName) {
                     case 'dong':
                         puppet.on('dong', payload => {
@@ -224,7 +250,7 @@ const puppetMixin = (mixinBase) => {
                                     this.emit('logout', contact, payload.data);
                                 }
                                 else {
-                                    log.verbose('PuppetMixin', '__setupPuppetEvents() logout event contact self not found for id: %s', payload.contactId);
+                                    this.log.verbose('PuppetMixin', '__setupPuppetEvents() logout event contact self not found for id: %s', payload.contactId);
                                 }
                             }
                             catch (e) {
@@ -316,7 +342,7 @@ const puppetMixin = (mixinBase) => {
                         break;
                     case 'ready':
                         puppet.on('ready', async () => {
-                            log.silly('WechatyPuppetMixin', '__setupPuppetEvents() puppet.on(ready)');
+                            this.log.silly('WechatyPuppetMixin', '__setupPuppetEvents() puppet.on(ready)');
                             // ready event should be emitted 15s after login
                             let onceLogout;
                             let timeout; // 'NodeJS' is not defined.
@@ -344,7 +370,7 @@ const puppetMixin = (mixinBase) => {
                                 }
                             }
                             catch (e) {
-                                log.error(`ready error: ${e.message}, will emit event anyway if it's logged in now`);
+                                this.log.error(`ready error: ${e.message}, will emit event anyway if it's logged in now`);
                                 if (this.puppet.isLoggedIn) {
                                     this.emit('ready');
                                     this.__loginIndicator.value(true);
@@ -449,7 +475,7 @@ const puppetMixin = (mixinBase) => {
                                     }
                                 }
                                 catch (e) {
-                                    log.warn('room-announce', 'room-announce event error: %s', e.message);
+                                    this.log.warn('room-announce', 'room-announce event error: %s', e.message);
                                 }
                                 const date = timestampToDate(payload.timestamp);
                                 this.emit('room-announce', room, payload.newAnnounce, changer, payload.oldAnnounce, date);
@@ -495,7 +521,7 @@ const puppetMixin = (mixinBase) => {
                                             return tag.name() === oldName;
                                         });
                                         if (!result) {
-                                            log.warn('WechatyPuppetMixin', 'tagRenameEvent still get old name after %s retries for tag %s', PUPPET_PAYLOAD_SYNC_MAX_RETRY, tag.id);
+                                            this.log.warn('WechatyPuppetMixin', 'tagRenameEvent still get old name after %s retries for tag %s', PUPPET_PAYLOAD_SYNC_MAX_RETRY, tag.id);
                                         }
                                     }));
                                     this.emit('tag', payload.type, renamedTags, date);
@@ -534,7 +560,7 @@ const puppetMixin = (mixinBase) => {
                                             return tagGroup.name() === oldName;
                                         });
                                         if (!result) {
-                                            log.warn('WechatyPuppetMixin', 'tagGroupRenameEvent still get old name after %s retries for tagGroup %s', PUPPET_PAYLOAD_SYNC_MAX_RETRY, tagGroup.id);
+                                            this.log.warn('WechatyPuppetMixin', 'tagGroupRenameEvent still get old name after %s retries for tagGroup %s', PUPPET_PAYLOAD_SYNC_MAX_RETRY, tagGroup.id);
                                         }
                                     }));
                                     this.emit('tag-group', payload.type, renamedTagGroups, date);
@@ -565,7 +591,7 @@ const puppetMixin = (mixinBase) => {
                                 contact.emit('enter-conversation', date, payload.scene);
                             }
                             else {
-                                log.verbose('PuppetMixin', '__setupPuppetEvents() contact-enter-conversation event contact not found for id: %s', payload.contactId);
+                                this.log.verbose('PuppetMixin', '__setupPuppetEvents() contact-enter-conversation event contact not found for id: %s', payload.contactId);
                             }
                         });
                         break;
@@ -579,7 +605,7 @@ const puppetMixin = (mixinBase) => {
                                 contact.emit('lead-filled', leads, date);
                             }
                             else {
-                                log.verbose('PuppetMixin', '__setupPuppetEvents() contact-lead-filled event contact not found for id: %s', payload.contactId);
+                                this.log.verbose('PuppetMixin', '__setupPuppetEvents() contact-lead-filled event contact not found for id: %s', payload.contactId);
                             }
                         });
                         break;
@@ -688,14 +714,14 @@ const puppetMixin = (mixinBase) => {
                                                 await call.ready(true);
                                             }
                                             catch (e) {
-                                                log.warn('WechatyPuppetMixin', 'dirty(Call) ready failed for callId=%s: %s', payloadId, e.message);
+                                                this.log.warn('WechatyPuppetMixin', 'dirty(Call) ready failed for callId=%s: %s', payloadId, e.message);
                                             }
                                         }
                                         break;
                                     }
                                     case PUPPET.types.Payload.Unspecified:
                                     default:
-                                        log.warn('unknown payload type: ' + payloadType);
+                                        this.log.warn('unknown payload type: ' + payloadType);
                                 }
                                 this.emit('dirty', payloadId, payloadType);
                             }
@@ -738,7 +764,7 @@ const puppetMixin = (mixinBase) => {
                             try {
                                 if (payload.signal === PUPPET.types.CallSignal.Invite) {
                                     if (this.__callPool.has(payload.callId)) {
-                                        log.warn('WechatyPuppetMixin', '__setupPuppetEvents() duplicate Invite for callId=%s, ignoring', payload.callId);
+                                        this.log.warn('WechatyPuppetMixin', '__setupPuppetEvents() duplicate Invite for callId=%s, ignoring', payload.callId);
                                         return;
                                     }
                                     const call = new this.Call({
@@ -756,12 +782,12 @@ const puppetMixin = (mixinBase) => {
                                     // are expected within race windows (e.g. a Ringing ack arriving
                                     // before callInvite returns) or after the Call has been finalized
                                     // and removed from the pool. Drop silently — log.warn, not error.
-                                    log.warn('WechatyPuppetMixin', '__setupPuppetEvents() call event for unknown callId=%s, dropping', payload.callId);
+                                    this.log.warn('WechatyPuppetMixin', '__setupPuppetEvents() call event for unknown callId=%s, dropping', payload.callId);
                                     return;
                                 }
                                 const actor = await this.Contact.find({ id: payload.contactId });
                                 if (!actor) {
-                                    log.warn('WechatyPuppetMixin', '__setupPuppetEvents() actor contact not found for callId=%s contactId=%s, dropping', payload.callId, payload.contactId);
+                                    this.log.warn('WechatyPuppetMixin', '__setupPuppetEvents() actor contact not found for callId=%s contactId=%s, dropping', payload.callId, payload.contactId);
                                     return;
                                 }
                                 call.__handleSignal(payload.signal, actor, payload.reason);
@@ -802,7 +828,7 @@ const puppetMixin = (mixinBase) => {
                         throw new Error('eventName ' + eventName + ' unsupported!');
                 }
             }
-            log.verbose('WechatyPuppetMixin', '__setupPuppetEvents() ... done');
+            this.log.verbose('WechatyPuppetMixin', '__setupPuppetEvents() ... done');
         }
         /**
          * Decide whether a call has reached its terminal state and, if so, drive
@@ -839,7 +865,7 @@ const puppetMixin = (mixinBase) => {
                         ended = !!call.endTime();
                     }
                     catch (e) {
-                        log.warn('WechatyPuppetMixin', '__finalizeIfEnded() sync attempt %d failed for callId=%s: %s', attempt + 1, call.id, e.message);
+                        this.log.warn('WechatyPuppetMixin', '__finalizeIfEnded() sync attempt %d failed for callId=%s: %s', attempt + 1, call.id, e.message);
                     }
                     if (!ended && attempt < 2) {
                         await new Promise(resolve => setTimeout(resolve, 500));
@@ -850,15 +876,15 @@ const puppetMixin = (mixinBase) => {
                 try {
                     const participants = await call.participants();
                     if (participants.length === 2) {
-                        log.warn('WechatyPuppetMixin', '__finalizeIfEnded() 1v1 fallback after sync failure for callId=%s (rosterLength=%d)', call.id, participants.length);
+                        this.log.warn('WechatyPuppetMixin', '__finalizeIfEnded() 1v1 fallback after sync failure for callId=%s (rosterLength=%d)', call.id, participants.length);
                         ended = true;
                     }
                     else {
-                        log.error('WechatyPuppetMixin', '__finalizeIfEnded() sync failed, leaving callId=%s in pool for next dirty signal (rosterLength=%d)', call.id, participants.length);
+                        this.log.error('WechatyPuppetMixin', '__finalizeIfEnded() sync failed, leaving callId=%s in pool for next dirty signal (rosterLength=%d)', call.id, participants.length);
                     }
                 }
                 catch (e) {
-                    log.error('WechatyPuppetMixin', '__finalizeIfEnded() participants lookup failed for callId=%s: %s', call.id, e.message);
+                    this.log.error('WechatyPuppetMixin', '__finalizeIfEnded() participants lookup failed for callId=%s: %s', call.id, e.message);
                 }
             }
             if (ended) {