@comunica/actor-init-query 2.2.2-alpha.18.0 → 2.3.0

package/lib/HttpServiceSparqlEndpoint.js

@@ -149,7 +149,9 @@ class HttpServiceSparqlEndpoint {
                     workerTimeouts[queryId] = setTimeout(() => {
                         stderr.write(`Worker ${worker.process.pid} timed out for query ${queryId}.\n`);
                         try {
-                            worker.send('shutdown');
+                            if (worker.isConnected()) {
+                                worker.send('shutdown');
+                            }
                         }
                         catch (error) {
                             stderr.write(`Unable to timeout worker ${worker.process.pid}: ${error.message}.\n`);
@@ -185,6 +187,28 @@ class HttpServiceSparqlEndpoint {
         const server = http.createServer(this.handleRequest.bind(this, engine, variants, stdout, stderr));
         server.listen(this.port);
         stderr.write(`Server worker (${process.pid}) running on http://localhost:${this.port}/sparql\n`);
+        // Keep track of all open connections
+        const openConnections = new Set();
+        server.on('request', (request, response) => {
+            openConnections.add(response);
+            response.on('close', () => {
+                openConnections.delete(response);
+            });
+        });
+        // Subscribe to shutdown messages
+        process.on('message', async (message) => {
+            if (message === 'shutdown') {
+                stderr.write(`Shutting down worker ${process.pid} with ${openConnections.size} open connections.\n`);
+                // Stop new connections from being accepted
+                server.close();
+                // Close all open connections
+                for (const connection of openConnections) {
+                    await new Promise(resolve => connection.end('!TIMEDOUT!', resolve));
+                }
+                // Kill the worker once the connections have been closed
+                process.exit(15);
+            }
+        });
     }
     /**
      * Handles an HTTP request.
@@ -305,20 +329,6 @@ class HttpServiceSparqlEndpoint {
         }
         // Send message to master process to indicate the start of an execution
         process.send({ type: 'start', queryId });
-        // Listen for shutdown events from master for timeouts
-        const messageListener = (message) => {
-            if (message === 'shutdown') {
-                response.end('!TIMEDOUT!', () => {
-                    // Wait a bit after sending response end, to make sure that all other responses have also been ended
-                    setTimeout(() => {
-                        stderr.write(`Shutting down worker ${process.pid} for query ${queryId}.\n`);
-                        // eslint-disable-next-line unicorn/no-process-exit
-                        process.exit(9);
-                    }, 1000);
-                });
-            }
-        };
-        process.on('message', messageListener);
         let eventEmitter;
         try {
             const { data } = await engine.resultToString(result, mediaType);
@@ -336,7 +346,6 @@ class HttpServiceSparqlEndpoint {
         }
         // Send message to master process to indicate the end of an execution
         response.on('close', () => {
-            process.removeListener('message', messageListener);
             process.send({ type: 'end', queryId });
         });
         this.stopResponse(response, queryId, eventEmitter);
@@ -405,6 +414,9 @@ class HttpServiceSparqlEndpoint {
             if (eventEmitter) {
                 // Remove all listeners so we are sure no more write calls are made
                 eventEmitter.removeAllListeners();
+                eventEmitter.on('error', () => {
+                    // Void any errors that may still occur
+                });
                 eventEmitter.emit('end');
             }
             try {
@@ -417,7 +429,7 @@ class HttpServiceSparqlEndpoint {
             if (self.freshWorkerPerQuery) {
                 process.stderr.write(`Killing fresh worker ${process.pid} after query ${queryId}.\n`);
                 // eslint-disable-next-line unicorn/no-process-exit
-                process.exit(9);
+                process.exit(15);
             }
         }
     }

package/package.json

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