@adviser/cement 0.4.59 → 0.4.61

package/esm/utils/promise-sleep.d.ts

@@ -1,3 +1,29 @@
-import { Result } from "../result.js";
-export declare function sleep(ms: number, signal?: AbortSignal): Promise<Result<void>>;
+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;
+export declare function sleep(ms: number, signal?: AbortSignal): Promise<SleepResult>;
 //# sourceMappingURL=promise-sleep.d.ts.map

package/esm/utils/promise-sleep.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promise-sleep.d.ts","sourceRoot":"","sources":["../../../../src/utils/promise-sleep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAUtC,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAgC7E"}
+{"version":3,"file":"promise-sleep.d.ts","sourceRoot":"","sources":["../../../../src/utils/promise-sleep.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAChD,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC;CAC3B;AAED,MAAM,WAAW,QAAS,SAAQ,SAAS;IACzC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC;CAC3B;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC;AAU1D,wBAAsB,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CA8BlF"}

package/esm/utils/promise-sleep.js

@@ -1,29 +1,30 @@
-import { Result } from "../result.js";
-export function sleep(ms, signal) {
-    return new Promise((resolve) => {
-        if (ms <= 0) {
-            resolve(Result.Ok());
-            return;
-        }
-        if (signal?.aborted) {
-            const err = new Error("sleep aborted");
-            resolve(Result.Err(err));
-            return;
-        }
-        function cleanup() {
-            clearTimeout(id);
-            signal?.removeEventListener("abort", onAbort);
-        }
-        const id = setTimeout(() => {
-            cleanup();
-            resolve(Result.Ok());
-        }, ms);
-        const onAbort = () => {
-            cleanup();
-            const err = new Error("sleep aborted");
-            resolve(Result.Err(err));
-        };
-        signal?.addEventListener("abort", onAbort, { once: true });
+import { Future } from "../future.js";
+export async function sleep(ms, signal) {
+    if (ms < 0) {
+        return { state: "sleeped", isOk: true, isErr: false, isAborted: false };
+    }
+    if (signal?.aborted) {
+        const err = new Error("sleep aborted");
+        return { state: "aborted", reason: err, isOk: false, isErr: false, isAborted: true };
+    }
+    const sleepFuture = new Future();
+    const id = setTimeout(() => {
+        sleepFuture.resolve({ state: "sleeped", isOk: true, isErr: false, isAborted: false });
+    }, ms);
+    const abortFuture = new Future();
+    function onAbort() {
+        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);
     });
 }
 //# sourceMappingURL=promise-sleep.js.map

package/esm/utils/promise-sleep.js.map

@@ -1 +1 @@
-{"version":3,"file":"promise-sleep.js","sourceRoot":"","sources":["../../../../src/utils/promise-sleep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAUtC,MAAM,UAAU,KAAK,CAAC,EAAU,EAAE,MAAoB,EAAyB;IAC7E,OAAO,IAAI,OAAO,CAAe,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5C,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QACD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;YAEvC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACzB,OAAO;QACT,CAAC;QAED,SAAS,OAAO,GAAS;YACvB,YAAY,CAAC,EAAE,CAAC,CAAC;YACjB,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAAA,CAC/C;QAED,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAAA,CACtB,EAAE,EAAE,CAAC,CAAC;QAEP,MAAM,OAAO,GAAG,GAAS,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;YAEvC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAAA,CAC1B,CAAC;QAEF,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAAA,CAC5D,CAAC,CAAC;AAAA,CACJ"}
+{"version":3,"file":"promise-sleep.js","sourceRoot":"","sources":["../../../../src/utils/promise-sleep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AA0CtC,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAU,EAAE,MAAoB,EAAwB;IAClF,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IAC1E,CAAC;IACD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;QACpB,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;QAEvC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IACvF,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,MAAM,EAAW,CAAC;IAC1C,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;QAE1B,WAAW,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAAA,CACvF,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,WAAW,GAAG,IAAI,MAAM,EAAc,CAAC;IAC7C,SAAS,OAAO,GAAS;QACvB,WAAW,CAAC,OAAO,CAAC;YAClB,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,IAAI,KAAK,CAAC,eAAe,CAAC;YAClC,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IAAA,CACJ;IACD,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACpF,YAAY,CAAC,EAAE,CAAC,CAAC;QACjB,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAAA,CAC/C,CAAC,CAAC;AAAA,CACJ"}

package/esm/utils/promise-sleep.test.js

@@ -5,58 +5,58 @@ it("sleeps for the specified duration", async () => {
     const duration = performance.now() - start;
     expect(duration).toBeGreaterThanOrEqual(95);
     expect(duration).toBeLessThan(150);
-    expect(result.isOk()).toBe(true);
-    expect(result.unwrap()).toBeUndefined();
+    expect(result.isOk).toBe(true);
 });
 it("returns immediately for zero milliseconds", async () => {
     const start = performance.now();
     const result = await sleep(0);
     const duration = performance.now() - start;
     expect(duration).toBeLessThan(10);
-    expect(result.isOk()).toBe(true);
+    expect(result.isOk).toBe(true);
 });
 it("returns immediately for negative milliseconds", async () => {
     const start = performance.now();
     const result = await sleep(-100);
     const duration = performance.now() - start;
     expect(duration).toBeLessThan(10);
-    expect(result.isOk()).toBe(true);
+    expect(result.isOk).toBe(true);
 });
 it("returns error when aborted before sleep starts", async () => {
     const controller = new AbortController();
     controller.abort();
-    const result = await sleep(100, controller.signal);
-    expect(result.isOk()).toBe(false);
-    expect(result.Err().message).toBe("sleep aborted");
+    const result = (await sleep(100, controller.signal));
+    expect(result.isOk).toBe(false);
+    expect(result.isAborted).toBe(true);
+    expect(result.reason.message).toBe("sleep aborted");
 });
 it("returns error when aborted during sleep", async () => {
     const controller = new AbortController();
     const start = performance.now();
     const sleepPromise = sleep(200, controller.signal);
     setTimeout(() => controller.abort(), 50);
-    const result = await sleepPromise;
+    const result = (await sleepPromise);
     const duration = performance.now() - start;
     expect(duration).toBeGreaterThanOrEqual(45);
     expect(duration).toBeLessThan(150);
-    expect(result.isOk()).toBe(false);
-    expect(result.Err().message).toBe("sleep aborted");
+    expect(result.isOk).toBe(false);
+    expect(result.reason.message).toBe("sleep aborted");
 });
 it("completes successfully if not aborted", async () => {
     const controller = new AbortController();
     const result = await sleep(50, controller.signal);
-    expect(result.isOk()).toBe(true);
+    expect(result.isOk).toBe(true);
 });
 it("cleans up timeout and event listener on abort", async () => {
     const controller = new AbortController();
     const sleepPromise = sleep(100, controller.signal);
     controller.abort();
     const result = await sleepPromise;
-    expect(result.isOk()).toBe(false);
+    expect(result.isOk).toBe(false);
 });
 it("cleans up timeout and event listener on success", async () => {
     const controller = new AbortController();
     const result = await sleep(50, controller.signal);
-    expect(result.isOk()).toBe(true);
+    expect(result.isOk).toBe(true);
     controller.abort();
 });
 //# sourceMappingURL=promise-sleep.test.js.map

package/esm/utils/promise-sleep.test.js.map

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

package/esm/version.js

@@ -1,2 +1,2 @@
-export const VERSION = "0.4.59";
+export const VERSION = "0.4.61";
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adviser/cement",
-  "version": "0.4.59",
+  "version": "0.4.61",
   "description": "better try/catch/finally handling",
   "main": "./cjs/index.js",
   "type": "module",

package/src/future.ts

@@ -1,3 +1,5 @@
+import { Lazy } from "./resolve-once.js";
+
 export class Future<T, CTX = void> {
   // readonly id = Math.random();
   readonly #promise: Promise<T>;
@@ -17,6 +19,9 @@ export class Future<T, CTX = void> {
     });
   }
 
+  // the id is not cryptographically secure, but good enough for transaction id
+  readonly id: () => string = Lazy(() => Math.random().toString(36).substring(2) + Date.now().toString(36));
+
   asPromise(): Promise<T> {
     return this.#promise;
   }

package/src/index.ts

@@ -30,6 +30,7 @@ export * from "./load-asset.js";
 export * from "./mutable-url.js";
 export * from "./poller.js";
 export * from "./on-func.js";
+export * from "./timeouted.js";
 
 // ugly
 export * as utils from "./utils/index.js";

package/src/poller.ts

@@ -1,3 +1,4 @@
+import { Future } from "./future.js";
 import { sleep } from "./utils/promise-sleep.js";
 import { Writable } from "ts-essentials";
 
@@ -7,42 +8,59 @@ export interface PollerStats {
   readonly totalElapsedMs: number;
 }
 
-export interface PollWaitingActionResult {
-  readonly state: "waiting";
+interface PollWithStats {
   readonly stats: PollerStats;
 }
 
-export interface PollSuccessActionResult<T> {
+export interface PurPollWaitingActionResult {
+  readonly state: "waiting";
+}
+
+export type PollWaitingActionResult = PurPollWaitingActionResult & PollWithStats;
+
+export interface PurPollSuccessActionResult<T> {
   readonly state: "success";
   readonly result: T;
-  readonly stats: PollerStats;
 }
 
-export interface PollErrorActionResult {
+export type PollSuccessActionResult<T> = PurPollSuccessActionResult<T> & PollWithStats;
+
+export interface PurPollErrorActionResult {
   readonly state: "error";
   readonly error: Error;
-  readonly stats: PollerStats;
 }
 
-export interface PollTimeoutActionResult {
+export type PollErrorActionResult = PurPollErrorActionResult & PollWithStats;
+
+export interface PurPollTimeoutActionResult {
   readonly state: "timeout";
-  readonly stats: PollerStats;
 }
 
+export type PollTimeoutActionResult = PurPollTimeoutActionResult & PollWithStats;
+
+export interface PurPollAbortActionResult {
+  readonly state: "aborted";
+  readonly reason: unknown;
+}
+export type PollAbortActionResult = PurPollAbortActionResult & PollWithStats;
+
 export type PollActionResult<T> =
-  | Omit<PollWaitingActionResult, "stats">
-  | Omit<PollSuccessActionResult<T>, "stats">
-  | Omit<PollErrorActionResult, "stats">;
+  | PurPollWaitingActionResult
+  | PurPollSuccessActionResult<T>
+  | PurPollErrorActionResult
+  | PurPollTimeoutActionResult
+  | PurPollAbortActionResult;
 
 export const FOREVER = 2147483647; // Maximum setTimeout delay
 export interface PollerOptions {
   readonly intervalMs: number;
+  readonly actionTimeoutMs: number; // not -1 it means if a timeout occures the action is retried in the next interval
   readonly timeoutMs: number;
   readonly exponentialBackoff: boolean;
   readonly abortSignal?: AbortSignal;
 }
 
-export type PollerResult<T> = PollSuccessActionResult<T> | PollErrorActionResult | PollTimeoutActionResult;
+export type PollerResult<T> = PollSuccessActionResult<T> | PollErrorActionResult | PollTimeoutActionResult | PollAbortActionResult;
 
 function doneStats(stats: Writable<PollerStats> & { startTime: number }): PollerStats {
   stats.totalElapsedMs = Date.now() - stats.startTime;
@@ -55,14 +73,56 @@ function doneStats(stats: Writable<PollerStats> & { startTime: number }): Poller
 
 async function interPoller<T>(
   fn: (abortSignal?: AbortSignal) => Promise<PollActionResult<T>>,
-  options: Writable<PollerOptions>,
+  options: Writable<Omit<PollerOptions, "abortSignal">>,
   stats: Writable<PollerStats> & { readonly startTime: number },
+  abortController: AbortController,
 ): Promise<PollerResult<T>> {
   do {
-    let result: PollActionResult<T>;
+    // let result: PollActionResult<T>;
     try {
       stats.attempts += 1;
-      result = await fn(options.abortSignal);
+
+      const abortCheck = new Future<PurPollAbortActionResult>();
+      function onAbort(): void {
+        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(() => {
+          // abort all other waits
+          fnAbortController.abort();
+        }),
+        abortCheck.asPromise().finally(() => {
+          // abort all other waits
+          fnAbortController.abort();
+        }),
+      ];
+      if (options.actionTimeoutMs > 0) {
+        races.push(
+          sleep(options.actionTimeoutMs, fnAbortController.signal).then((res): PollActionResult<T> => {
+            // abort all other waits
+            fnAbortController.abort(new Error("poller action timeout"));
+            switch (res.state) {
+              case "sleeped":
+                // timeout occurred but we retry
+                return { state: "waiting" as const };
+              case "error":
+                return { state: "error" as const, error: res.error };
+              case "aborted":
+                return { state: "aborted" as const, reason: res.reason };
+            }
+            throw new Error("Unreachable code in poller action timeout");
+          }),
+        );
+      }
+      const result = await Promise.race<PollActionResult<T>>(races).finally(() => {
+        fnAbortController.signal.removeEventListener("abort", onAbort);
+      });
       switch (result.state) {
         case "waiting":
           {
@@ -70,16 +130,33 @@ async function interPoller<T>(
               options.intervalMs = Math.min(options.intervalMs * 2, FOREVER);
             }
             stats.lastIntervalMs = options.intervalMs;
-            const err = await sleep(options.intervalMs, options.abortSignal);
-            if (err.isErr()) {
-              return {
-                state: "error",
-                error: err.Err(),
-                stats: doneStats(stats),
-              };
+            const res = await sleep(options.intervalMs, abortController.signal);
+            switch (true) {
+              case res.isAborted:
+                return {
+                  state: "aborted" as const,
+                  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" as const,
+            reason: result.reason,
+            stats: doneStats(stats),
+          };
         case "success":
           return { ...result, stats: doneStats(stats) };
         case "error":
@@ -102,7 +179,8 @@ export async function poller<T>(
 ): Promise<PollerResult<T>> {
   const options = {
     intervalMs: 1000,
-    timeoutMs: 30000,
+    timeoutMs: 30000, // -1 means forever
+    actionTimeoutMs: -1, // forever
     ...ioptions,
     exponentialBackoff:
       typeof ioptions.exponentialBackoff === "boolean" ? ioptions.exponentialBackoff : ioptions.timeoutMs === FOREVER,
@@ -113,10 +191,31 @@ export async function poller<T>(
     lastIntervalMs: 0,
     totalElapsedMs: 0,
   };
-  return Promise.race([
-    interPoller(fn, options, stats),
-    sleep(options.timeoutMs, options.abortSignal)
-      .then(() => ({ state: "timeout" as const, stats: doneStats(stats) }))
-      .catch((e: Error) => ({ state: "error" as const, error: e, stats: doneStats(stats) })),
-  ]);
+  const abortController = new AbortController();
+  const toRemoveEventListeners: (() => void)[] = [];
+  if (options.abortSignal) {
+    if (options.abortSignal.aborted) {
+      abortController.abort(options.abortSignal.reason);
+    } else {
+      function dispatchAbort(): void {
+        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(
+      sleep(options.timeoutMs, abortController.signal)
+        .then(() => ({ state: "timeout" as const, stats: doneStats(stats) }))
+        .catch((e: Error) => ({ state: "error" as const, error: e, stats: doneStats(stats) })),
+    );
+  }
+  return Promise.race(races).finally(() => {
+    toRemoveEventListeners.forEach((fn) => fn());
+    toRemoveEventListeners.length = 0;
+  });
 }

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");
+}