@juzi/wechaty 1.0.160 → 1.0.162

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

@@ -931,3 +931,206 @@ test('dirty(Call) refreshes user-layer payload so getters see new value', async
   await wechaty.stop()
   sandbox.restore()
 })
+
+// ---------------------------------------------------------------------------
+// 12. end() — universal terminator dispatches by state
+// ---------------------------------------------------------------------------
+
+test('call.end() on outgoing calling invokes puppet.callCancel and ends', async t => {
+  const { puppet, wechaty } = buildWechaty()
+  await startAndLogin(puppet, wechaty)
+
+  puppet.callInvite = sandbox.stub().resolves('call-id-end-cancel')
+  stubCallPayload(puppet, (id: string) => ({
+    id,
+    starter      : 'bot-self',
+    participants : [ 'bot-self', 'peer' ],
+    media        : PUPPET.types.CallMediaType.Audio,
+    startTime    : 1,
+  }))
+  const cancelStub = sandbox.stub().resolves(undefined)
+  const hangupStub = sandbox.stub().resolves(undefined)
+  puppet.callCancel = cancelStub
+  puppet.callHangup = hangupStub
+
+  const contact = (wechaty.Contact as typeof ContactImpl).load('peer')
+  const call    = await contact.call()
+  t.equal(call.status(), 'calling', 'prerequisite: outgoing call starts as calling')
+
+  await call.end('demo')
+  t.same(cancelStub.firstCall.args, [ call.id ], 'callCancel should be invoked with callId')
+  t.equal(hangupStub.callCount, 0, 'callHangup should not be touched')
+  t.equal(call.status(), 'ended', 'status should be ended')
+  t.equal((wechaty as any).__callPool.has(call.id), false, 'pool should be evicted')
+
+  await call.end('again')
+  t.equal(cancelStub.callCount, 1, 'second end() should be a no-op')
+
+  await wechaty.stop()
+  sandbox.restore()
+})
+
+test('call.end() on connected call invokes puppet.callHangup with reason', async t => {
+  const { puppet, wechaty } = buildWechaty()
+  await startAndLogin(puppet, wechaty)
+
+  puppet.callInvite = sandbox.stub().resolves('call-id-end-hangup')
+  stubCallPayload(puppet, (id: string) => ({
+    id,
+    starter      : 'bot-self',
+    participants : [ 'bot-self', 'peer' ],
+    media        : PUPPET.types.CallMediaType.Audio,
+    startTime    : 1,
+  }))
+  const cancelStub = sandbox.stub().resolves(undefined)
+  const hangupStub = sandbox.stub().resolves(undefined)
+  puppet.callCancel = cancelStub
+  puppet.callHangup = hangupStub
+
+  const contact = (wechaty.Contact as typeof ContactImpl).load('peer')
+  const call    = await contact.call()
+
+  ;(puppet as any).emit('call', {
+    callId    : call.id,
+    signal    : PUPPET.types.CallSignal.Accept,
+    contactId : 'peer',
+    timestamp : 2,
+  } as PUPPET.payloads.EventCall)
+  await flush()
+  t.equal(call.status(), 'connected', 'prerequisite: call should be connected')
+
+  await call.end('bye')
+  t.same(hangupStub.firstCall.args, [ call.id, 'bye' ], 'callHangup args should be [callId, reason]')
+  t.equal(cancelStub.callCount, 0, 'callCancel should not be touched')
+  t.equal(call.status(), 'ended', 'status should be ended')
+
+  await wechaty.stop()
+  sandbox.restore()
+})
+
+test('call.end() on incoming ringing invokes puppet.callReject with reason', async t => {
+  const { puppet, wechaty } = buildWechaty()
+  await startAndLogin(puppet, wechaty)
+
+  const CALL_ID = 'call-id-end-reject'
+  stubCallPayload(puppet, (id: string) => ({
+    id,
+    starter      : 'peer',
+    participants : [ 'peer', 'bot-self' ],
+    media        : PUPPET.types.CallMediaType.Audio,
+    startTime    : 1,
+  }))
+  const rejectStub = sandbox.stub().resolves(undefined)
+  puppet.callReject = rejectStub
+
+  let incoming: CallInterface | undefined
+  ;(wechaty as any).on('call', (c: CallInterface) => { incoming = c })
+  ;(puppet as any).emit('call', {
+    callId    : CALL_ID,
+    signal    : PUPPET.types.CallSignal.Invite,
+    contactId : 'peer',
+    timestamp : 1,
+  } as PUPPET.payloads.EventCall)
+  await flush()
+  t.ok(incoming, 'prerequisite: incoming call should surface via bot.on(call)')
+  t.equal(incoming!.status(), 'ringing', 'prerequisite: incoming call should be ringing')
+
+  await incoming!.end('busy')
+  t.same(rejectStub.firstCall.args, [ CALL_ID, 'busy' ], 'callReject args should be [callId, reason]')
+  t.equal(incoming!.status(), 'ended', 'status should be ended')
+
+  await wechaty.stop()
+  sandbox.restore()
+})
+
+test('call.end() falls back to callHangup when callCancel is UNIMPLEMENTED', async t => {
+  const { puppet, wechaty } = buildWechaty()
+  await startAndLogin(puppet, wechaty)
+
+  puppet.callInvite = sandbox.stub().resolves('call-id-end-fallback')
+  stubCallPayload(puppet, (id: string) => ({
+    id,
+    starter      : 'bot-self',
+    participants : [ 'bot-self', 'peer' ],
+    media        : PUPPET.types.CallMediaType.Audio,
+    startTime    : 1,
+  }))
+  const cancelStub = sandbox.stub().rejects(new Error('12 UNIMPLEMENTED: CallCancel is not supported'))
+  const hangupStub = sandbox.stub().resolves(undefined)
+  puppet.callCancel = cancelStub
+  puppet.callHangup = hangupStub
+
+  const contact = (wechaty.Contact as typeof ContactImpl).load('peer')
+  const call    = await contact.call()
+
+  await call.end('timeout')
+  t.equal(cancelStub.callCount, 1, 'callCancel should be attempted first')
+  t.same(hangupStub.firstCall.args, [ call.id, 'timeout' ], 'should retry via callHangup')
+  t.equal(call.status(), 'ended', 'status should be ended')
+
+  await wechaty.stop()
+  sandbox.restore()
+})
+
+test('call.end() retries via callHangup when peer accepts during in-flight cancel', async t => {
+  const { puppet, wechaty } = buildWechaty()
+  await startAndLogin(puppet, wechaty)
+
+  puppet.callInvite = sandbox.stub().resolves('call-id-end-race')
+  stubCallPayload(puppet, (id: string) => ({
+    id,
+    starter      : 'bot-self',
+    participants : [ 'bot-self', 'peer' ],
+    media        : PUPPET.types.CallMediaType.Audio,
+    startTime    : 1,
+  }))
+  const hangupStub = sandbox.stub().resolves(undefined)
+  puppet.callHangup = hangupStub
+  puppet.callCancel = sandbox.stub().callsFake(async (callId: string) => {
+    ;(puppet as any).emit('call', {
+      callId,
+      signal    : PUPPET.types.CallSignal.Accept,
+      contactId : 'peer',
+      timestamp : 2,
+    } as PUPPET.payloads.EventCall)
+    await flush()
+    throw new Error('call already answered')
+  })
+
+  const contact = (wechaty.Contact as typeof ContactImpl).load('peer')
+  const call    = await contact.call()
+
+  await call.end('too late to cancel')
+  t.same(hangupStub.firstCall.args, [ call.id, 'too late to cancel' ], 'should retry via callHangup after accept race')
+  t.equal(call.status(), 'ended', 'status should be ended')
+
+  await wechaty.stop()
+  sandbox.restore()
+})
+
+test('call.end() rethrows non-recoverable pre-connect failures but still finalizes', async t => {
+  const { puppet, wechaty } = buildWechaty()
+  await startAndLogin(puppet, wechaty)
+
+  puppet.callInvite = sandbox.stub().resolves('call-id-end-fatal')
+  stubCallPayload(puppet, (id: string) => ({
+    id,
+    starter      : 'bot-self',
+    participants : [ 'bot-self', 'peer' ],
+    media        : PUPPET.types.CallMediaType.Audio,
+    startTime    : 1,
+  }))
+  const hangupStub = sandbox.stub().resolves(undefined)
+  puppet.callCancel = sandbox.stub().rejects(new Error('network error'))
+  puppet.callHangup = hangupStub
+
+  const contact = (wechaty.Contact as typeof ContactImpl).load('peer')
+  const call    = await contact.call()
+
+  await t.rejects(call.end(), /network error/, 'end() should re-throw transport failures')
+  t.equal(hangupStub.callCount, 0, 'no hangup retry for transport failures')
+  t.equal(call.status(), 'ended', 'status should still finalize')
+
+  await wechaty.stop()
+  sandbox.restore()
+})

