@fireproof/core 0.5.13 → 0.5.15

package/src/sync.js

@@ -23,10 +23,15 @@ export class Sync {
       this.pushBacklogResolve = resolve
       this.pushBacklogReject = reject
     })
+    this.isReady = false
     // this.pushBacklog.then(() => {
     //   // console.log('sync backlog resolved')
     //   this.database.notifyReset()
     // })
+    // this.connected = new Promise((resolve, reject) => {
+    //   this.readyResolve = resolve
+    //   this.readyReject = reject
+    // })
   }
 
   async offer () {
@@ -75,22 +80,22 @@ export class Sync {
       // console.log('not a car', data.toString())
     }
     if (reader) {
-      console.log('got car')
+      // 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(
@@ -129,7 +134,7 @@ export class Sync {
       } else if (message.clock) {
         const reqCidDiff = message
         // this might be a CID diff
-        console.log('got diff', reqCidDiff)
+        // console.log('got diff', reqCidDiff)
         const carBlock = await Sync.makeCar(this.database, null, reqCidDiff.cids)
         if (!carBlock) {
           // we are full synced
@@ -138,9 +143,10 @@ export class Sync {
           this.peer.send(JSON.stringify({ ok: true }))
           // this.pushBacklogResolve({ ok: true })
         } else {
-          console.log('do send', carBlock.bytes.length)
+          // console.log('do send diff', carBlock.bytes.length)
           this.status = 'sending diff car'
           this.peer.send(carBlock.bytes)
+          // console.log('sent diff car')
           // this.pushBacklogResolve({ ok: true })
         }
       }
@@ -154,7 +160,7 @@ export class Sync {
   }
 
   async sendUpdate (blockstore) {
-    if (!this.peer) return
+    if (!this.peer || !this.isReady) return
     // console.log('send update from', this.database.instanceId)
     // todo should send updates since last sync
     const newCar = await blocksToCarBlock(blockstore.lastCid, blockstore)
@@ -164,6 +170,7 @@ export class Sync {
 
   async startSync () {
     // console.log('start sync', this.peer.initiator)
+    this.isReady = true
     const allCIDs = await this.database.allStoredCIDs()
     // console.log('allCIDs', allCIDs)
     const reqCidDiff = {

package/src/valet.js

@@ -39,11 +39,11 @@ export class Valet {
     this.name = name
     this.setKeyMaterial(keyMaterial)
     this.uploadQueue = cargoQueue(async (tasks, callback) => {
-      console.log(
-        'queue worker',
-        tasks.length,
-        tasks.reduce((acc, t) => acc + t.value.length, 0)
-      )
+      // console.log(
+      //   'queue worker',
+      //   tasks.length,
+      //   tasks.reduce((acc, t) => acc + t.value.length, 0)
+      // )
       if (this.uploadFunction) {
         // todo we can coalesce these into a single car file
         return await this.withDB(async db => {