@based/db 0.0.44 → 0.0.45

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

@@ -142,7 +142,7 @@ export function create(db, type, obj, opts) {
         ctx.prefix0 = -1; // Force a new cursor
         ctx.len = pos;
         if (err === RANGE_ERR) {
-            if (pos === 0) {
+            if (pos === 8) {
                 throw new Error('!No range available');
             }
             flushBuffer(db);

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

@@ -67,7 +67,7 @@ export const update = (db, type, id, obj, opts) => {
         ctx.prefix0 = -1; // force a new cursor
         ctx.len = pos;
         if (err === RANGE_ERR) {
-            if (pos === 0) {
+            if (pos === 8) {
                 throw new Error('out of range');
             }
             flushBuffer(db);

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

@@ -285,6 +285,7 @@ export class BasedDbQuery extends QueryBranch {
             throw new Error('Query: No schema yet - use await db.schemaIsSet()');
         }
         const def = createQueryDef(db, QueryDefType.Root, target, skipValidation);
+        def.schemaChecksum = db.schema?.hash || 0;
         super(db, def);
         this.db = db;
         this.skipValidation = skipValidation;
@@ -295,6 +296,7 @@ export class BasedDbQuery extends QueryBranch {
         this.id = undefined;
         this.buffer = undefined;
         const def = createQueryDef(this.db, QueryDefType.Root, this.target, this.skipValidation);
+        def.schemaChecksum = this.db.schema?.hash || 0;
         this.def = def;
         const q = this.queryCommands;
         this.queryCommands = [];
@@ -316,8 +318,20 @@ export class BasedDbQuery extends QueryBranch {
         }
         const d = performance.now();
         await this.db.isModified();
+        if (this.db.schema?.hash !== this.def.schemaChecksum) {
+            this.reBuildQuery();
+            return this.#getInternal(resolve, reject);
+        }
         const res = await this.db.hooks.getQueryBuf(buf);
-        if (res instanceof Error) {
+        if (res.byteLength === 1) {
+            if (res[0] === 0) {
+                reject(new Error('schema mismatch'));
+            }
+            else {
+                reject(new Error('unexpected error'));
+            }
+        }
+        else if (res instanceof Error) {
             reject(res);
         }
         else {

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

@@ -4,7 +4,6 @@ import { defToBuffer } from './toBuffer.js';
 import { handleErrors } from './validation.js';
 export const registerQuery = (q) => {
     if (!q.id) {
-        q.def.schemaChecksum = q.db.schema.hash;
         const b = defToBuffer(q.db, q.def);
         const buf = concatUint8Arr(b);
         let id = native.crc32(buf);

package/dist/src/index.js

@@ -53,6 +53,7 @@ export class BasedDb {
             maxModifySize,
             hooks: {
                 subscribe(q, onData, onError) {
+                    let killed = false;
                     let timer;
                     let prevChecksum;
                     let lastLen = 0;
@@ -63,8 +64,16 @@ export class BasedDb {
                             q.reBuildQuery();
                             registerQuery(q);
                             response = undefined;
+                            timer = setTimeout(get, 0);
+                            return;
+                        }
+                        if (killed) {
+                            return;
                         }
                         const res = await server.getQueryBuf(q.buffer);
+                        if (killed) {
+                            return;
+                        }
                         if (!response) {
                             response = new BasedQueryResponse(q.id, q.def, res, 0);
                         }
@@ -82,6 +91,7 @@ export class BasedDb {
                     };
                     get();
                     return () => {
+                        killed = true;
                         clearTimeout(timer);
                     };
                 },

package/dist/src/server/index.js

@@ -469,6 +469,10 @@ export class DbServer {
             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);

package/dist/src/server/worker.js

@@ -1,13 +1,12 @@
 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);
-    workerCtx = native.workerCtxInit();
+    native.workerCtxInit();
     // const transferList = new Array(1)
     const handleMsg = (msg) => {
         try {

package/package.json

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