hypercore 10.20.0 → 10.20.1

package/index.js

@@ -840,6 +840,7 @@ module.exports = class Hypercore extends EventEmitter {
     const cleared = (opts && opts.diff) ? { blocks: 0 } : null
 
     if (start >= end) return cleared
+    if (start >= this.length) return cleared
 
     await this.core.clear(start, end, cleared)
 

package/lib/core.js

@@ -22,6 +22,7 @@ module.exports = class Core {
     this.bitfield = bitfield
     this.defaultAuth = auth
     this.truncating = 0
+    this.closed = false
 
     this._maxOplogSize = 65536
     this._autoFlush = 1
@@ -335,8 +336,8 @@ module.exports = class Core {
       if (start >= end || start >= this.tree.length) return
 
       const offset = await this.tree.byteOffset(start * 2)
-      const [byteEnd, byteEndLength] = await this.tree.byteRange((end - 1) * 2)
-      const length = (byteEnd + byteEndLength) - offset
+      const endOffset = await this.tree.byteOffset(end * 2)
+      const length = endOffset - offset
 
       const before = cleared ? await Info.bytesUsed(this.blocks.storage) : null
 
@@ -639,6 +640,7 @@ module.exports = class Core {
   }
 
   async close () {
+    this.closed = true
     await this._mutex.destroy()
     await Promise.allSettled([
       this.oplog.close(),

package/lib/merkle-tree.js

@@ -714,6 +714,7 @@ module.exports = class MerkleTree {
   }
 
   async byteOffset (index) {
+    if (index === 2 * this.length) return this.byteLength
     if ((index & 1) === 1) index = flat.leftSpan(index)
 
     let head = 0

package/lib/replicator.js

@@ -560,6 +560,7 @@ class Peer {
         proof = await this._getProof(msg)
       } catch (err) { // TODO: better error handling here, ie custom errors
         safetyCatch(err)
+        if (this.replicator.core.closed) throw err // just an extra safety check...
       }
     }
 
@@ -1004,6 +1005,7 @@ module.exports = class Replicator {
     this.onupload = onupload
     this.peers = []
     this.findingPeers = 0 // updateable from the outside
+    this.destroyed = false
 
     this._attached = new Set()
     this._inflight = new InflightTracker()
@@ -1711,7 +1713,7 @@ module.exports = class Replicator {
     protomux.stream.opened.then((opened) => {
       this._ifAvailable--
 
-      if (opened) makePeer()
+      if (opened && !this.destroyed) makePeer()
       else if (session) session.close().catch(noop)
       this._checkUpgradeIfAvailable()
     })
@@ -1725,6 +1727,7 @@ module.exports = class Replicator {
   }
 
   destroy () {
+    this.destroyed = true
     for (const peer of this.peers) {
       this.detachFrom(peer.protomux)
       peer.channel.close()

package/package.json

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