@peerbit/pubsub 2.0.5 → 2.0.7
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/lib/esm/index.d.ts +4 -2
- package/lib/esm/index.js +70 -45
- package/lib/esm/index.js.map +1 -1
- package/package.json +3 -3
- package/src/index.ts +85 -52
package/lib/esm/index.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import type { PeerId as Libp2pPeerId } from "@libp2p/interface/peer-id";
|
|
2
2
|
import { AcknowledgeDelivery, DataMessage, SeekDelivery, SilentDelivery } from "@peerbit/stream-interface";
|
|
3
3
|
import { DirectStream, DirectStreamComponents, DirectStreamOptions, PeerStreams } from "@peerbit/stream";
|
|
4
|
-
import { PubSub, SubscriptionData } from "@peerbit/pubsub-interface";
|
|
4
|
+
import { PubSub, SubscriptionData, PubSubEvents } from "@peerbit/pubsub-interface";
|
|
5
5
|
import { PublicSignKey } from "@peerbit/crypto";
|
|
6
|
-
import { PubSubEvents } from "@peerbit/pubsub-interface";
|
|
7
6
|
export declare const logger: import("pino").Logger<never>;
|
|
8
7
|
export interface PeerStreamsInit {
|
|
9
8
|
id: Libp2pPeerId;
|
|
@@ -54,8 +53,11 @@ export declare class DirectSub extends DirectStream<PubSubEvents> implements Pub
|
|
|
54
53
|
client?: string;
|
|
55
54
|
}): Promise<Uint8Array>;
|
|
56
55
|
private deletePeerFromTopic;
|
|
56
|
+
private getSubscriptionOverlap;
|
|
57
|
+
onPeerSession(key: PublicSignKey, session: number): void;
|
|
57
58
|
onPeerReachable(publicKey: PublicSignKey): Promise<void>;
|
|
58
59
|
onPeerUnreachable(publicKeyHash: string): void;
|
|
60
|
+
private removeSubscriptions;
|
|
59
61
|
private subscriptionMessageIsLatest;
|
|
60
62
|
private addPeersOnTopic;
|
|
61
63
|
onDataMessage(from: PublicSignKey, stream: PeerStreams, message: DataMessage, seenBefore: number): Promise<boolean | undefined>;
|
package/lib/esm/index.js
CHANGED
|
@@ -43,14 +43,15 @@ export class DirectSub extends DirectStream {
|
|
|
43
43
|
throw new Error("Pubsub has not started");
|
|
44
44
|
}
|
|
45
45
|
const newTopicsForTopicData = [];
|
|
46
|
-
|
|
46
|
+
let prev = this.subscriptions.get(topic);
|
|
47
47
|
if (prev) {
|
|
48
48
|
prev.counter += 1;
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
|
-
|
|
51
|
+
prev = {
|
|
52
52
|
counter: 1
|
|
53
|
-
}
|
|
53
|
+
};
|
|
54
|
+
this.subscriptions.set(topic, prev);
|
|
54
55
|
newTopicsForTopicData.push(topic);
|
|
55
56
|
this.listenForSubscribers(topic);
|
|
56
57
|
}
|
|
@@ -60,7 +61,10 @@ export class DirectSub extends DirectStream {
|
|
|
60
61
|
topics: newTopicsForTopicData,
|
|
61
62
|
requestSubscribers: true
|
|
62
63
|
}).bytes()),
|
|
63
|
-
header: new MessageHeader({
|
|
64
|
+
header: new MessageHeader({
|
|
65
|
+
mode: new SeekDelivery({ redundancy: 2 }),
|
|
66
|
+
session: this.session
|
|
67
|
+
})
|
|
64
68
|
});
|
|
65
69
|
await this.publishMessage(this.publicKey, await message.sign(this.sign));
|
|
66
70
|
}
|
|
@@ -77,24 +81,27 @@ export class DirectSub extends DirectStream {
|
|
|
77
81
|
}
|
|
78
82
|
const subscriptions = this.subscriptions.get(topic);
|
|
79
83
|
logger.debug(`unsubscribe from ${topic} - am subscribed with subscriptions ${subscriptions}`);
|
|
80
|
-
if (subscriptions?.counter && subscriptions?.counter >= 0) {
|
|
81
|
-
subscriptions.counter -= 1;
|
|
82
|
-
}
|
|
83
84
|
const peersOnTopic = this.topicsToPeers.get(topic);
|
|
84
85
|
if (peersOnTopic) {
|
|
85
86
|
for (const peer of peersOnTopic) {
|
|
86
87
|
this.lastSubscriptionMessages.delete(peer);
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
|
-
if (!subscriptions
|
|
90
|
+
if (!subscriptions) {
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
93
|
+
if (subscriptions?.counter && subscriptions?.counter >= 0) {
|
|
94
|
+
subscriptions.counter -= 1;
|
|
95
|
+
}
|
|
96
|
+
if (!subscriptions.counter || options?.force) {
|
|
90
97
|
await this.publishMessage(this.publicKey, await new DataMessage({
|
|
91
98
|
header: new MessageHeader({
|
|
92
|
-
mode: new AnyWhere(
|
|
93
|
-
|
|
94
|
-
to: [...this.getPeersOnTopics([topic])]
|
|
95
|
-
} */)
|
|
99
|
+
mode: new AnyWhere(), // TODO make this better
|
|
100
|
+
session: this.session
|
|
96
101
|
}),
|
|
97
|
-
data: toUint8Array(new Unsubscribe({
|
|
102
|
+
data: toUint8Array(new Unsubscribe({
|
|
103
|
+
topics: [topic]
|
|
104
|
+
}).bytes())
|
|
98
105
|
}).sign(this.sign));
|
|
99
106
|
this.subscriptions.delete(topic);
|
|
100
107
|
this.topics.delete(topic);
|
|
@@ -140,7 +147,8 @@ export class DirectSub extends DirectStream {
|
|
|
140
147
|
mode: new SeekDelivery({
|
|
141
148
|
to: to ? [to.hashcode()] : [],
|
|
142
149
|
redundancy: 2
|
|
143
|
-
})
|
|
150
|
+
}),
|
|
151
|
+
session: this.session
|
|
144
152
|
})
|
|
145
153
|
}).sign(this.sign));
|
|
146
154
|
}
|
|
@@ -148,7 +156,7 @@ export class DirectSub extends DirectStream {
|
|
|
148
156
|
const newPeers = new Set();
|
|
149
157
|
if (topics?.length) {
|
|
150
158
|
for (const topic of topics) {
|
|
151
|
-
const peersOnTopic = this.topicsToPeers.get(topic
|
|
159
|
+
const peersOnTopic = this.topicsToPeers.get(topic);
|
|
152
160
|
if (peersOnTopic) {
|
|
153
161
|
peersOnTopic.forEach((peer) => {
|
|
154
162
|
newPeers.add(peer);
|
|
@@ -210,10 +218,30 @@ export class DirectSub extends DirectStream {
|
|
|
210
218
|
this.topicsToPeers.get(topic)?.delete(publicKeyHash);
|
|
211
219
|
return change;
|
|
212
220
|
}
|
|
221
|
+
getSubscriptionOverlap(topics) {
|
|
222
|
+
const subscriptions = [];
|
|
223
|
+
if (topics) {
|
|
224
|
+
for (const topic of topics) {
|
|
225
|
+
const subscription = this.subscriptions.get(topic);
|
|
226
|
+
if (subscription) {
|
|
227
|
+
subscriptions.push(topic);
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
for (const [topic, _subscription] of this.subscriptions) {
|
|
233
|
+
subscriptions.push(topic);
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
return subscriptions;
|
|
237
|
+
}
|
|
238
|
+
onPeerSession(key, session) {
|
|
239
|
+
// reset subs, the peer has restarted
|
|
240
|
+
this.removeSubscriptions(key.hashcode());
|
|
241
|
+
}
|
|
213
242
|
async onPeerReachable(publicKey) {
|
|
214
243
|
// Aggregate subscribers for my topics through this new peer because if we don't do this we might end up with a situtation where
|
|
215
244
|
// we act as a relay and relay messages for a topic, but don't forward it to this new peer because we never learned about their subscriptions
|
|
216
|
-
/* await this.requestSubscribers([...this.topics.keys()], publicKey); */
|
|
217
245
|
const resp = super.onPeerReachable(publicKey);
|
|
218
246
|
const stream = this.peers.get(publicKey.hashcode());
|
|
219
247
|
if (stream && this.subscriptions.size > 0) {
|
|
@@ -221,11 +249,12 @@ export class DirectSub extends DirectStream {
|
|
|
221
249
|
// tell the peer about all topics we subscribe to
|
|
222
250
|
this.publishMessage(this.publicKey, await new DataMessage({
|
|
223
251
|
data: toUint8Array(new Subscribe({
|
|
224
|
-
topics:
|
|
252
|
+
topics: this.getSubscriptionOverlap(),
|
|
225
253
|
requestSubscribers: true
|
|
226
254
|
}).bytes()),
|
|
227
255
|
header: new MessageHeader({
|
|
228
|
-
mode: new SeekDelivery({ redundancy: 2 })
|
|
256
|
+
mode: new SeekDelivery({ redundancy: 2 }),
|
|
257
|
+
session: this.session
|
|
229
258
|
})
|
|
230
259
|
}).sign(this.sign)),
|
|
231
260
|
[stream];
|
|
@@ -234,6 +263,9 @@ export class DirectSub extends DirectStream {
|
|
|
234
263
|
}
|
|
235
264
|
onPeerUnreachable(publicKeyHash) {
|
|
236
265
|
super.onPeerUnreachable(publicKeyHash);
|
|
266
|
+
this.removeSubscriptions(publicKeyHash);
|
|
267
|
+
}
|
|
268
|
+
removeSubscriptions(publicKeyHash) {
|
|
237
269
|
const peerTopics = this.peerToTopic.get(publicKeyHash);
|
|
238
270
|
const changed = [];
|
|
239
271
|
if (peerTopics) {
|
|
@@ -257,8 +289,8 @@ export class DirectSub extends DirectStream {
|
|
|
257
289
|
for (const topic of pubsubMessage.topics) {
|
|
258
290
|
const lastTimestamp = this.lastSubscriptionMessages
|
|
259
291
|
.get(subscriberKey)
|
|
260
|
-
?.get(topic)?.header.
|
|
261
|
-
if (lastTimestamp != null && lastTimestamp > message.header.
|
|
292
|
+
?.get(topic)?.header.timestamp;
|
|
293
|
+
if (lastTimestamp != null && lastTimestamp > message.header.timestamp) {
|
|
262
294
|
return false; // message is old
|
|
263
295
|
}
|
|
264
296
|
}
|
|
@@ -306,7 +338,7 @@ export class DirectSub extends DirectStream {
|
|
|
306
338
|
(pubsubMessage.topics.length === 0 && meInTOs);
|
|
307
339
|
}
|
|
308
340
|
if (isForMe) {
|
|
309
|
-
if ((await this.
|
|
341
|
+
if ((await this.verifyAndProcess(message)) === false) {
|
|
310
342
|
logger.warn("Recieved message that did not verify PubSubData");
|
|
311
343
|
return false;
|
|
312
344
|
}
|
|
@@ -343,7 +375,7 @@ export class DirectSub extends DirectStream {
|
|
|
343
375
|
}
|
|
344
376
|
}
|
|
345
377
|
else {
|
|
346
|
-
if (
|
|
378
|
+
if ((await this.verifyAndProcess(message)) === false) {
|
|
347
379
|
logger.warn("Recieved message that did not verify Unsubscribe");
|
|
348
380
|
return false;
|
|
349
381
|
}
|
|
@@ -359,7 +391,8 @@ export class DirectSub extends DirectStream {
|
|
|
359
391
|
logger.info("Recieved subscription message with no topics");
|
|
360
392
|
return false;
|
|
361
393
|
}
|
|
362
|
-
if (
|
|
394
|
+
if (seenBefore === 0 &&
|
|
395
|
+
this.subscriptionMessageIsLatest(message, pubsubMessage)) {
|
|
363
396
|
const changed = [];
|
|
364
397
|
pubsubMessage.topics.forEach((topic) => {
|
|
365
398
|
const peers = this.topics.get(topic);
|
|
@@ -371,31 +404,27 @@ export class DirectSub extends DirectStream {
|
|
|
371
404
|
// subscription where data is undefined is not intended to replace existing data
|
|
372
405
|
const existingSubscription = peers.get(senderKey);
|
|
373
406
|
if (!existingSubscription ||
|
|
374
|
-
existingSubscription.
|
|
407
|
+
existingSubscription.session < message.header.session) {
|
|
375
408
|
peers.set(senderKey, new SubscriptionData({
|
|
376
|
-
|
|
409
|
+
session: message.header.session,
|
|
410
|
+
timestamp: message.header.timestamp, // TODO update timestamps on all messages?
|
|
377
411
|
publicKey: sender
|
|
378
412
|
}));
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
413
|
+
changed.push(topic);
|
|
414
|
+
}
|
|
415
|
+
if (!existingSubscription) {
|
|
416
|
+
this.topicsToPeers.get(topic)?.add(senderKey);
|
|
417
|
+
this.peerToTopic.get(senderKey)?.add(topic);
|
|
382
418
|
}
|
|
383
|
-
this.topicsToPeers.get(topic)?.add(senderKey);
|
|
384
|
-
this.peerToTopic.get(senderKey)?.add(topic);
|
|
385
419
|
});
|
|
386
|
-
if (changed.length > 0
|
|
420
|
+
if (changed.length > 0) {
|
|
387
421
|
this.dispatchEvent(new CustomEvent("subscribe", {
|
|
388
422
|
detail: new SubscriptionEvent(sender, changed)
|
|
389
423
|
}));
|
|
390
424
|
}
|
|
391
425
|
if (pubsubMessage.requestSubscribers) {
|
|
392
426
|
// respond if we are subscribing
|
|
393
|
-
const mySubscriptions = pubsubMessage.topics
|
|
394
|
-
.map((x) => {
|
|
395
|
-
const subscription = this.subscriptions.get(x);
|
|
396
|
-
return subscription ? x : undefined;
|
|
397
|
-
})
|
|
398
|
-
.filter((x) => !!x);
|
|
427
|
+
const mySubscriptions = this.getSubscriptionOverlap(pubsubMessage.topics);
|
|
399
428
|
if (mySubscriptions.length > 0) {
|
|
400
429
|
const response = new DataMessage({
|
|
401
430
|
data: toUint8Array(new Subscribe({
|
|
@@ -404,6 +433,7 @@ export class DirectSub extends DirectStream {
|
|
|
404
433
|
}).bytes()),
|
|
405
434
|
// needs to be Ack or Silent else we will run into a infite message loop
|
|
406
435
|
header: new MessageHeader({
|
|
436
|
+
session: this.session,
|
|
407
437
|
mode: new SeekDelivery({
|
|
408
438
|
redundancy: 2,
|
|
409
439
|
to: [senderKey]
|
|
@@ -443,13 +473,7 @@ export class DirectSub extends DirectStream {
|
|
|
443
473
|
this.relayMessage(from, message).catch(logError);
|
|
444
474
|
}
|
|
445
475
|
else if (pubsubMessage instanceof GetSubscribers) {
|
|
446
|
-
const subscriptionsToSend =
|
|
447
|
-
for (const topic of pubsubMessage.topics) {
|
|
448
|
-
const subscription = this.subscriptions.get(topic);
|
|
449
|
-
if (subscription) {
|
|
450
|
-
subscriptionsToSend.push(topic);
|
|
451
|
-
}
|
|
452
|
-
}
|
|
476
|
+
const subscriptionsToSend = this.getSubscriptionOverlap(pubsubMessage.topics);
|
|
453
477
|
if (subscriptionsToSend.length > 0) {
|
|
454
478
|
// respond
|
|
455
479
|
this.publishMessage(this.publicKey, await new DataMessage({
|
|
@@ -461,7 +485,8 @@ export class DirectSub extends DirectStream {
|
|
|
461
485
|
mode: new SilentDelivery({
|
|
462
486
|
redundancy: 2,
|
|
463
487
|
to: [sender.hashcode()]
|
|
464
|
-
})
|
|
488
|
+
}),
|
|
489
|
+
session: this.session
|
|
465
490
|
})
|
|
466
491
|
}).sign(this.sign), [stream]); // send back to same stream
|
|
467
492
|
}
|
package/lib/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@peerbit/pubsub",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.7",
|
|
4
4
|
"description": "Direct streaming for libp2p",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -53,9 +53,9 @@
|
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
55
|
"@peerbit/logger": "1.0.2",
|
|
56
|
-
"@peerbit/stream": "
|
|
56
|
+
"@peerbit/stream": "3.0.0",
|
|
57
57
|
"@peerbit/uint8arrays": "3.0.1",
|
|
58
58
|
"libp2p": "^1.1.0"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "2d77ddb8360639f6a1ec2e4d3f6e3d791245c926"
|
|
61
61
|
}
|
package/src/index.ts
CHANGED
|
@@ -30,11 +30,11 @@ import {
|
|
|
30
30
|
PubSub,
|
|
31
31
|
DataEvent,
|
|
32
32
|
SubscriptionData,
|
|
33
|
-
PublishEvent
|
|
33
|
+
PublishEvent,
|
|
34
|
+
PubSubEvents
|
|
34
35
|
} from "@peerbit/pubsub-interface";
|
|
35
36
|
import { getPublicKeyFromPeerId, PublicSignKey } from "@peerbit/crypto";
|
|
36
37
|
import { CustomEvent } from "@libp2p/interface";
|
|
37
|
-
import { PubSubEvents } from "@peerbit/pubsub-interface";
|
|
38
38
|
|
|
39
39
|
export const logger = logFn({ module: "lazysub", level: "warn" });
|
|
40
40
|
const logError = (e?: { message: string }) => logger.error(e?.message);
|
|
@@ -95,13 +95,14 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
const newTopicsForTopicData: string[] = [];
|
|
98
|
-
|
|
98
|
+
let prev = this.subscriptions.get(topic);
|
|
99
99
|
if (prev) {
|
|
100
100
|
prev.counter += 1;
|
|
101
101
|
} else {
|
|
102
|
-
|
|
102
|
+
prev = {
|
|
103
103
|
counter: 1
|
|
104
|
-
}
|
|
104
|
+
};
|
|
105
|
+
this.subscriptions.set(topic, prev);
|
|
105
106
|
|
|
106
107
|
newTopicsForTopicData.push(topic);
|
|
107
108
|
this.listenForSubscribers(topic);
|
|
@@ -115,7 +116,10 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
115
116
|
requestSubscribers: true
|
|
116
117
|
}).bytes()
|
|
117
118
|
),
|
|
118
|
-
header: new MessageHeader({
|
|
119
|
+
header: new MessageHeader({
|
|
120
|
+
mode: new SeekDelivery({ redundancy: 2 }),
|
|
121
|
+
session: this.session
|
|
122
|
+
})
|
|
119
123
|
});
|
|
120
124
|
|
|
121
125
|
await this.publishMessage(this.publicKey, await message.sign(this.sign));
|
|
@@ -142,27 +146,34 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
142
146
|
`unsubscribe from ${topic} - am subscribed with subscriptions ${subscriptions}`
|
|
143
147
|
);
|
|
144
148
|
|
|
145
|
-
if (subscriptions?.counter && subscriptions?.counter >= 0) {
|
|
146
|
-
subscriptions.counter -= 1;
|
|
147
|
-
}
|
|
148
|
-
|
|
149
149
|
const peersOnTopic = this.topicsToPeers.get(topic);
|
|
150
150
|
if (peersOnTopic) {
|
|
151
151
|
for (const peer of peersOnTopic) {
|
|
152
152
|
this.lastSubscriptionMessages.delete(peer);
|
|
153
153
|
}
|
|
154
154
|
}
|
|
155
|
-
|
|
155
|
+
|
|
156
|
+
if (!subscriptions) {
|
|
157
|
+
return false;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
if (subscriptions?.counter && subscriptions?.counter >= 0) {
|
|
161
|
+
subscriptions.counter -= 1;
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
if (!subscriptions.counter || options?.force) {
|
|
156
165
|
await this.publishMessage(
|
|
157
166
|
this.publicKey,
|
|
158
167
|
await new DataMessage({
|
|
159
168
|
header: new MessageHeader({
|
|
160
|
-
mode: new AnyWhere(
|
|
161
|
-
|
|
162
|
-
to: [...this.getPeersOnTopics([topic])]
|
|
163
|
-
} */)
|
|
169
|
+
mode: new AnyWhere(), // TODO make this better
|
|
170
|
+
session: this.session
|
|
164
171
|
}),
|
|
165
|
-
data: toUint8Array(
|
|
172
|
+
data: toUint8Array(
|
|
173
|
+
new Unsubscribe({
|
|
174
|
+
topics: [topic]
|
|
175
|
+
}).bytes()
|
|
176
|
+
)
|
|
166
177
|
}).sign(this.sign)
|
|
167
178
|
);
|
|
168
179
|
|
|
@@ -224,7 +235,8 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
224
235
|
mode: new SeekDelivery({
|
|
225
236
|
to: to ? [to.hashcode()] : [],
|
|
226
237
|
redundancy: 2
|
|
227
|
-
})
|
|
238
|
+
}),
|
|
239
|
+
session: this.session
|
|
228
240
|
})
|
|
229
241
|
}).sign(this.sign)
|
|
230
242
|
);
|
|
@@ -234,7 +246,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
234
246
|
const newPeers: Set<string> = new Set();
|
|
235
247
|
if (topics?.length) {
|
|
236
248
|
for (const topic of topics) {
|
|
237
|
-
const peersOnTopic = this.topicsToPeers.get(topic
|
|
249
|
+
const peersOnTopic = this.topicsToPeers.get(topic);
|
|
238
250
|
if (peersOnTopic) {
|
|
239
251
|
peersOnTopic.forEach((peer) => {
|
|
240
252
|
newPeers.add(peer);
|
|
@@ -327,13 +339,32 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
327
339
|
return change;
|
|
328
340
|
}
|
|
329
341
|
|
|
342
|
+
private getSubscriptionOverlap(topics?: string[]) {
|
|
343
|
+
const subscriptions: string[] = [];
|
|
344
|
+
if (topics) {
|
|
345
|
+
for (const topic of topics) {
|
|
346
|
+
const subscription = this.subscriptions.get(topic);
|
|
347
|
+
if (subscription) {
|
|
348
|
+
subscriptions.push(topic);
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
} else {
|
|
352
|
+
for (const [topic, _subscription] of this.subscriptions) {
|
|
353
|
+
subscriptions.push(topic);
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
return subscriptions;
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
public onPeerSession(key: PublicSignKey, session: number): void {
|
|
360
|
+
// reset subs, the peer has restarted
|
|
361
|
+
this.removeSubscriptions(key.hashcode());
|
|
362
|
+
}
|
|
363
|
+
|
|
330
364
|
public async onPeerReachable(publicKey: PublicSignKey) {
|
|
331
365
|
// Aggregate subscribers for my topics through this new peer because if we don't do this we might end up with a situtation where
|
|
332
366
|
// we act as a relay and relay messages for a topic, but don't forward it to this new peer because we never learned about their subscriptions
|
|
333
|
-
/* await this.requestSubscribers([...this.topics.keys()], publicKey); */
|
|
334
|
-
|
|
335
367
|
const resp = super.onPeerReachable(publicKey);
|
|
336
|
-
|
|
337
368
|
const stream = this.peers.get(publicKey.hashcode());
|
|
338
369
|
if (stream && this.subscriptions.size > 0) {
|
|
339
370
|
// is new neighbour
|
|
@@ -343,12 +374,13 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
343
374
|
await new DataMessage({
|
|
344
375
|
data: toUint8Array(
|
|
345
376
|
new Subscribe({
|
|
346
|
-
topics:
|
|
377
|
+
topics: this.getSubscriptionOverlap(),
|
|
347
378
|
requestSubscribers: true
|
|
348
379
|
}).bytes()
|
|
349
380
|
),
|
|
350
381
|
header: new MessageHeader({
|
|
351
|
-
mode: new SeekDelivery({ redundancy: 2 })
|
|
382
|
+
mode: new SeekDelivery({ redundancy: 2 }),
|
|
383
|
+
session: this.session
|
|
352
384
|
})
|
|
353
385
|
}).sign(this.sign)
|
|
354
386
|
),
|
|
@@ -360,7 +392,10 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
360
392
|
|
|
361
393
|
public onPeerUnreachable(publicKeyHash: string) {
|
|
362
394
|
super.onPeerUnreachable(publicKeyHash);
|
|
395
|
+
this.removeSubscriptions(publicKeyHash);
|
|
396
|
+
}
|
|
363
397
|
|
|
398
|
+
private removeSubscriptions(publicKeyHash: string) {
|
|
364
399
|
const peerTopics = this.peerToTopic.get(publicKeyHash);
|
|
365
400
|
|
|
366
401
|
const changed: string[] = [];
|
|
@@ -396,8 +431,8 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
396
431
|
for (const topic of pubsubMessage.topics) {
|
|
397
432
|
const lastTimestamp = this.lastSubscriptionMessages
|
|
398
433
|
.get(subscriberKey)
|
|
399
|
-
?.get(topic)?.header.
|
|
400
|
-
if (lastTimestamp != null && lastTimestamp > message.header.
|
|
434
|
+
?.get(topic)?.header.timestamp;
|
|
435
|
+
if (lastTimestamp != null && lastTimestamp > message.header.timestamp) {
|
|
401
436
|
return false; // message is old
|
|
402
437
|
}
|
|
403
438
|
}
|
|
@@ -469,7 +504,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
469
504
|
}
|
|
470
505
|
|
|
471
506
|
if (isForMe) {
|
|
472
|
-
if ((await this.
|
|
507
|
+
if ((await this.verifyAndProcess(message)) === false) {
|
|
473
508
|
logger.warn("Recieved message that did not verify PubSubData");
|
|
474
509
|
return false;
|
|
475
510
|
}
|
|
@@ -520,7 +555,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
520
555
|
this.relayMessage(from, message).catch(logError);
|
|
521
556
|
}
|
|
522
557
|
} else {
|
|
523
|
-
if (
|
|
558
|
+
if ((await this.verifyAndProcess(message)) === false) {
|
|
524
559
|
logger.warn("Recieved message that did not verify Unsubscribe");
|
|
525
560
|
return false;
|
|
526
561
|
}
|
|
@@ -541,7 +576,10 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
541
576
|
return false;
|
|
542
577
|
}
|
|
543
578
|
|
|
544
|
-
if (
|
|
579
|
+
if (
|
|
580
|
+
seenBefore === 0 &&
|
|
581
|
+
this.subscriptionMessageIsLatest(message, pubsubMessage)
|
|
582
|
+
) {
|
|
545
583
|
const changed: string[] = [];
|
|
546
584
|
pubsubMessage.topics.forEach((topic) => {
|
|
547
585
|
const peers = this.topics.get(topic);
|
|
@@ -557,25 +595,27 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
557
595
|
|
|
558
596
|
if (
|
|
559
597
|
!existingSubscription ||
|
|
560
|
-
existingSubscription.
|
|
598
|
+
existingSubscription.session < message.header.session
|
|
561
599
|
) {
|
|
562
600
|
peers.set(
|
|
563
601
|
senderKey,
|
|
564
602
|
new SubscriptionData({
|
|
565
|
-
|
|
603
|
+
session: message.header.session,
|
|
604
|
+
timestamp: message.header.timestamp, // TODO update timestamps on all messages?
|
|
566
605
|
publicKey: sender
|
|
567
606
|
})
|
|
568
607
|
);
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
}
|
|
608
|
+
|
|
609
|
+
changed.push(topic);
|
|
572
610
|
}
|
|
573
611
|
|
|
574
|
-
|
|
575
|
-
|
|
612
|
+
if (!existingSubscription) {
|
|
613
|
+
this.topicsToPeers.get(topic)?.add(senderKey);
|
|
614
|
+
this.peerToTopic.get(senderKey)?.add(topic);
|
|
615
|
+
}
|
|
576
616
|
});
|
|
577
617
|
|
|
578
|
-
if (changed.length > 0
|
|
618
|
+
if (changed.length > 0) {
|
|
579
619
|
this.dispatchEvent(
|
|
580
620
|
new CustomEvent<SubscriptionEvent>("subscribe", {
|
|
581
621
|
detail: new SubscriptionEvent(sender, changed)
|
|
@@ -585,13 +625,9 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
585
625
|
|
|
586
626
|
if (pubsubMessage.requestSubscribers) {
|
|
587
627
|
// respond if we are subscribing
|
|
588
|
-
const mySubscriptions =
|
|
589
|
-
.
|
|
590
|
-
|
|
591
|
-
return subscription ? x : undefined;
|
|
592
|
-
})
|
|
593
|
-
.filter((x) => !!x) as string[];
|
|
594
|
-
|
|
628
|
+
const mySubscriptions = this.getSubscriptionOverlap(
|
|
629
|
+
pubsubMessage.topics
|
|
630
|
+
);
|
|
595
631
|
if (mySubscriptions.length > 0) {
|
|
596
632
|
const response = new DataMessage({
|
|
597
633
|
data: toUint8Array(
|
|
@@ -602,6 +638,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
602
638
|
),
|
|
603
639
|
// needs to be Ack or Silent else we will run into a infite message loop
|
|
604
640
|
header: new MessageHeader({
|
|
641
|
+
session: this.session,
|
|
605
642
|
mode: new SeekDelivery({
|
|
606
643
|
redundancy: 2,
|
|
607
644
|
to: [senderKey]
|
|
@@ -657,14 +694,9 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
657
694
|
// DONT await this since it might introduce a dead-lock
|
|
658
695
|
this.relayMessage(from, message).catch(logError);
|
|
659
696
|
} else if (pubsubMessage instanceof GetSubscribers) {
|
|
660
|
-
const subscriptionsToSend: string[] =
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
if (subscription) {
|
|
664
|
-
subscriptionsToSend.push(topic);
|
|
665
|
-
}
|
|
666
|
-
}
|
|
667
|
-
|
|
697
|
+
const subscriptionsToSend: string[] = this.getSubscriptionOverlap(
|
|
698
|
+
pubsubMessage.topics
|
|
699
|
+
);
|
|
668
700
|
if (subscriptionsToSend.length > 0) {
|
|
669
701
|
// respond
|
|
670
702
|
this.publishMessage(
|
|
@@ -680,7 +712,8 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
680
712
|
mode: new SilentDelivery({
|
|
681
713
|
redundancy: 2,
|
|
682
714
|
to: [sender.hashcode()]
|
|
683
|
-
})
|
|
715
|
+
}),
|
|
716
|
+
session: this.session
|
|
684
717
|
})
|
|
685
718
|
}).sign(this.sign),
|
|
686
719
|
[stream]
|