@based/db 0.2.8 → 0.2.10

package/dist/src/server/index.js

@@ -13,6 +13,7 @@ import { DbShared } from '../shared/DbBase.js';
 import { setNativeSchema, setSchemaOnServer, writeSchemaFile, } from './schema.js';
 import { resizeModifyDirtyRanges } from './resizeModifyDirtyRanges.js';
 import { loadBlock, unloadBlock } from './blocks.js';
+import { initDefaultSubscriptions } from './subscription.js';
 const emptyUint8Array = new Uint8Array(0);
 class SortIndex {
     constructor(buf, dbCtxExternal) {
@@ -26,15 +27,7 @@ class SortIndex {
 export class DbServer extends DbShared {
     modifyDirtyRanges;
     dbCtxExternal; // pointer to zig dbCtx
-    subscriptions = {
-        subInterval: 200,
-        active: 0,
-        updateHandler: null,
-        ids: new Map(),
-        fullType: new Map(),
-        updateId: 1,
-        now: { listeners: new Set(), lastUpdated: 1 },
-    };
+    subscriptions = initDefaultSubscriptions();
     migrating = null;
     saveInProgress = false;
     fileSystemPath;

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

@@ -5,4 +5,4 @@ export type MigrateRange = {
     start: number;
     end: number;
 };
-export declare const migrate: (server: DbServer, fromSchema: DbSchema, toSchema: DbSchema, transform?: MigrateFns) => Promise<void>;
+export declare const migrate: (server: DbServer, fromSchema: DbSchema, toSchema: DbSchema, transform?: MigrateFns) => Promise<true | void>;

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

@@ -1,4 +1,4 @@
-import { BasedDb, save } from '../../index.js';
+import { BasedDb, initDefaultSubscriptions, save } from '../../index.js';
 import { dirname, join } from 'path';
 import { Worker, MessageChannel } from 'node:worker_threads';
 import native from '../../native.js';
@@ -80,7 +80,7 @@ export const migrate = async (server, fromSchema, toSchema, transform) => {
         return newMigrationInProgress;
     };
     const tmpDb = new BasedDb({
-        path: null,
+        path: null, //join(tmpdir(), String(Math.random())),
     });
     await tmpDb.start({
         clean: true,
@@ -140,6 +140,23 @@ export const migrate = async (server, fromSchema, toSchema, transform) => {
         const end = start + def.blockCapacity - 1;
         rangesToMigrate.push({ typeId, start, end });
     });
+    rangesToMigrate.sort((a, b) => {
+        const typeA = server.schemaTypesParsedById[a.typeId];
+        const typeB = server.schemaTypesParsedById[b.typeId];
+        for (const k in typeA.props) {
+            const prop = typeA.props[k];
+            if (prop.dependent && prop.inverseTypeName === typeB.type) {
+                return 1;
+            }
+        }
+        for (const k in typeB.props) {
+            const prop = typeB.props[k];
+            if (prop.dependent && prop.inverseTypeName === typeA.type) {
+                return -1;
+            }
+        }
+        return 0;
+    });
     await waitUntilSleeping(workerState);
     while (i < rangesToMigrate.length) {
         if (abort()) {
@@ -176,15 +193,17 @@ export const migrate = async (server, fromSchema, toSchema, transform) => {
     }
     server.dbCtxExternal = toCtx;
     server.sortIndexes = {};
+    server.subscriptions = initDefaultSubscriptions();
     setSchemaOnServer(server, toSchema);
     tmpDb.server.dbCtxExternal = fromCtx;
     // TODO makes this SYNC
     const promises = [server.ioWorker, ...server.workers].map((worker) => worker.updateCtx(toAddress));
-    promises.push(tmpDb.destroy(), worker.terminate());
+    promises.push(worker.terminate());
     await Promise.all(promises);
     if (abort()) {
         return;
     }
+    tmpDb.destroy();
     native.membarSyncRead();
     await save(server, {
         forceFullDump: true,
@@ -194,5 +213,6 @@ export const migrate = async (server, fromSchema, toSchema, transform) => {
     await writeSchemaFile(server, toSchema);
     server.migrating = 0;
     process.nextTick(() => server.emit('schema', server.schema));
+    return true;
 };
 //# sourceMappingURL=index.js.map

package/dist/src/server/save.js

@@ -110,6 +110,7 @@ export async function save(db, opts = {}) {
         let err;
         err = native.saveCommon(join(db.fileSystemPath, COMMON_SDB_FILE), db.dbCtxExternal);
         if (err) {
+            console.log({ err });
             db.emit('error', `Save common failed: ${err}`);
             // Return ?
         }

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

@@ -27,6 +27,7 @@ export type Subscriptions = {
     };
     subInterval: number;
 };
+export declare const initDefaultSubscriptions: () => Subscriptions;
 export declare const startUpdateHandler: (server: DbServer) => void;
 export declare const registerSubscription: (server: DbServer, query: Uint8Array, sub: Uint8Array, onData: OnData, onError: OnError, subInterval?: number) => () => void;
 export {};

package/dist/src/server/subscription.js

@@ -3,6 +3,15 @@ import { SubscriptionType, } from '../client/query/subscription/types.js';
 import native from '../native.js';
 import { MAX_ID } from '@based/schema';
 import { styleText } from 'util';
+export const initDefaultSubscriptions = () => ({
+    subInterval: 200,
+    active: 0,
+    updateHandler: null,
+    ids: new Map(),
+    fullType: new Map(),
+    updateId: 1,
+    now: { listeners: new Set(), lastUpdated: 1 },
+});
 export const startUpdateHandler = (server) => {
     // skip next if queries are sitll in progress can add a number for each staged sub
     // combine this with handled modify

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/db",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "type": "module",
   "main": "./dist/src/index.js",
   "scripts": {
@@ -23,6 +23,7 @@
     "test-fast-linux_aarch64": "podman run -t --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; npm run test-fast'",
     "test-fast-linux_aarch64-gdb": "podman run -t --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; LOCPATH=../locale/locale-x86_64-gnu/locale gdb -ex run --args node ./scripts/test.js'",
     "test-fast-linux_aarch64-valgrind": "podman run -t --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; LOCPATH=../locale/locale-aarch64-gnu/locale valgrind --leak-check=full node ./scripts/test.js'",
+    "test-fast-linux_aarch64-valgrind-subs": "podman run -t --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; LOCPATH=../locale/locale-aarch64-gnu/locale valgrind --leak-check=full node ./scripts/test.js subscription/subscription.js'",
     "test-vector": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; npm run test-fast -- mem.js'",
     "test-zig": "npm run build-zig && tsc && npm run test-fast",
     "test-zig-debug": "npm run build-zig -- debug && tsc && LOCPATH=../locale/locale-x86_64-gnu/locale ./scripts/lldb-node ./scripts/test.js",
@@ -44,7 +45,7 @@
     "@based/hash": "1.1.0",
     "@based/schema": "5.1.4",
     "@based/utils": "1.2.0",
-    "@based/protocol": "0.1.4",
+    "@based/protocol": "0.1.5",
     "exit-hook": "^4.0.0"
   },
   "optionalDependencies": {