@comunica/actor-init-query 2.3.0 → 2.3.1-alpha.23.0

package/components/HttpServiceSparqlEndpoint.jsonld

@@ -17,6 +17,10 @@
         {
           "@id": "caiq:components/HttpServiceSparqlEndpoint.jsonld#IQueryBody__member_value",
           "memberFieldName": "value"
+        },
+        {
+          "@id": "caiq:components/HttpServiceSparqlEndpoint.jsonld#IQueryBody__member_context",
+          "memberFieldName": "context"
         }
       ],
       "constructorArguments": []
@@ -51,6 +55,10 @@
           "@id": "caiq:components/HttpServiceSparqlEndpoint.jsonld#IHttpServiceSparqlEndpointArgs__member_freshWorkerPerQuery",
           "memberFieldName": "freshWorkerPerQuery"
         },
+        {
+          "@id": "caiq:components/HttpServiceSparqlEndpoint.jsonld#IHttpServiceSparqlEndpointArgs__member_contextOverride",
+          "memberFieldName": "contextOverride"
+        },
         {
           "@id": "caiq:components/HttpServiceSparqlEndpoint.jsonld#IHttpServiceSparqlEndpointArgs__member_moduleRootPath",
           "memberFieldName": "moduleRootPath"

package/lib/HttpServiceSparqlEndpoint.d.ts

@@ -21,6 +21,7 @@ export declare class HttpServiceSparqlEndpoint {
     readonly workers: number;
     readonly invalidateCacheBeforeQuery: boolean;
     readonly freshWorkerPerQuery: boolean;
+    readonly contextOverride: boolean;
     lastQueryId: number;
     constructor(args: IHttpServiceSparqlEndpointArgs);
     /**
@@ -108,6 +109,7 @@ export declare class HttpServiceSparqlEndpoint {
 export interface IQueryBody {
     type: 'query' | 'void';
     value: string;
+    context: Record<string, any> | undefined;
 }
 export interface IHttpServiceSparqlEndpointArgs extends IDynamicQueryEngineOptions {
     context?: any;
@@ -116,6 +118,7 @@ export interface IHttpServiceSparqlEndpointArgs extends IDynamicQueryEngineOptio
     workers?: number;
     invalidateCacheBeforeQuery?: boolean;
     freshWorkerPerQuery?: boolean;
+    contextOverride?: boolean;
     moduleRootPath: string;
     defaultConfigPath: string;
 }

package/lib/HttpServiceSparqlEndpoint.js

@@ -25,6 +25,7 @@ class HttpServiceSparqlEndpoint {
         this.workers = args.workers ?? 1;
         this.invalidateCacheBeforeQuery = Boolean(args.invalidateCacheBeforeQuery);
         this.freshWorkerPerQuery = Boolean(args.freshWorkerPerQuery);
+        this.contextOverride = Boolean(args.contextOverride);
         this.engine = new __1.QueryEngineFactoryBase(args.moduleRootPath, args.defaultConfigPath, actorInitQuery => new __1.QueryEngineBase(actorInitQuery)).create(args);
     }
     /**
@@ -93,6 +94,7 @@ class HttpServiceSparqlEndpoint {
         }
         const invalidateCacheBeforeQuery = args.invalidateCache;
         const freshWorkerPerQuery = args.freshWorker;
+        const contextOverride = args.contextOverride;
         const port = args.port;
         const timeout = args.timeout * 1000;
         const workers = args.workers;
@@ -104,6 +106,7 @@ class HttpServiceSparqlEndpoint {
             context,
             invalidateCacheBeforeQuery,
             freshWorkerPerQuery,
+            contextOverride,
             moduleRootPath,
             mainModulePath: moduleRootPath,
             port,
@@ -138,8 +141,14 @@ class HttpServiceSparqlEndpoint {
             // Respawn crashed workers
             worker.once('exit', (code, signal) => {
                 if (!worker.exitedAfterDisconnect) {
-                    stderr.write(`Worker ${worker.process.pid} died with ${code || signal}. Starting new worker.\n`);
-                    cluster.fork();
+                    if (code === 9 || signal === 'SIGKILL') {
+                        stderr.write(`Worker ${worker.process.pid} forcefully killed with ${code || signal}. Killing main process as well.\n`);
+                        cluster.disconnect();
+                    }
+                    else {
+                        stderr.write(`Worker ${worker.process.pid} died with ${code || signal}. Starting new worker.\n`);
+                        cluster.fork();
+                    }
                 }
             });
             // Handle worker timeouts
@@ -147,9 +156,9 @@ class HttpServiceSparqlEndpoint {
             worker.on('message', ({ type, queryId }) => {
                 if (type === 'start') {
                     workerTimeouts[queryId] = setTimeout(() => {
-                        stderr.write(`Worker ${worker.process.pid} timed out for query ${queryId}.\n`);
                         try {
                             if (worker.isConnected()) {
+                                stderr.write(`Worker ${worker.process.pid} timed out for query ${queryId}.\n`);
                                 worker.send('shutdown');
                             }
                         }
@@ -209,6 +218,19 @@ class HttpServiceSparqlEndpoint {
                 process.exit(15);
             }
         });
+        // Catch global errors, and cleanly close open connections
+        process.on('uncaughtException', async (error) => {
+            stderr.write(`Terminating worker ${process.pid} with ${openConnections.size} open connections due to uncaught exception.\n`);
+            stderr.write(error.stack);
+            // Stop new connections from being accepted
+            server.close();
+            // Close all open connections
+            for (const connection of openConnections) {
+                await new Promise(resolve => connection.end('!ERROR!', resolve));
+            }
+            // Kill the worker once the connections have been closed
+            process.exit(15);
+        });
     }
     /**
      * Handles an HTTP request.
@@ -258,7 +280,7 @@ class HttpServiceSparqlEndpoint {
             case 'GET':
                 // eslint-disable-next-line no-case-declarations
                 const queryValue = requestUrl.query.query;
-                queryBody = queryValue ? { type: 'query', value: queryValue } : undefined;
+                queryBody = queryValue ? { type: 'query', value: queryValue, context: undefined } : undefined;
                 // eslint-disable-next-line no-case-declarations
                 const headOnly = request.method === 'HEAD';
                 await this.writeQueryResult(engine, stdout, stderr, request, response, queryBody, mediaType, headOnly, true, this.lastQueryId++);
@@ -287,7 +309,10 @@ class HttpServiceSparqlEndpoint {
             return this.writeServiceDescription(engine, stdout, stderr, request, response, mediaType, headOnly);
         }
         // Determine context
-        let context = this.context;
+        let context = {
+            ...this.context,
+            ...this.contextOverride ? queryBody.context : undefined,
+        };
         if (readOnly) {
             context = { ...context, [context_entries_1.KeysQueryOperation.readOnly.name]: readOnly };
         }
@@ -334,7 +359,9 @@ class HttpServiceSparqlEndpoint {
             const { data } = await engine.resultToString(result, mediaType);
             data.on('error', (error) => {
                 stdout.write(`[500] Server error in results: ${error.message} \n`);
-                response.end('An internal server error occurred.\n');
+                if (!response.writableEnded) {
+                    response.end('An internal server error occurred.\n');
+                }
             });
             data.pipe(response);
             eventEmitter = data;
@@ -450,18 +477,27 @@ class HttpServiceSparqlEndpoint {
                 const contentType = request.headers['content-type'];
                 if (contentType) {
                     if (contentType.includes('application/sparql-query')) {
-                        return resolve({ type: 'query', value: body });
+                        return resolve({ type: 'query', value: body, context: undefined });
                     }
                     if (contentType.includes('application/sparql-update')) {
-                        return resolve({ type: 'void', value: body });
+                        return resolve({ type: 'void', value: body, context: undefined });
                     }
                     if (contentType.includes('application/x-www-form-urlencoded')) {
                         const bodyStructure = querystring.parse(body);
+                        let context;
+                        if (bodyStructure.context) {
+                            try {
+                                context = JSON.parse(bodyStructure.context);
+                            }
+                            catch (error) {
+                                reject(new Error(`Invalid POST body with context received ('${bodyStructure.context}'): ${error.message}`));
+                            }
+                        }
                         if (bodyStructure.query) {
-                            return resolve({ type: 'query', value: bodyStructure.query });
+                            return resolve({ type: 'query', value: bodyStructure.query, context });
                         }
                         if (bodyStructure.update) {
-                            return resolve({ type: 'void', value: bodyStructure.update });
+                            return resolve({ type: 'void', value: bodyStructure.update, context });
                         }
                     }
                 }

package/lib/cli/CliArgsHandlerHttp.js

@@ -53,6 +53,11 @@ class CliArgsHandlerHttp {
                 describe: 'Kills the worker after each query execution',
                 default: false,
             },
+            contextOverride: {
+                type: 'boolean',
+                describe: 'If the query context can be overridden through POST requests',
+                default: false,
+            },
         })
             .check(args => {
             if (args.version) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-init-query",
-  "version": "2.3.0",
+  "version": "2.3.1-alpha.23.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.3.0",
-    "@comunica/bus-context-preprocess": "^2.3.0",
-    "@comunica/bus-http-invalidate": "^2.3.0",
-    "@comunica/bus-init": "^2.3.0",
-    "@comunica/bus-optimize-query-operation": "^2.3.0",
-    "@comunica/bus-query-operation": "^2.3.0",
-    "@comunica/bus-query-parse": "^2.3.0",
-    "@comunica/bus-query-result-serialize": "^2.3.0",
-    "@comunica/context-entries": "^2.3.0",
-    "@comunica/core": "^2.3.0",
-    "@comunica/logger-pretty": "^2.3.0",
-    "@comunica/runner": "^2.3.0",
-    "@comunica/types": "^2.3.0",
+    "@comunica/actor-http-proxy": "2.3.1-alpha.23.0",
+    "@comunica/bus-context-preprocess": "2.3.1-alpha.23.0",
+    "@comunica/bus-http-invalidate": "2.3.1-alpha.23.0",
+    "@comunica/bus-init": "2.3.1-alpha.23.0",
+    "@comunica/bus-optimize-query-operation": "2.3.1-alpha.23.0",
+    "@comunica/bus-query-operation": "2.3.1-alpha.23.0",
+    "@comunica/bus-query-parse": "2.3.1-alpha.23.0",
+    "@comunica/bus-query-result-serialize": "2.3.1-alpha.23.0",
+    "@comunica/context-entries": "2.3.1-alpha.23.0",
+    "@comunica/core": "2.3.1-alpha.23.0",
+    "@comunica/logger-pretty": "2.3.1-alpha.23.0",
+    "@comunica/runner": "2.3.1-alpha.23.0",
+    "@comunica/types": "2.3.1-alpha.23.0",
     "@rdfjs/types": "*",
     "@types/yargs": "^17.0.2",
     "asynciterator": "^3.4.2",
@@ -62,5 +62,5 @@
   "browser": {
     "./lib/index.js": "./lib/index-browser.js"
   },
-  "gitHead": "1e88a2053c15d75cc2e93c5161abdb24a4346c3d"
+  "gitHead": "4dd99fee904c64e9ef700eb5080197c4a03a36fa"
 }