feat: expose methods to close test runner and dev server

Author: thetutlage

package.json

@@ -106,7 +106,10 @@
     "exclude": [
       "tests/**",
       "build/**",
-      "examples/**"
+      "examples/**",
+      "src/dev_server.ts",
+      "src/test_runner.ts",
+      "src/assets_dev_server.ts"
     ]
   },
   "eslintConfig": {

src/dev_server.ts

@@ -125,17 +125,18 @@ export class DevServer {
 
     this.#httpServer
       .then((result) => {
-        this.#logger.warning(`underlying HTTP server closed with status code "${result.exitCode}"`)
         if (mode === 'nonblocking') {
           this.#onClose?.(result.exitCode)
           this.#watcher?.close()
           this.#assetsServer?.stop()
         }
       })
       .catch((error) => {
-        this.#onError?.(error)
-        this.#watcher?.close()
-        this.#assetsServer?.stop()
+        if (mode === 'nonblocking') {
+          this.#onError?.(error)
+          this.#watcher?.close()
+          this.#assetsServer?.stop()
+        }
       })
   }
 
@@ -220,6 +221,18 @@ export class DevServer {
     return this
   }
 
+  /**
+   * Close watchers and running child processes
+   */
+  async close() {
+    await this.#watcher?.close()
+    this.#assetsServer?.stop()
+    if (this.#httpServer) {
+      this.#httpServer.removeAllListeners()
+      this.#httpServer.kill('SIGKILL')
+    }
+  }
+
   /**
    * Start the development server
    */

src/test_runner.ts

@@ -149,27 +149,32 @@ export class TestRunner {
       .then((result) => {
         if (mode === 'nonblocking') {
           this.#onClose?.(result.exitCode)
-          this.#watcher?.close()
-          this.#assetsServer?.stop()
+          this.close()
         }
       })
       .catch((error) => {
-        /**
-         * Since the tests runner set the `process.exitCode = 1`, execa will
-         * throw an exception. However, we should ignore it and keep the
-         * watcher on.
-         */
         if (mode === 'nonblocking') {
           this.#onError?.(error)
-          this.#watcher?.close()
-          this.#assetsServer?.stop()
+          this.close()
         }
       })
       .finally(() => {
         this.#isBusy = false
       })
   }
 
+  /**
+   * Restarts the HTTP server
+   */
+  #rerunTests(port: string, filtersArgs: string[]) {
+    if (this.#testScript) {
+      this.#testScript.removeAllListeners()
+      this.#testScript.kill('SIGKILL')
+    }
+
+    this.#runTests(port, filtersArgs, 'blocking')
+  }
+
   /**
    * Starts the assets server
    */
@@ -190,7 +195,7 @@ export class TestRunner {
     if (isDotEnvFile(relativePath) || this.#isMetaFile(relativePath)) {
       this.#clearScreen()
       this.#logger.log(`${this.#colors.green(action)} ${relativePath}`)
-      this.#runTests(port, filters, 'blocking')
+      this.#rerunTests(port, filters)
     }
   }
 
@@ -210,18 +215,17 @@ export class TestRunner {
      * then only run that file
      */
     if (this.#isTestFile(relativePath)) {
-      this.#runTests(
+      this.#rerunTests(
         port,
         this.#convertFiltersToArgs({
           ...this.#options.filters,
           files: [relativePath],
-        }),
-        'blocking'
+        })
       )
       return
     }
 
-    this.#runTests(port, filters, 'blocking')
+    this.#rerunTests(port, filters)
   }
 
   /**
@@ -251,6 +255,18 @@ export class TestRunner {
     return this
   }
 
+  /**
+   * Close watchers and running child processes
+   */
+  async close() {
+    await this.#watcher?.close()
+    this.#assetsServer?.stop()
+    if (this.#testScript) {
+      this.#testScript.removeAllListeners()
+      this.#testScript.kill('SIGKILL')
+    }
+  }
+
   /**
    * Runs tests
    */