datafolder 1.0.11 → 1.0.12

package/src/QyKVData.js

@@ -11,11 +11,11 @@ import {
 } from "./QyDefaultOptions.js";
 
 import {
-    QyKVDataSaver as p
+    QyKVDataSaver as i
 } from "./QyKVDataSaver.js";
 
 import {
-    QySnapshotCompactor as i
+    QySnapshotCompactor as p
 } from "./QySnapshotCompactor.js";
 
 import {
@@ -23,16 +23,19 @@ import {
 } from "./QyKVDataCleaner.js";
 
 import {
-    arrayLast as y,
-    readBufferAsync as C,
+    readBufferAsync as y,
     sleep as c
 } from "./QyUtils.js";
 
 import {
-    logger as g
+    logger as C
 } from "./QyLogger.js";
 
-class a {
+import {
+    QyExpire as h
+} from "./QyExpire.js";
+
+class t {
     kvFolder;
     snapshotFolder;
     qyCache;
@@ -50,111 +53,114 @@ class a {
     aclKeyValueMap;
     compactInterval;
     unloadInterval;
-    constructor(a, t, o) {
-        t = {
+    qyExpire;
+    constructor(t, a, o) {
+        a = {
             ...s("QyKVData"),
-            ...t
+            ...a
         };
-        var e = n(a, "snapshot");
+        var e = n(t, "snapshot");
         Object.assign(this, {
             qyCache: o,
-            options: t,
-            kvFolder: a,
+            options: a,
+            kvFolder: t,
             snapshotFolder: e,
-            qyKVDataSaver: new p(this, a, t),
-            qySnapshotCompactor: new i(this, a, t),
-            qyKVDataCleaner: new r(this, a, t)
+            qyKVDataSaver: new i(this, t, a),
+            qySnapshotCompactor: new p(this, t, a),
+            qyKVDataCleaner: new r(this, t, a),
+            qyExpire: new h(o, a)
         });
     }
-    start(a, t, o, e) {
+    start(t, a, o, e) {
         var {
             options: n,
             qyKVDataSaver: s,
-            qySnapshotCompactor: p,
-            qyKVDataCleaner: i
+            qySnapshotCompactor: i,
+            qyKVDataCleaner: p
         } = this, {
             maxSnapshotNum: r,
             snapshotMaxChangeId: h
-        } = o, s = (s.start(a, r, t, e), p.start(), i.start(), setInterval(() => l(this), n.compactSnapshotsInterval)), r = setInterval(() => (async o => {
+        } = o, s = (s.start(t, r, a, e), i.start(), p.start(), this.qyExpire.start(), 
+        setInterval(() => l(this), n.compactSnapshotsInterval)), r = setInterval(() => (async o => {
             if (!o.unloadingMemory) {
                 o.unloadingMemory = !0;
                 var {
                     qyCache: e,
                     options: n
                 } = o;
-                let a = 0, t = 0;
+                let t = 0, a = 0;
                 if (e) {
-                    var s, p = n.maxFileCountToUnload, n = e.rootDir;
-                    t = d(o, n), a = t;
-                    for (s of n.allLoadedSubdirs()) if ((t += d(o, s)) > p && (a += t, 
-                    t = 0, await c(0), o.isStopping)) break;
+                    var s, i = n.maxFileCountToUnload, n = e.rootDir;
+                    a = d(o, n), t = a;
+                    for (s of n.allLoadedSubdirs()) if ((a += d(o, s)) > i && (t += a, 
+                    a = 0, await c(0), o.isStopping)) break;
                 }
-                a += t, global.gc && global.gc(), o.unloadingMemory = !1;
+                t += a, global.gc && global.gc(), o.unloadingMemory = !1;
             }
         })(this), n.unloadMemInterval);
         return Object.assign(this, {
-            maxChangeId: a,
+            maxChangeId: t,
             snapshotSavedChangeId: h,
             qySnapshots: o,
             aclKeyValueMap: e,
             compactInterval: s,
             unloadInterval: r
-        }), n.bgLoadPosMaps ? (async a => {
-            var t, {
+        }), n.bgLoadPosMaps ? (async t => {
+            var a, {
                 qySnapshots: o,
                 options: e
-            } = a;
+            } = t;
             console.time("bgLoadPosMaps");
-            for (t of Object.keys(o.numToSnapshotMap).sort((a, t) => t - a)) {
-                if (await async function s(p, i, r = void 0, h = void 0, c = void 0, l = void 0) {
-                    if (p.isStopping) return void (l && l.close());
-                    let d = p.qySnapshots;
+            for (a of Object.keys(o.numToSnapshotMap).sort((t, a) => a - t)) {
+                if (await async function s(i, p, r = void 0, h = void 0, c = void 0, l = void 0) {
+                    if (i.isStopping) return void (l && l.close());
+                    let d = i.qySnapshots;
                     let m = d.numToSnapshotMap;
-                    let S = m[i];
-                    if (!S) return void (l && l.close());
+                    let u = m[p];
+                    if (!u) return void (l && l.close());
                     let {
-                        info: u,
+                        info: S,
                         prefixPM: v
-                    } = S;
+                    } = u;
                     r = r || Object.keys(v).sort().reverse();
                     if (0 == r.length) return void (l && l.close());
-                    if (null == h || h != u.pMVersion) return l && l.close(), c = d.getPMFilePath(S), 
-                    s(p, i, r, u.pMVersion, c, await f(c));
+                    if (null == h || h != S.pMVersion) return l && l.close(), c = d.getPMFilePath(u), 
+                    s(i, p, r, S.pMVersion, c, await f(c));
                     for (;0 < r.length; ) {
-                        let e = y(r), n = v[e];
+                        let e = r.at(-1), n = v[e];
                         if (n) {
-                            let [ a, t ] = n, o = await C(c, l, a, t);
-                            if (p.isStopping || !m[i]) return void l.close();
-                            if (h != u.pMVersion) return l.close(), s(p, i, r);
-                            e in v && d.loadPartialPosMapBuffer(S, e, o);
+                            let [ t, a ] = n, o = await y(c, l, t, a);
+                            if (i.isStopping || !m[p]) return void l.close();
+                            if (h != S.pMVersion) return l.close(), s(i, p, r);
+                            e in v && d.loadPartialPosMapBuffer(u, e, o);
                         }
                         r.pop();
                     }
                     l.close();
-                    g.info("bgLoadPosMap:" + i);
-                }(a, t), a.isStopping) break;
-                if (await c(0), a.isStopping) break;
+                    C.info("bgLoadPosMap:" + p);
+                }(t, a), t.isStopping) break;
+                if (await c(0), t.isStopping) break;
             }
-            console.timeEnd("bgLoadPosMaps"), !a.isStopping && e.compactAtStart && l(a);
+            console.timeEnd("bgLoadPosMaps"), !t.isStopping && e.compactAtStart && l(t);
         })(this) : n.compactAtStart && l(this), this;
     }
     async stop() {
         this.isStopping = !0;
         var {
-            qyKVDataSaver: a,
-            qySnapshotCompactor: t,
+            qyKVDataSaver: t,
+            qySnapshotCompactor: a,
             qySnapshots: o,
             compactInterval: e,
             unloadInterval: n,
             qyKVDataCleaner: s
         } = this;
-        clearInterval(e), clearInterval(n), this.onSnapshotSavedChangeId(await a.stop()), 
-        o && o.closeAllFDs(), await t.stop(), await s.stop();
+        clearInterval(e), clearInterval(n), this.onSnapshotSavedChangeId(await t.stop()), 
+        o && o.closeAllFDs(), await a.stop(), await s.stop(), await this.qyExpire.stop();
     }
-    save(a, t, o, e) {
+    save(t, a, o, e) {
         var n = this.qyKVDataSaver;
-        if (e) return n.callSave(a, t, o);
-        n.castSave(a, t, o);
+        if (e) return n.callSave(t, a, o);
+        n.castSave(t, a, o);
     }
     increaseChangeId() {
         return ++this.maxChangeId;
@@ -162,68 +168,68 @@ class a {
     decreaseChangeId() {
         --this.maxChangeId;
     }
-    getValueSync(a) {
+    getValueSync(t) {
         var {
-            qySnapshots: t,
+            qySnapshots: a,
             aclKeyValueMap: o
         } = this;
-        return a in o ? o[a] : t.getValueSync(a);
+        return t in o ? o[t] : a.getValueSync(t);
     }
-    removeKey(a) {
+    removeKey(t) {
         var {
-            qySnapshots: t,
+            qySnapshots: a,
             aclKeyValueMap: o
         } = this;
-        if (!(a in o)) return t.removeKey(a);
-        o[a] = void 0;
+        if (!(t in o)) return a.removeKey(t);
+        o[t] = void 0;
     }
-    onSnapshotSavedChangeId(a, t = void 0) {
-        this.snapshotSavedChangeId = a;
+    onSnapshotSavedChangeId(t, a = void 0) {
+        this.snapshotSavedChangeId = t;
         var {
             compactState: o,
             compactMaxChangeId: e,
             qyKVDataSaver: n
         } = this;
-        if (3 == o && e <= a && (L(this), this.compactState = 1), t) {
-            var s, o = t, p = this.qySnapshots, i = p.keyToSnapshotMap;
+        if (3 == o && e <= t && (x(this), this.compactState = 1), a) {
+            var s, o = a, i = this.qySnapshots, p = i.keyToSnapshotMap;
             for (s in o.posMap) {
-                var r = i[s];
-                r && p.removeKeyFromSnapshot(r, s);
+                var r = p[s];
+                r && i.removeKeyFromSnapshot(r, s);
             }
-            p.addMaxSnapshot(o), g.info("addPMOnlySnapshot: " + p.snapshotMaxChangeId), 
-            n.releaseSnapshot(t.snapshotNum);
+            i.addMaxSnapshot(o), C.info("addPMOnlySnapshot: " + i.snapshotMaxChangeId), 
+            n.releaseSnapshot(a.snapshotNum);
         }
     }
-    onCompactUpdates(a) {
+    onCompactUpdates(t) {
         if (2 == this.compactState) {
             var l = this, {
-                pMUpdates: a,
+                pMUpdates: t,
                 vLUpdates: d,
                 combinationUpdate: m
-            } = a = a;
-            if (a) {
-                var t = a, o = l.qySnapshots.numToSnapshotMap;
-                for (s in t) {
-                    var e, n = t[s], s = o[s], {
-                        prefixPM: p,
-                        info: i
+            } = t = t;
+            if (t) {
+                var a = t, o = l.qySnapshots.numToSnapshotMap;
+                for (s in a) {
+                    var e, n = a[s], s = o[s], {
+                        prefixPM: i,
+                        info: p
                     } = s;
-                    for (e in ++i.pMVersion, i.verList[0] = i.pMVersion + i.vLVersion, 
-                    p) p[e] = n[e];
-                    (a => {
+                    for (e in ++p.pMVersion, p.verList[0] = p.pMVersion + p.vLVersion, 
+                    i) i[e] = n[e];
+                    (t => {
                         var {
-                            info: t,
+                            info: a,
                             compactOutedCount: o
-                        } = a;
-                        t.outdatedCount += o, a.outdatedCount -= o, a.compactOutedCount = 0;
+                        } = t;
+                        a.outdatedCount += o, t.outdatedCount -= o, t.compactOutedCount = 0;
                     })(s);
                 }
             }
             if (d) {
-                var r = d, h = (a = l).qySnapshots.numToSnapshotMap;
+                var r = d, h = (t = l).qySnapshots.numToSnapshotMap;
                 for (f in r) {
-                    var c, S, {
-                        posMap: u,
+                    var c, u, {
+                        posMap: S,
                         prefixPM: v
                     } = r[f], f = h[f], {
                         posMap: y,
@@ -231,9 +237,9 @@ class a {
                         info: g
                     } = f;
                     for (c in ++g.pMVersion, ++g.vLVersion, g.verList[0] = g.pMVersion + g.vLVersion, 
-                    y) y[c] = u[c];
-                    for (S in C) C[S] = v[S];
-                    q(f);
+                    y) y[c] = S[c];
+                    for (u in C) C[u] = v[u];
+                    I(f);
                 }
             }
             if (m) {
@@ -242,88 +248,94 @@ class a {
                     numToSnapshotMap: n,
                     keyToSnapshotMap: s
                 } = e, {
-                    snapshotNum: a,
-                    combinedSnapshotNumVerList: t,
-                    posMap: p
-                } = d, i = n[a], {
+                    snapshotNum: t,
+                    combinedSnapshotNumVerList: a,
+                    posMap: i
+                } = d, p = n[t], {
                     posMap: r,
                     info: o
-                } = i;
+                } = p;
                 for (M in ++o.pMVersion, ++o.vLVersion, o.verList[0] = o.pMVersion + o.vLVersion, 
-                r) r[M] = p[M];
-                q(i);
-                let h = o.totalCount, c = i.outdatedCount;
-                for (let [ o ] of t) {
-                    var V, I = n[o];
+                r) r[M] = i[M];
+                I(p);
+                let h = o.totalCount, c = p.outdatedCount;
+                for (let [ o ] of a) {
+                    var V, q = n[o];
                     let {
-                        posMap: a,
-                        info: t
-                    } = I;
-                    for (V in a) r[V] = p[V], s[V] = i;
-                    q(I), h += t.totalCount, c += I.outdatedCount, e.delSnapshot(I);
+                        posMap: t,
+                        info: a
+                    } = q;
+                    for (V in t) r[V] = i[V], s[V] = p;
+                    I(q), h += a.totalCount, c += q.outdatedCount, e.delSnapshot(q);
                 }
-                o.totalCount = h, i.outdatedCount = c;
+                o.totalCount = h, p.outdatedCount = c;
             }
-            this.snapshotSavedChangeId >= this.compactMaxChangeId ? (L(this), this.compactState = 1) : this.compactState = 3;
+            this.snapshotSavedChangeId >= this.compactMaxChangeId ? (x(this), this.compactState = 1) : this.compactState = 3;
         }
     }
+    monitorContentExpire(t, a) {
+        this.qyExpire.monitorContentExpire(t, a);
+    }
+    unmonitorContentExpire(t, a) {
+        this.qyExpire.unmonitorContentExpire(t, a);
+    }
 }
 
-function q(a) {
+function I(t) {
     var {
-        info: t,
+        info: a,
         compactOutedCount: o
-    } = a;
-    t.totalCount -= t.outdatedCount + o, t.outdatedCount = 0, a.outdatedCount -= o, 
-    a.compactOutedCount = 0;
+    } = t;
+    a.totalCount -= a.outdatedCount + o, a.outdatedCount = 0, t.outdatedCount -= o, 
+    t.compactOutedCount = 0;
 }
 
-function l(a) {
-    if (1 == a.compactState) {
+function l(t) {
+    if (1 == t.compactState) {
         var {
-            maxChangeId: t,
+            maxChangeId: a,
             qySnapshots: o,
             qySnapshotCompactor: e
-        } = a, {
+        } = t, {
             emptySnapshotNumVerList: o,
             pMCompactSnapshotList: n,
             vLCompactSnapshotList: s,
-            combiningSnapshotList: p
+            combiningSnapshotList: i
         } = o.calOutdates();
-        if (0 < p.length || 0 < n.length || 0 < s.length) {
-            Object.assign(a, {
+        if (0 < i.length || 0 < n.length || 0 < s.length) {
+            Object.assign(t, {
                 compactState: 2,
-                compactMaxChangeId: t
+                compactMaxChangeId: a
             });
-            for (var i of [ n, s, p ]) for (var r of i) r.compactOutedCount = r.outdatedCount;
-            e.compactSnapshots(n, s, p);
+            for (var p of [ n, s, i ]) for (var r of p) r.compactOutedCount = r.outdatedCount;
+            e.compactSnapshots(n, s, i);
         }
-        0 < o.length && (a.emptySnapshotNumVerList.push(...o), a.snapshotSavedChangeId >= t ? h(a) : 1 == a.compactState && Object.assign(a, {
+        0 < o.length && (t.emptySnapshotNumVerList.push(...o), t.snapshotSavedChangeId >= a ? m(t) : 1 == t.compactState && Object.assign(t, {
             compactState: 3,
-            compactMaxChangeId: t
+            compactMaxChangeId: a
         }));
     }
 }
 
-function d(a, t) {
-    var o = a.qySnapshots.snapshotMaxChangeId;
+function d(t, a) {
+    var o = t.qySnapshots.snapshotMaxChangeId;
     let e = 0;
-    if (t.fileMapLoaded) for (var n of t.fileList) ++e, n.cChangeId <= o && (n.visited ? n.visited = !1 : n.unloadFileContent());
+    if (a.fileMapLoaded) for (var n of a.fileList) ++e, n.cChangeId <= o && (n.visited ? n.visited = !1 : n.unloadFileContent());
     return e;
 }
 
-function h(a) {
+function m(t) {
     var {
-        qyKVDataCleaner: a,
-        emptySnapshotNumVerList: t
-    } = a;
-    0 < t.length && (a.removeSnapshotsFiles(t), t.length = 0);
+        qyKVDataCleaner: t,
+        emptySnapshotNumVerList: a
+    } = t;
+    0 < a.length && (t.removeSnapshotsFiles(a), a.length = 0);
 }
 
-function L(a) {
-    a.qySnapshotCompactor.saveSnapshotInfos(), h(a);
+function x(t) {
+    t.qySnapshotCompactor.saveSnapshotInfos(), m(t);
 }
 
 export {
-    a as QyKVData
+    t as QyKVData
 };

package/src/QyKVDataCleaner.js

@@ -8,13 +8,13 @@ import {
 
 class s extends e {
     constructor(e, s, a) {
-        super(e, "QyKVDataCleaner_Worker", {
+        super("QyKVDataCleaner_Worker", {
             kvFolder: s,
             options: a = {
                 ...r("QyKVDataCleaner"),
                 ...a
             }
-        }, a, [], [ "cleanAclFiles", "cleanPMFiles", "cleanVLFiles", "removeSnapshotsFiles" ]);
+        }, a, [], [ "cleanAclFiles", "cleanPMFiles", "cleanVLFiles", "removeSnapshotsFiles" ], e);
     }
 }
 

package/src/QyKVDataSaver.js

@@ -8,13 +8,13 @@ import {
 
 class a extends e {
     constructor(e, a, s) {
-        super(e, "QyKVDataSaver_Worker", {
+        super("QyKVDataSaver_Worker", {
             kvFolder: a,
             options: s = {
                 ...r("QyKVDataSaver"),
                 ...s
             }
-        }, s, [ "callSave" ], [ "castSave", "releaseSnapshot" ]);
+        }, s, [ "callSave" ], [ "castSave", "releaseSnapshot" ], e);
     }
 }
 

package/src/QyKVDataSaver_Worker.d.ts

@@ -16,8 +16,8 @@ export default class QyKVDataSaver_Worker extends QyMessageWorker {
     });
     _op_start(maxChangeId: any, maxSnapshotNum: any, loadedMaxAclNum: any, aclKeyValueMap: any): void;
     _op_stop(): Promise<any>;
-    callSave(changeId: any, cmdArgAsListObj: any, syncList: any): any;
-    castSave(changeId: any, cmdArgAsListObj: any, syncList: any): any;
+    callSave(changeId: any, cmdArgAsListChanges: any, syncList: any): any;
+    castSave(changeId: any, cmdArgAsListChanges: any, syncList: any): any;
     releaseSnapshot(snapshotNum: any): void;
     onSnapshotSavedChangeId(snapshotSavedChangeId: any, pMOnlySnapshot: any): void;
 }

package/src/QyKVDataSaver_Worker.js

@@ -84,7 +84,7 @@ export default class extends a {
         this.qySnapshotSaver.releaseSnapshot(a);
     }
     onSnapshotSavedChangeId(a, s) {
-        this.isSavingSnapshot = !1, this.saveSnapshotResolve ? this.saveSnapshotResolve() : this.isStopping || this.castParent("onSnapshotSavedChangeId", a, s);
+        this.isSavingSnapshot = !1, this.saveSnapshotResolve ? this.saveSnapshotResolve() : this.isStopping || this.postParent("onSnapshotSavedChangeId", a, s);
     }
 }
 
@@ -93,8 +93,8 @@ function h(a, s, t, e, o = !1) {
         qyAclSaver: n,
         qySnapshotSaver: r,
         options: h,
-        snapshotMaxChangeId: i,
-        currentAclNum: p,
+        snapshotMaxChangeId: p,
+        currentAclNum: i,
         isSavingSnapshot: S
     } = a;
     let v;
@@ -104,8 +104,8 @@ function h(a, s, t, e, o = !1) {
         var g = c.length;
         for (let a = 0; a < g; a += 2) m(l, c[a]);
     }
-    return r.castSave(s, t, e), a.maxChangeId = s, !S && s - i >= h.snapshotMaxChangeCount && (++a.currentAclNum, 
-    n && n.switch(d(a)), r.saveSnapshot(p), Object.assign(a, {
+    return r.castSave(s, t, e), a.maxChangeId = s, !S && s - p >= h.snapshotMaxChangeCount && (++a.currentAclNum, 
+    n && n.switch(d(a)), r.saveSnapshot(i), Object.assign(a, {
         snapshotMaxChangeId: s,
         isSavingSnapshot: !0
     })), v;

package/src/QyLogFileSaver.js

@@ -8,10 +8,10 @@ import {
 
 class s extends e {
     constructor(e, s) {
-        super(e, "QyLogFileSaver_Worker", s = {
+        super("QyLogFileSaver_Worker", s = {
             ...r("QyLogFileSaver"),
             ...s
-        }, s, [], [ "switch", "save" ]);
+        }, s, [], [ "switch", "save" ], e);
     }
 }
 

package/src/QyMessageWorker.d.ts

@@ -1,5 +1,5 @@
 import { QyOpRunner } from "./QyOpRunner.ts";
 export declare class QyMessageWorker extends QyOpRunner {
     constructor(options: any, callOpNameList?: any[], castOpNameList?: any[]);
-    castParent(opName: any, ...args: any[]): void;
+    postParent(opName: any, ...args: any[]): void;
 }

package/src/QyMessageWorker.js

@@ -1,5 +1,5 @@
 import {
-    parentPort as o
+    parentPort as t
 } from "node:worker_threads";
 
 import {
@@ -7,7 +7,7 @@ import {
 } from "./QyDefaultOptions.js";
 
 import {
-    logger as n
+    logger as p
 } from "./QyLogger.js";
 
 import {
@@ -19,7 +19,7 @@ class e extends s {
         super(s = {
             ...a("QyMessageWorker"),
             ...s
-        }, e, r), o?.on("message", async s => {
+        }, e, r), t?.on("message", async s => {
             var {
                 opName: e,
                 _cast: r
@@ -27,22 +27,22 @@ class e extends s {
             if (e) {
                 var a = s.args || [];
                 try {
-                    var t = await this[e](...a);
-                    r || o?.postMessage({
+                    var o = await this[e](...a);
+                    r || t?.postMessage({
                         ack: e,
-                        result: t
+                        result: o
                     }), "stop" == e && process.exit();
                 } catch (s) {
-                    n.error(`Running ${e} failed:`, s), r || o?.postMessage({
+                    p.error(`Running ${e} failed:`, s), r || t?.postMessage({
                         ack: e,
                         exception: s
                     });
                 }
-            } else n.warn("Msg ignored:", s);
+            } else p.warn("Msg ignored:", s);
         });
     }
-    castParent(s, ...e) {
-        o?.postMessage({
+    postParent(s, ...e) {
+        t?.postMessage({
             opName: s,
             args: e,
             _cast: !0

package/src/QyMessager.d.ts

@@ -3,7 +3,7 @@ export declare class QyMessager {
     worker: any;
     receiverQueueMap: any;
     options: any;
-    constructor(parent: any, workerTypeFileName: any, initArgMap: any, options: any, callOpNameList?: any[], castOpNameList?: any[]);
+    constructor(workerTypeFileName: any, initArgMap: any, options: any, callOpNameList?: any[], castOpNameList?: any[], workerMsgProcessor?: this);
     start(...args: any[]): any;
     stop(...args: any[]): any;
     castWorker(opName: any, args: any): void;