cojson 0.13.16 → 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.
Files changed (168) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/CHANGELOG.md +16 -0
  3. package/dist/PeerState.d.ts +3 -0
  4. package/dist/PeerState.d.ts.map +1 -1
  5. package/dist/PeerState.js +9 -0
  6. package/dist/PeerState.js.map +1 -1
  7. package/dist/SyncStateManager.d.ts.map +1 -1
  8. package/dist/SyncStateManager.js +2 -3
  9. package/dist/SyncStateManager.js.map +1 -1
  10. package/dist/coValue.d.ts +6 -4
  11. package/dist/coValue.d.ts.map +1 -1
  12. package/dist/coValue.js +5 -4
  13. package/dist/coValue.js.map +1 -1
  14. package/dist/coValueCore/coValueCore.d.ts +143 -0
  15. package/dist/coValueCore/coValueCore.d.ts.map +1 -0
  16. package/dist/{coValueCore.js → coValueCore/coValueCore.js} +314 -246
  17. package/dist/coValueCore/coValueCore.js.map +1 -0
  18. package/dist/coValueCore/verifiedState.d.ts +65 -0
  19. package/dist/coValueCore/verifiedState.d.ts.map +1 -0
  20. package/dist/coValueCore/verifiedState.js +210 -0
  21. package/dist/coValueCore/verifiedState.js.map +1 -0
  22. package/dist/coValues/account.d.ts +8 -10
  23. package/dist/coValues/account.d.ts.map +1 -1
  24. package/dist/coValues/account.js +12 -13
  25. package/dist/coValues/account.js.map +1 -1
  26. package/dist/coValues/coList.d.ts +10 -6
  27. package/dist/coValues/coList.d.ts.map +1 -1
  28. package/dist/coValues/coList.js +41 -15
  29. package/dist/coValues/coList.js.map +1 -1
  30. package/dist/coValues/coMap.d.ts +4 -3
  31. package/dist/coValues/coMap.d.ts.map +1 -1
  32. package/dist/coValues/coMap.js +5 -3
  33. package/dist/coValues/coMap.js.map +1 -1
  34. package/dist/coValues/coPlainText.d.ts +2 -2
  35. package/dist/coValues/coPlainText.d.ts.map +1 -1
  36. package/dist/coValues/coPlainText.js +5 -5
  37. package/dist/coValues/coPlainText.js.map +1 -1
  38. package/dist/coValues/coStream.d.ts +5 -4
  39. package/dist/coValues/coStream.d.ts.map +1 -1
  40. package/dist/coValues/coStream.js +5 -3
  41. package/dist/coValues/coStream.js.map +1 -1
  42. package/dist/coValues/group.d.ts +7 -2
  43. package/dist/coValues/group.d.ts.map +1 -1
  44. package/dist/coValues/group.js +29 -26
  45. package/dist/coValues/group.js.map +1 -1
  46. package/dist/coreToCoValue.d.ts +4 -3
  47. package/dist/coreToCoValue.d.ts.map +1 -1
  48. package/dist/coreToCoValue.js +10 -14
  49. package/dist/coreToCoValue.js.map +1 -1
  50. package/dist/exports.d.ts +6 -5
  51. package/dist/exports.d.ts.map +1 -1
  52. package/dist/exports.js +3 -4
  53. package/dist/exports.js.map +1 -1
  54. package/dist/localNode.d.ts +30 -24
  55. package/dist/localNode.d.ts.map +1 -1
  56. package/dist/localNode.js +153 -177
  57. package/dist/localNode.js.map +1 -1
  58. package/dist/permissions.d.ts +2 -1
  59. package/dist/permissions.d.ts.map +1 -1
  60. package/dist/permissions.js +15 -11
  61. package/dist/permissions.js.map +1 -1
  62. package/dist/priority.d.ts +1 -1
  63. package/dist/priority.d.ts.map +1 -1
  64. package/dist/sync.d.ts +2 -2
  65. package/dist/sync.d.ts.map +1 -1
  66. package/dist/sync.js +86 -55
  67. package/dist/sync.js.map +1 -1
  68. package/dist/tests/coList.test.js +133 -13
  69. package/dist/tests/coList.test.js.map +1 -1
  70. package/dist/tests/coMap.test.js +43 -14
  71. package/dist/tests/coMap.test.js.map +1 -1
  72. package/dist/tests/coPlainText.test.js +9 -10
  73. package/dist/tests/coPlainText.test.js.map +1 -1
  74. package/dist/tests/coStream.test.js +49 -18
  75. package/dist/tests/coStream.test.js.map +1 -1
  76. package/dist/tests/coValueCore.test.js +22 -28
  77. package/dist/tests/coValueCore.test.js.map +1 -1
  78. package/dist/tests/coValueCoreLoadingState.test.d.ts +2 -0
  79. package/dist/tests/coValueCoreLoadingState.test.d.ts.map +1 -0
  80. package/dist/tests/coValueCoreLoadingState.test.js +227 -0
  81. package/dist/tests/coValueCoreLoadingState.test.js.map +1 -0
  82. package/dist/tests/group.test.js +42 -43
  83. package/dist/tests/group.test.js.map +1 -1
  84. package/dist/tests/messagesTestUtils.d.ts +2 -2
  85. package/dist/tests/messagesTestUtils.d.ts.map +1 -1
  86. package/dist/tests/messagesTestUtils.js +1 -1
  87. package/dist/tests/messagesTestUtils.js.map +1 -1
  88. package/dist/tests/permissions.test.js +224 -292
  89. package/dist/tests/permissions.test.js.map +1 -1
  90. package/dist/tests/priority.test.js +13 -14
  91. package/dist/tests/priority.test.js.map +1 -1
  92. package/dist/tests/sync.auth.test.d.ts +2 -0
  93. package/dist/tests/sync.auth.test.d.ts.map +1 -0
  94. package/dist/tests/sync.auth.test.js +141 -0
  95. package/dist/tests/sync.auth.test.js.map +1 -0
  96. package/dist/tests/sync.load.test.js +60 -2
  97. package/dist/tests/sync.load.test.js.map +1 -1
  98. package/dist/tests/sync.mesh.test.js +70 -10
  99. package/dist/tests/sync.mesh.test.js.map +1 -1
  100. package/dist/tests/sync.peerReconciliation.test.js +19 -19
  101. package/dist/tests/sync.peerReconciliation.test.js.map +1 -1
  102. package/dist/tests/sync.storage.test.js +20 -13
  103. package/dist/tests/sync.storage.test.js.map +1 -1
  104. package/dist/tests/sync.test.js +32 -39
  105. package/dist/tests/sync.test.js.map +1 -1
  106. package/dist/tests/sync.upload.test.js +126 -37
  107. package/dist/tests/sync.upload.test.js.map +1 -1
  108. package/dist/tests/testUtils.d.ts +24 -15
  109. package/dist/tests/testUtils.d.ts.map +1 -1
  110. package/dist/tests/testUtils.js +88 -61
  111. package/dist/tests/testUtils.js.map +1 -1
  112. package/dist/typeUtils/expectGroup.js +1 -1
  113. package/dist/typeUtils/expectGroup.js.map +1 -1
  114. package/package.json +1 -1
  115. package/src/PeerState.ts +11 -0
  116. package/src/SyncStateManager.ts +2 -3
  117. package/src/coValue.ts +14 -8
  118. package/src/{coValueCore.ts → coValueCore/coValueCore.ts} +470 -413
  119. package/src/coValueCore/verifiedState.ts +376 -0
  120. package/src/coValues/account.ts +20 -25
  121. package/src/coValues/coList.ts +63 -29
  122. package/src/coValues/coMap.ts +13 -6
  123. package/src/coValues/coPlainText.ts +10 -8
  124. package/src/coValues/coStream.ts +12 -7
  125. package/src/coValues/group.ts +50 -28
  126. package/src/coreToCoValue.ts +14 -15
  127. package/src/exports.ts +9 -7
  128. package/src/localNode.ts +248 -283
  129. package/src/permissions.ts +18 -12
  130. package/src/priority.ts +1 -1
  131. package/src/sync.ts +96 -63
  132. package/src/tests/coList.test.ts +200 -12
  133. package/src/tests/coMap.test.ts +65 -14
  134. package/src/tests/coPlainText.test.ts +12 -9
  135. package/src/tests/coStream.test.ts +80 -17
  136. package/src/tests/coValueCore.test.ts +30 -27
  137. package/src/tests/coValueCoreLoadingState.test.ts +337 -0
  138. package/src/tests/group.test.ts +44 -68
  139. package/src/tests/messagesTestUtils.ts +3 -8
  140. package/src/tests/permissions.test.ts +283 -449
  141. package/src/tests/priority.test.ts +17 -13
  142. package/src/tests/sync.auth.test.ts +188 -0
  143. package/src/tests/sync.load.test.ts +79 -2
  144. package/src/tests/sync.mesh.test.ts +89 -9
  145. package/src/tests/sync.peerReconciliation.test.ts +25 -25
  146. package/src/tests/sync.storage.test.ts +20 -13
  147. package/src/tests/sync.test.ts +43 -43
  148. package/src/tests/sync.upload.test.ts +157 -37
  149. package/src/tests/testUtils.ts +120 -74
  150. package/src/typeUtils/expectGroup.ts +1 -1
  151. package/dist/CoValuesStore.d.ts +0 -14
  152. package/dist/CoValuesStore.d.ts.map +0 -1
  153. package/dist/CoValuesStore.js +0 -32
  154. package/dist/CoValuesStore.js.map +0 -1
  155. package/dist/coValueCore.d.ts +0 -141
  156. package/dist/coValueCore.d.ts.map +0 -1
  157. package/dist/coValueCore.js.map +0 -1
  158. package/dist/coValueState.d.ts +0 -34
  159. package/dist/coValueState.d.ts.map +0 -1
  160. package/dist/coValueState.js +0 -228
  161. package/dist/coValueState.js.map +0 -1
  162. package/dist/tests/coValueState.test.d.ts +0 -2
  163. package/dist/tests/coValueState.test.d.ts.map +0 -1
  164. package/dist/tests/coValueState.test.js +0 -344
  165. package/dist/tests/coValueState.test.js.map +0 -1
  166. package/src/CoValuesStore.ts +0 -41
  167. package/src/coValueState.ts +0 -300
  168. package/src/tests/coValueState.test.ts +0 -525
