@streamr/trackerless-network 102.0.0-beta.0 → 102.0.0-beta.1
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/generated/google/protobuf/any.js.map +1 -0
- package/dist/generated/google/protobuf/empty.js.map +1 -0
- package/dist/generated/google/protobuf/timestamp.js.map +1 -0
- package/dist/{src/proto → generated}/packages/dht/protos/DhtRpc.client.d.ts +9 -0
- package/dist/{src/proto → generated}/packages/dht/protos/DhtRpc.client.js +7 -0
- package/dist/generated/packages/dht/protos/DhtRpc.client.js.map +1 -0
- package/dist/{src/proto → generated}/packages/dht/protos/DhtRpc.d.ts +32 -8
- package/dist/{src/proto → generated}/packages/dht/protos/DhtRpc.js +23 -7
- package/dist/generated/packages/dht/protos/DhtRpc.js.map +1 -0
- package/dist/{src/proto → generated}/packages/dht/protos/DhtRpc.server.d.ts +5 -0
- package/dist/generated/packages/dht/protos/DhtRpc.server.js.map +1 -0
- package/dist/generated/packages/proto-rpc/protos/ProtoRpc.js.map +1 -0
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.client.js.map +1 -0
- package/dist/{src/proto → generated}/packages/trackerless-network/protos/NetworkRpc.d.ts +3 -3
- package/dist/{src/proto → generated}/packages/trackerless-network/protos/NetworkRpc.js +1 -1
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.js.map +1 -0
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.server.js.map +1 -0
- package/dist/package.json +9 -10
- package/dist/src/NetworkNode.d.ts +4 -3
- package/dist/src/NetworkNode.js.map +1 -1
- package/dist/src/NetworkStack.d.ts +2 -2
- package/dist/src/NetworkStack.js +4 -4
- package/dist/src/NetworkStack.js.map +1 -1
- package/dist/src/exports.d.ts +3 -2
- package/dist/src/exports.js +3 -2
- package/dist/src/exports.js.map +1 -1
- package/dist/src/logic/ContentDeliveryLayerNode.d.ts +2 -1
- package/dist/src/logic/ContentDeliveryLayerNode.js +5 -5
- package/dist/src/logic/ContentDeliveryLayerNode.js.map +1 -1
- package/dist/src/logic/ContentDeliveryManager.d.ts +2 -1
- package/dist/src/logic/ContentDeliveryManager.js +2 -1
- package/dist/src/logic/ContentDeliveryManager.js.map +1 -1
- package/dist/src/logic/ContentDeliveryRpcLocal.d.ts +3 -3
- package/dist/src/logic/ContentDeliveryRpcLocal.js +1 -1
- package/dist/src/logic/ContentDeliveryRpcLocal.js.map +1 -1
- package/dist/src/logic/ContentDeliveryRpcRemote.d.ts +2 -2
- package/dist/src/logic/ControlLayerNode.d.ts +1 -1
- package/dist/src/logic/DiscoveryLayerNode.d.ts +3 -3
- package/dist/src/logic/DuplicateMessageDetector.js +1 -1
- package/dist/src/logic/DuplicateMessageDetector.js.map +1 -1
- package/dist/src/logic/PeerDescriptorStoreManager.d.ts +1 -1
- package/dist/src/logic/PeerDescriptorStoreManager.js +1 -1
- package/dist/src/logic/PeerDescriptorStoreManager.js.map +1 -1
- package/dist/src/logic/inspect/InspectSession.d.ts +2 -2
- package/dist/src/logic/inspect/InspectSession.js +2 -2
- package/dist/src/logic/inspect/InspectSession.js.map +1 -1
- package/dist/src/logic/inspect/Inspector.d.ts +1 -1
- package/dist/src/logic/inspect/Inspector.js +1 -1
- package/dist/src/logic/inspect/Inspector.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.d.ts +2 -2
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.d.ts +2 -2
- package/dist/src/logic/neighbor-discovery/Handshaker.js +2 -2
- package/dist/src/logic/neighbor-discovery/Handshaker.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/NeighborUpdateRpcLocal.d.ts +2 -2
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.js +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/node-info/NodeInfoClient.d.ts +1 -1
- package/dist/src/logic/node-info/NodeInfoClient.js +1 -1
- package/dist/src/logic/node-info/NodeInfoClient.js.map +1 -1
- package/dist/src/logic/node-info/NodeInfoRpcLocal.d.ts +2 -2
- package/dist/src/logic/node-info/NodeInfoRpcLocal.js +1 -1
- package/dist/src/logic/node-info/NodeInfoRpcLocal.js.map +1 -1
- package/dist/src/logic/node-info/NodeInfoRpcRemote.d.ts +2 -2
- package/dist/src/logic/propagation/Propagation.d.ts +1 -1
- package/dist/src/logic/propagation/PropagationTaskStore.d.ts +1 -1
- package/dist/src/logic/proxy/ProxyClient.d.ts +1 -2
- package/dist/src/logic/proxy/ProxyClient.js +2 -3
- package/dist/src/logic/proxy/ProxyClient.js.map +1 -1
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.d.ts +2 -2
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js +4 -4
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js.map +1 -1
- package/dist/src/logic/proxy/ProxyConnectionRpcRemote.d.ts +2 -2
- package/dist/src/logic/proxy/ProxyConnectionRpcRemote.js +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/src/logic/temporary-connection/TemporaryConnectionRpcRemote.d.ts +1 -1
- package/dist/src/logic/utils.d.ts +1 -1
- package/dist/src/logic/utils.js +2 -2
- package/dist/src/logic/utils.js.map +1 -1
- package/dist/src/types.d.ts +6 -0
- package/dist/src/types.js +3 -0
- package/dist/src/types.js.map +1 -0
- package/dist/test/benchmark/first-message.js +2 -2
- package/dist/test/benchmark/first-message.js.map +1 -1
- package/dist/test/utils/utils.d.ts +2 -2
- package/dist/test/utils/utils.js +5 -4
- package/dist/test/utils/utils.js.map +1 -1
- package/jest.config.ts +13 -0
- package/package.json +9 -10
- package/proto.sh +2 -2
- package/protos/NetworkRpc.proto +2 -3
- package/src/NetworkNode.ts +4 -3
- package/src/NetworkStack.ts +6 -7
- package/src/exports.ts +5 -3
- package/src/logic/ContentDeliveryLayerNode.ts +6 -6
- package/src/logic/ContentDeliveryManager.ts +4 -2
- package/src/logic/ContentDeliveryRpcLocal.ts +3 -3
- package/src/logic/ContentDeliveryRpcRemote.ts +2 -2
- package/src/logic/ControlLayerNode.ts +1 -1
- package/src/logic/DiscoveryLayerNode.ts +3 -3
- package/src/logic/DuplicateMessageDetector.ts +2 -2
- package/src/logic/PeerDescriptorStoreManager.ts +1 -1
- package/src/logic/createContentDeliveryLayerNode.ts +1 -1
- package/src/logic/inspect/InspectSession.ts +5 -4
- package/src/logic/inspect/Inspector.ts +2 -2
- package/src/logic/neighbor-discovery/HandshakeRpcLocal.ts +2 -2
- package/src/logic/neighbor-discovery/HandshakeRpcRemote.ts +2 -2
- package/src/logic/neighbor-discovery/Handshaker.ts +2 -2
- package/src/logic/neighbor-discovery/NeighborUpdateManager.ts +2 -2
- package/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts +3 -3
- package/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts +2 -2
- package/src/logic/node-info/NodeInfoClient.ts +2 -2
- package/src/logic/node-info/NodeInfoRpcLocal.ts +2 -2
- package/src/logic/node-info/NodeInfoRpcRemote.ts +2 -2
- package/src/logic/propagation/Propagation.ts +1 -1
- package/src/logic/propagation/PropagationTaskStore.ts +1 -1
- package/src/logic/proxy/ProxyClient.ts +2 -3
- package/src/logic/proxy/ProxyConnectionRpcLocal.ts +6 -6
- package/src/logic/proxy/ProxyConnectionRpcRemote.ts +4 -4
- package/src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts +5 -5
- package/src/logic/temporary-connection/TemporaryConnectionRpcRemote.ts +1 -1
- package/src/logic/utils.ts +4 -4
- package/src/types.ts +13 -0
- package/test/benchmark/first-message.ts +4 -2
- package/test/end-to-end/content-delivery-layer-node-with-real-connections.test.ts +9 -4
- package/test/end-to-end/external-network-rpc.test.ts +2 -2
- package/test/end-to-end/inspect.test.ts +4 -4
- package/test/end-to-end/proxy-and-full-node.test.ts +3 -3
- package/test/end-to-end/proxy-connections.test.ts +10 -12
- package/test/end-to-end/proxy-key-exchange.test.ts +6 -6
- package/test/end-to-end/webrtc-full-node-network.test.ts +3 -5
- package/test/end-to-end/websocket-full-node-network.test.ts +4 -6
- package/test/integration/ContentDeliveryLayerNode-Layer1Node-Latencies.test.ts +7 -7
- package/test/integration/ContentDeliveryLayerNode-Layer1Node.test.ts +6 -6
- package/test/integration/ContentDeliveryManager.test.ts +17 -14
- package/test/integration/ContentDeliveryRpcRemote.test.ts +6 -6
- package/test/integration/HandshakeRpcRemote.test.ts +2 -2
- package/test/integration/Handshakes.test.ts +15 -50
- package/test/integration/NeighborUpdateRpcRemote.test.ts +2 -2
- package/test/integration/NetworkNode.test.ts +5 -5
- package/test/integration/NetworkRpc.test.ts +6 -6
- package/test/integration/NetworkStack.test.ts +2 -2
- package/test/integration/NodeInfoRpc.test.ts +3 -3
- package/test/integration/Propagation.test.ts +4 -4
- package/test/integration/joining-streams-on-offline-peers.test.ts +3 -3
- package/test/integration/stream-without-default-entrypoints.test.ts +8 -8
- package/test/integration/streamEntryPointReplacing.test.ts +3 -3
- package/test/types/global.d.ts +0 -1
- package/test/unit/ContentDeliveryLayerNode.test.ts +4 -4
- package/test/unit/ContentDeliveryManager.test.ts +5 -4
- package/test/unit/ContentDeliveryRpcLocal.test.ts +1 -1
- package/test/unit/DuplicateMessageDetector.test.ts +10 -10
- package/test/unit/ExternalNetworkRpc.test.ts +3 -3
- package/test/unit/HandshakeRpcLocal.test.ts +1 -14
- package/test/unit/InspectSession.test.ts +4 -1
- package/test/unit/Inspector.test.ts +1 -1
- package/test/unit/NeighborFinder.test.ts +2 -2
- package/test/unit/NeighborUpdateRpcLocal.test.ts +1 -1
- package/test/unit/NetworkNode.test.ts +3 -3
- package/test/unit/NodeList.test.ts +1 -1
- package/test/unit/PeerDescriptorStoreManager.test.ts +2 -2
- package/test/unit/Propagation.test.ts +4 -4
- package/test/unit/ProxyConnectionRpcRemote.test.ts +2 -2
- package/test/unit/StreamPartReconnect.test.ts +2 -2
- package/test/utils/mock/MockNeighborUpdateManager.ts +1 -1
- package/test/utils/utils.ts +6 -5
- package/tsconfig.browser.json +1 -0
- package/tsconfig.jest.json +1 -0
- package/tsconfig.node.json +1 -0
- package/.eslintignore +0 -7
- package/.eslintrc +0 -3
- package/dist/src/proto/google/protobuf/any.js.map +0 -1
- package/dist/src/proto/google/protobuf/empty.js.map +0 -1
- package/dist/src/proto/google/protobuf/timestamp.js.map +0 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +0 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +0 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.js.map +0 -1
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.js.map +0 -1
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.client.js.map +0 -1
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.js.map +0 -1
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.server.js.map +0 -1
- package/jest.config.js +0 -8
- package/src/proto/google/protobuf/any.ts +0 -326
- package/src/proto/google/protobuf/empty.ts +0 -81
- package/src/proto/google/protobuf/timestamp.ts +0 -287
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +0 -407
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +0 -160
- package/src/proto/packages/dht/protos/DhtRpc.ts +0 -1244
- package/src/proto/packages/proto-rpc/protos/ProtoRpc.ts +0 -108
- package/src/proto/packages/trackerless-network/protos/NetworkRpc.client.ts +0 -218
- package/src/proto/packages/trackerless-network/protos/NetworkRpc.server.ts +0 -85
- package/src/proto/packages/trackerless-network/protos/NetworkRpc.ts +0 -783
- /package/dist/{src/proto → generated}/google/protobuf/any.d.ts +0 -0
- /package/dist/{src/proto → generated}/google/protobuf/any.js +0 -0
- /package/dist/{src/proto → generated}/google/protobuf/empty.d.ts +0 -0
- /package/dist/{src/proto → generated}/google/protobuf/empty.js +0 -0
- /package/dist/{src/proto → generated}/google/protobuf/timestamp.d.ts +0 -0
- /package/dist/{src/proto → generated}/google/protobuf/timestamp.js +0 -0
- /package/dist/{src/proto → generated}/packages/dht/protos/DhtRpc.server.js +0 -0
- /package/dist/{src/proto → generated}/packages/proto-rpc/protos/ProtoRpc.d.ts +0 -0
- /package/dist/{src/proto → generated}/packages/proto-rpc/protos/ProtoRpc.js +0 -0
- /package/dist/{src/proto → generated}/packages/trackerless-network/protos/NetworkRpc.client.d.ts +0 -0
- /package/dist/{src/proto → generated}/packages/trackerless-network/protos/NetworkRpc.client.js +0 -0
- /package/dist/{src/proto → generated}/packages/trackerless-network/protos/NetworkRpc.server.d.ts +0 -0
- /package/dist/{src/proto → generated}/packages/trackerless-network/protos/NetworkRpc.server.js +0 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NodeInfoClient = void 0;
|
|
4
|
-
const NetworkRpc_client_1 = require("
|
|
4
|
+
const NetworkRpc_client_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc.client");
|
|
5
5
|
const NodeInfoRpcRemote_1 = require("./NodeInfoRpcRemote");
|
|
6
6
|
class NodeInfoClient {
|
|
7
7
|
ownPeerDescriptor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeInfoClient.js","sourceRoot":"","sources":["../../../../src/logic/node-info/NodeInfoClient.ts"],"names":[],"mappings":";;;AAGA,
|
|
1
|
+
{"version":3,"file":"NodeInfoClient.js","sourceRoot":"","sources":["../../../../src/logic/node-info/NodeInfoClient.ts"],"names":[],"mappings":";;;AAGA,gHAA4G;AAC5G,2DAAuD;AAEvD,MAAa,cAAc;IACN,iBAAiB,CAAgB;IACjC,eAAe,CAAiC;IAEjE,YAAY,iBAAiC,EAAE,eAAgD;QAC3F,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAoB;QAC9B,MAAM,MAAM,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,qCAAiB,CAAC,CAAA;QAC3G,4FAA4F;QAC5F,sDAAsD;QACtD,OAAO,MAAM,CAAC,OAAO,EAAyB,CAAA;IAClD,CAAC;CAEJ;AAhBD,wCAgBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { NodeInfoResponse } from '
|
|
2
|
-
import { INodeInfoRpc } from '
|
|
1
|
+
import { NodeInfoResponse } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
2
|
+
import { INodeInfoRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server';
|
|
3
3
|
import { NetworkStack } from '../../NetworkStack';
|
|
4
4
|
import { ListeningRpcCommunicator } from '@streamr/dht';
|
|
5
5
|
export declare const NODE_INFO_RPC_SERVICE_ID = "system/node-info-rpc";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NodeInfoRpcLocal = exports.NODE_INFO_RPC_SERVICE_ID = void 0;
|
|
4
|
-
const NetworkRpc_1 = require("
|
|
4
|
+
const NetworkRpc_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc");
|
|
5
5
|
exports.NODE_INFO_RPC_SERVICE_ID = 'system/node-info-rpc';
|
|
6
6
|
class NodeInfoRpcLocal {
|
|
7
7
|
stack;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeInfoRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/node-info/NodeInfoRpcLocal.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"NodeInfoRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/node-info/NodeInfoRpcLocal.ts"],"names":[],"mappings":";;;AAAA,kGAAqH;AAKxG,QAAA,wBAAwB,GAAG,sBAAsB,CAAA;AAE9D,MAAa,gBAAgB;IAER,KAAK,CAAc;IACnB,eAAe,CAA0B;IAE1D,YAAY,KAAmB,EAAE,eAAyC;QACtE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,4BAA4B,EAAE,CAAA;IACvC,CAAC;IAEO,4BAA4B;QAChC,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,4BAAe,EAAE,6BAAgB,EAAE,SAAS,EAC/E,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAA;IACtC,CAAC;CAEJ;AApBD,4CAoBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { NodeInfoResponse } from '
|
|
2
|
-
import { NodeInfoRpcClient } from '
|
|
1
|
+
import { NodeInfoResponse } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
2
|
+
import { NodeInfoRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client';
|
|
3
3
|
import { RpcRemote } from '@streamr/dht';
|
|
4
4
|
export declare class NodeInfoRpcRemote extends RpcRemote<NodeInfoRpcClient> {
|
|
5
5
|
getInfo(): Promise<NodeInfoResponse>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DhtAddress } from '@streamr/dht';
|
|
2
|
-
import { StreamMessage } from '
|
|
2
|
+
import { StreamMessage } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
3
3
|
type SendToNeighborFn = (neighborId: DhtAddress, msg: StreamMessage) => Promise<void>;
|
|
4
4
|
interface ConstructorOptions {
|
|
5
5
|
sendToNeighbor: SendToNeighborFn;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DhtAddress } from '@streamr/dht';
|
|
2
|
-
import { MessageRef, StreamMessage } from '
|
|
2
|
+
import { MessageRef, StreamMessage } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
3
3
|
export interface PropagationTask {
|
|
4
4
|
message: StreamMessage;
|
|
5
5
|
source: string | null;
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { ConnectionLocker, DhtAddress, ITransport, PeerDescriptor } from '@streamr/dht';
|
|
3
2
|
import { StreamPartID, UserID } from '@streamr/utils';
|
|
4
3
|
import { EventEmitter } from 'eventemitter3';
|
|
5
|
-
import { ProxyDirection, StreamMessage } from '
|
|
4
|
+
import { ProxyDirection, StreamMessage } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
6
5
|
export declare const retry: <T>(task: () => Promise<T>, description: string, abortSignal: AbortSignal, delay?: number) => Promise<T>;
|
|
7
6
|
interface ProxyClientOptions {
|
|
8
7
|
transport: ITransport;
|
|
@@ -5,8 +5,8 @@ const dht_1 = require("@streamr/dht");
|
|
|
5
5
|
const utils_1 = require("@streamr/utils");
|
|
6
6
|
const eventemitter3_1 = require("eventemitter3");
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
|
-
const NetworkRpc_1 = require("
|
|
9
|
-
const NetworkRpc_client_1 = require("
|
|
8
|
+
const NetworkRpc_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc");
|
|
9
|
+
const NetworkRpc_client_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc.client");
|
|
10
10
|
const ContentDeliveryRpcLocal_1 = require("../ContentDeliveryRpcLocal");
|
|
11
11
|
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
12
12
|
const NodeList_1 = require("../NodeList");
|
|
@@ -16,7 +16,6 @@ const utils_2 = require("../utils");
|
|
|
16
16
|
const ProxyConnectionRpcRemote_1 = require("./ProxyConnectionRpcRemote");
|
|
17
17
|
// TODO use options option or named constant?
|
|
18
18
|
const retry = async (task, description, abortSignal, delay = 10000) => {
|
|
19
|
-
// eslint-disable-next-line no-constant-condition
|
|
20
19
|
while (true) {
|
|
21
20
|
try {
|
|
22
21
|
const result = await task();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyClient.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyClient.ts"],"names":[],"mappings":";;;AAAA,sCAOqB;AACrB,0CAA4F;AAC5F,iDAA4C;AAC5C,mCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"ProxyClient.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@ import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
|
2
2
|
import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
|
|
3
3
|
import { StreamPartID, UserID } from '@streamr/utils';
|
|
4
4
|
import { EventEmitter } from 'eventemitter3';
|
|
5
|
-
import { ProxyConnectionRequest, ProxyConnectionResponse, ProxyDirection, StreamMessage } from '
|
|
6
|
-
import { IProxyConnectionRpc } from '
|
|
5
|
+
import { ProxyConnectionRequest, ProxyConnectionResponse, ProxyDirection, StreamMessage } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
6
|
+
import { IProxyConnectionRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server';
|
|
7
7
|
import { ContentDeliveryRpcRemote } from '../ContentDeliveryRpcRemote';
|
|
8
8
|
interface ProxyConnection {
|
|
9
9
|
direction: ProxyDirection;
|
|
@@ -4,8 +4,8 @@ exports.ProxyConnectionRpcLocal = void 0;
|
|
|
4
4
|
const dht_1 = require("@streamr/dht");
|
|
5
5
|
const utils_1 = require("@streamr/utils");
|
|
6
6
|
const eventemitter3_1 = require("eventemitter3");
|
|
7
|
-
const NetworkRpc_1 = require("
|
|
8
|
-
const NetworkRpc_client_1 = require("
|
|
7
|
+
const NetworkRpc_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc");
|
|
8
|
+
const NetworkRpc_client_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc.client");
|
|
9
9
|
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
10
10
|
const logger = new utils_1.Logger(module);
|
|
11
11
|
class ProxyConnectionRpcLocal extends eventemitter3_1.EventEmitter {
|
|
@@ -34,7 +34,7 @@ class ProxyConnectionRpcLocal extends eventemitter3_1.EventEmitter {
|
|
|
34
34
|
if (msg.body.oneofKind === 'groupKeyRequest') {
|
|
35
35
|
try {
|
|
36
36
|
const recipientId = msg.body.groupKeyRequest.recipientId;
|
|
37
|
-
return this.getNodeIdsForUserId((0, utils_1.
|
|
37
|
+
return this.getNodeIdsForUserId((0, utils_1.toUserId)(recipientId));
|
|
38
38
|
}
|
|
39
39
|
catch (err) {
|
|
40
40
|
logger.trace(`Could not parse GroupKeyRequest`, { err });
|
|
@@ -57,7 +57,7 @@ class ProxyConnectionRpcLocal extends eventemitter3_1.EventEmitter {
|
|
|
57
57
|
const remoteNodeId = (0, dht_1.toNodeId)(senderPeerDescriptor);
|
|
58
58
|
this.connections.set(remoteNodeId, {
|
|
59
59
|
direction: request.direction,
|
|
60
|
-
userId: (0, utils_1.
|
|
60
|
+
userId: (0, utils_1.toUserId)(request.userId),
|
|
61
61
|
remote: new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.options.localPeerDescriptor, senderPeerDescriptor, this.options.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient)
|
|
62
62
|
});
|
|
63
63
|
const response = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyConnectionRpcLocal.ts"],"names":[],"mappings":";;;AACA,sCAA6G;AAC7G,
|
|
1
|
+
{"version":3,"file":"ProxyConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/proxy/ProxyConnectionRpcLocal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RpcRemote } from '@streamr/dht';
|
|
2
2
|
import { UserID } from '@streamr/utils';
|
|
3
|
-
import { ProxyDirection } from '
|
|
4
|
-
import { ProxyConnectionRpcClient } from '
|
|
3
|
+
import { ProxyDirection } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
4
|
+
import { ProxyConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client';
|
|
5
5
|
export declare class ProxyConnectionRpcRemote extends RpcRemote<ProxyConnectionRpcClient> {
|
|
6
6
|
requestConnection(direction: ProxyDirection, userId: UserID): Promise<boolean>;
|
|
7
7
|
}
|
|
@@ -8,7 +8,7 @@ class ProxyConnectionRpcRemote extends dht_1.RpcRemote {
|
|
|
8
8
|
async requestConnection(direction, userId) {
|
|
9
9
|
const request = {
|
|
10
10
|
direction,
|
|
11
|
-
userId: (0, utils_1.
|
|
11
|
+
userId: (0, utils_1.toUserIdRaw)(userId)
|
|
12
12
|
};
|
|
13
13
|
const options = this.formDhtRpcOptions({
|
|
14
14
|
timeout: dht_1.EXISTING_CONNECTION_TIMEOUT
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
2
2
|
import { ConnectionLocker, DhtAddress, ListeningRpcCommunicator } from '@streamr/dht';
|
|
3
3
|
import { StreamPartID } from '@streamr/utils';
|
|
4
|
-
import { Empty } from '
|
|
5
|
-
import { PeerDescriptor } from '
|
|
6
|
-
import { CloseTemporaryConnection, TemporaryConnectionRequest, TemporaryConnectionResponse } from '
|
|
7
|
-
import { ITemporaryConnectionRpc } from '
|
|
4
|
+
import { Empty } from '../../../generated/google/protobuf/empty';
|
|
5
|
+
import { PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
6
|
+
import { CloseTemporaryConnection, TemporaryConnectionRequest, TemporaryConnectionResponse } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
7
|
+
import { ITemporaryConnectionRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server';
|
|
8
8
|
import { NodeList } from '../NodeList';
|
|
9
9
|
interface TemporaryConnectionRpcLocalOptions {
|
|
10
10
|
rpcCommunicator: ListeningRpcCommunicator;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TemporaryConnectionRpcLocal = void 0;
|
|
4
4
|
const dht_1 = require("@streamr/dht");
|
|
5
|
-
const NetworkRpc_client_1 = require("
|
|
5
|
+
const NetworkRpc_client_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc.client");
|
|
6
6
|
const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
|
|
7
7
|
const NodeList_1 = require("../NodeList");
|
|
8
8
|
const LOCK_ID_BASE = 'system/content-delivery/temporary-connection/';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemporaryConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts"],"names":[],"mappings":";;;AACA,sCAA+G;AAS/G,
|
|
1
|
+
{"version":3,"file":"TemporaryConnectionRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts"],"names":[],"mappings":";;;AACA,sCAA+G;AAS/G,gHAAmH;AAEnH,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,cAAQ,EAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAA;QAC7E,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,cAAQ,EAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC/E,OAAO;YACH,QAAQ,EAAE,IAAI;SACjB,CAAA;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAkC,EAAE,OAA0B;QAChF,MAAM,YAAY,GAAG,IAAA,cAAQ,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QACpF,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;QAC7B,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAhDD,kEAgDC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RpcRemote } from '@streamr/dht';
|
|
2
|
-
import { TemporaryConnectionRpcClient } from '
|
|
2
|
+
import { TemporaryConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client';
|
|
3
3
|
export declare class TemporaryConnectionRpcRemote extends RpcRemote<TemporaryConnectionRpcClient> {
|
|
4
4
|
openConnection(): Promise<boolean>;
|
|
5
5
|
closeConnection(): Promise<void>;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
+
import { MessageID, MessageRef } from '../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
1
2
|
import { DuplicateMessageDetector } from './DuplicateMessageDetector';
|
|
2
|
-
import { MessageID, MessageRef } from '../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
3
3
|
export declare const markAndCheckDuplicate: (duplicateDetectors: Map<string, DuplicateMessageDetector>, currentMessage: MessageID, previousMessageRef?: MessageRef) => boolean;
|
package/dist/src/logic/utils.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.markAndCheckDuplicate = void 0;
|
|
4
|
-
const DuplicateMessageDetector_1 = require("./DuplicateMessageDetector");
|
|
5
4
|
const utils_1 = require("@streamr/utils");
|
|
5
|
+
const DuplicateMessageDetector_1 = require("./DuplicateMessageDetector");
|
|
6
6
|
const markAndCheckDuplicate = (duplicateDetectors, currentMessage, previousMessageRef) => {
|
|
7
|
-
const detectorKey = `${(0, utils_1.
|
|
7
|
+
const detectorKey = `${(0, utils_1.toUserId)(currentMessage.publisherId)}-${currentMessage.messageChainId}`;
|
|
8
8
|
const previousNumberPair = previousMessageRef ?
|
|
9
9
|
new DuplicateMessageDetector_1.NumberPair(Number(previousMessageRef.timestamp), previousMessageRef.sequenceNumber) : null;
|
|
10
10
|
const currentNumberPair = new DuplicateMessageDetector_1.NumberPair(Number(currentMessage.timestamp), currentMessage.sequenceNumber);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/logic/utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/logic/utils.ts"],"names":[],"mappings":";;;AAAA,0CAAyC;AAEzC,yEAAiF;AAE1E,MAAM,qBAAqB,GAAG,CACjC,kBAAyD,EACzD,cAAyB,EACzB,kBAA+B,EACxB,EAAE;IACT,MAAM,WAAW,GAAG,GAAG,IAAA,gBAAQ,EAAC,cAAc,CAAC,WAAW,CAAC,IAAI,cAAc,CAAC,cAAc,EAAE,CAAA;IAC9F,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,CAAC;QAC3C,IAAI,qCAAU,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAClG,MAAM,iBAAiB,GAAG,IAAI,qCAAU,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAA;IACzG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;QACvC,kBAAkB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,mDAAwB,EAAE,CAAC,CAAA;IACvE,CAAC;IACD,OAAO,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,YAAY,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAA;AACnG,CAAC,CAAA;AAbY,QAAA,qBAAqB,yBAajC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ChangeFieldType } from '@streamr/utils';
|
|
2
|
+
import { MarkRequired } from 'ts-essentials';
|
|
3
|
+
import { ContentDeliveryLayerNeighborInfo as ContentDeliveryLayerNeighborInfo_, NodeInfoResponse, StreamPartitionInfo as StreamPartitionInfo_ } from '../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
4
|
+
export type ContentDeliveryLayerNeighborInfo = MarkRequired<ContentDeliveryLayerNeighborInfo_, 'peerDescriptor'>;
|
|
5
|
+
export type StreamPartitionInfo = ChangeFieldType<Required<StreamPartitionInfo_>, 'contentDeliveryLayerNeighbors', ContentDeliveryLayerNeighborInfo[]>;
|
|
6
|
+
export type NodeInfo = ChangeFieldType<Required<NodeInfoResponse>, 'streamPartitions', StreamPartitionInfo[]>;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":""}
|
|
@@ -8,7 +8,7 @@ const dht_1 = require("@streamr/dht");
|
|
|
8
8
|
const utils_1 = require("@streamr/utils");
|
|
9
9
|
const fs_1 = __importDefault(require("fs"));
|
|
10
10
|
const ContentDeliveryManager_1 = require("../../src/logic/ContentDeliveryManager");
|
|
11
|
-
const NetworkRpc_1 = require("../../
|
|
11
|
+
const NetworkRpc_1 = require("../../generated/packages/trackerless-network/protos/NetworkRpc");
|
|
12
12
|
const utils_2 = require("../utils/utils");
|
|
13
13
|
const numNodes = 10000;
|
|
14
14
|
let nodes;
|
|
@@ -67,7 +67,7 @@ const measureJoiningTime = async () => {
|
|
|
67
67
|
streamPartition: 0,
|
|
68
68
|
timestamp: i,
|
|
69
69
|
sequenceNumber: Math.floor(Math.random() * 20000),
|
|
70
|
-
publisherId: (0, utils_1.
|
|
70
|
+
publisherId: (0, utils_1.toUserIdRaw)((0, utils_1.toUserId)('0x2222')),
|
|
71
71
|
messageChainId: 'msgChainId'
|
|
72
72
|
},
|
|
73
73
|
body: {
|
|
@@ -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":";AAAA,+BAA+B;;;;;AAE/B,sCAOqB;AACrB,0CASuB;AACvB,4CAAmB;AAEnB,mFAA8E;AAG9E,+FAA2H;AAC3H,0CAAyF;AAEzF,MAAM,QAAQ,GAAG,KAAK,CAAA;AAEtB,IAAI,KAAoB,CAAA;AACxB,IAAI,SAAoB,CAAA;AACxB,IAAI,QAAwB,CAAA;AAC5B,MAAM,gBAAgB,GAAqB,EAAE,CAAA;AAC7C,MAAM,WAAW,GAAmC,IAAI,GAAG,EAAE,CAAA;AAC7D,IAAI,WAAwB,CAAA;AAC5B,IAAI,eAA2C,CAAA;AAC/C,IAAI,CAAC,GAAG,CAAC,CAAA;AAET,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IAC7B,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAChC,KAAK,GAAG,EAAE,CAAA;IACV,SAAS,GAAG,IAAI,eAAS,CAAC,iBAAW,CAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,cAAc,GAAG,IAAA,gCAAwB,EAAC;QAC5C,MAAM,EAAE,IAAA,qBAAe,GAAE;KAC5B,CAAC,CAAA;IACF,QAAQ,GAAG,cAAc,CAAA;IACzB,MAAM,UAAU,GAAG,MAAM,IAAA,sCAA8B,EAAC,cAAc,EAAE,SAAS,EAAE,CAAC,cAAc,CAAC,CAAC,CAAA;IACpG,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;IACxB,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAEtB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;IAC7C,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAChC,MAAM,cAAc,GAAG,IAAA,gCAAwB,EAAC;QAC5C,MAAM,EAAE,IAAA,qBAAe,GAAE;KAC5B,CAAC,CAAA;IACF,MAAM,YAAY,GAAG,IAAA,sBAAc,EAAC,IAAA,kBAAU,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5D,MAAM,eAAe,GAAG,MAAM,IAAA,sCAA8B,EAAC,cAAc,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IACnG,MAAM,eAAe,CAAC,KAAK,EAAE,CAAA;IAC7B,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IAClC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC3B,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,CAAA;AAClD,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;IAC/B,gBAAgB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/D,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;KACtC,CAAC,CAAA;IACF,SAAS,CAAC,IAAI,EAAE,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;IAClC,MAAM,cAAc,GAAG,IAAA,gCAAwB,EAAC;QAC5C,MAAM,EAAE,IAAA,qBAAe,GAAE;KAC5B,CAAC,CAAA;IACF,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,IAAA,cAAQ,EAAC,cAAc,CAAC,CAAC,CAAA;IAE/D,8BAA8B;IAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3F,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnB,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QAC/B,CAAC,IAAI,CAAC,CAAA;QACN,MAAM,aAAa,GAAG;YAClB,SAAS,EAAE;gBACP,QAAQ,EAAE,yBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC/C,eAAe,EAAE,CAAC;gBAClB,SAAS,EAAE,CAAC;gBACZ,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC;gBACjD,WAAW,EAAE,IAAA,mBAAW,EAAC,IAAA,gBAAQ,EAAC,QAAQ,CAAC,CAAC;gBAC5C,cAAc,EAAE,YAAY;aAC/B;YACD,IAAI,EAAE;gBACF,SAAS,EAAE,gBAAyB;gBACpC,cAAc,EAAE;oBACZ,OAAO,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,SAAS,CAAC;wBACjC,KAAK,EAAE,OAAO;qBACjB,CAAC,CAAC;oBACH,WAAW,EAAE,wBAAW,CAAC,IAAI;oBAC7B,cAAc,EAAE,2BAAc,CAAC,IAAI;iBACtC;aACJ;YACD,SAAS,EAAE,IAAA,mBAAW,EAAC,QAAQ,CAAC;YAChC,aAAa,EAAE,0BAAa,CAAC,SAAS;SACzC,CAAA;QACD,WAAW,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;IACrD,CAAC,EAAE,IAAI,CAAC,CAAA;IACR,oDAAoD;IACpD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IAClE,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAA8B,EACzD,cAAc,EACd,SAAS,EACT,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,sBAAsB,EAAE,CAAC,CACpE,CAAA;IACD,WAAW,GAAG,gBAAgB,CAAA;IAC9B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;IAC/B,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAA;IAE9B,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,IAAA,qBAAa,EAAC,gBAAgB,CAAC,KAAK,CAAC,yBAAyB,EAAS,EAAE,YAAY,EAAE,KAAK,CAAC;QAC7F,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC;KAChC,CAAC,CAAA;IAEF,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;IAE7B,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC5B,aAAa,CAAC,eAAe,CAAC,CAAA;IAC9B,eAAe,GAAG,SAAS,CAAA;IAC3B,OAAO,GAAG,GAAG,KAAK,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;IACnB,MAAM,aAAa,EAAE,CAAA;IACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1B,MAAM,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;IACtC,CAAC;IACD,MAAM,OAAO,GAAG,YAAE,CAAC,QAAQ,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAA;IAExD,YAAE,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,yCAAyC,GAAG,IAAI,CAAC,CAAA;IAC/F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,kBAAkB,EAAE,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAC,CAAA;QAClF,YAAE,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACtE,CAAC;IACD,YAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IACrB,MAAM,eAAe,EAAE,CAAA;AAC3B,CAAC,CAAA;AAED,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IACZ,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AACvB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAClB,MAAM,sBAAsB,GAAG,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAA;IAC5E,MAAM,WAAW,GAAG,sBAAsB,CAAC,cAAc,EAAE,CAAA;IAC3D,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,gBAAgB,CAAC,IAAA,8CAAqB,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9G,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACtB,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,mBAAmB,EAAa,CAAA;IAC3E,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAA;IACnD,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC,kBAAkB,EAAE,CAAC,CAAA;IACvE,MAAM,kBAAkB,GAAG,sBAAsB;SAC5C,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAgF,CAAA;IACzH,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC,CAAA;IACjE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;IACpC,IAAI,eAAe,EAAE,CAAC;QAClB,aAAa,CAAC,eAAe,CAAC,CAAA;IAClC,CAAC;AACL,CAAC,CAAC,CAAA"}
|
|
@@ -5,11 +5,11 @@ import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNo
|
|
|
5
5
|
import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote';
|
|
6
6
|
import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode';
|
|
7
7
|
import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/HandshakeRpcRemote';
|
|
8
|
-
import { StreamMessage } from '../../
|
|
8
|
+
import { StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
9
9
|
export declare const mockConnectionLocker: ConnectionLocker;
|
|
10
10
|
export declare const createMockContentDeliveryLayerNodeAndDhtNode: (localPeerDescriptor: PeerDescriptor, entryPointDescriptor: PeerDescriptor, streamPartId: StreamPartID, simulator: Simulator) => Promise<[DiscoveryLayerNode, ContentDeliveryLayerNode]>;
|
|
11
11
|
export declare const createStreamMessage: (content: string, streamPartId: StreamPartID, publisherId: UserID, timestamp?: number, sequenceNumber?: number) => StreamMessage;
|
|
12
|
-
export declare const createMockPeerDescriptor: (opts?: Omit<Partial<PeerDescriptor>,
|
|
12
|
+
export declare const createMockPeerDescriptor: (opts?: Omit<Partial<PeerDescriptor>, "nodeId" | "type">) => PeerDescriptor;
|
|
13
13
|
export declare const createMockContentDeliveryRpcRemote: (remotePeerDescriptor?: PeerDescriptor) => ContentDeliveryRpcRemote;
|
|
14
14
|
export declare const createMockHandshakeRpcRemote: () => HandshakeRpcRemote;
|
|
15
15
|
export declare const createNetworkNodeWithSimulator: (peerDescriptor: PeerDescriptor, simulator: Simulator, entryPoints: PeerDescriptor[]) => Promise<NetworkNode>;
|
package/dist/test/utils/utils.js
CHANGED
|
@@ -8,8 +8,8 @@ const NetworkNode_1 = require("../../src/NetworkNode");
|
|
|
8
8
|
const ContentDeliveryRpcRemote_1 = require("../../src/logic/ContentDeliveryRpcRemote");
|
|
9
9
|
const createContentDeliveryLayerNode_1 = require("../../src/logic/createContentDeliveryLayerNode");
|
|
10
10
|
const HandshakeRpcRemote_1 = require("../../src/logic/neighbor-discovery/HandshakeRpcRemote");
|
|
11
|
-
const NetworkRpc_1 = require("../../
|
|
12
|
-
const NetworkRpc_client_1 = require("../../
|
|
11
|
+
const NetworkRpc_1 = require("../../generated/packages/trackerless-network/protos/NetworkRpc");
|
|
12
|
+
const NetworkRpc_client_1 = require("../../generated/packages/trackerless-network/protos/NetworkRpc.client");
|
|
13
13
|
exports.mockConnectionLocker = {
|
|
14
14
|
lockConnection: () => { },
|
|
15
15
|
unlockConnection: () => { },
|
|
@@ -28,7 +28,8 @@ const createMockContentDeliveryLayerNodeAndDhtNode = async (localPeerDescriptor,
|
|
|
28
28
|
peerDescriptor: localPeerDescriptor,
|
|
29
29
|
numberOfNodesPerKBucket: 4,
|
|
30
30
|
entryPoints: [entryPointDescriptor],
|
|
31
|
-
rpcRequestTimeout: 5000
|
|
31
|
+
rpcRequestTimeout: 5000,
|
|
32
|
+
neighborPingLimit: 16
|
|
32
33
|
});
|
|
33
34
|
const contentDeliveryLayerNode = (0, createContentDeliveryLayerNode_1.createContentDeliveryLayerNode)({
|
|
34
35
|
streamPartId,
|
|
@@ -48,7 +49,7 @@ const createStreamMessage = (content, streamPartId, publisherId, timestamp, sequ
|
|
|
48
49
|
streamPartition: utils_1.StreamPartIDUtils.getStreamPartition(streamPartId),
|
|
49
50
|
sequenceNumber: sequenceNumber ?? 0,
|
|
50
51
|
timestamp: timestamp ?? Date.now(),
|
|
51
|
-
publisherId: (0, utils_1.
|
|
52
|
+
publisherId: (0, utils_1.toUserIdRaw)(publisherId),
|
|
52
53
|
messageChainId: 'messageChain0',
|
|
53
54
|
};
|
|
54
55
|
const msg = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../test/utils/utils.ts"],"names":[],"mappings":";;;AAAA,sCAUqB;AACrB,kDAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../test/utils/utils.ts"],"names":[],"mappings":"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"}
|
package/jest.config.ts
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { Config } from '@jest/types'
|
|
2
|
+
import defaultConfig from '../../jest.config'
|
|
3
|
+
|
|
4
|
+
const config: Config.InitialOptions = {
|
|
5
|
+
...defaultConfig,
|
|
6
|
+
setupFilesAfterEnv: [
|
|
7
|
+
...defaultConfig.setupFilesAfterEnv,
|
|
8
|
+
'@streamr/test-utils/setupCustomMatchers',
|
|
9
|
+
],
|
|
10
|
+
testTimeout: 15000,
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export default config
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/trackerless-network",
|
|
3
|
-
"version": "102.0.0-beta.
|
|
3
|
+
"version": "102.0.0-beta.1",
|
|
4
4
|
"description": "Minimal and extendable implementation of the Streamr Network node.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"scripts": {
|
|
15
15
|
"build": "tsc -b tsconfig.node.json",
|
|
16
16
|
"build-browser": "webpack --mode=development --progress",
|
|
17
|
-
"
|
|
17
|
+
"prebuild": "./proto.sh",
|
|
18
18
|
"check": "tsc -p ./tsconfig.jest.json",
|
|
19
19
|
"clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
|
|
20
20
|
"coverage": "jest --coverage",
|
|
@@ -30,22 +30,21 @@
|
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
32
32
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
33
|
-
"@streamr/dht": "102.0.0-beta.
|
|
34
|
-
"@streamr/proto-rpc": "102.0.0-beta.
|
|
35
|
-
"@streamr/
|
|
36
|
-
"@streamr/utils": "102.0.0-beta.0",
|
|
33
|
+
"@streamr/dht": "102.0.0-beta.1",
|
|
34
|
+
"@streamr/proto-rpc": "102.0.0-beta.1",
|
|
35
|
+
"@streamr/utils": "102.0.0-beta.1",
|
|
37
36
|
"eventemitter3": "^5.0.0",
|
|
38
37
|
"lodash": "^4.17.21",
|
|
39
|
-
"
|
|
38
|
+
"ts-essentials": "^10.0.4",
|
|
39
|
+
"uuid": "^11.0.5",
|
|
40
40
|
"yallist": "^5.0.0"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
43
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
44
|
-
"@
|
|
45
|
-
"@types/
|
|
44
|
+
"@streamr/test-utils": "102.0.0-beta.1",
|
|
45
|
+
"@types/lodash": "^4.17.14",
|
|
46
46
|
"@types/yallist": "^4.0.1",
|
|
47
47
|
"expect": "^29.6.2",
|
|
48
|
-
"ts-essentials": "^10.0.2",
|
|
49
48
|
"ts-node": "^10.9.2"
|
|
50
49
|
}
|
|
51
50
|
}
|
package/proto.sh
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
mkdir -p ./
|
|
2
|
-
npx protoc --ts_out ./
|
|
1
|
+
mkdir -p ./generated
|
|
2
|
+
npx protoc --ts_out ./generated --ts_opt server_generic,generate_dependencies,long_type_number --proto_path ../.. packages/trackerless-network/protos/NetworkRpc.proto --experimental_allow_proto3_optional
|
package/protos/NetworkRpc.proto
CHANGED
|
@@ -3,7 +3,6 @@ syntax = "proto3";
|
|
|
3
3
|
option optimize_for = CODE_SIZE;
|
|
4
4
|
|
|
5
5
|
import "google/protobuf/empty.proto";
|
|
6
|
-
import "google/protobuf/any.proto";
|
|
7
6
|
import "packages/dht/protos/DhtRpc.proto";
|
|
8
7
|
|
|
9
8
|
service ContentDeliveryRpc {
|
|
@@ -182,6 +181,6 @@ message NodeInfoRequest {}
|
|
|
182
181
|
message NodeInfoResponse {
|
|
183
182
|
dht.PeerDescriptor peerDescriptor = 1;
|
|
184
183
|
repeated StreamPartitionInfo streamPartitions = 2;
|
|
185
|
-
|
|
186
|
-
string
|
|
184
|
+
ControlLayerInfo controlLayer = 3;
|
|
185
|
+
string applicationVersion = 4;
|
|
187
186
|
}
|
package/src/NetworkNode.ts
CHANGED
|
@@ -4,8 +4,9 @@ import { DhtAddress, PeerDescriptor } from '@streamr/dht'
|
|
|
4
4
|
import { ProtoRpcClient } from '@streamr/proto-rpc'
|
|
5
5
|
import { MetricsContext, StreamPartID, UserID } from '@streamr/utils'
|
|
6
6
|
import { ExternalNetworkRpc, ExternalRpcClient, ExternalRpcClientClass } from './logic/ExternalNetworkRpc'
|
|
7
|
-
import { NetworkOptions, NetworkStack
|
|
8
|
-
import { ProxyDirection, StreamMessage } from '
|
|
7
|
+
import { NetworkOptions, NetworkStack } from './NetworkStack'
|
|
8
|
+
import { ProxyDirection, StreamMessage } from '../generated/packages/trackerless-network/protos/NetworkRpc'
|
|
9
|
+
import { NodeInfo } from './types'
|
|
9
10
|
|
|
10
11
|
export const createNetworkNode = (opts: NetworkOptions): NetworkNode => {
|
|
11
12
|
return new NetworkNode(new NetworkStack(opts))
|
|
@@ -75,7 +76,7 @@ export class NetworkNode {
|
|
|
75
76
|
await this.stack.getContentDeliveryManager().leaveStreamPart(streamPartId)
|
|
76
77
|
}
|
|
77
78
|
|
|
78
|
-
getNeighbors(streamPartId: StreamPartID):
|
|
79
|
+
getNeighbors(streamPartId: StreamPartID): readonly DhtAddress[] {
|
|
79
80
|
return this.stack.getContentDeliveryManager().getNeighbors(streamPartId)
|
|
80
81
|
}
|
|
81
82
|
|
package/src/NetworkStack.ts
CHANGED
|
@@ -7,14 +7,15 @@ import {
|
|
|
7
7
|
areEqualPeerDescriptors,
|
|
8
8
|
toNodeId
|
|
9
9
|
} from '@streamr/dht'
|
|
10
|
-
import { Logger, MetricsContext, StreamID, StreamPartID, toStreamPartID,
|
|
10
|
+
import { Logger, MetricsContext, StreamID, StreamPartID, toStreamPartID, until } from '@streamr/utils'
|
|
11
11
|
import { pull } from 'lodash'
|
|
12
12
|
import { version as applicationVersion } from '../package.json'
|
|
13
13
|
import { ContentDeliveryManager, ContentDeliveryManagerOptions } from './logic/ContentDeliveryManager'
|
|
14
14
|
import { ControlLayerNode } from './logic/ControlLayerNode'
|
|
15
15
|
import { NodeInfoClient } from './logic/node-info/NodeInfoClient'
|
|
16
16
|
import { NODE_INFO_RPC_SERVICE_ID, NodeInfoRpcLocal } from './logic/node-info/NodeInfoRpcLocal'
|
|
17
|
-
import {
|
|
17
|
+
import { ProxyDirection, StreamMessage } from '../generated/packages/trackerless-network/protos/NetworkRpc'
|
|
18
|
+
import { NodeInfo } from './types'
|
|
18
19
|
|
|
19
20
|
export interface NetworkOptions {
|
|
20
21
|
layer0?: DhtNodeOptions
|
|
@@ -49,8 +50,6 @@ if (typeof window === 'object') {
|
|
|
49
50
|
})
|
|
50
51
|
}
|
|
51
52
|
|
|
52
|
-
export type NodeInfo = Required<NodeInfoResponse>
|
|
53
|
-
|
|
54
53
|
export class NetworkStack {
|
|
55
54
|
|
|
56
55
|
private controlLayerNode?: ControlLayerNode
|
|
@@ -83,7 +82,7 @@ export class NetworkStack {
|
|
|
83
82
|
await this.ensureConnectedToControlLayer()
|
|
84
83
|
this.getContentDeliveryManager().joinStreamPart(streamPartId)
|
|
85
84
|
if (neighborRequirement !== undefined) {
|
|
86
|
-
await
|
|
85
|
+
await until(() => {
|
|
87
86
|
return this.getContentDeliveryManager().getNeighbors(streamPartId).length >= neighborRequirement.minCount
|
|
88
87
|
}, neighborRequirement.timeout)
|
|
89
88
|
}
|
|
@@ -109,7 +108,7 @@ export class NetworkStack {
|
|
|
109
108
|
await this.controlLayerNode!.start()
|
|
110
109
|
logger.info(`Node id is ${toNodeId(this.controlLayerNode!.getLocalPeerDescriptor())}`)
|
|
111
110
|
const connectionManager = this.controlLayerNode!.getTransport() as ConnectionManager
|
|
112
|
-
if ((this.options.layer0?.entryPoints
|
|
111
|
+
if ((this.options.layer0?.entryPoints?.some((entryPoint) =>
|
|
113
112
|
areEqualPeerDescriptors(entryPoint, this.controlLayerNode!.getLocalPeerDescriptor())
|
|
114
113
|
))) {
|
|
115
114
|
await this.controlLayerNode?.joinDht(this.options.layer0.entryPoints)
|
|
@@ -172,7 +171,7 @@ export class NetworkStack {
|
|
|
172
171
|
neighbors: this.getControlLayerNode().getNeighbors()
|
|
173
172
|
},
|
|
174
173
|
streamPartitions: this.getContentDeliveryManager().getNodeInfo(),
|
|
175
|
-
|
|
174
|
+
applicationVersion
|
|
176
175
|
}
|
|
177
176
|
}
|
|
178
177
|
|