major backend improvements and better error handling!

Author: Bvngee

backend/src/sim.py

@@ -5,118 +5,27 @@
 import random
 import datetime
 
-# Creating Fake Simulation Data To Then Pretend It's Live Telemetry Data
-
-# Note: Each characteristic does not act in relation to each other as it would
-# in real life, but the indvidual characteristics themselves are reflective of reality(if that makes any sense)
-
-# Cols 0-27: Acc Temp(Cel)
-# Cols 28-55: Acc Voltage(V)
-# Cols 56-57: Break Pressure Front & Rear(PSI)
-# Col 58: Current to Acc(A)
-# Cols 59-62: Hall Effect Sensors - FL,FR,RL,RR(Hz)
-# Col 63: Altitude(ft)
-# Col 64: Latitude(ft)
-# Col 65: Longitude(ft)
-# Col 66: Speed(mph)
-# Col 67-69: x,y, and z acceleration(m/s^2)
-# Col 70-72: x, y, and z gyro(deg)
-# Cols 73-76: Suspension Travel - FL,FR,RL,RR(V)
-# Cols 77-80: Suspension Force - FL,FR,RL,RR(Oh)
-# Col 81: Acc Air Intake Temp(C)
-# Col 82: Acc Air Exhaust Temp(C)
-# Col 83: Steering(Deg)
-# Col 84: Acc Air Intake Pressure(PSI)
-# Col 85: Acc Intake Air Flow Rate(m^3/sec)
-
-# data_columns = {
-#     "Acc Temp 1(Cel)": pa.float32(),
-#     "Acc Temp 2(Cel)": pa.float32(),
-#     "Acc Temp 3(Cel)": pa.float32(),
-#     "Acc Temp 4(Cel)": pa.float32(),
-#     "Acc Temp 5(Cel)": pa.float32(),
-#     "Acc Temp 6(Cel)": pa.float32(),
-#     "Acc Temp 7(Cel)": pa.float32(),
-#     "Acc Temp 8(Cel)": pa.float32(),
-#     "Acc Temp 9(Cel)": pa.float32(),
-#     "Acc Temp 10(Cel)": pa.float32(),
-#     "Acc Temp 11(Cel)": pa.float32(),
-#     "Acc Temp 12(Cel)": pa.float32(),
-#     "Acc Temp 13(Cel)": pa.float32(),
-#     "Acc Temp 14(Cel)": pa.float32(),
-#     "Acc Temp 15(Cel)": pa.float32(),
-#     "Acc Temp 16(Cel)": pa.float32(),
-#     "Acc Temp 17(Cel)": pa.float32(),
-#     "Acc Temp 18(Cel)": pa.float32(),
-#     "Acc Temp 19(Cel)": pa.float32(),
-#     "Acc Temp 20(Cel)": pa.float32(),
-#     "Acc Temp 21(Cel)": pa.float32(),
-#     "Acc Temp 22(Cel)": pa.float32(),
-#     "Acc Temp 23(Cel)": pa.float32(),
-#     "Acc Temp 24(Cel)": pa.float32(),
-#     "Acc Temp 25(Cel)": pa.float32(),
-#     "Acc Temp 26(Cel)": pa.float32(),
-#     "Acc Temp 27(Cel)": pa.float32(),
-#     "Acc Temp 28(Cel)": pa.float32(),
-#     "Acc Voltage 1(V)": pa.float32(),
-#     "Acc Voltage 2(V)": pa.float32(),
-#     "Acc Voltage 3(V)": pa.float32(),
-#     "Acc Voltage 4(V)": pa.float32(),
-#     "Acc Voltage 5(V)": pa.float32(),
-#     "Acc Voltage 6(V)": pa.float32(),
-#     "Acc Voltage 7(V)": pa.float32(),
-#     "Acc Voltage 8(V)": pa.float32(),
-#     "Acc Voltage 9(V)": pa.float32(),
-#     "Acc Voltage 10(V)": pa.float32(),
-#     "Acc Voltage 11(V)": pa.float32(),
-#     "Acc Voltage 12(V)": pa.float32(),
-#     "Acc Voltage 13(V)": pa.float32(),
-#     "Acc Voltage 14(V)": pa.float32(),
-#     "Acc Voltage 15(V)": pa.float32(),
-#     "Acc Voltage 16(V)": pa.float32(),
-#     "Acc Voltage 17(V)": pa.float32(),
-#     "Acc Voltage 18(V)": pa.float32(),
-#     "Acc Voltage 19(V)": pa.float32(),
-#     "Acc Voltage 20(V)": pa.float32(),
-#     "Acc Voltage 21(V)": pa.float32(),
-#     "Acc Voltage 22(V)": pa.float32(),
-#     "Acc Voltage 23(V)": pa.float32(),
-#     "Acc Voltage 24(V)": pa.float32(),
-#     "Acc Voltage 25(V)": pa.float32(),
-#     "Acc Voltage 26(V)": pa.float32(),
-#     "Acc Voltage 27(V)": pa.float32(),
-#     "Acc Voltage 28(V)": pa.float32(),
-#     "Brake Pressure Front(PSI)": pa.float32(),
-#     "Brake Pressure Rear(PSI)": pa.float32(),
-#     "Current to Acc(A)": pa.float32(),
-#     "Hall Effect Sensor - FL(Hz)": pa.float32(),
-#     "Hall Effect Sensor - FR(Hz)": pa.float32(),
-#     "Hall Effect Sensor - RL(Hz)": pa.float32(),
-#     "Hall Effect Sensor - RR(Hz)": pa.float32(),
-#     "Altitude(ft)": pa.float32(),
-#     "Latitude(ft)": pa.float32(),
-#     "Longitude(ft)": pa.float32(),
-#     "Speed(mph)": pa.float32(),
-#     "x acceleration(m/s^2)": pa.float32(),
-#     "y acceleration(m/s^2)": pa.float32(),
-#     "z acceleration(m/s^2)": pa.float32(),
-#     "x gyro(deg)": pa.float32(),
-#     "y gyro(deg)": pa.float32(),
-#     "z gyro(deg)": pa.float32(),
-#     "Suspension Travel - FL(V)": pa.float32(),
-#     "Suspension Travel - FR(V)": pa.float32(),
-#     "Suspension Travel - RL(V)": pa.float32(),
-#     "Suspension Travel - RR(V)": pa.float32(),
-#     "Suspension Force - FL(Oh)": pa.float32(),
-#     "Suspension Force - FR(Oh)": pa.float32(),
-#     "Suspension Force - RL(Oh)": pa.float32(),
-#     "Suspension Force - RR(Oh)": pa.float32(),
-#     "Acc Air Intake Temp(C)": pa.float32(),
-#     "Acc Air Exhaust Temp(C)": pa.float32(),
-#     "Steering(Deg)": pa.float32(),
-#     "Acc Air Intake Pressure(PSI)": pa.float32(),
-#     "Acc Intake Air Flow Rate(m^3/sec)": pa.float32(),
-# }
+# List of some data to consider:
+# Acc Temp(Cel)
+# Acc Voltage(V)
+# Break Pressure Front & Rear(PSI)
+# Current to Acc(A)
+# Hall Effect Sensors - FL,FR,RL,RR(Hz)
+# Altitude(ft)
+# Latitude(ft)
+# Longitude(ft)
+# Speed(mph)
+# x,y, and z acceleration(m/s^2)
+# x, y, and z gyro(deg)
+# Suspension Travel - FL,FR,RL,RR(V)
+# Suspension Force - FL,FR,RL,RR(Oh)
+# Acc Air Intake Temp(C)
+# Acc Air Exhaust Temp(C)
+# Steering(Deg)
+# Acc Air Intake Pressure(PSI)
+# Acc Intake Air Flow Rate(m^3/sec)
+
+# Real data schema:
 data_columns = {
   ":Lap": pa.float32(), # 91
   ":LapTime": pa.float32(), # 91
@@ -305,79 +214,13 @@
 
 
 def createdf():
-    simLength: float = 5.0  # how many seconds to run the simulation for
-    simStepsPerSec: int = 100  # how many simulation steps per second
-    # rowcount = int(simLength * simStepsPerSec)
-    rowcount = 1
-
-    column_names = list(data_columns.keys())
-    total_cols = len(column_names)
-    # table = [rowcount][total_cols]
-
-    # Initialize the data array
-    data = np.zeros((rowcount, total_cols))
-
-    # Generate Acc Temp Data
-    for col in range(0, 28):
-        # horiz_shift = random.uniform(-0.5, 0.5)
-        # time = np.arange(rowcount) / simStepsPerSec
-        # data[:, col] = 1 + np.sin(time - horiz_shift) * 0.5
-        t = (datetime.datetime.now() - t0).total_seconds()
-        data[:, col] = math.sin(t)
-
-    # Generate Acc Voltage Data
-    for col in range(28, 56):
-        horiz_shift = random.uniform(-0.3, 0.3)
-        time = np.arange(rowcount) / simStepsPerSec
-        data[:, col] = 1 + np.sin(time - horiz_shift) * 0.5
-
-    # Brake Pressure
-    data[: int(300), 56:58] = 0  # First 3 seconds are zero
-    data[300:, 56] = (
-        np.arange(300, rowcount) / simStepsPerSec
-    ) * 0.5 - 3  # Arbitrary equation for brake pressure
-
-    # Current to Acc
-    total_voltage = 6000  # Arbitrary voltage
-    resistance = 50  # Arbitrary resistance
-    capacitance = 300  # Arbitrary capacitance
-    data[:, 58] = (
-        total_voltage
-        / resistance
-        * np.exp(-np.arange(rowcount) / (resistance * capacitance))
-    )
-
-    # RPM Wheel Data
-    for col in range(59, 63):
-        time = np.arange(rowcount) / simStepsPerSec
-        data[:, col] = np.where(
-            time < 4, 1000 * time, 4000
-        )  # Linear eq up to 4 seconds, then peak
-
-    # Altitude and Latitude: Assuming constant at 0
-    data[:, 63] = 0  # Altitude
-    data[:, 64] = 0  # Latitude
-
-    # Longitude: Arbitrary quadratic function
-    data[:, 65] = 10.73 * (np.arange(rowcount) / simStepsPerSec) ** 2
-
-    # Speed: Same arbitrary acceleration
-    data[:, 66] = 10.73 * (np.arange(rowcount) / simStepsPerSec)
-
-    # Assuming gyro is 0
-    data[:, 70:73] = 0
-
-    # I do not have enough physics knowledge to do these
-    data[:, 73:] = 0
-
-    data[:, 2] = (datetime.datetime.now() - t0).total_seconds()
+    # Default item
+    series_list = [pl.Series(k, [math.sin((datetime.datetime.now() - t0).total_seconds() + i/10)], pl.Float32) for i, k in enumerate(data_columns)]
+    # :Time
+    series_list[2] = pl.Series(":Time", [(datetime.datetime.now() - t0).total_seconds()], pl.Float32)
+    df = pl.DataFrame(series_list)
 
-    # df = pl.DataFrame(data, schema=column_names).cast(pl.Float32)
-    # timestamps = pl.Series(
-    #     "Timestamp(s)", [(datetime.datetime.now() - t0).total_seconds()]
-    # ).cast(pl.Float32)
-    # return df.with_columns(timestamps)
-    return pl.DataFrame(data, schema=column_names).cast(pl.Float32)
+    return df
 
 # def get_schema():
 #     # for now, we use nullable: True. In the future, the backend should

backend/src/websocket_server.py

@@ -1,60 +1,88 @@
 import asyncio
 import io
-import signal
+from websockets import ConnectionClosed
 import websockets.asyncio.server as ws
 import polars as pl
 import pyarrow as pa
 import random
+
 import sim
 
+# List of WebSocket connections with their corresponding Arrow Stream (IPC)
+# Writers and BytesIO buffers
+connections: list[
+    tuple[ws.ServerConnection, pa.RecordBatchStreamWriter, io.BytesIO]
+] = []
 
-async def websocket_serve(websocket: ws.ServerConnection):
-    buffer = io.BytesIO()
-    with pa.ipc.new_stream(buffer, sim.get_schema()) as writer:
-        while True:
-            df = sim.createdf()
-            # print(str(df))
-            arrow_data = df.to_arrow()
 
-            assert arrow_data.schema.equals(sim.get_schema()), "get_schema() != df's schema!"
+# Todo: this will come from the radio module eventually!
+def get_arrow_data():
+    current_df = sim.createdf()
+    arrow_data = current_df.to_arrow()
+    assert arrow_data.schema.equals(sim.get_schema()), "get_schema() != df's schema!"
+    return arrow_data
+
+
+# TODO: use IDs and not indexes (race condition here I think)
+def clean_connection(idx: int):
+    rb_writer: pa.RecordBatchStreamWriter
+    buffer: io.BytesIO
+    if connections[idx]:
+        _, rb_writer, buffer = connections[idx]
+        rb_writer.close()
+        buffer.close()
+        del connections[idx]
+
 
-            writer.write_table(arrow_data)
+# The main loop that sends Arrow record batches to all connected clients
+async def ws_main_loop(freq_hertz: int):
+    while True:
+        arrow_data = get_arrow_data()
 
-            ipc_data = buffer.getvalue()
-            buffer.seek(0)
-            buffer.truncate()
+        disconnected_idxs = []
+        for idx, (ws_connection, rb_writer, buffer) in enumerate(connections):
+            try:
+                rb_writer.write_table(arrow_data)
 
-            await websocket.send(ipc_data)
-            # await websocket.send(df.write_ndjson())
-            await asyncio.sleep((1 + random.uniform(-0.5, 0.5)) / 100)
+                ipc_data = buffer.getvalue()
+                buffer.seek(0)
+                buffer.truncate()
 
+                await ws_connection.send(ipc_data)
+            except ConnectionClosed as e:
+                print("ConnectionClosed:", e)
+                disconnected_idxs.append(idx)
+
+        # Clean any disconnected websockets
+        for idx in reversed(disconnected_idxs):
+            clean_connection(idx)
+
+        await asyncio.sleep(
+            1 / freq_hertz + random.uniform(-0.4 / freq_hertz, 0.4 / freq_hertz)
+        )
+
+
+# Handler function for each incoming connection
+async def websocket_handler(websocket: ws.ServerConnection):
+    buffer = io.BytesIO()
+    rb_writer = pa.ipc.new_stream(buffer, sim.get_schema())
 
-    # Old code, which created a new Arrow IPC stream for each record batch
-    # (which breaks decoding multiple batches with a single reader on the client)
-    # while True:
-    #     df = sim.createdf()
-    #     # print(str(df))
-    #     arrow_data = df.to_arrow()
-    #     byte_stream = io.BytesIO()
-    #     with pa.ipc.new_stream(byte_stream, arrow_data.schema) as writer:
-    #         writer.write_table(arrow_data)
-    #
-    #     ipc_data = byte_stream.getvalue()
-    #
-    #     await websocket.send(ipc_data)
-    #     # await websocket.send(df.write_ndjson())
-    #     await asyncio.sleep((1 + random.uniform(-0.5, 0.5)) / 100)
+    connections.append((websocket, rb_writer, buffer))
+    print(f"Client connected! Current connections: {len(connections)}")
 
+    try:
+        await websocket.wait_closed()
+    finally:
+        if (websocket, rb_writer, buffer) in connections:
+            idx = connections.index((websocket, rb_writer, buffer))
+            clean_connection(idx)
+        print(f"Client disconnected. Remaining connections: {len(connections)}")
 
 
 async def ws_main(port: int):
-    # Add signal handler for SIGTERM
-    stop = asyncio.Event()
-    loop = asyncio.get_running_loop()
-    loop.add_signal_handler(signal.SIGTERM, lambda: stop.set())
+    ws_server = await ws.serve(websocket_handler, "0.0.0.0", port)
 
-    async with ws.serve(websocket_serve, "0.0.0.0", port):
-        await stop.wait()  # Run until stop "event" has been triggered
+    await asyncio.gather(ws_main_loop(100), ws_server.serve_forever())
 
 
 # asyncio.run(ws_main()) # handled by main.py now

frontend/app/components/ItemContainer.tsx

@@ -6,7 +6,7 @@ interface ItemContainerProps {
 
 export default function ItemContainer({ children }: ItemContainerProps) {
     return (
-        <div className="bg-background-2 rounded-xl p-4">
+        <div className="bg-background-2 rounded-xl p-3">
             {children}
         </div>
     )