@@ -134,6 +134,7 @@ describe("warm worker pool", () => {
134134 const warmDir = fs . mkdtempSync ( path . join ( os . tmpdir ( ) , "cap-warm-" ) ) ;
135135 const markerPath = path . join ( warmDir , "spawns.txt" ) ;
136136 const warmFixture = path . join ( warmDir , "warm-worker.mjs" ) ;
137+ const hangingFixture = path . join ( warmDir , "hanging-worker.mjs" ) ;
137138 fs . writeFileSync (
138139 warmFixture ,
139140 [
@@ -147,6 +148,32 @@ describe("warm worker pool", () => {
147148 ] . join ( "\n" ) ,
148149 "utf8" ,
149150 ) ;
151+ fs . writeFileSync (
152+ hangingFixture ,
153+ [
154+ 'import { parentPort } from "node:worker_threads";' ,
155+ 'import { appendFileSync } from "node:fs";' ,
156+ `appendFileSync(${ JSON . stringify ( markerPath ) } , "spawn\\n");` ,
157+ "if (!parentPort) throw new Error('fixture requires parent port');" ,
158+ "parentPort.on('message', () => {});" ,
159+ ] . join ( "\n" ) ,
160+ "utf8" ,
161+ ) ;
162+ const failThenHangFixture = path . join ( warmDir , "fail-then-hang-worker.mjs" ) ;
163+ fs . writeFileSync (
164+ failThenHangFixture ,
165+ [
166+ 'import { parentPort } from "node:worker_threads";' ,
167+ 'import { appendFileSync } from "node:fs";' ,
168+ `appendFileSync(${ JSON . stringify ( markerPath ) } , "spawn\\n");` ,
169+ "if (!parentPort) throw new Error('fixture requires parent port');" ,
170+ "let n = 0;" ,
171+ "parentPort.on('message', (m) => {" ,
172+ " if (n++ === 0) parentPort.postMessage({ id: m.id, ok: false, error: 'boom' });" ,
173+ "});" ,
174+ ] . join ( "\n" ) ,
175+ "utf8" ,
176+ ) ;
150177 const spawnCount = ( ) : number =>
151178 fs . existsSync ( markerPath )
152179 ? fs . readFileSync ( markerPath , "utf8" ) . split ( "\n" ) . filter ( ( l ) => l === "spawn" ) . length
@@ -182,6 +209,79 @@ describe("warm worker pool", () => {
182209 // The pool was emptied -> the next solve had to spawn a fresh worker.
183210 expect ( spawnCount ( ) ) . toBe ( 2 ) ;
184211 } ) ;
212+
213+ test ( "aborting a worker-per-solve solve mid-flight terminates the hung worker" , async ( ) => {
214+ process . env . ZCODE_CAPTCHA_WORKER = hangingFixture ;
215+ delete process . env . ZCODE_CAPTCHA_WARM_WORKERS ;
216+ mock . module ( "./captcha-worker-asset.js" , ( ) => ( { default : null } ) ) ;
217+ __resetCaptchaWorkerDispatchForTest ( ) ;
218+
219+ const controller = new AbortController ( ) ;
220+ const pending = solveViaWorkerOrInProcess ( {
221+ scene : "abort" ,
222+ region : "r" ,
223+ prefix : "p" ,
224+ signal : controller . signal ,
225+ } ) ;
226+ await new Promise ( ( r ) => setTimeout ( r , 100 ) ) ;
227+ const t0 = Date . now ( ) ;
228+ controller . abort ( new Error ( "request deadline" ) ) ;
229+ await expect ( pending ) . rejects . toThrow ( "request deadline" ) ;
230+ expect ( Date . now ( ) - t0 ) . toBeLessThan ( 5_000 ) ;
231+ } ) ;
232+
233+ test ( "aborting a warm solve mid-flight drops the handle; the next solve respawns" , async ( ) => {
234+ process . env . ZCODE_CAPTCHA_WORKER = hangingFixture ;
235+ process . env . ZCODE_CAPTCHA_WARM_WORKERS = "1" ;
236+ mock . module ( "./captcha-worker-asset.js" , ( ) => ( { default : null } ) ) ;
237+ __resetCaptchaWorkerDispatchForTest ( ) ;
238+ const baseline = spawnCount ( ) ;
239+
240+ const abortAfterDispatch = async ( scene : string ) : Promise < void > => {
241+ const controller = new AbortController ( ) ;
242+ const pending = solveViaWorkerOrInProcess ( { scene, region : "r" , prefix : "p" , signal : controller . signal } ) ;
243+ await new Promise ( ( r ) => setTimeout ( r , 100 ) ) ;
244+ const t0 = Date . now ( ) ;
245+ controller . abort ( new Error ( "request deadline" ) ) ;
246+ await expect ( pending ) . rejects . toThrow ( "request deadline" ) ;
247+ expect ( Date . now ( ) - t0 ) . toBeLessThan ( 5_000 ) ;
248+ } ;
249+
250+ await abortAfterDispatch ( "warm-abort-1" ) ;
251+ await abortAfterDispatch ( "warm-abort-2" ) ;
252+ expect ( spawnCount ( ) - baseline ) . toBe ( 2 ) ;
253+ } ) ;
254+
255+ test ( "a late abort from a finished warm solve does not kill the next take on the same handle" , async ( ) => {
256+ process . env . ZCODE_CAPTCHA_WORKER = failThenHangFixture ;
257+ process . env . ZCODE_CAPTCHA_WARM_WORKERS = "1" ;
258+ mock . module ( "./captcha-worker-asset.js" , ( ) => ( { default : null } ) ) ;
259+ __resetCaptchaWorkerDispatchForTest ( ) ;
260+ const baseline = spawnCount ( ) ;
261+ const sleep = ( ms : number ) => new Promise ( ( r ) => setTimeout ( r , ms ) ) ;
262+
263+ const controllerA = new AbortController ( ) ;
264+ await expect (
265+ solveViaWorkerOrInProcess ( { scene : "a" , region : "r" , prefix : "p" , signal : controllerA . signal } ) ,
266+ ) . rejects . toThrow ( "boom" ) ;
267+
268+ const controllerB = new AbortController ( ) ;
269+ let settledB = false ;
270+ const pendingB = solveViaWorkerOrInProcess ( { scene : "b" , region : "r" , prefix : "p" , signal : controllerB . signal } ) ;
271+ pendingB . then (
272+ ( ) => { settledB = true ; } ,
273+ ( ) => { settledB = true ; } ,
274+ ) ;
275+ await sleep ( 100 ) ;
276+
277+ controllerA . abort ( new Error ( "late abort A" ) ) ;
278+ await sleep ( 100 ) ;
279+ expect ( settledB ) . toBe ( false ) ;
280+
281+ controllerB . abort ( new Error ( "B deadline" ) ) ;
282+ await expect ( pendingB ) . rejects . toThrow ( "B deadline" ) ;
283+ expect ( spawnCount ( ) - baseline ) . toBe ( 1 ) ;
284+ } ) ;
185285} ) ;
186286
187287// File-level cleanup: runs after every describe above, so shared fixtures
0 commit comments