Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2898061
D9594.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D9594.diff
View Options
diff --git a/services/tunnelbroker/src/websockets/mod.rs b/services/tunnelbroker/src/websockets/mod.rs
--- a/services/tunnelbroker/src/websockets/mod.rs
+++ b/services/tunnelbroker/src/websockets/mod.rs
@@ -1,7 +1,7 @@
pub mod session;
use crate::database::DatabaseClient;
-use crate::websockets::session::SessionError;
+use crate::websockets::session::initialize_amqp;
use crate::CONFIG;
use futures_util::stream::SplitSink;
use futures_util::StreamExt;
@@ -20,6 +20,11 @@
type BoxedError = Box<dyn std::error::Error + Send + Sync + 'static>;
+pub type ErrorWithStreamHandle<S> = (
+ session::SessionError,
+ SplitSink<WebSocketStream<S>, Message>,
+);
+
use self::session::WebsocketSession;
/// Hyper HTTP service that handles incoming HTTP and websocket connections
@@ -234,18 +239,18 @@
frame: Message,
db_client: DatabaseClient,
amqp_channel: lapin::Channel,
-) -> Result<WebsocketSession<S>, session::SessionError> {
- let session = session::WebsocketSession::from_frame(
- outgoing,
- db_client.clone(),
- frame,
- &amqp_channel,
- )
- .await
- .map_err(|_| {
- error!("Device failed to send valid connection request.");
- SessionError::InvalidMessage
- })?;
-
- Ok(session)
+) -> Result<WebsocketSession<S>, ErrorWithStreamHandle<S>> {
+ let initialized_session =
+ initialize_amqp(db_client.clone(), frame, &amqp_channel).await;
+
+ match initialized_session {
+ Ok((device_info, amqp_consumer)) => Ok(WebsocketSession::new(
+ outgoing,
+ db_client,
+ device_info,
+ amqp_channel,
+ amqp_consumer,
+ )),
+ Err(e) => Err((e, outgoing)),
+ }
}
diff --git a/services/tunnelbroker/src/websockets/session.rs b/services/tunnelbroker/src/websockets/session.rs
--- a/services/tunnelbroker/src/websockets/session.rs
+++ b/services/tunnelbroker/src/websockets/session.rs
@@ -142,51 +142,54 @@
Ok(())
}
+pub async fn initialize_amqp(
+ db_client: DatabaseClient,
+ frame: Message,
+ amqp_channel: &lapin::Channel,
+) -> Result<(DeviceInfo, lapin::Consumer), SessionError> {
+ let device_info = match frame {
+ Message::Text(payload) => {
+ handle_first_message_from_device(&payload).await?
+ }
+ _ => {
+ error!("Client sent wrong frame type for establishing connection");
+ return Err(SessionError::InvalidMessage);
+ }
+ };
+
+ let mut args = FieldTable::default();
+ args.insert("x-max-priority".into(), MAX_RMQ_MSG_PRIORITY.into());
+ amqp_channel
+ .queue_declare(&device_info.device_id, QueueDeclareOptions::default(), args)
+ .await?;
+
+ publish_persisted_messages(&db_client, amqp_channel, &device_info).await?;
+
+ let amqp_consumer = amqp_channel
+ .basic_consume(
+ &device_info.device_id,
+ RMQ_CONSUMER_TAG,
+ BasicConsumeOptions::default(),
+ FieldTable::default(),
+ )
+ .await?;
+ Ok((device_info, amqp_consumer))
+}
impl<S: AsyncRead + AsyncWrite + Unpin> WebsocketSession<S> {
- pub async fn from_frame(
+ pub fn new(
tx: SplitSink<WebSocketStream<S>, Message>,
db_client: DatabaseClient,
- frame: Message,
- amqp_channel: &lapin::Channel,
- ) -> Result<WebsocketSession<S>, SessionError> {
- let device_info = match frame {
- Message::Text(payload) => {
- handle_first_message_from_device(&payload).await?
- }
- _ => {
- error!("Client sent wrong frame type for establishing connection");
- return Err(SessionError::InvalidMessage);
- }
- };
-
- let mut args = FieldTable::default();
- args.insert("x-max-priority".into(), MAX_RMQ_MSG_PRIORITY.into());
- amqp_channel
- .queue_declare(
- &device_info.device_id,
- QueueDeclareOptions::default(),
- args,
- )
- .await?;
-
- publish_persisted_messages(&db_client, amqp_channel, &device_info).await?;
-
- let amqp_consumer = amqp_channel
- .basic_consume(
- &device_info.device_id,
- RMQ_CONSUMER_TAG,
- BasicConsumeOptions::default(),
- FieldTable::default(),
- )
- .await?;
-
- Ok(WebsocketSession {
+ device_info: DeviceInfo,
+ amqp_channel: lapin::Channel,
+ amqp_consumer: lapin::Consumer,
+ ) -> Self {
+ Self {
tx,
db_client,
device_info,
- amqp_channel: amqp_channel.clone(),
+ amqp_channel,
amqp_consumer,
- })
+ }
}
pub async fn handle_message_to_device(
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Oct 6, 1:33 AM (20 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2247251
Default Alt Text
D9594.diff (4 KB)
Attached To
Mode
D9594: [Tunnelbroker] refactor initializing session to make it possible to send a response to the client on session creation failure
Attached
Detach File
Event Timeline
Log In to Comment