From bfac75c8fb57a572dc01d8400cb10b834a6bb61c Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Sat, 3 Jan 2026 18:10:37 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20sendEvent=20to=20emit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/lib/stores/socket.ts | 14 +++++++------- app/src/routes/+layout.svelte | 12 +++++------- app/src/routes/peripherals/i2c/i2cSetting.svelte | 4 ++-- app/src/routes/peripherals/servo/servos.svelte | 6 +++--- app/tests/unit/socket.spec.ts | 14 +++++++------- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/app/src/lib/stores/socket.ts b/app/src/lib/stores/socket.ts index ce365a8..28e4e9e 100644 --- a/app/src/lib/stores/socket.ts +++ b/app/src/lib/stores/socket.ts @@ -168,7 +168,7 @@ function createWebSocket() { } } - function unsubscribe_event(event_type: SocketEvent, listener: (data: unknown) => void) { + function unsubscribeEvent(event_type: SocketEvent, listener: (data: unknown) => void) { const message_listeners_totag = event_listeners.get(event_type) if (!message_listeners_totag) return @@ -180,7 +180,7 @@ function createWebSocket() { unresponsiveTimeoutId = setTimeout(() => disconnect('unresponsive'), reconnectTimeoutTime) } - function sendEvent(event: MessageFns, data: T) { + function emit(event: MessageFns, data: T) { if (!ws || ws.readyState !== WebSocket.OPEN) return const type = getNameFromMessageType(event) const wsm = Message.create() as Record @@ -221,7 +221,7 @@ function createWebSocket() { send(Message.create({ pingmsg: {} })) } - function sendRequest( + function request( data: CorrelationRequestData, resolve: (r: CorrelationResponse) => void, reject: (e: Error) => void @@ -240,14 +240,14 @@ function createWebSocket() { function flushQueuedRequests() { for (const [, { data, resolve, reject }] of queued_requests) { - sendRequest(data, resolve, reject) + request(data, resolve, reject) } queued_requests.clear() } return { subscribe, - sendEvent, + emit, init, on: (event_type: MessageFns, listener: (data: MT) => void): (() => void) => { const tag = getTagFromMessageType(event_type) @@ -272,13 +272,13 @@ function createWebSocket() { } listeners.add(listener) return () => { - unsubscribe_event(event_type, listener) + unsubscribeEvent(event_type, listener) } }, request: (data: CorrelationRequestData): Promise => { return new Promise((resolve, reject) => { if (ws && ws.readyState === WebSocket.OPEN) { - sendRequest(data, resolve, reject) + request(data, resolve, reject) } else { const key = getRequestKey(data) const existing = queued_requests.get(key) diff --git a/app/src/routes/+layout.svelte b/app/src/routes/+layout.svelte index 524781a..7b0971e 100644 --- a/app/src/routes/+layout.svelte +++ b/app/src/routes/+layout.svelte @@ -47,15 +47,13 @@ addEventListeners() - input.subscribe(data => - throttler.throttle(() => socket.sendEvent(ControllerData, data), 100) - ) - mode.subscribe(data => socket.sendEvent(ModeData, data)) - walkGait.subscribe(data => socket.sendEvent(WalkGaitData, data)) + input.subscribe(data => throttler.throttle(() => socket.emit(ControllerData, data), 100)) + mode.subscribe(data => socket.emit(ModeData, data)) + walkGait.subscribe(data => socket.emit(WalkGaitData, data)) servoAnglesOut.subscribe(data => - throttler.throttle(() => socket.sendEvent(AnglesData, data), 100) + throttler.throttle(() => socket.emit(AnglesData, data), 100) ) - kinematicData.subscribe(data => socket.sendEvent(KinematicData, data)) + kinematicData.subscribe(data => socket.emit(KinematicData, data)) }) onDestroy(() => { diff --git a/app/src/routes/peripherals/i2c/i2cSetting.svelte b/app/src/routes/peripherals/i2c/i2cSetting.svelte index fb3840d..4849e2a 100644 --- a/app/src/routes/peripherals/i2c/i2cSetting.svelte +++ b/app/src/routes/peripherals/i2c/i2cSetting.svelte @@ -14,7 +14,7 @@ onMount(() => { let unsub = socket.on(PeripheralSettingsData, handleSettings) - socket.sendEvent(PeripheralSettingsDataRequest, {}) + socket.emit(PeripheralSettingsDataRequest, {}) return unsub }) @@ -33,7 +33,7 @@ }, onConfirm: () => { modals.close() - socket.sendEvent(PeripheralSettingsData, settings) + socket.emit(PeripheralSettingsData, settings) } }) } diff --git a/app/src/routes/peripherals/servo/servos.svelte b/app/src/routes/peripherals/servo/servos.svelte index c8f0b42..32b2fae 100644 --- a/app/src/routes/peripherals/servo/servos.svelte +++ b/app/src/routes/peripherals/servo/servos.svelte @@ -12,16 +12,16 @@ const throttler = new Throttler() const activateServo = () => { - socket.sendEvent(ServoStateData, ServoStateData.create({ active: true })) + socket.emit(ServoStateData, ServoStateData.create({ active: true })) } const deactivateServo = () => { - socket.sendEvent(ServoStateData, ServoStateData.create({ active: false })) + socket.emit(ServoStateData, ServoStateData.create({ active: false })) } const updatePWM = () => { throttler.throttle(() => { - socket.sendEvent(ServoPWMData, ServoPWMData.create({ servoId: servoId, servoPwm: pwm })) + socket.emit(ServoPWMData, ServoPWMData.create({ servoId: servoId, servoPwm: pwm })) }, 10) } diff --git a/app/tests/unit/socket.spec.ts b/app/tests/unit/socket.spec.ts index b44fe99..58a2d2d 100644 --- a/app/tests/unit/socket.spec.ts +++ b/app/tests/unit/socket.spec.ts @@ -98,7 +98,7 @@ describe.sequential('WebSocket Integration Tests', () => { unsubscribe() }) - it('should send IMU data from client to server using sendEvent', async () => { + it('should send IMU data from client to server using emit', async () => { let serverReceivedData: any = null // Connect socket @@ -157,8 +157,8 @@ describe.sequential('WebSocket Integration Tests', () => { bmpTemp: 22, pressure: 23 }) - socket.sendEvent(IMUData, imuData) - console.log('Client: sendEvent called') + socket.emit(IMUData, imuData) + console.log('Client: emit called') }, 150) }) @@ -175,7 +175,7 @@ describe.sequential('WebSocket Integration Tests', () => { expect(serverReceivedData?.imu.pressure).toBe(23) }) - it('should fail to serialize data on sendEvent', async () => { + it('should fail to serialize data on emit', async () => { // Connect socket socket.init(`ws://localhost:${TEST_PORT}`) @@ -190,11 +190,11 @@ describe.sequential('WebSocket Integration Tests', () => { // Send any invalid message type const wsm = Message.create() try { - socket.sendEvent(Message as any, wsm) + socket.emit(Message as any, wsm) clearTimeout(timeout) - reject(new Error('Expected sendEvent to throw, but it did not')) + reject(new Error('Expected emit to throw, but it did not')) } catch (e) { - console.log('Client: sendEvent correctly threw error:', e) + console.log('Client: emit correctly threw error:', e) clearTimeout(timeout) resolve() }