Resolve merge conflicts

demo/README.md

@@ -59,6 +59,48 @@ demo/
 2. **LeRobot Arena Server** running on port 8000
 3. **Built JavaScript Client** (automatically installed as dependency)
 
+## ⚙️ Server Configuration
+
+The demo automatically detects the correct server URL based on the environment:
+
+- **Development mode**: `http://localhost:8000` (when running on localhost)
+- **Production mode**: `https://blanchon-robottransportserver.hf.space/api` (when deployed)
+
+### Environment Variable Override
+
+You can override the default server URL by setting the `PUBLIC_SERVER_URL` environment variable:
+
+```bash
+# For development with custom server
+export PUBLIC_SERVER_URL=http://localhost:8000
+
+# For production with HuggingFace Space
+export PUBLIC_SERVER_URL=https://blanchon-robottransportserver.hf.space/api
+
+# For custom server deployment
+export PUBLIC_SERVER_URL=https://your-custom-server.com/api
+```
+
+### Setting Environment Variables
+
+#### Option 1: Create a `.env` file
+```bash
+# In demo/.env
+PUBLIC_SERVER_URL=http://localhost:8000
+```
+
+#### Option 2: Runtime environment variable
+```bash
+# Set via window object (for runtime configuration)
+window.__SERVER_URL__ = 'http://localhost:8000';
+```
+
+#### Option 3: Build-time environment variable
+```bash
+# When building
+PUBLIC_SERVER_URL=https://your-server.com/api bun run build
+```
+
 ## 🚀 Quick Start
 
 ### 1. Install Dependencies

demo/bun.lock

