@adviser/cement 0.4.58 → 0.4.60

package/src/timeouted.ts

@@ -0,0 +1,186 @@
+import { Future } from "./future.js";
+import { isPromise } from "./is-promise.js";
+import { sleep } from "./utils/promise-sleep.js";
+
+export interface PurTimeoutResultSuccess<T> {
+  readonly state: "success";
+  readonly value: T;
+}
+
+export interface PurTimeoutResultTimeout {
+  readonly state: "timeout";
+}
+export interface PurTimeoutResultAborted {
+  readonly state: "aborted";
+  readonly reason: unknown;
+}
+export interface PurTimeoutResultError {
+  readonly state: "error";
+  readonly error: Error;
+}
+
+export interface TimeoutState<CTX> {
+  readonly duration: number;
+  readonly ctx: CTX;
+}
+
+type PurTimeoutResult<T> = PurTimeoutResultSuccess<T> | PurTimeoutResultTimeout | PurTimeoutResultAborted | PurTimeoutResultError;
+
+export type TimeoutResultSuccess<T, CTX = unknown> = PurTimeoutResultSuccess<T> & TimeoutState<CTX>;
+export type TimeoutResultTimeout<CTX = unknown> = PurTimeoutResultTimeout & TimeoutState<CTX>;
+export type TimeoutResultAborted<CTX = unknown> = PurTimeoutResultAborted & TimeoutState<CTX>;
+export type TimeoutResultError<CTX = unknown> = PurTimeoutResultError & TimeoutState<CTX>;
+
+export type TimeoutResult<T, CTX = unknown> =
+  | TimeoutResultSuccess<T, CTX>
+  | TimeoutResultTimeout<CTX>
+  | TimeoutResultAborted<CTX>
+  | TimeoutResultError<CTX>;
+
+export type ActionFunc<T> = (controller: AbortController) => Promise<T>;
+
+// Action item in arrays - can be function or promise
+export type ActionItem<T> = ActionFunc<T> | Promise<T>;
+
+// Main action type - function, promise, or mixed array
+export type TimeoutAction<T> = ActionItem<T>;
+
+// Configuration options
+export interface TimeoutActionOptions<CTX> {
+  readonly timeout: number;
+  readonly signal: AbortSignal;
+  readonly controller: AbortController;
+  readonly ctx: CTX;
+  onTimeout: () => void;
+  onAbort: (reason: unknown) => void;
+  onError: (error: Error) => void;
+  onAbortAction: (reason: unknown) => void;
+}
+
+// ============================================================================
+// TYPE GUARDS
+// ============================================================================
+
+export function isSuccess<T>(result: TimeoutResult<T>): result is TimeoutResultSuccess<T> {
+  return result.state === "success";
+}
+
+export function isTimeout<T>(result: TimeoutResult<T>): result is TimeoutResultTimeout<T> {
+  return result.state === "timeout";
+}
+
+export function isAborted<T>(result: TimeoutResult<T>): result is TimeoutResultAborted<T> {
+  return result.state === "aborted";
+}
+
+export function isError<T>(result: TimeoutResult<T>): result is TimeoutResultError<T> {
+  return result.state === "error";
+}
+
+export function unwrap<T>(result: TimeoutResult<T>): T {
+  if (isSuccess(result)) {
+    return result.value;
+  }
+  throw new Error(`TimeoutResult is not success: ${result.state}`);
+}
+
+export function unwrapOr<T>(result: TimeoutResult<T>, defaultValue: T): T {
+  return isSuccess(result) ? result.value : defaultValue;
+}
+
+export async function timeouted<T, CTX = void>(
+  action: TimeoutAction<T>,
+  options: Partial<TimeoutActionOptions<CTX>> = {},
+): Promise<TimeoutResult<T>> {
+  const { timeout = 30000, signal, controller: externalController, ctx, onTimeout, onAbort, onError, onAbortAction } = options;
+
+  const controller = externalController || new AbortController();
+  const startTime = Date.now();
+
+  const toRemoveEventListeners: (() => void)[] = [];
+
+  // Link external signal to internal controller
+  if (signal) {
+    function abortAction(): void {
+      controller.abort(signal?.reason);
+    }
+    toRemoveEventListeners.push(() => {
+      signal?.removeEventListener("abort", abortAction);
+    });
+    signal.addEventListener("abort", abortAction);
+  }
+  function cleanup<X extends PurTimeoutResult<T>>(result: X, skipCleanupAction = false): TimeoutResult<T, CTX> {
+    for (const evtFn of toRemoveEventListeners) {
+      evtFn();
+    }
+    toRemoveEventListeners.length = 0;
+    if (!skipCleanupAction) {
+      void onAbortAction?.(signal?.reason);
+      controller.abort(new Error("Timeouted Abort Action"));
+    }
+    return {
+      ...result,
+      duration: Date.now() - startTime,
+      ctx: ctx as CTX,
+    } as TimeoutResult<T, CTX>;
+  }
+
+  let toAwait: Promise<T>;
+  if (isPromise(action)) {
+    toAwait = action;
+  } else {
+    try {
+      toAwait = action(controller);
+    } catch (error) {
+      return cleanup({
+        state: "error",
+        error: error instanceof Error ? error : new Error(error as string),
+      });
+    }
+  }
+
+  const abortToAwait = new Future<PurTimeoutResultAborted>();
+  function onAbortHandler(): void {
+    abortToAwait.resolve({ state: "aborted" as const, reason: controller.signal.reason as unknown });
+  }
+  controller.signal.addEventListener("abort", onAbortHandler);
+  toRemoveEventListeners.push(() => {
+    controller.signal.removeEventListener("abort", onAbortHandler);
+  });
+
+  const toRace: Promise<PurTimeoutResult<T>>[] = [
+    toAwait.then((value) => ({ state: "success" as const, value })).catch((error: Error) => ({ state: "error" as const, error })),
+    abortToAwait.asPromise(),
+  ];
+  if (timeout > 0) {
+    toRace.push(
+      sleep(timeout, controller.signal).then((r): PurTimeoutResult<T> => {
+        switch (true) {
+          case r.isOk:
+            return { state: "timeout" as const };
+          case r.isErr:
+            return { state: "error" as const, error: r.error };
+          case r.isAborted:
+            return { state: "aborted" as const, reason: r.reason };
+        }
+        throw new Error("Unreachable code in timeoutAction");
+      }),
+    );
+  }
+
+  const res = await Promise.race(toRace);
+  switch (true) {
+    case res.state === "success":
+      return cleanup(res, true);
+    case res.state === "aborted":
+      onAbort?.(res.reason);
+      return cleanup(res);
+    case res.state === "error":
+      onError?.(res.error);
+      return cleanup(res);
+    case res.state === "timeout":
+      onTimeout?.();
+      return cleanup(res);
+  }
+  throw new Error("Unreachable code in timeoutAction");
+}

