@based/db 0.0.67 → 0.0.69

package/dist/src/server/workers/DbWorker.d.ts

@@ -1,12 +1,13 @@
+import { MessagePort } from 'node:worker_threads';
 import { DbServer } from '../index.js';
 export declare abstract class DbWorker {
     constructor(address: BigInt, db: DbServer, onExit: (code: number) => void, workerName: string);
     protected db: DbServer;
-    private channel;
+    protected channel: MessagePort;
     private worker;
     protected resolvers: ((x: any) => any)[];
     readyPromise: Promise<true>;
-    terminate(): Promise<number>;
+    terminate(): Promise<void>;
     abstract handleMsg(buf: any): void;
     protected callback: (resolve: (x: any) => any) => void;
     /**

package/dist/src/server/workers/DbWorker.js

@@ -53,7 +53,8 @@ export class DbWorker {
     resolvers = [];
     readyPromise;
     async terminate() {
-        return this.worker.terminate();
+        // TODO do we want to force this.worker.terminate() after a timeout?
+        await this.call(0n);
     }
     callback = (resolve) => {
         this.resolvers.push(resolve);

package/dist/src/server/workers/io_worker.js

@@ -1,14 +1,8 @@
 import { registerMsgHandler } from './worker.js';
-import { ENCODER, writeInt32 } from '@saulx/utils';
+import { writeInt32 } from '@saulx/utils';
 import native from '../../native.js';
 function loadBlock(dbCtx, filepath) {
-    try {
-        native.loadBlock(filepath, dbCtx);
-    }
-    catch (e) {
-        // need to get rid of the shared buffer
-        return new Uint8Array(ENCODER.encode(e.toString())).buffer;
-    }
+    native.loadBlock(filepath, dbCtx);
     return null;
 }
 function unloadBlock(dbCtx, filepath, typeId, start) {
@@ -25,15 +19,26 @@ function unloadBlock(dbCtx, filepath, typeId, start) {
     return buf;
 }
 registerMsgHandler((dbCtx, msg) => {
-    if (typeof msg?.type === 'string') {
-        const job = msg;
-        if (job.type === 'load') {
-            return loadBlock(dbCtx, job.filepath);
-        }
-        else if (job.type === 'unload') {
-            return unloadBlock(dbCtx, job.filepath, job.typeId, job.start);
-        }
+    if (typeof msg?.type !== 'string') {
+        throw new Error('Invalid message');
     }
-    return null;
+    const job = msg;
+    if (job.type === 'save') {
+        const LEN = 20;
+        return job.blocks.reduce((buf, block, index) => {
+            const errCodeBuf = new Uint8Array(buf, index * LEN, 4);
+            const hash = new Uint8Array(buf, index * LEN + 4, 16);
+            const err = native.saveBlock(block.filepath, block.typeId, block.start, dbCtx, hash);
+            writeInt32(errCodeBuf, err, 0);
+            return buf;
+        }, new ArrayBuffer(job.blocks.length * LEN));
+    }
+    else if (job.type === 'load') {
+        return loadBlock(dbCtx, job.filepath);
+    }
+    else if (job.type === 'unload') {
+        return unloadBlock(dbCtx, job.filepath, job.typeId, job.start);
+    }
+    throw new Error(`Unsupported type: "${msg.type}"`);
 });
 //# sourceMappingURL=io_worker.js.map

package/dist/src/server/workers/io_worker_types.d.ts

@@ -1,3 +1,11 @@
+export type IoJobSave = {
+    type: 'save';
+    blocks: {
+        filepath: string;
+        typeId: number;
+        start: number;
+    }[];
+};
 type IoJobLoad = {
     type: 'load';
     filepath: string;
@@ -8,5 +16,5 @@ type IoJobUnload = {
     typeId: number;
     start: number;
 };
-export type IoJob = IoJobLoad | IoJobUnload;
+export type IoJob = IoJobSave | IoJobLoad | IoJobUnload;
 export {};

package/dist/src/server/workers/worker.js

@@ -1,4 +1,5 @@
 import { isMainThread, parentPort, workerData } from 'node:worker_threads';
+import { nextTick } from 'node:process';
 import native from '../../native.js';
 let dbCtx;
 let wCtx; // This must be held until the worker exits otherwise the ctx will be autofreed instantly
@@ -21,9 +22,16 @@ export function registerMsgHandler(onMsg) {
     const handleMsg = (msg) => {
         try {
             if (typeof msg === 'bigint') {
-                // it's a ctx address
-                dbCtx = native.externalFromInt(msg);
-                channel.postMessage(null);
+                if (msg === 0n) {
+                    // terminate
+                    nextTick(() => typeof self === 'undefined' ? process.exit() : self.close());
+                    channel.postMessage(null);
+                }
+                else {
+                    // it's a ctx address
+                    dbCtx = native.externalFromInt(msg);
+                    channel.postMessage(null);
+                }
             }
             else {
                 // a message to the worker handler

package/dist/src/types.d.ts

@@ -1,3 +1,4 @@
+export declare const SCHEMA_FILE_DEPRECATED = "schema.json";
 export declare const SCHEMA_FILE = "schema.bin";
 export declare const WRITELOG_FILE = "writelog.json";
 export declare const COMMON_SDB_FILE = "common.sdb";

package/dist/src/types.js

@@ -1,3 +1,4 @@
+export const SCHEMA_FILE_DEPRECATED = 'schema.json';
 export const SCHEMA_FILE = 'schema.bin';
 export const WRITELOG_FILE = 'writelog.json';
 export const COMMON_SDB_FILE = 'common.sdb';

package/dist/src/utils.js

@@ -42,5 +42,5 @@ export const debugMode = (target, getInfo = null) => {
         }
     }
 };
-export const debugServer = (server) => debugMode(server, () => `p: ${server.processingQueries} m: ${server.modifyQueue.length} q: ${server.queryQueue.size}`);
+export const debugServer = (server) => debugMode(server, () => `p: ${server.activeReaders} m: ${server.modifyQueue.length} q: ${server.queryQueue.size}`);
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/db",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -20,6 +20,7 @@
     "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-fast-linux_aarch64-schema": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; npm run test-fast schemadebug'",
     "test-fast-linux_aarch64": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; npm run test-fast'",
     "test-fast-linux_aarch64-gdb": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; LOCPATH=../locale/locale-x86_64-gnu/locale gdb -ex run --args node ./scripts/test.js'",
     "test-fast-linux_aarch64-valgrind": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; LOCPATH=../locale/locale-aarch64-gnu/locale valgrind --leak-check=full node ./scripts/test.js references:update2'",
@@ -38,7 +39,7 @@
     "basedDbNative.cjs"
   ],
   "dependencies": {
-    "@based/schema": "5.0.0-alpha.23",
+    "@based/schema": "5.0.0-alpha.25",
     "@saulx/hash": "^3.0.0",
     "@saulx/utils": "^6.7.2",
     "exit-hook": "^4.0.0",