hypercore 10.37.24 → 10.37.26

package/index.js

@@ -10,7 +10,6 @@ const Protomux = require('protomux')
 const z32 = require('z32')
 const id = require('hypercore-id-encoding')
 const safetyCatch = require('safety-catch')
-const { createTracer } = require('hypertrace')
 const unslab = require('unslab')
 
 const Replicator = require('./lib/replicator')
@@ -57,7 +56,6 @@ module.exports = class Hypercore extends EventEmitter {
 
     this[promises] = true
 
-    this.tracer = createTracer(this)
     this.storage = null
     this.crypto = opts.crypto || hypercoreCrypto
     this.core = null
@@ -290,8 +288,6 @@ module.exports = class Hypercore extends EventEmitter {
     this.writable = this._isWritable()
     this.autoClose = o.autoClose
 
-    if (o.core) this.tracer.setParent(o.core.tracer)
-
     if (this.snapshotted && this.core && !this._snapshot) this._updateSnapshot()
   }
 
@@ -402,7 +398,6 @@ module.exports = class Hypercore extends EventEmitter {
       onupdate: this._oncoreupdate.bind(this),
       onconflict: this._oncoreconflict.bind(this)
     })
-    this.tracer.setParent(this.core.tracer)
 
     if (opts.userData) {
       for (const [key, value] of Object.entries(opts.userData)) {
@@ -503,7 +498,7 @@ module.exports = class Hypercore extends EventEmitter {
     }
 
     if (this.replicator !== null) {
-      this.replicator.destroy()
+      await this.replicator.destroy()
     }
 
     await this.core.close()
@@ -841,8 +836,6 @@ module.exports = class Hypercore extends EventEmitter {
     if (this.opened === false) await this.opening
     if (!isValidIndex(index)) throw ASSERTION('block index is invalid')
 
-    this.tracer.trace('get', { index })
-
     if (this.closing !== null) throw SESSION_CLOSED()
     if (this._snapshot !== null && index >= this._snapshot.compatLength) throw SNAPSHOT_NOT_AVAILABLE()
 
@@ -967,8 +960,6 @@ module.exports = class Hypercore extends EventEmitter {
   async _download (range) {
     if (this.opened === false) await this.opening
 
-    this.tracer.trace('download', { range })
-
     const activeRequests = (range && range.activeRequests) || this.activeRequests
 
     return this.replicator.addRange(activeRequests, range)
@@ -1011,7 +1002,6 @@ module.exports = class Hypercore extends EventEmitter {
     if (writable === false) throw SESSION_NOT_WRITABLE()
 
     blocks = Array.isArray(blocks) ? blocks : [blocks]
-    this.tracer.trace('append', { blocks })
 
     const preappend = this.encryption && this._preappend
 

package/lib/core.js

@@ -13,11 +13,9 @@ const { BAD_ARGUMENT, STORAGE_EMPTY, STORAGE_CONFLICT, INVALID_OPERATION, INVALI
 const m = require('./messages')
 const Verifier = require('./verifier')
 const audit = require('./audit')
-const { createTracer } = require('hypertrace')
 
 module.exports = class Core {
   constructor (header, compat, crypto, oplog, bigHeader, tree, blocks, bitfield, verifier, sessions, legacy, globalCache, onupdate, onconflict) {
-    this.tracer = createTracer(this)
     this.onupdate = onupdate
     this.onconflict = onconflict
     this.preupdate = null

package/lib/replicator.js

@@ -31,7 +31,6 @@ const RemoteBitfield = require('./remote-bitfield')
 const { REQUEST_CANCELLED, REQUEST_TIMEOUT, INVALID_CAPABILITY, SNAPSHOT_NOT_AVAILABLE } = require('hypercore-errors')
 const m = require('./messages')
 const caps = require('./caps')
-const { createTracer } = require('hypertrace')
 
 const DEFAULT_MAX_INFLIGHT = [16, 512]
 const SCALE_LATENCY = 50
@@ -39,6 +38,8 @@ const DEFAULT_SEGMENT_SIZE = 256 * 1024 * 8 // 256 KiB in bits
 const NOT_DOWNLOADING_SLACK = 20000 + (Math.random() * 20000) | 0
 const MAX_PEERS_UPGRADE = 3
 
+const MAX_RANGES = 64
+
 const PRIORITY = {
   NORMAL: 0,
   HIGH: 1,
@@ -331,7 +332,6 @@ class RoundtripQueue {
 
 class Peer {
   constructor (replicator, protomux, channel, useSession, inflightRange) {
-    this.tracer = createTracer(this, { parent: replicator.core.tracer })
     this.core = replicator.core
     this.replicator = replicator
     this.stream = protomux.stream
@@ -530,8 +530,6 @@ class Peer {
   }
 
   onclose (isRemote) {
-    this.tracer.trace('onclose')
-
     // we might have signalled to the remote that we are done (ie not downloading) and the remote might agree on that
     // if that happens, the channel might be closed by the remote. if so just renegotiate it.
     // TODO: add a CLOSE_REASON to mux to we can make this cleaner...
@@ -682,8 +680,6 @@ class Peer {
   }
 
   async onrequest (msg) {
-    this.tracer.trace('onrequest', msg)
-
     const size = this.remoteRequests.size
     this.remoteRequests.set(msg.id, msg)
 
@@ -817,8 +813,6 @@ class Peer {
   }
 
   async ondata (data) {
-    this.tracer.trace('ondata', data)
-
     // always allow a fork conflict proof to be sent
     if (data.request === 0 && data.upgrade && data.upgrade.start === 0) {
       if (await this.core.checkConflict(data, this)) return
@@ -888,8 +882,6 @@ class Peer {
   }
 
   onnodata ({ request }) {
-    this.tracer.trace('onnodata', { request })
-
     const req = request > 0 ? this.replicator._inflight.get(request) : null
 
     if (req === null || req.peer !== this) return
@@ -1397,8 +1389,6 @@ class Peer {
       return
     }
 
-    this.tracer.trace('send', req)
-
     this.wireRequest.send(req)
     incrementTx(this.stats.wireRequest, this.replicator.stats.wireRequest)
   }
@@ -1416,7 +1406,6 @@ module.exports = class Replicator {
     onupload = noop,
     oninvalid = noop
   } = {}) {
-    this.tracer = createTracer(this)
     this.key = key
     this.discoveryKey = core.crypto.discoveryKey(key)
     this.core = core
@@ -1636,11 +1625,18 @@ module.exports = class Replicator {
 
     const ref = r.attach(session)
 
-    this._ranges.push(r)
-
     // Trigger this to see if this is already resolved...
     // Also auto compresses the range based on local bitfield
-    this._updateNonPrimary(true)
+    clampRange(this.core, r)
+
+    this._ranges.push(r)
+
+    if (r.end !== -1 && r.start >= r.end) {
+      this._resolveRangeRequest(r, this._ranges.length - 1)
+      return ref
+    }
+
+    this.updateAll()
 
     return ref
   }
@@ -1912,13 +1908,16 @@ module.exports = class Replicator {
   async _updateNonPrimary (updateAll) {
     // Check if running, if so skip it and the running one will issue another update for us (debounce)
     while (++this._updatesPending === 1) {
-      for (let i = 0; i < this._ranges.length; i++) {
+      let len = Math.min(MAX_RANGES, this._ranges.length)
+
+      for (let i = 0; i < len; i++) {
         const r = this._ranges[i]
 
         clampRange(this.core, r)
 
         if (r.end !== -1 && r.start >= r.end) {
           this._resolveRangeRequest(r, i--)
+          if (len > this._ranges.length) len--
         }
       }
 
@@ -2200,11 +2199,13 @@ module.exports = class Replicator {
     }
 
     const ranges = new RandomIterator(this._ranges)
+    let tried = 0
 
     for (const r of ranges) {
       if (peer._requestRange(r) === true) {
         return true
       }
+      if (++tried >= MAX_RANGES) break
     }
 
     // Iterate from newest fork to oldest fork...
@@ -2323,18 +2324,26 @@ module.exports = class Replicator {
 
   destroy () {
     this.destroyed = true
+
     if (this._downloadingTimer) {
       clearTimeout(this._downloadingTimer)
       this._downloadingTimer = null
     }
+
+    const waiting = []
+
     while (this.peers.length) {
       const peer = this.peers[this.peers.length - 1]
       this.detachFrom(peer.protomux)
       peer.channel.close() // peer is removed from array in onclose
+      waiting.push(peer.channel.fullyClosed())
     }
+
     for (const protomux of this._attached) {
       this.detachFrom(protomux)
     }
+
+    return Promise.all(waiting)
   }
 
   _makePeer (protomux, useSession) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.37.24",
+  "version": "10.37.26",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -52,7 +52,6 @@
     "hypercore-crypto": "^3.2.1",
     "hypercore-errors": "^1.2.0",
     "hypercore-id-encoding": "^1.2.0",
-    "hypertrace": "^1.2.1",
     "is-options": "^1.0.1",
     "protomux": "^3.5.0",
     "quickbit-universal": "^2.2.0",