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
10 changes: 5 additions & 5 deletions scripts/api/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ try {
const pkg = JSON.parse(fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8'))
pkgVersion = pkg.version ?? pkgVersion
pkgName = pkg.name ?? pkgName
} catch { }
} catch {}

const HOST = envStr('API_HOST') ?? (typeof cliArgs.host === 'string' ? cliArgs.host : '127.0.0.1')
const PORT = Number(cliArgs.port) || envInt('API_PORT', 3010)
Expand Down Expand Up @@ -382,7 +382,7 @@ const requestHandler = async (req, res) => {
const force = Boolean(body.force)
try {
const stopping = pm.stop({ force })
stopping.catch(() => { })
stopping.catch(() => {})
return sendJson(res, 202, { stopping: true, force })
} catch (err) {
if (err.code === 'NOT_RUNNING') return sendJson(res, 409, { error: err.message, code: err.code })
Expand Down Expand Up @@ -514,14 +514,14 @@ function listDiagnostics() {
let error = null
try {
files = fs.readdirSync(full)
} catch { }
} catch {}
try {
createdAt = fs.statSync(full).mtime.toISOString()
} catch { }
} catch {}
if (files.includes('error.txt')) {
try {
error = fs.readFileSync(path.join(full, 'error.txt'), 'utf8').slice(0, 2000)
} catch { }
} catch {}
}
return {
name: d.name,
Expand Down
35 changes: 21 additions & 14 deletions scripts/api/trigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ function request(method, path) {
return new Promise((resolve, reject) => {
const headers = { 'Content-Type': 'application/json', 'Content-Length': '2' }
if (TOKEN) headers['Authorization'] = `Bearer ${TOKEN}`
const req = http.request(
{ host: '127.0.0.1', port: PORT, path, method, headers },
res => {
let raw = ''
res.on('data', c => (raw += c))
res.on('end', () => {
try { resolve({ status: res.statusCode, body: JSON.parse(raw) }) }
catch { resolve({ status: res.statusCode, body: raw }) }
})
}
)
const req = http.request({ host: '127.0.0.1', port: PORT, path, method, headers }, res => {
let raw = ''
res.on('data', c => (raw += c))
res.on('end', () => {
try {
resolve({ status: res.statusCode, body: JSON.parse(raw) })
} catch {
resolve({ status: res.statusCode, body: raw })
}
})
})
req.on('error', reject)
req.end('{}')
})
Expand All @@ -48,8 +48,13 @@ let ready = false
for (let i = 0; i < STARTUP_ATTEMPTS; i++) {
try {
const { status } = await request('GET', '/health')
if (status === 200) { ready = true; break }
} catch { /* server not up yet */ }
if (status === 200) {
ready = true
break
}
} catch {
/* server not up yet */
}
if (i < STARTUP_ATTEMPTS - 1) {
console.log(`[trigger] Waiting for API server (attempt ${i + 1}/${STARTUP_ATTEMPTS})…`)
await sleep(STARTUP_DELAY_MS)
Expand Down Expand Up @@ -88,7 +93,9 @@ while (Date.now() < deadline) {
console.log('[trigger] Run completed.')
process.exit(0)
}
} catch { /* momentary blip — keep polling */ }
} catch {
/* momentary blip — keep polling */
}
}

console.error(`[trigger] Timed out after ${process.env.STUCK_PROCESS_TIMEOUT_HOURS || 8}h waiting for run to finish.`)
Expand Down