Skip to content

Commit 8254b2f

Browse files
committed
Moved ws-wfr.0001200 to ws-demo.westernformularacing
1 parent e57ea19 commit 8254b2f

6 files changed

Lines changed: 18 additions & 8 deletions

File tree

car-simulate/persistent-broadcast/broadcast_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
CSV_FILE = os.getenv('CSV_FILE', '2025-01-01-00-00-00.csv')
1717
SSL_CERT = os.getenv('SSL_CERT', '/app/ssl/cert.pem')
1818
SSL_KEY = os.getenv('SSL_KEY', '/app/ssl/key.pem')
19-
DOMAIN = os.getenv('DOMAIN', 'ws-wfr.0001200.xyz')
19+
DOMAIN = os.getenv('DOMAIN', 'ws-demo.westernformularacing.org')
2020

2121
# Feature flags
2222
# Default to simulation-only for standard IDs; CSV replay can still be

flight-recorder/src/services/WebSocketService.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,15 @@ export class WebSocketService {
5151
if (isRpiNetwork) {
5252
wsUrl = `${protocol}://${hostname}:${port}`;
5353
} else {
54-
wsUrl = `wss://ws-wfr.0001200.xyz:9443`;
54+
wsUrl = `wss://ws-demo.westernformularacing.org`;
5555
}
5656
}
5757

58+
// Ensure protocol is present (especially for custom URLs)
59+
if (wsUrl && !wsUrl.startsWith('ws://') && !wsUrl.startsWith('wss://')) {
60+
wsUrl = `${protocol}://${wsUrl}`;
61+
}
62+
5863
console.log(`[WebSocket] Connecting to: ${wsUrl}`);
5964

6065
try {

pecan/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ flowchart TD
115115
ENV -->|Yes| USE_ENV["Use env var URL"]
116116
ENV -->|No| DETECT{"Detect deployment<br/>scenario"}
117117
118-
DETECT -->|"GitHub Pages /<br/>Cloud IP"| PROD["wss://ws-wfr.0001200.xyz:9443"]
118+
DETECT -->|"GitHub Pages /<br/>Cloud IP"| PROD["wss://ws-demo.westernformularacing.org"]
119119
DETECT -->|"localhost /<br/>127.0.0.1"| LOCAL["ws://localhost:9080"]
120120
DETECT -->|"192.168.x.x<br/>(Car Hotspot)"| CAR["ws://192.168.x.x:9080"]
121121
@@ -140,7 +140,7 @@ flowchart TD
140140
**Connection features:**
141141
- **Auto-protocol detection**: `ws://` on HTTP, `wss://` on HTTPS
142142
- **Deployment modes**: Production cloud, localhost dev, car hotspot (192.168.x.x)
143-
- **Default backend**: On non-`192.x.x.x` hosts (including `localhost`) PECAN connects to the hosted backend at `wss://ws-wfr.0001200.xyz:9443`, unless overridden
143+
- **Default backend**: On non-`192.x.x.x` hosts (including `localhost`) PECAN connects to the hosted backend at `wss://ws-demo.westernformularacing.org`, unless overridden
144144
- **Configurable override**: Users can set a custom WebSocket URL via Settings or `VITE_WS_URL`
145145
- **Reconnection**: Up to 5 attempts with linear backoff (2s increments)
146146
- **Uplink in active development**: The WebSocket protocol supports uplink (`can_send`, `can_send_batch`, `ping`), but the PECAN UI and client helpers for sending control messages are still under active development
@@ -159,7 +159,7 @@ npm install
159159
npm run dev
160160
```
161161

162-
By default, the development server runs on `http://localhost:5173` and PECAN connects to the **hosted** telemetry backend at `wss://ws-wfr.0001200.xyz:9443`. To force a different backend (for example, a local UTS instance on `ws://localhost:9080`), set `VITE_WS_URL` or configure a `custom-ws-url` in the PECAN Settings dialog.
162+
By default, the development server runs on `http://localhost:5173` and PECAN connects to the **hosted** telemetry backend at `wss://ws-demo.westernformularacing.org:9443`. To force a different backend (for example, a local UTS instance on `ws://localhost:9080`), set `VITE_WS_URL` or configure a `custom-ws-url` in the PECAN Settings dialog.
163163

164164
### Testing
165165

pecan/src/services/WebSocketService.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,15 @@ export class WebSocketService {
5151
if (isRpiNetwork) {
5252
wsUrl = `${protocol}://${hostname}:${port}`;
5353
} else {
54-
wsUrl = `wss://ws-wfr.0001200.xyz:9443`;
54+
wsUrl = `wss://ws-demo.westernformularacing.org`;
5555
}
5656
}
5757

58+
// Ensure protocol is present (especially for custom URLs)
59+
if (wsUrl && !wsUrl.startsWith('ws://') && !wsUrl.startsWith('wss://')) {
60+
wsUrl = `${protocol}://${wsUrl}`;
61+
}
62+
5863
console.log(`[WebSocket] Connecting to: ${wsUrl}`);
5964

6065
try {

universal-telemetry-software/WEBSOCKET_PROTOCOL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ wss://<host>:9443 # production (TLS)
1717

1818
The PECAN frontend auto-selects the URL based on `window.location`:
1919
- `192.x.x.x` hostnames connect directly to the RPi
20-
- Everything else connects to the production backend at `wss://ws-wfr.0001200.xyz:9443`
20+
- Everything else connects to the production backend at `wss://ws-demo.westernformularacing.org`
2121
- Override with `localStorage.setItem('custom-ws-url', 'ws://...')`
2222

2323
---

ws-backend/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- WSS_PORT=9443
1313
- SSL_CERT=/app/ssl/cert.pem
1414
- SSL_KEY=/app/ssl/key.pem
15-
- DOMAIN=ws-wfr.0001200.xyz
15+
- DOMAIN=ws-demo.westernformularacing.org # Also supports ws-wfr.0001200.xyz via Cloudflare Tunnel
1616
- ENABLE_CSV=false
1717
- ENABLE_ACCU=true
1818
volumes:

0 commit comments

Comments
 (0)