@based/db 0.0.53 → 0.0.57

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/migrate/index.js

@@ -1,4 +1,4 @@
-import { BasedDb } from '../../index.js';
+import { BasedDb, save } from '../../index.js';
 import { dirname, join } from 'path';
 import { Worker, MessageChannel, receiveMessageOnPort, } from 'node:worker_threads';
 import native from '../../native.js';
@@ -31,7 +31,11 @@ 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}`);
+    const abort = () => {
+        server.emit('info', `abort migration - migrating: ${server.migrating} abort: ${migrationId}`);
+        return server.migrating !== migrationId;
+    };
     const tmpDb = new BasedDb({
         path: null,
     });
@@ -73,7 +77,7 @@ export const migrate = async (server, fromSchema, toSchema, transform) => {
     // Block handling
     let i = 0;
     let rangesToMigrate = [];
-    await server.save();
+    await save(server, false, false, true);
     server.merkleTree.visitLeafNodes((leaf) => {
         const [_typeId, start] = destructureCsmtKey(leaf.key);
         if (start == specialBlock)
@@ -132,13 +136,15 @@ export const migrate = async (server, fromSchema, toSchema, transform) => {
     }
     // -----------------------------------------
     tmpDb.server.dbCtxExternal = fromCtx;
-    await writeSchemaFile(server, toSchema);
+    // TODO makes this SYNC
     const promises = server.workers.map((worker) => worker.updateCtx(toAddress));
-    promises.push(tmpDb.destroy(), worker.terminate(), server.save({ forceFullDump: true }));
+    promises.push(tmpDb.destroy(), worker.terminate());
     await Promise.all(promises);
     if (abort()) {
         return;
     }
+    await save(server, false, true, true);
+    await writeSchemaFile(server, toSchema);
     server.migrating = 0;
     process.nextTick(() => server.emit('schema', server.schema));
 };

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

@@ -81,7 +81,7 @@ else if (workerData?.isDbMigrateWorker) {
                 const nodes = fromDb
                     .query(type)
                     .include(include)
-                    .range(leafData.start - 1, leafData.end - 1)
+                    .range(leafData.start - 1, leafData.end)
                     ._getSync(fromCtx);
                 for (const node of nodes) {
                     const res = typeTransformFn(node);
@@ -100,7 +100,7 @@ else if (workerData?.isDbMigrateWorker) {
                 const nodes = fromDb
                     .query(type)
                     .include(include)
-                    .range(leafData.start - 1, leafData.end - 1)
+                    .range(leafData.start - 1, leafData.end)
                     ._getSync(fromCtx);
                 for (const node of nodes) {
                     toDb.create(type, node, { unsafe: true });

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

@@ -18,4 +18,4 @@ export type Writelog = {
         }[];
     };
 };
-export declare function save<T extends boolean>(db: DbServer, sync?: T, forceFullDump?: boolean): T extends true ? void : Promise<void>;
+export declare function save<T extends boolean>(db: DbServer, sync?: T, forceFullDump?: boolean, skipMigrationCheck?: boolean): T extends true ? void : Promise<void>;

package/dist/src/server/save.js

@@ -22,10 +22,13 @@ function saveRange(db, typeId, start, end, hashOut) {
     }
     return file;
 }
-export function save(db, sync = false, forceFullDump = false) {
+export function save(db, sync = false, forceFullDump = false, skipMigrationCheck = false) {
     if (!(isMainThread && (db.dirtyRanges.size || forceFullDump))) {
         return;
     }
+    if (db.migrating && !skipMigrationCheck) {
+        return;
+    }
     let err;
     const ts = Date.now();
     err = native.saveCommon(join(db.fileSystemPath, COMMON_SDB_FILE), db.dbCtxExternal);

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.53",
+  "version": "0.0.57",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -38,7 +38,7 @@
     "basedDbNative.cjs"
   ],
   "dependencies": {
-    "@based/schema": "5.0.0-alpha.16",
+    "@based/schema": "5.0.0-alpha.17",
     "@saulx/hash": "^3.0.0",
     "@saulx/utils": "^6.7.0",
     "exit-hook": "^4.0.0",