Skip to content

Commit ee736a6

Browse files
committed
fix(macos): abort runner on HTTP disconnect
1 parent 5d14b90 commit ee736a6

3 files changed

Lines changed: 130 additions & 7 deletions

File tree

‎src/daemon/server/http-server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ async function abortInFlightIosRunnerSessionsWhileDisconnected(
770770

771771
function shouldAbortIosRunnerSessionsOnDisconnect(req: DaemonRequest): boolean {
772772
if (req.flags?.platform === 'android') return false;
773-
if (req.flags?.platform === 'ios') return true;
773+
if (req.flags?.platform === 'ios' || req.flags?.platform === 'macos') return true;
774774
return IOS_RUNNER_ABORT_REPLAY_COMMANDS.has(req.command);
775775
}
776776

‎src/platforms/apple/core/__tests__/runner-disposal.test.ts‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import { afterEach, beforeEach, expect, test, vi } from 'vitest';
2-
import { IOS_SIMULATOR, MACOS_DEVICE } from '../../../../__tests__/test-utils/index.ts';
2+
import {
3+
IOS_SIMULATOR,
4+
MACOS_DEVICE,
5+
TVOS_SIMULATOR,
6+
} from '../../../../__tests__/test-utils/index.ts';
37
import type { ExecResult } from '../../../../utils/exec.ts';
48
import type { RunnerSession } from '../runner/runner-session-types.ts';
59

@@ -111,13 +115,16 @@ test('macOS runner abort force-kills only after both grace periods expire', asyn
111115
expect(runnerSignals(session)).toEqual(['SIGINT', 'SIGTERM', 'SIGKILL']);
112116
});
113117

114-
test('non-macOS runner abort preserves immediate cancellation', async () => {
115-
const session = makeRunnerSession(IOS_SIMULATOR, new Promise<ExecResult>(() => {}));
118+
test.each([IOS_SIMULATOR, TVOS_SIMULATOR])(
119+
'$appleOs runner abort preserves immediate cancellation',
120+
async (device) => {
121+
const session = makeRunnerSession(device, new Promise<ExecResult>(() => {}));
116122

117-
await abortRunnerSessionsAndPrepProcesses([session]);
123+
await abortRunnerSessionsAndPrepProcesses([session]);
118124

119-
expect(runnerSignals(session)).toEqual(['SIGINT', 'SIGTERM', 'SIGKILL']);
120-
});
125+
expect(runnerSignals(session)).toEqual(['SIGINT', 'SIGTERM', 'SIGKILL']);
126+
},
127+
);
121128

122129
function makeRunnerSession(
123130
device: RunnerSession['device'],
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
import assert from 'node:assert/strict';
2+
import http from 'node:http';
3+
import { afterEach, expect, test, vi } from 'vitest';
4+
import { emitRequestProgress } from '../../../src/daemon/request-progress.ts';
5+
import { getRequestSignal } from '../../../src/daemon/request-cancel.ts';
6+
import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
7+
import type { DaemonResponse } from '../../../src/daemon/types.ts';
8+
import {
9+
closeLoopbackServer,
10+
listenOnLoopback,
11+
skipWhenLoopbackUnavailable,
12+
} from '../../../src/__tests__/test-utils/loopback.ts';
13+
14+
const { abortAllIosRunnerSessions } = vi.hoisted(() => ({
15+
abortAllIosRunnerSessions: vi.fn(async () => {}),
16+
}));
17+
18+
vi.mock('../../../src/platforms/apple/core/runner/runner-client.ts', async (importOriginal) => {
19+
const actual =
20+
await importOriginal<
21+
typeof import('../../../src/platforms/apple/core/runner/runner-client.ts')
22+
>();
23+
return { ...actual, abortAllIosRunnerSessions };
24+
});
25+
26+
afterEach(() => {
27+
vi.clearAllMocks();
28+
});
29+
30+
test('macOS HTTP snapshot disconnect aborts in-flight Apple runner sessions', async (t) => {
31+
if (await skipWhenLoopbackUnavailable(t, 'daemon HTTP disconnect coverage')) return;
32+
33+
const requestId = 'req-http-macos-snapshot-disconnect';
34+
let resolveHandlerDone: () => void = () => {};
35+
const handlerDone = new Promise<void>((resolve) => {
36+
resolveHandlerDone = resolve;
37+
});
38+
const server = await createDaemonHttpServer({
39+
token: 'provider-scenario-token',
40+
handleRequest: async (): Promise<DaemonResponse> => {
41+
emitRequestProgress({
42+
type: 'command',
43+
status: 'progress',
44+
message: 'Starting macOS XCTest runner',
45+
});
46+
const signal = getRequestSignal(requestId);
47+
assert.ok(signal, 'request abort signal should be registered during snapshot');
48+
await waitForAbort(signal);
49+
resolveHandlerDone();
50+
return { ok: true, data: { canceled: true } };
51+
},
52+
});
53+
54+
try {
55+
const port = await listenOnLoopback(server);
56+
await Promise.all([
57+
abortStreamingRpcAfterFirstChunk(port, {
58+
jsonrpc: '2.0',
59+
id: 'rpc-macos-snapshot-disconnect',
60+
method: 'agent_device.command',
61+
params: {
62+
command: 'snapshot',
63+
flags: { platform: 'macos' },
64+
meta: { requestId, requestProgress: 'command' },
65+
},
66+
}),
67+
handlerDone,
68+
]);
69+
await vi.waitFor(() => {
70+
expect(abortAllIosRunnerSessions).toHaveBeenCalled();
71+
});
72+
} finally {
73+
await closeLoopbackServer(server);
74+
}
75+
});
76+
77+
function abortStreamingRpcAfterFirstChunk(
78+
port: number,
79+
payload: Record<string, unknown>,
80+
): Promise<void> {
81+
return new Promise((resolve, reject) => {
82+
let sawChunk = false;
83+
const body = JSON.stringify(payload);
84+
const req = http.request(
85+
{
86+
host: '127.0.0.1',
87+
port,
88+
path: '/rpc',
89+
method: 'POST',
90+
headers: {
91+
authorization: 'Bearer provider-scenario-token',
92+
'content-type': 'application/json',
93+
'content-length': Buffer.byteLength(body),
94+
},
95+
},
96+
(res) => {
97+
res.once('data', () => {
98+
sawChunk = true;
99+
res.destroy();
100+
req.destroy();
101+
});
102+
res.on('close', () => (sawChunk ? resolve() : reject(new Error('response closed early'))));
103+
res.on('error', (error) => (sawChunk ? resolve() : reject(error)));
104+
},
105+
);
106+
req.on('error', (error) => (sawChunk ? resolve() : reject(error)));
107+
req.end(body);
108+
});
109+
}
110+
111+
async function waitForAbort(signal: AbortSignal): Promise<void> {
112+
if (signal.aborted) return;
113+
await new Promise<void>((resolve) => {
114+
signal.addEventListener('abort', () => resolve(), { once: true });
115+
});
116+
}

0 commit comments

Comments
 (0)