iobroker.alpha-ess 0.0.6-beta.5 → 0.2.0

package/README.md

@@ -35,6 +35,14 @@ The password is stored encrypted and must therefore be entered manually: demo
 **All product and company names or logos are trademarks™ or registered® trademarks of their respective holders. Use of them does not imply any affiliation with or endorsement by them or any associated subsidiaries! This personal project is maintained in spare time and has no business goal.**
 
 ## Changelog
+### 0.2.0 (2023-01-19)
+* (Gaspode) Added states EV1_power, EV2_power, EV3_power and EV4_power to Realtime folder
+
+### 0.1.0 (2023-01-15)
+* (Gaspode) First release for Latest repository
+* (Gaspode) Corrected typo in state ID Battery_SOC
+* (Gaspode) Implemented improvements as suggested in code review
+
 ### 0.0.6-beta.5 (2023-01-07)
 * (Gaspode) Slow down requests in case of permanent errors
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "alpha-ess",
-    "version": "0.0.6-beta.5",
+    "version": "0.2.0",
     "news": {
+      "0.2.0": {
+        "en": "Added states EV1_power, EV2_power, EV3_power and EV4_power to Realtime folder",
+        "de": "EV1_power, EV2_power, EV3_power und EV4_power in Echtzeit-Ordner",
+        "ru": "Добавлены состояния EV1_power, EV2_power, EV3_power и EV4_power в папку Realtime",
+        "pt": "Estados adicionados EV1_power, EV2_power, EV3_power e EV4_power para pasta em tempo real",
+        "nl": "Vertaling:",
+        "fr": "Ajout des états EV1_power, EV2_power, EV3_power et EV4_power dans le dossier Realtime",
+        "it": "Aggiunti stati EV1_power, EV2_power, EV3_power e EV4_power nella cartella in tempo reale",
+        "es": "Estados adicionales EV1_power, EV2_power, EV3_power y EV4_power a carpeta en tiempo real",
+        "pl": "EV1_power, EV2_power, EV3_power i EV4_power do Realtime folder",
+        "uk": "Додано стани EV1_power, EV2_power, EV3_power і EV4_power до папки реального часу",
+        "zh-cn": "增加国家EV1:能力,EV2_ 能力, EV3_ 权力和EV4_ 实际工作时间的能力"
+      },
+      "0.1.0": {
+        "en": "First release for Latest repository\nCorrected typo in state ID Battery_SOC\nImplemented improvements as suggested in code review",
+        "de": "Erste Veröffentlichung für Neueste Repository\nKorrigierte Typo im Zustand ID Battery_SOC\nImplementierte Verbesserungen wie in der Code-Review vorgeschlagen",
+        "ru": "Первый выпуск для последней репозитории\nИсправлена опечатка в штате ID Батарея_SOC\nВнедренные улучшения, как предлагается в обзоре кода",
+        "pt": "Primeiro lançamento para o repositório mais recente\nTipo corrigido no estado ID Battery_SOC\nMelhorias implementadas conforme sugerido na revisão de código",
+        "nl": "Eerste vrijlating voor Latest\nQuality over Quantity (QoQ) Releases Vertaling: ID Battery\nVerbeteringen zoals geadviseerd in codereview",
+        "fr": "Première version pour Dernier dépôt\nTypo corrigé en état ID Battery_SOC\nAméliorations mises en œuvre comme suggéré dans l ' examen des codes",
+        "it": "Prima release per gli ultimi repository\nTipo corretto in stato ID Battery_SOC\nMiglioramenti attuati come suggerito nella revisione del codice",
+        "es": "Primer lanzamiento para el repositorio más reciente\nTypo corregido en estado ID Battery_SOC\nMejoras aplicadas como se sugiere en el examen del código",
+        "pl": "Pierwsze wydanie repozytorium Latest\nKary w państwie Bateria IDSOC\nImplementacja poprawek, jak zasugerowano w przegląd kodowy",
+        "uk": "Перший реліз для останніх репозиторій\nВиправлено типо в стані Акумулятор ID_SOC\nРеалізовані вдосконалення, як пропонуються в перегляді коду",
+        "zh-cn": "第一批La证存放处的释放\n州的打字 ID Battery_SOC\n实施守则审查建议的改进"
+      },
       "0.0.6-beta.5": {
         "en": "Slow down requests in case of permanent errors",
         "de": "Langsame Anträge bei dauerhaften Fehlern",
@@ -67,32 +93,6 @@
         "pl": "...",
         "uk": "...",
         "zh-cn": "..."
-      },
-      "0.0.6-beta.0": {
-        "en": "...",
-        "de": "...",
-        "ru": "...",
-        "pt": "...",
-        "nl": "...",
-        "fr": "...",
-        "it": "...",
-        "es": "...",
-        "pl": "...",
-        "uk": "...",
-        "zh-cn": "..."
-      },
-      "0.0.1": {
-        "en": "initial release",
-        "de": "Erstveröffentlichung",
-        "ru": "Начальная версия",
-        "pt": "lançamento inicial",
-        "nl": "Eerste uitgave",
-        "fr": "Première version",
-        "it": "Versione iniziale",
-        "es": "Versión inicial",
-        "pl": "Pierwsze wydanie",
-        "zh-cn": "首次出版",
-        "uk": "початковий випуск"
       }
     },
     "titleLang": {

package/main.js

@@ -16,6 +16,8 @@ const AUTHCONSTANT = 'LS885ZYDA95JVFQKUIUUUV7PQNODZRDZIS4ERREDS0EED8BCWSS';
 const AUTHSUFFIX = 'ui893ed';
 const BaseURI = 'https://cloud.alphaess.com/';
 
+const REQUEST_TIMEOUT = 10000;
+
 const stateList = [{
     Group: 'Realtime'
     , states: [
@@ -127,10 +129,46 @@ const stateList = [{
             , unit: 'W'
             , dayIndex: false
         }
+        , {
+            stateName: 'ev1_power'
+            , role: 'value.power'
+            , id: 'EV1_power'
+            , name: 'Wallbox Power 1'
+            , type: 'number'
+            , unit: 'W'
+            , dayIndex: false
+        }
+        , {
+            stateName: 'ev2_power'
+            , role: 'value.power'
+            , id: 'EV2_power'
+            , name: 'Wallbox Power 2'
+            , type: 'number'
+            , unit: 'W'
+            , dayIndex: false
+        }
+        , {
+            stateName: 'ev3_power'
+            , role: 'value.power'
+            , id: 'EV3_power'
+            , name: 'Wallbox Power 3'
+            , type: 'number'
+            , unit: 'W'
+            , dayIndex: false
+        }
+        , {
+            stateName: 'ev4_power'
+            , role: 'value.power'
+            , id: 'EV4_power'
+            , name: 'Wallbox Power 4'
+            , type: 'number'
+            , unit: 'W'
+            , dayIndex: false
+        }
         , {
             stateName: 'soc'
             , role: 'value.battery'
-            , id: 'Bttery_SOC'
+            , id: 'Battery_SOC'
             , name: 'State of charge'
             , type: 'number'
             , unit: '%'
@@ -363,7 +401,6 @@ class AlphaEss extends utils.Adapter {
             await this.setStateChangedAsync('info.connection', false, true);
 
             this.log.debug('config username:             ' + this.config.username);
-            this.log.debug('config password:             ' + this.config.password);
             this.log.debug('config systemId:             ' + this.config.systemId);
             this.log.debug('config intervalRealtimedata: ' + this.config.intervalRealtimedata);
             this.log.debug('config intervalSettingsdata: ' + this.config.intervalSettingsdata);
@@ -377,25 +414,21 @@ class AlphaEss extends utils.Adapter {
 
             if (this.config.password && this.config.username && this.config.systemId) {
                 if (this.config.enableRealtimedata) {
-                    this.fetchRealtimeData();
+                    await this.fetchRealtimeData();
                 }
                 else {
                     this.log.info('Realtime data disabled! Adapter won\'t fetch realtime data.');
                 }
 
                 if (this.config.enableEnergydata) {
-                    // We delay the first start for 3 seconds
-                    const _this = this;
-                    this.settingsDataTimeoutHandle = setTimeout(function () { _this.fetchEnergyData(); }, 3000);
+                    await this.fetchEnergyData();
                 }
                 else {
                     this.log.info('Energydata data disabled! Adapter won\'t fetch energy data.');
                 }
 
                 if (this.config.enableSettingsdata) {
-                    // We delay the first start for 6 seconds
-                    const _this = this;
-                    this.settingsDataTimeoutHandle = setTimeout(function () { _this.fetchSettingsData(); }, 6000);
+                    await this.fetchSettingsData();
                 }
                 else {
                     this.log.info('Settings data disabled! Adapter won\'t fetch settings data.');
@@ -540,12 +573,13 @@ class AlphaEss extends utils.Adapter {
                 };
             }
 
-            this.log.debug('Login data: ' + JSON.stringify(LoginData));
-
             // @ts-ignore
             const res = await axios.post(BaseURI + 'api/' + (refresh ? 'Account/RefreshToken' : 'Account/Login'),
                 JSON.stringify(LoginData),
-                { headers: this.headers(null) });
+                {
+                    timeout: REQUEST_TIMEOUT,
+                    headers: this.headers(null)
+                });
 
             if (res.status == 200) {
                 if (res.data && res.data.code && res.data.code == 5) {
@@ -591,8 +625,7 @@ class AlphaEss extends utils.Adapter {
             this.createAndUpdateStates(groupName, body.data);
 
             if (!this.realtimeDataTimeoutHandle) {
-                const _this = this;
-                this.realtimeDataTimeoutHandle = setTimeout(function () { _this.fetchRealtimeData(); }, this.calculateIntervalInMs(this.config.intervalRealtimedata, groupName));
+                this.realtimeDataTimeoutHandle = setTimeout(() => this.fetchRealtimeData(), this.calculateIntervalInMs(this.config.intervalRealtimedata, groupName));
             }
         }
         catch (e) {
@@ -623,8 +656,7 @@ class AlphaEss extends utils.Adapter {
             this.createAndUpdateStates(groupName, body.data);
 
             if (!this.energyDataTimeoutHandle) {
-                const _this = this;
-                this.energyDataTimeoutHandle = setTimeout(function () { _this.fetchEnergyData(); }, this.calculateIntervalInMs(this.config.intervalEnergydata, groupName));
+                this.energyDataTimeoutHandle = setTimeout(() => this.fetchEnergyData(), this.calculateIntervalInMs(this.config.intervalEnergydata, groupName));
             }
         }
         catch (e) {
@@ -646,8 +678,7 @@ class AlphaEss extends utils.Adapter {
             this.createAndUpdateStates(groupName, body.data);
 
             if (!this.settingsDataTimeoutHandle) {
-                const _this = this;
-                this.settingsDataTimeoutHandle = setTimeout(function () { _this.fetchSettingsData(); }, this.calculateIntervalInMs(this.config.intervalSettingsdata, groupName));
+                this.settingsDataTimeoutHandle = setTimeout(() => this.fetchSettingsData(), this.calculateIntervalInMs(this.config.intervalSettingsdata, groupName));
             }
         }
         catch (e) {
@@ -747,7 +778,10 @@ class AlphaEss extends utils.Adapter {
 
             // @ts-ignore
             const res = await axios.get(uri,
-                { headers: this.headers({ 'Authorization': 'Bearer ' + this.Auth.Token }) });
+                {
+                    timeout: REQUEST_TIMEOUT,
+                    headers: this.headers({ 'Authorization': 'Bearer ' + this.Auth.Token })
+                });
 
             if (res.status == 200) {
                 await this.setStateChangedAsync('info.connection', true, true);
@@ -788,7 +822,10 @@ class AlphaEss extends utils.Adapter {
             // @ts-ignore
             const res = await axios.post(uri,
                 sndBody,
-                { headers: this.headers({ 'Authorization': 'Bearer ' + this.Auth.Token }) });
+                {
+                    timeout: REQUEST_TIMEOUT,
+                    headers: this.headers({ 'Authorization': 'Bearer ' + this.Auth.Token })
+                });
 
             if (res.status == 200) {
                 await this.setStateChangedAsync('info.connection', true, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.alpha-ess",
-  "version": "0.0.6-beta.5",
+  "version": "0.2.0",
   "description": "Read and write data from and to Alpha ESS systems.",
   "author": {
     "name": "Gaspode",
@@ -19,7 +19,8 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7"
+    "@iobroker/adapter-core": "^2.6.7",
+    "axios": "^1.2.2"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.5.9",
@@ -36,7 +37,6 @@
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
-    "axios": "^1.2.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.31.0",