iobroker.alpha-ess 0.2.0 → 0.2.1-beta.0

package/README.md

@@ -27,6 +27,7 @@ Basically, it is possible to change selected configuration settings using the Al
 **Interval to read realtime data:** Unit: seconds.\
 **Interval to read energy data:** Unit: seconds.\
 **Interval to read settings data:** Unit: seconds.
+**Interval to read statistical data:** Unit: seconds.
 
 It is possible to use a demo account provided by Alpha ESS. The credentials (user name, system id) are set as default values within the adapter.
 The password is stored encrypted and must therefore be entered manually: demo
@@ -35,6 +36,9 @@ 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.1-beta.0 (2023-01-31)
+* (Gaspode) Read selected statistical data
+
 ### 0.2.0 (2023-01-19)
 * (Gaspode) Added states EV1_power, EV2_power, EV3_power and EV4_power to Realtime folder
 

package/admin/i18n/de/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Intervall zum Lesen von Echtzeitdaten [s]",
     "Interval to read settings data": "Intervall zum Lesen von Einstellungsdaten [s]",
     "Interval to read energy data": "Intervall zum Auslesen der Energiedaten [s]",
-    "Update unchanged states": "Unveränderte Zustände aktualisieren"
+    "Update unchanged states": "Unveränderte Zustände aktualisieren",
+    "Interval to read statistical data": "Intervall zum Lesen statistischer Daten [s]"
 }

package/admin/i18n/en/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Interval to read realtime data [s]",
     "Interval to read energy data": "Interval to read energy data [s]",
     "Interval to read settings data": "Interval to read settings data [s]",
+    "Interval to read statistical data": "Interval to read statistical data [s]",
     "Update unchanged states": "Update unchanged states"
 }

package/admin/i18n/es/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Intervalo para leer datos en tiempo real [s]",
     "Interval to read settings data": "Intervalo para leer los datos de configuración [s]",
     "Interval to read energy data": "Intervalo para leer datos de energía [s]",
-    "Update unchanged states": "Actualizar estados sin cambios"
+    "Update unchanged states": "Actualizar estados sin cambios",
+    "Interval to read statistical data": "Intervalo para leer datos estadísticos [s]"
 }

package/admin/i18n/fr/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Intervalle pour lire les données en temps réel [s]",
     "Interval to read settings data": "Intervalle pour lire les données de réglage [s]",
     "Interval to read energy data": "Intervalle pour lire les données énergétiques [s]",
-    "Update unchanged states": "Mettre à jour les états inchangés"
+    "Update unchanged states": "Mettre à jour les états inchangés",
+    "Interval to read statistical data": "Intervalle pour lire les données statistiques [s]"
 }

package/admin/i18n/it/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Intervallo per leggere i dati in tempo reale [s]",
     "Interval to read settings data": "Intervallo per leggere i dati delle impostazioni [s]",
     "Interval to read energy data": "Intervallo di lettura dei dati energetici [s]",
-    "Update unchanged states": "Aggiorna stati invariati"
+    "Update unchanged states": "Aggiorna stati invariati",
+    "Interval to read statistical data": "Intervallo di lettura dei dati statistici [s]"
 }

package/admin/i18n/nl/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Interval om realtime gegevens te lezen [s]",
     "Interval to read settings data": "Interval voor het lezen van instellingengegevens [s]",
     "Interval to read energy data": "Interval om energiegegevens te lezen [s]",
-    "Update unchanged states": "Update ongewijzigde statussen"
+    "Update unchanged states": "Update ongewijzigde statussen",
+    "Interval to read statistical data": "Interval om statistische gegevens te lezen [s]"
 }

package/admin/i18n/pl/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Interwał odczytu danych w czasie rzeczywistym [s]",
     "Interval to read settings data": "Interwał odczytu danych ustawień [s]",
     "Interval to read energy data": "Interwał odczytu danych dotyczących energii [s]",
-    "Update unchanged states": "Zaktualizuj niezmienione stany"
+    "Update unchanged states": "Zaktualizuj niezmienione stany",
+    "Interval to read statistical data": "Interwał odczytu danych statystycznych [s]"
 }

package/admin/i18n/pt/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Intervalo para ler dados em tempo real [s]",
     "Interval to read settings data": "Intervalo para ler os dados de configurações [s]",
     "Interval to read energy data": "Intervalo para ler dados de energia [s]",
-    "Update unchanged states": "Atualizar estados inalterados"
+    "Update unchanged states": "Atualizar estados inalterados",
+    "Interval to read statistical data": "Intervalo para ler dados estatísticos [s]"
 }

package/admin/i18n/ru/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Интервал для чтения данных в реальном времени [с]",
     "Interval to read settings data": "Интервал чтения данных настроек [с]",
     "Interval to read energy data": "Интервал для чтения данных об энергии [с]",
-    "Update unchanged states": "Обновить неизмененные состояния"
+    "Update unchanged states": "Обновить неизмененные состояния",
+    "Interval to read statistical data": "Интервал чтения статистических данных [с]"
 }

