iobroker.sbfspot 5.0.0 → 5.0.1

package/README.md

@@ -65,6 +65,9 @@ sometimes npm intall must be called more then one time to successfully install a
   Placeholder for the next version (at the beginning of the line):
   ### **WORK IN PROGRESS**
 -->
+### 5.0.1 (2025-06-29)
+* (René) new testing
+
 ### 5.0.0 (2025-06-07)
 * (René) ATTENTION breaking change: adapter type changed from scheduled to daemon
 * (René) update hints added to admin

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sbfspot",
-    "version": "5.0.0",
+    "version": "5.0.1",
     "news": {
+      "5.0.1": {
+        "en": "new testing",
+        "de": "neue tests",
+        "ru": "новые испытания",
+        "pt": "novos testes",
+        "nl": "nieuwe tests",
+        "fr": "nouveaux essais",
+        "it": "nuovi test",
+        "es": "nuevas pruebas",
+        "pl": "nowe badania",
+        "uk": "новий тест",
+        "zh-cn": "新测试"
+      },
       "5.0.0": {
         "en": "ATTENTION breaking change: adapter type changed from scheduled to daemon\nupdate hints added to admin\nsuggestions from adapter checker",
         "de": "ATTENTION Brechwechsel: Adaptertyp geändert von geplant nach Daemon\nupdate-hinweise zu admin hinzugefügt\nvorschläge von adapter checker",
@@ -80,19 +93,6 @@
         "pl": "aktualizacji zależności\npoprawki błędów oparte na rekomendacji sprawdzania adaptera",
         "uk": "оновлення залежності\nвиправлення помилок на основі рекомендації адаптера",
         "zh-cn": "更新依赖关系\n根据适配器检查器建议修正错误"
-      },
-      "4.3.3": {
-        "en": "(René) change of dependencies\n(René) mySql dependency update",
-        "de": "(René) Veränderung der Abhängigkeiten\n(René) mySql Abhängigkeitsupdate",
-        "ru": "(René) изменение зависимостей\n(René) обновление зависимости mySql",
-        "pt": "(René) mudança de dependências\n(René) atualização de dependência mySql",
-        "nl": "(René) verandering van afhankelijkheden\n(René) mySql afhankelijkheidsupdate",
-        "fr": "(René) changement de dépendances\n(René) Mise à jour de la dépendance mySql",
-        "it": "(René) cambiamento delle dipendenze\n(René) aggiornamento di dipendenza mySql",
-        "es": "(René) cambio de dependencia\n(René) mySql dependency update",
-        "pl": "(René) zmiana zależności\nAktualizacja zależności mySql",
-        "uk": "(Рене) зміна залежностей\n(René) mySql оновлення залежності",
-        "zh-cn": "(René) 属地变化\n(René) MySql 依赖性更新"
       }
     },
     "titleLang": {

package/lib/tools.js

@@ -1,7 +1,7 @@
 const axios = require('axios').default;
 
+//Tests whether the given variable is a real object and not an Array
 /**
- * Tests whether the given variable is a real object and not an Array
  * @param {any} it The variable to test
  * @returns {it is Record<string, any>}
  */
@@ -13,18 +13,20 @@ function isObject(it) {
     return Object.prototype.toString.call(it) === '[object Object]';
 }
 
+//Tests whether the given variable is really an Array
 /**
- * Tests whether the given variable is really an Array
  * @param {any} it The variable to test
  * @returns {it is any[]}
  */
 function isArray(it) {
-    if (typeof Array.isArray === 'function') return Array.isArray(it);
+    if (typeof Array.isArray === 'function') {
+        return Array.isArray(it);
+    }
     return Object.prototype.toString.call(it) === '[object Array]';
 }
 
+//Translates text to the target language. Automatically chooses the right translation API.
 /**
- * Translates text to the target language. Automatically chooses the right translation API.
  * @param {string} text The text to translate
  * @param {string} targetLang The target languate
  * @param {string} [yandexApiKey] The yandex API key. You can create one for free at https://translate.yandex.com/developers
@@ -43,8 +45,8 @@ async function translateText(text, targetLang, yandexApiKey) {
     }
 }
 
+//Translates text with Yandex API
 /**
- * Translates text with Yandex API
  * @param {string} text The text to translate
  * @param {string} targetLang The target languate
  * @param {string} apiKey The yandex API key. You can create one for free at https://translate.yandex.com/developers
@@ -66,8 +68,8 @@ async function translateYandex(text, targetLang, apiKey) {
     }
 }
 
+//Translates text with Google API
 /**
- * Translates text with Google API
  * @param {string} text The text to translate
  * @param {string} targetLang The target languate
  * @returns {Promise<string>}

package/main.js

@@ -1,10 +1,11 @@
-/*
+/* eslint-disable prefer-template */
+/*
  * sbfspot adapter für iobroker
  *
  * Created: 15.09.2016 21:31:28
  *  Author: Rene
 
-Copyright(C)[2016-2020][René Glaß]
+Copyright(C)[2016-2025][René Glaß]
 
 
 
@@ -24,7 +25,9 @@ const os = require('os');
 
 //const bluetooth_test = require("./lib/SMA_Bluetooth").test;
 
-const supportedVersion="3.9.12"
+const supportedVersion = "3.9.12"
+
+let updateTimerID = null;
 
 let adapter;
 function startAdapter(options) {
@@ -55,13 +58,14 @@ function startAdapter(options) {
                 //to do stop intervall
                 callback();
             } catch (e) {
+                adapter.log.error("exception catch after unload [" + e + "]");
                 callback();
             }
         },
 
-        stateChange: async (id, state) => {
+        //stateChange: async (id, state) => {
             //await HandleStateChange(id, state);
-        },
+        //},
 
         //#######################################
         //
@@ -110,7 +114,7 @@ let sqlite_db;
 //---------- mySQL
 let mysql_connection;
 
-let killTimer;
+//let killTimer;
 let intervalID = null;
 
 
@@ -172,8 +176,7 @@ async function Do() {
             && (now.getHours() < times.sunset.getHours() || (now.getHours() == times.sunset.getHours() && now.getMinutes() < times.sunset.getMinutes()))) {
             daylight = true;
         }
-    }
-    else {
+    } else {
         //always
         daylight = true;
     }
@@ -248,8 +251,7 @@ async function Do() {
             }
         }
         DB_Disconnect();
-    }
-    else {
+    } else {
         adapter.log.info("nothing to do, because no daylight ... ");
        
     }
@@ -274,14 +276,12 @@ async function GetSystemDateformat() {
             longitude = ret.common.longitude;
             latitude = ret.common.latitude;
             adapter.log.debug("system: longitude " + longitude + " latitude " + latitude);
-        }
-        else {
+        } else {
             adapter.log.error("system.config not available. longitude and latitude set to Berlin");
             longitude = 52.520008;
             latitude = 13.404954;
         }
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in GetSystemDateformat [" + e + "]");
     }
 }
@@ -368,8 +368,7 @@ async function CreateObject(key, obj) {
                 }
             });
         }
-    }
-    else {
+    } else {
         await adapter.setObjectNotExistsAsync(key, obj);
     }
 }
@@ -463,8 +462,7 @@ async function DB_Connect() {
 
         }
 
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_Connect [" + e + "]");
         ret = false;
     }
@@ -479,7 +477,7 @@ async function DB_Query(query) {
 
     if (adapter.config.databasetype == "mySQL" || adapter.config.databasetype == "MariaDB") {
 
-        const [rows, fields] = await mysql_connection.execute(query);
+        const [rows] = await mysql_connection.execute(query);
         retRows = rows;
 
     } else {
@@ -525,8 +523,7 @@ async function DB_CheckLastUploads(serial) {
 
             await adapter.setStateAsync(serial + ".sbfspot.LastUpload", { ack: true, val: lastUpload });
         }
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_CheckLastUploads [" + e + "]");
     }
 }
@@ -539,8 +536,7 @@ async function DB_GetInverters() {
     try {
         const query = "SELECT * from Inverters";
         retRows = await DB_Query(query);
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_GetInverters [" + e + "]");
     }
 
@@ -609,8 +605,7 @@ async function DB_GetInvertersData(serial) {
         //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";
         retRows = await DB_Query(query);
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_GetInvertersData [" + e + "]");
     }
 
@@ -715,8 +710,7 @@ async function DB_CalcHistory_LastMonth(serial) {
             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'))";
         }
         retRows = await DB_Query(query);
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_CalcHistory_LastMonth [" + e + "]");
     }
 
@@ -765,11 +759,10 @@ async function CalcHistory_LastMonth(err, rows, serial) {
 
                 */
 
-            }
-            else {
+            } else {
                 oLastDays.push({
-                    "date": data["date"],
-                    "value": data["ertrag"]
+                    date: data["date"],
+                    value: data["ertrag"]
                 });
             }
 
