wechaty-puppet-matrix 0.0.21 → 0.0.22
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/matrix/cache-manager.d.ts +2 -2
- package/dist/cjs/src/matrix/cache-manager.d.ts.map +1 -1
- package/dist/cjs/src/matrix/cache-manager.js +4 -0
- package/dist/cjs/src/puppet-matrix.js +2 -2
- package/dist/esm/src/matrix/cache-manager.d.ts +2 -2
- package/dist/esm/src/matrix/cache-manager.d.ts.map +1 -1
- package/dist/esm/src/matrix/cache-manager.js +4 -0
- package/dist/esm/src/puppet-matrix.js +2 -2
- package/package.json +2 -2
- package/src/matrix/cache-manager.ts +7 -3
- package/src/puppet-matrix.ts +2 -2
|
@@ -50,8 +50,8 @@ export declare class CacheManager {
|
|
|
50
50
|
getRoomInvitation(messageId: string): Promise<PUPPET.payloads.RoomInvitation | undefined>;
|
|
51
51
|
setRoomInvitation(messageId: string, payload: PUPPET.payloads.RoomInvitation): Promise<void>;
|
|
52
52
|
deleteRoomInvitation(messageId: string): Promise<void>;
|
|
53
|
-
getFriendshipRawPayload(id: string): Promise<PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm | undefined>;
|
|
54
|
-
setFriendshipRawPayload(id: string, payload: PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm): Promise<void>;
|
|
53
|
+
getFriendshipRawPayload(id: string): Promise<PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm | PUPPET.payloads.FriendshipVerify | undefined>;
|
|
54
|
+
setFriendshipRawPayload(id: string, payload: PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm | PUPPET.payloads.FriendshipVerify): Promise<void>;
|
|
55
55
|
getLabelList(): Label[] | undefined;
|
|
56
56
|
setLabelList(labelList: Label[]): void;
|
|
57
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-manager.d.ts","sourceRoot":"","sources":["../../../../src/matrix/cache-manager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAGnD,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAInG,MAAM,MAAM,aAAa,GAAG;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAAA;CAAE,CAAC;AAEpE,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAElC,OAAO,CAAC,aAAa,CAAC,CAA6B;IACnD,OAAO,CAAC,mBAAmB,CAAC,CAAgC;IAC5D,OAAO,CAAC,aAAa,CAAC,CAAoC;IAC1D,OAAO,CAAC,mBAAmB,CAAC,CAA6B;IACzD,OAAO,CAAC,0BAA0B,CAAC,CAA4B;IAC/D,OAAO,CAAC,UAAU,CAAC,CAAoC;IACvD,OAAO,CAAC,gBAAgB,CAAC,CAAmC;IAC5D,OAAO,CAAC,oBAAoB,CAAC,CAAoD;IACjF,OAAO,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"cache-manager.d.ts","sourceRoot":"","sources":["../../../../src/matrix/cache-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -274,6 +274,10 @@ class CacheManager {
|
|
|
274
274
|
async setFriendshipRawPayload(id, payload) {
|
|
275
275
|
if (!id)
|
|
276
276
|
return;
|
|
277
|
+
const res = await this._friendshipCache.get(id);
|
|
278
|
+
if (res) {
|
|
279
|
+
await this._friendshipCache.delete(id);
|
|
280
|
+
}
|
|
277
281
|
await this._friendshipCache.set(id, payload);
|
|
278
282
|
}
|
|
279
283
|
getLabelList() {
|
|
@@ -1139,8 +1139,8 @@ class PuppetMatrix extends PUPPET.Puppet {
|
|
|
1139
1139
|
});
|
|
1140
1140
|
break;
|
|
1141
1141
|
case mod_js_1.EventType.Friendship: {
|
|
1142
|
-
|
|
1143
|
-
|
|
1142
|
+
if (event.payload.type !== PUPPET.types.Friendship.Confirm && event.payload.type !== PUPPET.types.Friendship.Verify) {
|
|
1143
|
+
await this._cacheMgr?.setFriendshipRawPayload(event.payload.contactId, event.payload);
|
|
1144
1144
|
this.emit('friendship', {
|
|
1145
1145
|
friendshipId: event.payload.contactId,
|
|
1146
1146
|
type: event.payload.type,
|
|
@@ -50,8 +50,8 @@ export declare class CacheManager {
|
|
|
50
50
|
getRoomInvitation(messageId: string): Promise<PUPPET.payloads.RoomInvitation | undefined>;
|
|
51
51
|
setRoomInvitation(messageId: string, payload: PUPPET.payloads.RoomInvitation): Promise<void>;
|
|
52
52
|
deleteRoomInvitation(messageId: string): Promise<void>;
|
|
53
|
-
getFriendshipRawPayload(id: string): Promise<PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm | undefined>;
|
|
54
|
-
setFriendshipRawPayload(id: string, payload: PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm): Promise<void>;
|
|
53
|
+
getFriendshipRawPayload(id: string): Promise<PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm | PUPPET.payloads.FriendshipVerify | undefined>;
|
|
54
|
+
setFriendshipRawPayload(id: string, payload: PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm | PUPPET.payloads.FriendshipVerify): Promise<void>;
|
|
55
55
|
getLabelList(): Label[] | undefined;
|
|
56
56
|
setLabelList(labelList: Label[]): void;
|
|
57
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-manager.d.ts","sourceRoot":"","sources":["../../../../src/matrix/cache-manager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAGnD,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAInG,MAAM,MAAM,aAAa,GAAG;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAAA;CAAE,CAAC;AAEpE,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAElC,OAAO,CAAC,aAAa,CAAC,CAA6B;IACnD,OAAO,CAAC,mBAAmB,CAAC,CAAgC;IAC5D,OAAO,CAAC,aAAa,CAAC,CAAoC;IAC1D,OAAO,CAAC,mBAAmB,CAAC,CAA6B;IACzD,OAAO,CAAC,0BAA0B,CAAC,CAA4B;IAC/D,OAAO,CAAC,UAAU,CAAC,CAAoC;IACvD,OAAO,CAAC,gBAAgB,CAAC,CAAmC;IAC5D,OAAO,CAAC,oBAAoB,CAAC,CAAoD;IACjF,OAAO,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"cache-manager.d.ts","sourceRoot":"","sources":["../../../../src/matrix/cache-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -268,6 +268,10 @@ export class CacheManager {
|
|
|
268
268
|
async setFriendshipRawPayload(id, payload) {
|
|
269
269
|
if (!id)
|
|
270
270
|
return;
|
|
271
|
+
const res = await this._friendshipCache.get(id);
|
|
272
|
+
if (res) {
|
|
273
|
+
await this._friendshipCache.delete(id);
|
|
274
|
+
}
|
|
271
275
|
await this._friendshipCache.set(id, payload);
|
|
272
276
|
}
|
|
273
277
|
getLabelList() {
|
|
@@ -1099,8 +1099,8 @@ class PuppetMatrix extends PUPPET.Puppet {
|
|
|
1099
1099
|
});
|
|
1100
1100
|
break;
|
|
1101
1101
|
case EventType.Friendship: {
|
|
1102
|
-
|
|
1103
|
-
|
|
1102
|
+
if (event.payload.type !== PUPPET.types.Friendship.Confirm && event.payload.type !== PUPPET.types.Friendship.Verify) {
|
|
1103
|
+
await this._cacheMgr?.setFriendshipRawPayload(event.payload.contactId, event.payload);
|
|
1104
1104
|
this.emit('friendship', {
|
|
1105
1105
|
friendshipId: event.payload.contactId,
|
|
1106
1106
|
type: event.payload.type,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "wechaty-puppet-matrix",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.22",
|
|
4
4
|
"description": "Puppet matrix for Wechaty",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"typings": "./dist/esm/src/mod.d.ts",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"image-size": "^1.1.1",
|
|
79
79
|
"lru-cache": "^6.0.0",
|
|
80
80
|
"node-cleanup": "^2.1.2",
|
|
81
|
-
"wechaty-web-panel": "^1.6.
|
|
81
|
+
"wechaty-web-panel": "^1.6.76",
|
|
82
82
|
"ws": "^8.18.0",
|
|
83
83
|
"xml2js": "^0.5.0"
|
|
84
84
|
},
|
|
@@ -24,7 +24,7 @@ export class CacheManager {
|
|
|
24
24
|
private _roomCache?: FlashStore<string, ContactPayload>
|
|
25
25
|
private _roomMemberCache?: FlashStore<string, RoomMemberMap>
|
|
26
26
|
private _roomInvitationCache?: FlashStore<string, PUPPET.payloads.RoomInvitation>
|
|
27
|
-
private _friendshipCache?: FlashStore<string, PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm>
|
|
27
|
+
private _friendshipCache?: FlashStore<string, PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm | PUPPET.payloads.FriendshipVerify>
|
|
28
28
|
|
|
29
29
|
private _labelList?: Label[]
|
|
30
30
|
|
|
@@ -338,13 +338,17 @@ export class CacheManager {
|
|
|
338
338
|
* Friendship Cache Section
|
|
339
339
|
* --------------------------------
|
|
340
340
|
*/
|
|
341
|
-
public async getFriendshipRawPayload (id: string): Promise<PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm|undefined> {
|
|
341
|
+
public async getFriendshipRawPayload (id: string): Promise<PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm| PUPPET.payloads.FriendshipVerify | undefined> {
|
|
342
342
|
if (!id) return
|
|
343
343
|
return this._friendshipCache!.get(id)
|
|
344
344
|
}
|
|
345
345
|
|
|
346
|
-
public async setFriendshipRawPayload (id: string, payload: PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm) {
|
|
346
|
+
public async setFriendshipRawPayload (id: string, payload: PUPPET.payloads.FriendshipReceive | PUPPET.payloads.FriendshipConfirm | PUPPET.payloads.FriendshipVerify) {
|
|
347
347
|
if (!id) return
|
|
348
|
+
const res = await this._friendshipCache!.get(id)
|
|
349
|
+
if (res) {
|
|
350
|
+
await this._friendshipCache!.delete(id)
|
|
351
|
+
}
|
|
348
352
|
await this._friendshipCache!.set(id, payload)
|
|
349
353
|
}
|
|
350
354
|
|
package/src/puppet-matrix.ts
CHANGED
|
@@ -1502,8 +1502,8 @@ class PuppetMatrix extends PUPPET.Puppet {
|
|
|
1502
1502
|
})
|
|
1503
1503
|
break
|
|
1504
1504
|
case EventType.Friendship: {
|
|
1505
|
-
|
|
1506
|
-
|
|
1505
|
+
if (event.payload.type !== PUPPET.types.Friendship.Confirm && event.payload.type !== PUPPET.types.Friendship.Verify) {
|
|
1506
|
+
await this._cacheMgr?.setFriendshipRawPayload(event.payload.contactId, event.payload)
|
|
1507
1507
|
this.emit('friendship', {
|
|
1508
1508
|
friendshipId: event.payload.contactId,
|
|
1509
1509
|
type: event.payload.type,
|