From a05d8a7bc0ac0e63d063d577be84387a5c3eacb1 Mon Sep 17 00:00:00 2001
From: Arseniy Klempner <arseniyk@status.im>
Date: Thu, 4 Sep 2025 15:57:49 -0700
Subject: [PATCH] fix: make autostaurt default behavior

---
 packages/browser-tests/src/server.ts          | 54 +++++++++----------
 .../browser-tests/tests/docker-server.spec.ts |  5 +-
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/packages/browser-tests/src/server.ts b/packages/browser-tests/src/server.ts
index 120aa6d7b2..2529050a6a 100644
--- a/packages/browser-tests/src/server.ts
+++ b/packages/browser-tests/src/server.ts
@@ -103,37 +103,33 @@ async function startServer(port: number = 3000): Promise<void> {
     const actualPort = await startAPI(port);
     await initBrowser(actualPort);
 
-    // Optional auto-create/start with consistent bootstrap approach
-    const autoStart =
-      process.env.AUTO_START === "1" || process.env.HEADLESS_AUTO_START === "1";
-    if (autoStart) {
-      try {
-        console.log("Auto-starting node with CLI configuration...");
+    // Auto-create/start with consistent bootstrap approach
+    try {
+      console.log("Auto-starting node with CLI configuration...");
 
-        // Build network config from environment variables for auto-start
-        const networkConfig: any = { defaultBootstrap: true };
-        if (process.env.WAKU_CLUSTER_ID) {
-          networkConfig.networkConfig = networkConfig.networkConfig || {};
-          networkConfig.networkConfig.clusterId = parseInt(process.env.WAKU_CLUSTER_ID, 10);
-        }
-        if (process.env.WAKU_SHARD) {
-          networkConfig.networkConfig = networkConfig.networkConfig || {};
-          networkConfig.networkConfig.shards = [parseInt(process.env.WAKU_SHARD, 10)];
-        }
-
-        await getPage()?.evaluate((config) => {
-          return window.wakuApi.createWakuNode(config);
-        }, networkConfig);
-        await getPage()?.evaluate(() => window.wakuApi.startNode());
-
-        // Wait for bootstrap peers to connect
-        await getPage()?.evaluate(() =>
-          window.wakuApi.waitForPeers?.(5000, ["lightpush"] as any),
-        );
-        console.log("Auto-start completed with bootstrap peers");
-      } catch (e) {
-        console.warn("Auto-start failed:", e);
+      // Build network config from environment variables for auto-start
+      const networkConfig: any = { defaultBootstrap: true };
+      if (process.env.WAKU_CLUSTER_ID) {
+        networkConfig.networkConfig = networkConfig.networkConfig || {};
+        networkConfig.networkConfig.clusterId = parseInt(process.env.WAKU_CLUSTER_ID, 10);
       }
+      if (process.env.WAKU_SHARD) {
+        networkConfig.networkConfig = networkConfig.networkConfig || {};
+        networkConfig.networkConfig.shards = [parseInt(process.env.WAKU_SHARD, 10)];
+      }
+
+      await getPage()?.evaluate((config) => {
+        return window.wakuApi.createWakuNode(config);
+      }, networkConfig);
+      await getPage()?.evaluate(() => window.wakuApi.startNode());
+
+      // Wait for bootstrap peers to connect
+      await getPage()?.evaluate(() =>
+        window.wakuApi.waitForPeers?.(5000, ["lightpush"] as any),
+      );
+      console.log("Auto-start completed with bootstrap peers");
+    } catch (e) {
+      console.warn("Auto-start failed:", e);
     }
   } catch (error: any) {
     console.error("Error starting server:", error);
diff --git a/packages/browser-tests/tests/docker-server.spec.ts b/packages/browser-tests/tests/docker-server.spec.ts
index 7f39f6d472..189ffae2b3 100644
--- a/packages/browser-tests/tests/docker-server.spec.ts
+++ b/packages/browser-tests/tests/docker-server.spec.ts
@@ -14,10 +14,7 @@ test.beforeAll(async () => {
   // Build and run the container once for the suite; reuse across tests
   const generic = new GenericContainer(
     "waku-browser-tests:local",
-  ).withExposedPorts(8080)
-    .withEnvironment({
-      "AUTO_START": "0", // Don't auto-start, let tests control initialization
-    });
+  ).withExposedPorts(8080);
 
   container = await generic.start();