@k3000/store 1.2.2 → 1.3.0

package/architect.mjs

@@ -103,6 +103,25 @@ export const TypeLen = {
     string: 12
 }
 
+/**
+ * @param {Buffer} a
+ * @param {Buffer} b
+ * @returns {-1 | 0 | 1}
+ */
+const compareBuffer = (a, b) => {
+
+    if (a.length > b.length) return 1
+    if (a.length < b.length) return -1
+
+    for (let i = 0; i < a.length; i++) {
+
+        if (a[i] > b[i]) return 1
+        if (a[i] < b[i]) return -1
+    }
+
+    return 0
+}
+
 /**
  * 加解密的类
  */
@@ -222,14 +241,22 @@ export class Entity {
     #indexPosition(index, buffer, length, s, e) {
 
         if (e < s) return s
-        if (s === e) return buffer < this.#storage.getValue(index[s], length) ? s : s + 1
-        if (buffer <= this.#storage.getValue(index[s], length)) return s
-        if (buffer >= this.#storage.getValue(index[e], length)) return e + 1
 
-        let m = Math.floor((s + e) / 2), buf = this.#storage.getValue(index[m], length)
+        let result = compareBuffer(buffer, this.#storage.getValue(index[s], length))
 
-        if (buffer < buf) return this.#indexPosition(index, buffer, length, s + 1, m - 1)
-        if (buffer > buf) return this.#indexPosition(index, buffer, length, m + 1, e - 1)
+        if (s === e) return result < 0 ? s : s + 1
+        if (result <= 0) return s
+
+        result = compareBuffer(buffer, this.#storage.getValue(index[e], length))
+
+        if (result >= 0) return e + 1
+
+        let m = Math.floor((s + e) / 2)
+
+        result = compareBuffer(buffer, this.#storage.getValue(index[m], length))
+
+        if (result < 0) return this.#indexPosition(index, buffer, length, s + 1, m - 1)
+        if (result > 0) return this.#indexPosition(index, buffer, length, m + 1, e - 1)
 
         return m
     }
@@ -693,21 +720,23 @@ export class Entities extends Array {
 
         if (e < s) return []
 
-        let m = Math.floor((s + e) / 2), buf = this.#storage.getValue(index[m], length)
+        let m = Math.floor((s + e) / 2)
 
-        if (buffer < buf) return this.#findByValue(index, buffer, length, s, m - 1)
-        if (buffer > buf) return this.#findByValue(index, buffer, length, m + 1, e)
+        let result = compareBuffer(buffer, this.#storage.getValue(index[m], length))
 
-        let result = [index[m]], i
+        if (result < 0) return this.#findByValue(index, buffer, length, s, m - 1)
+        if (result > 0) return this.#findByValue(index, buffer, length, m + 1, e)
 
-        for (i = m - 1; i >= 0; i--) {
+        result = [index[m]]
+
+        for (let i = m - 1; i >= 0; i--) {
 
             if (!this.#storage.getValue(index[i], length).equals(buffer)) break
 
             result.unshift(index[i])
         }
 
-        for (i = m + 1; i < index.length; i++) {
+        for (let i = m + 1; i < index.length; i++) {
 
             if (!this.#storage.getValue(index[i], length).equals(buffer)) break
 
@@ -732,8 +761,8 @@ export class Entities extends Array {
 
         let m = Math.floor((s + e) / 2), buffer = this.#storage.getValue(index[m], length)
 
-        if (before < buffer) return this.#findByTime(index, after, before, length, s, m - 1)
-        if (after > buffer) return this.#findByTime(index, after, before, length, m + 1, e)
+        if (compareBuffer(before, buffer)) return this.#findByTime(index, after, before, length, s, m - 1)
+        if (compareBuffer(after, buffer)) return this.#findByTime(index, after, before, length, m + 1, e)
 
         let result = [index[m]], i
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k3000/store",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "storage",
   "main": "generator.mjs",
   "scripts": {