cojson 0.8.11 → 0.8.16

package/src/media.ts

@@ -2,7 +2,7 @@ import { RawCoMap } from "./coValues/coMap.js";
 import { RawBinaryCoStream } from "./coValues/coStream.js";
 
 export type ImageDefinition = RawCoMap<{
-    originalSize: [number, number];
-    placeholderDataURL?: string;
-    [res: `${number}x${number}`]: RawBinaryCoStream["id"];
+  originalSize: [number, number];
+  placeholderDataURL?: string;
+  [res: `${number}x${number}`]: RawBinaryCoStream["id"];
 }>;

package/src/permissions.ts

@@ -1,312 +1,306 @@
 import { CoID } from "./coValue.js";
+import { CoValueCore, Transaction } from "./coValueCore.js";
+import { RawAccount, RawAccountID, RawProfile } from "./coValues/account.js";
 import { MapOpPayload } from "./coValues/coMap.js";
-import { JsonValue } from "./jsonValue.js";
+import { EVERYONE, Everyone } from "./coValues/group.js";
 import { KeyID } from "./crypto/crypto.js";
-import { CoValueCore, Transaction } from "./coValueCore.js";
-import { accountOrAgentIDfromSessionID } from "./typeUtils/accountOrAgentIDfromSessionID.js";
 import { AgentID, RawCoID, SessionID, TransactionID } from "./ids.js";
-import { RawAccount, RawAccountID, RawProfile } from "./coValues/account.js";
 import { parseJSON } from "./jsonStringify.js";
-import { EVERYONE, Everyone } from "./coValues/group.js";
+import { JsonValue } from "./jsonValue.js";
+import { accountOrAgentIDfromSessionID } from "./typeUtils/accountOrAgentIDfromSessionID.js";
 import { expectGroup } from "./typeUtils/expectGroup.js";
 
 export type PermissionsDef =
-    | { type: "group"; initialAdmin: RawAccountID | AgentID }
-    | { type: "ownedByGroup"; group: RawCoID }
-    | { type: "unsafeAllowAll" };
+  | { type: "group"; initialAdmin: RawAccountID | AgentID }
+  | { type: "ownedByGroup"; group: RawCoID }
+  | { type: "unsafeAllowAll" };
 
 export type Role =
