cojson 0.18.0 → 0.18.2

package/src/coValueCore/decodeTransactionChangesAndMeta.ts

@@ -0,0 +1,81 @@
+import { AvailableCoValueCore, VerifiedTransaction } from "./coValueCore.js";
+import { safeParseJSON } from "../jsonStringify.js";
+
+export function decodeTransactionChangesAndMeta(
+  coValue: AvailableCoValueCore,
+  transaction: VerifiedTransaction,
+  ignorePrivateTransactions: boolean,
+) {
+  if (!transaction.isValid) {
+    return;
+  }
+
+  if (transaction.tx.privacy === "private" && ignorePrivateTransactions) {
+    return;
+  }
+
+  const needsChagesParsing =
+    !transaction.hasInvalidChanges && !transaction.changes;
+  const needsMetaParsing =
+    !transaction.hasInvalidMeta && !transaction.meta && transaction.tx.meta;
+
+  if (!needsChagesParsing && !needsMetaParsing) {
+    return;
+  }
+
+  if (transaction.tx.privacy === "private") {
+    const readKey = coValue.getReadKey(transaction.tx.keyUsed);
+
+    if (!readKey) {
+      return;
+    }
+
+    if (needsChagesParsing) {
+      const changes = coValue.verified.decryptTransaction(
+        transaction.txID.sessionID,
+        transaction.txID.txIndex,
+        readKey,
+      );
+
+      if (!changes) {
+        transaction.hasInvalidChanges = true;
+      } else {
+        transaction.changes = changes;
+      }
+    }
+
+    if (needsMetaParsing) {
+      const meta = coValue.verified.decryptTransactionMeta(
+        transaction.txID.sessionID,
+        transaction.txID.txIndex,
+        readKey,
+      );
+
+      if (!meta) {
+        transaction.hasInvalidMeta = true;
+      } else {
+        transaction.meta = meta;
+      }
+    }
+  } else {
+    if (needsChagesParsing) {
+      const changes = safeParseJSON(transaction.tx.changes);
+
+      if (!changes) {
+        transaction.hasInvalidChanges = true;
+      } else {
+        transaction.changes = changes;
+      }
+    }
+
+    if (needsMetaParsing && transaction.tx.meta) {
+      const meta = safeParseJSON(transaction.tx.meta);
+
+      if (!meta) {
+        transaction.hasInvalidMeta = true;
+      } else {
+        transaction.meta = meta;
+      }
+    }
+  }
+}

package/src/coValueCore/utils.ts

@@ -52,6 +52,10 @@ export function getDependedOnCoValuesFromRawData(
     deps.add(header.ruleset.group);
   }
 
+  if (header.meta?.source) {
+    deps.add(header.meta.source as RawCoID);
+  }
+
   return deps;
 }
 

package/src/coValueCore/verifiedState.ts

@@ -21,6 +21,7 @@ import { CoValueKnownState, NewContentMessage } from "../sync.js";
 import { TryAddTransactionsError } from "./coValueCore.js";
 import { SessionLog, SessionMap } from "./SessionMap.js";
 import { ControlledAccountOrAgent } from "../coValues/account.js";
+import { logger } from "../logger.js";
 
 export type CoValueHeader = {
   type: AnyRawCoValue["type"];
@@ -40,7 +41,6 @@ export type PrivateTransaction = {
   encryptedChanges: Encrypted<JsonValue[], { in: RawCoID; tx: TransactionID }>;
   meta?: Encrypted<JsonObject, { in: RawCoID; tx: TransactionID }>;
 };
-
 export type TrustingTransaction = {
   privacy: "trusting";
   madeAt: number;

package/src/coValues/coList.ts

@@ -10,6 +10,7 @@ import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfrom
 import { isCoValue } from "../typeUtils/isCoValue.js";
 import { RawAccountID } from "./account.js";
 import { RawGroup } from "./group.js";
+import { Transaction } from "../coValueCore/verifiedState.js";
 
 export type OpID = TransactionID & { changeIdx: number };
 
@@ -86,8 +87,12 @@ export class RawCoList<
     opID: OpID;
   }[];
   /** @internal */
-  totalValidTransactions = 0;
-  knownTransactions: CoValueKnownState["sessions"] = {};
+  knownTransactions: Set<Transaction>;
+
+  get totalValidTransactions() {
+    return this.knownTransactions.size;
+  }
+
   lastValidTransaction: number | undefined;
 
   /** @internal */
@@ -99,7 +104,7 @@ export class RawCoList<
     this.deletionsByInsertion = {};
     this.afterStart = [];
     this.beforeEnd = [];
-    this.knownTransactions = {};
+    this.knownTransactions = new Set<Transaction>();
 
     this.processNewTransactions();
   }