@@ -4,7 +4,7 @@
     "": {
       "name": "demo",
       "dependencies": {
-        "@robothub/transport-server-client": "https://gitpkg.now.sh/julien-blanchon/robothub/services/transport-server/client/js?main",
+        "@robothub/transport-server-client": "file:../client/js",
       },
       "devDependencies": {
         "@eslint/compat": "^1.2.5",
@@ -130,7 +130,7 @@
 
     "@polka/url": ["@polka/[email protected]", "", {}, "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww=="],
 
-    "@robothub/transport-server-client": ["@robothub/transport-server-client@https://gitpkg.now.sh/julien-blanchon/robothub/services/transport-server/client/js?main", { "dependencies": { "eventemitter3": "^5.0.1" }, "peerDependencies": { "typescript": ">=5.0.0" } }],
+    "@robothub/transport-server-client": ["@robothub/transport-server-client@file:../client/js", { "dependencies": { "eventemitter3": "^5.0.1" }, "devDependencies": { "@types/bun": "^1.2.15", "typescript": "^5.3.3" }, "peerDependencies": { "typescript": ">=5.0.0" } }],
 
     "@rollup/rollup-android-arm-eabi": ["@rollup/[email protected]", "", { "os": "android", "cpu": "arm" }, "sha512-NELNvyEWZ6R9QMkiytB4/L4zSEaBC03KIXEghptLGLZWJ6VPrL63ooZQCOnlx36aQPGhzuOMwDerC1Eb2VmrLw=="],
 
@@ -212,6 +212,8 @@
 
     "@tailwindcss/vite": ["@tailwindcss/[email protected]", "", { "dependencies": { "@tailwindcss/node": "4.1.8", "@tailwindcss/oxide": "4.1.8", "tailwindcss": "4.1.8" }, "peerDependencies": { "vite": "^5.2.0 || ^6" } }, "sha512-CQ+I8yxNV5/6uGaJjiuymgw0kEQiNKRinYbZXPdx1fk5WgiyReG0VaUx/Xq6aVNSUNJFzxm6o8FNKS5aMaim5A=="],
 
+    "@types/bun": ["@types/[email protected]", "", { "dependencies": { "bun-types": "1.2.17" } }, "sha512-l/BYs/JYt+cXA/0+wUhulYJB6a6p//GTPiJ7nV+QHa8iiId4HZmnu/3J/SowP5g0rTiERY2kfGKXEK5Ehltx4Q=="],
+
     "@types/cookie": ["@types/[email protected]", "", {}, "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="],
 
     "@types/estree": ["@types/[email protected]", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="],
@@ -260,6 +262,8 @@
 
     "braces": ["[email protected]", "", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="],
 
+    "bun-types": ["[email protected]", "", { "dependencies": { "@types/node": "*" } }, "sha512-ElC7ItwT3SCQwYZDYoAH+q6KT4Fxjl8DtZ6qDulUFBmXA8YB4xo+l54J9ZJN+k2pphfn9vk7kfubeSd5QfTVJQ=="],
+
     "callsites": ["[email protected]", "", {}, "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="],
 
     "chalk": ["[email protected]", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],

demo/src/lib/index.ts

@@ -1 +1,35 @@
 // place files you want to import through the `$lib` alias in this folder.
+
+/**
+ * Get the server URL based on environment variables and dev/prod mode
+ * Priority: ENV variable > dev mode (localhost:8000) > prod mode (HF Space)
+ */
+export function getServerUrl(): string {
+  // Check for environment variable first
+  if (typeof window !== 'undefined') {
+    // Client-side: check for runtime environment variable
+    const envUrl = (window as any).__SERVER_URL__;
+    if (envUrl) {
+      return envUrl;
+    }
+  } else {
+    // Server-side: check for build-time environment variable
+    const envUrl = process.env.PUBLIC_SERVER_URL;
+    if (envUrl) {
+      return envUrl;
+    }
+  }
+
+  // Fall back to dev/prod detection
+  if (typeof window !== 'undefined') {
+    // Client-side: check if we're in development
+    const isDev = window.location.hostname === 'localhost' || 
+                  window.location.hostname === '127.0.0.1' ||
+                  window.location.hostname.startsWith('192.168.');
+    
+    return isDev ? 'http://localhost:8000' : 'https://blanchon-robottransportserver.hf.space/api';
+  }
+  
+  // Server-side fallback
+  return 'http://localhost:8000';
+}

demo/src/lib/settings.svelte.ts

@@ -0,0 +1,9 @@
+import { getServerUrl } from './index.js';
+
+interface Settings {
+	transportServerUrl: string;
+}
+
+export const settings: Settings = $state({
+	transportServerUrl: getServerUrl()
+});

demo/src/routes/+page.svelte

@@ -3,6 +3,8 @@
 	import { robotics } from '@robothub/transport-server-client';
 	import type { robotics as roboticsTypes } from '@robothub/transport-server-client';
 	import { goto } from '$app/navigation';
+	import { settings } from '$lib/settings.svelte.js';
+	
 
 	// Server status
 	let serverStatus = $state<'checking' | 'connected' | 'error'>('checking');
@@ -29,10 +31,8 @@
 		debugInfo.connectionAttempts++;
 
 		try {
-			// Use relative URL so it works in both development and production
-			const baseUrl = typeof window !== 'undefined' ? window.location.origin : 'http://localhost:7860';
-			const apiUrl = `${baseUrl}/api`;
-			const client = new robotics.RoboticsClientCore(apiUrl);
+			// Use the configured server URL
+			const client = new robotics.RoboticsClientCore(settings.transportServerUrl);
 			const roomList = await client.listRooms('');
 			rooms = roomList;
 			serverInfo = { rooms: roomList.length, version: '1.0.0' };

demo/src/routes/[workspaceId]/+page.svelte

@@ -1,7 +1,9 @@
 <script lang="ts">
+	import { settings } from '$lib/settings.svelte.js';
 	import { onMount } from 'svelte';
 	import { robotics, video } from '@robothub/transport-server-client';
 	import type { robotics as roboticsTypes, video as videoTypes } from '@robothub/transport-server-client';
+	
 
 	// Get data from load function
 	let { data } = $props();
@@ -41,7 +43,11 @@
 
 			// Load robotics rooms
 			try {
+<<<<<<< HEAD
 				roboticsClient = new robotics.RoboticsClientCore('https://blanchon-robothub-transportserver.hf.space/api');
+=======
+				roboticsClient = new robotics.RoboticsClientCore(settings.transportServerUrl);
+>>>>>>> ccb03a313c3f3278e408a849294738a50b7ec4d0
 				roboticsRooms = await roboticsClient.listRooms(workspaceId);
 			} catch (err) {
 				roboticsError = 'Failed to load robotics rooms';
@@ -50,7 +56,11 @@
 
 			// Load video rooms
 			try {
+<<<<<<< HEAD
 				videoClient = new video.VideoClientCore('https://blanchon-robothub-transportserver.hf.space/api');
+=======
+				videoClient = new video.VideoClientCore(settings.transportServerUrl);
+>>>>>>> ccb03a313c3f3278e408a849294738a50b7ec4d0
 				videoRooms = await videoClient.listRooms(workspaceId);
 			} catch (err) {
 				videoError = 'Failed to load video rooms';

demo/src/routes/[workspaceId]/robotics/+page.svelte

@@ -2,6 +2,7 @@
 	import { onMount } from 'svelte';
 	import { robotics } from '@robothub/transport-server-client';
 	import type { robotics as roboticsTypes } from '@robothub/transport-server-client';
+	
 
 	// Get data from load function
 	let { data } = $props();
@@ -42,7 +43,11 @@
 		try {
 			loading = true;
 			error = '';
+<<<<<<< HEAD
 			client = new robotics.RoboticsClientCore('https://blanchon-robothub-transportserver.hf.space/api');
+=======
+			client = new robotics.RoboticsClientCore(settings.transportServerUrl);
+>>>>>>> ccb03a313c3f3278e408a849294738a50b7ec4d0
 			rooms = await client.listRooms(workspaceId);
 			debugInfo.responseTime = Date.now() - startTime;
 		} catch (err) {

demo/src/routes/[workspaceId]/robotics/consumer/+page.svelte

@@ -1,7 +1,9 @@
 <script lang="ts">
+	import { settings } from '$lib/settings.svelte.js';
 	import { onMount } from 'svelte';
 	import { robotics } from '@robothub/transport-server-client';
 	import type { robotics as roboticsTypes } from '@robothub/transport-server-client';
+	
 
 	// Get data from load function
 	let { data } = $props();
@@ -70,7 +72,11 @@
 			connecting = true;
 			error = '';
 
+<<<<<<< HEAD
 			consumer = new robotics.RoboticsConsumer('https://blanchon-robothub-transportserver.hf.space/api');
+=======
+			consumer = new robotics.RoboticsConsumer(settings.transportServerUrl);
+>>>>>>> ccb03a313c3f3278e408a849294738a50b7ec4d0
 
 			// Set up event handlers
 			consumer.onConnected(() => {

demo/src/routes/[workspaceId]/robotics/producer/+page.svelte

@@ -1,6 +1,8 @@
 <script lang="ts">
+	import { settings } from '$lib/settings.svelte.js';
 	import { onMount } from 'svelte';
 	import { robotics } from '@robothub/transport-server-client';
+	
 
 	// Get data from load function
 	let { data } = $props();
@@ -98,7 +100,11 @@
 			connecting = true;
 			error = '';
 
+<<<<<<< HEAD
 			producer = new robotics.RoboticsProducer('https://blanchon-robothub-transportserver.hf.space/api');
+=======
+			producer = new robotics.RoboticsProducer(settings.transportServerUrl);
+>>>>>>> ccb03a313c3f3278e408a849294738a50b7ec4d0
 
 			producer.onConnected(() => {
 				connected = true;
@@ -138,7 +144,11 @@
 			connecting = true;
 			error = '';
 
+<<<<<<< HEAD
 			producer = new robotics.RoboticsProducer('https://blanchon-robothub-transportserver.hf.space/api');
+=======
+			producer = new robotics.RoboticsProducer(settings.transportServerUrl);
+>>>>>>> ccb03a313c3f3278e408a849294738a50b7ec4d0
 
 			producer.onConnected(() => {
 				connected = true;

demo/src/routes/[workspaceId]/video/+page.svelte

@@ -1,7 +1,9 @@
 <script lang="ts">
+	import { settings } from '$lib/settings.svelte.js';
 	import { onMount } from 'svelte';
 	import { video } from '@robothub/transport-server-client';
 	import type { video as videoTypes } from '@robothub/transport-server-client';
+	
 
 	// Get data from load function
 	let { data } = $props();
@@ -42,7 +44,11 @@
 		try {
 			loading = true;
 			error = '';
+<<<<<<< HEAD
 			client = new video.VideoClientCore('https://blanchon-robothub-transportserver.hf.space/api');
+=======
+			client = new video.VideoClientCore(settings.transportServerUrl);
+>>>>>>> ccb03a313c3f3278e408a849294738a50b7ec4d0
 			rooms = await client.listRooms(workspaceId);
 			debugInfo.responseTime = Date.now() - startTime;
 		} catch (err) {

demo/src/routes/[workspaceId]/video/consumer/+page.svelte

@@ -1,6 +1,8 @@
 <script lang="ts">
+	import { settings } from '$lib/settings.svelte.js';
 	import { onMount } from 'svelte';
 	import { video } from '@robothub/transport-server-client';
+	
 
 	// Get data from load function
 	let { data } = $props();
@@ -78,7 +80,11 @@
 			connecting = true;
 			error = '';
 
+<<<<<<< HEAD
 			consumer = new video.VideoConsumer('https://blanchon-robothub-transportserver.hf.space/api');
+=======
+			consumer = new video.VideoConsumer(settings.transportServerUrl);
+>>>>>>> ccb03a313c3f3278e408a849294738a50b7ec4d0
 
 			// Set up event handlers
 			consumer.onConnected(() => {

demo/src/routes/[workspaceId]/video/producer/+page.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { settings } from '$lib/settings.svelte.js';
 	import { onMount } from 'svelte';
 	import { video } from '@robothub/transport-server-client';