cojson 0.17.13 → 0.18.0
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +36 -0
- package/dist/coValues/account.d.ts +7 -2
- package/dist/coValues/account.d.ts.map +1 -1
- package/dist/coValues/account.js +18 -0
- package/dist/coValues/account.js.map +1 -1
- package/dist/sync.d.ts +14 -4
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +51 -5
- package/dist/sync.js.map +1 -1
- package/dist/tests/account.test.js +60 -0
- package/dist/tests/account.test.js.map +1 -1
- package/dist/tests/sync.sharding.test.js +132 -0
- package/dist/tests/sync.sharding.test.js.map +1 -1
- package/dist/tests/testUtils.d.ts +1 -0
- package/dist/tests/testUtils.d.ts.map +1 -1
- package/dist/tests/testUtils.js +1 -1
- package/dist/tests/testUtils.js.map +1 -1
- package/package.json +2 -2
- package/src/coValues/account.ts +37 -11
- package/src/sync.ts +65 -11
- package/src/tests/account.test.ts +80 -0
- package/src/tests/sync.sharding.test.ts +184 -5
- package/src/tests/testUtils.ts +2 -1
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
import { beforeEach, describe, expect, test } from "vitest";
|
|
2
|
-
import {
|
|
2
|
+
import { Peer } from "../exports";
|
|
3
|
+
import { hwrServerPeerSelector, ServerPeerSelector } from "../sync";
|
|
3
4
|
import {
|
|
4
5
|
SyncMessagesLog,
|
|
5
6
|
TEST_NODE_CONFIG,
|
|
6
|
-
blockMessageTypeOnOutgoingPeer,
|
|
7
7
|
connectedPeersWithMessagesTracking,
|
|
8
8
|
getSyncServerConnectedPeer,
|
|
9
|
-
loadCoValueOrFail,
|
|
10
9
|
setupTestAccount,
|
|
11
10
|
setupTestNode,
|
|
12
11
|
} from "./testUtils";
|
|
13
|
-
import {
|
|
14
|
-
import { ServerPeerSelector } from "../sync";
|
|
12
|
+
import { PeerState } from "../PeerState";
|
|
15
13
|
|
|
16
14
|
beforeEach(async () => {
|
|
17
15
|
// We want to simulate a real world communication that happens asynchronously
|
|
@@ -116,4 +114,185 @@ describe("sharding", () => {
|
|
|
116
114
|
2 + 1, // 2 clients + 1 selected core
|
|
117
115
|
);
|
|
118
116
|
});
|
|
117
|
+
|
|
118
|
+
describe("hwrServerPeerSelector", () => {
|
|
119
|
+
const createMockPeer = (
|
|
120
|
+
id: string,
|
|
121
|
+
role: "server" | "client" = "server",
|
|
122
|
+
): Peer => ({
|
|
123
|
+
id,
|
|
124
|
+
role,
|
|
125
|
+
incoming: {
|
|
126
|
+
close: () => {},
|
|
127
|
+
onMessage: () => {},
|
|
128
|
+
onClose: () => {},
|
|
129
|
+
},
|
|
130
|
+
outgoing: {
|
|
131
|
+
push: () => {},
|
|
132
|
+
close: () => {},
|
|
133
|
+
onClose: () => {},
|
|
134
|
+
},
|
|
135
|
+
});
|
|
136
|
+
|
|
137
|
+
test("selects top n peers by hash weight", () => {
|
|
138
|
+
const allPeers = Array.from(
|
|
139
|
+
{ length: 5 },
|
|
140
|
+
(_, i) => new PeerState(createMockPeer(`peer_${i + 1}`), undefined),
|
|
141
|
+
);
|
|
142
|
+
|
|
143
|
+
// Create selector that picks top 2 peers
|
|
144
|
+
const selector = hwrServerPeerSelector(2);
|
|
145
|
+
const selectedPeers = selector("co_ztest123", allPeers);
|
|
146
|
+
|
|
147
|
+
// Should return exactly 2 peers (n=2)
|
|
148
|
+
expect(selectedPeers.length).toBe(2);
|
|
149
|
+
|
|
150
|
+
// All returned peers should be from the original set
|
|
151
|
+
expect(allPeers).toContain(selectedPeers[0]);
|
|
152
|
+
expect(allPeers).toContain(selectedPeers[1]);
|
|
153
|
+
|
|
154
|
+
// The two peers should be different
|
|
155
|
+
expect(selectedPeers[0]).not.toBe(selectedPeers[1]);
|
|
156
|
+
});
|
|
157
|
+
|
|
158
|
+
test("returns all peers when n >= total peers", () => {
|
|
159
|
+
const allPeers = Array.from(
|
|
160
|
+
{ length: 3 },
|
|
161
|
+
(_, i) => new PeerState(createMockPeer(`peer_${i + 1}`), undefined),
|
|
162
|
+
);
|
|
163
|
+
|
|
164
|
+
// Create a selector that picks top 10 peers (more than we'll have)
|
|
165
|
+
const selector = hwrServerPeerSelector(10);
|
|
166
|
+
const selectedPeers = selector("co_ztest123", allPeers);
|
|
167
|
+
|
|
168
|
+
// Should return all 3 peers since n=10 > 3
|
|
169
|
+
expect(selectedPeers.length).toBe(3);
|
|
170
|
+
expect(new Set(selectedPeers.map((p) => p.id))).toEqual(
|
|
171
|
+
new Set(allPeers.map((p) => p.id)),
|
|
172
|
+
);
|
|
173
|
+
});
|
|
174
|
+
|
|
175
|
+
test("returns consistent results for same CoValue ID", () => {
|
|
176
|
+
const allPeers = Array.from(
|
|
177
|
+
{ length: 5 },
|
|
178
|
+
(_, i) => new PeerState(createMockPeer(`peer_${i + 1}`), undefined),
|
|
179
|
+
);
|
|
180
|
+
|
|
181
|
+
const selector = hwrServerPeerSelector(2);
|
|
182
|
+
|
|
183
|
+
// Call the selector multiple times with the same CoValue ID
|
|
184
|
+
const result1 = selector("co_ztest123", allPeers);
|
|
185
|
+
const result2 = selector("co_ztest123", allPeers);
|
|
186
|
+
const result3 = selector("co_ztest123", allPeers);
|
|
187
|
+
|
|
188
|
+
// Results should be consistent (same peers selected each time for the same CoValue ID)
|
|
189
|
+
expect(new Set(result1.map((p) => p.id))).toEqual(
|
|
190
|
+
new Set(result2.map((p) => p.id)),
|
|
191
|
+
);
|
|
192
|
+
expect(new Set(result2.map((p) => p.id))).toEqual(
|
|
193
|
+
new Set(result3.map((p) => p.id)),
|
|
194
|
+
);
|
|
195
|
+
});
|
|
196
|
+
|
|
197
|
+
test("returns different results for different CoValue IDs", () => {
|
|
198
|
+
const allPeers = Array.from(
|
|
199
|
+
{ length: 6 },
|
|
200
|
+
(_, i) => new PeerState(createMockPeer(`peer_${i + 1}`), undefined),
|
|
201
|
+
);
|
|
202
|
+
|
|
203
|
+
const selector = hwrServerPeerSelector(5);
|
|
204
|
+
|
|
205
|
+
// Call the selector with different CoValue IDs
|
|
206
|
+
const result1 = selector("co_ztest123", allPeers);
|
|
207
|
+
const result2 = selector("co_ztest456", allPeers);
|
|
208
|
+
const result3 = selector("co_ztest789", allPeers);
|
|
209
|
+
|
|
210
|
+
expect(result1.length).toBe(5);
|
|
211
|
+
expect(result2.length).toBe(5);
|
|
212
|
+
expect(result3.length).toBe(5);
|
|
213
|
+
|
|
214
|
+
// Results should all be in different orders
|
|
215
|
+
expect(result1).not.toEqual(result2);
|
|
216
|
+
expect(result1).not.toEqual(result3);
|
|
217
|
+
expect(result2).not.toEqual(result3);
|
|
218
|
+
});
|
|
219
|
+
|
|
220
|
+
test("with n=0 throws an error", () => {
|
|
221
|
+
expect(() => hwrServerPeerSelector(0)).toThrow(
|
|
222
|
+
"n must be greater than 0",
|
|
223
|
+
);
|
|
224
|
+
});
|
|
225
|
+
});
|
|
226
|
+
|
|
227
|
+
test("peer reconciliation respects server sharding", async () => {
|
|
228
|
+
const client = setupTestNode();
|
|
229
|
+
const server1 = setupTestNode({ isSyncServer: true });
|
|
230
|
+
const server2 = setupTestNode({ isSyncServer: true });
|
|
231
|
+
const server3 = setupTestNode({ isSyncServer: true });
|
|
232
|
+
server1.node.syncManager.disableTransactionVerification();
|
|
233
|
+
server2.node.syncManager.disableTransactionVerification();
|
|
234
|
+
server3.node.syncManager.disableTransactionVerification();
|
|
235
|
+
|
|
236
|
+
const group = client.node.createGroup();
|
|
237
|
+
const map = group.createMap();
|
|
238
|
+
map.set("hello", "world", "trusting");
|
|
239
|
+
|
|
240
|
+
// Custom server peer selector that routes the group to server1 and the map to server3
|
|
241
|
+
client.node.syncManager.serverPeerSelector = (id, serverPeers) => {
|
|
242
|
+
if (id === group.id) {
|
|
243
|
+
return [
|
|
244
|
+
serverPeers.find((p) => p.id === server1.node.currentSessionID)!,
|
|
245
|
+
];
|
|
246
|
+
}
|
|
247
|
+
if (id === map.id) {
|
|
248
|
+
return [
|
|
249
|
+
serverPeers.find((p) => p.id === server3.node.currentSessionID)!,
|
|
250
|
+
];
|
|
251
|
+
}
|
|
252
|
+
return [];
|
|
253
|
+
};
|
|
254
|
+
|
|
255
|
+
// Connect the client to all servers, but don't reconcile them yet
|
|
256
|
+
client.connectToSyncServer({
|
|
257
|
+
ourName: "client",
|
|
258
|
+
syncServer: server1.node,
|
|
259
|
+
syncServerName: "server1",
|
|
260
|
+
skipReconciliation: true,
|
|
261
|
+
});
|
|
262
|
+
client.connectToSyncServer({
|
|
263
|
+
ourName: "client",
|
|
264
|
+
syncServer: server2.node,
|
|
265
|
+
syncServerName: "server2",
|
|
266
|
+
skipReconciliation: true,
|
|
267
|
+
});
|
|
268
|
+
client.connectToSyncServer({
|
|
269
|
+
ourName: "client",
|
|
270
|
+
syncServer: server3.node,
|
|
271
|
+
syncServerName: "server3",
|
|
272
|
+
skipReconciliation: true,
|
|
273
|
+
});
|
|
274
|
+
|
|
275
|
+
// Now that the full peer membership is known, we can reconcile
|
|
276
|
+
client.node.syncManager.reconcileServerPeers();
|
|
277
|
+
|
|
278
|
+
await map.core.waitForSync();
|
|
279
|
+
|
|
280
|
+
expect(
|
|
281
|
+
SyncMessagesLog.getMessages({
|
|
282
|
+
Group: group.core,
|
|
283
|
+
Map: map.core,
|
|
284
|
+
}),
|
|
285
|
+
).toMatchInlineSnapshot(`
|
|
286
|
+
[
|
|
287
|
+
"client -> server1 | LOAD Group sessions: header/3",
|
|
288
|
+
"client -> server3 | LOAD Map sessions: header/1",
|
|
289
|
+
"client -> server1 | CONTENT Group header: true new: After: 0 New: 3",
|
|
290
|
+
"client -> server3 | CONTENT Map header: true new: After: 0 New: 1",
|
|
291
|
+
"server1 -> client | KNOWN Group sessions: empty",
|
|
292
|
+
"server3 -> client | KNOWN Map sessions: empty",
|
|
293
|
+
"server1 -> client | KNOWN Group sessions: header/3",
|
|
294
|
+
"server3 -> client | KNOWN Map sessions: header/1",
|
|
295
|
+
]
|
|
296
|
+
`);
|
|
297
|
+
});
|
|
119
298
|
});
|
package/src/tests/testUtils.ts
CHANGED
|
@@ -506,6 +506,7 @@ export function setupTestNode(
|
|
|
506
506
|
ourName?: string;
|
|
507
507
|
syncServer?: LocalNode;
|
|
508
508
|
persistent?: boolean;
|
|
509
|
+
skipReconciliation?: boolean;
|
|
509
510
|
}) {
|
|
510
511
|
const { peer, peerStateOnServer, peerOnServer } =
|
|
511
512
|
getSyncServerConnectedPeer({
|
|
@@ -516,7 +517,7 @@ export function setupTestNode(
|
|
|
516
517
|
persistent: opts?.persistent,
|
|
517
518
|
});
|
|
518
519
|
|
|
519
|
-
node.syncManager.addPeer(peer);
|
|
520
|
+
node.syncManager.addPeer(peer, opts?.skipReconciliation);
|
|
520
521
|
|
|
521
522
|
return {
|
|
522
523
|
peerState: node.syncManager.peers[peer.id]!,
|