@fireproof/core 0.5.11 → 0.5.13

package/dist/src/fireproof.d.ts

@@ -13,7 +13,7 @@ import { CID } from 'multiformats';
  * @param {object} [authCtx] - Optional authorization context object to use for any authentication checks.
  *
  */
-declare class Database$1 {
+declare class Database {
     constructor(blocks: any, clock: any, config?: {});
     listeners: Set<any>;
     indexes: Map<any, any>;
@@ -217,8 +217,8 @@ declare class DbIndex {
     /**
      * @param {Database} database
      */
-    constructor(database: Database$1, name: any, mapFn: any, clock?: any, opts?: {});
-    database: Database$1;
+    constructor(database: Database, name: any, mapFn: any, clock?: any, opts?: {});
+    database: Database;
     indexById: {
         root: any;
         cid: any;
@@ -331,10 +331,10 @@ declare class Listener {
      * @param {import('./database.js').Database} database
      * @param {(_: any, emit: any) => void} routingFn
      */
-    constructor(database: Database$1, routingFn?: (_: any, emit: any) => void);
+    constructor(database: Database, routingFn?: (_: any, emit: any) => void);
     subcribers: Map<any, any>;
     doStopListening: any;
-    database: Database$1;
+    database: Database;
     /**
      * The map function to apply to each entry in the database.
      * @type {Function}
@@ -368,15 +368,16 @@ declare class Sync {
      * @param {import("./database.js").Database} database
      * @param {string} key
      */
-    static makeCar(database: Database$1, key: string, skip?: any[]): Promise<multiformats.BlockView<Uint8Array, 85, 18, 1>>;
+    static makeCar(database: Database, key: string, skip?: any[]): Promise<multiformats.BlockView<Uint8Array, 85, 18, 1>>;
+    constructor(database: any, PeerClass?: any);
     /**
      * @param {Database} database
      * @param {typeof SimplePeer} [PeerClass]
      * @memberof Sync
      * @static
      */
-    constructor(database: Database, PeerClass?: any);
-    database: Database$1;
+    status: string;
+    database: any;
     PeerClass: any;
     pushBacklog: Promise<any>;
     pushBacklogResolve: (value: any) => void;
@@ -388,10 +389,10 @@ declare class Sync {
     peer: any;
     backlog(): Promise<any>;
     gotData(data: any): Promise<void>;
+    destroy(): void;
     sendUpdate(blockstore: any): Promise<void>;
     startSync(): Promise<void>;
 }
-type Database = Database$1;
 
 declare class Fireproof {
     /**
@@ -402,10 +403,10 @@ declare class Fireproof {
      * @static
      * @returns {Database} - a new Fireproof instance
      */
-    static storage: (name?: any, opts?: {}) => Database$1;
+    static storage: (name?: any, opts?: {}) => Database;
     static fromJSON(json: any, database: any): any;
     static snapshot(database: any, clock: any): any;
     static zoom(database: any, clock: any): Promise<any>;
 }
 
-export { Database$1 as Database, Fireproof, DbIndex as Index, Listener, Sync };
+export { Database, Fireproof, DbIndex as Index, Listener, Sync };

package/dist/src/fireproof.js

@@ -37410,8 +37410,8 @@ class TransactionBlockstore {
     if (doSync) {
       // const all =
       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();
       })));
     }
   }
@@ -41048,6 +41048,7 @@ class Sync {
    * @memberof Sync
    * @static
    */
+  status = 'new'
   constructor (database, PeerClass = simplePeer) {
     this.database = database;
     this.database.blocks.syncs.add(this); // should this happen during setup?
@@ -41063,6 +41064,7 @@ class Sync {
   }
 
   async offer () {
+    this.status = 'offering';
     return this.setupPeer(true)
   }
 
@@ -41070,11 +41072,13 @@ class Sync {
     const offer = JSON.parse(atob(base64offer));
     const p = this.setupPeer(false);
     this.peer.signal(offer);
+    this.status = 'accepting';
     return p
   }
 
   connect (base64accept) {
     const accept = JSON.parse(atob(base64accept));
+    this.status = 'connecting';
     this.peer.signal(accept);
   }
 
@@ -41105,39 +41109,46 @@ class Sync {
       // console.log('not a car', data.toString())
     }
     if (reader) {
+      console.log('got car');
+      this.status = 'parking car';
       const blz = new Set();
       for await (const block of reader.blocks()) {
         blz.add(block);
       }
       const roots = await reader.getRoots();
-      // console.log(
-      //   'got car',
-      //   roots.map(c => c.toString()),
-      //   this.database.clock.map(c => c.toString())
-      // )
-      // console.log(
-      //   'got blocks',
-      //   [...blz].map(({ cid }) => cid.toString())
-      // )
+      console.log(
+        'got car',
+        roots.map(c => c.toString()),
+        this.database.clock.map(c => c.toString())
+      );
+      console.log(
+        'got blocks',
+        [...blz].map(({ cid }) => cid.toString())
+      );
       // @ts-ignore
       reader.entries = reader.blocks;
-      await this.database.blocks.commit({
-        label: 'sync',
-        entries: () => [...blz],
-        get: async cid => await reader.get(cid),
-        lastCid: [...blz][0].cid // doesn't matter
-      }, false);
+      await this.database.blocks.commit(
+        {
+          label: 'sync',
+          entries: () => [...blz],
+          get: async cid => await reader.get(cid),
+          lastCid: [...blz][0].cid // doesn't matter
+        },
+        false
+      );
       // first arg could be the roots parents?
       // get the roots parents
-      const parents = await Promise.all(roots.map(async (cid) => {
-        const rbl = await reader.get(cid);
-        if (!rbl) {
-          console.log('missing root block', cid.toString(), reader);
-          throw new Error('missing root block')
-        }
-        const block = await decodeEventBlock(rbl.bytes);
-        return block.value.parents
-      }));
+      const parents = await Promise.all(
+        roots.map(async cid => {
+          const rbl = await reader.get(cid);
+          if (!rbl) {
+            console.log('missing root block', cid.toString(), reader);
+            throw new Error('missing root block')
+          }
+          const block = await decodeEventBlock(rbl.bytes);
+          return block.value.parents
+        })
+      );
       this.database.applyClock(parents.flat(), roots);
       this.database.notifyReset();
       // console.log('after', this.database.clockToJSON())
@@ -41147,6 +41158,7 @@ class Sync {
       const message = JSON.parse(data.toString());
       // console.log('got message', message)
       if (message.ok) {
+        this.status = 'ok';
         this.pushBacklogResolve({ ok: true });
       } else if (message.clock) {
         const reqCidDiff = message;
@@ -41154,12 +41166,14 @@ class Sync {
         console.log('got diff', reqCidDiff);
         const carBlock = await Sync.makeCar(this.database, null, reqCidDiff.cids);
         if (!carBlock) {
-        // we are full synced
-        // console.log('we are full synced')
+          // we are full synced
+          // console.log('we are full synced')
+          this.status = 'full synced';
           this.peer.send(JSON.stringify({ ok: true }));
           // this.pushBacklogResolve({ ok: true })
         } else {
-        // console.log('do send', carBlock.bytes.length)
+          console.log('do send', carBlock.bytes.length);
+          this.status = 'sending diff car';
           this.peer.send(carBlock.bytes);
           // this.pushBacklogResolve({ ok: true })
         }
@@ -41167,10 +41181,18 @@ class Sync {
     }
   }
 
+  destroy () {
+    this.database.blocks.syncs.delete(this);
+    this.status = 'destroyed';
+    this.peer.destroy();
+  }
+
   async sendUpdate (blockstore) {
+    if (!this.peer) return
     // console.log('send update from', this.database.instanceId)
     // todo should send updates since last sync
     const newCar = await blocksToCarBlock(blockstore.lastCid, blockstore);
+    this.status = 'sending update car';
     this.peer.send(newCar.bytes);
   }
 
@@ -41183,6 +41205,7 @@ class Sync {
       cids: allCIDs.map(cid => cid.toString())
     };
     // console.log('send diff', reqCidDiff)
+    this.status = 'sending cid diff';
     this.peer.send(JSON.stringify(reqCidDiff));
   }