prefix-hash-tree 0.0.4 → 0.0.6

package/index.d.ts

@@ -24,6 +24,6 @@ declare module 'prefix-hash-tree' {
 
     searchExact(key: Buffer): Promise<any>
 
-    prefixQuery(prefix: Buffer): Promise<[string, any][]>
+    prefixQuery(prefix: Buffer): Promise<[string, any][] | null>
   }
 }

package/index.js

@@ -31,7 +31,7 @@ class PrefixHashTree {
   }
 
   async _dhtLookup(nodeLabel) {
-    return await this.getFunc(this._labelHash(nodeLabel))
+    return this.getFunc(this._labelHash(nodeLabel))
   }
 
   async _linearSearch(nodeLabel) {
@@ -73,13 +73,17 @@ class PrefixHashTree {
       return result
     }
 
-    return await this._linearSearch(nodeLabel)
+    return this._linearSearch(nodeLabel)
   }
 
   unhashedKeyFrom(string) {
-    const phtKey = b4a.alloc(this.bitDomain / 8)
-    phtKey.write(string, 0, this.keyEncoding)
-    return phtKey
+    const key = b4a.alloc(this.bitDomain / 8)
+    const length = key.write(string, 0, this.keyEncoding)
+    return { key, length }
+  }
+
+  _keyToCompactString(key) {
+    return key.key.toString(this.keyEncoding, 0, key.length)
   }
 
   prefixFrom(string) {
@@ -97,7 +101,7 @@ class PrefixHashTree {
   }
 
   async insert(key, val) {
-    const nodeLabel = PrefixHashTree._bufferToBase2String(key)
+    const nodeLabel = PrefixHashTree._bufferToBase2String(key.key)
     const { phtNode: leaf } = await this._fullSearch(nodeLabel)
 
     // TODO: alert the caller upon replication failure
@@ -105,7 +109,7 @@ class PrefixHashTree {
       return
     }
 
-    const serializedKey = key.toString(this.keyEncoding)
+    const serializedKey = this._keyToCompactString(key)
     const oldState = get(leaf, serializedKey)
     const newState = this.transform(oldState, val)
 
@@ -117,7 +121,7 @@ class PrefixHashTree {
         .map(([oldKey, oldVal]) => [this.unhashedKeyFrom(oldKey), oldVal])
         .concat([[key, newState]])
 
-      const keysAsBase2Strings = pairs.map(([key, _]) => PrefixHashTree._bufferToBase2String(key))
+      const keysAsBase2Strings = pairs.map(([key]) => PrefixHashTree._bufferToBase2String(key.key))
 
       const lcp = PrefixHashTree._lcp(keysAsBase2Strings)
       await this._split({ pairs, lcp, depth: label(leaf).length, leaf })
@@ -140,8 +144,9 @@ class PrefixHashTree {
     if (depth === lcp.length) {
       // Base case: we've reached our final depth, so distribute the keys to the children
       pairs.forEach(([key, val]) => {
-        const dest = PrefixHashTree._bufferToBase2String(key)[lcp.length] === '0' ? child0 : child1
-        const serializedKey = key.toString(this.keyEncoding)
+        const dest =
+          PrefixHashTree._bufferToBase2String(key.key)[lcp.length] === '0' ? child0 : child1
+        const serializedKey = this._keyToCompactString(key)
         set(dest, serializedKey, val)
       })
 
@@ -158,7 +163,8 @@ class PrefixHashTree {
       await this.putFunc(this._labelHash(label(parent)), parent)
 
       const next =
-        PrefixHashTree._lcp([lcp, label(child0)]) > PrefixHashTree._lcp([lcp, label(child1)])
+        PrefixHashTree._lcp([lcp, label(child0)]).length >
+        PrefixHashTree._lcp([lcp, label(child1)]).length
           ? child0
           : child1
 
@@ -167,8 +173,8 @@ class PrefixHashTree {
   }
 
   async searchLeaf(key) {
-    const keyLabel = PrefixHashTree._bufferToBase2String(key)
-    return await this._fullSearch(keyLabel)
+    const keyLabel = PrefixHashTree._bufferToBase2String(key.key)
+    return this._fullSearch(keyLabel)
   }
 
   async searchExact(key) {
@@ -178,7 +184,7 @@ class PrefixHashTree {
       return null
     }
 
-    const val = get(leaf, key.toString(this.keyEncoding))
+    const val = get(leaf, this._keyToCompactString(key))
     return val !== undefined ? val : null
   }
 
@@ -196,7 +202,7 @@ class PrefixHashTree {
       return null
     }
 
-    return await this._doPrefixQuery({ phtNode: startNode, prefix: prefix })
+    return this._doPrefixQuery({ phtNode: startNode, prefix })
   }
 
   async _doPrefixQuery({ phtNode, prefix } = {}) {
@@ -207,7 +213,6 @@ class PrefixHashTree {
 
     const subtree0 = `${label(phtNode)}0`
     const subtree1 = `${label(phtNode)}1`
-    const prefixLabel = PrefixHashTree._bufferToBase2String(prefix)
 
     const results = await Promise.all([
       (async () => {
@@ -226,9 +231,7 @@ class PrefixHashTree {
   }
 
   static _bufferToBase2String(buf) {
-    return Array.from(buf)
-      .map((byte) => byte.toString(2).padStart(8, '0'))
-      .join('')
+    return Array.from(buf, (byte) => byte.toString(2).padStart(8, '0')).join('')
   }
 
   static _lcp(strings = []) {

package/lib/pht-node.d.ts

@@ -22,7 +22,7 @@ declare module 'prefix-hash-tree' {
 
   export function size(node: PHTNode): number
 
-  export function setPointers(node: PHTNode, left: string, right: string): void
+  export function setPointers(node: PHTNode, left: string | null, right: string | null): void
 
   export function pointerLeft(node: PHTNode): string | null
 

package/package.json

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