@peerbit/log 1.0.14 → 2.0.0

package/lib/esm/heads.js

@@ -1,21 +1,23 @@
-import { Entry } from "./entry.js";
 import { HeadsCache } from "./heads-cache.js";
+import { logger } from "./logger.js";
 export class HeadsIndex {
     _id;
     _index = new Set();
-    _gids;
+    _gids; // gid -> hash -> entry
     _headsCache;
     _config;
+    _onGidRemoved;
     constructor(id) {
         this._gids = new Map();
         this._id = id;
     }
-    async init(config, options = {}) {
-        this._config = config;
+    async init(log, options = {}) {
+        this._config = log;
+        this._onGidRemoved = options.onGidRemoved;
         await this.reset(options?.entries || []);
-        if (config.memory) {
+        if (log.memory) {
             this._headsCache = new HeadsCache(this);
-            return this._headsCache.init(await config.memory.sublevel("heads"));
+            return this._headsCache.init(await log.memory.sublevel("heads"));
         }
     }
     async load(options) {
@@ -27,20 +29,17 @@ export class HeadsIndex {
         if (!heads) {
             return;
         }
-        try {
-            const entries = await Promise.all(heads.map(async (x) => {
-                const entry = await Entry.fromMultihash(this._config.storage, x, options);
-                entry.init(this._config);
-                await entry.getGid(); // decrypt gid
-                return entry;
-            }));
-            await this.reset(entries);
-            return entries;
-        }
-        catch (error) {
-            const q = 123;
-            throw error;
-        }
+        const entries = await Promise.all(heads.map(async (x) => {
+            const entry = await this._config.entryIndex.get(x, { load: true });
+            if (!entry) {
+                logger.error("Failed to load entry from head with hash: " + x);
+                return;
+            }
+            await entry.getMeta(); // TODO types,decrypt gid
+            return entry;
+        }));
+        await this.reset(entries.filter((x) => !!x));
+        return entries;
     }
     get headsCache() {
         return this._headsCache;
@@ -65,22 +64,26 @@ export class HeadsIndex {
     }
     async reset(entries, options = { cache: { reset: true, update: true } }) {
         this._index.clear();
+        const gidKeys = [...this._gids.keys()];
         this._gids = new Map();
-        if (entries) {
+        if (entries?.length > 0) {
             await this.putAll(entries, options); // reset cache = true
         }
+        if (gidKeys.length > 0) {
+            this._onGidRemoved?.(gidKeys);
+        }
     }
     has(cid) {
         return this._index.has(cid);
     }
     async put(entry, options) {
-        this._putOne(entry);
+        await this._putOne(entry);
         if (options?.cache?.update) {
             await this._headsCache?.queue({ added: [entry] }, options.cache.reset);
         }
     }
     async putAll(entries, options) {
-        this._putAll(entries);
+        await this._putAll(entries);
         if (options?.cache?.update) {
             await this._headsCache?.queue({ added: entries }, options.cache.reset);
         }
@@ -91,7 +94,7 @@ export class HeadsIndex {
     async updateHeadsCache(change = {}, reset) {
         await this._headsCache?.queue(change, reset);
     }
-    _putOne(entry) {
+    async _putOne(entry) {
         if (!entry.hash) {
             throw new Error("Missing hash");
         }
@@ -99,44 +102,49 @@ export class HeadsIndex {
             return;
         }
         this._index.add(entry.hash);
-        if (!this._gids.has(entry.gid)) {
-            this._gids.set(entry.gid, 1);
+        const map = this._gids.get(entry.meta.gid);
+        if (!map) {
+            const newMap = new Map();
+            this._gids.set(entry.meta.gid, newMap);
+            newMap.set(entry.hash, entry);
         }
         else {
-            this._gids.set(entry.gid, this._gids.get(entry.gid) + 1);
+            map.set(entry.hash, entry);
+        }
+        for (const next of entry.next) {
+            const indexedEntry = this._config.entryIndex.getShallow(next);
+            if (indexedEntry) {
+                await this.del(indexedEntry);
+            }
         }
     }
-    _putAll(entries) {
+    async _putAll(entries) {
         for (const entry of entries) {
-            this._putOne(entry);
+            await this._putOne(entry);
         }
     }
     async del(entry, options) {
         const wasHead = this._index.delete(entry.hash);
         if (!wasHead) {
-            return {
-                lastWithGid: false,
-                removed: false,
-            };
+            return false;
         }
-        const newValue = this._gids.get(entry.gid) - 1;
-        const lastWithGid = newValue <= 0;
-        if (newValue <= 0) {
-            this._gids.delete(entry.gid);
-        }
-        else {
-            this._gids.set(entry.gid, newValue);
+        let removedGids = undefined;
+        const map = this._gids.get(entry.meta.gid);
+        map.delete(entry.hash);
+        if (map.size <= 0) {
+            this._gids.delete(entry.meta.gid);
+            (removedGids || (removedGids = new Set())).add(entry.meta.gid);
         }
         if (!entry.hash) {
             throw new Error("Missing hash");
         }
+        if (removedGids) {
+            await this._onGidRemoved?.([...removedGids]);
+        }
         if (wasHead && options?.cache?.update) {
             await this._headsCache?.queue({ removed: [entry.hash] }, options.cache.reset);
         }
-        return {
-            removed: wasHead,
-            lastWithGid: lastWithGid,
-        };
+        return wasHead;
         //     this._headsCache = undefined; // TODO do smarter things here, only remove the element needed (?)
     }
 }

package/lib/esm/heads.js.map

@@ -1 +1 @@
-{"version":3,"file":"heads.js","sourceRoot":"","sources":["../../src/heads.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"heads.js","sourceRoot":"","sources":["../../src/heads.ts"],"names":[],"mappings":"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"}

package/lib/esm/log-sorting.d.ts

@@ -1,5 +1,5 @@
-import { Entry } from "./entry.js";
-export type ISortFunction = <T>(a: Entry<T>, b: Entry<T>, resolveConflict?: (a: Entry<T>, b: Entry<T>) => number) => number;
+import { ShallowEntry } from "./entry.js";
+export type ISortFunction = <T>(a: ShallowEntry, b: ShallowEntry, resolveConflict?: (a: ShallowEntry, b: ShallowEntry) => number) => number;
 /**
  * Sort two entries as Last-Write-Wins (LWW).
  *
@@ -41,4 +41,4 @@ export declare const SortByClockId: ISortFunction;
  * @returns {function(a, b)} 1 if a is greater, -1 if b is greater
  * @throws {Error} if func ever returns 0
  */
-export declare const NoZeroes: (func: ISortFunction) => <T>(a: Entry<T>, b: Entry<T>) => number;
+export declare const NoZeroes: (func: ISortFunction) => <T>(a: ShallowEntry, b: ShallowEntry) => number;

package/lib/esm/log-sorting.js

@@ -48,7 +48,7 @@ export const SortByEntryHash = (a, b) => {
  */
 export const SortByClocks = (a, b, resolveConflict) => {
     // Compare the clocks
-    const diff = Clock.compare(a.metadata.clock, b.metadata.clock);
+    const diff = Clock.compare(a.meta.clock, b.meta.clock);
     // If the clocks are concurrent, use the provided
     // conflict resolution function to determine which comes first
     return diff === 0 ? (resolveConflict || First)(a, b) : diff;
@@ -63,7 +63,7 @@ export const SortByClocks = (a, b, resolveConflict) => {
 export const SortByClockId = (a, b, resolveConflict) => {
     // Sort by ID if clocks are concurrent,
     // take the entry with a "greater" clock id
-    const clockCompare = compare(a.metadata.clock.id, b.metadata.clock.id);
+    const clockCompare = compare(a.meta.clock.id, b.meta.clock.id);
     return clockCompare === 0 ? (resolveConflict || First)(a, b) : clockCompare;
 };
 /**

package/lib/esm/log-sorting.js.map

@@ -1 +1 @@
-{"version":3,"file":"log-sorting.js","sourceRoot":"","sources":["../../src/log-sorting.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,IAAI,KAAK,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,MAAM,KAAK,GAAG,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC;AAOpC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,aAAa,GAAkB,CAAI,CAAW,EAAE,CAAW,EAAE,EAAE;IAC3E,yDAAyD;IACzD,wEAAwE;IACxE,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAE,CAAW,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC1E,uDAAuD;IACvD,gEAAgE;IAChE,MAAM,iBAAiB,GAAG,CAAC,CAAW,EAAE,CAAW,EAAE,EAAE,CACtD,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC9B,0DAA0D;IAC1D,OAAO,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;IACtD,gDAAgD;IAChD,MAAM,WAAW,GAAG,CAAC,CAAa,EAAE,CAAa,EAAE,EAAE,CACpD,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,sEAAsE;IACtE,MAAM,QAAQ,GAAG,CAAC,CAAa,EAAE,CAAa,EAAE,EAAE,CACjD,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;IAClC,uDAAuD;IACvD,gEAAgE;IAChE,MAAM,iBAAiB,GAAG,CAAC,CAAa,EAAE,CAAa,EAAE,EAAE,CAC1D,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC9B,0DAA0D;IAC1D,OAAO,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,YAAY,GAAkB,CAC1C,CAAW,EACX,CAAW,EACX,eAA0D,EACzD,EAAE;IACH,qBAAqB;IACrB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/D,iDAAiD;IACjD,8DAA8D;IAC9D,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,aAAa,GAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE;IACrE,uCAAuC;IACvC,2CAA2C;IAC3C,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvE,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAC7E,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAmB,EAAE,EAAE;IAC/C,MAAM,UAAU,GAAG,CAAI,CAAW,EAAE,CAAW,EAAE,EAAE;QAClD,mCAAmC;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,MAAM,KAAK,CAAC,EAAE;YACjB,MAAM,KAAK,CACV,mCAAmC,IAAI,CAAC,IAAI,6CAA6C,CACzF,CAAC;SACF;QACD,OAAO,MAAM,CAAC;IACf,CAAC,CAAC;IAEF,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC"}
+{"version":3,"file":"log-sorting.js","sourceRoot":"","sources":["../../src/log-sorting.ts"],"names":[],"mappings":"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"}

package/lib/esm/log.d.ts

@@ -13,6 +13,7 @@ import { EntryWithRefs } from "./entry-with-refs.js";
 import { Blocks } from "@peerbit/blocks-interface";
 export type LogEvents<T> = {
     onChange?: (change: Change<T>) => void;
+    onGidRemoved?: (gids: string[]) => Promise<void> | void;
 };
 export type MemoryProperties = {
     cache?: SimpleLevel;
@@ -27,17 +28,19 @@ export type LogProperties<T> = {
 };
 export type LogOptions<T> = LogProperties<T> & LogEvents<T> & MemoryProperties;
 export type AppendOptions<T> = {
-    type?: EntryType;
-    gidSeed?: Uint8Array;
-    nexts?: Entry<any>[];
+    meta?: {
+        type?: EntryType;
+        gidSeed?: Uint8Array;
+        data?: Uint8Array;
+        timestamp?: Timestamp;
+        next?: Entry<any>[];
+    };
     identity?: Identity;
     signers?: ((data: Uint8Array) => Promise<SignatureWithKey> | SignatureWithKey)[];
-    onGidsShadowed?: (gids: string[]) => void;
     trim?: TrimOptions;
-    timestamp?: Timestamp;
     encryption?: {
         keypair: X25519Keypair;
-        reciever: EncryptionTemplateMaybeEncrypted;
+        receiver: EncryptionTemplateMaybeEncrypted;
     };
 };
 export declare class Log<T> {
@@ -73,6 +76,7 @@ export declare class Log<T> {
      */
     get length(): number;
     get values(): Values<T>;
+    get canAppend(): CanAppend<T> | undefined;
     /**
      * Checks if a entry is part of the log
      * @param {string} hash The hash of the entry

package/lib/esm/log.js

@@ -13,7 +13,6 @@ import { Cache } from "@peerbit/cache";
 import { EntryIndex } from "./entry-index.js";
 import * as LogError from "./log-errors.js";
 import * as Sorting from "./log-sorting.js";
-import { isDefined } from "./is-defined.js";
 import { findUniques } from "./find-uniques.js";
 import { Entry, EntryType, } from "./entry.js";
 import { HLC, LamportClock as Clock, } from "./clock.js";
@@ -51,18 +50,18 @@ export let Log = Log_1 = class Log {
         this._id = properties?.id || randomBytes(32);
     }
     async open(store, identity, options = {}) {
-        if (!isDefined(store)) {
+        if (store == null) {
             throw LogError.BlockStoreNotDefinedError();
         }
-        if (!isDefined(identity)) {
+        if (identity == null) {
             throw new Error("Identity is required");
         }
         if (this.closed === false) {
             throw new Error("Already open");
         }
-        const { encoding, trim, keychain, cache } = options;
+        const { encoding, trim, keychain, cache, onGidRemoved } = options;
         let { sortFn } = options;
-        if (!isDefined(sortFn)) {
+        if (sortFn == null) {
             sortFn = LastWriteWins;
         }
         sortFn = sortFn;
@@ -86,7 +85,7 @@ export let Log = Log_1 = class Log {
             throw new Error("Id not set");
         }
         this._headsIndex = new HeadsIndex(id);
-        await this._headsIndex.init(this);
+        await this._headsIndex.init(this, { onGidRemoved });
         this._entryCache = new Cache({ max: ENTRY_CACHE_MAX });
         this._entryIndex = new EntryIndex({
             store: this._storage,
@@ -97,15 +96,15 @@ export let Log = Log_1 = class Log {
         this._trim = new Trim({
             deleteNode: async (node) => {
                 // TODO check if we have before delete?
-                const entry = await this.get(node.value.hash);
+                const entry = await this.get(node.value);
                 //f (!!entry)
                 const a = this.values.length;
                 if (entry) {
                     this.values.deleteNode(node);
-                    await this.entryIndex.delete(node.value.hash);
-                    await this.headsIndex.del(node.value);
-                    this.nextsIndex.delete(node.value.hash);
-                    await this.storage.rm(node.value.hash);
+                    await this.headsIndex.del(this.entryIndex.getShallow(node.value));
+                    await this.entryIndex.delete(node.value);
+                    this.nextsIndex.delete(node.value);
+                    await this.storage.rm(node.value);
                 }
                 const b = this.values.length;
                 if (a === b) {
@@ -158,6 +157,9 @@ export let Log = Log_1 = class Log {
     get values() {
         return this._values;
     }
+    get canAppend() {
+        return this._canAppend;
+    }
     /**
      * Checks if a entry is part of the log
      * @param {string} hash The hash of the entry
@@ -376,41 +378,43 @@ export let Log = Log_1 = class Log {
      */
     async append(data, options = {}) {
         // Update the clock (find the latest clock)
-        if (options.nexts) {
-            for (const n of options.nexts) {
+        if (options.meta?.next) {
+            for (const n of options.meta.next) {
                 if (!n.hash)
                     throw new Error("Expecting nexts to already be saved. missing hash for one or more entries");
             }
         }
         await this.load({ reload: false });
-        const hasNext = !!options.nexts; // true for [], which means we have explicitly said that nexts are empty
-        const nexts = options.nexts || (await this.getHeads());
+        const nexts = options.meta?.next || (await this.getHeads());
         // Calculate max time for log/graph
         const clock = new Clock({
             id: this._identity.publicKey.bytes,
-            timestamp: options.timestamp || this._hlc.now(),
+            timestamp: options?.meta?.timestamp || this._hlc.now(),
         });
         const entry = await Entry.create({
             store: this._storage,
             identity: options.identity || this._identity,
             signers: options.signers,
             data,
-            clock,
-            type: options.type,
+            meta: {
+                clock,
+                type: options.meta?.type,
+                gidSeed: options.meta?.gidSeed,
+                data: options.meta?.data,
+                next: nexts,
+            },
             encoding: this._encoding,
-            next: nexts,
-            gidSeed: options.gidSeed,
             encryption: options.encryption
                 ? {
                     keypair: options.encryption.keypair,
-                    reciever: {
-                        ...options.encryption.reciever,
+                    receiver: {
+                        ...options.encryption.receiver,
                     },
                 }
                 : undefined,
             canAppend: this._canAppend,
         });
-        if (!isDefined(entry.hash)) {
+        if (!entry.hash) {
             throw new Error("Unexpected");
         }
         for (const e of nexts) {
@@ -424,32 +428,10 @@ export let Log = Log_1 = class Log {
                 nextIndexSet.add(entry.hash);
             }
         }
-        const removedGids = new Set();
-        if (hasNext) {
-            for (const next of nexts) {
-                const deletion = await this._headsIndex.del(next);
-                if (deletion.lastWithGid && next.gid !== entry.gid) {
-                    removedGids.add(next.gid);
-                }
-            }
-        }
-        else {
-            // next is all heads, which means we should just overwrite
-            for (const key of this.headsIndex.gids.keys()) {
-                if (key !== entry.gid) {
-                    removedGids.add(key);
-                }
-            }
-            await this.headsIndex.reset([entry], { cache: { update: false } });
-        }
         await this._entryIndex.set(entry, false); // save === false, because its already saved when Entry.create
         await this._headsIndex.put(entry, { cache: { update: false } }); // we will update the cache a few lines later *
         await this._values.put(entry);
         const removed = await this.processEntry(entry);
-        // if next contails all gids
-        if (options.onGidsShadowed && removedGids.size > 0) {
-            options.onGidsShadowed([...removedGids]);
-        }
         entry.init({ encoding: this._encoding, keychain: this._keychain });
         //	console.log('put entry', entry.hash, (await this._entryIndex._index.size));
         const trimmed = await this.trim(options?.trim);
@@ -553,7 +535,7 @@ export let Log = Log_1 = class Log {
                 if (amount >= 0 && counter >= amount) {
                     return;
                 }
-                yield next.value.hash;
+                yield next.value;
                 counter++;
                 next = nextFn(next);
             }
@@ -606,6 +588,12 @@ export let Log = Log_1 = class Log {
         });
     } */
     async join(entriesOrLog, options) {
+        const definedOptions = {
+            ...options,
+            cache: options?.cache ?? {
+                update: true,
+            },
+        };
         await this.load({ reload: false });
         if (entriesOrLog.length === 0) {
             return;
@@ -654,7 +642,6 @@ export let Log = Log_1 = class Log {
                 }
             }
         }
-        // Resolve missing entries
         const removedHeads = [];
         for (const hash of stack) {
             if (visited.has(hash) || this.has(hash)) {
@@ -668,7 +655,7 @@ export let Log = Log_1 = class Log {
             entry.init(this);
             resolvedEntries.set(entry.hash, entry);
             let nexts;
-            if (entry.metadata.type !== EntryType.CUT &&
+            if (entry.meta.type !== EntryType.CUT &&
                 (nexts = await entry.getNext())) {
                 let isRoot = true;
                 for (const next of nexts) {
@@ -706,7 +693,7 @@ export let Log = Log_1 = class Log {
         while (entriesBottomUp.length > 0) {
             const e = entriesBottomUp.shift();
             await this._joining.get(e.hash);
-            const p = this.joinEntry(e, nextRefs, entriesBottomUp, options).then(() => this._joining.delete(e.hash) // TODO, if head we run into problems with concurrency here!, we add heads at line 929 but resolve here
+            const p = this.joinEntry(e, nextRefs, entriesBottomUp, definedOptions).then(() => this._joining.delete(e.hash) // TODO, if head we run into problems with concurrency here!, we add heads at line 929 but resolve here
             );
             this._joining.set(e.hash, p);
             await p;
@@ -716,7 +703,7 @@ export let Log = Log_1 = class Log {
         if (this.length > (options?.length ?? Number.MAX_SAFE_INTEGER)) {
             return;
         }
-        if (!isDefined(e.hash)) {
+        if (!e.hash) {
             throw new Error("Unexpected");
         }
         if (!this.has(e.hash)) {
@@ -731,7 +718,7 @@ export let Log = Log_1 = class Log {
             // Update the internal entry index
             await this._entryIndex.set(e);
             await this._values.put(e);
-            if (e.metadata.type !== EntryType.CUT) {
+            if (e.meta.type !== EntryType.CUT) {
                 for (const a of e.next) {
                     if (!this.has(a)) {
                         await this.join([a]);
@@ -770,7 +757,7 @@ export let Log = Log_1 = class Log {
         }
     }
     async processEntry(entry) {
-        if (entry.metadata.type === EntryType.CUT) {
+        if (entry.meta.type === EntryType.CUT) {
             return this.deleteRecursively(entry, true);
         }
         return [];
@@ -781,6 +768,7 @@ export let Log = Log_1 = class Log {
         const promises = [];
         let counter = 0;
         const deleted = [];
+        const deletedGids = new Set();
         while (stack.length > 0) {
             const entry = stack.pop();
             if ((counter > 0 || !skipFirst) && this.has(entry.hash)) {