cojson 0.13.17 → 0.13.18
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 +9 -0
- package/dist/PeerState.d.ts +3 -0
- package/dist/PeerState.d.ts.map +1 -1
- package/dist/PeerState.js +9 -0
- package/dist/PeerState.js.map +1 -1
- package/dist/SyncStateManager.d.ts.map +1 -1
- package/dist/SyncStateManager.js +2 -3
- package/dist/SyncStateManager.js.map +1 -1
- package/dist/coValue.d.ts +4 -4
- package/dist/coValue.d.ts.map +1 -1
- package/dist/coValue.js +4 -4
- package/dist/coValue.js.map +1 -1
- package/dist/coValueCore/coValueCore.d.ts +143 -0
- package/dist/coValueCore/coValueCore.d.ts.map +1 -0
- package/dist/{coValueCore.js → coValueCore/coValueCore.js} +314 -246
- package/dist/coValueCore/coValueCore.js.map +1 -0
- package/dist/coValueCore/verifiedState.d.ts +65 -0
- package/dist/coValueCore/verifiedState.d.ts.map +1 -0
- package/dist/coValueCore/verifiedState.js +210 -0
- package/dist/coValueCore/verifiedState.js.map +1 -0
- package/dist/coValues/account.d.ts +8 -10
- package/dist/coValues/account.d.ts.map +1 -1
- package/dist/coValues/account.js +12 -13
- package/dist/coValues/account.js.map +1 -1
- package/dist/coValues/coList.d.ts +3 -3
- package/dist/coValues/coList.d.ts.map +1 -1
- package/dist/coValues/coList.js +6 -3
- package/dist/coValues/coList.js.map +1 -1
- package/dist/coValues/coMap.d.ts +3 -3
- package/dist/coValues/coMap.d.ts.map +1 -1
- package/dist/coValues/coMap.js +3 -3
- package/dist/coValues/coMap.js.map +1 -1
- package/dist/coValues/coPlainText.d.ts +2 -2
- package/dist/coValues/coPlainText.d.ts.map +1 -1
- package/dist/coValues/coPlainText.js +4 -4
- package/dist/coValues/coPlainText.js.map +1 -1
- package/dist/coValues/coStream.d.ts +3 -3
- package/dist/coValues/coStream.d.ts.map +1 -1
- package/dist/coValues/coStream.js +3 -3
- package/dist/coValues/coStream.js.map +1 -1
- package/dist/coValues/group.d.ts +7 -2
- package/dist/coValues/group.d.ts.map +1 -1
- package/dist/coValues/group.js +29 -26
- package/dist/coValues/group.js.map +1 -1
- package/dist/coreToCoValue.d.ts +2 -2
- package/dist/coreToCoValue.d.ts.map +1 -1
- package/dist/coreToCoValue.js +10 -14
- package/dist/coreToCoValue.js.map +1 -1
- package/dist/exports.d.ts +6 -5
- package/dist/exports.d.ts.map +1 -1
- package/dist/exports.js +3 -4
- package/dist/exports.js.map +1 -1
- package/dist/localNode.d.ts +30 -24
- package/dist/localNode.d.ts.map +1 -1
- package/dist/localNode.js +139 -170
- package/dist/localNode.js.map +1 -1
- package/dist/permissions.d.ts +2 -1
- package/dist/permissions.d.ts.map +1 -1
- package/dist/permissions.js +15 -11
- package/dist/permissions.js.map +1 -1
- package/dist/priority.d.ts +1 -1
- package/dist/priority.d.ts.map +1 -1
- package/dist/sync.d.ts +2 -2
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +86 -55
- package/dist/sync.js.map +1 -1
- package/dist/tests/coList.test.js +19 -16
- package/dist/tests/coList.test.js.map +1 -1
- package/dist/tests/coMap.test.js +12 -13
- package/dist/tests/coMap.test.js.map +1 -1
- package/dist/tests/coPlainText.test.js +9 -10
- package/dist/tests/coPlainText.test.js.map +1 -1
- package/dist/tests/coStream.test.js +22 -17
- package/dist/tests/coStream.test.js.map +1 -1
- package/dist/tests/coValueCore.test.js +22 -28
- package/dist/tests/coValueCore.test.js.map +1 -1
- package/dist/tests/coValueCoreLoadingState.test.d.ts +2 -0
- package/dist/tests/coValueCoreLoadingState.test.d.ts.map +1 -0
- package/dist/tests/{coValueState.test.js → coValueCoreLoadingState.test.js} +62 -46
- package/dist/tests/coValueCoreLoadingState.test.js.map +1 -0
- package/dist/tests/group.test.js +42 -43
- package/dist/tests/group.test.js.map +1 -1
- package/dist/tests/messagesTestUtils.d.ts +2 -2
- package/dist/tests/messagesTestUtils.d.ts.map +1 -1
- package/dist/tests/messagesTestUtils.js +1 -1
- package/dist/tests/messagesTestUtils.js.map +1 -1
- package/dist/tests/permissions.test.js +224 -292
- package/dist/tests/permissions.test.js.map +1 -1
- package/dist/tests/priority.test.js +13 -14
- package/dist/tests/priority.test.js.map +1 -1
- package/dist/tests/sync.auth.test.d.ts +2 -0
- package/dist/tests/sync.auth.test.d.ts.map +1 -0
- package/dist/tests/sync.auth.test.js +141 -0
- package/dist/tests/sync.auth.test.js.map +1 -0
- package/dist/tests/sync.load.test.js +4 -4
- package/dist/tests/sync.load.test.js.map +1 -1
- package/dist/tests/sync.mesh.test.js +25 -12
- package/dist/tests/sync.mesh.test.js.map +1 -1
- package/dist/tests/sync.peerReconciliation.test.js +19 -19
- package/dist/tests/sync.peerReconciliation.test.js.map +1 -1
- package/dist/tests/sync.storage.test.js +20 -13
- package/dist/tests/sync.storage.test.js.map +1 -1
- package/dist/tests/sync.test.js +32 -39
- package/dist/tests/sync.test.js.map +1 -1
- package/dist/tests/sync.upload.test.js +126 -37
- package/dist/tests/sync.upload.test.js.map +1 -1
- package/dist/tests/testUtils.d.ts +24 -15
- package/dist/tests/testUtils.d.ts.map +1 -1
- package/dist/tests/testUtils.js +88 -61
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/typeUtils/expectGroup.js +1 -1
- package/dist/typeUtils/expectGroup.js.map +1 -1
- package/package.json +1 -1
- package/src/PeerState.ts +11 -0
- package/src/SyncStateManager.ts +2 -3
- package/src/coValue.ts +11 -8
- package/src/{coValueCore.ts → coValueCore/coValueCore.ts} +469 -413
- package/src/coValueCore/verifiedState.ts +376 -0
- package/src/coValues/account.ts +20 -25
- package/src/coValues/coList.ts +12 -6
- package/src/coValues/coMap.ts +9 -6
- package/src/coValues/coPlainText.ts +9 -6
- package/src/coValues/coStream.ts +9 -6
- package/src/coValues/group.ts +50 -28
- package/src/coreToCoValue.ts +14 -15
- package/src/exports.ts +9 -7
- package/src/localNode.ts +227 -273
- package/src/permissions.ts +18 -12
- package/src/priority.ts +1 -1
- package/src/sync.ts +96 -63
- package/src/tests/coList.test.ts +21 -15
- package/src/tests/coMap.test.ts +12 -13
- package/src/tests/coPlainText.test.ts +12 -9
- package/src/tests/coStream.test.ts +25 -16
- package/src/tests/coValueCore.test.ts +30 -27
- package/src/tests/{coValueState.test.ts → coValueCoreLoadingState.test.ts} +67 -57
- package/src/tests/group.test.ts +44 -68
- package/src/tests/messagesTestUtils.ts +3 -8
- package/src/tests/permissions.test.ts +283 -449
- package/src/tests/priority.test.ts +17 -13
- package/src/tests/sync.auth.test.ts +188 -0
- package/src/tests/sync.load.test.ts +4 -4
- package/src/tests/sync.mesh.test.ts +25 -12
- package/src/tests/sync.peerReconciliation.test.ts +25 -25
- package/src/tests/sync.storage.test.ts +20 -13
- package/src/tests/sync.test.ts +43 -43
- package/src/tests/sync.upload.test.ts +157 -37
- package/src/tests/testUtils.ts +120 -74
- package/src/typeUtils/expectGroup.ts +1 -1
- package/dist/CoValuesStore.d.ts +0 -14
- package/dist/CoValuesStore.d.ts.map +0 -1
- package/dist/CoValuesStore.js +0 -32
- package/dist/CoValuesStore.js.map +0 -1
- package/dist/coValueCore.d.ts +0 -142
- package/dist/coValueCore.d.ts.map +0 -1
- package/dist/coValueCore.js.map +0 -1
- package/dist/coValueState.d.ts +0 -34
- package/dist/coValueState.d.ts.map +0 -1
- package/dist/coValueState.js +0 -190
- package/dist/coValueState.js.map +0 -1
- package/dist/tests/coValueState.test.d.ts +0 -2
- package/dist/tests/coValueState.test.d.ts.map +0 -1
- package/dist/tests/coValueState.test.js.map +0 -1
- package/src/CoValuesStore.ts +0 -41
- package/src/coValueState.ts +0 -245
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { assert, afterEach, beforeEach, expect, test, vi } from "vitest";
|
|
2
|
-
import { CoValueCore } from "../coValueCore.js";
|
|
2
|
+
import { CoValueCore } from "../coValueCore/coValueCore.js";
|
|
3
3
|
import { WasmCrypto } from "../crypto/WasmCrypto.js";
|
|
4
4
|
import { stableStringify } from "../jsonStringify.js";
|
|
5
5
|
import { LocalNode } from "../localNode.js";
|
|
6
|
-
import { createTestMetricReader, createTestNode, createTwoConnectedNodes, loadCoValueOrFail,
|
|
6
|
+
import { createTestMetricReader, createTestNode, createTwoConnectedNodes, loadCoValueOrFail, nodeWithRandomAgentAndSessionID, randomAgentAndSessionID, tearDownTestMetricReader, } from "./testUtils.js";
|
|
7
7
|
const Crypto = await WasmCrypto.create();
|
|
8
8
|
let metricReader;
|
|
9
9
|
beforeEach(() => {
|
|
@@ -13,8 +13,8 @@ afterEach(() => {
|
|
|
13
13
|
tearDownTestMetricReader();
|
|
14
14
|
});
|
|
15
15
|
test("Can create coValue with new agent credentials and add transaction to it", () => {
|
|
16
|
-
const [
|
|
17
|
-
const node = new LocalNode(
|
|
16
|
+
const [agent, sessionID] = randomAgentAndSessionID();
|
|
17
|
+
const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
|
|
18
18
|
const coValue = node.createCoValue({
|
|
19
19
|
type: "costream",
|
|
20
20
|
ruleset: { type: "unsafeAllowAll" },
|
|
@@ -30,15 +30,14 @@ test("Can create coValue with new agent credentials and add transaction to it",
|
|
|
30
30
|
},
|
|
31
31
|
]),
|
|
32
32
|
};
|
|
33
|
-
const { expectedNewHash } = coValue.expectedNewHashAfter(node.currentSessionID, [transaction]);
|
|
33
|
+
const { expectedNewHash } = coValue.verified.expectedNewHashAfter(node.currentSessionID, [transaction]);
|
|
34
34
|
expect(coValue
|
|
35
|
-
.tryAddTransactions(node.currentSessionID, [transaction], expectedNewHash, Crypto.sign(
|
|
35
|
+
.tryAddTransactions(node.currentSessionID, [transaction], expectedNewHash, Crypto.sign(agent.currentSignerSecret(), expectedNewHash), "immediate")
|
|
36
36
|
._unsafeUnwrap()).toBe(true);
|
|
37
37
|
});
|
|
38
38
|
test("transactions with wrong signature are rejected", () => {
|
|
39
39
|
const wrongAgent = Crypto.newRandomAgentSecret();
|
|
40
|
-
const
|
|
41
|
-
const node = new LocalNode(agentSecret, sessionID, Crypto);
|
|
40
|
+
const node = nodeWithRandomAgentAndSessionID();
|
|
42
41
|
const coValue = node.createCoValue({
|
|
43
42
|
type: "costream",
|
|
44
43
|
ruleset: { type: "unsafeAllowAll" },
|
|
@@ -54,15 +53,15 @@ test("transactions with wrong signature are rejected", () => {
|
|
|
54
53
|
},
|
|
55
54
|
]),
|
|
56
55
|
};
|
|
57
|
-
const { expectedNewHash } = coValue.expectedNewHashAfter(node.currentSessionID, [transaction]);
|
|
56
|
+
const { expectedNewHash } = coValue.verified.expectedNewHashAfter(node.currentSessionID, [transaction]);
|
|
58
57
|
// eslint-disable-next-line neverthrow/must-use-result
|
|
59
58
|
coValue
|
|
60
|
-
.tryAddTransactions(node.currentSessionID, [transaction], expectedNewHash, Crypto.sign(Crypto.getAgentSignerSecret(wrongAgent), expectedNewHash))
|
|
59
|
+
.tryAddTransactions(node.currentSessionID, [transaction], expectedNewHash, Crypto.sign(Crypto.getAgentSignerSecret(wrongAgent), expectedNewHash), "immediate")
|
|
61
60
|
._unsafeUnwrapErr({ withStackTrace: true });
|
|
62
61
|
});
|
|
63
62
|
test("transactions with correctly signed, but wrong hash are rejected", () => {
|
|
64
|
-
const [
|
|
65
|
-
const node = new LocalNode(
|
|
63
|
+
const [agent, sessionID] = randomAgentAndSessionID();
|
|
64
|
+
const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
|
|
66
65
|
const coValue = node.createCoValue({
|
|
67
66
|
type: "costream",
|
|
68
67
|
ruleset: { type: "unsafeAllowAll" },
|
|
@@ -78,7 +77,7 @@ test("transactions with correctly signed, but wrong hash are rejected", () => {
|
|
|
78
77
|
},
|
|
79
78
|
]),
|
|
80
79
|
};
|
|
81
|
-
const { expectedNewHash } = coValue.expectedNewHashAfter(node.currentSessionID, [
|
|
80
|
+
const { expectedNewHash } = coValue.verified.expectedNewHashAfter(node.currentSessionID, [
|
|
82
81
|
{
|
|
83
82
|
privacy: "trusting",
|
|
84
83
|
madeAt: Date.now(),
|
|
@@ -91,12 +90,12 @@ test("transactions with correctly signed, but wrong hash are rejected", () => {
|
|
|
91
90
|
]);
|
|
92
91
|
// eslint-disable-next-line neverthrow/must-use-result
|
|
93
92
|
coValue
|
|
94
|
-
.tryAddTransactions(node.currentSessionID, [transaction], expectedNewHash, Crypto.sign(
|
|
93
|
+
.tryAddTransactions(node.currentSessionID, [transaction], expectedNewHash, Crypto.sign(agent.currentSignerSecret(), expectedNewHash), "immediate")
|
|
95
94
|
._unsafeUnwrapErr({ withStackTrace: true });
|
|
96
95
|
});
|
|
97
96
|
test("New transactions in a group correctly update owned values, including subscriptions", async () => {
|
|
98
|
-
const [
|
|
99
|
-
const node = new LocalNode(
|
|
97
|
+
const [agent, sessionID] = randomAgentAndSessionID();
|
|
98
|
+
const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
|
|
100
99
|
const group = node.createGroup();
|
|
101
100
|
const timeBeforeEdit = Date.now();
|
|
102
101
|
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
@@ -111,18 +110,16 @@ test("New transactions in a group correctly update owned values, including subsc
|
|
|
111
110
|
changes: stableStringify([
|
|
112
111
|
{
|
|
113
112
|
op: "set",
|
|
114
|
-
key:
|
|
113
|
+
key: agent.id,
|
|
115
114
|
value: "revoked",
|
|
116
115
|
},
|
|
117
116
|
]),
|
|
118
117
|
};
|
|
119
|
-
const { expectedNewHash } = group.core.expectedNewHashAfter(sessionID, [
|
|
120
|
-
|
|
121
|
-
]);
|
|
122
|
-
const signature = Crypto.sign(node.account.currentSignerSecret(), expectedNewHash);
|
|
118
|
+
const { expectedNewHash } = group.core.verified.expectedNewHashAfter(sessionID, [resignationThatWeJustLearnedAbout]);
|
|
119
|
+
const signature = Crypto.sign(node.getCurrentAgent().currentSignerSecret(), expectedNewHash);
|
|
123
120
|
expect(map.core.getValidSortedTransactions().length).toBe(1);
|
|
124
121
|
const manuallyAdddedTxSuccess = group.core
|
|
125
|
-
.tryAddTransactions(node.currentSessionID, [resignationThatWeJustLearnedAbout], expectedNewHash, signature)
|
|
122
|
+
.tryAddTransactions(node.currentSessionID, [resignationThatWeJustLearnedAbout], expectedNewHash, signature, "immediate")
|
|
126
123
|
._unsafeUnwrap({ withStackTrace: true });
|
|
127
124
|
expect(manuallyAdddedTxSuccess).toBe(true);
|
|
128
125
|
expect(listener.mock.calls.length).toBe(2);
|
|
@@ -130,8 +127,7 @@ test("New transactions in a group correctly update owned values, including subsc
|
|
|
130
127
|
expect(map.core.getValidSortedTransactions().length).toBe(0);
|
|
131
128
|
});
|
|
132
129
|
test("correctly records transactions", async () => {
|
|
133
|
-
const
|
|
134
|
-
const node = new LocalNode(account, sessionID, Crypto);
|
|
130
|
+
const node = nodeWithRandomAgentAndSessionID();
|
|
135
131
|
const changes1 = stableStringify([{ hello: "world" }]);
|
|
136
132
|
node.syncManager.recordTransactionsSize([
|
|
137
133
|
{
|
|
@@ -162,8 +158,7 @@ test("correctly records transactions", async () => {
|
|
|
162
158
|
expect(value.sum).toBe(changes1.length + changes2.length);
|
|
163
159
|
});
|
|
164
160
|
test("(smoke test) records transactions from local node", async () => {
|
|
165
|
-
const
|
|
166
|
-
const node = new LocalNode(account, sessionID, Crypto);
|
|
161
|
+
const node = nodeWithRandomAgentAndSessionID();
|
|
167
162
|
node.createGroup();
|
|
168
163
|
let value = await metricReader.getMetricValue("jazz.transactions.size", {
|
|
169
164
|
source: "local",
|
|
@@ -189,8 +184,7 @@ test("creating a coValue with a group should't trigger automatically a content c
|
|
|
189
184
|
getCurrentContentSpy.mockRestore();
|
|
190
185
|
});
|
|
191
186
|
test("loading a coValue core without having the owner group available doesn't crash", () => {
|
|
192
|
-
const
|
|
193
|
-
const node = new LocalNode(account, sessionID, Crypto);
|
|
187
|
+
const node = nodeWithRandomAgentAndSessionID();
|
|
194
188
|
const otherNode = createTestNode();
|
|
195
189
|
const group = otherNode.createGroup();
|
|
196
190
|
const coValue = node.createCoValue({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coValueCore.test.js","sourceRoot":"","sources":["../../src/tests/coValueCore.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"coValueCore.test.js","sourceRoot":"","sources":["../../src/tests/coValueCore.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"coValueCoreLoadingState.test.d.ts","sourceRoot":"","sources":["../../src/tests/coValueCoreLoadingState.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { afterEach, beforeEach, describe, expect, test, vi
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
|
|
2
2
|
import { PeerState } from "../PeerState";
|
|
3
|
-
import {
|
|
3
|
+
import { CoValueCore } from "../coValueCore/coValueCore";
|
|
4
4
|
import { createTestMetricReader, tearDownTestMetricReader } from "./testUtils";
|
|
5
5
|
let metricReader;
|
|
6
6
|
beforeEach(() => {
|
|
@@ -9,43 +9,46 @@ beforeEach(() => {
|
|
|
9
9
|
afterEach(() => {
|
|
10
10
|
tearDownTestMetricReader();
|
|
11
11
|
});
|
|
12
|
-
|
|
12
|
+
const mockNode = {};
|
|
13
|
+
describe("CoValueCore loading state", () => {
|
|
13
14
|
const mockCoValueId = "co_test123";
|
|
14
15
|
test("should create unknown state", async () => {
|
|
15
|
-
const state =
|
|
16
|
+
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
16
17
|
expect(state.id).toBe(mockCoValueId);
|
|
17
|
-
expect(state.
|
|
18
|
+
expect(state.loadingState).toBe("unknown");
|
|
18
19
|
expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
|
|
19
20
|
state: "unknown",
|
|
20
21
|
})).toBe(1);
|
|
21
22
|
});
|
|
22
23
|
test("should create loading state", async () => {
|
|
23
|
-
const state =
|
|
24
|
+
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
24
25
|
state.loadFromPeers([
|
|
25
26
|
createMockPeerState({ id: "peer1", role: "server" }),
|
|
26
27
|
createMockPeerState({ id: "peer2", role: "server" }),
|
|
27
28
|
]);
|
|
28
29
|
expect(state.id).toBe(mockCoValueId);
|
|
29
|
-
expect(state.
|
|
30
|
+
expect(state.loadingState).toBe("loading");
|
|
30
31
|
expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
|
|
31
32
|
state: "loading",
|
|
32
33
|
})).toBe(1);
|
|
33
34
|
});
|
|
34
35
|
test("should create available state", async () => {
|
|
35
|
-
const
|
|
36
|
-
const state =
|
|
37
|
-
state.internalMarkMagicallyAvailable(
|
|
36
|
+
const mockVerified = createMockCoValueVerified(mockCoValueId);
|
|
37
|
+
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
38
|
+
state.internalMarkMagicallyAvailable(mockVerified);
|
|
38
39
|
expect(state.id).toBe(mockCoValueId);
|
|
39
|
-
expect(state.
|
|
40
|
-
expect(state.
|
|
41
|
-
await expect(state.
|
|
40
|
+
expect(state.loadingState).toBe("available");
|
|
41
|
+
expect(state.verified).toBe(mockVerified);
|
|
42
|
+
await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
|
|
43
|
+
verified: mockVerified,
|
|
44
|
+
});
|
|
42
45
|
expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
|
|
43
46
|
state: "available",
|
|
44
47
|
})).toBe(1);
|
|
45
48
|
});
|
|
46
49
|
test("should handle found action", async () => {
|
|
47
|
-
const
|
|
48
|
-
const state =
|
|
50
|
+
const mockVerified = createMockCoValueVerified(mockCoValueId);
|
|
51
|
+
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
49
52
|
state.loadFromPeers([
|
|
50
53
|
createMockPeerState({ id: "peer1", role: "server" }),
|
|
51
54
|
createMockPeerState({ id: "peer2", role: "server" }),
|
|
@@ -56,11 +59,13 @@ describe("CoValueState", () => {
|
|
|
56
59
|
expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
|
|
57
60
|
state: "loading",
|
|
58
61
|
})).toBe(1);
|
|
59
|
-
const stateValuePromise = state.
|
|
60
|
-
state.internalMarkMagicallyAvailable(
|
|
61
|
-
const result = await state.
|
|
62
|
-
expect(result).
|
|
63
|
-
await expect(stateValuePromise).resolves.
|
|
62
|
+
const stateValuePromise = state.waitForAvailableOrUnavailable();
|
|
63
|
+
state.internalMarkMagicallyAvailable(mockVerified);
|
|
64
|
+
const result = await state.waitForAvailableOrUnavailable();
|
|
65
|
+
expect(result).toMatchObject({ verified: mockVerified });
|
|
66
|
+
await expect(stateValuePromise).resolves.toMatchObject({
|
|
67
|
+
verified: mockVerified,
|
|
68
|
+
});
|
|
64
69
|
expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
|
|
65
70
|
state: "available",
|
|
66
71
|
})).toBe(1);
|
|
@@ -83,14 +88,16 @@ describe("CoValueState", () => {
|
|
|
83
88
|
state.markNotFoundInPeer("peer2");
|
|
84
89
|
});
|
|
85
90
|
const mockPeers = [peer1, peer2];
|
|
86
|
-
const state =
|
|
91
|
+
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
87
92
|
const loadPromise = state.loadFromPeers(mockPeers);
|
|
88
93
|
await vi.runAllTimersAsync();
|
|
89
94
|
await loadPromise;
|
|
90
95
|
expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
|
|
91
96
|
expect(peer2.pushOutgoingMessage).toHaveBeenCalledTimes(1);
|
|
92
|
-
expect(state.
|
|
93
|
-
await expect(state.
|
|
97
|
+
expect(state.loadingState).toBe("unavailable");
|
|
98
|
+
await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
|
|
99
|
+
verified: null,
|
|
100
|
+
});
|
|
94
101
|
vi.useRealTimers();
|
|
95
102
|
});
|
|
96
103
|
test("should have a coValue as value property when becomes available after that have been marked as unavailable", async () => {
|
|
@@ -102,24 +109,26 @@ describe("CoValueState", () => {
|
|
|
102
109
|
state.markNotFoundInPeer("peer1");
|
|
103
110
|
});
|
|
104
111
|
const mockPeers = [peer1];
|
|
105
|
-
const state =
|
|
112
|
+
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
106
113
|
const loadPromise = state.loadFromPeers(mockPeers);
|
|
107
114
|
await vi.runAllTimersAsync();
|
|
108
|
-
state.internalMarkMagicallyAvailable(
|
|
115
|
+
state.internalMarkMagicallyAvailable(createMockCoValueVerified(mockCoValueId));
|
|
109
116
|
await loadPromise;
|
|
110
117
|
expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
|
|
111
|
-
expect(state.
|
|
112
|
-
await expect(state.
|
|
118
|
+
expect(state.loadingState).toBe("available");
|
|
119
|
+
await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
|
|
120
|
+
_verified: expect.any(Object),
|
|
121
|
+
});
|
|
113
122
|
vi.useRealTimers();
|
|
114
123
|
});
|
|
115
124
|
test("should start sending the known state to peers when available", async () => {
|
|
116
125
|
vi.useFakeTimers();
|
|
117
|
-
const
|
|
126
|
+
const mockVerified = createMockCoValueVerified(mockCoValueId);
|
|
118
127
|
const peer1 = createMockPeerState({
|
|
119
128
|
id: "peer1",
|
|
120
129
|
role: "storage",
|
|
121
130
|
}, async () => {
|
|
122
|
-
state.markAvailable(
|
|
131
|
+
state.markAvailable({}, "peer1");
|
|
123
132
|
});
|
|
124
133
|
const peer2 = createMockPeerState({
|
|
125
134
|
id: "peer2",
|
|
@@ -127,7 +136,7 @@ describe("CoValueState", () => {
|
|
|
127
136
|
}, async () => {
|
|
128
137
|
state.markNotFoundInPeer("peer2");
|
|
129
138
|
});
|
|
130
|
-
const state =
|
|
139
|
+
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
131
140
|
const loadPromise = state.loadFromPeers([peer1, peer2]);
|
|
132
141
|
await vi.runAllTimersAsync();
|
|
133
142
|
await loadPromise;
|
|
@@ -135,15 +144,17 @@ describe("CoValueState", () => {
|
|
|
135
144
|
expect(peer2.pushOutgoingMessage).toHaveBeenCalledTimes(1);
|
|
136
145
|
expect(peer2.pushOutgoingMessage).toHaveBeenCalledWith({
|
|
137
146
|
action: "load",
|
|
138
|
-
...
|
|
147
|
+
...mockVerified.knownState(),
|
|
148
|
+
});
|
|
149
|
+
expect(state.loadingState).toBe("available");
|
|
150
|
+
await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
|
|
151
|
+
verified: mockVerified,
|
|
139
152
|
});
|
|
140
|
-
expect(state.highLevelState).toBe("available");
|
|
141
|
-
await expect(state.getCoValue()).resolves.toEqual({ id: mockCoValueId });
|
|
142
153
|
vi.useRealTimers();
|
|
143
154
|
});
|
|
144
155
|
test("should skip closed peers", async () => {
|
|
145
156
|
vi.useFakeTimers();
|
|
146
|
-
const
|
|
157
|
+
const mockVerified = createMockCoValueVerified(mockCoValueId);
|
|
147
158
|
const peer1 = createMockPeerState({
|
|
148
159
|
id: "peer1",
|
|
149
160
|
role: "storage",
|
|
@@ -154,17 +165,19 @@ describe("CoValueState", () => {
|
|
|
154
165
|
id: "peer2",
|
|
155
166
|
role: "server",
|
|
156
167
|
}, async () => {
|
|
157
|
-
state.markAvailable(
|
|
168
|
+
state.markAvailable({}, "peer2");
|
|
158
169
|
});
|
|
159
170
|
peer1.closed = true;
|
|
160
|
-
const state =
|
|
171
|
+
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
161
172
|
const loadPromise = state.loadFromPeers([peer1, peer2]);
|
|
162
173
|
await vi.runAllTimersAsync();
|
|
163
174
|
await loadPromise;
|
|
164
175
|
expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(0);
|
|
165
176
|
expect(peer2.pushOutgoingMessage).toHaveBeenCalledTimes(1);
|
|
166
|
-
expect(state.
|
|
167
|
-
await expect(state.
|
|
177
|
+
expect(state.loadingState).toBe("available");
|
|
178
|
+
await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
|
|
179
|
+
verified: mockVerified,
|
|
180
|
+
});
|
|
168
181
|
vi.useRealTimers();
|
|
169
182
|
});
|
|
170
183
|
test("should not be stuck in loading state when not getting a response", async () => {
|
|
@@ -173,13 +186,15 @@ describe("CoValueState", () => {
|
|
|
173
186
|
id: "peer1",
|
|
174
187
|
role: "server",
|
|
175
188
|
}, async () => { });
|
|
176
|
-
const state =
|
|
189
|
+
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
177
190
|
const loadPromise = state.loadFromPeers([peer1]);
|
|
178
191
|
await vi.runAllTimersAsync();
|
|
179
192
|
await loadPromise;
|
|
180
193
|
expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
|
|
181
|
-
expect(state.
|
|
182
|
-
await expect(state.
|
|
194
|
+
expect(state.loadingState).toBe("unavailable");
|
|
195
|
+
await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
|
|
196
|
+
verified: null,
|
|
197
|
+
});
|
|
183
198
|
vi.useRealTimers();
|
|
184
199
|
});
|
|
185
200
|
});
|
|
@@ -195,17 +210,18 @@ function createMockPeerState(peer, pushFn = () => Promise.resolve()) {
|
|
|
195
210
|
vi.spyOn(peerState, "pushOutgoingMessage").mockImplementation(pushFn);
|
|
196
211
|
return peerState;
|
|
197
212
|
}
|
|
198
|
-
function
|
|
213
|
+
function createMockCoValueVerified(mockCoValueId) {
|
|
199
214
|
// Setting the knownState as part of the prototype to simplify
|
|
200
215
|
// the equality checks
|
|
201
|
-
const
|
|
216
|
+
const mockCoValueVerified = Object.create({
|
|
217
|
+
id: mockCoValueId,
|
|
202
218
|
knownState: vi.fn().mockReturnValue({
|
|
203
219
|
id: mockCoValueId,
|
|
204
220
|
header: true,
|
|
205
221
|
sessions: {},
|
|
206
222
|
}),
|
|
223
|
+
clone: vi.fn().mockReturnThis(),
|
|
207
224
|
});
|
|
208
|
-
|
|
209
|
-
return mockCoValue;
|
|
225
|
+
return mockCoValueVerified;
|
|
210
226
|
}
|
|
211
|
-
//# sourceMappingURL=
|
|
227
|
+
//# sourceMappingURL=coValueCoreLoadingState.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"coValueCoreLoadingState.test.js","sourceRoot":"","sources":["../../src/tests/coValueCoreLoadingState.test.ts"],"names":[],"mappings":"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"}
|