-    | "reader"
-    | "writer"
-    | "admin"
-    | "revoked"
-    | "adminInvite"
-    | "writerInvite"
-    | "readerInvite";
+  | "reader"
+  | "writer"
+  | "admin"
+  | "revoked"
+  | "adminInvite"
+  | "writerInvite"
+  | "readerInvite";
 
 export function determineValidTransactions(
-    coValue: CoValueCore,
+  coValue: CoValueCore,
 ): { txID: TransactionID; tx: Transaction }[] {
-    if (coValue.header.ruleset.type === "group") {
-        const allTransactionsSorted = [
-            ...coValue.sessionLogs.entries(),
-        ].flatMap(([sessionID, sessionLog]) => {
-            return sessionLog.transactions.map((tx, txIndex) => ({
-                sessionID,
-                txIndex,
-                tx,
-            })) as {
-                sessionID: SessionID;
-                txIndex: number;
-                tx: Transaction;
-            }[];
-        });
-
-        allTransactionsSorted.sort((a, b) => {
-            return a.tx.madeAt - b.tx.madeAt;
-        });
-
-        const initialAdmin = coValue.header.ruleset.initialAdmin;
-
-        if (!initialAdmin) {
-            throw new Error("Group must have initialAdmin");
-        }
+  if (coValue.header.ruleset.type === "group") {
+    const allTransactionsSorted = [...coValue.sessionLogs.entries()].flatMap(
+      ([sessionID, sessionLog]) => {
+        return sessionLog.transactions.map((tx, txIndex) => ({
+          sessionID,
+          txIndex,
+          tx,
+        })) as {
+          sessionID: SessionID;
+          txIndex: number;
+          tx: Transaction;
+        }[];
+      },
+    );
 
-        const memberState: {
-            [agent: RawAccountID | AgentID]: Role;
-            [EVERYONE]?: Role;
-        } = {};
-
-        const validTransactions: { txID: TransactionID; tx: Transaction }[] =
-            [];
-
-        for (const { sessionID, txIndex, tx } of allTransactionsSorted) {
-            // console.log("before", { memberState, validTransactions });
-            const transactor = accountOrAgentIDfromSessionID(sessionID);
-
-            if (tx.privacy === "private") {
-                if (memberState[transactor] === "admin") {
-                    validTransactions.push({
-                        txID: { sessionID, txIndex },
-                        tx,
-                    });
-                    continue;
-                } else {
-                    console.warn(
-                        "Only admins can make private transactions in groups",
-                    );
-                    continue;
-                }
-            }
+    allTransactionsSorted.sort((a, b) => {
+      return a.tx.madeAt - b.tx.madeAt;
+    });
 
-            let changes;
-
-            try {
-                changes = parseJSON(tx.changes);
-            } catch (e) {
-                console.warn(
-                    coValue.id,
-                    "Invalid JSON in transaction",
-                    e,
-                    tx,
-                    JSON.stringify(tx.changes, (k, v) =>
-                        k === "changes" || k === "encryptedChanges"
-                            ? v.slice(0, 20) + "..."
-                            : v,
-                    ),
-                );
-                continue;
-            }
+    const initialAdmin = coValue.header.ruleset.initialAdmin;
 
-            const change = changes[0] as
-                | MapOpPayload<RawAccountID | AgentID | Everyone, Role>
-                | MapOpPayload<"readKey", JsonValue>
-                | MapOpPayload<"profile", CoID<RawProfile>>;
-            if (changes.length !== 1) {
-                console.warn("Group transaction must have exactly one change");
-                continue;
-            }
+    if (!initialAdmin) {
+      throw new Error("Group must have initialAdmin");
+    }
 
-            if (change.op !== "set") {
-                console.warn("Group transaction must set a role or readKey");
-                continue;
-            }
+    const memberState: {
+      [agent: RawAccountID | AgentID]: Role;
+      [EVERYONE]?: Role;
+    } = {};
+
+    const validTransactions: { txID: TransactionID; tx: Transaction }[] = [];
+
+    for (const { sessionID, txIndex, tx } of allTransactionsSorted) {
+      // console.log("before", { memberState, validTransactions });
+      const transactor = accountOrAgentIDfromSessionID(sessionID);
+
+      if (tx.privacy === "private") {
+        if (memberState[transactor] === "admin") {
+          validTransactions.push({
+            txID: { sessionID, txIndex },
+            tx,
+          });
+          continue;
+        } else {
+          console.warn("Only admins can make private transactions in groups");
+          continue;
+        }
+      }
+
+      let changes;
+
+      try {
+        changes = parseJSON(tx.changes);
+      } catch (e) {
+        console.warn(
+          coValue.id,
+          "Invalid JSON in transaction",
+          e,
+          tx,
+          JSON.stringify(tx.changes, (k, v) =>
+            k === "changes" || k === "encryptedChanges"
+              ? v.slice(0, 20) + "..."
+              : v,
+          ),
+        );
+        continue;
+      }
+
+      const change = changes[0] as
+        | MapOpPayload<RawAccountID | AgentID | Everyone, Role>
+        | MapOpPayload<"readKey", JsonValue>
+        | MapOpPayload<"profile", CoID<RawProfile>>;
+      if (changes.length !== 1) {
+        console.warn("Group transaction must have exactly one change");
+        continue;
+      }
+
+      if (change.op !== "set") {
+        console.warn("Group transaction must set a role or readKey");
+        continue;
+      }
+
+      if (change.key === "readKey") {
+        if (memberState[transactor] !== "admin") {
+          console.warn("Only admins can set readKeys");
+          continue;
+        }
 
-            if (change.key === "readKey") {
-                if (memberState[transactor] !== "admin") {
-                    console.warn("Only admins can set readKeys");
-                    continue;
-                }
-
-                validTransactions.push({ txID: { sessionID, txIndex }, tx });
-                continue;
-            } else if (change.key === "profile") {
-                if (memberState[transactor] !== "admin") {
-                    console.warn("Only admins can set profile");
-                    continue;
-                }
-
-                validTransactions.push({ txID: { sessionID, txIndex }, tx });
-                continue;
-            } else if (
-                isKeyForKeyField(change.key) ||
-                isKeyForAccountField(change.key)
-            ) {
-                if (
-                    memberState[transactor] !== "admin" &&
-                    memberState[transactor] !== "adminInvite" &&
-                    memberState[transactor] !== "writerInvite" &&
-                    memberState[transactor] !== "readerInvite"
-                ) {
-                    console.warn("Only admins can reveal keys");
-                    continue;
-                }
-
-                // TODO: check validity of agents who the key is revealed to?
-
-                validTransactions.push({ txID: { sessionID, txIndex }, tx });
-                continue;
-            }
+        validTransactions.push({ txID: { sessionID, txIndex }, tx });
+        continue;
+      } else if (change.key === "profile") {
+        if (memberState[transactor] !== "admin") {
+          console.warn("Only admins can set profile");
+          continue;
+        }
 
-            const affectedMember = change.key;
-            const assignedRole = change.value;
-
-            if (
-                change.value !== "admin" &&
-                change.value !== "writer" &&
-                change.value !== "reader" &&
-                change.value !== "revoked" &&
-                change.value !== "adminInvite" &&
-                change.value !== "writerInvite" &&
-                change.value !== "readerInvite"
-            ) {
-                console.warn("Group transaction must set a valid role");
-                continue;
-            }
+        validTransactions.push({ txID: { sessionID, txIndex }, tx });
+        continue;
+      } else if (
+        isKeyForKeyField(change.key) ||
+        isKeyForAccountField(change.key)
+      ) {
+        if (
+          memberState[transactor] !== "admin" &&
+          memberState[transactor] !== "adminInvite" &&
+          memberState[transactor] !== "writerInvite" &&
+          memberState[transactor] !== "readerInvite"
+        ) {
+          console.warn("Only admins can reveal keys");
+          continue;
+        }
 
-            if (
-                affectedMember === EVERYONE &&
-                !(
-                    change.value === "reader" ||
-                    change.value === "writer" ||
-                    change.value === "revoked"
-                )
-            ) {
-                console.warn(
-                    "Everyone can only be set to reader, writer or revoked",
-                );
-                continue;
-            }
+        // TODO: check validity of agents who the key is revealed to?
+
+        validTransactions.push({ txID: { sessionID, txIndex }, tx });
+        continue;
+      }
+
+      const affectedMember = change.key;
+      const assignedRole = change.value;
+
+      if (
+        change.value !== "admin" &&
+        change.value !== "writer" &&
+        change.value !== "reader" &&
+        change.value !== "revoked" &&
+        change.value !== "adminInvite" &&
+        change.value !== "writerInvite" &&
+        change.value !== "readerInvite"
+      ) {
+        console.warn("Group transaction must set a valid role");
+        continue;
+      }
+
+      if (
+        affectedMember === EVERYONE &&
+        !(
+          change.value === "reader" ||
+          change.value === "writer" ||
+          change.value === "revoked"
+        )
+      ) {
+        console.warn("Everyone can only be set to reader, writer or revoked");
+        continue;
+      }
+
+      const isFirstSelfAppointment =
+        !memberState[transactor] &&
+        transactor === initialAdmin &&
+        change.op === "set" &&
+        change.key === transactor &&
+        change.value === "admin";
+
+      if (!isFirstSelfAppointment) {
+        if (memberState[transactor] === "admin") {
+          if (
+            memberState[affectedMember] === "admin" &&
+            affectedMember !== transactor &&
+            assignedRole !== "admin"
+          ) {
+            console.warn("Admins can only demote themselves.");
+            continue;
+          }
+        } else if (memberState[transactor] === "adminInvite") {
+          if (change.value !== "admin") {
+            console.warn("AdminInvites can only create admins.");
+            continue;
+          }
+        } else if (memberState[transactor] === "writerInvite") {
+          if (change.value !== "writer") {
+            console.warn("WriterInvites can only create writers.");
+            continue;
+          }
+        } else if (memberState[transactor] === "readerInvite") {
+          if (change.value !== "reader") {
+            console.warn("ReaderInvites can only create reader.");
+            continue;
+          }
+        } else {
+          console.warn(
+            "Group transaction must be made by current admin or invite",
+          );
+          continue;
+        }
+      }
 
-            const isFirstSelfAppointment =
-                !memberState[transactor] &&
-                transactor === initialAdmin &&
-                change.op === "set" &&
-                change.key === transactor &&
-                change.value === "admin";
-
-            if (!isFirstSelfAppointment) {
-                if (memberState[transactor] === "admin") {
-                    if (
-                        memberState[affectedMember] === "admin" &&
-                        affectedMember !== transactor &&
-                        assignedRole !== "admin"
-                    ) {
-                        console.warn("Admins can only demote themselves.");
-                        continue;
-                    }
-                } else if (memberState[transactor] === "adminInvite") {
-                    if (change.value !== "admin") {
-                        console.warn("AdminInvites can only create admins.");
-                        continue;
-                    }
-                } else if (memberState[transactor] === "writerInvite") {
-                    if (change.value !== "writer") {
-                        console.warn("WriterInvites can only create writers.");
-                        continue;
-                    }
-                } else if (memberState[transactor] === "readerInvite") {
-                    if (change.value !== "reader") {
-                        console.warn("ReaderInvites can only create reader.");
-                        continue;
-                    }
-                } else {
-                    console.warn(
-                        "Group transaction must be made by current admin or invite",
-                    );
-                    continue;
-                }
-            }
+      memberState[affectedMember] = change.value;
+      validTransactions.push({ txID: { sessionID, txIndex }, tx });
 
-            memberState[affectedMember] = change.value;
-            validTransactions.push({ txID: { sessionID, txIndex }, tx });
+      // console.log("after", { memberState, validTransactions });
+    }
 
-            // console.log("after", { memberState, validTransactions });
-        }
+    return validTransactions;
+  } else if (coValue.header.ruleset.type === "ownedByGroup") {
+    const groupContent = expectGroup(
+      coValue.node
+        .expectCoValueLoaded(
+          coValue.header.ruleset.group,
+          "Determining valid transaction in owned object but its group wasn't loaded",
+        )
+        .getCurrentContent(),
+    );
 
-        return validTransactions;
-    } else if (coValue.header.ruleset.type === "ownedByGroup") {
-        const groupContent = expectGroup(
-            coValue.node
-                .expectCoValueLoaded(
-                    coValue.header.ruleset.group,
-                    "Determining valid transaction in owned object but its group wasn't loaded",
-                )
-                .getCurrentContent(),
-        );
+    if (groupContent.type !== "comap") {
+      throw new Error("Group must be a map");
+    }
 
-        if (groupContent.type !== "comap") {
-            throw new Error("Group must be a map");
-        }
+    return [...coValue.sessionLogs.entries()].flatMap(
+      ([sessionID, sessionLog]) => {
+        const transactor = accountOrAgentIDfromSessionID(sessionID);
+
+        return sessionLog.transactions
+          .filter((tx) => {
+            const groupAtTime = groupContent.atTime(tx.madeAt);
+            const effectiveTransactor =
+              transactor === groupContent.id &&
+              groupAtTime instanceof RawAccount
+                ? groupAtTime.currentAgentID().match(
+                    (agentID) => agentID,
+                    (e) => {
+                      console.error(
+                        "Error while determining current agent ID in valid transactions",
+                        e,
+                      );
+                      return undefined;
+                    },
+                  )
+                : transactor;
+
+            if (!effectiveTransactor) {
+              return false;
+            }
 
-        return [...coValue.sessionLogs.entries()].flatMap(
-            ([sessionID, sessionLog]) => {
-                const transactor = accountOrAgentIDfromSessionID(sessionID);
-
-                return sessionLog.transactions
-                    .filter((tx) => {
-                        const groupAtTime = groupContent.atTime(tx.madeAt);
-                        const effectiveTransactor =
-                            transactor === groupContent.id &&
-                            groupAtTime instanceof RawAccount
-                                ? groupAtTime.currentAgentID().match(
-                                      (agentID) => agentID,
-                                      (e) => {
-                                          console.error(
-                                              "Error while determining current agent ID in valid transactions",
-                                              e,
-                                          );
-                                          return undefined;
-                                      },
-                                  )
-                                : transactor;
-
-                        if (!effectiveTransactor) {
-                            return false;
-                        }
-
-                        const transactorRoleAtTxTime =
-                            groupAtTime.get(effectiveTransactor) ||
-                            groupAtTime.get(EVERYONE);
-
-                        return (
-                            transactorRoleAtTxTime === "admin" ||
-                            transactorRoleAtTxTime === "writer"
-                        );
-                    })
-                    .map((tx, txIndex) => ({
-                        txID: { sessionID: sessionID, txIndex },
-                        tx,
-                    }));
-            },
-        );
-    } else if (coValue.header.ruleset.type === "unsafeAllowAll") {
-        return [...coValue.sessionLogs.entries()].flatMap(
-            ([sessionID, sessionLog]) => {
-                return sessionLog.transactions.map((tx, txIndex) => ({
-                    txID: { sessionID: sessionID, txIndex },
-                    tx,
-                }));
-            },
-        );
-    } else {
-        throw new Error(
-            "Unknown ruleset type " +
-                (coValue.header.ruleset as { type: string }).type,
-        );
-    }
+            const transactorRoleAtTxTime =
+              groupAtTime.get(effectiveTransactor) || groupAtTime.get(EVERYONE);
+
+            return (
+              transactorRoleAtTxTime === "admin" ||
+              transactorRoleAtTxTime === "writer"
+            );
+          })
+          .map((tx, txIndex) => ({
+            txID: { sessionID: sessionID, txIndex },
+            tx,
+          }));
+      },
+    );
+  } else if (coValue.header.ruleset.type === "unsafeAllowAll") {
+    return [...coValue.sessionLogs.entries()].flatMap(
+      ([sessionID, sessionLog]) => {
+        return sessionLog.transactions.map((tx, txIndex) => ({
+          txID: { sessionID: sessionID, txIndex },
+          tx,
+        }));
+      },
+    );
+  } else {
+    throw new Error(
+      "Unknown ruleset type " +
+        (coValue.header.ruleset as { type: string }).type,
+    );
+  }
 }
 
 export function isKeyForKeyField(co: string): co is `${KeyID}_for_${KeyID}` {
-    return co.startsWith("key_") && co.includes("_for_key");
+  return co.startsWith("key_") && co.includes("_for_key");
 }
 
 export function isKeyForAccountField(
-    co: string,
+  co: string,
 ): co is `${KeyID}_for_${RawAccountID | AgentID}` {
-    return (
-        (co.startsWith("key_") &&
-            (co.includes("_for_sealer") || co.includes("_for_co"))) ||
-        co.includes("_for_everyone")
-    );
+  return (
+    (co.startsWith("key_") &&
+      (co.includes("_for_sealer") || co.includes("_for_co"))) ||
+    co.includes("_for_everyone")
+  );
 }

