datafolder 1.0.12 → 1.0.14

package/src/QyBatch.js

@@ -3,38 +3,39 @@ import {
 } from "node:util";
 
 import {
-    mergeContentAndGenDelta as c,
+    mergeContentAndGenDelta as l,
     objToDelMarks as r
 } from "./QyFileContentUtils.js";
 
 import {
-    pathSplit as n,
-    ensurePropNamePathList as a,
-    isString as o,
+    pathSplit as o,
+    ensurePropNamePathList as n,
+    isString as c,
     SpecialOperators as e,
     getSuffix as g,
     SpecialFilePaths as t,
     toSingleName as C,
-    isSimpleType as l,
-    getNowSeconds as h,
-    isEmptyObj as d
+    isSimpleType as h,
+    isEmptyObj as d,
+    isNumber as a,
+    getNowRounded as m
 } from "./QyUtils.js";
 
 import {
     QyAclCmdGenerator as i,
-    CmdNames as m
+    CmdNames as u
 } from "./QyAcl.js";
 
 import {
-    calDifferenceList as u
+    calDifferenceList as f
 } from "./QyIndex.js";
 
 import {
-    getDefaultOptions as f
+    getDefaultOptions as p
 } from "./QyDefaultOptions.js";
 
 import {
-    QyCD as p
+    QyCD as v
 } from "./QyCD.js";
 
 import {
@@ -42,12 +43,10 @@ import {
 } from "./QyIndexPropTree.js";
 
 import {
-    logger as v
+    logger as _
 } from "./QyLogger.js";
 
-import {
-    flatObj as _
-} from "./QyExpire.js";
+import "node:process";
 
 let D = Array.isArray, x = e.$del, O = t.IndexPropPathsFileName, F = {
     none: 0,
@@ -56,7 +55,7 @@ let D = Array.isArray, x = e.$del, O = t.IndexPropPathsFileName, F = {
     all: 3
 };
 
-class L extends p {
+class L extends v {
     fileLogLevel;
     actionQueue;
     changeId;
@@ -67,7 +66,7 @@ class L extends p {
     running;
     constructor(e, t) {
         super(e), t = {
-            ...f("QyBatch"),
+            ...p("QyBatch"),
             ...t
         };
         e = F[t.fileLogLevel.toLowerCase()];
@@ -82,81 +81,100 @@ class L extends p {
         });
     }
     createDir(e, t = this.currentDir) {
-        return o(e) && (e = n(e)), q(this, "createDir", this.qyCache?.getOrCreateDir(e, t));
+        return c(e) && (e = o(e)), N(this, "createDir", this.qyCache.getOrCreateDir(e, t));
     }
     delDir(e, t = this.currentDir) {
-        return o(e) && (e = n(e)), q(this, "delDir", this.qyCache.getOrCreateDir(e, t));
+        return c(e) && (e = o(e)), N(this, "delDir", this.qyCache.getOrCreateDir(e, t).ensureAllLoaded());
     }
     createFile(e, t = this.currentDir) {
-        return o(e) && (e = n(e)), q(this, "createFile", this.qyCache.getOrCreateFile(e, t));
+        return c(e) && (e = o(e)), N(this, "createFile", this.qyCache.getOrCreateFile(e, t).ensureLoaded());
     }
     delFile(e, t = this.currentDir) {
-        return o(e) && (e = n(e)), q(this, "delFile", this.qyCache.getOrCreateFile(e, t));
+        return c(e) && (e = o(e)), N(this, "delFile", this.qyCache.getOrCreateFile(e, t).ensureLoaded());
     }
     expireFile(e, t, i = this.currentDir) {
-        return o(e) && (e = n(e)), this.expireContent(e, {
-            "": t
-        }, i);
+        return this.expireFileM(e, 1e3 * t, i);
+    }
+    expireFileM(e, t, i = this.currentDir) {
+        return M(this, e, t, "f", i);
+    }
+    expireDir(e, t, i = this.currentDir) {
+        return this.expireDirM(e, 1e3 * t, i);
+    }
+    expireDirM(e, t, i = this.currentDir) {
+        return M(this, e, t, "d", i);
     }
-    expireContent(e, t, i = this.currentDir) {
-        return o(e) && (e = n(e)), q(this, "expireContent", this.qyCache.getOrCreateFile(e, i), {
-            expireInfoObj: t
+    expireContent(e, t, i, r = this.currentDir) {
+        c(e) && (e = o(e));
+        e = this.qyCache.getOrCreateFile(e, r).ensureLoaded();
+        return N(this, "expireContent", e, {
+            expireInfoObj: t,
+            isMilliSecond: i
         });
     }
-    removeFileExpire(e, t = this.currentDir) {
-        return this.removeContentExpire(e, {
-            "": 1
-        }, !1, t);
+    expireContentM(e, t, i = this.currentDir) {
+        return this.expireContent(e, t, !0, i);
+    }
+    removeFileExpire(e, t = !1, i = this.currentDir) {
+        return E(this, e, "f", t, i);
+    }
+    removeDirExpire(e, t = !1, i = this.currentDir) {
+        return E(this, e, "d", t, i);
     }
     removeContentExpire(e, t, i = !1, r = this.currentDir) {
-        return o(e) && (e = n(e)), q(this, "removeContentExpire", this.qyCache.getOrCreateFile(e, r), {
+        c(e) && (e = o(e));
+        e = this.qyCache.getOrCreateFile(e, r).ensureLoaded();
+        return N(this, "removeContentExpire", e, {
             expireInfoObj: t,
             infoFileOnly: i
         });
     }
     createIndex(e, t, i = this.currentDir) {
-        return o(e) && (e = n(e)), D(t) || (t = [ t ]), q(this, "createIndex", this.qyCache?.getOrCreateDir(e, i), {
+        return c(e) && (e = o(e)), D(t) || (t = [ t ]), N(this, "createIndex", this.qyCache.getOrCreateDir(e, i), {
             indexPropPathList: t
         });
     }
     delIndex(e, t, i = this.currentDir) {
-        return o(e) && (e = n(e)), q(this, "delIndex", this.qyCache.getOrCreateDir(e, i), {
+        return c(e) && (e = o(e)), N(this, "delIndex", this.qyCache.getOrCreateDir(e, i), {
             indexPropPath: t
         });
     }
-    insert(e, t, i = !1, r = this.currentDir) {
-        return o(e) && (e = n(e)), q(this, "insert", this.qyCache.getOrCreateFile(e, r), {
-            content: i || l(t) ? t : structuredClone(t)
+    insert(e, t, i = !1, r = !1, n = this.currentDir) {
+        c(e) && (e = o(e));
+        e = this.qyCache.getOrCreateFile(e, n).ensureLoaded();
+        return N(this, "insert", e, {
+            content: i || h(t) ? t : structuredClone(t),
+            noCreate: r
         });
     }
     remove(e, t, i = this.currentDir) {
-        return this.insert(e, r(t), !0, i);
+        return this.insert(e, r(t), !0, !0, i);
     }
-    replace(e, t, i = this.currentDir) {
+    put(e, t, i = !1, r = this.currentDir) {
         return this.insert(e, {
             $rpl: t
-        }, !0, i);
+        }, i, !1, r);
     }
     delContent(e, t = this.currentDir) {
-        return o(e) && (e = n(e)), q(this, "delContent", this.qyCache.getOrCreateFile(e, t));
+        return c(e) && (e = o(e)), N(this, "delContent", this.qyCache.getOrCreateFile(e, t).ensureLoaded());
     }
     insertTrigger(e, t, i, r) {
-        return o(t) && (t = n(t)), i = a(i), q(this, "insertTrigger", this.qyCache.getOrCreateTriggerFile(e), {
+        return c(t) && (t = o(t)), i = n(i), N(this, "insertTrigger", this.qyCache.getOrCreateTriggerFile(e), {
             fileNamePath: t,
             propNamePathList: i,
             modCode: r
         });
     }
     removeTrigger(e) {
-        return q(this, "removeTrigger", this.qyCache.getOrCreateTriggerFile(e));
+        return N(this, "removeTrigger", this.qyCache.getOrCreateTriggerFile(e));
     }
     insertRpc(e, t) {
-        return q(this, "insertRpc", this.qyCache.getOrCreateRpcFile(e), {
+        return N(this, "insertRpc", this.qyCache.getOrCreateRpcFile(e), {
             modCode: t
         });
     }
     removeRpc(e) {
-        return q(this, "removeRpc", this.qyCache.getOrCreateRpcFile(e));
+        return N(this, "removeRpc", this.qyCache.getOrCreateRpcFile(e));
     }
     run(e = !1) {
         var {
@@ -174,17 +192,17 @@ class L extends p {
             changeList: i,
             qyAclCmdGenerator: o,
             qyCmdObjHistory: s,
-            syncList: c
-        } = this, l = i.length;
-        if (0 == l) return n.decreaseChangeId(), 0;
-        var h = g(l), o = o.takeCmdArgAsListObj();
+            syncList: l
+        } = this, c = i.length;
+        if (0 == c) return n.decreaseChangeId(), 0;
+        var h = g(c), o = o.takeCmdArgAsListObj();
         let d;
         0 < r && (r = i.map(({
             logStr: e
-        }) => e).join("\n"), d = new Date().toISOString() + `: ${l} change${h}:
+        }) => e).join("\n"), d = new Date().toISOString() + `: ${c} change${h}:
 ${r}
 `);
-        var m, u, l = n.save(t, o, d, (e => {
+        var m, u, c = n.save(t, o, d, (e => {
             var t = e.syncList, i = t.length;
             for (let e = 0; e < i; e += 2) {
                 var r, n = e + 1, a = t[e], o = t[n];
@@ -192,7 +210,7 @@ ${r}
                 t[n] = 0 < r.length ? r : void 0) : t[n] = o.fileContent;
             }
             if (0 < i) return t;
-        })(this), e), h = (c.length = 0, s.push(o), i.filter(({
+        })(this), e), h = (l.length = 0, s.push(o), i.filter(({
             item: e,
             delta: t
         }) => t && 0 < e.triggerNodes?.length));
@@ -201,7 +219,7 @@ ${r}
             item: m,
             delta: u
         } of h) for (var f of m.triggerNodes) f.checkTrigger(m, u);
-        return e ? l : t;
+        return e ? c : t;
     }
     getTopHistoryCmdObj() {
         return this.qyCmdObjHistory.top();
@@ -261,15 +279,15 @@ ${r}
             qyIndexPropTree: o
         } = (n.created || this._action_createFile({
             item: n
-        }), n), s = [], c = {};
+        }), n), s = [], l = {};
         for (e of i) {
-            var l = C(e);
-            a && a[l] || (s.push(e), c[l] = 1, o.insert(e));
+            var c = C(e);
+            a && a[c] || (s.push(e), l[c] = 1, o.insert(e));
         }
         if (0 != s.length) {
-            v.log(`Creating index ${JSON.stringify(s)} for ` + t.fullPath), this._action_insert({
+            _.log(`Creating index ${JSON.stringify(s)} for ` + t.fullPath), this._action_insert({
                 item: n,
-                content: c
+                content: l
             });
             {
                 var h, d = this, m = t, u = r, i = y(s);
@@ -285,7 +303,7 @@ ${r}
                                 fileContent: g,
                                 name: p
                             } = g;
-                            null != g && I(d, f, h, p, void 0, g);
+                            null != g && b(d, f, h, p, void 0, g);
                         }
                     }
                 }
@@ -320,7 +338,7 @@ ${r}
             parentDir: r,
             name: n
         } = i;
-        return i.created = !1, N(this, e), t || P(this, r, m.R, r.fileMapKey, n), 
+        return i.created = !1, I(this, e), t || q(this, r, u.R, r.fileMapKey, n), 
         !0;
     }
     _action_delDir(e) {
@@ -336,66 +354,71 @@ ${r}
             fileMapKey: s
         } = t;
         if (a) {
-            P(this, t, m.D, s);
-            for (var c of t.fileList) this._action_delFile({
-                item: c
+            q(this, t, u.D, s);
+            for (var l of t.fileList) this._action_delFile({
+                item: l
             }, !0);
         }
         if (n) {
-            P(this, t, m.D, o);
-            for (var l of t.allSubdirs()) {
+            q(this, t, u.D, o);
+            for (var c of t.allSubdirs()) {
                 let {
                     subdirMap: e,
                     fileMap: t,
                     subdirMapKey: i,
                     fileMapKey: r
-                } = l;
-                if (e && P(this, l, m.D, i), t) {
-                    P(this, l, m.D, r);
-                    for (var h of l.fileList) this._action_delFile({
+                } = c;
+                if (e && q(this, c, u.D, i), t) {
+                    q(this, c, u.D, r);
+                    for (var h of c.fileList) this._action_delFile({
                         item: h
                     }, !0);
                 }
-                N(this, {
+                I(this, {
                     actionName: "delDir",
-                    item: l
-                }), l.created = !1;
+                    item: c
+                }), c.created = !1;
             }
         }
-        return !!i && (t.created = !1, N(this, e), P(this, i, m.R, i.subdirMapKey, r), 
+        return !!i && (t.created = !1, I(this, e), q(this, i, u.R, i.subdirMapKey, r), 
         !0);
     }
     _action_delContent(e) {
         e.actionName = "delContent";
         var t = e.item, i = t.fileContent;
-        return null != i && (t.setContent(void 0), Object.assign(e, {
+        return null != i && (t.fileContent = void 0, Object.assign(e, {
             content: i,
             delta: {
                 oldValue: i,
                 newValue: x
             }
-        }), N(this, e), P(this, t, m.D, t.fileContentKey), b(this, t, i), !0);
+        }), I(this, e), q(this, t, u.D, t.fileContentKey), P(this, t, i), !0);
     }
     _action_insert(e) {
         e.actionName = "insert";
         var {
             item: t,
-            content: i
+            content: i,
+            noCreate: r
         } = e;
-        if (null == i) return v.warn(`Saving undefined to ${t.fullPath}. Not making any change.`), 
+        if (null == i) return _.warn(`Saving undefined to ${t.fullPath}. Not making any change.`), 
         !1;
-        t.created || this._action_createFile({
-            item: t
-        });
-        var r, n, i = c(t.fileContent, i), {
-            merged: a,
+        if (!t.created) {
+            if (r) return !1;
+            this._action_createFile({
+                item: t
+            });
+        }
+        var n, a, r = l(t.fileContent, i), {
+            merged: i,
             delta: o
-        } = i;
+        } = r;
         return !!o && ({
             oldValue: o,
-            newValue: r
-        } = o, !!r) && (n = t.fileContentKey, null == a ? P(this, t, m.D, n) : P(this, t, m.M, n, r), 
-        Object.assign(e, i), N(this, e), t.setContent(a), b(this, t, o, r, a), !0);
+            newValue: n
+        } = o, !!n) && (a = t.fileContentKey, null == i ? q(this, t, u.D, a) : q(this, t, u.M, a, n), 
+        Object.assign(e, r), I(this, e), t.fileContent = i, P(this, t, o, n, i), 
+        !0);
     }
     _action_createFile(e) {
         e.actionName = "createFile";
@@ -405,7 +428,7 @@ ${r}
         }), Object.assign(i, {
             created: !0,
             fileContentLoaded: !0
-        }), N(this, e), P(this, t, m.A, t.fileMapKey, i.name), !0);
+        }), I(this, e), q(this, t, u.A, t.fileMapKey, i.name), !0);
     }
     _action_createDir(e) {
         e.actionName = "createDir";
@@ -417,52 +440,83 @@ ${r}
                 created: !0,
                 subdirMapLoaded: !0,
                 fileMapLoaded: !0
-            }), N(this, {
+            }), I(this, {
                 actionName: "createDir",
                 item: e
             });
             var r = e.parentDir;
-            P(this, r, m.A, r.subdirMapKey, e.name);
+            q(this, r, u.A, r.subdirMapKey, e.name);
         }
         return !0;
     }
-    _action_expireContent(e) {
-        e.actionName = "expireContent";
+    _action_expireItem(e) {
+        e.actionName = "expireItem";
         var t, {
             item: e,
-            expireInfoObj: i
-        } = e, r = h(), n = _(i);
-        for (t in n) n[t] += r;
-        var i = this.qyCache, a = i.getOrCreateExpireInfoFile(e.fullPathHash), a = this._action_insert({
-            item: a,
+            milliSecond: i
+        } = e, {
+            parentDir: r,
+            name: n
+        } = e;
+        return !!r && null != (i = T(i, !0, m())) && (t = this.qyCache, r = t.getOrCreateExpireInfoFile(r.fullPathHash, e.isFile ? "f" : "d"), 
+        (r = this._action_insert({
+            item: r,
             content: {
-                ...n
+                [n]: i
             }
-        });
-        return a && i.monitorContentExpire(e, n), a;
+        })) && t.monitorItemExpire(e, i), r);
     }
-    _action_removeContentExpire(t) {
-        t.actionName = "removeContentExpire";
-        var {
+    _action_removeItemExpire(e) {
+        e.actionName = "removeItemExpire";
+        var t, {
+            item: e,
+            infoFileOnly: i
+        } = e, {
+            parentDir: r,
+            name: n
+        } = e;
+        return !!r && (t = this.qyCache, !!(r = t.getExpireInfoFile(r.fullPathHash, e.isFile ? "f" : "d"))) && ((n = this._action_insert({
+            item: r,
+            content: {
+                [n]: x
+            }
+        })) && (d(r.fileContent) && this._action_delFile({
+            item: r
+        }), i || t.unmonitorItemExpire(e)), n);
+    }
+    _action_expireContent(e) {
+        e.actionName = "expireContent";
+        let {
             item: t,
             expireInfoObj: i,
+            isMilliSecond: r
+        } = e, n = m();
+        var e = S(i, e => T(e, r, n)), a = this.qyCache, o = a.getOrCreateExpireInfoFile(t.fullPathHash, "c"), o = this._action_insert({
+            item: o,
+            content: {
+                ...e
+            }
+        });
+        return o && a.monitorContentExpire(t, e), o;
+    }
+    _action_removeContentExpire(e) {
+        e.actionName = "removeContentExpire";
+        var t, {
+            item: e,
+            expireInfoObj: i,
             infoFileOnly: r
-        } = t, n = this.qyCache, a = n.getExpireInfoFile(t.fullPathHash);
-        if (a.created) {
-            let e;
-            if (D(i)) e = Object.fromEntries(i.map(e => [ e, x ])); else for (var o in e = _(i)) e[o] ? e[o] = x : delete e[o];
-            i = this._action_insert({
-                item: a,
-                content: e
-            });
-            return i && (d(a.fileContent) && this._action_delFile({
-                item: a
-            }), r || n.unmonitorContentExpire(t, e)), i;
-        }
+        } = e, n = this.qyCache, a = n.getExpireInfoFile(e.fullPathHash, "c");
+        return !!a && (i = D(i) ? Object.fromEntries(i.map(e => [ e, x ])) : S(i, e => e ? x : void 0), 
+        (t = this._action_insert({
+            item: a,
+            content: i
+        })) && (d(a.fileContent) && this._action_delFile({
+            item: a
+        }), r || n.unmonitorContentExpire(e, i)), t);
     }
 }
 
-function q(e, t, i, r) {
+function N(e, t, i, r) {
     return e.actionQueue.push({
         actionName: t,
         item: i,
@@ -470,7 +524,7 @@ function q(e, t, i, r) {
     }), e;
 }
 
-function N(e, t) {
+function I(e, t) {
     var {
         changeList: e,
         fileLogLevel: i
@@ -494,7 +548,7 @@ function N(e, t) {
     })(t, i)), e.push(t);
 }
 
-function P(e, t, i, r, n = void 0) {
+function q(e, t, i, r, n = void 0) {
     var {
         qyAclCmdGenerator: e,
         qyCache: a,
@@ -505,7 +559,7 @@ function P(e, t, i, r, n = void 0) {
     a && a.qyKVData.removeKey(r) && o.push(r, t);
 }
 
-function b(e, t, i, r = void 0, n = void 0) {
+function P(e, t, i, r = void 0, n = void 0) {
     var {
         underHiddenFolder: t,
         name: a,
@@ -515,26 +569,26 @@ function b(e, t, i, r = void 0, n = void 0) {
         var s = e.qyCache.getIndexDir(o);
         if (s) {
             t = s.getFile(O);
-            if (t) for (var c of t.qyIndexPropTree.getAllIndexPropPaths()) I(e, s.searchOrCreateSubdir(c), c, a, i, r, n);
+            if (t) for (var l of t.qyIndexPropTree.getAllIndexPropPaths()) b(e, s.searchOrCreateSubdir(l), l, a, i, r, n);
         }
     }
 }
 
-function I(t, e, i, r, n, a, o = void 0) {
-    e = u(e, i, r, n, a, o);
+function b(t, e, i, r, n, a, o = void 0) {
+    e = f(e, i, r, n, a, o);
     if (e) {
-        var s, c, l, {
+        var s, l, c, {
             toAddFileList: i,
             toDelFileList: r
         } = e;
         for (s of i) t._action_createFile({
             item: s
         });
-        for (c of r) t._action_delFile({
-            item: c
+        for (l of r) t._action_delFile({
+            item: l
         });
-        for (l of r) {
-            let e = l.parentDir;
+        for (c of r) {
+            let e = c.parentDir;
             for (;e.created && !e.isHiddenFolder && e.isEmpty; ) t._action_delDir({
                 item: e
             }), e = e.parentDir;
@@ -570,6 +624,35 @@ class j {
     }
 }
 
+function S(e, t = void 0, i = [], r = {}) {
+    if (h(e)) {
+        var n = t ? t(e) : e;
+        null != n && (r[JSON.stringify(i)] = n);
+    } else {
+        var a, o = i.length;
+        for (a in e) i.push(a), S(e[a], t, i, r), i.length = o;
+    }
+    return r;
+}
+
+function T(e, t, i) {
+    return a(e) ? (t ? e : 1e3 * e) + i : c(e) ? (t = new Date(e).getTime(), isNaN(t) || t <= i ? void 0 : t) : !(e instanceof Date) || (t = e.getTime()) <= i ? void 0 : t;
+}
+
+function M(e, t, i, r, n) {
+    var a = e.qyCache, r = (c(t) && (t = o(t)), "f" == r ? a.getOrCreateFile(t, n) : a.getOrCreateDir(t, n));
+    return N(e, "expireItem", r, {
+        milliSecond: i
+    });
+}
+
+function E(e, t, i, r, n) {
+    var a = e.qyCache, i = (c(t) && (t = o(t)), "f" == i ? a.getOrCreateFile(t, n) : a.getOrCreateDir(t, n));
+    return N(e, "removeItemExpire", i, {
+        infoFileOnly: r
+    });
+}
+
 export {
     L as QyBatch
 };

package/src/QyCache.d.ts

@@ -30,12 +30,13 @@ export declare class QyCache extends EventEmitter {
     getOrCreateIndexDir(indexHostDir: any): any;
     getTriggerFile(triggerName: any): any;
     getOrCreateTriggerFile(triggerName: any): any;
-    getExpireInfoFile(fullPathHash: any, isDir?: boolean): any;
-    getOrCreateExpireInfoFile(fullPathHash: any, isDir?: boolean): any;
+    getExpireInfoFile(fullPathHash: any, type?: string): any;
+    getOrCreateExpireInfoFile(fullPathHash: any, type?: string): any;
     get triggerFileList(): any;
     getRpcFile(rpcFunName: any): any;
     getOrCreateRpcFile(rpcFunName: any): any;
     get rpcFileList(): any;
+    get metaFile(): any;
     insertTriggerToTree(triggerName: any, fileNamePath: any, propNamePathList: any, modCode: any): void;
     removeTriggerFromTree(triggerName: any, fileNamePath: any): void;
     insertRpc(rpcFunName: any, modCode: any): void;
@@ -43,6 +44,8 @@ export declare class QyCache extends EventEmitter {
     queryFiles(indexHostDirNamePath: any, queryObj: any, limit: any, cursor: any, parentDir?: any): never[];
     queryFilesMulti(indexHostDirNamePathMulti: any, limit: any, cursor: any, parentDir?: any): never[];
     callRpc(rpcFunName: any, args: any, body: any): Promise<any>;
-    monitorContentExpire(file: any, flattedAbsSecondObj: any): void;
+    monitorItemExpire(item: any, expireTime: any): void;
+    unmonitorItemExpire(item: any): void;
+    monitorContentExpire(file: any, flattedAbsTimeObj: any): void;
     unmonitorContentExpire(file: any, flattedDelObj: any): void;
 }