Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/lib/websocket/websocketService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class WebSocketService {
private reconnectDelay = 2000; // Start with 2 seconds
private connectionState: ConnectionState = ConnectionState.DISCONNECTED;
private baseUrl: string = '';
private authListenersRegistered = false;

/**
* Initialize the WebSocket service with the base URL
Expand All @@ -36,6 +37,11 @@ class WebSocketService {
// Convert http/https to ws/wss
this.baseUrl = baseUrl.replace(/^http/, 'ws');

if (this.authListenersRegistered) {
return;
}
this.authListenersRegistered = true;

// Listen for auth events to reconnect when token changes
eventService.subscribe(AuthEventType.AUTH_TOKEN_REFRESHED, () => {
if (this.connectionState === ConnectionState.CONNECTED) {
Expand Down
131 changes: 131 additions & 0 deletions src/providers/WebSocketProvider.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { render, act } from '@testing-library/react';
import { MemoryRouter, Routes, Route, useNavigate } from 'react-router-dom';
import { WebSocketProvider } from './WebSocketProvider';
import { eventService } from '@/lib/events/eventService';
import { WebSocketEventType } from '@/lib/websocket/websocketService';
import type { TextMessage } from '@/lib/models';

const mockConfig = { apis: { meshBot: { baseUrl: 'http://127.0.0.1:8000' } } };

const { connect, disconnect, initialize } = vi.hoisted(() => ({
connect: vi.fn(),
disconnect: vi.fn(),
initialize: vi.fn(),
}));

vi.mock('@/providers/ConfigProvider', () => ({
useConfig: () => mockConfig,
}));

vi.mock('@/lib/websocket/websocketService', () => ({
websocketService: {
initialize,
connect,
disconnect,
},
WebSocketEventType: {
CONNECTED: 'websocket:connected',
DISCONNECTED: 'websocket:disconnected',
MESSAGE_RECEIVED: 'websocket:message_received',
ERROR: 'websocket:error',
},
ConnectionState: {
CONNECTING: 'connecting',
CONNECTED: 'connected',
DISCONNECTED: 'disconnected',
ERROR: 'error',
},
}));

const { toastMock } = vi.hoisted(() => ({
toastMock: vi.fn(),
}));

vi.mock('@/hooks/use-toast', () => ({
toast: (...args: unknown[]) => toastMock(...args),
useToast: () => ({ toast: toastMock }),
}));

function NavigationHarness({ onNavigate }: { onNavigate: (navigate: ReturnType<typeof useNavigate>) => void }) {
const navigate = useNavigate();
onNavigate(navigate);
return null;
}

function renderWithRoutes(initialPath: string) {
let navigateFn: ReturnType<typeof useNavigate> | null = null;

const utils = render(
<MemoryRouter initialEntries={[initialPath]}>
<WebSocketProvider>
<Routes>
<Route path="/" element={<NavigationHarness onNavigate={(n) => (navigateFn = n)} />} />
<Route path="/nodes" element={<NavigationHarness onNavigate={(n) => (navigateFn = n)} />} />
<Route path="/messages" element={<NavigationHarness onNavigate={(n) => (navigateFn = n)} />} />
<Route path="/meshcore/messages" element={<NavigationHarness onNavigate={(n) => (navigateFn = n)} />} />
</Routes>
</WebSocketProvider>
</MemoryRouter>
);

return {
...utils,
navigate: (path: string) => {
if (!navigateFn) throw new Error('navigate not ready');
act(() => navigateFn!(path));
},
};
}

const sampleMessage = {
id: 1,
message_text: 'hello',
protocol: 'meshtastic',
channel: 1,
sender: { node_id_str: '!aabbccdd', short_name: 'AB' },
} as unknown as TextMessage;

describe('WebSocketProvider', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('connects once on mount and does not disconnect on route changes', () => {
const { navigate } = renderWithRoutes('/');

expect(initialize).toHaveBeenCalledTimes(1);
expect(initialize).toHaveBeenCalledWith('http://127.0.0.1:8000');
expect(connect).toHaveBeenCalledTimes(1);
expect(disconnect).not.toHaveBeenCalled();

navigate('/nodes');
navigate('/messages');
navigate('/meshcore/messages');
navigate('/');

expect(connect).toHaveBeenCalledTimes(1);
expect(disconnect).not.toHaveBeenCalled();
expect(initialize).toHaveBeenCalledTimes(1);
});

it('shows toast for messages when not on the matching messages page', () => {
renderWithRoutes('/');

act(() => {
eventService.emit(WebSocketEventType.MESSAGE_RECEIVED, sampleMessage);
});

expect(toastMock).toHaveBeenCalled();
});

it('suppresses toast when on the matching messages page', () => {
renderWithRoutes('/messages');

act(() => {
eventService.emit(WebSocketEventType.MESSAGE_RECEIVED, sampleMessage);
});

expect(toastMock).not.toHaveBeenCalled();
});
});
14 changes: 9 additions & 5 deletions src/providers/WebSocketProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { createContext, useContext, useEffect, useState, useCallback, useMemo } from 'react';
import React, { createContext, useContext, useEffect, useRef, useState, useCallback, useMemo } from 'react';
import { useConfig } from './ConfigProvider';
import { useLocation } from 'react-router-dom';
import { useToast } from '@/hooks/use-toast';
import { toast } from '@/hooks/use-toast';
import { websocketService, WebSocketEventType, ConnectionState } from '@/lib/websocket/websocketService';
import { TextMessage } from '@/lib/models';
import { eventService } from '@/lib/events/eventService';
Expand Down Expand Up @@ -36,11 +36,15 @@ export function useWebSocket() {
export function WebSocketProvider({ children }: { children: React.ReactNode }) {
const config = useConfig();
const location = useLocation();
const { toast } = useToast();
const pathnameRef = useRef(location.pathname);

const [connectionState, setConnectionState] = useState<ConnectionState>(ConnectionState.DISCONNECTED);
const [unreadMessages, setUnreadMessages] = useState<TextMessage[]>([]);

useEffect(() => {
pathnameRef.current = location.pathname;
}, [location.pathname]);

const markAsReadForProtocol = useCallback((protocol: MessageProtocolSlug) => {
setUnreadMessages((prev) => prev.filter((m) => messageProtocol(m) !== protocol));
}, []);
Expand Down Expand Up @@ -77,7 +81,7 @@ export function WebSocketProvider({ children }: { children: React.ReactNode }) {

const messageHandler = (message: TextMessage) => {
const proto = messageProtocol(message);
if (isOnMessagesPage(location.pathname, proto)) {
if (isOnMessagesPage(pathnameRef.current, proto)) {
return;
}

Expand All @@ -104,7 +108,7 @@ export function WebSocketProvider({ children }: { children: React.ReactNode }) {
eventService.unsubscribe(WebSocketEventType.MESSAGE_RECEIVED, messageHandler);
websocketService.disconnect();
};
}, [config.apis.meshBot.baseUrl, toast, location.pathname]);
}, [config.apis.meshBot.baseUrl]);

useEffect(() => {
if (isOnMessagesPage(location.pathname, 'meshtastic')) {
Expand Down
Loading