@@ -114,7 +119,6 @@ export class RawCoList<
       return;
     }
 
-    this.totalValidTransactions += transactions.length;
     let lastValidTransaction: number | undefined = undefined;
     let oldestValidTransaction: number | undefined = undefined;
     this._cachedEntries = undefined;
@@ -126,11 +130,6 @@ export class RawCoList<
         madeAt,
       );
 
-      this.knownTransactions[txID.sessionID] = Math.max(
-        this.knownTransactions[txID.sessionID] ?? 0,
-        txID.txIndex,
-      );
-
       for (const [changeIdx, changeUntyped] of changes.entries()) {
         const change = changeUntyped as ListOpPayload<Item>;
 
@@ -624,7 +623,6 @@ export class RawCoList<
     this.afterStart = listAfter.afterStart;
     this.beforeEnd = listAfter.beforeEnd;
     this.insertions = listAfter.insertions;
-    this.totalValidTransactions = listAfter.totalValidTransactions;
     this.lastValidTransaction = listAfter.lastValidTransaction;
     this.knownTransactions = listAfter.knownTransactions;
     this.deletionsByInsertion = listAfter.deletionsByInsertion;

package/src/coValues/coMap.ts

@@ -10,6 +10,7 @@ import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfrom
 import { isCoValue } from "../typeUtils/isCoValue.js";
 import { RawAccountID } from "./account.js";
 import type { RawGroup } from "./group.js";
+import { Transaction } from "../coValueCore/verifiedState.js";
 
 type MapOp<K extends string, V extends JsonValue | undefined> = {
   txID: TransactionID;
@@ -57,7 +58,7 @@ export class RawCoMapView<
     [Key in keyof Shape & string]?: MapOp<Key, Shape[Key]>[];
   };
   /** @internal */
-  knownTransactions: CoValueKnownState["sessions"];
+  knownTransactions: Set<Transaction>;
 
   /** @internal */
   ignorePrivateTransactions: boolean;
@@ -66,7 +67,9 @@ export class RawCoMapView<
   /** @category 6. Meta */
   readonly _shape!: Shape;
 
-  totalValidTransactions = 0;
+  get totalValidTransactions() {
+    return this.knownTransactions.size;
+  }
 
   /** @internal */
   constructor(
@@ -83,7 +86,7 @@ export class RawCoMapView<
       options?.ignorePrivateTransactions ?? false;
     this.ops = {};
     this.latest = {};
-    this.knownTransactions = {};
+    this.knownTransactions = new Set<Transaction>();
 
     this.processNewTransactions();
   }
@@ -113,7 +116,7 @@ export class RawCoMapView<
       NonNullable<(typeof ops)[keyof typeof ops]>
     >();
 
-    for (const { txID, changes, madeAt, trusting } of newValidTransactions) {
+    for (const { txID, changes, madeAt, tx } of newValidTransactions) {
       if (madeAt > this.latestTxMadeAt) {
         this.latestTxMadeAt = madeAt;
       }
@@ -128,7 +131,7 @@ export class RawCoMapView<
           madeAt,
           changeIdx,
           change,
-          trusting,
+          trusting: tx.privacy === "trusting",
         };
 
         const entries = ops[change.key];
@@ -140,15 +143,9 @@ export class RawCoMapView<
           entries.push(entry);
           changedEntries.set(change.key, entries);
         }
-        this.knownTransactions[txID.sessionID] = Math.max(
-          this.knownTransactions[txID.sessionID] ?? 0,
-          txID.txIndex,
-        );
       }
     }
 
-    this.totalValidTransactions += newValidTransactions.length;
-
     for (const entries of changedEntries.values()) {
       entries.sort(this.core.compareTransactions);
     }

package/src/coValues/coStream.ts

