From 6a0ff2744f0f13a2070b53e9eff20ea9379ee350 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 15 Jan 2020 01:14:27 +0200
Subject: Working on SignalR ExternalBridge...

---
 .../Views/MachineConnectionView.xaml                   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index 581e87ed6..0ef498420 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -55,6 +55,24 @@
                     <Grid Grid.Row="1">
                         <ListBox ItemsSource="{Binding Scanner.AvailableMachines}" SelectedItem="{Binding SelectedMachine}" Margin="0 0 0 7" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" HorizontalContentAlignment="Stretch">
                             <ListBox.Resources>
+                                <DataTemplate DataType="{x:Type integration:ExternalBridgeSignalRClient}">
+                                    <DockPanel>
+                                        <StackPanel Orientation="Horizontal">
+                                            <Image Source="/Images/external-bridge-emulator.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <StackPanel Margin="10 0 0 0">
+                                                <TextBlock FontSize="11">
+                                            <Run FontWeight="Bold">S/N:</Run> <Run Text="{Binding SerialNumber,Mode=OneWay}"></Run>
+                                                </TextBlock>
+                                                <TextBlock FontSize="11">
+                                            <Run FontWeight="Bold">IP Address:</Run> <Run Text="{Binding IPAddress,Mode=OneWay}"></Run>
+                                                </TextBlock>
+                                                <TextBlock FontSize="11">
+                                            <Run FontWeight="Bold">Organization:</Run> <Run Text="{Binding Machine.Organization.Name,Mode=OneWay}"></Run>
+                                                </TextBlock>
+                                            </StackPanel>
+                                        </StackPanel>
+                                    </DockPanel>
+                                </DataTemplate>
                                 <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpClient}">
                                     <DockPanel>
                                         <StackPanel Orientation="Horizontal">
-- 
cgit v1.3.1


From 8d1933f305e8fb4aa4cc7633fa02c419d77766ff Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 15 Jan 2020 21:13:45 +0200
Subject: External bridge improvements.

---
 .../ViewModels/MachineTechViewVM.cs                |   2 +-
 .../Images/external-bridge-signalr.png             | Bin 0 -> 3238 bytes
 .../Tango.MachineStudio.UI.csproj                  |   3 +-
 .../Views/ConnectedMachineView.xaml                |  48 +++++++++++++++
 .../Views/MachineConnectionView.xaml               |   4 +-
 .../ViewModels/ExternalBridgeViewVM.cs             |   8 +--
 .../PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml |   4 +-
 .../PPC/Tango.PPC.UI/Views/MainView.xaml           |   2 +-
 .../ExternalBridge/ExternalBridgeReceiver.cs       |   2 +-
 .../ExternalBridge/ExternalBridgeScanner.cs        |  21 +++++--
 .../ExternalBridge/ExternalBridgeService.cs        |  38 ++++++++----
 .../ExternalBridge/ExternalBridgeSignalRClient.cs  |   6 +-
 .../ExternalBridge/ExternalBridgeTcpClient.cs      |  11 +++-
 .../ExternalBridge/IExternalBridgeService.cs       |  30 +++++-----
 .../Adapters/SignalRTransportAdapter.cs            |  39 ++++++++++---
 .../Tango.MachineService/Hubs/ExternalBridgeHub.cs |  65 +++++++++++++++------
 16 files changed, 212 insertions(+), 71 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-signalr.png

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 7cb680527..139d85493 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -459,7 +459,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// <param name="data">The data.</param>
         private void PopulateDiagnosticsData(StartDiagnosticsResponse data)
         {
-            if (data.Monitors == null) return;
+            if (data.Monitors == null || _machineOperator == null || _machineOperator.DeviceInformation == null) return;
 
             _diagnostics_index++;
             uint interval = _machineOperator.DeviceInformation.DiagnosticsInterval;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-signalr.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-signalr.png
new file mode 100644
index 000000000..dc9b06e72
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Images/external-bridge-signalr.png differ
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 1762205ad..565489f0b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -363,6 +363,7 @@
       <Link>TCC\template.bmp</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Resource Include="Images\external-bridge-signalr.png" />
     <Resource Include="machine_new_small.ico" />
     <Resource Include="Images\Statuses\dyeing.png" />
     <Resource Include="Images\Statuses\dyeing_Anim.gif" />
@@ -675,7 +676,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\"</PostBuildEven
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index e69ac516e..a5283f346 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -32,6 +32,10 @@
                 <StackPanel Orientation="Horizontal" Margin="10">
                     <ContentControl Content="{Binding ApplicationManager.ConnectedMachine}">
                         <ContentControl.Resources>
+                            <DataTemplate DataType="{x:Type integration:ExternalBridgeSignalRClient}">
+                                <Image Source="/Images/external-bridge-signalr.png" Width="48" Height="48" RenderOptions.BitmapScalingMode="Fant"></Image>
+                            </DataTemplate>
+
                             <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpClient}">
                                 <Image Source="/Images/external-bridge-tcp.png" Width="48" Height="48" RenderOptions.BitmapScalingMode="Fant"></Image>
                             </DataTemplate>