package/src/utils/promise-sleep.ts

@@ -1,4 +1,36 @@
-import { Result } from "../result.js";
+import { Future } from "../future.js";
+
+export interface SleepBase {
+  readonly state: "sleeped" | "error" | "aborted";
+  readonly isOk: boolean;
+  readonly isErr: boolean;
+  readonly isAborted: boolean;
+}
+
+export interface SleepOk extends SleepBase {
+  readonly state: "sleeped";
+  readonly isOk: true;
+  readonly isErr: false;
+  readonly isAborted: false;
+}
+
+export interface SleepErr extends SleepBase {
+  readonly state: "error";
+  readonly error: Error;
+  readonly isOk: false;
+  readonly isErr: true;
+  readonly isAborted: false;
+}
+
+export interface SleepAbort extends SleepBase {
+  readonly state: "aborted";
+  readonly reason: Error;
+  readonly isOk: false;
+  readonly isErr: false;
+  readonly isAborted: true;
+}
+
+export type SleepResult = SleepOk | SleepErr | SleepAbort;
 
 /**
  * Pause execution for the given number of milliseconds.
@@ -8,36 +40,34 @@ import { Result } from "../result.js";
  *
  * Optionally accepts an AbortSignal to cancel the sleep (will resolve with Result.Err on abort).
  */
