@@ -251,16 +251,27 @@ it.layer(NodeServices.layer)("service state persistence", (it) => {
251251 using otherOwner = new NodeSqlite . DatabaseSync ( ownerPath ) ;
252252 otherOwner . exec ( "BEGIN EXCLUSIVE;" ) ;
253253 let refused = Promise . withResolvers < void > ( ) ;
254+ let onRefused : ( ( ) => void ) | undefined ;
254255 const owned = Promise . withResolvers < void > ( ) ;
255256 yield * Effect . acquireRelease (
256257 Effect . sync ( ( ) =>
257258 vi . spyOn ( process . stderr , "write" ) . mockImplementation ( ( chunk ) => {
258- if ( String ( chunk ) . includes ( "owns this T3 home" ) ) refused . resolve ( ) ;
259+ if ( ! String ( chunk ) . includes ( "owns this T3 home" ) ) return true ;
260+ onRefused ?.( ) ;
261+ refused . resolve ( ) ;
259262 return true ;
260263 } ) ,
261264 ) ,
262265 ( spy ) => Effect . sync ( ( ) => spy . mockRestore ( ) ) ,
263266 ) ;
267+ const setIntervalSpy = yield * Effect . acquireRelease (
268+ Effect . sync ( ( ) => vi . spyOn ( globalThis , "setInterval" ) ) ,
269+ ( spy ) => Effect . sync ( ( ) => spy . mockRestore ( ) ) ,
270+ ) ;
271+ const clearTimeoutSpy = yield * Effect . acquireRelease (
272+ Effect . sync ( ( ) => vi . spyOn ( globalThis , "clearTimeout" ) ) ,
273+ ( spy ) => Effect . sync ( ( ) => spy . mockRestore ( ) ) ,
274+ ) ;
264275 yield * Effect . acquireRelease (
265276 Effect . sync ( ( ) => {
266277 spawnHook . current = ( child ) => child . once ( "message" , ( ) => owned . resolve ( ) ) ;
@@ -278,15 +289,14 @@ it.layer(NodeServices.layer)("service state persistence", (it) => {
278289 stateDirOwnerPollMs : 10 ,
279290 } ,
280291 ) ;
281- let completed = false ;
282- const running = launcher . run ( ) . finally ( ( ) => {
283- completed = true ;
284- } ) ;
285- yield * Effect . promise ( ( ) => refused . promise ) ;
286- assert . isFalse ( completed ) ;
287- yield * Effect . promise ( ( ) => launcher . stop ( "SIGTERM" ) ) ;
288- yield * Effect . promise ( ( ) => running ) ;
289-
292+ // Stop lands after the exit-78 transition starts but before it installs the owner poll.
293+ onRefused = ( ) => void launcher . stop ( "SIGTERM" ) ;
294+ yield * Effect . promise ( ( ) => launcher . run ( ) ) ;
295+ const poll = setIntervalSpy . mock . results . at ( - 1 ) ?. value ;
296+ assert . isDefined ( poll ) ;
297+ assert . isTrue ( clearTimeoutSpy . mock . calls . some ( ( [ timer ] ) => timer === poll ) ) ;
298+
299+ onRefused = undefined ;
290300 refused = Promise . withResolvers < void > ( ) ;
291301 const restarted = new Launcher (
292302 root ,
@@ -295,8 +305,12 @@ it.layer(NodeServices.layer)("service state persistence", (it) => {
295305 stateDirOwnerPollMs : 10 ,
296306 } ,
297307 ) ;
298- const recovering = restarted . run ( ) ;
308+ let completed = false ;
309+ const recovering = restarted . run ( ) . finally ( ( ) => {
310+ completed = true ;
311+ } ) ;
299312 yield * Effect . promise ( ( ) => refused . promise ) ;
313+ assert . isFalse ( completed ) ;
300314 otherOwner . close ( ) ;
301315 yield * Effect . promise ( ( ) => owned . promise ) ;
302316 yield * Effect . promise ( ( ) => restarted . stop ( "SIGTERM" ) ) ;
@@ -313,20 +327,26 @@ it.layer(NodeServices.layer)("service state persistence", (it) => {
313327 const stateDir = path . join ( root , "userdata" ) ;
314328 const recordPath = path . join ( stateDir , "server-runtime.json" ) ;
315329 yield * fs . makeDirectory ( stateDir , { recursive : true } ) ;
316- assert . isFalse ( stateDirOwned ( root ) ) ;
330+ assert . isFalse ( yield * Effect . promise ( ( ) => stateDirOwned ( root ) ) ) ;
317331
318332 using owner = new NodeSqlite . DatabaseSync ( path . join ( stateDir , "server-owner.sqlite" ) ) ;
319333 owner . exec ( "BEGIN EXCLUSIVE;" ) ;
320- assert . isTrue ( stateDirOwned ( root ) ) ;
334+ assert . isTrue ( yield * Effect . promise ( ( ) => stateDirOwned ( root ) ) ) ;
321335 owner . close ( ) ;
322336
323337 const record = { version : 1 , pid : process . pid , port : 1 , origin : "" , startedAt : "" } ;
324338 yield * fs . writeFileString ( recordPath , JSON . stringify ( record ) ) ;
325- assert . isTrue ( stateDirOwned ( root ) ) ;
339+ assert . isTrue ( yield * Effect . promise ( ( ) => stateDirOwned ( root ) ) ) ;
326340 yield * fs . writeFileString ( recordPath , JSON . stringify ( { ...record , ownerId : "lock-aware" } ) ) ;
327- assert . isFalse ( stateDirOwned ( root ) ) ;
341+ assert . isFalse ( yield * Effect . promise ( ( ) => stateDirOwned ( root ) ) ) ;
342+ // This process started after 1970, so its PID was reused since that record.
343+ yield * fs . writeFileString (
344+ recordPath ,
345+ JSON . stringify ( { ...record , startedAt : "1970-01-01T00:00:00Z" } ) ,
346+ ) ;
347+ assert . isFalse ( yield * Effect . promise ( ( ) => stateDirOwned ( root ) ) ) ;
328348 yield * fs . writeFileString ( recordPath , JSON . stringify ( { ...record , pid : 2 ** 22 + 1 } ) ) ;
329- assert . isFalse ( stateDirOwned ( root ) ) ;
349+ assert . isFalse ( yield * Effect . promise ( ( ) => stateDirOwned ( root ) ) ) ;
330350 } ) ,
331351 ) ;
332352
0 commit comments