@smithy/util-waiter 4.0.4 → 4.0.6

package/dist-cjs/index.js

@@ -149,15 +149,24 @@ var validateWaiterOptions = /* @__PURE__ */ __name((options) => {
 }, "validateWaiterOptions");
 
 // src/createWaiter.ts
-var abortTimeout = /* @__PURE__ */ __name(async (abortSignal) => {
-  return new Promise((resolve) => {
-    const onAbort = /* @__PURE__ */ __name(() => resolve({ state: "ABORTED" /* ABORTED */ }), "onAbort");
+var abortTimeout = /* @__PURE__ */ __name((abortSignal) => {
+  let onAbort;
+  const promise = new Promise((resolve) => {
+    onAbort = /* @__PURE__ */ __name(() => resolve({ state: "ABORTED" /* ABORTED */ }), "onAbort");
     if (typeof abortSignal.addEventListener === "function") {
       abortSignal.addEventListener("abort", onAbort);
     } else {
       abortSignal.onabort = onAbort;
     }
   });
+  return {
+    clearListener() {
+      if (typeof abortSignal.removeEventListener === "function") {
+        abortSignal.removeEventListener("abort", onAbort);
+      }
+    },
+    aborted: promise
+  };
 }, "abortTimeout");
 var createWaiter = /* @__PURE__ */ __name(async (options, input, acceptorChecks) => {
   const params = {
@@ -166,13 +175,23 @@ var createWaiter = /* @__PURE__ */ __name(async (options, input, acceptorChecks)
   };
   validateWaiterOptions(params);
   const exitConditions = [runPolling(params, input, acceptorChecks)];
-  if (options.abortController) {
-    exitConditions.push(abortTimeout(options.abortController.signal));
-  }
+  const finalize = [];
   if (options.abortSignal) {
-    exitConditions.push(abortTimeout(options.abortSignal));
+    const { aborted, clearListener } = abortTimeout(options.abortSignal);
+    finalize.push(clearListener);
+    exitConditions.push(aborted);
+  }
+  if (options.abortController?.signal) {
+    const { aborted, clearListener } = abortTimeout(options.abortController.signal);
+    finalize.push(clearListener);
+    exitConditions.push(aborted);
   }
-  return Promise.race(exitConditions);
+  return Promise.race(exitConditions).then((result) => {
+    for (const fn of finalize) {
+      fn();
+    }
+    return result;
+  });
 }, "createWaiter");
 // Annotate the CommonJS export names for ESM import in node:
 

package/dist-es/createWaiter.js

@@ -1,9 +1,10 @@
 import { runPolling } from "./poller";
 import { validateWaiterOptions } from "./utils";
 import { waiterServiceDefaults, WaiterState } from "./waiter";
-const abortTimeout = async (abortSignal) => {
-    return new Promise((resolve) => {
-        const onAbort = () => resolve({ state: WaiterState.ABORTED });
+const abortTimeout = (abortSignal) => {
+    let onAbort;
+    const promise = new Promise((resolve) => {
+        onAbort = () => resolve({ state: WaiterState.ABORTED });
         if (typeof abortSignal.addEventListener === "function") {
             abortSignal.addEventListener("abort", onAbort);
         }
@@ -11,6 +12,14 @@ const abortTimeout = async (abortSignal) => {
             abortSignal.onabort = onAbort;
         }
     });
+    return {
+        clearListener() {
+            if (typeof abortSignal.removeEventListener === "function") {
+                abortSignal.removeEventListener("abort", onAbort);
+            }
+        },
+        aborted: promise,
+    };
 };
 export const createWaiter = async (options, input, acceptorChecks) => {
     const params = {
@@ -19,11 +28,21 @@ export const createWaiter = async (options, input, acceptorChecks) => {
     };
     validateWaiterOptions(params);
     const exitConditions = [runPolling(params, input, acceptorChecks)];
-    if (options.abortController) {
-        exitConditions.push(abortTimeout(options.abortController.signal));
-    }
+    const finalize = [];
     if (options.abortSignal) {
-        exitConditions.push(abortTimeout(options.abortSignal));
+        const { aborted, clearListener } = abortTimeout(options.abortSignal);
+        finalize.push(clearListener);
+        exitConditions.push(aborted);
+    }
+    if (options.abortController?.signal) {
+        const { aborted, clearListener } = abortTimeout(options.abortController.signal);
+        finalize.push(clearListener);
+        exitConditions.push(aborted);
     }
-    return Promise.race(exitConditions);
+    return Promise.race(exitConditions).then((result) => {
+        for (const fn of finalize) {
+            fn();
+        }
+        return result;
+    });
 };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@smithy/util-waiter",
-  "version": "4.0.4",
+  "version": "4.0.6",
   "description": "Shared utilities for client waiters for the AWS SDK",
   "dependencies": {
-    "@smithy/abort-controller": "^4.0.3",
-    "@smithy/types": "^4.3.0",
+    "@smithy/abort-controller": "^4.0.4",
+    "@smithy/types": "^4.3.1",
     "tslib": "^2.6.2"
   },
   "scripts": {