@@ -65,6 +69,50 @@
                 <Grid d:DataContext="{d:DesignInstance Type=integ:MachineOperator, IsDesignTimeCreatable=False}">
                     <ContentControl Content="{Binding ApplicationManager.ConnectedMachine}">
                         <ContentControl.Resources>
+
+                            <DataTemplate DataType="{x:Type integration:ExternalBridgeSignalRClient}">
+                                <controls:TableGrid RowHeight="22">
+                                    <TextBlock FontWeight="SemiBold" Text="Serial Number:" />
+                                    <TextBlock Text="{Binding SerialNumber}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Name:" />
+                                    <TextBlock Text="{Binding Machine.Name}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Organization:" />
+                                    <TextBlock Text="{Binding Machine.Organization.Name}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Total Dye Time:" />
+                                    <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.TotalMachineWorkTime}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Total Dye Meters:" />
+                                    <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.TotalMachineMeters}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" />
+                                    <TextBlock Text="{Binding DeviceInformation.Version}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Hub:" />
+                                    <TextBlock Text="{Binding IPAddress}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Total Bytes Sent:" />
+                                    <TextBlock Text="{Binding Adapter.TotalBytesSent,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Total Bytes Received:" />
+                                    <TextBlock Text="{Binding Adapter.TotalBytesReceived,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Transfer Rate:" />
+                                    <TextBlock>
+                                        <Run Text="{Binding Adapter.TransferRate,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}"></Run>
+                                        <Run Text="/ sec"></Run>
+                                    </TextBlock>
+                                    <TextBlock FontWeight="SemiBold" Text="Diagnostics Frame Rate:" />
+                                    <TextBlock>
+                                        <Run Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DiagnosticsFrameProvider.FrameRate,Mode=OneWay,IsAsync=True}"></Run>
+                                        <Run Text="/ sec"></Run>
+                                    </TextBlock>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable Diagnostics:" />
+                                    <ToggleButton IsChecked="{Binding EnableDiagnostics}" HorizontalAlignment="Left"></ToggleButton>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable Embedded Debug Logs:" />
+                                    <ToggleButton IsChecked="{Binding EnableEmbeddedDebugging}" HorizontalAlignment="Left"></ToggleButton>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable KeepAlive:" />
+                                    <ToggleButton IsChecked="{Binding UseKeepAlive}" HorizontalAlignment="Left"></ToggleButton>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable Events:" />
+                                    <ToggleButton IsChecked="{Binding EnableEventsNotification}" HorizontalAlignment="Left"></ToggleButton>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable Application Logs:" />
+                                    <ToggleButton IsChecked="{Binding EnableApplicationLogs}" HorizontalAlignment="Left"></ToggleButton>
+                                </controls:TableGrid>
+                            </DataTemplate>
+
                             <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpClient}">
                                 <controls:TableGrid RowHeight="22">
                                     <TextBlock FontWeight="SemiBold" Text="Serial Number:" />
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index 0ef498420..58ff03107 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -58,13 +58,13 @@
                                 <DataTemplate DataType="{x:Type integration:ExternalBridgeSignalRClient}">
                                     <DockPanel>
                                         <StackPanel Orientation="Horizontal">
