Use ssh proxy command instead of daemon IDE-72 (#57)

Co-authored-by: Jean Pierre <[email protected]>

Author: mustard-mh

package.json

@@ -142,14 +142,14 @@
 		"proto-gen": "cd ./src/proto && buf lint && buf generate"
 	},
 	"devDependencies": {
+		"@bufbuild/buf": "^1.15.0-1",
 		"@types/google-protobuf": "^3.7.4",
 		"@types/js-yaml": "^4.0.5",
 		"@types/mocha": "^9.1.1",
 		"@types/node": "16.x",
 		"@types/ps-node": "^0.1.1",
 		"@types/semver": "^7.3.10",
 		"@types/ssh2": "^0.5.52",
-		"@types/sshpk": "^1.17.1",
 		"@types/tmp": "^0.2.1",
 		"@types/uuid": "8.0.0",
 		"@types/vscode": "1.74.0",
@@ -159,6 +159,7 @@
 		"@typescript-eslint/eslint-plugin": "^5.19.0",
 		"@typescript-eslint/parser": "^5.19.0",
 		"@vscode/vsce": "^2.18.0",
+		"copy-webpack-plugin": "^11.0.0",
 		"eslint": "^8.13.0",
 		"eslint-plugin-header": "3.1.1",
 		"eslint-plugin-jsdoc": "^19.1.0",
@@ -169,8 +170,7 @@
 		"ts-proto": "^1.140.0",
 		"typescript": "^4.6.3",
 		"webpack": "^5.42.0",
-		"webpack-cli": "^4.7.2",
-		"@bufbuild/buf": "^1.15.0-1"
+		"webpack-cli": "^4.7.2"
 	},
 	"dependencies": {
 		"@bufbuild/connect-node": "^0.8.4",
@@ -180,9 +180,9 @@
 		"@gitpod/supervisor-api-grpc": "0.1.5-main.6711",
 		"@grpc/grpc-js": "^1.8.8",
 		"@improbable-eng/grpc-web-node-http-transport": "^0.14.0",
-		"@microsoft/dev-tunnels-ssh": "^3.11.2",
-		"@microsoft/dev-tunnels-ssh-keys": "^3.11.2",
-		"@microsoft/dev-tunnels-ssh-tcp": "^3.11.2",
+		"@microsoft/dev-tunnels-ssh": "^3.11.8",
+		"@microsoft/dev-tunnels-ssh-keys": "^3.11.8",
+		"@microsoft/dev-tunnels-ssh-tcp": "^3.11.8",
 		"@segment/analytics-node": "^1.0.0-beta.24",
 		"configcat-node": "^8.0.0",
 		"js-yaml": "^4.1.0",
@@ -197,10 +197,8 @@
 		"semver": "^7.3.7",
 		"ssh-config": "^4.1.6",
 		"ssh2": "^1.10.0",
-		"sshpk": "^1.17.0",
 		"tmp": "^0.2.1",
 		"uuid": "8.1.0",
-		"winston": "^3.8.2",
 		"ws": "^8.13.0",
 		"yazl": "^2.5.1"
 	}

src/commands/logs.ts

@@ -12,7 +12,6 @@ import { Command } from '../commandManager';
 import { ILogService } from '../services/logService';
 import { INotificationService } from '../services/notificationService';
 import { ITelemetryService, UserFlowTelemetry } from '../services/telemetryService';
-import { Configuration } from '../configuration';
 import { HostService } from '../services/hostService';
 
 interface IFile {
@@ -86,18 +85,7 @@ export class ExportLogsCommand implements Command {
 				return;
 			}
 
-			const daemonLogs: IFile[] = [];
-
-			const daemonPath = path.posix.join('./lssh', 'daemon.log');
-			const daemonLogContent = await vscode.workspace.fs.readFile(vscode.Uri.file(Configuration.getDaemonLogPath()));
-			if (daemonLogContent.byteLength > 0) {
-				daemonLogs.push({
-					path: daemonPath,
-					contents: Buffer.from(daemonLogContent)
-				});
-			}
-
-			return zip(saveUri.fsPath, remoteLogFiles.concat(localLogFiles).concat(daemonLogs));
+			return zip(saveUri.fsPath, remoteLogFiles.concat(localLogFiles));
 		});
 	}
 }

src/common/utils.ts

