Merge pull request #63 from qJake/project-updates

1.0.5: Websocket connection fix
qJake · Feb 8, 2020 · 4ca147d · 4ca147d
2 parents e53600b + 300c6aa
commit 4ca147d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Docker/BuildHaccContainers.ps1 b/Docker/BuildHaccContainers.ps1
@@ -1,4 +1,4 @@
-$version = '1.0.4'
+$version = '1.0.5'
 
 function Test-ExitCode ([int] $Expected = 0)
 {

diff --git a/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj b/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj
@@ -5,8 +5,8 @@
     <RuntimeIdentifiers>win10;alpine.3.10-x64;debian.10-arm</RuntimeIdentifiers>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <AssemblyVersion>1.0.4.0</AssemblyVersion>
-    <FileVersion>1.0.4.0</FileVersion>
+    <AssemblyVersion>1.0.5.0</AssemblyVersion>
+    <FileVersion>1.0.5.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Deterministic>false</Deterministic>

diff --git a/HADotNet.CommandCenter/Models/Config/SystemSettings.cs b/HADotNet.CommandCenter/Models/Config/SystemSettings.cs
@@ -32,5 +32,10 @@ public class SystemSettings
         /// Gets or sets whether or not this is a Hass.io addon environment. Set automatically when initialized from a Hass.io addon container.
         /// </summary>
         public bool IsHassIo { get; set; }
+
+        /// <summary>
+        /// Gets the Websocket URL.
+        /// </summary>
+        public string WebsocketUri => !string.IsNullOrWhiteSpace(OverrideAssetUri) ? OverrideAssetUri : IsHassIo && !string.IsNullOrWhiteSpace(ExternalBaseUri) ? ExternalBaseUri : BaseUri;
     }
 }
diff --git a/HADotNet.CommandCenter/Views/Dashboard/Index.cshtml b/HADotNet.CommandCenter/Views/Dashboard/Index.cshtml
@@ -129,8 +129,8 @@
     <script>
         window.ccOptions.autoReturn = @Model.CurrentPage.AutoReturnSeconds;
         window.ccOptions.pageId = '@Model.CurrentPage.Name';
-        window.ccOptions.baseUrl = '@Model.SystemSettings.BaseUri';
-        window.ccOptions.socketUrl = '@(Model.SystemSettings.IsHassIo ? "http://hassio/homeassistant/websocket" : Model.SystemSettings.BaseUri)';
+        window.ccOptions.baseUrl = '@(Model.SystemSettings.ExternalBaseUri ?? Model.SystemSettings.BaseUri)';
+        window.ccOptions.socketUrl = '@Model.SystemSettings.WebsocketUri';
         window.ccOptions.overrideAssetUrl = '@Model.SystemSettings.OverrideAssetUri';
         window.ccOptions.token = '@Model.SystemSettings.AccessToken';
     </script>