-                                            <Image Source="/Images/external-bridge-emulator.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <Image Source="/Images/external-bridge-signalr.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image>
                                             <StackPanel Margin="10 0 0 0">
                                                 <TextBlock FontSize="11">
                                             <Run FontWeight="Bold">S/N:</Run> <Run Text="{Binding SerialNumber,Mode=OneWay}"></Run>
                                                 </TextBlock>
                                                 <TextBlock FontSize="11">
-                                            <Run FontWeight="Bold">IP Address:</Run> <Run Text="{Binding IPAddress,Mode=OneWay}"></Run>
+                                            <Run FontWeight="Bold">Hub:</Run> <Run Text="{Binding IPAddress,Mode=OneWay}"></Run>
                                                 </TextBlock>
                                                 <TextBlock FontSize="11">
                                             <Run FontWeight="Bold">Organization:</Run> <Run Text="{Binding Machine.Organization.Name,Mode=OneWay}"></Run>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
index f1127ebfe..66b982ffe 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
@@ -79,7 +79,7 @@ namespace Tango.PPC.UI.ViewModels
             LogManager.Log("Disconnecting current external bridge session.");
             _disconnecting = true;
             InvalidateRelayCommands();
-            ExternalBridgeService.DisconnectSession();
+            ExternalBridgeService.DisconnectFullControlSession();
         }
 
         #endregion
@@ -103,7 +103,7 @@ namespace Tango.PPC.UI.ViewModels
         public override void OnApplicationStarted()
         {
             ExternalBridgeService.ConnectionRequest += ExternalBridgeService_ConnectionRequest;
-            ExternalBridgeService.ClientDisconnected += ExternalBridgeService_ClientDisconnected;
+            ExternalBridgeService.FullControlSessionDisconnected += ExternalBridgeService_FullControlSessionDisconnected;
         }
 
         #endregion
@@ -111,11 +111,11 @@ namespace Tango.PPC.UI.ViewModels
         #region Event Handlers
 
         /// <summary>
