Max WS retries

Author: filiptronicek

extensions/gitpod/src/auth.ts

@@ -248,17 +248,24 @@ async function createApiWebSocket(accessToken: string): Promise<{ gitpodService:
 				});
 			}
 		}
+		const webSocketMaxRetries = 3;
 		const webSocket = new ReconnectingWebSocket(baseURL.replace('https', 'wss'), undefined, {
 			minReconnectionDelay: 1000,
 			connectionTimeout: 10000,
-			maxRetries: 10,
+			maxRetries: webSocketMaxRetries,
 			debug: false,
 			startClosed: false,
 			WebSocket: GitpodServerWebSocket
 		});
+
+		let retry = 1;
 		webSocket.onerror = (err) => {
-			vscode.window.showErrorMessage(`WebSocket error: ${err.message}`);
+			vscode.window.showErrorMessage(`WebSocket error: ${err.message} (#${retry}/${webSocketMaxRetries})`);
+			if (retry++ === webSocketMaxRetries) {
+				throw new Error('Maximum websocket connection retries exceeded');
+			}
 		};
+
 		doListen({
 			webSocket,
 			logger: new ConsoleLogger(),
@@ -373,7 +380,7 @@ export function registerAuth(context: vscode.ExtensionContext, logger: (value: s
 	context.subscriptions.push(addCmd);
 
 	async function createSession(scopes: readonly string[]): Promise<vscode.AuthenticationSession> {
-		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://gitpod.gitpod-desktop/complete-gitpod-auth`));
+		const callbackUri = vscode.Uri.parse(`${vscode.env.uriScheme}://gitpod.gitpod-desktop/complete-gitpod-auth`);
 
 		if (![...gitpodScopes].every((scope) => scopes.includes(scope))) {
 			vscode.window.showErrorMessage('The provided scopes are not enough to turn on Settings Sync');