cojson 0.4.7 → 0.4.13

package/src/localNode.ts

@@ -17,7 +17,6 @@ import {
 import {
     InviteSecret,
     Group,
-    expectGroup,
     secretSeedFromInviteSecret,
 } from "./coValues/group.js";
 import { Peer, SyncManager } from "./sync.js";
@@ -36,6 +35,7 @@ import {
 } from "./coValues/account.js";
 import { CoMap } from "./coValues/coMap.js";
 import { CoValue } from "./index.js";
+import { expectGroup } from "./typeUtils/expectGroup.js";
 
 /** A `LocalNode` represents a local view of a set of loaded `CoValue`s, from the perspective of a particular account (or primitive cryptographic agent).
 
@@ -199,10 +199,10 @@ export class LocalNode {
     }
 
     /** @internal */
-    loadCoValue(id: RawCoID): Promise<CoValueCore> {
+    loadCoValue(id: RawCoID, onProgress?: (progress: number) => void): Promise<CoValueCore> {
         let entry = this.coValues[id];
         if (!entry) {
-            entry = newLoadingState();
+            entry = newLoadingState(onProgress);
 
             this.coValues[id] = entry;
 
@@ -221,8 +221,8 @@ export class LocalNode {
      *
      * @category 3. Low-level
      */
-    async load<T extends CoValue>(id: CoID<T>): Promise<T> {
-        return (await this.loadCoValue(id)).getCurrentContent() as T;
+    async load<T extends CoValue>(id: CoID<T>, onProgress?: (progress: number) => void): Promise<T> {
+        return (await this.loadCoValue(id, onProgress)).getCurrentContent() as T;
     }
 
     /** @category 3. Low-level */
@@ -577,11 +577,12 @@ type CoValueState =
           state: "loading";
           done: Promise<CoValueCore>;
           resolve: (coValue: CoValueCore) => void;
+          onProgress?: (progress: number) => void;
       }
-    | { state: "loaded"; coValue: CoValueCore };
+    | { state: "loaded"; coValue: CoValueCore; onProgress?: (progress: number) => void; };
 
 /** @internal */
-export function newLoadingState(): CoValueState {
+export function newLoadingState(onProgress?: (progress: number) => void): CoValueState {
     let resolve: (coValue: CoValueCore) => void;
 
     const promise = new Promise<CoValueCore>((r) => {
@@ -592,5 +593,6 @@ export function newLoadingState(): CoValueState {
         state: "loading",
         done: promise,
         resolve: resolve!,
+        onProgress
     };
 }

package/src/permissions.ts

@@ -5,12 +5,13 @@ import { KeyID } from "./crypto.js";
 import {
     CoValueCore,
     Transaction,
-    accountOrAgentIDfromSessionID,
 } from "./coValueCore.js";
+import { accountOrAgentIDfromSessionID } from "./typeUtils/accountOrAgentIDfromSessionID.js";
 import { AgentID, RawCoID, SessionID, TransactionID } from "./ids.js";
 import { Account, AccountID, Profile } from "./coValues/account.js";
 import { parseJSON } from "./jsonStringify.js";
-import { EVERYONE, Everyone, expectGroup } from "./coValues/group.js";
+import { EVERYONE, Everyone } from "./coValues/group.js";
+import { expectGroup } from "./typeUtils/expectGroup.js";
 
 export type PermissionsDef =
     | { type: "group"; initialAdmin: AccountID | AgentID }

package/src/sync.ts

@@ -225,12 +225,19 @@ export class SyncManager {
                 peer.optimisticKnownStates[id] || emptyKnownState(id);
 
             const sendPieces = async () => {
+                let lastYield = performance.now();
                 for (const [_i, piece] of newContentPieces.entries()) {
                     // console.log(
                     //     `${id} -> ${peer.id}: Sending content piece ${i + 1}/${newContentPieces.length} header: ${!!piece.header}`,
                     //     // Object.values(piece.new).map((s) => s.newTransactions)
                     // );
                     await this.trySendToPeer(peer, piece);
+                    if (performance.now() - lastYield > 10) {
+                        await new Promise<void>((resolve) => {
+                            setTimeout(resolve, 0);
+                        });
+                        lastYield = performance.now();
+                    }
                 }
             };
 
@@ -315,19 +322,20 @@ export class SyncManager {
 
     trySendToPeer(peer: PeerState, msg: SyncMessage) {
         return new Promise<void>((resolve) => {
-            const timeout = setTimeout(() => {
-                console.error(
-                    new Error(
-                        `Writing to peer ${peer.id} took >1s - this should never happen as write should resolve quickly or error`
-                    )
-                );
-                resolve();
-            }, 1000);
+            const start = Date.now()
             peer.outgoing
                 .write(msg)
                 .then(() => {
-                    clearTimeout(timeout);
-                    resolve();
+                    const end = Date.now();
+                    if (end - start > 1000) {
+                        console.error(
+                            new Error(
+                                `Writing to peer "${peer.id}" took ${Math.round((Date.now() - start)/100)/10}s - this should never happen as write should resolve quickly or error`
+                            )
+                        );
+                    } else {
+                        resolve();
+                    }
                 })
                 .catch((e) => {
                     console.error(
@@ -450,6 +458,7 @@ export class SyncManager {
             entry = {
                 state: "loaded",
                 coValue: coValue,
+                onProgress: entry.onProgress
             };
 
             this.local.coValues[msg.id] = entry;
@@ -509,6 +518,11 @@ export class SyncManager {
                 );
             }
 
+            const theirTotalnTxs = Object.values(peer.optimisticKnownStates[msg.id]?.sessions || {}).reduce((sum, nTxs) => sum + nTxs, 0);
+            const ourTotalnTxs = Object.values(coValue.sessions).reduce((sum, session) => sum + session.transactions.length, 0);
+
+            entry.onProgress?.(ourTotalnTxs / theirTotalnTxs);
+
             if (!success) {
                 console.error(
                     "Failed to add transactions",
@@ -522,9 +536,9 @@ export class SyncManager {
                 continue;
             }
 
-            peerOptimisticKnownState.sessions[sessionID] =
+            peerOptimisticKnownState.sessions[sessionID] = Math.max(peerOptimisticKnownState.sessions[sessionID] || 0,
                 newContentForSession.after +
-                newContentForSession.newTransactions.length;
+                newContentForSession.newTransactions.length);
         }
 
         if (resolveAfterDone) {

package/src/tests/testUtils.ts

@@ -1,7 +1,7 @@
 import { AgentSecret, createdNowUnique, getAgentID, newRandomAgentSecret  } from "../crypto.js";
 import { newRandomSessionID } from "../coValueCore.js";
 import { LocalNode } from "../localNode.js";
-import { expectGroup } from "../coValues/group.js";
+import { expectGroup } from "../typeUtils/expectGroup.js";
 import { AnonymousControlledAccount } from "../coValues/account.js";
 import { SessionID } from "../ids.js";
 // @ts-ignore

package/src/typeUtils/accountOrAgentIDfromSessionID.ts

@@ -0,0 +1,9 @@
+import { AgentID, SessionID } from "../ids.js";
+import { AccountID } from "../coValues/account.js";
+
+
+export function accountOrAgentIDfromSessionID(
+    sessionID: SessionID
+): AccountID | AgentID {
+    return sessionID.split("_session")[0] as AccountID | AgentID;
+}

package/src/typeUtils/expectGroup.ts

@@ -0,0 +1,15 @@
+import { expectMap, type CoValue } from "../coValue.js";
+import { Group } from "../coValues/group.js";
+
+export function expectGroup(content: CoValue): Group {
+    const map = expectMap(content);
+    if (map.core.header.ruleset.type !== "group") {
+        throw new Error("Expected group ruleset in group");
+    }
+
+    if (!(map instanceof Group)) {
+        throw new Error("Expected group");
+    }
+
+    return map;
+}

package/src/typeUtils/isAccountID.ts

@@ -0,0 +1,7 @@
+import type { AccountID } from "../coValues/account.js";
+import type { AgentID } from "../ids.js";
+
+
+export function isAccountID(id: AccountID | AgentID): id is AccountID {
+    return id.startsWith("co_");
+}

package/src/typeUtils/isCoValue.ts

@@ -0,0 +1,18 @@
+import { type CoValue } from "../coValue.js";
+import type { JsonValue } from "../jsonValue.js";
+import { CoMap } from "../coValues/coMap.js";
+import { CoList } from "../coValues/coList.js";
+import { CoStream } from "../coValues/coStream.js";
+import { BinaryCoStream } from "../coValues/coStream.js";
+
+
+export function isCoValue(
+    value: JsonValue | CoValue | undefined
+): value is CoValue {
+    return (
+        value instanceof CoMap ||
+        value instanceof CoList ||
+        value instanceof CoStream ||
+        value instanceof BinaryCoStream
+    );
+}

package/dist/typeCheckers.js

@@ -1,7 +0,0 @@
-export function isCoValue(value) {
-    return (typeof value === "object" && !!value && "id" in value && "headerMeta" in value && "core" in value);
-}
-export function isAccountID(id) {
-    return id.startsWith("co_");
-}
-//# sourceMappingURL=typeCheckers.js.map

package/dist/typeCheckers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"typeCheckers.js","sourceRoot":"","sources":["../src/typeCheckers.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,SAAS,CACrB,KAAsC;IAEtC,OAAO,CACH,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,YAAY,IAAI,KAAK,IAAI,MAAM,IAAI,KAAK,CACpG,CAAC;AACN,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,EAAuB;IAC/C,OAAO,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC"}

package/src/typeCheckers.ts

@@ -1,15 +0,0 @@
-import type { CoValue } from "./coValue.js";
-import type { AccountID, AgentID, JsonValue } from "./index.js";
-
-
-export function isCoValue(
-    value: JsonValue | CoValue | undefined
-): value is CoValue {
-    return (
-        typeof value === "object" && !!value && "id" in value && "headerMeta" in value && "core" in value
-    );
-}
-
-export function isAccountID(id: AccountID | AgentID): id is AccountID {
-    return id.startsWith("co_");
-}