From 59558739f05fdf45baa9cdb35340b55476df3f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Monnom?= <theo.monnom@outlook.com>
Date: Tue, 20 Dec 2022 23:25:35 +0100
Subject: [PATCH] remove unused imports

---
 crates/livekit-core/src/rtc_engine/mod.rs     | 23 ++++++-------------
 .../src/rtc_engine/rtc_session.rs             | 23 +++++++++----------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/crates/livekit-core/src/rtc_engine/mod.rs b/crates/livekit-core/src/rtc_engine/mod.rs
index 695ad59..6819173 100644
--- a/crates/livekit-core/src/rtc_engine/mod.rs
+++ b/crates/livekit-core/src/rtc_engine/mod.rs
@@ -4,29 +4,19 @@ use livekit_webrtc::media_stream::MediaStream;
 use livekit_webrtc::rtc_error::RTCError;
 use livekit_webrtc::rtp_receiver::RtpReceiver;
 use parking_lot::{Mutex, RwLock};
-use std::sync::atomic::{AtomicBool, AtomicU8, Ordering};
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 use thiserror::Error;
 use tokio::task::JoinHandle;
-use tokio_tungstenite::tungstenite::Error;
 
 use lazy_static::lazy_static;
-use prost::Message;
-use tokio::sync::{mpsc, oneshot, Mutex as AsyncMutex, RwLock as AsyncRwLock};
-use tracing::{debug, error, info, trace, warn};
+use tokio::sync::{mpsc, oneshot};
+use tracing::{error, info, warn};
 
-use livekit_webrtc::peer_connection_factory::RTCConfiguration;
-
-use crate::proto::data_packet::Value;
-use crate::proto::{
-    data_packet, signal_request, signal_response, DataPacket, JoinResponse, ParticipantUpdate,
-    SignalTarget, TrickleRequest,
-};
+use crate::proto::{data_packet, DataPacket, JoinResponse, ParticipantUpdate};
 use crate::rtc_engine::lk_runtime::LKRuntime;
-use crate::rtc_engine::pc_transport::PCTransport;
-use crate::rtc_engine::rtc_events::{RTCEmitter, RTCEvent, RTCEvents};
-use crate::signal_client::{SignalClient, SignalError, SignalEvent, SignalEvents, SignalOptions};
+use crate::signal_client::{SignalError, SignalOptions};
 
 use self::rtc_session::{RTCSession, SessionEvent, SessionEvents};
 
@@ -305,8 +295,9 @@ impl EngineInner {
     }
 
     /// Try to recover the connection by doing a full reconnect.
-    /// It creates a new RTCSession
+    /// It recreates a new RTCSession
     async fn try_restart_connection(&self) -> EngineResult<()> {
+        self.close().await;
         Ok(())
     }
 
diff --git a/crates/livekit-core/src/rtc_engine/rtc_session.rs b/crates/livekit-core/src/rtc_engine/rtc_session.rs
index 93f24fc..f802525 100644
--- a/crates/livekit-core/src/rtc_engine/rtc_session.rs
+++ b/crates/livekit-core/src/rtc_engine/rtc_session.rs
@@ -1,22 +1,21 @@
 use livekit_webrtc::media_stream::{MediaStream, MediaStreamTrackHandle};
 use livekit_webrtc::rtp_receiver::RtpReceiver;
-use parking_lot::{Mutex, RwLock};
+use parking_lot::Mutex;
 use std::sync::atomic::{AtomicBool, AtomicU8, Ordering};
-use std::sync::{Arc, Weak};
+use std::sync::Arc;
 use std::time::Duration;
 use tokio::task::JoinHandle;
 
-use tokio::sync::{broadcast, mpsc, watch, Mutex as AsyncMutex, RwLock as AsyncRwLock};
+use tokio::sync::{mpsc, watch, Mutex as AsyncMutex};
 use tokio::time::sleep;
 
-use lazy_static::lazy_static;
 use prost::Message;
 use serde::{Deserialize, Serialize};
-use tracing::{debug, error, info, trace, warn};
+use tracing::{debug, error, trace, warn};
 
 use crate::{proto, signal_client};
-use livekit_webrtc::data_channel::{DataChannel, DataChannelInit, DataSendError, DataState};
-use livekit_webrtc::jsep::{IceCandidate, SdpParseError, SessionDescription};
+use livekit_webrtc::data_channel::{DataChannel, DataChannelInit, DataState};
+use livekit_webrtc::jsep::{IceCandidate, SessionDescription};
 use livekit_webrtc::peer_connection::{
     IceConnectionState, PeerConnectionState, RTCOfferAnswerOptions,
 };
@@ -24,15 +23,15 @@ use livekit_webrtc::peer_connection_factory::RTCConfiguration;
 
 use crate::proto::data_packet::Value;
 use crate::proto::{
-    data_packet, signal_request, signal_response, DataPacket, JoinResponse, ParticipantUpdate,
-    SignalTarget, TrickleRequest,
+    data_packet, signal_request, signal_response, DataPacket, JoinResponse, SignalTarget,
+    TrickleRequest,
 };
 use crate::rtc_engine::lk_runtime::LKRuntime;
 use crate::rtc_engine::pc_transport::PCTransport;
-use crate::rtc_engine::rtc_events::{RTCEmitter, RTCEvent, RTCEvents};
-use crate::signal_client::{SignalClient, SignalError, SignalEvent, SignalEvents, SignalOptions};
+use crate::rtc_engine::rtc_events::{RTCEvent, RTCEvents};
+use crate::signal_client::{SignalClient, SignalEvent, SignalEvents, SignalOptions};
 
-use super::{rtc_events, EngineEmitter, EngineError, EngineEvent, EngineEvents, EngineResult};
+use super::{rtc_events, EngineError, EngineResult};
 
 pub const MAX_ICE_CONNECT_TIMEOUT: Duration = Duration::from_secs(15);
 pub const LOSSY_DC_LABEL: &str = "_lossy";