datafolder 1.0.12 → 1.0.13

package/src/QyExpire.js

@@ -3,111 +3,103 @@ import {
 } from "./QyMessager.js";
 
 import {
-    getDefaultOptions as i
+    getDefaultOptions as r
 } from "./QyDefaultOptions.js";
 
 import {
-    getNowSeconds as a,
-    isSimpleType as o
+    getNowRounded as t,
+    isEmptyObj as i
 } from "./QyUtils.js";
 
 import {
-    setValByNamePath as s
+    setValByNamePath as o
 } from "./QyFileContentUtils.js";
 
 import {
-    SpecialOperators as t
+    SpecialOperators as s
 } from "./QyUtils.js";
 
-import "./QyLogger.js";
+let n = s.$del;
 
-import "node:util";
-
-let n = t.$del, r = '[""]';
-
-class p extends e {
+class a extends e {
     qyCache;
-    hashToFileMap = {};
-    maxSecond = 0;
-    startTime;
+    expireMap = {};
+    roundedStartTime;
     constructor(e, t = void 0) {
         super("QyExpire_Worker", t = {
-            ...i("QyExpire"),
+            ...r("QyExpire"),
             ...t
-        }, t, [], [ "setStartTime", "setContentExpire", "removeContentExpire" ]), 
+        }, t, [], [ "setRoundedStartTime", "setContentExpire", "removeContentExpire", "setItemExpire", "removeItemExpire" ]), 
         Object.assign(this, {
             qyCache: e
         });
     }
