Add tests

Author: EhabY

src/remote/sshProcess.ts

@@ -20,15 +20,6 @@ export interface NetworkInfo {
 	using_coder_connect: boolean;
 }
 
-/**
- * Process information from find-process.
- */
-interface ProcessInfo {
-	pid: number;
-	name: string;
-	cmd: string;
-}
-
 /**
  * Options for creating an SshProcessMonitor.
  */
@@ -44,27 +35,6 @@ export interface SshProcessMonitorOptions {
 	remoteSshExtensionId: string;
 }
 
-/**
- * Checks if a process is an actual SSH process (not a shell wrapper).
- * Filters out processes like "sh -c ... | ssh ..." where ssh appears mid-command.
- */
-function isActualSshProcess(p: ProcessInfo): boolean {
-	// Process name is exactly "ssh" or "ssh.exe"
-	if (p.name === "ssh" || p.name === "ssh.exe") {
-		return true;
-	}
-	// Command starts with ssh binary (not piped through shell)
-	if (/^(ssh|ssh\.exe)\s/i.test(p.cmd)) {
-		return true;
-	}
-	// Command starts with full path to ssh (Unix or Windows)
-	// e.g., "/usr/bin/ssh " or "C:\Program Files\OpenSSH\ssh.exe "
-	if (/^[\w/\\:.-]+([/\\])ssh(\.exe)?\s/i.test(p.cmd)) {
-		return true;
-	}
-	return false;
-}
-
 /**
  * Finds the Remote SSH extension's log file path.
  */
