cojson 0.2.3 → 0.3.0

package/src/coValues/coStream.ts

@@ -2,9 +2,9 @@ import { JsonObject, JsonValue } from "../jsonValue.js";
 import { CoValue, CoID, isCoValue } from "../coValue.js";
 import { CoValueCore, accountOrAgentIDfromSessionID } from "../coValueCore.js";
 import { Group } from "../group.js";
-import { SessionID } from "../ids.js";
+import { AgentID, SessionID, TransactionID } from "../ids.js";
 import { base64URLtoBytes, bytesToBase64url } from "../base64url.js";
-import { AccountID, isAccountID } from "../account.js";
+import { AccountID } from "../account.js";
 import { parseJSON } from "../jsonStringify.js";
 
 export type BinaryStreamInfo = {
@@ -33,13 +33,14 @@ export type BinaryStreamItem =
     | BinaryStreamChunk
     | BinaryStreamEnd;
 
-export type CoStreamItem<T extends JsonValue | CoValue> = {
-    item: T extends CoValue ? CoID<T> : Exclude<T, CoValue>;
+export type CoStreamItem<Item extends JsonValue | CoValue> = {
+    value: Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>;
+    tx: TransactionID;
     madeAt: number;
 };
 
-export class CoStream<
-    T extends JsonValue | CoValue,
+export class CoStreamView<
+    Item extends JsonValue | CoValue,
     Meta extends JsonObject | null = null
 > implements CoValue
 {
@@ -47,8 +48,9 @@ export class CoStream<
     type = "costream" as const;
     core: CoValueCore;
     items: {
-        [key: SessionID]: CoStreamItem<T>[];
+        [key: SessionID]: CoStreamItem<Item>[];
     };
+    readonly _item!: Item;
 
     constructor(core: CoValueCore) {
         this.id = core.id as CoID<this>;
@@ -65,6 +67,11 @@ export class CoStream<
         return this.core.getGroup();
     }
 
+    /** Not yet implemented */
+    atTime(_time: number): this {
+        throw new Error("Not yet implemented");
+    }
+
     /** @internal */
     protected fillFromCoValue() {
         this.items = {};
@@ -75,21 +82,21 @@ export class CoStream<
             changes,
         } of this.core.getValidSortedTransactions()) {
             for (const changeUntyped of parseJSON(changes)) {
-                const change = changeUntyped as T extends CoValue
-                    ? CoID<T>
-                    : Exclude<T, CoValue>;
+                const change = changeUntyped as Item extends CoValue
+                    ? CoID<Item>
+                    : Exclude<Item, CoValue>;
                 let entries = this.items[txID.sessionID];
                 if (!entries) {
                     entries = [];
                     this.items[txID.sessionID] = entries;
                 }
-                entries.push({ item: change, madeAt });
+                entries.push({ value: change, madeAt, tx: txID });
             }
         }
     }
 
     getSingleStream():
-        | (T extends CoValue ? CoID<T> : Exclude<T, CoValue>)[]
+        | (Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>)[]
         | undefined {
         if (Object.keys(this.items).length === 0) {
             return undefined;
@@ -99,78 +106,134 @@ export class CoStream<
             );
         }
 
-        return Object.values(this.items)[0]?.map((item) => item.item);
+        return Object.values(this.items)[0]?.map((item) => item.value);
     }
 
