fix: duplicate logging of => false when testing if JS controller is…

… running (#605)
ioBroker · Apr 17, 2024 · 0dfc034 · 0dfc034
1 parent 107fc26
commit 0dfc034
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/build/tests/integration/lib/controllerSetup.js b/build/tests/integration/lib/controllerSetup.js
@@ -117,6 +117,12 @@ class ControllerSetup {
         debug("Testing if JS-Controller is running...");
         return new Promise((resolve) => {
             const client = new net_1.Socket();
+            const timeout = setTimeout(() => {
+                // Assume the connection failed after 1 s
+                client.destroy();
+                debug(`  => false`);
+                resolve(false);
+            }, 1000);
             // Try to connect to an existing ObjectsDB
             client
                 .connect({
@@ -127,19 +133,15 @@ class ControllerSetup {
                 // The connection succeeded
                 client.destroy();
                 debug(`  => true`);
+                clearTimeout(timeout);
                 resolve(true);
             })
                 .on("error", () => {
                 client.destroy();
                 debug(`  => false`);
+                clearTimeout(timeout);
                 resolve(false);
             });
-            setTimeout(() => {
-                // Assume the connection failed after 1 s
-                client.destroy();
-                debug(`  => false`);
-                resolve(false);
-            }, 1000);
         });
     }
     // /**

diff --git a/src/tests/integration/lib/controllerSetup.ts b/src/tests/integration/lib/controllerSetup.ts
@@ -16,8 +16,8 @@ import type { DBConnection } from "./dbConnection";
 import {
 	getTestAdapterDir,
 	getTestControllerDir,
-	getTestDataDir,
 	getTestDBDir,
+	getTestDataDir,
 	getTestLogDir,
 } from "./tools";
 
@@ -131,6 +131,14 @@ export class ControllerSetup {
 		debug("Testing if JS-Controller is running...");
 		return new Promise<boolean>((resolve) => {
 			const client = new Socket();
+
+			const timeout = setTimeout(() => {
+				// Assume the connection failed after 1 s
+				client.destroy();
+				debug(`  => false`);
+				resolve(false);
+			}, 1000);
+
 			// Try to connect to an existing ObjectsDB
 			client
 				.connect({
@@ -141,20 +149,15 @@ export class ControllerSetup {
 					// The connection succeeded
 					client.destroy();
 					debug(`  => true`);
+					clearTimeout(timeout);
 					resolve(true);
 				})
 				.on("error", () => {
 					client.destroy();
 					debug(`  => false`);
+					clearTimeout(timeout);
 					resolve(false);
 				});
-
-			setTimeout(() => {
-				// Assume the connection failed after 1 s
-				client.destroy();
-				debug(`  => false`);
-				resolve(false);
-			}, 1000);
 		});
 	}