datafolder 1.0.5 → 1.0.7

package/src/QyLogFileSaver.js

@@ -11,7 +11,7 @@ class s extends e {
         super(e, "QyLogFileSaver_Worker.js", s = {
             ...r("QyLogFileSaver"),
             ...s
-        }, s, [ "switch" ], [ "save" ]);
+        }, s, [], [ "switch", "save" ]);
     }
 }
 

package/src/QyLogFileSaver_Worker.js

@@ -19,10 +19,10 @@ class i extends t {
             qyBinWriter: new r(t)
         });
     }
-    async start(t) {
+    async _op_start(t) {
         await this.qyBinWriter.start(t);
     }
-    async stop() {
+    async _op_stop() {
         await this.qyBinWriter.stop();
     }
     async switch(t) {

package/src/QyMod.js

@@ -1,16 +1,16 @@
-import m from "node:module";
+import a from "node:module";
 
 import {
-    logger as a
+    logger as m
 } from "./QyLogger.js";
 
-function o(r, e, i, o) {
-    if (i) try {
-        var t = r + "_" + e, d = `_${t}_qydb`, l = (globalThis[d] = o, new m(e));
-        return l._compile(`(function(qyDB){${i}})(${d});`, t + ".js"), delete globalThis[d], 
+function o(r, e, d, o) {
+    if (d) try {
+        var i = r + "_" + e, t = `_${i}_qydb`, l = (globalThis[t] = o, new a(e));
+        return l._compile(`(function(dataFolder){${d}})(${t});`, i + ".js"), delete globalThis[t], 
         l.exports;
     } catch (o) {
-        a.error("requireFromModCode failed:", r, e, i, o);
+        m.error("requireFromModCode failed:", r, e, d, o);
     }
 }
 

package/src/QyOpRunner.js

@@ -9,23 +9,23 @@ import {
 } from "./QyLogger.js";
 
 import {
-    getDefaultOptions as i
+    getDefaultOptions as r
 } from "./QyDefaultOptions.js";
 
 import {
-    QyQueue as n
+    QyQueue as i
 } from "./QyQueue.js";
 
 class e extends s {
     constructor(s, t = [], e = []) {
         super(), s = {
-            ...i("QyOpRunner"),
+            ...r("QyOpRunner"),
             ...s
         }, Object.assign(this, {
             options: s,
             running: !1,
-            opQueue: new n(s)
-        }), r(this, t, !0), r(this, e);
+            opQueue: new i(s)
+        }), n(this, t, !0), n(this, e), n(this, [ "start", "stop" ], !0);
     }
     get firstOp() {
         return this.opQueue.first;
@@ -50,38 +50,41 @@ class e extends s {
             for (var s = this.opQueue; !s.isEmpty; ) {
                 var t = s.shift(), {
                     opFunName: e,
-                    eventName: i,
-                    resolve: n,
-                    args: r
+                    eventName: r,
+                    resolve: i,
+                    args: n
                 } = t;
                 if (e) {
                     this.runningOp = t;
                     try {
-                        var o = await (r ? this[e](...r) : this[e]());
-                        n && n(o), i && this.emit(i, o);
+                        var o = await (n ? this[e](...n) : this[e]());
+                        i && i(o), r && this.emit(r, o);
                     } catch (s) {
-                        u.error(`Run ${e} failed:`, s), i && this.emit(i, s);
+                        u.error(`Run ${e} failed:`, s), r && this.emit(r, s);
                     }
                     this.runningOp = void 0;
-                } else n && n(), i && this.emit(i);
+                } else i && i(), r && this.emit(r);
             }
             this.running = !1;
         }
     }
 }
 
-function r(i, s, n) {
+function n(r, s, i) {
     for (let e of s) {
         let t = "_op_" + e;
-        i[e] || (i[e] = n ? (...s) => i.pushAndRunWithPromise({
+        if (r[e] || (r[e] = i ? (...s) => r.pushAndRunWithPromise({
             opName: e,
             opFunName: t,
             args: s
-        }) : (...s) => i.pushAndRun({
+        }) : (...s) => r.pushAndRun({
             opName: e,
             opFunName: t,
             args: s
-        })), i[t] || (i[t] = () => u.error(`Class method ${t} not implemented.`));
+        })), !r[t]) {
+            let s = r.constructor.name + " not implemented " + t;
+            r[t] = () => u.error(s), u.error(s);
+        }
     }
 }
 

package/src/QySnapshotCompactor_Worker.js

@@ -3,7 +3,7 @@ import {
 } from "node:path";
 
 import {
-    open as h
+    open as f
 } from "node:fs/promises";
 
 import {
@@ -19,12 +19,12 @@ import {
 } from "./QyKVDataCleaner.js";
 
 import {
-    QySnapshots as n
+    QySnapshots as n,
+    iterPMBuffer as h
 } from "./QySnapshots.js";
 
 import {
     isEmptyObj as r,
-    listToMap as y,
     readBufferAsync as l
 } from "./QyUtils.js";
 
@@ -44,13 +44,14 @@ class s extends a {
             qySnapshots: new n(o, s),
             qyKVDataCleaner: new p(this, a, s),
             pMInfoMap: {},
-            vLInfoMap: {}
+            vLInfoMap: {},
+            combinedSnapshotNumList: []
         });
     }
-    start() {
+    _op_start() {
         this.qyKVDataCleaner.start();
     }
-    async stop() {
+    async _op_stop() {
         await this.qyKVDataCleaner.stop();
     }
     async _op_compactSnapshots(a, o, s) {
@@ -66,7 +67,7 @@ class s extends a {
                     info: n,
                     prefixPM: i
                 } = s;
-                (null == i || r(i) || await f(a, s)) && (await t.savePosMap(s), 
+                (null == i || r(i) || await M(a, s)) && (await t.savePosMap(s), 
                 e[p] = n, o[p] = s.prefixPM);
             })(this, a, s)));
         }
@@ -77,7 +78,7 @@ class s extends a {
                     qySnapshots: e,
                     vLInfoMap: p
                 } = a;
-                await f(a, s) && (await M(a, s), await e.saveKeyValueMap(s), {
+                await M(a, s) && (await m(a, s), await e.saveKeyValueMap(s), {
                     snapshotNum: a,
                     info: e,
                     posMap: s,
@@ -91,73 +92,74 @@ class s extends a {
         0 < s.length && e.push((async (a, s, o) => {
             var t, {
                 qySnapshots: e,
-                vLInfoMap: p
-            } = a, n = e.getMaxCombinedSnapshot(s), {
-                snapshotNum: i,
-                info: r,
-                keyValueMap: f
-            } = (await M(a, n), n), h = (Object.assign(n, {
+                vLInfoMap: p,
+                combinedSnapshotNumList: n
+            } = a, i = e.getMaxCombinedSnapshot(s), {
+                snapshotNum: r,
+                info: f,
+                keyValueMap: h
+            } = (await m(a, i), i);
+            Object.assign(i, {
                 posMap: void 0,
                 prefixPM: void 0
-            }), []);
-            for (t of s) t != n && (h.push(t.snapshotNum), await M(a, t), Object.assign(f, t.keyValueMap), 
+            });
+            for (t of s) t != i && (n.push(t.snapshotNum), await m(a, t), Object.assign(h, t.keyValueMap), 
             Object.assign(t, {
                 keyValueMap: void 0,
                 posMap: void 0,
                 prefixPM: void 0
             }));
-            await e.saveKeyValueMap(n), p[i] = r, o.combineUpdate = {
-                snapshotNum: i,
-                combinedSnapshotNumList: h,
-                posMap: n.posMap
+            await e.saveKeyValueMap(i), p[r] = f, o.combineUpdate = {
+                snapshotNum: r,
+                combinedSnapshotNumList: n,
+                posMap: i.posMap
             };
         })(this, s, t)), await Promise.all(e), this.castParent("onCompactUpdates", t);
     }
-    async _op_saveSnapshotInfos(a) {
-        var s, o, {
-            qySnapshots: t,
-            pMInfoMap: e,
-            vLInfoMap: p,
+    async _op_saveSnapshotInfos() {
+        var a, s, {
+            qySnapshots: o,
+            pMInfoMap: t,
+            vLInfoMap: e,
+            combinedSnapshotNumList: p,
             qyKVDataCleaner: n
         } = this, i = (Object.assign(this, {
             pMInfoMap: {},
             vLInfoMap: {}
-        }), y(a)), r = [];
-        for (s in e) s in i && r.push(t.saveSnapshotInfo(s, e[s]));
-        for (o in p) o in i && r.push(t.saveSnapshotInfo(o, p[o]));
-        if (0 < r.length) {
-            await Promise.all(r);
-            var f, h, l = [];
-            for (f in e) {
-                var M = e[f];
-                l.push([ f, M.pMVersion ]);
-            }
-            for (h in p) {
-                var v = p[h];
-                l.push([ h, v.pMVersion ]), n.cleanVLFiles(h, v.vLVersion);
-            }
-            n.cleanPMFiles(l);
+        }), []);
+        for (a in t) i.push(o.saveSnapshotInfo(a, t[a]));
+        for (s in e) i.push(o.saveSnapshotInfo(s, e[s]));
+        await Promise.all(i);
+        var r, f, h = [];
+        for (r in t) {
+            var l = t[r];
+            h.push([ r, l.pMVersion ]);
+        }
+        for (f in e) {
+            var M = e[f];
+            h.push([ f, M.pMVersion ]), n.cleanVLFiles(f, M.vLVersion);
         }
+        n.cleanPMFiles(h), 0 < p.length && (n.removeSnapshotsFiles(p), p.length = 0);
     }
 }
 
-async function f(a, s) {
-    var o = a.qySnapshots;
+async function M(a, s) {
+    a = a.qySnapshots;
     let {
-        prefixPM: t,
-        posMap: e
+        prefixPM: o,
+        posMap: t
     } = s;
-    var p, n = o.getPMFilePath(s), i = await h(n);
-    for (p of Object.keys(t).sort()) {
-        var [ r, f ] = t[p], r = await l(n, i, r, f);
-        if (!r) return void i.close();
-        o.iterPMBuffer(r, (a, s) => e[a] = s);
+    var e, p = a.getPMFilePath(s), n = await f(p);
+    for (e of Object.keys(o).sort()) {
+        var [ i, r ] = o[e], i = await l(p, n, i, r);
+        if (!i) return n.close(), !1;
+        h(i, (a, s) => t[a] = s);
     }
-    return i.close(), !0;
+    return n.close(), !0;
 }
 
-async function M(a, s) {
-    var o, a = a.qySnapshots, t = s.posMap, e = s.keyValueMap = {}, p = a.getVLFilePath(s), n = await h(p);
+async function m(a, s) {
+    var o, a = a.qySnapshots, t = s.posMap, e = s.keyValueMap = {}, p = a.getVLFilePath(s), n = await f(p);
     for (o of Object.keys(t).sort()) {
         var [ i, r ] = t[o];
         if (0 < r) {

package/src/QySnapshotSaver_Worker.js

@@ -1,5 +1,5 @@
 import {
-    join as e
+    join as t
 } from "node:path";
 
 import {
@@ -26,124 +26,126 @@ class s extends a {
         super(s = {
             ...o("QySnapshotSaver_Worker"),
             ...s
-        }, [ "stop", "waitForSnapshotSaved" ]);
-        var t = e(a, "snapshot");
+        }, [], [ "waitForSnapshotSaved" ]);
+        var e = t(a, "snapshot");
         Object.assign(this, {
             kvFolder: a,
-            snapshotFolder: t,
-            qySnapshots: new n(t, s),
+            snapshotFolder: e,
+            qySnapshots: new n(e, s),
             qyKVDataCleaner: new p(this, a, s),
-            aclKeyValueMap: {}
+            aclKeyValueMap: {},
+            snapshotSavedChangeId: 0
         });
     }
-    start(a, s, t) {
-        this.maxChangeId = a, this.qyKVDataCleaner.start(), s && this.waitForSnapshotSaved(h(this, s, a, t));
+    _op_start(a, s, e) {
+        this.maxChangeId = a, this.qyKVDataCleaner.start(), s && this.waitForSnapshotSaved(h(this, s, a, e));
     }
-    castSave(a, s, t) {
+    castSave(a, s, e) {
         var {
-            aclKeyValueMap: e,
+            aclKeyValueMap: t,
             qySnapshots: o
         } = this;
-        o.applyCmdObj(s, e, t), this.maxChangeId = a;
+        o.applyCmdObj(s, t, e), this.maxChangeId = a;
     }
     async saveSnapshot(a) {
         var {
             maxChangeId: s,
-            aclKeyValueMap: t
+            aclKeyValueMap: e
         } = this;
-        this.aclKeyValueMap = {}, this.waitForSnapshotSaved(h(this, a, s, t));
+        this.aclKeyValueMap = {}, this.waitForSnapshotSaved(h(this, a, s, e));
     }
     releaseSnapshot(a) {
-        var s, t = this.qySnapshots, {
-            numToSnapshotMap: e,
+        var s, e = this.qySnapshots, {
+            numToSnapshotMap: t,
             keyToSnapshotMap: o
-        } = t, e = e[a], a = e.keyValueMap;
-        for (s in delete e.keyValueMap, a) delete o[s];
-        t.delSnapshot(e), global.gc && global.gc();
+        } = e, t = t[a], a = t.keyValueMap;
+        for (s in delete t.keyValueMap, a) delete o[s];
+        e.delSnapshot(t), global.gc && global.gc();
     }
     async _op_stop() {
         var {
             qySnapshots: a,
-            qyKVDataCleaner: s
+            qyKVDataCleaner: s,
+            snapshotSavedChangeId: e
         } = this;
-        a.closeAllFDs(), await s.stop();
+        return a.closeAllFDs(), await s.stop(), e;
     }
     async _op_waitForSnapshotSaved({
         saveMaxSnapshotInfoPromise: a,
         outdates: s
     }) {
-        var t, {
+        var e, {
             snapshotNum: a,
-            maxChangeId: e
+            maxChangeId: t
         } = await a, {
             emptySnapshotNumList: s,
             pMChangeList: o,
             vLChange: n,
             snapshotInfoMap: p,
             promises: h
-        } = s, {
+        } = (this.snapshotSavedChangeId = t, s), {
             qyKVDataCleaner: r,
             qySnapshots: i,
             options: l
         } = this;
-        for (t in r.cleanAclFiles(a), 0 < h.length && await Promise.all(h), h.length = 0, 
-        p) h.push(i.saveSnapshotInfo(t, p[t]));
+        for (e in r.cleanAclFiles(a), 0 < h.length && await Promise.all(h), h.length = 0, 
+        p) h.push(i.saveSnapshotInfo(e, p[e]));
         0 < h.length && await Promise.all(h), 0 < s.length && r.removeSnapshotsFiles(s), 
         0 < o.length && r.cleanPMFiles(o), 0 < n.length && r.cleanVLFiles(n[0], n[1]);
         let u;
         a = i.snapshotCount;
         0 < a && a >= l.maxInMemSnapshotCount && (delete (s = (a => {
-            let s = a.qySnapshots.numToSnapshotMap, t;
-            for (var e in s) {
-                var o = s[e];
-                (!t || t.snapshotNum > e) && (t = o);
+            let s = a.qySnapshots.numToSnapshotMap, e;
+            for (var t in s) {
+                var o = s[t];
+                (!e || e.snapshotNum > t) && (e = o);
             }
-            return t;
+            return e;
         })(this)).prefixPM, delete (u = {
             ...s
         }).keyValueMap, delete s.posMap, s.isOut = !0, logger.info("Sending snapshot " + s.snapshotNum)), 
-        this.castParent("onSnapshotSavedChangeId", e, u);
+        this.castParent("onSnapshotSavedChangeId", t, u);
     }
 }
 
-function h(a, s, t, e) {
+function h(a, s, e, t) {
     var o = (a => {
-        var s, t = a.qySnapshots, {
-            emptySnapshotNumList: e,
+        var s, e = a.qySnapshots, {
+            emptySnapshotNumList: t,
             combiningSnapshotList: a,
             pMCompactSnapshotList: o
-        } = t.calOutdates(), n = {}, p = [], h = [], r = [];
+        } = e.calOutdates(), n = {}, p = [], h = [], r = [];
         for (s of o) {
             var {
                 snapshotNum: i,
                 info: l
             } = s;
-            p.push(t.savePosMap(s)), h.push([ i, l.pMVersion ]), n[i] = {
+            p.push(e.savePosMap(s)), h.push([ i, l.pMVersion ]), n[i] = {
                 ...l
             };
         }
-        let u = a.length, m;
+        let u = a.length, S;
         if (0 < u) {
-            var S, y = t.keyToSnapshotMap, {
-                keyValueMap: d,
+            var m, d = e.keyToSnapshotMap, {
+                keyValueMap: y,
                 info: o,
                 snapshotNum: v
-            } = m = t.getMaxCombinedSnapshot(a);
-            for (S of a) if (m != S) {
+            } = S = e.getMaxCombinedSnapshot(a);
+            for (m of a) if (S != m) {
                 var g, {
                     keyValueMap: M,
                     snapshotNum: f
-                } = S;
-                for (g in M) d[g] = M[g], y[g] = m;
-                t.delSnapshot(S), e.push(f);
+                } = m;
+                for (g in M) y[g] = M[g], d[g] = S;
+                e.delSnapshot(m), t.push(f);
             }
-            p.push(t.saveKeyValueMap(m)), h.push([ v, o.pMVersion ]), r.push(v, o.vLVersion), 
+            p.push(e.saveKeyValueMap(S)), h.push([ v, o.pMVersion ]), r.push(v, o.vLVersion), 
             n[v] = {
                 ...o
             };
         }
         return {
-            emptySnapshotNumList: e,
+            emptySnapshotNumList: t,
             pMChangeList: h,
             vLChange: r,
             snapshotInfoMap: n,
@@ -151,27 +153,27 @@ function h(a, s, t, e) {
         };
     })(a), s = {
         snapshotNum: s,
-        keyValueMap: e,
+        keyValueMap: t,
         outdatedCount: 0,
         info: {
-            maxChangeId: t,
+            maxChangeId: e,
             pMVersion: 0,
             vLVersion: 0
         }
-    }, e = (a.qySnapshots.addMaxSnapshot(s), (async (a, s) => {
+    }, t = (a.qySnapshots.addMaxSnapshot(s), (async (a, s) => {
         await (a = a.qySnapshots).saveKeyValueMap(s);
         var {
             snapshotNum: s,
-            info: t
+            info: e
         } = s;
-        return await a.saveSnapshotInfo(s, t), logger.log("Created snapshot " + s), 
+        return await a.saveSnapshotInfo(s, e), logger.log("Created snapshot " + s), 
         {
             snapshotNum: s,
-            maxChangeId: t.maxChangeId
+            maxChangeId: e.maxChangeId
         };
     })(a, s));
     return {
-        saveMaxSnapshotInfoPromise: e,
+        saveMaxSnapshotInfoPromise: t,
         outdates: o
     };
 }