hypercore 10.9.0 → 10.9.2

package/lib/bitfield.js

@@ -80,7 +80,7 @@ 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)
   }
 
@@ -107,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]
@@ -123,19 +123,23 @@ class BitfieldSegment {
   findFirst (val, position) {
     position = this.tree.skipFirst(!val, position)
 
-    const j = position & (BITS_PER_PAGE - 1)
-    const i = (position - j) / BITS_PER_PAGE
+    let j = position & (BITS_PER_PAGE - 1)
+    let i = (position - j) / BITS_PER_PAGE
 
     if (i >= PAGES_PER_SEGMENT) return -1
 
-    const p = this.pages[i]
+    while (i < this.pages.length) {
+      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
+
+      j = 0
+      i++
     }
 
     return -1
@@ -144,19 +148,23 @@ class BitfieldSegment {
   findLast (val, position) {
     position = this.tree.skipLast(!val, position)
 
-    const j = position & (BITS_PER_PAGE - 1)
-    const i = (position - j) / BITS_PER_PAGE
+    let j = position & (BITS_PER_PAGE - 1)
+    let i = (position - j) / BITS_PER_PAGE
 
     if (i >= PAGES_PER_SEGMENT) return -1
 
-    const p = this.pages[i]
+    while (i >= 0) {
+      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
+
+      j = BITS_PER_PAGE - 1
+      i--
     }
 
     return -1
@@ -276,19 +284,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) {
@@ -306,13 +313,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--

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)
   }
 
@@ -84,19 +84,23 @@ class RemoteBitfieldSegment {
   findFirst (val, position) {
     position = this.tree.skipFirst(!val, position)
 
-    const j = position & (BITS_PER_PAGE - 1)
-    const i = (position - j) / BITS_PER_PAGE
+    let j = position & (BITS_PER_PAGE - 1)
+    let i = (position - j) / BITS_PER_PAGE
 
     if (i >= PAGES_PER_SEGMENT) return -1
 
-    const p = this.pages[i]
+    while (i < this.pages.length) {
+      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
+
+      j = 0
+      i++
     }
 
     return -1
@@ -105,19 +109,23 @@ class RemoteBitfieldSegment {
   findLast (val, position) {
     position = this.tree.skipLast(!val, position)
 
-    const j = position & (BITS_PER_PAGE - 1)
-    const i = (position - j) / BITS_PER_PAGE
+    let j = position & (BITS_PER_PAGE - 1)
+    let i = (position - j) / BITS_PER_PAGE
 
     if (i >= PAGES_PER_SEGMENT) return -1
 
-    const p = this.pages[i]
+    while (i >= 0) {
+      const p = this.pages[i]
+
+      let index = -1
 
-    if (p) {
-      const index = p.findLast(val, j)
+      if (p) index = p.findLast(val, j)
+      else if (!val) index = j
 
-      if (index !== -1) {
-        return i * BITS_PER_PAGE + index
-      }
+      if (index !== -1) return i * BITS_PER_PAGE + index
+
+      j = BITS_PER_PAGE - 1
+      i--
     }
 
     return -1
@@ -187,19 +195,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 +224,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,15 @@ 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 || start >= r.end) r.start = r.end
+    else {
+      r.start = start
+
+      const end = core.bitfield.lastUnset(r.end - 1)
+
+      if (end === -1 || start >= end + 1) r.end = r.start
+      else r.end = end + 1
     }
   } 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.9.0",
+  "version": "10.9.2",
   "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.1",
     "random-access-file": "^4.0.0",
     "random-array-iterator": "^1.0.0",
     "safety-catch": "^1.0.1",