@zajno/common 1.5.8 → 1.5.9

package/lib/async/timeout.d.ts

@@ -1,3 +1,8 @@
 export declare function setTimeoutAsync(ms: number, useCancel?: (cb: () => void) => void): Promise<void>;
 export declare function setTimeoutFramesAsync(frames: number): Promise<void>;
+export declare function timeoutPromise<T>(p: Promise<T>, timeoutMs: number, waitForMinElapsed?: number): Promise<{
+    resolved: T;
+    timedOut?: boolean;
+    elapsed: number;
+}>;
 //# sourceMappingURL=timeout.d.ts.map

package/lib/async/timeout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../src/async/timeout.ts"],"names":[],"mappings":"AACA,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,GAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAW,iBA0BrF;AAID,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,iBAkBnD"}
+{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../src/async/timeout.ts"],"names":[],"mappings":"AACA,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,GAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAW,iBA0BrF;AAID,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,iBAkBnD;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC7J"}

package/lib/async/timeout.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setTimeoutFramesAsync = exports.setTimeoutAsync = void 0;
+exports.timeoutPromise = exports.setTimeoutFramesAsync = exports.setTimeoutAsync = void 0;
 function setTimeoutAsync(ms, useCancel = null) {
     let canceled = false;
     let _reject;
@@ -46,4 +46,33 @@ function setTimeoutFramesAsync(frames) {
     });
 }
 exports.setTimeoutFramesAsync = setTimeoutFramesAsync;
+function timeoutPromise(p, timeoutMs, waitForMinElapsed) {
+    const started = Date.now();
+    return new Promise((resolve, reject) => {
+        let finished = false;
+        const finish = (res, timedOut) => {
+            if (finished) {
+                return;
+            }
+            finished = true;
+            const getElapsed = () => (Date.now() - started);
+            const doFinish = () => resolve({ resolved: res, timedOut: timedOut, elapsed: getElapsed() });
+            const left = waitForMinElapsed != null ? (waitForMinElapsed - getElapsed()) : -1;
+            if (left >= 0) {
+                setTimeout(doFinish, left);
+            }
+            else {
+                doFinish();
+            }
+        };
+        const timeoutRef = setTimeout(() => {
+            finish(undefined, true);
+        }, timeoutMs);
+        p.then(res => {
+            clearTimeout(timeoutRef);
+            finish(res, false);
+        }).catch(reject);
+    });
+}
+exports.timeoutPromise = timeoutPromise;
 //# sourceMappingURL=timeout.js.map

