datafolder 1.0.11 → 1.0.12

package/src/QyMessager.js

@@ -1,11 +1,11 @@
 import {
-    join as t,
+    join as s,
     extname as e
 } from "node:path";
 
 import {
-    Worker as p,
-    setEnvironmentData as s
+    Worker as l,
+    setEnvironmentData as o
 } from "node:worker_threads";
 
 import {
@@ -17,7 +17,7 @@ import {
 } from "./QyLogger.js";
 
 import {
-    setPromise as l,
+    setPromise as p,
     __dirname as m
 } from "./QyUtils.js";
 
@@ -32,50 +32,51 @@ class r {
     worker;
     receiverQueueMap;
     options;
-    constructor(e, r, t, s, o = [], a = []) {
+    constructor(e, r, s, o = [], t = [], a = this) {
         s = {
             ...i("QyMessager"),
             ...s
-        }, r += k, Object.assign(this, {
-            parent: e,
-            workerTypeFileName: r,
-            initArgMap: t,
+        }, Object.assign(this, {
+            workerMsgProcessor: a,
+            workerTypeFileName: e,
+            initArgMap: r,
             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));
+        for (let r of t) this[r] || (this[r] = (...e) => this.castWorker(r, e));
     }
     start(...e) {
-        this.started = !0, s("logLevel", n.level);
-        var i = this;
-        if (!i.worker) {
+        this.started = !0, o("logLevel", n.level);
+        var p = this;
+        if (!p.worker) {
             let {
-                workerTypeFileName: s,
+                workerMsgProcessor: t,
+                workerTypeFileName: o,
                 initArgMap: e,
-                receiverQueueMap: o
-            } = i;
+                receiverQueueMap: a
+            } = p;
             var r = {
-                workerTypeFileName: s,
+                workerTypeFileName: o,
                 initArgMap: e
             };
-            let a = i.worker = new p(t(m, "QyMessager_Run" + k), {
+            let i = p.worker = new l(s(m, "QyMessager_Run" + k), {
                 workerData: r
             });
-            a.on("error", e => {
-                n.error(`Worker ${s} error:`, e);
-            }), a.on("message", e => {
+            i.on("error", e => {
+                n.error(`Worker ${o} error:`, e);
+            }), i.on("message", e => {
                 var {
                     opName: r,
-                    ack: t,
-                    result: s
+                    ack: s,
+                    result: o
                 } = e;
                 r ? "%o_" == r ? n.handleOutMsg(e) : "%e_" == r ? n.handleErrMsg(e) : (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 ${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;
+                t[r](...e)) : a[s]?.shift().resolve(o);
+            }), 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();
+                p.worker = void 0;
             });
         }
         return this.callWorker("start", e);
@@ -92,18 +93,18 @@ class r {
     }
     callWorker(e, r) {
         var {
-            worker: t,
-            receiverQueueMap: s,
-            options: o
+            worker: s,
+            receiverQueueMap: o,
+            options: t
         } = this;
-        t.postMessage({
+        s.postMessage({
             opName: e,
             args: r
         });
-        let a = s[e];
-        a = a || (s[e] = new h(o));
-        t = l({});
-        return a.push(t), t.promise;
+        let a = o[e];
+        a = a || (o[e] = new h(t));
+        s = p({});
+        return a.push(s), s.promise;
     }
 }
 

package/src/QyMessager_Run.js

@@ -1,15 +1,16 @@
 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;
+    return "string" == typeof e && /^\.\.?\//.test(e) ? e.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(e, r, t, a, o) {
+        return r ? i ? ".jsx" : ".js" : !t || a && o ? t + a + "." + o.toLowerCase() + "js" : e;
     }) : e;
 };
 
 import {
-    join as o
+    extname as e,
+    join as a
 } from "node:path";
 
 import {
-    getEnvironmentData as a,
+    getEnvironmentData as o,
     workerData as i
 } from "node:worker_threads";
 
@@ -22,11 +23,13 @@ import {
     __dirname as m
 } from "./QyUtils.js";
 
+let l = e(import.meta.filename);
+
 (async () => {
-    s.level = a("logLevel");
+    s.level = o("logLevel");
     var {
         workerTypeFileName: e,
         initArgMap: r
     } = i;
-    new (await import(t("file://" + o(m, e)))).default(r), s.log("" + n + e);
+    new (await import(t("file://" + a(m, e + l)))).default(r), s.log("" + n + e);
 })();

package/src/QyQueue.js

@@ -1,12 +1,8 @@
-import {
-    arrayLast as t
-} from "./QyUtils.js";
-
 import {
     getDefaultOptions as e
 } from "./QyDefaultOptions.js";
 
-class s {
+class t {
     options;
     queue = [];
     firstIdx = 0;
@@ -21,7 +17,7 @@ class s {
         return this.queue[this.firstIdx];
     }
     get last() {
-        return this.isEmpty ? void 0 : t(this.queue);
+        return this.isEmpty ? void 0 : this.queue.at(-1);
     }
     get isEmpty() {
         return this.firstIdx >= this.queue.length;
@@ -44,15 +40,15 @@ class s {
         if (!this.isEmpty) {
             var t = this.first, e = this, {
                 queue: s,
-                firstIdx: r,
-                options: i
-            } = e, u = s.length, h = r + 1;
+                firstIdx: i,
+                options: r
+            } = e, u = s.length, h = i + 1;
             if (u <= h) e.reset(); else {
                 var a = u - h;
-                if (h > i.maxLenBeforeRecycle || a <= 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;
-                } else e.firstIdx = h, s[r] = void 0;
+                } else e.firstIdx = h, s[i] = void 0;
             }
             return t;
         }
@@ -60,5 +56,5 @@ class s {
 }
 
 export {
-    s as QyQueue
+    t as QyQueue
 };

package/src/QySaver.d.ts

@@ -6,7 +6,7 @@ export declare class QySaver {
     processAfterLoad(data: any): any;
     processBeforeSave(data: any): Buffer<any>;
     removeFile(fileName: any): Promise<void>;
-    loadFromFile(fileName: any, defaultValue: any): Promise<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/QySaver.js

@@ -53,7 +53,7 @@ class i {
             m.warn(`Deleting ${r} failed:`, e);
         }
     }
-    async loadFromFile(r, t) {
+    async loadFromFile(r, t = void 0) {
         r = f(this.dataFolder, r);
         if (null != t && !await u(r)) return t;
         try {

package/src/QySnapshotCompactor.js

@@ -8,13 +8,13 @@ import {
 
 class s extends o {
     constructor(o, s, t) {
-        super(o, "QySnapshotCompactor_Worker", {
+        super("QySnapshotCompactor_Worker", {
             kvFolder: s,
             options: t = {
                 ...a("QySnapshotCompactor"),
                 ...t
             }
-        }, t, [], [ "compactSnapshots", "saveSnapshotInfos" ]);
+        }, t, [], [ "compactSnapshots", "saveSnapshotInfos" ], o);
     }
 }
 

package/src/QySnapshotCompactor_Worker.js

@@ -125,7 +125,7 @@ export default class extends a {
                 combinedSnapshotNumVerList: p,
                 posMap: n.posMap
             };
-        })(this, s, t)), await Promise.all(e), this.castParent("onCompactUpdates", t);
+        })(this, s, t)), await Promise.all(e), this.postParent("onCompactUpdates", t);
     }
     async _op_saveSnapshotInfos() {
         var a, s, {

package/src/QySnapshotSaver.js

@@ -8,13 +8,13 @@ import {
 
 class e extends s {
     constructor(s, e, a) {
-        super(s, "QySnapshotSaver_Worker", {
+        super("QySnapshotSaver_Worker", {
             kvFolder: e,
             options: a = {
                 ...o("QySnapshotSaver"),
                 ...a
             }
-        }, a, [], [ "saveSnapshot", "castSave", "releaseSnapshot" ]);
+        }, a, [], [ "saveSnapshot", "castSave", "releaseSnapshot" ], s);
     }
 }
 

package/src/QySnapshotSaver_Worker.js

@@ -113,7 +113,7 @@ export default class extends a {
         })(this)).prefixPM, delete (u = {
             ...s
         }).keyValueMap, delete s.posMap, s.isOut = !0, m.info("Sending snapshot " + s.snapshotNum)), 
-        this.castParent("onSnapshotSavedChangeId", t, u);
+        this.postParent("onSnapshotSavedChangeId", t, u);
     }
 }
 

package/src/QyTrigger.d.ts

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

package/src/QyTrigger.js

@@ -11,7 +11,6 @@ import {
     isEmptyObj as e,
     isMatchName as l,
     getMatchParam as d,
-    arrayLast as f,
     propNameJoin as v
 } from "./QyUtils.js";
 
@@ -21,7 +20,7 @@ import {
 
 let y = Array.isArray;
 
-class h {
+class f {
     name;
     parent;
     children = {};
@@ -32,12 +31,12 @@ class h {
             parent: r
         });
     }
-    insertTrigger(e, r, t, a) {
+    insertTrigger(e, r, t, a = void 0) {
         let i = this;
-        for (var s of r) {
-            l(s) && (s = "*");
-            var o = i.children;
-            i = o[s] || (o[s] = new h(s, i));
+        for (var o of r) {
+            l(o) && (o = "*");
+            var s = i.children;
+            i = s[o] || (s[o] = new f(o, i));
         }
         var n = i.triggerMap, g = n[e];
         g ? Object.assign(g, {
@@ -45,7 +44,7 @@ class h {
             fileNamePath: r,
             propNamePathList: t,
             fun: a
-        }) : n[e] = new m(e, r, t, a);
+        }) : n[e] = new h(e, r, t, a);
     }
     removeTrigger(e, r) {
         let t = this;
@@ -74,7 +73,7 @@ class h {
     }
 }
 
-class m {
+class h {
     triggerName;
     fileNamePath;
     propNamePathList;
@@ -91,11 +90,11 @@ class m {
         var t, {
             triggerName: a,
             fileNamePath: i,
-            propNamePathList: s,
-            fun: o
+            propNamePathList: o,
+            fun: s
         } = this, n = e.fileContent;
         let g;
-        for (t of s) {
+        for (t of o) {
             var l = c(r.oldValue, t), f = c(r.newValue, t);
             p(l, f) || (l = {
                 oldValue: l,
@@ -108,14 +107,14 @@ class m {
         if (g) {
             var {
                 namePath: h,
-                qyCache: s
+                qyCache: o
             } = e;
             for (let e = 0; e < h.length; ++e) {
                 var m = d(i[e]);
                 m && (g[m] = h[e]);
             }
             try {
-                o && o(g), s.emit(a, g);
+                s && s(g), o.emit(a, g);
             } catch (e) {
                 N.error(`Running trigger ${a} failed:`, g, e);
             }
@@ -125,7 +124,7 @@ class m {
 
 let t = [];
 
-function P(e, r) {
+function m(e, r) {
     return e ? l(r) ? Object.values(e) : (e = e[r]) ? [ e ] : t : t;
 }
 
@@ -133,18 +132,18 @@ function r(e, a) {
     if (0 != a.length) {
         let r = [ e ], t = [];
         for (let e = 0; e < a.length - 1; ++e) {
-            var i, s = a[e];
-            for (i of r) for (var o of P(i.subdirMap, s)) i.setChildTriggerNodes(o), 
-            t.push(o);
+            var i, o = a[e];
+            for (i of r) for (var s of m(i.subdirMap, o)) i.setChildTriggerNodes(s), 
+            t.push(s);
             if (0 == t.length) return;
             [ r, t ] = [ t, r ], t.length = 0;
         }
-        var n, g = f(a);
-        for (n of r) for (var l of P(n.fileMap, g)) n.setChildTriggerNodes(l);
+        var n, g = a.at(-1);
+        for (n of r) for (var l of m(n.fileMap, g)) n.setChildTriggerNodes(l);
     }
 }
 
 export {
-    h as QyTriggerNode,
+    f as QyTriggerNode,
     r as updateTriggerNodes
 };

package/src/QyUtils.d.ts

@@ -7,6 +7,7 @@ export declare const SpecialFilePaths: {
     TriggerDirPath: string[];
     RpcDirPath: string[];
     IndexDirPath: string[];
+    ExpireDirPath: string[];
     IndexPropPathsFileName: string;
 };
 export declare function isMatchName(name: any): any;
@@ -18,7 +19,6 @@ export declare function getSubdirMapKey(fullPathHash: any): string;
 export declare function getFileMapKey(fullPathHash: any): string;
 export declare function getContentKey(fullPathHash: any): string;
 export declare function getRandomStr(byteCount?: number): string;
-export declare function arrayLast(array: any): any;
 export declare function isEmptyObj(obj: any): boolean;
 export declare function isNotNullObj(item: any): boolean;
 export declare function isString(item: any): item is string;
@@ -40,7 +40,7 @@ export declare function unlockExclusiveFilePath(exclusiveFilePath: any): void;
 export declare function fromSingleName(name: any): any;
 export declare function toSingleName(list: any): any;
 export declare function pathSplit(itemPath: any): any;
-export declare function propNameSplit(propNameStr: any): any;
+export declare function ensurePropNamePathList(propNamePathList: any): any[] | undefined;
 export declare function propNameJoin(propName: any): any;
 export declare function randomInt(max: any, min?: number): number;
 export declare function listToMap(list: any): {};
@@ -50,4 +50,5 @@ export declare function loadFileList(fileList: any, preloadCount?: number): Asyn
     filePath: any;
     bin: any;
 }, void, unknown>;
+export declare function getNowSeconds(now?: Date): number;
 export * as default from "./QyUtils.ts";