@comunica/actor-http-fetch 2.2.1 → 2.2.2-alpha.13.0

package/lib/ActorHttpFetch.js

@@ -47,22 +47,58 @@ class ActorHttpFetch extends bus_http_1.ActorHttp {
         if (action.init?.headers && 'append' in action.init.headers && action.context.has(context_entries_1.KeysHttp.fetch)) {
             action.init.headers = bus_http_1.ActorHttp.headersToHash(action.init.headers);
         }
-        // Perform request
-        const customFetch = action
-            .context?.get(context_entries_1.KeysHttp.fetch);
-        return await (customFetch || fetch)(action.input, await this.fetchInitPreprocessor.handle({
-            ...action.init,
-            ...action.context.get(context_entries_1.KeysHttp.includeCredentials) ? { credentials: 'include' } : {},
-        })).then(response => {
+        let requestInit = { ...action.init };
+        if (action.context.get(context_entries_1.KeysHttp.includeCredentials)) {
+            requestInit.credentials = 'include';
+        }
+        const httpTimeout = action.context?.get(context_entries_1.KeysHttp.httpTimeout);
+        let requestTimeout;
+        let onTimeout;
+        if (httpTimeout !== undefined) {
+            const controller = await this.fetchInitPreprocessor.createAbortController();
+            requestInit.signal = controller.signal;
+            onTimeout = () => controller.abort();
+            requestTimeout = setTimeout(() => onTimeout(), httpTimeout);
+        }
+        try {
+            requestInit = await this.fetchInitPreprocessor.handle(requestInit);
+            // Perform request
+            const customFetch = action
+                .context?.get(context_entries_1.KeysHttp.fetch);
+            const response = await (customFetch || fetch)(action.input, requestInit);
+            // We remove or update the timeout
+            if (requestTimeout !== undefined) {
+                const httpBodyTimeout = action.context?.get(context_entries_1.KeysHttp.httpBodyTimeout) || false;
+                if (httpBodyTimeout && response.body) {
+                    onTimeout = () => response.body?.cancel(new Error(`HTTP timeout when reading the body of ${response.url}.
+This error can be disabled by modifying the 'httpBodyTimeout' and/or 'httpTimeout' options.`));
+                    response.body.on('close', () => {
+                        clearTimeout(requestTimeout);
+                    });
+                }
+                else {
+                    clearTimeout(requestTimeout);
+                }
+            }
             // Node-fetch does not support body.cancel, while it is mandatory according to the fetch and readablestream api.
             // If it doesn't exist, we monkey-patch it.
             if (response.body && !response.body.cancel) {
                 response.body.cancel = async (error) => {
                     response.body.destroy(error);
+                    if (requestTimeout !== undefined) {
+                        // We make sure to remove the timeout if it is still enabled
+                        clearTimeout(requestTimeout);
+                    }
                 };
             }
             return response;
-        });
+        }
+        catch (error) {
+            if (requestTimeout !== undefined) {
+                clearTimeout(requestTimeout);
+            }
+            throw error;
+        }
     }
 }
 exports.ActorHttpFetch = ActorHttpFetch;

package/lib/FetchInitPreprocessor-browser.d.ts

@@ -4,4 +4,5 @@ import type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';
  */
 export declare class FetchInitPreprocessor implements IFetchInitPreprocessor {
     handle(init: RequestInit): Promise<RequestInit>;
+    createAbortController(): Promise<AbortController>;
 }

package/lib/FetchInitPreprocessor-browser.js

@@ -35,6 +35,9 @@ class FetchInitPreprocessor {
         // Only enable keepalive functionality if we are not sending a body (some browsers seem to trip over this)
         return { keepalive: !init.body, ...init };
     }
+    async createAbortController() {
+        return new AbortController();
+    }
 }
 exports.FetchInitPreprocessor = FetchInitPreprocessor;
 //# sourceMappingURL=FetchInitPreprocessor-browser.js.map

package/lib/FetchInitPreprocessor.d.ts

@@ -6,4 +6,5 @@ export declare class FetchInitPreprocessor implements IFetchInitPreprocessor {
     private readonly agent;
     constructor(agentOptions: any);
     handle(init: RequestInit): Promise<RequestInit>;
+    createAbortController(): Promise<AbortController>;
 }

package/lib/FetchInitPreprocessor.js

@@ -20,6 +20,12 @@ class FetchInitPreprocessor {
         }
         return { ...init, agent: this.agent };
     }
+    async createAbortController() {
+        // Fallback to abort-controller for Node 14 backward compatibility
+        /* istanbul ignore next */
+        const AbortController = global.AbortController || await Promise.resolve().then(() => require('abort-controller'));
+        return new AbortController();
+    }
 }
 exports.FetchInitPreprocessor = FetchInitPreprocessor;
 //# sourceMappingURL=FetchInitPreprocessor.js.map

package/lib/IFetchInitPreprocessor.d.ts

@@ -3,4 +3,5 @@
  */
 export interface IFetchInitPreprocessor {
     handle: (init: RequestInit) => Promise<RequestInit>;
+    createAbortController: () => Promise<AbortController>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-http-fetch",
-  "version": "2.2.1",
+  "version": "2.2.2-alpha.13.0",
   "description": "A node-fetch http actor",
   "lsd:module": true,
   "main": "lib/index.js",
@@ -29,10 +29,10 @@
     "lib/**/*.js"
   ],
   "dependencies": {
-    "@comunica/bus-http": "^2.2.0",
-    "@comunica/context-entries": "^2.2.0",
-    "@comunica/core": "^2.2.0",
-    "@comunica/mediatortype-time": "^2.2.0",
+    "@comunica/bus-http": "2.2.2-alpha.13.0",
+    "@comunica/context-entries": "2.2.2-alpha.13.0",
+    "@comunica/mediatortype-time": "2.2.2-alpha.13.0",
+    "abort-controller": "^3.0.0",
     "cross-fetch": "^3.0.5"
   },
   "scripts": {
@@ -43,5 +43,5 @@
   "browser": {
     "./lib/FetchInitPreprocessor.js": "./lib/FetchInitPreprocessor-browser.js"
   },
-  "gitHead": "b2a0bee9640e2bcf70492fd7c497bab3d0e14113"
+  "gitHead": "f3a79b04bcf5f96767847cc335145491ccba68ff"
 }