iobroker.sbfspot 4.0.8 → 4.1.0

package/.github/workflows/test-and-release.yml

@@ -28,7 +28,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Use Node.js ${{ matrix.node-version }}
               uses: actions/setup-node@v1
               with:
@@ -51,14 +51,14 @@ jobs:
         runs-on: ${{ matrix.os }}
         strategy:
             matrix:
-                node-version: [ 12.x, 14.x, 16.x]
+                node-version: [12.x, 14.x, 16.x]
                 os: [ubuntu-latest, windows-latest, macos-latest]
                 exclude:
                     # Don't test Node.js 8 on Windows. npm is weird here
                     - os: windows-latest
                       node-version: 8.x
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Use Node.js ${{ matrix.node-version }}
               uses: actions/setup-node@v1
               with:
@@ -78,7 +78,7 @@ jobs:
               if: startsWith(runner.OS, 'windows')
               run: set DEBUG=testing:* & npm run test:integration
 
-# TODO: To enable automatic npm releases, create a token on npmjs.org 
+# TODO: To enable automatic npm releases, create a token on npmjs.org
 # Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options
 # Then uncomment the following block:
 
@@ -90,6 +90,7 @@ jobs:
 #        if: |
 #            contains(github.event.head_commit.message, '[skip ci]') == false &&
 #            github.event_name == 'push' &&
+#            github.event.base_ref == 'refs/heads/master' &&
 #            startsWith(github.ref, 'refs/tags/v')
 #
 #        runs-on: ubuntu-latest
@@ -98,7 +99,7 @@ jobs:
 #                node-version: [12.x]
 #
 #        steps:
-#            - uses: actions/checkout@v1
+#            - uses: actions/checkout@v2
 #            - name: Use Node.js ${{ matrix.node-version }}
 #              uses: actions/setup-node@v1
 #              with:

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) <2017-2021>  <info@rg-engineering.eu>
+Copyright (C) <2017-2022>  <info@rg-engineering.eu>
 
 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:
 

package/README.md

@@ -51,6 +51,9 @@ sometimes npm intall must be called more then one time to successfully install a
 
 ## Changelog
 
+### 4.1.0 (2022-04-21)
+* (René) add datapoint to show when data uploaded to sbfspot
+
 ### 4.0.8 (2021-07-11)
 * (René) bug fix color of labels in widget
 
@@ -182,7 +185,7 @@ sometimes npm intall must be called more then one time to successfully install a
 
 
 ## License
-Copyright (C) <2017-2021>  <info@rg-engineering.eu>
+Copyright (C) <2017-2022>  <info@rg-engineering.eu>
 
 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:
 

package/io-package.json

