Skip to content

fix(instance): do not open a second connection on repeated clicks #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michumichifu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(instance): do not open a second connection on repeated clicks #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/pages/instance/DashboardInstance/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Button } from "@evoapi/design-system/button";
import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "@evoapi/design-system/card";
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTrigger } from "@/components/ui/dialog";
import { CircleUser, LogOut, MessageCircle, Power, QrCode, RefreshCw, Send, UsersRound } from "lucide-react";
import { useEffect, useMemo, useState } from "react";
import { useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import QRCode from "react-qr-code";

Expand All @@ -28,8 +28,12 @@ function DashboardInstance() {
const numberFormatter = new Intl.NumberFormat(i18n.language);
const [qrCode, setQRCode] = useState<string | null>(null);
const [pairingCode, setPairingCode] = useState("");
const [isConnecting, setIsConnecting] = useState(false);
const [goQrOpen, setGoQrOpen] = useState(false);
const [goSendOpen, setGoSendOpen] = useState(false);
// Ref instead of state: it has to be readable synchronously, before React
// has had a chance to re-render, or two fast clicks both pass the check.
const connectInFlight = useRef(false);
const token = getToken(TOKEN_ID.TOKEN);
const isGo = getProvider() === "go";
const { theme } = useTheme();
Expand Down Expand Up @@ -67,7 +71,19 @@ function DashboardInstance() {
}
};

/**
* Ask the server for a QR code or a pairing code.
*
* Only one request may be in flight at a time. When the instance is closed,
* GET /instance/connect opens a brand new WhatsApp connection, so clicking
* the button twice left two sockets racing for the same instance: the phone
* would scan the code of one while the other overwrote the pairing state.
*/
const handleConnect = async (instanceName: string, wantPairing: boolean) => {
if (connectInFlight.current) return;
connectInFlight.current = true;
setIsConnecting(true);

try {
setQRCode(null);
if (!token) return console.error("Token not found.");
Expand All @@ -81,6 +97,9 @@ function DashboardInstance() {
}
} catch (error) {
console.error("Error:", error);
} finally {
connectInFlight.current = false;
setIsConnecting(false);
}
};

Expand Down Expand Up @@ -187,7 +206,7 @@ function DashboardInstance() {
<div className="flex flex-wrap gap-2">
<Dialog>
<DialogTrigger onClick={() => handleConnect(instance.name, false)} asChild>
<Button>
<Button disabled={isConnecting}>
<QrCode className="mr-2 h-4 w-4" />
{t("instance.dashboard.button.qrcode.label")}
</Button>
Expand All @@ -207,7 +226,7 @@ function DashboardInstance() {
{instance.number && (
<Dialog>
<DialogTrigger asChild>
<Button variant="outline" onClick={() => handleConnect(instance.name, true)}>
<Button variant="outline" disabled={isConnecting} onClick={() => handleConnect(instance.name, true)}>
{t("instance.dashboard.button.pairingCode.label")}
</Button>
</DialogTrigger>
Expand Down