datafolder 1.0.5 → 1.0.6

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

@@ -24,7 +24,6 @@ import {
 
 import {
     isEmptyObj as r,
-    listToMap as y,
     readBufferAsync as l
 } from "./QyUtils.js";
 
@@ -44,13 +43,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) {
@@ -91,53 +91,54 @@ 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);
     }
 }
 

package/src/QySnapshotSaver_Worker.js

@@ -26,7 +26,7 @@ class s extends a {
         super(s = {
             ...o("QySnapshotSaver_Worker"),
             ...s
-        }, [ "stop", "waitForSnapshotSaved" ]);
+        }, [], [ "waitForSnapshotSaved" ]);
         var t = e(a, "snapshot");
         Object.assign(this, {
             kvFolder: a,
@@ -36,7 +36,7 @@ class s extends a {
             aclKeyValueMap: {}
         });
     }
-    start(a, s, t) {
+    _op_start(a, s, t) {
         this.maxChangeId = a, this.qyKVDataCleaner.start(), s && this.waitForSnapshotSaved(h(this, s, a, t));
     }
     castSave(a, s, t) {