cojson 0.13.28 → 0.13.30

package/package.json

@@ -25,20 +25,21 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.13.28",
+  "version": "0.13.30",
   "devDependencies": {
     "@opentelemetry/sdk-metrics": "^2.0.0",
     "typescript": "5.6.2"
   },
   "dependencies": {
-    "@noble/ciphers": "^0.1.3",
-    "@noble/curves": "^1.3.0",
-    "@noble/hashes": "^1.4.0",
+    "@noble/ciphers": "^1.3.0",
+    "@noble/curves": "^1.9.1",
+    "@noble/hashes": "^1.8.0",
     "@opentelemetry/api": "^1.9.0",
     "@scure/base": "1.2.1",
     "jazz-crypto-rs": "0.0.7",
     "neverthrow": "^7.0.1",
-    "queueueue": "^4.1.2"
+    "queueueue": "^4.1.2",
+    "unicode-segmenter": "^0.12.0"
   },
   "gitHead": "33c27053293b4801b968c61d5c4c989f93a67d13",
   "scripts": {

package/src/coValueCore/coValueCore.ts

@@ -67,7 +67,7 @@ export type AvailableCoValueCore = CoValueCore & { verified: VerifiedState };
 export const CO_VALUE_LOADING_CONFIG = {
   MAX_RETRIES: 1,
   TIMEOUT: 30_000,
-  RETRY_DELAY: 300,
+  RETRY_DELAY: 3000,
 };
 
 export class CoValueCore {
@@ -193,6 +193,20 @@ export class CoValueCore {
     });
   }
 
+  waitForAvailable(): Promise<CoValueCore> {
+    return new Promise<CoValueCore>((resolve) => {
+      const listener = (core: CoValueCore) => {
+        if (core.isAvailable()) {
+          resolve(core);
+          this.listeners.delete(listener);
+        }
+      };
+
+      this.listeners.add(listener);
+      listener(this);
+    });
+  }
+
   getStateForPeer(peerId: PeerID) {
     return this.peers.get(peerId);
   }
@@ -1030,6 +1044,11 @@ export class CoValueCore {
     });
     peer.trackLoadRequestSent(this.id);
 
