ropegeo-common 1.18.1 → 1.18.2

package/dist/download/helpers/downloadHttpRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"downloadHttpRequest.d.ts","sourceRoot":"","sources":["../../../src/download/helpers/downloadHttpRequest.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA6BH;;;GAGG;AACH,wBAAsB,mBAAmB,CACrC,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,QAAQ,CAAC,CAmCnB"}
+{"version":3,"file":"downloadHttpRequest.d.ts","sourceRoot":"","sources":["../../../src/download/helpers/downloadHttpRequest.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA8CH;;;GAGG;AACH,wBAAsB,mBAAmB,CACrC,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,QAAQ,CAAC,CAwCnB"}

package/dist/download/helpers/downloadHttpRequest.js

@@ -5,6 +5,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadHttpRequest = downloadHttpRequest;
+const networkRequestPolicy_1 = require("../../helpers/network/networkRequestPolicy");
 const DEFAULT_HEADERS = {
     Accept: 'application/json, text/html, application/xml, */*',
     'Accept-Language': 'en-US,en;q=0.9',
@@ -24,6 +25,20 @@ const buildNonOkMessage = async (response, requestUrl) => {
     return (`downloadHttpRequest non-OK: status=${response.status} statusText=${response.statusText} ` +
         `requestUrl=${requestUrl} finalUrl=${finalUrl} server=${server} responseBody=${bodyPreview}`);
 };
+function abortSignalAfterMs(ms) {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => {
+        if (!controller.signal.aborted) {
+            controller.abort();
+        }
+    }, ms);
+    return {
+        signal: controller.signal,
+        dispose: () => {
+            clearTimeout(timeoutId);
+        },
+    };
+}
 /**
  * Send a single HTTP request for download list/page JSON fetches.
  * Aborts when `abortSignal` fires or after 30 seconds. Throws on non-OK responses.
@@ -36,10 +51,11 @@ async function downloadHttpRequest(url, abortSignal, init) {
             : new Error(String(abortSignal.reason));
         throw new Error(`downloadHttpRequest aborted: requestUrl=${requestUrl} error=${err.message}`);
     }
-    const timeoutSignal = AbortSignal.timeout(DOWNLOAD_HTTP_REQUEST_TIMEOUT_MS);
-    const requestSignal = abortSignal != null
-        ? AbortSignal.any([abortSignal, timeoutSignal])
-        : timeoutSignal;
+    const deadline = abortSignal != null
+        ? (0, networkRequestPolicy_1.mergeParentSignalWithDeadline)(abortSignal, DOWNLOAD_HTTP_REQUEST_TIMEOUT_MS)
+        : null;
+    const timeoutOnly = deadline == null ? abortSignalAfterMs(DOWNLOAD_HTTP_REQUEST_TIMEOUT_MS) : null;
+    const requestSignal = deadline?.signal ?? timeoutOnly.signal;
     let response;
     try {
         response = await globalThis.fetch(requestUrl, {
@@ -51,6 +67,10 @@ async function downloadHttpRequest(url, abortSignal, init) {
     catch (error) {
         throw new Error(`downloadHttpRequest failed: requestUrl=${requestUrl} error=${error}`);
     }
+    finally {
+        deadline?.dispose();
+        timeoutOnly?.dispose();
+    }
     if (!response.ok) {
         throw new Error(await buildNonOkMessage(response, requestUrl));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ropegeo-common",
-    "version": "1.18.1",
+    "version": "1.18.2",
     "description": "Shared domain models and helpers for RopeGeo and WebScraper",
     "license": "ISC",
     "repository": {