Skip to content

Commit 6b4fe99

Browse files
committed
Add more logging and some cleanup
1 parent 69df291 commit 6b4fe99

File tree

4 files changed

+17
-28
lines changed

4 files changed

+17
-28
lines changed

src/api/coderApi.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,14 @@ export class CoderApi extends Api implements vscode.Disposable {
177177
const socketsToReconnect = [...this.reconnectingSockets].filter(
178178
(socket) => socket.state === ConnectionState.DISCONNECTED,
179179
);
180-
this.output.debug(
181-
`Configuration changed, ${socketsToReconnect.length}/${this.reconnectingSockets.size} socket(s) in DISCONNECTED state`,
182-
);
183-
for (const socket of socketsToReconnect) {
184-
socket.reconnect();
180+
if (socketsToReconnect.length) {
181+
this.output.debug(
182+
`Configuration changed, ${socketsToReconnect.length}/${this.reconnectingSockets.size} socket(s) in DISCONNECTED state`,
183+
);
184+
for (const socket of socketsToReconnect) {
185+
this.output.debug(`Reconnecting WebSocket: ${socket.url}`);
186+
socket.reconnect();
187+
}
185188
}
186189
});
187190
}

src/inbox.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ export class Inbox implements vscode.Disposable {
5050
logger.info("Listening to Coder Inbox");
5151
});
5252

53-
socket.addEventListener("error", () => {
54-
// Errors are already logged internally
55-
inbox.dispose();
56-
});
57-
5853
socket.addEventListener("message", (data) => {
5954
if (data.parseError) {
6055
logger.error("Failed to parse inbox message", data.parseError);

src/websocket/reconnectingWebSocket.ts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,7 @@ function reduceState(
9393
}
9494

9595
case "DISPOSE":
96-
switch (state) {
97-
case ConnectionState.DISPOSED:
98-
return state;
99-
default:
100-
return ConnectionState.DISPOSED;
101-
}
96+
return ConnectionState.DISPOSED;
10297
}
10398
}
10499

@@ -172,7 +167,7 @@ export class ReconnectingWebSocket<
172167
this.#onDispose = onDispose;
173168
}
174169

175-
static async create<TData>(
170+
public static async create<TData>(
176171
socketFactory: SocketFactory<TData>,
177172
logger: Logger,
178173
options: ReconnectingWebSocketOptions,
@@ -190,14 +185,14 @@ export class ReconnectingWebSocket<
190185
return instance;
191186
}
192187

193-
get url(): string {
188+
public get url(): string {
194189
return this.#currentSocket?.url ?? "";
195190
}
196191

197192
/**
198193
* Returns the current connection state.
199194
*/
200-
get state(): ConnectionState {
195+
public get state(): ConnectionState {
201196
return this.#state;
202197
}
203198

@@ -214,14 +209,14 @@ export class ReconnectingWebSocket<
214209
return url.pathname + url.search;
215210
}
216211

217-
addEventListener<TEvent extends WebSocketEventType>(
212+
public addEventListener<TEvent extends WebSocketEventType>(
218213
event: TEvent,
219214
callback: EventHandler<TData, TEvent>,
220215
): void {
221216
this.#eventHandlers[event].add(callback);
222217
}
223218

224-
removeEventListener<TEvent extends WebSocketEventType>(
219+
public removeEventListener<TEvent extends WebSocketEventType>(
225220
event: TEvent,
226221
callback: EventHandler<TData, TEvent>,
227222
): void {
@@ -232,7 +227,7 @@ export class ReconnectingWebSocket<
232227
* Force an immediate reconnection attempt.
233228
* Resumes the socket if previously disconnected via disconnect().
234229
*/
235-
reconnect(): void {
230+
public reconnect(): void {
236231
if (this.#state === ConnectionState.DISPOSED) {
237232
return;
238233
}
@@ -254,14 +249,14 @@ export class ReconnectingWebSocket<
254249
/**
255250
* Temporarily disconnect the socket. Can be resumed via reconnect().
256251
*/
257-
disconnect(code?: number, reason?: string): void {
252+
public disconnect(code?: number, reason?: string): void {
258253
if (!this.#dispatch({ type: "DISCONNECT" })) {
259254
return;
260255
}
261256
this.clearCurrentSocket(code, reason);
262257
}
263258

264-
close(code?: number, reason?: string): void {
259+
public close(code?: number, reason?: string): void {
265260
if (this.#state === ConnectionState.DISPOSED) {
266261
return;
267262
}

src/workspace/workspacesProvider.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ export class WorkspaceProvider
101101
* logged in or the query fails.
102102
*/
103103
private async fetch(): Promise<WorkspaceTreeItem[]> {
104-
this.logger.debug(
105-
`Fetching workspaces: ${this.getWorkspacesQuery || "no filter"}...`,
106-
);
107-
108104
// If there is no URL configured, assume we are logged out.
109105
const url = this.client.getAxiosInstance().defaults.baseURL;
110106
if (!url) {

0 commit comments

Comments
 (0)