@adonisjs/assembler 6.1.3-8 → 6.1.3-9

package/build/src/dev_server.d.ts

@@ -30,6 +30,10 @@ export declare class DevServer {
      * with an error
      */
     onError(callback: (error: any) => any): this;
+    /**
+     * Close watchers and running child processes
+     */
+    close(): Promise<void>;
     /**
      * Start the development server
      */

package/build/src/dev_server.js

@@ -94,7 +94,6 @@ 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();
@@ -102,9 +101,11 @@ export class DevServer {
             }
         })
             .catch((error) => {
-            this.#onError?.(error);
-            this.#watcher?.close();
-            this.#assetsServer?.stop();
+            if (mode === 'nonblocking') {
+                this.#onError?.(error);
+                this.#watcher?.close();
+                this.#assetsServer?.stop();
+            }
         });
     }
     /**
@@ -178,6 +179,17 @@ export class DevServer {
         this.#onError = callback;
         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
      */

package/build/src/test_runner.d.ts

@@ -30,6 +30,10 @@ export declare class TestRunner {
      * with an error
      */
     onError(callback: (error: any) => any): this;
+    /**
+     * Close watchers and running child processes
+     */
+    close(): Promise<void>;
     /**
      * Runs tests
      */

package/build/src/test_runner.js

@@ -121,26 +121,29 @@ 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, filtersArgs) {
+        if (this.#testScript) {
+            this.#testScript.removeAllListeners();
+            this.#testScript.kill('SIGKILL');
+        }
+        this.#runTests(port, filtersArgs, 'blocking');
+    }
     /**
      * Starts the assets server
      */
@@ -159,7 +162,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);
         }
     }
     /**
@@ -176,13 +179,13 @@ export class TestRunner {
          * then only run that file
          */
         if (this.#isTestFile(relativePath)) {
-            this.#runTests(port, this.#convertFiltersToArgs({
+            this.#rerunTests(port, this.#convertFiltersToArgs({
                 ...this.#options.filters,
                 files: [relativePath],
-            }), 'blocking');
+            }));
             return;
         }
-        this.#runTests(port, filters, 'blocking');
+        this.#rerunTests(port, filters);
     }
     /**
      * Set a custom CLI UI logger
@@ -208,6 +211,17 @@ export class TestRunner {
         this.#onError = callback;
         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
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/assembler",
-  "version": "6.1.3-8",
+  "version": "6.1.3-9",
   "description": "Provides utilities to run AdonisJS development server and build project for production",
   "main": "build/index.js",
   "type": "module",
@@ -106,7 +106,10 @@
     "exclude": [
       "tests/**",
       "build/**",
-      "examples/**"
+      "examples/**",
+      "src/dev_server.ts",
+      "src/test_runner.ts",
+      "src/assets_dev_server.ts"
     ]
   },
   "eslintConfig": {