@fireproof/core 0.5.12 → 0.5.14

package/dist/hooks/use-fireproof.js

@@ -29,6 +29,7 @@ const initializeDatabase = name => {
 @function useFireproof
 React hook to initialize a Fireproof database, automatically saving and loading the clock.
 You might need to import { nodePolyfills } from 'vite-plugin-node-polyfills' in your vite.config.ts
+@deprecated - npm install @fireproof/react instead
 @param {string} name - The path to the database file
 @param {function(database): void} [defineDatabaseFn] - Synchronous function that defines the database, run this before any async calls
 @param {function(database): Promise<void>} [setupDatabaseFn] - Asynchronous function that sets up the database, run this to load fixture data etc
@@ -42,7 +43,7 @@ export function useFireproof(name = 'useFireproof', defineDatabaseFn = () => { }
      */
     const addSubscriber = (label, fn) => {
         // todo test that the label is not needed
-        return database.subscribe(fn);
+        return database.registerListener(fn);
         // inboundSubscriberQueue.set(label, fn)
     };
     useEffect(() => {

package/dist/src/blockstore.js

@@ -1,7 +1,6 @@
-// @ts-nocheck
 import { parse } from 'multiformats/link';
 import { CID } from 'multiformats';
-import { Valet } from './valet';
+import { Valet } from './valet.js';
 // const sleep = ms => new Promise(r => setTimeout(r, ms))
 const husherMap = new Map();
 const husher = (id, workFn) => {
@@ -150,9 +149,10 @@ export class TransactionBlockstore {
         await this.doCommit(innerBlockstore);
         if (doSync) {
             // const all =
+            // console.log('syncing', innerBlockstore.label)
             await Promise.all([...this.syncs].map(async (sync) => sync.sendUpdate(innerBlockstore).catch(e => {
-                console.error('sync error', e);
-                this.syncs.delete(sync);
+                console.error('sync error, cancelling', e);
+                sync.destroy();
             })));
         }
     }

package/dist/src/clock.js

@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { Block, encode, decode } from 'multiformats/block';
 import { sha256 } from 'multiformats/hashes/sha2';
 import * as cbor from '@ipld/dag-cbor';
@@ -18,17 +17,17 @@ import { CIDCounter } from 'prolly-trees/utils';
  */
 /**
  * @typedef {{
-*   type: 'put'|'del'
-*   key: string
-*   value: import('./link').AnyLink
-*   root: import('./link').AnyLink
-* }} EventData
-* @typedef {{
-*   root: import('./link').AnyLink
-*   head: import('./clock').EventLink<EventData>[]
-*   event: import('./clock').EventBlockView<EventData>
-* }} Result
-*/
+ *   type: 'put'|'del'
+ *   key: string
+ *   value: import('./link').AnyLink
+ *   root: import('./link').AnyLink
+ * }} EventData
+ * @typedef {{
+ *   root: import('./link').AnyLink
+ *   head: import('./clock').EventLink<EventData>[]
+ *   event: import('./clock').EventBlockView<EventData>
+ * }} Result
+ */
 /**
  * Advance the clock by adding an event.
  *
@@ -41,7 +40,7 @@ import { CIDCounter } from 'prolly-trees/utils';
 export async function advance(blocks, head, event) {
     /** @type {EventFetcher<T>} */
     const events = new EventFetcher(blocks);
-    const headmap = new Map(head.map((cid) => [cid.toString(), cid]));
+    const headmap = new Map(head.map(cid => [cid.toString(), cid]));
     // Check if the headmap already includes the event, return head if it does
     if (headmap.has(event.toString()))
         return { head, cids: await events.all() };
@@ -154,7 +153,9 @@ async function contains(events, a, b) {
     if (a.toString() === b.toString())
         return true;
     const [{ value: aevent }, { value: bevent }] = await Promise.all([events.get(a), events.get(b)]);
-    const links = [...aevent.parents];
+    // const links = [...aevent.parents]
+    // console.log('aevent', aevent.parents)
+    const links = [...(aevent.parents || [])];
     while (links.length) {
         const link = links.shift();
         if (!link)
@@ -163,7 +164,7 @@ async function contains(events, a, b) {
             return true;
         // if any of b's parents are this link, then b cannot exist in any of the
         // tree below, since that would create a cycle.
-        if (bevent.parents.some((p) => link.toString() === p.toString()))
+        if (bevent.parents.some(p => link.toString() === p.toString()))
             continue;
         const { value: event } = await events.get(link);
         links.push(...event.parents);
@@ -179,15 +180,16 @@ async function contains(events, a, b) {
  */
 export async function* vis(blocks, head, options = {}) {
     // @ts-ignore
-    const renderNodeLabel = options.renderNodeLabel ?? ((b) => {
-        // @ts-ignore
-        const { key, root, type } = b.value.data;
-        return b.cid.toString() + '\n' + JSON.stringify({ key, root: root.cid.toString(), type }, null, 2).replace(/"/g, '\'');
-    });
+    const renderNodeLabel = options.renderNodeLabel ??
+        (b => {
+            // @ts-ignore
+            const { key, root, type } = b.value.data;
+            return (b.cid.toString() + '\n' + JSON.stringify({ key, root: root.cid.toString(), type }, null, 2).replace(/"/g, "'"));
+        });
     const events = new EventFetcher(blocks);
     yield 'digraph clock {';
     yield '  node [shape=point fontname="Courier"]; head;';
-    const hevents = await Promise.all(head.map((link) => events.get(link)));
+    const hevents = await Promise.all(head.map(link => events.get(link)));
     const links = [];
     const nodes = new Set();
     for (const e of hevents) {
@@ -221,14 +223,14 @@ export async function findEventsToSync(blocks, head) {
     // console.time(callTag + '.findCommonAncestorWithSortedEvents')
     const { ancestor, sorted } = await findCommonAncestorWithSortedEvents(events, head);
     // console.timeEnd(callTag + '.findCommonAncestorWithSortedEvents')
-    // console.log('sorted', sorted.length)
+    // console.log('sorted', !!ancestor, sorted.length)
     // console.time(callTag + '.contains')
-    const toSync = await asyncFilter(sorted, async (uks) => !(await contains(events, ancestor, uks.cid)));
+    const toSync = ancestor ? await asyncFilter(sorted, async (uks) => !(await contains(events, ancestor, uks.cid))) : sorted;
     // console.timeEnd(callTag + '.contains')
-    // console.log('toSync.contains', toSync.length)
+    console.log('toSync', !!ancestor, sorted.length - toSync.length);
     return { cids: events, events: toSync };
 }
-const asyncFilter = async (arr, predicate) => Promise.all(arr.map(predicate)).then((results) => arr.filter((_v, index) => results[index]));
+const asyncFilter = async (arr, predicate) => Promise.all(arr.map(predicate)).then(results => arr.filter((_v, index) => results[index]));
 export async function findCommonAncestorWithSortedEvents(events, children, doFull = false) {
     // console.trace('findCommonAncestorWithSortedEvents')
     // const callTag = Math.random().toString(36).substring(7)
@@ -238,12 +240,16 @@ export async function findCommonAncestorWithSortedEvents(events, children, doFul
     // console.timeEnd(callTag + '.findCommonAncestor')
     // console.log('ancestor', ancestor.toString())
     if (!ancestor) {
-        throw new Error('failed to find common ancestor event');
+        console.log('no common ancestor', children);
+        // throw new Error('no common ancestor')
+        const sorted = await findSortedEvents(events, children, children, doFull);
+        return { ancestor: null, sorted };
     }
     // console.time(callTag + '.findSortedEvents')
-    const sorted = await findSortedEvents(events, children, ancestor, doFull);
+    const sorted = await findSortedEvents(events, children, [ancestor], doFull);
     // console.timeEnd(callTag + '.findSortedEvents')
     // console.log('sorted', sorted.length)
+    // console.log('ancestor', JSON.stringify(ancestor, null, 2))
     return { ancestor, sorted };
 }
 /**
@@ -253,20 +259,53 @@ export async function findCommonAncestorWithSortedEvents(events, children, doFul
  * @param {import('./clock').EventFetcher} events
  * @param  {import('./clock').EventLink<EventData>[]} children
  */
+// async function NEWfindCommonAncestor (events, children) {
+//   if (!children.length) return
+//   if (children.length === 1) return children[0]
+//   const candidates = children.map(c => [c])
+//   const visited = new Set()
+//   while (true) {
+//     let changed = false
+//     for (const c of candidates) {
+//       const candidate = await findAncestorCandidate(events, c[c.length - 1])
+//       if (!candidate) continue
+//       if (visited.has(candidate)) {
+//         return candidate // Common ancestor found
+//       }
+//       visited.add(candidate)
+//       changed = true
+//       c.push(candidate)
+//     }
+//     if (!changed) {
+//       // No common ancestor found, exhausted candidates
+//       return null
+//     }
+//   }
+// }
 async function findCommonAncestor(events, children) {
     if (!children.length)
         return;
+    children = [...new Set(children)];
     if (children.length === 1)
         return children[0];
     const candidates = children.map((c) => [c]);
+    // console.log(
+    //   'og candidates',
+    //   candidates.map((c) => c.toString())
+    // )
     while (true) {
         let changed = false;
         for (const c of candidates) {
             const candidate = await findAncestorCandidate(events, c[c.length - 1]);
             if (!candidate)
                 continue;
+            // Check if the candidate is already in the list, and if so, skip it.
+            if (c.includes(candidate))
+                continue;
+            // if set size is all cids, then no common ancestor
             changed = true;
-            c.push(candidate);
+            c.push(candidate); // make set?
+            // console.log('candidate', candidates.map((c) => c.toString()))
             const ancestor = findCommonString(candidates);
             if (ancestor)
                 return ancestor;
@@ -275,12 +314,44 @@ async function findCommonAncestor(events, children) {
             return;
     }
 }
+// async function OGfindCommonAncestor (events, children) {
+//   if (!children.length) return
+//   if (children.length === 1) return children[0]
+//   const candidates = children.map(c => [c])
+//   console.log(
+//     'og candidates',
+//     candidates.map(c => c.toString())
+//   )
+//   while (true) {
+//     let changed = false
+//     for (const c of candidates) {
+//       const candidate = await findAncestorCandidate(events, c[c.length - 1])
+//       if (!candidate) continue
+//       // if set size is all cids, then no common ancestor
+//       changed = true
+//       c.push(candidate) // make set?
+//       console.log(
+//         'candidate',
+//         candidates.map(c => c.toString())
+//       )
+//       const ancestor = findCommonString(candidates)
+//       if (ancestor) return ancestor
+//     }
+//     if (!changed) return
+//   }
+// }
 /**
  * @param {import('./clock').EventFetcher} events
  * @param {import('./clock').EventLink<EventData>} root
  */
 async function findAncestorCandidate(events, root) {
     const { value: event } = await events.get(root); // .catch(() => ({ value: { parents: [] } }))
+    // console.log(
+    //   'findAncestorCandidate',
+    //   root.toString(),
+    //   'parents',
+    //   event.parents.map(p => p.toString())
+    // )
     if (!event.parents.length)
         return root;
     return event.parents.length === 1 ? event.parents[0] : findCommonAncestor(events, event.parents);
@@ -291,14 +362,14 @@ async function findAncestorCandidate(events, root) {
  */
 function findCommonString(arrays) {
     // console.log('findCommonString', arrays.map((a) => a.map((i) => String(i))))
-    arrays = arrays.map((a) => [...a]);
+    arrays = arrays.map(a => [...a]);
     for (const arr of arrays) {
         for (const item of arr) {
             let matched = true;
             for (const other of arrays) {
                 if (arr === other)
                     continue;
-                matched = other.some((i) => String(i) === String(item));
+                matched = other.some(i => String(i) === String(item));
                 if (!matched)
                     break;
             }
@@ -311,17 +382,17 @@ function findCommonString(arrays) {
  * Find and sort events between the head(s) and the tail.
  * @param {import('./clock').EventFetcher} events
  * @param {any[]} head
- * @param {import('./clock').EventLink<EventData>} tail
+ * @param {import('./clock').EventLink<EventData>[]} tails
  */
-async function findSortedEvents(events, head, tail, doFull) {
+async function findSortedEvents(events, head, tails, doFull) {
     // const callTag = Math.random().toString(36).substring(7)
     // get weighted events - heavier events happened first
     // const callTag = Math.random().toString(36).substring(7)
     /** @type {Map<string, { event: import('./clock').EventBlockView<EventData>, weight: number }>} */
     const weights = new Map();
-    head = [...new Set([...head.map((h) => h.toString())])];
+    head = [...new Set([...head.map(h => h.toString())])];
     // console.log(callTag + '.head', head.length)
-    const allEvents = new Set([tail.toString(), ...head]);
+    const allEvents = new Set([tails.map((t) => t.toString()).toString(), ...head]);
     if (!doFull && allEvents.size === 1) {
         // console.log('head contains tail', tail.toString())
         return [];
@@ -331,7 +402,8 @@ async function findSortedEvents(events, head, tail, doFull) {
     // console.log('finding events')
     // console.log(callTag + '.head', head.length, [...head.map((h) => h.toString())], tail.toString())
     // console.time(callTag + '.findEvents')
-    const all = await Promise.all(head.map((h) => findEvents(events, h, tail)));
+    const all = await (await Promise.all(tails.map((t) => Promise.all(head.map(h => findEvents(events, h, t)))))).flat();
+    // console.log('all', all.length)
     // console.timeEnd(callTag + '.findEvents')
     for (const arr of all) {
         for (const { event, depth } of arr) {
@@ -377,9 +449,9 @@ async function findEvents(events, start, end, depth = 0) {
     const acc = [{ event, depth }];
     const { parents } = event.value;
     // if (parents.length === 1 && String(parents[0]) === send) return acc
-    if (parents.findIndex((p) => String(p) === send) !== -1)
+    if (parents.findIndex(p => String(p) === send) !== -1)
         return acc;
     // if (parents.length === 1) return acc
-    const rest = await Promise.all(parents.map((p) => findEvents(events, p, end, depth + 1)));
+    const rest = await Promise.all(parents.map(p => findEvents(events, p, end, depth + 1)));
     return acc.concat(...rest);
 }

package/dist/src/crypto.js

@@ -42,7 +42,7 @@ const decrypt = async function* ({ root, get, key, cache, chunker, hasher }) {
     const { result: nodes } = await cidset.getAllEntries();
     const unwrap = async (eblock) => {
         const { bytes, cid } = await codec.decrypt({ ...eblock, key }).catch(e => {
-            console.log('ekey', e);
+            // console.log('ekey', e)
             throw new Error('bad key: ' + key.toString('hex'));
         });
         const block = await createBlock(bytes, cid);

package/dist/src/database.js

@@ -1,12 +1,12 @@
 // @ts-nocheck
-import { visMerkleClock, visMerkleTree, vis, put, get, getAll, eventsSince } from './prolly';
-import { doTransaction } from './blockstore';
+import { visMerkleClock, visMerkleTree, vis, put, get, getAll, eventsSince } from './prolly.js';
+import { doTransaction } from './blockstore.js';
 import charwise from 'charwise';
-import { localSet } from './utils';
+import { localSet } from './utils.js';
 import { CID } from 'multiformats';
 // TypeScript Types
 // eslint-disable-next-line no-unused-vars
-// import { CID } from 'multiformats/dist/types/src/cid'
+// import { CID } from 'multiformats/dist/types/src/cid.js'
 // eslint-disable-next-line no-unused-vars
 class Proof {
 }
@@ -17,7 +17,7 @@ export const parseCID = cid => (typeof cid === 'string' ? CID.parse(cid) : cid);
  *  This is the main class for saving and loading JSON and other documents with the database. You can find additional examples and
  *  usage guides in the repository README.
  *
- * @param {import('./blockstore').TransactionBlockstore} blocks - The block storage instance to use documents and indexes
+ * @param {import('./blockstore.js').TransactionBlockstore} blocks - The block storage instance to use documents and indexes
  * @param {CID[]} clock - The Merkle clock head to use for the Fireproof instance.
  * @param {object} [config] - Optional configuration options for the Fireproof instance.
  * @param {object} [authCtx] - Optional authorization context object to use for any authentication checks.
@@ -28,8 +28,6 @@ export class Database {
     indexes = new Map();
     rootCache = null;
     eventsCache = new Map();
-    blocks;
-    clock;
     constructor(blocks, clock, config = {}) {
         this.name = config.name;
         this.instanceId = `fp.${this.name}.${Math.random().toString(36).substring(2, 7)}`;
@@ -58,8 +56,8 @@ export class Database {
      * @memberof Fireproof
      * @instance
      */
-    clockToJSON() {
-        return this.clock.map(cid => cid.toString());
+    clockToJSON(clock = null) {
+        return (clock || this.clock).map(cid => cid.toString());
     }
     hydrate({ clock, name, key }) {
         this.name = name;
@@ -94,21 +92,21 @@ export class Database {
      * @memberof Fireproof
      * @instance
      */
-    async changesSince(event) {
-        // console.log('events for', this.instanceId, event.constructor.name)
-        // console.log('changesSince', this.instanceId, event, this.clock)
+    async changesSince(aClock) {
+        // console.log('events for', this.instanceId, aClock?.constructor.name)
+        // console.log('changesSince', this.instanceId, this.clockToJSON(aClock), this.clockToJSON())
         let rows, dataCIDs, clockCIDs;
-        // if (!event) event = []
-        if (event) {
-            event = event.map((cid) => cid.toString());
-            const eventKey = JSON.stringify([...event, ...this.clockToJSON()]);
+        // if (!aClock) aClock = []
+        if (aClock && aClock.length > 0) {
+            aClock = aClock.map((cid) => cid.toString());
+            const eventKey = JSON.stringify([...this.clockToJSON(aClock), ...this.clockToJSON()]);
             let resp;
             if (this.eventsCache.has(eventKey)) {
-                console.log('events from cache');
+                // console.log('events from cache')
                 resp = this.eventsCache.get(eventKey);
             }
             else {
-                resp = await eventsSince(this.blocks, this.clock, event);
+                resp = await eventsSince(this.blocks, this.clock, aClock);
                 this.eventsCache.set(eventKey, resp);
             }
             const docsMap = new Map();
@@ -262,7 +260,9 @@ export class Database {
      */
     async putToProllyTree(decodedEvent, clock = null) {
         const event = encodeEvent(decodedEvent);
-        if (clock && JSON.stringify(clock) !== JSON.stringify(this.clockToJSON())) {
+        if (clock && JSON.stringify(this.clockToJSON(clock)) !== JSON.stringify(this.clockToJSON())) {
+            // console.log('this.clock', this.clockToJSON())
+            // console.log('that.clock', this.clockToJSON(clock))
             // we need to check and see what version of the document exists at the clock specified
             // if it is the same as the one we are trying to put, then we can proceed
             const resp = await eventsSince(this.blocks, this.clock, event.value._clock);
@@ -272,6 +272,7 @@ export class Database {
             }
         }
         const prevClock = [...this.clock];
+        // console.log('putToProllyTree', this.clockToJSON(), decodedEvent)
         const result = await doTransaction('putToProllyTree', this.blocks, async (blocks) => await put(blocks, this.clock, event));
         if (!result) {
             console.error('failed', event);

package/dist/src/db-index.js

@@ -8,7 +8,7 @@ import { nocache as cache } from 'prolly-trees/cache';
 import { bf, simpleCompare } from 'prolly-trees/utils';
 import { makeGetBlock, visMerkleTree } from './prolly.js';
 // eslint-disable-next-line no-unused-vars
-import { cidsToProof } from './database.js';
+import { Database, cidsToProof } from './database.js';
 import * as codec from '@ipld/dag-cbor';
 // import { create as createBlock } from 'multiformats/block'
 import { TransactionBlockstore, doTransaction } from './blockstore.js';
@@ -143,7 +143,7 @@ export class DbIndex {
         if (matches.length === 0) {
             matches = /=>\s*(.*)/.exec(this.mapFnString);
         }
-        if (matches.length === 0) {
+        if (matches === null) {
             return this.mapFnString;
         }
         else {
@@ -200,7 +200,7 @@ export class DbIndex {
     /**
      * Query object can have {range}
      * @param {DbQuery} query - the query range to use
-     * @returns {Promise<{proof: {}, rows: Array<{id: string, key: string, value: any}>}>}
+     * @returns {Promise<{proof: {}, rows: Array<{id: string, key: string, value: any, doc?: any}>}>}
      * @memberof DbIndex
      * @instance
      */
@@ -282,8 +282,8 @@ export class DbIndex {
         return this.updateIndexPromise;
     }
     async innerUpdateIndex(inBlocks) {
-        const callTag = Math.random().toString(36).substring(4);
-        console.log(`updateIndex ${callTag} >`, this.instanceId, this.dbHead?.toString(), this.indexByKey.cid?.toString(), this.indexById.cid?.toString());
+        // const callTag = Math.random().toString(36).substring(4)
+        // console.log(`updateIndex ${callTag} >`, this.instanceId, this.dbHead?.toString(), this.indexByKey.cid?.toString(), this.indexById.cid?.toString())
         // todo remove this hack
         if (ALWAYS_REBUILD) {
             this.indexById = { root: null, cid: null };
@@ -322,7 +322,7 @@ export class DbIndex {
             this.indexById = await bulkIndex(blocks, this.indexById, removeByIdIndexEntries.concat(byIdIndexEntries), idIndexOpts);
             this.indexByKey = await bulkIndex(blocks, this.indexByKey, oldIndexEntries.concat(indexEntries), dbIndexOpts);
             this.dbHead = result.clock;
-        });
+        }, false /* don't sync transaction -- maybe move this flag to database.indexBlocks? */);
         // todo index subscriptions
         // this.database.notifyExternal('dbIndex')
         // console.timeEnd(callTag + '.doTransactionupdateIndex')

package/dist/src/fireproof.d.ts

@@ -37,7 +37,7 @@ declare class Database {
      * @memberof Fireproof
      * @instance
      */
-    clockToJSON(): string[];
+    clockToJSON(clock?: any): string[];
     hydrate({ clock, name, key }: {
         clock: any;
         name: any;
@@ -61,7 +61,7 @@ declare class Database {
      * @memberof Fireproof
      * @instance
      */
-    changesSince(event?: CID[]): Promise<{
+    changesSince(aClock: any): Promise<{
         rows: any[];
         clock: CID[];
         proof: {};
@@ -382,6 +382,7 @@ declare class Sync {
     pushBacklog: Promise<any>;
     pushBacklogResolve: (value: any) => void;
     pushBacklogReject: (reason?: any) => void;
+    isReady: boolean;
     offer(): Promise<string>;
     accept(base64offer: any): Promise<string>;
     connect(base64accept: any): void;