hypercore 10.8.0 → 10.9.0

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') {
@@ -472,6 +472,10 @@ module.exports = class Hypercore extends EventEmitter {
     return this.core.tree.length
   }
 
+  get indexedLength () {
+    return this.length
+  }
+
   /**
    * Deprecated. Use `const { byteLength } = await core.info()`.
    */

package/lib/bitfield.js

@@ -53,6 +53,27 @@ 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 {
@@ -308,6 +329,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/package.json

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