make sure we close stuff

Author: mydea

dev-packages/node-overhead-gh-action/lib/getOverheadMeasurements.mjs

@@ -17,10 +17,40 @@ async function getMeasurements(instrumentFile) {
 
   log(`Getting measurements for "${cmd}"`);
 
+  const [appProcess, appProcessClosed] = await startAppProcess(cmd);
+
+  log('Example app listening, running autocannon...');
+
+  try {
+    return await startAutocannonProcess();
+  } catch (error) {
+    log(`Error running autocannon: ${error}`);
+  } finally {
+    appProcess.kill('SIGKILL');
+    await appProcessClosed;
+  }
+}
+
+async function startAppProcess(cmd) {
   const appProcess = spawn(cmd, { shell: true });
 
   log('Child process started, waiting for example app...');
 
+  // Promise to keep track of the app process being closed
+  let resolveAppClose, rejectAppClose;
+  const appClosePromise = new Promise((res, rej) => {
+    resolveAppClose = res;
+    rejectAppClose = rej;
+  });
+
+  appProcess.on('close', code => {
+    if (code !== 0) {
+      rejectAppClose(new Error(`App process exited with code ${code}`));
+    } else {
+      resolveAppClose();
+    }
+  });
+
   await new Promise((resolve, reject) => {
     appProcess.stdout.on('data', data => {
       log(`appProcess: ${data}`);
@@ -31,13 +61,15 @@ async function getMeasurements(instrumentFile) {
 
     appProcess.stderr.on('data', data => {
       log(`appProcess stderr: ${data}`);
-      reject(data);
       appProcess.kill('SIGKILL');
+      reject(data);
     });
   });
 
-  log('Example app listening, running autocannon...');
+  return [appProcess, appClosePromise];
+}
 
+async function startAutocannonProcess() {
   const autocannon = spawn('yarn test', {
     shell: true,
     cwd: packageRoot,
@@ -62,11 +94,8 @@ async function getMeasurements(instrumentFile) {
 
     autocannon.on('close', code => {
       log(`autocannon closed with code ${code}`);
-
       log(`Average requests: ${lastJson?.requests.average}`);
 
-      appProcess.kill('SIGKILL');
-
       resolve(lastJson?.requests.average);
     });
   });

dev-packages/node-overhead-gh-action/package.json

@@ -36,5 +36,3 @@
     "extends": "../../package.json"
   }
 }
-
-