@@ -7,6 +7,7 @@ import * as FileSystem from "effect/FileSystem";
77import * as Fiber from "effect/Fiber" ;
88import * as Layer from "effect/Layer" ;
99import * as Option from "effect/Option" ;
10+ import * as Queue from "effect/Queue" ;
1011import * as Stream from "effect/Stream" ;
1112import * as TestClock from "effect/testing/TestClock" ;
1213
@@ -214,7 +215,17 @@ it.layer(NodeServices.layer)("desktop app update", (it) => {
214215 it . effect ( "retains the tunnel handoff after transport loss, then expires it" , ( ) =>
215216 Effect . gen ( function * ( ) {
216217 const accepted = yield * Deferred . make < void > ( ) ;
217- const { service } = yield * makeHarness ( { keepOpen : true } ) ;
218+ const workerStarted = yield * Deferred . make < Fiber . Fiber < unknown , unknown > > ( ) ;
219+ const { service } = yield * makeHarness ( {
220+ keepOpen : true ,
221+ receiver : {
222+ commitDesktopUpdate : ( ) =>
223+ Effect . fiber . pipe (
224+ Effect . flatMap ( ( fiber ) => Deferred . succeed ( workerStarted , fiber ) ) ,
225+ Effect . asVoid ,
226+ ) ,
227+ } ,
228+ } ) ;
218229 const commit = yield * service
219230 . commit ( "update-1" , ( ) => Deferred . succeed ( accepted , undefined ) . pipe ( Effect . asVoid ) )
220231 . pipe ( Effect . forkChild ) ;
@@ -223,27 +234,67 @@ it.layer(NodeServices.layer)("desktop app update", (it) => {
223234
224235 yield * Fiber . interrupt ( commit ) ;
225236 expect ( yield * service . isRestartPending ) . toBe ( true ) ;
237+ // Server shutdown also interrupts the service-owned report consumer.
238+ yield * Fiber . interrupt ( yield * Deferred . await ( workerStarted ) ) ;
239+ expect ( yield * service . isRestartPending ) . toBe ( true ) ;
226240
227241 yield * TestClock . adjust ( "2 minutes" ) ;
228242 expect ( yield * service . isRestartPending ) . toBe ( false ) ;
229243 } ) ,
230244 ) ;
231245
232- it . effect ( "clears a failed install even after its remote caller disconnects " , ( ) =>
246+ it . effect ( "finishes a delayed handoff before honoring caller cancellation " , ( ) =>
233247 Effect . gen ( function * ( ) {
248+ const writing = yield * Deferred . make < void > ( ) ;
249+ const finishWrite = yield * Deferred . make < void > ( ) ;
234250 const accepted = yield * Deferred . make < void > ( ) ;
235- let latest = Option . none < DesktopUpdateStatusReport > ( ) ;
236251 const { service } = yield * makeHarness ( {
252+ keepOpen : true ,
237253 receiver : {
238- desktopUpdates : Effect . sync ( ( ) => ( { latest, changes : Stream . never } ) ) ,
254+ commitDesktopUpdate : ( ) =>
255+ Deferred . succeed ( writing , undefined ) . pipe ( Effect . andThen ( Deferred . await ( finishWrite ) ) ) ,
239256 } ,
240257 } ) ;
241258 const commit = yield * service
242259 . commit ( "update-1" , ( ) => Deferred . succeed ( accepted , undefined ) . pipe ( Effect . asVoid ) )
243260 . pipe ( Effect . forkChild ) ;
261+ yield * Deferred . await ( writing ) ;
262+ yield * TestClock . adjust ( "2 minutes" ) ;
263+ expect ( yield * service . isRestartPending ) . toBe ( false ) ;
264+
265+ const cancellation = yield * Fiber . interrupt ( commit ) . pipe (
266+ Effect . forkChild ( { startImmediately : true } ) ,
267+ ) ;
268+ yield * Deferred . succeed ( finishWrite , undefined ) ;
244269 yield * Deferred . await ( accepted ) ;
270+ yield * Fiber . join ( cancellation ) ;
271+ expect ( yield * service . isRestartPending ) . toBe ( true ) ;
272+ } ) ,
273+ ) ;
274+
275+ it . effect ( "consumes a disconnected caller's failure before later reports overwrite it" , ( ) =>
276+ Effect . gen ( function * ( ) {
277+ const workerStarted = yield * Deferred . make < Fiber . Fiber < unknown , unknown > > ( ) ;
278+ const reports = yield * Queue . unbounded < DesktopUpdateStatusReport > ( ) ;
279+ let latest = Option . none < DesktopUpdateStatusReport > ( ) ;
280+ const { service } = yield * makeHarness ( {
281+ receiver : {
282+ commitDesktopUpdate : ( ) =>
283+ Effect . fiber . pipe (
284+ Effect . flatMap ( ( fiber ) => Deferred . succeed ( workerStarted , fiber ) ) ,
285+ Effect . asVoid ,
286+ ) ,
287+ desktopUpdates : Effect . sync ( ( ) => ( { latest, changes : Stream . fromQueue ( reports ) } ) ) ,
288+ } ,
289+ } ) ;
290+ const commit = yield * service . commit ( "update-1" ) . pipe ( Effect . forkChild ) ;
291+ const worker = yield * Deferred . await ( workerStarted ) ;
245292 yield * Fiber . interrupt ( commit ) ;
246- latest = Option . some ( report ( "update-1" , makeState ( ) , { outcome : "failed" } ) ) ;
293+ const failure = report ( "update-1" , makeState ( ) , { outcome : "failed" } ) ;
294+ const later = report ( "update-2" , makeState ( { status : "checking" } ) ) ;
295+ latest = Option . some ( later ) ;
296+ yield * Queue . offerAll ( reports , [ failure , later ] ) ;
297+ yield * Fiber . await ( worker ) ;
247298
248299 expect ( yield * service . isRestartPending ) . toBe ( false ) ;
249300 } ) ,
0 commit comments