#1570. Fix tunnels.go by removing the redundant makeTunnels() method and fixed the response status for ConnectTunnel. Update test/ui connect_doom to properly handle waiting for asynchronous click acttions for connect and disconnect.

Author: Michael Winberry

src/internal/api/tunnels/tunnels.go

@@ -14,13 +14,12 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-var tunnels map[string]*cluster.Tunnel
+// tunnels is a map of package names to tunnel objects used for storing connected tunnels
+var tunnels map[string]*cluster.Tunnel = make(map[string]*cluster.Tunnel)
 
 // ListTunnels lists all tunnel names
 func ListTunnels(w http.ResponseWriter, _ *http.Request) {
 	// make sure tunnels is initialized
-	makeTunnels()
-
 	// get the tunnel names
 	tunnelNames := make([]string, 0, len(tunnels))
 	for name := range tunnels {
@@ -34,13 +33,10 @@ func ListTunnels(w http.ResponseWriter, _ *http.Request) {
 func ConnectTunnel(w http.ResponseWriter, r *http.Request) {
 	name := chi.URLParam(r, "name")
 
-	// make sure tunnels is initialized
-	makeTunnels()
-
 	// if the tunnel already exists, just launch the URL
 	if tunnels[name] != nil {
 		launchTunnelURL(tunnels[name], w, name)
-		common.WriteJSONResponse(w, true, http.StatusCreated)
+		common.WriteJSONResponse(w, true, http.StatusOK)
 		return
 	}
 
@@ -60,7 +56,7 @@ func ConnectTunnel(w http.ResponseWriter, r *http.Request) {
 	tunnels[name] = tunnel
 	launchTunnelURL(tunnel, w, name)
 
-	common.WriteJSONResponse(w, true, http.StatusOK)
+	common.WriteJSONResponse(w, true, http.StatusCreated)
 }
 
 // DisconnectTunnel closes the tunnel for the requested resource
@@ -72,13 +68,6 @@ func DisconnectTunnel(w http.ResponseWriter, r *http.Request) {
 	common.WriteJSONResponse(w, true, http.StatusOK)
 }
 
-// makeTunnels initializes the tunnels map if it is nil
-func makeTunnels() {
-	if tunnels == nil {
-		tunnels = make(map[string]*cluster.Tunnel)
-	}
-}
-
 // launchTunnelURL launches the tunnel URL in the default browser
 func launchTunnelURL(tunnel *cluster.Tunnel, w http.ResponseWriter, name string) {
 	if err := exec.LaunchURL(tunnel.FullURL()); err != nil {

src/test/ui/04_connect_doom.spec.ts

@@ -26,14 +26,13 @@ test.describe.serial('connect the dos-games package @connect', async () => {
         const connectButton = connectDialog.locator('button:has-text("Connect")');
 
         // Click the Connect Button
-        await connectButton.click();
-        await page.waitForResponse('api/tunnels/connect/doom');
+        await Promise.all([page.waitForResponse('api/tunnels/connect/doom'), connectButton.click()]);
 
         menu = await openDosGamesMenu(page);
         expect(await menu.textContent()).toContain('Disconnect...');
     });
 
-    test('disconnect the dos-games package', async ({page}) => {
+    test('disconnect the dos-games package', async ({ page }) => {
         // Dispose context once it's no longer needed.
         let menu = await openDosGamesMenu(page);
 
@@ -48,9 +47,9 @@ test.describe.serial('connect the dos-games package @connect', async () => {
         const dialog = page.locator('.dialog-open');
         expect(await dialog.textContent()).toContain('Disconnect Resource');
         const disconnectButton = dialog.locator('.button-label:text-is("Disconnect")');
-        
+
         // Click the Disconnect Button
-        await disconnectButton.click();
+        await Promise.all([page.waitForResponse('api/tunnels/disconnect/doom'), disconnectButton.click()])
 
         // Ensure the menu no longer contains the Disconnect option
         menu = await openDosGamesMenu(page);