datafolder 1.0.2 → 1.0.3

package/src/QyKVDataCleaner_Worker.js

@@ -1,37 +1,74 @@
-let path = require("node:path"), fsPromises = require("node:fs/promises"), getDefaultOptions = require("./QyDefaultOptions.js").getDefaultOptions, QyMessageWorker = require("./QyMessageWorker.js").QyMessageWorker, {
-    folderOrFileExists,
-    ensureDir
-} = require("./QyUtils.js"), qyCompressor = require("./QyCompressor.js");
+import {
+    join as c
+} from "node:path";
 
-class QyKVDataCleaner_Worker extends QyMessageWorker {
+import {
+    rm as m,
+    rename as r,
+    readdir as d
+} from "node:fs/promises";
+
+import {
+    getDefaultOptions as o
+} from "./QyDefaultOptions.js";
+
+import {
+    QyMessageWorker as e
+} from "./QyMessageWorker.js";
+
+import {
+    folderOrFileExists as f,
+    ensureDir as h
+} from "./QyUtils.js";
+
+import {
+    compressFile as t,
+    Zip_File_Extension as i
+} from "./QyCompressor.js";
+
+class s extends e {
     constructor({
         kvFolder: e,
         options: s
     }) {
         super(s = {
-            ...getDefaultOptions("QyKVDataCleaner_Worker"),
+            ...o("QyKVDataCleaner_Worker"),
             ...s
         }, [ "start", "stop" ], [ "cleanAclFiles", "cleanPMFiles", "cleanVLFiles", "removeSnapshotsFiles" ]);
-        var s = path.join(e, "history"), a = path.join(e, "snapshot");
+        var s = c(e, "history"), a = c(e, "snapshot");
         Object.assign(this, {
             kvFolder: e,
             snapshotFolder: a,
-            snapshotInfoFolder: path.join(a, "info"),
-            aclFolder: path.join(e, "acl"),
-            historyAclFolder: path.join(s, "acl"),
-            historySnapshotFolder: path.join(s, "snapshot")
+            snapshotInfoFolder: c(a, "info"),
+            aclFolder: c(e, "acl"),
+            historyAclFolder: c(s, "acl"),
+            historySnapshotFolder: c(s, "snapshot")
         });
     }
     _op_start() {}
     _op_stop() {}
     async _op_cleanAclFiles(e) {
-        await this._cleanOutdatedAclFiles(e);
+        var s = this, a = e, e = s.aclFolder;
+        if (await f(e)) {
+            var o, r = [];
+            for (o of (await d(e)).filter(e => /^[1-9]/.test(e))) parseInt(o) <= a && r.push((async (e, s) => {
+                var {
+                    aclFolder: a,
+                    historyAclFolder: o
+                } = e;
+                return await h(o), F(e, s, a, o);
+            })(s, o));
+            0 < r.length && await Promise.allSettled(r);
+        }
     }
     async _op_cleanPMFiles(e) {
-        await Promise.allSettled(e.map(([ e, s ]) => this._cleanOutdatedPMFiles(e, s)));
+        await Promise.allSettled(e.map(([ e, s ]) => {
+            return a = this, o = e, r = s, Promise.all([ "pM", "prefixPM" ].map(e => l(a, o, r, e)));
+            var a, o, r;
+        }));
     }
     async _op_cleanVLFiles(e, s) {
-        await this._cleanOutdatedVLFiles(e, s);
+        await l(this, e, s, "vL");
     }
     async _op_removeSnapshotsFiles(e) {
         let {
@@ -39,56 +76,37 @@ class QyKVDataCleaner_Worker extends QyMessageWorker {
             snapshotInfoFolder: a
         } = this;
         await Promise.all(e.map(async e => {
-            await fsPromises.rm(path.join(a, e + ".json")), await fsPromises.rm(path.join(s, "" + e), {
+            await m(c(a, e + ".json")), await m(c(s, "" + e), {
                 recursive: !0
             });
         }));
     }
-    async _cleanOutdatedAclFiles(e) {
-        var s = this.aclFolder;
-        if (await folderOrFileExists(s)) {
-            var a, t = [];
-            for (a of (await fsPromises.readdir(s)).filter(e => /^[1-9]/.test(e))) parseInt(a) <= e && t.push(this._cleanOutdatedAclFile(a));
-            0 < t.length && await Promise.allSettled(t);
-        }
-    }
-    _cleanOutdatedPMFiles(s, a) {
-        return Promise.all([ "pM", "prefixPM" ].map(e => this._cleanOutdatedSnapshotFiles(s, a, e)));
-    }
-    _cleanOutdatedVLFiles(e, s) {
-        return this._cleanOutdatedSnapshotFiles(e, s, "vL");
-    }
-    async _cleanOutdatedSnapshotFiles(s, a, t) {
-        var {
-            snapshotFolder: e,
-            historySnapshotFolder: r
-        } = this, i = path.join(e, "" + s);
-        if (await folderOrFileExists(i)) {
-            let e;
-            var o, l = [];
-            for (o of await fsPromises.readdir(i)) {
-                var n = new RegExp("^([0-9]+)_" + t).exec(o);
-                n && (n = parseInt(n[1])) < a && (1 == n ? (e || (e = path.join(r, "" + s), 
-                await ensureDir(e)), l.push(this._cleanOutdatedFile(o, i, e))) : (n = path.join(i, o), 
-                logger.info("Removing " + n), l.push(fsPromises.rm(n))));
-            }
-            0 < l.length && await Promise.allSettled(l);
+}
+
+function F(e, s, a, o) {
+    a = c(a, s), o = c(o, s);
+    return e.options.compressRedundantFile ? t(a, o + i, {
+        override: !0,
+        removeSrcAfterSuccess: !0
+    }) : (logger.info(`rename ${a} to ` + o), r(a, o));
+}
+
+async function l(s, a, o, r) {
+    var {
+        snapshotFolder: e,
+        historySnapshotFolder: t
+    } = s, i = c(e, "" + a);
+    if (await f(i)) {
+        let e;
+        var l, n = [];
+        for (l of await d(i)) {
+            var p = new RegExp("^([0-9]+)_" + r).exec(l);
+            p && (p = parseInt(p[1])) < o && (1 == p ? (e || (e = c(t, "" + a), 
+            await h(e)), n.push(F(s, l, i, e))) : (p = c(i, l), logger.info("Removing " + p), 
+            n.push(m(p))));
         }
-    }
-    async _cleanOutdatedAclFile(e) {
-        var {
-            aclFolder: s,
-            historyAclFolder: a
-        } = this;
-        return await ensureDir(a), this._cleanOutdatedFile(e, s, a);
-    }
-    _cleanOutdatedFile(e, s, a) {
-        s = path.join(s, e), a = path.join(a, e);
-        return this.options.compressRedundantFile ? qyCompressor.compressFile(s, a + qyCompressor.Zip_File_Extension, {
-            override: !0,
-            removeSrcAfterSuccess: !0
-        }) : (logger.info(`rename ${s} to ` + a), fsPromises.rename(s, a));
+        0 < n.length && await Promise.allSettled(n);
     }
 }
 
-module.exports = QyKVDataCleaner_Worker;
+export default s;

package/src/QyKVDataLoader.js

@@ -1,65 +1,86 @@
-let fsPromises = require("node:fs/promises"), path = require("node:path"), folderOrFileExists = require("./QyUtils.js").folderOrFileExists, readAclBuffer = require("./QyAcl.js").readAclBuffer, QySnapshots = require("./QySnapshots.js").QySnapshots, getDefaultOptions = require("./QyDefaultOptions.js").getDefaultOptions;
+import {
+    readFile as u,
+    readdir as x
+} from "node:fs/promises";
 
-class QyKVDataLoader {
-    constructor(a, e) {
-        e = {
-            ...getDefaultOptions("QyKVDataLoader"),
-            ...e
+import {
+    join as o
+} from "node:path";
+
+import {
+    folderOrFileExists as g
+} from "./QyUtils.js";
+
+import {
+    readAclBuffer as M
+} from "./QyAcl.js";
+
+import {
+    QySnapshots as e
+} from "./QySnapshots.js";
+
+import {
+    getDefaultOptions as r
+} from "./QyDefaultOptions.js";
+
+class a {
+    constructor(a, s) {
+        s = {
+            ...r("QyKVDataLoader"),
+            ...s
         };
-        var s = path.join(a, "snapshot");
+        var t = o(a, "snapshot");
         Object.assign(this, {
             kvFolder: a,
-            options: e,
-            aclFolder: path.join(a, "acl"),
-            snapshotFolder: s,
+            options: s,
+            aclFolder: o(a, "acl"),
+            snapshotFolder: t,
             loadedMaxAclNum: 0,
             aclKeyValueMap: {},
-            qySnapshots: new QySnapshots(s, e)
+            qySnapshots: new e(t, s)
         });
     }
     async load() {
-        var a = this.qySnapshots, [ e ] = await Promise.all([ this._listAclFiles(), a.loadSnapshotInfos() ]);
+        var a = this.qySnapshots, [ s ] = await Promise.all([ (async a => {
+            if (a = a.aclFolder, await g(a)) return (await x(a)).filter(a => /^[1-9]/.test(a)).map(a => parseInt(a));
+        })(this), a.loadSnapshotInfos() ]);
         let {
-            maxSnapshotNum: s,
-            snapshotMaxChangeId: t
+            maxSnapshotNum: t,
+            snapshotMaxChangeId: o
         } = a;
-        this.maxChangeId = t, e && await this._loadAclFiles(e.filter(a => a > s));
+        if (this.maxChangeId = o, s) {
+            var e = this, r = s.filter(a => a > t), {
+                aclKeyValueMap: l,
+                qySnapshots: i,
+                options: s
+            } = (r.sort((a, s) => a - s), e), n = s.autoRepairAclFile, p = await Promise.all(r.map(async a => u(F(e, a))));
+            for (let a = 0; a < r.length; ++a) {
+                var d = r[a], m = F(e, d), m = await M(m, p[a], n, e.maxChangeId);
+                if (0 < m.length) {
+                    for (var [ h, c ] of m) i.applyCmdObj(c, l), e.maxChangeId = h;
+                    e.loadedMaxAclNum = d;
+                }
+            }
+            await 0;
+        }
         var {
-            maxChangeId: e,
-            loadedMaxAclNum: l,
-            aclKeyValueMap: i
+            maxChangeId: s,
+            loadedMaxAclNum: f,
+            aclKeyValueMap: y
         } = this;
         return {
-            maxChangeId: e,
-            loadedMaxAclNum: l,
+            maxChangeId: s,
+            loadedMaxAclNum: f,
             qySnapshots: a,
-            aclKeyValueMap: i
+            aclKeyValueMap: y
         };
     }
-    async _loadAclFiles(e) {
-        e.sort((a, e) => a - e);
-        var {
-            aclKeyValueMap: s,
-            qySnapshots: t,
-            options: a
-        } = this, l = a.autoRepairAclFile, i = await Promise.all(e.map(async a => fsPromises.readFile(this._getAclFilePath(a))));
-        for (let a = 0; a < e.length; ++a) {
-            var r = e[a], o = this._getAclFilePath(r), o = await readAclBuffer(o, i[a], l, this.maxChangeId);
-            if (0 < o.length) {
-                for (var [ n, h ] of o) t.applyCmdObj(h, s), this.maxChangeId = n;
-                this.loadedMaxAclNum = r;
-            }
-        }
-    }
-    async _listAclFiles() {
-        var a = this.aclFolder;
-        if (await folderOrFileExists(a)) return (await fsPromises.readdir(a)).filter(a => /^[1-9]/.test(a)).map(a => parseInt(a));
-    }
-    _getAclFilePath(a) {
-        return path.join(this.aclFolder, a + "_acl.txt");
-    }
 }
 
-Object.assign(module.exports, {
-    QyKVDataLoader: QyKVDataLoader
-});
+function F(a, s) {
+    return o(a.aclFolder, s + "_acl.txt");
+}
+
+export {
+    a as QyKVDataLoader
+};

package/src/QyKVDataSaver.js

@@ -1,17 +1,23 @@
-let QyMessager = require("./QyMessager.js").QyMessager, getDefaultOptions = require("./QyDefaultOptions.js").getDefaultOptions;
+import {
+    QyMessager as a
+} from "./QyMessager.js";
 
-class QyKVDataSaver extends QyMessager {
-    constructor(e, a, s) {
-        super(e, "QyKVDataSaver_Worker.js", {
-            kvFolder: a,
+import {
+    getDefaultOptions as r
+} from "./QyDefaultOptions.js";
+
+class e extends a {
+    constructor(a, e, s) {
+        super(a, "QyKVDataSaver_Worker.js", {
+            kvFolder: e,
             options: s = {
-                ...getDefaultOptions("QyKVDataSaver"),
+                ...r("QyKVDataSaver"),
                 ...s
             }
         }, s, [ "callSave" ], [ "castSave", "releaseSnapshot" ]);
     }
 }
 
-Object.assign(module.exports, {
-    QyKVDataSaver: QyKVDataSaver
-});
+export {
+    e as QyKVDataSaver
+};

package/src/QyKVDataSaver_Worker.js

@@ -1,81 +1,104 @@
-let path = require("node:path"), getDefaultOptions = require("./QyDefaultOptions.js").getDefaultOptions, QyAclSaver = require("./QyAclSaver.js").QyAclSaver, QyMessageWorker = require("./QyMessageWorker.js").QyMessageWorker, QySnapshotSaver = require("./QySnapshotSaver.js").QySnapshotSaver, delCmdKey = require("./QyAcl.js").delCmdKey;
+import {
+    join as t
+} from "node:path";
 
-class QyKVDataSaver_Worker extends QyMessageWorker {
+import {
+    getDefaultOptions as e
+} from "./QyDefaultOptions.js";
+
+import {
+    QyAclSaver as n
+} from "./QyAclSaver.js";
+
+import {
+    QyMessageWorker as a
+} from "./QyMessageWorker.js";
+
+import {
+    QySnapshotSaver as o
+} from "./QySnapshotSaver.js";
+
+import {
+    delCmdKey as m
+} from "./QyAcl.js";
+
+class s extends a {
     constructor({
-        kvFolder: e,
-        options: a
+        kvFolder: a,
+        options: s
     }) {
-        super(a = {
-            ...getDefaultOptions("QyKVDataSaver_Worker"),
-            ...a
+        super(s = {
+            ...e("QyKVDataSaver_Worker"),
+            ...s
         }), Object.assign(this, {
-            kvFolder: e,
-            aclFolder: path.join(e, "acl"),
-            qyAclSaver: new QyAclSaver(this, a),
-            qySnapshotSaver: new QySnapshotSaver(this, e, a)
+            kvFolder: a,
+            aclFolder: t(a, "acl"),
+            qyAclSaver: new n(this, s),
+            qySnapshotSaver: new o(this, a, s)
         });
     }
-    start(e, a, s, t) {
+    start(a, s, t, e) {
         var {
-            qyAclSaver: r,
-            qySnapshotSaver: n
+            qyAclSaver: n,
+            qySnapshotSaver: o
         } = this;
         Object.assign(this, {
-            maxChangeId: e,
-            snapshotMaxChangeId: e,
-            currentAclNum: (s || a) + 1
-        }), r.start(this._getAclFilePath()), n.start(e, s, t);
+            maxChangeId: a,
+            snapshotMaxChangeId: a,
+            currentAclNum: (t || s) + 1
+        }), n.start(u(this)), o.start(a, t, e);
     }
     async stop() {
         var {
-            qyAclSaver: e,
-            options: a,
-            qySnapshotSaver: s,
-            currentAclNum: t,
-            maxChangeId: r,
-            snapshotMaxChangeId: n
+            qyAclSaver: a,
+            options: s,
+            qySnapshotSaver: t,
+            currentAclNum: e,
+            maxChangeId: n,
+            snapshotMaxChangeId: o
         } = this;
-        this.isStopping = !0, await e.stop(), a.saveSnapshotAtStop && n < r && (this.isSavingSnapshot && await new Promise(e => this.saveSnapshotResolve = e), 
-        logger.log(`Saving snapshot ${t} at stop.`), s.saveSnapshot(t)), await s.stop();
+        this.isStopping = !0, await a.stop(), s.saveSnapshotAtStop && o < n && (this.isSavingSnapshot && await new Promise(a => this.saveSnapshotResolve = a), 
+        logger.log(`Saving snapshot ${e} at stop.`), t.saveSnapshot(e)), await t.stop();
     }
-    callSave(e, a, s) {
-        return this._save(e, a, s, !0);
+    callSave(a, s, t) {
+        return r(this, a, s, t, !0);
     }
-    castSave(e, a, s) {
-        return this._save(e, a, s);
+    castSave(a, s, t) {
+        return r(this, a, s, t);
     }
-    releaseSnapshot(e) {
-        this.qySnapshotSaver.releaseSnapshot(e);
+    releaseSnapshot(a) {
+        this.qySnapshotSaver.releaseSnapshot(a);
     }
-    _save(e, a, s, t) {
-        var {
-            qyAclSaver: r,
-            qySnapshotSaver: n,
-            options: o,
-            snapshotMaxChangeId: h,
-            currentAclNum: i,
-            isSavingSnapshot: S
-        } = this;
-        let l;
-        return t ? l = r.callSave(e, a) : r.castSave(e, a), this._removeSyncedKeys(a, s), 
-        n.castSave(e, a, s), this.maxChangeId = e, !S && e - h >= o.snapshotMaxChangeCount && (++this.currentAclNum, 
-        r.switch(this._getAclFilePath()), n.saveSnapshot(i), Object.assign(this, {
-            snapshotMaxChangeId: e,
-            isSavingSnapshot: !0
-        })), l;
+    onSnapshotSavedChangeId(a, s) {
+        this.isSavingSnapshot = !1, this.saveSnapshotResolve ? this.saveSnapshotResolve() : this.isStopping || this.castParent("onSnapshotSavedChangeId", a, s);
     }
-    _removeSyncedKeys(a, s) {
-        if (s) {
-            var t = s.length;
-            for (let e = 0; e < t; e += 2) delCmdKey(a, s[e]);
-        }
-    }
-    _getAclFilePath() {
-        return path.join(this.aclFolder, this.currentAclNum + "_acl.txt");
-    }
-    onSnapshotSavedChangeId(e, a) {
-        this.isSavingSnapshot = !1, this.saveSnapshotResolve ? this.saveSnapshotResolve() : this.isStopping || this.castParent("onSnapshotSavedChangeId", e, a);
+}
+
+function r(a, s, t, e, n) {
+    var {
+        qyAclSaver: o,
+        qySnapshotSaver: r,
+        options: h,
+        snapshotMaxChangeId: i,
+        currentAclNum: p,
+        isSavingSnapshot: S
+    } = a;
+    let v;
+    n ? v = o.callSave(s, t) : o.castSave(s, t);
+    var l = t, c = e;
+    if (c) {
+        var g = c.length;
+        for (let a = 0; a < g; a += 2) m(l, c[a]);
     }
+    return r.castSave(s, t, e), a.maxChangeId = s, !S && s - i >= h.snapshotMaxChangeCount && (++a.currentAclNum, 
+    o.switch(u(a)), r.saveSnapshot(p), Object.assign(a, {
+        snapshotMaxChangeId: s,
+        isSavingSnapshot: !0
+    })), v;
+}
+
+function u(a) {
+    return t(a.aclFolder, a.currentAclNum + "_acl.txt");
 }
 
-module.exports = QyKVDataSaver_Worker;
+export default s;

package/src/QyLogFileSaver.js

@@ -1,14 +1,20 @@
-let QyMessager = require("./QyMessager.js").QyMessager, getDefaultOptions = require("./QyDefaultOptions.js").getDefaultOptions;
+import {
+    QyMessager as e
+} from "./QyMessager.js";
 
-class QyLogFileSaver extends QyMessager {
+import {
+    getDefaultOptions as r
+} from "./QyDefaultOptions.js";
+
+class s extends e {
     constructor(e, s) {
         super(e, "QyLogFileSaver_Worker.js", s = {
-            ...getDefaultOptions("QyLogFileSaver"),
+            ...r("QyLogFileSaver"),
             ...s
         }, s, [ "switch" ], [ "save" ]);
     }
 }
 
-Object.assign(module.exports, {
-    QyLogFileSaver: QyLogFileSaver
-});
+export {
+    s as QyLogFileSaver
+};

package/src/QyLogFileSaver_Worker.js

@@ -1,26 +1,36 @@
-let getDefaultOptions = require("./QyDefaultOptions.js").getDefaultOptions, QyMessageWorker = require("./QyMessageWorker.js").QyMessageWorker, QyBinWriter = require("./QyBinWriter.js").QyBinWriter;
+import {
+    getDefaultOptions as s
+} from "./QyDefaultOptions.js";
 
-class QyLogFileSaver_Worker extends QyMessageWorker {
-    constructor(e) {
-        super(e = {
-            ...getDefaultOptions("QyLogFileSaver_Worker"),
-            ...e
+import {
+    QyMessageWorker as t
+} from "./QyMessageWorker.js";
+
+import {
+    QyBinWriter as r
+} from "./QyBinWriter.js";
+
+class i extends t {
+    constructor(t) {
+        super(t = {
+            ...s("QyLogFileSaver_Worker"),
+            ...t
         }), Object.assign(this, {
-            qyBinWriter: new QyBinWriter(e)
+            qyBinWriter: new r(t)
         });
     }
-    async start(e) {
-        await this.qyBinWriter.start(e);
+    async start(t) {
+        await this.qyBinWriter.start(t);
     }
     async stop() {
         await this.qyBinWriter.stop();
     }
-    async switch(e) {
-        await this.qyBinWriter.switch(e);
+    async switch(t) {
+        await this.qyBinWriter.switch(t);
     }
-    save(e, r) {
-        this.qyBinWriter.save(e, r);
+    save(t, s) {
+        this.qyBinWriter.save(t, s);
     }
 }
 
-module.exports = QyLogFileSaver_Worker;
+export default i;