@@ -0,0 +1,227 @@
1
+ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
2
+ import { PeerState } from "../PeerState";
3
+ import { CoValueCore } from "../coValueCore/coValueCore";
4
+ import { createTestMetricReader, tearDownTestMetricReader } from "./testUtils";
5
+ let metricReader;
6
+ beforeEach(() => {
7
+ metricReader = createTestMetricReader();
8
+ });
9
+ afterEach(() => {
10
+ tearDownTestMetricReader();
11
+ });
12
+ const mockNode = {};
13
+ describe("CoValueCore loading state", () => {
14
+ const mockCoValueId = "co_test123";
15
+ test("should create unknown state", async () => {
16
+ const state = CoValueCore.fromID(mockCoValueId, mockNode);
17
+ expect(state.id).toBe(mockCoValueId);
18
+ expect(state.loadingState).toBe("unknown");
19
+ expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
20
+ state: "unknown",
21
+ })).toBe(1);
22
+ });
23
+ test("should create loading state", async () => {
24
+ const state = CoValueCore.fromID(mockCoValueId, mockNode);
25
+ state.loadFromPeers([
26
+ createMockPeerState({ id: "peer1", role: "server" }),
27
+ createMockPeerState({ id: "peer2", role: "server" }),
28
+ ]);
29
+ expect(state.id).toBe(mockCoValueId);
30
+ expect(state.loadingState).toBe("loading");
31
+ expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
32
+ state: "loading",
33
+ })).toBe(1);
34
+ });
35
+ test("should create available state", async () => {
36
+ const mockVerified = createMockCoValueVerified(mockCoValueId);
37
+ const state = CoValueCore.fromID(mockCoValueId, mockNode);
38
+ state.internalMarkMagicallyAvailable(mockVerified);
39
+ expect(state.id).toBe(mockCoValueId);
40
+ expect(state.loadingState).toBe("available");
41
+ expect(state.verified).toBe(mockVerified);
42
+ await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
43
+ verified: mockVerified,
44
+ });
45
+ expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
46
+ state: "available",
47
+ })).toBe(1);
48
+ });
49
+ test("should handle found action", async () => {
50
+ const mockVerified = createMockCoValueVerified(mockCoValueId);
51
+ const state = CoValueCore.fromID(mockCoValueId, mockNode);
52
+ state.loadFromPeers([
53
+ createMockPeerState({ id: "peer1", role: "server" }),
54
+ createMockPeerState({ id: "peer2", role: "server" }),
55
+ ]);
56
+ expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
57
+ state: "available",
58
+ })).toBe(undefined);
59
+ expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
60
+ state: "loading",
61
+ })).toBe(1);
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
+ });
69
+ expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
70
+ state: "available",
71
+ })).toBe(1);
72
+ expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
73
+ state: "loading",
74
+ })).toBe(0);
75
+ });
76
+ test("should skip errored coValues when loading from peers", async () => {
77
+ vi.useFakeTimers();
78
+ const peer1 = createMockPeerState({
79
+ id: "peer1",
80
+ role: "server",
81
+ }, async () => {
82
+ state.markErrored("peer1", {});
83
+ });
84
+ const peer2 = createMockPeerState({
85
+ id: "peer2",
86
+ role: "server",
87
+ }, async () => {
88
+ state.markNotFoundInPeer("peer2");
89
+ });
90
+ const mockPeers = [peer1, peer2];
91
+ const state = CoValueCore.fromID(mockCoValueId, mockNode);
92
+ const loadPromise = state.loadFromPeers(mockPeers);
93
+ await vi.runAllTimersAsync();
94
+ await loadPromise;
95
+ expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
96
+ expect(peer2.pushOutgoingMessage).toHaveBeenCalledTimes(1);
97
+ expect(state.loadingState).toBe("unavailable");
98
+ await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
99
+ verified: null,
100
+ });
101
+ vi.useRealTimers();
102
+ });
103
+ test("should have a coValue as value property when becomes available after that have been marked as unavailable", async () => {
104
+ vi.useFakeTimers();
105
+ const peer1 = createMockPeerState({
106
+ id: "peer1",
107
+ role: "server",
108
+ }, async () => {
109
+ state.markNotFoundInPeer("peer1");
110
+ });
111
+ const mockPeers = [peer1];
112
+ const state = CoValueCore.fromID(mockCoValueId, mockNode);
113
+ const loadPromise = state.loadFromPeers(mockPeers);
114
+ await vi.runAllTimersAsync();
115
+ state.internalMarkMagicallyAvailable(createMockCoValueVerified(mockCoValueId));
116
+ await loadPromise;
117
+ expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
118
+ expect(state.loadingState).toBe("available");
119
+ await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
120
+ _verified: expect.any(Object),
121
+ });
122
+ vi.useRealTimers();
123
+ });
124
+ test("should start sending the known state to peers when available", async () => {
125
+ vi.useFakeTimers();
126
+ const mockVerified = createMockCoValueVerified(mockCoValueId);
127
+ const peer1 = createMockPeerState({
128
+ id: "peer1",
129
+ role: "storage",
130
+ }, async () => {
131
+ state.markAvailable({}, "peer1");
132
+ });
133
+ const peer2 = createMockPeerState({
134
+ id: "peer2",
135
+ role: "server",
136
+ }, async () => {
137
+ state.markNotFoundInPeer("peer2");
138
+ });
139
+ const state = CoValueCore.fromID(mockCoValueId, mockNode);
140
+ const loadPromise = state.loadFromPeers([peer1, peer2]);
141
+ await vi.runAllTimersAsync();
142
+ await loadPromise;
143
+ expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
144
+ expect(peer2.pushOutgoingMessage).toHaveBeenCalledTimes(1);
145
+ expect(peer2.pushOutgoingMessage).toHaveBeenCalledWith({
146
+ action: "load",
147
+ ...mockVerified.knownState(),
148
+ });
149
+ expect(state.loadingState).toBe("available");
150
+ await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
151
+ verified: mockVerified,
152
+ });
153
+ vi.useRealTimers();
154
+ });
155
+ test("should skip closed peers", async () => {
156
+ vi.useFakeTimers();
157
+ const mockVerified = createMockCoValueVerified(mockCoValueId);
158
+ const peer1 = createMockPeerState({
159
+ id: "peer1",
160
+ role: "storage",
161
+ }, async () => {
162
+ return new Promise(() => { });
163
+ });
164
+ const peer2 = createMockPeerState({
165
+ id: "peer2",
166
+ role: "server",
167
+ }, async () => {
168
+ state.markAvailable({}, "peer2");
169
+ });
170
+ peer1.closed = true;
171
+ const state = CoValueCore.fromID(mockCoValueId, mockNode);
172
+ const loadPromise = state.loadFromPeers([peer1, peer2]);
173
+ await vi.runAllTimersAsync();
174
+ await loadPromise;
175
+ expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(0);
176
+ expect(peer2.pushOutgoingMessage).toHaveBeenCalledTimes(1);
177
+ expect(state.loadingState).toBe("available");
178
+ await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
179
+ verified: mockVerified,
180
+ });
181
+ vi.useRealTimers();
182
+ });
183
+ test("should not be stuck in loading state when not getting a response", async () => {
184
+ vi.useFakeTimers();
185
+ const peer1 = createMockPeerState({
186
+ id: "peer1",
187
+ role: "server",
188
+ }, async () => { });
189
+ const state = CoValueCore.fromID(mockCoValueId, mockNode);
190
+ const loadPromise = state.loadFromPeers([peer1]);
191
+ await vi.runAllTimersAsync();
192
+ await loadPromise;
193
+ expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
194
+ expect(state.loadingState).toBe("unavailable");
195
+ await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
196
+ verified: null,
197
+ });
198
+ vi.useRealTimers();
199
+ });
200
+ });
201
+ function createMockPeerState(peer, pushFn = () => Promise.resolve()) {
202
+ const peerState = new PeerState({
203
+ id: "peer",
204
+ role: "server",
205
+ outgoing: {
206
+ push: pushFn,
207
+ },
208
+ ...peer,
209
+ }, undefined);
210
+ vi.spyOn(peerState, "pushOutgoingMessage").mockImplementation(pushFn);
211
+ return peerState;
212
+ }
213
+ function createMockCoValueVerified(mockCoValueId) {
214
+ // Setting the knownState as part of the prototype to simplify
215
+ // the equality checks
216
+ const mockCoValueVerified = Object.create({
217
+ id: mockCoValueId,
218
+ knownState: vi.fn().mockReturnValue({
219
+ id: mockCoValueId,
220
+ header: true,
221
+ sessions: {},
222
+ }),
223
+ clone: vi.fn().mockReturnThis(),
224
+ });
225
+ return mockCoValueVerified;
226
+ }
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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"}
@@ -4,32 +4,31 @@ import { RawCoMap } from "../coValues/coMap.js";
4
4
  import { RawCoStream } from "../coValues/coStream.js";
