@@ -249,61 +249,59 @@ export const layer = Layer.effect(
249249 ) ,
250250 ) ;
251251
252- const unregister : DesktopBackendPool [ "Service" ] [ "unregister" ] = ( id ) =>
253- Effect . gen ( function * ( ) {
254- if ( id === DesktopBackendManager . PRIMARY_INSTANCE_ID ) {
255- return yield * new DesktopBackendPoolCannotUnregisterPrimaryError ( ) ;
256- }
257- const done = yield * Deferred . make < void > ( ) ;
258- const action = yield * SynchronizedRef . modifyEffect (
259- instancesRef ,
260- (
261- current ,
262- ) : Effect . Effect <
263- readonly [ UnregisterAction , ReadonlyMap < BackendInstanceId , RegisteredInstance > ]
264- > => {
265- const entry = current . get ( id ) ;
266- if ( entry === undefined ) {
267- return Effect . succeed ( [ { _tag : "Absent" } as const , current ] as const ) ;
268- }
269- if ( entry . _tag === "Closing" ) {
270- return Effect . succeed ( [
271- { _tag : "Wait" , done : entry . done } as const ,
272- current ,
273- ] as const ) ;
274- }
275- const next = new Map ( current ) ;
276- next . set ( id , { _tag : "Closing" , done } ) ;
277- return Effect . succeed ( [
278- { _tag : "Close" , entry } as const ,
279- next as ReadonlyMap < BackendInstanceId , RegisteredInstance > ,
280- ] as const ) ;
281- } ,
282- ) ;
283-
284- if ( action . _tag === "Absent" ) return ;
285- if ( action . _tag === "Wait" ) {
286- yield * Deferred . await ( action . done ) ;
287- return ;
288- }
289-
290- const finish = SynchronizedRef . modifyEffect ( instancesRef , ( current ) => {
291- const closing = current . get ( id ) ;
292- if ( closing ?. _tag !== "Closing" || closing . done !== done ) {
293- return Effect . succeed ( [ undefined , current ] as const ) ;
252+ const unregister : DesktopBackendPool [ "Service" ] [ "unregister" ] = Effect . fn (
253+ "DesktopBackendPool.unregister" ,
254+ ) ( function * ( id ) {
255+ if ( id === DesktopBackendManager . PRIMARY_INSTANCE_ID ) {
256+ return yield * new DesktopBackendPoolCannotUnregisterPrimaryError ( ) ;
257+ }
258+ const done = yield * Deferred . make < void > ( ) ;
259+ const action = yield * SynchronizedRef . modifyEffect (
260+ instancesRef ,
261+ (
262+ current ,
263+ ) : Effect . Effect <
264+ readonly [ UnregisterAction , ReadonlyMap < BackendInstanceId , RegisteredInstance > ]
265+ > => {
266+ const entry = current . get ( id ) ;
267+ if ( entry === undefined ) {
268+ return Effect . succeed ( [ { _tag : "Absent" } as const , current ] as const ) ;
269+ }
270+ if ( entry . _tag === "Closing" ) {
271+ return Effect . succeed ( [ { _tag : "Wait" , done : entry . done } as const , current ] as const ) ;
294272 }
295273 const next = new Map ( current ) ;
296- next . delete ( id ) ;
274+ next . set ( id , { _tag : "Closing" , done } ) ;
297275 return Effect . succeed ( [
298- undefined ,
276+ { _tag : "Close" , entry } as const ,
299277 next as ReadonlyMap < BackendInstanceId , RegisteredInstance > ,
300278 ] as const ) ;
301- } ) . pipe ( Effect . andThen ( Deferred . succeed ( done , undefined ) ) , Effect . asVoid ) ;
302- yield * Option . match ( action . entry . scope , {
303- onNone : ( ) => Effect . void ,
304- onSome : ( scope ) => Scope . close ( scope , Exit . void ) . pipe ( Effect . ignore ) ,
305- } ) . pipe ( Effect . ensuring ( finish ) ) ;
306- } ) ;
279+ } ,
280+ ) ;
281+
282+ if ( action . _tag === "Absent" ) return ;
283+ if ( action . _tag === "Wait" ) {
284+ yield * Deferred . await ( action . done ) ;
285+ return ;
286+ }
287+
288+ const finish = SynchronizedRef . modifyEffect ( instancesRef , ( current ) => {
289+ const closing = current . get ( id ) ;
290+ if ( closing ?. _tag !== "Closing" || closing . done !== done ) {
291+ return Effect . succeed ( [ undefined , current ] as const ) ;
292+ }
293+ const next = new Map ( current ) ;
294+ next . delete ( id ) ;
295+ return Effect . succeed ( [
296+ undefined ,
297+ next as ReadonlyMap < BackendInstanceId , RegisteredInstance > ,
298+ ] as const ) ;
299+ } ) . pipe ( Effect . andThen ( Deferred . succeed ( done , undefined ) ) , Effect . asVoid ) ;
300+ yield * Option . match ( action . entry . scope , {
301+ onNone : ( ) => Effect . void ,
302+ onSome : ( scope ) => Scope . close ( scope , Exit . void ) . pipe ( Effect . ignore ) ,
303+ } ) . pipe ( Effect . ensuring ( finish ) ) ;
304+ } ) ;
307305
308306 return DesktopBackendPool . of ( {
309307 get : ( id ) =>
0 commit comments