datafolder 1.0.8 → 1.0.10

package/src/QySnapshots.js

@@ -10,13 +10,13 @@ import {
 } from "node:fs/promises";
 
 import {
-    join as s
+    join as n
 } from "node:path";
 
 import m from "node:zlib";
 
 import {
-    getDefaultOptions as n
+    getDefaultOptions as s
 } from "./QyDefaultOptions.js";
 
 import {
@@ -46,57 +46,69 @@ import {
     logger as P
 } from "./QyLogger.js";
 
-let x = Array.isArray, O = Buffer.from("\n"), F = Buffer.from("'"), j = Buffer.from("z"), L = F[0], b = j[0];
+let x = Array.isArray, F = Buffer.from("\n"), L = Buffer.from("'"), O = Buffer.from("z"), V = L[0], J = O[0];
 
 class t {
-    constructor(t, a) {
-        (a = {
-            ...n("QySnapshots"),
-            ...a
-        }).vLOutdatedPercent = 2 * a.pMOutdatedPercent;
-        var o = s(t, "info");
+    snapshotFolder;
+    snapshotInfoFolder;
+    options;
+    qyJsonSaver;
+    numToSnapshotMap = {};
+    keyToSnapshotMap = {};
+    fDMap = {};
+    prefixMap = {};
+    snapshotMaxChangeId = 0;
+    maxSnapshotNum = 0;
+    snapshotCount = 0;
+    constructor(t, o) {
+        (o = {
+            ...s("QySnapshots"),
+            ...o
+        }).vLOutdatedPercent = 2 * o.pMOutdatedPercent;
+        var a = n(t, "info");
         Object.assign(this, {
             snapshotFolder: t,
-            snapshotInfoFolder: o,
-            options: a,
-            qyJsonSaver: new C(o, a),
-            numToSnapshotMap: {},
-            keyToSnapshotMap: {},
-            fDMap: {},
-            prefixMap: {},
-            snapshotMaxChangeId: 0,
-            maxSnapshotNum: 0,
-            snapshotCount: 0
+            snapshotInfoFolder: a,
+            options: o,
+            qyJsonSaver: new C(a, o)
         });
     }
     async loadSnapshotInfos() {
         let {
             snapshotInfoFolder: t,
-            qyJsonSaver: n,
+            qyJsonSaver: s,
             numToSnapshotMap: r
         } = this;
         if (await d(t)) {
-            var a = (await l(t)).filter(t => /^[1-9]/.test(t)).map(t => parseInt(t)).sort((t, a) => t - a);
-            let e = 0, s = 0;
-            await Promise.all(a.map(async t => {
-                var a = await n.loadFromFile(t + ".json"), o = r[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)));
+                }
+                return Object.entries(a).map(([ t, o ]) => [ +t, o ]).sort((t, o) => t[0] - o[0]);
+            })(s, t);
+            let e = 0, n = 0;
+            await Promise.all(o.map(async ([ t, o ]) => {
+                var a = await s.loadFromFile(D(t, o)), o = (a.verList = [ o ], r[t] = {
                     snapshotNum: t,
                     info: a,
                     posMap: {},
                     outdatedCount: 0
-                }, t = (++this.snapshotCount, t > e && (e = t, s = a.maxChangeId), 
+                }), t = (++this.snapshotCount, t > e && (e = t, n = a.maxChangeId), 
                 this), a = o;
-                t = k(t, a), P.info("Loading " + t), a.prefixPM = await V(t);
+                t = B(t, a), P.info("Loading " + t), a.prefixPM = await b(t);
             })), Object.assign(this, {
                 maxSnapshotNum: e,
-                snapshotMaxChangeId: s
+                snapshotMaxChangeId: n
             });
             var {
-                numToSnapshotMap: o,
+                numToSnapshotMap: a,
                 prefixMap: i
             } = this;
-            for (f of a) {
-                var p, u = o[f], f = u.prefixPM;
+            for ([ f ] of o) {
+                var p, u = a[f], f = u.prefixPM;
                 for (p in f) {
                     var h = i[p];
                     h ? h.push(u) : i[p] = [ u ];
@@ -105,282 +117,293 @@ class t {
         }
     }
     closeAllFDs() {
-        var t, a = this.fDMap;
-        for (t in a) e(a[t]), delete a[t];
+        var t, o = this.fDMap;
+        for (t in o) e(o[t]), delete o[t];
     }
     saveKeyValueMap(t) {
-        var a, o = this.options.minLenToCompress, {
+        var o, a = this.options.minLenToCompress, {
             keyValueMap: e,
-            info: s
-        } = t, n = (++s.vLVersion, new M()), r = (n.start(this.getVLFilePath(t)), 
+            info: n
+        } = t, s = (++n.vLVersion, new M()), r = (s.start(this.getVLFilePath(t)), 
         Object.keys(e).sort()), i = {};
         let p = 0, u = 0, f, h;
-        for (a of r) {
-            var l = e[a];
+        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 >= o ? (n.save(j), 
-            m.zstdCompressSync(l)) : (n.save(F), Buffer.from(l)), 1) : (f = Buffer.from(JSON.stringify(Q(a) && !x(l) ? Object.keys(l) : l)), 
-            0), n.save([ f, O ]), l = h + f.length, t = [ p, l ], p += l + 1), i[a] = t, 
+            null == l ? t = K : (h = Buffer.isBuffer(l) ? (f = l, 0) : v(l) ? (f = l.length >= a ? (s.save(O), 
+            m.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;
         }
         return Object.assign(t, {
             posMap: i,
             outdatedCount: 0
-        }), Object.assign(s, {
+        }), Object.assign(n, {
             totalCount: u,
             outdatedCount: 0
-        }), Promise.all([ this.savePosMap(t, r), n.stop() ]);
+        }), Promise.all([ this.savePosMap(t, r), s.stop() ]);
     }
     addMaxSnapshot(t) {
-        var a, {
-            numToSnapshotMap: o,
+        var o, {
+            numToSnapshotMap: a,
             keyToSnapshotMap: e
         } = this, {
-            posMap: s,
-            keyValueMap: n,
+            posMap: n,
+            keyValueMap: s,
             snapshotNum: r,
             info: i
         } = t, i = i.maxChangeId, i = (Object.assign(this, {
             maxSnapshotNum: r,
             snapshotMaxChangeId: i
-        }), n || s);
-        for (a in i) e[a] = t;
-        o[r] = t, ++this.snapshotCount;
+        }), s || n);
+        for (o in i) e[o] = t;
+        a[r] = t, ++this.snapshotCount;
     }
     removeKey(t) {
-        var a = this.keyToSnapshotMap, o = a[t];
-        if (o) return this.removeKeyFromSnapshot(o, t), delete a[t], !0;
+        var o = this.keyToSnapshotMap, a = o[t];
+        if (a) return this.removeKeyFromSnapshot(a, t), delete o[t], !0;
     }
-    applyCmdObj(t, a, o) {
-        if (null != o) {
-            var e = o.length;
+    applyCmdObj(t, o, a) {
+        if (null != a) {
+            var e = a.length;
             for (let t = 0; t < e; t += 2) {
-                var s = o[t], n = o[t + 1];
-                a[s] = null != n && Q(s) ? f(n) : n;
+                var n = a[t], s = a[t + 1];
+                o[n] = null != s && I(n) ? f(s) : s;
             }
         }
         S(t, t => {
-            t in a || (a[t] = this.getValueSync(t)), this.removeKey(t);
-        }), c(a, t);
+            t in o || (o[t] = this.getValueSync(t)), this.removeKey(t);
+        }), c(o, t);
     }
     getValueSync(t) {
-        var a = ((t, a) => {
+        var o = ((t, o) => {
             let {
-                keyToSnapshotMap: o,
+                keyToSnapshotMap: a,
                 prefixMap: e
-            } = t, s = o[a];
-            if (s) return s;
-            var n = I(a), r = e[n];
+            } = t, n = a[o];
+            if (n) return n;
+            var s = w(o), r = e[s];
             if (r) for (;0 < r.length; ) {
-                s = r.pop();
-                var i = ((t, a, o) => {
+                n = r.pop();
+                var i = ((t, o, a) => {
                     var e, {
-                        posMap: s,
-                        prefixPM: n
-                    } = a;
-                    if (n = n[o]) return [ n, e ] = n, n = T(t, t.getPMFilePath(a), n, e), 
-                    t.loadPartialPosMapBuffer(a, o, n), s;
-                })(t, s, n);
-                if (i && a in i) return s;
+                        posMap: n,
+                        prefixPM: s
+                    } = o;
+                    if (s = s[a]) return [ s, e ] = s, s = N(t, t.getPMFilePath(o), s, e), 
+                    t.loadPartialPosMapBuffer(o, a, s), n;
+                })(t, n, s);
+                if (i && o in i) return n;
             }
         })(this, t);
-        if (a) {
+        if (o) {
             var {
-                keyValueMap: o,
+                keyValueMap: a,
                 posMap: e
-            } = a;
-            if (o) return o[t];
-            o = e[t];
-            if (o) {
-                var [ e, o ] = o;
-                if (0 != o) {
-                    var s = this;
-                    if (a = s.getVLFilePath(a), s = T(s, a, e, o)) return (a = s[0]) == L ? s.toString("utf8", 1) : a == b ? m.zstdDecompressSync(s.subarray(1)).toString() : (e = JSON.parse(s), 
-                    Q(t) ? f(e) : e);
+            } = o;
+            if (a) return a[t];
+            a = e[t];
+            if (a) {
+                var [ e, a ] = a;
+                if (0 != a) {
+                    var n = this;
+                    if (o = n.getVLFilePath(o), n = N(n, o, e, a)) return (o = n[0]) == V ? n.toString("utf8", 1) : o == J ? m.zstdDecompressSync(n.subarray(1)).toString() : (e = JSON.parse(n), 
+                    I(t) ? f(e) : e);
                 }
             }
         }
     }
-    loadPartialPosMapBuffer(o, t, a) {
+    loadPartialPosMapBuffer(a, t, o) {
         let {
             posMap: e,
-            prefixPM: s
-        } = o, n = (delete s[t], this).keyToSnapshotMap;
-        N(a, (t, a) => {
-            t in n ? ++o.outdatedCount : (e[t] = a, n[t] = o);
+            prefixPM: n
+        } = a, s = (delete n[t], this).keyToSnapshotMap;
+        j(o, (t, o) => {
+            t in s ? ++a.outdatedCount : (e[t] = o, s[t] = a);
         });
     }
     delSnapshot(t) {
-        delete this.numToSnapshotMap[t.snapshotNum], --this.snapshotCount, a(this, this.getVLFilePath(t)), 
-        a(this, this.getPMFilePath(t));
+        delete this.numToSnapshotMap[t.snapshotNum], --this.snapshotCount, o(this, this.getVLFilePath(t)), 
+        o(this, this.getPMFilePath(t));
     }
     calOutdates() {
-        var t, a = [], o = [], e = [], s = [], {
-            options: n,
+        var t, o = [], a = [], e = [], n = [], {
+            options: s,
             numToSnapshotMap: r
         } = this, {
             pMOutdatedPercent: i,
             vLOutdatedPercent: p
-        } = n;
+        } = s;
         for (t in r) {
             var u, f = r[t];
-            f.isOut || (100 == (u = D(f)) ? (this.delSnapshot(f), a.push(t)) : p < u ? (B(f) ? o : s).push(f) : Math.floor(f.outdatedCount / f.info.totalCount * 100) > i ? e.push(f) : (u = this, 
-            f.info.totalCount < u.options.minSnapshotKeyCount && B(f) && o.push(f)));
+            f.isOut || (100 == (u = Q(f)) ? (this.delSnapshot(f), o.push([ t, f.info.verList[0] ])) : p < u ? (T(f) ? a : n).push(f) : Math.floor(f.outdatedCount / f.info.totalCount * 100) > i ? e.push(f) : (u = this, 
+            f.info.totalCount < u.options.minSnapshotKeyCount && T(f) && a.push(f)));
         }
-        return 1 == o.length && D(o[0]) < p && (o.length = 0), 0 < e.length && P.log("pMCompacts:" + e.map(t => t.snapshotNum)), 
-        0 < s.length && P.log("vLCompacts:" + s.map(t => t.snapshotNum)), 0 < o.length && P.log("combiningSnapshots:" + o.map(t => t.snapshotNum)), 
+        return 1 == a.length && Q(a[0]) < p && (a.length = 0), 0 < e.length && P.log("pMCompacts:" + e.map(t => t.snapshotNum)), 
+        0 < n.length && P.log("vLCompacts:" + n.map(t => t.snapshotNum)), 0 < a.length && P.log("combiningSnapshots:" + a.map(t => t.snapshotNum + "." + t.info.verList[0])), 
         {
-            emptySnapshotNumList: a,
-            combiningSnapshotList: o,
+            emptySnapshotNumVersionList: o,
+            combiningSnapshotList: a,
             pMCompactSnapshotList: e,
-            vLCompactSnapshotList: s
+            vLCompactSnapshotList: n
         };
     }
     getMaxCombinedSnapshot(t) {
-        let a, o;
+        let o, a;
         for (var e of t) {
-            var s = e.snapshotNum;
-            (!o || o < s) && (a = e, o = s);
+            var n = e.snapshotNum;
+            (!a || a < n) && (o = e, a = n);
         }
-        return a;
+        return o;
     }
     getPMFilePath(t) {
         var {
             snapshotNum: t,
-            info: a
+            info: o
         } = t;
-        return s(this.snapshotFolder, "" + t, a.pMVersion + "_pM.txt");
+        return n(this.snapshotFolder, "" + t, o.pMVersion + "_pM.txt");
     }
     getVLFilePath(t) {
         var {
             snapshotNum: t,
-            info: a
+            info: o
         } = t;
-        return s(this.snapshotFolder, "" + t, a.vLVersion + "_vL.txt");
+        return n(this.snapshotFolder, "" + t, o.vLVersion + "_vL.txt");
     }
-    saveSnapshotInfo(t, a) {
-        var {
-            outdatedCount: o,
-            totalCount: e
-        } = a;
-        return a.outdated = Math.floor(100 * o / e) + "%", P.log("Saving snapshotInfo:" + t), 
-        this.qyJsonSaver.saveToFile(a, t + ".json", !0);
+    async saveSnapshotInfo(t, o) {
+        var a = this.qyJsonSaver, {
+            pMVersion: e,
+            vLVersion: n,
+            verList: s,
+            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:${t}.${s} oldVersion:` + p), 
+        !!await a.saveToFile({
+            ...o,
+            verList: void 0
+        }, D(t, s), !0) && (null != p && a.removeFile(D(t, p)), !0);
     }
-    savePosMap(t, a) {
-        var o, {
+    savePosMap(t, o) {
+        var a, {
             outdatedCount: e,
-            info: s,
-            posMap: n
-        } = t, r = (s.outdatedCount += e, t.outdatedCount = 0, ++s.pMVersion, new M()), i = (r.start(this.getPMFilePath(t)), 
+            info: n,
+            posMap: s
+        } = t, r = (n.outdatedCount += e, t.outdatedCount = 0, ++n.pMVersion, new M()), i = (r.start(this.getPMFilePath(t)), 
         t.prefixPM = {});
         let p = 0, u = 0, f;
-        for (o of a = a || Object.keys(n).sort()) {
-            null == f ? f = I(o) : o.startsWith(f) || (i[f] = [ p, u ], f = I(o), 
+        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(o), l = y(n[o]);
+            var h = Buffer.from(a), l = y(s[a]);
             r.save([ h, l ]), u += h.length + l.length;
         }
-        return null != f && (i[f] = [ p, u ]), Promise.all([ r.stop(), ((t, a) => {
-            var o, e = new M(), s = (e.start(k(t, a)), a).prefixPM;
-            for (o in s) e.save([ Buffer.from(o), y(s[o]) ]);
+        return null != f && (i[f] = [ p, u ]), Promise.all([ r.stop(), ((t, o) => {
+            var a, e = new M(), n = (e.start(B(t, o)), o).prefixPM;
+            for (a in n) e.save([ Buffer.from(a), y(n[a]) ]);
             return e.stop();
         })(this, t) ]);
     }
     isEmptySnapshot(t) {
         var {
             info: t,
-            outdatedCount: a
+            outdatedCount: o
         } = t;
-        return a + t.outdatedCount == t.totalCount;
+        return o + t.outdatedCount == t.totalCount;
     }
-    removeKeyFromSnapshot(t, a) {
+    removeKeyFromSnapshot(t, o) {
         var {
-            posMap: o,
+            posMap: a,
             keyValueMap: e
         } = t;
-        e && delete e[a], o && delete o[a], ++t.outdatedCount;
+        e && delete e[o], a && delete a[o], ++t.outdatedCount;
     }
 }
 
-function N(a, o) {
-    var e = a.length;
+function j(o, a) {
+    var e = o.length;
     for (let t = 0; t < e; ) {
-        var s = t + u, n = a.toString("latin1", t, s), r = [];
-        t = g(a, s, r), o(n, r);
+        var n = t + u, s = o.toString("latin1", t, n), r = [];
+        t = g(o, n, r), a(s, r);
     }
 }
 
-async function V(t) {
-    var a = await r(t), o = a.length, e = {};
-    for (let t = 0; t < o; ) {
-        var s = t + w, n = e[a.toString("latin1", t, s)] = [];
-        t = g(a, s, n);
+async function b(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 = g(o, n, s);
     }
     return e;
 }
 
-function T(t, a, o, e) {
-    var s = ((t, a) => {
-        let o = t.fDMap, e = o[a];
+function N(t, o, a, e) {
+    var n = ((t, o) => {
+        let a = t.fDMap, e = a[o];
         if (!e) {
-            P.info("Opening " + a);
+            P.info("Opening " + o);
             try {
-                e = o[a] = p(a, "r");
+                e = a[o] = p(o, "r");
             } catch (t) {
-                throw P.error(`Opening ${a} failed:`, t), t;
+                throw P.error(`Opening ${o} failed:`, t), t;
             }
         }
         return e;
-    })(t, a), n = Buffer.allocUnsafe(e);
+    })(t, o), s = Buffer.allocUnsafe(e);
     for (let t = 0; t < e; ) {
-        var r = i(s, n, t, e - t, o + t);
-        if (0 == r) return void P.error(`readSync ${a} at ${o + t} returning 0 byte`);
+        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 n;
+    return s;
 }
 
-function B(t) {
+function T(t) {
     var {
-        keyValueMap: a,
-        prefixPM: o
+        keyValueMap: o,
+        prefixPM: a
     } = t;
-    return a || null == o || h(t.prefixPM);
+    return o || null == a || h(t.prefixPM);
 }
 
-function k(t, a) {
+function B(t, o) {
     var {
-        snapshotNum: a,
-        info: o
-    } = a;
-    return s(t.snapshotFolder, "" + a, o.pMVersion + "_prefixPM.txt");
+        snapshotNum: o,
+        info: a
+    } = o;
+    return n(t.snapshotFolder, "" + o, a.pMVersion + "_prefixPM.txt");
 }
 
-function a(t, a) {
-    var t = t.fDMap, o = t[a];
-    null != o && (e(o), delete t[a]);
+function o(t, o) {
+    var t = t.fDMap, a = t[o];
+    null != a && (e(a), delete t[o]);
 }
 
-let K = [ 0, 0 ], w = 3;
+let K = [ 0, 0 ], k = 3;
 
-function I(t) {
-    return t.substring(0, w);
+function w(t) {
+    return t.substring(0, k);
 }
 
-function Q(t) {
+function I(t) {
     return !t.startsWith("c");
 }
 
-function D(t) {
+function Q(t) {
     var {
         outdatedCount: t,
-        info: a
-    } = t, o = a.totalCount, t = t + a.outdatedCount;
-    return t == o ? 100 : Math.floor(t / o * 100);
+        info: o
+    } = t, a = o.totalCount, t = t + o.outdatedCount;
+    return t == a ? 100 : Math.floor(t / a * 100);
+}
+
+function D(t, o) {
+    return t + (2 < o ? "_" + o : "") + ".json";
 }
 
 export {
     t as QySnapshots,
-    N as iterPMBuffer,
-    V as loadPrefixPMFile
+    j as iterPMBuffer,
+    b as loadPrefixPMFile,
+    D as getSnapshotInfoFileName
 };

package/src/QyTrigger.d.ts

@@ -1,5 +1,9 @@
 export declare class QyTriggerNode {
-    constructor(name: any, parent: any);
+    name: any;
+    parent: any;
+    children: {};
+    triggerMap: {};
+    constructor(name?: any, parent?: any);
     insertTrigger(triggerName: any, fileNamePath: any, propNamePathList: any, fun: any): void;
     removeTrigger(triggerName: any, fileNamePath: any): boolean;
     get isEmpty(): boolean;