cojson 0.13.17 → 0.13.20

package/src/coValues/group.ts

@@ -1,7 +1,17 @@
 import { base58 } from "@scure/base";
 import { CoID } from "../coValue.js";
-import { CoValueUniqueness } from "../coValueCore.js";
-import { Encrypted, KeyID, KeySecret, Sealed } from "../crypto/crypto.js";
+import {
+  AvailableCoValueCore,
+  CoValueCore,
+} from "../coValueCore/coValueCore.js";
+import { CoValueUniqueness } from "../coValueCore/verifiedState.js";
+import {
+  CryptoProvider,
+  Encrypted,
+  KeyID,
+  KeySecret,
+  Sealed,
+} from "../crypto/crypto.js";
 import {
   AgentID,
   ChildGroupReference,
@@ -17,6 +27,7 @@ import { logger } from "../logger.js";
 import { AccountRole, Role } from "../permissions.js";
 import { expectGroup } from "../typeUtils/expectGroup.js";
 import {
+  ControlledAccount,
   ControlledAccountOrAgent,
   RawAccount,
   RawAccountID,
@@ -77,6 +88,18 @@ export type GroupShape = {
 export class RawGroup<
   Meta extends JsonObject | null = JsonObject | null,
 > extends RawCoMap<GroupShape, Meta> {
+  protected readonly crypto: CryptoProvider;
+
+  constructor(
+    core: AvailableCoValueCore,
+    options?: {
+      ignorePrivateTransactions: boolean;
+    },
+  ) {
+    super(core, options);
+    this.crypto = core.node.crypto;
+  }
+
   /**
    * Returns the current role of a given account.
    *
@@ -174,7 +197,6 @@ export class RawGroup<
 
   loadAllChildGroups() {
     const requests: Promise<unknown>[] = [];
-    const store = this.core.node.coValuesStore;
     const peers = this.core.node.syncManager.getServerAndStoragePeers();
 
     for (const key of this.keys()) {
@@ -183,11 +205,11 @@ export class RawGroup<
       }
 
       const id = getChildGroupId(key);
-      const child = store.get(id);
+      const child = this.core.node.getCoValue(id);
 
       if (
-        child.highLevelState === "unknown" ||
-        child.highLevelState === "unavailable"
+        child.loadingState === "unknown" ||
+        child.loadingState === "unavailable"
       ) {
         child.loadFromPeers(peers).catch(() => {
           logger.error(`Failed to load child group ${id}`);
@@ -195,8 +217,8 @@ export class RawGroup<
       }
 
       requests.push(
-        child.getCoValue().then((coValue) => {
-          if (coValue === "unavailable") {
+        child.waitForAvailableOrUnavailable().then((coValue) => {
+          if (!coValue.isAvailable()) {
             throw new Error(`Child group ${child.id} is unavailable`);
           }
 
@@ -236,7 +258,7 @@ export class RawGroup<
    * @category 1. Role reading
    */
   myRole(): Role | undefined {
-    return this.roleOfInternal(this.core.node.account.id);
+    return this.roleOfInternal(this.core.node.getCurrentAgent().id);
   }
 
   /**
@@ -357,7 +379,7 @@ export class RawGroup<
     memberKey: RawAccountID | AgentID,
     agent: AgentID,
   ) {
-    const writeKeyForNewMember = this.core.crypto.newRandomKeySecret();
+    const writeKeyForNewMember = this.crypto.newRandomKeySecret();
 
     this.set(`writeKeyFor_${memberKey}`, writeKeyForNewMember.id, "trusting");
 
@@ -404,10 +426,10 @@ export class RawGroup<
   ) {
     this.set(
       `${keyID}_for_${memberKey}`,
-      this.core.crypto.seal({
+      this.crypto.seal({
         message: secret,
-        from: this.core.node.account.currentSealerSecret(),
-        to: this.core.crypto.getAgentSealerID(agent),
+        from: this.core.node.getCurrentAgent().currentSealerSecret(),
+        to: this.crypto.getAgentSealerID(agent),
         nOnceMaterial: {
           in: this.id,
           tx: this.core.nextTransactionID(),
@@ -433,7 +455,7 @@ export class RawGroup<
 
   getCurrentReadKeyId() {
     if (this.myRole() === "writeOnly") {
-      const accountId = this.core.node.account.id;
+      const accountId = this.core.node.getCurrentAgent().id;
 
       const key = this.get(`writeKeyFor_${accountId}`) as KeyID;
 
@@ -441,7 +463,7 @@ export class RawGroup<
       if (!key && this.get("everyone") === "writeOnly") {
         this.internalCreateWriteOnlyKeyForMember(
           accountId,
-          this.core.node.account.currentAgentID(),
+          this.core.node.getCurrentAgent().currentAgentID(),
         );
 
         return this.get(`writeKeyFor_${accountId}`) as KeyID;
@@ -509,7 +531,7 @@ export class RawGroup<
       secret: maybeCurrentReadKey.secret,
     };
 
-    const newReadKey = this.core.crypto.newRandomKeySecret();
+    const newReadKey = this.crypto.newRandomKeySecret();
 
     for (const readerID of currentlyPermittedReaders) {
       const agent = this.core.node
@@ -539,7 +561,7 @@ export class RawGroup<
         )
         ._unsafeUnwrap({ withStackTrace: true });
 
-      const writeOnlyKey = this.core.crypto.newRandomKeySecret();
+      const writeOnlyKey = this.crypto.newRandomKeySecret();
 
       this.storeKeyRevelationForMember(
         writeOnlyMemberID,
@@ -568,7 +590,7 @@ export class RawGroup<
 
     this.set(
       `${currentReadKey.id}_for_${newReadKey.id}`,
-      this.core.crypto.encryptKeySecret({
+      this.crypto.encryptKeySecret({
         encrypting: newReadKey,
         toEncrypt: currentReadKey,
       }).encrypted,
@@ -594,7 +616,7 @@ export class RawGroup<
 
       this.set(
         `${newReadKey.id}_for_${parentReadKeyID}`,
-        this.core.crypto.encryptKeySecret({
+        this.crypto.encryptKeySecret({
           encrypting: {
             id: parentReadKeyID,
             secret: parentReadKeySecret,
@@ -678,7 +700,7 @@ export class RawGroup<
 
     this.set(
       `${childReadKeyID}_for_${parentReadKeyID}`,
-      this.core.crypto.encryptKeySecret({
+      this.crypto.encryptKeySecret({
         encrypting: {
           id: parentReadKeyID,
           secret: parentReadKeySecret,
@@ -763,10 +785,10 @@ export class RawGroup<
    * @category 2. Role changing
    */
   createInvite(role: AccountRole): InviteSecret {
-    const secretSeed = this.core.crypto.newRandomSecretSeed();
+    const secretSeed = this.crypto.newRandomSecretSeed();
 
-    const inviteSecret = this.core.crypto.agentSecretFromSecretSeed(secretSeed);
-    const inviteID = this.core.crypto.getAgentID(inviteSecret);
+    const inviteSecret = this.crypto.agentSecretFromSecretSeed(secretSeed);
+    const inviteID = this.crypto.getAgentID(inviteSecret);
 
     this.addMemberInternal(inviteID, `${role}Invite` as Role);
 
@@ -783,7 +805,7 @@ export class RawGroup<
     init?: M["_shape"],
     meta?: M["headerMeta"],
     initPrivacy: "trusting" | "private" = "private",
-    uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique(),
+    uniqueness: CoValueUniqueness = this.crypto.createdNowUnique(),
   ): M {
     const map = this.core.node
       .createCoValue({
@@ -814,7 +836,7 @@ export class RawGroup<
     init?: L["_item"][],
     meta?: L["headerMeta"],
     initPrivacy: "trusting" | "private" = "private",
-    uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique(),
+    uniqueness: CoValueUniqueness = this.crypto.createdNowUnique(),
   ): L {
     const list = this.core.node
       .createCoValue({
@@ -854,7 +876,7 @@ export class RawGroup<
           group: this.id,
         },
         meta: meta || null,
-        ...this.core.crypto.createdNowUnique(),
+        ...this.crypto.createdNowUnique(),
       })
       .getCurrentContent() as T;
 
@@ -868,7 +890,7 @@ export class RawGroup<
   /** @category 3. Value creation */
   createStream<C extends RawCoStream>(
     meta?: C["headerMeta"],
-    uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique(),
+    uniqueness: CoValueUniqueness = this.crypto.createdNowUnique(),
   ): C {
     return this.core.node
       .createCoValue({
@@ -886,7 +908,7 @@ export class RawGroup<
   /** @category 3. Value creation */
   createBinaryStream<C extends RawBinaryCoStream>(
     meta: C["headerMeta"] = { type: "binary" },
-    uniqueness: CoValueUniqueness = this.core.crypto.createdNowUnique(),
+    uniqueness: CoValueUniqueness = this.crypto.createdNowUnique(),
   ): C {
     return this.core.node
       .createCoValue({

package/src/coreToCoValue.ts

@@ -1,6 +1,6 @@
 import { RawUnknownCoValue } from "./coValue.js";
-import type { CoValueCore } from "./coValueCore.js";
-import { RawAccount, RawControlledAccount } from "./coValues/account.js";
+import type { AvailableCoValueCore } from "./coValueCore/coValueCore.js";
+import { RawAccount } from "./coValues/account.js";
 import { RawCoList } from "./coValues/coList.js";
 import { RawCoMap } from "./coValues/coMap.js";
 import { RawCoPlainText } from "./coValues/coPlainText.js";
@@ -8,32 +8,31 @@ import { RawBinaryCoStream, RawCoStream } from "./coValues/coStream.js";
 import { RawGroup } from "./coValues/group.js";
 
 export function coreToCoValue(
-  core: CoValueCore,
+  core: AvailableCoValueCore,
   options?: { ignorePrivateTransactions: true },
 ) {
-  if (core.header.type === "comap") {
-    if (core.header.ruleset.type === "group") {
+  if (core.verified.header.type === "comap") {
+    if (core.verified.header.ruleset.type === "group") {
       if (
-        core.header.meta?.type === "account" &&
+        core.verified.header.meta?.type === "account" &&
         !options?.ignorePrivateTransactions
       ) {
-        if (core.id === core.node.account.id) {
-          return new RawControlledAccount(core, core.node.account.agentSecret);
-        } else {
-          return new RawAccount(core);
-        }
+        return new RawAccount(core);
       } else {
         return new RawGroup(core, options);
       }
     } else {
       return new RawCoMap(core);
     }
-  } else if (core.header.type === "coplaintext") {
+  } else if (core.verified.header.type === "coplaintext") {
     return new RawCoPlainText(core);
-  } else if (core.header.type === "colist") {
+  } else if (core.verified.header.type === "colist") {
     return new RawCoList(core);
-  } else if (core.header.type === "costream") {
-    if (core.header.meta && core.header.meta.type === "binary") {
+  } else if (core.verified.header.type === "costream") {
+    if (
+      core.verified.header.meta &&
+      core.verified.header.meta.type === "binary"
+    ) {
       return new RawBinaryCoStream(core);
     } else {
       return new RawCoStream(core);

package/src/exports.ts

@@ -1,15 +1,16 @@
 import { base64URLtoBytes, bytesToBase64url } from "./base64url.js";
 import { type RawCoValue } from "./coValue.js";
 import {
+  CO_VALUE_LOADING_CONFIG,
   CoValueCore,
-  type CoValueUniqueness,
   MAX_RECOMMENDED_TX_SIZE,
   idforHeader,
-} from "./coValueCore.js";
+} from "./coValueCore/coValueCore.js";
+import { CoValueUniqueness } from "./coValueCore/verifiedState.js";
 import {
+  ControlledAccount,
   ControlledAgent,
   RawAccount,
-  RawControlledAccount,
   RawProfile,
   accountHeaderForInitialAgentSecret,
 } from "./coValues/account.js";
@@ -76,7 +77,6 @@ import {
 
 type Value = JsonValue | AnyRawCoValue;
 
-import { CO_VALUE_LOADING_CONFIG } from "./coValueState.js";
 import { logger } from "./logger.js";
 import { getPriorityFromHeader } from "./priority.js";
 
@@ -121,6 +121,7 @@ export {
   AnyRawCoValue,
   RawAccount,
   RawAccountID,
+  ControlledAccount,
   AccountMeta,
   RawAccountMigration,
   RawProfile as Profile,
@@ -128,7 +129,6 @@ export {
   Media,
   CoValueCore,
   ControlledAgent,
-  RawControlledAccount,
   MAX_RECOMMENDED_TX_SIZE,
   JsonObject,
   JsonValue,
@@ -173,8 +173,10 @@ export namespace CojsonInternalTypes {
   export type LoadMessage = import("./sync.js").LoadMessage;
   export type NewContentMessage = import("./sync.js").NewContentMessage;
   export type SessionNewContent = import("./sync.js").SessionNewContent;
-  export type CoValueHeader = import("./coValueCore.js").CoValueHeader;
-  export type Transaction = import("./coValueCore.js").Transaction;
+  // biome-ignore format: inserts spurious trialing comma that breaks some parsers
+  export type CoValueHeader = import("./coValueCore/verifiedState.js").CoValueHeader;
+  // biome-ignore format: inserts spurious trialing comma that breaks some parsers
+  export type Transaction = import("./coValueCore/verifiedState.js").Transaction;
   export type TransactionID = import("./ids.js").TransactionID;
   export type Signature = import("./crypto/crypto.js").Signature;
   export type RawCoID = import("./ids.js").RawCoID;