@streamr/trackerless-network 102.0.0-beta.1 → 102.0.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +5 -5
- package/package.json +5 -5
- package/src/NetworkNode.ts +0 -142
- package/src/NetworkStack.ts +0 -197
- package/src/exports.ts +0 -18
- package/src/logic/ContentDeliveryLayerNode.ts +0 -424
- package/src/logic/ContentDeliveryManager.ts +0 -401
- package/src/logic/ContentDeliveryRpcLocal.ts +0 -48
- package/src/logic/ContentDeliveryRpcRemote.ts +0 -44
- package/src/logic/ControlLayerNode.ts +0 -17
- package/src/logic/DiscoveryLayerNode.ts +0 -30
- package/src/logic/DuplicateMessageDetector.ts +0 -167
- package/src/logic/ExternalNetworkRpc.ts +0 -42
- package/src/logic/NodeList.ts +0 -114
- package/src/logic/PeerDescriptorStoreManager.ts +0 -96
- package/src/logic/StreamPartNetworkSplitAvoidance.ts +0 -90
- package/src/logic/StreamPartReconnect.ts +0 -38
- package/src/logic/createContentDeliveryLayerNode.ts +0 -130
- package/src/logic/formStreamPartDeliveryServiceId.ts +0 -7
- package/src/logic/inspect/InspectSession.ts +0 -55
- package/src/logic/inspect/Inspector.ts +0 -100
- package/src/logic/neighbor-discovery/HandshakeRpcLocal.ts +0 -138
- package/src/logic/neighbor-discovery/HandshakeRpcRemote.ts +0 -66
- package/src/logic/neighbor-discovery/Handshaker.ts +0 -215
- package/src/logic/neighbor-discovery/NeighborFinder.ts +0 -77
- package/src/logic/neighbor-discovery/NeighborUpdateManager.ts +0 -69
- package/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts +0 -75
- package/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts +0 -35
- package/src/logic/node-info/NodeInfoClient.ts +0 -23
- package/src/logic/node-info/NodeInfoRpcLocal.ts +0 -28
- package/src/logic/node-info/NodeInfoRpcRemote.ts +0 -11
- package/src/logic/propagation/FifoMapWithTTL.ts +0 -116
- package/src/logic/propagation/Propagation.ts +0 -84
- package/src/logic/propagation/PropagationTaskStore.ts +0 -41
- package/src/logic/proxy/ProxyClient.ts +0 -286
- package/src/logic/proxy/ProxyConnectionRpcLocal.ts +0 -106
- package/src/logic/proxy/ProxyConnectionRpcRemote.ts +0 -26
- package/src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts +0 -73
- package/src/logic/temporary-connection/TemporaryConnectionRpcRemote.ts +0 -29
- package/src/logic/utils.ts +0 -18
- package/src/types.ts +0 -13
- package/test/benchmark/StreamPartIdDataKeyDistribution.test.ts +0 -60
- package/test/benchmark/first-message.ts +0 -171
- package/test/end-to-end/content-delivery-layer-node-with-real-connections.test.ts +0 -165
- package/test/end-to-end/external-network-rpc.test.ts +0 -67
- package/test/end-to-end/inspect.test.ts +0 -124
- package/test/end-to-end/proxy-and-full-node.test.ts +0 -143
- package/test/end-to-end/proxy-connections.test.ts +0 -226
- package/test/end-to-end/proxy-key-exchange.test.ts +0 -126
- package/test/end-to-end/webrtc-full-node-network.test.ts +0 -83
- package/test/end-to-end/websocket-full-node-network.test.ts +0 -82
- package/test/integration/ContentDeliveryLayerNode-Layer1Node-Latencies.test.ts +0 -139
- package/test/integration/ContentDeliveryLayerNode-Layer1Node.test.ts +0 -162
- package/test/integration/ContentDeliveryManager.test.ts +0 -160
- package/test/integration/ContentDeliveryRpcRemote.test.ts +0 -100
- package/test/integration/HandshakeRpcRemote.test.ts +0 -79
- package/test/integration/Handshakes.test.ts +0 -141
- package/test/integration/Inspect.test.ts +0 -89
- package/test/integration/NeighborUpdateRpcRemote.test.ts +0 -82
- package/test/integration/NetworkNode.test.ts +0 -115
- package/test/integration/NetworkRpc.test.ts +0 -52
- package/test/integration/NetworkStack.test.ts +0 -72
- package/test/integration/NodeInfoRpc.test.ts +0 -109
- package/test/integration/Propagation.test.ts +0 -76
- package/test/integration/joining-streams-on-offline-peers.test.ts +0 -82
- package/test/integration/stream-without-default-entrypoints.test.ts +0 -128
- package/test/integration/streamEntryPointReplacing.test.ts +0 -97
- package/test/types/global.d.ts +0 -1
- package/test/unit/ContentDeliveryLayerNode.test.ts +0 -112
- package/test/unit/ContentDeliveryManager.test.ts +0 -96
- package/test/unit/ContentDeliveryRpcLocal.test.ts +0 -60
- package/test/unit/DuplicateMessageDetector.test.ts +0 -192
- package/test/unit/ExternalNetworkRpc.test.ts +0 -48
- package/test/unit/FifoMapWithTtl.test.ts +0 -253
- package/test/unit/HandshakeRpcLocal.test.ts +0 -155
- package/test/unit/Handshaker.test.ts +0 -69
- package/test/unit/InspectSession.test.ts +0 -83
- package/test/unit/Inspector.test.ts +0 -51
- package/test/unit/NeighborFinder.test.ts +0 -51
- package/test/unit/NeighborUpdateRpcLocal.test.ts +0 -139
- package/test/unit/NetworkNode.test.ts +0 -42
- package/test/unit/NodeList.test.ts +0 -164
- package/test/unit/NumberPair.test.ts +0 -22
- package/test/unit/PeerDescriptorStoreManager.test.ts +0 -103
- package/test/unit/Propagation.test.ts +0 -151
- package/test/unit/ProxyConnectionRpcRemote.test.ts +0 -39
- package/test/unit/StreamPartIDDataKey.test.ts +0 -12
- package/test/unit/StreamPartNetworkSplitAvoidance.test.ts +0 -31
- package/test/unit/StreamPartReconnect.test.ts +0 -30
- package/test/unit/TemporaryConnectionRpcLocal.test.ts +0 -38
- package/test/utils/fake/FakePeerDescriptorStoreManager.ts +0 -29
- package/test/utils/mock/MockConnectionsView.ts +0 -18
- package/test/utils/mock/MockControlLayerNode.ts +0 -78
- package/test/utils/mock/MockDiscoveryLayerNode.ts +0 -60
- package/test/utils/mock/MockHandshaker.ts +0 -17
- package/test/utils/mock/MockNeighborFinder.ts +0 -20
- package/test/utils/mock/MockNeighborUpdateManager.ts +0 -21
- package/test/utils/mock/MockTransport.ts +0 -30
- package/test/utils/utils.ts +0 -144
- package/tsconfig.browser.json +0 -13
- package/tsconfig.jest.json +0 -17
- package/tsconfig.json +0 -3
- package/tsconfig.node.json +0 -17
|
@@ -1,192 +0,0 @@
|
|
|
1
|
-
import { DuplicateMessageDetector, NumberPair, GapMisMatchError, InvalidNumberingError } from '../../src/logic/DuplicateMessageDetector'
|
|
2
|
-
|
|
3
|
-
test('starts empty', () => {
|
|
4
|
-
const detector = new DuplicateMessageDetector()
|
|
5
|
-
expect(detector.toString()).toEqual('')
|
|
6
|
-
})
|
|
7
|
-
|
|
8
|
-
test('first check initializes default gap', () => {
|
|
9
|
-
const detector = new DuplicateMessageDetector()
|
|
10
|
-
const result = detector.markAndCheck(new NumberPair(1, 5), new NumberPair(10, 10))
|
|
11
|
-
const state = detector.toString()
|
|
12
|
-
expect(result).toEqual(true)
|
|
13
|
-
expect(state).toEqual('(10|10, Infinity|Infinity]')
|
|
14
|
-
})
|
|
15
|
-
|
|
16
|
-
test('checking numbers in order introduces no new gaps', () => {
|
|
17
|
-
const detector = new DuplicateMessageDetector()
|
|
18
|
-
detector.markAndCheck(null, new NumberPair(10, 0))
|
|
19
|
-
expect(detector.markAndCheck(new NumberPair(10, 0), new NumberPair(20, 0))).toEqual(true)
|
|
20
|
-
expect(detector.markAndCheck(new NumberPair(20, 0), new NumberPair(30, 0))).toEqual(true)
|
|
21
|
-
expect(detector.markAndCheck(null, new NumberPair(30, 1))).toEqual(true)
|
|
22
|
-
expect(detector.markAndCheck(new NumberPair(30, 1), new NumberPair(30, 5))).toEqual(true)
|
|
23
|
-
const state = detector.toString()
|
|
24
|
-
expect(state).toEqual('(30|5, Infinity|Infinity]')
|
|
25
|
-
})
|
|
26
|
-
|
|
27
|
-
test('skipping next expected messages creates gaps', () => {
|
|
28
|
-
const detector = new DuplicateMessageDetector()
|
|
29
|
-
detector.markAndCheck(null, new NumberPair(10, 0))
|
|
30
|
-
|
|
31
|
-
expect(detector.markAndCheck(new NumberPair(15, 0), new NumberPair(20, 0))).toEqual(true)
|
|
32
|
-
expect(detector.toString()).toEqual('(10|0, 15|0], (20|0, Infinity|Infinity]')
|
|
33
|
-
|
|
34
|
-
expect(detector.markAndCheck(new NumberPair(30, 0), new NumberPair(40, 0))).toEqual(true)
|
|
35
|
-
expect(detector.toString()).toEqual('(10|0, 15|0], (20|0, 30|0], (40|0, Infinity|Infinity]')
|
|
36
|
-
|
|
37
|
-
expect(detector.markAndCheck(new NumberPair(40, 10), new NumberPair(80, 20))).toEqual(true)
|
|
38
|
-
expect(detector.toString()).toEqual('(10|0, 15|0], (20|0, 30|0], (40|0, 40|10], (80|20, Infinity|Infinity]')
|
|
39
|
-
})
|
|
40
|
-
|
|
41
|
-
test('only last gap is checked if no previous number given', () => {
|
|
42
|
-
const detector = new DuplicateMessageDetector()
|
|
43
|
-
detector.markAndCheck(null, new NumberPair(10, 0))
|
|
44
|
-
detector.markAndCheck(new NumberPair(10, 0), new NumberPair(20, 0))
|
|
45
|
-
|
|
46
|
-
expect(detector.markAndCheck(null, new NumberPair(15, 0))).toEqual(false)
|
|
47
|
-
expect(detector.markAndCheck(null, new NumberPair(30, 5))).toEqual(true)
|
|
48
|
-
const state = detector.toString()
|
|
49
|
-
expect(state).toEqual('(30|5, Infinity|Infinity]')
|
|
50
|
-
})
|
|
51
|
-
|
|
52
|
-
describe('gap handling', () => {
|
|
53
|
-
let detector: DuplicateMessageDetector
|
|
54
|
-
beforeEach(() => {
|
|
55
|
-
detector = new DuplicateMessageDetector()
|
|
56
|
-
detector.markAndCheck(null, new NumberPair(10, 0))
|
|
57
|
-
detector.markAndCheck(new NumberPair(20, 0), new NumberPair(40, 0))
|
|
58
|
-
detector.markAndCheck(new NumberPair(80, 10), new NumberPair(100, 0))
|
|
59
|
-
expect(detector.toString()).toEqual('(10|0, 20|0], (40|0, 80|10], (100|0, Infinity|Infinity]')
|
|
60
|
-
})
|
|
61
|
-
|
|
62
|
-
test('gap division', () => {
|
|
63
|
-
expect(detector.markAndCheck(new NumberPair(15, 0), new NumberPair(18, 0))).toEqual(true)
|
|
64
|
-
expect(detector.toString()).toEqual('(10|0, 15|0], (18|0, 20|0], (40|0, 80|10], (100|0, Infinity|Infinity]')
|
|
65
|
-
|
|
66
|
-
expect(detector.markAndCheck(new NumberPair(60, 0), new NumberPair(79, 5))).toEqual(true)
|
|
67
|
-
expect(detector.toString()).toEqual('(10|0, 15|0], (18|0, 20|0], (40|0, 60|0], (79|5, 80|10], (100|0, Infinity|Infinity]')
|
|
68
|
-
})
|
|
69
|
-
|
|
70
|
-
test('left-side gap contraction', () => {
|
|
71
|
-
expect(detector.markAndCheck(new NumberPair(10, 0), new NumberPair(15, 0))).toEqual(true)
|
|
72
|
-
expect(detector.toString()).toEqual('(15|0, 20|0], (40|0, 80|10], (100|0, Infinity|Infinity]')
|
|
73
|
-
|
|
74
|
-
expect(detector.markAndCheck(new NumberPair(40, 0), new NumberPair(80, 9))).toEqual(true)
|
|
75
|
-
expect(detector.toString()).toEqual('(15|0, 20|0], (80|9, 80|10], (100|0, Infinity|Infinity]')
|
|
76
|
-
})
|
|
77
|
-
|
|
78
|
-
test('right-side gap contraction', () => {
|
|
79
|
-
expect(detector.markAndCheck(new NumberPair(15, 0), new NumberPair(20, 0))).toEqual(true)
|
|
80
|
-
expect(detector.toString()).toEqual('(10|0, 15|0], (40|0, 80|10], (100|0, Infinity|Infinity]')
|
|
81
|
-
|
|
82
|
-
expect(detector.markAndCheck(new NumberPair(40, 1), new NumberPair(80, 10))).toEqual(true)
|
|
83
|
-
expect(detector.toString()).toEqual('(10|0, 15|0], (40|0, 40|1], (100|0, Infinity|Infinity]')
|
|
84
|
-
})
|
|
85
|
-
|
|
86
|
-
test('full contraction', () => {
|
|
87
|
-
expect(detector.markAndCheck(new NumberPair(40, 0), new NumberPair(80, 10))).toEqual(true)
|
|
88
|
-
expect(detector.toString()).toEqual('(10|0, 20|0], (100|0, Infinity|Infinity]')
|
|
89
|
-
|
|
90
|
-
expect(detector.markAndCheck(new NumberPair(10, 0), new NumberPair(20, 0))).toEqual(true)
|
|
91
|
-
expect(detector.toString()).toEqual('(100|0, Infinity|Infinity]')
|
|
92
|
-
})
|
|
93
|
-
})
|
|
94
|
-
|
|
95
|
-
describe('duplicates return false and do not change state', () => {
|
|
96
|
-
let detector: DuplicateMessageDetector
|
|
97
|
-
let expectedState: string
|
|
98
|
-
beforeEach(() => {
|
|
99
|
-
detector = new DuplicateMessageDetector()
|
|
100
|
-
detector.markAndCheck(new NumberPair(1, 0), new NumberPair(10, 0))
|
|
101
|
-
detector.markAndCheck(new NumberPair(20, 0), new NumberPair(40, 0))
|
|
102
|
-
detector.markAndCheck(new NumberPair(80, 10), new NumberPair(100, 0))
|
|
103
|
-
expectedState = detector.toString()
|
|
104
|
-
expect(expectedState).toEqual('(10|0, 20|0], (40|0, 80|10], (100|0, Infinity|Infinity]')
|
|
105
|
-
})
|
|
106
|
-
|
|
107
|
-
it('way below 1st gap', () => {
|
|
108
|
-
expect(detector.markAndCheck(new NumberPair(5, 0), new NumberPair(7, 0))).toEqual(false)
|
|
109
|
-
expect(detector.toString()).toEqual(expectedState)
|
|
110
|
-
})
|
|
111
|
-
|
|
112
|
-
it('number touches lower bound of 1st gap', () => {
|
|
113
|
-
expect(detector.markAndCheck(new NumberPair(8, 0), new NumberPair(10, 0))).toEqual(false)
|
|
114
|
-
expect(detector.toString()).toEqual(expectedState)
|
|
115
|
-
})
|
|
116
|
-
|
|
117
|
-
it('in-between gaps', () => {
|
|
118
|
-
expect(detector.markAndCheck(new NumberPair(25, 5), new NumberPair(30, 0))).toEqual(false)
|
|
119
|
-
expect(detector.toString()).toEqual(expectedState)
|
|
120
|
-
})
|
|
121
|
-
|
|
122
|
-
it('number touches lower bound of 2nd gap', () => {
|
|
123
|
-
expect(detector.markAndCheck(new NumberPair(25, 0), new NumberPair(40, 0))).toEqual(false)
|
|
124
|
-
expect(detector.toString()).toEqual(expectedState)
|
|
125
|
-
})
|
|
126
|
-
|
|
127
|
-
it('previous number touches upper bound of 2nd gap', () => {
|
|
128
|
-
expect(detector.markAndCheck(new NumberPair(80, 10), new NumberPair(90, 0))).toEqual(false)
|
|
129
|
-
expect(detector.toString()).toEqual(expectedState)
|
|
130
|
-
})
|
|
131
|
-
|
|
132
|
-
it('previous number not provided, number is below last gap', () => {
|
|
133
|
-
expect(detector.markAndCheck(null, new NumberPair(80, 10))).toEqual(false)
|
|
134
|
-
expect(detector.toString()).toEqual(expectedState)
|
|
135
|
-
})
|
|
136
|
-
|
|
137
|
-
it('previous number not provided, number touches lower bound of last gap', () => {
|
|
138
|
-
expect(detector.markAndCheck(null, new NumberPair(100, 0))).toEqual(false)
|
|
139
|
-
expect(detector.toString()).toEqual(expectedState)
|
|
140
|
-
})
|
|
141
|
-
})
|
|
142
|
-
|
|
143
|
-
describe('erroneous messages that overlap gaps', () => {
|
|
144
|
-
let detector: DuplicateMessageDetector
|
|
145
|
-
let expectedState
|
|
146
|
-
beforeEach(() => {
|
|
147
|
-
detector = new DuplicateMessageDetector()
|
|
148
|
-
detector.markAndCheck(new NumberPair(1, 0), new NumberPair(10, 0))
|
|
149
|
-
detector.markAndCheck(new NumberPair(20, 0), new NumberPair(40, 0))
|
|
150
|
-
detector.markAndCheck(new NumberPair(80, 10), new NumberPair(100, 0))
|
|
151
|
-
expectedState = detector.toString()
|
|
152
|
-
expect(expectedState).toEqual('(10|0, 20|0], (40|0, 80|10], (100|0, Infinity|Infinity]')
|
|
153
|
-
})
|
|
154
|
-
|
|
155
|
-
it('completely around gap', () => {
|
|
156
|
-
expect(() => detector.markAndCheck(new NumberPair(5, 0), new NumberPair(30, 0))).toThrow(GapMisMatchError)
|
|
157
|
-
})
|
|
158
|
-
|
|
159
|
-
it('previousNumber below gap while number in gap', () => {
|
|
160
|
-
expect(() => detector.markAndCheck(new NumberPair(5, 0), new NumberPair(15, 0))).toThrow(GapMisMatchError)
|
|
161
|
-
})
|
|
162
|
-
|
|
163
|
-
it('previousNumber in gap while number over gap', () => {
|
|
164
|
-
expect(() => detector.markAndCheck(new NumberPair(15, 0), new NumberPair(20, 5))).toThrow(GapMisMatchError)
|
|
165
|
-
})
|
|
166
|
-
|
|
167
|
-
it('completely around multiple gaps', () => {
|
|
168
|
-
expect(() => detector.markAndCheck(new NumberPair(10, 0), new NumberPair(200, 0))).toThrow(GapMisMatchError)
|
|
169
|
-
})
|
|
170
|
-
})
|
|
171
|
-
|
|
172
|
-
test('checks that number > previousNumber', () => {
|
|
173
|
-
const detector = new DuplicateMessageDetector()
|
|
174
|
-
expect(() => detector.markAndCheck(new NumberPair(5, 0), new NumberPair(1, 0)))
|
|
175
|
-
.toThrow(InvalidNumberingError)
|
|
176
|
-
expect(() => detector.markAndCheck(new NumberPair(5, 5), new NumberPair(5, 5)))
|
|
177
|
-
.toThrow(InvalidNumberingError)
|
|
178
|
-
})
|
|
179
|
-
|
|
180
|
-
test('lowest gaps get dropped when reaching maximum number of gaps', () => {
|
|
181
|
-
const detector = new DuplicateMessageDetector(3)
|
|
182
|
-
detector.markAndCheck(new NumberPair(1, 0), new NumberPair(10, 0))
|
|
183
|
-
detector.markAndCheck(new NumberPair(20, 0), new NumberPair(40, 0))
|
|
184
|
-
detector.markAndCheck(new NumberPair(80, 10), new NumberPair(100, 0))
|
|
185
|
-
expect(detector.toString()).toEqual('(10|0, 20|0], (40|0, 80|10], (100|0, Infinity|Infinity]')
|
|
186
|
-
|
|
187
|
-
detector.markAndCheck(new NumberPair(150, 0), new NumberPair(200, 0))
|
|
188
|
-
expect(detector.toString()).toEqual('(40|0, 80|10], (100|0, 150|0], (200|0, Infinity|Infinity]')
|
|
189
|
-
|
|
190
|
-
detector.markAndCheck(new NumberPair(50, 0), new NumberPair(70, 0))
|
|
191
|
-
expect(detector.toString()).toEqual('(70|0, 80|10], (100|0, 150|0], (200|0, Infinity|Infinity]')
|
|
192
|
-
})
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
import { Message } from '@streamr/dht'
|
|
2
|
-
import { ExternalNetworkRpc, SERVICE_ID } from '../../src/logic/ExternalNetworkRpc'
|
|
3
|
-
import { HandshakeRequest, HandshakeResponse } from '../../generated/packages/dht/protos/DhtRpc'
|
|
4
|
-
import { MockTransport } from '../utils/mock/MockTransport'
|
|
5
|
-
import { RpcMessage } from '@streamr/proto-rpc'
|
|
6
|
-
import { Any } from '../../generated/google/protobuf/any'
|
|
7
|
-
import { HandshakeRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
|
|
8
|
-
|
|
9
|
-
describe('ExternalNetworkRpc', () => {
|
|
10
|
-
|
|
11
|
-
let rpc: ExternalNetworkRpc
|
|
12
|
-
let fn: jest.Mock
|
|
13
|
-
let transport: MockTransport
|
|
14
|
-
|
|
15
|
-
beforeEach(() => {
|
|
16
|
-
transport = new MockTransport
|
|
17
|
-
rpc = new ExternalNetworkRpc(transport)
|
|
18
|
-
fn = jest.fn()
|
|
19
|
-
})
|
|
20
|
-
|
|
21
|
-
afterEach(() => {
|
|
22
|
-
rpc.destroy()
|
|
23
|
-
})
|
|
24
|
-
|
|
25
|
-
it('registers method', async () => {
|
|
26
|
-
rpc.registerRpcMethod(HandshakeRequest, HandshakeResponse, 'handshake', () => fn())
|
|
27
|
-
transport.emit('message', Message.create({
|
|
28
|
-
serviceId: SERVICE_ID,
|
|
29
|
-
body: {
|
|
30
|
-
oneofKind: 'rpcMessage',
|
|
31
|
-
rpcMessage: RpcMessage.create({
|
|
32
|
-
header: {
|
|
33
|
-
request: 'request',
|
|
34
|
-
method: 'handshake'
|
|
35
|
-
},
|
|
36
|
-
body: Any.pack(HandshakeRequest.create(), HandshakeRequest)
|
|
37
|
-
})
|
|
38
|
-
}
|
|
39
|
-
}))
|
|
40
|
-
expect(fn).toHaveBeenCalledTimes(1)
|
|
41
|
-
})
|
|
42
|
-
|
|
43
|
-
it('creates clients', async () => {
|
|
44
|
-
const client = rpc.createRpcClient(HandshakeRpcClient)
|
|
45
|
-
expect(client.methods.length).toEqual(2)
|
|
46
|
-
})
|
|
47
|
-
|
|
48
|
-
})
|
|
@@ -1,253 +0,0 @@
|
|
|
1
|
-
import { FifoMapWithTTL } from '../../src/logic/propagation/FifoMapWithTTL'
|
|
2
|
-
|
|
3
|
-
describe('FifoMapWithTtl', () => {
|
|
4
|
-
describe('invalid constructor arguments', () => {
|
|
5
|
-
it('cannot instantiate with negative ttl', () => {
|
|
6
|
-
expect(() => new FifoMapWithTTL({ ttlInMs: -5, maxSize: 10 }))
|
|
7
|
-
.toThrow('ttlInMs (-5) cannot be < 0')
|
|
8
|
-
})
|
|
9
|
-
|
|
10
|
-
it('cannot instantiate with negative maxSize', () => {
|
|
11
|
-
expect(() => new FifoMapWithTTL({ ttlInMs: 100, maxSize: -6 }))
|
|
12
|
-
.toThrow('maxSize (-6) cannot be < 0')
|
|
13
|
-
})
|
|
14
|
-
})
|
|
15
|
-
|
|
16
|
-
it('of maxSize=0 always remains empty', () => {
|
|
17
|
-
const fifoMap = new FifoMapWithTTL<string, string>({
|
|
18
|
-
ttlInMs: 100,
|
|
19
|
-
maxSize: 0
|
|
20
|
-
})
|
|
21
|
-
fifoMap.set('hello', 'world')
|
|
22
|
-
fifoMap.set('are', 'you empty?')
|
|
23
|
-
expect(fifoMap.get('hello')).toBeUndefined()
|
|
24
|
-
expect(fifoMap.get('are')).toBeUndefined()
|
|
25
|
-
})
|
|
26
|
-
|
|
27
|
-
describe('of maxSize=5', () => {
|
|
28
|
-
let fifoMap: FifoMapWithTTL<string, string>
|
|
29
|
-
|
|
30
|
-
beforeEach(() => {
|
|
31
|
-
fifoMap = new FifoMapWithTTL<string, string>({
|
|
32
|
-
ttlInMs: 100,
|
|
33
|
-
maxSize: 5
|
|
34
|
-
})
|
|
35
|
-
})
|
|
36
|
-
|
|
37
|
-
function setFirstFiveMessages() {
|
|
38
|
-
fifoMap.set('1st', 'foo')
|
|
39
|
-
fifoMap.set('2nd', 'bar')
|
|
40
|
-
fifoMap.set('3rd', 'hello')
|
|
41
|
-
fifoMap.set('4th', 'world')
|
|
42
|
-
fifoMap.set('5th', '!')
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
function set6thAnd7thMessages() {
|
|
46
|
-
fifoMap.set('6th', 'new')
|
|
47
|
-
fifoMap.set('7th', 'messages')
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
it('can insert 5 items and retrieve all of them', () => {
|
|
51
|
-
setFirstFiveMessages()
|
|
52
|
-
expect(fifoMap.get('1st')).toEqual('foo')
|
|
53
|
-
expect(fifoMap.get('2nd')).toEqual('bar')
|
|
54
|
-
expect(fifoMap.get('3rd')).toEqual('hello')
|
|
55
|
-
expect(fifoMap.get('4th')).toEqual('world')
|
|
56
|
-
expect(fifoMap.get('5th')).toEqual('!')
|
|
57
|
-
})
|
|
58
|
-
|
|
59
|
-
it('inserting items when full causes oldest items to get dropped', () => {
|
|
60
|
-
setFirstFiveMessages()
|
|
61
|
-
set6thAnd7thMessages()
|
|
62
|
-
expect(fifoMap.get('1st')).toBeUndefined()
|
|
63
|
-
expect(fifoMap.get('2nd')).toBeUndefined()
|
|
64
|
-
expect(fifoMap.get('3rd')).toEqual('hello')
|
|
65
|
-
expect(fifoMap.get('4th')).toEqual('world')
|
|
66
|
-
expect(fifoMap.get('5th')).toEqual('!')
|
|
67
|
-
expect(fifoMap.get('6th')).toEqual('new')
|
|
68
|
-
expect(fifoMap.get('7th')).toEqual('messages')
|
|
69
|
-
})
|
|
70
|
-
|
|
71
|
-
describe('(re-)setting an item', () => {
|
|
72
|
-
beforeEach(() => {
|
|
73
|
-
setFirstFiveMessages()
|
|
74
|
-
fifoMap.set('4th', 'modified-once')
|
|
75
|
-
fifoMap.set('4th', 'modified-twice')
|
|
76
|
-
})
|
|
77
|
-
|
|
78
|
-
it('does not cause oldest items to drop', () => {
|
|
79
|
-
expect(fifoMap.get('1st')).toEqual('foo')
|
|
80
|
-
expect(fifoMap.get('2nd')).toEqual('bar')
|
|
81
|
-
expect(fifoMap.get('3rd')).toEqual('hello')
|
|
82
|
-
expect(fifoMap.get('5th')).toEqual('!')
|
|
83
|
-
})
|
|
84
|
-
|
|
85
|
-
it('newest value stays in place', () => {
|
|
86
|
-
expect(fifoMap.get('4th')).toEqual('modified-twice')
|
|
87
|
-
})
|
|
88
|
-
})
|
|
89
|
-
|
|
90
|
-
describe('#delete', () => {
|
|
91
|
-
it('can delete an item', () => {
|
|
92
|
-
setFirstFiveMessages()
|
|
93
|
-
fifoMap.delete('4th')
|
|
94
|
-
expect(fifoMap.get('1st')).toEqual('foo')
|
|
95
|
-
expect(fifoMap.get('2nd')).toEqual('bar')
|
|
96
|
-
expect(fifoMap.get('3rd')).toEqual('hello')
|
|
97
|
-
expect(fifoMap.get('4th')).toBeUndefined()
|
|
98
|
-
expect(fifoMap.get('5th')).toEqual('!')
|
|
99
|
-
})
|
|
100
|
-
|
|
101
|
-
it('deleting items makes room for new ones', () => {
|
|
102
|
-
setFirstFiveMessages()
|
|
103
|
-
fifoMap.delete('2nd')
|
|
104
|
-
fifoMap.delete('4th')
|
|
105
|
-
set6thAnd7thMessages()
|
|
106
|
-
expect(fifoMap.get('1st')).toEqual('foo')
|
|
107
|
-
expect(fifoMap.get('2nd')).toBeUndefined()
|
|
108
|
-
expect(fifoMap.get('3rd')).toEqual('hello')
|
|
109
|
-
expect(fifoMap.get('4th')).toBeUndefined()
|
|
110
|
-
expect(fifoMap.get('5th')).toEqual('!')
|
|
111
|
-
expect(fifoMap.get('6th')).toEqual('new')
|
|
112
|
-
expect(fifoMap.get('7th')).toEqual('messages')
|
|
113
|
-
})
|
|
114
|
-
|
|
115
|
-
it('deleting a non-existing item does not throw', () => {
|
|
116
|
-
setFirstFiveMessages()
|
|
117
|
-
expect(() =>fifoMap.delete('non-existing-key')).not.toThrow()
|
|
118
|
-
})
|
|
119
|
-
|
|
120
|
-
it('deleting a non-existing item keeps existing items intact', () => {
|
|
121
|
-
setFirstFiveMessages()
|
|
122
|
-
fifoMap.delete('non-existing-key')
|
|
123
|
-
expect(fifoMap.get('1st')).toEqual('foo')
|
|
124
|
-
expect(fifoMap.get('2nd')).toEqual('bar')
|
|
125
|
-
expect(fifoMap.get('3rd')).toEqual('hello')
|
|
126
|
-
expect(fifoMap.get('4th')).toEqual('world')
|
|
127
|
-
expect(fifoMap.get('5th')).toEqual('!')
|
|
128
|
-
})
|
|
129
|
-
})
|
|
130
|
-
|
|
131
|
-
describe('TTL', () => {
|
|
132
|
-
let time: number
|
|
133
|
-
|
|
134
|
-
beforeEach(() => {
|
|
135
|
-
time = 0
|
|
136
|
-
fifoMap = new FifoMapWithTTL<string, string>({
|
|
137
|
-
ttlInMs: 100,
|
|
138
|
-
maxSize: 5,
|
|
139
|
-
timeProvider: () => time
|
|
140
|
-
})
|
|
141
|
-
})
|
|
142
|
-
|
|
143
|
-
it('#get returns undefined after TTL', () => {
|
|
144
|
-
time = 0
|
|
145
|
-
fifoMap.set('hello', 'world')
|
|
146
|
-
time = 50
|
|
147
|
-
fifoMap.set('foo', 'bar')
|
|
148
|
-
|
|
149
|
-
time = 100
|
|
150
|
-
expect(fifoMap.get('hello')).toBeUndefined()
|
|
151
|
-
expect(fifoMap.get('foo')).toEqual('bar')
|
|
152
|
-
|
|
153
|
-
time = 160
|
|
154
|
-
expect(fifoMap.get('hello')).toBeUndefined()
|
|
155
|
-
expect(fifoMap.get('foo')).toBeUndefined()
|
|
156
|
-
})
|
|
157
|
-
|
|
158
|
-
it('re-setting an item resets TTL', () => {
|
|
159
|
-
time = 0
|
|
160
|
-
fifoMap.set('hello', 'world')
|
|
161
|
-
|
|
162
|
-
time = 90
|
|
163
|
-
fifoMap.set('hello', 'world')
|
|
164
|
-
|
|
165
|
-
time = 100
|
|
166
|
-
expect(fifoMap.get('hello')).toEqual('world')
|
|
167
|
-
})
|
|
168
|
-
|
|
169
|
-
it('re-setting expired resets TTL', () => {
|
|
170
|
-
time = 0
|
|
171
|
-
fifoMap.set('hello', 'world')
|
|
172
|
-
|
|
173
|
-
time = 110
|
|
174
|
-
expect(fifoMap.get('hello')).toBeUndefined() // sanity check
|
|
175
|
-
fifoMap.set('hello', 'world')
|
|
176
|
-
|
|
177
|
-
time = 150
|
|
178
|
-
expect(fifoMap.get('hello')).toEqual('world')
|
|
179
|
-
})
|
|
180
|
-
|
|
181
|
-
it('#values returns non-expired items', () => {
|
|
182
|
-
time = 0
|
|
183
|
-
fifoMap.set('hello', 'world')
|
|
184
|
-
time = 50
|
|
185
|
-
fifoMap.set('foo', 'bar')
|
|
186
|
-
time = 100
|
|
187
|
-
fifoMap.set('lorem', 'ipsum')
|
|
188
|
-
time = 120
|
|
189
|
-
fifoMap.set('dolor', 'sit')
|
|
190
|
-
|
|
191
|
-
expect(fifoMap.values()).toEqual(['bar', 'ipsum', 'sit'])
|
|
192
|
-
|
|
193
|
-
time = 130
|
|
194
|
-
fifoMap.set('amet', 'consectetur')
|
|
195
|
-
|
|
196
|
-
expect(fifoMap.values()).toEqual(['bar', 'ipsum', 'sit', 'consectetur'])
|
|
197
|
-
|
|
198
|
-
time = 200
|
|
199
|
-
expect(fifoMap.values()).toEqual(['sit', 'consectetur'])
|
|
200
|
-
|
|
201
|
-
time = 300
|
|
202
|
-
expect(fifoMap.values()).toEqual([])
|
|
203
|
-
})
|
|
204
|
-
})
|
|
205
|
-
|
|
206
|
-
describe('onItemDropped callback', () => {
|
|
207
|
-
let time: number
|
|
208
|
-
let onItemDropped: jest.Mock<undefined, [string]>
|
|
209
|
-
|
|
210
|
-
beforeEach(() => {
|
|
211
|
-
time = 0
|
|
212
|
-
onItemDropped = jest.fn<undefined, [string]>()
|
|
213
|
-
fifoMap = new FifoMapWithTTL<string, string>({
|
|
214
|
-
ttlInMs: 100,
|
|
215
|
-
maxSize: 5,
|
|
216
|
-
onItemDropped,
|
|
217
|
-
timeProvider: () => time
|
|
218
|
-
})
|
|
219
|
-
})
|
|
220
|
-
|
|
221
|
-
it('invoked when deleting an item', () => {
|
|
222
|
-
setFirstFiveMessages()
|
|
223
|
-
fifoMap.delete('3rd')
|
|
224
|
-
expect(onItemDropped).toHaveBeenCalledTimes(1)
|
|
225
|
-
expect(onItemDropped).toHaveBeenCalledWith('3rd')
|
|
226
|
-
})
|
|
227
|
-
|
|
228
|
-
it('invoked when items are dropped due to being full', () => {
|
|
229
|
-
setFirstFiveMessages()
|
|
230
|
-
set6thAnd7thMessages()
|
|
231
|
-
expect(onItemDropped).toHaveBeenCalledTimes(2)
|
|
232
|
-
expect(onItemDropped).toHaveBeenNthCalledWith(1, '1st')
|
|
233
|
-
expect(onItemDropped).toHaveBeenNthCalledWith(2, '2nd')
|
|
234
|
-
})
|
|
235
|
-
|
|
236
|
-
it('invoked when re-setting an item', () => {
|
|
237
|
-
setFirstFiveMessages()
|
|
238
|
-
fifoMap.set('4th', '!!!')
|
|
239
|
-
expect(onItemDropped).toHaveBeenCalledTimes(1)
|
|
240
|
-
expect(onItemDropped).toHaveBeenNthCalledWith(1, '4th')
|
|
241
|
-
})
|
|
242
|
-
|
|
243
|
-
it('invoked when getting a stale item', () => {
|
|
244
|
-
time = 0
|
|
245
|
-
setFirstFiveMessages()
|
|
246
|
-
time = 500
|
|
247
|
-
expect(fifoMap.get('1st')).toBeUndefined()
|
|
248
|
-
expect(onItemDropped).toHaveBeenCalledTimes(1)
|
|
249
|
-
expect(onItemDropped).toHaveBeenNthCalledWith(1, '1st')
|
|
250
|
-
})
|
|
251
|
-
})
|
|
252
|
-
})
|
|
253
|
-
})
|
|
@@ -1,155 +0,0 @@
|
|
|
1
|
-
import { DhtAddress, NodeType, toNodeId, toDhtAddressRaw } from '@streamr/dht'
|
|
2
|
-
import { StreamPartIDUtils } from '@streamr/utils'
|
|
3
|
-
import { NodeList } from '../../src/logic/NodeList'
|
|
4
|
-
import { HandshakeRpcLocal } from '../../src/logic/neighbor-discovery/HandshakeRpcLocal'
|
|
5
|
-
import { InterleaveRequest, StreamPartHandshakeRequest } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
|
|
6
|
-
import { createMockContentDeliveryRpcRemote, createMockHandshakeRpcRemote, createMockPeerDescriptor } from '../utils/utils'
|
|
7
|
-
|
|
8
|
-
const STREAM_PART_ID = StreamPartIDUtils.parse('stream#0')
|
|
9
|
-
|
|
10
|
-
describe('HandshakeRpcLocal', () => {
|
|
11
|
-
|
|
12
|
-
let rpcLocal: HandshakeRpcLocal
|
|
13
|
-
|
|
14
|
-
const localPeerDescriptor = createMockPeerDescriptor()
|
|
15
|
-
|
|
16
|
-
let neighbors: NodeList
|
|
17
|
-
let ongoingHandshakes: Set<DhtAddress>
|
|
18
|
-
let ongoingInterleaves: Set<DhtAddress>
|
|
19
|
-
let handshakeWithInterleaving: jest.Mock
|
|
20
|
-
|
|
21
|
-
beforeEach(() => {
|
|
22
|
-
neighbors = new NodeList(toNodeId(localPeerDescriptor), 10)
|
|
23
|
-
ongoingHandshakes = new Set()
|
|
24
|
-
ongoingInterleaves = new Set()
|
|
25
|
-
handshakeWithInterleaving = jest.fn()
|
|
26
|
-
|
|
27
|
-
rpcLocal = new HandshakeRpcLocal({
|
|
28
|
-
streamPartId: STREAM_PART_ID,
|
|
29
|
-
ongoingHandshakes,
|
|
30
|
-
ongoingInterleaves,
|
|
31
|
-
createRpcRemote: (_p) => createMockHandshakeRpcRemote(),
|
|
32
|
-
createContentDeliveryRpcRemote: (_p) => createMockContentDeliveryRpcRemote(),
|
|
33
|
-
handshakeWithInterleaving: async (_p, _t) => {
|
|
34
|
-
handshakeWithInterleaving()
|
|
35
|
-
return true
|
|
36
|
-
},
|
|
37
|
-
neighbors,
|
|
38
|
-
maxNeighborCount: 4
|
|
39
|
-
})
|
|
40
|
-
})
|
|
41
|
-
|
|
42
|
-
it('handshake', async () => {
|
|
43
|
-
const req = StreamPartHandshakeRequest.create({
|
|
44
|
-
streamPartId: STREAM_PART_ID,
|
|
45
|
-
requestId: 'requestId'
|
|
46
|
-
})
|
|
47
|
-
const res = await rpcLocal.handshake(req, {
|
|
48
|
-
incomingSourceDescriptor: createMockPeerDescriptor()
|
|
49
|
-
} as any)
|
|
50
|
-
expect(res.accepted).toEqual(true)
|
|
51
|
-
expect(res.interleaveTargetDescriptor).toBeUndefined()
|
|
52
|
-
expect(res.requestId).toEqual('requestId')
|
|
53
|
-
})
|
|
54
|
-
|
|
55
|
-
it('handshake interleave', async () => {
|
|
56
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
57
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
58
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
59
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
60
|
-
const req = StreamPartHandshakeRequest.create({
|
|
61
|
-
streamPartId: STREAM_PART_ID,
|
|
62
|
-
requestId: 'requestId'
|
|
63
|
-
})
|
|
64
|
-
const res = await rpcLocal.handshake(req, {
|
|
65
|
-
incomingSourceDescriptor: createMockPeerDescriptor()
|
|
66
|
-
} as any)
|
|
67
|
-
expect(res.accepted).toEqual(true)
|
|
68
|
-
expect(res.interleaveTargetDescriptor).toBeDefined()
|
|
69
|
-
})
|
|
70
|
-
|
|
71
|
-
it('unaccepted handshake', async () => {
|
|
72
|
-
ongoingHandshakes.add('0x2222' as DhtAddress)
|
|
73
|
-
ongoingHandshakes.add('0x3333' as DhtAddress)
|
|
74
|
-
ongoingHandshakes.add('0x4444' as DhtAddress)
|
|
75
|
-
ongoingHandshakes.add('0x5555' as DhtAddress)
|
|
76
|
-
const req = StreamPartHandshakeRequest.create({
|
|
77
|
-
streamPartId: STREAM_PART_ID,
|
|
78
|
-
requestId: 'requestId'
|
|
79
|
-
})
|
|
80
|
-
const res = await rpcLocal.handshake(req, {
|
|
81
|
-
incomingSourceDescriptor: createMockPeerDescriptor()
|
|
82
|
-
} as any)
|
|
83
|
-
expect(res.accepted).toEqual(false)
|
|
84
|
-
})
|
|
85
|
-
|
|
86
|
-
it('handshakeWithInterleaving success', async () => {
|
|
87
|
-
const req: InterleaveRequest = {
|
|
88
|
-
interleaveTargetDescriptor: {
|
|
89
|
-
nodeId: toDhtAddressRaw('0x2222' as DhtAddress),
|
|
90
|
-
type: NodeType.NODEJS
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
await rpcLocal.interleaveRequest(req, {
|
|
94
|
-
incomingSourceDescriptor: createMockPeerDescriptor()
|
|
95
|
-
} as any)
|
|
96
|
-
expect(handshakeWithInterleaving).toHaveBeenCalledTimes(1)
|
|
97
|
-
})
|
|
98
|
-
|
|
99
|
-
it('rejects handshakes if interleaving to the requestor is ongoing', async () => {
|
|
100
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
101
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
102
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
103
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
104
|
-
const requestor = createMockPeerDescriptor()
|
|
105
|
-
ongoingInterleaves.add(toNodeId(requestor))
|
|
106
|
-
const req = StreamPartHandshakeRequest.create({
|
|
107
|
-
streamPartId: STREAM_PART_ID,
|
|
108
|
-
requestId: 'requestId'
|
|
109
|
-
})
|
|
110
|
-
const res = await rpcLocal.handshake(req, {
|
|
111
|
-
incomingSourceDescriptor: requestor
|
|
112
|
-
} as any)
|
|
113
|
-
expect(res.accepted).toEqual(false)
|
|
114
|
-
})
|
|
115
|
-
|
|
116
|
-
it('Rejects if interleaving is required and too many interleaving requests are ongoing', async () => {
|
|
117
|
-
const interleavingPeer1 = createMockPeerDescriptor()
|
|
118
|
-
const interleavingPeer2 = createMockPeerDescriptor()
|
|
119
|
-
const interleavingPeer3 = createMockPeerDescriptor()
|
|
120
|
-
neighbors.add(createMockContentDeliveryRpcRemote(interleavingPeer1))
|
|
121
|
-
neighbors.add(createMockContentDeliveryRpcRemote(interleavingPeer2))
|
|
122
|
-
neighbors.add(createMockContentDeliveryRpcRemote(interleavingPeer3))
|
|
123
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
124
|
-
ongoingInterleaves.add(toNodeId(interleavingPeer1))
|
|
125
|
-
ongoingInterleaves.add(toNodeId(interleavingPeer2))
|
|
126
|
-
ongoingInterleaves.add(toNodeId(interleavingPeer3))
|
|
127
|
-
const req = StreamPartHandshakeRequest.create({
|
|
128
|
-
streamPartId: STREAM_PART_ID,
|
|
129
|
-
requestId: 'requestId'
|
|
130
|
-
})
|
|
131
|
-
const res = await rpcLocal.handshake(req, {
|
|
132
|
-
incomingSourceDescriptor: createMockPeerDescriptor()
|
|
133
|
-
} as any)
|
|
134
|
-
expect(res.accepted).toEqual(false)
|
|
135
|
-
expect(handshakeWithInterleaving).toHaveBeenCalledTimes(0)
|
|
136
|
-
})
|
|
137
|
-
|
|
138
|
-
it('rejects handshakes if the requestor has more than maxNeighborCount neighbors', async () => {
|
|
139
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
140
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
141
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
142
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
143
|
-
neighbors.add(createMockContentDeliveryRpcRemote())
|
|
144
|
-
const req = StreamPartHandshakeRequest.create({
|
|
145
|
-
streamPartId: STREAM_PART_ID,
|
|
146
|
-
requestId: 'requestId'
|
|
147
|
-
})
|
|
148
|
-
const res = await rpcLocal.handshake(req, {
|
|
149
|
-
incomingSourceDescriptor: createMockPeerDescriptor()
|
|
150
|
-
} as any)
|
|
151
|
-
expect(res.accepted).toEqual(false)
|
|
152
|
-
expect(handshakeWithInterleaving).toHaveBeenCalledTimes(0)
|
|
153
|
-
})
|
|
154
|
-
|
|
155
|
-
})
|