package/src/user-modules/call.ts

@@ -29,6 +29,18 @@ interface CallConstructorOptions {
 
 const CallMixinBase = wechatifyMixin(CallEventEmitter)
 
+/**
+ * Whether a puppet rejection means "this verb is not supported by the
+ * implementation" (gRPC UNIMPLEMENTED, or an explicit not-supported error),
+ * as opposed to a transport/business failure. Message-based on purpose:
+ * puppet errors cross the service boundary as GError and no structured
+ * status code survives the trip.
+ */
+function isVerbUnsupportedError (e: unknown): boolean {
+  const message = e instanceof Error ? e.message : String(e)
+  return /UNIMPLEMENTED|not\s+(?:supported|implemented)|unsupported/i.test(message)
+}
+
 /**
  * Call – a live, stateful call-control session abstraction.
  *
@@ -224,6 +236,65 @@ class CallMixin extends CallMixinBase {
     }
   }
 
+  /**
+   * Universal terminator (the "red button"): end the call from whatever
+   * state it is in, dispatching to the state-appropriate verb —
+   *
+   *   connected                     → puppet.callHangup(reason)
+   *   incoming + ringing            → puppet.callReject(reason)
+   *   outgoing + calling / ringing  → puppet.callCancel()
+   *   ended                         → no-op (idempotent)
+   *
+   * Unlike the precise verbs (cancel/reject/hangup), which throw on any state
+   * mismatch, end() absorbs the two failure modes inherent to check-then-act
+   * termination, retrying ONCE via callHangup when:
+   *
+   *   - the peer accepts while our pre-connect verb is in flight (the verb
+   *     comes back rejected but the session is now connected, so hangup is
+   *     the correct verb by the time we retry), or
+   *   - the puppet does not implement the chosen verb (protocols whose
+   *     transport folds cancel/reject into a single hangup action).
+   *
+   * Local state always finalizes, matching cancel/reject/hangup semantics:
+   * whichever side actually terminated the session, the protocol-side record
+   * is the arbiter and its verdict arrives via the terminal signal path.
+   */
+  async end (reason?: string): Promise<void> {
+    if (this.__status === 'ended') {
+      this.log.verbose('Call', 'end() no-op: already ended, callId=%s', this.id)
+      return
+    }
+
+    try {
+      if (this.__status === 'connected') {
+        await this.wechaty.puppet.callHangup(this.id, reason)
+        return
+      }
+
+      try {
+        if (this.__direction === 'incoming') {
+          await this.wechaty.puppet.callReject(this.id, reason)
+        } else {
+          await this.wechaty.puppet.callCancel(this.id)
+        }
+      } catch (e) {
+        const acceptedMeanwhile = this.status() === 'connected'
+        if (!acceptedMeanwhile && !isVerbUnsupportedError(e)) {
+          throw e
+        }
+        this.log.verbose(
+          'Call',
+          'end() pre-connect verb failed (%s), retrying via callHangup, callId=%s',
+          acceptedMeanwhile ? 'accepted meanwhile' : 'verb unsupported',
+          this.id,
+        )
+        await this.wechaty.puppet.callHangup(this.id, reason)
+      }
+    } finally {
+      this.__finalize()
+    }
+  }
+
   /**
    * Invite additional contacts to a live call (group-call growth).
    */

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

@@ -18,8 +18,12 @@ import type {
   CallImpl,
   ContactImpl,
   ContactInterface,
+  MessageImpl,
+  RoomImpl,
   TagGroupInterface,
   TagInterface,
+  WxxdOrderImpl,
+  WxxdProductImpl,
 }                               from '../user-modules/mod.js'
 
 import type {
@@ -724,46 +728,26 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
           case 'dirty':
             /**
              * https://github.com/wechaty/wechaty-puppet-service/issues/43
-             *
-             * `dirty` semantics: the puppet-service told us the cached payload
-             * for this id is stale. It is NOT a request to load the payload.
-             *
-             * The old handler used `this.Xxx.find({ id })` which, on pool miss,
-             * constructs a fresh user-layer instance AND calls `.ready()` — a
-             * puppet-side gRPC round-trip. For a `dirty` event about an id
-             * that no business code has ever touched, this turned a passive
-             * "invalidate if cached" signal into an active fetch, amplifying
-             * dirty-event bursts (e.g. during message storms) into extra
-             * puppet-service QPS.
-             *
-             * Fix: for pooled user-modules, look the instance up in the pool
-             * directly and only call `.ready(true)` when it is already there.
-             * The Call branch (below) already follows this shape via
-             * `__callPool.get(...)`. Message has no pool, so its branch is a
-             * no-op break (any caller wanting a Message must load it itself).
              */
             puppet.on('dirty', async ({ payloadType, payloadId }) => {
               try {
                 switch (payloadType) {
                   case PUPPET.types.Payload.Contact: {
-                    const cached = this.Contact.pool.get(payloadId)
-                    if (cached) await cached.ready(true)
+                    const contact = await this.Contact.find({ id: payloadId }) as unknown as undefined | ContactImpl
+                    await contact?.ready(true)
                     break
                   }
                   case PUPPET.types.Payload.Room: {
-                    const cached = this.Room.pool.get(payloadId)
-                    if (cached) await cached.ready(true)
+                    const room = await this.Room.find({ id: payloadId })  as unknown as undefined | RoomImpl
+                    await room?.ready(true)
                     break
                   }
                   case PUPPET.types.Payload.RoomMember: {
                     if (payloadId.includes(PUPPET.STRING_SPLITTER)) {
                       break
                     }
-                    // A bare (non-composite) RoomMember dirty id addresses the
-                    // whole room, mirroring the Room branch — but never load
-                    // a new Room here.
-                    const cached = this.Room.pool.get(payloadId)
-                    if (cached) await cached.ready()
+                    const room = await this.Room.find({ id: payloadId }) as unknown as undefined | RoomImpl
+                    await room?.ready()
                     break
                   }
 
@@ -773,13 +757,12 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
                   case PUPPET.types.Payload.Friendship:
                     // Friendship has no payload
                     break
-                  case PUPPET.types.Payload.Message:
-                    // Message has no user-layer pool (see message.ts: `load`
-                    // constructs a fresh instance every call). Dirty for a
-                    // Message id is therefore a no-op at this layer — the
-                    // cache-mixin listener still invalidates the puppet-side
-                    // payload cache alongside this handler.
+                  case PUPPET.types.Payload.Message: {
+                    // Message does not need to dirty (?)
+                    const message = await this.Message.find({ id: payloadId }) as unknown as undefined | MessageImpl
+                    await message?.ready(true)
                     break
+                  }
                   case PUPPET.types.Payload.Tag:
                     break
                   case PUPPET.types.Payload.TagGroup:
@@ -787,13 +770,13 @@ const puppetMixin = <MixinBase extends WechatifyUserModuleMixin & GErrorMixin &
                   case PUPPET.types.Payload.Post:
                     break
                   case PUPPET.types.Payload.WxxdProduct: {
-                    const cached = this.WxxdProduct.pool.get(payloadId)
-                    if (cached) await cached.ready(true)
+                    const product = await this.WxxdProduct.find({ id: payloadId }) as unknown as undefined | WxxdProductImpl
+                    await product?.ready(true)
                     break
                   }
                   case PUPPET.types.Payload.WxxdOrder: {
-                    const cached = this.WxxdOrder.pool.get(payloadId)
-                    if (cached) await cached.ready(true)
+                    const order = await this.WxxdOrder.find({ id: payloadId }) as unknown as undefined | WxxdOrderImpl
+                    await order?.ready(true)
                     break
                   }
                   case PUPPET.types.Payload.Call: {

package/dist/cjs/src/wechaty-mixins/puppet-mixin-dirty-pool.spec.d.ts

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

package/dist/cjs/src/wechaty-mixins/puppet-mixin-dirty-pool.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"puppet-mixin-dirty-pool.spec.d.ts","sourceRoot":"","sources":["../../../../src/wechaty-mixins/puppet-mixin-dirty-pool.spec.ts"],"names":[],"mappings":""}

package/dist/cjs/src/wechaty-mixins/puppet-mixin-dirty-pool.spec.js

@@ -1,121 +0,0 @@
-#!/usr/bin/env -S node --no-warnings --loader ts-node/esm
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const tstest_1 = require("tstest");
-const PUPPET = __importStar(require("@juzi/wechaty-puppet"));
-const wechaty_puppet_mock_1 = require("@juzi/wechaty-puppet-mock");
-const wechaty_builder_js_1 = require("../wechaty-builder.js");
-/**
- * Regression: the `dirty` event handler for pooled user-modules
- * (Contact / Room / WxxdProduct / WxxdOrder) used to call
- * `this.Xxx.find({ id }).ready(true)`. `find({ id })` on a pool miss
- * constructs a fresh instance and calls `ready()` — a puppet-side gRPC
- * round-trip — turning a passive "invalidate if cached" signal into an
- * active fetch for ids no business code has touched.
- *
- * The fix looks the id up in the pool directly and only calls
- * `.ready(true)` when the instance is already pooled.
- */
-async function delay(ms) {
-    await new Promise(resolve => setTimeout(resolve, ms));
-}
-(0, tstest_1.test)('dirty handler does not fetch payload for un-pooled ids, but still refreshes pooled ones', async (t) => {
-    const puppet = new wechaty_puppet_mock_1.PuppetMock();
-    const wechaty = wechaty_builder_js_1.WechatyBuilder.build({ puppet });
-    const botContact = puppet.mocker.createContact({ name: 'test-bot' });
-    await wechaty.start();
-    await puppet.mocker.login(botContact);
-    // --- Case 1: un-pooled Contact id must not trigger contactRawPayload ---
-    let contactRawPayloadCalls = 0;
-    const originalContactRawPayload = puppet.contactRawPayload.bind(puppet);
-    puppet.contactRawPayload = async (id) => {
-        contactRawPayloadCalls++;
-        return originalContactRawPayload(id);
-    };
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Contact,
-        payloadId: 'never-loaded-contact-id',
-    });
-    await delay(50);
-    t.equal(contactRawPayloadCalls, 0, `dirty(Contact) for un-pooled id must not trigger contactRawPayload; got ${contactRawPayloadCalls} call(s)`);
-    // --- Case 2: un-pooled Room id must not trigger roomRawPayload ---
-    let roomRawPayloadCalls = 0;
-    const originalRoomRawPayload = puppet.roomRawPayload.bind(puppet);
-    puppet.roomRawPayload = async (id) => {
-        roomRawPayloadCalls++;
-        return originalRoomRawPayload(id);
-    };
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Room,
-        payloadId: 'never-loaded-room-id',
-    });
-    await delay(50);
-    t.equal(roomRawPayloadCalls, 0, `dirty(Room) for un-pooled id must not trigger roomRawPayload; got ${roomRawPayloadCalls} call(s)`);
-    // --- Case 3: Message dirty must not trigger messageRawPayload (Message has no user-layer pool) ---
-    let messageRawPayloadCalls = 0;
-    const originalMessageRawPayload = puppet.messageRawPayload.bind(puppet);
-    puppet.messageRawPayload = async (id) => {
-        messageRawPayloadCalls++;
-        return originalMessageRawPayload(id);
-    };
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Message,
-        payloadId: 'some-message-id',
-    });
-    await delay(50);
-    t.equal(messageRawPayloadCalls, 0, `dirty(Message) must not trigger messageRawPayload at the user layer; got ${messageRawPayloadCalls} call(s)`);
-    // --- Case 4: un-pooled Contact still emits the user-facing dirty event ---
-    let wechatyDirtyEmits = 0;
-    wechaty.on('dirty', () => {
-        wechatyDirtyEmits++;
-    });
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Contact,
-        payloadId: 'yet-another-un-pooled-id',
-    });
-    await delay(50);
-    t.equal(wechatyDirtyEmits, 1, `wechaty.emit('dirty', ...) must fire once even when the id is not pooled; got ${wechatyDirtyEmits}`);
-    // --- Case 5: pooled Contact MUST re-fetch on dirty ---
-    const pooledContact = puppet.mocker.createContact({ name: 'pooled-contact' });
-    // Force the contact into the wechatified pool via find(). Payload gets
-    // loaded once as part of find()'s ready() call — subsequent counts we
-    // measure from AFTER this seed.
-    await wechaty.Contact.find({ id: pooledContact.id });
-    let contactPayloadCalls = 0;
-    const originalContactPayload = puppet.contactPayload.bind(puppet);
-    puppet.contactPayload = async (id) => {
-        contactPayloadCalls++;
-        return originalContactPayload(id);
-    };
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Contact,
-        payloadId: pooledContact.id,
-    });
-    await delay(50);
-    t.ok(contactPayloadCalls >= 1, `dirty(Contact) for pooled id must trigger contactPayload via ready(true); got ${contactPayloadCalls} call(s)`);
-    await wechaty.stop();
-});
-//# sourceMappingURL=puppet-mixin-dirty-pool.spec.js.map

