datafolder 1.0.14 → 1.0.16

package/README.md

@@ -4,6 +4,10 @@ datafolder is a lightning fluid JSON database for high speed SSDs, featuring an
 
 ### Changelog
 
+1.0.16 Add GraphQL sample data test (test/testQyGraphQL.js) to show how to write complex queries.
+
+1.0.15 Use [Workers](https://nodejs.org/docs/latest/api/worker_threads.html) to implement snapshot compactor, expire service, outdated data cleaner etc.
+
 1.0.14 Expire supports specifying milliseconds.
 
 1.0.13 Added expire support to delete a dir in a specific future time.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datafolder",
-	"version": "1.0.14",
+	"version": "1.0.16",
 	"author": {
 		"name": "lysh",
 		"email": "datafolderdev@outlook.com"
@@ -52,7 +52,8 @@
 	"scripts": {
 		"ui": "start http://localhost:3628/datafolderui/index.html && node ./scripts/fastify.js",
 		"airbnb": "node ./scripts/airbnb2.js && start http://localhost:3628/datafolderui/index.html && node ./scripts/fastify.js",
-		"types:check": "tsc --noEmit"
+		"types:check": "tsc --noEmit",
+		"test": "node --test --experimental-test-coverage --test-coverage-exclude \"test/testQyAirBnB_Ubuntu.ts\" \"test/*\""
 	},
 	"type": "module"
 }

package/src/QyAcl.d.ts

@@ -4,20 +4,20 @@ export declare const CmdNames: {
     R: number;
     D: number;
 };
-export declare function delCmdKey(cmdArgAsListChanges: any, key: string): void;
-export declare function applyAclChange(aclKeyValueMap: any, cmdArgAsListChanges: any): void;
-export declare function iterCmdKeys(cmdArgAsListChanges: any, fun: any): void;
+export declare function applyAclChange(aclKeyValueMap: any, cmdArgAsListObj: any): void;
+export declare function iterCmdKeys(cmdArgAsListObj: any, fun: any): void;
 export declare class QyAclCmdGenerator {
     cmdArgAsMapChanges: any[];
     cmdCount: number;
     batchSize: number;
     constructor();
     pushCmd(cmdName: number, cmdHashKey: string, cmdArg?: any): void;
-    pushCmdArgAsListObj(cmdArgAsListChanges: any): this;
+    pushCmdArgAsListObj(cmdArgAsListObj: any): this;
     takeCmdArgAsListObj(): any[];
     toAclBuffer(changeId: any): Buffer<ArrayBuffer> | undefined;
 }
 export declare function readAclFile(aclFilePath: any, autoRepairAclFile?: boolean, currentChangeId?: number): Promise<any[]>;
 export declare function numsToBuffer(nums: any): Buffer<ArrayBuffer>;
 export declare function bufferToNums(buffer: any, offset: any, nums: any): any;
+export declare function toAclBuffer(changeId: any, batchSize: any, cmdArgAsListObjStr: any): Buffer<ArrayBuffer>;
 export declare function readAclBuffer(aclFilePath: any, contentBuffer: any, autoRepairAclFile: any, currentChangeId: any): Promise<any[]>;

package/src/QyAcl.js

@@ -1,4 +1,4 @@
-import l from "node:fs/promises";
+import h from "node:fs/promises";
 
 import {
     mergeContent as g,
@@ -7,11 +7,12 @@ import {
 } from "./QyFileContentUtils.js";
 
 import {
-    isEmptyObj as m
+    isEmptyObj as m,
+    toBuffer as n
 } from "./QyUtils.js";
 
 import {
-    logger as u
+    logger as l
 } from "./QyLogger.js";
 
 let f = {
@@ -21,74 +22,68 @@ let f = {
     D: 3
 };
 
-function r(r, e) {
-    var [ r, t, a, n ] = r;
-    n && delete n[e], e.startsWith("c") ? r && delete r[e] : (t && delete t[e], 
-    a && delete a[e]);
-}
-
-function e(r, e) {
-    var t, a, n, s, [ i, o, f, e ] = e;
-    for (t in e) null != r[t] && (r[t] = void 0);
+function r(r, t) {
+    var e, a, n, s, [ i, o, f, t ] = t;
+    for (e in t) null != r[e] && (r[e] = void 0);
     for (a in o) {
-        var c, h = r[a] || (r[a] = {});
-        for (c of o[a]) h[c] = 1;
+        var c, u = r[a] || (r[a] = {});
+        for (c of o[a]) u[c] = 1;
     }
     for (n in f) {
-        var l = r[n];
-        if (l) {
-            var u = f[n];
-            if (u) {
-                for (var d of u) delete l[d];
-                m(l) && (r[n] = void 0);
+        var h = r[n];
+        if (h) {
+            var l = f[n];
+            if (l) {
+                for (var d of l) delete h[d];
+                m(h) && (r[n] = void 0);
             }
         }
     }
     for (s in i) r[s] = g(r[s], i[s]);
 }
 
-function t(r, e) {
-    for (var t of r) for (var a in t) e(a);
+function t(r, t) {
+    for (var e of r) for (var a in e) t(a);
 }
 
-class n {
+class e {
     cmdArgAsMapChanges = [];
     cmdCount = 0;
     batchSize = 0;
     constructor() {}
-    pushCmd(r, e, t = void 0) {
+    pushCmd(r, t, e = void 0) {
         switch (++this.cmdCount, r) {
           case f.A:
-            i(this, [ f.A, e, t ]), o(this, [ f.R, e, t ]);
+            i(this, [ f.A, t, e ]), o(this, [ f.R, t, e ]);
             break;
 
           case f.R:
-            i(this, [ f.R, e, t ]), o(this, [ f.A, e, t ]);
+            i(this, [ f.R, t, e ]), o(this, [ f.A, t, e ]);
             break;
 
           case f.D:
-            if (i(this, [ f.D, e ]), e.startsWith("c")) o(this, [ f.M, e ]); else for (var a of [ f.A, f.R ]) o(this, [ a, e ]);
+            if (i(this, [ f.D, t ]), t.startsWith("c")) o(this, [ f.M, t ]); else for (var a of [ f.A, f.R ]) o(this, [ a, t ]);
             break;
 
           case f.M:
             {
                 var n = this.cmdArgAsMapChanges;
                 let [ r ] = n;
-                n = (r = null == r ? n[f.M] = {} : r)[e];
-                r[e] = null != n ? s(n, t) : t;
+                n = (r = null == r ? n[f.M] = {} : r)[t];
+                r[t] = null != n ? s(n, e) : e;
                 break;
             }
 
           default:
-            u.error(`unsupported cmdName:${r}, called with ${e} ` + t), --this.cmdCount;
+            l.error(`unsupported cmdName:${r}, called with ${t} ` + e), --this.cmdCount;
         }
     }
     pushCmdArgAsListObj(r) {
         if (r) {
-            for (var e in ++this.batchSize, r[f.D]) this.pushCmd(f.D, e);
-            for (var t of [ f.A, f.R ]) {
-                var a, n = r[t];
-                for (a in n) for (var s of n[a]) this.pushCmd(t, a, s);
+            for (var t in ++this.batchSize, r[f.D]) this.pushCmd(f.D, t);
+            for (var e of [ f.A, f.R ]) {
+                var a, n = r[e];
+                for (a in n) for (var s of n[a]) this.pushCmd(e, a, s);
             }
             var i, [ o ] = r;
             for (i in o) this.pushCmd(f.M, i, o[i]);
@@ -96,123 +91,127 @@ class n {
         return this;
     }
     takeCmdArgAsListObj() {
-        var r, e = this.cmdArgAsMapChanges;
+        var r, t = this.cmdArgAsMapChanges;
         Object.assign(this, {
             cmdArgAsMapChanges: [],
             cmdCount: 0,
             batchSize: 0
         });
         for (r of [ f.A, f.R ]) {
-            var t, a = e[r];
-            for (t in a) {
-                var n = Object.keys(a[t]);
-                0 < n.length ? a[t] = n : delete a[t];
+            var e, a = t[r];
+            for (e in a) {
+                var n = Object.keys(a[e]);
+                0 < n.length ? a[e] = n : delete a[e];
             }
-            m(a) && delete e[r];
+            m(a) && delete t[r];
         }
-        var s = e[f.D], s = (s && m(s) && delete e[f.D], e[f.M]);
-        return s && m(s) && delete e[f.M], e;
+        var s = t[f.D], s = (s && m(s) && delete t[f.D], t[f.M]);
+        return s && m(s) && delete t[f.M], t;
     }
     toAclBuffer(r) {
-        var e, t = this.batchSize;
-        if (0 < t) return r = r, t = t, e = this.takeCmdArgAsListObj(), e = Buffer.from(JSON.stringify(e)), 
-        Buffer.concat([ h([ r, t, e.length ]), e ]);
+        var t = this.batchSize;
+        if (0 < t) return A(r, t, JSON.stringify(this.takeCmdArgAsListObj()));
     }
 }
 
-function i(r, e, t = 1) {
-    a(r.cmdArgAsMapChanges, e, t);
+function i(r, t, e = 1) {
+    a(r.cmdArgAsMapChanges, t, e);
 }
 
-function o(r, e) {
-    let t = r.cmdArgAsMapChanges;
-    if (t && e && !(e.length <= 1)) {
-        for (let r = 0; r < e.length - 1; ++r) if (null == (t = t[e[r]])) return;
-        delete t[e.at(-1)];
+function o(r, t) {
+    let e = r.cmdArgAsMapChanges;
+    if (e && t && !(t.length <= 1)) {
+        for (let r = 0; r < t.length - 1; ++r) if (null == (e = e[t[r]])) return;
+        delete e[t.at(-1)];
     }
 }
 
-async function c(e, r = !1, t = 0) {
+async function c(t, r = !1, e = 0) {
     try {
-        return await A(e, await l.readFile(e), r, t);
+        return await p(t, await h.readFile(t), r, e);
     } catch (r) {
-        throw u.error(`Reading ${e} failed:`, r), r;
+        throw l.error(`Reading ${t} failed:`, r), r;
     }
 }
 
 let v = [ 1, 2, 4, 8 ];
 
-function h(e) {
-    var t = e.length, a = new Array(t), n = new Array(t);
-    let s = t << 6, i = 1;
-    for (let r = 0; r < t; ++r) {
-        var o = a[r] = (o = e[r]) <= 255 ? 0 : o <= 65535 ? 1 : o <= 4294967295 ? 2 : 3, o = (s |= o << (r << 1), 
+function u(t) {
+    var e = t.length, a = new Array(e), n = new Array(e);
+    let s = e << 6, i = 1;
+    for (let r = 0; r < e; ++r) {
+        var o = a[r] = (o = t[r]) <= 255 ? 0 : o <= 65535 ? 1 : o <= 4294967295 ? 2 : 3, o = (s |= o << (r << 1), 
         n[r] = v[o]);
         i += o;
     }
     var f = Buffer.allocUnsafe(i);
     f.writeUInt8(s);
     let c = 1;
-    for (let r = 0; r < t; ++r) {
-        d = u = l = h = void 0;
-        var [ h, l, u, d = 0 ] = [ f, e[r], n[r], c ];
-        switch (u) {
+    for (let r = 0; r < e; ++r) {
+        d = l = h = u = void 0;
+        var [ u, h, l, d = 0 ] = [ f, t[r], n[r], c ];
+        switch (l) {
           case 1:
-            h.writeUInt8(l, d);
+            u.writeUInt8(h, d);
             break;
 
           case 2:
-            h.writeUInt16BE(l, d);
+            u.writeUInt16BE(h, d);
             break;
 
           case 4:
-            h.writeUInt32BE(l, d);
+            u.writeUInt32BE(h, d);
             break;
 
           default:
-            h.writeBigUInt64BE(BigInt(l), d);
+            u.writeBigUInt64BE(BigInt(h), d);
         }
         c += n[r];
     }
     return f;
 }
 
-function d(e, t, a) {
-    var n = e.readUInt8(t), s = (++t, n >> 6 & 3);
+function d(t, e, a) {
+    var n = t.readUInt8(e), s = (++e, n >> 6 & 3);
     for (let r = 0; r < s; ++r) {
         var i = v[n >> (r << 1) & 3];
-        a[r] = ((r, e, t = 0) => {
-            switch (e) {
+        a[r] = ((r, t, e = 0) => {
+            switch (t) {
               case 1:
-                return r.readUInt8(t);
+                return r.readUInt8(e);
 
               case 2:
-                return r.readUInt16BE(t);
+                return r.readUInt16BE(e);
 
               case 4:
-                return r.readUInt32BE(t);
+                return r.readUInt32BE(e);
 
               default:
-                return Number(r.readBigUInt64BE(t));
+                return Number(r.readBigUInt64BE(e));
             }
-        })(e, i, t), t += i;
+        })(t, i, e), e += i;
     }
-    return t;
+    return e;
+}
+
+function A(r, t, e) {
+    e = n(e);
+    return Buffer.concat([ u([ r, t, e.length ]), e ]);
 }
 
-async function A(t, r, a, n) {
+async function p(e, r, a, n) {
     var s = [];
-    for (let e = 0; e < r.length; ) {
-        var i = [], o = d(r, e, i), [ i, f, c ] = i;
-        if (i <= n) u.warn(`changeId ${i} <= currentChangeId ${n} at ${t}:${e}. Ignored.`), 
-        e = o + c; else {
-            n + f != i && u.warn(`currentChangeId ${n} + batchSize ${f} != changeId ` + i);
+    for (let t = 0; t < r.length; ) {
+        var i = [], o = d(r, t, i), [ i, f, c ] = i;
+        if (i <= n) l.warn(`changeId ${i} <= currentChangeId ${n} at ${e}:${t}. Ignored.`), 
+        t = o + c; else {
+            n + f != i && l.warn(`currentChangeId ${n} + batchSize ${f} != changeId ` + i);
             try {
-                var h = JSON.parse(r.subarray(o, o + c));
-                s.push([ i, h ]), n = i, e = o + c;
+                var u = JSON.parse(r.subarray(o, o + c));
+                s.push([ i, u ]), n = i, t = o + c;
             } catch (r) {
-                if (u.error(`Parse ${t} failed at ${e}:`, r), a) return u.warn(`Autorepair by truncating ${t} to ` + e), 
-                null == (f = await l.truncate(t, e)) ? u.log("truncate success") : u.error("truncate failed:", f), 
+                if (l.error(`Parse ${e} failed at ${t}:`, r), a) return l.warn(`Autorepair by truncating ${e} to ` + t), 
+                null == (f = await h.truncate(e, t)) ? l.log("truncate success") : l.error("truncate failed:", f), 
                 s;
                 throw r;
             }
@@ -223,12 +222,12 @@ async function A(t, r, a, n) {
 
 export {
     f as CmdNames,
-    r as delCmdKey,
-    e as applyAclChange,
+    r as applyAclChange,
     t as iterCmdKeys,
-    n as QyAclCmdGenerator,
+    e as QyAclCmdGenerator,
     c as readAclFile,
-    h as numsToBuffer,
+    u as numsToBuffer,
     d as bufferToNums,
-    A as readAclBuffer
+    A as toAclBuffer,
+    p as readAclBuffer
 };

package/src/QyAclSaver_Worker.d.ts

@@ -5,6 +5,6 @@ export default class QyAclSaver_Worker extends QyMessageWorker {
     _op_start(aclFilePath: any): Promise<void>;
     _op_stop(): Promise<void>;
     switch(aclFilePath: any): void;
-    callSave(changeId: any, cmdArgAsListChanges: any): Promise<void>;
-    castSave(changeId: any, cmdArgAsListChanges: any): void;
+    callSave(changeId: any, cmdArgAsListObjStr: any): Promise<void>;
+    castSave(changeId: any, cmdArgAsListObjStr: any): void;
 }

package/src/QyAclWriter.d.ts

@@ -1,6 +1,7 @@
 import { QyBinWriter } from "./QyBinWriter.ts";
+import { QyAclCmdGenerator } from "./QyAcl.ts";
 export declare class QyAclWriter extends QyBinWriter {
-    qyAclCmdGenerator: any;
+    qyAclCmdGenerator: QyAclCmdGenerator;
     constructor(options: any, filePath?: any);
-    getBinData(dataQueue: any, changeId: any): any;
+    getBinData(dataQueue: any, changeId: any): Buffer<ArrayBuffer> | undefined;
 }

package/src/QyAclWriter.js

@@ -3,7 +3,8 @@ import {
 } from "./QyBinWriter.js";
 
 import {
-    QyAclCmdGenerator as e
+    QyAclCmdGenerator as e,
+    toAclBuffer as f
 } from "./QyAcl.js";
 
 import {
@@ -18,10 +19,18 @@ class t extends r {
             ...r
         }, t), this.qyAclCmdGenerator = new e();
     }
-    getBinData(r, t) {
-        var e, o = this.qyAclCmdGenerator;
-        for (e of r) o.pushCmdArgAsListObj(e);
-        return o.toAclBuffer(t);
+    getBinData(t, r) {
+        var e, {
+            qyAclCmdGenerator: o,
+            options: s
+        } = this, a = t.length;
+        if (a < s.minBatchSize) {
+            var i = new Array(a), n = r - a + 1;
+            for (let r = 0; r < a; ++r) i[r] = f(n + r, 1, t[r]);
+            return Buffer.concat(i);
+        }
+        for (e of t) o.pushCmdArgAsListObj(JSON.parse(e));
+        return o.toAclBuffer(r);
     }
 }
 

package/src/QyBatch.js

@@ -46,8 +46,6 @@ import {
     logger as _
 } from "./QyLogger.js";
 
-import "node:process";
-
 let D = Array.isArray, x = e.$del, O = t.IndexPropPathsFileName, F = {
     none: 0,
     basic: 1,

package/src/QyBinWriter.js

@@ -23,8 +23,6 @@ import {
     logger as g
 } from "./QyLogger.js";
 
-var {} = Array;
-
 class e extends t {
     _filePath;
     _totalSavedSize = 0;

package/src/QyCD.d.ts

@@ -17,7 +17,7 @@ export declare class QyCD {
     get triggerFileList(): any;
     rpcFile(rpcName: any): any;
     get rpcFileList(): any;
-    view(namePath: any, spec?: undefined, parentDir?: any): any;
+    view(namePath: any, spec?: any, parentDir?: any): any;
     viewP(namePath: any, spec: any, parentDir?: any): any;
     queryFiles(indexHostDirNamePath: any, queryObj: any, limit?: number | undefined, cursor?: number | undefined, parentDir?: any): any;
     queryFilesMulti(indexHostDirNamePathMulti: any, limit: any, cursor: any, parentDir?: any): any;

package/src/QyCache.d.ts

@@ -21,7 +21,7 @@ export declare class QyCache extends EventEmitter {
     stop(): Promise<this>;
     increaseChangeId(): any;
     decreaseChangeId(): void;
-    save(changeId: any, cmdArgAsListChanges: any, logText: any, syncList: any, needPromise: any): any;
+    save(changeId: any, cmdArgAsListObj: any, logText: any, syncList: any, needPromise: any): any;
     getFile(namePath: QyFile | string | string[], parentDir?: any): QyFile | undefined;
     getDir(namePath: QyDir | string | string[], parentDir?: any): QyDir | undefined;
     getOrCreateFile(namePath: QyFile | string | string[], parentDir?: any): QyFile;

package/src/QyCache.js

@@ -50,7 +50,7 @@ import {
 } from "./QyUnionNode.js";
 
 import {
-    QyKVDataLoader as Q
+    QyKVDataLoader as O
 } from "./QyKVDataLoader.js";
 
 import {
@@ -58,7 +58,7 @@ import {
 } from "./QyMod.js";
 
 import {
-    logger as O
+    logger as Q
 } from "./QyLogger.js";
 
 let {
@@ -89,24 +89,26 @@ class o extends r {
         super(), e = {
             ...h("QyCache"),
             ...e
-        };
-        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, {
+        }, o = new p("", !0, void 0, i = this), a = m.at(-1), s = F.at(-1), l = new p(D, !0, o), 
+        n = new p(a, !0, l), g = new p(s, !0, l), o._subdirMap = {
+            [D]: l
+        }, l._subdirMap = {
+            [a]: n,
+            [s]: g
+        }, Object.assign(i, {
+            rootDir: o,
+            expireRootDir: n,
+            indexRootDir: g
+        });
+        var i, o, a, s, n, g, l = v(r, "qykv");
+        Object.assign(this, {
             rootFolder: r,
             options: e,
             qyDB: t,
-            kvFolder: i,
-            rootDir: s,
-            expireRootDir: g,
-            indexRootDir: l,
+            kvFolder: l,
             rpcFolder: v(r, "rpc"),
             exclusiveFilePath: v(r, ".opened"),
-            qyKVData: new d(i, e, this),
+            qyKVData: new d(l, e, this),
             qyFileLogger: new u(v(r, "qylog"), e)
         });
     }
@@ -120,7 +122,7 @@ class o extends r {
             exclusiveFilePath: a,
             rootDir: s
         } = this;
-        O.log(`Starting at ${r}...`);
+        Q.log(`Starting at ${r}...`);
         try {
             await R(e), o.start();
             var [ {
@@ -128,7 +130,7 @@ class o extends r {
                 loadedMaxAclNum: g,
                 qySnapshots: l,
                 aclKeyValueMap: p
-            } ] = await Promise.all([ ((r, e) => (r = new Q(r, e)).load())(e, t), C(a) ]);
+            } ] = await Promise.all([ ((r, e) => (r = new O(r, e)).load())(e, t), C(a) ]);
             i.start(n, g, l, p);
         } catch (r) {
             throw o.stop(), r;
@@ -158,17 +160,17 @@ class o extends r {
             } = m;
             x(y) && F.insertRpc(m, y);
         }
-        return t.dumpStructureAtStart && await q(v(r, "qystruct"), s), O.log("Started."), 
+        return t.dumpStructureAtStart && await q(v(r, "qystruct"), s), Q.log("Started."), 
         this;
     }
     async stop() {
-        O.log("Stopping...");
+        Q.log("Stopping...");
         var {
             qyKVData: r,
             qyFileLogger: e,
             exclusiveFilePath: t
         } = this;
-        return await r.stop(), O.log("QyFileLogger stopped."), await e.stop(), i(t), 
+        return await r.stop(), Q.log("QyFileLogger stopped."), await e.stop(), i(t), 
         Object.assign(this, {
             rootDir: void 0,
             indexRootDir: void 0,
@@ -179,7 +181,7 @@ class o extends r {
             rpcFunMap: void 0,
             qyDB: void 0,
             qyFileLogger: void 0
-        }), O.log("Stopped."), this;
+        }), Q.log("Stopped."), this;
     }
     increaseChangeId() {
         return this.qyKVData.increaseChangeId();
@@ -271,11 +273,11 @@ class o extends r {
     }
     async callRpc(e, r, t) {
         var i, o = this.rpcFunMap[e];
-        if (!o) return O.warn(i = `RPC ${e} not implemented.`), new Error(i);
+        if (!o) return Q.warn(i = `RPC ${e} not implemented.`), new Error(i);
         try {
             return await o(r, t);
         } catch (r) {
-            return O.error(`Calling RPC ${e} failed:`, r), r;
+            return Q.error(`Calling RPC ${e} failed:`, r), r;
         }
     }
     monitorItemExpire(r, e) {

package/src/QyDefaultOptions.js

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

package/src/QyExpire.js

@@ -65,9 +65,7 @@ class a extends e {
     onEmptyHashList(e) {
         var t, r = this.expireMap;
         for (t of e) delete r[t];
-        i(r) && Object.assign(this, {
-            roundedStartTime: void 0
-        });
+        i(r) && (this.roundedStartTime = void 0);
     }
     onExpired(e) {
         var t, {

package/src/QyFileLogger.js

@@ -31,8 +31,7 @@ class a extends t {
         (e = {
             ...i("QyFileLogger"),
             ...e
-        }).append = !e.clearLogAtStart, super(e, [], [ "startFileConsole", "switchFileConsole" ]), 
-        Object.assign(this, {
+        }).append = !e.clearLogAtStart, super(e), Object.assign(this, {
             logFileFolder: t,
             qyLogFileSaver: new s(this, e)
         });
@@ -44,12 +43,12 @@ class a extends t {
         return this.dateDirPath;
     }
     async _op_start() {
-        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), h(t)), 
+        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), l(t)), 
         this.dateDirPath = n(this, t));
         this.qyLogFileSaver.start(r(t, "change.txt")), await this.startFileConsole(t);
     }
     switch() {
-        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), h(t)), 
+        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), l(t)), 
         n(this, t));
         return this.dateDirPath != t && (this.dateDirPath = t, this.qyLogFileSaver.switch(r(t, "change.txt")), 
         this.switchFileConsole(t)), this;
@@ -68,14 +67,14 @@ class a extends t {
 
 function n(t, e) {
     var i = e.getUTCFullYear(), s = e.getUTCMonth() + 1, o = e.getUTCDate(), e = e.getUTCHours();
-    return r(t.logFileFolder, i.toString(), l(s), l(o), l(e));
+    return r(t.logFileFolder, i.toString(), h(s), h(o), h(e));
 }
 
-function l(t) {
+function h(t) {
     return t.toString().padStart(2, "0");
 }
 
-function h(t) {
+function l(t) {
     return 1e3 * (60 * (60 - t.getUTCMinutes()) - t.getUTCSeconds());
 }