Websocket emit error after maxRetries

Author: jeanp413

src/internalApi.ts

@@ -33,12 +33,13 @@ class GitpodServerApi extends vscode.Disposable {
 		const factory = new JsonRpcProxyFactory<GitpodServer>();
 		this.service = new GitpodServiceImpl<GitpodClient, GitpodServer>(factory.createProxy());
 
+		const maxRetries = 3;
 		const webSocket = new ReconnectingWebSocket(`${serviceUrl.replace('https', 'wss')}/api/v1`, undefined, {
 			maxReconnectionDelay: 10000,
 			minReconnectionDelay: 1000,
 			reconnectionDelayGrowFactor: 1.5,
 			connectionTimeout: 10000,
-			maxRetries: 3,
+			maxRetries,
 			debug: false,
 			startClosed: false,
 			WebSocket: class extends WebSocket {
@@ -54,7 +55,11 @@ class GitpodServerApi extends vscode.Disposable {
 				}
 			}
 		});
-		webSocket.onerror = (e: ErrorEvent) => this.onErrorEmitter.fire(e.error);
+		webSocket.onerror = (e: ErrorEvent) => {
+			if (webSocket.retryCount >= maxRetries ) {
+				this.onErrorEmitter.fire(e.error);
+			}
+		};
 
 		doListen({
 			webSocket: (webSocket as any),

src/remoteConnector.ts

@@ -1024,9 +1024,7 @@ export default class RemoteConnector extends Disposable {
 				throw new Error('No Gitpod session available');
 			}
 
-			const workspaceInfo = await retry(async () => {
-				return await withServerApi(session!.accessToken, connectionInfo.gitpodHost, service => service.server.getWorkspace(connectionInfo.workspaceId), this.logger);
-			}, 500, 3);
+			const workspaceInfo = await withServerApi(session!.accessToken, connectionInfo.gitpodHost, service => service.server.getWorkspace(connectionInfo.workspaceId), this.logger);
 
 			if (workspaceInfo.latestInstance?.status?.phase !== 'running') {
 				throw new NoRunningInstanceError(connectionInfo.workspaceId, workspaceInfo.latestInstance?.status?.phase);