npm - @comunica/actor-query-source-dereference-link-hypermedia - Versions diffs - 5.1.3 → 5.2.0 - Mend

@comunica/actor-query-source-dereference-link-hypermedia 5.1.3 → 5.2.0

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 (7) hide show

package/README.md +3 -1
package/components/ActorQuerySourceDereferenceLinkHypermedia.jsonld +33 -0
package/components/context.jsonld +6 -0
package/lib/ActorQuerySourceDereferenceLinkHypermedia.d.ts +9 -0
package/lib/ActorQuerySourceDereferenceLinkHypermedia.js +20 -1
package/lib/ActorQuerySourceDereferenceLinkHypermedia.js.map +1 -1
package/package.json +12 -12

package/README.md CHANGED Viewed

@@ -33,7 +33,8 @@ After installing, this package can be added to your engine's configuration as fo
       "mediatorMetadata": { "@id": "urn:comunica:default:rdf-metadata/mediators#main" },
       "mediatorMetadataExtract": { "@id": "urn:comunica:default:rdf-metadata-extract/mediators#main" },
       "mediatorMetadataAccumulate": { "@id": "urn:comunica:default:rdf-metadata-accumulate/mediators#main" },
-      "mediatorQuerySourceIdentifyHypermedia": { "@id": "urn:comunica:default:query-source-identify-hypermedia/mediators#main" }
+      "mediatorQuerySourceIdentifyHypermedia": { "@id": "urn:comunica:default:query-source-identify-hypermedia/mediators#main" },
+      "sparqlServiceDescriptionTimeout": 3000
     }
   ]
 }
