May 30, 2025 · May 13, 2025 · May 13, 2025 · May 13, 2025 · May 13, 2025 · May 13, 2025
diff --git a/site/src/contexts/ProxyContext.test.tsx b/site/src/contexts/ProxyContext.test.tsx
 // here and not inside a unit test.
 jest.mock("contexts/useProxyLatency", () => ({
 useProxyLatency: () => {
 return { proxyLatencies: hardCodedLatencies, refetch: jest.fn(), loaded: true };
 return {
 proxyLatencies: hardCodedLatencies,
 refetch: jest.fn(),
 loaded: true,
 };
 },
 }));

diff --git a/site/src/contexts/ProxyContext.tsx b/site/src/contexts/ProxyContext.tsx

 // Every time we get a new proxiesResponse, update the latency check
 // to each workspace proxy.
 const { proxyLatencies, refetch: refetchProxyLatencies, loaded: latenciesLoaded } =
 useProxyLatency(proxiesResp);
 const {
 proxyLatencies,
 refetch: refetchProxyLatencies,
 loaded: latenciesLoaded,
 } = useProxyLatency(proxiesResp);

 // updateProxy is a helper function that when called will
 // update the proxy being used.
 // This useEffect will auto select the best proxy if the user has not selected one.
 // It must wait until all latencies are loaded to select based on latency. This does mean
 // the first time a user loads the page, the proxy will "flicker" to the best proxy.
 //
 //
 // Once the page is loaded, or the user selects a proxy, this will not run again.
 // biome-ignore lint/correctness/useExhaustiveDependencies: Only update if the source data changes
 useEffect(() => {
 if(loadUserSelectedProxy() !== undefined) {
 if(loadUserSelectedProxy() !== undefined) {
 return; // User has selected a proxy, do not auto select.
 }
 if(!latenciesLoaded) {
 if(!latenciesLoaded) {
 // Wait until the latencies are loaded before
 return;
 }
 true,
 );

 if(best?.proxy) {
 if(best?.proxy) {
 saveUserSelectedProxy(best.proxy);
 updateProxy();
 }

 }, [latenciesLoaded])
 }, [latenciesLoaded, proxiesResp, proxyLatencies]);

 return (
 <ProxyContext.Provider
 }

 // Use the primary proxy if we don't have  any other options.
 if(!selectedProxy) {
 if(!selectedProxy) {
 selectedProxy = proxies.find((proxy) => proxy.name === "primary");
 }
 }
diff --git a/site/src/contexts/useProxyLatency.ts b/site/src/contexts/useProxyLatency.ts
 return {
 proxyLatencies,
 refetch,
 loaded
 loaded,
 };
 };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,7 +26,11 @@ import type * as ProxyLatency from "./useProxyLatency";
		// here and not inside a unit test.
		jest.mock("contexts/useProxyLatency", () => ({
		useProxyLatency: () => {
		return { proxyLatencies: hardCodedLatencies, refetch: jest.fn(), loaded: true };
		return {
		proxyLatencies: hardCodedLatencies,
		refetch: jest.fn(),
		loaded: true,
		};
		},
		}));

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -122,8 +122,11 @@ export const ProxyProvider: FC<PropsWithChildren> = ({ children }) => {

		// Every time we get a new proxiesResponse, update the latency check
		// to each workspace proxy.
		const { proxyLatencies, refetch: refetchProxyLatencies, loaded: latenciesLoaded } =
		useProxyLatency(proxiesResp);
		const {
		proxyLatencies,
		refetch: refetchProxyLatencies,
		loaded: latenciesLoaded,
		} = useProxyLatency(proxiesResp);

		// updateProxy is a helper function that when called will
		// update the proxy being used.
Expand DownExpand Up		@@ -153,13 +156,14 @@ export const ProxyProvider: FC<PropsWithChildren> = ({ children }) => {
		// This useEffect will auto select the best proxy if the user has not selected one.
		// It must wait until all latencies are loaded to select based on latency. This does mean
		// the first time a user loads the page, the proxy will "flicker" to the best proxy.
		//
		//
		// Once the page is loaded, or the user selects a proxy, this will not run again.
		// biome-ignore lint/correctness/useExhaustiveDependencies: Only update if the source data changes
		useEffect(() => {
		if(loadUserSelectedProxy() !== undefined) {
		if(loadUserSelectedProxy() !== undefined) {
		return; // User has selected a proxy, do not auto select.
		}
		if(!latenciesLoaded) {
		if(!latenciesLoaded) {
		// Wait until the latencies are loaded before
		return;
		}
Expand All		@@ -171,12 +175,11 @@ export const ProxyProvider: FC<PropsWithChildren> = ({ children }) => {
		true,
		);

		if(best?.proxy) {
		if(best?.proxy) {
		saveUserSelectedProxy(best.proxy);
		updateProxy();
		}

		}, [latenciesLoaded])
		}, [latenciesLoaded, proxiesResp, proxyLatencies]);

		return (
		<ProxyContext.Provider
Expand DownExpand Up		@@ -250,7 +253,7 @@ export const getPreferredProxy = (
		}

		// Use the primary proxy if we don't have any other options.
		if(!selectedProxy) {
		if(!selectedProxy) {
		selectedProxy = proxies.find((proxy) => proxy.name === "primary");
		}
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -245,7 +245,7 @@ export const useProxyLatency = (
		return {
		proxyLatencies,
		refetch,
		loaded
		loaded,
		};
		};

Expand Down