@juzi/wechaty-puppet-service 1.0.122 → 1.0.124

package/dist/esm/tests/fast-dirty-room-member.spec.js

@@ -1,19 +1,24 @@
 #!/usr/bin/env -S node --no-warnings --loader ts-node/esm
 /**
- * Regression test for the RoomMember persistent-store dirty bug.
+ * Regression tests for the RoomMember persistent-store dirty semantics.
  *
- * The puppet-side cache mixin already knows that RoomMember dirty ids are
- * sometimes a compound `"<roomId><memberId>"` (using STRING_SPLITTER)
- * and splits the id before deleting from the in-memory LRU
- * (wechaty-puppet/src/mixins/cache-mixin.ts).
+ * The persistent `PayloadStore.roomMember` is a
+ * `FlashStore<roomId, {[memberId]: RoomMember}>` -- a per-room record of
+ * members. Dirty ids arrive in two shapes:
  *
- * However the client-side `fastDirty` here passes the raw id straight to
- * `PayloadStore.roomMember.delete`. The persistent FlashStore is keyed by
- * roomId only, so the delete silently no-ops and the stale entry survives
- * across process restarts.
+ *   1. A compound `"<roomId><STRING_SPLITTER><memberId>"` -- a single
+ *      member's payload went stale (e.g. one member renamed).
+ *   2. A bare `"<roomId>"` -- the whole room's member set went stale.
  *
- * This test populates the store, fires the dirty path with a compound id,
- * and asserts the entry is gone.
+ * The previous handler treated both shapes the same by calling
+ * `roomMember.delete(roomId)`, which threw away the entire room's
+ * cache even when only one member was dirty. That thrash forces the
+ * next N-1 members to re-fetch over gRPC.
+ *
+ * The new handler must:
+ *   - On compound id: drop only the named member, keep the rest.
+ *   - On compound id whose split leaves the record empty: delete the row.
+ *   - On bare roomId: delete the entire row (as before).
  */
 import { test } from 'tstest';
 import os from 'os';
@@ -21,29 +26,126 @@ import path from 'path';
 import fs from 'fs';
 import * as PUPPET from '@juzi/wechaty-puppet';
 import { PuppetService } from '../src/mod.js';
