@streamr/trackerless-network 101.0.0-beta.2 → 101.0.0-beta.4
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 +5 -6
- package/dist/src/NetworkNode.d.ts +5 -7
- package/dist/src/NetworkNode.js +5 -24
- package/dist/src/NetworkNode.js.map +1 -1
- package/dist/src/NetworkStack.d.ts +1 -2
- package/dist/src/NetworkStack.js +1 -2
- package/dist/src/NetworkStack.js.map +1 -1
- package/dist/src/exports.d.ts +3 -5
- package/dist/src/exports.js +13 -13
- package/dist/src/exports.js.map +1 -1
- package/dist/src/logic/ContentDeliveryLayerNode.d.ts +5 -5
- package/dist/src/logic/ContentDeliveryLayerNode.js +3 -3
- package/dist/src/logic/ContentDeliveryLayerNode.js.map +1 -1
- package/dist/src/logic/ContentDeliveryManager.d.ts +1 -2
- package/dist/src/logic/ContentDeliveryManager.js +2 -3
- package/dist/src/logic/ContentDeliveryManager.js.map +1 -1
- package/dist/src/logic/ContentDeliveryRpcLocal.d.ts +3 -3
- package/dist/src/logic/ContentDeliveryRpcLocal.js.map +1 -1
- package/dist/src/logic/ContentDeliveryRpcRemote.d.ts +1 -1
- package/dist/src/logic/ContentDeliveryRpcRemote.js.map +1 -1
- package/dist/src/logic/createContentDeliveryLayerNode.d.ts +1 -1
- package/dist/src/logic/formStreamPartDeliveryServiceId.d.ts +1 -1
- package/dist/src/logic/inspect/Inspector.d.ts +2 -2
- package/dist/src/logic/inspect/Inspector.js +2 -2
- package/dist/src/logic/inspect/Inspector.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.d.ts +4 -4
- package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.d.ts +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/Handshaker.d.ts +2 -2
- package/dist/src/logic/neighbor-discovery/Handshaker.js +4 -4
- package/dist/src/logic/neighbor-discovery/Handshaker.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.d.ts +2 -2
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js +3 -3
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.d.ts +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.d.ts +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.js.map +1 -1
- package/dist/src/logic/proxy/ProxyClient.d.ts +1 -2
- package/dist/src/logic/proxy/ProxyClient.js +3 -3
- package/dist/src/logic/proxy/ProxyClient.js.map +1 -1
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.d.ts +3 -4
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js +4 -4
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js.map +1 -1
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.d.ts +4 -4
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.js +1 -1
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.js.map +1 -1
- package/dist/test/benchmark/first-message.js +23 -12
- package/dist/test/benchmark/first-message.js.map +1 -1
- package/dist/test/utils/utils.d.ts +4 -5
- package/dist/test/utils/utils.js +6 -7
- package/dist/test/utils/utils.js.map +1 -1
- package/package.json +5 -6
- package/src/NetworkNode.ts +7 -25
- package/src/NetworkStack.ts +1 -2
- package/src/exports.ts +14 -11
- package/src/logic/ContentDeliveryLayerNode.ts +13 -14
- package/src/logic/ContentDeliveryManager.ts +1 -2
- package/src/logic/ContentDeliveryRpcLocal.ts +3 -3
- package/src/logic/ContentDeliveryRpcRemote.ts +1 -2
- package/src/logic/createContentDeliveryLayerNode.ts +1 -1
- package/src/logic/formStreamPartDeliveryServiceId.ts +1 -1
- package/src/logic/inspect/Inspector.ts +3 -4
- package/src/logic/neighbor-discovery/HandshakeRpcLocal.ts +9 -10
- package/src/logic/neighbor-discovery/HandshakeRpcRemote.ts +1 -2
- package/src/logic/neighbor-discovery/Handshaker.ts +8 -9
- package/src/logic/neighbor-discovery/NeighborUpdateManager.ts +4 -5
- package/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts +2 -2
- package/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts +1 -2
- package/src/logic/proxy/ProxyClient.ts +4 -5
- package/src/logic/proxy/ProxyConnectionRpcLocal.ts +5 -6
- package/src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts +7 -7
- package/test/benchmark/StreamPartIdDataKeyDistribution.test.ts +2 -2
- package/test/benchmark/first-message.ts +28 -29
- package/test/end-to-end/content-delivery-layer-node-with-real-connections.test.ts +4 -5
- package/test/end-to-end/inspect.test.ts +26 -28
- package/test/end-to-end/proxy-and-full-node.test.ts +34 -32
- package/test/end-to-end/proxy-connections.test.ts +34 -31
- package/test/end-to-end/proxy-key-exchange.test.ts +41 -57
- package/test/end-to-end/webrtc-full-node-network.test.ts +1 -2
- package/test/end-to-end/websocket-full-node-network.test.ts +2 -3
- package/test/integration/ContentDeliveryLayerNode-Layer1Node-Latencies.test.ts +2 -3
- package/test/integration/ContentDeliveryLayerNode-Layer1Node.test.ts +2 -3
- package/test/integration/ContentDeliveryManager.test.ts +3 -4
- package/test/integration/ContentDeliveryRpcRemote.test.ts +7 -8
- package/test/integration/HandshakeRpcRemote.test.ts +6 -6
- package/test/integration/Handshakes.test.ts +6 -6
- package/test/integration/Inspect.test.ts +1 -1
- package/test/integration/NeighborUpdateRpcRemote.test.ts +1 -1
- package/test/integration/NetworkNode.test.ts +28 -29
- package/test/integration/NetworkRpc.test.ts +7 -8
- package/test/integration/NetworkStack.test.ts +4 -4
- package/test/integration/NodeInfoRpc.test.ts +3 -4
- package/test/integration/Propagation.test.ts +2 -3
- package/test/integration/joining-streams-on-offline-peers.test.ts +3 -4
- package/test/integration/stream-without-default-entrypoints.test.ts +26 -28
- package/test/integration/streamEntryPointReplacing.test.ts +5 -6
- package/test/unit/ContentDeliveryLayerNode.test.ts +5 -6
- package/test/unit/ContentDeliveryManager.test.ts +2 -3
- package/test/unit/ContentDeliveryRpcLocal.test.ts +1 -1
- package/test/unit/HandshakeRpcLocal.test.ts +2 -2
- package/test/unit/Handshaker.test.ts +2 -2
- package/test/unit/Inspector.test.ts +1 -2
- package/test/unit/NeighborUpdateRpcLocal.test.ts +6 -6
- package/test/unit/NetworkNode.test.ts +3 -4
- package/test/unit/NodeList.test.ts +2 -2
- package/test/unit/StreamPartIDDataKey.test.ts +1 -1
- package/test/unit/StreamPartNetworkSplitAvoidance.test.ts +1 -2
- package/test/unit/TemporaryConnectionRpcLocal.test.ts +2 -2
- package/test/utils/mock/MockTransport.ts +1 -2
- package/test/utils/utils.ts +8 -9
- package/tsconfig.jest.json +0 -1
- package/tsconfig.node.json +0 -2
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.d.ts +0 -6
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.js +0 -28
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.js.map +0 -1
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.d.ts +0 -6
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.js +0 -32
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.js.map +0 -1
- package/dist/src/logic/protocol-integration/stream-message/StreamMessageTranslator.d.ts +0 -6
- package/dist/src/logic/protocol-integration/stream-message/StreamMessageTranslator.js +0 -170
- package/dist/src/logic/protocol-integration/stream-message/StreamMessageTranslator.js.map +0 -1
- package/dist/src/logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils.d.ts +0 -7
- package/dist/src/logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils.js +0 -32
- package/dist/src/logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils.js.map +0 -1
- package/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.ts +0 -28
- package/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.ts +0 -34
- package/src/logic/protocol-integration/stream-message/StreamMessageTranslator.ts +0 -197
- package/src/logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils.ts +0 -37
- package/test/unit/GroupKeyResponseTranslator.test.ts +0 -39
- package/test/unit/StreamMessageTranslator.test.ts +0 -71
- package/test/unit/oldStreamMessageBinaryUtils.test.ts +0 -39
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HandshakeRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/HandshakeRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAuH;AACvH,
|
|
1
|
+
{"version":3,"file":"HandshakeRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/HandshakeRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAuH;AACvH,0CAAqD;AACrD,+BAAyB;AAIzB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOpB,QAAA,0BAA0B,GAAG,KAAK,CAAA;AAE/C,MAAa,kBAAmB,SAAQ,eAA6B;IAEjE,KAAK,CAAC,SAAS,CACX,YAA0B,EAC1B,eAA6B,EAC7B,yBAAsC,EACtC,gBAA6B;QAE7B,MAAM,OAAO,GAA+B;YACxC,YAAY;YACZ,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,eAAe,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,0BAAoB,EAAC,EAAE,CAAC,CAAC;YACtE,yBAAyB,EAAE,CAAC,yBAAyB,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,0BAAoB,EAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,SAAS;YAClI,gBAAgB,EAAE,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,0BAAoB,EAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;SAC1G,CAAA;QACD,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACpF,OAAO;gBACH,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,0BAA0B,EAAE,QAAQ,CAAC,0BAA0B;aAClE,CAAA;QACL,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAA,iCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACrG,OAAO;gBACH,QAAQ,EAAE,KAAK;aAClB,CAAA;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,oBAAoC;QACxD,MAAM,OAAO,GAAsB;YAC/B,0BAA0B,EAAE,oBAAoB;SACnD,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,kCAA0B;SACtC,CAAC,CAAA;QACF,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO;gBACH,QAAQ,EAAE,GAAG,CAAC,QAAQ;aACzB,CAAA;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,wBAAwB,IAAA,iCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAC7G,OAAO;gBACH,QAAQ,EAAE,KAAK;aAClB,CAAA;QACL,CAAC;IAEL,CAAC;CACJ;AAlDD,gDAkDC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { DhtAddress,
|
|
1
|
+
import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
|
|
2
|
+
import { StreamPartID } from '@streamr/utils';
|
|
2
3
|
import { NodeList } from '../NodeList';
|
|
3
|
-
import { StreamPartID } from '@streamr/protocol';
|
|
4
4
|
interface HandshakerOptions {
|
|
5
5
|
localPeerDescriptor: PeerDescriptor;
|
|
6
6
|
streamPartId: StreamPartID;
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Handshaker = void 0;
|
|
4
4
|
const dht_1 = require("@streamr/dht");
|
|
5
|
-
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
6
|
-
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
7
|
-
const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
8
5
|
const utils_1 = require("@streamr/utils");
|
|
9
|
-
const
|
|
6
|
+
const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
7
|
+
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
8
|
+
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
10
9
|
const HandshakeRpcLocal_1 = require("./HandshakeRpcLocal");
|
|
10
|
+
const HandshakeRpcRemote_1 = require("./HandshakeRpcRemote");
|
|
11
11
|
const logger = new utils_1.Logger(module);
|
|
12
12
|
const PARALLEL_HANDSHAKE_COUNT = 2;
|
|
13
13
|
class Handshaker {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/Handshaker.ts"],"names":[],"mappings":";;;AAAA,sCAAgH;
|
|
1
|
+
{"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/Handshaker.ts"],"names":[],"mappings":";;;AAAA,sCAAgH;AAChH,0CAAqD;AACrD,2FAKmE;AACnE,yGAE0E;AAC1E,0EAAsE;AAEtE,2DAAuD;AACvD,6DAAqF;AAgBrF,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,wBAAwB,GAAG,CAAC,CAAA;AAElC,MAAa,UAAU;IAEX,OAAO,CAAmB;IACjB,QAAQ,CAAmB;IAE5C,YAAY,OAA0B;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,qCAAiB,CAAC;YAClC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;YACvC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YACjC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,kBAAkB,EAAE,IAAI,GAAG,EAAE;YAC7B,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB;YAC/C,yBAAyB,EAAE,CAAC,MAAsB,EAAE,YAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,MAAM,EAAE,YAAY,CAAC;YACrI,eAAe,EAAE,CAAC,MAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;YACzE,8BAA8B,EAAE,CAAC,MAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC;SAC1G,CAAC,CAAA;QACF,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,8BAAiB,EAAE,+BAAkB,EAAE,mBAAmB,EACrG,CAAC,GAAsB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,+CAA0B,EAAE,CAAC,CAAA;QAChI,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,uCAA0B,EAAE,wCAA2B,EAAE,WAAW,EAC/G,CAAC,GAA+B,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IAC5F,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,WAAyB;QACvD,iEAAiE;QACjE,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC;YAC1G,MAAM,CAAC,KAAK,CAAC,uCAAuC,wBAAwB,UAAU,CAAC,CAAA;YACvF,OAAO,IAAI,CAAC,iCAAiC,CAAC,WAAW,CAAC,CAAA;QAC9D,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC7G,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACpD,OAAO,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAA;QACxD,CAAC;QACD,OAAO,WAAW,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,iCAAiC,CAAC,WAAyB;QACrE,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;QACnE,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;QACrD,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAA,iCAA2B,EAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAA;QAC5H,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACxD,CAAC;IAEO,qBAAqB,CAAC,WAAyB;QACnD,MAAM,SAAS,GAA8C,IAAI,GAAG,EAAE,CAAA;QACtE,gFAAgF;QAChF,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAiB,CAAC,CAAA;QAClH,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAiB,CAAC,CAAA;QACpH,IAAI,IAAI,EAAE,CAAC;YACP,SAAS,CAAC,GAAG,CAAC,IAAA,iCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;QAC9E,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACR,SAAS,CAAC,GAAG,CAAC,IAAA,iCAA2B,EAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;QAChF,CAAC;QACD,8EAA8E;QAC9E,IAAI,SAAS,CAAC,IAAI,GAAG,wBAAwB,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAiB,CAAC,CAAA;YACrH,IAAI,KAAK,EAAE,CAAC;gBACR,SAAS,CAAC,GAAG,CAAC,IAAA,iCAA2B,EAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;YAChF,CAAC;QACL,CAAC;QACD,MAAM,yBAAyB,GAAG,GAAG,EAAE,CAAC;YACpC,GAAG,WAAW;YACd,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,iCAA2B,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC;SACjH,CAAA;QACD,wFAAwF;QACxF,OACI,SAAS,CAAC,IAAI,GAAG,wBAAwB;eACtC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,GAAG,CAAC,EACtE,CAAC;YACC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAiB,CAAC,CAAA;YACvH,IAAI,MAAM,EAAE,CAAC;gBACT,SAAS,CAAC,GAAG,CAAC,IAAA,iCAA2B,EAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;YAClF,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;IAC/G,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,OAA6B,EAAE,WAAyB;QACvF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACpC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAA0B,EAAE,CAAC,EAAE,EAAE;YACrE,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YACnD,8DAA8D;YAC9D,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,IAAA,iCAA2B,EAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACtG,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;QACxD,CAAC,CAAC,CACL,CAAA;QACD,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACvB,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;gBAC3C,WAAW,CAAC,IAAI,CAAC,IAAA,iCAA2B,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;YACjF,CAAC;QACL,CAAC,CAAC,CAAA;QACF,OAAO,WAAW,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,WAAyB;QAC/D,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;QACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC;eACrD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC;eAC5C,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;eAC7C,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACrD,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;YACnG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,WAAW,CAAC,IAAI,CAAC,IAAA,iCAA2B,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;YAC/E,CAAC;QACL,CAAC;QACD,OAAO,WAAW,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,QAA4B,EAAE,gBAA6B;QACzF,MAAM,YAAY,GAAG,IAAA,iCAA2B,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAC9E,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,CACnC,IAAI,CAAC,OAAO,CAAC,YAAY,EACzB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,EAC/B,gBAAgB,CACnB,CAAA;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;QACjG,CAAC;QACD,IAAI,MAAM,CAAC,0BAA0B,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,0BAA0B,EAAE,YAAY,CAAC,CAAA;QACzF,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QACnD,OAAO,MAAM,CAAC,QAAQ,CAAA;IAC1B,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,MAAsB,EAAE,YAAwB;QACpF,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QAC7C,MAAM,YAAY,GAAG,IAAA,iCAA2B,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAC9E,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAChD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,CACnC,IAAI,CAAC,OAAO,CAAC,YAAY,EACzB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,EAC/B,SAAS,EACT,YAAY,CACf,CAAA;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;QACjG,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QACnD,OAAO,MAAM,CAAC,QAAQ,CAAA;IAC1B,CAAC;IAEO,eAAe,CAAC,oBAAoC;QACxD,OAAO,IAAI,uCAAkB,CACzB,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAChC,oBAAoB,EACpB,IAAI,CAAC,OAAO,CAAC,eAAe,EAC5B,sCAAkB,EAClB,IAAI,CAAC,OAAO,CAAC,iBAAiB,CACjC,CAAA;IACL,CAAC;IAEO,8BAA8B,CAAC,oBAAoC;QACvE,OAAO,IAAI,mDAAwB,CAC/B,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAChC,oBAAoB,EACpB,IAAI,CAAC,OAAO,CAAC,eAAe,EAC5B,4CAAwB,EACxB,IAAI,CAAC,OAAO,CAAC,iBAAiB,CACjC,CAAA;IACL,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAA;IACzC,CAAC;CAEJ;AAxKD,gCAwKC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
|
|
2
|
-
import {
|
|
2
|
+
import { StreamPartID } from '@streamr/utils';
|
|
3
3
|
import { NodeList } from '../NodeList';
|
|
4
|
-
import {
|
|
4
|
+
import { NeighborFinder } from './NeighborFinder';
|
|
5
5
|
interface NeighborUpdateManagerOptions {
|
|
6
6
|
localPeerDescriptor: PeerDescriptor;
|
|
7
7
|
neighbors: NodeList;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NeighborUpdateManager = void 0;
|
|
4
|
-
const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
5
4
|
const dht_1 = require("@streamr/dht");
|
|
6
|
-
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
7
5
|
const utils_1 = require("@streamr/utils");
|
|
8
|
-
const
|
|
6
|
+
const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
7
|
+
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
9
8
|
const NeighborUpdateRpcLocal_1 = require("./NeighborUpdateRpcLocal");
|
|
9
|
+
const NeighborUpdateRpcRemote_1 = require("./NeighborUpdateRpcRemote");
|
|
10
10
|
const logger = new utils_1.Logger(module);
|
|
11
11
|
class NeighborUpdateManager {
|
|
12
12
|
abortController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeighborUpdateManager.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManager.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"NeighborUpdateManager.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManager.ts"],"names":[],"mappings":";;;AAAA,sCAAgH;AAChH,0CAAyE;AACzE,2FAA2F;AAC3F,yGAA2G;AAG3G,qEAAiE;AACjE,uEAAmE;AAcnE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,qBAAqB;IAEb,eAAe,CAAiB;IAChC,OAAO,CAA8B;IACrC,QAAQ,CAAwB;IAEjD,YAAY,OAAqC;QAC7C,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,QAAQ,GAAG,IAAI,+CAAsB,CAAC,OAAO,CAAC,CAAA;QACnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,2BAAc,EAAE,2BAAc,EAAE,gBAAgB,EAC3F,CAAC,GAAmB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACrF,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACtI,CAAC;IAED,IAAI;QACA,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,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAC3G,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC5E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAA;YACjI,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACf,MAAM,MAAM,GAAG,IAAA,iCAA2B,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;gBACxE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBACrC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;YAC/C,CAAC;QACL,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,YAAY,CAAC,oBAAoC;QACrD,OAAO,IAAI,iDAAuB,CAC9B,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAChC,oBAAoB,EACpB,IAAI,CAAC,OAAO,CAAC,eAAe,EAC5B,2CAAuB,CAC1B,CAAA;IACL,CAAC;CACJ;AA3CD,sDA2CC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
2
2
|
import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
|
|
3
|
+
import { StreamPartID } from '@streamr/utils';
|
|
3
4
|
import { NeighborUpdate } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
4
5
|
import { INeighborUpdateRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
|
|
5
6
|
import { NodeList } from '../NodeList';
|
|
6
7
|
import { NeighborFinder } from './NeighborFinder';
|
|
7
|
-
import { StreamPartID } from '@streamr/protocol';
|
|
8
8
|
interface NeighborUpdateRpcLocalOptions {
|
|
9
9
|
localPeerDescriptor: PeerDescriptor;
|
|
10
10
|
streamPartId: StreamPartID;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeighborUpdateRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts"],"names":[],"mappings":";;;AACA,sCAAgI;
|
|
1
|
+
{"version":3,"file":"NeighborUpdateRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts"],"names":[],"mappings":";;;AACA,sCAAgI;AAGhI,yGAA4G;AAE5G,0EAAsE;AAetE,MAAa,sBAAsB;IAEd,OAAO,CAA+B;IAEvD,YAAY,OAAsC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAEO,cAAc,CAAC,mBAAqC;QACxD,MAAM,SAAS,GAAG,IAAA,iCAA2B,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QAC/E,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE;YACrE,MAAM,MAAM,GAAG,IAAA,iCAA2B,EAAC,cAAc,CAAC,CAAA;YAC1D,OAAO,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACpF,CAAC,CAAC,CAAA;QACF,kBAAkB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAC1E,IAAI,mDAAwB,CACxB,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAChC,cAAc,EACd,IAAI,CAAC,OAAO,CAAC,eAAe,EAC5B,4CAAwB,CAC3B,CAAC,CACL,CAAA;IACL,CAAC;IAEO,cAAc,CAAC,QAAiB;QACpC,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;YACvC,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YACpG,QAAQ;SACX,CAAA;IACL,CAAC;IAED,mCAAmC;IACnC,KAAK,CAAC,cAAc,CAAC,OAAuB,EAAE,OAA0B;QACpE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,YAAY,GAAG,IAAA,iCAA2B,EAAC,oBAAoB,CAAC,CAAA;QACtE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QAChD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACjG,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QACpC,CAAC;aAAM,CAAC;YACJ,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB;gBACxF,0GAA0G;gBAC1G,yGAAyG;gBACzG,WAAW;mBACR,OAAO,CAAC,mBAAmB,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAA;YAC5E,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACvB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;YACvC,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YAC/C,CAAC;YACD,OAAO,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAA;QACnD,CAAC;IACL,CAAC;CACJ;AArDD,wDAqDC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PeerDescriptor, RpcRemote } from '@streamr/dht';
|
|
2
|
+
import { StreamPartID } from '@streamr/utils';
|
|
2
3
|
import { NeighborUpdateRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
|
|
3
|
-
import { StreamPartID } from '@streamr/protocol';
|
|
4
4
|
interface UpdateNeighborsResponse {
|
|
5
5
|
peerDescriptors: PeerDescriptor[];
|
|
6
6
|
removeMe: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeighborUpdateRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"NeighborUpdateRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAqF;AACrF,0CAAqD;AAIrD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,uBAAwB,SAAQ,eAAkC;IAE3E,KAAK,CAAC,eAAe,CAAC,YAA0B,EAAE,SAA2B;QACzE,MAAM,OAAO,GAAmB;YAC5B,YAAY;YACZ,mBAAmB,EAAE,SAAS;YAC9B,QAAQ,EAAE,KAAK;SAClB,CAAA;QACD,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACzF,OAAO;gBACH,eAAe,EAAE,QAAQ,CAAC,mBAAmB;gBAC7C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC9B,CAAA;QACL,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAA,iCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAC3G,OAAO;gBACH,eAAe,EAAE,EAAE;gBACnB,QAAQ,EAAE,IAAI;aACjB,CAAA;QACL,CAAC;IACL,CAAC;CACJ;AAtBD,0DAsBC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ConnectionLocker, DhtAddress, ITransport, PeerDescriptor } from '@streamr/dht';
|
|
3
|
-
import { StreamPartID } from '@streamr/
|
|
4
|
-
import { EthereumAddress } from '@streamr/utils';
|
|
3
|
+
import { EthereumAddress, StreamPartID } from '@streamr/utils';
|
|
5
4
|
import { EventEmitter } from 'eventemitter3';
|
|
6
5
|
import { ProxyDirection, StreamMessage } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
7
6
|
export declare const retry: <T>(task: () => Promise<T>, description: string, abortSignal: AbortSignal, delay?: number) => Promise<T>;
|
|
@@ -7,13 +7,13 @@ const eventemitter3_1 = require("eventemitter3");
|
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
8
|
const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
9
9
|
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
10
|
-
const NodeList_1 = require("../NodeList");
|
|
11
|
-
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
12
10
|
const ContentDeliveryRpcLocal_1 = require("../ContentDeliveryRpcLocal");
|
|
11
|
+
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
12
|
+
const NodeList_1 = require("../NodeList");
|
|
13
|
+
const formStreamPartDeliveryServiceId_1 = require("../formStreamPartDeliveryServiceId");
|
|
13
14
|
const Propagation_1 = require("../propagation/Propagation");
|
|
14
15
|
const utils_2 = require("../utils");
|
|
15
16
|
const ProxyConnectionRpcRemote_1 = require("./ProxyConnectionRpcRemote");
|
|
16
|
-
const formStreamPartDeliveryServiceId_1 = require("../formStreamPartDeliveryServiceId");
|
|
17
17
|
// TODO use options option or named constant?
|
|
18
18
|
const retry = async (task, description, abortSignal, delay = 10000) => {
|
|
19
19
|
// eslint-disable-next-line no-constant-condition
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyClient.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyClient.ts"],"names":[],"mappings":";;;AAAA,sCAOqB;
|
|
1
|
+
{"version":3,"file":"ProxyClient.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
2
|
+
import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
|
|
3
|
+
import { EthereumAddress, StreamPartID } from '@streamr/utils';
|
|
4
|
+
import { EventEmitter } from 'eventemitter3';
|
|
2
5
|
import { ProxyConnectionRequest, ProxyConnectionResponse, ProxyDirection, StreamMessage } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
3
6
|
import { IProxyConnectionRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
|
|
4
7
|
import { ContentDeliveryRpcRemote } from '../ContentDeliveryRpcRemote';
|
|
5
|
-
import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
|
|
6
|
-
import { EventEmitter } from 'eventemitter3';
|
|
7
|
-
import { EthereumAddress } from '@streamr/utils';
|
|
8
|
-
import { StreamPartID } from '@streamr/protocol';
|
|
9
8
|
interface ProxyConnection {
|
|
10
9
|
direction: ProxyDirection;
|
|
11
10
|
userId: EthereumAddress;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ProxyConnectionRpcLocal = void 0;
|
|
4
|
-
const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
5
|
-
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
6
4
|
const dht_1 = require("@streamr/dht");
|
|
7
|
-
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
8
|
-
const eventemitter3_1 = require("eventemitter3");
|
|
9
5
|
const utils_1 = require("@streamr/utils");
|
|
6
|
+
const eventemitter3_1 = require("eventemitter3");
|
|
7
|
+
const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
8
|
+
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
9
|
+
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
10
10
|
const logger = new utils_1.Logger(module);
|
|
11
11
|
class ProxyConnectionRpcLocal extends eventemitter3_1.EventEmitter {
|
|
12
12
|
options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyConnectionRpcLocal.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"ProxyConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyConnectionRpcLocal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
2
|
+
import { ConnectionLocker, DhtAddress, ListeningRpcCommunicator } from '@streamr/dht';
|
|
3
|
+
import { StreamPartID } from '@streamr/utils';
|
|
4
|
+
import { Empty } from '../../proto/google/protobuf/empty';
|
|
5
|
+
import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
6
|
import { CloseTemporaryConnection, TemporaryConnectionRequest, TemporaryConnectionResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
3
7
|
import { ITemporaryConnectionRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
|
|
4
|
-
import { ConnectionLocker, DhtAddress, ListeningRpcCommunicator } from '@streamr/dht';
|
|
5
8
|
import { NodeList } from '../NodeList';
|
|
6
|
-
import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
7
|
-
import { Empty } from '../../proto/google/protobuf/empty';
|
|
8
|
-
import { StreamPartID } from '@streamr/protocol';
|
|
9
9
|
interface TemporaryConnectionRpcLocalOptions {
|
|
10
10
|
rpcCommunicator: ListeningRpcCommunicator;
|
|
11
11
|
localPeerDescriptor: PeerDescriptor;
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TemporaryConnectionRpcLocal = void 0;
|
|
4
4
|
const dht_1 = require("@streamr/dht");
|
|
5
5
|
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
6
|
-
const NodeList_1 = require("../NodeList");
|
|
7
6
|
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
7
|
+
const NodeList_1 = require("../NodeList");
|
|
8
8
|
const LOCK_ID_BASE = 'system/content-delivery/temporary-connection/';
|
|
9
9
|
class TemporaryConnectionRpcLocal {
|
|
10
10
|
options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemporaryConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"TemporaryConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts"],"names":[],"mappings":";;;AACA,sCAAkI;AASlI,yGAA4G;AAE5G,0EAAsE;AACtE,0CAAsC;AAStC,MAAM,YAAY,GAAG,+CAA+C,CAAA;AAEpE,MAAa,2BAA2B;IAEnB,OAAO,CAAoC;IAC3C,cAAc,CAAU;IACxB,MAAM,CAAQ;IAC/B,YAAY,OAA2C;QACnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,6CAA6C;QAC7C,IAAI,CAAC,cAAc,GAAG,IAAI,mBAAQ,CAAC,IAAA,iCAA2B,EAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAA;QAChG,IAAI,CAAC,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,YAAY,CAAA;IACrD,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;IAED,OAAO,CAAC,IAAgB;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACxC,CAAC;IAED,UAAU,CAAC,MAAkB;QACzB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAClC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3E,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,QAAoC,EACpC,OAA0B;QAE1B,MAAM,MAAM,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QACpE,MAAM,MAAM,GAAG,IAAI,mDAAwB,CACvC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAChC,MAAM,EACN,IAAI,CAAC,OAAO,CAAC,eAAe,EAC5B,4CAAwB,CAC3B,CAAA;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAC/B,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,IAAA,iCAA2B,EAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAClG,OAAO;YACH,QAAQ,EAAE,IAAI;SACjB,CAAA;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAkC,EAAE,OAA0B;QAChF,MAAM,YAAY,GAAG,IAAA,iCAA2B,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QACvG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;QAC7B,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAhDD,kEAgDC"}
|
|
@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
};
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
const dht_1 = require("@streamr/dht");
|
|
8
|
-
const protocol_1 = require("@streamr/protocol");
|
|
9
8
|
const utils_1 = require("@streamr/utils");
|
|
10
9
|
const fs_1 = __importDefault(require("fs"));
|
|
11
10
|
const ContentDeliveryManager_1 = require("../../src/logic/ContentDeliveryManager");
|
|
11
|
+
const NetworkRpc_1 = require("../../src/proto/packages/trackerless-network/protos/NetworkRpc");
|
|
12
12
|
const utils_2 = require("../utils/utils");
|
|
13
13
|
const numNodes = 10000;
|
|
14
14
|
let nodes;
|
|
@@ -37,7 +37,7 @@ const prepareStream = async (streamId) => {
|
|
|
37
37
|
const peerDescriptor = (0, utils_2.createMockPeerDescriptor)({
|
|
38
38
|
region: (0, dht_1.getRandomRegion)()
|
|
39
39
|
});
|
|
40
|
-
const streamPartId = (0,
|
|
40
|
+
const streamPartId = (0, utils_1.toStreamPartID)((0, utils_1.toStreamID)(streamId), 0);
|
|
41
41
|
const streamPublisher = await (0, utils_2.createNetworkNodeWithSimulator)(peerDescriptor, simulator, [layer0Ep]);
|
|
42
42
|
await streamPublisher.start();
|
|
43
43
|
streamPublisher.join(streamPartId);
|
|
@@ -61,17 +61,28 @@ const measureJoiningTime = async () => {
|
|
|
61
61
|
console.log(stream);
|
|
62
62
|
publishInterval = setInterval(() => {
|
|
63
63
|
i += 1;
|
|
64
|
-
const streamMessage =
|
|
65
|
-
messageId:
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
64
|
+
const streamMessage = {
|
|
65
|
+
messageId: {
|
|
66
|
+
streamId: utils_1.StreamPartIDUtils.getStreamID(stream),
|
|
67
|
+
streamPartition: 0,
|
|
68
|
+
timestamp: i,
|
|
69
|
+
sequenceNumber: Math.floor(Math.random() * 20000),
|
|
70
|
+
publisherId: (0, utils_1.hexToBinary)('0x2222'),
|
|
71
|
+
messageChainId: 'msgChainId'
|
|
72
|
+
},
|
|
73
|
+
body: {
|
|
74
|
+
oneofKind: 'contentMessage',
|
|
75
|
+
contentMessage: {
|
|
76
|
+
content: (0, utils_1.utf8ToBinary)(JSON.stringify({
|
|
77
|
+
hello: 'world'
|
|
78
|
+
})),
|
|
79
|
+
contentType: NetworkRpc_1.ContentType.JSON,
|
|
80
|
+
encryptionType: NetworkRpc_1.EncryptionType.NONE,
|
|
81
|
+
}
|
|
82
|
+
},
|
|
72
83
|
signature: (0, utils_1.hexToBinary)('0x1234'),
|
|
73
|
-
signatureType:
|
|
74
|
-
}
|
|
84
|
+
signatureType: NetworkRpc_1.SignatureType.SECP256K1,
|
|
85
|
+
};
|
|
75
86
|
streamParts.get(stream).broadcast(streamMessage);
|
|
76
87
|
}, 1000);
|
|
77
88
|
// get random node from network to use as entrypoint
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"first-message.js","sourceRoot":"","sources":["../../../test/benchmark/first-message.ts"],"names":[],"mappings":";AAAA,+BAA+B;;;;;AAE/B,sCAOqB;AACrB,
|
|
1
|
+
{"version":3,"file":"first-message.js","sourceRoot":"","sources":["../../../test/benchmark/first-message.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { ConnectionLocker, PeerDescriptor, Simulator } from '@streamr/dht';
|
|
2
|
+
import { EthereumAddress, StreamPartID } from '@streamr/utils';
|
|
3
|
+
import { NetworkNode } from '../../src/NetworkNode';
|
|
2
4
|
import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode';
|
|
3
|
-
import { StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc';
|
|
4
5
|
import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote';
|
|
5
|
-
import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/HandshakeRpcRemote';
|
|
6
|
-
import { NetworkNode } from '../../src/NetworkNode';
|
|
7
|
-
import { EthereumAddress } from '@streamr/utils';
|
|
8
|
-
import { StreamPartID } from '@streamr/protocol';
|
|
9
6
|
import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode';
|
|
7
|
+
import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/HandshakeRpcRemote';
|
|
8
|
+
import { StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc';
|
|
10
9
|
export declare const mockConnectionLocker: ConnectionLocker;
|
|
11
10
|
export declare const createMockContentDeliveryLayerNodeAndDhtNode: (localPeerDescriptor: PeerDescriptor, entryPointDescriptor: PeerDescriptor, streamPartId: StreamPartID, simulator: Simulator) => Promise<[DiscoveryLayerNode, ContentDeliveryLayerNode]>;
|
|
12
11
|
export declare const createStreamMessage: (content: string, streamPartId: StreamPartID, publisherId: EthereumAddress, timestamp?: number, sequenceNumber?: number) => StreamMessage;
|
package/dist/test/utils/utils.js
CHANGED
|
@@ -2,15 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createNetworkNodeWithSimulator = exports.createMockHandshakeRpcRemote = exports.createMockContentDeliveryRpcRemote = exports.createMockPeerDescriptor = exports.createStreamMessage = exports.createMockContentDeliveryLayerNodeAndDhtNode = exports.mockConnectionLocker = void 0;
|
|
4
4
|
const dht_1 = require("@streamr/dht");
|
|
5
|
-
const
|
|
5
|
+
const proto_rpc_1 = require("@streamr/proto-rpc");
|
|
6
|
+
const utils_1 = require("@streamr/utils");
|
|
7
|
+
const NetworkNode_1 = require("../../src/NetworkNode");
|
|
6
8
|
const ContentDeliveryRpcRemote_1 = require("../../src/logic/ContentDeliveryRpcRemote");
|
|
7
9
|
const createContentDeliveryLayerNode_1 = require("../../src/logic/createContentDeliveryLayerNode");
|
|
8
10
|
const HandshakeRpcRemote_1 = require("../../src/logic/neighbor-discovery/HandshakeRpcRemote");
|
|
9
|
-
const
|
|
10
|
-
const utils_1 = require("@streamr/utils");
|
|
11
|
-
const protocol_1 = require("@streamr/protocol");
|
|
11
|
+
const NetworkRpc_1 = require("../../src/proto/packages/trackerless-network/protos/NetworkRpc");
|
|
12
12
|
const NetworkRpc_client_1 = require("../../src/proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
13
|
-
const proto_rpc_1 = require("@streamr/proto-rpc");
|
|
14
13
|
exports.mockConnectionLocker = {
|
|
15
14
|
lockConnection: () => { },
|
|
16
15
|
unlockConnection: () => { },
|
|
@@ -45,8 +44,8 @@ const createMockContentDeliveryLayerNodeAndDhtNode = async (localPeerDescriptor,
|
|
|
45
44
|
exports.createMockContentDeliveryLayerNodeAndDhtNode = createMockContentDeliveryLayerNodeAndDhtNode;
|
|
46
45
|
const createStreamMessage = (content, streamPartId, publisherId, timestamp, sequenceNumber) => {
|
|
47
46
|
const messageId = {
|
|
48
|
-
streamId:
|
|
49
|
-
streamPartition:
|
|
47
|
+
streamId: utils_1.StreamPartIDUtils.getStreamID(streamPartId),
|
|
48
|
+
streamPartition: utils_1.StreamPartIDUtils.getStreamPartition(streamPartId),
|
|
50
49
|
sequenceNumber: sequenceNumber ?? 0,
|
|
51
50
|
timestamp: timestamp ?? Date.now(),
|
|
52
51
|
publisherId: (0, utils_1.hexToBinary)(publisherId),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../test/utils/utils.ts"],"names":[],"mappings":";;;AAAA,sCAUqB;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../test/utils/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/trackerless-network",
|
|
3
|
-
"version": "101.0.0-beta.
|
|
3
|
+
"version": "101.0.0-beta.4",
|
|
4
4
|
"description": "Minimal and extendable implementation of the Streamr Network node.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,11 +30,10 @@
|
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
32
32
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
33
|
-
"@streamr/dht": "101.0.0-beta.
|
|
34
|
-
"@streamr/proto-rpc": "101.0.0-beta.
|
|
35
|
-
"@streamr/
|
|
36
|
-
"@streamr/
|
|
37
|
-
"@streamr/utils": "101.0.0-beta.2",
|
|
33
|
+
"@streamr/dht": "101.0.0-beta.4",
|
|
34
|
+
"@streamr/proto-rpc": "101.0.0-beta.4",
|
|
35
|
+
"@streamr/test-utils": "101.0.0-beta.4",
|
|
36
|
+
"@streamr/utils": "101.0.0-beta.4",
|
|
38
37
|
"eventemitter3": "^5.0.0",
|
|
39
38
|
"lodash": "^4.17.21",
|
|
40
39
|
"uuid": "^9.0.1",
|
package/src/NetworkNode.ts
CHANGED
|
@@ -1,40 +1,23 @@
|
|
|
1
|
-
import { StreamMessage, StreamPartID } from '@streamr/protocol'
|
|
2
1
|
import { DhtAddress, PeerDescriptor } from '@streamr/dht'
|
|
3
|
-
import {
|
|
2
|
+
import { EthereumAddress, MetricsContext, StreamPartID } from '@streamr/utils'
|
|
4
3
|
import { NetworkOptions, NetworkStack, NodeInfo } from './NetworkStack'
|
|
5
|
-
import {
|
|
6
|
-
import { ProxyDirection } from './proto/packages/trackerless-network/protos/NetworkRpc'
|
|
7
|
-
import { pull } from 'lodash'
|
|
4
|
+
import { ProxyDirection, StreamMessage } from './proto/packages/trackerless-network/protos/NetworkRpc'
|
|
8
5
|
|
|
9
6
|
export const createNetworkNode = (opts: NetworkOptions): NetworkNode => {
|
|
10
7
|
return new NetworkNode(new NetworkStack(opts))
|
|
11
8
|
}
|
|
12
9
|
|
|
13
|
-
const logger = new Logger(module)
|
|
14
10
|
/**
|
|
15
11
|
* Convenience wrapper for building client-facing functionality. Used by client.
|
|
16
12
|
*/
|
|
17
13
|
export class NetworkNode {
|
|
18
14
|
|
|
19
15
|
readonly stack: NetworkStack
|
|
20
|
-
private readonly messageListeners: ((msg: StreamMessage) => void)[] = []
|
|
21
16
|
private stopped = false
|
|
22
17
|
|
|
23
18
|
/** @internal */
|
|
24
19
|
constructor(stack: NetworkStack) {
|
|
25
20
|
this.stack = stack
|
|
26
|
-
this.stack.getContentDeliveryManager().on('newMessage', (msg) => {
|
|
27
|
-
if (this.messageListeners.length > 0) {
|
|
28
|
-
try {
|
|
29
|
-
const translated = StreamMessageTranslator.toClientProtocol(msg)
|
|
30
|
-
for (const listener of this.messageListeners) {
|
|
31
|
-
listener(translated)
|
|
32
|
-
}
|
|
33
|
-
} catch (err) {
|
|
34
|
-
logger.trace(`Could not translate message`, { err })
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
})
|
|
38
21
|
}
|
|
39
22
|
|
|
40
23
|
async start(doJoin?: boolean): Promise<void> {
|
|
@@ -45,8 +28,7 @@ export class NetworkNode {
|
|
|
45
28
|
return this.stack.getContentDeliveryManager().inspect(node, streamPartId)
|
|
46
29
|
}
|
|
47
30
|
|
|
48
|
-
async broadcast(
|
|
49
|
-
const msg = StreamMessageTranslator.toProtobuf(streamMessage)
|
|
31
|
+
async broadcast(msg: StreamMessage): Promise<void> {
|
|
50
32
|
await this.stack.broadcast(msg)
|
|
51
33
|
}
|
|
52
34
|
|
|
@@ -68,16 +50,16 @@ export class NetworkNode {
|
|
|
68
50
|
return this.stack.getContentDeliveryManager().isProxiedStreamPart(streamPartId)
|
|
69
51
|
}
|
|
70
52
|
|
|
71
|
-
addMessageListener(
|
|
72
|
-
this.
|
|
53
|
+
addMessageListener(listener: (msg: StreamMessage) => void): void {
|
|
54
|
+
this.stack.getContentDeliveryManager().on('newMessage', listener)
|
|
73
55
|
}
|
|
74
56
|
|
|
75
57
|
setStreamPartEntryPoints(streamPartId: StreamPartID, contactPeerDescriptors: PeerDescriptor[]): void {
|
|
76
58
|
this.stack.getContentDeliveryManager().setStreamPartEntryPoints(streamPartId, contactPeerDescriptors)
|
|
77
59
|
}
|
|
78
60
|
|
|
79
|
-
removeMessageListener(
|
|
80
|
-
|
|
61
|
+
removeMessageListener(listener: (msg: StreamMessage) => void): void {
|
|
62
|
+
this.stack.getContentDeliveryManager().off('newMessage', listener)
|
|
81
63
|
}
|
|
82
64
|
|
|
83
65
|
async leave(streamPartId: StreamPartID): Promise<void> {
|
package/src/NetworkStack.ts
CHANGED
|
@@ -7,8 +7,7 @@ import {
|
|
|
7
7
|
areEqualPeerDescriptors,
|
|
8
8
|
getNodeIdFromPeerDescriptor
|
|
9
9
|
} from '@streamr/dht'
|
|
10
|
-
import { StreamID, StreamPartID, toStreamPartID } from '@streamr/
|
|
11
|
-
import { Logger, MetricsContext, waitForCondition } from '@streamr/utils'
|
|
10
|
+
import { Logger, MetricsContext, StreamID, StreamPartID, toStreamPartID, waitForCondition } from '@streamr/utils'
|
|
12
11
|
import { pull } from 'lodash'
|
|
13
12
|
import { version as applicationVersion } from '../package.json'
|
|
14
13
|
import { ContentDeliveryManager, ContentDeliveryManagerOptions } from './logic/ContentDeliveryManager'
|