@@ -73,7 +73,11 @@ const makeServerConfig = Effect.fn(function* (baseDir: string) {
7373} ) ;
7474
7575it . layer ( NodeServices . layer ) ( "ServerEnvironmentLive" , ( it ) => {
76- it . effect ( "concurrent initializers use the same persisted environment id" , ( ) =>
76+ it . effect . each ( [
77+ { name : "missing" , content : undefined } ,
78+ { name : "empty" , content : "" } ,
79+ { name : "whitespace-only" , content : " \t\n" } ,
80+ ] ) ( "concurrent initializers recover a $name environment id file" , ( { content } ) =>
7781 Effect . gen ( function * ( ) {
7882 const fileSystem = yield * FileSystem . FileSystem ;
7983 const crypto = yield * Crypto . Crypto ;
@@ -82,14 +86,41 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {
8286 } ) ;
8387 const serverConfig = yield * makeServerConfig ( baseDir ) ;
8488 yield * fileSystem . makeDirectory ( serverConfig . stateDir , { recursive : true } ) ;
89+ if ( content !== undefined ) {
90+ yield * fileSystem . writeFileString ( serverConfig . environmentIdPath , content ) ;
91+ }
8592 const bothGenerated = yield * Deferred . make < void > ( ) ;
93+ const bothReadEmpty = yield * Deferred . make < void > ( ) ;
94+ const firstInitialized = yield * Deferred . make < void > ( ) ;
8695 let remaining = 2 ;
96+ let emptyReads = 0 ;
8797 const readIdentity = Effect . gen ( function * ( ) {
8898 const identity = yield * ServerEnvironment . ServerEnvironmentIdentity ;
8999 return yield * identity . getEnvironmentId ;
90100 } ) . pipe (
101+ Effect . tap ( ( ) => Deferred . succeed ( firstInitialized , undefined ) ) ,
91102 Effect . provide ( Layer . fresh ( ServerEnvironment . identityLayer ) ) ,
92103 Effect . provideService ( ServerConfig . ServerConfig , serverConfig ) ,
104+ Effect . provideService ( FileSystem . FileSystem , {
105+ ...fileSystem ,
106+ readFileString : ( path ) =>
107+ fileSystem . readFileString ( path ) . pipe (
108+ Effect . tap (
109+ Effect . fn ( function * ( value ) {
110+ if ( path !== serverConfig . environmentIdPath || remaining > 0 || value . trim ( ) ) {
111+ return ;
112+ }
113+ // Both observe the empty file, but one repairs it after the other has finished.
114+ if ( ++ emptyReads === 2 ) {
115+ yield * Deferred . succeed ( bothReadEmpty , undefined ) ;
116+ yield * Deferred . await ( firstInitialized ) ;
117+ } else {
118+ yield * Deferred . await ( bothReadEmpty ) ;
119+ }
120+ } ) ,
121+ ) ,
122+ ) ,
123+ } ) ,
93124 Effect . provideService ( Crypto . Crypto , {
94125 ...crypto ,
95126 randomUUIDv4 : Effect . gen ( function * ( ) {
0 commit comments