@@ -1,8 +1,20 @@
 {
     "common": {
         "name": "sbfspot",
-        "version": "4.0.8",
+        "version": "4.1.0",
         "news": {
+            "4.1.0": {
+                "en": "add datapoint to show when data uploaded to sbfspot",
+                "de": "Datenpunkt hinzufügen, um anzuzeigen, wann Daten auf sbfspot hochgeladen wurden",
+                "ru": "добавить точку данных, чтобы показать, когда данные загружаются в sbfspot",
+                "pt": "adicionar ponto de dados para mostrar quando os dados são carregados no sbfspot",
+                "nl": "voeg datapunt toe om te laten zien wanneer gegevens zijn geüpload naar sbfspot",
+                "fr": "ajouter un point de données pour montrer quand les données sont téléchargées sur sbfspot",
+                "it": "aggiungi datapoint per mostrare quando i dati sono stati caricati su sbfspot",
+                "es": "agregue un punto de datos para mostrar cuándo se cargan los datos en sbfspot",
+                "pl": "dodaj punkt danych, aby pokazać, kiedy dane zostały przesłane do sbfspot",
+                "zh-cn": "添加数据点以显示何时将数据上传到 sbfspot"
+            },
             "4.0.8": {
                 "en": "bug fix color of labels in widget",
                 "de": "Fehlerkorrektur Farbe der Labels im Widget",

package/lib/tools.js

@@ -56,7 +56,7 @@ async function translateYandex(text, targetLang, apiKey) {
     }
     try {
         const url = `https://translate.yandex.net/api/v1.5/tr.json/translate?key=${apiKey}&text=${encodeURIComponent(text)}&lang=en-${targetLang}`;
-        const response = await axios({url, timeout: 15000});
+        const response = await axios({ url, timeout: 15000 });
         if (response.data && response.data.text && isArray(response.data.text)) {
             return response.data.text[0];
         }
@@ -75,7 +75,7 @@ async function translateYandex(text, targetLang, apiKey) {
 async function translateGoogle(text, targetLang) {
     try {
         const url = `http://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=${targetLang}&dt=t&q=${encodeURIComponent(text)}&ie=UTF-8&oe=UTF-8`;
-        const response = await axios({url, timeout: 15000});
+        const response = await axios({ url, timeout: 15000 });
         if (isArray(response.data)) {
             // we got a valid response
             return response.data[0][0][0];

package/main.js

@@ -15,8 +15,12 @@ Copyright(C)[2016-2020][René Glaß]
 "use strict";
 
 const utils = require("@iobroker/adapter-core");
+//const { json } = require("stream/consumers");
 const SunCalc = require("suncalc2");
 
+
+
+
 let adapter;
 function startAdapter(options) {
     options = options || {};
@@ -110,6 +114,7 @@ async function main() {
 
                     await GetInverter(i, rows);
 
+                    await DB_CheckLastUploads(serial);
 
                     let rows1 = await DB_GetInvertersData(serial);
 
@@ -151,12 +156,8 @@ async function main() {
                                 }
 
                             }
-
                         }
-
-
                     }
-
                 }
             } else {
                 //
@@ -165,8 +166,6 @@ async function main() {
             }
         }
         DB_Disconnect();
-
-
     }
     else {
         adapter.log.info("nothing to do, because no daylight ... ");
@@ -185,18 +184,23 @@ async function main() {
 }
 
 async function GetSystemDateformat() {
-    const ret = await adapter.getForeignObjectAsync("system.config");
-    
-    if (typeof ret != undefined && ret != null) {
-        //dateformat = ret.common.dateFormat;
-        longitude = ret.common.longitude;
-        latitude = ret.common.latitude;
-        adapter.log.debug("system  longitude " + longitude + " latitude " + latitude);
+    try {
+        const ret = await adapter.getForeignObjectAsync("system.config");
+
+        if (typeof ret != undefined && ret != null) {
+            //dateformat = ret.common.dateFormat;
+            longitude = ret.common.longitude;
+            latitude = ret.common.latitude;
+            adapter.log.debug("system: longitude " + longitude + " latitude " + latitude);
+        }
+        else {
+            adapter.log.error("system.config not available. longitude and latitude set to Berlin");
+            longitude = 52.520008;
+            latitude = 13.404954;
+        }
     }
-    else {
-        adapter.log.error("system.config not available. longitude and latitude set to Berlin");
-        longitude = 52.520008;
-        latitude = 13.404954;
+    catch (e) {
+        adapter.log.error("exception in GetSystemDateformat [" + e + "]");
     }
 }
 
@@ -324,6 +328,9 @@ async function AddInverterVariables(serial) {
     await AddObject(serial.toString() + ".history.last12Months", "state", "SMA inverter history last 12 Months (JSON)", "string", "value", "", true, false);
     await AddObject(serial.toString() + ".history.years", "state", "SMA inverter history years (JSON)", "string", "value", "", true, false);
 
+    await AddObject(serial.toString() + ".sbfspot.LastUpload", "state", "date/time of last upload to sbfspot", "string", "value", "", true, false);
+    await AddObject(serial.toString() + ".sbfspot.notUploaded", "state", "number of datapoints waiting for upload", "number", "value", "", true, false);
+
 
     adapter.log.debug("AddInverterVariables done " );
 }
@@ -467,49 +474,78 @@ async function DB_Connect() {
     return ret;
 }
 
+async function DB_Query(query) {
+
+    adapter.log.debug(query);
+    let retRows;
 
+    if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
 
+        const [rows, fields] = await mysql_connection.execute(query);
+        retRows = rows;
 
+    } else {
+        const stmt = sqlite_db.prepare(query);
 
-async function DB_GetInverters() {
+        const rows = stmt.all();
+        retRows = rows;
+    }
+
+    adapter.log.debug(JSON.stringify(retRows));
+
+    return retRows;
+}
+
+async function DB_CheckLastUploads(serial) {
 
-    let retRows;
     try {
-        const query = "SELECT * from Inverters";
-        //numOfInverters = 0;
-        adapter.log.debug(query);
+        let query = "SELECT `TimeStamp` FROM `DayData` WHERE `PVoutput` is null    ";
 
+        let rows = await DB_Query(query);
 
+        let notUploaded = rows.length;
 
-        if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
+        await adapter.setStateAsync(serial + ".sbfspot.notUploaded", { ack: true, val: notUploaded });
 
-            const [rows, fields] = await mysql_connection.execute(query);
+        query = "SELECT `TimeStamp` FROM `DayData` WHERE `PVoutput` = 1 ORDER BY TimeStamp DESC LIMIT 1   ";
 
-            retRows = rows;
+        rows = await DB_Query(query);
 
-            //await GetInverter(0, rows);
+        if (rows.length > 0) {
+            let updateTimestamp = rows[0].TimeStamp;
+            const oDate = new Date(updateTimestamp * 1000);
+            const oDateNow = new Date();
 
-           
-        } else {
+            oDateNow.setDate(oDateNow.getDate() - 1);
 
-            const stmt = sqlite_db.prepare(query);
 
-            const rows = stmt.all();
-            retRows = rows;
-            //await GetInverter(0, rows);
+            if (oDate < oDateNow) {
+                adapter.log.error("no upload to sbfspot since " + oDate.toLocaleString());
+            }
+
+            let lastUpload = oDate.toLocaleString();
 
-            
+            await adapter.setStateAsync(serial + ".sbfspot.LastUpload", { ack: true, val: lastUpload });
         }
+    }
+    catch (e) {
+        adapter.log.error("exception in DB_CheckLastUploads [" + e + "]");
+    }
+}
 
-        
 
 
+async function DB_GetInverters() {
+
+    let retRows;
+    try {
+        const query = "SELECT * from Inverters";
+        retRows = await DB_Query(query);
     }
     catch (e) {
         adapter.log.error("exception in DB_GetInverters [" + e + "]");
     }
 
-
     return retRows;
 }
 
@@ -574,28 +610,7 @@ async function DB_GetInvertersData(serial) {
     try {
         //SELECT * from SpotData  where Serial ='2000562095' ORDER BY TimeStamp DESC LIMIT 1
         const query = "SELECT * from SpotData  where Serial =" + serial + " ORDER BY TimeStamp DESC LIMIT 1";
-        adapter.log.debug(query);
-        if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
-            //we only get one row = last one
-
-            const [rows, fields] = await mysql_connection.execute(query);
-
-            retRows = rows;
-            //await GetInverterData(0, rows, serial);
-
-            
-        } else {
-
-            const stmt = sqlite_db.prepare(query);
-
-            const rows = stmt.all();
-
-            retRows = rows;
-
-            //await GetInverterData(0, rows, serial);
-
-            
-        }
+        retRows = await DB_Query(query);
     }
     catch (e) {
         adapter.log.error("exception in DB_GetInvertersData [" + e + "]");
@@ -701,25 +716,7 @@ async function DB_CalcHistory_LastMonth(serial) {
         } else {
             query = "SELECT strftime('%Y-%m-%d', datetime(TimeStamp, 'unixepoch')) as date, Max(`EToday`) as ertrag FROM `SpotData` WHERE `Serial` = '" + serial + "' AND TimeStamp>= " + datefrom.getTime() / 1000 + " AND TimeStamp<= " + dateto.getTime() / 1000 + " Group By strftime('%Y-%m-%d', datetime(TimeStamp, 'unixepoch'))";
         }
-        adapter.log.debug(query);
-        if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
-
-            const [rows, fields] = await mysql_connection.execute(query);
-
-            retRows = rows;
-            //await calcHistory_LastMonth(0, rows, serial);
-
-            
-        } else {
-
-            const stmt = sqlite_db.prepare(query);
-
-            const rows = stmt.all();
-            retRows = rows;
-            //await CalcHistory_LastMonth(0, rows, serial);
-
-            
-        }
+        retRows = await DB_Query(query);
     }
     catch (e) {
         adapter.log.error("exception in DB_CalcHistory_LastMonth [" + e + "]");
@@ -784,26 +781,7 @@ async function DB_CalcHistory_Prepare(serial) {
         } else {
             query = "SELECT strftime('%Y-%m-%d', datetime(TimeStamp, 'unixepoch')) as date, ETotal  FROM `SpotData` WHERE `Serial` = '" + serial + "' ORDER by `TimeStamp` ASC LIMIT  1";
         }
-        adapter.log.debug(query);
-
-        if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
-
-            const [rows, fields] = await mysql_connection.execute(query);
-
-            retRows = rows;
-            //await CalcHistory_Prepare(0, rows, serial);
-
-
-        } else {
-
-
-            const stmt = sqlite_db.prepare(query);
-
-            const rows = stmt.all();
-            retRows = rows;
-            //await CalcHistory_Prepare(0, rows, serial);
-
-        }
+        retRows = await DB_Query(query);
     }
     catch (e) {
         adapter.log.error("exception in DB_CalcHistory_Prepare [" + e + "]");
@@ -860,25 +838,7 @@ async function DB_CalcHistory_Today(serial) {
         } else {
             query = "SELECT strftime('%H:%m', datetime(TimeStamp, 'unixepoch')) as time, Max(`EToday`) as ertrag FROM `SpotData` WHERE `Serial` = '" + serial + "' AND TimeStamp>= " + datefrom.getTime() / 1000 + " AND TimeStamp<= " + dateto.getTime() / 1000 + " Group By strftime('%H-%m', datetime(TimeStamp, 'unixepoch'))";
         }
-        adapter.log.debug(query);
-        if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
-
-            const [rows, fields] = await mysql_connection.execute(query);
-            retRows = rows;
-
-            //await CalcHistory_Today(0, rows, serial);
-
-            
-        } else {
-
-            const stmt = sqlite_db.prepare(query);
-
-            const rows = stmt.all();
-            retRows = rows;
-            //await CalcHistory_Today(0, rows, serial);
-
-           
-        }
+        retRows = await DB_Query(query);
     }
     catch (e) {
         adapter.log.error("exception in DB_CalcHistory_Today [" + e + "]");
@@ -908,12 +868,11 @@ async function CalcHistory_Today(err, rows, serial) {
                 "time": data["time"],
                 "value": data["ertrag"]
             });
-            //adapter.log.debug(JSON.stringify(oLastDays));
+
         }
 
         await adapter.setStateAsync(serial + ".history.today", { ack: true, val: JSON.stringify(oLastDays) });
 
-        //await DB_CalcHistory_Years(serial);
     } else {
         adapter.log.error("Error while performing Query in CalcHistory_Today. " + err);
     }
@@ -937,27 +896,7 @@ async function DB_CalcHistory_Years(serial) {
         } else {
             query = "SELECT strftime('%Y', datetime(TimeStamp, 'unixepoch')) as date, Max(`ETotal`) as ertrag, Min(`ETotal`) as startertrag FROM `SpotData` WHERE `Serial` = '" + serial + "' Group By strftime('%Y', datetime(TimeStamp, 'unixepoch'))";
         }
-        adapter.log.debug(query);
-        if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
-
-            const [rows, fields] = await mysql_connection.execute(query);
-
-            retRows = rows;
-            //await CalcHistory_Years(0, rows, serial);
-
-           
-        } else {
-
-            const stmt = sqlite_db.prepare(query);
-
-            const rows = stmt.all();
-            retRows = rows;
-
-            //await CalcHistory_Years(0, rows, serial);
-
-            
-
-        }
+        retRows = await DB_Query(query);
     }
     catch (e) {
         adapter.log.error("exception in DB_CalcHistory_Years [" + e + "]");
@@ -1053,7 +992,6 @@ async function CalcHistory_Years(err, rows, serial) {
         adapter.log.debug(JSON.stringify(oLastYears));
         await adapter.setStateAsync(serial + ".history.years", { ack: true, val: JSON.stringify(oLastYears) });
 
-        //await DB_CalcHistory_Months(serial);
     } else {
         adapter.log.error("Error while performing Query in CalcHistory_Years. " + err);
     }
@@ -1086,24 +1024,7 @@ async function DB_CalcHistory_Months(serial) {
         } else {
             query = "SELECT strftime('%Y-%m', datetime(TimeStamp, 'unixepoch')) as date, Max(`ETotal`) as ertrag FROM `SpotData` WHERE `Serial` = '" + serial + "' AND TimeStamp>= " + datefrom.getTime() / 1000 + " AND TimeStamp<= " + dateto.getTime() / 1000 + " Group By strftime('%Y-%m', datetime(TimeStamp, 'unixepoch'))";
         }
-        adapter.log.debug(query);
-        if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
-
-            const [rows, fields] = await mysql_connection.execute(query);
-            retRows = rows;
-            //await CalcHistory_Months(0, rows, serial);
-
-
-        } else {
-
-            const stmt = sqlite_db.prepare(query);
-
-            const rows = stmt.all();
-            retRows = rows;
-            //await CalcHistory_Months(0, rows, serial);
-
-           
-        }
+        retRows = await DB_Query(query);
     }
     catch (e) {
         adapter.log.error("exception in DB_CalcHistory_Months [" + e + "]");
@@ -1122,7 +1043,6 @@ async function CalcHistory_Months(err, rows, serial) {
         adapter.log.debug("rows " + JSON.stringify(rows));
 
         const oLastMonth = [];
-        //var monthdata = {};
 
         for (const i in rows) {
 
@@ -1132,12 +1052,11 @@ async function CalcHistory_Months(err, rows, serial) {
                 "month": data["date"],
                 "value": data["ertrag"]
             });
-            //adapter.log.debug(JSON.stringify(oLastDays));
+
         }
 
         await adapter.setStateAsync(serial + ".history.last12Months", { ack: true, val: JSON.stringify(oLastMonth) });
 
-        //DB_Disconnect();
     } else {
         adapter.log.error("Error while performing Query in CalcHistory_Months. " + err);
     }
