Resolve merge conflicts

demo/src/lib/index.ts

@@ -1,35 +1 @@
 // 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

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

demo/src/routes/+page.svelte

@@ -3,8 +3,6 @@
 	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');
@@ -32,7 +30,7 @@
 
 		try {
 			// Use the configured server URL
-			const client = new robotics.RoboticsClientCore(settings.transportServerUrl);
+			const client = new robotics.RoboticsClientCore('https://blanchon-robothub-transportserver.hf.space/api');
 			const roomList = await client.listRooms('');
 			rooms = roomList;
 			serverInfo = { rooms: roomList.length, version: '1.0.0' };

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

@@ -1,5 +1,4 @@
 <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';
@@ -43,11 +42,7 @@
 
 			// 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';
@@ -56,11 +51,7 @@
 
 			// 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

@@ -43,11 +43,7 @@
 		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,5 +1,4 @@
 <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';
@@ -72,11 +71,7 @@
 			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,5 +1,4 @@
 <script lang="ts">
-	import { settings } from '$lib/settings.svelte.js';
 	import { onMount } from 'svelte';
 	import { robotics } from '@robothub/transport-server-client';
 	
@@ -100,11 +99,7 @@
 			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;
@@ -144,11 +139,7 @@
 			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,5 +1,4 @@
 <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';
@@ -44,11 +43,7 @@
 		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,5 +1,4 @@
 <script lang="ts">
-	import { settings } from '$lib/settings.svelte.js';
 	import { onMount } from 'svelte';
 	import { video } from '@robothub/transport-server-client';
 	
@@ -19,7 +18,7 @@
 
 	// Remote video stream
 	let remoteVideoStream = $state<MediaStream | null>(null);
-	let remoteVideoRef: HTMLVideoElement;
+	let remoteVideoRef: HTMLVideoElement | null = $state(null);
 
 	// Stream status
 	let streamActive = $state<boolean>(false);
@@ -80,11 +79,7 @@
 			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(() => {
@@ -259,6 +254,7 @@
 			remoteVideoRef.play().catch((err) => {
 				console.warn('Auto-play failed:', err);
 				// Try to play with user gesture required
+				if (!remoteVideoRef) return;
 				remoteVideoRef.muted = true;
 				remoteVideoRef.play().catch((err2) => {
 					console.error('Failed to play video even when muted:', err2);
@@ -514,6 +510,7 @@
 						{#if streamActive && remoteVideoRef}
 							<button
 								onclick={() => {
+									if (!remoteVideoRef) return;
 									if (remoteVideoRef.requestFullscreen) {
 										remoteVideoRef.requestFullscreen();
 									}

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

@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { settings } from '$lib/settings.svelte.js';
 	import { onMount } from 'svelte';
 	import { video } from '@robothub/transport-server-client';
 	
@@ -131,7 +130,7 @@
 			connecting = true;
 			error = '';
 
-			producer = new video.VideoProducer(settings.transportServerUrl);
+			producer = new video.VideoProducer("https://blanchon-robothub-transportserver.hf.space/api");
 
 			producer.onConnected(() => {
 				connected = true;
@@ -195,7 +194,7 @@
 			connecting = true;
 			error = '';
 
-			producer = new video.VideoProducer(settings.transportServerUrl);
+			producer = new video.VideoProducer('https://blanchon-robothub-transportserver.hf.space/api');
 
 			producer.onConnected(() => {
 				connected = true;