@waku/core 0.0.33-f599932.0 → 0.0.34-66cf711.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/CHANGELOG.md +22 -0
- package/bundle/{base_protocol-CS0EDeEY.js → base_protocol-Dzv-QHPR.js} +93 -78
- package/bundle/{index-BVysxsMu.js → index-BIW3qNYx.js} +19 -12
- package/bundle/index.js +45 -420
- package/bundle/lib/base_protocol.js +2 -2
- package/bundle/lib/message/version_0.js +2 -2
- package/bundle/{version_0-C5ObpJ_0.js → version_0-CdmZMfkQ.js} +10 -4
- package/dist/.tsbuildinfo +1 -1
- package/dist/index.d.ts +1 -2
- package/dist/index.js +1 -2
- package/dist/index.js.map +1 -1
- package/dist/lib/base_protocol.d.ts +1 -1
- package/dist/lib/base_protocol.js +1 -5
- package/dist/lib/base_protocol.js.map +1 -1
- package/dist/lib/connection_manager.js +1 -1
- package/dist/lib/connection_manager.js.map +1 -1
- package/dist/lib/filter/index.d.ts +1 -2
- package/dist/lib/filter/index.js +2 -5
- package/dist/lib/filter/index.js.map +1 -1
- package/dist/lib/stream_manager/stream_manager.d.ts +12 -9
- package/dist/lib/stream_manager/stream_manager.js +87 -56
- 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/index.ts +1 -3
- package/src/lib/base_protocol.ts +1 -7
- package/src/lib/connection_manager.ts +1 -1
- package/src/lib/filter/index.ts +2 -10
- package/src/lib/stream_manager/stream_manager.ts +124 -66
- package/src/lib/stream_manager/utils.ts +5 -17
- package/dist/lib/wait_for_remote_peer.d.ts +0 -22
- package/dist/lib/wait_for_remote_peer.js +0 -142
- package/dist/lib/wait_for_remote_peer.js.map +0 -1
- package/src/lib/wait_for_remote_peer.ts +0 -200
|
@@ -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), {
|
|
@@ -200,8 +198,7 @@ export class FilterCore extends BaseProtocol {
|
|
|
200
198
|
}).then(() => {
|
|
201
199
|
log.info("Receiving pipe closed.");
|
|
202
200
|
}, async (e) => {
|
|
203
|
-
log.error(
|
|
204
|
-
await this.handleError(e);
|
|
201
|
+
log.error(`Error with receiving pipe on peer:${connection.remotePeer.toString()} -- stream:${stream.id} -- protocol:${stream.protocol}: `, 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,19 @@
|
|
|
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;
|
|
17
|
+
private lockStream;
|
|
18
|
+
private isStreamLocked;
|
|
16
19
|
}
|
|
@@ -1,90 +1,121 @@
|
|
|
1
1
|
import { Logger } from "@waku/utils";
|
|
2
|
-
import {
|
|
3
|
-
const
|
|
4
|
-
const RETRY_BACKOFF_BASE = 1_000;
|
|
5
|
-
const MAX_RETRIES = 3;
|
|
2
|
+
import { selectOpenConnection } from "./utils.js";
|
|
3
|
+
const STREAM_LOCK_KEY = "consumed";
|
|
6
4
|
export class StreamManager {
|
|
7
5
|
multicodec;
|
|
8
6
|
getConnections;
|
|
9
7
|
addEventListener;
|
|
10
|
-
streamPool;
|
|
11
8
|
log;
|
|
9
|
+
ongoingCreation = new Set();
|
|
10
|
+
streamPool = new Map();
|
|
12
11
|
constructor(multicodec, getConnections, addEventListener) {
|
|
13
12
|
this.multicodec = multicodec;
|
|
14
13
|
this.getConnections = getConnections;
|
|
15
14
|
this.addEventListener = addEventListener;
|
|
16
15
|
this.log = new Logger(`stream-manager:${multicodec}`);
|
|
17
|
-
this.streamPool = new Map();
|
|
18
16
|
this.addEventListener("peer:update", this.handlePeerUpdateStreamPool);
|
|
19
17
|
}
|
|
20
18
|
async getStream(peer) {
|
|
21
|
-
const
|
|
22
|
-
const
|
|
23
|
-
if (
|
|
24
|
-
|
|
19
|
+
const peerId = peer.id.toString();
|
|
20
|
+
const scheduledStream = this.streamPool.get(peerId);
|
|
21
|
+
if (scheduledStream) {
|
|
22
|
+
this.streamPool.delete(peerId);
|
|
23
|
+
await scheduledStream;
|
|
25
24
|
}
|
|
26
|
-
this.
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
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");
|
|
25
|
+
let stream = this.getOpenStreamForCodec(peer.id);
|
|
26
|
+
if (stream) {
|
|
27
|
+
this.log.info(`Found existing stream peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
28
|
+
this.lockStream(peer.id.toString(), stream);
|
|
29
|
+
return stream;
|
|
37
30
|
}
|
|
38
|
-
|
|
31
|
+
stream = await this.createStream(peer);
|
|
32
|
+
this.lockStream(peer.id.toString(), stream);
|
|
33
|
+
return stream;
|
|
39
34
|
}
|
|
40
35
|
async createStream(peer, retries = 0) {
|
|
41
36
|
const connections = this.getConnections(peer.id);
|
|
42
|
-
const connection =
|
|
37
|
+
const connection = selectOpenConnection(connections);
|
|
43
38
|
if (!connection) {
|
|
44
|
-
throw new Error(
|
|
39
|
+
throw new Error(`Failed to get a connection to the peer peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
40
|
+
}
|
|
41
|
+
let lastError;
|
|
42
|
+
let stream;
|
|
43
|
+
for (let i = 0; i < retries + 1; i++) {
|
|
44
|
+
try {
|
|
45
|
+
this.log.info(`Attempting to create a stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
46
|
+
stream = await connection.newStream(this.multicodec);
|
|
47
|
+
this.log.info(`Created stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
48
|
+
break;
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
lastError = error;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
if (!stream) {
|
|
55
|
+
throw new Error(`Failed to create a new stream for ${peer.id.toString()} -- ` +
|
|
56
|
+
lastError);
|
|
57
|
+
}
|
|
58
|
+
return stream;
|
|
59
|
+
}
|
|
60
|
+
async createStreamWithLock(peer) {
|
|
61
|
+
const peerId = peer.id.toString();
|
|
62
|
+
if (this.ongoingCreation.has(peerId)) {
|
|
63
|
+
this.log.info(`Skipping creation of a stream due to lock for peerId=${peerId} multicodec=${this.multicodec}`);
|
|
64
|
+
return;
|
|
45
65
|
}
|
|
46
66
|
try {
|
|
47
|
-
|
|
67
|
+
this.ongoingCreation.add(peerId);
|
|
68
|
+
await this.createStream(peer);
|
|
48
69
|
}
|
|
49
70
|
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);
|
|
71
|
+
this.log.error(`Failed to createStreamWithLock:`, error);
|
|
56
72
|
}
|
|
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);
|
|
73
|
+
finally {
|
|
74
|
+
this.ongoingCreation.delete(peerId);
|
|
75
|
+
}
|
|
76
|
+
return;
|
|
69
77
|
}
|
|
70
78
|
handlePeerUpdateStreamPool = (evt) => {
|
|
71
79
|
const { peer } = evt.detail;
|
|
72
|
-
if (peer.protocols.includes(this.multicodec)) {
|
|
73
|
-
|
|
74
|
-
if (isConnected) {
|
|
75
|
-
this.log.info(`Preemptively opening a stream to ${peer.id.toString()}`);
|
|
76
|
-
this.prepareStream(peer);
|
|
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
|
-
}
|
|
80
|
+
if (!peer.protocols.includes(this.multicodec)) {
|
|
81
|
+
return;
|
|
83
82
|
}
|
|
83
|
+
const stream = this.getOpenStreamForCodec(peer.id);
|
|
84
|
+
if (stream) {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
this.scheduleNewStream(peer);
|
|
84
88
|
};
|
|
85
|
-
|
|
89
|
+
scheduleNewStream(peer) {
|
|
90
|
+
this.log.info(`Scheduling creation of a stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
|
|
91
|
+
// abandon previous attempt
|
|
92
|
+
if (this.streamPool.has(peer.id.toString())) {
|
|
93
|
+
this.streamPool.delete(peer.id.toString());
|
|
94
|
+
}
|
|
95
|
+
this.streamPool.set(peer.id.toString(), this.createStreamWithLock(peer));
|
|
96
|
+
}
|
|
97
|
+
getOpenStreamForCodec(peerId) {
|
|
86
98
|
const connections = this.getConnections(peerId);
|
|
87
|
-
|
|
99
|
+
const connection = selectOpenConnection(connections);
|
|
100
|
+
if (!connection) {
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
const stream = connection.streams.find((s) => s.protocol === this.multicodec);
|
|
104
|
+
if (!stream) {
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
const isStreamUnusable = ["done", "closed", "closing"].includes(stream.writeStatus || "");
|
|
108
|
+
if (isStreamUnusable || this.isStreamLocked(stream)) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
return stream;
|
|
112
|
+
}
|
|
113
|
+
lockStream(peerId, stream) {
|
|
114
|
+
this.log.info(`Locking stream for peerId:${peerId}\tstreamId:${stream.id}`);
|
|
115
|
+
stream.metadata[STREAM_LOCK_KEY] = true;
|
|
116
|
+
}
|
|
117
|
+
isStreamLocked(stream) {
|
|
118
|
+
return !!stream.metadata[STREAM_LOCK_KEY];
|
|
88
119
|
}
|
|
89
120
|
}
|
|
90
121
|
//# 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,eAAe,GAAG,UAAU,CAAC;AAEnC,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,IAAI,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEjD,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,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;YAC5C,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;QAE5C,OAAO,MAAM,CAAC;IAChB,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,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAC7D,MAAM,CAAC,WAAW,IAAI,EAAE,CACzB,CAAC;QACF,IAAI,gBAAgB,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACpD,OAAO;QACT,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,UAAU,CAAC,MAAc,EAAE,MAAc;QAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,MAAM,cAAc,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5E,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC;IAC1C,CAAC;IAEO,cAAc,CAAC,MAAc;QACnC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC5C,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.
|
|
1
|
+
{"name":"@waku/core","version":"0.0.34-66cf711.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":{"@waku/enr":"0.0.28-66cf711.0","@waku/interfaces":"0.0.29-66cf711.0","@libp2p/ping":"2.0.1","@waku/proto":"0.0.9-66cf711.0","@waku/utils":"0.0.22-66cf711.0","debug":"^4.3.4","it-all":"^3.0.4","it-length-prefixed":"^9.0.4","it-pipe":"^3.0.1","uint8arraylist":"^2.4.3","uuid":"^9.0.0"},"devDependencies":{"@libp2p/peer-id":"^5.0.1","@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":"2.1.8"},"peerDependenciesMeta":{"@multiformats/multiaddr":{"optional":true},"libp2p":{"optional":true}},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}
|
package/src/index.ts
CHANGED
|
@@ -13,9 +13,7 @@ export * as waku_light_push from "./lib/light_push/index.js";
|
|
|
13
13
|
export { LightPushCodec, LightPushCore } from "./lib/light_push/index.js";
|
|
14
14
|
|
|
15
15
|
export * as waku_store from "./lib/store/index.js";
|
|
16
|
-
export { StoreCore } from "./lib/store/index.js";
|
|
17
|
-
|
|
18
|
-
export { waitForRemotePeer } from "./lib/wait_for_remote_peer.js";
|
|
16
|
+
export { StoreCore, StoreCodec } from "./lib/store/index.js";
|
|
19
17
|
|
|
20
18
|
export { ConnectionManager } from "./lib/connection_manager.js";
|
|
21
19
|
|
package/src/lib/base_protocol.ts
CHANGED
|
@@ -46,7 +46,6 @@ export class BaseProtocol implements IBaseProtocolCore {
|
|
|
46
46
|
return this.streamManager.getStream(peer);
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
//TODO: move to SDK
|
|
50
49
|
/**
|
|
51
50
|
* Returns known peers from the address book (`libp2p.peerStore`) that support
|
|
52
51
|
* the class protocol. Waku may or may not be currently connected to these
|
|
@@ -56,17 +55,12 @@ export class BaseProtocol implements IBaseProtocolCore {
|
|
|
56
55
|
return getPeersForProtocol(this.components.peerStore, [this.multicodec]);
|
|
57
56
|
}
|
|
58
57
|
|
|
59
|
-
public async connectedPeers(
|
|
58
|
+
public async connectedPeers(): Promise<Peer[]> {
|
|
60
59
|
const peers = await this.allPeers();
|
|
61
60
|
return peers.filter((peer) => {
|
|
62
61
|
const connections = this.components.connectionManager.getConnections(
|
|
63
62
|
peer.id
|
|
64
63
|
);
|
|
65
|
-
if (withOpenStreams) {
|
|
66
|
-
return connections.some((c) =>
|
|
67
|
-
c.streams.some((s) => s.protocol === this.multicodec)
|
|
68
|
-
);
|
|
69
|
-
}
|
|
70
64
|
return connections.length > 0;
|
|
71
65
|
});
|
|
72
66
|
}
|
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
|
) {
|
|
@@ -304,16 +303,9 @@ export class FilterCore extends BaseProtocol implements IBaseProtocolCore {
|
|
|
304
303
|
},
|
|
305
304
|
async (e) => {
|
|
306
305
|
log.error(
|
|
307
|
-
|
|
308
|
-
e
|
|
309
|
-
" -- ",
|
|
310
|
-
"on peer ",
|
|
311
|
-
connection.remotePeer.toString(),
|
|
312
|
-
" -- ",
|
|
313
|
-
"stream ",
|
|
314
|
-
stream
|
|
306
|
+
`Error with receiving pipe on peer:${connection.remotePeer.toString()} -- stream:${stream.id} -- protocol:${stream.protocol}: `,
|
|
307
|
+
e
|
|
315
308
|
);
|
|
316
|
-
await this.handleError(e);
|
|
317
309
|
}
|
|
318
310
|
);
|
|
319
311
|
} catch (e) {
|