cojson 0.13.17 → 0.13.20

package/dist/tests/{coValueState.test.js → coValueCoreLoadingState.test.js}

@@ -1,6 +1,6 @@
-import { afterEach, beforeEach, describe, expect, test, vi, } from "vitest";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { PeerState } from "../PeerState";
-import { CoValueState } from "../coValueState";
+import { CoValueCore } from "../coValueCore/coValueCore";
 import { createTestMetricReader, tearDownTestMetricReader } from "./testUtils";
 let metricReader;
 beforeEach(() => {
@@ -9,43 +9,46 @@ beforeEach(() => {
 afterEach(() => {
     tearDownTestMetricReader();
 });
-describe("CoValueState", () => {
+const mockNode = {};
+describe("CoValueCore loading state", () => {
     const mockCoValueId = "co_test123";
     test("should create unknown state", async () => {
-        const state = new CoValueState(mockCoValueId);
+        const state = CoValueCore.fromID(mockCoValueId, mockNode);
         expect(state.id).toBe(mockCoValueId);
-        expect(state.highLevelState).toBe("unknown");
+        expect(state.loadingState).toBe("unknown");
         expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
             state: "unknown",
         })).toBe(1);
     });
     test("should create loading state", async () => {
-        const state = new CoValueState(mockCoValueId);
+        const state = CoValueCore.fromID(mockCoValueId, mockNode);
         state.loadFromPeers([
             createMockPeerState({ id: "peer1", role: "server" }),
             createMockPeerState({ id: "peer2", role: "server" }),
         ]);
         expect(state.id).toBe(mockCoValueId);
-        expect(state.highLevelState).toBe("loading");
+        expect(state.loadingState).toBe("loading");
         expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
             state: "loading",
         })).toBe(1);
     });
     test("should create available state", async () => {
-        const mockCoValue = createMockCoValueCore(mockCoValueId);
-        const state = new CoValueState(mockCoValueId);
-        state.internalMarkMagicallyAvailable(mockCoValue);
+        const mockVerified = createMockCoValueVerified(mockCoValueId);
+        const state = CoValueCore.fromID(mockCoValueId, mockNode);
+        state.internalMarkMagicallyAvailable(mockVerified);
         expect(state.id).toBe(mockCoValueId);
-        expect(state.highLevelState).toBe("available");
-        expect(state.core).toBe(mockCoValue);
-        await expect(state.getCoValue()).resolves.toEqual(mockCoValue);
+        expect(state.loadingState).toBe("available");
+        expect(state.verified).toBe(mockVerified);
+        await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
+            verified: mockVerified,
+        });
         expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
             state: "available",
         })).toBe(1);
     });
     test("should handle found action", async () => {
-        const mockCoValue = createMockCoValueCore(mockCoValueId);
-        const state = new CoValueState(mockCoValueId);
+        const mockVerified = createMockCoValueVerified(mockCoValueId);
+        const state = CoValueCore.fromID(mockCoValueId, mockNode);
         state.loadFromPeers([
             createMockPeerState({ id: "peer1", role: "server" }),
             createMockPeerState({ id: "peer2", role: "server" }),
@@ -56,11 +59,13 @@ describe("CoValueState", () => {
         expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
             state: "loading",
         })).toBe(1);
-        const stateValuePromise = state.getCoValue();
-        state.internalMarkMagicallyAvailable(mockCoValue);
-        const result = await state.getCoValue();
-        expect(result).toBe(mockCoValue);
-        await expect(stateValuePromise).resolves.toBe(mockCoValue);
+        const stateValuePromise = state.waitForAvailableOrUnavailable();
+        state.internalMarkMagicallyAvailable(mockVerified);
+        const result = await state.waitForAvailableOrUnavailable();
+        expect(result).toMatchObject({ verified: mockVerified });
+        await expect(stateValuePromise).resolves.toMatchObject({
+            verified: mockVerified,
+        });
         expect(await metricReader.getMetricValue("jazz.covalues.loaded", {
             state: "available",
         })).toBe(1);
@@ -83,14 +88,16 @@ describe("CoValueState", () => {
             state.markNotFoundInPeer("peer2");
         });
         const mockPeers = [peer1, peer2];
-        const state = new CoValueState(mockCoValueId);
+        const state = CoValueCore.fromID(mockCoValueId, mockNode);
         const loadPromise = state.loadFromPeers(mockPeers);
         await vi.runAllTimersAsync();
         await loadPromise;
         expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
         expect(peer2.pushOutgoingMessage).toHaveBeenCalledTimes(1);
-        expect(state.highLevelState).toBe("unavailable");
-        await expect(state.getCoValue()).resolves.toBe("unavailable");
+        expect(state.loadingState).toBe("unavailable");
+        await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
+            verified: null,
+        });
         vi.useRealTimers();
     });
     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", () => {
             state.markNotFoundInPeer("peer1");
         });
         const mockPeers = [peer1];