-test('fastDirty(RoomMember, "<roomId>\\u001F<memberId>") must clear the room entry', async (t) => {
+const makePuppet = async () => {
     const token = `puppet_service_test_${Date.now()}_${Math.floor(Math.random() * 1e6)}`;
     const puppet = new PuppetService({ token });
     const accountId = 'acct-test';
     await puppet._payloadStore.start(accountId);
+    return { puppet, token };
+};
+const cleanup = async (puppet, token) => {
+    await puppet._payloadStore.stop();
+    try {
+        await fs.promises.rm(path.join(os.homedir(), '.wechaty', 'wechaty-puppet-service', token), { recursive: true, force: true });
+    }
+    catch (_) { /* ignore */ }
+};
+test('fastDirty(RoomMember, "<roomId>\\u001F<memberId>") drops only the named member', async (t) => {
+    const { puppet, token } = await makePuppet();
     const roomId = 'room-test-id';
     await puppet._payloadStore.roomMember.set(roomId, {
         'member-A': { id: 'member-A', name: 'A' },
         'member-B': { id: 'member-B', name: 'B' },
     });
-    const before = await puppet._payloadStore.roomMember.get(roomId);
-    t.ok(before, 'sanity: roomMember entry exists before dirty');
     await puppet.fastDirty({
         payloadType: PUPPET.types.Dirty.RoomMember,
         payloadId: `${roomId}${PUPPET.STRING_SPLITTER}member-A`,
     });
     const after = await puppet._payloadStore.roomMember.get(roomId);
-    t.notOk(after, 'roomMember entry must be cleared after compound-id dirty');
-    await puppet._payloadStore.stop();
-    // best-effort cleanup of the on-disk store dir
-    try {
-        await fs.promises.rm(path.join(os.homedir(), '.wechaty', 'wechaty-puppet-service', token), { recursive: true, force: true });
-    }
-    catch (_) { /* ignore */ }
+    t.ok(after, 'room entry must survive when only one member is dirtied');
+    t.notOk(after && after['member-A'], 'dirtied member-A must be gone');
+    t.ok(after && after['member-B'], 'unrelated member-B must be preserved');
+    await cleanup(puppet, token);
+});
+test('fastDirty(RoomMember, "<roomId>\\u001F<lastMember>") deletes the row when empty', async (t) => {
+    const { puppet, token } = await makePuppet();
+    const roomId = 'room-test-id-lone';
+    await puppet._payloadStore.roomMember.set(roomId, {
+        'only-member': { id: 'only-member', name: 'Solo' },
+    });
+    await puppet.fastDirty({
+        payloadType: PUPPET.types.Dirty.RoomMember,
+        payloadId: `${roomId}${PUPPET.STRING_SPLITTER}only-member`,
+    });
+    const after = await puppet._payloadStore.roomMember.get(roomId);
+    t.notOk(after, 'row must be deleted once the record has no members left');
+    await cleanup(puppet, token);
+});
+test('fastDirty(RoomMember, "<roomId>") clears the whole room entry', async (t) => {
+    const { puppet, token } = await makePuppet();
+    const roomId = 'room-test-id-full';
+    await puppet._payloadStore.roomMember.set(roomId, {
+        'member-A': { id: 'member-A', name: 'A' },
+        'member-B': { id: 'member-B', name: 'B' },
+    });
+    await puppet.fastDirty({
+        payloadType: PUPPET.types.Dirty.RoomMember,
+        payloadId: roomId,
+    });
+    const after = await puppet._payloadStore.roomMember.get(roomId);
+    t.notOk(after, 'bare roomId dirty must clear the whole row');
+    await cleanup(puppet, token);
+});
+test('fastDirty(RoomMember) on unknown member is a no-op', async (t) => {
+    const { puppet, token } = await makePuppet();
+    const roomId = 'room-test-id-noop';
+    const before = {
+        'member-A': { id: 'member-A', name: 'A' },
+        'member-B': { id: 'member-B', name: 'B' },
+    };
+    await puppet._payloadStore.roomMember.set(roomId, before);
+    await puppet.fastDirty({
+        payloadType: PUPPET.types.Dirty.RoomMember,
+        payloadId: `${roomId}${PUPPET.STRING_SPLITTER}ghost-member`,
+    });
+    const after = await puppet._payloadStore.roomMember.get(roomId);
+    t.same(after, before, 'unrelated dirty must not disturb the record');
+    await cleanup(puppet, token);
+});
+test('fastDirty(RoomMember) concurrent compound dirties on same roomId drop every named member', async (t) => {
+    const { puppet, token } = await makePuppet();
+    const roomId = 'room-test-id-race';
+    await puppet._payloadStore.roomMember.set(roomId, {
+        'member-A': { id: 'member-A', name: 'A' },
+        'member-B': { id: 'member-B', name: 'B' },
+    });
+    // Fire both compound dirties without awaiting between them so their
+    // `get → mutate → set` cycles interleave. Without per-roomId
+    // serialization, both reads would see {A, B}, both writes would keep
+    // one sibling, and one of the two deletes would be lost.
+    await Promise.all([
+        puppet.fastDirty({
+            payloadType: PUPPET.types.Dirty.RoomMember,
+            payloadId: `${roomId}${PUPPET.STRING_SPLITTER}member-A`,
+        }),
+        puppet.fastDirty({
+            payloadType: PUPPET.types.Dirty.RoomMember,
+            payloadId: `${roomId}${PUPPET.STRING_SPLITTER}member-B`,
+        }),
+    ]);
+    const after = await puppet._payloadStore.roomMember.get(roomId);
+    // Either the whole row is gone (last shrink deleted it) or the record
+    // is empty. Both are acceptable "no members left" observations.
+    const noMembersLeft = !after || Object.keys(after).length === 0;
+    t.ok(noMembersLeft, `both dirtied members must be evicted, got: ${JSON.stringify(after)}`);
+    await cleanup(puppet, token);
+});
+test('fastDirty(RoomMember) prototype-key member id must not match a real member', async (t) => {
+    const { puppet, token } = await makePuppet();
+    const roomId = 'room-test-id-proto';
+    const before = {
+        'member-A': { id: 'member-A', name: 'A' },
+    };
+    await puppet._payloadStore.roomMember.set(roomId, before);
+    // `toString` exists on Object.prototype; a naive `memberId in current`
+    // check would match it and take the mutate branch. The correct guard
+    // uses hasOwnProperty and treats this as an unknown member.
+    await puppet.fastDirty({
+        payloadType: PUPPET.types.Dirty.RoomMember,
+        payloadId: `${roomId}${PUPPET.STRING_SPLITTER}toString`,
+    });
+    const after = await puppet._payloadStore.roomMember.get(roomId);
+    t.same(after, before, 'prototype-key dirty must be a no-op');
+    await cleanup(puppet, token);
 });
 //# sourceMappingURL=fast-dirty-room-member.spec.js.map

package/dist/esm/tests/fast-dirty-room-member.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"fast-dirty-room-member.spec.js","sourceRoot":"","sources":["../../../tests/fast-dirty-room-member.spec.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE7C,IAAI,CAAC,8EAA8E,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC7F,MAAM,KAAK,GAAG,uBAAuB,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAA;IACpF,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAE,KAAK,EAAE,CAAQ,CAAA;IAElD,MAAM,SAAS,GAAG,WAAW,CAAA;IAC7B,MAAM,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAE3C,MAAM,MAAM,GAAG,cAAc,CAAA;IAC7B,MAAM,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE;QAChD,UAAU,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAS;QAChD,UAAU,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAS;KACjD,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAChE,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,8CAA8C,CAAC,CAAA;IAE5D,MAAM,MAAM,CAAC,SAAS,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU;QAC1C,SAAS,EAAI,GAAG,MAAM,GAAG,MAAM,CAAC,eAAe,UAAU;KAC1D,CAAC,CAAA;IAEF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC/D,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,0DAA0D,CAAC,CAAA;IAE1E,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,CAAA;IAEjC,+CAA+C;IAC/C,IAAI;QACF,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAClB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,wBAAwB,EAAE,KAAK,CAAC,EACpE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CACjC,CAAA;KACF;IAAC,OAAO,CAAC,EAAE,EAAE,YAAY,EAAE;AAC9B,CAAC,CAAC,CAAA"}
+{"version":3,"file":"fast-dirty-room-member.spec.js","sourceRoot":"","sources":["../../../tests/fast-dirty-room-member.spec.ts"],"names":[],"mappings":"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"}

package/dist/esm/tests/grpc-stream-dirty-order.spec.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env -S node --no-warnings --loader ts-node/esm
+export {};
+//# sourceMappingURL=grpc-stream-dirty-order.spec.d.ts.map

package/dist/esm/tests/grpc-stream-dirty-order.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grpc-stream-dirty-order.spec.d.ts","sourceRoot":"","sources":["../../../tests/grpc-stream-dirty-order.spec.ts"],"names":[],"mappings":""}

package/dist/esm/tests/grpc-stream-dirty-order.spec.js

@@ -0,0 +1,110 @@
+#!/usr/bin/env -S node --no-warnings --loader ts-node/esm
+/**
+ * Regression / hardening test for the EVENT_TYPE_DIRTY dispatch order.
+ *
+ * Client-side dirty handling touches two independent caches:
+ *
+ *   - `fastDirty()` clears `_payloadStore` (FlashStore, on disk, async).
+ *   - `emit('dirty')` triggers the puppet-side CacheMixin which clears
+ *     the in-memory LRU synchronously in the same tick.
+ *
+ * If `emit('dirty')` runs before `fastDirty()` resolves, a listener that
+ * immediately reads back the payload -- as CacheMixin.onDirty does when
+ * a caller races with the dirty event -- can:
+ *
+ *   1. See an LRU miss (already cleared),
+ *   2. Refetch via `contactRawPayload` etc.,
+ *   3. Hit the still-un-cleared `_payloadStore` entry,
+ *   4. Repopulate the LRU with the stale row that fastDirty is about
+ *      to delete a microtask later,
+ *   5. And the fresh fastDirty delete no-ops against a now-cold key.
+ *
+ * The current implementation `await`s fastDirty before emitting. This
+ * test pins that invariant: fastDirty must fully resolve before any
+ * `dirty` listener observes the event.
+ */
+import { test, sinon } from 'tstest';
+import * as PUPPET from '@juzi/wechaty-puppet';
+import { puppet as grpcPuppet } from '@juzi/wechaty-grpc';
+import { PuppetService } from '../src/mod.js';
+test('onGrpcStreamEvent awaits fastDirty before emitting dirty', async (t) => {
+    const token = `puppet_service_test_${Date.now()}_${Math.floor(Math.random() * 1e6)}`;
+    const puppet = new PuppetService({ token });
+    let fastDirtyResolvedAt;
+    let dirtyEmittedAt;
+    const FASTDIRTY_DELAY_MS = 50;
+    puppet.fastDirty = async (_payload) => {
+        await new Promise(resolve => setTimeout(resolve, FASTDIRTY_DELAY_MS));
+        fastDirtyResolvedAt = Date.now();
+    };
+    puppet.on('dirty', () => {
+        dirtyEmittedAt = Date.now();
+    });
+    const dirtyJson = JSON.stringify({
+        payloadType: PUPPET.types.Dirty.Contact,
+        payloadId: 'contact-x',
+    });
+    const fakeEvent = {
+        getType: () => grpcPuppet.EventType.EVENT_TYPE_DIRTY,
+        getPayload: () => dirtyJson,
+        getSeq: () => 0,
+    };
+    await puppet.onGrpcStreamEvent(fakeEvent);
+    t.ok(fastDirtyResolvedAt, 'fastDirty must have been invoked');
+    t.ok(dirtyEmittedAt, 'dirty listener must have been invoked');
+    t.ok(fastDirtyResolvedAt <= dirtyEmittedAt, `dirty emit (${dirtyEmittedAt}) must not precede fastDirty resolve (${fastDirtyResolvedAt})`);
+});
+test('onGrpcStreamEvent: dirty emit sequence-number is strictly after every fastDirty resolution', async (t) => {
+    // Wall-clock ordering (the baseline test above) is fine as a smoke
+    // signal but can collapse to a tie when both boundaries fall inside
+    // the same millisecond. The invariant we actually care about is
+    // *causal*: each fastDirty must have fully resolved before the
+    // corresponding dirty emit fires. Record call ordinals from a shared
+    // monotonic counter to pin that -- ordinals cannot tie.
+    const token = `puppet_service_test_${Date.now()}_${Math.floor(Math.random() * 1e6)}`;
+    const puppet = new PuppetService({ token });
+    let sequence = 0;
+    const nextOrdinal = () => ++sequence;
+    // Order of interest per event: fastDirty enter -> fastDirty resolve -> dirty emit.
+    const fastDirtyEnterOrdinals = [];
+    const fastDirtyResolveOrdinals = [];
+    const dirtyEmitOrdinals = [];
+    const fastDirtyStub = sinon.stub().callsFake(async (_payload) => {
+        fastDirtyEnterOrdinals.push(nextOrdinal());
+        // Yield the microtask queue so a broken ordering would surface: if
+        // emit ran ahead of the await point below, its ordinal would slot
+        // between our enter and resolve records.
+        await new Promise(resolve => setImmediate(resolve));
+        fastDirtyResolveOrdinals.push(nextOrdinal());
+    });
+    puppet.fastDirty = fastDirtyStub;
+    const dirtySpy = sinon.spy(() => {
+        dirtyEmitOrdinals.push(nextOrdinal());
+    });
+    puppet.on('dirty', dirtySpy);
+    const makeEvent = (payloadId) => {
+        const dirtyJson = JSON.stringify({
+            payloadType: PUPPET.types.Dirty.Contact,
+            payloadId,
+        });
+        return {
+            getType: () => grpcPuppet.EventType.EVENT_TYPE_DIRTY,
+            getPayload: () => dirtyJson,
+            getSeq: () => 0,
+        };
+    };
+    // Two back-to-back dirty events: this is the scenario Fix #6 pins,
+    // sequential await must hold across both.
+    await puppet.onGrpcStreamEvent(makeEvent('contact-1'));
+    await puppet.onGrpcStreamEvent(makeEvent('contact-2'));
+    t.equal(fastDirtyStub.callCount, 2, 'fastDirty invoked once per dirty event');
+    t.equal(dirtySpy.callCount, 2, 'dirty listener invoked once per dirty event');
+    t.equal(fastDirtyEnterOrdinals.length, 2, 'both fastDirty invocations recorded an entry ordinal');
+    t.equal(fastDirtyResolveOrdinals.length, 2, 'both fastDirty invocations recorded a resolve ordinal');
+    t.equal(dirtyEmitOrdinals.length, 2, 'both dirty emits recorded an ordinal');
+    for (let i = 0; i < 2; i++) {
+        t.ok(fastDirtyEnterOrdinals[i] < fastDirtyResolveOrdinals[i], `event #${i}: fastDirty must enter (ord=${fastDirtyEnterOrdinals[i]}) before it resolves (ord=${fastDirtyResolveOrdinals[i]})`);
+        t.ok(fastDirtyResolveOrdinals[i] < dirtyEmitOrdinals[i], `event #${i}: dirty emit ordinal (${dirtyEmitOrdinals[i]}) must strictly follow fastDirty resolve ordinal (${fastDirtyResolveOrdinals[i]})`);
+    }
+});
+//# sourceMappingURL=grpc-stream-dirty-order.spec.js.map

package/dist/esm/tests/grpc-stream-dirty-order.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grpc-stream-dirty-order.spec.js","sourceRoot":"","sources":["../../../tests/grpc-stream-dirty-order.spec.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEpC,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE7C,IAAI,CAAC,0DAA0D,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACzE,MAAM,KAAK,GAAG,uBAAuB,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAA;IACpF,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAE,KAAK,EAAE,CAAQ,CAAA;IAElD,IAAI,mBAAuC,CAAA;IAC3C,IAAI,cAAkC,CAAA;IAEtC,MAAM,kBAAkB,GAAG,EAAE,CAAA;IAE7B,MAAM,CAAC,SAAS,GAAG,KAAK,EAAE,QAAoC,EAAE,EAAE;QAChE,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAA;QACrE,mBAAmB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAClC,CAAC,CAAA;IAED,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACtB,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAC/B,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO;QACvC,SAAS,EAAI,WAAW;KACzB,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG;QAChB,OAAO,EAAK,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,gBAAgB;QACvD,UAAU,EAAE,GAAG,EAAE,CAAC,SAAS;QAC3B,MAAM,EAAM,GAAG,EAAE,CAAC,CAAC;KACpB,CAAA;IAED,MAAM,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IAEzC,CAAC,CAAC,EAAE,CAAC,mBAAmB,EAAE,kCAAkC,CAAC,CAAA;IAC7D,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,uCAAuC,CAAC,CAAA;IAC7D,CAAC,CAAC,EAAE,CACF,mBAAoB,IAAI,cAAe,EACvC,eAAe,cAAc,yCAAyC,mBAAmB,GAAG,CAC7F,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,4FAA4F,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC3G,mEAAmE;IACnE,oEAAoE;IACpE,gEAAgE;IAChE,+DAA+D;IAC/D,qEAAqE;IACrE,wDAAwD;IACxD,MAAM,KAAK,GAAG,uBAAuB,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAA;IACpF,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAE,KAAK,EAAE,CAAQ,CAAA;IAElD,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,EAAE,QAAQ,CAAA;IAEpC,mFAAmF;IACnF,MAAM,sBAAsB,GAAa,EAAE,CAAA;IAC3C,MAAM,wBAAwB,GAAa,EAAE,CAAA;IAC7C,MAAM,iBAAiB,GAAa,EAAE,CAAA;IAEtC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,QAAoC,EAAE,EAAE;QAC1F,sBAAsB,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;QAC1C,mEAAmE;QACnE,kEAAkE;QAClE,yCAAyC;QACzC,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;QACnD,wBAAwB,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,SAAS,GAAG,aAAa,CAAA;IAEhC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;QAC9B,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAE5B,MAAM,SAAS,GAAG,CAAC,SAAiB,EAAE,EAAE;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAC/B,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO;YACvC,SAAS;SACV,CAAC,CAAA;QACF,OAAO;YACL,OAAO,EAAK,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,gBAAgB;YACvD,UAAU,EAAE,GAAG,EAAE,CAAC,SAAS;YAC3B,MAAM,EAAM,GAAG,EAAE,CAAC,CAAC;SACpB,CAAA;IACH,CAAC,CAAA;IAED,mEAAmE;IACnE,0CAA0C;IAC1C,MAAM,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;IACtD,MAAM,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;IAEtD,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,EAAE,wCAAwC,CAAC,CAAA;IAC7E,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,EAAE,6CAA6C,CAAC,CAAA;IAC7E,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,EAAE,sDAAsD,CAAC,CAAA;IACjG,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC,EAAE,uDAAuD,CAAC,CAAA;IACpG,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,sCAAsC,CAAC,CAAA;IAE5E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAC1B,CAAC,CAAC,EAAE,CACF,sBAAsB,CAAC,CAAC,CAAE,GAAG,wBAAwB,CAAC,CAAC,CAAE,EACzD,UAAU,CAAC,+BAA+B,sBAAsB,CAAC,CAAC,CAAC,6BAA6B,wBAAwB,CAAC,CAAC,CAAC,GAAG,CAC/H,CAAA;QACD,CAAC,CAAC,EAAE,CACF,wBAAwB,CAAC,CAAC,CAAE,GAAG,iBAAiB,CAAC,CAAC,CAAE,EACpD,UAAU,CAAC,yBAAyB,iBAAiB,CAAC,CAAC,CAAC,qDAAqD,wBAAwB,CAAC,CAAC,CAAC,GAAG,CAC5I,CAAA;KACF;AACH,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juzi/wechaty-puppet-service",
-  "version": "1.0.122",
+  "version": "1.0.124",
   "description": "Puppet Service for Wechaty",
   "type": "module",
   "exports": {
@@ -51,11 +51,12 @@
     "@chatie/eslint-config": "^1.0.4",
     "@chatie/semver": "^0.4.7",
     "@chatie/tsconfig": "^4.6.3",
-    "@juzi/wechaty-puppet": "^1.0.146",
+    "@juzi/wechaty-puppet": "^1.0.148",
     "@juzi/wechaty-puppet-mock": "^1.0.1",
     "@swc/core": "1.3.39",
     "@types/google-protobuf": "^3.15.5",
     "@types/lru-cache": "^7.5.0",
+    "@types/node": "^20",
     "@types/semver": "^7.3.9",
     "@types/temp": "^0.9.1",
     "@types/uuid": "^8.3.4",
@@ -70,7 +71,7 @@
     "why-is-node-running": "^2.2.1"
   },
   "peerDependencies": {
-    "@juzi/wechaty-puppet": "^1.0.143"
+    "@juzi/wechaty-puppet": "^1.0.148"
   },
   "dependencies": {
     "@juzi/wechaty-grpc": "^1.0.106",

package/src/client/grpc-manager.ts

@@ -21,7 +21,10 @@ import util from 'util'
 import EventEmitter from 'events'
 import crypto from 'crypto'
 
-import { log } from '@juzi/wechaty-puppet'
+import {
+  log,
+  type LoggerLike,
+}                     from '@juzi/wechaty-puppet'
 import {
   grpc,
   puppet,
@@ -78,14 +81,17 @@ class GrpcManager extends EventEmitter {
   serverName : string
   token      : WechatyToken
 
+  private readonly _log: LoggerLike
+
   constructor (private options: PuppetServiceOptions) {
     super()
-    log.verbose('GrpcManager', 'constructor(%s)', JSON.stringify(options))
+    this._log = options.logger ?? log
+    this._log.verbose('GrpcManager', 'constructor(%s)', JSON.stringify(options))
 
     this.caCert = Buffer.from(
       envVars.WECHATY_PUPPET_SERVICE_TLS_CA_CERT(this.options.tls?.caCert) || TLS_CA_CERT,
     )
-    log.verbose('GrpcManager', 'constructor() tlsRootCert(hash): "%s"',
+    this._log.verbose('GrpcManager', 'constructor() tlsRootCert(hash): "%s"',
       crypto.createHash('sha256')
         .update(this.caCert)
         .digest('hex'),
@@ -97,7 +103,7 @@ class GrpcManager extends EventEmitter {
     this.token = new WechatyToken(
       envVars.WECHATY_PUPPET_SERVICE_TOKEN(this.options.token),
     )
-    log.verbose('GrpcManager', 'constructor() token: "%s"', this.token)
+    this._log.verbose('GrpcManager', 'constructor() token: "%s"', this.token)
 
     this.endpoint = envVars.WECHATY_PUPPET_SERVICE_ENDPOINT(this.options.endpoint)
       /**
@@ -110,13 +116,13 @@ class GrpcManager extends EventEmitter {
         '/',
         this.token,
       ].join('')
-    log.verbose('GrpcManager', 'constructor() endpoint: "%s"', this.endpoint)
+    this._log.verbose('GrpcManager', 'constructor() endpoint: "%s"', this.endpoint)
 
     /**
      * Disable TLS
      */
     this.disableTls = envVars.WECHATY_PUPPET_SERVICE_NO_TLS_INSECURE_CLIENT(this.options.tls?.disable)
-    log.verbose('GrpcManager', 'constructor() disableTls: "%s"', this.disableTls)
+    this._log.verbose('GrpcManager', 'constructor() disableTls: "%s"', this.disableTls)
 
     /**
      * for Node.js TLS SNI
@@ -141,59 +147,59 @@ class GrpcManager extends EventEmitter {
     }
 
     this.serverName = serverNameIndication
-    log.verbose('GrpcManager', 'constructor() serverName(SNI): "%s"', this.serverName)
+    this._log.verbose('GrpcManager', 'constructor() serverName(SNI): "%s"', this.serverName)
   }
 
   async start (lastEventSeq?: string, accountId?: string): Promise<void> {
-    log.verbose('GrpcManager', 'start()')
+    this._log.verbose('GrpcManager', 'start()')
 
     /**
      * 1. Init grpc client
      */
-    log.verbose('GrpcManager', 'start() initializing client ...')
+    this._log.verbose('GrpcManager', 'start() initializing client ...')
     await this.initClient()
-    log.verbose('GrpcManager', 'start() initializing client ... done')
+    this._log.verbose('GrpcManager', 'start() initializing client ... done')
 
     /**
      * 2. Connect to stream
      */
-    log.verbose('GrpcManager', 'start() starting stream ...')
+    this._log.verbose('GrpcManager', 'start() starting stream ...')
     await this.startStream(lastEventSeq, accountId)
-    log.verbose('GrpcManager', 'start() starting stream ... done')
+    this._log.verbose('GrpcManager', 'start() starting stream ... done')
 
     /**
      * 3. Start the puppet
      */
-    log.verbose('GrpcManager', 'start() calling grpc server: start() ...')
+    this._log.verbose('GrpcManager', 'start() calling grpc server: start() ...')
     await util.promisify(
       this.client.start
         .bind(this.client),
     )(new puppet.StartRequest())
-    log.verbose('GrpcManager', 'start() calling grpc server: start() ... done')
+    this._log.verbose('GrpcManager', 'start() calling grpc server: start() ... done')
 
-    log.verbose('GrpcManager', 'start() ... done')
+    this._log.verbose('GrpcManager', 'start() ... done')
   }
 
   async stop (): Promise<void> {
-    log.verbose('GrpcManager', 'stop()')
+    this._log.verbose('GrpcManager', 'stop()')
 
     /**
      * 1. Disconnect from stream
      */
-    log.verbose('GrpcManager', 'stop() stop stream ...')
+    this._log.verbose('GrpcManager', 'stop() stop stream ...')
     this.stopStream()
-    log.verbose('GrpcManager', 'stop() stop stream ... done')
+    this._log.verbose('GrpcManager', 'stop() stop stream ... done')
 
     /**
      * 2. Stop the puppet
      */
     try {
-      log.verbose('GrpcManager', 'stop() stop client ...')
+      this._log.verbose('GrpcManager', 'stop() stop client ...')
       await util.promisify(
         this.client.stop
           .bind(this.client),
       )(new puppet.StopRequest())
-      log.verbose('GrpcManager', 'stop() stop client ... done')
+      this._log.verbose('GrpcManager', 'stop() stop client ... done')
     } catch (e) {
       this.emit('error', e)
     }
@@ -202,18 +208,18 @@ class GrpcManager extends EventEmitter {
      * 3. Destroy grpc client
      */
     try {
-      log.verbose('GrpcManager', 'stop() destroy client ...')
+      this._log.verbose('GrpcManager', 'stop() destroy client ...')
       this.destroyClient()
-      log.verbose('GrpcManager', 'stop() destroy client ... done')
+      this._log.verbose('GrpcManager', 'stop() destroy client ... done')
     } catch (e) {
       this.emit('error', e)
     }
 
-    log.verbose('GrpcManager', 'stop() ... done')
+    this._log.verbose('GrpcManager', 'stop() ... done')
   }
 
   protected async initClient (): Promise<void> {
-    log.verbose('GrpcManager', 'initClient()')
+    this._log.verbose('GrpcManager', 'initClient()')
 
     /**
      * Huan(202108): for maximum compatible with the non-tls community servers/clients,
@@ -222,10 +228,10 @@ class GrpcManager extends EventEmitter {
      */
     let credential
     if (this.disableTls) {
-      log.warn('GrpcManager', 'initClient() TLS: disabled (INSECURE)')
+      this._log.warn('GrpcManager', 'initClient() TLS: disabled (INSECURE)')
       credential = grpc.credentials.createInsecure()
     } else {
-      log.verbose('GrpcManager', 'initClient() TLS: enabled')
+      this._log.verbose('GrpcManager', 'initClient() TLS: enabled')
       const callCred    = callCredToken(this.token.token)
       const channelCred = grpc.credentials.createSsl(this.caCert)
       const combCreds   = grpc.credentials.combineChannelCredentials(channelCred, callCred)
@@ -252,7 +258,7 @@ class GrpcManager extends EventEmitter {
     }
 
     if (this._client) {
-      log.warn('GrpcManager', 'initClient() this.#client exists? Old client has been dropped.')
+      this._log.warn('GrpcManager', 'initClient() this.#client exists? Old client has been dropped.')
       this._client = undefined
     }
 
@@ -262,14 +268,14 @@ class GrpcManager extends EventEmitter {
       clientOptions,
     )
 
-    log.verbose('GrpcManager', 'initClient() ... done')
+    this._log.verbose('GrpcManager', 'initClient() ... done')
   }
 
   protected destroyClient (): void {
-    log.verbose('GrpcManager', 'destroyClient()')
+    this._log.verbose('GrpcManager', 'destroyClient()')
 
     if (!this._client) {
-      log.warn('GrpcManager', 'destroyClient() this.#client not exist')
+      this._log.warn('GrpcManager', 'destroyClient() this.#client not exist')
       return
     }
 
@@ -283,19 +289,19 @@ class GrpcManager extends EventEmitter {
     try {
       client.close()
     } catch (e) {
-      log.error('GrpcManager', 'destroyClient() client.close() rejection: %s\n%s', e && (e as Error).message, (e as Error).stack)
+      this._log.error('GrpcManager', 'destroyClient() client.close() rejection: %s\n%s', e && (e as Error).message, (e as Error).stack)
     }
   }
 
   async startStream (lastEventSeq?: string, accountId?: string): Promise<void> {
-    log.verbose('GrpcManager', 'startStream()')
+    this._log.verbose('GrpcManager', 'startStream()')
 
     if (this.eventStream) {
-      log.verbose('GrpcManager', 'startStream() this.eventStream exists, dropped.')
+      this._log.verbose('GrpcManager', 'startStream() this.eventStream exists, dropped.')
       this.eventStream = undefined
     }
 
-    log.verbose('GrpcManager', 'startStream() grpc -> event() ...')
+    this._log.verbose('GrpcManager', 'startStream() grpc -> event() ...')
 
     const eventRequest = new puppet.EventRequest()
     if (lastEventSeq) {
@@ -304,10 +310,10 @@ class GrpcManager extends EventEmitter {
     if (accountId) {
       eventRequest.setAccountId(accountId)
     }
-    log.info('GrpcManager', `startStream() connecting event stream with account ${accountId} and seq ${lastEventSeq}`)
+    this._log.info('GrpcManager', `startStream() connecting event stream with account ${accountId} and seq ${lastEventSeq}`)
 
     const eventStream = this.client.event(eventRequest)
-    log.verbose('GrpcManager', 'startStream() grpc -> event() ... done')
+    this._log.verbose('GrpcManager', 'startStream() grpc -> event() ... done')
 
     /**
      * Store the event data from the stream when we test connection,
@@ -374,13 +380,13 @@ class GrpcManager extends EventEmitter {
      *  if a puppet service provider is coming from the community, it might not follow the protocol specification.
      * So we need a timeout for compatible with those providers
      */
-    log.verbose('GrpcManager', 'startStream() grpc -> event peeking data or timeout ...')
+    this._log.verbose('GrpcManager', 'startStream() grpc -> event peeking data or timeout ...')
     try {
       await timeoutPromise(future, 5 * 1000)  // 5 seconds
     } catch (_) {
-      log.verbose('GrpcManager', 'startStream() grpc -> event peeking data or timeout ... timeout')
+      this._log.verbose('GrpcManager', 'startStream() grpc -> event peeking data or timeout ... timeout')
     }
-    log.verbose('GrpcManager', 'startStream() grpc -> event peeking data or timeout ... data peeked')
+    this._log.verbose('GrpcManager', 'startStream() grpc -> event peeking data or timeout ... data peeked')
 
     /**
      * Bridge the events
@@ -389,7 +395,7 @@ class GrpcManager extends EventEmitter {
      *  so that if there's any `error` event,
      *  it will be triggered already.
      */
-    log.verbose('GrpcManager', 'startStream() initializing event stream ...')
+    this._log.verbose('GrpcManager', 'startStream() initializing event stream ...')
     eventStream
       .on('cancel',   (...args) => this.emit('cancel',    ...args))
       .on('data',     (...args) => this.emit('data',      ...args))
@@ -399,26 +405,26 @@ class GrpcManager extends EventEmitter {
       .on('status',   (...args) => this.emit('status',    ...args))
 
     this.eventStream = eventStream
-    log.verbose('GrpcManager', 'startStream() initializing event stream ... done')
+    this._log.verbose('GrpcManager', 'startStream() initializing event stream ... done')
 
     /**
      * Re-emit the peeked data if there' s any
      */
     if (peekedData) {
-      log.verbose('GrpcManager', 'startStream() sending back the peeked data ...')
+      this._log.verbose('GrpcManager', 'startStream() sending back the peeked data ...')
       this.emit('data', peekedData)
       peekedData = undefined
-      log.verbose('GrpcManager', 'startStream() sending back the peeked data ... done')
+      this._log.verbose('GrpcManager', 'startStream() sending back the peeked data ... done')
     }
 
-    log.verbose('GrpcManager', 'startStream() ... done')
+    this._log.verbose('GrpcManager', 'startStream() ... done')
   }
 
   stopStream (): void {
-    log.verbose('GrpcManager', 'stopStream()')
+    this._log.verbose('GrpcManager', 'stopStream()')
 
     if (!this.eventStream) {
-      log.verbose('GrpcManager', 'stopStream() no eventStream when stop, skip destroy.')
+      this._log.verbose('GrpcManager', 'stopStream() no eventStream when stop, skip destroy.')
       return
     }
     /**
@@ -436,9 +442,9 @@ class GrpcManager extends EventEmitter {
     // this.eventStream.cancel()
 
     try {
-      log.verbose('GrpcManager', 'stopStream() destroying event stream ...')
+      this._log.verbose('GrpcManager', 'stopStream() destroying event stream ...')
       eventStream.destroy()
-      log.verbose('GrpcManager', 'stopStream() destroying event stream ... done')
+      this._log.verbose('GrpcManager', 'stopStream() destroying event stream ... done')
     } catch (e) {
       this.emit('error', e)
     }