github-mirror/project-nomad
1
0
Fork 0
mirror of https://github.com/Crosstalk-Solutions/project-nomad.git synced 2026-04-05 16:26:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

use abort reason to detect user-initiated cancels

Browse Source
This commit is contained in:
Ben Gauger 2026-04-02 15:19:59 -06:00
parent 6401021364
commit a02d43582a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/app/jobs/run_download_job.ts
View File

@ -67,7 +67,7 @@ export class RunDownloadJob {
if (val) {
await cancelRedis.del(RunDownloadJob.cancelKey(job.id!))
userCancelled = true
abortController.abort()
abortController.abort('user-cancel')
}
} catch {
// Redis errors are non-fatal; in-process AbortController covers same-process cancels
@ -184,7 +184,8 @@ export class RunDownloadJob {
} catch (error: any) {
// Only prevent retries for user-initiated cancellations. BullMQ lock mismatches
// can also abort the stream, and those should be retried with backoff.
if (userCancelled) {
// Check both the flag (Redis poll) and abort reason (in-process cancel).
if (userCancelled || abortController.signal.reason === 'user-cancel') {
throw new UnrecoverableError(`Download cancelled: ${error.message}`)
}
throw error

2
admin/app/services/download_service.ts
View File

@ -125,7 +125,7 @@ export class DownloadService {
await RunDownloadJob.signalCancel(jobId)
// Also try in-memory abort (works if worker is in same process)
RunDownloadJob.abortControllers.get(jobId)?.abort()
RunDownloadJob.abortControllers.get(jobId)?.abort('user-cancel')
RunDownloadJob.abortControllers.delete(jobId)
// Poll for terminal state (up to 4s at 250ms intervals) — cooperates with BullMQ's lifecycle