# HG changeset patch
# User StephaneLenclud
# Date 1475672529 -7200
# Node ID 5dcd226539d4b597c34b58a683c895a108573c13
# Parent  8e32e51a2edd5c20c607152eed289a7be08f981d
Published v1.3.4.0
Harmony connection retries.

diff -r 8e32e51a2edd -r 5dcd226539d4 Server/FormMain.Designer.cs
--- a/Server/FormMain.Designer.cs	Wed Sep 28 22:31:27 2016 +0200
+++ b/Server/FormMain.Designer.cs	Wed Oct 05 15:02:09 2016 +0200
@@ -44,7 +44,7 @@
             this.marqueeLabelTop = new SharpDisplayManager.MarqueeLabel();
             this.marqueeLabelBottom = new SharpDisplayManager.MarqueeLabel();
             this.fontDialog = new System.Windows.Forms.FontDialog();
-            this.timer = new System.Windows.Forms.Timer(this.components);
+            this.iTimerDisplay = new System.Windows.Forms.Timer(this.components);
             this.statusStrip = new System.Windows.Forms.StatusStrip();
             this.toolStripStatusLabelConnect = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabelSpring = new System.Windows.Forms.ToolStripStatusLabel();
@@ -227,10 +227,10 @@
             this.marqueeLabelBottom.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.marqueeLabelBottom.UseCompatibleTextRendering = true;
             // 
-            // timer
+            // iTimerDisplay
             // 
-            this.timer.Interval = 50;
-            this.timer.Tick += new System.EventHandler(this.timer_Tick);
+            this.iTimerDisplay.Interval = 50;
+            this.iTimerDisplay.Tick += new System.EventHandler(this.timer_Tick);
             // 
             // statusStrip
             // 
@@ -1352,7 +1352,7 @@
         #endregion
 
         private System.Windows.Forms.FontDialog fontDialog;
-        private System.Windows.Forms.Timer timer;
+        private System.Windows.Forms.Timer iTimerDisplay;
         private System.Windows.Forms.StatusStrip statusStrip;
         private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelConnect;
         private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelFps;
diff -r 8e32e51a2edd -r 5dcd226539d4 Server/FormMain.cs
--- a/Server/FormMain.cs	Wed Sep 28 22:31:27 2016 +0200
+++ b/Server/FormMain.cs	Wed Oct 05 15:02:09 2016 +0200
@@ -1033,7 +1033,12 @@
 
         }
 
-        //This is our timer tick responsible to perform our render
+        /// <summary>
+        /// This is our timer tick responsible to perform our render
+        /// TODO: Use a threading timer instead of a Windows form timer.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void timer_Tick(object sender, EventArgs e)
         {
             //Update our animations
@@ -1095,7 +1100,7 @@
 
             //Compute instant FPS
             toolStripStatusLabelFps.Text = (1.0/NewTickTime.Subtract(LastTickTime).TotalSeconds).ToString("F0") + " / " +
-                                           (1000/timer.Interval).ToString() + " FPS";
+                                           (1000/iTimerDisplay.Interval).ToString() + " FPS";
 
             LastTickTime = NewTickTime;
 
@@ -1257,7 +1262,7 @@
             maskedTextBoxMinFontSize.Text = cds.MinFontSize.ToString();
             maskedTextBoxScrollingSpeed.Text = cds.ScrollingSpeedInPixelsPerSecond.ToString();
             comboBoxDisplayType.SelectedIndex = cds.DisplayType;
-            timer.Interval = cds.TimerInterval;
+            iTimerDisplay.Interval = cds.TimerInterval;
             maskedTextBoxTimerInterval.Text = cds.TimerInterval.ToString();
             textBoxScrollLoopSeparator.Text = cds.Separator;
             //
@@ -1563,27 +1568,27 @@
         private void StartTimer()
         {
             LastTickTime = DateTime.Now; //Reset timer to prevent jump
-            timer.Enabled = true;
+            iTimerDisplay.Enabled = true;
             UpdateSuspendButton();
         }
 
         private void StopTimer()
         {
             LastTickTime = DateTime.Now; //Reset timer to prevent jump
-            timer.Enabled = false;
+            iTimerDisplay.Enabled = false;
             UpdateSuspendButton();
         }
 
         private void ToggleTimer()
         {
             LastTickTime = DateTime.Now; //Reset timer to prevent jump
-            timer.Enabled = !timer.Enabled;
+            iTimerDisplay.Enabled = !iTimerDisplay.Enabled;
             UpdateSuspendButton();
         }
 
         private void UpdateSuspendButton()
         {
-            if (!timer.Enabled)
+            if (!iTimerDisplay.Enabled)
             {
                 buttonSuspend.Text = "Run";
             }
@@ -2301,8 +2306,8 @@
 
                 if (interval > 0)
                 {
-                    timer.Interval = interval;
-                    cds.TimerInterval = timer.Interval;
+                    iTimerDisplay.Interval = interval;
+                    cds.TimerInterval = iTimerDisplay.Interval;
                     Properties.Settings.Default.Save();
                 }
             }
@@ -3062,6 +3067,11 @@
 #pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
         }
 