-        const state = new CoValueState(mockCoValueId);
+        const state = CoValueCore.fromID(mockCoValueId, mockNode);
         const loadPromise = state.loadFromPeers(mockPeers);
         await vi.runAllTimersAsync();
-        state.internalMarkMagicallyAvailable(createMockCoValueCore(mockCoValueId));
+        state.internalMarkMagicallyAvailable(createMockCoValueVerified(mockCoValueId));
         await loadPromise;
         expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
-        expect(state.highLevelState).toBe("available");
-        await expect(state.getCoValue()).resolves.toEqual({ id: mockCoValueId });
+        expect(state.loadingState).toBe("available");
+        await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
+            _verified: expect.any(Object),
+        });
         vi.useRealTimers();
     });
     test("should start sending the known state to peers when available", async () => {
         vi.useFakeTimers();
-        const mockCoValue = createMockCoValueCore(mockCoValueId);
+        const mockVerified = createMockCoValueVerified(mockCoValueId);
         const peer1 = createMockPeerState({
             id: "peer1",
             role: "storage",
         }, async () => {
-            state.markAvailable(mockCoValue, "peer1");
+            state.markAvailable({}, "peer1");
         });
         const peer2 = createMockPeerState({
             id: "peer2",
@@ -127,7 +136,7 @@ describe("CoValueState", () => {
         }, async () => {
             state.markNotFoundInPeer("peer2");
         });
-        const state = new CoValueState(mockCoValueId);
+        const state = CoValueCore.fromID(mockCoValueId, mockNode);
         const loadPromise = state.loadFromPeers([peer1, peer2]);
         await vi.runAllTimersAsync();
         await loadPromise;
@@ -135,15 +144,17 @@ describe("CoValueState", () => {
         expect(peer2.pushOutgoingMessage).toHaveBeenCalledTimes(1);
         expect(peer2.pushOutgoingMessage).toHaveBeenCalledWith({
             action: "load",
-            ...mockCoValue.knownState(),
+            ...mockVerified.knownState(),
+        });
+        expect(state.loadingState).toBe("available");
+        await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
+            verified: mockVerified,
         });
-        expect(state.highLevelState).toBe("available");
-        await expect(state.getCoValue()).resolves.toEqual({ id: mockCoValueId });
         vi.useRealTimers();
     });
     test("should skip closed peers", async () => {
         vi.useFakeTimers();
-        const mockCoValue = createMockCoValueCore(mockCoValueId);
+        const mockVerified = createMockCoValueVerified(mockCoValueId);
         const peer1 = createMockPeerState({
             id: "peer1",
             role: "storage",
@@ -154,17 +165,19 @@ describe("CoValueState", () => {
             id: "peer2",
             role: "server",
         }, async () => {
-            state.markAvailable(mockCoValue, "peer2");
+            state.markAvailable({}, "peer2");
         });
         peer1.closed = true;
-        const state = new CoValueState(mockCoValueId);
+        const state = CoValueCore.fromID(mockCoValueId, mockNode);
         const loadPromise = state.loadFromPeers([peer1, peer2]);
         await vi.runAllTimersAsync();
         await loadPromise;
         expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(0);
         expect(peer2.pushOutgoingMessage).toHaveBeenCalledTimes(1);
-        expect(state.highLevelState).toBe("available");
-        await expect(state.getCoValue()).resolves.toEqual({ id: mockCoValueId });
+        expect(state.loadingState).toBe("available");
+        await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
+            verified: mockVerified,
+        });
         vi.useRealTimers();
     });
     test("should not be stuck in loading state when not getting a response", async () => {
@@ -173,13 +186,15 @@ describe("CoValueState", () => {
             id: "peer1",
             role: "server",
         }, async () => { });
-        const state = new CoValueState(mockCoValueId);
+        const state = CoValueCore.fromID(mockCoValueId, mockNode);
         const loadPromise = state.loadFromPeers([peer1]);
         await vi.runAllTimersAsync();
         await loadPromise;
         expect(peer1.pushOutgoingMessage).toHaveBeenCalledTimes(1);
-        expect(state.highLevelState).toBe("unavailable");
-        await expect(state.getCoValue()).resolves.toEqual("unavailable");
+        expect(state.loadingState).toBe("unavailable");
+        await expect(state.waitForAvailableOrUnavailable()).resolves.toMatchObject({
+            verified: null,
+        });
         vi.useRealTimers();
     });
 });
