iobroker.sbfspot 4.0.8 → 4.1.2

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 || {};
@@ -57,7 +61,7 @@ async function main() {
         adapter.terminate ? adapter.terminate(11) : process.exit(11);
     }
 
-    await CheckInverterVariables();
+    //await CheckInverterVariables();
 
     killTimer = setTimeout(function () {
         //adapter.stop();
@@ -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,16 +328,53 @@ 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 " );
 }
 
 
+async function CreateObject(key, obj) {
+
+    const obj_new = await adapter.getObjectAsync(key);
+    //adapter.log.warn("got object " + JSON.stringify(obj_new));
+
+    if (obj_new != null) {
+
+        if ((obj_new.common.role != obj.common.role
+            || obj_new.common.type != obj.common.type
+            || (obj_new.common.unit != obj.common.unit && obj.common.unit != null)
+            || obj_new.common.read != obj.common.read
+            || obj_new.common.write != obj.common.write
+            || obj_new.common.name != obj.common.name)
+            && obj.type === "state"
+        ) {
+            adapter.log.warn("change object " + JSON.stringify(obj) + " " + JSON.stringify(obj_new));
+            await adapter.extendObject(key, {
+                common: {
+                    name: obj.common.name,
+                    role: obj.common.role,
+                    type: obj.common.type,
+                    unit: obj.common.unit,
+                    read: obj.common.read,
+                    write: obj.common.write
+                }
+            });
+        }
+    }
+    else {
+        await adapter.setObjectNotExistsAsync(key, obj);
+    }
+}
+
+
 async function AddObject(key, type, common_name, common_type, common_role, common_unit, common_read, common_write) {
 
     adapter.log.debug("addObject " + key);
 
-    await adapter.setObjectNotExistsAsync(key, {
+    let obj= {
         type: type,
         common: {
             name: common_name,
@@ -346,37 +387,9 @@ async function AddObject(key, type, common_name, common_type, common_role, commo
         native: {
             location: key
         }
-    });
-
-    const obj = await adapter.getObjectAsync(key);
-
-    if (obj != null) {
-        //adapter.log.debug(" got Object " + JSON.stringify(obj));
-        if (obj.type != type
-            || obj.common.name != common_name
-            || obj.common.type != common_type
-            || obj.common.role != common_role
-            || obj.common.unit != common_unit
-            || obj.common.read != common_read
-            || obj.common.write != common_write ) {
-            adapter.log.debug(" !!! need to extend for " + key);
-            await adapter.extendObject(key, {
-                type: type,
-                common: {
-                    name: common_name,
-                    type: common_type,
-                    role: common_role,
-                    unit: common_unit,
-                    read: common_read,
-                    write: common_write
-                },
-                native: {
-                    location: key
-                }
-            });
-        }
+    };
 
-    }
+    await CreateObject(key, obj);
 }
 
 
@@ -387,11 +400,11 @@ sbfspot.0	2021-07-08 19:30:13.024	info	State value to set for "sbfspot.0.2000562
 sbfspot.0	2021-07-08 19:30:12.888	info	State value to set for "sbfspot.0.2000562095.history.last30Days" has to be type "number" but received type "string"
  */
 
-
+/*
 async function CheckInverterVariables() {
 
 }
-
+*/
 
 
 async function DB_Connect() {
@@ -467,49 +480,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;
 
-async function DB_GetInverters() {
+    } else {
+        const stmt = sqlite_db.prepare(query);
+
+        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 +616,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 +722,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 +787,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 +844,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 +874,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 +902,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 +998,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 +1030,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 +1049,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 +1058,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 +1114,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 +1126,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.2",
   "description": "sbfspot (SMA inverter) Adapter",
   "author": {
     "name": "René G.",
@@ -18,31 +18,30 @@
     "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",
+    "better-sqlite3": "7.6.2",
+    "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": "3.0.2",
+    "@types/chai": "4.3.3",
+    "@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": "18.7.3",
     "@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.13",
+    "@types/sinon-chai": "3.2.8",
+    "axios": "0.27.2",
+    "chai": "4.3.6",
     "chai-as-promised": "7.1.1",
-    "eslint": "8.1.0",
+    "eslint": "8.22.0",
     "gulp": "4.0.2",
-    "mocha": "9.1.3",
+    "mocha": "10.0.0",
     "proxyquire": "2.1.3",
-    "sinon": "12.0.1",
+    "sinon": "14.0.0",
     "sinon-chai": "3.7.0"
   },
   "main": "main.js",