-    monitorContentExpire(e, t) {
-        (s = this).startTime || s.setStartTime(s.startTime = a());
-        var i, {
-            startTime: r,
-            hashToFileMap: s
+    monitorItemExpire(e, t) {
+        d(this);
+        var {
+            roundedStartTime: r,
+            expireMap: i
+        } = this, t = t - r, r = x(e);
+        i[r] = e, this.setItemExpire(r, t);
+    }
+    unmonitorItemExpire(e) {
+        var {
+            roundedStartTime: t,
+            expireMap: r
         } = this;
-        for (i in t) {
-            var o = t[i] - r;
-            (t[i] = o) > this.maxSecond && (this.maxSecond = o);
-        }
-        var n = e.fullPathHash;
-        this.setContentExpire(n, t), s[n] = e;
+        t && (t = x(e), this.removeItemExpire(t), delete r[t]);
+    }
+    monitorContentExpire(e, t) {
+        d(this);
+        var r, {
+            roundedStartTime: i,
+            expireMap: o
+        } = this, s = {};
+        for (r in t) s[r] = t[r] - i;
+        var n = e.fileContentKey;
+        o[n] = e, this.setContentExpire(n, s);
     }
     unmonitorContentExpire(e, t) {
-        this.startTime && this.removeCOntentExpire(e.fullPathHash, Object.keys(t));
+        this.roundedStartTime && this.removeContentExpire(e.fileContentKey, Object.keys(t));
     }
-    onExpireEmpty(e) {
-        e == this.maxSecond && Object.assign(this, {
-            startTime: void 0,
-            maxSecond: 0
+    onEmptyHashList(e) {
+        var t, r = this.expireMap;
+        for (t of e) delete r[t];
+        i(r) && Object.assign(this, {
+            roundedStartTime: void 0
         });
     }
-    onFileAllExpireRemoved(e) {
-        delete this.hashToFileMap[e];
-    }
-    onContentExpired(e) {
+    onExpired(e) {
         var t, {
-            qyCache: i,
-            hashToFileMap: r
-        } = this, s = i.qyDB;
+            qyCache: r,
+            expireMap: i
+        } = this, o = r.qyDB;
         for (t in e) {
-            var {
-                expiredProps: o,
-                toDeleteFile: n
-            } = e[t];
-            h(s, r[t], o, n);
+            var s = i[t];
+            s && (t.startsWith("c") ? m(o, s, e[t]) : (p(o, s), delete i[t]));
         }
     }
 }
 
-function l(e, t = [], i = {}) {
-    if (o(e)) i[JSON.stringify(t)] = e; else {
-        var r, s = t.length;
-        for (r in e) t.push(r), l(e[r], t, i), t.length = s;
-    }
-    return i;
+function p(e, t) {
+    t.isFile ? (e.delFile(t), e.removeFileExpire(t, !0)) : (e.delDir(t), e.removeDirExpire(t, !0));
 }
 
-function m(e, t = a()) {
-    var i, r = [], s = {}, o = e['[""]'], o = o && o <= t;
-    for (i in e) {
-        var n = e[i];
-        n <= t ? r.push(i) : s[i] = n;
-    }
-    return {
-        expiredProps: r,
-        remainingExpireInfoObj: s,
-        toDeleteFile: o
-    };
+function m(e, t, r) {
+    t.created && e.insert(t, r.reduce((e, t) => o(e, JSON.parse(t), n), {}), !0), 
+    e.removeContentExpire(t, r, !0);
+}
+
+function d(e) {
+    e.roundedStartTime || e.setRoundedStartTime(e.roundedStartTime = t());
 }
 
-function h(e, t, i, r) {
-    r && e.delFile(t), 0 < i.length && (e.removeContentExpire(t, i, !0), r || e.insert(t, i.reduce((e, t) => s(e, JSON.parse(t), n), {}), !0));
+function x(e) {
+    return (e.isFile ? "f" : "d") + e.fullPathHash;
 }
 
 export {
-    r as WholeFileProp,
-    p as QyExpire,
-    l as flatObj,
-    m as analyzeExpireInfo,
-    h as handleExpiredProps
+    a as QyExpire,
+    p as handleExpiredItem,
+    m as handleExpiredProps
 };

package/src/QyExpireInfo.d.ts

@@ -0,0 +1,10 @@
+export declare class QyExpireInfo {
+    hashPropTimeMap: {};
+    secondTimeHashPropMap: {};
+    get isEmpty(): boolean;
+    setExpireInfo(hashKey: any, expireTime: any, prop?: any): void;
+    removeExpireInfo(hashKey: any, prop?: any): void;
+    processExpired(currentSecondTime: any, checkedSecondTime: any, hashExpiredInfoMap: any, emptyHashList: any): void;
+}
+export declare function getSecond(expireTime: any): number;
+export declare function getSecondM(expireTime: any): number;

package/src/QyExpireInfo.js

@@ -0,0 +1,92 @@
+import {
+    getValByNamePath as i,
+    setValByNamePath as p,
+    delValByNamePath as l
+} from "./QyFileContentUtils.js";
+
+import {
+    isEmptyObj as T
+} from "./QyUtils.js";
+
+class e {
+    hashPropTimeMap = {};
+    secondTimeHashPropMap = {};
+    get isEmpty() {
+        return T(this.hashPropTimeMap);
+    }
+    setExpireInfo(e, a, r = void 0) {
+        var {
+            hashPropTimeMap: t,
+            secondTimeHashPropMap: s
+        } = this, o = r ? i(t, [ e, r ]) : t[e];
+        o != a && (r ? p(t, [ e, r ], a) : t[e] = a, p(s, h(a, e, r), 1), null != o) && l(s, h(o, e, r));
+    }
+    removeExpireInfo(e, a = void 0) {
+        var {
+            hashPropTimeMap: r,
+            secondTimeHashPropMap: t
+        } = this, s = a ? i(r, [ e, a ]) : r[e];
+        null != s && (a ? l(r, [ e, a ]) : delete r[e], l(t, h(s, e, a)));
+    }
+    processExpired(e, a, r, t) {
+        if (!(this.isEmpty || e <= a)) {
+            var {
+                hashPropTimeMap: s,
+                secondTimeHashPropMap: o
+            } = this, i = j(e), p = j(a), l = o, h = r, n = i;
+            for (let e = p; e < n - 1; ++e) {
+                var f = l[e];
+                if (f) {
+                    for (var m of Object.values(f)) E(h, m);
+                    delete l[e];
+                }
+            }
+            var v, d = o[i];
+            if (d) {
+                var u = e % 1e3;
+                for (let e = i != p ? 0 : a % 1e3 + 1; e <= u; ++e) {
+                    var c = d[e];
+                    c && (E(r, c), delete d[e]);
+                }
+                T(d) && delete o[i];
+            }
+            for (v in r) {
+                var P = r[v];
+                if (1 == P) delete s[v]; else {
+                    var M, y = s[v];
+                    for (M of P) delete y[M];
+                    T(y) && (delete s[v], t.push(v));
+                }
+            }
+        }
+    }
+}
+
+function E(a, e) {
+    for (var r in e) {
+        var t = e[r];
+        if (1 == t) a[r] = 1; else {
+            let e = a[r];
+            (e = e || (a[r] = [])).push(...Object.keys(t));
+        }
+    }
+}
+
+function h(e, a, r = void 0) {
+    e = [ j(e), e % 1e3, a ];
+    return null != r && e.push(r), e;
+}
+
+function j(e) {
+    return Math.floor(e / 1e3);
+}
+
+function a(e) {
+    return e % 1e3;
+}
+
+export {
+    e as QyExpireInfo,
+    j as getSecond,
+    a as getSecondM
+};

package/src/QyExpire_Worker.d.ts

@@ -1,20 +1,19 @@
 import { QyMessageWorker } from "./QyMessageWorker.ts";
+import { QyExpireInfo } from "./QyExpireInfo.ts";
 export default class QyExpire_Worker extends QyMessageWorker {
-    startTime: any;
-    seconds: number;
-    maxSecond: number;
-    interval: any;
-    hashPropSecondMap: {};
-    secondHashPropMap: {};
-    hashSecondMap: {};
-    secondDirMap: {};
-    emptyFileHashList: never[];
+    roundedStartTime: any;
+    checkedTime: number;
+    roundTimer: any;
+    secondInterval: any;
+    milliSecondInterval: any;
+    emptyHashList: any;
+    qyExpireInfo: QyExpireInfo;
     constructor(options: any);
-    get currentTime(): any;
-    setStartTime(startTime: any): void;
-    setContentExpire(fullPathHash: any, flattedRelativeSecondObj: any): void;
-    removeContentExpire(fullPathHash: any, propNamePathStrList: any): void;
-    _inc(deltaSeconds?: number): void;
+    setRoundedStartTime(roundedStartTime: any): void;
+    setItemExpire(hashKey: any, expireTime: any): void;
+    removeItemExpire(hashKey: any): void;
+    setContentExpire(hashKey: any, flattedRelativeTimeObj: any): void;
+    removeContentExpire(hashKey: any, propNamePathStrList: any): void;
     _op_start(): void;
     _op_stop(): void;
 }

package/src/QyExpire_Worker.js

@@ -7,121 +7,106 @@ import {
 } from "./QyMessageWorker.js";
 
 import {
-    getValByNamePath as x,
-    setValByNamePath as y
-} from "./QyFileContentUtils.js";
-
-import {
-    getNowSeconds as v,
-    isEmptyObj as a
+    getNowTime as r,
+    isEmptyObj as c
 } from "./QyUtils.js";
 
-import "./QyLogger.js";
-
 import {
-    WholeFileProp as P
-} from "./QyExpire.js";
-
-var {} = Array;
+    getSecond as d,
+    getSecondM as l,
+    QyExpireInfo as i
+} from "./QyExpireInfo.js";
 
 export default class extends e {
-    startTime;
-    seconds = 0;
-    maxSecond = 0;
-    interval;
-    hashPropSecondMap = {};
-    secondHashPropMap = {};
-    hashSecondMap = {};
-    secondDirMap = {};
-    emptyFileHashList = [];
+    roundedStartTime;
+    checkedTime = 0;
+    roundTimer;
+    secondInterval;
+    milliSecondInterval;
+    emptyHashList = [];
+    qyExpireInfo = new i();
     constructor(e) {
         super(e = {
             ...t("QyExpire_Worker"),
             ...e
         });
     }
-    get currentTime() {
-        return this.startTime + this.seconds;
-    }
-    setStartTime(e) {
+    setRoundedStartTime(e) {
         Object.assign(this, {
-            startTime: e,
-            seconds: 0
+            roundedStartTime: e,
+            checkedTime: 0
         });
     }
+    setItemExpire(e, t) {
+        var {
+            checkedTime: r,
+            qyExpireInfo: i
+        } = this, o = h(this), n = {};
+        t <= o ? n[e] = 1 : i.setExpireInfo(e, t), r || (this.checkedTime = o), 
+        v(this, !1, o, n);
+    }
+    removeItemExpire(e) {
+        var t = this.qyExpireInfo;
+        t.isEmpty || (t.removeExpireInfo(e), v(this));
+    }
     setContentExpire(e, t) {
-        var s, {
-            interval: r,
-            options: o,
-            seconds: i
-        } = this, a = (r || (this.interval = setInterval(this._inc.bind(this), o.expireInterval)), 
-        []);
-        let n;
-        for (s in t) {
-            var p = t[s];
-            if (p <= i) a.push(s), s == P && (n = !0); else {
-                f = m = v = c = d = h = l = void 0;
-                var l = this, h = e, d = s, c = p, {
-                    hashPropSecondMap: v,
-                    secondHashPropMap: m
-                } = l, f = x(v, [ h, d ]);
-                c != f && (y(v, [ h, d ], c), y(m, [ c, h, d ], 1), null != f && u(l, f, h, d), 
-                c > l.maxSecond) && (l.maxSecond = c);
-            }
+        var r, {
+            checkedTime: i,
+            qyExpireInfo: o,
+            emptyHashList: n
+        } = this, s = h(this);
+        let a;
+        for (r in t) {
+            var m = t[r];
+            m <= s ? a ? a.push(r) : a = [ r ] : o.setExpireInfo(e, m, r);
         }
-        0 < a.length && (r = {
-            expiredProps: a
-        }, n && (r.toDeleteFile = !0), this.postParent("onContentExpired", r));
+        var p = a ? {
+            [e]: a
+        } : {};
+        o.hashPropTimeMap[e] || n.push(e), i || (this.checkedTime = s), v(this, !1, s, p);
     }
     removeContentExpire(e, t) {
-        var s, r, o;
-        if (this.interval) for (var i of t) s = this, r = e, i = i, o = void 0, 
-        o = s.hashPropSecondMap, null != (o = x(o, [ r, i ])) && (m(s, r, i), u(s, o, r, i));
-    }
-    _inc(t = v() - this.currentTime) {
-        for (let e = 0; e < t; ++e) {
-            ++this.seconds, a = p = h = l = n = i = o = r = s = void 0;
-            var s = this, r = this.seconds, o = s.secondHashPropMap, i = o[r];
-            if (i) {
-                var a, n = {};
-                for (a in i) {
-                    var p, l = Object.keys(i[a]), h = {
-                        expiredProps: l
-                    };
-                    for (p of l) m(s, a, p), p == P && (h.toDeleteFile = !0);
-                    n[a] = h;
-                }
-                s.postParent("onContentExpired", n), delete o[r];
-            }
+        var r = this.qyExpireInfo;
+        if (!r.isEmpty) {
+            for (var i of t) r.removeExpireInfo(e, i);
+            v(this);
         }
-        var {
-            emptyFileHashList: e,
-            maxSecond: d,
-            interval: c
-        } = this;
-        0 < e.length && (this.postParent("onFileAllExpireRemoved", e), e.length = 0), 
-        this.seconds > d && (this.postParent("onExpireEmpty", d), clearInterval(c), 
-        Object.assign(this, {
-            interval: void 0,
-            maxSecond: 0
-        }));
     }
     _op_start() {}
     _op_stop() {
-        var e = this.interval;
-        e && (clearInterval(e), this.interval = void 0);
+        u(this);
     }
 }
 
-function m(e, t, s) {
-    var {
-        hashPropSecondMap: e,
-        emptyFileHashList: r
+function h(e) {
+    return r() - e.roundedStartTime;
+}
+
+function v(e, t = !1, r = h(e), i = {}) {
+    var o, n, s, {
+        qyExpireInfo: a,
+        checkedTime: m,
+        emptyHashList: p
     } = e;
-    delete e[t][s], a(e[t]) && (delete e[t], r.push(t));
+    m != r && (a.processExpired(r, m, i, p), e.checkedTime = r), c(i) || e.postParent("onExpired", i), 
+    0 < p.length && (e.postParent("onEmptyHashList", p), p.length = 0), a.isEmpty ? u(e) : c(a.secondTimeHashPropMap[d(r)]) ? (f(e), 
+    t || e.secondInterval ? (n = e).secondInterval || (I(n), n.secondInterval = setInterval(() => v(n, !0), 1e3)) : (s = e, 
+    m = 1e3 - l(r), s.roundTimer || (s.roundTimer = setTimeout(() => v(s, !0), m)))) : (o = e).milliSecondInterval || (I(o), 
+    o.milliSecondInterval = setInterval(() => v(o), 1));
+}
+
+function I(e) {
+    var t = e.roundTimer;
+    t && (clearTimeout(t), e.roundTimer = void 0);
+}
+
+function f(e) {
+    var t = e.milliSecondInterval;
+    t && (clearInterval(t), e.milliSecondInterval = void 0);
 }
 
-function u(e, t, s, r) {
-    var e = e.secondHashPropMap, o = e[t], i = o[s];
-    delete i[r], a(i) && (delete o[s], a(o)) && delete e[t];
+function u(e) {
+    var t, r;
+    I(e), (r = (t = e).secondInterval) && (clearInterval(r), t.secondInterval = void 0), 
+    f(e);
 }

package/src/QyFile.d.ts

@@ -14,8 +14,8 @@ export declare class QyFile extends QyItem {
     get isFile(): boolean;
     get contentAsText(): any;
     get clonedContent(): any;
-    setContent(content: any): void;
     view(spec: string | undefined, noClone: any): any;
     prop(namePath: any, spec: string | undefined, noClone: any): any;
     unloadFileContent(): void;
+    ensureLoaded(): this | undefined;
 }