cojson 0.7.0-alpha.36 → 0.7.0-alpha.38

package/src/coValues/coList.ts

@@ -196,7 +196,7 @@ export class RawCoListView<
                 } else {
                     throw new Error(
                         "Unknown list operation " +
-                            (change as { op: unknown }).op
+                            (change as { op: unknown }).op,
                     );
                 }
             }
@@ -285,7 +285,7 @@ export class RawCoListView<
             value: Item;
             madeAt: number;
             opID: OpID;
-        }[]
+        }[],
     ) {
         const entry =
             this.insertions[opID.sessionID]?.[opID.txIndex]?.[opID.changeIdx];
@@ -372,7 +372,7 @@ export class RawCoListView<
                     for (const deletion of changeEntry || []) {
                         const madeAt = new Date(deletion.madeAt);
                         const by = accountOrAgentIDfromSessionID(
-                            deletion.deletionID.sessionID
+                            deletion.deletionID.sessionID,
                         );
                         edits.push({
                             by,
@@ -413,7 +413,7 @@ export class RawCoList<
     append(
         item: Item,
         after?: number,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ) {
         const entries = this.entries();
         after =
@@ -443,7 +443,7 @@ export class RawCoList<
                     after: opIDBefore,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const listAfter = new RawCoList(this.core) as this;
@@ -467,7 +467,7 @@ export class RawCoList<
     prepend(
         item: Item,
         before?: number,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ) {
         const entries = this.entries();
         before = before === undefined ? 0 : before;
@@ -496,7 +496,7 @@ export class RawCoList<
                     before: opIDAfter,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const listAfter = new RawCoList(this.core) as this;
@@ -529,7 +529,7 @@ export class RawCoList<
                     insertion: entry.opID,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const listAfter = new RawCoList(this.core) as this;
@@ -544,7 +544,7 @@ export class RawCoList<
     replace(
         at: number,
         newItem: Item,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ) {
         const entries = this.entries();
         const entry = entries[at];
@@ -564,7 +564,7 @@ export class RawCoList<
                     insertion: entry.opID,
                 },
             ],
-            privacy
+            privacy,
         );
         const listAfter = new RawCoList(this.core) as this;
 

package/src/coValues/coMap.ts

@@ -50,14 +50,14 @@ export class RawCoMapView<
     /** @internal */
     constructor(
         core: CoValueCore,
-        options?: { ignorePrivateTransactions: true }
+        options?: { ignorePrivateTransactions: true },
     ) {
         this.id = core.id as CoID<this>;
         this.core = core;
         this.ops = {};
 
         for (const { txID, changes, madeAt } of core.getValidSortedTransactions(
-            options
+            options,
         )) {
             for (const [changeIdx, changeUntyped] of changes.entries()) {
                 const change = changeUntyped as MapOpPayload<
@@ -105,11 +105,11 @@ export class RawCoMapView<
 
     /** @internal */
     timeFilteredOps<K extends keyof Shape & string>(
-        key: K
+        key: K,
     ): MapOp<K, Shape[K]>[] | undefined {
         if (this.atTimeFilter) {
             return this.ops[key]?.filter(
-                (op) => op.madeAt <= this.atTimeFilter!
+                (op) => op.madeAt <= this.atTimeFilter!,
             );
         } else {
             return this.ops[key];
@@ -193,7 +193,7 @@ export class RawCoMapView<
     /** @category 5. Edit history */
     nthEditAt<K extends keyof Shape & string>(
         key: K,
-        n: number
+        n: number,
     ):
         | {
               by: AccountID | AgentID;
@@ -223,7 +223,7 @@ export class RawCoMapView<
 
     /** @category 5. Edit history */
     lastEditAt<K extends keyof Shape & string>(
-        key: K
+        key: K,
     ):
         | {
               by: AccountID | AgentID;
@@ -280,7 +280,7 @@ export class RawCoMap<
     set<K extends keyof Shape & string>(
         key: K,
         value: Shape[K],
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ): void {
         this.core.makeTransaction(
             [
@@ -290,7 +290,7 @@ export class RawCoMap<
                     value: isCoValue(value) ? value.id : value,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const after = new RawCoMap(this.core) as this;
@@ -308,7 +308,7 @@ export class RawCoMap<
      **/
     delete(
         key: keyof Shape & string,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ) {
         this.core.makeTransaction(
             [
@@ -317,7 +317,7 @@ export class RawCoMap<
                     key,
                 },
             ],
-            privacy
+            privacy,
         );
 
         const after = new RawCoMap(this.core) as this;

package/src/coValues/coStream.ts

@@ -43,7 +43,7 @@ export type CoStreamItem<Item extends JsonValue> = {
 
 export class RawCoStreamView<
     Item extends JsonValue = JsonValue,
-    Meta extends JsonObject | null = JsonObject | null
+    Meta extends JsonObject | null = JsonObject | null,
 > implements RawCoValue
 {
     id: CoID<this>;
@@ -100,7 +100,7 @@ export class RawCoStreamView<
             return undefined;
         } else if (Object.keys(this.items).length !== 1) {
             throw new Error(
-                "CoStream.getSingleStream() can only be called when there is exactly one stream"
+                "CoStream.getSingleStream() can only be called when there is exactly one stream",
             );
         }
 
@@ -115,13 +115,13 @@ export class RawCoStreamView<
         return new Set(
             this.sessions()
                 .map(accountOrAgentIDfromSessionID)
-                .filter(isAccountID)
+                .filter(isAccountID),
         );
     }
 
     nthItemIn(
         sessionID: SessionID,
-        n: number
+        n: number,
     ):
         | {
               by: AccountID | AgentID;
@@ -214,7 +214,7 @@ export class RawCoStreamView<
                           in: sessionID as SessionID,
                           ...item,
                       }))
-                    : []
+                    : [],
             ),
         ];
 
@@ -232,7 +232,7 @@ export class RawCoStreamView<
             Object.entries(this.items).map(([sessionID, items]) => [
                 sessionID,
                 items.map((item) => item.value),
-            ])
+            ]),
         );
     }
 
@@ -245,7 +245,7 @@ export class RawCoStreamView<
 
 export class RawCoStream<
         Item extends JsonValue = JsonValue,
-        Meta extends JsonObject | null = JsonObject | null
+        Meta extends JsonObject | null = JsonObject | null,
     >
     extends RawCoStreamView<Item, Meta>
     implements RawCoValue
@@ -259,13 +259,13 @@ export class RawCoStream<
 const binary_U_prefixLength = 8; // "binary_U".length;
 
 export class RawBinaryCoStreamView<
-        Meta extends BinaryCoStreamMeta = { type: "binary" }
+        Meta extends BinaryCoStreamMeta = { type: "binary" },
     >
     extends RawCoStreamView<BinaryStreamItem, Meta>
     implements RawCoValue
 {
     getBinaryChunks(
-        allowUnfinished?: boolean
+        allowUnfinished?: boolean,
     ):
         | (BinaryStreamInfo & { chunks: Uint8Array[]; finished: boolean })
         | undefined {
@@ -304,7 +304,7 @@ export class RawBinaryCoStreamView<
             }
 
             const chunk = base64URLtoBytes(
-                item.chunk.slice(binary_U_prefixLength)
+                item.chunk.slice(binary_U_prefixLength),
             );
             // totalLength += chunk.length;
             chunks.push(chunk);
@@ -331,7 +331,7 @@ export class RawBinaryCoStreamView<
 }
 
 export class RawBinaryCoStream<
-        Meta extends BinaryCoStreamMeta = { type: "binary" }
+        Meta extends BinaryCoStreamMeta = { type: "binary" },
     >
     extends RawBinaryCoStreamView<Meta>
     implements RawCoValue
@@ -340,7 +340,7 @@ export class RawBinaryCoStream<
     push(
         item: BinaryStreamItem,
         privacy: "private" | "trusting" = "private",
-        updateView: boolean = true
+        updateView: boolean = true,
     ): void {
         this.core.makeTransaction([item], privacy);
         if (updateView) {
@@ -350,7 +350,7 @@ export class RawBinaryCoStream<
 
     startBinaryStream(
         settings: BinaryStreamInfo,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ): void {
         this.push(
             {
@@ -358,13 +358,13 @@ export class RawBinaryCoStream<
                 ...settings,
             } satisfies BinaryStreamStart,
             privacy,
-            false
+            false,
         );
     }
 
     pushBinaryStreamChunk(
         chunk: Uint8Array,
-        privacy: "private" | "trusting" = "private"
+        privacy: "private" | "trusting" = "private",
     ): void {
         // const before = performance.now();
         this.push(
@@ -373,7 +373,7 @@ export class RawBinaryCoStream<
                 chunk: `binary_U${bytesToBase64url(chunk)}`,
             } satisfies BinaryStreamChunk,
             privacy,
-            false
+            false,
         );
         // const after = performance.now();
         // console.log(
@@ -388,7 +388,7 @@ export class RawBinaryCoStream<
                 type: "end",
             } satisfies BinaryStreamEnd,
             privacy,
-            true
+            true,
         );
     }
 }

package/src/coValues/group.ts

@@ -3,26 +3,9 @@ import { RawCoMap } from "./coMap.js";
 import { RawCoList } from "./coList.js";
 import { JsonObject } from "../jsonValue.js";
 import { RawBinaryCoStream, RawCoStream } from "./coStream.js";
-import {
-    Encrypted,
-    KeyID,
-    KeySecret,
-    createdNowUnique,
-    newRandomKeySecret,
-    seal,
-    encryptKeySecret,
-    getAgentSealerID,
-    Sealed,
-    newRandomSecretSeed,
-    agentSecretFromSecretSeed,
-    getAgentID,
-} from "../crypto.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, AccountID, ControlledAccountOrAgent } from "./account.js";
 import { Role } from "../permissions.js";
 import { base58 } from "@scure/base";
 
@@ -65,7 +48,7 @@ export type GroupShape = {
  *  ```
  * */
 export class RawGroup<
-    Meta extends JsonObject | null = JsonObject | null
+    Meta extends JsonObject | null = JsonObject | null,
 > extends RawCoMap<GroupShape, Meta> {
     /**
      * Returns the current role of a given account.
@@ -98,7 +81,7 @@ export class RawGroup<
      */
     addMember(
         account: RawAccount | ControlledAccountOrAgent | Everyone,
-        role: Role
+        role: Role,
     ) {
         this.addMemberInternal(account, role);
     }
@@ -106,58 +89,58 @@ export class RawGroup<
     /** @internal */
     addMemberInternal(
         account: RawAccount | ControlledAccountOrAgent | AgentID | Everyone,
-        role: Role
+        role: Role,
     ) {
-            const currentReadKey = this.core.getCurrentReadKey();
+        const currentReadKey = this.core.getCurrentReadKey();
 
-            if (!currentReadKey.secret) {
-                throw new Error("Can't add member without read key secret");
-            }
+        if (!currentReadKey.secret) {
+            throw new Error("Can't add member without read key secret");
+        }
 
-            if (account === EVERYONE) {
-                if (!(role === "reader" || role === "writer")) {
-                    throw new Error(
-                        "Can't make everyone something other than reader or writer"
-                    );
-                }
-                this.set(account, role, "trusting");
-
-                if (this.get(account) !== role) {
-                    throw new Error("Failed to set role");
-                }
-
-                this.set(
-                    `${currentReadKey.id}_for_${EVERYONE}`,
-                    currentReadKey.secret,
-                    "trusting"
-                );
-            } else {
-                const memberKey =
-                    typeof account === "string" ? account : account.id;
-                const agent =
-                    typeof account === "string"
-                        ? account
-                        : account.currentAgentID();
-                this.set(memberKey, role, "trusting");
-
-                if (this.get(memberKey) !== role) {
-                    throw new Error("Failed to set role");
-                }
-
-                this.set(
-                    `${currentReadKey.id}_for_${memberKey}`,
-                    seal({
-                        message: currentReadKey.secret,
-                        from: this.core.node.account.currentSealerSecret(),
-                        to: getAgentSealerID(agent),
-                        nOnceMaterial: {
-                            in: this.id,
-                            tx: this.core.nextTransactionID(),
-                        },
-                    }),
-                    "trusting"
+        if (account === EVERYONE) {
+            if (!(role === "reader" || role === "writer")) {
+                throw new Error(
+                    "Can't make everyone something other than reader or writer",
                 );
             }
+            this.set(account, role, "trusting");
+
+            if (this.get(account) !== role) {
+                throw new Error("Failed to set role");
+            }
+
+            this.set(
+                `${currentReadKey.id}_for_${EVERYONE}`,
+                currentReadKey.secret,
+                "trusting",
+            );
+        } else {
+            const memberKey =
+                typeof account === "string" ? account : account.id;
+            const agent =
+                typeof account === "string"
+                    ? account
+                    : account.currentAgentID();
+            this.set(memberKey, role, "trusting");
+
+            if (this.get(memberKey) !== role) {
+                throw new Error("Failed to set role");
+            }
+
+            this.set(
+                `${currentReadKey.id}_for_${memberKey}`,
+                this.core.crypto.seal({
+                    message: currentReadKey.secret,
+                    from: this.core.node.account.currentSealerSecret(),
+                    to: this.core.crypto.getAgentSealerID(agent),
+                    nOnceMaterial: {
+                        in: this.id,
+                        tx: this.core.nextTransactionID(),
+                    },
+                }),
+                "trusting",
+            );
+        }
     }
 
     /** @internal */
@@ -177,7 +160,7 @@ export class RawGroup<
 
         if (!maybeCurrentReadKey.secret) {
             throw new Error(
-                "Can't rotate read key secret we don't have access to"
+                "Can't rotate read key secret we don't have access to",
             );
         }
 
@@ -186,39 +169,39 @@ export class RawGroup<
             secret: maybeCurrentReadKey.secret,
         };
 
-        const newReadKey = newRandomKeySecret();
+        const newReadKey = this.core.crypto.newRandomKeySecret();
 
-            for (const readerID of currentlyPermittedReaders) {
-                const reader = this.core.node.resolveAccountAgent(
-                    readerID,
-                    "Expected to know currently permitted reader"
-                );
-
-                this.set(
-                    `${newReadKey.id}_for_${readerID}`,
-                    seal({
-                        message: newReadKey.secret,
-                        from: this.core.node.account.currentSealerSecret(),
-                        to: getAgentSealerID(reader),
-                        nOnceMaterial: {
-                            in: this.id,
-                            tx: this.core.nextTransactionID(),
-                        },
-                    }),
-                    "trusting"
-                );
-            }
+        for (const readerID of currentlyPermittedReaders) {
+            const reader = this.core.node.resolveAccountAgent(
+                readerID,
+                "Expected to know currently permitted reader",
+            );
 
             this.set(
-                `${currentReadKey.id}_for_${newReadKey.id}`,
-                encryptKeySecret({
-                    encrypting: newReadKey,
-                    toEncrypt: currentReadKey,
-                }).encrypted,
-                "trusting"
+                `${newReadKey.id}_for_${readerID}`,
+                this.core.crypto.seal({
+                    message: newReadKey.secret,
+                    from: this.core.node.account.currentSealerSecret(),
+                    to: this.core.crypto.getAgentSealerID(reader),
+                    nOnceMaterial: {
+                        in: this.id,
+                        tx: this.core.nextTransactionID(),
+                    },
+                }),
+                "trusting",
             );
+        }
 
-            this.set("readKey", newReadKey.id, "trusting");
+        this.set(
+            `${currentReadKey.id}_for_${newReadKey.id}`,
+            this.core.crypto.encryptKeySecret({
+                encrypting: newReadKey,
+                toEncrypt: currentReadKey,
+            }).encrypted,
+            "trusting",
+        );
+
+        this.set("readKey", newReadKey.id, "trusting");
     }
 
     /**
@@ -234,10 +217,10 @@ export class RawGroup<
 
     /** @internal */
     removeMemberInternal(
-        account: RawAccount | ControlledAccountOrAgent | AgentID | Everyone
+        account: RawAccount | ControlledAccountOrAgent | AgentID | Everyone,
     ) {
         const memberKey = typeof account === "string" ? account : account.id;
-         this.set(memberKey, "revoked", "trusting");
+        this.set(memberKey, "revoked", "trusting");
         this.rotateReadKey();
     }
 
@@ -249,10 +232,11 @@ export class RawGroup<
      * @category 2. Role changing
      */
     createInvite(role: "reader" | "writer" | "admin"): InviteSecret {
-        const secretSeed = newRandomSecretSeed();
+        const secretSeed = this.core.crypto.newRandomSecretSeed();
 
-        const inviteSecret = agentSecretFromSecretSeed(secretSeed);
-        const inviteID = getAgentID(inviteSecret);
+        const inviteSecret =
+            this.core.crypto.agentSecretFromSecretSeed(secretSeed);
+        const inviteID = this.core.crypto.getAgentID(inviteSecret);
 
         this.addMemberInternal(inviteID, `${role}Invite` as Role);
 
@@ -268,7 +252,7 @@ export class RawGroup<
     createMap<M extends RawCoMap>(
         init?: M["_shape"],
         meta?: M["headerMeta"],
-        initPrivacy: "trusting" | "private" = "private"
+        initPrivacy: "trusting" | "private" = "private",
     ): M {
         const map = this.core.node
             .createCoValue({
@@ -278,7 +262,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta || null,
-                ...createdNowUnique(),
+                ...this.core.crypto.createdNowUnique(),
             })
             .getCurrentContent() as M;
 
@@ -300,7 +284,7 @@ export class RawGroup<
     createList<L extends RawCoList>(
         init?: L["_item"][],
         meta?: L["headerMeta"],
-        initPrivacy: "trusting" | "private" = "private"
+        initPrivacy: "trusting" | "private" = "private",
     ): L {
         const list = this.core.node
             .createCoValue({
@@ -310,7 +294,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta || null,
-                ...createdNowUnique(),
+                ...this.core.crypto.createdNowUnique(),
             })
             .getCurrentContent() as L;
 
@@ -333,14 +317,14 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta || null,
-                ...createdNowUnique(),
+                ...this.core.crypto.createdNowUnique(),
             })
             .getCurrentContent() as C;
     }
 
     /** @category 3. Value creation */
     createBinaryStream<C extends RawBinaryCoStream>(
-        meta: C["headerMeta"] = { type: "binary" }
+        meta: C["headerMeta"] = { type: "binary" },
     ): C {
         return this.core.node
             .createCoValue({
@@ -350,7 +334,7 @@ export class RawGroup<
                     group: this.id,
                 },
                 meta: meta,
-                ...createdNowUnique(),
+                ...this.core.crypto.createdNowUnique(),
             })
             .getCurrentContent() as C;
     }

package/src/coreToCoValue.ts

@@ -8,7 +8,7 @@ import { RawBinaryCoStream } from "./coValues/coStream.js";
 
 export function coreToCoValue(
     core: CoValueCore,
-    options?: { ignorePrivateTransactions: true }
+    options?: { ignorePrivateTransactions: true },
 ) {
     if (core.header.type === "comap") {
         if (core.header.ruleset.type === "group") {
@@ -17,7 +17,10 @@ export function coreToCoValue(
                 !options?.ignorePrivateTransactions
             ) {
                 if (core.id === core.node.account.id) {
-                    return new RawControlledAccount(core, core.node.account.agentSecret);
+                    return new RawControlledAccount(
+                        core,
+                        core.node.account.agentSecret,
+                    );
                 } else {
                     return new RawAccount(core);
                 }