@juzi/wechaty-puppet-service 1.0.124 → 1.0.125
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
- package/dist/cjs/src/client/puppet-service.js +120 -16
- package/dist/cjs/src/client/puppet-service.js.map +1 -1
- package/dist/cjs/src/package-json.js +3 -3
- package/dist/cjs/tests/dirty-gen-guard.spec.d.ts +3 -0
- package/dist/cjs/tests/dirty-gen-guard.spec.d.ts.map +1 -0
- package/dist/cjs/tests/dirty-gen-guard.spec.js +206 -0
- package/dist/cjs/tests/dirty-gen-guard.spec.js.map +1 -0
- package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
- package/dist/esm/src/client/puppet-service.js +120 -16
- package/dist/esm/src/client/puppet-service.js.map +1 -1
- package/dist/esm/src/package-json.js +3 -3
- package/dist/esm/tests/dirty-gen-guard.spec.d.ts +3 -0
- package/dist/esm/tests/dirty-gen-guard.spec.d.ts.map +1 -0
- package/dist/esm/tests/dirty-gen-guard.spec.js +178 -0
- package/dist/esm/tests/dirty-gen-guard.spec.js.map +1 -0
- package/package.json +3 -3
- package/src/client/puppet-service.ts +120 -16
- package/src/package-json.ts +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -295,6 +295,34 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
295
295
|
break;
|
|
296
296
|
case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_DIRTY: {
|
|
297
297
|
const dirtyPayload = JSON.parse(payload);
|
|
298
|
+
/**
|
|
299
|
+
* Bump the generation counter *before* awaiting fastDirty so the
|
|
300
|
+
* whole fastDirty window is covered: any raw fetch that started
|
|
301
|
+
* before this dirty and resolves while fastDirty is deleting the
|
|
302
|
+
* FlashStore row must be judged stale by `isFreshWrite` and skip
|
|
303
|
+
* its write-back -- otherwise it re-poisons the row we just
|
|
304
|
+
* cleared and the value only refreshes after a *second* dirty.
|
|
305
|
+
*
|
|
306
|
+
* Upstream cache-mixin.onDirty bumps the same (type, id) again
|
|
307
|
+
* after `emit('dirty')` below; double-bumping is harmless because
|
|
308
|
+
* the counter only moves forward and `isFreshWrite` compares by
|
|
309
|
+
* equality.
|
|
310
|
+
*/
|
|
311
|
+
this.cache.bumpGen(dirtyPayload.payloadType, dirtyPayload.payloadId);
|
|
312
|
+
/**
|
|
313
|
+
* A compound RoomMember dirty (`${roomId}${SEP}${memberId}`) must
|
|
314
|
+
* also bump the bare roomId key: roomMember write-backs are
|
|
315
|
+
* row-level read-modify-writes keyed by roomId, so a single-member
|
|
316
|
+
* dirty has to move that key too or an in-flight roomMember fetch
|
|
317
|
+
* could still write the whole row back stale.
|
|
318
|
+
*/
|
|
319
|
+
if (dirtyPayload.payloadType === PUPPET.types.Dirty.RoomMember
|
|
320
|
+
&& dirtyPayload.payloadId.includes(PUPPET.STRING_SPLITTER)) {
|
|
321
|
+
const [roomId] = dirtyPayload.payloadId.split(PUPPET.STRING_SPLITTER);
|
|
322
|
+
if (roomId) {
|
|
323
|
+
this.cache.bumpGen(PUPPET.types.Dirty.RoomMember, roomId);
|
|
324
|
+
}
|
|
325
|
+
}
|
|
298
326
|
await this.fastDirty(dirtyPayload);
|
|
299
327
|
this.emit('dirty', dirtyPayload);
|
|
300
328
|
break;
|
|
@@ -664,6 +692,9 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
664
692
|
this.log.silly('PuppetService', 'contactRawPayload(%s) cache HIT', id);
|
|
665
693
|
return cachedPayload;
|
|
666
694
|
}
|
|
695
|
+
// Snapshot the gen before the raw fetch so a dirty that lands while
|
|
696
|
+
// the gRPC round-trip is in flight makes the write-back below stale.
|
|
697
|
+
const gen = this.cache.snapshotGen(PUPPET.types.Dirty.Contact, id);
|
|
667
698
|
const request = new wechaty_grpc_1.puppet.ContactPayloadRequest();
|
|
668
699
|
request.setId(id);
|
|
669
700
|
const response = await util_1.default.promisify(this.grpcManager.client.contactPayload
|
|
@@ -701,8 +732,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
701
732
|
realName: response.getRealName(),
|
|
702
733
|
aka: response.getAka(),
|
|
703
734
|
};
|
|
704
|
-
|
|
705
|
-
|
|
735
|
+
if (this.cache.isFreshWrite(PUPPET.types.Dirty.Contact, id, gen)) {
|
|
736
|
+
await this._payloadStore.contact?.set(id, payload);
|
|
737
|
+
this.log.silly('PuppetService', 'contactRawPayload(%s) cache SET', id);
|
|
738
|
+
}
|
|
739
|
+
else {
|
|
740
|
+
this.log.silly('PuppetService', 'contactRawPayload(%s) cache SET skipped: dirty landed during raw fetch', id);
|
|
741
|
+
}
|
|
706
742
|
return payload;
|
|
707
743
|
}
|
|
708
744
|
async contactRawPayloadParser(payload) {
|
|
@@ -726,6 +762,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
726
762
|
}
|
|
727
763
|
if (needGetSet.size > 0) {
|
|
728
764
|
try {
|
|
765
|
+
// Snapshot each id's gen before the batch fetch; write-backs below
|
|
766
|
+
// are validated per id so a dirty on one contact mid-flight only
|
|
767
|
+
// skips that contact's stale write, not the whole batch.
|
|
768
|
+
const genSnap = new Map();
|
|
769
|
+
for (const contactId of needGetSet) {
|
|
770
|
+
genSnap.set(contactId, this.cache.snapshotGen(PUPPET.types.Dirty.Contact, contactId));
|
|
771
|
+
}
|
|
729
772
|
const request = new wechaty_grpc_1.puppet.BatchContactPayloadRequest();
|
|
730
773
|
request.setIdsList(Array.from(needGetSet));
|
|
731
774
|
const response = await util_1.default.promisify(this.grpcManager.client.batchContactPayload
|
|
@@ -735,7 +778,12 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
735
778
|
const contactId = payload.getId();
|
|
736
779
|
const puppetPayload = (0, pb_payload_helper_js_1.contactPbToPayload)(payload);
|
|
737
780
|
result.set(contactId, puppetPayload);
|
|
738
|
-
|
|
781
|
+
if (this.cache.isFreshWrite(PUPPET.types.Dirty.Contact, contactId, genSnap.get(contactId) ?? 0)) {
|
|
782
|
+
await this._payloadStore.contact?.set(contactId, puppetPayload);
|
|
783
|
+
}
|
|
784
|
+
else {
|
|
785
|
+
this.log.silly('PuppetService', 'batchContactRawPayload(%s) cache SET skipped: dirty landed during raw fetch', contactId);
|
|
786
|
+
}
|
|
739
787
|
}
|
|
740
788
|
}
|
|
741
789
|
catch (e) {
|
|
@@ -1656,6 +1704,9 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1656
1704
|
this.log.silly('PuppetService', 'roomRawPayload(%s) cache HIT', id);
|
|
1657
1705
|
return cachedPayload;
|
|
1658
1706
|
}
|
|
1707
|
+
// Snapshot the gen before the raw fetch so a dirty that lands while
|
|
1708
|
+
// the gRPC round-trip is in flight makes the write-back below stale.
|
|
1709
|
+
const gen = this.cache.snapshotGen(PUPPET.types.Dirty.Room, id);
|
|
1659
1710
|
const request = new wechaty_grpc_1.puppet.RoomPayloadRequest();
|
|
1660
1711
|
request.setId(id);
|
|
1661
1712
|
const response = await util_1.default.promisify(this.grpcManager.client.roomPayload
|
|
@@ -1676,8 +1727,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1676
1727
|
if (createTime) {
|
|
1677
1728
|
payload.createTime = (0, timestamp_js_1.millisecondsFromTimestamp)(createTime);
|
|
1678
1729
|
}
|
|
1679
|
-
|
|
1680
|
-
|
|
1730
|
+
if (this.cache.isFreshWrite(PUPPET.types.Dirty.Room, id, gen)) {
|
|
1731
|
+
await this._payloadStore.room?.set(id, payload);
|
|
1732
|
+
this.log.silly('PuppetService', 'roomRawPayload(%s) cache SET', id);
|
|
1733
|
+
}
|
|
1734
|
+
else {
|
|
1735
|
+
this.log.silly('PuppetService', 'roomRawPayload(%s) cache SET skipped: dirty landed during raw fetch', id);
|
|
1736
|
+
}
|
|
1681
1737
|
return payload;
|
|
1682
1738
|
}
|
|
1683
1739
|
async roomRawPayloadParser(payload) {
|
|
@@ -1701,6 +1757,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1701
1757
|
}
|
|
1702
1758
|
if (needGetSet.size > 0) {
|
|
1703
1759
|
try {
|
|
1760
|
+
// Snapshot each id's gen before the batch fetch; write-backs below
|
|
1761
|
+
// are validated per id so a dirty on one room mid-flight only skips
|
|
1762
|
+
// that room's stale write, not the whole batch.
|
|
1763
|
+
const genSnap = new Map();
|
|
1764
|
+
for (const roomId of needGetSet) {
|
|
1765
|
+
genSnap.set(roomId, this.cache.snapshotGen(PUPPET.types.Dirty.Room, roomId));
|
|
1766
|
+
}
|
|
1704
1767
|
const request = new wechaty_grpc_1.puppet.BatchRoomPayloadRequest();
|
|
1705
1768
|
request.setIdsList(Array.from(needGetSet));
|
|
1706
1769
|
const response = await util_1.default.promisify(this.grpcManager.client.batchRoomPayload
|
|
@@ -1725,7 +1788,12 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1725
1788
|
puppetPayload.createTime = (0, timestamp_js_1.millisecondsFromTimestamp)(createTime);
|
|
1726
1789
|
}
|
|
1727
1790
|
result.set(roomId, puppetPayload);
|
|
1728
|
-
|
|
1791
|
+
if (this.cache.isFreshWrite(PUPPET.types.Dirty.Room, roomId, genSnap.get(roomId) ?? 0)) {
|
|
1792
|
+
await this._payloadStore.room?.set(roomId, puppetPayload);
|
|
1793
|
+
}
|
|
1794
|
+
else {
|
|
1795
|
+
this.log.silly('PuppetService', 'batchRoomRawPayload(%s) cache SET skipped: dirty landed during raw fetch', roomId);
|
|
1796
|
+
}
|
|
1729
1797
|
}
|
|
1730
1798
|
}
|
|
1731
1799
|
catch (e) {
|
|
@@ -1904,6 +1972,12 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1904
1972
|
}
|
|
1905
1973
|
async roomMemberRawPayload(roomId, contactId) {
|
|
1906
1974
|
this.log.verbose('PuppetService', 'roomMemberRawPayload(%s, %s)', roomId, contactId);
|
|
1975
|
+
// Row-level read-modify-write: the write-back merges the fetched
|
|
1976
|
+
// member into the existing row, so snapshot the room-level gen before
|
|
1977
|
+
// even reading the row. A room-level dirty (bare roomId, or the
|
|
1978
|
+
// room-level bump a compound RoomMember dirty triggers) that lands
|
|
1979
|
+
// anywhere in this window then skips the merge write-back.
|
|
1980
|
+
const roomGen = this.cache.snapshotGen(PUPPET.types.Dirty.RoomMember, roomId);
|
|
1907
1981
|
const cachedPayload = await this._payloadStore.roomMember?.get(roomId);
|
|
1908
1982
|
const cachedRoomMemberPayload = cachedPayload && cachedPayload[contactId];
|
|
1909
1983
|
if (cachedRoomMemberPayload) {
|
|
@@ -1925,11 +1999,16 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1925
1999
|
joinScene: response.getJoinScene(),
|
|
1926
2000
|
joinTime: response.getJoinTime(),
|
|
1927
2001
|
};
|
|
1928
|
-
|
|
1929
|
-
|
|
1930
|
-
|
|
1931
|
-
|
|
1932
|
-
|
|
2002
|
+
if (this.cache.isFreshWrite(PUPPET.types.Dirty.RoomMember, roomId, roomGen)) {
|
|
2003
|
+
await this._payloadStore.roomMember?.set(roomId, {
|
|
2004
|
+
...cachedPayload,
|
|
2005
|
+
[contactId]: payload,
|
|
2006
|
+
});
|
|
2007
|
+
this.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache SET', roomId, contactId);
|
|
2008
|
+
}
|
|
2009
|
+
else {
|
|
2010
|
+
this.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache SET skipped: dirty landed during raw fetch', roomId, contactId);
|
|
2011
|
+
}
|
|
1933
2012
|
return payload;
|
|
1934
2013
|
}
|
|
1935
2014
|
async roomMemberRawPayloadParser(payload) {
|
|
@@ -1942,6 +2021,10 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1942
2021
|
const result = new Map();
|
|
1943
2022
|
const contactIdSet = new Set(contactIdList);
|
|
1944
2023
|
let needGetSet = new Set();
|
|
2024
|
+
// Row-level read-modify-write keyed by roomId: snapshot the room-level
|
|
2025
|
+
// gen before reading the row so a dirty landing anywhere in the window
|
|
2026
|
+
// skips the merged write-back.
|
|
2027
|
+
const roomGen = this.cache.snapshotGen(PUPPET.types.Dirty.RoomMember, roomId);
|
|
1945
2028
|
const cachedPayload = await this._payloadStore.roomMember?.get(roomId) || {};
|
|
1946
2029
|
if (Object.keys(cachedPayload).length > 0) {
|
|
1947
2030
|
for (const contactId of contactIdSet) {
|
|
@@ -1971,7 +2054,12 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1971
2054
|
result.set(contactId, puppetPayload);
|
|
1972
2055
|
cachedPayload[contactId] = puppetPayload;
|
|
1973
2056
|
}
|
|
1974
|
-
|
|
2057
|
+
if (this.cache.isFreshWrite(PUPPET.types.Dirty.RoomMember, roomId, roomGen)) {
|
|
2058
|
+
await this._payloadStore.roomMember?.set(roomId, cachedPayload);
|
|
2059
|
+
}
|
|
2060
|
+
else {
|
|
2061
|
+
this.log.silly('PuppetService', 'batchRoomMemberRawPayload(%s) cache SET skipped: dirty landed during raw fetch', roomId);
|
|
2062
|
+
}
|
|
1975
2063
|
}
|
|
1976
2064
|
catch (e) {
|
|
1977
2065
|
this.log.error('PuppetService', 'batchRoomMemberRawPayload(%s, %s) error: %s, use one by one method', roomId, needGetSet, e);
|
|
@@ -2386,6 +2474,9 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2386
2474
|
this.log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id);
|
|
2387
2475
|
return cachedPayload;
|
|
2388
2476
|
}
|
|
2477
|
+
// Snapshot the gen before the raw fetch so a dirty that lands while
|
|
2478
|
+
// the gRPC round-trip is in flight makes the write-back below stale.
|
|
2479
|
+
const gen = this.cache.snapshotGen(PUPPET.types.Dirty.TagGroup, id);
|
|
2389
2480
|
const request = new wechaty_grpc_1.puppet.TagGroupPayloadRequest();
|
|
2390
2481
|
request.setGroupId(id);
|
|
2391
2482
|
const response = await util_1.default.promisify(this.grpcManager.client.tagGroupPayload
|
|
@@ -2399,8 +2490,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2399
2490
|
name: grpcPayload.getName(),
|
|
2400
2491
|
type: grpcPayload.getType(),
|
|
2401
2492
|
};
|
|
2402
|
-
|
|
2403
|
-
|
|
2493
|
+
if (this.cache.isFreshWrite(PUPPET.types.Dirty.TagGroup, id, gen)) {
|
|
2494
|
+
await this._payloadStore.tagGroup?.set(id, payload);
|
|
2495
|
+
this.log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id);
|
|
2496
|
+
}
|
|
2497
|
+
else {
|
|
2498
|
+
this.log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET skipped: dirty landed during raw fetch', id);
|
|
2499
|
+
}
|
|
2404
2500
|
return payload;
|
|
2405
2501
|
}
|
|
2406
2502
|
async tagPayloadPuppet(tagId) {
|
|
@@ -2410,6 +2506,9 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2410
2506
|
this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tagId);
|
|
2411
2507
|
return cachedPayload;
|
|
2412
2508
|
}
|
|
2509
|
+
// Snapshot the gen before the raw fetch so a dirty that lands while
|
|
2510
|
+
// the gRPC round-trip is in flight makes the write-back below stale.
|
|
2511
|
+
const gen = this.cache.snapshotGen(PUPPET.types.Dirty.Tag, tagId);
|
|
2413
2512
|
const request = new wechaty_grpc_1.puppet.TagPayloadRequest();
|
|
2414
2513
|
request.setTagId(tagId);
|
|
2415
2514
|
const response = await util_1.default.promisify(this.grpcManager.client.tagPayload
|
|
@@ -2424,8 +2523,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2424
2523
|
groupId: grpcPayload.getGroupId(),
|
|
2425
2524
|
type: grpcPayload.getType(),
|
|
2426
2525
|
};
|
|
2427
|
-
|
|
2428
|
-
|
|
2526
|
+
if (this.cache.isFreshWrite(PUPPET.types.Dirty.Tag, tagId, gen)) {
|
|
2527
|
+
await this._payloadStore.tag?.set(tagId, payload);
|
|
2528
|
+
this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', tagId);
|
|
2529
|
+
}
|
|
2530
|
+
else {
|
|
2531
|
+
this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET skipped: dirty landed during raw fetch', tagId);
|
|
2532
|
+
}
|
|
2429
2533
|
return payload;
|
|
2430
2534
|
}
|
|
2431
2535
|
/**
|