@comunica/actor-init-query 2.2.0 → 2.2.2-alpha.13.0

package/components/ActorInitQuery.jsonld

@@ -2,6 +2,7 @@
   "@context": [
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-init-query/^2.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/core/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/types/^2.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-init/^2.0.0/components/context.jsonld"
   ],
   "@id": "npmd:@comunica/actor-init-query",
@@ -57,7 +58,7 @@
         },
         {
           "@id": "caiq:components/ActorInitQuery.jsonld#ActorInitQuery_args_logger",
-          "range": "cc:components/Logger.jsonld#Logger",
+          "range": "ct:components/Logger.jsonld#Logger",
           "default": {
             "@type": "npmd:@comunica/logger-void/^2.0.0/components/LoggerVoid.jsonld#LoggerVoid"
           },
@@ -122,11 +123,14 @@
               "lenient": "@comunica/actor-init-query:lenient",
               "httpIncludeCredentials": "@comunica/bus-http:include-credentials",
               "httpAuth": "@comunica/bus-http:auth",
+              "httpTimeout": "@comunica/bus-http:http-timeout",
+              "httpBodyTimeout": "@comunica/bus-http:http-body-timeout",
               "fetch": "@comunica/bus-http:fetch",
               "readOnly": "@comunica/bus-query-operation:readOnly",
               "extensionFunctions": "@comunica/actor-init-query:extensionFunctions",
               "extensionFunctionCreator": "@comunica/actor-init-query:extensionFunctionCreator",
-              "explain": "@comunica/actor-init-query:explain"
+              "explain": "@comunica/actor-init-query:explain",
+              "unionDefaultGraph": "@comunica/bus-query-operation:unionDefaultGraph"
             }
           },
           "comment": "A record of context shortcuts to full context keys (as defined in @comunica/context-entries)."

package/components/ActorInitQueryBase.jsonld

@@ -2,6 +2,7 @@
   "@context": [
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-init-query/^2.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/core/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/types/^2.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-init/^2.0.0/components/context.jsonld"
   ],
   "@id": "npmd:@comunica/actor-init-query",
@@ -58,7 +59,7 @@
         },
         {
           "@id": "caiq:components/ActorInitQueryBase.jsonld#ActorInitQueryBase_args_logger",
-          "range": "cc:components/Logger.jsonld#Logger",
+          "range": "ct:components/Logger.jsonld#Logger",
           "default": {
             "@type": "npmd:@comunica/logger-void/^2.0.0/components/LoggerVoid.jsonld#LoggerVoid"
           },
@@ -123,11 +124,14 @@
               "lenient": "@comunica/actor-init-query:lenient",
               "httpIncludeCredentials": "@comunica/bus-http:include-credentials",
               "httpAuth": "@comunica/bus-http:auth",
+              "httpTimeout": "@comunica/bus-http:http-timeout",
+              "httpBodyTimeout": "@comunica/bus-http:http-body-timeout",
               "fetch": "@comunica/bus-http:fetch",
               "readOnly": "@comunica/bus-query-operation:readOnly",
               "extensionFunctions": "@comunica/actor-init-query:extensionFunctions",
               "extensionFunctionCreator": "@comunica/actor-init-query:extensionFunctionCreator",
-              "explain": "@comunica/actor-init-query:explain"
+              "explain": "@comunica/actor-init-query:explain",
+              "unionDefaultGraph": "@comunica/bus-query-operation:unionDefaultGraph"
             }
           },
           "comment": "A record of context shortcuts to full context keys (as defined in @comunica/context-entries)."
@@ -262,7 +266,7 @@
         {
           "@id": "caiq:components/ActorInitQueryBase.jsonld#ActorInitQueryBase__member_logger",
           "memberFieldName": "logger",
-          "range": "cc:components/Logger.jsonld#Logger"
+          "range": "ct:components/Logger.jsonld#Logger"
         },
         {
           "@id": "caiq:components/ActorInitQueryBase.jsonld#ActorInitQueryBase__member_queryString",

package/components/HttpServiceSparqlEndpoint.jsonld

@@ -47,6 +47,10 @@
           "@id": "caiq:components/HttpServiceSparqlEndpoint.jsonld#IHttpServiceSparqlEndpointArgs__member_invalidateCacheBeforeQuery",
           "memberFieldName": "invalidateCacheBeforeQuery"
         },