5
5
  import { RawBinaryCoStream } from "../coValues/coStream.js";
6
6
  import { WasmCrypto } from "../crypto/WasmCrypto.js";
7
- import { LocalNode } from "../localNode.js";
8
- import { createThreeConnectedNodes, createTwoConnectedNodes, loadCoValueOrFail, randomAnonymousAccountAndSessionID, waitFor, } from "./testUtils.js";
7
+ import { createThreeConnectedNodes, createTwoConnectedNodes, loadCoValueOrFail, nodeWithRandomAgentAndSessionID, randomAgentAndSessionID, waitFor, } from "./testUtils.js";
9
8
  const Crypto = await WasmCrypto.create();
10
9
  test("Can create a RawCoMap in a group", () => {
11
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
10
+ const node = nodeWithRandomAgentAndSessionID();
12
11
  const group = node.createGroup();
13
12
  const map = group.createMap();
14
13
  expect(map.core.getCurrentContent().type).toEqual("comap");
15
14
  expect(map instanceof RawCoMap).toEqual(true);
16
15
  });
17
16
  test("Can create a CoList in a group", () => {
18
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
17
+ const node = nodeWithRandomAgentAndSessionID();
19
18
  const group = node.createGroup();
20
19
  const list = group.createList();
21
20
  expect(list.core.getCurrentContent().type).toEqual("colist");
22
21
  expect(list instanceof RawCoList).toEqual(true);
23
22
  });