@@ -806,8 +799,7 @@ async function DB_CalcHistory_Prepare(serial) {
             query = "SELECT strftime('%Y-%m-%d', datetime(TimeStamp, 'unixepoch')) as date, ETotal  FROM `SpotData` WHERE `Serial` = '" + serial + "' ORDER by `TimeStamp` ASC LIMIT  1";
         }
         retRows = await DB_Query(query);
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_CalcHistory_Prepare [" + e + "]");
     }
 
@@ -863,8 +855,7 @@ async function DB_CalcHistory_Today(serial) {
             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'))";
         }
         retRows = await DB_Query(query);
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_CalcHistory_Today [" + e + "]");
     }
 
@@ -920,11 +911,10 @@ async function CalcHistory_Today(err, rows, serial) {
 
                 */
 
-            }
-            else {
+            } else {
                 oLastDays.push({
-                    "time": data["time"],
-                    "value": data["ertrag"]
+                    time: data["time"],
+                    value: data["ertrag"]
                 });
 
             }
@@ -957,8 +947,7 @@ async function DB_CalcHistory_Years(serial) {
             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'))";
         }
         retRows = await DB_Query(query);
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_CalcHistory_Years [" + e + "]");
     }
 
@@ -1049,11 +1038,10 @@ async function CalcHistory_Years(err, rows, serial) {
 
                         */
 
-                    }
-                    else {
+                    } else {
                         oLastYears.push({
-                            "year": installyear + n,
-                            "value": parseInt(yearvalue)
+                            year: installyear + n,
+                            value: parseInt(yearvalue)
                         });
                     }
                 }