-    getLastItemsPerAccount(): {
-        [account: AccountID]:
-            | (T extends CoValue ? CoID<T> : Exclude<T, CoValue>)
-            | undefined;
-    } {
-        const result: { [account: AccountID]: CoStreamItem<T> | undefined } =
-            {};
+    sessions(): SessionID[] {
+        return Object.keys(this.items) as SessionID[];
+    }
 
-        for (const [sessionID, items] of Object.entries(this.items)) {
-            const account = accountOrAgentIDfromSessionID(
-                sessionID as SessionID
-            );
-            if (!isAccountID(account)) continue;
-            if (items.length > 0) {
-                const lastItemOfSession = items[items.length - 1]!;
-                if (
-                    !result[account] ||
-                    lastItemOfSession.madeAt > result[account]!.madeAt
-                ) {
-                    result[account] = lastItemOfSession;
-                }
-            }
-        }
+    accounts(): Set<AccountID | AgentID> {
+        return new Set(this.sessions().map(accountOrAgentIDfromSessionID));
+    }
 
-        return Object.fromEntries(
-            Object.entries(result).map(([account, item]) => [
-                account,
-                item?.item,
-            ])
-        );
+    nthItemIn(
+        sessionID: SessionID,
+        n: number
+    ):
+        | {
+              by: AccountID | AgentID;
+              tx: TransactionID;
+              at: Date;
+              value: Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>;
+          }
+        | undefined {
+        const items = this.items[sessionID];
+        if (!items) return;
+
+        const item = items[n];
+        if (!item) return;
+
+        return {
+            by: accountOrAgentIDfromSessionID(sessionID),
+            tx: item.tx,
+            at: new Date(item.madeAt),
+            value: item.value,
+        };
+    }
+
+    lastItemIn(sessionID: SessionID):
+        | {
+              by: AccountID | AgentID;
+              tx: TransactionID;
+              at: Date;
+              value: Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>;
+          }
+        | undefined {
+        const items = this.items[sessionID];
+        if (!items) return;
+        return this.nthItemIn(sessionID, items.length - 1);
+    }
+
+    *itemsIn(sessionID: SessionID) {
+        const items = this.items[sessionID];
+        if (!items) return;
+        for (const item of items) {
+            yield {
+                by: accountOrAgentIDfromSessionID(sessionID),
+                tx: item.tx,
+                at: new Date(item.madeAt),
+                value: item.value,
+            };
+        }
     }
 
-    getLastItemFrom(
-        account: AccountID
-    ): (T extends CoValue ? CoID<T> : Exclude<T, CoValue>) | undefined {
-        let lastItem: CoStreamItem<T> | undefined;
+    lastItemBy(account: AccountID | AgentID):
+        | {
+              by: AccountID | AgentID;
+              tx: TransactionID;
+              at: Date;
+              value: Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>;
+          }
+        | undefined {
+        let latestItem:
+            | {
+                  by: AccountID | AgentID;
+                  tx: TransactionID;
+                  at: Date;
+                  value: Item extends CoValue
+                      ? CoID<Item>
+                      : Exclude<Item, CoValue>;
+              }
+            | undefined;
 
-        for (const [sessionID, items] of Object.entries(this.items)) {
+        for (const sessionID of Object.keys(this.items)) {
             if (sessionID.startsWith(account)) {
-                if (items.length > 0) {
-                    const lastItemOfSession = items[items.length - 1]!;
-                    if (
-                        !lastItem ||
-                        lastItemOfSession.madeAt > lastItem.madeAt
-                    ) {
-                        lastItem = lastItemOfSession;
-                    }
+                const item = this.lastItemIn(sessionID as SessionID);
+                if (!item) continue;
+                if (!latestItem || item.at > latestItem.at) {
+                    latestItem = {
+                        by: item.by,
+                        tx: item.tx,
+                        at: item.at,
+                        value: item.value,
+                    };
                 }
             }
         }
 
-        return lastItem?.item;
+        return latestItem;
     }
 
-    getLastItemFromMe():
-        | (T extends CoValue ? CoID<T> : Exclude<T, CoValue>)
-        | undefined {
-        const myAccountID = this.core.node.account.id;
-        if (!isAccountID(myAccountID)) return undefined;
-        return this.getLastItemFrom(myAccountID);
+    *itemsBy(account: AccountID | AgentID) {
+        // TODO: this can be made more lazy without a huge collect and sort
+        const items = [
+            ...Object.keys(this.items).flatMap((sessionID) =>
+                sessionID.startsWith(account)
+                    ? [...this.itemsIn(sessionID as SessionID)].map((item) => ({
+                          in: sessionID as SessionID,
+                          ...item,
+                      }))
+                    : []
+            ),
+        ];
+
+        items.sort((a, b) => a.at.getTime() - b.at.getTime());
+
+        for (const item of items) {
+            yield item;
+        }
     }
 
     toJSON(): {
-        [key: SessionID]: (T extends CoValue ? CoID<T> : Exclude<T, CoValue>)[];
+        [key: SessionID]: (Item extends CoValue
+            ? CoID<Item>
+            : Exclude<Item, CoValue>)[];
     } {
         return Object.fromEntries(
             Object.entries(this.items).map(([sessionID, items]) => [
                 sessionID,
-                items.map((item) => item.item),
+                items.map((item) => item.value),
             ])
         );
     }
@@ -180,20 +243,57 @@ export class CoStream<
             listener(content as this);
         });
     }
+}
 
-    edit(changer: (editable: WriteableCoStream<T, Meta>) => void): this {
-        const editable = new WriteableCoStream<T, Meta>(this.core);
-        changer(editable);
+export class CoStream<
+        Item extends JsonValue | CoValue,
+        Meta extends JsonObject | null = null
+    >
+    extends CoStreamView<Item, Meta>
+    implements CoValue
+{
+    push(
+        item: Item extends CoValue ? Item | CoID<Item> : Item,
+        privacy: "private" | "trusting" = "private"
+    ): this {
+        this.core.makeTransaction([isCoValue(item) ? item.id : item], privacy);
         return new CoStream(this.core) as this;
     }
+
+    mutate(mutator: (mutable: MutableCoStream<Item, Meta>) => void): this {
+        const mutable = new MutableCoStream<Item, Meta>(this.core);
+        mutator(mutable);
+        return new CoStream(this.core) as this;
+    }
+
+    /** @deprecated Use `mutate` instead. */
+    edit(mutator: (mutable: MutableCoStream<Item, Meta>) => void): this {
+        return this.mutate(mutator);
+    }
+}
+
+export class MutableCoStream<
+        Item extends JsonValue | CoValue,
+        Meta extends JsonObject | null = null
+    >
+    extends CoStreamView<Item, Meta>
+    implements CoValue
+{
+    push(
+        item: Item extends CoValue ? Item | CoID<Item> : Item,
+        privacy: "private" | "trusting" = "private"
+    ) {
+        this.core.makeTransaction([isCoValue(item) ? item.id : item], privacy);
+        this.fillFromCoValue();
+    }
 }
 
 const binary_U_prefixLength = 8; // "binary_U".length;
 
-export class BinaryCoStream<
+export class BinaryCoStreamView<
         Meta extends BinaryCoStreamMeta = { type: "binary" }
     >
-    extends CoStream<BinaryStreamItem, Meta>
+    extends CoStreamView<BinaryStreamItem, Meta>
     implements CoValue
 {
     id!: CoID<this>;
@@ -256,52 +356,85 @@ export class BinaryCoStream<
             finished,
         };
     }
-
-    edit(changer: (editable: WriteableBinaryCoStream<Meta>) => void): this {
-        const editable = new WriteableBinaryCoStream<Meta>(this.core);
-        changer(editable);
-        return new BinaryCoStream(this.core) as this;
-    }
 }
 
