prefix-hash-tree 0.0.2 → 0.0.4

package/index.js

@@ -27,7 +27,7 @@ class PrefixHashTree {
   _labelHash(nodeLabel) {
     const hash = b4a.allocUnsafe(32)
     sodium.crypto_generichash(hash, b4a.from(`${this.indexID}${nodeLabel}`))
-    return b4a.toBuffer(hash)
+    return hash
   }
 
   async _dhtLookup(nodeLabel) {
@@ -35,7 +35,7 @@ class PrefixHashTree {
   }
 
   async _linearSearch(nodeLabel) {
-    for (let i = 0; i < label.length; i += 1) {
+    for (let i = 0; i <= nodeLabel.length; i += 1) {
       const { phtNode, metadata } = await this._dhtLookup(nodeLabel.substring(0, i))
 
       if (phtNode !== null && isLeaf(phtNode)) {
@@ -47,19 +47,19 @@ class PrefixHashTree {
   }
 
   async _binarySearch(nodeLabel) {
-    let p = 0
-    let r = this.bitDomain - 1
+    let lo = 0
+    let hi = nodeLabel.length
 
-    while (p <= r) {
-      const q = Math.floor((p + r) / 2)
-      const { phtNode, metadata } = await this._dhtLookup(nodeLabel.substring(0, q))
+    while (lo <= hi) {
+      const mid = Math.floor((lo + hi) / 2)
+      const { phtNode, metadata } = await this._dhtLookup(nodeLabel.substring(0, mid))
 
       if (phtNode !== null && isLeaf(phtNode)) {
         return { phtNode, metadata }
       } else if (phtNode !== null) {
-        p = q + 1
+        lo = mid + 1
       } else {
-        r = q - 1
+        hi = mid - 1
       }
     }
 
@@ -67,15 +67,13 @@ class PrefixHashTree {
   }
 
   async _fullSearch(nodeLabel) {
-    let { phtNode, metadata } = await this._binarySearch(nodeLabel)
+    const result = await this._binarySearch(nodeLabel)
 
-    if (phtNode === null) {
-      const result = await this._linearSearch(nodeLabel)
-      phtNode = result.phtNode
-      metadata = result.metadata
+    if (result.phtNode !== null) {
+      return result
     }
 
-    return { phtNode, metadata }
+    return await this._linearSearch(nodeLabel)
   }
 
   unhashedKeyFrom(string) {
@@ -89,7 +87,7 @@ class PrefixHashTree {
   }
 
   async init() {
-    const { phtNode: rootNode, metadata: _ } = await this._dhtLookup('')
+    const { phtNode: rootNode } = await this._dhtLookup('')
 
     if (rootNode !== null) {
       return
@@ -100,7 +98,7 @@ class PrefixHashTree {
 
   async insert(key, val) {
     const nodeLabel = PrefixHashTree._bufferToBase2String(key)
-    const { phtNode: leaf, metadata: _ } = await this._fullSearch(nodeLabel)
+    const { phtNode: leaf } = await this._fullSearch(nodeLabel)
 
     // TODO: alert the caller upon replication failure
     if (leaf === null) {
@@ -122,7 +120,7 @@ class PrefixHashTree {
       const keysAsBase2Strings = pairs.map(([key, _]) => PrefixHashTree._bufferToBase2String(key))
 
       const lcp = PrefixHashTree._lcp(keysAsBase2Strings)
-      await this._split({ pairs: pairs, lcp: lcp, depth: label(leaf).length, leaf: leaf })
+      await this._split({ pairs, lcp, depth: label(leaf).length, leaf })
     }
   }
 
@@ -164,7 +162,7 @@ class PrefixHashTree {
           ? child0
           : child1
 
-      await this._split({ pairs: pairs, lcp: lcp, depth: depth + 1, leaf: next })
+      await this._split({ pairs, lcp, depth: depth + 1, leaf: next })
     }
   }
 
@@ -174,7 +172,7 @@ class PrefixHashTree {
   }
 
   async searchExact(key) {
-    const { phtNode: leaf, metadata: _ } = await this.searchLeaf(key)
+    const { phtNode: leaf } = await this.searchLeaf(key)
 
     if (leaf === null) {
       return null
@@ -186,7 +184,7 @@ class PrefixHashTree {
 
   async prefixQuery(prefix) {
     const prefixLabel = PrefixHashTree._bufferToBase2String(prefix)
-    let { phtNode: startNode, metadata: _ } = await this._dhtLookup(prefixLabel)
+    let { phtNode: startNode } = await this._dhtLookup(prefixLabel)
 
     if (startNode === null) {
       const result = await this._fullSearch(prefixLabel)
@@ -211,29 +209,19 @@ class PrefixHashTree {
     const subtree1 = `${label(phtNode)}1`
     const prefixLabel = PrefixHashTree._bufferToBase2String(prefix)
 
-    const subtrieTraversals = []
+    const results = await Promise.all([
+      (async () => {
+        // TODO: alert caller upon replication failure
+        const { phtNode: child } = await this._dhtLookup(subtree0)
+        return child !== null ? this._doPrefixQuery({ phtNode: child, prefix }) : []
+      })(),
+      (async () => {
+        // TODO: alert caller upon replication failure
+        const { phtNode: child } = await this._dhtLookup(subtree1)
+        return child !== null ? this._doPrefixQuery({ phtNode: child, prefix }) : []
+      })()
+    ])
 
-    if (prefixLabel.startsWith(subtree0) || subtree0.startsWith(prefixLabel)) {
-      subtrieTraversals.push(
-        (async () => {
-          // TODO: alert caller upon replication failure
-          const { phtNode: child, metadata: _ } = await this._dhtLookup(subtree0)
-          return child !== null ? this._doPrefixQuery({ phtNode: child, prefix }) : []
-        })()
-      )
-    }
-
-    if (prefixLabel.startsWith(subtree1) || subtree1.startsWith(prefixLabel)) {
-      subtrieTraversals.push(
-        (async () => {
-          // TODO: alert caller upon replication failure
-          const { phtNode: child, metadata: _ } = await this._dhtLookup(subtree1)
-          return child !== null ? this._doPrefixQuery({ phtNode: child, prefix }) : []
-        })()
-      )
-    }
-
-    const results = await Promise.all(subtrieTraversals)
     return results.flat()
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prefix-hash-tree",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "An extensible prefix hash tree for indexing over distributed hash tables",
   "main": "index.js",
   "exports": {