@based/db 0.0.56 → 0.0.58

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

@@ -158,7 +158,6 @@ export function create(db, type, obj, opts) {
     }
     if (id > def.lastId) {
         def.lastId = id;
-        def.total++;
     }
     // @ts-ignore
     return res;

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

@@ -340,11 +340,17 @@ export class BasedDbQuery extends QueryBranch {
         const res = await this.db.hooks.getQueryBuf(buf);
         if (res.byteLength === 1) {
             if (res[0] === 0) {
-                if (this.db.schema?.hash !== this.def.schemaChecksum) {
+                if (this.def && this.db.schema?.hash !== this.def.schemaChecksum) {
+                    this.reset();
+                    this.db.emit('info', 'query get schema mismatch - awaiting new schema');
+                    await this.db.once('schema');
+                    return this.#getInternal(resolve, reject);
+                }
+                else {
+                    this.db.emit('info', 'query get schema mismatch - got the same already');
                     this.reset();
                     return this.#getInternal(resolve, reject);
                 }
-                reject(new Error('schema mismatch'));
             }
             else {
                 reject(new Error('unexpected error'));

package/dist/src/server/index.js

@@ -242,7 +242,9 @@ export class DbServer extends DbShared {
     }
     modify(buf) {
         const schemaHash = readUint64(buf, 0);
-        if (schemaHash !== this.schema.hash) {
+        // if !schema
+        if (schemaHash !== this.schema?.hash) {
+            this.emit('info', 'Schema mismatch in modify');
             return null;
         }
         buf = buf.subarray(8);
@@ -255,6 +257,10 @@ export class DbServer extends DbShared {
             i += 2;
             const startId = readUint32(buf, i);
             const def = this.schemaTypesParsedById[typeId];
+            if (!def) {
+                console.error(`Wrong cannot get def in modify ${typeId} ${schemaHash} ${this.schema?.hash}!}`);
+                return null;
+            }
             let offset = def.lastId - startId;
             if (offset < 0) {
                 offset = 0;

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

@@ -6,7 +6,6 @@ import { destructureCsmtKey, foreachDirtyBlock, specialBlock } from '../tree.js'
 import { fileURLToPath } from 'url';
 import { setNativeSchema, setSchemaOnServer, writeSchemaFile, } from '../schema.js';
 import { setToAwake, waitUntilSleeping } from './utils.js';
-import { deepMerge } from '@saulx/utils';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const workerPath = join(__dirname, 'worker.js');
@@ -31,7 +30,16 @@ const parseTransform = (transform) => {
 export const migrate = async (server, fromSchema, toSchema, transform) => {
     const migrationId = toSchema.hash;
     server.migrating = migrationId;
-    const abort = () => server.migrating !== migrationId;
+    server.emit('info', `migrating schema ${migrationId}`);
+    let killed = false;
+    const abort = () => {
+        if (killed) {
+            server.emit('info', `migration killed something went wrong ${migrationId}`);
+            return true;
+        }
+        server.emit('info', `abort migration - migrating: ${server.migrating} abort: ${migrationId}`);
+        return server.migrating !== migrationId;
+    };
     const tmpDb = new BasedDb({
         path: null,
     });
@@ -69,7 +77,10 @@ export const migrate = async (server, fromSchema, toSchema, transform) => {
         transferList: [port2],
     });
     // handle?
-    worker.on('error', console.error);
+    worker.on('error', (err) => {
+        killed = true;
+        console.error(`Error in migration ${err.message}`);
+    });
     // Block handling
     let i = 0;
     let rangesToMigrate = [];
@@ -123,12 +134,9 @@ export const migrate = async (server, fromSchema, toSchema, transform) => {
     // ----------------MAKE NICE THIS------------------
     // pass last node IDS { type: lastId }
     setSchemaOnServer(server, toSchema);
-    // make schema util for this later
-    server.schemaTypesParsed = deepMerge(tmpDb.server.schemaTypesParsed, schemaTypesParsed);
-    server.schemaTypesParsedById = {};
-    for (const key in server.schemaTypesParsed) {
+    for (const key in schemaTypesParsed) {
         const def = server.schemaTypesParsed[key];
-        server.schemaTypesParsedById[def.id] = def;
+        def.lastId = schemaTypesParsed[key].lastId;
     }
     // -----------------------------------------
     tmpDb.server.dbCtxExternal = fromCtx;

package/dist/src/shared/Emitter.d.ts

@@ -1,6 +1,7 @@
 import { DbSchema } from '../schema.js';
 export type EventMap = {
     schema: DbSchema;
+    info: string;
 };
 export type Event = keyof EventMap;
 export type Listener<T> = (data: T) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/db",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -38,7 +38,7 @@
     "basedDbNative.cjs"
   ],
   "dependencies": {
-    "@based/schema": "5.0.0-alpha.17",
+    "@based/schema": "5.0.0-alpha.18",
     "@saulx/hash": "^3.0.0",
     "@saulx/utils": "^6.7.0",
     "exit-hook": "^4.0.0",