iobroker.sprinklecontrol 0.2.8 → 0.2.9

package/README.md

@@ -35,10 +35,12 @@ Wetterabhängige automatische Steuerung der Gartenbewässerung
   Placeholder for the next version (at the beginning of the line):
   ### **WORK IN PROGRESS**
 -->
+### 0.2.9 (2022-04-10)
+* (Dirk-Peter-md) Bug-Initialisierungsroutine
 
 ### 0.2.8 (2022-03-20)
-* Adaptation for js controller 4
-* switched main.js to async
+* (Dirk-Peter-md) Adaptation for js controller 4
+* (Dirk-Peter-md) switched main.js to async
 
 ### 0.2.7 (16.10.2021)
 * (Dirk-Peter-md) zusätzliche Testnachrichten gelöscht, Readme aktualisiert

package/io-package.json

@@ -1,8 +1,20 @@
 {
   "common": {
     "name": "sprinklecontrol",
-    "version": "0.2.8",
+    "version": "0.2.9",
     "news": {
+      "0.2.9": {
+        "en": "Bug initialization routine",
+        "de": "Bug-Initialisierungsroutine",
+        "ru": "Процедура инициализации ошибки",
+        "pt": "Rotina de inicialização de bugs",
+        "nl": "Bug initialisatie routine",
+        "fr": "Routine d'initialisation de bogue",
+        "it": "Routine di inizializzazione dei bug",
+        "es": "Rutina de inicialización de errores",
+        "pl": "Procedura inicjowania błędów",
+        "zh-cn": "错误初始化例程"
+      },
       "0.2.8": {
         "en": "Adaptation for js controller 4; switched main.js to async",
         "de": "Anpassung für js-Controller 4; main.js auf async umgestellt",

package/lib/valveControl.js

@@ -253,7 +253,7 @@ const switchTheValvesOffOn = async (threadList, parallel) => {
                 if (err) {
                     return err;
                 } else {
-                    adapter.log.info(`Valve => Set (${myConfig.config[entry.sprinkleID].methodControlSM}) ID: ${entry.sprinkleName}, value: ${entry.enabled}, duration: ${addTime(entry.wateringTime,'')}`);
+                    adapter.log.info(`Set (${myConfig.config[entry.sprinkleID].methodControlSM}) ID: ${entry.sprinkleName}, value: ${entry.enabled}, duration: ${addTime(entry.wateringTime,'')}`);
                 }
             });
             entry.enabledState = entry.enabled;
@@ -576,7 +576,7 @@ function setPumpOnOff(pumpOnOff) {
                             ack: false
                         });
                         currentPumpUse.enable = true;
-                        adapter.log.info('Set pump on');
+                        adapter.log.info('Set (pump) on');
                     }
                 } else {
                     if (state.val !== false) {
@@ -585,7 +585,7 @@ function setPumpOnOff(pumpOnOff) {
                             ack: false
                         });
                         currentPumpUse.enable = false;
-                        adapter.log.info('Set pump off');
+                        adapter.log.info('Set (pump) off');
                     }
                 }
             } else if (err) {
@@ -610,7 +610,7 @@ function setVoltageOnOff(voltageOnOff) {
                             val: true,
                             ack: false
                         });
