iobroker.alpha-ess 1.0.0 → 1.0.1

package/README.md

@@ -14,10 +14,7 @@
 This adapter logs into the web API of [Alpha ESS](https://www.alphaess.com/) and retrieves information for your Alpha ESS equipment.\
 Depending on your Alpha ESS product, it is possible to get realtime data and configuration data for your equipment. Which data points are returned by the API depends on your Alpha ESS equipment.
 
-This adapter supports two APIs, the internal Alpha ESS Web API, which may be changed at any time by Alpha ESS, and the Alpha ESS Open API, which provides less functionality but is on official and documented API to Alpha ESS devices.
-
-Currently this adapter creates a state with a hopefully self explaining name for each suppoerted data point.\
-All other data points are ignored. During adapter start these data points are logged as debug message.
+This adapter supports two APIs, the internal Alpha ESS Web API, which may be changed at any time by Alpha ESS, and the Alpha ESS Open API, which provides less functionality but is an official and documented API for Alpha ESS devices.
 
 Staring with version 1.0.0-alpha.5, the quality attribute of each state is set accordingly to its status:
 | Quality | meaning |
@@ -65,6 +62,10 @@ To be able to use the new Open API you have to register your Alpha-ESS device un
 **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
+### 1.0.1 (2023-10-03)
+
+-   (Gaspode) Adapted fetching energy values using 'Closed API' to latest API changes by Alpha-ESS
+
 ### 1.0.0 (2023-06-20)
 
 -   (Gaspode) Support also the new official OpenAPI provided by Alpha-ESS

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "alpha-ess",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "news": {
+      "1.0.1": {
+        "en": "Adapted fetching energy values using 'Closed API' to latest API changes by Alpha-ESS",
+        "de": "Closed API: Energiewerte an neueste API-Änderungen von Alpha-ESS angepasst",
+        "ru": "Адаптированные выкачивание энергетических ценностей с помощью 'Closed API' для последних изменений API от Alpha-ESS",
+        "pt": "Valores de energia de busca adaptados usando ' API fechada' para as últimas alterações de API por Alpha-ESS",
+        "nl": "API verandert door Alpha-ESSS",
+        "fr": "Récupération des valeurs d'énergie à l'aide de 'API fermée' aux dernières modifications de l'API par Alpha-ESS",
+        "it": "Adattato l'ottenimento di valori energetici utilizzando 'API archiviate' alle ultime modifiche API di Alpha-ESS",
+        "es": "Valores de energía adaptados de búsqueda usando 'Closed API' para los últimos cambios de API por Alpha-ESS",
+        "pl": "Adapted fetching energy values używając 'Closed API' do najnowszych zmian API przez Alpha-ESS",
+        "uk": "Адаптивовані коефіцієнти відтікання енергії за допомогою 'Closed API' для останніх змін API від Alpha-ESS",
+        "zh-cn": "利用“无能”的能源价值降低到Alpha-ESS新生动的改变"
+      },
       "1.0.0": {
         "en": "Support also the new official OpenAPI provided by Alpha-ESS\nSet state quality accordingly to status of data\nWriting charging and discharging settings implemented for 'Closed API' and OpenAPI\nRemove no more supported states at startup automatically",
         "de": "Unterstützung der neuen offiziellen OpenAPI von Alpha-ESS\nQuality von States wird jetzt entsprechend des Zustands der Daten gesetzt\nSchreiben von Lade- und Entladeeinstellungen für 'Closed API' und OpenAPI implementiert\nNicht mehr unterstützte States werden bei Adapter-Neustart automatisch gelöscht",
@@ -80,19 +93,6 @@
         "pl": "Pisanie ładowania i rozładowania wdrożone (OpenAPI)",
         "uk": "Написання параметрів зарядки та розвантаження (OpenAPI тільки)",
         "zh-cn": "标定和执行的慈善环境(仅为泛美卫生组织)"
-      },
-      "1.0.0-alpha.0": {
-        "en": "Support also the new official OpenAPI provided by Alpha-ESS",
-        "de": "Unterstützung jetzt auch die neue offizielle OpenAPI von Alpha-ESS",
-        "ru": "Поддержка также новый официальный OpenAPI, предоставленный Alpha-ESS",
-        "pt": "Suporte também o novo OpenAPI oficial fornecido pela Alpha-ESS",
-        "nl": "Vertaling:",
-        "fr": "Soutien également le nouveau OpenAPI officiel fourni par Alpha-ESS",
-        "it": "Supporto anche il nuovo OpenAPI ufficiale fornito da Alpha-ESS",
-        "es": "Apoyar también el nuevo OpenAPI oficial proporcionado por Alpha-ESS",
-        "pl": "Wspiera również nowy oficjalny interfejs OpenAPI zapewniany przez Alpha-ESS",
-        "uk": "Підтримка також нових офіційних OpenAPI, що надається Альфа-ESS",
-        "zh-cn": "还支持阿尔法-萨斯新官方开放协会"
       }
     },
     "titleLang": {

package/main.js

@@ -1086,58 +1086,58 @@ class ClosedAPI {
             , intervalFactor: 60
             , states: [
                 {
-                    alphaAttrName: 'Eloads'
+                    alphaAttrName: 'Eload'
                     , role: 'value.power.consumption'
                     , id: 'Consumption_today'
                     , name: 'Today\'s consumption'
                     , type: 'number'
                     , unit: 'kWh'
-                    , dayIndex: true
+                    , dayIndex: false
                 }
                 , {
-                    alphaAttrName: 'Epvs'
+                    alphaAttrName: 'Epvtoday'
                     , role: 'value.power.consumption'
                     , id: 'Generation_today'
                     , name: 'Today\'s generation'
                     , type: 'number'
                     , unit: 'kWh'
-                    , dayIndex: true
+                    , dayIndex: false
                 }
                 , {
-                    alphaAttrName: 'Eoutputs'
+                    alphaAttrName: 'Eoutput'
                     , role: 'value.power.consumption'
                     , id: 'Grid_feed_in_today'
                     , name: 'Today\'s grid feed in'
                     , type: 'number'
                     , unit: 'kWh'
-                    , dayIndex: true
+                    , dayIndex: false
                 }
                 , {
-                    alphaAttrName: 'Einputs'
+                    alphaAttrName: 'Einput'
                     , role: 'value.power.consumption'
                     , id: 'Grid_consumption_today'
                     , name: 'Today\'s grid consumption'
                     , type: 'number'
                     , unit: 'kWh'
-                    , dayIndex: true
+                    , dayIndex: false
                 }
                 , {
-                    alphaAttrName: 'ECharge'
+                    alphaAttrName: 'Echarge'
                     , role: 'value.power.consumption'
                     , id: 'Battery_charge_today'
                     , name: 'Today\'s battery charge'
                     , type: 'number'
                     , unit: 'kWh'
-                    , dayIndex: true
+                    , dayIndex: false
                 }
                 , {
-                    alphaAttrName: 'EDischarge'
+                    alphaAttrName: 'EDisCharge'
                     , role: 'value.power.consumption'
                     , id: 'Battery_discharge_today'
                     , name: 'Today\'s battery discharge'
                     , type: 'number'
                     , unit: 'kWh'
-                    , dayIndex: true
+                    , dayIndex: false
                 }]
         },
         {
@@ -1690,20 +1690,17 @@ class ClosedAPI {
         try {
             this.adapter.stopGroupTimeout(group);
 
-            this.adapter.log.debug('Fetching ' + group + ' data...');
+            this.adapter.log.debug('Fetching summary data...');
 
             const dt = new Date();
-            const dts = (dt.getFullYear() + '-0' + (dt.getMonth() + 1) + '-01');
-            const json = {
-                'statisticBy': 'month',
-                'sDate': dts,
-                'isOEM': 0,
-                'sn': this.adapter.config.systemId,
-                'userId': '',
-            };
-            const body = await this.postData(CA_BaseURI + 'api/Statistic/SystemStatistic', JSON.stringify(json), group);
+            const dts = (dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate());
+
+            const body = await this.getData(CA_BaseURI + 'api/ESS/SticsSummeryDataForCustomer?sn=' + this.adapter.config.systemId +
+                '&tday=' + dts + '&noLoading=true', group);
+
             await this.adapter.createAndUpdateStates(group, body.data);
 
+            // Configuration is in minutes, so multiply with 60
             this.startGroupTimeout(group);
         }
         catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.alpha-ess",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Read and write data from and to Alpha ESS systems.",
   "author": {
     "name": "Gaspode",
@@ -19,36 +19,36 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.8",
-    "axios": "^1.4.0"
+    "@iobroker/adapter-core": "^3.0.3",
+    "axios": "^1.5.0"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.5.9",
-    "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
+    "@alcalzone/release-script": "^3.6.0",
+    "@alcalzone/release-script-plugin-iobroker": "^3.6.0",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
     "@iobroker/adapter-dev": "^1.2.0",
     "@iobroker/testing": "^4.1.0",
-    "@tsconfig/node14": "^1.0.3",
-    "@tsconfig/node18": "^2.0.0",
+    "@tsconfig/node14": "^14.1.0",
+    "@tsconfig/node18": "^18.2.2",
     "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^18.16.3",
+    "@types/mocha": "^10.0.2",
+    "@types/node": "^20.8.0",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.41.0",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint": "^8.50.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.2.0",
     "prettier": "^2.8.7",
     "proxyquire": "^2.1.3",
-    "sinon": "^15.1.0",
+    "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.0.4"
+    "typescript": "~5.2.2"
   },
   "main": "main.js",
   "files": [