+        {
+          "@id": "caiq:components/HttpServiceSparqlEndpoint.jsonld#IHttpServiceSparqlEndpointArgs__member_freshWorkerPerQuery",
+          "memberFieldName": "freshWorkerPerQuery"
+        },
         {
           "@id": "caiq:components/HttpServiceSparqlEndpoint.jsonld#IHttpServiceSparqlEndpointArgs__member_moduleRootPath",
           "memberFieldName": "moduleRootPath"

package/lib/ActorInitQueryBase.d.ts

@@ -6,7 +6,8 @@ import type { MediatorOptimizeQueryOperation } from '@comunica/bus-optimize-quer
 import type { MediatorQueryOperation } from '@comunica/bus-query-operation';
 import type { MediatorQueryParse } from '@comunica/bus-query-parse';
 import type { MediatorQueryResultSerializeHandle, MediatorQueryResultSerializeMediaTypes, MediatorQueryResultSerializeMediaTypeFormats } from '@comunica/bus-query-result-serialize';
-import type { IActorTest, Logger } from '@comunica/core';
+import type { IActorTest } from '@comunica/core';
+import type { Logger } from '@comunica/types';
 /**
  * A browser-safe comunica Query Init Actor.
  */
@@ -96,11 +97,14 @@ export interface IActorInitQueryBaseArgs extends IActorInitArgs {
      *   "lenient": "@comunica/actor-init-query:lenient",
      *   "httpIncludeCredentials": "@comunica/bus-http:include-credentials",
      *   "httpAuth": "@comunica/bus-http:auth",
+     *   "httpTimeout": "@comunica/bus-http:http-timeout",
+     *   "httpBodyTimeout": "@comunica/bus-http:http-body-timeout",
      *   "fetch": "@comunica/bus-http:fetch",
      *   "readOnly": "@comunica/bus-query-operation:readOnly",
      *   "extensionFunctions": "@comunica/actor-init-query:extensionFunctions",
      *   "extensionFunctionCreator": "@comunica/actor-init-query:extensionFunctionCreator",
-     *   "explain": "@comunica/actor-init-query:explain"
+     *   "explain": "@comunica/actor-init-query:explain",
+     *   "unionDefaultGraph": "@comunica/bus-query-operation:unionDefaultGraph"
      * }}
      */
     contextKeyShortcuts: Record<string, string>;

package/lib/HttpServiceSparqlEndpoint.d.ts

@@ -1,4 +1,7 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import type { EventEmitter } from 'events';
 import * as http from 'http';
 import type { Writable } from 'stream';
