@based/db 0.0.62 → 0.0.64

package/dist/src/client/flushModify.js

@@ -169,12 +169,12 @@ export const startDrain = (db) => {
     db.isDraining = true;
     if (db.flushTime === 0) {
         process.nextTick(() => {
-            flushBuffer(db);
+            void flushBuffer(db);
         });
     }
     else {
         setTimeout(() => {
-            flushBuffer(db);
+            void flushBuffer(db);
         }, db.flushTime);
     }
 };

package/dist/src/client/modify/create.js

@@ -145,7 +145,7 @@ export function create(db, type, obj, opts) {
             if (pos === 8) {
                 throw new Error('!No range available');
             }
-            flushBuffer(db);
+            void flushBuffer(db);
             return db.create(type, obj, opts);
         }
         res.error = err;

package/dist/src/client/modify/delete.js

@@ -15,7 +15,7 @@ export const deleteFn = (db, type, id, opts) => {
     if (separate) {
         const size = 11 /* SIZE.DEFAULT_CURSOR */ + 2 + separate.length * 12;
         if (ctx.len + size > ctx.max) {
-            flushBuffer(db);
+            void flushBuffer(db);
             return deleteFn(db, type, id);
         }
         setCursor(ctx, schema, 0, MICRO_BUFFER, id, UPDATE);
@@ -28,7 +28,7 @@ export const deleteFn = (db, type, id, opts) => {
     }
     else {
         if (ctx.len + 11 /* SIZE.DEFAULT_CURSOR */ + 2 > ctx.max) {
-            flushBuffer(db);
+            void flushBuffer(db);
             return deleteFn(db, type, id);
         }
         setCursor(ctx, schema, 0, MICRO_BUFFER, id, UPDATE);

package/dist/src/client/modify/expire.js

@@ -9,7 +9,7 @@ export function expire(db, type, id, seconds) {
     }
     const ctx = db.modifyCtx;
     if (ctx.len + 11 /* SIZE.DEFAULT_CURSOR */ + 5 > ctx.max) {
-        flushBuffer(db);
+        void flushBuffer(db);
         return expire(db, type, id, seconds);
     }
     setCursor(ctx, def, 0, MICRO_BUFFER, id, EXPIRE);

package/dist/src/client/modify/update.js

@@ -70,7 +70,7 @@ export const update = (db, type, id, obj, opts) => {
             if (pos === 8) {
                 throw new Error('out of range');
             }
-            flushBuffer(db);
+            void flushBuffer(db);
             return update(db, type, id, obj, opts);
         }
         res.error = err;

package/dist/src/client/query/BasedDbQuery.js

@@ -11,7 +11,6 @@ import { langCodesMap } from '@based/schema';
 import { convertFilter } from './filter/convertFilter.js';
 import { validateLocale, validateRange } from './validation.js';
 import { DEF_RANGE_PROP_LIMIT } from './thresholds.js';
-import { wait } from '@saulx/utils';
 import { displayTarget } from './display.js';
 import picocolors from 'picocolors';
 export class QueryBranch {
@@ -338,13 +337,19 @@ export class BasedDbQuery extends QueryBranch {
         const res = await this.db.hooks.getQueryBuf(buf);
         if (res.byteLength === 1) {
             if (res[0] === 0) {
-                this.reset();
-                this.db.emit('info', 'query get schema mismatch - awaiting new schema (max 15s)');
-                const ok = await Promise.race([wait(15e3), this.db.once('schema')]);
-                if (!ok) {
-                    reject(new Error('schema mismath'));
+                if (this.def && this.def.schemaChecksum === this.db.schema?.hash) {
+                    // my schema did not change since last time, wait for the schema to change
+                    this.reset();
+                    this.db.emit('info', 'query get schema mismatch - awaiting new schema');
+                    await this.db.once('schema');
+                    return this.#getInternal(resolve, reject);
+                }
+                else {
+                    // its changed so lets send again
+                    this.db.emit('info', 'query get schema mismatch - got the same already');
+                    this.reset();
+                    return this.#getInternal(resolve, reject);
                 }
-                return this.#getInternal(resolve, reject);
             }
             else {
                 reject(new Error('unexpected error'));

package/dist/src/client/query/subscription/index.js

@@ -32,7 +32,9 @@ export class SubStore {
         };
         let killed = false;
         if (!q.db.schema) {
-            q.db.schemaIsSet().then(() => {
+            q.db
+                .schemaIsSet()
+                .then(() => {
                 if (!killed) {
                     try {
                         registerQuery(q);
@@ -42,6 +44,9 @@ export class SubStore {
                         onError(err);
                     }
                 }
+            })
+                .catch((err) => {
+                onError(err);
             });
             this.onClose = () => {
                 killed = true;

package/dist/src/hooks.js

@@ -25,7 +25,7 @@ export const getDefaultHooks = (server, subInterval = 200) => {
                 }
                 timer = setTimeout(poll, subInterval);
             };
-            poll();
+            void poll();
             return () => {
                 clearTimeout(timer);
                 killed = true;

package/dist/src/server/DbWorker.js

@@ -29,7 +29,9 @@ export class DbWorker {
         });
         this.worker.on('error', (err) => {
             console.error('error in query worker:', err);
-            this.worker.terminate();
+            this.worker.terminate().catch((err) => {
+                console.error('error terminating query worker:', err);
+            });
         });
         this.worker.on('exit', (code) => {
             if (!this.db.stopped) {

package/dist/src/server/index.d.ts

@@ -67,10 +67,10 @@ export declare class DbServer extends DbShared {
     getSortIndex(typeId: number, field: number, start: number, lang: number): SortIndex;
     createSortIndexBuffer(typeId: number, field: number, start: number, lang: number): SortIndex;
     setSchema(strictSchema: StrictSchema, transformFns?: TransformFns): Promise<SchemaChecksum>;
-    modify(buf: Uint8Array): Record<number, number> | null;
-    addToQueryQueue(resolve: any, buf: any): void;
+    modify(bufWithHash: Uint8Array): Record<number, number> | null;
+    addToQueryQueue(resolve: any, buf: any): Promise<Uint8Array>;
     getQueryBuf(buf: Uint8Array, fromQueue?: boolean): Promise<Uint8Array>;
-    onQueryEnd(): void;
+    onQueryEnd(): any;
     stop(noSave?: boolean): Promise<void>;
     destroy(): Promise<void>;
 }

package/dist/src/server/index.js

@@ -242,14 +242,13 @@ export class DbServer extends DbShared {
         });
         return schema.hash;
     }
-    modify(buf) {
-        const schemaHash = readUint64(buf, 0);
-        // if !schema
+    modify(bufWithHash) {
+        const schemaHash = readUint64(bufWithHash, 0);
         if (schemaHash !== this.schema?.hash) {
             this.emit('info', 'Schema mismatch in modify');
             return null;
         }
-        buf = buf.subarray(8);
+        const buf = bufWithHash.subarray(8);
         const offsets = {};
         const dataLen = readUint32(buf, buf.length - 4);
         let typesSize = readUint16(buf, dataLen);
@@ -277,7 +276,7 @@ export class DbServer extends DbShared {
             offsets[typeId] = offset;
         }
         if (this.processingQueries) {
-            this.modifyQueue.push(new Uint8Array(buf));
+            this.modifyQueue.push(new Uint8Array(bufWithHash));
         }
         else {
             this.#modify(buf);
@@ -334,6 +333,10 @@ export class DbServer extends DbShared {
             resolve(new Error('Query queue exceeded'));
             return;
         }
+        const schemaChecksum = readUint64(buf, buf.byteLength - 8);
+        if (schemaChecksum !== this.schema?.hash) {
+            return Promise.resolve(new Uint8Array(1));
+        }
         this.queryQueue.set(resolve, buf);
     }
     getQueryBuf(buf, fromQueue = false) {
@@ -341,10 +344,6 @@ export class DbServer extends DbShared {
             console.error('Db is stopped - trying to query', buf.byteLength);
             return Promise.resolve(new Uint8Array(8));
         }
-        const schemaChecksum = readUint64(buf, buf.byteLength - 8);
-        if (schemaChecksum !== this.schema?.hash) {
-            return Promise.resolve(new Uint8Array(1));
-        }
         if (this.modifyQueue.length) {
             return new Promise((resolve) => {
                 this.addToQueryQueue(resolve, buf);
@@ -393,7 +392,13 @@ export class DbServer extends DbShared {
             if (this.modifyQueue.length) {
                 const modifyQueue = this.modifyQueue;
                 this.modifyQueue = [];
-                for (const buf of modifyQueue) {
+                for (const bufWithHash of modifyQueue) {
+                    const schemaHash = readUint64(bufWithHash, 0);
+                    if (schemaHash !== this.schema?.hash) {
+                        this.emit('info', 'Schema mismatch in modify');
+                        return null;
+                    }
+                    const buf = bufWithHash.subarray(8);
                     this.#modify(buf);
                 }
             }

package/dist/src/server/migrate/index.js

@@ -113,7 +113,7 @@ export const migrate = async (server, fromSchema, toSchema, transform) => {
             if (server.dirtyRanges.size) {
                 rangesToMigrate = [];
                 i = 0;
-                foreachDirtyBlock(server, (_mtKey, typeId, start, end) => {
+                void foreachDirtyBlock(server, (_mtKey, typeId, start, end) => {
                     rangesToMigrate.push({
                         typeId,
                         start,

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

@@ -13,6 +13,7 @@ else if (workerData?.isDbMigrateWorker) {
     const { from, to, fromSchema, toSchema, channel, workerState, transformFns } = workerData;
     const fromCtx = native.externalFromInt(from);
     const toCtx = native.externalFromInt(to);
+    native.workerCtxInit();
     const fromDb = new BasedDb({ path: null });
     const toDb = new BasedDb({ path: null });
     const cp = (obj) => {

package/dist/src/server/save.js

@@ -69,7 +69,7 @@ export function save(db, sync = false, forceFullDump = false, skipMigrationCheck
             }
         }
         else {
-            foreachDirtyBlock(db, (mtKey, typeId, start, end) => {
+            void foreachDirtyBlock(db, (mtKey, typeId, start, end) => {
                 const hash = new Uint8Array(16);
                 const file = saveRange(db, typeId, start, end, hash);
                 if (file === null) {

package/dist/src/server/start.js

@@ -124,7 +124,7 @@ export async function start(db, opts) {
     // use timeout
     if (db.saveIntervalInSeconds > 0) {
         db.saveInterval ??= setInterval(() => {
-            save(db);
+            void save(db);
         }, db.saveIntervalInSeconds * 1e3);
     }
     if (db.schema) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/db",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",