@@ -1075,12 +1063,11 @@ async function CalcHistory_Years(err, rows, serial) {
                             oDate,
                             yearvalue
                         ]);
-                }
-                else {
+                } else {
 
                     oLastYears.push({
-                        "year": data["date"],
-                        "value": yearvalue
+                        year: data["date"],
+                        value: yearvalue
                     });
                 }
 
@@ -1125,8 +1112,7 @@ async function DB_CalcHistory_Months(serial) {
             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'))";
         }
         retRows = await DB_Query(query);
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_CalcHistory_Months [" + e + "]");
     }
 
@@ -1167,11 +1153,10 @@ async function CalcHistory_Months(err, rows, serial) {
 
                 */
 
-            }
-            else {
+            } else {
                 oLastMonth.push({
-                    "month": data["date"],
-                    "value": data["ertrag"]
+                    month: data["date"],
+                    value: data["ertrag"]
                 });
             }
         }
@@ -1217,8 +1202,7 @@ async function DB_AddDummyData() {
            
 
         }
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in DB_AddDummyData [" + e + "]");
     }
 
@@ -1251,14 +1235,12 @@ async function CheckVersion(version, msg) {
         const version = await GetLatestVersionGithub();
 
         adapter.sendTo(msg.from, msg.command, version, msg.callback);
-    }
-    else if (version == "current") {
+    } else if (version == "current") {
 
         const version = await GetInstalledVersion();
 
         adapter.sendTo(msg.from, msg.command, version, msg.callback);
-    }
-    else if (version == "supported") {
+    } else if (version == "supported") {
         adapter.sendTo(msg.from, msg.command, supportedVersion, msg.callback);
     }
 
@@ -1270,7 +1252,7 @@ async function GetLatestVersionGithub() {
     let latestVersion = "unknown";
 
     try {
-        const url = " https://api.github.com/repos/SBFspot/SBFspot/releases/latest";
+        const url = "https://api.github.com/repos/SBFspot/SBFspot/releases/latest";
         adapter.log.debug("call " + url);
 
         let result = await axios.get(url, { timeout: 5000 });
@@ -1279,12 +1261,10 @@ async function GetLatestVersionGithub() {
             adapter.log.info("installable version " + JSON.stringify(result.data.name));
 
             latestVersion = result.data.name;
-        }
-        else {
+        } else {
             latestVersion = "unknown / no result";
         }
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in GetLatestVersionGithub [" + e + "]");
         latestVersion = "unknown / error";
     }
@@ -1310,13 +1290,11 @@ async function GetInstalledVersion() {
             Version = res.stdout;
 
             adapter.log.info("result " + Version);
-        }
-        else {
+        } else {
             adapter.log.error("sbfspot version cannot be detected on  " + os.type());
             Version = "unknown on " + os.type();
         }
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in GetInstalledVersion [" + e + "]");
         Version = "unknown / error"
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sbfspot",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "sbfspot (SMA inverter) Adapter",
   "author": {
     "name": "René G.",
@@ -22,8 +22,8 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
-    "axios": "^1.9.0",
-    "better-sqlite3": "^11.10.0",
+    "axios": "^1.10.0",
+    "better-sqlite3": "^12.2.0",
     "mysql2": "^3.14.1",
     "suncalc2": "^1.8.1"
   },
@@ -33,10 +33,10 @@
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@iobroker/adapter-dev": "^1.4.0",
+    "@iobroker/eslint-config": "^2.0.2",
     "@iobroker/testing": "^5.0.4",
     "chai": "^5.2.0",
-    "eslint": "^9.28.0",
-    "mocha": "^11.5.0"
+    "mocha": "^11.7.1"
   },
   "main": "main.js",
   "bugs": {