@comunica/actor-init-query 2.2.2-alpha.11.0 → 2.2.2-alpha.12.0

package/components/ActorInitQuery.jsonld

@@ -124,6 +124,7 @@
               "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",

package/components/ActorInitQueryBase.jsonld

@@ -125,6 +125,7 @@
               "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",

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

@@ -98,6 +98,7 @@ export interface IActorInitQueryBaseArgs extends IActorInitArgs {
      *   "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",

package/lib/HttpServiceSparqlEndpoint.d.ts

@@ -17,6 +17,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 +109,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

@@ -107,6 +107,10 @@ class CliArgsHandlerBase {
                 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',
@@ -176,6 +180,13 @@ class CliArgsHandlerBase {
         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;

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.2-alpha.11.0",
+  "version": "2.2.2-alpha.12.0",
   "description": "A query init actor",
   "lsd:module": true,
   "main": "lib/index.js",
@@ -31,19 +31,19 @@
     "lib/**/*.js"
   ],
   "dependencies": {
-    "@comunica/actor-http-proxy": "2.2.2-alpha.11.0",
-    "@comunica/bus-context-preprocess": "2.2.2-alpha.11.0",
-    "@comunica/bus-http-invalidate": "2.2.2-alpha.11.0",
-    "@comunica/bus-init": "2.2.2-alpha.11.0",
-    "@comunica/bus-optimize-query-operation": "2.2.2-alpha.11.0",
-    "@comunica/bus-query-operation": "2.2.2-alpha.11.0",
-    "@comunica/bus-query-parse": "2.2.2-alpha.11.0",
-    "@comunica/bus-query-result-serialize": "2.2.2-alpha.11.0",
-    "@comunica/context-entries": "2.2.2-alpha.11.0",
-    "@comunica/core": "2.2.2-alpha.11.0",
-    "@comunica/logger-pretty": "2.2.2-alpha.11.0",
-    "@comunica/runner": "2.2.2-alpha.11.0",
-    "@comunica/types": "2.2.2-alpha.11.0",
+    "@comunica/actor-http-proxy": "2.2.2-alpha.12.0",
+    "@comunica/bus-context-preprocess": "2.2.2-alpha.12.0",
+    "@comunica/bus-http-invalidate": "2.2.2-alpha.12.0",
+    "@comunica/bus-init": "2.2.2-alpha.12.0",
+    "@comunica/bus-optimize-query-operation": "2.2.2-alpha.12.0",
+    "@comunica/bus-query-operation": "2.2.2-alpha.12.0",
+    "@comunica/bus-query-parse": "2.2.2-alpha.12.0",
+    "@comunica/bus-query-result-serialize": "2.2.2-alpha.12.0",
+    "@comunica/context-entries": "2.2.2-alpha.12.0",
+    "@comunica/core": "2.2.2-alpha.12.0",
+    "@comunica/logger-pretty": "2.2.2-alpha.12.0",
+    "@comunica/runner": "2.2.2-alpha.12.0",
+    "@comunica/types": "2.2.2-alpha.12.0",
     "@rdfjs/types": "*",
     "@types/yargs": "^17.0.2",
     "asynciterator": "^3.4.0",
@@ -62,5 +62,5 @@
   "browser": {
     "./lib/index.js": "./lib/index-browser.js"
   },
-  "gitHead": "b122c1ac9a3382a65812c843727d752ad21d4846"
+  "gitHead": "399067ba332379a62a0d82782b5930f2925e262b"
 }