cojson 0.7.35 → 0.8.3

package/src/PeerState.ts

@@ -7,12 +7,25 @@ import {
 import { CoValueKnownState, Peer, SyncMessage } from "./sync.js";
 
 export class PeerState {
+    constructor(private peer: Peer) {}
+
     readonly optimisticKnownStates: { [id: RawCoID]: CoValueKnownState } = {};
     readonly toldKnownState: Set<RawCoID> = new Set();
-    readonly id = this.peer.id;
-    readonly role = this.peer.role;
-    readonly priority = this.peer.priority;
-    readonly crashOnClose = this.peer.crashOnClose;
+    get id() {
+        return this.peer.id;
+    }
+
+    get role() {
+        return this.peer.role;
+    }
+
+    get priority() {
+        return this.peer.priority;
+    }
+
+    get crashOnClose() {
+        return this.peer.crashOnClose;
+    }
 
     /**
      * We set as default priority HIGH to handle all the messages without a
@@ -24,8 +37,6 @@ export class PeerState {
     private processing = false;
     public closed = false;
 
-    constructor(private peer: Peer) {}
-
     async processQueue() {
         if (this.processing) {
             return;
@@ -37,7 +48,7 @@ export class PeerState {
         let entry: QueueEntry | undefined;
         while ((entry = this.queue.pull())) {
             // Awaiting the push to send one message at a time
-            // This way when the peer is "under pressure" we can enqueue all 
+            // This way when the peer is "under pressure" we can enqueue all
             // the coming messages and organize them by priority
             await this.peer.outgoing
                 .push(entry.msg)

package/src/coValue.ts

@@ -5,7 +5,7 @@ import { RawBinaryCoStream, RawCoStream } from "./coValues/coStream.js";
 import { RawCoList } from "./coValues/coList.js";
 import { CoValueCore } from "./coValueCore.js";
 import { RawGroup } from "./coValues/group.js";
-import { RawAccount, Profile } from "./index.js";
+import { RawAccount, RawProfile as Profile } from "./coValues/account.js";
 
 export type CoID<T extends RawCoValue> = RawCoID & {
     readonly __type: T;

package/src/coValueCore.ts

@@ -10,7 +10,6 @@ import {
     SignerID,
 } from "./crypto/crypto.js";
 import { JsonObject, JsonValue } from "./jsonValue.js";
-import { base58 } from "@scure/base";
 import {
     PermissionsDef as RulesetDef,
     determineValidTransactions,
@@ -19,8 +18,8 @@ import {
 import { RawGroup } from "./coValues/group.js";
 import { LocalNode, ResolveAccountAgentError } from "./localNode.js";
 import { CoValueKnownState, NewContentMessage } from "./sync.js";
-import { AgentID, RawCoID, SessionID, TransactionID } from "./ids.js";
-import { AccountID, ControlledAccountOrAgent } from "./coValues/account.js";
+import { RawCoID, SessionID, TransactionID } from "./ids.js";
+import { RawAccountID, ControlledAccountOrAgent } from "./coValues/account.js";
 import { Stringified, parseJSON, stableStringify } from "./jsonStringify.js";
 import { coreToCoValue } from "./coreToCoValue.js";
 import { expectGroup } from "./typeUtils/expectGroup.js";
@@ -42,8 +41,11 @@ export type CoValueHeader = {
     type: AnyRawCoValue["type"];
     ruleset: RulesetDef;
     meta: JsonObject | null;
-    createdAt: `2${string}` | null;
-    uniqueness: `z${string}` | null;
+} & CoValueUniqueness;
+
+export type CoValueUniqueness = {
+    uniqueness: JsonValue;
+    createdAt?: `2${string}` | null;
 };
 
 export function idforHeader(
@@ -54,13 +56,6 @@ export function idforHeader(
     return `co_z${hash.slice("shortHash_z".length)}`;
 }
 
-export function newRandomSessionID(accountID: AccountID | AgentID): SessionID {
-    return `${accountID}_session_z${base58.encode(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (globalThis as any).crypto.getRandomValues(new Uint8Array(8)),
-    )}`;
-}
-
 type SessionLog = {
     transactions: Transaction[];
     lastHash?: Hash;
@@ -993,7 +988,7 @@ export class CoValueCore {
         return this.header.ruleset.type === "group"
             ? expectGroup(this.getCurrentContent())
                   .keys()
-                  .filter((k): k is AccountID => k.startsWith("co_"))
+                  .filter((k): k is RawAccountID => k.startsWith("co_"))
             : this.header.ruleset.type === "ownedByGroup"
               ? [
                     this.header.ruleset.group,
@@ -1005,7 +1000,7 @@ export class CoValueCore {
                                 ),
                             )
                             .filter(
-                                (session): session is AccountID =>
+                                (session): session is RawAccountID =>
                                     isAccountID(session) && session !== this.id,
                             ),
                     ),

package/src/coValues/account.ts

@@ -1,4 +1,8 @@
-import { CoValueCore, CoValueHeader } from "../coValueCore.js";
+import {
+    CoValueCore,
+    CoValueHeader,
+    CoValueUniqueness,
+} from "../coValueCore.js";
 import { CoID, RawCoValue } from "../coValue.js";
 import {
     AgentSecret,
@@ -11,9 +15,9 @@ import {
 import { AgentID } from "../ids.js";
 import { RawCoMap } from "./coMap.js";
 import { RawGroup, InviteSecret } from "./group.js";
-import { LocalNode } from "../index.js";
 import { JsonObject } from "../jsonValue.js";
 import { err, ok, Result } from "neverthrow";
+import { LocalNode } from "../localNode.js";
 
 export function accountHeaderForInitialAgentSecret(
     agentSecret: AgentSecret,
@@ -63,7 +67,7 @@ export class RawAccount<
 }
 
 export interface ControlledAccountOrAgent {
-    id: AccountID | AgentID;
+    id: RawAccountID | AgentID;
     agentSecret: AgentSecret;
 
     currentAgentID: () => Result<AgentID, InvalidAccountAgentIDError>;
@@ -92,8 +96,10 @@ export class RawControlledAccount<Meta extends AccountMeta = AccountMeta>
      * Creates a new group (with the current account as the group's first admin).
      * @category 1. High-level
      */
-    createGroup() {
-        return this.core.node.createGroup();
+    createGroup(
+        uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique(),
+    ) {
+        return this.core.node.createGroup(uniqueness);
     }
 
     async acceptInvite<T extends RawCoValue>(
@@ -133,7 +139,6 @@ export class RawControlledAccount<Meta extends AccountMeta = AccountMeta>
     }
 }
 
-/** @hidden */
 export class ControlledAgent implements ControlledAccountOrAgent {
     constructor(
         public agentSecret: AgentSecret,
@@ -170,7 +175,7 @@ export class ControlledAgent implements ControlledAccountOrAgent {
 }
 
 export type AccountMeta = { type: "account" };
-export type AccountID = CoID<RawAccount>;
+export type RawAccountID = CoID<RawAccount>;
 
 export type ProfileShape = {
     name: string;

package/src/coValues/coList.ts

@@ -4,7 +4,7 @@ import { isCoValue } from "../typeUtils/isCoValue.js";
 import { CoValueCore } from "../coValueCore.js";
 import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
 import { AgentID, SessionID, TransactionID } from "../ids.js";
-import { AccountID } from "./account.js";
+import { RawAccountID } from "./account.js";
 import { RawGroup } from "./group.js";
 
 type OpID = TransactionID & { changeIdx: number };
@@ -325,7 +325,7 @@ export class RawCoListView<
     /** @category 5. Edit history */
     editAt(idx: number):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value: Item;
@@ -351,13 +351,13 @@ export class RawCoListView<
 
     /** @category 5. Edit history */
     deletionEdits(): {
-        by: AccountID | AgentID;
+        by: RawAccountID | AgentID;
         tx: TransactionID;
         at: Date;
         // TODO: add indices that are now before and after the deleted item
     }[] {
         const edits: {
-            by: AccountID | AgentID;
+            by: RawAccountID | AgentID;
             tx: TransactionID;
             at: Date;
         }[] = [];

package/src/coValues/coMap.ts

@@ -4,7 +4,7 @@ import { CoID, RawCoValue } from "../coValue.js";
 import { isCoValue } from "../typeUtils/isCoValue.js";
 import { CoValueCore } from "../coValueCore.js";
 import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
-import { AccountID } from "./account.js";
+import { RawAccountID } from "./account.js";
 import type { RawGroup } from "./group.js";
 
 type MapOp<K extends string, V extends JsonValue | undefined> = {
@@ -196,7 +196,7 @@ export class RawCoMapView<
         n: number,
     ):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value?: Shape[K];
@@ -226,7 +226,7 @@ export class RawCoMapView<
         key: K,
     ):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value?: Shape[K];

package/src/coValues/coStream.ts

@@ -7,7 +7,7 @@ import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfrom
 import { RawGroup } from "./group.js";
 import { AgentID, SessionID, TransactionID } from "../ids.js";
 import { base64URLtoBytes, bytesToBase64url } from "../base64url.js";
-import { AccountID } from "./account.js";
+import { RawAccountID } from "./account.js";
 
 export type BinaryStreamInfo = {
     mimeType: string;
@@ -116,7 +116,7 @@ export class RawCoStreamView<
         return Object.keys(this.items) as SessionID[];
     }
 
-    accounts(): Set<AccountID> {
+    accounts(): Set<RawAccountID> {
         return new Set(
             this.sessions()
                 .map(accountOrAgentIDfromSessionID)
@@ -129,7 +129,7 @@ export class RawCoStreamView<
         n: number,
     ):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value: Item;
@@ -151,7 +151,7 @@ export class RawCoStreamView<
 
     lastItemIn(sessionID: SessionID):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value: Item;
@@ -175,9 +175,9 @@ export class RawCoStreamView<
         }
     }
 
-    lastItemBy(account: AccountID | AgentID):
+    lastItemBy(account: RawAccountID | AgentID):
         | {
-              by: AccountID | AgentID;
+              by: RawAccountID | AgentID;
               tx: TransactionID;
               at: Date;
               value: Item;
@@ -185,7 +185,7 @@ export class RawCoStreamView<
         | undefined {
         let latestItem:
             | {
-                  by: AccountID | AgentID;
+                  by: RawAccountID | AgentID;
                   tx: TransactionID;
                   at: Date;
                   value: Item;
@@ -210,7 +210,7 @@ export class RawCoStreamView<
         return latestItem;
     }
 
-    *itemsBy(account: AccountID | AgentID) {
+    *itemsBy(account: RawAccountID | AgentID) {
         // TODO: this can be made more lazy without a huge collect and sort
         const items = [
             ...Object.keys(this.items).flatMap((sessionID) =>

package/src/coValues/group.ts

@@ -5,9 +5,10 @@ import { JsonObject } from "../jsonValue.js";
 import { RawBinaryCoStream, RawCoStream } from "./coStream.js";
 import { Encrypted, KeyID, KeySecret, Sealed } from "../crypto/crypto.js";
 import { AgentID, isAgentID } from "../ids.js";
-import { RawAccount, AccountID, ControlledAccountOrAgent } from "./account.js";
+import { RawAccount, RawAccountID, ControlledAccountOrAgent } from "./account.js";
 import { Role } from "../permissions.js";
 import { base58 } from "@scure/base";
+import { CoValueUniqueness } from "../coValueCore.js";
 
 export const EVERYONE = "everyone" as const;
 export type Everyone = "everyone";
@@ -15,10 +16,10 @@ export type Everyone = "everyone";
 export type GroupShape = {
     profile: CoID<RawCoMap> | null;
     root: CoID<RawCoMap> | null;
-    [key: AccountID | AgentID]: Role;
+    [key: RawAccountID | AgentID]: Role;
     [EVERYONE]?: Role;
     readKey?: KeyID;
-    [revelationFor: `${KeyID}_for_${AccountID | AgentID}`]: Sealed<KeySecret>;
+    [revelationFor: `${KeyID}_for_${RawAccountID | AgentID}`]: Sealed<KeySecret>;
     [revelationFor: `${KeyID}_for_${Everyone}`]: KeySecret;
     [oldKeyForNewKey: `${KeyID}_for_${KeyID}`]: Encrypted<
         KeySecret,
@@ -55,12 +56,12 @@ export class RawGroup<
      *
      * @category 1. Role reading
      */
-    roleOf(accountID: AccountID): Role | undefined {
+    roleOf(accountID: RawAccountID): Role | undefined {
         return this.roleOfInternal(accountID);
     }
 
     /** @internal */
-    roleOfInternal(accountID: AccountID | AgentID): Role | undefined {
+    roleOfInternal(accountID: RawAccountID | AgentID): Role | undefined {
         return this.get(accountID);
     }
 
@@ -156,7 +157,7 @@ export class RawGroup<
             } else {
                 return false;
             }
-        }) as (AccountID | AgentID)[];
+        }) as (RawAccountID | AgentID)[];
 
         const maybeCurrentReadKey = this.core.getCurrentReadKey();
 
@@ -255,6 +256,7 @@ export class RawGroup<
         init?: M["_shape"],
         meta?: M["headerMeta"],
         initPrivacy: "trusting" | "private" = "private",
+        uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique()
     ): M {
         const map = this.core.node
             .createCoValue({
@@ -264,7 +266,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta || null,
-                ...this.core.crypto.createdNowUnique(),
+                ...uniqueness
             })
             .getCurrentContent() as M;
 
@@ -287,6 +289,7 @@ export class RawGroup<
         init?: L["_item"][],
         meta?: L["headerMeta"],
         initPrivacy: "trusting" | "private" = "private",
+        uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique()
     ): L {
         const list = this.core.node
             .createCoValue({
@@ -296,7 +299,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta || null,
-                ...this.core.crypto.createdNowUnique(),
+                ...uniqueness
             })
             .getCurrentContent() as L;
 
@@ -310,7 +313,7 @@ export class RawGroup<
     }
 
     /** @category 3. Value creation */
-    createStream<C extends RawCoStream>(meta?: C["headerMeta"]): C {
+    createStream<C extends RawCoStream>(meta?: C["headerMeta"], uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique()): C {
         return this.core.node
             .createCoValue({
                 type: "costream",
@@ -319,7 +322,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta || null,
-                ...this.core.crypto.createdNowUnique(),
+                ...uniqueness
             })
             .getCurrentContent() as C;
     }
@@ -327,6 +330,7 @@ export class RawGroup<
     /** @category 3. Value creation */
     createBinaryStream<C extends RawBinaryCoStream>(
         meta: C["headerMeta"] = { type: "binary" },
+        uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique()
     ): C {
         return this.core.node
             .createCoValue({
@@ -336,7 +340,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta,
-                ...this.core.crypto.createdNowUnique(),
+                ...uniqueness
             })
             .getCurrentContent() as C;
     }

package/src/crypto/PureJSCrypto.ts

@@ -36,6 +36,11 @@ export class PureJSCrypto extends CryptoProvider<Blake3State> {
         return blake3.create({});
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    cloneBlake3State(state: any): Blake3State {
+        return state.clone();
+    }
+
     blake3HashOnce(data: Uint8Array) {
         return blake3(data);
     }

package/src/crypto/WasmCrypto.ts

@@ -64,6 +64,10 @@ export class WasmCrypto extends CryptoProvider<Uint8Array> {
         return this.blake3Instance.init().save();
     }
 
+    cloneBlake3State(state: Uint8Array): Uint8Array {
+        return this.blake3Instance.load(state).save();
+    }
+
     blake3HashOnce(data: Uint8Array) {
         return this.blake3Instance.init().update(data).digest("binary");
     }

package/src/crypto/crypto.ts

@@ -2,6 +2,8 @@ import { JsonValue } from "../jsonValue.js";
 import { base58 } from "@scure/base";
 import { AgentID, RawCoID, TransactionID } from "../ids.js";
 import { Stringified, parseJSON, stableStringify } from "../jsonStringify.js";
+import { RawAccountID } from "../coValues/account.js";
+import { SessionID } from "../ids.js";
 
 export type SignerSecret = `signerSecret_z${string}`;
 export type SignerID = `signer_z${string}`;
@@ -102,6 +104,7 @@ export abstract class CryptoProvider<Blake3State = any> {
     }
 
     abstract emptyBlake3State(): Blake3State;
+    abstract cloneBlake3State(state: Blake3State): Blake3State;
     abstract blake3HashOnce(data: Uint8Array): Uint8Array;
     abstract blake3HashOnceWithContext(
         data: Uint8Array,
@@ -290,6 +293,10 @@ export abstract class CryptoProvider<Blake3State = any> {
             }),
         )}`;
     }
+
+    newRandomSessionID(accountID: RawAccountID | AgentID): SessionID {
+        return `${accountID}_session_z${base58.encode(this.randomBytes(8))}`;
+    }
 }
 
 export type Hash = `hash_z${string}`;
@@ -318,7 +325,10 @@ export class StreamingHash {
     }
 
     clone(): StreamingHash {
-        return new StreamingHash(this.crypto, new Uint8Array(this.state));
+        return new StreamingHash(
+            this.crypto,
+            this.crypto.cloneBlake3State(this.state),
+        );
     }
 }
 

package/src/ids.ts

@@ -1,4 +1,4 @@
-import { AccountID } from "./coValues/account.js";
+import { RawAccountID } from "./coValues/account.js";
 import { base58 } from "@scure/base";
 import { shortHashLength } from "./crypto/crypto.js";
 
@@ -28,4 +28,4 @@ export function isAgentID(id: string): id is AgentID {
     );
 }
 
-export type SessionID = `${AccountID | AgentID}_session_z${string}`;
+export type SessionID = `${RawAccountID | AgentID}_session_z${string}`;

package/src/{index.ts → index.native.ts}

@@ -1,6 +1,8 @@
+import { PureJSCrypto } from "./crypto/PureJSCrypto.js";
+
 import {
     CoValueCore,
-    newRandomSessionID,
+    type CoValueUniqueness,
     MAX_RECOMMENDED_TX_SIZE,
     idforHeader,
 } from "./coValueCore.js";
@@ -16,8 +18,6 @@ import {
     StreamingHash,
     CryptoProvider,
 } from "./crypto/crypto.js";
-import { WasmCrypto } from "./crypto/WasmCrypto.js";
-import { PureJSCrypto } from "./crypto/PureJSCrypto.js";
 import { connectedPeers, Channel } from "./streamUtils.js";
 import { ControlledAgent, RawControlledAccount } from "./coValues/account.js";
 import type { Role } from "./permissions.js";
@@ -50,7 +50,7 @@ import type {
 import { DisconnectedError, PingTimeoutError } from "./sync.js";
 import type { AgentSecret } from "./crypto/crypto.js";
 import type {
-    AccountID,
+    RawAccountID,
     AccountMeta,
     RawAccountMigration,
 } from "./coValues/account.js";
@@ -65,7 +65,6 @@ import { getPriorityFromHeader } from "./priority.js";
 
 /** @hidden */
 export const cojsonInternals = {
-    newRandomSessionID,
     connectedPeers,
     rawCoIDtoBytes,
     rawCoIDfromBytes,
@@ -98,7 +97,7 @@ export {
     CoID,
     AnyRawCoValue,
     RawAccount,
-    AccountID,
+    RawAccountID,
     AccountMeta,
     RawAccountMigration,
     RawProfile as Profile,
@@ -116,11 +115,10 @@ export {
     AgentSecret,
     InviteSecret,
     CryptoProvider,
-    WasmCrypto,
-    PureJSCrypto,
     SyncMessage,
     isRawCoID,
     LSMStorage,
+    PureJSCrypto,
 };
 
 export type {
@@ -132,6 +130,7 @@ export type {
     OutgoingSyncQueue,
     DisconnectedError,
     PingTimeoutError,
+    CoValueUniqueness,
 };
 
 // eslint-disable-next-line @typescript-eslint/no-namespace