npm - @comunica/actor-http-fetch - Versions diffs - 4.5.0 → 5.0.2 - Mend

@comunica/actor-http-fetch 4.5.0 → 5.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/README.md +8 -1
package/components/ActorHttpFetch.jsonld +83 -15
package/components/components.jsonld +1 -1
package/components/context.jsonld +25 -1
package/lib/ActorHttpFetch.d.ts +26 -0
package/lib/ActorHttpFetch.js +26 -4
package/lib/ActorHttpFetch.js.map +1 -1
package/lib/CachePolicyHttpCacheSemanticsWrapper.d.ts +21 -0
package/lib/CachePolicyHttpCacheSemanticsWrapper.js +78 -0
package/lib/CachePolicyHttpCacheSemanticsWrapper.js.map +1 -0
package/lib/FetchInitPreprocessor-browser.d.ts +0 -0
package/lib/FetchInitPreprocessor-browser.js +0 -0
package/lib/FetchInitPreprocessor-browser.js.map +0 -0
package/lib/FetchInitPreprocessor.d.ts +9 -3
package/lib/FetchInitPreprocessor.js +36 -4
package/lib/FetchInitPreprocessor.js.map +1 -1
package/lib/IFetchInitPreprocessor.d.ts +2 -1
package/lib/IFetchInitPreprocessor.js +0 -0
package/lib/IFetchInitPreprocessor.js.map +1 -1
package/lib/MetadataWrappingCacheStore.d.ts +13 -0
package/lib/MetadataWrappingCacheStore.js +27 -0
package/lib/MetadataWrappingCacheStore.js.map +1 -0
package/lib/index.d.ts +1 -0
package/lib/index.js +1 -0
package/lib/index.js.map +1 -1
package/package.json +11 -6

package/README.md CHANGED Viewed

