@streamr/trackerless-network 100.0.0-pretestnet.0 → 100.0.0-pretestnet.3

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.
Files changed (100) hide show
  1. package/dist/package.json +8 -8
  2. package/dist/src/NetworkNode.js +1 -1
  3. package/dist/src/NetworkNode.js.map +1 -1
  4. package/dist/src/NetworkStack.js +1 -1
  5. package/dist/src/NetworkStack.js.map +1 -1
  6. package/dist/src/logic/DeliveryRpcLocal.d.ts +1 -1
  7. package/dist/src/logic/EntryPointDiscovery.d.ts +1 -1
  8. package/dist/src/logic/EntryPointDiscovery.js +5 -5
  9. package/dist/src/logic/EntryPointDiscovery.js.map +1 -1
  10. package/dist/src/logic/Layer0Node.d.ts +1 -1
  11. package/dist/src/logic/Layer1Node.d.ts +1 -1
  12. package/dist/src/logic/RandomGraphNode.d.ts +2 -1
  13. package/dist/src/logic/RandomGraphNode.js +8 -8
  14. package/dist/src/logic/RandomGraphNode.js.map +1 -1
  15. package/dist/src/logic/StreamrNode.d.ts +1 -0
  16. package/dist/src/logic/StreamrNode.js +34 -28
  17. package/dist/src/logic/StreamrNode.js.map +1 -1
  18. package/dist/src/logic/createRandomGraphNode.js +8 -7
  19. package/dist/src/logic/createRandomGraphNode.js.map +1 -1
  20. package/dist/src/logic/inspect/Inspector.d.ts +2 -2
  21. package/dist/src/logic/inspect/Inspector.js +2 -2
  22. package/dist/src/logic/inspect/Inspector.js.map +1 -1
  23. package/dist/src/logic/neighbor-discovery/Handshaker.d.ts +2 -1
  24. package/dist/src/logic/neighbor-discovery/Handshaker.js +3 -3
  25. package/dist/src/logic/neighbor-discovery/Handshaker.js.map +1 -1
  26. package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.d.ts +1 -1
  27. package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js +1 -1
  28. package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js.map +1 -1
  29. package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.d.ts +1 -1
  30. package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.js +2 -2
  31. package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.js.map +1 -1
  32. package/dist/src/logic/proxy/ProxyClient.d.ts +1 -1
  33. package/dist/src/logic/proxy/ProxyClient.js +5 -5
  34. package/dist/src/logic/proxy/ProxyClient.js.map +1 -1
  35. package/dist/src/logic/proxy/ProxyConnectionRpcLocal.d.ts +1 -1
  36. package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js +1 -1
  37. package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js.map +1 -1
  38. package/dist/src/logic/proxy/ProxyConnectionRpcRemote.js +1 -1
  39. package/dist/src/logic/proxy/ProxyConnectionRpcRemote.js.map +1 -1
  40. package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.d.ts +1 -1
  41. package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.js +2 -2
  42. package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.js.map +1 -1
  43. package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +77 -60
  44. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +71 -58
  45. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
  46. package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +87 -124
  47. package/dist/src/proto/packages/dht/protos/DhtRpc.js +83 -101
  48. package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
  49. package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +37 -32
  50. package/dist/test/benchmark/first-message.js +1 -1
  51. package/dist/test/benchmark/first-message.js.map +1 -1
  52. package/dist/test/utils/utils.d.ts +1 -1
  53. package/dist/test/utils/utils.js +10 -8
  54. package/dist/test/utils/utils.js.map +1 -1
  55. package/karma.config.js +2 -2
  56. package/package.json +8 -8
  57. package/src/NetworkNode.ts +1 -1
  58. package/src/NetworkStack.ts +1 -1
  59. package/src/logic/DeliveryRpcLocal.ts +1 -1
  60. package/src/logic/EntryPointDiscovery.ts +6 -6
  61. package/src/logic/Layer0Node.ts +1 -1
  62. package/src/logic/Layer1Node.ts +1 -1
  63. package/src/logic/RandomGraphNode.ts +19 -13
  64. package/src/logic/StreamrNode.ts +22 -12
  65. package/src/logic/createRandomGraphNode.ts +8 -7
  66. package/src/logic/inspect/Inspector.ts +4 -4
  67. package/src/logic/neighbor-discovery/Handshaker.ts +15 -6
  68. package/src/logic/neighbor-discovery/NeighborUpdateManager.ts +2 -2
  69. package/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts +3 -3
  70. package/src/logic/proxy/ProxyClient.ts +7 -7
  71. package/src/logic/proxy/ProxyConnectionRpcLocal.ts +2 -2
  72. package/src/logic/proxy/ProxyConnectionRpcRemote.ts +2 -2
  73. package/src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts +3 -3
  74. package/src/proto/packages/dht/protos/DhtRpc.client.ts +113 -97
  75. package/src/proto/packages/dht/protos/DhtRpc.server.ts +37 -32
  76. package/src/proto/packages/dht/protos/DhtRpc.ts +115 -160
  77. package/test/benchmark/first-message.ts +1 -1
  78. package/test/end-to-end/inspect.test.ts +6 -3
  79. package/test/end-to-end/proxy-and-full-node.test.ts +1 -0
  80. package/test/end-to-end/proxy-connections.test.ts +2 -0
  81. package/test/end-to-end/proxy-key-exchange.test.ts +1 -0
  82. package/test/end-to-end/random-graph-with-real-connections.test.ts +10 -10
  83. package/test/end-to-end/webrtc-full-node-network.test.ts +2 -1
  84. package/test/end-to-end/websocket-full-node-network.test.ts +3 -1
  85. package/test/integration/Handshakes.test.ts +1 -1
  86. package/test/integration/Inspect.test.ts +1 -1
  87. package/test/integration/NetworkStack.test.ts +4 -2
  88. package/test/integration/NetworkStackStoppedDuringStart.test.ts +4 -2
  89. package/test/integration/RandomGraphNode-Layer1Node-Latencies.test.ts +2 -2
  90. package/test/integration/RandomGraphNode-Layer1Node.test.ts +2 -2
  91. package/test/unit/DeliveryRpcLocal.test.ts +1 -1
  92. package/test/unit/EntrypointDiscovery.test.ts +3 -3
  93. package/test/unit/HandshakeRpcLocal.test.ts +2 -2
  94. package/test/unit/Handshaker.test.ts +3 -2
  95. package/test/unit/Inspector.test.ts +1 -1
  96. package/test/unit/NodeList.test.ts +1 -1
  97. package/test/unit/RandomGraphNode.test.ts +1 -1
  98. package/test/utils/mock/MockLayer0Node.ts +1 -1
  99. package/test/utils/mock/Transport.ts +1 -1
  100. package/test/utils/utils.ts +10 -8
