@@ -219,47 +219,7 @@ it.layer(NodeServices.layer)("service state persistence", (it) => {
219219 } ) ,
220220 ) ;
221221
222- it . effect ( "stays idle instead of exiting when another server owns the T3 home" , ( ) =>
223- Effect . gen ( function * ( ) {
224- const fs = yield * FileSystem . FileSystem ;
225- const path = yield * Path . Path ;
226- const root = yield * fs . makeTempDirectoryScoped ( { prefix : "t3-service-refused-" } ) ;
227- const statePath = path . join ( root , "runtime" , "service-state.json" ) ;
228- yield * writeFakeRuntime (
229- fs ,
230- path ,
231- path . join ( root , "runtime" , "versions" , "1.0.0" ) ,
232- `process.exit(${ SERVER_EXIT_CODE_STATE_DIR_OWNED } );\n` ,
233- ) ;
234- yield * Effect . promise ( ( ) =>
235- writeServiceState ( statePath , {
236- protocol : SERVICE_LAUNCHER_PROTOCOL ,
237- activeVersion : "1.0.0" ,
238- } ) ,
239- ) ;
240- const refused = Promise . withResolvers < void > ( ) ;
241- yield * Effect . acquireRelease (
242- Effect . sync ( ( ) =>
243- vi . spyOn ( process . stderr , "write" ) . mockImplementation ( ( chunk ) => {
244- if ( String ( chunk ) . includes ( "owns this T3 home" ) ) refused . resolve ( ) ;
245- return true ;
246- } ) ,
247- ) ,
248- ( spy ) => Effect . sync ( ( ) => spy . mockRestore ( ) ) ,
249- ) ;
250- const launcher = new Launcher ( root , yield * Effect . promise ( ( ) => readServiceState ( statePath ) ) ) ;
251- let completed = false ;
252- const running = launcher . run ( ) . finally ( ( ) => {
253- completed = true ;
254- } ) ;
255- yield * Effect . promise ( ( ) => refused . promise ) ;
256- assert . isFalse ( completed ) ;
257- yield * Effect . promise ( ( ) => launcher . stop ( "SIGTERM" ) ) ;
258- yield * Effect . promise ( ( ) => running ) ;
259- } ) ,
260- ) ;
261-
262- it . effect ( "starts the server again once the other owner releases the T3 home" , ( ) =>
222+ it . effect ( "waits without exiting and restarts once the other owner releases the T3 home" , ( ) =>
263223 Effect . gen ( function * ( ) {
264224 const fs = yield * FileSystem . FileSystem ;
265225 const path = yield * Path . Path ;
@@ -285,9 +245,9 @@ it.layer(NodeServices.layer)("service state persistence", (it) => {
285245 activeVersion : "1.0.0" ,
286246 } ) ,
287247 ) ;
288- const otherOwner = new NodeSqlite . DatabaseSync ( ownerPath ) ;
248+ using otherOwner = new NodeSqlite . DatabaseSync ( ownerPath ) ;
289249 otherOwner . exec ( "BEGIN EXCLUSIVE;" ) ;
290- const refused = Promise . withResolvers < void > ( ) ;
250+ let refused = Promise . withResolvers < void > ( ) ;
291251 const owned = Promise . withResolvers < void > ( ) ;
292252 yield * Effect . acquireRelease (
293253 Effect . sync ( ( ) =>
@@ -315,13 +275,31 @@ it.layer(NodeServices.layer)("service state persistence", (it) => {
315275 stateDirOwnerPollMs : 10 ,
316276 } ,
317277 ) ;
318- const running = launcher . run ( ) ;
278+ let completed = false ;
279+ const running = launcher . run ( ) . finally ( ( ) => {
280+ completed = true ;
281+ } ) ;
319282 yield * Effect . promise ( ( ) => refused . promise ) ;
320- otherOwner . close ( ) ;
321- yield * Effect . promise ( ( ) => owned . promise ) ;
283+ assert . isFalse ( completed ) ;
322284 yield * Effect . promise ( ( ) => launcher . stop ( "SIGTERM" ) ) ;
323285 yield * Effect . promise ( ( ) => running ) ;
324- assert . strictEqual ( spawnedChildren . length - spawnsBefore , 2 ) ;
286+ assert . isTrue ( stateDirOwned ( root ) ) ;
287+
288+ refused = Promise . withResolvers < void > ( ) ;
289+ const restarted = new Launcher (
290+ root ,
291+ yield * Effect . promise ( ( ) => readServiceState ( statePath ) ) ,
292+ {
293+ stateDirOwnerPollMs : 10 ,
294+ } ,
295+ ) ;
296+ const recovering = restarted . run ( ) ;
297+ yield * Effect . promise ( ( ) => refused . promise ) ;
298+ otherOwner . close ( ) ;
299+ yield * Effect . promise ( ( ) => owned . promise ) ;
300+ yield * Effect . promise ( ( ) => restarted . stop ( "SIGTERM" ) ) ;
301+ yield * Effect . promise ( ( ) => recovering ) ;
302+ assert . strictEqual ( spawnedChildren . length - spawnsBefore , 3 ) ;
325303 } ) ,
326304 ) ;
327305
@@ -335,7 +313,7 @@ it.layer(NodeServices.layer)("service state persistence", (it) => {
335313 yield * fs . makeDirectory ( stateDir , { recursive : true } ) ;
336314 assert . isFalse ( stateDirOwned ( root ) ) ;
337315
338- const owner = new NodeSqlite . DatabaseSync ( path . join ( stateDir , "server-owner.sqlite" ) ) ;
316+ using owner = new NodeSqlite . DatabaseSync ( path . join ( stateDir , "server-owner.sqlite" ) ) ;
339317 owner . exec ( "BEGIN EXCLUSIVE;" ) ;
340318 assert . isTrue ( stateDirOwned ( root ) ) ;
341319 owner . close ( ) ;
0 commit comments