diff --git a/src/remote.ts b/src/remote.ts index 3ff8f6e3..540525ed 100644 --- a/src/remote.ts +++ b/src/remote.ts @@ -19,7 +19,7 @@ import { Inbox } from "./inbox" import { SSHConfig, SSHValues, mergeSSHConfigValues } from "./sshConfig" import { computeSSHProperties, sshSupportsSetEnv } from "./sshSupport" import { Storage } from "./storage" -import { AuthorityPrefix, expandPath, parseRemoteAuthority } from "./util" +import { AuthorityPrefix, expandPath, findPort, parseRemoteAuthority } from "./util" import { WorkspaceMonitor } from "./workspaceMonitor" export interface RemoteDetails extends vscode.Disposable { @@ -793,14 +793,7 @@ export class Remote { // this to find the SSH process that is powering this connection. That SSH // process will be logging network information periodically to a file. const text = await fs.readFile(logPath, "utf8") - const matches = text.match(/-> socksPort (\d+) ->/) - if (!matches) { - return - } - if (matches.length < 2) { - return - } - const port = Number.parseInt(matches[1]) + const port = await findPort(text) if (!port) { return } diff --git a/src/util.ts b/src/util.ts index 8253f152..87707210 100644 --- a/src/util.ts +++ b/src/util.ts @@ -13,6 +13,33 @@ export interface AuthorityParts { // they should be handled by this extension. export const AuthorityPrefix = "coder-vscode" +// `ms-vscode-remote.remote-ssh`: `-> socksPort ->` +// `codeium.windsurf-remote-openssh`, `jeanp413.open-remote-ssh`: `=> (socks) =>` +// Windows `ms-vscode-remote.remote-ssh`: `between local port ` +export const RemoteSSHLogPortRegex = /(?:-> socksPort (\d+) ->|=> (\d+)\(socks\) =>|between local port (\d+))/ + +/** + * Given the contents of a Remote - SSH log file, find a port number used by the + * SSH process. This is typically the socks port, but the local port works too. + * + * Returns null if no port is found. + */ +export async function findPort(text: string): Promise { + const matches = text.match(RemoteSSHLogPortRegex) + if (!matches) { + return null + } + if (matches.length < 2) { + return null + } + const portStr = matches[1] || matches[2] || matches[3] + if (!portStr) { + return null + } + + return Number.parseInt(portStr) +} + /** * Given an authority, parse into the expected parts. *