datafolder 1.0.6 → 1.0.8

package/src/QyKVDataSaver_Worker.js

@@ -19,10 +19,10 @@ import {
 } from "./QySnapshotSaver.js";
 
 import {
-    delCmdKey as m
+    delCmdKey as u
 } from "./QyAcl.js";
 
-class s extends a {
+export default class extends a {
     constructor({
         kvFolder: a,
         options: s
@@ -33,7 +33,7 @@ class s extends a {
         }), Object.assign(this, {
             kvFolder: a,
             aclFolder: t(a, "acl"),
-            qyAclSaver: new o(this, s),
+            qyAclSaver: s.noAcl ? void 0 : new o(this, s),
             qySnapshotSaver: new n(this, a, s)
         });
     }
@@ -46,7 +46,7 @@ class s extends a {
             maxChangeId: a,
             snapshotMaxChangeId: a,
             currentAclNum: (t || s) + 1
-        }), o.start(u(this)), n.start(a, t, e);
+        }), o && o.start(m(this)), n.start(a, t, e);
     }
     async _op_stop() {
         var {
@@ -57,8 +57,8 @@ class s extends a {
             maxChangeId: o,
             snapshotMaxChangeId: n
         } = this;
-        this.isStopping = !0, await a.stop(), s.saveSnapshotAtStop && n < o && (this.isSavingSnapshot && await new Promise(a => this.saveSnapshotResolve = a), 
-        logger.log(`Saving snapshot ${e} at stop.`), t.saveSnapshot(e)), await t.stop();
+        return this.isStopping = !0, a && await a.stop(), s.saveSnapshotAtStop && n < o && (this.isSavingSnapshot && await new Promise(a => this.saveSnapshotResolve = a), 
+        logger.log(`Saving snapshot ${e} at stop.`), t.saveSnapshot(e)), t.stop();
     }
     callSave(a, s, t) {
         return r(this, a, s, t, !0);
@@ -84,21 +84,19 @@ function r(a, s, t, e, o) {
         isSavingSnapshot: S
     } = a;
     let v;
-    o ? v = n.callSave(s, t) : n.castSave(s, t);
+    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]);
+        for (let a = 0; a < g; a += 2) u(l, c[a]);
     }
     return r.castSave(s, t, e), a.maxChangeId = s, !S && s - i >= h.snapshotMaxChangeCount && (++a.currentAclNum, 
-    n.switch(u(a)), r.saveSnapshot(p), Object.assign(a, {
+    n && n.switch(m(a)), r.saveSnapshot(p), Object.assign(a, {
         snapshotMaxChangeId: s,
         isSavingSnapshot: !0
     })), v;
 }
 
-function u(a) {
+function m(a) {
     return t(a.aclFolder, a.currentAclNum + "_acl.txt");
-}
-
-export default s;
+}

package/src/QyLogFileSaver.d.ts

@@ -0,0 +1,4 @@
+import { QyMessager } from "./QyMessager.ts";
+export declare class QyLogFileSaver extends QyMessager {
+    constructor(parent: any, options: any);
+}

package/src/QyLogFileSaver.js

@@ -8,7 +8,7 @@ import {
 
 class s extends e {
     constructor(e, s) {
-        super(e, "QyLogFileSaver_Worker.js", s = {
+        super(e, "QyLogFileSaver_Worker", s = {
             ...r("QyLogFileSaver"),
             ...s
         }, s, [], [ "switch", "save" ]);

package/src/QyLogFileSaver_Worker.d.ts

@@ -0,0 +1,8 @@
+import { QyMessageWorker } from "./QyMessageWorker.ts";
+export default class QyLogFileSaver_Worker extends QyMessageWorker {
+    constructor(options: any);
+    _op_start(logFilePath: any): Promise<void>;
+    _op_stop(): Promise<void>;
+    switch(logFilePath: any): Promise<void>;
+    save(changeId: any, data: any): void;
+}

package/src/QyLogFileSaver_Worker.js

@@ -10,7 +10,7 @@ import {
     QyBinWriter as r
 } from "./QyBinWriter.js";
 
-class i extends t {
+export default class extends t {
     constructor(t) {
         super(t = {
             ...s("QyLogFileSaver_Worker"),
@@ -31,6 +31,4 @@ class i extends t {
     save(t, s) {
         this.qyBinWriter.save(t, s);
     }
-}
-
-export default i;
+}

package/src/QyLogger.d.ts

@@ -0,0 +1,10 @@
+export declare const logger: {
+    currentLogLevel: number;
+    info: (...args: any[]) => void;
+    log: (...args: any[]) => void;
+    debug: (...args: any[]) => void;
+    warn: (...args: any[]) => void;
+    error: (...args: any[]) => void;
+};
+export declare function closeFileConsole(): void;
+export declare function setFileConsoleDateDirPath(dateDirPath: any, clearLogAtStart: any): void;

package/src/QyLogger.js

@@ -1,4 +1,4 @@
-import r from "node:fs";
+import o from "node:fs";
 
 import n from "node:path";
 
@@ -8,55 +8,55 @@ import {
 
 import {
     isMainThread as e,
-    threadId as o
+    threadId as r
 } from "node:worker_threads";
 
-let i = e ? "" : `W${o}:`, s = {
+let i = e ? "" : `W${r}:`, u = {
     Info: 0,
     Debug: 1,
     Warn: 2,
     Error: 3,
     None: 4
-}, l = {
-    verbose: s.Info,
-    info: s.Info,
-    log: s.Debug,
-    debug: s.Debug,
-    warn: s.Warn,
-    error: s.Error,
-    none: s.None
-}, a = Object.fromEntries(Object.entries(l).map(([ e, o ]) => [ o, e ])), c = {
-    currentLogLevel: s.Debug,
-    info: function() {
-        c.currentLogLevel == s.Info && b("info", arguments);
+}, c = {
+    verbose: u.Info,
+    info: u.Info,
+    log: u.Debug,
+    debug: u.Debug,
+    warn: u.Warn,
+    error: u.Error,
+    none: u.None
+}, s = Object.fromEntries(Object.entries(c).map(([ e, r ]) => [ r, e ])), l = {
+    currentLogLevel: u.Debug,
+    info: function(...e) {
+        l.currentLogLevel == u.Info && b("info", e);
     },
-    log: function() {
-        c.currentLogLevel <= s.Debug && b("log", arguments);
+    log: function(...e) {
+        l.currentLogLevel <= u.Debug && b("log", e);
     },
-    debug: function() {
-        c.currentLogLevel <= s.Debug && b("debug", arguments);
+    debug: function(...e) {
+        l.currentLogLevel <= u.Debug && b("debug", e);
     },
-    warn: function() {
-        c.currentLogLevel <= s.Warn && b("warn", arguments);
+    warn: function(...e) {
+        l.currentLogLevel <= u.Warn && b("warn", e);
     },
-    error: function() {
-        c.currentLogLevel <= s.Error && b("error", arguments);
+    error: function(...e) {
+        l.currentLogLevel <= u.Error && b("error", e);
     }
-}, u, g, f;
+}, a, g, f;
 
 function d() {
-    u = void 0, g && (g.close(), g = void 0), f && (f.close(), f = void 0);
+    a = void 0, g && (g.close(), g = void 0), f && (f.close(), f = void 0);
 }
 
-function L(e, o) {
+function L(e, r) {
     d();
-    o = {
-        flags: o ? "w" : "a",
+    r = {
+        flags: r ? "w" : "a",
         flush: !0,
         autoClose: !1
     };
-    g = r.createWriteStream(n.join(e, "stdout.txt"), o), f = r.createWriteStream(n.join(e, "stderr.txt"), o), 
-    u = new t({
+    g = o.createWriteStream(n.join(e, "stdout.txt"), r), f = o.createWriteStream(n.join(e, "stderr.txt"), r), 
+    a = new t({
         stdout: g,
         stderr: f,
         inspectOptions: {
@@ -66,22 +66,22 @@ function L(e, o) {
     });
 }
 
-function b(e, o) {
-    var r = new Error().stack.split("\n"), r = `${new Date().toISOString()} ${i}${/([^/\\()]+)\)?$/.exec(r[3])[1]}:${e}:`;
-    console[e](r, ...o), u && u[e](r, ...o);
+function b(e, r) {
+    var o = new Error().stack?.split("\n"), o = o && /([^/\\()]+)\)?$/.exec(o[3] ?? ""), o = (o && o[1]) ?? "", o = `${new Date().toISOString()} ${i}${o}:${e}:`;
+    console[e](o, ...r), a && a[e](o, ...r);
 }
 
-Object.defineProperty(c, "level", {
+Object.defineProperty(l, "level", {
     get() {
-        return a[c.currentLogLevel];
+        return s[l.currentLogLevel];
     },
     set(e) {
-        c.currentLogLevel = l[e];
+        l.currentLogLevel = c[e];
     }
-}), globalThis.logger = c;
+}), globalThis.logger = l;
 
 export {
-    c as logger,
-    L as setFileConsoleDateDirPath,
-    d as closeFileConsole
+    l as logger,
+    d as closeFileConsole,
+    L as setFileConsoleDateDirPath
 };

package/src/QyMessageWorker.d.ts

@@ -0,0 +1,5 @@
+import { QyOpRunner } from "./QyOpRunner.ts";
+export declare class QyMessageWorker extends QyOpRunner {
+    constructor(options: any, callOpNameList: any, castOpNameList: any);
+    castParent(opName: any, ...args: any[]): void;
+}

package/src/QyMessageWorker.js

@@ -1,5 +1,5 @@
 import {
-    parentPort as t
+    parentPort as o
 } from "node:worker_threads";
 
 import {
@@ -19,7 +19,7 @@ class e extends s {
         super(s = {
             ...a("QyMessageWorker"),
             ...s
-        }, e, r), t.on("message", async s => {
+        }, e, r), o.on("message", async s => {
             var {
                 opName: e,
                 _cast: r
@@ -27,13 +27,13 @@ class e extends s {
             if (e) {
                 var a = s.args || [];
                 try {
-                    var o = await this[e](...a);
-                    r || t.postMessage({
+                    var t = await this[e](...a);
+                    r || o.postMessage({
                         ack: e,
-                        result: o
+                        result: t
                     }), "stop" == e && process.exit();
                 } catch (s) {
-                    n.error(`Running ${e} failed:`, s), r || t.postMessage({
+                    n.error(`Running ${e} failed:`, s), r || o.postMessage({
                         ack: e,
                         exception: s
                     });
@@ -42,7 +42,7 @@ class e extends s {
         });
     }
     castParent(s, ...e) {
-        t.postMessage({
+        o.postMessage({
             opName: s,
             args: e,
             _cast: !0

package/src/QyMessager.d.ts

@@ -0,0 +1,7 @@
+export declare class QyMessager {
+    constructor(parent: any, workerTypeFileName: any, initArgMap: any, options: any, callOpNameList?: never[], castOpNameList?: never[]);
+    start(...args: any[]): any;
+    stop(...args: any[]): any;
+    castWorker(opName: any, args: any): void;
+    callWorker(opName: any, args: any): any;
+}

package/src/QyMessager.js

@@ -1,10 +1,11 @@
 import {
-    join as s
+    join as t,
+    extname as e
 } from "node:path";
 
 import {
     Worker as p,
-    setEnvironmentData as t
+    setEnvironmentData as s
 } from "node:worker_threads";
 
 import {
@@ -24,49 +25,51 @@ import {
     QyQueue as h
 } from "./QyQueue.js";
 
-class e {
-    constructor(e, r, s, t, o = [], a = []) {
-        t = {
+let k = e(import.meta.filename);
+
+class r {
+    constructor(e, r, t, s, o = [], a = []) {
+        s = {
             ...i("QyMessager"),
-            ...t
-        }, Object.assign(this, {
+            ...s
+        }, r += k, Object.assign(this, {
             parent: e,
             workerTypeFileName: r,
-            initArgMap: s,
-            options: t,
+            initArgMap: t,
+            options: s,
             receiverQueueMap: {}
         });
         for (let r of o) this[r] || (this[r] = (...e) => this.callWorker(r, e));
         for (let r of a) this[r] || (this[r] = (...e) => this.castWorker(r, e));
     }
     start(...e) {
-        this.started = !0, t("logLevel", n.level);
+        this.started = !0, s("logLevel", n.level);
         var i = this;
         if (!i.worker) {
             let {
-                workerTypeFileName: t,
+                workerTypeFileName: s,
                 initArgMap: e,
                 receiverQueueMap: o
             } = i;
             var r = {
-                workerTypeFileName: t,
+                workerTypeFileName: s,
                 initArgMap: e
             };
-            let a = i.worker = new p(s(m, "QyMessager_Run.js"), {
+            let a = i.worker = new p(t(m, "QyMessager_Run" + k), {
                 workerData: r
             });
             a.on("error", e => {
-                n.error(`Worker ${t} error:`, e);
+                n.error(`Worker ${s} error:`, e);
             }), a.on("message", e => {
                 var {
                     opName: r,
-                    ack: s,
-                    result: t
+                    ack: t,
+                    result: s
                 } = e;
-                r ? (e = e.args || [], (i.parent || i)[r](...e)) : o[s]?.shift().resolve(t);
+                r ? (e = e.args || [], (i.parent || i)[r](...e)) : o[t]?.shift().resolve(s);
             }), a.on("exit", e => {
-                for (var r in a.removeAllListeners(), 0 != e ? n.warn(`Worker ${t} stopped with exitCode ` + e) : n.info(`Worker ${t} stopped.`), 
-                o) for (var s = o[r]; !s.isEmpty; ) s.shift()?.resolve();
+                for (var r in a.removeAllListeners(), 0 != e ? n.warn(`Worker ${s} stopped with exitCode ` + e) : n.info(`Worker ${s} stopped.`), 
+                o) for (var t = o[r]; !t.isEmpty; ) t.shift()?.resolve();
                 i.worker = void 0;
             });
         }
@@ -84,21 +87,21 @@ class e {
     }
     callWorker(e, r) {
         var {
-            worker: s,
-            receiverQueueMap: t,
+            worker: t,
+            receiverQueueMap: s,
             options: o
         } = this;
-        s.postMessage({
+        t.postMessage({
             opName: e,
             args: r
         });
-        let a = t[e];
-        a = a || (t[e] = new h(o));
-        s = l({});
-        return a.push(s), s.promise;
+        let a = s[e];
+        a = a || (s[e] = new h(o));
+        t = l({});
+        return a.push(t), t.promise;
     }
 }
 
 export {
-    e as QyMessager
+    r as QyMessager
 };

package/src/QyMessager_Run.d.ts

@@ -0,0 +1 @@
+export {};

package/src/QyMessager_Run.js

@@ -1,26 +1,31 @@
+var t = this && this.__rewriteRelativeImportExtension || function(e, i) {
+    return "string" == typeof e && /^\.\.?\//.test(e) ? e.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(e, r, t, o, a) {
+        return r ? i ? ".jsx" : ".js" : !t || o && a ? t + o + "." + a.toLowerCase() + "js" : e;
+    }) : e;
+};
+
 import {
-    resolve as a,
     join as o
 } from "node:path";
 
 import {
-    getEnvironmentData as t,
+    getEnvironmentData as a,
     workerData as i
 } from "node:worker_threads";
 
 import {
-    logger as m
+    logger as s
 } from "./QyLogger.js";
 
 import {
-    __dirname as s
+    __dirname as n
 } from "./QyUtils.js";
 
 (async () => {
-    m.level = t("logLevel");
+    s.level = a("logLevel");
     var {
         workerTypeFileName: e,
         initArgMap: r
     } = i;
-    new (await import("file://" + a(o(s, e)))).default(r);
+    new (await import(t("file://" + o(n, e)))).default(r);
 })();

package/src/QyMod.d.ts

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

package/src/QyMod.js

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

package/src/QyOpRunner.d.ts

@@ -0,0 +1,10 @@
+import EventEmitter from "node:events";
+export declare class QyOpRunner extends EventEmitter {
+    constructor(options: any, callOpNameList?: never[], castOpNameList?: never[]);
+    get firstOp(): any;
+    get lastOp(): any;
+    finish(): any;
+    pushAndRunWithPromise(op: any): any;
+    pushAndRun(...ops: any[]): void;
+    run(): Promise<void>;
+}

package/src/QyOpRunner.js

@@ -1,7 +1,7 @@
-import s from "node:events";
+import t from "node:events";
 
 import {
-    setPromise as t
+    setPromise as s
 } from "./QyUtils.js";
 
 import {
@@ -9,23 +9,23 @@ import {
 } from "./QyLogger.js";
 
 import {
-    getDefaultOptions as r
+    getDefaultOptions as i
 } from "./QyDefaultOptions.js";
 
 import {
-    QyQueue as i
+    QyQueue as r
 } from "./QyQueue.js";
 
-class e extends s {
-    constructor(s, t = [], e = []) {
-        super(), s = {
-            ...r("QyOpRunner"),
-            ...s
+class e extends t {
+    constructor(t, s = [], e = []) {
+        super(), t = {
+            ...i("QyOpRunner"),
+            ...t
         }, Object.assign(this, {
-            options: s,
+            options: t,
             running: !1,
-            opQueue: new i(s)
-        }), n(this, t, !0), n(this, e), n(this, [ "start", "stop" ], !0);
+            opQueue: new r(t)
+        }), n(this, s, !0), n(this, e), n(this, [ "start", "stop" ], !0);
     }
     get firstOp() {
         return this.opQueue.first;
@@ -36,54 +36,54 @@ class e extends s {
     finish() {
         return this.lastOp?.promise || this.runningOp?.promise;
     }
-    pushAndRunWithPromise(s) {
-        return t(s), this.pushAndRun(s), s.promise;
+    pushAndRunWithPromise(t) {
+        return s(t), this.pushAndRun(t), t.promise;
     }
-    pushAndRun(...s) {
-        var t = this.opQueue, e = this.lastOp;
-        "_op_stop" === e?.opFunName ? (t.pop(), t.push(...s, e)) : t.push(...s), 
+    pushAndRun(...t) {
+        var s = this.opQueue, e = this.lastOp;
+        "_op_stop" === e?.opFunName ? (s.pop(), s.push(...t, e)) : s.push(...t), 
         this.run();
     }
     async run() {
         if (!this.running) {
             this.running = !0;
-            for (var s = this.opQueue; !s.isEmpty; ) {
-                var t = s.shift(), {
+            for (var t = this.opQueue; !t.isEmpty; ) {
+                var s = t.shift(), {
                     opFunName: e,
-                    eventName: r,
-                    resolve: i,
+                    eventName: i,
+                    resolve: r,
                     args: n
-                } = t;
+                } = s;
                 if (e) {
-                    this.runningOp = t;
+                    this.runningOp = s;
                     try {
                         var o = await (n ? this[e](...n) : this[e]());
-                        i && i(o), r && this.emit(r, o);
-                    } catch (s) {
-                        u.error(`Run ${e} failed:`, s), r && this.emit(r, s);
+                        r && r(o), i && this.emit(i, o);
+                    } catch (t) {
+                        u.error(`Run ${e} failed:`, t), i && this.emit(i, t);
                     }
                     this.runningOp = void 0;
-                } else i && i(), r && this.emit(r);
+                } else r && r(), i && this.emit(i);
             }
             this.running = !1;
         }
     }
 }
 
-function n(r, s, i) {
-    for (let e of s) {
-        let t = "_op_" + e;
-        if (r[e] || (r[e] = i ? (...s) => r.pushAndRunWithPromise({
+function n(i, t, r) {
+    for (let e of t) {
+        let s = "_op_" + e;
+        if (i[e] || (i[e] = r ? (...t) => i.pushAndRunWithPromise({
             opName: e,
-            opFunName: t,
-            args: s
-        }) : (...s) => r.pushAndRun({
+            opFunName: s,
+            args: t
+        }) : (...t) => i.pushAndRun({
             opName: e,
-            opFunName: t,
-            args: s
-        })), !r[t]) {
-            let s = r.constructor.name + " not implemented " + t;
-            r[t] = () => u.error(s), u.error(s);
+            opFunName: s,
+            args: t
+        })), !i[s]) {
+            let t = i.constructor.name + " not implemented " + s;
+            i[s] = () => u.error(t), u.error(t);
         }
     }
 }

package/src/QyQueue.d.ts

@@ -0,0 +1,11 @@
+export declare class QyQueue {
+    constructor(options: any);
+    get first(): any;
+    get last(): any;
+    get isEmpty(): boolean;
+    get waterMark(): any;
+    pop(): any;
+    reset(): void;
+    push(...args: any[]): void;
+    shift(): any;
+}

package/src/QySaver.d.ts

@@ -0,0 +1,10 @@
+export declare class QySaver {
+    constructor(dataFolder: any, options: any);
+    setDataFolder(dataFolder: any): this;
+    processAfterLoad(data: any): any;
+    processBeforeSave(data: any): Buffer<any>;
+    loadFromFile(fileName: any, defaultValue: any): Promise<any>;
+    saveToFile(data: any, fileName: any, override?: boolean): Promise<boolean>;
+    _saveTmpFileAndRename(contentBuffer: any, tmpFilePath: any, targetFilePath: any): Promise<boolean>;
+    _saveContent(filePath: any, contentBuffer: any): Promise<number | false>;
+}

package/src/QySnapshotCompactor.d.ts

@@ -0,0 +1,4 @@
+import { QyMessager } from "./QyMessager.ts";
+export declare class QySnapshotCompactor extends QyMessager {
+    constructor(parent: any, kvFolder: any, options: any);
+}

package/src/QySnapshotCompactor.js

@@ -8,7 +8,7 @@ import {
 
 class s extends o {
     constructor(o, s, t) {
-        super(o, "QySnapshotCompactor_Worker.js", {
+        super(o, "QySnapshotCompactor_Worker", {
             kvFolder: s,
             options: t = {
                 ...a("QySnapshotCompactor"),