datafolder 1.0.11 → 1.0.12

package/src/QyDB.js

@@ -11,11 +11,11 @@ import {
 } from "./QyBatch.js";
 
 import {
-    QyCache as n
+    QyCache as a
 } from "./QyCache.js";
 
 import {
-    getDefaultOptions as a
+    getDefaultOptions as o
 } from "./QyDefaultOptions.js";
 
 import {
@@ -24,29 +24,33 @@ import {
 
 import {
     isNotNullObj as s,
-    __dirname as m
+    __dirname as c
 } from "./QyUtils.js";
 
-let d = e(m, "../data/sampleDataFolder");
+let h = e(c, "../data/sampleDataFolder");
 
-class h extends t {
+class n extends t {
     rootFolder;
     options;
     fetch;
     batch;
     _immediate;
-    constructor(e = d, t) {
-        s(e) && (t = e, e = d), super(), this.options = {
-            ...a("QyDB"),
+    constructor(e = h, t) {
+        s(e) && (t = e, e = h), super(), this.options = {
+            ...o("QyDB"),
             ...t
         }, this.rootFolder = e;
+        for (let r of [ "createIndex", "delIndex", "insert", "remove", "replace", "delDir", "delFile", "delContent", "insertTrigger", "removeTrigger", "insertRpc", "removeRpc", "expireFile", "expireContent", "removeFileExpire", "removeContentExpire" ]) this[r] = (...e) => {
+            var t = this.currentBatch;
+            return t[r].apply(t, e).run();
+        };
     }
     async start(e) {
         var t;
         return this.qyCache || (e = {
             ...this.options,
             ...e
-        }, t = new n(this.rootFolder, e, this), Object.assign(this, {
+        }, t = new a(this.rootFolder, e, this), Object.assign(this, {
             qyCache: t,
             fetch: new r(t),
             batch: new i(t, e),
@@ -68,77 +72,18 @@ class h extends t {
             _immediate: void 0
         }));
     }
-    createDir(e) {
-        return this._immediate.createDir(e).run(), this.dir(e);
+    get currentBatch() {
+        var {
+            batch: e,
+            _immediate: t
+        } = this;
+        return e.running ? e : t;
     }
-    createDirP(e) {
-        return this._immediate.createDirP(e).run(), this.dirP(e);
+    createDir(e) {
+        return this.currentBatch.createDir(e).run(), this.dir(e);
     }
     createFile(e) {
-        return this._immediate.createFile(e).run(), this.file(e);
-    }
-    createFileP(e) {
-        return this._immediate.createFileP(e).run(), this.fileP(e);
-    }
-    createIndex(e, t) {
-        return this._immediate.createIndex(e, t).run();
-    }
-    createIndexP(e, t) {
-        return this._immediate.createIndexP(e, t).run();
-    }
-    delIndex(e, t) {
-        return this._immediate.delIndex(e, t).run();
-    }
-    delIndexP(e, t) {
-        return this._immediate.delIndexP(e, t).run();
-    }
-    insert(e, t) {
-        return this._immediate.insert(e, t).run();
-    }
-    insertP(e, t) {
-        return this._immediate.insertP(e, t).run();
-    }
-    remove(e, t) {
-        return this._immediate.remove(e, t).run();
-    }
-    removeP(e, t) {
-        return this._immediate.removeP(e, t).run();
-    }
-    replace(e, t) {
-        return this._immediate.replace(e, t).run();
-    }
-    replaceP(e, t) {
-        return this._immediate.replaceP(e, t).run();
-    }
-    delDir(e) {
-        return this._immediate.delDir(e).run();
-    }
-    delDirP(e) {
-        return this._immediate.delDirP(e).run();
-    }
-    delFile(e) {
-        return this._immediate.delFile(e).run();
-    }
-    delFileP(e) {
-        return this._immediate.delFileP(e).run();
-    }
-    delContent(e) {
-        return this._immediate.delContent(e).run();
-    }
-    delContentP(e) {
-        return this._immediate.delContentP(e).run();
-    }
-    insertTrigger(e, t, r, i) {
-        return this._immediate.insertTrigger(e, t, r, i).run();
-    }
-    removeTrigger(e) {
-        return this._immediate.removeTrigger(e).run();
-    }
-    insertRpc(e, t) {
-        return this._immediate.insertRpc(e, t).run();
-    }
-    removeRpc(e) {
-        return this._immediate.removeRpc(e).run();
+        return this.currentBatch.createFile(e).run(), this.file(e);
     }
     on(e, t) {
         return this.qyCache?.on(e, t);
@@ -149,5 +94,5 @@ class h extends t {
 }
 
 export {
-    h as QyDB
+    n as QyDB
 };

package/src/QyDefaultOptions.js

@@ -1,3 +1,5 @@
+import "./QyExpire.js";
+
 var e = {
     append: !1,
     retryIntervalFactor: 2,
@@ -54,6 +56,9 @@ let t = {
     },
     QyKVDataSaver_Worker: {
         noAcl: !1
+    },
+    QyExpireClock: {
+        expireInterval: 1e3
     }
 };
 

package/src/QyDir.js

@@ -6,17 +6,16 @@ import {
     getSubdirMapKey as i,
     getFileMapKey as t,
     SpecialFilePaths as r,
-    arrayLast as s,
     isString as d
 } from "./QyUtils.js";
 
 import {
-    QyFile as a
+    QyFile as s
 } from "./QyFile.js";
 
-let u = r.HiddenFolderName;
+let a = r.HiddenFolderName;
 
-class h extends e {
+class u extends e {
     _subdirCount = 0;
     _fileCount = 0;
     subdirMapChangeCount = 0;
@@ -36,10 +35,10 @@ class h extends e {
         ++i.subdirMapChangeCount);
     }
     get fileCount() {
-        return o(this), this._fileCount;
+        return n(this), this._fileCount;
     }
     get subdirCount() {
-        return n(this), this._subdirCount;
+        return l(this), this._subdirCount;
     }
     get isDir() {
         return !0;
@@ -48,7 +47,7 @@ class h extends e {
         return 0 == this.fileCount && 0 == this.subdirCount;
     }
     get isHiddenFolder() {
-        return this.name == u;
+        return this.name == a;
     }
     get subdirMapKey() {
         return this._subdirMapKey || (this._subdirMapKey = i(this.fullPathHash));
@@ -57,10 +56,10 @@ class h extends e {
         return this._fileMapKey || (this._fileMapKey = t(this.fullPathHash));
     }
     get subdirMap() {
-        return n(this), this._subdirMap;
+        return l(this), this._subdirMap;
     }
     get fileMap() {
-        return o(this), this._fileMap;
+        return n(this), this._fileMap;
     }
     getSubdir(e) {
         var i;
@@ -80,13 +79,13 @@ class h extends e {
         if ("/" === e) return this.qyCache?.rootDir || this;
         let t = this.subdirMap;
         var r = (t = t || (this._subdirMap = {}))[e];
-        return r || (r = t[e] = new h(e, i, this), this.setChildTriggerNodes(r)), 
+        return r || (r = t[e] = new u(e, i, this), this.setChildTriggerNodes(r)), 
         r;
     }
     getOrCreateFile(e, i = !1) {
         let t = this.fileMap;
         var r = (t = t || (this._fileMap = {}))[e];
-        return r || (r = t[e] = new a(e, i, this), this.setChildTriggerNodes(r)), 
+        return r || (r = t[e] = new s(e, i, this), this.setChildTriggerNodes(r)), 
         r;
     }
     searchSubdir(i, t = i.length) {
@@ -107,34 +106,34 @@ class h extends e {
     }
     searchFile(e) {
         var i = this.searchSubdir(e, e.length - 1);
-        if (i) return i.getFile(s(e));
+        if (i) return i.getFile(e.at(-1));
     }
     searchOrCreateFile(e, i = !1) {
-        return this.searchOrCreateSubdir(e, i, e.length - 1).getOrCreateFile(s(e), i);
+        return this.searchOrCreateSubdir(e, i, e.length - 1).getOrCreateFile(e.at(-1), i);
     }
     get subdirList() {
-        return l(this, "_subdirList", this.subdirMapChangeCount, () => this.created && this.subdirMap ? Object.values(this.subdirMap).filter(e => e.created) : []);
+        return h(this, "_subdirList", this.subdirMapChangeCount, () => this.created && this.subdirMap ? Object.values(this.subdirMap).filter(e => e.created) : []);
     }
     get subdirNameList() {
-        return l(this, "_subdirNameList", this.subdirMapChangeCount, () => this.subdirList.map(e => e.name));
+        return h(this, "_subdirNameList", this.subdirMapChangeCount, () => this.subdirList.map(e => e.name));
     }
     get sortedSubdirList() {
-        return l(this, "_sortedSubdirList", this.subdirMapChangeCount, () => this.subdirList.sort((e, i) => e.cmp(i)));
+        return h(this, "_sortedSubdirList", this.subdirMapChangeCount, () => this.subdirList.sort((e, i) => e.cmp(i)));
     }
     get sortedSubdirNameList() {
-        return l(this, "_sortedSubdirNameList", this.subdirMapChangeCount, () => this.sortedSubdirList.map(e => e.nameNum));
+        return h(this, "_sortedSubdirNameList", this.subdirMapChangeCount, () => this.sortedSubdirList.map(e => e.nameNum));
     }
     get fileList() {
-        return l(this, "_fileList", this.fileMapChangeCount, () => this.created && this.fileMap ? Object.values(this.fileMap).filter(e => e.created) : []);
+        return h(this, "_fileList", this.fileMapChangeCount, () => this.created && this.fileMap ? Object.values(this.fileMap).filter(e => e.created) : []);
     }
     get fileNameList() {
-        return l(this, "_fileNameList", this.fileMapChangeCount, () => this.fileList.map(e => e.name));
+        return h(this, "_fileNameList", this.fileMapChangeCount, () => this.fileList.map(e => e.name));
     }
     get sortedFileList() {
-        return l(this, "_sortedFileList", this.fileMapChangeCount, () => this.fileList.sort((e, i) => e.cmp(i)));
+        return h(this, "_sortedFileList", this.fileMapChangeCount, () => this.fileList.sort((e, i) => e.cmp(i)));
     }
     get sortedFileNameList() {
-        return l(this, "_sortedFileNameList", this.fileMapChangeCount, () => this.sortedFileList.map(e => e.nameNum));
+        return h(this, "_sortedFileNameList", this.fileMapChangeCount, () => this.sortedFileList.map(e => e.nameNum));
     }
     *allSubdirs() {
         var e, i, t = this.subdirList;
@@ -190,12 +189,12 @@ class h extends e {
     }
 }
 
-function l(e, i, t, r) {
+function h(e, i, t, r) {
     var e = e.cache, s = i + "ChangeCount";
     return e[i] && e[s] == t || (e[i] = r(), e[s] = t), e[i];
 }
 
-function n(e) {
+function l(e) {
     if (e.created && !e._subdirMap && !e.subdirMapLoaded) {
         e.subdirMapLoaded = !0;
         var i = e.qyCache;
@@ -203,13 +202,13 @@ function n(e) {
             i = i.qyKVData.getValueSync(e.subdirMapKey);
             if (i) {
                 var t, r = e._subdirMap = {};
-                for (t in i) r[t] = new h(t, !0, e);
+                for (t in i) r[t] = new u(t, !0, e);
             }
         }
     }
 }
 
-function o(e) {
+function n(e) {
     if (e.created && !e._fileMap && !e.fileMapLoaded) {
         e.fileMapLoaded = !0;
         var i = e.qyCache;
@@ -217,12 +216,12 @@ function o(e) {
             i = i.qyKVData.getValueSync(e.fileMapKey);
             if (i) {
                 var t, r = e._fileMap = {};
-                for (t in i) r[t] = new a(t, !0, e);
+                for (t in i) r[t] = new s(t, !0, e);
             }
         }
     }
 }
 
 export {
-    h as QyDir
+    u as QyDir
 };

package/src/QyExpire.d.ts

@@ -0,0 +1,21 @@
+import { QyMessager } from "./QyMessager.ts";
+export declare const WholeFileProp = "[\"\"]";
+export declare class QyExpire extends QyMessager {
+    qyCache: any;
+    hashToFileMap: {};
+    maxSecond: number;
+    startTime: any;
+    constructor(qyCache: any, options?: any);
+    monitorContentExpire(file: any, flattedAbsSecondObj: any): void;
+    unmonitorContentExpire(file: any, flattedDelObj: any): void;
+    onExpireEmpty(maxSecond: any): void;
+    onFileAllExpireRemoved(fullPathHash: any): void;
+    onContentExpired(expiredInfoMap: any): void;
+}
+export declare function flatObj(obj: any, path?: any[], flatted?: {}): {};
+export declare function analyzeExpireInfo(expireInfoObj: any, nowSeconds?: number): {
+    expiredProps: any[];
+    remainingExpireInfoObj: {};
+    toDeleteFile: any;
+};
+export declare function handleExpiredProps(qyDB: any, file: any, expiredProps: any, toDeleteFile: any): void;

package/src/QyExpire.js

@@ -0,0 +1,113 @@
+import {
+    QyMessager as e
+} from "./QyMessager.js";
+
+import {
+    getDefaultOptions as i
+} from "./QyDefaultOptions.js";
+
+import {
+    getNowSeconds as a,
+    isSimpleType as o
+} from "./QyUtils.js";
+
+import {
+    setValByNamePath as s
+} from "./QyFileContentUtils.js";
+
+import {
+    SpecialOperators as t
+} from "./QyUtils.js";
+
+import "./QyLogger.js";
+
+import "node:util";
+
+let n = t.$del, r = '[""]';
+
+class p extends e {
+    qyCache;
+    hashToFileMap = {};
+    maxSecond = 0;
+    startTime;
+    constructor(e, t = void 0) {
+        super("QyExpire_Worker", t = {
+            ...i("QyExpire"),
+            ...t
+        }, t, [], [ "setStartTime", "setContentExpire", "removeContentExpire" ]), 
+        Object.assign(this, {
+            qyCache: e
+        });
+    }
+    monitorContentExpire(e, t) {
+        (s = this).startTime || s.setStartTime(s.startTime = a());
+        var i, {
+            startTime: r,
+            hashToFileMap: s
+        } = 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;
+    }
+    unmonitorContentExpire(e, t) {
+        this.startTime && this.removeCOntentExpire(e.fullPathHash, Object.keys(t));
+    }
+    onExpireEmpty(e) {
+        e == this.maxSecond && Object.assign(this, {
+            startTime: void 0,
+            maxSecond: 0
+        });
+    }
+    onFileAllExpireRemoved(e) {
+        delete this.hashToFileMap[e];
+    }
+    onContentExpired(e) {
+        var t, {
+            qyCache: i,
+            hashToFileMap: r
+        } = this, s = i.qyDB;
+        for (t in e) {
+            var {
+                expiredProps: o,
+                toDeleteFile: n
+            } = e[t];
+            h(s, r[t], o, n);
+        }
+    }
+}
+
+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 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 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));
+}
+
+export {
+    r as WholeFileProp,
+    p as QyExpire,
+    l as flatObj,
+    m as analyzeExpireInfo,
+    h as handleExpiredProps
+};

package/src/QyExpireClock.d.ts

@@ -0,0 +1,15 @@
+import EventEmitter from "node:events";
+export declare const ExpiredEventName = "expired";
+export declare class QyExpireClock extends EventEmitter {
+    startTime: number;
+    seconds: number;
+    expireMap: {};
+    interval: any;
+    options: any;
+    constructor(options?: any);
+    start(): void;
+    stop(): void;
+    get currentTime(): number;
+    addExpire(expireSeconds: any): void;
+    inc(deltaSeconds?: number): void;
+}

package/src/QyExpireClock.js

@@ -0,0 +1,53 @@
+import t from "node:events";
+
+import {
+    getDefaultOptions as e
+} from "./QyDefaultOptions.js";
+
+import {
+    getNowSeconds as s
+} from "./QyUtils.js";
+
+let i = "expired";
+
+class r extends t {
+    startTime = 0;
+    seconds = 0;
+    expireMap = {};
+    interval;
+    options;
+    constructor(t = void 0) {
+        super(), this.options = {
+            ...e("QyExpireClock"),
+            ...t
+        };
+    }
+    start() {
+        this.startTime = s(), this.interval = setInterval(this.inc.bind(this), this.options.expireInterval);
+    }
+    stop() {
+        var t = this.interval;
+        t && (clearInterval(t), this.interval = void 0);
+    }
+    get currentTime() {
+        return this.startTime + this.seconds;
+    }
+    addExpire(t) {
+        var {
+            startTime: e,
+            currentTime: i,
+            expireMap: s
+        } = this;
+        t <= i ? this.emit("expired", t) : s[t - e] = 1;
+    }
+    inc(e = s() - this.currentTime) {
+        var i = this.expireMap;
+        for (let t = 0; t < e; ++t) i[++this.seconds] && (this.emit("expired", this.currentTime), 
+        delete i[this.seconds]);
+    }
+}
+
+export {
+    i as ExpiredEventName,
+    r as QyExpireClock
+};

package/src/QyExpire_Worker.d.ts

@@ -0,0 +1,20 @@
+import { QyMessageWorker } from "./QyMessageWorker.ts";
+export default class QyExpire_Worker extends QyMessageWorker {
+    startTime: any;
+    seconds: number;
+    maxSecond: number;
+    interval: any;
+    hashPropSecondMap: {};
+    secondHashPropMap: {};
+    hashSecondMap: {};
+    secondDirMap: {};
+    emptyFileHashList: never[];
+    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;
+    _op_start(): void;
+    _op_stop(): void;
+}

package/src/QyExpire_Worker.js

@@ -0,0 +1,127 @@
+import {
+    getDefaultOptions as t
+} from "./QyDefaultOptions.js";
+
+import {
+    QyMessageWorker as e
+} from "./QyMessageWorker.js";
+
+import {
+    getValByNamePath as x,
+    setValByNamePath as y
+} from "./QyFileContentUtils.js";
+
+import {
+    getNowSeconds as v,
+    isEmptyObj as a
+} from "./QyUtils.js";
+
+import "./QyLogger.js";
+
+import {
+    WholeFileProp as P
+} from "./QyExpire.js";
+
+var {} = Array;
+
+export default class extends e {
+    startTime;
+    seconds = 0;
+    maxSecond = 0;
+    interval;
+    hashPropSecondMap = {};
+    secondHashPropMap = {};
+    hashSecondMap = {};
+    secondDirMap = {};
+    emptyFileHashList = [];
+    constructor(e) {
+        super(e = {
+            ...t("QyExpire_Worker"),
+            ...e
+        });
+    }
+    get currentTime() {
+        return this.startTime + this.seconds;
+    }
+    setStartTime(e) {
+        Object.assign(this, {
+            startTime: e,
+            seconds: 0
+        });
+    }
+    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);
+            }
+        }
+        0 < a.length && (r = {
+            expiredProps: a
+        }, n && (r.toDeleteFile = !0), this.postParent("onContentExpired", r));
+    }
+    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 {
+            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);
+    }
+}
+
+function m(e, t, s) {
+    var {
+        hashPropSecondMap: e,
+        emptyFileHashList: r
+    } = e;
+    delete e[t][s], a(e[t]) && (delete e[t], r.push(t));
+}
+
+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];
+}