datafolder 1.0.5 → 1.0.6

package/src/QyBinWriter.js

@@ -7,24 +7,26 @@ import {
 } from "./QyOpRunner.js";
 
 import {
-    ensureParentDir as r,
-    getSize as n,
-    getSizeStr as d,
-    sleep as _,
-    setPromise as o,
-    toBuffer as v
+    ensureParentDir as n,
+    getSize as o,
+    getSizeStr as g,
+    sleep as v,
+    setPromise as l,
+    toBuffer as _
 } from "./QyUtils.js";
 
 import {
     getDefaultOptions as a
 } from "./QyDefaultOptions.js";
 
+let h = Array.isArray;
+
 class t extends e {
     constructor(e, t) {
         super({
             ...a("QyBinWriter"),
             ...e
-        }, [ "start", "stop" ]), this.filePath = t, this._resetParams();
+        }), this.filePath = t, p(this);
     }
     getFilePath() {
         return this.filePath;
@@ -34,11 +36,11 @@ class t extends e {
     }
     save(e, t, a) {
         null == t && (t = e, e = 0);
-        var i, s = this.lastOp;
-        return "_op_save" === s?.opFunName ? (i = s.args, i[0] = e, i[1].push(t), 
-        a && o(s), s.promise) : (i = {
+        var i, r = this.lastOp;
+        return "_op_save" === r?.opFunName ? (i = r.args, i[0] = e, i = i[1], h(t) ? i.push(...t) : i.push(t), 
+        a && l(r), r.promise) : (i = {
             opFunName: "_op_save",
-            args: [ e, [ t ] ]
+            args: [ e, h(t) ? t : [ t ] ]
         }, a ? this.pushAndRunWithPromise(i) : this.pushAndRun(i));
     }
     truncate() {
@@ -54,41 +56,12 @@ class t extends e {
             args: [ e ]
         });
     }
-    supressMaxFileSizeEvent() {
-        this.maxFileSizeEmitted = !0;
-    }
-    _getBinData(e) {
+    getBinData(e) {
         var t = e.length;
         return 0 == t ? "" : 1 == t ? e[0] : Buffer.isBuffer(e[0]) ? Buffer.concat(e) : Buffer.concat(e.map(e => Buffer.from(e)));
     }
-    async _saveBinData(e, t) {
-        var {
-            fileHandle: a,
-            totalSavedSize: i,
-            filePath: s,
-            options: r
-        } = this, {
-            emitSaveEvent: n,
-            maxFileSize: o,
-            maxRetryInterval: l,
-            retryIntervalFactor: h
-        } = r, p = v(t), u = p.length, f = `size ${d(u)} (MaxId:${e}) to ` + s;
-        let m;
-        for (;"_op_truncate" !== this.firstOp?.opFunName; ) try {
-            await a.appendFile(p, {
-                flush: !0
-            });
-            var c = this.totalSavedSize = i + u;
-            return n && this.emit("save", e), void (o && o < c && !this.maxFileSizeEmitted && (this.supressMaxFileSizeEvent(), 
-            this.emit("maxFileSize", c)));
-        } catch (e) {
-            logger.error(`Saving ${f} failed:`, e, "Truncated back to " + i), await a.truncate(i), 
-            m = m ? Math.min(l, m * h) : 1, logger.log(`Retry in ${m} seconds`), 
-            await _(m);
-        }
-    }
     async _op_start(e) {
-        return e = e || this.filePath, await this._openFile(e), this;
+        return await i(this, e = e || this.filePath), this;
     }
     async _op_stop() {
         var {
@@ -100,11 +73,35 @@ class t extends e {
         } catch (e) {
             logger.error(`Close ${t} failed:`, e);
         }
-        this._resetParams();
+        p(this);
     }
     _op_save(e, t) {
-        t = this._getBinData(t, e);
-        if (t) return this._saveBinData(e, t);
+        t = this.getBinData(t, e);
+        if (t) return (async (e, t, a) => {
+            let {
+                fileHandle: i,
+                totalSavedSize: r,
+                filePath: s,
+                options: n
+            } = e, {
+                emitSaveEvent: o,
+                maxFileSize: l,
+                maxRetryInterval: h,
+                retryIntervalFactor: p
+            } = n, u = _(a), f = u.length, c = `size ${g(f)} (MaxId:${t}) to ` + s, m;
+            for (;"_op_truncate" !== e.firstOp?.opFunName; ) try {
+                await i.appendFile(u, {
+                    flush: !0
+                });
+                var d = e.totalSavedSize = r + f;
+                return o && 0 < t && e.emit("save", t), void (!e.maxFileSizeEmitted && l && d > l && (e.maxFileSizeEmitted = !0, 
+                e.emit("maxFileSize", d)));
+            } catch (e) {
+                logger.error(`Saving ${c} failed:`, e, "Truncated back to " + r), 
+                await i.truncate(r), m = m ? Math.min(h, m * p) : 1, logger.log(`Retry in ${m} seconds`), 
+                await v(m);
+            }
+        })(this, e, t);
     }
     async _op_truncate() {
         var {
@@ -116,37 +113,39 @@ class t extends e {
         } catch (e) {
             logger.error(`Truncate ${t} failed:`, e);
         }
-        this._resetParams();
+        p(this);
     }
     async _op_switch(e) {
         var {
             fileHandle: t,
             filePath: a
         } = this;
-        t && a == e || (await this._openFile(e), logger.info(`Switched from ${a} to ` + e));
+        t && a == e || (await i(this, e), logger.info(`Switched from ${a} to ` + e));
     }
-    async _openFile(t) {
-        var {
-            fileHandle: e,
-            options: a
-        } = this;
-        this._resetParams();
-        try {
-            e && (e.close(), this.fileHandle = void 0), await r(t);
-            var i = a.append;
-            this.fileHandle = await s(t, i ? "a" : "w"), this.filePath = t, i && (this.totalSavedSize = await n(t));
-        } catch (e) {
-            logger.error(`Open ${t} failed:`, e);
-        }
-    }
-    _resetParams() {
-        Object.assign(this, {
-            totalSavedSize: 0,
-            maxFileSizeEmitted: !1
-        });
+}
+
+async function i(e, t) {
+    var {
+        fileHandle: a,
+        options: i
+    } = e;
+    p(e);
+    try {
+        a && (a.close(), e.fileHandle = void 0), await n(t);
+        var r = i.append;
+        e.fileHandle = await s(t, r ? "a" : "w"), e.filePath = t, r && (e.totalSavedSize = await o(t));
+    } catch (e) {
+        logger.error(`Open ${t} failed:`, e);
     }
 }
 
+function p(e) {
+    Object.assign(e, {
+        totalSavedSize: 0,
+        maxFileSizeEmitted: !1
+    });
+}
+
 export {
     t as QyBinWriter
 };

package/src/QyCD.js

@@ -1,5 +1,5 @@
 import {
-    isString as e,
+    isString as i,
     pathSplit as s
 } from "./QyUtils.js";
 
@@ -7,52 +7,88 @@ class r {
     constructor(r) {
         this.qyCache = r;
     }
-    cd(r, i = this.currentDir) {
-        return e(r) && (r = s(r)), this.cdP(r, i);
+    cd(r, e = this.currentDir) {
+        return i(r) && (r = s(r)), this.cdP(r, e);
     }
-    cdP(r, i = this.currentDir) {
-        return this.currentDir = this.qyCache.getOrCreateDir(r, i), this;
+    cdP(r, e = this.currentDir) {
+        return this.currentDir = this.qyCache.getOrCreateDir(r, e), this;
     }
-    dir(r, i = this.currentDir) {
-        return e(r) && (r = s(r)), this.dirP(r, i);
+    dir(r, e = this.currentDir) {
+        return i(r) && (r = s(r)), this.dirP(r, e);
     }
-    dirP(r, i = this.currentDir) {
-        return this.qyCache.getDir(r, i);
+    dirP(r, e = this.currentDir) {
+        return this.qyCache.getDir(r, e);
     }
-    indexDir(r, i, t = this.currentDir) {
-        return e(r) && (r = s(r)), e(i) && (i = s(i)), this.indexDirP(r, i, t);
+    indexDir(r, e, t = this.currentDir) {
+        return i(r) && (r = s(r)), i(e) && (e = s(e)), this.indexDirP(r, e, t);
     }
-    indexDirP(r, i, t = this.currentDir) {
-        var e = this.qyCache, r = e.getDir(r, t);
+    indexDirP(r, e, t = this.currentDir) {
+        var i = this.qyCache, r = i.getDir(r, t);
         if (r) {
-            t = e.getIndexDir(r);
-            if (t) return i && 0 != i.length ? e.getDir(i, t) : t;
+            t = i.getIndexDir(r);
+            if (t) return e && 0 != e.length ? i.getDir(e, t) : t;
         }
     }
-    file(r, i = this.currentDir) {
-        return e(r) && (r = s(r)), this.fileP(r, i);
+    file(r, e = this.currentDir) {
+        return i(r) && (r = s(r)), this.fileP(r, e);
     }
-    fileP(r, i = this.currentDir) {
-        return this.qyCache.getFile(r, i);
+    fileP(r, e = this.currentDir) {
+        return this.qyCache.getFile(r, e);
     }
     triggerFile(r) {
         return this.qyCache.getTriggerFile(r);
     }
-    view(r, i, t = this.currentDir) {
-        return e(r) && (r = s(r)), this.viewP(r, i, t);
+    view(r, e, t = this.currentDir) {
+        return i(r) && (r = s(r)), this.viewP(r, e, t);
     }
-    viewP(r, i, t = this.currentDir) {
-        return this.qyCache.getFile(r, t)?.view(i);
+    viewP(r, e, t = this.currentDir) {
+        return this.qyCache.getFile(r, t)?.view(e);
     }
-    queryFiles(r, i, t, e, s = this.currentDir) {
-        return this.qyCache.queryFiles(r, i, t, e, s);
+    queryFiles(r, e, t, i, s = this.currentDir) {
+        return this.qyCache.queryFiles(r, e, t, i, s);
     }
-    queryFilesMulti(r, i, t, e = this.currentDir) {
-        return this.qyCache.queryFilesMulti(r, i, t, e);
+    queryFilesMulti(r, e, t, i = this.currentDir) {
+        return this.qyCache.queryFilesMulti(r, e, t, i);
+    }
+    queryTree(r, e, t, i, s, n = this.currentDir) {
+        return u(this.qyCache.queryFiles(r, e, i, s, n), t);
+    }
+    queryTreeMulti(r, e, t, i, s = this.currentDir) {
+        return u(this.qyCache.queryFilesMulti(r, t, i, s), e);
     }
     resetCurrentDir() {
         this.currentDir = void 0;
     }
+    fileListToTree(r, e) {
+        return u(r, e);
+    }
+}
+
+function u(r, t) {
+    var i, s = {};
+    for (i of r) {
+        var n, u = i.parentList;
+        let e = s;
+        for (n of u) {
+            var {
+                name: h,
+                fullPathHash: c
+            } = n;
+            let r = e.subdirMap;
+            r = r || (e.subdirMap = {}), e = (e = r[h]) || (r[h] = {
+                fullPathHash: c
+            });
+        }
+        let r = e.fileMap;
+        (r = r || (e.fileMap = {}))[i.name] = {
+            fileContent: i.view(t, !0),
+            fileContentKey: i.fileContentKey
+        };
+    }
+    return {
+        tree: s,
+        count: r.length
+    };
 }
 
 export {

package/src/QyCache.js

@@ -22,51 +22,51 @@ import {
 } from "./QyTrigger.js";
 
 import {
-    isString as n,
-    lockExclusiveFilePath as C,
+    isString as C,
+    lockExclusiveFilePath as q,
     unlockExclusiveFilePath as i
 } from "./QyUtils.js";
 
 import {
-    dumpStructure as q
+    dumpStructure as R
 } from "./QyStructure.js";
 
 import {
-    getIndexPropPaths as l,
-    parseNamePathAndQuery as d
+    getIndexPropPaths as n,
+    parseNamePathAndQuery as l
 } from "./QyIndex.js";
 
 import {
-    getDefaultOptions as u
+    getDefaultOptions as d
 } from "./QyDefaultOptions.js";
 
 import {
-    ensureDir as R,
+    ensureDir as Q,
     SpecialFilePaths as e
 } from "./QyUtils.js";
 
 import {
-    QueryCounter as p
+    QueryCounter as u
 } from "./QyUnionNode.js";
 
 import {
-    QyKVDataLoader as Q
+    QyKVDataLoader as S
 } from "./QyKVDataLoader.js";
 
 import {
-    requireFromModCode as h
+    requireFromModCode as p
 } from "./QyMod.js";
 
 let {
-    IndexDirPath: S,
-    TriggerDirPath: x,
-    RpcDirPath: O
+    IndexDirPath: x,
+    TriggerDirPath: O,
+    RpcDirPath: P
 } = e;
 
 class t extends r {
     constructor(r, e, t) {
         super(), e = {
-            ...u("QyCache"),
+            ...d("QyCache"),
             ...e
         };
         var i = v(r, "qykv");
@@ -95,13 +95,13 @@ class t extends r {
         } = this;
         logger.log(`Starting at ${r}...`);
         try {
-            await R(e), o.start();
+            await Q(e), o.start();
             var [ {
                 maxChangeId: g,
                 loadedMaxAclNum: n,
                 qySnapshots: l,
                 aclKeyValueMap: d
-            } ] = await Promise.all([ ((r, e) => (r = new Q(r, e)).load())(e, t), C(a) ]);
+            } ] = await Promise.all([ ((r, e) => (r = new S(r, e)).load())(e, t), q(a) ]);
             await i.start(g, n, l, d);
         } catch (r) {
             throw o.stop(), r;
@@ -112,9 +112,9 @@ class t extends r {
                 fileMap: i
             } = e;
             for (var o of t) r(o);
-        }(s), this.indexRootDir = s.searchOrCreateSubdir(S);
+        }(s), this.indexRootDir = s.searchOrCreateSubdir(x);
         var u = this, e = u.rootDir;
-        e.triggerNodes = [ new f() ], u.triggerRootDir = e.searchOrCreateSubdir(x);
+        e.triggerNodes = [ new f() ], u.triggerRootDir = e.searchOrCreateSubdir(O);
         for (p of u.triggerRootDir.fileList) {
             var {
                 name: p,
@@ -127,15 +127,15 @@ class t extends r {
             u.insertTriggerToTree(p, h, c, D);
         }
         var y = this;
-        y.rpcRootDir = y.rootDir.searchOrCreateSubdir(O);
+        y.rpcRootDir = y.rootDir.searchOrCreateSubdir(P);
         for (m of y.rpcRootDir.fileList) {
             var {
                 name: m,
                 fileContent: F
             } = m;
-            F && (F = F.modCode, F) && y.insertRpc(m, F);
+            C(F) && y.insertRpc(m, F);
         }
-        return t.dumpStructureAtStart && await q(v(r, "qystruct"), s), logger.log("Started."), 
+        return t.dumpStructureAtStart && await R(v(r, "qystruct"), s), logger.log("Started."), 
         this;
     }
     async stop() {
@@ -170,16 +170,16 @@ 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 : n(r) ? e.getFile(r) : e.searchFile(r);
+        return r.isFile ? r : C(r) ? e.getFile(r) : e.searchFile(r);
     }
     getDir(r, e = this.rootDir) {
-        return r.isDir ? r : n(r) ? e.getSubdir(r) : e.searchSubdir(r);
+        return r.isDir ? r : C(r) ? e.getSubdir(r) : e.searchSubdir(r);
     }
     getOrCreateFile(r, e = this.rootDir) {
-        return r.isFile ? r : n(r) ? e.getOrCreateFile(r) : e.searchOrCreateFile(r);
+        return r.isFile ? r : C(r) ? e.getOrCreateFile(r) : e.searchOrCreateFile(r);
     }
     getOrCreateDir(r, e = this.rootDir) {
-        return r.isDir ? r : n(r) ? e.getOrCreateSubdir(r) : e.searchOrCreateSubdir(r);
+        return r.isDir ? r : C(r) ? e.getOrCreateSubdir(r) : e.searchOrCreateSubdir(r);
     }
     getIndexDir(r) {
         return this.indexRootDir.getSubdir(r.fullPathHash);
@@ -203,7 +203,7 @@ class t extends r {
         var {
             rootDir: o,
             qyDB: a
-        } = this, i = h("trigger", r, i, a);
+        } = this, i = p("trigger", r, i, a);
         o.triggerNodes[0].insertTrigger(r, e, t, i), g(o, e);
     }
     removeTriggerFromTree(r, e) {
@@ -214,19 +214,19 @@ class t extends r {
         var {
             rpcFunMap: t,
             qyDB: i
-        } = this, e = h("rpc", r, e, i);
+        } = this, e = p("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 = (n(e) && null == t && (t = 1), new p(t, i)), i = this.options.queryAutoCreateIndex;
-        return c(r, e, a, t, o, i), a;
+        var a = [], t = (C(e) && !t && (t = 1), new u(t, i)), i = this.options.queryAutoCreateIndex;
+        return h(r, e, a, t, o, i), a;
     }
     queryFilesMulti(r, e, t, i = this.rootDir) {
-        var o, a, s = [], g = new p(e, t), n = this.options.queryAutoCreateIndex;
-        for ([ o, a ] of r) c(o, a, s, g, i, n);
+        var o, a, s = [], g = new u(e, t), n = this.options.queryAutoCreateIndex;
+        for ([ o, a ] of r) h(o, a, s, g, i, n);
         return s;
     }
     async callRpc(e, r, t) {
@@ -240,8 +240,8 @@ class t extends r {
     }
 }
 
-function c(r, e, t, i, o, a) {
-    e && (a = a ? l(e) : void 0, d(r, o, a, e, t, i));
+function h(r, e, t, i, o, a) {
+    e && (a = a ? n(e) : void 0, l(r, o, a, e, t, i));
 }
 
 export {

package/src/QyDB.js

@@ -11,11 +11,11 @@ import {
 } from "./QyBatch.js";
 
 import {
-    QyCache as a
+    QyCache as n
 } from "./QyCache.js";
 
 import {
-    getDefaultOptions as n
+    getDefaultOptions as a
 } from "./QyDefaultOptions.js";
 
 import {
@@ -34,7 +34,7 @@ class h extends t {
         s(e) && (t = e, e = d), super(), Object.assign(this, {
             rootFolder: e,
             options: {
-                ...n("QyDB"),
+                ...a("QyDB"),
                 ...t
             }
         });
@@ -44,7 +44,7 @@ class h extends t {
         return this.qyCache || (e = {
             ...this.options,
             ...e
-        }, t = new a(this.rootFolder, e, this), Object.assign(this, {
+        }, t = new n(this.rootFolder, e, this), Object.assign(this, {
             qyCache: t,
             fetch: new r(t),
             batch: new i(t, e),
@@ -144,32 +144,6 @@ class h extends t {
     callRpc(e, t, r) {
         return this.qyCache.callRpc(e, t, r);
     }
-    fileListToTree(e, t) {
-        var r, i = t, a = {};
-        for (r of e) {
-            var n, s = r.parentList;
-            let t = a;
-            for (n of s) {
-                var {
-                    name: m,
-                    fullPathHash: d
-                } = n;
-                let e = t.subdirMap;
-                e = e || (t.subdirMap = {}), t = (t = e[m]) || (e[m] = {
-                    fullPathHash: d
-                });
-            }
-            let e = t.fileMap;
-            (e = e || (t.fileMap = {}))[r.name] = {
-                fileContent: r.view(i, !0),
-                fileContentKey: r.fileContentKey
-            };
-        }
-        return {
-            tree: a,
-            count: e.length
-        };
-    }
 }
 
 export {

package/src/QyDefaultOptions.js

@@ -43,7 +43,8 @@ let t = {
     },
     QySnapshots: {
         pMOutdatedPercent: 30,
-        minSnapshotKeyCount: 3e3
+        minSnapshotKeyCount: 3e3,
+        minLenToCompress: 4e3
     },
     QyKVDataCleaner_Worker: {
         compressRedundantFile: !1

package/src/QyFetch.js

@@ -7,24 +7,10 @@ class e extends r {
         super(r), Object.assign(this, {
             stack: []
         });
-    }
-    dir(r, e) {
-        return u(this, super.dir(r, e));
-    }
-    indexDir(r, e, s) {
-        return u(this, super.indexDir(r, e, s));
-    }
-    file(r, e) {
-        return u(this, super.file(r, e));
-    }
-    view(r, e, s) {
-        return u(this, super.view(r, e, s));
-    }
-    queryFiles(r, e, s, t, i) {
-        return u(this, super.queryFiles(r, e, s, t, i));
-    }
-    queryFilesMulti(r, e, s, t) {
-        return u(this, super.queryFilesMulti(r, e, s, t));
+        for (let s of [ "dir", "indexDir", "file", "view", "queryFiles", "queryFilesMulti", "queryTree", "queryTreeMulti" ]) this[s] = (...r) => {
+            return e = this, r = super[s].apply(this, r), e.stack.push(r), e;
+            var e;
+        };
     }
     run() {
         var r = this.stack;
@@ -32,10 +18,6 @@ class e extends r {
     }
 }
 
-function u(r, e) {
-    return r.stack.push(e), r;
-}
-
 export {
     e as QyFetch
 };

package/src/QyFileLogger.js

@@ -28,7 +28,7 @@ class n extends o {
         (e = {
             ...s("QyFileLogger"),
             ...e
-        }).append = !e.clearLogAtStart, super(e, [ "stop" ], [ "startFileConsole", "switchFileConsole" ]), 
+        }).append = !e.clearLogAtStart, super(e, [], [ "startFileConsole", "switchFileConsole" ]), 
         Object.assign(this, {
             logFileFolder: t,
             qyLogFileSaver: new r(this, e)
@@ -40,7 +40,7 @@ class n extends o {
     getDateDirPath() {
         return this.dateDirPath;
     }
-    async start() {
+    async _op_start() {
         var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), g(t)), 
         this.dateDirPath = h(this, t));
         this.qyLogFileSaver.start(a(t, "change.txt")), await this.startFileConsole(t);