-                        adapter.log.info('Set voltage on');
+                        adapter.log.info('Set (voltage) on');
                     }
                 } else {
                     if (state.val !== false) {
@@ -618,7 +618,7 @@ function setVoltageOnOff(voltageOnOff) {
                             val: false ,
                             ack: false
                         });
-                        adapter.log.info('Set voltage off');
+                        adapter.log.info('Set (voltage) off');
                     }
                 }
             } else if (err) {

package/main.js

@@ -443,24 +443,24 @@ async function checkActualStates () {
         if (adapter.config.publicHolidays === true && (adapter.config.publicHolInstance !== 'none' || adapter.config.publicHolInstance !== '')) {
             /**
              * Feiertag Heute
-             * @type {ioBroker.GetStatePromise}
+             * @type {ioBroker.State | void}
              * @private
              */
-            const _publicHolInstanceHeute = adapter.getForeignStateAsync(
+            const _publicHolInstanceHeute = await adapter.getForeignStateAsync(
                 adapter.config.publicHolInstance + '.heute.boolean'
             ).catch((e) => adapter.log.warn(e));
-                if (await _publicHolInstanceHeute && _publicHolInstanceHeute.val) {
-                    publicHolidayStr = _publicHolInstanceHeute.val;
-                }
+            if (_publicHolInstanceHeute && _publicHolInstanceHeute.val) {
+                publicHolidayStr = _publicHolInstanceHeute.val;
+            }
             /**
              * Feiertag MORGEN
-             * @type {ioBroker.GetStatePromise}
+             * @type {ioBroker.State | void}
              * @private
              */
-            const _publicHolInstanceMorgen = adapter.getForeignStateAsync(
+            const _publicHolInstanceMorgen = await adapter.getForeignStateAsync(
                 adapter.config.publicHolInstance + '.morgen.boolean'
             ).catch((e) => adapter.log.warn(e));
-                if (await _publicHolInstanceMorgen && _publicHolInstanceMorgen.val) {
+                if (_publicHolInstanceMorgen && _publicHolInstanceMorgen.val) {
                     publicHolidayTomorrowStr = _publicHolInstanceMorgen.val;
                 }
         }
@@ -468,13 +468,13 @@ async function checkActualStates () {
         if (adapter.config.weatherForecast === true && (adapter.config.weatherForInstance !== 'none' || adapter.config.weatherForInstance !== '')) {
             /**
              * Niederschlagsmenge HEUTE in mm
-             * @type {ioBroker.GetStatePromise}
+             * @type {ioBroker.State | void}
              * @private
              */
-            const _weatherForInstanceToday = adapter.getForeignStateAsync(
+            const _weatherForInstanceToday = await adapter.getForeignStateAsync(
                 adapter.config.weatherForInstance + '.NextDaysDetailed.Location_1.Day_1.rain_value'
             ).catch((e) => adapter.log.warn(e));
-                if (await _weatherForInstanceToday && _weatherForInstanceToday.val) {
+                if (_weatherForInstanceToday && _weatherForInstanceToday.val) {
                     if (typeof _weatherForInstanceToday.val == 'string') {
                         weatherForecastTodayNum = parseFloat(_weatherForInstanceToday.val);
                     } else if (typeof _weatherForInstanceToday.val == 'number') {
@@ -491,28 +491,30 @@ async function checkActualStates () {
 
             /**
              * Niederschlagsmenge MORGEN in mm
-             * @type {ioBroker.GetStatePromise}
+             * @type {ioBroker.State | void}
              * @private
              */
-            const _weatherForInstance = adapter.getForeignStateAsync(
+            const _weatherForInstance = await adapter.getForeignStateAsync(
                 adapter.config.weatherForInstance + '.NextDaysDetailed.Location_1.Day_2.rain_value'
             ).catch((e) => adapter.log.warn(e));
-                if (_weatherForInstance && _weatherForInstance.val) {
-                    weatherForecastTomorrowNum = _weatherForInstance.val;
-                    await adapter.setStateAsync(
-                        'info.rainTomorrow',
-                        weatherForecastTomorrowNum,
-                        true
-                    );
-                }
+            if (_weatherForInstance && _weatherForInstance.val) {
+                weatherForecastTomorrowNum = _weatherForInstance.val;
+                await adapter.setStateAsync(
+                    'info.rainTomorrow',
+                    weatherForecastTomorrowNum,
+                    true
+                );
+            }
         }
         if (adapter.config.actualValueLevel){
             /**
              * Füllstand der Zisterne in %
-             * @type {ioBroker.GetStatePromise}
+             * @type {ioBroker.State | void}
              * @private
              */
-            const _actualValueLevel = adapter.getForeignStateAsync(adapter.config.actualValueLevel).catch((e) => adapter.log.warn(e));
+            const _actualValueLevel = await adapter.getForeignStateAsync(
+                adapter.config.actualValueLevel
+            ).catch((e) => adapter.log.warn(e));
             if (_actualValueLevel && typeof _actualValueLevel.val !== undefined) {
                 valveControl.setFillLevelCistern(parseFloat(_actualValueLevel.val));
             }
@@ -520,6 +522,8 @@ async function checkActualStates () {
         /**
          * return the saved objects under sprinkle.*
          * rückgabe der gespeicherten Objekte unter sprinkle.*
+         * @type {ioBroker.NonNullCallbackReturnTypeOf<(err?: (Error | null), objects?: Record<string, ioBroker.AnyObject & {type: "channel"}>) => void> | void}
+         * @private
          */
         const _list = await adapter.getForeignObjectsAsync(adapter.namespace + '.sprinkle.*', 'channel').catch((e) => adapter.log.warn(e));
             if (_list) {
@@ -1082,14 +1086,14 @@ async function createSprinklers() {
                             'type':  'boolean',
                             'read':  true,
                             'write': true,
-                            'def':   false
+                            'def':   true
                         },
                         'native': {},
                     }).catch((e) => adapter.log.warn(`${objectName}.autoOn ${e}`));
                     // Create Object for .actualSoilMoisture
                     const _actualSoilMoistureNotExist = await adapter.setObjectNotExistsAsync(objPfad + '.actualSoilMoisture',
                         objMetConSM
-                    ).catch((e) => adapter.log.warn(`${objectName}.autoOn ${e}`));
+                    ).catch((e) => adapter.log.warn(`${objectName}.actualSoilMoisture ${e}`));
                     // Create Object for .countdown => Countdown des Ventils
                     const _countdownNotExist = adapter.setObjectNotExistsAsync(objPfad + '.countdown', {
                         'type': 'state',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sprinklecontrol",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Control of several sprinklers depending on weather conditions and pump performance.",
   "author": {
     "name": "Dirk Peter",
@@ -33,15 +33,15 @@
     "@types/chai-as-promised": "^7.1.5",
     "@types/gulp": "^4.0.9",
     "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.21",
+    "@types/node": "^17.0.23",
     "@types/node-schedule": "^1.3.2",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.11",
-    "@types/sinon-chai": "^3.2.5",
+    "@types/sinon-chai": "^3.2.8",
     "axios": "^0.26.1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.11.0",
+    "eslint": "^8.12.0",
     "gulp": "^4.0.2",
     "mocha": "^9.1.2",
     "proxyquire": "^2.1.3",