mirror of
https://github.com/stablyai/orca.git
synced 2026-11-01 09:37:33 +00:00
* fix(ssh): the SSH password dialog no longer closes itself and comes back A host that drops an unanswered login no longer replaces the open prompt with a new one, a background dial no longer replaces a connection whose reconnect is asking the user, one Cancel closes every open prompt for that host, and a paired client's automatic connect stays automatic. Co-Authored-By: Claude <noreply@anthropic.com> * fix(ssh): a typed password its reconnect has yet to use is not replaced by a background dial Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: m4air <m4air@Mac.localdomain> Co-authored-by: Claude <noreply@anthropic.com>
85 lines
2.6 KiB
TypeScript
85 lines
2.6 KiB
TypeScript
import { ipcMain, type BrowserWindow } from 'electron'
|
|
import { randomUUID } from 'node:crypto'
|
|
import { SSH_CREDENTIAL_TIMEOUT_MS, type SshCredentialKind } from '../ssh/ssh-connection-utils'
|
|
import { recordSshCredentialDeclined } from '../ssh/ssh-credential-decline'
|
|
const pendingRequests = new Map<
|
|
string,
|
|
{ targetId: string; resolve: (value: string | null) => void; close: () => void }
|
|
>()
|
|
|
|
function notifyCredentialResolved(
|
|
getMainWindow: () => BrowserWindow | null,
|
|
requestId: string
|
|
): void {
|
|
const win = getMainWindow()
|
|
if (win && !win.isDestroyed()) {
|
|
win.webContents.send('ssh:credential-resolved', { requestId })
|
|
}
|
|
}
|
|
|
|
export function requestCredential(
|
|
getMainWindow: () => BrowserWindow | null,
|
|
targetId: string,
|
|
kind: SshCredentialKind,
|
|
detail: string,
|
|
echo?: boolean,
|
|
signal?: AbortSignal
|
|
): Promise<string | null> {
|
|
const requestId = randomUUID()
|
|
const { promise, resolve } = Promise.withResolvers<string | null>()
|
|
let timer: ReturnType<typeof setTimeout>
|
|
const finish = (value: string | null): void => {
|
|
if (!pendingRequests.delete(requestId)) {
|
|
return
|
|
}
|
|
clearTimeout(timer)
|
|
signal?.removeEventListener('abort', onAbort)
|
|
notifyCredentialResolved(getMainWindow, requestId)
|
|
resolve(value)
|
|
}
|
|
const onAbort = (): void => finish(null)
|
|
// Why: an abort is the connection's own teardown; only the user's Cancel (or silence) declines.
|
|
const decline = (): void => {
|
|
if (!pendingRequests.has(requestId)) {
|
|
return
|
|
}
|
|
recordSshCredentialDeclined(targetId, signal)
|
|
finish(null)
|
|
// Why: one Cancel answers the host; a queued prompt for it would otherwise open next.
|
|
for (const [otherId, other] of pendingRequests) {
|
|
if (otherId !== requestId && other.targetId === targetId) {
|
|
other.close()
|
|
}
|
|
}
|
|
}
|
|
timer = setTimeout(decline, SSH_CREDENTIAL_TIMEOUT_MS)
|
|
pendingRequests.set(requestId, {
|
|
targetId,
|
|
resolve: (value) => (value === null ? decline() : finish(value)),
|
|
close: () => finish(null)
|
|
})
|
|
if (signal?.aborted) {
|
|
finish(null)
|
|
return promise
|
|
}
|
|
signal?.addEventListener('abort', onAbort, { once: true })
|
|
|
|
const win = getMainWindow()
|
|
if (win && !win.isDestroyed()) {
|
|
win.webContents.send('ssh:credential-request', { requestId, targetId, kind, detail, echo })
|
|
} else {
|
|
finish(null)
|
|
}
|
|
return promise
|
|
}
|
|
|
|
export function registerCredentialHandler(): void {
|
|
ipcMain.removeHandler('ssh:submitCredential')
|
|
ipcMain.handle(
|
|
'ssh:submitCredential',
|
|
(_event, args: { requestId: string; value: string | null }) => {
|
|
pendingRequests.get(args.requestId)?.resolve(args.value)
|
|
}
|
|
)
|
|
}
|