nx 19.8.12 → 19.8.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.8.12",
+  "version": "19.8.13",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -67,7 +67,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.8.12"
+    "@nrwl/tao": "19.8.13"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.8.12",
-    "@nx/nx-darwin-arm64": "19.8.12",
-    "@nx/nx-linux-x64-gnu": "19.8.12",
-    "@nx/nx-linux-x64-musl": "19.8.12",
-    "@nx/nx-win32-x64-msvc": "19.8.12",
-    "@nx/nx-linux-arm64-gnu": "19.8.12",
-    "@nx/nx-linux-arm64-musl": "19.8.12",
-    "@nx/nx-linux-arm-gnueabihf": "19.8.12",
-    "@nx/nx-win32-arm64-msvc": "19.8.12",
-    "@nx/nx-freebsd-x64": "19.8.12"
+    "@nx/nx-darwin-x64": "19.8.13",
+    "@nx/nx-darwin-arm64": "19.8.13",
+    "@nx/nx-linux-x64-gnu": "19.8.13",
+    "@nx/nx-linux-x64-musl": "19.8.13",
+    "@nx/nx-win32-x64-msvc": "19.8.13",
+    "@nx/nx-linux-arm64-gnu": "19.8.13",
+    "@nx/nx-linux-arm64-musl": "19.8.13",
+    "@nx/nx-linux-arm-gnueabihf": "19.8.13",
+    "@nx/nx-win32-arm64-msvc": "19.8.13",
+    "@nx/nx-freebsd-x64": "19.8.13"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/daemon/client/client.js

@@ -408,6 +408,9 @@ class DaemonClient {
         }
     }
     async startInBackground() {
+        if (global.NX_PLUGIN_WORKER) {
+            throw new Error('Fatal Error: Something unexpected has occurred. Plugin Workers should not start a new daemon process. Please report this issue.');
+        }
         (0, node_fs_1.mkdirSync)(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE, { recursive: true });
         if (!(0, node_fs_1.existsSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE)) {
             (0, node_fs_1.writeFileSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, '');

package/src/daemon/server/server.js

@@ -353,6 +353,15 @@ async function startServer() {
             server.listen((0, socket_utils_1.getFullOsSocketPath)(), async () => {
                 try {
                     logger_1.serverLogger.log(`Started listening on: ${(0, socket_utils_1.getFullOsSocketPath)()}`);
+                    setInterval(() => {
+                        if ((0, cache_1.getDaemonProcessIdSync)() !== process.pid) {
+                            return (0, shutdown_utils_1.handleServerProcessTermination)({
+                                server,
+                                reason: 'this process is no longer the current daemon (native)',
+                                sockets: exports.openSockets,
+                            });
+                        }
+                    }).unref();
                     // this triggers the storage of the lock file hash
                     daemonIsOutdated();
                     if (!(0, shutdown_utils_1.getWatcherInstance)()) {

package/src/project-graph/plugins/isolation/plugin-worker.js

@@ -10,9 +10,19 @@ if (process.env.NX_PERF_LOGGING === 'true') {
     require('../../../utils/perf-logging');
 }
 global.NX_GRAPH_CREATION = true;
+global.NX_PLUGIN_WORKER = true;
+let connected = false;
 let plugin;
 const socketPath = process.argv[2];
 const server = (0, net_1.createServer)((socket) => {
+    connected = true;
+    // This handles cases where the host process was killed
+    // after the worker connected but before the worker was
+    // instructed to load the plugin.
+    const loadTimeout = setTimeout(() => {
+        console.error(`Plugin Worker exited because no plugin was loaded within 10 seconds of starting up.`);
+        process.exit(1);
+    }, 10000).unref();
     socket.on('data', (0, consume_messages_from_socket_1.consumeMessagesFromSocket)((raw) => {
         const message = JSON.parse(raw.toString());
         if (!(0, messaging_1.isPluginWorkerMessage)(message)) {
@@ -20,6 +30,8 @@ const server = (0, net_1.createServer)((socket) => {
         }
         return (0, messaging_1.consumeMessage)(socket, message, {
             load: async ({ plugin: pluginConfiguration, root }) => {
+                if (loadTimeout)
+                    clearTimeout(loadTimeout);
                 process.chdir(root);
                 try {
                     const [promise] = (0, loader_1.loadNxPlugin)(pluginConfiguration, root);
@@ -131,6 +143,8 @@ const server = (0, net_1.createServer)((socket) => {
     // since the worker is spawned per host process. As such,
     // we can safely close the worker when the host disconnects.
     socket.on('end', () => {
+        // Destroys the socket once it's fully closed.
+        socket.destroySoon();
         // Stops accepting new connections, but existing connections are
         // not closed immediately.
         server.close(() => {
@@ -140,11 +154,15 @@ const server = (0, net_1.createServer)((socket) => {
             catch (e) { }
             process.exit(0);
         });
-        // Destroys the socket once it's fully closed.
-        socket.destroySoon();
     });
 });
 server.listen(socketPath);
+setTimeout(() => {
+    if (!connected) {
+        console.error('The plugin worker is exiting as it was not connected to within 5 seconds.');
+        process.exit(1);
+    }
+}, 5000).unref();
 const exitHandler = (exitCode) => () => {
     server.close();
     try {