package/admin/i18n/uk/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "Інтервал читання даних у реальному часі [с]",
     "Interval to read settings data": "Інтервал читання даних налаштувань [с]",
     "Interval to read energy data": "Інтервал зчитування даних про енергію [с]",
-    "Update unchanged states": "Оновити незмінні стани"
+    "Update unchanged states": "Оновити незмінні стани",
+    "Interval to read statistical data": "Інтервал читання статистичних даних [с]"
 }

package/admin/i18n/zh-cn/translations.json

@@ -6,5 +6,6 @@
     "Interval to read realtime data": "读取实时数据的间隔 [s]",
     "Interval to read settings data": "读取设置数据的间隔 [s]",
     "Interval to read energy data": "读取能量数据的间隔[s]",
-    "Update unchanged states": "更新未改变的状态"
+    "Update unchanged states": "更新未改变的状态",
+    "Interval to read statistical data": "读取统计数据的间隔[s]"
 }

package/admin/jsonConfig.json

@@ -26,7 +26,7 @@
         },
         "intervalRealtimedata": {
             "sm": 5,
-            "min":10,
+            "min": 10,
             "type": "number",
             "label": "Interval to read realtime data",
             "newLine": false
@@ -37,7 +37,7 @@
         },
         "intervalEnergydata": {
             "sm": 5,
-            "min":60,
+            "min": 60,
             "type": "number",
             "label": "Interval to read energy data",
             "newLine": false
@@ -48,11 +48,22 @@
         },
         "intervalSettingsdata": {
             "sm": 5,
-            "min":60,
+            "min": 60,
             "type": "number",
             "label": "Interval to read settings data",
             "newLine": false
         },
+        "enableStatisticaldata": {
+            "type": "checkbox",
+            "newLine": true
+        },
+        "intervalStatisticaldata": {
+            "sm": 5,
+            "min": 60,
+            "type": "number",
+            "label": "Interval to read statistical data",
+            "newLine": false
+        },
         "updateUnchangedStates": {
             "type": "checkbox",
             "label": "Update unchanged states",

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "alpha-ess",
-    "version": "0.2.0",
+    "version": "0.2.1-beta.0",
     "news": {
+      "0.2.1-beta.0": {
+        "en": "Read selected statistical data",
+        "de": "Ausgewählte statistische Daten",
+        "ru": "Прочитать выбранные статистические данные",
+        "pt": "Leia dados estatísticos selecionados",
+        "nl": "Vertaling:",
+        "fr": "Lire les données statistiques sélectionnées",
+        "it": "Dati statistici selezionati",
+        "es": "Lea los datos estadísticos seleccionados",
+        "pl": "Czytamy dane statystyczne",
+        "uk": "Читати вибрані статистичні дані",
+        "zh-cn": "阅读选定的统计数据"
+      },
       "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",
@@ -80,19 +93,6 @@
         "pl": "NPM",
         "uk": "Увімкнути NPM",
         "zh-cn": "国家预防机制"
-      },
-      "0.0.6-beta.1": {
-        "en": "...",
-        "de": "...",
-        "ru": "...",
-        "pt": "...",
-        "nl": "...",
-        "fr": "...",
-        "it": "...",
-        "es": "...",
-        "pl": "...",
-        "uk": "...",
-        "zh-cn": "..."
       }
     },
     "titleLang": {
@@ -171,6 +171,8 @@
     "intervalEnergydata": 300,
     "enableSettingsdata": false,
     "intervalSettingsdata": 300,
+    "enableStatisticaldata": false,
+    "intervalStatisticaldata": 300,
     "updateUnchangedStates": false
   },
   "objects": [],

package/main.js

@@ -353,6 +353,32 @@ const stateList = [{
             , unit: 'kWh'
             , dayIndex: true
         }]
