@waku/core 0.0.36-f7c290d.0 → 0.0.36
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 +39 -0
- package/bundle/index.js +1008 -594
- package/bundle/lib/message/version_0.js +1 -2
- package/bundle/{version_0-CyeTW0Vr.js → version_0-9DPFjcJG.js} +1570 -6
- package/dist/.tsbuildinfo +1 -1
- package/dist/lib/connection_manager/connection_manager.d.ts +2 -1
- package/dist/lib/connection_manager/connection_manager.js +16 -8
- package/dist/lib/connection_manager/connection_manager.js.map +1 -1
- package/dist/lib/filter/filter.d.ts +4 -3
- package/dist/lib/filter/filter.js +9 -7
- package/dist/lib/filter/filter.js.map +1 -1
- package/dist/lib/light_push/light_push.d.ts +4 -3
- package/dist/lib/light_push/light_push.js +6 -4
- package/dist/lib/light_push/light_push.js.map +1 -1
- package/dist/lib/message/version_0.d.ts +1 -1
- package/dist/lib/metadata/metadata.js +6 -4
- package/dist/lib/metadata/metadata.js.map +1 -1
- package/dist/lib/store/store.d.ts +4 -3
- package/dist/lib/store/store.js +6 -4
- package/dist/lib/store/store.js.map +1 -1
- package/dist/lib/stream_manager/stream_manager.d.ts +3 -4
- package/dist/lib/stream_manager/stream_manager.js +6 -8
- package/dist/lib/stream_manager/stream_manager.js.map +1 -1
- package/package.json +125 -1
- package/src/lib/connection_manager/connection_manager.ts +24 -16
- package/src/lib/filter/filter.ts +13 -8
- package/src/lib/light_push/light_push.ts +8 -5
- package/src/lib/metadata/metadata.ts +8 -5
- package/src/lib/store/store.ts +8 -5
- package/src/lib/stream_manager/stream_manager.ts +8 -6
- package/bundle/base_protocol-DvQrudwy.js +0 -152
- package/bundle/index-CTo1my9M.js +0 -1543
- package/bundle/lib/base_protocol.js +0 -2
- package/dist/lib/base_protocol.d.ts +0 -18
- package/dist/lib/base_protocol.js +0 -25
- package/dist/lib/base_protocol.js.map +0 -1
- package/src/lib/base_protocol.ts +0 -44
|
@@ -3,19 +3,21 @@ import { Logger } from "@waku/utils";
|
|
|
3
3
|
import all from "it-all";
|
|
4
4
|
import * as lp from "it-length-prefixed";
|
|
5
5
|
import { pipe } from "it-pipe";
|
|
6
|
-
import {
|
|
6
|
+
import { StreamManager } from "../stream_manager/index.js";
|
|
7
7
|
import { FilterPushRpc, FilterSubscribeResponse, FilterSubscribeRpc } from "./filter_rpc.js";
|
|
8
8
|
const log = new Logger("filter:v2");
|
|
9
9
|
export const FilterCodecs = {
|
|
10
10
|
SUBSCRIBE: "/vac/waku/filter-subscribe/2.0.0-beta1",
|
|
11
11
|
PUSH: "/vac/waku/filter-push/2.0.0-beta1"
|
|
12
12
|
};
|
|
13
|
-
export class FilterCore
|
|
13
|
+
export class FilterCore {
|
|
14
14
|
pubsubTopics;
|
|
15
|
+
streamManager;
|
|
15
16
|
static handleIncomingMessage;
|
|
17
|
+
multicodec = FilterCodecs.SUBSCRIBE;
|
|
16
18
|
constructor(handleIncomingMessage, pubsubTopics, libp2p) {
|
|
17
|
-
super(FilterCodecs.SUBSCRIBE, libp2p.components, pubsubTopics);
|
|
18
19
|
this.pubsubTopics = pubsubTopics;
|
|
20
|
+
this.streamManager = new StreamManager(FilterCodecs.SUBSCRIBE, libp2p.components);
|
|
19
21
|
// TODO(weboko): remove when @waku/sdk 0.0.33 is released
|
|
20
22
|
const prevHandler = FilterCore.handleIncomingMessage;
|
|
21
23
|
FilterCore.handleIncomingMessage = !prevHandler
|
|
@@ -44,7 +46,7 @@ export class FilterCore extends BaseProtocol {
|
|
|
44
46
|
});
|
|
45
47
|
}
|
|
46
48
|
async subscribe(pubsubTopic, peerId, contentTopics) {
|
|
47
|
-
const stream = await this.getStream(peerId);
|
|
49
|
+
const stream = await this.streamManager.getStream(peerId);
|
|
48
50
|
const request = FilterSubscribeRpc.createSubscribeRequest(pubsubTopic, contentTopics);
|
|
49
51
|
let res;
|
|
50
52
|
try {
|
|
@@ -79,7 +81,7 @@ export class FilterCore extends BaseProtocol {
|
|
|
79
81
|
async unsubscribe(pubsubTopic, peerId, contentTopics) {
|
|
80
82
|
let stream;
|
|
81
83
|
try {
|
|
82
|
-
stream = await this.getStream(peerId);
|
|
84
|
+
stream = await this.streamManager.getStream(peerId);
|
|
83
85
|
}
|
|
84
86
|
catch (error) {
|
|
85
87
|
log.error(`Failed to get a stream for remote peer${peerId.toString()}`, error);
|
|
@@ -111,7 +113,7 @@ export class FilterCore extends BaseProtocol {
|
|
|
111
113
|
};
|
|
112
114
|
}
|
|
113
115
|
async unsubscribeAll(pubsubTopic, peerId) {
|
|
114
|
-
const stream = await this.getStream(peerId);
|
|
116
|
+
const stream = await this.streamManager.getStream(peerId);
|
|
115
117
|
const request = FilterSubscribeRpc.createUnsubscribeAllRequest(pubsubTopic);
|
|
116
118
|
const res = await pipe([request.encode()], lp.encode, stream, lp.decode, async (source) => await all(source));
|
|
117
119
|
if (!res || !res.length) {
|
|
@@ -142,7 +144,7 @@ export class FilterCore extends BaseProtocol {
|
|
|
142
144
|
async ping(peerId) {
|
|
143
145
|
let stream;
|
|
144
146
|
try {
|
|
145
|
-
stream = await this.getStream(peerId);
|
|
147
|
+
stream = await this.streamManager.getStream(peerId);
|
|
146
148
|
}
|
|
147
149
|
catch (error) {
|
|
148
150
|
log.error(`Failed to get a stream for remote peer${peerId.toString()}`, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/lib/filter/filter.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/lib/filter/filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import type { PeerId } from "@libp2p/interface";
|
|
2
|
-
import { type CoreProtocolResult, type
|
|
2
|
+
import { type CoreProtocolResult, type IEncoder, type IMessage, type Libp2p, PubsubTopic } from "@waku/interfaces";
|
|
3
3
|
import { PushResponse } from "@waku/proto";
|
|
4
|
-
import { BaseProtocol } from "../base_protocol.js";
|
|
5
4
|
export declare const LightPushCodec = "/vac/waku/lightpush/2.0.0-beta1";
|
|
6
5
|
export { PushResponse };
|
|
7
6
|
/**
|
|
8
7
|
* Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
|
|
9
8
|
*/
|
|
10
|
-
export declare class LightPushCore
|
|
9
|
+
export declare class LightPushCore {
|
|
11
10
|
readonly pubsubTopics: PubsubTopic[];
|
|
11
|
+
private readonly streamManager;
|
|
12
|
+
readonly multicodec = "/vac/waku/lightpush/2.0.0-beta1";
|
|
12
13
|
constructor(pubsubTopics: PubsubTopic[], libp2p: Libp2p);
|
|
13
14
|
private preparePushMessage;
|
|
14
15
|
send(encoder: IEncoder, message: IMessage, peerId: PeerId): Promise<CoreProtocolResult>;
|
|
@@ -6,7 +6,7 @@ import all from "it-all";
|
|
|
6
6
|
import * as lp from "it-length-prefixed";
|
|
7
7
|
import { pipe } from "it-pipe";
|
|
8
8
|
import { Uint8ArrayList } from "uint8arraylist";
|
|
9
|
-
import {
|
|
9
|
+
import { StreamManager } from "../stream_manager/index.js";
|
|
10
10
|
import { PushRpc } from "./push_rpc.js";
|
|
11
11
|
import { isRLNResponseError } from "./utils.js";
|
|
12
12
|
const log = new Logger("light-push");
|
|
@@ -15,11 +15,13 @@ export { PushResponse };
|
|
|
15
15
|
/**
|
|
16
16
|
* Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
|
|
17
17
|
*/
|
|
18
|
-
export class LightPushCore
|
|
18
|
+
export class LightPushCore {
|
|
19
19
|
pubsubTopics;
|
|
20
|
+
streamManager;
|
|
21
|
+
multicodec = LightPushCodec;
|
|
20
22
|
constructor(pubsubTopics, libp2p) {
|
|
21
|
-
super(LightPushCodec, libp2p.components, pubsubTopics);
|
|
22
23
|
this.pubsubTopics = pubsubTopics;
|
|
24
|
+
this.streamManager = new StreamManager(LightPushCodec, libp2p.components);
|
|
23
25
|
}
|
|
24
26
|
async preparePushMessage(encoder, message) {
|
|
25
27
|
try {
|
|
@@ -63,7 +65,7 @@ export class LightPushCore extends BaseProtocol {
|
|
|
63
65
|
}
|
|
64
66
|
let stream;
|
|
65
67
|
try {
|
|
66
|
-
stream = await this.getStream(peerId);
|
|
68
|
+
stream = await this.streamManager.getStream(peerId);
|
|
67
69
|
}
|
|
68
70
|
catch (error) {
|
|
69
71
|
log.error("Failed to get stream", error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"light_push.js","sourceRoot":"","sources":["../../../src/lib/light_push/light_push.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"light_push.js","sourceRoot":"","sources":["../../../src/lib/light_push/light_push.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ export declare class Encoder implements IEncoder {
|
|
|
19
19
|
ephemeral: boolean;
|
|
20
20
|
pubsubTopic: PubsubTopic;
|
|
21
21
|
metaSetter?: IMetaSetter | undefined;
|
|
22
|
-
constructor(contentTopic: string, ephemeral: boolean, pubsubTopic: PubsubTopic, metaSetter?: IMetaSetter | undefined);
|
|
22
|
+
constructor(contentTopic: string, ephemeral: boolean | undefined, pubsubTopic: PubsubTopic, metaSetter?: IMetaSetter | undefined);
|
|
23
23
|
toWire(message: IMessage): Promise<Uint8Array>;
|
|
24
24
|
toProtoObj(message: IMessage): Promise<IProtoMessage>;
|
|
25
25
|
}
|
|
@@ -5,16 +5,18 @@ import all from "it-all";
|
|
|
5
5
|
import * as lp from "it-length-prefixed";
|
|
6
6
|
import { pipe } from "it-pipe";
|
|
7
7
|
import { Uint8ArrayList } from "uint8arraylist";
|
|
8
|
-
import {
|
|
8
|
+
import { StreamManager } from "../stream_manager/index.js";
|
|
9
9
|
const log = new Logger("metadata");
|
|
10
10
|
export const MetadataCodec = "/vac/waku/metadata/1.0.0";
|
|
11
|
-
class Metadata
|
|
11
|
+
class Metadata {
|
|
12
12
|
pubsubTopics;
|
|
13
|
+
streamManager;
|
|
13
14
|
libp2pComponents;
|
|
14
15
|
handshakesConfirmed = new Map();
|
|
16
|
+
multicodec = MetadataCodec;
|
|
15
17
|
constructor(pubsubTopics, libp2p) {
|
|
16
|
-
super(MetadataCodec, libp2p.components, pubsubTopics);
|
|
17
18
|
this.pubsubTopics = pubsubTopics;
|
|
19
|
+
this.streamManager = new StreamManager(MetadataCodec, libp2p);
|
|
18
20
|
this.libp2pComponents = libp2p;
|
|
19
21
|
void libp2p.registrar.handle(MetadataCodec, (streamData) => {
|
|
20
22
|
void this.onRequest(streamData);
|
|
@@ -34,7 +36,7 @@ class Metadata extends BaseProtocol {
|
|
|
34
36
|
}
|
|
35
37
|
let stream;
|
|
36
38
|
try {
|
|
37
|
-
stream = await this.getStream(peerId);
|
|
39
|
+
stream = await this.streamManager.getStream(peerId);
|
|
38
40
|
}
|
|
39
41
|
catch (error) {
|
|
40
42
|
log.error("Failed to get stream", error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/lib/metadata/metadata.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,aAAa,EAGd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/lib/metadata/metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { PeerId } from "@libp2p/interface";
|
|
2
|
-
import { IDecodedMessage, IDecoder,
|
|
3
|
-
import { BaseProtocol } from "../base_protocol.js";
|
|
2
|
+
import { IDecodedMessage, IDecoder, Libp2p, PubsubTopic, QueryRequestParams } from "@waku/interfaces";
|
|
4
3
|
export declare const StoreCodec = "/vac/waku/store-query/3.0.0";
|
|
5
|
-
export declare class StoreCore
|
|
4
|
+
export declare class StoreCore {
|
|
6
5
|
readonly pubsubTopics: PubsubTopic[];
|
|
6
|
+
private readonly streamManager;
|
|
7
|
+
readonly multicodec = "/vac/waku/store-query/3.0.0";
|
|
7
8
|
constructor(pubsubTopics: PubsubTopic[], libp2p: Libp2p);
|
|
8
9
|
queryPerPage<T extends IDecodedMessage>(queryOpts: QueryRequestParams, decoders: Map<string, IDecoder<T>>, peerId: PeerId): AsyncGenerator<Promise<T | undefined>[]>;
|
|
9
10
|
}
|
package/dist/lib/store/store.js
CHANGED
|
@@ -3,16 +3,18 @@ import all from "it-all";
|
|
|
3
3
|
import * as lp from "it-length-prefixed";
|
|
4
4
|
import { pipe } from "it-pipe";
|
|
5
5
|
import { Uint8ArrayList } from "uint8arraylist";
|
|
6
|
-
import {
|
|
6
|
+
import { StreamManager } from "../stream_manager/index.js";
|
|
7
7
|
import { toProtoMessage } from "../to_proto_message.js";
|
|
8
8
|
import { DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE, StoreQueryRequest, StoreQueryResponse } from "./rpc.js";
|
|
9
9
|
const log = new Logger("store");
|
|
10
10
|
export const StoreCodec = "/vac/waku/store-query/3.0.0";
|
|
11
|
-
export class StoreCore
|
|
11
|
+
export class StoreCore {
|
|
12
12
|
pubsubTopics;
|
|
13
|
+
streamManager;
|
|
14
|
+
multicodec = StoreCodec;
|
|
13
15
|
constructor(pubsubTopics, libp2p) {
|
|
14
|
-
super(StoreCodec, libp2p.components, pubsubTopics);
|
|
15
16
|
this.pubsubTopics = pubsubTopics;
|
|
17
|
+
this.streamManager = new StreamManager(StoreCodec, libp2p.components);
|
|
16
18
|
}
|
|
17
19
|
async *queryPerPage(queryOpts, decoders, peerId) {
|
|
18
20
|
// Only validate decoder content topics for content-filtered queries
|
|
@@ -37,7 +39,7 @@ export class StoreCore extends BaseProtocol {
|
|
|
37
39
|
});
|
|
38
40
|
let stream;
|
|
39
41
|
try {
|
|
40
|
-
stream = await this.getStream(peerId);
|
|
42
|
+
stream = await this.streamManager.getStream(peerId);
|
|
41
43
|
}
|
|
42
44
|
catch (e) {
|
|
43
45
|
log.error("Failed to get stream", e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/lib/store/store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/lib/store/store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import type { PeerId, Stream } from "@libp2p/interface";
|
|
2
|
-
import type {
|
|
2
|
+
import type { Libp2pComponents } from "@waku/interfaces";
|
|
3
3
|
export declare class StreamManager {
|
|
4
4
|
private multicodec;
|
|
5
|
-
private
|
|
6
|
-
private addEventListener;
|
|
5
|
+
private readonly libp2p;
|
|
7
6
|
private readonly log;
|
|
8
7
|
private ongoingCreation;
|
|
9
8
|
private streamPool;
|
|
10
|
-
constructor(multicodec: string,
|
|
9
|
+
constructor(multicodec: string, libp2p: Libp2pComponents);
|
|
11
10
|
getStream(peerId: PeerId): Promise<Stream>;
|
|
12
11
|
private createStream;
|
|
13
12
|
private createStreamWithLock;
|
|
@@ -3,17 +3,15 @@ import { selectOpenConnection } from "./utils.js";
|
|
|
3
3
|
const STREAM_LOCK_KEY = "consumed";
|
|
4
4
|
export class StreamManager {
|
|
5
5
|
multicodec;
|
|
6
|
-
|
|
7
|
-
addEventListener;
|
|
6
|
+
libp2p;
|
|
8
7
|
log;
|
|
9
8
|
ongoingCreation = new Set();
|
|
10
9
|
streamPool = new Map();
|
|
11
|
-
constructor(multicodec,
|
|
10
|
+
constructor(multicodec, libp2p) {
|
|
12
11
|
this.multicodec = multicodec;
|
|
13
|
-
this.
|
|
14
|
-
this.addEventListener = addEventListener;
|
|
12
|
+
this.libp2p = libp2p;
|
|
15
13
|
this.log = new Logger(`stream-manager:${multicodec}`);
|
|
16
|
-
this.addEventListener("peer:update", this.handlePeerUpdateStreamPool);
|
|
14
|
+
this.libp2p.events.addEventListener("peer:update", this.handlePeerUpdateStreamPool);
|
|
17
15
|
}
|
|
18
16
|
async getStream(peerId) {
|
|
19
17
|
const peerIdStr = peerId.toString();
|
|
@@ -33,7 +31,7 @@ export class StreamManager {
|
|
|
33
31
|
return stream;
|
|
34
32
|
}
|
|
35
33
|
async createStream(peerId, retries = 0) {
|
|
36
|
-
const connections = this.getConnections(peerId);
|
|
34
|
+
const connections = this.libp2p.connectionManager.getConnections(peerId);
|
|
37
35
|
const connection = selectOpenConnection(connections);
|
|
38
36
|
if (!connection) {
|
|
39
37
|
throw new Error(`Failed to get a connection to the peer peerId=${peerId.toString()} multicodec=${this.multicodec}`);
|
|
@@ -94,7 +92,7 @@ export class StreamManager {
|
|
|
94
92
|
this.streamPool.set(peer.id.toString(), this.createStreamWithLock(peer));
|
|
95
93
|
}
|
|
96
94
|
getOpenStreamForCodec(peerId) {
|
|
97
|
-
const connections = this.getConnections(peerId);
|
|
95
|
+
const connections = this.libp2p.connectionManager.getConnections(peerId);
|
|
98
96
|
const connection = selectOpenConnection(connections);
|
|
99
97
|
if (!connection) {
|
|
100
98
|
return;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;IACS;IAPF,GAAG,CAAS;IAErB,eAAe,GAAgB,IAAI,GAAG,EAAE,CAAC;IACzC,UAAU,GAA+B,IAAI,GAAG,EAAE,CAAC;IAE3D,YACU,UAAkB,EACT,MAAwB;QADjC,eAAU,GAAV,UAAU,CAAQ;QACT,WAAM,GAAN,MAAM,CAAkB;QAEzC,IAAI,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,kBAAkB,UAAU,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CACjC,aAAa,EACb,IAAI,CAAC,0BAA0B,CAChC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,MAAc;QACnC,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEvD,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAClC,MAAM,eAAe,CAAC;QACxB,CAAC;QAED,IAAI,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAEhD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,gCAAgC,SAAS,eAAe,IAAI,CAAC,UAAU,EAAE,CAC1E,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACnC,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAEnC,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,OAAO,GAAG,CAAC;QACpD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACzE,MAAM,UAAU,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAErD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,iDAAiD,MAAM,CAAC,QAAQ,EAAE,eAAe,IAAI,CAAC,UAAU,EAAE,CACnG,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,MAAM,CAAC,QAAQ,EAAE,eAAe,IAAI,CAAC,UAAU,EAAE,CAC9F,CAAC;gBACF,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,6BAA6B,MAAM,CAAC,QAAQ,EAAE,eAAe,IAAI,CAAC,UAAU,EAAE,CAC/E,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,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CACzE,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,EAAE,CAAC,CAAC;QACnC,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,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACzE,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"}
|
package/package.json
CHANGED
|
@@ -1 +1,125 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"name": "@waku/core",
|
|
3
|
+
"version": "0.0.36",
|
|
4
|
+
"description": "TypeScript implementation of the Waku v2 protocol",
|
|
5
|
+
"types": "./dist/index.d.ts",
|
|
6
|
+
"module": "./dist/index.js",
|
|
7
|
+
"exports": {
|
|
8
|
+
".": {
|
|
9
|
+
"types": "./dist/index.d.ts",
|
|
10
|
+
"import": "./dist/index.js"
|
|
11
|
+
},
|
|
12
|
+
"./lib/message/version_0": {
|
|
13
|
+
"types": "./dist/lib/message/version_0.d.ts",
|
|
14
|
+
"import": "./dist/lib/message/version_0.js"
|
|
15
|
+
}
|
|
16
|
+
},
|
|
17
|
+
"typesVersions": {
|
|
18
|
+
"*": {
|
|
19
|
+
"lib/*": [
|
|
20
|
+
"dist/lib/*"
|
|
21
|
+
],
|
|
22
|
+
"constants/*": [
|
|
23
|
+
"dist/constants/*"
|
|
24
|
+
]
|
|
25
|
+
}
|
|
26
|
+
},
|
|
27
|
+
"type": "module",
|
|
28
|
+
"homepage": "https://github.com/waku-org/js-waku/tree/master/packages/core#readme",
|
|
29
|
+
"repository": {
|
|
30
|
+
"type": "git",
|
|
31
|
+
"url": "https://github.com/waku-org/js-waku.git"
|
|
32
|
+
},
|
|
33
|
+
"bugs": {
|
|
34
|
+
"url": "https://github.com/waku-org/js-waku/issues"
|
|
35
|
+
},
|
|
36
|
+
"license": "MIT OR Apache-2.0",
|
|
37
|
+
"keywords": [
|
|
38
|
+
"waku",
|
|
39
|
+
"decentralised",
|
|
40
|
+
"communication",
|
|
41
|
+
"web3",
|
|
42
|
+
"ethereum",
|
|
43
|
+
"dapps"
|
|
44
|
+
],
|
|
45
|
+
"scripts": {
|
|
46
|
+
"build": "run-s build:**",
|
|
47
|
+
"build:esm": "tsc",
|
|
48
|
+
"build:bundle": "rollup --config rollup.config.js",
|
|
49
|
+
"fix": "run-s fix:*",
|
|
50
|
+
"fix:lint": "eslint src *.js --fix",
|
|
51
|
+
"check": "run-s check:*",
|
|
52
|
+
"check:tsc": "tsc -p tsconfig.dev.json",
|
|
53
|
+
"check:lint": "eslint src *.js",
|
|
54
|
+
"check:spelling": "cspell \"{README.md,src/**/*.ts}\"",
|
|
55
|
+
"test": "NODE_ENV=test run-s test:*",
|
|
56
|
+
"test:node": "NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha",
|
|
57
|
+
"test:browser": "NODE_ENV=test karma start karma.conf.cjs",
|
|
58
|
+
"watch:build": "tsc -p tsconfig.json -w",
|
|
59
|
+
"watch:test": "mocha --watch",
|
|
60
|
+
"prepublish": "npm run build",
|
|
61
|
+
"reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build"
|
|
62
|
+
},
|
|
63
|
+
"engines": {
|
|
64
|
+
"node": ">=22"
|
|
65
|
+
},
|
|
66
|
+
"dependencies": {
|
|
67
|
+
"@waku/enr": "^0.0.30",
|
|
68
|
+
"@waku/interfaces": "0.0.31",
|
|
69
|
+
"@libp2p/ping": "2.0.35",
|
|
70
|
+
"@waku/proto": "0.0.11",
|
|
71
|
+
"@waku/utils": "0.0.24",
|
|
72
|
+
"debug": "^4.3.4",
|
|
73
|
+
"@noble/hashes": "^1.3.2",
|
|
74
|
+
"it-all": "^3.0.4",
|
|
75
|
+
"it-length-prefixed": "^9.0.4",
|
|
76
|
+
"it-pipe": "^3.0.1",
|
|
77
|
+
"uint8arraylist": "^2.4.3",
|
|
78
|
+
"uuid": "^9.0.0"
|
|
79
|
+
},
|
|
80
|
+
"devDependencies": {
|
|
81
|
+
"@libp2p/peer-id": "5.1.7",
|
|
82
|
+
"@libp2p/interface": "2.10.4",
|
|
83
|
+
"@multiformats/multiaddr": "^12.0.0",
|
|
84
|
+
"@rollup/plugin-commonjs": "^25.0.7",
|
|
85
|
+
"@rollup/plugin-json": "^6.0.0",
|
|
86
|
+
"@rollup/plugin-node-resolve": "^15.2.3",
|
|
87
|
+
"@types/chai": "^4.3.11",
|
|
88
|
+
"@types/debug": "^4.1.12",
|
|
89
|
+
"@types/mocha": "^10.0.6",
|
|
90
|
+
"@types/uuid": "^9.0.8",
|
|
91
|
+
"@waku/build-utils": "*",
|
|
92
|
+
"chai": "^4.3.10",
|
|
93
|
+
"sinon": "^18.0.0",
|
|
94
|
+
"cspell": "^8.6.1",
|
|
95
|
+
"fast-check": "^3.19.0",
|
|
96
|
+
"ignore-loader": "^0.1.2",
|
|
97
|
+
"isomorphic-fetch": "^3.0.0",
|
|
98
|
+
"mocha": "^10.3.0",
|
|
99
|
+
"npm-run-all": "^4.1.5",
|
|
100
|
+
"process": "^0.11.10",
|
|
101
|
+
"rollup": "^4.12.0"
|
|
102
|
+
},
|
|
103
|
+
"peerDependencies": {
|
|
104
|
+
"@multiformats/multiaddr": "^12.0.0",
|
|
105
|
+
"libp2p": "2.8.11"
|
|
106
|
+
},
|
|
107
|
+
"peerDependenciesMeta": {
|
|
108
|
+
"@multiformats/multiaddr": {
|
|
109
|
+
"optional": true
|
|
110
|
+
},
|
|
111
|
+
"libp2p": {
|
|
112
|
+
"optional": true
|
|
113
|
+
}
|
|
114
|
+
},
|
|
115
|
+
"files": [
|
|
116
|
+
"dist",
|
|
117
|
+
"bundle",
|
|
118
|
+
"src/**/*.ts",
|
|
119
|
+
"!**/*.spec.*",
|
|
120
|
+
"!**/*.json",
|
|
121
|
+
"CHANGELOG.md",
|
|
122
|
+
"LICENSE",
|
|
123
|
+
"README.md"
|
|
124
|
+
]
|
|
125
|
+
}
|
|
@@ -4,7 +4,6 @@ import {
|
|
|
4
4
|
type Peer,
|
|
5
5
|
type PeerId,
|
|
6
6
|
type PeerInfo,
|
|
7
|
-
type PeerStore,
|
|
8
7
|
type Stream,
|
|
9
8
|
TypedEventEmitter
|
|
10
9
|
} from "@libp2p/interface";
|
|
@@ -574,12 +573,9 @@ export class ConnectionManager
|
|
|
574
573
|
return false;
|
|
575
574
|
}
|
|
576
575
|
|
|
577
|
-
const isSameShard = await this.
|
|
576
|
+
const isSameShard = await this.isPeerOnSameShard(peerId);
|
|
578
577
|
if (!isSameShard) {
|
|
579
|
-
const shardInfo = await this.getPeerShardInfo(
|
|
580
|
-
peerId,
|
|
581
|
-
this.libp2p.peerStore
|
|
582
|
-
);
|
|
578
|
+
const shardInfo = await this.getPeerShardInfo(peerId);
|
|
583
579
|
|
|
584
580
|
log.warn(
|
|
585
581
|
`Discovered peer ${peerId.toString()} with ShardInfo ${shardInfo} is not part of any of the configured pubsub topics (${
|
|
@@ -666,28 +662,40 @@ export class ConnectionManager
|
|
|
666
662
|
}
|
|
667
663
|
}
|
|
668
664
|
|
|
669
|
-
|
|
670
|
-
const shardInfo = await this.getPeerShardInfo(
|
|
671
|
-
peerId,
|
|
672
|
-
this.libp2p.peerStore
|
|
673
|
-
);
|
|
665
|
+
public async isPeerOnSameShard(peerId: PeerId): Promise<boolean> {
|
|
666
|
+
const shardInfo = await this.getPeerShardInfo(peerId);
|
|
674
667
|
|
|
675
|
-
|
|
676
|
-
|
|
668
|
+
if (!shardInfo) {
|
|
669
|
+
return true;
|
|
670
|
+
}
|
|
677
671
|
|
|
678
672
|
const pubsubTopics = shardInfoToPubsubTopics(shardInfo);
|
|
679
673
|
|
|
680
674
|
const isTopicConfigured = pubsubTopics.some((topic) =>
|
|
681
675
|
this.pubsubTopics.includes(topic)
|
|
682
676
|
);
|
|
677
|
+
|
|
683
678
|
return isTopicConfigured;
|
|
684
679
|
}
|
|
685
680
|
|
|
686
|
-
|
|
681
|
+
public async isPeerOnPubsubTopic(
|
|
687
682
|
peerId: PeerId,
|
|
688
|
-
|
|
683
|
+
pubsubTopic: string
|
|
684
|
+
): Promise<boolean> {
|
|
685
|
+
const shardInfo = await this.getPeerShardInfo(peerId);
|
|
686
|
+
|
|
687
|
+
if (!shardInfo) {
|
|
688
|
+
return true;
|
|
689
|
+
}
|
|
690
|
+
|
|
691
|
+
const pubsubTopics = shardInfoToPubsubTopics(shardInfo);
|
|
692
|
+
return pubsubTopics.some((t) => t === pubsubTopic);
|
|
693
|
+
}
|
|
694
|
+
|
|
695
|
+
private async getPeerShardInfo(
|
|
696
|
+
peerId: PeerId
|
|
689
697
|
): Promise<ShardInfo | undefined> {
|
|
690
|
-
const peer = await peerStore.get(peerId);
|
|
698
|
+
const peer = await this.libp2p.peerStore.get(peerId);
|
|
691
699
|
const shardInfoBytes = peer.metadata.get("shardInfo");
|
|
692
700
|
if (!shardInfoBytes) return undefined;
|
|
693
701
|
return decodeRelayShard(shardInfoBytes);
|