@@ -5,6 +5,8 @@ import * as Duration from "effect/Duration";
55import * as Effect from "effect/Effect" ;
66import * as Layer from "effect/Layer" ;
77import * as Option from "effect/Option" ;
8+ import * as Queue from "effect/Queue" ;
9+ import * as Stream from "effect/Stream" ;
810import * as TestClock from "effect/testing/TestClock" ;
911import * as SqlClient from "effect/unstable/sql/SqlClient" ;
1012
@@ -44,6 +46,14 @@ const makeSessionStoreLayer = (
4446 Layer . provide ( makeServerConfigLayer ( overrides ) ) ,
4547 ) ;
4648
49+ const relaySessionInput = {
50+ subject : "managed-relay-bootstrap" ,
51+ method : "dpop-access-token" ,
52+ proofKeyThumbprint : "relay-proof-key" ,
53+ ttl : Duration . hours ( 1 ) ,
54+ client : { label : "Relay desktop" , deviceType : "desktop" } ,
55+ } as const ;
56+
4757const repositoryFailure = new PersistenceSqlError ( {
4858 operation : "AuthSessionRepository.getById:query" ,
4959 detail : "sqlite is unavailable" ,
@@ -420,6 +430,124 @@ it.layer(NodeServices.layer)("SessionStore.layer", (it) => {
420430 expect ( afterReconnect [ 0 ] ?. lastConnectedAt ?. toString ( ) ) . not . toBe ( firstConnectedAt ?. toString ( ) ) ;
421431 } ) . pipe ( Effect . provide ( Layer . merge ( makeSessionStoreLayer ( ) , TestClock . layer ( ) ) ) ) ,
422432 ) ;
433+
434+ it . effect ( "keeps connected relay sessions visible through expiry and HTTP renewal" , ( ) =>
435+ Effect . gen ( function * ( ) {
436+ const sessions = yield * SessionStore . SessionStore ;
437+ const original = yield * sessions . issue ( relaySessionInput ) ;
438+ const websocket = yield * sessions . issueWebSocketToken ( original . sessionId , {
439+ ttl : Duration . hours ( 2 ) ,
440+ } ) ;
441+ yield * sessions . verifyWebSocketToken ( websocket . token ) ;
442+ yield * sessions . markConnected ( original . sessionId ) ;
443+ const beforeExpiry = yield * sessions . listActive ( ) ;
444+ expect ( beforeExpiry ) . toHaveLength ( 1 ) ;
445+ expect ( beforeExpiry [ 0 ] ?. connected ) . toBe ( true ) ;
446+
447+ yield * TestClock . adjust ( Duration . minutes ( 61 ) ) ;
448+
449+ expect ( yield * sessions . listActive ( ) ) . toEqual ( beforeExpiry ) ;
450+ expect ( yield * Effect . flip ( sessions . verify ( original . token ) ) ) . toMatchObject ( {
451+ _tag : "SessionTokenExpiredError" ,
452+ } ) ;
453+ expect ( yield * Effect . flip ( sessions . verifyWebSocketToken ( websocket . token ) ) ) . toMatchObject ( {
454+ _tag : "WebSocketSessionExpiredError" ,
455+ } ) ;
456+
457+ const renewed = yield * sessions . issue ( relaySessionInput ) ;
458+ const afterRenewal = yield * sessions . listActive ( ) ;
459+ expect ( renewed . sessionId ) . not . toBe ( original . sessionId ) ;
460+ expect ( afterRenewal ) . toHaveLength ( 2 ) ;
461+ expect ( afterRenewal ) . toEqual (
462+ expect . arrayContaining ( [
463+ beforeExpiry [ 0 ] ,
464+ expect . objectContaining ( {
465+ sessionId : renewed . sessionId ,
466+ connected : false ,
467+ lastConnectedAt : null ,
468+ } ) ,
469+ ] ) ,
470+ ) ;
471+ } ) . pipe ( Effect . provide ( Layer . merge ( makeSessionStoreLayer ( ) , TestClock . layer ( ) ) ) ) ,
472+ ) ;
473+
474+ it . effect . each ( [ 1 , 2 ] ) (
475+ "removes an expired session from listings and updates after its last of %s sockets closes" ,
476+ ( socketCount ) =>
477+ Effect . gen ( function * ( ) {
478+ const sessions = yield * SessionStore . SessionStore ;
479+ const issued = yield * sessions . issue ( relaySessionInput ) ;
480+ const changes = yield * Queue . unbounded < SessionStore . SessionCredentialChange > ( ) ;
481+ yield * sessions . streamChanges . pipe (
482+ Stream . runForEach ( ( change ) => Queue . offer ( changes , change ) ) ,
483+ Effect . forkScoped ( { startImmediately : true } ) ,
484+ ) ;
485+ for ( let index = 0 ; index < socketCount ; index += 1 ) {
486+ yield * sessions . markConnected ( issued . sessionId ) ;
487+ expect ( yield * Queue . take ( changes ) ) . toMatchObject ( {
488+ type : "clientUpserted" ,
489+ clientSession : { sessionId : issued . sessionId , connected : true } ,
490+ } ) ;
491+ }
492+
493+ yield * TestClock . adjust ( Duration . minutes ( 61 ) ) ;
494+
495+ for ( let remaining = socketCount - 1 ; remaining >= 0 ; remaining -= 1 ) {
496+ yield * sessions . markDisconnected ( issued . sessionId ) ;
497+ const change = yield * Queue . take ( changes ) ;
498+ const listed = yield * sessions . listActive ( ) ;
499+ if ( remaining > 0 ) {
500+ expect ( change ) . toMatchObject ( {
501+ type : "clientUpserted" ,
502+ clientSession : { sessionId : issued . sessionId , connected : true } ,
503+ } ) ;
504+ expect ( listed ) . toHaveLength ( 1 ) ;
505+ expect ( listed [ 0 ] ?. connected ) . toBe ( true ) ;
506+ } else {
507+ expect ( change ) . toEqual ( { type : "clientRemoved" , sessionId : issued . sessionId } ) ;
508+ expect ( listed ) . toEqual ( [ ] ) ;
509+ }
510+ }
511+ } ) . pipe (
512+ Effect . scoped ,
513+ Effect . provide ( Layer . merge ( makeSessionStoreLayer ( ) , TestClock . layer ( ) ) ) ,
514+ ) ,
515+ ) ;
516+
517+ it . effect . each ( [ "revoke" , "revokeAllExcept" ] as const ) (
518+ "removes expired connected sessions with %s" ,
519+ ( operation ) =>
520+ Effect . gen ( function * ( ) {
521+ const sessions = yield * SessionStore . SessionStore ;
522+ const administrative = yield * sessions . issue ( { subject : "desktop-bootstrap" } ) ;
523+ const client = yield * sessions . issue ( relaySessionInput ) ;
524+ yield * sessions . markConnected ( client . sessionId ) ;
525+ yield * TestClock . adjust ( Duration . minutes ( 61 ) ) ;
526+ const changes = yield * Queue . unbounded < SessionStore . SessionCredentialChange > ( ) ;
527+ yield * sessions . streamChanges . pipe (
528+ Stream . runForEach ( ( change ) => Queue . offer ( changes , change ) ) ,
529+ Effect . forkScoped ( { startImmediately : true } ) ,
530+ ) ;
531+
532+ if ( operation === "revoke" ) {
533+ expect ( yield * sessions . revoke ( client . sessionId ) ) . toBe ( true ) ;
534+ } else {
535+ expect ( yield * sessions . revokeAllExcept ( administrative . sessionId ) ) . toBe ( 1 ) ;
536+ }
537+
538+ expect ( yield * Queue . take ( changes ) ) . toEqual ( {
539+ type : "clientRemoved" ,
540+ sessionId : client . sessionId ,
541+ } ) ;
542+ const listed = yield * sessions . listActive ( ) ;
543+ expect ( listed ) . toHaveLength ( 1 ) ;
544+ expect ( listed [ 0 ] ?. sessionId ) . toBe ( administrative . sessionId ) ;
545+ } ) . pipe (
546+ Effect . scoped ,
547+ Effect . provide ( Layer . merge ( makeSessionStoreLayer ( ) , TestClock . layer ( ) ) ) ,
548+ ) ,
549+ ) ;
550+
423551 it . effect ( "records client connection metadata without clearing prior values" , ( ) =>
424552 Effect . gen ( function * ( ) {
425553 const sessions = yield * SessionStore . SessionStore ;
0 commit comments