mirror of
https://github.com/ruvnet/RuView
synced 2026-08-10 20:31:42 +00:00
fix: complete sensing server API, WebSocket connectivity, and mobile tests (#125)
The web UI had persistent 404 errors on model, recording, and training endpoints, and the sensing WebSocket never connected on Dashboard/Live Demo tabs because sensingService.start() was only called lazily on Sensing tab visit. Server (main.rs): - Add 14 fully-functional Axum handlers: model CRUD (7), recording lifecycle (4), training control (3) - Scan data/models/ and data/recordings/ at startup - Recording writes CSI frames to .jsonl via tokio background task - Model load/unload lifecycle with state tracking Web UI (app.js): - Import and start sensingService early in initializeServices() so Dashboard and Live Demo tabs connect to /ws/sensing immediately Mobile (ws.service.ts): - Fix WebSocket URL builder to use same-origin port instead of hardcoded port 3001 Mobile (jest.config.js): - Fix testPathIgnorePatterns that was ignoring the entire test directory Mobile (25 test files): - Replace all it.todo() placeholder tests with real implementations covering components, services, stores, hooks, screens, and utils ADR-043 documents all changes.
This commit is contained in:
@@ -1,5 +1,169 @@
|
||||
describe('placeholder', () => {
|
||||
it('passes', () => {
|
||||
expect(true).toBe(true);
|
||||
// We test the WsService class by importing a fresh instance.
|
||||
// We need to mock the poseStore to prevent side effects.
|
||||
jest.mock('@/stores/poseStore', () => ({
|
||||
usePoseStore: {
|
||||
getState: jest.fn(() => ({
|
||||
setConnectionStatus: jest.fn(),
|
||||
})),
|
||||
},
|
||||
}));
|
||||
|
||||
jest.mock('@/services/simulation.service', () => ({
|
||||
generateSimulatedData: jest.fn(() => ({
|
||||
type: 'sensing_update',
|
||||
timestamp: Date.now(),
|
||||
source: 'simulated',
|
||||
nodes: [],
|
||||
features: { mean_rssi: -45, variance: 1 },
|
||||
classification: { motion_level: 'absent', presence: false, confidence: 0.5 },
|
||||
signal_field: { grid_size: [20, 1, 20], values: [] },
|
||||
})),
|
||||
}));
|
||||
|
||||
// Create a fresh WsService for each test to avoid shared state
|
||||
function createWsService() {
|
||||
// Use jest.isolateModules to get a fresh module instance
|
||||
let service: any;
|
||||
jest.isolateModules(() => {
|
||||
service = require('@/services/ws.service').wsService;
|
||||
});
|
||||
return service;
|
||||
}
|
||||
|
||||
describe('WsService', () => {
|
||||
beforeEach(() => {
|
||||
jest.useFakeTimers();
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jest.useRealTimers();
|
||||
});
|
||||
|
||||
describe('buildWsUrl', () => {
|
||||
it('uses the same port as the HTTP URL, not a hardcoded port', () => {
|
||||
// This is the critical bug-fix verification.
|
||||
// buildWsUrl is private, so we test it indirectly via connect().
|
||||
// We mock WebSocket to capture the URL it is called with.
|
||||
const capturedUrls: string[] = [];
|
||||
const OrigWebSocket = globalThis.WebSocket;
|
||||
|
||||
class MockWebSocket {
|
||||
static OPEN = 1;
|
||||
static CONNECTING = 0;
|
||||
readyState = 0;
|
||||
onopen: (() => void) | null = null;
|
||||
onclose: (() => void) | null = null;
|
||||
onerror: (() => void) | null = null;
|
||||
onmessage: (() => void) | null = null;
|
||||
close() {}
|
||||
constructor(url: string) {
|
||||
capturedUrls.push(url);
|
||||
}
|
||||
}
|
||||
|
||||
globalThis.WebSocket = MockWebSocket as any;
|
||||
|
||||
try {
|
||||
const ws = createWsService();
|
||||
|
||||
// Test with port 3000
|
||||
ws.connect('http://192.168.1.10:3000');
|
||||
expect(capturedUrls[capturedUrls.length - 1]).toBe('ws://192.168.1.10:3000/ws/sensing');
|
||||
|
||||
// Clean up, create another service
|
||||
ws.disconnect();
|
||||
const ws2 = createWsService();
|
||||
|
||||
// Test with port 8080
|
||||
ws2.connect('http://myserver.local:8080');
|
||||
expect(capturedUrls[capturedUrls.length - 1]).toBe('ws://myserver.local:8080/ws/sensing');
|
||||
ws2.disconnect();
|
||||
|
||||
// Test HTTPS -> WSS upgrade (port 443 is default for HTTPS so host drops it)
|
||||
const ws3 = createWsService();
|
||||
ws3.connect('https://secure.example.com:443');
|
||||
expect(capturedUrls[capturedUrls.length - 1]).toBe('wss://secure.example.com/ws/sensing');
|
||||
ws3.disconnect();
|
||||
|
||||
// Test WSS input
|
||||
const ws4 = createWsService();
|
||||
ws4.connect('wss://secure.example.com');
|
||||
expect(capturedUrls[capturedUrls.length - 1]).toBe('wss://secure.example.com/ws/sensing');
|
||||
ws4.disconnect();
|
||||
|
||||
// Verify port 3001 is NOT hardcoded anywhere
|
||||
for (const url of capturedUrls) {
|
||||
expect(url).not.toContain(':3001');
|
||||
}
|
||||
} finally {
|
||||
globalThis.WebSocket = OrigWebSocket;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe('connect with empty URL', () => {
|
||||
it('falls back to simulation mode when URL is empty', () => {
|
||||
const ws = createWsService();
|
||||
ws.connect('');
|
||||
expect(ws.getStatus()).toBe('simulated');
|
||||
ws.disconnect();
|
||||
});
|
||||
});
|
||||
|
||||
describe('subscribe and unsubscribe', () => {
|
||||
it('adds a listener and returns an unsubscribe function', () => {
|
||||
const ws = createWsService();
|
||||
const listener = jest.fn();
|
||||
const unsub = ws.subscribe(listener);
|
||||
expect(typeof unsub).toBe('function');
|
||||
unsub();
|
||||
ws.disconnect();
|
||||
});
|
||||
|
||||
it('listener receives simulated frames', () => {
|
||||
const ws = createWsService();
|
||||
const listener = jest.fn();
|
||||
ws.subscribe(listener);
|
||||
ws.connect('');
|
||||
|
||||
// Advance timer to trigger simulation
|
||||
jest.advanceTimersByTime(600);
|
||||
|
||||
expect(listener).toHaveBeenCalled();
|
||||
const frame = listener.mock.calls[0][0];
|
||||
expect(frame).toHaveProperty('type', 'sensing_update');
|
||||
ws.disconnect();
|
||||
});
|
||||
|
||||
it('unsubscribed listener does not receive frames', () => {
|
||||
const ws = createWsService();
|
||||
const listener = jest.fn();
|
||||
const unsub = ws.subscribe(listener);
|
||||
unsub();
|
||||
ws.connect('');
|
||||
|
||||
jest.advanceTimersByTime(600);
|
||||
|
||||
expect(listener).not.toHaveBeenCalled();
|
||||
ws.disconnect();
|
||||
});
|
||||
});
|
||||
|
||||
describe('disconnect', () => {
|
||||
it('clears state and sets status to disconnected', () => {
|
||||
const ws = createWsService();
|
||||
ws.connect('');
|
||||
expect(ws.getStatus()).toBe('simulated');
|
||||
ws.disconnect();
|
||||
expect(ws.getStatus()).toBe('disconnected');
|
||||
});
|
||||
});
|
||||
|
||||
describe('getStatus', () => {
|
||||
it('returns disconnected initially', () => {
|
||||
const ws = createWsService();
|
||||
expect(ws.getStatus()).toBe('disconnected');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user