Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
const mocks = vi.hoisted(() => ({
handle: vi.fn(),
deploy: vi.fn(),
status: vi.fn(),
registerProvisioning: vi.fn()
status: vi.fn()
}))

vi.mock('electron', () => ({ ipcMain: { handle: mocks.handle } }))
Expand All @@ -14,9 +13,6 @@ vi.mock('../../managed-server/lifecycle/orcad-runtime-deployment', () => ({
vi.mock('../../managed-server/lifecycle/orcad-runtime-status', () => ({
getManagedOrcadRuntimeStatus: mocks.status
}))
vi.mock('./orcad-ssh-provisioning-handlers', () => ({
registerOrcadSshProvisioningHandlers: mocks.registerProvisioning
}))

const { registerOrcadRuntimeLifecycleHandlers } = await import('./orcad-runtime-lifecycle-handlers')

Expand All @@ -34,12 +30,11 @@ describe('managed orcad lifecycle IPC', () => {
registerOrcadRuntimeLifecycleHandlers({ getUserDataPath: () => '/profile' })
})

it('registers only deploy, status and provisioning; maintenance and stop are not exposed', () => {
it('registers only deploy and status; maintenance and stop are not exposed', () => {
expect(mocks.handle.mock.calls.map(([channel]) => channel)).toEqual([
'runtimeEnvironments:deployOrcad',
'runtimeEnvironments:getOrcadStatus'
])
expect(mocks.registerProvisioning).toHaveBeenCalledOnce()
})

it('trims deploy input and treats only a literal true as force', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ import { ipcMain } from 'electron'
import type { OrcadManagedRuntimeStatus } from '../../../shared/orcad-managed-runtime'
import { createManagedOrcadEnvironment } from '../../managed-server/lifecycle/orcad-runtime-deployment'
import { getManagedOrcadRuntimeStatus } from '../../managed-server/lifecycle/orcad-runtime-status'
import { registerOrcadSshProvisioningHandlers } from './orcad-ssh-provisioning-handlers'

export function registerOrcadRuntimeLifecycleHandlers(options: {
getUserDataPath: () => string
}): void {
registerOrcadSshProvisioningHandlers(options.getUserDataPath)
ipcMain.handle(
'runtimeEnvironments:deployOrcad',
async (_event, args: { name: string; sshTargetId: string; force?: boolean }) =>
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ import { verifyAndAddRuntimeEnvironmentFromPairingCode } from './runtime-environ
import { publishVerifiedPairing } from './runtime-environment-verified-pairing-publish'
import {
closeRemoteRuntimeRequestConnection,
getRuntimeEnvironmentStatusSnapshots,
retryRemoteRuntimeSharedControlConnectionNow
getRuntimeEnvironmentStatusSnapshots
} from './runtime-environment-request-connections'
import {
clearRuntimeEnvironmentManualDisconnect,
Expand Down Expand Up @@ -174,15 +173,6 @@ export function registerRuntimeEnvironmentConnectivityHandlers({
})
}
)
ipcMain.handle(
'runtimeEnvironments:retryControlConnection',
(_event, args: { selector: string }): void => {
const environment = resolveEnvironment(getUserDataPath(), args.selector)
if (!isRuntimeEnvironmentManuallyDisconnected(environment.id)) {
retryRemoteRuntimeSharedControlConnectionNow(environment.id)
}
}
)
}

export function registerRuntimeEnvironmentPassiveHandlers(getUserDataPath: () => string): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ vi.mock('./runtime-environment-request-connections', async () => {
sendRemoteRuntimeConnectionRequest: vi.fn(),
sendRemoteRuntimeSharedControlRequest: sendRemoteRuntimeSharedControlRequestMock,
reconnectRemoteRuntimeSharedControlConnection: vi.fn(),
retryRemoteRuntimeSharedControlConnectionNow: vi.fn(),
ensureRemoteRuntimeSharedControlConnection: vi.fn(),
pauseRemoteRuntimeSharedControlRetry: vi.fn()
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export const RUNTIME_ENVIRONMENT_HANDLER_CHANNELS = [
'runtimeEnvironments:remove',
'runtimeEnvironments:disconnect',
'runtimeEnvironments:connect',
'runtimeEnvironments:retryControlConnection',
'runtimeEnvironments:prepareBrowserClientHostPlacement',
'runtimeEnvironments:getStatus',
'runtimeEnvironments:getStatusSnapshots',
Expand All @@ -30,8 +29,5 @@ export const RUNTIME_ENVIRONMENT_HANDLER_CHANNELS = [
'runtimeEnvironments:previewOrcadDeltaMove',
'runtimeEnvironments:moveOrcadDelta',
'runtimeEnvironments:keepOrcadServerVersion',
'runtimeEnvironments:allowOrcadMoveLeavingBehind',
'runtimeEnvironments:createOrcadSshHost',
'runtimeEnvironments:resumeOrcadSshHost',
'runtimeEnvironments:listPendingOrcadSshProvisioning'
'runtimeEnvironments:allowOrcadMoveLeavingBehind'
] as const
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,6 @@ export function reconnectRemoteRuntimeSharedControlConnection(environmentId: str
sharedControlConnections.get(environmentId)?.connection.reconnectNow()
}

export function retryRemoteRuntimeSharedControlConnectionNow(environmentId: string): void {
sharedControlConnections.get(environmentId)?.connection.retryNow()
}

export function pauseRemoteRuntimeSharedControlRetry(environmentId: string): void {
sharedControlConnections.get(environmentId)?.connection.pauseStandingRetry()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ vi.mock('./runtime-environment-request-connections', async () => {
reconnectRemoteRuntimeSharedControlConnectionMock,
retryRemoteRuntimeSharedControlConnectionsNow:
retryRemoteRuntimeSharedControlConnectionsNowMock,
retryRemoteRuntimeSharedControlConnectionNow: vi.fn(),
ensureRemoteRuntimeSharedControlConnection: vi.fn(),
pauseRemoteRuntimeSharedControlRetry: vi.fn(),
closeRemoteRuntimeRequestConnection: closeRemoteRuntimeRequestConnectionMock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ vi.mock('./runtime-environment-request-connections', async () => {
reconnectRemoteRuntimeSharedControlConnectionMock,
retryRemoteRuntimeSharedControlConnectionsNow:
retryRemoteRuntimeSharedControlConnectionsNowMock,
retryRemoteRuntimeSharedControlConnectionNow: vi.fn(),
ensureRemoteRuntimeSharedControlConnection: vi.fn(),
pauseRemoteRuntimeSharedControlRetry: vi.fn(),
closeRemoteRuntimeRequestConnection: closeRemoteRuntimeRequestConnectionMock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ const {
getRemoteRuntimeSharedControlDiagnosticsMock,
reconnectRemoteRuntimeSharedControlConnectionMock,
retryRemoteRuntimeSharedControlConnectionsNowMock,
retryRemoteRuntimeSharedControlConnectionNowMock,
closeRemoteRuntimeRequestConnectionMock
} = vi.hoisted(() => ({
handleMock: vi.fn(),
Expand All @@ -43,7 +42,6 @@ const {
getRemoteRuntimeSharedControlDiagnosticsMock: vi.fn(),
reconnectRemoteRuntimeSharedControlConnectionMock: vi.fn(),
retryRemoteRuntimeSharedControlConnectionsNowMock: vi.fn(),
retryRemoteRuntimeSharedControlConnectionNowMock: vi.fn(),
closeRemoteRuntimeRequestConnectionMock: vi.fn()
}))

Expand Down Expand Up @@ -74,7 +72,6 @@ vi.mock('./runtime-environment-request-connections', async () => {
reconnectRemoteRuntimeSharedControlConnectionMock,
retryRemoteRuntimeSharedControlConnectionsNow:
retryRemoteRuntimeSharedControlConnectionsNowMock,
retryRemoteRuntimeSharedControlConnectionNow: retryRemoteRuntimeSharedControlConnectionNowMock,
ensureRemoteRuntimeSharedControlConnection: vi.fn(),
pauseRemoteRuntimeSharedControlRetry: vi.fn(),
closeRemoteRuntimeRequestConnection: closeRemoteRuntimeRequestConnectionMock
Expand Down Expand Up @@ -134,7 +131,6 @@ describe('registerRuntimeEnvironmentHandlers', () => {
getRemoteRuntimeSharedControlDiagnosticsMock.mockReturnValue(null)
reconnectRemoteRuntimeSharedControlConnectionMock.mockReset()
retryRemoteRuntimeSharedControlConnectionsNowMock.mockReset()
retryRemoteRuntimeSharedControlConnectionNowMock.mockReset()
closeRemoteRuntimeRequestConnectionMock.mockReset()
})

Expand Down Expand Up @@ -189,29 +185,6 @@ describe('registerRuntimeEnvironmentHandlers', () => {
expect(retryRemoteRuntimeSharedControlConnectionsNowMock).toHaveBeenCalledTimes(1)
})

it('retries one control connection without reversing manual disconnect intent', async () => {
registerRuntimeEnvironmentHandlers(store as never)
const add = handler<{ name: string; pairingCode: string }, { environment: { id: string } }>(
'runtimeEnvironments:addFromPairingCode'
)
const added = await add(null, { name: 'desk', pairingCode: pairingCode() })
const retry = handler<{ selector: string }, void>('runtimeEnvironments:retryControlConnection')

await retry(null, { selector: 'desk' })
expect(retryRemoteRuntimeSharedControlConnectionNowMock).toHaveBeenCalledWith(
added.environment.id
)
expect(sendRemoteRuntimeRequestMock).not.toHaveBeenCalled()

const disconnect = handler<{ selector: string }, unknown>('runtimeEnvironments:disconnect')
await disconnect(null, { selector: 'desk' })
retryRemoteRuntimeSharedControlConnectionNowMock.mockClear()
await retry(null, { selector: 'desk' })

expect(retryRemoteRuntimeSharedControlConnectionNowMock).not.toHaveBeenCalled()
expect(sendRemoteRuntimeRequestMock).not.toHaveBeenCalled()
})

it('stores, resolves, lists, and removes environments under Electron userData', async () => {
registerRuntimeEnvironmentHandlers(store as never)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ vi.mock('./runtime-environment-request-connections', async () => {
getRemoteRuntimeSharedControlDiagnostics: vi.fn(() => null),
reconnectRemoteRuntimeSharedControlConnection: vi.fn(),
retryRemoteRuntimeSharedControlConnectionsNow: vi.fn(),
retryRemoteRuntimeSharedControlConnectionNow: vi.fn(),
ensureRemoteRuntimeSharedControlConnection: vi.fn(),
pauseRemoteRuntimeSharedControlRetry: vi.fn(),
closeRemoteRuntimeRequestConnection: vi.fn()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ vi.mock('./runtime-environment-request-connections', async () => {
reconnectRemoteRuntimeSharedControlConnectionMock,
retryRemoteRuntimeSharedControlConnectionsNow:
retryRemoteRuntimeSharedControlConnectionsNowMock,
retryRemoteRuntimeSharedControlConnectionNow: vi.fn(),
ensureRemoteRuntimeSharedControlConnection: ensureRemoteRuntimeSharedControlConnectionMock,
pauseRemoteRuntimeSharedControlRetry: pauseRemoteRuntimeSharedControlRetryMock,
closeRemoteRuntimeRequestConnection: closeRemoteRuntimeRequestConnectionMock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ vi.mock('./runtime-environment-request-connections', async () => {
reconnectRemoteRuntimeSharedControlConnectionMock,
retryRemoteRuntimeSharedControlConnectionsNow:
retryRemoteRuntimeSharedControlConnectionsNowMock,
retryRemoteRuntimeSharedControlConnectionNow: vi.fn(),
ensureRemoteRuntimeSharedControlConnection: vi.fn(),
pauseRemoteRuntimeSharedControlRetry: vi.fn(),
closeRemoteRuntimeRequestConnection: closeRemoteRuntimeRequestConnectionMock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ vi.mock('./runtime-environment-request-connections', async () => {
reconnectRemoteRuntimeSharedControlConnectionMock,
retryRemoteRuntimeSharedControlConnectionsNow:
retryRemoteRuntimeSharedControlConnectionsNowMock,
retryRemoteRuntimeSharedControlConnectionNow: vi.fn(),
ensureRemoteRuntimeSharedControlConnection: vi.fn(),
pauseRemoteRuntimeSharedControlRetry: vi.fn(),
closeRemoteRuntimeRequestConnection: closeRemoteRuntimeRequestConnectionMock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ vi.mock('./runtime-environment-request-connections', async () => {
reconnectRemoteRuntimeSharedControlConnectionMock,
retryRemoteRuntimeSharedControlConnectionsNow:
retryRemoteRuntimeSharedControlConnectionsNowMock,
retryRemoteRuntimeSharedControlConnectionNow: vi.fn(),
ensureRemoteRuntimeSharedControlConnection: vi.fn(),
pauseRemoteRuntimeSharedControlRetry: vi.fn(),
closeRemoteRuntimeRequestConnection: closeRemoteRuntimeRequestConnectionMock
Expand Down
1 change: 0 additions & 1 deletion src/main/ipc/wsl-host-gate-off.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ vi.mock('./runtime-environments/runtime-environment-request-connections', async
getRemoteRuntimeSharedControlDiagnostics: vi.fn(() => null),
reconnectRemoteRuntimeSharedControlConnection: vi.fn(),
retryRemoteRuntimeSharedControlConnectionsNow: vi.fn(),
retryRemoteRuntimeSharedControlConnectionNow: vi.fn(),
ensureRemoteRuntimeSharedControlConnection: mocks.ensureSharedControl,
pauseRemoteRuntimeSharedControlRetry: vi.fn(),
closeRemoteRuntimeRequestConnection: vi.fn()
Expand Down
Loading
Loading