Disabled Closed API, improved cleanup at adapter termination

Gaspode69 · Gaspode69 · commit 6223d7fa4e81 · 2023-11-04T12:50:59.000+01:00
diff --git a/README.md b/README.md
@@ -27,7 +27,9 @@ Staring with version 1.0.0-alpha.5, the quality attribute of each state is set a
 
 ## Settings:
 
-**Used API:** Choose between the inofficial "Closed" API and the official "Open" API (under development)
+<span style="color:red">CAUTION: Currently only Open API is supported because the Closed API was changed by Apha-ESS and cannot be used by third party applications at the moment.</span>
+
+**Used API:** Choose between the inofficial "Closed" API and the official "Open" API
 Depending on the selected API there are different settings available.
 
 **Closed API Settings:**
@@ -47,6 +49,7 @@ The password is stored encrypted and must therefore be entered manually: demo
 **Open API Settings:**
 
 To be able to use the new Open API you have to register your Alpha-ESS device unter https://open.alphaess.com. Once registered, you get a developer ID and a developer key (called "Secret"). You will need these to have access to the Open API. Currently I have no information if this will be changed in the future.
+How to find SN and Check code for registration is described here: https://github.com/alphaess-developer/alphacloud_open_api
 
 -   **Personal application ID:** The application ID (see above)
 -   **Personal application Secret:** The application Secret (see above)
@@ -65,6 +68,7 @@ To be able to use the new Open API you have to register your Alpha-ESS device un
 
 ### **WORK IN PROGRESS**
 
+-   (Gaspode) Closed API disabled (temporarily?) because API has been changed by Alpha-ESS
 -   (Gaspode) Read back changed settings values 2 seconds after they have been changed
 
 ### 1.0.2 (2023-10-05)
diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "Persönliche Application ID",
     "Personal APP Secret": "Persönliches Application Secret",
     "Interval to read charging settings": "Intervall zum Lesen der Ladeeinstellungen [min]",
-    "Interval to read discharging settings": "Intervall zum Lesen der Entladeeinstellungen [min]"
+    "Interval to read discharging settings": "Intervall zum Lesen der Entladeeinstellungen [min]",
+    "Sorry. Closed API currently not supported!": "Entschuldigung. Closed API wird aufgrund von Änderungen durch Alpha-ESS derzeit nicht unterstützt!"
 }
diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -12,5 +12,6 @@
 	"Personal APP ID": "Personal Application ID",
 	"Personal APP Secret": "Personal Application Secret",
 	"Interval to read charging settings": "Interval to read charging settings [min]",
-	"Interval to read discharging settings": "Interval to read discharging settings [min]"
+	"Interval to read discharging settings": "Interval to read discharging settings [min]",
+    "Sorry. Closed API currently not supported!": "Sorry. Closed API currently not supported due to changes by Alpha-ESS!"
 }
diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "ID de aplicación personal",
     "Personal APP Secret": "Secreto de aplicación personal",
     "Interval to read charging settings": "Intervalo para leer la configuración de carga",
-    "Interval to read discharging settings": "Intervalo para leer la configuración de descarga"
+    "Interval to read discharging settings": "Intervalo para leer la configuración de descarga",
+    "Sorry. Closed API currently not supported!": "Lo siento. ¡La API cerrada actualmente no es compatible debido a cambios realizados por Alpha-ESS!"
 }
diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "ID de candidature personnel",
     "Personal APP Secret": "Secret d'application personnel",
     "Interval to read charging settings": "Intervalle pour lire les paramètres de charge",
-    "Interval to read discharging settings": "Intervalle pour lire les paramètres de décharge"
+    "Interval to read discharging settings": "Intervalle pour lire les paramètres de décharge",
+    "Sorry. Closed API currently not supported!": "Désolé. API fermée actuellement non prise en charge en raison de modifications apportées par Alpha-ESS !"
 }
diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "ID applicazione personale",
     "Personal APP Secret": "Segreto dell'applicazione personale",
     "Interval to read charging settings": "Intervallo per leggere le impostazioni di ricarica",
-    "Interval to read discharging settings": "Intervallo per leggere le impostazioni di scarica"
+    "Interval to read discharging settings": "Intervallo per leggere le impostazioni di scarica",
+    "Sorry. Closed API currently not supported!": "Scusa. API chiusa attualmente non supportata a causa di modifiche apportate da Alpha-ESS!"
 }
diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "Persoonlijke applicatie-ID",
     "Personal APP Secret": "Persoonlijk toepassingsgeheim",
     "Interval to read charging settings": "Interval om laadinstellingen te lezen",
-    "Interval to read discharging settings": "Interval om ontlaadinstellingen te lezen"
+    "Interval to read discharging settings": "Interval om ontlaadinstellingen te lezen",
+    "Sorry. Closed API currently not supported!": "Sorry. Gesloten API momenteel niet ondersteund vanwege wijzigingen door Alpha-ESS!"
 }
diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "Osobisty identyfikator aplikacji",
     "Personal APP Secret": "Tajny wniosek osobisty",
     "Interval to read charging settings": "Interwał odczytu ustawień ładowania",
-    "Interval to read discharging settings": "Interwał odczytu ustawień rozładowania"
+    "Interval to read discharging settings": "Interwał odczytu ustawień rozładowania",
+    "Sorry. Closed API currently not supported!": "Przepraszam. Zamknięte API obecnie nie jest obsługiwane ze względu na zmiany wprowadzone przez Alpha-ESS!"
 }
diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "ID de aplicativo pessoal",
     "Personal APP Secret": "Segredo de aplicativo pessoal",
     "Interval to read charging settings": "Intervalo para ler as configurações de carregamento",
