@streamr/trackerless-network 101.1.0 → 101.1.1-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +6 -6
- package/dist/src/logic/NodeList.d.ts +1 -1
- package/dist/src/logic/NodeList.js +8 -5
- package/dist/src/logic/NodeList.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.d.ts +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.js +1 -1
- package/dist/src/logic/neighbor-discovery/Handshaker.js +8 -1
- package/dist/src/logic/neighbor-discovery/Handshaker.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborFinder.js +6 -1
- package/dist/src/logic/neighbor-discovery/NeighborFinder.js.map +1 -1
- package/package.json +6 -6
- package/src/logic/NodeList.ts +12 -5
- package/src/logic/neighbor-discovery/HandshakeRpcRemote.ts +1 -1
- package/src/logic/neighbor-discovery/Handshaker.ts +11 -1
- package/src/logic/neighbor-discovery/NeighborFinder.ts +6 -1
- package/test/unit/NodeList.test.ts +7 -1
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/trackerless-network",
|
|
3
|
-
"version": "101.1.0",
|
|
3
|
+
"version": "101.1.1-beta.0",
|
|
4
4
|
"description": "Minimal and extendable implementation of the Streamr Network node.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,10 +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.1.0",
|
|
34
|
-
"@streamr/proto-rpc": "101.1.0",
|
|
35
|
-
"@streamr/test-utils": "101.1.0",
|
|
36
|
-
"@streamr/utils": "101.1.0",
|
|
33
|
+
"@streamr/dht": "101.1.1-beta.0",
|
|
34
|
+
"@streamr/proto-rpc": "101.1.1-beta.0",
|
|
35
|
+
"@streamr/test-utils": "101.1.1-beta.0",
|
|
36
|
+
"@streamr/utils": "101.1.1-beta.0",
|
|
37
37
|
"eventemitter3": "^5.0.0",
|
|
38
38
|
"lodash": "^4.17.21",
|
|
39
39
|
"uuid": "^10.0.0",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@types/uuid": "^10.0.0",
|
|
46
46
|
"@types/yallist": "^4.0.1",
|
|
47
47
|
"expect": "^29.6.2",
|
|
48
|
-
"ts-essentials": "^10.0.
|
|
48
|
+
"ts-essentials": "^10.0.2",
|
|
49
49
|
"ts-node": "^10.9.2"
|
|
50
50
|
}
|
|
51
51
|
}
|
|
@@ -18,7 +18,7 @@ export declare class NodeList extends EventEmitter<Events> {
|
|
|
18
18
|
get(id: DhtAddress): ContentDeliveryRpcRemote | undefined;
|
|
19
19
|
size(exclude?: DhtAddress[]): number;
|
|
20
20
|
getRandom(exclude: DhtAddress[]): ContentDeliveryRpcRemote | undefined;
|
|
21
|
-
getFirst(exclude: DhtAddress[]): ContentDeliveryRpcRemote | undefined;
|
|
21
|
+
getFirst(exclude: DhtAddress[], wsOnly?: boolean): ContentDeliveryRpcRemote | undefined;
|
|
22
22
|
getFirstAndLast(exclude: DhtAddress[]): ContentDeliveryRpcRemote[];
|
|
23
23
|
getLast(exclude: DhtAddress[]): ContentDeliveryRpcRemote | undefined;
|
|
24
24
|
getAll(): ContentDeliveryRpcRemote[];
|
|
@@ -4,9 +4,12 @@ exports.NodeList = void 0;
|
|
|
4
4
|
const dht_1 = require("@streamr/dht");
|
|
5
5
|
const lodash_1 = require("lodash");
|
|
6
6
|
const eventemitter3_1 = require("eventemitter3");
|
|
7
|
-
const getValuesOfIncludedKeys = (nodes, exclude) => {
|
|
8
|
-
|
|
9
|
-
.filter(([
|
|
7
|
+
const getValuesOfIncludedKeys = (nodes, exclude, wsOnly = false) => {
|
|
8
|
+
const values = wsOnly
|
|
9
|
+
? Array.from(nodes.entries()).filter(([_, node]) => node.getPeerDescriptor().websocket !== undefined)
|
|
10
|
+
: Array.from(nodes.entries());
|
|
11
|
+
return values
|
|
12
|
+
.filter(([id]) => !exclude.includes(id))
|
|
10
13
|
.map(([_id, node]) => node);
|
|
11
14
|
};
|
|
12
15
|
// The items in the list are in the insertion order
|
|
@@ -60,8 +63,8 @@ class NodeList extends eventemitter3_1.EventEmitter {
|
|
|
60
63
|
getRandom(exclude) {
|
|
61
64
|
return (0, lodash_1.sample)(getValuesOfIncludedKeys(this.nodes, exclude));
|
|
62
65
|
}
|
|
63
|
-
getFirst(exclude) {
|
|
64
|
-
const included = getValuesOfIncludedKeys(this.nodes, exclude);
|
|
66
|
+
getFirst(exclude, wsOnly = false) {
|
|
67
|
+
const included = getValuesOfIncludedKeys(this.nodes, exclude, wsOnly);
|
|
65
68
|
return included[0];
|
|
66
69
|
}
|
|
67
70
|
getFirstAndLast(exclude) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeList.js","sourceRoot":"","sources":["../../../src/logic/NodeList.ts"],"names":[],"mappings":";;;AAAA,sCAAsE;AACtE,mCAA+B;AAE/B,iDAA4C;AAO5C,MAAM,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"NodeList.js","sourceRoot":"","sources":["../../../src/logic/NodeList.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ interface HandshakeResponse {
|
|
|
6
6
|
accepted: boolean;
|
|
7
7
|
interleaveTargetDescriptor?: PeerDescriptor;
|
|
8
8
|
}
|
|
9
|
-
export declare const INTERLEAVE_REQUEST_TIMEOUT =
|
|
9
|
+
export declare const INTERLEAVE_REQUEST_TIMEOUT = 10000;
|
|
10
10
|
export declare class HandshakeRpcRemote extends RpcRemote<HandshakeRpcClient> {
|
|
11
11
|
handshake(streamPartId: StreamPartID, neighborNodeIds: DhtAddress[], concurrentHandshakeNodeId?: DhtAddress, interleaveNodeId?: DhtAddress): Promise<HandshakeResponse>;
|
|
12
12
|
interleaveRequest(originatorDescriptor: PeerDescriptor): Promise<InterleaveResponse>;
|
|
@@ -5,7 +5,7 @@ const dht_1 = require("@streamr/dht");
|
|
|
5
5
|
const utils_1 = require("@streamr/utils");
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
7
|
const logger = new utils_1.Logger(module);
|
|
8
|
-
exports.INTERLEAVE_REQUEST_TIMEOUT =
|
|
8
|
+
exports.INTERLEAVE_REQUEST_TIMEOUT = 10000;
|
|
9
9
|
class HandshakeRpcRemote extends dht_1.RpcRemote {
|
|
10
10
|
async handshake(streamPartId, neighborNodeIds, concurrentHandshakeNodeId, interleaveNodeId) {
|
|
11
11
|
const request = {
|
|
@@ -48,7 +48,14 @@ class Handshaker {
|
|
|
48
48
|
}
|
|
49
49
|
selectParallelTargets(excludedIds) {
|
|
50
50
|
const neighbors = new Map();
|
|
51
|
-
//
|
|
51
|
+
// If the node has 0 neighbors find a node in the stream with a WS server to connect to for faster time to data.
|
|
52
|
+
if (this.options.neighbors.size() === 0) {
|
|
53
|
+
const wsNode = this.options.nearbyNodeView.getFirst([...excludedIds, ...Array.from(neighbors.keys())], true);
|
|
54
|
+
if (wsNode) {
|
|
55
|
+
neighbors.set((0, dht_1.getNodeIdFromPeerDescriptor)(wsNode.getPeerDescriptor()), wsNode);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
// Add the closest left and then right contacts from the ring if possible.
|
|
52
59
|
const left = this.options.leftNodeView.getFirst([...excludedIds, ...Array.from(neighbors.keys())]);
|
|
53
60
|
const right = this.options.rightNodeView.getFirst([...excludedIds, ...Array.from(neighbors.keys())]);
|
|
54
61
|
if (left) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/Handshaker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/Handshaker.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,12 @@ class NeighborFinder {
|
|
|
40
40
|
}
|
|
41
41
|
this.running = true;
|
|
42
42
|
// TODO should we catch possible promise rejection?
|
|
43
|
-
(0, utils_1.setAbortableTimeout)(() =>
|
|
43
|
+
(0, utils_1.setAbortableTimeout)(async () => {
|
|
44
|
+
await Promise.all([
|
|
45
|
+
this.findNeighbors(excluded),
|
|
46
|
+
this.findNeighbors(excluded)
|
|
47
|
+
]);
|
|
48
|
+
}, INITIAL_WAIT, this.abortController.signal);
|
|
44
49
|
}
|
|
45
50
|
stop() {
|
|
46
51
|
if (!this.running) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAcpD,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAA;AAEpB,MAAa,cAAc;IACN,eAAe,CAAiB;IAChC,OAAO,CAA6B;IAC7C,OAAO,GAAG,KAAK,CAAA;IAEvB,YAAY,OAAoC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,OAAM;QACV,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAChE,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;YAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE;YACvC,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE;YACrC,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE;YACtC,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE;SAC1C,CAAC,CAAC,IAAI,CAAA;QACP,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;YACnG,mDAAmD;YACnD,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QACrG,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACxB,CAAC;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,WAAyB,EAAE;QAC7B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAM;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,mDAAmD;QACnD,IAAA,2BAAmB,EAAC,
|
|
1
|
+
{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAcpD,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAA;AAEpB,MAAa,cAAc;IACN,eAAe,CAAiB;IAChC,OAAO,CAA6B;IAC7C,OAAO,GAAG,KAAK,CAAA;IAEvB,YAAY,OAAoC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,OAAM;QACV,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAChE,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;YAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE;YACvC,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE;YACrC,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE;YACtC,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE;SAC1C,CAAC,CAAC,IAAI,CAAA;QACP,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;YACnG,mDAAmD;YACnD,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QACrG,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACxB,CAAC;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,WAAyB,EAAE;QAC7B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAM;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,mDAAmD;QACnD,IAAA,2BAAmB,EAAC,KAAK,IAAI,EAAE;YAC3B,MAAM,OAAO,CAAC,GAAG,CAAC;gBACd,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;gBAC5B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;aAC/B,CAAC,CAAA;QACN,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,OAAM;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AAtDD,wCAsDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/trackerless-network",
|
|
3
|
-
"version": "101.1.0",
|
|
3
|
+
"version": "101.1.1-beta.0",
|
|
4
4
|
"description": "Minimal and extendable implementation of the Streamr Network node.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,10 +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.1.0",
|
|
34
|
-
"@streamr/proto-rpc": "101.1.0",
|
|
35
|
-
"@streamr/test-utils": "101.1.0",
|
|
36
|
-
"@streamr/utils": "101.1.0",
|
|
33
|
+
"@streamr/dht": "101.1.1-beta.0",
|
|
34
|
+
"@streamr/proto-rpc": "101.1.1-beta.0",
|
|
35
|
+
"@streamr/test-utils": "101.1.1-beta.0",
|
|
36
|
+
"@streamr/utils": "101.1.1-beta.0",
|
|
37
37
|
"eventemitter3": "^5.0.0",
|
|
38
38
|
"lodash": "^4.17.21",
|
|
39
39
|
"uuid": "^10.0.0",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@types/uuid": "^10.0.0",
|
|
46
46
|
"@types/yallist": "^4.0.1",
|
|
47
47
|
"expect": "^29.6.2",
|
|
48
|
-
"ts-essentials": "^10.0.
|
|
48
|
+
"ts-essentials": "^10.0.2",
|
|
49
49
|
"ts-node": "^10.9.2"
|
|
50
50
|
}
|
|
51
51
|
}
|
package/src/logic/NodeList.ts
CHANGED
|
@@ -8,9 +8,16 @@ export interface Events {
|
|
|
8
8
|
nodeRemoved: (id: DhtAddress, remote: ContentDeliveryRpcRemote) => void
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
const getValuesOfIncludedKeys = (
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
const getValuesOfIncludedKeys = (
|
|
12
|
+
nodes: Map<DhtAddress, ContentDeliveryRpcRemote>,
|
|
13
|
+
exclude: DhtAddress[],
|
|
14
|
+
wsOnly = false
|
|
15
|
+
): ContentDeliveryRpcRemote[] => {
|
|
16
|
+
const values = wsOnly
|
|
17
|
+
? Array.from(nodes.entries()).filter(([_, node]) => node.getPeerDescriptor().websocket !== undefined)
|
|
18
|
+
: Array.from(nodes.entries())
|
|
19
|
+
return values
|
|
20
|
+
.filter(([id]) => !exclude.includes(id))
|
|
14
21
|
.map(([_id, node]) => node)
|
|
15
22
|
}
|
|
16
23
|
|
|
@@ -77,8 +84,8 @@ export class NodeList extends EventEmitter<Events> {
|
|
|
77
84
|
return sample(getValuesOfIncludedKeys(this.nodes, exclude))
|
|
78
85
|
}
|
|
79
86
|
|
|
80
|
-
getFirst(exclude: DhtAddress[]): ContentDeliveryRpcRemote | undefined {
|
|
81
|
-
const included = getValuesOfIncludedKeys(this.nodes, exclude)
|
|
87
|
+
getFirst(exclude: DhtAddress[], wsOnly = false): ContentDeliveryRpcRemote | undefined {
|
|
88
|
+
const included = getValuesOfIncludedKeys(this.nodes, exclude, wsOnly)
|
|
82
89
|
return included[0]
|
|
83
90
|
}
|
|
84
91
|
|
|
@@ -11,7 +11,7 @@ interface HandshakeResponse {
|
|
|
11
11
|
interleaveTargetDescriptor?: PeerDescriptor
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
export const INTERLEAVE_REQUEST_TIMEOUT =
|
|
14
|
+
export const INTERLEAVE_REQUEST_TIMEOUT = 10000
|
|
15
15
|
|
|
16
16
|
export class HandshakeRpcRemote extends RpcRemote<HandshakeRpcClient> {
|
|
17
17
|
|
|
@@ -76,7 +76,17 @@ export class Handshaker {
|
|
|
76
76
|
|
|
77
77
|
private selectParallelTargets(excludedIds: DhtAddress[]): HandshakeRpcRemote[] {
|
|
78
78
|
const neighbors: Map<DhtAddress, ContentDeliveryRpcRemote> = new Map()
|
|
79
|
-
//
|
|
79
|
+
// If the node has 0 neighbors find a node in the stream with a WS server to connect to for faster time to data.
|
|
80
|
+
if (this.options.neighbors.size() === 0) {
|
|
81
|
+
const wsNode = this.options.nearbyNodeView.getFirst(
|
|
82
|
+
[...excludedIds, ...Array.from(neighbors.keys())] as DhtAddress[],
|
|
83
|
+
true
|
|
84
|
+
)
|
|
85
|
+
if (wsNode) {
|
|
86
|
+
neighbors.set(getNodeIdFromPeerDescriptor(wsNode.getPeerDescriptor()), wsNode)
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
// Add the closest left and then right contacts from the ring if possible.
|
|
80
90
|
const left = this.options.leftNodeView.getFirst([...excludedIds, ...Array.from(neighbors.keys())] as DhtAddress[])
|
|
81
91
|
const right = this.options.rightNodeView.getFirst([...excludedIds, ...Array.from(neighbors.keys())] as DhtAddress[])
|
|
82
92
|
if (left) {
|
|
@@ -54,7 +54,12 @@ export class NeighborFinder {
|
|
|
54
54
|
}
|
|
55
55
|
this.running = true
|
|
56
56
|
// TODO should we catch possible promise rejection?
|
|
57
|
-
setAbortableTimeout(() =>
|
|
57
|
+
setAbortableTimeout(async () => {
|
|
58
|
+
await Promise.all([
|
|
59
|
+
this.findNeighbors(excluded),
|
|
60
|
+
this.findNeighbors(excluded)
|
|
61
|
+
])
|
|
62
|
+
}, INITIAL_WAIT, this.abortController.signal)
|
|
58
63
|
}
|
|
59
64
|
|
|
60
65
|
stop(): void {
|
|
@@ -13,7 +13,7 @@ import { NodeList } from '../../src/logic/NodeList'
|
|
|
13
13
|
import { formStreamPartContentDeliveryServiceId } from '../../src/logic/formStreamPartDeliveryServiceId'
|
|
14
14
|
import { ContentDeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
|
|
15
15
|
import { MockTransport } from '../utils/mock/MockTransport'
|
|
16
|
-
import { createMockPeerDescriptor } from '../utils/utils'
|
|
16
|
+
import { createMockContentDeliveryRpcRemote, createMockPeerDescriptor } from '../utils/utils'
|
|
17
17
|
|
|
18
18
|
const streamPartId = StreamPartIDUtils.parse('stream#0')
|
|
19
19
|
|
|
@@ -87,6 +87,12 @@ describe('NodeList', () => {
|
|
|
87
87
|
.toEqual(getDhtAddressFromRaw(new Uint8Array([1, 1, 2])))
|
|
88
88
|
})
|
|
89
89
|
|
|
90
|
+
it('getFirst wsOnly', () => {
|
|
91
|
+
nodeList.add(createMockContentDeliveryRpcRemote(createMockPeerDescriptor({ websocket: { port: 111, host: '', tls: false } })))
|
|
92
|
+
const closest = nodeList.getFirst([], true)
|
|
93
|
+
expect(closest).toBeDefined()
|
|
94
|
+
})
|
|
95
|
+
|
|
90
96
|
it('getLast', () => {
|
|
91
97
|
const closest = nodeList.getLast([])
|
|
92
98
|
expect(getNodeIdFromPeerDescriptor(closest!.getPeerDescriptor()))
|