datafolder 1.0.6 → 1.0.8

package/src/QySnapshotCompactor_Worker.d.ts

@@ -0,0 +1,11 @@
+import { QyMessageWorker } from "./QyMessageWorker.ts";
+export default class QySnapshotCompactor_Worker extends QyMessageWorker {
+    constructor({ kvFolder, options }: {
+        kvFolder: any;
+        options: any;
+    });
+    _op_start(): void;
+    _op_stop(): Promise<void>;
+    _op_compactSnapshots(pMCompactSnapshotList: any, vLCompactSnapshotList: any, combiningSnapshotList: any): Promise<void>;
+    _op_saveSnapshotInfos(): Promise<void>;
+}

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,7 +19,8 @@ import {
 } from "./QyKVDataCleaner.js";
 
 import {
-    QySnapshots as n
+    QySnapshots as n,
+    iterPMBuffer as h
 } from "./QySnapshots.js";
 
 import {
@@ -27,7 +28,7 @@ import {
     readBufferAsync as l
 } from "./QyUtils.js";
 
-class s extends a {
+export default class extends a {
     constructor({
         kvFolder: a,
         options: 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,
@@ -97,12 +98,12 @@ class s extends a {
                 snapshotNum: r,
                 info: f,
                 keyValueMap: h
-            } = (await M(a, i), i);
+            } = (await m(a, i), i);
             Object.assign(i, {
                 posMap: void 0,
                 prefixPM: void 0
             });
-            for (t of s) t != i && (n.push(t.snapshotNum), await M(a, t), Object.assign(h, 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,
@@ -142,23 +143,23 @@ class s extends a {
     }
 }
 
-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) {
@@ -168,6 +169,4 @@ async function M(a, s) {
         } else e[o] = void 0;
     }
     return n.close(), !0;
-}
-
-export default s;
+}

package/src/QySnapshotSaver.d.ts

@@ -0,0 +1,4 @@
+import { QyMessager } from "./QyMessager.ts";
+export declare class QySnapshotSaver extends QyMessager {
+    constructor(parent: any, kvFolder: any, options: any);
+}

package/src/QySnapshotSaver.js

@@ -8,7 +8,7 @@ import {
 
 class e extends s {
     constructor(s, e, a) {
-        super(s, "QySnapshotSaver_Worker.js", {
+        super(s, "QySnapshotSaver_Worker", {
             kvFolder: e,
             options: a = {
                 ...o("QySnapshotSaver"),

package/src/QySnapshotSaver_Worker.d.ts

@@ -0,0 +1,16 @@
+import { QyMessageWorker } from "./QyMessageWorker.ts";
+export default class QySnapshotSaver_Worker extends QyMessageWorker {
+    constructor({ kvFolder, options }: {
+        kvFolder: any;
+        options: any;
+    });
+    _op_start(maxChangeId: any, loadedMaxAclNum: any, aclKeyValueMap: any): void;
+    castSave(changeId: any, cmdArgAsListObj: any, syncList: any): void;
+    saveSnapshot(maxSnapshotNum: any): Promise<void>;
+    releaseSnapshot(snapshotNum: any): void;
+    _op_stop(): Promise<any>;
+    _op_waitForSnapshotSaved({ saveMaxSnapshotInfoPromise, outdates }: {
+        saveMaxSnapshotInfoPromise: any;
+        outdates: any;
+    }): Promise<void>;
+}

package/src/QySnapshotSaver_Worker.js

@@ -1,5 +1,5 @@
 import {
-    join as e
+    join as t
 } from "node:path";
 
 import {
@@ -18,7 +18,11 @@ import {
     QyKVDataCleaner as p
 } from "./QyKVDataCleaner.js";
 
-class s extends a {
+import {
+    logger as m
+} from "./QyLogger.js";
+
+export default class extends a {
     constructor({
         kvFolder: a,
         options: s
@@ -27,123 +31,125 @@ class s extends a {
             ...o("QySnapshotSaver_Worker"),
             ...s
         }, [], [ "waitForSnapshotSaved" ]);
-        var t = e(a, "snapshot");
+        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
         });
     }
-    _op_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);
+        }).keyValueMap, delete s.posMap, s.isOut = !0, m.info("Sending snapshot " + s.snapshotNum)), 
+        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;
         if (0 < u) {
-            var S, y = t.keyToSnapshotMap, {
+            var S, y = e.keyToSnapshotMap, {
                 keyValueMap: d,
                 info: o,
                 snapshotNum: v
-            } = m = t.getMaxCombinedSnapshot(a);
+            } = m = e.getMaxCombinedSnapshot(a);
             for (S of a) if (m != S) {
                 var g, {
                     keyValueMap: M,
                     snapshotNum: f
                 } = S;
                 for (g in M) d[g] = M[g], y[g] = m;
-                t.delSnapshot(S), e.push(f);
+                e.delSnapshot(S), t.push(f);
             }
-            p.push(t.saveKeyValueMap(m)), h.push([ v, o.pMVersion ]), r.push(v, o.vLVersion), 
+            p.push(e.saveKeyValueMap(m)), 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,29 +157,26 @@ 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), m.log("Created snapshot " + s), {
             snapshotNum: s,
-            maxChangeId: t.maxChangeId
+            maxChangeId: e.maxChangeId
         };
     })(a, s));
     return {
-        saveMaxSnapshotInfoPromise: e,
+        saveMaxSnapshotInfoPromise: t,
         outdates: o
     };
-}
-
-export default s;
+}

package/src/QySnapshots.d.ts

@@ -0,0 +1,27 @@
+export declare class QySnapshots {
+    constructor(snapshotFolder: any, options: any);
+    loadSnapshotInfos(): Promise<void>;
+    closeAllFDs(): void;
+    saveKeyValueMap(snapshot: any): Promise<any>;
+    addMaxSnapshot(maxSnapshot: any): void;
+    removeKey(key: any): true | undefined;
+    applyCmdObj(cmdObj: any, aclKeyValueMap: any, syncList: any): void;
+    getValueSync(key: any): any;
+    loadPartialPosMapBuffer(snapshot: any, prefix: any, buffer: any): void;
+    delSnapshot(snapshot: any): void;
+    calOutdates(): {
+        emptySnapshotNumList: never[];
+        combiningSnapshotList: never[];
+        pMCompactSnapshotList: never[];
+        vLCompactSnapshotList: never[];
+    };
+    getMaxCombinedSnapshot(snapshotList: any): any;
+    getPMFilePath(snapshot: any): string;
+    getVLFilePath(snapshot: any): string;
+    saveSnapshotInfo(snapshotNum: any, info: any): any;
+    savePosMap(snapshot: any, sortedKeyList: any): Promise<any>;
+    isEmptySnapshot(snapshot: any): boolean;
+    removeKeyFromSnapshot(snapshot: any, key: any): void;
+}
+export declare function iterPMBuffer(buffer: any, fun: any): void;
+export declare function loadPrefixPMFile(prefixPMFilePath: any): Promise<{}>;