@@ -161,26 +161,26 @@ export interface ClosestPeersResponse {
161
161
  requestId: string;
162
162
  }
163
163
  /**
164
- * @generated from protobuf message dht.RecursiveFindRequest
164
+ * @generated from protobuf message dht.FindRequest
165
165
  */
166
- export interface RecursiveFindRequest {
166
+ export interface FindRequest {
167
167
  /**
168
- * @generated from protobuf field: string recursiveFindSessionId = 1;
168
+ * @generated from protobuf field: string sessionId = 1;
169
169
  */
170
- recursiveFindSessionId: string;
170
+ sessionId: string;
171
171
  /**
172
- * @generated from protobuf field: dht.FindMode findMode = 2;
172
+ * @generated from protobuf field: bool fetchData = 2;
173
173
  */
174
- findMode: FindMode;
174
+ fetchData: boolean;
175
175
  }
176
176
  /**
177
- * @generated from protobuf message dht.RecursiveFindReport
177
+ * @generated from protobuf message dht.FindResponse
178
178
  */
179
- export interface RecursiveFindReport {
179
+ export interface FindResponse {
180
180
  /**
181
- * @generated from protobuf field: repeated dht.PeerDescriptor nodes = 1;
181
+ * @generated from protobuf field: repeated dht.PeerDescriptor closestConnectedPeers = 1;
182
182
  */
183
- nodes: PeerDescriptor[];
183
+ closestConnectedPeers: PeerDescriptor[];
184
184
  /**
185
185
  * @generated from protobuf field: repeated dht.DataEntry dataEntries = 2;
186
186
  */
@@ -246,11 +246,7 @@ export interface PeerDescriptor {
246
246
  */
247
247
  websocket?: ConnectivityMethod;
248
248
  /**
249
- * @generated from protobuf field: optional bool openInternet = 6;
250
- */
251
- openInternet?: boolean;
252
- /**
253
- * @generated from protobuf field: optional uint32 region = 7;
249
+ * @generated from protobuf field: optional uint32 region = 6;
254
250
  */
255
251
  region?: number;
256
252
  }
@@ -288,19 +284,15 @@ export interface RouteMessageWrapper {
288
284
  */
289
285
  destinationPeer?: PeerDescriptor;
290
286
  /**
291
- * @generated from protobuf field: dht.PeerDescriptor previousPeer = 4;
292
- */
293
- previousPeer?: PeerDescriptor;
294
- /**
295
- * @generated from protobuf field: dht.Message message = 5;
287
+ * @generated from protobuf field: dht.Message message = 4;
296
288
  */
297
289
  message?: Message;
298
290
  /**
299
- * @generated from protobuf field: repeated dht.PeerDescriptor reachableThrough = 6;
291
+ * @generated from protobuf field: repeated dht.PeerDescriptor reachableThrough = 5;
300
292
  */
301
293
  reachableThrough: PeerDescriptor[];
302
294
  /**
303
- * @generated from protobuf field: repeated dht.PeerDescriptor routingPath = 7;
295
+ * @generated from protobuf field: repeated dht.PeerDescriptor routingPath = 6;
304
296
  */
305
297
  routingPath: PeerDescriptor[];
306
298
  }
@@ -341,19 +333,15 @@ export interface ConnectivityRequest {
341
333
  */
342
334
  export interface ConnectivityResponse {
343
335
  /**
344
- * @generated from protobuf field: bool open_internet = 1;
345
- */
346
- openInternet: boolean;
347
- /**
348
- * @generated from protobuf field: string host = 2;
336
+ * @generated from protobuf field: string host = 1;
349
337
  */
350
338
  host: string;
351
339
  /**
352
- * @generated from protobuf field: string natType = 3;
340
+ * @generated from protobuf field: string natType = 2;
353
341
  */
354
342
  natType: string;
355
343
  /**
356
- * @generated from protobuf field: dht.ConnectivityMethod websocket = 4;
344
+ * @generated from protobuf field: dht.ConnectivityMethod websocket = 3;
357
345
  */
358
346
  websocket?: ConnectivityMethod;
359
347
  }
@@ -445,11 +433,11 @@ export interface Message {
445
433
  */
446
434
  rpcMessage: RpcMessage;
447
435
  } | {
448
- oneofKind: "recursiveFindRequest";
436
+ oneofKind: "findRequest";
449
437
  /**
450
- * @generated from protobuf field: dht.RecursiveFindRequest RecursiveFindRequest = 11 [json_name = "RecursiveFindRequest"];
438
+ * @generated from protobuf field: dht.FindRequest findRequest = 11;
451
439
  */
452
- recursiveFindRequest: RecursiveFindRequest;
440
+ findRequest: FindRequest;
453
441
  } | {
454
442
  oneofKind: undefined;
455
443
  };
@@ -459,41 +447,25 @@ export interface Message {
459
447
  /**
460
448
  * WebSocket
461
449
  *
462
- * @generated from protobuf message dht.WebSocketConnectionRequest
450
+ * @generated from protobuf message dht.WebsocketConnectionRequest
463
451
  */
464
- export interface WebSocketConnectionRequest {
465
- /**
466
- * @generated from protobuf field: string ip = 1;
467
- */
468
- ip: string;
469
- /**
470
- * @generated from protobuf field: uint32 port = 2;
471
- */
472
- port: number;
452
+ export interface WebsocketConnectionRequest {
473
453
  }
474
454
  /**
475
- * @generated from protobuf message dht.WebSocketConnectionResponse
455
+ * @generated from protobuf message dht.WebsocketConnectionResponse
476
456
  */
477
- export interface WebSocketConnectionResponse {
457
+ export interface WebsocketConnectionResponse {
478
458
  /**
479
459
  * @generated from protobuf field: bool accepted = 1;
480
460
  */
481
461
  accepted: boolean;
482
- /**
483
- * @generated from protobuf field: optional string reason = 2;
484
- */
485
- reason?: string;
486
462
  }
487
463
  /**
488
464
  * WebRTC
489
465
  *
490
- * @generated from protobuf message dht.WebRtcConnectionRequest
466
+ * @generated from protobuf message dht.WebrtcConnectionRequest
491
467
  */
492
- export interface WebRtcConnectionRequest {
493
- /**
494
- * @generated from protobuf field: string connectionId = 1;
495
- */
496
- connectionId: string;
468
+ export interface WebrtcConnectionRequest {
497
469
  }
498
470
  /**
499
471
  * @generated from protobuf message dht.RtcOffer
@@ -543,18 +515,18 @@ export interface IceCandidate {
543
515
  */
544
516
  export interface LockRequest {
545
517
  /**
546
- * @generated from protobuf field: string serviceId = 1;
518
+ * @generated from protobuf field: string lockId = 1;
547
519
  */
548
- serviceId: string;
520
+ lockId: string;
549
521
  }
550
522
  /**
551
523
  * @generated from protobuf message dht.UnlockRequest
552
524
  */
553
525
  export interface UnlockRequest {
554
526
  /**
555
- * @generated from protobuf field: string serviceId = 1;
527
+ * @generated from protobuf field: string lockId = 1;
556
528
  */
557
- serviceId: string;
529
+ lockId: string;
558
530
  }
559
531
  /**
560
532
  * @generated from protobuf message dht.LockResponse
@@ -584,18 +556,18 @@ export interface DisconnectNotice {
584
556
  export interface DisconnectNoticeResponse {
585
557
  }
586
558
  /**
587
- * @generated from protobuf message dht.FindDataRequest
559
+ * @generated from protobuf message dht.ExternalFindDataRequest
588
560
  */
589
- export interface FindDataRequest {
561
+ export interface ExternalFindDataRequest {
590
562
  /**
591
563
  * @generated from protobuf field: bytes kademliaId = 1;
592
564
  */
593
565
  kademliaId: Uint8Array;
594
566
  }
595
567
  /**
596
- * @generated from protobuf message dht.FindDataResponse
568
+ * @generated from protobuf message dht.ExternalFindDataResponse
597
569
  */
598
- export interface FindDataResponse {
570
+ export interface ExternalFindDataResponse {
599
571
  /**
600
572
  * @generated from protobuf field: repeated dht.DataEntry dataEntries = 1;
601
573
  */
@@ -605,19 +577,6 @@ export interface FindDataResponse {
605
577
  */
606
578
  error?: string;
607
579
  }
608
- /**
609
- * @generated from protobuf enum dht.FindMode
610
- */
611
- export enum FindMode {
612
- /**
613
- * @generated from protobuf enum value: NODE = 0;
614
- */
615
- NODE = 0,
616
- /**
617
- * @generated from protobuf enum value: DATA = 1;
618
- */
619
- DATA = 1
620
- }
621
580
  /**
622
581
  * @generated from protobuf enum dht.NodeType
623
582
  */
@@ -663,29 +622,29 @@ export enum RpcResponseError {
663
622
  */
664
623
  export enum MessageType {
665
624
  /**
666
- * @generated from protobuf enum value: CONNECTIVITY_REQUEST = 0;
625
+ * @generated from protobuf enum value: RPC = 0;
667
626
  */
668
- CONNECTIVITY_REQUEST = 0,
627
+ RPC = 0,
669
628
  /**
670
- * @generated from protobuf enum value: CONNECTIVITY_RESPONSE = 1;
629
+ * @generated from protobuf enum value: CONNECTIVITY_REQUEST = 1;
671
630
  */
672
- CONNECTIVITY_RESPONSE = 1,
631
+ CONNECTIVITY_REQUEST = 1,
673
632
  /**
674
- * @generated from protobuf enum value: HANDSHAKE_REQUEST = 2;
633
+ * @generated from protobuf enum value: CONNECTIVITY_RESPONSE = 2;
675
634
  */
676
- HANDSHAKE_REQUEST = 2,
635
+ CONNECTIVITY_RESPONSE = 2,
677
636
  /**
678
- * @generated from protobuf enum value: HANDSHAKE_RESPONSE = 3;
637
+ * @generated from protobuf enum value: HANDSHAKE_REQUEST = 3;
679
638
  */
680
- HANDSHAKE_RESPONSE = 3,
639
+ HANDSHAKE_REQUEST = 3,
681
640
  /**
682
- * @generated from protobuf enum value: RPC = 4;
641
+ * @generated from protobuf enum value: HANDSHAKE_RESPONSE = 4;
683
642
  */
684
- RPC = 4,
643
+ HANDSHAKE_RESPONSE = 4,
685
644
  /**
686
- * @generated from protobuf enum value: RECURSIVE_FIND_REQUEST = 5;
645
+ * @generated from protobuf enum value: FIND_REQUEST = 5;
687
646
  */
688
- RECURSIVE_FIND_REQUEST = 5
647
+ FIND_REQUEST = 5
689
648
  }
690
649
  /**
691
650
  * @generated from protobuf enum dht.DisconnectMode
@@ -846,23 +805,23 @@ class ClosestPeersResponse$Type extends MessageType$<ClosestPeersResponse> {
846
805
  */
847
806
  export const ClosestPeersResponse = new ClosestPeersResponse$Type();
848
807
  // @generated message type with reflection information, may provide speed optimized methods
849
- class RecursiveFindRequest$Type extends MessageType$<RecursiveFindRequest> {
808
+ class FindRequest$Type extends MessageType$<FindRequest> {
850
809
  constructor() {
851
- super("dht.RecursiveFindRequest", [
852
- { no: 1, name: "recursiveFindSessionId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
853
- { no: 2, name: "findMode", kind: "enum", T: () => ["dht.FindMode", FindMode] }
810
+ super("dht.FindRequest", [
811
+ { no: 1, name: "sessionId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
812
+ { no: 2, name: "fetchData", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
854
813
  ]);
855
814
  }
856
815
  }
857
816
  /**
858
- * @generated MessageType for protobuf message dht.RecursiveFindRequest
817
+ * @generated MessageType for protobuf message dht.FindRequest
859
818
  */
860
- export const RecursiveFindRequest = new RecursiveFindRequest$Type();
819
+ export const FindRequest = new FindRequest$Type();
861
820
  // @generated message type with reflection information, may provide speed optimized methods
862
- class RecursiveFindReport$Type extends MessageType$<RecursiveFindReport> {
821
+ class FindResponse$Type extends MessageType$<FindResponse> {
863
822
  constructor() {
864
- super("dht.RecursiveFindReport", [
865
- { no: 1, name: "nodes", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
823
+ super("dht.FindResponse", [
824
+ { no: 1, name: "closestConnectedPeers", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
866
825
  { no: 2, name: "dataEntries", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => DataEntry },
867
826
  { no: 3, name: "noCloserNodesFound", kind: "scalar", opt: true, T: 8 /*ScalarType.BOOL*/ },
868
827
  { no: 4, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
@@ -870,9 +829,9 @@ class RecursiveFindReport$Type extends MessageType$<RecursiveFindReport> {
870
829
  }
871
830
  }
872
831
  /**
873
- * @generated MessageType for protobuf message dht.RecursiveFindReport
832
+ * @generated MessageType for protobuf message dht.FindResponse
874
833
  */
875
- export const RecursiveFindReport = new RecursiveFindReport$Type();
834
+ export const FindResponse = new FindResponse$Type();
876
835
  // @generated message type with reflection information, may provide speed optimized methods
877
836
  class PingRequest$Type extends MessageType$<PingRequest> {
878
837
  constructor() {
@@ -918,8 +877,7 @@ class PeerDescriptor$Type extends MessageType$<PeerDescriptor> {
918
877
  { no: 3, name: "udp", kind: "message", T: () => ConnectivityMethod },
919
878
  { no: 4, name: "tcp", kind: "message", T: () => ConnectivityMethod },
920
879
  { no: 5, name: "websocket", kind: "message", T: () => ConnectivityMethod },
921
- { no: 6, name: "openInternet", kind: "scalar", opt: true, T: 8 /*ScalarType.BOOL*/ },
922
- { no: 7, name: "region", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
880
+ { no: 6, name: "region", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ }
923
881
  ]);
924
882
  }
925
883
  }
@@ -948,10 +906,9 @@ class RouteMessageWrapper$Type extends MessageType$<RouteMessageWrapper> {
948
906
  { no: 1, name: "sourcePeer", kind: "message", T: () => PeerDescriptor },
949
907
  { no: 2, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
950
908
  { no: 3, name: "destinationPeer", kind: "message", T: () => PeerDescriptor },
951
- { no: 4, name: "previousPeer", kind: "message", T: () => PeerDescriptor },
952
- { no: 5, name: "message", kind: "message", T: () => Message },
953
- { no: 6, name: "reachableThrough", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
954
- { no: 7, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
909
+ { no: 4, name: "message", kind: "message", T: () => Message },
910
+ { no: 5, name: "reachableThrough", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
911
+ { no: 6, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
955
912
  ]);
956
913
  }
957
914
  }
@@ -990,10 +947,9 @@ export const ConnectivityRequest = new ConnectivityRequest$Type();
990
947
  class ConnectivityResponse$Type extends MessageType$<ConnectivityResponse> {
991
948
  constructor() {
992
949
  super("dht.ConnectivityResponse", [
993
- { no: 1, name: "open_internet", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
994
- { no: 2, name: "host", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
995
- { no: 3, name: "natType", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
996
- { no: 4, name: "websocket", kind: "message", T: () => ConnectivityMethod }
950
+ { no: 1, name: "host", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
951
+ { no: 2, name: "natType", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
952
+ { no: 3, name: "websocket", kind: "message", T: () => ConnectivityMethod }
997
953
  ]);
998
954
  }
999
955
  }
@@ -1042,7 +998,7 @@ class Message$Type extends MessageType$<Message> {
1042
998
  { no: 8, name: "handshakeRequest", kind: "message", oneof: "body", T: () => HandshakeRequest },
1043
999
  { no: 9, name: "handshakeResponse", kind: "message", oneof: "body", T: () => HandshakeResponse },
1044
1000
  { no: 10, name: "rpcMessage", kind: "message", oneof: "body", T: () => RpcMessage },
1045
- { no: 11, name: "RecursiveFindRequest", kind: "message", jsonName: "RecursiveFindRequest", oneof: "body", T: () => RecursiveFindRequest }
1001
+ { no: 11, name: "findRequest", kind: "message", oneof: "body", T: () => FindRequest }
1046
1002
  ]);
1047
1003
  }
1048
1004
  }
@@ -1051,43 +1007,37 @@ class Message$Type extends MessageType$<Message> {
1051
1007
  */
1052
1008
  export const Message = new Message$Type();
1053
1009
  // @generated message type with reflection information, may provide speed optimized methods
1054
- class WebSocketConnectionRequest$Type extends MessageType$<WebSocketConnectionRequest> {
1010
+ class WebsocketConnectionRequest$Type extends MessageType$<WebsocketConnectionRequest> {
1055
1011
  constructor() {
1056
- super("dht.WebSocketConnectionRequest", [
1057
- { no: 1, name: "ip", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
1058
- { no: 2, name: "port", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
1059
- ]);
1012
+ super("dht.WebsocketConnectionRequest", []);
1060
1013
  }
1061
1014
  }
1062
1015
  /**
1063
- * @generated MessageType for protobuf message dht.WebSocketConnectionRequest
1016
+ * @generated MessageType for protobuf message dht.WebsocketConnectionRequest
1064
1017
  */
1065
- export const WebSocketConnectionRequest = new WebSocketConnectionRequest$Type();
1018
+ export const WebsocketConnectionRequest = new WebsocketConnectionRequest$Type();
1066
1019
  // @generated message type with reflection information, may provide speed optimized methods
1067
- class WebSocketConnectionResponse$Type extends MessageType$<WebSocketConnectionResponse> {
1020
+ class WebsocketConnectionResponse$Type extends MessageType$<WebsocketConnectionResponse> {
1068
1021
  constructor() {
1069
- super("dht.WebSocketConnectionResponse", [
1070
- { no: 1, name: "accepted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
1071
- { no: 2, name: "reason", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
1022
+ super("dht.WebsocketConnectionResponse", [
1023
+ { no: 1, name: "accepted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
1072
1024
  ]);
1073
1025
  }
1074
1026
  }
1075
1027
  /**
1076
- * @generated MessageType for protobuf message dht.WebSocketConnectionResponse
1028
+ * @generated MessageType for protobuf message dht.WebsocketConnectionResponse
1077
1029
  */
1078
- export const WebSocketConnectionResponse = new WebSocketConnectionResponse$Type();
1030
+ export const WebsocketConnectionResponse = new WebsocketConnectionResponse$Type();
1079
1031
  // @generated message type with reflection information, may provide speed optimized methods
1080
- class WebRtcConnectionRequest$Type extends MessageType$<WebRtcConnectionRequest> {
1032
+ class WebrtcConnectionRequest$Type extends MessageType$<WebrtcConnectionRequest> {
1081
1033
  constructor() {
1082
- super("dht.WebRtcConnectionRequest", [
1083
- { no: 1, name: "connectionId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
1084
- ]);
1034
+ super("dht.WebrtcConnectionRequest", []);
1085
1035
  }
1086
1036
  }
1087
1037
  /**
1088
- * @generated MessageType for protobuf message dht.WebRtcConnectionRequest
1038
+ * @generated MessageType for protobuf message dht.WebrtcConnectionRequest
1089
1039
  */
1090
- export const WebRtcConnectionRequest = new WebRtcConnectionRequest$Type();
1040
+ export const WebrtcConnectionRequest = new WebrtcConnectionRequest$Type();
1091
1041
  // @generated message type with reflection information, may provide speed optimized methods
1092
1042
  class RtcOffer$Type extends MessageType$<RtcOffer> {
1093
1043
  constructor() {
@@ -1132,7 +1082,7 @@ export const IceCandidate = new IceCandidate$Type();
1132
1082
  class LockRequest$Type extends MessageType$<LockRequest> {
1133
1083
  constructor() {
1134
1084
  super("dht.LockRequest", [
1135
- { no: 1, name: "serviceId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
1085
+ { no: 1, name: "lockId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
1136
1086
  ]);
1137
1087
  }
1138
1088
  }
@@ -1144,7 +1094,7 @@ export const LockRequest = new LockRequest$Type();
1144
1094
  class UnlockRequest$Type extends MessageType$<UnlockRequest> {
1145
1095
  constructor() {
1146
1096
  super("dht.UnlockRequest", [
1147
- { no: 1, name: "serviceId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
1097
+ { no: 1, name: "lockId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
1148
1098
  ]);
1149
1099
  }
1150
1100
  }
@@ -1188,87 +1138,92 @@ class DisconnectNoticeResponse$Type extends MessageType$<DisconnectNoticeRespons
1188
1138
  */
1189
1139
  export const DisconnectNoticeResponse = new DisconnectNoticeResponse$Type();
1190
1140
  // @generated message type with reflection information, may provide speed optimized methods
1191
- class FindDataRequest$Type extends MessageType$<FindDataRequest> {
1141
+ class ExternalFindDataRequest$Type extends MessageType$<ExternalFindDataRequest> {
1192
1142
  constructor() {
1193
- super("dht.FindDataRequest", [
1143
+ super("dht.ExternalFindDataRequest", [
1194
1144
  { no: 1, name: "kademliaId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
1195
1145
  ]);
1196
1146
  }
1197
1147
  }
1198
1148
  /**
1199
- * @generated MessageType for protobuf message dht.FindDataRequest
1149
+ * @generated MessageType for protobuf message dht.ExternalFindDataRequest
1200
1150
  */
1201
- export const FindDataRequest = new FindDataRequest$Type();
1151
+ export const ExternalFindDataRequest = new ExternalFindDataRequest$Type();
1202
1152
  // @generated message type with reflection information, may provide speed optimized methods
1203
- class FindDataResponse$Type extends MessageType$<FindDataResponse> {
1153
+ class ExternalFindDataResponse$Type extends MessageType$<ExternalFindDataResponse> {
1204
1154
  constructor() {
1205
- super("dht.FindDataResponse", [
1155
+ super("dht.ExternalFindDataResponse", [
1206
1156
  { no: 1, name: "dataEntries", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => DataEntry },
1207
1157
  { no: 2, name: "error", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
1208
1158
  ]);
1209
1159
  }
1210
1160
  }
1211
1161
  /**
1212
- * @generated MessageType for protobuf message dht.FindDataResponse
1162
+ * @generated MessageType for protobuf message dht.ExternalFindDataResponse
1213
1163
  */
1214
- export const FindDataResponse = new FindDataResponse$Type();
1164
+ export const ExternalFindDataResponse = new ExternalFindDataResponse$Type();
1215
1165
  /**
1216
- * @generated ServiceType for protobuf service dht.DhtRpcService
1166
+ * @generated ServiceType for protobuf service dht.DhtNodeRpc
1217
1167
  */
1218
- export const DhtRpcService = new ServiceType("dht.DhtRpcService", [
1168
+ export const DhtNodeRpc = new ServiceType("dht.DhtNodeRpc", [
1219
1169
  { name: "getClosestPeers", options: {}, I: ClosestPeersRequest, O: ClosestPeersResponse },
1220
1170
  { name: "ping", options: {}, I: PingRequest, O: PingResponse },
1221
1171
  { name: "leaveNotice", options: {}, I: LeaveNotice, O: Empty }
1222
1172
  ]);
1223
1173
  /**
1224
- * @generated ServiceType for protobuf service dht.RoutingService
1174
+ * @generated ServiceType for protobuf service dht.RouterRpc
1225
1175
  */
1226
- export const RoutingService = new ServiceType("dht.RoutingService", [
1176
+ export const RouterRpc = new ServiceType("dht.RouterRpc", [
1227
1177
  { name: "routeMessage", options: {}, I: RouteMessageWrapper, O: RouteMessageAck },
1228
- { name: "forwardMessage", options: {}, I: RouteMessageWrapper, O: RouteMessageAck },
1229
- { name: "findRecursively", options: {}, I: RouteMessageWrapper, O: RouteMessageAck }
1178
+ { name: "forwardMessage", options: {}, I: RouteMessageWrapper, O: RouteMessageAck }
1179
+ ]);
1180
+ /**
1181
+ * @generated ServiceType for protobuf service dht.FindRpc
1182
+ */
1183
+ export const FindRpc = new ServiceType("dht.FindRpc", [
1184
+ { name: "routeFindRequest", options: {}, I: RouteMessageWrapper, O: RouteMessageAck }
1230
1185
  ]);
1231
1186
  /**
1232
- * @generated ServiceType for protobuf service dht.StoreService
1187
+ * @generated ServiceType for protobuf service dht.StoreRpc
1233
1188
  */
1234
- export const StoreService = new ServiceType("dht.StoreService", [
1189
+ export const StoreRpc = new ServiceType("dht.StoreRpc", [
1235
1190
  { name: "storeData", options: {}, I: StoreDataRequest, O: StoreDataResponse },
1236
1191
  { name: "migrateData", options: {}, I: MigrateDataRequest, O: MigrateDataResponse },
1237
1192
  { name: "deleteData", options: {}, I: DeleteDataRequest, O: DeleteDataResponse }
1238
1193
  ]);
1239
1194
  /**
1240
- * @generated ServiceType for protobuf service dht.RecursiveFindSessionService
1195
+ * @generated ServiceType for protobuf service dht.FindSessionRpc
1241
1196
  */
1242
- export const RecursiveFindSessionService = new ServiceType("dht.RecursiveFindSessionService", [
1243
- { name: "reportRecursiveFindResult", options: {}, I: RecursiveFindReport, O: Empty }
1197
+ export const FindSessionRpc = new ServiceType("dht.FindSessionRpc", [
1198
+ { name: "sendFindResponse", options: {}, I: FindResponse, O: Empty }
1244
1199
  ]);
1245
1200
  /**
1246
- * @generated ServiceType for protobuf service dht.WebSocketConnectorService
1201
+ * @generated ServiceType for protobuf service dht.WebsocketConnectorRpc
1247
1202
  */
1248
- export const WebSocketConnectorService = new ServiceType("dht.WebSocketConnectorService", [
1249
- { name: "requestConnection", options: {}, I: WebSocketConnectionRequest, O: WebSocketConnectionResponse }
1203
+ export const WebsocketConnectorRpc = new ServiceType("dht.WebsocketConnectorRpc", [
1204
+ { name: "requestConnection", options: {}, I: WebsocketConnectionRequest, O: WebsocketConnectionResponse }
1250
1205
  ]);
1251
1206
  /**
1252
- * @generated ServiceType for protobuf service dht.WebRtcConnectorService
1207
+ * @generated ServiceType for protobuf service dht.WebrtcConnectorRpc
1253
1208
  */
1254
- export const WebRtcConnectorService = new ServiceType("dht.WebRtcConnectorService", [
1255
- { name: "requestConnection", options: {}, I: WebRtcConnectionRequest, O: Empty },
1209
+ export const WebrtcConnectorRpc = new ServiceType("dht.WebrtcConnectorRpc", [
1210
+ { name: "requestConnection", options: {}, I: WebrtcConnectionRequest, O: Empty },
1256
1211
  { name: "rtcOffer", options: {}, I: RtcOffer, O: Empty },
1257
1212
  { name: "rtcAnswer", options: {}, I: RtcAnswer, O: Empty },
1258
1213
  { name: "iceCandidate", options: {}, I: IceCandidate, O: Empty }
1259
1214
  ]);
1260
1215
  /**
1261
- * @generated ServiceType for protobuf service dht.ConnectionLocker
1216
+ * @generated ServiceType for protobuf service dht.ConnectionLockRpc
1262
1217
  */
1263
- export const ConnectionLocker = new ServiceType("dht.ConnectionLocker", [
1218
+ export const ConnectionLockRpc = new ServiceType("dht.ConnectionLockRpc", [
1264
1219
  { name: "lockRequest", options: {}, I: LockRequest, O: LockResponse },
1265
1220
  { name: "unlockRequest", options: {}, I: UnlockRequest, O: Empty },
1266
1221
  { name: "gracefulDisconnect", options: {}, I: DisconnectNotice, O: DisconnectNoticeResponse }
1267
1222
  ]);
1268
1223
  /**
1269
- * @generated ServiceType for protobuf service dht.ExternalApiService
1224
+ * @generated ServiceType for protobuf service dht.ExternalApiRpc
1270
1225
  */
1271
- export const ExternalApiService = new ServiceType("dht.ExternalApiService", [
1272
- { name: "findData", options: {}, I: FindDataRequest, O: FindDataResponse },
1226
+ export const ExternalApiRpc = new ServiceType("dht.ExternalApiRpc", [
1227
+ { name: "externalFindData", options: {}, I: ExternalFindDataRequest, O: ExternalFindDataResponse },
1273
1228
  { name: "externalStoreData", options: {}, I: ExternalStoreDataRequest, O: ExternalStoreDataResponse }
1274
1229
  ]);
@@ -90,7 +90,7 @@ const measureJoiningTime = async () => {
90
90
  }, 1000)
91
91
  // get random node from network to use as entrypoint
92
92
  const randomNode = nodes[Math.floor(Math.random() * nodes.length)]
93
- const streamSubscriber = createNetworkNodeWithSimulator(peerDescriptor, simulator, [randomNode.stack.getLayer0Node().getPeerDescriptor()])
93
+ const streamSubscriber = createNetworkNodeWithSimulator(peerDescriptor, simulator, [randomNode.stack.getLayer0Node().getLocalPeerDescriptor()])
94
94
  currentNode = streamSubscriber
95
95
  const start = performance.now()
96
96
  await streamSubscriber.start()
@@ -59,21 +59,24 @@ describe('inspect', () => {
59
59
  publisherNode = createNetworkNode({
60
60
  layer0: {
61
61
  entryPoints: [publisherDescriptor],
62
- peerDescriptor: publisherDescriptor
62
+ peerDescriptor: publisherDescriptor,
63
+ websocketServerEnableTls: false
63
64
  }
64
65
  })
65
66
 
66
67
  inspectedNode = createNetworkNode({
67
68
  layer0: {
68
69
  entryPoints: [publisherDescriptor],
69
- peerDescriptor: inspectedDescriptor
70
+ peerDescriptor: inspectedDescriptor,
71
+ websocketServerEnableTls: false
70
72
  }
71
73
  })
72
74
 
73
75
  inspectorNode = createNetworkNode({
74
76
  layer0: {
75
77
  entryPoints: [publisherDescriptor],
76
- peerDescriptor: inspectorDescriptor
78
+ peerDescriptor: inspectorDescriptor,
79
+ websocketServerEnableTls: false
77
80
  }
78
81
  })
79
82
 
@@ -45,6 +45,7 @@ describe('proxy and full node', () => {
45
45
  layer0: {
46
46
  entryPoints: [proxyNodeDescriptor],
47
47
  peerDescriptor: proxyNodeDescriptor,
48
+ websocketServerEnableTls: false
48
49
  },
49
50
  networkNode: {
50
51
  acceptProxyConnections: true
@@ -57,6 +57,7 @@ describe('Proxy connections', () => {
57
57
  layer0: {
58
58
  entryPoints: [proxyNodeDescriptor1],
59
59
  peerDescriptor: proxyNodeDescriptor1,
60
+ websocketServerEnableTls: false
60
61
  },
61
62
  networkNode: {
62
63
  acceptProxyConnections: true
@@ -69,6 +70,7 @@ describe('Proxy connections', () => {
69
70
  layer0: {
70
71
  entryPoints: [proxyNodeDescriptor1],
71
72
  peerDescriptor: proxyNodeDescriptor2,
73
+ websocketServerEnableTls: false
72
74
  },
73
75
  networkNode: {
74
76
  acceptProxyConnections: true
@@ -33,6 +33,7 @@ describe('proxy group key exchange', () => {
33
33
  layer0: {
34
34
  entryPoints: [proxyNodeDescriptor],
35
35
  peerDescriptor: proxyNodeDescriptor,
36
+ websocketServerEnableTls: false
36
37
  },
37
38
  networkNode: {
38
39
  acceptProxyConnections: true