jazz-tools 0.7.0-alpha.4 → 0.7.0-alpha.42

package/src/tests/coStream.test.ts

@@ -1,76 +1,72 @@
-import { expect, describe, test, beforeEach, Test } from "vitest";
-
-import { webcrypto } from "node:crypto";
+import { expect, describe, test } from "vitest";
 import { connectedPeers } from "cojson/src/streamUtils.js";
 import { newRandomSessionID } from "cojson/src/coValueCore.js";
 import { Effect, Queue } from "effect";
-import { BinaryCoStream, ID, Account, jazzReady, CoStream } from "..";
-import { Simplify } from "effect/Types";
-
-if (!("crypto" in globalThis)) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (globalThis as any).crypto = webcrypto;
-}
-
-beforeEach(async () => {
-    await jazzReady;
-});
+import {
+    BinaryCoStream,
+    ID,
+    Account,
+    CoStream,
+    co,
+    WasmCrypto,
+    isControlledAccount,
+} from "../index.js";
+
+const Crypto = await WasmCrypto.create();
 
 describe("Simple CoStream operations", async () => {
     const me = await Account.create({
-        name: "Hermes Puggington",
+        creationProps: { name: "Hermes Puggington" },
+        crypto: Crypto,
     });
+    if (!isControlledAccount(me)) { throw("me is not a controlled account") }
+    class TestStream extends CoStream.Of(co.string) {}
 
-    class TestStream extends CoStream<string> {}
-    TestStream.encoding({ _item: "json" });
-
-    const stream = new TestStream(["milk"], { owner: me });
+    const stream = TestStream.create(["milk"], { owner: me });
 
     test("Construction", () => {
-        expect(stream.by[me.id]?.value).toEqual("milk");
-        expect(stream.in[me.sessionID]?.value).toEqual("milk");
+        expect(stream[me.id]?.value).toEqual("milk");
+        expect(stream.perSession[me.sessionID]?.value).toEqual("milk");
     });
 
     describe("Mutation", () => {
         test("pushing", () => {
             stream.push("bread");
-            expect(stream.by[me.id]?.value).toEqual("bread");
-            expect(stream.in[me.sessionID]?.value).toEqual("bread");
+            expect(stream[me.id]?.value).toEqual("bread");
+            expect(stream.perSession[me.sessionID]?.value).toEqual("bread");
 
             stream.push("butter");
-            expect(stream.by[me.id]?.value).toEqual("butter");
-            expect(stream.in[me.sessionID]?.value).toEqual("butter");
+            expect(stream[me.id]?.value).toEqual("butter");
+            expect(stream.perSession[me.sessionID]?.value).toEqual("butter");
         });
     });
 });
 
 describe("CoStream resolution", async () => {
-    class TwiceNestedStream extends CoStream<string> {
+    class TwiceNestedStream extends CoStream.Of(co.string) {
         fancyValueOf(account: ID<Account>) {
-            return "Sir " + this.by[account]?.value;
+            return "Sir " + this[account]?.value;
         }
     }
-    TwiceNestedStream.encoding({ _item: "json" });
 
-    class NestedStream extends CoStream<TwiceNestedStream | null>{}
-    NestedStream.encoding({ _item: {ref: () => TwiceNestedStream} });
+    class NestedStream extends CoStream.Of(co.ref(TwiceNestedStream)) {}
 
-    class TestStream extends CoStream<NestedStream | null> {}
-    TestStream.encoding({ _item: {ref: () => NestedStream} });
+    class TestStream extends CoStream.Of(co.ref(NestedStream)) {}
 
     const initNodeAndStream = async () => {
         const me = await Account.create({
-            name: "Hermes Puggington",
+            creationProps: { name: "Hermes Puggington" },
+            crypto: Crypto,
         });
 
-        const stream = new TestStream(
+        const stream = TestStream.create(
             [
-                new NestedStream(
-                    [new TwiceNestedStream(["milk"], { owner: me })],
-                    { owner: me }
+                NestedStream.create(
+                    [TwiceNestedStream.create(["milk"], { owner: me })],
+                    { owner: me },
                 ),
             ],
-            { owner: me }
+            { owner: me },
         );
 
         return { me, stream };
@@ -78,9 +74,9 @@ describe("CoStream resolution", async () => {
 
     test("Construction", async () => {
         const { me, stream } = await initNodeAndStream();
-        expect(
-            stream.by[me.id]?.value?.by[me.id]?.value?.by[me.id]?.value
-        ).toEqual("milk");
+        expect(stream[me.id]?.value?.[me.id]?.value?.[me.id]?.value).toEqual(
+            "milk",
+        );
     });
 
     test("Loading and availability", async () => {
@@ -88,80 +84,87 @@ describe("CoStream resolution", async () => {
         const [initialAsPeer, secondPeer] = connectedPeers(
             "initial",
             "second",
-            { peer1role: "server", peer2role: "client" }
+            { peer1role: "server", peer2role: "client" },
         );
+        if (!isControlledAccount(me)) { throw("me is not a controlled account") }
         me._raw.core.node.syncManager.addPeer(secondPeer);
         const meOnSecondPeer = await Account.become({
             accountID: me.id,
             accountSecret: me._raw.agentSecret,
             peersToLoadFrom: [initialAsPeer],
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             sessionID: newRandomSessionID(me.id as any),
+            crypto: Crypto,
         });
 
-        const loadedStream = await TestStream.load(stream.id, {
-            as: meOnSecondPeer,
-        });
+        const loadedStream = await TestStream.load(
+            stream.id,
+            meOnSecondPeer,
+            []
+        );
 
-        expect(loadedStream?.by[me.id]?.value).toEqual(null);
-        expect(loadedStream?.by[me.id]?.ref?.id).toEqual(
-            stream.by[me.id]?.value?.id
+        expect(loadedStream?.[me.id]?.value).toEqual(null);
+        expect(loadedStream?.[me.id]?.ref?.id).toEqual(
+            stream[me.id]?.value?.id,
         );
 
         const loadedNestedStream = await NestedStream.load(
-            stream.by[me.id]!.value!.id,
-            { as: meOnSecondPeer }
+            stream[me.id]!.value!.id,
+            meOnSecondPeer,
+            []
         );
 
-        // expect(loadedStream?.by[me.id]?.value).toEqual(loadedNestedStream);
-        expect(loadedStream?.by[me.id]?.value?.id).toEqual(
-            loadedNestedStream?.id
+        // expect(loadedStream?.[me.id]?.value).toEqual(loadedNestedStream);
+        expect(loadedStream?.[me.id]?.value?.id).toEqual(
+            loadedNestedStream?.id,
         );
-        expect(loadedStream?.by[me.id]?.value?.by[me.id]?.value).toEqual(null);
-        // expect(loadedStream?.by[me.id]?.ref?.value).toEqual(loadedNestedStream);
-        expect(loadedStream?.by[me.id]?.ref?.value?.id).toEqual(
-            loadedNestedStream?.id
+        expect(loadedStream?.[me.id]?.value?.[me.id]?.value).toEqual(null);
+        // expect(loadedStream?.[me.id]?.ref?.value).toEqual(loadedNestedStream);
+        expect(loadedStream?.[me.id]?.ref?.value?.id).toEqual(
+            loadedNestedStream?.id,
         );
-        expect(loadedStream?.by[me.id]?.value?.by[me.id]?.ref?.id).toEqual(
-            stream.by[me.id]?.value?.by[me.id]?.value?.id
+        expect(loadedStream?.[me.id]?.value?.[me.id]?.ref?.id).toEqual(
+            stream[me.id]?.value?.[me.id]?.value?.id,
         );
 
         const loadedTwiceNestedStream = await TwiceNestedStream.load(
-            stream.by[me.id]!.value!.by[me.id]!.value!.id,
-            { as: meOnSecondPeer }
+            stream[me.id]!.value![me.id]!.value!.id,
+            meOnSecondPeer,
+            []
         );
 
-        // expect(loadedStream?.by[me.id]?.value?.by[me.id]?.value).toEqual(
+        // expect(loadedStream?.[me.id]?.value?.[me.id]?.value).toEqual(
         //     loadedTwiceNestedStream
         // );
-        expect(loadedStream?.by[me.id]?.value?.by[me.id]?.value?.id).toEqual(
-            loadedTwiceNestedStream?.id
+        expect(loadedStream?.[me.id]?.value?.[me.id]?.value?.id).toEqual(
+            loadedTwiceNestedStream?.id,
         );
         expect(
-            loadedStream?.by[me.id]?.value?.by[me.id]?.value?.fancyValueOf(
-                me.id
-            )
+            loadedStream?.[me.id]?.value?.[me.id]?.value?.fancyValueOf(me.id),
         ).toEqual("Sir milk");
-        // expect(loadedStream?.by[me.id]?.ref?.value).toEqual(loadedNestedStream);
-        expect(loadedStream?.by[me.id]?.ref?.value?.id).toEqual(loadedNestedStream?.id);
-        expect(loadedStream?.by[me.id]?.value?.by[me.id]?.ref?.value?.id).toEqual(
-            loadedTwiceNestedStream?.id
+        // expect(loadedStream?.[me.id]?.ref?.value).toEqual(loadedNestedStream);
+        expect(loadedStream?.[me.id]?.ref?.value?.id).toEqual(
+            loadedNestedStream?.id,
+        );
+        expect(loadedStream?.[me.id]?.value?.[me.id]?.ref?.value?.id).toEqual(
+            loadedTwiceNestedStream?.id,
         );
 
-        const otherNestedStream = new NestedStream(
-            [new TwiceNestedStream(["butter"], { owner: meOnSecondPeer })],
-            { owner: meOnSecondPeer }
+        const otherNestedStream = NestedStream.create(
+            [TwiceNestedStream.create(["butter"], { owner: meOnSecondPeer })],
+            { owner: meOnSecondPeer },
         );
         loadedStream?.push(otherNestedStream);
-        // expect(loadedStream?.by[me.id]?.value).toEqual(otherNestedStream);
-        expect(loadedStream?.by[me.id]?.value?.id).toEqual(otherNestedStream?.id);
-        expect(loadedStream?.by[me.id]?.ref?.value?.id).toEqual(otherNestedStream?.id);
-        expect(loadedStream?.by[me.id]?.value?.by[me.id]?.value?.id).toEqual(
-            otherNestedStream.by[me.id]?.value?.id
+        // expect(loadedStream?.[me.id]?.value).toEqual(otherNestedStream);
+        expect(loadedStream?.[me.id]?.value?.id).toEqual(otherNestedStream?.id);
+        expect(loadedStream?.[me.id]?.ref?.value?.id).toEqual(
+            otherNestedStream?.id,
+        );
+        expect(loadedStream?.[me.id]?.value?.[me.id]?.value?.id).toEqual(
+            otherNestedStream[me.id]?.value?.id,
         );
         expect(
-            loadedStream?.by[me.id]?.value?.by[me.id]?.value?.fancyValueOf(
-                me.id
-            )
+            loadedStream?.[me.id]?.value?.[me.id]?.value?.fancyValueOf(me.id),
         ).toEqual("Sir butter");
     });
 
@@ -171,16 +174,17 @@ describe("CoStream resolution", async () => {
         const [initialAsPeer, secondAsPeer] = connectedPeers(
             "initial",
             "second",
-            { peer1role: "server", peer2role: "client" }
+            { peer1role: "server", peer2role: "client" },
         );
-
         me._raw.core.node.syncManager.addPeer(secondAsPeer);
-
+        if (!isControlledAccount(me)) { throw("me is not a controlled account") }
         const meOnSecondPeer = await Account.become({
             accountID: me.id,
             accountSecret: me._raw.agentSecret,
             peersToLoadFrom: [initialAsPeer],
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             sessionID: newRandomSessionID(me.id as any),
+            crypto: Crypto,
         });
 
         await Effect.runPromise(
@@ -188,57 +192,54 @@ describe("CoStream resolution", async () => {
                 const queue = yield* $(Queue.unbounded<TestStream>());
 
                 TestStream.subscribe(
-                    stream.id,
-                    { as: meOnSecondPeer },
+                    stream.id, meOnSecondPeer , [],
                     (subscribedStream) => {
                         console.log(
-                            "subscribedStream.by[me.id]",
-                            subscribedStream.by[me.id]
+                            "subscribedStream[me.id]",
+                            subscribedStream[me.id],
                         );
                         console.log(
-                            "subscribedStream.by[me.id]?.value?.by[me.id]?.value",
-                            subscribedStream.by[me.id]?.value?.by[me.id]?.value
+                            "subscribedStream[me.id]?.value?.[me.id]?.value",
+                            subscribedStream[me.id]?.value?.[me.id]?.value,
                         );
                         console.log(
-                            "subscribedStream.by[me.id]?.value?.by[me.id]?.value?.by[me.id]?.value",
-                            subscribedStream.by[me.id]?.value?.by[me.id]?.value
-                                ?.by[me.id]?.value
+                            "subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value",
+                            subscribedStream[me.id]?.value?.[me.id]?.value?.[
+                                me.id
+                            ]?.value,
+                        );
+                        void Effect.runPromise(
+                            Queue.offer(queue, subscribedStream),
                         );
-                        Effect.runPromise(Queue.offer(queue, subscribedStream));
-                    }
+                    },
                 );
 
-                type T = Simplify<TestStream>;
-                const te: T = stream;
-
                 const update1 = yield* $(Queue.take(queue));
-                expect(update1.by[me.id]?.value).toEqual(null);
+                expect(update1[me.id]?.value).toEqual(null);
 
                 const update2 = yield* $(Queue.take(queue));
-                expect(update2.by[me.id]?.value).toBeDefined();
-                expect(update2.by[me.id]?.value?.by[me.id]?.value).toBe(null);
+                expect(update2[me.id]?.value).toBeDefined();
+                expect(update2[me.id]?.value?.[me.id]?.value).toBe(null);
 
                 const update3 = yield* $(Queue.take(queue));
+                expect(update3[me.id]?.value?.[me.id]?.value).toBeDefined();
                 expect(
-                    update3.by[me.id]?.value?.by[me.id]?.value
-                ).toBeDefined();
-                expect(
-                    update3.by[me.id]?.value?.by[me.id]?.value?.by[me.id]?.value
+                    update3[me.id]?.value?.[me.id]?.value?.[me.id]?.value,
                 ).toBe("milk");
 
-                update3.by[me.id]!.value!.by[me.id]!.value!.push("bread");
+                update3[me.id]!.value![me.id]!.value!.push("bread");
 
                 const update4 = yield* $(Queue.take(queue));
                 expect(
-                    update4.by[me.id]?.value?.by[me.id]?.value?.by[me.id]?.value
+                    update4[me.id]?.value?.[me.id]?.value?.[me.id]?.value,
                 ).toBe("bread");
 
                 // When assigning a new nested stream, we get an update
-                const newTwiceNested = new TwiceNestedStream(["butter"], {
+                const newTwiceNested = TwiceNestedStream.create(["butter"], {
                     owner: meOnSecondPeer,
                 });
 
-                const newNested = new NestedStream([newTwiceNested], {
+                const newNested = NestedStream.create([newTwiceNested], {
                     owner: meOnSecondPeer,
                 });
 
@@ -246,26 +247,27 @@ describe("CoStream resolution", async () => {
 
                 const update5 = yield* $(Queue.take(queue));
                 expect(
-                    update5.by[me.id]?.value?.by[me.id]?.value?.by[me.id]?.value
+                    update5[me.id]?.value?.[me.id]?.value?.[me.id]?.value,
                 ).toBe("butter");
 
                 // we get updates when the new nested stream changes
                 newTwiceNested.push("jam");
                 const update6 = yield* $(Queue.take(queue));
                 expect(
-                    update6.by[me.id]?.value?.by[me.id]?.value?.by[me.id]?.value
+                    update6[me.id]?.value?.[me.id]?.value?.[me.id]?.value,
                 ).toBe("jam");
-            })
+            }),
         );
     });
 });
 
 describe("Simple BinaryCoStream operations", async () => {
     const me = await Account.create({
-        name: "Hermes Puggington",
+        creationProps: { name: "Hermes Puggington" },
+        crypto: Crypto,
     });
 
-    const stream = new BinaryCoStream(undefined, { owner: me });
+    const stream = BinaryCoStream.create({ owner: me });
 
     test("Construction", () => {
         expect(stream.getChunks()).toBe(undefined);
@@ -290,10 +292,11 @@ describe("Simple BinaryCoStream operations", async () => {
 describe("BinaryCoStream loading & Subscription", async () => {
     const initNodeAndStream = async () => {
         const me = await Account.create({
-            name: "Hermes Puggington",
+            creationProps: { name: "Hermes Puggington" },
+            crypto: Crypto,
         });
 
-        const stream = new BinaryCoStream(undefined, { owner: me });
+        const stream = BinaryCoStream.create({ owner: me });
 
         stream.start({ mimeType: "text/plain" });
         stream.push(new Uint8Array([1, 2, 3]));
@@ -304,7 +307,7 @@ describe("BinaryCoStream loading & Subscription", async () => {
     };
 
     test("Construction", async () => {
-        const { me, stream } = await initNodeAndStream();
+        const { stream } = await initNodeAndStream();
         expect(stream.getChunks()).toEqual({
             mimeType: "text/plain",
             chunks: [new Uint8Array([1, 2, 3]), new Uint8Array([4, 5, 6])],
@@ -317,19 +320,24 @@ describe("BinaryCoStream loading & Subscription", async () => {
         const [initialAsPeer, secondAsPeer] = connectedPeers(
             "initial",
             "second",
-            { peer1role: "server", peer2role: "client" }
+            { peer1role: "server", peer2role: "client" },
         );
+        if (!isControlledAccount(me)) { throw("me is not a controlled account") }
         me._raw.core.node.syncManager.addPeer(secondAsPeer);
         const meOnSecondPeer = await Account.become({
             accountID: me.id,
             accountSecret: me._raw.agentSecret,
             peersToLoadFrom: [initialAsPeer],
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             sessionID: newRandomSessionID(me.id as any),
+            crypto: Crypto,
         });
 
-        const loadedStream = await BinaryCoStream.load(stream.id, {
-            as: meOnSecondPeer,
-        });
+        const loadedStream = await BinaryCoStream.load(
+            stream.id,
+            meOnSecondPeer,
+            []
+        );
 
         expect(loadedStream?.getChunks()).toEqual({
             mimeType: "text/plain",
@@ -341,21 +349,22 @@ describe("BinaryCoStream loading & Subscription", async () => {
     test("Subscription", async () => {
         const { me } = await initNodeAndStream();
 
-        const stream = new BinaryCoStream(undefined, { owner: me });
+        const stream = BinaryCoStream.create({ owner: me });
 
         const [initialAsPeer, secondAsPeer] = connectedPeers(
             "initial",
             "second",
-            { peer1role: "server", peer2role: "client" }
+            { peer1role: "server", peer2role: "client" },
         );
-
         me._raw.core.node.syncManager.addPeer(secondAsPeer);
-
+        if (!isControlledAccount(me)) { throw("me is not a controlled account") }
         const meOnSecondPeer = await Account.become({
             accountID: me.id,
             accountSecret: me._raw.agentSecret,
             peersToLoadFrom: [initialAsPeer],
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             sessionID: newRandomSessionID(me.id as any),
+            crypto: Crypto,
         });
 
         await Effect.runPromise(
@@ -363,11 +372,12 @@ describe("BinaryCoStream loading & Subscription", async () => {
                 const queue = yield* $(Queue.unbounded<BinaryCoStream>());
 
                 BinaryCoStream.subscribe(
-                    stream.id,
-                    { as: meOnSecondPeer },
+                    stream.id, meOnSecondPeer, [],
                     (subscribedStream) => {
-                        Effect.runPromise(Queue.offer(queue, subscribedStream));
-                    }
+                        void Effect.runPromise(
+                            Queue.offer(queue, subscribedStream),
+                        );
+                    },
                 );
 
                 const update1 = yield* $(Queue.take(queue));
@@ -422,7 +432,7 @@ describe("BinaryCoStream loading & Subscription", async () => {
                     totalSizeBytes: undefined,
                     finished: true,
                 });
-            })
+            }),
         );
     });
 });