@@ -140,8 +140,7 @@ export class SnapshotBridgeManager {
140140 } else if ( normalized . failureKind === 'process-crash' ) {
141141 await this . removeSession ( session , false ) ;
142142 } else if ( normalized . failureKind === 'transport-failure' ) {
143- session . socket ?. destroy ( ) ;
144- session . socket = undefined ;
143+ retireBridgeSocket ( session ) ;
145144 }
146145 return normalized ;
147146 }
@@ -386,17 +385,11 @@ export class SnapshotBridgeManager {
386385 if ( stop . aborted ) throw closedSourceRefusal ( ) ;
387386 throw snapshotSourceError ( 'cancelled' , 'abort-signal' ) ;
388387 }
389- const invalidate = ( ) => {
390- if ( session . socket === socket ) session . socket = undefined ;
391- } ;
392- const onError = ( ) => {
393- invalidate ( ) ;
394- socket . destroy ( ) ;
395- } ;
388+ const onError = ( ) => retireBridgeSocket ( session , socket ) ;
396389 const onClose = ( ) => {
397- invalidate ( ) ;
398390 socket . off ( 'error' , onError ) ;
399391 socket . off ( 'close' , onClose ) ;
392+ retireBridgeSocket ( session , socket ) ;
400393 } ;
401394 socket . on ( 'error' , onError ) ;
402395 socket . on ( 'close' , onClose ) ;
@@ -482,14 +475,14 @@ export class SnapshotBridgeManager {
482475 deadline : SnapshotSourceDeadline ,
483476 turn : OwnedWork ,
484477 ) : Promise < SnapshotBridgeEnvelope > {
485- if ( ! session . socket || session . socket . destroyed ) {
486- await this . connectUntilReady ( session , deadline , turn . interrupt . signal ) ;
487- }
488- const socket = session . socket ;
489- if ( ! socket || socket . destroyed )
490- throw snapshotSourceError ( 'transport-failure' , 'bridge-connection-closed' ) ;
478+ const socket =
479+ session . socket && ! session . socket . destroyed
480+ ? session . socket
481+ : await this . connectUntilReady ( session , deadline , turn . interrupt . signal ) ;
491482 // Nothing is sent once a close owns this turn: the bridge it would reach is being stopped.
492483 if ( refusedByClose ( this . closed , turn ) ) throw closedSourceRefusal ( ) ;
484+ if ( socket . destroyed )
485+ throw snapshotSourceError ( 'transport-failure' , 'bridge-connection-closed' ) ;
493486 const requestId = randomUUID ( ) ;
494487 const request = createSnapshotBridgeDescribeRequest ( {
495488 requestId,
@@ -574,8 +567,7 @@ export class SnapshotBridgeManager {
574567 }
575568
576569 private async dispose ( session : BridgeSession , stopProcess : boolean ) : Promise < void > {
577- session . socket ?. destroy ( ) ;
578- session . socket = undefined ;
570+ retireBridgeSocket ( session ) ;
579571 if ( stopProcess && session . process . isAlive ( ) ) {
580572 session . process . signal ( 'SIGTERM' ) ;
581573 await waitForProcess ( session . process , SHUTDOWN_TERM_TIMEOUT_MS ) ;
@@ -588,6 +580,11 @@ export class SnapshotBridgeManager {
588580 }
589581}
590582
583+ function retireBridgeSocket ( session : BridgeSession , socket = session . socket ) : void {
584+ if ( session . socket === socket ) session . socket = undefined ;
585+ socket ?. destroy ( ) ;
586+ }
587+
591588function liveSession ( entry : BridgeEntry | undefined ) : BridgeSession | undefined {
592589 return entry ?. phase === 'live' ? entry . session : undefined ;
593590}
0 commit comments