jazz-tools 0.13.4 → 0.13.5

package/dist/coValues/inbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../src/coValues/inbox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../src/coValues/inbox.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -35,7 +35,7 @@ import {
   parseInviteLink,
   randomSessionProvider,
   subscribeToCoValue
-} from "./chunk-JNC2UVYB.js";
+} from "./chunk-IYNL2EJM.js";
 
 // src/index.ts
 import { MAX_RECOMMENDED_TX_SIZE, cojsonInternals } from "cojson";

package/dist/testing.js

@@ -5,7 +5,7 @@ import {
   createAnonymousJazzContext,
   createJazzContext,
   randomSessionProvider
-} from "./chunk-JNC2UVYB.js";
+} from "./chunk-IYNL2EJM.js";
 
 // src/testing.ts
 import { LocalNode } from "cojson";

package/package.json

@@ -17,11 +17,11 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.13.4",
+  "version": "0.13.5",
   "dependencies": {
     "@scure/bip39": "^1.3.0",
     "fast-myers-diff": "^3.2.0",
-    "cojson": "0.13.2"
+    "cojson": "0.13.5"
   },
   "devDependencies": {
     "tsup": "8.3.5",

package/src/coValues/inbox.ts

@@ -61,10 +61,10 @@ type InboxMessage<I extends CoValue, O extends CoValue | undefined> = RawCoMap<{
   error: string | undefined;
 }>;
 
-function createInboxMessage<I extends CoValue, O extends CoValue | undefined>(
-  payload: I,
-  inboxOwner: RawAccount,
-) {
+async function createInboxMessage<
+  I extends CoValue,
+  O extends CoValue | undefined,
+>(payload: I, inboxOwner: RawAccount) {
   const group = payload._raw.group;
 
   if (group instanceof RawAccount) {
@@ -80,6 +80,9 @@ function createInboxMessage<I extends CoValue, O extends CoValue | undefined>(
     error: undefined,
   });
 
+  await payload._raw.core.waitForSync();
+  await message.core.waitForSync();
+
   return message;
 }
 
@@ -202,14 +205,18 @@ export class Inbox {
                 const stringifiedError = String(error);
                 errors.push(stringifiedError);
 
-                const inboxMessage = node
-                  .expectCoValueLoaded(item.value)
-                  .getCurrentContent() as RawCoMap;
+                let inboxMessage: RawCoMap | undefined;
 
-                inboxMessage.set("error", stringifiedError);
+                try {
+                  inboxMessage = node
+                    .expectCoValueLoaded(item.value)
+                    .getCurrentContent() as RawCoMap;
+
+                  inboxMessage.set("error", stringifiedError);
+                } catch (error) {}
 
                 if (errors.length > retries) {
-                  inboxMessage.set("processed", true);
+                  inboxMessage?.set("processed", true);
                   this.processed.push(txKey);
                   this.failed.push({ errors, value: item.value });
                 } else {
@@ -227,7 +234,12 @@ export class Inbox {
       }
     };
 
-    return this.messages.subscribe(handleNewMessages);
+    const unsubscribe = this.messages.subscribe(handleNewMessages);
+
+    return () => {
+      unsubscribe();
+      clearFailTimer();
+    };
   }
 
   static async load(account: Account) {
@@ -286,8 +298,10 @@ export class InboxSender<I extends CoValue, O extends CoValue | undefined> {
     return this.owner;
   }
 
-  sendMessage(message: I): Promise<O extends CoValue ? ID<O> : undefined> {
-    const inboxMessage = createInboxMessage<I, O>(message, this.owner);
+  async sendMessage(
+    message: I,
+  ): Promise<O extends CoValue ? ID<O> : undefined> {
+    const inboxMessage = await createInboxMessage<I, O>(message, this.owner);
 
     this.messages.push(inboxMessage.id);
 

package/src/tests/inbox.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import { Account } from "../coValues/account";
 import { CoMap } from "../coValues/coMap";
 import { Group } from "../coValues/group";
@@ -191,6 +191,8 @@ describe("Inbox", () => {
       },
     );
 
+    const errorLogSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+
     const unsubscribe = receiverInbox.subscribe(Message, async () => {
       return Promise.reject(new Error("Failed"));
     });
@@ -203,6 +205,13 @@ describe("Inbox", () => {
     );
 
     unsubscribe();
+
+    expect(errorLogSpy).toHaveBeenCalledWith(
+      "Error processing inbox message",
+      expect.any(Error),
+    );
+
+    errorLogSpy.mockRestore();
   });
 
   it("should mark messages as processed", async () => {
@@ -297,6 +306,7 @@ describe("Inbox", () => {
         owner: Group.create({ owner: sender }),
       },
     );
+    const errorLogSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
     // Setup inbox sender
     const inboxSender = await InboxSender.load(receiver.id, sender);
@@ -319,5 +329,51 @@ describe("Inbox", () => {
     const [failed] = Object.values(receiverInbox.failed.items).flat();
     expect(failed?.value.errors.length).toBe(3);
     unsubscribe();
+
+    expect(errorLogSpy).toHaveBeenCalledWith(
+      "Error processing inbox message",
+      expect.any(Error),
+    );
+
+    errorLogSpy.mockRestore();
+  });
+
+  it("should not break the subscription if the message is unavailable", async () => {
+    const { clientAccount: sender, serverAccount: receiver } =
+      await setupTwoNodes();
+
+    const receiverInbox = await Inbox.load(receiver);
+
+    const inboxSender = await InboxSender.load(receiver.id, sender);
+    inboxSender.messages.push(`co_z123234` as any);
+
+    const spy = vi.fn();
+
+    const errorLogSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+
+    // Subscribe to inbox messages
+    const unsubscribe = receiverInbox.subscribe(
+      Message,
+      async () => {
+        spy();
+      },
+      { retries: 2 },
+    );
+
+    await waitFor(() => {
+      const [failed] = Object.values(receiverInbox.failed.items).flat();
+
+      expect(failed?.value.errors.length).toBe(3);
+    });
+
+    expect(spy).not.toHaveBeenCalled();
+    unsubscribe();
+
+    expect(errorLogSpy).toHaveBeenCalledWith(
+      "Error processing inbox message",
+      expect.any(Error),
+    );
+
+    errorLogSpy.mockRestore();
   });
 });