@comunica/actor-http-fetch 2.2.0 → 2.2.1

package/lib/ActorHttpFetch.js

@@ -24,7 +24,7 @@ class ActorHttpFetch extends bus_http_1.ActorHttp {
     async test(action) {
         return { time: Number.POSITIVE_INFINITY };
     }
-    run(action) {
+    async run(action) {
         // Prepare headers
         const initHeaders = action.init ? action.init.headers || {} : {};
         action.init = action.init ? action.init : {};
@@ -50,7 +50,7 @@ class ActorHttpFetch extends bus_http_1.ActorHttp {
         // Perform request
         const customFetch = action
             .context?.get(context_entries_1.KeysHttp.fetch);
-        return (customFetch || fetch)(action.input, this.fetchInitPreprocessor.handle({
+        return await (customFetch || fetch)(action.input, await this.fetchInitPreprocessor.handle({
             ...action.init,
             ...action.context.get(context_entries_1.KeysHttp.includeCredentials) ? { credentials: 'include' } : {},
         })).then(response => {

package/lib/FetchInitPreprocessor-browser.d.ts

@@ -1,7 +1,7 @@
 import type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';
 /**
- * Does nothing in browsers
+ * Overrides things for fetch requests in browsers
  */
 export declare class FetchInitPreprocessor implements IFetchInitPreprocessor {
-    handle(init: RequestInit): RequestInit;
+    handle(init: RequestInit): Promise<RequestInit>;
 }

package/lib/FetchInitPreprocessor-browser.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetchInitPreprocessor = void 0;
 /**
- * Does nothing in browsers
+ * Overrides things for fetch requests in browsers
  */
 class FetchInitPreprocessor {
-    handle(init) {
+    async handle(init) {
         // Remove overridden user-agent header within browsers to avoid CORS issues
         if (init.headers) {
             const headers = new Headers(init.headers);
@@ -14,6 +14,24 @@ class FetchInitPreprocessor {
             }
             init.headers = headers;
         }
+        // Browsers don't yet support passing ReadableStream as body to requests, see
+        // https://bugs.chromium.org/p/chromium/issues/detail?id=688906
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=1387483
+        // As such, we convert those bodies to a plain string
+        // TODO: remove this once browser support ReadableStream in requests
+        if (init.body && typeof init.body !== 'string' && 'getReader' in init.body) {
+            const reader = init.body.getReader();
+            const chunks = [];
+            // eslint-disable-next-line no-constant-condition
+            while (true) {
+                const { done, value } = await reader.read();
+                if (done) {
+                    break;
+                }
+                chunks.push(value);
+            }
+            init.body = chunks.join('');
+        }
         // Only enable keepalive functionality if we are not sending a body (some browsers seem to trip over this)
         return { keepalive: !init.body, ...init };
     }

package/lib/FetchInitPreprocessor.d.ts

@@ -5,5 +5,5 @@ import type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';
 export declare class FetchInitPreprocessor implements IFetchInitPreprocessor {
     private readonly agent;
     constructor(agentOptions: any);
-    handle(init: RequestInit): RequestInit;
+    handle(init: RequestInit): Promise<RequestInit>;
 }

package/lib/FetchInitPreprocessor.js

@@ -13,7 +13,7 @@ class FetchInitPreprocessor {
         const httpsAgent = new https_1.Agent(agentOptions);
         this.agent = (_parsedURL) => _parsedURL.protocol === 'http:' ? httpAgent : httpsAgent;
     }
-    handle(init) {
+    async handle(init) {
         // Convert body Web stream to Node stream, as node-fetch does not support Web streams
         if (init.body && typeof init.body !== 'string' && 'getReader' in init.body) {
             init.body = bus_http_1.ActorHttp.toNodeReadable(init.body);

package/lib/IFetchInitPreprocessor.d.ts

@@ -2,5 +2,5 @@
  * Can modify a fetch init object.
  */
 export interface IFetchInitPreprocessor {
-    handle: (init: RequestInit) => RequestInit;
+    handle: (init: RequestInit) => Promise<RequestInit>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-http-fetch",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A node-fetch http actor",
   "lsd:module": true,
   "main": "lib/index.js",
@@ -43,5 +43,5 @@
   "browser": {
     "./lib/FetchInitPreprocessor.js": "./lib/FetchInitPreprocessor-browser.js"
   },
-  "gitHead": "00d4108e46250fb94b586bfb8caf5e8b1c704160"
+  "gitHead": "b2a0bee9640e2bcf70492fd7c497bab3d0e14113"
 }