Skip to content

fix(mcp): timeout aborts Mocha runner so next run_test isn't blocked #5551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavertMik wants to merge 1 commit into
base: 4.x
Choose a base branch
from
+42 −12
Open

fix(mcp): timeout aborts Mocha runner so next run_test isn't blocked #5551

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 42 additions & 12 deletions bin/mcp-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,14 @@ async function cancelRun() {
abortRun = true
if (typeof pendingRunCleanup === 'function') { try { pendingRunCleanup() } catch {} }
if (pausedController) { try { pausedController.resolveContinue() } catch {} ; pausedController = null }

const mocha = typeof container.mocha === 'function' ? container.mocha() : container.mocha
const runner = mocha?._runner || mocha?._previousRunner || mocha?.runner
if (runner && typeof runner.abort === 'function') {
try { runner.abort() } catch {}
}
try { recorder.reset() } catch {}

if (pendingRunPromise) {
try { await Promise.race([pendingRunPromise.catch(() => {}), new Promise(r => setTimeout(r, 5000))]) } catch {}
}
Expand Down Expand Up @@ -1025,18 +1033,28 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
throw err
}
})()
pendingRunPromise = runPromise

const pausedPromise = new Promise(resolve => pauseEvents.once('paused', () => resolve('paused')))
const completedPromise = runPromise.then(() => 'completed', () => 'completed')

const which = await Promise.race([
completedPromise,
pausedPromise,
new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout after ${timeout}ms`)), timeout)),
])
let timeoutId
const timeoutPromise = new Promise((_, reject) => {
timeoutId = setTimeout(() => reject(new Error(`Timeout after ${timeout}ms`)), timeout)
})

let which
try {
which = await Promise.race([completedPromise, pausedPromise, timeoutPromise])
} catch (err) {
await cancelRun()
await startShellSession()
return { content: [{ type: 'text', text: JSON.stringify({ status: 'failed', file: testFile, error: err.message }, null, 2) }] }
} finally {
clearTimeout(timeoutId)
}

if (which === 'paused') {
pendingRunPromise = runPromise
const page = await gatherPageBrief()
return {
content: [{
Expand All @@ -1046,6 +1064,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
}
}

pendingRunPromise = null
const final = collectRunCompletion(runError?.message)
await startShellSession()
return { content: [{ type: 'text', text: JSON.stringify({ ...final, file: testFile }, null, 2) }] }
Expand Down Expand Up @@ -1121,18 +1140,28 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
throw err
}
})()
pendingRunPromise = runPromise

const pausedPromise = new Promise(resolve => pauseEvents.once('paused', () => resolve('paused')))
const completedPromise = runPromise.then(() => 'completed', () => 'completed')

const which = await Promise.race([
completedPromise,
pausedPromise,
new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout after ${timeout}ms`)), timeout)),
])
let timeoutId
const timeoutPromise = new Promise((_, reject) => {
timeoutId = setTimeout(() => reject(new Error(`Timeout after ${timeout}ms`)), timeout)
})

let which
try {
which = await Promise.race([completedPromise, pausedPromise, timeoutPromise])
} catch (err) {
await cancelRun()
await startShellSession()
return { content: [{ type: 'text', text: JSON.stringify({ status: 'failed', file: testFile, error: err.message }, null, 2) }] }
} finally {
clearTimeout(timeoutId)
}

if (which === 'paused') {
pendingRunPromise = runPromise
const page = await gatherPageBrief()
return {
content: [{
Expand All @@ -1142,6 +1171,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
}
}

pendingRunPromise = null
const final = collectRunCompletion(runError?.message)
await startShellSession()
return { content: [{ type: 'text', text: JSON.stringify({ ...final, file: testFile }, null, 2) }] }
Expand Down