hypercore 10.18.1 → 10.18.3

package/index.js

@@ -258,7 +258,7 @@ module.exports = class Hypercore extends EventEmitter {
   }
 
   async _openFromExisting (from, opts) {
-    await from.opening
+    if (!from.opened) await from.opening
 
     // includes ourself as well, so the loop below also updates us
     const sessions = this.sessions
@@ -279,7 +279,7 @@ module.exports = class Hypercore extends EventEmitter {
     const isFirst = !opts._opening
 
     if (!isFirst) await opts._opening
-    if (opts.preload) opts = { ...opts, ...(await opts.preload()) }
+    if (opts.preload) opts = { ...opts, ...(await this._retryPreload(opts.preload)) }
 
     const keyPair = (key && opts.keyPair)
       ? { ...opts.keyPair, publicKey: key }
@@ -329,6 +329,18 @@ module.exports = class Hypercore extends EventEmitter {
     this.emit('ready')
   }
 
+  async _retryPreload (preload) {
+    while (true) { // TODO: better long term fix is allowing lib/core.js creation from the outside...
+      const result = await preload()
+      const from = result && result.from
+      if (from) {
+        if (!from.opened) await from.ready()
+        if (from.closing) continue
+      }
+      return result
+    }
+  }
+
   async _openCapabilities (keyPair, storage, opts) {
     if (opts.from) return this._openFromExisting(opts.from, opts)
 

package/lib/replicator.js

@@ -305,6 +305,7 @@ class Peer {
 
     this.remoteOpened = false
     this.remoteBitfield = new RemoteBitfield()
+    this.skipList = new RemoteBitfield()
 
     this.remoteFork = 0
     this.remoteLength = 0
@@ -678,6 +679,7 @@ class Peer {
 
   onbitfield ({ start, bitfield }) {
     if (this.remoteBitfield.insert(start, bitfield)) {
+      this.skipList.setRange(start, bitfield.byteLength * 8, false)
       this._update()
     }
   }
@@ -687,12 +689,14 @@ class Peer {
 
     if (length === 1) {
       this.remoteBitfield.setRange(start, length, has)
+      this.skipList.set(start, false)
     } else {
       const rangeStart = this.remoteBitfield.findFirst(!has, start)
       const rangeLength = length - (rangeStart - start)
 
       if (rangeLength > 0) {
         this.remoteBitfield.setRange(rangeStart, rangeLength, has)
+        this.skipList.setRange(rangeStart, rangeLength, false)
       }
     }
 
@@ -850,17 +854,36 @@ class Peer {
     // as they are "cheaper" and will trigger an auto upgrade if possible
     // If no blocks < .length is avaible then try the "needs upgrade" range
 
-    for (let i = 0; i < len; i++) {
+    let wrapped = 0
+
+    for (let i = 0; i < len && wrapped < 2; i++) {
       let index = off + i
       if (index >= end) index -= len
 
-      if (r.blocks !== null) index = r.blocks[index]
+      if (r.blocks !== null) {
+        index = r.blocks[index]
+      } else { // TODO: make this loop better (something like a for loop that skips with the skip list)
+        index = this.skipList.findFirst(false, index)
+        if (index === -1 || index >= end) {
+          wrapped++
+          index = this.skipList.findFirst(false, r.start)
+          if (index === -1 || index >= end) {
+            return false
+          }
+        }
+      }
 
-      if (this.remoteBitfield.get(index) === false) continue
-      if (this.core.bitfield.get(index) === true) continue
+      if (this.remoteBitfield.get(index) === false || this.core.bitfield.get(index) === true) {
+        this.skipList.set(index, true)
+        continue
+      }
 
       const b = this.replicator._blocks.add(index, PRIORITY.NORMAL)
-      if (b.inflight.length > 0) continue
+
+      if (b.inflight.length > 0) {
+        this.skipList.set(index, true)
+        continue
+      }
 
       const req = this._makeRequest(index >= length, b.priority)
 
@@ -870,6 +893,8 @@ class Peer {
         return false
       }
 
+      this.skipList.set(index, true)
+
       req.block = { index, nodes: 0 }
 
       b.inflight.push(req)
@@ -1332,6 +1357,10 @@ module.exports = class Replicator {
 
     if (b === null || removeInflight(b.inflight, req) === false) return
 
+    if (isBlock && this.core.bitfield.get(index) === false) {
+      for (const peer of this.peers) peer.skipList.set(index, false)
+    }
+
     if (b.refs.length > 0 && isBlock === true) {
       this._queueBlock(b)
       return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.18.1",
+  "version": "10.18.3",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {