@streamr/trackerless-network 100.0.0-pretestnet.6 → 100.0.0-rc.1

package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NeighborUpdateRpcRemote = void 0;
 const dht_1 = require("@streamr/dht");
 const utils_1 = require("@streamr/utils");
-const identifiers_1 = require("../../identifiers");
 const logger = new utils_1.Logger(module);
-class NeighborUpdateRpcRemote extends dht_1.Remote {
-    async updateNeighbors(neighbors) {
+class NeighborUpdateRpcRemote extends dht_1.RpcRemote {
+    async updateNeighbors(streamPartId, neighbors) {
         const request = {
-            streamPartId: this.getServiceId(),
+            streamPartId,
             neighborDescriptors: neighbors,
             removeMe: false
         };
@@ -20,7 +19,7 @@ class NeighborUpdateRpcRemote extends dht_1.Remote {
             };
         }
         catch (err) {
-            logger.debug(`updateNeighbors to ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} failed: ${err}`);
+            logger.debug(`updateNeighbors to ${(0, dht_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} failed: ${err}`);
             return {
                 peerDescriptors: [],
                 removeMe: true

package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"NeighborUpdateRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAqD;AACrD,0CAAuC;AACvC,mDAA+D;AAI/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,uBAAwB,SAAQ,YAAgC;IAEzE,KAAK,CAAC,eAAe,CAAC,SAA2B;QAC7C,MAAM,OAAO,GAAmB;YAC5B,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;YACjC,mBAAmB,EAAE,SAAS;YAC9B,QAAQ,EAAE,KAAK;SAClB,CAAA;QACD,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACzF,OAAO;gBACH,eAAe,EAAE,QAAQ,CAAC,mBAAmB;gBAC7C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC9B,CAAA;SACJ;QAAC,OAAO,GAAQ,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YAC1G,OAAO;gBACH,eAAe,EAAE,EAAE;gBACnB,QAAQ,EAAE,IAAI;aACjB,CAAA;SACJ;IACL,CAAC;CACJ;AAtBD,0DAsBC"}
+{"version":3,"file":"NeighborUpdateRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAqF;AACrF,0CAAuC;AAKvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,uBAAwB,SAAQ,eAAkC;IAE3E,KAAK,CAAC,eAAe,CAAC,YAA0B,EAAE,SAA2B;QACzE,MAAM,OAAO,GAAmB;YAC5B,YAAY;YACZ,mBAAmB,EAAE,SAAS;YAC9B,QAAQ,EAAE,KAAK;SAClB,CAAA;QACD,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACzF,OAAO;gBACH,eAAe,EAAE,QAAQ,CAAC,mBAAmB;gBAC7C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC9B,CAAA;QACL,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAA,iCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YAC1G,OAAO;gBACH,eAAe,EAAE,EAAE;gBACnB,QAAQ,EAAE,IAAI;aACjB,CAAA;QACL,CAAC;IACL,CAAC;CACJ;AAtBD,0DAsBC"}

package/dist/src/logic/node-info/NodeInfoClient.d.ts

@@ -0,0 +1,9 @@
+import { DhtCallContext, PeerDescriptor } from '@streamr/dht';
+import { RpcCommunicator } from '@streamr/proto-rpc';
+import { NodeInfo } from '../../NetworkStack';
+export declare class NodeInfoClient {
+    private readonly ownPeerDescriptor;
+    private readonly rpcCommunicator;
+    constructor(ownPeerDescriptor: PeerDescriptor, rpcCommunicator: RpcCommunicator<DhtCallContext>);
+    getInfo(node: PeerDescriptor): Promise<NodeInfo>;
+}

package/dist/src/logic/node-info/NodeInfoClient.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeInfoClient = void 0;
+const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
+const NodeInfoRpcRemote_1 = require("./NodeInfoRpcRemote");
+class NodeInfoClient {
+    ownPeerDescriptor;
+    rpcCommunicator;
+    constructor(ownPeerDescriptor, rpcCommunicator) {
+        this.ownPeerDescriptor = ownPeerDescriptor;
+        this.rpcCommunicator = rpcCommunicator;
+    }
+    async getInfo(node) {
+        const remote = new NodeInfoRpcRemote_1.NodeInfoRpcRemote(this.ownPeerDescriptor, node, this.rpcCommunicator, NetworkRpc_client_1.NodeInfoRpcClient);
+        // TODO remove casting when we validate NodeInfoResponse messages and therefore can annotate
+        // each of the field as required in the decorated type
+        return remote.getInfo();
+    }
+}
+exports.NodeInfoClient = NodeInfoClient;
+//# sourceMappingURL=NodeInfoClient.js.map

package/dist/src/logic/node-info/NodeInfoClient.js.map

@@ -0,0 +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"}

package/dist/src/logic/node-info/NodeInfoRpcLocal.d.ts

@@ -0,0 +1,12 @@
+import { NodeInfoResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
+import { INodeInfoRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
+import { NetworkStack } from '../../NetworkStack';
+import { ListeningRpcCommunicator } from '@streamr/dht';
+export declare const NODE_INFO_RPC_SERVICE_ID = "system/node-info-rpc";
+export declare class NodeInfoRpcLocal implements INodeInfoRpc {
+    private readonly stack;
+    private readonly rpcCommunicator;
+    constructor(stack: NetworkStack, rpcCommunicator: ListeningRpcCommunicator);
+    private registerDefaultServerMethods;
+    getInfo(): Promise<NodeInfoResponse>;
+}

package/dist/src/logic/node-info/NodeInfoRpcLocal.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeInfoRpcLocal = exports.NODE_INFO_RPC_SERVICE_ID = void 0;
+const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
+exports.NODE_INFO_RPC_SERVICE_ID = 'system/node-info-rpc';
+class NodeInfoRpcLocal {
+    stack;
+    rpcCommunicator;
+    constructor(stack, rpcCommunicator) {
+        this.stack = stack;
+        this.rpcCommunicator = rpcCommunicator;
+        this.registerDefaultServerMethods();
+    }
+    registerDefaultServerMethods() {
+        this.rpcCommunicator.registerRpcMethod(NetworkRpc_1.NodeInfoRequest, NetworkRpc_1.NodeInfoResponse, 'getInfo', () => this.getInfo());
+    }
+    async getInfo() {
+        return this.stack.createNodeInfo();
+    }
+}
+exports.NodeInfoRpcLocal = NodeInfoRpcLocal;
+//# sourceMappingURL=NodeInfoRpcLocal.js.map

package/dist/src/logic/node-info/NodeInfoRpcLocal.js.map

@@ -0,0 +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/dist/src/logic/node-info/NodeInfoRpcRemote.d.ts

@@ -0,0 +1,6 @@
+import { NodeInfoResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
+import { NodeInfoRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
+import { RpcRemote } from '@streamr/dht';
+export declare class NodeInfoRpcRemote extends RpcRemote<NodeInfoRpcClient> {
+    getInfo(): Promise<NodeInfoResponse>;
+}

package/dist/src/logic/node-info/NodeInfoRpcRemote.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeInfoRpcRemote = void 0;
+const dht_1 = require("@streamr/dht");
+class NodeInfoRpcRemote extends dht_1.RpcRemote {
+    async getInfo() {
+        return this.getClient().getInfo({}, this.formDhtRpcOptions());
+    }
+}
+exports.NodeInfoRpcRemote = NodeInfoRpcRemote;
+//# sourceMappingURL=NodeInfoRpcRemote.js.map

package/dist/src/logic/node-info/NodeInfoRpcRemote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodeInfoRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/node-info/NodeInfoRpcRemote.ts"],"names":[],"mappings":";;;AAEA,sCAAwC;AAExC,MAAa,iBAAkB,SAAQ,eAA4B;IAE/D,KAAK,CAAC,OAAO;QACT,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;IACjE,CAAC;CAEJ;AAND,8CAMC"}

package/dist/src/logic/propagation/FifoMapWithTTL.js

@@ -12,10 +12,14 @@ const yallist_1 = require("yallist");
  *
  */
 class FifoMapWithTTL {
+    // class invariant: the keys present in `items` and `dropQueue` are the same set.
+    items = new Map();
+    dropQueue = (0, yallist_1.create)(); // queue is used to determine deletion order when full
+    ttlInMs;
+    maxSize;
+    onItemDropped;
+    timeProvider;
     constructor({ ttlInMs, maxSize, onItemDropped = () => { }, timeProvider = Date.now }) {
-        // class invariant: the keys present in `items` and `dropQueue` are the same set.
-        this.items = new Map();
-        this.dropQueue = (0, yallist_1.create)(); // queue is used to determine deletion order when full
         if (ttlInMs < 0) {
             throw new Error(`ttlInMs (${ttlInMs}) cannot be < 0`);
         }

package/dist/src/logic/propagation/FifoMapWithTTL.js.map

@@ -1 +1 @@
-{"version":3,"file":"FifoMapWithTTL.js","sourceRoot":"","sources":["../../../../src/logic/propagation/FifoMapWithTTL.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FifoMapWithTTL.js","sourceRoot":"","sources":["../../../../src/logic/propagation/FifoMapWithTTL.ts"],"names":[],"mappings":"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"}

package/dist/src/logic/propagation/Propagation.d.ts

@@ -1,6 +1,6 @@
-import { NodeID } from '../../identifiers';
+import { DhtAddress } from '@streamr/dht';
 import { StreamMessage } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
-type SendToNeighborFn = (neighborId: NodeID, msg: StreamMessage) => Promise<void>;
+type SendToNeighborFn = (neighborId: DhtAddress, msg: StreamMessage) => Promise<void>;
 interface ConstructorOptions {
     sendToNeighbor: SendToNeighborFn;
     minPropagationTargets: number;
@@ -22,11 +22,11 @@ export declare class Propagation {
     /**
      * Node should invoke this when it learns about a new message
      */
-    feedUnseenMessage(message: StreamMessage, targets: NodeID[], source: NodeID | null): void;
+    feedUnseenMessage(message: StreamMessage, targets: DhtAddress[], source: DhtAddress | null): void;
     /**
      * Node should invoke this when it learns about a new node stream assignment
      */
-    onNeighborJoined(neighborId: NodeID): void;
+    onNeighborJoined(neighborId: DhtAddress): void;
     private sendAndAwaitThenMark;
 }
 export {};

package/dist/src/logic/propagation/Propagation.js

@@ -12,6 +12,9 @@ const DEFAULT_TTL = 30 * 1000;
  * only be propagated exactly once, to neighbors that are present at that moment, in a fire-and-forget manner.
  */
 class Propagation {
+    sendToNeighbor;
+    minPropagationTargets;
+    activeTaskStore;
     constructor({ sendToNeighbor, minPropagationTargets, ttl = DEFAULT_TTL, maxMessages = DEFAULT_MAX_MESSAGES }) {
         this.sendToNeighbor = sendToNeighbor;
         this.minPropagationTargets = minPropagationTargets;
@@ -42,6 +45,7 @@ class Propagation {
     }
     sendAndAwaitThenMark({ message, source, handledNeighbors }, neighborId) {
         if (!handledNeighbors.has(neighborId) && neighborId !== source) {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             (async () => {
                 try {
                     await this.sendToNeighbor(neighborId, message);

package/dist/src/logic/propagation/Propagation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Propagation.js","sourceRoot":"","sources":["../../../../src/logic/propagation/Propagation.ts"],"names":[],"mappings":";;;AAEA,iEAA8E;AAW9E,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAChC,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAA;AAE7B;;;;;;GAMG;AAEH,MAAa,WAAW;IAKpB,YAAY,EACR,cAAc,EACd,qBAAqB,EACrB,GAAG,GAAG,WAAW,EACjB,WAAW,GAAG,oBAAoB,EACjB;QACjB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;QAClD,IAAI,CAAC,eAAe,GAAG,IAAI,2CAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IACrE,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,OAAsB,EAAE,OAAiB,EAAE,MAAqB;QAC9E,MAAM,IAAI,GAAG;YACT,OAAO;YACP,MAAM;YACN,gBAAgB,EAAE,IAAI,GAAG,EAAU;SACtC,CAAA;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;SAC1C;IACL,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,UAAkB;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,CAAA;QACxC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;SAC9C;IACL,CAAC;IAEO,oBAAoB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAmB,EAAE,UAAkB;QACnG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,UAAU,KAAK,MAAM,EAAE;YAC5D,CAAC,KAAK,IAAI,EAAE;gBACR,IAAI;oBACA,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;iBACjD;gBAAC,MAAM;oBACJ,OAAM;iBACT;gBACD,qGAAqG;gBACrG,4FAA4F;gBAC5F,0DAA0D;gBAC1D,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBAChC,IAAI,gBAAgB,CAAC,IAAI,IAAI,IAAI,CAAC,qBAAqB,EAAE;oBACrD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAU,CAAC,CAAA;iBAClD;YACL,CAAC,CAAC,EAAE,CAAA;SACP;IACL,CAAC;CACJ;AA3DD,kCA2DC"}
+{"version":3,"file":"Propagation.js","sourceRoot":"","sources":["../../../../src/logic/propagation/Propagation.ts"],"names":[],"mappings":";;;AAEA,iEAA8E;AAW9E,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAChC,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAA;AAE7B;;;;;;GAMG;AAEH,MAAa,WAAW;IACH,cAAc,CAAkB;IAChC,qBAAqB,CAAQ;IAC7B,eAAe,CAAsB;IAEtD,YAAY,EACR,cAAc,EACd,qBAAqB,EACrB,GAAG,GAAG,WAAW,EACjB,WAAW,GAAG,oBAAoB,EACjB;QACjB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;QAClD,IAAI,CAAC,eAAe,GAAG,IAAI,2CAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IACrE,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,OAAsB,EAAE,OAAqB,EAAE,MAAyB;QACtF,MAAM,IAAI,GAAG;YACT,OAAO;YACP,MAAM;YACN,gBAAgB,EAAE,IAAI,GAAG,EAAc;SAC1C,CAAA;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC3C,CAAC;IACL,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,UAAsB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,CAAA;QACxC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAC/C,CAAC;IACL,CAAC;IAEO,oBAAoB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAmB,EAAE,UAAsB;QACvG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;YAC7D,mEAAmE;YACnE,CAAC,KAAK,IAAI,EAAE;gBACR,IAAI,CAAC;oBACD,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;gBAClD,CAAC;gBAAC,MAAM,CAAC;oBACL,OAAM;gBACV,CAAC;gBACD,qGAAqG;gBACrG,4FAA4F;gBAC5F,0DAA0D;gBAC1D,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBAChC,IAAI,gBAAgB,CAAC,IAAI,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;oBACtD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAU,CAAC,CAAA;gBACnD,CAAC;YACL,CAAC,CAAC,EAAE,CAAA;QACR,CAAC;IACL,CAAC;CACJ;AA5DD,kCA4DC"}

package/dist/src/logic/propagation/PropagationTaskStore.d.ts

@@ -1,9 +1,9 @@
-import { NodeID } from '../../identifiers';
+import { DhtAddress } from '@streamr/dht';
 import { MessageRef, StreamMessage } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
 export interface PropagationTask {
     message: StreamMessage;
     source: string | null;
-    handledNeighbors: Set<NodeID>;
+    handledNeighbors: Set<DhtAddress>;
 }
 /**
  * Keeps track of propagation tasks for the needs of message propagation logic.

package/dist/src/logic/propagation/PropagationTaskStore.js

@@ -11,6 +11,7 @@ const FifoMapWithTTL_1 = require("./FifoMapWithTTL");
  * - Items have a TTL, after which they are considered stale and not returned when querying
 **/
 class PropagationTaskStore {
+    tasks;
     constructor(ttlInMs, maxTasks) {
         this.tasks = new FifoMapWithTTL_1.FifoMapWithTTL({
             ttlInMs,

package/dist/src/logic/propagation/PropagationTaskStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"PropagationTaskStore.js","sourceRoot":"","sources":["../../../../src/logic/propagation/PropagationTaskStore.ts"],"names":[],"mappings":";;;AAEA,qDAAiD;AAQjD;;;;;;;GAOG;AACH,MAAa,oBAAoB;IAG7B,YAAY,OAAe,EAAE,QAAgB;QACzC,IAAI,CAAC,KAAK,GAAG,IAAI,+BAAc,CAA8B;YACzD,OAAO;YACP,OAAO,EAAE,QAAQ;SACpB,CAAC,CAAA;IACN,CAAC;IAED,GAAG;QACC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACxD,CAAC;IAED,GAAG,CAAC,IAAqB;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAU,CAAA;QACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,CAAC,SAAqB;QACxB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA,CAAC,sCAAsC;IACvE,CAAC;CACJ;AAtBD,oDAsBC"}
+{"version":3,"file":"PropagationTaskStore.js","sourceRoot":"","sources":["../../../../src/logic/propagation/PropagationTaskStore.ts"],"names":[],"mappings":";;;AAEA,qDAAiD;AAQjD;;;;;;;GAOG;AACH,MAAa,oBAAoB;IACZ,KAAK,CAA6C;IAEnE,YAAY,OAAe,EAAE,QAAgB;QACzC,IAAI,CAAC,KAAK,GAAG,IAAI,+BAAc,CAA8B;YACzD,OAAO;YACP,OAAO,EAAE,QAAQ;SACpB,CAAC,CAAA;IACN,CAAC;IAED,GAAG;QACC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACxD,CAAC;IAED,GAAG,CAAC,IAAqB;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAU,CAAA;QACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,CAAC,SAAqB;QACxB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA,CAAC,sCAAsC;IACvE,CAAC;CACJ;AAtBD,oDAsBC"}

package/dist/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.js

@@ -10,7 +10,7 @@ class GroupKeyRequestTranslator {
             recipientId: (0, utils_1.hexToBinary)(msg.recipient),
             requestId: msg.requestId,
             rsaPublicKey: (0, utils_1.utf8ToBinary)(msg.rsaPublicKey),
-            groupKeyIds: msg.groupKeyIds
+            groupKeyIds: [...msg.groupKeyIds]
         };
         return translated;
     }

package/dist/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.js.map

@@ -1 +1 @@
-{"version":3,"file":"GroupKeyRequestTranslator.js","sourceRoot":"","sources":["../../../../../src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.ts"],"names":[],"mappings":";;;AAAA,gDAAyE;AAEzE,0CAAwG;AAExG,kEAAkE;AAClE,MAAa,yBAAyB;IAElC,MAAM,CAAC,UAAU,CAAC,GAAuB;QACrC,MAAM,UAAU,GAAoB;YAChC,WAAW,EAAE,IAAA,mBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;YACvC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,YAAY,EAAE,IAAA,oBAAY,EAAC,GAAG,CAAC,YAAY,CAAC;YAC5C,WAAW,EAAE,GAAG,CAAC,WAAW;SAC/B,CAAA;QACD,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,GAAoB;QACxC,MAAM,UAAU,GAAG,IAAI,0BAAkB,CAAC;YACtC,SAAS,EAAE,IAAA,yBAAiB,EAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAChE,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,YAAY,EAAE,IAAA,oBAAY,EAAC,GAAG,CAAC,YAAY,CAAC;YAC5C,WAAW,EAAE,GAAG,CAAC,WAAW;SAC/B,CAAC,CAAA;QACF,OAAO,UAAU,CAAA;IACrB,CAAC;CAEJ;AAtBD,8DAsBC"}
+{"version":3,"file":"GroupKeyRequestTranslator.js","sourceRoot":"","sources":["../../../../../src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.ts"],"names":[],"mappings":";;;AAAA,gDAAyE;AAEzE,0CAAwG;AAExG,kEAAkE;AAClE,MAAa,yBAAyB;IAElC,MAAM,CAAC,UAAU,CAAC,GAAuB;QACrC,MAAM,UAAU,GAAoB;YAChC,WAAW,EAAE,IAAA,mBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;YACvC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,YAAY,EAAE,IAAA,oBAAY,EAAC,GAAG,CAAC,YAAY,CAAC;YAC5C,WAAW,EAAE,CAAC,GAAG,GAAG,CAAC,WAAW,CAAC;SACpC,CAAA;QACD,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,GAAoB;QACxC,MAAM,UAAU,GAAG,IAAI,0BAAkB,CAAC;YACtC,SAAS,EAAE,IAAA,yBAAiB,EAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAChE,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,YAAY,EAAE,IAAA,oBAAY,EAAC,GAAG,CAAC,YAAY,CAAC;YAC5C,WAAW,EAAE,GAAG,CAAC,WAAW;SAC/B,CAAC,CAAA;QACF,OAAO,UAAU,CAAA;IACrB,CAAC;CAEJ;AAtBD,8DAsBC"}

package/dist/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.js

@@ -9,7 +9,7 @@ class GroupKeyResponseTranslator {
         const groupKeys = msg.encryptedGroupKeys.map((groupKey) => {
             return {
                 data: groupKey.data,
-                id: groupKey.groupKeyId
+                id: groupKey.id
             };
         });
         const translated = {

package/dist/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.js.map

@@ -1 +1 @@
-{"version":3,"file":"GroupKeyResponseTranslator.js","sourceRoot":"","sources":["../../../../../src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.ts"],"names":[],"mappings":";;;AAAA,gDAAsH;AAEtH,0CAA4E;AAE5E,kEAAkE;AAClE,MAAa,0BAA0B;IAEnC,MAAM,CAAC,UAAU,CAAC,GAAwB;QAEtC,MAAM,SAAS,GAAG,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACtD,OAAO;gBACH,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,EAAE,EAAE,QAAQ,CAAC,UAAU;aAC1B,CAAA;QACL,CAAC,CAAC,CAAA;QACF,MAAM,UAAU,GAAqB;YACjC,WAAW,EAAE,IAAA,mBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;YACvC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS;SACZ,CAAA;QACD,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,GAAqB;QACzC,MAAM,kBAAkB,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,IAAI,4BAAoB,CACzF,QAAQ,CAAC,EAAE,EACX,QAAQ,CAAC,IAAI,CAChB,CAAC,CAAA;QACF,OAAO,IAAI,2BAAmB,CAAC;YAC3B,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,IAAA,yBAAiB,EAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAChE,kBAAkB;SACrB,CAAC,CAAA;IACN,CAAC;CACJ;AA7BD,gEA6BC"}
+{"version":3,"file":"GroupKeyResponseTranslator.js","sourceRoot":"","sources":["../../../../../src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.ts"],"names":[],"mappings":";;;AAAA,gDAAsH;AAEtH,0CAA4E;AAE5E,kEAAkE;AAClE,MAAa,0BAA0B;IAEnC,MAAM,CAAC,UAAU,CAAC,GAAwB;QACtC,MAAM,SAAS,GAAG,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACtD,OAAO;gBACH,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,EAAE,EAAE,QAAQ,CAAC,EAAE;aAClB,CAAA;QACL,CAAC,CAAC,CAAA;QACF,MAAM,UAAU,GAAqB;YACjC,WAAW,EAAE,IAAA,mBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;YACvC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS;SACZ,CAAA;QACD,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,GAAqB;QACzC,MAAM,kBAAkB,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,IAAI,4BAAoB,CACzF,QAAQ,CAAC,EAAE,EACX,QAAQ,CAAC,IAAI,CAChB,CAAC,CAAA;QACF,OAAO,IAAI,2BAAmB,CAAC;YAC3B,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,IAAA,yBAAiB,EAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAChE,kBAAkB;SACrB,CAAC,CAAA;IACN,CAAC;CACJ;AA5BD,gEA4BC"}

package/dist/src/logic/protocol-integration/stream-message/StreamMessageTranslator.js

@@ -4,8 +4,6 @@ exports.StreamMessageTranslator = void 0;
 const protocol_1 = require("@streamr/protocol");
 const NetworkRpc_1 = require("../../../proto/packages/trackerless-network/protos/NetworkRpc");
 const utils_1 = require("@streamr/utils");
-const GroupKeyRequestTranslator_1 = require("./GroupKeyRequestTranslator");
-const GroupKeyResponseTranslator_1 = require("./GroupKeyResponseTranslator");
 const oldToNewEncryptionType = (type) => {
     if (type === protocol_1.EncryptionType.AES) {
         return NetworkRpc_1.EncryptionType.AES;
@@ -18,26 +16,33 @@ const newToOldEncryptionType = (type) => {
     }
     return protocol_1.EncryptionType.NONE;
 };
+const oldToNewContentType = (type) => {
+    if (type === protocol_1.ContentType.JSON) {
+        return NetworkRpc_1.ContentType.JSON;
+    }
+    return NetworkRpc_1.ContentType.BINARY;
+};
+const newToOldContentType = (type) => {
+    if (type === NetworkRpc_1.ContentType.JSON) {
+        return protocol_1.ContentType.JSON;
+    }
+    return protocol_1.ContentType.BINARY;
+};
+const oldToNewSignatureType = (type) => {
+    if (type === protocol_1.SignatureType.LEGACY_SECP256K1) {
+        return NetworkRpc_1.SignatureType.LEGACY_SECP256K1;
+    }
+    return NetworkRpc_1.SignatureType.SECP256K1;
+};
+const newToOldSignatureType = (type) => {
+    if (type === NetworkRpc_1.SignatureType.LEGACY_SECP256K1) {
+        return protocol_1.SignatureType.LEGACY_SECP256K1;
+    }
+    return protocol_1.SignatureType.SECP256K1;
+};
 // eslint-disable-next-line @typescript-eslint/no-extraneous-class
 class StreamMessageTranslator {
     static toProtobuf(msg) {
-        let content;
-        let messageType;
-        if (msg.messageType === protocol_1.StreamMessageType.MESSAGE) {
-            content = msg.serializedContent;
-            messageType = NetworkRpc_1.StreamMessageType.MESSAGE;
-        }
-        else if (msg.messageType === protocol_1.StreamMessageType.GROUP_KEY_REQUEST) {
-            content = NetworkRpc_1.GroupKeyRequest.toBinary(GroupKeyRequestTranslator_1.GroupKeyRequestTranslator.toProtobuf(protocol_1.GroupKeyRequest.deserialize((0, utils_1.binaryToUtf8)(msg.serializedContent), protocol_1.StreamMessageType.GROUP_KEY_REQUEST)));
-            messageType = NetworkRpc_1.StreamMessageType.GROUP_KEY_REQUEST;
-        }
-        else if (msg.messageType === protocol_1.StreamMessageType.GROUP_KEY_RESPONSE) {
-            content = NetworkRpc_1.GroupKeyResponse.toBinary(GroupKeyResponseTranslator_1.GroupKeyResponseTranslator.toProtobuf(protocol_1.GroupKeyResponse.deserialize((0, utils_1.binaryToUtf8)(msg.serializedContent), protocol_1.StreamMessageType.GROUP_KEY_RESPONSE)));
-            messageType = NetworkRpc_1.StreamMessageType.GROUP_KEY_RESPONSE;
-        }
-        else {
-            throw new Error('invalid message type');
-        }
         const messageId = {
             timestamp: msg.getTimestamp(),
             sequenceNumber: msg.getSequenceNumber(),
@@ -47,54 +52,86 @@ class StreamMessageTranslator {
             messageChainId: msg.getMsgChainId()
         };
         let previousMessageRef = undefined;
-        if (msg.getPreviousMessageRef()) {
+        if (msg.prevMsgRef) {
             previousMessageRef = {
-                timestamp: msg.getPreviousMessageRef().timestamp,
-                sequenceNumber: msg.getPreviousMessageRef().sequenceNumber,
+                timestamp: msg.prevMsgRef.timestamp,
+                sequenceNumber: msg.prevMsgRef.sequenceNumber
             };
         }
-        let newGroupKey = undefined;
-        if (msg.getNewGroupKey()) {
-            newGroupKey = {
-                id: msg.getNewGroupKey().groupKeyId,
-                data: msg.getNewGroupKey().data
+        let body;
+        if (msg.messageType === protocol_1.StreamMessageType.MESSAGE) {
+            let newGroupKey = undefined;
+            if (msg.newGroupKey) {
+                newGroupKey = {
+                    id: msg.newGroupKey.id,
+                    data: msg.newGroupKey.data
+                };
+            }
+            body = {
+                oneofKind: 'contentMessage',
+                contentMessage: {
+                    content: msg.content,
+                    contentType: oldToNewContentType(msg.contentType),
+                    encryptionType: oldToNewEncryptionType(msg.encryptionType),
+                    groupKeyId: msg.groupKeyId ?? undefined,
+                    newGroupKey
+                }
+            };
+        }
+        else if (msg.messageType === protocol_1.StreamMessageType.GROUP_KEY_REQUEST) {
+            body = {
+                oneofKind: 'groupKeyRequest',
+                groupKeyRequest: NetworkRpc_1.GroupKeyRequest.fromBinary(msg.content)
+            };
+        }
+        else if (msg.messageType === protocol_1.StreamMessageType.GROUP_KEY_RESPONSE) {
+            body = {
+                oneofKind: 'groupKeyResponse',
+                groupKeyResponse: NetworkRpc_1.GroupKeyResponse.fromBinary(msg.content)
             };
         }
+        else {
+            throw new Error('invalid message type');
+        }
         const translated = {
             messageId,
             previousMessageRef,
-            content,
-            messageType,
-            contentType: NetworkRpc_1.ContentType.JSON,
-            encryptionType: oldToNewEncryptionType(msg.encryptionType),
-            groupKeyId: msg.groupKeyId ?? undefined,
-            newGroupKey,
-            signature: msg.signature
+            signature: msg.signature,
+            signatureType: oldToNewSignatureType(msg.signatureType),
+            body
         };
         return translated;
     }
     static toClientProtocol(msg) {
-        let content;
         let messageType;
-        if (msg.messageType === NetworkRpc_1.StreamMessageType.MESSAGE) {
+        let content;
+        let contentType = protocol_1.ContentType.BINARY;
+        let encryptionType = protocol_1.EncryptionType.NONE;
+        let newGroupKey = undefined;
+        let groupKeyId = undefined;
+        if (msg.body.oneofKind === 'contentMessage') {
             messageType = protocol_1.StreamMessageType.MESSAGE;
-            content = msg.content;
+            content = msg.body.contentMessage.content;
+            contentType = newToOldContentType(msg.body.contentMessage.contentType);
+            encryptionType = newToOldEncryptionType(msg.body.contentMessage.encryptionType);
+            if (msg.body.contentMessage.newGroupKey) {
+                newGroupKey = new protocol_1.EncryptedGroupKey(msg.body.contentMessage.newGroupKey.id, msg.body.contentMessage.newGroupKey.data);
+            }
+            groupKeyId = msg.body.contentMessage.groupKeyId;
         }
-        else if (msg.messageType === NetworkRpc_1.StreamMessageType.GROUP_KEY_REQUEST) {
+        else if (msg.body.oneofKind === 'groupKeyRequest') {
             messageType = protocol_1.StreamMessageType.GROUP_KEY_REQUEST;
             try {
-                const parsedRequest = NetworkRpc_1.GroupKeyRequest.fromBinary(msg.content);
-                content = (0, utils_1.utf8ToBinary)(GroupKeyRequestTranslator_1.GroupKeyRequestTranslator.toClientProtocol(parsedRequest).serialize());
+                content = NetworkRpc_1.GroupKeyRequest.toBinary(msg.body.groupKeyRequest);
             }
             catch (err) {
                 throw new Error(`invalid group key request: ${err}`);
             }
         }
-        else if (msg.messageType === NetworkRpc_1.StreamMessageType.GROUP_KEY_RESPONSE) {
+        else if (msg.body.oneofKind === 'groupKeyResponse') {
             messageType = protocol_1.StreamMessageType.GROUP_KEY_RESPONSE;
             try {
-                const parsedResponse = NetworkRpc_1.GroupKeyResponse.fromBinary(msg.content);
-                content = (0, utils_1.utf8ToBinary)(GroupKeyResponseTranslator_1.GroupKeyResponseTranslator.toClientProtocol(parsedResponse).serialize());
+                content = NetworkRpc_1.GroupKeyResponse.toBinary(msg.body.groupKeyResponse);
             }
             catch (err) {
                 throw new Error(`invalid group key response: ${err}`);
@@ -108,20 +145,17 @@ class StreamMessageTranslator {
         if (msg.previousMessageRef) {
             prevMsgRef = new protocol_1.MessageRef(Number(msg.previousMessageRef.timestamp), msg.previousMessageRef.sequenceNumber);
         }
-        let newGroupKey = undefined;
-        if (msg.newGroupKey) {
-            newGroupKey = new protocol_1.EncryptedGroupKey(msg.newGroupKey.id, msg.newGroupKey.data);
-        }
         const translated = new protocol_1.StreamMessage({
             messageId,
             prevMsgRef,
-            content,
             messageType,
-            contentType: protocol_1.ContentType.JSON,
-            encryptionType: newToOldEncryptionType(msg.encryptionType),
-            groupKeyId: msg.groupKeyId,
-            newGroupKey,
-            signature: msg.signature
+            content,
+            contentType,
+            signature: msg.signature,
+            signatureType: newToOldSignatureType(msg.signatureType),
+            encryptionType,
+            groupKeyId,
+            newGroupKey
         });
         return translated;
     }

package/dist/src/logic/protocol-integration/stream-message/StreamMessageTranslator.js.map

@@ -1 +1 @@
-{"version":3,"file":"StreamMessageTranslator.js","sourceRoot":"","sources":["../../../../../src/logic/protocol-integration/stream-message/StreamMessageTranslator.ts"],"names":[],"mappings":";;;AAAA,gDAW0B;AAC1B,8FAUsE;AACtE,0CAAwG;AACxG,2EAAuE;AACvE,6EAAyE;AAEzE,MAAM,sBAAsB,GAAG,CAAC,IAAuB,EAAkB,EAAE;IACvE,IAAI,IAAI,KAAK,yBAAiB,CAAC,GAAG,EAAE;QAChC,OAAO,2BAAc,CAAC,GAAG,CAAA;KAC5B;IACD,OAAO,2BAAc,CAAC,IAAI,CAAA;AAC9B,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,CAAC,IAAoB,EAAqB,EAAE;IACvE,IAAI,IAAI,KAAK,2BAAc,CAAC,GAAG,EAAE;QAC7B,OAAO,yBAAiB,CAAC,GAAG,CAAA;KAC/B;IACD,OAAO,yBAAiB,CAAC,IAAI,CAAA;AACjC,CAAC,CAAA;AAED,kEAAkE;AAClE,MAAa,uBAAuB;IAEhC,MAAM,CAAC,UAAU,CAAC,GAAqB;QACnC,IAAI,OAAmB,CAAA;QACvB,IAAI,WAA8B,CAAA;QAClC,IAAI,GAAG,CAAC,WAAW,KAAK,4BAAoB,CAAC,OAAO,EAAE;YAClD,OAAO,GAAG,GAAG,CAAC,iBAAiB,CAAA;YAC/B,WAAW,GAAG,8BAAiB,CAAC,OAAO,CAAA;SAC1C;aAAM,IAAI,GAAG,CAAC,WAAW,KAAK,4BAAoB,CAAC,iBAAiB,EAAE;YACnE,OAAO,GAAG,4BAAe,CAAC,QAAQ,CAC9B,qDAAyB,CAAC,UAAU,CAChC,0BAAkB,CAAC,WAAW,CAC1B,IAAA,oBAAY,EAAC,GAAG,CAAC,iBAAiB,CAAC,EACnC,4BAAoB,CAAC,iBAAiB,CAAuB,CACpE,CACJ,CAAA;YACD,WAAW,GAAG,8BAAiB,CAAC,iBAAiB,CAAA;SACpD;aAAM,IAAI,GAAG,CAAC,WAAW,KAAK,4BAAoB,CAAC,kBAAkB,EAAE;YACpE,OAAO,GAAG,6BAAgB,CAAC,QAAQ,CAC/B,uDAA0B,CAAC,UAAU,CACjC,2BAAmB,CAAC,WAAW,CAC3B,IAAA,oBAAY,EAAC,GAAG,CAAC,iBAAiB,CAAC,EACnC,4BAAoB,CAAC,kBAAkB,CAAwB,CACtE,CACJ,CAAA;YACD,WAAW,GAAG,8BAAiB,CAAC,kBAAkB,CAAA;SACrD;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SAC1C;QACD,MAAM,SAAS,GAAc;YACzB,SAAS,EAAE,GAAG,CAAC,YAAY,EAAE;YAC7B,cAAc,EAAE,GAAG,CAAC,iBAAiB,EAAE;YACvC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAY;YACrC,eAAe,EAAE,GAAG,CAAC,kBAAkB,EAAE;YACzC,WAAW,EAAE,IAAA,mBAAW,EAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YAC9C,cAAc,EAAE,GAAG,CAAC,aAAa,EAAE;SACtC,CAAA;QACD,IAAI,kBAAkB,GAA2B,SAAS,CAAA;QAC1D,IAAI,GAAG,CAAC,qBAAqB,EAAE,EAAE;YAC7B,kBAAkB,GAAG;gBACjB,SAAS,EAAE,GAAG,CAAC,qBAAqB,EAAG,CAAC,SAAS;gBACjD,cAAc,EAAE,GAAG,CAAC,qBAAqB,EAAG,CAAC,cAAc;aAC9D,CAAA;SACJ;QACD,IAAI,WAAW,GAAyB,SAAS,CAAA;QACjD,IAAI,GAAG,CAAC,cAAc,EAAE,EAAE;YACtB,WAAW,GAAG;gBACV,EAAE,EAAE,GAAG,CAAC,cAAc,EAAG,CAAC,UAAU;gBACpC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAG,CAAC,IAAI;aACnC,CAAA;SACJ;QACD,MAAM,UAAU,GAAkB;YAC9B,SAAS;YACT,kBAAkB;YAClB,OAAO;YACP,WAAW;YACX,WAAW,EAAE,wBAAW,CAAC,IAAI;YAC7B,cAAc,EAAE,sBAAsB,CAAC,GAAG,CAAC,cAAc,CAAC;YAC1D,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,SAAS;YACvC,WAAW;YACX,SAAS,EAAE,GAAG,CAAC,SAAS;SAC3B,CAAA;QACD,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,GAAkB;QACtC,IAAI,OAAmB,CAAA;QACvB,IAAI,WAAiC,CAAA;QACrC,IAAI,GAAG,CAAC,WAAW,KAAK,8BAAiB,CAAC,OAAO,EAAE;YAC/C,WAAW,GAAG,4BAAoB,CAAC,OAAO,CAAA;YAC1C,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;SACxB;aAAM,IAAI,GAAG,CAAC,WAAW,KAAK,8BAAiB,CAAC,iBAAiB,EAAE;YAChE,WAAW,GAAG,4BAAoB,CAAC,iBAAiB,CAAA;YACpD,IAAI;gBACA,MAAM,aAAa,GAAG,4BAAe,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAC7D,OAAO,GAAG,IAAA,oBAAY,EAAC,qDAAyB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;aAChG;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAA;aACvD;SACJ;aAAM,IAAI,GAAG,CAAC,WAAW,KAAK,8BAAiB,CAAC,kBAAkB,EAAE;YACjE,WAAW,GAAG,4BAAoB,CAAC,kBAAkB,CAAA;YACrD,IAAI;gBACA,MAAM,cAAc,GAAG,6BAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAC/D,OAAO,GAAG,IAAA,oBAAY,EAAC,uDAA0B,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;aAClG;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAA;aACxD;SACJ;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;SAC1C;QACD,MAAM,SAAS,GAAG,IAAI,oBAAY,CAC9B,GAAG,CAAC,SAAU,CAAC,QAAoB,EACnC,GAAG,CAAC,SAAU,CAAC,eAAe,EAC9B,MAAM,CAAC,GAAG,CAAC,SAAU,CAAC,SAAS,CAAC,EAChC,GAAG,CAAC,SAAU,CAAC,cAAc,EAC7B,IAAA,yBAAiB,EAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,SAAU,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,EAChE,GAAG,CAAC,SAAU,CAAC,cAAc,CAChC,CAAA;QACD,IAAI,UAAU,GAA8B,SAAS,CAAA;QACrD,IAAI,GAAG,CAAC,kBAAkB,EAAE;YACxB,UAAU,GAAG,IAAI,qBAAa,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;SAClH;QACD,IAAI,WAAW,GAAqC,SAAS,CAAA;QAC7D,IAAI,GAAG,CAAC,WAAW,EAAE;YACjB,WAAW,GAAG,IAAI,4BAAoB,CAClC,GAAG,CAAC,WAAW,CAAC,EAAE,EAClB,GAAG,CAAC,WAAW,CAAC,IAAI,CACvB,CAAA;SACJ;QACD,MAAM,UAAU,GAAG,IAAI,wBAAgB,CAAC;YACpC,SAAS;YACT,UAAU;YACV,OAAO;YACP,WAAW;YACX,WAAW,EAAE,sBAAc,CAAC,IAAI;YAChC,cAAc,EAAE,sBAAsB,CAAC,GAAG,CAAC,cAAc,CAAC;YAC1D,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,WAAW;YACX,SAAS,EAAE,GAAG,CAAC,SAAS;SAC3B,CAAC,CAAA;QACF,OAAO,UAAU,CAAA;IACrB,CAAC;CACJ;AA1HD,0DA0HC"}
+{"version":3,"file":"StreamMessageTranslator.js","sourceRoot":"","sources":["../../../../../src/logic/protocol-integration/stream-message/StreamMessageTranslator.ts"],"names":[],"mappings":"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"}

package/dist/src/logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils.d.ts

@@ -0,0 +1,7 @@
+import { StreamMessage as OldStreamMessage, GroupKeyRequest as OldGroupKeyRequest, GroupKeyResponse as OldGroupKeyResponse } from '@streamr/protocol';
+export declare function convertStreamMessageToBytes(oldStreamMessage: OldStreamMessage): Uint8Array;
+export declare function convertBytesToStreamMessage(bytes: Uint8Array): OldStreamMessage;
+export declare const convertGroupKeyRequestToBytes: (oldGroupKeyRequest: OldGroupKeyRequest) => Uint8Array;
+export declare const convertBytesToGroupKeyRequest: (bytes: Uint8Array) => OldGroupKeyRequest;
+export declare const convertGroupKeyResponseToBytes: (oldGroupKeyResponse: OldGroupKeyResponse) => Uint8Array;
+export declare const convertBytesToGroupKeyResponse: (bytes: Uint8Array) => OldGroupKeyResponse;

package/dist/src/logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertBytesToGroupKeyResponse = exports.convertGroupKeyResponseToBytes = exports.convertBytesToGroupKeyRequest = exports.convertGroupKeyRequestToBytes = exports.convertBytesToStreamMessage = exports.convertStreamMessageToBytes = void 0;
+const StreamMessageTranslator_1 = require("./StreamMessageTranslator");
+const NetworkRpc_1 = require("../../../proto/packages/trackerless-network/protos/NetworkRpc");
+const GroupKeyResponseTranslator_1 = require("./GroupKeyResponseTranslator");
+const GroupKeyRequestTranslator_1 = require("./GroupKeyRequestTranslator");
+function convertStreamMessageToBytes(oldStreamMessage) {
+    return NetworkRpc_1.StreamMessage.toBinary(StreamMessageTranslator_1.StreamMessageTranslator.toProtobuf(oldStreamMessage));
+}
+exports.convertStreamMessageToBytes = convertStreamMessageToBytes;
+function convertBytesToStreamMessage(bytes) {
+    return StreamMessageTranslator_1.StreamMessageTranslator.toClientProtocol(NetworkRpc_1.StreamMessage.fromBinary(bytes));
+}
+exports.convertBytesToStreamMessage = convertBytesToStreamMessage;
+const convertGroupKeyRequestToBytes = (oldGroupKeyRequest) => {
+    return NetworkRpc_1.GroupKeyRequest.toBinary(GroupKeyRequestTranslator_1.GroupKeyRequestTranslator.toProtobuf(oldGroupKeyRequest));
+};
+exports.convertGroupKeyRequestToBytes = convertGroupKeyRequestToBytes;
+const convertBytesToGroupKeyRequest = (bytes) => {
+    return GroupKeyRequestTranslator_1.GroupKeyRequestTranslator.toClientProtocol(NetworkRpc_1.GroupKeyRequest.fromBinary(bytes));
+};
+exports.convertBytesToGroupKeyRequest = convertBytesToGroupKeyRequest;
+const convertGroupKeyResponseToBytes = (oldGroupKeyResponse) => {
+    return NetworkRpc_1.GroupKeyResponse.toBinary(GroupKeyResponseTranslator_1.GroupKeyResponseTranslator.toProtobuf(oldGroupKeyResponse));
+};
+exports.convertGroupKeyResponseToBytes = convertGroupKeyResponseToBytes;
+const convertBytesToGroupKeyResponse = (bytes) => {
+    return GroupKeyResponseTranslator_1.GroupKeyResponseTranslator.toClientProtocol(NetworkRpc_1.GroupKeyResponse.fromBinary(bytes));
+};
+exports.convertBytesToGroupKeyResponse = convertBytesToGroupKeyResponse;
+//# sourceMappingURL=oldStreamMessageBinaryUtils.js.map

package/dist/src/logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oldStreamMessageBinaryUtils.js","sourceRoot":"","sources":["../../../../../src/logic/protocol-integration/stream-message/oldStreamMessageBinaryUtils.ts"],"names":[],"mappings":";;;AAKA,uEAAmE;AACnE,8FAIsE;AACtE,6EAAyE;AACzE,2EAAuE;AAEvE,SAAgB,2BAA2B,CAAC,gBAAkC;IAC1E,OAAO,0BAAa,CAAC,QAAQ,CAAC,iDAAuB,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAA;AACvF,CAAC;AAFD,kEAEC;AAED,SAAgB,2BAA2B,CAAC,KAAiB;IACzD,OAAO,iDAAuB,CAAC,gBAAgB,CAAC,0BAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;AACpF,CAAC;AAFD,kEAEC;AAEM,MAAM,6BAA6B,GAAG,CAAC,kBAAsC,EAAc,EAAE;IAChG,OAAO,4BAAe,CAAC,QAAQ,CAAC,qDAAyB,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAA;AAC7F,CAAC,CAAA;AAFY,QAAA,6BAA6B,iCAEzC;AAEM,MAAM,6BAA6B,GAAG,CAAC,KAAiB,EAAsB,EAAE;IACnF,OAAO,qDAAyB,CAAC,gBAAgB,CAAC,4BAAe,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;AACxF,CAAC,CAAA;AAFY,QAAA,6BAA6B,iCAEzC;AAEM,MAAM,8BAA8B,GAAG,CAAC,mBAAwC,EAAc,EAAE;IACnG,OAAO,6BAAgB,CAAC,QAAQ,CAAC,uDAA0B,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAA;AAChG,CAAC,CAAA;AAFY,QAAA,8BAA8B,kCAE1C;AAEM,MAAM,8BAA8B,GAAG,CAAC,KAAiB,EAAuB,EAAE;IACrF,OAAO,uDAA0B,CAAC,gBAAgB,CAAC,6BAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;AAC1F,CAAC,CAAA;AAFY,QAAA,8BAA8B,kCAE1C"}

package/dist/src/logic/proxy/ProxyClient.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="node" />
-import { ConnectionLocker, ITransport, PeerDescriptor } from '@streamr/dht';
+import { ConnectionLocker, DhtAddress, ITransport, PeerDescriptor } from '@streamr/dht';
 import { StreamPartID } from '@streamr/protocol';
 import { EthereumAddress } from '@streamr/utils';
 import { EventEmitter } from 'eventemitter3';
-import { NodeID } from '../../identifiers';
 import { ProxyDirection, StreamMessage } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
 export declare const retry: <T>(task: () => Promise<T>, description: string, abortSignal: AbortSignal, delay?: number) => Promise<T>;
 interface ProxyClientConfig {
@@ -13,7 +12,10 @@ interface ProxyClientConfig {
     connectionLocker: ConnectionLocker;
     minPropagationTargets?: number;
 }
-export declare class ProxyClient extends EventEmitter {
+interface Events {
+    message: (message: StreamMessage) => void;
+}
+export declare class ProxyClient extends EventEmitter<Events> {
     private readonly rpcCommunicator;
     private readonly deliveryRpcLocal;
     private readonly config;
@@ -21,7 +23,7 @@ export declare class ProxyClient extends EventEmitter {
     private definition?;
     private readonly connections;
     private readonly propagation;
-    private readonly targetNeighbors;
+    private readonly neighbors;
     private readonly abortController;
     constructor(config: ProxyClientConfig);
     private registerDefaultServerMethods;
@@ -33,8 +35,8 @@ export declare class ProxyClient extends EventEmitter {
     private closeRandomConnections;
     private closeConnection;
     private removeConnection;
-    broadcast(msg: StreamMessage, previousNode?: NodeID): void;
-    hasConnection(nodeId: NodeID, direction: ProxyDirection): boolean;
+    broadcast(msg: StreamMessage, previousNode?: DhtAddress): void;
+    hasConnection(nodeId: DhtAddress, direction: ProxyDirection): boolean;
     getDirection(): ProxyDirection;
     private onNodeDisconnected;
     start(): Promise<void>;