v1.4.0-beta.54

- Deprecated MacroRecorder - Improved *Commands Capture* UI workflow - Fixes translation files caching
genielabs · Sep 26, 2023 · 1c2d222 · 1c2d222
1 parent 81c7c14
commit 1c2d222
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 276 deletions.
diff --git a/assets/build/all/app/3rdpartylicenses.txt b/assets/build/all/app/3rdpartylicenses.txt
@@ -737,31 +737,6 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-deepmerge
-MIT
-The MIT License (MIT)
-
-Copyright (c) 2012 James Halliday, Josh Duff, and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
 error-stack-parser
 MIT
 Copyright (c) 2017 Eric Wendelin and other contributors
@@ -1070,6 +1045,31 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+ramda
+MIT
+The MIT License (MIT)
+
+Copyright (c) 2013-2023 Scott Sauyet and Michael Hurley
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 regenerator-runtime
 MIT
 MIT License

diff --git a/assets/build/all/app/assets/i18n/en.json b/assets/build/all/app/assets/i18n/en.json
@@ -56,6 +56,7 @@
   "application_domain": "Application domain",
   "package_info": "Package info",
   "run": "Run",
+  "start": "Start",
   "stop": "Stop",
   "schedule": "Schedule",
   "scheduling_on": "Scheduling on {{date}}",

diff --git a/assets/build/all/app/assets/i18n/homegenie/en.json b/assets/build/all/app/assets/i18n/homegenie/en.json
@@ -210,10 +210,14 @@
     "\"Setup\" code is empty.\n\nUse the \"Visual code\" editor to generate this code:\n- Open the category \"Program\" from the command palette on the left\n- Drag a block of type \"Setup\" in the visual code workspace\n- Add inside it other code blocks to determine the conditions that will trigger \"Main\" code execution\n\nThis code gets evaluated everytime a new event occurs and at least once a minute.",
   "capture_commands":
     "Capture commands",
+  "capture_commands_description":
+    "Add all commands performed manually on widgets to the program.",
   "capture_commands_pause":
