@streamr/trackerless-network 100.0.0-testnet-three.5 → 100.0.0-testnet-three.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +8 -8
- package/dist/src/NetworkNode.d.ts +3 -3
- package/dist/src/NetworkNode.js.map +1 -1
- package/dist/src/NetworkStack.d.ts +3 -1
- package/dist/src/NetworkStack.js +18 -1
- package/dist/src/NetworkStack.js.map +1 -1
- package/dist/src/exports.d.ts +2 -2
- package/dist/src/exports.js +1 -2
- package/dist/src/exports.js.map +1 -1
- package/dist/src/logic/node-info/NodeInfoClient.d.ts +2 -2
- package/dist/src/logic/node-info/NodeInfoClient.js +3 -1
- package/dist/src/logic/node-info/NodeInfoClient.js.map +1 -1
- package/dist/src/logic/node-info/NodeInfoRpcLocal.js +1 -10
- package/dist/src/logic/node-info/NodeInfoRpcLocal.js.map +1 -1
- package/package.json +8 -8
- package/src/NetworkNode.ts +3 -3
- package/src/NetworkStack.ts +29 -3
- package/src/exports.ts +2 -2
- package/src/logic/node-info/NodeInfoClient.ts +6 -4
- package/src/logic/node-info/NodeInfoRpcLocal.ts +1 -10
- package/test/integration/NetworkNode.test.ts +8 -4
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/trackerless-network",
|
|
3
|
-
"version": "100.0.0-testnet-three.
|
|
3
|
+
"version": "100.0.0-testnet-three.6",
|
|
4
4
|
"description": "Minimal and extendable implementation of the Streamr Network node.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
32
32
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
33
|
-
"@streamr/dht": "100.0.0-testnet-three.
|
|
34
|
-
"@streamr/proto-rpc": "100.0.0-testnet-three.
|
|
35
|
-
"@streamr/protocol": "100.0.0-testnet-three.
|
|
36
|
-
"@streamr/test-utils": "100.0.0-testnet-three.
|
|
37
|
-
"@streamr/utils": "100.0.0-testnet-three.
|
|
33
|
+
"@streamr/dht": "100.0.0-testnet-three.6",
|
|
34
|
+
"@streamr/proto-rpc": "100.0.0-testnet-three.6",
|
|
35
|
+
"@streamr/protocol": "100.0.0-testnet-three.6",
|
|
36
|
+
"@streamr/test-utils": "100.0.0-testnet-three.6",
|
|
37
|
+
"@streamr/utils": "100.0.0-testnet-three.6",
|
|
38
38
|
"eventemitter3": "^5.0.0",
|
|
39
39
|
"lodash": "^4.17.21",
|
|
40
40
|
"uuid": "^9.0.1",
|
|
@@ -43,9 +43,9 @@
|
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
45
45
|
"@types/lodash": "^4.14.202",
|
|
46
|
-
"@types/uuid": "^9.0.
|
|
46
|
+
"@types/uuid": "^9.0.8",
|
|
47
47
|
"@types/yallist": "^4.0.1",
|
|
48
|
-
"commander": "^
|
|
48
|
+
"commander": "^12.0.0",
|
|
49
49
|
"expect": "^29.6.2",
|
|
50
50
|
"express": "^4.17.1",
|
|
51
51
|
"ts-essentials": "^9.4.1",
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { StreamMessage, StreamPartID } from '@streamr/protocol';
|
|
2
2
|
import { DhtAddress, PeerDescriptor } from '@streamr/dht';
|
|
3
|
-
import { NetworkOptions, NetworkStack } from './NetworkStack';
|
|
3
|
+
import { NetworkOptions, NetworkStack, NodeInfo } from './NetworkStack';
|
|
4
4
|
import { EthereumAddress, MetricsContext } from '@streamr/utils';
|
|
5
|
-
import {
|
|
5
|
+
import { ProxyDirection } from './proto/packages/trackerless-network/protos/NetworkRpc';
|
|
6
6
|
export declare const createNetworkNode: (opts: NetworkOptions) => NetworkNode;
|
|
7
7
|
/**
|
|
8
8
|
* Convenience wrapper for building client-facing functionality. Used by client.
|
|
@@ -32,6 +32,6 @@ export declare class NetworkNode {
|
|
|
32
32
|
getNodeId(): DhtAddress;
|
|
33
33
|
getOptions(): NetworkOptions;
|
|
34
34
|
getStreamParts(): StreamPartID[];
|
|
35
|
-
fetchNodeInfo(node: PeerDescriptor): Promise<
|
|
35
|
+
fetchNodeInfo(node: PeerDescriptor): Promise<NodeInfo>;
|
|
36
36
|
getDiagnosticInfo(): Record<string, unknown>;
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkNode.js","sourceRoot":"","sources":["../../src/NetworkNode.ts"],"names":[],"mappings":";;;AAEA,iHAA6G;AAC7G,
|
|
1
|
+
{"version":3,"file":"NetworkNode.js","sourceRoot":"","sources":["../../src/NetworkNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export interface NetworkOptions {
|
|
|
9
9
|
networkNode?: StreamrNodeConfig;
|
|
10
10
|
metricsContext?: MetricsContext;
|
|
11
11
|
}
|
|
12
|
+
export type NodeInfo = Required<NodeInfoResponse>;
|
|
12
13
|
export declare class NetworkStack {
|
|
13
14
|
private layer0Node?;
|
|
14
15
|
private streamrNode?;
|
|
@@ -28,7 +29,8 @@ export declare class NetworkStack {
|
|
|
28
29
|
getStreamrNode(): StreamrNode;
|
|
29
30
|
getLayer0Node(): Layer0Node;
|
|
30
31
|
getMetricsContext(): MetricsContext;
|
|
31
|
-
fetchNodeInfo(node: PeerDescriptor): Promise<
|
|
32
|
+
fetchNodeInfo(node: PeerDescriptor): Promise<NodeInfo>;
|
|
33
|
+
createNodeInfo(): NodeInfo;
|
|
32
34
|
getOptions(): NetworkOptions;
|
|
33
35
|
private getConnectionManager;
|
|
34
36
|
stop(): Promise<void>;
|
package/dist/src/NetworkStack.js
CHANGED
|
@@ -9,6 +9,7 @@ const NetworkRpc_1 = require("./proto/packages/trackerless-network/protos/Networ
|
|
|
9
9
|
const lodash_1 = require("lodash");
|
|
10
10
|
const NodeInfoRpcLocal_1 = require("./logic/node-info/NodeInfoRpcLocal");
|
|
11
11
|
const NodeInfoClient_1 = require("./logic/node-info/NodeInfoClient");
|
|
12
|
+
const package_json_1 = require("../package.json");
|
|
12
13
|
const logger = new utils_1.Logger(module);
|
|
13
14
|
const instances = [];
|
|
14
15
|
const stopInstances = async () => {
|
|
@@ -121,7 +122,23 @@ class NetworkStack {
|
|
|
121
122
|
return this.metricsContext;
|
|
122
123
|
}
|
|
123
124
|
async fetchNodeInfo(node) {
|
|
124
|
-
|
|
125
|
+
if (!(0, dht_1.areEqualPeerDescriptors)(node, this.getLayer0Node().getLocalPeerDescriptor())) {
|
|
126
|
+
return this.nodeInfoClient.getInfo(node);
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
return this.createNodeInfo();
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
createNodeInfo() {
|
|
133
|
+
return {
|
|
134
|
+
peerDescriptor: this.getLayer0Node().getLocalPeerDescriptor(),
|
|
135
|
+
controlLayer: {
|
|
136
|
+
connections: this.getLayer0Node().getConnections(),
|
|
137
|
+
neighbors: this.getLayer0Node().getNeighbors()
|
|
138
|
+
},
|
|
139
|
+
streamPartitions: this.getStreamrNode().getNodeInfo(),
|
|
140
|
+
version: package_json_1.version
|
|
141
|
+
};
|
|
125
142
|
}
|
|
126
143
|
getOptions() {
|
|
127
144
|
return this.options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkStack.js","sourceRoot":"","sources":["../../src/NetworkStack.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"NetworkStack.js","sourceRoot":"","sources":["../../src/NetworkStack.ts"],"names":[],"mappings":"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"}
|
package/dist/src/exports.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export { NetworkStack, NetworkOptions } from './NetworkStack';
|
|
1
|
+
export { NetworkStack, NetworkOptions, NodeInfo } from './NetworkStack';
|
|
2
2
|
export { NetworkNode, createNetworkNode } from './NetworkNode';
|
|
3
3
|
export { StreamrNodeConfig } from './logic/StreamrNode';
|
|
4
|
-
export { ProxyDirection
|
|
4
|
+
export { ProxyDirection } from './proto/packages/trackerless-network/protos/NetworkRpc';
|
|
5
5
|
export { streamPartIdToDataKey } from './logic/EntryPointDiscovery';
|
|
6
6
|
export { convertStreamMessageToBytes, convertBytesToStreamMessage } from './logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils';
|
package/dist/src/exports.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.convertBytesToStreamMessage = exports.convertStreamMessageToBytes = exports.streamPartIdToDataKey = exports.
|
|
3
|
+
exports.convertBytesToStreamMessage = exports.convertStreamMessageToBytes = exports.streamPartIdToDataKey = exports.ProxyDirection = exports.createNetworkNode = exports.NetworkNode = exports.NetworkStack = void 0;
|
|
4
4
|
var NetworkStack_1 = require("./NetworkStack");
|
|
5
5
|
Object.defineProperty(exports, "NetworkStack", { enumerable: true, get: function () { return NetworkStack_1.NetworkStack; } });
|
|
6
6
|
var NetworkNode_1 = require("./NetworkNode");
|
|
@@ -8,7 +8,6 @@ Object.defineProperty(exports, "NetworkNode", { enumerable: true, get: function
|
|
|
8
8
|
Object.defineProperty(exports, "createNetworkNode", { enumerable: true, get: function () { return NetworkNode_1.createNetworkNode; } });
|
|
9
9
|
var NetworkRpc_1 = require("./proto/packages/trackerless-network/protos/NetworkRpc");
|
|
10
10
|
Object.defineProperty(exports, "ProxyDirection", { enumerable: true, get: function () { return NetworkRpc_1.ProxyDirection; } });
|
|
11
|
-
Object.defineProperty(exports, "NodeInfoResponse", { enumerable: true, get: function () { return NetworkRpc_1.NodeInfoResponse; } });
|
|
12
11
|
var EntryPointDiscovery_1 = require("./logic/EntryPointDiscovery");
|
|
13
12
|
Object.defineProperty(exports, "streamPartIdToDataKey", { enumerable: true, get: function () { return EntryPointDiscovery_1.streamPartIdToDataKey; } });
|
|
14
13
|
var oldStreamMessageBinaryUtils_1 = require("./logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils");
|
package/dist/src/exports.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../src/exports.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../src/exports.ts"],"names":[],"mappings":";;;AAAA,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,6CAA8D;AAArD,0GAAA,WAAW,OAAA;AAAE,gHAAA,iBAAiB,OAAA;AAEvC,qFAAuF;AAA9E,4GAAA,cAAc,OAAA;AACvB,mEAAmE;AAA1D,4HAAA,qBAAqB,OAAA;AAC9B,uHAGgF;AAF5E,0IAAA,2BAA2B,OAAA;AAC3B,0IAAA,2BAA2B,OAAA"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { DhtCallContext, PeerDescriptor } from '@streamr/dht';
|
|
2
|
-
import { NodeInfoResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
3
2
|
import { RpcCommunicator } from '@streamr/proto-rpc';
|
|
3
|
+
import { NodeInfo } from '../../NetworkStack';
|
|
4
4
|
export declare class NodeInfoClient {
|
|
5
5
|
private readonly ownPeerDescriptor;
|
|
6
6
|
private readonly rpcCommunicator;
|
|
7
7
|
constructor(ownPeerDescriptor: PeerDescriptor, rpcCommunicator: RpcCommunicator<DhtCallContext>);
|
|
8
|
-
getInfo(node: PeerDescriptor): Promise<
|
|
8
|
+
getInfo(node: PeerDescriptor): Promise<NodeInfo>;
|
|
9
9
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NodeInfoClient = void 0;
|
|
4
|
-
const NodeInfoRpcRemote_1 = require("./NodeInfoRpcRemote");
|
|
5
4
|
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
5
|
+
const NodeInfoRpcRemote_1 = require("./NodeInfoRpcRemote");
|
|
6
6
|
class NodeInfoClient {
|
|
7
7
|
ownPeerDescriptor;
|
|
8
8
|
rpcCommunicator;
|
|
@@ -12,6 +12,8 @@ class NodeInfoClient {
|
|
|
12
12
|
}
|
|
13
13
|
async getInfo(node) {
|
|
14
14
|
const remote = new NodeInfoRpcRemote_1.NodeInfoRpcRemote(this.ownPeerDescriptor, node, this.rpcCommunicator, NetworkRpc_client_1.NodeInfoRpcClient);
|
|
15
|
+
// TODO remove casting when we validate NodeInfoResponse messages and therefore can annotate
|
|
16
|
+
// each of the field as required in the decorated type
|
|
15
17
|
return remote.getInfo();
|
|
16
18
|
}
|
|
17
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeInfoClient.js","sourceRoot":"","sources":["../../../../src/logic/node-info/NodeInfoClient.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"NodeInfoClient.js","sourceRoot":"","sources":["../../../../src/logic/node-info/NodeInfoClient.ts"],"names":[],"mappings":";;;AAGA,yGAAqG;AACrG,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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NodeInfoRpcLocal = exports.NODE_INFO_RPC_SERVICE_ID = void 0;
|
|
4
4
|
const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
5
|
-
const package_json_1 = require("../../../package.json");
|
|
6
5
|
exports.NODE_INFO_RPC_SERVICE_ID = 'system/node-info-rpc';
|
|
7
6
|
class NodeInfoRpcLocal {
|
|
8
7
|
stack;
|
|
@@ -16,15 +15,7 @@ class NodeInfoRpcLocal {
|
|
|
16
15
|
this.rpcCommunicator.registerRpcMethod(NetworkRpc_1.NodeInfoRequest, NetworkRpc_1.NodeInfoResponse, 'getInfo', () => this.getInfo());
|
|
17
16
|
}
|
|
18
17
|
async getInfo() {
|
|
19
|
-
return
|
|
20
|
-
peerDescriptor: this.stack.getLayer0Node().getLocalPeerDescriptor(),
|
|
21
|
-
controlLayer: {
|
|
22
|
-
connections: this.stack.getLayer0Node().getConnections(),
|
|
23
|
-
neighbors: this.stack.getLayer0Node().getNeighbors()
|
|
24
|
-
},
|
|
25
|
-
streamPartitions: this.stack.getStreamrNode().getNodeInfo(),
|
|
26
|
-
version: package_json_1.version
|
|
27
|
-
};
|
|
18
|
+
return this.stack.createNodeInfo();
|
|
28
19
|
}
|
|
29
20
|
}
|
|
30
21
|
exports.NodeInfoRpcLocal = NodeInfoRpcLocal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeInfoRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/node-info/NodeInfoRpcLocal.ts"],"names":[],"mappings":";;;AAAA,2FAA8G;
|
|
1
|
+
{"version":3,"file":"NodeInfoRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/node-info/NodeInfoRpcLocal.ts"],"names":[],"mappings":";;;AAAA,2FAA8G;AAKjG,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/trackerless-network",
|
|
3
|
-
"version": "100.0.0-testnet-three.
|
|
3
|
+
"version": "100.0.0-testnet-three.6",
|
|
4
4
|
"description": "Minimal and extendable implementation of the Streamr Network node.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
32
32
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
33
|
-
"@streamr/dht": "100.0.0-testnet-three.
|
|
34
|
-
"@streamr/proto-rpc": "100.0.0-testnet-three.
|
|
35
|
-
"@streamr/protocol": "100.0.0-testnet-three.
|
|
36
|
-
"@streamr/test-utils": "100.0.0-testnet-three.
|
|
37
|
-
"@streamr/utils": "100.0.0-testnet-three.
|
|
33
|
+
"@streamr/dht": "100.0.0-testnet-three.6",
|
|
34
|
+
"@streamr/proto-rpc": "100.0.0-testnet-three.6",
|
|
35
|
+
"@streamr/protocol": "100.0.0-testnet-three.6",
|
|
36
|
+
"@streamr/test-utils": "100.0.0-testnet-three.6",
|
|
37
|
+
"@streamr/utils": "100.0.0-testnet-three.6",
|
|
38
38
|
"eventemitter3": "^5.0.0",
|
|
39
39
|
"lodash": "^4.17.21",
|
|
40
40
|
"uuid": "^9.0.1",
|
|
@@ -43,9 +43,9 @@
|
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
45
45
|
"@types/lodash": "^4.14.202",
|
|
46
|
-
"@types/uuid": "^9.0.
|
|
46
|
+
"@types/uuid": "^9.0.8",
|
|
47
47
|
"@types/yallist": "^4.0.1",
|
|
48
|
-
"commander": "^
|
|
48
|
+
"commander": "^12.0.0",
|
|
49
49
|
"expect": "^29.6.2",
|
|
50
50
|
"express": "^4.17.1",
|
|
51
51
|
"ts-essentials": "^9.4.1",
|
package/src/NetworkNode.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { StreamMessage, StreamPartID } from '@streamr/protocol'
|
|
2
2
|
import { DhtAddress, PeerDescriptor } from '@streamr/dht'
|
|
3
3
|
import { StreamMessageTranslator } from './logic/protocol-integration/stream-message/StreamMessageTranslator'
|
|
4
|
-
import { NetworkOptions, NetworkStack } from './NetworkStack'
|
|
4
|
+
import { NetworkOptions, NetworkStack, NodeInfo } from './NetworkStack'
|
|
5
5
|
import { EthereumAddress, Logger, MetricsContext } from '@streamr/utils'
|
|
6
|
-
import {
|
|
6
|
+
import { ProxyDirection } from './proto/packages/trackerless-network/protos/NetworkRpc'
|
|
7
7
|
import { pull } from 'lodash'
|
|
8
8
|
|
|
9
9
|
export const createNetworkNode = (opts: NetworkOptions): NetworkNode => {
|
|
@@ -120,7 +120,7 @@ export class NetworkNode {
|
|
|
120
120
|
return this.stack.getStreamrNode().getStreamParts()
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
-
async fetchNodeInfo(node: PeerDescriptor): Promise<
|
|
123
|
+
async fetchNodeInfo(node: PeerDescriptor): Promise<NodeInfo> {
|
|
124
124
|
return this.stack.fetchNodeInfo(node)
|
|
125
125
|
}
|
|
126
126
|
|
package/src/NetworkStack.ts
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
ConnectionManager,
|
|
3
|
+
DhtNode,
|
|
4
|
+
DhtNodeOptions,
|
|
5
|
+
ListeningRpcCommunicator,
|
|
6
|
+
PeerDescriptor,
|
|
7
|
+
areEqualPeerDescriptors
|
|
8
|
+
} from '@streamr/dht'
|
|
2
9
|
import { StreamrNode, StreamrNodeConfig } from './logic/StreamrNode'
|
|
3
10
|
import { Logger, MetricsContext, waitForCondition } from '@streamr/utils'
|
|
4
11
|
import { StreamID, StreamPartID, toStreamPartID } from '@streamr/protocol'
|
|
@@ -7,6 +14,7 @@ import { Layer0Node } from './logic/Layer0Node'
|
|
|
7
14
|
import { pull } from 'lodash'
|
|
8
15
|
import { NODE_INFO_RPC_SERVICE_ID, NodeInfoRpcLocal } from './logic/node-info/NodeInfoRpcLocal'
|
|
9
16
|
import { NodeInfoClient } from './logic/node-info/NodeInfoClient'
|
|
17
|
+
import { version as localVersion } from '../package.json'
|
|
10
18
|
|
|
11
19
|
export interface NetworkOptions {
|
|
12
20
|
layer0?: DhtNodeOptions
|
|
@@ -41,6 +49,8 @@ if (typeof window === 'object') {
|
|
|
41
49
|
})
|
|
42
50
|
}
|
|
43
51
|
|
|
52
|
+
export type NodeInfo = Required<NodeInfoResponse>
|
|
53
|
+
|
|
44
54
|
export class NetworkStack {
|
|
45
55
|
|
|
46
56
|
private layer0Node?: Layer0Node
|
|
@@ -142,8 +152,24 @@ export class NetworkStack {
|
|
|
142
152
|
return this.metricsContext
|
|
143
153
|
}
|
|
144
154
|
|
|
145
|
-
async fetchNodeInfo(node: PeerDescriptor): Promise<
|
|
146
|
-
|
|
155
|
+
async fetchNodeInfo(node: PeerDescriptor): Promise<NodeInfo> {
|
|
156
|
+
if (!areEqualPeerDescriptors(node, this.getLayer0Node().getLocalPeerDescriptor())) {
|
|
157
|
+
return this.nodeInfoClient!.getInfo(node)
|
|
158
|
+
} else {
|
|
159
|
+
return this.createNodeInfo()
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
createNodeInfo(): NodeInfo {
|
|
164
|
+
return {
|
|
165
|
+
peerDescriptor: this.getLayer0Node().getLocalPeerDescriptor(),
|
|
166
|
+
controlLayer: {
|
|
167
|
+
connections: this.getLayer0Node().getConnections(),
|
|
168
|
+
neighbors: this.getLayer0Node().getNeighbors()
|
|
169
|
+
},
|
|
170
|
+
streamPartitions: this.getStreamrNode().getNodeInfo(),
|
|
171
|
+
version: localVersion
|
|
172
|
+
}
|
|
147
173
|
}
|
|
148
174
|
|
|
149
175
|
getOptions(): NetworkOptions {
|
package/src/exports.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export { NetworkStack, NetworkOptions } from './NetworkStack'
|
|
1
|
+
export { NetworkStack, NetworkOptions, NodeInfo } from './NetworkStack'
|
|
2
2
|
export { NetworkNode, createNetworkNode } from './NetworkNode'
|
|
3
3
|
export { StreamrNodeConfig } from './logic/StreamrNode'
|
|
4
|
-
export { ProxyDirection
|
|
4
|
+
export { ProxyDirection } from './proto/packages/trackerless-network/protos/NetworkRpc'
|
|
5
5
|
export { streamPartIdToDataKey } from './logic/EntryPointDiscovery'
|
|
6
6
|
export {
|
|
7
7
|
convertStreamMessageToBytes,
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { DhtCallContext, PeerDescriptor } from '@streamr/dht'
|
|
2
|
-
import { NodeInfoResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc'
|
|
3
|
-
import { NodeInfoRpcRemote } from './NodeInfoRpcRemote'
|
|
4
2
|
import { RpcCommunicator } from '@streamr/proto-rpc'
|
|
3
|
+
import { NodeInfo } from '../../NetworkStack'
|
|
5
4
|
import { NodeInfoRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
|
|
5
|
+
import { NodeInfoRpcRemote } from './NodeInfoRpcRemote'
|
|
6
6
|
|
|
7
7
|
export class NodeInfoClient {
|
|
8
8
|
private readonly ownPeerDescriptor: PeerDescriptor
|
|
@@ -13,9 +13,11 @@ export class NodeInfoClient {
|
|
|
13
13
|
this.rpcCommunicator = rpcCommunicator
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
async getInfo(node: PeerDescriptor): Promise<
|
|
16
|
+
async getInfo(node: PeerDescriptor): Promise<NodeInfo> {
|
|
17
17
|
const remote = new NodeInfoRpcRemote(this.ownPeerDescriptor, node, this.rpcCommunicator, NodeInfoRpcClient)
|
|
18
|
-
|
|
18
|
+
// TODO remove casting when we validate NodeInfoResponse messages and therefore can annotate
|
|
19
|
+
// each of the field as required in the decorated type
|
|
20
|
+
return remote.getInfo() as unknown as NodeInfo
|
|
19
21
|
}
|
|
20
22
|
|
|
21
23
|
}
|
|
@@ -2,7 +2,6 @@ import { NodeInfoRequest, NodeInfoResponse } from '../../proto/packages/trackerl
|
|
|
2
2
|
import { INodeInfoRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server'
|
|
3
3
|
import { NetworkStack } from '../../NetworkStack'
|
|
4
4
|
import { ListeningRpcCommunicator } from '@streamr/dht'
|
|
5
|
-
import { version as localVersion } from '../../../package.json'
|
|
6
5
|
|
|
7
6
|
export const NODE_INFO_RPC_SERVICE_ID = 'system/node-info-rpc'
|
|
8
7
|
|
|
@@ -23,15 +22,7 @@ export class NodeInfoRpcLocal implements INodeInfoRpc {
|
|
|
23
22
|
}
|
|
24
23
|
|
|
25
24
|
async getInfo(): Promise<NodeInfoResponse> {
|
|
26
|
-
return
|
|
27
|
-
peerDescriptor: this.stack.getLayer0Node().getLocalPeerDescriptor(),
|
|
28
|
-
controlLayer: {
|
|
29
|
-
connections: this.stack.getLayer0Node().getConnections(),
|
|
30
|
-
neighbors: this.stack.getLayer0Node().getNeighbors()
|
|
31
|
-
},
|
|
32
|
-
streamPartitions: this.stack.getStreamrNode().getNodeInfo(),
|
|
33
|
-
version: localVersion
|
|
34
|
-
}
|
|
25
|
+
return this.stack.createNodeInfo()
|
|
35
26
|
}
|
|
36
27
|
|
|
37
28
|
}
|
|
@@ -98,12 +98,16 @@ describe('NetworkNode', () => {
|
|
|
98
98
|
await node2.join(STREAM_PART_ID)
|
|
99
99
|
const result1 = await node1.fetchNodeInfo(pd2)
|
|
100
100
|
const result2 = await node2.fetchNodeInfo(pd1)
|
|
101
|
+
const result3 = await node1.fetchNodeInfo(node1.getPeerDescriptor())
|
|
101
102
|
expect(result1.streamPartitions.length).toEqual(1)
|
|
102
103
|
expect(result2.streamPartitions.length).toEqual(1)
|
|
103
|
-
expect(
|
|
104
|
-
expect(
|
|
105
|
-
expect(
|
|
106
|
-
expect(
|
|
104
|
+
expect(result3.streamPartitions.length).toEqual(1)
|
|
105
|
+
expect(result1.controlLayer.connections.length).toEqual(1)
|
|
106
|
+
expect(result2.controlLayer.connections.length).toEqual(1)
|
|
107
|
+
expect(result3.controlLayer.connections.length).toEqual(1)
|
|
108
|
+
expect(result1.controlLayer.neighbors.length).toEqual(1)
|
|
109
|
+
expect(result2.controlLayer.neighbors.length).toEqual(1)
|
|
110
|
+
expect(result3.controlLayer.neighbors.length).toEqual(1)
|
|
107
111
|
})
|
|
108
112
|
|
|
109
113
|
})
|