Added HttpRequest

Author: amigin

my-http-server-signal-r-middleware/src/web_socket_callbacks.rs

@@ -3,6 +3,7 @@ use std::{sync::Arc, time::Duration};
 use my_http_server_core::HttpFailResult;
 use my_http_server_web_sockets::MyWebSocket;
 
+use my_http_server_web_sockets::MyWebSocketHttpRequest;
 use my_json::json_reader::JsonFirstLineIterator;
 use my_json::json_reader::JsonValueRef;
 #[cfg(feature = "with-telemetry")]
@@ -28,6 +29,7 @@ impl<TCtx: Send + Sync + Default + 'static> my_http_server_web_sockets::MyWebSoc
     async fn connected(
         &self,
         my_web_socket: Arc<MyWebSocket>,
+        _request: MyWebSocketHttpRequest,
         disconnect_timeout: Duration,
     ) -> Result<(), HttpFailResult> {
         #[cfg(feature = "debug-ws")]

my-http-server-socket-io-middleware/src/web_socket_callbacks.rs

@@ -2,7 +2,7 @@ use std::{sync::Arc, time::Duration};
 
 use hyper_tungstenite::tungstenite::Message;
 use my_http_server_core::*;
-use my_http_server_web_sockets::MyWebSocket;
+use my_http_server_web_sockets::{MyWebSocket, MyWebSocketHttpRequest};
 
 use socket_io_utils::{SocketIoContract, SocketIoMessage, SocketIoSettings};
 
@@ -130,6 +130,7 @@ impl my_http_server_web_sockets::MyWebSocketCallback for WebSocketCallbacks {
     async fn connected(
         &self,
         my_web_socket: Arc<MyWebSocket>,
+        _request: MyWebSocketHttpRequest,
         _disconnect_timeout: Duration,
     ) -> Result<(), HttpFailResult> {
         #[cfg(feature = "debug-ws")]

my-http-server-web-sockets/src/lib.rs

@@ -4,7 +4,9 @@ mod my_web_socket_callback;
 pub use helpers::handle_web_socket_upgrade;
 pub use my_web_socket::*;
 pub use my_web_socket_callback::*;
+mod my_web_socket_http_request;
 mod my_websocket_middleware;
 mod web_sockets_upgrade;
+pub use my_web_socket_http_request::*;
 pub use my_websocket_middleware::*;
 pub type WsMessage = hyper_tungstenite::tungstenite::Message;

my-http-server-web-sockets/src/my_web_socket_callback.rs

@@ -2,7 +2,7 @@ use std::{sync::Arc, time::Duration};
 
 use my_http_server_core::HttpFailResult;
 
-use crate::WsMessage;
+use crate::{MyWebSocketHttpRequest, WsMessage};
 
 use super::MyWebSocket;
 
@@ -11,6 +11,7 @@ pub trait MyWebSocketCallback {
     async fn connected(
         &self,
         my_web_socket: Arc<MyWebSocket>,
+        http_request: MyWebSocketHttpRequest,
         disconnect_timeout: Duration,
     ) -> Result<(), HttpFailResult>;
     async fn disconnected(&self, my_web_socket: &MyWebSocket);

my-http-server-web-sockets/src/my_web_socket_http_request.rs

@@ -0,0 +1,36 @@
+use hyper::{header::*, *};
+use hyper_tungstenite::tungstenite::http::Extensions;
+
+pub struct MyWebSocketHttpRequest {
+    uri: Uri,
+    headers: HeaderMap<HeaderValue>,
+    version: Version,
+    extensions: Extensions,
+}
+
+impl<'s> MyWebSocketHttpRequest {
+    pub fn new(req: &Request<hyper::body::Incoming>) -> Self {
+        Self {
+            uri: req.uri().clone(),
+            headers: req.headers().clone(),
+            version: req.version(),
+            extensions: req.extensions().clone(),
+        }
+    }
+
+    pub fn get_uri(&self) -> &Uri {
+        &self.uri
+    }
+
+    pub fn get_headers(&self) -> &HeaderMap<HeaderValue> {
+        &self.headers
+    }
+
+    pub fn get_http_version(&self) -> Version {
+        self.version
+    }
+
+    pub fn get_extensions(&self) -> &Extensions {
+        &self.extensions
+    }
+}

my-http-server-web-sockets/src/web_sockets_upgrade.rs

@@ -9,7 +9,7 @@ use hyper_tungstenite::tungstenite::Message;
 use hyper_tungstenite::HyperWebsocketStream;
 use rust_extensions::Logger;
 
-use crate::{MyWebSocket, MyWebSocketCallback};
+use crate::{MyWebSocket, MyWebSocketCallback, MyWebSocketHttpRequest};
 
 type Error = Box<dyn std::error::Error + Send + Sync + 'static>;
 
@@ -24,6 +24,7 @@ pub async fn upgrade<TMyWebSocketCallback: MyWebSocketCallback + Send + Sync + '
     disconnect_timeout: Duration,
     logs: Arc<dyn Logger + Send + Sync + 'static>,
 ) -> Result<MyHttpResponse, Error> {
+    let http_request = MyWebSocketHttpRequest::new(&req);
     let (response, websocket) = hyper_tungstenite::upgrade(req, None)?;
 
     tokio::spawn(async move {
@@ -39,7 +40,7 @@ pub async fn upgrade<TMyWebSocketCallback: MyWebSocketCallback + Send + Sync + '
                 let my_web_socket = Arc::new(my_web_socket);
 
                 callback
-                    .connected(my_web_socket.clone(), disconnect_timeout)
+                    .connected(my_web_socket.clone(), http_request, disconnect_timeout)
                     .await
                     .unwrap();