Upgrade holepunch preset

Author: mikker

index.js

@@ -154,11 +154,7 @@ class Hyperblobs {
 
   async get(id, opts) {
     const all =
-      !opts ||
-      (!opts.start &&
-        opts.length === undefined &&
-        opts.end === undefined &&
-        !opts.core)
+      !opts || (!opts.start && opts.length === undefined && opts.end === undefined && !opts.core)
     if (all) return this._getAll(id, opts)
 
     const res = []
@@ -176,11 +172,7 @@ class Hyperblobs {
   }
 
   async clear(id, opts) {
-    return this.core.clear(
-      id.blockOffset,
-      id.blockOffset + id.blockLength,
-      opts
-    )
+    return this.core.clear(id.blockOffset, id.blockOffset + id.blockLength, opts)
   }
 
   createReadStream(id, opts) {

lib/monitor.js

@@ -27,14 +27,9 @@ module.exports = class Monitor extends EventEmitter {
 
     this.uploadStats = { ...stats }
     this.downloadStats = { ...stats }
-    this.uploadStats.targetBytes = this.downloadStats.targetBytes =
-      this.id.byteLength
-    this.uploadStats.targetBlocks = this.downloadStats.targetBlocks =
-      this.id.blockLength
-    this.uploadStats.peers =
-      this.downloadStats.peers =
-      this.peers =
-        this.blobs.core.peers.length
+    this.uploadStats.targetBytes = this.downloadStats.targetBytes = this.id.byteLength
+    this.uploadStats.targetBlocks = this.downloadStats.targetBlocks = this.id.blockLength
+    this.uploadStats.peers = this.downloadStats.peers = this.peers = this.blobs.core.peers.length
 
     this.uploadSpeedometer = speedometer()
     this.downloadSpeedometer = speedometer()
@@ -52,30 +47,15 @@ module.exports = class Monitor extends EventEmitter {
   }
 
   _onUpload(index, bytes, from) {
-    this._updateStats(
-      this.uploadSpeedometer,
-      this.uploadStats,
-      index,
-      bytes,
-      from
-    )
+    this._updateStats(this.uploadSpeedometer, this.uploadStats, index, bytes, from)
   }
 
   _onDownload(index, bytes, from) {
-    this._updateStats(
-      this.downloadSpeedometer,
-      this.downloadStats,
-      index,
-      bytes,
-      from
-    )
+    this._updateStats(this.downloadSpeedometer, this.downloadStats, index, bytes, from)
   }
 
   _updatePeers() {
-    this.uploadStats.peers =
-      this.downloadStats.peers =
-      this.peers =
-        this.blobs.core.peers.length
+    this.uploadStats.peers = this.downloadStats.peers = this.peers = this.blobs.core.peers.length
     this.emit('update')
   }
 

lib/prefetcher.js

@@ -3,19 +3,13 @@
 const MAX_READAHEAD_TARGET = 0.05 // aim to buffer 5% always
 
 module.exports = class Prefetcher {
-  constructor(
-    core,
-    { max = 64, start = 0, end = core.length, linear = true } = {}
-  ) {
+  constructor(core, { max = 64, start = 0, end = core.length, linear = true } = {}) {
     this.core = core
     this.max = max
     this.range = null
     this.startBound = start
     this.endBound = end
-    this.maxReadAhead = Math.max(
-      max * 2,
-      Math.floor((end - start) * MAX_READAHEAD_TARGET)
-    )
+    this.maxReadAhead = Math.max(max * 2, Math.floor((end - start) * MAX_READAHEAD_TARGET))
 
     this.start = start
     this.end = start
@@ -57,8 +51,7 @@ module.exports = class Prefetcher {
       this.missing++
     }
 
-    if (end > this.start + this.maxReadAhead)
-      end = this.start + this.maxReadAhead
+    if (end > this.start + this.maxReadAhead) end = this.start + this.maxReadAhead
     if (end >= this.endBound) end = this.endBound
 
     this.end = end

lib/streams.js

@@ -69,16 +69,14 @@ class BlobReadStream extends Readable {
 
     const start = id.blockOffset
     const end = id.blockOffset + id.blockLength
-    const noPrefetch =
-      opts.wait === false || opts.prefetch === false || !core.core
+    const noPrefetch = opts.wait === false || opts.prefetch === false || !core.core
 
     this._prefetch = noPrefetch
       ? null
       : new Prefetcher(this.core, { max: opts.prefetch, start, end })
     this._lastPrefetch = null
 
-    this._pos =
-      opts.start !== undefined ? id.byteOffset + opts.start : id.byteOffset
+    this._pos = opts.start !== undefined ? id.byteOffset + opts.start : id.byteOffset
 
     if (opts.length !== undefined) this._end = this._pos + opts.length
     else if (opts.end !== undefined) this._end = id.byteOffset + opts.end + 1
@@ -137,10 +135,7 @@ class BlobReadStream extends Readable {
 
         const remainder = this._end - this._pos
         if (this._relativeOffset || remainder < block.length) {
-          block = block.subarray(
-            this._relativeOffset,
-            this._relativeOffset + remainder
-          )
+          block = block.subarray(this._relativeOffset, this._relativeOffset + remainder)
         }
 
         this._index++

test/all.js

@@ -359,11 +359,7 @@ test('upload/download can be monitored', async (t) => {
     monitor.on('update', () => {
       t.is(monitor.downloadStats.blocks, expectedBlocks.pop())
       if (monitor.downloadStats.targetBlocks === monitor.downloadStats.blocks) {
-        t.is(
-          monitor.downloadStats.monitoringBytes,
-          bytes,
-          'downloaded all bytes'
-        )
+        t.is(monitor.downloadStats.monitoringBytes, bytes, 'downloaded all bytes')
       }
       t.is(monitor.downloadStats.targetBlocks, 2)
       t.is(monitor.downloadStats.targetBytes, bytes)