@based/db 0.0.49 → 0.0.51

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

@@ -1,7 +1,7 @@
 import { REFERENCES } from '@based/schema/def';
 import { ModifyError, ModifyState } from '../ModifyRes.js';
 import { setCursor } from '../setCursor.js';
-import { DELETE, EDGE_INDEX_REALID, EDGE_INDEX_TMPID, EDGE_NOINDEX_REALID, EDGE_NOINDEX_TMPID, NOEDGE_INDEX_REALID, NOEDGE_INDEX_TMPID, NOEDGE_NOINDEX_REALID, NOEDGE_NOINDEX_TMPID, RANGE_ERR, REF_OP_UPDATE, } from '../types.js';
+import { DELETE, EDGE_INDEX_REALID, EDGE_INDEX_TMPID, EDGE_NOINDEX_REALID, EDGE_NOINDEX_TMPID, NOEDGE_INDEX_REALID, NOEDGE_INDEX_TMPID, NOEDGE_NOINDEX_REALID, NOEDGE_NOINDEX_TMPID, RANGE_ERR, REF_OP_OVERWRITE, REF_OP_PUT_ADD, REF_OP_PUT_OVERWRITE, REF_OP_UPDATE, } from '../types.js';
 import { writeEdges } from './edge.js';
 export function writeReferences(value, ctx, schema, def, res, mod) {
     if (typeof value !== 'object') {
@@ -266,8 +266,8 @@ function putRefs(def, ctx, modifyOp, refs, op) {
     ctx.buf[ctx.len++] = size >>>= 8;
     ctx.buf[ctx.len++] = size >>>= 8;
     ctx.buf[ctx.len++] = size >>>= 8;
-    ctx.buf[ctx.len++] = op === 0 ? 3 : 4;
-    ctx.len = (ctx.len + 3) & ~3;
+    ctx.buf[ctx.len++] =
+        op === REF_OP_OVERWRITE ? REF_OP_PUT_OVERWRITE : REF_OP_PUT_ADD;
     let i = 0;
     for (; i < refs.length; i++) {
         let ref = refs[i];

package/dist/src/client/modify/types.d.ts

@@ -37,4 +37,6 @@ export declare const EDGE_INDEX_TMPID = 6;
 export declare const NOEDGE_INDEX_TMPID = 7;
 export declare const REF_OP_UPDATE = 1;
 export declare const REF_OP_OVERWRITE = 0;
+export declare const REF_OP_PUT_OVERWRITE = 3;
+export declare const REF_OP_PUT_ADD = 4;
 export type REF_OP = typeof REF_OP_OVERWRITE | typeof REF_OP_UPDATE;

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

@@ -25,4 +25,6 @@ export const EDGE_INDEX_TMPID = 6;
 export const NOEDGE_INDEX_TMPID = 7;
 export const REF_OP_UPDATE = 1;
 export const REF_OP_OVERWRITE = 0;
+export const REF_OP_PUT_OVERWRITE = 3;
+export const REF_OP_PUT_ADD = 4;
 //# sourceMappingURL=types.js.map

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

@@ -12,6 +12,8 @@ import { convertFilter } from './filter/convertFilter.js';
 import { validateLocale, validateRange } from './validation.js';
 import { DEF_RANGE_PROP_LIMIT } from './thresholds.js';
 import { concatUint8Arr } from '@saulx/utils';
+import { displayTarget } from './display.js';
+import picocolors from 'picocolors';
 export class QueryBranch {
     db;
     def;
@@ -357,7 +359,19 @@ export class BasedDbQuery extends QueryBranch {
         return this;
     }
     subscribe(onData, onError) {
-        return subscribe(this, onData, onError ??
+        return subscribe(this, (res) => {
+            try {
+                onData(res);
+            }
+            catch (err) {
+                // const t = displayTarget(this.def)
+                const def = this.def;
+                let name = picocolors.red(`QueryError[${displayTarget(def)}]\n`);
+                name += `  Error executing onData handler in subscription\n`;
+                name += `  ${err.message}\n`;
+                console.error(name);
+            }
+        }, onError ??
             ((err) => {
                 console.error(err);
             }));

package/dist/src/hooks.js

@@ -1,3 +1,5 @@
+import picocolors from 'picocolors';
+import { displayTarget } from './client/query/display.js';
 export const getDefaultHooks = (server, subInterval = 200) => {
     return {
         subscribe(q, onData, onError) {
@@ -8,7 +10,7 @@ export const getDefaultHooks = (server, subInterval = 200) => {
                 if (killed) {
                     return;
                 }
-                if (res.byteLength >= 8) {
+                if (res.byteLength >= 4) {
                     onData(res);
                 }
                 else if (res.byteLength === 1 && res[0] === 0) {
@@ -17,7 +19,10 @@ export const getDefaultHooks = (server, subInterval = 200) => {
                     return;
                 }
                 else {
-                    onError(new Error('unexpected error'));
+                    const def = this.def;
+                    let name = picocolors.red(`QueryError[${displayTarget(def)}]\n`);
+                    name += `  Incorrect buffer received in subscription (maybe server not started ${res.byteLength}) bytes\n`;
+                    onError(new Error(name));
                 }
                 timer = setTimeout(poll, subInterval);
             };

package/dist/src/schema.js

@@ -55,14 +55,15 @@ export const parseSchema = (strictSchema) => {
         };
         const props = { ...strictSchema.props };
         for (const key in props) {
-            const prop = props[key];
+            const prop = { ...props[key] };
             const propType = getPropType(prop);
             let refProp;
             if (propType === 'reference') {
                 refProp = prop;
             }
             else if (propType === 'references') {
-                refProp = prop.items;
+                refProp = { ...prop.items };
+                prop.items = refProp;
             }
             if (refProp) {
                 const type = parsedSchema.types[refProp.ref];
@@ -81,6 +82,7 @@ export const parseSchema = (strictSchema) => {
                 };
                 refProp.prop = inverseKey;
             }
+            props[key] = prop;
         }
         // @ts-ignore This creates an internal type to use for root props
         parsedSchema.types._root = {

package/dist/src/server/index.js

@@ -287,7 +287,13 @@ export class DbServer {
             if (schemaLooseEqual(parsedSchema, this.schema)) {
                 return this.schema;
             }
-            return this.migrateSchema(strictSchema, transformFns);
+            try {
+                return this.migrateSchema(strictSchema, transformFns);
+            }
+            catch (e) {
+                console.error('error migrating schema:', e);
+                return this.schema;
+            }
         }
         this.schema = {
             lastId: this.schema.lastId,

package/dist/src/server/start.js

@@ -2,13 +2,12 @@ import { DbWorker, SCHEMA_FILE, WRITELOG_FILE } from './index.js';
 import native from '../native.js';
 import { rm, mkdir, readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { hashEq } from './csmt/index.js';
-import { foreachBlock, initCsmt, makeCsmtKey } from './tree.js';
+import { destructureCsmtKey, foreachBlock, initCsmt, makeCsmtKey, specialBlock } from './tree.js';
 import { availableParallelism } from 'node:os';
 import exitHook from 'exit-hook';
 import { save } from './save.js';
 import { DEFAULT_BLOCK_CAPACITY } from '@based/schema/def';
-import { bufToHex, hexToBuf } from '@saulx/utils';
+import { bufToHex } from '@saulx/utils';
 export async function start(db, opts) {
     const path = db.fileSystemPath;
     const noop = () => { };
@@ -74,10 +73,27 @@ export async function start(db, opts) {
         }, true);
     }
     if (writelog?.hash) {
-        const oldHash = hexToBuf(writelog.hash);
-        const newHash = db.merkleTree.getRoot()?.hash;
-        if (!hashEq(oldHash, newHash)) {
-            console.error(`WARN: CSMT hash mismatch. expected: ${writelog.hash} actual: ${bufToHex(newHash)}`);
+        // FIXME FDN-1301
+        //const oldHash = hexToBuf(writelog.hash)
+        //const newHash = db.merkleTree.getRoot()?.hash
+        //if (!hashEq(oldHash, newHash)) {
+        //  console.error(
+        //    `WARN: CSMT hash mismatch. expected: ${writelog.hash} actual: ${bufToHex(newHash)}`,
+        //  )
+        //}
+        const oldHashSet = new Set();
+        const newHashSet = new Set();
+        for (let k in writelog.rangeDumps)
+            writelog.rangeDumps[k].forEach(({ hash }) => oldHashSet.add(hash));
+        db.merkleTree.visitLeafNodes(({ key, hash }) => {
+            const [_typeId, start] = destructureCsmtKey(key);
+            if (start == specialBlock)
+                return; // skip the type specialBlock
+            newHashSet.add(bufToHex(hash));
+        });
+        const setEq = (a, b) => a.size === b.size && [...a].every(value => b.has(value));
+        if (!setEq(oldHashSet, newHashSet)) {
+            console.error(`WARN: CSMT hash mismatch.`);
         }
     }
     // start workers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/db",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -57,4 +57,4 @@
     "tar": "^7.4.3",
     "typescript": "^5.6.3"
   }
-}
+}