@@ -17,6 +20,7 @@ export declare class HttpServiceSparqlEndpoint {
     readonly port: number;
     readonly workers: number;
     readonly invalidateCacheBeforeQuery: boolean;
+    readonly freshWorkerPerQuery: boolean;
     constructor(args: IHttpServiceSparqlEndpointArgs);
     /**
      * Starts the server
@@ -108,6 +112,7 @@ export interface IHttpServiceSparqlEndpointArgs extends IDynamicQueryEngineOptio
     port?: number;
     workers?: number;
     invalidateCacheBeforeQuery?: boolean;
+    freshWorkerPerQuery?: boolean;
     moduleRootPath: string;
     defaultConfigPath: string;
 }

package/lib/HttpServiceSparqlEndpoint.js

@@ -23,6 +23,7 @@ class HttpServiceSparqlEndpoint {
         this.port = args.port ?? 3000;
         this.workers = args.workers ?? 1;
         this.invalidateCacheBeforeQuery = Boolean(args.invalidateCacheBeforeQuery);
+        this.freshWorkerPerQuery = Boolean(args.freshWorkerPerQuery);
         this.engine = new __1.QueryEngineFactoryBase(args.moduleRootPath, args.defaultConfigPath, actorInitQuery => new __1.QueryEngineBase(actorInitQuery)).create(args);
     }
     /**
@@ -90,6 +91,7 @@ class HttpServiceSparqlEndpoint {
             exit(1);
         }
         const invalidateCacheBeforeQuery = args.invalidateCache;
+        const freshWorkerPerQuery = args.freshWorker;
         const port = args.port;
         const timeout = args.timeout * 1000;
         const workers = args.workers;
@@ -100,6 +102,7 @@ class HttpServiceSparqlEndpoint {
             configPath,
             context,
             invalidateCacheBeforeQuery,
+            freshWorkerPerQuery,
             moduleRootPath,
             mainModulePath: moduleRootPath,
             port,
@@ -383,6 +386,8 @@ class HttpServiceSparqlEndpoint {
      */
     stopResponse(response, eventEmitter) {
         response.on('close', killClient);
+        // eslint-disable-next-line @typescript-eslint/no-this-alias,consistent-this
+        const self = this;
         function killClient() {
             if (eventEmitter) {
                 // Remove all listeners so we are sure no more write calls are made
@@ -395,6 +400,11 @@ class HttpServiceSparqlEndpoint {
             catch {
                 // Do nothing
             }
+            // Kill the worker if we want fresh workers per query
+            if (self.freshWorkerPerQuery) {
+                // eslint-disable-next-line unicorn/no-process-exit
+                process.exit(9);
+            }
         }
     }
     /**

package/lib/cli/CliArgsHandlerBase.js

@@ -103,6 +103,18 @@ class CliArgsHandlerBase {
                 type: 'boolean',
                 describe: 'Prints the full stacktrace when errors are thrown',
             },
+            httpTimeout: {
+                type: 'number',
+                describe: 'HTTP requests timeout in milliseconds',
+            },
+            httpBodyTimeout: {
+                type: 'boolean',
+                describe: 'Makes the HTTP timeout take into account the response body stream read',
+            },
+            unionDefaultGraph: {
+                type: 'boolean',
+                describe: 'If the default graph should also contain the union of all named graphs',
+            },
         })
             .exitProcess(false)
             .fail(false)
@@ -164,6 +176,21 @@ class CliArgsHandlerBase {
         if (args.lenient) {
             context[context_entries_1.KeysInitQuery.lenient.name] = true;
         }
+        // Define HTTP timeout
+        if (args.httpTimeout) {
+            context[context_entries_1.KeysHttp.httpTimeout.name] = args.httpTimeout;
+        }
+        // Define HTTP body timeout
+        if (args.httpBodyTimeout) {
+            if (!args.httpTimeout) {
+                throw new Error('The --httpBodyTimeout option requires the --httpTimeout option to be set');
+            }
+            context[context_entries_1.KeysHttp.httpBodyTimeout.name] = args.httpBodyTimeout;
+        }
+        // Define union default graph
+        if (args.unionDefaultGraph) {
+            context[context_entries_1.KeysQueryOperation.unionDefaultGraph.name] = true;
+        }
     }
 }
 exports.CliArgsHandlerBase = CliArgsHandlerBase;

package/lib/cli/CliArgsHandlerHttp.js

@@ -48,6 +48,11 @@ class CliArgsHandlerHttp {
                 describe: 'Enable cache invalidation before each query execution',
                 default: false,
             },
+            freshWorker: {
+                type: 'boolean',
+                describe: 'Kills the worker after each query execution',
+                default: false,
+            },
         })
             .check(args => {
             if (args.version) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-init-query",
-  "version": "2.2.0",
+  "version": "2.2.2-alpha.13.0",
   "description": "A query init actor",
   "lsd:module": true,
   "main": "lib/index.js",
@@ -31,27 +31,25 @@
     "lib/**/*.js"
   ],
   "dependencies": {
-    "@comunica/actor-http-proxy": "^2.2.0",
-    "@comunica/bindings-factory": "^2.2.0",
-    "@comunica/bus-context-preprocess": "^2.2.0",
-    "@comunica/bus-http-invalidate": "^2.2.0",
-    "@comunica/bus-init": "^2.2.0",
-    "@comunica/bus-optimize-query-operation": "^2.2.0",
-    "@comunica/bus-query-operation": "^2.2.0",
-    "@comunica/bus-query-parse": "^2.2.0",
-    "@comunica/bus-query-result-serialize": "^2.2.0",
-    "@comunica/context-entries": "^2.2.0",
-    "@comunica/core": "^2.2.0",
-    "@comunica/logger-pretty": "^2.2.0",
-    "@comunica/runner": "^2.2.0",
-    "@comunica/types": "^2.2.0",
+    "@comunica/actor-http-proxy": "2.2.2-alpha.13.0",
+    "@comunica/bus-context-preprocess": "2.2.2-alpha.13.0",
+    "@comunica/bus-http-invalidate": "2.2.2-alpha.13.0",
+    "@comunica/bus-init": "2.2.2-alpha.13.0",
+    "@comunica/bus-optimize-query-operation": "2.2.2-alpha.13.0",
+    "@comunica/bus-query-operation": "2.2.2-alpha.13.0",
+    "@comunica/bus-query-parse": "2.2.2-alpha.13.0",
+    "@comunica/bus-query-result-serialize": "2.2.2-alpha.13.0",
+    "@comunica/context-entries": "2.2.2-alpha.13.0",
+    "@comunica/core": "2.2.2-alpha.13.0",
+    "@comunica/logger-pretty": "2.2.2-alpha.13.0",
+    "@comunica/runner": "2.2.2-alpha.13.0",
+    "@comunica/types": "2.2.2-alpha.13.0",
     "@rdfjs/types": "*",
     "@types/yargs": "^17.0.2",
-    "asynciterator": "^3.3.0",
+    "asynciterator": "^3.4.2",
     "negotiate": "^1.0.1",
     "rdf-quad": "^1.4.0",
     "rdf-string": "^1.5.0",
-    "rdf-terms": "^1.6.2",
     "sparqlalgebrajs": "^4.0.0",
     "streamify-string": "^1.0.1",
     "yargs": "^17.1.1"
@@ -64,5 +62,5 @@
   "browser": {
     "./lib/index.js": "./lib/index-browser.js"
   },
-  "gitHead": "00d4108e46250fb94b586bfb8caf5e8b1c704160"
+  "gitHead": "f3a79b04bcf5f96767847cc335145491ccba68ff"
 }