@based/db 0.0.62 → 0.0.63

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,11 @@ export class DbServer extends DbShared {
             resolve(new Error('Query queue exceeded'));
             return;
         }
+        // TODO should we check here as well? Already will check in DbWorker
+        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 +345,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 +393,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/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/package.json

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