@based/db 0.0.20 → 0.0.21

package/dist/src/server/tree.js

@@ -12,7 +12,7 @@ export async function foreachBlock(db, def, cb) {
     const step = def.blockCapacity;
     for (let start = 1; start <= def.lastId; start += step) {
         const end = start + step - 1;
-        const hash = Buffer.allocUnsafe(16);
+        const hash = new Uint8Array(16);
         native.getNodeRangeHash(def.id, start, end, hash, db.dbCtxExternal);
         cb(start, end, hash);
     }
@@ -24,7 +24,22 @@ export async function foreachDirtyBlock(db, cb) {
         const typeId = type.id;
         typeIdMap[typeId] = type;
     }
-    for (const mtKey of db.dirtyRanges) {
+    // FDN-791 CSMT is unstable (not history independent)
+    // For now we just sort the dirty data by type and start
+    // to make the insertion order more deterministic.
+    // This doesn't solve the issue completely because
+    // we might mess the order later with updates.
+    const dirty = [...db.dirtyRanges].sort((a, b) => {
+        const [aTypeId, aStart] = destructureCsmtKey(a);
+        const [bTypeId, bStart] = destructureCsmtKey(b);
+        const aId = typeIdMap[aTypeId].id;
+        const bId = typeIdMap[bTypeId].id;
+        const td = aId - bId;
+        if (td != 0)
+            return td;
+        return aStart - bStart;
+    });
+    for (const mtKey of dirty) {
         const [typeId, start] = destructureCsmtKey(mtKey);
         const end = start + typeIdMap[typeId].blockCapacity - 1;
         cb(mtKey, typeId, start, end);

package/dist/src/server/worker.js

@@ -1,12 +1,13 @@
 import { isMainThread, receiveMessageOnPort, workerData, } from 'node:worker_threads';
 import native from '../native.js';
+let workerCtx;
 if (isMainThread) {
     console.warn('running query worker.ts in mainthread');
 }
 else {
     let { address, channel } = workerData;
     let dbCtx = native.externalFromInt(address);
-    native.workerCtxInit();
+    workerCtx = native.workerCtxInit();
     const transferList = new Array(1);
     const handleMsg = (msg) => {
         try {

package/dist/src/utils.d.ts

@@ -0,0 +1,4 @@
+export declare const equals: (aB: Uint8Array, bB: Uint8Array) => boolean;
+export declare const bufToHex: (a: Uint8Array) => string;
+export declare const hexToBuf: (s: string) => Uint8Array;
+export declare const base64encode: (a: Uint8Array, lineMax?: number) => string;

package/dist/src/utils.js

@@ -0,0 +1,84 @@
+import native from './native.js';
+export const equals = (aB, bB) => {
+    const len = aB.byteLength;
+    if (len != bB.byteLength) {
+        return false;
+    }
+    let i = 0;
+    if (len < 50) {
+        while (i < len) {
+            if (aB[i] != bB[i]) {
+                return false;
+            }
+            i++;
+        }
+        return true;
+    }
+    else {
+        while (i < 4) {
+            if (aB[i] != bB[i]) {
+                return false;
+            }
+            i++;
+        }
+        return native.equals(aB, bB);
+    }
+};
+const charMap = new TextEncoder().encode("0123456789abcdef");
+const DECODER = new TextDecoder();
+// Uint8Array.fromHex() and Uint8Array.toHex() are not available in V8
+// https://issues.chromium.org/issues/42204568
+export const bufToHex = (a) => {
+    const tmp = new Uint8Array(2 * a.byteLength);
+    const n = charMap.length;
+    let j = 0;
+    for (let i = 0; i < a.byteLength; i++) {
+        tmp[j++] = charMap[a[i] >>> 4 % n];
+        tmp[j++] = charMap[a[i] & 0x0f % n];
+    }
+    return DECODER.decode(tmp);
+};
+const intMap = {
+    '0': 0,
+    '1': 0x1,
+    '2': 0x2,
+    '3': 0x3,
+    '4': 0x4,
+    '5': 0x5,
+    '6': 0x6,
+    '7': 0x7,
+    '8': 0x8,
+    '9': 0x9,
+    'a': 0xa,
+    'b': 0xb,
+    'c': 0xc,
+    'd': 0xd,
+    'e': 0xe,
+    'f': 0xf,
+};
+// Uint8Array.fromHex() and Uint8Array.toHex() are not available in V8
+// https://issues.chromium.org/issues/42204568
+export const hexToBuf = (s) => {
+    const len = (s.length >>> 1) << 1;
+    const buf = new Uint8Array(len / 2);
+    for (let i = 0; i < buf.byteLength; i++) {
+        const x = s.charAt(2 * i);
+        const y = s.charAt(2 * i + 1);
+        buf[i] = (intMap[x] << 4) + intMap[y];
+    }
+    return buf;
+};
+function base64OutLen(n, lineMax) {
+    let olen;
+    /* This version would be with padding but we don't pad */
+    //olen = n * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
+    olen = ((4 * n / 3) + 3) & ~3;
+    olen += lineMax > 0 ? olen / lineMax : 0; // line feeds
+    return olen;
+}
+export const base64encode = (a, lineMax = 72) => {
+    // TODO Could fallback to @saulx/utils if native is not available
+    const tmp = new Uint8Array(base64OutLen(a.byteLength, lineMax));
+    return DECODER.decode(native.base64encode(tmp, a, lineMax));
+};
+//# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/db",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -12,9 +12,9 @@
     "clean-selva": "make -C clibs clean",
     "clean": "rimraf {.turbo,dist,node_modules,.zig-cache,.zig-out,tmp} && npm run clean-selva",
     "playground-nodebug": "npm run build && node ./dist/test/shared/playground.js",
-    "playground": "npm run build && LOCPATH=../locale/locale-x86_64-gnu/locale lldb -b -o run --one-line-on-crash bt -o \"script import os; os._exit(0)\" node ./dist/test/shared/playground.js",
+    "playground": "npm run build && LOCPATH=../locale/locale-x86_64-gnu/locale ./scripts/lldb-node ./dist/test/shared/playground.js",
     "playground-fast": "node ./dist/test/shared/playground.js",
-    "test": "npm run build && LOCPATH=../locale/locale-x86_64-gnu/locale lldb -b -o run --one-line-on-crash bt -o \"script import os; os._exit(0)\" node ./scripts/test.js",
+    "test": "npm run build && LOCPATH=../locale/locale-x86_64-gnu/locale ./scripts/lldb-node ./scripts/test.js",
     "test-gdb": "npm run build && LOCPATH=../locale/locale-x86_64-gnu/locale gdb -ex run --args node ./scripts/test.js",
     "test-fast": "LOCPATH=../locale/locale-x86_64-gnu/locale node ./scripts/test.js",
     "test-zig": "npm run build-zig -- debug && tsc && npm run test-fast",