package/lib/async/timeout.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../src/async/timeout.ts"],"names":[],"mappings":";;;AACA,SAAgB,eAAe,CAAC,EAAU,EAAE,YAAsC,IAAI;IAClF,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,OAAmB,CAAC;IACxB,IAAI,KAAU,CAAC;IACf,MAAM,GAAG,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9C,OAAO,GAAG,MAAM,CAAC;QACjB,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,IAAI,CAAC,QAAQ,EAAE;gBACX,OAAO,EAAE,CAAC;aACb;QACL,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,IAAI,SAAS,EAAE;QACX,MAAM,QAAQ,GAAG,GAAG,EAAE;YAClB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,OAAO,EAAE;gBACT,OAAO,EAAE,CAAC;aACb;QACL,CAAC,CAAC;QACF,SAAS,CAAC,QAAQ,CAAC,CAAC;KACvB;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AA1BD,0CA0BC;AAED,kCAAkC;AAElC,SAAgB,qBAAqB,CAAC,MAAc;IAChD,IAAI,OAAO,qBAAqB,KAAK,WAAW,EAAE;QAC9C,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAC;KAC7G;IAED,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;QAC/B,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,CAAC;QAEvB,MAAM,EAAE,GAAG,GAAG,EAAE;YACZ,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE;gBACb,OAAO,EAAE,CAAC;aACb;iBAAM;gBACH,qBAAqB,CAAC,EAAE,CAAC,CAAC;aAC7B;QACL,CAAC,CAAC;QAEF,EAAE,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;AACP,CAAC;AAlBD,sDAkBC"}
+{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../src/async/timeout.ts"],"names":[],"mappings":"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"}

package/lib/event.d.ts

@@ -1,3 +1,4 @@
+import type { Predicate } from './types';
 import './async/arrays';
 import { ILogger } from './logger';
 export declare type EventHandler<T = any> = (data?: T) => void | Promise<void>;
@@ -18,4 +19,5 @@ export declare class Event<T = any> implements IEvent<T> {
     expose(): IEvent<T>;
     private logError;
 }
+export declare function oneTimeSubscription<T>(e: IEvent<T>, filter?: Predicate<T>): Promise<T>;
 //# sourceMappingURL=event.d.ts.map

package/lib/event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,CAAC;AAExB,OAAO,EAAE,OAAO,EAAgB,MAAM,UAAU,CAAC;AAEjD,oBAAY,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvE,MAAM,WAAW,MAAM,CAAC,CAAC,GAAG,GAAG;IAC3B,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC;IACzC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;CACvC;AAED,qBAAa,KAAK,CAAC,CAAC,GAAG,GAAG,CAAE,YAAW,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,OAAO,CAAiB;;gBAGpB,MAAM,CAAC,EAAE,OAAO;gBAChB,IAAI,CAAC,EAAE,MAAM;IAQlB,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAOxC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI;IAInC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IAeV,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAqB9C,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;IAI1B,OAAO,CAAC,QAAQ;CAGnB"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,gBAAgB,CAAC;AAExB,OAAO,EAAE,OAAO,EAAgB,MAAM,UAAU,CAAC;AAEjD,oBAAY,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvE,MAAM,WAAW,MAAM,CAAC,CAAC,GAAG,GAAG;IAC3B,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC;IACzC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;CACvC;AAED,qBAAa,KAAK,CAAC,CAAC,GAAG,GAAG,CAAE,YAAW,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,OAAO,CAAiB;;gBAGpB,MAAM,CAAC,EAAE,OAAO;gBAChB,IAAI,CAAC,EAAE,MAAM;IAQlB,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAOxC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI;IAInC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IAeV,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAqB9C,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;IAI1B,OAAO,CAAC,QAAQ;CAGnB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAStF"}

package/lib/event.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Event = void 0;
+exports.oneTimeSubscription = exports.Event = void 0;
 require("./async/arrays");
 const arrays_1 = require("./async/arrays");
 const logger_1 = require("./logger");
@@ -60,4 +60,15 @@ class Event {
     }
 }
 exports.Event = Event;
+function oneTimeSubscription(e, filter) {
+    return new Promise((resolve) => {
+        const unsub = e.on(v => {
+            if (!filter || filter(v)) {
+                unsub();
+                resolve(v);
+            }
+        });
+    });
+}
+exports.oneTimeSubscription = oneTimeSubscription;
 //# sourceMappingURL=event.js.map