-        /// Handles the <see cref="ExternalBridgeService.ClientDisconnected"/> event.
+        /// Handles the <see cref="ExternalBridgeService.FullControlSessionDisconnected"/> event.
         /// </summary>
         /// <param name="sender">The sender.</param>
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
-        private void ExternalBridgeService_ClientDisconnected(object sender, EventArgs e)
+        private void ExternalBridgeService_FullControlSessionDisconnected(object sender, EventArgs e)
         {
             if (IsVisible)
             {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml
index 4de00120f..377d1b531 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml
@@ -23,7 +23,7 @@
                     <touch:TouchIcon.Style>
                         <Style TargetType="touch:TouchIcon">
                             <Style.Triggers>
-                                <DataTrigger Binding="{Binding ExternalBridgeService.IsInSession}" Value="True">
+                                <DataTrigger Binding="{Binding ExternalBridgeService.HasSessions}" Value="True">
                                     <DataTrigger.EnterActions>
                                         <BeginStoryboard x:Name="Blink">
                                             <Storyboard>
@@ -62,7 +62,7 @@
 
                 <TextBlock FontWeight="Bold" Text="Transfer Rate:" />
                 <TextBlock>
-                                        <Run Text="{Binding ExternalBridgeService.Adapter.TransferRate,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}"></Run>
+                                        <Run Text="{Binding ExternalBridgeService.FullControlSessionReceiver.Adapter.TransferRate,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}"></Run>
                                         <Run Text="/ sec"></Run>
                 </TextBlock>
             </controls:TableGrid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
index 185a5b7ce..c6b2aaa12 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
@@ -54,7 +54,7 @@
                                 <Style TargetType="touch:TouchIcon">
                                     <Setter Property="Foreground" Value="{StaticResource TangoGrayBrush}"></Setter>
                                     <Style.Triggers>
-                                        <DataTrigger Binding="{Binding ExternalBridgeService.IsInSession}" Value="True">
+                                        <DataTrigger Binding="{Binding ExternalBridgeService.HasSessions}" Value="True">
                                             <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
                                         </DataTrigger>
                                     </Style.Triggers>
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs
index 366f1bbdb..4796072f3 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs
@@ -202,7 +202,7 @@ namespace Tango.Integration.ExternalBridge
             {
                 if (IsLoggedIn)
                 {
-                    await SendRequest<ExternalBridgeLogoutRequest, ExternalBridgeLogoutResponse>(new ExternalBridgeLogoutRequest(), TimeSpan.FromSeconds(0.5));
+                    await SendRequest<ExternalBridgeLogoutRequest, ExternalBridgeLogoutResponse>(new ExternalBridgeLogoutRequest(), TimeSpan.FromSeconds(3));
                 }
             }
             catch (Exception ex)
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
index 97f15f6b4..ff045a9e5 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
@@ -111,11 +111,24 @@ namespace Tango.Integration.ExternalBridge
                     {
                         _connection = new HubConnection(SignalRConfiguration.Address);
                         _proxy = _connection.CreateHubProxy(SignalRConfiguration.Hub);
-                        _connection.Start();
 
-                        _signalRDiscoveryThread = new Thread(SignalRDiscoveryThreadMethod);
-                        _signalRDiscoveryThread.IsBackground = true;
-                        _signalRDiscoveryThread.Start();
+                        bool signalRStarted = false;
+
+                        _connection.StateChanged += (x) => 
+                        {
+                            if (x.NewState == ConnectionState.Connected)
+                            {
+                                if (!signalRStarted)
+                                {
+                                    signalRStarted = true;
+                                    _signalRDiscoveryThread = new Thread(SignalRDiscoveryThreadMethod);
+                                    _signalRDiscoveryThread.IsBackground = true;
+                                    _signalRDiscoveryThread.Start();
+                                }
+                            }
+                        };
+
+                        _connection.Start();
                     }
                     catch (Exception ex)
                     {
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
index b4d2e4df4..fb56194e8 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
@@ -48,7 +48,7 @@ namespace Tango.Integration.ExternalBridge
         /// <summary>
         /// Occurs when the last client has been disconnected.
         /// </summary>
-        public event EventHandler ClientDisconnected;
+        public event EventHandler FullControlSessionDisconnected;
 
         /// <summary>
         /// Occurs when the service has received a new color profile request.
@@ -113,20 +113,26 @@ namespace Tango.Integration.ExternalBridge
             }
         }
 
-        private bool _isInSession;
+        private bool _hasSessions;
         /// <summary>
-        /// Gets a value indicating whether a remote client is authenticated and in session.
+        /// Gets a value indicating whether there are any connected sessions.
         /// </summary>
-        public bool IsInSession
+        public bool HasSessions
         {
-            get { return _isInSession; }
-            private set { _isInSession = value; RaisePropertyChangedAuto(); }
+            get { return _hasSessions; }
+            private set { _hasSessions = value; RaisePropertyChangedAuto(); }
         }
 
+        private ExternalBridgeReceiver _fullControlSessionReceiver;
         /// <summary>
-        /// Gets the current session login intent.
+        /// Gets the current full control session receiver.
         /// </summary>
-        public ExternalBridgeLoginIntent SessionIntent { get; private set; }
+        public ExternalBridgeReceiver FullControlSessionReceiver
+        {
+            get { return _fullControlSessionReceiver; }
+            private set { _fullControlSessionReceiver = value; RaisePropertyChangedAuto(); }
+        }
+
 
         #endregion
 
@@ -290,8 +296,12 @@ namespace Tango.Integration.ExternalBridge
 
             if (receiver.LoginIntent == ExternalBridgeLoginIntent.FullControl)
             {
-                ClientDisconnected?.Invoke(this, new EventArgs());
+                FullControlSessionDisconnected?.Invoke(this, new EventArgs());
             }
+
+            HasSessions = _receivers.Count(x => x.IsLoggedIn) > 0;
+
+            FullControlSessionReceiver = _receivers.SingleOrDefault(x => x.IsLoggedIn && x.LoginIntent == ExternalBridgeLoginIntent.FullControl);
         }
 
         private void Receiver_ColorProfileRequest(object sender, ColorProfileRequestEventArgs e)