@@ -13,6 +13,7 @@ import { isAccountID } from "../typeUtils/isAccountID.js";
 import { isCoValue } from "../typeUtils/isCoValue.js";
 import { RawAccountID } from "./account.js";
 import { RawGroup } from "./group.js";
+import { Transaction } from "../coValueCore/verifiedState.js";
 
 export type BinaryStreamInfo = {
   mimeType: string;
@@ -58,15 +59,18 @@ export class RawCoStreamView<
     [key: SessionID]: CoStreamItem<Item>[];
   };
   /** @internal */
-  knownTransactions: CoValueKnownState["sessions"];
-  totalValidTransactions = 0;
+  knownTransactions: Set<Transaction>;
   readonly _item!: Item;
 
+  get totalValidTransactions() {
+    return this.knownTransactions.size;
+  }
+
   constructor(core: AvailableCoValueCore) {
     this.id = core.id as CoID<this>;
     this.core = core;
     this.items = {};
-    this.knownTransactions = {};
+    this.knownTransactions = new Set<Transaction>();
     this.processNewTransactions();
   }
 
@@ -113,7 +117,6 @@ export class RawCoStreamView<
     }
 
     for (const { txID, madeAt, changes } of newValidTransactions) {
-      this.totalValidTransactions++;
       for (const changeUntyped of changes) {
         const change = changeUntyped as Item;
         let entries = this.items[txID.sessionID];
@@ -124,10 +127,6 @@ export class RawCoStreamView<
         entries.push({ value: change, madeAt, tx: txID });
         changeEntries.add(entries);
       }
-      this.knownTransactions[txID.sessionID] = Math.max(
-        this.knownTransactions[txID.sessionID] ?? 0,
-        txID.txIndex,
-      );
     }
 
     for (const entries of changeEntries) {

package/src/ids.ts

@@ -20,7 +20,10 @@ export function rawCoIDfromBytes(bytes: Uint8Array): RawCoID {
   return `co_z${base58.encode(bytes.slice(0, shortHashLength))}` as RawCoID;
 }
 
-export type TransactionID = { sessionID: SessionID; txIndex: number };
+export type TransactionID = {
+  sessionID: SessionID;
+  txIndex: number;
+};
 
 export type AgentID = `sealer_z${string}/signer_z${string}`;
 

package/src/jsonStringify.ts

@@ -66,3 +66,11 @@ export function stableStringify<T>(
 export function parseJSON<T>(json: Stringified<T>): T {
   return JSON.parse(json);
 }
+
+export function safeParseJSON<T>(json: Stringified<T>): T | undefined {
+  try {
+    return JSON.parse(json);
+  } catch (e) {
+    return undefined;
+  }
+}

package/src/localNode.ts

@@ -457,6 +457,46 @@ export class LocalNode {
     return core.getCurrentContent() as T;
   }
 
+  /**
+   * Loads a branch from a group coValue, creating a new one if it doesn't exist.
+   *
+   * Returns "unavailable" in case of errors or missing source.
+   */
+  async checkoutBranch<T extends RawCoValue>(
+    id: CoID<T>,
+    branch: string,
+    branchOwnerID?: RawCoID,
+  ): Promise<T | "unavailable"> {
+    const source = await this.loadCoValueCore(id);
+
+    if (!source.isAvailable()) {
+      return "unavailable";
+    }
+
+    const header = source.verified.header;
+
+    // Group and account coValues can't have branches
+    if (header.ruleset.type !== "ownedByGroup") {
+      logger.error("Can't checkout a branch from a group coValue", {
+        id,
+      });
+      return "unavailable";
+    }
+
+    const ownerID = branchOwnerID || header.ruleset.group;
+
+    const branchID = source.getBranchId(branch, ownerID);
+
+    // Passing skipRetry to true because otherwise creating a new branch would always take 1 retry delay
+    let branchCoValue = await this.loadCoValueCore(branchID, undefined, true);
+
+    if (!branchCoValue.isAvailable()) {
+      branchCoValue = source.createBranch(branch, ownerID);
+    }
+
+    return branchCoValue.getCurrentContent() as T;
+  }
+
   getLoaded<T extends RawCoValue>(id: CoID<T>): T | undefined {
     const coValue = this.getCoValue(id);