hypercore 10.8.1 → 10.9.1

package/README.md

@@ -416,3 +416,11 @@ Emitted when the core has been appended to (i.e. has a new length / byteLength),
 #### `core.on('truncate', ancestors, forkId)`
 
 Emitted when the core has been truncated, either locally or remotely.
+
+#### `core.on('peer-add')`
+
+Emitted when a new connection has been established with a peer.
+
+#### `core.on('peer-remove')`
+
+Emitted when a peer's connection has been closed.

package/index.js

@@ -27,10 +27,10 @@ module.exports = class Hypercore extends EventEmitter {
     if (isOptions(storage)) {
       opts = storage
       storage = null
-      key = null
+      key = opts.key || null
     } else if (isOptions(key)) {
       opts = key
-      key = null
+      key = opts.key || null
     }
 
     if (key && typeof key === 'string') {

package/lib/bitfield.js

@@ -53,13 +53,34 @@ class BitfieldPage {
   findLast (val, position) {
     return quickbit.findLast(this.bitfield, val, position)
   }
+
+  count (start, length, val) {
+    const end = start + length
+
+    let i = start
+    let c = 0
+
+    while (length > 0) {
+      const l = this.findFirst(val, i)
+      if (l === -1 || l >= end) return c
+
+      const h = this.findFirst(!val, l + 1)
+      if (h === -1 || h >= end) return c + end - l
+
+      c += h - l
+      length -= h - i
+      i = h
+    }
+
+    return c
+  }
 }
 
 class BitfieldSegment {
   constructor (index, bitfield) {
     this.index = index
     this.offset = index * BYTES_PER_SEGMENT
-    this.tree = quickbit.Index.from(bitfield)
+    this.tree = quickbit.Index.from(bitfield, BYTES_PER_SEGMENT)
     this.pages = new Array(PAGES_PER_SEGMENT)
   }
 
@@ -86,7 +107,7 @@ class BitfieldSegment {
     const bitfield = new Uint32Array(target)
     bitfield.set(this.bitfield)
 
-    this.tree = quickbit.Index.from(bitfield)
+    this.tree = quickbit.Index.from(bitfield, BYTES_PER_SEGMENT)
 
     for (let i = 0; i < this.pages.length; i++) {
       const page = this.pages[i]
@@ -105,17 +126,16 @@ class BitfieldSegment {
     const j = position & (BITS_PER_PAGE - 1)
     const i = (position - j) / BITS_PER_PAGE
 
-    if (i >= PAGES_PER_SEGMENT) return -1
+    if (i >= PAGES_PER_SEGMENT) return val ? -1 : position
 
     const p = this.pages[i]
 
-    if (p) {
-      const index = p.findFirst(val, j)
+    let index = -1
 
-      if (index !== -1) {
-        return i * BITS_PER_PAGE + index
-      }
-    }
+    if (p) index = p.findFirst(val, j)
+    else if (!val) index = j
+
+    if (index !== -1) return i * BITS_PER_PAGE + index
 
     return -1
   }
@@ -130,13 +150,12 @@ class BitfieldSegment {
 
     const p = this.pages[i]
 
-    if (p) {
-      const index = p.findLast(val, j)
+    let index = -1
 
-      if (index !== -1) {
-        return i * BITS_PER_PAGE + index
-      }
-    }
+    if (p) index = p.findLast(val, j)
+    else if (!val) index = j
+
+    if (index !== -1) return i * BITS_PER_PAGE + index
 
     return -1
   }
@@ -255,19 +274,18 @@ module.exports = class Bitfield {
     while (i < this._segments.maxLength) {
       const s = this._segments.get(i)
 
-      if (s) {
-        const index = s.findFirst(val, j)
+      let index = -1
 
-        if (index !== -1) {
-          return i * BITS_PER_SEGMENT + index
-        }
-      }
+      if (s) index = s.findFirst(val, j)
+      else if (!val) index = j
+
+      if (index !== -1) return i * BITS_PER_SEGMENT + index
 
       j = 0
       i++
     }
 
-    return -1
+    return val ? -1 : position
   }
 
   firstSet (position) {
@@ -285,13 +303,12 @@ module.exports = class Bitfield {
     while (i >= 0) {
       const s = this._segments.get(i)
 
-      if (s) {
-        const index = s.findLast(val, j)
+      let index = -1
 
-        if (index !== -1) {
-          return i * BITS_PER_SEGMENT + index
-        }
-      }
+      if (s) index = s.findLast(val, j)
+      else if (!val) index = j
+
+      if (index !== -1) return i * BITS_PER_SEGMENT + index
 
       j = BITS_PER_SEGMENT - 1
       i--
@@ -308,6 +325,36 @@ module.exports = class Bitfield {
     return this.findLast(false, position)
   }
 
+  count (start, length, val) {
+    let j = start & (BITS_PER_PAGE - 1)
+    let i = (start - j) / BITS_PER_PAGE
+    let c = 0
+
+    while (length > 0) {
+      const p = this._pages.get(i)
+
+      const end = Math.min(j + length, BITS_PER_PAGE)
+      const range = end - j
+
+      if (p) c += p.count(j, range, val)
+      else if (!val) c += range
+
+      j = 0
+      i++
+      length -= range
+    }
+
+    return c
+  }
+
+  countSet (start, length) {
+    return this.count(start, length, true)
+  }
+
+  countUnset (start, length) {
+    return this.count(start, length, false)
+  }
+
   * want (start, length) {
     const j = start & (BITS_PER_SEGMENT - 1)
     let i = (start - j) / BITS_PER_SEGMENT

package/lib/remote-bitfield.js

@@ -58,7 +58,7 @@ class RemoteBitfieldSegment {
   constructor (index) {
     this.index = index
     this.offset = index * BYTES_PER_SEGMENT
-    this.tree = quickbit.Index.from([])
+    this.tree = quickbit.Index.from([], BYTES_PER_SEGMENT)
     this.pages = new Array(PAGES_PER_SEGMENT)
   }
 
@@ -87,17 +87,16 @@ class RemoteBitfieldSegment {
     const j = position & (BITS_PER_PAGE - 1)
     const i = (position - j) / BITS_PER_PAGE
 
-    if (i >= PAGES_PER_SEGMENT) return -1
+    if (i >= PAGES_PER_SEGMENT) return val ? -1 : position
 
     const p = this.pages[i]
 
-    if (p) {
-      const index = p.findFirst(val, j)
+    let index = -1
 
-      if (index !== -1) {
-        return i * BITS_PER_PAGE + index
-      }
-    }
+    if (p) index = p.findFirst(val, j)
+    else if (!val) index = j
+
+    if (index !== -1) return i * BITS_PER_PAGE + index
 
     return -1
   }
@@ -108,17 +107,16 @@ class RemoteBitfieldSegment {
     const j = position & (BITS_PER_PAGE - 1)
     const i = (position - j) / BITS_PER_PAGE
 
-    if (i >= PAGES_PER_SEGMENT) return -1
+    if (i >= PAGES_PER_SEGMENT) return val ? -1 : position
 
     const p = this.pages[i]
 
-    if (p) {
-      const index = p.findLast(val, j)
+    let index = -1
 
-      if (index !== -1) {
-        return i * BITS_PER_PAGE + index
-      }
-    }
+    if (p) index = p.findLast(val, j)
+    else if (!val) index = j
+
+    if (index !== -1) return i * BITS_PER_PAGE + index
 
     return -1
   }
@@ -187,19 +185,18 @@ module.exports = class RemoteBitfield {
     while (i < this._segments.maxLength) {
       const s = this._segments.get(i)
 
-      if (s) {
-        const index = s.findFirst(val, j)
+      let index = -1
 
-        if (index !== -1) {
-          return i * BITS_PER_SEGMENT + index
-        }
-      }
+      if (s) index = s.findFirst(val, j)
+      else if (!val) index = j
+
+      if (index !== -1) return i * BITS_PER_SEGMENT + index
 
       j = 0
       i++
     }
 
-    return -1
+    return val ? -1 : position
   }
 
   firstSet (position) {
@@ -217,13 +214,12 @@ module.exports = class RemoteBitfield {
     while (i >= 0) {
       const s = this._segments.get(i)
 
-      if (s) {
-        const index = s.findLast(val, j)
+      let index = -1
 
-        if (index !== -1) {
-          return i * BITS_PER_SEGMENT + index
-        }
-      }
+      if (s) index = s.findLast(val, j)
+      else if (!val) index = j
+
+      if (index !== -1) return i * BITS_PER_SEGMENT + index
 
       j = BITS_PER_SEGMENT - 1
       i--

package/lib/replicator.js

@@ -1673,17 +1673,13 @@ function clampRange (core, r) {
   if (r.blocks === null) {
     const start = core.bitfield.firstUnset(r.start)
 
-    if (r.end === -1) {
-      r.start = start === -1 ? core.tree.length : start
-    } else {
-      const end = core.bitfield.lastUnset(r.end - 1) + 1
-
-      if (start === -1) {
-        r.start = r.end
-      } else {
-        r.start = start
-        r.end = end
-      }
+    if (r.end === -1) r.start = start === -1 ? core.tree.length : start
+    else if (start === -1) r.start = r.end
+    else {
+      const end = core.bitfield.lastUnset(r.end)
+
+      r.start = start
+      r.end = end
     }
   } else {
     while (r.start < r.end && core.bitfield.get(r.blocks[r.start])) r.start++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.8.1",
+  "version": "10.9.1",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -43,7 +43,7 @@
     "hypercore-crypto": "^3.2.1",
     "is-options": "^1.0.1",
     "protomux": "^3.4.0",
-    "quickbit-universal": "^2.0.3",
+    "quickbit-universal": "^2.1.0",
     "random-access-file": "^4.0.0",
     "random-array-iterator": "^1.0.0",
     "safety-catch": "^1.0.1",