+
+
+        int iHarmonyReconnectTries = 0;
+        const int KHarmonyMaxReconnectTries = 10;
+
         /// <summary>
         /// 
         /// </summary>
@@ -3073,9 +3083,12 @@
                 await Program.HarmonyClient.CloseAsync();
             }
 
+            bool success = false;
+
             //Reset Harmony client & config
             Program.HarmonyClient = null;
             Program.HarmonyConfig = null;
+            iTreeViewHarmony.Nodes.Clear();
 
             Trace.WriteLine("Harmony: Connecting... ");
             //First create our client and login
@@ -3087,13 +3100,17 @@
             if (!string.IsNullOrEmpty(authToken) && !aForceAuth)
             {
                 Trace.WriteLine("Harmony: Reusing token: {0}", authToken);
-                await Program.HarmonyClient.TryOpenAsync(authToken);
+                success = await Program.HarmonyClient.TryOpenAsync(authToken);
             }
 
-            if (!Program.HarmonyClient.IsReady)
+            if (!Program.HarmonyClient.IsReady || !success 
+                // Only first failure triggers new Harmony server AUTH
+                // That's to avoid calling upon Logitech servers too often
+                && iHarmonyReconnectTries == 0 )
             {
                 //We failed to connect using our token
                 //Delete it then
+                Trace.WriteLine("Harmony: Reseting authentication token!");
                 Properties.Settings.Default.LogitechAuthToken = "";
                 Properties.Settings.Default.Save();
 
@@ -3105,18 +3122,65 @@
                 }
 
                 Trace.WriteLine("Harmony: Authenticating with Logitech servers...");
-                await Program.HarmonyClient.TryOpenAsync(iTextBoxLogitechUserName.Text, iTextBoxLogitechPassword.Text);
+                success = await Program.HarmonyClient.TryOpenAsync(iTextBoxLogitechUserName.Text, iTextBoxLogitechPassword.Text);
                 //Persist our authentication token in our setting
-                Properties.Settings.Default.LogitechAuthToken = Program.HarmonyClient.Token;
-                Properties.Settings.Default.Save();
+                if (success)
+                {
+                    Trace.WriteLine("Harmony: Saving authentication token.");
+                    Properties.Settings.Default.LogitechAuthToken = Program.HarmonyClient.Token;
+                    Properties.Settings.Default.Save();
+                }
             }
