datafolder 1.0.12 → 1.0.13

package/src/QyCache.js

@@ -5,70 +5,72 @@ import {
 import r from "node:events";
 
 import {
-    QyDir as o
+    QyDir as p
 } from "./QyDir.js";
 
 import {
-    QyFileLogger as a
+    QyFileLogger as u
 } from "./QyFileLogger.js";
 
 import {
-    QyKVData as s
+    QyKVData as d
 } from "./QyKVData.js";
 
 import {
     QyTriggerNode as f,
-    updateTriggerNodes as n
+    updateTriggerNodes as s
 } from "./QyTrigger.js";
 
 import {
-    isString as C,
-    lockExclusiveFilePath as x,
+    isString as x,
+    lockExclusiveFilePath as C,
     unlockExclusiveFilePath as i
 } from "./QyUtils.js";
 
 import {
-    dumpStructure as R
+    dumpStructure as q
 } from "./QyStructure.js";
 
 import {
-    getIndexPropPaths as g,
-    parseNamePathAndQuery as l
+    getIndexPropPaths as n,
+    parseNamePathAndQuery as g
 } from "./QyIndex.js";
 
 import {
-    getDefaultOptions as p
+    getDefaultOptions as h
 } from "./QyDefaultOptions.js";
 
 import {
-    ensureDir as q,
+    ensureDir as R,
     SpecialFilePaths as e
 } from "./QyUtils.js";
 
 import {
-    QueryCounter as u
+    QueryCounter as l
 } from "./QyUnionNode.js";
 
 import {
-    QyKVDataLoader as O
+    QyKVDataLoader as Q
 } from "./QyKVDataLoader.js";
 
 import {
-    requireFromModCode as d
+    requireFromModCode as c
 } from "./QyMod.js";
 
 import {
-    logger as Q
+    logger as O
 } from "./QyLogger.js";
 
 let {
-    IndexDirPath: S,
-    TriggerDirPath: L,
-    RpcDirPath: P,
-    ExpireDirPath: j
+    HiddenFolderName: D,
+    IndexDirPath: F,
+    TriggerDirPath: P,
+    RpcDirPath: S,
+    ExpireDirPath: m,
+    MetaFilePath: t
 } = e;
 
-class t extends r {
+class o extends r {
     rootFolder;
     options;
     qyDB;
@@ -85,20 +87,27 @@ class t extends r {
     rpcFunMap = {};
     constructor(r, e, t) {
         super(), e = {
-            ...p("QyCache"),
+            ...h("QyCache"),
             ...e
         };
-        var i = v(r, "qykv");
-        Object.assign(this, {
+        var i = v(r, "qykv"), o = m.at(-1), a = F.at(-1), s = new p("", !0, void 0, this), n = new p(D, !0, s), g = new p(o, !0, n), l = new p(a, !0, n);
+        s._subdirMap = {
+            [D]: n
+        }, n._subdirMap = {
+            [o]: g,
+            [a]: l
+        }, Object.assign(this, {
             rootFolder: r,
             options: e,
             qyDB: t,
             kvFolder: i,
+            rootDir: s,
+            expireRootDir: g,
+            indexRootDir: l,
             rpcFolder: v(r, "rpc"),
-            rootDir: new o("", !0, void 0, this),
             exclusiveFilePath: v(r, ".opened"),
-            qyKVData: new s(i, e, this),
-            qyFileLogger: new a(v(r, "qylog"), e)
+            qyKVData: new d(i, e, this),
+            qyFileLogger: new u(v(r, "qylog"), e)
         });
     }
     async start() {
@@ -111,15 +120,15 @@ class t extends r {
             exclusiveFilePath: a,
             rootDir: s
         } = this;
-        Q.log(`Starting at ${r}...`);
+        O.log(`Starting at ${r}...`);
         try {
-            await q(e), o.start();
+            await R(e), o.start();
             var [ {
                 maxChangeId: n,
                 loadedMaxAclNum: g,
                 qySnapshots: l,
                 aclKeyValueMap: p
-            } ] = await Promise.all([ ((r, e) => (r = new O(r, e)).load())(e, t), x(a) ]);
+            } ] = await Promise.all([ ((r, e) => (r = new Q(r, e)).load())(e, t), C(a) ]);
             i.start(n, g, l, p);
         } catch (r) {
             throw o.stop(), r;
@@ -130,36 +139,36 @@ class t extends r {
                 fileMap: i
             } = e;
             for (var o of t) r(o);
-        }(s), this.indexRootDir = s.searchOrCreateSubdir(S), this.expireRootDir = s.searchOrCreateSubdir(j);
+        }(s);
         var u = this, e = u.rootDir;
         e.triggerNodes = [ new f() ];
-        for (d of (e = u.triggerRootDir = e.searchOrCreateSubdir(L)).fileList) {
+        for (d of (e = u.triggerRootDir = e.searchOrCreateSubdir(P)).fileList) {
             var {
                 name: d,
                 fileContent: h
             } = d, [ h, c, D ] = h;
             u.insertTriggerToTree(d, h, c, D);
         }
-        var y = this;
-        y.rpcRootDir = y.rootDir.searchOrCreateSubdir(P);
-        for (F of y.rpcRootDir.fileList) {
+        var F = this;
+        F.rpcRootDir = F.rootDir.searchOrCreateSubdir(S);
+        for (m of F.rpcRootDir.fileList) {
             var {
-                name: F,
-                fileContent: m
-            } = F;
-            C(m) && y.insertRpc(F, m);
+                name: m,
+                fileContent: y
+            } = m;
+            x(y) && F.insertRpc(m, y);
         }
-        return t.dumpStructureAtStart && await R(v(r, "qystruct"), s), Q.log("Started."), 
+        return t.dumpStructureAtStart && await q(v(r, "qystruct"), s), O.log("Started."), 
         this;
     }
     async stop() {
-        Q.log("Stopping...");
+        O.log("Stopping...");
         var {
             qyKVData: r,
             qyFileLogger: e,
             exclusiveFilePath: t
         } = this;
-        return await r.stop(), Q.log("QyFileLogger stopped."), await e.stop(), i(t), 
+        return await r.stop(), O.log("QyFileLogger stopped."), await e.stop(), i(t), 
         Object.assign(this, {
             rootDir: void 0,
             indexRootDir: void 0,
@@ -170,7 +179,7 @@ class t extends r {
             rpcFunMap: void 0,
             qyDB: void 0,
             qyFileLogger: void 0
-        }), Q.log("Stopped."), this;
+        }), O.log("Stopped."), this;
     }
     increaseChangeId() {
         return this.qyKVData.increaseChangeId();
@@ -186,22 +195,22 @@ class t extends r {
         return t && s.save(r, t), a.save(r, e, i, o);
     }
     getFile(r, e = this.rootDir) {
-        return r.isFile ? r : C(r) ? e.getFile(r) : e.searchFile(r);
+        return r.isFile ? r : x(r) ? e.getFile(r) : e.searchFile(r);
     }
     getDir(r, e = this.rootDir) {
-        return r.isDir ? r : C(r) ? e.getSubdir(r) : e.searchSubdir(r);
+        return r.isDir ? r : x(r) ? e.getSubdir(r) : e.searchSubdir(r);
     }
     getOrCreateFile(r, e = this.rootDir) {
-        return r.isFile ? r : C(r) ? e.getOrCreateFile(r) : e.searchOrCreateFile(r);
+        return r.isFile ? r : x(r) ? e.getOrCreateFile(r) : e.searchOrCreateFile(r);
     }
     getOrCreateDir(r, e = this.rootDir) {
-        return r.isDir ? r : C(r) ? e.getOrCreateSubdir(r) : e.searchOrCreateSubdir(r);
+        return r.isDir ? r : x(r) ? e.getOrCreateSubdir(r) : e.searchOrCreateSubdir(r);
     }
     getIndexDir(r) {
-        return this.indexRootDir.searchSubdir(c(r.fullPathHash));
+        return this.indexRootDir.searchSubdir(y(r.fullPathHash));
     }
     getOrCreateIndexDir(r) {
-        return this.indexRootDir.searchOrCreateSubdir(c(r.fullPathHash));
+        return this.indexRootDir.searchOrCreateSubdir(y(r.fullPathHash));
     }
     getTriggerFile(r) {
         return this.triggerRootDir.getFile(r);
@@ -209,11 +218,11 @@ class t extends r {
     getOrCreateTriggerFile(r) {
         return this.triggerRootDir.getOrCreateFile(r);
     }
-    getExpireInfoFile(r, e = !1) {
-        return this.expireRootDir.searchFile(h(r, e));
+    getExpireInfoFile(r, e = "c") {
+        return this.expireRootDir.searchFile(a(r, e));
     }
-    getOrCreateExpireInfoFile(r, e = !1) {
-        return this.expireRootDir.searchOrCreateFile(h(r, e));
+    getOrCreateExpireInfoFile(r, e = "c") {
+        return this.expireRootDir.searchOrCreateFile(a(r, e));
     }
     get triggerFileList() {
         return this.triggerRootDir.fileList;
@@ -227,45 +236,54 @@ class t extends r {
     get rpcFileList() {
         return this.rpcRootDir.fileList;
     }
+    get metaFile() {
+        return this.rootDir.searchOrCreateFile(t);
+    }
     insertTriggerToTree(r, e, t, i) {
         var {
             rootDir: o,
             qyDB: a
-        } = this, i = d("trigger", r, i, a);
-        o.triggerNodes[0].insertTrigger(r, e, t, i), n(o, e);
+        } = this, i = c("trigger", r, i, a);
+        o.triggerNodes[0].insertTrigger(r, e, t, i), s(o, e);
     }
     removeTriggerFromTree(r, e) {
         var t = this.rootDir;
-        t.triggerNodes[0].removeTrigger(r, e) && n(t, e);
+        t.triggerNodes[0].removeTrigger(r, e) && s(t, e);
     }
     insertRpc(r, e) {
         var {
             rpcFunMap: t,
             qyDB: i
-        } = this, e = d("rpc", r, e, i);
+        } = this, e = c("rpc", r, e, i);
         e && (t[r] = e);
     }
     removeRpc(r) {
         delete this.rpcFunMap[r];
     }
     queryFiles(r, e, t, i, o = this.rootDir) {
-        var a = [], t = (C(e) && !t && (t = 1), new u(t, i)), i = this.options.queryAutoCreateIndex;
-        return D(r, e, a, t, o, i), a;
+        var a = [], t = (x(e) && !t && (t = 1), new l(t, i)), i = this.options.queryAutoCreateIndex;
+        return w(r, e, a, t, o, i), a;
     }
     queryFilesMulti(r, e, t, i = this.rootDir) {
-        var o, a, s = [], n = new u(e, t), g = this.options.queryAutoCreateIndex;
-        for ([ o, a ] of r) D(o, a, s, n, i, g);
+        var o, a, s = [], n = new l(e, t), g = this.options.queryAutoCreateIndex;
+        for ([ o, a ] of r) w(o, a, s, n, i, g);
         return s;
     }
     async callRpc(e, r, t) {
         var i, o = this.rpcFunMap[e];
-        if (!o) return Q.warn(i = `RPC ${e} not implemented.`), new Error(i);
+        if (!o) return O.warn(i = `RPC ${e} not implemented.`), new Error(i);
         try {
             return await o(r, t);
         } catch (r) {
-            return Q.error(`Calling RPC ${e} failed:`, r), r;
+            return O.error(`Calling RPC ${e} failed:`, r), r;
         }
     }
+    monitorItemExpire(r, e) {
+        this.qyKVData.monitorItemExpire(r, e);
+    }
+    unmonitorItemExpire(r) {
+        this.qyKVData.unmonitorItemExpire(r);
+    }
     monitorContentExpire(r, e) {
         this.qyKVData.monitorContentExpire(r, e);
     }
@@ -274,18 +292,18 @@ class t extends r {
     }
 }
 
-function h(r, e) {
-    return [ e ? "d" : "f", r.substring(0, 2), r ];
+function a(r, e) {
+    return [ e, r.substring(0, 2), r ];
 }
 
-function c(r) {
+function y(r) {
     return [ r[0], r ];
 }
 
-function D(r, e, t, i, o, a) {
-    e && (a = a ? g(e) : void 0, l(r, o, a, e, t, i));
+function w(r, e, t, i, o, a) {
+    e && (a = a ? n(e) : void 0, g(r, o, a, e, t, i));
 }
 
 export {
-    t as QyCache
+    o as QyCache
 };

package/src/QyDB.d.ts

@@ -7,9 +7,12 @@ export declare class QyDB extends QyCD {
     fetch: any;
     batch: any;
     _immediate: any;
+    creationTime: any;
     constructor(rootFolder?: string, options?: {});
     start(options?: {}): Promise<this>;
     stop(): Promise<void>;
+    get age(): number;
+    get ageSecond(): number;
     get currentBatch(): any;
     createDir(namePath: string | string[]): QyDir;
     createFile(namePath: string | string[]): QyFile;

package/src/QyDB.js

@@ -3,11 +3,11 @@ import {
 } from "node:path";
 
 import {
-    QyFetch as r
+    QyFetch as i
 } from "./QyFetch.js";
 
 import {
-    QyBatch as i
+    QyBatch as r
 } from "./QyBatch.js";
 
 import {
@@ -24,25 +24,32 @@ import {
 
 import {
     isNotNullObj as s,
-    __dirname as c
+    __dirname as n,
+    getNowTime as c,
+    getNowRounded as h
 } from "./QyUtils.js";
 
-let h = e(c, "../data/sampleDataFolder");
+import {
+    logger as m
+} from "./QyLogger.js";
+
+let l = e(n, "../data/sampleDataFolder");
 
-class n extends t {
+class d extends t {
     rootFolder;
     options;
     fetch;
     batch;
     _immediate;
-    constructor(e = h, t) {
-        s(e) && (t = e, e = h), super(), this.options = {
+    creationTime;
+    constructor(e = l, t) {
+        s(e) && (t = e, e = l), 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) => {
+        for (let i of [ "createIndex", "delIndex", "insert", "put", "remove", "delDir", "delFile", "delContent", "insertTrigger", "removeTrigger", "insertRpc", "removeRpc", "expireFile", "expireDir", "expireContent", "removeFileExpire", "removeDirExpire", "removeContentExpire" ]) this[i] = (...e) => {
             var t = this.currentBatch;
-            return t[r].apply(t, e).run();
+            return t[i].apply(t, e).run();
         };
     }
     async start(e) {
@@ -50,28 +57,36 @@ class n extends t {
         return this.qyCache || (e = {
             ...this.options,
             ...e
-        }, t = new a(this.rootFolder, e, this), Object.assign(this, {
+        }, t = new a(this.rootFolder, e, this), e = (Object.assign(this, {
             qyCache: t,
-            fetch: new r(t),
-            batch: new i(t, e),
-            _immediate: new i(t, e)
-        }), await t.start()), this;
+            fetch: new i(t),
+            batch: new r(t, e),
+            _immediate: new r(t, e)
+        }), await t.start(), t).metaFile, e.created ? this.creationTime = e.fileContent.creationTime : this.insert(e, {
+            creationTime: this.creationTime = h()
+        }, !0), m.log("CreationTime:" + new Date(this.creationTime))), this;
     }
     async stop() {
         var {
             qyCache: e,
             fetch: t,
-            batch: r,
-            _immediate: i
+            batch: i,
+            _immediate: r
         } = this;
-        e && (await e.stop(), t && (t.qyCache = void 0), r && (r.qyCache = void 0), 
-        i && (i.qyCache = void 0), Object.assign(this, {
+        e && (await e.stop(), t && (t.qyCache = void 0), i && (i.qyCache = void 0), 
+        r && (r.qyCache = void 0), Object.assign(this, {
             qyCache: void 0,
             fetch: void 0,
             batch: void 0,
             _immediate: void 0
         }));
     }
+    get age() {
+        return c() - this.creationTime;
+    }
+    get ageSecond() {
+        return Math.floor(this.age / 1e3);
+    }
     get currentBatch() {
         var {
             batch: e,
@@ -88,11 +103,11 @@ class n extends t {
     on(e, t) {
         return this.qyCache?.on(e, t);
     }
-    callRpc(e, t, r = void 0) {
-        return this.qyCache?.callRpc(e, t, r);
+    callRpc(e, t, i = void 0) {
+        return this.qyCache?.callRpc(e, t, i);
     }
 }
 
 export {
-    n as QyDB
+    d as QyDB
 };

package/src/QyDefaultOptions.js

@@ -56,9 +56,6 @@ let t = {
     },
     QyKVDataSaver_Worker: {
         noAcl: !1
-    },
-    QyExpireClock: {
-        expireInterval: 1e3
     }
 };
 

package/src/QyDir.d.ts

@@ -45,4 +45,5 @@ export declare class QyDir extends QyItem {
     filterSubdirNames(filterFun: any): Generator<QyDir, void, unknown>;
     compareSubdirRangeL2H(cmpFun: any): Generator<QyDir, void, unknown>;
     compareSubdirRangeH2L(cmpFun: any): Generator<QyDir | undefined, void, unknown>;
+    ensureAllLoaded(): this;
 }

package/src/QyDir.js

@@ -6,14 +6,19 @@ import {
     getSubdirMapKey as i,
     getFileMapKey as t,
     SpecialFilePaths as r,
-    isString as d
+    isString as d,
+    getNowTime as l
 } from "./QyUtils.js";
 
 import {
-    QyFile as s
+    QyFile as a
 } from "./QyFile.js";
 
-let a = r.HiddenFolderName;
+import {
+    handleExpiredItem as o
+} from "./QyExpire.js";
+
+let s = r.HiddenFolderName;
 
 class u extends e {
     _subdirCount = 0;
@@ -35,10 +40,10 @@ class u extends e {
         ++i.subdirMapChangeCount);
     }
     get fileCount() {
-        return n(this), this._fileCount;
+        return f(this), this._fileCount;
     }
     get subdirCount() {
-        return l(this), this._subdirCount;
+        return n(this), this._subdirCount;
     }
     get isDir() {
         return !0;
@@ -47,7 +52,7 @@ class u extends e {
         return 0 == this.fileCount && 0 == this.subdirCount;
     }
     get isHiddenFolder() {
-        return this.name == a;
+        return this.name == s;
     }
     get subdirMapKey() {
         return this._subdirMapKey || (this._subdirMapKey = i(this.fullPathHash));
@@ -56,10 +61,10 @@ class u extends e {
         return this._fileMapKey || (this._fileMapKey = t(this.fullPathHash));
     }
     get subdirMap() {
-        return l(this), this._subdirMap;
+        return n(this), this._subdirMap;
     }
     get fileMap() {
-        return n(this), this._fileMap;
+        return f(this), this._fileMap;
     }
     getSubdir(e) {
         var i;
@@ -85,7 +90,7 @@ class u extends e {
     getOrCreateFile(e, i = !1) {
         let t = this.fileMap;
         var r = (t = t || (this._fileMap = {}))[e];
-        return r || (r = t[e] = new s(e, i, this), this.setChildTriggerNodes(r)), 
+        return r || (r = t[e] = new a(e, i, this), this.setChildTriggerNodes(r)), 
         r;
     }
     searchSubdir(i, t = i.length) {
@@ -187,6 +192,10 @@ class u extends e {
             } else if (i(a)) yield s, r = !0; else if (r) return;
         }
     }
+    ensureAllLoaded() {
+        for (var e of this.allFiles()) e.ensureLoaded();
+        return this;
+    }
 }
 
 function h(e, i, t, r) {
@@ -194,34 +203,54 @@ function h(e, i, t, r) {
     return e[i] && e[s] == t || (e[i] = r(), e[s] = t), e[i];
 }
 
-function l(e) {
-    if (e.created && !e._subdirMap && !e.subdirMapLoaded) {
+function n(e) {
+    if (e.created && !e.subdirMapLoaded) {
         e.subdirMapLoaded = !0;
         var i = e.qyCache;
         if (i) {
-            i = i.qyKVData.getValueSync(e.subdirMapKey);
-            if (i) {
-                var t, r = e._subdirMap = {};
-                for (t in i) r[t] = new u(t, !0, e);
+            var t = i.qyKVData.getValueSync(e.subdirMapKey);
+            if (t) {
+                var r, s = e._subdirMap || (e._subdirMap = {});
+                for (r in t) r in s || (s[r] = new u(r, !0, e));
+                e.underHiddenFolder || p(e, i, "d");
             }
         }
     }
 }
 
-function n(e) {
+function f(e) {
     if (e.created && !e._fileMap && !e.fileMapLoaded) {
         e.fileMapLoaded = !0;
         var i = e.qyCache;
         if (i) {
-            i = i.qyKVData.getValueSync(e.fileMapKey);
-            if (i) {
-                var t, r = e._fileMap = {};
-                for (t in i) r[t] = new s(t, !0, e);
+            var t = i.qyKVData.getValueSync(e.fileMapKey);
+            if (t) {
+                var r, s = e._fileMap = {};
+                for (r in t) s[r] = new a(r, !0, e);
+                e.underHiddenFolder || p(e, i, "f");
             }
         }
     }
 }
 
+function p(e, i, t) {
+    if ("d" == t) {
+        if (e.dExpireChecked) return;
+        e.dExpireChecked = !0;
+    } else {
+        if (e.fExpireChecked) return;
+        e.fExpireChecked = !0;
+    }
+    var r = i.getExpireInfoFile(e.fullPathHash, t);
+    if (r) {
+        var s, a = r.fileContent, d = l(), u = i.qyDB;
+        for (s in a) {
+            var h = "d" == t ? e.getOrCreateSubdir(s) : e.getOrCreateFile(s), n = a[s];
+            n <= d ? o(u, h) : i.monitorItemExpire(h, n);
+        }
+    }
+}
+
 export {
     u as QyDir
 };

package/src/QyExpire.d.ts

@@ -1,21 +1,15 @@
 import { QyMessager } from "./QyMessager.ts";
-export declare const WholeFileProp = "[\"\"]";
 export declare class QyExpire extends QyMessager {
     qyCache: any;
-    hashToFileMap: {};
-    maxSecond: number;
-    startTime: any;
+    expireMap: {};
+    roundedStartTime: any;
     constructor(qyCache: any, options?: any);
-    monitorContentExpire(file: any, flattedAbsSecondObj: any): void;
+    monitorItemExpire(item: any, expireAbsTime: any): void;
+    unmonitorItemExpire(item: any): void;
+    monitorContentExpire(file: any, flattedAbsTimeObj: any): void;
     unmonitorContentExpire(file: any, flattedDelObj: any): void;
-    onExpireEmpty(maxSecond: any): void;
-    onFileAllExpireRemoved(fullPathHash: any): void;
-    onContentExpired(expiredInfoMap: any): void;
+    onEmptyHashList(emptyHashList: any): void;
+    onExpired(hashExpiredInfoMap: 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;
+export declare function handleExpiredItem(qyDB: any, item: any): void;
+export declare function handleExpiredProps(qyDB: any, file: any, expiredProps: any): void;