@juzi/wechaty-puppet-service 1.0.123 → 1.0.125

package/dist/cjs/src/client/puppet-service.js

@@ -110,6 +110,7 @@ class PuppetService extends PUPPET.Puppet {
         this.options = options;
         this._payloadStore = new payload_store_js_1.PayloadStore({
             token: config_js_1.envVars.WECHATY_PUPPET_SERVICE_TOKEN(this.options.token),
+            logger: this.options.logger,
         });
         this.hookPayloadStore();
         this.FileBoxUuid = (0, mod_js_1.uuidifyFileBoxGrpc)(() => this.grpcManager.client);
@@ -139,77 +140,77 @@ class PuppetService extends PUPPET.Puppet {
         return package_json_js_1.packageJson.version || '0.0.0';
     }
     async onStart() {
-        config_js_1.log.verbose('PuppetService', 'onStart()');
+        this.log.verbose('PuppetService', 'onStart()');
         this.waitingForLogin = false;
         this.waitingForReady = false;
         if (this._grpcManager) {
-            config_js_1.log.warn('PuppetService', 'onStart() found this.grpc is already existed. dropped.');
+            this.log.warn('PuppetService', 'onStart() found this.grpc is already existed. dropped.');
             this._grpcManager = undefined;
         }
-        config_js_1.log.info('PuppetService', 'start() instanciating GrpcManager ...');
+        this.log.info('PuppetService', 'start() instanciating GrpcManager ...');
         const grpcManager = new grpc_manager_js_1.GrpcManager(this.options);
-        config_js_1.log.info('PuppetService', 'start() instanciating GrpcManager ... done');
+        this.log.info('PuppetService', 'start() instanciating GrpcManager ... done');
         /**
          * Huan(202108): when we started the event stream,
          *  the `this.grpc` need to be available for all listeners.
          */
         this._grpcManager = grpcManager;
-        config_js_1.log.info('PuppetService', 'start() setting up bridge grpc event stream ...');
+        this.log.info('PuppetService', 'start() setting up bridge grpc event stream ...');
         this.bridgeGrpcEventStream(grpcManager);
-        config_js_1.log.info('PuppetService', 'start() setting up bridge grpc event stream ... done');
-        config_js_1.log.info('PuppetService', 'start() starting grpc manager...');
+        this.log.info('PuppetService', 'start() setting up bridge grpc event stream ... done');
+        this.log.info('PuppetService', 'start() starting grpc manager...');
         const { lastEventSeq, accountId } = await this.getMiscellaneousStoreData();
         await grpcManager.start(lastEventSeq, accountId);
-        config_js_1.log.info('PuppetService', 'start() starting grpc manager... done');
-        config_js_1.log.info('PuppetService', 'start healthCheck');
+        this.log.info('PuppetService', 'start() starting grpc manager... done');
+        this.log.info('PuppetService', 'start healthCheck');
         this.startHealthCheck();
-        config_js_1.log.info('PuppetService', 'onStart() ... done');
+        this.log.info('PuppetService', 'onStart() ... done');
     }
     async onStop() {
-        config_js_1.log.info('PuppetService', 'onStop()');
+        this.log.info('PuppetService', 'onStop()');
         if (this._grpcManager) {
-            config_js_1.log.info('PuppetService', 'onStop() stopping grpc manager ...');
+            this.log.info('PuppetService', 'onStop() stopping grpc manager ...');
             const grpcManager = this._grpcManager;
             this._grpcManager = undefined;
             await grpcManager.stop();
-            config_js_1.log.info('PuppetService', 'onStop() stopping grpc manager ... done');
+            this.log.info('PuppetService', 'onStop() stopping grpc manager ... done');
         }
-        config_js_1.log.info('PuppetService', 'onStop() ... done');
-        config_js_1.log.info('PuppetService', 'stop healthCheck');
+        this.log.info('PuppetService', 'onStop() ... done');
+        this.log.info('PuppetService', 'stop healthCheck');
         this.stopHealthCheck();
     }
     hookPayloadStore() {
-        config_js_1.log.verbose('PuppetService', 'hookPayloadStore()');
+        this.log.verbose('PuppetService', 'hookPayloadStore()');
         this.on('login', async ({ contactId }) => {
             try {
-                config_js_1.log.verbose('PuppetService', 'hookPayloadStore() this.on(login) contactId: "%s"', contactId);
+                this.log.verbose('PuppetService', 'hookPayloadStore() this.on(login) contactId: "%s"', contactId);
                 await this._payloadStore.start(contactId);
             }
             catch (e) {
-                config_js_1.log.verbose('PuppetService', 'hookPayloadStore() this.on(login) rejection "%s"', e.message);
+                this.log.verbose('PuppetService', 'hookPayloadStore() this.on(login) rejection "%s"', e.message);
             }
         });
         this.on('logout', async ({ contactId }) => {
-            config_js_1.log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) contactId: "%s"', contactId);
+            this.log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) contactId: "%s"', contactId);
             try {
                 await this._payloadStore.stop();
             }
             catch (e) {
-                config_js_1.log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) rejection "%s"', e.message);
+                this.log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) rejection "%s"', e.message);
             }
         });
     }
     bridgeGrpcEventStream(client) {
-        config_js_1.log.verbose('PuppetService', 'bridgeGrpcEventStream(client)');
+        this.log.verbose('PuppetService', 'bridgeGrpcEventStream(client)');
         client
             .on('data', this.onGrpcStreamEvent.bind(this))
             .on('end', () => {
-            config_js_1.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(end)');
+            this.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(end)');
         })
             .on('error', (e) => {
             this.emit('error', e);
             // https://github.com/wechaty/wechaty-puppet-service/issues/16
-            // log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(error) %s', e)
+            // this.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(error) %s', e)
             // const reason = 'bridgeGrpcEventStream() eventStream.on(error) ' + e
             /**
              * Huan(202110): simple reset puppet when grpc client has error? (or not?)
@@ -224,7 +225,7 @@ class PuppetService extends PUPPET.Puppet {
             // }
         })
             .on('cancel', (...args) => {
-            config_js_1.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(cancel), %s', JSON.stringify(args));
+            this.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(cancel), %s', JSON.stringify(args));
         });
     }
     async onGrpcStreamEvent(event) {
@@ -233,9 +234,9 @@ class PuppetService extends PUPPET.Puppet {
         const seq = event.getSeq();
         const timestamp = String(Date.now());
         if (!config_js_1.NO_LOG_EVENTS.includes(type)) {
-            config_js_1.log.info('PuppetService', `received grpc event ${event_type_rev_js_1.EventTypeRev[type]} on ${new Date().toString()}, content: ${JSON.stringify(payload)}, seq: ${seq}, timestamp: ${timestamp}`);
+            this.log.info('PuppetService', `received grpc event ${event_type_rev_js_1.EventTypeRev[type]} on ${new Date().toString()}, content: ${JSON.stringify(payload)}, seq: ${seq}, timestamp: ${timestamp}`);
         }
-        config_js_1.log.silly('PuppetService', 'onGrpcStreamEvent({type:%s(%s), payload:"%s"})', event_type_rev_js_1.EventTypeRev[type], type, payload);
+        this.log.silly('PuppetService', 'onGrpcStreamEvent({type:%s(%s), payload:"%s"})', event_type_rev_js_1.EventTypeRev[type], type, payload);
         if (type !== wechaty_grpc_1.puppet.EventType.EVENT_TYPE_HEARTBEAT) {
             this.emit('heartbeat', {
                 data: `onGrpcStreamEvent(${event_type_rev_js_1.EventTypeRev[type]})`,
@@ -266,7 +267,7 @@ class PuppetService extends PUPPET.Puppet {
             case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_LOGIN:
                 {
                     if (this.waitingForLogin && this.isLoggedIn) {
-                        config_js_1.log.warn('PuppetService', 'this login event is ignored because the it is expected by event stream reconnect and this puppet is already logged in');
+                        this.log.warn('PuppetService', 'this login event is ignored because the it is expected by event stream reconnect and this puppet is already logged in');
                         return;
                     }
                     const loginPayload = JSON.parse(payload);
@@ -279,7 +280,7 @@ class PuppetService extends PUPPET.Puppet {
                             });
                         }
                     }
-                    (async () => this.login(loginPayload.contactId))().catch(e => config_js_1.log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s', e.message));
+                    (async () => this.login(loginPayload.contactId))().catch(e => this.log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s', e.message));
                 }
                 break;
             case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_LOGOUT:
@@ -289,11 +290,39 @@ class PuppetService extends PUPPET.Puppet {
                         await this.resetMiscellaneousStoreData();
                     }
                     ;
-                    (async () => this.logout(logoutPayload.data))().catch(e => config_js_1.log.error('PuppetService', 'onGrpcStreamEvent() this.logout() rejection %s', e.message));
+                    (async () => this.logout(logoutPayload.data))().catch(e => this.log.error('PuppetService', 'onGrpcStreamEvent() this.logout() rejection %s', e.message));
                 }
                 break;
             case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_DIRTY: {
                 const dirtyPayload = JSON.parse(payload);
+                /**
+                 * Bump the generation counter *before* awaiting fastDirty so the
+                 * whole fastDirty window is covered: any raw fetch that started
+                 * before this dirty and resolves while fastDirty is deleting the
+                 * FlashStore row must be judged stale by `isFreshWrite` and skip
+                 * its write-back -- otherwise it re-poisons the row we just
+                 * cleared and the value only refreshes after a *second* dirty.
+                 *
+                 * Upstream cache-mixin.onDirty bumps the same (type, id) again
+                 * after `emit('dirty')` below; double-bumping is harmless because
+                 * the counter only moves forward and `isFreshWrite` compares by
+                 * equality.
+                 */
+                this.cache.bumpGen(dirtyPayload.payloadType, dirtyPayload.payloadId);
+                /**
+                 * A compound RoomMember dirty (`${roomId}${SEP}${memberId}`) must
+                 * also bump the bare roomId key: roomMember write-backs are
+                 * row-level read-modify-writes keyed by roomId, so a single-member
+                 * dirty has to move that key too or an in-flight roomMember fetch
+                 * could still write the whole row back stale.
+                 */
+                if (dirtyPayload.payloadType === PUPPET.types.Dirty.RoomMember
+                    && dirtyPayload.payloadId.includes(PUPPET.STRING_SPLITTER)) {
+                    const [roomId] = dirtyPayload.payloadId.split(PUPPET.STRING_SPLITTER);
+                    if (roomId) {
+                        this.cache.bumpGen(PUPPET.types.Dirty.RoomMember, roomId);
+                    }
+                }
                 await this.fastDirty(dirtyPayload);
                 this.emit('dirty', dirtyPayload);
                 break;
@@ -312,7 +341,7 @@ class PuppetService extends PUPPET.Puppet {
                 break;
             case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_READY:
                 if (this.waitingForReady && this.readyIndicator.value()) {
-                    config_js_1.log.warn('PuppetService', 'this ready event is ignored because the it is expected by event stream reconnect and this puppet is already ready');
+                    this.log.warn('PuppetService', 'this ready event is ignored because the it is expected by event stream reconnect and this puppet is already ready');
                     return;
                 }
                 this.emit('ready', JSON.parse(payload));
@@ -342,14 +371,14 @@ class PuppetService extends PUPPET.Puppet {
                 this.emit('tag-group', JSON.parse(payload));
                 break;
             case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_RESET:
-                config_js_1.log.warn('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_RESET ?');
+                this.log.warn('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_RESET ?');
                 // the `reset` event should be dealed not send out
                 break;
             case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_VERIFY_CODE:
                 this.emit('verify-code', JSON.parse(payload));
                 break;
             case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_UNSPECIFIED:
-                config_js_1.log.error('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_UNSPECIFIED ?');
+                this.log.error('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_UNSPECIFIED ?');
                 break;
             case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_VERIFY_SLIDE:
                 this.emit('verify-slide', JSON.parse(payload));
@@ -359,27 +388,27 @@ class PuppetService extends PUPPET.Puppet {
                 break;
             default:
                 // Huan(202003): in default, the `type` type should be `never`, please check.
-                config_js_1.log.error(`eventType ${type} unsupported! data: ${payload}`);
+                this.log.error(`eventType ${type} unsupported! data: ${payload}`);
         }
     }
     async logout(reason) {
-        config_js_1.log.verbose('PuppetService', 'logout(%s)', reason ? `"${reason}"` : '');
+        this.log.verbose('PuppetService', 'logout(%s)', reason ? `"${reason}"` : '');
         await super.logout(reason);
         try {
             await util_1.default.promisify(this.grpcManager.client.logout
                 .bind(this.grpcManager.client))(new wechaty_grpc_1.puppet.LogoutRequest());
         }
         catch (e) {
-            config_js_1.log.silly('PuppetService', 'logout() no grpc client');
+            this.log.silly('PuppetService', 'logout() no grpc client');
         }
     }
     ding(data) {
-        config_js_1.log.silly('PuppetService', 'ding(%s)', data);
+        this.log.silly('PuppetService', 'ding(%s)', data);
         const request = new wechaty_grpc_1.puppet.DingRequest();
         request.setData(data || '');
         this.grpcManager.client.ding(request, (error, _response) => {
             if (error) {
-                config_js_1.log.error('PuppetService', 'ding() rejection: %s', error);
+                this.log.error('PuppetService', 'ding() rejection: %s', error);
             }
         });
     }
@@ -392,7 +421,7 @@ class PuppetService extends PUPPET.Puppet {
      *
      */
     async dirtyPayload(type, id) {
-        config_js_1.log.verbose('PuppetService', 'dirtyPayload(%s, %s)', type, id);
+        this.log.verbose('PuppetService', 'dirtyPayload(%s, %s)', type, id);
         const request = new wechaty_grpc_1.puppet.DirtyPayloadRequest();
         request.setId(id);
         request.setType(type);
@@ -401,7 +430,7 @@ class PuppetService extends PUPPET.Puppet {
                 .bind(this.grpcManager.client))(request);
         }
         catch (e) {
-            config_js_1.log.error('PuppetService', 'dirtyPayload() rejection: %s', e && e.message);
+            this.log.error('PuppetService', 'dirtyPayload() rejection: %s', e && e.message);
             throw e;
         }
     }
@@ -483,7 +512,7 @@ class PuppetService extends PUPPET.Puppet {
             [PUPPET.types.Dirty.Call]: async (_) => { },
             [PUPPET.types.Dirty.Unspecified]: async (id) => {
                 const msg = `fastDirty() received Unspecified dirty type (id=${id}); upstream puppet is leaking protobuf default — this is a server-side contract bug`;
-                config_js_1.log.error('PuppetService', msg);
+                this.log.error('PuppetService', msg);
                 this.emit('error', new Error(msg));
             },
         };
@@ -493,14 +522,14 @@ class PuppetService extends PUPPET.Puppet {
      *  the event listener will be registered in `start()` from the `PuppetAbstract` class
      */
     async fastDirty({ payloadType, payloadId, }) {
-        config_js_1.log.verbose('PuppetService', 'fastDirty(%s<%s>, %s)', PUPPET.types.Dirty[payloadType], payloadType, payloadId);
+        this.log.verbose('PuppetService', 'fastDirty(%s<%s>, %s)', PUPPET.types.Dirty[payloadType], payloadType, payloadId);
         // payloadType is typed as the enum, but at runtime the server may emit a
         // value outside our enum (forward-compat). Look it up via a
         // possibly-undefined view so the runtime guard stays meaningful.
         const lookup = this._dirtyHandlerMap;
         const handler = lookup[payloadType];
         if (!handler) {
-            config_js_1.log.warn('PuppetService', 'fastDirty() no handler for payloadType=%s', payloadType);
+            this.log.warn('PuppetService', 'fastDirty() no handler for payloadType=%s', payloadType);
             return;
         }
         try {
@@ -511,7 +540,7 @@ class PuppetService extends PUPPET.Puppet {
         }
     }
     async enterVerifyCode(id, code) {
-        config_js_1.log.verbose('PuppetService', 'enterVerifyCode(%s, %s)', id, code);
+        this.log.verbose('PuppetService', 'enterVerifyCode(%s, %s)', id, code);
         const request = new wechaty_grpc_1.puppet.EnterVerifyCodeRequest();
         request.setId(id);
         request.setCode(code);
@@ -519,20 +548,20 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async cancelVerifyCode(id) {
-        config_js_1.log.verbose('PuppetService', 'cancelVerifyCode(%s)', id);
+        this.log.verbose('PuppetService', 'cancelVerifyCode(%s)', id);
         const request = new wechaty_grpc_1.puppet.CancelVerifyCodeRequest();
         request.setId(id);
         await util_1.default.promisify(this.grpcManager.client.cancelVerifyCode
             .bind(this.grpcManager.client))(request);
     }
     async refreshQRCode() {
-        config_js_1.log.verbose('PuppetService', 'refreshQRCode(%s)');
+        this.log.verbose('PuppetService', 'refreshQRCode(%s)');
         const request = new wechaty_grpc_1.puppet.RefreshQRCodeRequest();
         await util_1.default.promisify(this.grpcManager.client.refreshQRCode
             .bind(this.grpcManager.client))(request);
     }
     async contactAlias(contactId, alias) {
-        config_js_1.log.verbose('PuppetService', 'contactAlias(%s, %s)', contactId, alias);
+        this.log.verbose('PuppetService', 'contactAlias(%s, %s)', contactId, alias);
         /**
          * Get alias
          */
@@ -570,7 +599,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async contactPhone(contactId, phoneList) {
-        config_js_1.log.verbose('PuppetService', 'contactPhone(%s, %s)', contactId, phoneList);
+        this.log.verbose('PuppetService', 'contactPhone(%s, %s)', contactId, phoneList);
         const request = new wechaty_grpc_1.puppet.ContactPhoneRequest();
         request.setContactId(contactId);
         request.setPhonesList(phoneList);
@@ -578,7 +607,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async contactCorporationRemark(contactId, corporationRemark) {
-        config_js_1.log.verbose('PuppetService', 'contactCorporationRemark(%s, %s)', contactId, corporationRemark);
+        this.log.verbose('PuppetService', 'contactCorporationRemark(%s, %s)', contactId, corporationRemark);
         const request = new wechaty_grpc_1.puppet.ContactCorporationRemarkRequest();
         request.setContactId(contactId);
         if (corporationRemark) {
@@ -596,7 +625,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async contactDescription(contactId, description) {
-        config_js_1.log.verbose('PuppetService', 'contactDescription(%s, %s)', contactId, description);
+        this.log.verbose('PuppetService', 'contactDescription(%s, %s)', contactId, description);
         const request = new wechaty_grpc_1.puppet.ContactDescriptionRequest();
         request.setContactId(contactId);
         if (description) {
@@ -614,13 +643,13 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async contactList() {
-        config_js_1.log.verbose('PuppetService', 'contactList()');
+        this.log.verbose('PuppetService', 'contactList()');
         const response = await util_1.default.promisify(this.grpcManager.client.contactList
             .bind(this.grpcManager.client))(new wechaty_grpc_1.puppet.ContactListRequest());
         return response.getIdsList();
     }
     async contactAvatar(contactId, fileBox) {
-        config_js_1.log.verbose('PuppetService', 'contactAvatar(%s)', contactId);
+        this.log.verbose('PuppetService', 'contactAvatar(%s)', contactId);
         /**
          * 1. set
          */
@@ -657,12 +686,15 @@ class PuppetService extends PUPPET.Puppet {
         return this.FileBoxUuid.fromJSON(jsonText);
     }
     async contactRawPayload(id) {
-        config_js_1.log.verbose('PuppetService', 'contactRawPayload(%s)', id);
+        this.log.verbose('PuppetService', 'contactRawPayload(%s)', id);
         const cachedPayload = await this._payloadStore.contact?.get(id);
         if (cachedPayload) {
-            config_js_1.log.silly('PuppetService', 'contactRawPayload(%s) cache HIT', id);
+            this.log.silly('PuppetService', 'contactRawPayload(%s) cache HIT', id);
             return cachedPayload;
         }
+        // Snapshot the gen before the raw fetch so a dirty that lands while
+        // the gRPC round-trip is in flight makes the write-back below stale.
+        const gen = this.cache.snapshotGen(PUPPET.types.Dirty.Contact, id);
         const request = new wechaty_grpc_1.puppet.ContactPayloadRequest();
         request.setId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.contactPayload
@@ -700,17 +732,22 @@ class PuppetService extends PUPPET.Puppet {
             realName: response.getRealName(),
             aka: response.getAka(),
         };
-        await this._payloadStore.contact?.set(id, payload);
-        config_js_1.log.silly('PuppetService', 'contactRawPayload(%s) cache SET', id);
+        if (this.cache.isFreshWrite(PUPPET.types.Dirty.Contact, id, gen)) {
+            await this._payloadStore.contact?.set(id, payload);
+            this.log.silly('PuppetService', 'contactRawPayload(%s) cache SET', id);
+        }
+        else {
+            this.log.silly('PuppetService', 'contactRawPayload(%s) cache SET skipped: dirty landed during raw fetch', id);
+        }
         return payload;
     }
     async contactRawPayloadParser(payload) {
-        // log.silly('PuppetService', 'contactRawPayloadParser({id:%s})', payload.id)
+        // this.log.silly('PuppetService', 'contactRawPayloadParser({id:%s})', payload.id)
         // passthrough
         return payload;
     }
     async batchContactRawPayload(contactIdList) {
-        config_js_1.log.verbose('PuppetService', 'batchContactRawPayload(%s)', contactIdList);
+        this.log.verbose('PuppetService', 'batchContactRawPayload(%s)', contactIdList);
         const result = new Map();
         const contactIdSet = new Set(contactIdList);
         const needGetSet = new Set();
@@ -725,6 +762,13 @@ class PuppetService extends PUPPET.Puppet {
         }
         if (needGetSet.size > 0) {
             try {
+                // Snapshot each id's gen before the batch fetch; write-backs below
+                // are validated per id so a dirty on one contact mid-flight only
+                // skips that contact's stale write, not the whole batch.
+                const genSnap = new Map();
+                for (const contactId of needGetSet) {
+                    genSnap.set(contactId, this.cache.snapshotGen(PUPPET.types.Dirty.Contact, contactId));
+                }
                 const request = new wechaty_grpc_1.puppet.BatchContactPayloadRequest();
                 request.setIdsList(Array.from(needGetSet));
                 const response = await util_1.default.promisify(this.grpcManager.client.batchContactPayload
@@ -734,11 +778,16 @@ class PuppetService extends PUPPET.Puppet {
                     const contactId = payload.getId();
                     const puppetPayload = (0, pb_payload_helper_js_1.contactPbToPayload)(payload);
                     result.set(contactId, puppetPayload);
-                    await this._payloadStore.contact?.set(contactId, puppetPayload);
+                    if (this.cache.isFreshWrite(PUPPET.types.Dirty.Contact, contactId, genSnap.get(contactId) ?? 0)) {
+                        await this._payloadStore.contact?.set(contactId, puppetPayload);
+                    }
+                    else {
+                        this.log.silly('PuppetService', 'batchContactRawPayload(%s) cache SET skipped: dirty landed during raw fetch', contactId);
+                    }
                 }
             }
             catch (e) {
-                config_js_1.log.error('PuppetService', 'batchContactRawPayload(%s, %s) error: %s, use one by one method', contactIdList, needGetSet, e);
+                this.log.error('PuppetService', 'batchContactRawPayload(%s, %s) error: %s, use one by one method', contactIdList, needGetSet, e);
                 for (const contactId of needGetSet) {
                     const payload = await this.contactRawPayload(contactId);
                     result.set(contactId, payload);
@@ -748,7 +797,7 @@ class PuppetService extends PUPPET.Puppet {
         return result;
     }
     async contactPayloadModify(contactId, payload) {
-        config_js_1.log.verbose('PuppetService', 'contactPayloadModify(%s, %s)', contactId, JSON.stringify(payload));
+        this.log.verbose('PuppetService', 'contactPayloadModify(%s, %s)', contactId, JSON.stringify(payload));
         const request = new wechaty_grpc_1.puppet.ContactPayloadModifyRequest();
         request.setId(contactId);
         if (payload.id) {
@@ -818,41 +867,41 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async contactSelfName(name) {
-        config_js_1.log.verbose('PuppetService', 'contactSelfName(%s)', name);
+        this.log.verbose('PuppetService', 'contactSelfName(%s)', name);
         const request = new wechaty_grpc_1.puppet.ContactSelfNameRequest();
         request.setName(name);
         await util_1.default.promisify(this.grpcManager.client.contactSelfName
             .bind(this.grpcManager.client))(request);
     }
     async contactSelfRealName(realName) {
-        config_js_1.log.verbose('PuppetService', 'contactSelfRealName(%s)', realName);
+        this.log.verbose('PuppetService', 'contactSelfRealName(%s)', realName);
         const request = new wechaty_grpc_1.puppet.ContactSelfRealNameRequest();
         request.setRealName(realName);
         await util_1.default.promisify(this.grpcManager.client.contactSelfRealName
             .bind(this.grpcManager.client))(request);
     }
     async contactSelfAka(aka) {
-        config_js_1.log.verbose('PuppetService', 'contactSelfAka(%s)', aka);
+        this.log.verbose('PuppetService', 'contactSelfAka(%s)', aka);
         const request = new wechaty_grpc_1.puppet.ContactSelfAkaRequest();
         request.setAka(aka);
         await util_1.default.promisify(this.grpcManager.client.contactSelfAka
             .bind(this.grpcManager.client))(request);
     }
     async contactSelfQRCode() {
-        config_js_1.log.verbose('PuppetService', 'contactSelfQRCode()');
+        this.log.verbose('PuppetService', 'contactSelfQRCode()');
         const response = await util_1.default.promisify(this.grpcManager.client.contactSelfQRCode
             .bind(this.grpcManager.client))(new wechaty_grpc_1.puppet.ContactSelfQRCodeRequest());
         return response.getQrcode();
     }
     async contactSelfSignature(signature) {
-        config_js_1.log.verbose('PuppetService', 'contactSelfSignature(%s)', signature);
+        this.log.verbose('PuppetService', 'contactSelfSignature(%s)', signature);
         const request = new wechaty_grpc_1.puppet.ContactSelfSignatureRequest();
         request.setSignature(signature);
         await util_1.default.promisify(this.grpcManager.client.contactSelfSignature
             .bind(this.grpcManager.client))(request);
     }
     async contactSelfRoomAlias(roomId, alias) {
-        config_js_1.log.verbose('PuppetService', 'contactSelfRoomAlias(%s, %s)', roomId, alias);
+        this.log.verbose('PuppetService', 'contactSelfRoomAlias(%s, %s)', roomId, alias);
         const request = new wechaty_grpc_1.puppet.ContactSelfRoomAliasRequest();
         request.setRoomId(roomId);
         request.setAlias(alias);
@@ -860,7 +909,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async contactDelete(contactId) {
-        config_js_1.log.verbose('PuppetService', 'contactDelete(%s)', contactId);
+        this.log.verbose('PuppetService', 'contactDelete(%s)', contactId);
         const request = new wechaty_grpc_1.puppet.ContactDeleteRequest();
         request.setContactId(contactId);
         await util_1.default.promisify(this.grpcManager.client.contactDelete
@@ -872,7 +921,7 @@ class PuppetService extends PUPPET.Puppet {
      *
      */
     async conversationReadMark(conversationId, hasRead = true) {
-        config_js_1.log.verbose('PuppetService', 'conversationMarkRead(%s, %s)', conversationId, hasRead);
+        this.log.verbose('PuppetService', 'conversationMarkRead(%s, %s)', conversationId, hasRead);
         const request = new wechaty_grpc_1.puppet.ConversationReadRequest();
         request.setConversationId(conversationId);
         request.setHasRead(hasRead);
@@ -885,7 +934,7 @@ class PuppetService extends PUPPET.Puppet {
      *
      */
     async messageMiniProgram(messageId) {
-        config_js_1.log.verbose('PuppetService', 'messageMiniProgram(%s)', messageId);
+        this.log.verbose('PuppetService', 'messageMiniProgram(%s)', messageId);
         const request = new wechaty_grpc_1.puppet.MessageMiniProgramRequest();
         request.setId(messageId);
         const response = await util_1.default.promisify(this.grpcManager.client.messageMiniProgram
@@ -904,7 +953,7 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async messageLocation(messageId) {
-        config_js_1.log.verbose('PuppetService', 'messageLocation(%s)', messageId);
+        this.log.verbose('PuppetService', 'messageLocation(%s)', messageId);
         const request = new wechaty_grpc_1.puppet.MessageLocationRequest();
         request.setId(messageId);
         const response = await util_1.default.promisify(this.grpcManager.client.messageLocation
@@ -920,7 +969,7 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async messageImage(messageId, imageType) {
-        config_js_1.log.verbose('PuppetService', 'messageImage(%s, %s[%s])', messageId, imageType, PUPPET.types.Image[imageType]);
+        this.log.verbose('PuppetService', 'messageImage(%s, %s[%s])', messageId, imageType, PUPPET.types.Image[imageType]);
         const request = new wechaty_grpc_1.puppet.MessageImageRequest();
         request.setId(messageId);
         request.setType(imageType);
@@ -933,7 +982,7 @@ class PuppetService extends PUPPET.Puppet {
         throw new Error(`failed to get image filebox for message ${messageId}`);
     }
     async messageContact(messageId) {
-        config_js_1.log.verbose('PuppetService', 'messageContact(%s)', messageId);
+        this.log.verbose('PuppetService', 'messageContact(%s)', messageId);
         const request = new wechaty_grpc_1.puppet.MessageContactRequest();
         request.setId(messageId);
         const response = await util_1.default.promisify(this.grpcManager.client.messageContact
@@ -942,7 +991,7 @@ class PuppetService extends PUPPET.Puppet {
         return contactId;
     }
     async messageChannel(messageId) {
-        config_js_1.log.verbose('PuppetService', 'messageChannel(%s)', messageId);
+        this.log.verbose('PuppetService', 'messageChannel(%s)', messageId);
         const request = new wechaty_grpc_1.puppet.MessageChannelRequest();
         request.setId(messageId);
         const response = await util_1.default.promisify(this.grpcManager.client.messageChannel
@@ -951,7 +1000,7 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async messageChannelCard(messageId) {
-        config_js_1.log.verbose('PuppetService', 'messageChannelCard(%s)', messageId);
+        this.log.verbose('PuppetService', 'messageChannelCard(%s)', messageId);
         const request = new wechaty_grpc_1.puppet.MessageChannelCardRequest();
         request.setId(messageId);
         const response = await util_1.default.promisify(this.grpcManager.client.messageChannelCard
@@ -960,7 +1009,7 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async messageCallRecord(messageId) {
-        config_js_1.log.verbose('PuppetService', 'messageCallRecord(%s)', messageId);
+        this.log.verbose('PuppetService', 'messageCallRecord(%s)', messageId);
         const request = new wechaty_grpc_1.puppet.MessageCallRecordRequest();
         request.setId(messageId);
         const response = await util_1.default.promisify(this.grpcManager.client.messageCallRecord
@@ -969,7 +1018,7 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async callInvite(contactIds, media) {
-        config_js_1.log.verbose('PuppetService', 'callInvite(%s, %s)', contactIds, media);
+        this.log.verbose('PuppetService', 'callInvite(%s, %s)', contactIds, media);
         const request = new wechaty_grpc_1.puppet.CallInviteRequest();
         request.setContactIdsList(contactIds);
         request.setMedia((0, call_media_mapping_js_1.puppetCallMediaTypeToGrpc)(media));
@@ -982,20 +1031,20 @@ class PuppetService extends PUPPET.Puppet {
         return callId;
     }
     async callAdd(callId, contactIds) {
-        config_js_1.log.verbose('PuppetService', 'callAdd(%s, %s)', callId, contactIds);
+        this.log.verbose('PuppetService', 'callAdd(%s, %s)', callId, contactIds);
         const request = new wechaty_grpc_1.puppet.CallAddRequest();
         request.setCallId(callId);
         request.setContactIdsList(contactIds);
         await this.grpcUnary(this.grpcManager.client.callAdd, request);
     }
     async callAccept(callId) {
-        config_js_1.log.verbose('PuppetService', 'callAccept(%s)', callId);
+        this.log.verbose('PuppetService', 'callAccept(%s)', callId);
         const request = new wechaty_grpc_1.puppet.CallAcceptRequest();
         request.setCallId(callId);
         await this.grpcUnary(this.grpcManager.client.callAccept, request);
     }
     async callReject(callId, reason) {
-        config_js_1.log.verbose('PuppetService', 'callReject(%s, %s)', callId, reason);
+        this.log.verbose('PuppetService', 'callReject(%s, %s)', callId, reason);
         const request = new wechaty_grpc_1.puppet.CallRejectRequest();
         request.setCallId(callId);
         if (reason !== undefined && reason !== '') {
@@ -1004,13 +1053,13 @@ class PuppetService extends PUPPET.Puppet {
         await this.grpcUnary(this.grpcManager.client.callReject, request);
     }
     async callCancel(callId) {
-        config_js_1.log.verbose('PuppetService', 'callCancel(%s)', callId);
+        this.log.verbose('PuppetService', 'callCancel(%s)', callId);
         const request = new wechaty_grpc_1.puppet.CallCancelRequest();
         request.setCallId(callId);
         await this.grpcUnary(this.grpcManager.client.callCancel, request);
     }
     async callHangup(callId, reason) {
-        config_js_1.log.verbose('PuppetService', 'callHangup(%s, %s)', callId, reason);
+        this.log.verbose('PuppetService', 'callHangup(%s, %s)', callId, reason);
         const request = new wechaty_grpc_1.puppet.CallHangupRequest();
         request.setCallId(callId);
         if (reason !== undefined && reason !== '') {
@@ -1019,7 +1068,7 @@ class PuppetService extends PUPPET.Puppet {
         await this.grpcUnary(this.grpcManager.client.callHangup, request);
     }
     async callMediaEndpoint(callId) {
-        config_js_1.log.verbose('PuppetService', 'callMediaEndpoint(%s)', callId);
+        this.log.verbose('PuppetService', 'callMediaEndpoint(%s)', callId);
         const request = new wechaty_grpc_1.puppet.CallMediaEndpointRequest();
         request.setCallId(callId);
         const response = await util_1.default.promisify(this.grpcManager.client.callMediaEndpoint
@@ -1043,7 +1092,7 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async callRawPayload(callId) {
-        config_js_1.log.verbose('PuppetService', 'callRawPayload(%s)', callId);
+        this.log.verbose('PuppetService', 'callRawPayload(%s)', callId);
         const request = new wechaty_grpc_1.puppet.CallPayloadRequest();
         request.setId(callId);
         const response = await util_1.default.promisify(this.grpcManager.client.callPayload
@@ -1051,6 +1100,10 @@ class PuppetService extends PUPPET.Puppet {
         return response.toObject();
     }
     async callRawPayloadParser(rawPayload) {
+        // Intentionally uses the module-level `log` instead of `this.log`: the
+        // matching unit spec invokes this parser via `prototype.call({}, raw)` and
+        // never binds a real PuppetService instance. Keep this `this`-free so that
+        // contract survives the pluggable-logger migration.
         config_js_1.log.verbose('PuppetService', 'callRawPayloadParser({id:%s})', rawPayload.id);
         const media = (0, call_media_mapping_js_1.grpcCallTypeToPuppetMedia)(rawPayload.media);
         if (media === undefined) {
@@ -1074,7 +1127,7 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async messageChatHistory(messageId) {
-        config_js_1.log.verbose('PuppetService', 'messageChatHistory(%s)', messageId);
+        this.log.verbose('PuppetService', 'messageChatHistory(%s)', messageId);
         const request = new wechaty_grpc_1.puppet.MessageChatHistoryRequest();
         request.setId(messageId);
         const response = await util_1.default.promisify(this.grpcManager.client.messageChatHistory
@@ -1083,7 +1136,7 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async messageSendMiniProgram(conversationId, miniProgramPayload) {
-        config_js_1.log.verbose('PuppetService', 'messageSendMiniProgram(%s, "%s")', conversationId, JSON.stringify(miniProgramPayload));
+        this.log.verbose('PuppetService', 'messageSendMiniProgram(%s, "%s")', conversationId, JSON.stringify(miniProgramPayload));
         const request = new wechaty_grpc_1.puppet.MessageSendMiniProgramRequest();
         request.setConversationId(conversationId);
         const pbMiniProgramPayload = new wechaty_grpc_1.puppet.MiniProgramPayload();
@@ -1119,11 +1172,11 @@ class PuppetService extends PUPPET.Puppet {
          * Deprecated: will be removed after Dec 31, 2022
          */
         request.setMiniProgramDeprecated(JSON.stringify(miniProgramPayload));
-        config_js_1.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) about to call grpc`);
+        this.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageSendMiniProgram
             .bind(this.grpcManager.client))(request);
         const messageId = response.getId();
-        config_js_1.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) grpc called, messageId: ${messageId}`);
+        this.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) grpc called, messageId: ${messageId}`);
         if (messageId) {
             return messageId;
         }
@@ -1138,7 +1191,7 @@ class PuppetService extends PUPPET.Puppet {
         }
     }
     async messageSendLocation(conversationId, locationPayload) {
-        config_js_1.log.verbose('PuppetService', 'messageSendLocation(%s)', conversationId, JSON.stringify(locationPayload));
+        this.log.verbose('PuppetService', 'messageSendLocation(%s)', conversationId, JSON.stringify(locationPayload));
         const request = new wechaty_grpc_1.puppet.MessageSendLocationRequest();
         request.setConversationId(conversationId);
         const pbLocationPayload = new wechaty_grpc_1.puppet.LocationPayload();
@@ -1148,47 +1201,47 @@ class PuppetService extends PUPPET.Puppet {
         pbLocationPayload.setLongitude(locationPayload.longitude);
         pbLocationPayload.setName(locationPayload.name);
         request.setLocation(pbLocationPayload);
-        config_js_1.log.info('PuppetService', `messageSendLocation(${conversationId}, ${locationPayload.name}) about to call grpc`);
+        this.log.info('PuppetService', `messageSendLocation(${conversationId}, ${locationPayload.name}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageSendLocation
             .bind(this.grpcManager.client))(request);
         const id = response.getId();
-        config_js_1.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${locationPayload.name}) grpc called, messageId: ${id}`);
+        this.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${locationPayload.name}) grpc called, messageId: ${id}`);
         if (id) {
             return id;
         }
     }
     async messageSendChannel(conversationId, channelPayload) {
-        config_js_1.log.verbose('PuppetService', 'messageSendChannel(%s, "%s")', conversationId, JSON.stringify(channelPayload));
+        this.log.verbose('PuppetService', 'messageSendChannel(%s, "%s")', conversationId, JSON.stringify(channelPayload));
         const request = new wechaty_grpc_1.puppet.MessageSendChannelRequest();
         request.setConversationId(conversationId);
         const pbChannelPayload = (0, pb_payload_helper_js_1.channelPayloadToPb)(wechaty_grpc_1.puppet, channelPayload);
         request.setChannel(pbChannelPayload);
-        config_js_1.log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) about to call grpc`);
+        this.log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageSendChannel
             .bind(this.grpcManager.client))(request);
         const messageId = response.getId();
-        config_js_1.log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) grpc called, messageId: ${messageId}`);
+        this.log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) grpc called, messageId: ${messageId}`);
         if (messageId) {
             return messageId;
         }
     }
     async messageSendChannelCard(conversationId, channelCardPayload) {
-        config_js_1.log.verbose('PuppetService', 'messageSendChannelCard(%s, "%s")', conversationId, JSON.stringify(channelCardPayload));
+        this.log.verbose('PuppetService', 'messageSendChannelCard(%s, "%s")', conversationId, JSON.stringify(channelCardPayload));
         const request = new wechaty_grpc_1.puppet.MessageSendChannelCardRequest();
         request.setConversationId(conversationId);
         const pbChannelCardPayload = (0, pb_payload_helper_js_1.channelCardPayloadToPb)(wechaty_grpc_1.puppet, channelCardPayload);
         request.setChannelCard(pbChannelCardPayload);
-        config_js_1.log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) about to call grpc`);
+        this.log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageSendChannelCard
             .bind(this.grpcManager.client))(request);
         const messageId = response.getId();
-        config_js_1.log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) grpc called, messageId: ${messageId}`);
+        this.log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) grpc called, messageId: ${messageId}`);
         if (messageId) {
             return messageId;
         }
     }
     async messageRecall(messageId) {
-        config_js_1.log.verbose('PuppetService', 'messageRecall(%s)', messageId);
+        this.log.verbose('PuppetService', 'messageRecall(%s)', messageId);
         const request = new wechaty_grpc_1.puppet.MessageRecallRequest();
         request.setId(messageId);
         const response = await util_1.default.promisify(this.grpcManager.client.messageRecall
@@ -1196,7 +1249,7 @@ class PuppetService extends PUPPET.Puppet {
         return response.getSuccess();
     }
     async messageFile(id) {
-        config_js_1.log.verbose('PuppetService', 'messageFile(%s)', id);
+        this.log.verbose('PuppetService', 'messageFile(%s)', id);
         const request = new wechaty_grpc_1.puppet.MessageFileRequest();
         request.setId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.messageFile
@@ -1208,7 +1261,7 @@ class PuppetService extends PUPPET.Puppet {
         throw new Error(`failed to get filebox for message ${id}`);
     }
     async messageVoice(id) {
-        config_js_1.log.verbose('PuppetService', 'messageVoice(%s)', id);
+        this.log.verbose('PuppetService', 'messageVoice(%s)', id);
         const request = new wechaty_grpc_1.puppet.MessageVoiceRequest();
         request.setId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.messageVoice
@@ -1220,7 +1273,7 @@ class PuppetService extends PUPPET.Puppet {
         throw new Error(`failed to get voice filebox for message ${id}`);
     }
     async messageVoiceText(id) {
-        config_js_1.log.verbose('PuppetService', 'messageVoiceText(%s)', id);
+        this.log.verbose('PuppetService', 'messageVoiceText(%s)', id);
         const request = new wechaty_grpc_1.puppet.MessageVoiceTextRequest();
         request.setId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.messageVoiceText
@@ -1231,7 +1284,7 @@ class PuppetService extends PUPPET.Puppet {
         };
     }
     async messagePreview(id) {
-        config_js_1.log.verbose('PuppetService', 'messagePreview(%s)', id);
+        this.log.verbose('PuppetService', 'messagePreview(%s)', id);
         const request = new wechaty_grpc_1.puppet.MessagePreviewRequest();
         request.setId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.messagePreview
@@ -1243,7 +1296,7 @@ class PuppetService extends PUPPET.Puppet {
         return undefined;
     }
     async messageForward(conversationId, messageIds) {
-        config_js_1.log.verbose('PuppetService', 'messageForward(%s, %s)', conversationId, messageIds);
+        this.log.verbose('PuppetService', 'messageForward(%s, %s)', conversationId, messageIds);
         const request = new wechaty_grpc_1.puppet.MessageForwardRequest();
         request.setConversationId(conversationId);
         if (Array.isArray(messageIds)) {
@@ -1255,11 +1308,11 @@ class PuppetService extends PUPPET.Puppet {
         else {
             request.setMessageId(messageIds);
         }
-        config_js_1.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) about to call grpc`);
+        this.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageForward
             .bind(this.grpcManager.client))(request);
         const forwardedMessageId = response.getId();
-        config_js_1.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) grpc called, messageId: ${forwardedMessageId}`);
+        this.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) grpc called, messageId: ${forwardedMessageId}`);
         if (forwardedMessageId) {
             return forwardedMessageId;
         }
@@ -1274,10 +1327,10 @@ class PuppetService extends PUPPET.Puppet {
         }
     }
     async messageRawPayload(id) {
-        config_js_1.log.verbose('PuppetService', 'messageRawPayload(%s)', id);
+        this.log.verbose('PuppetService', 'messageRawPayload(%s)', id);
         // const cachedPayload = await this.payloadStore.message?.get(id)
         // if (cachedPayload) {
-        //   log.silly('PuppetService', 'messageRawPayload(%s) cache HIT', id)
+        //   this.log.silly('PuppetService', 'messageRawPayload(%s) cache HIT', id)
         //   return cachedPayload
         // }
         const request = new wechaty_grpc_1.puppet.MessagePayloadRequest();
@@ -1326,21 +1379,21 @@ class PuppetService extends PUPPET.Puppet {
                     break;
                 }
                 default:
-                    config_js_1.log.warn('PuppetService', `unknown text content type ${type}`);
+                    this.log.warn('PuppetService', `unknown text content type ${type}`);
             }
             payload.textContent?.push(contentData);
         }
-        // log.silly('PuppetService', 'messageRawPayload(%s) cache SET', id)
+        // this.log.silly('PuppetService', 'messageRawPayload(%s) cache SET', id)
         // await this.payloadStore.message?.set(id, payload)
         return payload;
     }
     async messageRawPayloadParser(payload) {
-        // log.silly('PuppetService', 'messagePayload({id:%s})', payload.id)
+        // this.log.silly('PuppetService', 'messagePayload({id:%s})', payload.id)
         // passthrough
         return payload;
     }
     async messageSendText(conversationId, text, options) {
-        config_js_1.log.verbose('PuppetService', 'messageSend(%s, %s)', conversationId, text);
+        this.log.verbose('PuppetService', 'messageSend(%s, %s)', conversationId, text);
         let mentionIdList;
         let quoteId;
         if (Array.isArray(options)) {
@@ -1359,11 +1412,11 @@ class PuppetService extends PUPPET.Puppet {
         if (typeof quoteId !== 'undefined') {
             request.setQuoteId(quoteId);
         }
-        config_js_1.log.info('PuppetService', `messageSend(${conversationId}, ${text}) about to call grpc`);
+        this.log.info('PuppetService', `messageSend(${conversationId}, ${text}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageSendText
             .bind(this.grpcManager.client))(request);
         const messageId = response.getId();
-        config_js_1.log.info('PuppetService', `messageSend(${conversationId}, ${text}) grpc called, messageId: ${messageId}`);
+        this.log.info('PuppetService', `messageSend(${conversationId}, ${text}) grpc called, messageId: ${messageId}`);
         if (messageId) {
             return messageId;
         }
@@ -1378,7 +1431,7 @@ class PuppetService extends PUPPET.Puppet {
         }
     }
     async messageBatchSendText(conversationIds, text, batchTaskId) {
-        config_js_1.log.verbose('PuppetService', 'messageBatchSendText(%s)', conversationIds.join(','));
+        this.log.verbose('PuppetService', 'messageBatchSendText(%s)', conversationIds.join(','));
         const request = new wechaty_grpc_1.puppet.MessageBatchSendTextRequest();
         request.setConversationIdsList(conversationIds);
         request.setText(text);
@@ -1389,7 +1442,7 @@ class PuppetService extends PUPPET.Puppet {
         return grpcBatchResultsToPayload(response);
     }
     async messageBatchSendFile(conversationIds, fileBox, batchTaskId) {
-        config_js_1.log.verbose('PuppetService', 'messageBatchSendFile(%s)', conversationIds.join(','));
+        this.log.verbose('PuppetService', 'messageBatchSendFile(%s)', conversationIds.join(','));
         const request = new wechaty_grpc_1.puppet.MessageBatchSendFileRequest();
         request.setConversationIdsList(conversationIds);
         request.setFileBox(await this.serializeFileBox(fileBox));
@@ -1400,7 +1453,7 @@ class PuppetService extends PUPPET.Puppet {
         return grpcBatchResultsToPayload(response);
     }
     async messageBatchForward(conversationIds, messageIds, batchTaskId) {
-        config_js_1.log.verbose('PuppetService', 'messageBatchForward(%s, %s)', conversationIds.join(','), messageIds);
+        this.log.verbose('PuppetService', 'messageBatchForward(%s, %s)', conversationIds.join(','), messageIds);
         const request = new wechaty_grpc_1.puppet.MessageBatchForwardRequest();
         request.setConversationIdsList(conversationIds);
         if (Array.isArray(messageIds)) {
@@ -1419,7 +1472,7 @@ class PuppetService extends PUPPET.Puppet {
         return grpcBatchResultsToPayload(response);
     }
     async messageBatchSendContact(conversationIds, contactId, batchTaskId) {
-        config_js_1.log.verbose('PuppetService', 'messageBatchSendContact(%s, %s)', conversationIds.join(','), contactId);
+        this.log.verbose('PuppetService', 'messageBatchSendContact(%s, %s)', conversationIds.join(','), contactId);
         const request = new wechaty_grpc_1.puppet.MessageBatchSendContactRequest();
         request.setConversationIdsList(conversationIds);
         request.setContactId(contactId);
@@ -1430,7 +1483,7 @@ class PuppetService extends PUPPET.Puppet {
         return grpcBatchResultsToPayload(response);
     }
     async messageBatchSendUrl(conversationIds, urlLinkPayload, batchTaskId) {
-        config_js_1.log.verbose('PuppetService', 'messageBatchSendUrl(%s)', conversationIds.join(','));
+        this.log.verbose('PuppetService', 'messageBatchSendUrl(%s)', conversationIds.join(','));
         const request = new wechaty_grpc_1.puppet.MessageBatchSendUrlRequest();
         request.setConversationIdsList(conversationIds);
         request.setUrlLink((0, pb_payload_helper_js_1.urlLinkPayloadToPb)(wechaty_grpc_1.puppet, urlLinkPayload));
@@ -1441,7 +1494,7 @@ class PuppetService extends PUPPET.Puppet {
         return grpcBatchResultsToPayload(response);
     }
     async messageBatchSendMiniProgram(conversationIds, miniProgramPayload, batchTaskId) {
-        config_js_1.log.verbose('PuppetService', 'messageBatchSendMiniProgram(%s)', conversationIds.join(','));
+        this.log.verbose('PuppetService', 'messageBatchSendMiniProgram(%s)', conversationIds.join(','));
         const request = new wechaty_grpc_1.puppet.MessageBatchSendMiniProgramRequest();
         request.setConversationIdsList(conversationIds);
         request.setMiniProgram((0, pb_payload_helper_js_1.miniProgramPayloadToPb)(wechaty_grpc_1.puppet, miniProgramPayload));
@@ -1452,7 +1505,7 @@ class PuppetService extends PUPPET.Puppet {
         return grpcBatchResultsToPayload(response);
     }
     async messageBatchSendLocation(conversationIds, locationPayload, batchTaskId) {
-        config_js_1.log.verbose('PuppetService', 'messageBatchSendLocation(%s)', conversationIds.join(','));
+        this.log.verbose('PuppetService', 'messageBatchSendLocation(%s)', conversationIds.join(','));
         const request = new wechaty_grpc_1.puppet.MessageBatchSendLocationRequest();
         request.setConversationIdsList(conversationIds);
         request.setLocation((0, pb_payload_helper_js_1.locationPayloadToPb)(wechaty_grpc_1.puppet, locationPayload));
@@ -1463,7 +1516,7 @@ class PuppetService extends PUPPET.Puppet {
         return grpcBatchResultsToPayload(response);
     }
     async messageBatchSendChannel(conversationIds, channelPayload, batchTaskId) {
-        config_js_1.log.verbose('PuppetService', 'messageBatchSendChannel(%s)', conversationIds.join(','));
+        this.log.verbose('PuppetService', 'messageBatchSendChannel(%s)', conversationIds.join(','));
         const request = new wechaty_grpc_1.puppet.MessageBatchSendChannelRequest();
         request.setConversationIdsList(conversationIds);
         request.setChannel((0, pb_payload_helper_js_1.channelPayloadToPb)(wechaty_grpc_1.puppet, channelPayload));
@@ -1474,7 +1527,7 @@ class PuppetService extends PUPPET.Puppet {
         return grpcBatchResultsToPayload(response);
     }
     async messageBatchSendChannelCard(conversationIds, channelCardPayload, batchTaskId) {
-        config_js_1.log.verbose('PuppetService', 'messageBatchSendChannelCard(%s)', conversationIds.join(','));
+        this.log.verbose('PuppetService', 'messageBatchSendChannelCard(%s)', conversationIds.join(','));
         const request = new wechaty_grpc_1.puppet.MessageBatchSendChannelCardRequest();
         request.setConversationIdsList(conversationIds);
         request.setChannelCard((0, pb_payload_helper_js_1.channelCardPayloadToPb)(wechaty_grpc_1.puppet, channelCardPayload));
@@ -1485,16 +1538,16 @@ class PuppetService extends PUPPET.Puppet {
         return grpcBatchResultsToPayload(response);
     }
     async messageSendFile(conversationId, fileBox) {
-        config_js_1.log.verbose('PuppetService', 'messageSendFile(%s, %s)', conversationId, fileBox);
+        this.log.verbose('PuppetService', 'messageSendFile(%s, %s)', conversationId, fileBox);
         const request = new wechaty_grpc_1.puppet.MessageSendFileRequest();
         request.setConversationId(conversationId);
         const serializedFileBox = await this.serializeFileBox(fileBox);
         request.setFileBox(serializedFileBox);
-        config_js_1.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) about to call grpc`);
+        this.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageSendFile
             .bind(this.grpcManager.client))(request);
         const messageId = response.getId();
-        config_js_1.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) grpc called, messageId: ${messageId}`);
+        this.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) grpc called, messageId: ${messageId}`);
         if (messageId) {
             return messageId;
         }
@@ -1509,15 +1562,15 @@ class PuppetService extends PUPPET.Puppet {
         }
     }
     async messageSendContact(conversationId, contactId) {
-        config_js_1.log.verbose('PuppetService', 'messageSend("%s", %s)', conversationId, contactId);
+        this.log.verbose('PuppetService', 'messageSend("%s", %s)', conversationId, contactId);
         const request = new wechaty_grpc_1.puppet.MessageSendContactRequest();
         request.setConversationId(conversationId);
         request.setContactId(contactId);
-        config_js_1.log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) about to call grpc`);
+        this.log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageSendContact
             .bind(this.grpcManager.client))(request);
         const messageId = response.getId();
-        config_js_1.log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) grpc called, messageId: ${messageId}`);
+        this.log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) grpc called, messageId: ${messageId}`);
         if (messageId) {
             return messageId;
         }
@@ -1532,7 +1585,7 @@ class PuppetService extends PUPPET.Puppet {
         }
     }
     async messageSendUrl(conversationId, urlLinkPayload) {
-        config_js_1.log.verbose('PuppetService', 'messageSendUrl("%s", %s)', conversationId, JSON.stringify(urlLinkPayload));
+        this.log.verbose('PuppetService', 'messageSendUrl("%s", %s)', conversationId, JSON.stringify(urlLinkPayload));
         const request = new wechaty_grpc_1.puppet.MessageSendUrlRequest();
         request.setConversationId(conversationId);
         const pbUrlLinkPayload = new wechaty_grpc_1.puppet.UrlLinkPayload();
@@ -1547,11 +1600,11 @@ class PuppetService extends PUPPET.Puppet {
         request.setUrlLink(pbUrlLinkPayload);
         // Deprecated: will be removed after Dec 31, 2022
         request.setUrlLinkDeprecated(JSON.stringify(urlLinkPayload));
-        config_js_1.log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) about to call grpc`);
+        this.log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageSendUrl
             .bind(this.grpcManager.client))(request);
         const messageId = response.getId();
-        config_js_1.log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) grpc called, messageId: ${messageId}`);
+        this.log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) grpc called, messageId: ${messageId}`);
         if (messageId) {
             return messageId;
         }
@@ -1566,22 +1619,22 @@ class PuppetService extends PUPPET.Puppet {
         }
     }
     async messageSendPost(conversationId, postPayload) {
-        config_js_1.log.verbose('PuppetService', 'messageSendPost("%s", %s)', conversationId, JSON.stringify(postPayload));
+        this.log.verbose('PuppetService', 'messageSendPost("%s", %s)', conversationId, JSON.stringify(postPayload));
         const request = new wechaty_grpc_1.puppet.MessageSendPostRequest();
         const post = await (0, pb_payload_helper_js_1.postPayloadToPb)(wechaty_grpc_1.puppet, postPayload, this.serializeFileBox.bind(this));
         request.setContent(post);
         request.setConversationId(conversationId);
-        config_js_1.log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) about to call grpc`);
+        this.log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) about to call grpc`);
         const response = await util_1.default.promisify(this.grpcManager.client.messageSendPost
             .bind(this.grpcManager.client))(request);
         const messageId = response.getId();
-        config_js_1.log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) grpc called, messageId: ${messageId}`);
+        this.log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) grpc called, messageId: ${messageId}`);
         if (messageId) {
             return messageId;
         }
     }
     async messageUrl(messageId) {
-        config_js_1.log.verbose('PuppetService', 'messageUrl(%s)', messageId);
+        this.log.verbose('PuppetService', 'messageUrl(%s)', messageId);
         const request = new wechaty_grpc_1.puppet.MessageUrlRequest();
         request.setId(messageId);
         const response = await util_1.default.promisify(this.grpcManager.client.messageUrl
@@ -1600,7 +1653,7 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async getMessageBroadcastTarget() {
-        config_js_1.log.verbose('PuppetService', 'getMessageBroadcastTarget()');
+        this.log.verbose('PuppetService', 'getMessageBroadcastTarget()');
         const request = new wechaty_grpc_1.puppet.GetMessageBroadcastTargetRequest();
         const response = await util_1.default.promisify(this.grpcManager.client.getMessageBroadcastTarget.bind(this.grpcManager.client))(request);
         return {
@@ -1609,7 +1662,7 @@ class PuppetService extends PUPPET.Puppet {
         };
     }
     async createMessageBroadcast(targets, content) {
-        config_js_1.log.verbose('PuppetService', 'createMessageBroadcast()');
+        this.log.verbose('PuppetService', 'createMessageBroadcast()');
         if (!PUPPET.payloads.isPostClient(content)) {
             throw new Error('can only create broadcast with client post');
         }
@@ -1621,7 +1674,7 @@ class PuppetService extends PUPPET.Puppet {
         return response.getId();
     }
     async getMessageBroadcastStatus(id) {
-        config_js_1.log.verbose('PuppetService', 'getMessageBroadcastStatus()');
+        this.log.verbose('PuppetService', 'getMessageBroadcastStatus()');
         const request = new wechaty_grpc_1.puppet.GetMessageBroadcastStatusRequest();
         request.setId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.getMessageBroadcastStatus.bind(this.grpcManager.client))(request);
@@ -1645,12 +1698,15 @@ class PuppetService extends PUPPET.Puppet {
      *
      */
     async roomRawPayload(id) {
-        config_js_1.log.verbose('PuppetService', 'roomRawPayload(%s)', id);
+        this.log.verbose('PuppetService', 'roomRawPayload(%s)', id);
         const cachedPayload = await this._payloadStore.room?.get(id);
         if (cachedPayload) {
-            config_js_1.log.silly('PuppetService', 'roomRawPayload(%s) cache HIT', id);
+            this.log.silly('PuppetService', 'roomRawPayload(%s) cache HIT', id);
             return cachedPayload;
         }
+        // Snapshot the gen before the raw fetch so a dirty that lands while
+        // the gRPC round-trip is in flight makes the write-back below stale.
+        const gen = this.cache.snapshotGen(PUPPET.types.Dirty.Room, id);
         const request = new wechaty_grpc_1.puppet.RoomPayloadRequest();
         request.setId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.roomPayload
@@ -1671,17 +1727,22 @@ class PuppetService extends PUPPET.Puppet {
         if (createTime) {
             payload.createTime = (0, timestamp_js_1.millisecondsFromTimestamp)(createTime);
         }
-        await this._payloadStore.room?.set(id, payload);
-        config_js_1.log.silly('PuppetService', 'roomRawPayload(%s) cache SET', id);
+        if (this.cache.isFreshWrite(PUPPET.types.Dirty.Room, id, gen)) {
+            await this._payloadStore.room?.set(id, payload);
+            this.log.silly('PuppetService', 'roomRawPayload(%s) cache SET', id);
+        }
+        else {
+            this.log.silly('PuppetService', 'roomRawPayload(%s) cache SET skipped: dirty landed during raw fetch', id);
+        }
         return payload;
     }
     async roomRawPayloadParser(payload) {
-        // log.silly('PuppetService', 'roomRawPayloadParser({id:%s})', payload.id)
+        // this.log.silly('PuppetService', 'roomRawPayloadParser({id:%s})', payload.id)
         // passthrough
         return payload;
     }
     async batchRoomRawPayload(roomIdList) {
-        config_js_1.log.verbose('PuppetService', 'batchRoomRawPayload(%s)', roomIdList);
+        this.log.verbose('PuppetService', 'batchRoomRawPayload(%s)', roomIdList);
         const result = new Map();
         const roomIdSet = new Set(roomIdList);
         const needGetSet = new Set();
@@ -1696,6 +1757,13 @@ class PuppetService extends PUPPET.Puppet {
         }
         if (needGetSet.size > 0) {
             try {
+                // Snapshot each id's gen before the batch fetch; write-backs below
+                // are validated per id so a dirty on one room mid-flight only skips
+                // that room's stale write, not the whole batch.
+                const genSnap = new Map();
+                for (const roomId of needGetSet) {
+                    genSnap.set(roomId, this.cache.snapshotGen(PUPPET.types.Dirty.Room, roomId));
+                }
                 const request = new wechaty_grpc_1.puppet.BatchRoomPayloadRequest();
                 request.setIdsList(Array.from(needGetSet));
                 const response = await util_1.default.promisify(this.grpcManager.client.batchRoomPayload
@@ -1720,11 +1788,16 @@ class PuppetService extends PUPPET.Puppet {
                         puppetPayload.createTime = (0, timestamp_js_1.millisecondsFromTimestamp)(createTime);
                     }
                     result.set(roomId, puppetPayload);
-                    await this._payloadStore.room?.set(roomId, puppetPayload);
+                    if (this.cache.isFreshWrite(PUPPET.types.Dirty.Room, roomId, genSnap.get(roomId) ?? 0)) {
+                        await this._payloadStore.room?.set(roomId, puppetPayload);
+                    }
+                    else {
+                        this.log.silly('PuppetService', 'batchRoomRawPayload(%s) cache SET skipped: dirty landed during raw fetch', roomId);
+                    }
                 }
             }
             catch (e) {
-                config_js_1.log.error('PuppetService', 'batchRoomRawPayload(%s, %s) error: %s, use one by one method', roomIdList, needGetSet, e);
+                this.log.error('PuppetService', 'batchRoomRawPayload(%s, %s) error: %s, use one by one method', roomIdList, needGetSet, e);
                 for (const roomId of needGetSet) {
                     const payload = await this.roomRawPayload(roomId);
                     result.set(roomId, payload);
@@ -1734,13 +1807,13 @@ class PuppetService extends PUPPET.Puppet {
         return result;
     }
     async roomList() {
-        config_js_1.log.verbose('PuppetService', 'roomList()');
+        this.log.verbose('PuppetService', 'roomList()');
         const response = await util_1.default.promisify(this.grpcManager.client.roomList
             .bind(this.grpcManager.client))(new wechaty_grpc_1.puppet.RoomListRequest());
         return response.getIdsList();
     }
     async roomDel(roomId, contactIds) {
-        config_js_1.log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactIds);
+        this.log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactIds);
         const request = new wechaty_grpc_1.puppet.RoomDelRequest();
         request.setId(roomId);
         if (Array.isArray(contactIds)) {
@@ -1756,7 +1829,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async roomDelV2(roomId, contactIds) {
-        config_js_1.log.verbose('PuppetService', 'roomDelV2(%s, %s)', roomId, contactIds);
+        this.log.verbose('PuppetService', 'roomDelV2(%s, %s)', roomId, contactIds);
         const request = new wechaty_grpc_1.puppet.RoomDelV2Request();
         request.setId(roomId);
         request.setContactIdsList(contactIds);
@@ -1769,7 +1842,7 @@ class PuppetService extends PUPPET.Puppet {
         };
     }
     async roomAvatar(roomId) {
-        config_js_1.log.verbose('PuppetService', 'roomAvatar(%s)', roomId);
+        this.log.verbose('PuppetService', 'roomAvatar(%s)', roomId);
         const request = new wechaty_grpc_1.puppet.RoomAvatarRequest();
         request.setId(roomId);
         const response = await util_1.default.promisify(this.grpcManager.client.roomAvatar
@@ -1778,7 +1851,7 @@ class PuppetService extends PUPPET.Puppet {
         return this.FileBoxUuid.fromJSON(jsonText);
     }
     async roomAdd(roomId, contactId, inviteOnly, quoteIds) {
-        config_js_1.log.verbose('PuppetService', 'roomAdd(%s, %s)', roomId, contactId);
+        this.log.verbose('PuppetService', 'roomAdd(%s, %s)', roomId, contactId);
         const request = new wechaty_grpc_1.puppet.RoomAddRequest();
         request.setId(roomId);
         if (Array.isArray(contactId)) {
@@ -1793,7 +1866,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async roomAddV2(roomId, contactIds, inviteOnly, quoteIds) {
-        config_js_1.log.verbose('PuppetService', 'roomAddV2(%s, %s)', roomId, contactIds);
+        this.log.verbose('PuppetService', 'roomAddV2(%s, %s)', roomId, contactIds);
         const request = new wechaty_grpc_1.puppet.RoomAddV2Request();
         request.setId(roomId);
         request.setContactIdsList(contactIds);
@@ -1808,7 +1881,7 @@ class PuppetService extends PUPPET.Puppet {
         };
     }
     async roomTopic(roomId, topic) {
-        config_js_1.log.verbose('PuppetService', 'roomTopic(%s, %s)', roomId, topic);
+        this.log.verbose('PuppetService', 'roomTopic(%s, %s)', roomId, topic);
         /**
          * Get
          */
@@ -1846,7 +1919,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async roomRemark(roomId, remark) {
-        config_js_1.log.verbose('PuppetService', 'roomRemark(%s)', roomId);
+        this.log.verbose('PuppetService', 'roomRemark(%s)', roomId);
         const request = new wechaty_grpc_1.puppet.RoomRemarkRequest();
         request.setId(roomId);
         request.setRemark(remark);
@@ -1854,7 +1927,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async roomCreate(contactIdList, topic) {
-        config_js_1.log.verbose('PuppetService', 'roomCreate(%s, %s)', contactIdList, topic);
+        this.log.verbose('PuppetService', 'roomCreate(%s, %s)', contactIdList, topic);
         const request = new wechaty_grpc_1.puppet.RoomCreateRequest();
         request.setContactIdsList(contactIdList);
         request.setTopic(topic);
@@ -1863,14 +1936,14 @@ class PuppetService extends PUPPET.Puppet {
         return response.getId();
     }
     async roomQuit(roomId) {
-        config_js_1.log.verbose('PuppetService', 'roomQuit(%s)', roomId);
+        this.log.verbose('PuppetService', 'roomQuit(%s)', roomId);
         const request = new wechaty_grpc_1.puppet.RoomQuitRequest();
         request.setId(roomId);
         await util_1.default.promisify(this.grpcManager.client.roomQuit
             .bind(this.grpcManager.client))(request);
     }
     async roomQRCode(roomId) {
-        config_js_1.log.verbose('PuppetService', 'roomQRCode(%s)', roomId);
+        this.log.verbose('PuppetService', 'roomQRCode(%s)', roomId);
         const request = new wechaty_grpc_1.puppet.RoomQRCodeRequest();
         request.setId(roomId);
         const response = await util_1.default.promisify(this.grpcManager.client.roomQRCode
@@ -1878,7 +1951,7 @@ class PuppetService extends PUPPET.Puppet {
         return response.getQrcode();
     }
     async roomParseDynamicQRCode(url) {
-        config_js_1.log.verbose('PuppetService', 'roomParseDynamicQRCode(%s)', url);
+        this.log.verbose('PuppetService', 'roomParseDynamicQRCode(%s)', url);
         const request = new wechaty_grpc_1.puppet.RoomParseDynamicQRCodeRequest();
         request.setUrl(url);
         const response = await util_1.default.promisify(this.grpcManager.client.roomParseDynamicQRCode
@@ -1890,7 +1963,7 @@ class PuppetService extends PUPPET.Puppet {
         };
     }
     async roomMemberList(roomId) {
-        config_js_1.log.verbose('PuppetService', 'roomMemberList(%s)', roomId);
+        this.log.verbose('PuppetService', 'roomMemberList(%s)', roomId);
         const request = new wechaty_grpc_1.puppet.RoomMemberListRequest();
         request.setId(roomId);
         const response = await util_1.default.promisify(this.grpcManager.client.roomMemberList
@@ -1898,11 +1971,17 @@ class PuppetService extends PUPPET.Puppet {
         return response.getMemberIdsList();
     }
     async roomMemberRawPayload(roomId, contactId) {
-        config_js_1.log.verbose('PuppetService', 'roomMemberRawPayload(%s, %s)', roomId, contactId);
+        this.log.verbose('PuppetService', 'roomMemberRawPayload(%s, %s)', roomId, contactId);
+        // Row-level read-modify-write: the write-back merges the fetched
+        // member into the existing row, so snapshot the room-level gen before
+        // even reading the row. A room-level dirty (bare roomId, or the
+        // room-level bump a compound RoomMember dirty triggers) that lands
+        // anywhere in this window then skips the merge write-back.
+        const roomGen = this.cache.snapshotGen(PUPPET.types.Dirty.RoomMember, roomId);
         const cachedPayload = await this._payloadStore.roomMember?.get(roomId);
         const cachedRoomMemberPayload = cachedPayload && cachedPayload[contactId];
         if (cachedRoomMemberPayload) {
-            config_js_1.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache HIT', roomId, contactId);
+            this.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache HIT', roomId, contactId);
             return cachedRoomMemberPayload;
         }
         const request = new wechaty_grpc_1.puppet.RoomMemberPayloadRequest();
@@ -1920,23 +1999,32 @@ class PuppetService extends PUPPET.Puppet {
             joinScene: response.getJoinScene(),
             joinTime: response.getJoinTime(),
         };
-        await this._payloadStore.roomMember?.set(roomId, {
-            ...cachedPayload,
-            [contactId]: payload,
-        });
-        config_js_1.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache SET', roomId, contactId);
+        if (this.cache.isFreshWrite(PUPPET.types.Dirty.RoomMember, roomId, roomGen)) {
+            await this._payloadStore.roomMember?.set(roomId, {
+                ...cachedPayload,
+                [contactId]: payload,
+            });
+            this.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache SET', roomId, contactId);
+        }
+        else {
+            this.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache SET skipped: dirty landed during raw fetch', roomId, contactId);
+        }
         return payload;
     }
     async roomMemberRawPayloadParser(payload) {
-        // log.silly('PuppetService', 'roomMemberRawPayloadParser({id:%s})', payload.id)
+        // this.log.silly('PuppetService', 'roomMemberRawPayloadParser({id:%s})', payload.id)
         // passthrough
         return payload;
     }
     async batchRoomMemberRawPayload(roomId, contactIdList) {
-        config_js_1.log.verbose('PuppetService', 'batchRoomMemberRawPayload(%s, %s)', roomId, contactIdList);
+        this.log.verbose('PuppetService', 'batchRoomMemberRawPayload(%s, %s)', roomId, contactIdList);
         const result = new Map();
         const contactIdSet = new Set(contactIdList);
         let needGetSet = new Set();
+        // Row-level read-modify-write keyed by roomId: snapshot the room-level
+        // gen before reading the row so a dirty landing anywhere in the window
+        // skips the merged write-back.
+        const roomGen = this.cache.snapshotGen(PUPPET.types.Dirty.RoomMember, roomId);
         const cachedPayload = await this._payloadStore.roomMember?.get(roomId) || {};
         if (Object.keys(cachedPayload).length > 0) {
             for (const contactId of contactIdSet) {
@@ -1966,10 +2054,15 @@ class PuppetService extends PUPPET.Puppet {
                     result.set(contactId, puppetPayload);
                     cachedPayload[contactId] = puppetPayload;
                 }
-                await this._payloadStore.roomMember?.set(roomId, cachedPayload);
+                if (this.cache.isFreshWrite(PUPPET.types.Dirty.RoomMember, roomId, roomGen)) {
+                    await this._payloadStore.roomMember?.set(roomId, cachedPayload);
+                }
+                else {
+                    this.log.silly('PuppetService', 'batchRoomMemberRawPayload(%s) cache SET skipped: dirty landed during raw fetch', roomId);
+                }
             }
             catch (e) {
-                config_js_1.log.error('PuppetService', 'batchRoomMemberRawPayload(%s, %s) error: %s, use one by one method', roomId, needGetSet, e);
+                this.log.error('PuppetService', 'batchRoomMemberRawPayload(%s, %s) error: %s, use one by one method', roomId, needGetSet, e);
                 for (const contactId of needGetSet) {
                     const payload = await this.roomMemberRawPayload(roomId, contactId);
                     result.set(contactId, payload);
@@ -1979,7 +2072,7 @@ class PuppetService extends PUPPET.Puppet {
         return result;
     }
     async roomAnnounce(roomId, text) {
-        config_js_1.log.verbose('PuppetService', 'roomAnnounce(%s%s)', roomId, typeof text === 'undefined'
+        this.log.verbose('PuppetService', 'roomAnnounce(%s%s)', roomId, typeof text === 'undefined'
             ? ''
             : `, ${text}`);
         /**
@@ -2020,14 +2113,14 @@ class PuppetService extends PUPPET.Puppet {
         return '';
     }
     async roomInvitationAccept(roomInvitationId) {
-        config_js_1.log.verbose('PuppetService', 'roomInvitationAccept(%s)', roomInvitationId);
+        this.log.verbose('PuppetService', 'roomInvitationAccept(%s)', roomInvitationId);
         const request = new wechaty_grpc_1.puppet.RoomInvitationAcceptRequest();
         request.setId(roomInvitationId);
         await util_1.default.promisify(this.grpcManager.client.roomInvitationAccept
             .bind(this.grpcManager.client))(request);
     }
     async roomInvitationAcceptByQRCode(qrcode) {
-        config_js_1.log.verbose('PuppetService', 'roomInvitationAcceptByQRCode(%s)', qrcode);
+        this.log.verbose('PuppetService', 'roomInvitationAcceptByQRCode(%s)', qrcode);
         const request = new wechaty_grpc_1.puppet.RoomInvitationAcceptByQRCodeRequest();
         request.setQrcode(qrcode);
         const response = await util_1.default.promisify(this.grpcManager.client.roomInvitationAcceptByQRCode
@@ -2038,7 +2131,7 @@ class PuppetService extends PUPPET.Puppet {
         };
     }
     async roomInvitationRawPayload(id) {
-        config_js_1.log.verbose('PuppetService', 'roomInvitationRawPayload(%s)', id);
+        this.log.verbose('PuppetService', 'roomInvitationRawPayload(%s)', id);
         const request = new wechaty_grpc_1.puppet.RoomInvitationPayloadRequest();
         request.setId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.roomInvitationPayload
@@ -2072,12 +2165,12 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async roomInvitationRawPayloadParser(payload) {
-        // log.silly('PuppetService', 'roomInvitationRawPayloadParser({id:%s})', payload.id)
+        // this.log.silly('PuppetService', 'roomInvitationRawPayloadParser({id:%s})', payload.id)
         // passthrough
         return payload;
     }
     async roomPermission(roomId, permission) {
-        config_js_1.log.verbose('PuppetService', 'roomPermission(%s, %s)', roomId, JSON.stringify(permission));
+        this.log.verbose('PuppetService', 'roomPermission(%s, %s)', roomId, JSON.stringify(permission));
         const request = new wechaty_grpc_1.puppet.RoomPermissionRequest();
         request.setId(roomId);
         let set = false;
@@ -2103,7 +2196,7 @@ class PuppetService extends PUPPET.Puppet {
         return set ? undefined : result;
     }
     async roomOwnerTransfer(roomId, contactId) {
-        config_js_1.log.verbose('PuppetService', 'roomOwnerTransfer(%s, %s)', roomId, contactId);
+        this.log.verbose('PuppetService', 'roomOwnerTransfer(%s, %s)', roomId, contactId);
         const request = new wechaty_grpc_1.puppet.RoomOwnerTransferRequest();
         request.setId(roomId);
         request.setContactId(contactId);
@@ -2111,7 +2204,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async roomAddAdmins(roomId, contactIdList) {
-        config_js_1.log.verbose('PuppetService', 'roomAddAdmins(%s, %s)', roomId, contactIdList);
+        this.log.verbose('PuppetService', 'roomAddAdmins(%s, %s)', roomId, contactIdList);
         const request = new wechaty_grpc_1.puppet.RoomAdminsRequest();
         request.setId(roomId);
         request.setContactIdsList(contactIdList);
@@ -2119,7 +2212,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async roomDelAdmins(roomId, contactIdList) {
-        config_js_1.log.verbose('PuppetService', 'roomDelAdmins(%s, %s)', roomId, contactIdList);
+        this.log.verbose('PuppetService', 'roomDelAdmins(%s, %s)', roomId, contactIdList);
         const request = new wechaty_grpc_1.puppet.RoomAdminsRequest();
         request.setId(roomId);
         request.setContactIdsList(contactIdList);
@@ -2127,7 +2220,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async roomDismiss(roomId) {
-        config_js_1.log.verbose('PuppetService', 'roomDelAdmins(%s)', roomId);
+        this.log.verbose('PuppetService', 'roomDelAdmins(%s)', roomId);
         const request = new wechaty_grpc_1.puppet.RoomDismissRequest();
         request.setId(roomId);
         await util_1.default.promisify(this.grpcManager.client.roomDismiss
@@ -2139,7 +2232,7 @@ class PuppetService extends PUPPET.Puppet {
      *
      */
     async friendshipSearchPhone(phone, type) {
-        config_js_1.log.verbose('PuppetService', 'friendshipSearchPhone(%s)', phone);
+        this.log.verbose('PuppetService', 'friendshipSearchPhone(%s)', phone);
         const request = new wechaty_grpc_1.puppet.FriendshipSearchPhoneRequest();
         request.setPhone(phone);
         if (typeof (type) === 'undefined') {
@@ -2164,7 +2257,7 @@ class PuppetService extends PUPPET.Puppet {
         return null;
     }
     async friendshipSearchHandle(handle, type) {
-        config_js_1.log.verbose('PuppetService', 'friendshipSearchHandle(%s)', handle);
+        this.log.verbose('PuppetService', 'friendshipSearchHandle(%s)', handle);
         const request = new wechaty_grpc_1.puppet.FriendshipSearchHandleRequest();
         /**
          * TODO: use `setHandle()` in v2.0.0
@@ -2193,7 +2286,7 @@ class PuppetService extends PUPPET.Puppet {
         return null;
     }
     async friendshipRawPayload(id) {
-        config_js_1.log.verbose('PuppetService', 'friendshipRawPayload(%s)', id);
+        this.log.verbose('PuppetService', 'friendshipRawPayload(%s)', id);
         const request = new wechaty_grpc_1.puppet.FriendshipPayloadRequest();
         request.setId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.friendshipPayload
@@ -2210,12 +2303,12 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async friendshipRawPayloadParser(payload) {
-        // log.silly('PuppetService', 'friendshipRawPayloadParser({id:%s})', payload.id)
+        // this.log.silly('PuppetService', 'friendshipRawPayloadParser({id:%s})', payload.id)
         // passthrough
         return payload;
     }
     async friendshipAdd(contactId, options) {
-        config_js_1.log.verbose('PuppetService', 'friendshipAdd(%s, %s)', contactId, JSON.stringify(options));
+        this.log.verbose('PuppetService', 'friendshipAdd(%s, %s)', contactId, JSON.stringify(options));
         const request = new wechaty_grpc_1.puppet.FriendshipAddRequest();
         request.setContactId(contactId);
         // FIXME: for backward compatibility, need to be removed after all puppet has updated.
@@ -2246,7 +2339,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async friendshipAccept(friendshipId) {
-        config_js_1.log.verbose('PuppetService', 'friendshipAccept(%s)', friendshipId);
+        this.log.verbose('PuppetService', 'friendshipAccept(%s)', friendshipId);
         const request = new wechaty_grpc_1.puppet.FriendshipAcceptRequest();
         request.setId(friendshipId);
         await util_1.default.promisify(this.grpcManager.client.friendshipAccept
@@ -2258,7 +2351,7 @@ class PuppetService extends PUPPET.Puppet {
      *
      */
     async tagContactTagAdd(tagIds, contactIds) {
-        config_js_1.log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', tagIds, contactIds);
+        this.log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', tagIds, contactIds);
         const request = new wechaty_grpc_1.puppet.TagContactTagAddRequest();
         request.setTagIdsList(tagIds);
         request.setContactIdsList(contactIds);
@@ -2266,7 +2359,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async tagContactTagRemove(tagIds, contactIds) {
-        config_js_1.log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', tagIds, contactIds);
+        this.log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', tagIds, contactIds);
         const request = new wechaty_grpc_1.puppet.TagContactTagRemoveRequest();
         request.setTagIdsList(tagIds);
         request.setContactIdsList(contactIds);
@@ -2274,7 +2367,7 @@ class PuppetService extends PUPPET.Puppet {
             .bind(this.grpcManager.client))(request);
     }
     async tagGroupAdd(tagGroupName) {
-        config_js_1.log.verbose('PuppetService', 'tagGroupAdd(%s)', tagGroupName);
+        this.log.verbose('PuppetService', 'tagGroupAdd(%s)', tagGroupName);
         const request = new wechaty_grpc_1.puppet.TagGroupAddRequest();
         request.setTagGroupName(tagGroupName);
         const result = await util_1.default.promisify(this.grpcManager.client.tagGroupAdd
@@ -2283,14 +2376,14 @@ class PuppetService extends PUPPET.Puppet {
         return id;
     }
     async tagGroupDelete(tagGroupId) {
-        config_js_1.log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId);
+        this.log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId);
         const request = new wechaty_grpc_1.puppet.TagGroupDeleteRequest();
         request.setTagGroupId(tagGroupId);
         await util_1.default.promisify(this.grpcManager.client.tagGroupDelete
             .bind(this.grpcManager.client))(request);
     }
     async tagTagAdd(tagNameList, tagGroupId) {
-        config_js_1.log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagNameList, tagGroupId);
+        this.log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagNameList, tagGroupId);
         const request = new wechaty_grpc_1.puppet.TagTagAddRequest();
         if (typeof tagGroupId !== 'undefined') {
             request.setTagGroupId(tagGroupId);
@@ -2305,14 +2398,14 @@ class PuppetService extends PUPPET.Puppet {
         return tagInfoList;
     }
     async tagTagDelete(tagIdList) {
-        config_js_1.log.verbose('PuppetService', 'tagTagDelete(%s)', tagIdList);
+        this.log.verbose('PuppetService', 'tagTagDelete(%s)', tagIdList);
         const request = new wechaty_grpc_1.puppet.TagTagDeleteRequest();
         request.setTagIdList(tagIdList);
         await util_1.default.promisify(this.grpcManager.client.tagTagDelete
             .bind(this.grpcManager.client))(request);
     }
     async tagTagModify(tagNewInfoList) {
-        config_js_1.log.verbose('PuppetService', 'tagTagModify(%o)', tagNewInfoList);
+        this.log.verbose('PuppetService', 'tagTagModify(%o)', tagNewInfoList);
         const request = new wechaty_grpc_1.puppet.TagTagModifyRequest();
         const newInfoList = tagNewInfoList.map(i => {
             const tagInfo = new wechaty_grpc_1.puppet.TagTagInfo();
@@ -2330,7 +2423,7 @@ class PuppetService extends PUPPET.Puppet {
         return tagInfoList;
     }
     async tagGroupList() {
-        config_js_1.log.verbose('PuppetService', 'tagGroupList()');
+        this.log.verbose('PuppetService', 'tagGroupList()');
         const request = new wechaty_grpc_1.puppet.TagGroupListRequest();
         const result = await util_1.default.promisify(this.grpcManager.client.tagGroupList
             .bind(this.grpcManager.client))(request);
@@ -2338,7 +2431,7 @@ class PuppetService extends PUPPET.Puppet {
         return groupIds;
     }
     async tagGroupTagList(tagGroupId) {
-        config_js_1.log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId);
+        this.log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId);
         const request = new wechaty_grpc_1.puppet.TagGroupTagListRequest();
         if (typeof tagGroupId !== 'undefined') {
             request.setTagGroupId(tagGroupId);
@@ -2349,7 +2442,7 @@ class PuppetService extends PUPPET.Puppet {
         return tagIds;
     }
     async tagTagList() {
-        config_js_1.log.verbose('PuppetService', 'tagTagList()');
+        this.log.verbose('PuppetService', 'tagTagList()');
         const request = new wechaty_grpc_1.puppet.TagTagListRequest();
         const result = await util_1.default.promisify(this.grpcManager.client.tagTagList
             .bind(this.grpcManager.client))(request);
@@ -2357,7 +2450,7 @@ class PuppetService extends PUPPET.Puppet {
         return tagIds;
     }
     async tagContactTagList(contactId) {
-        config_js_1.log.verbose('PuppetService', 'tagContactTagList(%s)', contactId);
+        this.log.verbose('PuppetService', 'tagContactTagList(%s)', contactId);
         const request = new wechaty_grpc_1.puppet.TagContactTagListRequest();
         request.setContactId(contactId);
         const result = await util_1.default.promisify(this.grpcManager.client.tagContactTagList
@@ -2366,7 +2459,7 @@ class PuppetService extends PUPPET.Puppet {
         return tagIds;
     }
     async tagTagContactList(tagId) {
-        config_js_1.log.verbose('PuppetService', 'tagTagContactList(%s)', tagId);
+        this.log.verbose('PuppetService', 'tagTagContactList(%s)', tagId);
         const request = new wechaty_grpc_1.puppet.TagTagContactListRequest();
         request.setTagId(tagId);
         const result = await util_1.default.promisify(this.grpcManager.client.tagTagContactList
@@ -2375,12 +2468,15 @@ class PuppetService extends PUPPET.Puppet {
         return contactIds;
     }
     async tagGroupPayloadPuppet(id) {
-        config_js_1.log.verbose('PuppetService', 'tagGroupPayload(%s)', id);
+        this.log.verbose('PuppetService', 'tagGroupPayload(%s)', id);
         const cachedPayload = await this._payloadStore.tagGroup?.get(id);
         if (cachedPayload) {
-            config_js_1.log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id);
+            this.log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id);
             return cachedPayload;
         }
+        // Snapshot the gen before the raw fetch so a dirty that lands while
+        // the gRPC round-trip is in flight makes the write-back below stale.
+        const gen = this.cache.snapshotGen(PUPPET.types.Dirty.TagGroup, id);
         const request = new wechaty_grpc_1.puppet.TagGroupPayloadRequest();
         request.setGroupId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.tagGroupPayload
@@ -2394,17 +2490,25 @@ class PuppetService extends PUPPET.Puppet {
             name: grpcPayload.getName(),
             type: grpcPayload.getType(),
         };
-        await this._payloadStore.tagGroup?.set(id, payload);
-        config_js_1.log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id);
+        if (this.cache.isFreshWrite(PUPPET.types.Dirty.TagGroup, id, gen)) {
+            await this._payloadStore.tagGroup?.set(id, payload);
+            this.log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id);
+        }
+        else {
+            this.log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET skipped: dirty landed during raw fetch', id);
+        }
         return payload;
     }
     async tagPayloadPuppet(tagId) {
-        config_js_1.log.verbose('PuppetService', 'tagPayloadPuppet(%s)', tagId);
+        this.log.verbose('PuppetService', 'tagPayloadPuppet(%s)', tagId);
         const cachedPayload = await this._payloadStore.tag?.get(tagId);
         if (cachedPayload) {
-            config_js_1.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tagId);
+            this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tagId);
             return cachedPayload;
         }
+        // Snapshot the gen before the raw fetch so a dirty that lands while
+        // the gRPC round-trip is in flight makes the write-back below stale.
+        const gen = this.cache.snapshotGen(PUPPET.types.Dirty.Tag, tagId);
         const request = new wechaty_grpc_1.puppet.TagPayloadRequest();
         request.setTagId(tagId);
         const response = await util_1.default.promisify(this.grpcManager.client.tagPayload
@@ -2419,8 +2523,13 @@ class PuppetService extends PUPPET.Puppet {
             groupId: grpcPayload.getGroupId(),
             type: grpcPayload.getType(),
         };
-        await this._payloadStore.tag?.set(tagId, payload);
-        config_js_1.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', tagId);
+        if (this.cache.isFreshWrite(PUPPET.types.Dirty.Tag, tagId, gen)) {
+            await this._payloadStore.tag?.set(tagId, payload);
+            this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', tagId);
+        }
+        else {
+            this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET skipped: dirty landed during raw fetch', tagId);
+        }
         return payload;
     }
     /**
@@ -2429,7 +2538,7 @@ class PuppetService extends PUPPET.Puppet {
      *
      */
     async postPublish(payload) {
-        config_js_1.log.verbose('PuppetService', 'postPublish(%s)', payload);
+        this.log.verbose('PuppetService', 'postPublish(%s)', payload);
         if (!PUPPET.payloads.isPostClient(payload)) {
             throw new Error('can only publish client post now');
         }
@@ -2442,13 +2551,13 @@ class PuppetService extends PUPPET.Puppet {
         return momentId;
     }
     async postUnpublish(id) {
-        config_js_1.log.verbose('PuppetService', 'postUnpublish(%s)', id);
+        this.log.verbose('PuppetService', 'postUnpublish(%s)', id);
         const request = new wechaty_grpc_1.puppet.MomentUnpublishRequest();
         request.setMomentId(id);
         await util_1.default.promisify(this.grpcManager.client.momentUnpublish.bind(this.grpcManager.client))(request);
     }
     async momentSignature(text) {
-        config_js_1.log.verbose('PuppetService', 'momentSignature(%s)', text);
+        this.log.verbose('PuppetService', 'momentSignature(%s)', text);
         const request = new wechaty_grpc_1.puppet.MomentSignatureRequest();
         if (text) {
             request.setText(text);
@@ -2459,7 +2568,7 @@ class PuppetService extends PUPPET.Puppet {
         return signature;
     }
     async momentCoverage(cover) {
-        config_js_1.log.verbose('PuppetService', 'momentCoverage(%s)', JSON.stringify(cover));
+        this.log.verbose('PuppetService', 'momentCoverage(%s)', JSON.stringify(cover));
         const request = new wechaty_grpc_1.puppet.MomentCoverageRequest();
         if (cover) {
             const serializedFileBox = await this.serializeFileBox(cover);
@@ -2473,7 +2582,7 @@ class PuppetService extends PUPPET.Puppet {
         }
     }
     async postPayloadSayable(postId, sayableId) {
-        config_js_1.log.verbose('PuppetService', 'postPayloadSayable(%s, %s)', postId, sayableId);
+        this.log.verbose('PuppetService', 'postPayloadSayable(%s, %s)', postId, sayableId);
         const request = new wechaty_grpc_1.puppet.PostPayloadSayableRequest();
         request.setPostId(postId);
         request.setSayableId(sayableId);
@@ -2525,7 +2634,7 @@ class PuppetService extends PUPPET.Puppet {
         }
     }
     async postRawPayload(id) {
-        config_js_1.log.verbose('PuppetService', 'postRawPayload(%s)', id);
+        this.log.verbose('PuppetService', 'postRawPayload(%s)', id);
         const request = new wechaty_grpc_1.puppet.PostPayloadRequest();
         request.setPostId(id);
         const response = await util_1.default.promisify(this.grpcManager.client.postPayload
@@ -2569,12 +2678,12 @@ class PuppetService extends PUPPET.Puppet {
         return payload;
     }
     async postRawPayloadParser(payload) {
-        // log.silly('PuppetService', 'postRawPayloadParser({id:%s})', payload.id)
+        // this.log.silly('PuppetService', 'postRawPayloadParser({id:%s})', payload.id)
         // passthrough
         return payload;
     }
     async tap(postId, type, tap = true) {
-        config_js_1.log.verbose('PuppetService', 'tap(%s, %s, %s)', postId, type, tap);
+        this.log.verbose('PuppetService', 'tap(%s, %s, %s)', postId, type, tap);
         const request = new wechaty_grpc_1.puppet.PostTapRequest();
         request.setPostId(postId);
         if (type) {
@@ -2587,14 +2696,14 @@ class PuppetService extends PUPPET.Puppet {
         return result;
     }
     async momentVisibleList() {
-        config_js_1.log.verbose('PuppetService', 'momentVisibleList()');
+        this.log.verbose('PuppetService', 'momentVisibleList()');
         const request = new wechaty_grpc_1.puppet.MomentVisibleListRequest();
         const response = await util_1.default.promisify(this.grpcManager.client.momentVisibleList.bind(this.grpcManager.client))(request);
         const contactIdsList = response.getContactIdsList();
         return contactIdsList;
     }
     async getContactExternalUserId(contactIds, serviceProviderId) {
-        config_js_1.log.verbose('PuppetService', 'getContactExternalUserId(%s, %s)', JSON.stringify(contactIds), serviceProviderId);
+        this.log.verbose('PuppetService', 'getContactExternalUserId(%s, %s)', JSON.stringify(contactIds), serviceProviderId);
         const request = new wechaty_grpc_1.puppet.GetContactExternalUserIdRequest();
         request.setContactIdsList(contactIds);
         if (serviceProviderId) {
@@ -2612,7 +2721,7 @@ class PuppetService extends PUPPET.Puppet {
         return result;
     }
     async getRoomAntiSpamStrategyList() {
-        config_js_1.log.verbose('PuppetService', 'getRoomAntiSpamStrategyList()');
+        this.log.verbose('PuppetService', 'getRoomAntiSpamStrategyList()');
         const request = new wechaty_grpc_1.puppet.GetRoomAntiSpamStrategyListRequest();
         const response = await util_1.default.promisify(this.grpcManager.client.getRoomAntiSpamStrategyList.bind(this.grpcManager.client))(request);
         const result = [];
@@ -2626,7 +2735,7 @@ class PuppetService extends PUPPET.Puppet {
         return result;
     }
     async getRoomAntiSpamStrategyEffectRoomList(strategyId) {
-        config_js_1.log.verbose('PuppetService', 'getRoomAntiSpamStrategyEffectRoomList(%s)', strategyId);
+        this.log.verbose('PuppetService', 'getRoomAntiSpamStrategyEffectRoomList(%s)', strategyId);
         const request = new wechaty_grpc_1.puppet.GetRoomAntiSpamStrategyEffectRoomListRequest();
         request.setStrategyId(strategyId);
         const response = await util_1.default.promisify(this.grpcManager.client.getRoomAntiSpamStrategyEffectRoomList.bind(this.grpcManager.client))(request);
@@ -2634,7 +2743,7 @@ class PuppetService extends PUPPET.Puppet {
         return result;
     }
     async applyRoomAntiSpamStrategy(strategyId, roomIds, active) {
-        config_js_1.log.verbose('PuppetService', 'applyRoomAntiSpamStrategy(%s, %s, %s)', strategyId, roomIds, active);
+        this.log.verbose('PuppetService', 'applyRoomAntiSpamStrategy(%s, %s, %s)', strategyId, roomIds, active);
         const request = new wechaty_grpc_1.puppet.ApplyRoomAntiSpamStrategyRequest();
         request.setStrategyId(strategyId);
         request.setRoomIdsList(roomIds);
@@ -2642,7 +2751,7 @@ class PuppetService extends PUPPET.Puppet {
         await util_1.default.promisify(this.grpcManager.client.applyRoomAntiSpamStrategy.bind(this.grpcManager.client))(request);
     }
     async getCorpMessageInterceptionStrategies() {
-        config_js_1.log.verbose('PuppetService', 'getCorpMessageInterceptionStrategies()');
+        this.log.verbose('PuppetService', 'getCorpMessageInterceptionStrategies()');
         const request = new wechaty_grpc_1.puppet.GetCorpMessageInterceptionStrategiesRequest();
         const response = await util_1.default.promisify(this.grpcManager.client.getCorpMessageInterceptionStrategies.bind(this.grpcManager.client))(request);
         const result = [];
@@ -2675,15 +2784,15 @@ class PuppetService extends PUPPET.Puppet {
     reconnectIndicator;
     async reset() {
         if (!this._grpcManager) {
-            config_js_1.log.warn('PuppetService', 'grpc manager not constructed, perform regular reset');
+            this.log.warn('PuppetService', 'grpc manager not constructed, perform regular reset');
             return super.reset();
         }
         if (!this.isLoggedIn) {
-            config_js_1.log.warn('PuppetService', 'puppet not logged in, perform regular reset');
+            this.log.warn('PuppetService', 'puppet not logged in, perform regular reset');
             return super.reset();
         }
         if (this.reconnectIndicator.value()) {
-            config_js_1.log.warn('PuppetService', 'already trying to reconnect, pass this one');
+            this.log.warn('PuppetService', 'already trying to reconnect, pass this one');
             return;
         }
         this.reconnectIndicator.value(true);
@@ -2733,13 +2842,13 @@ class PuppetService extends PUPPET.Puppet {
             }
             catch (e) {
                 if (Date.now() - startTime < timeoutMilliseconds) {
-                    config_js_1.log.warn('failed to start stream, will try again in 15 seconds');
+                    this.log.warn('failed to start stream, will try again in 15 seconds');
                     await new Promise(resolve => {
                         setTimeout(resolve, 5000);
                     });
                 }
                 else {
-                    config_js_1.log.warn('failed to start stream and reaches timeout, will perform regular reset');
+                    this.log.warn('failed to start stream and reaches timeout, will perform regular reset');
                     this.reconnectIndicator.value(false);
                     return super.reset();
                 }
@@ -2756,7 +2865,7 @@ class PuppetService extends PUPPET.Puppet {
             });
         }
         catch (e) {
-            config_js_1.log.warn('PuppetService', 'waiting for event reset login error, will perform regular reset');
+            this.log.warn('PuppetService', 'waiting for event reset login error, will perform regular reset');
             return super.reset();
         }
         try {
@@ -2767,7 +2876,7 @@ class PuppetService extends PUPPET.Puppet {
             });
         }
         catch (e) {
-            config_js_1.log.warn('PuppetService', 'waiting for event reset ready error, will do nothing');
+            this.log.warn('PuppetService', 'waiting for event reset ready error, will do nothing');
         }
     }
     async getMiscellaneousStoreData() {
@@ -2781,7 +2890,7 @@ class PuppetService extends PUPPET.Puppet {
         const lastEventTimestamp = await this._payloadStore.miscellaneous?.get('lastEventTimestamp');
         let lastEventSeq = await this._payloadStore.miscellaneous?.get('lastEventSeq');
         if ((Date.now() - Number(lastEventTimestamp || 0)) > this.timeoutMilliseconds) {
-            config_js_1.log.warn(`last event was ${(Date.now() - Number(lastEventTimestamp || 0)) / 1000} seconds ago, will not request event cache`);
+            this.log.warn(`last event was ${(Date.now() - Number(lastEventTimestamp || 0)) / 1000} seconds ago, will not request event cache`);
             lastEventSeq = undefined;
         }
         const accountId = await this._payloadStore.miscellaneous?.get('accountId');