@waku/core 0.0.26-678635e.0 → 0.0.26
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 +30 -0
- package/bundle/base_protocol-pDODy0G6.js +260 -0
- package/bundle/{base_protocol-4bcf7514.js → browser-mTOOnVZp.js} +751 -381
- package/bundle/index-cmONXM-V.js +595 -0
- package/bundle/index.js +637 -1879
- package/bundle/lib/base_protocol.js +3 -3
- package/bundle/lib/message/version_0.js +3 -3
- package/bundle/lib/predefined_bootstrap_nodes.js +1 -1
- package/bundle/{version_0-2f1176e3.js → version_0-LQTFNC7k.js} +118 -11
- package/dist/.tsbuildinfo +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/base_protocol.d.ts +3 -2
- package/dist/lib/base_protocol.js +12 -6
- package/dist/lib/base_protocol.js.map +1 -1
- package/dist/lib/connection_manager.d.ts +8 -4
- package/dist/lib/connection_manager.js +34 -12
- package/dist/lib/connection_manager.js.map +1 -1
- package/dist/lib/filter/index.js +8 -5
- package/dist/lib/filter/index.js.map +1 -1
- package/dist/lib/filterPeers.js.map +1 -1
- package/dist/lib/keep_alive_manager.d.ts +1 -0
- package/dist/lib/keep_alive_manager.js +6 -3
- package/dist/lib/keep_alive_manager.js.map +1 -1
- package/dist/lib/light_push/index.js +1 -2
- package/dist/lib/light_push/index.js.map +1 -1
- package/dist/lib/message/version_0.d.ts +7 -7
- package/dist/lib/message/version_0.js +5 -6
- package/dist/lib/message/version_0.js.map +1 -1
- package/dist/lib/metadata/index.d.ts +3 -0
- package/dist/lib/metadata/index.js +67 -0
- package/dist/lib/metadata/index.js.map +1 -0
- package/dist/lib/predefined_bootstrap_nodes.js.map +1 -1
- package/dist/lib/store/history_rpc.js.map +1 -1
- package/dist/lib/store/index.js +10 -11
- package/dist/lib/store/index.js.map +1 -1
- package/dist/lib/stream_manager.js.map +1 -1
- package/dist/lib/wait_for_remote_peer.js.map +1 -1
- package/dist/lib/waku.d.ts +4 -3
- package/dist/lib/waku.js +15 -6
- package/dist/lib/waku.js.map +1 -1
- package/package.json +127 -1
- package/src/index.ts +3 -1
- package/src/lib/base_protocol.ts +29 -7
- package/src/lib/connection_manager.ts +44 -13
- package/src/lib/filter/index.ts +18 -11
- package/src/lib/keep_alive_manager.ts +9 -3
- package/src/lib/light_push/index.ts +3 -4
- package/src/lib/message/version_0.ts +18 -10
- package/src/lib/metadata/index.ts +110 -0
- package/src/lib/store/index.ts +12 -13
- package/src/lib/waku.ts +19 -5
- package/bundle/browser-90197c87.js +0 -754
- package/bundle/index-27b91e3b.js +0 -31
- package/dist/lib/constants.d.ts +0 -4
- package/dist/lib/constants.js +0 -5
- package/dist/lib/constants.js.map +0 -1
- package/src/lib/constants.ts +0 -4
package/dist/lib/store/index.js
CHANGED
@@ -8,7 +8,6 @@ import * as lp from "it-length-prefixed";
|
|
8
8
|
import { pipe } from "it-pipe";
|
9
9
|
import { Uint8ArrayList } from "uint8arraylist";
|
10
10
|
import { BaseProtocol } from "../base_protocol.js";
|
11
|
-
import { DefaultPubSubTopic } from "../constants.js";
|
12
11
|
import { toProtoMessage } from "../to_proto_message.js";
|
13
12
|
import { HistoryRpc, PageDirection } from "./history_rpc.js";
|
14
13
|
var HistoryError = proto.HistoryResponse.HistoryError;
|
@@ -26,7 +25,7 @@ class Store extends BaseProtocol {
|
|
26
25
|
NUM_PEERS_PROTOCOL = 1;
|
27
26
|
constructor(libp2p, options) {
|
28
27
|
super(StoreCodec, libp2p.components);
|
29
|
-
this.pubsubTopics = options
|
28
|
+
this.pubsubTopics = this.initializePubsubTopic(options);
|
30
29
|
}
|
31
30
|
/**
|
32
31
|
* Processes messages based on the provided callback and options.
|
@@ -145,18 +144,18 @@ class Store extends BaseProtocol {
|
|
145
144
|
endTime = options.timeFilter.endTime;
|
146
145
|
}
|
147
146
|
// convert array to set to remove duplicates
|
148
|
-
const
|
147
|
+
const uniquePubsubTopicsInQuery = Array.from(new Set(decoders.map((decoder) => decoder.pubsubTopic)));
|
149
148
|
// If multiple pubsub topics are provided, throw an error
|
150
|
-
if (
|
149
|
+
if (uniquePubsubTopicsInQuery.length > 1) {
|
151
150
|
throw new Error("API does not support querying multiple pubsub topics at once");
|
152
151
|
}
|
153
152
|
// we can be certain that there is only one pubsub topic in the query
|
154
|
-
const
|
155
|
-
ensurePubsubTopicIsConfigured(
|
153
|
+
const pubsubTopicForQuery = uniquePubsubTopicsInQuery[0];
|
154
|
+
ensurePubsubTopicIsConfigured(pubsubTopicForQuery, this.pubsubTopics);
|
156
155
|
// check that the pubsubTopic from the Cursor and Decoder match
|
157
156
|
if (options?.cursor?.pubsubTopic &&
|
158
|
-
options.cursor.pubsubTopic !==
|
159
|
-
throw new Error(`Cursor pubsub topic (${options?.cursor?.pubsubTopic}) does not match decoder pubsub topic (${
|
157
|
+
options.cursor.pubsubTopic !== pubsubTopicForQuery) {
|
158
|
+
throw new Error(`Cursor pubsub topic (${options?.cursor?.pubsubTopic}) does not match decoder pubsub topic (${pubsubTopicForQuery})`);
|
160
159
|
}
|
161
160
|
const decodersAsMap = new Map();
|
162
161
|
decoders.forEach((dec) => {
|
@@ -166,13 +165,13 @@ class Store extends BaseProtocol {
|
|
166
165
|
decodersAsMap.set(dec.contentTopic, dec);
|
167
166
|
});
|
168
167
|
const contentTopics = decoders
|
169
|
-
.filter((decoder) => decoder.pubsubTopic ===
|
168
|
+
.filter((decoder) => decoder.pubsubTopic === pubsubTopicForQuery)
|
170
169
|
.map((dec) => dec.contentTopic);
|
171
170
|
if (contentTopics.length === 0) {
|
172
|
-
throw new Error("No decoders found for topic " +
|
171
|
+
throw new Error("No decoders found for topic " + pubsubTopicForQuery);
|
173
172
|
}
|
174
173
|
const queryOpts = Object.assign({
|
175
|
-
pubsubTopic:
|
174
|
+
pubsubTopic: pubsubTopicForQuery,
|
176
175
|
pageDirection: PageDirection.BACKWARD,
|
177
176
|
pageSize: DefaultPageSize
|
178
177
|
}, options, { contentTopics, startTime, endTime });
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/store/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAU9C,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,6BAA6B,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACxD,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,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/store/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAU9C,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,6BAA6B,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACxD,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,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAU,MAAM,kBAAkB,CAAC;AAErE,IAAO,YAAY,GAAG,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC;AAEzD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAExD,MAAM,CAAC,MAAM,eAAe,GAAG,EAAE,CAAC;AAElC,OAAO,EAAE,aAAa,EAAE,CAAC;AAqCzB;;;;GAIG;AACH,MAAM,KAAM,SAAQ,YAAY;IACb,YAAY,CAAgB;IAC5B,kBAAkB,GAAG,CAAC,CAAC;IAExC,YAAY,MAAc,EAAE,OAA+B;QACzD,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,eAAe,CAC3B,QAAkC,EAClC,QAAkE,EAClE,OAAsB;QAEtB,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,MAAM,eAAe,GAAyB,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1E,IAAI,iBAAiB,GAAa,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEpE,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;YACrC,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CACf,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAClC,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;gBAClB,KAAK,GAAG,OAAO,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;YACvC,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;OAOG;IACK,kBAAkB,CAAC,OAAsB;QAC/C,OAAO,CACL,OAAO,OAAO,EAAE,aAAa,KAAK,WAAW;YAC7C,OAAO,EAAE,aAAa,KAAK,aAAa,CAAC,QAAQ,CAClD,CAAC;IACJ,CAAC;IAED;;QAEI;IACJ,oBAAoB,GAAG,IAAI,CAAC,wBAAwB,CAAC;IAErD;;;;;;;;;;;;;;;;OAgBG;IACH,KAAK,CAAC,wBAAwB,CAC5B,QAAuB,EACvB,QAAkE,EAClE,OAAsB;QAEtB,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YACpE,IAAI,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC;gBAAE,MAAM;QACrE,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,KAAK,CAAC,wBAAwB,CAC5B,QAAuB,EACvB,QAE6C,EAC7C,OAAsB;QAEtB,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YAChE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;gBAC9C,IAAI,KAAK;oBAAE,OAAO;gBAClB,KAAK,GAAG,OAAO,CAAC,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC7B,IAAI,KAAK;gBAAE,MAAM;QACnB,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,KAAK,CAAC,CAAC,cAAc,CACnB,QAAuB,EACvB,OAAsB;QAEtB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,SAAS,EAAE,OAAO,CAAC;QAEvB,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC;YACxB,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YACzC,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;QACvC,CAAC;QAED,4CAA4C;QAC5C,MAAM,yBAAyB,GAAG,KAAK,CAAC,IAAI,CAC1C,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CACxD,CAAC;QAEF,yDAAyD;QACzD,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;QACJ,CAAC;QAED,qEAAqE;QACrE,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,CAAC,CAAC,CAAC;QAEzD,6BAA6B,CAAC,mBAAmB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAEtE,+DAA+D;QAC/D,IACE,OAAO,EAAE,MAAM,EAAE,WAAW;YAC5B,OAAO,CAAC,MAAM,CAAC,WAAW,KAAK,mBAAmB,EAClD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,wBAAwB,OAAO,EAAE,MAAM,EAAE,WAAW,0CAA0C,mBAAmB,GAAG,CACrH,CAAC;QACJ,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;QAChC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;YACJ,CAAC;YACD,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,QAAQ;aAC3B,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,mBAAmB,CAAC;aAChE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAElC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,mBAAmB,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAC7B;YACE,WAAW,EAAE,mBAAmB;YAChC,aAAa,EAAE,aAAa,CAAC,QAAQ;YACrC,QAAQ,EAAE,eAAe;SAC1B,EACD,OAAO,EACP,EAAE,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,CACtC,CAAC;QAEF,MAAM,IAAI,GAAG,CACX,MAAM,IAAI,CAAC,QAAQ,CAAC;YAClB,QAAQ,EAAE,IAAI,CAAC,kBAAkB;YACjC,iBAAiB,EAAE,CAAC;SACrB,CAAC,CACH,CAAC,CAAC,CAAC,CAAC;QAEL,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,QAAQ,CACnC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAC/B,SAAS,EACT,aAAa,EACb,OAAO,EAAE,MAAM,CAChB,EAAE,CAAC;YACF,MAAM,QAAQ,CAAC;QACjB,CAAC;IACH,CAAC;CACF;AAED,KAAK,SAAS,CAAC,CAAC,QAAQ,CACtB,aAAoC,EACpC,SAAiB,EACjB,QAAkC,EAClC,MAAe;IAEf,IACE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;QAClC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,EACtC,CAAC;QACD,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;IACJ,CAAC;IAED,IAAI,aAAa,GAAG,MAAM,CAAC;IAC3B,OAAO,IAAI,EAAE,CAAC;QACZ,SAAS,CAAC,MAAM,GAAG,aAAa,CAAC;QAEjC,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAE1D,GAAG,CAAC,IAAI,CACN,qBAAqB,EACrB,QAAQ,SAAS,CAAC,WAAW,GAAG,EAChC,SAAS,CAAC,aAAa,CACxB,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;QAErC,MAAM,GAAG,GAAG,MAAM,IAAI,CACpB,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,EAC1B,EAAE,CAAC,MAAM,EACT,MAAM,EACN,EAAE,CAAC,MAAM,EACT,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,CACpC,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,cAAc,EAAE,CAAC;QACnC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACpB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE5C,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,GAAG,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;YACtE,MAAM;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAiC,CAAC;QAEzD,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;YAC3D,MAAM,sCAAsC,GAAG,QAAQ,CAAC,KAAK,CAAC;QAChE,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpD,GAAG,CAAC,IAAI,CACN,6EAA6E,CAC9E,CAAC;YACF,MAAM;QACR,CAAC;QAED,GAAG,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,gCAAgC,CAAC,CAAC;QAEvE,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACvC,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;YAC3C,IAAI,OAAO,YAAY,KAAK,WAAW,EAAE,CAAC;gBACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC3C,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO,OAAO,CAAC,YAAY,CACzB,SAAS,CAAC,WAAW,EACrB,cAAc,CAAC,QAAQ,CAAC,CACzB,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC/C,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE,CAAC;YACtC,+DAA+D;YAC/D,kDAAkD;YAClD,GAAG,CAAC,IAAI,CACN,qFAAqF,CACtF,CAAC;YACF,MAAM;QACR,CAAC;QAED,aAAa,GAAG,UAAU,CAAC;QAE3B,MAAM,gBAAgB,GAAG,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC;QACvD,MAAM,aAAa,GAAG,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC;QAClE;QACE,uEAAuE;QACvE,gBAAgB;YAChB,aAAa;YACb,gBAAgB,GAAG,aAAa,EAChC,CAAC;YACD,MAAM;QACR,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAwB;IACzD,IACE,CAAC,OAAO;QACR,CAAC,OAAO,CAAC,SAAS;QAClB,CAAC,OAAO,CAAC,OAAO;QAChB,CAAC,OAAO,CAAC,YAAY,EACrB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAEpE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAE1E,OAAO;QACL,MAAM;QACN,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,UAAU,EAAE,WAAW;QACvB,YAAY,EAAE,WAAW;KAC1B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,OAAuC,EAAE;IAEzC,OAAO,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"stream_manager.js","sourceRoot":"","sources":["../../src/lib/stream_manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,OAAO,aAAa;IAKf;IACA;IACA;IAND,UAAU,CAAsC;IACvC,GAAG,CAAS;IAE7B,YACS,UAAkB,EAClB,cAAwC,EACxC,gBAA4C;QAF5C,eAAU,GAAV,UAAU,CAAQ;QAClB,mBAAc,GAAd,cAAc,CAA0B;QACxC,qBAAgB,GAAhB,gBAAgB,CAA4B;QAEnD,IAAI,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,kBAAkB,UAAU,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,gBAAgB,CACnB,aAAa,EACb,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAC3C,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,IAAU;QAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAErD,IAAI,CAAC,aAAa,EAAE;
|
1
|
+
{"version":3,"file":"stream_manager.js","sourceRoot":"","sources":["../../src/lib/stream_manager.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"wait_for_remote_peer.js","sourceRoot":"","sources":["../../src/lib/wait_for_remote_peer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAE/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAU,EACV,SAAuB,EACvB,SAAkB;IAElB,SAAS,GAAG,SAAS,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAEzE,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,IAAI,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;
|
1
|
+
{"version":3,"file":"wait_for_remote_peer.js","sourceRoot":"","sources":["../../src/lib/wait_for_remote_peer.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/waku.d.ts
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
import type { Stream } from "@libp2p/interface/connection";
|
2
2
|
import { PeerId } from "@libp2p/interface/peer-id";
|
3
3
|
import { MultiaddrInput } from "@multiformats/multiaddr";
|
4
|
-
import type { IFilter, ILightPush, IRelay, IStore, Libp2p,
|
4
|
+
import type { IFilter, ILightPush, IRelay, IStore, Libp2p, PubsubTopic, ShardingParams, Waku } from "@waku/interfaces";
|
5
5
|
import { Protocols } from "@waku/interfaces";
|
6
6
|
import { ConnectionManager } from "./connection_manager.js";
|
7
7
|
export declare const DefaultPingKeepAliveValueSecs: number;
|
@@ -29,14 +29,14 @@ export interface WakuOptions {
|
|
29
29
|
userAgent?: string;
|
30
30
|
}
|
31
31
|
export declare class WakuNode implements Waku {
|
32
|
-
readonly pubsubTopics: PubSubTopic[];
|
33
32
|
libp2p: Libp2p;
|
34
33
|
relay?: IRelay;
|
35
34
|
store?: IStore;
|
36
35
|
filter?: IFilter;
|
37
36
|
lightPush?: ILightPush;
|
38
37
|
connectionManager: ConnectionManager;
|
39
|
-
|
38
|
+
readonly pubsubTopics: PubsubTopic[];
|
39
|
+
constructor(options: WakuOptions, pubsubTopics: string[] | undefined, libp2p: Libp2p, pubsubShardInfo?: ShardingParams, store?: (libp2p: Libp2p) => IStore, lightPush?: (libp2p: Libp2p) => ILightPush, filter?: (libp2p: Libp2p) => IFilter, relay?: (libp2p: Libp2p) => IRelay);
|
40
40
|
/**
|
41
41
|
* Dials to the provided peer.
|
42
42
|
*
|
@@ -47,6 +47,7 @@ export declare class WakuNode implements Waku {
|
|
47
47
|
start(): Promise<void>;
|
48
48
|
stop(): Promise<void>;
|
49
49
|
isStarted(): boolean;
|
50
|
+
isConnected(): boolean;
|
50
51
|
/**
|
51
52
|
* Return the local multiaddr with peer id on which libp2p is listening.
|
52
53
|
*
|
package/dist/lib/waku.js
CHANGED
@@ -1,22 +1,28 @@
|
|
1
1
|
import { isPeerId } from "@libp2p/interface/peer-id";
|
2
2
|
import { multiaddr } from "@multiformats/multiaddr";
|
3
|
-
import { Protocols } from "@waku/interfaces";
|
4
|
-
import { Logger } from "@waku/utils";
|
3
|
+
import { DefaultPubsubTopic, Protocols } from "@waku/interfaces";
|
4
|
+
import { Logger, shardInfoToPubsubTopics } from "@waku/utils";
|
5
5
|
import { ConnectionManager } from "./connection_manager.js";
|
6
6
|
export const DefaultPingKeepAliveValueSecs = 5 * 60;
|
7
7
|
export const DefaultRelayKeepAliveValueSecs = 5 * 60;
|
8
8
|
export const DefaultUserAgent = "js-waku";
|
9
9
|
const log = new Logger("waku");
|
10
10
|
export class WakuNode {
|
11
|
-
pubsubTopics;
|
12
11
|
libp2p;
|
13
12
|
relay;
|
14
13
|
store;
|
15
14
|
filter;
|
16
15
|
lightPush;
|
17
16
|
connectionManager;
|
18
|
-
|
19
|
-
|
17
|
+
pubsubTopics;
|
18
|
+
constructor(options, pubsubTopics = [], libp2p, pubsubShardInfo, store, lightPush, filter, relay) {
|
19
|
+
if (!pubsubShardInfo) {
|
20
|
+
this.pubsubTopics =
|
21
|
+
pubsubTopics.length > 0 ? pubsubTopics : [DefaultPubsubTopic];
|
22
|
+
}
|
23
|
+
else {
|
24
|
+
this.pubsubTopics = shardInfoToPubsubTopics(pubsubShardInfo);
|
25
|
+
}
|
20
26
|
this.libp2p = libp2p;
|
21
27
|
if (store) {
|
22
28
|
this.store = store(libp2p);
|
@@ -35,7 +41,7 @@ export class WakuNode {
|
|
35
41
|
? options.relayKeepAlive || DefaultRelayKeepAliveValueSecs
|
36
42
|
: 0;
|
37
43
|
const peerId = this.libp2p.peerId.toString();
|
38
|
-
this.connectionManager = ConnectionManager.create(peerId, libp2p, { pingKeepAlive, relayKeepAlive }, pubsubTopics, this.relay);
|
44
|
+
this.connectionManager = ConnectionManager.create(peerId, libp2p, { pingKeepAlive, relayKeepAlive }, this.pubsubTopics, this.relay);
|
39
45
|
log.info("Waku node created", peerId, `relay: ${!!this.relay}, store: ${!!this.store}, light push: ${!!this
|
40
46
|
.lightPush}, filter: ${!!this.filter}`);
|
41
47
|
}
|
@@ -100,6 +106,9 @@ export class WakuNode {
|
|
100
106
|
isStarted() {
|
101
107
|
return this.libp2p.isStarted();
|
102
108
|
}
|
109
|
+
isConnected() {
|
110
|
+
return this.connectionManager.isConnected();
|
111
|
+
}
|
103
112
|
/**
|
104
113
|
* Return the local multiaddr with peer id on which libp2p is listening.
|
105
114
|
*
|
package/dist/lib/waku.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"waku.js","sourceRoot":"","sources":["../../src/lib/waku.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAU,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAA6B,MAAM,yBAAyB,CAAC;
|
1
|
+
{"version":3,"file":"waku.js","sourceRoot":"","sources":["../../src/lib/waku.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1 +1,127 @@
|
|
1
|
-
{
|
1
|
+
{
|
2
|
+
"name": "@waku/core",
|
3
|
+
"version": "0.0.26",
|
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/predefined_bootstrap_nodes": {
|
13
|
+
"types": "./dist/lib/predefined_bootstrap_nodes.d.ts",
|
14
|
+
"import": "./dist/lib/predefined_bootstrap_nodes.js"
|
15
|
+
},
|
16
|
+
"./lib/message/version_0": {
|
17
|
+
"types": "./dist/lib/message/version_0.d.ts",
|
18
|
+
"import": "./dist/lib/message/version_0.js"
|
19
|
+
},
|
20
|
+
"./lib/base_protocol": {
|
21
|
+
"types": "./dist/lib/base_protocol.d.ts",
|
22
|
+
"import": "./dist/lib/base_protocol.js"
|
23
|
+
}
|
24
|
+
},
|
25
|
+
"typesVersions": {
|
26
|
+
"*": {
|
27
|
+
"lib/*": [
|
28
|
+
"dist/lib/*"
|
29
|
+
],
|
30
|
+
"constants/*": [
|
31
|
+
"dist/constants/*"
|
32
|
+
]
|
33
|
+
}
|
34
|
+
},
|
35
|
+
"type": "module",
|
36
|
+
"homepage": "https://github.com/waku-org/js-waku/tree/master/packages/core#readme",
|
37
|
+
"repository": {
|
38
|
+
"type": "git",
|
39
|
+
"url": "https://github.com/waku-org/js-waku.git"
|
40
|
+
},
|
41
|
+
"bugs": {
|
42
|
+
"url": "https://github.com/waku-org/js-waku/issues"
|
43
|
+
},
|
44
|
+
"license": "MIT OR Apache-2.0",
|
45
|
+
"keywords": [
|
46
|
+
"waku",
|
47
|
+
"decentralised",
|
48
|
+
"communication",
|
49
|
+
"web3",
|
50
|
+
"ethereum",
|
51
|
+
"dapps"
|
52
|
+
],
|
53
|
+
"scripts": {
|
54
|
+
"build": "run-s build:**",
|
55
|
+
"build:esm": "tsc",
|
56
|
+
"build:bundle": "rollup --config rollup.config.js",
|
57
|
+
"fix": "run-s fix:*",
|
58
|
+
"fix:lint": "eslint src *.js --fix",
|
59
|
+
"check": "run-s check:*",
|
60
|
+
"check:tsc": "tsc -p tsconfig.dev.json",
|
61
|
+
"check:lint": "eslint src *.js",
|
62
|
+
"check:spelling": "cspell \"{README.md,src/**/*.ts}\"",
|
63
|
+
"test": "NODE_ENV=test run-s test:*",
|
64
|
+
"test:node": "NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha",
|
65
|
+
"test:browser": "NODE_ENV=test karma start karma.conf.cjs",
|
66
|
+
"watch:build": "tsc -p tsconfig.json -w",
|
67
|
+
"watch:test": "mocha --watch",
|
68
|
+
"prepublish": "npm run build",
|
69
|
+
"reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build"
|
70
|
+
},
|
71
|
+
"engines": {
|
72
|
+
"node": ">=18"
|
73
|
+
},
|
74
|
+
"dependencies": {
|
75
|
+
"@noble/hashes": "^1.3.2",
|
76
|
+
"@waku/enr": "^0.0.20",
|
77
|
+
"@waku/interfaces": "0.0.21",
|
78
|
+
"@waku/proto": "0.0.6",
|
79
|
+
"@waku/utils": "0.0.14",
|
80
|
+
"debug": "^4.3.4",
|
81
|
+
"it-all": "^3.0.4",
|
82
|
+
"it-length-prefixed": "^9.0.1",
|
83
|
+
"it-pipe": "^3.0.1",
|
84
|
+
"p-event": "^6.0.0",
|
85
|
+
"uint8arraylist": "^2.4.3",
|
86
|
+
"uuid": "^9.0.0"
|
87
|
+
},
|
88
|
+
"devDependencies": {
|
89
|
+
"@multiformats/multiaddr": "^12.0.0",
|
90
|
+
"@rollup/plugin-commonjs": "^25.0.7",
|
91
|
+
"@rollup/plugin-json": "^6.0.0",
|
92
|
+
"@rollup/plugin-node-resolve": "^15.2.3",
|
93
|
+
"@types/chai": "^4.3.11",
|
94
|
+
"@types/debug": "^4.1.12",
|
95
|
+
"@types/mocha": "^10.0.1",
|
96
|
+
"@types/uuid": "^9.0.7",
|
97
|
+
"@waku/build-utils": "*",
|
98
|
+
"chai": "^4.3.10",
|
99
|
+
"cspell": "^7.3.2",
|
100
|
+
"fast-check": "^3.14.0",
|
101
|
+
"ignore-loader": "^0.1.2",
|
102
|
+
"isomorphic-fetch": "^3.0.0",
|
103
|
+
"mocha": "^10.2.0",
|
104
|
+
"npm-run-all": "^4.1.5",
|
105
|
+
"process": "^0.11.10",
|
106
|
+
"rollup": "^4.6.0"
|
107
|
+
},
|
108
|
+
"peerDependencies": {
|
109
|
+
"@multiformats/multiaddr": "^12.0.0",
|
110
|
+
"libp2p": "^0.46.3"
|
111
|
+
},
|
112
|
+
"peerDependenciesMeta": {
|
113
|
+
"@multiformats/multiaddr": {
|
114
|
+
"optional": true
|
115
|
+
}
|
116
|
+
},
|
117
|
+
"files": [
|
118
|
+
"dist",
|
119
|
+
"bundle",
|
120
|
+
"src/**/*.ts",
|
121
|
+
"!**/*.spec.*",
|
122
|
+
"!**/*.json",
|
123
|
+
"CHANGELOG.md",
|
124
|
+
"LICENSE",
|
125
|
+
"README.md"
|
126
|
+
]
|
127
|
+
}
|
package/src/index.ts
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
export { DefaultUserAgent } from "./lib/waku.js";
|
2
|
-
export { DefaultPubSubTopic } from "./lib/constants.js";
|
3
2
|
export { createEncoder, createDecoder } from "./lib/message/version_0.js";
|
4
3
|
export type {
|
5
4
|
Encoder,
|
@@ -15,6 +14,7 @@ export * as waku_filter from "./lib/filter/index.js";
|
|
15
14
|
export { wakuFilter, FilterCodecs } from "./lib/filter/index.js";
|
16
15
|
|
17
16
|
export * as waku_light_push from "./lib/light_push/index.js";
|
17
|
+
export { LightPushCodec } from "./lib/light_push/index.js";
|
18
18
|
export { wakuLightPush } from "./lib/light_push/index.js";
|
19
19
|
|
20
20
|
export * as waku_store from "./lib/store/index.js";
|
@@ -27,3 +27,5 @@ export { ConnectionManager } from "./lib/connection_manager.js";
|
|
27
27
|
|
28
28
|
export { KeepAliveManager } from "./lib/keep_alive_manager.js";
|
29
29
|
export { StreamManager } from "./lib/stream_manager.js";
|
30
|
+
|
31
|
+
export { MetadataCodec, wakuMetadata } from "./lib/metadata/index.js";
|
package/src/lib/base_protocol.ts
CHANGED
@@ -2,8 +2,19 @@ import type { Libp2p } from "@libp2p/interface";
|
|
2
2
|
import type { Stream } from "@libp2p/interface/connection";
|
3
3
|
import type { PeerId } from "@libp2p/interface/peer-id";
|
4
4
|
import { Peer, PeerStore } from "@libp2p/interface/peer-store";
|
5
|
-
import type {
|
6
|
-
|
5
|
+
import type {
|
6
|
+
IBaseProtocol,
|
7
|
+
Libp2pComponents,
|
8
|
+
ProtocolCreateOptions,
|
9
|
+
PubsubTopic
|
10
|
+
} from "@waku/interfaces";
|
11
|
+
import { DefaultPubsubTopic } from "@waku/interfaces";
|
12
|
+
import { shardInfoToPubsubTopics } from "@waku/utils";
|
13
|
+
import {
|
14
|
+
getConnectedPeersForProtocol,
|
15
|
+
getPeersForProtocol,
|
16
|
+
selectPeerForProtocol
|
17
|
+
} from "@waku/utils/libp2p";
|
7
18
|
|
8
19
|
import { filterPeers } from "./filterPeers.js";
|
9
20
|
import { StreamManager } from "./stream_manager.js";
|
@@ -63,7 +74,7 @@ export class BaseProtocol implements IBaseProtocol {
|
|
63
74
|
}
|
64
75
|
|
65
76
|
/**
|
66
|
-
* Retrieves a list of peers based on the specified criteria.
|
77
|
+
* Retrieves a list of connected peers based on the specified criteria.
|
67
78
|
*
|
68
79
|
* @param numPeers - The total number of peers to retrieve. If 0, all peers are returned.
|
69
80
|
* @param maxBootstrapPeers - The maximum number of bootstrap peers to retrieve.
|
@@ -81,12 +92,23 @@ export class BaseProtocol implements IBaseProtocol {
|
|
81
92
|
numPeers: 0
|
82
93
|
}
|
83
94
|
): Promise<Peer[]> {
|
84
|
-
// Retrieve all peers that support the protocol
|
85
|
-
const allPeersForProtocol = await
|
86
|
-
this.
|
87
|
-
|
95
|
+
// Retrieve all connected peers that support the protocol
|
96
|
+
const allPeersForProtocol = await getConnectedPeersForProtocol(
|
97
|
+
this.components.connectionManager.getConnections(),
|
98
|
+
this.peerStore,
|
99
|
+
[this.multicodec]
|
100
|
+
);
|
88
101
|
|
89
102
|
// Filter the peers based on the specified criteria
|
90
103
|
return filterPeers(allPeersForProtocol, numPeers, maxBootstrapPeers);
|
91
104
|
}
|
105
|
+
|
106
|
+
initializePubsubTopic(options?: ProtocolCreateOptions): PubsubTopic[] {
|
107
|
+
return (
|
108
|
+
options?.pubsubTopics ??
|
109
|
+
(options?.shardInfo
|
110
|
+
? shardInfoToPubsubTopics(options.shardInfo)
|
111
|
+
: [DefaultPubsubTopic])
|
112
|
+
);
|
113
|
+
}
|
92
114
|
}
|
@@ -6,17 +6,19 @@ import { CustomEvent, EventEmitter } from "@libp2p/interfaces/events";
|
|
6
6
|
import { decodeRelayShard } from "@waku/enr";
|
7
7
|
import {
|
8
8
|
ConnectionManagerOptions,
|
9
|
+
EConnectionStateEvents,
|
9
10
|
EPeersByDiscoveryEvents,
|
10
11
|
IConnectionManager,
|
12
|
+
IConnectionStateEvents,
|
11
13
|
IPeersByDiscoveryEvents,
|
12
14
|
IRelay,
|
13
15
|
KeepAliveOptions,
|
14
16
|
PeersByDiscoveryResult,
|
15
|
-
|
17
|
+
PubsubTopic,
|
16
18
|
ShardInfo
|
17
19
|
} from "@waku/interfaces";
|
18
20
|
import { Libp2p, Tags } from "@waku/interfaces";
|
19
|
-
import {
|
21
|
+
import { shardInfoToPubsubTopics } from "@waku/utils";
|
20
22
|
import { Logger } from "@waku/utils";
|
21
23
|
|
22
24
|
import { KeepAliveManager } from "./keep_alive_manager.js";
|
@@ -28,7 +30,7 @@ export const DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER = 3;
|
|
28
30
|
export const DEFAULT_MAX_PARALLEL_DIALS = 3;
|
29
31
|
|
30
32
|
export class ConnectionManager
|
31
|
-
extends EventEmitter<IPeersByDiscoveryEvents>
|
33
|
+
extends EventEmitter<IPeersByDiscoveryEvents & IConnectionStateEvents>
|
32
34
|
implements IConnectionManager
|
33
35
|
{
|
34
36
|
private static instances = new Map<string, ConnectionManager>();
|
@@ -40,12 +42,39 @@ export class ConnectionManager
|
|
40
42
|
|
41
43
|
private currentActiveParallelDialCount = 0;
|
42
44
|
private pendingPeerDialQueue: Array<PeerId> = [];
|
45
|
+
private online: boolean = false;
|
46
|
+
|
47
|
+
public isConnected(): boolean {
|
48
|
+
return this.online;
|
49
|
+
}
|
50
|
+
|
51
|
+
private toggleOnline(): void {
|
52
|
+
if (!this.online) {
|
53
|
+
this.online = true;
|
54
|
+
this.dispatchEvent(
|
55
|
+
new CustomEvent<boolean>(EConnectionStateEvents.CONNECTION_STATUS, {
|
56
|
+
detail: this.online
|
57
|
+
})
|
58
|
+
);
|
59
|
+
}
|
60
|
+
}
|
61
|
+
|
62
|
+
private toggleOffline(): void {
|
63
|
+
if (this.online && this.libp2p.getConnections().length == 0) {
|
64
|
+
this.online = false;
|
65
|
+
this.dispatchEvent(
|
66
|
+
new CustomEvent<boolean>(EConnectionStateEvents.CONNECTION_STATUS, {
|
67
|
+
detail: this.online
|
68
|
+
})
|
69
|
+
);
|
70
|
+
}
|
71
|
+
}
|
43
72
|
|
44
73
|
public static create(
|
45
74
|
peerId: string,
|
46
75
|
libp2p: Libp2p,
|
47
76
|
keepAliveOptions: KeepAliveOptions,
|
48
|
-
pubsubTopics:
|
77
|
+
pubsubTopics: PubsubTopic[],
|
49
78
|
relay?: IRelay,
|
50
79
|
options?: ConnectionManagerOptions
|
51
80
|
): ConnectionManager {
|
@@ -111,13 +140,13 @@ export class ConnectionManager
|
|
111
140
|
private constructor(
|
112
141
|
libp2p: Libp2p,
|
113
142
|
keepAliveOptions: KeepAliveOptions,
|
114
|
-
private
|
143
|
+
private configuredPubsubTopics: PubsubTopic[],
|
115
144
|
relay?: IRelay,
|
116
145
|
options?: Partial<ConnectionManagerOptions>
|
117
146
|
) {
|
118
147
|
super();
|
119
148
|
this.libp2p = libp2p;
|
120
|
-
this.
|
149
|
+
this.configuredPubsubTopics = configuredPubsubTopics;
|
121
150
|
this.options = {
|
122
151
|
maxDialAttemptsForPeer: DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER,
|
123
152
|
maxBootstrapPeersAllowed: DEFAULT_MAX_BOOTSTRAP_PEERS_ALLOWED,
|
@@ -393,12 +422,14 @@ export class ConnectionManager
|
|
393
422
|
)
|
394
423
|
);
|
395
424
|
}
|
425
|
+
this.toggleOnline();
|
396
426
|
})();
|
397
427
|
},
|
398
|
-
"peer:disconnect": () => {
|
399
|
-
|
428
|
+
"peer:disconnect": (evt: CustomEvent<PeerId>): void => {
|
429
|
+
void (async () => {
|
400
430
|
this.keepAliveManager.stop(evt.detail);
|
401
|
-
|
431
|
+
this.toggleOffline();
|
432
|
+
})();
|
402
433
|
}
|
403
434
|
};
|
404
435
|
|
@@ -426,8 +457,8 @@ export class ConnectionManager
|
|
426
457
|
);
|
427
458
|
log.warn(
|
428
459
|
`Discovered peer ${peerId.toString()} with ShardInfo ${shardInfo} is not part of any of the configured pubsub topics (${
|
429
|
-
this.
|
430
|
-
}).
|
460
|
+
this.configuredPubsubTopics
|
461
|
+
}).
|
431
462
|
Not dialing.`
|
432
463
|
);
|
433
464
|
return false;
|
@@ -518,10 +549,10 @@ export class ConnectionManager
|
|
518
549
|
// If there's no shard information, simply return true
|
519
550
|
if (!shardInfo) return true;
|
520
551
|
|
521
|
-
const pubsubTopics =
|
552
|
+
const pubsubTopics = shardInfoToPubsubTopics(shardInfo);
|
522
553
|
|
523
554
|
const isTopicConfigured = pubsubTopics.some((topic) =>
|
524
|
-
this.
|
555
|
+
this.configuredPubsubTopics.includes(topic)
|
525
556
|
);
|
526
557
|
return isTopicConfigured;
|
527
558
|
}
|