feat: backend proxy feature

Author: RonenMars

entrypoint.sh

@@ -1,15 +1,15 @@
 #!/bin/sh
 
-if [ -z "$VITE_HOST_URL" ]; then
-    echo "window.appConfig = { apiBaseUrl: \"\", proxy: false };" > /usr/share/nginx/html/config.js
+if [ -n "$VITE_HOST_URL" ]; then
+    echo "window.appConfig = { apiBaseUrl: \"$VITE_HOST_URL\", rerouteApi: false };" > /usr/share/nginx/html/config.js
+elif [ -n "$REROUTE_API" ]; then
+    echo "window.appConfig = { rerouteApi: \"$REROUTE_API\" };" > /usr/share/nginx/html/config.js
 else
-    echo "window.appConfig = { apiBaseUrl: \"$VITE_HOST_URL\", proxy: \"$PROXY\" };" > /usr/share/nginx/html/config.js
+    echo "window.appConfig = { apiBaseUrl: \"\" };" > /usr/share/nginx/html/config.js
 fi
 
 cat /usr/share/nginx/html/config.js
 
-# Substitute environment variables into nginx.conf.template and output to default.conf
 envsubst '${VITE_HOST_URL}' < /app/nginx.conf.template > /etc/nginx/conf.d/default.conf
 
-# Start Nginx
 nginx -g "daemon off;"

src/utilities/getApiBaseUrl.utils.ts

@@ -1,26 +1,30 @@
+/* eslint-disable no-console */
+import { ValidateURL } from "@src/utilities";
+
 export const getApiBaseUrl = (): string => {
-	const buildUrl = (url: string, useProxy: boolean): string => {
-		if (url.match(/^(http|https):\/\//)) {
-			return useProxy ? "/api" : url; // If proxying, return "/api"; otherwise, use the full URL
-		} else {
-			const path = url.startsWith("/") ? url.substring(1) : url;
-			return `${window.location.origin}/${path}`;
+	if (window.appConfig?.rerouteApi) {
+		if (window.appConfig.rerouteApi.toString()?.toLowerCase === "true") return "/api";
+		else {
+			console.error("Reroute API is set to false. Please set it to 'true' to reroute the API.");
 		}
-	};
+	}
 
-	// Check runtime config first (injected via config.js)
 	if (window.appConfig?.apiBaseUrl) {
-		const useProxy = window.appConfig.proxy === "true" || window.appConfig.proxy === true;
-		return buildUrl(window.appConfig.apiBaseUrl, useProxy);
+		if (ValidateURL(window.appConfig.apiBaseUrl)) return window.appConfig.apiBaseUrl;
+		else {
+			console.error("Invalid API base URL found. Please set a valid URL in your environment variables.");
+		}
 	}
 
-	// Fallback to Vite env var (for dev or if config.js isn’t set)
 	const hostUrl = import.meta.env.VITE_HOST_URL;
 	if (hostUrl) {
-		return buildUrl(hostUrl, false); // Default to no proxy for Vite env
+		if (ValidateURL(hostUrl)) return hostUrl;
+		else {
+			console.error("Invalid HOST_BASE_URL found. Please set a valid URL in your environment variables.");
+			return "";
+		}
 	}
 
-	// Fallback logic based on hostname
 	const { hostname } = window.location;
 	if (hostname === "app.autokitteh.cloud") {
 		return "https://api.autokitteh.cloud";

vite.config.ts

@@ -42,7 +42,7 @@ export default defineConfig({
 		"import.meta.env.VITE_NODE_ENV": JSON.stringify(process.env.VITE_NODE_ENV),
 		"import.meta.env.VITE_DESCOPE_PROJECT_ID": JSON.stringify(process.env.VITE_DESCOPE_PROJECT_ID),
 		"import.meta.env.GOOGLE_ANALYTICS_ID": JSON.stringify(process.env.GOOGLE_ANALYTICS_ID),
-		// Remove VITE_HOST_URL if runtime injection is the only source
+		"import.meta.env.VITE_HOST_URL": JSON.stringify(process.env.VITE_HOST_URL),
 		"import.meta.env.DISPLAY_DISCORD_INTEGRATION": process.env.DISPLAY_DISCORD_INTEGRATION,
 		"import.meta.env.DISPLAY_SLACK_SOCKET_INTEGRATION": process.env.DISPLAY_SLACK_SOCKET_INTEGRATION,
 		"import.meta.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN),
@@ -140,12 +140,5 @@ export default defineConfig({
 	server: {
 		port: 8000,
 		host: true,
-		proxy: {
-			"/api": {
-				target: process.env.VITE_HOST_URL || "http://localhost:9980",
-				changeOrigin: true,
-				rewrite: (path) => path.replace(/^\/api/, ""),
-			},
-		},
 	},
 });