fix: sync process kill

Author: jhefferman-sfdc

test/commands/lightning/dev/component-preview/browserMenu.nut.ts

@@ -20,8 +20,7 @@ import { TestSession } from '@salesforce/cli-plugins-testkit';
 import { expect } from 'chai';
 import { type Browser, type Page } from 'playwright';
 import { getSession } from '../helpers/sessionUtils.js';
-import { startLightningDevServer, getPreviewURL } from '../helpers/devServerUtils.js';
-import { killServerProcess } from '../helpers/processUtils.js';
+import { startLightningDevServer, getPreviewURL, killServerProcess } from '../helpers/devServerUtils.js';
 import { getPreview } from '../helpers/browserUtils.js';
 
 const COMPONENT_NAME = 'helloWorld';

test/commands/lightning/dev/component-preview/componentError.nut.ts

@@ -20,8 +20,7 @@ import { TestSession } from '@salesforce/cli-plugins-testkit';
 import { expect } from 'chai';
 import { type Browser, type Page } from 'playwright';
 import { getSession } from '../helpers/sessionUtils.js';
-import { startLightningDevServer, getPreviewURL } from '../helpers/devServerUtils.js';
-import { killServerProcess } from '../helpers/processUtils.js';
+import { startLightningDevServer, getPreviewURL, killServerProcess } from '../helpers/devServerUtils.js';
 import { getPreview } from '../helpers/browserUtils.js';
 
 const COMPONENT_NAME = 'withError';

test/commands/lightning/dev/component-preview/hmr.nut.ts

@@ -22,8 +22,7 @@ import { TestSession } from '@salesforce/cli-plugins-testkit';
 import { expect } from 'chai';
 import { type Browser, type Page } from 'playwright';
 import { getSession, getComponentPath } from '../helpers/sessionUtils.js';
-import { startLightningDevServer, getPreviewURL } from '../helpers/devServerUtils.js';
-import { killServerProcess } from '../helpers/processUtils.js';
+import { startLightningDevServer, getPreviewURL, killServerProcess } from '../helpers/devServerUtils.js';
 import { getPreview } from '../helpers/browserUtils.js';
 
 const COMPONENT_NAME = 'helloWorld';

test/commands/lightning/dev/component-preview/prompts.nut.ts

@@ -26,8 +26,8 @@ import {
   waitForPrompt,
   waitForProcessExit,
   getPreviewURL,
+  killServerProcess,
 } from '../helpers/devServerUtils.js';
-import { killServerProcess } from '../helpers/processUtils.js';
 import { getPreview } from '../helpers/browserUtils.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);

test/commands/lightning/dev/helpers/devServerUtils.ts

@@ -17,6 +17,7 @@ import { spawn, ChildProcessByStdio, ChildProcessWithoutNullStreams } from 'node
 import { Readable } from 'node:stream';
 import type { Writable } from 'node:stream';
 import path from 'node:path';
+import { type ChildProcess } from 'node:child_process';
 import { PLUGIN_ROOT_PATH } from './utils.js';
 
 const PREVIEW_URL_REGEX = /(https:\/\/[^\s]*\/lwr\/application\/[^\s]+)/;
@@ -131,3 +132,15 @@ export function startLightningDevServer(
     stdio: ['pipe', 'pipe', 'pipe'],
   });
 }
+
+export function killServerProcess(serverProcess: ChildProcess | undefined): void {
+  // Clean up
+  try {
+    if (serverProcess?.pid && process.kill(serverProcess.pid, 0)) {
+      process.kill(serverProcess.pid, 'SIGKILL');
+    }
+  } catch (error) {
+    const err = error as NodeJS.ErrnoException;
+    if (err.code !== 'ESRCH') throw error;
+  }
+}