hypercore 10.0.0-alpha.26 → 10.0.0-alpha.27

package/index.js

@@ -94,8 +94,8 @@ module.exports = class Hypercore extends EventEmitter {
       indent + ')'
   }
 
-  static protomux (stream, opts) {
-    return stream.noiseStream.userData.open(opts)
+  static getProtocolMuxer (stream) {
+    return stream.noiseStream.userData
   }
 
   static createProtocolStream (isInitiator, opts = {}) {
@@ -392,7 +392,7 @@ module.exports = class Hypercore extends EventEmitter {
         }
       }
 
-      this.replicator.signalUpgrade()
+      this.replicator.localUpgrade()
     }
 
     if (bitfield) {

package/lib/replicator.js

@@ -213,6 +213,10 @@ class BlockTracker {
     yield * this._additional
   }
 
+  isEmpty () {
+    return this._indexed.size === 0 && this._additional.length === 0
+  }
+
   has (fork, index) {
     return this.get(fork, index) !== null
   }
@@ -863,14 +867,16 @@ module.exports = class Replicator {
     for (const peer of this.peers) peer.protomux.uncork()
   }
 
-  signalUpgrade () {
-    for (const peer of this.peers) peer.signalUpgrade()
-  }
-
   broadcastRange (start, length, drop = false) {
     for (const peer of this.peers) peer.broadcastRange(start, length, drop)
   }
 
+  localUpgrade () {
+    for (const peer of this.peers) peer.signalUpgrade()
+    if (this._blocks.isEmpty() === false) this._resolveBlocksLocally()
+    if (this._upgrade !== null) this._resolveUpgradeRequest(null)
+  }
+
   addUpgrade (session) {
     if (this._upgrade !== null) {
       const ref = this._upgrade.attach(session)
@@ -1065,6 +1071,34 @@ module.exports = class Replicator {
     this._queued.push(b)
   }
 
+  // Runs in the background - not allowed to throw
+  async _resolveBlocksLocally () {
+    // TODO: check if fork compat etc. Requires that we pass down truncation info
+
+    let clear = null
+
+    for (const b of this._blocks) {
+      if (this.core.bitfield.get(b.index) === false) continue
+
+      try {
+        b.resolve(await this.core.blocks.get(b.index))
+      } catch (err) {
+        b.reject(err)
+      }
+
+      if (clear === null) clear = []
+      clear.push(b)
+    }
+
+    if (clear === null) return
+
+    // Currently the block tracker does not support deletes during iteration, so we make
+    // sure to clear them afterwards.
+    for (const b of clear) {
+      this._blocks.remove(b.fork, b.index)
+    }
+  }
+
   _resolveBlockRequest (tracker, fork, index, value, req) {
     const b = tracker.remove(fork, index)
     if (b === null) return false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.0.0-alpha.26",
+  "version": "10.0.0-alpha.27",
   "description": "Hypercore 10",
   "main": "index.js",
   "scripts": {