@streamr/trackerless-network 103.0.0-rc.1 → 103.0.0-rc.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/generated/google/protobuf/timestamp.js +1 -1
- package/dist/generated/google/protobuf/timestamp.js.map +1 -1
- package/dist/generated/packages/dht/protos/DhtRpc.client.d.ts +10 -0
- package/dist/generated/packages/dht/protos/DhtRpc.client.js +8 -1
- package/dist/generated/packages/dht/protos/DhtRpc.client.js.map +1 -1
- package/dist/generated/packages/dht/protos/DhtRpc.d.ts +32 -0
- package/dist/generated/packages/dht/protos/DhtRpc.js +29 -4
- package/dist/generated/packages/dht/protos/DhtRpc.js.map +1 -1
- package/dist/generated/packages/dht/protos/DhtRpc.server.d.ts +6 -0
- package/dist/generated/packages/proto-rpc/protos/ProtoRpc.js +1 -1
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.client.d.ts +44 -0
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.client.js +55 -20
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.client.js.map +1 -1
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.d.ts +83 -16
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.js +69 -14
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.js.map +1 -1
- package/dist/generated/packages/trackerless-network/protos/NetworkRpc.server.d.ts +20 -0
- package/dist/package.json +5 -5
- package/dist/src/NetworkNode.d.ts +3 -2
- package/dist/src/NetworkNode.js +4 -4
- package/dist/src/NetworkNode.js.map +1 -1
- package/dist/src/NetworkStack.d.ts +3 -3
- package/dist/src/NetworkStack.js +4 -4
- package/dist/src/NetworkStack.js.map +1 -1
- package/dist/src/exports.d.ts +1 -1
- package/dist/src/exports.js +3 -2
- package/dist/src/exports.js.map +1 -1
- package/dist/src/logic/ContentDeliveryLayerNode.d.ts +2 -0
- package/dist/src/logic/ContentDeliveryLayerNode.js +6 -1
- package/dist/src/logic/ContentDeliveryLayerNode.js.map +1 -1
- package/dist/src/logic/ContentDeliveryManager.d.ts +5 -2
- package/dist/src/logic/ContentDeliveryManager.js +7 -6
- package/dist/src/logic/ContentDeliveryManager.js.map +1 -1
- package/dist/src/logic/ContentDeliveryRpcLocal.d.ts +2 -0
- package/dist/src/logic/ContentDeliveryRpcLocal.js +15 -4
- package/dist/src/logic/ContentDeliveryRpcLocal.js.map +1 -1
- package/dist/src/logic/createContentDeliveryLayerNode.d.ts +1 -0
- package/dist/src/logic/createContentDeliveryLayerNode.js +8 -1
- package/dist/src/logic/createContentDeliveryLayerNode.js.map +1 -1
- package/dist/src/logic/plumtree/PausedNeighbors.d.ts +9 -0
- package/dist/src/logic/plumtree/PausedNeighbors.js +37 -0
- package/dist/src/logic/plumtree/PausedNeighbors.js.map +1 -0
- package/dist/src/logic/plumtree/PlumTreeManager.d.ts +34 -0
- package/dist/src/logic/plumtree/PlumTreeManager.js +125 -0
- package/dist/src/logic/plumtree/PlumTreeManager.js.map +1 -0
- package/dist/src/logic/plumtree/PlumTreeRpcLocal.d.ts +20 -0
- package/dist/src/logic/plumtree/PlumTreeRpcLocal.js +37 -0
- package/dist/src/logic/plumtree/PlumTreeRpcLocal.js.map +1 -0
- package/dist/src/logic/plumtree/PlumTreeRpcRemote.d.ts +8 -0
- package/dist/src/logic/plumtree/PlumTreeRpcRemote.js +26 -0
- package/dist/src/logic/plumtree/PlumTreeRpcRemote.js.map +1 -0
- package/dist/test/benchmark/first-message.js +1 -1
- package/dist/test/benchmark/first-message.js.map +1 -1
- package/dist/test/utils/utils.d.ts +1 -1
- package/dist/test/utils/utils.js +5 -4
- package/dist/test/utils/utils.js.map +1 -1
- package/package.json +5 -5
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PlumTreeRpcLocal = void 0;
|
|
4
|
+
const dht_1 = require("@streamr/dht");
|
|
5
|
+
const empty_1 = require("../../../generated/google/protobuf/empty");
|
|
6
|
+
class PlumTreeRpcLocal {
|
|
7
|
+
neighbors;
|
|
8
|
+
pausedNodes;
|
|
9
|
+
onMetadataCb;
|
|
10
|
+
sendBuffer;
|
|
11
|
+
constructor(neighbors, pausedNodes, onMetaDataCb, sendBuffer) {
|
|
12
|
+
this.neighbors = neighbors;
|
|
13
|
+
this.pausedNodes = pausedNodes;
|
|
14
|
+
this.onMetadataCb = onMetaDataCb;
|
|
15
|
+
this.sendBuffer = sendBuffer;
|
|
16
|
+
}
|
|
17
|
+
async sendMetadata(message, context) {
|
|
18
|
+
const previousNode = context.incomingSourceDescriptor;
|
|
19
|
+
await this.onMetadataCb(message, previousNode);
|
|
20
|
+
return empty_1.Empty;
|
|
21
|
+
}
|
|
22
|
+
async pauseNeighbor(request, context) {
|
|
23
|
+
const sender = (0, dht_1.toNodeId)(context.incomingSourceDescriptor);
|
|
24
|
+
if (this.neighbors.has(sender)) {
|
|
25
|
+
this.pausedNodes.add(sender, request.messageChainId);
|
|
26
|
+
}
|
|
27
|
+
return empty_1.Empty;
|
|
28
|
+
}
|
|
29
|
+
async resumeNeighbor(request, context) {
|
|
30
|
+
const sender = context.incomingSourceDescriptor;
|
|
31
|
+
this.pausedNodes.delete((0, dht_1.toNodeId)(sender), request.messageChainId);
|
|
32
|
+
await this.sendBuffer(request.fromTimestamp, request.messageChainId, sender);
|
|
33
|
+
return empty_1.Empty;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
exports.PlumTreeRpcLocal = PlumTreeRpcLocal;
|
|
37
|
+
//# sourceMappingURL=PlumTreeRpcLocal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PlumTreeRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/plumtree/PlumTreeRpcLocal.ts"],"names":[],"mappings":";;;AAAA,sCAAuE;AAEvE,oEAAgE;AAQhE,MAAa,gBAAgB;IAER,SAAS,CAAU;IACnB,WAAW,CAAiB;IAC5B,YAAY,CAAc;IAC1B,UAAU,CAAc;IAEzC,YACI,SAAmB,EACnB,WAA4B,EAC5B,YAA0B,EAC1B,UAAwB;QAExB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAkB,EAAE,OAA0B;QAC7D,MAAM,YAAY,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAC1E,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;QAC9C,OAAO,aAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAA6B,EAAE,OAA0B;QACzE,MAAM,MAAM,GAAG,IAAA,cAAQ,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QAC9E,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;QACxD,CAAC;QACD,OAAO,aAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA8B,EAAE,OAA0B;QAC3E,MAAM,MAAM,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QACpE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAA,cAAQ,EAAC,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;QACjE,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;QAC5E,OAAO,aAAK,CAAA;IAChB,CAAC;CACJ;AAvCD,4CAuCC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { RpcRemote } from '@streamr/dht';
|
|
2
|
+
import { MessageID } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
3
|
+
import { PlumTreeRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client';
|
|
4
|
+
export declare class PlumTreeRpcRemote extends RpcRemote<PlumTreeRpcClient> {
|
|
5
|
+
sendMetadata(msg: MessageID): Promise<void>;
|
|
6
|
+
pauseNeighbor(messageChainId: string): Promise<void>;
|
|
7
|
+
resumeNeighbor(fromTimestamp: number, messageChainId: string): Promise<void>;
|
|
8
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PlumTreeRpcRemote = void 0;
|
|
4
|
+
const dht_1 = require("@streamr/dht");
|
|
5
|
+
class PlumTreeRpcRemote extends dht_1.RpcRemote {
|
|
6
|
+
async sendMetadata(msg) {
|
|
7
|
+
const options = this.formDhtRpcOptions({
|
|
8
|
+
notification: true
|
|
9
|
+
});
|
|
10
|
+
await this.getClient().sendMetadata(msg, options);
|
|
11
|
+
}
|
|
12
|
+
async pauseNeighbor(messageChainId) {
|
|
13
|
+
const options = this.formDhtRpcOptions({
|
|
14
|
+
notification: true
|
|
15
|
+
});
|
|
16
|
+
await this.getClient().pauseNeighbor({ messageChainId }, options);
|
|
17
|
+
}
|
|
18
|
+
async resumeNeighbor(fromTimestamp, messageChainId) {
|
|
19
|
+
const options = this.formDhtRpcOptions({
|
|
20
|
+
notification: true
|
|
21
|
+
});
|
|
22
|
+
await this.getClient().resumeNeighbor({ fromTimestamp, messageChainId }, options);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
exports.PlumTreeRpcRemote = PlumTreeRpcRemote;
|
|
26
|
+
//# sourceMappingURL=PlumTreeRpcRemote.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PlumTreeRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/plumtree/PlumTreeRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAwC;AAIxC,MAAa,iBAAkB,SAAQ,eAA4B;IAE/D,KAAK,CAAC,YAAY,CAAC,GAAc;QAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,cAAsB;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,cAAc,EAAE,EAAE,OAAO,CAAC,CAAA;IACrE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,aAAqB,EAAE,cAAsB;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,OAAO,CAAC,CAAA;IACrF,CAAC;CAEJ;AAvBD,8CAuBC"}
|
|
@@ -81,7 +81,7 @@ const measureJoiningTime = async () => {
|
|
|
81
81
|
}
|
|
82
82
|
},
|
|
83
83
|
signature: (0, utils_1.hexToBinary)('0x1234'),
|
|
84
|
-
signatureType: NetworkRpc_1.SignatureType.
|
|
84
|
+
signatureType: NetworkRpc_1.SignatureType.ECDSA_SECP256K1_EVM,
|
|
85
85
|
};
|
|
86
86
|
streamParts.get(stream).broadcast(streamMessage);
|
|
87
87
|
}, 1000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"first-message.js","sourceRoot":"","sources":["../../../test/benchmark/first-message.ts"],"names":[],"mappings":";AAAA,+BAA+B;;;;;AAE/B,sCAOqB;AACrB,0CASuB;AACvB,4CAAmB;AAEnB,mFAA8E;AAG9E,+FAA2H;AAC3H,0CAAyF;AAEzF,MAAM,QAAQ,GAAG,KAAK,CAAA;AAEtB,IAAI,KAAoB,CAAA;AACxB,IAAI,SAAoB,CAAA;AACxB,IAAI,QAAwB,CAAA;AAC5B,MAAM,gBAAgB,GAAqB,EAAE,CAAA;AAC7C,MAAM,WAAW,GAAmC,IAAI,GAAG,EAAE,CAAA;AAC7D,IAAI,WAAwB,CAAA;AAC5B,IAAI,eAA2C,CAAA;AAC/C,IAAI,CAAC,GAAG,CAAC,CAAA;AAET,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IAC7B,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAChC,KAAK,GAAG,EAAE,CAAA;IACV,SAAS,GAAG,IAAI,eAAS,CAAC,iBAAW,CAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,cAAc,GAAG,IAAA,gCAAwB,EAAC;QAC5C,MAAM,EAAE,IAAA,qBAAe,GAAE;KAC5B,CAAC,CAAA;IACF,QAAQ,GAAG,cAAc,CAAA;IACzB,MAAM,UAAU,GAAG,MAAM,IAAA,sCAA8B,EAAC,cAAc,EAAE,SAAS,EAAE,CAAC,cAAc,CAAC,CAAC,CAAA;IACpG,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;IACxB,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAEtB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;IAC7C,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAChC,MAAM,cAAc,GAAG,IAAA,gCAAwB,EAAC;QAC5C,MAAM,EAAE,IAAA,qBAAe,GAAE;KAC5B,CAAC,CAAA;IACF,MAAM,YAAY,GAAG,IAAA,sBAAc,EAAC,IAAA,kBAAU,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5D,MAAM,eAAe,GAAG,MAAM,IAAA,sCAA8B,EAAC,cAAc,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IACnG,MAAM,eAAe,CAAC,KAAK,EAAE,CAAA;IAC7B,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IAClC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC3B,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,CAAA;AAClD,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;IAC/B,gBAAgB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/D,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;KACtC,CAAC,CAAA;IACF,SAAS,CAAC,IAAI,EAAE,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;IAClC,MAAM,cAAc,GAAG,IAAA,gCAAwB,EAAC;QAC5C,MAAM,EAAE,IAAA,qBAAe,GAAE;KAC5B,CAAC,CAAA;IACF,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,IAAA,cAAQ,EAAC,cAAc,CAAC,CAAC,CAAA;IAE/D,8BAA8B;IAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3F,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnB,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QAC/B,CAAC,IAAI,CAAC,CAAA;QACN,MAAM,aAAa,GAAG;YAClB,SAAS,EAAE;gBACP,QAAQ,EAAE,yBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC/C,eAAe,EAAE,CAAC;gBAClB,SAAS,EAAE,CAAC;gBACZ,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC;gBACjD,WAAW,EAAE,IAAA,mBAAW,EAAC,IAAA,gBAAQ,EAAC,QAAQ,CAAC,CAAC;gBAC5C,cAAc,EAAE,YAAY;aAC/B;YACD,IAAI,EAAE;gBACF,SAAS,EAAE,gBAAyB;gBACpC,cAAc,EAAE;oBACZ,OAAO,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,SAAS,CAAC;wBACjC,KAAK,EAAE,OAAO;qBACjB,CAAC,CAAC;oBACH,WAAW,EAAE,wBAAW,CAAC,IAAI;oBAC7B,cAAc,EAAE,2BAAc,CAAC,IAAI;iBACtC;aACJ;YACD,SAAS,EAAE,IAAA,mBAAW,EAAC,QAAQ,CAAC;YAChC,aAAa,EAAE,0BAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"first-message.js","sourceRoot":"","sources":["../../../test/benchmark/first-message.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode';
|
|
|
7
7
|
import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/HandshakeRpcRemote';
|
|
8
8
|
import { StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc';
|
|
9
9
|
export declare const mockConnectionLocker: ConnectionLocker;
|
|
10
|
-
export declare const createMockContentDeliveryLayerNodeAndDhtNode: (localPeerDescriptor: PeerDescriptor, entryPointDescriptor: PeerDescriptor, streamPartId: StreamPartID, simulator: Simulator) => Promise<[DiscoveryLayerNode, ContentDeliveryLayerNode]>;
|
|
10
|
+
export declare const createMockContentDeliveryLayerNodeAndDhtNode: (localPeerDescriptor: PeerDescriptor, entryPointDescriptor: PeerDescriptor, streamPartId: StreamPartID, simulator: Simulator, plumTreeOptimisation?: boolean) => Promise<[DiscoveryLayerNode, ContentDeliveryLayerNode]>;
|
|
11
11
|
export declare const createStreamMessage: (content: string, streamPartId: StreamPartID, publisherId: UserID, timestamp?: number, sequenceNumber?: number) => StreamMessage;
|
|
12
12
|
export declare const createMockPeerDescriptor: (opts?: Partial<PeerDescriptor>) => PeerDescriptor;
|
|
13
13
|
export declare const createMockContentDeliveryRpcRemote: (remotePeerDescriptor?: PeerDescriptor) => ContentDeliveryRpcRemote;
|
package/dist/test/utils/utils.js
CHANGED
|
@@ -19,7 +19,7 @@ exports.mockConnectionLocker = {
|
|
|
19
19
|
getRemoteLockedConnectionCount: () => 0,
|
|
20
20
|
getWeakLockedConnectionCount: () => 0,
|
|
21
21
|
};
|
|
22
|
-
const createMockContentDeliveryLayerNodeAndDhtNode = async (localPeerDescriptor, entryPointDescriptor, streamPartId, simulator) => {
|
|
22
|
+
const createMockContentDeliveryLayerNodeAndDhtNode = async (localPeerDescriptor, entryPointDescriptor, streamPartId, simulator, plumTreeOptimisation) => {
|
|
23
23
|
const mockCm = new dht_1.SimulatorTransport(localPeerDescriptor, simulator);
|
|
24
24
|
await mockCm.start();
|
|
25
25
|
const discoveryLayerNode = new dht_1.DhtNode({
|
|
@@ -38,7 +38,8 @@ const createMockContentDeliveryLayerNodeAndDhtNode = async (localPeerDescriptor,
|
|
|
38
38
|
connectionLocker: mockCm,
|
|
39
39
|
localPeerDescriptor,
|
|
40
40
|
rpcRequestTimeout: 5000,
|
|
41
|
-
isLocalNodeEntryPoint: () => false
|
|
41
|
+
isLocalNodeEntryPoint: () => false,
|
|
42
|
+
plumTreeOptimisation
|
|
42
43
|
});
|
|
43
44
|
return [discoveryLayerNode, contentDeliveryLayerNode];
|
|
44
45
|
};
|
|
@@ -50,11 +51,11 @@ const createStreamMessage = (content, streamPartId, publisherId, timestamp, sequ
|
|
|
50
51
|
sequenceNumber: sequenceNumber ?? 0,
|
|
51
52
|
timestamp: timestamp ?? Date.now(),
|
|
52
53
|
publisherId: (0, utils_1.toUserIdRaw)(publisherId),
|
|
53
|
-
messageChainId:
|
|
54
|
+
messageChainId: `messageChain0-${publisherId}`,
|
|
54
55
|
};
|
|
55
56
|
const msg = {
|
|
56
57
|
messageId,
|
|
57
|
-
signatureType: NetworkRpc_1.SignatureType.
|
|
58
|
+
signatureType: NetworkRpc_1.SignatureType.ECDSA_SECP256K1_EVM,
|
|
58
59
|
signature: (0, utils_1.hexToBinary)('0x1234'),
|
|
59
60
|
body: {
|
|
60
61
|
oneofKind: 'contentMessage',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../test/utils/utils.ts"],"names":[],"mappings":";;;AAAA,sCAUqB;AACrB,kDAAoD;AACpD,0CAAgH;AAChH,uDAAsE;AAEtE,uFAAmF;AAEnF,mGAA+F;AAC/F,8FAA0F;AAC1F,+FAMuE;AACvE,6GAAoI;AAEvH,QAAA,oBAAoB,GAAqB;IAClD,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC5B,oBAAoB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC9B,6BAA6B,EAAE,GAAG,EAAE,CAAC,CAAC;IACtC,8BAA8B,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,4BAA4B,EAAE,GAAG,EAAE,CAAC,CAAC;CACxC,CAAA;AAEM,MAAM,4CAA4C,GAAG,KAAK,EAC7D,mBAAmC,EACnC,oBAAoC,EACpC,YAA0B,EAC1B,SAAoB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../test/utils/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/trackerless-network",
|
|
3
|
-
"version": "103.0.0-rc.
|
|
3
|
+
"version": "103.0.0-rc.12",
|
|
4
4
|
"description": "Minimal and extendable implementation of the Streamr Network node.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -36,9 +36,9 @@
|
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
38
38
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
39
|
-
"@streamr/dht": "103.0.0-rc.
|
|
40
|
-
"@streamr/proto-rpc": "103.0.0-rc.
|
|
41
|
-
"@streamr/utils": "103.0.0-rc.
|
|
39
|
+
"@streamr/dht": "103.0.0-rc.12",
|
|
40
|
+
"@streamr/proto-rpc": "103.0.0-rc.12",
|
|
41
|
+
"@streamr/utils": "103.0.0-rc.12",
|
|
42
42
|
"eventemitter3": "^5.0.0",
|
|
43
43
|
"lodash": "^4.17.21",
|
|
44
44
|
"ts-essentials": "^10.0.4",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
50
|
-
"@streamr/test-utils": "103.0.0-rc.
|
|
50
|
+
"@streamr/test-utils": "103.0.0-rc.12",
|
|
51
51
|
"@types/lodash": "^4.17.16",
|
|
52
52
|
"@types/yallist": "^4.0.1",
|
|
53
53
|
"expect": "^29.6.2",
|