@based/db 0.0.44 → 0.0.46

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/debug.js

@@ -101,6 +101,9 @@ export const debug = (x, start = 0, end = 0, label) => {
                 if (a[j + i * w] === 252) {
                     return picocolors.red(v);
                 }
+                if (a[j + i * w] === 250) {
+                    return picocolors.redBright(v);
+                }
                 return v;
             })
                 .join(' '));

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

@@ -281,7 +281,7 @@ export const inspectData = (q, def, level, top, depth, hasId = false) => {
         str = prefix + '[';
     }
     if (def.aggregate) {
-        str += inspectObject(q.toObject(), def, '', level + 1, i === max - 1, i === 0, false, depth);
+        str += inspectObject('toObject' in q ? q.toObject() : q, def, '', level + 1, i === max - 1, i === 0, false, depth);
         return str;
     }
     for (const x of q) {

package/dist/src/client/query/include/toBuffer.js

@@ -18,7 +18,6 @@ export const includeToBuffer = (db, def) => {
             walkDefs(db, def, f);
         }
     }
-    // main
     if (def.include.main.len > 0) {
         // if (def.target.)
         const len = def.type === QueryDefType.Edge

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

@@ -3,7 +3,43 @@ import { QueryDefType } from '../types.js';
 import { read, readUtf8 } from '../../string.js';
 import { DECODER, readDoubleLE, readFloatLE, readInt16, readInt32, readUint16, readUint32, setByPath, } from '@saulx/utils';
 import { inverseLangMap } from '@based/schema';
-import { READ_EDGE, READ_ID, READ_REFERENCE, READ_REFERENCES, } from '../types.js';
+import { READ_EDGE, READ_ID, READ_REFERENCE, READ_REFERENCES, READ_AGGREGATION, } from '../types.js';
+const readAggregate = (q, result, offset, len) => {
+    const results = {};
+    if (q.aggregate.groupBy) {
+        let i = offset;
+        while (i < len) {
+            let key = '';
+            if (result[i] == 0) {
+                if (q.aggregate.groupBy.default) {
+                    key = q.aggregate.groupBy.default;
+                }
+                else {
+                    key = `$undefined`;
+                }
+            }
+            else {
+                key = DECODER.decode(result.subarray(i, i + 2));
+            }
+            i += 2;
+            const resultKey = (results[key] = {});
+            for (const aggregatesArray of q.aggregate.aggregates.values()) {
+                for (const agg of aggregatesArray) {
+                    setByPath(resultKey, agg.propDef.path, readUint32(result, agg.resultPos + i));
+                }
+            }
+            i += q.aggregate.totalResultsPos;
+        }
+    }
+    else {
+        for (const aggregatesArray of q.aggregate.aggregates.values()) {
+            for (const agg of aggregatesArray) {
+                setByPath(results, agg.propDef.path, readUint32(result, agg.resultPos + offset));
+            }
+        }
+    }
+    return results;
+};
 const addField = (p, value, item, defaultOnly = false, lang = 0) => {
     let i = p.__isEdge === true ? 1 : 0;
     // TODO OPTMIZE
@@ -175,7 +211,19 @@ export const readAllFields = (q, result, offset, end, item, id) => {
             handleUndefinedProps(id, q, item);
             return i - offset;
         }
-        if (index === READ_EDGE) {
+        if (index === READ_AGGREGATION) {
+            // also for edges at some point!
+            let field = result[i];
+            i++;
+            const size = readUint32(result, i);
+            i += 4;
+            const ref = q.references.get(field);
+            addField(
+            // @ts-ignore
+            ref.target.propDef, readAggregate(ref, result, i, i + size), item);
+            i += size;
+        }
+        else if (index === READ_EDGE) {
             let prop = result[i];
             if (prop === READ_REFERENCE) {
                 i++;
@@ -369,44 +417,7 @@ export const readAllFields = (q, result, offset, end, item, id) => {
 let cnt = 0;
 export const resultToObject = (q, result, end, offset = 0) => {
     if (q.aggregate) {
-        const results = {};
-        // range for numbers
-        if (q.aggregate.groupBy) {
-            // key size = 2 for now... not perfect...
-            let i = 0;
-            while (i < result.byteLength - 4) {
-                // if group = 0
-                // add extra thing for the keys maybe?
-                let key = '';
-                if (result[i] == 0) {
-                    if (q.aggregate.groupBy.default) {
-                        key = q.aggregate.groupBy.default;
-                    }
-                    else {
-                        key = `$undefined`;
-                    }
-                }
-                else {
-                    key = DECODER.decode(result.subarray(i, i + 2));
-                }
-                i += 2;
-                const resultKey = (results[key] = {});
-                for (const aggregatesArray of q.aggregate.aggregates.values()) {
-                    for (const agg of aggregatesArray) {
-                        setByPath(resultKey, agg.propDef.path, readUint32(result, agg.resultPos + i));
-                    }
-                }
-                i += q.aggregate.totalResultsPos;
-            }
-        }
-        else {
-            for (const aggregatesArray of q.aggregate.aggregates.values()) {
-                for (const agg of aggregatesArray) {
-                    setByPath(results, agg.propDef.path, readUint32(result, agg.resultPos));
-                }
-            }
-        }
-        return results;
+        return readAggregate(q, result, 0, result.byteLength - 4);
     }
     const len = readUint32(result, offset);
     if (len === 0) {

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/client/query/toBuffer.js

@@ -39,30 +39,58 @@ export function defToBuffer(db, def) {
             throw new Error('Wrong aggregate size (0)');
         }
         const filterSize = def.filter.size || 0;
-        const buf = new Uint8Array(16 + filterSize + aggregateSize);
-        buf[0] = isRootCountOnly(def, filterSize)
-            ? QueryType.aggregatesCountType
-            : QueryType.aggregates;
-        buf[1] = def.schema.idUint8[0];
-        buf[2] = def.schema.idUint8[1];
-        buf[3] = def.range.offset;
-        buf[4] = def.range.offset >>> 8;
-        buf[5] = def.range.offset >>> 16;
-        buf[6] = def.range.offset >>> 24;
-        buf[7] = def.range.limit;
-        buf[8] = def.range.limit >>> 8;
-        buf[9] = def.range.limit >>> 16;
-        buf[10] = def.range.limit >>> 24;
-        buf[11] = filterSize;
-        buf[12] = filterSize >>> 8;
-        if (filterSize) {
-            buf.set(filterToBuffer(def.filter), 13);
+        if (def.type === QueryDefType.References) {
+            const buf = new Uint8Array(13 + filterSize + aggregateSize);
+            const sz = 10 + filterSize + aggregateSize;
+            buf[0] = 251 /* includeOp.REFERENCES_AGGREGATION */;
+            buf[1] = sz;
+            buf[2] = sz >>> 8;
+            // ---
+            buf[3] = filterSize;
+            buf[4] = filterSize >>> 8;
+            buf[5] = def.range.offset;
+            buf[6] = def.range.offset >>> 8;
+            buf[7] = def.range.offset >>> 16;
+            buf[8] = def.range.offset >>> 24;
+            if (filterSize) {
+                buf.set(filterToBuffer(def.filter), 9);
+            }
+            // required to get typeEntry and fieldSchema
+            buf[9 + filterSize] = def.schema.idUint8[0]; // typeId
+            buf[9 + 1 + filterSize] = def.schema.idUint8[1]; // typeId
+            buf[9 + 2 + filterSize] = def.target.propDef.prop; // refField
+            const aggregateBuffer = aggregateToBuffer(def.aggregate);
+            buf.set(aggregateBuffer, 9 + 3 + filterSize);
+            // buf[12 + filterSize] = aggregateSize
+            // buf[12 + 1 + filterSize] = aggregateSize >>> 8
+            result.push(buf);
+        }
+        else {
+            const buf = new Uint8Array(16 + filterSize + aggregateSize);
+            buf[0] = isRootCountOnly(def, filterSize)
+                ? QueryType.aggregatesCountType
+                : QueryType.aggregates;
+            buf[1] = def.schema.idUint8[0];
+            buf[2] = def.schema.idUint8[1];
+            buf[3] = def.range.offset;
+            buf[4] = def.range.offset >>> 8;
+            buf[5] = def.range.offset >>> 16;
+            buf[6] = def.range.offset >>> 24;
+            buf[7] = def.range.limit;
+            buf[8] = def.range.limit >>> 8;
+            buf[9] = def.range.limit >>> 16;
+            buf[10] = def.range.limit >>> 24;
+            buf[11] = filterSize;
+            buf[12] = filterSize >>> 8;
+            if (filterSize) {
+                buf.set(filterToBuffer(def.filter), 13);
+            }
+            const aggregateBuffer = aggregateToBuffer(def.aggregate);
+            buf[14 + filterSize] = aggregateSize;
+            buf[15 + filterSize] = aggregateSize >>> 8;
+            buf.set(aggregateBuffer, 16 + filterSize);
+            result.push(buf);
         }
-        const aggregateBuffer = aggregateToBuffer(def.aggregate);
-        buf[14 + filterSize] = aggregateSize;
-        buf[15 + filterSize] = aggregateSize >>> 8;
-        buf.set(aggregateBuffer, 16 + filterSize);
-        result.push(buf);
         // ignore this for now...
         // result.push(...include)
         if (def.type === QueryDefType.Root) {
@@ -206,7 +234,7 @@ export function defToBuffer(db, def) {
         const modsSize = filterSize + sortSize;
         const meta = new Uint8Array(modsSize + 10 + 8);
         const sz = size + 7 + modsSize + 8;
-        meta[0] = 254;
+        meta[0] = 254 /* includeOp.REFERENCES */;
         meta[1] = sz;
         meta[2] = sz >>> 8;
         meta[3] = filterSize;
@@ -235,7 +263,7 @@ export function defToBuffer(db, def) {
     else if (def.type === QueryDefType.Reference) {
         const meta = new Uint8Array(6);
         const sz = size + 3;
-        meta[0] = 255;
+        meta[0] = 255 /* includeOp.REFERENCE */;
         meta[1] = sz;
         meta[2] = sz >>> 8;
         meta[3] = def.schema.idUint8[0];
@@ -246,7 +274,7 @@ export function defToBuffer(db, def) {
     result.push(...include);
     if (edges) {
         const metaEdgeBuffer = new Uint8Array(3);
-        metaEdgeBuffer[0] = 252;
+        metaEdgeBuffer[0] = 252 /* includeOp.EDGE */;
         metaEdgeBuffer[1] = edgesSize;
         metaEdgeBuffer[2] = edgesSize >>> 8;
         result.push(metaEdgeBuffer, ...edges);

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

@@ -140,3 +140,10 @@ export declare const READ_ID = 255;
 export declare const READ_EDGE = 252;
 export declare const READ_REFERENCES = 253;
 export declare const READ_REFERENCE = 254;
+export declare const READ_AGGREGATION = 250;
+export declare const enum includeOp {
+    REFERENCES_AGGREGATION = 251,
+    EDGE = 252,
+    REFERENCES = 254,
+    REFERENCE = 255
+}

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

@@ -31,4 +31,5 @@ export const READ_ID = 255;
 export const READ_EDGE = 252;
 export const READ_REFERENCES = 253;
 export const READ_REFERENCE = 254;
+export const READ_AGGREGATION = 250;
 //# sourceMappingURL=types.js.map

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.46",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",