datafolder 1.0.17 → 1.0.19

package/src/QySnapshots.js

@@ -1,7 +1,6 @@
 import {
     close as e,
-    readSync as i,
-    openSync as p
+    openSync as s
 } from "node:fs";
 
 import {
@@ -13,40 +12,43 @@ import {
     join as n
 } from "node:path";
 
-import d from "node:zlib";
+import m from "node:zlib";
 
 import {
-    getDefaultOptions as s
+    getDefaultOptions as i
 } from "./QyDefaultOptions.js";
 
 import {
-    Hash_Key_Length as u,
-    folderOrFileExists as m,
+    Hash_Key_Length as p,
+    folderOrFileExists as d,
     listToMap as f,
-    isEmptyObj as h,
-    isString as v
+    isEmptyObj as u,
+    isString as v,
+    isArray as M,
+    isUint8Array as y,
+    readBufferFromFD as h
 } from "./QyUtils.js";
 
 import {
-    QyBinWriter as M
+    QyBinWriter as g
 } from "./QyBinWriter.js";
 
 import {
-    bufferToNums as y,
-    numsToBuffer as c,
-    applyAclChange as g,
-    iterCmdKeys as S
+    bufferToNums as c,
+    numsToBuffer as S,
+    applyAclChange as C,
+    iterCmdKeys as P
 } from "./QyAcl.js";
 
 import {
-    QyJsonSaver as C
+    QyJsonSaver as x
 } from "./QyJsonSaver.js";
 
 import {
-    logger as P
+    logger as F
 } from "./QyLogger.js";
 
-let x = Array.isArray, F = Buffer.from("\n"), L = Buffer.from("'"), O = Buffer.from("z"), j = L[0], J = O[0];
+let J = Buffer.from("\n"), L = Buffer.from("'"), O = Buffer.from("z"), b = Buffer.from("vect"), K = L[0], _ = O[0], A = b[0];
 
 class t {
     snapshotFolder;
@@ -62,7 +64,7 @@ class t {
     snapshotCount = 0;
     constructor(t, o = void 0) {
         (o = {
-            ...s("QySnapshots"),
+            ...i("QySnapshots"),
             ...o
         }).vLOutdatedPercent = 2 * o.pMOutdatedPercent;
         var a = n(t, "info");
@@ -70,48 +72,48 @@ class t {
             snapshotFolder: t,
             snapshotInfoFolder: a,
             options: o,
-            qyJsonSaver: new C(a, o)
+            qyJsonSaver: new x(a, o)
         });
     }
     async loadSnapshotInfos() {
         let {
             snapshotInfoFolder: t,
-            qyJsonSaver: s,
+            qyJsonSaver: n,
             numToSnapshotMap: r
         } = this;
-        if (await m(t)) {
+        if (await d(t)) {
             var o = await (async (t, o) => {
                 var a = {};
-                for (s of await l(o)) {
-                    var e, n, s = /^([1-9][0-9]*)(_([0-9]+))*\.json/.exec(s);
-                    s && (e = +s[1], s = s[3], s = s ? +s : 2, null == (n = a[e]) ? a[e] = s : (t.removeFile(D(e, Math.min(n, s))), 
-                    a[e] = Math.max(n, s)));
+                for (n of await l(o)) {
+                    var e, s, n = /^([1-9][0-9]*)(_([0-9]+))*\.json/.exec(n);
+                    n && (e = +n[1], n = n[3], n = n ? +n : 2, null == (s = a[e]) ? a[e] = n : (t.removeFile(Q(e, Math.min(s, n))), 
+                    a[e] = Math.max(s, n)));
                 }
                 return Object.entries(a).map(([ t, o ]) => [ +t, o ]).sort((t, o) => t[0] - o[0]);
-            })(s, t);
-            let e = 0, n = 0;
+            })(n, t);
+            let e = 0, s = 0;
             await Promise.all(o.map(async ([ t, o ]) => {
-                var a = await s.loadFromFile(D(t, o)), o = (a.verList = [ o ], r[t] = {
+                var a = await n.loadFromFile(Q(t, o)), o = (a.verList = [ o ], r[t] = {
                     snapshotNum: t,
                     info: a,
                     posMap: {},
                     outdatedCount: 0
-                }), t = (++this.snapshotCount, t > e && (e = t, n = a.maxChangeId), 
+                }), t = (++this.snapshotCount, t > e && (e = t, s = a.maxChangeId), 
                 this), a = o;
-                t = N(t, a), P.info("Loading " + t), a.prefixPM = await b(t);
+                t = T(t, a), F.info("Loading " + t), a.prefixPM = await V(t);
             })), Object.assign(this, {
                 maxSnapshotNum: e,
-                snapshotMaxChangeId: n
+                snapshotMaxChangeId: s
             });
             var {
                 numToSnapshotMap: a,
                 prefixMap: i
             } = this;
-            for ([ f ] of o) {
-                var p, u = a[f], f = u.prefixPM;
-                for (p in f) {
+            for ([ u ] of o) {
+                var p, f = a[u], u = f.prefixPM;
+                for (p in u) {
                     var h = i[p];
-                    h ? h.push(u) : i[p] = [ u ];
+                    h ? h.push(f) : i[p] = [ f ];
                 }
             }
         }
@@ -123,39 +125,40 @@ class t {
     saveKeyValueMap(t) {
         var o, a = this.options.minLenToCompress, {
             keyValueMap: e,
-            info: n
-        } = t, s = (++n.vLVersion, new M()), r = (s.start(this.getVLFilePath(t)), 
+            info: s
+        } = t, n = (++s.vLVersion, new g()), r = (n.start(this.getVLFilePath(t)), 
         Object.keys(e).sort()), i = {};
-        let p = 0, u = 0, f, h;
+        let p = 0, f = 0, u, h;
         for (o of r) {
             var l = e[o];
             let t;
-            null == l ? t = K : (h = Buffer.isBuffer(l) ? (f = l, 0) : v(l) ? (f = l.length >= a ? (s.save(O), 
-            d.zstdCompressSync(l)) : (s.save(L), Buffer.from(l)), 1) : (f = Buffer.from(JSON.stringify(I(o) && !x(l) ? Object.keys(l) : l)), 
-            0), s.save([ f, F ]), l = h + f.length, t = [ p, l ], p += l + 1), i[o] = t, 
-            ++u;
+            null == l ? t = q : (h = Buffer.isBuffer(l) ? (u = l, 0) : v(l) ? (u = l.length >= a ? (n.save(O), 
+            m.zstdCompressSync(l)) : (n.save(L), Buffer.from(l)), 1) : y(l) ? (n.save(b), 
+            u = Buffer.from(l.buffer, l.byteOffset, l.byteLength), 4) : (u = Buffer.from(JSON.stringify(I(o) && !M(l) ? Object.keys(l) : l)), 
+            0), n.save([ u, J ]), l = h + u.length, t = [ p, l ], p += l + 1), i[o] = t, 
+            ++f;
         }
         return Object.assign(t, {
             posMap: i,
             outdatedCount: 0
-        }), Object.assign(n, {
-            totalCount: u,
+        }), Object.assign(s, {
+            totalCount: f,
             outdatedCount: 0
-        }), Promise.all([ this.savePosMap(t, r), s.stop() ]);
+        }), Promise.all([ this.savePosMap(t, r), n.stop() ]);
     }
     addMaxSnapshot(t) {
         var o, {
             numToSnapshotMap: a,
             keyToSnapshotMap: e
         } = this, {
-            posMap: n,
-            keyValueMap: s,
+            posMap: s,
+            keyValueMap: n,
             snapshotNum: r,
             info: i
         } = t, i = i.maxChangeId, i = (Object.assign(this, {
             maxSnapshotNum: r,
             snapshotMaxChangeId: i
-        }), s || n);
+        }), n || s);
         for (o in i) e[o] = t;
         a[r] = t, ++this.snapshotCount;
     }
@@ -167,33 +170,33 @@ class t {
         if (null != a) {
             var e = a.length;
             for (let t = 0; t < e; t += 2) {
-                var n = a[t], s = a[t + 1];
-                o[n] = null != s && I(n) ? f(s) : s;
+                var s = a[t], n = a[t + 1];
+                o[s] = null != n && I(s) ? f(n) : n;
             }
         }
-        S(t, t => {
+        P(t, t => {
             t in o || (o[t] = this.getValueSync(t)), this.removeKey(t);
-        }), g(o, t);
+        }), C(o, t);
     }
     getValueSync(t) {
         var o = ((t, o) => {
             let {
                 keyToSnapshotMap: a,
                 prefixMap: e
-            } = t, n = a[o];
-            if (n) return n;
-            var s = w(o), r = e[s];
+            } = t, s = a[o];
+            if (s) return s;
+            var n = k(o), r = e[n];
             if (r) for (;0 < r.length; ) {
-                n = r.pop();
+                s = r.pop();
                 var i = ((t, o, a) => {
-                    var e, {
+                    var e, s, {
                         posMap: n,
-                        prefixPM: s
+                        prefixPM: r
                     } = o;
-                    if (s = s[a]) return [ s, e ] = s, s = T(t, t.getPMFilePath(o), s, e), 
+                    if (r = r[a]) return [ r, e ] = r, s = t.getPMFilePath(o), s = h(N(t, s), s, r, e), 
                     t.loadPartialPosMapBuffer(o, a, s), n;
-                })(t, n, s);
-                if (i && o in i) return n;
+                })(t, s, n);
+                if (i && o in i) return s;
             }
         })(this, t);
         if (o) {
@@ -206,8 +209,8 @@ class t {
             if (a) {
                 var [ e, a ] = a;
                 if (0 != a) {
-                    var n = this;
-                    if (o = n.getVLFilePath(o), n = T(n, o, e, a)) return (o = n[0]) == j ? n.toString("utf8", 1) : o == J ? d.zstdDecompressSync(n.subarray(1)).toString() : (e = JSON.parse(n), 
+                    var s = this;
+                    if (o = s.getVLFilePath(o), s = h(N(s, o), o, e, a)) return (o = s[0]) == K ? s.toString("utf8", 1) : o == _ ? m.zstdDecompressSync(s.subarray(1)).toString() : o == A ? new Uint8Array(s.buffer, s.byteOffset + 4, s.byteLength - 4) : (e = JSON.parse(s), 
                     I(t) ? f(e) : e);
                 }
             }
@@ -216,10 +219,10 @@ class t {
     loadPartialPosMapBuffer(a, t, o) {
         let {
             posMap: e,
-            prefixPM: n
-        } = a, s = (delete n[t], this).keyToSnapshotMap;
-        V(o, (t, o) => {
-            t in s ? ++a.outdatedCount : (e[t] = o, s[t] = a);
+            prefixPM: s
+        } = a, n = (delete s[t], this).keyToSnapshotMap;
+        j(o, (t, o) => {
+            t in n ? ++a.outdatedCount : (e[t] = o, n[t] = a);
         });
     }
     delSnapshot(t) {
@@ -227,32 +230,32 @@ class t {
         o(this, this.getPMFilePath(t));
     }
     calOutdates() {
-        var t, o, a, e = [], n = [], s = [], r = [], {
+        var t, o, a, e = [], s = [], n = [], r = [], {
             options: i,
             numToSnapshotMap: p
         } = this, {
-            pMOutdatedPercent: u,
-            vLOutdatedPercent: f
+            pMOutdatedPercent: f,
+            vLOutdatedPercent: u
         } = i;
         for (t in p) {
             var h, l = p[t];
-            l.isOut || (100 == (h = Q(l)) ? (this.delSnapshot(l), e.push([ t, l.info.verList[0] ])) : f < h ? (B(l) ? n : r).push(l) : Math.floor(l.outdatedCount / l.info.totalCount * 100) > u ? s.push(l) : (h = this, 
-            l.info.totalCount < h.options.minSnapshotKeyCount && B(l) && n.push(l)));
+            l.isOut || (100 == (h = D(l)) ? (this.delSnapshot(l), e.push([ t, l.info.verList[0] ])) : u < h ? (B(l) ? s : r).push(l) : Math.floor(l.outdatedCount / l.info.totalCount * 100) > f ? n.push(l) : (h = this, 
+            l.info.totalCount < h.options.minSnapshotKeyCount && B(l) && s.push(l)));
         }
-        1 == n.length && Q(n[0]) < f && (n.length = 0);
-        for ([ o, a ] of [ [ "pMCompacts", s ], [ "vLCompacts", r ], [ "combiningSnapshots", n ] ]) 0 < a.length && P.log(o + ":" + a.map(t => t.snapshotNum + "." + t.info.verList[0]));
+        1 == s.length && D(s[0]) < u && (s.length = 0);
+        for ([ o, a ] of [ [ "pMCompacts", n ], [ "vLCompacts", r ], [ "combiningSnapshots", s ] ]) 0 < a.length && F.log(o + ":" + a.map(t => t.snapshotNum + "." + t.info.verList[0]));
         return {
             emptySnapshotNumVerList: e,
-            combiningSnapshotList: n,
-            pMCompactSnapshotList: s,
+            combiningSnapshotList: s,
+            pMCompactSnapshotList: n,
             vLCompactSnapshotList: r
         };
     }
     getMaxCombinedSnapshot(t) {
         let o, a;
         for (var e of t) {
-            var n = e.snapshotNum;
-            (!a || a < n) && (o = e, a = n);
+            var s = e.snapshotNum;
+            (!a || a < s) && (o = e, a = s);
         }
         return o;
     }
@@ -273,34 +276,34 @@ class t {
     async saveSnapshotInfo(t, o) {
         var a = this.qyJsonSaver, {
             pMVersion: e,
-            vLVersion: n,
-            verList: s,
+            vLVersion: s,
+            verList: n,
             outdatedCount: r,
             totalCount: i
-        } = o, p = s[0], s = s[0] = e + n;
-        return o.outdated = Math.floor(100 * r / i) + "%", P.log(`Saving snapshotInfo:${p ? t + `.${p}->` : ""}${t}.` + s), 
+        } = o, p = n[0], n = n[0] = e + s;
+        return o.outdated = Math.floor(100 * r / i) + "%", F.log(`Saving snapshotInfo:${p ? t + `.${p}->` : ""}${t}.` + n), 
         !!await a.saveToFile({
             ...o,
             verList: void 0
-        }, D(t, s), !0) && (null != p && a.removeFile(D(t, p)), !0);
+        }, Q(t, n), !0) && (null != p && a.removeFile(Q(t, p)), !0);
     }
     savePosMap(t, o) {
         var a, {
             outdatedCount: e,
-            info: n,
-            posMap: s
-        } = t, r = (n.outdatedCount += e, t.outdatedCount = 0, ++n.pMVersion, new M()), i = (r.start(this.getPMFilePath(t)), 
+            info: s,
+            posMap: n
+        } = t, r = (s.outdatedCount += e, t.outdatedCount = 0, ++s.pMVersion, new g()), i = (r.start(this.getPMFilePath(t)), 
         t.prefixPM = {});
-        let p = 0, u = 0, f;
-        for (a of o = o || Object.keys(s).sort()) {
-            null == f ? f = w(a) : a.startsWith(f) || (i[f] = [ p, u ], f = w(a), 
-            p += u, u = 0);
-            var h = Buffer.from(a), l = c(s[a]);
-            r.save([ h, l ]), u += h.length + l.length;
+        let p = 0, f = 0, u;
+        for (a of o = o || Object.keys(n).sort()) {
+            null == u ? u = k(a) : a.startsWith(u) || (i[u] = [ p, f ], u = k(a), 
+            p += f, f = 0);
+            var h = Buffer.from(a), l = S(n[a]);
+            r.save([ h, l ]), f += h.length + l.length;
         }
-        return null != f && (i[f] = [ p, u ]), Promise.all([ r.stop(), ((t, o) => {
-            var a, e = new M(), n = (e.start(N(t, o)), o).prefixPM;
-            for (a in n) e.save([ Buffer.from(a), c(n[a]) ]);
+        return null != u && (i[u] = [ p, f ]), Promise.all([ r.stop(), ((t, o) => {
+            var a, e = new g(), s = (e.start(T(t, o)), o).prefixPM;
+            for (a in s) e.save([ Buffer.from(a), S(s[a]) ]);
             return e.stop();
         })(this, t) ]);
     }
@@ -320,53 +323,32 @@ class t {
     }
 }
 
-function V(o, a) {
+function j(o, a) {
     var e = o.length;
     for (let t = 0; t < e; ) {
-        var n = t + u, s = o.toString("latin1", t, n), r = [];
-        t = y(o, n, r), a(s, r);
+        var s = t + p, n = o.toString("latin1", t, s), r = [];
+        t = c(o, s, r), a(n, r);
     }
 }
 
-async function b(t) {
+async function V(t) {
     var o = await r(t), a = o.length, e = {};
     for (let t = 0; t < a; ) {
-        var n = t + k, s = e[o.toString("latin1", t, n)] = [];
-        t = y(o, n, s);
+        var s = t + w, n = e[o.toString("latin1", t, s)] = [];
+        t = c(o, s, n);
     }
     return e;
 }
 
-function T(t, o, a, e) {
-    var n = ((t, o) => {
-        let a = t.fDMap, e = a[o];
-        if (!e) {
-            P.info("Opening " + o);
-            try {
-                e = a[o] = p(o, "r");
-            } catch (t) {
-                throw P.error(`Opening ${o} failed:`, t), t;
-            }
-        }
-        return e;
-    })(t, o), s = Buffer.allocUnsafe(e);
-    for (let t = 0; t < e; ) {
-        var r = i(n, s, t, e - t, a + t);
-        if (0 == r) return void P.error(`readSync ${o} at ${a + t} returning 0 byte`);
-        t += r;
-    }
-    return s;
-}
-
 function B(t) {
     var {
         keyValueMap: o,
         prefixPM: a
     } = t;
-    return o || null == a || h(t.prefixPM);
+    return o || null == a || u(t.prefixPM);
 }
 
-function N(t, o) {
+function T(t, o) {
     var {
         snapshotNum: o,
         info: a
@@ -374,22 +356,36 @@ function N(t, o) {
     return n(t.snapshotFolder, "" + o, a.pMVersion + "_prefixPM.txt");
 }
 
+function N(t, o) {
+    t = t.fDMap;
+    let a = t[o];
+    if (!a) {
+        F.info("Opening " + o);
+        try {
+            a = t[o] = s(o, "r");
+        } catch (t) {
+            throw F.error(`Opening ${o} failed:`, t), t;
+        }
+    }
+    return a;
+}
+
 function o(t, o) {
     var t = t.fDMap, a = t[o];
     null != a && (e(a), delete t[o]);
 }
 
-let K = [ 0, 0 ], k = 3;
+let q = [ 0, 0 ], w = 3;
 
-function w(t) {
-    return t.substring(0, k);
+function k(t) {
+    return t.substring(0, w);
 }
 
 function I(t) {
     return !t.startsWith("c");
 }
 
-function Q(t) {
+function D(t) {
     var {
         outdatedCount: t,
         info: o
@@ -397,13 +393,13 @@ function Q(t) {
     return t == a ? 100 : Math.floor(t / a * 100);
 }
 
-function D(t, o) {
+function Q(t, o) {
     return t + (2 < o ? "_" + o : "") + ".json";
 }
 
 export {
     t as QySnapshots,
-    V as iterPMBuffer,
-    b as loadPrefixPMFile,
-    D as getInfoFileName
+    j as iterPMBuffer,
+    V as loadPrefixPMFile,
+    Q as getInfoFileName
 };

package/src/QyTrigger.js

@@ -11,15 +11,14 @@ import {
     isEmptyObj as e,
     isMatchName as l,
     getMatchParam as d,
-    propNameJoin as v
+    propNameJoin as v,
+    isArray as N
 } from "./QyUtils.js";
 
 import {
-    logger as N
+    logger as y
 } from "./QyLogger.js";
 
-let y = Array.isArray;
-
 class f {
     name;
     parent;
@@ -99,7 +98,7 @@ class h {
             p(l, f) || (l = {
                 oldValue: l,
                 newValue: f
-            }, (y(f) || y(c(n, t))) && (l.isArrayDelta = !0), (g = g || {
+            }, (N(f) || N(c(n, t))) && (l.isArrayDelta = !0), (g = g || {
                 _file: e,
                 _fileContent: n
             })[v(t)] = l, u(g, t, l));
@@ -116,7 +115,7 @@ class h {
             try {
                 s && s(g), o.emit(a, g);
             } catch (e) {
-                N.error(`Running trigger ${a} failed:`, g, e);
+                y.error(`Running trigger ${a} failed:`, g, e);
             }
         }
     }

package/src/QyUtils.d.ts

@@ -1,3 +1,6 @@
+import util from "node:util";
+export declare const isArray: (arg: any) => arg is any[];
+export declare const isDate: typeof util.types.isDate, isFloat32Array: typeof util.types.isFloat32Array, isUint8Array: typeof util.types.isUint8Array;
 export declare const __dirname: string;
 export declare const SpecialOperators: {
     [k: string]: string;
@@ -8,6 +11,9 @@ export declare const SpecialFilePaths: {
     RpcDirPath: string[];
     IndexDirPath: string[];
     ExpireDirPath: string[];
+    HNSWDirPath: string[];
+    InfoDirPath: string[];
+    RecycleDirPath: string[];
     MetaFilePath: string[];
     IndexPropPathsFileName: string;
 };
@@ -53,4 +59,5 @@ export declare function loadFileList(fileList: any, preloadCount?: number): Asyn
 }, void, unknown>;
 export declare function getNowTime(now?: Date): number;
 export declare function getNowRounded(now?: Date): number;
+export declare function readBufferFromFD(fd: any, filePath: any, start: any, length: any): Buffer<ArrayBuffer> | undefined;
 export * as default from "./QyUtils.ts";