better connection handling

schmic · Dec 11, 2023 · 1267e6e · 1267e6e
1 parent 218dd47
commit 1267e6e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 11 deletions.
diff --git a/HaPlugin/HaConfig.cs b/HaPlugin/HaConfig.cs
@@ -5,17 +5,17 @@
 
     public class HaConfig
     {
-        public String Url { private get; set; }
+        public String Url { get; set; }
 
-        public Uri Uri
+        public String ApiUrl
         {
             get
             {
                 var builder = new UriBuilder(this.Url.Replace("http", "ws"))
-                { 
+                {
                     Path = "/api/websocket",
                 };
-                return builder.Uri;
+                return builder.Uri.ToString();
             }
         }
 

diff --git a/HaPlugin/HaPlugin.cs b/HaPlugin/HaPlugin.cs
@@ -2,6 +2,7 @@ namespace Loupedeck.HomeAssistant
 {
     using System;
     using System.Collections.Generic;
+    using System.Security.Authentication;
 
     using Loupedeck.HomeAssistant.Events;
     using Loupedeck.HomeAssistant.Json;
@@ -36,9 +37,19 @@ public override void Load()
                 this.OnPluginStatusChanged(Loupedeck.PluginStatus.Error, "Configuration could not be read.", "https://github.com/schmic/Loupedeck-HomeAssistant", "Help");
                 return;
             }
+            else if (Config.Token.IsNullOrEmpty())
+            {
+                this.OnPluginStatusChanged(Loupedeck.PluginStatus.Error, "Configuration is missing token.", "https://github.com/schmic/Loupedeck-HomeAssistant", "Help");
+                return;
+            }
+            else if (Config.Url.IsNullOrEmpty())
+            {
+                this.OnPluginStatusChanged(Loupedeck.PluginStatus.Error, "Configuration is missing url.", "https://github.com/schmic/Loupedeck-HomeAssistant", "Help");
+                return;
+            }
 
             this.Token = Config.Token;
-            this.SetupWebsocket(Config.Uri.ToString());
+            this.SetupWebsocket(Config.ApiUrl);
         }
 
         public override void Unload() => this.WebSocket.Close();
@@ -57,16 +68,27 @@ private enum Events : Int32
 
         private void SetupWebsocket(String url)
         {
-            PluginLog.Verbose($"SetupWebsocket(): [url: {url}]");
+            PluginLog.Verbose($"SetupWebsocket(): [url: {url}] [token: {this.Token.Substring(0, 16)}...]");
             this.WebSocket = new WebSocket(url);
-            this.WebSocket.Log.Level = LogLevel.Info;
-            this.WebSocket.SslConfiguration.EnabledSslProtocols = System.Security.Authentication.SslProtocols.Tls12;
-            this.WebSocket.SslConfiguration.ServerCertificateValidationCallback = null;
+            this.WebSocket.Log.Level = LogLevel.Trace;
+
+            if (url.StartsWith("wss://"))
+            {
+                this.WebSocket.SslConfiguration.EnabledSslProtocols = SslProtocols.None;
+                this.WebSocket.SslConfiguration.ServerCertificateValidationCallback = null;
+            }
 
             this.WebSocket.OnError += this.OnErrorHdl;
             this.WebSocket.OnMessage += this.OnMessageHdl;
 
-            this.WebSocket.Connect();
+            try
+            {
+                this.WebSocket.Connect();
+            }
+            catch (Exception ex)
+            {
+                PluginLog.Error($"### Error: {ex.Message}\n{ex.InnerException}");
+            }
         }
 
         private void OnErrorHdl(Object sender, ErrorEventArgs e) => PluginLog.Error($"### Error: {e.Message}\n{e.Exception}");

diff --git a/package.ps1 b/package.ps1
@@ -1 +1 @@
-LoupedeckPluginTool.exe pack -input=".\HaPlugin\bin\" -output="..\HomeAssistant-0.3.lplug4"
+LoupedeckPluginTool.exe pack -input=".\HaPlugin\bin\" -output="..\HomeAssistant-0.4.lplug4"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		LoupedeckPluginTool.exe pack -input=".\HaPlugin\bin\" -output="..\HomeAssistant-0.3.lplug4"
		LoupedeckPluginTool.exe pack -input=".\HaPlugin\bin\" -output="..\HomeAssistant-0.4.lplug4"