@waku/core 0.0.33-acef1ac.0 → 0.0.33-b93134a.0
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/bundle/{base_protocol-BS9mxaB7.js → base_protocol-1U9jKpZH.js} +77 -73
- package/bundle/index.js +5 -8
- package/bundle/lib/base_protocol.js +1 -1
- package/dist/.tsbuildinfo +1 -1
- package/dist/lib/base_protocol.js +1 -2
- package/dist/lib/base_protocol.js.map +1 -1
- package/dist/lib/filter/index.d.ts +1 -2
- package/dist/lib/filter/index.js +3 -6
- package/dist/lib/filter/index.js.map +1 -1
- package/dist/lib/stream_manager/stream_manager.d.ts +10 -9
- package/dist/lib/stream_manager/stream_manager.js +72 -55
- package/dist/lib/stream_manager/stream_manager.js.map +1 -1
- package/dist/lib/stream_manager/utils.d.ts +1 -1
- package/dist/lib/stream_manager/utils.js +5 -17
- package/dist/lib/stream_manager/utils.js.map +1 -1
- package/package.json +1 -1
- package/src/lib/base_protocol.ts +2 -5
- package/src/lib/filter/index.ts +2 -13
- package/src/lib/stream_manager/stream_manager.ts +105 -66
- package/src/lib/stream_manager/utils.ts +5 -17
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_protocol.js","sourceRoot":"","sources":["../../src/lib/base_protocol.ts"],"names":[],"mappings":"AAOA,OAAO,EAAU,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EACL,oCAAoC,EACpC,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D;;;GAGG;AACH,MAAM,OAAO,YAAY;IAMd;IACC;IACA;IACQ;IARF,sBAAsB,CAA6B;IACnD,yBAAyB,CAAgC;IAC/D,aAAa,CAAgB;IAEvC,YACS,UAAkB,EACjB,UAA4B,EAC5B,GAAW,EACH,YAA2B;QAHpC,eAAU,GAAV,UAAU,CAAQ;QACjB,eAAU,GAAV,UAAU,CAAkB;QAC5B,QAAG,GAAH,GAAG,CAAQ;QACH,iBAAY,GAAZ,YAAY,CAAe;QAE3C,IAAI,CAAC,sBAAsB,GAAG,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CACnE,UAAU,CAAC,MAAM,CAClB,CAAC;QACF,IAAI,CAAC,yBAAyB,GAAG,UAAU,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,CACzE,UAAU,CAAC,MAAM,CAClB,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CACpC,UAAU,EACV,UAAU,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAC9C,UAAU,CAAC,iBAAiB,CAC7B,EACD,IAAI,CAAC,sBAAsB,CAC5B,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,IAAU;QAClC,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,QAAQ;QACnB,OAAO,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAChE,CAAC;IAEM,KAAK,CAAC,cAAc;QACzB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,
|
|
1
|
+
{"version":3,"file":"base_protocol.js","sourceRoot":"","sources":["../../src/lib/base_protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,8 @@ export declare const FilterCodecs: {
|
|
|
8
8
|
};
|
|
9
9
|
export declare class FilterCore extends BaseProtocol implements IBaseProtocolCore {
|
|
10
10
|
private handleIncomingMessage;
|
|
11
|
-
private handleError;
|
|
12
11
|
readonly pubsubTopics: PubsubTopic[];
|
|
13
|
-
constructor(handleIncomingMessage: (pubsubTopic: PubsubTopic, wakuMessage: WakuMessage, peerIdStr: string) => Promise<void>,
|
|
12
|
+
constructor(handleIncomingMessage: (pubsubTopic: PubsubTopic, wakuMessage: WakuMessage, peerIdStr: string) => Promise<void>, pubsubTopics: PubsubTopic[], libp2p: Libp2p);
|
|
14
13
|
subscribe(pubsubTopic: PubsubTopic, peer: Peer, contentTopics: ContentTopic[]): Promise<CoreProtocolResult>;
|
|
15
14
|
unsubscribe(pubsubTopic: PubsubTopic, peer: Peer, contentTopics: ContentTopic[]): Promise<CoreProtocolResult>;
|
|
16
15
|
unsubscribeAll(pubsubTopic: PubsubTopic, peer: Peer): Promise<CoreProtocolResult>;
|
package/dist/lib/filter/index.js
CHANGED
|
@@ -12,12 +12,10 @@ export const FilterCodecs = {
|
|
|
12
12
|
};
|
|
13
13
|
export class FilterCore extends BaseProtocol {
|
|
14
14
|
handleIncomingMessage;
|
|
15
|
-
handleError;
|
|
16
15
|
pubsubTopics;
|
|
17
|
-
constructor(handleIncomingMessage,
|
|
16
|
+
constructor(handleIncomingMessage, pubsubTopics, libp2p) {
|
|
18
17
|
super(FilterCodecs.SUBSCRIBE, libp2p.components, log, pubsubTopics);
|
|
19
18
|
this.handleIncomingMessage = handleIncomingMessage;
|
|
20
|
-
this.handleError = handleError;
|
|
21
19
|
this.pubsubTopics = pubsubTopics;
|
|
22
20
|
libp2p
|
|
23
21
|
.handle(FilterCodecs.PUSH, this.onRequest.bind(this), {
|
|
@@ -199,9 +197,8 @@ export class FilterCore extends BaseProtocol {
|
|
|
199
197
|
}
|
|
200
198
|
}).then(() => {
|
|
201
199
|
log.info("Receiving pipe closed.");
|
|
202
|
-
},
|
|
203
|
-
log.error("Error with receiving pipe", e
|
|
204
|
-
await this.handleError(e);
|
|
200
|
+
}, (e) => {
|
|
201
|
+
log.error("Error with receiving pipe", e);
|
|
205
202
|
});
|
|
206
203
|
}
|
|
207
204
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/filter/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,SAAS,EAAE,wCAAwC;IACnD,IAAI,EAAE,mCAAmC;CAC1C,CAAC;AAEF,MAAM,OAAO,UAAW,SAAQ,YAAY;IAEhC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/filter/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
import type { Stream } from "@libp2p/interface";
|
|
2
|
-
import type {
|
|
3
|
-
import { Libp2p } from "@waku/interfaces";
|
|
1
|
+
import type { Peer, Stream } from "@libp2p/interface";
|
|
2
|
+
import type { Libp2p } from "@waku/interfaces";
|
|
4
3
|
export declare class StreamManager {
|
|
5
|
-
multicodec
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
private readonly streamPool;
|
|
4
|
+
private multicodec;
|
|
5
|
+
private getConnections;
|
|
6
|
+
private addEventListener;
|
|
9
7
|
private readonly log;
|
|
8
|
+
private ongoingCreation;
|
|
9
|
+
private streamPool;
|
|
10
10
|
constructor(multicodec: string, getConnections: Libp2p["getConnections"], addEventListener: Libp2p["addEventListener"]);
|
|
11
11
|
getStream(peer: Peer): Promise<Stream>;
|
|
12
12
|
private createStream;
|
|
13
|
-
private
|
|
13
|
+
private createStreamWithLock;
|
|
14
14
|
private handlePeerUpdateStreamPool;
|
|
15
|
-
private
|
|
15
|
+
private scheduleNewStream;
|
|
16
|
+
private getOpenStreamForCodec;
|
|
16
17
|
}
|
|
@@ -1,90 +1,107 @@
|
|
|
1
1
|
import { Logger } from "@waku/utils";
|
|
2
|
-
import {
|
|
3
|
-
const CONNECTION_TIMEOUT = 5_000;
|
|
4
|
-
const RETRY_BACKOFF_BASE = 1_000;
|
|
5
|
-
const MAX_RETRIES = 3;
|
|
2
|
+
import { selectOpenConnection } from "./utils.js";
|
|
6
3
|
export class StreamManager {
|
|
7
4
|
multicodec;
|
|
8
5
|
getConnections;
|
|
9
6
|
addEventListener;
|
|
10
|
-
streamPool;
|
|
11
7
|
log;
|
|
8
|
+
ongoingCreation = new Set();
|
|
9
|
+
streamPool = new Map();
|
|
12
10
|
constructor(multicodec, getConnections, addEventListener) {
|
|
13
11
|
this.multicodec = multicodec;
|
|
14
12
|
this.getConnections = getConnections;
|
|
15
13
|
this.addEventListener = addEventListener;
|
|
16
14
|
this.log = new Logger(`stream-manager:${multicodec}`);
|
|
17
|
-
this.streamPool = new Map();
|
|
18
15
|
this.addEventListener("peer:update", this.handlePeerUpdateStreamPool);
|
|
19
16
|
}
|
|
20
17
|
async getStream(peer) {
|
|
21
|
-
const
|
|
22
|
-
const
|
|
23
|
-
if (
|
|
24
|
-
|
|
18
|
+
const peerId = peer.id.toString();
|
|
19
|
+
const scheduledStream = this.streamPool.get(peerId);
|
|
20
|
+
if (scheduledStream) {
|
|
21
|
+
this.streamPool.delete(peerId);
|
|
22
|
+
await scheduledStream;
|
|
25
23
|
}
|
|
26
|
-
this.
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
if (stream && stream.status !== "closed") {
|
|
31
|
-
return stream;
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
catch (error) {
|
|
35
|
-
this.log.warn(`Failed to get stream for ${peerIdStr} -- `, error);
|
|
36
|
-
this.log.warn("Attempting to create a new stream for the peer");
|
|
24
|
+
const stream = this.getOpenStreamForCodec(peer.id);
|
|
25
|
+
if (stream) {
|
|
26
|
+
this.log.info(`Found existing stream peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
27
|
+
return stream;
|
|
37
28
|
}
|
|
38
29
|
return this.createStream(peer);
|
|
39
30
|
}
|
|
40
31
|
async createStream(peer, retries = 0) {
|
|
41
32
|
const connections = this.getConnections(peer.id);
|
|
42
|
-
const connection =
|
|
33
|
+
const connection = selectOpenConnection(connections);
|
|
43
34
|
if (!connection) {
|
|
44
|
-
throw new Error(
|
|
35
|
+
throw new Error(`Failed to get a connection to the peer peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
36
|
+
}
|
|
37
|
+
let lastError;
|
|
38
|
+
let stream;
|
|
39
|
+
for (let i = 0; i < retries + 1; i++) {
|
|
40
|
+
try {
|
|
41
|
+
this.log.info(`Attempting to create a stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
42
|
+
stream = await connection.newStream(this.multicodec);
|
|
43
|
+
this.log.info(`Created stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
44
|
+
break;
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
lastError = error;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
if (!stream) {
|
|
51
|
+
throw new Error(`Failed to create a new stream for ${peer.id.toString()} -- ` +
|
|
52
|
+
lastError);
|
|
53
|
+
}
|
|
54
|
+
return stream;
|
|
55
|
+
}
|
|
56
|
+
async createStreamWithLock(peer) {
|
|
57
|
+
const peerId = peer.id.toString();
|
|
58
|
+
if (this.ongoingCreation.has(peerId)) {
|
|
59
|
+
this.log.info(`Skipping creation of a stream due to lock for peerId=${peerId} multicodec=${this.multicodec}`);
|
|
60
|
+
return;
|
|
45
61
|
}
|
|
46
62
|
try {
|
|
47
|
-
|
|
63
|
+
this.ongoingCreation.add(peerId);
|
|
64
|
+
await this.createStream(peer);
|
|
48
65
|
}
|
|
49
66
|
catch (error) {
|
|
50
|
-
|
|
51
|
-
const backoff = RETRY_BACKOFF_BASE * Math.pow(2, retries);
|
|
52
|
-
await new Promise((resolve) => setTimeout(resolve, backoff));
|
|
53
|
-
return this.createStream(peer, retries + 1);
|
|
54
|
-
}
|
|
55
|
-
throw new Error(`Failed to create a new stream for ${peer.id.toString()} -- ` + error);
|
|
67
|
+
this.log.error(`Failed to createStreamWithLock:`, error);
|
|
56
68
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
this.createStream(peer),
|
|
62
|
-
timeoutPromise.then(() => {
|
|
63
|
-
throw new Error("Connection timeout");
|
|
64
|
-
})
|
|
65
|
-
]).catch((error) => {
|
|
66
|
-
this.log.error(`Failed to prepare a new stream for ${peer.id.toString()} -- `, error);
|
|
67
|
-
});
|
|
68
|
-
this.streamPool.set(peer.id.toString(), streamPromise);
|
|
69
|
+
finally {
|
|
70
|
+
this.ongoingCreation.delete(peerId);
|
|
71
|
+
}
|
|
72
|
+
return;
|
|
69
73
|
}
|
|
70
74
|
handlePeerUpdateStreamPool = (evt) => {
|
|
71
75
|
const { peer } = evt.detail;
|
|
72
|
-
if (peer.protocols.includes(this.multicodec)) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
else {
|
|
79
|
-
const peerIdStr = peer.id.toString();
|
|
80
|
-
this.streamPool.delete(peerIdStr);
|
|
81
|
-
this.log.info(`Removed pending stream for disconnected peer ${peerIdStr}`);
|
|
82
|
-
}
|
|
76
|
+
if (!peer.protocols.includes(this.multicodec)) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
const stream = this.getOpenStreamForCodec(peer.id);
|
|
80
|
+
if (stream) {
|
|
81
|
+
return;
|
|
83
82
|
}
|
|
83
|
+
this.scheduleNewStream(peer);
|
|
84
84
|
};
|
|
85
|
-
|
|
85
|
+
scheduleNewStream(peer) {
|
|
86
|
+
this.log.info(`Scheduling creation of a stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
87
|
+
// abandon previous attempt
|
|
88
|
+
if (this.streamPool.has(peer.id.toString())) {
|
|
89
|
+
this.streamPool.delete(peer.id.toString());
|
|
90
|
+
}
|
|
91
|
+
this.streamPool.set(peer.id.toString(), this.createStreamWithLock(peer));
|
|
92
|
+
}
|
|
93
|
+
getOpenStreamForCodec(peerId) {
|
|
86
94
|
const connections = this.getConnections(peerId);
|
|
87
|
-
|
|
95
|
+
const connection = selectOpenConnection(connections);
|
|
96
|
+
if (!connection) {
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
const stream = connection.streams.find((s) => s.protocol === this.multicodec);
|
|
100
|
+
const isStreamUnusable = ["done", "closed", "closing"].includes(stream?.writeStatus || "");
|
|
101
|
+
if (isStreamUnusable) {
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
return stream;
|
|
88
105
|
}
|
|
89
106
|
}
|
|
90
107
|
//# sourceMappingURL=stream_manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream_manager.js","sourceRoot":"","sources":["../../../src/lib/stream_manager/stream_manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stream_manager.js","sourceRoot":"","sources":["../../../src/lib/stream_manager/stream_manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,OAAO,aAAa;IAOd;IACA;IACA;IARO,GAAG,CAAS;IAErB,eAAe,GAAgB,IAAI,GAAG,EAAE,CAAC;IACzC,UAAU,GAA+B,IAAI,GAAG,EAAE,CAAC;IAE3D,YACU,UAAkB,EAClB,cAAwC,EACxC,gBAA4C;QAF5C,eAAU,GAAV,UAAU,CAAQ;QAClB,mBAAc,GAAd,cAAc,CAA0B;QACxC,qBAAgB,GAAhB,gBAAgB,CAA4B;QAEpD,IAAI,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,kBAAkB,UAAU,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,IAAU;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;QAElC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpD,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC/B,MAAM,eAAe,CAAC;QACxB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEnD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,gCAAgC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,IAAI,CAAC,UAAU,EAAE,CACnF,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,IAAU,EAAE,OAAO,GAAG,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAErD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,iDAAiD,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,IAAI,CAAC,UAAU,EAAE,CACpG,CAAC;QACJ,CAAC;QAED,IAAI,SAAkB,CAAC;QACvB,IAAI,MAA0B,CAAC;QAE/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,IAAI,CAAC;gBACH,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,4CAA4C,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,IAAI,CAAC,UAAU,EAAE,CAC/F,CAAC;gBACF,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,6BAA6B,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,IAAI,CAAC,UAAU,EAAE,CAChF,CAAC;gBACF,MAAM;YACR,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,SAAS,GAAG,KAAK,CAAC;YACpB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CACb,qCAAqC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM;gBAC3D,SAAS,CACZ,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,IAAU;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;QAElC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,wDAAwD,MAAM,eAAe,IAAI,CAAC,UAAU,EAAE,CAC/F,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;QAC3D,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QAED,OAAO;IACT,CAAC;IAEO,0BAA0B,GAAG,CAAC,GAA4B,EAAQ,EAAE;QAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAE5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9C,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEnD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEM,iBAAiB,CAAC,IAAU;QAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,8CAA8C,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,IAAI,CAAC,UAAU,EAAE,CACjG,CAAC;QAEF,2BAA2B;QAC3B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3E,CAAC;IAEO,qBAAqB,CAAC,MAAc;QAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAErD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,UAAU,CACtC,CAAC;QAEF,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAC7D,MAAM,EAAE,WAAW,IAAI,EAAE,CAC1B,CAAC;QACF,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { Connection } from "@libp2p/interface";
|
|
2
|
-
export declare function
|
|
2
|
+
export declare function selectOpenConnection(connections: Connection[]): Connection | undefined;
|
|
@@ -1,19 +1,7 @@
|
|
|
1
|
-
export function
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
let latestConnection;
|
|
7
|
-
connections.forEach((connection) => {
|
|
8
|
-
if (connection.status === "open") {
|
|
9
|
-
if (!latestConnection) {
|
|
10
|
-
latestConnection = connection;
|
|
11
|
-
}
|
|
12
|
-
else if (connection.timeline.open > latestConnection.timeline.open) {
|
|
13
|
-
latestConnection = connection;
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
});
|
|
17
|
-
return latestConnection;
|
|
1
|
+
export function selectOpenConnection(connections) {
|
|
2
|
+
return connections
|
|
3
|
+
.filter((c) => c.status === "open")
|
|
4
|
+
.sort((left, right) => right.timeline.open - left.timeline.open)
|
|
5
|
+
.at(0);
|
|
18
6
|
}
|
|
19
7
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/stream_manager/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/stream_manager/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,oBAAoB,CAClC,WAAyB;IAEzB,OAAO,WAAW;SACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC;SAClC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;SAC/D,EAAE,CAAC,CAAC,CAAC,CAAC;AACX,CAAC"}
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@waku/core","version":"0.0.33-
|
|
1
|
+
{"name":"@waku/core","version":"0.0.33-b93134a.0","description":"TypeScript implementation of the Waku v2 protocol","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"},"./lib/message/version_0":{"types":"./dist/lib/message/version_0.d.ts","import":"./dist/lib/message/version_0.js"},"./lib/base_protocol":{"types":"./dist/lib/base_protocol.d.ts","import":"./dist/lib/base_protocol.js"}},"typesVersions":{"*":{"lib/*":["dist/lib/*"],"constants/*":["dist/constants/*"]}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/core#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","decentralised","communication","web3","ethereum","dapps"],"scripts":{"build":"run-s build:**","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint src *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:node":"NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha","test:browser":"NODE_ENV=test karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"dependencies":{"@libp2p/ping":"^1.1.2","@waku/enr":"0.0.27-b93134a.0","@waku/interfaces":"0.0.28-b93134a.0","@waku/proto":"0.0.9-b93134a.0","@waku/utils":"0.0.21-b93134a.0","debug":"^4.3.4","it-all":"^3.0.4","it-length-prefixed":"^9.0.4","it-pipe":"^3.0.1","p-event":"^6.0.1","uint8arraylist":"^2.4.3","uuid":"^9.0.0"},"devDependencies":{"@multiformats/multiaddr":"^12.0.0","@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^4.3.11","@types/debug":"^4.1.12","@types/mocha":"^10.0.6","@types/uuid":"^9.0.8","@waku/build-utils":"*","chai":"^4.3.10","sinon":"^18.0.0","cspell":"^8.6.1","fast-check":"^3.19.0","ignore-loader":"^0.1.2","isomorphic-fetch":"^3.0.0","mocha":"^10.3.0","npm-run-all":"^4.1.5","process":"^0.11.10","rollup":"^4.12.0"},"peerDependencies":{"@multiformats/multiaddr":"^12.0.0","libp2p":"^1.8.1"},"peerDependenciesMeta":{"@multiformats/multiaddr":{"optional":true},"libp2p":{"optional":true}},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}
|
package/src/lib/base_protocol.ts
CHANGED
|
@@ -66,11 +66,8 @@ export class BaseProtocol implements IBaseProtocolCore {
|
|
|
66
66
|
public async connectedPeers(): Promise<Peer[]> {
|
|
67
67
|
const peers = await this.allPeers();
|
|
68
68
|
return peers.filter((peer) => {
|
|
69
|
-
|
|
70
|
-
peer.id
|
|
71
|
-
);
|
|
72
|
-
return connections.some((c) =>
|
|
73
|
-
c.streams.some((s) => s.protocol === this.multicodec)
|
|
69
|
+
return (
|
|
70
|
+
this.components.connectionManager.getConnections(peer.id).length > 0
|
|
74
71
|
);
|
|
75
72
|
});
|
|
76
73
|
}
|
package/src/lib/filter/index.ts
CHANGED
|
@@ -37,7 +37,6 @@ export class FilterCore extends BaseProtocol implements IBaseProtocolCore {
|
|
|
37
37
|
wakuMessage: WakuMessage,
|
|
38
38
|
peerIdStr: string
|
|
39
39
|
) => Promise<void>,
|
|
40
|
-
private handleError: (error: Error) => Promise<void>,
|
|
41
40
|
public readonly pubsubTopics: PubsubTopic[],
|
|
42
41
|
libp2p: Libp2p
|
|
43
42
|
) {
|
|
@@ -302,18 +301,8 @@ export class FilterCore extends BaseProtocol implements IBaseProtocolCore {
|
|
|
302
301
|
() => {
|
|
303
302
|
log.info("Receiving pipe closed.");
|
|
304
303
|
},
|
|
305
|
-
|
|
306
|
-
log.error(
|
|
307
|
-
"Error with receiving pipe",
|
|
308
|
-
e,
|
|
309
|
-
" -- ",
|
|
310
|
-
"on peer ",
|
|
311
|
-
connection.remotePeer.toString(),
|
|
312
|
-
" -- ",
|
|
313
|
-
"stream ",
|
|
314
|
-
stream
|
|
315
|
-
);
|
|
316
|
-
await this.handleError(e);
|
|
304
|
+
(e) => {
|
|
305
|
+
log.error("Error with receiving pipe", e);
|
|
317
306
|
}
|
|
318
307
|
);
|
|
319
308
|
} catch (e) {
|
|
@@ -1,47 +1,41 @@
|
|
|
1
|
-
import type { PeerUpdate, Stream } from "@libp2p/interface";
|
|
2
|
-
import type {
|
|
3
|
-
import { Libp2p } from "@waku/interfaces";
|
|
1
|
+
import type { Peer, PeerId, PeerUpdate, Stream } from "@libp2p/interface";
|
|
2
|
+
import type { Libp2p } from "@waku/interfaces";
|
|
4
3
|
import { Logger } from "@waku/utils";
|
|
5
4
|
|
|
6
|
-
import {
|
|
7
|
-
|
|
8
|
-
const CONNECTION_TIMEOUT = 5_000;
|
|
9
|
-
const RETRY_BACKOFF_BASE = 1_000;
|
|
10
|
-
const MAX_RETRIES = 3;
|
|
5
|
+
import { selectOpenConnection } from "./utils.js";
|
|
11
6
|
|
|
12
7
|
export class StreamManager {
|
|
13
|
-
private readonly streamPool: Map<string, Promise<Stream | void>>;
|
|
14
8
|
private readonly log: Logger;
|
|
15
9
|
|
|
10
|
+
private ongoingCreation: Set<string> = new Set();
|
|
11
|
+
private streamPool: Map<string, Promise<void>> = new Map();
|
|
12
|
+
|
|
16
13
|
public constructor(
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
private multicodec: string,
|
|
15
|
+
private getConnections: Libp2p["getConnections"],
|
|
16
|
+
private addEventListener: Libp2p["addEventListener"]
|
|
20
17
|
) {
|
|
21
18
|
this.log = new Logger(`stream-manager:${multicodec}`);
|
|
22
|
-
this.streamPool = new Map();
|
|
23
19
|
this.addEventListener("peer:update", this.handlePeerUpdateStreamPool);
|
|
24
20
|
}
|
|
25
21
|
|
|
26
22
|
public async getStream(peer: Peer): Promise<Stream> {
|
|
27
|
-
const
|
|
28
|
-
|
|
23
|
+
const peerId = peer.id.toString();
|
|
24
|
+
|
|
25
|
+
const scheduledStream = this.streamPool.get(peerId);
|
|
29
26
|
|
|
30
|
-
if (
|
|
31
|
-
|
|
27
|
+
if (scheduledStream) {
|
|
28
|
+
this.streamPool.delete(peerId);
|
|
29
|
+
await scheduledStream;
|
|
32
30
|
}
|
|
33
31
|
|
|
34
|
-
this.
|
|
35
|
-
this.prepareStream(peer);
|
|
32
|
+
const stream = this.getOpenStreamForCodec(peer.id);
|
|
36
33
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
} catch (error) {
|
|
43
|
-
this.log.warn(`Failed to get stream for ${peerIdStr} -- `, error);
|
|
44
|
-
this.log.warn("Attempting to create a new stream for the peer");
|
|
34
|
+
if (stream) {
|
|
35
|
+
this.log.info(
|
|
36
|
+
`Found existing stream peerId=${peer.id.toString()} multicodec=${this.multicodec}`
|
|
37
|
+
);
|
|
38
|
+
return stream;
|
|
45
39
|
}
|
|
46
40
|
|
|
47
41
|
return this.createStream(peer);
|
|
@@ -49,67 +43,112 @@ export class StreamManager {
|
|
|
49
43
|
|
|
50
44
|
private async createStream(peer: Peer, retries = 0): Promise<Stream> {
|
|
51
45
|
const connections = this.getConnections(peer.id);
|
|
52
|
-
const connection =
|
|
46
|
+
const connection = selectOpenConnection(connections);
|
|
53
47
|
|
|
54
48
|
if (!connection) {
|
|
55
|
-
throw new Error(
|
|
49
|
+
throw new Error(
|
|
50
|
+
`Failed to get a connection to the peer peerId=${peer.id.toString()} multicodec=${this.multicodec}`
|
|
51
|
+
);
|
|
56
52
|
}
|
|
57
53
|
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
54
|
+
let lastError: unknown;
|
|
55
|
+
let stream: Stream | undefined;
|
|
56
|
+
|
|
57
|
+
for (let i = 0; i < retries + 1; i++) {
|
|
58
|
+
try {
|
|
59
|
+
this.log.info(
|
|
60
|
+
`Attempting to create a stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`
|
|
61
|
+
);
|
|
62
|
+
stream = await connection.newStream(this.multicodec);
|
|
63
|
+
this.log.info(
|
|
64
|
+
`Created stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`
|
|
65
|
+
);
|
|
66
|
+
break;
|
|
67
|
+
} catch (error) {
|
|
68
|
+
lastError = error;
|
|
65
69
|
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
if (!stream) {
|
|
66
73
|
throw new Error(
|
|
67
|
-
`Failed to create a new stream for ${peer.id.toString()} -- ` +
|
|
74
|
+
`Failed to create a new stream for ${peer.id.toString()} -- ` +
|
|
75
|
+
lastError
|
|
68
76
|
);
|
|
69
77
|
}
|
|
78
|
+
|
|
79
|
+
return stream;
|
|
70
80
|
}
|
|
71
81
|
|
|
72
|
-
private
|
|
73
|
-
const
|
|
74
|
-
setTimeout(resolve, CONNECTION_TIMEOUT)
|
|
75
|
-
);
|
|
82
|
+
private async createStreamWithLock(peer: Peer): Promise<void> {
|
|
83
|
+
const peerId = peer.id.toString();
|
|
76
84
|
|
|
77
|
-
|
|
78
|
-
this.
|
|
79
|
-
|
|
80
|
-
throw new Error("Connection timeout");
|
|
81
|
-
})
|
|
82
|
-
]).catch((error) => {
|
|
83
|
-
this.log.error(
|
|
84
|
-
`Failed to prepare a new stream for ${peer.id.toString()} -- `,
|
|
85
|
-
error
|
|
85
|
+
if (this.ongoingCreation.has(peerId)) {
|
|
86
|
+
this.log.info(
|
|
87
|
+
`Skipping creation of a stream due to lock for peerId=${peerId} multicodec=${this.multicodec}`
|
|
86
88
|
);
|
|
87
|
-
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
try {
|
|
93
|
+
this.ongoingCreation.add(peerId);
|
|
94
|
+
await this.createStream(peer);
|
|
95
|
+
} catch (error) {
|
|
96
|
+
this.log.error(`Failed to createStreamWithLock:`, error);
|
|
97
|
+
} finally {
|
|
98
|
+
this.ongoingCreation.delete(peerId);
|
|
99
|
+
}
|
|
88
100
|
|
|
89
|
-
|
|
101
|
+
return;
|
|
90
102
|
}
|
|
91
103
|
|
|
92
104
|
private handlePeerUpdateStreamPool = (evt: CustomEvent<PeerUpdate>): void => {
|
|
93
105
|
const { peer } = evt.detail;
|
|
94
106
|
|
|
95
|
-
if (peer.protocols.includes(this.multicodec)) {
|
|
96
|
-
|
|
107
|
+
if (!peer.protocols.includes(this.multicodec)) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
97
110
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
const peerIdStr = peer.id.toString();
|
|
103
|
-
this.streamPool.delete(peerIdStr);
|
|
104
|
-
this.log.info(
|
|
105
|
-
`Removed pending stream for disconnected peer ${peerIdStr}`
|
|
106
|
-
);
|
|
107
|
-
}
|
|
111
|
+
const stream = this.getOpenStreamForCodec(peer.id);
|
|
112
|
+
|
|
113
|
+
if (stream) {
|
|
114
|
+
return;
|
|
108
115
|
}
|
|
116
|
+
|
|
117
|
+
this.scheduleNewStream(peer);
|
|
109
118
|
};
|
|
110
119
|
|
|
111
|
-
private
|
|
120
|
+
private scheduleNewStream(peer: Peer): void {
|
|
121
|
+
this.log.info(
|
|
122
|
+
`Scheduling creation of a stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`
|
|
123
|
+
);
|
|
124
|
+
|
|
125
|
+
// abandon previous attempt
|
|
126
|
+
if (this.streamPool.has(peer.id.toString())) {
|
|
127
|
+
this.streamPool.delete(peer.id.toString());
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
this.streamPool.set(peer.id.toString(), this.createStreamWithLock(peer));
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
private getOpenStreamForCodec(peerId: PeerId): Stream | undefined {
|
|
112
134
|
const connections = this.getConnections(peerId);
|
|
113
|
-
|
|
135
|
+
const connection = selectOpenConnection(connections);
|
|
136
|
+
|
|
137
|
+
if (!connection) {
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
const stream = connection.streams.find(
|
|
142
|
+
(s) => s.protocol === this.multicodec
|
|
143
|
+
);
|
|
144
|
+
|
|
145
|
+
const isStreamUnusable = ["done", "closed", "closing"].includes(
|
|
146
|
+
stream?.writeStatus || ""
|
|
147
|
+
);
|
|
148
|
+
if (isStreamUnusable) {
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
return stream;
|
|
114
153
|
}
|
|
115
154
|
}
|