@zajno/common 1.4.15 → 1.4.18

package/lib/logger/file.js

@@ -2,40 +2,62 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileLoggerNode = void 0;
 const tslib_1 = require("tslib");
+/* eslint-disable no-console */
+const Path = tslib_1.__importStar(require("path"));
 const FS = tslib_1.__importStar(require("fs"));
 const Util = tslib_1.__importStar(require("util"));
-const types_1 = require("../types");
 class FileLoggerNode {
-    constructor(fileName, bufferMode = false) {
-        this.fileName = fileName;
+    constructor(extraLogger = console, instantFlush = false) {
+        this.extraLogger = extraLogger;
+        this.instantFlush = instantFlush;
+        this._buffer = [];
+        this._logFilePath = null;
         this.log = (...args) => {
-            this.appendToFile(...args);
+            var _a;
+            (_a = this.extraLogger) === null || _a === void 0 ? void 0 : _a.log(...args);
+            this.append(...args);
         };
-        this._buffer = bufferMode ? [] : null;
+        this.warn = (...args) => {
+            var _a;
+            (_a = this.extraLogger) === null || _a === void 0 ? void 0 : _a.warn(...args);
+            this.append(...args);
+        };
+        this.error = (...args) => {
+            var _a;
+            (_a = this.extraLogger) === null || _a === void 0 ? void 0 : _a.error(...args);
+            this.append(...args);
+        };
+        this.setLogName('');
+    }
+    setLogFilePath(path) {
+        this._logFilePath = path;
+        return this;
     }
-    /** @example Path.resolve(__dirname, `../run.${new Date().toISOString()}.log`) */
-    get logFilePath() { return types_1.Getter.getValue(this.fileName); }
-    warn(...args) {
-        this.appendToFile(...args);
+    setLogName(name) {
+        const n = name ? `-${name}` : '';
+        this._logFilePath = Path.resolve(__dirname, `../run${n}.${new Date().toISOString()}.log`);
+        return this;
     }
-    error(...args) {
-        this.appendToFile(...args);
+    append(..._args) {
+        // @ts-ignore
+        const str = Util.format.apply(null, arguments) + '\n';
+        this._buffer.push(str);
+        if (this.instantFlush) {
+            this.flush();
+        }
     }
     flush() {
-        if (!this._buffer) {
+        if (!this._buffer.length) {
             return;
         }
-        FS.writeFileSync(this.logFilePath, this._buffer.join(''));
-        this._buffer.length = 0;
-    }
-    appendToFile(..._args) {
-        // @ts-ignore
-        const str = Util.format.apply(null, arguments) + '\n';
-        if (this._buffer) {
-            this._buffer.push(str);
+        try {
+            FS.appendFileSync(this._logFilePath, this._buffer.join(''));
+        }
+        catch (err) {
+            console.warn('Failed to flush file, error', err);
         }
-        else {
-            FS.appendFileSync(this.logFilePath, str);
+        finally {
+            this._buffer.length = 0;
         }
     }
 }

package/lib/logger/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/logger/file.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,oCAAkC;AAElC,MAAa,cAAc;IAGvB,YAAqB,QAAwB,EAAE,UAAU,GAAG,KAAK;QAA5C,aAAQ,GAAR,QAAQ,CAAgB;QAO7C,QAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YACrB,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;QARE,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1C,CAAC;IAED,iFAAiF;IACjF,IAAY,WAAW,KAAK,OAAO,cAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAMpE,IAAI,CAAC,GAAG,IAAW;QACf,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG,IAAW;QAChB,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/B,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAO;SACV;QAED,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5B,CAAC;IAEO,YAAY,CAAC,GAAG,KAAY;QAChC,aAAa;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;QACtD,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC1B;aAAM;YACH,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;SAC5C;IACL,CAAC;CACJ;AAxCD,wCAwCC"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/logger/file.ts"],"names":[],"mappings":";;;;AACA,+BAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,mDAA6B;AAI7B,MAAa,cAAc;IAIvB,YAAqB,cAAuB,OAAO,EAAW,eAAe,KAAK;QAA7D,gBAAW,GAAX,WAAW,CAAmB;QAAW,iBAAY,GAAZ,YAAY,CAAQ;QAHjE,YAAO,GAAa,EAAE,CAAC;QAChC,iBAAY,GAAW,IAAI,CAAC;QA2BpC,QAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;;YACrB,MAAA,IAAI,CAAC,WAAW,0CAAE,GAAG,CAAC,GAAG,IAAI,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC;QAEF,SAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;;YACtB,MAAA,IAAI,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,IAAI,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC;QAEF,UAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;;YACvB,MAAA,IAAI,CAAC,WAAW,0CAAE,KAAK,CAAC,GAAG,IAAI,EAAE;YACjC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC;QArCE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,cAAc,CAAC,IAAY;QACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,IAAY;QACnB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC1F,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,MAAM,CAAC,GAAG,KAAY;QAC1B,aAAa;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;QACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEvB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,KAAK,EAAE,CAAC;SAChB;IACL,CAAC;IAiBD,KAAK;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACtB,OAAO;SACV;QAED,IAAI;YACA,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;SAC/D;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,IAAI,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;SACpD;gBAAS;YACN,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;SAC3B;IACL,CAAC;CACJ;AAzDD,wCAyDC"}

package/lib/tempoCache.d.ts

@@ -0,0 +1,10 @@
+export declare class TempoCache<T> {
+    readonly factory: () => T;
+    readonly lifetimeMs: number;
+    private _expiringAt;
+    private _current;
+    constructor(factory: () => T, lifetimeMs: number);
+    get isExpired(): boolean;
+    get current(): T;
+}
+//# sourceMappingURL=tempoCache.d.ts.map

package/lib/tempoCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tempoCache.d.ts","sourceRoot":"","sources":["../src/tempoCache.ts"],"names":[],"mappings":"AACA,qBAAa,UAAU,CAAC,CAAC;IAKT,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAE,QAAQ,CAAC,UAAU,EAAE,MAAM;IAHlE,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAgB;gBAEX,OAAO,EAAE,MAAM,CAAC,EAAW,UAAU,EAAE,MAAM;IAElE,IAAW,SAAS,YAA6C;IAEjE,IAAW,OAAO,MAMjB;CACJ"}

package/lib/tempoCache.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TempoCache = void 0;
+class TempoCache {
+    constructor(factory, lifetimeMs) {
+        this.factory = factory;
+        this.lifetimeMs = lifetimeMs;
+        this._expiringAt = 0; // already expired
+        this._current = undefined;
+    }
+    get isExpired() { return Date.now() >= this._expiringAt; }
+    get current() {
+        if (this.isExpired) {
+            this._current = this.factory();
+            this._expiringAt = Date.now() + this.lifetimeMs;
+        }
+        return this._current;
+    }
+}
+exports.TempoCache = TempoCache;
+//# sourceMappingURL=tempoCache.js.map

package/lib/tempoCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tempoCache.js","sourceRoot":"","sources":["../src/tempoCache.ts"],"names":[],"mappings":";;;AACA,MAAa,UAAU;IAKnB,YAAqB,OAAgB,EAAW,UAAkB;QAA7C,YAAO,GAAP,OAAO,CAAS;QAAW,eAAU,GAAV,UAAU,CAAQ;QAH1D,gBAAW,GAAW,CAAC,CAAC,CAAC,kBAAkB;QAC3C,aAAQ,GAAM,SAAS,CAAC;IAEsC,CAAC;IAEvE,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAEjE,IAAW,OAAO;QACd,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;SACnD;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAhBD,gCAgBC"}

package/lib/timeHelper.d.ts

@@ -4,11 +4,4 @@ export declare function formatMS(ms: number): string;
 export declare function formatTime(n: number): string;
 /** @deprecated */
 export declare function secToFormattedMin(totalSec: number): string;
-declare class Time {
-    private _now;
-    constructor();
-    get now(): number;
-}
-export declare const TimeHelper: Time;
-export {};
 //# sourceMappingURL=timeHelper.d.ts.map

package/lib/timeHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeHelper.d.ts","sourceRoot":"","sources":["../src/timeHelper.ts"],"names":[],"mappings":"AAEA,kBAAkB;AAClB,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAU3C;AAED,kBAAkB;AAClB,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAM5C;AAED,kBAAkB;AAClB,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAW1D;AAED,cAAM,IAAI;IAEN,OAAO,CAAC,IAAI,CAAgC;;IAQ5C,IAAI,GAAG,WAEN;CACJ;AAED,eAAO,MAAM,UAAU,MAAa,CAAC"}
+{"version":3,"file":"timeHelper.d.ts","sourceRoot":"","sources":["../src/timeHelper.ts"],"names":[],"mappings":"AAIA,kBAAkB;AAClB,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAU3C;AAED,kBAAkB;AAClB,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAM5C;AAED,kBAAkB;AAClB,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAW1D"}

package/lib/timeHelper.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeHelper = exports.secToFormattedMin = exports.formatTime = exports.formatMS = void 0;
-const tslib_1 = require("tslib");
-const mobx_1 = require("mobx");
+exports.secToFormattedMin = exports.formatTime = exports.formatMS = void 0;
+// eslint-disable-next-line no-console
+console.warn('"timeHelper" module is deprecated. Please use "dates" one.');
 /** @deprecated */
 function formatMS(ms) {
     if (!ms && ms !== 0) {
@@ -34,20 +34,4 @@ function secToFormattedMin(totalSec) {
     return res;
 }
 exports.secToFormattedMin = secToFormattedMin;
-class Time {
-    constructor() {
-        this._now = new Date().getTime();
-        mobx_1.makeObservable(this);
-        // Update _now once an hour
-        setInterval(() => { this._now = new Date().getTime(); }, 1000 * 3600);
-    }
-    get now() {
-        return this._now;
-    }
-}
-tslib_1.__decorate([
-    mobx_1.observable,
-    tslib_1.__metadata("design:type", Number)
-], Time.prototype, "_now", void 0);
-exports.TimeHelper = new Time();
 //# sourceMappingURL=timeHelper.js.map

package/lib/timeHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeHelper.js","sourceRoot":"","sources":["../src/timeHelper.ts"],"names":[],"mappings":";;;;AAAA,+BAAkD;AAElD,kBAAkB;AAClB,SAAgB,QAAQ,CAAC,EAAU;IAC/B,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE;QACjB,OAAO,EAAE,CAAC;KACb;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAEvD,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;AACpG,CAAC;AAVD,4BAUC;AAED,kBAAkB;AAClB,SAAgB,UAAU,CAAC,CAAS;IAChC,IAAI,CAAC,GAAG,EAAE,EAAE;QACR,OAAO,GAAG,GAAG,CAAC,CAAC;KAClB;IAED,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAND,gCAMC;AAED,kBAAkB;AAClB,SAAgB,iBAAiB,CAAC,QAAgB;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,IAAI,GAAG,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;IAE/B,IAAI,GAAG,EAAE;QACL,GAAG,IAAI,GAAG,CAAC;QACX,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;KACtC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAXD,8CAWC;AAED,MAAM,IAAI;IAIN;QAFQ,SAAI,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAGxC,qBAAc,CAAC,IAAI,CAAC,CAAC;QACrB,2BAA2B;QAC3B,WAAW,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;CACJ;AAXG;IADC,iBAAU;;kCACiC;AAanC,QAAA,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC"}
+{"version":3,"file":"timeHelper.js","sourceRoot":"","sources":["../src/timeHelper.ts"],"names":[],"mappings":";;;AACA,sCAAsC;AACtC,OAAO,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;AAE3E,kBAAkB;AAClB,SAAgB,QAAQ,CAAC,EAAU;IAC/B,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE;QACjB,OAAO,EAAE,CAAC;KACb;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAEvD,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;AACpG,CAAC;AAVD,4BAUC;AAED,kBAAkB;AAClB,SAAgB,UAAU,CAAC,CAAS;IAChC,IAAI,CAAC,GAAG,EAAE,EAAE;QACR,OAAO,GAAG,GAAG,CAAC,CAAC;KAClB;IAED,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAND,gCAMC;AAED,kBAAkB;AAClB,SAAgB,iBAAiB,CAAC,QAAgB;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,IAAI,GAAG,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;IAE/B,IAAI,GAAG,EAAE;QACL,GAAG,IAAI,GAAG,CAAC;QACX,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;KACtC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAXD,8CAWC"}

package/lib/timer.d.ts

@@ -0,0 +1,15 @@
+import { IDisposable } from './disposer';
+import { EventHandler, IEvent } from './event';
+export declare class Timer implements IDisposable, IEvent<number> {
+    readonly interval: number;
+    private readonly _event;
+    private _now;
+    private _handle;
+    constructor(interval?: number);
+    get now(): number;
+    on(handler: EventHandler<number>): () => void;
+    off(handler: EventHandler<number>): void;
+    restart(): void;
+    dispose(): void;
+}
+//# sourceMappingURL=timer.d.ts.map

package/lib/timer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../src/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAS,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtD,qBAAa,KAAM,YAAW,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC;IAMzC,QAAQ,CAAC,QAAQ;IAL7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAE9C,OAAO,CAAC,IAAI,CAAsB;IAClC,OAAO,CAAC,OAAO,CAAQ;gBAEF,QAAQ,SAAc;IAI3C,IAAI,GAAG,WAEN;IAED,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI;IAI7C,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,IAAI;IAIjC,OAAO;IAUP,OAAO,IAAI,IAAI;CAIzB"}

package/lib/timer.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Timer = void 0;
+const event_1 = require("./event");
+class Timer {
+    constructor(interval = 3600 * 1000) {
+        this.interval = interval;
+        this._event = new event_1.Event();
+        this._now = Date.now();
+        this._handle = null;
+        this.restart();
+    }
+    get now() {
+        return this._now;
+    }
+    on(handler) {
+        return this._event.on(handler);
+    }
+    off(handler) {
+        return this._event.off(handler);
+    }
+    restart() {
+        this.dispose();
+        // Update _now once an hour
+        this._handle = setInterval(() => {
+            this._now = Date.now();
+            this._event.trigger(this._now);
+        }, this.interval);
+    }
+    dispose() {
+        clearInterval(this._handle);
+        this._handle = null;
+    }
+}
+exports.Timer = Timer;
+//# sourceMappingURL=timer.js.map

package/lib/timer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"timer.js","sourceRoot":"","sources":["../src/timer.ts"],"names":[],"mappings":";;;AACA,mCAAsD;AAEtD,MAAa,KAAK;IAMd,YAAqB,WAAW,IAAI,GAAG,IAAI;QAAtB,aAAQ,GAAR,QAAQ,CAAc;QAL1B,WAAM,GAAG,IAAI,aAAK,EAAU,CAAC;QAEtC,SAAI,GAAW,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,YAAO,GAAG,IAAI,CAAC;QAGnB,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,EAAE,CAAC,OAA6B;QAC5B,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,GAAG,CAAC,OAA6B;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,2BAA2B;QAC3B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;IAEM,OAAO;QACV,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACxB,CAAC;CACJ;AApCD,sBAoCC"}

package/lib/validation/helpers.d.ts

@@ -1,10 +1,6 @@
-import { ValidatorFunction } from './types';
 import { ValidationErrors } from './ValidationErrors';
+import { ValidationConfig, ValidationResults, ValidatorFunction } from './types';
 export declare function createShouldBeEqualTo<T = string>(getter: () => T): ValidatorFunction<T>;
 export declare function throwNotOk(result: ValidationErrors, message?: string): void;
-export declare function validateObject<T>(obj: T, validators: {
-    [P in keyof T]?: ValidatorFunction<T[P]>;
-}): {
-    [P in keyof T]?: ValidationErrors;
-};
+export declare function validateObject<T, TErrors = ValidationErrors>(obj: T, validators: ValidationConfig<T, TErrors>, onlyTruethy?: boolean): ValidationResults<T, TErrors>;
 //# sourceMappingURL=helpers.d.ts.map

package/lib/validation/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,wBAAgB,qBAAqB,CAAC,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAEvF;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,gBAAgB,EAAE,OAAO,SAAqB,QAIhF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAC5B,GAAG,EAAE,CAAC,EACN,UAAU,EAAE;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GACzD;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,gBAAgB;CAAE,CA8BvC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACH,gBAAgB,EAEhB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,qBAAqB,CAAC,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAEvF;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,gBAAgB,EAAE,OAAO,SAAqB,QAIhF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,gBAAgB,EACxD,GAAG,EAAE,CAAC,EACN,UAAU,EAAE,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,EACxC,WAAW,UAAQ,GACpB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,CAuB/B"}

package/lib/validation/helpers.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateObject = exports.throwNotOk = exports.createShouldBeEqualTo = void 0;
-const types_1 = require("./types");
 const ValidationErrors_1 = require("./ValidationErrors");
+const types_1 = require("./types");
 function createShouldBeEqualTo(getter) {
     return (val) => getter() === val ? ValidationErrors_1.ValidationErrors.None : ValidationErrors_1.ValidationErrors.ShouldBeEqualTo;
 }
@@ -13,7 +13,7 @@ function throwNotOk(result, message = 'Validation error') {
     }
 }
 exports.throwNotOk = throwNotOk;
-function validateObject(obj, validators) {
+function validateObject(obj, validators, onlyTruethy = false) {
     const res = {};
     Object.keys(obj).forEach(k => {
         const kk = k;
@@ -22,15 +22,10 @@ function validateObject(obj, validators) {
             return;
         }
         const v = obj[k];
-        // let str: string;
-        // if (typeof v === 'number') {
-        //     str = v + '';
-        // }
-        // if (typeof v !== 'string') {
-        //     return; // skip non-strings
-        // }
-        // str = v;
-        const err = validator(v);
+        if (onlyTruethy && !v) {
+            return;
+        }
+        const err = validator(v, obj);
         if (err) {
             res[kk] = err;
         }

package/lib/validation/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":";;;AAAA,mCAA6D;AAC7D,yDAAsD;AAEtD,SAAgB,qBAAqB,CAAa,MAAe;IAC7D,OAAO,CAAC,GAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,mCAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAgB,CAAC,eAAe,CAAC;AACnG,CAAC;AAFD,sDAEC;AAED,SAAgB,UAAU,CAAC,MAAwB,EAAE,OAAO,GAAG,kBAAkB;IAC7E,IAAI,MAAM,EAAE;QACR,MAAM,IAAI,uBAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC9C;AACL,CAAC;AAJD,gCAIC;AAED,SAAgB,cAAc,CAC1B,GAAM,EACN,UAAwD;IAGxD,MAAM,GAAG,GAA0C,EAAG,CAAC;IAEvD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACzB,MAAM,EAAE,GAAG,CAAY,CAAC;QACxB,MAAM,SAAS,GAAoC,UAAU,CAAC,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO;SACV;QAED,MAAM,CAAC,GAAG,GAAG,CAAC,CAAY,CAAC,CAAC;QAC5B,mBAAmB;QACnB,+BAA+B;QAC/B,oBAAoB;QACpB,IAAI;QAEJ,+BAA+B;QAC/B,kCAAkC;QAClC,IAAI;QAEJ,WAAW;QAEX,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,GAAG,EAAE;YACL,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;SACjB;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACf,CAAC;AAjCD,wCAiCC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,mCAKiB;AAEjB,SAAgB,qBAAqB,CAAa,MAAe;IAC7D,OAAO,CAAC,GAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,mCAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAgB,CAAC,eAAe,CAAC;AACnG,CAAC;AAFD,sDAEC;AAED,SAAgB,UAAU,CAAC,MAAwB,EAAE,OAAO,GAAG,kBAAkB;IAC7E,IAAI,MAAM,EAAE;QACR,MAAM,IAAI,uBAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC9C;AACL,CAAC;AAJD,gCAIC;AAED,SAAgB,cAAc,CAC1B,GAAM,EACN,UAAwC,EACxC,WAAW,GAAG,KAAK;IAGnB,MAAM,GAAG,GAAkC,EAAG,CAAC;IAE/C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACzB,MAAM,EAAE,GAAG,CAAY,CAAC;QACxB,MAAM,SAAS,GAAgD,UAAU,CAAC,EAAE,CAAC,CAAC;QAC9E,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO;SACV;QAED,MAAM,CAAC,GAAG,GAAG,CAAC,CAAY,CAAC,CAAC;QAC5B,IAAI,WAAW,IAAI,CAAC,CAAC,EAAE;YACnB,OAAO;SACV;QAED,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACL,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;SACjB;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACf,CAAC;AA3BD,wCA2BC"}

package/lib/validation/types.d.ts

@@ -1,6 +1,12 @@
 import { ValidationErrors } from './ValidationErrors';
-export declare type ValidatorFunction<T = string, TErrors = ValidationErrors> = (val: T) => TErrors;
-export declare type ValidatorFunctionAsync<T = string, TErrors = ValidationErrors> = (val: T) => Promise<TErrors>;
+export declare type ValidatorFunction<T = string, TErrors = ValidationErrors, TContext = any> = (val: T, ctx?: TContext) => TErrors;
+export declare type ValidatorFunctionAsync<T = string, TErrors = ValidationErrors, TContext = any> = (val: T, ctx?: TContext) => Promise<TErrors>;
+export declare type ValidationConfig<T, TErrors> = {
+    [P in keyof T]?: ValidatorFunction<T[P], TErrors, T>;
+};
+export declare type ValidationResults<T, TErrors> = {
+    [P in keyof T]?: TErrors;
+};
 export declare type WrapperFunction = (val: ValidatorFunction) => ValidatorFunction;
 export declare class ValidationError<TErrors = ValidationErrors> extends Error {
     readonly code: TErrors;

package/lib/validation/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,oBAAY,iBAAiB,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,GAAG,gBAAgB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;AAC5F,oBAAY,sBAAsB,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,GAAG,gBAAgB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE1G,oBAAY,eAAe,GAAG,CAAC,GAAG,EAAE,iBAAiB,KAAK,iBAAiB,CAAC;AAE5E,qBAAa,eAAe,CAAC,OAAO,GAAG,gBAAgB,CAAE,SAAQ,KAAK;IAClE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAQ;gBAElB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;CAI7C"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,oBAAY,iBAAiB,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,GAAG,gBAAgB,EAAE,QAAQ,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC;AAC5H,oBAAY,sBAAsB,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,GAAG,gBAAgB,EAAE,QAAQ,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE1I,oBAAY,gBAAgB,CAAC,CAAC,EAAE,OAAO,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;CAAE,CAAC;AACpG,oBAAY,iBAAiB,CAAC,CAAC,EAAE,OAAO,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO;CAAE,CAAC;AAEzE,oBAAY,eAAe,GAAG,CAAC,GAAG,EAAE,iBAAiB,KAAK,iBAAiB,CAAC;AAE5E,qBAAa,eAAe,CAAC,OAAO,GAAG,gBAAgB,CAAE,SAAQ,KAAK;IAClE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAQ;gBAElB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;CAI7C"}

package/lib/validation/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":";;;AAOA,MAAa,eAA4C,SAAQ,KAAK;IAGlE,YAAY,OAAe,EAAE,IAAa;QACtC,KAAK,CAAC,OAAO,CAAC,CAAC;QAHV,SAAI,GAAY,IAAI,CAAC;QAI1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ;AAPD,0CAOC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":";;;AAUA,MAAa,eAA4C,SAAQ,KAAK;IAGlE,YAAY,OAAe,EAAE,IAAa;QACtC,KAAK,CAAC,OAAO,CAAC,CAAC;QAHV,SAAI,GAAY,IAAI,CAAC;QAI1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ;AAPD,0CAOC"}

package/lib/validation/wrappers.d.ts

@@ -1,8 +1,8 @@
 import { ValidatorFunction } from './types';
 import { ValidationErrors } from './ValidationErrors';
 export declare const Wrappers: {
-    required<T = string>(validator: ValidatorFunction<T, ValidationErrors>): ValidatorFunction<T, ValidationErrors>;
-    notRequired<T_1 = string>(validator: ValidatorFunction<T_1, ValidationErrors>): ValidatorFunction<T_1, ValidationErrors>;
-    thrower<T_2 = string>(validator: ValidatorFunction<T_2, ValidationErrors>): (val: T_2) => void;
+    required<T = string>(validator: ValidatorFunction<T, ValidationErrors, any>): ValidatorFunction<T, ValidationErrors, any>;
+    notRequired<T_1 = string>(validator: ValidatorFunction<T_1, ValidationErrors, any>): ValidatorFunction<T_1, ValidationErrors, any>;
+    thrower<T_2 = string>(validator: ValidatorFunction<T_2, ValidationErrors, any>): (val: T_2) => void;
 };
 //# sourceMappingURL=wrappers.d.ts.map

package/lib/viewModels/LoadingModel.d.ts

@@ -1,6 +1,8 @@
 import { NumberModel } from './NumberModel';
 export declare class LoadingModel extends NumberModel {
     get isLoading(): boolean;
-    useLoading<T>(cb: () => (T | Promise<T>), exclusive?: boolean | 'throw'): Promise<T | false>;
+    useLoading<T>(cb: () => (T | Promise<T>)): Promise<T>;
+    useLoading<T>(cb: () => (T | Promise<T>), exclusive: false): Promise<T>;
+    useLoading<T>(cb: () => (T | Promise<T>), exclusive: true | 'throw'): Promise<T | false>;
 }
 //# sourceMappingURL=LoadingModel.d.ts.map

package/lib/viewModels/LoadingModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoadingModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/LoadingModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,YAAa,SAAQ,WAAW;IAEzC,IAAW,SAAS,YAA6B;IAEpC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,GAAE,OAAO,GAAG,OAAe,GAAG,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC;CAiBnH"}
+{"version":3,"file":"LoadingModel.d.ts","sourceRoot":"","sources":["../../src/viewModels/LoadingModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,YAAa,SAAQ,WAAW;IAEzC,IAAW,SAAS,YAA6B;IAEpC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC;IACvE,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC;CAmBxG"}

package/lib/viewModels/LoadingModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoadingModel.js","sourceRoot":"","sources":["../../src/viewModels/LoadingModel.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,MAAa,YAAa,SAAQ,yBAAW;IAEzC,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAE1C,KAAK,CAAC,UAAU,CAAI,EAA0B,EAAE,YAA+B,KAAK;QACvF,IAAI,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE;YAC7B,IAAI,SAAS,KAAK,OAAO,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;aAC9F;YACD,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;QAEjB,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;YACvB,OAAO,GAAG,CAAC;SACd;gBAAS;YACN,IAAI,CAAC,SAAS,EAAE,CAAC;SACpB;IACL,CAAC;CACJ;AArBD,oCAqBC"}
+{"version":3,"file":"LoadingModel.js","sourceRoot":"","sources":["../../src/viewModels/LoadingModel.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,MAAa,YAAa,SAAQ,yBAAW;IAEzC,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAM1C,KAAK,CAAC,UAAU,CAAI,EAA0B,EAAE,YAA+B,KAAK;QACvF,IAAI,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE;YAC7B,IAAI,SAAS,KAAK,OAAO,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;aAC9F;YACD,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;QAEjB,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;YACvB,OAAO,GAAG,CAAC;SACd;gBAAS;YACN,IAAI,CAAC,SAAS,EAAE,CAAC;SACpB;IACL,CAAC;CACJ;AAzBD,oCAyBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zajno/common",
-  "version": "1.4.15",
+  "version": "1.4.18",
   "description": "Zajno's re-usable utilities for JS/TS projects",
   "repository": {
     "type": "git",

package/src/__tests__/tempoCache.test.ts

@@ -0,0 +1,31 @@
+import { TempoCache } from '../tempoCache';
+import { setTimeoutAsync } from '../async/timeout';
+
+describe('TempoCache', () => {
+    it('just works', async () => {
+        let incrementer = 1;
+
+        const example = new TempoCache(() => Promise.resolve(incrementer++), 199);
+
+        expect(await example.current).toBe(1);
+        await expect(example.current).resolves.toBe(1);
+
+        await setTimeoutAsync(100);
+
+        await expect(example.current).resolves.toBe(1);
+
+        await setTimeoutAsync(200);
+
+        await expect(example.current).resolves.toBe(2);
+
+        await setTimeoutAsync(100);
+
+        await expect(example.current).resolves.toBe(2);
+        await expect(example.current).resolves.toBe(2);
+
+        await setTimeoutAsync(300);
+
+        await expect(example.current).resolves.toBe(3);
+        await expect(example.current).resolves.toBe(3);
+    });
+});

package/src/logger/file.ts

@@ -1,46 +1,66 @@
+
+/* eslint-disable no-console */
+import * as Path from 'path';
 import * as FS from 'fs';
 import * as Util from 'util';
+
 import { ILogger } from './abstractions';
-import { Getter } from '../types';
 
 export class FileLoggerNode implements ILogger {
-    private readonly _buffer: string[];
+    private readonly _buffer: string[] = [];
+    private _logFilePath: string = null;
+
+    constructor(readonly extraLogger: ILogger = console, readonly instantFlush = false) {
+        this.setLogName('');
+    }
+
+    setLogFilePath(path: string) {
+        this._logFilePath = path;
+        return this;
+    }
 
-    constructor(readonly fileName: Getter<string>, bufferMode = false) {
-        this._buffer = bufferMode ? [] : null;
+    setLogName(name: string) {
+        const n = name ? `-${name}` : '';
+        this._logFilePath = Path.resolve(__dirname, `../run${n}.${new Date().toISOString()}.log`);
+        return this;
     }
 
-    /** @example Path.resolve(__dirname, `../run.${new Date().toISOString()}.log`) */
-    private get logFilePath() { return Getter.getValue(this.fileName); }
+    private append(..._args: any[]) {
+        // @ts-ignore
+        const str = Util.format.apply(null, arguments) + '\n';
+        this._buffer.push(str);
+
+        if (this.instantFlush) {
+            this.flush();
+        }
+    }
 
     log = (...args: any[]) => {
-        this.appendToFile(...args);
+        this.extraLogger?.log(...args);
+        this.append(...args);
     };
 
-    warn(...args: any[]) {
-        this.appendToFile(...args);
-    }
+    warn = (...args: any[]) => {
+        this.extraLogger?.warn(...args);
+        this.append(...args);
+    };
 
-    error(...args: any[]) {
-        this.appendToFile(...args);
-    }
+    error = (...args: any[]) => {
+        this.extraLogger?.error(...args);
+        this.append(...args);
+    };
 
-    public flush() {
-        if (!this._buffer) {
+    flush() {
+        if (!this._buffer.length) {
             return;
         }
 
-        FS.writeFileSync(this.logFilePath, this._buffer.join(''));
-        this._buffer.length = 0;
-    }
-
-    private appendToFile(..._args: any[]) {
-        // @ts-ignore
-        const str = Util.format.apply(null, arguments) + '\n';
-        if (this._buffer) {
-            this._buffer.push(str);
-        } else {
-            FS.appendFileSync(this.logFilePath, str);
+        try {
+            FS.appendFileSync(this._logFilePath, this._buffer.join(''));
+        } catch (err) {
+            console.warn('Failed to flush file, error', err);
+        } finally {
+            this._buffer.length = 0;
         }
     }
 }

package/src/tempoCache.ts

@@ -0,0 +1,18 @@
+
+export class TempoCache<T> {
+
+    private _expiringAt: number = 0; // already expired
+    private _current: T = undefined;
+
+    constructor(readonly factory: () => T, readonly lifetimeMs: number) { }
+
+    public get isExpired() { return Date.now() >= this._expiringAt; }
+
+    public get current() {
+        if (this.isExpired) {
+            this._current = this.factory();
+            this._expiringAt = Date.now() + this.lifetimeMs;
+        }
+        return this._current;
+    }
+}

package/src/timeHelper.ts

@@ -1,4 +1,6 @@
-import { observable, makeObservable } from 'mobx';
+
+// eslint-disable-next-line no-console
+console.warn('"timeHelper" module is deprecated. Please use "dates" one.');
 
 /** @deprecated */
 export function formatMS(ms: number): string {
@@ -35,20 +37,3 @@ export function secToFormattedMin(totalSec: number): string {
 
     return res;
 }
-
-class Time {
-    @observable
-    private _now: number = new Date().getTime();
-
-    constructor() {
-        makeObservable(this);
-        // Update _now once an hour
-        setInterval(() => { this._now = new Date().getTime(); }, 1000 * 3600);
-    }
-
-    get now() {
-        return this._now;
-    }
-}
-
-export const TimeHelper = new Time();

package/src/timer.ts

@@ -0,0 +1,40 @@
+import { IDisposable } from './disposer';
+import { Event, EventHandler, IEvent } from './event';
+
+export class Timer implements IDisposable, IEvent<number> {
+    private readonly _event = new Event<number>();
+
+    private _now: number = Date.now();
+    private _handle = null;
+
+    constructor(readonly interval = 3600 * 1000) {
+        this.restart();
+    }
+
+    get now() {
+        return this._now;
+    }
+
+    on(handler: EventHandler<number>): () => void {
+        return this._event.on(handler);
+    }
+
+    off(handler: EventHandler<number>): void {
+        return this._event.off(handler);
+    }
+
+    public restart() {
+        this.dispose();
+
+        // Update _now once an hour
+        this._handle = setInterval(() => {
+            this._now = Date.now();
+            this._event.trigger(this._now);
+        }, this.interval);
+    }
+
+    public dispose(): void {
+        clearInterval(this._handle);
+        this._handle = null;
+    }
+}