@@ -124,7 +124,3 @@ export function arrayEquals<T>(one: ReadonlyArray<T> | undefined, other: Readonl
 export function getServiceURL(gitpodHost: string): string {
 	return new URL(gitpodHost).toString().replace(/\/$/, '');
 }
-
-export function getLocalSSHUrl(gitpodHost: string): string {
-	return 'lssh.' + (new URL(gitpodHost)).hostname;
-}

src/configuration.ts

@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { tmpdir } from 'os';
-import { join } from 'path';
 import * as vscode from 'vscode';
 
 // Use these functions instead of `vscode.workspace.getConfiguration` API
@@ -22,40 +20,16 @@ function getUseLocalApp(useLocalSSHServer?: boolean) {
     return vscode.workspace.getConfiguration('gitpod').get<boolean>('remote.useLocalApp', false);
 }
 
-function getLocalSSHServerPort() {
-    // TODO(local-ssh): VSCodium?
-    // use `sudo lsof -i:<port>` to check if the port is already in use
-    let defaultPort = 42025;
+function getLocalSshExtensionIpcPort() {
+    let defaultPort = 43025;
     if (vscode.env.appName.includes('Insiders')) {
-        defaultPort = 42026;
+        defaultPort = 43026;
     }
-    return vscode.workspace.getConfiguration('gitpod').get<number>('lsshPort', defaultPort) || defaultPort;
-}
-
-function getLocalSshIpcPort() {
-    let defaultPort = 41025;
-    if (vscode.env.appName.includes('Insiders')) {
-        defaultPort = 41026;
-    }
-    return vscode.workspace.getConfiguration('gitpod').get<number>('lsshIpcPort', defaultPort) || defaultPort;
-}
-
-function getDaemonLogFileName(): string {
-    if (vscode.env.appName.includes('Insiders')) {
-        return 'gitpod-vscode-daemon-insiders.log';
-    }
-    return 'gitpod-vscode-daemon.log';
-}
-
-function getDaemonLogPath(): string {
-    return join(tmpdir(), getDaemonLogFileName());
+    return vscode.workspace.getConfiguration('gitpod').get<number>('lsshExtensionIpcPort', defaultPort) || defaultPort;
 }
 
 export const Configuration = {
     getGitpodHost,
     getUseLocalApp,
-    getLocalSSHServerPort,
-    getLocalSshIpcPort,
-    getDaemonLogPath,
-    getDaemonLogFileName,
+    getLocalSshExtensionIpcPort,
 };

src/daemonStarter.ts

@@ -20,9 +20,8 @@ import { SessionService } from './services/sessionService';
 import { CommandManager } from './commandManager';
 import { SignInCommand } from './commands/account';
 import { ExportLogsCommand } from './commands/logs';
-import { ensureDaemonStarted } from './daemonStarter';
-import { ExtensionServiceServer } from './local-ssh/ipc/extension';
 import { Configuration } from './configuration';
+import { LocalSSHService } from './services/localSSHService';
 
 // connect-web uses fetch api, so we need to polyfill it
 if (!global.fetch) {
@@ -73,6 +72,9 @@ export async function activate(context: vscode.ExtensionContext) {
 		hostService = new HostService(context, notificationService, logger);
 		context.subscriptions.push(hostService);
 
+		const localSSHService = new LocalSSHService(context, hostService, logger);
+		context.subscriptions.push(localSSHService);
+
 		const sessionService = new SessionService(hostService, logger);
 		context.subscriptions.push(sessionService);
 
@@ -82,12 +84,9 @@ export async function activate(context: vscode.ExtensionContext) {
 		const settingsSync = new SettingsSync(commandManager, logger, telemetryService, notificationService);
 		context.subscriptions.push(settingsSync);
 
-		const remoteConnector = new RemoteConnector(context, sessionService, hostService, experiments, logger, telemetryService, notificationService);
+		const remoteConnector = new RemoteConnector(context, sessionService, hostService, experiments, logger, telemetryService, notificationService, localSSHService);
 		context.subscriptions.push(remoteConnector);
 
-		const extensionIPCService = new ExtensionServiceServer(logger, sessionService, hostService, telemetryService, experiments);
-		context.subscriptions.push(extensionIPCService);
-
 		context.subscriptions.push(vscode.window.registerUriHandler({
 			handleUri(uri: vscode.Uri) {
 				// logger.trace('Handling Uri...', uri.toString());
@@ -103,8 +102,6 @@ export async function activate(context: vscode.ExtensionContext) {
 		commandManager.register(new SignInCommand(sessionService));
 		commandManager.register(new ExportLogsCommand(context.logUri, notificationService, telemetryService, logger, hostService));
 
-		ensureDaemonStarted(logger, telemetryService, 3).then(() => { }).catch(e => { logger?.error(e); });
-
 		if (!context.globalState.get<boolean>(FIRST_INSTALL_KEY, false)) {
 			context.globalState.update(FIRST_INSTALL_KEY, true);
 			telemetryService.sendTelemetryEvent(hostService.gitpodHost, 'gitpod_desktop_installation', { kind: 'install' });