hypercore 10.37.4 → 10.37.6

package/lib/merkle-tree.js

@@ -3,6 +3,7 @@ const crypto = require('hypercore-crypto')
 const c = require('compact-encoding')
 const Xache = require('xache')
 const b4a = require('b4a')
+const unslab = require('unslab')
 const caps = require('./caps')
 const { INVALID_PROOF, INVALID_CHECKSUM, INVALID_OPERATION, BAD_ARGUMENT, ASSERTION } = require('hypercore-errors')
 
@@ -1224,7 +1225,13 @@ function getStoredNode (storage, index, cache, error) {
       }
 
       const node = { index, size, hash }
-      if (cache !== null) cache.set(index, node)
+
+      if (cache !== null) {
+        // Copy hash to a new buffer to avoid blocking gc of its original slab
+        node.hash = unslab(hash)
+        cache.set(index, node)
+      }
+
       resolve(node)
     })
   })

package/lib/replicator.js

@@ -144,7 +144,7 @@ class BlockRequest extends Attachable {
     this.queued = false
 
     for (const req of this.inflight) {
-      req.peer._cancelRequest(req.id)
+      req.peer._cancelRequest(req)
     }
 
     this.tracker.remove(this.index)
@@ -300,9 +300,14 @@ class RoundtripQueue {
   }
 
   clear () {
-    const q = this.queue
+    const ids = new Array(this.queue.length)
+    for (let i = 0; i < ids.length; i++) {
+      ids[i] = this.queue[i][1]
+    }
+
     this.queue = []
-    return q
+
+    return ids
   }
 
   add (id) {
@@ -747,20 +752,18 @@ class Peer {
     })
   }
 
-  _cancelRequest (id) {
-    const req = this.replicator._inflight.get(id)
-    if (!req) return
-
-    // mark as cancelled also
+  _cancelRequest (req) {
+    if (req.priority === PRIORITY.CANCELLED) return
+    // mark as cancelled also and avoid re-entry
     req.priority = PRIORITY.CANCELLED
 
     this.inflight--
-    this.replicator._removeInflight(id, false)
+    this.replicator._requestDone(req.id, false)
     if (isBlockRequest(req)) this.replicator._unmarkInflight(req.block.index)
 
     if (this.roundtripQueue === null) this.roundtripQueue = new RoundtripQueue()
-    this.roundtripQueue.add(id)
-    this.wireCancel.send({ request: id })
+    this.roundtripQueue.add(req.id)
+    this.wireCancel.send({ request: req.id })
   }
 
   _checkIfConflict () {
@@ -865,8 +868,12 @@ class Peer {
   }
 
   _onrequestroundtrip (req) {
+    if (req.priority === PRIORITY.CANCELLED) return
+    // to avoid re-entry we also just mark it as cancelled
+    req.priority = PRIORITY.CANCELLED
+
     this.inflight--
-    this.replicator._removeInflight(req.id, true)
+    this.replicator._requestDone(req.id, true)
     if (this.roundtripQueue === null) return
     const flushed = this.roundtripQueue.flush(req.rt)
     if (flushed === null) return
@@ -1333,9 +1340,11 @@ class Peer {
     try {
       if (req.block !== null && req.fork === fork) {
         req.block.nodes = await this.core.tree.missingNodes(2 * req.block.index)
+        if (req.priority === PRIORITY.CANCELLED) return
       }
       if (req.hash !== null && req.fork === fork && req.hash.nodes === 0) {
         req.hash.nodes = await this.core.tree.missingNodes(req.hash.index)
+        if (req.priority === PRIORITY.CANCELLED) return
 
         // nodes === 0, we already have it, bail
         if (req.hash.nodes === 0 && (req.hash.index & 1) === 0) {
@@ -1349,9 +1358,6 @@ class Peer {
       return
     }
 
-    // this was cancelled during the above async work
-    if (req.priority === PRIORITY.CANCELLED) return
-
     this.tracer.trace('send', req)
 
     this.wireRequest.send(req)
@@ -1703,7 +1709,7 @@ module.exports = class Replicator {
     this.onpeerupdate(true, peer)
   }
 
-  _removeInflight (id, roundtrip) {
+  _requestDone (id, roundtrip) {
     this._inflight.remove(id, roundtrip)
     if (this.isDownloading() === true) return
     for (const peer of this.peers) peer.signalUpgrade()
@@ -1731,7 +1737,7 @@ module.exports = class Replicator {
   }
 
   _resolveHashLocally (peer, req) {
-    this._removeInflight(req.id, false)
+    this._requestDone(req.id, false)
     this._resolveBlockRequest(this._hashes, req.hash.index / 2, null, req)
     this.updatePeer(peer)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.37.4",
+  "version": "10.37.6",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -61,6 +61,7 @@
     "safety-catch": "^1.0.1",
     "sodium-universal": "^4.0.0",
     "streamx": "^2.12.4",
+    "unslab": "^1.0.0",
     "xache": "^1.1.0",
     "z32": "^1.0.0"
   },