-    "Interval to read discharging settings": "Intervalo para ler as configurações de descarga"
+    "Interval to read discharging settings": "Intervalo para ler as configurações de descarga",
+    "Sorry. Closed API currently not supported!": "Desculpe. API fechada atualmente não suportada devido a alterações do Alpha-ESS!"
 }
diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "Идентификатор личного приложения",
     "Personal APP Secret": "Секрет личного приложения",
     "Interval to read charging settings": "Интервал чтения настроек зарядки",
-    "Interval to read discharging settings": "Интервал чтения настроек разрядки"
+    "Interval to read discharging settings": "Интервал чтения настроек разрядки",
+    "Sorry. Closed API currently not supported!": "Извини. Закрытый API в настоящее время не поддерживается из-за изменений Alpha-ESS!"
 }
diff --git a/admin/i18n/uk/translations.json b/admin/i18n/uk/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "Персональний ID програми",
     "Personal APP Secret": "Особистий секрет програми",
     "Interval to read charging settings": "Інтервал зчитування параметрів заряджання",
-    "Interval to read discharging settings": "Інтервал зчитування параметрів розрядки"
+    "Interval to read discharging settings": "Інтервал зчитування параметрів розрядки",
+    "Sorry. Closed API currently not supported!": "вибач Закритий API наразі не підтримується через зміни Alpha-ESS!"
 }
diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json
@@ -12,5 +12,6 @@
     "Personal APP ID": "个人申请编号",
     "Personal APP Secret": "个人申请秘诀",
     "Interval to read charging settings": "读取充电设置的间隔",
-    "Interval to read discharging settings": "读取放电设置的间隔"
+    "Interval to read discharging settings": "读取放电设置的间隔",
+    "Sorry. Closed API currently not supported!": "对不起。由于 Alpha-ESS 的更改，目前不支持封闭 API！"
 }
diff --git a/admin/jsonConfig.json b/admin/jsonConfig.json
@@ -12,19 +12,29 @@
         { "label": "Open API", "value": 1 }
       ]
     },
+    "closedAPINotSupported": {
+      "sm": 5,
+      "type": "staticText",
+      "text": "Sorry. Closed API currently not supported!",
+      "style": {
+          "color": "red"
+      },
+      "newLine": true,
+      "hidden": "data.apiType == 1"
+    },
     "username": {
       "sm": 5,
       "type": "text",
       "label": "Username",
       "newLine": true,
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "password": {
       "sm": 5,
       "type": "password",
       "label": "Password",
       "newLine": true,
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "appID": {
       "sm": 5,
@@ -44,12 +54,13 @@
       "sm": 5,
       "type": "text",
       "label": "Alpha ESS System ID",
-      "newLine": true
+      "newLine": true,
+      "disabled": "data.apiType == 0"
     },
     "enableRealtimedata": {
       "type": "checkbox",
       "newLine": true,
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "intervalRealtimedata": {
       "sm": 5,
@@ -58,12 +69,12 @@
       "label": "Interval to read realtime data",
       "newLine": false,
       "disabled": "!data.enableRealtimedata",
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "enableEnergydata": {
       "type": "checkbox",
       "newLine": true,
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "intervalEnergydataMins": {
       "sm": 5,
@@ -72,12 +83,12 @@
       "label": "Interval to read energy data",
       "newLine": false,
       "disabled": "!data.enableEnergydata",
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "enableSettingsdata": {
       "type": "checkbox",
       "newLine": true,
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "enableSettingsCharge": {
       "type": "checkbox",
@@ -114,12 +125,12 @@
       "label": "Interval to read settings data",
       "newLine": false,
       "disabled": "!data.enableSettingsdata",
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "enableStatisticalTodaydata": {
       "type": "checkbox",
       "newLine": true,
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "intervalStatisticalTodaydataMins": {
       "sm": 5,
@@ -128,12 +139,12 @@
       "label": "Interval to read statistical data (today)",
       "newLine": false,
       "disabled": "!data.enableStatisticalTodaydata",
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "enableSummarydata": {
       "type": "checkbox",
       "newLine": true,
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "intervalSummarydataMins": {
       "sm": 5,
@@ -142,7 +153,7 @@
       "label": "Interval to read summary data",
       "newLine": false,
       "disabled": "!data.enableSummarydata",
-      "hidden": "data.apiType == 1"
+      "hidden": "data.apiType == 1 || data.apiType == 0"
     },
     "oAEnableRealtime": {
       "type": "checkbox",
@@ -245,7 +256,8 @@
     "updateUnchangedStates": {
       "type": "checkbox",
       "label": "Update unchanged states",
-      "newLine": true
+      "newLine": true,
+      "hidden": "data.apiType == 0"
     }
   }
 }
diff --git a/io-package.json b/io-package.json
diff --git a/main.js b/main.js

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@`
`12`	`12`	`"Personal APP ID": "Persönliche Application ID",`
`13`	`13`	`"Personal APP Secret": "Persönliches Application Secret",`
`14`	`14`	`"Interval to read charging settings": "Intervall zum Lesen der Ladeeinstellungen [min]",`
`15`		`- "Interval to read discharging settings": "Intervall zum Lesen der Entladeeinstellungen [min]"`
	`15`	`+ "Interval to read discharging settings": "Intervall zum Lesen der Entladeeinstellungen [min]",`
	`16`	`+ "Sorry. Closed API currently not supported!": "Entschuldigung. Closed API wird aufgrund von Änderungen durch Alpha-ESS derzeit nicht unterstützt!"`
`16`	`17`	`}`