@workglow/tasks 0.2.13 → 0.2.14

package/dist/node.js

@@ -263,6 +263,9 @@ import { PermanentJobError as PermanentJobError2 } from "@workglow/job-queue";
 import { lookup as dnsLookup } from "node:dns/promises";
 import { Agent, fetch as undiciFetch } from "undici";
 
+// src/util/SafeFetch.ts
+import { PermanentJobError } from "@workglow/job-queue";
+
 // src/util/UrlClassifier.ts
 import { resourcePatternMatches } from "@workglow/task-graph";
 import ipaddr from "ipaddr.js";
@@ -491,7 +494,6 @@ function urlMatchesScope(url, patterns) {
 }
 
 // src/util/SafeFetch.ts
-import { PermanentJobError } from "@workglow/job-queue";
 var MAX_REDIRECT_HOPS = 20;
 function assertAllowedUrl(url, allowPrivate, privateResourceScopes) {
   const classification = classifyUrl(url);
@@ -555,6 +557,12 @@ function safeFetch(url, options = {}) {
 
 // src/util/SafeFetch.server.ts
 var MAX_REDIRECT_HOPS2 = 20;
+function closeAgent(dispatcher) {
+  dispatcher.close?.().catch(() => {});
+}
+async function closeAgentAsync(dispatcher) {
+  await dispatcher.close?.().catch(() => {});
+}
 async function resolveAll(hostname) {
   try {
     const addrs = await dnsLookup(hostname, { all: true, verbatim: true });
@@ -626,7 +634,7 @@ async function fetchOneHop(url, opts, fetchInit) {
     });
     return { response, dispatcher };
   } catch (err) {
-    await dispatcher.close().catch(() => {});
+    await closeAgentAsync(dispatcher);
     throw err;
   }
 }
@@ -644,14 +652,14 @@ var serverSafeFetch = async (url, options) => {
   for (let hops = 0;hops <= MAX_REDIRECT_HOPS2; hops += 1) {
     const { response, dispatcher } = await fetchOneHop(currentUrl, opts, fetchInit);
     if (prevDispatcher !== undefined) {
-      prevDispatcher.close().catch(() => {});
+      closeAgent(prevDispatcher);
     }
     if (!isRedirectStatus2(response.status)) {
       const body = response.body;
       if (body !== null) {
         const { readable, writable } = new TransformStream;
         body.pipeTo(writable).finally(() => {
-          dispatcher.close().catch(() => {});
+          closeAgent(dispatcher);
         });
         return new Response(readable, {
           status: response.status,
@@ -659,20 +667,20 @@ var serverSafeFetch = async (url, options) => {
           headers: response.headers
         });
       }
-      dispatcher.close().catch(() => {});
+      closeAgent(dispatcher);
       return response;
     }
     if (requestedRedirectMode === "manual") {
-      dispatcher.close().catch(() => {});
+      closeAgent(dispatcher);
       return response;
     }
     if (requestedRedirectMode === "error") {
-      dispatcher.close().catch(() => {});
+      closeAgent(dispatcher);
       throw new TypeError(`Fetch for ${currentUrl} failed because redirect mode was set to 'error'.`);
     }
     const location = response.headers.get("location");
     if (!location) {
-      dispatcher.close().catch(() => {});
+      closeAgent(dispatcher);
       throw new PermanentJobError2(`Refusing to follow redirect from ${currentUrl}: missing Location header.`);
     }
     prevDispatcher = dispatcher;
@@ -16295,4 +16303,4 @@ export {
   ArrayTask
 };
 
-//# debugId=DA0D3A41673110B864756E2164756E21
+//# debugId=3F14772045E1F99364756E2164756E21