@@ -8,6 +8,7 @@ import * as Effect from "effect/Effect";
88import * as FileSystem from "effect/FileSystem" ;
99import * as Fiber from "effect/Fiber" ;
1010import * as Path from "effect/Path" ;
11+ import * as Stream from "effect/Stream" ;
1112import { HttpClient , HttpClientResponse } from "effect/http" ;
1213import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner" ;
1314
@@ -22,6 +23,7 @@ interface HarnessOptions {
2223 readonly mode ?: "web" | "desktop" ;
2324 readonly managed ?: boolean ;
2425 readonly preflight ?: "ready" | "blocked" ;
26+ readonly beforeDownload ?: Effect . Effect < void > ;
2527 readonly requestUpdate ?: ServiceLauncherClient . ServiceLauncherClient [ "Service" ] [ "requestUpdate" ] ;
2628 readonly desktopAppUpdate ?: DesktopAppUpdate . DesktopAppUpdate [ "Service" ] ;
2729}
@@ -30,7 +32,7 @@ interface HarnessOptions {
3032// and the tarball, and the fake runner stands in for tar before it answers
3133// the staged preflight.
3234const archiveBytes = new TextEncoder ( ) . encode ( "not really a tarball" ) ;
33- const releaseHttpClient = ( order : string [ ] ) =>
35+ const releaseHttpClient = ( order : string [ ] , beforeDownload ?: Effect . Effect < void > ) =>
3436 HttpClient . make ( ( request ) =>
3537 Effect . gen ( function * ( ) {
3638 if ( request . url . endsWith ( "/SHA256SUMS" ) ) {
@@ -43,6 +45,7 @@ const releaseHttpClient = (order: string[]) =>
4345 new Response ( `${ hex } t3-1.1.0-linux-x64.tar.gz\n` ) ,
4446 ) ;
4547 }
48+ if ( beforeDownload ) yield * beforeDownload ;
4649 order . push ( "download" ) ;
4750 return HttpClientResponse . fromWeb ( request , new Response ( archiveBytes ) ) ;
4851 } ) ,
@@ -119,7 +122,7 @@ const makeHarness = Effect.fn("test.make_self_update_harness")(function* (
119122 run : ( ) => Effect . die ( "unexpected desktop app update run" ) ,
120123 } ,
121124 ) ,
122- Effect . provideService ( HttpClient . HttpClient , releaseHttpClient ( order ) ) ,
125+ Effect . provideService ( HttpClient . HttpClient , releaseHttpClient ( order , options . beforeDownload ) ) ,
123126 Effect . provideService ( HostProcess . Platform , "linux" ) ,
124127 Effect . provideService ( HostProcess . Architecture , "x64" ) ,
125128 Effect . provide ( ServerConfig . layer ( { ...config , mode : options . mode ?? "web" } ) ) ,
@@ -422,4 +425,46 @@ it.layer(NodeServices.layer)("server self update", (it) => {
422425 expect ( ( yield * Fiber . join ( first ) ) . updateId ) . toBe ( "launcher-id" ) ;
423426 } ) ,
424427 ) ;
428+
429+ it . effect ( "keeps preparing after the progress stream closes" , ( ) =>
430+ Effect . gen ( function * ( ) {
431+ const releaseDownload = yield * Deferred . make < void > ( ) ;
432+ const sawDownloading = yield * Deferred . make < void > ( ) ;
433+ const accepted = yield * Deferred . make < void > ( ) ;
434+ const { selfUpdate, order } = yield * makeHarness ( {
435+ beforeDownload : Deferred . await ( releaseDownload ) ,
436+ requestUpdate : ( ) =>
437+ Effect . sync ( ( ) => {
438+ order . push ( "accept" ) ;
439+ } ) . pipe ( Effect . andThen ( Deferred . succeed ( accepted , undefined ) ) , Effect . as ( "launcher-id" ) ) ,
440+ } ) ;
441+
442+ const consumed = yield * ServerSelfUpdate . updateProgressStream ( selfUpdate , {
443+ targetVersion : "1.1.0" ,
444+ } ) . pipe (
445+ Stream . tap ( ( event ) =>
446+ event . type === "progress" && event . stage === "downloading"
447+ ? Deferred . succeed ( sawDownloading , undefined )
448+ : Effect . void ,
449+ ) ,
450+ Stream . runDrain ,
451+ Effect . forkChild ,
452+ ) ;
453+
454+ yield * Deferred . await ( sawDownloading ) ;
455+ // The socket drop ends the stream. The download is still held.
456+ yield * Fiber . interrupt ( consumed ) ;
457+ expect ( ( yield * selfUpdate . update ( { targetVersion : "1.2.0" } ) . pipe ( Effect . flip ) ) . reason ) . toBe (
458+ "A server update is already in progress." ,
459+ ) ;
460+
461+ yield * Deferred . succeed ( releaseDownload , undefined ) ;
462+ // `installing` is offered only after the stream queue has shut down.
463+ yield * Deferred . await ( accepted ) ;
464+ expect ( order ) . toEqual ( [ "download" , "extract" , "preflight" , "accept" ] ) ;
465+ expect ( ( yield * selfUpdate . update ( { targetVersion : "1.1.0" } ) . pipe ( Effect . flip ) ) . reason ) . toBe (
466+ "A server update is already in progress." ,
467+ ) ;
468+ } ) ,
469+ ) ;
425470} ) ;
0 commit comments