@streamr/trackerless-network 101.0.0-beta.2 → 101.0.0-beta.4

package/test/unit/ContentDeliveryLayerNode.test.ts

@@ -1,15 +1,14 @@
-import { waitForCondition } from '@streamr/utils'
-import { NodeList } from '../../src/logic/NodeList'
+import { getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
+import { NodeList } from '../../src/logic/NodeList'
 import { createContentDeliveryLayerNode } from '../../src/logic/createContentDeliveryLayerNode'
-import { MockHandshaker } from '../utils/mock/MockHandshaker'
 import { MockDiscoveryLayerNode } from '../utils/mock/MockDiscoveryLayerNode'
+import { MockHandshaker } from '../utils/mock/MockHandshaker'
 import { MockNeighborFinder } from '../utils/mock/MockNeighborFinder'
 import { MockNeighborUpdateManager } from '../utils/mock/MockNeighborUpdateManager'
 import { MockTransport } from '../utils/mock/MockTransport'
-import { createMockPeerDescriptor, createMockContentDeliveryRpcRemote, mockConnectionLocker } from '../utils/utils'
-import { StreamPartIDUtils } from '@streamr/protocol'
-import { getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { createMockContentDeliveryRpcRemote, createMockPeerDescriptor, mockConnectionLocker } from '../utils/utils'
 
 describe('ContentDeliveryLayerNode', () => {
 

package/test/unit/ContentDeliveryManager.test.ts

@@ -1,12 +1,11 @@
 import { areEqualPeerDescriptors } from '@streamr/dht'
-import { StreamPartIDUtils } from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
-import { waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
 import { ContentDeliveryManager } from '../../src/logic/ContentDeliveryManager'
+import { ProxyDirection } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 import { MockControlLayerNode } from '../utils/mock/MockControlLayerNode'
 import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor, createStreamMessage, mockConnectionLocker } from '../utils/utils'
-import { ProxyDirection } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 
 describe('ContentDeliveryManager', () => {
 

package/test/unit/ContentDeliveryRpcLocal.test.ts

@@ -1,6 +1,6 @@
 import { ListeningRpcCommunicator } from '@streamr/dht'
-import { StreamPartIDUtils } from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
+import { StreamPartIDUtils } from '@streamr/utils'
 import { ContentDeliveryRpcLocal } from '../../src/logic/ContentDeliveryRpcLocal'
 import { LeaveStreamPartNotice } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 import { MockTransport } from '../utils/mock/MockTransport'

package/test/unit/HandshakeRpcLocal.test.ts

@@ -1,9 +1,9 @@
 import { DhtAddress, NodeType, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '@streamr/dht'
+import { StreamPartIDUtils } from '@streamr/utils'
 import { NodeList } from '../../src/logic/NodeList'
 import { HandshakeRpcLocal } from '../../src/logic/neighbor-discovery/HandshakeRpcLocal'
 import { InterleaveRequest, StreamPartHandshakeRequest } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { createMockPeerDescriptor, createMockHandshakeRpcRemote, createMockContentDeliveryRpcRemote } from '../utils/utils'
-import { StreamPartIDUtils } from '@streamr/protocol'
+import { createMockContentDeliveryRpcRemote, createMockHandshakeRpcRemote, createMockPeerDescriptor } from '../utils/utils'
 
 const STREAM_PART_ID = StreamPartIDUtils.parse('stream#0')
 

package/test/unit/Handshaker.test.ts

@@ -1,9 +1,9 @@
 import { ListeningRpcCommunicator, Simulator, SimulatorTransport, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { StreamPartIDUtils } from '@streamr/utils'
 import { range } from 'lodash'
 import { NodeList } from '../../src/logic/NodeList'
 import { Handshaker } from '../../src/logic/neighbor-discovery/Handshaker'
-import { createMockPeerDescriptor, createMockContentDeliveryRpcRemote } from '../utils/utils'
-import { StreamPartIDUtils } from '@streamr/protocol'
+import { createMockContentDeliveryRpcRemote, createMockPeerDescriptor } from '../utils/utils'
 
 describe('Handshaker', () => {
 

package/test/unit/Inspector.test.ts

@@ -1,9 +1,8 @@
 import { ListeningRpcCommunicator, createRandomDhtAddress, getNodeIdFromPeerDescriptor } from '@streamr/dht'
-import { utf8ToBinary } from '@streamr/utils'
+import { StreamPartIDUtils, utf8ToBinary } from '@streamr/utils'
 import { Inspector } from '../../src/logic/inspect/Inspector'
 import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor, mockConnectionLocker } from '../utils/utils'
-import { StreamPartIDUtils } from '@streamr/protocol'
 
 describe('Inspector', () => {
     

package/test/unit/NeighborUpdateRpcLocal.test.ts

@@ -1,13 +1,13 @@
 import { DhtAddress, ListeningRpcCommunicator, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { StreamPartIDUtils } from '@streamr/utils'
+import { range } from 'lodash'
+import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote'
+import { NodeList } from '../../src/logic/NodeList'
 import { NeighborFinder } from '../../src/logic/neighbor-discovery/NeighborFinder'
 import { NeighborUpdateRpcLocal } from '../../src/logic/neighbor-discovery/NeighborUpdateRpcLocal'
-import { createMockPeerDescriptor } from '../utils/utils'
-import { NodeList } from '../../src/logic/NodeList'
-import { StreamPartIDUtils } from '@streamr/protocol'
-import { MockTransport } from '../utils/mock/MockTransport'
 import { ContentDeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
-import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote'
-import { range } from 'lodash'
+import { MockTransport } from '../utils/mock/MockTransport'
+import { createMockPeerDescriptor } from '../utils/utils'
 
 describe('NeighborUpdateRpcLocal', () => {
 

package/test/unit/NetworkNode.test.ts

@@ -1,12 +1,11 @@
-import { StreamPartIDUtils } from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
+import { StreamPartIDUtils } from '@streamr/utils'
 import { EventEmitter } from 'eventemitter3'
 import { NetworkNode } from '../../src/NetworkNode'
 import { NetworkStack } from '../../src/NetworkStack'
 import { Events } from '../../src/logic/ContentDeliveryManager'
 import { StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 import { createStreamMessage } from '../utils/utils'
-import { StreamMessageTranslator } from '../../src/logic/protocol-integration/stream-message/StreamMessageTranslator'
 
 const STREAM_PART = StreamPartIDUtils.parse('stream#0')
 const PUBLISHER_ID = randomEthereumAddress()
@@ -32,8 +31,8 @@ describe('NetworkNode', () => {
         const msg2 = createMessage(2)
         contentDeliveryManager.emit('newMessage', msg1)
         contentDeliveryManager.emit('newMessage', msg2)
-        expect(onMessage.mock.calls[0][0]).toEqual(StreamMessageTranslator.toClientProtocol(msg1))
-        expect(onMessage.mock.calls[1][0]).toEqual(StreamMessageTranslator.toClientProtocol(msg2))
+        expect(onMessage.mock.calls[0][0]).toEqual(msg1)
+        expect(onMessage.mock.calls[1][0]).toEqual(msg2)
         expect(onMessage).toBeCalledTimes(2)
 
         node.removeMessageListener(onMessage)

package/test/unit/NodeList.test.ts

@@ -6,14 +6,14 @@ import {
     getDhtAddressFromRaw,
     getNodeIdFromPeerDescriptor,
 } from '@streamr/dht'
-import { StreamPartIDUtils } from '@streamr/protocol'
+import { StreamPartIDUtils } from '@streamr/utils'
 import { expect } from 'expect'
 import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote'
 import { NodeList } from '../../src/logic/NodeList'
 import { formStreamPartContentDeliveryServiceId } from '../../src/logic/formStreamPartDeliveryServiceId'
 import { ContentDeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
-import { createMockPeerDescriptor } from '../utils/utils'
 import { MockTransport } from '../utils/mock/MockTransport'
+import { createMockPeerDescriptor } from '../utils/utils'
 
 const streamPartId = StreamPartIDUtils.parse('stream#0')
 

package/test/unit/StreamPartIDDataKey.test.ts

@@ -1,4 +1,4 @@
-import { StreamPartIDUtils } from '@streamr/protocol'
+import { StreamPartIDUtils } from '@streamr/utils'
 import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
 
 describe('StreamPartIDtoDataKey', () => {

package/test/unit/StreamPartNetworkSplitAvoidance.test.ts

@@ -1,5 +1,4 @@
-import { MIN_NEIGHBOR_COUNT } from '../../src/logic/StreamPartNetworkSplitAvoidance'
-import { StreamPartNetworkSplitAvoidance } from '../../src/logic/StreamPartNetworkSplitAvoidance'
+import { MIN_NEIGHBOR_COUNT, StreamPartNetworkSplitAvoidance } from '../../src/logic/StreamPartNetworkSplitAvoidance'
 import { MockDiscoveryLayerNode } from '../utils/mock/MockDiscoveryLayerNode'
 
 describe('StreamPartNetworkSplitAvoidance', () => {

package/test/unit/TemporaryConnectionRpcLocal.test.ts

@@ -1,8 +1,8 @@
-import { StreamPartIDUtils } from '@streamr/protocol'
+import { ListeningRpcCommunicator, getDhtAddressFromRaw } from '@streamr/dht'
+import { StreamPartIDUtils } from '@streamr/utils'
 import { TemporaryConnectionRpcLocal } from '../../src/logic/temporary-connection/TemporaryConnectionRpcLocal'
 import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor } from '../utils/utils'
-import { ListeningRpcCommunicator, getDhtAddressFromRaw } from '@streamr/dht'
 
 describe('TemporaryConnectionRpcLocal', () => {
 

package/test/utils/mock/MockTransport.ts

@@ -1,5 +1,4 @@
-import { ITransport, PeerDescriptor } from '@streamr/dht'
-import { TransportEvents } from '@streamr/dht'
+import { ITransport, PeerDescriptor, TransportEvents } from '@streamr/dht'
 import { EventEmitter } from 'eventemitter3'
 
 export class MockTransport extends EventEmitter<TransportEvents> implements ITransport {

package/test/utils/utils.ts

@@ -1,4 +1,4 @@
-import { 
+import {
     ConnectionLocker,
     DhtNode,
     NodeType,
@@ -9,7 +9,14 @@ import {
     getRandomRegion,
     getRawFromDhtAddress
 } from '@streamr/dht'
+import { RpcCommunicator } from '@streamr/proto-rpc'
+import { EthereumAddress, StreamPartID, StreamPartIDUtils, hexToBinary, utf8ToBinary } from '@streamr/utils'
+import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
+import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote'
+import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
+import { createContentDeliveryLayerNode } from '../../src/logic/createContentDeliveryLayerNode'
+import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/HandshakeRpcRemote'
 import {
     ContentType,
     EncryptionType,
@@ -17,15 +24,7 @@ import {
     SignatureType,
     StreamMessage
 } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote'
-import { createContentDeliveryLayerNode } from '../../src/logic/createContentDeliveryLayerNode'
-import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/HandshakeRpcRemote'
-import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
-import { EthereumAddress, hexToBinary, utf8ToBinary } from '@streamr/utils'
-import { StreamPartID, StreamPartIDUtils } from '@streamr/protocol'
-import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 import { ContentDeliveryRpcClient, HandshakeRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
-import { RpcCommunicator } from '@streamr/proto-rpc'
 
 export const mockConnectionLocker: ConnectionLocker = {
     lockConnection: () => {},

package/tsconfig.jest.json

@@ -10,7 +10,6 @@
         "package.json"
     ],
     "references": [
-        { "path": "../protocol/tsconfig.node.json" },
         { "path": "../proto-rpc/tsconfig.node.json" },
         { "path": "../dht/tsconfig.node.json" }
     ]

package/tsconfig.node.json

@@ -11,8 +11,6 @@
         "package.json"
     ],
     "references": [
-        { "path": "../protocol/tsconfig.node.json" },
-        { "path": "../proto-rpc/tsconfig.node.json" },
         { "path": "../dht/tsconfig.node.json" }
     ]
 }

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

@@ -1,6 +0,0 @@
-import { GroupKeyRequest as OldGroupKeyRequest } from '@streamr/protocol';
-import { GroupKeyRequest } from '../../../proto/packages/trackerless-network/protos/NetworkRpc';
-export declare class GroupKeyRequestTranslator {
-    static toProtobuf(msg: OldGroupKeyRequest): GroupKeyRequest;
-    static toClientProtocol(msg: GroupKeyRequest): OldGroupKeyRequest;
-}

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

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GroupKeyRequestTranslator = void 0;
-const protocol_1 = require("@streamr/protocol");
-const utils_1 = require("@streamr/utils");
-// eslint-disable-next-line @typescript-eslint/no-extraneous-class
-class GroupKeyRequestTranslator {
-    static toProtobuf(msg) {
-        const translated = {
-            recipientId: (0, utils_1.hexToBinary)(msg.recipient),
-            requestId: msg.requestId,
-            rsaPublicKey: (0, utils_1.utf8ToBinary)(msg.rsaPublicKey),
-            groupKeyIds: [...msg.groupKeyIds]
-        };
-        return translated;
-    }
-    static toClientProtocol(msg) {
-        const translated = new protocol_1.GroupKeyRequest({
-            recipient: (0, utils_1.toEthereumAddress)((0, utils_1.binaryToHex)(msg.recipientId, true)),
-            requestId: msg.requestId,
-            rsaPublicKey: (0, utils_1.binaryToUtf8)(msg.rsaPublicKey),
-            groupKeyIds: msg.groupKeyIds
-        });
-        return translated;
-    }
-}
-exports.GroupKeyRequestTranslator = GroupKeyRequestTranslator;
-//# sourceMappingURL=GroupKeyRequestTranslator.js.map

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

@@ -1 +0,0 @@
-{"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.d.ts

@@ -1,6 +0,0 @@
-import { GroupKeyResponse as OldGroupKeyResponse } from '@streamr/protocol';
-import { GroupKeyResponse } from '../../../proto/packages/trackerless-network/protos/NetworkRpc';
-export declare class GroupKeyResponseTranslator {
-    static toProtobuf(msg: OldGroupKeyResponse): GroupKeyResponse;
-    static toClientProtocol(msg: GroupKeyResponse): OldGroupKeyResponse;
-}

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

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GroupKeyResponseTranslator = void 0;
-const protocol_1 = require("@streamr/protocol");
-const utils_1 = require("@streamr/utils");
-// eslint-disable-next-line @typescript-eslint/no-extraneous-class
-class GroupKeyResponseTranslator {
-    static toProtobuf(msg) {
-        const groupKeys = msg.encryptedGroupKeys.map((groupKey) => {
-            return {
-                data: groupKey.data,
-                id: groupKey.id
-            };
-        });
-        const translated = {
-            recipientId: (0, utils_1.hexToBinary)(msg.recipient),
-            requestId: msg.requestId,
-            groupKeys
-        };
-        return translated;
-    }
-    static toClientProtocol(msg) {
-        const encryptedGroupKeys = msg.groupKeys.map((groupKey) => new protocol_1.EncryptedGroupKey(groupKey.id, groupKey.data));
-        return new protocol_1.GroupKeyResponse({
-            requestId: msg.requestId,
-            recipient: (0, utils_1.toEthereumAddress)((0, utils_1.binaryToHex)(msg.recipientId, true)),
-            encryptedGroupKeys
-        });
-    }
-}
-exports.GroupKeyResponseTranslator = GroupKeyResponseTranslator;
-//# sourceMappingURL=GroupKeyResponseTranslator.js.map

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

@@ -1 +0,0 @@
-{"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.d.ts

@@ -1,6 +0,0 @@
-import { StreamMessage as OldStreamMessage } from '@streamr/protocol';
-import { StreamMessage } from '../../../proto/packages/trackerless-network/protos/NetworkRpc';
-export declare class StreamMessageTranslator {
-    static toProtobuf(msg: OldStreamMessage): StreamMessage;
-    static toClientProtocol(msg: StreamMessage): OldStreamMessage;
-}

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

@@ -1,170 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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 oldToNewEncryptionType = (type) => {
-    if (type === protocol_1.EncryptionType.AES) {
-        return NetworkRpc_1.EncryptionType.AES;
-    }
-    return NetworkRpc_1.EncryptionType.NONE;
-};
-const newToOldEncryptionType = (type) => {
-    if (type === NetworkRpc_1.EncryptionType.AES) {
-        return protocol_1.EncryptionType.AES;
-    }
-    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;
-    }
-    if (type === protocol_1.SignatureType.ERC_1271) {
-        return NetworkRpc_1.SignatureType.ERC_1271;
-    }
-    return NetworkRpc_1.SignatureType.SECP256K1;
-};
-const newToOldSignatureType = (type) => {
-    if (type === NetworkRpc_1.SignatureType.LEGACY_SECP256K1) {
-        return protocol_1.SignatureType.LEGACY_SECP256K1;
-    }
-    if (type === NetworkRpc_1.SignatureType.ERC_1271) {
-        return protocol_1.SignatureType.ERC_1271;
-    }
-    return protocol_1.SignatureType.SECP256K1;
-};
-// eslint-disable-next-line @typescript-eslint/no-extraneous-class
-class StreamMessageTranslator {
-    static toProtobuf(msg) {
-        const messageId = {
-            timestamp: msg.getTimestamp(),
-            sequenceNumber: msg.getSequenceNumber(),
-            streamId: msg.getStreamId(),
-            streamPartition: msg.getStreamPartition(),
-            publisherId: (0, utils_1.hexToBinary)(msg.getPublisherId()),
-            messageChainId: msg.getMsgChainId()
-        };
-        let previousMessageRef = undefined;
-        if (msg.prevMsgRef) {
-            previousMessageRef = {
-                timestamp: msg.prevMsgRef.timestamp,
-                sequenceNumber: msg.prevMsgRef.sequenceNumber
-            };
-        }
-        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,
-            signature: msg.signature,
-            signatureType: oldToNewSignatureType(msg.signatureType),
-            body
-        };
-        return translated;
-    }
-    static toClientProtocol(msg) {
-        let messageType;
-        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.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.body.oneofKind === 'groupKeyRequest') {
-            messageType = protocol_1.StreamMessageType.GROUP_KEY_REQUEST;
-            try {
-                content = NetworkRpc_1.GroupKeyRequest.toBinary(msg.body.groupKeyRequest);
-            }
-            catch (err) {
-                throw new Error(`invalid group key request: ${err}`);
-            }
-        }
-        else if (msg.body.oneofKind === 'groupKeyResponse') {
-            messageType = protocol_1.StreamMessageType.GROUP_KEY_RESPONSE;
-            try {
-                content = NetworkRpc_1.GroupKeyResponse.toBinary(msg.body.groupKeyResponse);
-            }
-            catch (err) {
-                throw new Error(`invalid group key response: ${err}`);
-            }
-        }
-        else {
-            throw new Error('invalid message type');
-        }
-        const messageId = new protocol_1.MessageID(msg.messageId.streamId, msg.messageId.streamPartition, Number(msg.messageId.timestamp), msg.messageId.sequenceNumber, (0, utils_1.toEthereumAddress)((0, utils_1.binaryToHex)(msg.messageId.publisherId, true)), msg.messageId.messageChainId);
-        let prevMsgRef = undefined;
-        if (msg.previousMessageRef) {
-            prevMsgRef = new protocol_1.MessageRef(Number(msg.previousMessageRef.timestamp), msg.previousMessageRef.sequenceNumber);
-        }
-        const translated = new protocol_1.StreamMessage({
-            messageId,
-            prevMsgRef,
-            messageType,
-            content,
-            contentType,
-            signature: msg.signature,
-            signatureType: newToOldSignatureType(msg.signatureType),
-            encryptionType,
-            groupKeyId,
-            newGroupKey
-        });
-        return translated;
-    }
-}
-exports.StreamMessageTranslator = StreamMessageTranslator;
-//# sourceMappingURL=StreamMessageTranslator.js.map

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

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

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

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

@@ -1 +0,0 @@
-{"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/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.ts

@@ -1,28 +0,0 @@
-import { GroupKeyRequest as OldGroupKeyRequest } from '@streamr/protocol'
-import { GroupKeyRequest } from '../../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { toEthereumAddress, binaryToHex, binaryToUtf8, hexToBinary, utf8ToBinary } from '@streamr/utils'
-
-// eslint-disable-next-line @typescript-eslint/no-extraneous-class
-export class GroupKeyRequestTranslator {
-
-    static toProtobuf(msg: OldGroupKeyRequest): GroupKeyRequest {
-        const translated: GroupKeyRequest = {
-            recipientId: hexToBinary(msg.recipient),
-            requestId: msg.requestId,
-            rsaPublicKey: utf8ToBinary(msg.rsaPublicKey),
-            groupKeyIds: [...msg.groupKeyIds]
-        }
-        return translated
-    }
-
-    static toClientProtocol(msg: GroupKeyRequest): OldGroupKeyRequest {
-        const translated = new OldGroupKeyRequest({
-            recipient: toEthereumAddress(binaryToHex(msg.recipientId, true)),
-            requestId: msg.requestId,
-            rsaPublicKey: binaryToUtf8(msg.rsaPublicKey),
-            groupKeyIds: msg.groupKeyIds
-        })
-        return translated
-    }
-
-}

package/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.ts

@@ -1,34 +0,0 @@
-import { GroupKeyResponse as OldGroupKeyResponse, EncryptedGroupKey as OldEncryptedGroupKey } from '@streamr/protocol'
-import { GroupKey, GroupKeyResponse } from '../../../proto/packages/trackerless-network/protos/NetworkRpc'
-import { toEthereumAddress, binaryToHex, hexToBinary } from '@streamr/utils'
-
-// eslint-disable-next-line @typescript-eslint/no-extraneous-class
-export class GroupKeyResponseTranslator {
-
-    static toProtobuf(msg: OldGroupKeyResponse): GroupKeyResponse {
-        const groupKeys = msg.encryptedGroupKeys.map((groupKey) => {
-            return {
-                data: groupKey.data,
-                id: groupKey.id
-            }
-        })
-        const translated: GroupKeyResponse = {
-            recipientId: hexToBinary(msg.recipient),
-            requestId: msg.requestId,
-            groupKeys
-        }
-        return translated
-    }
-
-    static toClientProtocol(msg: GroupKeyResponse): OldGroupKeyResponse {
-        const encryptedGroupKeys = msg.groupKeys.map((groupKey: GroupKey) => new OldEncryptedGroupKey(
-            groupKey.id,
-            groupKey.data,
-        ))
-        return new OldGroupKeyResponse({
-            requestId: msg.requestId,
-            recipient: toEthereumAddress(binaryToHex(msg.recipientId, true)),
-            encryptedGroupKeys
-        })
-    }
-}