@fireproof/core 0.5.11 → 0.5.13

package/dist/src/fireproof.mjs

@@ -37408,8 +37408,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();
       })));
     }
   }
@@ -41046,6 +41046,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?
@@ -41061,6 +41062,7 @@ class Sync {
   }
 
   async offer () {
+    this.status = 'offering';
     return this.setupPeer(true)
   }
 
@@ -41068,11 +41070,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);
   }
 
@@ -41103,39 +41107,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())
@@ -41145,6 +41156,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;
@@ -41152,12 +41164,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 })
         }
@@ -41165,10 +41179,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);
   }
 
@@ -41181,6 +41203,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));
   }