@@ -46,3 +47,4 @@ After installing, this package can be added to your engine's configuration as fo
 * `mediatorMetadataExtract`: A mediator over the [Metadata Extract bus](https://github.com/comunica/comunica/tree/master/packages/bus-metadata-extract).
 * `mediatorMetadataAccumulate`: A mediator over the [Metadata Accumulatebus](https://github.com/comunica/comunica/tree/master/packages/bus-metadata-accumulate).
 * `mediatorQuerySourceIdentifyHypermedia`: A mediator over the [Query Source Identify Hypermedia bus](https://github.com/comunica/comunica/tree/master/packages/bus-query-source-identify-hypermedia).
+* `sparqlServiceDescriptionTimeout`: Timeout in ms for dereferencing SPARQL service descriptions. Defaults to `3000`.

package/components/ActorQuerySourceDereferenceLinkHypermedia.jsonld CHANGED Viewed

@@ -40,6 +40,20 @@
           "range": "cc:components/Mediator.jsonld#Mediator",
           "comment": "The hypermedia resolve mediator"
         },
+        {
+          "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_sparqlServiceDescriptionTimeout",
+          "range": {
+            "@type": "ParameterRangeUnion",
+            "parameterRangeElements": [
+              "xsd:integer",
+              {
+                "@type": "ParameterRangeUndefined"
+              }
+            ]
+          },
+          "default": "3000",
+          "comment": "Timeout in ms for dereferencing SPARQL service descriptions."
+        },
         {
           "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_name",
           "range": "xsd:string",
@@ -178,6 +192,11 @@
           "memberFieldName": "mediatorQuerySourceIdentifyHypermedia",
           "range": "cc:components/Mediator.jsonld#Mediator"
         },
+        {
+          "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia__member_sparqlServiceDescriptionTimeout",
+          "memberFieldName": "sparqlServiceDescriptionTimeout",
+          "range": "xsd:number"
+        },
         {
           "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia__member_constructor",
           "memberFieldName": "constructor"
@@ -186,6 +205,10 @@
           "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia__member_test",
           "memberFieldName": "test"
         },
+        {
+          "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia__member_getDereferenceRdfContext",
+          "memberFieldName": "getDereferenceRdfContext"
+        },
         {
           "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia__member_run",
           "memberFieldName": "run"
@@ -225,6 +248,12 @@
                 "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_mediatorQuerySourceIdentifyHypermedia"
               }
             },
+            {
+              "keyRaw": "sparqlServiceDescriptionTimeout",
+              "value": {
+                "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_sparqlServiceDescriptionTimeout"
+              }
+            },
             {
               "keyRaw": "name",
               "value": {
@@ -278,6 +307,10 @@
         {
           "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#IActorQuerySourceDereferenceLinkHypermediaArgs__member_mediatorQuerySourceIdentifyHypermedia",
           "memberFieldName": "mediatorQuerySourceIdentifyHypermedia"
+        },
+        {
+          "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#IActorQuerySourceDereferenceLinkHypermediaArgs__member_sparqlServiceDescriptionTimeout",
+          "memberFieldName": "sparqlServiceDescriptionTimeout"
         }
       ],
       "constructorArguments": []

package/components/context.jsonld CHANGED Viewed

@@ -23,6 +23,9 @@
           "args_mediatorQuerySourceIdentifyHypermedia": {
             "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_mediatorQuerySourceIdentifyHypermedia"
           },
+          "args_sparqlServiceDescriptionTimeout": {
+            "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_sparqlServiceDescriptionTimeout"
+          },
           "args_name": {
             "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_name"
           },
@@ -51,6 +54,9 @@
           "mediatorQuerySourceIdentifyHypermedia": {
             "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_mediatorQuerySourceIdentifyHypermedia"
           },
+          "sparqlServiceDescriptionTimeout": {
+            "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_sparqlServiceDescriptionTimeout"
+          },
           "name": {
             "@id": "caqsdlh:components/ActorQuerySourceDereferenceLinkHypermedia.jsonld#ActorQuerySourceDereferenceLinkHypermedia_args_name"
           },

package/lib/ActorQuerySourceDereferenceLinkHypermedia.d.ts CHANGED Viewed

@@ -6,6 +6,7 @@ import type { MediatorRdfMetadata } from '@comunica/bus-rdf-metadata';
 import type { MediatorRdfMetadataAccumulate } from '@comunica/bus-rdf-metadata-accumulate';
 import type { MediatorRdfMetadataExtract } from '@comunica/bus-rdf-metadata-extract';
 import type { TestResult, IActorTest } from '@comunica/core';
+import type { IActionContext } from '@comunica/types';
 /**
  * A comunica Dereference Query Source Hypermedia Resolve Actor.
  */
@@ -15,8 +16,10 @@ export declare class ActorQuerySourceDereferenceLinkHypermedia extends ActorQuer
     readonly mediatorMetadataExtract: MediatorRdfMetadataExtract;
     readonly mediatorMetadataAccumulate: MediatorRdfMetadataAccumulate;
     readonly mediatorQuerySourceIdentifyHypermedia: MediatorQuerySourceIdentifyHypermedia;
+    readonly sparqlServiceDescriptionTimeout: number;
     constructor(args: IActorQuerySourceDereferenceLinkHypermediaArgs);
     test(_action: IActionQuerySourceDereferenceLink): Promise<TestResult<IActorTest>>;
+    protected getDereferenceRdfContext(context: IActionContext, url: string, forceSourceType?: string): IActionContext;
     run(action: IActionQuerySourceDereferenceLink): Promise<IActorQuerySourceDereferenceLinkOutput>;
 }
 export interface IActorQuerySourceDereferenceLinkHypermediaArgs extends IActorQuerySourceDereferenceLinkArgs {
@@ -40,4 +43,10 @@ export interface IActorQuerySourceDereferenceLinkHypermediaArgs extends IActorQu
      * The hypermedia resolve mediator
      */
     mediatorQuerySourceIdentifyHypermedia: MediatorQuerySourceIdentifyHypermedia;
+    /**
+     * Timeout in ms for dereferencing SPARQL service descriptions.
+     * @range {integer}
+     * @default {3000}
+     */
+    sparqlServiceDescriptionTimeout?: number;
 }

package/lib/ActorQuerySourceDereferenceLinkHypermedia.js CHANGED Viewed

@@ -15,6 +15,7 @@ class ActorQuerySourceDereferenceLinkHypermedia extends bus_query_source_derefer
     mediatorMetadataExtract;
     mediatorMetadataAccumulate;
     mediatorQuerySourceIdentifyHypermedia;
+    sparqlServiceDescriptionTimeout;
     constructor(args) {
         super(args);
         this.mediatorDereferenceRdf = args.mediatorDereferenceRdf;
@@ -22,10 +23,27 @@ class ActorQuerySourceDereferenceLinkHypermedia extends bus_query_source_derefer
         this.mediatorMetadataExtract = args.mediatorMetadataExtract;
         this.mediatorMetadataAccumulate = args.mediatorMetadataAccumulate;
         this.mediatorQuerySourceIdentifyHypermedia = args.mediatorQuerySourceIdentifyHypermedia;
+        this.sparqlServiceDescriptionTimeout = args.sparqlServiceDescriptionTimeout ?? 3000;
     }
     async test(_action) {
         return (0, core_1.passTestVoid)();
     }
+    getDereferenceRdfContext(context, url, forceSourceType) {
+        const isSparqlServiceDescriptionDereference = forceSourceType === 'sparql' ||
+            (!forceSourceType && (url.endsWith('/sparql') || url.endsWith('/sparql/')));
+        if (this.sparqlServiceDescriptionTimeout > 0 &&
+            isSparqlServiceDescriptionDereference) {
+            const existingTimeout = context.get(context_entries_1.KeysHttp.httpTimeout);
+            const effectiveTimeout = existingTimeout !== undefined && existingTimeout > 0 ?
+                Math.min(existingTimeout, this.sparqlServiceDescriptionTimeout) :
+                this.sparqlServiceDescriptionTimeout;
+            if (effectiveTimeout === existingTimeout) {
+                return context;
+            }
+            return context.set(context_entries_1.KeysHttp.httpTimeout, effectiveTimeout);
+        }
+        return context;
+    }
     async run(action) {
         const context = action.link.context ? action.context.merge(action.link.context) : action.context;
         let url = action.link.url;
@@ -33,8 +51,9 @@ class ActorQuerySourceDereferenceLinkHypermedia extends bus_query_source_derefer
         let metadata;
         let cachePolicy;
         try {
+            const dereferenceRdfContext = this.getDereferenceRdfContext(context, url, action.link.forceSourceType);
             const dereferenceRdfOutput = await this.mediatorDereferenceRdf
-                .mediate({ context, url });
+                .mediate({ context: dereferenceRdfContext, url });
             url = dereferenceRdfOutput.url;
             if (dereferenceRdfOutput.cachePolicy) {
                 cachePolicy = new QuerySourceCachePolicyDereferenceWrapper_1.QuerySourceCachePolicyDereferenceWrapper(dereferenceRdfOutput.cachePolicy);

package/lib/ActorQuerySourceDereferenceLinkHypermedia.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ActorQuerySourceDereferenceLinkHypermedia.js","sourceRoot":"","sources":["ActorQuerySourceDereferenceLinkHypermedia.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IActorDereferenceRdfOutput, MediatorDereferenceRdf } from '@comunica/bus-dereference-rdf';\nimport {\n ActorQuerySourceDereferenceLink,\n} from '@comunica/bus-query-source-dereference-link';\nimport type {\n IActionQuerySourceDereferenceLink,\n IActorQuerySourceDereferenceLinkOutput,\n IActorQuerySourceDereferenceLinkArgs,\n} from '@comunica/bus-query-source-dereference-link';\nimport type { MediatorQuerySourceIdentifyHypermedia } from '@comunica/bus-query-source-identify-hypermedia';\nimport type { IActorRdfMetadataOutput, MediatorRdfMetadata } from '@comunica/bus-rdf-metadata';\nimport type { MediatorRdfMetadataAccumulate } from '@comunica/bus-rdf-metadata-accumulate';\nimport type { MediatorRdfMetadataExtract } from '@comunica/bus-rdf-metadata-extract';\nimport { KeysStatistics } from '@comunica/context-entries';\nimport type { TestResult, IActorTest } from '@comunica/core';\nimport { passTestVoid } from '@comunica/core';\nimport type { ICachePolicy, MetadataBindings } from '@comunica/types';\nimport type * as RDF from '@rdfjs/types';\nimport { Readable } from 'readable-stream';\nimport { QuerySourceCachePolicyDereferenceWrapper } from './QuerySourceCachePolicyDereferenceWrapper';\n\n/*\n A comunica Dereference Query Source Hypermedia Resolve Actor.\n /\nexport class ActorQuerySourceDereferenceLinkHypermedia extends ActorQuerySourceDereferenceLink {\n public readonly mediatorDereferenceRdf: MediatorDereferenceRdf;\n public readonly mediatorMetadata: MediatorRdfMetadata;\n public readonly mediatorMetadataExtract: MediatorRdfMetadataExtract;\n public readonly mediatorMetadataAccumulate: MediatorRdfMetadataAccumulate;\n public readonly mediatorQuerySourceIdentifyHypermedia: MediatorQuerySourceIdentifyHypermedia;\n\n public constructor(args: IActorQuerySourceDereferenceLinkHypermediaArgs) {\n super(args);\n this.mediatorDereferenceRdf = args.mediatorDereferenceRdf;\n this.mediatorMetadata = args.mediatorMetadata;\n this.mediatorMetadataExtract = args.mediatorMetadataExtract;\n this.mediatorMetadataAccumulate = args.mediatorMetadataAccumulate;\n this.mediatorQuerySourceIdentifyHypermedia = args.mediatorQuerySourceIdentifyHypermedia;\n }\n\n public async test(_action: IActionQuerySourceDereferenceLink): Promise<TestResult<IActorTest>> {\n return passTestVoid();\n }\n\n public async run(action: IActionQuerySourceDereferenceLink): Promise<IActorQuerySourceDereferenceLinkOutput> {\n const context = action.link.context ? action.context.merge(action.link.context) : action.context;\n let url = action.link.url;\n let quads: RDF.Stream;\n let metadata: Record<string, any>;\n let cachePolicy: ICachePolicy<IActionQuerySourceDereferenceLink> \| undefined;\n try {\n const dereferenceRdfOutput: IActorDereferenceRdfOutput = await this.mediatorDereferenceRdf\n .mediate({ context, url });\n url = dereferenceRdfOutput.url;\n if (dereferenceRdfOutput.cachePolicy) {\n cachePolicy = new QuerySourceCachePolicyDereferenceWrapper(dereferenceRdfOutput.cachePolicy);\n }\n\n // Determine the metadata\n const rdfMetadataOutput: IActorRdfMetadataOutput = await this.mediatorMetadata.mediate(\n { context, url, quads: dereferenceRdfOutput.data, triples: dereferenceRdfOutput.metadata?.triples },\n );\n\n rdfMetadataOutput.data.on('error', () => {\n // Silence errors in the data stream,\n // as they will be emitted again in the metadata stream,\n // and will result in a promise rejection anyways.\n // If we don't do this, we end up with an unhandled error message\n });\n\n metadata = (await this.mediatorMetadataExtract.mediate({\n context,\n url,\n // The problem appears to be conflicting metadata keys here\n metadata: rdfMetadataOutput.metadata,\n headers: dereferenceRdfOutput.headers,\n requestTime: dereferenceRdfOutput.requestTime,\n })).metadata;\n quads = rdfMetadataOutput.data;\n\n // Transform quads if needed.\n if (action.link.transform) {\n quads = await action.link.transform(quads);\n }\n } catch (error: unknown) {\n // Make sure that dereference errors are only emitted once an actor really needs the read quads\n // This allows SPARQL endpoints that error on service description fetching to still be source-forcible\n quads = new Readable();\n quads.read = () => {\n setTimeout(() => quads.emit('error', error));\n return null;\n };\n ({ metadata } = await this.mediatorMetadataAccumulate.mediate({ context, mode: 'initialize' }));\n\n // Log as warning, because the quads above may not always be consumed (e.g. for SPARQL endpoints),\n // so the user would not be notified of something going wrong otherwise.\n this.logWarn(context, `Metadata extraction for ${action.link.url} failed: ${(<Error>error).message}`);\n }\n\n // Determine the source\n const { source, dataset } = await this.mediatorQuerySourceIdentifyHypermedia.mediate({\n context,\n forceSourceType: action.link.forceSourceType,\n handledDatasets: action.handledDatasets,\n metadata,\n quads,\n url,\n });\n\n if (dataset && action.handledDatasets) {\n // Mark the dataset as applied\n // This is needed to make sure that things like QPF search forms are only applied once,\n // and next page links are followed after that.\n action.handledDatasets[dataset] = true;\n }\n\n // Track dereference event\n context.get(KeysStatistics.dereferencedLinks)?.updateStatistic({ url: action.link.url, metadata }, source);\n\n return { source, metadata: <MetadataBindings> metadata, dataset, cachePolicy };\n }\n}\n\nexport interface IActorQuerySourceDereferenceLinkHypermediaArgs extends IActorQuerySourceDereferenceLinkArgs {\n /\n The RDF dereference mediator\n /\n mediatorDereferenceRdf: MediatorDereferenceRdf;\n /\n The metadata mediator\n /\n mediatorMetadata: MediatorRdfMetadata;\n /\n The metadata extract mediator\n /\n mediatorMetadataExtract: MediatorRdfMetadataExtract;\n /\n The metadata accumulate mediator\n /\n mediatorMetadataAccumulate: MediatorRdfMetadataAccumulate;\n /\n The hypermedia resolve mediator\n */\n mediatorQuerySourceIdentifyHypermedia: MediatorQuerySourceIdentifyHypermedia;\n}\n"]}
1	+ {"version":3,"file":"ActorQuerySourceDereferenceLinkHypermedia.js","sourceRoot":"","sources":["ActorQuerySourceDereferenceLinkHypermedia.ts"],"names":[],"mappings":";;;AACA,mGAEqD;AAUrD,+DAAqE;AAErE,yCAA8C;AAG9C,qDAA2C;AAC3C,yGAAsG;AAEtG;;GAEG;AACH,MAAa,yCAA0C,SAAQ,mEAA+B;IAC5E,sBAAsB,CAAyB;IAC/C,gBAAgB,CAAsB;IACtC,uBAAuB,CAA6B;IACpD,0BAA0B,CAAgC;IAC1D,qCAAqC,CAAwC;IAC7E,+BAA+B,CAAS;IAExD,YAAmB,IAAoD;QACrE,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAC1D,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC9C,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC;QAC5D,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,0BAA0B,CAAC;QAClE,IAAI,CAAC,qCAAqC,GAAG,IAAI,CAAC,qCAAqC,CAAC;QACxF,IAAI,CAAC,+BAA+B,GAAG,IAAI,CAAC,+BAA+B,IAAI,IAAI,CAAC;IACtF,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAA0C;QAC1D,OAAO,IAAA,mBAAY,GAAE,CAAC;IACxB,CAAC;IAES,wBAAwB,CAChC,OAAuB,EACvB,GAAW,EACX,eAAwB;QAExB,MAAM,qCAAqC,GAAG,eAAe,KAAK,QAAQ;YACxE,CAAC,CAAC,eAAe,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9E,IACE,IAAI,CAAC,+BAA+B,GAAG,CAAC;YACxC,qCAAqC,EACrC,CAAC;YACD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,0BAAQ,CAAC,WAAW,CAAC,CAAC;YAC1D,MAAM,gBAAgB,GAAG,eAAe,KAAK,SAAS,IAAI,eAAe,GAAG,CAAC,CAAC,CAAC;gBAC7E,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,+BAA+B,CAAC,CAAC,CAAC;gBACjE,IAAI,CAAC,+BAA+B,CAAC;YACvC,IAAI,gBAAgB,KAAK,eAAe,EAAE,CAAC;gBACzC,OAAO,OAAO,CAAC;YACjB,CAAC;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,0BAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,MAAyC;QACxD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;QACjG,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QAC1B,IAAI,KAAiB,CAAC;QACtB,IAAI,QAA6B,CAAC;QAClC,IAAI,WAAwE,CAAC;QAC7E,IAAI,CAAC;YACH,MAAM,qBAAqB,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACvG,MAAM,oBAAoB,GAA+B,MAAM,IAAI,CAAC,sBAAsB;iBACvF,OAAO,CAAC,EAAE,OAAO,EAAE,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;YACpD,GAAG,GAAG,oBAAoB,CAAC,GAAG,CAAC;YAC/B,IAAI,oBAAoB,CAAC,WAAW,EAAE,CAAC;gBACrC,WAAW,GAAG,IAAI,mFAAwC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAC/F,CAAC;YAED,yBAAyB;YACzB,MAAM,iBAAiB,GAA4B,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CACpF,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,CACpG,CAAC;YAEF,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtC,qCAAqC;gBACrC,wDAAwD;gBACxD,kDAAkD;gBAClD,iEAAiE;YACnE,CAAC,CAAC,CAAC;YAEH,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC;gBACrD,OAAO;gBACP,GAAG;gBACH,2DAA2D;gBAC3D,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;gBACpC,OAAO,EAAE,oBAAoB,CAAC,OAAO;gBACrC,WAAW,EAAE,oBAAoB,CAAC,WAAW;aAC9C,CAAC,CAAC,CAAC,QAAQ,CAAC;YACb,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC;YAE/B,6BAA6B;YAC7B,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC1B,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,+FAA+F;YAC/F,sGAAsG;YACtG,KAAK,GAAG,IAAI,0BAAQ,EAAE,CAAC;YACvB,KAAK,CAAC,IAAI,GAAG,GAAG,EAAE;gBAChB,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;gBAC7C,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;YACF,CAAC,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;YAEhG,kGAAkG;YAClG,wEAAwE;YACxE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,2BAA2B,MAAM,CAAC,IAAI,CAAC,GAAG,YAAoB,KAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACxG,CAAC;QAED,uBAAuB;QACvB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,qCAAqC,CAAC,OAAO,CAAC;YACnF,OAAO;YACP,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe;YAC5C,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,QAAQ;YACR,KAAK;YACL,GAAG;SACJ,CAAC,CAAC;QAEH,IAAI,OAAO,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;YACtC,8BAA8B;YAC9B,uFAAuF;YACvF,+CAA+C;YAC/C,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;QACzC,CAAC;QAED,0BAA0B;QAC1B,OAAO,CAAC,GAAG,CAAC,gCAAc,CAAC,iBAAiB,CAAC,EAAE,eAAe,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;QAE3G,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAqB,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IACjF,CAAC;CACF;AA3HD,8FA2HC","sourcesContent":["import type { IActorDereferenceRdfOutput, MediatorDereferenceRdf } from '@comunica/bus-dereference-rdf';\nimport {\n ActorQuerySourceDereferenceLink,\n} from '@comunica/bus-query-source-dereference-link';\nimport type {\n IActionQuerySourceDereferenceLink,\n IActorQuerySourceDereferenceLinkOutput,\n IActorQuerySourceDereferenceLinkArgs,\n} from '@comunica/bus-query-source-dereference-link';\nimport type { MediatorQuerySourceIdentifyHypermedia } from '@comunica/bus-query-source-identify-hypermedia';\nimport type { IActorRdfMetadataOutput, MediatorRdfMetadata } from '@comunica/bus-rdf-metadata';\nimport type { MediatorRdfMetadataAccumulate } from '@comunica/bus-rdf-metadata-accumulate';\nimport type { MediatorRdfMetadataExtract } from '@comunica/bus-rdf-metadata-extract';\nimport { KeysHttp, KeysStatistics } from '@comunica/context-entries';\nimport type { TestResult, IActorTest } from '@comunica/core';\nimport { passTestVoid } from '@comunica/core';\nimport type { IActionContext, ICachePolicy, MetadataBindings } from '@comunica/types';\nimport type * as RDF from '@rdfjs/types';\nimport { Readable } from 'readable-stream';\nimport { QuerySourceCachePolicyDereferenceWrapper } from './QuerySourceCachePolicyDereferenceWrapper';\n\n/*\n A comunica Dereference Query Source Hypermedia Resolve Actor.\n /\nexport class ActorQuerySourceDereferenceLinkHypermedia extends ActorQuerySourceDereferenceLink {\n public readonly mediatorDereferenceRdf: MediatorDereferenceRdf;\n public readonly mediatorMetadata: MediatorRdfMetadata;\n public readonly mediatorMetadataExtract: MediatorRdfMetadataExtract;\n public readonly mediatorMetadataAccumulate: MediatorRdfMetadataAccumulate;\n public readonly mediatorQuerySourceIdentifyHypermedia: MediatorQuerySourceIdentifyHypermedia;\n public readonly sparqlServiceDescriptionTimeout: number;\n\n public constructor(args: IActorQuerySourceDereferenceLinkHypermediaArgs) {\n super(args);\n this.mediatorDereferenceRdf = args.mediatorDereferenceRdf;\n this.mediatorMetadata = args.mediatorMetadata;\n this.mediatorMetadataExtract = args.mediatorMetadataExtract;\n this.mediatorMetadataAccumulate = args.mediatorMetadataAccumulate;\n this.mediatorQuerySourceIdentifyHypermedia = args.mediatorQuerySourceIdentifyHypermedia;\n this.sparqlServiceDescriptionTimeout = args.sparqlServiceDescriptionTimeout ?? 3000;\n }\n\n public async test(_action: IActionQuerySourceDereferenceLink): Promise<TestResult<IActorTest>> {\n return passTestVoid();\n }\n\n protected getDereferenceRdfContext(\n context: IActionContext,\n url: string,\n forceSourceType?: string,\n ): IActionContext {\n const isSparqlServiceDescriptionDereference = forceSourceType === 'sparql' \|\|\n (!forceSourceType && (url.endsWith('/sparql') \|\| url.endsWith('/sparql/')));\n if (\n this.sparqlServiceDescriptionTimeout > 0 &&\n isSparqlServiceDescriptionDereference\n ) {\n const existingTimeout = context.get(KeysHttp.httpTimeout);\n const effectiveTimeout = existingTimeout !== undefined && existingTimeout > 0 ?\n Math.min(existingTimeout, this.sparqlServiceDescriptionTimeout) :\n this.sparqlServiceDescriptionTimeout;\n if (effectiveTimeout === existingTimeout) {\n return context;\n }\n return context.set(KeysHttp.httpTimeout, effectiveTimeout);\n }\n return context;\n }\n\n public async run(action: IActionQuerySourceDereferenceLink): Promise<IActorQuerySourceDereferenceLinkOutput> {\n const context = action.link.context ? action.context.merge(action.link.context) : action.context;\n let url = action.link.url;\n let quads: RDF.Stream;\n let metadata: Record<string, any>;\n let cachePolicy: ICachePolicy<IActionQuerySourceDereferenceLink> \| undefined;\n try {\n const dereferenceRdfContext = this.getDereferenceRdfContext(context, url, action.link.forceSourceType);\n const dereferenceRdfOutput: IActorDereferenceRdfOutput = await this.mediatorDereferenceRdf\n .mediate({ context: dereferenceRdfContext, url });\n url = dereferenceRdfOutput.url;\n if (dereferenceRdfOutput.cachePolicy) {\n cachePolicy = new QuerySourceCachePolicyDereferenceWrapper(dereferenceRdfOutput.cachePolicy);\n }\n\n // Determine the metadata\n const rdfMetadataOutput: IActorRdfMetadataOutput = await this.mediatorMetadata.mediate(\n { context, url, quads: dereferenceRdfOutput.data, triples: dereferenceRdfOutput.metadata?.triples },\n );\n\n rdfMetadataOutput.data.on('error', () => {\n // Silence errors in the data stream,\n // as they will be emitted again in the metadata stream,\n // and will result in a promise rejection anyways.\n // If we don't do this, we end up with an unhandled error message\n });\n\n metadata = (await this.mediatorMetadataExtract.mediate({\n context,\n url,\n // The problem appears to be conflicting metadata keys here\n metadata: rdfMetadataOutput.metadata,\n headers: dereferenceRdfOutput.headers,\n requestTime: dereferenceRdfOutput.requestTime,\n })).metadata;\n quads = rdfMetadataOutput.data;\n\n // Transform quads if needed.\n if (action.link.transform) {\n quads = await action.link.transform(quads);\n }\n } catch (error: unknown) {\n // Make sure that dereference errors are only emitted once an actor really needs the read quads\n // This allows SPARQL endpoints that error on service description fetching to still be source-forcible\n quads = new Readable();\n quads.read = () => {\n setTimeout(() => quads.emit('error', error));\n return null;\n };\n ({ metadata } = await this.mediatorMetadataAccumulate.mediate({ context, mode: 'initialize' }));\n\n // Log as warning, because the quads above may not always be consumed (e.g. for SPARQL endpoints),\n // so the user would not be notified of something going wrong otherwise.\n this.logWarn(context, `Metadata extraction for ${action.link.url} failed: ${(<Error>error).message}`);\n }\n\n // Determine the source\n const { source, dataset } = await this.mediatorQuerySourceIdentifyHypermedia.mediate({\n context,\n forceSourceType: action.link.forceSourceType,\n handledDatasets: action.handledDatasets,\n metadata,\n quads,\n url,\n });\n\n if (dataset && action.handledDatasets) {\n // Mark the dataset as applied\n // This is needed to make sure that things like QPF search forms are only applied once,\n // and next page links are followed after that.\n action.handledDatasets[dataset] = true;\n }\n\n // Track dereference event\n context.get(KeysStatistics.dereferencedLinks)?.updateStatistic({ url: action.link.url, metadata }, source);\n\n return { source, metadata: <MetadataBindings> metadata, dataset, cachePolicy };\n }\n}\n\nexport interface IActorQuerySourceDereferenceLinkHypermediaArgs extends IActorQuerySourceDereferenceLinkArgs {\n /\n The RDF dereference mediator\n /\n mediatorDereferenceRdf: MediatorDereferenceRdf;\n /\n The metadata mediator\n /\n mediatorMetadata: MediatorRdfMetadata;\n /\n The metadata extract mediator\n /\n mediatorMetadataExtract: MediatorRdfMetadataExtract;\n /\n The metadata accumulate mediator\n /\n mediatorMetadataAccumulate: MediatorRdfMetadataAccumulate;\n /\n The hypermedia resolve mediator\n /\n mediatorQuerySourceIdentifyHypermedia: MediatorQuerySourceIdentifyHypermedia;\n /\n Timeout in ms for dereferencing SPARQL service descriptions.\n * @range {integer}\n * @default {3000}\n */\n sparqlServiceDescriptionTimeout?: number;\n}\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-query-source-dereference-link-hypermedia",
-  "version": "5.1.3",
+  "version": "5.2.0",
   "description": "A dereference query-source-dereference-link actor",
   "lsd:module": true,
   "license": "MIT",
@@ -41,17 +41,17 @@
     "build:components": "componentsjs-generator"
   },
   "dependencies": {
-    "@comunica/bus-dereference": "^5.1.3",
-    "@comunica/bus-dereference-rdf": "^5.1.3",
-    "@comunica/bus-query-source-dereference-link": "^5.1.3",
-    "@comunica/bus-query-source-identify-hypermedia": "^5.1.3",
-    "@comunica/bus-rdf-metadata": "^5.1.3",
-    "@comunica/bus-rdf-metadata-accumulate": "^5.1.3",
-    "@comunica/bus-rdf-metadata-extract": "^5.1.3",
-    "@comunica/context-entries": "^5.1.3",
-    "@comunica/core": "^5.1.3",
-    "@comunica/types": "^5.1.3",
+    "@comunica/bus-dereference": "^5.2.0",
+    "@comunica/bus-dereference-rdf": "^5.2.0",
+    "@comunica/bus-query-source-dereference-link": "^5.2.0",
+    "@comunica/bus-query-source-identify-hypermedia": "^5.2.0",
+    "@comunica/bus-rdf-metadata": "^5.2.0",
+    "@comunica/bus-rdf-metadata-accumulate": "^5.2.0",
+    "@comunica/bus-rdf-metadata-extract": "^5.2.0",
+    "@comunica/context-entries": "^5.2.0",
+    "@comunica/core": "^5.2.0",
+    "@comunica/types": "^5.2.0",
     "readable-stream": "^4.7.0"
   },
-  "gitHead": "8740a36019a375fd2ba27e799c52d63eb5cacc24"
+  "gitHead": "ebb0e79bddcd850fcb8d0fb5b422af88e67fa283"
 }