@@ -4,7 +4,6 @@ import http from 'node:http';
44import os from 'node:os' ;
55import path from 'node:path' ;
66import { test } from 'vitest' ;
7- import { DEFAULT_PROXY_LEASE_TTL_MS } from '@agent-device/contracts/lease-scope' ;
87import { sendToDaemon } from '../../../src/daemon-client/daemon-client.ts' ;
98import { LeaseRegistry } from '../../../src/daemon/lease-registry.ts' ;
109import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts' ;
@@ -549,7 +548,7 @@ test(
549548 async ( { world, proxied } ) => {
550549 const session = 'leased' ;
551550 const flags = { platform : 'ios' , udid : SIM . id } as const ;
552- const allocate = async ( ) : Promise < string > => {
551+ const allocate = async ( ) : Promise < { leaseId : string ; expiresAt : number } > => {
553552 const response = await proxied ( {
554553 session,
555554 command : 'lease_allocate' ,
@@ -558,9 +557,13 @@ test(
558557 meta : LEASE_SCOPE ,
559558 } ) ;
560559 assert . equal ( response . ok , true , JSON . stringify ( response ) ) ;
561- const leaseId = ( response . ok ? response . data : { } ) ?. lease as { leaseId ?: string } ;
562- assert . equal ( typeof leaseId ?. leaseId , 'string' ) ;
563- return leaseId . leaseId ! ;
560+ const lease = ( response . ok ? response . data : { } ) ?. lease as {
561+ leaseId ?: string ;
562+ expiresAt ?: number ;
563+ } ;
564+ assert . equal ( typeof lease ?. leaseId , 'string' ) ;
565+ assert . equal ( typeof lease ?. expiresAt , 'number' ) ;
566+ return { leaseId : lease . leaseId ! , expiresAt : lease . expiresAt ! } ;
564567 } ;
565568 const run = async (
566569 command : string ,
@@ -577,22 +580,24 @@ test(
577580 } ) ;
578581
579582 const firstLease = await allocate ( ) ;
580- assert . equal ( ( await run ( 'open' , [ APP ] , firstLease ) ) . ok , true ) ;
583+ assert . equal ( ( await run ( 'open' , [ APP ] , firstLease . leaseId ) ) . ok , true ) ;
581584 assert . equal (
582- ( await run ( 'snapshot' , [ ] , firstLease , { snapshotInteractiveOnly : true } ) ) . ok ,
585+ ( await run ( 'snapshot' , [ ] , firstLease . leaseId , { snapshotInteractiveOnly : true } ) ) . ok ,
583586 true ,
584587 ) ;
585588 assert . equal (
586589 baselineInitialized (
587- await run ( 'diff' , [ 'snapshot' ] , firstLease , { snapshotInteractiveOnly : true } ) ,
590+ await run ( 'diff' , [ 'snapshot' ] , firstLease . leaseId , { snapshotInteractiveOnly : true } ) ,
588591 ) ,
589592 false ,
590593 'the leased session holds comparison state before it expires' ,
591594 ) ;
592595
593596 // The lease lapses without a heartbeat; the next request through the proxy finds it expired.
594- now += DEFAULT_PROXY_LEASE_TTL_MS + 1 ;
595- const expired = await run ( 'diff' , [ 'snapshot' ] , firstLease , {
597+ // The jump is the window the lease itself was allocated with — a client that names no ttl
598+ // gets the registry default, which is the only window the daemon promises it.
599+ now = firstLease . expiresAt + 1 ;
600+ const expired = await run ( 'diff' , [ 'snapshot' ] , firstLease . leaseId , {
596601 snapshotInteractiveOnly : true ,
597602 } ) ;
598603 assert . equal ( expired . ok , false ) ;
@@ -603,16 +608,16 @@ test(
603608 assert . equal ( world . daemon . session ( session ) , undefined , 'expiry tears the session down' ) ;
604609
605610 const secondLease = await allocate ( ) ;
606- assert . notEqual ( secondLease , firstLease ) ;
607- assert . equal ( ( await run ( 'open' , [ APP ] , secondLease ) ) . ok , true ) ;
611+ assert . notEqual ( secondLease . leaseId , firstLease . leaseId ) ;
612+ assert . equal ( ( await run ( 'open' , [ APP ] , secondLease . leaseId ) ) . ok , true ) ;
608613 assert . equal (
609614 baselineInitialized (
610- await run ( 'diff' , [ 'snapshot' ] , secondLease , { snapshotInteractiveOnly : true } ) ,
615+ await run ( 'diff' , [ 'snapshot' ] , secondLease . leaseId , { snapshotInteractiveOnly : true } ) ,
611616 ) ,
612617 true ,
613618 'a reacquired lease must not compare against the expired session tree' ,
614619 ) ;
615- assert . equal ( ( await run ( 'close' , [ ] , secondLease , { } ) ) . ok , true ) ;
620+ assert . equal ( ( await run ( 'close' , [ ] , secondLease . leaseId , { } ) ) . ok , true ) ;
616621 } ,
617622 { leaseRegistry } ,
618623 ) ;
0 commit comments