@rvoh/psychic-spec-helpers 0.3.1 → 0.4.0

package/dist/esm/src/feature/helpers/{launchViteServer.js → launchDevServer.js}

@@ -1,14 +1,14 @@
 import { spawn } from 'child_process';
 import { createServer } from 'net';
 import sleep from '../../shared/sleep.js';
-let serverProcess = undefined;
-export default async function launchViteServer({ port = 3000, cmd = 'yarn client', timeout = 5000, } = {}) {
-    if (serverProcess)
+const devServerProcesses = {};
+export default async function launchDevServer(key, { port = 3000, cmd = 'yarn client', timeout = 5000, } = {}) {
+    if (devServerProcesses[key])
         return;
     if (process.env.DEBUG === '1')
         console.log('Starting server...');
     const [_cmd, ...args] = cmd.split(' ');
-    serverProcess = spawn(_cmd, args, {
+    const proc = spawn(_cmd, args, {
         detached: true,
         env: {
             ...process.env,
@@ -16,41 +16,46 @@ export default async function launchViteServer({ port = 3000, cmd = 'yarn client
             VITE_PSYCHIC_ENV: 'test',
         },
     });
-    await waitForPort(port, timeout);
-    serverProcess.stdout.on('data', data => {
-        if (process.env.DEBUG === '1')
-            console.log(`Server output: ${data}`);
-    });
-    serverProcess.on('error', err => {
+    await waitForPort(key, port, timeout);
+    proc.on('error', err => {
         throw err;
     });
-    serverProcess.stdout.on('data', data => {
+    proc.stdout.on('data', data => {
         if (process.env.DEBUG === '1')
             console.log(`Server output: ${data}`);
     });
-    serverProcess.stderr.on('data', data => {
+    proc.stderr.on('data', data => {
         if (process.env.DEBUG === '1')
             console.error(`Server error: ${data}`);
     });
-    serverProcess.on('error', err => {
+    proc.on('error', err => {
         console.error(`Server process error: ${err}`);
     });
-    serverProcess.on('close', code => {
+    proc.on('close', code => {
         if (process.env.DEBUG === '1')
             console.log(`Server process exited with code ${code}`);
     });
 }
-export function stopViteServer() {
-    if (serverProcess?.pid) {
+export function stopDevServer(key) {
+    const proc = devServerProcesses[key];
+    if (!proc) {
+        throw new Error(`Cannot find a dev server by the key: ${key}`);
+    }
+    if (proc?.pid) {
         if (process.env.DEBUG === '1')
             console.log('Stopping server...');
         // serverProcess.kill('SIGINT')
-        process.kill(-serverProcess.pid, 'SIGKILL');
-        serverProcess = undefined;
+        process.kill(-proc.pid, 'SIGKILL');
+        delete devServerProcesses[key];
         if (process.env.DEBUG === '1')
             console.log('server stopped');
     }
 }
+export function stopDevServers() {
+    Object.keys(devServerProcesses).forEach(key => {
+        stopDevServer(key);
+    });
+}
 async function isPortAvailable(port) {
     return new Promise(resolve => {
         const server = createServer()
@@ -69,7 +74,7 @@ async function isPortAvailable(port) {
             .listen(port, '127.0.0.1');
     });
 }
-async function waitForPort(port, timeout = 5000) {
+async function waitForPort(key, port, timeout = 5000) {
     if (await isPortAvailable(port)) {
         return true;
     }
@@ -79,7 +84,7 @@ async function waitForPort(port, timeout = 5000) {
             return true;
         }
         if (Date.now() > startTime + timeout) {
-            stopViteServer();
+            stopDevServer(key);
             throw new Error('waited too long for port: ' + port);
         }
         await sleep(50);

package/dist/esm/src/index.js

@@ -7,6 +7,6 @@ export { SpecSession } from './unit/SpecSession.js';
 export { default as providePuppeteerViteMatchers } from './feature/helpers/providePuppeteerViteMatchers.js';
 export { default as launchBrowser } from './feature/helpers/launchBrowser.js';
 export { default as launchPage } from './feature/helpers/launchPage.js';
-export { default as launchViteServer, stopViteServer } from './feature/helpers/launchViteServer.js';
+export { default as launchDevServer, stopDevServers, stopDevServer, } from './feature/helpers/launchDevServer.js';
 export { default as visit } from './feature/helpers/visit.js';
 export default {};

package/dist/types/src/feature/helpers/launchDevServer.d.ts

@@ -0,0 +1,7 @@
+export default function launchDevServer(key: string, { port, cmd, timeout, }?: {
+    port?: number;
+    cmd?: string;
+    timeout?: number;
+}): Promise<void>;
+export declare function stopDevServer(key: string): void;
+export declare function stopDevServers(): void;

package/dist/types/src/index.d.ts

@@ -9,7 +9,7 @@ export { SpecSession } from './unit/SpecSession.js';
 export { default as providePuppeteerViteMatchers } from './feature/helpers/providePuppeteerViteMatchers.js';
 export { default as launchBrowser } from './feature/helpers/launchBrowser.js';
 export { default as launchPage } from './feature/helpers/launchPage.js';
-export { default as launchViteServer, stopViteServer } from './feature/helpers/launchViteServer.js';
+export { default as launchDevServer, stopDevServers, stopDevServer, } from './feature/helpers/launchDevServer.js';
 export { default as visit } from './feature/helpers/visit.js';
 declare global {
     function context(description: string, callback: () => void): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@rvoh/psychic-spec-helpers",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "psychic framework spec helpers",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",

package/src/feature/helpers/{launchViteServer.ts → launchDevServer.ts}

@@ -2,19 +2,22 @@ import { ChildProcessWithoutNullStreams, spawn } from 'child_process'
 import { createServer } from 'net'
 import sleep from '../../shared/sleep.js'
 
-let serverProcess: ChildProcessWithoutNullStreams | undefined = undefined
-
-export default async function launchViteServer({
-  port = 3000,
-  cmd = 'yarn client',
-  timeout = 5000,
-}: { port?: number; cmd?: string; timeout?: number } = {}) {
-  if (serverProcess) return
+const devServerProcesses: Record<string, ChildProcessWithoutNullStreams | undefined> = {}
+
+export default async function launchDevServer(
+  key: string,
+  {
+    port = 3000,
+    cmd = 'yarn client',
+    timeout = 5000,
+  }: { port?: number; cmd?: string; timeout?: number } = {}
+) {
+  if (devServerProcesses[key]) return
 
   if (process.env.DEBUG === '1') console.log('Starting server...')
   const [_cmd, ...args] = cmd.split(' ')
 
-  serverProcess = spawn(_cmd, args, {
+  const proc = spawn(_cmd, args, {
     detached: true,
     env: {
       ...process.env,
@@ -23,44 +26,51 @@ export default async function launchViteServer({
     },
   })
 
-  await waitForPort(port, timeout)
+  await waitForPort(key, port, timeout)
 
-  serverProcess.stdout.on('data', data => {
-    if (process.env.DEBUG === '1') console.log(`Server output: ${data}`)
-  })
-
-  serverProcess.on('error', err => {
+  proc.on('error', err => {
     throw err
   })
 
-  serverProcess.stdout.on('data', data => {
+  proc.stdout.on('data', data => {
     if (process.env.DEBUG === '1') console.log(`Server output: ${data}`)
   })
 
-  serverProcess.stderr.on('data', data => {
+  proc.stderr.on('data', data => {
     if (process.env.DEBUG === '1') console.error(`Server error: ${data}`)
   })
 
-  serverProcess.on('error', err => {
+  proc.on('error', err => {
     console.error(`Server process error: ${err as unknown as string}`)
   })
 
-  serverProcess.on('close', code => {
+  proc.on('close', code => {
     if (process.env.DEBUG === '1') console.log(`Server process exited with code ${code}`)
   })
 }
 
-export function stopViteServer() {
-  if (serverProcess?.pid) {
+export function stopDevServer(key: string) {
+  const proc = devServerProcesses[key]
+  if (!proc) {
+    throw new Error(`Cannot find a dev server by the key: ${key}`)
+  }
+
+  if (proc?.pid) {
     if (process.env.DEBUG === '1') console.log('Stopping server...')
     // serverProcess.kill('SIGINT')
-    process.kill(-serverProcess.pid, 'SIGKILL')
-    serverProcess = undefined
+    process.kill(-proc.pid, 'SIGKILL')
+    delete devServerProcesses[key]
 
     if (process.env.DEBUG === '1') console.log('server stopped')
   }
 }
 
+export function stopDevServers() {
+  Object.keys(devServerProcesses).forEach(key => {
+    stopDevServer(key)
+  })
+}
+
 async function isPortAvailable(port: number): Promise<boolean> {
   return new Promise(resolve => {
     const server = createServer()
@@ -79,7 +89,7 @@ async function isPortAvailable(port: number): Promise<boolean> {
   })
 }
 
-async function waitForPort(port: number, timeout: number = 5000) {
+async function waitForPort(key: string, port: number, timeout: number = 5000) {
   if (await isPortAvailable(port)) {
     return true
   }
@@ -92,7 +102,7 @@ async function waitForPort(port: number, timeout: number = 5000) {
     }
 
     if (Date.now() > startTime + timeout) {
-      stopViteServer()
+      stopDevServer(key)
       throw new Error('waited too long for port: ' + port)
     }
 

package/src/index.ts

@@ -13,7 +13,11 @@ export { SpecSession } from './unit/SpecSession.js'
 export { default as providePuppeteerViteMatchers } from './feature/helpers/providePuppeteerViteMatchers.js'
 export { default as launchBrowser } from './feature/helpers/launchBrowser.js'
 export { default as launchPage } from './feature/helpers/launchPage.js'
-export { default as launchViteServer, stopViteServer } from './feature/helpers/launchViteServer.js'
+export {
+  default as launchDevServer,
+  stopDevServers,
+  stopDevServer,
+} from './feature/helpers/launchDevServer.js'
 export { default as visit } from './feature/helpers/visit.js'
 
 declare global {

package/dist/types/src/feature/helpers/launchViteServer.d.ts

@@ -1,6 +0,0 @@
-export default function launchViteServer({ port, cmd, timeout, }?: {
-    port?: number;
-    cmd?: string;
-    timeout?: number;
-}): Promise<void>;
-export declare function stopViteServer(): void;