Enhance WebSocket support and update environment configuration
- Added VITE_SOCKET_URL to docker-compose.yml for WebSocket connection. - Updated update-docker-env.sh to handle SSL options for WebSocket URLs. - Modified Dockerfile to include VITE_SOCKET_URL in env-config.js. - Implemented getSocketUrl function in frontend to retrieve WebSocket URL. - Refactored socket configuration to use centralized socket URL from environment settings.
This commit is contained in:
@@ -1,13 +1,14 @@
|
||||
/**
|
||||
* Environment configuration
|
||||
* Reads from window.VITE_API_URL (set by env-config.js)
|
||||
* Falls back to import.meta.env.VITE_API_URL (set during build time)
|
||||
* Falls back to a development default
|
||||
* Reads from window environment variables (set by env-config.js)
|
||||
* Falls back to import.meta.env variables (set during build time)
|
||||
* Falls back to development defaults
|
||||
*/
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
VITE_API_URL?: string;
|
||||
VITE_SOCKET_URL?: string;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,6 +27,30 @@ export const getApiUrl = (): string => {
|
||||
return 'http://localhost:3000';
|
||||
};
|
||||
|
||||
export const getSocketUrl = (): string => {
|
||||
// First check runtime-injected environment variables
|
||||
if (window.VITE_SOCKET_URL) {
|
||||
return window.VITE_SOCKET_URL;
|
||||
}
|
||||
|
||||
// Then check build-time environment variables
|
||||
if (import.meta.env.VITE_SOCKET_URL) {
|
||||
return import.meta.env.VITE_SOCKET_URL;
|
||||
}
|
||||
|
||||
// Default based on API URL (convert http->ws or https->wss)
|
||||
const apiUrl = getApiUrl();
|
||||
if (apiUrl.startsWith('https://')) {
|
||||
return apiUrl.replace('https://', 'wss://');
|
||||
} else if (apiUrl.startsWith('http://')) {
|
||||
return apiUrl.replace('http://', 'ws://');
|
||||
}
|
||||
|
||||
// Final fallback
|
||||
return 'ws://localhost:3000';
|
||||
};
|
||||
|
||||
export default {
|
||||
apiUrl: getApiUrl(),
|
||||
socketUrl: getSocketUrl(),
|
||||
};
|
||||
Reference in New Issue
Block a user