-    "Commands pause",
-  "select_modules":
-    "Select modules",
+    "Pause between commands",
+  "capture_pause_none":
+    "None",
+  "capture_pause_asis":
+    "As is",
 " ": "------------------------------------------",
   "$options": {
 

diff --git a/assets/build/all/app/assets/i18n/homegenie/it.json b/assets/build/all/app/assets/i18n/homegenie/it.json
@@ -210,10 +210,14 @@
     "Il codice \"Setup\" è vuoto.\n\nUsa l'editor di \"Codice visuale\" per generare questo codice:\n- Apri la categoria \"Programma\" dalla tavolozza dei comandi sulla sinistra\n- Trascina un blocco di tipo \"Setup\" nell'area di lavoro del codice visuale\n- Aggiungi al suo interno altri blocchi di codice per stabilire le condizioni che innescheranno l'avvio automatico del codice \"Main\"\n\nQuesto codice viene valutato ogni volta che si verifica un evento ed almeno una volta al minuto.",
   "capture_commands":
     "Cattura comandi",
+  "capture_commands_description":
+    "Aggiungi al programma tutti i comandi eseguiti manualmente sui widget.",
   "capture_commands_pause":
-    "Pausa comandi",
-  "select_modules":
-    "Seleziona moduli",
+    "Pausa tra i comandi",
+  "capture_pause_none":
+    "Nessuna",
+  "capture_pause_asis":
+    "Così com'è",
 " ": "------------------------------------------",
     "$options":
     {

diff --git a/assets/build/all/app/assets/i18n/it.json b/assets/build/all/app/assets/i18n/it.json
@@ -55,7 +55,8 @@
   "applications": "Applicazioni",
   "application_domain": "Dominio applicazione",
   "package_info": "Informazioni pacchetto",
-  "run": "Avvia",
+  "run": "Esegui",
+  "start": "Avvia",
   "stop": "Interrompi",
   "schedule": "Pianificazione",
   "scheduling_on": "Pianificazione del {{date}}",

diff --git a/assets/build/all/app/index.html b/assets/build/all/app/index.html
@@ -56,6 +56,6 @@
 
   </div>
 
-<script src="runtime.b92e2ca178ebbf4a.js" type="module"></script><script src="polyfills.a360d6e45b80c065.js" type="module"></script><script src="scripts.0dcb4f0a61221c18.js" defer></script><script src="main.ca2f0ce1f8ff8489.js" type="module"></script>
+<script src="runtime.b92e2ca178ebbf4a.js" type="module"></script><script src="polyfills.a360d6e45b80c065.js" type="module"></script><script src="scripts.0dcb4f0a61221c18.js" defer></script><script src="main.a56a8879565d6386.js" type="module"></script>
 
 </body></html>
diff --git a/assets/build/all/app/main.a56a8879565d6386.js b/assets/build/all/app/main.a56a8879565d6386.js
diff --git a/assets/build/all/app/main.ca2f0ce1f8ff8489.js b/assets/build/all/app/main.ca2f0ce1f8ff8489.js
diff --git a/assets/build/all/app/ngsw.json b/assets/build/all/app/ngsw.json
@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1695654789291,
+  "timestamp": 1695734403275,
   "index": "/app/index.html",
   "assetGroups": [
     {
@@ -15,7 +15,7 @@
         "/app/613.16b9c52c0ae74833.js",
         "/app/859.0f150be9c99a6b5a.js",
         "/app/index.html",
-        "/app/main.ca2f0ce1f8ff8489.js",
+        "/app/main.a56a8879565d6386.js",
         "/app/manifest.webmanifest",
         "/app/polyfills.a360d6e45b80c065.js",
         "/app/runtime.b92e2ca178ebbf4a.js",
@@ -444,10 +444,10 @@
     "/app/assets/fonts/Roboto-Latin-300.woff": "fec6225507c70951797db15985fe0bf87195d6ee",
     "/app/assets/fonts/Roboto-Latin-400.woff": "fec6225507c70951797db15985fe0bf87195d6ee",
     "/app/assets/fonts/Roboto-Latin-500.woff": "7416b5d46c615d2786a604d71d334b605d41cc73",
-    "/app/assets/i18n/en.json": "af3f4edf453fe59217fd3e3ea98828eeb2a6f9b1",
-    "/app/assets/i18n/homegenie/en.json": "728521285c51ce5291af3442db937edf3b1d8a61",
-    "/app/assets/i18n/homegenie/it.json": "1ff8768aa65eec75b44208c378215e8406bc78ec",
-    "/app/assets/i18n/it.json": "1aebb002e44abf318936038c672f433ffed2ec9c",
+    "/app/assets/i18n/en.json": "2c102d1542c09ccfc2345de7627fbd5bde485ff4",
+    "/app/assets/i18n/homegenie/en.json": "46fcd188f209a020c910554303938787b4fa85e9",
+    "/app/assets/i18n/homegenie/it.json": "63d300c523536bf726e903f28f85f3b5f58d383d",
+    "/app/assets/i18n/it.json": "5417c8b3739e34282dc2d1424c31d94aea2a79ff",
     "/app/assets/i18n/module/en.json": "bd1f58f6eeb2e8213bc5dbe316d1252db8aa436f",
     "/app/assets/i18n/module/it.json": "35c4ef9b17591c0ef0283317a3f226c666d908f9",
     "/app/assets/i18n/widgets/en.json": "81775f6536411948d4d4c6e054a768a21793ab24",
@@ -759,8 +759,8 @@
     "/app/assets/widgets/weather/images_alt/thunder.svg": "2ace7038dfd663330cecc350d680ef08206d62ff",
     "/app/assets/widgets/weather/images_alt/weather.svg": "c719c09048977fd40688272316b35ddf1bdf89e8",
     "/app/assets/workers/typings-worker.js": "8df10d867c12d36cdebfb7e16caacd0020db301f",
-    "/app/index.html": "4dc72a6251fdc2de1fff003e654c2b4fd91a06e7",
-    "/app/main.ca2f0ce1f8ff8489.js": "5f36a19808df129f7d9ee46dcc02d24099589fc3",
+    "/app/index.html": "3844bbfa3d6ad67e22c218104dc46a3e4a8e2c33",
+    "/app/main.a56a8879565d6386.js": "ca58448e7d1f2d0de714340270f538d1dc305ffd",
     "/app/manifest.webmanifest": "d47bb07a495e27ddf072f8702df373f79b4eb183",
     "/app/polyfills.a360d6e45b80c065.js": "f317e1a3e4bb6a84068c7e1845a2ce8b2f956ee7",
     "/app/runtime.b92e2ca178ebbf4a.js": "b50d841a4c50d466c34aab3267d3fb4afe87dede",

diff --git a/src/HomeGenie/Automation/MacroRecorder.cs b/src/HomeGenie/Automation/MacroRecorder.cs
diff --git a/src/HomeGenie/Automation/ProgramManager.cs b/src/HomeGenie/Automation/ProgramManager.cs
@@ -41,9 +41,7 @@ public class ProgramManager
         private readonly TsList<ProgramBlock> automationPrograms = new TsList<ProgramBlock>();
         private readonly HomeGenieService hgService;
         private readonly SchedulerService schedulerService;
-        private readonly MacroRecorder macroRecorder;
 
-        //private object lockObject = new object();
         private bool isEngineEnabled;
 
         public const int USERSPACE_PROGRAMS_START = 1000;
@@ -59,7 +57,6 @@ public class RoutedEvent
         public ProgramManager(HomeGenieService hg)
         {
             hgService = hg;
-            macroRecorder = new MacroRecorder(this);
             schedulerService = new SchedulerService(this);
         }
 
@@ -98,11 +95,6 @@ public HomeGenieService HomeGenie
             get { return hgService; }
         }
 
-        public MacroRecorder MacroRecorder
-        {
-            get { return macroRecorder; }
-        }
-
         public SchedulerService SchedulerService
         {
             get { return schedulerService; }

diff --git a/src/HomeGenie/Automation/Scripting/MqttClientHelper.cs b/src/HomeGenie/Automation/Scripting/MqttClientHelper.cs
@@ -349,9 +349,7 @@ private MqttClientOptionsBuilder GetMqttOptionsBuilder(string clientId)
                 .WithCleanSession();
             if (usingWebSockets)
             {
-                builder.WithWebSocketServer(endPoint.Address + ":" + endPoint.Port + "/mqtt");
-                // TODO: WARNING -- upgrading to MQTTnet 4.3.0.858 WebSocket connection won't work anymore
-                //builder.WithWebSocketServer(o => o.WithUri(endPoint.Address + ":" + endPoint.Port + "/mqtt"));
+                builder.WithWebSocketServer(o => o.WithUri(endPoint.Address + ":" + endPoint.Port + "/mqtt"));
             }
             else
             {
@@ -363,10 +361,7 @@ private MqttClientOptionsBuilder GetMqttOptionsBuilder(string clientId)
             }
             if (useTls)
             {
-                var tlsParameters = new MqttClientOptionsBuilderTlsParameters {UseTls = true};
-                builder.WithTls(tlsParameters);
-                // TODO: WARNING -- upgrading to MQTTnet 4.3.0.858 WebSocket connection won't work anymore
-                //builder.WithTlsOptions(o => o.UseTls());
+                builder.WithTlsOptions(o => o.UseTls());
             }
             return builder;
         }