-export class WriteableCoStream<
-        T extends JsonValue | CoValue,
-        Meta extends JsonObject | null = null
+export class BinaryCoStream<
+        Meta extends BinaryCoStreamMeta = { type: "binary" }
     >
-    extends CoStream<T, Meta>
+    extends BinaryCoStreamView<Meta>
     implements CoValue
 {
     /** @internal */
-    edit(_changer: (editable: WriteableCoStream<T, Meta>) => void): this {
-        throw new Error("Already editing.");
+    push(
+        item: BinaryStreamItem,
+        privacy: "private" | "trusting" = "private"
+    ): this {
+        this.core.makeTransaction([item], privacy);
+        return new BinaryCoStream(this.core) as this;
     }
 
-    push(
-        item: T extends CoValue ? T | CoID<T> : T,
+    startBinaryStream(
+        settings: BinaryStreamInfo,
         privacy: "private" | "trusting" = "private"
-    ) {
-        this.core.makeTransaction(
-            [isCoValue(item) ? item.id : item],
+    ): this {
+        return this.push(
+            {
+                type: "start",
+                ...settings,
+            } satisfies BinaryStreamStart,
             privacy
         );
-        this.fillFromCoValue();
+    }
+
+    pushBinaryStreamChunk(
+        chunk: Uint8Array,
+        privacy: "private" | "trusting" = "private"
+    ): this {
+        // const before = performance.now();
+        return this.push(
+            {
+                type: "chunk",
+                chunk: `binary_U${bytesToBase64url(chunk)}`,
+            } satisfies BinaryStreamChunk,
+            privacy
+        );
+        // const after = performance.now();
+        // console.log(
+        //     "pushBinaryStreamChunk bandwidth in MB/s",
+        //     (1000 * chunk.length) / (after - before) / (1024 * 1024)
+        // );
+    }
+
+    endBinaryStream(privacy: "private" | "trusting" = "private"): this {
+        return this.push(
+            {
+                type: "end",
+            } satisfies BinaryStreamEnd,
+            privacy
+        );
+    }
+
+    mutate(mutator: (mutable: MutableBinaryCoStream<Meta>) => void): this {
+        const mutable = new MutableBinaryCoStream<Meta>(this.core);
+        mutator(mutable);
+        return new BinaryCoStream(this.core) as this;
+    }
+
+    /** @deprecated Use `mutate` instead. */
+    edit(mutator: (mutable: MutableBinaryCoStream<Meta>) => void): this {
+        return this.mutate(mutator);
     }
 }
 
-export class WriteableBinaryCoStream<
+export class MutableBinaryCoStream<
         Meta extends BinaryCoStreamMeta = { type: "binary" }
     >
-    extends BinaryCoStream<Meta>
+    extends BinaryCoStreamView<Meta>
     implements CoValue
 {
-    /** @internal */
-    edit(_changer: (editable: WriteableBinaryCoStream<Meta>) => void): this {
-        throw new Error("Already editing.");
-    }
-
     /** @internal */
     push(item: BinaryStreamItem, privacy: "private" | "trusting" = "private") {
-        WriteableCoStream.prototype.push.call(this, item, privacy);
+        MutableCoStream.prototype.push.call(this, item, privacy);
     }
 
     startBinaryStream(

package/src/crypto.ts

@@ -6,33 +6,39 @@ import { randomBytes } from "@noble/ciphers/webcrypto/utils";
 import { AgentID, RawCoID, TransactionID } from "./ids.js";
 import { base64URLtoBytes, bytesToBase64url } from "./base64url.js";
 
-import { createBLAKE3 } from 'hash-wasm';
+import { createBLAKE3 } from "hash-wasm";
 import { Stringified, parseJSON, stableStringify } from "./jsonStringify.js";
 
 let blake3Instance: Awaited<ReturnType<typeof createBLAKE3>>;
 let blake3HashOnce: (data: Uint8Array) => Uint8Array;
-let blake3HashOnceWithContext: (data: Uint8Array, {context}: {context: Uint8Array}) => Uint8Array;
-let blake3incrementalUpdateSLOW_WITH_DEVTOOLS: (state: Uint8Array, data: Uint8Array) => Uint8Array;
+let blake3HashOnceWithContext: (
+    data: Uint8Array,
+    { context }: { context: Uint8Array }
+) => Uint8Array;
+let blake3incrementalUpdateSLOW_WITH_DEVTOOLS: (
+    state: Uint8Array,
+    data: Uint8Array
+) => Uint8Array;
 let blake3digestForState: (state: Uint8Array) => Uint8Array;
 
 export const cryptoReady = new Promise<void>((resolve) => {
-    createBLAKE3().then(bl3 => {
+    createBLAKE3().then((bl3) => {
         blake3Instance = bl3;
         blake3HashOnce = (data) => {
-            return bl3.init().update(data).digest('binary');
-        }
-        blake3HashOnceWithContext = (data, {context}) => {
-            return bl3.init().update(context).update(data).digest('binary');
-        }
+            return bl3.init().update(data).digest("binary");
+        };
+        blake3HashOnceWithContext = (data, { context }) => {
+            return bl3.init().update(context).update(data).digest("binary");
+        };
         blake3incrementalUpdateSLOW_WITH_DEVTOOLS = (state, data) => {
             bl3.load(state).update(data);
             return bl3.save();
-        }
+        };
         blake3digestForState = (state) => {
-            return bl3.load(state).digest('binary');
-        }
+            return bl3.load(state).digest("binary");
+        };
         resolve();
-    })
+    });
 });
 
 export type SignerSecret = `signerSecret_z${string}`;
@@ -149,12 +155,17 @@ export function getAgentSealerSecret(agentSecret: AgentSecret): SealerSecret {
     return agentSecret.split("/")[0] as SealerSecret;
 }
 
-export function seal<T extends JsonValue>(
-    message: T,
-    from: SealerSecret,
-    to: SealerID,
-    nOnceMaterial: { in: RawCoID; tx: TransactionID }
-): Sealed<T> {
+export function seal<T extends JsonValue>({
+    message,
+    from,
+    to,
+    nOnceMaterial,
+}: {
+    message: T;
+    from: SealerSecret;
+    to: SealerID;
+    nOnceMaterial: { in: RawCoID; tx: TransactionID };
+}): Sealed<T> {
     const nOnce = blake3HashOnce(
         textEncoder.encode(stableStringify(nOnceMaterial))
     ).slice(0, 24);
@@ -220,9 +231,12 @@ export class StreamingHash {
     }
 
     update(value: JsonValue) {
-        const encoded = textEncoder.encode(stableStringify(value))
+        const encoded = textEncoder.encode(stableStringify(value));
         // const before = performance.now();
-        this.state = blake3incrementalUpdateSLOW_WITH_DEVTOOLS(this.state, encoded);
+        this.state = blake3incrementalUpdateSLOW_WITH_DEVTOOLS(
+            this.state,
+            encoded
+        );
         // const after = performance.now();
         // console.log(`Hashing throughput in MB/s`, 1000 * (encoded.length / (after - before)) / (1024 * 1024));
     }
@@ -333,8 +347,7 @@ function decryptRaw<T extends JsonValue, N extends JsonValue>(
     );
     const plaintext = xsalsa20(keySecretBytes, nOnce, ciphertext);
 
-        return textDecoder.decode(plaintext) as Stringified<T>;
-
+    return textDecoder.decode(plaintext) as Stringified<T>;
 }
 
 function decrypt<T extends JsonValue, N extends JsonValue>(
@@ -345,7 +358,7 @@ function decrypt<T extends JsonValue, N extends JsonValue>(
     try {
         return parseJSON(decryptRaw(encrypted, keySecret, nOnceMaterial));
     } catch (e) {
-        console.error("Decryption error", e)
+        console.error("Decryption error", e);
         return undefined;
     }
 }