@@ -328,6 +338,12 @@ namespace Tango.Integration.ExternalBridge
             if (args.Confirmed)
             {
                 e.Confirm(Machine, MachineOperator.DeviceInformation);
+                HasSessions = true;
+
+                if (request.Intent == ExternalBridgeLoginIntent.FullControl)
+                {
+                    FullControlSessionReceiver = sender as ExternalBridgeReceiver;
+                }
             }
             else
             {
@@ -397,7 +413,7 @@ namespace Tango.Integration.ExternalBridge
                 }
 
                 IsStarted = false;
-                IsInSession = false;
+                HasSessions = false;
                 _enabled = false;
                 RaisePropertyChanged(nameof(Enabled));
             }
@@ -406,7 +422,7 @@ namespace Tango.Integration.ExternalBridge
         /// <summary>
         /// Disconnects the current remote client session.
         /// </summary>
-        public async void DisconnectSession()
+        public async void DisconnectFullControlSession()
         {
             var sessionReceiver = _receivers.SingleOrDefault(x => x.IsLoggedIn && x.LoginIntent == ExternalBridgeLoginIntent.FullControl);
             if (sessionReceiver != null)
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeSignalRClient.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeSignalRClient.cs
index 3a26e6a25..d541f323a 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeSignalRClient.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeSignalRClient.cs
@@ -19,8 +19,12 @@ namespace Tango.Integration.ExternalBridge
         public ExternalBridgeSignalRClient(String url, String hub, String serialNumber)
         {
             SerialNumber = serialNumber;
+            IPAddress = hub;
             Machine = ObservablesStaticCollections.Instance.Machines.SingleOrDefault(x => x.SerialNumber == serialNumber);
             Adapter = new SignalRTransportAdapter(url, hub, SignalRTransportAdapter.SignalRTransportAdapterMode.CreateSession, serialNumber);
+
+            KeepAliveTimeout = TimeSpan.FromSeconds(5);
+            KeepAliveRetries = 2;
         }
 
         public override async Task Connect(ExternalBridgeLoginRequest login)
@@ -34,7 +38,7 @@ namespace Tango.Integration.ExternalBridge
                     State = TransportComponentState.Connected;
                     StartThreads();
 
-                    LogManager.Log("External Bridge TCP Client Connected...");
+                    LogManager.Log("External Bridge SignalR Client Connected...");
 
 
                     LogRequestSent(login);
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeTcpClient.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeTcpClient.cs
index 064b673bc..f050708d7 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeTcpClient.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeTcpClient.cs
@@ -245,7 +245,7 @@ namespace Tango.Integration.ExternalBridge
             {
                 await Adapter.Disconnect();
             }
-            LogManager.Log("External Bridge TCP client disconnected.");
+            LogManager.Log($"{ComponentName} disconnected.");
         }
 
         internal ExternalBridgeTcpClient()
