Ask for local app fallback when Timed out while waiting for handshake (#20)

Co-authored-by: Filip Troníček <[email protected]>

Author: jeanp413

src/experiments.ts

@@ -32,7 +32,7 @@ export class ExperimentalSettings {
         this.extensionVersion = new semver.SemVer(extensionVersion);
     }
 
-    async get<T>(key: string, userId?: string): Promise<T | undefined> {
+    async get<T>(key: string, userId?: string, custom?: { [key: string]: string }): Promise<T | undefined> {
         const config = vscode.workspace.getConfiguration('gitpod');
         const values = config.inspect<T>(key.substring('gitpod.'.length));
         if (!values || !EXPERTIMENTAL_SETTINGS.includes(key)) {
@@ -48,22 +48,22 @@ export class ExperimentalSettings {
             return values.globalValue;
         }
 
-        const user = userId ? new configcatcommon.User(userId) : undefined;
+        const user = userId ? new configcatcommon.User(userId, undefined, undefined, custom) : undefined;
         const configcatKey = key.replace(/\./g, '_'); // '.' are not allowed in configcat
         const experimentValue = (await this.configcatClient.getValueAsync(configcatKey, undefined, user)) as T | undefined;
 
         return experimentValue ?? values.defaultValue;
     }
 
-    async inspect<T>(key: string, userId?: string): Promise<{ key: string; defaultValue?: T; globalValue?: T; experimentValue?: T } | undefined> {
+    async inspect<T>(key: string, userId?: string, custom?: { [key: string]: string }): Promise<{ key: string; defaultValue?: T; globalValue?: T; experimentValue?: T } | undefined> {
         const config = vscode.workspace.getConfiguration('gitpod');
         const values = config.inspect<T>(key.substring('gitpod.'.length));
         if (!values || !EXPERTIMENTAL_SETTINGS.includes(key)) {
             this.logger.error(`Cannot inspect invalid experimental setting '${key}'`);
             return values;
         }
 
-        const user = userId ? new configcatcommon.User(userId) : undefined;
+        const user = userId ? new configcatcommon.User(userId, undefined, undefined, custom) : undefined;
         const configcatKey = key.replace(/\./g, '_'); // '.' are not allowed in configcat
         const experimentValue = (await this.configcatClient.getValueAsync(configcatKey, undefined, user)) as T | undefined;
 

src/remoteConnector.ts

@@ -566,6 +566,7 @@ export default class RemoteConnector extends Disposable {
 			}).connect({
 				host: sshDestInfo.hostName,
 				username: sshDestInfo.user,
+				readyTimeout: 40000,
 				authHandler(_methodsLeft, _partialSuccess, _callback) {
 					return {
 						type: 'password',
@@ -787,7 +788,7 @@ export default class RemoteConnector extends Disposable {
 
 		// Only use experiment for SaaS
 		const forceUseLocalApp = getServiceURL(params.gitpodHost) === 'https://gitpod.io'
-			? (await this.experiments.get<boolean>('gitpod.remote.useLocalApp', session.account.id))!
+			? (await this.experiments.get<boolean>('gitpod.remote.useLocalApp', session.account.id, { gitpodHost: params.gitpodHost }))!
 			: vscode.workspace.getConfiguration('gitpod').get<boolean>('remote.useLocalApp')!;
 		const userOverride = isUserOverrideSetting('gitpod.remote.useLocalApp');
 		let sshDestination: string | undefined;
@@ -808,7 +809,13 @@ export default class RemoteConnector extends Disposable {
 				this.telemetry.sendRawTelemetryEvent('vscode_desktop_ssh', { kind: 'gateway', status: 'failed', reason: e.toString(), ...params, gitpodVersion: gitpodVersion.raw, userOverride, openSSHVersion });
 				if (e instanceof NoSSHGatewayError) {
 					this.logger.error('No SSH gateway:', e);
-					vscode.window.showWarningMessage(`${e.host} does not support [direct SSH access](https://github.com/gitpod-io/gitpod/blob/main/install/installer/docs/workspace-ssh-access.md), connecting via the deprecated SSH tunnel over WebSocket.`);
+					const ok = 'OK';
+					await vscode.window.showWarningMessage(`${e.host} does not support [direct SSH access](https://github.com/gitpod-io/gitpod/blob/main/install/installer/docs/workspace-ssh-access.md), connecting via the deprecated SSH tunnel over WebSocket.`, ok);
+					// Do nothing and continue execution
+				} else if (e instanceof SSHError && e.message === 'Timed out while waiting for handshake') {
+					this.logger.error('SSH test connection error:', e);
+					const ok = 'OK';
+					await vscode.window.showWarningMessage(`Timed out while waiting for the SSH handshake. It's possible, that SSH connections on port 22 are blocked, or your network is too slow. Connecting via the deprecated SSH tunnel over WebSocket instead.`, ok);
 					// Do nothing and continue execution
 				} else if (e instanceof NoRunningInstanceError) {
 					this.logger.error('No Running instance:', e);