Found from the live bot log: after the user scans the QR, Baileys
receives `pair-success`, logs "pairing configured successfully, expect
to restart the connection...", and then closes the websocket with
status 515 (DisconnectReason.restartRequired) so it can reopen with
the new credentials. The next `open` event finishes the pairing.
The previous code path treated ANY close during pairing as a failure:
it parked the row as `unpaired`, wiped the QR, and emitted
session.timeout to the UI. The user was greeted with "Pairing timed
out — The QR window closed before a device was linked" at the exact
moment they had successfully paired.
Three changes:
- session.ts emits `restartRequired: boolean` on the SessionEvent close
payload (true when reason === DisconnectReason.restartRequired).
- pair-handler treats the restart-required close as a no-op: keeps the
listener attached and the DB row in `pending` so the upcoming `open`
event flips it to `connected`.
- session-manager always reconnects on restart-required (250 ms after
the close — no `lastConnectedAt` gate, no 5 s back-off).
Pure helpers (`pair-state.ts`) updated to model the new branch:
- decideOnPairClose returns null when restartRequired (don't touch DB).
- shouldAutoReconnect returns true on restartRequired regardless of
whether the account has ever connected before.
Tests (+1; 26 bot tests, 104 web tests = 130 green):
- pair-state.test.ts gains explicit cases:
* restart-required close → null
* shouldAutoReconnect always true on restart-required (incl.
first-time pair, where hasEverConnected is false — the exact
case that broke in production).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
224 lines
8.4 KiB
TypeScript
224 lines
8.4 KiB
TypeScript
import { eq, and, lt } from "drizzle-orm";
|
|
import { rm } from "node:fs/promises";
|
|
import { join } from "node:path";
|
|
import { whatsappAccounts } from "@cmbot/db";
|
|
import { db } from "../db.js";
|
|
import { env } from "../env.js";
|
|
import { logger } from "../logger.js";
|
|
import { sessionManager } from "../whatsapp/session-manager.js";
|
|
import { renderQrPng } from "../whatsapp/qr-renderer.js";
|
|
import { syncGroupsForAccount } from "../whatsapp/group-sync.js";
|
|
import { writeAuditLog } from "../audit.js";
|
|
import { pgNotifyWeb } from "./notify.js";
|
|
|
|
const PAIR_TIMEOUT_MS = 5 * 60 * 1000;
|
|
const offByAccount = new Map<string, () => void>();
|
|
const lastQrPayload = new Map<string, string>();
|
|
const pairTimeouts = new Map<string, NodeJS.Timeout>();
|
|
|
|
async function abandonPair(accountId: string): Promise<{ existed: boolean; label: string | null }> {
|
|
const account = await db.query.whatsappAccounts.findFirst({
|
|
where: (a, { eq }) => eq(a.id, accountId),
|
|
});
|
|
if (!account || account.status !== "pending") {
|
|
return { existed: false, label: account?.label ?? null };
|
|
}
|
|
const off = offByAccount.get(accountId);
|
|
if (off) {
|
|
off();
|
|
offByAccount.delete(accountId);
|
|
}
|
|
const t = pairTimeouts.get(accountId);
|
|
if (t) {
|
|
clearTimeout(t);
|
|
pairTimeouts.delete(accountId);
|
|
}
|
|
lastQrPayload.delete(accountId);
|
|
if (sessionManager.hasSession(accountId)) {
|
|
await sessionManager.stop(accountId);
|
|
}
|
|
// Throw away the partial Baileys session files so the next pair
|
|
// attempt starts clean — but KEEP the account row so the operator
|
|
// sees it on the list with a "Re-pair" affordance.
|
|
await rm(join(env.SESSIONS_DIR, accountId), { recursive: true, force: true });
|
|
await db
|
|
.update(whatsappAccounts)
|
|
.set({ status: "unpaired", lastQrPng: null })
|
|
.where(eq(whatsappAccounts.id, accountId));
|
|
return { existed: true, label: account.label };
|
|
}
|
|
|
|
export async function handleStartPairing(accountId: string): Promise<void> {
|
|
const account = await db.query.whatsappAccounts.findFirst({
|
|
where: (a, { eq }) => eq(a.id, accountId),
|
|
});
|
|
if (!account) {
|
|
logger.warn({ accountId }, "pair: account row missing");
|
|
return;
|
|
}
|
|
|
|
// Detach any listener still subscribed from a prior pairing attempt for
|
|
// this account. Without this, repeated Re-pair clicks accumulate
|
|
// listeners and each one writes a fresh QR to the DB on every Baileys
|
|
// event — the UI then flashes through new QRs constantly.
|
|
const prevOff = offByAccount.get(accountId);
|
|
if (prevOff) {
|
|
prevOff();
|
|
offByAccount.delete(accountId);
|
|
}
|
|
|
|
// For Re-pair, an old session may still be alive. Stop it so
|
|
// sessionManager.start() actually opens a fresh socket and Baileys emits
|
|
// a new QR. (start() is a no-op when a session is already registered.)
|
|
if (sessionManager.hasSession(accountId)) {
|
|
await sessionManager.stop(accountId);
|
|
}
|
|
// Clear any stale QR lingering from a prior attempt.
|
|
lastQrPayload.delete(accountId);
|
|
await db
|
|
.update(whatsappAccounts)
|
|
.set({ lastQrPng: null })
|
|
.where(eq(whatsappAccounts.id, accountId));
|
|
|
|
const off = sessionManager.on(async (id, _state, event) => {
|
|
if (id !== accountId) return;
|
|
try {
|
|
if (event.type === "qr") {
|
|
// Dedupe by payload — Baileys can re-emit the same QR string in a
|
|
// burst. Different strings (a fresh QR) always pass through, so
|
|
// the user gets a new QR as soon as Baileys generates one.
|
|
if (lastQrPayload.get(id) === event.payload) return;
|
|
lastQrPayload.set(id, event.payload);
|
|
const png = await renderQrPng(event.payload);
|
|
// PNG is too large (~5-10KB) for pg_notify (8000 byte limit).
|
|
// Persist on the account row; web fetches via /api/qr/[id].
|
|
await db
|
|
.update(whatsappAccounts)
|
|
.set({ lastQrPng: png.toString("base64"), lastQrAt: new Date() })
|
|
.where(eq(whatsappAccounts.id, id));
|
|
await pgNotifyWeb({
|
|
type: "session.qr",
|
|
accountId: id,
|
|
ts: Date.now(),
|
|
});
|
|
} else if (event.type === "open") {
|
|
const t = pairTimeouts.get(id);
|
|
if (t) {
|
|
clearTimeout(t);
|
|
pairTimeouts.delete(id);
|
|
}
|
|
lastQrPayload.delete(id);
|
|
offByAccount.delete(id);
|
|
const session = sessionManager.getSession(id);
|
|
let synced = 0;
|
|
if (session) {
|
|
const r = await syncGroupsForAccount(id, session.socket);
|
|
synced = r.synced;
|
|
}
|
|
await writeAuditLog(db, {
|
|
operatorId: account.operatorId,
|
|
source: "web",
|
|
action: "account.paired",
|
|
targetType: "whatsapp_account",
|
|
targetId: id,
|
|
payload: { label: account.label },
|
|
});
|
|
await pgNotifyWeb({
|
|
type: "session.connected",
|
|
accountId: id,
|
|
phoneNumber: event.phoneNumber ?? null,
|
|
});
|
|
await pgNotifyWeb({
|
|
type: "groups.synced",
|
|
accountId: id,
|
|
count: synced,
|
|
});
|
|
off();
|
|
} else if (event.type === "close" && event.restartRequired) {
|
|
// After the user scans, WhatsApp tells Baileys to "restart"
|
|
// the connection. The socket closes with status 515 and the
|
|
// session-manager will reopen it with the new credentials —
|
|
// the next `open` event is what completes the pairing.
|
|
// This is NOT a failure: keep the listener attached so we see
|
|
// that subsequent `open` event, and don't surface a timeout
|
|
// to the UI. The DB row stays in `pending` until `open`.
|
|
logger.info(
|
|
{ accountId: id },
|
|
"pair: restart-required close (post-pair reconnect) — keeping listener alive",
|
|
);
|
|
// The session-manager handles the actual reconnect; nothing to
|
|
// do here other than NOT tear our listener / DB state down.
|
|
} else if (event.type === "close") {
|
|
// During the pairing window, any other close means the QR window
|
|
// ended without a successful link — Baileys' default is to
|
|
// close after exhausting QR refs (~2.5 min). Surface this to
|
|
// the UI so the user gets a "pairing timed out" screen, and
|
|
// park the row in a stable state so it shows up cleanly on
|
|
// the accounts list with a "Re-pair" affordance.
|
|
const t = pairTimeouts.get(id);
|
|
if (t) {
|
|
clearTimeout(t);
|
|
pairTimeouts.delete(id);
|
|
}
|
|
lastQrPayload.delete(id);
|
|
offByAccount.delete(id);
|
|
await db
|
|
.update(whatsappAccounts)
|
|
.set({ status: "unpaired", lastQrPng: null })
|
|
.where(eq(whatsappAccounts.id, id));
|
|
await pgNotifyWeb({ type: "session.timeout", accountId: id });
|
|
off();
|
|
}
|
|
} catch (err) {
|
|
logger.error({ err, accountId: id }, "pair: handler error");
|
|
}
|
|
});
|
|
offByAccount.set(accountId, off);
|
|
|
|
try {
|
|
await sessionManager.start(accountId);
|
|
} catch (err) {
|
|
logger.error({ err, accountId }, "pair: start failed");
|
|
off();
|
|
offByAccount.delete(accountId);
|
|
await pgNotifyWeb({ type: "session.timeout", accountId });
|
|
return;
|
|
}
|
|
|
|
const timeoutId = setTimeout(() => {
|
|
void (async () => {
|
|
try {
|
|
const r = await abandonPair(accountId);
|
|
if (r.existed) {
|
|
await pgNotifyWeb({ type: "session.timeout", accountId });
|
|
}
|
|
} catch (err) {
|
|
logger.error({ err, accountId }, "pair: timeout cleanup failed");
|
|
}
|
|
})();
|
|
}, PAIR_TIMEOUT_MS);
|
|
pairTimeouts.set(accountId, timeoutId);
|
|
}
|
|
|
|
/**
|
|
* Sweep stale `pending` accounts on bot startup. The bot was probably
|
|
* restarted mid-pair (or the operator never finished scanning) — the
|
|
* row is parked as `unpaired` so the operator sees it on the list and
|
|
* can hit Re-pair, instead of silently disappearing.
|
|
*/
|
|
export async function sweepStalePendingAccounts(): Promise<void> {
|
|
const cutoff = new Date(Date.now() - 60 * 60 * 1000);
|
|
const stale = await db
|
|
.select({ id: whatsappAccounts.id, label: whatsappAccounts.label })
|
|
.from(whatsappAccounts)
|
|
.where(and(eq(whatsappAccounts.status, "pending"), lt(whatsappAccounts.createdAt, cutoff)));
|
|
for (const row of stale) {
|
|
await rm(join(env.SESSIONS_DIR, row.id), { recursive: true, force: true });
|
|
await db
|
|
.update(whatsappAccounts)
|
|
.set({ status: "unpaired", lastQrPng: null })
|
|
.where(eq(whatsappAccounts.id, row.id));
|
|
logger.info({ accountId: row.id, label: row.label }, "sweep: parked stale pending account as unpaired");
|
|
}
|
|
}
|