@@ -139,6 +109,7 @@ export class SshProcessMonitor implements vscode.Disposable {
 	private currentPid: number | undefined;
 	private logFilePath: string | undefined;
 	private pendingTimeout: NodeJS.Timeout | undefined;
+	private lastStaleSearchTime = 0;
 
 	private constructor(options: SshProcessMonitorOptions) {
 		this.options = {
@@ -216,7 +187,7 @@ export class SshProcessMonitor implements vscode.Disposable {
 		while (!this.disposed) {
 			attempt++;
 
-			if (attempt % 5 === 0) {
+			if (attempt % 10 === 0) {
 				logger.debug(
 					`SSH process search attempt ${attempt} for host: ${sshHost}`,
 				);
@@ -231,15 +202,6 @@ export class SshProcessMonitor implements vscode.Disposable {
 				return;
 			}
 
-			// Fall back to hostname-based search
-			// const pidByHost = await this.findSshProcessByHost();
-			// if (pidByHost !== undefined) {
-			// 	logger.info(`Found SSH process by hostname (PID: ${pidByHost})`);
-			// 	this.setCurrentPid(pidByHost);
-			// 	this.startMonitoring();
-			// 	return;
-			// }
-
 			await this.delay(pollInterval);
 		}
 	}
@@ -262,6 +224,7 @@ export class SshProcessMonitor implements vscode.Disposable {
 
 			const logContent = await fs.readFile(logPath, "utf8");
 			this.options.logger.debug(`Read Remote SSH log file: ${logPath}`);
+
 			const port = findPort(logContent);
 			if (!port) {
 				return undefined;
@@ -280,45 +243,6 @@ export class SshProcessMonitor implements vscode.Disposable {
 		}
 	}
 
-	/**
-	 * Attempts to find an SSH process by hostname.
-	 * Less accurate than port-based as multiple windows may connect to same host.
-	 * Returns the PID if found, undefined otherwise.
-	 */
-	private async findSshProcessByHost(): Promise<number | undefined> {
-		const { sshHost, logger } = this.options;
-
-		try {
-			// Find all processes with "ssh" in name
-			const processes = await find("name", "ssh");
-			const matches = processes.filter(
-				(p) => p.cmd.includes(sshHost) && isActualSshProcess(p),
-			);
-
-			if (matches.length === 0) {
-				return undefined;
-			}
-
-			const preferred = matches.find(
-				(p) => p.name === "ssh" || p.name === "ssh.exe",
-			);
-			if (preferred) {
-				return preferred.pid;
-			}
-
-			if (matches.length > 1) {
-				logger.warn(
-					`Found ${matches.length} SSH processes for host, using first`,
-				);
-			}
-
-			return matches[0].pid;
-		} catch (error) {
-			logger.debug(`Error searching for SSH process: ${error}`);
-			return undefined;
-		}
-	}
-
 	/**
 	 * Updates the current PID and fires change events.
 	 */
@@ -406,15 +330,20 @@ export class SshProcessMonitor implements vscode.Disposable {
 				const ageMs = Date.now() - stats.mtime.getTime();
 
 				if (ageMs > staleThreshold) {
-					logger.info(
+					// Prevent tight loop: if we just searched due to stale, wait before searching again
+					const timeSinceLastSearch = Date.now() - this.lastStaleSearchTime;
+					if (timeSinceLastSearch < staleThreshold) {
+						await this.delay(staleThreshold - timeSinceLastSearch);
+						continue;
+					}
+
+					logger.debug(
 						`Network info stale (${Math.round(ageMs / 1000)}s old), searching for new SSH process`,
 					);
-					this.currentPid = undefined;
-					this.statusBarItem.hide();
-					this._onPidChange.fire(undefined);
-					this.searchForProcess().catch((err) => {
-						logger.error("Error restarting SSH process search", err);
-					});
+
+					// searchForProcess will update PID if a different process is found
+					this.lastStaleSearchTime = Date.now();
+					await this.searchForProcess();
 					return;
 				}
 

test/mocks/testHelpers.ts

@@ -29,7 +29,7 @@ export class MockConfigurationProvider {
 	get<T>(key: string, defaultValue: T): T;
 	get<T>(key: string, defaultValue?: T): T | undefined {
 		const value = this.config.get(key);
-		return value !== undefined ? (value as T) : defaultValue;
+		return value === undefined ? defaultValue : (value as T);
 	}
 
 	/**
@@ -53,7 +53,7 @@ export class MockConfigurationProvider {
 				return {
 					get: vi.fn((key: string, defaultValue?: unknown) => {
 						const value = snapshot.get(getFullKey(key));
-						return value !== undefined ? value : defaultValue;
+						return value === undefined ? defaultValue : value;
 					}),
 					has: vi.fn((key: string) => {
 						return snapshot.has(getFullKey(key));
@@ -141,7 +141,7 @@ export class MockProgressReporter {
  * Use this to control user responses in tests.
  */
 export class MockUserInteraction {
-	private responses = new Map<string, string | undefined>();
+	private readonly responses = new Map<string, string | undefined>();
 	private externalUrls: string[] = [];
 
 	constructor() {
@@ -211,7 +211,7 @@ export class MockUserInteraction {
 
 // Simple in-memory implementation of Memento
 export class InMemoryMemento implements vscode.Memento {
-	private storage = new Map<string, unknown>();
+	private readonly storage = new Map<string, unknown>();
 
 	get<T>(key: string): T | undefined;
 	get<T>(key: string, defaultValue: T): T;
@@ -235,9 +235,11 @@ export class InMemoryMemento implements vscode.Memento {
 
 // Simple in-memory implementation of SecretStorage
 export class InMemorySecretStorage implements vscode.SecretStorage {
-	private secrets = new Map<string, string>();
+	private readonly secrets = new Map<string, string>();
 	private isCorrupted = false;
-	private listeners: Array<(e: vscode.SecretStorageChangeEvent) => void> = [];
+	private readonly listeners: Array<
+		(e: vscode.SecretStorageChangeEvent) => void
+	> = [];
 
 	onDidChange: vscode.Event<vscode.SecretStorageChangeEvent> = (listener) => {
 		this.listeners.push(listener);
@@ -350,3 +352,50 @@ export function createMockStream(
 		destroy: vi.fn(),
 	} as unknown as IncomingMessage;
 }
+
+/**
+ * Mock status bar that integrates with vscode.window.createStatusBarItem.
+ * Use this to inspect status bar state in tests.
+ */
+export class MockStatusBar {
+	text = "";
+	tooltip: string | vscode.MarkdownString = "";
+	backgroundColor: vscode.ThemeColor | undefined;
+	color: string | vscode.ThemeColor | undefined;
+	command: string | vscode.Command | undefined;
+	accessibilityInformation: vscode.AccessibilityInformation | undefined;
+	name: string | undefined;
+	priority: number | undefined;
+	alignment: vscode.StatusBarAlignment = vscode.StatusBarAlignment.Left;
+
+	readonly show = vi.fn();
+	readonly hide = vi.fn();
+	readonly dispose = vi.fn();
+
+	constructor() {
+		this.setupVSCodeMock();
+	}
+
+	/**
+	 * Reset all status bar state
+	 */
+	reset(): void {
+		this.text = "";
+		this.tooltip = "";
+		this.backgroundColor = undefined;
+		this.color = undefined;
+		this.command = undefined;
+		this.show.mockClear();
+		this.hide.mockClear();
+		this.dispose.mockClear();
+	}
+
+	/**
+	 * Setup the vscode.window.createStatusBarItem mock
+	 */
+	private setupVSCodeMock(): void {
+		vi.mocked(vscode.window.createStatusBarItem).mockReturnValue(
+			this as unknown as vscode.StatusBarItem,
+		);
+	}
+}

test/mocks/vscode.runtime.ts

@@ -55,18 +55,28 @@ export class Uri {
 	}
 }
 
-// mini event
-const makeEvent = <T>() => {
-	const listeners = new Set<(e: T) => void>();
-	const event = (listener: (e: T) => void) => {
-		listeners.add(listener);
-		return { dispose: () => listeners.delete(listener) };
+/**
+ * Mock EventEmitter that matches vscode.EventEmitter interface.
+ */
+export class EventEmitter<T> {
+	private readonly listeners = new Set<(e: T) => void>();
+
+	event = (listener: (e: T) => void) => {
+		this.listeners.add(listener);
+		return { dispose: () => this.listeners.delete(listener) };
 	};
-	return { event, fire: (e: T) => listeners.forEach((l) => l(e)) };
-};
 
-const onDidChangeConfiguration = makeEvent<unknown>();
-const onDidChangeWorkspaceFolders = makeEvent<unknown>();
+	fire(data: T): void {
+		this.listeners.forEach((l) => l(data));
+	}
+
+	dispose(): void {
+		this.listeners.clear();
+	}
+}
+
+const onDidChangeConfiguration = new EventEmitter<unknown>();
+const onDidChangeWorkspaceFolders = new EventEmitter<unknown>();
 
 export const window = {
 	showInformationMessage: vi.fn(),
@@ -83,6 +93,7 @@ export const window = {
 		dispose: vi.fn(),
 		clear: vi.fn(),
 	})),
+	createStatusBarItem: vi.fn(),
 };
 
 export const commands = {
@@ -132,6 +143,7 @@ const vscode = {
 	ExtensionMode,
 	UIKind,
 	Uri,
+	EventEmitter,
 	window,
 	commands,
 	workspace,