Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(dashboard): distinguish failed lookups and isolate batch runs by id

Purushotham-Prajapati-240778d0b6e03a
diff --git a/dashboard/src/pages/NumberChecker.css b/dashboard/src/pages/NumberChecker.css
index cdac872bd..c34e62b62 100644
--- a/dashboard/src/pages/NumberChecker.css
+++ b/dashboard/src/pages/NumberChecker.css
@@ -436,7 +436,7 @@
.number-checker /* Batch Stats */
.nc-batch-stats {
display: grid;
- grid-template-columns: repeat(4, 1fr);
+ grid-template-columns: repeat(auto-fit, minmax(130px, 1fr));
gap: 1rem;
margin-bottom: 1.25rem;
}
diff --git a/dashboard/src/pages/NumberChecker.test.ts b/dashboard/src/pages/NumberChecker.test.ts
index ce6920220..6fb06cf48 100644
--- a/dashboard/src/pages/NumberChecker.test.ts
+++ b/dashboard/src/pages/NumberChecker.test.ts
@@ -10,6 +10,14 @@ let rtl: RTL;
let NumberChecker: typeof import('./NumberChecker.tsx').NumberChecker;
let ToastProvider: typeof import('../components/Toast.tsx').ToastProvider;
let MemoryRouter: typeof import('react-router-dom').MemoryRouter;
+let defaultFetch: typeof fetch;
+
+function jsonResponse(data: unknown, status = 200): Response {
+ return new Response(JSON.stringify(data), {
+ status,
+ headers: { 'Content-Type': 'application/json' },
+ });
+}
function createTestQueryClient() {
return new QueryClient({
@@ -35,20 +43,18 @@ function renderComponent() {
before(async () => {
const { installJsdomGlobals } = await import('../test-helpers/jsdom.ts');
await installJsdomGlobals();
- globalThis.fetch = (() =>
+ defaultFetch = (() =>
Promise.resolve(
- new Response(
- JSON.stringify([
- {
- id: 'test-session-1',
- name: 'Primary Session',
- status: 'ready',
- phone: '919876543210',
- },
- ]),
- { headers: { 'Content-Type': 'application/json' } },
- ),
+ jsonResponse([
+ {
+ id: 'test-session-1',
+ name: 'Primary Session',
+ status: 'ready',
+ phone: '919876543210',
+ },
+ ]),
)) as typeof fetch;
+ globalThis.fetch = defaultFetch;
const { i18nReady } = await import('../i18n/index.ts');
await i18nReady;
@@ -60,6 +66,7 @@ before(async () => {
afterEach(() => {
rtl.cleanup();
+ globalThis.fetch = defaultFetch;
});
test('NumberChecker: renders single check form and tabs', () => {
@@ -75,3 +82,138 @@ test('NumberChecker: switches to bulk / batch tab when clicked', () => {
const headings = getAllByText('Bulk Number Checker');
assert.ok(headings.length >= 1);
});
+
+test('NumberChecker: a rejected lookup is recorded as failed with error status, not as unregistered', async () => {
+ const recordedDownloads: Blob[] = [];
+ const realCreateObjectURL = URL.createObjectURL;
+ URL.createObjectURL = (blob: Blob) => {
+ recordedDownloads.push(blob);
+ return 'blob:mock-csv';
+ };
+
+ try {
+ globalThis.fetch = ((input: RequestInfo | URL) => {
+ const url = String(input);
+ if (url.includes('/contacts/check/919999999999')) {
+ return Promise.resolve(jsonResponse({ message: 'Rate limit exceeded (HTTP 429)' }, 429));
+ }
+ return Promise.resolve(
+ jsonResponse([
+ {
+ id: 'test-session-1',
+ name: 'Primary Session',
+ status: 'ready',
+ phone: '919876543210',
+ },
+ ]),
+ );
+ }) as typeof fetch;
+
+ renderComponent();
+
+ // Switch to bulk tab
+ const bulkTab = rtl.screen.getByRole('button', { name: /Bulk/i });
+ rtl.fireEvent.click(bulkTab);
+
+ // Wait for session to be selected
+ await rtl.screen.findByRole('option', { name: /Primary Session/ });
+
+ // Enter phone number
+ const textarea = rtl.screen.getByPlaceholderText(/9612345678/i);
+ rtl.fireEvent.change(textarea, { target: { value: '919999999999' } });
+
+ // Start batch
+ const startBtn = rtl.screen.getByRole('button', { name: /Start Batch Check/i });
+ rtl.fireEvent.click(startBtn);
+
+ // Verify row displays Failed status and the error message
+ const failedBadge = await rtl.screen.findByText('Failed', { selector: '.nc-status-badge' });
+ assert.ok(failedBadge);
+ assert.ok(rtl.screen.getByText('Rate limit exceeded (HTTP 429)'));
+
+ // Verify "Not Registered" count is 0 and "Failed" count is 1
+ const notRegBox = rtl.screen.getByText('Not Registered').parentElement;
+ assert.ok(notRegBox?.textContent?.includes('0'));
+
+ const failedBox = rtl.screen.getByText('Failed', { selector: '.nc-stat-label' }).parentElement;
+ assert.ok(failedBox?.textContent?.includes('1'));
+
+ // Export CSV and verify Error status is retained
+ const exportBtn = rtl.screen.getByRole('button', { name: /Export Results/i });
+ rtl.fireEvent.click(exportBtn);
+
+ assert.equal(recordedDownloads.length, 1);
+ const csvContent = await recordedDownloads[0].text();
+ assert.ok(csvContent.includes('"919999999999","Error","","Rate limit exceeded (HTTP 429)"'));
+ assert.ok(!csvContent.includes('"919999999999","No"'));
+ } finally {
+ URL.createObjectURL = realCreateObjectURL;
+ }
+});
+
+test('NumberChecker: Stop followed by Start while lookup is pending cancels earlier run and prevents overwriting', async () => {
+ let resolveFirstLookup!: (res: Response) => void;
+ const firstLookupPromise = new Promise<Response>(resolve => {
+ resolveFirstLookup = resolve;
+ });
+
+ globalThis.fetch = ((input: RequestInfo | URL) => {
+ const url = String(input);
+ if (url.includes('/contacts/check/911111111111')) {
+ return firstLookupPromise;
+ }
+ if (url.includes('/contacts/check/912222222222')) {
+ return Promise.resolve(jsonResponse({ number: '912222222222', exists: true, whatsappId: '[email protected]' }));
+ }
+ return Promise.resolve(
+ jsonResponse([
+ {
+ id: 'test-session-1',
+ name: 'Primary Session',
+ status: 'ready',
+ phone: '919876543210',
+ },
+ ]),
+ );
+ }) as typeof fetch;
+
+ renderComponent();
+
+ // Switch to bulk tab
+ const bulkTab = rtl.screen.getByRole('button', { name: /Bulk/i });
+ rtl.fireEvent.click(bulkTab);
+
+ await rtl.screen.findByRole('option', { name: /Primary Session/ });
+
+ const textarea = rtl.screen.getByPlaceholderText(/9612345678/i);
+
+ // Run 1: Start checking 911111111111
+ rtl.fireEvent.change(textarea, { target: { value: '911111111111' } });
+ const startBtn = rtl.screen.getByRole('button', { name: /Start Batch Check/i });
+ rtl.fireEvent.click(startBtn);
+
+ // Stop while lookup 1 is pending
+ const stopBtn = await rtl.screen.findByRole('button', { name: /Stop Checking/i });
+ rtl.fireEvent.click(stopBtn);
+
+ // Run 2: Start checking 912222222222
+ rtl.fireEvent.change(textarea, { target: { value: '912222222222' } });
+ const startBtnAgain = await rtl.screen.findByRole('button', { name: /Start Batch Check/i });
+ rtl.fireEvent.click(startBtnAgain);
+
+ // Late resolution of Run 1's pending lookup
+ resolveFirstLookup(jsonResponse({ number: '911111111111', exists: false, whatsappId: null }));
+
+ // Wait for Run 2 to finish
+ const registeredRow = await rtl.screen.findByText('+912222222222');
+ assert.ok(registeredRow);
+
+ // Ensure Run 1's late resolution did NOT overwrite or get appended to Run 2's results
+ assert.equal(rtl.screen.queryByText('+911111111111'), null);
+
+ const checkedBox = rtl.screen.getByText('Checked', { selector: '.nc-stat-label' }).parentElement;
+ assert.ok(checkedBox?.textContent?.includes('1'));
+
+ const regBox = rtl.screen.getByText('Registered', { selector: '.nc-stat-label' }).parentElement;
+ assert.ok(regBox?.textContent?.includes('1'));
+});
diff --git a/dashboard/src/pages/NumberChecker.tsx b/dashboard/src/pages/NumberChecker.tsx
index f941493b1..c5c534f79 100644
--- a/dashboard/src/pages/NumberChecker.tsx
+++ b/dashboard/src/pages/NumberChecker.tsx
@@ -1,4 +1,4 @@
-import { useState, useMemo, useRef, useCallback } from 'react';
+import { useState, useMemo, useRef, useCallback, useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import {
UserCheck,
@@ -23,7 +23,11 @@ import { contactApi, type CheckNumberResponse } from '../services/api';
import { useToast } from '../hooks/useToast';
import './NumberChecker.css';
-interface CheckResultItem extends CheckNumberResponse {
+export type CheckStatus = 'registered' | 'unregistered' | 'failed';
+
+export interface CheckResultItem extends CheckNumberResponse {
+ status: CheckStatus;
+ error?: string | null;
avatarUrl?: string | null;
timestamp: string;
}
@@ -58,8 +62,15 @@ export function NumberChecker() {
const [isCheckingBatch, setIsCheckingBatch] = useState(false);
const [batchResults, setBatchResults] = useState<CheckResultItem[]>([]);
const [batchProgress, setBatchProgress] = useState({ current: 0, total: 0 });
- const [batchFilter, setBatchFilter] = useState<'all' | 'registered' | 'unregistered'>('all');
- const cancelBatchRef = useRef(false);
+ const [batchFilter, setBatchFilter] = useState<'all' | 'registered' | 'unregistered' | 'failed'>('all');
+ const batchRunIdRef = useRef<number>(0);
+
+ useEffect(() => {
+ const runRef = batchRunIdRef;
+ return () => {
+ runRef.current++;
+ };
+ }, []);
// Auto-prefix country code state
const [autoPrefix91, setAutoPrefix91] = useState(true);
@@ -164,6 +175,8 @@ export function NumberChecker() {
const item: CheckResultItem = {
...res,
+ status: res.exists ? 'registered' : 'unregistered',
+ error: null,
avatarUrl: avatar,
timestamp: new Date().toLocaleTimeString(),
};
@@ -197,64 +210,81 @@ export function NumberChecker() {
return;
}
+ const runId = ++batchRunIdRef.current;
setIsCheckingBatch(true);
- cancelBatchRef.current = false;
setBatchResults([]);
setBatchProgress({ current: 0, total: numbers.length });
const results: CheckResultItem[] = [];
for (let i = 0; i < numbers.length; i++) {
- if (cancelBatchRef.current) break;
+ if (batchRunIdRef.current !== runId) return;
const num = numbers[i];
try {
const res = await contactApi.checkNumber(currentSession, num);
+ if (batchRunIdRef.current !== runId) return;
+
const item: CheckResultItem = {
...res,
+ status: res.exists ? 'registered' : 'unregistered',
+ error: null,
timestamp: new Date().toLocaleTimeString(),
};
results.push(item);
setBatchResults([...results]);
- } catch {
+ } catch (err) {
+ if (batchRunIdRef.current !== runId) return;
+
+ const errorMsg = err instanceof Error ? err.message : 'Lookup failed';
results.push({
number: num,
exists: false,
whatsappId: null,
+ status: 'failed',
+ error: errorMsg,
timestamp: new Date().toLocaleTimeString(),
});
setBatchResults([...results]);
}
+ if (batchRunIdRef.current !== runId) return;
setBatchProgress({ current: i + 1, total: numbers.length });
if (i < numbers.length - 1 && batchDelay > 0) {
await new Promise(resolve => setTimeout(resolve, batchDelay));
+ if (batchRunIdRef.current !== runId) return;
}
}
+ if (batchRunIdRef.current !== runId) return;
setIsCheckingBatch(false);
toast.success(`Completed checking ${results.length} numbers.`);
};
const handleStopBatch = () => {
- cancelBatchRef.current = true;
+ batchRunIdRef.current++;
setIsCheckingBatch(false);
};
// Filter batch results
const filteredBatchResults = useMemo(() => {
- if (batchFilter === 'registered') return batchResults.filter(r => r.exists);
- if (batchFilter === 'unregistered') return batchResults.filter(r => !r.exists);
+ if (batchFilter === 'registered') return batchResults.filter(r => r.status === 'registered');
+ if (batchFilter === 'unregistered') return batchResults.filter(r => r.status === 'unregistered');
+ if (batchFilter === 'failed') return batchResults.filter(r => r.status === 'failed');
return batchResults;
}, [batchResults, batchFilter]);
// Export batch results as CSV
const handleExportCSV = () => {
if (batchResults.length === 0) return;
- const header = 'Phone Number,Has WhatsApp,WhatsApp ID,Checked At\n';
+ const header = 'Phone Number,Has WhatsApp,WhatsApp ID,Error,Checked At\n';
const rows = batchResults
- .map(r => `"${r.number}","${r.exists ? 'Yes' : 'No'}","${r.whatsappId || ''}","${r.timestamp}"`)
+ .map(r => {
+ const hasWa = r.status === 'failed' ? 'Error' : r.exists ? 'Yes' : 'No';
+ const errorText = (r.error || '').replace(/"/g, '""');
+ return `"${r.number}","${hasWa}","${r.whatsappId || ''}","${errorText}","${r.timestamp}"`;
+ })
.join('\n');
const blob = new Blob([header + rows], { type: 'text/csv;charset=utf-8;' });
const url = URL.createObjectURL(blob);
@@ -266,8 +296,9 @@ export function NumberChecker() {
document.body.removeChild(link);
};
- const registeredCount = batchResults.filter(r => r.exists).length;
- const unregisteredCount = batchResults.filter(r => !r.exists).length;
+ const registeredCount = batchResults.filter(r => r.status === 'registered').length;
+ const unregisteredCount = batchResults.filter(r => r.status === 'unregistered').length;
+ const failedCount = batchResults.filter(r => r.status === 'failed').length;
return (
<div className="number-checker">
@@ -529,10 +560,14 @@ export function NumberChecker() {
<tr key={`${item.number}-${idx}`}>
<td style={{ fontWeight: 600 }}>+{item.number}</td>
<td>
- {item.exists ? (
+ {item.status === 'registered' ? (
<span className="nc-status-badge registered">
<CheckCircle2 size={13} /> Registered
</span>
+ ) : item.status === 'failed' ? (
+ <span className="nc-status-badge error" title={item.error || 'Failed'}>
+ <AlertCircle size={13} /> Failed
+ </span>
) : (
<span className="nc-status-badge unregistered">
<XCircle size={13} /> Unregistered
@@ -703,11 +738,19 @@ export function NumberChecker() {
<div className="nc-stat-label">Registered</div>
</div>
<div className="nc-stat-box">
- <div className="nc-stat-number" style={{ color: 'var(--error-text)' }}>
+ <div className="nc-stat-number" style={{ color: 'var(--text-secondary)' }}>
{unregisteredCount}
</div>
<div className="nc-stat-label">Not Registered</div>
</div>
+ {failedCount > 0 && (
+ <div className="nc-stat-box">
+ <div className="nc-stat-number" style={{ color: 'var(--error-text)' }}>
+ {failedCount}
+ </div>
+ <div className="nc-stat-label">Failed</div>
+ </div>
+ )}
<div className="nc-stat-box">
<div className="nc-stat-number">{Math.max(0, batchProgress.total - batchProgress.current)}</div>
<div className="nc-stat-label">Remaining</div>
@@ -735,6 +778,14 @@ export function NumberChecker() {
>
Not Registered ({unregisteredCount})
</button>
+ {failedCount > 0 && (
+ <button
+ className={`nc-filter-btn ${batchFilter === 'failed' ? 'active' : ''}`}
+ onClick={() => setBatchFilter('failed')}
+ >
+ Failed ({failedCount})
+ </button>
+ )}
</div>
</div>
@@ -754,10 +805,28 @@ export function NumberChecker() {
<td style={{ color: 'var(--text-muted)' }}>{idx + 1}</td>
<td style={{ fontWeight: 600 }}>+{item.number}</td>
<td>
- {item.exists ? (
+ {item.status === 'registered' ? (
<span className="nc-status-badge registered">
<CheckCircle2 size={13} /> Registered
</span>
+ ) : item.status === 'failed' ? (
+ <div style={{ display: 'inline-flex', flexDirection: 'column', gap: '0.25rem' }}>
+ <span className="nc-status-badge error" title={item.error || 'Lookup failed'}>
+ <AlertCircle size={13} /> Failed
+ </span>
+ {item.error && (
+ <span
+ style={{
+ fontSize: '0.75rem',
+ color: 'var(--error-text)',
+ maxWidth: '240px',
+ wordBreak: 'break-word',
+ }}
+ >
+ {item.error}
+ </span>
+ )}
+ </div>
) : (
<span className="nc-status-badge unregistered">
<XCircle size={13} /> Unregistered