1010 */
1111import * as Scope from "effect/Scope" ;
1212import * as Effect from "effect/Effect" ;
13+ import * as Exit from "effect/Exit" ;
1314import * as TxQueue from "effect/TxQueue" ;
1415import * as TxRef from "effect/TxRef" ;
1516
@@ -36,8 +37,14 @@ export const makeKeyedDrainableWorker = <A, K, E, R>(
3637 Effect . gen ( function * ( ) {
3738 const context = yield * Effect . context < R > ( ) ;
3839 const scope = yield * Scope . Scope ;
39- type Entry = { readonly worker : DrainableWorker < A > ; version : number } ;
40+ type Entry = {
41+ readonly worker : DrainableWorker < A > ;
42+ readonly scope : Scope . Closeable ;
43+ version : number ;
44+ } ;
4045 const entries = new Map < K , Entry > ( ) ;
46+ const processInParentScope = ( item : A ) =>
47+ process ( item ) . pipe ( Effect . provide ( context ) , Scope . provide ( scope ) ) ;
4148
4249 const removeWhenIdle = ( key : K , entry : Entry ) =>
4350 Effect . gen ( function * ( ) {
@@ -46,6 +53,7 @@ export const makeKeyedDrainableWorker = <A, K, E, R>(
4653 yield * entry . worker . drain ;
4754 if ( entry . version === observedVersion && entries . get ( key ) === entry ) {
4855 entries . delete ( key ) ;
56+ yield * Scope . close ( entry . scope , Exit . void ) ;
4957 return ;
5058 }
5159 }
@@ -60,11 +68,11 @@ export const makeKeyedDrainableWorker = <A, K, E, R>(
6068 yield * existing . worker . enqueue ( item ) ;
6169 return ;
6270 }
63- const worker = yield * makeDrainableWorker ( process ) . pipe (
64- Effect . provide ( context ) ,
65- Scope . provide ( scope ) ,
71+ const laneScope = yield * Scope . fork ( scope , "sequential" ) ;
72+ const worker = yield * makeDrainableWorker ( processInParentScope ) . pipe (
73+ Scope . provide ( laneScope ) ,
6674 ) ;
67- const entry : Entry = { worker, version : 1 } ;
75+ const entry : Entry = { worker, scope : laneScope , version : 1 } ;
6876 entries . set ( key , entry ) ;
6977 yield * worker . enqueue ( item ) ;
7078 yield * removeWhenIdle ( key , entry ) . pipe ( Effect . forkIn ( scope ) ) ;
0 commit comments