-export function sleep(ms: number, signal?: AbortSignal): Promise<Result<void>> {
-  return new Promise<Result<void>>((resolve) => {
-    if (ms <= 0) {
-      resolve(Result.Ok());
-      return;
-    }
-    if (signal?.aborted) {
-      const err = new Error("sleep aborted");
-      // (err as { name: string }).name = "AbortError";
-      resolve(Result.Err(err));
-      return;
-    }
-
-    function cleanup(): void {
-      clearTimeout(id);
-      signal?.removeEventListener("abort", onAbort);
-    }
-
-    const id = setTimeout(() => {
-      cleanup();
-      resolve(Result.Ok());
-    }, ms);
-
-    const onAbort = (): void => {
-      cleanup();
-      const err = new Error("sleep aborted");
-      // (err as { name: string }).name = "AbortError";
-      resolve(Result.Err(err));
-    };
+export async function sleep(ms: number, signal?: AbortSignal): Promise<SleepResult> {
+  if (ms < 0) {
+    return { state: "sleeped", isOk: true, isErr: false, isAborted: false };
+  }
+  if (signal?.aborted) {
+    const err = new Error("sleep aborted");
+    // (err as { name: string }).name = "AbortError";
+    return { state: "aborted", reason: err, isOk: false, isErr: false, isAborted: true };
+  }
+  const sleepFuture = new Future<SleepOk>();
+  const id = setTimeout(() => {
+    // cleanup();
+    sleepFuture.resolve({ state: "sleeped", isOk: true, isErr: false, isAborted: false });
+  }, ms);
 
-    signal?.addEventListener("abort", onAbort, { once: true });
+  const abortFuture = new Future<SleepAbort>();
+  function onAbort(): void {
+    abortFuture.resolve({
+      state: "aborted",
+      reason: new Error("sleep aborted"),
+      isOk: false,
+      isErr: false,
+      isAborted: true,
+    });
+  }
+  signal?.addEventListener("abort", onAbort, { once: true });
+  return Promise.race([abortFuture.asPromise(), sleepFuture.asPromise()]).finally(() => {
+    clearTimeout(id);
+    signal?.removeEventListener("abort", onAbort);
   });
 }

package/ts/cjs/base-sys-abstraction.d.ts

@@ -1,5 +1,5 @@
 import { FileService } from "./file-service.js";
-import { TimeMode, RandomMode, IDMode, SystemService, VoidFunc, BasicSysAbstraction, BasicRuntimeService } from "./sys-abstraction.js";
+import { TimeMode, RandomMode, IDMode, SystemService, VoidFunc, BasicSysAbstraction, type BasicRuntimeService } from "./sys-abstraction.js";
 import { Time } from "./time.js";
 import { TxtEnDecoder } from "./txt-en-decoder.js";
 import { Env } from "./sys-env.js";

package/ts/cjs/base-sys-abstraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-sys-abstraction.d.ts","sourceRoot":"","sources":["../../../src/base-sys-abstraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,QAAQ,EACR,UAAU,EACV,MAAM,EACN,aAAa,EACb,QAAQ,EACR,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAKnC,qBAAa,OAAQ,SAAQ,IAAI;IAC/B,GAAG,IAAI,IAAI,CAEV;IACD,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMrC;CACF;AAED,qBAAa,SAAU,SAAQ,IAAI;IACjC,GAAG,IAAI,IAAI,CAEV;IAED,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErC;CACF;AAED,qBAAa,QAAS,SAAQ,IAAI;IAChC,KAAK,EAAE,IAAI,CAAC;IACZ,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;IACtB,cAIC;IACD,GAAG,CAAC,KAAK,SAAI,GAAG,IAAI,CAanB;IACD,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrC;CACF;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAUpD;AAED,qBAAa,aAAa;IACxB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,KAAK,SAAK;IACV,YAAY,IAAI,EAAE,UAAU,EAE3B;IACD,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAYpC;CACF;AAED,qBAAa,SAAS;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,KAAK,SAAK;IACV,YAAY,IAAI,CAAC,EAAE,MAAM,EAKxB;IACD,MAAM,IAAI,MAAM,CAWf;CACF;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACrC;AAED,MAAM,WAAW,wBAAyB,SAAQ,6BAA6B;IAC7E,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;CACvC;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC9C,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAID,qBAAa,uBAAuB;IAClC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAGxC,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAmB;IACjD,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAwC;IAC9E,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEhC,YAAY,MAAM,EAAE,6BAA6B,EAEhD;CACF;AAED,qBAAa,kBAAmB,SAAQ,uBAAuB;IAE7D,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC;IAEvC,YAAY,MAAM,EAAE,wBAAwB,EAI3C;CACF;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAGhC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CAErC;AAED,MAAM,MAAM,gCAAgC,GAAG,OAAO,CAAC,mBAAmB,GAAG,yBAAyB,CAAC,CAAC;AAExG,wBAAgB,0BAA0B,CAAC,MAAM,CAAC,EAAE,gCAAgC,GAAG,mBAAmB,CAczG;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACpE,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC;IAC/B,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC;IACvC,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,CAAC;IACnD,YACE,IAAI,EAAE,uBAAuB,EAC7B,MAAM,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG;QAAE,mBAAmB,EAAE,mBAAmB,CAAA;KAAE,EAe1F;IAED,IAAI,IAAI,IAAI,CAEX;IACD,MAAM,IAAI,MAAM,CAEf;IACD,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEpC;IACD,MAAM,IAAI,cAAc,CAEvB;IACD,MAAM,IAAI,cAAc,CAEvB;IACD,GAAG,IAAI,GAAG,CAET;IACD,IAAI,IAAI,MAAM,EAAE,CAEf;CAQF;AAGD,qBAAa,4BAA6B,SAAQ,0BAA0B;IAC1E,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,YACE,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG;QACzC,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,UAAU,CAAC,EAAE,WAAW,CAAC;QACzB,mBAAmB,EAAE,mBAAmB,CAAC;KAC1C,EAKF;IAED,MAAM,IAAI,aAAa,CAEtB;IACD,UAAU,IAAI,WAAW,CAExB;CACF"}
+{"version":3,"file":"base-sys-abstraction.d.ts","sourceRoot":"","sources":["../../../src/base-sys-abstraction.ts"],"names":[],"mappings":"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"}

package/ts/cjs/future.d.ts

@@ -2,6 +2,7 @@ export declare class Future<T, CTX = void> {
     #private;
     readonly ctx?: CTX;
     constructor(ctx?: CTX);
+    readonly id: () => string;
     asPromise(): Promise<T>;
     resolve(value: T): void;
     reject(reason: unknown): void;

package/ts/cjs/future.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"future.d.ts","sourceRoot":"","sources":["../../../src/future.ts"],"names":[],"mappings":"AAAA,qBAAa,MAAM,CAAC,CAAC,EAAE,GAAG,GAAG,IAAI;;IAU/B,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC;IACnB,YAAY,GAAG,CAAC,EAAE,GAAG,EAMpB;IAED,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,CAEtB;IAED,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAEtB;IACD,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAE5B;CACF"}
+{"version":3,"file":"future.d.ts","sourceRoot":"","sources":["../../../src/future.ts"],"names":[],"mappings":"AAEA,qBAAa,MAAM,CAAC,CAAC,EAAE,GAAG,GAAG,IAAI;;IAU/B,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC;IACnB,YAAY,GAAG,CAAC,EAAE,GAAG,EAMpB;IAGD,QAAQ,CAAC,EAAE,EAAE,MAAM,MAAM,CAAiF;IAE1G,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,CAEtB;IAED,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAEtB;IACD,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAE5B;CACF"}

package/ts/cjs/future.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Future = void 0;
+const resolve_once_js_1 = require("./resolve-once.js");
 class Future {
     #promise;
     #resolveFn = () => {
@@ -17,6 +18,7 @@ class Future {
             this.#rejectFn = reject;
         });
     }
+    id = (0, resolve_once_js_1.Lazy)(() => Math.random().toString(36).substring(2) + Date.now().toString(36));
     asPromise() {
         return this.#promise;
     }

package/ts/cjs/future.js.map

@@ -1 +1 @@
-{"version":3,"file":"future.js","sourceRoot":"","sources":["../../../src/future.ts"],"names":[],"mappings":";;;AAAA;IAEW,QAAQ,CAAa;IAC9B,UAAU,GAAuB,GAAG,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAAA,CAC7D,CAAC;IACF,SAAS,GAA8B,GAAG,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAAA,CAC7D,CAAC;IAEO,GAAG,CAAO;IACnB,YAAY,GAAS,EAAE;QACrB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;YAClD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;YAC1B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;QAAA,CACzB,CAAC,CAAC;IAAA,CACJ;IAED,SAAS,GAAe;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC;IAAA,CACtB;IAED,OAAO,CAAC,KAAQ,EAAQ;QACtB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAAA,CACxB;IACD,MAAM,CAAC,MAAe,EAAQ;QAC5B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAAA,CACxB;CACF"}
+{"version":3,"file":"future.js","sourceRoot":"","sources":["../../../src/future.ts"],"names":[],"mappings":";;;AAAA,uDAAyC;AAEzC;IAEW,QAAQ,CAAa;IAC9B,UAAU,GAAuB,GAAG,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAAA,CAC7D,CAAC;IACF,SAAS,GAA8B,GAAG,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAAA,CAC7D,CAAC;IAEO,GAAG,CAAO;IACnB,YAAY,GAAS,EAAE;QACrB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;YAClD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;YAC1B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;QAAA,CACzB,CAAC,CAAC;IAAA,CACJ;IAGQ,EAAE,GAAiB,IAAA,sBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAE1G,SAAS,GAAe;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC;IAAA,CACtB;IAED,OAAO,CAAC,KAAQ,EAAQ;QACtB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAAA,CACxB;IACD,MAAM,CAAC,MAAe,EAAQ;QAC5B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAAA,CACxB;CACF"}

package/ts/cjs/future.test.js

@@ -35,4 +35,9 @@ it("Create Future with Context", () => {
     const future = new cement_1.Future({ id: 42 });
     expect(future.ctx?.id).toBe(42);
 });
+it("Future create a unique id per instance could be used as transaction id", () => {
+    const future1 = new cement_1.Future();
+    const future2 = new cement_1.Future();
+    expect(future1.id()).not.toBe(future2.id());
+});
 //# sourceMappingURL=future.test.js.map

package/ts/cjs/future.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"future.test.js","sourceRoot":"","sources":["../../../src/future.test.ts"],"names":[],"mappings":";;AAAA,4CAAyC;AAEzC,EAAE,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAExC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAAA,CACrC,CAAC,CAAC;IACH,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE5B,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AAAA,CAC3C,CAAC,CAAC;AAEH,EAAE,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAExC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAAA,CACrC,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC3B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC3B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAE3B,IAAI,CAAC;QACH,MAAM,OAAO,CAAC;QACd,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;AAAA,CACF,CAAC,CAAC;AAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAmC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACxE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAAA,CACjC,CAAC,CAAC"}
+{"version":3,"file":"future.test.js","sourceRoot":"","sources":["../../../src/future.test.ts"],"names":[],"mappings":";;AAAA,4CAAyC;AAEzC,EAAE,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAExC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAAA,CACrC,CAAC,CAAC;IACH,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE5B,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AAAA,CAC3C,CAAC,CAAC;AAEH,EAAE,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAExC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAAA,CACrC,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC3B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC3B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAE3B,IAAI,CAAC;QACH,MAAM,OAAO,CAAC;QACd,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;AAAA,CACF,CAAC,CAAC;AAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAmC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACxE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAAA,CACjC,CAAC,CAAC;AAEH,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE,CAAC;IACjF,MAAM,OAAO,GAAG,IAAI,eAAM,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,IAAI,eAAM,EAAE,CAAC;IAC7B,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7C,CAAC,CAAC"}

package/ts/cjs/on-func.test.js

@@ -34,7 +34,7 @@ it("OnFunctionTest", async () => {
     const start = performance.now();
     await test.onFunAction.invokeAsync(2, "34");
     const duration = performance.now() - start;
-    expect(duration).toBeGreaterThanOrEqual(10);
+    expect(duration).toBeGreaterThanOrEqual(9);
     for (const fn of [...asyncFns, ...fns]) {
         expect(fn.mock.calls).toEqual([[2, "34"]]);
         fn.mock.calls.length = 0;

package/ts/cjs/on-func.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"on-func.test.js","sourceRoot":"","sources":["../../../src/on-func.test.ts"],"names":[],"mappings":";;AAAA,6CAAsC;AACtC,+DAAiD;AA0CjD,MAAM,cAAc;IACT,WAAW,GAAG,IAAA,mBAAM,GAAkC,CAAC;IACvD,YAAY,GAAG,IAAA,mBAAM,GAAc,CAAC;IAEpC,SAAS,GAAG,IAAA,mBAAM,GAA0C,CAAC;IAC7D,aAAa,GAAG,IAAA,mBAAM,GAA+D,CAAC;IACtF,mBAAmB,GAAG,IAAA,mBAAM,GAAqE,CAAC;CAC5G;AAED,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;IAClC,MAAM,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACjD,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;IAE3B,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAU,EAAE,EAAU,EAAE,EAAE,CAAC,IAAA,wBAAK,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9F,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAU,EAAE,EAAU,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClF,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACjC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACjC,KAAK,MAAM,EAAE,IAAI,CAAC,GAAG,QAAQ,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;YAC5B,CAAC,CAAC,EAAE,IAAI,CAAC;YACT,CAAC,CAAC,EAAE,IAAI,CAAC;SACV,CAAC,CAAC;QACH,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,CAAC;IACD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAChC,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;IAC3C,MAAM,CAAC,QAAQ,CAAC,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;IAC5C,KAAK,MAAM,EAAE,IAAI,CAAC,GAAG,QAAQ,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3C,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,KAAK,EAAE,CAAC;IACV,CAAC;IAED,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACjC,KAAK,MAAM,EAAE,IAAI,CAAC,GAAG,QAAQ,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;AAAA,CACF,CAAC,CAAC;AAEH,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;IAClC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAU,EAAE,EAAU,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;IACjD,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACrB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IACzB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAAA,CACnC,CAAC,CAAC"}
+{"version":3,"file":"on-func.test.js","sourceRoot":"","sources":["../../../src/on-func.test.ts"],"names":[],"mappings":"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"}

package/ts/cjs/poller.d.ts

@@ -1,22 +1,44 @@
-export interface PollWaitingActionResult {
+export interface PollerStats {
+    readonly attempts: number;
+    readonly lastIntervalMs: number;
+    readonly totalElapsedMs: number;
+}
+interface PollWithStats {
+    readonly stats: PollerStats;
+}
+export interface PurPollWaitingActionResult {
     readonly state: "waiting";
 }
-export interface PollSuccessActionResult<T> {
+export type PollWaitingActionResult = PurPollWaitingActionResult & PollWithStats;
+export interface PurPollSuccessActionResult<T> {
     readonly state: "success";
     readonly result: T;
 }
-export interface PollErrorActionResult {
+export type PollSuccessActionResult<T> = PurPollSuccessActionResult<T> & PollWithStats;
+export interface PurPollErrorActionResult {
     readonly state: "error";
     readonly error: Error;
 }
-export type PollActionResult<T> = PollWaitingActionResult | PollSuccessActionResult<T> | PollErrorActionResult;
+export type PollErrorActionResult = PurPollErrorActionResult & PollWithStats;
+export interface PurPollTimeoutActionResult {
+    readonly state: "timeout";
+}
+export type PollTimeoutActionResult = PurPollTimeoutActionResult & PollWithStats;
+export interface PurPollAbortActionResult {
+    readonly state: "aborted";
+    readonly reason: unknown;
+}
+export type PollAbortActionResult = PurPollAbortActionResult & PollWithStats;
+export type PollActionResult<T> = PurPollWaitingActionResult | PurPollSuccessActionResult<T> | PurPollErrorActionResult | PurPollTimeoutActionResult | PurPollAbortActionResult;
 export declare const FOREVER = 2147483647;
 export interface PollerOptions {
     readonly intervalMs: number;
+    readonly actionTimeoutMs: number;
     readonly timeoutMs: number;
     readonly exponentialBackoff: boolean;
     readonly abortSignal?: AbortSignal;
 }
-export type PollerResult<T> = PollSuccessActionResult<T> | PollErrorActionResult;
+export type PollerResult<T> = PollSuccessActionResult<T> | PollErrorActionResult | PollTimeoutActionResult | PollAbortActionResult;
 export declare function poller<T>(fn: () => Promise<PollActionResult<T>>, ioptions?: Partial<PollerOptions>): Promise<PollerResult<T>>;
+export {};
 //# sourceMappingURL=poller.d.ts.map

package/ts/cjs/poller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"poller.d.ts","sourceRoot":"","sources":["../../../src/poller.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACvB;AAED,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,uBAAuB,GAAG,uBAAuB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC;AAE/G,eAAO,MAAM,OAAO,aAAa,CAAC;AAClC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;CACpC;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,uBAAuB,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC;AAwCjF,wBAAsB,MAAM,CAAC,CAAC,EAC5B,EAAE,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EACtC,QAAQ,GAAE,OAAO,CAAC,aAAa,CAAM,GACpC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAc1B"}
+{"version":3,"file":"poller.d.ts","sourceRoot":"","sources":["../../../src/poller.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,UAAU,aAAa;IACrB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;CAC3B;AAED,MAAM,MAAM,uBAAuB,GAAG,0BAA0B,GAAG,aAAa,CAAC;AAEjF,MAAM,WAAW,0BAA0B,CAAC,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;CACpB;AAED,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI,0BAA0B,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC;AAEvF,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACvB;AAED,MAAM,MAAM,qBAAqB,GAAG,wBAAwB,GAAG,aAAa,CAAC;AAE7E,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;CAC3B;AAED,MAAM,MAAM,uBAAuB,GAAG,0BAA0B,GAAG,aAAa,CAAC;AAEjF,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B;AACD,MAAM,MAAM,qBAAqB,GAAG,wBAAwB,GAAG,aAAa,CAAC;AAE7E,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAC1B,0BAA0B,GAC1B,0BAA0B,CAAC,CAAC,CAAC,GAC7B,wBAAwB,GACxB,0BAA0B,GAC1B,wBAAwB,CAAC;AAE7B,eAAO,MAAM,OAAO,aAAa,CAAC;AAClC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;CACpC;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,uBAAuB,CAAC,CAAC,CAAC,GAAG,qBAAqB,GAAG,uBAAuB,GAAG,qBAAqB,CAAC;AAiHnI,wBAAsB,MAAM,CAAC,CAAC,EAC5B,EAAE,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EACtC,QAAQ,GAAE,OAAO,CAAC,aAAa,CAAM,GACpC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CA0C1B"}

package/ts/cjs/poller.js

@@ -2,38 +2,100 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FOREVER = void 0;
 exports.poller = poller;
+const future_js_1 = require("./future.js");
 const promise_sleep_js_1 = require("./utils/promise-sleep.js");
 exports.FOREVER = 2147483647;
-async function interPoller(fn, options) {
+function doneStats(stats) {
+    stats.totalElapsedMs = Date.now() - stats.startTime;
+    return {
+        attempts: stats.attempts,
+        lastIntervalMs: stats.lastIntervalMs,
+        totalElapsedMs: stats.totalElapsedMs,
+    };
+}
+async function interPoller(fn, options, stats, abortController) {
     do {
-        let result;
         try {
-            result = await fn(options.abortSignal);
+            stats.attempts += 1;
+            const abortCheck = new future_js_1.Future();
+            function onAbort() {
+                abortCheck.resolve({
+                    state: "aborted",
+                    reason: abortController.signal.reason,
+                });
+            }
+            const fnAbortController = new AbortController();
+            fnAbortController.signal.addEventListener("abort", onAbort, { once: true });
+            const races = [
+                fn(fnAbortController.signal).finally(() => {
+                    fnAbortController.abort();
+                }),
+                abortCheck.asPromise().finally(() => {
+                    fnAbortController.abort();
+                }),
+            ];
+            if (options.actionTimeoutMs > 0) {
+                races.push((0, promise_sleep_js_1.sleep)(options.actionTimeoutMs, fnAbortController.signal).then((res) => {
+                    fnAbortController.abort(new Error("poller action timeout"));
+                    switch (res.state) {
+                        case "sleeped":
+                            return { state: "waiting" };
+                        case "error":
+                            return { state: "error", error: res.error };
+                        case "aborted":
+                            return { state: "aborted", reason: res.reason };
+                    }
+                    throw new Error("Unreachable code in poller action timeout");
+                }));
+            }
+            const result = await Promise.race(races).finally(() => {
+                fnAbortController.signal.removeEventListener("abort", onAbort);
+            });
             switch (result.state) {
                 case "waiting":
                     {
                         if (options.exponentialBackoff) {
                             options.intervalMs = Math.min(options.intervalMs * 2, exports.FOREVER);
                         }
-                        const err = await (0, promise_sleep_js_1.sleep)(options.intervalMs, options.abortSignal);
-                        if (err.isErr()) {
-                            return {
-                                state: "error",
-                                error: err.Err(),
-                            };
+                        stats.lastIntervalMs = options.intervalMs;
+                        const res = await (0, promise_sleep_js_1.sleep)(options.intervalMs, abortController.signal);
+                        switch (true) {
+                            case res.isAborted:
+                                return {
+                                    state: "aborted",
+                                    reason: res.reason,
+                                    stats: doneStats(stats),
+                                };
+                            case res.isOk:
+                                break;
+                            case res.isErr:
+                                return {
+                                    state: "error",
+                                    error: res.error,
+                                    stats: doneStats(stats),
+                                };
+                            default:
+                                throw new Error("poller interrupted during sleep");
                         }
                     }
                     break;
+                case "aborted":
+                    return {
+                        state: "aborted",
+                        reason: result.reason,
+                        stats: doneStats(stats),
+                    };
                 case "success":
-                    return result;
+                    return { ...result, stats: doneStats(stats) };
                 case "error":
-                    return result;
+                    return { ...result, stats: doneStats(stats) };
             }
         }
         catch (err) {
             return {
                 state: "error",
                 error: err,
+                stats: doneStats(stats),
             };
         }
         // eslint-disable-next-line no-constant-condition
@@ -42,15 +104,42 @@ async function interPoller(fn, options) {
 async function poller(fn, ioptions = {}) {
     const options = {
         intervalMs: 1000,
-        timeoutMs: 30000,
+        timeoutMs: 30000, // -1 means forever
+        actionTimeoutMs: -1, // forever
         ...ioptions,
         exponentialBackoff: typeof ioptions.exponentialBackoff === "boolean" ? ioptions.exponentialBackoff : ioptions.timeoutMs === exports.FOREVER,
     };
-    return Promise.race([
-        interPoller(fn, options),
-        (0, promise_sleep_js_1.sleep)(options.timeoutMs, options.abortSignal)
-            .then(() => ({ state: "error", error: new Error("Polling timed out") }))
-            .catch((e) => ({ state: "error", error: e })),
-    ]);
+    const stats = {
+        attempts: 0,
+        startTime: Date.now(),
+        lastIntervalMs: 0,
+        totalElapsedMs: 0,
+    };
+    const abortController = new AbortController();
+    const toRemoveEventListeners = [];
+    if (options.abortSignal) {
+        if (options.abortSignal.aborted) {
+            abortController.abort(options.abortSignal.reason);
+        }
+        else {
+            function dispatchAbort() {
+                abortController.abort(options.abortSignal?.reason);
+            }
+            toRemoveEventListeners.push(() => {
+                options.abortSignal?.removeEventListener("abort", dispatchAbort);
+            });
+            options.abortSignal.addEventListener("abort", dispatchAbort, { once: true });
+        }
+    }
+    const races = [interPoller(fn, options, stats, abortController)];
+    if (options.timeoutMs > 0) {
+        races.push((0, promise_sleep_js_1.sleep)(options.timeoutMs, abortController.signal)
+            .then(() => ({ state: "timeout", stats: doneStats(stats) }))
+            .catch((e) => ({ state: "error", error: e, stats: doneStats(stats) })));
+    }
+    return Promise.race(races).finally(() => {
+        toRemoveEventListeners.forEach((fn) => fn());
+        toRemoveEventListeners.length = 0;
+    });
 }
 //# sourceMappingURL=poller.js.map

package/ts/cjs/poller.js.map

@@ -1 +1 @@
-{"version":3,"file":"poller.js","sourceRoot":"","sources":["../../../src/poller.ts"],"names":[],"mappings":";;;;AAAA,+DAAiD;AAmBpC,QAAA,OAAO,GAAG,UAAU,CAAC;AAUlC,KAAK,UAAU,WAAW,CACxB,EAA+D,EAC/D,OAAgC,EACN;IAC1B,GAAG,CAAC;QACF,IAAI,MAA2B,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACvC,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC;gBACrB,KAAK,SAAS;oBACZ,CAAC;wBACC,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;4BAC/B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC,EAAE,QAAA,OAAO,CAAC,CAAC;wBACjE,CAAC;wBACD,MAAM,GAAG,GAAG,MAAM,IAAA,wBAAK,EAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;wBACjE,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;4BAChB,OAAO;gCACL,KAAK,EAAE,OAAO;gCACd,KAAK,EAAE,GAAG,CAAC,GAAG,EAAE;6BACjB,CAAC;wBACJ,CAAC;oBACH,CAAC;oBACD,MAAM;gBACR,KAAK,SAAS;oBACZ,OAAO,MAAM,CAAC;gBAChB,KAAK,OAAO;oBACV,OAAO,MAAM,CAAC;YAClB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,OAAO;gBACd,KAAK,EAAE,GAAY;aACpB,CAAC;QACJ,CAAC;QACD,iDAAiD;IACnD,CAAC,QAAQ,IAAI,EAAE;AAAA,CAChB;AAEM,KAAK,iBACV,EAAsC,EACtC,QAAQ,GAA2B,EAAE,EACX;IAC1B,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,GAAG,QAAQ;QACX,kBAAkB,EAChB,OAAO,QAAQ,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,KAAK,QAAA,OAAO;KAClH,CAAC;IACF,OAAO,OAAO,CAAC,IAAI,CAAC;QAClB,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC;QACxB,IAAA,wBAAK,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC;aAC1C,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,OAAgB,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;aAChF,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,OAAgB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;KAChE,CAAC,CAAC;AAAA,CACJ"}
+{"version":3,"file":"poller.js","sourceRoot":"","sources":["../../../src/poller.ts"],"names":[],"mappings":"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"}