24
23
  test("Can create a CoStream in a group", () => {
25
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
24
+ const node = nodeWithRandomAgentAndSessionID();
26
25
  const group = node.createGroup();
27
26
  const stream = group.createStream();
28
27
  expect(stream.core.getCurrentContent().type).toEqual("costream");
29
28
  expect(stream instanceof RawCoStream).toEqual(true);
30
29
  });
31
30
  test("Can create a FileStream in a group", () => {
32
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
31
+ const node = nodeWithRandomAgentAndSessionID();
33
32
  const group = node.createGroup();
34
33
  const stream = group.createBinaryStream();
35
34
  expect(stream.core.getCurrentContent().type).toEqual("costream");
@@ -55,7 +54,7 @@ test("Remove a member from a group where the admin role is inherited", async ()
55
54
  expect(mapOnNode3.get("test")).toEqual("Available to everyone");
56
55
  // The node1 account removes the reader from the group
57
56
  // The reader should be automatically kicked out of the child group
58
- await group.removeMember(node3.node.account);
57
+ await group.removeMember(node3.node.expectCurrentAccount("node3"));
59
58
  await group.core.waitForSync();
60
59
  // Update the map to check that node3 can't read updates anymore
61
60
  map.set("test", "Hidden to node3");
@@ -81,7 +80,7 @@ test("An admin should be able to rotate the readKey on child groups and keep acc
81
80
  // The node1 account removes the reader from the group
82
81
  // In this case we want to ensure that node1 is still able to read new coValues
83
82
  // Even if some childs are not available when the readKey is rotated
84
- await group.removeMember(node3.node.account);
83
+ await group.removeMember(node3.node.expectCurrentAccount("node3"));
85
84
  await group.core.waitForSync();
86
85
  const map = childGroup.createMap();
87
86
  map.set("test", "Available to node1");
@@ -103,7 +102,7 @@ test("An admin should be able to rotate the readKey on child groups even if it w
103
102
  // The node1 account removes the reader from the group
104
103
  // In this case we want to ensure that node1 is still able to read new coValues
105
104
  // Even if some childs are not available when the readKey is rotated
106
- await group.removeMember(node3.node.account);
105
+ await group.removeMember(node3.node.expectCurrentAccount("node3"));
107
106
  await group.core.waitForSync();
108
107
  const map = childGroup.createMap();
109
108
  map.set("test", "Available to node1");
@@ -127,7 +126,7 @@ test("An admin should be able to rotate the readKey on child groups even if it w
127
126
  // The node1 account removes the reader from the group
128
127
  // In this case we want to ensure that node1 is still able to read new coValues
129
128
  // Even if some childs are not available when the readKey is rotated
130
- await group.removeMember(node3.node.account);
129
+ await group.removeMember(node3.node.expectCurrentAccount("node3"));
131
130
  await group.core.waitForSync();
132
131
  const map = childGroup.createMap();
133
132
  map.set("test", "Available to node1");
@@ -143,7 +142,7 @@ test("A user add after a key rotation should have access to the old transactions
143
142
  const map = groupOnNode2.createMap();
144
143
  map.set("test", "Written from node2");
145
144
  await map.core.waitForSync();
146
- await group.removeMember(node3.node.account);
145
+ await group.removeMember(node3.node.expectCurrentAccount("node3"));
147
146
  group.addMember(await loadCoValueOrFail(node1.node, node3.accountID), "reader");
148
147
  await group.core.waitForSync();
149
148
  const mapOnNode3 = await loadCoValueOrFail(node3.node, map.id);
@@ -154,7 +153,7 @@ test("Invites should have access to the new keys", async () => {
154
153
  const group = node1.node.createGroup();
155
154
  group.addMember(await loadCoValueOrFail(node1.node, node3.accountID), "reader");
156
155
  const invite = group.createInvite("admin");
157
- await group.removeMember(node3.node.account);
156
+ await group.removeMember(node3.node.expectCurrentAccount("node3"));
158
157
  const map = group.createMap();
159
158
  map.set("test", "Written from node1");
160
159
  await map.core.waitForSync();
@@ -233,7 +232,7 @@ describe("writeOnly", () => {
233
232
  const map = groupOnNode2.createMap();
234
233
  map.set("test", "Written from a writeOnly member");
235
234
  await map.core.waitForSync();
236
- await group.removeMember(node3.node.account);
235
+ await group.removeMember(node3.node.expectCurrentAccount("node3"));
237
236
  await group.core.waitForSync();
238
237
  map.set("test", "Updated after key rotation");
239
238
  await map.core.waitForSync();
@@ -252,8 +251,8 @@ describe("writeOnly", () => {
252
251
  map.set("test", "Written from the writeOnly member");
253
252
  await map.core.waitForSync();
254
253
  group.addMember(await loadCoValueOrFail(node1.node, node2.accountID), "writer");
255
- node2.node.coValuesStore.coValues.delete(map.id);
256
- expect(node2.node.coValuesStore.get(map.id)?.highLevelState).toBe("unknown");
254
+ node2.node.internalDeleteCoValue(map.id);
255
+ expect(node2.node.getCoValue(map.id)?.loadingState).toBe("unknown");
257
256
  const mapOnNode2 = await loadCoValueOrFail(node2.node, map.id);
258
257
  // The writer role should be able to see the edits from the admin
259
258
  expect(mapOnNode2.get("test")).toEqual("Written from the writeOnly member");
@@ -493,60 +492,60 @@ describe("extend with role mapping", () => {
493
492
  });
494
493
  describe("roleOf", () => {
495
494
  test("returns direct role assignments", () => {
496
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
495
+ const node = nodeWithRandomAgentAndSessionID();
497
496
  const group = node.createGroup();
498
- const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
499
- group.addMember(account, "writer");
500
- expect(group.roleOf(account.id)).toEqual("writer");
497
+ const [agent2] = randomAgentAndSessionID();
498
+ group.addMember(agent2, "writer");
499
+ expect(group.roleOfInternal(agent2.id)).toEqual("writer");
501
500
  });
502
501
  test("returns undefined for non-members", () => {
503
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
502
+ const node = nodeWithRandomAgentAndSessionID();
504
503
  const group = node.createGroup();
505
- const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
506
- expect(group.roleOf(account.id)).toEqual(undefined);
504
+ const [agent2] = randomAgentAndSessionID();
505
+ expect(group.roleOfInternal(agent2.id)).toEqual(undefined);
507
506
  });
508
507
  test("revoked roles return undefined", () => {
509
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
508
+ const node = nodeWithRandomAgentAndSessionID();
510
509
  const group = node.createGroup();
511
- const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
512
- group.addMember(account, "writer");
513
- group.removeMemberInternal(account);
514
- expect(group.roleOf(account.id)).toEqual(undefined);
510
+ const [agent2] = randomAgentAndSessionID();
511
+ group.addMember(agent2, "writer");
512
+ group.removeMemberInternal(agent2);
513
+ expect(group.roleOfInternal(agent2.id)).toEqual(undefined);
515
514
  });
516
515
  test("everyone role applies to all accounts", () => {
517
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
516
+ const node = nodeWithRandomAgentAndSessionID();
518
517
  const group = node.createGroup();
519
- const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
518
+ const [agent2, sessionID2] = randomAgentAndSessionID();
520
519
  group.addMemberInternal("everyone", "reader");
521
- expect(group.roleOf(account.id)).toEqual("reader");
520
+ expect(group.roleOfInternal(agent2.id)).toEqual("reader");
522
521
  });
523
522
  test("account role overrides everyone role", () => {
524
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
523
+ const node = nodeWithRandomAgentAndSessionID();
525
524
  const group = node.createGroup();
526
- const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
525
+ const [agent2, sessionID2] = randomAgentAndSessionID();
527
526
  group.addMemberInternal("everyone", "writer");
528
- group.addMember(account, "reader");
529
- expect(group.roleOf(account.id)).toEqual("reader");
527
+ group.addMember(agent2, "reader");
528
+ expect(group.roleOfInternal(agent2.id)).toEqual("reader");
530
529
  });
531
530
  test("Revoking access on everyone role should not affect existing members", () => {
532
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
531
+ const node = nodeWithRandomAgentAndSessionID();
533
532
  const group = node.createGroup();
534
- const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
533
+ const [agent2, sessionID2] = randomAgentAndSessionID();
535
534
  group.addMemberInternal("everyone", "reader");
536
- group.addMember(account, "writer");
535
+ group.addMember(agent2, "writer");
537
536
  group.removeMemberInternal("everyone");
538
- expect(group.roleOf(account.id)).toEqual("writer");
539
- expect(group.roleOf("123")).toEqual(undefined);
537
+ expect(group.roleOfInternal(agent2.id)).toEqual("writer");
538
+ expect(group.roleOfInternal("123")).toEqual(undefined);
540
539
  });
541
540
  test("Everyone role is inherited following the most permissive algorithm", () => {
542
- const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
541
+ const node = nodeWithRandomAgentAndSessionID();
543
542
  const group = node.createGroup();
544
- const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
543
+ const [agent2, sessionID2] = randomAgentAndSessionID();
545
544
  const parentGroup = node.createGroup();
546
545
  parentGroup.addMemberInternal("everyone", "writer");
547
546
  group.extend(parentGroup);
548
- group.addMember(account, "reader");
549
- expect(group.roleOf(account.id)).toEqual("writer");
547
+ group.addMember(agent2, "reader");
548
+ expect(group.roleOfInternal(agent2.id)).toEqual("writer");
550
549
  });
551
550
  test("roleOf should prioritize explicit account role over everyone role in same group", async () => {
552
551
  const { node1, node2 } = await createTwoConnectedNodes("server", "server");