Factor out connection, peer management, and packet handling into `Vid…

…eoCallClient` (#137)

* factor out connection, peer management, and packet handling code

* clean up warnings about unused variables and results

* make CameraEncoder::start() args consistent with the other encoders

* Various cleanups and clippy

* Pass VideoCallClient to encoders, remove on_packet callbacks

* keep copy of aes in outer struct so no borrow() is needed to get it

* Explicitly ensure peer before handling packet, rather than on-the-fly callback hell

With some code cleanups along the way

* Gratuitous cleanup: Better naming

* Gratuitous cleanup: error enums & DRY some code

* Gratuitous cleanup: factor out HashWithOrderedKeys

* cargo fmt

yew-ui/src/components/host.rs

@@ -1,13 +1,11 @@
+use crate::model::client::VideoCallClient;
 use gloo_timers::callback::Timeout;
 use log::debug;
-use types::protos::packet_wrapper::PacketWrapper;
 
 use std::fmt::Debug;
-use std::sync::Arc;
 use yew::prelude::*;
 
 use crate::components::device_selector::DeviceSelector;
-use crate::crypto::aes::Aes128State;
 use crate::model::encode::CameraEncoder;
 use crate::model::encode::MicrophoneEncoder;
 use crate::model::encode::ScreenEncoder;
@@ -40,31 +38,25 @@ pub struct MeetingProps {
     #[prop_or_default]
     pub id: String,
 
-    #[prop_or_default]
-    pub on_packet: Callback<PacketWrapper>,
-
-    #[prop_or_default]
-    pub email: String,
+    pub client: VideoCallClient,
 
     pub share_screen: bool,
 
     pub mic_enabled: bool,
 
     pub video_enabled: bool,
-
-    pub aes: Arc<Aes128State>,
 }
 
 impl Component for Host {
     type Message = Msg;
     type Properties = MeetingProps;
 
     fn create(ctx: &Context<Self>) -> Self {
-        let aes = ctx.props().aes.clone();
+        let client = &ctx.props().client;
         Self {
-            camera: CameraEncoder::new(aes.clone()),
-            microphone: MicrophoneEncoder::new(aes.clone()),
-            screen: ScreenEncoder::new(aes),
+            camera: CameraEncoder::new(client.clone(), VIDEO_ELEMENT_ID),
+            microphone: MicrophoneEncoder::new(client.clone()),
+            screen: ScreenEncoder::new(client.clone()),
             share_screen: ctx.props().share_screen,
             mic_enabled: ctx.props().mic_enabled,
             video_enabled: ctx.props().video_enabled,
@@ -107,10 +99,7 @@ impl Component for Host {
     fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
         match msg {
             Msg::EnableScreenShare => {
-                let on_frame = ctx.props().on_packet.clone();
-                let email = ctx.props().email.clone();
-                self.screen
-                    .start(email, move |packet: PacketWrapper| on_frame.emit(packet));
+                self.screen.start();
                 true
             }
             Msg::DisableScreenShare => {
@@ -122,10 +111,7 @@ impl Component for Host {
                 if !should_enable {
                     return true;
                 }
-                let on_audio = ctx.props().on_packet.clone();
-                let email = ctx.props().email.clone();
-                self.microphone
-                    .start(email, move |packet: PacketWrapper| on_audio.emit(packet));
+                self.microphone.start();
                 true
             }
             Msg::DisableMicrophone => {
@@ -137,13 +123,7 @@ impl Component for Host {
                     return true;
                 }
 
-                let on_packet = ctx.props().on_packet.clone();
-                let email = ctx.props().email.clone();
-                self.camera.start(
-                    email,
-                    move |packet: PacketWrapper| on_packet.emit(packet),
-                    VIDEO_ELEMENT_ID,
-                );
+                self.camera.start();
                 true
             }
             Msg::DisableVideo => {

yew-ui/src/model/client/mod.rs

@@ -0,0 +1,3 @@
+mod video_call_client;
+
+pub use video_call_client::{VideoCallClient, VideoCallClientOptions};