jazz-tools 0.13.16 → 0.13.18

package/src/tests/ContextManager.test.ts

@@ -113,7 +113,7 @@ describe("ContextManager", () => {
 
     const credentials = {
       accountID: account.id,
-      accountSecret: account._raw.core.node.account.agentSecret,
+      accountSecret: account._raw.core.node.getCurrentAgent().agentSecret,
       provider: "test",
     };
 
@@ -130,7 +130,7 @@ describe("ContextManager", () => {
 
     const credentials = {
       accountID: account.id,
-      accountSecret: account._raw.core.node.account.agentSecret,
+      accountSecret: account._raw.core.node.getCurrentAgent().agentSecret,
       provider: "test",
     };
 
@@ -193,7 +193,7 @@ describe("ContextManager", () => {
     // Authenticate with credentials
     await manager.authenticate({
       accountID: account.id,
-      accountSecret: account._raw.core.node.account.agentSecret,
+      accountSecret: account._raw.core.node.getCurrentAgent().agentSecret,
       provider: "test",
     });
 
@@ -207,7 +207,7 @@ describe("ContextManager", () => {
 
     await manager.getAuthSecretStorage().set({
       accountID: account.id,
-      accountSecret: account._raw.core.node.account.agentSecret,
+      accountSecret: account._raw.core.node.getCurrentAgent().agentSecret,
       provider: "test",
     });
 
@@ -217,7 +217,7 @@ describe("ContextManager", () => {
     // Authenticate with same credentials
     await manager.authenticate({
       accountID: account.id,
-      accountSecret: account._raw.core.node.account.agentSecret,
+      accountSecret: account._raw.core.node.getCurrentAgent().agentSecret,
       provider: "test",
     });
 
@@ -253,9 +253,11 @@ describe("ContextManager", () => {
       customManager.getCurrentValue() as JazzAuthContext<CustomAccount>
     ).me;
 
+    console.log("before", account._refs.root?.id);
+
     await customManager.authenticate({
       accountID: account.id,
-      accountSecret: account._raw.core.node.account.agentSecret,
+      accountSecret: account._raw.core.node.getCurrentAgent().agentSecret,
       provider: "test",
     });
 
@@ -263,6 +265,8 @@ describe("ContextManager", () => {
       resolve: { root: true },
     });
 
+    console.log("after", me._refs.root?.id);
+
     expect(me.root.id).toBe(lastRootId);
   });
 
@@ -299,7 +303,7 @@ describe("ContextManager", () => {
 
     await customManager.authenticate({
       accountID: account.id,
-      accountSecret: account._raw.core.node.account.agentSecret,
+      accountSecret: account._raw.core.node.getCurrentAgent().agentSecret,
       provider: "test",
     });
 
@@ -365,7 +369,7 @@ describe("ContextManager", () => {
 
     await customManager.authenticate({
       accountID: account.id,
-      accountSecret: account._raw.core.node.account.agentSecret,
+      accountSecret: account._raw.core.node.getCurrentAgent().agentSecret,
       provider: "test",
     });
 
@@ -408,7 +412,7 @@ describe("ContextManager", () => {
 
     await manager.getAuthSecretStorage().set({
       accountID: account.id,
-      accountSecret: account._raw.core.node.account.agentSecret,
+      accountSecret: account._raw.core.node.getCurrentAgent().agentSecret,
       provider: "test",
     });
 

package/src/tests/coFeed.test.ts

@@ -117,7 +117,7 @@ describe("CoFeed resolution", async () => {
       await createJazzContextFromExistingCredentials({
         credentials: {
           accountID: me.id,
-          secret: me._raw.agentSecret,
+          secret: me._raw.core.node.getCurrentAgent().agentSecret,
         },
         sessionProvider: randomSessionProvider,
         peersToLoadFrom: [initialAsPeer],
@@ -203,7 +203,7 @@ describe("CoFeed resolution", async () => {
       await createJazzContextFromExistingCredentials({
         credentials: {
           accountID: me.id,
-          secret: me._raw.agentSecret,
+          secret: me._raw.core.node.getCurrentAgent().agentSecret,
         },
         sessionProvider: randomSessionProvider,
         peersToLoadFrom: [initialAsPeer],
@@ -257,6 +257,50 @@ describe("CoFeed resolution", async () => {
     const update6 = (await queue.next()).value;
     expect(update6[me.id]?.value?.[me.id]?.value?.[me.id]?.value).toBe("jam");
   });
+
+  test("Subscription without options", async () => {
+    const { me, stream } = await initNodeAndStream();
+
+    const [initialAsPeer, secondAsPeer] = connectedPeers("initial", "second", {
+      peer1role: "server",
+      peer2role: "client",
+    });
+    if (!isControlledAccount(me)) {
+      throw "me is not a controlled account";
+    }
+    me._raw.core.node.syncManager.addPeer(secondAsPeer);
+
+    await createJazzContextFromExistingCredentials({
+      credentials: {
+        accountID: me.id,
+        secret: me._raw.core.node.getCurrentAgent().agentSecret,
+      },
+      sessionProvider: randomSessionProvider,
+      peersToLoadFrom: [initialAsPeer],
+      crypto: Crypto,
+    });
+
+    const queue = new cojsonInternals.Channel();
+
+    TestStream.subscribe(stream.id, (subscribedStream) => {
+      void queue.push(subscribedStream);
+    });
+
+    const update1 = (await queue.next()).value;
+    expect(update1[me.id]?.value).toEqual(null);
+
+    const update2 = (await queue.next()).value;
+    expect(update2[me.id]?.value?.[me.id]?.value).toEqual(null);
+
+    const update3 = (await queue.next()).value;
+    expect(update3[me.id]?.value?.[me.id]?.value).toBeDefined();
+    expect(update3[me.id]?.value?.[me.id]?.value?.[me.id]?.value).toBe("milk");
+
+    update3[me.id]!.value![me.id]!.value!.push("bread");
+
+    const update4 = (await queue.next()).value;
+    expect(update4[me.id]?.value?.[me.id]?.value?.[me.id]?.value).toBe("bread");
+  });
 });
 
 describe("Simple FileStream operations", async () => {
@@ -327,7 +371,7 @@ describe("FileStream loading & Subscription", async () => {
       await createJazzContextFromExistingCredentials({
         credentials: {
           accountID: me.id,
-          secret: me._raw.agentSecret,
+          secret: me._raw.core.node.getCurrentAgent().agentSecret,
         },
         sessionProvider: randomSessionProvider,
         peersToLoadFrom: [initialAsPeer],
@@ -361,7 +405,7 @@ describe("FileStream loading & Subscription", async () => {
       await createJazzContextFromExistingCredentials({
         credentials: {
           accountID: me.id,
-          secret: me._raw.agentSecret,
+          secret: me._raw.core.node.getCurrentAgent().agentSecret,
         },
         sessionProvider: randomSessionProvider,
         peersToLoadFrom: [initialAsPeer],
@@ -425,6 +469,62 @@ describe("FileStream loading & Subscription", async () => {
       finished: true,
     });
   });
+
+  test("Subscription without options", async () => {
+    const { me } = await initNodeAndStream();
+    const stream = FileStream.create({ owner: me });
+
+    const [initialAsPeer, secondAsPeer] = connectedPeers("initial", "second", {
+      peer1role: "server",
+      peer2role: "client",
+    });
+    me._raw.core.node.syncManager.addPeer(secondAsPeer);
+    if (!isControlledAccount(me)) {
+      throw "me is not a controlled account";
+    }
+    await createJazzContextFromExistingCredentials({
+      credentials: {
+        accountID: me.id,
+        secret: me._raw.core.node.getCurrentAgent().agentSecret,
+      },
+      sessionProvider: randomSessionProvider,
+      peersToLoadFrom: [initialAsPeer],
+      crypto: Crypto,
+    });
+
+    const queue = new cojsonInternals.Channel();
+
+    FileStream.subscribe(stream.id, (subscribedStream) => {
+      void queue.push(subscribedStream);
+    });
+
+    // Initial state
+    const update1 = (await queue.next()).value;
+    expect(update1.getChunks()).toBe(undefined);
+
+    // Start the stream
+    stream.start({ mimeType: "text/plain" });
+    const update2 = (await queue.next()).value;
+    expect(update2.getChunks({ allowUnfinished: true })).toMatchObject({
+      mimeType: "text/plain",
+      finished: false,
+    });
+
+    // Push a chunk
+    stream.push(new Uint8Array([1, 2, 3]));
+    const update3 = (await queue.next()).value;
+    expect(update3.getChunks({ allowUnfinished: true })?.chunks).toHaveLength(
+      1,
+    );
+    expect(update3.getChunks({ allowUnfinished: true })?.chunks?.[0]).toEqual(
+      new Uint8Array([1, 2, 3]),
+    );
+
+    // End the stream
+    stream.end();
+    const update4 = (await queue.next()).value;
+    expect(update4.getChunks()?.finished).toBe(true);
+  });
 });
 
 describe("FileStream.loadAsBlob", async () => {