@@ -291,7 +291,14 @@ namespace Tango.Integration.ExternalBridge
 
             if (request.Type == MessageType.ExternalBridgeLogoutRequest)
             {
-                await SendResponse<ExternalBridgeLogoutResponse>(new ExternalBridgeLogoutResponse(), request.Token);
+                try
+                {
+                    await SendResponse<ExternalBridgeLogoutResponse>(new ExternalBridgeLogoutResponse(), request.Token);
+                }
+                catch { }
+
+                await Task.Delay(2000);
+
                 try
                 {
                     State = TransportComponentState.Disconnected;
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/IExternalBridgeService.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/IExternalBridgeService.cs
index 39b2f4e07..d2b5ef750 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/IExternalBridgeService.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/IExternalBridgeService.cs
@@ -19,9 +19,9 @@ namespace Tango.Integration.ExternalBridge
         event EventHandler<ExternalBridgeClientConnectedEventArgs> ConnectionRequest;
 
         /// <summary>
-        /// Occurs when the last client has been disconnected.
+        /// Occurs when the current full control session has disconnected.
         /// </summary>
-        event EventHandler ClientDisconnected;
+        event EventHandler FullControlSessionDisconnected;
 
         /// <summary>
         /// Occurs when the service has received a new color profile request.
@@ -38,6 +38,16 @@ namespace Tango.Integration.ExternalBridge
         /// </summary>
         Machine Machine { get; set; }
 
+        /// <summary>
+        /// Gets or sets the SignalR configuration.
+        /// </summary>
+        ExternalBridgeSignalRConfiguration SignalRConfiguration { get; set; }
+
+        /// <summary>
+        /// Gets the current full control session receiver.
+        /// </summary>
+        ExternalBridgeReceiver FullControlSessionReceiver { get; }
+
         /// <summary>
         /// Gets a value indicating whether this instance is started.
         /// </summary>
@@ -49,9 +59,9 @@ namespace Tango.Integration.ExternalBridge
         bool Enabled { get; set; }
 
         /// <summary>
-        /// Gets a value indicating whether a remote client is authenticated and in session.
+        /// Gets a value indicating whether there are any connected sessions.
         /// </summary>
-        bool IsInSession { get; }
+        bool HasSessions { get; }
 
         /// <summary>
         /// Starts this instance.
@@ -66,16 +76,6 @@ namespace Tango.Integration.ExternalBridge
         /// <summary>
         /// Disconnects the current remote client session.
         /// </summary>
-        void DisconnectSession();
-
-        /// <summary>
-        /// Gets the current session login intent.
-        /// </summary>
-        ExternalBridgeLoginIntent SessionIntent { get; }
-
-        /// <summary>
-        /// Gets or sets the SignalR configuration.
-        /// </summary>
-        ExternalBridgeSignalRConfiguration SignalRConfiguration { get; set; }
+        void DisconnectFullControlSession();
     }
 }
diff --git a/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs b/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs
index 6e1f60232..2324e140c 100644
--- a/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs
+++ b/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs
@@ -96,18 +96,34 @@ namespace Tango.Transport.Adapters
         {
             if (State != TransportComponentState.Connected)
             {
+                bool completed = false;
+
                 TaskCompletionSource<object> completionSource = new TaskCompletionSource<object>();
 
                 _connection = new HubConnection(Address);
                 _proxy = _connection.CreateHubProxy(Hub);
 
+                Core.Threading.TimeoutTask.StartNew(() => 
+                {
+                    if (!completed)
+                    {
+                        completed = true;
+                        completionSource.SetException(new TimeoutException("Could not connect the SignalR adapter."));
+                    }
+
+                }, TimeSpan.FromSeconds(5));
+
                 if (Mode == SignalRTransportAdapterMode.CreateSession)
                 {
                     _proxy.On("SessionCreated", () =>
                     {
-                        State = TransportComponentState.Connected;
-                        _pushThread.Start();
-                        completionSource.SetResult(true);
+                        if (!completed)
+                        {
+                            completed = true;
+                            State = TransportComponentState.Connected;
+                            _pushThread.Start();
+                            completionSource.SetResult(true);
+                        }
                     });
                 }
 
@@ -126,9 +142,13 @@ namespace Tango.Transport.Adapters
 
                         if (Mode == SignalRTransportAdapterMode.JoinSession)
                         {
-                            State = TransportComponentState.Connected;
-                            _pushThread.Start();
-                            completionSource.SetResult(true);
+                            if (!completed)
+                            {
+                                completed = true;
+                                State = TransportComponentState.Connected;
+                                _pushThread.Start();
+                                completionSource.SetResult(true);
+                            }
                         }
                     }
                 };
