Fix an issue with changing host + Fix an issue with catching errors on socket creation

Author: EhabY

src/api/coderApi.ts

@@ -74,15 +74,14 @@ export class CoderApi extends Api {
 			client.setSessionToken(token);
 		}
 
-		setupInterceptors(client, baseUrl, output);
+		setupInterceptors(client, output);
 		return client;
 	}
 
 	setSessionToken = (token: string): void => {
-		const currentToken =
-			this.getAxiosInstance().defaults.headers.common[coderSessionTokenHeader];
-		this.getAxiosInstance().defaults.headers.common[coderSessionTokenHeader] =
-			token;
+		const defaultHeaders = this.getAxiosInstance().defaults.headers.common;
+		const currentToken = defaultHeaders[coderSessionTokenHeader];
+		defaultHeaders[coderSessionTokenHeader] = token;
 
 		if (currentToken !== token) {
 			for (const socket of this.reconnectingSockets) {
@@ -92,8 +91,9 @@ export class CoderApi extends Api {
 	};
 
 	setHost = (host: string | undefined): void => {
-		const currentHost = this.getAxiosInstance().defaults.baseURL;
-		this.getAxiosInstance().defaults.baseURL = host;
+		const defaults = this.getAxiosInstance().defaults;
+		const currentHost = defaults.baseURL;
+		defaults.baseURL = host;
 
 		if (currentHost !== host) {
 			for (const socket of this.reconnectingSockets) {
@@ -380,14 +380,11 @@ export class CoderApi extends Api {
 /**
  * Set up logging and request interceptors for the CoderApi instance.
  */
-function setupInterceptors(
-	client: CoderApi,
-	baseUrl: string,
-	output: Logger,
-): void {
+function setupInterceptors(client: CoderApi, output: Logger): void {
 	addLoggingInterceptors(client.getAxiosInstance(), output);
 
 	client.getAxiosInstance().interceptors.request.use(async (config) => {
+		const baseUrl = client.getAxiosInstance().defaults.baseURL;
 		const headers = await getHeaders(
 			baseUrl,
 			getHeaderCommand(vscode.workspace.getConfiguration()),
@@ -413,7 +410,12 @@ function setupInterceptors(
 	client.getAxiosInstance().interceptors.response.use(
 		(r) => r,
 		async (err) => {
-			throw await CertificateError.maybeWrap(err, baseUrl, output);
+			const baseUrl = client.getAxiosInstance().defaults.baseURL;
+			if (baseUrl) {
+				throw await CertificateError.maybeWrap(err, baseUrl, output);
+			} else {
+				throw err;
+			}
 		},
 	);
 }

src/websocket/reconnectingWebSocket.ts

@@ -10,9 +10,9 @@ import type {
 export type SocketFactory<TData> = () => Promise<UnidirectionalStream<TData>>;
 
 export type ReconnectingWebSocketOptions = {
-	initialBackoffMs?: number; // Default: 250ms
-	maxBackoffMs?: number; // Default: 30s
-	jitterFactor?: number; // Default: 0.1 (±10%)
+	initialBackoffMs?: number;
+	maxBackoffMs?: number;
+	jitterFactor?: number;
 };
 
 // 403 Forbidden, 410 Gone, 426 Upgrade Required, 1002/1003 Protocol errors
@@ -147,7 +147,6 @@ export class ReconnectingWebSocket<TData = unknown>
 		}
 
 		this.#isConnecting = true;
-
 		try {
 			const socket = await this.#socketFactory();
 			this.#currentSocket = socket;
@@ -199,13 +198,6 @@ export class ReconnectingWebSocket<TData = unknown>
 				// Reconnect on abnormal closures (e.g., 1006) or other unexpected codes
 				this.#scheduleReconnect();
 			});
-		} catch (error) {
-			if (!this.#isDisposed) {
-				this.#logger.warn(
-					`[ReconnectingWebSocket] Failed: ${error instanceof Error ? error.message : String(error)} for ${this.#apiRoute}`,
-				);
-				this.#scheduleReconnect();
-			}
 		} finally {
 			this.#isConnecting = false;
 		}
@@ -227,7 +219,14 @@ export class ReconnectingWebSocket<TData = unknown>
 		this.#reconnectTimeoutId = setTimeout(() => {
 			this.#reconnectTimeoutId = null;
 			// Errors already handled in #connect
-			void this.#connect();
+			this.#connect().catch((error) => {
+				if (!this.#isDisposed) {
+					this.#logger.warn(
+						`[ReconnectingWebSocket] Failed: ${error instanceof Error ? error.message : String(error)} for ${this.#apiRoute}`,
+					);
+					this.#scheduleReconnect();
+				}
+			});
 		}, delayMs);
 
 		this.#backoffMs = Math.min(this.#backoffMs * 2, this.#options.maxBackoffMs);