datafolder 1.0.10 → 1.0.12

package/src/QyTrigger.js

@@ -11,7 +11,6 @@ import {
     isEmptyObj as e,
     isMatchName as l,
     getMatchParam as d,
-    arrayLast as f,
     propNameJoin as v
 } from "./QyUtils.js";
 
@@ -21,7 +20,7 @@ import {
 
 let y = Array.isArray;
 
-class h {
+class f {
     name;
     parent;
     children = {};
@@ -32,12 +31,12 @@ class h {
             parent: r
         });
     }
-    insertTrigger(e, r, t, a) {
+    insertTrigger(e, r, t, a = void 0) {
         let i = this;
-        for (var s of r) {
-            l(s) && (s = "*");
-            var o = i.children;
-            i = o[s] || (o[s] = new h(s, i));
+        for (var o of r) {
+            l(o) && (o = "*");
+            var s = i.children;
+            i = s[o] || (s[o] = new f(o, i));
         }
         var n = i.triggerMap, g = n[e];
         g ? Object.assign(g, {
@@ -45,7 +44,7 @@ class h {
             fileNamePath: r,
             propNamePathList: t,
             fun: a
-        }) : n[e] = new m(e, r, t, a);
+        }) : n[e] = new h(e, r, t, a);
     }
     removeTrigger(e, r) {
         let t = this;
@@ -74,7 +73,7 @@ class h {
     }
 }
 
-class m {
+class h {
     triggerName;
     fileNamePath;
     propNamePathList;
@@ -91,11 +90,11 @@ class m {
         var t, {
             triggerName: a,
             fileNamePath: i,
-            propNamePathList: s,
-            fun: o
+            propNamePathList: o,
+            fun: s
         } = this, n = e.fileContent;
         let g;
-        for (t of s) {
+        for (t of o) {
             var l = c(r.oldValue, t), f = c(r.newValue, t);
             p(l, f) || (l = {
                 oldValue: l,
@@ -108,14 +107,14 @@ class m {
         if (g) {
             var {
                 namePath: h,
-                qyCache: s
+                qyCache: o
             } = e;
             for (let e = 0; e < h.length; ++e) {
                 var m = d(i[e]);
                 m && (g[m] = h[e]);
             }
             try {
-                o && o(g), s.emit(a, g);
+                s && s(g), o.emit(a, g);
             } catch (e) {
                 N.error(`Running trigger ${a} failed:`, g, e);
             }
@@ -125,7 +124,7 @@ class m {
 
 let t = [];
 
-function P(e, r) {
+function m(e, r) {
     return e ? l(r) ? Object.values(e) : (e = e[r]) ? [ e ] : t : t;
 }
 
@@ -133,18 +132,18 @@ function r(e, a) {
     if (0 != a.length) {
         let r = [ e ], t = [];
         for (let e = 0; e < a.length - 1; ++e) {
-            var i, s = a[e];
-            for (i of r) for (var o of P(i.subdirMap, s)) i.setChildTriggerNodes(o), 
-            t.push(o);
+            var i, o = a[e];
+            for (i of r) for (var s of m(i.subdirMap, o)) i.setChildTriggerNodes(s), 
+            t.push(s);
             if (0 == t.length) return;
             [ r, t ] = [ t, r ], t.length = 0;
         }
-        var n, g = f(a);
-        for (n of r) for (var l of P(n.fileMap, g)) n.setChildTriggerNodes(l);
+        var n, g = a.at(-1);
+        for (n of r) for (var l of m(n.fileMap, g)) n.setChildTriggerNodes(l);
     }
 }
 
 export {
-    h as QyTriggerNode,
+    f as QyTriggerNode,
     r as updateTriggerNodes
 };

package/src/QyUtils.d.ts

@@ -7,6 +7,7 @@ export declare const SpecialFilePaths: {
     TriggerDirPath: string[];
     RpcDirPath: string[];
     IndexDirPath: string[];
+    ExpireDirPath: string[];
     IndexPropPathsFileName: string;
 };
 export declare function isMatchName(name: any): any;
@@ -18,7 +19,6 @@ export declare function getSubdirMapKey(fullPathHash: any): string;
 export declare function getFileMapKey(fullPathHash: any): string;
 export declare function getContentKey(fullPathHash: any): string;
 export declare function getRandomStr(byteCount?: number): string;
-export declare function arrayLast(array: any): any;
 export declare function isEmptyObj(obj: any): boolean;
 export declare function isNotNullObj(item: any): boolean;
 export declare function isString(item: any): item is string;
@@ -40,7 +40,7 @@ export declare function unlockExclusiveFilePath(exclusiveFilePath: any): void;
 export declare function fromSingleName(name: any): any;
 export declare function toSingleName(list: any): any;
 export declare function pathSplit(itemPath: any): any;
-export declare function propNameSplit(propNameStr: any): any;
+export declare function ensurePropNamePathList(propNamePathList: any): any[] | undefined;
 export declare function propNameJoin(propName: any): any;
 export declare function randomInt(max: any, min?: number): number;
 export declare function listToMap(list: any): {};
@@ -50,4 +50,5 @@ export declare function loadFileList(fileList: any, preloadCount?: number): Asyn
     filePath: any;
     bin: any;
 }, void, unknown>;
+export declare function getNowSeconds(now?: Date): number;
 export * as default from "./QyUtils.ts";

package/src/QyUtils.js

@@ -18,52 +18,51 @@ import {
     logger as u
 } from "../src/QyLogger.js";
 
-var a = t.dirname(r(import.meta.url)), f = Object.fromEntries([ "$del", "$link", "$rpl", "$spec", "$raw", "$all", "$clone", "$ext", "$or", "$and", "$gt", "$lt", "$gte", "$lte" ].map(r => [ r, r ])), c = "%", c = {
-    HiddenFolderName: c,
-    TriggerDirPath: [ c, "trigger" ],
-    RpcDirPath: [ c, "rpc" ],
-    IndexDirPath: [ c, "index" ],
+let a = Array.isArray;
+
+var f = t.dirname(r(import.meta.url)), c = Object.fromEntries([ "$del", "$link", "$rpl", "$spec", "$raw", "$all", "$clone", "$ext", "$or", "$and", "$gt", "$lt", "$gte", "$lte" ].map(r => [ r, r ])), s = "%", s = {
+    HiddenFolderName: s,
+    TriggerDirPath: [ s, "trigger" ],
+    RpcDirPath: [ s, "rpc" ],
+    IndexDirPath: [ s, "index" ],
+    ExpireDirPath: [ s, "expire" ],
     IndexPropPathsFileName: "propPaths"
 };
 
-function s(r) {
+function d(r) {
     return r.startsWith("{") && r.endsWith("}");
 }
 
-function d(r) {
-    return s(r) && r.substring(1, r.length - 1);
+function m(r) {
+    return d(r) && r.substring(1, r.length - 1);
 }
 
-function m(r) {
+function p(r) {
     return 1e12 < r ? Math.round(100 * r / 1e12) / 100 + "TB" : 1e9 < r ? Math.round(100 * r / 1e9) / 100 + "GB" : 1e6 < r ? Math.round(100 * r / 1e6) / 100 + "MB" : 1e3 < r ? Math.round(100 * r / 1e3) / 100 + "KB" : r.toString();
 }
 
-function p(r, t = 10) {
+function h(r, t = 10) {
     return n.createHash("sha256").update(r, "utf8").digest("base64url").slice(0, t);
 }
 
-var h = 11;
+var g = 11;
 
-function g(r) {
+function y(r) {
     return "d" + r;
 }
 
-function y(r) {
+function v(r) {
     return "f" + r;
 }
 
-function v(r) {
+function b(r) {
     return "c" + r;
 }
 
-function b(r = 8) {
+function $(r = 8) {
     return n.randomBytes(r).toString("hex");
 }
 
-function $(r) {
-    return r[r.length - 1];
-}
-
 function w(r) {
     if (null != r) for (var t in r) if (null != r[t]) return !1;
     return !0;
@@ -73,28 +72,28 @@ function P(r) {
     return null != r && "object" == typeof r && !(r instanceof Date);
 }
 
-function S(r) {
+function x(r) {
     return "string" == typeof r;
 }
 
-function j(r) {
+function S(r) {
     return "number" == typeof r;
 }
 
-function x(r) {
+function j(r) {
     return "boolean" == typeof r;
 }
 
-function B(r) {
+function M(r) {
     return "function" == typeof r;
 }
 
-function M(r) {
+function B(r) {
     var t = typeof r;
     return "string" == t || "number" == t || "boolean" == t || r instanceof Date;
 }
 
-function O(r) {
+function D(r) {
     let t = r.length;
     for (;null == r[t - 1] && 0 < t; ) --t;
     return r.length = t, r;
@@ -107,25 +106,25 @@ function T(n) {
     }))), n;
 }
 
-function k(r) {
+function A(r) {
     return Buffer.isBuffer(r) ? r : Buffer.from(r);
 }
 
-function A(r) {
+function E(r) {
     return 1 < r ? "s" : "";
 }
 
-function D(r) {
+function O(r) {
     return l.mkdir(r, {
         recursive: !0
     });
 }
 
-function F(r) {
-    return D(t.dirname(r));
+function k(r) {
+    return O(t.dirname(r));
 }
 
-async function I(r) {
+async function F(r) {
     try {
         return (await l.stat(r)).size;
     } catch (r) {
@@ -134,29 +133,29 @@ async function I(r) {
 }
 
 async function W(r) {
-    return !1 !== await I(r);
+    return !1 !== await F(r);
 }
 
-function E(r, t = void 0) {
+function L(r, t = void 0) {
     r *= 1e3;
     return t ? i.setTimeout(r, !0, {
         signal: t
     }) : i.setTimeout(r);
 }
 
-let N;
+let I;
 
-async function L(t) {
+async function R(t) {
     try {
-        await F(t);
+        await k(t);
         var r = new Date().toISOString() + ": " + e.argv.join(" ");
         function n() {
-            for (var r of Object.keys(N)) U(r);
+            for (var r of Object.keys(I)) N(r);
         }
         await l.writeFile(t, r, {
             flag: "wx",
             flush: !0
-        }), u.info("Locked " + t), N ? N[t] = 1 : (N = {
+        }), u.info("Locked " + t), I ? I[t] = 1 : (I = {
             [t]: 1
         }, e.on("exit", n), e.on("SIGINT", n));
     } catch (r) {
@@ -165,44 +164,48 @@ async function L(t) {
     }
 }
 
-function U(r) {
+function N(r) {
     try {
         o.unlinkSync(r), u.info("Unlocked " + r);
     } catch (r) {}
 }
 
-function R(r) {
+function G(r) {
     return r.startsWith("[") && r.endsWith("]") ? JSON.parse(r) : r;
 }
 
-function G(r) {
-    return Array.isArray(r) ? 1 == r.length ? r[0] : JSON.stringify(r) : r;
+function H(r) {
+    return a(r) ? 1 == r.length ? r[0] : JSON.stringify(r) : r;
 }
 
-function H(r) {
+function J(r) {
     r = r.split("/");
     return r[0] || (r[0] = "/"), r;
 }
 
-function J(r) {
+function U(r) {
     return r.split(".");
 }
 
 function Q(r) {
+    return x(r) ? [ U(r) ] : a(r) ? r.map(r => x(r) ? U(r) : r) : void 0;
+}
+
+function z(r) {
     return r.join(".");
 }
 
-function z(r, t = 0) {
+function K(r, t = 0) {
     return Math.floor(Math.random() * (r - t)) + t;
 }
 
-function K(r) {
+function X(r) {
     var t, n = {};
     for (t of r) n[t] = 1;
     return n;
 }
 
-async function X(t, n, e, o) {
+async function q(t, n, e, o) {
     var i = Buffer.allocUnsafe(o);
     for (let r = 0; r < o; ) {
         var a = (await n.read(i, r, o - r, e + r)).bytesRead;
@@ -212,12 +215,12 @@ async function X(t, n, e, o) {
     return i;
 }
 
-function q() {
+function C() {
     var r = e.availableMemory();
     return Math.round(r / (e.memoryUsage.rss() + r) * 100);
 }
 
-async function* C(e, t = 3) {
+async function* V(e, t = 3) {
     var n = e.length, o = (n < t && (t = n), new Array(n));
     for (let r = 0; r < t; ++r) {
         var i = o[r] = {};
@@ -243,48 +246,52 @@ async function* C(e, t = 3) {
     }
 }
 
+function Y(r = new Date()) {
+    return Math.floor(r.getTime() / 1e3);
+}
+
 export * as default from "./QyUtils.js";
 
 export {
-    a as __dirname,
-    f as SpecialOperators,
-    c as SpecialFilePaths,
-    s as isMatchName,
-    d as getMatchParam,
-    m as getSizeStr,
-    p as calHash,
-    h as Hash_Key_Length,
-    g as getSubdirMapKey,
-    y as getFileMapKey,
-    v as getContentKey,
-    b as getRandomStr,
-    $ as arrayLast,
+    f as __dirname,
+    c as SpecialOperators,
+    s as SpecialFilePaths,
+    d as isMatchName,
+    m as getMatchParam,
+    p as getSizeStr,
+    h as calHash,
+    g as Hash_Key_Length,
+    y as getSubdirMapKey,
+    v as getFileMapKey,
+    b as getContentKey,
+    $ as getRandomStr,
     w as isEmptyObj,
     P as isNotNullObj,
-    S as isString,
-    j as isNumber,
-    x as isBoolean,
-    B as isFunction,
-    M as isSimpleType,
-    O as trimArrayTail,
+    x as isString,
+    S as isNumber,
+    j as isBoolean,
+    M as isFunction,
+    B as isSimpleType,
+    D as trimArrayTail,
     T as setPromise,
-    k as toBuffer,
-    A as getSuffix,
-    D as ensureDir,
-    F as ensureParentDir,
-    I as getSize,
+    A as toBuffer,
+    E as getSuffix,
+    O as ensureDir,
+    k as ensureParentDir,
+    F as getSize,
     W as folderOrFileExists,
-    E as sleep,
-    L as lockExclusiveFilePath,
-    U as unlockExclusiveFilePath,
-    R as fromSingleName,
-    G as toSingleName,
-    H as pathSplit,
-    J as propNameSplit,
-    Q as propNameJoin,
-    z as randomInt,
-    K as listToMap,
-    X as readBufferAsync,
-    q as memoryPercent,
-    C as loadFileList
+    L as sleep,
+    R as lockExclusiveFilePath,
+    N as unlockExclusiveFilePath,
+    G as fromSingleName,
+    H as toSingleName,
+    J as pathSplit,
+    Q as ensurePropNamePathList,
+    z as propNameJoin,
+    K as randomInt,
+    X as listToMap,
+    q as readBufferAsync,
+    C as memoryPercent,
+    V as loadFileList,
+    Y as getNowSeconds
 };

package/src/hackernews.js

@@ -67,7 +67,7 @@ function c(e, t) {
     let g = 0;
     for (l in c) {
         var w = a[l];
-        j.batch.insert([ "hackernews", ...w, l ], c[l]), ++g >= C && (j.batch.run(), 
+        j.batch.insert([ "hackernews", ...w, l ], c[l], !0), ++g >= C && (j.batch.run(), 
         g = 0);
     }
     for (m in 0 < g && j.batch.run(), c) !function e(t) {

package/src/simulate.js

@@ -36,18 +36,18 @@ async function b(e) {
 function h(e) {
     console.time("insertData");
     var t, s, r, o = e.batch;
-    for (t of d) o.insert([ "hosts", t ], p[t]);
+    for (t of d) o.insert([ "hosts", t ], p[t], !0);
     for (s of g) {
         var i = f[s], {
             property_type: a,
             room_type: n,
             bed_type: l
         } = i;
-        o.insert([ "airbnb", a, n, l, s ], i);
+        o.insert([ "airbnb", a, n, l, s ], i, !0);
     }
     for (r of y) {
         var c = v[r];
-        o.insert([ "reviews", c.listing_id, r ], c);
+        o.insert([ "reviews", c.listing_id, r ], c, !0);
     }
     o.run(), console.timeEnd("insertData");
 }
@@ -71,7 +71,7 @@ async function E(e, t) {
             s = a = i = o = r = void 0;
             var s, r = e, o = _(), i = _(), a = {};
             for (s in i) 1 == u(2) && (a[s] = i[s]);
-            r.insert([ "hosts", o.host_id ], a);
+            r.insert([ "hosts", o.host_id ], a, !0);
             break;
 
           case 1:
@@ -84,14 +84,14 @@ async function E(e, t) {
                 bed_type: p,
                 _id: f
             } = o;
-            r.insert([ "airbnb", o, m, p, f ], c);
+            r.insert([ "airbnb", o, m, p, f ], c, !0);
             break;
 
           case 2:
             v = g = d = p = m = void 0;
             var v, m = e, p = D(), d = D(), g = {};
             for (v in d) 1 == u(2) && (g[v] = d[v]);
-            m.insert([ "reviews", p.listing_id, p._id ], g);
+            m.insert([ "reviews", p.listing_id, p._id ], g, !0);
         }
         await w(u(1e3) / 1e3);
     }

package/src/simulate2.js

@@ -44,7 +44,7 @@ function w(t) {
         Day: i
     } = h[o], a = h[c(h.length)], n = {};
     for (e in a) 1 == c(2) && (n[e] = a[e]);
-    t.insert([ "flights", s, r, i, o ], n);
+    t.insert([ "flights", s, r, i, o ], n, !0);
 }
 
 async function y(t, e) {
@@ -54,7 +54,7 @@ async function y(t, e) {
             o = a = i = r = s = void 0;
             var o, s = t, r = v()._key, i = v(), a = {};
             for (o in i) 1 == c(2) && (a[o] = i[o]);
-            s.insert([ "airports", r ], a);
+            s.insert([ "airports", r ], a, !0);
             break;
 
           case 1:
@@ -68,7 +68,7 @@ function b(t) {
     var e = t;
     console.time("insertAirports");
     var o, s = e.batch;
-    for (o of d) s.insert("airports/" + o._key, o);
+    for (o of d) s.insert("airports/" + o._key, o, !0);
     s.run(), console.timeEnd("insertAirports");
     e = t;
     f.log("insertFlights begin"), console.time("insertFlights");
@@ -79,7 +79,7 @@ function b(t) {
             Month: l,
             Day: c
         } = a;
-        i.insert(`flights/${n}/${l}/${c}/` + t, a);
+        i.insert(`flights/${n}/${l}/${c}/` + t, a, !0);
     }
     i.run(), f.log("insertFlights end"), console.timeEnd("insertFlights"), console.time("createFlightsIndex");
     for (r of e.dir("flights").subdirList) for (var m of r.subdirList) for (var g of m.subdirList) i.createIndex(g, [ "_from", "_to" ]);
@@ -101,7 +101,7 @@ function b(t) {
     await !console.timeEnd("loadData"), console.log(`airports:${d.length}, flights:` + h.length);
     var s = new n(p, {
         fileLogLevel: "basic",
-        maxInMemSnapshotCount: 2
+        maxInMemSnapshotCount: 3
     }), r = (t && (await s.start(), b(s), await s.stop()), await s.start(), g(s), 
     `simulate ${e} ` + o), i = (console.time(r), console.time("simulateStop"), []);
     for (let t = 0; t < e; ++t) i.push(y(s, o));

package/src/soc_pokec.js

@@ -50,7 +50,7 @@ let d = "./tmp/soc_pokec", w = new e(d);
             let e = w.batch, t = 0;
             for (a in r) {
                 var c = r[a];
-                e.insertP([ "relationships", a ], c), 3e4 < ++t && (await e.run(!0), 
+                e.insertP([ "relationships", a ], c, !0), 3e4 < ++t && (await e.run(!0), 
                 t = 0);
             }
             await e.run(!0), console.timeEnd("insertData"), s.close();