package/dist/cjs/src/wechaty-mixins/puppet-mixin-dirty-pool.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"puppet-mixin-dirty-pool.spec.js","sourceRoot":"","sources":["../../../../src/wechaty-mixins/puppet-mixin-dirty-pool.spec.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"puppet-mixin-dirty-pool.spec.d.ts","sourceRoot":"","sources":["../../../../src/wechaty-mixins/puppet-mixin-dirty-pool.spec.ts"],"names":[],"mappings":""}

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

@@ -1,96 +0,0 @@
-#!/usr/bin/env -S node --no-warnings --loader ts-node/esm
-import { test } from 'tstest';
-import * as PUPPET from '@juzi/wechaty-puppet';
-import { PuppetMock } from '@juzi/wechaty-puppet-mock';
-import { WechatyBuilder } from '../wechaty-builder.js';
-/**
- * Regression: the `dirty` event handler for pooled user-modules
- * (Contact / Room / WxxdProduct / WxxdOrder) used to call
- * `this.Xxx.find({ id }).ready(true)`. `find({ id })` on a pool miss
- * constructs a fresh instance and calls `ready()` — a puppet-side gRPC
- * round-trip — turning a passive "invalidate if cached" signal into an
- * active fetch for ids no business code has touched.
- *
- * The fix looks the id up in the pool directly and only calls
- * `.ready(true)` when the instance is already pooled.
- */
-async function delay(ms) {
-    await new Promise(resolve => setTimeout(resolve, ms));
-}
-test('dirty handler does not fetch payload for un-pooled ids, but still refreshes pooled ones', async (t) => {
-    const puppet = new PuppetMock();
-    const wechaty = WechatyBuilder.build({ puppet });
-    const botContact = puppet.mocker.createContact({ name: 'test-bot' });
-    await wechaty.start();
-    await puppet.mocker.login(botContact);
-    // --- Case 1: un-pooled Contact id must not trigger contactRawPayload ---
-    let contactRawPayloadCalls = 0;
-    const originalContactRawPayload = puppet.contactRawPayload.bind(puppet);
-    puppet.contactRawPayload = async (id) => {
-        contactRawPayloadCalls++;
-        return originalContactRawPayload(id);
-    };
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Contact,
-        payloadId: 'never-loaded-contact-id',
-    });
-    await delay(50);
-    t.equal(contactRawPayloadCalls, 0, `dirty(Contact) for un-pooled id must not trigger contactRawPayload; got ${contactRawPayloadCalls} call(s)`);
-    // --- Case 2: un-pooled Room id must not trigger roomRawPayload ---
-    let roomRawPayloadCalls = 0;
-    const originalRoomRawPayload = puppet.roomRawPayload.bind(puppet);
-    puppet.roomRawPayload = async (id) => {
-        roomRawPayloadCalls++;
-        return originalRoomRawPayload(id);
-    };
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Room,
-        payloadId: 'never-loaded-room-id',
-    });
-    await delay(50);
-    t.equal(roomRawPayloadCalls, 0, `dirty(Room) for un-pooled id must not trigger roomRawPayload; got ${roomRawPayloadCalls} call(s)`);
-    // --- Case 3: Message dirty must not trigger messageRawPayload (Message has no user-layer pool) ---
-    let messageRawPayloadCalls = 0;
-    const originalMessageRawPayload = puppet.messageRawPayload.bind(puppet);
-    puppet.messageRawPayload = async (id) => {
-        messageRawPayloadCalls++;
-        return originalMessageRawPayload(id);
-    };
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Message,
-        payloadId: 'some-message-id',
-    });
-    await delay(50);
-    t.equal(messageRawPayloadCalls, 0, `dirty(Message) must not trigger messageRawPayload at the user layer; got ${messageRawPayloadCalls} call(s)`);
-    // --- Case 4: un-pooled Contact still emits the user-facing dirty event ---
-    let wechatyDirtyEmits = 0;
-    wechaty.on('dirty', () => {
-        wechatyDirtyEmits++;
-    });
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Contact,
-        payloadId: 'yet-another-un-pooled-id',
-    });
-    await delay(50);
-    t.equal(wechatyDirtyEmits, 1, `wechaty.emit('dirty', ...) must fire once even when the id is not pooled; got ${wechatyDirtyEmits}`);
-    // --- Case 5: pooled Contact MUST re-fetch on dirty ---
-    const pooledContact = puppet.mocker.createContact({ name: 'pooled-contact' });
-    // Force the contact into the wechatified pool via find(). Payload gets
-    // loaded once as part of find()'s ready() call — subsequent counts we
-    // measure from AFTER this seed.
-    await wechaty.Contact.find({ id: pooledContact.id });
-    let contactPayloadCalls = 0;
-    const originalContactPayload = puppet.contactPayload.bind(puppet);
-    puppet.contactPayload = async (id) => {
-        contactPayloadCalls++;
-        return originalContactPayload(id);
-    };
-    puppet.emit('dirty', {
-        payloadType: PUPPET.types.Payload.Contact,
-        payloadId: pooledContact.id,
-    });
-    await delay(50);
-    t.ok(contactPayloadCalls >= 1, `dirty(Contact) for pooled id must trigger contactPayload via ready(true); got ${contactPayloadCalls} call(s)`);
-    await wechaty.stop();
-});
-//# sourceMappingURL=puppet-mixin-dirty-pool.spec.js.map

package/dist/esm/src/wechaty-mixins/puppet-mixin-dirty-pool.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"puppet-mixin-dirty-pool.spec.js","sourceRoot":"","sources":["../../../../src/wechaty-mixins/puppet-mixin-dirty-pool.spec.ts"],"names":[],"mappings":"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"}