@@ -1189,10 +1108,6 @@ async function DB_AddDummyData() {
 
 function DB_Disconnect() {
 
-    //numOfInverters--;
-    // wait for all data paths... last data path will close connection
-
-    //if (numOfInverters == 0) {
     adapter.log.debug("disconnect database");
     if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
         if (typeof mysql_connection != undefined && mysql_connection != null) {
@@ -1205,124 +1120,10 @@ function DB_Disconnect() {
     }
 
     adapter.log.info("all done ... ");
-
-    
-    //} else {
-    //    adapter.log.debug("need to wait for disconnect");
-    //}
-}
-
-
-/**
- * @param {string} timeVal
- * @param {string} timeLimit
- */
-/*
-function IsLater(timeVal, timeLimit) {
-
-    let ret = false;
-    try {
-        adapter.log.debug("check IsLater : " + timeVal + " " + timeLimit);
-
-        if (typeof timeVal === "string" && typeof timeLimit === "string") {
-            const valIn = timeVal.split(":");
-            const valLimits = timeLimit.split(":");
-
-            if (valIn.length > 1 && valLimits.length > 1) {
-
-                if (parseInt(valIn[0]) > parseInt(valLimits[0])
-                    || (parseInt(valIn[0]) == parseInt(valLimits[0]) && parseInt(valIn[1]) > parseInt(valLimits[1]))) {
-                    ret = true;
-                    adapter.log.debug("yes, IsLater : " + timeVal + " " + timeLimit);
-                }
-            }
-            else {
-                adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
-            }
-        }
-        else {
-            adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
-        }
-    }
-    catch (e) {
-        adapter.log.error("exception in IsLater [" + e + "]");
-    }
-    return ret;
-}
-*/
-/**
- * @param {string } timeVal
- * @param {string } [timeLimit]
- */
-/*
-function IsEarlier(timeVal, timeLimit) {
-
-    let ret = false;
-    try {
-        adapter.log.debug("check IsEarlier : " + timeVal + " " + timeLimit);
-
-        if (typeof timeVal === "string" && typeof timeLimit === "string") {
-            const valIn = timeVal.split(":");
-            const valLimits = timeLimit.split(":");
-
-            if (valIn.length > 1 && valLimits.length > 1) {
-
-                if (parseInt(valIn[0]) < parseInt(valLimits[0])
-                    || (parseInt(valIn[0]) == parseInt(valLimits[0]) && parseInt(valIn[1]) < parseInt(valLimits[1]))) {
-                    ret = true;
-                    adapter.log.debug("yes, IsEarlier : " + timeVal + " " + timeLimit);
-                }
-            }
-            else {
-                adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
-            }
-        }
-        else {
-            adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
-        }
-    }
-    catch (e) {
-        adapter.log.error("exception in IsEarlier [" + e + "]");
-    }
-    return ret;
 }
-*/
-/**
- * @param {string} timeVal
- * @param {string} timeLimit
- */
-/*
-function IsEqual(timeVal, timeLimit) {
-
-    let ret = false;
-    try {
-        adapter.log.debug("check IsEqual : " + timeVal + " " + timeLimit);
 
-        if (typeof timeVal === "string" && typeof timeLimit === "string") {
-            const valIn = timeVal.split(":");
-            const valLimits = timeLimit.split(":");
 
-            if (valIn.length > 1 && valLimits.length > 1) {
 
-                if (parseInt(valIn[0]) === parseInt(valLimits[0]) && parseInt(valIn[1]) === parseInt(valLimits[1])) {
-                    ret = true;
-                    adapter.log.debug("yes, IsEqual : " + timeVal + " " + timeLimit);
-                }
-            }
-            else {
-                adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
-            }
-        }
-        else {
-            adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
-        }
-    }
-    catch (e) {
-        adapter.log.error("exception in IsEqual [" + e + "]");
-    }
-    return ret;
-}
-*/
 
 // If started as allInOne/compact mode => return function to create instance
 if (module && module.parent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sbfspot",
-  "version": "4.0.8",
+  "version": "4.1.0",
   "description": "sbfspot (SMA inverter) Adapter",
   "author": {
     "name": "René G.",
@@ -18,31 +18,31 @@
     "url": "https://github.com/rg-engineering/ioBroker.sbfspot"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "2.5.1",
-    "@sentry/node": "6.14.1",
-    "better-sqlite3": "7.4.4",
-    "mysql2": "2.3.2",
+    "@iobroker/adapter-core": "2.6.0",
+    "@sentry/node": "6.19.6",
+    "better-sqlite3": "7.5.1",
+    "mysql2": "2.3.3",
     "suncalc2": "1.8.1"
   },
   "devDependencies": {
-    "@iobroker/testing": "2.5.2",
-    "@types/chai": "4.2.22",
-    "@types/chai-as-promised": "7.1.4",
+    "@iobroker/testing": "2.6.0",
+    "@types/chai": "4.3.1",
+    "@types/chai-as-promised": "7.1.5",
     "@types/gulp": "4.0.9",
-    "@types/mocha": "9.0.0",
-    "@types/node": "16.11.6",
+    "@types/mocha": "9.1.1",
+    "@types/node": "17.0.25",
     "@types/proxyquire": "1.3.28",
     "@types/request-promise-native": "1.0.18",
-    "@types/sinon": "10.0.6",
-    "@types/sinon-chai": "3.2.5",
-    "axios": "0.24.0",
-    "chai": "4.3.4",
+    "@types/sinon": "10.0.11",
+    "@types/sinon-chai": "3.2.8",
+    "axios": "0.26.1",
+    "chai": "4.3.6",
     "chai-as-promised": "7.1.1",
-    "eslint": "8.1.0",
+    "eslint": "8.13.0",
     "gulp": "4.0.2",
-    "mocha": "9.1.3",
+    "mocha": "9.2.2",
     "proxyquire": "2.1.3",
-    "sinon": "12.0.1",
+    "sinon": "13.0.2",
     "sinon-chai": "3.7.0"
   },
   "main": "main.js",

package/sbfspot.njsproj

@@ -50,6 +50,9 @@
     <Content Include="docs\en\install_arm.md">
       <SubType>Code</SubType>
     </Content>
+    <Content Include="lib\tools.js">
+      <SubType>Code</SubType>
+    </Content>
     <Content Include="LICENSE" />
     <Content Include="package-lock.json" />
     <Content Include="readme.txt" />
@@ -59,7 +62,6 @@
     <Content Include="package.json" />
     <Content Include="README.md" />
     <Content Include="admin\index.html" />
-    <Compile Include="lib\utils.js" />
     <Compile Include="tasks\jscs.js" />
     <Compile Include="tasks\jscsRules.js" />
     <Compile Include="tasks\jshint.js" />
@@ -111,8 +113,8 @@
     <Folder Include="admin\i18n\pt\" />
     <Folder Include="admin\i18n\ru\" />
     <Folder Include="docs\en\" />
-    <Folder Include="lib" />
     <Folder Include="docs\" />
+    <Folder Include="lib\" />
     <Folder Include="tasks" />
     <Folder Include="test\" />
     <Folder Include="typings\" />

package/lib/support_tools.js

@@ -1,371 +0,0 @@
-"use strict";
-
-const heatingcontrolDictionary = require("./vis_words.js").heatingcontrolDictionary;
-
-/**
- * @param {string} timeVal
- * @param {string} timeLimit
- */
-function IsLater(adapter, timeVal, timeLimit) {
-
-    let ret = false;
-    try {
-        adapter.log.debug("check IsLater : " + timeVal + " " + timeLimit);
-
-        if (typeof timeVal === "string" && typeof timeLimit === "string") {
-            const valIn = timeVal.split(":");
-            const valLimits = timeLimit.split(":");
-
-            if (valIn.length > 1 && valLimits.length > 1) {
-
-                if (parseInt(valIn[0]) > parseInt(valLimits[0])
-                    || (parseInt(valIn[0]) == parseInt(valLimits[0]) && parseInt(valIn[1]) > parseInt(valLimits[1]))) {
-                    ret = true;
-                    adapter.log.debug("yes, IsLater : " + timeVal + " " + timeLimit);
-                }
-            }
-            else {
-                adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
-            }
-        }
-        else {
-            adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
-        }
-    }
-    catch (e) {
-        adapter.log.error("exception in IsLater [" + e + "]");
-    }
-    return ret;
-}
-
-/**
- * @param {string } timeVal
- * @param {string } [timeLimit]
- */
-function IsEarlier(adapter, timeVal, timeLimit) {
-
-    let ret = false;
-    try {
-        adapter.log.debug("check IsEarlier : " + timeVal + " " + timeLimit);
-
-        if (typeof timeVal === "string" && typeof timeLimit === "string") {
-            const valIn = timeVal.split(":");
-            const valLimits = timeLimit.split(":");
-
-            if (valIn.length > 1 && valLimits.length > 1) {
-
-                if (parseInt(valIn[0]) < parseInt(valLimits[0])
-                    || (parseInt(valIn[0]) == parseInt(valLimits[0]) && parseInt(valIn[1]) < parseInt(valLimits[1]))) {
-                    ret = true;
-                    adapter.log.debug("yes, IsEarlier : " + timeVal + " " + timeLimit);
-                }
-            }
-            else {
-                adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
-            }
-        }
-        else {
-            adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
-        }
-    }
-    catch (e) {
-        adapter.log.error("exception in IsEarlier [" + e + "]");
-    }
-    return ret;
-}
-
-/**
- * @param {string} timeVal
- * @param {string} timeLimit
- */
-function IsEqual(adapter, timeVal, timeLimit) {
-
-    let ret = false;
-    try {
-        adapter.log.debug("check IsEqual : " + timeVal + " " + timeLimit);
-
-        if (typeof timeVal === "string" && typeof timeLimit === "string") {
-            const valIn = timeVal.split(":");
-            const valLimits = timeLimit.split(":");
-
-            if (valIn.length > 1 && valLimits.length > 1) {
-
-                if (parseInt(valIn[0]) === parseInt(valLimits[0]) && parseInt(valIn[1]) === parseInt(valLimits[1])) {
-                    ret = true;
-                    adapter.log.debug("yes, IsEqual : " + timeVal + " " + timeLimit);
-                }
-            }
-            else {
-                adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
-            }
-        }
-        else {
-            adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
-        }
-    }
-    catch (e) {
-        adapter.log.error("exception in IsEqual [" + e + "]");
-    }
-    return ret;
-}
-
-//*******************************************************************
-//
-// find a object in array by key and value
-// returns the object
-function findObjectByKey(array, key, value) {
-    if (array !== null && typeof array !== undefined) {
-        for (let i = 0; i < array.length; i++) {
-            if (array[i][key] === value) {
-                return array[i];
-            }
-        }
-    }
-    return null;
-}
-
-//*******************************************************************
-//
-// find a object in array by key and value
-// returns the object
-function findObjectsByKey(array, key, value) {
-
-    const ret = [];
-
-    if (array !== null && typeof array !== undefined) {
-        for (let i = 0; i < array.length; i++) {
-            if (array[i][key] === value) {
-                ret.push(array[i]);
-            }
-        }
-    }
-    return ret;
-}
-
-
-//*******************************************************************
-//
-// find a object in array by key and value
-// returns index number
-function findObjectIdByKey(array, key, value) {
-
-
-    //array.filter(d => d.key == value);
-
-    if (array !== null && typeof array !== undefined) {
-
-        for (let i = 0; i < array.length; i++) {
-            if (array[i][key] === value) {
-                return i;
-            }
-        }
-    }
-    return -1;
-}
-
-
-//*******************************************************************
-//
-// find all objects in array by key and value
-// returns index number array
-function findObjectsIdByKey(array, key, value) {
-
-    const ret = [];
-
-    if (array !== null && typeof array !== undefined) {
-
-        for (let i = 0; i < array.length; i++) {
-            if (array[i][key] === value) {
-                ret.push(i);
-            }
-        }
-    }
-    return ret;
-}
-
-
-function timeConverter(SystemLanguage,time, timeonly = false) {
-
-    let a;
-
-    if (time != null) {
-        a = new Date(time);
-    }
-    else {
-        a = new Date();
-    }
-    let months;
-
-    if (SystemLanguage === "de") {
-        months = ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"];
-    }
-    else {
-        months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-    }
-    const year = a.getFullYear();
-    const month = months[a.getMonth()];
-    let date = a.getDate();
-    date = date < 10 ? " " + date : date;
-    let hour = a.getHours();
-    hour = hour < 10 ? "0" + hour : hour;
-    let min = a.getMinutes();
-    min = min < 10 ? "0" + min : min;
-    let sec = a.getSeconds();
-    sec = sec < 10 ? "0" + sec : sec;
-
-    let sRet = "";
-    if (timeonly) {
-        sRet = hour + ":" + min + ":" + sec;
-    }
-    else {
-        sRet = date + " " + month + " " + year + " " + hour + ":" + min + ":" + sec;
-    }
-
-    return sRet;
-}
-
-function CheckValidTime(adapter, id, time) {
-
-    let sRet = "00:00";
-    try {
-        if (time === "null" || typeof time === undefined) {
-            adapter.log.error("time value not found for " + id);
-
-        }
-        else if (typeof time !== "string") {
-            adapter.log.error("time should be a string but is " + typeof time.val + " for " + id);
-
-        }
-        else if (time.length < 3) {
-            adapter.log.error("time not long enough for " + id);
-
-        }
-        else if (!time.includes(":")) {
-            adapter.log.error("time ':' missing for " + id);
-        }
-        else {
-            const times = time.split(":");
-            sRet = "0" + times[0].slice(-2) + ":" + "0" + times[1].slice(-2);
-        }
-
-    }
-    catch (e) {
-        adapter.log.error("exception in CheckValidTime [" + e + "] for " + id + " " + JSON.stringify(time));
-
-    }
-    return sRet;
-
-}
-
-
-function Check4ValidTemperature(adapter, temperature) {
-
-    try {
-
-        if (typeof temperature == "object") {
-            adapter.log.warn("target temperature is object " + JSON.stringify(temperature));
-        }
-
-        if (isNaN(temperature) || typeof temperature === "string") {
-
-            adapter.log.debug("try to convert " + temperature + " to a number");
-            return Number(temperature);
-        }
-        else {
-            return temperature;
-        }
-
-    }
-    catch (e) {
-        adapter.log.error("exception in Check4ValidTemperature [" + e + "]");
-        return 0;
-    }
-
-}
-
-
-function IsSummerTime(adapter, sStartDate, sEndDate) {
-
-    let ret = false;
-    try {
-
-        adapter.log.debug("check in time " + sStartDate + " " + sEndDate);
-
-        if (sStartDate.length > 0 && sEndDate.length > 0) {
-            const StartPeriod = sStartDate.split(/[.,/ -]/);
-            const EndPeriod = sEndDate.split(/[.,/ -]/);
-
-            if (StartPeriod.length >= 2 && EndPeriod.length >= 2) {
-
-                const StartDate = new Date();
-                StartDate.setDate(parseInt(StartPeriod[0]));
-                StartDate.setMonth(parseInt(StartPeriod[1]) - 1);
-                adapter.log.debug("Start " + StartDate.toDateString());
-
-                const EndDate = new Date();
-                EndDate.setDate(parseInt(EndPeriod[0]));
-                EndDate.setMonth(parseInt(EndPeriod[1]) - 1);
-                adapter.log.debug("End " + EndDate.toDateString());
-
-                const now = new Date();
-
-                //bei Jahreswechsel
-                if (EndDate < StartDate) {
-                    if (now > EndDate) {
-                        //end already past, increase end year
-                        EndDate.setFullYear(EndDate.getFullYear() + 1);
-                        adapter.log.debug("corrected End " + EndDate.toDateString());
-                    }
-                    else {
-                        //else decrease Start year
-                        StartDate.setFullYear(StartDate.getFullYear() - 1);
-                        adapter.log.debug("corrected Start " + StartDate.toDateString());
-                    }
-                }
-
-                if (now >= StartDate && now <= EndDate) {
-                    adapter.log.debug("we are in period");
-                    ret = true;
-                }
-                else {
-                    adapter.log.debug("we are not in period, after start " + StartDate.toDateString() + " and before end " + EndDate.toDateString());
-                    ret = false;
-                }
-            }
-        }
-    }
-    catch (e) {
-        adapter.log.error("exception catch in IsSummerTime [" + e + "] ");
-    }
-    return ret;
-}
-
-
-
-function GetTranslation(adapter,text, systemLang) {
-
-    let translated = text;
-
-    if (heatingcontrolDictionary[text]) {
-        translated = heatingcontrolDictionary[text][systemLang] || heatingcontrolDictionary[text].en;
-    }
-
-   
-    return translated;
-}
-
-
-module.exports = {
-    IsLater,
-    IsEarlier,
-    IsEqual,
-    findObjectsIdByKey,
-    findObjectIdByKey,
-    findObjectsByKey,
-    findObjectByKey,
-    timeConverter,
-    CheckValidTime,
-    Check4ValidTemperature,
-    IsSummerTime,
-    GetTranslation
-};