@peerbit/pubsub 3.0.5-aa577a5 → 3.0.5-cccc078
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/README.md +5 -0
- package/dist/benchmark/index.js +11 -11
- package/dist/benchmark/index.js.map +1 -1
- package/dist/src/index.d.ts +7 -5
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +42 -42
- package/dist/src/index.js.map +1 -1
- package/package.json +8 -7
- package/src/index.ts +102 -98
package/README.md
CHANGED
|
@@ -21,3 +21,8 @@ Features
|
|
|
21
21
|
- Packet prioritization. Data packages can be sent with different priority. That allows some traffic to pass through the traffic faster than other. This is useful in case of congestion
|
|
22
22
|
- Mode'd delivery. Packages can be sent with different delivery mode 'Acknowledge' (wait for acknowledgement from all known subscribers), 'Seek' (find new subscribers for a topic), 'Silent' (just deliver).
|
|
23
23
|
- Redundancy in data delivery. Data packages can be sent with different redundancy. This means that you can choose to send some packages only in one path (the fastest) or send a package in the 'N' fastest paths (this gives you a redundancy degree of 'N'). This feature is useful when you want to adapt delivery for unstable networks or when you want to make sure that some messages are delivered with high probability (without waiting for Acknowledgemts and retry)
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
Protocol specification (TODO)
|
|
27
|
+
|
|
28
|
+
Currently the protocol itself is not specificed more than as in this implementation with messages types found [here](https://github.com/dao-xyz/peerbit/blob/master/packages/transport/stream-interface/src/messages.ts) and [here](https://github.com/dao-xyz/peerbit/blob/master/packages/transport/pubsub-interface/src/messages.ts). Message handling logic can be found [here](https://github.com/dao-xyz/peerbit/blob/aa577a5e5b2b4920662de5e0efb92fb97a5dc63c/packages/transport/pubsub/src/index.ts#L502) and [here](https://github.com/dao-xyz/peerbit/blob/aa577a5e5b2b4920662de5e0efb92fb97a5dc63c/packages/transport/stream/src/index.ts#L1057).
|
package/dist/benchmark/index.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import B from "benchmark";
|
|
2
|
-
import { TestSession } from "@peerbit/libp2p-test-utils";
|
|
3
|
-
import { DirectSub } from "../src/index.js";
|
|
4
|
-
import crypto from "crypto";
|
|
5
|
-
import { waitForPeers } from "@peerbit/stream";
|
|
6
1
|
import { tcp } from "@libp2p/tcp";
|
|
2
|
+
import { TestSession } from "@peerbit/libp2p-test-utils";
|
|
7
3
|
import { DataEvent } from "@peerbit/pubsub-interface";
|
|
8
|
-
|
|
4
|
+
import { waitForPeers } from "@peerbit/stream";
|
|
5
|
+
import B from "benchmark";
|
|
6
|
+
import crypto from "crypto";
|
|
7
|
+
import { DirectSub } from "../src/index.js";
|
|
8
|
+
// Run with "node --loader ts-node/esm ./benchmark/index.ts"
|
|
9
9
|
// size: 1kb x 1,722 ops/sec ±1.89% (82 runs sampled)
|
|
10
10
|
// size: 1000kb x 107 ops/sec ±2.02% (85 runs sampled)
|
|
11
11
|
const session = await TestSession.disconnected(4, {
|
|
@@ -13,14 +13,14 @@ const session = await TestSession.disconnected(4, {
|
|
|
13
13
|
services: {
|
|
14
14
|
pubsub: (c) => new DirectSub(c, {
|
|
15
15
|
canRelayMessage: true,
|
|
16
|
-
connectionManager: false
|
|
17
|
-
})
|
|
18
|
-
}
|
|
16
|
+
connectionManager: false,
|
|
17
|
+
}),
|
|
18
|
+
},
|
|
19
19
|
});
|
|
20
20
|
await session.connect([
|
|
21
21
|
[session.peers[0], session.peers[1]],
|
|
22
22
|
[session.peers[1], session.peers[2]],
|
|
23
|
-
[session.peers[2], session.peers[3]]
|
|
23
|
+
[session.peers[2], session.peers[3]],
|
|
24
24
|
]);
|
|
25
25
|
/*
|
|
26
26
|
┌─┐
|
|
@@ -66,7 +66,7 @@ for (const size of sizes) {
|
|
|
66
66
|
},
|
|
67
67
|
teardown: () => {
|
|
68
68
|
session.peers[session.peers.length - 1].services.pubsub.removeEventListener("data", listener);
|
|
69
|
-
}
|
|
69
|
+
},
|
|
70
70
|
});
|
|
71
71
|
}
|
|
72
72
|
suite
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../benchmark/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../benchmark/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import { AcknowledgeDelivery, DataMessage, SeekDelivery, SilentDelivery, type IdentificationOptions, type PriorityOptions } from "@peerbit/stream-interface";
|
|
3
|
-
import { DirectStream, type DirectStreamComponents, type DirectStreamOptions, PeerStreams } from "@peerbit/stream";
|
|
4
|
-
import { type PubSub, SubscriptionData, type PubSubEvents } from "@peerbit/pubsub-interface";
|
|
1
|
+
import { type PeerId as Libp2pPeerId } from "@libp2p/interface";
|
|
5
2
|
import { PublicSignKey } from "@peerbit/crypto";
|
|
3
|
+
import { type PubSub, type PubSubEvents, SubscriptionData } from "@peerbit/pubsub-interface";
|
|
4
|
+
import { DirectStream, type DirectStreamComponents, type DirectStreamOptions, type PeerStreams } from "@peerbit/stream";
|
|
5
|
+
import { AcknowledgeDelivery, DataMessage, type IdentificationOptions, type PriorityOptions, SeekDelivery, SilentDelivery } from "@peerbit/stream-interface";
|
|
6
6
|
import { Uint8ArrayList } from "uint8arraylist";
|
|
7
7
|
export declare const toUint8Array: (arr: Uint8ArrayList | Uint8Array) => Uint8Array;
|
|
8
8
|
export declare const logger: import("pino").Logger<never>;
|
|
@@ -34,7 +34,9 @@ export declare class DirectSub extends DirectStream<PubSubEvents> implements Pub
|
|
|
34
34
|
/**
|
|
35
35
|
*
|
|
36
36
|
* @param topic
|
|
37
|
-
* @param
|
|
37
|
+
* @param options
|
|
38
|
+
* @param options.force
|
|
39
|
+
* @param options.data
|
|
38
40
|
* @returns true unsubscribed completely
|
|
39
41
|
*/
|
|
40
42
|
unsubscribe(topic: string, options?: {
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
+
import { CodeError, CustomEvent, } from "@libp2p/interface";
|
|
2
|
+
import { PublicSignKey, getPublicKeyFromPeerId } from "@peerbit/crypto";
|
|
1
3
|
import { logger as logFn } from "@peerbit/logger";
|
|
2
|
-
import {
|
|
3
|
-
import { DirectStream,
|
|
4
|
-
import {
|
|
5
|
-
import { PubSubMessage, Subscribe, PubSubData, Unsubscribe, GetSubscribers, UnsubcriptionEvent, SubscriptionEvent, DataEvent, SubscriptionData, PublishEvent } from "@peerbit/pubsub-interface";
|
|
6
|
-
import { getPublicKeyFromPeerId, PublicSignKey } from "@peerbit/crypto";
|
|
7
|
-
import { CustomEvent } from "@libp2p/interface";
|
|
4
|
+
import { DataEvent, GetSubscribers, PubSubData, PubSubMessage, PublishEvent, Subscribe, SubscriptionData, SubscriptionEvent, UnsubcriptionEvent, Unsubscribe, } from "@peerbit/pubsub-interface";
|
|
5
|
+
import { DirectStream, } from "@peerbit/stream";
|
|
6
|
+
import { AcknowledgeDelivery, AnyWhere, DataMessage, DeliveryError, MessageHeader, NotStartedError, SeekDelivery, SilentDelivery, deliveryModeHasReceiver, } from "@peerbit/stream-interface";
|
|
8
7
|
import { Uint8ArrayList } from "uint8arraylist";
|
|
9
8
|
export const toUint8Array = (arr) => arr instanceof Uint8ArrayList ? arr.subarray() : arr;
|
|
10
9
|
export const logger = logFn({ module: "lazysub", level: "warn" });
|
|
@@ -62,7 +61,7 @@ export class DirectSub extends DirectStream {
|
|
|
62
61
|
}
|
|
63
62
|
else {
|
|
64
63
|
prev = {
|
|
65
|
-
counter: 1
|
|
64
|
+
counter: 1,
|
|
66
65
|
};
|
|
67
66
|
this.subscriptions.set(topic, prev);
|
|
68
67
|
newTopicsForTopicData.push(topic);
|
|
@@ -72,13 +71,13 @@ export class DirectSub extends DirectStream {
|
|
|
72
71
|
const message = new DataMessage({
|
|
73
72
|
data: toUint8Array(new Subscribe({
|
|
74
73
|
topics: newTopicsForTopicData,
|
|
75
|
-
requestSubscribers: true
|
|
74
|
+
requestSubscribers: true,
|
|
76
75
|
}).bytes()),
|
|
77
76
|
header: new MessageHeader({
|
|
78
77
|
priority: 1,
|
|
79
78
|
mode: new SeekDelivery({ redundancy: 2 }),
|
|
80
|
-
session: this.session
|
|
81
|
-
})
|
|
79
|
+
session: this.session,
|
|
80
|
+
}),
|
|
82
81
|
});
|
|
83
82
|
await this.publishMessage(this.publicKey, await message.sign(this.sign));
|
|
84
83
|
}
|
|
@@ -86,7 +85,9 @@ export class DirectSub extends DirectStream {
|
|
|
86
85
|
/**
|
|
87
86
|
*
|
|
88
87
|
* @param topic
|
|
89
|
-
* @param
|
|
88
|
+
* @param options
|
|
89
|
+
* @param options.force
|
|
90
|
+
* @param options.data
|
|
90
91
|
* @returns true unsubscribed completely
|
|
91
92
|
*/
|
|
92
93
|
async unsubscribe(topic, options) {
|
|
@@ -94,7 +95,7 @@ export class DirectSub extends DirectStream {
|
|
|
94
95
|
throw new NotStartedError();
|
|
95
96
|
}
|
|
96
97
|
const subscriptions = this.subscriptions.get(topic);
|
|
97
|
-
logger.debug(`unsubscribe from ${topic} - am subscribed with subscriptions ${subscriptions}`);
|
|
98
|
+
logger.debug(`unsubscribe from ${topic} - am subscribed with subscriptions ${JSON.stringify(subscriptions)}`);
|
|
98
99
|
const peersOnTopic = this.topicsToPeers.get(topic);
|
|
99
100
|
if (peersOnTopic) {
|
|
100
101
|
for (const peer of peersOnTopic) {
|
|
@@ -112,11 +113,11 @@ export class DirectSub extends DirectStream {
|
|
|
112
113
|
header: new MessageHeader({
|
|
113
114
|
mode: new AnyWhere(), // TODO make this better
|
|
114
115
|
session: this.session,
|
|
115
|
-
priority: 1
|
|
116
|
+
priority: 1,
|
|
116
117
|
}),
|
|
117
118
|
data: toUint8Array(new Unsubscribe({
|
|
118
|
-
topics: [topic]
|
|
119
|
-
}).bytes())
|
|
119
|
+
topics: [topic],
|
|
120
|
+
}).bytes()),
|
|
120
121
|
}).sign(this.sign));
|
|
121
122
|
this.subscriptions.delete(topic);
|
|
122
123
|
this.topics.delete(topic);
|
|
@@ -161,11 +162,11 @@ export class DirectSub extends DirectStream {
|
|
|
161
162
|
header: new MessageHeader({
|
|
162
163
|
mode: new SeekDelivery({
|
|
163
164
|
to: to ? [to.hashcode()] : undefined,
|
|
164
|
-
redundancy: 2
|
|
165
|
+
redundancy: 2,
|
|
165
166
|
}),
|
|
166
167
|
session: this.session,
|
|
167
|
-
priority: 1
|
|
168
|
-
})
|
|
168
|
+
priority: 1,
|
|
169
|
+
}),
|
|
169
170
|
}).sign(this.sign));
|
|
170
171
|
}
|
|
171
172
|
getPeersOnTopics(topics) {
|
|
@@ -202,7 +203,7 @@ export class DirectSub extends DirectStream {
|
|
|
202
203
|
? new PubSubData({
|
|
203
204
|
topics: topics.map((x) => x.toString()),
|
|
204
205
|
data,
|
|
205
|
-
strict: hasExplicitTOs
|
|
206
|
+
strict: hasExplicitTOs,
|
|
206
207
|
})
|
|
207
208
|
: undefined;
|
|
208
209
|
const bytes = dataMessage?.bytes();
|
|
@@ -213,8 +214,8 @@ export class DirectSub extends DirectStream {
|
|
|
213
214
|
detail: new PublishEvent({
|
|
214
215
|
client: options?.client,
|
|
215
216
|
data: dataMessage,
|
|
216
|
-
message
|
|
217
|
-
})
|
|
217
|
+
message,
|
|
218
|
+
}),
|
|
218
219
|
}));
|
|
219
220
|
}
|
|
220
221
|
// send to all the other peers
|
|
@@ -279,7 +280,7 @@ export class DirectSub extends DirectStream {
|
|
|
279
280
|
this.publishMessage(this.publicKey, await new DataMessage({
|
|
280
281
|
data: toUint8Array(new Subscribe({
|
|
281
282
|
topics: this.getSubscriptionOverlap(), // TODO make the protocol more efficient, do we really need to share *everything* ?
|
|
282
|
-
requestSubscribers: true
|
|
283
|
+
requestSubscribers: true,
|
|
283
284
|
}).bytes()),
|
|
284
285
|
header: new MessageHeader({
|
|
285
286
|
// is new neighbour ? then send to all, though that connection (potentially find new peers)
|
|
@@ -287,10 +288,10 @@ export class DirectSub extends DirectStream {
|
|
|
287
288
|
priority: 1,
|
|
288
289
|
mode: new SeekDelivery({
|
|
289
290
|
redundancy: 2,
|
|
290
|
-
to: isNeigbour ? undefined : [publicKey.hashcode()]
|
|
291
|
+
to: isNeigbour ? undefined : [publicKey.hashcode()],
|
|
291
292
|
}),
|
|
292
|
-
session: this.session
|
|
293
|
-
})
|
|
293
|
+
session: this.session,
|
|
294
|
+
}),
|
|
294
295
|
}).sign(this.sign)).catch(dontThrowIfDeliveryError); // peer might have become unreachable immediately
|
|
295
296
|
}
|
|
296
297
|
return resp;
|
|
@@ -313,7 +314,7 @@ export class DirectSub extends DirectStream {
|
|
|
313
314
|
this.lastSubscriptionMessages.delete(publicKey.hashcode());
|
|
314
315
|
if (changed.length > 0) {
|
|
315
316
|
this.dispatchEvent(new CustomEvent("unsubscribe", {
|
|
316
|
-
detail: new UnsubcriptionEvent(publicKey, changed)
|
|
317
|
+
detail: new UnsubcriptionEvent(publicKey, changed),
|
|
317
318
|
}));
|
|
318
319
|
}
|
|
319
320
|
}
|
|
@@ -383,8 +384,8 @@ export class DirectSub extends DirectStream {
|
|
|
383
384
|
this.dispatchEvent(new CustomEvent("data", {
|
|
384
385
|
detail: new DataEvent({
|
|
385
386
|
data: pubsubMessage,
|
|
386
|
-
message
|
|
387
|
-
})
|
|
387
|
+
message,
|
|
388
|
+
}),
|
|
388
389
|
}));
|
|
389
390
|
}
|
|
390
391
|
}
|
|
@@ -433,7 +434,7 @@ export class DirectSub extends DirectStream {
|
|
|
433
434
|
peers.set(senderKey, new SubscriptionData({
|
|
434
435
|
session: message.header.session,
|
|
435
436
|
timestamp: message.header.timestamp, // TODO update timestamps on all messages?
|
|
436
|
-
publicKey: sender
|
|
437
|
+
publicKey: sender,
|
|
437
438
|
}));
|
|
438
439
|
changed.push(topic);
|
|
439
440
|
}
|
|
@@ -444,7 +445,7 @@ export class DirectSub extends DirectStream {
|
|
|
444
445
|
});
|
|
445
446
|
if (changed.length > 0) {
|
|
446
447
|
this.dispatchEvent(new CustomEvent("subscribe", {
|
|
447
|
-
detail: new SubscriptionEvent(sender, changed)
|
|
448
|
+
detail: new SubscriptionEvent(sender, changed),
|
|
448
449
|
}));
|
|
449
450
|
}
|
|
450
451
|
if (pubsubMessage.requestSubscribers) {
|
|
@@ -454,7 +455,7 @@ export class DirectSub extends DirectStream {
|
|
|
454
455
|
const response = new DataMessage({
|
|
455
456
|
data: toUint8Array(new Subscribe({
|
|
456
457
|
topics: mySubscriptions,
|
|
457
|
-
requestSubscribers: false
|
|
458
|
+
requestSubscribers: false,
|
|
458
459
|
}).bytes()),
|
|
459
460
|
// needs to be Ack or Silent else we will run into a infite message loop
|
|
460
461
|
header: new MessageHeader({
|
|
@@ -462,9 +463,9 @@ export class DirectSub extends DirectStream {
|
|
|
462
463
|
priority: 1,
|
|
463
464
|
mode: new SeekDelivery({
|
|
464
465
|
redundancy: 2,
|
|
465
|
-
to: [senderKey]
|
|
466
|
-
})
|
|
467
|
-
})
|
|
466
|
+
to: [senderKey],
|
|
467
|
+
}),
|
|
468
|
+
}),
|
|
468
469
|
});
|
|
469
470
|
this.publishMessage(this.publicKey, await response.sign(this.sign)).catch(dontThrowIfDeliveryError);
|
|
470
471
|
}
|
|
@@ -485,7 +486,7 @@ export class DirectSub extends DirectStream {
|
|
|
485
486
|
}
|
|
486
487
|
if (changed.length > 0 && seenBefore === 0) {
|
|
487
488
|
this.dispatchEvent(new CustomEvent("unsubscribe", {
|
|
488
|
-
detail: new UnsubcriptionEvent(sender, changed)
|
|
489
|
+
detail: new UnsubcriptionEvent(sender, changed),
|
|
489
490
|
}));
|
|
490
491
|
}
|
|
491
492
|
// Forwarding
|
|
@@ -505,16 +506,16 @@ export class DirectSub extends DirectStream {
|
|
|
505
506
|
this.publishMessage(this.publicKey, await new DataMessage({
|
|
506
507
|
data: toUint8Array(new Subscribe({
|
|
507
508
|
topics: subscriptionsToSend,
|
|
508
|
-
requestSubscribers: false
|
|
509
|
+
requestSubscribers: false,
|
|
509
510
|
}).bytes()),
|
|
510
511
|
header: new MessageHeader({
|
|
511
512
|
priority: 1,
|
|
512
513
|
mode: new SilentDelivery({
|
|
513
514
|
redundancy: 2,
|
|
514
|
-
to: [sender.hashcode()]
|
|
515
|
+
to: [sender.hashcode()],
|
|
515
516
|
}),
|
|
516
|
-
session: this.session
|
|
517
|
-
})
|
|
517
|
+
session: this.session,
|
|
518
|
+
}),
|
|
518
519
|
}).sign(this.sign), [stream]).catch(dontThrowIfDeliveryError); // send back to same stream
|
|
519
520
|
}
|
|
520
521
|
// Forward
|
|
@@ -552,9 +553,8 @@ export const waitForSubscribers = async (libp2p, peersToWait, topic) => {
|
|
|
552
553
|
}
|
|
553
554
|
try {
|
|
554
555
|
const peers = await libp2p.services.pubsub.topics.get(topic);
|
|
555
|
-
const hasAllPeers = peerIdsToWait
|
|
556
|
-
.
|
|
557
|
-
.filter((e) => e === false).length === 0;
|
|
556
|
+
const hasAllPeers = peerIdsToWait.map((e) => peers?.has(e)).filter((e) => e === false)
|
|
557
|
+
.length === 0;
|
|
558
558
|
// FIXME: Does not fail on timeout, not easily fixable
|
|
559
559
|
if (hasAllPeers) {
|
|
560
560
|
clearInterval(interval);
|
package/dist/src/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": "3.0.5-
|
|
3
|
+
"version": "3.0.5-cccc078",
|
|
4
4
|
"description": "Direct streaming for libp2p",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"types": "./dist/src/index.d.ts",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
}
|
|
35
35
|
},
|
|
36
36
|
"eslintConfig": {
|
|
37
|
-
"extends": "
|
|
37
|
+
"extends": "peerbit",
|
|
38
38
|
"parserOptions": {
|
|
39
39
|
"project": true,
|
|
40
40
|
"sourceType": "module"
|
|
@@ -51,7 +51,8 @@
|
|
|
51
51
|
"scripts": {
|
|
52
52
|
"clean": "aegir clean",
|
|
53
53
|
"build": "aegir build --no-bundle",
|
|
54
|
-
"test": "aegir test --target node"
|
|
54
|
+
"test": "aegir test --target node",
|
|
55
|
+
"lint": "aegir lint"
|
|
55
56
|
},
|
|
56
57
|
"engines": {
|
|
57
58
|
"node": ">=16.15.1"
|
|
@@ -73,11 +74,11 @@
|
|
|
73
74
|
"dao.xyz"
|
|
74
75
|
],
|
|
75
76
|
"devDependencies": {
|
|
76
|
-
"@peerbit/libp2p-test-utils": "2.1.3-
|
|
77
|
+
"@peerbit/libp2p-test-utils": "2.1.3-cccc078"
|
|
77
78
|
},
|
|
78
79
|
"dependencies": {
|
|
79
|
-
"@peerbit/stream": "4.0.5-
|
|
80
|
-
"@peerbit/logger": "1.0.2-
|
|
81
|
-
"libp2p": "^1.
|
|
80
|
+
"@peerbit/stream": "4.0.5-cccc078",
|
|
81
|
+
"@peerbit/logger": "1.0.2-cccc078",
|
|
82
|
+
"libp2p": "^1.8.1"
|
|
82
83
|
}
|
|
83
84
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,42 +1,45 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {
|
|
2
|
+
CodeError,
|
|
3
|
+
CustomEvent,
|
|
4
|
+
type PeerId as Libp2pPeerId,
|
|
5
|
+
} from "@libp2p/interface";
|
|
6
|
+
import { PublicSignKey, getPublicKeyFromPeerId } from "@peerbit/crypto";
|
|
2
7
|
import { logger as logFn } from "@peerbit/logger";
|
|
8
|
+
import {
|
|
9
|
+
DataEvent,
|
|
10
|
+
GetSubscribers,
|
|
11
|
+
type PubSub,
|
|
12
|
+
PubSubData,
|
|
13
|
+
type PubSubEvents,
|
|
14
|
+
PubSubMessage,
|
|
15
|
+
PublishEvent,
|
|
16
|
+
Subscribe,
|
|
17
|
+
SubscriptionData,
|
|
18
|
+
SubscriptionEvent,
|
|
19
|
+
UnsubcriptionEvent,
|
|
20
|
+
Unsubscribe,
|
|
21
|
+
} from "@peerbit/pubsub-interface";
|
|
22
|
+
import {
|
|
23
|
+
DirectStream,
|
|
24
|
+
type DirectStreamComponents,
|
|
25
|
+
type DirectStreamOptions,
|
|
26
|
+
type PeerStreams,
|
|
27
|
+
} from "@peerbit/stream";
|
|
3
28
|
import {
|
|
4
29
|
AcknowledgeDelivery,
|
|
5
30
|
AnyWhere,
|
|
6
31
|
DataMessage,
|
|
32
|
+
DeliveryError,
|
|
33
|
+
type IdentificationOptions,
|
|
7
34
|
MessageHeader,
|
|
35
|
+
NotStartedError,
|
|
36
|
+
type PriorityOptions,
|
|
8
37
|
SeekDelivery,
|
|
9
38
|
SilentDelivery,
|
|
10
39
|
deliveryModeHasReceiver,
|
|
11
|
-
NotStartedError,
|
|
12
|
-
DeliveryError,
|
|
13
|
-
type IdentificationOptions,
|
|
14
|
-
type PriorityOptions
|
|
15
40
|
} from "@peerbit/stream-interface";
|
|
16
|
-
import {
|
|
17
|
-
DirectStream,
|
|
18
|
-
type DirectStreamComponents,
|
|
19
|
-
type DirectStreamOptions,
|
|
20
|
-
PeerStreams
|
|
21
|
-
} from "@peerbit/stream";
|
|
22
|
-
import { CodeError } from "@libp2p/interface";
|
|
23
|
-
import {
|
|
24
|
-
PubSubMessage,
|
|
25
|
-
Subscribe,
|
|
26
|
-
PubSubData,
|
|
27
|
-
Unsubscribe,
|
|
28
|
-
GetSubscribers,
|
|
29
|
-
UnsubcriptionEvent,
|
|
30
|
-
SubscriptionEvent,
|
|
31
|
-
type PubSub,
|
|
32
|
-
DataEvent,
|
|
33
|
-
SubscriptionData,
|
|
34
|
-
PublishEvent,
|
|
35
|
-
type PubSubEvents
|
|
36
|
-
} from "@peerbit/pubsub-interface";
|
|
37
|
-
import { getPublicKeyFromPeerId, PublicSignKey } from "@peerbit/crypto";
|
|
38
|
-
import { CustomEvent } from "@libp2p/interface";
|
|
39
41
|
import { Uint8ArrayList } from "uint8arraylist";
|
|
42
|
+
|
|
40
43
|
export const toUint8Array = (arr: Uint8ArrayList | Uint8Array) =>
|
|
41
44
|
arr instanceof Uint8ArrayList ? arr.subarray() : arr;
|
|
42
45
|
|
|
@@ -116,7 +119,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
116
119
|
prev.counter += 1;
|
|
117
120
|
} else {
|
|
118
121
|
prev = {
|
|
119
|
-
counter: 1
|
|
122
|
+
counter: 1,
|
|
120
123
|
};
|
|
121
124
|
this.subscriptions.set(topic, prev);
|
|
122
125
|
|
|
@@ -129,14 +132,14 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
129
132
|
data: toUint8Array(
|
|
130
133
|
new Subscribe({
|
|
131
134
|
topics: newTopicsForTopicData,
|
|
132
|
-
requestSubscribers: true
|
|
133
|
-
}).bytes()
|
|
135
|
+
requestSubscribers: true,
|
|
136
|
+
}).bytes(),
|
|
134
137
|
),
|
|
135
138
|
header: new MessageHeader({
|
|
136
139
|
priority: 1,
|
|
137
140
|
mode: new SeekDelivery({ redundancy: 2 }),
|
|
138
|
-
session: this.session
|
|
139
|
-
})
|
|
141
|
+
session: this.session,
|
|
142
|
+
}),
|
|
140
143
|
});
|
|
141
144
|
|
|
142
145
|
await this.publishMessage(this.publicKey, await message.sign(this.sign));
|
|
@@ -146,12 +149,14 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
146
149
|
/**
|
|
147
150
|
*
|
|
148
151
|
* @param topic
|
|
149
|
-
* @param
|
|
152
|
+
* @param options
|
|
153
|
+
* @param options.force
|
|
154
|
+
* @param options.data
|
|
150
155
|
* @returns true unsubscribed completely
|
|
151
156
|
*/
|
|
152
157
|
async unsubscribe(
|
|
153
158
|
topic: string,
|
|
154
|
-
options?: { force: boolean; data: Uint8Array }
|
|
159
|
+
options?: { force: boolean; data: Uint8Array },
|
|
155
160
|
) {
|
|
156
161
|
if (!this.started) {
|
|
157
162
|
throw new NotStartedError();
|
|
@@ -160,7 +165,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
160
165
|
const subscriptions = this.subscriptions.get(topic);
|
|
161
166
|
|
|
162
167
|
logger.debug(
|
|
163
|
-
`unsubscribe from ${topic} - am subscribed with subscriptions ${subscriptions}
|
|
168
|
+
`unsubscribe from ${topic} - am subscribed with subscriptions ${JSON.stringify(subscriptions)}`,
|
|
164
169
|
);
|
|
165
170
|
|
|
166
171
|
const peersOnTopic = this.topicsToPeers.get(topic);
|
|
@@ -185,14 +190,14 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
185
190
|
header: new MessageHeader({
|
|
186
191
|
mode: new AnyWhere(), // TODO make this better
|
|
187
192
|
session: this.session,
|
|
188
|
-
priority: 1
|
|
193
|
+
priority: 1,
|
|
189
194
|
}),
|
|
190
195
|
data: toUint8Array(
|
|
191
196
|
new Unsubscribe({
|
|
192
|
-
topics: [topic]
|
|
193
|
-
}).bytes()
|
|
194
|
-
)
|
|
195
|
-
}).sign(this.sign)
|
|
197
|
+
topics: [topic],
|
|
198
|
+
}).bytes(),
|
|
199
|
+
),
|
|
200
|
+
}).sign(this.sign),
|
|
196
201
|
);
|
|
197
202
|
|
|
198
203
|
this.subscriptions.delete(topic);
|
|
@@ -226,7 +231,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
226
231
|
|
|
227
232
|
async requestSubscribers(
|
|
228
233
|
topic: string | string[],
|
|
229
|
-
to?: PublicSignKey
|
|
234
|
+
to?: PublicSignKey,
|
|
230
235
|
): Promise<void> {
|
|
231
236
|
if (!this.started) {
|
|
232
237
|
throw new CodeError("not started yet", "ERR_NOT_STARTED_YET");
|
|
@@ -252,12 +257,12 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
252
257
|
header: new MessageHeader({
|
|
253
258
|
mode: new SeekDelivery({
|
|
254
259
|
to: to ? [to.hashcode()] : undefined,
|
|
255
|
-
redundancy: 2
|
|
260
|
+
redundancy: 2,
|
|
256
261
|
}),
|
|
257
262
|
session: this.session,
|
|
258
|
-
priority: 1
|
|
259
|
-
})
|
|
260
|
-
}).sign(this.sign)
|
|
263
|
+
priority: 1,
|
|
264
|
+
}),
|
|
265
|
+
}).sign(this.sign),
|
|
261
266
|
);
|
|
262
267
|
}
|
|
263
268
|
|
|
@@ -290,7 +295,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
290
295
|
} & { client?: string } & {
|
|
291
296
|
mode?: SilentDelivery | AcknowledgeDelivery | SeekDelivery;
|
|
292
297
|
} & PriorityOptions &
|
|
293
|
-
IdentificationOptions
|
|
298
|
+
IdentificationOptions,
|
|
294
299
|
): Promise<Uint8Array> {
|
|
295
300
|
if (!this.started) {
|
|
296
301
|
throw new NotStartedError();
|
|
@@ -308,10 +313,10 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
308
313
|
// Embedd topic info before the data so that peers/relays can also use topic info to route messages efficiently
|
|
309
314
|
const dataMessage = data
|
|
310
315
|
? new PubSubData({
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
316
|
+
topics: topics.map((x) => x.toString()),
|
|
317
|
+
data,
|
|
318
|
+
strict: hasExplicitTOs,
|
|
319
|
+
})
|
|
315
320
|
: undefined;
|
|
316
321
|
|
|
317
322
|
const bytes = dataMessage?.bytes();
|
|
@@ -324,9 +329,9 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
324
329
|
detail: new PublishEvent({
|
|
325
330
|
client: options?.client,
|
|
326
331
|
data: dataMessage,
|
|
327
|
-
message
|
|
328
|
-
})
|
|
329
|
-
})
|
|
332
|
+
message,
|
|
333
|
+
}),
|
|
334
|
+
}),
|
|
330
335
|
);
|
|
331
336
|
}
|
|
332
337
|
|
|
@@ -404,8 +409,8 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
404
409
|
data: toUint8Array(
|
|
405
410
|
new Subscribe({
|
|
406
411
|
topics: this.getSubscriptionOverlap(), // TODO make the protocol more efficient, do we really need to share *everything* ?
|
|
407
|
-
requestSubscribers: true
|
|
408
|
-
}).bytes()
|
|
412
|
+
requestSubscribers: true,
|
|
413
|
+
}).bytes(),
|
|
409
414
|
),
|
|
410
415
|
header: new MessageHeader({
|
|
411
416
|
// is new neighbour ? then send to all, though that connection (potentially find new peers)
|
|
@@ -413,11 +418,11 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
413
418
|
priority: 1,
|
|
414
419
|
mode: new SeekDelivery({
|
|
415
420
|
redundancy: 2,
|
|
416
|
-
to: isNeigbour ? undefined : [publicKey.hashcode()]
|
|
421
|
+
to: isNeigbour ? undefined : [publicKey.hashcode()],
|
|
417
422
|
}),
|
|
418
|
-
session: this.session
|
|
419
|
-
})
|
|
420
|
-
}).sign(this.sign)
|
|
423
|
+
session: this.session,
|
|
424
|
+
}),
|
|
425
|
+
}).sign(this.sign),
|
|
421
426
|
).catch(dontThrowIfDeliveryError); // peer might have become unreachable immediately
|
|
422
427
|
}
|
|
423
428
|
|
|
@@ -446,15 +451,15 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
446
451
|
if (changed.length > 0) {
|
|
447
452
|
this.dispatchEvent(
|
|
448
453
|
new CustomEvent<UnsubcriptionEvent>("unsubscribe", {
|
|
449
|
-
detail: new UnsubcriptionEvent(publicKey, changed)
|
|
450
|
-
})
|
|
454
|
+
detail: new UnsubcriptionEvent(publicKey, changed),
|
|
455
|
+
}),
|
|
451
456
|
);
|
|
452
457
|
}
|
|
453
458
|
}
|
|
454
459
|
|
|
455
460
|
private subscriptionMessageIsLatest(
|
|
456
461
|
message: DataMessage,
|
|
457
|
-
pubsubMessage: Subscribe | Unsubscribe
|
|
462
|
+
pubsubMessage: Subscribe | Unsubscribe,
|
|
458
463
|
) {
|
|
459
464
|
const subscriber = message.header.signatures!.signatures[0].publicKey!;
|
|
460
465
|
const subscriberKey = subscriber.hashcode(); // Assume first signature is the one who is signing
|
|
@@ -479,7 +484,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
479
484
|
|
|
480
485
|
private addPeersOnTopic(
|
|
481
486
|
message: DataMessage<AcknowledgeDelivery | SilentDelivery | SeekDelivery>,
|
|
482
|
-
topics: string[]
|
|
487
|
+
topics: string[],
|
|
483
488
|
) {
|
|
484
489
|
const existingPeers: Set<string> = new Set(message.header.mode.to);
|
|
485
490
|
const allPeersOnTopic = this.getPeersOnTopics(topics);
|
|
@@ -496,7 +501,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
496
501
|
from: PublicSignKey,
|
|
497
502
|
stream: PeerStreams,
|
|
498
503
|
message: DataMessage,
|
|
499
|
-
seenBefore: number
|
|
504
|
+
seenBefore: number,
|
|
500
505
|
) {
|
|
501
506
|
if (!message.data || message.data.length === 0) {
|
|
502
507
|
return super.onDataMessage(from, stream, message, seenBefore);
|
|
@@ -517,19 +522,19 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
517
522
|
*/
|
|
518
523
|
|
|
519
524
|
const meInTOs = !!message.header.mode.to?.find(
|
|
520
|
-
(x) => this.publicKeyHash === x
|
|
525
|
+
(x) => this.publicKeyHash === x,
|
|
521
526
|
);
|
|
522
527
|
|
|
523
528
|
let isForMe: boolean;
|
|
524
529
|
if (pubsubMessage.strict) {
|
|
525
530
|
isForMe =
|
|
526
531
|
!!pubsubMessage.topics.find((topic) =>
|
|
527
|
-
this.subscriptions.has(topic)
|
|
532
|
+
this.subscriptions.has(topic),
|
|
528
533
|
) && meInTOs;
|
|
529
534
|
} else {
|
|
530
535
|
isForMe =
|
|
531
536
|
!!pubsubMessage.topics.find((topic) =>
|
|
532
|
-
this.subscriptions.has(topic)
|
|
537
|
+
this.subscriptions.has(topic),
|
|
533
538
|
) ||
|
|
534
539
|
(pubsubMessage.topics.length === 0 && meInTOs);
|
|
535
540
|
}
|
|
@@ -549,9 +554,9 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
549
554
|
new CustomEvent("data", {
|
|
550
555
|
detail: new DataEvent({
|
|
551
556
|
data: pubsubMessage,
|
|
552
|
-
message
|
|
553
|
-
})
|
|
554
|
-
})
|
|
557
|
+
message,
|
|
558
|
+
}),
|
|
559
|
+
}),
|
|
555
560
|
);
|
|
556
561
|
}
|
|
557
562
|
}
|
|
@@ -562,7 +567,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
562
567
|
message as DataMessage<
|
|
563
568
|
SeekDelivery | SilentDelivery | AcknowledgeDelivery
|
|
564
569
|
>,
|
|
565
|
-
pubsubMessage.topics
|
|
570
|
+
pubsubMessage.topics,
|
|
566
571
|
);
|
|
567
572
|
}
|
|
568
573
|
|
|
@@ -621,8 +626,8 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
621
626
|
new SubscriptionData({
|
|
622
627
|
session: message.header.session,
|
|
623
628
|
timestamp: message.header.timestamp, // TODO update timestamps on all messages?
|
|
624
|
-
publicKey: sender
|
|
625
|
-
})
|
|
629
|
+
publicKey: sender,
|
|
630
|
+
}),
|
|
626
631
|
);
|
|
627
632
|
|
|
628
633
|
changed.push(topic);
|
|
@@ -637,23 +642,23 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
637
642
|
if (changed.length > 0) {
|
|
638
643
|
this.dispatchEvent(
|
|
639
644
|
new CustomEvent<SubscriptionEvent>("subscribe", {
|
|
640
|
-
detail: new SubscriptionEvent(sender, changed)
|
|
641
|
-
})
|
|
645
|
+
detail: new SubscriptionEvent(sender, changed),
|
|
646
|
+
}),
|
|
642
647
|
);
|
|
643
648
|
}
|
|
644
649
|
|
|
645
650
|
if (pubsubMessage.requestSubscribers) {
|
|
646
651
|
// respond if we are subscribing
|
|
647
652
|
const mySubscriptions = this.getSubscriptionOverlap(
|
|
648
|
-
pubsubMessage.topics
|
|
653
|
+
pubsubMessage.topics,
|
|
649
654
|
);
|
|
650
655
|
if (mySubscriptions.length > 0) {
|
|
651
656
|
const response = new DataMessage({
|
|
652
657
|
data: toUint8Array(
|
|
653
658
|
new Subscribe({
|
|
654
659
|
topics: mySubscriptions,
|
|
655
|
-
requestSubscribers: false
|
|
656
|
-
}).bytes()
|
|
660
|
+
requestSubscribers: false,
|
|
661
|
+
}).bytes(),
|
|
657
662
|
),
|
|
658
663
|
// needs to be Ack or Silent else we will run into a infite message loop
|
|
659
664
|
header: new MessageHeader({
|
|
@@ -661,14 +666,14 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
661
666
|
priority: 1,
|
|
662
667
|
mode: new SeekDelivery({
|
|
663
668
|
redundancy: 2,
|
|
664
|
-
to: [senderKey]
|
|
665
|
-
})
|
|
666
|
-
})
|
|
669
|
+
to: [senderKey],
|
|
670
|
+
}),
|
|
671
|
+
}),
|
|
667
672
|
});
|
|
668
673
|
|
|
669
674
|
this.publishMessage(
|
|
670
675
|
this.publicKey,
|
|
671
|
-
await response.sign(this.sign)
|
|
676
|
+
await response.sign(this.sign),
|
|
672
677
|
).catch(dontThrowIfDeliveryError);
|
|
673
678
|
}
|
|
674
679
|
}
|
|
@@ -691,8 +696,8 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
691
696
|
if (changed.length > 0 && seenBefore === 0) {
|
|
692
697
|
this.dispatchEvent(
|
|
693
698
|
new CustomEvent<UnsubcriptionEvent>("unsubscribe", {
|
|
694
|
-
detail: new UnsubcriptionEvent(sender, changed)
|
|
695
|
-
})
|
|
699
|
+
detail: new UnsubcriptionEvent(sender, changed),
|
|
700
|
+
}),
|
|
696
701
|
);
|
|
697
702
|
}
|
|
698
703
|
|
|
@@ -706,7 +711,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
706
711
|
message as DataMessage<
|
|
707
712
|
SeekDelivery | SilentDelivery | AcknowledgeDelivery
|
|
708
713
|
>,
|
|
709
|
-
pubsubMessage.topics
|
|
714
|
+
pubsubMessage.topics,
|
|
710
715
|
);
|
|
711
716
|
}
|
|
712
717
|
}
|
|
@@ -715,7 +720,7 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
715
720
|
this.relayMessage(from, message).catch(logErrorIfStarted);
|
|
716
721
|
} else if (pubsubMessage instanceof GetSubscribers) {
|
|
717
722
|
const subscriptionsToSend: string[] = this.getSubscriptionOverlap(
|
|
718
|
-
pubsubMessage.topics
|
|
723
|
+
pubsubMessage.topics,
|
|
719
724
|
);
|
|
720
725
|
if (subscriptionsToSend.length > 0) {
|
|
721
726
|
// respond
|
|
@@ -725,19 +730,19 @@ export class DirectSub extends DirectStream<PubSubEvents> implements PubSub {
|
|
|
725
730
|
data: toUint8Array(
|
|
726
731
|
new Subscribe({
|
|
727
732
|
topics: subscriptionsToSend,
|
|
728
|
-
requestSubscribers: false
|
|
729
|
-
}).bytes()
|
|
733
|
+
requestSubscribers: false,
|
|
734
|
+
}).bytes(),
|
|
730
735
|
),
|
|
731
736
|
header: new MessageHeader({
|
|
732
737
|
priority: 1,
|
|
733
738
|
mode: new SilentDelivery({
|
|
734
739
|
redundancy: 2,
|
|
735
|
-
to: [sender.hashcode()]
|
|
740
|
+
to: [sender.hashcode()],
|
|
736
741
|
}),
|
|
737
|
-
session: this.session
|
|
738
|
-
})
|
|
742
|
+
session: this.session,
|
|
743
|
+
}),
|
|
739
744
|
}).sign(this.sign),
|
|
740
|
-
[stream]
|
|
745
|
+
[stream],
|
|
741
746
|
).catch(dontThrowIfDeliveryError); // send back to same stream
|
|
742
747
|
}
|
|
743
748
|
|
|
@@ -759,7 +764,7 @@ export const waitForSubscribers = async (
|
|
|
759
764
|
| { peerId: Libp2pPeerId }[]
|
|
760
765
|
| string
|
|
761
766
|
| string[],
|
|
762
|
-
topic: string
|
|
767
|
+
topic: string,
|
|
763
768
|
) => {
|
|
764
769
|
const peersToWaitArr = Array.isArray(peersToWait)
|
|
765
770
|
? peersToWait
|
|
@@ -786,15 +791,14 @@ export const waitForSubscribers = async (
|
|
|
786
791
|
if (counter > 100) {
|
|
787
792
|
clearInterval(interval);
|
|
788
793
|
reject(
|
|
789
|
-
new Error("Failed to find expected subscribers for topic: " + topic)
|
|
794
|
+
new Error("Failed to find expected subscribers for topic: " + topic),
|
|
790
795
|
);
|
|
791
796
|
}
|
|
792
797
|
try {
|
|
793
798
|
const peers = await libp2p.services.pubsub.topics.get(topic);
|
|
794
799
|
const hasAllPeers =
|
|
795
|
-
peerIdsToWait
|
|
796
|
-
.
|
|
797
|
-
.filter((e) => e === false).length === 0;
|
|
800
|
+
peerIdsToWait.map((e) => peers?.has(e)).filter((e) => e === false)
|
|
801
|
+
.length === 0;
|
|
798
802
|
|
|
799
803
|
// FIXME: Does not fail on timeout, not easily fixable
|
|
800
804
|
if (hasAllPeers) {
|