@@ -4,9 +4,9 @@ use std::{
44 collections:: { HashMap , HashSet } ,
55 net:: SocketAddr ,
66 path:: PathBuf ,
7- sync:: { Arc , RwLock } ,
7+ sync:: { Arc , Mutex , RwLock } ,
88 thread:: { JoinHandle , sleep} ,
9- time:: Duration ,
9+ time:: { Duration , Instant } ,
1010} ;
1111
1212use agave_geyser_plugin_interface:: geyser_plugin_interface:: {
@@ -19,7 +19,9 @@ use itertools::Itertools;
1919use jsonrpc_core:: MetaIoHandler ;
2020use jsonrpc_http_server:: { DomainsValidation , ServerBuilder } ;
2121use jsonrpc_pubsub:: { PubSubHandler , Session } ;
22- use jsonrpc_ws_server:: { RequestContext , ServerBuilder as WsServerBuilder } ;
22+ use jsonrpc_ws_server:: {
23+ RequestContext , ServerBuilder as WsServerBuilder , SessionId , SessionStats , ws:: CloseCode ,
24+ } ;
2325use libloading:: { Library , Symbol } ;
2426use serde:: Serialize ;
2527use solana_commitment_config:: CommitmentConfig ;
@@ -998,19 +1000,57 @@ impl RpcServer for jsonrpc_http_server::Server {
9981000/// contexts, where they panic.
9991001struct WsServerWithRuntime {
10001002 server : jsonrpc_ws_server:: Server ,
1003+ sessions : WsSessions ,
10011004 _runtime : tokio:: runtime:: Runtime ,
10021005}
10031006
10041007impl RpcServer for WsServerWithRuntime {
1005- type CloseHandle = jsonrpc_ws_server :: CloseHandle ;
1008+ type CloseHandle = WsCloseHandle ;
10061009 fn close_handle ( & self ) -> Self :: CloseHandle {
1007- self . server . close_handle ( )
1010+ WsCloseHandle {
1011+ server : self . server . close_handle ( ) ,
1012+ sessions : self . sessions . clone ( ) ,
1013+ }
10081014 }
10091015 fn wait ( self ) -> Result < ( ) , String > {
10101016 self . server . wait ( ) . map_err ( |e| format ! ( "{:?}" , e) )
10111017 }
10121018}
10131019
1020+ const WS_CLOSE_GRACE : Duration = Duration :: from_secs ( 1 ) ;
1021+
1022+ type WsSessionCloser = Arc < dyn Fn ( ) + Send + Sync > ;
1023+
1024+ #[ derive( Clone , Default ) ]
1025+ struct WsSessions ( Arc < Mutex < HashMap < SessionId , WsSessionCloser > > > ) ;
1026+
1027+ impl SessionStats for WsSessions {
1028+ fn open_session ( & self , _id : SessionId ) { }
1029+ fn close_session ( & self , id : SessionId ) {
1030+ self . 0 . lock ( ) . unwrap ( ) . remove ( & id) ;
1031+ }
1032+ }
1033+
1034+ /// parity-ws drops its queued close frames on shutdown, so each session is closed first.
1035+ struct WsCloseHandle {
1036+ server : jsonrpc_ws_server:: CloseHandle ,
1037+ sessions : WsSessions ,
1038+ }
1039+
1040+ impl WsCloseHandle {
1041+ fn close ( self ) {
1042+ let closers: Vec < _ > = self . sessions . 0 . lock ( ) . unwrap ( ) . values ( ) . cloned ( ) . collect ( ) ;
1043+ for close_session in closers {
1044+ close_session ( ) ;
1045+ }
1046+ let deadline = Instant :: now ( ) + WS_CLOSE_GRACE ;
1047+ while !self . sessions . 0 . lock ( ) . unwrap ( ) . is_empty ( ) && Instant :: now ( ) < deadline {
1048+ sleep ( Duration :: from_millis ( 10 ) ) ;
1049+ }
1050+ self . server . close ( ) ;
1051+ }
1052+ }
1053+
10141054/// Runs one RPC server on a dedicated thread and reports how startup
10151055/// went: the close handle on success, the error on failure. On failure
10161056/// the error is published on the handshake channel first and the aborted
@@ -1159,7 +1199,7 @@ fn start_ws_rpc_server_runloop(
11591199 config : & SurfpoolConfig ,
11601200 middleware : SurfpoolMiddleware ,
11611201 simnet_events_tx : SimnetEventsTx ,
1162- ) -> Result < ( JoinHandle < ( ) > , jsonrpc_ws_server :: CloseHandle ) , String > {
1202+ ) -> Result < ( JoinHandle < ( ) > , WsCloseHandle ) , String > {
11631203 let ws_server_bind: SocketAddr = config
11641204 . rpc
11651205 . get_ws_base_url ( )
@@ -1192,8 +1232,17 @@ fn start_ws_rpc_server_runloop(
11921232 . to_delegate ( ) ,
11931233 ) ;
11941234
1235+ let sessions = WsSessions :: default ( ) ;
1236+ let tracked_sessions = sessions. clone ( ) ;
11951237 let server = WsServerBuilder :: new ( rpc_io)
11961238 . session_meta_extractor ( move |ctx : & RequestContext | {
1239+ let out = ctx. out . clone ( ) ;
1240+ tracked_sessions. 0 . lock ( ) . unwrap ( ) . insert (
1241+ ctx. session_id ,
1242+ Arc :: new ( move || {
1243+ let _ = out. close ( CloseCode :: Normal ) ;
1244+ } ) ,
1245+ ) ;
11971246 let runloop_context = RunloopContext {
11981247 id : None ,
11991248 svm_locker : middleware. surfnet_svm . clone ( ) ,
@@ -1215,11 +1264,13 @@ fn start_ws_rpc_server_runloop(
12151264 // shared handle removes that runtime (and its worker threads)
12161265 // entirely.
12171266 . event_loop_executor ( tokio_handle)
1267+ . session_stats ( sessions. clone ( ) )
12181268 . start ( & ws_server_bind)
12191269 . map_err ( |e| format ! ( "{:?}" , e) ) ?;
12201270
12211271 Ok ( WsServerWithRuntime {
12221272 server,
1273+ sessions,
12231274 _runtime : runtime,
12241275 } )
12251276 } )
0 commit comments