fix: server web api url setting not applying on runtime process (#4109)

* fix: server web api url setting not applying on runtime process

* Apply suggestion from @greptile-apps[bot]

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
Signed-off-by: Ruslan Konviser <[email protected]>

* fix: dynamic server url in desktop mode

* fix: silent error

* fix: remove unused code

---------

Signed-off-by: Ruslan Konviser <[email protected]>
Co-authored-by: Ruslan Konviser <[email protected]>
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

Author: 3 people

.scripts/configure.electron.ts

@@ -34,7 +34,7 @@ function updateWebConstant(setDesktopApp: boolean) {
 		const [from, to] = setDesktopApp ? [envCheck, hardcoded] : [hardcoded, envCheck];
 
 		if (!fileContent.includes(from)) {
-			throw new Error(`Expected content not found in ${filePath}`);
+			throw Error(`Expected content not found in ${filePath}`);
 		}
 
 		fileContent = fileContent.replace(from, to);

apps/web/core/services/client/api.service.ts

@@ -1,10 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-
 import {
 	APPLICATION_LANGUAGES_CODE,
 	DEFAULT_APP_PATH,
-	GAUZY_API_BASE_SERVER_URL,
-	IS_DESKTOP_APP
+	IS_DESKTOP_APP,
+	GAUZY_API_BASE_SERVER_URL
 } from '@/core/constants/config/constants';
 
 export const getFallbackAPI = async () => {
@@ -19,7 +18,7 @@ import {
 	getTenantIdCookie
 } from '@/core/lib/helpers/cookies';
 import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
-import { APIConfig, desktopServerOverride } from './axios';
+import { APIConfig } from './axios';
 import { HttpLoggerAdapter } from '../logs/logger-adapter.service';
 import { Logger } from '../logs/logger.service';
 import { ApiErrorService } from './api-error.service';
@@ -135,6 +134,10 @@ export class APIService {
 		};
 	}
 
+	protected get desktopBaseURL() {
+		return GAUZY_API_BASE_SERVER_URL.value;
+	}
+
 	getConfig() {
 		return this.config;
 	}
@@ -320,6 +323,8 @@ export class APIService {
 		this.httpLogger.logError(error);
 	}
 
+
+
 	/**
 	 * Get active request statistics for debugging and monitoring
 	 */
@@ -356,14 +361,11 @@ export class APIService {
 		const tenantId = getTenantIdCookie();
 		const organizationId = getOrganizationIdCookie();
 		let baseURL: string | undefined = this.baseURL;
-
 		if (IS_DESKTOP_APP) {
-			// dynamic api host while on desktop mode
-			const runtimeConfig = await desktopServerOverride();
-			baseURL = (runtimeConfig || GAUZY_API_BASE_SERVER_URL.value) as string;
+			baseURL = this.desktopBaseURL;
 		}
-
 		baseURL = baseURL ? `${baseURL}/api` : undefined;
+
 		if (this.config.directAPI) {
 			this.axiosInstance.defaults.baseURL = baseURL;
 		}

apps/web/core/services/client/axios.ts

@@ -1,8 +1,7 @@
 import {
 	APPLICATION_LANGUAGES_CODE,
 	DEFAULT_APP_PATH,
-	GAUZY_API_BASE_SERVER_URL,
-	IS_DESKTOP_APP
+	GAUZY_API_BASE_SERVER_URL
 } from '@/core/constants/config/constants';
 import { getAccessTokenCookie, getOrganizationIdCookie, getTenantIdCookie } from '@/core/lib/helpers/cookies';
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
@@ -86,30 +85,12 @@ export const getAPIDirect = async (): Promise<APIService> => {
 
 export type APIConfig = AxiosRequestConfig<any> & { tenantId?: string; directAPI?: boolean };
 
-export async function desktopServerOverride() {
-	if (typeof window !== 'undefined') {
-		try {
-			const serverConfig = await api.get<{ NEXT_PUBLIC_GAUZY_API_SERVER_URL: string }>('/desktop-server');
-
-			return serverConfig?.data?.NEXT_PUBLIC_GAUZY_API_SERVER_URL;
-		} catch (error) {
-			return GAUZY_API_BASE_SERVER_URL;
-		}
-	}
-	return GAUZY_API_BASE_SERVER_URL;
-}
 async function apiConfig(config?: APIConfig) {
 	const tenantId = getTenantIdCookie();
 	const organizationId = getOrganizationIdCookie();
 
 	let baseURL: string | undefined = GAUZY_API_BASE_SERVER_URL.value;
 
-	if (IS_DESKTOP_APP) {
-		// dynamic api host while on desktop mode
-		const runtimeConfig = await desktopServerOverride();
-		baseURL = (runtimeConfig || GAUZY_API_BASE_SERVER_URL.value) as string;
-	}
-
 	baseURL = baseURL ? `${baseURL}/api` : undefined;
 
 	apiDirect.axiosInstance.defaults.baseURL = baseURL;

apps/web/core/services/server/requests/desktop-source.ts

@@ -1,10 +1,12 @@
-import { GAUZY_API_SERVER_URL, GAUZY_API_BASE_SERVER_URL } from '@/core/constants/config/constants';
+import { GAUZY_API_SERVER_URL, IS_DESKTOP_APP } from '@/core/constants/config/constants';
 import { IServerRuntimeConfig } from '@/core/types/interfaces/common/runtime-server-config';
 
 export function getDesktopConfig(): Partial<IServerRuntimeConfig> {
 	// Next.js 16: serverRuntimeConfig removed, use environment variables instead
-	return {
-		GAUZY_API_SERVER_URL: process.env.GAUZY_API_SERVER_URL || GAUZY_API_SERVER_URL,
-		NEXT_PUBLIC_GAUZY_API_SERVER_URL: process.env.NEXT_PUBLIC_GAUZY_API_SERVER_URL || GAUZY_API_BASE_SERVER_URL.value
-	};
+	if (IS_DESKTOP_APP) {
+		return {
+			GAUZY_API_SERVER_URL: process.env.GAUZY_API_SERVER_URL || GAUZY_API_SERVER_URL
+		};
+	}
+	return {};
 }

apps/web/env-config.ts

@@ -64,4 +64,14 @@ export function loadNextPublicEnvs() {
 }
 
 // Preload Some variables
-setNextPublicEnv(loadNextPublicEnvs());
+if (process.env.NEXT_PUBLIC_IS_DESKTOP_APP === 'true' && typeof window !== 'undefined' && !Object.keys(NEXT_PUBLIC_ENVS.value).length) {
+	(async () => {
+		const resp = await fetch('/api/desktop-server');
+		if (resp.ok) {
+			const serverConfig = await resp.json();
+			setNextPublicEnv({ ...loadNextPublicEnvs(), ...{ NEXT_PUBLIC_GAUZY_API_SERVER_URL: serverConfig?.GAUZY_API_SERVER_URL } });
+		}
+	})();
+} else {
+	setNextPublicEnv(loadNextPublicEnvs());
+}

package.json

@@ -95,7 +95,7 @@
 		"pack:server-web": "yarn run pack --desktop=server-web",
 		"config:server-web": "yarn run config:electron -- --environment=prod --desktop=server-web",
 		"dev:server-web": "cross-env NODE_ENV=production yarn prepare:config:server-web && yarn build:web:desktop && yarn run prepare:server-web && yarn copy:build:web && yarn run start:server-web",
-		"build:web:desktop": "yarn config:electron:web:build -- --type=constant && cross-env NEXT_BUILD_OUTPUT_TYPE=standalone NEXT_SHARP_PATH=/tmp/node_modules/sharp yarn build:web",
+		"build:web:desktop": "yarn config:electron:web:build -- --type=constant && cross-env NEXT_PUBLIC_IS_DESKTOP_APP=true NEXT_BUILD_OUTPUT_TYPE=standalone NEXT_SHARP_PATH=/tmp/node_modules/sharp yarn build:web",
 		"copy:build:web": "yarn ts-node .scripts/copy-web-build.ts && yarn config:electron:web:build -- --type=server",
 		"start:server-web": "cd apps/server-web && yarn run start",
 		"postinstall:electron": "cd apps/server-web && yarn run postinstall",