@comunica/actor-init-query 2.2.2-alpha.20.0 → 2.3.1-alpha.22.0

package/lib/HttpServiceSparqlEndpoint.js

@@ -138,8 +138,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 +153,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');
                             }
                         }
@@ -206,10 +212,22 @@ class HttpServiceSparqlEndpoint {
                     await new Promise(resolve => connection.end('!TIMEDOUT!', resolve));
                 }
                 // Kill the worker once the connections have been closed
-                // eslint-disable-next-line unicorn/no-process-exit
                 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.
@@ -335,7 +353,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-init-query",
-  "version": "2.2.2-alpha.20.0",
+  "version": "2.3.1-alpha.22.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.20.0",
-    "@comunica/bus-context-preprocess": "2.2.2-alpha.20.0",
-    "@comunica/bus-http-invalidate": "2.2.2-alpha.20.0",
-    "@comunica/bus-init": "2.2.2-alpha.20.0",
-    "@comunica/bus-optimize-query-operation": "2.2.2-alpha.20.0",
-    "@comunica/bus-query-operation": "2.2.2-alpha.20.0",
-    "@comunica/bus-query-parse": "2.2.2-alpha.20.0",
-    "@comunica/bus-query-result-serialize": "2.2.2-alpha.20.0",
-    "@comunica/context-entries": "2.2.2-alpha.20.0",
-    "@comunica/core": "2.2.2-alpha.20.0",
-    "@comunica/logger-pretty": "2.2.2-alpha.20.0",
-    "@comunica/runner": "2.2.2-alpha.20.0",
-    "@comunica/types": "2.2.2-alpha.20.0",
+    "@comunica/actor-http-proxy": "2.3.1-alpha.22.0",
+    "@comunica/bus-context-preprocess": "2.3.1-alpha.22.0",
+    "@comunica/bus-http-invalidate": "2.3.1-alpha.22.0",
+    "@comunica/bus-init": "2.3.1-alpha.22.0",
+    "@comunica/bus-optimize-query-operation": "2.3.1-alpha.22.0",
+    "@comunica/bus-query-operation": "2.3.1-alpha.22.0",
+    "@comunica/bus-query-parse": "2.3.1-alpha.22.0",
+    "@comunica/bus-query-result-serialize": "2.3.1-alpha.22.0",
+    "@comunica/context-entries": "2.3.1-alpha.22.0",
+    "@comunica/core": "2.3.1-alpha.22.0",
+    "@comunica/logger-pretty": "2.3.1-alpha.22.0",
+    "@comunica/runner": "2.3.1-alpha.22.0",
+    "@comunica/types": "2.3.1-alpha.22.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": "cde1c9148ae06ad0878515d011601daebb659665"
+  "gitHead": "300afb0d1e324dff121acd0fbd24b4eb37e201f5"
 }