fix(core): keep plugin workers until main process shutdown (#22860)

nrwl · Apr 17, 2024 · e7c2ebd · e7c2ebd
1 parent 18070cf
commit e7c2ebd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/packages/nx/src/project-graph/plugins/isolation/index.ts b/packages/nx/src/project-graph/plugins/isolation/index.ts
@@ -3,10 +3,10 @@ import { PluginConfiguration } from '../../../config/nx-json';
 import { LoadedNxPlugin } from '../internal-api';
 import { loadRemoteNxPlugin } from './plugin-pool';
 
-const remotePluginCache = new Map<
-  string,
-  [Promise<LoadedNxPlugin>, () => void]
->();
+/**
+ * Used to ensure 1 plugin : 1 worker
+ */
+const remotePluginCache = new Map<string, Promise<LoadedNxPlugin>>();
 
 export function loadNxPluginInIsolation(
   plugin: PluginConfiguration,
@@ -15,10 +15,11 @@ export function loadNxPluginInIsolation(
   const cacheKey = JSON.stringify(plugin);
 
   if (remotePluginCache.has(cacheKey)) {
-    return remotePluginCache.get(cacheKey);
+    return [remotePluginCache.get(cacheKey), () => {}];
   }
 
-  const [loadingPlugin, cleanup] = loadRemoteNxPlugin(plugin, root);
-  remotePluginCache.set(cacheKey, [loadingPlugin, cleanup]);
-  return [loadingPlugin, cleanup];
+  const loadingPlugin = loadRemoteNxPlugin(plugin, root);
+  remotePluginCache.set(cacheKey, loadingPlugin);
+  // We clean up plugin workers when Nx process completes.
+  return [loadingPlugin, () => {}];
 }
diff --git a/packages/nx/src/project-graph/plugins/isolation/plugin-pool.ts b/packages/nx/src/project-graph/plugins/isolation/plugin-pool.ts
@@ -22,7 +22,7 @@ interface PendingPromise {
 export function loadRemoteNxPlugin(
   plugin: PluginConfiguration,
   root: string
-): [Promise<LoadedNxPlugin>, () => void] {
+): Promise<LoadedNxPlugin> {
   // this should only really be true when running unit tests within
   // the Nx repo. We still need to start the worker in this case,
   // but its typescript.
@@ -60,19 +60,13 @@ export function loadRemoteNxPlugin(
 
   cleanupFunctions.add(cleanupFunction);
 
-  return [
-    new Promise<LoadedNxPlugin>((res, rej) => {
-      worker.on(
-        'message',
-        createWorkerHandler(worker, pendingPromises, res, rej)
-      );
-      worker.on('exit', exitHandler);
-    }),
-    () => {
-      cleanupFunction();
-      cleanupFunctions.delete(cleanupFunction);
-    },
-  ] as const;
+  return new Promise<LoadedNxPlugin>((res, rej) => {
+    worker.on(
+      'message',
+      createWorkerHandler(worker, pendingPromises, res, rej)
+    );
+    worker.on('exit', exitHandler);
+  });
 }
 
 async function shutdownPluginWorker(