@@ -195,17 +210,18 @@ function createMockPeerState(peer, pushFn = () => Promise.resolve()) {
     vi.spyOn(peerState, "pushOutgoingMessage").mockImplementation(pushFn);
     return peerState;
 }
-function createMockCoValueCore(mockCoValueId) {
+function createMockCoValueVerified(mockCoValueId) {
     // Setting the knownState as part of the prototype to simplify
     // the equality checks
-    const mockCoValue = Object.create({
+    const mockCoValueVerified = Object.create({
+        id: mockCoValueId,
         knownState: vi.fn().mockReturnValue({
             id: mockCoValueId,
             header: true,
             sessions: {},
         }),
+        clone: vi.fn().mockReturnThis(),
     });
-    mockCoValue.id = mockCoValueId;
-    return mockCoValue;
+    return mockCoValueVerified;
 }
-//# sourceMappingURL=coValueState.test.js.map
+//# sourceMappingURL=coValueCoreLoadingState.test.js.map

package/dist/tests/coValueCoreLoadingState.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coValueCoreLoadingState.test.js","sourceRoot":"","sources":["../../src/tests/coValueCoreLoadingState.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAKzD,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE/E,IAAI,YAAuD,CAAC;AAE5D,UAAU,CAAC,GAAG,EAAE;IACd,YAAY,GAAG,sBAAsB,EAAE,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,SAAS,CAAC,GAAG,EAAE;IACb,wBAAwB,EAAE,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,EAAe,CAAC;AAEjC,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,MAAM,aAAa,GAAG,YAAuB,CAAC;IAE9C,IAAI,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC7C,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAE1D,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,CACJ,MAAM,YAAY,CAAC,cAAc,CAAC,sBAAsB,EAAE;YACxD,KAAK,EAAE,SAAS;SACjB,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC7C,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1D,KAAK,CAAC,aAAa,CAAC;YAClB,mBAAmB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;YACpD,mBAAmB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACrD,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,CACJ,MAAM,YAAY,CAAC,cAAc,CAAC,sBAAsB,EAAE;YACxD,KAAK,EAAE,SAAS;SACjB,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,YAAY,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1D,KAAK,CAAC,8BAA8B,CAAC,YAAY,CAAC,CAAC;QAEnD,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1C,MAAM,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YACzE,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAC;QACH,MAAM,CACJ,MAAM,YAAY,CAAC,cAAc,CAAC,sBAAsB,EAAE;YACxD,KAAK,EAAE,WAAW;SACnB,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,YAAY,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1D,KAAK,CAAC,aAAa,CAAC;YAClB,mBAAmB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;YACpD,mBAAmB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACrD,CAAC,CAAC;QAEH,MAAM,CACJ,MAAM,YAAY,CAAC,cAAc,CAAC,sBAAsB,EAAE;YACxD,KAAK,EAAE,WAAW;SACnB,CAAC,CACH,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClB,MAAM,CACJ,MAAM,YAAY,CAAC,cAAc,CAAC,sBAAsB,EAAE;YACxD,KAAK,EAAE,SAAS;SACjB,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEV,MAAM,iBAAiB,GAAG,KAAK,CAAC,6BAA6B,EAAE,CAAC;QAEhE,KAAK,CAAC,8BAA8B,CAAC,YAAY,CAAC,CAAC;QAEnD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,6BAA6B,EAAE,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QACzD,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YACrD,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAC;QAEH,MAAM,CACJ,MAAM,YAAY,CAAC,cAAc,CAAC,sBAAsB,EAAE;YACxD,KAAK,EAAE,WAAW;SACnB,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACV,MAAM,CACJ,MAAM,YAAY,CAAC,cAAc,CAAC,sBAAsB,EAAE;YACxD,KAAK,EAAE,SAAS;SACjB,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACtE,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,KAAK,GAAG,mBAAmB,CAC/B;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,QAAQ;SACf,EACD,KAAK,IAAI,EAAE;YACT,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,EAAS,CAAC,CAAC;QACxC,CAAC,CACF,CAAC;QACF,MAAM,KAAK,GAAG,mBAAmB,CAC/B;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,QAAQ;SACf,EACD,KAAK,IAAI,EAAE;YACT,KAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC,CACF,CAAC;QAEF,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,KAAK,CAA2B,CAAC;QAE3D,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAEnD,MAAM,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAC7B,MAAM,WAAW,CAAC;QAElB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC/C,MAAM,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YACzE,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2GAA2G,EAAE,KAAK,IAAI,EAAE;QAC3H,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,KAAK,GAAG,mBAAmB,CAC/B;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,QAAQ;SACf,EACD,KAAK,IAAI,EAAE;YACT,KAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC,CACF,CAAC;QAEF,MAAM,SAAS,GAAG,CAAC,KAAK,CAA2B,CAAC;QAEpD,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAEnD,MAAM,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAE7B,KAAK,CAAC,8BAA8B,CAClC,yBAAyB,CAAC,aAAa,CAAC,CACzC,CAAC;QAEF,MAAM,WAAW,CAAC;QAElB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YACzE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;SAC9B,CAAC,CAAC;QAEH,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;QAC9E,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,YAAY,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;QAE9D,MAAM,KAAK,GAAG,mBAAmB,CAC/B;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,SAAS;SAChB,EACD,KAAK,IAAI,EAAE;YACT,KAAK,CAAC,aAAa,CAAC,EAAmB,EAAE,OAAO,CAAC,CAAC;QACpD,CAAC,CACF,CAAC;QACF,MAAM,KAAK,GAAG,mBAAmB,CAC/B;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,QAAQ;SACf,EACD,KAAK,IAAI,EAAE;YACT,KAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC,CACF,CAAC;QAEF,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QAExD,MAAM,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAC7B,MAAM,WAAW,CAAC;QAElB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,oBAAoB,CAAC;YACrD,MAAM,EAAE,MAAM;YACd,GAAG,YAAY,CAAC,UAAU,EAAE;SAC7B,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YACzE,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAC;QAEH,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QAC1C,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,YAAY,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;QAE9D,MAAM,KAAK,GAAG,mBAAmB,CAC/B;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,SAAS;SAChB,EACD,KAAK,IAAI,EAAE;YACT,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/B,CAAC,CACF,CAAC;QACF,MAAM,KAAK,GAAG,mBAAmB,CAC/B;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,QAAQ;SACf,EACD,KAAK,IAAI,EAAE;YACT,KAAK,CAAC,aAAa,CAAC,EAAmB,EAAE,OAAO,CAAC,CAAC;QACpD,CAAC,CACF,CAAC;QAEF,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;QAEpB,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QAExD,MAAM,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAC7B,MAAM,WAAW,CAAC;QAElB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAE3D,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YACzE,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAC;QAEH,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAClF,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,KAAK,GAAG,mBAAmB,CAC/B;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,QAAQ;SACf,EACD,KAAK,IAAI,EAAE,GAAE,CAAC,CACf,CAAC;QAEF,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAEjD,MAAM,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAC7B,MAAM,WAAW,CAAC;QAElB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAE3D,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC/C,MAAM,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YACzE,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,SAAS,mBAAmB,CAC1B,IAAmB,EACnB,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;IAEhC,MAAM,SAAS,GAAG,IAAI,SAAS,CAC7B;QACE,EAAE,EAAE,MAAM;QACV,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM;SACb;QACD,GAAG,IAAI;KACA,EACT,SAAS,CACV,CAAC;IAEF,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEtE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,yBAAyB,CAAC,aAAqB;IACtD,8DAA8D;IAC9D,sBAAsB;IACtB,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;QACxC,EAAE,EAAE,aAAa;QACjB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;YAClC,EAAE,EAAE,aAAa;YACjB,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,EAAE;SACb,CAAC;QACF,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,EAAE;KAChC,CAA6B,CAAC;IAE/B,OAAO,mBAA+C,CAAC;AACzD,CAAC"}

package/dist/tests/group.test.js

@@ -4,32 +4,31 @@ import { RawCoMap } from "../coValues/coMap.js";
 import { RawCoStream } from "../coValues/coStream.js";
 import { RawBinaryCoStream } from "../coValues/coStream.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
-import { LocalNode } from "../localNode.js";
-import { createThreeConnectedNodes, createTwoConnectedNodes, loadCoValueOrFail, randomAnonymousAccountAndSessionID, waitFor, } from "./testUtils.js";
+import { createThreeConnectedNodes, createTwoConnectedNodes, loadCoValueOrFail, nodeWithRandomAgentAndSessionID, randomAgentAndSessionID, waitFor, } from "./testUtils.js";
 const Crypto = await WasmCrypto.create();
 test("Can create a RawCoMap in a group", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const group = node.createGroup();
     const map = group.createMap();
     expect(map.core.getCurrentContent().type).toEqual("comap");
     expect(map instanceof RawCoMap).toEqual(true);
 });
 test("Can create a CoList in a group", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const group = node.createGroup();
     const list = group.createList();
     expect(list.core.getCurrentContent().type).toEqual("colist");
     expect(list instanceof RawCoList).toEqual(true);
 });
 test("Can create a CoStream in a group", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const group = node.createGroup();
     const stream = group.createStream();
     expect(stream.core.getCurrentContent().type).toEqual("costream");
     expect(stream instanceof RawCoStream).toEqual(true);
 });
 test("Can create a FileStream in a group", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const group = node.createGroup();
     const stream = group.createBinaryStream();
     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 ()
     expect(mapOnNode3.get("test")).toEqual("Available to everyone");
     // The node1 account removes the reader from the group
     // The reader should be automatically kicked out of the child group
-    await group.removeMember(node3.node.account);
+    await group.removeMember(node3.node.expectCurrentAccount("node3"));
     await group.core.waitForSync();
     // Update the map to check that node3 can't read updates anymore
     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
     // The node1 account removes the reader from the group
     // In this case we want to ensure that node1 is still able to read new coValues
     // Even if some childs are not available when the readKey is rotated
-    await group.removeMember(node3.node.account);
+    await group.removeMember(node3.node.expectCurrentAccount("node3"));
     await group.core.waitForSync();
     const map = childGroup.createMap();
     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
     // The node1 account removes the reader from the group
     // In this case we want to ensure that node1 is still able to read new coValues
     // Even if some childs are not available when the readKey is rotated
-    await group.removeMember(node3.node.account);
+    await group.removeMember(node3.node.expectCurrentAccount("node3"));
     await group.core.waitForSync();
     const map = childGroup.createMap();
     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
     // The node1 account removes the reader from the group
     // In this case we want to ensure that node1 is still able to read new coValues
     // Even if some childs are not available when the readKey is rotated
-    await group.removeMember(node3.node.account);
+    await group.removeMember(node3.node.expectCurrentAccount("node3"));
     await group.core.waitForSync();
     const map = childGroup.createMap();
     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
     const map = groupOnNode2.createMap();
     map.set("test", "Written from node2");
     await map.core.waitForSync();
-    await group.removeMember(node3.node.account);
+    await group.removeMember(node3.node.expectCurrentAccount("node3"));
     group.addMember(await loadCoValueOrFail(node1.node, node3.accountID), "reader");
     await group.core.waitForSync();
     const mapOnNode3 = await loadCoValueOrFail(node3.node, map.id);
@@ -154,7 +153,7 @@ test("Invites should have access to the new keys", async () => {
     const group = node1.node.createGroup();
     group.addMember(await loadCoValueOrFail(node1.node, node3.accountID), "reader");
     const invite = group.createInvite("admin");
-    await group.removeMember(node3.node.account);
+    await group.removeMember(node3.node.expectCurrentAccount("node3"));
     const map = group.createMap();
     map.set("test", "Written from node1");
     await map.core.waitForSync();
@@ -233,7 +232,7 @@ describe("writeOnly", () => {
         const map = groupOnNode2.createMap();
         map.set("test", "Written from a writeOnly member");
         await map.core.waitForSync();
-        await group.removeMember(node3.node.account);
+        await group.removeMember(node3.node.expectCurrentAccount("node3"));
         await group.core.waitForSync();
         map.set("test", "Updated after key rotation");
         await map.core.waitForSync();
@@ -252,8 +251,8 @@ describe("writeOnly", () => {
         map.set("test", "Written from the writeOnly member");
         await map.core.waitForSync();
         group.addMember(await loadCoValueOrFail(node1.node, node2.accountID), "writer");
-        node2.node.coValuesStore.coValues.delete(map.id);
-        expect(node2.node.coValuesStore.get(map.id)?.highLevelState).toBe("unknown");
+        node2.node.internalDeleteCoValue(map.id);
+        expect(node2.node.getCoValue(map.id)?.loadingState).toBe("unknown");
         const mapOnNode2 = await loadCoValueOrFail(node2.node, map.id);
         // The writer role should be able to see the edits from the admin
         expect(mapOnNode2.get("test")).toEqual("Written from the writeOnly member");
@@ -493,60 +492,60 @@ describe("extend with role mapping", () => {
 });
 describe("roleOf", () => {
     test("returns direct role assignments", () => {
-        const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+        const node = nodeWithRandomAgentAndSessionID();
         const group = node.createGroup();
-        const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
-        group.addMember(account, "writer");
-        expect(group.roleOf(account.id)).toEqual("writer");
+        const [agent2] = randomAgentAndSessionID();
+        group.addMember(agent2, "writer");
+        expect(group.roleOfInternal(agent2.id)).toEqual("writer");
     });
     test("returns undefined for non-members", () => {
-        const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+        const node = nodeWithRandomAgentAndSessionID();
         const group = node.createGroup();
-        const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
-        expect(group.roleOf(account.id)).toEqual(undefined);
+        const [agent2] = randomAgentAndSessionID();
+        expect(group.roleOfInternal(agent2.id)).toEqual(undefined);
     });
     test("revoked roles return undefined", () => {
-        const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+        const node = nodeWithRandomAgentAndSessionID();
         const group = node.createGroup();
-        const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
-        group.addMember(account, "writer");
-        group.removeMemberInternal(account);
-        expect(group.roleOf(account.id)).toEqual(undefined);
+        const [agent2] = randomAgentAndSessionID();
+        group.addMember(agent2, "writer");
+        group.removeMemberInternal(agent2);
+        expect(group.roleOfInternal(agent2.id)).toEqual(undefined);
     });
     test("everyone role applies to all accounts", () => {
-        const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+        const node = nodeWithRandomAgentAndSessionID();
         const group = node.createGroup();
-        const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
+        const [agent2, sessionID2] = randomAgentAndSessionID();
         group.addMemberInternal("everyone", "reader");
-        expect(group.roleOf(account.id)).toEqual("reader");
+        expect(group.roleOfInternal(agent2.id)).toEqual("reader");
     });
     test("account role overrides everyone role", () => {
-        const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+        const node = nodeWithRandomAgentAndSessionID();
         const group = node.createGroup();
-        const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
+        const [agent2, sessionID2] = randomAgentAndSessionID();
         group.addMemberInternal("everyone", "writer");
-        group.addMember(account, "reader");
-        expect(group.roleOf(account.id)).toEqual("reader");
+        group.addMember(agent2, "reader");
+        expect(group.roleOfInternal(agent2.id)).toEqual("reader");
     });
     test("Revoking access on everyone role should not affect existing members", () => {
-        const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+        const node = nodeWithRandomAgentAndSessionID();
         const group = node.createGroup();
-        const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
+        const [agent2, sessionID2] = randomAgentAndSessionID();
         group.addMemberInternal("everyone", "reader");
-        group.addMember(account, "writer");
+        group.addMember(agent2, "writer");
         group.removeMemberInternal("everyone");
-        expect(group.roleOf(account.id)).toEqual("writer");
-        expect(group.roleOf("123")).toEqual(undefined);
+        expect(group.roleOfInternal(agent2.id)).toEqual("writer");
+        expect(group.roleOfInternal("123")).toEqual(undefined);
     });
     test("Everyone role is inherited following the most permissive algorithm", () => {
-        const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+        const node = nodeWithRandomAgentAndSessionID();
         const group = node.createGroup();
-        const account = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto).account;
+        const [agent2, sessionID2] = randomAgentAndSessionID();
         const parentGroup = node.createGroup();
         parentGroup.addMemberInternal("everyone", "writer");
         group.extend(parentGroup);
-        group.addMember(account, "reader");
-        expect(group.roleOf(account.id)).toEqual("writer");
+        group.addMember(agent2, "reader");
+        expect(group.roleOfInternal(agent2.id)).toEqual("writer");
     });
     test("roleOf should prioritize explicit account role over everyone role in same group", async () => {
         const { node1, node2 } = await createTwoConnectedNodes("server", "server");