package/src/priority.ts

@@ -3,37 +3,39 @@ import { type CoValueHeader } from "./coValueCore.js";
 /**
  * The priority of a `CoValue` determines how much priority is given
  * to its content messages.
- * 
+ *
  * The priority value is handled as weight in the weighed round robin algorithm
  * used to determine the order in which messages are sent.
- * 
+ *
  * Follows the HTTP urgency range and order:
  *  - https://www.rfc-editor.org/rfc/rfc9218.html#name-urgency
  */
 export const CO_VALUE_PRIORITY = {
-    HIGH: 0,
-    MEDIUM: 3,
-    LOW: 6,
+  HIGH: 0,
+  MEDIUM: 3,
+  LOW: 6,
 } as const;
 
 export type CoValuePriority = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
 
-export function getPriorityFromHeader(header: CoValueHeader | undefined | boolean): CoValuePriority {
-    if (typeof header === "boolean" || !header) {
-        return CO_VALUE_PRIORITY.MEDIUM;
-    }
+export function getPriorityFromHeader(
+  header: CoValueHeader | undefined | boolean,
+): CoValuePriority {
+  if (typeof header === "boolean" || !header) {
+    return CO_VALUE_PRIORITY.MEDIUM;
+  }
 
-    if (header.meta?.type === "account") {
-        return CO_VALUE_PRIORITY.HIGH;
-    }
+  if (header.meta?.type === "account") {
+    return CO_VALUE_PRIORITY.HIGH;
+  }
 
-    if (header.ruleset.type === "group") {
-        return CO_VALUE_PRIORITY.HIGH;
-    }
+  if (header.ruleset.type === "group") {
+    return CO_VALUE_PRIORITY.HIGH;
+  }
 
-    if (header.type === "costream" && header.meta?.type === "binary") {
-        return CO_VALUE_PRIORITY.LOW;
-    }
+  if (header.type === "costream" && header.meta?.type === "binary") {
+    return CO_VALUE_PRIORITY.LOW;
+  }
 
-    return CO_VALUE_PRIORITY.MEDIUM;
+  return CO_VALUE_PRIORITY.MEDIUM;
 }