mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-01-31 09:49:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Load configurations in parallel & stop suppressing errors

Browse source 
correct commit this time
This commit is contained in:
nexy7574 2025-01-13 16:55:32 +00:00
parent 50bb5b2e99
commit f830d10c68
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/app/components/ClientConfigLoader.tsx
View file

@ -4,26 +4,21 @@ import { ClientConfig } from '../hooks/useClientConfig';
import { trimTrailingSlash } from '../utils/common'; import { trimTrailingSlash } from '../utils/common';
const getClientConfig = async (): Promise<ClientConfig> => { const getClientConfig = async (): Promise<ClientConfig> => {
let url = `${trimTrailingSlash(import.meta.env.BASE_URL)}/config.${window.location.hostname}.json`; const defaultConfig = fetch(
let config = await fetch(url, { method: 'GET' }); `${trimTrailingSlash(import.meta.env.BASE_URL)}/config.json`, { method: 'GET' }
);
const perSiteConfig = fetch(
`${trimTrailingSlash(import.meta.env.BASE_URL)}/config.${window.location.hostname}.json`, { method: "GET" }
);
let loadedConfig = null; return perSiteConfig.then(
try { async (pscResponse) => {
if(config.ok && import.meta.env.MODE != "development") { if (import.meta.env.MODE === "development" || !pscResponse.ok) {
loadedConfig = await config.json(); return defaultConfig.then((dcResponse) => dcResponse.json());
}
return pscResponse.json();
} }
} catch (e) {} )
if(!loadedConfig) {
url = `${trimTrailingSlash(import.meta.env.BASE_URL)}/config.json`;
config = await fetch(url, { method: 'GET' });
try {
loadedConfig = await config.json();
} catch (e) {
return {};
}
}
return loadedConfig;
}; };
type ClientConfigLoaderProps = { type ClientConfigLoaderProps = {