+},
+{
+    Group: 'Statistics'
+    , states: [
+        {
+            stateName: 'EselfSufficiency'
+            , role: 'value'
+            , id: 'Self_sufficiency_today'
+            , name: 'Self sufficiency today'
+            , type: 'number'
+            , unit: '%'
+            , factor: 100
+            , round: 1
+            , dayIndex: false
+        }
+        , {
+            stateName: 'EselfConsumption'
+            , role: 'value'
+            , id: 'Self_consumption_today'
+            , name: 'Self consumption today'
+            , type: 'number'
+            , unit: '%'
+            , factor: 100
+            , round: 1
+            , dayIndex: false
+        }]
 }];
 
 class AlphaEss extends utils.Adapter {
@@ -370,6 +396,7 @@ class AlphaEss extends utils.Adapter {
         this.realtimeDataTimeoutHandle = null;
         this.energyDataTimeoutHandle = null;
         this.settingsDataTimeoutHandle = null;
+        this.statisticalDataTimeoutHandle = null;
         this.wrongCredentials = false;
         this.errorCount = 0;
 
@@ -400,13 +427,17 @@ class AlphaEss extends utils.Adapter {
             // Reset the connection indicator during startup
             await this.setStateChangedAsync('info.connection', false, true);
 
-            this.log.debug('config username:             ' + this.config.username);
-            this.log.debug('config systemId:             ' + this.config.systemId);
-            this.log.debug('config intervalRealtimedata: ' + this.config.intervalRealtimedata);
-            this.log.debug('config intervalSettingsdata: ' + this.config.intervalSettingsdata);
-            this.log.debug('config enableRealtimedata:   ' + this.config.enableRealtimedata);
-            this.log.debug('config enableSettingsdata:   ' + this.config.enableSettingsdata);
-            this.log.debug('config updateUnchangedStates:' + this.config.updateUnchangedStates);
+            this.log.debug('config username:                ' + this.config.username);
+            this.log.debug('config systemId:                ' + this.config.systemId);
+            this.log.debug('config intervalRealtimedata:    ' + this.config.intervalRealtimedata);
+            this.log.debug('config intervalSettingsdata:    ' + this.config.intervalSettingsdata);
+            this.log.debug('config intervalEnergydata:      ' + this.config.intervalEnergydata);
+            this.log.debug('config intervalStatisticaldata: ' + this.config.intervalStatisticaldata);
+            this.log.debug('config enableRealtimedata:      ' + this.config.enableRealtimedata);
+            this.log.debug('config enableSettingsdata:      ' + this.config.enableSettingsdata);
+            this.log.debug('config enableEnergydata:        ' + this.config.enableEnergydata);
+            this.log.debug('config enableStatisticaldata:   ' + this.config.enableStatisticaldata);
+            this.log.debug('config updateUnchangedStates:   ' + this.config.updateUnchangedStates);
 
             this.wrongCredentials = false;
 
@@ -433,6 +464,12 @@ class AlphaEss extends utils.Adapter {
                 else {
                     this.log.info('Settings data disabled! Adapter won\'t fetch settings data.');
                 }
+                if (this.config.enableStatisticaldata) {
+                    await this.fetchStatisticalData();
+                }
+                else {
+                    this.log.info('Settings data disabled! Adapter won\'t fetch statistical data.');
+                }
             }
             else {
                 this.log.error('No username, password and/or system ID set! Adapter won\'t fetch any data.');
@@ -461,6 +498,10 @@ class AlphaEss extends utils.Adapter {
                 clearTimeout(this.settingsDataTimeoutHandle);
                 this.settingsDataTimeoutHandle = null;
             }
+            if (this.statisticalDataTimeoutHandle) {
+                clearTimeout(this.statisticalDataTimeoutHandle);
+                this.statisticalDataTimeoutHandle = null;
+            }
             this.resetAuth();
 
             callback();
@@ -644,7 +685,7 @@ class AlphaEss extends utils.Adapter {
             this.log.debug('Fetching energy data...');
 
             const dt = new Date();
-            const dts = (dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-01');
+            const dts = (dt.getFullYear() + '-0' + (dt.getMonth() + 1) + '-01');
             const json = {
                 'statisticBy': 'month',
                 'sDate': dts,
@@ -686,6 +727,33 @@ class AlphaEss extends utils.Adapter {
         }
     }
 
+    async fetchStatisticalData() {
+        try {
+            if (this.statisticalDataTimeoutHandle) {
+                clearTimeout(this.statisticalDataTimeoutHandle);
+                this.statisticalDataTimeoutHandle = null;
+            }
+            const groupName = 'Statistics';
+
+            this.log.debug('Fetching statistical data...');
+
+            const dt = new Date();
+            const dts = (dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate());
+
+            const body = await this.getData(BaseURI + 'api/Power/SticsByPeriod?beginDay=' + dts + '&endDay=' + dts +
+                '&tDay=' + dts + '&isOEM=0&SN=' + this.config.systemId + '&userID=&noLoading=true');
+
+            this.createAndUpdateStates(groupName, body.data);
+
+            if (!this.statisticalDataTimeoutHandle) {
+                this.statisticalDataTimeoutHandle = setTimeout(() => this.fetchStatisticalData(), this.calculateIntervalInMs(this.config.intervalStatisticaldata, groupName));
+            }
+        }
+        catch (e) {
+            this.log.error('fetchStatisticalData Exception occurred: ' + e);
+        }
+    }
+
     /**
      * @param {string} groupName
      * @param {{ [s: string]: any; }} data
@@ -726,6 +794,12 @@ class AlphaEss extends utils.Adapter {
                         switch (stateInfo.type) {
                             case 'number':
                                 tvalue = Number.parseFloat(value);
+                                if (stateInfo.factor) {
+                                    tvalue *= stateInfo.factor;
+                                }
+                                if (stateInfo.round) {
+                                    tvalue = (Math.round(tvalue * (10 ** stateInfo.round))) / (10 ** stateInfo.round);
+                                }
                                 break;
                             case 'boolean':
                                 tvalue = Number.parseInt(value) != 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.alpha-ess",
-  "version": "0.2.0",
+  "version": "0.2.1-beta.0",
   "description": "Read and write data from and to Alpha ESS systems.",
   "author": {
     "name": "Gaspode",