Merge main into dev, resolving conflicts in favor of dev

Author: haoruizhou

.github/workflows/offline-bundle.yml

@@ -0,0 +1,83 @@
+name: Offline Docker Bundle
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'Git ref to package (branch, tag, SHA)'
+        required: true
+        default: 'timescale-sync'
+
+  release:
+    types: [published]
+
+  push:
+    branches: [ timescale-sync, main, dev ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  package-offline:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.ref || github.ref }}
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build cloud-sync image
+        run: |
+          docker compose -f universal-telemetry-software/deploy/docker-compose.macbook-base.yml build cloud-sync
+
+      - name: Pull all required images
+        run: |
+          docker pull ghcr.io/western-formula-racing/daq-radio/universal-telemetry:latest
+          docker pull ghcr.io/western-formula-racing/daq-radio/pecan:latest
+          docker pull timescale/timescaledb:latest-pg16
+          docker pull redis:8.2
+          docker pull bluenviron/mediamtx:latest
+          docker pull grafana/grafana:latest
+
+      - name: Save images as tarball
+        run: |
+          cd universal-telemetry-software/deploy
+          docker save \
+            ghcr.io/western-formula-racing/daq-radio/universal-telemetry:latest \
+            ghcr.io/western-formula-racing/daq-radio/pecan:latest \
+            timescale/timescaledb:latest-pg16 \
+            redis:8.2 \
+            bluenviron/mediamtx:latest \
+            deploy-cloud-sync:latest \
+            grafana/grafana:latest \
+            -o offline/wfr-docker-images.tar
+
+      - name: Upload as workflow artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: wfr-docker-images-offline
+          path: universal-telemetry-software/deploy/offline/wfr-docker-images.tar
+          retention-days: 30
+
+      - name: Upload to Release
+        if: github.event_name == 'release'
+        uses: softprops/action-gh-release@v1
+        with:
+          files: universal-telemetry-software/deploy/offline/wfr-docker-images.tar
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/telemetry-ci.yml

@@ -150,16 +150,15 @@ jobs:
       run: |
         pip install \
           pytest pytest-asyncio pytest-timeout \
-          cantools influxdb-client \
-          websockets redis requests \
-          "slicks>=0.2.0"
+          cantools \
+          websockets redis requests
 
     - name: Run unit tests
       working-directory: ./universal-telemetry-software
       run: |
         python -m pytest \
           tests/test_leds.py \
-          tests/test_influx_bridge.py \
+          tests/test_helpers.py \
           tests/test_car_mode.py \
           tests/test_dbc_consistency.py \
           tests/test_ws_relay.py \
@@ -193,7 +192,6 @@ jobs:
     # ── Pull heavy images in parallel ────────────────────────────────────
     - name: Pull base images
       run: |
-        docker pull influxdb:3.5.0-core &
         docker pull redis:8.2 &
         wait
         echo "✓ Images pulled"
@@ -207,10 +205,9 @@ jobs:
       run: |
         pip install \
           pytest pytest-asyncio pytest-timeout \
-          cantools influxdb-client \
+          cantools \
           websockets redis requests aiohttp \
-          playwright \
-          "slicks>=0.2.0"
+          playwright
 
     - name: Install Playwright browsers
       run: playwright install chromium --with-deps
@@ -220,8 +217,9 @@ jobs:
       env:
         GIT_HASH: ${{ github.sha }}
       run: |
+        docker compose -f deploy/docker-compose.test.yml down -v --remove-orphans || true
         docker compose -f deploy/docker-compose.test.yml up -d --build
-        echo "Waiting for all services (InfluxDB3 needs ~15s)..."
+        echo "Waiting for all services to become ready..."
         sleep 20
 
     - name: Check container health
@@ -319,9 +317,8 @@ jobs:
       run: |
         pip install \
           pytest pytest-asyncio pytest-timeout \
-          cantools influxdb-client \
-          websockets redis requests \
-          "slicks>=0.2.0"
+          cantools \
+          websockets redis requests
 
     - name: Start vCAN test stack
       working-directory: ./universal-telemetry-software
@@ -653,7 +650,9 @@ jobs:
   deploy-pecan-internal-cloudflare:
     needs: [detect-changes, unit-tests, integration, vcan]
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev'
+    if: |
+      (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') &&
+      needs.detect-changes.outputs.pecan == 'true'
     permissions:
       contents: read
       deployments: write

car-simulate/persistent-broadcast/broadcast_server.py

@@ -169,7 +169,7 @@ class StandardCanSimulator:
       - 512  BMS_Status
       - 768  Wheel_Speeds
 
-    Encoding follows the DBC scale/offset so PECAN and Influx decoding remain
+    Encoding follows the DBC scale/offset so PECAN and backend decoding remain
     consistent with the rest of the system.
     """
 

flight-recorder/src/App.tsx

@@ -61,8 +61,8 @@ const FlightDataRecorder: React.FC = () => {
 
   useEffect(() => {
     // Legacy cleanup
-    localStorage.removeItem('influx-cfClientId');
-    localStorage.removeItem('influx-cfClientSecret');
+    localStorage.removeItem('cfClientId');
+    localStorage.removeItem('cfClientSecret');
 
     const handleStatusChange = (status: ConnectionStatus) => setWsStatus(status);
     webSocketService.on('status', handleStatusChange);

flight-recorder/src/services/LoggingHandler.ts

@@ -12,7 +12,7 @@ class LoggingHandler {
 
       // Stamp with wall-clock time at FDR receipt.
       // The car's msg.time is relative (ms since ECU boot) and has no
-      // meaning as a Unix timestamp — InfluxDB needs absolute epoch ms.
+      // meaning as a Unix timestamp — TimescaleDB expects absolute epoch ms.
       const receivedAt = Date.now();
       messages.forEach(msg => {
         if (msg?.signals) {

flight-recorder/src/services/SyncService.ts

@@ -28,7 +28,7 @@ export class SyncService {
 
   /**
    * Sync recorded CAN frames to the server TimescaleDB via REST API.
-   * Replaces the InfluxDB3 Line Protocol upload.
+    * Replaces the legacy line protocol upload path.
    */
   public async syncToServer(
     config: SyncConfig,

flight-recorder/src/utils/canProcessor.ts

@@ -63,8 +63,8 @@ let dbcFile = import.meta.env.DEV ? localDbc : exampleDbc;
 let usingCache = false;
 const dbcDebugSeen = new Set<number>();
 
-// Simple type definitions for our use, align with InfluxDB3 schema for consistency
-// InfluxDB3 Schema: id -> canId, name -> messageName, signalName, sensorReading, time
+// Simple type definitions for our use, aligned with TimescaleDB ingest schema
+// Schema mapping: id -> canId, name -> messageName, signalName, sensorReading, time
 interface DecodedMessage {
   canId: number;
   messageName: string;

grafana-worker/worker.js

@@ -8,10 +8,12 @@ export default {
       "https://pecan-internal.westernformularacing.org",
     ];
 
-    const corsOrigin = allowedOrigins.includes(origin) ? origin : allowedOrigins[0];
+    if (!allowedOrigins.includes(origin)) {
+      return new Response("Forbidden", { status: 403 });
+    }
 
     const corsHeaders = {
-      "Access-Control-Allow-Origin": corsOrigin,
+      "Access-Control-Allow-Origin": origin,
       "Access-Control-Allow-Methods": "GET, HEAD, POST, OPTIONS",
       "Access-Control-Allow-Headers": "Content-Type, Authorization",
     };