@@ -5,6 +5,9 @@
 An [HTTP](https://github.com/comunica/comunica/tree/master/packages/bus-http) actor that
 uses [fetch](https://fetch.spec.whatwg.org/) to perform HTTP requests.
+When this actor is used in Node.js, a memory-based cache will be initialized.
+This cache is only used when the `httpCache` context flag is enabled.
 This module is part of the [Comunica framework](https://github.com/comunica/comunica),
 and should only be used by [developers that want to build their own query engine](https://comunica.dev/docs/modify/).
@@ -25,7 +28,7 @@ After installing, this package can be added to your engine's configuration as fo
 ```json
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^4.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^5.0.0/components/context.jsonld"
   ],
   "actors": [
     {
@@ -38,4 +41,8 @@ After installing, this package can be added to your engine's configuration as fo
 ### Config Parameters
+* `cacheMaxSize`: Maximum size of the cache (in bytes). Defaults to `104857600` (100MB).
+* `cacheMaxCount`: Maximum number of documents to store in the cache. Defaults to `1000`.
+* `cacheMaxEntrySize`: Maximum size of an entry in the cache (in bytes). Defaults to `5242880` (5MB).
+* `httpInvalidator`: A mediator over the [HTTP invalidate bus](https://github.com/comunica/comunica/tree/master/packages/bus-http-invalidate).
 * `agentOptions`: The agent JSON options for the HTTP agent in Node.js environments. _(optional)_

package/components/ActorHttpFetch.jsonld CHANGED Viewed

@@ -1,8 +1,9 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^4.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-http/^4.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/core/^4.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^5.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-http-invalidate/^5.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-http/^5.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/core/^5.0.0/components/context.jsonld"
   ],
   "@id": "npmd:@comunica/actor-http-fetch",
   "components": [
@@ -14,6 +15,33 @@
         "cbh:components/ActorHttp.jsonld#ActorHttp"
       ],
       "parameters": [
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxSize",
+          "range": "xsd:integer",
+          "default": "104857600",
+          "comment": "Maximum size of the cache (in bytes). Defaults to 100MB."
+        },
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxCount",
+          "range": "xsd:integer",
+          "default": "1000",
+          "comment": "Maximum number of documents to store in the cache."
+        },
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxEntrySize",
+          "range": "xsd:integer",
+          "default": "5242880",
+          "comment": "Maximum size of an entry in the cache (in bytes). Defaults to 5MB."
+        },
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_httpInvalidator",
+          "range": "cbhi:components/ActorHttpInvalidateListenable.jsonld#ActorHttpInvalidateListenable",
+          "default": {
+            "@id": "cahf:components/ActorHttpFetch.jsonld#IActorHttpFetchArgs_default_invalidator",
+            "@type": "npmd:@comunica/bus-http-invalidate/^5.0.0/components/ActorHttpInvalidateListenable.jsonld#ActorHttpInvalidateListenable"
+          },
+          "comment": "An actor that listens to HTTP invalidation events"
+        },
         {
           "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_agentOptions",
           "range": {
@@ -54,37 +82,37 @@
                 "genericTypeInstances": [
                   {
                     "@type": "ParameterRangeGenericTypeReference",
-                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
+                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
                   },
                   {
                     "@type": "ParameterRangeGenericTypeReference",
-                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
+                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
                   },
                   {
                     "@type": "ParameterRangeGenericTypeReference",
-                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
+                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
                   },
                   {
                     "@type": "ParameterRangeGenericTypeReference",
-                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
+                    "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
                   }
                 ]
               },
               {
                 "@type": "ParameterRangeGenericTypeReference",
-                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
+                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
               },
               {
                 "@type": "ParameterRangeGenericTypeReference",
-                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
+                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
               },
               {
                 "@type": "ParameterRangeGenericTypeReference",
-                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
+                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
               },
               {
                 "@type": "ParameterRangeGenericTypeReference",
-                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
+                "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
               }
             ]
           },
@@ -121,19 +149,19 @@
                   "genericTypeInstances": [
                     {
                       "@type": "ParameterRangeGenericTypeReference",
-                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
+                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_I"
                     },
                     {
                       "@type": "ParameterRangeGenericTypeReference",
-                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
+                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_T"
                     },
                     {
                       "@type": "ParameterRangeGenericTypeReference",
-                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
+                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_O"
                     },
                     {
                       "@type": "ParameterRangeGenericTypeReference",
-                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^4.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
+                      "parameterRangeGenericType": "npmd:@comunica/actor-abstract-mediatyped/^5.0.0/components/ActorAbstractMediaTyped.jsonld#ActorAbstractMediaTyped__generic_TS"
                     }
                   ]
                 }
@@ -180,6 +208,30 @@
         {
           "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args__constructorArgument",
           "fields": [
+            {
+              "keyRaw": "cacheMaxSize",
+              "value": {
+                "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxSize"
+              }
+            },
+            {
+              "keyRaw": "cacheMaxCount",
+              "value": {
+                "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxCount"
+              }
+            },
+            {
+              "keyRaw": "cacheMaxEntrySize",
+              "value": {
+                "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxEntrySize"
+              }
+            },
+            {
+              "keyRaw": "httpInvalidator",
+              "value": {
+                "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_httpInvalidator"
+              }
+            },
             {
               "keyRaw": "agentOptions",
               "value": {
@@ -220,6 +272,22 @@
       "requireElement": "IActorHttpFetchArgs",
       "parameters": [],
       "memberFields": [
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#IActorHttpFetchArgs__member_cacheMaxSize",
+          "memberFieldName": "cacheMaxSize"
+        },
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#IActorHttpFetchArgs__member_cacheMaxCount",
+          "memberFieldName": "cacheMaxCount"
+        },
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#IActorHttpFetchArgs__member_cacheMaxEntrySize",
+          "memberFieldName": "cacheMaxEntrySize"
+        },
+        {
+          "@id": "cahf:components/ActorHttpFetch.jsonld#IActorHttpFetchArgs__member_httpInvalidator",
+          "memberFieldName": "httpInvalidator"
+        },
         {
           "@id": "cahf:components/ActorHttpFetch.jsonld#IActorHttpFetchArgs__member_agentOptions",
           "memberFieldName": "agentOptions"

package/components/components.jsonld CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^4.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^5.0.0/components/context.jsonld"
   ],
   "@id": "npmd:@comunica/actor-http-fetch",
   "@type": "Module",

package/components/context.jsonld CHANGED Viewed

@@ -3,11 +3,23 @@
     "https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^6.0.0/components/context.jsonld",
     {
       "npmd": "https://linkedsoftwaredependencies.org/bundles/npm/",
-      "cahf": "npmd:@comunica/actor-http-fetch/^4.0.0/",
+      "cahf": "npmd:@comunica/actor-http-fetch/^5.0.0/",
       "ActorHttpFetch": {
         "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch",
         "@prefix": true,
         "@context": {
+          "args_cacheMaxSize": {
+            "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxSize"
+          },
+          "args_cacheMaxCount": {
+            "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxCount"
+          },
+          "args_cacheMaxEntrySize": {
+            "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxEntrySize"
+          },
+          "args_httpInvalidator": {
+            "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_httpInvalidator"
+          },
           "args_agentOptions": {
             "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_agentOptions"
           },
@@ -24,6 +36,18 @@
             "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_beforeActors",
             "@container": "@list"
           },
+          "cacheMaxSize": {
+            "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxSize"
+          },
+          "cacheMaxCount": {
+            "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxCount"
+          },
+          "cacheMaxEntrySize": {
+            "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_cacheMaxEntrySize"
+          },
+          "httpInvalidator": {
+            "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_httpInvalidator"
+          },
           "agentOptions": {
             "@id": "cahf:components/ActorHttpFetch.jsonld#ActorHttpFetch_args_agentOptions"
           },

package/lib/ActorHttpFetch.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import type { IActionHttp, IActorHttpOutput, IActorHttpArgs } from '@comunica/bus-http';
 import { ActorHttp } from '@comunica/bus-http';
+import type { ActorHttpInvalidateListenable } from '@comunica/bus-http-invalidate';
 import type { TestResult } from '@comunica/core';
 import type { IMediatorTypeTime } from '@comunica/mediatortype-time';
 export declare class ActorHttpFetch extends ActorHttp {
@@ -24,6 +25,31 @@ export declare class ActorHttpFetch extends ActorHttp {
     static stringToBase64(value: string): string;
 }
 export interface IActorHttpFetchArgs extends IActorHttpArgs {
+    /**
+     * Maximum size of the cache (in bytes).
+     * Defaults to 100MB.
+     * @range {integer}
+     * @default {104857600}
+     */
+    cacheMaxSize: number;
+    /**
+     * Maximum number of documents to store in the cache.
+     * @range {integer}
+     * @default {1000}
+     */
+    cacheMaxCount: number;
+    /**
+     * Maximum size of an entry in the cache (in bytes).
+     * Defaults to 5MB.
+     * @range {integer}
+     * @default {5242880}
+     */
+    cacheMaxEntrySize: number;
+    /**
+     * An actor that listens to HTTP invalidation events
+     * @default {<default_invalidator> a <npmd:@comunica/bus-http-invalidate/^5.0.0/components/ActorHttpInvalidateListenable.jsonld#ActorHttpInvalidateListenable>}
+     */
+    httpInvalidator: ActorHttpInvalidateListenable;
     /**
      * The agent options for the HTTP agent
      * @range {json}

package/lib/ActorHttpFetch.js CHANGED Viewed

@@ -4,13 +4,18 @@ 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 ts/no-require-imports
+const CachePolicy = require("http-cache-semantics");
 // eslint-disable-next-line import/extensions
 const package_json_1 = require("../package.json");
+const CachePolicyHttpCacheSemanticsWrapper_1 = require("./CachePolicyHttpCacheSemanticsWrapper");
 const FetchInitPreprocessor_1 = require("./FetchInitPreprocessor");
 class ActorHttpFetch extends bus_http_1.ActorHttp {
+    fetchInitPreprocessor;
+    static userAgent = bus_http_1.ActorHttp.createUserAgent('ActorHttpFetch', package_json_1.version);
     constructor(args) {
         super(args);
-        this.fetchInitPreprocessor = new FetchInitPreprocessor_1.FetchInitPreprocessor(args.agentOptions);
+        this.fetchInitPreprocessor = new FetchInitPreprocessor_1.FetchInitPreprocessor(args);
     }
     async test(_action) {
         return (0, core_1.passTest)({ time: Number.POSITIVE_INFINITY });
@@ -32,16 +37,34 @@ class ActorHttpFetch extends bus_http_1.ActorHttp {
         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);
+        const requestInit = await this.fetchInitPreprocessor.handle(init, action.context);
         let timeoutCallback;
         let timeoutHandle;
+        const abortSignal = action.context.get(context_entries_1.KeysHttp.httpAbortSignal);
+        if (abortSignal) {
+            requestInit.signal = AbortSignal
+                .any([...requestInit.signal ? [requestInit.signal] : [], abortSignal]);
+        }
         if (httpTimeout) {
             const abortController = new AbortController();
-            requestInit.signal = abortController.signal;
+            requestInit.signal = AbortSignal
+                .any([...requestInit.signal ? [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);
         }
         const response = await fetchFunction(action.input, requestInit);
+        response.fromCache = response.headers.get('x-comunica-cache') === 'HIT';
+        if (response.fromCache) {
+            this.logInfo(action.context, `Cache hit for ${bus_http_1.ActorHttp.getInputUrl(action.input).href}`);
+        }
+        response.cachePolicy = new CachePolicyHttpCacheSemanticsWrapper_1.CachePolicyHttpCacheSemanticsWrapper(new CachePolicy(await CachePolicyHttpCacheSemanticsWrapper_1.CachePolicyHttpCacheSemanticsWrapper.convertFromFetchRequest(action, this.fetchInitPreprocessor), {
+            status: response.status,
+            headers: bus_http_1.ActorHttp.headersToHash(response.headers),
+        }, {
+            // Disabled "shared" ensures responses with set-cookie are also cached.
+            // For example, for https://www.w3.org/ns/activitystreams
+            shared: false,
+        }), action.context.get(context_entries_1.KeysInitQuery.queryTimestampHighResolution), this.fetchInitPreprocessor);
         if (httpTimeout && (!httpBodyTimeout || !response.body)) {
             clearTimeout(timeoutHandle);
         }
@@ -82,5 +105,4 @@ class ActorHttpFetch extends bus_http_1.ActorHttp {
     }
 }
 exports.ActorHttpFetch = ActorHttpFetch;
-ActorHttpFetch.userAgent = bus_http_1.ActorHttp.createUserAgent('ActorHttpFetch', package_json_1.version);
 //# sourceMappingURL=ActorHttpFetch.js.map

package/lib/ActorHttpFetch.js.map CHANGED Viewed

	@@ -1 +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';\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"]}
1	+ {"version":3,"file":"ActorHttpFetch.js","sourceRoot":"","sources":["ActorHttpFetch.ts"],"names":[],"mappings":";;;AACA,iDAA+C;AAE/C,+DAAoE;AAEpE,yCAA0C;AAG1C,iDAAiD;AACjD,oDAAqD;AAErD,6CAA6C;AAC7C,kDAA0D;AAE1D,iGAA8F;AAC9F,mEAAgE;AAGhE,MAAa,cAAe,SAAQ,oBAAS;IAC1B,qBAAqB,CAAyB;IAEvD,MAAM,CAAU,SAAS,GAAG,oBAAS,CAAC,eAAe,CAAC,gBAAgB,EAAE,sBAAY,CAAC,CAAC;IAE9F,YAAmB,IAAyB;QAC1C,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAoB;QACpC,OAAO,IAAA,eAAQ,EAAC,EAAE,IAAI,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,MAAmB;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAEnD,MAAM,IAAI,GAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;QAErE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,cAAc,oBAAS,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YAC5F,OAAO,EAAE,oBAAS,CAAC,aAAa,CAAC,OAAO,CAAC;YACzC,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC,CAAC;QAEJ,gHAAgH;QAChH,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,GAAG,oBAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC/B,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAQ,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAQ,CAAC,eAAe,CAAC,CAAC;QACrE,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC;QAClE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAElF,IAAI,eAA2B,CAAC;QAChC,IAAI,aAAyC,CAAC;QAE9C,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAQ,CAAC,eAAe,CAAC,CAAC;QACjE,IAAI,WAAW,EAAE,CAAC;YAChB,WAAW,CAAC,MAAM,GAAG,WAAW;iBAC7B,GAAG,CAAC,CAAE,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,WAAW,CAAC,MAAM,CAAE,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,CAAE,CAAC,CAAC;QAC/E,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;YAC9C,WAAW,CAAC,MAAM,GAAG,WAAW;iBAC7B,GAAG,CAAC,CAAE,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,WAAW,CAAC,MAAM,CAAE,CAAC,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC,MAAM,CAAE,CAAC,CAAC;YACxF,eAAe,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,uBAAuB,oBAAS,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,UAAU,WAAW,KAAK,CAAC,CAAC,CAAC;YACpJ,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,QAAQ,GAAqB,MAAM,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAElF,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAK,KAAK,CAAC;QACxE,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,iBAAiB,oBAAS,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5F,CAAC;QAED,QAAQ,CAAC,WAAW,GAAG,IAAI,2EAAoC,CAAC,IAAI,WAAW,CAC7E,MAAM,2EAAoC,CAAC,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,qBAAqB,CAAC,EACtG;YACE,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,OAAO,EAAE,oBAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC;SACnD,EACD;YACE,uEAAuE;YACvE,yDAAyD;YACzD,MAAM,EAAE,KAAK;SACd,CACF,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,+BAAa,CAAC,4BAA4B,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAE/F,IAAI,WAAW,IAAI,CAAC,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACxD,YAAY,CAAC,aAAa,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAAC,MAAmB;QAC9C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,IAAI,oBAAS,CAAC,SAAS,EAAE,EAAE,CAAC;YAC1B,uEAAuE;YACvE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC/B,CAAC;aAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACtC,+DAA+D;YAC/D,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,CAAC,SAAU,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,cAAc,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACrF,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,cAAc,CAAC,KAAa;QACxC,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjF,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;;AArHH,wCAsHC","sourcesContent":["import type { IActionHttp, IActorHttpOutput, IActorHttpArgs } from '@comunica/bus-http';\nimport { ActorHttp } from '@comunica/bus-http';\nimport type { ActorHttpInvalidateListenable } from '@comunica/bus-http-invalidate';\nimport { KeysHttp, KeysInitQuery } 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 ts/no-require-imports\nimport CachePolicy = require('http-cache-semantics');\n\n// eslint-disable-next-line import/extensions\nimport { version as actorVersion } from '../package.json';\n\nimport { CachePolicyHttpCacheSemanticsWrapper } from './CachePolicyHttpCacheSemanticsWrapper';\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);\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, action.context);\n\n let timeoutCallback: () => void;\n let timeoutHandle: NodeJS.Timeout \| undefined;\n\n const abortSignal = action.context.get(KeysHttp.httpAbortSignal);\n if (abortSignal) {\n requestInit.signal = AbortSignal\n .any([ ...requestInit.signal ? [ requestInit.signal ] : [], abortSignal ]);\n }\n\n if (httpTimeout) {\n const abortController = new AbortController();\n requestInit.signal = AbortSignal\n .any([ ...requestInit.signal ? [ 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: IActorHttpOutput = await fetchFunction(action.input, requestInit);\n\n response.fromCache = response.headers.get('x-comunica-cache') === 'HIT';\n if (response.fromCache) {\n this.logInfo(action.context, `Cache hit for ${ActorHttp.getInputUrl(action.input).href}`);\n }\n\n response.cachePolicy = new CachePolicyHttpCacheSemanticsWrapper(new CachePolicy(\n await CachePolicyHttpCacheSemanticsWrapper.convertFromFetchRequest(action, this.fetchInitPreprocessor),\n {\n status: response.status,\n headers: ActorHttp.headersToHash(response.headers),\n },\n {\n // Disabled \"shared\" ensures responses with set-cookie are also cached.\n // For example, for https://www.w3.org/ns/activitystreams\n shared: false,\n },\n ), action.context.get(KeysInitQuery.queryTimestampHighResolution), this.fetchInitPreprocessor);\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 Maximum size of the cache (in bytes).\n * Defaults to 100MB.\n * @range {integer}\n * @default {104857600}\n /\n cacheMaxSize: number;\n /\n Maximum number of documents to store in the cache.\n * @range {integer}\n * @default {1000}\n /\n cacheMaxCount: number;\n /\n Maximum size of an entry in the cache (in bytes).\n * Defaults to 5MB.\n * @range {integer}\n * @default {5242880}\n /\n cacheMaxEntrySize: number;\n / eslint-disable max-len /\n /\n An actor that listens to HTTP invalidation events\n * @default {<default_invalidator> a <npmd:@comunica/bus-http-invalidate/^5.0.0/components/ActorHttpInvalidateListenable.jsonld#ActorHttpInvalidateListenable>}\n /\n httpInvalidator: ActorHttpInvalidateListenable;\n / eslint-enable max-len /\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/CachePolicyHttpCacheSemanticsWrapper.d.ts ADDED Viewed

@@ -0,0 +1,21 @@
+import { type IActionHttp } from '@comunica/bus-http';
+import type { ICachePolicy, ICacheResponseHead, IRevalidationPolicy } from '@comunica/types';
+import CachePolicy = require('http-cache-semantics');
+import type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';
+/**
+ * Wrapper over the cache policy of http-cache-semantics to expose it as an ICachePolicy.
+ */
+export declare class CachePolicyHttpCacheSemanticsWrapper implements ICachePolicy<IActionHttp> {
+    private readonly cachePolicy;
+    private readonly queryTimestamp;
+    private readonly fetchInitPreprocessor;
+    constructor(cachePolicy: CachePolicy, queryTimestamp: number | undefined, fetchInitPreprocessor: IFetchInitPreprocessor);
+    storable(): boolean;
+    satisfiesWithoutRevalidation(action: IActionHttp): Promise<boolean>;
+    responseHeaders(): Headers;
+    timeToLive(): number;
+    revalidationHeaders(newAction: IActionHttp): Promise<Headers>;
+    revalidatedPolicy(revalidationAction: IActionHttp, revalidationResponse: ICacheResponseHead): Promise<IRevalidationPolicy<IActionHttp>>;
+    static convertFromFetchRequest(request: IActionHttp, fetchInitPreprocessor: IFetchInitPreprocessor): Promise<CachePolicy.Request>;
+    static convertToFetchHeaders(headers: CachePolicy.Headers): Headers;
+}

package/lib/CachePolicyHttpCacheSemanticsWrapper.js ADDED Viewed

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CachePolicyHttpCacheSemanticsWrapper = void 0;
+const bus_http_1 = require("@comunica/bus-http");
+const context_entries_1 = require("@comunica/context-entries");
+/**
+ * Wrapper over the cache policy of http-cache-semantics to expose it as an ICachePolicy.
+ */
+class CachePolicyHttpCacheSemanticsWrapper {
+    cachePolicy;
+    queryTimestamp;
+    fetchInitPreprocessor;
+    constructor(cachePolicy, queryTimestamp, fetchInitPreprocessor) {
+        this.cachePolicy = cachePolicy;
+        this.queryTimestamp = queryTimestamp;
+        this.fetchInitPreprocessor = fetchInitPreprocessor;
+    }
+    storable() {
+        return this.cachePolicy.storable();
+    }
+    async satisfiesWithoutRevalidation(action) {
+        // We always allow full caching within the context of a single query execution
+        if (this.queryTimestamp && action.context.get(context_entries_1.KeysInitQuery.queryTimestampHighResolution) === this.queryTimestamp) {
+            return true;
+        }
+        // Otherwise, determine through cache policy
+        return this.cachePolicy.satisfiesWithoutRevalidation(await CachePolicyHttpCacheSemanticsWrapper
+            .convertFromFetchRequest(action, this.fetchInitPreprocessor));
+    }
+    responseHeaders() {
+        return CachePolicyHttpCacheSemanticsWrapper.convertToFetchHeaders(this.cachePolicy.responseHeaders());
+    }
+    timeToLive() {
+        return this.cachePolicy.timeToLive();
+    }
+    async revalidationHeaders(newAction) {
+        return CachePolicyHttpCacheSemanticsWrapper.convertToFetchHeaders(this.cachePolicy
+            .revalidationHeaders(await CachePolicyHttpCacheSemanticsWrapper
+            .convertFromFetchRequest(newAction, this.fetchInitPreprocessor)));
+    }
+    async revalidatedPolicy(revalidationAction, revalidationResponse) {
+        const revalidatedPolicy = this.cachePolicy.revalidatedPolicy(await CachePolicyHttpCacheSemanticsWrapper
+            .convertFromFetchRequest(revalidationAction, this.fetchInitPreprocessor), {
+            status: revalidationResponse.status,
+            headers: revalidationResponse.headers ? bus_http_1.ActorHttp.headersToHash(revalidationResponse.headers) : {},
+        });
+        return {
+            policy: new CachePolicyHttpCacheSemanticsWrapper(revalidatedPolicy.policy, this.queryTimestamp, this.fetchInitPreprocessor),
+            modified: revalidatedPolicy.modified,
+            matches: revalidatedPolicy.matches,
+        };
+    }
+    static async convertFromFetchRequest(request, fetchInitPreprocessor) {
+        let headers = typeof request.input === 'string' ? request.init?.headers : request.input.headers;
+        headers = (await fetchInitPreprocessor.handle({ headers }, request.context)).headers;
+        return {
+            url: typeof request.input === 'string' ? request.input : request.input.url,
+            method: request.init?.method ?? 'GET',
+            headers: headers ? bus_http_1.ActorHttp.headersToHash(new Headers(headers)) : {},
+        };
+    }
+    static convertToFetchHeaders(headers) {
+        const fetchHeaders = new Headers();
+        for (const [key, value] of Object.entries(headers)) {
+            if (Array.isArray(value)) {
+                for (const valueEntry of value) {
+                    fetchHeaders.append(key, valueEntry);
+                }
+            }
+            else if (value) {
+                fetchHeaders.append(key, value);
+            }
+        }
+        return fetchHeaders;
+    }
+}
+exports.CachePolicyHttpCacheSemanticsWrapper = CachePolicyHttpCacheSemanticsWrapper;
+//# sourceMappingURL=CachePolicyHttpCacheSemanticsWrapper.js.map

package/lib/CachePolicyHttpCacheSemanticsWrapper.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"CachePolicyHttpCacheSemanticsWrapper.js","sourceRoot":"","sources":["CachePolicyHttpCacheSemanticsWrapper.ts"],"names":[],"mappings":"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","sourcesContent":["import { ActorHttp, type IActionHttp } from '@comunica/bus-http';\nimport { KeysInitQuery } from '@comunica/context-entries';\nimport type { ICachePolicy, ICacheResponseHead, IRevalidationPolicy } from '@comunica/types';\n\n// eslint-disable-next-line ts/no-require-imports\nimport CachePolicy = require('http-cache-semantics');\nimport type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';\n\n/**\n * Wrapper over the cache policy of http-cache-semantics to expose it as an ICachePolicy.\n */\nexport class CachePolicyHttpCacheSemanticsWrapper implements ICachePolicy<IActionHttp> {\n public constructor(\n private readonly cachePolicy: CachePolicy,\n private readonly queryTimestamp: number | undefined,\n private readonly fetchInitPreprocessor: IFetchInitPreprocessor,\n ) {}\n\n public storable(): boolean {\n return this.cachePolicy.storable();\n }\n\n public async satisfiesWithoutRevalidation(action: IActionHttp): Promise<boolean> {\n // We always allow full caching within the context of a single query execution\n if (this.queryTimestamp && action.context.get(KeysInitQuery.queryTimestampHighResolution) === this.queryTimestamp) {\n return true;\n }\n // Otherwise, determine through cache policy\n return this.cachePolicy.satisfiesWithoutRevalidation(await CachePolicyHttpCacheSemanticsWrapper\n .convertFromFetchRequest(action, this.fetchInitPreprocessor));\n }\n\n public responseHeaders(): Headers {\n return CachePolicyHttpCacheSemanticsWrapper.convertToFetchHeaders(this.cachePolicy.responseHeaders());\n }\n\n public timeToLive(): number {\n return this.cachePolicy.timeToLive();\n }\n\n public async revalidationHeaders(newAction: IActionHttp): Promise<Headers> {\n return CachePolicyHttpCacheSemanticsWrapper.convertToFetchHeaders(this.cachePolicy\n .revalidationHeaders(await CachePolicyHttpCacheSemanticsWrapper\n .convertFromFetchRequest(newAction, this.fetchInitPreprocessor)));\n }\n\n public async revalidatedPolicy(\n revalidationAction: IActionHttp,\n revalidationResponse: ICacheResponseHead,\n ): Promise<IRevalidationPolicy<IActionHttp>> {\n const revalidatedPolicy = this.cachePolicy.revalidatedPolicy(\n await CachePolicyHttpCacheSemanticsWrapper\n .convertFromFetchRequest(revalidationAction, this.fetchInitPreprocessor),\n {\n status: revalidationResponse.status,\n headers: revalidationResponse.headers ? ActorHttp.headersToHash(revalidationResponse.headers) : {},\n },\n );\n return {\n policy: new CachePolicyHttpCacheSemanticsWrapper(\n revalidatedPolicy.policy,\n this.queryTimestamp,\n this.fetchInitPreprocessor,\n ),\n modified: revalidatedPolicy.modified,\n matches: revalidatedPolicy.matches,\n };\n }\n\n public static async convertFromFetchRequest(\n request: IActionHttp,\n fetchInitPreprocessor: IFetchInitPreprocessor,\n ): Promise<CachePolicy.Request> {\n let headers = typeof request.input === 'string' ? request.init?.headers : request.input.headers;\n headers = (await fetchInitPreprocessor.handle({ headers }, request.context)).headers;\n return {\n url: typeof request.input === 'string' ? request.input : request.input.url,\n method: request.init?.method ?? 'GET',\n headers: headers ? ActorHttp.headersToHash(new Headers(headers)) : {},\n };\n }\n\n public static convertToFetchHeaders(headers: CachePolicy.Headers): Headers {\n const fetchHeaders = new Headers();\n for (const [ key, value ] of Object.entries(headers)) {\n if (Array.isArray(value)) {\n for (const valueEntry of value) {\n fetchHeaders.append(key, valueEntry);\n }\n } else if (value) {\n fetchHeaders.append(key, value);\n }\n }\n return fetchHeaders;\n }\n}\n"]}

package/lib/FetchInitPreprocessor-browser.d.ts CHANGED Viewed

File without changes

package/lib/FetchInitPreprocessor-browser.js CHANGED Viewed

File without changes

package/lib/FetchInitPreprocessor-browser.js.map CHANGED Viewed

File without changes

package/lib/FetchInitPreprocessor.d.ts CHANGED Viewed

@@ -1,13 +1,19 @@
-/// <reference types="node" />
 import { Agent as HttpAgent } from 'node:http';
+import type { IActionContext } from '@comunica/types';
+import type { Dispatcher } from 'undici';
+import type { IActorHttpFetchArgs } from './ActorHttpFetch';
 import type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';
 /**
  * Overrides the HTTP agent to perform better in Node.js.
  */
 export declare class FetchInitPreprocessor implements IFetchInitPreprocessor {
     private readonly agent;
-    constructor(agentOptions: any);
-    handle(init: RequestInit): Promise<RequestInit & {
+    private dispatcher;
+    private cache;
+    constructor(args: IActorHttpFetchArgs);
+    protected createCache(args: IActorHttpFetchArgs): void;
+    handle(init: RequestInit, context: IActionContext): Promise<RequestInit & {
         agent: (url: URL) => HttpAgent;
+        dispatcher?: Dispatcher;
     }>;
 }

package/lib/FetchInitPreprocessor.js CHANGED Viewed

@@ -4,16 +4,47 @@ 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 context_entries_1 = require("@comunica/context-entries");
+const undici_1 = require("undici");
+const MetadataWrappingCacheStore_1 = require("./MetadataWrappingCacheStore");
+// eslint-disable-next-line ts/no-require-imports,ts/no-var-requires
+const cacheStores = require('undici').cacheStores;
+// TODO: the require above can be replaced with import when undici updates.
 /**
  * Overrides the HTTP agent to perform better in Node.js.
  */
 class FetchInitPreprocessor {
-    constructor(agentOptions) {
-        const httpAgent = new node_http_1.Agent(agentOptions);
-        const httpsAgent = new node_https_1.Agent(agentOptions);
+    agent;
+    dispatcher;
+    cache;
+    constructor(args) {
+        const httpAgent = new node_http_1.Agent(args.agentOptions);
+        const httpsAgent = new node_https_1.Agent(args.agentOptions);
         this.agent = (_parsedURL) => _parsedURL.protocol === 'http:' ? httpAgent : httpsAgent;
+        this.createCache(args);
+        args.httpInvalidator.addInvalidateListener(({ url }) => {
+            if (url) {
+                const parsedUrl = new URL(url);
+                // eslint-disable-next-line ts/no-floating-promises
+                this.cache.delete({ origin: parsedUrl.origin, path: parsedUrl.pathname + parsedUrl.search, method: 'GET' });
+            }
+            else {
+                this.createCache(args);
+            }
+        });
     }
-    async handle(init) {
+    createCache(args) {
+        this.cache = new cacheStores.MemoryCacheStore({
+            maxSize: args.cacheMaxSize,
+            maxCount: args.cacheMaxCount,
+            maxEntrySize: args.cacheMaxEntrySize,
+        });
+        this.dispatcher = new undici_1.Agent().compose(undici_1.interceptors.cache({
+            store: new MetadataWrappingCacheStore_1.MetadataWrappingCacheStore(this.cache),
+            methods: ['GET', 'HEAD'],
+        }));
+    }
+    async handle(init, context) {
         // Add 'Accept-Encoding' headers
         const headers = new Headers(init.headers);
         if (!headers.has('Accept-Encoding')) {
@@ -27,6 +58,7 @@ class FetchInitPreprocessor {
             ...init,
             ...init.body ? { keepalive: false, duplex: 'half' } : { keepalive: true },
             agent: this.agent,
+            dispatcher: context.get(context_entries_1.KeysHttp.httpCache) ? this.dispatcher : undefined,
         };
     }
 }

package/lib/FetchInitPreprocessor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"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"]}
1	+ {"version":3,"file":"FetchInitPreprocessor.js","sourceRoot":"","sources":["FetchInitPreprocessor.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable import/no-nodejs-modules /\nimport { Agent as HttpAgent } from 'node:http';\nimport { Agent as HttpsAgent } from 'node:https';\nimport type { IActionHttpInvalidate } from '@comunica/bus-http-invalidate';\nimport { KeysHttp } from '@comunica/context-entries';\nimport type { IActionContext } from '@comunica/types';\nimport type { Dispatcher } from 'undici';\nimport { Agent, interceptors } from 'undici';\n\n/ eslint-enable import/no-nodejs-modules /\nimport CacheHandler from 'undici/types/cache-interceptor';\nimport type { IActorHttpFetchArgs } from './ActorHttpFetch';\nimport type { IFetchInitPreprocessor } from './IFetchInitPreprocessor';\nimport { MetadataWrappingCacheStore } from './MetadataWrappingCacheStore';\nimport CacheStore = CacheHandler.CacheStore;\n\n// eslint-disable-next-line ts/no-require-imports,ts/no-var-requires\nconst cacheStores = require('undici').cacheStores;\n// TODO: the require above can be replaced with import when undici updates.\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 private dispatcher!: Dispatcher;\n private cache!: CacheStore;\n\n public constructor(args: IActorHttpFetchArgs) {\n const httpAgent = new HttpAgent(args.agentOptions);\n const httpsAgent = new HttpsAgent(args.agentOptions);\n this.agent = (_parsedURL: URL): HttpAgent => _parsedURL.protocol === 'http:' ? httpAgent : httpsAgent;\n this.createCache(args);\n args.httpInvalidator.addInvalidateListener(\n ({ url }: IActionHttpInvalidate) => {\n if (url) {\n const parsedUrl = new URL(url);\n // eslint-disable-next-line ts/no-floating-promises\n this.cache.delete({ origin: parsedUrl.origin, path: parsedUrl.pathname + parsedUrl.search, method: 'GET' });\n } else {\n this.createCache(args);\n }\n },\n );\n }\n\n protected createCache(args: IActorHttpFetchArgs): void {\n this.cache = new cacheStores.MemoryCacheStore({\n maxSize: args.cacheMaxSize,\n maxCount: args.cacheMaxCount,\n maxEntrySize: args.cacheMaxEntrySize,\n });\n this.dispatcher = new Agent().compose(interceptors.cache({\n store: new MetadataWrappingCacheStore(this.cache),\n methods: [ 'GET', 'HEAD' ],\n }));\n }\n\n public async handle(\n init: RequestInit,\n context: IActionContext,\n ): Promise<RequestInit & { agent: (url: URL) => HttpAgent; dispatcher?: Dispatcher }> {\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 dispatcher: context.get(KeysHttp.httpCache) ? this.dispatcher : undefined,\n };\n }\n}\n"]}

package/lib/IFetchInitPreprocessor.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
+import type { IActionContext } from '@comunica/types';
 /**
  * Can modify a fetch init object.
  */
 export interface IFetchInitPreprocessor {
-    handle: (init: RequestInit) => Promise<RequestInit>;
+    handle: (init: RequestInit, context: IActionContext) => Promise<RequestInit>;
 }

package/lib/IFetchInitPreprocessor.js CHANGED Viewed

File without changes

package/lib/IFetchInitPreprocessor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IFetchInitPreprocessor.js","sourceRoot":"","sources":["IFetchInitPreprocessor.ts"],"names":[],"mappings":"","sourcesContent":["/*\n Can modify a fetch init object.\n */\nexport interface IFetchInitPreprocessor {\n handle: (init: RequestInit) => Promise<RequestInit>;\n}\n"]}
1	+ {"version":3,"file":"IFetchInitPreprocessor.js","sourceRoot":"","sources":["IFetchInitPreprocessor.ts"],"names":[],"mappings":"","sourcesContent":["import type { IActionContext } from '@comunica/types';\n\n/*\n Can modify a fetch init object.\n */\nexport interface IFetchInitPreprocessor {\n handle: (init: RequestInit, context: IActionContext) => Promise<RequestInit>;\n}\n"]}

package/lib/MetadataWrappingCacheStore.d.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import type { Writable } from 'node:stream';
+import CacheHandler from 'undici/types/cache-interceptor';
+import CacheStore = CacheHandler.CacheStore;
+/**
+ * A wrapper around a cache store that adds the `x-comunica-cache: HIT` header to cached responses.
+ */
+export declare class MetadataWrappingCacheStore implements CacheStore {
+    private readonly cacheStore;
+    constructor(cacheStore: CacheStore);
+    get(key: CacheHandler.CacheKey): Promise<CacheHandler.GetResult | undefined>;
+    createWriteStream(key: CacheHandler.CacheKey, val: CacheHandler.CacheValue): Writable | undefined;
+    delete(key: CacheHandler.CacheKey): void | Promise<void>;
+}

package/lib/MetadataWrappingCacheStore.js ADDED Viewed

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetadataWrappingCacheStore = void 0;
+/**
+ * A wrapper around a cache store that adds the `x-comunica-cache: HIT` header to cached responses.
+ */
+class MetadataWrappingCacheStore {
+    cacheStore;
+    constructor(cacheStore) {
+        this.cacheStore = cacheStore;
+    }
+    async get(key) {
+        const ret = await this.cacheStore.get(key);
+        if (ret) {
+            ret.headers['x-comunica-cache'] = 'HIT';
+        }
+        return ret;
+    }
+    createWriteStream(key, val) {
+        return this.cacheStore.createWriteStream(key, val);
+    }
+    delete(key) {
+        return this.cacheStore.delete(key);
+    }
+}
+exports.MetadataWrappingCacheStore = MetadataWrappingCacheStore;
+//# sourceMappingURL=MetadataWrappingCacheStore.js.map

package/lib/MetadataWrappingCacheStore.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"MetadataWrappingCacheStore.js","sourceRoot":"","sources":["MetadataWrappingCacheStore.ts"],"names":[],"mappings":";;;AAKA;;GAEG;AACH,MAAa,0BAA0B;IACD;IAApC,YAAoC,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,GAAG,CAAC,GAA0B;QACzC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;QAC5C,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;QAC1C,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,iBAAiB,CAAC,GAA0B,EAAE,GAA4B;QAC/E,OAAO,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrD,CAAC;IAEM,MAAM,CAAC,GAA0B;QACtC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;CACF;AAlBD,gEAkBC","sourcesContent":["// eslint-disable-next-line import/no-nodejs-modules\nimport type { Writable } from 'node:stream';\nimport CacheHandler from 'undici/types/cache-interceptor';\nimport CacheStore = CacheHandler.CacheStore;\n\n/**\n * A wrapper around a cache store that adds the `x-comunica-cache: HIT` header to cached responses.\n */\nexport class MetadataWrappingCacheStore implements CacheStore {\n public constructor(private readonly cacheStore: CacheStore) {}\n\n public async get(key: CacheHandler.CacheKey): Promise<CacheHandler.GetResult | undefined> {\n const ret = await this.cacheStore.get(key)!;\n if (ret) {\n ret.headers['x-comunica-cache'] = 'HIT';\n }\n return ret;\n }\n\n public createWriteStream(key: CacheHandler.CacheKey, val: CacheHandler.CacheValue): Writable | undefined {\n return this.cacheStore.createWriteStream(key, val);\n }\n\n public delete(key: CacheHandler.CacheKey): void | Promise<void> {\n return this.cacheStore.delete(key);\n }\n}\n"]}

package/lib/index.d.ts CHANGED Viewed

	@@ -1 +1,2 @@
1 1	export * from './ActorHttpFetch';
2	+ export * from './CachePolicyHttpCacheSemanticsWrapper';

package/lib/index.js CHANGED Viewed

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ActorHttpFetch"), exports);
+__exportStar(require("./CachePolicyHttpCacheSemanticsWrapper"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC","sourcesContent":["export * from './ActorHttpFetch';\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,yEAAuD","sourcesContent":["export * from './ActorHttpFetch';\nexport * from './CachePolicyHttpCacheSemanticsWrapper';\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-http-fetch",
-  "version": "4.5.0",
+  "version": "5.0.2",
   "description": "A fetch http actor",
   "lsd:module": true,
   "license": "MIT",
@@ -39,13 +39,18 @@
     "build:components": "componentsjs-generator"
   },
   "dependencies": {
-    "@comunica/bus-http": "^4.5.0",
-    "@comunica/context-entries": "^4.5.0",
-    "@comunica/core": "^4.5.0",
-    "@comunica/mediatortype-time": "^4.5.0"
+    "@comunica/bus-http": "^5.0.2",
+    "@comunica/bus-http-invalidate": "^5.0.2",
+    "@comunica/context-entries": "^5.0.2",
+    "@comunica/core": "^5.0.2",
+    "@comunica/mediatortype-time": "^5.0.2",
+    "@comunica/types": "^5.0.0",
+    "@types/http-cache-semantics": "^4.0.4",
+    "http-cache-semantics": "^4.2.0",
+    "undici": "^7.16.0"
   },
   "browser": {
     "./lib/FetchInitPreprocessor.js": "./lib/FetchInitPreprocessor-browser.js"
   },
-  "gitHead": "2bcd98c387a021fc5c08d375793c205ca3d1bf0d"
+  "gitHead": "3b29f914010fd2fc56682a0ceff962ef6ff24f32"
 }