datafolder 1.0.14 → 1.0.15

package/src/QyKVData.js

@@ -54,7 +54,7 @@ class t {
     compactInterval;
     unloadInterval;
     qyExpire;
-    constructor(t, a, o) {
+    constructor(t, a = void 0, o = void 0) {
         a = {
             ...s("QyKVData"),
             ...a
@@ -159,7 +159,7 @@ class t {
         o && o.closeAllFDs(), await a.stop(), await s.stop();
     }
     save(t, a, o, e) {
-        var n = this.qyKVDataSaver;
+        var n = this.qyKVDataSaver, a = JSON.stringify(a), o = JSON.stringify(o);
         if (e) return n.callSave(t, a, o);
         n.castSave(t, a, o);
     }

package/src/QyKVDataCleaner_Worker.js

@@ -5,7 +5,7 @@ import {
 import {
     rm as c,
     rename as r,
-    readdir as h
+    readdir as d
 } from "node:fs/promises";
 
 import {
@@ -13,12 +13,12 @@ import {
 } from "./QyDefaultOptions.js";
 
 import {
-    QyMessageWorker as e
+    QyMessageWorker as s
 } from "./QyMessageWorker.js";
 
 import {
-    folderOrFileExists as d,
-    ensureDir as F
+    folderOrFileExists as h,
+    ensureDir as f
 } from "./QyUtils.js";
 
 import {
@@ -27,14 +27,14 @@ import {
 } from "./QyCompressor.js";
 
 import {
-    logger as f
+    logger as F
 } from "./QyLogger.js";
 
 import {
     getInfoFileName as l
 } from "./QySnapshots.js";
 
-export default class extends e {
+export default class extends s {
     kvFolder;
     snapshotFolder;
     snapshotInfoFolder;
@@ -42,82 +42,82 @@ export default class extends e {
     historyAclFolder;
     historySnapshotFolder;
     constructor({
-        kvFolder: e,
-        options: s
+        kvFolder: s,
+        options: o
     }) {
-        super(s = {
+        super(o = {
             ...a("QyKVDataCleaner_Worker"),
-            ...s
-        }, [], [ "cleanAclFiles", "cleanPMFiles", "cleanVLFiles", "removeSnapshotsFiles" ]);
-        var s = m(e, "history"), o = m(e, "snapshot");
+            ...o
+        });
+        var o = m(s, "history"), e = m(s, "snapshot");
         Object.assign(this, {
-            kvFolder: e,
-            snapshotFolder: o,
-            snapshotInfoFolder: m(o, "info"),
-            aclFolder: m(e, "acl"),
-            historyAclFolder: m(s, "acl"),
-            historySnapshotFolder: m(s, "snapshot")
+            kvFolder: s,
+            snapshotFolder: e,
+            snapshotInfoFolder: m(e, "info"),
+            aclFolder: m(s, "acl"),
+            historyAclFolder: m(o, "acl"),
+            historySnapshotFolder: m(o, "snapshot")
         });
     }
     _op_start() {}
     _op_stop() {}
-    async _op_cleanAclFiles(e) {
-        var s = this, o = e, e = s.aclFolder;
-        if (await d(e)) {
+    async _op_cleanAclFiles(s) {
+        var o = this, e = s, s = o.aclFolder;
+        if (await h(s)) {
             var a, r = [];
-            for (a of (await h(e)).filter(e => /^[1-9]/.test(e))) parseInt(a) <= o && r.push((async (e, s) => {
+            for (a of (await d(s)).filter(s => /^[1-9]/.test(s))) parseInt(a) <= e && r.push((async (s, o) => {
                 var {
-                    aclFolder: o,
+                    aclFolder: e,
                     historyAclFolder: a
-                } = e;
-                return await F(a), y(e, s, o, a);
-            })(s, a));
+                } = s;
+                return await f(a), y(s, o, e, a);
+            })(o, a));
             0 < r.length && await Promise.allSettled(r);
         }
     }
-    async _op_cleanPMFiles(e) {
-        await Promise.allSettled(e.map(([ e, s ]) => {
-            return o = this, a = e, r = s, Promise.all([ "pM", "prefixPM" ].map(e => n(o, a, r, e)));
-            var o, a, r;
+    async _op_cleanPMFiles(s) {
+        await Promise.allSettled(s.map(([ s, o ]) => {
+            return e = this, a = s, r = o, Promise.all([ "pM", "prefixPM" ].map(s => n(e, a, r, s)));
+            var e, a, r;
         }));
     }
-    async _op_cleanVLFiles(e, s) {
-        await n(this, e, s, "vL");
+    async _op_cleanVLFiles(s, o) {
+        await n(this, s, o, "vL");
     }
-    async _op_removeSnapshotsFiles(e) {
+    async _op_removeSnapshotsFiles(s) {
         let {
-            snapshotFolder: o,
+            snapshotFolder: e,
             snapshotInfoFolder: a
         } = this;
-        await Promise.all(e.map(async ([ s, e ]) => {
-            await c(m(a, l(s, e))), await Promise.all([ "pM", "prefixPM", "vL" ].map(e => n(this, s, 1 / 0, e))), 
-            await c(m(o, "" + s), {
+        await Promise.all(s.map(async ([ o, s ]) => {
+            await c(m(a, l(o, s))), await Promise.all([ "pM", "prefixPM", "vL" ].map(s => n(this, o, 1 / 0, s))), 
+            await c(m(e, "" + o), {
                 recursive: !0
             });
         }));
     }
 }
 
-function y(e, s, o, a) {
-    o = m(o, s), a = m(a, s);
-    return e.options.compressRedundantFile ? t(o, a + i, {
+function y(s, o, e, a) {
+    e = m(e, o), a = m(a, o);
+    return s.options.compressRedundantFile ? t(e, a + i, {
         override: !0,
         removeSrcAfterSuccess: !0
-    }) : (f.info(`rename ${o} to ` + a), r(o, a));
+    }) : (F.info(`rename ${e} to ` + a), r(e, a));
 }
 
-async function n(s, o, a, r) {
+async function n(o, e, a, r) {
     var {
-        snapshotFolder: e,
+        snapshotFolder: s,
         historySnapshotFolder: t
-    } = s, i = m(e, "" + o);
-    if (await d(i)) {
-        let e;
+    } = o, i = m(s, "" + e);
+    if (await h(i)) {
+        let s;
         var l, n = [];
-        for (l of await h(i)) {
+        for (l of await d(i)) {
             var p = new RegExp("^([0-9]+)_" + r).exec(l);
-            p && (p = parseInt(p[1])) < a && (1 == p ? (e || (e = m(t, "" + o), 
-            await F(e)), n.push(y(s, l, i, e))) : (p = m(i, l), f.info("Removing " + p), 
+            p && (p = parseInt(p[1])) < a && (1 == p ? (s || (s = m(t, "" + e), 
+            await f(s)), n.push(y(o, l, i, s))) : (p = m(i, l), F.info("Removing " + p), 
             n.push(c(p))));
         }
         0 < n.length && await Promise.allSettled(n);

package/src/QyKVDataLoader.d.ts

@@ -7,7 +7,7 @@ export declare class QyKVDataLoader {
     loadedMaxAclNum: number;
     aclKeyValueMap: any;
     maxChangeId: number;
-    constructor(kvFolder: any, options: any);
+    constructor(kvFolder: any, options?: any);
     load(): Promise<{
         maxChangeId: number;
         loadedMaxAclNum: number;

package/src/QyKVDataLoader.js

@@ -32,36 +32,36 @@ class a {
     loadedMaxAclNum = 0;
     aclKeyValueMap = {};
     maxChangeId = 0;
-    constructor(a, s) {
-        s = {
+    constructor(a, o = void 0) {
+        o = {
             ...l("QyKVDataLoader"),
-            ...s
+            ...o
         };
-        var o = t(a, "snapshot");
+        var s = t(a, "snapshot");
         Object.assign(this, {
             kvFolder: a,
-            options: s,
+            options: o,
             aclFolder: t(a, "acl"),
-            snapshotFolder: o,
-            qySnapshots: new e(o, s)
+            snapshotFolder: s,
+            qySnapshots: new e(s, o)
         });
     }
     async load() {
-        var a = this.qySnapshots, [ s ] = await Promise.all([ (async a => {
+        var a = this.qySnapshots, [ o ] = 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: o,
+            maxSnapshotNum: s,
             snapshotMaxChangeId: t
         } = a;
-        if (this.maxChangeId = t, s) {
-            var e = this, l = s.filter(a => a > o), {
+        if (this.maxChangeId = t, o) {
+            var e = this, l = o.filter(a => a > s), {
                 aclKeyValueMap: r,
                 qySnapshots: n,
-                options: s
-            } = (l.sort((a, s) => a - s), e), i = s.autoRepairAclFile, p = await Promise.all(l.map(async a => u(I(e, a))));
+                options: o
+            } = (l.sort((a, o) => a - o), e), i = o.autoRepairAclFile, p = await Promise.all(l.map(async a => u(v(e, a))));
             for (let a = 0; a < l.length; ++a) {
-                var d = l[a], m = I(e, d), m = await F(m, p[a], i, e.maxChangeId);
+                var d = l[a], m = v(e, d), m = await F(m, p[a], i, e.maxChangeId);
                 if (0 < m.length) {
                     for (var [ h, c ] of m) n.applyCmdObj(c, r), e.maxChangeId = h;
                     e.loadedMaxAclNum = d;
@@ -70,12 +70,12 @@ class a {
             await 0;
         }
         var {
-            maxChangeId: s,
+            maxChangeId: o,
             loadedMaxAclNum: f,
             aclKeyValueMap: y
         } = this;
         return {
-            maxChangeId: s,
+            maxChangeId: o,
             loadedMaxAclNum: f,
             qySnapshots: a,
             aclKeyValueMap: y
@@ -83,8 +83,8 @@ class a {
     }
 }
 
-function I(a, s) {
-    return t(a.aclFolder, s + "_acl.txt");
+function v(a, o) {
+    return t(a.aclFolder, o + "_acl.txt");
 }
 
 export {

package/src/QyKVDataSaver_Worker.d.ts

@@ -16,8 +16,8 @@ export default class QyKVDataSaver_Worker extends QyMessageWorker {
     });
     _op_start(maxChangeId: any, maxSnapshotNum: any, loadedMaxAclNum: any, aclKeyValueMap: any): void;
     _op_stop(): Promise<any>;
-    callSave(changeId: any, cmdArgAsListChanges: any, syncList: any): any;
-    castSave(changeId: any, cmdArgAsListChanges: any, syncList: any): any;
+    callSave(changeId: any, cmdArgAsListObj: any, syncList: any): any;
+    castSave(changeId: any, cmdArgAsListObj: any, syncList: any): any;
     releaseSnapshot(snapshotNum: any): void;
     onSnapshotSavedChangeId(snapshotSavedChangeId: any, pMOnlySnapshot: any): void;
 }

package/src/QyKVDataSaver_Worker.js

@@ -18,10 +18,6 @@ import {
     QySnapshotSaver as n
 } from "./QySnapshotSaver.js";
 
-import {
-    delCmdKey as m
-} from "./QyAcl.js";
-
 import {
     logger as r
 } from "./QyLogger.js";
@@ -60,7 +56,7 @@ export default class extends a {
             maxChangeId: a,
             snapshotMaxChangeId: a,
             currentAclNum: (t || s) + 1
-        }), o && o.start(d(this)), n.start(a, t, e);
+        }), o && o.start(l(this)), n.start(a, t, e);
     }
     async _op_stop() {
         var {
@@ -98,19 +94,14 @@ function h(a, s, t, e, o = !1) {
         isSavingSnapshot: S
     } = a;
     let v;
-    n && (o ? v = n.callSave(s, t) : n.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 - p >= h.snapshotMaxChangeCount && (++a.currentAclNum, 
-    n && n.switch(d(a)), r.saveSnapshot(i), Object.assign(a, {
+    return n && (o ? v = n.callSave(s, t) : n.castSave(s, t)), r.castSave(s, t, e), 
+    a.maxChangeId = s, !S && s - p >= h.snapshotMaxChangeCount && (++a.currentAclNum, 
+    n && n.switch(l(a)), r.saveSnapshot(i), Object.assign(a, {
         snapshotMaxChangeId: s,
         isSavingSnapshot: !0
     })), v;
 }
 
-function d(a) {
+function l(a) {
     return t(a.aclFolder, a.currentAclNum + "_acl.txt");
 }

package/src/QyMessageWorker.js

@@ -11,45 +11,44 @@ import {
 } from "./QyLogger.js";
 
 import {
-    QyOpRunner as s
+    QyOpRunner as e
 } from "./QyOpRunner.js";
 
-class e extends s {
-    constructor(s, e = [], r = []) {
-        super(s = {
+class s extends e {
+    constructor(e, s = [], r = []) {
+        super(e = {
             ...a("QyMessageWorker"),
-            ...s
-        }, e, r), t?.on("message", async s => {
+            ...e
+        }, s, r), t?.on("message", async e => {
             var {
-                opName: e,
-                _cast: r
-            } = s;
-            if (e) {
-                var a = s.args || [];
+                opName: s,
+                _call: r
+            } = e;
+            if (s) {
+                var a = e.args || [];
                 try {
-                    var o = await this[e](...a);
-                    r || t?.postMessage({
-                        ack: e,
+                    var o = await this[s](...a);
+                    r && t?.postMessage({
+                        ack: s,
                         result: o
-                    }), "stop" == e && process.exit();
-                } catch (s) {
-                    p.error(`Running ${e} failed:`, s), r || t?.postMessage({
-                        ack: e,
-                        exception: s
+                    }), "stop" == s && process.exit();
+                } catch (e) {
+                    p.error(`Running ${s} failed:`, e), r && t?.postMessage({
+                        ack: s,
+                        exception: e
                     });
                 }
-            } else p.warn("Msg ignored:", s);
+            } else p.warn("Msg ignored:", e);
         });
     }
-    postParent(s, ...e) {
+    postParent(e, ...s) {
         t?.postMessage({
-            opName: s,
-            args: e,
-            _cast: !0
+            opName: e,
+            args: s
         });
     }
 }
 
 export {
-    e as QyMessageWorker
+    s as QyMessageWorker
 };

package/src/QyMessager.d.ts

@@ -3,9 +3,9 @@ export declare class QyMessager {
     worker: any;
     receiverQueueMap: any;
     options: any;
-    constructor(workerTypeFileName: any, initArgMap: any, options: any, callOpNameList?: any[], castOpNameList?: any[], workerMsgProcessor?: this);
+    constructor(workerTypeFileName: any, initArgMap: any, options: any, callOpNameList: any, castOpNameList: any, workerMsgProcessor?: this);
     start(...args: any[]): any;
     stop(...args: any[]): any;
-    castWorker(opName: any, args: any): void;
-    callWorker(opName: any, args: any): any;
+    castWorker(opName: any, args: any, transferList?: any): void;
+    callWorker(opName: any, args: any, transferList?: any): any;
 }

package/src/QyMessager.js

@@ -1,11 +1,11 @@
 import {
-    join as s,
+    join as o,
     extname as e
 } from "node:path";
 
 import {
     Worker as l,
-    setEnvironmentData as o
+    setEnvironmentData as s
 } from "node:worker_threads";
 
 import {
@@ -32,50 +32,50 @@ class r {
     worker;
     receiverQueueMap;
     options;
-    constructor(e, r, s, o = [], t = [], a = this) {
-        s = {
+    constructor(e, r, o, s, t, a = this) {
+        o = {
             ...i("QyMessager"),
-            ...s
+            ...o
         }, Object.assign(this, {
             workerMsgProcessor: a,
             workerTypeFileName: e,
             initArgMap: r,
-            options: s,
+            options: o,
             receiverQueueMap: {}
         });
-        for (let r of o) this[r] || (this[r] = (...e) => this.callWorker(r, e));
+        for (let r of s) this[r] || (this[r] = (...e) => this.callWorker(r, e));
         for (let r of t) this[r] || (this[r] = (...e) => this.castWorker(r, e));
     }
     start(...e) {
-        this.started = !0, o("logLevel", n.level);
+        this.started = !0, s("logLevel", n.level);
         var p = this;
         if (!p.worker) {
             let {
                 workerMsgProcessor: t,
-                workerTypeFileName: o,
+                workerTypeFileName: s,
                 initArgMap: e,
                 receiverQueueMap: a
             } = p;
             var r = {
-                workerTypeFileName: o,
+                workerTypeFileName: s,
                 initArgMap: e
             };
-            let i = p.worker = new l(s(m, "QyMessager_Run" + k), {
+            let i = p.worker = new l(o(m, "QyMessager_Run" + k), {
                 workerData: r
             });
             i.on("error", e => {
-                n.error(`Worker ${o} error:`, e);
+                n.error(`Worker ${s} error:`, e);
             }), i.on("message", e => {
                 var {
                     opName: r,
-                    ack: s,
-                    result: o
+                    ack: o,
+                    result: s
                 } = e;
                 r ? "%o_" == r ? n.handleOutMsg(e) : "%e_" == r ? n.handleErrMsg(e) : (e = e.args || [], 
-                t[r](...e)) : a[s]?.shift().resolve(o);
+                t[r](...e)) : a[o]?.shift().resolve(s);
             }), i.on("exit", e => {
-                for (var r in i.removeAllListeners(), 0 != e ? n.warn(`Worker ${o} stopped with exitCode ` + e) : n.info(`Worker ${o} stopped.`), 
-                a) for (var s = a[r]; !s.isEmpty; ) s.shift()?.resolve();
+                for (var r in i.removeAllListeners(), 0 != e ? n.warn(`Worker ${s} stopped with exitCode ` + e) : n.info(`Worker ${s} stopped.`), 
+                a) for (var o = a[r]; !o.isEmpty; ) o.shift()?.resolve();
                 p.worker = void 0;
             });
         }
@@ -84,27 +84,27 @@ class r {
     stop(...e) {
         if (this.started) return this.started = !1, this.callWorker("stop", e);
     }
-    castWorker(e, r) {
+    castWorker(e, r, o = void 0) {
         this.worker.postMessage({
             opName: e,
-            args: r,
-            _cast: !0
-        });
+            args: r
+        }, o);
     }
-    callWorker(e, r) {
+    callWorker(e, r, o = void 0) {
         var {
             worker: s,
-            receiverQueueMap: o,
-            options: t
+            receiverQueueMap: t,
+            options: a
         } = this;
         s.postMessage({
             opName: e,
-            args: r
-        });
-        let a = o[e];
-        a = a || (o[e] = new h(t));
+            args: r,
+            _call: !0
+        }, o);
+        let i = t[e];
+        i = i || (t[e] = new h(a));
         s = p({});
-        return a.push(s), s.promise;
+        return i.push(s), s.promise;
     }
 }
 

package/src/QyMod.d.ts

@@ -1 +1 @@
-export declare function requireFromModCode(modFolder: any, modName: any, modCode: any, qyDB: any): any;
+export declare function requireFromModCode(modFolder: any, modName: any, modCode: any, qyDB?: any): any;

package/src/QyMod.js

@@ -1,15 +1,15 @@
-import d from "node:module";
+import a from "node:module";
 
 import {
     logger as s
 } from "./QyLogger.js";
 
-function o(e, r, l, o) {
+function o(e, r, l, o = void 0) {
     if (l) try {
-        var t = e + "_" + r, g = `_${t}_qydb`, i = `_${t}_logger`, a = (globalThis[g] = o, 
-        globalThis[i] = s, new d(r));
-        return a._compile(`(function(dataFolder, logger){${l}})(${g},${i});`, t + ".ts"), 
-        delete globalThis[g], delete globalThis[i], a.exports;
+        var i = e + "_" + r, t = `_${i}_qydb`, g = `_${i}_logger`, d = (globalThis[t] = o, 
+        globalThis[g] = s, new a(r));
+        return d._compile(`(function(dataFolder, logger){${l}})(${t},${g});`, i + ".ts"), 
+        delete globalThis[t], delete globalThis[g], d.exports;
     } catch (o) {
         s.error("requireFromModCode failed:", e, r, l, o);
     }

package/src/QyOpRunner.d.ts

@@ -4,7 +4,7 @@ export declare class QyOpRunner extends EventEmitter {
     opQueue: any;
     options: any;
     runningOp: any;
-    constructor(options: any, callOpNameList?: any[], castOpNameList?: any[]);
+    constructor(options: any, callOpNameList?: any, castOpNameList?: any);
     get firstOp(): any;
     get lastOp(): any;
     finish(): any;

package/src/QyOpRunner.js

@@ -21,11 +21,12 @@ class e extends t {
     opQueue;
     options;
     runningOp;
-    constructor(t, s = [], e = []) {
+    constructor(t, s = void 0, e = void 0) {
         super(), t = this.options = {
             ...i("QyOpRunner"),
             ...t
-        }, this.opQueue = new r(t), n(this, s, !0), n(this, e), n(this, [ "start", "stop" ], !0);
+        }, this.opQueue = new r(t), s && n(this, s, !0), n(this, [ "start", "stop" ], !0), 
+        e && n(this, e), n(this, Object.getOwnPropertyNames(Object.getPrototypeOf(this)).filter(t => t.startsWith("_op_")).map(t => t.substring(4)));
     }
     get firstOp() {
         return this.opQueue.first;

package/src/QyQueue.d.ts

@@ -3,7 +3,7 @@ export declare class QyQueue {
     queue: any[];
     firstIdx: number;
     _waterMark: number;
-    constructor(options: any);
+    constructor(options?: any);
     get first(): any;
     get last(): any;
     get isEmpty(): boolean;

package/src/QyQueue.js

@@ -7,7 +7,7 @@ class t {
     queue = [];
     firstIdx = 0;
     _waterMark = 0;
-    constructor(t) {
+    constructor(t = void 0) {
         this.options = {
             ...e("QyQueue"),
             ...t
@@ -44,10 +44,10 @@ class t {
                 options: r
             } = e, u = s.length, h = i + 1;
             if (u <= h) e.reset(); else {
-                var a = u - h;
-                if (h > r.maxLenBeforeRecycle || a <= h) {
-                    for (let t = 0; t < a; ++t) s[t] = s[t + h];
-                    e.firstIdx = 0, s.length = a;
+                var o = u - h;
+                if (h > r.maxLenBeforeRecycle || o <= h) {
+                    for (let t = 0; t < o; ++t) s[t] = s[t + h];
+                    e.firstIdx = 0, s.length = o;
                 } else e.firstIdx = h, s[i] = void 0;
             }
             return t;

package/src/QySaver.d.ts

@@ -1,7 +1,7 @@
 export declare class QySaver {
     dataFolder: any;
     options: any;
-    constructor(dataFolder: any, options: any);
+    constructor(dataFolder?: any, options?: any);
     setDataFolder(dataFolder: any): this;
     processAfterLoad(data: any): any;
     processBeforeSave(data: any): Buffer<any>;

package/src/QySaver.js

@@ -27,7 +27,7 @@ import {
 class i {
     dataFolder;
     options;
-    constructor(e, r) {
+    constructor(e = void 0, r = void 0) {
         Object.assign(this, {
             dataFolder: e,
             options: {