hypercore 10.0.0-alpha.26 → 10.0.0-alpha.29

package/index.js

@@ -51,7 +51,7 @@ module.exports = class Hypercore extends EventEmitter {
     this.core = null
     this.replicator = null
     this.encryption = null
-    this.extensions = opts.extensions || new Map()
+    this.extensions = new Map()
     this.cache = opts.cache === true ? new Xache({ maxSize: 65536, maxAge: 0 }) : (opts.cache || null)
 
     this.valueEncoding = null
@@ -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 = {}) {
@@ -157,7 +157,6 @@ module.exports = class Hypercore extends EventEmitter {
     const Clz = opts.class || Hypercore
     const s = new Clz(this.storage, this.key, {
       ...opts,
-      extensions: this.extensions,
       _opening: this.opening,
       _sessions: this.sessions
     })
@@ -182,12 +181,7 @@ module.exports = class Hypercore extends EventEmitter {
   async _openFromExisting (from, opts) {
     await from.opening
 
-    for (const [name, ext] of this.extensions) {
-      from.extensions.register(name, null, ext)
-    }
-
     this._passCapabilities(from)
-    this.extensions = from.extensions
     this.sessions = from.sessions
     this.storage = from.storage
 
@@ -392,7 +386,7 @@ module.exports = class Hypercore extends EventEmitter {
         }
       }
 
-      this.replicator.signalUpgrade()
+      this.replicator.localUpgrade()
     }
 
     if (bitfield) {
@@ -411,14 +405,14 @@ module.exports = class Hypercore extends EventEmitter {
   _onpeerupdate (added, peer) {
     const name = added ? 'peer-add' : 'peer-remove'
 
-    if (added) {
-      for (const ext of this.extensions.values()) {
-        peer.extensions.set(ext.name, ext)
-      }
-    }
-
     for (let i = 0; i < this.sessions.length; i++) {
       this.sessions[i].emit(name, peer)
+
+      if (added) {
+        for (const ext of this.sessions[i].extensions.values()) {
+          peer.extensions.set(ext.name, ext)
+        }
+      }
     }
   }
 
@@ -610,7 +604,7 @@ module.exports = class Hypercore extends EventEmitter {
       },
       destroy () {
         for (const peer of this.session.peers) {
-          peer.extensions.delete(name)
+          if (peer.extensions.get(name) === ext) peer.extensions.delete(name)
         }
         this.session.extensions.delete(name)
       },

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
@@ -1090,11 +1124,13 @@ module.exports = class Replicator {
   }
 
   _clearInflightBlock (tracker, req) {
-    const b = tracker.get(req.fork, req.block.index)
+    const isBlock = tracker === this._blocks
+    const index = isBlock === true ? req.block.index : req.hash.index / 2
+    const b = tracker.get(req.fork, index)
 
     if (b === null || removeInflight(b.inflight, req) === false) return
 
-    if (b.refs.length > 0 && tracker === this._blocks) {
+    if (b.refs.length > 0 && isBlock === true) {
       this._queueBlock(b)
       return
     }

package/package.json

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