@@ -153,8 +173,11 @@ namespace Tango.Transport.Adapters
         {
             return Task.Factory.StartNew(() =>
             {
-                _connection.Stop();
-                _connection.Dispose();
+                Core.Threading.TimeoutTask.StartNew(() => 
+                {
+                    _connection.Stop();
+                    _connection.Dispose();
+                },TimeSpan.FromSeconds(5));
                 State = TransportComponentState.Disconnected;
             });
         }
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Hubs/ExternalBridgeHub.cs b/Software/Visual_Studio/Web/Tango.MachineService/Hubs/ExternalBridgeHub.cs
index d5ce0d145..a09cd7954 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Hubs/ExternalBridgeHub.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Hubs/ExternalBridgeHub.cs
@@ -41,6 +41,8 @@ namespace Tango.MachineService.Hubs
         public void RegisterMachine(MachineInfo machineInfo)
         {
             _externalBridges.RemoveAll(x => x.MachineInfo.SerialNumber == machineInfo.SerialNumber);
+            _sessions.RemoveAll(x => x.ExternalBridge.ConnectionID == Context.ConnectionId);
+
             _externalBridges.Add(new ExternalBridgeInfo()
             {
                 MachineInfo = machineInfo,
@@ -51,6 +53,7 @@ namespace Tango.MachineService.Hubs
         public void UnregisterMachine()
         {
             _externalBridges.RemoveAll(x => x.ConnectionID == Context.ConnectionId);
+            _sessions.RemoveAll(x => x.ExternalBridge.ConnectionID == Context.ConnectionId);
         }
 
         public List<MachineInfo> GetAvailableMachines()
@@ -64,6 +67,13 @@ namespace Tango.MachineService.Hubs
             
             if (externalBridge != null)
             {
+                var existingSession = GetSession();
+
+                if (existingSession != null)
+                {
+                    _sessions.Remove(existingSession);
+                }
+
                 MachineSession session = new MachineSession();
                 session.ControllerConnectionID = Context.ConnectionId;
                 session.ExternalBridge = externalBridge;
@@ -75,16 +85,6 @@ namespace Tango.MachineService.Hubs
             return null;
         }
 
-        //public void NotifySessionCreated()
-        //{
-        //    var session = _sessions.SingleOrDefault(x => x.ReceiverConnectionID == Context.ConnectionId);
-
-        //    if (session != null)
-        //    {
-        //        Clients.Client(session.ControllerConnectionID).SessionCreated();
-        //    }
-        //}
-
         public void JoinSession(String sessionID)
         {
             var session = _sessions.SingleOrDefault(x => x.SessionID == sessionID);
@@ -98,7 +98,41 @@ namespace Tango.MachineService.Hubs
 
         public void Write(List<byte[]> dataCollection)
         {
-            var session = _sessions.SingleOrDefault(x => x.ReceiverConnectionID == Context.ConnectionId || x.ControllerConnectionID == Context.ConnectionId);
+            var connectionID = GetOtherSideConnectionID();
+
+            if (connectionID != null)
+            {
+                Clients.Client(connectionID).DataAvailable(dataCollection);
+            }
+        }
+
+        public void LeaveSession()
+        {
+            var connectionID = GetOtherSideConnectionID();
+            ClearSession();
+            Clients.Client(connectionID).OnSessionClosed();
+        }
+
+        public override Task OnDisconnected(bool stopCalled)
+        {
+            _externalBridges.RemoveAll(x => x.ConnectionID == Context.ConnectionId);
+            _sessions.RemoveAll(x => x.ControllerConnectionID == Context.ConnectionId || x.ReceiverConnectionID == Context.ConnectionId || x.ExternalBridge.ConnectionID == Context.ConnectionId);
+            return base.OnDisconnected(stopCalled);
+        }
+
+        private void ClearSession()
+        {
+            _sessions.RemoveAll(x => x.ControllerConnectionID == Context.ConnectionId || x.ReceiverConnectionID == Context.ConnectionId);
+        }
+
+        private MachineSession GetSession()
+        {
+            return _sessions.SingleOrDefault(x => x.ReceiverConnectionID == Context.ConnectionId || x.ControllerConnectionID == Context.ConnectionId);
+        }
+
+        private String GetOtherSideConnectionID()
+        {
+            var session = GetSession();
 
             if (session != null)
             {
@@ -113,15 +147,10 @@ namespace Tango.MachineService.Hubs
                     connectionID = session.ReceiverConnectionID;
                 }
 
-                Clients.Client(connectionID).DataAvailable(dataCollection);
+                return connectionID;
             }
-        }
 
-        public override Task OnDisconnected(bool stopCalled)
-        {
-            _externalBridges.RemoveAll(x => x.ConnectionID == Context.ConnectionId);
-            _sessions.RemoveAll(x => x.ControllerConnectionID == Context.ConnectionId || x.ReceiverConnectionID == Context.ConnectionId);
-            return base.OnDisconnected(stopCalled);
+            return null;
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.3.1