feat: add real-time latency indicator and websocket heartbeat #84
+207
−136
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,115 @@ | ||
| import { useState, useEffect, useCallback, useRef } from "react"; | ||
| import type { RemoteMessage } from "@/types"; | ||
|
|
||
| export const useRemoteConnection = () => { | ||
| const wsRef = useRef<WebSocket | null>(null); | ||
| const [status, setStatus] = useState<"connecting" | "connected" | "disconnected">("disconnected"); | ||
| const [latency, setLatency] = useState<number | null>(null); | ||
|
|
||
| useEffect(() => { | ||
| let isMounted = true; | ||
| const protocol = window.location.protocol === "https:" ? "wss:" : "ws:"; | ||
| const host = window.location.host; | ||
| const wsUrl = `${protocol}//${host}/ws`; | ||
|
|
||
| let reconnectTimer: NodeJS.Timeout; | ||
| let heartbeatTimer: NodeJS.Timeout; | ||
| let reconnectDelay = 1000; | ||
| const MAX_RECONNECT_DELAY = 30000; | ||
|
|
||
| const connect = () => { | ||
| if (!isMounted) return; | ||
|
|
||
| if (wsRef.current) { | ||
| wsRef.current.onopen = null; | ||
| wsRef.current.onclose = null; | ||
| wsRef.current.onerror = null; | ||
| wsRef.current.close(); | ||
| wsRef.current = null; | ||
| } | ||
|
|
||
| console.log(`Connecting to ${wsUrl}`); | ||
| setStatus("connecting"); | ||
| const socket = new WebSocket(wsUrl); | ||
| wsRef.current = socket; | ||
|
|
||
| socket.onopen = () => { | ||
| if (!isMounted) return; | ||
| setStatus("connected"); | ||
| reconnectDelay = 1000; | ||
| heartbeatTimer = setInterval(() => { | ||
| if (socket.readyState === WebSocket.OPEN) { | ||
| socket.send(JSON.stringify({ type: "ping", timestamp: Date.now() })); | ||
| } | ||
| }, 3000); | ||
| }; | ||
|
|
||
| socket.onmessage = (event) => { | ||
| try { | ||
| const msg = JSON.parse(event.data); | ||
| if (msg.type === "pong") { | ||
| const ts = Number(msg.timestamp); | ||
| const rtt = Date.now() - ts; | ||
| if (Number.isFinite(ts) && Number.isFinite(rtt) && rtt >= 0 && rtt < 60000) { | ||
| setLatency(rtt); | ||
| } | ||
| } | ||
| } catch (e) { | ||
| console.error("Error parsing WS message", e); | ||
| } | ||
| }; | ||
|
|
||
| socket.onclose = () => { | ||
| if (!isMounted) return; | ||
| setStatus("disconnected"); | ||
| setLatency(null); | ||
| wsRef.current = null; | ||
| clearInterval(heartbeatTimer); | ||
| const delay = reconnectDelay; | ||
| reconnectDelay = Math.min(reconnectDelay * 2, MAX_RECONNECT_DELAY); | ||
| reconnectTimer = setTimeout(connect, delay); | ||
| }; | ||
|
|
||
| socket.onerror = (e) => { | ||
| console.error("WS Error", e); | ||
| socket.close(); | ||
| }; | ||
| }; | ||
|
|
||
| const initialTimer = setTimeout(connect, 0); | ||
|
|
||
| return () => { | ||
| isMounted = false; | ||
| clearTimeout(initialTimer); | ||
| clearTimeout(reconnectTimer); | ||
| clearInterval(heartbeatTimer); | ||
|
|
||
| if (wsRef.current) { | ||
| wsRef.current.onopen = null; | ||
| wsRef.current.onclose = null; | ||
| wsRef.current.onerror = null; | ||
| wsRef.current.close(); | ||
| wsRef.current = null; | ||
| } | ||
| }; | ||
| }, []); | ||
|
|
||
| const send = useCallback((msg: RemoteMessage) => { | ||
| if (wsRef.current?.readyState === WebSocket.OPEN) { | ||
| wsRef.current.send(JSON.stringify(msg)); | ||
| } | ||
| }, []); | ||
|
|
||
| const sendCombo = useCallback((msg: string[]) => { | ||
| if (wsRef.current?.readyState === WebSocket.OPEN) { | ||
| wsRef.current.send( | ||
| JSON.stringify({ | ||
| type: "combo", | ||
| keys: msg, | ||
| }), | ||
| ); | ||
| } | ||
| }, []); | ||
|
Comment on lines
+103
to
+112
Contributor
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# First, let's find and examine the RemoteMessage type definition
echo "=== Looking for RemoteMessage type definition ==="
rg -n --type=ts --type=tsx "type RemoteMessage|export type RemoteMessage" -A 10
echo -e "\n=== Checking sendCombo implementation in useRemoteConnection.ts ==="
sed -n '103,112p' src/hooks/useRemoteConnection.ts
echo -e "\n=== Searching for all 'combo' references in the codebase ==="
rg -n '"combo"' --type=ts --type=tsx
echo -e "\n=== Searching for RemoteMessage usage context ==="
rg -n "RemoteMessage" --type=ts --type=tsx -B 2 -A 2Repository: AOSSIE-Org/Rein Length of output: 604 🏁 Script executed: #!/bin/bash
# Find the types file
echo "=== Locating types file ==="
find . -name "types.*" -type f | grep -E "\.(ts|tsx|js|jsx)$"
echo -e "\n=== Searching for RemoteMessage definition ==="
rg -n "type RemoteMessage|RemoteMessage =" -A 15
echo -e "\n=== Searching for combo references ==="
rg -n "combo" -C 2
echo -e "\n=== Examining src/types.tsx or similar ==="
if [ -f src/types.tsx ]; then
cat -n src/types.tsx
elif [ -f src/types.ts ]; then
cat -n src/types.ts
fiRepository: AOSSIE-Org/Rein Length of output: 3073
The Add Suggested type additionexport type RemoteMessage =
| { type: "move"; dx: number; dy: number }
| { type: "scroll"; dx?: number; dy?: number }
| { type: "click"; button: "left" | "right" | "middle"; press: boolean }
| { type: "key"; key: string }
| { type: "text"; text: string }
| { type: "zoom"; delta: number }
| { type: "combo"; keys: string[] };🤖 Prompt for AI Agents |
||
|
|
||
| return { status, latency, send, sendCombo }; | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.