@streamr/trackerless-network 0.0.1-tatum.5 → 0.0.1-tatum.6
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/dist/package.json +6 -6
- package/dist/src/NetworkStack.d.ts +1 -1
- package/dist/src/NetworkStack.js.map +1 -1
- package/dist/src/logic/ILayer1.d.ts +2 -2
- package/dist/src/logic/NodeList.d.ts +2 -2
- package/dist/src/logic/NodeList.js +2 -2
- package/dist/src/logic/NodeList.js.map +1 -1
- package/dist/src/logic/RandomGraphNode.js +6 -6
- package/dist/src/logic/RandomGraphNode.js.map +1 -1
- package/dist/src/logic/StreamPartEntryPointDiscovery.d.ts +7 -9
- package/dist/src/logic/StreamPartEntryPointDiscovery.js +46 -73
- package/dist/src/logic/StreamPartEntryPointDiscovery.js.map +1 -1
- package/dist/src/logic/StreamrNode.d.ts +2 -1
- package/dist/src/logic/StreamrNode.js +22 -15
- package/dist/src/logic/StreamrNode.js.map +1 -1
- package/dist/src/logic/createRandomGraphNode.js +1 -1
- package/dist/src/logic/createRandomGraphNode.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborFinder.js +4 -4
- package/dist/src/logic/neighbor-discovery/NeighborFinder.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js +2 -2
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManagerServer.js +2 -2
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManagerServer.js.map +1 -1
- package/dist/src/logic/proxy/ProxyStreamConnectionClient.d.ts +2 -3
- package/dist/src/logic/proxy/ProxyStreamConnectionClient.js +5 -8
- package/dist/src/logic/proxy/ProxyStreamConnectionClient.js.map +1 -1
- package/dist/src/logic/proxy/ProxyStreamConnectionServer.d.ts +0 -2
- package/dist/src/logic/proxy/ProxyStreamConnectionServer.js +0 -6
- package/dist/src/logic/proxy/ProxyStreamConnectionServer.js.map +1 -1
- package/dist/test/utils/utils.js +0 -1
- package/dist/test/utils/utils.js.map +1 -1
- package/package.json +6 -6
- package/src/NetworkStack.ts +1 -1
- package/src/logic/ILayer1.ts +2 -5
- package/src/logic/NodeList.ts +2 -2
- package/src/logic/RandomGraphNode.ts +6 -7
- package/src/logic/StreamPartEntryPointDiscovery.ts +51 -86
- package/src/logic/StreamrNode.ts +23 -21
- package/src/logic/createRandomGraphNode.ts +1 -1
- package/src/logic/neighbor-discovery/NeighborFinder.ts +4 -4
- package/src/logic/neighbor-discovery/NeighborUpdateManager.ts +2 -2
- package/src/logic/neighbor-discovery/NeighborUpdateManagerServer.ts +2 -2
- package/src/logic/proxy/ProxyStreamConnectionClient.ts +6 -10
- package/src/logic/proxy/ProxyStreamConnectionServer.ts +0 -8
- package/test/end-to-end/proxy-connections.test.ts +1 -1
- package/test/end-to-end/websocket-full-node-network.test.ts +1 -1
- package/test/unit/RandomGraphNode.test.ts +6 -6
- package/test/unit/StreamPartEntrypointDiscovery.test.ts +15 -30
- package/test/utils/mock/MockLayer1.ts +5 -7
- package/test/utils/utils.ts +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamrNode.js","sourceRoot":"","sources":["../../../src/logic/StreamrNode.ts"],"names":[],"mappings":";;;AAAA,sCAKqB;AACrB,gDAA6F;AAC7F,0CAOuB;AACvB,iDAA4C;AAC5C,mCAAmC;AACnC,gDAAoE;AAKpE,mFAA8G;AAC9G,mEAA+D;AAC/D,qFAAiF;
|
|
1
|
+
{"version":3,"file":"StreamrNode.js","sourceRoot":"","sources":["../../../src/logic/StreamrNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ const createConfigWithDefaults = (config) => {
|
|
|
38
38
|
const propagation = config.propagation ?? new Propagation_1.Propagation({
|
|
39
39
|
minPropagationTargets,
|
|
40
40
|
sendToNeighbor: async (neighborId, msg) => {
|
|
41
|
-
const remote = targetNeighbors.
|
|
41
|
+
const remote = targetNeighbors.get(neighborId) ?? temporaryConnectionServer.getNodes().get(neighborId);
|
|
42
42
|
const proxyConnection = proxyConnectionServer?.getConnection(neighborId);
|
|
43
43
|
if (remote) {
|
|
44
44
|
await remote.sendStreamMessage(msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createRandomGraphNode.js","sourceRoot":"","sources":["../../../src/logic/createRandomGraphNode.ts"],"names":[],"mappings":";;;AAAA,sCAAuD;AACvD,gEAA4D;AAC5D,wEAAoE;AACpE,sFAAkF;AAClF,uDAAgF;AAChF,yCAAqC;AACrC,2DAAuD;AAGvD,qFAAiF;AACjF,mDAA+C;AAC/C,sGAAkG;AAClG,gDAAqD;AACrD,gDAAoE;AAQpE,MAAM,wBAAwB,GAAG,CAAC,MAA6B,EAA+B,EAAE;IAC5F,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;IACvE,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,IAAI,8BAAwB,CAAC,UAAU,MAAM,CAAC,aAAa,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,CAAA;IACrI,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,SAAS,CAAA;IACrC,MAAM,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,IAAI,CAAC,CAAA;IAC7D,MAAM,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,IAAI,EAAE,CAAA;IAC5D,MAAM,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,IAAI,CAAC,CAAA;IAC/D,MAAM,sBAAsB,GAAG,MAAM,CAAC,sBAAsB,IAAI,KAAK,CAAA;IACrE,MAAM,sBAAsB,GAAG,MAAM,CAAC,sBAAsB,IAAI,KAAK,CAAA;IACrE,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,IAAI,mBAAQ,CAAC,SAAS,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAA;IACjG,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,IAAI,mBAAQ,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAA;IAC5F,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,IAAI,mBAAQ,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAA;IAE9F,MAAM,yBAAyB,GAAG,IAAI,2DAA4B,CAAC;QAC/D,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,eAAe;QACf,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;KAC9C,CAAC,CAAA;IACF,MAAM,qBAAqB,GAAG,sBAAsB,CAAC,CAAC,CAAC,IAAI,yDAA2B,CAAC;QACnF,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,YAAY,EAAE,4BAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3D,eAAe;KAClB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACd,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,IAAI,yBAAW,CAAC;QACtD,qBAAqB;QACrB,cAAc,EAAE,KAAK,EAAE,UAAkB,EAAE,GAAkB,EAAiB,EAAE;YAC5E,MAAM,MAAM,GAAG,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"createRandomGraphNode.js","sourceRoot":"","sources":["../../../src/logic/createRandomGraphNode.ts"],"names":[],"mappings":";;;AAAA,sCAAuD;AACvD,gEAA4D;AAC5D,wEAAoE;AACpE,sFAAkF;AAClF,uDAAgF;AAChF,yCAAqC;AACrC,2DAAuD;AAGvD,qFAAiF;AACjF,mDAA+C;AAC/C,sGAAkG;AAClG,gDAAqD;AACrD,gDAAoE;AAQpE,MAAM,wBAAwB,GAAG,CAAC,MAA6B,EAA+B,EAAE;IAC5F,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;IACvE,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,IAAI,8BAAwB,CAAC,UAAU,MAAM,CAAC,aAAa,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,CAAA;IACrI,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,SAAS,CAAA;IACrC,MAAM,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,IAAI,CAAC,CAAA;IAC7D,MAAM,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,IAAI,EAAE,CAAA;IAC5D,MAAM,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,IAAI,CAAC,CAAA;IAC/D,MAAM,sBAAsB,GAAG,MAAM,CAAC,sBAAsB,IAAI,KAAK,CAAA;IACrE,MAAM,sBAAsB,GAAG,MAAM,CAAC,sBAAsB,IAAI,KAAK,CAAA;IACrE,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,IAAI,mBAAQ,CAAC,SAAS,EAAE,oBAAoB,GAAG,CAAC,CAAC,CAAA;IACjG,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,IAAI,mBAAQ,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAA;IAC5F,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,IAAI,mBAAQ,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAA;IAE9F,MAAM,yBAAyB,GAAG,IAAI,2DAA4B,CAAC;QAC/D,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,eAAe;QACf,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;KAC9C,CAAC,CAAA;IACF,MAAM,qBAAqB,GAAG,sBAAsB,CAAC,CAAC,CAAC,IAAI,yDAA2B,CAAC;QACnF,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,YAAY,EAAE,4BAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3D,eAAe;KAClB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACd,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,IAAI,yBAAW,CAAC;QACtD,qBAAqB;QACrB,cAAc,EAAE,KAAK,EAAE,UAAkB,EAAE,GAAkB,EAAiB,EAAE;YAC5E,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,yBAAyB,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YACtG,MAAM,eAAe,GAAG,qBAAqB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAA;YACxE,IAAI,MAAM,EAAE;gBACR,MAAM,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;aACtC;iBAAM,IAAI,eAAe,EAAE;gBACxB,MAAM,eAAe,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;aACtD;iBAAM;gBACH,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;aAClD;QACL,CAAC;KACJ,CAAC,CAAA;IACF,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,IAAI,uBAAU,CAAC;QACnD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,eAAe;QACf,cAAc;QACd,cAAc;QACd,eAAe;QACf,CAAC,EAAE,oBAAoB;KAC1B,CAAC,CAAA;IACF,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,IAAI,+BAAc,CAAC;QAC/D,eAAe;QACf,cAAc;QACd,eAAe,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,UAAU,CAAC,2BAA2B,CAAC,WAAW,CAAC;QACrF,CAAC,EAAE,oBAAoB;KAC1B,CAAC,CAAA;IACF,MAAM,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,IAAI,IAAI,6CAAqB,CAAC;QACpF,eAAe;QACf,cAAc;QACd,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,cAAc;QACd,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,eAAe;QACf,sBAAsB;KACzB,CAAC,CAAA;IACF,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,IAAI,qBAAS,CAAC;QAChD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,eAAe;QACf,OAAO,EAAE,MAAM,CAAC,aAAa;QAC7B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;KAC5C,CAAC,CAAA;IACF,OAAO;QACH,GAAG,MAAM;QACT,cAAc;QACd,cAAc;QACd,eAAe;QACf,eAAe;QACf,UAAU;QACV,cAAc;QACd,qBAAqB;QACrB,WAAW;QACX,oBAAoB;QACpB,qBAAqB;QACrB,mBAAmB;QACnB,IAAI;QACJ,YAAY,EAAE,mBAAmB;QACjC,sBAAsB;QACtB,qBAAqB;QACrB,sBAAsB;QACtB,SAAS;QACT,yBAAyB;KAC5B,CAAA;AACL,CAAC,CAAA;AAEM,MAAM,qBAAqB,GAAG,CAAC,MAA6B,EAAmB,EAAE;IACpF,OAAO,IAAI,iCAAe,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAA;AAChE,CAAC,CAAA;AAFY,QAAA,qBAAqB,yBAEjC"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NeighborFinder = void 0;
|
|
4
4
|
const utils_1 = require("@streamr/utils");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
5
|
+
const INITIAL_WAIT = 100;
|
|
6
|
+
const INTERVAL = 250;
|
|
7
7
|
class NeighborFinder {
|
|
8
8
|
constructor(config) {
|
|
9
9
|
this.running = false;
|
|
@@ -16,7 +16,7 @@ class NeighborFinder {
|
|
|
16
16
|
}
|
|
17
17
|
const newExcludes = await this.config.doFindNeighbors(excluded);
|
|
18
18
|
if (this.config.targetNeighbors.size() < this.config.N && newExcludes.length < this.config.nearbyNodeView.size()) {
|
|
19
|
-
(0, utils_1.setAbortableTimeout)(() => this.findNeighbors(newExcludes),
|
|
19
|
+
(0, utils_1.setAbortableTimeout)(() => this.findNeighbors(newExcludes), INTERVAL, this.abortController.signal);
|
|
20
20
|
}
|
|
21
21
|
else {
|
|
22
22
|
this.running = false;
|
|
@@ -30,7 +30,7 @@ class NeighborFinder {
|
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
32
|
this.running = true;
|
|
33
|
-
(0, utils_1.setAbortableTimeout)(() => this.findNeighbors(excluded),
|
|
33
|
+
(0, utils_1.setAbortableTimeout)(() => this.findNeighbors(excluded), INITIAL_WAIT, this.abortController.signal);
|
|
34
34
|
}
|
|
35
35
|
stop() {
|
|
36
36
|
if (!this.running) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAWpD,MAAM,
|
|
1
|
+
{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAWpD,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAA;AAQpB,MAAa,cAAc;IAKvB,YAAY,MAAkC;QAFtC,YAAO,GAAG,KAAK,CAAA;QAGnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAkB;QAC1C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE;YAC9G,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SACpG;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;SACvB;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,WAAqB,EAAE;QACzB,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACtG,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AAzCD,wCAyCC"}
|
|
@@ -25,8 +25,8 @@ class NeighborUpdateManager {
|
|
|
25
25
|
}
|
|
26
26
|
async updateNeighborInfo() {
|
|
27
27
|
logger.trace(`Updating neighbor info to nodes`);
|
|
28
|
-
const neighborDescriptors = this.config.targetNeighbors.
|
|
29
|
-
await Promise.allSettled(this.config.targetNeighbors.
|
|
28
|
+
const neighborDescriptors = this.config.targetNeighbors.getAll().map((neighbor) => neighbor.getPeerDescriptor());
|
|
29
|
+
await Promise.allSettled(this.config.targetNeighbors.getAll().map(async (neighbor) => {
|
|
30
30
|
const res = await this.createRemote(neighbor.getPeerDescriptor()).updateNeighbors(neighborDescriptors);
|
|
31
31
|
if (res.removeMe) {
|
|
32
32
|
this.config.targetNeighbors.remove(neighbor.getPeerDescriptor());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeighborUpdateManager.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManager.ts"],"names":[],"mappings":";;;AAAA,2FAA2F;AAE3F,kDAAqE;AACrE,yGAA2G;AAC3G,0CAA2D;AAG3D,+EAA2E;AAC3E,+EAA2E;AAC3E,mDAA+D;AAY/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,qBAAqB;IAK9B,YAAY,MAAmC;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,MAAM,GAAG,IAAA,4BAAgB,EAAC,IAAI,2CAAuB,CAAC,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAA;QAC3G,IAAI,CAAC,MAAM,GAAG,IAAI,yDAA2B,CAAC,MAAM,CAAC,CAAA;QACrD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,2BAAc,EAAE,2BAAc,EAAE,gBAAgB,EAC1F,CAAC,GAAmB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACnF,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACrI,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC5B,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAC/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"NeighborUpdateManager.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManager.ts"],"names":[],"mappings":";;;AAAA,2FAA2F;AAE3F,kDAAqE;AACrE,yGAA2G;AAC3G,0CAA2D;AAG3D,+EAA2E;AAC3E,+EAA2E;AAC3E,mDAA+D;AAY/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,qBAAqB;IAK9B,YAAY,MAAmC;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,MAAM,GAAG,IAAA,4BAAgB,EAAC,IAAI,2CAAuB,CAAC,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAA;QAC3G,IAAI,CAAC,MAAM,GAAG,IAAI,yDAA2B,CAAC,MAAM,CAAC,CAAA;QACrD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,2BAAc,EAAE,2BAAc,EAAE,gBAAgB,EAC1F,CAAC,GAAmB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACnF,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACrI,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC5B,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAC/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAChH,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACjF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAA;YACtG,IAAI,GAAG,CAAC,QAAQ,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;gBAChE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAA,yCAA2B,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAA;aAChG;QACL,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,YAAY,CAAC,oBAAoC;QACrD,OAAO,IAAI,yDAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACvI,CAAC;CACJ;AArCD,sDAqCC"}
|
|
@@ -24,7 +24,7 @@ class NeighborUpdateManagerServer {
|
|
|
24
24
|
this.config.neighborFinder.start();
|
|
25
25
|
const response = {
|
|
26
26
|
randomGraphId: this.config.randomGraphId,
|
|
27
|
-
neighborDescriptors: this.config.targetNeighbors.
|
|
27
|
+
neighborDescriptors: this.config.targetNeighbors.getAll().map((neighbor) => neighbor.getPeerDescriptor()),
|
|
28
28
|
removeMe: false
|
|
29
29
|
};
|
|
30
30
|
return response;
|
|
@@ -32,7 +32,7 @@ class NeighborUpdateManagerServer {
|
|
|
32
32
|
else {
|
|
33
33
|
const response = {
|
|
34
34
|
randomGraphId: this.config.randomGraphId,
|
|
35
|
-
neighborDescriptors: this.config.targetNeighbors.
|
|
35
|
+
neighborDescriptors: this.config.targetNeighbors.getAll().map((neighbor) => neighbor.getPeerDescriptor()),
|
|
36
36
|
removeMe: true
|
|
37
37
|
};
|
|
38
38
|
return response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeighborUpdateManagerServer.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManagerServer.ts"],"names":[],"mappings":";;;AAGA,kDAAqD;AACrD,mDAA+D;AAE/D,yGAAoG;AAGpG,oEAAgE;AAYhE,MAAa,2BAA2B;IAIpC,YAAY,MAAmC;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,4BAA4B;IAC5B,KAAK,CAAC,cAAc,CAAC,OAAuB,EAAE,OAA0B;QACpE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,QAAQ,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAClE,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;YACnD,MAAM,kBAAkB,GAAG,OAAO,CAAC,mBAAmB;iBACjD,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;gBAC1D,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;gBAC5E,OAAO,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACzF,CAAC,CAAC,CAAA;YACN,kBAAkB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CACzE,IAAI,6CAAqB,CACrB,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAC7B,cAAc,EACd,IAAI,CAAC,MAAM,CAAC,aAAa,EACzB,IAAA,4BAAgB,EAAC,IAAI,oCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAC9F,CAAC,CACL,CAAA;YACD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;YAClC,MAAM,QAAQ,GAAmB;gBAC7B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;gBACxC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"NeighborUpdateManagerServer.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManagerServer.ts"],"names":[],"mappings":";;;AAGA,kDAAqD;AACrD,mDAA+D;AAE/D,yGAAoG;AAGpG,oEAAgE;AAYhE,MAAa,2BAA2B;IAIpC,YAAY,MAAmC;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,4BAA4B;IAC5B,KAAK,CAAC,cAAc,CAAC,OAAuB,EAAE,OAA0B;QACpE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,QAAQ,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAClE,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;YACnD,MAAM,kBAAkB,GAAG,OAAO,CAAC,mBAAmB;iBACjD,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;gBAC1D,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;gBAC5E,OAAO,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACzF,CAAC,CAAC,CAAA;YACN,kBAAkB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CACzE,IAAI,6CAAqB,CACrB,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAC7B,cAAc,EACd,IAAI,CAAC,MAAM,CAAC,aAAa,EACzB,IAAA,4BAAgB,EAAC,IAAI,oCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAC9F,CAAC,CACL,CAAA;YACD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;YAClC,MAAM,QAAQ,GAAmB;gBAC7B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;gBACxC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBACzG,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;aAAM;YACH,MAAM,QAAQ,GAAmB;gBAC7B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;gBACxC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBACzG,QAAQ,EAAE,IAAI;aACjB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;IACL,CAAC;CACJ;AA3CD,kEA2CC"}
|
|
@@ -37,10 +37,9 @@ export declare class ProxyStreamConnectionClient extends EventEmitter {
|
|
|
37
37
|
private closeConnection;
|
|
38
38
|
private removeConnection;
|
|
39
39
|
broadcast(msg: StreamMessage, previousNode?: NodeID): void;
|
|
40
|
-
|
|
41
|
-
hasProxyConnection(nodeId: NodeID, direction: ProxyDirection): boolean;
|
|
40
|
+
hasConnection(nodeId: NodeID, direction: ProxyDirection): boolean;
|
|
42
41
|
getDirection(): ProxyDirection;
|
|
43
|
-
onNodeDisconnected
|
|
42
|
+
private onNodeDisconnected;
|
|
44
43
|
start(): Promise<void>;
|
|
45
44
|
stop(): void;
|
|
46
45
|
}
|
|
@@ -46,7 +46,7 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
|
|
|
46
46
|
markAndCheckDuplicate: (msg, prev) => (0, utils_2.markAndCheckDuplicate)(this.duplicateDetectors, msg, prev),
|
|
47
47
|
broadcast: (message, previousNode) => this.broadcast(message, previousNode),
|
|
48
48
|
onLeaveNotice: (senderId) => {
|
|
49
|
-
const contact = this.targetNeighbors.
|
|
49
|
+
const contact = this.targetNeighbors.get(senderId);
|
|
50
50
|
if (contact) {
|
|
51
51
|
setImmediate(() => this.onNodeDisconnected(contact.getPeerDescriptor()));
|
|
52
52
|
}
|
|
@@ -57,7 +57,7 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
|
|
|
57
57
|
this.propagation = new Propagation_1.Propagation({
|
|
58
58
|
minPropagationTargets: config.minPropagationTargets ?? 2,
|
|
59
59
|
sendToNeighbor: async (neighborId, msg) => {
|
|
60
|
-
const remote = this.targetNeighbors.
|
|
60
|
+
const remote = this.targetNeighbors.get(neighborId);
|
|
61
61
|
if (remote) {
|
|
62
62
|
await remote.sendStreamMessage(msg);
|
|
63
63
|
}
|
|
@@ -143,7 +143,7 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
|
|
|
143
143
|
logger.info('Close proxy connection', {
|
|
144
144
|
nodeId
|
|
145
145
|
});
|
|
146
|
-
const server = this.targetNeighbors.
|
|
146
|
+
const server = this.targetNeighbors.get(nodeId);
|
|
147
147
|
server?.leaveStreamPartNotice();
|
|
148
148
|
this.removeConnection(nodeId);
|
|
149
149
|
}
|
|
@@ -159,10 +159,7 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
|
|
|
159
159
|
this.emit('message', msg);
|
|
160
160
|
this.propagation.feedUnseenMessage(msg, this.targetNeighbors.getIds(), previousNode ?? null);
|
|
161
161
|
}
|
|
162
|
-
|
|
163
|
-
return this.targetNeighbors.getIds();
|
|
164
|
-
}
|
|
165
|
-
hasProxyConnection(nodeId, direction) {
|
|
162
|
+
hasConnection(nodeId, direction) {
|
|
166
163
|
return this.connections.has(nodeId) && this.connections.get(nodeId) === direction;
|
|
167
164
|
}
|
|
168
165
|
getDirection() {
|
|
@@ -181,7 +178,7 @@ class ProxyStreamConnectionClient extends eventemitter3_1.EventEmitter {
|
|
|
181
178
|
(0, utils_1.addManagedEventListener)(this.config.P2PTransport, 'disconnected', (peerDescriptor) => this.onNodeDisconnected(peerDescriptor), this.abortController.signal);
|
|
182
179
|
}
|
|
183
180
|
stop() {
|
|
184
|
-
this.targetNeighbors.
|
|
181
|
+
this.targetNeighbors.getAll().map((remote) => {
|
|
185
182
|
this.config.connectionLocker.unlockConnection(remote.getPeerDescriptor(), 'proxy-stream-connection-client');
|
|
186
183
|
remote.leaveStreamPartNotice();
|
|
187
184
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyStreamConnectionClient.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyStreamConnectionClient.ts"],"names":[],"mappings":";;;AAAA,sCAIqB;AAErB,kDAAqD;AAErD,0CAAuF;AACvF,iDAA4C;AAC5C,mCAAmC;AACnC,mDAAuE;AACvE,2FAMmE;AACnE,yGAA8H;AAE9H,0CAAsC;AACtC,oEAAgE;AAChE,0DAAsD;AACtD,4DAAwD;AACxD,oCAAgD;AAChD,2DAAuD;AAEhD,MAAM,KAAK,GAAG,KAAK,EAAK,IAAsB,EAAE,WAAmB,EAAE,WAAwB,EAAE,KAAK,GAAG,KAAK,EAAc,EAAE;IAC/H,iDAAiD;IACjD,OAAO,IAAI,EAAE;QACT,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;YAC3B,OAAO,MAAM,CAAA;SAChB;QAAC,OAAO,CAAM,EAAE;YACb,MAAM,CAAC,IAAI,CAAC,UAAU,WAAW,yBAAyB,EAAE;gBACxD,SAAS,EAAE,KAAK;aACnB,CAAC,CAAA;SACL;QACD,MAAM,IAAA,YAAI,EAAC,KAAK,EAAE,WAAW,CAAC,CAAA;KACjC;AACL,CAAC,CAAA;AAbY,QAAA,KAAK,SAajB;AAmBD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,2BAA4B,SAAQ,4BAAY;IAYzD,YAAY,MAAyC;QACjD,KAAK,EAAE,CAAA;QARM,uBAAkB,GAA0C,IAAI,GAAG,EAAE,CAAA;QAErE,gBAAW,GAAgC,IAAI,GAAG,EAAE,CAAA;QAOjE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,8BAAwB,CAAC,UAAU,MAAM,CAAC,YAAY,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,CAAA;QACzG,IAAI,CAAC,eAAe,GAAG,IAAI,mBAAQ,CAAC,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,CAAA;QACrG,IAAI,CAAC,MAAM,GAAG,IAAI,mCAAgB,CAAC;YAC/B,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YACvC,qBAAqB,EAAE,CAAC,GAAc,EAAE,IAAiB,EAAE,EAAE,CAAC,IAAA,6BAAqB,EAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE,IAAI,CAAC;YACvH,SAAS,EAAE,CAAC,OAAsB,EAAE,YAAqB,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;YACnG,aAAa,EAAE,CAAC,QAAgB,EAAE,EAAE;gBAChC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"ProxyStreamConnectionClient.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyStreamConnectionClient.ts"],"names":[],"mappings":";;;AAAA,sCAIqB;AAErB,kDAAqD;AAErD,0CAAuF;AACvF,iDAA4C;AAC5C,mCAAmC;AACnC,mDAAuE;AACvE,2FAMmE;AACnE,yGAA8H;AAE9H,0CAAsC;AACtC,oEAAgE;AAChE,0DAAsD;AACtD,4DAAwD;AACxD,oCAAgD;AAChD,2DAAuD;AAEhD,MAAM,KAAK,GAAG,KAAK,EAAK,IAAsB,EAAE,WAAmB,EAAE,WAAwB,EAAE,KAAK,GAAG,KAAK,EAAc,EAAE;IAC/H,iDAAiD;IACjD,OAAO,IAAI,EAAE;QACT,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;YAC3B,OAAO,MAAM,CAAA;SAChB;QAAC,OAAO,CAAM,EAAE;YACb,MAAM,CAAC,IAAI,CAAC,UAAU,WAAW,yBAAyB,EAAE;gBACxD,SAAS,EAAE,KAAK;aACnB,CAAC,CAAA;SACL;QACD,MAAM,IAAA,YAAI,EAAC,KAAK,EAAE,WAAW,CAAC,CAAA;KACjC;AACL,CAAC,CAAA;AAbY,QAAA,KAAK,SAajB;AAmBD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,2BAA4B,SAAQ,4BAAY;IAYzD,YAAY,MAAyC;QACjD,KAAK,EAAE,CAAA;QARM,uBAAkB,GAA0C,IAAI,GAAG,EAAE,CAAA;QAErE,gBAAW,GAAgC,IAAI,GAAG,EAAE,CAAA;QAOjE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,8BAAwB,CAAC,UAAU,MAAM,CAAC,YAAY,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,CAAA;QACzG,IAAI,CAAC,eAAe,GAAG,IAAI,mBAAQ,CAAC,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,CAAA;QACrG,IAAI,CAAC,MAAM,GAAG,IAAI,mCAAgB,CAAC;YAC/B,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YACvC,qBAAqB,EAAE,CAAC,GAAc,EAAE,IAAiB,EAAE,EAAE,CAAC,IAAA,6BAAqB,EAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE,IAAI,CAAC;YACvH,SAAS,EAAE,CAAC,OAAsB,EAAE,YAAqB,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;YACnG,aAAa,EAAE,CAAC,QAAgB,EAAE,EAAE;gBAChC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;gBAClD,IAAI,OAAO,EAAE;oBACT,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;iBAC3E;YACL,CAAC;YACD,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,iBAAiB,EAAE,CAAC,SAAiB,EAAE,UAAqB,EAAE,EAAE,GAAE,CAAC;SACtE,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,yBAAW,CAAC;YAC/B,qBAAqB,EAAE,MAAM,CAAC,qBAAqB,IAAI,CAAC;YACxD,cAAc,EAAE,KAAK,EAAE,UAAkB,EAAE,GAAkB,EAAiB,EAAE;gBAC5E,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACnD,IAAI,MAAM,EAAE;oBACR,MAAM,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;iBACtC;qBAAM;oBACH,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;iBAClD;YACL,CAAC;SACJ,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,4BAA4B;QAChC,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,0BAAa,EAAE,mBAAmB,EAC3E,CAAC,GAAkB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;QACjF,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,kCAAqB,EAAE,uBAAuB,EACvF,CAAC,GAA0B,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACjG,CAAC;IAED,KAAK,CAAC,UAAU,CACZ,YAA0B,EAC1B,KAAuB,EACvB,SAAyB,EACzB,MAAuB,EACvB,eAAwB;QAExB,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,YAAY,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAA;QAC7G,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,GAAG,KAAK,CAAC,MAAM,EAAE;YACjE,MAAM,KAAK,CAAC,4EAA4E,CAAC,CAAA;SAC5F;QACD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAA;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;YAC7B,QAAQ,CAAC,GAAG,CAAC,IAAA,yCAA2B,EAAC,cAAc,CAAC,EAAE,cAAc,CAAC,CAAA;QAC7E,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,UAAU,GAAG;YACd,KAAK,EAAE,QAAQ;YACf,MAAM;YACN,SAAS;YACT,eAAe,EAAE,eAAe,IAAI,KAAK,CAAC,MAAM;SACnD,CAAA;QACD,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;IAClC,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC3B,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAC5D,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QAClC,CAAC,CAAC,CAAC,CAAA;QACH,MAAM,mBAAmB,GAAG,IAAI,CAAC,UAAW,CAAC,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;QACpF,IAAI,mBAAmB,GAAG,CAAC,EAAE;YACzB,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,CAAA;SACxD;aAAM,IAAI,mBAAmB,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,CAAC,sBAAsB,CAAC,CAAC,mBAAmB,CAAC,CAAA;SAC1D;IACL,CAAC;IAEO,qBAAqB;QACzB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YACrD,OAAO,CAAC,IAAI,CAAC,UAAW,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAE;mBAChC,IAAI,CAAC,UAAW,CAAC,SAAS,KAAK,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAClE,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,eAAuB;QACvD,MAAM,gBAAgB,GAAG,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAW,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CACxF,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAuB,CAAC,CACjD,EAAE,eAAe,CAAC,CAAA;QACnB,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAC1C,IAAI,CAAC,iBAAiB,CAAC,EAAuB,EAAE,IAAI,CAAC,UAAW,CAAC,SAAS,EAAE,IAAI,CAAC,UAAW,CAAC,MAAM,CAAC,CACvG,CAAC,CAAA;IACN,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,MAAc,EAAE,SAAyB,EAAE,MAAuB;QAC9F,MAAM,cAAc,GAAG,IAAI,CAAC,UAAW,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAE,CAAA;QAC1D,MAAM,MAAM,GAAG,IAAA,4BAAgB,EAAC,IAAI,4CAAwB,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAA;QAC3G,MAAM,SAAS,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;QACxH,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QACrE,IAAI,QAAQ,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,cAAc,EAAE,gCAAgC,CAAC,CAAA;YAC7F,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;YACvC,MAAM,MAAM,GAAG,IAAI,6CAAqB,CACpC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAC7B,cAAc,EACd,IAAI,CAAC,MAAM,CAAC,YAAY,EACxB,IAAA,4BAAgB,EAAC,IAAI,oCAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CACvF,CAAA;YACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAChC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;YACzC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE;gBACjC,MAAM;gBACN,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;aACzC,CAAC,CAAA;SACL;aAAM;YACH,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE;gBAC3C,MAAM;gBACN,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;aACzC,CAAC,CAAA;SACL;IACL,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,eAAuB;QACxD,MAAM,mBAAmB,GAAG,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,EAAE,eAAe,CAAC,CAAA;QAC5F,MAAM,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC3F,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAAc;QACxC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE;gBAClC,MAAM;aACT,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAC/C,MAAM,EAAE,qBAAqB,EAAE,CAAA;YAC/B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;SAChC;IACL,CAAC;IAEO,gBAAgB,CAAC,MAAc;QACnC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC/B,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC;IAED,SAAS,CAAC,GAAkB,EAAE,YAAqB;QAC/C,IAAI,CAAC,YAAY,EAAE;YACf,IAAA,6BAAqB,EAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,CAAC,SAAU,EAAE,GAAG,CAAC,kBAAkB,CAAC,CAAA;SACzF;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;QACzB,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,YAAY,IAAI,IAAI,CAAC,CAAA;IAChG,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,SAAyB;QACnD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,SAAS,CAAA;IACrF,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,UAAW,CAAC,SAAS,CAAA;IACrC,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,cAA8B;QAC3D,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;QAC1D,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC9B,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,cAAc,EAAE,gCAAgC,CAAC,CAAA;YAC/F,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;YAC7B,MAAM,IAAA,aAAK,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,4BAA4B,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SACzG;IACL,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,4BAA4B,EAAE,CAAA;QACnC,IAAA,+BAAuB,EACnB,IAAI,CAAC,MAAM,CAAC,YAAmB,EAC/B,cAAc,EACd,CAAC,cAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAC3E,IAAI,CAAC,eAAe,CAAC,MAAM,CAC9B,CAAA;IACL,CAAC;IAED,IAAI;QACA,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,CAAC,iBAAiB,EAAE,EAAE,gCAAgC,CAAC,CAAA;YAC3G,MAAM,CAAC,qBAAqB,EAAE,CAAA;QAClC,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;QAC3B,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;QAC3B,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;QACxB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CAEJ;AAvMD,kEAuMC"}
|
|
@@ -28,8 +28,6 @@ export declare class ProxyStreamConnectionServer extends EventEmitter<Events> im
|
|
|
28
28
|
hasConnection(nodeId: NodeID): boolean;
|
|
29
29
|
removeConnection(nodeId: NodeID): void;
|
|
30
30
|
stop(): void;
|
|
31
|
-
getConnectedNodeIds(): NodeID[];
|
|
32
|
-
getConnections(): ProxyConnection[];
|
|
33
31
|
getPropagationTargets(msg: StreamMessage): NodeID[];
|
|
34
32
|
private getNodeIdsForUserId;
|
|
35
33
|
private getSubscribers;
|
|
@@ -30,12 +30,6 @@ class ProxyStreamConnectionServer extends eventemitter3_1.EventEmitter {
|
|
|
30
30
|
this.connections.clear();
|
|
31
31
|
this.removeAllListeners();
|
|
32
32
|
}
|
|
33
|
-
getConnectedNodeIds() {
|
|
34
|
-
return Array.from(this.connections.keys());
|
|
35
|
-
}
|
|
36
|
-
getConnections() {
|
|
37
|
-
return Array.from(this.connections.values());
|
|
38
|
-
}
|
|
39
33
|
getPropagationTargets(msg) {
|
|
40
34
|
if (msg.messageType === NetworkRpc_1.StreamMessageType.GROUP_KEY_REQUEST) {
|
|
41
35
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyStreamConnectionServer.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyStreamConnectionServer.ts"],"names":[],"mappings":";;;AACA,2FAOmE;AAEnE,oEAAgE;AAEhE,kDAAqD;AACrD,yGAAoG;AACpG,iDAA4C;AAC5C,0CAAwF;AAExF,mDAAuE;AAGvE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAkBjC,MAAa,2BAA4B,SAAQ,4BAAoB;IAKjE,YAAY,MAAyC;QACjD,KAAK,EAAE,CAAA;QAHM,gBAAW,GAAiC,IAAI,GAAG,EAAE,CAAA;QAIlE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,mCAAsB,EAAE,oCAAuB,EAAE,mBAAmB,EAC9G,CAAC,GAA2B,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACvF,CAAC;IAED,aAAa,CAAC,MAAc;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED,aAAa,CAAC,MAAc;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC3B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACnC,CAAC;IAED,IAAI;QACA,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAA;QACnF,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7B,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"ProxyStreamConnectionServer.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyStreamConnectionServer.ts"],"names":[],"mappings":"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"}
|
package/dist/test/utils/utils.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../test/utils/utils.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,sCAAiH;AAEjH,+FAMuE;AACvE,iFAA6E;AAC7E,iFAA6E;AAC7E,0FAAsF;AACtF,uDAAsE;AACtE,0CAA2E;AAC3E,gDAAmE;AAGtD,QAAA,oBAAoB,GAAqB;IAClD,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC5B,oBAAoB,EAAE,GAAG,EAAE,GAAE,CAAC;CACjC,CAAA;AAEM,MAAM,mCAAmC,GAAG,CAC/C,iBAAiC,EACjC,oBAAoC,EACpC,aAAqB,EACrB,SAAoB,EACQ,EAAE;IAC9B,MAAM,MAAM,GAAG,IAAI,wBAAkB,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;IACnE,MAAM,OAAO,GAAG,IAAI,aAAO,CAAC;QACxB,cAAc,EAAE,MAAM;QACtB,cAAc,EAAE,iBAAiB;QACjC,uBAAuB,EAAE,CAAC;QAC1B,WAAW,EAAE,CAAC,oBAAoB,CAAC;KACtC,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,IAAA,6CAAqB,EAAC;QAC1C,aAAa;QACb,YAAY,EAAE,MAAM;QACpB,MAAM,EAAE,OAAO;QACf,gBAAgB,EAAE,MAAM;QACxB,iBAAiB;KACpB,CAAC,CAAA;IACF,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;AACrC,CAAC,CAAA;AArBY,QAAA,mCAAmC,uCAqB/C;AAEM,MAAM,mBAAmB,GAAG,CAC/B,OAAe,EACf,YAA0B,EAC1B,WAA4B,EAC5B,SAAkB,EAClB,cAAuB,EACV,EAAE;IACf,MAAM,SAAS,GAAc;QACzB,QAAQ,EAAE,4BAAiB,CAAC,WAAW,CAAC,YAAY,CAAC;QACrD,eAAe,EAAE,4BAAiB,CAAC,kBAAkB,CAAC,YAAY,CAAC;QACnE,cAAc,EAAE,cAAc,IAAI,CAAC;QACnC,SAAS,EAAE,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE;QAClC,WAAW,EAAE,IAAA,mBAAW,EAAC,WAAW,CAAC;QACrC,cAAc,EAAE,eAAe;KAClC,CAAA;IACD,MAAM,GAAG,GAAkB;QACvB,WAAW,EAAE,8BAAiB,CAAC,OAAO;QACtC,cAAc,EAAE,2BAAc,CAAC,IAAI;QACnC,OAAO,EAAE,IAAA,oBAAY,EAAC,OAAO,CAAC;QAC9B,WAAW,EAAE,wBAAW,CAAC,IAAI;QAC7B,SAAS;QACT,SAAS,EAAE,IAAA,mBAAW,EAAC,QAAQ,CAAC;KACnC,CAAA;IACD,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AAxBY,QAAA,mBAAmB,uBAwB/B;AAEM,MAAM,kBAAkB,GAAG,GAAW,EAAE;IAC3C,OAAO,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAW,CAAA;AACpD,CAAC,CAAA;AAFY,QAAA,kBAAkB,sBAE9B;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../test/utils/utils.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,sCAAiH;AAEjH,+FAMuE;AACvE,iFAA6E;AAC7E,iFAA6E;AAC7E,0FAAsF;AACtF,uDAAsE;AACtE,0CAA2E;AAC3E,gDAAmE;AAGtD,QAAA,oBAAoB,GAAqB;IAClD,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC5B,oBAAoB,EAAE,GAAG,EAAE,GAAE,CAAC;CACjC,CAAA;AAEM,MAAM,mCAAmC,GAAG,CAC/C,iBAAiC,EACjC,oBAAoC,EACpC,aAAqB,EACrB,SAAoB,EACQ,EAAE;IAC9B,MAAM,MAAM,GAAG,IAAI,wBAAkB,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;IACnE,MAAM,OAAO,GAAG,IAAI,aAAO,CAAC;QACxB,cAAc,EAAE,MAAM;QACtB,cAAc,EAAE,iBAAiB;QACjC,uBAAuB,EAAE,CAAC;QAC1B,WAAW,EAAE,CAAC,oBAAoB,CAAC;KACtC,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,IAAA,6CAAqB,EAAC;QAC1C,aAAa;QACb,YAAY,EAAE,MAAM;QACpB,MAAM,EAAE,OAAO;QACf,gBAAgB,EAAE,MAAM;QACxB,iBAAiB;KACpB,CAAC,CAAA;IACF,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;AACrC,CAAC,CAAA;AArBY,QAAA,mCAAmC,uCAqB/C;AAEM,MAAM,mBAAmB,GAAG,CAC/B,OAAe,EACf,YAA0B,EAC1B,WAA4B,EAC5B,SAAkB,EAClB,cAAuB,EACV,EAAE;IACf,MAAM,SAAS,GAAc;QACzB,QAAQ,EAAE,4BAAiB,CAAC,WAAW,CAAC,YAAY,CAAC;QACrD,eAAe,EAAE,4BAAiB,CAAC,kBAAkB,CAAC,YAAY,CAAC;QACnE,cAAc,EAAE,cAAc,IAAI,CAAC;QACnC,SAAS,EAAE,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE;QAClC,WAAW,EAAE,IAAA,mBAAW,EAAC,WAAW,CAAC;QACrC,cAAc,EAAE,eAAe;KAClC,CAAA;IACD,MAAM,GAAG,GAAkB;QACvB,WAAW,EAAE,8BAAiB,CAAC,OAAO;QACtC,cAAc,EAAE,2BAAc,CAAC,IAAI;QACnC,OAAO,EAAE,IAAA,oBAAY,EAAC,OAAO,CAAC;QAC9B,WAAW,EAAE,wBAAW,CAAC,IAAI;QAC7B,SAAS;QACT,SAAS,EAAE,IAAA,mBAAW,EAAC,QAAQ,CAAC;KACnC,CAAA;IACD,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AAxBY,QAAA,mBAAmB,uBAwB/B;AAEM,MAAM,kBAAkB,GAAG,GAAW,EAAE;IAC3C,OAAO,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAW,CAAA;AACpD,CAAC,CAAA;AAFY,QAAA,kBAAkB,sBAE9B;AAEM,MAAM,wBAAwB,GAAG,CAAC,IAA2D,EAAkB,EAAE;IACpH,OAAO;QACH,GAAG,IAAI;QACP,UAAU,EAAE,IAAA,mBAAW,EAAC,IAAA,0BAAkB,GAAE,CAAC;QAC7C,IAAI,EAAE,cAAQ,CAAC,MAAM;KACxB,CAAA;AACL,CAAC,CAAA;AANY,QAAA,wBAAwB,4BAMpC;AAEM,MAAM,oBAAoB,GAAG,CAAC,oBAAqC,EAAyB,EAAE;IACjG,OAAO,IAAI,6CAAqB,CAAC,IAAA,gCAAwB,GAAE,EAAE,oBAAoB,IAAI,IAAA,gCAAwB,GAAE,EAAE,MAAM,EAAE,EAAS,CAAC,CAAA;AACvI,CAAC,CAAA;AAFY,QAAA,oBAAoB,wBAEhC;AAEM,MAAM,0BAA0B,GAAG,GAAqB,EAAE;IAC7D,OAAO,IAAI,mCAAgB,CACvB,IAAA,gCAAwB,GAAE,EAC1B,IAAA,gCAAwB,GAAE,EAC1B,MAAM,EACN;QACI,SAAS,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;QACzB,gBAAgB,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;KAC5B,CACX,CAAA;AACL,CAAC,CAAA;AAVY,QAAA,0BAA0B,8BAUtC;AAEM,MAAM,8BAA8B,GAAG,CAC1C,cAA8B,EAC9B,SAAoB,EACpB,WAA6B,EAClB,EAAE;IACb,MAAM,SAAS,GAAG,IAAI,wBAAkB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;IACnE,OAAO,IAAA,+BAAiB,EAAC;QACrB,MAAM,EAAE;YACJ,cAAc;YACd,WAAW;YACX,cAAc,EAAE,SAAS;YACzB,cAAc,EAAE,EAAE;YAClB,eAAe,EAAE,MAAM;YACvB,WAAW,EAAE,MAAM;SACtB;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAhBY,QAAA,8BAA8B,kCAgB1C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/trackerless-network",
|
|
3
|
-
"version": "0.0.1-tatum.
|
|
3
|
+
"version": "0.0.1-tatum.6",
|
|
4
4
|
"description": "Minimal and extendable implementation of the Streamr Network node.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
32
32
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
33
|
-
"@streamr/dht": "0.0.1-tatum.
|
|
34
|
-
"@streamr/proto-rpc": "0.0.1-tatum.
|
|
35
|
-
"@streamr/protocol": "0.0.1-tatum.
|
|
36
|
-
"@streamr/test-utils": "0.0.1-tatum.
|
|
37
|
-
"@streamr/utils": "0.0.1-tatum.
|
|
33
|
+
"@streamr/dht": "0.0.1-tatum.6",
|
|
34
|
+
"@streamr/proto-rpc": "0.0.1-tatum.6",
|
|
35
|
+
"@streamr/protocol": "0.0.1-tatum.6",
|
|
36
|
+
"@streamr/test-utils": "0.0.1-tatum.6",
|
|
37
|
+
"@streamr/utils": "0.0.1-tatum.6",
|
|
38
38
|
"eventemitter3": "^5.0.0",
|
|
39
39
|
"lodash": "^4.17.21",
|
|
40
40
|
"yallist": "^4.0.0"
|
package/src/NetworkStack.ts
CHANGED
|
@@ -122,7 +122,7 @@ export class NetworkStack extends EventEmitter<NetworkStackEvents> {
|
|
|
122
122
|
await readinessListener.waitUntilReady(timeout)
|
|
123
123
|
}
|
|
124
124
|
|
|
125
|
-
async joinLayer0IfRequired(streamPartId: StreamPartID): Promise<void> {
|
|
125
|
+
private async joinLayer0IfRequired(streamPartId: StreamPartID): Promise<void> {
|
|
126
126
|
if (this.streamrNode!.isProxiedStreamPart(streamPartId)) {
|
|
127
127
|
return
|
|
128
128
|
}
|
package/src/logic/ILayer1.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PeerDescriptor
|
|
1
|
+
import { PeerDescriptor } from '@streamr/dht'
|
|
2
2
|
|
|
3
3
|
export interface ILayer1Events {
|
|
4
4
|
newContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void
|
|
@@ -9,13 +9,10 @@ export interface ILayer1Events {
|
|
|
9
9
|
|
|
10
10
|
export interface ILayer1 {
|
|
11
11
|
on<T extends keyof ILayer1Events>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: PeerDescriptor[]) => void): void
|
|
12
|
-
|
|
13
12
|
once<T extends keyof ILayer1Events>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: PeerDescriptor[]) => void): void
|
|
14
|
-
|
|
15
13
|
off<T extends keyof ILayer1Events>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: PeerDescriptor[]) => void): void
|
|
16
|
-
|
|
17
14
|
removeContact: (peerDescriptor: PeerDescriptor, removeFromOpenInternetPeers?: boolean) => void
|
|
18
|
-
|
|
15
|
+
getClosestContacts: (maxCount?: number) => PeerDescriptor[]
|
|
19
16
|
getKBucketPeers: () => PeerDescriptor[]
|
|
20
17
|
getBucketSize: () => number
|
|
21
18
|
joinDht: (entryPoints: PeerDescriptor[], doRandomJoin?: boolean, retry?: boolean) => Promise<void>
|
package/src/logic/NodeList.ts
CHANGED
|
@@ -66,7 +66,7 @@ export class NodeList extends EventEmitter<Events> {
|
|
|
66
66
|
return Array.from(this.nodes.keys())
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
-
|
|
69
|
+
get(id: NodeID): RemoteRandomGraphNode | undefined {
|
|
70
70
|
return this.nodes.get(id)
|
|
71
71
|
}
|
|
72
72
|
|
|
@@ -96,7 +96,7 @@ export class NodeList extends EventEmitter<Events> {
|
|
|
96
96
|
return included[included.length - 1]
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
|
|
99
|
+
getAll(): RemoteRandomGraphNode[] {
|
|
100
100
|
return Array.from(this.nodes.values())
|
|
101
101
|
}
|
|
102
102
|
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from 'eventemitter3'
|
|
2
2
|
import {
|
|
3
3
|
PeerDescriptor,
|
|
4
|
-
DhtPeer,
|
|
5
4
|
ListeningRpcCommunicator,
|
|
6
5
|
ITransport,
|
|
7
6
|
ConnectionLocker
|
|
@@ -85,9 +84,9 @@ export class RandomGraphNode extends EventEmitter<Events> {
|
|
|
85
84
|
markAndCheckDuplicate: (msg: MessageID, prev?: MessageRef) => markAndCheckDuplicate(this.duplicateDetectors, msg, prev),
|
|
86
85
|
broadcast: (message: StreamMessage, previousNode?: NodeID) => this.broadcast(message, previousNode),
|
|
87
86
|
onLeaveNotice: (senderId: NodeID) => {
|
|
88
|
-
const contact = this.config.nearbyNodeView.
|
|
89
|
-
|| this.config.randomNodeView.
|
|
90
|
-
|| this.config.targetNeighbors.
|
|
87
|
+
const contact = this.config.nearbyNodeView.get(senderId)
|
|
88
|
+
|| this.config.randomNodeView.get(senderId)
|
|
89
|
+
|| this.config.targetNeighbors.get(senderId)
|
|
91
90
|
|| this.config.proxyConnectionServer?.getConnection(senderId )?.remote
|
|
92
91
|
// TODO: check integrity of notifier?
|
|
93
92
|
if (contact) {
|
|
@@ -256,8 +255,8 @@ export class RandomGraphNode extends EventEmitter<Events> {
|
|
|
256
255
|
|
|
257
256
|
private getNeighborCandidatesFromLayer1(): PeerDescriptor[] {
|
|
258
257
|
const uniqueNodes = new Set<PeerDescriptor>()
|
|
259
|
-
this.config.layer1.
|
|
260
|
-
uniqueNodes.add(
|
|
258
|
+
this.config.layer1.getClosestContacts(this.config.nodeViewSize).forEach((peer: PeerDescriptor) => {
|
|
259
|
+
uniqueNodes.add(peer)
|
|
261
260
|
})
|
|
262
261
|
this.config.layer1.getKBucketPeers().forEach((peer: PeerDescriptor) => {
|
|
263
262
|
uniqueNodes.add(peer)
|
|
@@ -279,7 +278,7 @@ export class RandomGraphNode extends EventEmitter<Events> {
|
|
|
279
278
|
this.stopped = true
|
|
280
279
|
this.abortController.abort()
|
|
281
280
|
this.config.proxyConnectionServer?.stop()
|
|
282
|
-
this.config.targetNeighbors.
|
|
281
|
+
this.config.targetNeighbors.getAll().map((remote) => remote.leaveStreamPartNotice())
|
|
283
282
|
this.config.rpcCommunicator.stop()
|
|
284
283
|
this.removeAllListeners()
|
|
285
284
|
this.config.nearbyNodeView.stop()
|