package/lib/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":";;;AAAA,0BAAwB;AACxB,2CAA8C;AAC9C,qCAAiD;AASjD,MAAa,KAAK;IAQd,YAAY,YAA+B;QAPnC,cAAS,GAAsB,EAAE,CAAC;QAClC,YAAO,GAAY,IAAI,CAAC;QAO5B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,CAAC;YAC9D,CAAC,CAAC,IAAA,qBAAY,EAAC,UAAU,YAAY,IAAI,GAAG,GAAG,CAAC;YAChD,CAAC,CAAC,YAAY,CAAC;IACvB,CAAC;IAEM,EAAE,CAAC,OAAwB;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE;YACR,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC;IACN,CAAC;IAEM,GAAG,CAAC,OAAwB;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC;IAC/D,CAAC;IAEM,OAAO,CAAC,IAAQ;QACnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YACxB,OAAO;SACV;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACZ,IAAI;gBACA,EAAE,CAAC,IAAI,CAAC,CAAC;aACZ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAQ;QAC9B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YACxB,OAAO,EAAE,CAAC;SACb;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAY,EAAE,CAAC;QAE3B,MAAM,IAAA,qBAAY,EAAC,EAAE,EAAE,KAAK,EAAE,EAAmB,EAAE,EAAE;YACjD,IAAI;gBACA,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,QAAQ,CAAC,IAAO,EAAE,EAAmB,EAAE,GAAU;QACrD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,aAAa,EAAE,CAAC,IAAI,wBAAwB,EAAE,GAAG,CAAC,CAAC;IAC/F,CAAC;CACJ;AApED,sBAoEC"}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":";;;AACA,0BAAwB;AACxB,2CAA8C;AAC9C,qCAAiD;AASjD,MAAa,KAAK;IAQd,YAAY,YAA+B;QAPnC,cAAS,GAAsB,EAAE,CAAC;QAClC,YAAO,GAAY,IAAI,CAAC;QAO5B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,CAAC;YAC9D,CAAC,CAAC,IAAA,qBAAY,EAAC,UAAU,YAAY,IAAI,GAAG,GAAG,CAAC;YAChD,CAAC,CAAC,YAAY,CAAC;IACvB,CAAC;IAEM,EAAE,CAAC,OAAwB;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE;YACR,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC;IACN,CAAC;IAEM,GAAG,CAAC,OAAwB;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC;IAC/D,CAAC;IAEM,OAAO,CAAC,IAAQ;QACnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YACxB,OAAO;SACV;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACZ,IAAI;gBACA,EAAE,CAAC,IAAI,CAAC,CAAC;aACZ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,IAAQ;QAC9B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YACxB,OAAO,EAAE,CAAC;SACb;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAY,EAAE,CAAC;QAE3B,MAAM,IAAA,qBAAY,EAAC,EAAE,EAAE,KAAK,EAAE,EAAmB,EAAE,EAAE;YACjD,IAAI;gBACA,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,QAAQ,CAAC,IAAO,EAAE,EAAmB,EAAE,GAAU;QACrD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,aAAa,EAAE,CAAC,IAAI,wBAAwB,EAAE,GAAG,CAAC,CAAC;IAC/F,CAAC;CACJ;AApED,sBAoEC;AAED,SAAgB,mBAAmB,CAAI,CAAY,EAAE,MAAqB;IACtE,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,EAAE;QAC9B,MAAM,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACnB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;gBACtB,KAAK,EAAE,CAAC;gBACR,OAAO,CAAC,CAAC,CAAC,CAAC;aACd;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AATD,kDASC"}

package/lib/lazy.d.ts

