fix(gateway): defer channel stop until qr takeover

mcaxtr · mcaxtr · commit 86cdb8601415 · 2026-06-14T23:58:05.000-03:00
diff --git a/src/gateway/server-methods/web.start.test.ts b/src/gateway/server-methods/web.start.test.ts
@@ -72,11 +72,30 @@ describe("webHandlers web.login.start", () => {
     vi.clearAllMocks();
   });
 
-  it("restarts a previously running channel when login start exits early without a QR", async () => {
-    const loginWithQrStart = vi.fn().mockResolvedValue({
-      code: "whatsapp-auth-unstable",
-      message: "retry later",
-    });
+  it.each([
+    {
+      name: "leaves a running channel alone when non-forced login start exits early without a QR",
+      params: {},
+      result: { code: "whatsapp-auth-unstable", message: "retry later" },
+      stopsChannel: false,
+      restartsChannel: false,
+    },
+    {
+      name: "stops a running channel after non-forced login start takes over with a QR flow",
+      params: {},
+      result: { qrDataUrl: "data:image/png;base64,qr", message: "scan qr" },
+      stopsChannel: true,
+      restartsChannel: false,
+    },
+    {
+      name: "stops and restores a running channel around forced login failures without a QR",
+      params: { force: true },
+      result: { code: "whatsapp-auth-unstable", message: "retry later" },
+      stopsChannel: true,
+      restartsChannel: true,
+    },
+  ] as const)("$name", async ({ params, result, stopsChannel, restartsChannel }) => {
+    const loginWithQrStart = vi.fn().mockResolvedValue(result);
     mocks.listChannelPlugins.mockReturnValue([
       {
         id: "whatsapp",
@@ -89,51 +108,25 @@ describe("webHandlers web.login.start", () => {
 
     await webHandlers["web.login.start"](
       createOptions(
-        { accountId: "default" },
+        { accountId: "default", ...params },
         {
           respond,
           context,
         },
       ),
     );
 
-    expect(stopChannel).toHaveBeenCalledWith("whatsapp", "default");
-    expect(startChannel).toHaveBeenCalledWith("whatsapp", "default");
-    expect(respond).toHaveBeenCalledWith(
-      true,
-      {
-        code: "whatsapp-auth-unstable",
-        message: "retry later",
-      },
-      undefined,
-    );
-  });
-
-  it("keeps the channel stopped when login start has taken over with a QR flow", async () => {
-    const loginWithQrStart = vi.fn().mockResolvedValue({
-      qrDataUrl: "data:image/png;base64,qr",
-      message: "scan qr",
-    });
-    mocks.listChannelPlugins.mockReturnValue([
-      {
-        id: "whatsapp",
-        gatewayMethods: ["web.login.start"],
-        gateway: { loginWithQrStart },
-      },
-    ]);
-    const { context, startChannel, stopChannel } = createRunningWhatsappContext();
-
-    await webHandlers["web.login.start"](
-      createOptions(
-        { accountId: "default" },
-        {
-          context,
-        },
-      ),
-    );
-
-    expect(stopChannel).toHaveBeenCalledWith("whatsapp", "default");
-    expect(startChannel).not.toHaveBeenCalled();
+    if (stopsChannel) {
+      expect(stopChannel).toHaveBeenCalledWith("whatsapp", "default");
+    } else {
+      expect(stopChannel).not.toHaveBeenCalled();
+    }
+    if (restartsChannel) {
+      expect(startChannel).toHaveBeenCalledWith("whatsapp", "default");
+    } else {
+      expect(startChannel).not.toHaveBeenCalled();
+    }
+    expect(respond).toHaveBeenCalledWith(true, result, undefined);
   });
 
   it("preserves gateway method receiver state for login start", async () => {
diff --git a/src/gateway/server-methods/web.ts b/src/gateway/server-methods/web.ts
@@ -119,16 +119,25 @@ export const webHandlers: GatewayRequestHandlers = {
         channelId: provider.id,
         accountId,
       });
-      await context.stopChannel(provider.id, accountId);
+      const forceLogin = Boolean(params.force);
+      const stoppedBeforeLogin = forceLogin || !wasRunning;
+      if (stoppedBeforeLogin) {
+        await context.stopChannel(provider.id, accountId);
+      }
       const result = await run({
-        force: Boolean(params.force),
+        force: forceLogin,
         timeoutMs: typeof params.timeoutMs === "number" ? params.timeoutMs : undefined,
         verbose: Boolean(params.verbose),
         accountId,
       });
-      if (result.connected) {
+      const stoppedAfterQrTakeover = !stoppedBeforeLogin && Boolean(result.qrDataUrl);
+      if (stoppedAfterQrTakeover) {
+        await context.stopChannel(provider.id, accountId);
+      }
+      const stoppedForLogin = stoppedBeforeLogin || stoppedAfterQrTakeover;
+      if (result.connected && stoppedForLogin) {
         await context.startChannel(provider.id, accountId);
-      } else if (wasRunning && !result.qrDataUrl) {
+      } else if (wasRunning && stoppedForLogin && !result.qrDataUrl) {
         // When start fails before producing a QR code, restore the previously
         // running channel/account so a transient login failure does not stop it.
         await context.startChannel(provider.id, accountId);
