@comunica/actor-http-fetch 4.0.1-alpha.48.0 → 4.0.2

package/README.md

@@ -9,6 +9,7 @@ This module is part of the [Comunica framework](https://github.com/comunica/comu
 and should only be used by [developers that want to build their own query engine](https://comunica.dev/docs/modify/).
 
 When this actor is used, a custom fetch implementation may be provided via the context (`fetch`).
+If none is provided, the global `fetch` implementation from the runtime or a polyfill is used.
 
 [Click here if you just want to query with Comunica](https://comunica.dev/docs/query/).
 
@@ -21,14 +22,12 @@ $ yarn add @comunica/actor-http-fetch
 ## Configure
 
 After installing, this package can be added to your engine's configuration as follows:
-```text
+```json
 {
   "@context": [
-    ...
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^4.0.0/components/context.jsonld"
   ],
   "actors": [
-    ...
     {
       "@id": "urn:comunica:default:http/actors#fetch",
       "@type": "ActorHttpFetch"
@@ -39,4 +38,4 @@ After installing, this package can be added to your engine's configuration as fo
 
 ### Config Parameters
 
-* `agentOptions`: The agent JSON options for the HTTP agent. _(optional)_
+* `agentOptions`: The agent JSON options for the HTTP agent in Node.js environments. _(optional)_

package/components/ActorHttpFetch.jsonld

@@ -13,7 +13,6 @@
       "extends": [
         "cbh:components/ActorHttp.jsonld#ActorHttp"
       ],
-      "comment": "A node-fetch actor that listens on the 'init' bus.  It will call `fetch` with either action.input or action.url.",
       "parameters": [
         {
           "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_agentOptions",
@@ -148,33 +147,33 @@
         }
       ],
       "memberFields": [
-        {
-          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_userAgent",
-          "memberFieldName": "userAgent"
-        },
         {
           "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_fetchInitPreprocessor",
           "memberFieldName": "fetchInitPreprocessor"
         },
         {
-          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_constructor",
-          "memberFieldName": "constructor"
+          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_userAgent",
+          "memberFieldName": "userAgent"
         },
         {
-          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_createUserAgent",
-          "memberFieldName": "createUserAgent"
+          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_constructor",
+          "memberFieldName": "constructor"
         },
         {
           "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_test",
           "memberFieldName": "test"
         },
-        {
-          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_getResponse",
-          "memberFieldName": "getResponse"
-        },
         {
           "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_run",
           "memberFieldName": "run"
+        },
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_prepareRequestHeaders",
+          "memberFieldName": "prepareRequestHeaders"
+        },
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch__member_stringToBase64",
+          "memberFieldName": "stringToBase64"
         }
       ],
       "constructorArguments": [

package/lib/ActorHttpFetch.d.ts

@@ -2,28 +2,26 @@ import type { IActionHttp, IActorHttpOutput, IActorHttpArgs } from '@comunica/bu
 import { ActorHttp } from '@comunica/bus-http';
 import type { TestResult } from '@comunica/core';
 import type { IMediatorTypeTime } from '@comunica/mediatortype-time';
-/**
- * A node-fetch actor that listens on the 'init' bus.
- *
- * It will call `fetch` with either action.input or action.url.
- */
 export declare class ActorHttpFetch extends ActorHttp {
-    private readonly userAgent;
     private readonly fetchInitPreprocessor;
+    private static readonly userAgent;
     constructor(args: IActorHttpFetchArgs);
-    static createUserAgent(): string;
     test(_action: IActionHttp): Promise<TestResult<IMediatorTypeTime>>;
+    run(action: IActionHttp): Promise<IActorHttpOutput>;
     /**
-     * Perform a fetch request, taking care of retries
-     * @param fetchFn
-     * @param requestInput Url or RequestInfo to pass to fetchFn
-     * @param requestInit RequestInit to pass to fetch function
-     * @param retryCount Maximum retries after which to abort
-     * @param retryDelay Time in milliseconds to wait between retries
-     * @returns a fetch `Response` object
+     * Prepares the request headers, taking into account the environment.
+     * @param {IActionHttp} action The HTTP action
+     * @returns {Headers} Headers
      */
-    private static getResponse;
-    run(action: IActionHttp): Promise<IActorHttpOutput>;
+    prepareRequestHeaders(action: IActionHttp): Headers;
+    /**
+     * Converts a string, including ones with Unicode symbols, to Base64 encoding.
+     * This function was adapted from the MDN example function here:
+     * https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
+     * @param {string} value The string value to encode
+     * @returns {string} The Base64-encoded value
+     */
+    static stringToBase64(value: string): string;
 }
 export interface IActorHttpFetchArgs extends IActorHttpArgs {
     /**

package/lib/ActorHttpFetch.js

@@ -4,156 +4,83 @@ exports.ActorHttpFetch = void 0;
 const bus_http_1 = require("@comunica/bus-http");
 const context_entries_1 = require("@comunica/context-entries");
 const core_1 = require("@comunica/core");
+// eslint-disable-next-line import/extensions
+const package_json_1 = require("../package.json");
 const FetchInitPreprocessor_1 = require("./FetchInitPreprocessor");
-/**
- * A node-fetch actor that listens on the 'init' bus.
- *
- * It will call `fetch` with either action.input or action.url.
- */
 class ActorHttpFetch extends bus_http_1.ActorHttp {
     constructor(args) {
         super(args);
-        this.userAgent = ActorHttpFetch.createUserAgent();
         this.fetchInitPreprocessor = new FetchInitPreprocessor_1.FetchInitPreprocessor(args.agentOptions);
     }
-    static createUserAgent() {
-        return `Comunica/actor-http-fetch (${typeof globalThis.navigator === 'undefined' ?
-            `Node.js ${process.version}; ${process.platform}` :
-            `Browser-${globalThis.navigator.userAgent}`})`;
-    }
     async test(_action) {
         return (0, core_1.passTest)({ time: Number.POSITIVE_INFINITY });
     }
-    /**
-     * Perform a fetch request, taking care of retries
-     * @param fetchFn
-     * @param requestInput Url or RequestInfo to pass to fetchFn
-     * @param requestInit RequestInit to pass to fetch function
-     * @param retryCount Maximum retries after which to abort
-     * @param retryDelay Time in milliseconds to wait between retries
-     * @returns a fetch `Response` object
-     */
-    static async getResponse(fetchFn, requestInput, requestInit, retryCount, retryDelay, throwOnServerError) {
-        let lastError;
-        // The retryCount is 0-based. Therefore, add 1 to triesLeft.
-        let triesLeft = retryCount + 1;
-        // When retry count is greater than 0, repeat fetch.
-        while (triesLeft-- > 0) {
-            try {
-                const response = await fetchFn(requestInput, requestInit);
-                // Check, if server sent a 5xx error response.
-                if (throwOnServerError && response.status >= 500 && response.status < 600) {
-                    throw new Error(`Server replied with response code ${response.status}: ${response.statusText}`);
-                }
-                return response;
-            }
-            catch (error) {
-                lastError = error;
-                // If the fetch was aborted by timeout, we won't retry.
-                if (requestInit.signal?.aborted) {
-                    throw error;
-                }
-                if (triesLeft > 0) {
-                    // Wait for specified delay, before retrying.
-                    await new Promise((resolve, reject) => {
-                        setTimeout(resolve, retryDelay);
-                        // Cancel waiting, if timeout is reached.
-                        requestInit.signal?.addEventListener('abort', () => {
-                            reject(new Error('Fetch aborted by timeout.'));
-                        });
-                    });
-                }
-            }
-        }
-        // The fetch was not successful. We throw.
-        if (retryCount > 0) {
-            // Feedback the last error, if there were retry attempts.
-            throw new Error(`Number of fetch retries (${retryCount}) exceeded. Last error: ${String(lastError)}`);
-        }
-        else {
-            throw lastError;
-        }
-    }
     async run(action) {
-        // Prepare headers
-        const headers = new Headers(action.init?.headers);
-        if (!headers.has('User-Agent')) {
-            headers.set('User-Agent', this.userAgent);
-        }
-        const authString = action.context.get(context_entries_1.KeysHttp.auth);
-        if (authString) {
-            headers.set('Authorization', `Basic ${Buffer.from(authString).toString('base64')}`);
-        }
-        action.init = { ...action.init, headers };
-        // Log request
-        this.logInfo(action.context, `Requesting ${typeof action.input === 'string' ?
-            action.input :
-            action.input.url}`, () => ({
+        const headers = this.prepareRequestHeaders(action);
+        const init = { method: 'GET', ...action.init, headers };
+        this.logInfo(action.context, `Requesting ${bus_http_1.ActorHttp.getInputUrl(action.input).href}`, () => ({
             headers: bus_http_1.ActorHttp.headersToHash(headers),
-            method: action.init.method ?? 'GET',
+            method: init.method,
         }));
         // TODO: remove this workaround once this has a fix: https://github.com/inrupt/solid-client-authn-js/issues/1708
-        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(headers);
+        if (action.context.has(context_entries_1.KeysHttp.fetch)) {
+            init.headers = bus_http_1.ActorHttp.headersToHash(headers);
         }
-        let requestInit = { ...action.init };
         if (action.context.get(context_entries_1.KeysHttp.includeCredentials)) {
-            requestInit.credentials = 'include';
+            init.credentials = 'include';
         }
-        const httpTimeout = action.context?.get(context_entries_1.KeysHttp.httpTimeout);
-        let requestTimeout;
-        let onTimeout;
-        if (httpTimeout !== undefined) {
-            const controller = new AbortController();
-            requestInit.signal = controller.signal;
-            onTimeout = () => controller.abort();
-            requestTimeout = setTimeout(() => onTimeout(), httpTimeout);
+        const httpTimeout = action.context.get(context_entries_1.KeysHttp.httpTimeout);
+        const httpBodyTimeout = action.context.get(context_entries_1.KeysHttp.httpBodyTimeout);
+        const fetchFunction = action.context.get(context_entries_1.KeysHttp.fetch) ?? fetch;
+        const requestInit = await this.fetchInitPreprocessor.handle(init);
+        let timeoutCallback;
+        let timeoutHandle;
+        if (httpTimeout) {
+            const abortController = new AbortController();
+            requestInit.signal = abortController.signal;
+            timeoutCallback = () => abortController.abort(new Error(`Fetch timed out for ${bus_http_1.ActorHttp.getInputUrl(action.input).href} after ${httpTimeout} ms`));
+            timeoutHandle = setTimeout(() => timeoutCallback(), httpTimeout);
         }
-        try {
-            requestInit = await this.fetchInitPreprocessor.handle(requestInit);
-            // Number of retries to perform after a failed fetch.
-            const retryCount = action.context?.get(context_entries_1.KeysHttp.httpRetryCount) ?? 0;
-            const retryDelay = action.context?.get(context_entries_1.KeysHttp.httpRetryDelay) ?? 0;
-            const retryOnSeverError = action.context?.get(context_entries_1.KeysHttp.httpRetryOnServerError) ?? false;
-            const customFetch = action
-                .context?.get(context_entries_1.KeysHttp.fetch);
-            // Execute the fetch (with retries and timeouts, if applicable).
-            const response = await ActorHttpFetch.getResponse(customFetch ?? fetch, action.input, requestInit, retryCount, retryDelay, retryOnSeverError);
-            // We remove or update the timeout
-            if (requestTimeout !== undefined) {
-                const httpBodyTimeout = action.context?.get(context_entries_1.KeysHttp.httpBodyTimeout) ?? false;
-                if (httpBodyTimeout && response.body) {
-                    // eslint-disable-next-line ts/no-misused-promises
-                    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;
+        const response = await fetchFunction(action.input, requestInit);
+        if (httpTimeout && (!httpBodyTimeout || !response.body)) {
+            clearTimeout(timeoutHandle);
         }
-        catch (error) {
-            if (requestTimeout !== undefined) {
-                clearTimeout(requestTimeout);
-            }
-            throw error;
+        return response;
+    }
+    /**
+     * Prepares the request headers, taking into account the environment.
+     * @param {IActionHttp} action The HTTP action
+     * @returns {Headers} Headers
+     */
+    prepareRequestHeaders(action) {
+        const headers = new Headers(action.init?.headers);
+        if (bus_http_1.ActorHttp.isBrowser()) {
+            // When running in a browser, the User-Agent header should never be set
+            headers.delete('user-agent');
+        }
+        else if (!headers.has('user-agent')) {
+            // Otherwise, if no header value is provided, use the actor one
+            headers.set('user-agent', ActorHttpFetch.userAgent);
         }
+        const authString = action.context.get(context_entries_1.KeysHttp.auth);
+        if (authString) {
+            headers.set('Authorization', `Basic ${ActorHttpFetch.stringToBase64(authString)}`);
+        }
+        return headers;
+    }
+    /**
+     * Converts a string, including ones with Unicode symbols, to Base64 encoding.
+     * This function was adapted from the MDN example function here:
+     * https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
+     * @param {string} value The string value to encode
+     * @returns {string} The Base64-encoded value
+     */
+    static stringToBase64(value) {
+        const bytes = new TextEncoder().encode(value);
+        const binString = Array.from(bytes, byte => String.fromCodePoint(byte)).join('');
+        return btoa(binString);
     }
 }
 exports.ActorHttpFetch = ActorHttpFetch;
+ActorHttpFetch.userAgent = bus_http_1.ActorHttp.createUserAgent('ActorHttpFetch', package_json_1.version);
 //# sourceMappingURL=ActorHttpFetch.js.map

package/lib/ActorHttpFetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActorHttpFetch.js","sourceRoot":"","sources":["ActorHttpFetch.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IActionHttp, IActorHttpOutput, IActorHttpArgs } from '@comunica/bus-http';\nimport { ActorHttp } from '@comunica/bus-http';\nimport { KeysHttp } from '@comunica/context-entries';\nimport type { TestResult } from '@comunica/core';\nimport { passTest } from '@comunica/core';\nimport type { IMediatorTypeTime } from '@comunica/mediatortype-time';\nimport type { Readable } from 'readable-stream';\nimport { FetchInitPreprocessor } from './FetchInitPreprocessor';\nimport type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';\n\n/**\n * A node-fetch actor that listens on the 'init' bus.\n *\n * It will call `fetch` with either action.input or action.url.\n */\nexport class ActorHttpFetch extends ActorHttp {\n  private readonly userAgent: string;\n  private readonly fetchInitPreprocessor: IFetchInitPreprocessor;\n\n  public constructor(args: IActorHttpFetchArgs) {\n    super(args);\n    this.userAgent = ActorHttpFetch.createUserAgent();\n    this.fetchInitPreprocessor = new FetchInitPreprocessor(args.agentOptions);\n  }\n\n  public static createUserAgent(): string {\n    return `Comunica/actor-http-fetch (${typeof globalThis.navigator === 'undefined' ?\n      `Node.js ${process.version}; ${process.platform}` :\n      `Browser-${globalThis.navigator.userAgent}`})`;\n  }\n\n  public async test(_action: IActionHttp): Promise<TestResult<IMediatorTypeTime>> {\n    return passTest({ time: Number.POSITIVE_INFINITY });\n  }\n\n  /**\n   * Perform a fetch request, taking care of retries\n   * @param fetchFn\n   * @param requestInput Url or RequestInfo to pass to fetchFn\n   * @param requestInit RequestInit to pass to fetch function\n   * @param retryCount Maximum retries after which to abort\n   * @param retryDelay Time in milliseconds to wait between retries\n   * @returns a fetch `Response` object\n   */\n  private static async getResponse(\n    fetchFn: (input: RequestInfo | URL, init?: RequestInit | undefined) => Promise<Response>,\n    requestInput: RequestInfo | URL,\n    requestInit: RequestInit,\n    retryCount: number,\n    retryDelay: number,\n    throwOnServerError: boolean,\n  ): Promise<Response> {\n    let lastError: unknown;\n    // The retryCount is 0-based. Therefore, add 1 to triesLeft.\n    let triesLeft = retryCount + 1;\n\n    // When retry count is greater than 0, repeat fetch.\n    while (triesLeft-- > 0) {\n      try {\n        const response = await fetchFn(requestInput, requestInit);\n        // Check, if server sent a 5xx error response.\n        if (throwOnServerError && response.status >= 500 && response.status < 600) {\n          throw new Error(`Server replied with response code ${response.status}: ${response.statusText}`);\n        }\n        return response;\n      } catch (error: unknown) {\n        lastError = error;\n        // If the fetch was aborted by timeout, we won't retry.\n        if (requestInit.signal?.aborted) {\n          throw error;\n        }\n\n        if (triesLeft > 0) {\n          // Wait for specified delay, before retrying.\n          await new Promise((resolve, reject) => {\n            setTimeout(resolve, retryDelay);\n            // Cancel waiting, if timeout is reached.\n            requestInit.signal?.addEventListener('abort', () => {\n              reject(new Error('Fetch aborted by timeout.'));\n            });\n          });\n        }\n      }\n    }\n    // The fetch was not successful. We throw.\n    if (retryCount > 0) {\n      // Feedback the last error, if there were retry attempts.\n      throw new Error(`Number of fetch retries (${retryCount}) exceeded. Last error: ${String(lastError)}`);\n    } else {\n      throw lastError;\n    }\n  }\n\n  public async run(action: IActionHttp): Promise<IActorHttpOutput> {\n    // Prepare headers\n    const headers = new Headers(action.init?.headers);\n    if (!headers.has('User-Agent')) {\n      headers.set('User-Agent', this.userAgent);\n    }\n    const authString = action.context.get<string>(KeysHttp.auth);\n    if (authString) {\n      headers.set('Authorization', `Basic ${Buffer.from(authString).toString('base64')}`);\n    }\n    action.init = { ...action.init, headers };\n\n    // Log request\n    this.logInfo(action.context, `Requesting ${typeof action.input === 'string' ?\n      action.input :\n      action.input.url}`, () => ({\n      headers: ActorHttp.headersToHash(headers),\n      method: action.init!.method ?? 'GET',\n    }));\n\n    // TODO: remove this workaround once this has a fix: https://github.com/inrupt/solid-client-authn-js/issues/1708\n    if (action.init?.headers && 'append' in action.init.headers && action.context.has(KeysHttp.fetch)) {\n      action.init.headers = ActorHttp.headersToHash(headers);\n    }\n\n    let requestInit: RequestInit = { ...action.init };\n\n    if (action.context.get(KeysHttp.includeCredentials)) {\n      requestInit.credentials = 'include';\n    }\n\n    const httpTimeout: number | undefined = action.context?.get(KeysHttp.httpTimeout);\n    let requestTimeout: NodeJS.Timeout | undefined;\n    let onTimeout: (() => void) | undefined;\n    if (httpTimeout !== undefined) {\n      const controller = new AbortController();\n      requestInit.signal = controller.signal;\n      onTimeout = () => controller.abort();\n      requestTimeout = setTimeout(() => onTimeout!(), httpTimeout);\n    }\n\n    try {\n      requestInit = await this.fetchInitPreprocessor.handle(requestInit);\n      // Number of retries to perform after a failed fetch.\n      const retryCount: number = action.context?.get(KeysHttp.httpRetryCount) ?? 0;\n      const retryDelay: number = action.context?.get(KeysHttp.httpRetryDelay) ?? 0;\n      const retryOnSeverError: boolean = action.context?.get(KeysHttp.httpRetryOnServerError) ?? false;\n      const customFetch: ((input: RequestInfo | URL, init?: RequestInit) => Promise<Response>) | undefined = action\n        .context?.get(KeysHttp.fetch);\n\n      // Execute the fetch (with retries and timeouts, if applicable).\n      const response = await ActorHttpFetch.getResponse(\n        customFetch ?? fetch,\n        action.input,\n        requestInit,\n        retryCount,\n        retryDelay,\n        retryOnSeverError,\n      );\n\n      // We remove or update the timeout\n      if (requestTimeout !== undefined) {\n        const httpBodyTimeout = action.context?.get(KeysHttp.httpBodyTimeout) ?? false;\n        if (httpBodyTimeout && response.body) {\n          // eslint-disable-next-line ts/no-misused-promises\n          onTimeout = () => response.body?.cancel(new Error(`HTTP timeout when reading the body of ${response.url}.\nThis error can be disabled by modifying the 'httpBodyTimeout' and/or 'httpTimeout' options.`));\n          (<Readable><any>response.body).on('close', () => {\n            clearTimeout(requestTimeout);\n          });\n        } else {\n          clearTimeout(requestTimeout);\n        }\n      }\n\n      // Node-fetch does not support body.cancel, while it is mandatory according to the fetch and readablestream api.\n      // If it doesn't exist, we monkey-patch it.\n      if (response.body && !response.body.cancel) {\n        response.body.cancel = async(error?: Error) => {\n          (<Readable><any>response.body).destroy(error);\n          if (requestTimeout !== undefined) {\n            // We make sure to remove the timeout if it is still enabled\n            clearTimeout(requestTimeout);\n          }\n        };\n      }\n\n      return response;\n    } catch (error: unknown) {\n      if (requestTimeout !== undefined) {\n        clearTimeout(requestTimeout);\n      }\n      throw error;\n    }\n  }\n}\n\nexport interface IActorHttpFetchArgs extends IActorHttpArgs {\n  /**\n   * The agent options for the HTTP agent\n   * @range {json}\n   * @default {{ \"keepAlive\": true, \"maxSockets\": 5 }}\n   */\n  agentOptions?: Record<string, any>;\n}\n"]}
+{"version":3,"file":"ActorHttpFetch.js","sourceRoot":"","sources":["ActorHttpFetch.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IActionHttp, IActorHttpOutput, IActorHttpArgs } from '@comunica/bus-http';\nimport { ActorHttp } from '@comunica/bus-http';\nimport { KeysHttp } from '@comunica/context-entries';\nimport type { TestResult } from '@comunica/core';\nimport { passTest } from '@comunica/core';\nimport type { IMediatorTypeTime } from '@comunica/mediatortype-time';\n\n// eslint-disable-next-line import/extensions\nimport { version as actorVersion } from '../package.json';\n\nimport { FetchInitPreprocessor } from './FetchInitPreprocessor';\nimport type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';\n\nexport class ActorHttpFetch extends ActorHttp {\n  private readonly fetchInitPreprocessor: IFetchInitPreprocessor;\n\n  private static readonly userAgent = ActorHttp.createUserAgent('ActorHttpFetch', actorVersion);\n\n  public constructor(args: IActorHttpFetchArgs) {\n    super(args);\n    this.fetchInitPreprocessor = new FetchInitPreprocessor(args.agentOptions);\n  }\n\n  public async test(_action: IActionHttp): Promise<TestResult<IMediatorTypeTime>> {\n    return passTest({ time: Number.POSITIVE_INFINITY });\n  }\n\n  public async run(action: IActionHttp): Promise<IActorHttpOutput> {\n    const headers = this.prepareRequestHeaders(action);\n\n    const init: RequestInit = { method: 'GET', ...action.init, headers };\n\n    this.logInfo(action.context, `Requesting ${ActorHttp.getInputUrl(action.input).href}`, () => ({\n      headers: ActorHttp.headersToHash(headers),\n      method: init.method,\n    }));\n\n    // TODO: remove this workaround once this has a fix: https://github.com/inrupt/solid-client-authn-js/issues/1708\n    if (action.context.has(KeysHttp.fetch)) {\n      init.headers = ActorHttp.headersToHash(headers);\n    }\n\n    if (action.context.get(KeysHttp.includeCredentials)) {\n      init.credentials = 'include';\n    }\n\n    const httpTimeout = action.context.get(KeysHttp.httpTimeout);\n    const httpBodyTimeout = action.context.get(KeysHttp.httpBodyTimeout);\n    const fetchFunction = action.context.get(KeysHttp.fetch) ?? fetch;\n    const requestInit = await this.fetchInitPreprocessor.handle(init);\n\n    let timeoutCallback: () => void;\n    let timeoutHandle: NodeJS.Timeout | undefined;\n\n    if (httpTimeout) {\n      const abortController = new AbortController();\n      requestInit.signal = abortController.signal;\n      timeoutCallback = () => abortController.abort(new Error(`Fetch timed out for ${ActorHttp.getInputUrl(action.input).href} after ${httpTimeout} ms`));\n      timeoutHandle = setTimeout(() => timeoutCallback(), httpTimeout);\n    }\n\n    const response = await fetchFunction(action.input, requestInit);\n\n    if (httpTimeout && (!httpBodyTimeout || !response.body)) {\n      clearTimeout(timeoutHandle);\n    }\n\n    return response;\n  }\n\n  /**\n   * Prepares the request headers, taking into account the environment.\n   * @param {IActionHttp} action The HTTP action\n   * @returns {Headers} Headers\n   */\n  public prepareRequestHeaders(action: IActionHttp): Headers {\n    const headers = new Headers(action.init?.headers);\n\n    if (ActorHttp.isBrowser()) {\n      // When running in a browser, the User-Agent header should never be set\n      headers.delete('user-agent');\n    } else if (!headers.has('user-agent')) {\n      // Otherwise, if no header value is provided, use the actor one\n      headers.set('user-agent', ActorHttpFetch.userAgent!);\n    }\n\n    const authString = action.context.get(KeysHttp.auth);\n    if (authString) {\n      headers.set('Authorization', `Basic ${ActorHttpFetch.stringToBase64(authString)}`);\n    }\n\n    return headers;\n  }\n\n  /**\n   * Converts a string, including ones with Unicode symbols, to Base64 encoding.\n   * This function was adapted from the MDN example function here:\n   * https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem\n   * @param {string} value The string value to encode\n   * @returns {string} The Base64-encoded value\n   */\n  public static stringToBase64(value: string): string {\n    const bytes = new TextEncoder().encode(value);\n    const binString = Array.from(bytes, byte => String.fromCodePoint(byte)).join('');\n    return btoa(binString);\n  }\n}\n\nexport interface IActorHttpFetchArgs extends IActorHttpArgs {\n  /**\n   * The agent options for the HTTP agent\n   * @range {json}\n   * @default {{ \"keepAlive\": true, \"maxSockets\": 5 }}\n   */\n  agentOptions?: Record<string, any>;\n}\n"]}

package/lib/FetchInitPreprocessor-browser.js

@@ -1,24 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FetchInitPreprocessor = void 0;
-const bus_http_1 = require("@comunica/bus-http");
 /**
  * Overrides things for fetch requests in browsers
  */
 class FetchInitPreprocessor {
     async handle(init) {
-        // Remove overridden user-agent header within browsers to avoid CORS issues
-        if (init.headers) {
-            const headers = new Headers(init.headers);
-            if (headers.has('user-agent')) {
-                headers.delete('user-agent');
-            }
-            init.headers = headers;
-        }
-        // TODO: remove this workaround once this has a fix: https://github.com/inrupt/solid-client-authn-js/issues/1708
-        if (init?.headers && 'append' in init.headers) {
-            init.headers = bus_http_1.ActorHttp.headersToHash(init.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
@@ -37,7 +24,7 @@ class FetchInitPreprocessor {
             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 };
+        return { ...init, keepalive: !init.body };
     }
 }
 exports.FetchInitPreprocessor = FetchInitPreprocessor;

package/lib/FetchInitPreprocessor-browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"FetchInitPreprocessor-browser.js","sourceRoot":"","sources":["FetchInitPreprocessor-browser.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAG/C;;GAEG;AACH,MAAa,qBAAqB;IACzB,KAAK,CAAC,MAAM,CAAC,IAAiB;QACnC,2EAA2E;QAC3E,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC9B,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC/B,CAAC;YACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,CAAC;QAED,gHAAgH;QAChH,IAAI,IAAI,EAAE,OAAO,IAAI,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC9C,IAAI,CAAC,OAAO,GAAG,oBAAS,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvD,CAAC;QAED,6EAA6E;QAC7E,+DAA+D;QAC/D,uDAAuD;QACvD,qDAAqD;QACrD,oEAAoE;QACpE,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,EAAE,CAAC;YAElB,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM;gBACR,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;YACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9B,CAAC;QAED,0GAA0G;QAC1G,OAAO,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;IAC5C,CAAC;CACF;AAtCD,sDAsCC","sourcesContent":["import { ActorHttp } from '@comunica/bus-http';\nimport type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';\n\n/**\n * Overrides things for fetch requests in browsers\n */\nexport class FetchInitPreprocessor implements IFetchInitPreprocessor {\n  public async handle(init: RequestInit): Promise<RequestInit> {\n    // Remove overridden user-agent header within browsers to avoid CORS issues\n    if (init.headers) {\n      const headers = new Headers(init.headers);\n      if (headers.has('user-agent')) {\n        headers.delete('user-agent');\n      }\n      init.headers = headers;\n    }\n\n    // TODO: remove this workaround once this has a fix: https://github.com/inrupt/solid-client-authn-js/issues/1708\n    if (init?.headers && 'append' in init.headers) {\n      init.headers = ActorHttp.headersToHash(init.headers);\n    }\n\n    // Browsers don't yet support passing ReadableStream as body to requests, see\n    // https://bugs.chromium.org/p/chromium/issues/detail?id=688906\n    // https://bugzilla.mozilla.org/show_bug.cgi?id=1387483\n    // As such, we convert those bodies to a plain string\n    // TODO: remove this once browser support ReadableStream in requests\n    if (init.body && typeof init.body !== 'string' && 'getReader' in init.body) {\n      const reader = init.body.getReader();\n      const chunks = [];\n\n      while (true) {\n        const { done, value } = await reader.read();\n        if (done) {\n          break;\n        }\n        chunks.push(value);\n      }\n      init.body = chunks.join('');\n    }\n\n    // Only enable keepalive functionality if we are not sending a body (some browsers seem to trip over this)\n    return { keepalive: !init.body, ...init };\n  }\n}\n"]}
+{"version":3,"file":"FetchInitPreprocessor-browser.js","sourceRoot":"","sources":["FetchInitPreprocessor-browser.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,qBAAqB;IACzB,KAAK,CAAC,MAAM,CAAC,IAAiB;QACnC,6EAA6E;QAC7E,+DAA+D;QAC/D,uDAAuD;QACvD,qDAAqD;QACrD,oEAAoE;QACpE,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,EAAE,CAAC;YAElB,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM;gBACR,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;YACD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9B,CAAC;QAED,0GAA0G;QAC1G,OAAO,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC;CACF;AAxBD,sDAwBC","sourcesContent":["import type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';\n\n/**\n * Overrides things for fetch requests in browsers\n */\nexport class FetchInitPreprocessor implements IFetchInitPreprocessor {\n  public async handle(init: RequestInit): Promise<RequestInit> {\n    // Browsers don't yet support passing ReadableStream as body to requests, see\n    // https://bugs.chromium.org/p/chromium/issues/detail?id=688906\n    // https://bugzilla.mozilla.org/show_bug.cgi?id=1387483\n    // As such, we convert those bodies to a plain string\n    // TODO: remove this once browser support ReadableStream in requests\n    if (init.body && typeof init.body !== 'string' && 'getReader' in init.body) {\n      const reader = init.body.getReader();\n      const chunks = [];\n\n      while (true) {\n        const { done, value } = await reader.read();\n        if (done) {\n          break;\n        }\n        chunks.push(value);\n      }\n      init.body = chunks.join('');\n    }\n\n    // Only enable keepalive functionality if we are not sending a body (some browsers seem to trip over this)\n    return { ...init, keepalive: !init.body };\n  }\n}\n"]}

package/lib/FetchInitPreprocessor.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { Agent as HttpAgent } from 'node:http';
 import type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';
 /**
  * Overrides the HTTP agent to perform better in Node.js.
@@ -5,5 +7,7 @@ import type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';
 export declare class FetchInitPreprocessor implements IFetchInitPreprocessor {
     private readonly agent;
     constructor(agentOptions: any);
-    handle(init: RequestInit): Promise<RequestInit>;
+    handle(init: RequestInit): Promise<RequestInit & {
+        agent: (url: URL) => HttpAgent;
+    }>;
 }

package/lib/FetchInitPreprocessor.js

@@ -4,7 +4,6 @@ exports.FetchInitPreprocessor = void 0;
 /* eslint-disable import/no-nodejs-modules */
 const node_http_1 = require("node:http");
 const node_https_1 = require("node:https");
-const bus_http_1 = require("@comunica/bus-http");
 /**
  * Overrides the HTTP agent to perform better in Node.js.
  */
@@ -15,29 +14,21 @@ class FetchInitPreprocessor {
         this.agent = (_parsedURL) => _parsedURL.protocol === 'http:' ? httpAgent : httpsAgent;
     }
     async handle(init) {
-        // Convert body Web stream to Node stream, as node-fetch does not support Web streams
-        let halfDuplex = false;
-        if (init.body && typeof init.body !== 'string' && 'getReader' in init.body) {
-            init.body = bus_http_1.ActorHttp.toNodeReadable(init.body);
-            // The Fetch API requires specific options to be set when sending body streams:
-            // - 'keepalive' can not be true
-            // - 'duplex' must be set to 'half'
-            halfDuplex = true;
-        }
         // Add 'Accept-Encoding' headers
         const headers = new Headers(init.headers);
         if (!headers.has('Accept-Encoding')) {
             headers.set('Accept-Encoding', 'br,gzip,deflate');
             init = { ...init, headers };
         }
+        // The Fetch API requires specific options to be set when sending body streams:
+        // - 'keepalive' can not be true
+        // - 'duplex' must be set to 'half'
         return {
             ...init,
+            ...init.body ? { keepalive: false, duplex: 'half' } : { keepalive: true },
             agent: this.agent,
-            keepalive: halfDuplex ? undefined : true,
-            duplex: halfDuplex ? 'half' : undefined,
         };
     }
 }
 exports.FetchInitPreprocessor = FetchInitPreprocessor;
-/* eslint-enable import/no-nodejs-modules */
 //# sourceMappingURL=FetchInitPreprocessor.js.map

package/lib/FetchInitPreprocessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"FetchInitPreprocessor.js","sourceRoot":"","sources":["FetchInitPreprocessor.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,yCAA+C;AAC/C,2CAAiD;AACjD,iDAA+C;AAG/C;;GAEG;AACH,MAAa,qBAAqB;IAGhC,YAAmB,YAAiB;QAClC,MAAM,SAAS,GAAG,IAAI,iBAAS,CAAC,YAAY,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAI,kBAAU,CAAC,YAAY,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,GAAG,CAAC,UAAe,EAAa,EAAE,CAAC,UAAU,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;IACxG,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,IAAiB;QACnC,qFAAqF;QACrF,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,IAAU,IAAI,CAAC,IAAI,EAAE,CAAC;YACjF,IAAI,CAAC,IAAI,GAAS,oBAAS,CAAC,cAAc,CAAO,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5D,+EAA+E;YAC/E,gCAAgC;YAChC,mCAAmC;YACnC,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;QAED,gCAAgC;QAChC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;YAClD,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC;QAC9B,CAAC;QAED,OAAa;YACX,GAAG,IAAI;YACP,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;YACxC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;SACxC,CAAC;IACJ,CAAC;CACF;AAlCD,sDAkCC;AACD,4CAA4C","sourcesContent":["/* eslint-disable import/no-nodejs-modules */\nimport { Agent as HttpAgent } from 'node:http';\nimport { Agent as HttpsAgent } from 'node:https';\nimport { ActorHttp } from '@comunica/bus-http';\nimport type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';\n\n/**\n * Overrides the HTTP agent to perform better in Node.js.\n */\nexport class FetchInitPreprocessor implements IFetchInitPreprocessor {\n  private readonly agent: (url: URL) => HttpAgent;\n\n  public constructor(agentOptions: any) {\n    const httpAgent = new HttpAgent(agentOptions);\n    const httpsAgent = new HttpsAgent(agentOptions);\n    this.agent = (_parsedURL: URL): HttpAgent => _parsedURL.protocol === 'http:' ? httpAgent : httpsAgent;\n  }\n\n  public async handle(init: RequestInit): Promise<RequestInit> {\n    // Convert body Web stream to Node stream, as node-fetch does not support Web streams\n    let halfDuplex = false;\n    if (init.body && typeof init.body !== 'string' && 'getReader' in <any> init.body) {\n      init.body = <any> ActorHttp.toNodeReadable(<any> init.body);\n      // The Fetch API requires specific options to be set when sending body streams:\n      // - 'keepalive' can not be true\n      // - 'duplex' must be set to 'half'\n      halfDuplex = true;\n    }\n\n    // Add 'Accept-Encoding' headers\n    const headers = new Headers(init.headers);\n    if (!headers.has('Accept-Encoding')) {\n      headers.set('Accept-Encoding', 'br,gzip,deflate');\n      init = { ...init, headers };\n    }\n\n    return <any> {\n      ...init,\n      agent: this.agent,\n      keepalive: halfDuplex ? undefined : true,\n      duplex: halfDuplex ? 'half' : undefined,\n    };\n  }\n}\n/* eslint-enable import/no-nodejs-modules */\n"]}
+{"version":3,"file":"FetchInitPreprocessor.js","sourceRoot":"","sources":["FetchInitPreprocessor.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,yCAA+C;AAC/C,2CAAiD;AAKjD;;GAEG;AACH,MAAa,qBAAqB;IAGhC,YAAmB,YAAiB;QAClC,MAAM,SAAS,GAAG,IAAI,iBAAS,CAAC,YAAY,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAI,kBAAU,CAAC,YAAY,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,GAAG,CAAC,UAAe,EAAa,EAAE,CAAC,UAAU,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;IACxG,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,IAAiB;QACnC,gCAAgC;QAChC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;YAClD,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC;QAC9B,CAAC;QAED,+EAA+E;QAC/E,gCAAgC;QAChC,mCAAmC;QACnC,OAAO;YACL,GAAG,IAAI;YACP,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE;YACzE,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;IACJ,CAAC;CACF;AA1BD,sDA0BC","sourcesContent":["/* eslint-disable import/no-nodejs-modules */\nimport { Agent as HttpAgent } from 'node:http';\nimport { Agent as HttpsAgent } from 'node:https';\n\n/* eslint-enable import/no-nodejs-modules */\nimport type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';\n\n/**\n * Overrides the HTTP agent to perform better in Node.js.\n */\nexport class FetchInitPreprocessor implements IFetchInitPreprocessor {\n  private readonly agent: (url: URL) => HttpAgent;\n\n  public constructor(agentOptions: any) {\n    const httpAgent = new HttpAgent(agentOptions);\n    const httpsAgent = new HttpsAgent(agentOptions);\n    this.agent = (_parsedURL: URL): HttpAgent => _parsedURL.protocol === 'http:' ? httpAgent : httpsAgent;\n  }\n\n  public async handle(init: RequestInit): Promise<RequestInit & { agent: (url: URL) => HttpAgent }> {\n    // Add 'Accept-Encoding' headers\n    const headers = new Headers(init.headers);\n    if (!headers.has('Accept-Encoding')) {\n      headers.set('Accept-Encoding', 'br,gzip,deflate');\n      init = { ...init, headers };\n    }\n\n    // The Fetch API requires specific options to be set when sending body streams:\n    // - 'keepalive' can not be true\n    // - 'duplex' must be set to 'half'\n    return {\n      ...init,\n      ...init.body ? { keepalive: false, duplex: 'half' } : { keepalive: true },\n      agent: this.agent,\n    };\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comunica/actor-http-fetch",
-  "version": "4.0.1-alpha.48.0",
-  "description": "A node-fetch http actor",
+  "version": "4.0.2",
+  "description": "A fetch http actor",
   "lsd:module": true,
   "license": "MIT",
   "funding": {
@@ -39,13 +39,13 @@
     "build:components": "componentsjs-generator"
   },
   "dependencies": {
-    "@comunica/bus-http": "4.0.1-alpha.48.0",
-    "@comunica/context-entries": "4.0.1-alpha.48.0",
-    "@comunica/core": "4.0.1-alpha.48.0",
-    "@comunica/mediatortype-time": "4.0.1-alpha.48.0"
+    "@comunica/bus-http": "^4.0.2",
+    "@comunica/context-entries": "^4.0.2",
+    "@comunica/core": "^4.0.2",
+    "@comunica/mediatortype-time": "^4.0.2"
   },
   "browser": {
     "./lib/FetchInitPreprocessor.js": "./lib/FetchInitPreprocessor-browser.js"
   },
-  "gitHead": "4cc37905eab2c94a2e1d9cee0f51c53604f07da1"
+  "gitHead": "b60deab76821557f8d027208ab743d3c66fc60ea"
 }