@streamr/trackerless-network 100.0.0-testnet-one.4 → 100.0.0-testnet-two.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/package.json +7 -7
- package/dist/src/NetworkStack.d.ts +1 -5
- package/dist/src/NetworkStack.js +1 -3
- package/dist/src/NetworkStack.js.map +1 -1
- package/dist/src/logic/DeliveryRpcLocal.d.ts +1 -1
- package/dist/src/logic/DeliveryRpcLocal.js +3 -3
- package/dist/src/logic/DeliveryRpcLocal.js.map +1 -1
- package/dist/src/logic/DeliveryRpcRemote.d.ts +3 -3
- package/dist/src/logic/DeliveryRpcRemote.js +3 -2
- package/dist/src/logic/DeliveryRpcRemote.js.map +1 -1
- package/dist/src/logic/EntryPointDiscovery.d.ts +3 -0
- package/dist/src/logic/EntryPointDiscovery.js +11 -5
- package/dist/src/logic/EntryPointDiscovery.js.map +1 -1
- package/dist/src/logic/RandomGraphNode.d.ts +10 -8
- package/dist/src/logic/RandomGraphNode.js +23 -17
- package/dist/src/logic/RandomGraphNode.js.map +1 -1
- package/dist/src/logic/StreamrNode.js +13 -4
- package/dist/src/logic/StreamrNode.js.map +1 -1
- package/dist/src/logic/formStreamPartDeliveryServiceId.d.ts +2 -1
- package/dist/src/logic/formStreamPartDeliveryServiceId.js.map +1 -1
- package/dist/src/logic/inspect/Inspector.d.ts +5 -11
- package/dist/src/logic/inspect/Inspector.js +2 -3
- package/dist/src/logic/inspect/Inspector.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.d.ts +3 -3
- package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.js +39 -13
- package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.d.ts +5 -3
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.js +18 -8
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/Handshaker.d.ts +1 -6
- package/dist/src/logic/neighbor-discovery/Handshaker.js +6 -6
- package/dist/src/logic/neighbor-discovery/Handshaker.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborFinder.d.ts +1 -6
- package/dist/src/logic/neighbor-discovery/NeighborFinder.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.d.ts +3 -8
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js +1 -3
- 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 -2
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.d.ts +2 -2
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.js.map +1 -1
- package/dist/src/logic/proxy/ProxyClient.d.ts +4 -1
- package/dist/src/logic/proxy/ProxyClient.js +7 -6
- package/dist/src/logic/proxy/ProxyClient.js.map +1 -1
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js +2 -3
- 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.map +1 -1
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.js +2 -2
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.js.map +1 -1
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcRemote.d.ts +2 -2
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcRemote.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +21 -22
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +18 -18
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +49 -65
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +43 -58
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +11 -12
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.client.d.ts +6 -5
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.client.js +2 -2
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.client.js.map +1 -1
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.d.ts +26 -10
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.js +21 -9
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.js.map +1 -1
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.server.d.ts +4 -3
- package/dist/test/benchmark/first-message.js +4 -6
- package/dist/test/benchmark/first-message.js.map +1 -1
- package/dist/test/utils/utils.d.ts +1 -1
- package/dist/test/utils/utils.js +8 -7
- package/dist/test/utils/utils.js.map +1 -1
- package/package.json +7 -7
- package/protos/NetworkRpc.proto +8 -4
- package/src/NetworkStack.ts +1 -7
- package/src/logic/DeliveryRpcLocal.ts +4 -4
- package/src/logic/DeliveryRpcRemote.ts +5 -4
- package/src/logic/EntryPointDiscovery.ts +10 -6
- package/src/logic/RandomGraphNode.ts +38 -25
- package/src/logic/StreamrNode.ts +22 -5
- package/src/logic/formStreamPartDeliveryServiceId.ts +2 -1
- package/src/logic/inspect/Inspector.ts +15 -16
- package/src/logic/neighbor-discovery/HandshakeRpcLocal.ts +46 -15
- package/src/logic/neighbor-discovery/HandshakeRpcRemote.ts +21 -10
- package/src/logic/neighbor-discovery/Handshaker.ts +15 -24
- package/src/logic/neighbor-discovery/NeighborFinder.ts +1 -7
- package/src/logic/neighbor-discovery/NeighborUpdateManager.ts +10 -12
- package/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts +4 -4
- package/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts +2 -2
- package/src/logic/proxy/ProxyClient.ts +19 -7
- package/src/logic/proxy/ProxyConnectionRpcLocal.ts +3 -3
- package/src/logic/proxy/ProxyConnectionRpcRemote.ts +3 -3
- package/src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts +3 -2
- package/src/logic/temporary-connection/TemporaryConnectionRpcRemote.ts +2 -2
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +31 -32
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +11 -12
- package/src/proto/packages/dht/protos/DhtRpc.ts +67 -90
- package/src/proto/packages/trackerless-network/protos/NetworkRpc.client.ts +7 -6
- package/src/proto/packages/trackerless-network/protos/NetworkRpc.server.ts +4 -3
- package/src/proto/packages/trackerless-network/protos/NetworkRpc.ts +36 -15
- package/test/benchmark/first-message.ts +8 -6
- package/test/end-to-end/random-graph-with-real-connections.test.ts +10 -5
- package/test/end-to-end/webrtc-full-node-network.test.ts +1 -1
- package/test/end-to-end/websocket-full-node-network.test.ts +2 -2
- package/test/integration/DeliveryRpcRemote.test.ts +3 -3
- package/test/integration/HandshakeRpcRemote.test.ts +2 -4
- package/test/integration/Handshakes.test.ts +8 -7
- package/test/integration/Inspect.test.ts +0 -2
- package/test/integration/NeighborUpdateRpcRemote.test.ts +2 -2
- package/test/integration/NetworkNode.test.ts +0 -2
- package/test/integration/NetworkRpc.test.ts +0 -3
- package/test/integration/RandomGraphNode-Layer1Node-Latencies.test.ts +4 -4
- package/test/integration/RandomGraphNode-Layer1Node.test.ts +4 -5
- package/test/integration/stream-without-default-entrypoints.test.ts +4 -7
- package/test/integration/streamEntryPointReplacing.test.ts +94 -0
- package/test/unit/DeliveryRpcLocal.test.ts +2 -1
- package/test/unit/EntrypointDiscovery.test.ts +5 -2
- package/test/unit/HandshakeRpcLocal.test.ts +47 -9
- package/test/unit/NodeList.test.ts +10 -12
- package/test/unit/ProxyConnectionRpcRemote.test.ts +18 -10
- package/test/unit/RandomGraphNode.test.ts +6 -4
- package/test/utils/mock/MockHandshaker.ts +3 -2
- package/test/utils/mock/MockNeighborFinder.ts +3 -2
- package/test/utils/mock/MockNeighborUpdateManager.ts +3 -2
- package/test/utils/utils.ts +16 -8
|
@@ -11,9 +11,8 @@ import { IceCandidate } from "./DhtRpc";
|
|
|
11
11
|
import { RtcAnswer } from "./DhtRpc";
|
|
12
12
|
import { RtcOffer } from "./DhtRpc";
|
|
13
13
|
import { WebrtcConnectionRequest } from "./DhtRpc";
|
|
14
|
-
import { WebsocketConnectionResponse } from "./DhtRpc";
|
|
15
14
|
import { WebsocketConnectionRequest } from "./DhtRpc";
|
|
16
|
-
import {
|
|
15
|
+
import { RecursiveOperationResponse } from "./DhtRpc";
|
|
17
16
|
import { ReplicateDataRequest } from "./DhtRpc";
|
|
18
17
|
import { StoreDataResponse } from "./DhtRpc";
|
|
19
18
|
import { StoreDataRequest } from "./DhtRpc";
|
|
@@ -57,13 +56,13 @@ export interface IRouterRpc<T = ServerCallContext> {
|
|
|
57
56
|
forwardMessage(request: RouteMessageWrapper, context: T): Promise<RouteMessageAck>;
|
|
58
57
|
}
|
|
59
58
|
/**
|
|
60
|
-
* @generated from protobuf service dht.
|
|
59
|
+
* @generated from protobuf service dht.RecursiveOperationRpc
|
|
61
60
|
*/
|
|
62
|
-
export interface
|
|
61
|
+
export interface IRecursiveOperationRpc<T = ServerCallContext> {
|
|
63
62
|
/**
|
|
64
|
-
* @generated from protobuf rpc:
|
|
63
|
+
* @generated from protobuf rpc: routeRequest(dht.RouteMessageWrapper) returns (dht.RouteMessageAck);
|
|
65
64
|
*/
|
|
66
|
-
|
|
65
|
+
routeRequest(request: RouteMessageWrapper, context: T): Promise<RouteMessageAck>;
|
|
67
66
|
}
|
|
68
67
|
/**
|
|
69
68
|
* @generated from protobuf service dht.StoreRpc
|
|
@@ -79,22 +78,22 @@ export interface IStoreRpc<T = ServerCallContext> {
|
|
|
79
78
|
replicateData(request: ReplicateDataRequest, context: T): Promise<Empty>;
|
|
80
79
|
}
|
|
81
80
|
/**
|
|
82
|
-
* @generated from protobuf service dht.
|
|
81
|
+
* @generated from protobuf service dht.RecursiveOperationSessionRpc
|
|
83
82
|
*/
|
|
84
|
-
export interface
|
|
83
|
+
export interface IRecursiveOperationSessionRpc<T = ServerCallContext> {
|
|
85
84
|
/**
|
|
86
|
-
* @generated from protobuf rpc:
|
|
85
|
+
* @generated from protobuf rpc: sendResponse(dht.RecursiveOperationResponse) returns (google.protobuf.Empty);
|
|
87
86
|
*/
|
|
88
|
-
|
|
87
|
+
sendResponse(request: RecursiveOperationResponse, context: T): Promise<Empty>;
|
|
89
88
|
}
|
|
90
89
|
/**
|
|
91
90
|
* @generated from protobuf service dht.WebsocketConnectorRpc
|
|
92
91
|
*/
|
|
93
92
|
export interface IWebsocketConnectorRpc<T = ServerCallContext> {
|
|
94
93
|
/**
|
|
95
|
-
* @generated from protobuf rpc: requestConnection(dht.WebsocketConnectionRequest) returns (
|
|
94
|
+
* @generated from protobuf rpc: requestConnection(dht.WebsocketConnectionRequest) returns (google.protobuf.Empty);
|
|
96
95
|
*/
|
|
97
|
-
requestConnection(request: WebsocketConnectionRequest, context: T): Promise<
|
|
96
|
+
requestConnection(request: WebsocketConnectionRequest, context: T): Promise<Empty>;
|
|
98
97
|
}
|
|
99
98
|
/**
|
|
100
99
|
* @generated from protobuf service dht.WebrtcConnectorRpc
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { TemporaryConnectionResponse } from "./NetworkRpc";
|
|
2
2
|
import type { TemporaryConnectionRequest } from "./NetworkRpc";
|
|
3
3
|
import type { NeighborUpdate } from "./NetworkRpc";
|
|
4
|
-
import type {
|
|
4
|
+
import type { InterleaveResponse } from "./NetworkRpc";
|
|
5
|
+
import type { InterleaveRequest } from "./NetworkRpc";
|
|
5
6
|
import type { StreamPartHandshakeResponse } from "./NetworkRpc";
|
|
6
7
|
import type { StreamPartHandshakeRequest } from "./NetworkRpc";
|
|
7
8
|
import type { ProxyConnectionResponse } from "./NetworkRpc";
|
|
@@ -80,9 +81,9 @@ export interface IHandshakeRpcClient {
|
|
|
80
81
|
*/
|
|
81
82
|
handshake(input: StreamPartHandshakeRequest, options?: RpcOptions): UnaryCall<StreamPartHandshakeRequest, StreamPartHandshakeResponse>;
|
|
82
83
|
/**
|
|
83
|
-
* @generated from protobuf rpc:
|
|
84
|
+
* @generated from protobuf rpc: interleaveRequest(InterleaveRequest) returns (InterleaveResponse);
|
|
84
85
|
*/
|
|
85
|
-
|
|
86
|
+
interleaveRequest(input: InterleaveRequest, options?: RpcOptions): UnaryCall<InterleaveRequest, InterleaveResponse>;
|
|
86
87
|
}
|
|
87
88
|
/**
|
|
88
89
|
* @generated from protobuf service HandshakeRpc
|
|
@@ -100,9 +101,9 @@ export declare class HandshakeRpcClient implements IHandshakeRpcClient, ServiceI
|
|
|
100
101
|
*/
|
|
101
102
|
handshake(input: StreamPartHandshakeRequest, options?: RpcOptions): UnaryCall<StreamPartHandshakeRequest, StreamPartHandshakeResponse>;
|
|
102
103
|
/**
|
|
103
|
-
* @generated from protobuf rpc:
|
|
104
|
+
* @generated from protobuf rpc: interleaveRequest(InterleaveRequest) returns (InterleaveResponse);
|
|
104
105
|
*/
|
|
105
|
-
|
|
106
|
+
interleaveRequest(input: InterleaveRequest, options?: RpcOptions): UnaryCall<InterleaveRequest, InterleaveResponse>;
|
|
106
107
|
}
|
|
107
108
|
/**
|
|
108
109
|
* @generated from protobuf service NeighborUpdateRpc
|
|
@@ -73,9 +73,9 @@ class HandshakeRpcClient {
|
|
|
73
73
|
return (0, runtime_rpc_1.stackIntercept)("unary", this._transport, method, opt, input);
|
|
74
74
|
}
|
|
75
75
|
/**
|
|
76
|
-
* @generated from protobuf rpc:
|
|
76
|
+
* @generated from protobuf rpc: interleaveRequest(InterleaveRequest) returns (InterleaveResponse);
|
|
77
77
|
*/
|
|
78
|
-
|
|
78
|
+
interleaveRequest(input, options) {
|
|
79
79
|
const method = this.methods[1], opt = this._transport.mergeOptions(options);
|
|
80
80
|
return (0, runtime_rpc_1.stackIntercept)("unary", this._transport, method, opt, input);
|
|
81
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkRpc.client.js","sourceRoot":"","sources":["../../../../../../src/proto/packages/trackerless-network/protos/NetworkRpc.client.ts"],"names":[],"mappings":";;;AAAA,uGAAuG;AACvG,uGAAuG;AACvG,iBAAiB;AACjB,6CAAsD;AAGtD,6CAAiD;AAEjD,6CAA4C;
|
|
1
|
+
{"version":3,"file":"NetworkRpc.client.js","sourceRoot":"","sources":["../../../../../../src/proto/packages/trackerless-network/protos/NetworkRpc.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -180,20 +180,25 @@ export interface StreamPartHandshakeResponse {
|
|
|
180
180
|
interleaveTargetDescriptor?: PeerDescriptor;
|
|
181
181
|
}
|
|
182
182
|
/**
|
|
183
|
-
* @generated from protobuf message
|
|
183
|
+
* @generated from protobuf message InterleaveRequest
|
|
184
184
|
*/
|
|
185
|
-
export interface
|
|
186
|
-
/**
|
|
187
|
-
* @generated from protobuf field: string streamPartId = 1;
|
|
188
|
-
*/
|
|
189
|
-
streamPartId: string;
|
|
185
|
+
export interface InterleaveRequest {
|
|
190
186
|
/**
|
|
191
187
|
* this is a required field but in generated NetworkRpc.ts it is incorrectly annotated as optional (NET-1082)
|
|
192
188
|
*
|
|
193
|
-
* @generated from protobuf field: dht.PeerDescriptor interleaveTargetDescriptor =
|
|
189
|
+
* @generated from protobuf field: dht.PeerDescriptor interleaveTargetDescriptor = 1;
|
|
194
190
|
*/
|
|
195
191
|
interleaveTargetDescriptor?: PeerDescriptor;
|
|
196
192
|
}
|
|
193
|
+
/**
|
|
194
|
+
* @generated from protobuf message InterleaveResponse
|
|
195
|
+
*/
|
|
196
|
+
export interface InterleaveResponse {
|
|
197
|
+
/**
|
|
198
|
+
* @generated from protobuf field: bool accepted = 1;
|
|
199
|
+
*/
|
|
200
|
+
accepted: boolean;
|
|
201
|
+
}
|
|
197
202
|
/**
|
|
198
203
|
* @generated from protobuf message LeaveStreamPartNotice
|
|
199
204
|
*/
|
|
@@ -202,6 +207,10 @@ export interface LeaveStreamPartNotice {
|
|
|
202
207
|
* @generated from protobuf field: string streamPartId = 1;
|
|
203
208
|
*/
|
|
204
209
|
streamPartId: string;
|
|
210
|
+
/**
|
|
211
|
+
* @generated from protobuf field: bool isEntryPoint = 2;
|
|
212
|
+
*/
|
|
213
|
+
isEntryPoint: boolean;
|
|
205
214
|
}
|
|
206
215
|
/**
|
|
207
216
|
* @generated from protobuf message NeighborUpdate
|
|
@@ -368,13 +377,20 @@ declare class StreamPartHandshakeResponse$Type extends MessageType<StreamPartHan
|
|
|
368
377
|
* @generated MessageType for protobuf message StreamPartHandshakeResponse
|
|
369
378
|
*/
|
|
370
379
|
export declare const StreamPartHandshakeResponse: StreamPartHandshakeResponse$Type;
|
|
371
|
-
declare class
|
|
380
|
+
declare class InterleaveRequest$Type extends MessageType<InterleaveRequest> {
|
|
381
|
+
constructor();
|
|
382
|
+
}
|
|
383
|
+
/**
|
|
384
|
+
* @generated MessageType for protobuf message InterleaveRequest
|
|
385
|
+
*/
|
|
386
|
+
export declare const InterleaveRequest: InterleaveRequest$Type;
|
|
387
|
+
declare class InterleaveResponse$Type extends MessageType<InterleaveResponse> {
|
|
372
388
|
constructor();
|
|
373
389
|
}
|
|
374
390
|
/**
|
|
375
|
-
* @generated MessageType for protobuf message
|
|
391
|
+
* @generated MessageType for protobuf message InterleaveResponse
|
|
376
392
|
*/
|
|
377
|
-
export declare const
|
|
393
|
+
export declare const InterleaveResponse: InterleaveResponse$Type;
|
|
378
394
|
declare class LeaveStreamPartNotice$Type extends MessageType<LeaveStreamPartNotice> {
|
|
379
395
|
constructor();
|
|
380
396
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TemporaryConnectionRpc = exports.NeighborUpdateRpc = exports.HandshakeRpc = exports.ProxyConnectionRpc = exports.DeliveryRpc = exports.TemporaryConnectionResponse = exports.TemporaryConnectionRequest = exports.ProxyConnectionResponse = exports.ProxyConnectionRequest = exports.NeighborUpdate = exports.LeaveStreamPartNotice = exports.
|
|
3
|
+
exports.TemporaryConnectionRpc = exports.NeighborUpdateRpc = exports.HandshakeRpc = exports.ProxyConnectionRpc = exports.DeliveryRpc = exports.TemporaryConnectionResponse = exports.TemporaryConnectionRequest = exports.ProxyConnectionResponse = exports.ProxyConnectionRequest = exports.NeighborUpdate = exports.LeaveStreamPartNotice = exports.InterleaveResponse = exports.InterleaveRequest = exports.StreamPartHandshakeResponse = exports.StreamPartHandshakeRequest = exports.GroupKey = exports.GroupKeyResponse = exports.GroupKeyRequest = exports.StreamMessage = exports.MessageRef = exports.MessageID = exports.ProxyDirection = exports.EncryptionType = exports.ContentType = exports.StreamMessageType = void 0;
|
|
4
4
|
// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
|
|
5
5
|
// @generated from protobuf file "packages/trackerless-network/protos/NetworkRpc.proto" (syntax proto3)
|
|
6
6
|
// tslint:disable
|
|
@@ -191,23 +191,35 @@ class StreamPartHandshakeResponse$Type extends runtime_1.MessageType {
|
|
|
191
191
|
*/
|
|
192
192
|
exports.StreamPartHandshakeResponse = new StreamPartHandshakeResponse$Type();
|
|
193
193
|
// @generated message type with reflection information, may provide speed optimized methods
|
|
194
|
-
class
|
|
194
|
+
class InterleaveRequest$Type extends runtime_1.MessageType {
|
|
195
195
|
constructor() {
|
|
196
|
-
super("
|
|
197
|
-
{ no: 1, name: "
|
|
198
|
-
|
|
196
|
+
super("InterleaveRequest", [
|
|
197
|
+
{ no: 1, name: "interleaveTargetDescriptor", kind: "message", T: () => DhtRpc_1.PeerDescriptor }
|
|
198
|
+
]);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
/**
|
|
202
|
+
* @generated MessageType for protobuf message InterleaveRequest
|
|
203
|
+
*/
|
|
204
|
+
exports.InterleaveRequest = new InterleaveRequest$Type();
|
|
205
|
+
// @generated message type with reflection information, may provide speed optimized methods
|
|
206
|
+
class InterleaveResponse$Type extends runtime_1.MessageType {
|
|
207
|
+
constructor() {
|
|
208
|
+
super("InterleaveResponse", [
|
|
209
|
+
{ no: 1, name: "accepted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
|
|
199
210
|
]);
|
|
200
211
|
}
|
|
201
212
|
}
|
|
202
213
|
/**
|
|
203
|
-
* @generated MessageType for protobuf message
|
|
214
|
+
* @generated MessageType for protobuf message InterleaveResponse
|
|
204
215
|
*/
|
|
205
|
-
exports.
|
|
216
|
+
exports.InterleaveResponse = new InterleaveResponse$Type();
|
|
206
217
|
// @generated message type with reflection information, may provide speed optimized methods
|
|
207
218
|
class LeaveStreamPartNotice$Type extends runtime_1.MessageType {
|
|
208
219
|
constructor() {
|
|
209
220
|
super("LeaveStreamPartNotice", [
|
|
210
|
-
{ no: 1, name: "streamPartId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
|
|
221
|
+
{ no: 1, name: "streamPartId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
|
|
222
|
+
{ no: 2, name: "isEntryPoint", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
|
|
211
223
|
]);
|
|
212
224
|
}
|
|
213
225
|
}
|
|
@@ -294,7 +306,7 @@ exports.ProxyConnectionRpc = new runtime_rpc_1.ServiceType("ProxyConnectionRpc",
|
|
|
294
306
|
*/
|
|
295
307
|
exports.HandshakeRpc = new runtime_rpc_1.ServiceType("HandshakeRpc", [
|
|
296
308
|
{ name: "handshake", options: {}, I: exports.StreamPartHandshakeRequest, O: exports.StreamPartHandshakeResponse },
|
|
297
|
-
{ name: "
|
|
309
|
+
{ name: "interleaveRequest", options: {}, I: exports.InterleaveRequest, O: exports.InterleaveResponse }
|
|
298
310
|
]);
|
|
299
311
|
/**
|
|
300
312
|
* @generated ServiceType for protobuf service NeighborUpdateRpc
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkRpc.js","sourceRoot":"","sources":["../../../../../../src/proto/packages/trackerless-network/protos/NetworkRpc.ts"],"names":[],"mappings":";;;AAAA,uGAAuG;AACvG,uGAAuG;AACvG,iBAAiB;AACjB,0DAAuD;AACvD,0DAAuD;AACvD,kDAAmD;AACnD,oDAAyD;
|
|
1
|
+
{"version":3,"file":"NetworkRpc.js","sourceRoot":"","sources":["../../../../../../src/proto/packages/trackerless-network/protos/NetworkRpc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { TemporaryConnectionResponse } from "./NetworkRpc";
|
|
2
2
|
import { TemporaryConnectionRequest } from "./NetworkRpc";
|
|
3
3
|
import { NeighborUpdate } from "./NetworkRpc";
|
|
4
|
-
import {
|
|
4
|
+
import { InterleaveResponse } from "./NetworkRpc";
|
|
5
|
+
import { InterleaveRequest } from "./NetworkRpc";
|
|
5
6
|
import { StreamPartHandshakeResponse } from "./NetworkRpc";
|
|
6
7
|
import { StreamPartHandshakeRequest } from "./NetworkRpc";
|
|
7
8
|
import { ProxyConnectionResponse } from "./NetworkRpc";
|
|
@@ -41,9 +42,9 @@ export interface IHandshakeRpc<T = ServerCallContext> {
|
|
|
41
42
|
*/
|
|
42
43
|
handshake(request: StreamPartHandshakeRequest, context: T): Promise<StreamPartHandshakeResponse>;
|
|
43
44
|
/**
|
|
44
|
-
* @generated from protobuf rpc:
|
|
45
|
+
* @generated from protobuf rpc: interleaveRequest(InterleaveRequest) returns (InterleaveResponse);
|
|
45
46
|
*/
|
|
46
|
-
|
|
47
|
+
interleaveRequest(request: InterleaveRequest, context: T): Promise<InterleaveResponse>;
|
|
47
48
|
}
|
|
48
49
|
/**
|
|
49
50
|
* @generated from protobuf service NeighborUpdateRpc
|
|
@@ -28,7 +28,7 @@ const prepareLayer0 = async () => {
|
|
|
28
28
|
region: (0, dht_1.getRandomRegion)()
|
|
29
29
|
});
|
|
30
30
|
layer0Ep = peerDescriptor;
|
|
31
|
-
const entryPoint = (0, utils_2.createNetworkNodeWithSimulator)(peerDescriptor, simulator, [peerDescriptor]);
|
|
31
|
+
const entryPoint = await (0, utils_2.createNetworkNodeWithSimulator)(peerDescriptor, simulator, [peerDescriptor]);
|
|
32
32
|
await entryPoint.start();
|
|
33
33
|
nodes.push(entryPoint);
|
|
34
34
|
console.log('Entrypoint ready');
|
|
@@ -39,7 +39,7 @@ const prepareStream = async (streamId) => {
|
|
|
39
39
|
region: (0, dht_1.getRandomRegion)()
|
|
40
40
|
});
|
|
41
41
|
const streamPartId = (0, protocol_1.toStreamPartID)((0, protocol_1.toStreamID)(streamId), 0);
|
|
42
|
-
const streamPublisher = (0, utils_2.createNetworkNodeWithSimulator)(peerDescriptor, simulator, [layer0Ep]);
|
|
42
|
+
const streamPublisher = await (0, utils_2.createNetworkNodeWithSimulator)(peerDescriptor, simulator, [layer0Ep]);
|
|
43
43
|
await streamPublisher.start();
|
|
44
44
|
streamPublisher.join(streamPartId);
|
|
45
45
|
nodes.push(streamPublisher);
|
|
@@ -63,7 +63,7 @@ const measureJoiningTime = async () => {
|
|
|
63
63
|
publishInterval = setInterval(() => {
|
|
64
64
|
i += 1;
|
|
65
65
|
const streamMessage = new protocol_1.StreamMessage({
|
|
66
|
-
messageId: new protocol_1.MessageID(protocol_1.StreamPartIDUtils.getStreamID(stream), 0, i, Math.floor(Math.random() * 20000), '
|
|
66
|
+
messageId: new protocol_1.MessageID(protocol_1.StreamPartIDUtils.getStreamID(stream), 0, i, Math.floor(Math.random() * 20000), '2222', 'msgChainId'),
|
|
67
67
|
prevMsgRef: null,
|
|
68
68
|
content: (0, utils_1.utf8ToBinary)(JSON.stringify({
|
|
69
69
|
hello: 'world'
|
|
@@ -75,7 +75,7 @@ const measureJoiningTime = async () => {
|
|
|
75
75
|
}, 1000);
|
|
76
76
|
// get random node from network to use as entrypoint
|
|
77
77
|
const randomNode = nodes[Math.floor(Math.random() * nodes.length)];
|
|
78
|
-
const streamSubscriber = (0, utils_2.createNetworkNodeWithSimulator)(peerDescriptor, simulator, [randomNode.stack.getLayer0Node().getLocalPeerDescriptor()]);
|
|
78
|
+
const streamSubscriber = await (0, utils_2.createNetworkNodeWithSimulator)(peerDescriptor, simulator, [randomNode.stack.getLayer0Node().getLocalPeerDescriptor()]);
|
|
79
79
|
currentNode = streamSubscriber;
|
|
80
80
|
const start = performance.now();
|
|
81
81
|
await streamSubscriber.start();
|
|
@@ -90,7 +90,6 @@ const measureJoiningTime = async () => {
|
|
|
90
90
|
return end - start;
|
|
91
91
|
};
|
|
92
92
|
const run = async () => {
|
|
93
|
-
dht_1.Simulator.useFakeTimers();
|
|
94
93
|
await prepareLayer0();
|
|
95
94
|
for (let i = 0; i < 20; i++) {
|
|
96
95
|
await prepareStream(`stream-${i}`);
|
|
@@ -104,7 +103,6 @@ const run = async () => {
|
|
|
104
103
|
}
|
|
105
104
|
fs_1.default.closeSync(logFile);
|
|
106
105
|
await shutdownNetwork();
|
|
107
|
-
dht_1.Simulator.useFakeTimers(false);
|
|
108
106
|
};
|
|
109
107
|
// eslint-disable-next-line promise/catch-or-return, promise/always-return
|
|
110
108
|
run().then(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"first-message.js","sourceRoot":"","sources":["../../../test/benchmark/first-message.ts"],"names":[],"mappings":";AAAA,+BAA+B;;;;;AAE/B,sCAA+E;AAC/E,gDAA4I;AAC5I,0CAAyE;AACzE,4CAAmB;AAGnB,uDAAmE;AACnE,6EAA2E;AAC3E,0CAAyF;AAIzF,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,IAAA,sCAA8B,EAAC,cAAc,EAAE,SAAS,EAAE,CAAC,cAAc,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"first-message.js","sourceRoot":"","sources":["../../../test/benchmark/first-message.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,4 +15,4 @@ export declare const createRandomNodeId: () => NodeID;
|
|
|
15
15
|
export declare const createMockPeerDescriptor: (opts?: Omit<Partial<PeerDescriptor>, 'nodeId' | 'type'>) => PeerDescriptor;
|
|
16
16
|
export declare const createMockDeliveryRpcRemote: (remotePeerDescriptor?: PeerDescriptor) => DeliveryRpcRemote;
|
|
17
17
|
export declare const createMockHandshakeRpcRemote: () => HandshakeRpcRemote;
|
|
18
|
-
export declare const createNetworkNodeWithSimulator: (peerDescriptor: PeerDescriptor, simulator: Simulator, entryPoints: PeerDescriptor[]) => NetworkNode
|
|
18
|
+
export declare const createNetworkNodeWithSimulator: (peerDescriptor: PeerDescriptor, simulator: Simulator, entryPoints: PeerDescriptor[]) => Promise<NetworkNode>;
|
package/dist/test/utils/utils.js
CHANGED
|
@@ -10,6 +10,8 @@ const HandshakeRpcRemote_1 = require("../../src/logic/neighbor-discovery/Handsha
|
|
|
10
10
|
const NetworkNode_1 = require("../../src/NetworkNode");
|
|
11
11
|
const utils_1 = require("@streamr/utils");
|
|
12
12
|
const protocol_1 = require("@streamr/protocol");
|
|
13
|
+
const NetworkRpc_client_1 = require("../../src/proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
14
|
+
const proto_rpc_1 = require("@streamr/proto-rpc");
|
|
13
15
|
exports.mockConnectionLocker = {
|
|
14
16
|
lockConnection: () => { },
|
|
15
17
|
unlockConnection: () => { },
|
|
@@ -32,7 +34,8 @@ const createMockRandomGraphNodeAndDhtNode = async (localPeerDescriptor, entryPoi
|
|
|
32
34
|
layer1Node,
|
|
33
35
|
connectionLocker: mockCm,
|
|
34
36
|
localPeerDescriptor,
|
|
35
|
-
rpcRequestTimeout: 5000
|
|
37
|
+
rpcRequestTimeout: 5000,
|
|
38
|
+
isLocalNodeEntryPoint: () => false
|
|
36
39
|
});
|
|
37
40
|
return [layer1Node, randomGraphNode];
|
|
38
41
|
};
|
|
@@ -71,18 +74,16 @@ const createMockPeerDescriptor = (opts) => {
|
|
|
71
74
|
};
|
|
72
75
|
exports.createMockPeerDescriptor = createMockPeerDescriptor;
|
|
73
76
|
const createMockDeliveryRpcRemote = (remotePeerDescriptor) => {
|
|
74
|
-
return new DeliveryRpcRemote_1.DeliveryRpcRemote((0, exports.createMockPeerDescriptor)(), remotePeerDescriptor ?? (0, exports.createMockPeerDescriptor)(), 'mock',
|
|
77
|
+
return new DeliveryRpcRemote_1.DeliveryRpcRemote((0, exports.createMockPeerDescriptor)(), remotePeerDescriptor ?? (0, exports.createMockPeerDescriptor)(), 'mock', new proto_rpc_1.RpcCommunicator(), NetworkRpc_client_1.DeliveryRpcClient);
|
|
75
78
|
};
|
|
76
79
|
exports.createMockDeliveryRpcRemote = createMockDeliveryRpcRemote;
|
|
77
80
|
const createMockHandshakeRpcRemote = () => {
|
|
78
|
-
return new HandshakeRpcRemote_1.HandshakeRpcRemote((0, exports.createMockPeerDescriptor)(), (0, exports.createMockPeerDescriptor)(), 'mock',
|
|
79
|
-
handshake: async () => { },
|
|
80
|
-
interleaveNotice: async () => { }
|
|
81
|
-
});
|
|
81
|
+
return new HandshakeRpcRemote_1.HandshakeRpcRemote((0, exports.createMockPeerDescriptor)(), (0, exports.createMockPeerDescriptor)(), 'mock', new proto_rpc_1.RpcCommunicator(), NetworkRpc_client_1.HandshakeRpcClient);
|
|
82
82
|
};
|
|
83
83
|
exports.createMockHandshakeRpcRemote = createMockHandshakeRpcRemote;
|
|
84
|
-
const createNetworkNodeWithSimulator = (peerDescriptor, simulator, entryPoints) => {
|
|
84
|
+
const createNetworkNodeWithSimulator = async (peerDescriptor, simulator, entryPoints) => {
|
|
85
85
|
const transport = new dht_1.SimulatorTransport(peerDescriptor, simulator);
|
|
86
|
+
await transport.start();
|
|
86
87
|
return (0, NetworkNode_1.createNetworkNode)({
|
|
87
88
|
layer0: {
|
|
88
89
|
peerDescriptor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../test/utils/utils.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,sCAAkI;AAElI,+FAMuE;AACvE,yEAAqE;AACrE,iFAA6E;AAC7E,8FAA0F;AAC1F,uDAAsE;AACtE,0CAA2E;AAC3E,gDAAmE;
|
|
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": "100.0.0-testnet-
|
|
3
|
+
"version": "100.0.0-testnet-two.1",
|
|
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-
|
|
34
|
-
"@streamr/proto-rpc": "100.0.0-testnet-
|
|
35
|
-
"@streamr/protocol": "100.0.0-testnet-
|
|
36
|
-
"@streamr/test-utils": "100.0.0-testnet-
|
|
37
|
-
"@streamr/utils": "100.0.0-testnet-
|
|
33
|
+
"@streamr/dht": "100.0.0-testnet-two.1",
|
|
34
|
+
"@streamr/proto-rpc": "100.0.0-testnet-two.1",
|
|
35
|
+
"@streamr/protocol": "100.0.0-testnet-two.1",
|
|
36
|
+
"@streamr/test-utils": "100.0.0-testnet-two.1",
|
|
37
|
+
"@streamr/utils": "100.0.0-testnet-two.1",
|
|
38
38
|
"eventemitter3": "^5.0.0",
|
|
39
39
|
"lodash": "^4.17.21",
|
|
40
40
|
"uuid": "^9.0.1",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
45
|
-
"@types/lodash": "^4.14.
|
|
45
|
+
"@types/lodash": "^4.14.202",
|
|
46
46
|
"@types/uuid": "^9.0.7",
|
|
47
47
|
"@types/yallist": "^4.0.1",
|
|
48
48
|
"commander": "^11.1.0",
|
package/protos/NetworkRpc.proto
CHANGED
|
@@ -17,7 +17,7 @@ service ProxyConnectionRpc {
|
|
|
17
17
|
|
|
18
18
|
service HandshakeRpc {
|
|
19
19
|
rpc handshake (StreamPartHandshakeRequest) returns (StreamPartHandshakeResponse);
|
|
20
|
-
rpc
|
|
20
|
+
rpc interleaveRequest (InterleaveRequest) returns (InterleaveResponse);
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
service NeighborUpdateRpc {
|
|
@@ -103,14 +103,18 @@ message StreamPartHandshakeResponse {
|
|
|
103
103
|
optional dht.PeerDescriptor interleaveTargetDescriptor = 3;
|
|
104
104
|
}
|
|
105
105
|
|
|
106
|
-
message
|
|
107
|
-
string streamPartId = 1;
|
|
106
|
+
message InterleaveRequest {
|
|
108
107
|
// this is a required field but in generated NetworkRpc.ts it is incorrectly annotated as optional (NET-1082)
|
|
109
|
-
dht.PeerDescriptor interleaveTargetDescriptor =
|
|
108
|
+
dht.PeerDescriptor interleaveTargetDescriptor = 1;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
message InterleaveResponse {
|
|
112
|
+
bool accepted = 1;
|
|
110
113
|
}
|
|
111
114
|
|
|
112
115
|
message LeaveStreamPartNotice {
|
|
113
116
|
string streamPartId = 1;
|
|
117
|
+
bool isEntryPoint = 2;
|
|
114
118
|
}
|
|
115
119
|
|
|
116
120
|
message NeighborUpdate {
|
package/src/NetworkStack.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ConnectionManager, DhtNode, DhtNodeOptions, areEqualPeerDescriptors } from '@streamr/dht'
|
|
2
2
|
import { StreamrNode, StreamrNodeConfig } from './logic/StreamrNode'
|
|
3
3
|
import { MetricsContext, waitForCondition } from '@streamr/utils'
|
|
4
|
-
import { EventEmitter } from 'eventemitter3'
|
|
5
4
|
import { StreamID, StreamPartID, toStreamPartID } from '@streamr/protocol'
|
|
6
5
|
import { ProxyDirection, StreamMessage, StreamMessageType } from './proto/packages/trackerless-network/protos/NetworkRpc'
|
|
7
6
|
import { Layer0Node } from './logic/Layer0Node'
|
|
@@ -13,10 +12,6 @@ export interface NetworkOptions {
|
|
|
13
12
|
metricsContext?: MetricsContext
|
|
14
13
|
}
|
|
15
14
|
|
|
16
|
-
export interface NetworkStackEvents {
|
|
17
|
-
stopped: () => void
|
|
18
|
-
}
|
|
19
|
-
|
|
20
15
|
const instances: NetworkStack[] = []
|
|
21
16
|
const stopInstances = async () => {
|
|
22
17
|
// make a clone so that it is ok for each instance.stop() to remove itself from the list (at line 139)
|
|
@@ -38,7 +33,7 @@ if (typeof window === 'object') {
|
|
|
38
33
|
})
|
|
39
34
|
}
|
|
40
35
|
|
|
41
|
-
export class NetworkStack
|
|
36
|
+
export class NetworkStack {
|
|
42
37
|
|
|
43
38
|
private layer0Node?: Layer0Node
|
|
44
39
|
private streamrNode?: StreamrNode
|
|
@@ -47,7 +42,6 @@ export class NetworkStack extends EventEmitter<NetworkStackEvents> {
|
|
|
47
42
|
private readonly options: NetworkOptions
|
|
48
43
|
|
|
49
44
|
constructor(options: NetworkOptions) {
|
|
50
|
-
super()
|
|
51
45
|
this.options = options
|
|
52
46
|
this.metricsContext = options.metricsContext ?? new MetricsContext()
|
|
53
47
|
this.layer0Node = new DhtNode({
|
|
@@ -16,7 +16,7 @@ export interface DeliveryRpcLocalConfig {
|
|
|
16
16
|
streamPartId: StreamPartID
|
|
17
17
|
markAndCheckDuplicate: (messageId: MessageID, previousMessageRef?: MessageRef) => boolean
|
|
18
18
|
broadcast: (message: StreamMessage, previousNode?: NodeID) => void
|
|
19
|
-
onLeaveNotice(senderId: NodeID): void
|
|
19
|
+
onLeaveNotice(senderId: NodeID, isLocalNodeEntryPoint: boolean): void
|
|
20
20
|
markForInspection(senderId: NodeID, messageId: MessageID): void
|
|
21
21
|
rpcCommunicator: ListeningRpcCommunicator
|
|
22
22
|
}
|
|
@@ -40,9 +40,9 @@ export class DeliveryRpcLocal implements IDeliveryRpc {
|
|
|
40
40
|
|
|
41
41
|
async leaveStreamPartNotice(message: LeaveStreamPartNotice, context: ServerCallContext): Promise<Empty> {
|
|
42
42
|
if (message.streamPartId === this.config.streamPartId) {
|
|
43
|
-
const
|
|
44
|
-
const
|
|
45
|
-
this.config.onLeaveNotice(
|
|
43
|
+
const sourcePeerDescriptor = (context as DhtCallContext).incomingSourceDescriptor!
|
|
44
|
+
const sourceId = getNodeIdFromPeerDescriptor(sourcePeerDescriptor)
|
|
45
|
+
this.config.onLeaveNotice(sourceId, message.isEntryPoint)
|
|
46
46
|
}
|
|
47
47
|
return Empty
|
|
48
48
|
}
|
|
@@ -4,11 +4,11 @@ import {
|
|
|
4
4
|
LeaveStreamPartNotice,
|
|
5
5
|
StreamMessage
|
|
6
6
|
} from '../proto/packages/trackerless-network/protos/NetworkRpc'
|
|
7
|
-
import {
|
|
7
|
+
import { DeliveryRpcClient } from '../proto/packages/trackerless-network/protos/NetworkRpc.client'
|
|
8
8
|
|
|
9
9
|
const logger = new Logger(module)
|
|
10
10
|
|
|
11
|
-
export class DeliveryRpcRemote extends RpcRemote<
|
|
11
|
+
export class DeliveryRpcRemote extends RpcRemote<DeliveryRpcClient> {
|
|
12
12
|
|
|
13
13
|
async sendStreamMessage(msg: StreamMessage): Promise<void> {
|
|
14
14
|
const options = this.formDhtRpcOptions({
|
|
@@ -19,9 +19,10 @@ export class DeliveryRpcRemote extends RpcRemote<IDeliveryRpcClient> {
|
|
|
19
19
|
})
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
leaveStreamPartNotice(): void {
|
|
22
|
+
leaveStreamPartNotice(isLocalNodeEntryPoint: boolean): void {
|
|
23
23
|
const notification: LeaveStreamPartNotice = {
|
|
24
|
-
streamPartId: this.getServiceId()
|
|
24
|
+
streamPartId: this.getServiceId(),
|
|
25
|
+
isEntryPoint: isLocalNodeEntryPoint
|
|
25
26
|
}
|
|
26
27
|
const options = this.formDhtRpcOptions({
|
|
27
28
|
notification: true
|