@@ -15,8 +15,10 @@ export declare class LazyPromise<T> implements IDisposable {
     private _instance;
     private _busy;
     private _loaded;
+    private _promise;
     constructor(_factory: () => Promise<T>, initial?: T);
     get busy(): boolean;
+    get promise(): Promise<T>;
     get(): T;
     private setInstance;
     reset(): void;

package/lib/lazy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../src/lazy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,MAAM,CAAC,OAAO,OAAO,IAAI,CAAC,CAAC,CAAE,YAAW,WAAW;IAKnC,OAAO,CAAC,QAAQ;IAF5B,OAAO,CAAC,SAAS,CAAW;gBAER,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC;IAIvC,IAAI,QAAQ,YAAqC;IAEjD,IAAI,KAAK,MAKR;IAED,OAAO;IAIP,KAAK;IAIL,OAAO,aAAsB;CAChC;AAED,qBAAa,WAAW,CAAC,CAAC,CAAE,YAAW,WAAW;IAW1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAT5B,OAAO,CAAC,SAAS,CAAW;IAG5B,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,OAAO,CAAS;gBAGH,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC1B,OAAO,GAAE,CAAQ;IAMtC,IAAI,IAAI,YAAyB;IAEjC,GAAG;IAUH,OAAO,CAAC,WAAW,CAMjB;IAGF,KAAK;IAML,OAAO,aAAsB;CAChC"}
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../src/lazy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,MAAM,CAAC,OAAO,OAAO,IAAI,CAAC,CAAC,CAAE,YAAW,WAAW;IAKnC,OAAO,CAAC,QAAQ;IAF5B,OAAO,CAAC,SAAS,CAAW;gBAER,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC;IAIvC,IAAI,QAAQ,YAAqC;IAEjD,IAAI,KAAK,MAKR;IAED,OAAO;IAIP,KAAK;IAIL,OAAO,aAAsB;CAChC;AAED,qBAAa,WAAW,CAAC,CAAC,CAAE,YAAW,WAAW;IAY1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAV5B,OAAO,CAAC,SAAS,CAAW;IAG5B,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAoB;gBAGf,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC1B,OAAO,GAAE,CAAQ;IAMtC,IAAI,IAAI,YAAyB;IAEjC,IAAI,OAAO,eAGV;IAED,GAAG;IAWH,OAAO,CAAC,WAAW,CAMjB;IAGF,KAAK;IAML,OAAO,aAAsB;CAChC"}

package/lib/lazy.js

@@ -36,6 +36,7 @@ class LazyPromise {
         this._instance = null;
         this._busy = false;
         this._loaded = false;
+        this._promise = null;
         this.setInstance = (res) => {
             const wasBusy = this._busy;
             this._busy = false;
@@ -47,10 +48,14 @@ class LazyPromise {
         this._instance = initial;
     }
     get busy() { return this._busy; }
+    get promise() {
+        return this._promise;
+    }
     get() {
         if (!this._loaded && !this._busy) {
             this._busy = true;
-            this._factory().then(this.setInstance);
+            this._promise = this._factory();
+            this._promise.then(this.setInstance);
         }
         return this._instance;
     }

package/lib/lazy.js.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.js","sourceRoot":"","sources":["../src/lazy.ts"],"names":[],"mappings":";;;;AACA,+BAA0D;AAE1D,MAAqB,IAAI;IAKrB,YAAoB,QAAmB;QAAnB,aAAQ,GAAR,QAAQ,CAAW;QAF/B,cAAS,GAAM,IAAI,CAAC;QAuB5B,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QApBzB,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC;IAEjD,IAAI,KAAK;QACL,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;SACpC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IAC1B,CAAC;CAGJ;AAxBG;IADC,iBAAU,CAAC,GAAG;;uCACa;AAHhC,uBA2BC;AAED,MAAa,WAAW;IAUpB,YACqB,QAA0B,EAC1B,UAAa,IAAI;QADjB,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,YAAO,GAAP,OAAO,CAAU;QAT9B,cAAS,GAAM,IAAI,CAAC;QAGpB,UAAK,GAAG,KAAK,CAAC;QAEd,YAAO,GAAG,KAAK,CAAC;QAsBhB,gBAAW,GAAG,CAAC,GAAM,EAAE,EAAE;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;YAE3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1C,CAAC,CAAC;QASF,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QA/BzB,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;IAC7B,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAEjC,GAAG;QACC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC1C;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAYD,KAAK;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACzB,CAAC;CAGJ;AA3CG;IADC,iBAAU,CAAC,GAAG;;8CACa;AAG5B;IADC,iBAAU;;0CACW;AAwBtB;IADC,aAAM;;gDAOL;AAGF;IADC,aAAM;;;;wCAKN;AA3CL,kCA8CC"}
+{"version":3,"file":"lazy.js","sourceRoot":"","sources":["../src/lazy.ts"],"names":[],"mappings":";;;;AACA,+BAA0D;AAE1D,MAAqB,IAAI;IAKrB,YAAoB,QAAmB;QAAnB,aAAQ,GAAR,QAAQ,CAAW;QAF/B,cAAS,GAAM,IAAI,CAAC;QAuB5B,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QApBzB,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC;IAEjD,IAAI,KAAK;QACL,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;SACpC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IAC1B,CAAC;CAGJ;AAxBG;IADC,iBAAU,CAAC,GAAG;;uCACa;AAHhC,uBA2BC;AAED,MAAa,WAAW;IAWpB,YACqB,QAA0B,EAC1B,UAAa,IAAI;QADjB,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,YAAO,GAAP,OAAO,CAAU;QAV9B,cAAS,GAAM,IAAI,CAAC;QAGpB,UAAK,GAAG,KAAK,CAAC;QAEd,YAAO,GAAG,KAAK,CAAC;QAChB,aAAQ,GAAe,IAAI,CAAC;QA4B5B,gBAAW,GAAG,CAAC,GAAM,EAAE,EAAE;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;YAE3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1C,CAAC,CAAC;QASF,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QArCzB,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;IAC7B,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAEjC,IAAI,OAAO;QAEP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,GAAG;QACC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACxC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAYD,KAAK;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACzB,CAAC;CAGJ;AAlDG;IADC,iBAAU,CAAC,GAAG;;8CACa;AAG5B;IADC,iBAAU;;0CACW;AA+BtB;IADC,aAAM;;gDAOL;AAGF;IADC,aAAM;;;;wCAKN;AAlDL,kCAqDC"}

package/lib/queue/parallel.d.ts

@@ -7,7 +7,7 @@ export declare class ParallelQueue {
     private _logger;
     private readonly _beforePriorityRun;
     private readonly _afterPriorityRun;
-    get currentoPriority(): number;
+    get currentPriority(): number;
     get inProgress(): boolean;
     get beforePriorityRun(): import("../event").IEvent<number>;
     get afterPriorityRun(): import("../event").IEvent<number>;

package/lib/queue/parallel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parallel.d.ts","sourceRoot":"","sources":["../../src/queue/parallel.ts"],"names":[],"mappings":"AAGA,oBAAY,SAAS,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAInD,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IAEtD,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAK;IAEtB,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAuB;IAC1D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuB;IAEzD,IAAW,gBAAgB,WAAiC;IAC5D,IAAW,UAAU,YAA+B;IAEpD,IAAW,iBAAiB,sCAA+C;IAC3E,IAAW,gBAAgB,sCAA8C;IAElE,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM;IAK/B,8DAA8D;IACvD,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI;IAkC/C,KAAK;IAgBlB,OAAO,CAAC,QAAQ;YAUF,aAAa;IAqC3B,OAAO,CAAC,cAAc,CAOpB;CACL"}
+{"version":3,"file":"parallel.d.ts","sourceRoot":"","sources":["../../src/queue/parallel.ts"],"names":[],"mappings":"AAGA,oBAAY,SAAS,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAInD,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IAEtD,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAK;IAEtB,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAuB;IAC1D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuB;IAEzD,IAAW,eAAe,WAAiC;IAC3D,IAAW,UAAU,YAA+B;IAEpD,IAAW,iBAAiB,sCAA+C;IAC3E,IAAW,gBAAgB,sCAA8C;IAElE,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM;IAK/B,8DAA8D;IACvD,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI;IAkC/C,KAAK;IAgBlB,OAAO,CAAC,QAAQ;YAUF,aAAa;IAqC3B,OAAO,CAAC,cAAc,CAOpB;CACL"}

package/lib/queue/parallel.js

@@ -23,7 +23,7 @@ class ParallelQueue {
             }
         };
     }
-    get currentoPriority() { return this._currentIndex; }
+    get currentPriority() { return this._currentIndex; }
     get inProgress() { return this._inProgress; }
     get beforePriorityRun() { return this._beforePriorityRun.expose(); }
     get afterPriorityRun() { return this._afterPriorityRun.expose(); }

package/lib/queue/parallel.js.map

@@ -1 +1 @@
-{"version":3,"file":"parallel.js","sourceRoot":"","sources":["../../src/queue/parallel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parallel.js","sourceRoot":"","sources":["../../src/queue/parallel.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/async/__tests__/timeout.test.ts

@@ -0,0 +1,74 @@
+
+import { timeoutPromise } from '../timeout';
+import { Event, oneTimeSubscription } from '../../event';
+
+describe('Timeouts', () => {
+
+    describe('one-time subscription to event', () => {
+        const createOneTimePromise = (finishOnStep = 3, totalSteps = 5) => {
+            const e = new Event<number>();
+            let currentValue = 0;
+
+            const p = oneTimeSubscription(e, v => v === finishOnStep);
+
+            const intervalRef = setInterval(() => {
+                e.trigger(++currentValue);
+                if (currentValue === totalSteps) {
+                    clearInterval(intervalRef);
+                }
+            }, 100);
+
+            return p;
+        };
+
+        it('just works as expected', async () => {
+
+            const p = createOneTimePromise();
+
+            await expect(p).resolves.toBe(3);
+        });
+
+        it('works with timing out', async () => {
+            const p = createOneTimePromise();
+
+            const timeoutResult = timeoutPromise(p, 200);
+
+            await expect(timeoutResult).resolves.not.toBeNull();
+
+            const res = await timeoutResult;
+
+            expect(res.resolved).toBeUndefined();
+            expect(res.timedOut).toBe(true);
+            expect(res.elapsed).toBeLessThanOrEqual(210);
+        });
+
+        it('works without timing out', async () => {
+            const p = createOneTimePromise();
+
+            const timeoutResult = timeoutPromise(p, 400);
+
+            await expect(timeoutResult).resolves.not.toBeNull();
+
+            const res = await timeoutResult;
+
+            expect(res.resolved).toBe(3);
+            expect(res.timedOut).toBe(false);
+            expect(res.elapsed).toBeLessThanOrEqual(410);
+        });
+
+        it('works without timing out with minimal run', async () => {
+            const p = createOneTimePromise();
+
+            const timeoutResult = timeoutPromise(p, 400, 350);
+
+            await expect(timeoutResult).resolves.not.toBeNull();
+
+            const res = await timeoutResult;
+
+            expect(res.resolved).toBe(3);
+            expect(res.timedOut).toBe(false);
+            expect(res.elapsed).toBeGreaterThanOrEqual(349);
+            expect(res.elapsed).toBeLessThanOrEqual(410);
+        });
+    });
+});

package/src/async/timeout.ts

@@ -48,3 +48,37 @@ export function setTimeoutFramesAsync(frames: number) {
         cb();
     });
 }
+
+export function timeoutPromise<T>(p: Promise<T>, timeoutMs: number, waitForMinElapsed?: number): Promise<{ resolved: T, timedOut?: boolean, elapsed: number }> {
+    const started = Date.now();
+
+    return new Promise((resolve, reject) => {
+        let finished = false;
+        const finish = (res: T, timedOut: boolean) => {
+            if (finished) {
+                return;
+            }
+
+            finished = true;
+
+            const getElapsed = () => (Date.now() - started);
+            const doFinish = () => resolve({ resolved: res, timedOut: timedOut, elapsed: getElapsed() });
+
+            const left = waitForMinElapsed != null ? (waitForMinElapsed - getElapsed()) : -1;
+            if (left >= 0) {
+                setTimeout(doFinish, left);
+            } else {
+                doFinish();
+            }
+        };
+
+        const timeoutRef = setTimeout(() => {
+            finish(undefined, true);
+        }, timeoutMs);
+
+        p.then(res => {
+            clearTimeout(timeoutRef);
+            finish(res, false);
+        }).catch(reject);
+    });
+}

package/src/event.ts

@@ -1,3 +1,4 @@
+import type { Predicate } from './types';
 import './async/arrays';
 import { forEachAsync } from './async/arrays';
 import { ILogger, createLogger } from './logger';
@@ -78,3 +79,14 @@ export class Event<T = any> implements IEvent<T> {
         this._logger.error(`[Event.${typeof data}] Handler ${cb.name} thrown an exception: `, err);
     }
 }
+
+export function oneTimeSubscription<T>(e: IEvent<T>, filter?: Predicate<T>): Promise<T> {
+    return new Promise<T>((resolve) => {
+        const unsub = e.on(v => {
+            if (!filter || filter(v)) {
+                unsub();
+                resolve(v);
+            }
+        });
+    });
+}

package/src/lazy.ts

@@ -39,6 +39,7 @@ export class LazyPromise<T> implements IDisposable {
     private _busy = false;
 
     private _loaded = false;
+    private _promise: Promise<T> = null;
 
     constructor(
         private readonly _factory: () => Promise<T>,
@@ -50,10 +51,16 @@ export class LazyPromise<T> implements IDisposable {
 
     get busy() { return this._busy; }
 
+    get promise() {
+
+        return this._promise;
+    }
+
     get() {
         if (!this._loaded && !this._busy) {
             this._busy = true;
-            this._factory().then(this.setInstance);
+            this._promise = this._factory();
+            this._promise.then(this.setInstance);
         }
 
         return this._instance;

package/src/queue/__tests__/parallel.test.ts

@@ -26,7 +26,7 @@ describe('ParallelQueue', () => {
         const res = q.start();
         expect(q.inProgress).toBeTruthy();
 
-        expect(q.currentoPriority).toBe(0);
+        expect(q.currentPriority).toBe(0);
 
         const f3 = createLoader();
         const f4 = createLoader();
@@ -40,7 +40,7 @@ describe('ParallelQueue', () => {
         await expect(res).resolves.toBe(true);
 
         expect(q.inProgress).toBeFalsy();
-        expect(q.currentoPriority).toBe(1);
+        expect(q.currentPriority).toBe(1);
 
         expect(f1).toHaveBeenCalledBefore(f2);
         expect(f2).toHaveBeenCalledAfter(f1);

package/src/queue/parallel.ts

@@ -18,7 +18,7 @@ export class ParallelQueue {
     private readonly _beforePriorityRun = new Event<number>();
     private readonly _afterPriorityRun = new Event<number>();
 
-    public get currentoPriority() { return this._currentIndex; }
+    public get currentPriority() { return this._currentIndex; }
     public get inProgress() { return this._inProgress; }
 
     public get beforePriorityRun() { return this._beforePriorityRun.expose(); }