-
-            //Fetch our config
-            Program.HarmonyConfig = await Program.HarmonyClient.GetConfigAsync();
-            PopulateTreeViewHarmony(Program.HarmonyConfig);
-
-            //Make sure harmony command actions are showing device name instead of device id
-            PopulateTreeViewEvents(CurrentEarObject());
+           
+            // I've seen this failing with "Policy lookup failed on server".
+            Program.HarmonyConfig = await Program.HarmonyClient.TryGetConfigAsync();
+            if (Program.HarmonyConfig == null)
+            {
+                success = false;
+            }
+            else
+            {
+                // So we now have our Harmony Configuration
+                PopulateTreeViewHarmony(Program.HarmonyConfig);
+                // Make sure harmony command actions are showing device name instead of device id
+                PopulateTreeViewEvents(CurrentEarObject());
+            }
+
+            // TODO: Consider putting the retry logic one level higher in ResetHarmonyAsync
+            if (!success)
+            {
+                // See if we need to keep trying 
+                if (iHarmonyReconnectTries < KHarmonyMaxReconnectTries)
+                {
+                    iHarmonyReconnectTries++;
+                    Trace.WriteLine("Harmony: Failed to connect, try again: " + iHarmonyReconnectTries);
+                    await ConnectHarmonyAsync();
+                }
+                else
+                {
+                    Trace.WriteLine("Harmony: Failed to connect, giving up!");
+                    iHarmonyReconnectTries = 0;
+                    // TODO: Could use a data member as timer rather than a new instance.
+                    // Try that again in 5 minutes then.
+                    // Using Windows Form timer to make sure we run in the UI thread.
+                    System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
+                    timer.Tick += async delegate (object sender, EventArgs e)
+                    {
+                        // Stop our timer first as we won't need it anymore
+                        (sender as System.Windows.Forms.Timer).Stop();
+                        // Then try to connect again
+                        await ConnectHarmonyAsync();
+                    };
+                    timer.Interval = 300000;
+                    timer.Start();
+                }
+            }
+            else
+            {
+                // We are connected with a valid Harmony Configuration
+                // Reset our tries counter then    
+                iHarmonyReconnectTries = 0;
+            }
         }
 
         /// <summary>
diff -r 8e32e51a2edd -r 5dcd226539d4 Server/FormMain.resx
--- a/Server/FormMain.resx	Wed Sep 28 22:31:27 2016 +0200
+++ b/Server/FormMain.resx	Wed Oct 05 15:02:09 2016 +0200
@@ -120,7 +120,7 @@
   <metadata name="fontDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="iTimerDisplay.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>126, 17</value>
   </metadata>
   <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff -r 8e32e51a2edd -r 5dcd226539d4 Server/SharpDisplayManager.csproj
--- a/Server/SharpDisplayManager.csproj	Wed Sep 28 22:31:27 2016 +0200
+++ b/Server/SharpDisplayManager.csproj	Wed Oct 05 15:02:09 2016 +0200
@@ -34,7 +34,7 @@
     <WebPage>index.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.3.2.0</ApplicationVersion>
+    <ApplicationVersion>1.3.4.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -112,7 +112,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="HarmonyHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpLibHarmony.0.6.3\lib\net451\HarmonyHub.dll</HintPath>
+      <HintPath>..\packages\SharpLibHarmony.0.6.5\lib\net451\HarmonyHub.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="LibCecSharp, Version=2.2.0.0, Culture=neutral, processorArchitecture=x86">
diff -r 8e32e51a2edd -r 5dcd226539d4 Server/packages.config
--- a/Server/packages.config	Wed Sep 28 22:31:27 2016 +0200
+++ b/Server/packages.config	Wed Oct 05 15:02:09 2016 +0200
@@ -4,7 +4,7 @@
   <package id="Loamen.agsXMPP" version="1.3.1" targetFramework="net46" />
   <package id="NAudio" version="1.7.3" targetFramework="net45" />
   <package id="SharpLibDisplay" version="0.2.6" targetFramework="net46" />
-  <package id="SharpLibHarmony" version="0.6.3" targetFramework="net46" />
+  <package id="SharpLibHarmony" version="0.6.5" targetFramework="net46" />
   <package id="SharpLibHid" version="1.4.2" targetFramework="net46" />
   <package id="SharpLibNotification" version="0.0.1" targetFramework="net46" />
   <package id="SharpLibWin32" version="0.0.9" targetFramework="net46" />