+    const timeoutDuration =
+      peer.role === "storage"
+        ? CO_VALUE_LOADING_CONFIG.TIMEOUT * 10
+        : CO_VALUE_LOADING_CONFIG.TIMEOUT;
+
     return new Promise<void>((resolve) => {
       const markNotFound = () => {
         if (this.peers.get(peer.id)?.type === "pending") {
@@ -1041,7 +1060,7 @@ export class CoValueCore {
         }
       };
 
-      const timeout = setTimeout(markNotFound, CO_VALUE_LOADING_CONFIG.TIMEOUT);
+      const timeout = setTimeout(markNotFound, timeoutDuration);
       const removeCloseListener = peer.addCloseListener(markNotFound);
 
       const listener = (state: CoValueCore) => {

package/src/coValues/coPlainText.ts

@@ -1,7 +1,5 @@
-import {
-  AvailableCoValueCore,
-  CoValueCore,
-} from "../coValueCore/coValueCore.js";
+import { splitGraphemes } from "unicode-segmenter/grapheme";
+import { AvailableCoValueCore } from "../coValueCore/coValueCore.js";
 import { JsonObject } from "../jsonValue.js";
 import { DeletionOpPayload, OpID, RawCoList } from "./coList.js";
 
@@ -57,8 +55,6 @@ export class RawCoPlainText<
   /** @category 6. Meta */
   type = "coplaintext" as const;
 
-  private _segmenter: Intl.Segmenter;
-
   _cachedMapping: WeakMap<
     NonNullable<typeof this._cachedEntries>,
     PlaintextIdxMapping
@@ -67,11 +63,6 @@ export class RawCoPlainText<
   constructor(core: AvailableCoValueCore) {
     super(core);
     this._cachedMapping = new WeakMap();
-    if (!Intl.Segmenter) {
-      throw new Error(
-        "Intl.Segmenter is not supported. Use a polyfill to get coPlainText support in Jazz. (eg. https://formatjs.github.io/docs/polyfills/intl-segmenter/)",
-      );
-    }
 
     // Use locale from meta if provided, fallback to browser locale, or 'en' as last resort
     const effectiveLocale =
@@ -81,10 +72,6 @@ export class RawCoPlainText<
         ? (core.verified.header.meta.locale as string)
         : undefined) ||
       (typeof navigator !== "undefined" ? navigator.language : "en");
-
-    this._segmenter = new Intl.Segmenter(effectiveLocale, {
-      granularity: "grapheme",
-    });
   }
 
   get mapping() {
@@ -104,7 +91,7 @@ export class RawCoPlainText<
     let idxBefore = 0;
 
     for (const entry of entries) {
-      const idxAfter = idxBefore + entry.value.length;
+      const idxAfter = idxBefore + 1;
 
       mapping.opIDafterIdx[idxBefore] = entry.opID;
       mapping.opIDbeforeIdx[idxAfter] = entry.opID;
@@ -138,7 +125,7 @@ export class RawCoPlainText<
     text: string,
     privacy: "private" | "trusting" = "private",
   ) {
-    const graphemes = [...this._segmenter.segment(text)].map((g) => g.segment);
+    const graphemes = [...splitGraphemes(text)];
 
     if (idx === 0) {
       // For insertions at start, prepend each character in reverse
@@ -164,8 +151,12 @@ export class RawCoPlainText<
     text: string,
     privacy: "private" | "trusting" = "private",
   ) {
-    const graphemes = [...this._segmenter.segment(text)].map((g) => g.segment);
-    this.appendItems(graphemes, idx, privacy);
+    const graphemes = [...splitGraphemes(text)];
+    if (idx >= this.entries().length) {
+      this.appendItems(graphemes, idx - 1, privacy);
+    } else {
+      this.appendItems(graphemes, idx, privacy);
+    }
   }
 
   deleteRange(

package/src/coValues/group.ts

@@ -1,9 +1,6 @@
 import { base58 } from "@scure/base";
 import { CoID } from "../coValue.js";
-import {
-  AvailableCoValueCore,
-  CoValueCore,
-} from "../coValueCore/coValueCore.js";
+import { AvailableCoValueCore } from "../coValueCore/coValueCore.js";
 import { CoValueUniqueness } from "../coValueCore/verifiedState.js";
 import {
   CryptoProvider,
@@ -27,7 +24,6 @@ import { logger } from "../logger.js";
 import { AccountRole, Role } from "../permissions.js";
 import { expectGroup } from "../typeUtils/expectGroup.js";
 import {
-  ControlledAccount,
   ControlledAccountOrAgent,
   RawAccount,
   RawAccountID,
@@ -332,6 +328,8 @@ export class RawGroup<
     if (role === "writeOnly" || role === "writeOnlyInvite") {
       const previousRole = this.get(memberKey);
 
+      this.set(memberKey, role, "trusting");
+
       if (
         previousRole === "reader" ||
         previousRole === "writer" ||
@@ -340,7 +338,6 @@ export class RawGroup<
         this.rotateReadKey();
       }
 
-      this.set(memberKey, role, "trusting");
       this.internalCreateWriteOnlyKeyForMember(memberKey, agent);
     } else {
       const currentReadKey = this.core.getCurrentReadKey();

package/src/crypto/PureJSCrypto.ts

@@ -1,4 +1,4 @@
-import { xsalsa20, xsalsa20_poly1305 } from "@noble/ciphers/salsa";
+import { xsalsa20, xsalsa20poly1305 } from "@noble/ciphers/salsa";
 import { ed25519, x25519 } from "@noble/curves/ed25519";
 import { blake3 } from "@noble/hashes/blake3";
 import { base58 } from "@scure/base";
@@ -165,7 +165,7 @@ export class PureJSCrypto extends CryptoProvider<Blake3State> {
 
     const sharedSecret = x25519.getSharedSecret(senderPriv, sealerPub);
 
-    const sealedBytes = xsalsa20_poly1305(sharedSecret, nOnce).encrypt(
+    const sealedBytes = xsalsa20poly1305(sharedSecret, nOnce).encrypt(
       plaintext,
     );
 
@@ -188,7 +188,7 @@ export class PureJSCrypto extends CryptoProvider<Blake3State> {
 
     const sharedSecret = x25519.getSharedSecret(sealerPriv, senderPub);
 
-    const plaintext = xsalsa20_poly1305(sharedSecret, nOnce).decrypt(
+    const plaintext = xsalsa20poly1305(sharedSecret, nOnce).decrypt(
       sealedBytes,
     );
 

package/src/exports.ts

@@ -103,6 +103,9 @@ export const cojsonInternals = {
   getGroupDependentKey,
   disablePermissionErrors,
   CO_VALUE_LOADING_CONFIG,
+  setCoValueLoadingRetryDelay(delay: number) {
+    CO_VALUE_LOADING_CONFIG.RETRY_DELAY = delay;
+  },
 };
 
 export {

package/src/localNode.ts

@@ -345,6 +345,10 @@ export class LocalNode {
     while (true) {
       const coValue = this.getCoValue(id);
 
+      if (coValue.isAvailable()) {
+        return coValue;
+      }
+
       if (
         coValue.loadingState === "unknown" ||
         coValue.loadingState === "unavailable"
@@ -365,6 +369,7 @@ export class LocalNode {
       }
 
       const result = await coValue.waitForAvailableOrUnavailable();
+
       if (
         result.isAvailable() ||
         retries >= CO_VALUE_LOADING_CONFIG.MAX_RETRIES
@@ -372,9 +377,12 @@ export class LocalNode {
         return result;
       }
 
-      await new Promise((resolve) =>
-        setTimeout(resolve, CO_VALUE_LOADING_CONFIG.RETRY_DELAY),
-      );
+      await Promise.race([
+        new Promise((resolve) =>
+          setTimeout(resolve, CO_VALUE_LOADING_CONFIG.RETRY_DELAY),
+        ),
+        coValue.waitForAvailable(), // Stop waiting if the coValue becomes available
+      ]);
 
       retries++;
     }

package/src/tests/coPlainText.test.ts

@@ -1,28 +1,12 @@
 import { afterEach, expect, test, vi } from "vitest";
 import { expectPlainText } from "../coValue.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
-import { LocalNode } from "../localNode.js";
-import {
-  nodeWithRandomAgentAndSessionID,
-  randomAgentAndSessionID,
-} from "./testUtils.js";
+import { nodeWithRandomAgentAndSessionID } from "./testUtils.js";
 
 const Crypto = await WasmCrypto.create();
 
 afterEach(() => void vi.unstubAllGlobals());
 
-test("should throw on creation if Intl.Segmenter is not available", () => {
-  vi.stubGlobal("Intl", {
-    Segmenter: undefined,
-  });
-
-  const node = nodeWithRandomAgentAndSessionID();
-  const group = node.createGroup();
-  expect(() => group.createPlainText()).toThrow(
-    "Intl.Segmenter is not supported. Use a polyfill to get coPlainText support in Jazz. (eg. https://formatjs.github.io/docs/polyfills/intl-segmenter/)",
-  );
-});
-
 test("Empty CoPlainText works", () => {
   const node = nodeWithRandomAgentAndSessionID();
 
@@ -86,7 +70,7 @@ test("Can insert and delete in CoPlainText", () => {
   content.insertBefore(2, "😍", "trusting");
   expect(content.toString()).toEqual("He😍llo, world");
 
-  content.deleteRange({ from: 2, to: 4 }, "trusting");
+  content.deleteRange({ from: 2, to: 3 }, "trusting");
   expect(content.toString()).toEqual("Hello, world");
 });
 
@@ -204,3 +188,80 @@ test("insertBefore and insertAfter work as expected", () => {
   content.insertBefore(0, "!", "trusting"); // "!hey"
   expect(content.toString()).toEqual("!hey");
 });
+
+test("Can delete a single grapheme", () => {
+  const node = nodeWithRandomAgentAndSessionID();
+  const coValue = node.createCoValue({
+    type: "coplaintext",
+    ruleset: { type: "unsafeAllowAll" },
+    meta: null,
+    ...Crypto.createdNowUnique(),
+  });
+  const content = expectPlainText(coValue.getCurrentContent());
+
+  content.insertAfter(0, "a̐éö̲", "trusting"); // 3 graphemes
+  content.deleteRange({ from: 1, to: 2 }, "trusting"); // delete the second grapheme
+  expect(content.toString()).toEqual("a̐ö̲");
+});
+
+test("Handles complex grapheme clusters correctly", () => {
+  const node = nodeWithRandomAgentAndSessionID();
+  const coValue = node.createCoValue({
+    type: "coplaintext",
+    ruleset: { type: "unsafeAllowAll" },
+    meta: null,
+    ...Crypto.createdNowUnique(),
+  });
+  const content = expectPlainText(coValue.getCurrentContent());
+
+  // Combining marks (should be treated as one grapheme each)
+  const combining = "a̐éö̲"; // 3 graphemes: [a̐][é][ö̲]
+  content.insertAfter(0, combining, "trusting");
+  expect(content.toString()).toEqual(combining);
+  content.deleteRange({ from: 1, to: 2 }, "trusting");
+  expect(content.toString()).toEqual("a̐ö̲");
+
+  // ZWJ emoji (family)
+  const family = "👨‍👩‍👧‍👦"; // 1 grapheme
+  content.insertAfter(2, family, "trusting");
+  expect(content.toString()).toEqual("a̐ö̲👨‍👩‍👧‍👦");
+  content.deleteRange({ from: 2, to: 3 }, "trusting");
+  expect(content.toString()).toEqual("a̐ö̲");
+
+  // Flag emoji (regional indicators)
+  const flag = "🇺🇸"; // 1 grapheme
+  content.insertAfter(2, flag, "trusting");
+  expect(content.toString()).toEqual("a̐ö̲🇺🇸");
+  content.deleteRange({ from: 2, to: 3 }, "trusting");
+  expect(content.toString()).toEqual("a̐ö̲");
+
+  // Emoji with skin tone modifier
+  const thumbsUp = "👍🏽"; // 1 grapheme
+  content.insertAfter(2, thumbsUp, "trusting");
+  expect(content.toString()).toEqual("a̐ö̲👍🏽");
+  content.deleteRange({ from: 2, to: 3 }, "trusting");
+  expect(content.toString()).toEqual("a̐ö̲");
+});
+
+test("Handle deletion of complex grapheme clusters correctly", () => {
+  const node = nodeWithRandomAgentAndSessionID();
+  const coValue = node.createCoValue({
+    type: "coplaintext",
+    ruleset: { type: "unsafeAllowAll" },
+    meta: null,
+    ...Crypto.createdNowUnique(),
+  });
+  const content = expectPlainText(coValue.getCurrentContent());
+
+  // Combining marks (should be treated as one grapheme each)
+  content.insertAfter(0, "👋 안녕!", "trusting");
+  expect(content.toString()).toEqual("👋 안녕!");
+
+  // Delete the first grapheme
+  content.deleteRange({ from: 0, to: 1 }, "trusting");
+  expect(content.toString()).toEqual(" 안녕!");
+
+  // Delete the second grapheme
+  content.deleteRange({ from: 1, to: 2 }, "trusting");
+  expect(content.toString()).toEqual(" 녕!");
+});

package/src/tests/crypto.test.ts

@@ -1,4 +1,4 @@
-import { xsalsa20_poly1305 } from "@noble/ciphers/salsa";
+import { xsalsa20poly1305 } from "@noble/ciphers/salsa";
 import { x25519 } from "@noble/curves/ed25519";
 import { blake3 } from "@noble/hashes/blake3";
 import { base58, base64url } from "@scure/base";
@@ -68,7 +68,7 @@ const pureJSCrypto = await PureJSCrypto.create();
         crypto.getSealerID(sender),
         nOnceMaterial,
       ),
-    ).toThrow(/Wrong tag/);
+    ).toThrow(name === "PureJSCrypto" ? "invalid tag" : "Wrong tag");
 
     // trying with wrong sealer secret, by hand
     const nOnce = blake3(
@@ -84,8 +84,8 @@ const pureJSCrypto = await PureJSCrypto.create();
     const sharedSecret = x25519.getSharedSecret(sealer3priv, senderPub);
 
     expect(() => {
-      const _ = xsalsa20_poly1305(sharedSecret, nOnce).decrypt(sealedBytes);
-    }).toThrow("Wrong tag");
+      const _ = xsalsa20poly1305(sharedSecret, nOnce).decrypt(sealedBytes);
+    }).toThrow("invalid tag");
   });
 
   test(`Hashing is deterministic [${name}]`, () => {
@@ -211,7 +211,7 @@ const pureJSCrypto = await PureJSCrypto.create();
 
     const plaintext = new TextEncoder().encode(data);
     const sharedSecret = x25519.getSharedSecret(senderPriv, sealerPub);
-    const sealedBytes = xsalsa20_poly1305(sharedSecret, nOnce).encrypt(
+    const sealedBytes = xsalsa20poly1305(sharedSecret, nOnce).encrypt(
       plaintext,
     );
     const sealed = `sealed_U${base64url.encode(sealedBytes)}`;