datafolder 1.0.12 → 1.0.13

package/src/QyKVData.js

@@ -15,16 +15,16 @@ import {
 } from "./QyKVDataSaver.js";
 
 import {
-    QySnapshotCompactor as p
+    QySnapshotCompactor as r
 } from "./QySnapshotCompactor.js";
 
 import {
-    QyKVDataCleaner as r
+    QyKVDataCleaner as p
 } from "./QyKVDataCleaner.js";
 
 import {
     readBufferAsync as y,
-    sleep as c
+    sleep as l
 } from "./QyUtils.js";
 
 import {
@@ -66,8 +66,8 @@ class t {
             kvFolder: t,
             snapshotFolder: e,
             qyKVDataSaver: new i(this, t, a),
-            qySnapshotCompactor: new p(this, t, a),
-            qyKVDataCleaner: new r(this, t, a),
+            qySnapshotCompactor: new r(this, t, a),
+            qyKVDataCleaner: new p(this, t, a),
             qyExpire: new h(o, a)
         });
     }
@@ -76,12 +76,12 @@ class t {
             options: n,
             qyKVDataSaver: s,
             qySnapshotCompactor: i,
-            qyKVDataCleaner: p
+            qyKVDataCleaner: r,
+            qyExpire: p
         } = this, {
-            maxSnapshotNum: r,
-            snapshotMaxChangeId: h
-        } = o, s = (s.start(t, r, a, e), i.start(), p.start(), this.qyExpire.start(), 
-        setInterval(() => l(this), n.compactSnapshotsInterval)), r = setInterval(() => (async o => {
+            maxSnapshotNum: h,
+            snapshotMaxChangeId: c
+        } = o, s = (s.start(t, h, a, e), i.start(), r.start(), p.start(), setInterval(() => m(this), n.compactSnapshotsInterval)), h = setInterval(() => (async o => {
             if (!o.unloadingMemory) {
                 o.unloadingMemory = !0;
                 var {
@@ -93,18 +93,18 @@ class t {
                     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 = 0, await l(0), o.isStopping)) break;
                 }
                 t += a, global.gc && global.gc(), o.unloadingMemory = !1;
             }
         })(this), n.unloadMemInterval);
         return Object.assign(this, {
             maxChangeId: t,
-            snapshotSavedChangeId: h,
+            snapshotSavedChangeId: c,
             qySnapshots: o,
             aclKeyValueMap: e,
             compactInterval: s,
-            unloadInterval: r
+            unloadInterval: h
         }), n.bgLoadPosMaps ? (async t => {
             var a, {
                 qySnapshots: o,
@@ -112,37 +112,37 @@ class t {
             } = t;
             console.time("bgLoadPosMaps");
             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 (await async function s(i, r, p = 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 u = m[p];
+                    let m = i.qySnapshots;
+                    let d = m.numToSnapshotMap;
+                    let u = d[r];
                     if (!u) return void (l && l.close());
                     let {
                         info: S,
                         prefixPM: v
                     } = u;
-                    r = r || Object.keys(v).sort().reverse();
-                    if (0 == r.length) return void (l && l.close());
-                    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 = r.at(-1), n = v[e];
+                    p = p || Object.keys(v).sort().reverse();
+                    if (0 == p.length) return void (l && l.close());
+                    if (null == h || h != S.pMVersion) return l && l.close(), c = m.getPMFilePath(u), 
+                    s(i, r, p, S.pMVersion, c, await f(c));
+                    for (;0 < p.length; ) {
+                        let e = p.at(-1), n = v[e];
                         if (n) {
                             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);
+                            if (i.isStopping || !d[r]) return void l.close();
+                            if (h != S.pMVersion) return l.close(), s(i, r, p);
+                            e in v && m.loadPartialPosMapBuffer(u, e, o);
                         }
-                        r.pop();
+                        p.pop();
                     }
                     l.close();
-                    C.info("bgLoadPosMap:" + p);
+                    C.info("bgLoadPosMap:" + r);
                 }(t, a), t.isStopping) break;
-                if (await c(0), t.isStopping) break;
+                if (await l(0), t.isStopping) break;
             }
-            console.timeEnd("bgLoadPosMaps"), !t.isStopping && e.compactAtStart && l(t);
-        })(this) : n.compactAtStart && l(this), this;
+            console.timeEnd("bgLoadPosMaps"), !t.isStopping && e.compactAtStart && m(t);
+        })(this) : n.compactAtStart && m(this), this;
     }
     async stop() {
         this.isStopping = !0;
@@ -152,10 +152,11 @@ class t {
             qySnapshots: o,
             compactInterval: e,
             unloadInterval: n,
-            qyKVDataCleaner: s
+            qyKVDataCleaner: s,
+            qyExpire: i
         } = this;
-        clearInterval(e), clearInterval(n), this.onSnapshotSavedChangeId(await t.stop()), 
-        o && o.closeAllFDs(), await a.stop(), await s.stop(), await this.qyExpire.stop();
+        clearInterval(e), clearInterval(n), await i.stop(), this.onSnapshotSavedChangeId(await t.stop()), 
+        o && o.closeAllFDs(), await a.stop(), await s.stop();
     }
     save(t, a, o, e) {
         var n = this.qyKVDataSaver;
@@ -191,10 +192,10 @@ class t {
             qyKVDataSaver: n
         } = this;
         if (3 == o && e <= t && (x(this), this.compactState = 1), a) {
-            var s, o = a, i = this.qySnapshots, p = i.keyToSnapshotMap;
+            var s, o = a, i = this.qySnapshots, r = i.keyToSnapshotMap;
             for (s in o.posMap) {
-                var r = p[s];
-                r && i.removeKeyFromSnapshot(r, s);
+                var p = r[s];
+                p && i.removeKeyFromSnapshot(p, s);
             }
             i.addMaxSnapshot(o), C.info("addPMOnlySnapshot: " + i.snapshotMaxChangeId), 
             n.releaseSnapshot(a.snapshotNum);
@@ -204,17 +205,17 @@ class t {
         if (2 == this.compactState) {
             var l = this, {
                 pMUpdates: t,
-                vLUpdates: d,
-                combinationUpdate: m
+                vLUpdates: m,
+                combinationUpdate: d
             } = 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
+                        info: r
                     } = s;
-                    for (e in ++p.pMVersion, p.verList[0] = p.pMVersion + p.vLVersion, 
+                    for (e in ++r.pMVersion, r.verList[0] = r.pMVersion + r.vLVersion, 
                     i) i[e] = n[e];
                     (t => {
                         var {
@@ -225,13 +226,13 @@ class t {
                     })(s);
                 }
             }
-            if (d) {
-                var r = d, h = (t = l).qySnapshots.numToSnapshotMap;
-                for (f in r) {
+            if (m) {
+                var p = m, h = (t = l).qySnapshots.numToSnapshotMap;
+                for (f in p) {
                     var c, u, {
                         posMap: S,
                         prefixPM: v
-                    } = r[f], f = h[f], {
+                    } = p[f], f = h[f], {
                         posMap: y,
                         prefixPM: C,
                         info: g
@@ -242,8 +243,8 @@ class t {
                     I(f);
                 }
             }
-            if (m) {
-                var M, d = m;
+            if (d) {
+                var M, m = d;
                 let e = l.qySnapshots, {
                     numToSnapshotMap: n,
                     keyToSnapshotMap: s
@@ -251,24 +252,24 @@ class t {
                     snapshotNum: t,
                     combinedSnapshotNumVerList: a,
                     posMap: i
-                } = d, p = n[t], {
-                    posMap: r,
+                } = m, r = n[t], {
+                    posMap: p,
                     info: o
-                } = p;
+                } = r;
                 for (M in ++o.pMVersion, ++o.vLVersion, o.verList[0] = o.pMVersion + o.vLVersion, 
-                r) r[M] = i[M];
-                I(p);
-                let h = o.totalCount, c = p.outdatedCount;
+                p) p[M] = i[M];
+                I(r);
+                let h = o.totalCount, c = r.outdatedCount;
                 for (let [ o ] of a) {
-                    var V, q = n[o];
+                    var q, V = n[o];
                     let {
                         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);
+                    } = V;
+                    for (q in t) p[q] = i[q], s[q] = r;
+                    I(V), h += a.totalCount, c += V.outdatedCount, e.delSnapshot(V);
                 }
-                o.totalCount = h, p.outdatedCount = c;
+                o.totalCount = h, r.outdatedCount = c;
             }
             this.snapshotSavedChangeId >= this.compactMaxChangeId ? (x(this), this.compactState = 1) : this.compactState = 3;
         }
@@ -279,6 +280,12 @@ class t {
     unmonitorContentExpire(t, a) {
         this.qyExpire.unmonitorContentExpire(t, a);
     }
+    monitorItemExpire(t, a) {
+        this.qyExpire.monitorItemExpire(t, a);
+    }
+    unmonitorItemExpire(t) {
+        this.qyExpire.unmonitorItemExpire(t);
+    }
 }
 
 function I(t) {
@@ -290,7 +297,7 @@ function I(t) {
     t.compactOutedCount = 0;
 }
 
-function l(t) {
+function m(t) {
     if (1 == t.compactState) {
         var {
             maxChangeId: a,
@@ -307,10 +314,10 @@ function l(t) {
                 compactState: 2,
                 compactMaxChangeId: a
             });
-            for (var p of [ n, s, i ]) for (var r of p) r.compactOutedCount = r.outdatedCount;
+            for (var r of [ n, s, i ]) for (var p of r) p.compactOutedCount = p.outdatedCount;
             e.compactSnapshots(n, s, i);
         }
-        0 < o.length && (t.emptySnapshotNumVerList.push(...o), t.snapshotSavedChangeId >= a ? m(t) : 1 == t.compactState && Object.assign(t, {
+        0 < o.length && (t.emptySnapshotNumVerList.push(...o), t.snapshotSavedChangeId >= a ? c(t) : 1 == t.compactState && Object.assign(t, {
             compactState: 3,
             compactMaxChangeId: a
         }));
@@ -324,7 +331,7 @@ function d(t, a) {
     return e;
 }
 
-function m(t) {
+function c(t) {
     var {
         qyKVDataCleaner: t,
         emptySnapshotNumVerList: a
@@ -333,7 +340,7 @@ function m(t) {
 }
 
 function x(t) {
-    t.qySnapshotCompactor.saveSnapshotInfos(), m(t);
+    t.qySnapshotCompactor.saveSnapshotInfos(), c(t);
 }
 
 export {

package/src/QyUtils.d.ts

@@ -8,6 +8,7 @@ export declare const SpecialFilePaths: {
     RpcDirPath: string[];
     IndexDirPath: string[];
     ExpireDirPath: string[];
+    MetaFilePath: string[];
     IndexPropPathsFileName: string;
 };
 export declare function isMatchName(name: any): any;
@@ -50,5 +51,6 @@ export declare function loadFileList(fileList: any, preloadCount?: number): Asyn
     filePath: any;
     bin: any;
 }, void, unknown>;
-export declare function getNowSeconds(now?: Date): number;
+export declare function getNowTime(now?: Date): number;
+export declare function getNowRounded(now?: Date): number;
 export * as default from "./QyUtils.ts";

package/src/QyUtils.js

@@ -6,9 +6,9 @@ import e from "node:process";
 
 import l from "node:fs/promises";
 
-import o from "node:fs";
+import i from "node:fs";
 
-import i from "node:timers/promises";
+import o from "node:timers/promises";
 
 import {
     fileURLToPath as r
@@ -26,15 +26,16 @@ var f = t.dirname(r(import.meta.url)), c = Object.fromEntries([ "$del", "$link",
     RpcDirPath: [ s, "rpc" ],
     IndexDirPath: [ s, "index" ],
     ExpireDirPath: [ s, "expire" ],
+    MetaFilePath: [ s, "meta" ],
     IndexPropPathsFileName: "propPaths"
 };
 
-function d(r) {
+function m(r) {
     return r.startsWith("{") && r.endsWith("}");
 }
 
-function m(r) {
-    return d(r) && r.substring(1, r.length - 1);
+function d(r) {
+    return m(r) && r.substring(1, r.length - 1);
 }
 
 function p(r) {
@@ -59,11 +60,11 @@ function b(r) {
     return "c" + r;
 }
 
-function $(r = 8) {
+function w(r = 8) {
     return n.randomBytes(r).toString("hex");
 }
 
-function w(r) {
+function $(r) {
     if (null != r) for (var t in r) if (null != r[t]) return !1;
     return !0;
 }
@@ -114,17 +115,17 @@ function E(r) {
     return 1 < r ? "s" : "";
 }
 
-function O(r) {
+function F(r) {
     return l.mkdir(r, {
         recursive: !0
     });
 }
 
-function k(r) {
-    return O(t.dirname(r));
+function O(r) {
+    return F(t.dirname(r));
 }
 
-async function F(r) {
+async function k(r) {
     try {
         return (await l.stat(r)).size;
     } catch (r) {
@@ -133,21 +134,21 @@ async function F(r) {
 }
 
 async function W(r) {
-    return !1 !== await F(r);
+    return !1 !== await k(r);
 }
 
 function L(r, t = void 0) {
     r *= 1e3;
-    return t ? i.setTimeout(r, !0, {
+    return t ? o.setTimeout(r, !0, {
         signal: t
-    }) : i.setTimeout(r);
+    }) : o.setTimeout(r);
 }
 
 let I;
 
 async function R(t) {
     try {
-        await k(t);
+        await O(t);
         var r = new Date().toISOString() + ": " + e.argv.join(" ");
         function n() {
             for (var r of Object.keys(I)) N(r);
@@ -166,7 +167,7 @@ async function R(t) {
 
 function N(r) {
     try {
-        o.unlinkSync(r), u.info("Unlocked " + r);
+        i.unlinkSync(r), u.info("Unlocked " + r);
     } catch (r) {}
 }
 
@@ -205,14 +206,14 @@ function X(r) {
     return n;
 }
 
-async function q(t, n, e, o) {
-    var i = Buffer.allocUnsafe(o);
-    for (let r = 0; r < o; ) {
-        var a = (await n.read(i, r, o - r, e + r)).bytesRead;
+async function q(t, n, e, i) {
+    var o = Buffer.allocUnsafe(i);
+    for (let r = 0; r < i; ) {
+        var a = (await n.read(o, r, i - r, e + r)).bytesRead;
         if (0 == a) return void u.error(`read ${t} at ${e + r} returning 0 byte`);
         r += a;
     }
-    return i;
+    return o;
 }
 
 function C() {
@@ -221,13 +222,13 @@ function C() {
 }
 
 async function* V(e, t = 3) {
-    var n = e.length, o = (n < t && (t = n), new Array(n));
+    var n = e.length, i = (n < t && (t = n), new Array(n));
     for (let r = 0; r < t; ++r) {
-        var i = o[r] = {};
-        s(r, i);
+        var o = i[r] = {};
+        s(r, o);
     }
     for (let r = 0; r < n; ++r) {
-        var a = o[r % t], {
+        var a = i[r % t], {
             filePath: u,
             bin: f
         } = (a.bin || await a.promise, a), c = r + t;
@@ -247,7 +248,12 @@ async function* V(e, t = 3) {
 }
 
 function Y(r = new Date()) {
-    return Math.floor(r.getTime() / 1e3);
+    return r.getTime();
+}
+
+function Z(r = new Date()) {
+    r = r.getTime();
+    return r - r % 1e3;
 }
 
 export * as default from "./QyUtils.js";
@@ -256,16 +262,16 @@ export {
     f as __dirname,
     c as SpecialOperators,
     s as SpecialFilePaths,
-    d as isMatchName,
-    m as getMatchParam,
+    m as isMatchName,
+    d as getMatchParam,
     p as getSizeStr,
     h as calHash,
     g as Hash_Key_Length,
     y as getSubdirMapKey,
     v as getFileMapKey,
     b as getContentKey,
-    $ as getRandomStr,
-    w as isEmptyObj,
+    w as getRandomStr,
+    $ as isEmptyObj,
     P as isNotNullObj,
     x as isString,
     S as isNumber,
@@ -276,9 +282,9 @@ export {
     T as setPromise,
     A as toBuffer,
     E as getSuffix,
-    O as ensureDir,
-    k as ensureParentDir,
-    F as getSize,
+    F as ensureDir,
+    O as ensureParentDir,
+    k as getSize,
     W as folderOrFileExists,
     L as sleep,
     R as lockExclusiveFilePath,
@@ -293,5 +299,6 @@ export {
     q as readBufferAsync,
     C as memoryPercent,
     V as loadFileList,
-    Y as getNowSeconds
+    Y as getNowTime,
+    Z as getNowRounded
 };

package/static/codemirror.bundle/editor.bundle.js

@@ -25815,6 +25815,8 @@
           if (dPrec)
               this.score += dPrec;
           if (depth == 0) {
+              if (type < parser.minRepeatTerm && this.reducePos < this.pos)
+                  this.reducePos = this.pos;
               this.pushState(parser.getGoto(this.state, type, true), this.reducePos);
               // Zero-depth reductions are a special case—they add stuff to
               // the stack without popping anything off.
@@ -25829,7 +25831,10 @@
           // expression and the state that we'll be staying in, which should
           // be moved to `this.state`).
           let base = this.stack.length - ((depth - 1) * 3) - (action & 262144 /* Action.StayFlag */ ? 6 : 0);
-          let start = base ? this.stack[base - 2] : this.p.ranges[0].from, size = this.reducePos - start;
+          let start = base ? this.stack[base - 2] : this.p.ranges[0].from;
+          if (type < parser.minRepeatTerm && start == this.reducePos && this.reducePos < this.pos)
+              this.reducePos = this.pos;
+          let size = this.reducePos - start;
           // This is a kludge to try and detect overly deep left-associative
           // trees, which will not increase the parse stack depth and thus
           // won't be caught by the regular stack-depth limit check.

package/src/QyExpireClock.d.ts

@@ -1,15 +0,0 @@
-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

@@ -1,53 +0,0 @@
-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/rpc/evalCode.js

@@ -1,9 +0,0 @@
-module.exports = r => {
-    try {
-        return new Function("dataFolder", `return (${r})();`)(dataFolder);
-    } catch (r) {
-        return {
-            error: r.message
-        };
-    }
-};

package/src/rpc/getFileContent.js

@@ -1,16 +0,0 @@
-let a = new Error("No such file");
-
-module.exports = ({
-    filePath: e,
-    cChangeId: n
-}) => {
-    var t, l, o, e = dataFolder.fileP(e);
-    return e ? ({
-        fileContent: e,
-        cChangeId: t,
-        fileContentKey: l
-    } = e, o = {}, n != t && (Object.assign(o, {
-        fileContent: e,
-        cChangeId: t
-    }), null == n) && (o.fileContentKey = l), o) : a;
-};

package/src/rpc/getRpcFiles.js

@@ -1 +0,0 @@
-module.exports = () => dataFolder.fileListToTree(dataFolder.rpcFileList);

package/src/rpc/getSubItems.js

@@ -1,16 +0,0 @@
-let s = new Error("No such dir");
-
-module.exports = ({
-    dirPath: a,
-    dChangeId: d,
-    fChangeId: e
-}) => {
-    var r, a = dataFolder.dirP(a);
-    return a ? (r = {}, d || e || (r.fullPathHash = a.fullPathHash), d != a.dChangeId && Object.assign(r, {
-        subdirList: a.sortedSubdirList.map(a => a.name),
-        dChangeId: a.dChangeId
-    }), e != a.fChangeId && Object.assign(r, {
-        fileList: a.sortedFileList.map(a => a.name),
-        fChangeId: a.fChangeId
-    }), r) : s;
-};

package/src/rpc/getTriggerFiles.js

@@ -1 +0,0 @@
-module.exports = () => dataFolder.fileListToTree(dataFolder.triggerFileList);

package/src/rpc/queryFiles.js

@@ -1,10 +0,0 @@
-module.exports = queryText => {
-    let {
-        folder,
-        value,
-        view,
-        limit,
-        cursor
-    } = eval("((x)=>x)(" + queryText + ")");
-    return dataFolder.queryTree(folder, value, view, limit, cursor);
-};

package/src/rpc/reloadRpc.js

@@ -1 +0,0 @@
-module.exports = () => {};