diff --git a/.gitignore b/.gitignore
index e9f705d0..f39a45b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ Backup/*
 backup/
 backup/*
 temp/
-temp/*
\ No newline at end of file
+temp/*
+*.bak
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 768f705c..5b9d5371 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,21 +2,27 @@
 
 ## Installation
 
-### Install of a specific Version in Node-Red:
- - change to the installation directory of Node-Red
- - enter the command `npm install node-red-contrib-sun-position@2.0.0`
+### Install of a specific Version in Node-Red
+
+- change to the installation directory of Node-Red
+- enter the command `npm install node-red-contrib-sun-position@2.0.0`
+
+### Install of a specific Version in Redmatic (on a Homematic)
 
-### Install of a specific Version in Redmatic (on a Homematic):
 - logon per ssh
 - enter the commands in the order:
   - `source /usr/local/addons/redmatic/home/.profile`
   - `cd /usr/local/addons/redmatic/var`
   - `npm install --save --no-package-lock --global-style --save-prefix="~" --production node-red-contrib-sun-position@2.0.0`
 
-### Install of a specific Version in HomeAssistant:
- - go to the Supervisor
- - go to the Node-Red AddOn
- - add unter the `Configuration` in the Node-Red options as `npm_packages`:
+### Install of a specific Version in HomeAssistant
+
+- go to the Supervisor
+- go to the Node-Red AddOn
+- stop the Node-Red AddOn
+- edit `config/node-red/package.json` and remove the line with `node-red-contrib-sun-position`
+- add unter the `Configuration` in the Node-Red options as `npm_packages`:
+
 ```yaml
 npm_packages:
   - node-red-contrib-sun-position@2.0.0
@@ -24,12 +30,30 @@ npm_packages:
 
 This can be also used to go back to an older Version.
 
-### 2.2.0-beta: enhancement
+### 3.0.0-alpha: enhancement
+
+Breaking changes:
+
+- removed all "Radiant" angle selection from typed input. The standard selection (which was previous the decimal degree output) gives now an angle based on the type selection (degree or radiant) of the configuration node. Version number is changed to 3 to reflect these API changes.
+
+
+This is still a non stable development version!!
+
+Changes:
 
 - general
   - first implementation of tests with `mocha` and some changes due to the test implementation (inject enhance and delay-until)
     - revised error handling and output messages if the configuration of nodes is not correct (missing config node, missing latitude/longitude).
   - added type checking
+  - allow of custom sun position set and rise angles in the configuration node
+  - allow of custom angles in the configuration node
+  - removed the following angle selections (replaced by existing ones without rad):
+    - time by azimuth (rad)
+    - time by elevation (set or rise in rad)
+    - next time by elevation (set or rise in rad)
+    - next rise time by elevation (rad)
+    - next set time by elevation (rad)
+  - sun-times and moon-times have now every angle in Radians and Degree
 
 - inject enhance (time-inject)
   - added repletely inject with CRON expression
@@ -43,14 +67,23 @@ This can be also used to go back to an older Version.
     - basic test for configuration
     - test for message passing is for later
 
+- sun-position + moon-position
+  - smaller rework
+
 - new Node `delay-until` which allows to delay messages until defined time
 
+- blind-control and clock-timer
+  - implement start and end time for rules #357
+  - show rule edit dialog no longer modal to allow usage of JSON and JSONATA editor #432
+  - separated renamed earliest/latest naming to make it clearer #441
+  - reworked value caching mechanism; fixed bug #434
+
 - blind-control
   - fix #421
   - added for oversteer blind position the possibility to select msg property, flow or global context #423
     - This has some limitations. Changes would only have effect if the oversteer are evaluated.
   - fix not working oversteer mode limitation #431
-  - show rule edit dialog no longer modal to allow usage of JSON and JSONATA editor #432
+  - implemented optional alternative azimuth input like node-red-contrib-blindcontroller #430
 
 - time-comp
   - better adjustable of next time, fixes #420
@@ -77,11 +110,12 @@ This can be also used to go back to an older Version.
 
 - general
   - Fixed bug with wrong default values for Input type in blind-control and within-time-switch node, added console error in case it occurs again.
-  -  additional check for missing position configuration
+  - additional check for missing position configuration
 
 ### 2.0.10: maintenance release
 
 - rerelease, no changed
+
 ### 2.0.9: maintenance release
 
 - general
@@ -159,7 +193,7 @@ This can be also used to go back to an older Version.
 
 - blind-control
   - allow to setup a rule which will only overwrite slat #345 or topic
-  - enhanced overwrite possibilities for slat. Additional `msg.blindSlat` as message property allowed or if the topic contains __slatOverwrite __ the payload as slat position will be used - partly #346
+  - enhanced overwrite possibilities for slat. Additional `msg.blindSlat` as message property allowed or if the topic contains __slatOverwrite__ the payload as slat position will be used - partly #346
   - for slat value make a deep clone as this could be any object and an object comparison
 
 - clock-time
@@ -173,7 +207,7 @@ This can be also used to go back to an older Version.
 
 ⚠ Warning: This Version could break existing flows. Please check your configuration!
 
-🛑 Nodes (especially blind, time-control nodes) that were created or saved with this version do not work in older versions of the package. This affects the export / import of flows and when switching to an older version. It is therefore **essential** to create a **backup** before upgrading to this version!
+🛑 Nodes (especially blind, time-control nodes) that were created or saved with this version do not work in older versions of the package. This affects the export / import of flows and when switching to an older version. It is therefore __essential__ to create a __backup__ before upgrading to this version!
 
 - general
   - added only even and only odd weeks
@@ -371,7 +405,7 @@ This can be also used to go back to an older Version.
 
 - moon-position
   - moon-times now available #161
-  - has now a `isUp` _Boolean_ property which gives the state if the moon is Up #162
+  - has now a `isUp` *Boolean* property which gives the state if the moon is Up #162
   - additional properties are `positionAtRise` and `positionAtSet` with position information on rise and set
 
 - clock-time
@@ -678,7 +712,7 @@ With this for example the time-inject could distinguish between using standard o
 - implemented #52 as height of the sun in the sky in percent (0~100 with 100% being at solarnoon and 0% being completely down) - altithudePercent
 - fixed bug for #53, no longer send blind position in override mode
 - updated dependencies
-- more changes for node-red 1.0 (https://nodered.org/blog/2019/09/20/node-done)
+- more changes for node-red 1.0 <https://nodered.org/blog/2019/09/20/node-done>
 - added node-red 0.19.0 as required version
 
 ### 0.4.8: Maintenance Release
diff --git a/README.md b/README.md
index bb7cc6f8..5f946e91 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ This is not an error, it hides only that the node needs to be opened, saved and
 
 ## Preconditions
 
-These nodes need at least NodeJS Version __8.0__ and Node-Red with Version __1.0__! Any early Version of Node-Red will not work!
+These nodes need at least NodeJS Version __12.0__ and Node-Red with Version __1.2.9__! Any early Version of Node-Red will not work!
 
 ## Installation
 
diff --git a/jsconfig.json b/jsconfig.json
index b079866a..e004f2db 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -2,6 +2,7 @@
 	"compilerOptions": {
 		"baseUrl": "./",
 	 	"checkJs": true,
+		"allowJs": true,
 		"module": "commonJS",
 		"target": "es6",
 		"lib": [
@@ -9,12 +10,16 @@
 		],
 		"paths": {
 			"@types": ["nodes/types"],
-			"@nodes": ["nodes"]
+			"@nodes": ["nodes"],
+			"@static": ["nodes/static"]
 		},
 		"sourceMap": true,
 		"alwaysStrict": true,
 		"resolveJsonModule": true
 	},
-	"include": ["./nodes/types/typedefs.js"],
-	"exclude": ["node_modules", "**/node_modules/*", "temp", "**/temp/*", "backup", "**/backup/*", "examples", "**/examples/*"]
+	"include": ["./nodes/types/typedefs.js", "./nodes/static/htmlglobal.js"],
+	"exclude": ["node_modules", "**/node_modules/*", "temp", "**/temp/*", "backup", "**/backup/*", "examples", "**/examples/*"],
+	"typeAcquisition": {
+		"include": ["jquery", "jqueryui", "node-red"]
+	}
   }
\ No newline at end of file
diff --git a/nodes/10-position-config.html b/nodes/10-position-config.html
index 1fe8914a..5735d231 100644
--- a/nodes/10-position-config.html
+++ b/nodes/10-position-config.html
@@ -23,6 +23,18 @@
 
 <script type="text/javascript">
     (function() {
+        const preassignedSunPositions = ['solarNoon','nadir',
+            'goldenHourDawnEnd', 'goldenHourDuskStart',
+            'sunriseEnd',  'sunsetStart',
+            'sunriseStart',  'sunsetEnd',
+            'goldenHourDawnStart',  'goldenHourDuskEnd',
+            'blueHourDawnEnd',  'blueHourDuskStart',
+            'civilDawn', 'civilDusk',
+            'blueHourDawnStart',  'blueHourDuskEnd',
+            'nauticalDawn',  'nauticalDusk',
+            'amateurDawn',  'amateurDusk',
+            'astronomicalDawn', 'astronomicalDusk'];
+
         RED.nodes.registerType('position-config', {
             category: 'config',
             credentials: {
@@ -46,9 +58,11 @@
                 },
                 height: {
                     type: 'text',
-                    value: '',
-                    required: true,
-                    validate: RED.validators.number()
+                    value: '0',
+                    required: false,
+                    validate(v){
+                        return (v === '') || RED.validators.number()(v);
+                    }
                 }
             },
             defaults: {
@@ -84,7 +98,75 @@
                 stateDateFormat: {
                     value: 12 // 12 - date.toLocaleDateString()
                 },
-                contextStore: {value: ''}
+                contextStore: {value: ''},
+                sunPositions: {
+                    value: [],
+                    validate(v) {
+                        if (v && (v.length > 0)) {
+                            const EXP = /^(?![0-9])[a-zA-Z0-9$_]+$/;
+                            const names = preassignedSunPositions.slice();
+                            let valid = true;
+
+                            // check for invalid names
+                            for (let i=0; i<v.length; ++i) {
+                                if (!EXP.test(v[i].riseName) ||
+                                    !EXP.test(v[i].setName) ||
+                                    !RED.validators.number()(v[i].angle) ||
+                                    isNaN(v[i].angle) ||
+                                    typeof v[i].angle !== 'number') {
+                                    valid = false;
+                                    break;
+                                }
+
+                                names.push(v[i].riseName);
+                                names.push(v[i].setName);
+                                if (hasDuplicates(names)) {
+                                    valid = false;
+                                    break;
+                                }
+                            }
+                            return valid;
+                        }
+                        return true;
+
+                        /** check array for duplicates */
+                        function hasDuplicates(arr) {
+                            return arr.some(item => {
+                                return (arr.indexOf(item) !== arr.lastIndexOf(item));
+                            });
+                        }
+                    }
+                },
+                predefAngles: {
+                    value: [],
+                    validate(v) {
+                        if (v && (v.length > 0)) {
+                            const EXP = /^[0-9a-zA-Z_\s]+$/;
+                            let valid = true;
+                            const names = [];
+
+                            // check for invalid names
+                            for (let i=0; i<v.length; ++i) {
+                                if (!EXP.test(v[i].name) ||
+                                    !RED.validators.number()(v[i].angle) ||
+                                    isNaN(v[i].angle) ||
+                                    typeof v[i].angle !== 'number') {
+                                    valid = false;
+                                    break;
+                                }
+
+                                if (names.includes(v[i].name)) {
+                                    valid = false;
+                                    break;
+                                }
+                                names.push(v[i].name);
+                            }
+
+                            return valid;
+                        }
+                        return true;
+                    }
+                }
             },
             label() {
                 return this.name || 'timeControl';
@@ -97,6 +179,24 @@
                 $('#node-config-map-row').hide();
                 const node = this;
 
+                const validateCoords = function(_event, _ui) {
+                    const val = $(this).spinner('value');
+                    if (/^(\+|-)?\d+(\.\d+)?$/.test(val)) {
+                        const value = parseFloat($(this).spinner('value'));
+                        const min = $(this).spinner('option', 'min');
+                        const max = $(this).spinner('option', 'max');
+
+                        if (value < min) {
+                            $(this).spinner('value', min);
+                        } else if (value > max) {
+                            $(this).spinner('value', max);
+                        }
+                    } else {
+                        $(this).spinner('value', 0);
+                    }
+                    coordChanged();
+                };
+
                 const $nodeInputContextStore = $('#node-config-input-contextStore');
                 RED.settings.context.stores.forEach(store => {
                     $nodeInputContextStore.append('<option value="' + store + '"' + (this.contextStore === store ? ' selected' : '') + '>' + store + '</option>');
@@ -157,11 +257,17 @@
 
                 $lat.spinner({
                     step: 0.00001,
-                    numberFormat: 'n'
+                    min: -90,
+                    max: 90,
+                    numberFormat: 'n',
+                    change: validateCoords
                 });
                 $lon.spinner({
                     step: 0.00001,
-                    numberFormat: 'n'
+                    min: -180,
+                    max: 180,
+                    numberFormat: 'n',
+                    change: validateCoords
                 });
                 $height.spinner({
                     step: 0.00001,
@@ -199,6 +305,173 @@
                 $lat.change();
                 $lon.change();
 
+                const validateMyAngle = function(_event, _ui) {
+                    const angleValue = $(this).spinner('value');
+                    // Show a red border around the fileName field, when the same file name value is used in multiple input fields
+                    if (isNaN(angleValue) ||
+                        angleValue === null ||
+                        typeof angleValue !== 'number' ||
+                        !RED.validators.number()(angleValue)) {
+                        $(this).css('border', '1px solid rgb(214, 97, 95)');
+                        $(this).addClass('input-error');
+                    } else {
+                        if (angleValue < -360) {
+                            $(this).spinner('value', -360);
+                        } else if (angleValue > 720) {
+                            $(this).spinner('value', 720);
+                        }
+                        $(this).css('border', '');
+                        $(this).removeClass('input-error');
+                    }
+                };
+
+                const predefAngleList = $('#node-input-predefAngleList').css('min-width', '500px').css('min-height', '150px')
+                    .editableList({
+                        removable: true,
+                        sortable: true,
+                        addItem(item, index, data) {
+                            const fragment = document.createDocumentFragment();
+
+                            const $angleLabel = $('<label/>', {class: 'spinner-Small', style: 'width: auto; margin-left: 5px; margin-bottom: 0px;'})
+                            // .html("<i class='fa fa-sun-o' aria-hidden='true'></i> " + node._("position-config.label.angle") + " ")
+                                .text(node._('position-config.label.angle') + ' ')
+                                .appendTo(fragment);
+                            const $angle = $('<input/>', {class: 'node-input-angle', style: 'width: 60px; margin-left: 4px;'})
+                                .appendTo($angleLabel)
+                                .spinner({
+                                    step: 0.1,
+                                    min: -360,
+                                    max: 720,
+                                    numberFormat: 'n',
+                                    change: validateMyAngle
+                                }).width(60);
+                            const $nameLabel = $('<label/>', {title: node._('position-config.label.name'), style: 'width: auto; margin-left: 12px; margin-bottom: 0px;'})
+                                .html("<i class='fa fa-tag' aria-hidden='true'></i>")
+                                .appendTo(fragment);
+                            const $name = $('<input/>', {type: 'text', class: 'node-input-name', placeholder: node._('position-config.label.name'), style: 'width: 110px; margin-left: 4px;'})
+                                .appendTo($nameLabel);
+
+                            if (!('angle' in data)) {
+                                data = {angle: 0, name: ''};
+                            }
+                            $name.prop('required',true);
+                            $angle.prop('required',true);
+                            $name.on('change keyup paste', function() {
+                                const angleName = this.value;
+
+                                // Find all fileName input fields with the same file name value
+                                const angleNameFields = predefAngleList.find('.node-input-name').filter(function() {
+                                    return this.value === angleName;
+                                });
+
+                                // Show a red border around the fileName field, when the same file name value is used in multiple input fields
+                                if (angleNameFields.length > 1 || !(/^[0-9a-zA-Z_\s]+$/.test(angleName))) {
+                                    $(this).css('border', '1px solid rgb(214, 97, 95)');
+                                    $(this).addClass('input-error');
+                                } else {
+                                    $(this).css('border', '');
+                                    $(this).removeClass('input-error');
+                                }
+                            });
+                            $angle.spinner('value', data.angle);
+                            $name.val(data.name);
+                            $name.change();
+                            $angle.change();
+                            validateMyAngle.call($angle[0]);
+                            item[0].appendChild(fragment);
+                        }
+                    });
+                if (!node.predefAngles) { // backward compatibility
+                    node.predefAngles = [];
+                }
+
+                node.predefAngles.forEach(data => {
+                    predefAngleList.editableList('addItem', data);
+                });
+
+                const sunPositionList = $('#node-input-sunPositionList').css('min-width', '500px').css('min-height', '150px').editableList(
+                    {
+                        removable: true,
+                        sortable: true,
+                        addItem(item, index, data) {
+                            const fragment = document.createDocumentFragment();
+
+                            const $angleLabel = $('<label/>', {class: 'spinner-Small', style: 'width: auto; margin-left: 5px; margin-bottom: 0px;'})
+                            // .html("<i class='fa fa-sun-o' aria-hidden='true'></i> " + node._("position-config.label.angle") + " ")
+                                .text(node._('position-config.label.angle') + ' ')
+                                .appendTo(fragment);
+                            const $angle = $('<input/>', {class: 'node-input-angle', style: 'width: 60px; margin-left: 4px;'})
+                                .appendTo($angleLabel)
+                                .spinner({
+                                    step: 0.1,
+                                    min: -360,
+                                    max: 720,
+                                    numberFormat: 'n',
+                                    change: validateMyAngle
+                                }).width(60);
+                            const $riseLabel = $('<label/>', {title: node._('position-config.label.riseName'), style: 'width: auto; margin-left: 12px; margin-bottom: 0px;'})
+                                .html("<i class='fa fa-arrow-up' aria-hidden='true'></i>")
+                                .appendTo(fragment);
+                            const $riseName = $('<input/>', {type: 'text', class: 'node-input-riseName', placeholder: node._('position-config.label.riseName'), style: 'width: 110px; margin-left: 4px;'})
+                                .appendTo($riseLabel);
+                            const $setLabel = $('<label/>', {title: node._('position-config.label.setName'), style: 'width: auto; margin-left: 12px; margin-bottom: 0px;'})
+                                .html("<i class='fa fa-arrow-down' aria-hidden='true'></i>")
+                                .appendTo(fragment);
+                            const $setName = $('<input/>', {type: 'text', class: 'node-input-setName', placeholder: node._('position-config.label.setName'), style: 'width: 110px; margin-left: 4px;'})
+                                .appendTo($setLabel);
+
+                            if (!('angle' in data)) {
+                                data = {angle: 0, riseName: '', setName: ''};
+                            }
+                            $riseName.prop('required',true);
+                            $setName.prop('required',true);
+                            $angle.prop('required',true);
+                            const validateName = function() {
+                                const angleName = this.value;
+
+                                // Find all fileName input fields with the same file name value
+                                const riseNameFields = predefAngleList.find('.node-input-riseName').filter(function() {
+                                    return this.value === angleName;
+                                });
+                                const setNameFields = predefAngleList.find('.node-input-setName').filter(function() {
+                                    return this.value === angleName;
+                                });
+
+                                // Show a red border around the fileName field, when the same file name value is used in multiple input fields
+                                if (preassignedSunPositions.includes(angleName) ||
+                                    riseNameFields.length > 1 ||
+                                    setNameFields.length > 1 ||
+                                    !(/^(?![0-9])[a-zA-Z0-9$_]+$/.test(angleName))) {
+                                    $(this).css('border', '1px solid rgb(214, 97, 95)');
+                                    $(this).addClass('input-error');
+                                } else {
+                                    $(this).css('border', '');
+                                    $(this).removeClass('input-error');
+                                }
+                            };
+
+                            $riseName.on('change keyup paste', validateName);
+                            $setName.on('change keyup paste', validateName);
+
+                            $angle.spinner('value', data.angle);
+                            $riseName.val(data.riseName);
+                            $setName.val(data.setName);
+                            $riseName.change();
+                            $setName.change();
+                            $angle.change();
+                            validateMyAngle.call($angle[0]);
+                            item[0].appendChild(fragment);
+                        }
+                    });
+
+                if (!node.sunPositions) {  // backward compatibility
+                    node.sunPositions = [];
+                }
+
+                node.sunPositions.forEach(data => {
+                    sunPositionList.editableList('addItem', data);
+                });
+
                 const setup = function(_node) {
                 /* global initCombobox */
                     initCombobox(node, $('#node-config-input-stateDateFormatSel'), $('#node-config-input-stateDateFormat'), 'dateOutFormat', 'outputFormats', node.stateDateFormat || 12, 50, 'isoDate');
@@ -222,28 +495,41 @@
                     });
             },
             oneditsave() {
-            /*
-            this.latitude = '';
-            this.longitude = '';
-            let longitude= $('#node-config-input-longitude').val();
-            longitude = parseFloat(longitude.trim());
-            if (isNaN(longitude)) {
-                $('#node-config-input-posLongitude').val('');
-            } else  {
-                $('#node-config-input-posLongitude').val(longitude);
-            }
-            $('#node-config-input-longitude').val(0);
-
-            let latitude= $('#node-config-input-longitude').val();
-            latitude = parseFloat(latitude.trim());
-            if (isNaN(latitude)) {
-                $('#node-config-input-posLatitude').val('');
-            } else  {
-                $('#node-config-input-posLatitude').val(latitude);
-            }
-            /* */
                 delete this.longitude;
                 delete this.latitude;
+                const node = this;
+
+                const predefAngleList = $('#node-input-predefAngleList').editableList('items');
+
+                node.predefAngles = [];
+                predefAngleList.each(function(_index)             {
+                    const data = {};
+
+                    const angle = $(this).find('.node-input-angle');
+                    const name = $(this).find('.node-input-name');
+
+                    data.angle = angle.spinner('value');
+                    data.name = name.val();
+
+                    node.predefAngles.push(data);
+                });
+
+                const sunPositionList = $('#node-input-sunPositionList').editableList('items');
+
+                node.sunPositions = [];
+                sunPositionList.each(function(_index) {
+                    const data = {};
+
+                    const angle = $(this).find('.node-input-angle');
+                    const riseName = $(this).find('.node-input-riseName');
+                    const setName = $(this).find('.node-input-setName');
+
+                    data.angle = angle.spinner('value');
+                    data.riseName = riseName.val();
+                    data.setName = setName.val();
+
+                    node.sunPositions.push(data);
+                });
             },
 
             /**
@@ -392,40 +678,24 @@
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.suninsky')}"${suffix}`;
                     case 'pdsCalcAzimuth':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.sunAzimuth')}"${suffix}`;
-                    case 'pdsCalcAzimuthRad':
-                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.sunAzimuthRad')}"${suffix}`;
                     case 'pdsCalcElevation':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.sunElevation')}"${suffix}`;
-                    case 'pdsCalcElevationRad':
-                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.sunElevationRad')}"${suffix}`;
                     case 'numAzimuth':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.numAzimuth')}"${suffix}`;
-                    case 'numAzimuthRad':
-                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.numAzimuthRad')}"${suffix}`;
                     case 'numAltitude':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.numAltitude')}"${suffix}`;
-                    case 'numAltitudeRad':
-                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.numAltitudeRad')}"${suffix}`;
+                    case 'numAnglePreDef':
+                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.numAnglePreDef')}"${suffix}`;
                     case 'pdsTimeByAzimuth':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByAzimuth')}"${suffix}`;
-                    case 'pdsTimeByAzimuthRad':
-                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByAzimuthRad')}"${suffix}`;
                     case 'pdsTimeByElevation':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationObj')}"${suffix}`;
-                    case 'pdsTimeByElevationRad':
-                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationObjRad')}"${suffix}`;
                     case 'pdsTimeByElevationNext':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationNext')}"${suffix}`;
-                    case 'pdsTimeByElevationNextRad':
-                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationNextRad')}"${suffix}`;
                     case 'pdsTimeByElevationRise':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationRise')}"${suffix}`;
-                    case 'pdsTimeByElevationRiseRad':
-                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationRiseRad')}"${suffix}`;
                     case 'pdsTimeByElevationSet':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationSet')}"${suffix}`;
-                    case 'pdsTimeByElevationSetRad':
-                        return `"${node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationSetRad')}"${suffix}`;
                     case 'pdmCalcData':
                         return `"${node._('node-red-contrib-sun-position/position-config:common.types.mooncalc')}"${suffix}`;
                     case 'pdmPhase':
@@ -482,6 +752,7 @@
                             }
                         }
                     }
+                    case 'pdsTimeCustom': return `"${node._('node-red-contrib-sun-position/position-config:common.types.timesuncustomnamed',{value:v})}"${suffix}`;
                     case 'pdmTime':
                         switch (v) {
                             case 'rise':
@@ -704,6 +975,28 @@
 
     <hr>
 
+    <div class="form-row form-tips is-to-show-initially" data-i18n="[html]position-config.tips.sunPositions"></div>
+
+    <div class="form-row node-input-sunPositionList-row" style="padding-top: 10px">
+        <label for="node-input-sunPositionList" style="width: auto;"><i class="fa fa-calendar-o"></i> <span data-i18n="position-config.label.sunPositions"></span></label>
+        <div class="form-row">
+            <ol id="node-input-sunPositionList"></ol>
+        </div>
+    </div>
+
+    <hr>
+
+    <div class="form-row form-tips is-to-show-initially" data-i18n="[html]position-config.tips.predefAngles"></div>
+
+    <div class="form-row node-input-predefAngles-row" style="padding-top: 10px">
+        <label for="node-input-predefAngles" style="width: auto;"><i class="fa fa-calendar-o"></i> <span data-i18n="position-config.label.predefAngles"></span></label>
+        <div class="form-row">
+            <ol id="node-input-predefAngleList"></ol>
+        </div>
+    </div>
+
+    <hr>
+
     <div class="form-row">
         <label for="node-config-input-name"><i class="icon-tag"></i> <span data-i18n="position-config.label.name"></span></label>
         <input type="text" id="node-config-input-name" data-i18n="[placeholder]position-config.placeholder.name">
diff --git a/nodes/10-position-config.js b/nodes/10-position-config.js
index 2ab6a11d..12031389 100644
--- a/nodes/10-position-config.js
+++ b/nodes/10-position-config.js
@@ -21,10 +21,15 @@
  *
  */
 
-/********************************************
+/*******************************************************************************************************
  * position-config:
- *********************************************/
+ ******************************************************************************************************/
+
 'use strict';
+
+/*******************************************************************************************************
+ * --- imported type definitions ---
+ ******************************************************************************************************/
 /** --- Type Defs ---
  * @typedef {import('./types/typedefs.js').runtimeRED} runtimeRED
  * @typedef {import('./types/typedefs.js').runtimeNode} runtimeNode
@@ -33,11 +38,19 @@
  * @typedef {import("./lib/dateTimeHelper").ILimitationsObj} ILimitationsObj
  * @typedef {import("suncalc3").ISunTimeDef} ISunTimeDef
  * @typedef {import("suncalc3").ISunTimeSingle} ISunTimeSingle
+ * @typedef {import("suncalc3").ISunTimeList} ISunTimeList
+ * @typedef {import("suncalc3").ISunPosition} ISunPosition
+ * @typedef {import("suncalc3").IMoonPosition} IMoonPosition
+ * @typedef {import("suncalc3").IMoonIllumination} IMoonIllumination
+ * @typedef {import("suncalc3").IMoonData} IMoonData
+ * @typedef {import("suncalc3").IMoonTimes} IMoonTimes
  */
 
-// IPositionConfigNodeInstance
+/*******************************************************************************************************
+ * --- generic type definitions ---
+ ******************************************************************************************************/
 /**
- * @typedef {Object} IPositionConfigNodeInstance Extensions for the nodeInstance object type
+ * @typedef {Object} IPositionConfigNode Extensions for the nodeInstance object type
  * @property {boolean} valid
  * @property {number} latitude
  * @property {number} longitude
@@ -47,61 +60,260 @@
  * @property {string} contextStore
  * @property {object} cache
  *
- * @property {function} setState function for settign the state of the node
- * @property {function} register register a node as child
- * @property {function} deregister remove a previous registered node as child
+ * @property {FktRegister} register register a node as child
+ * @property {FktDeregister} deregister remove a previous registered node as child
  * @property {FktCheckNode} checkNode checks the node configuration
  * @property {FktFormatDate} toDateTimeString Formate a Date Object to a Date and Time String
  * @property {FktFormatDate} toTimeString Formate a Date Object to a Time String
  * @property {FktFormatDate} toDateString Formate a Date Object to a Date String
+ * @property {FktGetCustomAngles} getCustomAngles get list of custom angles
+ * @property {FktGetSunTimesList} getSunTimesList get list of all suntimes including custom ones
  * @property {FktGetFloatProp} getFloatProp get a float value from a type input in Node-Red
  * @property {FktFormatOutDate} formatOutDate get an formated date prepared for output
  * @property {FktGetOutDataProp} getOutDataProp get the time Data prepared for output
  * @property {FktSetMessageProp} setMessageProp Creates a out object, based on input data
  * @property {FktGetTimeProp} getTimeProp get the time Data from a typed input
+ * @property {FktGetJSONataExpression} getJSONataExpression get a prepared JSONATA Expression
  * @property {FktGetPropValue} getPropValue get a property value from a type input in Node-Red
  * @property {FktComparePropValue} comparePropValue compared two property's
- * @property {function} getSunCalc
- * @property {function} getMoonCalc
- * @property {FktGetJSONataExpression} getJSONataExpression get a prepared JSONATA Expression
+ * @property {FktGetSunCalc} getSunCalc
+ * @property {FktGetMoonCalc} getMoonCalc
  * ... obviously there are more ...
  */
 
+/*******************************************************************************************************
+ * --- Interfaces ---
+ ******************************************************************************************************/
 /**
  * This callback is displayed as a global member.
  * @callback IValuePropertyTypeCallback
- * @param {*} result - the result of the property value from a type input in Node-Red
- * @param {IValuePropertyType} data - the given data to the function
+ * @param {*} result                    - the result of the property value from a type input in Node-Red
+ * @param {IValuePropertyType} data     - the given data to the function
+ * @param {boolean} cachable            - boolean which is true if the value is cachable
  * @returns {*} value of the type input
  */
 
 /**
  * @typedef {Object} ITypedValue
- * @property {string} type - type of the value
+ * @property {String} type - type of the value
  * @property {*} value - value
  */
 
 /**
  * @typedef {Object} IValuePropertyType
- * @property {string} type - type of the value
+ * @property {String} type - type of the value
  * @property {*} value - value
  * @property {*} [expr] - optional prepared Jsonata expression
  * @property {IValuePropertyTypeCallback} [callback] - function which should be called after value was recived
+ * @property {Boolean} [noError] - true if no error shoudl be given in GUI
+ * @property {Date} [now] base Date to use for Date time functions
+ */
+
+/**
+ * @typedef {Object} INodeCacheSunData
+ * @property {ISunTimeList} times
+ * @property {Number} dayId
+ * @property {ISunPosition} [sunPosAtSolarNoon]
+ */
+
+/**
+ * @typedef {Object} INodeCacheMoonData
+ * @property {IMoonTimes} times
+ * @property {Number} dayId
+ * @property {IMoonPosition} positionAtRise
+ * @property {IMoonPosition} positionAtSet
+ */
+
+/**
+ * @typedef {Object} INodeCacheData
+ * @property {ISunDataResult|{ts: number}} lastSunCalc - last mooncalc
+ * @property {Object} lastMoonCalc - last mooncalc
+ * @property {INodeCacheSunData} sunTimesToday - last mooncalc
+ * @property {INodeCacheSunData} sunTimesTomorrow - last mooncalc
+ * @property {INodeCacheSunData} sunTimesAdd1 - last mooncalc
+ * @property {INodeCacheSunData} sunTimesAdd2 - last mooncalc
+ * @property {INodeCacheMoonData} moonTimesToday - last mooncalc
+ * @property {INodeCacheMoonData} moonTimesTomorrow - last mooncalc
+ * @property {INodeCacheMoonData} moonTimes2Days - last mooncalc
+ */
+
+/**
+ * @typedef {Object} ISunDataResult
+ * @property {Number} ts - the date of the calculated sun data as timestamp
+ * @property {Date} lastUpdate - the date of the calculated sun data
+ * @property {String} lastUpdateStr - date as string
+ * @property {Number} latitude - latitude
+ * @property {Number} longitude - longitude
+ * @property {Number} height -observer height
+ * @property {('deg'|'rad')} angleType
+ * @property {Number} azimuth
+ * @property {Number} altitude
+ * @property {Number} altitudeDegrees
+ * @property {Number} azimuthDegrees
+ * @property {Number} altitudeRadians
+ * @property {Number} azimuthRadians
+ * @property {ISunTimeList} times
+ * @property {ISunPosition} [positionAtSolarNoon]
+ * @property {Number} [altitudePercent]
+ */
+
+/**
+ * @typedef {Object} IMoonDataResult
+ * @property {Number} ts - the date of the calculated sun data as timestamp
+ * @property {Date} lastUpdate - the date of the calculated sun data
+ * @property {String} lastUpdateStr - date as string
+ * @property {Number} latitude - latitude
+ * @property {Number} longitude - longitude
+ * @property {('deg'|'rad')} angleType
+ * @property {Number} azimuth
+ * @property {Number} altitude
+ * @property {Number} altitudeDegrees
+ * @property {Number} azimuthDegrees
+ * @property {Number} altitudeRadians
+ * @property {Number} azimuthRadians
+ * @property {Number} distance
+ * @property {Number} parallacticAngle
+ * @property {IMoonIllumination} illumination
+ * @property {Number} zenithAngle
+ * @property {IMoonTimes} times
+ * @property {IMoonTimes} [timesNext]
+ * @property {IMoonPosition} [positionAtRise]
+ * @property {IMoonPosition} [positionAtSet]
+ * @property {Number} [altitudePercent]
+ * @property {IMoonPosition} [highestPosition]
+ * @property {Boolean} [isUp]
+ */
+
+
+/**
+ * @typedef {Object} ITimeResult
+ * @property {Date} value - a Date object of the neesed date/time
+ * @property {number} ts - The time as unix timestamp
+ * @property {number} pos - The position of the sun on the time
+ * @property {number} angle - Angle of the sun on the time
+ * @property {number} julian - The time as julian calendar
+ * @property {Boolean} valid - indicates if the time is valid or not
+ * @property {String} [error] - string of an error message if an error occurs
+ */
+
+/**
+ * @typedef {Object} ISunTimeDefRed
+ * @property {String} name - The Name of the time
+ * @property {Date} value - Date object with the calculated sun-time
+ * @property {number} pos - The position of the sun on the time
+ * @property {number} elevation - The elevation angle
+ * @property {Boolean} valid - indicates if the time is valid or not
+ */
+
+/**
+ * @typedef {Object} ISunTimeDefNextLast
+ * @property {ISunTimeDefRed} next - next sun time
+ * @property {ISunTimeDefRed} last - previous sun time
+ */
+
+/**
+ * @typedef {Object} IMoonTime
+ * @property {Date|NaN} value - a Date object of the neesed date/time
+ * @property {String} [error] - string of an error message if an error occurs
+ */
+
+/**
+ * @typedef {Object} IOffsetData
+ * @property {String} [offset] - value of the offset
+ * @property {String} [offsetType] - type name of the offset
+ * @property {IValuePropertyTypeCallback} [offsetCallback] - callback function for getting getPropValue
+ * @property {Boolean} [noOffsetError] - true if no error should be given in GUI
+ * @property {number} [multiplier] - multiplier to the time
+ */
+
+/**
+ * @typedef {Object} ITimePropertyTypeInt
+ * @property {String} [format]      - format of the input
+ * @property {String} [days]        - valid days
+ * @property {String} [months]      - valid monthss
+ * @property {Date} [now]           - base date, current time as default
+ * @property {number} [latitude]    - latitude
+ * @property {number} [longitude]   - longitude
+ * @property {number} [height]      - height definition
+ * @property {*} [expr] - optional prepared Jsonata expression
+ *
+ * @typedef {ITimePropertyTypeInt & ILimitationsObj & ITypedValue & IOffsetData} ITimePropertyType
+ */
+
+/**
+ * get a float value from a type input in Node-Red
+ * @typedef {Object} IGetFloatPropData
+ * @property {String} type - type of the value
+ * @property {*} value - value
+ * @property {*} [expr] - optional prepared Jsonata expression
+ * @property {number} [def] - default value if can not get float value
+ * @property {IValuePropertyTypeCallback} [callback] - callback function for getting getPropValue
+ * @property {Boolean} [noError] - true if no error should be given in GUI
+ * @property {Date} [now] base Date to use for Date time functions
+ */
+
+/**
+ * @typedef {Object} ITimePropertyResult
+ * @property {Date} value - the Date value
+ * @property {String} error - error message if an error has occured
+ * @property {Boolean} fix - indicator if the given time value is a fix date
+ */
+
+/*******************************************************************************************************
+ * --- Functions ---
+ ******************************************************************************************************/
+/**
+ * check this node for configuration errors
+ * @typedef {function} FktRegister
+ * @param {runtimeNode} srcnode node to register as child node
+ * @public
+ */
+
+/**
+ * check this node for configuration errors
+ * @typedef {function} FktDeregister
+ * @param {runtimeNode} srcnode node to register as child node
+ * @param {function} done node to register as child node
+ * @returns {*} result of the function
+ * @public
+ */
+
+/**
+ * This callback type is called `requestCallback` and is displayed as a global symbol.
+ *
+ * @callback onErrorCallback
+ * @param {String} errorMessage - the error message
+ * @return {Boolean|String} returns true if ok otherwise an string with the error
  */
 
 /**
  * check this node for configuration errors
  * @typedef {function} FktCheckNode
  * @property {onErrorCallback} [onError] - if an error occurs this function will be called
- * @property {any} [onOk] - the return value in case of ok
- * @return {boolean|string} returns the result of onrror if an error occurs, otherwise onOK
+ * @property {Boolean|function} [onOk=false] - if no error, this function will be called or the return value in case of ok
+ * @return {Boolean|String} returns the result of onError if an error occurs, otherwise result of onOk
  */
 
 /**
  * Formate a Date Object
  * @typedef {function} FktFormatDate
  * @param {Date} dt Date to format to Date and Time string
- * @returns {string} formated Date object
+ * @returns {String} formated Date object
+ */
+
+/**
+ * get list of custom angles
+ * @typedef {function} FktGetCustomAngles
+ * @param {string} filter filter to the angle names
+ * @returns {Array.<{value: string, name: string, angle: number, [i:number]}>}
+ */
+
+/**
+ * get list of all suntimes including custom ones
+ * @typedef {function} FktGetSunTimesList
+ * @param {string} filter filter to the angle names
+ * @param {boolean} [onlyCustom=false] if true only custom angles will be given
+ * @returns {Array.<{value: string, name: string, angle: number, [i:number]}>}
  */
 
 /**
@@ -109,12 +321,7 @@
  * @typedef {function} FktGetFloatProp
  * @param {runtimeNode} _srcNode - source node information
  * @param {Object} msg - message object
- * @param {string} type - type name of the type input
- * @param {*} value - value of the type input
- * @param {number} [def] - default value if can not get float value
- * @param {IValuePropertyTypeCallback} [callback] - callback function for getting getPropValue
- * @param {boolean} [noError] - true if no error should be given in GUI
- * @param {Date} [dNow] base Date to use for Date time functions
+ * @param {IGetFloatPropData} data - input data object
  * @returns {number} float property
  */
 
@@ -125,7 +332,6 @@
  * @param {Object} msg - the message object
  * @param {Date} dateValue - the source date object which should be formated
  * @param {ITimePropertyType} data - additional formating and control data
- * @param {Date} [dNow] base Date to use for Date time functions
  */
 
 /**
@@ -135,7 +341,7 @@
  * @param {Object} msg - the message object
  * @param {ITimePropertyType} data - a Data object
  * @param {Date} [dNow] base Date to use for Date time functions
- * @param {boolean} [noError] - true if no error shoudl be given in GUI
+ * @param {Boolean} [noError] - true if no error shoudl be given in GUI
  * @returns {*} output Data
  */
 
@@ -144,7 +350,7 @@
  * @typedef {function} FktSetMessageProp
  * @param {runtimeNode} _srcNode The base node
  * @param {Object} msg The Message Object to set the Data
- * @param {string} type type of the property to set
+ * @param {String} type type of the property to set
  * @param {*} value value of the property to set
  * @param {*} msgPropertyData Data object to set to the property
  */
@@ -155,7 +361,6 @@
  * @param {runtimeNode} _srcNode - source node for logging
  * @param {Object} msg - the message object
  * @param {ITimePropertyType} data - a Data object
- * @param {Date} [dNow] base Date to use for Date time functions
  * @returns {ITimePropertyResult} value of the type input
  */
 
@@ -163,7 +368,7 @@
  * get a prepared JSONATA Expression
  * @typedef {function} FktGetJSONataExpression
  * @param {runtimeNode} _srcNode - source node information
- * @param {string} value - get an expression for a value
+ * @param {String} value - get an expression for a value
  * @returns {function} JSONataExpression
  */
 
@@ -173,8 +378,7 @@
  * @param {runtimeNode} _srcNode - source node information
  * @param {Object} msg - message object
  * @param {IValuePropertyType} data - data object with more information
- * @param {boolean} [noError] - true if no error shoudl be given in GUI
- * @param {Date} [dNow] base Date to use for Date time functions
+ * @param {Boolean} [noError] - true if no error shoudl be given in GUI
  * @returns {*} value of the type input, return of the callback function if defined or __null__ if value could not resolved
 */
 
@@ -184,82 +388,56 @@
  * @param {runtimeNode} _srcNode - source node information
  * @param {Object} msg - message object
  * @property {IValuePropertyType} operandA - first operand
- * @property {string} compare - compare between the both operands
+ * @property {String} compare - compare between the both operands
  * @property {IValuePropertyType} operandB - second operand
- * @param {boolean} [noError] - true if no error shoudl be given in GUI
- * @param {Date} [dNow] base Date to use for Date time functions
  * @returns {*} value of the type input, return of the callback function if defined or __null__ if value could not resolved
 */
 
 /**
- * @typedef {IPositionConfigNodeInstance & runtimeNode} IPositionConfigNode Combine nodeInstance with additional, optional functions
- */
-
-/**
- * @typedef {Object} ITimeResult
- * @property {Date} value - a Date object of the neesed date/time
- * @property {number} ts - The time as unix timestamp
- * @property {number} pos - The position of the sun on the time
- * @property {number} angle - Angle of the sun on the time
- * @property {number} julian - The time as julian calendar
- * @property {boolean} valid - indicates if the time is valid or not
- * @property {string} [error] - string of an error message if an error occurs
- */
-
-/**
- * @typedef {Object} ISunTimeDefRed
- * @property {string} name - The Name of the time
- * @property {Date} value - Date object with the calculated sun-time
- * @property {number} pos - The position of the sun on the time
- * @property {number} elevation - The elevation angle
- * @property {boolean} valid - indicates if the time is valid or not
- */
-
-/**
- * @typedef {Object} ISunTimeDefNextLast
- * @property {ISunTimeDefRed} next - next sun time
- * @property {ISunTimeDefRed} last - previous sun time
- */
-
-/**
- * @typedef {Object} IMoonTime
- * @property {Date|NaN} value - a Date object of the neesed date/time
- * @property {string} [error] - string of an error message if an error occurs
+ * compared two property's
+ * @typedef {function} FktGetSunCalc
+ * @param {Date} [date] - defines the date to calculates sun data for (can be a number too)
+ * @param {Boolean} [calcTimes] - defines if times should be calculated
+ * @param {Boolean} [sunInSky] - is sun in sky should determinated
+ * @param {Number} [specLatitude] - optionaly special latitude
+ * @param {Number} [specLongitude] - optionaly special longitude
+ * @param {Number} [specHeight] - optionaly observer height
+ * @returns {ISunDataResult}
+ * @public
  */
 
 /**
- * @typedef {Object} IOffsetData
- * @property {string} [offset] - value of the offset
- * @property {string} [offsetType] - type name of the offset
- * @property {IValuePropertyTypeCallback} [offsetCallback] - callback function for getting getPropValue
- * @property {boolean} [noOffsetError] - true if no error should be given in GUI
- * @property {number} [multiplier] - multiplier to the time
+ * compared two property's
+ * @typedef {function} FktGetMoonCalc
+ * @param {Date} [date] - defines the date to calculates sun data for (can be a number too)
+ * @param {Boolean} [calcTimes] - defines if times should be calculated
+ * @param {Boolean} [moonInSky] - is moon in sky should determinated
+ * @param {Number} [specLatitude] - optionaly special latitude
+ * @param {Number} [specLongitude] - optionaly special longitude
+ * @returns {IMoonDataResult}
+ * @public
  */
 
 /**
- * @typedef {Object} ITimePropertyTypeInt
- * @property {string} [format]      - format of the input
- * @property {string} [days]        - valid days
- * @property {string} [months]      - valid monthss
- * @property {Date} [now]           - base date, current time as default
- * @property {number} [latitude]    - latitude
- * @property {number} [longitude]   - longitude
- * @property {number} [height]      - height definition
- * @property {*} [expr] - optional prepared Jsonata expression
+ * check an array if an array has duplicates.
  *
- * @typedef {ITimePropertyTypeInt & ILimitationsObj & ITypedValue & IOffsetData} ITimePropertyType
+ * @callback FktHasDuplicates
+ * @param {Array.<String>} arr - An array of strings.
+ * @returns {Boolean} __true__ if array has duplicates
  */
 
 /**
- * @typedef {Object} ITimePropertyResult
- * @property {Date} value - the Date value
- * @property {string} error - error message if an error has occured
- * @property {boolean} fix - indicator if the given time value is a fix date
+ * check an array if an array has duplicates.
+ *
+ * @callback FktValidateCustomTimes
+ * @param {Array.<{riseName: String, setName: String, angle: number, rad: Boolean}>} riseName - An array of strings.
+ * @returns {Boolean} __true__ if array has duplicates
  */
 
 /*******************************************************************************************************/
-/** Export the function that defines the node
- * @type {runtimeRED} */
+// Implementation
+/*******************************************************************************************************/
+/** Export the function that defines the node */
 module.exports = function (/** @type {runtimeRED} */ RED) {
     'use strict';
 
@@ -267,12 +445,12 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
     const util = require('util');
     const sunCalc = require('suncalc3');
 
-    const dayMs = 86400000; // 1000 * 60 * 60 * 24;
-
     /** generic configuration Node
      * @class
-     * @augments IPositionConfigNode
-    */
+     * @extends {runtimeNode}
+     * @constructor
+     * @public
+     */
     class positionConfigurationNode {
         /**
          * creates a new instance of the settings node and initializes them
@@ -280,16 +458,34 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          */
         constructor(config) {
             RED.nodes.createNode(this, config);
+            /** Copy 'this' object in case we need it in context of callbacks of other functions.
+             * @type {runtimeNode}
+             * @private
+             */
+            // @ts-ignore
+            const node = this;
 
             try {
+                /** @type {String} - name of the node */
                 this.name = config.name;
+                /** @type {Boolean} - indicator if the node is valid */
                 this.valid = true;
+                /** @type {number} - latitude angle */
+                this.latitude = parseFloat(Object.prototype.hasOwnProperty.call(
+                    // @ts-ignore
+                    this.credentials, 'posLatitude') ? this.credentials.posLatitude : config.latitude);
+                /** @type {number} - longitude angle */
+                this.longitude = parseFloat(Object.prototype.hasOwnProperty.call(
+                    // @ts-ignore
+                    this.credentials, 'posLongitude') ? this.credentials.posLongitude : config.longitude);
+                /** @type {number} - observer height */
+                this.height = parseFloat(
+                    // @ts-ignore
+                    this.credentials.height);
                 // @ts-ignore
-                this.latitude = parseFloat(Object.prototype.hasOwnProperty.call(this.credentials, 'posLatitude') ? this.credentials.posLatitude : config.latitude);
-                // @ts-ignore
-                this.longitude = parseFloat(Object.prototype.hasOwnProperty.call(this.credentials, 'posLongitude') ? this.credentials.posLongitude : config.longitude);
-                // @ts-ignore
-                this.height = parseFloat(this.credentials.height);
+                if (typeof this.credentials.height === 'undefined' || this.credentials.height === '') { this.height = 0; }
+
+                /** @type {FktCheckNode} - checkNode checks the node configuration */
                 this.checkNode(
                     error => {
                         // @ts-ignore
@@ -298,11 +494,58 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                         this.status({fill: 'red', shape: 'dot', text: error });
                         this.valid = false;
                     });
+                /** @type {('deg'|'rad')} - type of the angle */
                 this.angleType = config.angleType;
+                /** @type {number} - time zone offset */
                 this.tzOffset = parseInt(config.timeZoneOffset || 99);
+                /** @type {number} - time zone DST */
                 this.tzDST = parseInt(config.timeZoneDST || 0);
+                /** @type {String} - type of the angle */
                 this.contextStore = config.contextStore;
 
+                /** @type {FktHasDuplicates} - check an array if an array has duplicates */
+                this.hasDuplicates = arr => {
+                    return arr.some(item => {
+                        return (arr.indexOf(item) !== arr.lastIndexOf(item));
+                    });
+                };
+
+                /** @type {Array.<{name: String, angle: number}>} - custom angle definition */
+                this.customAngles = [];
+                if (config.predefAngles && (config.predefAngles.length > 0)) {
+                    const EXP = /^[0-9a-zA-Z_\s]+$/;
+                    const names = [];
+
+                    config.predefAngles.forEach((/** @type {{ angle: number; name: String;rad: Boolean }} */ time) => {
+                        if (!EXP.test(time.name) ||
+                            isNaN(time.angle) ||
+                            typeof time.angle !== 'number') {
+                            node.error(RED._('position-config.errors.custom-angles', time));
+                            this.valid = false;
+                        } else if (names.includes(time.name)) {
+                            node.error(RED._('position-config.errors.custom-angles-duplicate', time));
+                            this.valid = false;
+                        } else {
+                            names.push(time.name);
+                            this.customAngles.push({
+                                name: time.name,
+                                angle: time.angle
+                            });
+                        }
+                    });
+                }
+
+                const times = config.sunPositions;
+                if (times) {
+                    times.forEach((/** @type {{ angle: number; riseName: String; setName: String }} */ time, /** @type {number} */ index) => {
+                        if (!sunCalc.addTime(time.angle, time.riseName, time.setName, index+100, index+200, this.angleType === 'deg')) {
+                            node.error(RED._('position-config.errors.invalid-custom-suntime', time));
+                            this.valid = false;
+                        }
+                    });
+                }
+
+                /** @type {INodeCacheData} - cache object */
                 this.cache = {
                     lastSunCalc: {
                         ts: 0
@@ -310,12 +553,19 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     lastMoonCalc: {
                         ts: 0
                     },
+                    // @ts-ignore
                     sunTimesToday: {},
+                    // @ts-ignore
                     sunTimesTomorrow: {},
+                    // @ts-ignore
                     sunTimesAdd1: {},
+                    // @ts-ignore
                     sunTimesAdd2: {},
+                    // @ts-ignore
                     moonTimesToday: {},
+                    // @ts-ignore
                     moonTimesTomorrow: {},
+                    // @ts-ignore
                     moonTimes2Days: {}
                 };
 
@@ -333,16 +583,20 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 }
                 // this.debug(`initialize latitude=${this.latitude} longitude=${this.longitude} tzOffset=${this.tzOffset} tzDST=${this.tzDST}`);
 
-                this.stateTimeFormat = config.stateTimeFormat || '3';
-                this.stateDateFormat = config.stateDateFormat || '12';
+                /** @type {number|string} - standard time format */
+                this.stateTimeFormat = config.stateTimeFormat || 3;
+                /** @type {number|string} - standard date format */
+                this.stateDateFormat = config.stateDateFormat || 12;
                 // this.debug('load position-config ' + this.name + ' latitude:' + this.latitude + ' long:' + this.longitude + ' angelt:' + this.angleType + ' TZ:' + this.tzOffset);
 
-
                 const today = new Date();
                 const dayId = hlp.getDayId(today); // this._getUTCDayId(today);
                 this._sunTimesRefresh(today.valueOf(), dayId);
                 this._moonTimesRefresh(today.valueOf(), dayId);
                 hlp.initializeParser(RED._('common.days', { returnObjects: true}), RED._('common.months', { returnObjects: true}), RED._('common.dayDiffNames', { returnObjects: true}));
+
+                /** @type {Object} - cache object */
+                this.subNodes = {};
             } catch (err) {
                 // @ts-ignore
                 this.debug(util.inspect(err));
@@ -359,10 +613,10 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         /**
          * register a node as child
          * @param {runtimeNode} srcnode node to register as child node
+         * @public
          */
         register(srcnode) {
-            // @ts-ignore
-            this.users[srcnode.id] = srcnode;
+            this.subNodes[srcnode.id] = srcnode;
         }
 
         /**
@@ -370,26 +624,19 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {runtimeNode} srcnode node to remove
          * @param {function} done function which should be executed after deregister
          * @returns {*} result of the function
+         * @public
          */
         deregister(srcnode, done) {
-            // @ts-ignore
-            delete srcnode.users[srcnode.id];
+            delete this.subNodes[srcnode.id];
             return done();
         }
         /*******************************************************************************************************/
-        /**
-         * This callback type is called `requestCallback` and is displayed as a global symbol.
-         *
-         * @callback onErrorCallback
-         * @param {string} errorMessage - the error message
-         * @return {boolean|string} returns true if ok otherwise an string with the error
-         */
-
         /**
          * check this node for configuration errors
          * @property {onErrorCallback} [onError] - if an error occurs this function will be called
-         * @property {any} [onOk] - the return value in case of ok
-         * @return {boolean|string} returns the result of onrror if an error occurs, otherwise onOK
+         * @property {Boolean|function} [onOk=false] - if no error, this function will be called or the return value in case of ok
+         * @return {Boolean|String} returns the result of onError if an error occurs, otherwise result of onOk
+         * @public
          */
         checkNode(onError, onOk) {
             if ((Number.isNaN(this.latitude) && Number.isNaN(this.longitude))) {
@@ -401,13 +648,19 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             if (isNaN(this.longitude) || (this.longitude < -180) || (this.longitude > 180)) {
                 return onError(RED._('position-config.errors.longitude-missing'));
             }
-            return onOk;
+            if (Number.isNaN(this.height)) {
+                return onError(RED._('position-config.errors.height-wrong'));
+            }
+            if (typeof onOk === 'function') {
+                return onOk();
+            }
+            return onOk ? true : false;
         }
         /*******************************************************************************************************/
         /**
          * gets sun time by Name
          * @param {Date} dNow current time
-         * @param {string} value name of the sun time
+         * @param {String} name name of the sun time
          * @param {number} [offset] the offset (positive or negative) which should be added to the date. If no multiplier is given, the offset must be in milliseconds.
          * @param {number} [multiplier] additional multiplier for the offset. Should be a positive Number. Special value -1 if offset is in month and -2 if offset is in years
          * @param {ILimitationsObj} [limit] additional limitations for the calculation
@@ -415,27 +668,28 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {number} [longitude] longitude
          * @param {number} [height] height definition
          * @return {ITimeResult} result object of sunTime
+         * @private
          */
-        _getSunTimeByName(dNow, value, offset, multiplier, limit, latitude, longitude, height) {
+        _getSunTimeByName(dNow, name, offset, multiplier, limit, latitude, longitude, height) {
             // this.debug('_getSunTimeByName dNow=' + dNow + ' limit=' + util.inspect(limit, { colors: true, compact: 10, breakLength: Infinity }));
             let result;
             const dayId = hlp.getDayId(dNow); // this._getUTCDayId(dNow);
             const mheight = (height || this.height);
             if (latitude && longitude) {
-                result = Object.assign({}, sunCalc.getSunTimes(dNow.getTime(), latitude, longitude, mheight, true)[value]);
+                result = Object.assign({}, sunCalc.getSunTimes(dNow.getTime(), latitude, longitude, mheight, true)[name]);
             } else {
                 latitude = this.latitude;
                 longitude = this.longitude;
                 this._sunTimesCheck(); // refresh if needed, get dayId
-                // this.debug(`_getSunTimeByName value=${value} offset=${offset} multiplier=${multiplier} dNow=${dNow} dayId=${dayId} limit=${util.inspect(limit, { colors: true, compact: 10, breakLength: Infinity })}`);
+                // this.debug(`_getSunTimeByName name=${name} offset=${offset} multiplier=${multiplier} dNow=${dNow} dayId=${dayId} limit=${util.inspect(limit, { colors: true, compact: 10, breakLength: Infinity })}`);
                 if (dayId === this.cache.sunTimesToday.dayId) {
-                    result = Object.assign({}, this.cache.sunTimesToday.times[value]); // needed for a object copy
+                    result = Object.assign({}, this.cache.sunTimesToday.times[name]); // needed for a object copy
                 } else if (dayId === this.cache.sunTimesTomorrow.dayId) {
-                    result = Object.assign({}, this.cache.sunTimesTomorrow.times[value]); // needed for a object copy
+                    result = Object.assign({}, this.cache.sunTimesTomorrow.times[name]); // needed for a object copy
                 } else if (dayId === this.cache.sunTimesAdd1.dayId) {
-                    result = Object.assign({},this.cache.sunTimesAdd1.times[value]); // needed for a object copy
+                    result = Object.assign({},this.cache.sunTimesAdd1.times[name]); // needed for a object copy
                 } else if (dayId === this.cache.sunTimesAdd2.dayId) {
-                    result = Object.assign({},this.cache.sunTimesAdd2.times[value]); // needed for a object copy
+                    result = Object.assign({},this.cache.sunTimesAdd2.times[name]); // needed for a object copy
                 } else {
                     // this.debug('sun-time not in cache - calc time');
                     this.cache.sunTimesAdd2 = {
@@ -446,20 +700,33 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                         dayId,
                         times : sunCalc.getSunTimes(dNow.getTime(), latitude, longitude, mheight, true)
                     };
-                    result = Object.assign({},this.cache.sunTimesAdd1.times[value]); // needed for a object copy
+                    result = Object.assign({},this.cache.sunTimesAdd1.times[name]); // needed for a object copy
                 }
             }
+            if (!result) {
+                // @ts-ignore
+                this.error(RED._('position-config.errors.invalid-custom-suntime', {name}));
+                return {
+                    error: RED._('position-config.errors.invalid-custom-suntime', {name}),
+                    valid: false,
+                    ts: dNow.valueOf(),
+                    value: dNow,
+                    pos: NaN,
+                    angle: NaN,
+                    julian: NaN
+                };
+            }
 
             result.value = hlp.addOffset(new Date(result.value), offset, multiplier);
             if (limit.next && result.value.getTime() <= dNow.getTime()) {
                 if (dayId === this.cache.sunTimesToday.dayId) {
-                    result = Object.assign({}, this.cache.sunTimesTomorrow.times[value]);
+                    result = Object.assign({}, this.cache.sunTimesTomorrow.times[name]);
                     result.value = hlp.addOffset(new Date(result.value), offset, multiplier);
                 }
                 const dateBase = new Date(dNow);
                 while (result.value.getTime() <= dNow.getTime()) {
                     dateBase.setUTCDate(dateBase.getUTCDate() + 1);
-                    result = Object.assign(result, sunCalc.getSunTimes(dateBase.getTime(), latitude, longitude, mheight, true)[value]);
+                    result = Object.assign(result, sunCalc.getSunTimes(dateBase.getTime(), latitude, longitude, mheight, true)[name]);
                     result.value = hlp.addOffset(new Date(result.value), offset, multiplier);
                 }
             }
@@ -472,7 +739,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
             if (r.hasChanged) {
                 this.checkNode(error => { throw new Error(error); });
-                result = Object.assign(result, sunCalc.getSunTimes(result.value.valueOf(), latitude, longitude, mheight, true)[value]);
+                result = Object.assign(result, sunCalc.getSunTimes(result.value.valueOf(), latitude, longitude, mheight, true)[name]);
                 result.value = hlp.addOffset(new Date(result.value), offset, multiplier);
             }
 
@@ -484,12 +751,12 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * gets sun time by Elevation
          * @param {Date} dNow current time
          * @param {number} elevationAngle name of the sun time
-         * @param {boolean} degree type of the angle
          * @param {ITimePropertyType} tprop additional limitations for the calculation
-         * @param {string} [prop=both] property (set, rise or both) to return
+         * @param {('set'|'rise'|'both')} [prop=both] property (set, rise or both) to return
          * @return {ISunTimeSingle} result object of sunTime
+         * @private
          */
-        _getSunTimeByElevation(dNow, elevationAngle, degree, tprop, prop) {
+        _getSunTimeByElevation(dNow, elevationAngle, tprop, prop) {
             if (!hlp.isValidDate(dNow)) {
                 const dto = new Date(dNow);
                 if (hlp.isValidDate(dto)) {
@@ -502,19 +769,13 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             const latitude = (tprop.latitude || this.latitude);
             const longitude = (tprop.longitude || this.longitude);
             const height = (tprop.height || this.height);
+            const degree = (this.angleType === 'deg');
             const result = Object.assign({},sunCalc.getSunTime(dNow.valueOf(), latitude, longitude, elevationAngle, height, degree));
 
-            const offsetX = this.getFloatProp(
-                /** @type {IPositionConfigNode} */
+            const offsetX = this._getOffsetVal(
                 // @ts-ignore
                 this,
-                null,
-                tprop.offsetType,
-                tprop.offset,
-                0,
-                tprop.offsetCallback,
-                tprop.noOffsetError,
-                dNow);
+                null, tprop, dNow);
             const calc = (result, recalc) => {
                 result.value = hlp.addOffset(new Date(result.value), offsetX, tprop.multiplier);
                 if (tprop.next && result.value.getTime() <= dNow.getTime()) {
@@ -558,6 +819,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {number} [latitude] latitude
          * @param {number} [longitude] longitude
          * @return {Date} result object of sunTime
+         * @private
          */
         _getSunTimeByAzimuth(dNow, azimuthAngle, degree, tprop, latitude, longitude) {
             if (!hlp.isValidDate(dNow)) {
@@ -573,17 +835,10 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             longitude = (longitude || tprop.longitude || this.longitude);
             let result = sunCalc.getSunTimeByAzimuth(dNow, latitude, longitude, azimuthAngle, degree);
 
-            const offsetX = this.getFloatProp(
-                /** @type {IPositionConfigNode} */
+            const offsetX = this._getOffsetVal(
                 // @ts-ignore
                 this,
-                null,
-                tprop.offsetType,
-                tprop.offset,
-                0,
-                tprop.offsetCallback,
-                tprop.noOffsetError,
-                dNow);
+                null, tprop, dNow);
             result = hlp.addOffset(result, offsetX, tprop.multiplier);
             if (tprop.next && result.getTime() <= dNow.getTime()) {
                 const datebase = new Date(dNow);
@@ -613,6 +868,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * gets previous and next sun time
          * @param {Date} dNow current time
          * @return {ISunTimeDefNextLast} result object of sunTime
+         * @private
          */
         _getSunTimePrevNext(dNow) {
             let dayId = hlp.getDayId(dNow); // this._getUTCDayId(dNow);
@@ -702,7 +958,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             } else if (dayId === this.cache.sunTimesAdd2.dayId) {
                 result = this.cache.sunTimesAdd2.times;
             } else {
-                result = sunCalc.getSunTimes(dNow.valueOf() + dayMs, this.latitude, this.longitude, this.height, false); // needed for a object copy
+                result = sunCalc.getSunTimes(dNow.valueOf() + hlp.TIME_24h, this.latitude, this.longitude, this.height, false); // needed for a object copy
             }
             const sortable2 = [];
             for (const key in result) {
@@ -734,13 +990,14 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         /**
         * gets moon time
         * @param {Date} dNow current time
-        * @param {string} value name of the moon time
+        * @param {String} value name of the moon time
         * @param {number} [offset] the offset (positive or negative) which should be added to the date. If no multiplier is given, the offset must be in milliseconds.
         * @param {number} [multiplier] additional multiplier for the offset. Should be a positive Number. Special value -1 if offset is in month and -2 if offset is in years
         * @param {ILimitationsObj} [limit] additional limitations for the calculation
         * @param {number} [latitude] optional latitude angle
         * @param {number} [longitude] optional longitude angle
         * @return {IMoonTime} result object of moon time
+        * @private
         */
         _getMoonTimeByName(dNow, value, offset, multiplier, limit, latitude, longitude) {
             const result = {};
@@ -808,7 +1065,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         /**
          * Formate a Date Object to a Date and Time String
          * @param {Date} dt Date to format to Date and Time string
-         * @returns {string} formated Date object
+         * @returns {String} formated Date object
+         * @public
          */
         toDateTimeString(dt) {
             return (dt && this.toDateString(dt) + ' ' + this.toTimeString(dt)).trim();
@@ -817,7 +1075,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         /**
          * Formate a Date Object to a Time String
          * @param {Date} dt Date to format to trime string
-         * @returns {string} formated Date object
+         * @returns {String} formated Date object
+         * @public
          */
         toTimeString(dt) {
             if (dt && !this.tzOffset && this.stateTimeFormat === '3') {
@@ -829,7 +1088,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         /**
          * Formate a Date Object to a Date String
          * @param {Date} dt Date to format to Date string
-         * @returns {string} formated Date object
+         * @returns {String} formated Date object
+         * @public
          */
         toDateString(dt) {
             if (dt && !this.tzOffset && this.stateDateFormat === '12') {
@@ -837,6 +1097,98 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
             return hlp.getFormattedDateOut(dt, this.stateDateFormat, (this.tzOffset === 0), this.tzOffset);
         }
+
+        /*******************************************************************************************************/
+        /**
+         * get list of custom angles
+         * @param {string} filter filter to the angle names
+         * @returns {Array.<{value: string, name: string, angle: number, [i:number]}>}
+         * @public
+         */
+        getCustomAngles(filter) {
+            const matches = [];
+            if (filter) {
+                filter = filter.toLowerCase();
+                this.customAngles.forEach(v => {
+                    const i = v.name.toLowerCase().indexOf(filter.toLowerCase());
+                    if (i > -1) {
+                        matches.push({
+                            value: v.name,
+                            label: v.name,
+                            angle: v.angle,
+                            i
+                        });
+                    }
+                });
+                matches.sort((a,b) => a.i-b.i);
+            } else {
+                this.customAngles.forEach(v => {
+                    matches.push({
+                        value: v.name,
+                        label: v.name,
+                        angle: v.angle
+                    });
+                });
+                matches.sort((a,b) => ((a.label > b.label) ? 1 : ((b.label > a.label) ? -1 : 0)));
+            }
+            return matches;
+        }
+
+        /**
+         * get list of all suntimes including custom ones
+         * @param {string} filter filter to the angle names
+         * @returns {Array.<{value: string, name: string, angle: number, [i:number]}>}
+         * @public
+         */
+        getSunTimesList(filter) {
+            const matches = [];
+            if (filter) {
+                filter = filter.toLowerCase();
+                sunCalc.times.forEach(v => {
+                    const r = v.riseName.toLowerCase().indexOf(filter.toLowerCase());
+                    if (r > -1) {
+                        matches.push({
+                            value: v.riseName,
+                            label: v.riseName,
+                            angle: v.angle,
+                            pos: v.risePos,
+                            type: 'rise',
+                            i: r
+                        });
+                    }
+                    const s = v.setName.toLowerCase().indexOf(filter.toLowerCase());
+                    if (s > -1) {
+                        matches.push({
+                            value: v.setName,
+                            label: v.setName,
+                            angle: v.angle,
+                            pos: v.setPos,
+                            type: 'set',
+                            i: s
+                        });
+                    }
+                });
+                matches.sort((a,b) => a.i-b.i);
+            } else {
+                sunCalc.times.forEach(v => {
+                    matches.push({
+                        value: v.riseName,
+                        label: v.riseName,
+                        angle: v.angle,
+                        pos: v.risePos
+                    });
+                    matches.push({
+                        value: v.setName,
+                        label: v.setName,
+                        angle: v.angle,
+                        pos: v.setPos,
+                        type: 'set'
+                    });
+                });
+                matches.sort((a,b) => ((a.label > b.label) ? 1 : ((b.label > a.label) ? -1 : 0)));
+            }
+            return matches;
+        }
         /*******************************************************************************************************/
         /**
          * @typedef {Object} ICacheData
@@ -848,7 +1200,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * get the random number cache for a node
          * @param {runtimeNode} _srcNode - source node information
          * @param {Date} dNow base Date to use for Date time functions
-         * @param {string} store used context store
+         * @param {String} store used context store
          * @returns {ICacheData} random number cache
         */
         _getNodeNumberCache(_srcNode, dNow, store) {
@@ -873,6 +1225,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {number} limit2 - upper limit for random number
          * @param {Date} [dNow] base Date to use for Date time functions
          * @returns {number} random number
+         * @private
         */
         _getCachedRandomDayNumber(_srcNode, limit1, limit2, dNow) {
             // _srcNode.debug(`_getCachedRandomDayNumber limit1=${String(limit1)} limit2=${String(limit2)} dNow=${dNow}`);
@@ -899,6 +1252,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {number} limit2 - upper limit for random number
          * @param {Date} [dNow] base Date to use for Date time functions
          * @returns {number} random number
+         * @private
         */
         _getCachedRandomWeekNumber(_srcNode, limit1, limit2, dNow) {
             // _srcNode.debug(`getCachedRandomWeekNumber limit1=${limit1} limit2=${limit2} dNow=${dNow}`);
@@ -918,47 +1272,60 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
             return cache.week[name];
         }
+
         /**
          * get a float value from a type input in Node-Red
          * @param {runtimeNode} _srcNode - source node information
          * @param {Object} msg - message object
-         * @param {string} type - type name of the type input
-         * @param {*} value - value of the type input
-         * @param {number} [def] - default value if can not get float value
-         * @param {IValuePropertyTypeCallback} [callback] - callback function for getting getPropValue
-         * @param {boolean} [noError] - true if no error should be given in GUI
+         * @param {ITimePropertyType} offsetData - input data object
          * @param {Date} [dNow] base Date to use for Date time functions
          * @returns {number} float property
+         * @public
          */
-        getFloatProp(_srcNode, msg, type, value, def, callback, noError, dNow) {
-            // _srcNode.debug(`getFloatProp type=${type} value=${value} def=${def} callback=${callback} noError=${noError}`);
-            let data; // 'msg', 'flow', 'global', 'num', 'bin', 'env', 'jsonata'
-            if (type === 'num') {
-                data = Number(value); // extra conversation to handle empty string as 0
-            } else if (type === 'numAzimuth' || type === 'numAltitude') {
-                data = hlp.angleNorm(Number(value));
-            } else if (type === 'numAzimuthRad' || type === 'numAltitudeRad') {
-                data = hlp.angleNormRad(Number(value));
-            } else if (type === '' || (typeof type === 'undefined') || type === null) {
-                if (isNaN(value)) {
-                    return def || NaN;
+        _getOffsetVal(_srcNode, msg, offsetData, dNow) {
+            return this.getFloatProp(
+                _srcNode,
+                msg,
+                {
+                    type: offsetData.offsetType,
+                    value: offsetData.offset,
+                    def: 0,
+                    callback: offsetData.offsetCallback,
+                    noError: offsetData.noOffsetError,
+                    now: dNow || offsetData.now
+                });
+        }
+        /**
+         * get a float value from a type input in Node-Red
+         * @param {runtimeNode} _srcNode - source node information
+         * @param {Object} msg - message object
+         * @param {IGetFloatPropData} data - input data object
+         * @returns {number} float property
+         * @public
+         */
+        getFloatProp(_srcNode, msg, data) {
+            // _srcNode.debug(`getFloatProp type=${data.type} value=${data.value} def=${data.def} noError=${data.noError}`);
+            let result; // 'msg', 'flow', 'global', 'num', 'bin', 'env', 'jsonata'
+            if (data.type === '' || (typeof data.type === 'undefined') || data.type === null) {
+                if (isNaN(data.value)) {
+                    return data.def || NaN;
                 }
-                data = value;
-            } else if (type === 'none') {
-                return def || NaN;
+                result = data.value;
+            } else if (data.type === 'none') {
+                return data.def || NaN;
             } else {
-                data = this.getPropValue(_srcNode, msg, { type, value, callback }, noError, dNow);
+                result = this.getPropValue(_srcNode, msg, data);
             }
-            if (data === null || typeof data === 'undefined') {
-                if (noError) { return NaN; }
-                throw new Error(RED._('errors.notEvaluableProperty', {type, value}));
+            if (result === null || typeof result === 'undefined') {
+                if (data.noError) { return data.def || NaN; }
+                throw new Error(RED._('errors.notEvaluableProperty', data));
             }
-            data = parseFloat(data);
-            if (isNaN(data)) {
-                if (noError) { return NaN; }
-                throw new Error('the value of ' + type + '.' + value + ' is not a valid Number!');
+            result = parseFloat(result);
+            if (isNaN(result)) {
+                if (data.noError) { return data.def || NaN; }
+                throw new Error('the value of ' + data.type + '.' + data.value + ' is not a valid Number!');
             }
-            return data;
+            return result;
         }
         /*******************************************************************************************************/
         /**
@@ -967,10 +1334,20 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
           * @param {Object} msg - the message object
           * @param {Date} dateValue - the source date object which should be formated
           * @param {ITimePropertyType} data - additional formating and control data
-          * @param {Date} [dNow] base Date to use for Date time functions
+          * @public
           */
-        formatOutDate(_srcNode, msg, dateValue, data, dNow) {
-            const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+        formatOutDate(_srcNode, msg, dateValue, data) {
+            const offsetX = this.getFloatProp(
+                _srcNode,
+                msg,
+                {
+                    type: data.offsetType,
+                    value: data.offset,
+                    def: 0,
+                    callback: data.offsetCallback,
+                    noError: data.noOffsetError,
+                    now:data.now
+                });
             const result = hlp.normalizeDate(dateValue, offsetX, data.multiplier, data);
             return hlp.getFormattedDateOut(result, data.format, (this.tzOffset === 0), this.tzOffset);
         }
@@ -981,8 +1358,9 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {Object} msg - the message object
          * @param {ITimePropertyType} data - a Data object
          * @param {Date} [dNow] base Date to use for Date time functions
-         * @param {boolean} [noError] - true if no error shoudl be given in GUI
+         * @param {Boolean} [noError] - true if no error shoudl be given in GUI
          * @returns {*} output Data
+         * @public
          */
         getOutDataProp(_srcNode, msg, data, dNow, noError) {
             // _srcNode.debug(`getOutDataProp IN data=${util.inspect(data, { colors: true, compact: 10, breakLength: Infinity }) } tzOffset=${this.tzOffset} dNow=${dNow}`);
@@ -998,12 +1376,12 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 return Date.now();
             } else if (data.type === 'dateSpecific') {
                 return this.formatOutDate(_srcNode, msg, dNow, data);
-            } else if ((data.type === 'pdsTime') || (data.type === 'pdmTime')) {
-                if (data.type === 'pdsTime') { // sun
-                    const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+            } else if ((data.type === 'pdsTime') || (data.type === 'pdsTimeCustom') || (data.type === 'pdmTime')) {
+                if ((data.type === 'pdsTime')  || (data.type === 'pdsTimeCustom')) { // sun
+                    const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                     result = this._getSunTimeByName(dNow, data.value, offsetX, data.multiplier, data, data.latitude, data.longitude, data.height);
                 } else if (data.type === 'pdmTime') { // moon
-                    const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                    const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                     result = this._getMoonTimeByName(dNow, data.value, offsetX, data.multiplier, data, data.latitude, data.longitude);
                     _srcNode.debug(`_getMoonTimeByName data=${util.inspect(result, { colors: true, compact: 10, breakLength: Infinity }) }`);
                 }
@@ -1013,7 +1391,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 return null;
             } else if (data.type === 'pdsTimeNow') {
                 result = Object.assign({}, this._getSunTimePrevNext(dNow));
-                const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                 result.last.value = hlp.normalizeDate(result.last.value, offsetX, data.multiplier, data);
                 result.next.value = hlp.normalizeDate(result.next.value, offsetX, data.multiplier, data);
                 if (this.tzOffset) {
@@ -1034,7 +1412,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 return null;
             }
             // _srcNode.debug(`getOutDataProp OUT data=${util.inspect(data, { colors: true, compact: 10, breakLength: Infinity })} tzOffset=${this.tzOffset} result=${util.inspect(result, { colors: true, compact: 10, breakLength: Infinity })}`);
-            return this.getPropValue(_srcNode, msg, { type: data.type, value: data.value }, noError, dNow);
+            return this.getPropValue(_srcNode, msg, { type: data.type, value: data.value, noError, now:dNow });
         }
         /*******************************************************************************************************/
         /**
@@ -1044,6 +1422,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {*} type type of the property to set
          * @param {*} value value of the property to set
          * @param {*} msgPropertyData Data object to set to the property
+         * @public
          */
         setMessageProp(_srcNode, msg, type, value, msgPropertyData) {
             // _srcNode.debug(`setMessageProp type=${type} value=${value} msg=${util.inspect(msg, { colors: true, compact: 10, breakLength: Infinity })} data=${util.inspect(data, { colors: true, compact: 10, breakLength: Infinity })}`);
@@ -1072,18 +1451,17 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {runtimeNode} _srcNode - source node for logging
          * @param {Object} msg - the message object
          * @param {ITimePropertyType} data - a Data object
-         * @param {Date} [dNow] base Date to use for Date time functions
          * @returns {ITimePropertyResult} value of the type input
+         * @public
          */
-        getTimeProp(_srcNode, msg, data, dNow) {
+        getTimeProp(_srcNode, msg, data) {
             // _srcNode.debug(`getTimeProp data=${util.inspect(data, { colors: true, compact: 10, breakLength: Infinity })} tzOffset=${this.tzOffset}`);
             const result = {
                 value: null,
                 error: null,
                 fix: true
             };
-            dNow = dNow || ((hlp.isValidDate(data.now)) ? new Date(data.now) : new Date());
-            if (!hlp.isValidDate(dNow)) { dNow = new Date(); _srcNode.debug('getTimeProp: Date parameter not given or date Parameter ' + data.now + ' is invalid!!');}
+            const dNow = ((hlp.isValidDate(data.now)) ? new Date(data.now) : new Date());
             try {
                 if (data.type === '' || data.type === 'none' || data.type === null || typeof data.type === 'undefined') {
                     result.error = 'internal error - time-type is not defined (type="' + String(data.type) + '" value="' + String(data.value) + '")';
@@ -1096,7 +1474,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     }
                     result.fix = true;
                 } else if (data.type === 'dateSpecific') {
-                    const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                    const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                     result.value = hlp.normalizeDate(dNow, offsetX, data.multiplier, data);
                     if (this.tzOffset) {
                         result.value = hlp.convertDateTimeZone(result.value, this.tzOffset);
@@ -1104,7 +1482,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     result.fix = true;
                 } else if (data.type === 'dayOfMonth') {
                     result.value = hlp.getSpecialDayOfMonth(dNow.getFullYear(), dNow.getMonth(), data.value);
-                    const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                    const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                     result.value = hlp.normalizeDate(result.value, offsetX, data.multiplier, data);
                     if (this.tzOffset) {
                         result.value = hlp.convertDateTimeZone(result.value, this.tzOffset);
@@ -1112,20 +1490,20 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 } else if (data.type === 'entered') {
                     result.value = hlp.getTimeOfText(String(data.value), dNow, (this.tzOffset === 0), this.tzOffset);
                     if (result.value !== null && typeof result.value !== 'undefined') {
-                        const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                        const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                         result.value = hlp.normalizeDate(result.value, offsetX, data.multiplier, data);
                     }
                     result.fix = true;
                 } else if (data.type === 'dateEntered') {
                     result.value =  hlp.getDateOfText(String(data.value), true, (this.tzOffset === 0), this.tzOffset);
                     if (result.value !== null && typeof result.value !== 'undefined') {
-                        const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                        const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                         result.value = hlp.normalizeDate(result.value, offsetX, data.multiplier, data);
                     }
                     result.fix = true;
-                } else if (data.type === 'pdsTime') {
+                } else if ((data.type === 'pdsTime')  || (data.type === 'pdsTimeCustom')) {
                     // sun
-                    const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                    const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                     Object.assign(result, this._getSunTimeByName(dNow, data.value, offsetX, data.multiplier, data, data.latitude, data.longitude, data.height));
                     if (this.tzOffset) {
                         result.value = hlp.convertDateTimeZone(result.value, this.tzOffset);
@@ -1133,7 +1511,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     result.fix = true;
                 } else if (data.type === 'pdmTime') {
                     // moon
-                    const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                    const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                     Object.assign(result, this._getMoonTimeByName(dNow, data.value, offsetX, data.multiplier, data, data.latitude, data.longitude));
                     if (this.tzOffset) {
                         result.value = hlp.convertDateTimeZone(result.value, this.tzOffset);
@@ -1142,11 +1520,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 } else if (data.type === 'pdsTimeNow') {
                     Object.assign(result, this._getSunTimePrevNext(dNow).next);
                     result.fix = true;
-                    const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                    const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                     result.value = hlp.addOffset(new Date(result.value), offsetX, data.multiplier);
-                } else if (data.type === 'pdsTimeByAzimuth' ||
-                           data.type === 'pdsTimeByAzimuthRad') {
-                    result.value = this.getPropValue(_srcNode, msg, data, true, dNow);
                 } else if (data.type === 'str') {
                     result.fix = true;
                     if (data.format) {
@@ -1154,7 +1529,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     } else {
                         result.value = hlp.getDateOfText(data.value, true, (this.tzOffset === 0), this.tzOffset);
                     }
-                    const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                    const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                     result.value = hlp.normalizeDate(result.value, offsetX, data.multiplier, data);
                     if (this.tzOffset) {
                         result.value = hlp.convertDateTimeZone(result.value, this.tzOffset);
@@ -1169,7 +1544,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                         } else {
                             result.value = hlp.getDateOfText(res, true, (this.tzOffset === 0), this.tzOffset);
                         }
-                        const offsetX = this.getFloatProp(_srcNode, msg, data.offsetType, data.offset, 0, data.offsetCallback, data.noOffsetError, dNow);
+                        const offsetX = this._getOffsetVal(_srcNode, msg, data, dNow);
                         result.value = hlp.normalizeDate(result.value, offsetX, data.multiplier, data);
                         if (this.tzOffset) {
                             result.value = hlp.convertDateTimeZone(result.value, this.tzOffset);
@@ -1200,8 +1575,9 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         /**
         * get a prepared JSONATA Expression
         * @param {runtimeNode} _srcNode - source node information
-        * @param {string} value - get an expression for a value
+        * @param {String} value - get an expression for a value
         * @returns {function} JSONataExpression
+        * @public
         */
         getJSONataExpression(_srcNode, value) {
             // _srcNode.debug(`getJSONataExpression - data= ${util.inspect(data, { colors: true, compact: 10, breakLength: Infinity })}`);
@@ -1315,7 +1691,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                         dNow = new Date();
                     }
                 }
-                return this._getSunTimeByElevation(dNow, parseFloat(elevation), true, {
+                return this._getSunTimeByElevation(dNow, parseFloat(elevation), {
                     type: 'str',
                     value: ''
                 });
@@ -1354,26 +1730,43 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {runtimeNode} _srcNode - source node information
          * @param {Object} msg - message object
          * @param {IValuePropertyType} data - data object with more information
-         * @param {boolean} [noError] - true if no error shoudl be given in GUI
+         * @param {Boolean} [noError] - true if no error shoudl be given in GUI
          * @param {Date} [dNow] base Date to use for Date time functions
          * @returns {*} value of the type input, return of the callback function if defined or __null__ if value could not resolved
+         * @public
         */
         getPropValue(_srcNode, msg, data, noError, dNow) {
-            // _srcNode.debug(`getPropValue ${data.type}.${data.value} (${data.addID}) - data= ${util.inspect(data, { colors: true, compact: 10, breakLength: Infinity })}`);
+            // _srcNode.debug(`getPropValue ${data.type}.${data.value} - data= ${util.inspect(data, { colors: true, compact: 10, breakLength: Infinity })}`);
+            noError = noError || data.noError;
+            dNow = dNow || data.now;
             let result = null;
+            let /** @type {boolean} */ cachable = false;
             if (typeof data.type === 'undefined' || data.type === null || data.type === '') {
                 result = null;
             } else if (data.type === 'none') {
                 if (typeof data.callback === 'function') {
-                    return data.callback(undefined, data);
+                    return data.callback(undefined, data, false);
                 }
                 return undefined;
             } else if (data.type === 'num') {
-                result = Number(data.value);
+                result = Number(data.value); // extra conversation to handle empty string as 0
             } else if (data.type === 'numAzimuth' || data.type === 'numAltitude') {
-                result = hlp.angleNorm(Number(data.value));
-            } else if (data.type === 'numAzimuthRad' || data.type === 'numAltitudeRad') {
-                result = hlp.angleNormRad(Number(data.value));
+                if (this.angleType === 'rad') {
+                    result = hlp.angleNormRad(Number(data.value));
+                } else {
+                    result = hlp.angleNorm(Number(data.value));
+                }
+            } else if (data.type === 'numAnglePreDef') {
+                const val = this.customAngles.find( el => el.name === data.value);
+                if (typeof val === 'undefined') {
+                    if (noError) { return NaN; }
+                    throw new Error(RED._('errors.notEvaluableCustomAngle', data));
+                }
+                if (this.angleType === 'rad') {
+                    result = hlp.angleNormRad(Number(val.angle));
+                } else {
+                    result = hlp.angleNorm(Number(val.angle));
+                }
             } else if (data.type === 'str') {
                 result = ''+data.value;
             } else if (data.type === 'strPlaceholder') {
@@ -1384,20 +1777,26 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     topic: ((!msg) ? '' : msg.topic)
                 };
                 result = hlp.textReplace(''+data.value, replaceAttrs, RED, msg);
+                cachable = true;
             } else if (data.type === 'bool') {
                 result = /^true$/i.test(data.value);
             } else if (data.type === 'date') {
                 result = Date.now();
             } else if (data.type === 'msgPayload') {
                 result = msg.payload;
+                cachable = true;
             } else if (data.type === 'msgTopic') {
                 result = msg.topic;
+                cachable = true;
             } else if (data.type === 'msgValue') {
                 result = msg.value;
+                cachable = true;
             } else if (data.type === 'msgTs') {
                 result =  msg.ts;
+                cachable = true;
             } else if (data.type === 'msgLc') {
                 result = msg.lc;
+                cachable = true;
             } else if (data.type === 'numPct') {
                 return parseFloat(data.value) / 100;
             } else if (data.type === 'nodeId') {
@@ -1429,6 +1828,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             } else if (data.type === 'PlT') {
                 if (msg.topic && data.value && msg.topic.includes(data.value)) {
                     result = msg.payload;
+                    cachable = true;
                 } else {
                     result = undefined;
                 }
@@ -1437,41 +1837,31 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             } else if (data.type === 'pdsCalcPercent') {
                 result = this._getSunInSky(dNow);
             } else if (data.type === 'pdsCalcAzimuth') {
-                result = this.getSunCalc(dNow, false, false).azimuthDegrees;
+                if (this.angleType === 'deg') {
+                    result = this.getSunCalc(dNow, false, false).azimuthDegrees;
+                } else {
+                    result = this.getSunCalc(dNow, false, false).azimuthRadians;
+                }
             } else if (data.type === 'pdsCalcElevation') {
-                result = this.getSunCalc(dNow, false, false).altitudeDegrees;
-            } else if (data.type === 'pdsCalcAzimuthRad') {
-                result = this.getSunCalc(dNow, false, false).azimuthRadians;
-            } else if (data.type === 'pdsCalcElevationRad') {
-                result = this.getSunCalc(dNow, false, false).altitudeRadians;
+                if (this.angleType === 'deg') {
+                    result = this.getSunCalc(dNow, false, false).altitudeDegrees;
+                } else {
+                    result = this.getSunCalc(dNow, false, false).altitudeRadians;
+                }
             } else if (data.type === 'pdsTimeByElevation') { // gives an object back
-                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), true, data);
-            } else if (data.type === 'pdsTimeByElevationRad') { // gives an object back
-                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), false, data);
+                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), data);
             } else if (data.type === 'pdsTimeByAzimuth') {
-                result = this._getSunTimeByAzimuth(dNow, parseFloat(data.value), true, data);
-            } else if (data.type === 'pdsTimeByAzimuthRad') {
-                result = this._getSunTimeByAzimuth(dNow, parseFloat(data.value), false, data);
+                result = this._getSunTimeByAzimuth(dNow, parseFloat(data.value), data);
             } else if (data.type === 'pdsTimeByElevationNext') {
-                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), true, data);
-                if (result.set.value.getTime() < result.rise.value.getTime()) {
-                    return result.set;
-                }
-                return result.rise;
-            } else if (data.type === 'pdsTimeByElevationNextRad') {
-                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), false, data);
+                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), data);
                 if (result.set.value.getTime() < result.rise.value.getTime()) {
                     return result.set;
                 }
                 return result.rise;
             } else if (data.type === 'pdsTimeByElevationRise') {
-                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), true, data, 'rise').rise;
-            } else if (data.type === 'pdsTimeByElevationRiseRad') {
-                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), false, data, 'rise').rise;
+                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), data, 'rise').rise;
             } else if (data.type === 'pdsTimeByElevationSet') {
-                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), true, data, 'set').set;
-            } else if (data.type === 'pdsTimeByElevationSetRad') {
-                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), false, data, 'set').set;
+                result = this._getSunTimeByElevation(dNow, parseFloat(data.value), data, 'set').set;
             } else if (data.type === 'pdmCalcData') {
                 result = this.getMoonCalc(dNow, true, false);
             } else if (data.type === 'pdmPhase') {
@@ -1496,20 +1886,23 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     if (!data.expr) {
                         data.expr = this.getJSONataExpression(_srcNode, data.value);
                     }
+                    cachable = true;
                     result = RED.util.evaluateJSONataExpression(data.expr, msg);
                 } catch (err) {
                     _srcNode.debug(util.inspect(err));
                 }
             } else {
                 try {
+                    cachable = true;
+                    _srcNode.debug('getPropValue evaluateNodeProperty data=' + util.inspect(data, { colors: true, compact: 10, breakLength: Infinity }));
                     result = RED.util.evaluateNodeProperty(data.value, data.type, _srcNode, msg);
                 } catch (err) {
                     _srcNode.log(util.inspect(err));
                 }
             }
             if (typeof data.callback === 'function') {
-                // _srcNode.debug('getPropValue result=' + util.inspect(result, { colors: true, compact: 10, breakLength: Infinity }) + ' - ' + typeof result);
-                return data.callback(result, data);
+                // _srcNode.debug('getPropValue callback result=' + util.inspect(result, { colors: true, compact: 10, breakLength: Infinity }) + ' - ' + typeof result);
+                return data.callback(result, data, cachable);
             } else if (result === null || typeof result === 'undefined') {
                 if (noError !== true) {
                     _srcNode.error(RED._('errors.notEvaluableProperty', data));
@@ -1525,21 +1918,19 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @param {runtimeNode} _srcNode - source node information
          * @param {Object} msg - message object
          * @property {IValuePropertyType} operandA - first operand
-         * @property {string} compare - compare between the both operands
+         * @property {String} compare - compare between the both operands
          * @property {IValuePropertyType} operandB - second operand
-         * @param {boolean} [noError] - true if no error shoudl be given in GUI
-         * @param {Date} [dNow] base Date to use for Date time functions
          * @returns {*} value of the type input, return of the callback function if defined or __null__ if value could not resolved
+         * @public
         */
-        comparePropValue(_srcNode, msg, operandA, compare, operandB, noError, dNow) {
+        comparePropValue(_srcNode, msg, operandA, compare, operandB) {
             // _srcNode.debug(`getComparablePropValue operandA='${util.inspect(operandA, { colors: true, compact: 10, breakLength: Infinity })}' operandB='${util.inspect(operandB, { colors: true, compact: 10, breakLength: Infinity })}' compare='${util.inspect(compare, { colors: true, compact: 10, breakLength: Infinity })}'`);
             if (operandA.type === 'none' || operandA.type === '' || typeof operandA.type === 'undefined' || operandA.type === null) {
                 return false;
             } else if (operandA.type === 'jsonata' || operandA.type === 'pdmPhaseCheck') {
                 compare = 'true';
             }
-
-            const a = this.getPropValue(_srcNode, msg, operandA, noError, dNow);
+            const a = this.getPropValue(_srcNode, msg, operandA);
             switch (compare) {
                 case 'true':
                     return (a === true);
@@ -1572,32 +1963,32 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 case 'nfalse_expr':
                     return !hlp.isFalse(a);
                 case 'equal':
-                    return (a == this.getPropValue(_srcNode, msg, operandB, noError, dNow));  // eslint-disable-line eqeqeq
+                    return (a == this.getPropValue(_srcNode, msg, operandB));  // eslint-disable-line eqeqeq
                 case 'nequal':
-                    return (a != this.getPropValue(_srcNode, msg, operandB, noError, dNow));  // eslint-disable-line eqeqeq
+                    return (a != this.getPropValue(_srcNode, msg, operandB));  // eslint-disable-line eqeqeq
                 case 'lt':
-                    return (a < this.getPropValue(_srcNode, msg, operandB, noError, dNow));
+                    return (a < this.getPropValue(_srcNode, msg, operandB));
                 case 'lte':
-                    return (a <= this.getPropValue(_srcNode, msg, operandB, noError, dNow));
+                    return (a <= this.getPropValue(_srcNode, msg, operandB));
                 case 'gt':
-                    return (a > this.getPropValue(_srcNode, msg, operandB, noError, dNow));
+                    return (a > this.getPropValue(_srcNode, msg, operandB));
                 case 'gte':
-                    return (a >= this.getPropValue(_srcNode, msg, operandB, noError, dNow));
+                    return (a >= this.getPropValue(_srcNode, msg, operandB));
                 case 'contain': {
-                    let val = this.getPropValue(_srcNode, msg, operandB, noError, dNow);
+                    let val = this.getPropValue(_srcNode, msg, operandB);
                     if (!val) { return false; }
                     val = (val + '').trim();
                     return ((a + '').includes(val));
                 }
                 case 'containSome': {
-                    let vals = this.getPropValue(_srcNode, msg, operandB, noError, dNow);
+                    let vals = this.getPropValue(_srcNode, msg, operandB);
                     if (!vals) { return false; }
                     vals = (vals + '').trim().split(/\s*[,;|]\s*/).filter(x => x);
                     const txt = (a + '');
                     return vals.some(v => txt.includes(v));
                 }
                 case 'containEvery': {
-                    let vals = this.getPropValue(_srcNode, msg, operandB, noError, dNow);
+                    let vals = this.getPropValue(_srcNode, msg, operandB);
                     if (!vals) { return false; }
                     vals = (vals + '').trim().split(/\s*[,;|]\s*/).filter(x => x);
                     const txt = (a + '');
@@ -1611,6 +2002,17 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
         }
         /**************************************************************************************************************/
+        /**
+         * calculates the sun position and times
+         * @param {Date} [date] - defines the date to calculates sun data for (can be a number too)
+         * @param {Boolean} [calcTimes] - defines if times should be calculated
+         * @param {Boolean} [sunInSky] - is sun in sky should determinated
+         * @param {Number} [specLatitude] - optionaly special latitude
+         * @param {Number} [specLongitude] - optionaly special longitude
+         * @param {Number} [specHeight] - optionaly observer height
+         * @returns {ISunDataResult}
+         * @public
+         */
         getSunCalc(date, calcTimes, sunInSky, specLatitude, specLongitude, specHeight) {
             // this.debug(`getSunCalc for date="${date}" calcTimes="${calcTimes}" sunInSky="${sunInSky}"`);
             if (!hlp.isValidDate(date)) {
@@ -1626,6 +2028,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             if (cacheEnabled && (Math.abs(date.getTime() - this.cache.lastSunCalc.ts) < 3000)) {
                 // @ts-ignore
                 this.log('getSunCalc, time difference since last output to low, do no calculation');
+                // @ts-ignore
                 return this.cache.lastSunCalc;
             }
             specLatitude = specLatitude || this.latitude;
@@ -1633,7 +2036,25 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             specHeight = specHeight || this.height;
 
             const sunPos = sunCalc.getPosition(date.valueOf(), specLatitude, specLongitude);
-            const result = {
+            this._fixAngles(sunPos);
+
+            /** @type {ISunDataResult} */
+            const result = Object.assign({},sunPos, {
+                ts: date.getTime(),
+                lastUpdate:     date,
+                lastUpdateStr:  date.getFullYear() + '-' // return custom format
+                                + hlp.pad2(date.getMonth() + 1) + '-'
+                                + hlp.pad2(date.getDate()) + 'T'
+                                + hlp.pad2(date.getHours()) + ':'
+                                + hlp.pad2(date.getMinutes()) + ':'
+                                + hlp.pad2(date.getSeconds()),
+                latitude:       specLatitude,
+                longitude:      specLongitude,
+                height:         specHeight,
+                angleType:      this.angleType
+            });
+
+            /* {
                 ts: date.getTime(),
                 lastUpdate:     date,
                 lastUpdateStr:  date.getFullYear() + '-' // return custom format
@@ -1644,14 +2065,16 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                                 + hlp.pad2(date.getSeconds()),
                 latitude:       specLatitude,
                 longitude:      specLongitude,
+                height:         specHeight,
                 angleType:      this.angleType,
                 azimuth:        (this.angleType === 'deg') ? sunPos.azimuthDegrees : sunPos.azimuth,
                 altitude:       (this.angleType === 'deg') ? sunPos.altitudeDegrees : sunPos.altitude, // elevation = altitude
                 altitudeDegrees:    sunPos.altitudeDegrees,
                 azimuthDegrees:     sunPos.azimuthDegrees,
                 altitudeRadians:    sunPos.altitude,
-                azimuthRadians:     sunPos.azimuth
-            };
+                azimuthRadians:     sunPos.azimuth,
+                times:              undefined
+            }; */
 
             if (!calcTimes) { return result; }
 
@@ -1673,6 +2096,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
             if (!result.positionAtSolarNoon && sunInSky && result.times.solarNoon.valid) {
                 result.positionAtSolarNoon = sunCalc.getPosition(result.times.solarNoon.value.valueOf(), specLatitude, specLongitude);
+                this._fixAngles(result.positionAtSolarNoon);
             }
 
             if (result.positionAtSolarNoon && result.times.solarNoon.valid) {
@@ -1692,11 +2116,23 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         }
 
         /**************************************************************************************************************/
+        /**
+         * calculates if the sun is in the sky
+         * @param {Date} [date] - defines the date to calculates sun data for (can be a number too)
+         * @returns {Number}
+         * @private
+         */
         _getSunInSky(date) {
             const result = this.getSunCalc(date, true, true);
             return result.altitudePercent;
         }
         /**************************************************************************************************************/
+        /**
+         * calculates if the sun is in the sky
+         * @param {Date} [date] - defines the date to calculates sun data for (can be a number too)
+         * @returns {IMoonIllumination}
+         * @private
+         */
         _getMoonIllumination(date) {
             if (!hlp.isValidDate(date)) {
                 const dto = new Date(date);
@@ -1719,12 +2155,24 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             // angle: (this.angleType === 'deg') ? 180 / Math.PI * moonIllum.angle : moonIllum.angle,
 
             if (dayIdNow !== this.moonIlluDayId && dayIdNow === dayIdReq) {
+                /** @type {IMoonIllumination} */
                 this.moonIlluminationToday = Object.assign({}, result);
+                /** @type {number} */
                 this.moonIlluDayId = dayIdNow;
             }
             return result;
         }
 
+        /**
+         * calculates the moon position
+         * @param {Date} [date] - defines the date to calculates sun data for (can be a number too)
+         * @param {Boolean} [calcTimes] - defines if times should be calculated
+         * @param {Boolean} [moonInSky] - is moon in sky should determinated
+         * @param {Number} [specLatitude] - optionaly special latitude
+         * @param {Number} [specLongitude] - optionaly special longitude
+         * @returns {IMoonDataResult}
+         * @public
+         */
         getMoonCalc(date, calcTimes, moonInSky, specLatitude, specLongitude) {
             if (!hlp.isValidDate(date)) {
                 const dto = new Date(date);
@@ -1745,7 +2193,23 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             specLongitude = specLongitude || this.longitude;
 
             const moonData = sunCalc.getMoonData(date.valueOf(), specLatitude, specLongitude);
+            this._fixAngles(moonData);
 
+            /** @type {IMoonDataResult} */
+            const result = Object.assign({},moonData , {
+                ts: date.getTime(),
+                lastUpdate:     date,
+                lastUpdateStr:  date.getFullYear() + '-'
+                                + hlp.pad2(date.getMonth() + 1) + '-'
+                                + hlp.pad2(date.getDate()) + 'T'
+                                + hlp.pad2(date.getHours()) + ':'
+                                + hlp.pad2(date.getMinutes()) + ':'
+                                + hlp.pad2(date.getSeconds()),
+                latitude:       specLatitude,
+                longitude:      specLongitude,
+                angleType:      this.angleType
+            });
+            /*
             const result = {
                 ts: date.getTime(),
                 lastUpdate:     date,
@@ -1767,8 +2231,9 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 distance:           moonData.distance,
                 parallacticAngle:   (this.angleType === 'deg') ? moonData.parallacticAngleDegrees : moonData.parallacticAngle,
                 illumination:       moonData.illumination,
-                zenithAngle:        (this.angleType === 'deg') ? 180 / Math.PI * moonData.zenithAngle : moonData.zenithAngle
-            };
+                zenithAngle:        (this.angleType === 'deg') ? hlp.toDec(moonData.zenithAngle) : moonData.zenithAngle,
+                times: undefined
+            }; */
 
             if (!calcTimes) { return result; }
 
@@ -1795,15 +2260,18 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             if (moonInSky) {
                 if (!result.positionAtRise && result.times.rise) {
                     result.positionAtRise = sunCalc.getMoonPosition(result.times.rise.valueOf(), specLatitude, specLongitude);
+                    this._fixAngles(result.positionAtRise);
                 }
 
                 if (!result.positionAtSet && result.times.set) {
                     result.positionAtSet = sunCalc.getMoonPosition(result.times.set.valueOf(), specLatitude, specLongitude);
+                    this._fixAngles(result.positionAtSet);
                 }
             }
 
             if (result.times.highest) {
                 result.highestPosition = sunCalc.getMoonPosition(result.times.highest.valueOf(), specLatitude, specLongitude);
+                this._fixAngles(result.highestPosition);
                 result.altitudePercent = (result.altitudeDegrees / result.highestPosition.altitudeDegrees) * 100;
             }
 
@@ -1825,6 +2293,32 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             return result;
         }
         /**************************************************************************************************************/
+        /**
+         * fixes angle object
+         * @param {{altitude:number, azimuth:number, azimuthDegrees:number, altitudeDegrees:number, zenith?:number, zenithDegrees?:number, parallacticAngle?:number, parallacticAngleDegrees?:number, azimuthRadians?:number, altitudeRadians?:number, zenithRadians?:number, parallacticAngleRadians?:number }} angleObj  angle object to fix
+         * @return {any}
+         * @private
+         */
+        _fixAngles(angleObj) {
+            angleObj.azimuthRadians = angleObj.altitude;
+            angleObj.altitudeRadians = angleObj.azimuth;
+            angleObj.azimuth = (this.angleType === 'deg') ? angleObj.azimuthDegrees : angleObj.azimuth;
+            angleObj.altitude = (this.angleType === 'deg') ? angleObj.altitudeDegrees : angleObj.altitude;
+            if (Object.prototype.hasOwnProperty.call(angleObj, 'zenith') && Object.prototype.hasOwnProperty.call(angleObj, 'zenithDegrees')) {
+                angleObj.zenithRadians = angleObj.zenith;
+                angleObj.zenith = (this.angleType === 'deg') ? angleObj.zenithDegrees : angleObj.zenith;
+            }
+            if (Object.prototype.hasOwnProperty.call(angleObj, 'parallacticAngle') && Object.prototype.hasOwnProperty.call(angleObj, 'parallacticAngleDegrees')) {
+                angleObj.parallacticAngleRadians = angleObj.parallacticAngle;
+                angleObj.parallacticAngle = (this.angleType === 'deg') ? angleObj.parallacticAngleDegrees : angleObj.parallacticAngle;
+            }
+        }
+        /**
+         * refreshes cached sun times
+         * @param {Number} todayValue - timestamp of today
+         * @param {Number} dayId - number of current day
+         * @private
+         */
         _sunTimesRefresh(todayValue, dayId) {
             if (!this.valid) { return; }
             if (this.cache.sunTimesToday.dayId === (dayId + 1)) {
@@ -1834,16 +2328,24 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             } else {
                 this.cache.sunTimesToday.times = sunCalc.getSunTimes(todayValue, this.latitude, this.longitude, this.height, true);
                 this.cache.sunTimesToday.sunPosAtSolarNoon = sunCalc.getPosition(this.cache.sunTimesToday.times.solarNoon.value.valueOf(), this.latitude, this.longitude);
+                this._fixAngles(this.cache.sunTimesToday.sunPosAtSolarNoon);
                 this.cache.sunTimesToday.dayId = dayId;
             }
+            // @ts-ignore
             this.cache.sunTimesTomorrow = {};
-            this.cache.sunTimesTomorrow.times = sunCalc.getSunTimes(todayValue + dayMs, this.latitude, this.longitude, this.height, true);
+            this.cache.sunTimesTomorrow.times = sunCalc.getSunTimes(todayValue + hlp.TIME_24h, this.latitude, this.longitude, this.height, true);
             this.cache.sunTimesTomorrow.sunPosAtSolarNoon = sunCalc.getPosition(this.cache.sunTimesTomorrow.times.solarNoon.value.valueOf(), this.latitude, this.longitude);
+            this._fixAngles(this.cache.sunTimesTomorrow.sunPosAtSolarNoon);
             this.cache.sunTimesTomorrow.dayId = (dayId + 1);
 
             // this.debug(`sunTimesRefresh - calculate sun times - dayId=${dayId}, today=${today.toISOString()}, this.cache=${util.inspect(this.cache, { colors: true, compact: 10, breakLength: Infinity })}`);
         }
 
+        /**
+         * check if sun times needs refresh
+         * @param {Boolean} [force=false] - forces refresh
+         * @private
+         */
         _sunTimesCheck(force) {
             // this.debug(`_sunTimesCheck - force=${force}`);
             const today = new Date();
@@ -1853,6 +2355,12 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
         }
 
+        /**
+         * refreshes cached moon times
+         * @param {Number} todayValue - timestamp of today
+         * @param {Number} dayId - number of current day
+         * @private
+         */
         _moonTimesRefresh(todayValue, dayId) {
             if (!this.valid) { return; }
 
@@ -1861,17 +2369,23 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 this.cache.moonTimesTomorrow.times = this.cache.moonTimes2Days.times;
                 this.cache.moonTimesToday.dayId = this.cache.moonTimesTomorrow.dayId;
                 this.cache.moonTimesToday.times = this.cache.moonTimesTomorrow.times;
+                // @ts-ignore
                 this.cache.moonTimes2Days = {};
             } else {
                 this.cache.moonTimesToday.dayId = dayId;
                 this.cache.moonTimesToday.times = sunCalc.getMoonTimes(todayValue, this.latitude, this.longitude);
-                this.cache.moonTimesTomorrow.times = sunCalc.getMoonTimes(todayValue + dayMs, this.latitude, this.longitude);
+                this.cache.moonTimesTomorrow.times = sunCalc.getMoonTimes(todayValue + hlp.TIME_24h, this.latitude, this.longitude);
                 this.cache.moonTimesTomorrow.dayId = (dayId + 1);
             }
-            this.cache.moonTimes2Days.times = sunCalc.getMoonTimes(todayValue + dayMs + dayMs, this.latitude, this.longitude);
+            this.cache.moonTimes2Days.times = sunCalc.getMoonTimes(todayValue + hlp.TIME_24h + hlp.TIME_24h, this.latitude, this.longitude);
             this.cache.moonTimes2Days.dayId = (dayId + 2);
         }
 
+        /**
+         * check if moon times needs refresh
+         * @param {Boolean} [force=false] - forces refresh
+         * @private
+         */
         _moonTimesCheck(force) {
             // this.debug(`_moonTimesCheck - force=${force}`);
             const today = new Date();
@@ -1886,7 +2400,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
     RED.nodes.registerType('position-config', positionConfigurationNode, {
         credentials: {
             posLatitude: { type: 'text' },
-            posLongitude: { type: 'text' }
+            posLongitude: { type: 'text' },
+            height: { type: 'text' }
         }
     });
 
@@ -1900,6 +2415,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
     RED.httpAdmin.get('/sun-position/data', RED.auth.needsPermission('sun-position.read'), (req, res) => {
         if (req.query.config && req.query.config !== '_ADD_') {
+            /** @type {IPositionConfigNode} */
             const posConfig = RED.nodes.getNode(req.query.config);
             if (!posConfig) {
                 res.status(500).send(JSON.stringify({
@@ -1916,7 +2432,17 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
             let obj = { value:'none', useful: false};
             try {
-                if (req.query.kind === 'getTimeData') {
+                if (req.query.kind === 'autoComplete') {
+                    if (req.query.type === 'numAnglePreDef') {
+                        obj = posConfig.getCustomAngles(req.query.value);
+                        res.status(200).send(JSON.stringify(obj)); // ...getOwnProper... does not work for arrays!
+                    } else if (req.query.type === 'pdsTimeCustom') {
+                        obj = posConfig.getSunTimesList(req.query.value);
+                        res.status(200).send(JSON.stringify(obj)); // ...getOwnProper... does not work for arrays!
+                    } else {
+                        res.status(400).send(JSON.stringify({value: '', error: 'no valid configuration!!'}));
+                    }
+                } else if (req.query.kind === 'getTimeData') {
                     obj = posConfig.getTimeProp(scrNode, undefined, req.query); // req.query.type, req.query.value, req.query.offsetType, req.query.offset, req.query.multiplier, req.query.next, req.query.days);
                     obj.useful = true;
                     res.status(200).send(JSON.stringify(obj, Object.getOwnPropertyNames(obj)));
diff --git a/nodes/20-time-inject.html b/nodes/20-time-inject.html
index 4d0daa70..32049f6e 100644
--- a/nodes/20-time-inject.html
+++ b/nodes/20-time-inject.html
@@ -609,12 +609,11 @@
                     dayOfMonth: 'timestamp',
                     pdsTime: 'sun time',
                     pdsTimeNow: 'sun time object',
+                    pdsTimeCustom: 'sun time (custom)',
                     pdmTime: 'moon time',
                     pdsCalcPercent: 'percent of sun in the sky',
                     pdsCalcAzimuth: 'Azimuth of sun',
-                    pdsCalcAzimuthRad: 'Azimuth of sun (Rad)',
                     pdsCalcElevation: 'Elevation of sun',
-                    pdsCalcElevationRad: 'Elevation of sun (Rad)',
                     pdsCalcData: 'object of sun position',
                     pdmCalcData: 'object of moon position',
                     pdmPhase: 'object of moon phase',
@@ -731,7 +730,7 @@
                     }, 300);
 
                     /* global initializeValue getTypes getSelectFields appendOptions setupTInput autocomplete addLabel initCombobox initCheckboxesBlock getBackendData bdDateToTime getCheckboxesStr setTInputValue */
-                    const types = getTypes(node);
+                    const types = getTypes(node, () => $nodeConfig.val());
                     const selFields = getSelectFields();
                     // #region initialize
                     /**
@@ -887,6 +886,7 @@
                                         types.TimeEntered,
                                         types.DateEntered,
                                         types.TimeSun,
+                                        types.TimeSunCustom,
                                         types.TimeSunNow,
                                         types.TimeMoon,
                                         types.DayOfMonth,
@@ -903,12 +903,11 @@
                                         types.MoonPhase,
                                         types.SunAzimuth,
                                         types.SunElevation,
-                                        types.SunAzimuthRad,
-                                        types.SunElevationRad,
                                         types.SunTimeByAzimuth,
                                         types.SunTimeByElevationObj,
-                                        types.SunTimeByAzimuthRad,
-                                        types.SunTimeByElevationObjRad,
+                                        types.SunTimeByElevationNext,
+                                        types.SunTimeByElevationRise,
+                                        types.SunTimeByElevationSet,
                                         types.isDST,
                                         types.WeekOfYear,
                                         types.WeekOfYearEven,
@@ -1128,6 +1127,7 @@
                                 const plVType = $propertyValue.typedInput('type');
                                 if (plVType === types.TimeEntered.value ||
                                     plVType === types.TimeSun.value ||
+                                    plVType === types.TimeSunCustom.value ||
                                     plVType === types.TimeMoon.value) {
                                     $row2.show(); // format
                                     $row3.show(); // offset
@@ -1397,19 +1397,16 @@
                         types: [
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'flow',
                             'global',
                             'env',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ],
                         onChange(_type, _value) {
                             const injectType = $('#node-input-injectTypeSelect').val();
@@ -1491,18 +1488,15 @@
                         types: [
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeMoon,
                             'flow',
                             'global',
                             'env',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ],
                         onChange(_type, _value) {
                             const injectType = $('#node-input-injectTypeSelect').val();
@@ -1717,13 +1711,17 @@
                         types: [
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'flow',
                             'global',
                             'env',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad
+                            types.SunTimeByElevationNext,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet
+
                         ],
                         onChange (_type, _value) {
                             if (!$('.time-inject-row-timeAlt').is(':hidden')) {
diff --git a/nodes/20-time-inject.js b/nodes/20-time-inject.js
index 55de5582..15d22402 100644
--- a/nodes/20-time-inject.js
+++ b/nodes/20-time-inject.js
@@ -195,7 +195,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             intervalAmount : 5,
             cron : 6
         };
-        const intervalMax = 24*60*60*1000 * 3; // 3 Tage
+        const intervalMax = hlp.TIME_3d;
 
         RED.nodes.createNode(this, config);
 
@@ -212,8 +212,10 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             return;
         } else if (node.positionConfig.checkNode(
             error => {
-                node.error(error);
-                node.status({fill: 'red', shape: 'dot', text: error });
+                const text = RED._('node-red-contrib-sun-position/position-config:errors.config-error', { error });
+                node.error(text);
+                node.status({fill: 'red', shape: 'dot', text });
+                return true;
             }, false)) {
             return;
         }
@@ -240,7 +242,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         } else {
             node.intervalCountType = 'none';
         }
-        node.intervalCountMultiplier = config.intervalCountMultiplier ? config.intervalCountMultiplier : 60000;
+        node.intervalCountMultiplier = config.intervalCountMultiplier ? config.intervalCountMultiplier : hlp.TIME_1min;
 
         if (node.injType === tInj.interval) {
             if (config.intervalStart) {
@@ -393,7 +395,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 vt   : config.payloadType ? ((config.payloadType === 'string') ? 'str' : config.payloadType) : (config.payload ? 'str' : 'date'),
                 o    : config.payloadOffset ? config.payloadOffset : 1,
                 oT   : (config.payloadOffset === 0 || config.payloadOffset === '') ? 'none' : (config.payloadOffsetType ? config.payloadOffsetType : 'num'),
-                oM   : config.payloadOffsetMultiplier ? config.payloadOffsetMultiplier : 60000,
+                oM   : config.payloadOffsetMultiplier ? config.payloadOffsetMultiplier : hlp.TIME_1min,
                 f    : config.payloadTimeFormat ? config.payloadTimeFormat : 0,
                 next : true,
                 days : '*',
@@ -520,7 +522,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
         node.props = prepareProps(this, config.props);
 
-        node.recalcTime = (config.recalcTime || 2) * 3600000;
+        node.recalcTime = (config.recalcTime || 2) * hlp.TIME_1h;
 
         node.timeOutStartObj = null;
         node.timeOutEndObj = null;
@@ -654,7 +656,9 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 node.getIntervalTime();
                 node.doStartInterval(); // starte Interval
             } else if (node.injType === tInj.intervalAmount) {
-                node.intervalCountMax = node.positionConfig.getFloatProp(node, null, node.intervalCountType, node.intervalCount, 0);
+                node.intervalCountMax = node.positionConfig.getFloatProp(node, null, {
+                    type: node.intervalCountType, value: node.intervalCount, def: 0
+                });
                 node.intervalTime = Math.floor((millisecEnd - millisecStart) / node.intervalCountMax);
                 node.intervalCountCurrent = 0;
                 node.doStartInterval(); // starte Interval
@@ -742,7 +746,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
             node.nextEndTime = nextEndTimeData.value;
 
-            let millisecEnd = 1000 * 60 * 60 * 24; // 24h
+            let millisecEnd = hlp.TIME_24h;
             if ((node.nextEndTime !== null) && (typeof node.nextEndTime !== 'undefined')) {
                 // node.debug('timeout ' + node.nextEndTime + ' is in ' + millisec + 'ms');
                 millisecEnd = hlp.getTimeOut(new Date(), node.nextEndTime);
@@ -761,8 +765,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 return;
             }
 
-            if (millisecEnd > 345600000) {
-                millisecEnd = Math.min((millisecEnd - 129600000), 2147483646);
+            if (millisecEnd > hlp.TIME_5d) {
+                millisecEnd = Math.min((millisecEnd - hlp.TIME_36h), 2147483646);
                 node.timeOutEndObj = setTimeout(() => {
                     node.doCreateEndTimeout();
                 }, millisecEnd); // 1,5 days before
@@ -801,21 +805,21 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * @returns {string} the text of the interval
          */
         node.getIntervalText = (mstime, val) => {
-            if (mstime === 604800000) {
+            if (mstime === hlp.TIME_WEEK) {
                 if (val === 1) {
                     return String(val) + RED._('node-red-contrib-sun-position/position-config:common.units.week');
                 }
                 return String(val) + RED._('node-red-contrib-sun-position/position-config:common.units.weeks');
-            } else if (mstime === 86400000) {
+            } else if (mstime === hlp.TIME_24h) {
                 if (val === 1) {
                     return String(val) + RED._('node-red-contrib-sun-position/position-config:common.units.day');
                 }
                 return String(val) + RED._('node-red-contrib-sun-position/position-config:common.units.days');
-            } else if (mstime === 3600000) {
+            } else if (mstime === hlp.TIME_1h) {
                 return String(val) + RED._('node-red-contrib-sun-position/position-config:common.units.hour');
-            } else if (mstime === 60000) {
+            } else if (mstime === hlp.TIME_1min) {
                 return String(val) + RED._('node-red-contrib-sun-position/position-config:common.units.min');
-            } else if (mstime === 1000) {
+            } else if (mstime === hlp.TIME_1s) {
                 return String(val) + RED._('node-red-contrib-sun-position/position-config:common.units.sec');
             }
             return String(val) + RED._('node-red-contrib-sun-position/position-config:common.units.ms');
@@ -849,13 +853,13 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     node.intervalObj = setInterval(() => {
                         node.send(node.prepOutMsg({ _inject_type: 'interval' }));
                     }, node.intervalTime);
-                    if (node.intervalTime > 43200000) { // 12h
+                    if (node.intervalTime > hlp.TIME_12h) {
                         node.status({
-                            text: '↻' + (node.intervalTime / 3600000).toFixed(1) + 'h'
+                            text: '↻' + (node.intervalTime / hlp.TIME_1h).toFixed(1) + 'h'
                         });
-                    } else if (node.intervalTime > 3600000) { // 1h
+                    } else if (node.intervalTime > hlp.TIME_1h) {
                         node.status({
-                            text: '↻' + (node.intervalTime / 60000).toFixed(2) + 'min'
+                            text: '↻' + (node.intervalTime / hlp.TIME_1min).toFixed(2) + 'min'
                         });
                     } else {
                         node.status({
@@ -913,7 +917,9 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          * get and validate a given interval
          */
         node.getIntervalTime = () => {
-            node.intervalTime = node.positionConfig.getFloatProp(node, null, node.intervalCountType, node.intervalCount, 0);
+            node.intervalTime = node.positionConfig.getFloatProp(node, null, {
+                type: node.intervalCountType, value: node.intervalCount, def: 0
+            });
             if (node.intervalTime <= 0) {
                 throw new Error('Interval wrong!');
             } else {
@@ -979,7 +985,9 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
 
             if (node.injType === tInj.intervalAmount) {
-                node.intervalCountMax = node.positionConfig.getFloatProp(node, null, node.intervalCountType, node.intervalCount, 0);
+                node.intervalCountMax = node.positionConfig.getFloatProp(node, null, {
+                    type: node.intervalCountType, value: node.intervalCount, def: 0
+                });
                 delete node.intervalTime;
             }
 
@@ -1049,15 +1057,14 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     }
                 }
 
-                if (millisec > 345600000) {
-                    // > 4 Days
+                if (millisec > hlp.TIME_5d) {
                     if (node.intervalObj) {
                         clearInterval(node.intervalObj);
                         node.intervalObj = null;
                     }
                     // there is a limitation of nodejs that the maximum setTimeout time
                     // should not more then 2147483647 ms (24.8 days).
-                    millisec = Math.min((millisec - 129600000), 2147483646);
+                    millisec = Math.min((millisec - hlp.TIME_36h), 2147483646);
                     // node.debug('next inject is far far away, plan a inject time recalc in ' + millisec + ' ms');
                     node.timeOutStartObj = setTimeout(() => {
                         node.doRecalcStartTimeOut();
diff --git a/nodes/21-within-time-switch.html b/nodes/21-within-time-switch.html
index 3404b1c5..e913126f 100644
--- a/nodes/21-within-time-switch.html
+++ b/nodes/21-within-time-switch.html
@@ -355,7 +355,7 @@
                 const setup = function(node) {
                     /* global getTypes getSelectFields appendOptions setupTInput initializeValue initCheckboxesBlock getCheckboxesStr getBackendData bdDateToTime */
 
-                    const types = getTypes(node);
+                    const types = getTypes(node, () => $nodeConfig.val());
                     const selFields = getSelectFields();
                     let onInit = true;
                     // #region initialize
@@ -408,6 +408,7 @@
                         types: [
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -415,13 +416,9 @@
                             'global',
                             'env',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ],
                         onFocus(_type, _value) {
                             const plVType = $('#node-input-startTime').typedInput('type');
@@ -555,6 +552,7 @@
                         types: [
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -562,13 +560,9 @@
                             'global',
                             'env',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ],
                         onFocus(_type, _value) {
                             const plVType = $('#node-input-endTime').typedInput('type');
@@ -716,6 +710,7 @@
                         types: [
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -723,13 +718,9 @@
                             'global',
                             'env',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ],
                         onFocus(_type, _value) {
                             if (($('#node-input-startTimeAlt').typedInput('type') === 'none') ||
@@ -872,6 +863,7 @@
                         types: [
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -879,13 +871,9 @@
                             'global',
                             'env',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ],
                         onFocus(_type, _value) {
                             if (($('#node-input-endTimeAlt').typedInput('type') === 'none') ||
@@ -969,12 +957,11 @@
                             types.MoonPhase,
                             types.SunAzimuth,
                             types.SunElevation,
-                            types.SunAzimuthRad,
-                            types.SunElevationRad,
                             types.SunTimeByAzimuth,
                             types.SunTimeByElevationObj,
-                            types.SunTimeByAzimuthRad,
-                            types.SunTimeByElevationObjRad,
+                            types.SunTimeByElevationNext,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet,
                             types.isDST,
                             types.WeekOfYear,
                             types.WeekOfYearEven,
@@ -1018,12 +1005,11 @@
                             types.MoonPhase,
                             types.SunAzimuth,
                             types.SunElevation,
-                            types.SunAzimuthRad,
-                            types.SunElevationRad,
                             types.SunTimeByAzimuth,
                             types.SunTimeByElevationObj,
-                            types.SunTimeByAzimuthRad,
-                            types.SunTimeByElevationObjRad,
+                            types.SunTimeByElevationNext,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet,
                             types.isDST,
                             types.WeekOfYear,
                             types.WeekOfYearEven,
diff --git a/nodes/21-within-time-switch.js b/nodes/21-within-time-switch.js
index 333f080a..bba6472b 100644
--- a/nodes/21-within-time-switch.js
+++ b/nodes/21-within-time-switch.js
@@ -169,6 +169,22 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         return false;
     }
 
+    /**
+        2024-06-05 - jonferreira
+        quick hack - Change evaluateJSONataExpression  to use callback
+    **/
+    function evaluateJSONataExpression(expr, message) {
+        return new Promise((resolve, reject) => {
+            RED.util.evaluateJSONataExpression(expr, message, (err, res) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(res);
+                }
+            });
+        });
+    }
+
     /**
      * calc the start and end times
      * @param {*} node - thje noide data
@@ -195,7 +211,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     if (!node.timeRestrictions.expr) {
                         node.timeRestrictions.expr = this.getJSONataExpression(node, node.timeRestrictions.value);
                     }
-                    node.timeRestrictions.data = RED.util.evaluateJSONataExpression(node.timeRestrictions.expr, msg);
+                    // node.timeRestrictions.data = RED.util.evaluateJSONataExpression(node.timeRestrictions.expr, msg);
+                    node.timeRestrictions.data = evaluateJSONataExpression(node.timeRestrictions.expr, msg);
                 } else {
                     node.timeRestrictions.data = RED.util.evaluateNodeProperty(node.timeRestrictions.value, node.timeRestrictions.type, node, msg);
                 }
@@ -315,8 +332,10 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         if (result.altStartTime) {
             // node.debug('alternate start times enabled ' + node.propertyStart.type + '.' + node.propertyStart.value);
             try {
+                node.propertyStart.now = dNow;
+                node.propertyStartThreshold.now = dNow;
                 result.altStartTime = node.positionConfig.comparePropValue(node, msg, node.propertyStart,
-                    node.propertyStartOperator, node.propertyStartThreshold, false, dNow);
+                    node.propertyStartOperator, node.propertyStartThreshold);
             } catch (err) {
                 result.altStartTime = false;
                 hlp.handleError(node, RED._('within-time-switch.errors.invalid-propertyStart-type', node.propertyStart), err);
@@ -337,8 +356,11 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         if (result.altEndTime) {
             // node.debug('alternate end times enabled ' + node.propertyEnd.type + '.' + node.propertyEnd.value);
             try {
+                node.propertyEnd.now = dNow;
+                node.propertyEndThreshold.now = dNow;
+
                 result.altEndTime = node.positionConfig.comparePropValue(node, msg, node.propertyEnd,
-                    node.propertyEndOperator, node.propertyEndThreshold, false, dNow);
+                    node.propertyEndOperator, node.propertyEndThreshold);
             } catch (err) {
                 result.altEndTime = false;
                 hlp.handleError(node, RED._('within-time-switch.errors.invalid-propertyEnd-type', node.propertyEnd), err);
@@ -379,8 +401,10 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             return;
         } else if (node.positionConfig.checkNode(
             error => {
-                node.error(error);
-                node.status({fill: 'red', shape: 'dot', text: error });
+                const text = RED._('node-red-contrib-sun-position/position-config:errors.config-error', { error });
+                node.error(text);
+                node.status({fill: 'red', shape: 'dot', text });
+                return true;
             }, false)) {
             return;
         }
diff --git a/nodes/22-delay-until.html b/nodes/22-delay-until.html
index caa662b7..ba8c45b2 100644
--- a/nodes/22-delay-until.html
+++ b/nodes/22-delay-until.html
@@ -156,7 +156,7 @@
             const setup = function(node) {
                 /* global getTypes setupTInput getBackendData bdDateToTime initializeValue appendOptions */
 
-                const types = getTypes(node);
+                const types = getTypes(node, () => $nodeConfig.val());
                 let onInit = true;
                 // #region initialize
                 /**
@@ -191,6 +191,7 @@
                     types: [
                         types.TimeEntered,
                         types.TimeSun,
+                        types.TimeSunCustom,
                         types.TimeMoon,
                         'msg',
                         'flow',
@@ -199,11 +200,7 @@
                         types.SunTimeByAzimuth,
                         types.SunTimeByElevationNext,
                         types.SunTimeByElevationRise,
-                        types.SunTimeByElevationSet,
-                        types.SunTimeByAzimuthRad,
-                        types.SunTimeByElevationNextRad,
-                        types.SunTimeByElevationRiseRad,
-                        types.SunTimeByElevationSetRad
+                        types.SunTimeByElevationSet
                     ],
                     onChange(_type, _value) {
                         if ( onInit) { return; }
diff --git a/nodes/22-delay-until.js b/nodes/22-delay-until.js
index 3f320f14..6cab1cbc 100644
--- a/nodes/22-delay-until.js
+++ b/nodes/22-delay-until.js
@@ -100,8 +100,10 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         }
         if (node.positionConfig.checkNode(
             error => {
-                node.error(error);
-                node.status({fill: 'red', shape: 'dot', text: error });
+                const text = RED._('node-red-contrib-sun-position/position-config:errors.config-error', { error });
+                node.error(text);
+                node.status({fill: 'red', shape: 'dot', text });
+                return true;
             }, false)) {
             return null;
         }
@@ -305,25 +307,25 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             if (node.delayTimer) {
                 clearTimer();
             }
-            const dNow = getIntDate(node.tsCompare, qObj.msg, node);
+            node.timeData.now = getIntDate(node.tsCompare, qObj.msg, node);
 
-            node.nextTime = node.positionConfig.getTimeProp(node, qObj.msg, node.timeData, dNow);
+            node.nextTime = node.positionConfig.getTimeProp(node, qObj.msg, node.timeData);
             if (node.nextTime.error) {
                 node.debug('node.nextTime=' + util.inspect(node.nextTime, { colors: true, compact: 10, breakLength: Infinity }));
                 hlp.handleError(node, node.nextTime.error, null, 'could not evaluate time');
                 return;
 
             }
-            let millisec = hlp.getTimeOut(dNow, node.nextTime.value);
-            // let millisec = node.nextTime.value.valueOf() - dNow.valueOf();
-            node.debug(`set timeout to ${node.nextTime.value.valueOf()} - ${dNow.valueOf()}`);
+            let millisec = hlp.getTimeOut(node.timeData.now, node.nextTime.value);
+            // let millisec = node.nextTime.value.valueOf() - node.timeData.now.valueOf();
+            node.debug(`set timeout to ${node.nextTime.value.valueOf()} - ${node.timeData.now.valueOf()}`);
             // while (millisec < 1) {
-            //    millisec += 86400000; // 24h
+            //    millisec += hlp.TIME_24h; // 24h
             // }
-            if (millisec > 345600000) {
+            if (millisec > hlp.TIME_4d) {
                 // there is a limitation of nodejs that the maximum setTimeout time
                 // should not more then 2147483647 ms (24.8 days).
-                millisec = Math.min((millisec - 129600000), 2147483646);
+                millisec = Math.min((millisec - hlp.TIME_36h), 2147483646);
                 // node.debug('next inject is far far away, plan a inject time recalc in ' + millisec + ' ms');
                 node.delayTimer = setTimeout(() => {
                     delete node.delayTimer;
diff --git a/nodes/30-sun-position.html b/nodes/30-sun-position.html
index 083ab824..8db376ae 100644
--- a/nodes/30-sun-position.html
+++ b/nodes/30-sun-position.html
@@ -165,9 +165,10 @@
                     $('.is-to-hide-initially').hide();
                 }, 300);
                 const node = this;
+                const $nodeConfig = $('#node-input-positionConfig');
                 const setup = function(node) {
                     /* global getTypes appendOptions setupTInput */
-                    const types = getTypes(node);
+                    const types = getTypes(node, () => $nodeConfig.val());
                     // #region initialize
                     /**
                     * update multiplier settings from a previous version
@@ -196,19 +197,16 @@
                             types.Undefined,
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'flow',
                             'global',
                             'env',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ],
                         onChange(_type, _value) {
                             if ($('#node-input-start').typedInput('type') === types.Undefined.value) {
@@ -251,19 +249,16 @@
                             types.Undefined,
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'flow',
                             'global',
                             'env',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ],
                         onChange(_type, _value) {
                             if ($('#node-input-end').typedInput('type') === types.Undefined.value) {
diff --git a/nodes/30-sun-position.js b/nodes/30-sun-position.js
index b876fc8c..c8b3c5ad 100644
--- a/nodes/30-sun-position.js
+++ b/nodes/30-sun-position.js
@@ -50,7 +50,7 @@
  * @property {string} endOffsetType type of the end offset value
  * @property {number} endOffsetMultiplier end offset multipier
  *
- * @property {*} azimuthPos end offset multipier
+ * @property {*} azimuthPos ??
  */
 
 
@@ -78,46 +78,96 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         // @ts-ignore
         const node = this;
         // Retrieve the config node
+        /** @type {IPositionConfigNode} */
         node.positionConfig = RED.nodes.getNode(config.positionConfig);
-        node.topic = config.topic || '';
-        node.rules = config.rules || [];
-        node.azimuthPos = {};
-        node.start = config.start;
-        node.startType = config.startType || 'none';
-        node.startOffset = config.startOffset || 0;
-        node.startOffsetType = config.startOffsetType || 'none';
-        node.startOffsetMultiplier = config.startOffsetMultiplier || 60;
-        node.end = config.end;
-        node.endType = config.endType || 'none';
-        node.endOffset = config.endOffset || 0;
-        node.endOffsetType = config.endOffsetType || 'none';
-        node.endOffsetMultiplier = config.endOffsetMultiplier || 60;
-
+        node.positionConfigValid = true;
         if (!node.positionConfig) {
             node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
             node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing-state') });
             return;
+        } else if (node.positionConfig.checkNode(
+            error => {
+                const text = RED._('node-red-contrib-sun-position/position-config:errors.config-error', { error });
+                node.warn(text);
+                node.status({fill: 'red', shape: 'dot', text });
+                return true;
+            }, false)) {
+            node.positionConfigValid = false;
+        } else {
+            node.status({});
         }
 
+        // Retrieve the config node
+        node.topic = config.topic || '';
+        node.rules = config.rules || [];
+        node.azimuthPos = {};
+        node.start = {
+            type: config.startType || 'none',
+            value : config.start,
+            offsetType : config.startOffsetType || 'none',
+            offset : config.startOffset || 0,
+            multiplier : config.startOffsetMultiplier || 60,
+            next: false
+        };
+        node.end = {
+            type: config.endType || 'none',
+            value : config.end,
+            offsetType : config.endOffsetType || 'none',
+            offset : config.endOffset || 0,
+            multiplier : config.endOffsetMultiplier || 60,
+            next: false
+        };
+
         node.on('input', function (msg, send, done) {
             // If this is pre-1.0, 'done' will be undefined
             done = done || function (text, msg) { if (text) { return node.error(text, msg); } return null; };
             send = send || function (...args) { node.send.apply(node, args); };
 
             try {
-                let errorStatus = '';
-                const dNow = hlp.getNowTimeStamp(this, msg);
+                const data = {
+                    now : hlp.getNowTimeStamp(this, msg),
+                    latitude: parseFloat(msg.latitude) || parseFloat(msg.lat),
+                    longitude: parseFloat(msg.longitude) || parseFloat(msg.lon),
+                    height: parseFloat(msg.height)
+                };
+                if (isNaN(data.latitude)) {
+                    delete data.latitude;
+                } else if ((data.latitude < -90) || (data.latitude > 90)) {
+                    node.error(RED._('node-red-contrib-sun-position/position-config:errors.latitude-wrong', data));
+                    delete data.latitude;
+                }
+                if (isNaN(data.longitude)) {
+                    delete data.longitude;
+                } else if ((data.longitude < -180) || (data.longitude > 180)) {
+                    node.error(RED._('position-config.errors.longitude-missing', data));
+                    delete data.longitude;
+                }
+                if (isNaN(data.height)) { delete data.height; }
 
                 if (!node.positionConfig) {
-                    node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
+                    // node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
                     node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing-state') });
                     done(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'), msg);
                     return null;
+                } else if (!node.positionConfigValid) {
+                    let text = '';
+                    if (isNaN(this.latitude) || (this.latitude < -90) || (this.latitude > 90)) {
+                        text = RED._('node-red-contrib-sun-position/errors.latitude-missing');
+                    }
+                    if (isNaN(this.longitude) || (this.longitude < -180) || (this.longitude > 180)) {
+                        text = RED._('node-red-contrib-sun-position/errors.longitude-missing');
+                    }
+                    if (text) {
+                        node.status({fill: 'red', shape: 'dot', text });
+                        done(text, msg);
+                        return null;
+                    }
                 }
+                let errorStatus = '';
                 const ports = new Array(node.rules.length);
 
                 ports[0] = RED.util.cloneMessage(msg);
-                ports[0].payload = node.positionConfig.getSunCalc(dNow, true, false, msg.latitude || msg.lat,  msg.longitude || msg.lon);
+                ports[0].payload = node.positionConfig.getSunCalc(data.now, true, false, data.latitude,  data.longitude);
                 ports[0].topic = node.topic;
                 if (!ports[0].payload.azimuth) {
                     // node.error('Azimuth could not calculated!');
@@ -128,19 +178,9 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
                 ports[0].payload.pos = [];
                 ports[0].payload.posChanged = false;
-                if (node.startType !== 'none') {
-                    // const startTime = node.positionConfig.getTimeProp(node, msg, node.startType, node.start, node.startOffsetType, node.startOffset, node.startOffsetMultiplier);
-                    const startTime = node.positionConfig.getTimeProp(node, msg, {
-                        type: node.startType,
-                        value : node.start,
-                        offsetType : node.startOffsetType,
-                        offset : node.startOffset,
-                        multiplier : node.startOffsetMultiplier,
-                        now: dNow,
-                        latitude: msg.latitude || msg.lat,
-                        longitude: msg.longitude || msg.lon
-                    });
 
+                if (node.start.type !== 'none') {
+                    const startTime = node.positionConfig.getTimeProp(node, msg, Object.assign({}, node.start, data));
                     node.debug('startTime: ' + util.inspect(startTime, { colors: true, compact: 10, breakLength: Infinity }));
                     if (startTime.error) {
                         errorStatus = 'could not evaluate start time';
@@ -151,18 +191,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     }
                 }
 
-                if (node.endType !== 'none') {
-                    // const endTime = node.positionConfig.getTimeProp(node, msg, node.endType, node.end, node.endOffsetType, node.endOffset, node.endOffsetMultiplier);
-                    const endTime = node.positionConfig.getTimeProp(node, msg, {
-                        type: node.endType,
-                        value : node.end,
-                        offsetType : node.endOffsetType,
-                        offset : node.endOffset,
-                        multiplier : node.endOffsetMultiplier,
-                        now: dNow,
-                        latitude: msg.latitude || msg.lat,
-                        longitude: msg.longitude || msg.lon
-                    });
+                if (node.end.type !== 'none') {
+                    const endTime = node.positionConfig.getTimeProp(node, msg,  Object.assign({}, node.end, data));
 
                     node.debug('endTime: ' + util.inspect(endTime, { colors: true, compact: 10, breakLength: Infinity }));
                     if (endTime.error) {
@@ -175,7 +205,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 }
 
                 if (ports[0].payload.startTime && ports[0].payload.endTime) {
-                    const nowMillis = dNow.getTime();
+                    const nowMillis = data.now.getTime();
                     ports[0].payload.sunInSky = nowMillis > ports[0].payload.startTime && nowMillis < ports[0].payload.endTime;
                 }
 
@@ -189,6 +219,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     ports[0].payload.posChanged = ports[0].payload.posChanged && chg;
                     if (chk) {
                         ports[i + 1] = RED.util.cloneMessage(msg);
+                        ports[i + 1].payload.sunPos = chk;
+                        ports[i + 1].payload.posChanged = chg;
                         ports[i + 1].sunPos = chk;
                         ports[i + 1].posChanged = chg;
                         ports[i + 1].azimuth = ports[0].payload.azimuth;
@@ -263,7 +295,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 if (vType === 'none') {
                     return undefined;
                 }
-                return node.positionConfig.getFloatProp(node, msg, vType, value, 0);
+                return node.positionConfig.getFloatProp(node, msg, { type: vType, value, def: 0 });
             } catch (err) {
                 return undefined;
             }
diff --git a/nodes/31-moon-position.html b/nodes/31-moon-position.html
index f0e8785a..1e3cbb62 100644
--- a/nodes/31-moon-position.html
+++ b/nodes/31-moon-position.html
@@ -83,9 +83,10 @@
             paletteLabel: 'moon-position',
             oneditprepare() {
                 const node = this;
+                const $nodeConfig = $('#node-input-positionConfig');
                 const setup = function(node) {
                     /* global getTypes */
-                    const types = getTypes(node);
+                    const types = getTypes(node, () => $nodeConfig.val());
                     // #region initialize
 
                     const outputCount = $('#node-input-outputs').val('{}');
diff --git a/nodes/31-moon-position.js b/nodes/31-moon-position.js
index 7ea27bf7..ac30ccad 100644
--- a/nodes/31-moon-position.js
+++ b/nodes/31-moon-position.js
@@ -50,7 +50,7 @@
   * @property {string} endOffsetType type of the end offset value
   * @property {number} endOffsetMultiplier end offset multipier
   *
-  * @property {*} azimuthPos end offset multipier
+  * @property {*} azimuthPos ??
   */
 
 /**
@@ -61,11 +61,10 @@
   * @type {runtimeRED} */
 module.exports = function (/** @type {runtimeRED} */ RED) {
     'use strict';
-    const path = require('path');
-
-    const hlp = require(path.join(__dirname, '/lib/dateTimeHelper.js'));
+    const hlp = require('./lib/dateTimeHelper.js');
     const util = require('util');
 
+    /******************************************************************************************/
     /**
      * standard Node-Red Node handler for the moonPositionNode
      * @param {*} config the Node-Red Configuration property of the Node
@@ -78,36 +77,79 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         // @ts-ignore
         const node = this;
         // Retrieve the config node
+        /** @type {IPositionConfigNode} */
         node.positionConfig = RED.nodes.getNode(config.positionConfig);
-        node.topic = config.topic || '';
-        node.rules = config.rules || [];
-        node.azimuthPos = {};
+        node.positionConfigValid = true;
         if (!node.positionConfig) {
             node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
             node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing-state') });
             return;
+        } else if (node.positionConfig.checkNode(
+            error => {
+                const text = RED._('node-red-contrib-sun-position/position-config:errors.config-error', { error });
+                node.warn(text);
+                node.status({fill: 'red', shape: 'dot', text });
+                return true;
+            }, false)) {
+            node.positionConfigValid = false;
+        } else {
+            node.status({});
         }
 
+        // Retrieve the config node
+        node.topic = config.topic || '';
+        node.rules = config.rules || [];
+        node.azimuthPos = {};
         node.on('input', function (msg, send, done) {
             // If this is pre-1.0, 'done' will be undefined
             done = done || function (text, msg) { if (text) { return node.error(text, msg); } return null; };
             send = send || function (...args) { node.send.apply(node, args); };
 
             try {
-                const errorStatus = '';
-                const dNow = hlp.getNowTimeStamp(this, msg);
+                const data = {
+                    now : hlp.getNowTimeStamp(this, msg),
+                    latitude: parseFloat(msg.latitude) || parseFloat(msg.lat),
+                    longitude: parseFloat(msg.longitude) || parseFloat(msg.lon),
+                    height: parseFloat(msg.height)
+                };
+                if (isNaN(data.latitude)) {
+                    delete data.latitude;
+                } else if ((data.latitude < -90) || (data.latitude > 90)) {
+                    node.error(RED._('node-red-contrib-sun-position/position-config:errors.latitude-wrong', data));
+                    delete data.latitude;
+                }
+                if (isNaN(data.longitude)) {
+                    delete data.longitude;
+                } else if ((data.longitude < -180) || (data.longitude > 180)) {
+                    node.error(RED._('position-config.errors.longitude-missing', data));
+                    delete data.longitude;
+                }
+                if (isNaN(data.height)) { delete data.height; }
 
                 if (!node.positionConfig) {
-                    node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
+                    // node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
                     node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing-state') });
                     done(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'), msg);
                     return null;
+                } else if (!node.positionConfigValid) {
+                    let text = '';
+                    if (isNaN(this.latitude) || (this.latitude < -90) || (this.latitude > 90)) {
+                        text = RED._('node-red-contrib-sun-position/errors.latitude-missing');
+                    }
+                    if (isNaN(this.longitude) || (this.longitude < -180) || (this.longitude > 180)) {
+                        text = RED._('node-red-contrib-sun-position/errors.longitude-missing');
+                    }
+                    if (text) {
+                        node.status({fill: 'red', shape: 'dot', text });
+                        done(text, msg);
+                        return null;
+                    }
                 }
+                const errorStatus = '';
                 const ports = new Array(node.rules.length);
 
                 ports[0] = RED.util.cloneMessage(msg);
-                ports[0].payload = node.positionConfig.getMoonCalc(dNow, true, true, msg.latitude || msg.lat,  msg.longitude || msg.lon);
-
+                ports[0].payload = node.positionConfig.getMoonCalc(data.now, true, true, data.latitude,  data.longitude);
                 ports[0].topic = node.topic;
                 if (!ports[0].payload.azimuth) {
                     // node.error('Azimuth could not calculated!');
@@ -188,7 +230,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 if (vType === 'none') {
                     return undefined;
                 }
-                return node.positionConfig.getFloatProp(node, msg, vType, value, 0);
+                return node.positionConfig.getFloatProp(node, msg, { type: vType, value, def: 0 });
             } catch (err) {
                 return undefined;
             }
diff --git a/nodes/60-time-comp.html b/nodes/60-time-comp.html
index 303c1ecd..f55ac6e6 100644
--- a/nodes/60-time-comp.html
+++ b/nodes/60-time-comp.html
@@ -165,7 +165,7 @@
                 const $nodeConfig = $('#node-input-positionConfig');
                 const setup = function(node) {
                     /* global getTypes getSelectFields appendOptions setupTInput autocomplete addLabel initCombobox getBackendData bdDateToTime getCheckboxesStr setMultiselect multiselect setTInputValue */
-                    const types = getTypes(node);
+                    const types = getTypes(node, () => $nodeConfig.val());
                     const selFields = getSelectFields();
                     const operatorTypesShort = [
                         {selection: /(^\*$|^(11,)?12,13,14,15,16(,17)?(,18)?$)/, label: 'DT'},
@@ -191,6 +191,7 @@
                             types.DateEntered,
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             types.DayOfMonth,
@@ -211,6 +212,7 @@
                                 $('.time-row-inputFormat').hide();
                                 $('.time-row-inputOffset').show();
                             } else if ( opType === types.TimeSun.value ||
+                                        opType === types.TimeSunCustom.value ||
                                         opType === types.TimeMoon.value) {
                                 $('.time-row-inputNext').show();
                                 $('.time-row-inputFormat').hide();
@@ -375,6 +377,7 @@
                                     types.DateEntered,
                                     types.TimeEntered,
                                     types.TimeSun,
+                                    types.TimeSunCustom,
                                     types.TimeSunNow,
                                     types.TimeMoon,
                                     types.DayOfMonth,
@@ -462,12 +465,15 @@
                                         $row3.show(); // next
                                         $row4.show(); // offset
                                         $row5.show(); // limit
-                                    } else if (opType === types.DateEntered.value  || opType === types.DateSpecific.value) {
+                                    } else if (opType === types.DateEntered.value  ||
+                                               opType === types.DateSpecific.value) {
                                         $row2.hide(); // format
                                         $row3.hide(); // next
                                         $row4.show(); // offset
                                         $row5.show(); // limit
-                                    } else if (opType === types.TimeSun.value || opType === types.TimeMoon.value ) {
+                                    } else if (opType === types.TimeSun.value ||
+                                               opType === types.TimeSunCustom.value ||
+                                               opType === types.TimeMoon.value ) {
                                         $row2.hide(); // format
                                         $row3.show(); // next
                                         $row4.show(); // offset
@@ -621,6 +627,7 @@
                                         types.TimeEntered,
                                         types.DateEntered,
                                         types.TimeSun,
+                                        types.TimeSunCustom,
                                         types.TimeSunNow,
                                         types.TimeMoon,
                                         types.DayOfMonth,
@@ -638,12 +645,11 @@
                                         types.MoonPhase,
                                         types.SunAzimuth,
                                         types.SunElevation,
-                                        types.SunAzimuthRad,
-                                        types.SunElevationRad,
                                         types.SunTimeByAzimuth,
                                         types.SunTimeByElevationObj,
-                                        types.SunTimeByAzimuthRad,
-                                        types.SunTimeByElevationObjRad,
+                                        types.SunTimeByElevationNext,
+                                        types.SunTimeByElevationRise,
+                                        types.SunTimeByElevationSet,
                                         types.isDST,
                                         types.WeekOfYear,
                                         types.WeekOfYearEven,
@@ -862,6 +868,7 @@
                                 const plVType = $propertyValue.typedInput('type');
                                 if (plVType === types.TimeEntered.value ||
                                     plVType === types.TimeSun.value ||
+                                    plVType === types.TimeSunCustom.value ||
                                     plVType === types.TimeMoon.value) {
                                     $row2.show(); // format
                                     $row3.show(); // offset
diff --git a/nodes/60-time-comp.js b/nodes/60-time-comp.js
index ea16383d..573fef3b 100644
--- a/nodes/60-time-comp.js
+++ b/nodes/60-time-comp.js
@@ -52,6 +52,7 @@
   * @type {runtimeRED} */
 module.exports = function (/** @type {runtimeRED} */ RED) {
     'use strict';
+
     const util = require('util');
     const hlp = require('./lib/dateTimeHelper.js');
 
@@ -66,6 +67,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
          */
         // @ts-ignore
         const node = this;
+
         // Retrieve the config node
         node.positionConfig = RED.nodes.getNode(config.positionConfig);
         // node.debug('initialize time Node ' + util.inspect(config, { colors: true, compact: 10, breakLength: Infinity }));
@@ -76,8 +78,10 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         }
         if (node.positionConfig.checkNode(
             error => {
-                node.error(error);
-                node.status({fill: 'red', shape: 'dot', text: error });
+                const text = RED._('node-red-contrib-sun-position/position-config:errors.config-error', { error });
+                node.error(text);
+                node.status({fill: 'red', shape: 'dot', text });
+                return true;
             }, false)) {
             return;
         }
@@ -90,7 +94,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             offset: config.inputOffset,
             multiplier: config.inputOffsetMultiplier
         };
-        if (node.input.type !== 'entered' && node.input.type !== 'pdsTime' && node.input.type !== 'pdmTime') {
+        if (node.input.type !== 'entered' && node.input.type !== 'pdsTime' && node.input.type !== 'pdsTimeCustom' && node.input.type !== 'pdmTime') {
             node.input.next = false;
         }
 
@@ -106,7 +110,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     oT          : (config.result1OffsetType === 0 || config.result1OffsetType === '') ? 'none' : (config.result1OffsetType ? config.result1OffsetType : 'num'),
                     oM          : config.result1OffsetMultiplier ? config.result1OffsetMultiplier : 60000,
                     f           : config.result1Format ? config.result1Format : 0,
-                    next        : false,
+                    next        : true,
                     days        : '*',
                     months      : '*',
                     onlyEvenDays: false,
@@ -127,29 +131,29 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         node.results = [];
         config.results.forEach(prop => {
             const propNew = {
-                outType     : prop.pt,
-                outValue    : prop.p,
-                type        : prop.vt,
-                value       : prop.v,
-                format      : prop.f,
-                offsetType  : prop.oT,
-                offset      : prop.o,
-                multiplier  : parseFloat(prop.oM) || 60000,
-                next        : (typeof prop.next === 'undefined' || prop.next === null || hlp.isTrue(prop.next)) ? true : false,
-                days        : prop.days,
-                months      : prop.months,
-                onlyEvenDays: prop.onlyEvenDays,
-                onlyOddDays : prop.onlyOddDays,
-                onlyEvenWeeks: prop.onlyEvenWeeks,
-                onlyOddWeeks : prop.onlyOddWeeks
+                outType         : prop.pt,
+                outValue        : prop.p,
+                type            : prop.vt,
+                value           : prop.v,
+                format          : prop.f,
+                offsetType      : prop.oT,
+                offset          : prop.o,
+                multiplier      : parseFloat(prop.oM) || 60000,
+                next            : (typeof prop.next === 'undefined' || prop.next === null || hlp.isTrue(prop.next)) ? true : false,
+                days            : prop.days,
+                months          : prop.months,
+                onlyEvenDays    : prop.onlyEvenDays === 'true' || prop.onlyEvenDays === true,
+                onlyOddDays     : prop.onlyOddDays === 'true' || prop.onlyOddDays === true,
+                onlyEvenWeeks   : prop.onlyEvenWeeks === 'true' || prop.onlyEvenWeeks === true,
+                onlyOddWeeks    : prop.onlyOddWeeks === 'true' || prop.onlyOddWeeks === true
             };
-            if (propNew.type !== 'entered' && propNew.type !== 'pdsTime' && propNew.type !== 'pdmTime') {
+            if (propNew.type !== 'entered' && propNew.type !== 'pdsTime' && propNew.type !== 'pdsTimeCustom' && propNew.type !== 'pdmTime') {
                 propNew.next = false;
             }
 
             if (node.positionConfig && propNew.type === 'jsonata') {
                 try {
-                    propNew.expr = node.positionConfig.getJSONataExpression(this, propNew.value);
+                    propNew.expr = node.positionConfig.getJSONataExpression(node, propNew.value);
                 } catch (err) {
                     node.error(RED._('node-red-contrib-sun-position/position-config:errors.invalid-expr', { error: err.message }));
                     propNew.expr = null;
@@ -166,7 +170,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             if (rule.operator === 99) {
                 rule.next = false;
             } else {
-                if (rule.operandType !== 'entered' && rule.operandType !== 'pdsTime' && rule.operandType !== 'pdmTime') {
+                if (rule.operandType !== 'entered' && rule.operandType !== 'pdsTime' && rule.operandType !== 'pdsTimeCustom' && rule.operandType !== 'pdmTime') {
                     rule.next = false;
                 }
             }
@@ -217,7 +221,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
 
             try {
-                // const inputData = node.positionConfig.getDateFromProp(node, msg, node.input.type, node.input.value);
+                node.input.now = dNow;
                 const inputData = node.positionConfig.getTimeProp(node, msg, node.input);
                 if (inputData.error) {
                     throw new Error(inputData.error);
@@ -229,16 +233,17 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
                     let resultObj = null;
                     if (prop.type === 'input') {
-                        resultObj = node.positionConfig.formatOutDate(this, msg, inputData.value, prop);
+                        resultObj = node.positionConfig.formatOutDate(node, msg, inputData.value, prop);
                     } else {
-                        resultObj = node.positionConfig.getOutDataProp(this, msg, prop, dNow);
+                        resultObj = node.positionConfig.getOutDataProp(node, msg, prop, dNow);
                     }
+
                     if (resultObj === null || (typeof resultObj === 'undefined')) {
                         node.error('Could not evaluate ' + prop.type + '.' + prop.value + '. - Maybe settings outdated (open and save again)!');
                     } else if (resultObj.error) {
                         node.error('error on getting result: "' + resultObj.error + '"');
                     } else {
-                        node.positionConfig.setMessageProp(this, msg, prop.outType, prop.outValue, resultObj);
+                        node.positionConfig.setMessageProp(node, msg, prop.outType, prop.outValue, resultObj);
                     }
                     // node.debug(`prepOutMsg-${i} msg=${util.inspect(msg, { colors: true, compact: 10, breakLength: Infinity })}`);
                 }
diff --git a/nodes/61-time-span.html b/nodes/61-time-span.html
index 11688c02..ff7b0d1d 100644
--- a/nodes/61-time-span.html
+++ b/nodes/61-time-span.html
@@ -131,7 +131,7 @@
                             pt: 'msgPayload',
                             v: '',
                             vt: 'input',
-                            o: '',
+                            o: 1,
                             oT: 'none',
                             oM: 60000,
                             fTs: 1,
@@ -206,7 +206,7 @@
                 const $nodeConfig = $('#node-input-positionConfig');
                 const setup = function(node) {
                     /* global getTypes getSelectFields appendOptions setupTInput autocomplete addLabel initCombobox getBackendData bdDateToTime getCheckboxesStr setTInputValue */
-                    const types = getTypes(node);
+                    const types = getTypes(node, () => $nodeConfig.val());
                     const selFields = getSelectFields();
                     // #region operand1
                     setupTInput(node, {
@@ -219,6 +219,7 @@
                             types.MsgPayload,
                             types.MsgTs,
                             types.MsgLc,
+                            types.MsgValue,
                             'flow',
                             'global',
                             'date',
@@ -227,6 +228,7 @@
                             'str',
                             types.DateEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             types.DayOfMonth,
@@ -239,6 +241,7 @@
                                 opType === types.TimeEntered.value ||
                                 opType === types.DateEntered.value ||
                                 opType === types.TimeSun.value ||
+                                opType === types.TimeSunCustom.value ||
                                 opType === types.TimeMoon.value ||
                                 opType === types.DayOfMonth.value) {
                                 $('.time-row-operand1Format').hide();
@@ -246,6 +249,8 @@
                             } else if (opType === 'msg' ||
                                         opType === types.MsgPayload.value ||
                                         opType === types.MsgTs.value ||
+                                        opType === types.MsgLc.value ||
+                                        opType === types.MsgValue.value ||
                                         opType === 'flow' ||
                                         opType === 'global' ||
                                         opType === 'str' ||
@@ -257,7 +262,6 @@
                                 $('.time-row-operand1Format').hide();
                                 $('.time-row-operand1Offset').hide();
                             }
-
                             getBackendData(d => {
                                 const $div = $('#node-input-operand1-div');
                                 const titleOrg = $div.attr('titleOrg');
@@ -268,6 +272,7 @@
                                 config:     $nodeConfig.val(),
                                 type:       opType,
                                 value:      $operand1.typedInput('value'),
+                                next:       $('#node-input-operand1Next').is(':checked'),
                                 format:     $('#node-input-operand1Format').val(),
                                 offsetType: $('#node-input-operand1Offset').typedInput('type'),
                                 offset:     $('#node-input-operand1Offset').typedInput('value'),
@@ -310,6 +315,7 @@
                             types.MsgPayload,
                             types.MsgTs,
                             types.MsgLc,
+                            types.MsgValue,
                             'flow',
                             'global',
                             'date',
@@ -318,6 +324,7 @@
                             'str',
                             types.DateEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             types.DayOfMonth,
@@ -330,6 +337,7 @@
                                 opType === types.TimeEntered.value ||
                                 opType === types.DateEntered.value ||
                                 opType === types.TimeSun.value ||
+                                opType === types.TimeSunCustom.value ||
                                 opType === types.TimeMoon.value ||
                                 opType === types.DayOfMonth.value) {
                                 $('.time-row-operand2Format').hide();
@@ -337,6 +345,8 @@
                             } else if (opType === 'msg' ||
                                         opType === types.MsgPayload.value ||
                                         opType === types.MsgTs.value ||
+                                        opType === types.MsgLc.value ||
+                                        opType === types.MsgValue.value ||
                                         opType === 'flow' ||
                                         opType === 'global' ||
                                         opType === 'str' ||
@@ -360,6 +370,7 @@
                                 type:       opType,
                                 value:      $operand2.typedInput('value'),
                                 format:     $('#node-input-operand2Format').val(),
+                                next:       $('#node-input-operand2Next').is(':checked'),
                                 offsetType: $('#node-input-operand2Offset').typedInput('type'),
                                 offset:     $('#node-input-operand2Offset').typedInput('value'),
                                 multiplier: $('#node-input-operand2OffsetMultiplier').val(),
@@ -493,9 +504,7 @@
                     }
                     // #endregion rule-container
                     // #region result-container
-                    /**
-                    * resizes result container
-                    */
+                    /** resizes result container */
                     function resizeResultContainer() {
                         const editorRow = $('.node-input-result-container-row ol');
                         const height = editorRow.outerHeight(true);
@@ -586,6 +595,7 @@
                                         types.TimeEntered,
                                         types.DateEntered,
                                         types.TimeSun,
+                                        types.TimeSunCustom,
                                         types.TimeSunNow,
                                         types.TimeMoon,
                                         types.DayOfMonth,
@@ -606,12 +616,11 @@
                                         types.MoonPhase,
                                         types.SunAzimuth,
                                         types.SunElevation,
-                                        types.SunAzimuthRad,
-                                        types.SunElevationRad,
                                         types.SunTimeByAzimuth,
                                         types.SunTimeByElevationObj,
-                                        types.SunTimeByAzimuthRad,
-                                        types.SunTimeByElevationObjRad,
+                                        types.SunTimeByElevationNext,
+                                        types.SunTimeByElevationRise,
+                                        types.SunTimeByElevationSet,
                                         types.isDST,
                                         types.WeekOfYear,
                                         types.WeekOfYearEven,
@@ -868,6 +877,7 @@
                                 const plVType = $propertyValue.typedInput('type');
                                 if (plVType === types.TimeEntered.value ||
                                     plVType === types.TimeSun.value ||
+                                    plVType === types.TimeSunCustom.value ||
                                     plVType === types.TimeMoon.value) {
                                     $row2a.hide(); // formatTS
                                     $row2b.show(); // format
@@ -925,8 +935,8 @@
                                         months:         getCheckboxesStr($divMonths.find('input[type=checkbox]:checked'), 12),
                                         onlyOddDays:    $cbOnlyEvenDays.is(':checked'),
                                         onlyEvenDays:   $cbOnlyOddDays.is(':checked'),
-                                        onlyOddWeeks:    $cbOnlyEvenWeeks.is(':checked'),
-                                        onlyEvenWeeks:   $cbOnlyOddWeeks.is(':checked'),
+                                        onlyOddWeeks:   $cbOnlyEvenWeeks.is(':checked'),
+                                        onlyEvenWeeks:  $cbOnlyOddWeeks.is(':checked'),
                                         noOffsetError:  true
                                     });
                                 }
@@ -1010,6 +1020,24 @@
                     $('#node-input-operand2Format').val($('#node-input-operand2Formatsel').val());
                     node.operand2Format = $('#node-input-operand2Formatsel').val();
                 }
+                if (node.operand1 === 'payload' && (!node.operand1Type || node.operand1Type === 'msg')) {
+                    node.operand1Type = 'msgPayload';
+                } else if (node.operand1  === 'ts' && (!node.operand1Type || node.operand1Type === 'msg')) {
+                    node.operand1Type = 'msgTs';
+                } else if (node.operand1  === 'lc' && (!node.operand1Type || node.operand1Type === 'msg')) {
+                    node.operand1Type = 'msgLC';
+                } else if (node.operand1  === 'value' && (!node.operand1Type || node.operand1Type === 'msg')) {
+                    node.operand1Type = 'msgValue';
+                }
+                if (node.operand2 === 'payload' && (!node.operand2Type || node.operand2Type === 'msg')) {
+                    node.operand2Type = 'msgPayload';
+                } else if (node.operand2  === 'ts' && (!node.operand2Type || node.operand2Type === 'msg')) {
+                    node.operand2Type = 'msgTs';
+                } else if (node.operand2  === 'lc' && (!node.operand2Type || node.operand2Type === 'msg')) {
+                    node.operand2Type = 'msgLC';
+                } else if (node.operand2  === 'value' && (!node.operand2Type || node.operand2Type === 'msg')) {
+                    node.operand2Type = 'msgValue';
+                }
                 // #region rule-container
                 node.rules = [];
                 const rules = $('#node-input-rule-container').editableList('items');
@@ -1038,6 +1066,7 @@
                 delete node.result1Offset;
                 delete node.result1OffsetType;
                 delete node.result1OffsetMultiplier;
+                delete node.operand;
 
                 const results = $('#node-input-result-container').editableList('items');
                 node.results = [];
diff --git a/nodes/61-time-span.js b/nodes/61-time-span.js
index 1b85a69f..ca57c04d 100644
--- a/nodes/61-time-span.js
+++ b/nodes/61-time-span.js
@@ -40,7 +40,6 @@
  * @property {ITimePropertyType} operand1      -   operand1 data
  * @property {ITimePropertyType} operand2      -   operand2 data
  * @property {number} operand                  -   operand
- * operand
  * @property {Array} results                -   output data
  * @property {Array} rules                  -   input data
  * @property {boolean|string} checkall      -   define if check all rules
@@ -59,12 +58,6 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
     const util = require('util');
     const hlp = require('./lib/dateTimeHelper.js');
 
-    const perSecond = 1000;
-    const perMinute = 60000;
-    const perHour = 3600000;
-    const perDay = 86400000;
-    const perWeek = 604800000;
-
     /**
      * get the differense between two month relative
      * @param {Date} d1 - Date 1
@@ -138,17 +131,17 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         }
 
         const tl = timeSpan;
-        const ts = Math.floor(timeSpan / perSecond);
-        const tm = Math.floor(timeSpan / perMinute);
-        const tH = Math.floor(timeSpan / perHour);
-        const td = Math.floor(timeSpan / perDay);
-        const tw = Math.floor(timeSpan / perWeek);
+        const ts = Math.floor(timeSpan / hlp.TIME_1s);
+        const tm = Math.floor(timeSpan / hlp.TIME_1min);
+        const tH = Math.floor(timeSpan / hlp.TIME_1h);
+        const td = Math.floor(timeSpan / hlp.TIME_24h);
+        const tw = Math.floor(timeSpan / hlp.TIME_WEEK);
 
         const l = timeSpan % 1000;
-        const s = Math.floor(timeSpan / perSecond) % 60;
-        const m = Math.floor(timeSpan / perMinute) % 60;
-        const H = Math.floor(timeSpan / perHour) % 24;
-        const d = Math.floor(timeSpan / perDay) % 7;
+        const s = Math.floor(timeSpan / hlp.TIME_1s) % 60;
+        const m = Math.floor(timeSpan / hlp.TIME_1min) % 60;
+        const H = Math.floor(timeSpan / hlp.TIME_1h) % 24;
+        const d = Math.floor(timeSpan / hlp.TIME_24h) % 7;
         const M = getMonthDiffAbs(d1, d2);
         const y = getYearDiffAbs(d1, d2);
 
@@ -226,15 +219,15 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         }
         switch (Number(format)) {
             case 1: // sec
-                return (timeSpan) / perSecond;
+                return (timeSpan) / hlp.TIME_1s;
             case 2: // min
-                return (timeSpan) / perMinute;
+                return (timeSpan) / hlp.TIME_1min;
             case 3: // hour
-                return (timeSpan) / perHour;
+                return (timeSpan) / hlp.TIME_1h;
             case 4: // days
-                return (timeSpan) / perDay;
+                return (timeSpan) / hlp.TIME_24h;
             case 5: // weeks
-                return (timeSpan) / perWeek;
+                return (timeSpan) / hlp.TIME_WEEK;
             case 6: // month
                 if (date1.getTime() > date2.getTime()) {
                     return getMonthDiff(date2, date1) * -1;
@@ -246,15 +239,15 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 }
                 return (getMonthDiff(date1, date2) / 12);
             case 11: // sec
-                return Math.floor((timeSpan) / perSecond);
+                return Math.floor((timeSpan) / hlp.TIME_1s);
             case 12: // min
-                return Math.floor((timeSpan) / perMinute);
+                return Math.floor((timeSpan) / hlp.TIME_1min);
             case 13: // hour
-                return Math.floor((timeSpan) / perHour);
+                return Math.floor((timeSpan) / hlp.TIME_1h);
             case 14: // days
-                return Math.floor((timeSpan) / perDay);
+                return Math.floor((timeSpan) / hlp.TIME_24h);
             case 15: // weeks
-                return Math.floor((timeSpan) / perWeek);
+                return Math.floor((timeSpan) / hlp.TIME_WEEK);
             case 16: // full month
                 if (date1.getTime() > date2.getTime()) {
                     return getMonthDiffAbs(date2, date1) * -1;
@@ -287,20 +280,20 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             timeSpan,
             timeSpanAbs: {
                 ms: timeSpan % 1000,
-                sec: Math.floor(timeSpan / perSecond) % 60,
+                sec: Math.floor(timeSpan / hlp.TIME_1s) % 60,
                 min: timeSpan % 1000,
-                hours: Math.floor(timeSpan / perHour) % 24,
-                days: Math.floor(timeSpan / perDay) % 7,
+                hours: Math.floor(timeSpan / hlp.TIME_1h) % 24,
+                days: Math.floor(timeSpan / hlp.TIME_24h) % 7,
                 month: getMonthDiffAbs(date1, date2),
                 years: getYearDiffAbs(date1, date2)
             },
             timeSpanRel: {
                 ms: timeSpan,
-                sec: (timeSpan / perSecond),
-                min: (timeSpan / perMinute),
-                hour: (timeSpan / perHour),
-                day: (timeSpan / perDay),
-                week: (timeSpan / perWeek),
+                sec: (timeSpan / hlp.TIME_1s),
+                min: (timeSpan / hlp.TIME_1min),
+                hour: (timeSpan / hlp.TIME_1h),
+                day: (timeSpan / hlp.TIME_24h),
+                week: (timeSpan / hlp.TIME_WEEK),
                 month: getMonthDiff(date1, date2),
                 year:  getMonthDiff(date1, date2) / 12
             }
@@ -323,33 +316,43 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         node.positionConfig = RED.nodes.getNode(config.positionConfig);
         if (!node.positionConfig) {
             node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
-            node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing') });
+            node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing-state') });
             return;
         }
         if (node.positionConfig.checkNode(
             error => {
-                node.error(error);
-                node.status({fill: 'red', shape: 'dot', text: error });
+                const text = RED._('node-red-contrib-sun-position/position-config:errors.config-error', { error });
+                node.error(text);
+                node.status({fill: 'red', shape: 'dot', text });
+                return true;
             }, false)) {
             return;
         }
         node.operand1 = {
             type: config.operand1Type,
             value: config.operand1,
+            next: hlp.isTrue(config.operand1Next),
             format: config.operand1Format,
             offsetType: config.operand1OffsetType,
             offset: config.operand1Offset,
             multiplier: config.operand1OffsetMultiplier
         };
+        if (node.operand1.type !== 'entered' && node.operand1.type !== 'pdsTime' && node.operand1.type !== 'pdsTimeCustom' && node.operand1.type !== 'pdmTime') {
+            node.operand1.next = false;
+        }
 
         node.operand2 = {
             type: config.operand2Type,
             value: config.operand2,
+            next: hlp.isTrue(config.operand2Next),
             format: config.operand2Format,
             offsetType: config.operand2OffsetType,
             offset: config.operand2Offset,
             multiplier: config.operand2OffsetMultiplier
         };
+        if (node.operand2.type !== 'entered' && node.operand2.type !== 'pdsTime' && node.operand2.type !== 'pdsTimeCustom' && node.operand2.type !== 'pdmTime') {
+            node.operand2.next = false;
+        }
 
         if (!Array.isArray(config.results)) {
             config.results = [];
@@ -393,20 +396,23 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 format          : prop.f,
                 offsetType      : prop.oT,
                 offset          : prop.o,
-                multiplier      : prop.oM,
+                multiplier      : parseFloat(prop.oM) || 60000,
                 outTSFormat     : prop.fTs,
                 next            : (typeof prop.next === 'undefined' || prop.next === null || hlp.isTrue(prop.next)) ? true : false,
                 days            : prop.days,
                 months          : prop.months,
-                onlyEvenDays    : prop.onlyEvenDays,
-                onlyOddDays     : prop.onlyOddDays,
-                onlyEvenWeeks   : prop.onlyEvenWeeks,
-                onlyOddWeeks    : prop.onlyOddWeeks
+                onlyEvenDays    : prop.onlyEvenDays === 'true' || prop.onlyEvenDays === true,
+                onlyOddDays     : prop.onlyOddDays === 'true' || prop.onlyOddDays === true,
+                onlyEvenWeeks   : prop.onlyEvenWeeks === 'true' || prop.onlyEvenWeeks === true,
+                onlyOddWeeks    : prop.onlyOddWeeks === 'true' || prop.onlyOddWeeks === true
             };
+            if (propNew.type !== 'entered' && propNew.type !== 'pdsTime' && propNew.type !== 'pdsTimeCustom' && propNew.type !== 'pdmTime') {
+                propNew.next = false;
+            }
 
             if (node.positionConfig && propNew.type === 'jsonata') {
                 try {
-                    propNew.expr = node.positionConfig.getJSONataExpression(this, propNew.value);
+                    propNew.expr = node.positionConfig.getJSONataExpression(node, propNew.value);
                 } catch (err) {
                     node.error(RED._('node-red-contrib-sun-position/position-config:errors.invalid-expr', { error: err.message }));
                     propNew.expr = null;
@@ -414,9 +420,46 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
             node.results.push(propNew);
         });
-        node.operand = config.operand;
+        node.checkall = config.checkall === 'true' || config.checkall === true;
         node.rules = config.rules;
-        node.checkall = config.checkall;
+        const rulesLength = node.rules.length;
+        for (let i = 0; i < rulesLength; ++i) {
+            const rule = node.rules[i];
+            rule.operator = Number(rule.operator);
+
+            if (rule.operator === 99) {
+                rule.next = false;
+            } else {
+                if (rule.operandType !== 'entered' && rule.operandType !== 'pdsTime' && rule.operandType !== 'pdsTimeCustom' && rule.operandType !== 'pdmTime') {
+                    rule.next = false;
+                }
+            }
+            rule.compare = null;
+            rule.result = false;
+            switch (rule.operator) {
+                case 1: // equal             { id: 1, group: "ms", label: "==", "text": "equal" },
+                    rule.compare = (op1, op2) => op1 === op2;
+                    break;
+                case 2: // unequal           { id: 2, group: "ms", label: "!=", "text": "unequal" },
+                    rule.compare = (op1, op2) => op1 !== op2;
+                    break;
+                case 3: // greater           { id: 3, group: "ms", label: ">", "text": "greater" },
+                    rule.compare = (op1, op2) => op1 > op2;
+                    break;
+                case 4: // greaterOrEqual    { id: 5, group: "ms", label: ">=", "text": "greater or equal" },
+                    rule.compare = (op1, op2) => op1 >= op2;
+                    break;
+                case 5: // lesser            { id: 6, group: "ms", label: "<", "text": "lesser" },
+                    rule.compare = (op1, op2) => op1 < op2;
+                    break;
+                case 6: // lesserOrEqual     { id: 7, group: "ms", label: "<=", "text": "lesser or equal" },
+                    rule.compare = (op1, op2) => op1 <= op2;
+                    break;
+                case 99: // otherwise
+                    rule.result = true;
+                    break;
+            }
+        }
 
         node.on('input', (msg, send, done) => {
             // If this is pre-1.0, 'done' will be undefined
@@ -452,21 +495,17 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 // node.debug('operand1=' + util.inspect(operand1, { colors: true, compact: 10, breakLength: Infinity }));
                 // node.debug('operand2=' + util.inspect(operand2, { colors: true, compact: 10, breakLength: Infinity }));
 
-                let timeSpan = operand1.value.getTime() - operand2.value.getTime();
-                if (node.operand === 0) {
-                    timeSpan = Math.abs(timeSpan);
-                }
-
                 for (let i = 0; i < node.results.length; i++) {
                     const prop = node.results[i];
                     // node.debug(`prepOutMsg-${i} node.results[${i}]=${util.inspect(prop, { colors: true, compact: 10, breakLength: Infinity })}`);
+
                     let resultObj = null;
                     if (prop.type === 'timespan') {
                         resultObj = getFormattedTimeSpanOut(node, operand1.value, operand2.value, prop.outTSFormat);
                     } else if (prop.type === 'operand1') {
-                        resultObj = node.positionConfig.formatOutDate(this, msg, operand1.value, prop);
+                        resultObj = node.positionConfig.formatOutDate(node, msg, operand1.value, prop);
                     } else if (prop.type === 'operand2') {
-                        resultObj = node.positionConfig.formatOutDate(this, msg, operand2.value, prop);
+                        resultObj = node.positionConfig.formatOutDate(node, msg, operand2.value, prop);
                     } else {
                         resultObj = node.positionConfig.getOutDataProp(node, msg, prop, dNow);
                     }
@@ -476,48 +515,29 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     } else if (resultObj.error) {
                         node.error('error on getting result: "' + resultObj.error + '"');
                     } else {
-                        node.positionConfig.setMessageProp(this, msg, prop.outType, prop.outValue, resultObj);
+                        node.positionConfig.setMessageProp(node, msg, prop.outType, prop.outValue, resultObj);
                     }
                     // node.debug(`prepOutMsg-${i} msg=${util.inspect(msg, { colors: true, compact: 10, breakLength: Infinity })}`);
                 }
 
+                const timeSpan = operand1.value.getTime() - operand2.value.getTime();
+
                 const resObj = [];
-                const rulesLength = node.rules.length;
                 for (let i = 0; i < rulesLength; ++i) {
-                    const rule =  node.rules[i];
+                    const rule = node.rules[i];
                     try {
-                        let ruleoperand = node.positionConfig.getFloatProp(node, msg, rule.operandType, rule.operandValue, 0);
-                        if (!isNaN(rule.multiplier) && rule.multiplier !== 0) {
-                            ruleoperand = ruleoperand * rule.multiplier;
-                        }
-
-                        let result = false;
-                        switch (parseInt(rule.operator)) {
-                            case 1: // equal
-                                result = (timeSpan === ruleoperand);
-                                break;
-                            case 2: // unequal
-                                result = (timeSpan !== ruleoperand);
-                                break;
-                            case 3: // greater
-                                result = (timeSpan > ruleoperand);
-                                break;
-                            case 4: // greaterOrEqual
-                                result = (timeSpan >= ruleoperand);
-                                break;
-                            case 5: // lesser
-                                result = (timeSpan < ruleoperand);
-                                break;
-                            case 6: // lesserOrEqual
-                                result = (timeSpan <= ruleoperand);
-                                break;
-                            case 99: // otherwise
-                                result = true;
-                                break;
+                        rule.result =  rule.operator === 99;
+                        if (rule.compare) {
+                            let ruleoperand = node.positionConfig.getFloatProp(node, msg,
+                                { type: rule.operandType, value: rule.operandValue, def: 0 });
+                            if (!isNaN(rule.multiplier) && rule.multiplier !== 0) {
+                                ruleoperand = ruleoperand * rule.multiplier;
+                            }
+                            rule.result = rule.compare(timeSpan, ruleoperand);
                         }
-                        if (result) {
+                        if (rule.result) {
                             resObj.push(msg);
-                            if (node.checkall != 'true') { // eslint-disable-line eqeqeq
+                            if (!node.checkall) { // eslint-disable-line eqeqeq
                                 break;
                             }
                         } else {
@@ -560,6 +580,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             }
             return null;
         });
+        node.status({});
     }
 
     RED.nodes.registerType('time-span', timeSpanNode);
diff --git a/nodes/80-blind-control.html b/nodes/80-blind-control.html
index 465f8138..69996682 100644
--- a/nodes/80-blind-control.html
+++ b/nodes/80-blind-control.html
@@ -22,18 +22,26 @@
 -->
 
 <script type="text/javascript">
-    // @ts-cehck
     /* eslint-env browser es6 */
     // Isolate this code
     (function() {
         'use strict';
+        /// <reference path="./types/typedefs.js" />
+        /// <reference lib="./static/htmlglobal.js" />
+
         /** --- Type Defs ---
          * @typedef {import("node-red").Red} Red
          */
+
         const cNBC_MODE_OFF = 0;
         const cNBC_MODE_MAXIMIZE = 1;
         const cNBC_MODE_MINIMIZE = 3;
         const cNBC_MODE_SUN_CONTROL = 16;
+        const cNBC_RULE_EXEC = {
+            auto: 0,
+            first:1,
+            last:2
+        };
         const cNBC_RULE_TYPE_UNTIL = 0;
         const cNBC_RULE_TYPE_FROM = 1;
         const cNBC_RULE_OP = {
@@ -71,6 +79,7 @@
         }
 
         /** @type {Red} */
+        // @ts-ignore
         RED.nodes.registerType('blind-control', {
             category: 'time and astro',
             color: '#FFCC66',
@@ -91,6 +100,7 @@
                 },
                 addId: {
                     value: '',
+                    // @ts-ignore
                     validate: RED.validators.typedInput('addIdType')
                 },
                 positionConfig: {
@@ -104,7 +114,9 @@
                     validate(v) {
                         const n = parseFloat(v);
                         return (typeof v === 'undefined') ||
-                               (RED.validators.number()(v) && (n >= 60000) && (n < 0x7FFFFFFF));
+                        // @ts-ignore
+                               (RED.validators.number()(v) &&
+                               (n >= 60000) && (n < 0x7FFFFFFF));
                     }
                 },
                 startDelayTime: {
@@ -112,7 +124,9 @@
                     validate(v) {
                         const n = parseFloat(v);
                         return (typeof v === 'undefined') ||
-                               (RED.validators.number()(v) && (n >= 0) && (n < 0x7FFFFFFF));
+                        // @ts-ignore
+                               (RED.validators.number()(v) &&
+                               (n >= 0) && (n < 0x7FFFFFFF));
                     },
                     required: false
                 },
@@ -152,7 +166,7 @@
                     validate(v) {
                         const n = parseFloat(v);
                         const mm = getMinMaxBlindPos(this);
-
+                        // @ts-ignore
                         return (RED.validators.number()(v) &&
                                 (n < mm.max) &&
                                 (n > 0));
@@ -163,6 +177,7 @@
                     required: true,
                     validate(v) {
                         const n = parseFloat(v);
+                        // @ts-ignore
                         return RED.validators.number()(v) &&
                                 (Number.isInteger(n / parseFloat(getVal(this, 'blindIncrement')))) &&
                                 (n !== parseFloat(getVal(this, 'blindClosedPos')));
@@ -173,6 +188,7 @@
                     required: true,
                     validate(v) {
                         const n = parseFloat(v);
+                        // @ts-ignore
                         return RED.validators.number()(v) &&
                                 (Number.isInteger(n / parseFloat(getVal(this, 'blindIncrement')))) &&
                                 (n !== parseFloat(getVal(this, 'blindOpenPos')));
@@ -183,6 +199,7 @@
                 },
                 blindPosDefault: {
                     value: 'open (max)',
+                    // @ts-ignore
                     validate: RED.validators.typedInput('blindPosDefaultType')
                 },
                 blindPosDefaultType: {
@@ -190,6 +207,7 @@
                 },
                 slatPosDefault: {
                     value: '',
+                    // @ts-ignore
                     validate: RED.validators.typedInput('slatPosDefaultType')
                 },
                 slatPosDefaultType: {
@@ -204,6 +222,7 @@
                         const n = parseFloat(v);
                         return (typeof v === 'undefined') ||
                                (v === '') ||
+                               // @ts-ignore
                                (RED.validators.number()(v) && (n >= 200) && (n < 0x7FFFFFFF));
                     }
                 },
@@ -219,6 +238,7 @@
                     required: true,
                     validate(v) {
                         const n = Number(v);
+                        // @ts-ignore
                         return (RED.validators.number()(v) &&
                                 ((n === cNBC_MODE_OFF) || (n === cNBC_MODE_MINIMIZE) || (n === cNBC_MODE_MAXIMIZE) || (n === cNBC_MODE_SUN_CONTROL)));
                     }
@@ -234,6 +254,7 @@
                         return (mode === cNBC_MODE_OFF) ||
                                 (mode === cNBC_MODE_MAXIMIZE) ||
                                 (mode === cNBC_MODE_MINIMIZE) ||
+                                // @ts-ignore
                                 RED.validators.typedInput('sunFloorLengthType')(v);
                     }
                 },
@@ -257,6 +278,7 @@
                     value: 'closed (min)',
                     validate(v) {
                         return ((Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
+                                // @ts-ignore
                                 RED.validators.typedInput('blindPosMinType')(v));
                     }
                 },
@@ -267,6 +289,7 @@
                     value: 'open (max)',
                     validate(v) {
                         return ((Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
+                                // @ts-ignore
                                 RED.validators.typedInput('blindPosMaxType')(v));
                     }
                 },
@@ -281,6 +304,7 @@
                         const n = parseFloat(v);
                         const mm = getMinMaxBlindPos(this);
                         return n === 0.00 ||
+                            // @ts-ignore
                             (RED.validators.number()(v) &&
                             (Number.isInteger(n / parseFloat(getVal(this, 'blindIncrement')))) &&
                             (n < mm.max) &&
@@ -295,6 +319,7 @@
                         const n = parseFloat(v);
                         const mm = getMinMaxBlindPos(this);
                         return n === 0.00 ||
+                            // @ts-ignore
                             (RED.validators.number()(v) &&
                             (Number.isInteger(n / parseFloat(getVal(this, 'blindIncrement')))) &&
                             (n < mm.max) &&
@@ -303,6 +328,7 @@
                 },
                 sunSlat: {
                     value: '',
+                    // @ts-ignore
                     validate: RED.validators.typedInput('sunSlatType')
                 },
                 sunSlatType: {
@@ -314,6 +340,7 @@
                         const n = parseFloat(v);
                         return ((Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
                                 (v === '') ||
+                                // @ts-ignore
                                 (RED.validators.number()(v) && (n > -2147483647) && (n < 0x7FFFFFFF)));
                     }
                 },
@@ -330,6 +357,7 @@
                     value: '',
                     validate(v) {
                         return (Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
+                                // @ts-ignore
                                 RED.validators.typedInput('blindPosMaxType')(v);
                     }
                 },
@@ -340,9 +368,13 @@
                     value: '',
                     validate(v) {
                         return (Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
+                                // @ts-ignore
                                 RED.validators.typedInput('blindPosMaxType')(v);
                     }
                 },
+                windowSetMode: {
+                    value: 'startEnd'
+                },
                 windowAzimuthStartType: {
                     value: 'numAzimuth'
                 },
@@ -350,6 +382,8 @@
                     value: '',
                     validate(v) {
                         return (Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
+                                getVal(this, 'windowSetMode') !== 'startEnd' ||
+                                // @ts-ignore
                                 RED.validators.typedInput('windowAzimuthStartType')(v);
                     }
                 },
@@ -360,9 +394,45 @@
                     value: '',
                     validate(v) {
                         return (Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
+                                getVal(this, 'windowSetMode') !== 'startEnd' ||
+                                // @ts-ignore
                                 RED.validators.typedInput('windowAzimuthEndType')(v);
                     }
                 },
+                windowOrientationType: {
+                    value: 'numAzimuth'
+                },
+                windowOrientation: {
+                    value: '',
+                    validate(v) {
+                        return (Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
+                                getVal(this, 'windowSetMode') !== 'orientation' ||
+                                // @ts-ignore
+                                RED.validators.typedInput('windowOrientationType')(v);
+                    }
+                },
+                windowOffsetN: {
+                    value: '',
+                    validate(v) {
+                        const n = parseFloat(v);
+                        return (Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
+                                getVal(this, 'windowSetMode') !== 'orientation' ||
+                                v==='' ||
+                                // @ts-ignore
+                                RED.validators.number()(v) && (n >= 0) && (n <= 90);
+                    }
+                },
+                windowOffsetP: {
+                    value: '',
+                    validate(v) {
+                        const n = parseFloat(v);
+                        return (Number(getVal(this, 'sunControlMode')) === cNBC_MODE_OFF) ||
+                                getVal(this, 'windowSetMode') !== 'orientation' ||
+                                v==='' ||
+                                // @ts-ignore
+                                RED.validators.number()(v) && (n >= 0) && (n <= 90);
+                    }
+                },
                 // #endregion window settings
                 // #region oversteering settings
                 oversteers: {
@@ -543,10 +613,12 @@
                 const node = this;
 
                 const $nodeInputContextStore = $('#node-input-contextStore');
+                // @ts-ignore
                 RED.settings.context.stores.forEach(store => {
                     $nodeInputContextStore.append('<option value="' + store + '"' + (this.contextStore === store ? ' selected' : '') + '>' + store + '</option>');
                 });
 
+                // @ts-ignore
                 const tabs = RED.tabs.create({
                     id: 'node-config-blind-control-tabs',
                     onchange(tab) {
@@ -564,11 +636,11 @@
                     $('#node-input-sunControlMode').val(cNBC_MODE_SUN_CONTROL);
                 }
 
-                node.dialogAddData = {};
+                node.dialogAddData = { time:{ start:{ min:{}, max:{} }, end:{ min:{}, max:{} } }, timeReg:{} };
                 const setup = function(node) {
                     /* global getTypes getSelectFields setupTInput appendOptions addLabel getBackendData bdDateToTime initCheckboxesBlock getCheckboxesStr setTInputValue */
                     // #region initialize
-                    const types = getTypes(node);
+                    const types = getTypes(node, () => $nodeConfig.val());
                     types.LevelEntered = {
                         value: 'num',
                         label: node._('node-red-contrib-sun-position/position-config:common.types.levelfree'),
@@ -668,7 +740,25 @@
                         label: node._('node-red-contrib-sun-position/position-config:common.types.ctrlObj'),
                         hasValue: false
                     };
+                    types.OutputCtrlObj = {
+                        value: 'ctrlObj',
+                        label: node._('node-red-contrib-sun-position/position-config:common.types.ctrlObj'),
+                        hasValue: false
+                    };
+                    types.OutputCtrlObj = {
+                        value: 'ctrlObj',
+                        label: node._('node-red-contrib-sun-position/position-config:common.types.ctrlObj'),
+                        hasValue: false
+                    };
+                    types.UndefinedTimeFrom = Object.assign({}, types.Undefined, {
+                        label: node._('node-red-contrib-sun-position/position-config:common.types.undefinedTimeFrom')
+                    });
+                    types.UndefinedTimeUntil = Object.assign({}, types.Undefined, {
+                        label: node._('node-red-contrib-sun-position/position-config:common.types.undefinedTimeUntil')
+                    });
+
                     const selFields = getSelectFields();
+
                     /**
                      * save rules
                      * @param {*} node - the node representation
@@ -819,13 +909,22 @@
                         types: ['num', types.MsgValue, types.MsgPayloadByTopic, 'msg', 'flow', 'global', 'env']
                     });
 
+                    $('#node-input-windowSetMode').on('change focus focusout', () => {
+                        $('#node-input-sunControlMode').change();
+                    });
+
+                    if (node.windowSetMode !== 'orientation' && node.windowSetMode !== 'startEnd') {
+                        node.windowSetMode = 'startEnd';
+                        $('#node-input-windowSetMode').val('startEnd');
+                    }
+
                     setupTInput(node, {
                         typeProp: 'windowAzimuthStartType',
                         valueProp: 'windowAzimuthStart',
                         width: 'calc(100% - 110px)',
                         defaultType: types.numAzimuth.value,
                         defaultValue: '',
-                        types: [types.numAzimuth, types.MsgValue, types.MsgPayloadByTopic, 'msg', 'flow', 'global', 'env']
+                        types: [types.numAzimuth, types.numAnglePreDef, types.MsgValue, types.MsgPayloadByTopic, 'msg', 'flow', 'global', 'env']
                     });
 
                     setupTInput(node, {
@@ -834,7 +933,16 @@
                         width: 'calc(100% - 110px)',
                         defaultType: types.numAzimuth.value,
                         defaultValue: '',
-                        types: [types.numAzimuth, types.MsgValue, types.MsgPayloadByTopic, 'msg', 'flow', 'global', 'env']
+                        types: [types.numAzimuth, types.numAnglePreDef, types.MsgValue, types.MsgPayloadByTopic, 'msg', 'flow', 'global', 'env']
+                    });
+
+                    setupTInput(node, {
+                        typeProp: 'windowOrientationType',
+                        valueProp: 'windowOrientation',
+                        width: 'calc(100% - 110px)',
+                        defaultType: types.numAzimuth.value,
+                        defaultValue: '',
+                        types: [types.numAzimuth, types.numAnglePreDef, types.MsgValue, types.MsgPayloadByTopic, 'msg', 'flow', 'global', 'env']
                     });
 
                     setupTInput(node, {
@@ -847,7 +955,7 @@
                     });
                     // #endregion blind
                     // #region rules
-                    const ruleVersion = 3;
+                    const ruleVersion = 4;
                     /**
                      * get a time in millisecond as string of the format hh:mm, hh:mm:ss or hh:mm:ss.mss
                      * @param {number} s - milisecond
@@ -942,17 +1050,30 @@
                         let result = '';
                         const length = (enh) ? 60 : 30;
                         try {
-                            if (typeof data.isValid === 'undefined' || typeof data.version === 'undefined' || (!data.isValid && (typeof data.valid === 'undefined' || Object.keys(data.valid).length === 0))) {
+                            if (typeof data.isValid === 'undefined' || typeof data.version === 'undefined' || (!data.isValid && !data.validationError && typeof data.validation === 'undefined')) {
                                 result += '<div>';
                                 result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.outDated');
                                 result += '</div>';
                             } else if (!data.isValid) {
                                 result += '<div>';
                                 result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.isInValid');
+                                result += '</div><div>';
+                                result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleInValidText');
+                                result += data.validationError;
                                 result += '</div>';
-                                if (data.valid && Object.keys(data.valid).length > 0) {
+                                if (data.validation && Object.keys(data.validation).length > 0) {
+                                    const lines = JSON.stringify(data.validation,
+                                        (key, value) => {
+                                            if (value === true || (Array.isArray(value) && value.length === 0) || (typeof value === 'object' && Object.keys(value).length === 0))
+                                                return undefined;
+                                            if (value === false)
+                                                return node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleInValidElement');
+                                            return value;
+                                        }, '\t').split('\n');
+                                    lines.splice(0,1); // remove first line
+                                    lines.pop(); // remove last line
                                     result += '<div><pre>';
-                                    result += JSON.stringify(data.valid, null, '\t');
+                                    result += lines.join('\n');
                                     result += '</pre></div>';
                                 }
                             }
@@ -970,10 +1091,10 @@
                                     if (addBrac && i > 0 && i < l) {
                                         result += '(&nbsp;';
                                     }
-                                    if (cond.valueType === 'sunControlMode') {
-                                        result += 'Mode is <var>' + cond.value + '</var>';
-                                    } else if (cond.valueType === 'pdmPhaseCheck') {
+                                    if (cond.valueType === 'pdmPhaseCheck') {
                                         result += 'Moon phase is <var>' + cond.value + '</var>';
+                                    } else if (cond.valueType === 'sunControlMode') {
+                                        result += 'Mode is <var>' + cond.value + '</var>';
                                     } else {
                                         result += '<var>' + RED.nodes.getType('position-config').getRDGNodeValLbl(node, cond.valueType, cond.value, null, null, null, length) + '</var>';
                                         result += ' ' + cond.operatorText;
@@ -1004,154 +1125,159 @@
                                 result += '</div>';
                             }
                             if (data.time) {
-                                if (data.time.type && data.timeType !== 'none') {
-                                    result += '<div>';
-                                    result += '<i class="fa fa-clock-o" aria-hidden="true"></i> ';
-                                    result += data.time.operatorText;
-                                    result += ' <var>' + RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.time.type, data.time.value, null, null, null, length) + '</var>';
-                                    result += _getOffsetText(node, data.time.offsetType, data.time.offset, data.time.multiplier);
-                                    if (enh && enh.timeReg && enh.timeReg.text) {
-                                        result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.timeReg.text + '</code>]</span>';
-                                    }
+                                const gettime = (ttype, text) => {
+                                    if (data.time[ttype] && data.time[ttype].type && data.timeType !== 'none') {
+                                        result += '<div>';
+                                        result += '<i class="fa fa-clock-o" aria-hidden="true"></i> ';
+                                        result += text;
+                                        result += ' <var>' + RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.time[ttype].type, data.time[ttype].value, null, null, null, length) + '</var>';
+                                        result += _getOffsetText(node, data.time[ttype].offsetType, data.time[ttype].offset, data.time[ttype].multiplier);
+                                        if (enh && enh.timeReg && enh.timeReg.text) {
+                                            result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.timeReg.text + '</code>]</span>';
+                                        }
 
-                                    if (data.timeMin && data.timeMin.type && data.timeMin.type !== 'none') {
-                                        result += '<div class="indent-time-text"><i class="fa fa-step-backward" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin');
-                                        result += '</span> <var>';
-                                        result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.timeMin.type, data.timeMin.value, null, null, null, length);
-                                        result += '</var>';
-                                        result += _getOffsetText(node, data.timeMin.offsetType, data.timeMin.offset, data.timeMin.multiplier);
-                                        if (enh && enh.timeMin && enh.timeMin.text) {
-                                            result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.timeMin.text + '</code>]</span>';
+                                        if (data.time[ttype].min && data.time[ttype].min.type && data.time[ttype].min.type !== 'none') {
+                                            result += '<div class="indent-time-text"><i class="fa fa-step-backward" aria-hidden="true"></i> <span>';
+                                            result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin_'+ttype);
+                                            result += '</span> <var>';
+                                            result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.time[ttype].min.type, data.time[ttype].min.value, null, null, null, length);
+                                            result += '</var>';
+                                            result += _getOffsetText(node, data.time[ttype].min.offsetType, data.time[ttype].min.offset, data.time[ttype].min.multiplier);
+                                            if (enh && enh.time[ttype].min && enh.time[ttype].min.text) {
+                                                result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.time[ttype].min.text + '</code>]</span>';
+                                            }
+                                            result += '</div>';
                                         }
-                                        result += '</div>';
-                                    }
-                                    if (data.timeMax && data.timeMax.type && data.timeMax.type !== 'none') {
-                                        result += '<div class="indent-time-text"><i class="fa fa-step-forward" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax');
-                                        result += '</span> <var>';
-                                        result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.timeMax.type, data.timeMax.value, null, null, null, length);
-                                        result += '</var>';
-                                        result += _getOffsetText(node, data.timeMax.offsetType, data.timeMax.offset, data.timeMax.multiplier);
-                                        if (enh && enh.timeMax && enh.timeMax.text) {
-                                            result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.timeMax.text + '</code>]</span>';
+                                        if (data.time[ttype].max && data.time[ttype].max.type && data.time[ttype].max.type !== 'none') {
+                                            result += '<div class="indent-time-text"><i class="fa fa-step-forward" aria-hidden="true"></i> <span>';
+                                            result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax_'+ttype);
+                                            result += '</span> <var>';
+                                            result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.time[ttype].max.type, data.time[ttype].max.value, null, null, null, length);
+                                            result += '</var>';
+                                            result += _getOffsetText(node, data.time[ttype].max.offsetType, data.time[ttype].max.offset, data.time[ttype].max.multiplier);
+                                            if (enh && enh.time[ttype].max && enh.time[ttype].max.text) {
+                                                result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.time[ttype].max.text + '</code>]</span>';
+                                            }
+                                            result += '</div>';
                                         }
                                         result += '</div>';
                                     }
-                                    if (data.time.days && data.time.days !== '*') {
-                                        result += '<div class="indent-time-days"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeDays');
-                                        result += '</span> <var>';
-                                        const daysarr = data.time.days.split(',');
-                                        if (daysarr.length === 1) {
-                                            result += (node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[0]) + 7)));
-                                        } else if (data.time.days === '5,6,0') {
-                                            result += node._('node-red-contrib-sun-position/position-config:common.days.12');
-                                            result += '-';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.days.7');
-                                        } else if (daysarr.length === 2) {
-                                            result += node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[0]) + 7));
-                                            result += ' ';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.label.and');
-                                            result += ' ';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[1]) + 7));
+                                };
+                                gettime('start',node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeStart'));
+                                gettime('end',node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeEnd'));
+                                result += '<div>';
+                                if (data.time.days && data.time.days !== '*') {
+                                    result += '<div class="indent-time-days"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeDays');
+                                    result += '</span> <var>';
+                                    const daysarr = data.time.days.split(',');
+                                    if (daysarr.length === 1) {
+                                        result += (node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[0]) + 7)));
+                                    } else if (data.time.days === '5,6,0') {
+                                        result += node._('node-red-contrib-sun-position/position-config:common.days.12');
+                                        result += '-';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.days.7');
+                                    } else if (daysarr.length === 2) {
+                                        result += node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[0]) + 7));
+                                        result += ' ';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.label.and');
+                                        result += ' ';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[1]) + 7));
+                                    } else {
+                                        daysarr.sort((a, b) => parseInt(a) - parseInt(b));
+                                        let isok = true;
+                                        let elF = parseInt(daysarr[0]);
+                                        daysarr[0] = node._('node-red-contrib-sun-position/position-config:common.days.'+(elF + 7));
+                                        for (let index = 1; index < daysarr.length; index++) {
+                                            const element = parseInt(daysarr[index]);
+                                            isok = isok && (element === elF+1);
+                                            elF = element;
+                                            daysarr[index] = node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(element) + 7));
+                                        }
+                                        if (isok) {
+                                            result += (daysarr[0] + '-' + daysarr[daysarr.length-1]);
                                         } else {
-                                            daysarr.sort((a, b) => parseInt(a) - parseInt(b));
-                                            let isok = true;
-                                            let elF = parseInt(daysarr[0]);
-                                            daysarr[0] = node._('node-red-contrib-sun-position/position-config:common.days.'+(elF + 7));
-                                            for (let index = 1; index < daysarr.length; index++) {
-                                                const element = parseInt(daysarr[index]);
-                                                isok = isok && (element === elF+1);
-                                                elF = element;
-                                                daysarr[index] = node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(element) + 7));
-                                            }
-                                            if (isok) {
-                                                result += (daysarr[0] + '-' + daysarr[daysarr.length-1]);
-                                            } else {
-                                                result += (daysarr.join(','));
-                                            }
+                                            result += (daysarr.join(','));
                                         }
-                                        result += '</var></div>';
                                     }
-                                    if (data.time.onlyEvenDays || data.time.onlyOddDays || data.time.onlyEvenWeeks || data.time.onlyOddWeeks) {
-                                        result += '<div class="indent-time-special"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimit');
-                                        result += '</span> <var>';
-                                        const resultArr = [];
-                                        if (data.time.onlyEvenDays) {
-                                            resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyEvenDays'));
-                                        }
-                                        if (data.time.onlyOddDays) {
-                                            resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyOddDays'));
-                                        }
-                                        if (data.time.onlyEvenWeeks) {
-                                            resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyEvenWeeks'));
-                                        }
-                                        if (data.time.onlyOddWeeks) {
-                                            resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyOddWeeks'));
-                                        }
-                                        result += resultArr.join(' <b>' + node._('node-red-contrib-sun-position/position-config:common.label.and') + '</b> ');
-                                        result += '</var></div>';
+                                    result += '</var></div>';
+                                }
+                                if (data.time.onlyEvenDays || data.time.onlyOddDays || data.time.onlyEvenWeeks || data.time.onlyOddWeeks) {
+                                    result += '<div class="indent-time-special"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimit');
+                                    result += '</span> <var>';
+                                    const resultArr = [];
+                                    if (data.time.onlyEvenDays) {
+                                        resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyEvenDays'));
                                     }
-                                    if (data.time.months && data.time.months !== '*') {
-                                        result += '<div class="indent-time-months"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMonths');
-                                        result += '</span> <var>';
-                                        const montharr = data.time.months.split(',');
-                                        if (montharr.length === 2) {
-                                            result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[0]) + 12));
-                                            result += ' ';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.label.and');
-                                            result += ' ';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[1]) + 12));
-                                        } else if (montharr.length === 1) {
-                                            result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[0]) + 12));
-                                        } else {
-                                            montharr.sort((a, b) => parseInt(a) - parseInt(b));
-                                            let isok = true;
-                                            let elF = parseInt(montharr[0]);
-                                            montharr[0] = node._('node-red-contrib-sun-position/position-config:common.months.'+(elF + 12));
-                                            for (let index = 1; index < montharr.length; index++) {
-                                                const element = parseInt(montharr[index]);
-                                                isok = isok && (element === elF+1);
-                                                elF = element;
-                                                montharr[index] = node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(element) + 12));
-                                            }
-                                            if (isok) {
-                                                result += montharr[0];
-                                                result += '-';
-                                                result += montharr[montharr.length-1];
-                                            } else {
-                                                result += montharr.join(',');
-                                            }
-                                        }
-                                        result += '</var></div>';
+                                    if (data.time.onlyOddDays) {
+                                        resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyOddDays'));
                                     }
-
-                                    if (data.time.dateStart || data.time.dateEnd) {
-                                        result += '<div class="indent-time-datelimit"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimitStart');
-                                        result += '</span> <var>';
-                                        if (enh) {
-                                            const year = (new Date()).getFullYear();
-                                            result += data.time.dateStart || year + '-01-01';
-                                        } else {
-                                            result += (getDateShort(data.time.dateStart) || '01-01');
+                                    if (data.time.onlyEvenWeeks) {
+                                        resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyEvenWeeks'));
+                                    }
+                                    if (data.time.onlyOddWeeks) {
+                                        resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyOddWeeks'));
+                                    }
+                                    result += resultArr.join(' <b>' + node._('node-red-contrib-sun-position/position-config:common.label.and') + '</b> ');
+                                    result += '</var></div>';
+                                }
+                                if (data.time.months && data.time.months !== '*') {
+                                    result += '<div class="indent-time-months"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMonths');
+                                    result += '</span> <var>';
+                                    const montharr = data.time.months.split(',');
+                                    if (montharr.length === 2) {
+                                        result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[0]) + 12));
+                                        result += ' ';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.label.and');
+                                        result += ' ';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[1]) + 12));
+                                    } else if (montharr.length === 1) {
+                                        result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[0]) + 12));
+                                    } else {
+                                        montharr.sort((a, b) => parseInt(a) - parseInt(b));
+                                        let isok = true;
+                                        let elF = parseInt(montharr[0]);
+                                        montharr[0] = node._('node-red-contrib-sun-position/position-config:common.months.'+(elF + 12));
+                                        for (let index = 1; index < montharr.length; index++) {
+                                            const element = parseInt(montharr[index]);
+                                            isok = isok && (element === elF+1);
+                                            elF = element;
+                                            montharr[index] = node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(element) + 12));
                                         }
-                                        result += '</var> <span> ';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimitEnd');
-                                        result += '</span> <var>';
-                                        if (enh) {
-                                            const year = (new Date()).getFullYear();
-                                            result += data.time.dateEnd || year + '-12-31';
+                                        if (isok) {
+                                            result += montharr[0];
+                                            result += '-';
+                                            result += montharr[montharr.length-1];
                                         } else {
-                                            result += (getDateShort(data.time.dateEnd) || '12-31');
+                                            result += montharr.join(',');
                                         }
-                                        result += '</var></div>';
                                     }
-                                    result += '</div>';
+                                    result += '</var></div>';
+                                }
+                                if (data.time.dateStart || data.time.dateEnd) {
+                                    result += '<div class="indent-time-datelimit"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimitStart');
+                                    result += '</span> <var>';
+                                    if (enh) {
+                                        const year = (new Date()).getFullYear();
+                                        result += data.time.dateStart || year + '-01-01';
+                                    } else {
+                                        result += (getDateShort(data.time.dateStart) || '01-01');
+                                    }
+                                    result += '</var> <span> ';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimitEnd');
+                                    result += '</span> <var>';
+                                    if (enh) {
+                                        const year = (new Date()).getFullYear();
+                                        result += data.time.dateEnd || year + '-12-31';
+                                    } else {
+                                        result += (getDateShort(data.time.dateEnd) || '12-31');
+                                    }
+                                    result += '</var></div>';
                                 }
+                                result += '</div>';
                             }
                             result += '<div>';
                             if (data.level) {
@@ -1253,13 +1379,13 @@
                             if (data === {}) {
                                 data.description = 'please edit rule';
                                 data.name = 'empty';
+                                data.exec = cNBC_RULE_EXEC.auto;
                                 data.version = ruleVersion;
                                 data.enabled = true;
                             }
                             data.index = containerIndex;
                             data.importance = 0;
                             if (!data.conditions) {
-                                data.valid = {};
                                 data.conditions = [];
                                 if (data.validOperandAType && data.validOperandAType !== types.Unlimited.value) {
                                     data.conditions.push({
@@ -1301,7 +1427,9 @@
                                 delete data.valid2OperandBType;
                             }
                             if (data.timeBType) {
-                                if (data.timeBType === types.TimeSun.value || data.timeBType === types.TimeMoon.value) {
+                                if (data.timeBType === types.TimeSun.value ||
+                                    data.timeBType === types.TimeSunCustom.value ||
+                                    data.timeBType === types.TimeMoon.value) {
                                     data.timeMinType = data.timeType;
                                     data.timeMinValue = data.timeValue;
                                     data.timeType = data.timeBType;
@@ -1317,51 +1445,15 @@
                                 delete data.isValid; // need retrigger of validation, because rule is outdated
                                 data.description = node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleIsOutdated');
                             }
-                            if(data.timeType) {
-                                if (!data.time && data.timeType !== types.Undefined.value) {
-                                    data.time = {
-                                        type            : data.timeType,
-                                        value           : (data.timeValue || ''),
-                                        operator        : (parseInt(data.timeOp) || 0),
-                                        offsetType      : (data.offsetType || types.Undefined.value),
-                                        offset          : (data.offsetValue || '1'),
-                                        multiplier      : (parseInt(data.multiplier) || 60000),
-                                        days            : (data.timeDays || '*'),
-                                        months          : (data.timeMonths || '*')
-                                    };
-                                    if (data.timeOnlyOddDays) data.time.onlyOddDays = data.timeOnlyOddDays;
-                                    if (data.timeOnlyEvenDays) data.time.onlyEvenDays = data.timeOnlyEvenDays;
-                                    if (data.timeDateStart) data.time.dateStart = data.timeDateStart;
-                                    if (data.timeDateEnd) data.time.dateEnd = data.timeDateEnd;
-                                    if (data.timeOpText) data.time.operatorText = data.timeOpText;
-                                }
-                                delete data.timeType;
-                                delete data.timeValue;
-                                delete data.timeOp;
-                                delete data.timeOpText;
-                                delete data.offsetType;
-                                delete data.offsetValue;
-                                delete data.multiplier;
-                                delete data.timeDays;
-                                delete data.timeMonths;
-                                delete data.timeOnlyOddDays;
-                                delete data.timeOnlyEvenDays;
-                                delete data.timeDateStart;
-                                delete data.timeDateEnd;
-                                if (data.time && data.time.onlyEvenDays && data.time.onlyOddDays) {
-                                    delete data.time.onlyEvenDays;
-                                    delete data.time.onlyOddDays;
-                                }
-                            }
                             if (data.timeMinType) {
                                 if (!data.timeMin && data.timeMinType !== types.Undefined.value) {
-                                    data.timeMin = {
+                                    data.timeMin = Object.assign({
                                         type            : data.timeMinType,
                                         value           : (data.timeMinValue || ''),
                                         offsetType      : (data.offsetMinType || types.Undefined.value),
                                         offset          : (data.offsetMinValue || '1'),
                                         multiplier      : (parseInt(data.multiplierMin) || 60000)
-                                    };
+                                    }, data.timeMin);
                                 }
                                 delete data.timeMinType;
                                 delete data.timeMinValue;
@@ -1372,13 +1464,13 @@
                             }
                             if (data.timeMaxType) {
                                 if (!data.timeMax && data.timeMaxType !== types.Undefined.value) {
-                                    data.timeMax = {
+                                    data.timeMax = Object.assign({
                                         type            : data.timeMaxType,
                                         value           : (data.timeMaxValue || ''),
                                         offsetType      : (data.offsetMaxType || types.Undefined.value),
                                         offset          : (data.offsetMaxValue || '1'),
                                         multiplier      : (parseInt(data.multiplierMax) || 60000)
-                                    };
+                                    }, data.timeMax);
                                 }
                                 delete data.timeMaxType;
                                 delete data.timeMaxValue;
@@ -1387,6 +1479,128 @@
                                 delete data.multiplierMax;
                                 delete data.timeMaxOp;
                             }
+                            if (data.timeType) {
+                                if (!data.time && data.timeType !== types.Undefined.value) {
+                                    const operator = (parseInt(data.timeOp) || cNBC_RULE_TYPE_UNTIL);
+                                    data.time = { };
+                                    let ttype = 'end'; // cNBC_RULE_TYPE_UNTIL
+                                    data.exec = cNBC_RULE_EXEC.auto;
+                                    if (operator === cNBC_RULE_TYPE_FROM) {
+                                        data.time.start = {};
+                                        ttype = 'start';
+                                    }
+                                    data.time[ttype] = {
+                                        type            : data.timeType,
+                                        value           : (data.timeValue || ''),
+                                        offsetType      : (data.offsetType || 'none'),
+                                        offset          : (data.offsetValue || 1),
+                                        multiplier      : (parseInt(data.multiplier) || 60000)
+                                    };
+
+                                    if (data.timeMinType && data.timeMinType !== 'none') {
+                                        data.time[ttype].min = {
+                                            type            : data.timeMinType,
+                                            value           : (data.timeMinValue || ''),
+                                            offsetType      : (data.offsetMinType || 'none'),
+                                            offset          : (data.offsetMinValue || 1),
+                                            multiplier      : (parseInt(data.multiplierMin) || 60000)
+                                        };
+                                    }
+                                    if (data.timeMin) {
+                                        data.time[ttype].min = {
+                                            type            : data.timeMin.type,
+                                            value           : data.timeMin.value,
+                                            offsetType      : data.timeMin.offsetType,
+                                            offset          : data.timeMin.offset,
+                                            multiplier      : data.timeMin.multiplier
+                                        };
+                                        delete data.timeMin;
+                                    }
+                                    if (data.timeMaxType && data.timeMaxType !== 'none') {
+                                        data.time[ttype].max = {
+                                            type            : data.timeMaxType,
+                                            value           : (data.timeMaxValue || ''),
+                                            offsetType      : (data.offsetMaxType || 'none'),
+                                            offset          : (data.offsetMaxValue || 1),
+                                            multiplier      : (parseInt(data.multiplierMax) || 60000)
+                                        };
+                                    }
+                                    if (data.timeMax) {
+                                        data.time[ttype].max = {
+                                            type            : data.timeMax.type,
+                                            value           : data.timeMax.value,
+                                            offsetType      : data.timeMax.offsetType,
+                                            offset          : data.timeMax.offset,
+                                            multiplier      : data.timeMax.multiplier
+                                        };
+                                        delete data.timeMax;
+                                    }
+                                    if (data.timeDays && data.timeDays !== '*') data.time.days = data.timeDays;
+                                    if (data.timeMonths && data.timeMonths !== '*') data.time.months = data.timeMonths;
+                                    if (data.timeOnlyOddDays) data.time.onlyOddDays = data.timeOnlyOddDays;
+                                    if (data.timeOnlyEvenDays) data.time.onlyEvenDays = data.timeOnlyEvenDays;
+                                    if (data.timeDateStart) data.time.dateStart = data.timeDateStart;
+                                    if (data.timeDateEnd) data.time.dateEnd = data.timeDateEnd;
+                                }
+                                delete data.timeType;
+                                delete data.timeValue;
+                                delete data.timeOp;
+                                delete data.timeOpText;
+                                delete data.offsetType;
+                                delete data.offsetValue;
+                                delete data.multiplier;
+                                delete data.timeDays;
+                                delete data.timeMonths;
+                                delete data.timeOnlyOddDays;
+                                delete data.timeOnlyEvenDays;
+                                delete data.timeDateStart;
+                                delete data.timeDateEnd;
+                                if (data.time && data.time.onlyEvenDays && data.time.onlyOddDays) {
+                                    delete data.time.onlyEvenDays;
+                                    delete data.time.onlyOddDays;
+                                }
+                            }
+                            if (data.time && (typeof data.time.operator !== 'undefined')) {
+                                let ttype = 'end'; // cNBC_RULE_TYPE_UNTIL
+                                data.exec = cNBC_RULE_EXEC.auto;
+                                if (data.time.operator === cNBC_RULE_TYPE_FROM) {
+                                    ttype = 'start';
+                                }
+                                data.time[ttype] = Object.assign({
+                                    type            : data.time.type,
+                                    value           : data.time.value,
+                                    offsetType      : data.time.offsetType,
+                                    offset          : data.time.offset,
+                                    multiplier      : data.time.multiplier
+                                }, data.time[ttype]);
+                                if (data.timeMin && data.timeMin.type !== 'none' ) {
+                                    data.time[ttype].min = Object.assign({
+                                        type            : data.timeMin.type,
+                                        value           : (data.timeMin.value || ''),
+                                        offsetType      : (data.timeMin.offsetType || 'none'),
+                                        offset          : (data.timeMin.offset || 1),
+                                        multiplier      : (parseInt(data.timeMin.multiplier) || 60000)
+                                    }, data.time[ttype].min);
+                                }
+                                if (data.timeMax && data.timeMax.type !== 'none' ) {
+                                    data.time[ttype].max = Object.assign({
+                                        type            : data.timeMax.type,
+                                        value           : (data.timeMax.value || ''),
+                                        offsetType      : (data.timeMax.offsetType || 'none'),
+                                        offset          : (data.timeMax.offset || 1),
+                                        multiplier      : (parseInt(data.timeMax.multiplier) || 60000)
+                                    }, data.time[ttype].max);
+                                }
+                                delete data.time.operator;
+                                delete data.time.operatorText;
+                                delete data.time.type;
+                                delete data.time.value;
+                                delete data.time.offsetType;
+                                delete data.time.offset;
+                                delete data.time.multiplier;
+                                delete data.timeMin;
+                                delete data.timeMax;
+                            }
                             if (data.levelType) {
                                 if (!data.level) {
                                     data.level = {
@@ -1421,6 +1635,9 @@
                                 data.description = getRuleDescription(node, selFields, data);
                                 data.version = ruleVersion;
                             }
+                            if (typeof data.exec === 'undefined') {
+                                data.exec = cNBC_RULE_EXEC.auto;
+                            }
                             $containerRow.data('ruleData', JSON.stringify(data));
                             $containerRow.css({ overflow: 'hidden'}); // , whiteSpace: 'nowrap'
 
@@ -1430,10 +1647,22 @@
                             const $div = $('<div/>', {
                                 class: 'rdgtimer-rule-mainblock'
                             }).appendTo($row0);
+
                             $('<span />', {
                                 id: 'rule-name-'+containerIndex,
                                 class: 'rdgtimer-rule-name-span'
                             }).append(data.name || 'rule ' + (containerIndex + 1)).appendTo( $div );
+                            let exec = data.exec;
+                            if (data.time) {
+                                exec = cNBC_RULE_EXEC.first;
+                                if (data.exec === cNBC_RULE_EXEC.last || (data.time.start && !data.time.end)) {
+                                    exec = cNBC_RULE_EXEC.last;
+                                }
+                            }
+                            $('<span />', {
+                                id: 'rule-exec-'+containerIndex,
+                                class: 'rdgtimer-rule-exec-span'
+                            }).append(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExecShort.'+exec)).appendTo( $div );
                             $('<div />', {
                                 id: 'rule-description-'+containerIndex,
                                 class: 'rdgtimer-rule-description-span'
@@ -1528,6 +1757,8 @@
                             data.index = i;
                             // data.conditional = ((data.conditions.length > 0) ? 1 : 0);
                             // data.timeLimited = ((data.time && data.time.type !== 'none') ? 1 : 0);
+                            // TODO: node-input-rule-timeReg does not exists
+                            // WARNING: node-input-rule-timeReg does not exists
                             data.timeData = (parseFloat($(this).find('.node-input-rule-timeReg').attr('timedata')) || 0);
                         });
                         /**
@@ -1614,24 +1845,28 @@
                     // #region sun
                     $('#node-input-sunControlMode').on('change focus focusin focusout', (_type, _value) => {
                         const val= Number($('#node-input-sunControlMode').val());
+                        let vis = false;
                         if (val === cNBC_MODE_SUN_CONTROL) {
                             $('.form-row-sunControlActive').show();
                             $('.form-row-sunControlRestriction').show();
                             $('.form-row-sunControlMaximization').hide();
                             $('.form-row-sunControlMinimization').hide();
                             resizeOversteerContainer();
+                            vis=true;
                         } else if (val === cNBC_MODE_MAXIMIZE ) {
                             $('.form-row-sunControlActive').show();
                             $('.form-row-sunControlRestriction').hide();
                             $('.form-row-sunControlMaximization').show();
                             $('.form-row-sunControlMinimization').hide();
                             resizeOversteerContainer();
+                            vis=true;
                         } else if (val === cNBC_MODE_MINIMIZE) {
                             $('.form-row-sunControlActive').show();
                             $('.form-row-sunControlRestriction').hide();
                             $('.form-row-sunControlMaximization').hide();
                             $('.form-row-sunControlMinimization').show();
                             resizeOversteerContainer();
+                            vis=true;
                         } else {
                             $('.form-row-sunControlActive').hide();
                             $('.form-row-sunControlRestriction').hide();
@@ -1639,6 +1874,16 @@
                             $('.form-row-sunControlMinimization').hide();
                             $('.row-oversteerTopic').hide();
                         }
+                        if (vis) {
+                            const winAng = $('#node-input-windowSetMode').val();
+                            if (winAng === 'orientation') {
+                                $('.windowSetMode-azimuth').hide();
+                                $('.windowSetMode-orientation').show();
+                            } else {
+                                $('.windowSetMode-azimuth').show();
+                                $('.windowSetMode-orientation').hide();
+                            }
+                        }
                     });
                     setupTInput(node, {
                         typeProp: 'blindPosMinType',
@@ -1813,6 +2058,7 @@
                                         'num',
                                         types.numAzimuth,
                                         types.numAltitude,
+                                        types.numAnglePreDef,
                                         'str',
                                         'bool',
                                         'flow',
@@ -2319,6 +2565,12 @@
                         min: 0,
                         step: 1
                     });
+                    $('.spinner-windowangle').spinner({
+                        max: 90,
+                        min: 0,
+                        step: 0.1,
+                        numberFormat: 'n'
+                    });
                     $('#node-input-autoTrigger').change( () => {
                         if ($('#node-input-autoTrigger').is(':checked')) {
                             $('#blind-control-autoTriggerTime-edit').show();
@@ -2383,6 +2635,12 @@
                     });
 
                     const $dialogName = $dialog.find('#dlg-ip-btctl-rule-name');
+
+                    const $dialogExec = $dialog.find('#dlg-ip-btctl-rule-exec');
+                    $dialogExec.append($('<option></option>').val(cNBC_RULE_EXEC.auto).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExecAuto')));
+                    $dialogExec.append($('<option></option>').val(cNBC_RULE_EXEC.first).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExecFirst')));
+                    $dialogExec.append($('<option></option>').val(cNBC_RULE_EXEC.last).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExecLast')));
+
                     let $dialogDataRow = null;
                     let dialogDataOnLoading = false;
                     let dialogDataIndex = -1;
@@ -2508,6 +2766,7 @@
                                         'num',
                                         types.numAzimuth,
                                         types.numAltitude,
+                                        types.numAnglePreDef,
                                         'str',
                                         'bool',
                                         'flow',
@@ -2635,18 +2894,169 @@
                     }); // condition-container
                     $dialog.find('#dlg-ip-btctl-rule-condition-text').html(node._('node-red-contrib-sun-position/position-config:ruleCtrl.text.ruleCondition'));
                     // #endregion dialogConditions
-                    // #region dialogTimeReg
-                    const $dialogTimeRegOperator = $dialog.find('#dlg-ip-btctl-rule-timeReg-operator');
-                    $dialogTimeRegOperator.append($('<option></option>').val(cNBC_RULE_TYPE_UNTIL).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeUntil')));
-                    $dialogTimeRegOperator.append($('<option></option>').val(cNBC_RULE_TYPE_FROM).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeFrom')));
+                    // #region dialogTimeReg Start
+                    const $dialogTimeStartRegInput = $dialog.find('#dlg-ip-btctl-rule-timeStartReg');
+                    $dialogTimeStartRegInput.typedInput({
+                        default: types.UndefinedTimeFrom.value,
+                        types: [
+                            types.UndefinedTimeFrom,
+                            types.TimeEntered,
+                            types.TimeSun,
+                            types.TimeSunCustom,
+                            types.TimeMoon,
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.SunTimeByAzimuth,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet
+                        ]
+                    });
+                    $dialogTimeStartRegInput.typedInput('width', '40%');
+
+                    const $dialogTimeStartRegMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeStartReg');
+                    appendOptions(node, $dialogTimeStartRegMultiplier, 'multiplier', data => (data.id > 0));
+
+                    const $dialogTimeStartRegOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeStartReg');
+                    $dialogTimeStartRegOffset.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.Undefined,
+                            'num',
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.randmNumCachedDay,
+                            types.randmNumCachedWeek
+                        ]
+                    }).change(() => {
+                        const type = $dialogTimeStartRegOffset.typedInput('type');
+                        if (type === types.Undefined.value) {
+                            $dialogTimeStartRegMultiplier.prop('disabled', true);
+                        } else {
+                            $dialogTimeStartRegMultiplier.prop('disabled', false);
+                        }
+                        $dialogTimeStartRegInput.change();
+                    });
+                    $dialogTimeStartRegOffset.typedInput('width', '40%');
+                    // #endregion dialogTimeReg Start
+                    // #region dialogTimeMin Start
+                    const $dialogTimeStartMinInput = $dialog.find('#dlg-ip-btctl-rule-timeStartMin');
+                    $dialogTimeStartMinInput.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.Undefined,
+                            types.TimeEntered,
+                            types.TimeSun,
+                            types.TimeSunCustom,
+                            types.TimeSunNow,
+                            types.TimeMoon,
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.SunTimeByAzimuth,
+                            types.SunTimeByElevationNext,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet
+                        ]
+                    });
+                    $dialogTimeStartMinInput.typedInput('width', '40%');
+
+                    const $dialogTimeStartMinMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeStartMin');
+                    appendOptions(node, $dialogTimeStartMinMultiplier, 'multiplier', data => (data.id > 0));
+
+                    const $dialogTimeStartMinOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeStartMin');
+                    $dialogTimeStartMinOffset.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.Undefined,
+                            'num',
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.randmNumCachedDay,
+                            types.randmNumCachedWeek
+                        ]
+                    }).change(() => {
+                        const type = $dialogTimeStartMinOffset.typedInput('type');
+                        if (type === types.Undefined.value) {
+                            $dialogTimeStartMinMultiplier.prop('disabled', true);
+                        } else {
+                            $dialogTimeStartMinMultiplier.prop('disabled', false);
+                        }
+                        $dialogTimeStartMinInput.change();
+                    });
+                    $dialogTimeStartMinOffset.typedInput('width', '40%');
+                    // #endregion dialogTimeMin Start
+                    // #region dialogTimeMax Start
+                    const $dialogTimeStartMaxInput = $dialog.find('#dlg-ip-btctl-rule-timeStartMax');
+                    $dialogTimeStartMaxInput.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.Undefined,
+                            types.TimeEntered,
+                            types.TimeSun,
+                            types.TimeSunCustom,
+                            types.TimeSunNow,
+                            types.TimeMoon,
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.SunTimeByAzimuth,
+                            types.SunTimeByElevationNext,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet
+                        ]
+                    });
+                    $dialogTimeStartMaxInput.typedInput('width', '40%');
+
+                    const $dialogTimeStartMaxMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeStartMax');
+                    appendOptions(node, $dialogTimeStartMaxMultiplier, 'multiplier', data => (data.id > 0));
 
-                    const $dialogTimeRegInput = $dialog.find('#dlg-ip-btctl-rule-timeReg');
-                    $dialogTimeRegInput.typedInput({
+                    const $dialogTimeStartMaxOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeStartMax');
+                    $dialogTimeStartMaxOffset.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
+                            'num',
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.randmNumCachedDay,
+                            types.randmNumCachedWeek
+                        ]
+                    }).change(() => {
+                        const type = $dialogTimeStartMaxOffset.typedInput('type');
+                        if (type === types.Undefined.value) {
+                            $dialogTimeStartMaxMultiplier.prop('disabled', true);
+                        } else {
+                            $dialogTimeStartMaxMultiplier.prop('disabled', false);
+                        }
+                        $dialogTimeStartMaxInput.change();
+                    });
+                    // #endregion dialogTimeMax  Start
+
+                    // #region dialogTimeReg End
+                    const $dialogTimeEndRegInput = $dialog.find('#dlg-ip-btctl-rule-timeEndReg');
+                    $dialogTimeEndRegInput.typedInput({
+                        default: types.UndefinedTimeUntil.value,
+                        types: [
+                            types.UndefinedTimeUntil,
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -2655,22 +3065,18 @@
                             'env',
                             'jsonata',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ]
                     });
-                    $dialogTimeRegInput.typedInput('width', '40%');
+                    $dialogTimeEndRegInput.typedInput('width', '40%');
 
-                    const $dialogTimeRegMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeReg');
-                    appendOptions(node, $dialogTimeRegMultiplier, 'multiplier', data => (data.id > 0));
+                    const $dialogTimeEndRegMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeEndReg');
+                    appendOptions(node, $dialogTimeEndRegMultiplier, 'multiplier', data => (data.id > 0));
 
-                    const $dialogTimeRegOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeReg');
-                    $dialogTimeRegOffset.typedInput({
+                    const $dialogTimeEndRegOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeEndReg');
+                    $dialogTimeEndRegOffset.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
@@ -2684,24 +3090,25 @@
                             types.randmNumCachedWeek
                         ]
                     }).change(() => {
-                        const type = $dialogTimeRegOffset.typedInput('type');
+                        const type = $dialogTimeEndRegOffset.typedInput('type');
                         if (type === types.Undefined.value) {
-                            $dialogTimeRegMultiplier.prop('disabled', true);
+                            $dialogTimeEndRegMultiplier.prop('disabled', true);
                         } else {
-                            $dialogTimeRegMultiplier.prop('disabled', false);
+                            $dialogTimeEndRegMultiplier.prop('disabled', false);
                         }
-                        $dialogTimeRegInput.change();
+                        $dialogTimeEndRegInput.change();
                     });
-                    $dialogTimeRegOffset.typedInput('width', '40%');
-                    // #endregion dialogTimeReg
-                    // #region dialogTimeMin
-                    const $dialogTimeMinInput = $dialog.find('#dlg-ip-btctl-rule-timeMin');
-                    $dialogTimeMinInput.typedInput({
+                    $dialogTimeEndRegOffset.typedInput('width', '40%');
+                    // #endregion dialogTimeReg End
+                    // #region dialogTimeMin End
+                    const $dialogTimeEndMinInput = $dialog.find('#dlg-ip-btctl-rule-timeEndMin');
+                    $dialogTimeEndMinInput.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -2710,22 +3117,18 @@
                             'env',
                             'jsonata',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ]
                     });
-                    $dialogTimeMinInput.typedInput('width', '40%');
+                    $dialogTimeEndMinInput.typedInput('width', '40%');
 
-                    const $dialogTimeMinMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeMin');
-                    appendOptions(node, $dialogTimeMinMultiplier, 'multiplier', data => (data.id > 0));
+                    const $dialogTimeEndMinMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeEndMin');
+                    appendOptions(node, $dialogTimeEndMinMultiplier, 'multiplier', data => (data.id > 0));
 
-                    const $dialogTimeMinOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeMin');
-                    $dialogTimeMinOffset.typedInput({
+                    const $dialogTimeEndMinOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeEndMin');
+                    $dialogTimeEndMinOffset.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
@@ -2739,24 +3142,25 @@
                             types.randmNumCachedWeek
                         ]
                     }).change(() => {
-                        const type = $dialogTimeMinOffset.typedInput('type');
+                        const type = $dialogTimeEndMinOffset.typedInput('type');
                         if (type === types.Undefined.value) {
-                            $dialogTimeMinMultiplier.prop('disabled', true);
+                            $dialogTimeEndMinMultiplier.prop('disabled', true);
                         } else {
-                            $dialogTimeMinMultiplier.prop('disabled', false);
+                            $dialogTimeEndMinMultiplier.prop('disabled', false);
                         }
-                        $dialogTimeMinInput.change();
+                        $dialogTimeEndMinInput.change();
                     });
-                    $dialogTimeMinOffset.typedInput('width', '40%');
-                    // #endregion dialogTimeMin
-                    // #region dialogTimeMax
-                    const $dialogTimeMaxInput = $dialog.find('#dlg-ip-btctl-rule-timeMax');
-                    $dialogTimeMaxInput.typedInput({
+                    $dialogTimeEndMinOffset.typedInput('width', '40%');
+                    // #endregion dialogTimeMin End
+                    // #region dialogTimeMax End
+                    const $dialogTimeEndMaxInput = $dialog.find('#dlg-ip-btctl-rule-timeEndMax');
+                    $dialogTimeEndMaxInput.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -2765,22 +3169,18 @@
                             'env',
                             'jsonata',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ]
                     });
-                    $dialogTimeMaxInput.typedInput('width', '40%');
+                    $dialogTimeEndMaxInput.typedInput('width', '40%');
 
-                    const $dialogTimeMaxMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeMax');
-                    appendOptions(node, $dialogTimeMaxMultiplier, 'multiplier', data => (data.id > 0));
+                    const $dialogTimeEndMaxMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeEndMax');
+                    appendOptions(node, $dialogTimeEndMaxMultiplier, 'multiplier', data => (data.id > 0));
 
-                    const $dialogTimeMaxOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeMax');
-                    $dialogTimeMaxOffset.typedInput({
+                    const $dialogTimeEndMaxOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeEndMax');
+                    $dialogTimeEndMaxOffset.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
@@ -2794,16 +3194,16 @@
                             types.randmNumCachedWeek
                         ]
                     }).change(() => {
-                        const type = $dialogTimeMaxOffset.typedInput('type');
+                        const type = $dialogTimeEndMaxOffset.typedInput('type');
                         if (type === types.Undefined.value) {
-                            $dialogTimeMaxMultiplier.prop('disabled', true);
+                            $dialogTimeEndMaxMultiplier.prop('disabled', true);
                         } else {
-                            $dialogTimeMaxMultiplier.prop('disabled', false);
+                            $dialogTimeEndMaxMultiplier.prop('disabled', false);
                         }
-                        $dialogTimeMaxInput.change();
+                        $dialogTimeEndMaxInput.change();
                     });
-                    $dialogTimeMaxOffset.typedInput('width', '40%');
-                    // #endregion dialogTimeMax
+                    // #endregion dialogTimeMax End
+
                     // #region dialogTimeLimit
                     $dialog.find('#dialog-row-timeConstraints-show').click(() => {
                         $dialog.find('#dialog-row-timeConstraintsPlaceholder').hide();
@@ -2947,6 +3347,7 @@
                             'bin',
                             'env',
                             'jsonata',
+                            types.randomNumber,
                             types.randmNumCachedDay,
                             types.randmNumCachedWeek
                         ]
@@ -2958,43 +3359,244 @@
                     $dialogTopic.change(() => { _dialogGenHelpText(); });
                     // #endregion topic
                     // #region dialogChange
-                    $dialogTimeRegInput.change(() => {
+                    $dialogTimeStartRegInput.change(() => {
                         if (dialogDataOnLoading) { return; }
-                        const opType = $dialogTimeRegInput.typedInput('type');
+                        const opType = $dialogTimeStartRegInput.typedInput('type');
                         if (opType === types.Undefined.value) {
                             node.dialogAddData.timeReg = {
                                 ts : 0,
                                 data : null,
                                 text : 'N/A'
                             };
-                            $('#dialog-row-timeReg').attr('title', node.dialogAddData.timeReg.text);
-                            $dialogTimeRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
-                            $dialogTimeRegOperator.hide();
-                            $('#dialog-row-offset-timeReg').hide();
-                            $('#dialog-row-timeReg').attr('title', opType);
-
-                            $('#dialog-row-timeMin').hide();
-                            $('#dialog-row-timeMax').hide();
-                            $('#dialog-row-offset-timeMin').hide();
-                            $('#dialog-row-offset-timeMax').hide();
+                            $('#dialog-row-timeStartReg').attr('title', node.dialogAddData.timeReg.text);
+                            $dialogTimeStartRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
+                            $('#dialog-row-offset-timeStartReg').hide();
+                            $('#dialog-row-timeStartReg').attr('title', opType);
+
+                            $('#dialog-row-timeStartMin').hide();
+                            $('#dialog-row-timeStartMax').hide();
+                            $('#dialog-row-offset-timeStartMin').hide();
+                            $('#dialog-row-offset-timeStartMax').hide();
+                            $('.dialog-row-timeStartLimits').hide();
+                            $('.dialog-row-timeStartLimits-ph').hide();
+                            if ($dialogTimeStartMaxInput.typedInput('type') !== types.Undefined.value) {
+                                $dialogTimeStartMaxInput.typedInput('type', types.Undefined.value);
+                            }
+                            if ($dialogTimeStartMaxInput.typedInput('type') !== types.Undefined.value) {
+                                $dialogTimeStartMaxInput.typedInput('type', types.Undefined.value);
+                            }
+                            _dialogGenHelpText();
+                            return;
+                        }
+                        if (opType === types.TimeEntered.value ||
+                            opType === types.TimeSun.value ||
+                            opType === types.TimeSunCustom.value ||
+                            opType === types.TimeMoon.value) {
+                            $('#dialog-row-offset-timeStartReg').show();
+                        } else {
+                            $('#dialog-row-offset-timeStartReg').hide();
+                        }
+
+                        const noLimit = getCheckboxesStr($('#dlg-ip-btctl-rule-timeDays input[type=checkbox]:checked'), 7) === '*' &&
+                                        getCheckboxesStr($('#dlg-ip-btctl-rule-timeMonths input[type=checkbox]:checked'), 12) === '*' &&
+                                        $dialogTimeLimitOnlyEvenDays.is(':checked') !== true &&
+                                        $dialogTimeLimitOnlyOddDays.is(':checked') !== true &&
+                                        $dialogTimeLimitOnlyEvenWeeks.is(':checked') !== true &&
+                                        $dialogTimeLimitOnlyOddWeeks.is(':checked') !== true &&
+                                        $dialogTimeLimitDateStart.val() === '' &&
+                                        $dialogTimeLimitDateEnd.val() === '';
+                        if (noLimit) {
                             $('.dialog-row-timeLimits').hide();
+                            $('.dialog-row-timeLimits-ph').show();
+                        } else {
+                            $('.dialog-row-timeLimits').show();
                             $('.dialog-row-timeLimits-ph').hide();
-                            if ($dialogTimeMaxInput.typedInput('type') !== types.Undefined.value) {
-                                $dialogTimeMaxInput.typedInput('type', types.Undefined.value);
+                        }
+                        getBackendData(d => {
+                            if (d.value && d.value !== 'none') {
+                                const dv = new Date(d.value);
+                                node.dialogAddData.timeReg = {
+                                    ts : dv.getTime(),
+                                    data : d,
+                                    text : bdDateToTime(dv)
+                                };
+                            } else {
+                                node.dialogAddData.timeReg = {
+                                    ts : 0,
+                                    data : null,
+                                    text : bdDateToTime(d)
+                                };
                             }
-                            if ($dialogTimeMaxInput.typedInput('type') !== types.Undefined.value) {
-                                $dialogTimeMaxInput.typedInput('type', types.Undefined.value);
+                            $('#dialog-row-timeStartReg').attr('title', node.dialogAddData.timeReg.text);
+                            $dialogTimeStartRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
+                            _dialogGenHelpText();
+                        }, {
+                            nodeId:         node.id,
+                            kind:           'getTimeData',
+                            config:         $nodeConfig.val(),
+                            type:           opType,
+                            value:          $dialogTimeStartRegInput.typedInput('value'),
+                            offsetType:     $dialogTimeStartRegOffset.typedInput('type'),
+                            offset:         $dialogTimeStartRegOffset.typedInput('value'),
+                            multiplier:     parseInt($dialogTimeStartRegMultiplier.val()),
+                            noOffsetError:  true
+                        });
+                        $dialogTimeStartMinInput.change();
+                        $dialogTimeStartMaxInput.change();
+                    });
+
+                    $dialogTimeStartMinInput.change(() => {
+                        if (dialogDataOnLoading) { return; }
+                        const opAType = $dialogTimeStartRegInput.typedInput('type');
+                        if (opAType && opAType !== types.Undefined.value) {
+                            $('#dialog-row-timeStartMin').show();
+                            const opType = $dialogTimeStartMinInput.typedInput('type');
+                            if (opType === types.Undefined.value) {
+                                $('#dialog-row-offset-timeStartMin').hide();
+                                node.dialogAddData.time.start.min = {
+                                    ts : 0,
+                                    data : null,
+                                    text : 'N/A'
+                                };
+                                $('#dialog-row-timeStartMin').attr('title', node.dialogAddData.time.start.min.text);
+                                $dialogTimeStartMinInput.attr('timedata', node.dialogAddData.time.start.min.ts);
+                                _dialogGenHelpText();
+                                return;
+                            } else if (opType === types.TimeEntered.value ||
+                                       opType === types.TimeSun.value ||
+                                       opType === types.TimeSunCustom.value ||
+                                       opType === types.TimeMoon.value) {
+                                $('#dialog-row-offset-timeStartMin').show();
+                            } else {
+                                $('#dialog-row-offset-timeStartMin').hide();
+                            }
+                            getBackendData(d => {
+                                if (d.value && d.value !== 'none') {
+                                    const dv = new Date(d.value);
+                                    node.dialogAddData.time.start.min = {
+                                        ts : dv.getTime(),
+                                        data : d,
+                                        text : bdDateToTime(dv)
+                                    };
+                                } else {
+                                    node.dialogAddData.time.start.min = {
+                                        ts : 0,
+                                        data : null,
+                                        text : bdDateToTime(d)
+                                    };
+                                }
+                                $('#dialog-row-timeStartMin').attr('title', node.dialogAddData.time.start.min.text);
+                                $dialogTimeStartMinInput.attr('timedata', node.dialogAddData.time.start.min.ts);
+                                _dialogGenHelpText();
+                            }, {
+                                nodeId:         node.id,
+                                kind:           'getTimeData',
+                                config:         $nodeConfig.val(),
+                                type:           opType,
+                                value:          $dialogTimeStartMinInput.typedInput('value'),
+                                offsetType:     $dialogTimeStartMinOffset.typedInput('type'),
+                                offset:         $dialogTimeStartMinOffset.typedInput('value'),
+                                multiplier:     parseInt($dialogTimeStartMinMultiplier.val()),
+                                noOffsetError:  true
+                            });
+                        }
+                        _dialogGenHelpText();
+                    });
+
+                    $dialogTimeStartMaxInput.change(() => {
+                        if (dialogDataOnLoading) { return; }
+                        const opAType = $dialogTimeStartRegInput.typedInput('type');
+                        if (opAType && opAType !== types.Undefined.value) {
+                            $('#dialog-row-timeStartMax').show();
+                            const opType = $dialogTimeStartMaxInput.typedInput('type');
+                            if (opType === types.Undefined.value) {
+                                $('#dialog-row-offset-timeStartMax').hide();
+                                node.dialogAddData.time.start.max = {
+                                    ts : 0,
+                                    data : null,
+                                    text : 'N/A'
+                                };
+                                $('#dialog-row-timeStartMax').attr('title', node.dialogAddData.time.start.max.text);
+                                $dialogTimeStartMaxInput.attr('timedata', node.dialogAddData.time.start.max.ts);
+                                _dialogGenHelpText();
+                                return;
+                            } else if (opType === types.TimeEntered.value ||
+                                       opType === types.TimeSun.value ||
+                                       opType === types.TimeSunCustom.value ||
+                                       opType === types.TimeMoon.value) {
+                                $('#dialog-row-offset-timeStartMax').show();
+                            } else {
+                                $('#dialog-row-offset-timeStartMax').hide();
+                            }
+                            getBackendData(d => {
+                                if (d.value && d.value !== 'none') {
+                                    const dv = new Date(d.value);
+                                    node.dialogAddData.time.start.max = {
+                                        ts : dv.getTime(),
+                                        data : d,
+                                        text : bdDateToTime(dv)
+                                    };
+                                } else {
+                                    node.dialogAddData.time.start.max = {
+                                        ts : 0,
+                                        data : null,
+                                        text : bdDateToTime(d)
+                                    };
+                                }
+                                $('#dialog-row-timeStartMax').attr('title', node.dialogAddData.time.start.max.text);
+                                $dialogTimeStartMaxInput.attr('timedata', node.dialogAddData.time.start.max.ts);
+                                _dialogGenHelpText();
+                            }, {
+                                nodeId:         node.id,
+                                kind:           'getTimeData',
+                                config:         $nodeConfig.val(),
+                                type:           opType,
+                                value:          $dialogTimeStartMaxInput.typedInput('value'),
+                                offsetType:     $dialogTimeStartMaxOffset.typedInput('type'),
+                                offset:         $dialogTimeStartMaxOffset.typedInput('value'),
+                                multiplier:     parseInt($dialogTimeStartMaxMultiplier.val()),
+                                noOffsetError:  true
+                            });
+                        }
+                        _dialogGenHelpText();
+                    });
+
+                    $dialogTimeEndRegInput.change(() => {
+                        if (dialogDataOnLoading) { return; }
+                        const opType = $dialogTimeEndRegInput.typedInput('type');
+                        if (opType === types.Undefined.value) {
+                            node.dialogAddData.timeReg = {
+                                ts : 0,
+                                data : null,
+                                text : 'N/A'
+                            };
+                            $('#dialog-row-timeEndReg').attr('title', node.dialogAddData.timeReg.text);
+                            $dialogTimeEndRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
+                            $('#dialog-row-timeEndReg-offset').hide();
+                            $('#dialog-row-timeEndReg').attr('title', opType);
+
+                            $('#dialog-row-timeEndMin').hide();
+                            $('#dialog-row-timeEndMax').hide();
+                            $('#dialog-row-timeEndMin-offset').hide();
+                            $('#dialog-row-timeEndMax-offset').hide();
+                            $('.dialog-row-timeEndLimits').hide();
+                            $('.dialog-row-timeEndLimits-ph').hide();
+                            if ($dialogTimeEndMaxInput.typedInput('type') !== types.Undefined.value) {
+                                $dialogTimeEndMaxInput.typedInput('type', types.Undefined.value);
+                            }
+                            if ($dialogTimeEndMaxInput.typedInput('type') !== types.Undefined.value) {
+                                $dialogTimeEndMaxInput.typedInput('type', types.Undefined.value);
                             }
                             _dialogGenHelpText();
                             return;
                         }
-                        $dialogTimeRegOperator.show();
                         if (opType === types.TimeEntered.value ||
                            opType === types.TimeSun.value ||
+                           opType === types.TimeSunCustom.value ||
                            opType === types.TimeMoon.value) {
-                            $('#dialog-row-offset-timeReg').show();
+                            $('#dialog-row-timeEndReg-offset').show();
                         } else {
-                            $('#dialog-row-offset-timeReg').hide();
+                            $('#dialog-row-timeEndReg-offset').hide();
                         }
 
                         const noLimit = getCheckboxesStr($('#dlg-ip-btctl-rule-timeDays input[type=checkbox]:checked'), 7) === '*' &&
@@ -3027,142 +3629,146 @@
                                     text : bdDateToTime(d)
                                 };
                             }
-                            $('#dialog-row-timeReg').attr('title', node.dialogAddData.timeReg.text);
-                            $dialogTimeRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
+                            $('#dialog-row-timeEndReg').attr('title', node.dialogAddData.timeReg.text);
+                            $dialogTimeEndRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
                             _dialogGenHelpText();
                         }, {
                             nodeId:         node.id,
                             kind:           'getTimeData',
                             config:         $nodeConfig.val(),
                             type:           opType,
-                            value:          $dialogTimeRegInput.typedInput('value'),
-                            offsetType:     $dialogTimeRegOffset.typedInput('type'),
-                            offset:         $dialogTimeRegOffset.typedInput('value'),
-                            multiplier:     parseInt($dialogTimeRegMultiplier.val()),
+                            value:          $dialogTimeEndRegInput.typedInput('value'),
+                            offsetType:     $dialogTimeEndRegOffset.typedInput('type'),
+                            offset:         $dialogTimeEndRegOffset.typedInput('value'),
+                            multiplier:     parseInt($dialogTimeEndRegMultiplier.val()),
                             noOffsetError:  true
                         });
-                        $dialogTimeMinInput.change();
-                        $dialogTimeMaxInput.change();
+                        $dialogTimeEndMinInput.change();
+                        $dialogTimeEndMaxInput.change();
                     });
 
-                    $dialogTimeMinInput.change(() => {
+                    $dialogTimeEndMinInput.change(() => {
                         if (dialogDataOnLoading) { return; }
-                        const opAType = $dialogTimeRegInput.typedInput('type');
+                        const opAType = $dialogTimeEndRegInput.typedInput('type');
                         if (opAType && opAType !== types.Undefined.value) {
-                            $('#dialog-row-timeMin').show();
-                            const opType = $dialogTimeMinInput.typedInput('type');
+                            $('#dialog-row-timeEndMin').show();
+                            const opType = $dialogTimeEndMinInput.typedInput('type');
                             if (opType === types.Undefined.value) {
-                                $('#dialog-row-offset-timeMin').hide();
-                                node.dialogAddData.timeMin = {
+                                $('#dialog-row-timeEndMin-offset').hide();
+                                node.dialogAddData.time.end.min = {
                                     ts : 0,
                                     data : null,
                                     text : 'N/A'
                                 };
-                                $('#dialog-row-timeMin').attr('title', node.dialogAddData.timeMin.text);
-                                $dialogTimeMinInput.attr('timedata', node.dialogAddData.timeMin.ts);
+                                $('#dialog-row-timeEndMin').attr('title', node.dialogAddData.time.end.min.text);
+                                $dialogTimeEndMinInput.attr('timedata', node.dialogAddData.time.end.min.ts);
                                 _dialogGenHelpText();
                                 return;
                             } else if (opType === types.TimeEntered.value ||
                                        opType === types.TimeSun.value ||
+                                       opType === types.TimeSunCustom.value ||
                                        opType === types.TimeMoon.value) {
-                                $('#dialog-row-offset-timeMin').show();
+                                $('#dialog-row-timeEndMin-offset').show();
                             } else {
-                                $('#dialog-row-offset-timeMin').hide();
+                                $('#dialog-row-timeEndMin-offset').hide();
                             }
                             getBackendData(d => {
                                 if (d.value && d.value !== 'none') {
                                     const dv = new Date(d.value);
-                                    node.dialogAddData.timeMin = {
+                                    node.dialogAddData.time.end.min = {
                                         ts : dv.getTime(),
                                         data : d,
                                         text : bdDateToTime(dv)
                                     };
                                 } else {
-                                    node.dialogAddData.timeMin = {
+                                    node.dialogAddData.time.end.min = {
                                         ts : 0,
                                         data : null,
                                         text : bdDateToTime(d)
                                     };
                                 }
-                                $('#dialog-row-timeMin').attr('title', node.dialogAddData.timeMin.text);
-                                $dialogTimeMinInput.attr('timedata', node.dialogAddData.timeMin.ts);
+                                $('#dialog-row-timeEndMin').attr('title', node.dialogAddData.time.end.min.text);
+                                $dialogTimeEndMinInput.attr('timedata', node.dialogAddData.time.end.min.ts);
                                 _dialogGenHelpText();
                             }, {
                                 nodeId:         node.id,
                                 kind:           'getTimeData',
                                 config:         $nodeConfig.val(),
                                 type:           opType,
-                                value:          $dialogTimeMinInput.typedInput('value'),
-                                offsetType:     $dialogTimeMinOffset.typedInput('type'),
-                                offset:         $dialogTimeMinOffset.typedInput('value'),
-                                multiplier:     parseInt($dialogTimeMinMultiplier.val()),
+                                value:          $dialogTimeEndMinInput.typedInput('value'),
+                                offsetType:     $dialogTimeEndMinOffset.typedInput('type'),
+                                offset:         $dialogTimeEndMinOffset.typedInput('value'),
+                                multiplier:     parseInt($dialogTimeEndMinMultiplier.val()),
                                 noOffsetError:  true
                             });
                         }
                         _dialogGenHelpText();
                     });
 
-                    $dialogTimeMaxInput.change(() => {
+                    $dialogTimeEndMaxInput.change(() => {
                         if (dialogDataOnLoading) { return; }
-                        const opAType = $dialogTimeRegInput.typedInput('type');
+                        const opAType = $dialogTimeEndRegInput.typedInput('type');
                         if (opAType && opAType !== types.Undefined.value) {
-                            $('#dialog-row-timeMax').show();
-                            const opType = $dialogTimeMaxInput.typedInput('type');
+                            $('#dialog-row-timeEndMax').show();
+                            const opType = $dialogTimeEndMaxInput.typedInput('type');
                             if (opType === types.Undefined.value) {
-                                $('#dialog-row-offset-timeMax').hide();
-                                node.dialogAddData.timeMax = {
+                                $('#dialog-row-timeEndMax-offset').hide();
+                                node.dialogAddData.time.end.max = {
                                     ts : 0,
                                     data : null,
                                     text : 'N/A'
                                 };
-                                $('#dialog-row-timeMax').attr('title', node.dialogAddData.timeMax.text);
-                                $dialogTimeMaxInput.attr('timedata', node.dialogAddData.timeMax.ts);
+                                $('#dialog-row-timeEndMax').attr('title', node.dialogAddData.time.end.max.text);
+                                $dialogTimeEndMaxInput.attr('timedata', node.dialogAddData.time.end.max.ts);
                                 _dialogGenHelpText();
                                 return;
                             } else if (opType === types.TimeEntered.value ||
                                        opType === types.TimeSun.value ||
+                                       opType === types.TimeSunCustom.value ||
                                        opType === types.TimeMoon.value) {
-                                $('#dialog-row-offset-timeMax').show();
+                                $('#dialog-row-timeEndMax-offset').show();
                             } else {
-                                $('#dialog-row-offset-timeMax').hide();
+                                $('#dialog-row-timeEndMax-offset').hide();
                             }
                             getBackendData(d => {
                                 if (d.value && d.value !== 'none') {
                                     const dv = new Date(d.value);
-                                    node.dialogAddData.timeMax = {
+                                    node.dialogAddData.time.end.max = {
                                         ts : dv.getTime(),
                                         data : d,
                                         text : bdDateToTime(dv)
                                     };
                                 } else {
-                                    node.dialogAddData.timeMax = {
+                                    node.dialogAddData.time.end.max = {
                                         ts : 0,
                                         data : null,
                                         text : bdDateToTime(d)
                                     };
                                 }
-                                $('#dialog-row-timeMax').attr('title', node.dialogAddData.timeMax.text);
-                                $dialogTimeMaxInput.attr('timedata', node.dialogAddData.timeMax.ts);
+                                $('#dialog-row-timeEndMax').attr('title', node.dialogAddData.time.end.max.text);
+                                $dialogTimeEndMaxInput.attr('timedata', node.dialogAddData.time.end.max.ts);
                                 _dialogGenHelpText();
                             }, {
                                 nodeId:         node.id,
                                 kind:           'getTimeData',
                                 config:         $nodeConfig.val(),
                                 type:           opType,
-                                value:          $dialogTimeMaxInput.typedInput('value'),
-                                offsetType:     $dialogTimeMaxOffset.typedInput('type'),
-                                offset:         $dialogTimeMaxOffset.typedInput('value'),
-                                multiplier:     parseInt($dialogTimeMaxMultiplier.val()),
+                                value:          $dialogTimeEndMaxInput.typedInput('value'),
+                                offsetType:     $dialogTimeEndMaxOffset.typedInput('type'),
+                                offset:         $dialogTimeEndMaxOffset.typedInput('value'),
+                                multiplier:     parseInt($dialogTimeEndMaxMultiplier.val()),
                                 noOffsetError:  true
                             });
                         }
                         _dialogGenHelpText();
                     });
+
                     $('.dialog-row-timeLimits :input').change(() => {
                         if (node.dialogAddData.timeout2) { clearTimeout(node.dialogAddData.timeout2); }
                         node.dialogAddData.timeout2 = setTimeout(() => {
                             delete node.dialogAddData.timeout2;
-                            $dialogTimeRegInput.change();
+                            $dialogTimeStartRegInput.change();
+                            $dialogTimeEndRegInput.change();
                         },1000);
                     });
                     // #endregion dialogChange
@@ -3187,6 +3793,8 @@
                             dialogDataIndex = containerIndex;
                             const data = JSON.parse($dialogDataRow.data('ruleData'));
                             $dialogName.val(data.name);
+                            $dialogExec.val(data.exec);
+
                             $dialogRuleEnableBtn.attr('is_enabled', data.enabled);
                             $dialogRuleEnableBtn.trigger('setRuleEnabledState');
                             dialogDataOnLoading = true;
@@ -3194,11 +3802,69 @@
                             for (let i = 0; i < data.conditions.length; i++) {
                                 $dialogConditionContainer.editableList('addItem', data.conditions[i]);
                             }
+                            $dialogTimeStartRegMultiplier.val(60000);
+                            $dialogTimeEndRegMultiplier.val(60000);
+                            setTInputValue($dialogTimeStartRegInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeStartRegOffset, 1, types.Undefined.value);
+                            setTInputValue($dialogTimeEndRegInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeEndRegOffset, 1, types.Undefined.value);
+                            initCheckboxesBlock('#dlg-ip-btctl-rule-timeDays', '*');
+                            initCheckboxesBlock('#dlg-ip-btctl-rule-timeMonths', '*');
+                            $dialogTimeLimitOnlyEvenDays.prop('checked', false);
+                            $dialogTimeLimitOnlyOddDays.prop('checked', false);
+                            $dialogTimeLimitOnlyEvenWeeks.prop('checked', false);
+                            $dialogTimeLimitOnlyOddWeeks.prop('checked', false);
+                            $dialogTimeLimitDateStart.val('');
+                            $dialogTimeLimitDateEnd.val('');
+
+                            setTInputValue($dialogTimeEndMinInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeEndMinOffset, 1, types.Undefined.value);
+                            $dialogTimeEndMinMultiplier.val(60000);
+                            setTInputValue($dialogTimeEndMaxInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeEndMaxOffset, 1, types.Undefined.value);
+                            $dialogTimeEndMaxMultiplier.val(60000);
+
+                            setTInputValue($dialogTimeStartMinInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeStartMinOffset, 1, types.Undefined.value);
+                            $dialogTimeStartMinMultiplier.val(60000);
+                            setTInputValue($dialogTimeStartMaxInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeStartMaxOffset, 1, types.Undefined.value);
+                            $dialogTimeStartMaxMultiplier.val(60000);
+
                             if (data.time) {
-                                $dialogTimeRegOperator.val(data.time.operator);
-                                $dialogTimeRegMultiplier.val(data.time.multiplier);
-                                setTInputValue($dialogTimeRegInput, data.time.value, data.time.type);
-                                setTInputValue($dialogTimeRegOffset, data.time.offset, data.time.offsetType);
+                                if (data.time.start) {
+                                    $dialogTimeStartRegMultiplier.val(data.time.start.multiplier);
+                                    setTInputValue($dialogTimeStartRegInput, data.time.start.value, data.time.start.type);
+                                    setTInputValue($dialogTimeStartRegOffset, data.time.start.offset, data.time.start.offsetType);
+
+                                    if (data.time.start.min) {
+                                        $dialogTimeStartMinMultiplier.val(data.time.start.min.multiplier || 60000);
+                                        setTInputValue($dialogTimeStartMinInput, data.time.start.min.value, data.time.start.min.type);
+                                        setTInputValue($dialogTimeStartMinOffset, data.time.start.min.offset, data.time.start.min.offsetType);
+                                    }
+                                    if (data.time.start.max) {
+                                        $dialogTimeStartMaxMultiplier.val(data.time.start.max.multiplier || 60000);
+                                        setTInputValue($dialogTimeStartMaxInput, data.time.start.max.value, data.time.start.max.type);
+                                        setTInputValue($dialogTimeStartMaxOffset, data.time.start.max.offset, data.time.start.max.offsetType);
+                                    }
+                                }
+                                if (data.time.end) {
+                                    $dialogTimeEndRegMultiplier.val(data.time.end.multiplier);
+                                    setTInputValue($dialogTimeEndRegInput, data.time.end.value, data.time.end.type);
+                                    setTInputValue($dialogTimeEndRegOffset, data.time.end.offset, data.time.end.offsetType);
+
+                                    if (data.time.end.min) {
+                                        $dialogTimeEndMinMultiplier.val(data.time.end.min.multiplier || 60000);
+                                        setTInputValue($dialogTimeEndMinInput, data.time.end.min.value, data.time.end.min.type);
+                                        setTInputValue($dialogTimeEndMinOffset, data.time.end.min.offset, data.time.end.min.offsetType);
+                                    }
+                                    if (data.time.end.max) {
+                                        $dialogTimeEndMaxMultiplier.val(data.time.end.max.multiplier || 60000);
+                                        setTInputValue($dialogTimeEndMaxInput, data.time.end.max.value, data.time.end.max.type);
+                                        setTInputValue($dialogTimeEndMaxOffset, data.time.end.max.offset, data.time.end.max.offsetType);
+                                    }
+                                }
+
                                 initCheckboxesBlock('#dlg-ip-btctl-rule-timeDays', data.time.days);
                                 initCheckboxesBlock('#dlg-ip-btctl-rule-timeMonths', data.time.months);
                                 if (!!data.time.onlyEvenDays && !!data.time.onlyOddDays) {
@@ -3243,37 +3909,6 @@
                                 }
                                 $dialogTimeLimitDateStart.change();
                                 $dialogTimeLimitDateEnd.change();
-                            } else {
-                                $dialogTimeRegOperator.val(0);
-                                $dialogTimeRegMultiplier.val(60000);
-                                setTInputValue($dialogTimeRegInput, '', types.Undefined.value);
-                                setTInputValue($dialogTimeRegOffset, 1, types.Undefined.value);
-                                initCheckboxesBlock('#dlg-ip-btctl-rule-timeDays', '*');
-                                initCheckboxesBlock('#dlg-ip-btctl-rule-timeMonths', '*');
-                                $dialogTimeLimitOnlyEvenDays.prop('checked', false);
-                                $dialogTimeLimitOnlyOddDays.prop('checked', false);
-                                $dialogTimeLimitOnlyEvenWeeks.prop('checked', false);
-                                $dialogTimeLimitOnlyOddWeeks.prop('checked', false);
-                                $dialogTimeLimitDateStart.val('');
-                                $dialogTimeLimitDateEnd.val('');
-                            }
-                            if (data.timeMin) {
-                                $dialogTimeMinMultiplier.val(data.timeMin.multiplier || 60000);
-                                setTInputValue($dialogTimeMinInput, data.timeMin.value, data.timeMin.type);
-                                setTInputValue($dialogTimeMinOffset, data.timeMin.offset, data.timeMin.offsetType);
-                            } else {
-                                setTInputValue($dialogTimeMinInput, '', types.Undefined.value);
-                                setTInputValue($dialogTimeMinOffset, 1, types.Undefined.value);
-                                $dialogTimeMinMultiplier.val(60000);
-                            }
-                            if (data.timeMax) {
-                                $dialogTimeMaxMultiplier.val(data.timeMax.multiplier || 60000);
-                                setTInputValue($dialogTimeMaxInput, data.timeMax.value, data.timeMax.type);
-                                setTInputValue($dialogTimeMaxOffset, data.timeMax.offset, data.timeMax.offsetType);
-                            } else {
-                                setTInputValue($dialogTimeMaxInput, '', types.Undefined.value);
-                                setTInputValue($dialogTimeMaxOffset, 1, types.Undefined.value);
-                                $dialogTimeMaxMultiplier.val(60000);
                             }
                             if (data.level) {
                                 $dialogLevelOperator.val(data.level.operator || 0);
@@ -3293,7 +3928,8 @@
 
                             _dialogGenHelpText();
                             dialogDataOnLoading = false;
-                            $dialogTimeRegInput.change();
+                            $dialogTimeStartRegInput.change();
+                            $dialogTimeEndRegInput.change();
                             $dialogLevelOperator.change();
                         } catch (err) {
                             console.log(err.message); // eslint-disable-line no-console
@@ -3303,6 +3939,22 @@
                         $dialog.dialog('open');
                     }
 
+                    /**
+                     * checks if all properties of an object are true
+                     */
+                    function checkObj(obj, path) {
+                        for (const [key, value] of Object.entries(obj)) {
+                            if (value === true || key === 'index') continue; // return path;
+                            if (typeof value === 'object') {
+                                const val = checkObj(value, path + key + '.');
+                                if (val !== '') return val;
+                                continue;
+                            }
+                            return path + key;
+                        }
+                        return '';
+                    }
+
                     /**
                      * Get the data object for a rule
                      */
@@ -3310,10 +3962,12 @@
                         const result = {
                             index: dialogDataIndex,
                             name:$dialogName.val(),
+                            exec: $dialogExec.val(),
                             version: ruleVersion,
                             enabled: !($dialogRuleEnableBtn.attr('is_enabled') === false || $dialogRuleEnableBtn.attr('is_enabled') === 'false'),
-                            isValid: true,
-                            valid:{
+                            isValid: false,
+                            validationError: '',
+                            validation:{
                                 conditions : []
                             },
                             conditions: [],
@@ -3331,6 +3985,7 @@
                             resetOverwrite: $dialogResetOverwrite.is(':checked'),
                             importance: parseInt($dialogImportance.val())
                         };
+
                         try {
                             const setval = (param, name, val) => { if (val) param[name] = val; };
                             if (result.level.type === types.LevelND.value) {
@@ -3358,6 +4013,10 @@
                                 delete result.topic;
                                 delete result.resetOverwrite;
                                 delete result.importance;
+                            } else {
+                                if (result.slat.type === 'none') {
+                                    delete result.slat;
+                                }
                             }
 
                             $dialogConditionContainer.editableList('items').each(function(_i) {
@@ -3380,28 +4039,103 @@
                                     delete p.conditionText;
                                 }
                                 result.conditions.push(p);
-                                const isCValid = {
+                                result.validation.conditions.push({
                                     index       : _i,
                                     value       : $cond.find('.dlg-ip-btctl-rule-condOperand').typedInput('validate'),
                                     threshold   : $cond.find('.dlg-ip-btctl-rule-condThreshold').typedInput('validate')
-                                };
-                                result.valid.conditions.push(isCValid);
-                                result.isValid = result.isValid && isCValid.value && isCValid.threshold;
+                                });
                             });
-                            const timeType = $dialogTimeRegInput.typedInput('type');
-                            result.valid.time = $dialogTimeRegInput.typedInput('validate');
-                            if (timeType !== 'none') {
-                                result.time = {
-                                    type            : timeType,
-                                    value           : $dialogTimeRegInput.typedInput('value'),
-                                    operator        : parseInt($dialogTimeRegOperator.val()),
-                                    operatorText    : $dialogTimeRegOperator.find('option:selected').text(),
-                                    offsetType      : $dialogTimeRegOffset.typedInput('type'),
-                                    offset          : $dialogTimeRegOffset.typedInput('value'),
-                                    multiplier      : parseInt($dialogTimeRegMultiplier.val()),
-                                    days            : getCheckboxesStr($('#dlg-ip-btctl-rule-timeDays input[type=checkbox]:checked'),7),
-                                    months          : getCheckboxesStr($('#dlg-ip-btctl-rule-timeMonths input[type=checkbox]:checked'), 12)
+                            const timeTypeStart = $dialogTimeStartRegInput.typedInput('type');
+                            const timeTypeEnd = $dialogTimeEndRegInput.typedInput('type');
+
+                            if (timeTypeStart !== 'none' || timeTypeEnd !== 'none') {
+                                result.time = { };
+                                result.validation.time = {
+                                    start : {
+                                        value : $dialogTimeStartRegInput.typedInput('validate')
+                                    },
+                                    end : {
+                                        value : $dialogTimeEndRegInput.typedInput('validate')
+                                    }
                                 };
+
+                                if (timeTypeStart !== 'none') {
+                                    result.time.start = {
+                                        type            : timeTypeStart,
+                                        value           : $dialogTimeStartRegInput.typedInput('value'),
+                                        offsetType      : $dialogTimeStartRegOffset.typedInput('type'),
+                                        offset          : $dialogTimeStartRegOffset.typedInput('value'),
+                                        multiplier      : parseInt($dialogTimeStartRegMultiplier.val())
+                                    };
+                                    result.validation.time.start.offset = $dialogTimeStartRegOffset.typedInput('validate');
+                                    result.validation.time.start.multiplier = !isNaN(result.time.start.multiplier);
+                                    const minType = $dialogTimeStartMinInput.typedInput('type');
+                                    result.validation.time.start.min = $dialogTimeStartMinInput.typedInput('validate');
+                                    if (minType !== 'none') {
+                                        result.time.start.min = {
+                                            type        : minType,
+                                            value       : $dialogTimeStartMinInput.typedInput('value'),
+                                            offsetType  : $dialogTimeStartMinOffset.typedInput('type'),
+                                            offset      : $dialogTimeStartMinOffset.typedInput('value'),
+                                            multiplier  : parseInt($dialogTimeStartMinMultiplier.val())
+                                        };
+                                        result.validation.time.start.minOffset = $dialogTimeStartMinOffset.typedInput('validate');
+                                        result.validation.time.start.minMultiplier = !isNaN(result.time.start.min.multiplier);
+                                    }
+                                    const maxType = $dialogTimeStartMaxInput.typedInput('type');
+                                    result.validation.time.start.max = $dialogTimeStartMaxInput.typedInput('validate');
+                                    if (maxType !== 'none') {
+                                        result.time.start.max = {
+                                            type        : maxType,
+                                            value       : $dialogTimeStartMaxInput.typedInput('value'),
+                                            offsetType  : $dialogTimeStartMaxOffset.typedInput('type'),
+                                            offset      : $dialogTimeStartMaxOffset.typedInput('value'),
+                                            multiplier  :  parseInt($dialogTimeStartMaxMultiplier.val())
+                                        };
+                                        result.validation.time.start.maxOffset = $dialogTimeStartMaxOffset.typedInput('validate');
+                                        result.validation.time.start.maxMultiplier = !isNaN(result.time.start.max.multiplier);
+                                    }
+                                }
+                                if (timeTypeEnd !== 'none') {
+                                    result.time.end = {
+                                        type            : timeTypeEnd,
+                                        value           : $dialogTimeEndRegInput.typedInput('value'),
+                                        offsetType      : $dialogTimeEndRegOffset.typedInput('type'),
+                                        offset          : $dialogTimeEndRegOffset.typedInput('value'),
+                                        multiplier      : parseInt($dialogTimeEndRegMultiplier.val())
+                                    };
+                                    result.validation.time.end.offset = $dialogTimeEndRegOffset.typedInput('validate');
+                                    result.validation.time.end.multiplier = !isNaN(result.time.end.multiplier);
+                                    const minType = $dialogTimeEndMinInput.typedInput('type');
+                                    result.validation.time.end.min = $dialogTimeEndMinInput.typedInput('validate');
+                                    if (minType !== 'none') {
+                                        result.time.end.min = {
+                                            type        : minType,
+                                            value       : $dialogTimeEndMinInput.typedInput('value'),
+                                            offsetType  : $dialogTimeEndMinOffset.typedInput('type'),
+                                            offset      : $dialogTimeEndMinOffset.typedInput('value'),
+                                            multiplier  : parseInt($dialogTimeEndMinMultiplier.val())
+                                        };
+                                        result.validation.time.end.minOffset = $dialogTimeEndMinOffset.typedInput('validate');
+                                        result.validation.time.end.minMultiplier = !isNaN(result.time.end.min.multiplier);
+                                    }
+                                    const maxType = $dialogTimeEndMaxInput.typedInput('type');
+                                    result.validation.time.end.max = $dialogTimeEndMaxInput.typedInput('validate');
+                                    if (maxType !== 'none') {
+                                        result.time.end.max = {
+                                            type        : maxType,
+                                            value       : $dialogTimeEndMaxInput.typedInput('value'),
+                                            offsetType  : $dialogTimeEndMaxOffset.typedInput('type'),
+                                            offset      : $dialogTimeEndMaxOffset.typedInput('value'),
+                                            multiplier  :  parseInt($dialogTimeEndMaxMultiplier.val())
+                                        };
+                                        result.validation.time.end.maxOffset = $dialogTimeEndMaxOffset.typedInput('validate');
+                                        result.validation.time.end.maxMultiplier = !isNaN(result.time.end.max.multiplier);
+                                    }
+                                }
+
+                                result.time.days = getCheckboxesStr($('#dlg-ip-btctl-rule-timeDays input[type=checkbox]:checked'),7);
+                                result.time.months = getCheckboxesStr($('#dlg-ip-btctl-rule-timeMonths input[type=checkbox]:checked'), 12);
                                 setval(result.time,'onlyEvenDays', $dialogTimeLimitOnlyEvenDays.is(':checked'));
                                 setval(result.time,'onlyOddDays', $dialogTimeLimitOnlyOddDays.is(':checked'));
                                 setval(result.time,'onlyEvenWeeks', $dialogTimeLimitOnlyEvenWeeks.is(':checked'));
@@ -3409,67 +4143,55 @@
                                 setval(result.time,'dateStart', $dialogTimeLimitDateStart.val());
                                 setval(result.time,'dateEnd', $dialogTimeLimitDateEnd.val());
 
-                                result.valid.time = result.valid.time && $dialogTimeRegOffset.typedInput('validate') && result.time.multiplier;
                                 if (result.time.onlyEvenDays && result.time.onlyOddDays) {
                                     delete result.time.onlyEvenDays;
                                     delete result.time.onlyOddDays;
+                                    result.validation.time.noEvenAndOddDaysAllowed = false;
                                 }
                                 if (result.time.onlyEvenWeeks && result.time.onlyOddWeeks) {
                                     delete result.time.onlyEvenWeeks;
                                     delete result.time.onlyOddWeeks;
+                                    result.validation.time.noEvenAndOddWeeksAllowed = false;
                                 }
                                 if (!result.time.days || !result.time.months) {
-                                    result.valid.time = false;
-                                }
-                                const minType = $dialogTimeMinInput.typedInput('type');
-                                result.valid.timeMin = $dialogTimeMinInput.typedInput('validate');
-                                if (minType !== 'none') {
-                                    result.timeMin = {
-                                        type        : minType,
-                                        value       : $dialogTimeMinInput.typedInput('value'),
-                                        offsetType  : $dialogTimeMinOffset.typedInput('type'),
-                                        offset      : $dialogTimeMinOffset.typedInput('value'),
-                                        multiplier  : parseInt($dialogTimeMinMultiplier.val())
-                                    };
-                                    result.valid.timeMin = result.valid.timeMin &&
-                                        $dialogTimeMinOffset.typedInput('validate') &&
-                                        result.timeMin.multiplier;
+                                    result.validation.time.noDaysAllowed = false;
                                 }
-                                const maxType = $dialogTimeMaxInput.typedInput('type');
-                                result.valid.timeMax = $dialogTimeMaxInput.typedInput('validate');
-                                if (maxType !== 'none') {
-                                    result.timeMax = {
-                                        type        : maxType,
-                                        value       : $dialogTimeMaxInput.typedInput('value'),
-                                        offsetType  : $dialogTimeMaxOffset.typedInput('type'),
-                                        offset      : $dialogTimeMaxOffset.typedInput('value'),
-                                        multiplier  :  parseInt($dialogTimeMaxMultiplier.val())
-                                    };
-                                    result.valid.timeMax =result.valid.timeMax &&
-                                        result.timeMax.multiplier;
+                                if (!result.time.days || !result.time.months) {
+                                    result.validation.time.noMonthAllowed = false;
                                 }
-                                result.isValid = result.isValid && result.valid.time && result.valid.timeMin && result.valid.timeMax;
                             }
-                            result.valid.level = (result.level.operator === cNBC_RULE_OP.off) ||
-                                                 (result.level.operator === cNBC_RULE_OP.slatOversteer) ||
-                                                 (result.level.operator === cNBC_RULE_OP.topicOversteer) ||
-                                                 $dialogLevel.typedInput('validate');
-                            result.valid.slat = (result.level.operator === cNBC_RULE_OP.off) ||
-                                                (result.level.operator === cNBC_RULE_OP.topicOversteer) ||
-                                                (result.level.operator === cNBC_RULE_OP.levelMaxOversteer) ||
-                                                (result.level.operator === cNBC_RULE_OP.levelMinOversteer) ||
-                                                $dialogSlat.typedInput('validate');
-                            result.isValid = result.isValid && result.valid.level && result.valid.slat;
+                            switch (result.level.operator) {
+                                case cNBC_RULE_OP.off:
+                                    break;
+                                case cNBC_RULE_OP.topicOversteer:
+                                    result.validation.topicIsMissing = (result.topic !== '');
+                                    break;
+                                case cNBC_RULE_OP.levelAbsolute:
+                                case cNBC_RULE_OP.levelMinOversteer:
+                                case cNBC_RULE_OP.levelMaxOversteer:
+                                    result.validation.level = $dialogLevel.typedInput('validate');
+                                    result.validation.slat = $dialogSlat.typedInput('validate');
+                                    break;
+                                case cNBC_RULE_OP.slatOversteer:
+                                    result.validation.slat = $dialogSlat.typedInput('validate');
+                                    break;
+                                default:
+                                    result.validation.ruleOperator = false;
+                                    break;
+                            }
+                            result.validationError = checkObj(result.validation, '');
+                            result.isValid = (result.validationError === '');
                         } catch (err) {
                             console.log(err.message); // eslint-disable-line no-console
                             console.log(err.stack); // eslint-disable-line no-console
                             result.isValid = false;
-                            result.valid.error = err.message;
+                            result.validationError = err.message;
                         }
                         if (!result.isValid) {
-                            console.log('rule validation:',result.isValid, result.valid); // eslint-disable-line
+                            console.warn('Rule validation failed! Wrong element:', result.validationError, result.validation); // eslint-disable-line
+                            console.log('Rule Data:', result); // eslint-disable-line
                         } else {
-                            delete result.valid; // if valid, not needed
+                            delete result.validation; // if valid, not needed
                         }
                         return result;
                     }
@@ -3479,6 +4201,12 @@
                     function _dialogSaveData() {
                         const data = _dialogGetData();
                         data.description = getRuleDescription(node, selFields, data);
+                        if (data.level) delete data.level.operatorText;
+                        if (data.conditions) data.conditions.forEach(p => {
+                            delete p.operatorText;
+                            delete p.conditionText;
+                        });
+
                         $dialogDataRow.data('ruleData', JSON.stringify(data));
                         $('#rule-name-'+dialogDataIndex).text((data.name || 'rule ' + (dialogDataIndex + 1)) + ((data.importance > 0) ? ' ['+data.importance+']' : ''));
                         $('#rule-description-'+dialogDataIndex).html(data.description);
@@ -3594,7 +4322,7 @@
                 });
 
                 const overwriteExpire = parseFloat($('#blind-control-overwriteExpire').val());
-                if (isNaN(overwriteExpire) || overwriteExpire === '' || overwriteExpire === 0) {
+                if (isNaN(overwriteExpire) || overwriteExpire === 0) {
                     $('#node-input-overwriteExpire').val('');
                 } else {
                     let val = overwriteExpire * parseFloat($('#blind-control-overwriteExpire-multiplier').val());
@@ -3605,7 +4333,7 @@
                 }
 
                 const autoTriggerTime = parseFloat($('#blind-control-autoTriggerTime').val());
-                if (isNaN(autoTriggerTime) || autoTriggerTime === '' || autoTriggerTime <= 0) {
+                if (isNaN(autoTriggerTime) || autoTriggerTime <= 0) {
                     $('#node-input-autoTriggerTime').val(20*60000);
                 } else {
                     let val = autoTriggerTime * parseFloat($('#blind-control-autoTriggerTime-multiplier').val());
@@ -3616,7 +4344,7 @@
                 }
 
                 const startDelayTime = parseFloat($('#blind-control-startDelayTime').val());
-                if (isNaN(startDelayTime) || startDelayTime === '' || startDelayTime <= 0) {
+                if (isNaN(startDelayTime) || startDelayTime <= 0) {
                     $('#node-input-startDelayTime').val(0);
                     $('#time-control-startDelayTime-multiplier').val(60000);
                 } else {
@@ -3849,16 +4577,36 @@
             <div class="form-row form-row-sunControlActive block-noindent">
                 <span data-i18n="[html]node-red-contrib-sun-position/position-config:ruleCtrl.text.windowAzimuth" class="row-full-width" style="word-wrap:break-word;"></span>
             </div>
-            <div class="form-row form-row-sunControlActive block-indent1-noadd" data-i18n="[title]blind-control.placeholder.windowAzimuthStart">
+            <div class="form-row form-row-sunControlActive block-noindent" data-i18n="[title]blind-control.placeholder.windowSetMode">
+                <label for="node-input-windowSetMode"><i class="fa fa-compass"></i> <span data-i18n="blind-control.label.windowSetMode"></span></label>
+                <select id="node-input-windowSetMode" class="row-full-width">
+                    <option value="startEnd" data-i18n="[html]blind-control.label.windowSetModeAzimuthStartEnd"></option>
+                    <option value="orientation" data-i18n="[html]blind-control.label.windowSetModeOrientation"></option>
+                </select>
+            </div>
+            <div class="form-row form-row-sunControlActive block-indent1-noadd windowSetMode-azimuth" data-i18n="[title]blind-control.placeholder.windowAzimuthStart">
                 <label for="node-input-windowAzimuthStart"><i class="fa fa-compass fa-spin"></i> <span data-i18n="blind-control.label.windowAzimuthStart"></span></label>
                 <input type="text" class="row-full-width" id="node-input-windowAzimuthStart" data-i18n="[placeholder]blind-control.placeholder.windowAzimuthStart"/>
                 <input type="hidden" id="node-input-windowAzimuthStartType"/>
             </div>
-            <div class="form-row form-row-sunControlActive block-indent1-noadd" data-i18n="[title]blind-control.placeholder.windowAzimuthEnd">
+            <div class="form-row form-row-sunControlActive block-indent1-noadd windowSetMode-azimuth" data-i18n="[title]blind-control.placeholder.windowAzimuthEnd">
                 <label for="node-input-windowAzimuthEnd"><i class="fa fa-compass fa-spin"></i> <span data-i18n="blind-control.label.windowAzimuthEnd"></span></label>
                 <input type="text" class="row-full-width" id="node-input-windowAzimuthEnd" data-i18n="[placeholder]blind-control.placeholder.windowAzimuthEnd"/>
                 <input type="hidden" id="node-input-windowAzimuthEndType"/>
             </div>
+            <div class="form-row form-row-sunControlActive block-indent1-noadd windowSetMode-orientation is-initial-hidden" data-i18n="[title]blind-control.placeholder.windowOrientation">
+                <label for="node-input-windowOrientation"><i class="fa fa-compass fa-spin"></i> <span data-i18n="blind-control.label.windowOrientation"></span></label>
+                <input type="text" class="row-full-width" id="node-input-windowOrientation" data-i18n="[placeholder]blind-control.placeholder.windowOrientation"/>
+                <input type="hidden" id="node-input-windowOrientationType"/>
+            </div>
+            <div class="form-row form-row-sunControlActive block-indent1-noadd windowSetMode-orientation is-initial-hidden" data-i18n="[title]blind-control.placeholder.windowOffsetN">
+                <label for="node-input-windowOffsetN"><i class="fa fa-undo"></i> <span data-i18n="blind-control.label.windowOffsetN"></span></label>
+                <input type="text" class="row-full-width spinner-windowangle" id="node-input-windowOffsetN" data-i18n="[placeholder]blind-control.placeholder.windowOffsetN"/>
+            </div>
+            <div class="form-row form-row-sunControlActive block-indent1-noadd windowSetMode-orientation is-initial-hidden" data-i18n="[title]blind-control.placeholder.windowOffsetP">
+                <label for="node-input-windowOffsetP"><i class="fa fa-repeat"></i> <span data-i18n="blind-control.label.windowOffsetP"></span></label>
+                <input type="text" class="row-full-width spinner-windowangle" id="node-input-windowOffsetP" data-i18n="[placeholder]blind-control.placeholder.windowOffsetP"/>
+            </div>
             <div class="form-row form-row-sunControlRestriction block-noindent">
                 <span data-i18n="[html]node-red-contrib-sun-position/position-config:ruleCtrl.text.windowPos" class="row-full-width" style="word-wrap:break-word;"></span>
             </div>
@@ -4011,44 +4759,72 @@
             </div>
         </div>
         <hr class="mt-1 mb-1 pt-0 pb-0">
-        <div class="dialog-row pt-0" id="dialog-row-timeReg">
-            <label for="dlg-ip-btctl-rule-timeReg"><i class="fa fa-clock-o"></i> <span data-i18n="blind-control.label.time"></span></label>
-            <select id="dlg-ip-btctl-rule-timeReg-operator" class="ipadd dlg-ip-btctl-rule-timeReg-operator" >
+        <div class="dialog-row pt-0" id="dialog-row-timeStartReg">
+            <label for="dlg-ip-btctl-rule-timeStartReg"><i class="fa fa-clock-o"></i><i class="fa fa-hourglass-start"></i><span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeStart"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeStartReg" class="ipMain dlg-ip-btctl-rule-timeStartReg" value="" data-i18n="[placeholder]blind-control.placeholder.time"/>
+        </div>
+        <div class="dialog-row block-indent2" id="dialog-row-offset-timeStartReg">
+            <label for="dlg-ip-btctl-rule-offset-timeStartReg"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeOffset"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeStartReg" class="ipMain dlg-ip-btctl-rule-offset-timeStartReg" value="" data-i18n="[placeholder]blind-control.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeStartReg" class="ipadd dlg-ip-btctl-rule-multiplier-timeStartReg" >
+            </select>
+        </div>
+        <div class="dialog-row block-indent1" id="dialog-row-timeStartMin">
+            <label for="dlg-ip-btctl-rule-timeStartMin"><i class="fa fa-step-backward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin_start"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeStartMin" class="ipMain dlg-ip-btctl-rule-timeStartMin" value="" data-i18n="[placeholder]blind-control.placeholder.time"/>
+        </div>
+        <div class="dialog-row block-indent2" id="dialog-row-offset-timeStartMin">
+            <label for="dlg-ip-btctl-rule-offset-timeStartMin"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMinOffset_start"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeStartMin" class="ipMain dlg-ip-btctl-rule-offset-timeStartMin" value="" data-i18n="[placeholder]blind-control.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeStartMin" class="ipadd dlg-ip-btctl-rule-multiplier-timeStartMin">
             </select>
-            <input type="text" id="dlg-ip-btctl-rule-timeReg" class="ipMain dlg-ip-btctl-rule-timeReg" value="" data-i18n="[placeholder]blind-control.placeholder.time"/>
         </div>
-        <div class="dialog-row block-indent2" id="dialog-row-offset-timeReg">
-            <label for="dlg-ip-btctl-rule-offset-timeReg"><i class="fa fa-plus"></i> <span data-i18n="blind-control.label.offset"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-offset-timeReg" class="ipMain dlg-ip-btctl-rule-offset-timeReg" value="" data-i18n="[placeholder]blind-control.placeholder.offset"/>
-            <select  id="dlg-ip-btctl-rule-multiplier-timeReg" class="ipadd dlg-ip-btctl-rule-multiplier-timeReg" >
+        <div class="dialog-row block-indent1" id="dialog-row-timeStartMax">
+            <label for="dlg-ip-btctl-rule-timeStartMax"><i class="fa fa-step-forward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax_start"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeStartMax" class="ipMain dlg-ip-btctl-rule-timeStartMax" value="" data-i18n="[placeholder]blind-control.placeholder.time"/>
+        </div>
+        <div class="dialog-row block-indent2" id="dialog-row-offset-timeStartMax">
+            <label for="dlg-ip-btctl-rule-offset-timeStartMax"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMaxOffset_start"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeStartMax" class="ipMain dlg-ip-btctl-rule-offset-timeStartMax" value="" data-i18n="[placeholder]blind-control.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeStartMax" class="ipadd dlg-ip-btctl-rule-multiplier-timeStartMax">
+            </select>
+        </div>
+        <div class="dialog-row pt-2" id="dialog-row-timeEndReg">
+            <label for="dlg-ip-btctl-rule-timeEndReg"><i class="fa fa-clock-o"></i><i class="fa fa-hourglass-end"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeEnd"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeEndReg" class="ipMain dlg-ip-btctl-rule-timeEndReg" value="" data-i18n="[placeholder]blind-control.placeholder.time"/>
+        </div>
+        <div class="dialog-row block-indent2" id="dialog-row-timeEndReg-offset">
+            <label for="dlg-ip-btctl-rule-offset-timeEndReg"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeOffset"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeEndReg" class="ipMain dlg-ip-btctl-rule-offset-timeEndReg" value="" data-i18n="[placeholder]blind-control.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeEndReg" class="ipadd dlg-ip-btctl-rule-multiplier-timeEndReg" >
             </select>
         </div>
-        <div class="dialog-row block-indent1" id="dialog-row-timeMin">
-            <label for="dlg-ip-btctl-rule-timeMin"><i class="fa fa-step-backward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-timeMin" class="ipMain dlg-ip-btctl-rule-timeMin" value="" data-i18n="[placeholder]blind-control.placeholder.time"/>
+        <div class="dialog-row block-indent1" id="dialog-row-timeEndMin">
+            <label for="dlg-ip-btctl-rule-timeEndMin"><i class="fa fa-step-backward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin_end"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeEndMin" class="ipMain dlg-ip-btctl-rule-timeEndMin" value="" data-i18n="[placeholder]blind-control.placeholder.time"/>
         </div>
-        <div class="dialog-row block-indent2" id="dialog-row-offset-timeMin">
-            <label for="dlg-ip-btctl-rule-offset-timeMin"><i class="fa fa-plus"></i> <span data-i18n="blind-control.label.offset-timeMin"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-offset-timeMin" class="ipMain dlg-ip-btctl-rule-offset-timeMin" value="" data-i18n="[placeholder]blind-control.placeholder.offset"/>
-            <select  id="dlg-ip-btctl-rule-multiplier-timeMin" class="ipadd dlg-ip-btctl-rule-multiplier-timeMin">
+        <div class="dialog-row block-indent2" id="dialog-row-timeEndMin-offset">
+            <label for="dlg-ip-btctl-rule-offset-timeEndMin"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMinOffset_end"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeEndMin" class="ipMain dlg-ip-btctl-rule-offset-timeEndMin" value="" data-i18n="[placeholder]blind-control.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeEndMin" class="ipadd dlg-ip-btctl-rule-multiplier-timeEndMin">
             </select>
         </div>
-        <div class="dialog-row block-indent1" id="dialog-row-timeMax">
-            <label for="dlg-ip-btctl-rule-timeMax"><i class="fa fa-step-forward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-timeMax" class="ipMain dlg-ip-btctl-rule-timeMax" value="" data-i18n="[placeholder]blind-control.placeholder.time"/>
+        <div class="dialog-row block-indent1" id="dialog-row-timeEndMax">
+            <label for="dlg-ip-btctl-rule-timeEndMax"><i class="fa fa-step-forward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax_end"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeEndMax" class="ipMain dlg-ip-btctl-rule-timeEndMax" value="" data-i18n="[placeholder]blind-control.placeholder.time"/>
         </div>
-        <div class="dialog-row block-indent2" id="dialog-row-offset-timeMax">
-            <label for="dlg-ip-btctl-rule-offset-timeMax"><i class="fa fa-plus"></i> <span data-i18n="blind-control.label.offset-timeMax"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-offset-timeMax" class="ipMain dlg-ip-btctl-rule-offset-timeMax" value="" data-i18n="[placeholder]blind-control.placeholder.offset"/>
-            <select  id="dlg-ip-btctl-rule-multiplier-timeMax" class="ipadd dlg-ip-btctl-rule-multiplier-timeMax">
+        <div class="dialog-row block-indent2" id="dialog-row-timeEndMax-offset">
+            <label for="dlg-ip-btctl-rule-offset-timeEndMax"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMaxOffset_end"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeEndMax" class="ipMain dlg-ip-btctl-rule-offset-timeEndMax" value="" data-i18n="[placeholder]blind-control.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeEndMax" class="ipadd dlg-ip-btctl-rule-multiplier-timeEndMax">
             </select>
         </div>
-        <div class="dialog-row dialog-row-timeLimits-ph is-to-show-initially" id="dialog-row-timeConstraintsPlaceholder">
+        <div class="dialog-row dialog-row-timeLimits-ph is-to-show-initially pt-2" id="dialog-row-timeConstraintsPlaceholder">
             <div class="dlg-ip-btctl-rule-timecontraintctrl" id="dialog-row-timeConstraints-show">
                 <button class="dialog-element-clickable" data-i18n="blind-control.label.timeconstraintshow"></button>
             </div>
         </div>
-        <div class="dialog-row dialog-row-timeLimits is-initial-hidden" id="dialog-row-timeConstraints">
+        <div class="dialog-row dialog-row-timeLimits is-initial-hidden pt-2" id="dialog-row-timeConstraints">
             <div class="dlg-ip-btctl-rule-timecontraintctrl" id="dialog-row-timeConstraints-hide">
                 <button class="dialog-element-clickable" data-i18n="blind-control.label.timeconstrainthide"></button>
             </div>
@@ -4121,6 +4897,11 @@
             <input type="text" id="dlg-ip-btctl-rule-topic" class="ipalone" data-i18n="[placeholder]node-red:common.label.topic"/>
         </div>
         <hr class="mt-1 mb-1 pt-0 pb-0" id="dialog-hr-overwrite">
+        <div class="dialog-row pt-0" id="dialog-row-exec" data-i18n="[title]blind-control.placeholder.exec">
+            <label for="dlg-ip-btctl-rule-exec"><i class="fa fa-sort"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExec"></span></label>
+            <select  id="dlg-ip-btctl-rule-exec" class="ipalone dlg-ip-btctl-rule-exec" >
+            </select>
+        </div>
         <div class="dialog-row pt-0 is-initial-hidden" id="dialog-row-resetOverwrite" data-i18n="[title]blind-control.placeholder.ruleResetOverwrite">
             <label for="dlg-ip-btctl-rule-resetOverwrite"><i class="fa fa-thumbs-o-down"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleOverwrite"></span></label>
             <input type="checkbox" id="dlg-ip-btctl-rule-resetOverwrite" style="width: auto;"/>
@@ -4308,6 +5089,8 @@
     }
     .dialog-element-clickable {
         user-select: none;
+        -ms-user-select: none;
+        -webkit-user-select: none;
         cursor: pointer;
         touch-action: manipulation;
         display: inline-block;
@@ -4356,8 +5139,13 @@
         margin-right: 16px; /*28px;*/
     }
     .rdgtimer-rule-name-span {
-        width: 30%; /* width: 120px; */
+        width: 25%; /* width: 120px; */
+        float: left;
+    }
+    .rdgtimer-rule-exec-span {
+        margin-right: 5px;
         float: left;
+        box-shadow: 1px 1px 1px 1px rgb(0 0 0 / 20%);
     }
     .rdgtimer-rule-description-span {
         font-size: 10px;
@@ -4400,4 +5188,4 @@
     .rdgtimer-rule-stateBtn {
         right: 58px;
     }
-</style>
+</style>
\ No newline at end of file
diff --git a/nodes/80-blind-control.js b/nodes/80-blind-control.js
index 95beed1a..cb03d090 100644
--- a/nodes/80-blind-control.js
+++ b/nodes/80-blind-control.js
@@ -30,12 +30,11 @@
  * @typedef {import('./types/typedefs.js').runtimeNode} runtimeNode
  * @typedef {import('./types/typedefs.js').runtimeNodeConfig} runtimeNodeConfig
  * @typedef {import("./lib/dateTimeHelper").ITimeObject} ITimeObject
- * @typedef {import("./10-position-config.js").IPositionConfigNode} IPositionConfigNode
  * @typedef {import("./10-position-config.js").ITypedValue} ITypedValue
  * @typedef {import("./lib/timeControlHelper.js").ITimeControlNode} ITimeControlNode
+ * @typedef {import("./lib/timeControlHelper.js").IPositionConfigNode} IPositionConfigNode
  */
 
-
 /**
  * @typedef {Object} IBlindNodeData Node data object
  * @property {boolean} isDisabled           - is the node disabled
@@ -63,10 +62,15 @@
  * @property {string} topType               - type of the top of the window
  * @property {*} bottom                     - the bottom of the window
  * @property {string} bottomType            - type of the bottom of the window
- * @property {*} azimuthStart               - the orientation angle to the geographical north
- * @property {string} azimuthStartType      - type of the orientation angle to the geographical north
- * @property {*} azimuthEnd                 - the offset for the angle clockwise offset
- * @property {string} azimuthEndType        - type of the offset for the angle clockwise offset
+ * @property {('startEnd'|'orientation')} setMode   - mode of the start/end angles
+ * @property {*} azimuthStart               - the start position angle to the geographical north
+ * @property {string} azimuthStartType      - type of the start position angle to the geographical north
+ * @property {*} azimuthEnd                 - the end position angle to the geographical north
+ * @property {string} azimuthEndType        - type of the end position angle to the geographical north
+ * @property {*} windowOrientation          - the orientation angle to the geographical north
+ * @property {string} windowOrientationType - type of the  the orientation angle to the geographical north
+ * @property {number} windowOffsetP         - an offset for the angle clockwise offset
+ * @property {number} windowOffsetN         - an offset for the angle anti-clockwise offset
  */
 
 /**
@@ -120,22 +124,11 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
     const clonedeep = require('lodash.clonedeep');
     const isEqual = require('lodash.isequal');
 
-    const cRuleUntil = 0;
-    const cRuleFrom = 1;
-    const cRule = {
-        levelAbsolute : 0,
-        levelMinOversteer : 1,  // ⭳❗ minimum (oversteer)
-        levelMaxOversteer : 2, // ⭱️❗ maximum (oversteer)
-        slatOversteer : 5,
-        topicOversteer : 8,
-        off : 9
-    };
-    const cautoTriggerTimeBeforeSun = 10 * 60000; // 10 min
-    const cautoTriggerTimeSun = 5 * 60000; // 5 min
+    const cautoTriggerTimeBeforeSun = 10 * hlp.TIME_1min; // 10 min
+    const cautoTriggerTimeSun = 5 * hlp.TIME_1min; // 5 min
     const cWinterMode = 1;
     const cMinimizeMode = 3;
     const cSummerMode = 16;
-    const cRuleDefault = -1;
     /******************************************************************************************/
     /**
      * get the absolute level from percentage level
@@ -200,8 +193,19 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
     /**
      * check if angle is between start and end
+     * @param {number} angle    - angle in decimal degree
+     * @param {number} start    - angle in decimal degree or rad, based on angleType
+     * @param {number} end      - angle in decimal degree
+     * @param {('deg'|'rad')} angleType      - angle type
+     * @return {Boolean}
      */
-    function angleBetween_(angle, start, end) {
+    function angleBetween_(angle, start, end, angleType) {
+        if (angleType === 'rad') {
+            start = hlp.toDec(start);
+            end = hlp.toDec(end);
+        }
+        start = hlp.angleNorm(start);
+        end = hlp.angleNorm(end);
         if(start<end) return start<=angle && angle<=end;
         return               start<=angle || angle<=end;
     }
@@ -225,18 +229,22 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                         value: el.value,
                         type: el.valueType,
                         expr: el.valueExpr,
-                        callback: (result, _obj) => {
-                            return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData);
-                        }
+                        callback: (result, _obj, cachable) => {
+                            return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                        },
+                        noError:false,
+                        now:oNow.now
                     },
                     el.operator,
                     {
                         value: el.threshold,
                         type: el.thresholdType,
-                        callback: (result, _obj) => {
-                            return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData);
-                        }
-                    }, false, oNow.now)));
+                        callback: (result, _obj, cachable) => {
+                            return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                        },
+                        noError:false,
+                        now:oNow.now
+                    })));
         } catch (err) {
             node.error(RED._('blind-control.errors.getOversteerData', err));
             node.log(util.inspect(err));
@@ -247,12 +255,15 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
     /******************************************************************************************/
     /**
      * get the blind level from a typed input
-     * @param {IBlindControlNode} node node data
-     * @param {string} type type field
-     * @param {string} value value field
-     * @returns blind level as number or NaN if not defined
+     * @param {IBlindControlNode} node  - node data
+     * @param {*} msg                   - message object
+     * @param {string} type             - type field
+     * @param {string} value            - value field
+     * @param {number|NaN} def          - default value
+     * @param {Object} tempData         - the temporary data holder object
+     * @returns {number|NaN} blind level as number or NaN if not defined
      */
-    function getBlindPosFromTI(node, msg, type, value, def) {
+    function getBlindPosFromTI(node, msg, type, value, def, tempData) {
         // node.debug(`getBlindPosFromTI - type=${type} value=${value} def=${def} nodeData=${ util.inspect(node.nodeData, { colors: true, compact: 5, breakLength: Infinity, depth: 10 }) }`);
         def = def || NaN;
         if (type === 'none' || type === ''|| type === 'levelND') {
@@ -279,7 +290,15 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 }
                 throw new Error(`unknown value "${value}" of type "${type}"` );
             }
-            const res = node.positionConfig.getFloatProp(node, msg, type, value, def);
+            const res = node.positionConfig.getFloatProp(node, msg,
+                {
+                    type,
+                    value,
+                    def,
+                    callback: (result, _obj, cachable) => {
+                        return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                    }
+                });
             if (node.levelReverse) {
                 return getInversePos_(node, res);
             }
@@ -404,31 +423,77 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
     /******************************************************************************************/
     /**
      * calculates for the blind the new level
-     * @param {IBlindControlNode} node the node data
-     * @param {Object} msg the message object
-     * @param {ITimeObject} oNow the now Object
-     * @param {Object} tempData the temporary data holder object
-     * @param {Object} prevData the nodes previous data
-     * @returns the sun position object
+     * @param {IBlindControlNode} node  - the node data
+     * @param {Object} msg              - the message object
+     * @param {ITimeObject} oNow        - the now Object
+     * @param {Object} tempData         - the temporary data holder object
+     * @param {Object} prevData         - the nodes previous data
+     * @returns {Object} the sun position object
      */
     function calcBlindSunPosition(node, msg, oNow, tempData, prevData) {
         // node.debug('calcBlindSunPosition: calculate blind position by sun');
         // sun control is active
         const sunPosition = node.positionConfig.getSunCalc(oNow.now, false, false);
         // node.debug('sunPosition: ' + util.inspect(sunPosition, { colors: true, compact: 5, breakLength: Infinity, depth: 10 }));
+        let /** @type {number} */ azimuthStart, /** @type {number} */ azimuthEnd;
+        if (node.windowSettings.setMode === 'orientation') {
+            const orientationValue = node.positionConfig.getFloatProp(node, msg, {
+                type: node.windowSettings.windowOrientationType,
+                value: node.windowSettings.windowOrientation,
+                def: NaN,
+                callback: (result, _obj, cachable) => {
+                    return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                },
+                /* callback: (result, _obj) => {
+                    if (result !== null && typeof result !== 'undefined') {
+                        tempData[_obj.type + '.' + _obj.value] = result;
+                    }
+                    return result;
+                }, */
+                noError: true,
+                now: oNow.now
+            });
+            azimuthStart = orientationValue - node.windowSettings.windowOffsetN;
+            azimuthEnd = orientationValue + node.windowSettings.windowOffsetP;
+        } else {
+            azimuthStart = node.positionConfig.getFloatProp(node, msg, {
+                type: node.windowSettings.azimuthStartType,
+                value: node.windowSettings.azimuthStart,
+                def: NaN,
+                callback: (result, _obj, cachable) => {
+                    return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                },
+                /*
+                callback: (result, _obj) => {
+                    if (result !== null && typeof result !== 'undefined') {
+                        tempData[_obj.type + '.' + _obj.value] = result;
+                    }
+                    return result;
+                }, */
+                noError: true,
+                now: oNow.now
+            });
 
-        const azimuthStart = node.positionConfig.getFloatProp(node, msg, node.windowSettings.azimuthStartType, node.windowSettings.azimuthStart, NaN, (result, _obj) => {
-            if (result !== null && typeof result !== 'undefined') {
-                tempData[_obj.type + '.' + _obj.value] = result;
-            }
-        }, true, oNow.now);
-        const azimuthEnd = node.positionConfig.getFloatProp(node, msg, node.windowSettings.azimuthEndType, node.windowSettings.azimuthEnd, NaN, (result, _obj) => {
-            if (result !== null && typeof result !== 'undefined') {
-                tempData[_obj.type + '.' + _obj.value] = result;
-            }
-        }, true, oNow.now);
+            azimuthEnd = node.positionConfig.getFloatProp(node, msg, {
+                type: node.windowSettings.azimuthEndType,
+                value: node.windowSettings.azimuthEnd,
+                def: NaN,
+                callback: (result, _obj, cachable) => {
+                    return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                },
+                /*
+                callback: (result, _obj) => {
+                    if (result !== null && typeof result !== 'undefined') {
+                        tempData[_obj.type + '.' + _obj.value] = result;
+                    }
+                    return result;
+                }, */
+                noError: true,
+                now: oNow.now
+            });
+        }
+        sunPosition.InWindow = angleBetween_(sunPosition.azimuthDegrees, azimuthStart, azimuthEnd, node.positionConfig.angleType);
 
-        sunPosition.InWindow = angleBetween_(sunPosition.azimuthDegrees, azimuthStart, azimuthEnd);
         // node.debug(`sunPosition: InWindow=${sunPosition.InWindow} azimuthDegrees=${sunPosition.azimuthDegrees} AzimuthStart=${azimuthStart} AzimuthEnd=${azimuthEnd}`);
         if (node.autoTrigger ) {
             if ((sunPosition.altitudeDegrees <= 0)) {
@@ -517,21 +582,57 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             return sunPosition;
         }
 
-        const floorLength = node.positionConfig.getFloatProp(node, msg, node.sunData.floorLengthType, node.sunData.floorLength, NaN, (result, _obj) => {
-            if (result !== null && typeof result !== 'undefined') {
-                tempData[_obj.type + '.' + _obj.value] = result;
-            }
-        }, true, oNow.now);
-        const wTop = node.positionConfig.getFloatProp(node, msg, node.windowSettings.topType, node.windowSettings.top, NaN, (result, _obj) => {
-            if (result !== null && typeof result !== 'undefined') {
-                tempData[_obj.type + '.' + _obj.value] = result;
-            }
-        }, true, oNow.now);
-        const wBottom = node.positionConfig.getFloatProp(node, msg, node.windowSettings.bottomType, node.windowSettings.bottom, NaN, (result, _obj) => {
-            if (result !== null && typeof result !== 'undefined') {
-                tempData[_obj.type + '.' + _obj.value] = result;
-            }
-        }, true, oNow.now);
+        const floorLength = node.positionConfig.getFloatProp(node, msg, {
+            type: node.sunData.floorLengthType,
+            value: node.sunData.floorLength,
+            def: NaN,
+            callback: (result, _obj, cachable) => {
+                return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+            },
+            /*
+            callback: (result, _obj) => {
+                if (result !== null && typeof result !== 'undefined') {
+                    tempData[_obj.type + '.' + _obj.value] = result;
+                }
+                return result;
+            }, */
+            noError: true,
+            now: oNow.now
+        });
+        const wTop = node.positionConfig.getFloatProp(node, msg, {
+            type: node.windowSettings.topType,
+            value: node.windowSettings.top,
+            def: NaN,
+            callback: (result, _obj, cachable) => {
+                return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+            },
+            /*
+            callback: (result, _obj) => {
+                if (result !== null && typeof result !== 'undefined') {
+                    tempData[_obj.type + '.' + _obj.value] = result;
+                }
+                return result;
+            }, */
+            noError: true,
+            now: oNow.now
+        });
+        const wBottom = node.positionConfig.getFloatProp(node, msg, {
+            type: node.windowSettings.bottomType,
+            value: node.windowSettings.bottom,
+            def: NaN,
+            callback: (result, _obj, cachable) => {
+                return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+            },
+            /*
+            callback: (result, _obj) => {
+                if (result !== null && typeof result !== 'undefined') {
+                    tempData[_obj.type + '.' + _obj.value] = result;
+                }
+                return result;
+            }, */
+            noError: true,
+            now: oNow.now
+        });
 
         const height = Math.tan(sunPosition.altitudeRadians) * floorLength;
         // node.debug(`height=${height} - altitude=${sunPosition.altitudeRadians} - floorLength=${floorLength}`);
@@ -576,7 +677,8 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             // node.debug(`set next time - smoothTime= ${node.smoothTime}  changeAgain= ${node.sunData.changeAgain} nowNr=` + oNow.nowNr);
         }
         const levelMin = getBlindPosFromTI(node, msg, node.nodeData.levelMin.type, node.nodeData.levelMin.value, node.nodeData.levelBottom);
-        const levelMax = getBlindPosFromTI(node, msg, node.nodeData.levelMin.type, node.nodeData.levelMin.value, node.nodeData.levelBottom);
+        // const levelMax = getBlindPosFromTI(node, msg, node.nodeData.levelMin.type, node.nodeData.levelMin.value, node.nodeData.levelBottom);
+        const levelMax = getBlindPosFromTI(node, msg, node.nodeData.levelMax.type, node.nodeData.levelMax.value, node.nodeData.levelTop);
         if (node.level.current < levelMin)  {
             // min
             node.debug(`${node.level.current} is below ${levelMin} (min)`);
@@ -623,212 +725,137 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
      * @param {Object} msg the message object
      * @param {ITimeObject} oNow the *current* date Object
      * @param {Object} tempData the object storing the temporary caching data
-     * @returns the active rule or null
+     * @returns {Object} the active rule or null
      */
     function checkRules(node, msg, oNow, tempData) {
         // node.debug('checkRules --------------------');
-        const livingRuleData = {};
         ctrlLib.prepareRules(node, msg, tempData, oNow.now);
-        // node.debug(`checkRules rules.count=${node.rules.count}, rules.lastUntil=${node.rules.lastUntil}, oNow=${util.inspect(oNow, {colors:true, compact:10})}`);
-
-        let ruleSel = null;
-        let ruleSlatOvs = null;
-        let ruleTopicOvs = null;
-        let ruleSelMin = null;
-        let ruleSelMax = null;
-        let ruleindex = -1;
-        // node.debug(`first loop count:${ node.rules.count } lastuntil:${ node.rules.lastUntil}`);
-        for (let i = 0; i <= node.rules.lastUntil; ++i) {
-            const rule = node.rules.data[i];
-            if (!rule.enabled) { continue; }
-            if (rule.time && rule.time.operator === cRuleFrom) { continue; }
-            const res = ctrlLib.compareRules(node, msg, rule, r => (r >= oNow.nowNr), oNow);
-            if (res) {
-                // node.debug(`1. ruleSel ${rule.name} (${rule.pos}) level.operator=${ res.level.operator }`);
-                if (res.level.operator === cRule.slatOversteer) {
-                    ruleSlatOvs = res;
-                } else if (res.level.operator === cRule.topicOversteer) {
-                    ruleTopicOvs = res;
-                } else if (res.level.operator === cRule.levelMinOversteer) {
-                    ruleSelMin = res;
-                } else if (res.level.operator === cRule.levelMaxOversteer) {
-                    ruleSelMax = res;
-                } else {
-                    ruleSel = res;
-                    ruleindex = i;
-                    break;
-                }
-            }
-        }
-
-        if (!ruleSel || (ruleSel.time && ruleSel.time.operator === cRuleFrom) ) {
-            // node.debug('--------- starting second loop ' + node.rules.count);
-            for (let i = (node.rules.count - 1); i >= 0; --i) {
-                const rule = node.rules.data[i];
-                // node.debug(`rule ${rule.name} (${rule.pos}) enabled=${rule.enabled} operator=${rule.time.operator} noUntil=${rule.time.operator !== cRuleUntil} data=${util.inspect(rule, {colors:true, compact:10, breakLength: Infinity })}`);
-                if (!rule.enabled) { continue; }
-                if (rule.time && rule.time.operator === cRuleUntil) { continue; } // - From: timeOp === cRuleFrom
-                const res = ctrlLib.compareRules(node, msg, rule, r => (r <= oNow.nowNr), oNow);
-                if (res) {
-                    // node.debug(`2. ruleSel ${rule.name} (${rule.pos}) data=${ util.inspect(res, { colors: true, compact: 10, breakLength: Infinity }) }`);
-                    if (res.level.operator === cRule.slatOversteer) {
-                        ruleSlatOvs = res;
-                    } else if (res.level.operator === cRule.topicOversteer) {
-                        ruleTopicOvs = res;
-                    } else if (res.level.operator === cRule.levelMinOversteer) {
-                        ruleSelMin = res;
-                    } else if (res.level.operator === cRule.levelMaxOversteer) {
-                        ruleSelMax = res;
-                    } else {
-                        ruleSel = res;
-                        break;
-                    }
-                }
-            }
-        }
+        const rule = ctrlLib.getActiveRule(node, msg, oNow, tempData);
+        const livingRuleData = {};
 
         livingRuleData.importance = 0;
         livingRuleData.resetOverwrite = false;
-        if (ruleTopicOvs) {
+        if (rule.ruleTopicOvs) {
             livingRuleData.topicOversteer = {
-                id: ruleTopicOvs.pos,
-                name: ruleTopicOvs.name,
-                conditional: ruleTopicOvs.conditional,
-                timeLimited: (!!ruleTopicOvs.time),
-                conditon: ruleTopicOvs.conditon,
-                time: ruleTopicOvs.timeData,
-                importance: ruleTopicOvs.importance,
-                topic : ruleTopicOvs.topic || ''
+                id: rule.ruleTopicOvs.pos,
+                name: rule.ruleTopicOvs.name,
+                conditional: rule.ruleTopicOvs.conditional,
+                timeLimited: (!!rule.ruleTopicOvs.time),
+                conditon: rule.ruleTopicOvs.conditonResult,
+                time: rule.ruleTopicOvs.timeResult,
+                importance: rule.ruleTopicOvs.importance,
+                topic : rule.ruleTopicOvs.topic || ''
             };
+            delete rule.ruleTopicOvs;
         }
-        if (ruleSlatOvs) {
+        if (rule.ruleSlatOvs) {
             livingRuleData.slatOversteer = {
-                id: ruleSlatOvs.pos,
-                name: ruleSlatOvs.name,
-                conditional: ruleSlatOvs.conditional,
-                timeLimited: (!!ruleSlatOvs.time),
-                conditon: ruleSlatOvs.conditon,
-                time: ruleSlatOvs.timeData,
-                slat: node.positionConfig.getPropValue(node, msg, ruleSlatOvs.slat, false, oNow.now),
-                importance: ruleSlatOvs.importance
+                id: rule.ruleSlatOvs.pos,
+                name: rule.ruleSlatOvs.name,
+                conditional: rule.ruleSlatOvs.conditional,
+                timeLimited: (!!rule.ruleSlatOvs.time),
+                conditon: rule.ruleSlatOvs.conditonResult,
+                time: rule.ruleSlatOvs.timeResult,
+                slat: node.positionConfig.getPropValue(node, msg, rule.ruleSlatOvs.slat, false, oNow.now),
+                importance: rule.ruleSlatOvs.importance
             };
+            delete rule.ruleSlatOvs;
         }
         livingRuleData.hasMinimum = false;
-        if (ruleSelMin) {
-            const lev = getBlindPosFromTI(node, msg, ruleSelMin.level.type, ruleSelMin.level.value, -1);
-            // node.debug('ruleSelMin ' + lev + ' -- ' + util.inspect(ruleSelMin, { colors: true, compact: 10, breakLength: Infinity }));
+        if (rule.ruleSelMin) {
+            const lev = getBlindPosFromTI(node, msg, rule.ruleSelMin.level.type, rule.ruleSelMin.level.value, -1);
+            // node.debug('rule.ruleSelMin ' + lev + ' -- ' + util.inspect(rule.ruleSelMin, { colors: true, compact: 5, breakLength: Infinity, depth: 10 }));
             if (lev > -1) {
                 livingRuleData.levelMinimum = lev;
                 livingRuleData.hasMinimum = true;
                 livingRuleData.minimum = {
-                    id: ruleSelMin.pos,
-                    name: ruleSelMin.name,
-                    conditional: ruleSelMin.conditional,
-                    timeLimited: (!!ruleSelMin.time),
-                    conditon: ruleSelMin.conditon,
-                    time: ruleSelMin.timeData
-                    // slat: node.positionConfig.getPropValue(node, msg, ruleSelMin.slat, false, oNow.now)
-                    // importance: ruleSelMin.importance,
-                    // resetOverwrite: ruleSelMin.resetOverwrite,
-                    // topic : ruleSelMin.topic
+                    id: rule.ruleSelMin.pos,
+                    name: rule.ruleSelMin.name,
+                    conditional: rule.ruleSelMin.conditional,
+                    timeLimited: (!!rule.ruleSelMin.time),
+                    conditon: rule.ruleSelMin.conditonResult,
+                    time: rule.ruleSelMin.timeResult
+                    // slat: node.positionConfig.getPropValue(node, msg, rule.ruleSelMin.slat, false, oNow.now)
+                    // importance: rule.ruleSelMin.importance,
+                    // resetOverwrite: rule.ruleSelMin.resetOverwrite,
+                    // topic : rule.ruleSelMin.topic
                 };
             }
+            delete rule.ruleSelMin;
         }
         livingRuleData.hasMaximum = false;
-        if (ruleSelMax) {
-            const lev = getBlindPosFromTI(node, msg, ruleSelMax.level.type, ruleSelMax.level.value, -1);
-            // node.debug('ruleSelMax ' + lev + ' -- ' + util.inspect(ruleSelMax, { colors: true, compact: 10, breakLength: Infinity }) );
+        if (rule.ruleSelMax) {
+            const lev = getBlindPosFromTI(node, msg, rule.ruleSelMax.level.type, rule.ruleSelMax.level.value, -1);
+            // node.debug('rule.ruleSelMax ' + lev + ' -- ' + util.inspect(rule.ruleSelMax, { colors: true, compact: 5, breakLength: Infinity, depth: 10 }) );
             if (lev > -1) {
                 livingRuleData.levelMaximum = lev;
                 livingRuleData.hasMaximum = true;
                 livingRuleData.maximum = {
-                    id: ruleSelMax.pos,
-                    name: ruleSelMax.name,
-                    conditional: ruleSelMax.conditional,
-                    timeLimited: (!!ruleSelMax.time),
-                    conditon: ruleSelMax.conditon,
-                    time: ruleSelMax.timeData
-                    // slat: node.positionConfig.getPropValue(node, msg, ruleSelMax.slat, false, oNow.now)
-                    // importance: ruleSelMax.importance,
-                    // resetOverwrite: ruleSelMax.resetOverwrite,
-                    // topic : ruleSelMax.topic
+                    id: rule.ruleSelMax.pos,
+                    name: rule.ruleSelMax.name,
+                    conditional: rule.ruleSelMax.conditional,
+                    timeLimited: (!!rule.ruleSelMax.time),
+                    conditon: rule.ruleSelMax.conditonResult,
+                    time: rule.ruleSelMax.timeResult
+                    // slat: node.positionConfig.getPropValue(node, msg, rule.ruleSelMax.slat, false, oNow.now)
+                    // importance: rule.ruleSelMax.importance,
+                    // resetOverwrite: rule.ruleSelMax.resetOverwrite,
+                    // topic : rule.ruleSelMax.topic
                 };
             }
+            delete rule.ruleSelMax;
         }
-        const checkRuleForAT = rule => {
-            if (!rule.time) {
-                return;
-            }
-            const num = ctrlLib.getRuleTimeData(node, msg, rule, oNow);
-            if (num > oNow.nowNr) {
-                node.debug('autoTrigger set to rule ' + rule.pos);
-                const diff = num - oNow.nowNr;
-                node.autoTrigger.time = Math.min(node.autoTrigger.time, diff);
-                node.autoTrigger.type = 2; // next rule
-            }
-        };
-        if (ruleSel) {
-            // ruleSel.text = '';
-            // node.debug('ruleSel ' + util.inspect(ruleSel, {colors:true, compact:10, breakLength: Infinity }));
-            livingRuleData.id = ruleSel.pos;
-            livingRuleData.name = ruleSel.name;
-            livingRuleData.importance = ruleSel.importance;
-            livingRuleData.resetOverwrite = ruleSel.resetOverwrite;
+
+        if (rule.ruleSel) {
+            // rule.ruleSel.text = '';
+            // node.debug('rule.ruleSel ' + util.inspect(rule.ruleSel, {colors:true, compact:10, breakLength: Infinity }));
+            livingRuleData.id = rule.ruleSel.pos;
+            livingRuleData.name = rule.ruleSel.name;
+            livingRuleData.importance = rule.ruleSel.importance;
+            livingRuleData.resetOverwrite = rule.ruleSel.resetOverwrite;
             livingRuleData.code = 4;
-            livingRuleData.topic = ruleSel.topic;
-
-            if (node.autoTrigger) {
-                if (ruleSel.time && ruleSel.timeData.ts > oNow.nowNr) {
-                    node.debug('autoTrigger set to rule ' + ruleSel.pos + ' (current)');
-                    const diff = ruleSel.timeData.ts - oNow.nowNr;
-                    node.autoTrigger.time = Math.min(node.autoTrigger.time, diff);
-                    node.autoTrigger.type = 1; // current rule end
-                } else {
-                    for (let i = (ruleindex+1); i < node.rules.count; ++i) {
-                        const rule = node.rules.data[i];
-                        if (!rule.time) {
-                            continue;
-                        }
-                        checkRuleForAT(rule);
-                    }
-                    // check first rule, maybe next day
-                    if ((node.autoTrigger.type !== 2) && (node.rules.firstTimeLimited < node.rules.count)) {
-                        checkRuleForAT(node.rules.data[node.rules.firstTimeLimited]);
-                    }
-                }
-            }
+            livingRuleData.topic = rule.ruleSel.topic;
 
-            livingRuleData.conditional = ruleSel.conditional;
-            livingRuleData.timeLimited = (!!ruleSel.time);
+            livingRuleData.active = true;
+            livingRuleData.conditional = rule.ruleSel.conditional;
+            livingRuleData.timeLimited = (!!rule.ruleSel.time);
 
-            const data = { number: ruleSel.pos, name: ruleSel.name };
+            const data = { number: rule.ruleSel.pos, name: rule.ruleSel.name };
             let name = 'rule';
-            if (ruleSel.conditional) {
-                livingRuleData.conditon = ruleSel.conditon;
-                data.text = ruleSel.conditon.text;
-                data.textShort = ruleSel.conditon.textShort;
+            if (rule.ruleSel.conditional) {
+                livingRuleData.conditon = rule.ruleSel.conditonResult;
+                data.text = rule.ruleSel.conditonResult.text;
+                data.textShort = rule.ruleSel.conditonResult.textShort;
                 name = 'ruleCond';
             }
-            if (ruleSel.time && ruleSel.timeData) {
-                livingRuleData.time = ruleSel.timeData;
-                livingRuleData.time.timeLocal = node.positionConfig.toTimeString(ruleSel.timeData.value);
-                livingRuleData.time.timeLocalDate = node.positionConfig.toDateString(ruleSel.timeData.value);
-                livingRuleData.time.dateISO= ruleSel.timeData.value.toISOString();
-                livingRuleData.time.dateUTC= ruleSel.timeData.value.toUTCString();
-                data.timeOp = ruleSel.time.operatorText;
-                data.timeLocal = livingRuleData.time.timeLocal;
-                data.time = livingRuleData.time.dateISO;
-                name = (ruleSel.conditional) ? 'ruleTimeCond' : 'ruleTime';
+            if (rule.ruleSel.time && rule.ruleSel.timeResult) {
+                livingRuleData.time = rule.ruleSel.timeResult;
+                if (livingRuleData.time.start) {
+                    livingRuleData.time.start.timeLocal = node.positionConfig.toTimeString(rule.ruleSel.timeResult.start.value);
+                    livingRuleData.time.start.timeLocalDate = node.positionConfig.toDateString(rule.ruleSel.timeResult.start.value);
+                    livingRuleData.time.start.dateISO= rule.ruleSel.timeResult.start.value.toISOString();
+                    livingRuleData.time.start.dateUTC= rule.ruleSel.timeResult.start.value.toUTCString();
+                }
+                if (livingRuleData.time.end) {
+                    livingRuleData.time.end.timeLocal = node.positionConfig.toTimeString(rule.ruleSel.timeResult.end.value);
+                    livingRuleData.time.end.timeLocalDate = node.positionConfig.toDateString(rule.ruleSel.timeResult.end.value);
+                    livingRuleData.time.end.dateISO= rule.ruleSel.timeResult.end.value.toISOString();
+                    livingRuleData.time.end.dateUTC= rule.ruleSel.timeResult.end.value.toUTCString();
+                }
+                // data.timeOp = rule.ruleSel.time.operatorText;
+                // data.timeLocal = livingRuleData.time.timeLocal;
+                // data.time = livingRuleData.time.dateISO;
+                name = (rule.ruleSel.conditional) ? 'ruleTimeCond' : 'ruleTime';
             }
             livingRuleData.state = RED._('node-red-contrib-sun-position/position-config:ruleCtrl.states.'+name, data);
             livingRuleData.description = RED._('node-red-contrib-sun-position/position-config:ruleCtrl.reasons.'+name, data);
-            // node.debug(`checkRules end livingRuleData=${util.inspect(livingRuleData, { colors: true, compact: 10, breakLength: Infinity })}`);
+            // node.debug(`checkRules end livingRuleData=${util.inspect(livingRuleData, { colors: true, compact: 5, breakLength: Infinity, depth: 10 })}`);
 
-            if (ruleSel.level.operator === cRule.off) {
+            if (rule.ruleSel.level.operator === ctrlLib.cRuleType.off) {
                 livingRuleData.isOff = true;
-            } else if (ruleSel.level.operator === cRule.levelAbsolute) { // absolute rule
-                livingRuleData.level = getBlindPosFromTI(node, msg, ruleSel.level.type, ruleSel.level.value, -1);
-                livingRuleData.slat = node.positionConfig.getPropValue(node, msg, ruleSel.slat, false, oNow.now);
+            } else if (rule.ruleSel.level.operator === ctrlLib.cRuleType.absolute) { // absolute rule
+                livingRuleData.level = getBlindPosFromTI(node, msg, rule.ruleSel.level.type, rule.ruleSel.level.value, -1);
+                livingRuleData.slat = node.positionConfig.getPropValue(node, msg, rule.ruleSel.slat, false, oNow.now);
                 livingRuleData.active = (livingRuleData.level > -1);
             } else {
                 livingRuleData.active = false;
@@ -838,7 +865,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             return livingRuleData;
         }
         livingRuleData.active = false;
-        livingRuleData.id = cRuleDefault;
+        livingRuleData.id = ctrlLib.cRuleDefault;
         livingRuleData.importance = 0;
         livingRuleData.resetOverwrite = false;
         livingRuleData.level = getBlindPosFromTI(node, msg, node.nodeData.levelDefault.type, node.nodeData.levelDefault.value, node.nodeData.levelTop);
@@ -848,16 +875,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         livingRuleData.state = RED._('node-red-contrib-sun-position/position-config:ruleCtrl.states.default');
         livingRuleData.description = RED._('node-red-contrib-sun-position/position-config:ruleCtrl.reasons.default');
 
-        if (node.autoTrigger && node.rules && node.rules.count > 0) {
-            // check first rule, maybe next day
-            if (node.rules.firstTimeLimited < node.rules.count) {
-                checkRuleForAT(node.rules.data[node.rules.firstTimeLimited]);
-            }
-            if (node.rules.firstTimeLimited !== node.rules.firstFrom) {
-                checkRuleForAT(node.rules.data[node.rules.firstFrom]);
-            }
-        }
-        // node.debug(`checkRules end livingRuleData=${util.inspect(livingRuleData, { colors: true, compact: 10, breakLength: Infinity })}`);
+        // node.debug(`checkRules end livingRuleData=${util.inspect(livingRuleData, { colors: true, compact: 5, breakLength: Infinity, depth: 10 })}`);
         return livingRuleData;
     }
     /******************************************************************************************/
@@ -868,22 +886,27 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
      */
     function sunBlindControlNode(config) {
         RED.nodes.createNode(this, config);
-        this.positionConfig = RED.nodes.getNode(config.positionConfig);
         /** Copy 'this' object in case we need it in context of callbacks of other functions.
          * @type {IBlindControlNode}
          */
         // @ts-ignore
         const node = this;
-        if (!this.positionConfig) {
+
+        /** @type {IPositionConfigNode} */
+        node.positionConfig = RED.nodes.getNode(config.positionConfig);
+
+        if (!node.positionConfig) {
             node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
-            node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing') });
+            node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing-state') });
             return;
         }
 
-        if (this.positionConfig.checkNode(
+        if (node.positionConfig.checkNode(
             error => {
-                node.error(error);
-                node.status({fill: 'red', shape: 'dot', text: error });
+                const text = RED._('node-red-contrib-sun-position/position-config:errors.config-error', { error });
+                node.error(text);
+                node.status({fill: 'red', shape: 'dot', text });
+                return true;
             }, false)) {
             return;
         }
@@ -917,7 +940,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
         if (config.autoTrigger) {
             node.autoTrigger = {
-                defaultTime : parseInt(config.autoTriggerTime) || 3600000, // 1h
+                defaultTime : parseInt(config.autoTriggerTime) || hlp.TIME_20min,
                 time : NaN,
                 type : 0 // default time
             };
@@ -936,7 +959,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         };
         // temporary node Data
         node.levelReverse = false;
-        node.contextStore = config.contextStore || this.positionConfig.contextStore;
+        node.contextStore = config.contextStore || node.positionConfig.contextStore;
         // Retrieve the config node
         node.sunData = {
             /** Defines if the sun control is active or not */
@@ -959,7 +982,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         if (node.sunData.mode === 2) { node.sunData.mode = cSummerMode; } // backwards compatibility
         node.sunData.modeMax = node.sunData.mode;
 
-        /** type {IBlindWindowSettings} */
+        /** @type {IBlindWindowSettings} */
         node.windowSettings = {
             /** The top of the window */
             top: config.windowTop,
@@ -967,13 +990,23 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             /** The bottom of the window */
             bottom: config.windowBottom,
             bottomType: config.windowBottomType || 'num',
+
+            setMode: config.windowSetMode || 'startEnd',
             /** the orientation angle to the geographical north */
             azimuthStart: config.windowAzimuthStart,
-            azimuthStartType: config.windowAzimuthStartType || 'num',
+            azimuthStartType: config.windowAzimuthStartType || 'numAzimuth',
             /** an offset for the angle clockwise offset */
             azimuthEnd: config.windowAzimuthEnd,
-            azimuthEndType: config.windowAzimuthEndType || 'num'
+            azimuthEndType: config.windowAzimuthEndType || 'numAzimuth',
+            /** the orientation angle to the geographical north */
+            windowOrientation: config.windowOrientation,
+            windowOrientationType: config.windowOrientationType || 'numAzimuth',
+            /** an offset for the angle clockwise offset */
+            windowOffsetP: config.windowOffsetP,
+            /** an offset for the angle anti-clockwise offset */
+            windowOffsetN: config.windowOffsetN
         };
+        // startEnd
 
         /** @type {IBlindNodeData} */
         node.nodeData = {
@@ -1158,7 +1191,11 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
         // @ts-ignore
         node.rules = {
-            data: config.rules || []
+            data: config.rules || [],
+            count: 0,
+            maxImportance : 0,
+            last1stRun : -1,
+            canResetOverwrite : false
         };
         node.level = {
             current: NaN, // unknown
@@ -1175,7 +1212,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
             try {
                 node.debug(`--------- blind-control - input msg.topic=${msg.topic} msg.payload=${msg.payload} msg.ts=${msg.ts}`);
-                if (!this.positionConfig) {
+                if (!node.positionConfig) {
                     node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
                     node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing-state') });
                     done(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'), msg);
@@ -1183,10 +1220,18 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 }
 
                 // allow to overwrite settings by incomming message
-                const newMode = hlp.getMsgNumberValue(msg, ['mode'], ['setMode']);
+                let newMode = hlp.getMsgNumberValue(msg, ['mode'], ['setMode']);
                 if (Number.isFinite(newMode) && newMode >= 0 && newMode <= node.sunData.modeMax) {
                     node.debug(`set mode from ${node.sunData.mode} to ${newMode}`);
-                    node.sunData.mode = newMode;
+                    if (newMode === 2) { newMode = cSummerMode; } // backwards compatibility
+                    if (newMode !== 0 &&
+                        newMode !== cSummerMode &&
+                        newMode !== cWinterMode &&
+                        newMode !== cMinimizeMode) {
+                        node.error('Mode "' + newMode + '" is not a valid value!');
+                    } else {
+                        node.sunData.mode = newMode;
+                    }
                     node.context().set('mode', newMode, node.contextStore);
                 }
 
@@ -1202,76 +1247,112 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                         return val;
                     };
                     switch (msg.topic) {
-                        /* Blind Settings */
-                        case 'setBlindSettingsTop':
-                            node.nodeData.levelTop = getFloatValue(node.nodeData.levelTop);
-                            break;
-                        case 'setBlindSettingsBottom':
-                            node.nodeData.levelBottom = getFloatValue(node.nodeData.levelBottom);
-                            break;
-                        case 'setBlindSettingsIncrement':
-                            node.nodeData.increment = getFloatValue(node.nodeData.increment);
-                            break;
-                        /* Default Settings */
-                        case 'setBlindSettingsLevel':
-                            node.nodeData.levelDefault = getFloatValue(node.nodeData.levelDefault);
-                            break;
-                        case 'setSettingsTopic':
-                            node.nodeData.topic = msg.payload || node.nodeData.topic;
-                            break;
-                        /* sun Control Settings */
-                        case 'setSunDataTopic':
-                            node.sunData.topic = msg.payload || node.sunData.topic;
-                            break;
-                        case 'setSunDataFloorLength': {
-                            const val = getFloatValue(node.sunData.floorLength);
-                            if (val !== node.sunData.floorLength) {
-                                node.sunData.floorLengthType = 'num';
-                                node.sunData.floorLength = val;
-                            }
-                            break;
+                      /* Blind Settings */
+                      case "setBlindSettingsTop":
+                        node.nodeData.levelTop = getFloatValue(
+                          node.nodeData.levelTop
+                        );
+                        break;
+                      case "setBlindSettingsBottom":
+                        node.nodeData.levelBottom = getFloatValue(
+                          node.nodeData.levelBottom
+                        );
+                        break;
+                      case "setBlindSettingsIncrement":
+                        node.nodeData.increment = getFloatValue(
+                          node.nodeData.increment
+                        );
+                        break;
+                      /* Default Settings */
+                      case "setBlindSettingsLevel":
+                        node.nodeData.levelDefault = getFloatValue(
+                          node.nodeData.levelDefault
+                        );
+                        break;
+                      case "setSettingsTopic":
+                        node.nodeData.topic =
+                          msg.payload || node.nodeData.topic;
+                        break;
+                      /* sun Control Settings */
+                      case "setSunDataTopic":
+                        node.sunData.topic = msg.payload || node.sunData.topic;
+                        break;
+                      case "setSunDataFloorLength": {
+                        const val = getFloatValue(node.sunData.floorLength);
+                        if (val !== node.sunData.floorLength) {
+                          node.sunData.floorLengthType = "num";
+                          node.sunData.floorLength = val;
                         }
-                        /* minimum changes Settings */
-                        case 'setSunDataMinDelta':
-                            node.sunData.minDelta = parseFloat(msg.payload) || node.sunData.minDelta; // payload of 0 makes no sense, use then default
-                            break;
-                        case 'setSmoothTime':
-                            node.smoothTime = parseFloat(msg.payload) || node.smoothTime; // payload of 0 makes no sense, use then default
-                            break;
-                        /* advanced Settings */
-                        case 'setAutoTriggerTime':
-                            node.autoTrigger.defaultTime = parseInt(msg.payload) || node.autoTrigger.defaultTime; // payload of 0 makes no sense, use then default
-                            break;
-                        case 'setContextStore':
-                            node.contextStore = msg.payload || node.contextStore;
-                            break;
-                        case 'disableRule':
-                            changeRules(node, undefined, msg.payload, { enabled: false });
-                            break;
-                        case 'enableRule':
-                            changeRules(node, undefined, msg.payload, { enabled: true });
-                            break;
-                        case 'disableRuleByPos':
-                            changeRules(node, parseInt(msg.payload), undefined, { enabled: false });
-                            break;
-                        case 'enableRuleByPos':
-                            changeRules(node, parseInt(msg.payload), undefined, { enabled: true });
-                            break;
-                        case 'enableNode':
-                            node.nodeData.isDisabled = false;
-                            node.context().set('isDisabled', false, node.contextStore);
-                            break;
-                        case 'disableNode':
-                            node.nodeData.isDisabled = true;
-                            node.context().set('isDisabled', true, node.contextStore);
-                            node.status({
-                                fill: 'grey',
-                                shape: 'dot',
-                                text: (typeof msg.payload === 'string') ? msg.payload : 'disabled'
-                            });
-                            break;
-                        default:
-                            break;
+                        break;
+                      }
+                      case "setSunDataMinAltitude":
+                        {
+                          config.sunMinAltitude.threshold = parseFloat(msg.payload) || config.sunMinAltitude.threshold; //TFR TODO see if it works
+                          node.warn(`SunDataMinAltitude set to ${config.sunMinAltitude.threshold}`);
+                          break;
+                        }
+                      /* minimum changes Settings */
+                      case "setSunDataMinDelta":
+                        node.sunData.minDelta =
+                          parseFloat(msg.payload) || node.sunData.minDelta; // payload of 0 makes no sense, use then default
+                        break;
+                      case "setSmoothTime":
+                        node.smoothTime =
+                          parseFloat(msg.payload) || node.smoothTime; // payload of 0 makes no sense, use then default
+                        break;
+                      /* advanced Settings */
+                      case "setAutoTriggerTime":
+                        node.autoTrigger = Object.assign(node.autoTrigger, {
+                          defaultTime:
+                            parseInt(msg.payload) ||
+                            node.autoTrigger.defaultTime,
+                        }); // payload of 0 makes no sense, use then default
+                        break;
+                      case "setContextStore":
+                        node.contextStore = msg.payload || node.contextStore;
+                        break;
+                      case "disableRule":
+                        changeRules(node, undefined, msg.payload, {
+                          enabled: false,
+                        });
+                        break;
+                      case "enableRule":
+                        changeRules(node, undefined, msg.payload, {
+                          enabled: true,
+                        });
+                        break;
+                      case "disableRuleByPos":
+                        changeRules(node, parseInt(msg.payload), undefined, {
+                          enabled: false,
+                        });
+                        break;
+                      case "enableRuleByPos":
+                        changeRules(node, parseInt(msg.payload), undefined, {
+                          enabled: true,
+                        });
+                        break;
+                      case "enableNode":
+                        node.nodeData.isDisabled = false;
+                        node
+                          .context()
+                          .set("isDisabled", false, node.contextStore);
+                        break;
+                      case "disableNode":
+                        node.nodeData.isDisabled = true;
+                        node
+                          .context()
+                          .set("isDisabled", true, node.contextStore);
+                        node.status({
+                          fill: "grey",
+                          shape: "dot",
+                          text:
+                            typeof msg.payload === "string"
+                              ? msg.payload
+                              : "disabled",
+                        });
+                        break;
+                      default:
+                        break;
                     }
                     if (node.nodeData.levelTop < node.nodeData.levelBottom) {
                         [node.nodeData.levelBottom, node.nodeData.levelTop] = [node.nodeData.levelTop, node.nodeData.levelBottom];
@@ -1318,12 +1399,16 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     node.addId = node.positionConfig.getPropValue(node, msg, {
                         type: node.nodeData.addId.type,
                         value: node.nodeData.addId.value,
+                        callback: (result, _obj, cachable) => {
+                            return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                        }
+                        /*
                         callback: (result, _obj) => {
                             if (result !== null && typeof result !== 'undefined') {
                                 tempData[_obj.type + '.' + _obj.value] = result;
                             }
                             return result;
-                        }
+                        } */
                     }, true, oNow.now);
                 }
                 const blindCtrl = {
@@ -1418,12 +1503,16 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                         node.positionConfig.getPropValue(node, msg, {
                             type: el.valueType,
                             value: el.value,
+                            callback: (result, _obj, cachable) => {
+                                return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                            },
+                            /*
                             callback: (result, _obj) => {
                                 if (result !== null && typeof result !== 'undefined') {
                                     tempData[_obj.type + '.' + _obj.value] = result;
                                 }
                                 return result;
-                            },
+                            }, */
                             operator: el.operator
                         }, false, oNow.now);
                     });
@@ -1492,7 +1581,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                         }
                         if (typeof resultObj !== 'undefined') {
                             if (resultObj.error) {
-                                this.error('error on getting result: "' + resultObj.error + '"');
+                                node.error('error on getting result: "' + resultObj.error + '"');
                             } else {
                                 node.positionConfig.setMessageProp(this, msgOut, prop.outType, prop.outValue, resultObj);
                             }
@@ -1510,13 +1599,13 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 node.context().set('lastData', previousData, node.contextStore);
                 if (node.autoTrigger) {
                     node.debug('next autoTrigger will set to ' + node.autoTrigger.time + ' - ' + node.autoTrigger.type);
-                    if (node.autoTriggerObj) {
-                        clearTimeout(node.autoTriggerObj);
-                        delete node.autoTriggerObj;
+                    if (node.autoTrigger.timer) {
+                        clearTimeout(node.autoTrigger.timer);
+                        delete node.autoTrigger.timer;
                     }
-                    node.autoTriggerObj = setTimeout(() => {
-                        clearTimeout(node.autoTriggerObj);
-                        delete node.autoTriggerObj;
+                    node.autoTrigger.timer = setTimeout(() => {
+                        clearTimeout(node.autoTrigger.timer);
+                        delete node.autoTrigger.timer;
                         node.emit('input', {
                             topic: 'autoTrigger/triggerOnly',
                             payload: 'triggerOnly',
@@ -1577,9 +1666,9 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         });
 
         node.on('close', () => {
-            if (node.autoTriggerObj) {
-                clearTimeout(node.autoTriggerObj);
-                delete node.autoTriggerObj;
+            if (node.autoTrigger && node.autoTrigger.timer) {
+                clearTimeout(node.autoTrigger.timer);
+                delete node.autoTrigger.timer;
             }
             if (node.startDelayTimeOutObj) {
                 clearTimeout(node.startDelayTimeOutObj);
diff --git a/nodes/81-clock-timer.html b/nodes/81-clock-timer.html
index 5bee36e5..49cc6c11 100644
--- a/nodes/81-clock-timer.html
+++ b/nodes/81-clock-timer.html
@@ -22,17 +22,27 @@
 -->
 
 <script type="text/javascript">
-    // @ts-cehck
     /* eslint-env browser es6 */
     // Isolate this code
     (function() {
         'use strict';
+        /// <reference path="./types/typedefs.js" />
+        /// <reference lib="./static/htmlglobal.js" />
+
         /** --- Type Defs ---
          * @typedef {import("node-red").Red} Red
          */
+
+        const cNBC_RULE_EXEC = {
+            auto: 0,
+            first:1,
+            last:2
+        };
         const cNBC_RULE_TYPE_UNTIL = 0;
         const cNBC_RULE_TYPE_FROM = 1;
 
+        /** @type {Red} */
+        // @ts-ignore
         RED.nodes.registerType('clock-timer', {
             category: 'time and astro',
             color: '#FFCC66',
@@ -53,6 +63,7 @@
                 },
                 addId: {
                     value: '',
+                    // @ts-ignore
                     validate: RED.validators.typedInput('addIdType')
                 },
                 positionConfig: {
@@ -66,7 +77,9 @@
                     validate(v) {
                         const n = parseFloat(v);
                         return (typeof v === 'undefined') ||
-                               (RED.validators.number()(v) && (n >= 60000) && (n < 0x7FFFFFFF));
+                        // @ts-ignore
+                               (RED.validators.number()(v) &&
+                               (n >= 60000) && (n < 0x7FFFFFFF));
                     }
                 },
                 startDelayTime: {
@@ -74,7 +87,9 @@
                     validate(v) {
                         const n = parseFloat(v);
                         return (typeof v === 'undefined') ||
-                               (RED.validators.number()(v) && (n >= 0) && (n < 0x7FFFFFFF));
+                        // @ts-ignore
+                               (RED.validators.number()(v) &&
+                               (n >= 0) && (n < 0x7FFFFFFF));
                     },
                     required: false
                 },
@@ -109,6 +124,7 @@
                         const n = parseFloat(v);
                         return (typeof v === 'undefined') ||
                                (v === '') ||
+                               // @ts-ignore
                                (RED.validators.number()(v) && (n >= 200) && (n < 0x7FFFFFFF));
                     }
                 },
@@ -119,6 +135,7 @@
                 },
                 payloadDefault: {
                     value: '',
+                    // @ts-ignore
                     validate: RED.validators.typedInput('payloadDefaultType')
                 },
                 payloadDefaultType: {
@@ -133,6 +150,7 @@
                         return (
                             (typeof v === 'undefined') ||
                             (typeof this.payloadOffsetType === 'undefined') ||
+                            // @ts-ignore
                             RED.validators.typedInput('payloadOffsetType')(v)
                         );
                     }
@@ -142,6 +160,7 @@
                 },
                 payloadDefaultOffsetMultiplier: {
                     value: 60000,
+                    // @ts-ignore
                     validate : RED.validators.number()
                 }
                 // #endregion time settings
@@ -285,10 +304,12 @@
                 const node = this;
 
                 const $nodeInputContextStore = $('#node-input-contextStore');
+                // @ts-ignore
                 RED.settings.context.stores.forEach(store => {
                     $nodeInputContextStore.append('<option value="' + store + '"' + (this.contextStore === store ? ' selected' : '') + '>' + store + '</option>');
                 });
 
+                // @ts-ignore
                 const tabs = RED.tabs.create({
                     id: 'node-config-clock-timer-tabs',
                     onchange(tab) {
@@ -300,11 +321,11 @@
                     collapsible: true
                 });
 
-                node.dialogAddData = {};
+                node.dialogAddData = { time:{ start:{ min:{}, max:{} }, end:{ min:{}, max:{} } }, timeReg:{} };
                 const setup = function(node) {
                     /* global getTypes getSelectFields setupTInput appendOptions getBackendData bdDateToTime initCombobox initCheckboxesBlock autocomplete getCheckboxesStr setTInputValue */
                     // #region initialize
-                    const types = getTypes(node);
+                    const types = /** @type {Object} */ getTypes(node, () => $nodeConfig.val());
                     types.OutputPayload = {
                         value: 'payload',
                         label: node._('node-red-contrib-sun-position/position-config:common.types.payload'),
@@ -320,6 +341,23 @@
                         label: node._('node-red-contrib-sun-position/position-config:common.types.ctrlObj'),
                         hasValue: false
                     };
+                    types.OutputCtrlObj = {
+                        value: 'ctrlObj',
+                        label: node._('node-red-contrib-sun-position/position-config:common.types.ctrlObj'),
+                        hasValue: false
+                    };
+                    types.OutputCtrlObj = {
+                        value: 'ctrlObj',
+                        label: node._('node-red-contrib-sun-position/position-config:common.types.ctrlObj'),
+                        hasValue: false
+                    };
+                    types.UndefinedTimeFrom = Object.assign({}, types.Undefined, {
+                        label: node._('node-red-contrib-sun-position/position-config:common.types.undefinedTimeFrom')
+                    });
+                    types.UndefinedTimeUntil = Object.assign({}, types.Undefined, {
+                        label: node._('node-red-contrib-sun-position/position-config:common.types.undefinedTimeUntil')
+                    });
+
                     const selFields = getSelectFields();
                     /**
                     * update multiplier settings from a previous version
@@ -433,6 +471,7 @@
                             types.TimeEntered,
                             types.DateEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             types.DayOfMonth,
@@ -442,12 +481,11 @@
                             types.MoonPhase,
                             types.SunAzimuth,
                             types.SunElevation,
-                            types.SunAzimuthRad,
-                            types.SunElevationRad,
                             types.SunTimeByAzimuth,
                             types.SunTimeByElevationObj,
-                            types.SunTimeByAzimuthRad,
-                            types.SunTimeByElevationObjRad,
+                            types.SunTimeByElevationNext,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet,
                             types.isDST,
                             types.WeekOfYear,
                             types.WeekOfYearEven,
@@ -458,6 +496,7 @@
                             const plVType = $('#node-input-payloadDefault').typedInput('type');
                             if (plVType ===  types.TimeEntered.value ||
                                 plVType === types.TimeSun.value ||
+                                plVType === types.TimeSunCustom.value ||
                                 plVType === types.TimeMoon.value ||
                                 plVType === types.DateSpecific.value) {
                                 $('.rdgtimer-rule-row-payloadDefaultTimeFormat').show();
@@ -519,7 +558,7 @@
                     });
                     // #endregion payloadDefault
                     // #region rules
-                    const ruleVersion = 3;
+                    const ruleVersion = 4;
                     /**
                      * get a time in millisecond as string of the format hh:mm, hh:mm:ss or hh:mm:ss.mss
                      * @param {number} s - milisecond
@@ -614,17 +653,30 @@
                         let result = '';
                         const length = (enh) ? 60 : 30;
                         try {
-                            if (typeof data.isValid === 'undefined' || typeof data.version === 'undefined' || (!data.isValid && (typeof data.valid === 'undefined' || Object.keys(data.valid).length === 0))) {
+                            if (typeof data.isValid === 'undefined' || typeof data.version === 'undefined' || (!data.isValid && !data.validationError && typeof data.validation === 'undefined')) {
                                 result += '<div>';
                                 result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.outDated');
                                 result += '</div>';
                             } else if (!data.isValid) {
                                 result += '<div>';
                                 result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.isInValid');
+                                result += '</div><div>';
+                                result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleInValidText');
+                                result += data.validationError;
                                 result += '</div>';
-                                if (data.valid && Object.keys(data.valid).length > 0) {
+                                if (data.validation && Object.keys(data.validation).length > 0) {
+                                    const lines = JSON.stringify(data.validation,
+                                        (key, value) => {
+                                            if (value === true || (Array.isArray(value) && value.length === 0) || (typeof value === 'object' && Object.keys(value).length === 0))
+                                                return undefined;
+                                            if (value === false)
+                                                return node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleInValidElement');
+                                            return value;
+                                        }, '\t').split('\n');
+                                    lines.splice(0,1); // remove first line
+                                    lines.pop(); // remove last line
                                     result += '<div><pre>';
-                                    result += JSON.stringify(data.valid, null, '\t');
+                                    result += lines.join('\n');
                                     result += '</pre></div>';
                                 }
                             }
@@ -674,186 +726,193 @@
                                 result += '</div>';
                             }
                             if (data.time) {
-                                if (data.time.type && data.timeType !== 'none') {
-                                    result += '<div>';
-                                    result += '<i class="fa fa-clock-o" aria-hidden="true"></i> ';
-                                    result += data.time.operatorText;
-                                    result += ' <var>' + RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.time.type, data.time.value, null, null, null, length) + '</var>';
-                                    result += _getOffsetText(node, data.time.offsetType, data.time.offset, data.time.multiplier);
-                                    if (enh && enh.timeReg && enh.timeReg.text) {
-                                        result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.timeReg.text + '</code>]</span>';
-                                    }
+                                const gettime = (ttype, text) => {
+                                    if (data.time[ttype] && data.time[ttype].type && data.timeType !== 'none') {
+                                        result += '<div>';
+                                        result += '<i class="fa fa-clock-o" aria-hidden="true"></i> ';
+                                        result += text;
+                                        result += ' <var>' + RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.time[ttype].type, data.time[ttype].value, null, null, null, length) + '</var>';
+                                        result += _getOffsetText(node, data.time[ttype].offsetType, data.time[ttype].offset, data.time[ttype].multiplier);
+                                        if (enh && enh.timeReg && enh.timeReg.text) {
+                                            result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.timeReg.text + '</code>]</span>';
+                                        }
 
-                                    if (data.timeMin && data.timeMin.type && data.timeMin.type !== 'none') {
-                                        result += '<div class="indent-time-text"><i class="fa fa-step-backward" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin');
-                                        result += '</span> <var>';
-                                        result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.timeMin.type, data.timeMin.value, null, null, null, length);
-                                        result += '</var>';
-                                        result += _getOffsetText(node, data.timeMin.offsetType, data.timeMin.offset, data.timeMin.multiplier);
-                                        if (enh && enh.timeMin && enh.timeMin.text) {
-                                            result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.timeMin.text + '</code>]</span>';
+                                        if (data.time[ttype].min && data.time[ttype].min.type && data.time[ttype].min.type !== 'none') {
+                                            result += '<div class="indent-time-text"><i class="fa fa-step-backward" aria-hidden="true"></i> <span>';
+                                            result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin_'+ttype);
+                                            result += '</span> <var>';
+                                            result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.time[ttype].min.type, data.time[ttype].min.value, null, null, null, length);
+                                            result += '</var>';
+                                            result += _getOffsetText(node, data.time[ttype].min.offsetType, data.time[ttype].min.offset, data.time[ttype].min.multiplier);
+                                            if (enh && enh.time[ttype].min && enh.time[ttype].min.text) {
+                                                result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.time[ttype].min.text + '</code>]</span>';
+                                            }
+                                            result += '</div>';
                                         }
-                                        result += '</div>';
-                                    }
-                                    if (data.timeMax && data.timeMax.type && data.timeMax.type !== 'none') {
-                                        result += '<div class="indent-time-text"><i class="fa fa-step-forward" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax');
-                                        result += '</span> <var>';
-                                        result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.timeMax.type, data.timeMax.value, null, null, null, length);
-                                        result += '</var>';
-                                        result += _getOffsetText(node, data.timeMax.offsetType, data.timeMax.offset, data.timeMax.multiplier);
-                                        if (enh && enh.timeMax && enh.timeMax.text) {
-                                            result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.timeMax.text + '</code>]</span>';
+                                        if (data.time[ttype].max && data.time[ttype].max.type && data.time[ttype].max.type !== 'none') {
+                                            result += '<div class="indent-time-text"><i class="fa fa-step-forward" aria-hidden="true"></i> <span>';
+                                            result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax_'+ttype);
+                                            result += '</span> <var>';
+                                            result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.time[ttype].max.type, data.time[ttype].max.value, null, null, null, length);
+                                            result += '</var>';
+                                            result += _getOffsetText(node, data.time[ttype].max.offsetType, data.time[ttype].max.offset, data.time[ttype].max.multiplier);
+                                            if (enh && enh.time[ttype].max && enh.time[ttype].max.text) {
+                                                result += ' <span class="indent-enh-text">[<i class="fa fa-hand-o-right" aria-hidden="true"></i>&nbsp;<code>' + enh.time[ttype].max.text + '</code>]</span>';
+                                            }
+                                            result += '</div>';
                                         }
                                         result += '</div>';
                                     }
-                                    if (data.time.days && data.time.days !== '*') {
-                                        result += '<div class="indent-time-days"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeDays');
-                                        result += '</span> <var>';
-                                        const daysarr = data.time.days.split(',');
-                                        if (daysarr.length === 1) {
-                                            result += (node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[0]) + 7)));
-                                        } else if (data.time.days === '5,6,0') {
-                                            result += node._('node-red-contrib-sun-position/position-config:common.days.12');
-                                            result += '-';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.days.7');
-                                        } else if (daysarr.length === 2) {
-                                            result += node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[0]) + 7));
-                                            result += ' ';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.label.and');
-                                            result += ' ';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[1]) + 7));
+                                };
+                                gettime('start',node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeStart'));
+                                gettime('end',node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeEnd'));
+                                result += '<div>';
+                                if (data.time.days && data.time.days !== '*') {
+                                    result += '<div class="indent-time-days"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeDays');
+                                    result += '</span> <var>';
+                                    const daysarr = data.time.days.split(',');
+                                    if (daysarr.length === 1) {
+                                        result += (node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[0]) + 7)));
+                                    } else if (data.time.days === '5,6,0') {
+                                        result += node._('node-red-contrib-sun-position/position-config:common.days.12');
+                                        result += '-';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.days.7');
+                                    } else if (daysarr.length === 2) {
+                                        result += node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[0]) + 7));
+                                        result += ' ';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.label.and');
+                                        result += ' ';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(daysarr[1]) + 7));
+                                    } else {
+                                        daysarr.sort((a, b) => parseInt(a) - parseInt(b));
+                                        let isok = true;
+                                        let elF = parseInt(daysarr[0]);
+                                        daysarr[0] = node._('node-red-contrib-sun-position/position-config:common.days.'+(elF + 7));
+                                        for (let index = 1; index < daysarr.length; index++) {
+                                            const element = parseInt(daysarr[index]);
+                                            isok = isok && (element === elF+1);
+                                            elF = element;
+                                            daysarr[index] = node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(element) + 7));
+                                        }
+                                        if (isok) {
+                                            result += (daysarr[0] + '-' + daysarr[daysarr.length-1]);
                                         } else {
-                                            daysarr.sort((a, b) => parseInt(a) - parseInt(b));
-                                            let isok = true;
-                                            let elF = parseInt(daysarr[0]);
-                                            daysarr[0] = node._('node-red-contrib-sun-position/position-config:common.days.'+(elF + 7));
-                                            for (let index = 1; index < daysarr.length; index++) {
-                                                const element = parseInt(daysarr[index]);
-                                                isok = isok && (element === elF+1);
-                                                elF = element;
-                                                daysarr[index] = node._('node-red-contrib-sun-position/position-config:common.days.'+(parseInt(element) + 7));
-                                            }
-                                            if (isok) {
-                                                result += (daysarr[0] + '-' + daysarr[daysarr.length-1]);
-                                            } else {
-                                                result += (daysarr.join(','));
-                                            }
+                                            result += (daysarr.join(','));
                                         }
-                                        result += '</var></div>';
                                     }
-                                    if (data.time.onlyEvenDays || data.time.onlyOddDays || data.time.onlyEvenWeeks || data.time.onlyOddWeeks) {
-                                        result += '<div class="indent-time-special"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimit');
-                                        result += '</span> <var>';
-                                        const resultArr = [];
-                                        if (data.time.onlyEvenDays) {
-                                            resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyEvenDays'));
-                                        }
-                                        if (data.time.onlyOddDays) {
-                                            resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyOddDays'));
-                                        }
-                                        if (data.time.onlyEvenWeeks) {
-                                            resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyEvenWeeks'));
-                                        }
-                                        if (data.time.onlyOddWeeks) {
-                                            resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyOddWeeks'));
-                                        }
-                                        result += resultArr.join(' <b>' + node._('node-red-contrib-sun-position/position-config:common.label.and') + '</b> ');
-                                        result += '</var></div>';
+                                    result += '</var></div>';
+                                }
+                                if (data.time.onlyEvenDays || data.time.onlyOddDays || data.time.onlyEvenWeeks || data.time.onlyOddWeeks) {
+                                    result += '<div class="indent-time-special"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimit');
+                                    result += '</span> <var>';
+                                    const resultArr = [];
+                                    if (data.time.onlyEvenDays) {
+                                        resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyEvenDays'));
                                     }
-                                    if (data.time.months && data.time.months !== '*') {
-                                        result += '<div class="indent-time-months"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMonths');
-                                        result += '</span> <var>';
-                                        const montharr = data.time.months.split(',');
-                                        if (montharr.length === 2) {
-                                            result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[0]) + 12));
-                                            result += ' ';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.label.and');
-                                            result += ' ';
-                                            result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[1]) + 12));
-                                        } else if (montharr.length === 1) {
-                                            result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[0]) + 12));
-                                        } else {
-                                            montharr.sort((a, b) => parseInt(a) - parseInt(b));
-                                            let isok = true;
-                                            let elF = parseInt(montharr[0]);
-                                            montharr[0] = node._('node-red-contrib-sun-position/position-config:common.months.'+(elF + 12));
-                                            for (let index = 1; index < montharr.length; index++) {
-                                                const element = parseInt(montharr[index]);
-                                                isok = isok && (element === elF+1);
-                                                elF = element;
-                                                montharr[index] = node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(element) + 12));
-                                            }
-                                            if (isok) {
-                                                result += montharr[0];
-                                                result += '-';
-                                                result += montharr[montharr.length-1];
-                                            } else {
-                                                result += montharr.join(',');
-                                            }
-                                        }
-                                        result += '</var></div>';
+                                    if (data.time.onlyOddDays) {
+                                        resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyOddDays'));
                                     }
-
-                                    if (data.time.dateStart || data.time.dateEnd) {
-                                        result += '<div class="indent-time-datelimit"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimitStart');
-                                        result += '</span> <var>';
-                                        if (enh) {
-                                            const year = (new Date()).getFullYear();
-                                            result += data.time.dateStart || year + '-01-01';
-                                        } else {
-                                            result += (getDateShort(data.time.dateStart) || '01-01');
+                                    if (data.time.onlyEvenWeeks) {
+                                        resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyEvenWeeks'));
+                                    }
+                                    if (data.time.onlyOddWeeks) {
+                                        resultArr.push(node._('node-red-contrib-sun-position/position-config:common.label.onlyOddWeeks'));
+                                    }
+                                    result += resultArr.join(' <b>' + node._('node-red-contrib-sun-position/position-config:common.label.and') + '</b> ');
+                                    result += '</var></div>';
+                                }
+                                if (data.time.months && data.time.months !== '*') {
+                                    result += '<div class="indent-time-months"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMonths');
+                                    result += '</span> <var>';
+                                    const montharr = data.time.months.split(',');
+                                    if (montharr.length === 2) {
+                                        result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[0]) + 12));
+                                        result += ' ';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.label.and');
+                                        result += ' ';
+                                        result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[1]) + 12));
+                                    } else if (montharr.length === 1) {
+                                        result += node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(montharr[0]) + 12));
+                                    } else {
+                                        montharr.sort((a, b) => parseInt(a) - parseInt(b));
+                                        let isok = true;
+                                        let elF = parseInt(montharr[0]);
+                                        montharr[0] = node._('node-red-contrib-sun-position/position-config:common.months.'+(elF + 12));
+                                        for (let index = 1; index < montharr.length; index++) {
+                                            const element = parseInt(montharr[index]);
+                                            isok = isok && (element === elF+1);
+                                            elF = element;
+                                            montharr[index] = node._('node-red-contrib-sun-position/position-config:common.months.'+(parseInt(element) + 12));
                                         }
-                                        result += '</var> <span> ';
-                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimitEnd');
-                                        result += '</span> <var>';
-                                        if (enh) {
-                                            const year = (new Date()).getFullYear();
-                                            result += data.time.dateEnd || year + '-12-31';
+                                        if (isok) {
+                                            result += montharr[0];
+                                            result += '-';
+                                            result += montharr[montharr.length-1];
                                         } else {
-                                            result += (getDateShort(data.time.dateEnd) || '12-31');
+                                            result += montharr.join(',');
                                         }
-                                        result += '</var></div>';
                                     }
-                                    result += '</div>';
+                                    result += '</var></div>';
                                 }
+                                if (data.time.dateStart || data.time.dateEnd) {
+                                    result += '<div class="indent-time-datelimit"><i class="fa fa-calendar-o" aria-hidden="true"></i> <span>';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimitStart');
+                                    result += '</span> <var>';
+                                    if (enh) {
+                                        const year = (new Date()).getFullYear();
+                                        result += data.time.dateStart || year + '-01-01';
+                                    } else {
+                                        result += (getDateShort(data.time.dateStart) || '01-01');
+                                    }
+                                    result += '</var> <span> ';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeLimitEnd');
+                                    result += '</span> <var>';
+                                    if (enh) {
+                                        const year = (new Date()).getFullYear();
+                                        result += data.time.dateEnd || year + '-12-31';
+                                    } else {
+                                        result += (getDateShort(data.time.dateEnd) || '12-31');
+                                    }
+                                    result += '</var></div>';
+                                }
+                                result += '</div>';
                             }
                             result += '<div>';
-                            if (data.payload && data.payload.type && data.payload.type !== 'none') {
-                                result += '<div class="indent-payload-text"><i class="fa fa-step-backward" aria-hidden="true"></i> <span>';
-                                result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.rulePayload');
-                                result += '</span> <var>';
-                                result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.payload.type, data.payload.value, null, null, null, length);
-                                result += '</var>';
-                                result += _getOffsetText(node, data.payload.offsetType, data.payload.offset, data.payload.multiplier);
-                                result += '</div>';
-                                if (data.topic) {
-                                    result += '<div class="indent-topic-text"> <i class="fa fa-tasks" aria-hidden="true"></i><span>';
-                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTopic');
-                                    result += ': </span> <var>';
-                                    result += data.topic;
+                            if (data.payload) {
+                                if (data.payload.type && data.payload.type !== 'none') {
+                                    result += '<div class="indent-payload-text"><i class="fa fa-step-backward" aria-hidden="true"></i> <span>';
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.rulePayload');
+                                    result += '</span> <var>';
+                                    result += RED.nodes.getType('position-config').getRDGNodeValLbl(node, data.payload.type, data.payload.value, null, null, null, length);
                                     result += '</var>';
+                                    result += _getOffsetText(node, data.payload.offsetType, data.payload.offset, data.payload.multiplier);
                                     result += '</div>';
+                                    if (data.topic) {
+                                        result += '<div class="indent-topic-text"> <i class="fa fa-tasks" aria-hidden="true"></i><span>';
+                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTopic');
+                                        result += ': </span> <var>';
+                                        result += data.topic;
+                                        result += '</var>';
+                                        result += '</div>';
+                                    }
+                                    if (data.resetOverwrite) {
+                                        result += '<div class="indent-resetOverwrite-text"> <i class="fa fa-thumbs-o-down" aria-hidden="true"></i><span>';
+                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleResetOverwrite');
+                                        result += '</span> </div>';
+                                    }
+                                    if (data.importance > 0) {
+                                        result += '<div class="indent-resetOverwrite-text"> <i class="fa fa-hand-spock-o" aria-hidden="true"></i><span>';
+                                        result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleImportance');
+                                        result += ' = </span><var>';
+                                        result += data.importance;
+                                        result += '</var></div>';
+                                    }
+                                } else {
+                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.rulePayloadND');
                                 }
-                                if (data.resetOverwrite) {
-                                    result += '<div class="indent-resetOverwrite-text"> <i class="fa fa-thumbs-o-down" aria-hidden="true"></i><span>';
-                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleResetOverwrite');
-                                    result += '</span> </div>';
-                                }
-                                if (data.importance > 0) {
-                                    result += '<div class="indent-resetOverwrite-text"> <i class="fa fa-hand-spock-o" aria-hidden="true"></i><span>';
-                                    result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleImportance');
-                                    result += ' = </span><var>';
-                                    result += data.importance;
-                                    result += '</var></div>';
-                                }
-                            } else {
-                                result += node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.rulePayloadND');
                             }
                             result += '</div>';
                         } catch (err) {
@@ -869,13 +928,13 @@
                             if (data === {}) {
                                 data.description = 'please edit rule';
                                 data.name = 'empty';
+                                data.exec = cNBC_RULE_EXEC.auto;
                                 data.version = ruleVersion;
                                 data.enabled = true;
                             }
                             data.index = containerIndex;
                             data.importance = 0;
                             if (!data.conditions) {
-                                data.valid = {};
                                 data.conditions = [];
                                 if (data.validOperandAType && data.validOperandAType !== types.Unlimited.value) {
                                     data.conditions.push({
@@ -916,8 +975,10 @@
                                 delete data.valid2OperandBValue;
                                 delete data.valid2OperandBType;
                             }
-                            if(data.timeBType) {
-                                if (data.timeBType === types.TimeSun.value || data.timeBType === types.TimeMoon.value) {
+                            if (data.timeBType) {
+                                if (data.timeBType === types.TimeSun.value ||
+                                    data.timeBType === types.TimeSunCustom.value ||
+                                    data.timeBType === types.TimeMoon.value) {
                                     data.timeMinType = data.timeType;
                                     data.timeMinValue = data.timeValue;
                                     data.timeType = data.timeBType;
@@ -933,51 +994,15 @@
                                 delete data.isValid; // need retrigger of validation, because rule is outdated
                                 data.description = node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleIsOutdated');
                             }
-                            if(data.timeType) {
-                                if (!data.time && data.timeType !== types.Undefined.value) {
-                                    data.time = {
-                                        type            : data.timeType,
-                                        value           : (data.timeValue || ''),
-                                        operator        : (parseInt(data.timeOp) || 0),
-                                        offsetType      : (data.offsetType || types.Undefined.value),
-                                        offset          : (data.offsetValue || '1'),
-                                        multiplier      : (parseInt(data.multiplier) || 60000),
-                                        days            : (data.timeDays || '*'),
-                                        months          : (data.timeMonths || '*')
-                                    };
-                                    if (data.timeOnlyOddDays) data.time.onlyOddDays = data.timeOnlyOddDays;
-                                    if (data.timeOnlyEvenDays) data.time.onlyEvenDays = data.timeOnlyEvenDays;
-                                    if (data.timeDateStart) data.time.dateStart = data.timeDateStart;
-                                    if (data.timeDateEnd) data.time.dateEnd = data.timeDateEnd;
-                                    if (data.timeOpText) data.time.operatorText = data.timeOpText;
-                                }
-                                delete data.timeType;
-                                delete data.timeValue;
-                                delete data.timeOp;
-                                delete data.timeOpText;
-                                delete data.offsetType;
-                                delete data.offsetValue;
-                                delete data.multiplier;
-                                delete data.timeDays;
-                                delete data.timeMonths;
-                                delete data.timeOnlyOddDays;
-                                delete data.timeOnlyEvenDays;
-                                delete data.timeDateStart;
-                                delete data.timeDateEnd;
-                                if (data.time && data.time.onlyEvenDays && data.time.onlyOddDays) {
-                                    delete data.time.onlyEvenDays;
-                                    delete data.time.onlyOddDays;
-                                }
-                            }
                             if (data.timeMinType) {
                                 if (!data.timeMin && data.timeMinType !== types.Undefined.value) {
-                                    data.timeMin = {
+                                    data.timeMin = Object.assign({
                                         type            : data.timeMinType,
                                         value           : (data.timeMinValue || ''),
                                         offsetType      : (data.offsetMinType || types.Undefined.value),
                                         offset          : (data.offsetMinValue || '1'),
                                         multiplier      : (parseInt(data.multiplierMin) || 60000)
-                                    };
+                                    }, data.timeMin);
                                 }
                                 delete data.timeMinType;
                                 delete data.timeMinValue;
@@ -988,13 +1013,13 @@
                             }
                             if (data.timeMaxType) {
                                 if (!data.timeMax && data.timeMaxType !== types.Undefined.value) {
-                                    data.timeMax = {
+                                    data.timeMax = Object.assign({
                                         type            : data.timeMaxType,
                                         value           : (data.timeMaxValue || ''),
                                         offsetType      : (data.offsetMaxType || types.Undefined.value),
                                         offset          : (data.offsetMaxValue || '1'),
                                         multiplier      : (parseInt(data.multiplierMax) || 60000)
-                                    };
+                                    }, data.timeMax);
                                 }
                                 delete data.timeMaxType;
                                 delete data.timeMaxValue;
@@ -1003,6 +1028,128 @@
                                 delete data.multiplierMax;
                                 delete data.timeMaxOp;
                             }
+                            if (data.timeType) {
+                                if (!data.time && data.timeType !== types.Undefined.value) {
+                                    const operator = (parseInt(data.timeOp) || cNBC_RULE_TYPE_UNTIL);
+                                    data.time = { };
+                                    let ttype = 'end'; // cNBC_RULE_TYPE_UNTIL
+                                    data.exec = cNBC_RULE_EXEC.auto;
+                                    if (operator === cNBC_RULE_TYPE_FROM) {
+                                        data.time.start = {};
+                                        ttype = 'start';
+                                    }
+                                    data.time[ttype] = {
+                                        type            : data.timeType,
+                                        value           : (data.timeValue || ''),
+                                        offsetType      : (data.offsetType || 'none'),
+                                        offset          : (data.offsetValue || 1),
+                                        multiplier      : (parseInt(data.multiplier) || 60000)
+                                    };
+
+                                    if (data.timeMinType && data.timeMinType !== 'none') {
+                                        data.time[ttype].min = {
+                                            type            : data.timeMinType,
+                                            value           : (data.timeMinValue || ''),
+                                            offsetType      : (data.offsetMinType || 'none'),
+                                            offset          : (data.offsetMinValue || 1),
+                                            multiplier      : (parseInt(data.multiplierMin) || 60000)
+                                        };
+                                    }
+                                    if (data.timeMin) {
+                                        data.time[ttype].min = {
+                                            type            : data.timeMin.type,
+                                            value           : data.timeMin.value,
+                                            offsetType      : data.timeMin.offsetType,
+                                            offset          : data.timeMin.offset,
+                                            multiplier      : data.timeMin.multiplier
+                                        };
+                                        delete data.timeMin;
+                                    }
+                                    if (data.timeMaxType && data.timeMaxType !== 'none') {
+                                        data.time[ttype].max = {
+                                            type            : data.timeMaxType,
+                                            value           : (data.timeMaxValue || ''),
+                                            offsetType      : (data.offsetMaxType || 'none'),
+                                            offset          : (data.offsetMaxValue || 1),
+                                            multiplier      : (parseInt(data.multiplierMax) || 60000)
+                                        };
+                                    }
+                                    if (data.timeMax) {
+                                        data.time[ttype].max = {
+                                            type            : data.timeMax.type,
+                                            value           : data.timeMax.value,
+                                            offsetType      : data.timeMax.offsetType,
+                                            offset          : data.timeMax.offset,
+                                            multiplier      : data.timeMax.multiplier
+                                        };
+                                        delete data.timeMax;
+                                    }
+                                    if (data.timeDays && data.timeDays !== '*') data.time.days = data.timeDays;
+                                    if (data.timeMonths && data.timeMonths !== '*') data.time.months = data.timeMonths;
+                                    if (data.timeOnlyOddDays) data.time.onlyOddDays = data.timeOnlyOddDays;
+                                    if (data.timeOnlyEvenDays) data.time.onlyEvenDays = data.timeOnlyEvenDays;
+                                    if (data.timeDateStart) data.time.dateStart = data.timeDateStart;
+                                    if (data.timeDateEnd) data.time.dateEnd = data.timeDateEnd;
+                                }
+                                delete data.timeType;
+                                delete data.timeValue;
+                                delete data.timeOp;
+                                delete data.timeOpText;
+                                delete data.offsetType;
+                                delete data.offsetValue;
+                                delete data.multiplier;
+                                delete data.timeDays;
+                                delete data.timeMonths;
+                                delete data.timeOnlyOddDays;
+                                delete data.timeOnlyEvenDays;
+                                delete data.timeDateStart;
+                                delete data.timeDateEnd;
+                                if (data.time && data.time.onlyEvenDays && data.time.onlyOddDays) {
+                                    delete data.time.onlyEvenDays;
+                                    delete data.time.onlyOddDays;
+                                }
+                            }
+                            if (data.time && (typeof data.time.operator !== 'undefined')) {
+                                let ttype = 'end'; // cNBC_RULE_TYPE_UNTIL
+                                data.exec = cNBC_RULE_EXEC.auto;
+                                if (data.time.operator === cNBC_RULE_TYPE_FROM) {
+                                    ttype = 'start';
+                                }
+                                data.time[ttype] = Object.assign({
+                                    type            : data.time.type,
+                                    value           : data.time.value,
+                                    offsetType      : data.time.offsetType,
+                                    offset          : data.time.offset,
+                                    multiplier      : data.time.multiplier
+                                }, data.time[ttype]);
+                                if (data.timeMin && data.timeMin.type !== 'none' ) {
+                                    data.time[ttype].min = Object.assign({
+                                        type            : data.timeMin.type,
+                                        value           : (data.timeMin.value || ''),
+                                        offsetType      : (data.timeMin.offsetType || 'none'),
+                                        offset          : (data.timeMin.offset || 1),
+                                        multiplier      : (parseInt(data.timeMin.multiplier) || 60000)
+                                    }, data.time[ttype].min);
+                                }
+                                if (data.timeMax && data.timeMax.type !== 'none' ) {
+                                    data.time[ttype].max = Object.assign({
+                                        type            : data.timeMax.type,
+                                        value           : (data.timeMax.value || ''),
+                                        offsetType      : (data.timeMax.offsetType || 'none'),
+                                        offset          : (data.timeMax.offset || 1),
+                                        multiplier      : (parseInt(data.timeMax.multiplier) || 60000)
+                                    }, data.time[ttype].max);
+                                }
+                                delete data.time.operator;
+                                delete data.time.operatorText;
+                                delete data.time.type;
+                                delete data.time.value;
+                                delete data.time.offsetType;
+                                delete data.time.offset;
+                                delete data.time.multiplier;
+                                delete data.timeMin;
+                                delete data.timeMax;
+                            }
                             if (data.payloadType) {
                                 if (!data.payload && data.payloadType !== types.Undefined.value) {
                                     data.payload = {
@@ -1034,6 +1181,9 @@
                                 data.description = getRuleDescription(node, selFields, data);
                                 data.version = ruleVersion;
                             }
+                            if (typeof data.exec === 'undefined') {
+                                data.exec = cNBC_RULE_EXEC.auto;
+                            }
                             $containerRow.data('ruleData', JSON.stringify(data));
                             $containerRow.css({ overflow: 'hidden'}); // , whiteSpace: 'nowrap'
 
@@ -1043,10 +1193,22 @@
                             const $div = $('<div/>', {
                                 class: 'rdgtimer-rule-mainblock'
                             }).appendTo($row0);
+
                             $('<span />', {
                                 id: 'rule-name-'+containerIndex,
                                 class: 'rdgtimer-rule-name-span'
                             }).append(data.name || 'rule ' + (containerIndex + 1)).appendTo( $div );
+                            let exec = data.exec;
+                            if (data.time) {
+                                exec = cNBC_RULE_EXEC.first;
+                                if (data.exec === cNBC_RULE_EXEC.last || (data.time.start && !data.time.end)) {
+                                    exec = cNBC_RULE_EXEC.last;
+                                }
+                            }
+                            $('<span />', {
+                                id: 'rule-exec-'+containerIndex,
+                                class: 'rdgtimer-rule-exec-span'
+                            }).append(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExecShort.'+exec)).appendTo( $div );
                             $('<div />', {
                                 id: 'rule-description-'+containerIndex,
                                 class: 'rdgtimer-rule-description-span'
@@ -1141,6 +1303,8 @@
                             data.index = i;
                             // data.conditional = ((data.conditions.length > 0) ? 1 : 0);
                             // data.timeLimited = ((data.time && data.time.type !== 'none') ? 1 : 0);
+                            // TODO: node-input-rule-timeReg does not exists
+                            // WARNING: node-input-rule-timeReg does not exists
                             data.timeData = (parseFloat($(this).find('.node-input-rule-timeReg').attr('timedata')) || 0);
                         });
                         /**
@@ -1462,6 +1626,12 @@
                     });
 
                     const $dialogName = $dialog.find('#dlg-ip-btctl-rule-name');
+
+                    const $dialogExec = $dialog.find('#dlg-ip-btctl-rule-exec');
+                    $dialogExec.append($('<option></option>').val(cNBC_RULE_EXEC.auto).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExecAuto')));
+                    $dialogExec.append($('<option></option>').val(cNBC_RULE_EXEC.first).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExecFirst')));
+                    $dialogExec.append($('<option></option>').val(cNBC_RULE_EXEC.last).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExecLast')));
+
                     let $dialogDataRow = null;
                     let dialogDataOnLoading = false;
                     let dialogDataIndex = -1;
@@ -1586,6 +1756,7 @@
                                         'num',
                                         types.numAzimuth,
                                         types.numAltitude,
+                                        types.numAnglePreDef,
                                         'str',
                                         'bool',
                                         'flow',
@@ -1712,18 +1883,65 @@
                     }); // condition-container
                     $dialog.find('#dlg-ip-btctl-rule-condition-text').html(node._('node-red-contrib-sun-position/position-config:ruleCtrl.text.ruleCondition'));
                     // #endregion dialogConditions
-                    // #region dialogTimeReg
-                    const $dialogTimeRegOperator = $dialog.find('#dlg-ip-btctl-rule-timeReg-operator');
-                    $dialogTimeRegOperator.append($('<option></option>').val(cNBC_RULE_TYPE_UNTIL).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeUntil')));
-                    $dialogTimeRegOperator.append($('<option></option>').val(cNBC_RULE_TYPE_FROM).text(node._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeFrom')));
+                    // #region dialogTimeReg Start
+                    const $dialogTimeStartRegInput = $dialog.find('#dlg-ip-btctl-rule-timeStartReg');
+                    $dialogTimeStartRegInput.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.UndefinedTimeFrom,
+                            types.TimeEntered,
+                            types.TimeSun,
+                            types.TimeSunCustom,
+                            types.TimeMoon,
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.SunTimeByAzimuth,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet
+                        ]
+                    });
+                    $dialogTimeStartRegInput.typedInput('width', '40%');
+
+                    const $dialogTimeStartRegMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeStartReg');
+                    appendOptions(node, $dialogTimeStartRegMultiplier, 'multiplier', data => (data.id > 0));
 
-                    const $dialogTimeRegInput = $dialog.find('#dlg-ip-btctl-rule-timeReg');
-                    $dialogTimeRegInput.typedInput({
+                    const $dialogTimeStartRegOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeStartReg');
+                    $dialogTimeStartRegOffset.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.Undefined,
+                            'num',
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.randmNumCachedDay,
+                            types.randmNumCachedWeek
+                        ]
+                    }).change(() => {
+                        const type = $dialogTimeStartRegOffset.typedInput('type');
+                        if (type === types.Undefined.value) {
+                            $dialogTimeStartRegMultiplier.prop('disabled', true);
+                        } else {
+                            $dialogTimeStartRegMultiplier.prop('disabled', false);
+                        }
+                        $dialogTimeStartRegInput.change();
+                    });
+                    $dialogTimeStartRegOffset.typedInput('width', '40%');
+                    // #endregion dialogTimeReg Start
+                    // #region dialogTimeMin Start
+                    const $dialogTimeStartMinInput = $dialog.find('#dlg-ip-btctl-rule-timeStartMin');
+                    $dialogTimeStartMinInput.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -1732,22 +1950,18 @@
                             'env',
                             'jsonata',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ]
                     });
-                    $dialogTimeRegInput.typedInput('width', '40%');
+                    $dialogTimeStartMinInput.typedInput('width', '40%');
 
-                    const $dialogTimeRegMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeReg');
-                    appendOptions(node, $dialogTimeRegMultiplier, 'multiplier', data => (data.id > 0));
+                    const $dialogTimeStartMinMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeStartMin');
+                    appendOptions(node, $dialogTimeStartMinMultiplier, 'multiplier', data => (data.id > 0));
 
-                    const $dialogTimeRegOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeReg');
-                    $dialogTimeRegOffset.typedInput({
+                    const $dialogTimeStartMinOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeStartMin');
+                    $dialogTimeStartMinOffset.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
@@ -1761,24 +1975,25 @@
                             types.randmNumCachedWeek
                         ]
                     }).change(() => {
-                        const type = $dialogTimeRegOffset.typedInput('type');
+                        const type = $dialogTimeStartMinOffset.typedInput('type');
                         if (type === types.Undefined.value) {
-                            $dialogTimeRegMultiplier.prop('disabled', true);
+                            $dialogTimeStartMinMultiplier.prop('disabled', true);
                         } else {
-                            $dialogTimeRegMultiplier.prop('disabled', false);
+                            $dialogTimeStartMinMultiplier.prop('disabled', false);
                         }
-                        $dialogTimeRegInput.change();
+                        $dialogTimeStartMinInput.change();
                     });
-                    $dialogTimeRegOffset.typedInput('width', '40%');
-                    // #endregion dialogTimeReg
-                    // #region dialogTimeMin
-                    const $dialogTimeMinInput = $dialog.find('#dlg-ip-btctl-rule-timeMin');
-                    $dialogTimeMinInput.typedInput({
+                    $dialogTimeStartMinOffset.typedInput('width', '40%');
+                    // #endregion dialogTimeMin Start
+                    // #region dialogTimeMax Start
+                    const $dialogTimeStartMaxInput = $dialog.find('#dlg-ip-btctl-rule-timeStartMax');
+                    $dialogTimeStartMaxInput.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -1787,22 +2002,70 @@
                             'env',
                             'jsonata',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
+                        ]
+                    });
+                    $dialogTimeStartMaxInput.typedInput('width', '40%');
+
+                    const $dialogTimeStartMaxMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeStartMax');
+                    appendOptions(node, $dialogTimeStartMaxMultiplier, 'multiplier', data => (data.id > 0));
+
+                    const $dialogTimeStartMaxOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeStartMax');
+                    $dialogTimeStartMaxOffset.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.Undefined,
+                            'num',
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.randmNumCachedDay,
+                            types.randmNumCachedWeek
+                        ]
+                    }).change(() => {
+                        const type = $dialogTimeStartMaxOffset.typedInput('type');
+                        if (type === types.Undefined.value) {
+                            $dialogTimeStartMaxMultiplier.prop('disabled', true);
+                        } else {
+                            $dialogTimeStartMaxMultiplier.prop('disabled', false);
+                        }
+                        $dialogTimeStartMaxInput.change();
+                    });
+                    // #endregion dialogTimeMax  Start
+
+                    // #region dialogTimeReg End
+                    const $dialogTimeEndRegInput = $dialog.find('#dlg-ip-btctl-rule-timeEndReg');
+                    $dialogTimeEndRegInput.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.UndefinedTimeUntil,
+                            types.TimeEntered,
+                            types.TimeSun,
+                            types.TimeSunCustom,
+                            types.TimeSunNow,
+                            types.TimeMoon,
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.SunTimeByAzimuth,
+                            types.SunTimeByElevationNext,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet
                         ]
                     });
-                    $dialogTimeMinInput.typedInput('width', '40%');
+                    $dialogTimeEndRegInput.typedInput('width', '40%');
 
-                    const $dialogTimeMinMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeMin');
-                    appendOptions(node, $dialogTimeMinMultiplier, 'multiplier', data => (data.id > 0));
+                    const $dialogTimeEndRegMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeEndReg');
+                    appendOptions(node, $dialogTimeEndRegMultiplier, 'multiplier', data => (data.id > 0));
 
-                    const $dialogTimeMinOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeMin');
-                    $dialogTimeMinOffset.typedInput({
+                    const $dialogTimeEndRegOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeEndReg');
+                    $dialogTimeEndRegOffset.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
@@ -1816,24 +2079,25 @@
                             types.randmNumCachedWeek
                         ]
                     }).change(() => {
-                        const type = $dialogTimeMinOffset.typedInput('type');
+                        const type = $dialogTimeEndRegOffset.typedInput('type');
                         if (type === types.Undefined.value) {
-                            $dialogTimeMinMultiplier.prop('disabled', true);
+                            $dialogTimeEndRegMultiplier.prop('disabled', true);
                         } else {
-                            $dialogTimeMinMultiplier.prop('disabled', false);
+                            $dialogTimeEndRegMultiplier.prop('disabled', false);
                         }
-                        $dialogTimeMinInput.change();
+                        $dialogTimeEndRegInput.change();
                     });
-                    $dialogTimeMinOffset.typedInput('width', '40%');
-                    // #endregion dialogTimeMin
-                    // #region dialogTimeMax
-                    const $dialogTimeMaxInput = $dialog.find('#dlg-ip-btctl-rule-timeMax');
-                    $dialogTimeMaxInput.typedInput({
+                    $dialogTimeEndRegOffset.typedInput('width', '40%');
+                    // #endregion dialogTimeReg End
+                    // #region dialogTimeMin End
+                    const $dialogTimeEndMinInput = $dialog.find('#dlg-ip-btctl-rule-timeEndMin');
+                    $dialogTimeEndMinInput.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
                             types.TimeEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             'msg',
@@ -1842,22 +2106,18 @@
                             'env',
                             'jsonata',
                             types.SunTimeByAzimuth,
-                            types.SunTimeByAzimuthRad,
                             types.SunTimeByElevationNext,
-                            types.SunTimeByElevationNextRad,
                             types.SunTimeByElevationRise,
-                            types.SunTimeByElevationRiseRad,
-                            types.SunTimeByElevationSet,
-                            types.SunTimeByElevationSetRad
+                            types.SunTimeByElevationSet
                         ]
                     });
-                    $dialogTimeMaxInput.typedInput('width', '40%');
+                    $dialogTimeEndMinInput.typedInput('width', '40%');
 
-                    const $dialogTimeMaxMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeMax');
-                    appendOptions(node, $dialogTimeMaxMultiplier, 'multiplier', data => (data.id > 0));
+                    const $dialogTimeEndMinMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeEndMin');
+                    appendOptions(node, $dialogTimeEndMinMultiplier, 'multiplier', data => (data.id > 0));
 
-                    const $dialogTimeMaxOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeMax');
-                    $dialogTimeMaxOffset.typedInput({
+                    const $dialogTimeEndMinOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeEndMin');
+                    $dialogTimeEndMinOffset.typedInput({
                         default: types.Undefined.value,
                         types: [
                             types.Undefined,
@@ -1871,16 +2131,68 @@
                             types.randmNumCachedWeek
                         ]
                     }).change(() => {
-                        const type = $dialogTimeMaxOffset.typedInput('type');
+                        const type = $dialogTimeEndMinOffset.typedInput('type');
                         if (type === types.Undefined.value) {
-                            $dialogTimeMaxMultiplier.prop('disabled', true);
+                            $dialogTimeEndMinMultiplier.prop('disabled', true);
                         } else {
-                            $dialogTimeMaxMultiplier.prop('disabled', false);
+                            $dialogTimeEndMinMultiplier.prop('disabled', false);
                         }
-                        $dialogTimeMaxInput.change();
+                        $dialogTimeEndMinInput.change();
                     });
-                    $dialogTimeMaxOffset.typedInput('width', '40%');
-                    // #endregion dialogTimeMax
+                    $dialogTimeEndMinOffset.typedInput('width', '40%');
+                    // #endregion dialogTimeMin End
+                    // #region dialogTimeMax End
+                    const $dialogTimeEndMaxInput = $dialog.find('#dlg-ip-btctl-rule-timeEndMax');
+                    $dialogTimeEndMaxInput.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.Undefined,
+                            types.TimeEntered,
+                            types.TimeSun,
+                            types.TimeSunCustom,
+                            types.TimeSunNow,
+                            types.TimeMoon,
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.SunTimeByAzimuth,
+                            types.SunTimeByElevationNext,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet
+                        ]
+                    });
+                    $dialogTimeEndMaxInput.typedInput('width', '40%');
+
+                    const $dialogTimeEndMaxMultiplier = $dialog.find('#dlg-ip-btctl-rule-multiplier-timeEndMax');
+                    appendOptions(node, $dialogTimeEndMaxMultiplier, 'multiplier', data => (data.id > 0));
+
+                    const $dialogTimeEndMaxOffset = $dialog.find('#dlg-ip-btctl-rule-offset-timeEndMax');
+                    $dialogTimeEndMaxOffset.typedInput({
+                        default: types.Undefined.value,
+                        types: [
+                            types.Undefined,
+                            'num',
+                            'msg',
+                            'flow',
+                            'global',
+                            'env',
+                            'jsonata',
+                            types.randmNumCachedDay,
+                            types.randmNumCachedWeek
+                        ]
+                    }).change(() => {
+                        const type = $dialogTimeEndMaxOffset.typedInput('type');
+                        if (type === types.Undefined.value) {
+                            $dialogTimeEndMaxMultiplier.prop('disabled', true);
+                        } else {
+                            $dialogTimeEndMaxMultiplier.prop('disabled', false);
+                        }
+                        $dialogTimeEndMaxInput.change();
+                    });
+                    // #endregion dialogTimeMax End
+
                     // #region dialogTimeLimit
                     $dialog.find('#dialog-row-timeConstraints-show').click(() => {
                         $dialog.find('#dialog-row-timeConstraintsPlaceholder').hide();
@@ -1949,6 +2261,7 @@
                             types.TimeEntered,
                             types.DateEntered,
                             types.TimeSun,
+                            types.TimeSunCustom,
                             types.TimeSunNow,
                             types.TimeMoon,
                             types.DayOfMonth,
@@ -1958,12 +2271,11 @@
                             types.MoonPhase,
                             types.SunAzimuth,
                             types.SunElevation,
-                            types.SunAzimuthRad,
-                            types.SunElevationRad,
                             types.SunTimeByAzimuth,
                             types.SunTimeByElevationObj,
-                            types.SunTimeByAzimuthRad,
-                            types.SunTimeByElevationObjRad,
+                            types.SunTimeByElevationNext,
+                            types.SunTimeByElevationRise,
+                            types.SunTimeByElevationSet,
                             types.isDST,
                             types.WeekOfYear,
                             types.WeekOfYearEven,
@@ -1994,53 +2306,254 @@
                     $dialogTopic.change(() => { _dialogGenHelpText(); });
                     // #endregion topic
                     // #region dialogChange
-                    $dialogTimeRegInput.change(() => {
+                    $dialogTimeStartRegInput.change(() => {
                         if (dialogDataOnLoading) { return; }
-                        const opType = $dialogTimeRegInput.typedInput('type');
+                        const opType = $dialogTimeStartRegInput.typedInput('type');
                         if (opType === types.Undefined.value) {
                             node.dialogAddData.timeReg = {
                                 ts : 0,
                                 data : null,
                                 text : 'N/A'
                             };
-                            $('#dialog-row-timeReg').attr('title', node.dialogAddData.timeReg.text);
-                            $dialogTimeRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
-                            $dialogTimeRegOperator.hide();
-                            $('#dialog-row-offset-timeReg').hide();
-                            $('#dialog-row-timeReg').attr('title', opType);
-
-                            $('#dialog-row-timeMin').hide();
-                            $('#dialog-row-timeMax').hide();
-                            $('#dialog-row-offset-timeMin').hide();
-                            $('#dialog-row-offset-timeMax').hide();
-                            $('.dialog-row-timeLimits').hide();
-                            $('.dialog-row-timeLimits-ph').hide();
-                            if ($dialogTimeMaxInput.typedInput('type') !== types.Undefined.value) {
-                                $dialogTimeMaxInput.typedInput('type', types.Undefined.value);
+                            $('#dialog-row-timeStartReg').attr('title', node.dialogAddData.timeReg.text);
+                            $dialogTimeStartRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
+                            $('#dialog-row-offset-timeStartReg').hide();
+                            $('#dialog-row-timeStartReg').attr('title', opType);
+
+                            $('#dialog-row-timeStartMin').hide();
+                            $('#dialog-row-timeStartMax').hide();
+                            $('#dialog-row-offset-timeStartMin').hide();
+                            $('#dialog-row-offset-timeStartMax').hide();
+                            $('.dialog-row-timeStartLimits').hide();
+                            $('.dialog-row-timeStartLimits-ph').hide();
+                            if ($dialogTimeStartMaxInput.typedInput('type') !== types.Undefined.value) {
+                                $dialogTimeStartMaxInput.typedInput('type', types.Undefined.value);
                             }
-                            if ($dialogTimeMaxInput.typedInput('type') !== types.Undefined.value) {
-                                $dialogTimeMaxInput.typedInput('type', types.Undefined.value);
+                            if ($dialogTimeStartMaxInput.typedInput('type') !== types.Undefined.value) {
+                                $dialogTimeStartMaxInput.typedInput('type', types.Undefined.value);
                             }
                             _dialogGenHelpText();
                             return;
                         }
-                        $dialogTimeRegOperator.show();
                         if (opType === types.TimeEntered.value ||
                             opType === types.TimeSun.value ||
+                            opType === types.TimeSunCustom.value ||
                             opType === types.TimeMoon.value) {
-                            $('#dialog-row-offset-timeReg').show();
+                            $('#dialog-row-offset-timeStartReg').show();
+                        } else {
+                            $('#dialog-row-offset-timeStartReg').hide();
+                        }
+
+                        const noLimit = getCheckboxesStr($('#dlg-ip-btctl-rule-timeDays input[type=checkbox]:checked'), 7) === '*' &&
+                                        getCheckboxesStr($('#dlg-ip-btctl-rule-timeMonths input[type=checkbox]:checked'), 12) === '*' &&
+                                        $dialogTimeLimitOnlyEvenDays.is(':checked') !== true &&
+                                        $dialogTimeLimitOnlyOddDays.is(':checked') !== true &&
+                                        $dialogTimeLimitOnlyEvenWeeks.is(':checked') !== true &&
+                                        $dialogTimeLimitOnlyOddWeeks.is(':checked') !== true &&
+                                        $dialogTimeLimitDateStart.val() === '' &&
+                                        $dialogTimeLimitDateEnd.val() === '';
+                        if (noLimit) {
+                            $('.dialog-row-timeLimits').hide();
+                            $('.dialog-row-timeLimits-ph').show();
+                        } else {
+                            $('.dialog-row-timeLimits').show();
+                            $('.dialog-row-timeLimits-ph').hide();
+                        }
+                        getBackendData(d => {
+                            if (d.value && d.value !== 'none') {
+                                const dv = new Date(d.value);
+                                node.dialogAddData.timeReg = {
+                                    ts : dv.getTime(),
+                                    data : d,
+                                    text : bdDateToTime(dv)
+                                };
+                            } else {
+                                node.dialogAddData.timeReg = {
+                                    ts : 0,
+                                    data : null,
+                                    text : bdDateToTime(d)
+                                };
+                            }
+                            $('#dialog-row-timeStartReg').attr('title', node.dialogAddData.timeReg.text);
+                            $dialogTimeStartRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
+                            _dialogGenHelpText();
+                        }, {
+                            nodeId:         node.id,
+                            kind:           'getTimeData',
+                            config:         $nodeConfig.val(),
+                            type:           opType,
+                            value:          $dialogTimeStartRegInput.typedInput('value'),
+                            offsetType:     $dialogTimeStartRegOffset.typedInput('type'),
+                            offset:         $dialogTimeStartRegOffset.typedInput('value'),
+                            multiplier:     parseInt($dialogTimeStartRegMultiplier.val()),
+                            noOffsetError:  true
+                        });
+                        $dialogTimeStartMinInput.change();
+                        $dialogTimeStartMaxInput.change();
+                    });
+
+                    $dialogTimeStartMinInput.change(() => {
+                        if (dialogDataOnLoading) { return; }
+                        const opAType = $dialogTimeStartRegInput.typedInput('type');
+                        if (opAType && opAType !== types.Undefined.value) {
+                            $('#dialog-row-timeStartMin').show();
+                            const opType = $dialogTimeStartMinInput.typedInput('type');
+                            if (opType === types.Undefined.value) {
+                                $('#dialog-row-offset-timeStartMin').hide();
+                                node.dialogAddData.time.start.min = {
+                                    ts : 0,
+                                    data : null,
+                                    text : 'N/A'
+                                };
+                                $('#dialog-row-timeStartMin').attr('title', node.dialogAddData.time.start.min.text);
+                                $dialogTimeStartMinInput.attr('timedata', node.dialogAddData.time.start.min.ts);
+                                _dialogGenHelpText();
+                                return;
+                            } else if (opType === types.TimeEntered.value ||
+                                       opType === types.TimeSun.value ||
+                                       opType === types.TimeSunCustom.value ||
+                                       opType === types.TimeMoon.value) {
+                                $('#dialog-row-offset-timeStartMin').show();
+                            } else {
+                                $('#dialog-row-offset-timeStartMin').hide();
+                            }
+                            getBackendData(d => {
+                                if (d.value && d.value !== 'none') {
+                                    const dv = new Date(d.value);
+                                    node.dialogAddData.time.start.min = {
+                                        ts : dv.getTime(),
+                                        data : d,
+                                        text : bdDateToTime(dv)
+                                    };
+                                } else {
+                                    node.dialogAddData.time.start.min = {
+                                        ts : 0,
+                                        data : null,
+                                        text : bdDateToTime(d)
+                                    };
+                                }
+                                $('#dialog-row-timeStartMin').attr('title', node.dialogAddData.time.start.min.text);
+                                $dialogTimeStartMinInput.attr('timedata', node.dialogAddData.time.start.min.ts);
+                                _dialogGenHelpText();
+                            }, {
+                                nodeId:         node.id,
+                                kind:           'getTimeData',
+                                config:         $nodeConfig.val(),
+                                type:           opType,
+                                value:          $dialogTimeStartMinInput.typedInput('value'),
+                                offsetType:     $dialogTimeStartMinOffset.typedInput('type'),
+                                offset:         $dialogTimeStartMinOffset.typedInput('value'),
+                                multiplier:     parseInt($dialogTimeStartMinMultiplier.val()),
+                                noOffsetError:  true
+                            });
+                        }
+                        _dialogGenHelpText();
+                    });
+
+                    $dialogTimeStartMaxInput.change(() => {
+                        if (dialogDataOnLoading) { return; }
+                        const opAType = $dialogTimeStartRegInput.typedInput('type');
+                        if (opAType && opAType !== types.Undefined.value) {
+                            $('#dialog-row-timeStartMax').show();
+                            const opType = $dialogTimeStartMaxInput.typedInput('type');
+                            if (opType === types.Undefined.value) {
+                                $('#dialog-row-offset-timeStartMax').hide();
+                                node.dialogAddData.time.start.max = {
+                                    ts : 0,
+                                    data : null,
+                                    text : 'N/A'
+                                };
+                                $('#dialog-row-timeStartMax').attr('title', node.dialogAddData.time.start.max.text);
+                                $dialogTimeStartMaxInput.attr('timedata', node.dialogAddData.time.start.max.ts);
+                                _dialogGenHelpText();
+                                return;
+                            } else if (opType === types.TimeEntered.value ||
+                                       opType === types.TimeSun.value ||
+                                       opType === types.TimeSunCustom.value ||
+                                       opType === types.TimeMoon.value) {
+                                $('#dialog-row-offset-timeStartMax').show();
+                            } else {
+                                $('#dialog-row-offset-timeStartMax').hide();
+                            }
+                            getBackendData(d => {
+                                if (d.value && d.value !== 'none') {
+                                    const dv = new Date(d.value);
+                                    node.dialogAddData.time.start.max = {
+                                        ts : dv.getTime(),
+                                        data : d,
+                                        text : bdDateToTime(dv)
+                                    };
+                                } else {
+                                    node.dialogAddData.time.start.max = {
+                                        ts : 0,
+                                        data : null,
+                                        text : bdDateToTime(d)
+                                    };
+                                }
+                                $('#dialog-row-timeStartMax').attr('title', node.dialogAddData.time.start.max.text);
+                                $dialogTimeStartMaxInput.attr('timedata', node.dialogAddData.time.start.max.ts);
+                                _dialogGenHelpText();
+                            }, {
+                                nodeId:         node.id,
+                                kind:           'getTimeData',
+                                config:         $nodeConfig.val(),
+                                type:           opType,
+                                value:          $dialogTimeStartMaxInput.typedInput('value'),
+                                offsetType:     $dialogTimeStartMaxOffset.typedInput('type'),
+                                offset:         $dialogTimeStartMaxOffset.typedInput('value'),
+                                multiplier:     parseInt($dialogTimeStartMaxMultiplier.val()),
+                                noOffsetError:  true
+                            });
+                        }
+                        _dialogGenHelpText();
+                    });
+
+                    $dialogTimeEndRegInput.change(() => {
+                        if (dialogDataOnLoading) { return; }
+                        const opType = $dialogTimeEndRegInput.typedInput('type');
+                        if (opType === types.Undefined.value) {
+                            node.dialogAddData.timeReg = {
+                                ts : 0,
+                                data : null,
+                                text : 'N/A'
+                            };
+                            $('#dialog-row-timeEndReg').attr('title', node.dialogAddData.timeReg.text);
+                            $dialogTimeEndRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
+                            $('#dialog-row-timeEndReg-offset').hide();
+                            $('#dialog-row-timeEndReg').attr('title', opType);
+
+                            $('#dialog-row-timeEndMin').hide();
+                            $('#dialog-row-timeEndMax').hide();
+                            $('#dialog-row-timeEndMin-offset').hide();
+                            $('#dialog-row-timeEndMax-offset').hide();
+                            $('.dialog-row-timeEndLimits').hide();
+                            $('.dialog-row-timeEndLimits-ph').hide();
+                            if ($dialogTimeEndMaxInput.typedInput('type') !== types.Undefined.value) {
+                                $dialogTimeEndMaxInput.typedInput('type', types.Undefined.value);
+                            }
+                            if ($dialogTimeEndMaxInput.typedInput('type') !== types.Undefined.value) {
+                                $dialogTimeEndMaxInput.typedInput('type', types.Undefined.value);
+                            }
+                            _dialogGenHelpText();
+                            return;
+                        }
+                        if (opType === types.TimeEntered.value ||
+                           opType === types.TimeSun.value ||
+                           opType === types.TimeSunCustom.value ||
+                           opType === types.TimeMoon.value) {
+                            $('#dialog-row-timeEndReg-offset').show();
                         } else {
-                            $('#dialog-row-offset-timeReg').hide();
+                            $('#dialog-row-timeEndReg-offset').hide();
                         }
 
                         const noLimit = getCheckboxesStr($('#dlg-ip-btctl-rule-timeDays input[type=checkbox]:checked'), 7) === '*' &&
-                            getCheckboxesStr($('#dlg-ip-btctl-rule-timeMonths input[type=checkbox]:checked'), 12) === '*' &&
-                            $dialogTimeLimitOnlyEvenDays.is(':checked') !== true &&
-                            $dialogTimeLimitOnlyOddDays.is(':checked') !== true &&
-                            $dialogTimeLimitOnlyEvenWeeks.is(':checked') !== true &&
-                            $dialogTimeLimitOnlyOddWeeks.is(':checked') !== true &&
-                            $dialogTimeLimitDateStart.val() === '' &&
-                            $dialogTimeLimitDateEnd.val() === '';
+                                        getCheckboxesStr($('#dlg-ip-btctl-rule-timeMonths input[type=checkbox]:checked'), 12) === '*' &&
+                                        $dialogTimeLimitOnlyEvenDays.is(':checked') !== true &&
+                                        $dialogTimeLimitOnlyOddDays.is(':checked') !== true &&
+                                        $dialogTimeLimitOnlyEvenWeeks.is(':checked') !== true &&
+                                        $dialogTimeLimitOnlyOddWeeks.is(':checked') !== true &&
+                                        $dialogTimeLimitDateStart.val() === '' &&
+                                        $dialogTimeLimitDateEnd.val() === '';
                         if (noLimit) {
                             $('.dialog-row-timeLimits').hide();
                             $('.dialog-row-timeLimits-ph').show();
@@ -2063,142 +2576,146 @@
                                     text : bdDateToTime(d)
                                 };
                             }
-                            $('#dialog-row-timeReg').attr('title', node.dialogAddData.timeReg.text);
-                            $dialogTimeRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
+                            $('#dialog-row-timeEndReg').attr('title', node.dialogAddData.timeReg.text);
+                            $dialogTimeEndRegInput.attr('timedata', node.dialogAddData.timeReg.ts);
                             _dialogGenHelpText();
                         }, {
                             nodeId:         node.id,
                             kind:           'getTimeData',
                             config:         $nodeConfig.val(),
                             type:           opType,
-                            value:          $dialogTimeRegInput.typedInput('value'),
-                            offsetType:     $dialogTimeRegOffset.typedInput('type'),
-                            offset:         $dialogTimeRegOffset.typedInput('value'),
-                            multiplier:     parseInt($dialogTimeRegMultiplier.val()),
+                            value:          $dialogTimeEndRegInput.typedInput('value'),
+                            offsetType:     $dialogTimeEndRegOffset.typedInput('type'),
+                            offset:         $dialogTimeEndRegOffset.typedInput('value'),
+                            multiplier:     parseInt($dialogTimeEndRegMultiplier.val()),
                             noOffsetError:  true
                         });
-                        $dialogTimeMinInput.change();
-                        $dialogTimeMaxInput.change();
+                        $dialogTimeEndMinInput.change();
+                        $dialogTimeEndMaxInput.change();
                     });
 
-                    $dialogTimeMinInput.change(() => {
+                    $dialogTimeEndMinInput.change(() => {
                         if (dialogDataOnLoading) { return; }
-                        const opAType = $dialogTimeRegInput.typedInput('type');
+                        const opAType = $dialogTimeEndRegInput.typedInput('type');
                         if (opAType && opAType !== types.Undefined.value) {
-                            $('#dialog-row-timeMin').show();
-                            const opType = $dialogTimeMinInput.typedInput('type');
+                            $('#dialog-row-timeEndMin').show();
+                            const opType = $dialogTimeEndMinInput.typedInput('type');
                             if (opType === types.Undefined.value) {
-                                $('#dialog-row-offset-timeMin').hide();
-                                node.dialogAddData.timeMin = {
+                                $('#dialog-row-timeEndMin-offset').hide();
+                                node.dialogAddData.time.end.min = {
                                     ts : 0,
                                     data : null,
                                     text : 'N/A'
                                 };
-                                $('#dialog-row-timeMin').attr('title', node.dialogAddData.timeMin.text);
-                                $dialogTimeMinInput.attr('timedata', node.dialogAddData.timeMin.ts);
+                                $('#dialog-row-timeEndMin').attr('title', node.dialogAddData.time.end.min.text);
+                                $dialogTimeEndMinInput.attr('timedata', node.dialogAddData.time.end.min.ts);
                                 _dialogGenHelpText();
                                 return;
                             } else if (opType === types.TimeEntered.value ||
                                        opType === types.TimeSun.value ||
+                                       opType === types.TimeSunCustom.value ||
                                        opType === types.TimeMoon.value) {
-                                $('#dialog-row-offset-timeMin').show();
+                                $('#dialog-row-timeEndMin-offset').show();
                             } else {
-                                $('#dialog-row-offset-timeMin').hide();
+                                $('#dialog-row-timeEndMin-offset').hide();
                             }
                             getBackendData(d => {
                                 if (d.value && d.value !== 'none') {
                                     const dv = new Date(d.value);
-                                    node.dialogAddData.timeMin = {
+                                    node.dialogAddData.time.end.min = {
                                         ts : dv.getTime(),
                                         data : d,
                                         text : bdDateToTime(dv)
                                     };
                                 } else {
-                                    node.dialogAddData.timeMin = {
+                                    node.dialogAddData.time.end.min = {
                                         ts : 0,
                                         data : null,
                                         text : bdDateToTime(d)
                                     };
                                 }
-                                $('#dialog-row-timeMin').attr('title', node.dialogAddData.timeMin.text);
-                                $dialogTimeMinInput.attr('timedata', node.dialogAddData.timeMin.ts);
+                                $('#dialog-row-timeEndMin').attr('title', node.dialogAddData.time.end.min.text);
+                                $dialogTimeEndMinInput.attr('timedata', node.dialogAddData.time.end.min.ts);
                                 _dialogGenHelpText();
                             }, {
                                 nodeId:         node.id,
                                 kind:           'getTimeData',
                                 config:         $nodeConfig.val(),
                                 type:           opType,
-                                value:          $dialogTimeMinInput.typedInput('value'),
-                                offsetType:     $dialogTimeMinOffset.typedInput('type'),
-                                offset:         $dialogTimeMinOffset.typedInput('value'),
-                                multiplier:     parseInt($dialogTimeMinMultiplier.val()),
+                                value:          $dialogTimeEndMinInput.typedInput('value'),
+                                offsetType:     $dialogTimeEndMinOffset.typedInput('type'),
+                                offset:         $dialogTimeEndMinOffset.typedInput('value'),
+                                multiplier:     parseInt($dialogTimeEndMinMultiplier.val()),
                                 noOffsetError:  true
                             });
                         }
                         _dialogGenHelpText();
                     });
 
-                    $dialogTimeMaxInput.change(() => {
+                    $dialogTimeEndMaxInput.change(() => {
                         if (dialogDataOnLoading) { return; }
-                        const opAType = $dialogTimeRegInput.typedInput('type');
+                        const opAType = $dialogTimeEndRegInput.typedInput('type');
                         if (opAType && opAType !== types.Undefined.value) {
-                            $('#dialog-row-timeMax').show();
-                            const opType = $dialogTimeMaxInput.typedInput('type');
+                            $('#dialog-row-timeEndMax').show();
+                            const opType = $dialogTimeEndMaxInput.typedInput('type');
                             if (opType === types.Undefined.value) {
-                                $('#dialog-row-offset-timeMax').hide();
-                                node.dialogAddData.timeMax = {
+                                $('#dialog-row-timeEndMax-offset').hide();
+                                node.dialogAddData.time.end.max = {
                                     ts : 0,
                                     data : null,
                                     text : 'N/A'
                                 };
-                                $('#dialog-row-timeMax').attr('title', node.dialogAddData.timeMax.text);
-                                $dialogTimeMaxInput.attr('timedata', node.dialogAddData.timeMax.ts);
+                                $('#dialog-row-timeEndMax').attr('title', node.dialogAddData.time.end.max.text);
+                                $dialogTimeEndMaxInput.attr('timedata', node.dialogAddData.time.end.max.ts);
                                 _dialogGenHelpText();
                                 return;
                             } else if (opType === types.TimeEntered.value ||
                                        opType === types.TimeSun.value ||
+                                       opType === types.TimeSunCustom.value ||
                                        opType === types.TimeMoon.value) {
-                                $('#dialog-row-offset-timeMax').show();
+                                $('#dialog-row-timeEndMax-offset').show();
                             } else {
-                                $('#dialog-row-offset-timeMax').hide();
+                                $('#dialog-row-timeEndMax-offset').hide();
                             }
                             getBackendData(d => {
                                 if (d.value && d.value !== 'none') {
                                     const dv = new Date(d.value);
-                                    node.dialogAddData.timeMax = {
+                                    node.dialogAddData.time.end.max = {
                                         ts : dv.getTime(),
                                         data : d,
                                         text : bdDateToTime(dv)
                                     };
                                 } else {
-                                    node.dialogAddData.timeMax = {
+                                    node.dialogAddData.time.end.max = {
                                         ts : 0,
                                         data : null,
                                         text : bdDateToTime(d)
                                     };
                                 }
-                                $('#dialog-row-timeMax').attr('title', node.dialogAddData.timeMax.text);
-                                $dialogTimeMaxInput.attr('timedata', node.dialogAddData.timeMax.ts);
+                                $('#dialog-row-timeEndMax').attr('title', node.dialogAddData.time.end.max.text);
+                                $dialogTimeEndMaxInput.attr('timedata', node.dialogAddData.time.end.max.ts);
                                 _dialogGenHelpText();
                             }, {
                                 nodeId:         node.id,
                                 kind:           'getTimeData',
                                 config:         $nodeConfig.val(),
                                 type:           opType,
-                                value:          $dialogTimeMaxInput.typedInput('value'),
-                                offsetType:     $dialogTimeMaxOffset.typedInput('type'),
-                                offset:         $dialogTimeMaxOffset.typedInput('value'),
-                                multiplier:     parseInt($dialogTimeMaxMultiplier.val()),
+                                value:          $dialogTimeEndMaxInput.typedInput('value'),
+                                offsetType:     $dialogTimeEndMaxOffset.typedInput('type'),
+                                offset:         $dialogTimeEndMaxOffset.typedInput('value'),
+                                multiplier:     parseInt($dialogTimeEndMaxMultiplier.val()),
                                 noOffsetError:  true
                             });
                         }
                         _dialogGenHelpText();
                     });
+
                     $('.dialog-row-timeLimits :input').change(() => {
                         if (node.dialogAddData.timeout2) { clearTimeout(node.dialogAddData.timeout2); }
                         node.dialogAddData.timeout2 = setTimeout(() => {
                             delete node.dialogAddData.timeout2;
-                            $dialogTimeRegInput.change();
+                            $dialogTimeStartRegInput.change();
+                            $dialogTimeEndRegInput.change();
                         },1000);
                     });
 
@@ -2212,6 +2729,7 @@
                             return;
                         } else if (plVType ===  types.TimeEntered.value ||
                             plVType === types.TimeSun.value ||
+                            plVType === types.TimeSunCustom.value ||
                             plVType === types.TimeMoon.value ||
                             plVType === types.DateSpecific.value) {
                             $('#dialog-row-topic').show();
@@ -2285,6 +2803,8 @@
                             dialogDataIndex = containerIndex;
                             const data = JSON.parse($dialogDataRow.data('ruleData'));
                             $dialogName.val(data.name);
+                            $dialogExec.val(data.exec);
+
                             $dialogRuleEnableBtn.attr('is_enabled', data.enabled);
                             $dialogRuleEnableBtn.trigger('setRuleEnabledState');
                             dialogDataOnLoading = true;
@@ -2292,11 +2812,69 @@
                             for (let i = 0; i < data.conditions.length; i++) {
                                 $dialogConditionContainer.editableList('addItem', data.conditions[i]);
                             }
+                            $dialogTimeStartRegMultiplier.val(60000);
+                            $dialogTimeEndRegMultiplier.val(60000);
+                            setTInputValue($dialogTimeStartRegInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeStartRegOffset, 1, types.Undefined.value);
+                            setTInputValue($dialogTimeEndRegInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeEndRegOffset, 1, types.Undefined.value);
+                            initCheckboxesBlock('#dlg-ip-btctl-rule-timeDays', '*');
+                            initCheckboxesBlock('#dlg-ip-btctl-rule-timeMonths', '*');
+                            $dialogTimeLimitOnlyEvenDays.prop('checked', false);
+                            $dialogTimeLimitOnlyOddDays.prop('checked', false);
+                            $dialogTimeLimitOnlyEvenWeeks.prop('checked', false);
+                            $dialogTimeLimitOnlyOddWeeks.prop('checked', false);
+                            $dialogTimeLimitDateStart.val('');
+                            $dialogTimeLimitDateEnd.val('');
+
+                            setTInputValue($dialogTimeEndMinInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeEndMinOffset, 1, types.Undefined.value);
+                            $dialogTimeEndMinMultiplier.val(60000);
+                            setTInputValue($dialogTimeEndMaxInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeEndMaxOffset, 1, types.Undefined.value);
+                            $dialogTimeEndMaxMultiplier.val(60000);
+
+                            setTInputValue($dialogTimeStartMinInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeStartMinOffset, 1, types.Undefined.value);
+                            $dialogTimeStartMinMultiplier.val(60000);
+                            setTInputValue($dialogTimeStartMaxInput, '', types.Undefined.value);
+                            setTInputValue($dialogTimeStartMaxOffset, 1, types.Undefined.value);
+                            $dialogTimeStartMaxMultiplier.val(60000);
+
                             if (data.time) {
-                                $dialogTimeRegOperator.val(data.time.operator);
-                                $dialogTimeRegMultiplier.val(data.time.multiplier);
-                                setTInputValue($dialogTimeRegInput, data.time.value, data.time.type);
-                                setTInputValue($dialogTimeRegOffset, data.time.offset, data.time.offsetType);
+                                if (data.time.start) {
+                                    $dialogTimeStartRegMultiplier.val(data.time.start.multiplier);
+                                    setTInputValue($dialogTimeStartRegInput, data.time.start.value, data.time.start.type);
+                                    setTInputValue($dialogTimeStartRegOffset, data.time.start.offset, data.time.start.offsetType);
+
+                                    if (data.time.start.min) {
+                                        $dialogTimeStartMinMultiplier.val(data.time.start.min.multiplier || 60000);
+                                        setTInputValue($dialogTimeStartMinInput, data.time.start.min.value, data.time.start.min.type);
+                                        setTInputValue($dialogTimeStartMinOffset, data.time.start.min.offset, data.time.start.min.offsetType);
+                                    }
+                                    if (data.time.start.max) {
+                                        $dialogTimeStartMaxMultiplier.val(data.time.start.max.multiplier || 60000);
+                                        setTInputValue($dialogTimeStartMaxInput, data.time.start.max.value, data.time.start.max.type);
+                                        setTInputValue($dialogTimeStartMaxOffset, data.time.start.max.offset, data.time.start.max.offsetType);
+                                    }
+                                }
+                                if (data.time.end) {
+                                    $dialogTimeEndRegMultiplier.val(data.time.end.multiplier);
+                                    setTInputValue($dialogTimeEndRegInput, data.time.end.value, data.time.end.type);
+                                    setTInputValue($dialogTimeEndRegOffset, data.time.end.offset, data.time.end.offsetType);
+
+                                    if (data.time.end.min) {
+                                        $dialogTimeEndMinMultiplier.val(data.time.end.min.multiplier || 60000);
+                                        setTInputValue($dialogTimeEndMinInput, data.time.end.min.value, data.time.end.min.type);
+                                        setTInputValue($dialogTimeEndMinOffset, data.time.end.min.offset, data.time.end.min.offsetType);
+                                    }
+                                    if (data.time.end.max) {
+                                        $dialogTimeEndMaxMultiplier.val(data.time.end.max.multiplier || 60000);
+                                        setTInputValue($dialogTimeEndMaxInput, data.time.end.max.value, data.time.end.max.type);
+                                        setTInputValue($dialogTimeEndMaxOffset, data.time.end.max.offset, data.time.end.max.offsetType);
+                                    }
+                                }
+
                                 initCheckboxesBlock('#dlg-ip-btctl-rule-timeDays', data.time.days);
                                 initCheckboxesBlock('#dlg-ip-btctl-rule-timeMonths', data.time.months);
                                 if (!!data.time.onlyEvenDays && !!data.time.onlyOddDays) {
@@ -2341,37 +2919,6 @@
                                 }
                                 $dialogTimeLimitDateStart.change();
                                 $dialogTimeLimitDateEnd.change();
-                            } else {
-                                $dialogTimeRegOperator.val(0);
-                                $dialogTimeRegMultiplier.val(60000);
-                                setTInputValue($dialogTimeRegInput, '', types.Undefined.value);
-                                setTInputValue($dialogTimeRegOffset, 1, types.Undefined.value);
-                                initCheckboxesBlock('#dlg-ip-btctl-rule-timeDays', '*');
-                                initCheckboxesBlock('#dlg-ip-btctl-rule-timeMonths', '*');
-                                $dialogTimeLimitOnlyEvenDays.prop('checked', false);
-                                $dialogTimeLimitOnlyOddDays.prop('checked', false);
-                                $dialogTimeLimitOnlyEvenWeeks.prop('checked', false);
-                                $dialogTimeLimitOnlyOddWeeks.prop('checked', false);
-                                $dialogTimeLimitDateStart.val('');
-                                $dialogTimeLimitDateEnd.val('');
-                            }
-                            if (data.timeMin) {
-                                $dialogTimeMinMultiplier.val(data.timeMin.multiplier || 60000);
-                                setTInputValue($dialogTimeMinInput, data.timeMin.value, data.timeMin.type);
-                                setTInputValue($dialogTimeMinOffset, data.timeMin.offset, data.timeMin.offsetType);
-                            } else {
-                                setTInputValue($dialogTimeMinInput, '', types.Undefined.value);
-                                setTInputValue($dialogTimeMinOffset, 1, types.Undefined.value);
-                                $dialogTimeMinMultiplier.val(60000);
-                            }
-                            if (data.timeMax) {
-                                $dialogTimeMaxMultiplier.val(data.timeMax.multiplier || 60000);
-                                setTInputValue($dialogTimeMaxInput, data.timeMax.value, data.timeMax.type);
-                                setTInputValue($dialogTimeMaxOffset, data.timeMax.offset, data.timeMax.offsetType);
-                            } else {
-                                setTInputValue($dialogTimeMaxInput, '', types.Undefined.value);
-                                setTInputValue($dialogTimeMaxOffset, 1, types.Undefined.value);
-                                $dialogTimeMaxMultiplier.val(60000);
                             }
                             if (data.payload) {
                                 $dialogPayloadMultiplier.val(data.payload.multiplier || 60000);
@@ -2393,7 +2940,8 @@
 
                             _dialogGenHelpText();
                             dialogDataOnLoading = false;
-                            $dialogTimeRegInput.change();
+                            $dialogTimeStartRegInput.change();
+                            $dialogTimeEndRegInput.change();
                         } catch (err) {
                             console.log(err.message); // eslint-disable-line no-console
                             console.log(err.stack); // eslint-disable-line no-console
@@ -2402,6 +2950,22 @@
                         $dialog.dialog('open');
                     }
 
+                    /**
+                     * checks if all properties of an object are true
+                     */
+                    function checkObj(obj, path) {
+                        for (const [key, value] of Object.entries(obj)) {
+                            if (value === true || key === 'index') continue; // return path;
+                            if (typeof value === 'object') {
+                                const val = checkObj(value, path + key + '.');
+                                if (val !== '') return val;
+                                continue;
+                            }
+                            return path + key;
+                        }
+                        return '';
+                    }
+
                     /**
                      * Get the data object for a rule
                      */
@@ -2409,10 +2973,12 @@
                         const result = {
                             index: dialogDataIndex,
                             name:$dialogName.val(),
+                            exec: $dialogExec.val(),
                             version: ruleVersion,
                             enabled: !($dialogRuleEnableBtn.attr('is_enabled') === false || $dialogRuleEnableBtn.attr('is_enabled') === 'false'),
-                            isValid: true,
-                            valid:{
+                            isValid: false,
+                            validationError: '',
+                            validation:{
                                 conditions : []
                             },
                             conditions: [],
@@ -2425,11 +2991,18 @@
                                 format      : $dialogPayloadTimeFormat.val()
                             },
                             topic           : $dialogTopic.val(),
-                            importance      : parseInt($dialogImportance.val()),
-                            resetOverwrite  : $dialogResetOverwrite.is(':checked')
+                            resetOverwrite: $dialogResetOverwrite.is(':checked'),
+                            importance      : parseInt($dialogImportance.val())
                         };
                         try {
                             const setval = (param, name, val) => { if (val) param[name] = val; };
+                            if (result.payload.type === 'none') {
+                                delete result.payload.offsetType;
+                                delete result.payload.offset;
+                                delete result.payload.multiplier;
+                                delete result.payload.format;
+                            }
+
                             $dialogConditionContainer.editableList('items').each(function(_i) {
                                 const $cond = $(this);
                                 const p = {
@@ -2450,28 +3023,103 @@
                                     delete p.conditionText;
                                 }
                                 result.conditions.push(p);
-                                const isCValid = {
+                                result.validation.conditions.push({
                                     index       : _i,
                                     value       : $cond.find('.dlg-ip-btctl-rule-condOperand').typedInput('validate'),
                                     threshold   : $cond.find('.dlg-ip-btctl-rule-condThreshold').typedInput('validate')
-                                };
-                                result.valid.conditions.push(isCValid);
-                                result.isValid = result.isValid && isCValid.value && isCValid.threshold;
+                                });
                             });
-                            const timeType = $dialogTimeRegInput.typedInput('type');
-                            result.valid.time = $dialogTimeRegInput.typedInput('validate');
-                            if (timeType !== 'none') {
-                                result.time = {
-                                    type            : timeType,
-                                    value           : $dialogTimeRegInput.typedInput('value'),
-                                    operator        : parseInt($dialogTimeRegOperator.val()),
-                                    operatorText    : $dialogTimeRegOperator.find('option:selected').text(),
-                                    offsetType      : $dialogTimeRegOffset.typedInput('type'),
-                                    offset          : $dialogTimeRegOffset.typedInput('value'),
-                                    multiplier      : parseInt($dialogTimeRegMultiplier.val()),
-                                    days            : getCheckboxesStr($('#dlg-ip-btctl-rule-timeDays input[type=checkbox]:checked'),7),
-                                    months          : getCheckboxesStr($('#dlg-ip-btctl-rule-timeMonths input[type=checkbox]:checked'), 12)
+                            const timeTypeStart = $dialogTimeStartRegInput.typedInput('type');
+                            const timeTypeEnd = $dialogTimeEndRegInput.typedInput('type');
+
+                            if (timeTypeStart !== 'none' || timeTypeEnd !== 'none') {
+                                result.time = { };
+                                result.validation.time = {
+                                    start : {
+                                        value : $dialogTimeStartRegInput.typedInput('validate')
+                                    },
+                                    end : {
+                                        value : $dialogTimeEndRegInput.typedInput('validate')
+                                    }
                                 };
+
+                                if (timeTypeStart !== 'none') {
+                                    result.time.start = {
+                                        type            : timeTypeStart,
+                                        value           : $dialogTimeStartRegInput.typedInput('value'),
+                                        offsetType      : $dialogTimeStartRegOffset.typedInput('type'),
+                                        offset          : $dialogTimeStartRegOffset.typedInput('value'),
+                                        multiplier      : parseInt($dialogTimeStartRegMultiplier.val())
+                                    };
+                                    result.validation.time.start.offset = $dialogTimeStartRegOffset.typedInput('validate');
+                                    result.validation.time.start.multiplier = !isNaN(result.time.start.multiplier);
+                                    const minType = $dialogTimeStartMinInput.typedInput('type');
+                                    result.validation.time.start.min = $dialogTimeStartMinInput.typedInput('validate');
+                                    if (minType !== 'none') {
+                                        result.time.start.min = {
+                                            type        : minType,
+                                            value       : $dialogTimeStartMinInput.typedInput('value'),
+                                            offsetType  : $dialogTimeStartMinOffset.typedInput('type'),
+                                            offset      : $dialogTimeStartMinOffset.typedInput('value'),
+                                            multiplier  : parseInt($dialogTimeStartMinMultiplier.val())
+                                        };
+                                        result.validation.time.start.minOffset = $dialogTimeStartMinOffset.typedInput('validate');
+                                        result.validation.time.start.minMultiplier = !isNaN(result.time.start.min.multiplier);
+                                    }
+                                    const maxType = $dialogTimeStartMaxInput.typedInput('type');
+                                    result.validation.time.start.max = $dialogTimeStartMaxInput.typedInput('validate');
+                                    if (maxType !== 'none') {
+                                        result.time.start.max = {
+                                            type        : maxType,
+                                            value       : $dialogTimeStartMaxInput.typedInput('value'),
+                                            offsetType  : $dialogTimeStartMaxOffset.typedInput('type'),
+                                            offset      : $dialogTimeStartMaxOffset.typedInput('value'),
+                                            multiplier  :  parseInt($dialogTimeStartMaxMultiplier.val())
+                                        };
+                                        result.validation.time.start.maxOffset = $dialogTimeStartMaxOffset.typedInput('validate');
+                                        result.validation.time.start.maxMultiplier = !isNaN(result.time.start.max.multiplier);
+                                    }
+                                }
+                                if (timeTypeEnd !== 'none') {
+                                    result.time.end = {
+                                        type            : timeTypeEnd,
+                                        value           : $dialogTimeEndRegInput.typedInput('value'),
+                                        offsetType      : $dialogTimeEndRegOffset.typedInput('type'),
+                                        offset          : $dialogTimeEndRegOffset.typedInput('value'),
+                                        multiplier      : parseInt($dialogTimeEndRegMultiplier.val())
+                                    };
+                                    result.validation.time.end.offset = $dialogTimeEndRegOffset.typedInput('validate');
+                                    result.validation.time.end.multiplier = !isNaN(result.time.end.multiplier);
+                                    const minType = $dialogTimeEndMinInput.typedInput('type');
+                                    result.validation.time.end.min = $dialogTimeEndMinInput.typedInput('validate');
+                                    if (minType !== 'none') {
+                                        result.time.end.min = {
+                                            type        : minType,
+                                            value       : $dialogTimeEndMinInput.typedInput('value'),
+                                            offsetType  : $dialogTimeEndMinOffset.typedInput('type'),
+                                            offset      : $dialogTimeEndMinOffset.typedInput('value'),
+                                            multiplier  : parseInt($dialogTimeEndMinMultiplier.val())
+                                        };
+                                        result.validation.time.end.minOffset = $dialogTimeEndMinOffset.typedInput('validate');
+                                        result.validation.time.end.minMultiplier = !isNaN(result.time.end.min.multiplier);
+                                    }
+                                    const maxType = $dialogTimeEndMaxInput.typedInput('type');
+                                    result.validation.time.end.max = $dialogTimeEndMaxInput.typedInput('validate');
+                                    if (maxType !== 'none') {
+                                        result.time.end.max = {
+                                            type        : maxType,
+                                            value       : $dialogTimeEndMaxInput.typedInput('value'),
+                                            offsetType  : $dialogTimeEndMaxOffset.typedInput('type'),
+                                            offset      : $dialogTimeEndMaxOffset.typedInput('value'),
+                                            multiplier  :  parseInt($dialogTimeEndMaxMultiplier.val())
+                                        };
+                                        result.validation.time.end.maxOffset = $dialogTimeEndMaxOffset.typedInput('validate');
+                                        result.validation.time.end.maxMultiplier = !isNaN(result.time.end.max.multiplier);
+                                    }
+                                }
+
+                                result.time.days = getCheckboxesStr($('#dlg-ip-btctl-rule-timeDays input[type=checkbox]:checked'),7);
+                                result.time.months = getCheckboxesStr($('#dlg-ip-btctl-rule-timeMonths input[type=checkbox]:checked'), 12);
                                 setval(result.time,'onlyEvenDays', $dialogTimeLimitOnlyEvenDays.is(':checked'));
                                 setval(result.time,'onlyOddDays', $dialogTimeLimitOnlyOddDays.is(':checked'));
                                 setval(result.time,'onlyEvenWeeks', $dialogTimeLimitOnlyEvenWeeks.is(':checked'));
@@ -2479,63 +3127,41 @@
                                 setval(result.time,'dateStart', $dialogTimeLimitDateStart.val());
                                 setval(result.time,'dateEnd', $dialogTimeLimitDateEnd.val());
 
-                                result.valid.time = result.valid.time && $dialogTimeRegOffset.typedInput('validate') && result.time.multiplier;
                                 if (result.time.onlyEvenDays && result.time.onlyOddDays) {
                                     delete result.time.onlyEvenDays;
                                     delete result.time.onlyOddDays;
+                                    result.validation.time.noEvenAndOddDaysAllowed = false;
                                 }
                                 if (result.time.onlyEvenWeeks && result.time.onlyOddWeeks) {
                                     delete result.time.onlyEvenWeeks;
                                     delete result.time.onlyOddWeeks;
+                                    result.validation.time.noEvenAndOddWeeksAllowed = false;
                                 }
                                 if (!result.time.days || !result.time.months) {
-                                    result.valid.time = false;
+                                    result.validation.time.noDaysAllowed = false;
                                 }
-                                const minType = $dialogTimeMinInput.typedInput('type');
-                                result.valid.timeMin = $dialogTimeMinInput.typedInput('validate');
-                                if (minType !== 'none') {
-                                    result.timeMin = {
-                                        type        : minType,
-                                        value       : $dialogTimeMinInput.typedInput('value'),
-                                        offsetType  : $dialogTimeMinOffset.typedInput('type'),
-                                        offset      : $dialogTimeMinOffset.typedInput('value'),
-                                        multiplier  : parseInt($dialogTimeMinMultiplier.val())
-                                    };
-                                    result.valid.timeMin = result.valid.timeMin &&
-                                        $dialogTimeMinOffset.typedInput('validate') &&
-                                        result.timeMin.multiplier;
-                                }
-                                const maxType = $dialogTimeMaxInput.typedInput('type');
-                                result.valid.timeMax = $dialogTimeMaxInput.typedInput('validate');
-                                if (maxType !== 'none') {
-                                    result.timeMax = {
-                                        type        : maxType,
-                                        value       : $dialogTimeMaxInput.typedInput('value'),
-                                        offsetType  : $dialogTimeMaxOffset.typedInput('type'),
-                                        offset      : $dialogTimeMaxOffset.typedInput('value'),
-                                        multiplier  :  parseInt($dialogTimeMaxMultiplier.val())
-                                    };
-                                    result.valid.timeMax =result.valid.timeMax &&
-                                        result.timeMax.multiplier;
+                                if (!result.time.days || !result.time.months) {
+                                    result.validation.time.noMonthAllowed = false;
                                 }
-                                result.isValid = result.isValid && result.valid.time && result.valid.timeMin && result.valid.timeMax;
                             }
-                            result.valid.payload = $dialogPayload.typedInput('validate');
-                            if (result.valid.payload && result.payload.type !== 'none') {
-                                result.valid.payload = $dialogPayloadOffset.typedInput('validate') &&
-                                            !isNaN(result.payload.multiplier);
+                            result.validation.payload = $dialogPayload.typedInput('validate');
+                            if (result.validation.payload && result.payload.type !== 'none') {
+                                result.validation.payloadOffset = $dialogPayloadOffset.typedInput('validate');
+                                result.validation.payloadMultiplier = !isNaN(result.payload.multiplier);
                             }
-                            result.isValid = result.isValid && result.valid.payload;
+                            result.validationError = checkObj(result.validation, '');
+                            result.isValid = (result.validationError === '');
                         } catch (err) {
                             console.log(err.message); // eslint-disable-line no-console
                             console.log(err.stack); // eslint-disable-line no-console
                             result.isValid = false;
-                            result.valid.error = err.message;
+                            result.validationError = err.message;
                         }
                         if (!result.isValid) {
-                            console.log('rule validation:',result.isValid, result.valid); // eslint-disable-line
+                            console.warn('Rule validation failed! Wrong element:', result.validationError, result.validation); // eslint-disable-line
+                            console.log('Rule Data:', result); // eslint-disable-line
                         } else {
-                            delete result.valid; // if valid, not needed
+                            delete result.validation; // if valid, not needed
                         }
                         return result;
                     }
@@ -2545,6 +3171,11 @@
                     function _dialogSaveData() {
                         const data = _dialogGetData();
                         data.description = getRuleDescription(node, selFields, data);
+                        if (data.conditions) data.conditions.forEach(p => {
+                            delete p.operatorText;
+                            delete p.conditionText;
+                        });
+
                         $dialogDataRow.data('ruleData', JSON.stringify(data));
                         $('#rule-name-'+dialogDataIndex).text((data.name || 'rule ' + (dialogDataIndex + 1)) + ((data.importance > 0) ? ' ['+data.importance+']' : ''));
                         $('#rule-description-'+dialogDataIndex).html(data.description);
@@ -2870,44 +3501,72 @@
             </div>
         </div>
         <hr class="mt-1 mb-1 pt-0 pb-0">
-        <div class="dialog-row pt-0" id="dialog-row-timeReg">
-            <label for="dlg-ip-btctl-rule-timeReg"><i class="fa fa-clock-o"></i> <span data-i18n="clock-timer.label.time"></span></label>
-            <select id="dlg-ip-btctl-rule-timeReg-operator" class="ipadd dlg-ip-btctl-rule-timeReg-operator" >
+        <div class="dialog-row pt-0" id="dialog-row-timeStartReg">
+            <label for="dlg-ip-btctl-rule-timeStartReg"><i class="fa fa-clock-o"></i><i class="fa fa-hourglass-start"></i><span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeStart"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeStartReg" class="ipMain dlg-ip-btctl-rule-timeStartReg" value="" data-i18n="[placeholder]clock-timer.placeholder.time"/>
+        </div>
+        <div class="dialog-row block-indent2" id="dialog-row-offset-timeStartReg">
+            <label for="dlg-ip-btctl-rule-offset-timeStartReg"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeOffset"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeStartReg" class="ipMain dlg-ip-btctl-rule-offset-timeStartReg" value="" data-i18n="[placeholder]clock-timer.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeStartReg" class="ipadd dlg-ip-btctl-rule-multiplier-timeStartReg" >
             </select>
-            <input type="text" id="dlg-ip-btctl-rule-timeReg" class="ipMain dlg-ip-btctl-rule-timeReg" value="" data-i18n="[placeholder]clock-timer.placeholder.time">
         </div>
-        <div class="dialog-row block-indent2" id="dialog-row-offset-timeReg">
-            <label for="dlg-ip-btctl-rule-offset-timeReg"><i class="fa fa-plus"></i> <span data-i18n="clock-timer.label.offset"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-offset-timeReg"class="ipMain dlg-ip-btctl-rule-offset-timeReg" value="" data-i18n="[placeholder]clock-timer.placeholder.offset">
-            <select  id="dlg-ip-btctl-rule-multiplier-timeReg" class="ipadd dlg-ip-btctl-rule-multiplier-timeReg" >
+        <div class="dialog-row block-indent1" id="dialog-row-timeStartMin">
+            <label for="dlg-ip-btctl-rule-timeStartMin"><i class="fa fa-step-backward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin_start"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeStartMin" class="ipMain dlg-ip-btctl-rule-timeStartMin" value="" data-i18n="[placeholder]clock-timer.placeholder.time"/>
+        </div>
+        <div class="dialog-row block-indent2" id="dialog-row-offset-timeStartMin">
+            <label for="dlg-ip-btctl-rule-offset-timeStartMin"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMinOffset_start"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeStartMin" class="ipMain dlg-ip-btctl-rule-offset-timeStartMin" value="" data-i18n="[placeholder]clock-timer.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeStartMin" class="ipadd dlg-ip-btctl-rule-multiplier-timeStartMin">
+            </select>
+        </div>
+        <div class="dialog-row block-indent1" id="dialog-row-timeStartMax">
+            <label for="dlg-ip-btctl-rule-timeStartMax"><i class="fa fa-step-forward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax_start"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeStartMax" class="ipMain dlg-ip-btctl-rule-timeStartMax" value="" data-i18n="[placeholder]clock-timer.placeholder.time"/>
+        </div>
+        <div class="dialog-row block-indent2" id="dialog-row-offset-timeStartMax">
+            <label for="dlg-ip-btctl-rule-offset-timeStartMax"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMaxOffset_start"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeStartMax" class="ipMain dlg-ip-btctl-rule-offset-timeStartMax" value="" data-i18n="[placeholder]clock-timer.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeStartMax" class="ipadd dlg-ip-btctl-rule-multiplier-timeStartMax">
+            </select>
+        </div>
+        <div class="dialog-row pt-2" id="dialog-row-timeEndReg">
+            <label for="dlg-ip-btctl-rule-timeEndReg"><i class="fa fa-clock-o"></i><i class="fa fa-hourglass-end"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeEnd"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeEndReg" class="ipMain dlg-ip-btctl-rule-timeEndReg" value="" data-i18n="[placeholder]clock-timer.placeholder.time"/>
+        </div>
+        <div class="dialog-row block-indent2" id="dialog-row-timeEndReg-offset">
+            <label for="dlg-ip-btctl-rule-offset-timeEndReg"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeOffset"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeEndReg" class="ipMain dlg-ip-btctl-rule-offset-timeEndReg" value="" data-i18n="[placeholder]clock-timer.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeEndReg" class="ipadd dlg-ip-btctl-rule-multiplier-timeEndReg" >
             </select>
         </div>
-        <div class="dialog-row block-indent1" id="dialog-row-timeMin">
-            <label for="dlg-ip-btctl-rule-timeMin"><i class="fa fa-step-backward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-timeMin" class="ipMain dlg-ip-btctl-rule-timeMin" value="" data-i18n="[placeholder]clock-timer.placeholder.time"/>
+        <div class="dialog-row block-indent1" id="dialog-row-timeEndMin">
+            <label for="dlg-ip-btctl-rule-timeEndMin"><i class="fa fa-step-backward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMin_end"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeEndMin" class="ipMain dlg-ip-btctl-rule-timeEndMin" value="" data-i18n="[placeholder]clock-timer.placeholder.time"/>
         </div>
-        <div class="dialog-row block-indent2" id="dialog-row-offset-timeMin">
-            <label for="dlg-ip-btctl-rule-offset-timeMin"><i class="fa fa-plus"></i> <span data-i18n="clock-timer.label.offset-timeMin"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-offset-timeMin"class="ipMain dlg-ip-btctl-rule-offset-timeMin" value="" data-i18n="[placeholder]clock-timer.placeholder.offset">
-            <select  id="dlg-ip-btctl-rule-multiplier-timeMin" class="ipadd dlg-ip-btctl-rule-multiplier-timeMin">
+        <div class="dialog-row block-indent2" id="dialog-row-timeEndMin-offset">
+            <label for="dlg-ip-btctl-rule-offset-timeEndMin"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMinOffset_end"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeEndMin" class="ipMain dlg-ip-btctl-rule-offset-timeEndMin" value="" data-i18n="[placeholder]clock-timer.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeEndMin" class="ipadd dlg-ip-btctl-rule-multiplier-timeEndMin">
             </select>
         </div>
-        <div class="dialog-row block-indent1" id="dialog-row-timeMax">
-            <label for="dlg-ip-btctl-rule-timeMax"><i class="fa fa-step-forward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-timeMax" class="ipMain dlg-ip-btctl-rule-timeMax" value="" data-i18n="[placeholder]clock-timer.placeholder.time">
+        <div class="dialog-row block-indent1" id="dialog-row-timeEndMax">
+            <label for="dlg-ip-btctl-rule-timeEndMax"><i class="fa fa-step-forward" aria-hidden="true"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMax_end"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-timeEndMax" class="ipMain dlg-ip-btctl-rule-timeEndMax" value="" data-i18n="[placeholder]clock-timer.placeholder.time"/>
         </div>
-        <div class="dialog-row block-indent2" id="dialog-row-offset-timeMax">
-            <label for="dlg-ip-btctl-rule-offset-timeMax"><i class="fa fa-plus"></i> <span data-i18n="clock-timer.label.offset-timeMax"></span></label>
-            <input type="text" id="dlg-ip-btctl-rule-offset-timeMax"class="ipMain dlg-ip-btctl-rule-offset-timeMax" value="" data-i18n="[placeholder]clock-timer.placeholder.offset">
-            <select  id="dlg-ip-btctl-rule-multiplier-timeMax" class="ipadd dlg-ip-btctl-rule-multiplier-timeMax">
+        <div class="dialog-row block-indent2" id="dialog-row-timeEndMax-offset">
+            <label for="dlg-ip-btctl-rule-offset-timeEndMax"><i class="fa fa-plus"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleTimeMaxOffset_end"></span></label>
+            <input type="text" id="dlg-ip-btctl-rule-offset-timeEndMax" class="ipMain dlg-ip-btctl-rule-offset-timeEndMax" value="" data-i18n="[placeholder]clock-timer.placeholder.offset"/>
+            <select  id="dlg-ip-btctl-rule-multiplier-timeEndMax" class="ipadd dlg-ip-btctl-rule-multiplier-timeEndMax">
             </select>
         </div>
-        <div class="dialog-row dialog-row-timeLimits-ph is-to-show-initially" id="dialog-row-timeConstraintsPlaceholder">
+        <div class="dialog-row dialog-row-timeLimits-ph is-to-show-initially pt-2" id="dialog-row-timeConstraintsPlaceholder">
             <div class="dlg-ip-btctl-rule-timecontraintctrl" id="dialog-row-timeConstraints-show">
                 <button class="dialog-element-clickable" data-i18n="clock-timer.label.timeconstraintshow"></button>
             </div>
         </div>
-        <div class="dialog-row dialog-row-timeLimits is-initial-hidden" id="dialog-row-timeConstraints">
+        <div class="dialog-row dialog-row-timeLimits is-initial-hidden pt-2" id="dialog-row-timeConstraints">
             <div class="dlg-ip-btctl-rule-timecontraintctrl" id="dialog-row-timeConstraints-hide">
                 <button class="dialog-element-clickable" data-i18n="clock-timer.label.timeconstrainthide"></button>
             </div>
@@ -2987,6 +3646,11 @@
             <input type="text" id="dlg-ip-btctl-rule-topic" class="ipalone" data-i18n="[placeholder]node-red:common.label.topic"/>
         </div>
         <hr class="mt-1 mb-1 pt-0 pb-0" id="dialog-hr-overwrite">
+        <div class="dialog-row pt-0" id="dialog-row-exec" data-i18n="[title]clock-timer.placeholder.exec">
+            <label for="dlg-ip-btctl-rule-exec"><i class="fa fa-sort"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleExec"></span></label>
+            <select  id="dlg-ip-btctl-rule-exec" class="ipalone dlg-ip-btctl-rule-exec" >
+            </select>
+        </div>
         <div class="dialog-row pt-0" id="dialog-row-resetOverwrite" data-i18n="[title]clock-timer.placeholder.ruleResetOverwrite">
             <label for="dlg-ip-btctl-rule-resetOverwrite"><i class="fa fa-thumbs-o-down"></i> <span data-i18n="node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleOverwrite"></span></label>
             <input type="checkbox" id="dlg-ip-btctl-rule-resetOverwrite" style="width: auto;"/>
@@ -3170,6 +3834,8 @@
     }
     .dialog-element-clickable {
         user-select: none;
+        -ms-user-select: none;
+        -webkit-user-select: none;
         cursor: pointer;
         touch-action: manipulation;
         display: inline-block;
@@ -3218,8 +3884,13 @@
         margin-right: 16px; /*28px;*/
     }
     .rdgtimer-rule-name-span {
-        width: 30%; /* width: 120px; */
+        width: 25%; /* width: 120px; */
+        float: left;
+    }
+    .rdgtimer-rule-exec-span {
+        margin-right: 5px;
         float: left;
+        box-shadow: 1px 1px 1px 1px rgb(0 0 0 / 20%);
     }
     .rdgtimer-rule-description-span {
         font-size: 10px;
diff --git a/nodes/81-clock-timer.js b/nodes/81-clock-timer.js
index 3f43a840..8a3bcc3a 100644
--- a/nodes/81-clock-timer.js
+++ b/nodes/81-clock-timer.js
@@ -60,10 +60,6 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
     const clonedeep = require('lodash.clonedeep');
     const isEqual = require('lodash.isequal');
 
-    const cRuleUntil = 0;
-    const cRuleFrom = 1;
-    const cRuleDefault = -1;
-
     /******************************************************************************************/
     /**
      * check if a manual overwrite should be set
@@ -201,119 +197,61 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
      */
     function checkRules(node, msg, oNow, tempData) {
         // node.debug('checkRules --------------------');
-        const livingRuleData = {};
         ctrlLib.prepareRules(node, msg, tempData, oNow.now);
-        // node.debug(`checkRules rules.count=${node.rules.count}, rules.lastUntil=${node.rules.lastUntil}, oNow=${util.inspect(oNow, {colors:true, compact:10})}`);
-
-        let ruleSel = null;
-        let ruleindex = -1;
-        // node.debug('first loop count:' + node.rules.count + ' lastuntil:' + node.rules.lastUntil);
-        for (let i = 0; i <= node.rules.lastUntil; ++i) {
-            const rule = node.rules.data[i];
-            // node.debug('rule ' + rule.time.operator + ' - ' + (rule.time.operator !== cRuleFrom) + ' - ' + util.inspect(rule, {colors:true, compact:10, breakLength: Infinity }));
-            if (!rule.enabled) { continue; }
-            if (rule.time && rule.time.operator === cRuleFrom) { continue; }
-            // const res = fktCheck(rule, r => (r >= nowNr));
-            const res = ctrlLib.compareRules(node, msg, rule, r => (r >= oNow.nowNr), oNow);
-            if (res) {
-                // node.debug(`1. ruleSel ${rule.name} (${rule.pos}) data=${ util.inspect(res, { colors: true, compact: 10, breakLength: Infinity }) }`);
-                ruleSel = res;
-                ruleindex = i;
-                break;
-            }
-        }
-
-        if (!ruleSel || (ruleSel.time && ruleSel.time.operator === cRuleFrom) ) {
-            // node.debug('--------- starting second loop ' + node.rules.count);
-            for (let i = (node.rules.count - 1); i >= 0; --i) {
-                const rule = node.rules.data[i];
-                // node.debug(`rule ${rule.name} (${rule.pos}) enabled=${rule.enabled} operator=${rule.time.operator} noUntil=${rule.time.operator !== cRuleUntil} data=${util.inspect(rule, {colors:true, compact:10, breakLength: Infinity })}`);
-                if (!rule.enabled) { continue; }
-                if (rule.time && rule.time.operator === cRuleUntil) { continue; } // - From: timeOp === cRuleFrom
-                const res = ctrlLib.compareRules(node, msg, rule, r => (r <= oNow.nowNr), oNow);
-                if (res) {
-                    // node.debug(`2. ruleSel ${rule.name} (${rule.pos}) data=${ util.inspect(res, { colors: true, compact: 10, breakLength: Infinity }) }`);
-                    ruleSel = res;
-                    break;
-                }
-            }
-        }
+        const rule = ctrlLib.getActiveRule(node, msg, oNow, tempData);
+        const livingRuleData = {};
 
-        const checkRuleForAT = rule => {
-            if (!rule.time) {
-                return;
-            }
-            const num = ctrlLib.getRuleTimeData(node, msg, rule, oNow);
-            if (num > oNow.nowNr) {
-                node.debug('autoTrigger set to rule ' + rule.pos);
-                const diff = num - oNow.nowNr;
-                node.autoTrigger.time = Math.min(node.autoTrigger.time, diff);
-                node.autoTrigger.type = 2; // next rule
-            }
-        };
-        if (ruleSel) {
-            if (node.autoTrigger) {
-                if (ruleSel.time && ruleSel.timeData.ts > oNow.nowNr) {
-                    node.debug('autoTrigger set to rule ' + ruleSel.pos + ' (current)');
-                    const diff = ruleSel.timeData.ts - oNow.nowNr;
-                    node.autoTrigger.time = Math.min(node.autoTrigger.time, diff);
-                    node.autoTrigger.type = 1; // current rule end
-                } else {
-                    for (let i = (ruleindex+1); i < node.rules.count; ++i) {
-                        const rule = node.rules.data[i];
-                        if (!rule.time) {
-                            continue;
-                        }
-                        checkRuleForAT(rule);
-                    }
-                    // check first rule, maybe next day
-                    if ((node.autoTrigger.type !== 2) && (node.rules.firstTimeLimited < node.rules.count)) {
-                        checkRuleForAT(node.rules.data[node.rules.firstTimeLimited]);
-                    }
-                }
-            }
-            // ruleSel.text = '';
-            // node.debug('ruleSel ' + util.inspect(ruleSel, {colors:true, compact:10, breakLength: Infinity }));
-            livingRuleData.id = ruleSel.pos;
-            livingRuleData.name = ruleSel.name;
-            livingRuleData.importance = ruleSel.importance;
-            livingRuleData.resetOverwrite = ruleSel.resetOverwrite;
+        if (rule.ruleSel) {
+            // rule.ruleSel.text = '';
+            // node.debug('rule.ruleSel ' + util.inspect(rule.ruleSel, {colors:true, compact:10, breakLength: Infinity }));
+            livingRuleData.id = rule.ruleSel.pos;
+            livingRuleData.name = rule.ruleSel.name;
+            livingRuleData.importance = rule.ruleSel.importance;
+            livingRuleData.resetOverwrite = rule.ruleSel.resetOverwrite;
             livingRuleData.code = 4;
-            livingRuleData.topic = ruleSel.topic;
+            livingRuleData.topic = rule.ruleSel.topic;
 
             livingRuleData.active = true;
-            livingRuleData.outputValue = ruleSel.outputValue;
-            livingRuleData.outputType = ruleSel.outputType;
+            // livingRuleData.outputValue = rule.ruleSel.outputValue;
+            // livingRuleData.outputType = rule.ruleSel.outputType;
 
-            livingRuleData.conditional = ruleSel.conditional;
-            livingRuleData.timeLimited = (!!ruleSel.time);
-            livingRuleData.payloadData = ruleSel.payload;
-            const data = { number: ruleSel.pos, name: ruleSel.name };
+            livingRuleData.conditional = rule.ruleSel.conditional;
+            livingRuleData.timeLimited = (!!rule.ruleSel.time);
+            livingRuleData.payloadData = rule.ruleSel.payload;
+            const data = { number: rule.ruleSel.pos, name: rule.ruleSel.name };
             let name = 'rule';
-            if (ruleSel.conditional) {
-                livingRuleData.conditon = ruleSel.conditon;
-                data.text = ruleSel.conditon.text;
-                data.textShort = ruleSel.conditon.textShort;
+            if (rule.ruleSel.conditional) {
+                livingRuleData.conditon = rule.ruleSel.conditonResult;
+                data.text = rule.ruleSel.conditonResult.text;
+                data.textShort = rule.ruleSel.conditonResult.textShort;
                 name = 'ruleCond';
             }
-            if (ruleSel.time && ruleSel.timeData) {
-                livingRuleData.time = ruleSel.timeData;
-                livingRuleData.time.timeLocal = node.positionConfig.toTimeString(ruleSel.timeData.value);
-                livingRuleData.time.timeLocalDate = node.positionConfig.toDateString(ruleSel.timeData.value);
-                livingRuleData.time.dateISO= ruleSel.timeData.value.toISOString();
-                livingRuleData.time.dateUTC= ruleSel.timeData.value.toUTCString();
-                data.timeOp = ruleSel.time.operatorText;
-                data.timeLocal = livingRuleData.time.timeLocal;
-                data.time = livingRuleData.time.dateISO;
-                name = (ruleSel.conditional) ? 'ruleTimeCond' : 'ruleTime';
+            if (rule.ruleSel.time && rule.ruleSel.timeResult) {
+                livingRuleData.time = rule.ruleSel.timeResult;
+                if (livingRuleData.time.start) {
+                    livingRuleData.time.start.timeLocal = node.positionConfig.toTimeString(rule.ruleSel.timeResult.start.value);
+                    livingRuleData.time.start.timeLocalDate = node.positionConfig.toDateString(rule.ruleSel.timeResult.start.value);
+                    livingRuleData.time.start.dateISO= rule.ruleSel.timeResult.start.value.toISOString();
+                    livingRuleData.time.start.dateUTC= rule.ruleSel.timeResult.start.value.toUTCString();
+                }
+                if (livingRuleData.time.end) {
+                    livingRuleData.time.end.timeLocal = node.positionConfig.toTimeString(rule.ruleSel.timeResult.end.value);
+                    livingRuleData.time.end.timeLocalDate = node.positionConfig.toDateString(rule.ruleSel.timeResult.end.value);
+                    livingRuleData.time.end.dateISO= rule.ruleSel.timeResult.end.value.toISOString();
+                    livingRuleData.time.end.dateUTC= rule.ruleSel.timeResult.end.value.toUTCString();
+                }
+                // data.timeOp = rule.ruleSel.time.operatorText;
+                // data.timeLocal = livingRuleData.time.timeLocal;
+                // data.time = livingRuleData.time.dateISO;
+                name = (rule.ruleSel.conditional) ? 'ruleTimeCond' : 'ruleTime';
             }
             livingRuleData.state = RED._('node-red-contrib-sun-position/position-config:ruleCtrl.states.'+name, data);
             livingRuleData.description = RED._('node-red-contrib-sun-position/position-config:ruleCtrl.reasons.'+name, data);
-            // node.debug(`checkRules end livingRuleData=${util.inspect(livingRuleData, { colors: true, compact: 10, breakLength: Infinity })}`);
+            // node.debug(`checkRules end livingRuleData=${util.inspect(livingRuleData, { colors: true, compact: 5, breakLength: Infinity, depth: 10 })}`);
             return livingRuleData;
         }
         livingRuleData.active = false;
-        livingRuleData.id = cRuleDefault;
+        livingRuleData.id = ctrlLib.cRuleDefault;
         livingRuleData.importance = 0;
         livingRuleData.resetOverwrite = false;
         livingRuleData.payloadData = {
@@ -330,16 +268,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         livingRuleData.state = RED._('node-red-contrib-sun-position/position-config:ruleCtrl.states.default');
         livingRuleData.description = RED._('node-red-contrib-sun-position/position-config:ruleCtrl.reasons.default');
 
-        if (node.autoTrigger && node.rules && node.rules.count > 0) {
-            // check first rule, maybe next day
-            if (node.rules.firstTimeLimited < node.rules.count) {
-                checkRuleForAT(node.rules.data[node.rules.firstTimeLimited]);
-            }
-            if (node.rules.firstTimeLimited !== node.rules.firstFrom) {
-                checkRuleForAT(node.rules.data[node.rules.firstFrom]);
-            }
-        }
-        // node.debug(`checkRules end livingRuleData=${util.inspect(livingRuleData, { colors: true, compact: 10, breakLength: Infinity })}`);
+        // node.debug(`checkRules end livingRuleData=${util.inspect(livingRuleData, { colors: true, compact: 5, breakLength: Infinity, depth: 10 })}`);
         return livingRuleData;
     }
     /******************************************************************************************/
@@ -350,22 +279,27 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
      */
     function clockTimerNode(config) {
         RED.nodes.createNode(this, config);
-        this.positionConfig = RED.nodes.getNode(config.positionConfig);
-        this.outputs = Number(config.outputs || 1);
         /** Copy 'this' object in case we need it in context of callbacks of other functions.
          * @type {IClockTimerNode}
          */
         // @ts-ignore
         const node = this;
-        if (!this.positionConfig) {
+
+        /** @type {IPositionConfigNode} */
+        node.positionConfig = RED.nodes.getNode(config.positionConfig);
+
+        // node.outputs = Number(config.outputs || 1);
+        if (!node.positionConfig) {
             node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
-            node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing') });
+            node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing-state') });
             return;
         }
-        if (this.positionConfig.checkNode(
+        if (node.positionConfig.checkNode(
             error => {
-                node.error(error);
-                node.status({fill: 'red', shape: 'dot', text: error });
+                const text = RED._('node-red-contrib-sun-position/position-config:errors.config-error', { error });
+                node.error(text);
+                node.status({fill: 'red', shape: 'dot', text });
+                return true;
             }, false)) {
             return;
         }
@@ -393,7 +327,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
         if (config.autoTrigger) {
             node.autoTrigger = {
-                defaultTime : parseInt(config.autoTriggerTime) || 20 * 60000, // 20min
+                defaultTime : parseInt(config.autoTriggerTime) || hlp.TIME_20min,
                 time : NaN,
                 type : 0 // default time
             };
@@ -406,7 +340,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
             description: ''
         };
         // temporary node Data
-        node.contextStore = config.contextStore || this.positionConfig.contextStore;
+        node.contextStore = config.contextStore || node.positionConfig.contextStore;
         node.nodeData = {
             isDisabled: node.context().get('isDisabled', node.contextStore) || false,
             /** The Level of the window */
@@ -445,7 +379,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
 
             try {
                 node.debug(`--------- clock-timer - input msg.topic=${msg.topic} msg.payload=${msg.payload} msg.ts=${msg.ts}`);
-                if (!this.positionConfig) {
+                if (!node.positionConfig) {
                     node.error(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'));
                     node.status({fill: 'red', shape: 'dot', text: RED._('node-red-contrib-sun-position/position-config:errors.config-missing-state') });
                     done(RED._('node-red-contrib-sun-position/position-config:errors.config-missing'), msg);
@@ -464,7 +398,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                             break;
                         /* advanced Settings */
                         case 'setAutoTriggerTime':
-                            node.autoTrigger.defaultTime = parseInt(msg.payload) || node.autoTrigger.defaultTime; // payload of 0 makes no sense, use then default
+                            node.autoTrigger = Object.assign(node.autoTrigger ,{ defaultTime : parseInt(msg.payload) || node.autoTrigger.defaultTime }); // payload of 0 makes no sense, use then default
                             break;
                         case 'setContextStore':
                             node.contextStore = msg.payload || node.contextStore;
@@ -522,12 +456,15 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                     node.addId = node.positionConfig.getPropValue(node, msg, {
                         type: node.nodeData.addIdType,
                         value: node.nodeData.addId,
-                        callback: (result, _obj) => {
+                        callback: (result, _obj, cachable) => {
+                            return ctrlLib.evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                        }
+                        /* callback: (result, _obj) => {
                             if (result !== null && typeof result !== 'undefined') {
                                 tempData[_obj.type + '.' + _obj.value] = result;
                             }
                             return result;
-                        }
+                        } */
                     }, true, oNow.now);
                 }
                 const timeCtrl = {
@@ -618,7 +555,7 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                         }
                         if (typeof resultObj !== 'undefined') {
                             if (resultObj.error) {
-                                this.error('error on getting result: "' + resultObj.error + '"');
+                                node.error('error on getting result: "' + resultObj.error + '"');
                             } else {
                                 node.positionConfig.setMessageProp(this, msgOut, prop.outType, prop.outValue, resultObj);
                             }
@@ -639,13 +576,13 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
                 node.context().set('lastData', previousData, node.contextStore);
                 if (node.autoTrigger) {
                     node.debug('next autoTrigger will set to ' + node.autoTrigger.time + ' - ' + node.autoTrigger.type);
-                    if (node.autoTriggerObj) {
-                        clearTimeout(node.autoTriggerObj);
-                        delete node.autoTriggerObj;
+                    if (node.autoTrigger.timer) {
+                        clearTimeout(node.autoTrigger.timer);
+                        delete node.autoTrigger.timer;
                     }
-                    node.autoTriggerObj = setTimeout(() => {
-                        clearTimeout(node.autoTriggerObj);
-                        delete node.autoTriggerObj;
+                    node.autoTrigger.timer = setTimeout(() => {
+                        clearTimeout(node.autoTrigger.timer);
+                        delete node.autoTrigger.timer;
                         node.emit('input', {
                             topic: 'autoTrigger/triggerOnly',
                             payload: 'triggerOnly',
@@ -697,9 +634,9 @@ module.exports = function (/** @type {runtimeRED} */ RED) {
         });
 
         node.on('close', () => {
-            if (node.autoTriggerObj) {
-                clearTimeout(node.autoTriggerObj);
-                delete node.autoTriggerObj;
+            if (node.autoTrigger && node.autoTrigger.timer) {
+                clearTimeout(node.autoTrigger.timer);
+                delete node.autoTrigger.timer;
             }
             if (node.startDelayTimeOutObj) {
                 clearTimeout(node.startDelayTimeOutObj);
diff --git a/nodes/icons/inputTypeSunAzimuthRad.svg b/nodes/icons/inputTypeSunAzimuthCfg.svg
similarity index 84%
rename from nodes/icons/inputTypeSunAzimuthRad.svg
rename to nodes/icons/inputTypeSunAzimuthCfg.svg
index a364d42f..55d394b5 100644
--- a/nodes/icons/inputTypeSunAzimuthRad.svg
+++ b/nodes/icons/inputTypeSunAzimuthCfg.svg
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="inputTypeSunAzimuthRad.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="inputTypeSunAzimuthCfg.svg"
    id="svg21"
    version="1.1"
    viewBox="0 0 40 40"
    height="40pt"
-   width="40pt">
+   width="40pt"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata27">
     <rdf:RDF>
@@ -22,7 +22,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -32,14 +31,14 @@
      inkscape:current-layer="svg21"
      inkscape:window-maximized="1"
      inkscape:window-y="-8"
-     inkscape:window-x="72"
-     inkscape:cy="30.899471"
-     inkscape:cx="26.666667"
+     inkscape:window-x="-8"
+     inkscape:cy="33.359788"
+     inkscape:cx="25.291005"
      inkscape:zoom="18.9"
      showgrid="false"
      id="namedview23"
-     inkscape:window-height="1177"
-     inkscape:window-width="1840"
+     inkscape:window-height="1017"
+     inkscape:window-width="1920"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      guidetolerance="10"
@@ -47,7 +46,9 @@
      objecttolerance="10"
      borderopacity="1"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     pagecolor="#ffffff"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="pt" />
   <g
      transform="scale(0.59821427)"
      id="surface1">
@@ -100,16 +101,16 @@
      id="text35"
      y="29.441187"
      x="21.045038"
-     style="font-style:normal;font-weight:normal;font-size:35.8374px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.895936"
+     style="font-style:normal;font-weight:normal;font-size:35.8374px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.895936"
      xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.55665px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.895936"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.55665px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.895936;fill:#000080"
        y="29.441187"
        x="21.045038"
        id="tspan33"
        sodipodi:role="line">N</tspan></text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:35.8374px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.895936"
+     style="font-style:normal;font-weight:normal;font-size:35.8374px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808000;fill-opacity:1;stroke:none;stroke-width:0.895936"
      x="32.017391"
      y="39.024143"
      id="text35-8"><tspan
@@ -117,10 +118,10 @@
        id="tspan33-2"
        x="32.017391"
        y="39.024143"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.55669px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.895936">S</tspan></text>
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.55669px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.895936;fill:#808000">S</tspan></text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:35.8374px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.895936"
+     style="font-style:normal;font-weight:normal;font-size:35.8374px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#008080;fill-opacity:1;stroke:none;stroke-width:0.895936"
      x="31.54335"
      y="29.353724"
      id="text35-7"><tspan
@@ -128,10 +129,10 @@
        id="tspan33-0"
        x="31.54335"
        y="29.353724"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.55669px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.895936">O</tspan></text>
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.55669px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.895936;fill:#008080">O</tspan></text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:35.8374px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.895936"
+     style="font-style:normal;font-weight:normal;font-size:35.8374px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#800080;fill-opacity:1;stroke:none;stroke-width:0.895936"
      x="20.450811"
      y="39.166359"
      id="text35-5"><tspan
@@ -139,16 +140,16 @@
        id="tspan33-7"
        x="20.450811"
        y="39.166359"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.55669px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.895936">W</tspan></text>
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.55669px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.895936;fill:#800080">W</tspan></text>
   <text
-     id="text73"
-     y="17.222223"
-     x="25.011168"
-     style="font-style:normal;font-weight:normal;font-size:18.1015px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.452538"
-     xml:space="preserve"><tspan
-       style="stroke-width:0.452538"
-       y="17.222223"
-       x="25.011168"
-       id="tspan71"
-       sodipodi:role="line">R</tspan></text>
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:13.0024px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#550000;fill-opacity:1;stroke:none;stroke-width:0.32506"
+     x="-0.63751405"
+     y="37.359943"
+     id="text2229"><tspan
+       sodipodi:role="line"
+       id="tspan2227"
+       style="fill:#550000;stroke-width:0.32506"
+       x="-0.63751405"
+       y="37.359943">cfg</tspan></text>
 </svg>
diff --git a/nodes/icons/inputTypeSunClockCustom.svg b/nodes/icons/inputTypeSunClockCustom.svg
new file mode 100644
index 00000000..63b06fe5
--- /dev/null
+++ b/nodes/icons/inputTypeSunClockCustom.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="inputTypeSunClockCustom.svg"
+   id="svg21"
+   version="1.1"
+   viewBox="0 0 40 40"
+   height="40pt"
+   width="40pt"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata27">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs25" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg21"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:cy="24.580379"
+     inkscape:cx="19.529616"
+     inkscape:zoom="13.364318"
+     showgrid="false"
+     id="namedview23"
+     inkscape:window-height="1017"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="pt" />
+  <path
+     id="path4"
+     d="m 20.035156,0 c 0.902344,0 1.632813,0.730469 1.632813,1.632812 v 3.402344 c 0,0.902344 -0.730469,1.632813 -1.632813,1.632813 h -0.07031 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 V 1.632812 C 18.332031,0.730469 19.0625,0 19.964844,0 Z m 0,0"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     id="path6"
+     d="m 10.570312,8.214844 c 0.652344,0.652344 0.652344,1.707031 0,2.355468 -0.648437,0.652344 -1.703124,0.652344 -2.355468,0 L 5.859375,8.214844 c -0.652344,-0.648438 -0.652344,-1.707032 0,-2.355469 0.648437,-0.652344 1.703125,-0.652344 2.355469,0 z m 0,0"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     id="path8"
+     d="m 5,18.332031 c 0.921875,0 1.667969,0.746094 1.667969,1.667969 0,0.921875 -0.746094,1.667969 -1.667969,1.667969 H 1.667969 C 0.746094,21.667969 0,20.921875 0,20 0,19.078125 0.746094,18.332031 1.667969,18.332031 Z m 0,0"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     id="path10"
+     d="m 10.597656,29.453125 c 0.636719,0.636719 0.636719,1.671875 0,2.308594 l -2.40625,2.40625 c -0.636718,0.636719 -1.671875,0.636719 -2.308594,0 l -0.050781,-0.05078 c -0.636719,-0.636719 -0.636719,-1.671876 0,-2.308594 l 2.40625,-2.40625 c 0.636719,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     id="path12"
+     d="m 20.035156,33.332031 c 0.902344,0 1.632813,0.730469 1.632813,1.632813 v 3.402344 C 21.667969,39.269531 20.9375,40 20.035156,40 h -0.07031 C 19.0625,40 18.332031,39.269531 18.332031,38.367188 v -3.402344 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     id="path14"
+     d="m 34.167969,31.808594 c 0.636719,0.636718 0.636719,1.671875 0,2.308594 l -0.05078,0.05078 c -0.636719,0.636719 -1.671876,0.636719 -2.308594,0 l -2.40625,-2.40625 c -0.63672,-0.636718 -0.63672,-1.671874 0.0039,-2.308593 l 0.04687,-0.04687 c 0.636719,-0.640625 1.671875,-0.640625 2.308594,-0.0039 z m 0,0"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     id="path16"
+     d="M 38.367188,18.332031 C 39.269531,18.332031 40,19.0625 40,19.964844 v 0.07031 c 0,0.902344 -0.730469,1.632813 -1.632812,1.632813 h -3.402344 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 v -0.07031 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     id="path18"
+     d="m 10,20 c 0,5.523438 4.476562,10 10,10 5.523438,0 10,-4.476562 10,-10 0,-5.523438 -4.476562,-10 -10,-10 -5.523438,0 -10,4.476562 -10,10 z m 16.667969,0 c 0,3.683594 -2.984375,6.667969 -6.667969,6.667969 -3.683594,0 -6.667969,-2.984375 -6.667969,-6.667969 0,-3.683594 2.984375,-6.667969 6.667969,-6.667969 3.683594,0 6.667969,2.984375 6.667969,6.667969 z m 0,0"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     id="path31"
+     d="m 20.079366,14.007937 0.03968,6.150794"
+     style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     id="path33"
+     d="m 20.158731,19.166668 -0.03968,0.992063 3.54693,2.047821"
+     style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:30px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75"
+     x="-11.904762"
+     y="23.968254"
+     id="text1649"><tspan
+       sodipodi:role="line"
+       id="tspan1647"
+       style="stroke-width:0.75"
+       x="-11.904762"
+       y="23.968254" /></text>
+  <path
+     d="m 30.236009,10.120645 q 0,-0.1757482 -0.128321,-0.3041612 -0.128323,-0.1284105 -0.304159,-0.1284105 -0.175629,0 -0.304157,0.1284105 -0.128322,0.1284402 -0.128322,0.3041612 0,0.175747 0.128322,0.30416 0.128321,0.128411 0.304157,0.128411 0.17563,0 0.304159,-0.128411 0.128321,-0.12841 0.128321,-0.30416 z M 34.588891,7.2818172 29.979159,11.89153 q -0.250139,0.250079 -0.608316,0.250079 -0.351465,0 -0.615086,-0.250079 l -0.716443,-0.729981 q -0.256939,-0.243338 -0.256939,-0.608321 0,-0.358234 0.256939,-0.6150784 l 4.602933,-4.6029565 q 0.263739,0.6623939 0.773921,1.1727062 0.51033,0.510315 1.172723,0.7739179 z m 4.285263,-2.940212 q 0,0.2635915 -0.155523,0.7164664 -0.31767,0.9057202 -1.111875,1.4701049 -0.794174,0.5643876 -1.747214,0.5643876 -1.250456,0 -2.139275,-0.8888228 -0.88882,-0.8888224 -0.88882,-2.1392606 0,-1.2504352 0.88882,-2.1392586 0.888819,-0.8888225 2.139275,-0.8888225 0.392032,0 0.821229,0.1115275 0.429197,0.1115275 0.726584,0.3142993 0.108216,0.074362 0.108216,0.1892597 0,0.114898 -0.108216,0.1892595 l -1.980411,1.1422912 v 1.5140386 l 1.304505,0.7232255 q 0.03371,-0.020401 0.533984,-0.3278174 0.500158,-0.3075373 0.915844,-0.547487 0.415685,-0.2399378 0.476535,-0.2399378 0.101414,0 0.158775,0.067591 0.05736,0.067591 0.05736,0.1689766 z"
+     id="path2429"
+     style="stroke-width:0.00675912" />
+</svg>
diff --git a/nodes/icons/inputTypeSunElevationRad.svg b/nodes/icons/inputTypeSunElevationRad.svg
deleted file mode 100644
index 68381869..00000000
--- a/nodes/icons/inputTypeSunElevationRad.svg
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="inputTypeSunElevationRad.svg"
-   id="svg21"
-   version="1.1"
-   viewBox="0 0 40 40"
-   height="40pt"
-   width="40pt">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25" />
-  <sodipodi:namedview
-     inkscape:current-layer="svg21"
-     inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="72"
-     inkscape:cy="39.811403"
-     inkscape:cx="3.9991523"
-     inkscape:zoom="8"
-     showgrid="false"
-     id="namedview23"
-     inkscape:window-height="1177"
-     inkscape:window-width="1840"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <circle
-     r="5.71875"
-     cy="14.53125"
-     cx="14.625"
-     id="path919"
-     style="fill:#fdff00;fill-opacity:1;stroke:none;stroke-width:0.863208;stroke-opacity:1" />
-  <g
-     style="fill:#000000;fill-opacity:1"
-     transform="scale(0.72901785)"
-     id="surface1">
-    <path
-       id="path2"
-       d="m 34.167969,5.882812 c 0.636719,0.636719 0.636719,1.671876 0,2.308594 l -2.40625,2.40625 c -0.636719,0.636719 -1.671875,0.636719 -2.308594,0 l -0.04687,-0.05078 C 28.765625,9.910156 28.765625,8.875 29.402344,8.238281 l 2.40625,-2.40625 c 0.636718,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       id="path4"
-       d="m 20.035156,0 c 0.902344,0 1.632813,0.730469 1.632813,1.632812 v 3.402344 c 0,0.902344 -0.730469,1.632813 -1.632813,1.632813 h -0.07031 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 V 1.632812 C 18.332031,0.730469 19.0625,0 19.964844,0 Z m 0,0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       id="path6"
-       d="m 10.570312,8.214844 c 0.652344,0.652344 0.652344,1.707031 0,2.355468 -0.648437,0.652344 -1.703124,0.652344 -2.355468,0 L 5.859375,8.214844 c -0.652344,-0.648438 -0.652344,-1.707032 0,-2.355469 0.648437,-0.652344 1.703125,-0.652344 2.355469,0 z m 0,0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       id="path8"
-       d="m 5,18.332031 c 0.921875,0 1.667969,0.746094 1.667969,1.667969 0,0.921875 -0.746094,1.667969 -1.667969,1.667969 H 1.667969 C 0.746094,21.667969 0,20.921875 0,20 0,19.078125 0.746094,18.332031 1.667969,18.332031 Z m 0,0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       id="path10"
-       d="m 10.597656,29.453125 c 0.636719,0.636719 0.636719,1.671875 0,2.308594 l -2.40625,2.40625 c -0.636718,0.636719 -1.671875,0.636719 -2.308594,0 l -0.050781,-0.05078 c -0.636719,-0.636719 -0.636719,-1.671876 0,-2.308594 l 2.40625,-2.40625 c 0.636719,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       id="path12"
-       d="m 20.035156,33.332031 c 0.902344,0 1.632813,0.730469 1.632813,1.632813 v 3.402344 C 21.667969,39.269531 20.9375,40 20.035156,40 h -0.07031 C 19.0625,40 18.332031,39.269531 18.332031,38.367188 v -3.402344 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       id="path14"
-       d="m 34.167969,31.808594 c 0.636719,0.636718 0.636719,1.671875 0,2.308594 l -0.05078,0.05078 c -0.636719,0.636719 -1.671876,0.636719 -2.308594,0 l -2.40625,-2.40625 c -0.63672,-0.636718 -0.63672,-1.671874 0.0039,-2.308593 l 0.04687,-0.04687 c 0.636719,-0.640625 1.671875,-0.640625 2.308594,-0.0039 z m 0,0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       id="path16"
-       d="M 38.367188,18.332031 C 39.269531,18.332031 40,19.0625 40,19.964844 v 0.07031 c 0,0.902344 -0.730469,1.632813 -1.632812,1.632813 h -3.402344 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 v -0.07031 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       id="path18"
-       d="m 10,20 c 0,5.523438 4.476562,10 10,10 5.523438,0 10,-4.476562 10,-10 0,-5.523438 -4.476562,-10 -10,-10 -5.523438,0 -10,4.476562 -10,10 z m 16.667969,0 c 0,3.683594 -2.984375,6.667969 -6.667969,6.667969 -3.683594,0 -6.667969,-2.984375 -6.667969,-6.667969 0,-3.683594 2.984375,-6.667969 6.667969,-6.667969 3.683594,0 6.667969,2.984375 6.667969,6.667969 z m 0,0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
-  <path
-     sodipodi:nodetypes="cczcc"
-     style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0.316511px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 37.263695,38.732476 H 22.4295 c 0,0 -0.794802,-1.530694 -0.767355,-2.560404 0.02745,-1.029709 0.767355,-2.589546 0.767355,-2.589546 z"
-     id="path29-0" />
-  <path
-     id="path29"
-     d="M 37.261906,38.73016 H 1.468254 V 26.746032 Z"
-     style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  <text
-     id="text877"
-     y="37.542442"
-     x="1.7682357"
-     style="font-style:normal;font-weight:normal;font-size:22.5496px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.56374"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5231px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.56374"
-       y="37.542442"
-       x="1.7682357"
-       id="tspan875"
-       sodipodi:role="line">R</tspan></text>
-  <text
-     id="text877-0"
-     y="11.479492"
-     x="28.512695"
-     style="font-style:normal;font-weight:normal;font-size:30px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.75"
-       y="11.479492"
-       x="28.512695"
-       id="tspan875-1"
-       sodipodi:role="line">E</tspan></text>
-</svg>
diff --git a/nodes/icons/inputTypeSunTimeAzimuthRad.svg b/nodes/icons/inputTypeSunTimeAzimuthRad.svg
deleted file mode 100644
index 634d8203..00000000
--- a/nodes/icons/inputTypeSunTimeAzimuthRad.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40pt"
-   height="40pt"
-   viewBox="0 0 40 40"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="inputTypeSunTmeAzimuthRad.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25" />
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1840"
-     inkscape:window-height="1177"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="6.6821591"
-     inkscape:cx="35.095079"
-     inkscape:cy="28.905939"
-     inkscape:window-x="72"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg21" />
-  <g
-     transform="scale(0.66328248)"
-     id="g30">
-    <g
-       id="surface1">
-      <path
-         id="path2"
-         d="m 34.167969,5.882812 c 0.636719,0.636719 0.636719,1.671876 0,2.308594 l -2.40625,2.40625 c -0.636719,0.636719 -1.671875,0.636719 -2.308594,0 l -0.04687,-0.05078 C 28.765625,9.910156 28.765625,8.875 29.402344,8.238281 l 2.40625,-2.40625 c 0.636718,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path4"
-         d="m 20.035156,0 c 0.902344,0 1.632813,0.730469 1.632813,1.632812 v 3.402344 c 0,0.902344 -0.730469,1.632813 -1.632813,1.632813 h -0.07031 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 V 1.632812 C 18.332031,0.730469 19.0625,0 19.964844,0 Z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path6"
-         d="m 10.570312,8.214844 c 0.652344,0.652344 0.652344,1.707031 0,2.355468 -0.648437,0.652344 -1.703124,0.652344 -2.355468,0 L 5.859375,8.214844 c -0.652344,-0.648438 -0.652344,-1.707032 0,-2.355469 0.648437,-0.652344 1.703125,-0.652344 2.355469,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path8"
-         d="m 5,18.332031 c 0.921875,0 1.667969,0.746094 1.667969,1.667969 0,0.921875 -0.746094,1.667969 -1.667969,1.667969 H 1.667969 C 0.746094,21.667969 0,20.921875 0,20 0,19.078125 0.746094,18.332031 1.667969,18.332031 Z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path10"
-         d="m 10.597656,29.453125 c 0.636719,0.636719 0.636719,1.671875 0,2.308594 l -2.40625,2.40625 c -0.636718,0.636719 -1.671875,0.636719 -2.308594,0 l -0.050781,-0.05078 c -0.636719,-0.636719 -0.636719,-1.671876 0,-2.308594 l 2.40625,-2.40625 c 0.636719,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path12"
-         d="m 20.035156,33.332031 c 0.902344,0 1.632813,0.730469 1.632813,1.632813 v 3.402344 C 21.667969,39.269531 20.9375,40 20.035156,40 h -0.07031 C 19.0625,40 18.332031,39.269531 18.332031,38.367188 v -3.402344 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path14"
-         d="m 34.167969,31.808594 c 0.636719,0.636718 0.636719,1.671875 0,2.308594 l -0.05078,0.05078 c -0.636719,0.636719 -1.671876,0.636719 -2.308594,0 l -2.40625,-2.40625 c -0.63672,-0.636718 -0.63672,-1.671874 0.0039,-2.308593 l 0.04687,-0.04687 c 0.636719,-0.640625 1.671875,-0.640625 2.308594,-0.0039 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path16"
-         d="M 38.367188,18.332031 C 39.269531,18.332031 40,19.0625 40,19.964844 v 0.07031 c 0,0.902344 -0.730469,1.632813 -1.632812,1.632813 h -3.402344 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 v -0.07031 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path18"
-         d="m 10,20 c 0,5.523438 4.476562,10 10,10 5.523438,0 10,-4.476562 10,-10 0,-5.523438 -4.476562,-10 -10,-10 -5.523438,0 -10,4.476562 -10,10 z m 16.667969,0 c 0,3.683594 -2.984375,6.667969 -6.667969,6.667969 -3.683594,0 -6.667969,-2.984375 -6.667969,-6.667969 0,-3.683594 2.984375,-6.667969 6.667969,-6.667969 3.683594,0 6.667969,2.984375 6.667969,6.667969 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    </g>
-    <path
-       id="path31"
-       d="m 20.079366,14.007937 0.03968,6.150794"
-       style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path33"
-       d="m 20.158731,19.166668 -0.03968,0.992063 3.54693,2.047821"
-       style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:30px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75"
-     x="28.197273"
-     y="12.33308"
-     id="text877-0"><tspan
-       sodipodi:role="line"
-       id="tspan875-1"
-       x="28.197273"
-       y="12.33308"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.75">A</tspan></text>
-  <path
-     id="path29-0"
-     d="M 37.892919,38.28003 H 23.058724 c 0,0 -0.794802,-1.530694 -0.767355,-2.560404 0.02745,-1.029709 0.767355,-2.589546 0.767355,-2.589546 z"
-     style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0.316511px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     sodipodi:nodetypes="cczcc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 37.89113,38.277714 H 2.0974786 V 26.293586 Z"
-     id="path29" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:22.5496px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.56374"
-     x="2.3974602"
-     y="37.089996"
-     id="text877"><tspan
-       sodipodi:role="line"
-       id="tspan875"
-       x="2.3974602"
-       y="37.089996"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5231px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.56374">R</tspan></text>
-</svg>
diff --git a/nodes/icons/inputTypeSunTimeElevationRad.svg b/nodes/icons/inputTypeSunTimeElevationRad.svg
deleted file mode 100644
index 29b0b94b..00000000
--- a/nodes/icons/inputTypeSunTimeElevationRad.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40pt"
-   height="40pt"
-   viewBox="0 0 40 40"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="inputTypeSunTmeElevationRad.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25" />
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1840"
-     inkscape:window-height="1177"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="6.6821591"
-     inkscape:cx="35.095079"
-     inkscape:cy="28.905939"
-     inkscape:window-x="72"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg21" />
-  <g
-     transform="scale(0.66328248)"
-     id="g30">
-    <g
-       id="surface1">
-      <path
-         id="path2"
-         d="m 34.167969,5.882812 c 0.636719,0.636719 0.636719,1.671876 0,2.308594 l -2.40625,2.40625 c -0.636719,0.636719 -1.671875,0.636719 -2.308594,0 l -0.04687,-0.05078 C 28.765625,9.910156 28.765625,8.875 29.402344,8.238281 l 2.40625,-2.40625 c 0.636718,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path4"
-         d="m 20.035156,0 c 0.902344,0 1.632813,0.730469 1.632813,1.632812 v 3.402344 c 0,0.902344 -0.730469,1.632813 -1.632813,1.632813 h -0.07031 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 V 1.632812 C 18.332031,0.730469 19.0625,0 19.964844,0 Z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path6"
-         d="m 10.570312,8.214844 c 0.652344,0.652344 0.652344,1.707031 0,2.355468 -0.648437,0.652344 -1.703124,0.652344 -2.355468,0 L 5.859375,8.214844 c -0.652344,-0.648438 -0.652344,-1.707032 0,-2.355469 0.648437,-0.652344 1.703125,-0.652344 2.355469,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path8"
-         d="m 5,18.332031 c 0.921875,0 1.667969,0.746094 1.667969,1.667969 0,0.921875 -0.746094,1.667969 -1.667969,1.667969 H 1.667969 C 0.746094,21.667969 0,20.921875 0,20 0,19.078125 0.746094,18.332031 1.667969,18.332031 Z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path10"
-         d="m 10.597656,29.453125 c 0.636719,0.636719 0.636719,1.671875 0,2.308594 l -2.40625,2.40625 c -0.636718,0.636719 -1.671875,0.636719 -2.308594,0 l -0.050781,-0.05078 c -0.636719,-0.636719 -0.636719,-1.671876 0,-2.308594 l 2.40625,-2.40625 c 0.636719,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path12"
-         d="m 20.035156,33.332031 c 0.902344,0 1.632813,0.730469 1.632813,1.632813 v 3.402344 C 21.667969,39.269531 20.9375,40 20.035156,40 h -0.07031 C 19.0625,40 18.332031,39.269531 18.332031,38.367188 v -3.402344 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path14"
-         d="m 34.167969,31.808594 c 0.636719,0.636718 0.636719,1.671875 0,2.308594 l -0.05078,0.05078 c -0.636719,0.636719 -1.671876,0.636719 -2.308594,0 l -2.40625,-2.40625 c -0.63672,-0.636718 -0.63672,-1.671874 0.0039,-2.308593 l 0.04687,-0.04687 c 0.636719,-0.640625 1.671875,-0.640625 2.308594,-0.0039 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path16"
-         d="M 38.367188,18.332031 C 39.269531,18.332031 40,19.0625 40,19.964844 v 0.07031 c 0,0.902344 -0.730469,1.632813 -1.632812,1.632813 h -3.402344 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 v -0.07031 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path18"
-         d="m 10,20 c 0,5.523438 4.476562,10 10,10 5.523438,0 10,-4.476562 10,-10 0,-5.523438 -4.476562,-10 -10,-10 -5.523438,0 -10,4.476562 -10,10 z m 16.667969,0 c 0,3.683594 -2.984375,6.667969 -6.667969,6.667969 -3.683594,0 -6.667969,-2.984375 -6.667969,-6.667969 0,-3.683594 2.984375,-6.667969 6.667969,-6.667969 3.683594,0 6.667969,2.984375 6.667969,6.667969 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    </g>
-    <path
-       id="path31"
-       d="m 20.079366,14.007937 0.03968,6.150794"
-       style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path33"
-       d="m 20.158731,19.166668 -0.03968,0.992063 3.54693,2.047821"
-       style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:30px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75"
-     x="28.197273"
-     y="12.33308"
-     id="text877-0"><tspan
-       sodipodi:role="line"
-       id="tspan875-1"
-       x="28.197273"
-       y="12.33308"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.75">E</tspan></text>
-  <path
-     id="path29-0"
-     d="M 37.892919,38.28003 H 23.058724 c 0,0 -0.794802,-1.530694 -0.767355,-2.560404 0.02745,-1.029709 0.767355,-2.589546 0.767355,-2.589546 z"
-     style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0.316511px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     sodipodi:nodetypes="cczcc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 37.89113,38.277714 H 2.0974786 V 26.293586 Z"
-     id="path29" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:22.5496px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.56374"
-     x="2.3974602"
-     y="37.089996"
-     id="text877"><tspan
-       sodipodi:role="line"
-       id="tspan875"
-       x="2.3974602"
-       y="37.089996"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5231px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.56374">R</tspan></text>
-</svg>
diff --git a/nodes/icons/inputTypeSunTimeElevationRiseRad.svg b/nodes/icons/inputTypeSunTimeElevationRiseRad.svg
deleted file mode 100644
index 9e666c2b..00000000
--- a/nodes/icons/inputTypeSunTimeElevationRiseRad.svg
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="40pt"
-   height="40pt"
-   viewBox="0 0 40 40"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="inputTypeSunTimeElevationRiseRad.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25" />
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="6.6821591"
-     inkscape:cx="35.2431"
-     inkscape:cy="28.957706"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg21"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="pt" />
-  <g
-     transform="scale(0.66328248)"
-     id="g30">
-    <g
-       id="surface1">
-      <path
-         id="path2"
-         d="m 34.167969,5.882812 c 0.636719,0.636719 0.636719,1.671876 0,2.308594 l -2.40625,2.40625 c -0.636719,0.636719 -1.671875,0.636719 -2.308594,0 l -0.04687,-0.05078 C 28.765625,9.910156 28.765625,8.875 29.402344,8.238281 l 2.40625,-2.40625 c 0.636718,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path4"
-         d="m 20.035156,0 c 0.902344,0 1.632813,0.730469 1.632813,1.632812 v 3.402344 c 0,0.902344 -0.730469,1.632813 -1.632813,1.632813 h -0.07031 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 V 1.632812 C 18.332031,0.730469 19.0625,0 19.964844,0 Z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path6"
-         d="m 10.570312,8.214844 c 0.652344,0.652344 0.652344,1.707031 0,2.355468 -0.648437,0.652344 -1.703124,0.652344 -2.355468,0 L 5.859375,8.214844 c -0.652344,-0.648438 -0.652344,-1.707032 0,-2.355469 0.648437,-0.652344 1.703125,-0.652344 2.355469,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path8"
-         d="m 5,18.332031 c 0.921875,0 1.667969,0.746094 1.667969,1.667969 0,0.921875 -0.746094,1.667969 -1.667969,1.667969 H 1.667969 C 0.746094,21.667969 0,20.921875 0,20 0,19.078125 0.746094,18.332031 1.667969,18.332031 Z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path10"
-         d="m 10.597656,29.453125 c 0.636719,0.636719 0.636719,1.671875 0,2.308594 l -2.40625,2.40625 c -0.636718,0.636719 -1.671875,0.636719 -2.308594,0 l -0.050781,-0.05078 c -0.636719,-0.636719 -0.636719,-1.671876 0,-2.308594 l 2.40625,-2.40625 c 0.636719,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path12"
-         d="m 20.035156,33.332031 c 0.902344,0 1.632813,0.730469 1.632813,1.632813 v 3.402344 C 21.667969,39.269531 20.9375,40 20.035156,40 h -0.07031 C 19.0625,40 18.332031,39.269531 18.332031,38.367188 v -3.402344 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path14"
-         d="m 34.167969,31.808594 c 0.636719,0.636718 0.636719,1.671875 0,2.308594 l -0.05078,0.05078 c -0.636719,0.636719 -1.671876,0.636719 -2.308594,0 l -2.40625,-2.40625 c -0.63672,-0.636718 -0.63672,-1.671874 0.0039,-2.308593 l 0.04687,-0.04687 c 0.636719,-0.640625 1.671875,-0.640625 2.308594,-0.0039 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path16"
-         d="M 38.367188,18.332031 C 39.269531,18.332031 40,19.0625 40,19.964844 v 0.07031 c 0,0.902344 -0.730469,1.632813 -1.632812,1.632813 h -3.402344 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 v -0.07031 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path18"
-         d="m 10,20 c 0,5.523438 4.476562,10 10,10 5.523438,0 10,-4.476562 10,-10 0,-5.523438 -4.476562,-10 -10,-10 -5.523438,0 -10,4.476562 -10,10 z m 16.667969,0 c 0,3.683594 -2.984375,6.667969 -6.667969,6.667969 -3.683594,0 -6.667969,-2.984375 -6.667969,-6.667969 0,-3.683594 2.984375,-6.667969 6.667969,-6.667969 3.683594,0 6.667969,2.984375 6.667969,6.667969 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    </g>
-    <path
-       id="path31"
-       d="m 20.079366,14.007937 0.03968,6.150794"
-       style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path33"
-       d="m 20.158731,19.166668 -0.03968,0.992063 3.54693,2.047821"
-       style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:30px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75"
-     x="28.197273"
-     y="12.33308"
-     id="text877-0"><tspan
-       sodipodi:role="line"
-       id="tspan875-1"
-       x="28.197273"
-       y="12.33308"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.75">E</tspan></text>
-  <path
-     id="path29-0"
-     d="M 37.892919,38.28003 H 23.058724 c 0,0 -0.794802,-1.530694 -0.767355,-2.560404 0.02745,-1.029709 0.767355,-2.589546 0.767355,-2.589546 z"
-     style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0.316511px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     sodipodi:nodetypes="cczcc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 37.89113,38.277714 H 2.0974786 V 26.293586 Z"
-     id="path29" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:22.5496px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.56374"
-     x="2.3974602"
-     y="37.089996"
-     id="text877"><tspan
-       sodipodi:role="line"
-       id="tspan875"
-       x="2.3974602"
-       y="37.089996"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5231px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.56374">R</tspan></text>
-  <path
-     id="path2-0"
-     d="m 29.291,23.136639 h 1.93125 v 5 h 3.8625 v -5 H 37.016 l -3.8625,-7.5 z m 0,0"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.87892" />
-</svg>
diff --git a/nodes/icons/inputTypeSunTimeElevationSetRad.svg b/nodes/icons/inputTypeSunTimeElevationSetRad.svg
deleted file mode 100644
index 3269193e..00000000
--- a/nodes/icons/inputTypeSunTimeElevationSetRad.svg
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="40pt"
-   height="40pt"
-   viewBox="0 0 40 40"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="inputTypeSunTimeElevationRiseSet.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25" />
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="6.6821591"
-     inkscape:cx="35.2431"
-     inkscape:cy="28.957706"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg21"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="pt" />
-  <g
-     transform="scale(0.66328248)"
-     id="g30">
-    <g
-       id="surface1">
-      <path
-         id="path2"
-         d="m 34.167969,5.882812 c 0.636719,0.636719 0.636719,1.671876 0,2.308594 l -2.40625,2.40625 c -0.636719,0.636719 -1.671875,0.636719 -2.308594,0 l -0.04687,-0.05078 C 28.765625,9.910156 28.765625,8.875 29.402344,8.238281 l 2.40625,-2.40625 c 0.636718,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path4"
-         d="m 20.035156,0 c 0.902344,0 1.632813,0.730469 1.632813,1.632812 v 3.402344 c 0,0.902344 -0.730469,1.632813 -1.632813,1.632813 h -0.07031 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 V 1.632812 C 18.332031,0.730469 19.0625,0 19.964844,0 Z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path6"
-         d="m 10.570312,8.214844 c 0.652344,0.652344 0.652344,1.707031 0,2.355468 -0.648437,0.652344 -1.703124,0.652344 -2.355468,0 L 5.859375,8.214844 c -0.652344,-0.648438 -0.652344,-1.707032 0,-2.355469 0.648437,-0.652344 1.703125,-0.652344 2.355469,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path8"
-         d="m 5,18.332031 c 0.921875,0 1.667969,0.746094 1.667969,1.667969 0,0.921875 -0.746094,1.667969 -1.667969,1.667969 H 1.667969 C 0.746094,21.667969 0,20.921875 0,20 0,19.078125 0.746094,18.332031 1.667969,18.332031 Z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path10"
-         d="m 10.597656,29.453125 c 0.636719,0.636719 0.636719,1.671875 0,2.308594 l -2.40625,2.40625 c -0.636718,0.636719 -1.671875,0.636719 -2.308594,0 l -0.050781,-0.05078 c -0.636719,-0.636719 -0.636719,-1.671876 0,-2.308594 l 2.40625,-2.40625 c 0.636719,-0.636719 1.671875,-0.636719 2.308594,0 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path12"
-         d="m 20.035156,33.332031 c 0.902344,0 1.632813,0.730469 1.632813,1.632813 v 3.402344 C 21.667969,39.269531 20.9375,40 20.035156,40 h -0.07031 C 19.0625,40 18.332031,39.269531 18.332031,38.367188 v -3.402344 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path14"
-         d="m 34.167969,31.808594 c 0.636719,0.636718 0.636719,1.671875 0,2.308594 l -0.05078,0.05078 c -0.636719,0.636719 -1.671876,0.636719 -2.308594,0 l -2.40625,-2.40625 c -0.63672,-0.636718 -0.63672,-1.671874 0.0039,-2.308593 l 0.04687,-0.04687 c 0.636719,-0.640625 1.671875,-0.640625 2.308594,-0.0039 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path16"
-         d="M 38.367188,18.332031 C 39.269531,18.332031 40,19.0625 40,19.964844 v 0.07031 c 0,0.902344 -0.730469,1.632813 -1.632812,1.632813 h -3.402344 c -0.902344,0 -1.632813,-0.730469 -1.632813,-1.632813 v -0.07031 c 0,-0.902344 0.730469,-1.632813 1.632813,-1.632813 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path18"
-         d="m 10,20 c 0,5.523438 4.476562,10 10,10 5.523438,0 10,-4.476562 10,-10 0,-5.523438 -4.476562,-10 -10,-10 -5.523438,0 -10,4.476562 -10,10 z m 16.667969,0 c 0,3.683594 -2.984375,6.667969 -6.667969,6.667969 -3.683594,0 -6.667969,-2.984375 -6.667969,-6.667969 0,-3.683594 2.984375,-6.667969 6.667969,-6.667969 3.683594,0 6.667969,2.984375 6.667969,6.667969 z m 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    </g>
-    <path
-       id="path31"
-       d="m 20.079366,14.007937 0.03968,6.150794"
-       style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path33"
-       d="m 20.158731,19.166668 -0.03968,0.992063 3.54693,2.047821"
-       style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:30px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75"
-     x="28.197273"
-     y="12.33308"
-     id="text877-0"><tspan
-       sodipodi:role="line"
-       id="tspan875-1"
-       x="28.197273"
-       y="12.33308"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.75">E</tspan></text>
-  <path
-     id="path29-0"
-     d="M 37.892919,38.28003 H 23.058724 c 0,0 -0.794802,-1.530694 -0.767355,-2.560404 0.02745,-1.029709 0.767355,-2.589546 0.767355,-2.589546 z"
-     style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0.316511px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     sodipodi:nodetypes="cczcc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 37.89113,38.277714 H 2.0974786 V 26.293586 Z"
-     id="path29" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:22.5496px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.56374"
-     x="2.3974602"
-     y="37.089996"
-     id="text877"><tspan
-       sodipodi:role="line"
-       id="tspan875"
-       x="2.3974602"
-       y="37.089996"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5231px;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';stroke-width:0.56374">R</tspan></text>
-  <path
-     id="path2-0"
-     d="m 37.016,20.636639 h -1.93125 v -5 h -3.8625 v 5 H 29.291 l 3.8625,7.5 z m 0,0"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.87892" />
-</svg>
diff --git a/nodes/lib/dateTimeHelper.js b/nodes/lib/dateTimeHelper.js
index 1dc09a8e..ca150589 100644
--- a/nodes/lib/dateTimeHelper.js
+++ b/nodes/lib/dateTimeHelper.js
@@ -62,15 +62,27 @@
 
 const util = require('util');
 const TIME_WEEK = 604800000;
+const TIME_5d = 432000000;
+const TIME_4d = 345600000;
+const TIME_3d = 259200000;
+const TIME_36h = 129600000;
 const TIME_24h = 86400000;
+const TIME_12h = 43200000;
 const TIME_1h = 3600000;
+const TIME_20min = 1200000;
 const TIME_1min = 60000;
 const TIME_1s = 1000;
 
 module.exports = {
     TIME_WEEK,
+    TIME_5d,
+    TIME_4d,
+    TIME_3d,
+    TIME_36h,
     TIME_24h,
+    TIME_12h,
     TIME_1h,
+    TIME_20min,
     TIME_1min,
     TIME_1s,
     isBool,
@@ -82,6 +94,8 @@ module.exports = {
     pad,
     angleNorm,
     angleNormRad,
+    toDec,
+    toRad,
     clipStrLength,
     countDecimals,
     handleError,
@@ -239,6 +253,24 @@ function angleNormRad(angle) {
     }
     return angle;
 }
+
+/**
+ * radians to decimal grad
+ * @param {number} rad angle in radians
+ * @return {number} angle in decimal grad
+ */
+function toDec(rad) {
+    return rad * ( 180 / Math.PI );
+}
+
+/**
+ * decimal grad to radians
+ * @param {number} dec angle in decimal grad
+ * @return {number} angle in radians
+ */
+function toRad(dec) {
+    return dec * ( Math.PI / 180 );
+}
 /*******************************************************************************************************/
 /**
  * gives a ID of a node
@@ -1509,7 +1541,7 @@ _dateFormat.format = [
 /**
  * pre defined formats of a given date
  * @param  {Date | number}            date            -  JavaScript Date to format
- * @param  {string}          [format]        -  format of the date
+ * @param  {string | number}          [format]        -  format of the date
  * @param  {boolean} [utc] - indicates if the formatted date should be in utc or not
  * @param  {number} [timeZoneOffset] - timezone offset for conversation in minutes
  * @return {any}   returns a number, string or object depending on the given Format
diff --git a/nodes/lib/timeControlHelper.js b/nodes/lib/timeControlHelper.js
index 54119603..fcbc0999 100644
--- a/nodes/lib/timeControlHelper.js
+++ b/nodes/lib/timeControlHelper.js
@@ -40,6 +40,7 @@
  * @property {number} defaultTime   - default next autotriggering time
  * @property {(0|1|2|3|4|5|6|7|8|9)} type         - type of next autotriggering
  * @property {number} time          - next autotrigger in milliseconds
+ * @property {NodeJS.Timeout} [timer] - autotrigger TimeOut Object
  */
 
 /**
@@ -98,16 +99,19 @@
  * @property {number} multiplier            - time offset value
  * @property {boolean} next                 - time offset value
  * @property {Date} [now]                   - start time definition
- *
- * @property {(0|1)} [operator]             - time operator
- * @property {(0|1)} [operatorText]         - time operator text
- *
  * @property {IRuleTimeDefSingle} [min]     - minimum limitation to the time
  * @property {IRuleTimeDefSingle} [max]     - maximum limitation to the time
   */
 
 /**
- * @typedef {ILimitationsObj & IRuleTimeDef} IRuleTimesDef object for a rule time definition
+ * @typedef {Object} IRuleTimesDefInt object for a rule time definition
+ *
+ * @property {IRuleTimeDef} [start]     - start time definition
+ * @property {IRuleTimeDef} [end]       - end time definition
+ */
+
+/**
+ * @typedef {ILimitationsObj & IRuleTimesDefInt} IRuleTimesDef object for a rule time definition
  */
 
 /**
@@ -120,13 +124,27 @@
  * @property {string} [dateISO]         - time representation
  * @property {string} [dateUTC]         - time representation
  * @property {('default'|'min'|'max')} [source]    - source of the data if it comes from minimum or maximum limitation
- * @property {number} [now]                 - start time definition
  */
 
 /**
  * @typedef {ITimePropertyResultInt & ITimePropertyResult} ITimePropResult object for a rule time definition
  */
 
+/**
+ * @typedef {Object} IRuleTimeDataDef object for a rule time definition
+ *
+ * @property {ITimePropResult} [start]      - start time definition
+ * @property {ITimePropResult} [end]        - end time definition
+ * @property {number} [now]                 - start time definition
+ */
+
+/**
+ * @typedef {Object} IRuleTimeDataMinMaxDef object for a rule time definition
+ *
+ * @property {ITimePropResult} [start]      - start time definition
+ * @property {ITimePropResult} [end]        - end time definition
+ */
+
 /**
  * @typedef {Object} IRuleData object for a rule
  * @property {boolean} enabled                      - defines if a rle is enabled or disabled
@@ -138,13 +156,11 @@
  * @property {number} importance                    - importance of the rule
  * @property {boolean} conditional                  - defines if the rule has conditions
  * @property {Array.<IRuleCondition>} conditions    - conditions for a rule
- * @property {IRuleConditionResult} conditon        - condition resule
+ * @property {IRuleConditionResult} conditonResult        - condition resule
  * @property {IRuleTimesDef} [time]                 - rule time Data
- * @property {IRuleTimesDef} [timeMin]              - rule time Data
- * @property {IRuleTimesDef} [timeMax]              - rule time Data
- * @property {ITimePropResult} [timeData]           - object for storing time Data
- * @property {ITimePropResult} [timeDataMin]        - object for storing time Data
- * @property {ITimePropResult} [timeDataMax]        - object for storing time Data
+ * @property {IRuleTimeDataDef} [timeResult]          - object for storing time Data
+ * @property {IRuleTimeDataMinMaxDef} [timeResultMin]          - object for storing time Data
+ * @property {IRuleTimeDataMinMaxDef} [timeResultMax]          - object for storing time Data
  * @property {Object} [payload]                     - rule time Data
  * @property {Object} [level]                       - rule time Data
  * @property {Object} [slat]                        - rule time Data
@@ -161,18 +177,16 @@
  * @property {IRuleData} [ruleTopicOvs]                  - selected rule
  * @property {IRuleData} [ruleSelMin]                  - selected rule
  * @property {IRuleData} [ruleSelMax]                  - selected rule
- * @property {IRuleTimesDef} [timeResult]          - object for storing time Data
- * @property {IRuleTimesDef} [timeResultMin]          - object for storing time Data
- * @property {IRuleTimesDef} [timeResultMax]          - object for storing time Data
+ * @property {IRuleTimeDataDef} [timeResult]          - object for storing time Data
+ * @property {IRuleTimeDataDef} [timeResultMin]          - object for storing time Data
+ * @property {IRuleTimeDataDef} [timeResultMax]          - object for storing time Data
  */
 
 /**
  * @typedef {Object} IRulesData object for a rule
  * @property {Array.<IRuleData>} data       - the rules itself
  * @property {number} count                 - executuion type of a rule which is defined
- * @property {number} lastUntil             - last rule for first evaluation loop
- * @property {number} firstFrom             - first from rule
- * @property {number} firstTimeLimited      - first from rule with time limitation
+ * @property {number} last1stRun            - last rule for first evaluation loop
  * @property {number} maxImportance         - maximum inportance of all rules
  * @property {boolean} canResetOverwrite    - __true__ if any rule can overwrite reset
  */
@@ -206,7 +220,6 @@
  * @property {Array.<Object>} results    -   tbd
  *
  * @property {IAutoTrigger} autoTrigger autotrigger options
- * @property {NodeJS.Timeout} [autoTriggerObj] - autotrigger TimeOut Object
  *
  * @property {Object} startDelayTimeOut    -   tbd
  * @property {NodeJS.Timeout} startDelayTimeOutObj    -   tbd
@@ -221,6 +234,26 @@
 const util = require('util');
 const hlp = require( './dateTimeHelper.js' );
 
+const cRuleType = {
+    absolute : 0,
+    levelMinOversteer : 1,  // ⭳❗ minimum (oversteer)
+    levelMaxOversteer : 2, // ⭱️❗ maximum (oversteer)
+    slatOversteer : 5,
+    topicOversteer : 8,
+    off : 9
+};
+
+const cRuleDefault = -1;
+const cRuleLogOperatorAnd = 2;
+const cRuleLogOperatorOr = 1;
+const cNBC_RULE_TYPE_UNTIL = 0;
+const cNBC_RULE_TYPE_FROM = 1;
+const cNBC_RULE_EXEC = {
+    auto: 0,
+    first:1,
+    last:2
+};
+
 module.exports = {
     isNullOrUndefined,
     evalTempData,
@@ -232,17 +265,14 @@ module.exports = {
     getRuleTimeData,
     validPosition,
     compareRules,
-    initializeCtrl
+    getActiveRule,
+    initializeCtrl,
+    cRuleType,
+    cRuleDefault,
+    cRuleLogOperatorAnd,
+    cRuleLogOperatorOr
 };
 
-const cRuleUntil = 0;
-const cRuleFrom = 1;
-const cRuleAbsolute = 0;
-// const cRuleNone = 0;
-// const cRuleMinOversteer = 1; // ⭳❗ minimum (oversteer)
-// const cRuleMaxOversteer = 2; // ⭱️❗ maximum (oversteer)
-const cRuleLogOperatorAnd = 2;
-const cRuleLogOperatorOr = 1;
 let RED = null;
 /******************************************************************************************/
 /**
@@ -270,9 +300,13 @@ function isNullOrUndefined(object) {
  * @param {string} value  value of typeinput
  * @param {*} data  data to cache
  * @param {Object} tempData  object which holding the chached data
+ * @param {boolean} [cachable = false] defines if the value is cachable
  * @returns {*}  data which was cached
  */
-function evalTempData(node, type, value, data, tempData) {
+function evalTempData(node, type, value, data, tempData, cachable) {
+    if (!cachable) {
+        return data;
+    }
     // node.debug(`evalTempData type=${type} value=${value} data=${data}`);
     const name = `${type}.${value}`;
     if (isNullOrUndefined(data)) {
@@ -432,16 +466,19 @@ function setOverwriteReason(node) {
 function prepareRules(node, msg, tempData, dNow) {
     for (let i = 0; i < node.rules.count; ++i) {
         const rule = node.rules.data[i];
+        if (rule.time) {
+            delete rule.timeResult;
+        }
         if (rule.conditional) {
-            rule.conditon = {
+            rule.conditonResult = {
                 index : -1,
                 result : false
             };
             for (let i = 0; i < rule.conditions.length; i++) {
                 const el = rule.conditions[i];
-                if (rule.conditon.result === true && el.condition === cRuleLogOperatorOr) {
+                if (rule.conditonResult.result === true && el.condition === cRuleLogOperatorOr) {
                     break; // not nessesary, becaue already tue
-                } else if (rule.conditon.result === false && el.condition === cRuleLogOperatorAnd) {
+                } else if (rule.conditonResult.result === false && el.condition === cRuleLogOperatorAnd) {
                     break; // should never bekome true
                 }
                 delete el.valueWorth;
@@ -455,31 +492,35 @@ function prepareRules(node, msg, tempData, dNow) {
                             type: el.valueType,
                             // @ts-ignore
                             expr: el.valueExpr,
-                            callback: (result, _obj) => { // opCallback
+                            callback: (result, _obj, cachable) => { // opCallback
                                 el.valueWorth = _obj.value;
-                                return evalTempData(node, _obj.type, _obj.value, result, tempData);
-                            }
+                                return evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                            },
+                            noError:false,
+                            now: dNow
                         },
                         el.operator,
                         {
                             value: el.threshold,
                             type: el.thresholdType,
-                            callback: (result, _obj) => { // opCallback
+                            callback: (result, _obj, cachable) => { // opCallback
                                 el.thresholdWorth = _obj.value;
-                                return evalTempData(node, _obj.type, _obj.value, result, tempData);
-                            }
-                        }, false, dNow
+                                return evalTempData(node, _obj.type, _obj.value, result, tempData, cachable);
+                            },
+                            noError:false,
+                            now: dNow
+                        }
                     );
                 }
-                rule.conditon = {
+                rule.conditonResult = {
                     index : i,
                     result : el.result,
                     text : el.text,
                     textShort : el.textShort
                 };
                 if (typeof el.thresholdWorth !== 'undefined') {
-                    rule.conditon.text += ' ' + el.thresholdWorth;
-                    rule.conditon.textShort += ' ' + hlp.clipStrLength(el.thresholdWorth, 10);
+                    rule.conditonResult.text += ' ' + el.thresholdWorth;
+                    rule.conditonResult.textShort += ' ' + hlp.clipStrLength(el.thresholdWorth, 10);
                 }
             }
         }
@@ -491,54 +532,67 @@ function prepareRules(node, msg, tempData, dNow) {
  * @param {ITimeControlNode} node node data
  * @param {Object} msg the message object
  * @param {IRuleData} rule the rule data
+ * @param {('start'|'end')} timep rule type
  * @param {Date} dNow base timestamp
+ * @param {number} def default value
  */
-function getRuleTimeData(node, msg, rule, dNow) {
-    rule.time.now = dNow;
-    rule.timeData = node.positionConfig.getTimeProp(node, msg, rule.time);
-    if (rule.timeData.error) {
-        hlp.handleError(node, RED._('node-red-contrib-sun-position/position-config:errors.error-time', { message: rule.timeData.error }), undefined, rule.timeData.error);
-        return -1;
-    } else if (!rule.timeData.value) {
+function getRuleTimeData(node, msg, rule, timep, dNow, def) {
+    if (!rule.timeResult) { rule.timeResult = {}; }
+    if (!rule.time || !rule.time[timep]) {
+        Object.assign(rule.timeResult, { [timep]: { ts: def } });
+        return;
+    }
+    rule.time[timep].now = dNow;
+    Object.assign(rule, { timeResult: { [timep]: node.positionConfig.getTimeProp(node, msg, rule.time[timep]) } });
+
+    if (rule.timeResult[timep].error) {
+        hlp.handleError(node, RED._('node-red-contrib-sun-position/position-config:errors.error-time', { message: rule.timeResult[timep].error }), undefined, rule.timeResult[timep].error);
+        Object.assign(rule.timeResult, { [timep]: { ts: def } });
+        // node.debug('rule data complete');
+        // node.debug(util.inspect(rule, { colors: true, compact: 10, depth: 10, breakLength: Infinity }));
+        return;
+    } else if (!rule.timeResult[timep].value) {
         throw new Error('Error can not calc time!');
     }
-    rule.timeData.source = 'default';
-    rule.timeData.ts = rule.timeData.value.getTime();
-    // node.debug(`time=${rule.timeData.value} -> ${new Date(rule.timeData.value)}`);
-    rule.timeData.dayId = hlp.getDayId(rule.timeData.value);
-    if (rule.timeMin) {
-        rule.timeMin.now = dNow;
-        rule.timeDataMin = node.positionConfig.getTimeProp(node, msg, rule.timeMin);
-        rule.timeDataMin.source = 'min';
-        if (rule.timeDataMin.error) {
-            hlp.handleError(node, RED._('node-red-contrib-sun-position/position-config:errors.error-time', { message: rule.timeDataMin.error }), undefined, rule.timeDataMin.error);
-        } else if (!rule.timeDataMin.value) {
-            throw new Error('Error can not calc Alt time!');
+    rule.timeResult[timep].source = 'default';
+    rule.timeResult[timep].ts = rule.timeResult[timep].value.getTime();
+    // node.debug(`time=${rule.timeResult[timep].value} -> ${new Date(rule.timeResult[timep].value)}`);
+    if (rule.time[timep].min) {
+        rule.time[timep].min.now = dNow;
+        // @ts-ignore
+        if (!rule.timeResultMin) rule.timeResultMin = { start:{}, end:{} };
+        rule.timeResultMin[timep] = node.positionConfig.getTimeProp(node, msg, rule.time[timep].min);
+        rule.timeResultMin[timep].source = 'min';
+        if (rule.timeResultMin[timep].error) {
+            hlp.handleError(node, RED._('node-red-contrib-sun-position/position-config:errors.error-time', { message: rule.timeResultMin[timep].error }), undefined, rule.timeResultMin[timep].error);
+        } else if (!rule.timeResultMin[timep].value) {
+            throw new Error('Error can not calc minimum time!');
         } else {
-            rule.timeDataMin.ts = rule.timeDataMin.value.getTime();
-            rule.timeDataMin.dayId = hlp.getDayId(rule.timeDataMin.value);
-            if (rule.timeDataMin.ts > rule.timeData.ts) {
-                [rule.timeData, rule.timeDataMin] = [rule.timeDataMin, rule.timeData];
+            rule.timeResultMin[timep].ts = rule.timeResultMin[timep].value.getTime();
+            if (rule.timeResultMin[timep].ts > rule.timeResult[timep].ts) {
+                [rule.timeResult[timep], rule.timeResultMin[timep]] = [rule.timeResultMin[timep], rule.timeResult[timep]];
             }
         }
     }
-    if (rule.timeMax) {
-        rule.timeMax.now = dNow;
-        rule.timeDataMax = node.positionConfig.getTimeProp(node, msg, rule.timeMax);
-        rule.timeDataMax.source = 'max';
-        if (rule.timeDataMax.error) {
-            hlp.handleError(node, RED._('node-red-contrib-sun-position/position-config:errors.error-time', { message: rule.timeDataMax.error }), undefined, rule.timeDataMax.error);
-        } else if (!rule.timeDataMax.value) {
-            throw new Error('Error can not calc Alt time!');
+    if (rule.time[timep].max) {
+        rule.time[timep].max.now = dNow;
+        // @ts-ignore
+        if (!rule.timeResultMax) rule.timeResultMax = { start:{}, end:{} };
+        rule.timeResultMax[timep] = node.positionConfig.getTimeProp(node, msg, rule.time[timep].max);
+        rule.timeResultMax[timep].source = 'max';
+        if (rule.timeResultMax[timep].error) {
+            hlp.handleError(node, RED._('node-red-contrib-sun-position/position-config:errors.error-time', { message: rule.timeResultMax[timep].error }), undefined, rule.timeResultMin[timep].error);
+        } else if (!rule.timeResultMax[timep].value) {
+            throw new Error('Error can not calc maximum time!');
         } else {
-            rule.timeDataMax.ts = rule.timeDataMax.value.getTime();
-            rule.timeDataMax.dayId = hlp.getDayId(rule.timeDataMax.value);
-            if (rule.timeDataMax.ts < rule.timeData.ts) {
-                [rule.timeData, rule.timeDataMax] = [rule.timeDataMax, rule.timeData];
+            rule.timeResultMax[timep].ts = rule.timeResultMax[timep].value.getTime();
+            if (rule.timeResultMax[timep].ts < rule.timeResult[timep].ts) {
+                [rule.timeResult[timep], rule.timeResultMax[timep]] = [rule.timeResultMax[timep], rule.timeResult[timep]];
             }
         }
     }
-    return rule.timeData.ts;
+    rule.timeResult[timep].dayId = hlp.getDayId(rule.timeResult[timep].value);
+    return;
 }
 
 /*************************************************************************************************************************/
@@ -547,15 +601,14 @@ function getRuleTimeData(node, msg, rule, dNow) {
  * @param {ITimeControlNode} node the node object
  * @param {Object} msg the message object
  * @param {IRuleData} rule a rule object to test
- * @param {ICompareTimeStamp} cmp a function to compare two timestamps.
  * @param {ITimeObject} tData Now time object
  * @returns {IRuleData|null} returns the rule if rule is valid, otherwhise null
  */
-function compareRules(node, msg, rule, cmp, tData) {
+function compareRules(node, msg, rule, tData) {
     // node.debug(`compareRules rule ${rule.name} (${rule.pos}) rule=${util.inspect(rule, {colors:true, compact:10})}`);
     if (rule.conditional) {
         try {
-            if (!rule.conditon.result) {
+            if (!rule.conditonResult.result) {
                 node.debug(`compareRules rule ${rule.name} (${rule.pos}) conditon does not match`);
                 return null;
             }
@@ -612,14 +665,145 @@ function compareRules(node, msg, rule, cmp, tData) {
             }
         }
     }
-    const num = getRuleTimeData(node, msg, rule, tData.now);
-    // node.debug(`compareRules ${rule.name} (${rule.pos}) type=${rule.time.operatorText} - ${rule.time.value} - num=${num} - rule.timeData = ${ util.inspect(rule.timeData, { colors: true, compact: 40, breakLength: Infinity }) }`);
-    if (tData.dayId === rule.timeData.dayId && num >=0 && (cmp(num) === true)) {
-        return rule;
+
+    rule.timeResult = {
+        now: tData.now
+    };
+    if (rule.time.start) {
+        getRuleTimeData(node, msg, rule, 'start', tData.now, Number.MIN_VALUE);
+        if (rule.time.end) {
+            getRuleTimeData(node, msg, rule, 'end', tData.now, Number.MAX_VALUE);
+            if (rule.timeResult.start.ts > rule.timeResult.end.ts) {
+                if ((tData.dayId === rule.timeResult.start.dayId &&
+                        rule.timeResult.start.ts <= tData.nowNr) ||
+                    (tData.dayId === rule.timeResult.end.dayId &&
+                        rule.timeResult.end.ts > tData.nowNr)) {
+                    return rule;
+                }
+                return null;
+            }
+            if (rule.timeResult.start.ts <= tData.nowNr &&
+                tData.dayId === rule.timeResult.start.dayId &&
+                rule.timeResult.end.ts > tData.nowNr &&
+                tData.dayId === rule.timeResult.end.dayId) {
+                return rule;
+            }
+        }
+        if (rule.timeResult.start.ts <= tData.nowNr &&
+            tData.dayId === rule.timeResult.start.dayId) {
+            return rule;
+        }
+    } else if (rule.time.end) {
+        getRuleTimeData(node, msg, rule, 'end', tData.now, Number.MAX_VALUE);
+        if (rule.timeResult.end.ts > tData.nowNr &&
+            tData.dayId === rule.timeResult.end.dayId) {
+            return rule;
+        }
     }
-    // node.debug(`compareRules rule ${rule.name} (${rule.pos}) dayId=${tData.dayId} rule-DayID=${rule.timeData.dayId} num=${num} cmp=${cmp(num)} invalid time`);
+    // node.debug(`compareRules rule ${rule.name} (${rule.pos}) dayId=${tData.dayId} rule-DayID=${rule.timeResult[timep].dayId} num=${num} invalid time`);
     return null;
 }
+/******************************************************************************************/
+/**
+ * check all rules and determinate the active rule
+ * @param {ITimeControlNode} node node data
+ * @param {Object} msg the message object
+ * @param {ITimeObject} oNow the *current* date Object
+ * @param {Object} tempData the object storing the temporary caching data
+ * @returns {IRuleResultData} the active rule or null
+ */
+function getActiveRule(node, msg, oNow, tempData) {
+    // node.debug('getActiveRule --------------------');
+    prepareRules(node, msg, tempData, oNow.now);
+    // node.debug(`getActiveRule rules.count=${node.rules.count}, rules.last1stRun=${node.rules.last1stRun}, oNow=${util.inspect(oNow, {colors:true, compact:10})}`);
+    /** @type {IRuleResultData} */
+    const result = {
+        ruleindex : -1,
+        ruleSel : null
+    };
+    const setRes = (i, res) => {
+        if (res) {
+            // node.debug('new 1. ruleSel ' + util.inspect(res, { colors: true, compact: 5, breakLength: Infinity, depth: 10 }));
+            if (res.level && res.level.operator === cRuleType.slatOversteer) {
+                result.ruleSlatOvs = res;
+            } else if (res.level && res.level.operator === cRuleType.topicOversteer) {
+                result.ruleTopicOvs = res;
+            } else if (res.level && res.level.operator === cRuleType.levelMinOversteer) {
+                result.ruleSelMin = res;
+            } else if (res.level && res.level.operator === cRuleType.levelMaxOversteer) {
+                result.ruleSelMax = res;
+            } else {
+                result.ruleSel = res;
+                result.ruleindex = i;
+                return true;
+            }
+        }
+        return false;
+    };
+
+    for (let i = 0; i <= node.rules.last1stRun; ++i) {
+        const rule = node.rules.data[i];
+        // node.debug('rule ' + util.inspect(rule, {colors:true, compact:10, breakLength: Infinity }));
+        if (!rule.enabled || rule.execUse === cNBC_RULE_EXEC.last) { continue; }
+        if (setRes(i, compareRules(node, msg, rule, oNow))) break;
+    }
+
+    if (!result.ruleSel) {
+        // node.debug('--------- starting second loop ' + node.rules.count);
+        for (let i = (node.rules.count - 1); i >= 0; --i) {
+            const rule = node.rules.data[i];
+            // node.debug('rule ' + util.inspect(rule, {colors:true, compact:10, breakLength: Infinity }));
+            if (!rule.enabled || rule.execUse === cNBC_RULE_EXEC.first) { continue; }
+            if (setRes(i, compareRules(node, msg, rule, oNow))) break;
+        }
+    }
+
+    if (node.autoTrigger) {
+        const setAutoTrigger = (ts, type) => {
+            const d = new Date();
+            d.setHours(24,0,0,1); // next midnight
+            const diff = ts - oNow.nowNr;
+            node.autoTrigger.time = Math.min(node.autoTrigger.time, diff, d.getTime());
+            node.autoTrigger.type = type; // current rule end
+        };
+        if (result.ruleSel && result.ruleSel.time && result.timeResult && result.timeResult.end && result.ruleSel.timeResult.end.ts > oNow.nowNr) {
+            node.debug('autoTrigger set to current rule ' + result.ruleSel.pos + ' end');
+            setAutoTrigger(result.ruleSel.timeResult.end.ts, 1);
+        } else {
+            const times = [];
+            for (let i = (result.ruleindex+1); i < node.rules.count; ++i) {
+                const rule = node.rules.data[i];
+                if (!rule.time) { continue; }
+                rule.timeResult = { now: oNow };
+                if (rule.time.start) {
+                    getRuleTimeData(node, msg, rule, 'start', oNow, Number.MIN_VALUE);
+                    if (rule.timeResult.start.ts > oNow.nowNr) {
+                        times.push(rule.timeResult.start.ts);
+                    }
+                }
+                if (rule.time.end) {
+                    getRuleTimeData(node, msg, rule, 'end', oNow, Number.MAX_VALUE);
+                    if (rule.timeResult.end.ts > oNow.nowNr) {
+                        times.push(rule.timeResult.end.ts);
+                    }
+                }
+            }
+            if (times.length > 0) {
+                times.sort();
+                node.debug('autoTrigger set to next rule time ' + times[0]);
+                setAutoTrigger(times[0], 2);
+            } else {
+                // check maybe next day
+                const d = new Date();
+                d.setHours(24,0,0,1); // after next midnight
+                node.autoTrigger.time = Math.min(node.autoTrigger.time, d.getTime());
+                node.autoTrigger.type = 9; // no rule based autotrigger
+            }
+        }
+    }
+
+    return result;
+}
 /*************************************************************************************************************************/
 /**
  * check if a level has a valid value
@@ -732,15 +916,15 @@ function initializeCtrl(REDLib, node, config) {
 
     // Prepare Rules
     node.rules.count = node.rules.data.length;
-    node.rules.lastUntil = node.rules.count -1;
-    node.rules.firstFrom = node.rules.lastUntil;
-    node.rules.firstTimeLimited = node.rules.count;
+    node.rules.last1stRun = node.rules.count -1;
     node.rules.maxImportance = 0;
     node.rules.canResetOverwrite = false;
-
+    // node.debug('all node.rules before convert');
+    // node.debug(util.inspect(node.rules, { colors: true, compact: 10, depth: 10, breakLength: Infinity }));
     for (let i = 0; i < node.rules.count; ++i) {
         const rule = node.rules.data[i];
         rule.pos = i + 1;
+        rule.exec = rule.exec || cNBC_RULE_EXEC.auto;
         // Backward compatibility
         if (!rule.conditions) {
             rule.conditions = [];
@@ -809,60 +993,65 @@ function initializeCtrl(REDLib, node, config) {
             // @ts-ignore
             if (!rule.time && rule.timeType !== 'none') {
                 // @ts-ignore
-                rule.time = {
+                const operator = (parseInt(rule.timeOp) || cNBC_RULE_TYPE_UNTIL);
+                rule.time = { };
+                /** @type {('start'|'end')} */
+                let ttype = 'end'; // cNBC_RULE_TYPE_UNTIL
+                if (operator === cNBC_RULE_TYPE_FROM) {
+                    // @ts-ignore
+                    rule.time.start = {};
+                    ttype = 'start';
+                }
+                rule.time[ttype] = {
                     // @ts-ignore
                     type            : rule.timeType,
                     // @ts-ignore
                     value           : (rule.timeValue || ''),
                     // @ts-ignore
-                    operator        : (parseInt(rule.timeOp) || cRuleUntil),
-                    // @ts-ignore
                     offsetType      : (rule.offsetType || 'none'),
                     // @ts-ignore
                     offset          : (rule.offsetValue || 1),
                     // @ts-ignore
-                    multiplier      : (parseInt(rule.multiplier) || 60000),
+                    multiplier      : (parseInt(rule.multiplier) || hlp.TIME_1min),
+                    next            : false,
                     // @ts-ignore
                     days            : (rule.timeDays || '*'),
                     // @ts-ignore
                     months          : (rule.timeMonths || '*')
                 };
                 // @ts-ignore
-                if (rule.timeOnlyOddDays) rule.time.onlyOddDays = rule.timeOnlyOddDays; // @ts-ignore
-                if (rule.timeOnlyEvenDays) rule.time.onlyEvenDays = rule.timeOnlyEvenDays; // @ts-ignore
-                if (rule.timeDateStart) rule.time.dateStart = rule.timeDateStart; // @ts-ignore
-                if (rule.timeDateEnd) rule.time.dateEnd = rule.timeDateEnd; // @ts-ignore
-                if (rule.timeOpText) rule.time.operatorText = rule.timeOpText; // @ts-ignore
-                if (rule.timeMinType) {
-                    // @ts-ignore
-                    if (!rule.timeMin && rule.timeMinType !== 'none') {
-                        rule.timeMin = {
-                            // @ts-ignore
-                            type            : rule.timeMinType, // @ts-ignore
-                            value           : (rule.timeMinValue || ''), // @ts-ignore
-                            offsetType      : (rule.offsetMinType || 'none'), // @ts-ignore
-                            offset          : (rule.offsetMinValue || 1), // @ts-ignore
-                            multiplier      : (parseInt(rule.multiplierMin) || 60000),
-                            next            : false
-                        };
-                    }
+                if (rule.timeMinType && rule.timeMinType !== 'none') {
+                    rule.time[ttype].min = {
+                        // @ts-ignore
+                        type            : rule.timeMinType, // @ts-ignore
+                        value           : (rule.timeMinValue || ''), // @ts-ignore
+                        offsetType      : (rule.offsetMinType || 'none'), // @ts-ignore
+                        offset          : (rule.offsetMinValue || 1), // @ts-ignore
+                        multiplier      : (parseInt(rule.multiplierMin) || 60000),
+                        next            : false
+                    };
                 }
                 // @ts-ignore
-                if (rule.timeMaxType) {
-                    // @ts-ignore
-                    if (!rule.timeMax && rule.timeMaxType !== 'none') {
-                        rule.timeMax = {
-                            // @ts-ignore
-                            type            : rule.timeMaxType, // @ts-ignore
-                            value           : (rule.timeMaxValue || ''), // @ts-ignore
-                            offsetType      : (rule.offsetMaxType || 'none'), // @ts-ignore
-                            offset          : (rule.offsetMaxValue || 1), // @ts-ignore
-                            multiplier      : (parseInt(rule.multiplierMax) || 60000),
-                            next            : false
-                        };
-                    }
+                if (rule.timeMaxType && rule.timeMaxType !== 'none') {
+                    rule.time[ttype].max = {
+                        // @ts-ignore
+                        type            : rule.timeMaxType, // @ts-ignore
+                        value           : (rule.timeMaxValue || ''), // @ts-ignore
+                        offsetType      : (rule.offsetMaxType || 'none'), // @ts-ignore
+                        offset          : (rule.offsetMaxValue || 1), // @ts-ignore
+                        multiplier      : (parseInt(rule.multiplierMax) || 60000),
+                        next            : false
+                    };
                 }
             }
+            // @ts-ignore
+            if (rule.timeDays && rule.timeDays !== '*') rule.time.days = rule.timeDays; // @ts-ignore
+            if (rule.timeMonths && rule.timeMonths !== '*') rule.time.months = rule.timeMonths; // @ts-ignore
+            if (rule.timeOnlyOddDays) rule.time.onlyOddDays = rule.timeOnlyOddDays; // @ts-ignore
+            if (rule.timeOnlyEvenDays) rule.time.onlyEvenDays = rule.timeOnlyEvenDays; // @ts-ignore
+            if (rule.timeDateStart) rule.time.dateStart = rule.timeDateStart; // @ts-ignore
+            if (rule.timeDateEnd) rule.time.dateEnd = rule.timeDateEnd;
+
             // @ts-ignore
             delete rule.timeType; // @ts-ignore
             delete rule.timeValue; // @ts-ignore
@@ -891,6 +1080,70 @@ function initializeCtrl(REDLib, node, config) {
             delete rule.timeMaxOp;
         }
         // @ts-ignore
+        if (rule.time && (typeof rule.time.operator !== 'undefined')) {
+            /** @type {('start'|'end')} */
+            let ttype = 'end'; // cNBC_RULE_TYPE_UNTIL
+            // @ts-ignore
+            if (rule.time.operator === cNBC_RULE_TYPE_FROM) {
+                ttype = 'start';
+            }
+            rule.time[ttype] = Object.assign({
+                // @ts-ignore
+                type            : rule.time.type,
+                // @ts-ignore
+                value           : rule.time.value,
+                // @ts-ignore
+                offsetType      : rule.time.offsetType,
+                // @ts-ignore
+                offset          : rule.time.offset,
+                // @ts-ignore
+                multiplier      : rule.time.multiplier,
+                next            : false
+            }, rule.time[ttype]);
+            // @ts-ignore
+            if (rule.timeMin && rule.timeMin.type !== 'none' ) {
+                rule.time[ttype].min = Object.assign({
+                    // @ts-ignore
+                    type            : rule.timeMin.type,
+                    // @ts-ignore
+                    value           : (rule.timeMin.value || ''),
+                    // @ts-ignore
+                    offsetType      : (rule.timeMin.offsetType || 'none'),
+                    // @ts-ignore
+                    offset          : (rule.timeMin.offset || 1),
+                    // @ts-ignore
+                    multiplier      : (parseInt(rule.timeMin.multiplier) || 60000),
+                    next            : false
+                }, rule.time[ttype].min);
+            }
+            // @ts-ignore
+            if (rule.timeMax && rule.timeMax.type !== 'none' ) {
+                rule.time[ttype].max = Object.assign({
+                    // @ts-ignore
+                    type            : rule.timeMax.type,
+                    // @ts-ignore
+                    value           : (rule.timeMax.value || ''),
+                    // @ts-ignore
+                    offsetType      : (rule.timeMax.offsetType || 'none'),
+                    // @ts-ignore
+                    offset          : (rule.timeMax.offset || 1),
+                    // @ts-ignore
+                    multiplier      : (parseInt(rule.timeMax.multiplier) || 60000),
+                    next            : false
+                }, rule.time[ttype].max);
+            }
+            // @ts-ignore
+            delete rule.time.operator; // @ts-ignore
+            delete rule.time.operatorText; // @ts-ignore
+            delete rule.time.type; // @ts-ignore
+            delete rule.time.value; // @ts-ignore
+            delete rule.time.offsetType; // @ts-ignore
+            delete rule.time.offset; // @ts-ignore
+            delete rule.time.multiplier; // @ts-ignore
+            delete rule.timeMin; // @ts-ignore
+            delete rule.timeMax;
+        }
+        // @ts-ignore
         if (rule.levelType) {
             if (!rule.level) {
                 rule.level = {
@@ -899,21 +1152,15 @@ function initializeCtrl(REDLib, node, config) {
                     // @ts-ignore
                     value           : (rule.levelValue || 'closed (min)'),
                     // @ts-ignore
-                    operator        : (parseInt(rule.levelOp) || cRuleAbsolute),
+                    operator        : (parseInt(rule.levelOp) || cRuleType.absolute),
                     // @ts-ignore
                     operatorText    : rule.levelOpText || RED._('node-red-contrib-sun-position/position-config:ruleCtrl.label.ruleLevelAbs')
                 };
             }
-            if (!rule.slat) {
-                rule.slat = {
-                    type            : 'str',
-                    value           : ''
-                };
-            }
             if ((rule.level.operator === 3) || (rule.level.operator === 4)) { // 3 -> ⭳✋ reset minimum; 4 -> ⭱️✋ reset maximum
                 rule.level.type = 'levelND';
                 rule.level.value = '';
-                rule.level.operator = rule.level.operator - 2;
+                rule.level.operator = rule.level.operator - 2; // cRuleType.absolute;
             }
             // @ts-ignore
             delete rule.levelType; // @ts-ignore
@@ -935,7 +1182,7 @@ function initializeCtrl(REDLib, node, config) {
                     // @ts-ignore
                     offset          : (rule.payloadOffsetValue || '1'),
                     // @ts-ignore
-                    multiplier      : (parseInt(rule.payloadOffsetMultiplier) || 60000),
+                    multiplier      : (parseInt(rule.payloadOffsetMultiplier) || hlp.TIME_1min),
                     // @ts-ignore
                     format          : (parseInt(rule.payloadFormat) || 99)
                 };
@@ -951,27 +1198,51 @@ function initializeCtrl(REDLib, node, config) {
         if (rule.payload && !('next' in rule)) {
             rule.payload.next = true;
         }
+        /**
+         * non time rules will be executed if auto in order to first/last, so the will be let as auto
+         */
+        rule.execUse = rule.exec;
+        if (rule.exec === cNBC_RULE_EXEC.first || (rule.time && !rule.time.start && rule.time.end)) {
+            rule.execUse = cNBC_RULE_EXEC.first;
+            node.rules.last1stRun = i;
+        } else if (rule.exec === cNBC_RULE_EXEC.last || (rule.time && rule.time.start && !rule.time.end)) {
+            rule.execUse = cNBC_RULE_EXEC.last;
+        }
+
         /// check generic rule settings
         rule.name = rule.name || 'rule ' + rule.pos;
         // @ts-ignore
         rule.enabled = !(rule.enabled === false || rule.enabled === 'false');
         rule.resetOverwrite = hlp.isTrue(rule.resetOverwrite === true) ? true : false;
-        if (rule.payload || (rule.level && (rule.level.operator === cRuleAbsolute))) {
+
+        if (rule.level) {
+            if (!rule.slat) {
+                rule.slat = {
+                    type            : 'none',
+                    value           : ''
+                };
+            }
+            if (rule.level.type === 'levelND') {
+                rule.level.operator = cRuleType.absolute;
+            }
+        }
+        if (rule.payload || (rule.level && (rule.level.operator === cRuleType.absolute))) {
             rule.importance = Number(rule.importance) || 0;
             node.rules.maxImportance = Math.max(node.rules.maxImportance, rule.importance);
             node.rules.canResetOverwrite = node.rules.canResetOverwrite || rule.resetOverwrite;
         }
         /// readout timesettings
         if (rule.time) {
-            rule.time.next = false;
-            if (rule.timeMax) { rule.timeMax.next = false; }
-            if (rule.timeMin) { rule.timeMin.next = false; }
-            node.rules.firstTimeLimited = Math.min(i, node.rules.firstTimeLimited);
-            if (rule.time.operator === cRuleUntil) {
-                node.rules.lastUntil = i;
+            const checkTimeR = id => {
+                if (rule.time[id].max) { rule.time[id].max.next = false; }
+                if (rule.time[id].min) { rule.time[id].min.next = false; }
+                rule.time[id].next = false;
+            };
+            if (rule.time.start) { // cNBC_RULE_TYPE_FROM
+                checkTimeR('start');
             }
-            if (rule.time.operator === cRuleFrom) {
-                node.rules.firstFrom = Math.min(i,node.rules.firstFrom);
+            if (rule.time.end) { // cNBC_RULE_TYPE_UNTIL
+                checkTimeR('end');
             }
             if (!rule.time.days || rule.time.days === '*') {
                 delete rule.time.days;
@@ -1047,6 +1318,8 @@ function initializeCtrl(REDLib, node, config) {
         });
         rule.conditional = rule.conditions.length > 0;
     }
+    // node.debug('all node.rules after convert');
+    // node.debug(util.inspect(node.rules, { colors: true, compact: 10, depth: 10, breakLength: Infinity }));
 
     if (node.autoTrigger || (parseFloat(config.startDelayTime) > 9)) {
         let delay = parseFloat(config.startDelayTime) || (300 + Math.floor(Math.random() * 700)); // default = 300ms - 1s
diff --git a/nodes/locales/de/10-position-config.json b/nodes/locales/de/10-position-config.json
index 24910a9b..bc3af394 100644
--- a/nodes/locales/de/10-position-config.json
+++ b/nodes/locales/de/10-position-config.json
@@ -3,7 +3,7 @@
         "label": {
             "positionConfig": "Konfiguration",
             "binary": "binär",
-            "infoText":"Die Konfiguration muss erstellt und deployed werden damit die Einstellungen angezeigt werden können.",
+            "infoText":"Die Konfiguration muss erstellt und bereitgestellt werden, damit die Einstellungen angezeigt werden können.",
             "loadingInfo":"lade Daten...",
             "json": "json",
             "jsonata": "jsonata Ausdr.",
@@ -41,6 +41,8 @@
             "undefined": "nicht verwendet",
             "delete":"entfernen",
             "msgInput": "eingangs Nachricht",
+            "undefinedTimeFrom":"von Mitternacht oder vorhergehender Regel",
+            "undefinedTimeUntil":"bis Mitternacht oder nächster Regel",
             "datespecific": "Zeitpunkt (erweitert)",
             "nodeId":"Node Name",
             "nodeName":"Node ID",
@@ -53,10 +55,12 @@
             "dayofweek": "Wochentag",
             "timesun": "Uhrzeit Sonnenstand",
             "timesunnow": "nächste Uhrzeit Sonnenstand",
+            "timesuncustom":"Uhrzeit Sonnenstand (benutzerdefiniert)",
+            "timesuncustomnamed":"Uhrzeit Sonnenstand __value__",
             "timemoon": "Uhrzeit Mond Auf/Untergang",
             "randomNumber":"zufällige Zahl (immer neu)",
-            "randmNumCachedDay":"zufällig Zahl (täglich neu)",
-            "randmNumCachedWeek":"zufällig Zahl (wöchentlich neu)",
+            "randmNumCachedDay":"zufällige Zahl (täglich neu)",
+            "randmNumCachedWeek":"zufällige Zahl (wöchentlich neu)",
             "numPercent":"Nummer in Prozent %",
             "suncalc":"Sonnenstand berechnet",
             "suninsky":"Sonne am Himmel (Prozent)",
@@ -78,14 +82,13 @@
             "SunTimeByElevationRiseRad":"Zeit Aufgang Sonne durch Höhenwinkel (rad)",
             "SunTimeByElevationSet":"Zeit Untergang Sonne durch Höhenwinkel",
             "SunTimeByElevationSetRad":"Zeit Untergang Sonne durch Höhenwinkel (rad)",
-            "suntime":"Sonnenzeit",
-            "suntimes":"Sonnenzeiten",
+            "suntime":"Sonnenzeit",            "suntimes":"Sonnenzeiten",
             "mooncalc": "Mondposition",
             "moonPhase": "Mondphase",
             "moonPhaseCheck": "Mondphase",
             "levelfix": "Position",
             "levelfree": "Position eingeben",
-            "levelND": "N/D - benutze standard oder sonnensteuerung",
+            "levelND": "N/D - Benutze standard oder Sonnensteuerung",
             "PlTRes":"msg.payload wenn msg.topic enthält",
             "isDST":"ist Sommerzeit (true/false)",
             "WeekOfYear":"Kalenderwoche (KW)",
@@ -94,7 +97,7 @@
             "isDayOfYearEven":"gerader Tag des Jahres (true/false)",
             "sunControlMode": "Aktueller Modus Sonnensteuerung",
 			"sunControlOff": "aus",
-			"sunControlRestrict": "Sonnenlicht beschränken (🌞 Sommer)",
+			"sunControlRestrict": "Sonnenlicht einschränken (🌞 Sommer)",
 			"sunControlMaximize": "Sonnenlicht maximieren (⛄ Winter)",
             "sunControlMinimize": "Sonnenlicht minimieren (🕶️)",
             "payload":"payload",
@@ -354,38 +357,56 @@
     "ruleCtrl": {
         "label": {
             "outDated": "✎ Bitte editieren Sie diese Regel.",
-            "isInValid": "⚠️ Diese Regel ist ungültig und muss geändert werden!!",
-            "ruleIsOutdated": "⚠️ Diese Regel ist ungültig und muss angepasst werden, da sie nicht mehr funktioniert!",
-			"ruleTimeMax": "spätestens (max)",
-			"ruleTimeMin": "frühestens (min)",
-            "ruleTimeLimit": "limitiert",
-			"ruleTimeLimitStart": "nur von",
-			"ruleTimeLimitEnd": "bis",
-			"ruleTimeDays": "nur an folgenden Tagen",
-			"ruleTimeMonths": "nur an folgenden Monaten",
+            "isInValid": "⚠️ Diese Regel ist ungültig und muss geändert werden!",
+            "ruleIsOutdated": "⚠️ Diese Regel ist ungültig und muss geändert werden, da sie nicht mehr funktioniert!",
+			"ruleTimeMax_start": "von Spätestens (max)",
+			"ruleTimeMin_start": "von Frühestens (min)",
+			"ruleTimeMax_end": "bis Spätestens (max)",
+			"ruleTimeMin_end": "bis Frühestens (min)",
+            "ruleTimeMinOffset_start": "frühester (min) offset",
+			"ruleTimeMaxOffset_start": "spätester (max) offset",
+            "ruleTimeMinOffset_end": "frühester (min) offset",
+			"ruleTimeMaxOffset_end": "spätester (max) offset",
+            "ruleTimeLimit": "Limitiert",
+            "ruleTimeLimitStart": "Nur von",
+			"ruleTimeLimitEnd": "Bis",
+			"ruleTimeDays": "Nur an folgenden Tagen",
+			"ruleTimeMonths": "Nur an folgenden Monaten",
 			"ruleTopic": "Topic",
 			"ruleSlat": "Lamellenposition",
 			"rulePayload": "Payload:",
 			"rulePayloadND": "Kein Payload",
-			"ruleResetOverwrite": "manuelle Überschreibung verfällt wenn die Regel aktiv wird",
+			"ruleResetOverwrite": "Manuelle Überschreibung verfällt wenn die Regel aktiv wird",
 			"ruleDescription": "Beschreibung",
 			"ruleBlindLevel": "Rollladenposition",
-            "ruleBlindLevelMinimum": "⭳ minimale Rollladen Position",
-            "ruleBlindLevelMaximum": "⭱️ maximale Rollladen Position",
-            "ruleOverwrite": "überschreiben",
-			"ruleImportance":"Wichtung der Regel",
+            "ruleBlindLevelMinimum": "⭳ Minimale Rollladen Position",
+            "ruleBlindLevelMaximum": "⭱️ Maximale Rollladen Position",
+            "ruleOverwrite": "Überschreiben",
+			"ruleImportance":"Gewichtung der Regel",
 			"ruleLevelAbs": "↕  Absolut",
 			"ruleLevelMin": "⭳❗  Minimum (übersteuernd)",
 			"ruleLevelMax": "⭱️❗  Maximum (übersteuernd)",
             "ruleSlatOversteer": "Lamellenposition (übersteuernd)",
             "ruleTopicOversteer": "Topic (übersteuernd)",
+            "ruleTimeStart": "↧ von",
+			"ruleTimeEnd": "↥ bis",
+            "ruleTimeOffset": "zeit offset",
             "ruleOff": "✋ nichts senden",
-			"ruleLevelND": "standard level (e.g. sun control)",
+			"ruleLevelND": "standard Level (e.g. sun control)",
+            "ruleState": "aktiviert oder deaktiviert die Regel",
+            "ruleExec":"Reihenfolge der Auswertung",
+            "ruleExecAuto": "auto - Regeln nur mit '↧ von', letzte gültige; alle anderen erste gültige",
+			"ruleExecFirst": "⭳ Erste gültige Regel (Bewertung von Anfang bis Ende [1])",
+			"ruleExecLast": "⭱️ letze gültige Regel (Bewertung von Ende bis Anfang [2])",
+            "ruleExecShort": [
+                "",
+                "¹⭳",
+                "²⭱️"
+            ],
+            "ruleInValidElement":"ungültig",
+            "ruleInValidText":"ungültiges Element",
 			"editRule": "Regel editieren",
 			"duplicateRule": "Regel duplizieren",
-            "ruleState": "aktiviert oder deaktiviert die Regel",
-			"ruleTimeFrom": "↧ von",
-			"ruleTimeUntil": "↥ bis",
 			"btnAdd": "hinzufügen",
 			"btnSort": "sortieren",
 			"btnClear": "leeren",
@@ -440,26 +461,26 @@
 		},
         "text": {
 			"blind": "Rollladen Einstellungen",
-			"time": "Es werden nur Zeilen ausgewertet, bei denen die Eigenschaft <b>nicht verwendet</b> oder <em>true</em> ist. <br> <b>bis</b>: Die erste übereinstimmende Zeile wird verwendet, wobei die definierte Zeit <b>nicht verwendet</b> oder größer als <b>now</b> ist. <br> <b>von</b>: Die letzte übereinstimmende Zeile wird verwendet, wo die angegebene Zeit <b>nicht verwendet</b> oder weniger als <b>der aktuelle Zeitpunkt</b> ist. <br>",
-			"blindLevelDefault": "Wenn keine andere Vorgabe (Zeitregel, Regel, Sonnensteuerung) zutrifft, wird diese Rollladenposition, Lamelleneinstellung und Topic genutzt. Bei beschränkender Sonnen-Steuerung ist die die Rollladenposition, wenn die Sonne nicht in das Fenster scheint.",
+			"time": "Es werden nur Zeilen ausgewertet, bei denen die Eigenschaft <b>nicht verwendet</b> oder <em>true</em> ist. <br> <b>bis</b>: Es wird die erste übereinstimmende Zeile verwendet, in der die angegebene Zeit <b>nicht verwendet</b> wird oder größer als <b>now</b> ist. <br> <b>von:</b>: Es wird die letzte übereinstimmende Zeile verwendet, in der die angegebene Zeit <b>nicht verwendet</b> wird oder kleiner als <b>jetzt</b> ist.",
+			"blindLevelDefault": "Wenn keine andere Vorgabe (Zeitregel, Regel, Sonnensteuerung) zutrifft, wird diese Rollladenposition, Lamelleneinstellung und Topic genutzt. Bei restriktiver Sonnenautomatik ist dies die Position des Rollladens, wenn keine Sonne ins Fenster scheint.",
 			"payloadDefault":"Wenn keine Regel zutrifft, wird der folgende payload gesendet.",
-			"overwriteBlind": "manuelles Überschreiben der Rollladenposition",
-			"overwriteTimer": "manuelles Überschreiben der Regel",
+			"overwriteBlind": "Manuelles Überschreiben der Rollladenposition",
+			"overwriteTimer": "Manuelles Überschreiben der Regel",
 			"sunControlNotActive": "Nur Regelbasiert",
-			"sunControlMode": "Anstelle der standard Rollladenposition kann das Ausmaß in dem direktes Sonnenlicht in den Raum scheint eingeschränkt werden. <br><br>Der Modus kann über die eingehende Nachricht verändert werden. In diesem Falle ist der heir eingestellte Modus der maximal wählbare Modus. Der über eine nachricht eingestellte Modus wird im Node-Context persistiert und bleibt bei einem deploy erhalten.",
-			"windowAzimuth": "Darstellung der Ausrichtung des Fensters zum geografischen Norden (in Grad), wenn die Sonne in das Fenster fällt (Sonnenrichtung/Azimuth).",
-			"windowPos": "Fenster Eigenschaften, Messung vom Boden bis zum unter und Oberseite des Fensters",
-			"oversteer": "erlaubt das Übersteuern der Position in Abhängigkeit von der Sonne unter definierten Bedingungen wie Sonnenwinkel oder Wetter (z. B. Wolkenhimmel, Beleuchtung, etc.). Hiermit kann auch eine minimale oder maximaler Höhenwinkel definiert werden, wenn Berge/Gebäude, etc das Fenster verdecken.",
+			"sunControlMode": "Das Ausmaß, in dem direktes Sonnenlicht in den Raum einfällt, kann anstelle der Standardposition des Rollladens begrenzt werden. <br><br>Der Modus kann über die eingehende Nachricht geändert werden. In diesem Fall ist der hier eingestellte Modus der maximal wählbare Modus. Der über eine Nachricht eingestellte Modus wird im Node-Context persistiert und bleibt bei einem Deploy erhalten.",
+            "windowAzimuth": "Zeigt die Ausrichtung des Fensters bezogen auf den geografischen Norden (in Grad), wenn die Sonne in das Fenster einfällt (Sonnenrichtung/Azimut).",
+			"windowPos": "Fenstereigenschaften, Messung vom Boden bis unter und über dem Fenster",
+			"oversteer": "Ermöglicht das Anpassen der Position in Abhängigkeit von der Sonne unter bestimmten Bedingungen wie dem Sonnenwinkel oder dem Wetter (z. B. Wolkenhimmel, Beleuchtung, usw.). Es kann auch ein minimaler oder maximaler Winkel für die Höhe definiert werden, wenn Berge/Gebäude das Fenster verdecken.",
             "sunAdvanced": "Erweiterte Einstellungen für die Sonnensteuerung",
-            "blindPosOffset": "Wenn der Fensterbereich kleiner als der Rollladen öffnen/schließenBereichs entspricht, weil ein breiter Fensterrahmen vorhanden ist oder verzögerte öffnen/schließen vorliegt (durch beispielsweise Schlitze welche sich erst Öffnen/schließen müssen), kann hier ein Offset dafür eingestellt werden.",
+            "blindPosOffset": "Falls der Fensterbereich kleiner als der Rollladen öffnen/schließenBereichs entspricht, weil ein breiter Fensterrahmen vorhanden ist oder verzögerte öffnen/schließen vorliegt (durch beispielsweise Schlitze welche sich erst Öffnen/schließen müssen), kann hier ein Offset dafür eingestellt werden.",
 			"sunControlMaximization": "<ul><li>Wenn keine Regel oder Überschreiben (Override) zutrifft,<ul><li>Wenn die Sonne <em>nicht</ em> in das Fenster scheint, wird die Rollladenhöhe die definierte <strong>Minimalposition</ strong> gesetzt. (Übersteuern wird ignoriert)</ li><li>Wenn sich die Sonne im Fenster befindet</ li><li>Wenn eine Übersteueruzng aufgesetzt ist und die bedingung zutrifft, wird der Behang auf die Höhe des Übersteuerns gesetzt.< / li><li>Andernfalls wird die Behanghöhe auf die definierte <strong>Maximalposition</ strong> gesetzt.</ li></ ul></ li></ ul>",
 			"sunControlMinimization": "<ul><li>Wenn keine Regel oder Überschreiben (Override) zutrifft,<ul><li>Wenn die Sonne <em>nicht</ em> in das Fenster scheint, wird die Rollladenhöhe die definierte <strong>Maximalposition</ strong> gesetzt. (Übersteuern wird ignoriert)</ li><li>Wenn sich die Sonne im Fenster befindet</ li><li>Wenn eine Übersteueruzng aufgesetzt ist und die bedingung zutrifft, wird der Behang auf die Höhe des Übersteuerns gesetzt.< / li><li>Andernfalls wird die Behanghöhe auf die definierte <strong>Minimalposition</ strong> gesetzt.</ li></ ul></ li></ ul>",
-			"sunControlRestriction": "Wenn keine Regel oder Überschreiben (Override) zutrifft, berechnet der Knoten die entsprechende Blindposition, um die Menge des direkten Sonnenlichts, das in den Raum fällt, zu begrenzen.",
-			"sunCtrlLoF": "Definition inwieweit direktes Sonnenlicht durch das Fenster in den Raum gelangen darf (als Länge auf dem Boden).",
-			"sunCtrlRestrict": "Begrenzen Sie die Häufigkeit von Änderungen nach Zeit und / oder Änderungsgröße (Delta).",
-			"ruleCondition": "Bedingung unter welcher diese Regel beachtet wird.<br/><small>Es gibt keine Operatorrangfolge! Die Verknüpfung von mehreren Bedingungen mit <kbd>UND</kbd> bzw. <kbd>ODER</kbd> bedeutet nur die jeweilige Bedingung zu den vorhergehenden. Die Auswertung wird abgebrochen sobald der Ausdruck true ergibt.</small>",
+			"sunControlRestriction": "Falls keine Regel oder Überschreibung vorliegt, berechnet der Knoten die passende Position für die Rolladen, um die Menge des direkten Sonnenlichts im Raum zu begrenzen.",
+			"sunCtrlLoF": "Definition, wie viel direktes Sonnenlicht durch das Fenster in den Raum gelangen darf (als Länge am Boden).",
+			"sunCtrlRestrict": "Begrenzung der Änderungshäufigkeit nach Zeit und/oder Änderungsgröße (Delta).",
+			"ruleCondition": "Bedingung, unter der diese Regel erfüllt ist.<br/><small>Es gibt keine Rangfolge der Operatoren! Die Verknüpfung mehrerer Bedingungen mit <kbd>UND</kbd> oder <kbd>ODER</kbd> bedeutet nur, dass die jeweilige Bedingung mit den vorhergehenden Bedingungen verknüpft ist. Die Auswertung wird abgebrochen, sobald der Ausdruck <b>true</b> ergibt.</small>",
 			"enhanced":"erweiterte Einstellungen",
-            "startDelayTime":"Bei einem Wert von 0 wird die node nach einem Deploy oder Node-Red Start erst mit der nächsten eingehenden nachricht aktiviert und bis dahin auf keine Ereignise reagieren!"
+            "startDelayTime":"Bei einem Wert von 0 wird die Node nach einem Deploy oder Node-Red Start erst mit der nächsten eingehenden Nachricht aktiviert und bis dahin auf keine Ereignise reagieren!"
 		}
     },
     "errors": {
@@ -468,13 +489,15 @@
         "error-title": "interner Fehler",
         "error-init": "Fehler '__message__', wiederhole in __time__min",
         "warn-init": "Warnung '__message__', wiederhole in __time__min",
-        "config-missing": "Node ist nicht richtig konfiguriert!! Fehlende oder falsche positionsangaben!",
+        "config-missing": "Node ist nicht richtig konfiguriert!! Fehlende oder falsche Positionsangaben!",
         "config-missing-state": "Node ist nicht richtig konfiguriert!!",
+        "config-error": "Error in used configuration node: __error__",
         "unknownPropertyOperator": "Fehler, der verwendete Operator __propertyOp__=\"__propertyOpText__\" ist unbekannt!",
         "unknownCompareOperator": "Fehler, der verwendete vergleichs-Operator \"__operator__\" ist unbekannt! (Vergleich \"__opTypeA__.__opValueA__\" mit \"__opTypeB__.__opValueB__\")",
         "notEvaluableProperty":"Kann den Wert von __type__.__value__ nicht ermitteln",
         "notEvaluablePropertyAdd":"\"__err__\", kann den Wert von __type__.__value__ nicht ermitteln!",
         "notEvaluablePropertyUsedValue": "kann den Wert von __type__.__value__ nicht ermitteln, verwende \"__usedValue__\"!",
+        "notEvaluableCustomAngle":"Benutzerdefinierter Winkel mit Namen \"__value__\" wurde im Konfigurationsknoten nicht definiert!",
         "invalidParameter":"Der Parameter \"__param__\" hat ist ungültig \"__type__\" (nutze __newValue__)",
         "invalid-expr": "Ungültiger JSONata Austruck: __error__",
         "getPropertyData": "Fehler bei der Ermittlung der Bedingung: \"__message__\" Zeit wird nicht verwendet",
@@ -486,6 +509,7 @@
             "position": "Position",
             "latitude": "Breitengrad",
             "longitude": "Längengrad",
+            "height":"(opt) Beobachterhöhe",
             "angleType": "Winkel Typ",
             "timeZoneOffset": "Zeitzone",
             "name": "Name",
@@ -497,13 +521,20 @@
             "timeZoneDST": "Sommerzeit",
             "noDST": "keine Sommerzeit",
             "addDST1Hour": "Sommerzeit 1 Stunde hinzufügen",
-            "addDST2Hour": "Sommerzeit 2 Stunden hinzufügen"
+            "addDST2Hour": "Sommerzeit 2 Stunden hinzufügen",
+            "sunPositions": "Benutzerdefinierte Sonnenpositionen",
+            "predefAngles":  "vordefinierte Winkel",
+            "angle":         "Winkel",
+            "riseName":      "Name Aufgang",
+            "setName":       "Name Untergang",
+            "angleDec":      "Dezimalgrad"
         },
         "placeholder": {
-            "positionConfig": "wähle oder erstelle die Konfiguration",
+            "positionConfig": "Wähle oder erstelle die Konfiguration",
             "latitude": "51.025",
             "longitude": "-1.4",
             "angleType": "deg",
+            "height": "die Höhe des Beobachters (in Metern) in Bezug auf den Horizont",
             "timeZoneOffset": "0",
             "name": "Name",
             "stateDateFormat": "Format der Statusausgabe eines Datums. Standard ist toLocale​Date​String.",
@@ -511,13 +542,18 @@
         },
         "tips": {
             "config": "Starting from Version 2.0 the coordinates are not saved as credentials due to privacy reasons. So they no longer part of the regular flow and will not part of the export! To update from a previous version save and re-deploy is necessary.",
-            "sunPosControl": "Here you can specify the upper and lower limits for the solar radiation so that you can evaluate the sunshine on 4 sides of an object.",
-            "timeZoneOffset":"Änderungen am Format können einige zeit dauern, bis diese Auswirkung zeigen."
+            "timeZoneOffset":"Änderungen am Format können einige Zeit in Anspruch nehmen, bis sie wirksam werden.",
+            "sunPositions": "Hier können Sie Ihre eigenen Elevationswinkel für Sonnenpositionen definieren.",
+            "predefAngles": "Hier können Sie Winkelwerte in Dezimalgraden mit einem Namen angeben, der in verschiedenen Knoten verwendet werden kann. Zum Beispiel kann hier ein Azimutwinkel mit dem Namen N (für Nord) definiert werden. Für die Fensterposition im Knoten Jalousie wird nur die Seite des Fensters (N) angegeben."
         },
         "errors": {
             "latitude-missing": "Koordinate für den Breitengrad fehlt oder ist falsch!",
             "longitude-missing": "Koordinate für den Längengrad fehlt oder ist falsch!",
-            "coordinates-missing": "Koordinaten für den Breitengrad und Längengrad ist falsch!"
+            "coordinates-missing": "Koordinaten für den Breitengrad und Längengrad ist falsch!",
+            "height-wrong": "Beobachter höhe ist Falsch. Es sind nur zahlen oder leer erlaubt!",
+            "invalid-custom-suntime": "Ungültiger benutzerdefinierte Sonnenzeit __riseName__ oder __setName__ angegeben! Vielleicht ein Duplikat eines bestehenden Namens.",
+            "custom-angles":"Ungültiger benutzerdefinierter Winkel __name__! Der Name darf keine Sonderzeichen enthalten!",
+            "custom-angles-duplicate":"Ungültiger benutzerdefinierter Winkel __name__! Name existiert bereits, Duplikate sind nicht erlaubt!"
         }
     }
 }
\ No newline at end of file
diff --git a/nodes/locales/de/20-time-inject.json b/nodes/locales/de/20-time-inject.json
index 545c3ec2..09357221 100644
--- a/nodes/locales/de/20-time-inject.json
+++ b/nodes/locales/de/20-time-inject.json
@@ -36,8 +36,8 @@
             "timeAlt": "alternativer Zeitpunkt",
             "timeAltOffset": "offset des alternativen Zeitpunktes",
             "timeLimits":"Wählen Sie Tage und / oder Monate aus, für welche es gültig sein soll",
-            "days": "Tage auswählen, an denen die nachricht gesendet werden soll",
-            "months":"Monate auswählen, an denen die nachricht gesendet werden soll",
+            "days": "Tage auswählen, an denen die Nachricht gesendet werden soll",
+            "months":"Monate auswählen, an denen die Nachricht gesendet werden soll",
             "recalcTime": "Intervall in dem eine Neuberechnung des Zeitpunktes zum Senden der Nachricht stattfinden soll.",
             "once": "zusätzlich soll beim Start des Flows eine Nachricht (unabhängig von der Zeit) gesendet werden"
         },
diff --git a/nodes/locales/de/80-blind-control.json b/nodes/locales/de/80-blind-control.json
index 157e1c0a..8162eccb 100644
--- a/nodes/locales/de/80-blind-control.json
+++ b/nodes/locales/de/80-blind-control.json
@@ -30,7 +30,7 @@
 			"sunControlMinimizeOnly": "🕶️ nur im Modus Sonnenlicht minimieren",
 			"sunMinDelta": "Mindeständerung",
 			"sunTopic": "Topic 🌞/⛄",
-			"time": "Zeit",
+            "time": "Zeit",
 			"name": "name",
 			"oversteerValue": "Übersteuerung",
 			"oversteerThreshold": "Schwelle",
@@ -69,8 +69,8 @@
 			"blindSlatSun": "Lamellenposition, wenn Sonnensteuerung aktiv",
 			"sunControlMode": "wähle wie die Sonnensteuerung  arbeiten soll",
 			"overwriteExpire": "(opt) Dauer nasch der eine manuelle Einstellung (überschreiben) verfällt",
-			"sunFloorLength": "das Ausmaß, in dem direktes Sonnenlicht durch das Fenster in den Raum gelangen darf, definiert als Länge am Boden",
-			"sunMinDelta": "(opt) mindest Änderung der Behanghöhe",
+			"sunFloorLength": "Die maximale Länge des Sonnenlichts, das durch das Fenster in den Raum fallen kann, wird als Bodenlänge definiert.",
+			"sunMinDelta": "(opt) Mindeständerung der Behanghöhe",
 			"oversteerValue": "Wert zum Vergleich",
 			"oversteerThreshold": "Schwelle für den Vergleich",
 			"oversteerBlindPos": "Position wenn der Vergleich zutrifft",
@@ -87,16 +87,16 @@
 			"offset": "Zeit offset",
 			"level": "Behanghöhe",
 			"slat": "Lamellenposition",
-			"ruleImportance": "definiert eine wichtung der Regel gegenüber manueller Einstellung (überschreiben). Nur Überschreibungen mit gleicher oder höherer Wichtung können diese Regel übersteuern.",
-			"ruleTopic":"Erlaubt es die topic der ausgesendeten Nachricht speziell für die Regel angepasst werden. Wenn diese leer ist, wird die Standard topic verwendet.",
-			"resetOverwrite": "Wenn angehakt, wird eine manuelle Einstellung (überschreiben) zurückgesetzt, wenn diese Regel erstmalig aktif geht",
-			"sunTopic": "Erlaubt es die topic der ausgesendeten Nachricht anzupassen wenn die sonnensteuerung aktiv ist. Wenn diese leer ist, wird die Standard topic verwendet.",
-			"oversteerTopic":"Erlaubt es die topic der ausgesendeten Nachricht anzupassen wenn eine Übersteuerung aktiv ist. Wenn diese leer ist, wird die topic der Sonnensteuerung verwendet.",
+			"ruleImportance": "Definiere eine Priorisierung der Regeln im Vergleich zu manuellen Einstellungen (Überschreiben). Nur Überschreibungen mit gleicher oder höherer Gewichtung können diese Regel übersteuern.",
+			"ruleTopic":"Erlaubt es das Topic der ausgesendeten Nachricht speziell für die Regel angepasst werden. Wenn dieses leer ist, wird das Standard topic verwendet.",
+			"resetOverwrite": "Wenn ausgewählt, werden manuelle Einstellungen zurückgesetzt, sobald diese Regel zum ersten Mal aktiv ist.",
+			"sunTopic": "Erlaubt es das Topic der ausgesendeten Nachricht anzupassen wenn die Sonnensteuerung aktiv ist. Wenn dieses leer ist, wird das Standard topic verwendet.",
+			"oversteerTopic":"Erlaubt es das Topic der ausgesendeten Nachricht anzupassen wenn eine Übersteuerung aktiv ist. Wenn dieses leer ist, wird das Topic der Sonnensteuerung verwendet.",
 			"ruleTimeDays": "Wählen Sie Tage aus, an denen die Regel gültig sein soll",
 			"ruleTimeMonths": "Wählen Sie Monate aus, an denen die Regel gültig sein soll",
-			"autoTrigger": "automatisches triggern der Neuberechnung der Rollladenposition nach einer dynamischen Zeitspanne",
+			"autoTrigger": "automatisches Auslösen einer Neuberechnung der Rollladenposition nach einer bestimmten Zeitspanne.",
 			"startDelay": "0 - aus",
-			"startDelay2": "verzögert die Ausgabe auf dem ersten Ausgang um die angegebene Zeit. Auf 0 setzen zum abschalten.",
+			"startDelay2": "Verzögern Sie die Ausgabe am ersten Ausgang um die angegebene Zeit. Zum Ausschalten auf 0 setzen.",
 			"start":"tt.mm",
 			"end":"tt.mm",
 			"addId": "zusätzliche ID"
diff --git a/nodes/locales/en-US/10-position-config.json b/nodes/locales/en-US/10-position-config.json
index 197ee8e2..88aa3241 100644
--- a/nodes/locales/en-US/10-position-config.json
+++ b/nodes/locales/en-US/10-position-config.json
@@ -1,45 +1,47 @@
 {
     "common": {
         "label": {
-            "positionConfig": "configuration",
-            "infoText":"The configuration must be created and deployed for the settings page to work properly.",
-            "loadingInfo":"loading data...",
-            "binary": "binary",
-            "json": "json",
-            "jsonata": "json expr.",
-            "timestamp":"timestamp",
-            "suntimeObj": "{next suntime}",
-            "blank": "\"\"",
-            "nothing": "nothing",
-            "checkall": "stopping after first match (if)",
-            "stopfirst": "checking all rules",
-            "nextOccurrence": "next occurrence",
-            "on": "on",
-            "validForDays": "valid days",
-            "validForMonths": "valid months",
-            "validForDates": "validForDates (year will be ignored)",
-            "specialLimits": "limit",
-            "onlyEvenDays":"only even days",
-            "onlyOddDays":"only odd days",
-            "onlyEvenWeeks":"only even weeks",
-            "onlyOddWeeks":"only odd weeks",
-            "between":"between",
-            "and": "and",
-            "or": "or",
-            "enabled": "enabled",
-            "disabled": "disabled",
-            "cancel":"Cancel",
-            "ok":"Ok",
-            "randNum":"random till",
-            "randNumCachedDay":"random (daily) till",
-            "randNumCachedWeek":"random (weekly) till",
-            "inputPort": "input message",
-            "outputPort": "output message"
+          "positionConfig": "configuration",
+          "infoText": "The configuration must be created and deployed for the settings page to work properly.",
+          "loadingInfo": "loading data...",
+          "binary": "binary",
+          "json": "json",
+          "jsonata": "json expr.",
+          "timestamp": "timestamp",
+          "suntimeObj": "{next suntime}",
+          "blank": "\"\"",
+          "nothing": "nothing",
+          "checkall": "checking all rules",
+          "stopfirst": "stopping after first match (if)",
+          "nextOccurrence": "next occurrence",
+          "on": "on",
+          "validForDays": "valid days",
+          "validForMonths": "valid months",
+          "validForDates": "validForDates (year will be ignored)",
+          "specialLimits": "limit",
+          "onlyEvenDays": "only even days",
+          "onlyOddDays": "only odd days",
+          "onlyEvenWeeks": "only even weeks",
+          "onlyOddWeeks": "only odd weeks",
+          "between": "between",
+          "and": "and",
+          "or": "or",
+          "enabled": "enabled",
+          "disabled": "disabled",
+          "cancel": "Cancel",
+          "ok": "Ok",
+          "randNum": "random till",
+          "randNumCachedDay": "random (daily) till",
+          "randNumCachedWeek": "random (weekly) till",
+          "inputPort": "input message",
+          "outputPort": "output message"
         },
         "types": {
             "unlimited":"no limitation",
             "undefined":"not used",
             "delete":"delete",
+            "undefinedTimeFrom":"from midnight or previous rule",
+            "undefinedTimeUntil":"until midnight or the next rule",
             "msgInput": "input message",
             "datespecific":"timestamp enhanced",
             "nodeId":"node name",
@@ -53,6 +55,8 @@
             "dayofweek":"day of week",
             "timesun":"sun time",
             "timesunnow": "next sun time",
+            "timesuncustom":"sun time (custom)",
+            "timesuncustomnamed":"sun time __value__",
             "timemoon":"moon time",
             "randomNumber":"random number (continuously new)",
             "randmNumCachedDay":"random number (once a day)",
@@ -62,22 +66,14 @@
             "suninsky":"sun in the sky (percent)",
             "sunAzimuth":"Azimuth of sun",
             "sunElevation":"Elevation of sun",
-            "sunAzimuthRad":"Azimuth of sun (rad)",
-            "sunElevationRad":"Elevation of sun (rad)",
             "numAzimuth":"Azimuth angle",
             "numAltitude":"Elevation angle",
-            "numAzimuthRad":"Azimuth angle (rad)",
-            "numAltitudeRad":"Elevation angle (rad)",
+            "numAnglePreDef":"custom angle from config node",
             "SunTimeByAzimuth":"time by azimuth",
-            "SunTimeByAzimuthRad":"time by azimuth (rad)",
             "SunTimeByElevationObj":"time by elevation (set or rise)",
-            "SunTimeByElevationObjRad":"time by elevation (set or rise in rad)",
             "SunTimeByElevationNext":"next time by elevation (set or rise)",
-            "SunTimeByElevationNextRad":"next time by elevation (set or rise in rad)",
             "SunTimeByElevationRise":"next rise time by elevation",
-            "SunTimeByElevationRiseRad":"next rise time by elevation (rad)",
             "SunTimeByElevationSet":"next set time by elevation",
-            "SunTimeByElevationSetRad":"next set time by elevation (rad)",
             "suntime":"sun time",
             "suntimes":"sun times",
             "mooncalc":"moon calculation",
@@ -371,8 +367,14 @@
             "outDated": "✎ Please edit this rule.",
             "isInValid": "⚠️ Rule is invalid and needs to be changed!!",
             "ruleIsOutdated": "⚠️ This rule is invalid and has to be adjusted because it no longer works!",
-            "ruleTimeMin": "at the earliest (min)",
-            "ruleTimeMax": "no later than (max)",
+            "ruleTimeMin_start": "from at the earliest (min)",
+            "ruleTimeMax_start": "from no later than (max)",
+            "ruleTimeMin_end": "until at the earliest (min)",
+            "ruleTimeMax_end": "until no later than (max)",
+            "ruleTimeMinOffset_start": "earliest (min) offset",
+			"ruleTimeMaxOffset_start": "latest (max) offset",
+            "ruleTimeMinOffset_end": "earliest (min) offset",
+			"ruleTimeMaxOffset_end": "latest (max) offset",
             "ruleTimeLimit": "limited",
 			"ruleTimeLimitStart": "only from",
 			"ruleTimeLimitEnd": "to",
@@ -394,13 +396,25 @@
 			"ruleLevelMax": "⭱️❗ maximum (oversteer)",
             "ruleSlatOversteer": "Slat (oversteer)",
             "ruleTopicOversteer": "Topic (oversteer)",
+			"ruleTimeStart": "↧ from",
+			"ruleTimeEnd": "↥ until",
+            "ruleTimeOffset": "time offset",
             "ruleOff": "✋ send nothing",
 			"ruleLevelND": "use default level (e.g. sun control)",
+            "ruleState": "enables or disables the rule",
+            "ruleExec":"order of evaluation",
+            "ruleExecAuto": "auto - rules only with '↧ from', last matching; all other first matching",
+			"ruleExecFirst": "⭳ first valid rule (evaluation first to last [1])",
+			"ruleExecLast": "⭱️ last valid rule (evaluation last to first [2], only if no first match)",
+            "ruleExecShort": [
+                "",
+                "¹⭳",
+                "²⭱️"
+            ],
+            "ruleInValidElement":"invalid",
+            "ruleInValidText":"invalid Element",
 			"editRule": "edit the rule",
 			"duplicateRule": "duplicate the rule",
-            "ruleState": "enables or disables the rule",
-			"ruleTimeFrom": "↧ from",
-			"ruleTimeUntil": "↥ until",
 			"btnAdd": "add",
 			"btnSort": "sort",
 			"btnClear": "clear",
@@ -485,23 +499,27 @@
         "warn-init": "warning '__message__', retry in __time__min",
         "config-missing": "Node not properly configured!! Configuration is missing or wrong (no valid configuration is selected)!",
         "config-missing-state": "No valid configuration is selected!",
+        "config-error": "Error in used configuration node: __error__",
         "unknownPropertyOperator": "error, the used property operator __propertyOp__=\"__propertyOpText__\" is unknown!",
         "unknownCompareOperator": "error, the used compare operator \"__operator__\" is unknown! (\"__opTypeA__.__opValueA__\" compare to \"__opTypeB__.__opValueB__\")",
         "notEvaluableProperty":"Error: could not evaluate __type__.__value__!",
         "notEvaluablePropertyAdd":"Error \"__err__\", could not evaluate __type__.__value__",
         "notEvaluablePropertyUsedValue": "could not evaluate __type__.__value__, using \"__usedValue__\"!",
+        "notEvaluableCustomAngle":"Custom Angle with name \"__value__\" is not defined in the configuration node!",
         "invalidParameter":"Parameter \"__param__\" is invalid \"__type__\" (using __newValue__)",
         "invalid-expr": "Invalid JSONata expression: __error__",
         "getPropertyData": "error getting condition data: \"__message__\" skipping time",
         "error-time": "Error get time: __message__",
-        "usingTempValue": "Could not evaluate __type__.__value__ and using stored value \"__usedValue__\"!"
+        "usingTempValue": "Could not evaluate __type__.__value__ and using stored value \"__usedValue__\"!",
+        "latitude-wrong":"Given Latitude __latitude__ is wrong. Using default from config!",
+        "longitude-wrong":"Given Longitude __longitude__ is wrong. Using default from config!"
     },
     "position-config": {
         "label": {
             "position": "Position",
             "latitude": "Latitude",
             "longitude": "Longitude",
-            "height":"observer height",
+            "height":"(opt) observer height",
             "angleType": "angle type",
             "timeZoneOffset": "TZ Offset",
             "name": "Name",
@@ -513,14 +531,19 @@
             "timeZoneDST": "DST",
             "noDST": "No DST",
             "addDST1Hour": "DST add 1 Hour",
-            "addDST2Hour": "DST add 2 Hours"
+            "addDST2Hour": "DST add 2 Hours",
+            "sunPositions": "Custom Sun Positions",
+            "predefAngles":  "defined angles",
+            "angle":         "Angle",
+            "riseName":      "Rise Name",
+            "setName":       "Set Name",
+            "angleDec":      "Decimal degree"
         },
         "placeholder": {
             "positionConfig":"select or create generic configuration",
             "latitude": "51.025",
             "longitude": "-1.4",
             "height": "the observer height (in meters) relative to the horizon",
-            "angleType": "deg",
             "timeZoneOffset": "0",
             "name": "Name",
             "stateDateFormat": "Format of the state output of a date only. If empty default toLocale​Date​String will be used.",
@@ -528,12 +551,18 @@
         },
         "tips": {
             "config": "Starting from Version 2.0 the coordinates are not saved as credentials due to privacy reasons. So they no longer part of the regular flow and will not part of the export! To update from a previous version save and re-deploy is necessary.",
-            "timeZoneOffset": "If for the timezone OS Standard is choosen the standard timezone including daylight saving switch is used. If is not chosen this setting, but a special time zone then no change of the daylightsaving is done! Formatchanges to time could taken time until it will get any effect."
+            "timeZoneOffset": "If for the timezone OS Standard is choosen the standard timezone including daylight saving switch is used. If is not chosen this setting, but a special time zone then no change of the daylightsaving is done! Formatchanges to time could taken time until it will get any effect.",
+            "sunPositions": "Here you can define your own elevation angles for sun positions.",
+            "predefAngles": "Here you can specify angle values in decimal degrees with a name, which can be used in different nodes. For example, an azimuth angle with the name N (for north) can be defined here. For the window position in the blind node, only the side of the window (N) is specified."
         },
         "errors": {
             "latitude-missing": "Latitude is missing or wrong!",
             "longitude-missing": "Longitude is missing or wrong!",
-            "coordinates-missing": "Coordinates Latitude and Longitude is missing in the configuration node!"
+            "coordinates-missing": "Coordinates Latitude and Longitude is missing in the configuration node!",
+            "height-wrong": "Observer height has wrong value in the configuration node! Must be a number or empty!",
+            "invalid-custom-suntime": "Invalid custom suntime __riseName__ or __setName__ given! Maybe duplicate to existing name.",
+            "custom-angles":"Invalid user-defined angle __name__! The name must not contain special characters!",
+            "custom-angles-duplicate":"Invalid custom angle __name__! Name already exists, duplicates are not allowed!"
         }
     }
 }
\ No newline at end of file
diff --git a/nodes/locales/en-US/61-time-span.json b/nodes/locales/en-US/61-time-span.json
index 57ad5061..7353e712 100644
--- a/nodes/locales/en-US/61-time-span.json
+++ b/nodes/locales/en-US/61-time-span.json
@@ -15,7 +15,8 @@
             "result1Value": "value",
             "result1TSFormat": "output format",
             "result1Format": "output format",
-            "result1Offset": "Offset"
+            "result1Offset": "Offset",
+            "resultContainer": "result"
         },
         "typeLabel":{
             "timespan": "timespan between Inputs",
diff --git a/nodes/locales/en-US/80-blind-control.json b/nodes/locales/en-US/80-blind-control.json
index 22a60cf7..df5cda8c 100644
--- a/nodes/locales/en-US/80-blind-control.json
+++ b/nodes/locales/en-US/80-blind-control.json
@@ -6,8 +6,14 @@
 			"output2": "state object",
 			"windowTop": "window top",
 			"windowBottom": "window bottom",
+			"windowSetMode":"setting by",
+			"windowSetModeAzimuthStartEnd":"Azimuth Start End",
+			"windowSetModeOrientation":"Orientation",
 			"windowAzimuthStart": "start",
 			"windowAzimuthEnd": "end",
+			"windowOrientation":"Orientation",
+			"windowOffsetN":"negative offset -",
+			"windowOffsetP":"positive offset +",
 			"blindIncrement": "Increment",
 			"blindOpenPos": "open position (max)",
 			"blindClosedPos": "closed position (min)",
@@ -30,7 +36,6 @@
 			"sunFloorLength": "length on the floor",
 			"sunMinDelta": "min delta",
 			"sunTopic": "Topic 🌞/⛄",
-			"time": "time",
 			"name": "name",
 			"oversteerValue": "oversteer",
 			"oversteerThreshold": "Threshold",
@@ -40,9 +45,6 @@
 			"oversteerSunInWindow": "only when sun shines in the window",
 			"smoothTime": "smoothTime",
 			"showEnhSettings": "Enhanced settings",
-			"offset": "time offset",
-			"offset-timeMin": "earliest (min) offset",
-			"offset-timeMax": "latest (max) offset",
 			"dialogtitle": "Edit Rule",
 			"autoTrigger": "auto trigger",
 			"autoTrigger2": "dynamic, but at least every",
@@ -57,6 +59,9 @@
 			"windowBottom": "bottom of the window",
 			"windowAzimuthStart": "window left to geographical north",
 			"windowAzimuthEnd": "window right to geographical north",
+			"windowOrientation":"the bearing representing the perpendicular of the window to geographical north",
+			"windowOffsetN":"90 - (optional) anti-clockwise offset from orientation for determination of whether the sun is coming through window.",
+			"windowOffsetP":"90 - (optional) clockwise offset from orientation for determination of whether the sun is coming through window",
 			"blindIncrement": "0.01 or 1",
 			"blindOpenPos": "100",
 			"blindClosedPos": "0",
diff --git a/nodes/locales/en-US/81-clock-timer.json b/nodes/locales/en-US/81-clock-timer.json
index fe2aba23..c31ee6d5 100644
--- a/nodes/locales/en-US/81-clock-timer.json
+++ b/nodes/locales/en-US/81-clock-timer.json
@@ -8,12 +8,9 @@
 			"payloadDefaultOffset": "Offset",
 			"payloadDefaultFormat": "Format",
 			"overwriteExpire": "expire",
-			"time": "time",
 			"name": "name",
 			"showEnhSettings": "Enhanced settings",
 			"offset": "time offset",
-			"offset-timeMin": "earliest (min) offset",
-			"offset-timeMax": "latest (max) offset",
 			"dialogtitle": "Edit Rule",
 			"autoTrigger": "auto trigger",
 			"autoTrigger2": "dynamic, but at least every",
diff --git a/nodes/static/htmlglobal.js b/nodes/static/htmlglobal.js
index c207f4cd..c0b7ba27 100644
--- a/nodes/static/htmlglobal.js
+++ b/nodes/static/htmlglobal.js
@@ -22,9 +22,12 @@
  */
 
 'use strict';
+
 /** --- Type Defs ---
- * @typedef {import('./../types/typedefs.js').runtimeRED} runtimeRED
+ * @typedef {import('jquery')} $
  */
+// @typedef {import('jqueryui')}
+//  * @typedef {import('./../types/typedefs.js')}
 /************************************************************************/
 /**
  * get selection firlds
@@ -194,9 +197,10 @@ function checkDeprecatedValues(type, value) {
 /**
  * get types for typeInputs
  * @param {*} node - node representation for access to i18N function (node._())
+ * @param {function} getConfig - function to get configuration
  * @returns {Object} object of types
  */
-function getTypes(node) { // eslint-disable-line no-unused-vars
+function getTypes(node, getConfig) { // eslint-disable-line no-unused-vars
     return {
         Unlimited: {
             value: 'none',
@@ -266,7 +270,7 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             icon: 'icons/node-red-contrib-sun-position/inputTypeNumberPercent.svg',
             hasValue: true,
             // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number() // ^[1-9]\d*(\.\d+)?\s?%?$
+            validate: RED.validators.number() // ^[1-9]\d*(\.\d+)?\s?%?$
         },
         nodeId: {
             value: 'nodeId',
@@ -358,7 +362,7 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             hasValue: true,
             // @ts-ignore
             // eslint-disable-next-line no-useless-escape
-            validate: /** @type {runtimeRED} */ RED.validators.regex(/^(?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?([\/|](?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?)?$/)()
+            validate: RED.validators.regex(/^(?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?([\/|](?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?)?$/)
         },
         randmNumCachedDay: {
             value: 'randmNumCachedDay',
@@ -367,7 +371,7 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             hasValue: true,
             // @ts-ignore
             // eslint-disable-next-line no-useless-escape
-            validate: /** @type {runtimeRED} */ RED.validators.regex(/^(?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?([\/|](?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?)?$/)()
+            validate: RED.validators.regex(/^(?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?([\/|](?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?)?$/)
         },
         randmNumCachedWeek: {
             value: 'randmNumCachedWeek',
@@ -376,7 +380,7 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             hasValue: true,
             // @ts-ignore
             // eslint-disable-next-line no-useless-escape
-            validate: /** @type {runtimeRED} */ RED.validators.regex(/^(?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?([\/|](?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?)?$/)()
+            validate: RED.validators.regex(/^(?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?([\/|](?:[1-9]|-0\.|0\.|-)\d*(?:\.\d+)?)?$/)
         },
         TimeSun: {
             value: 'pdsTime',
@@ -456,6 +460,28 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeNow.svg',
             hasValue: false
         },
+        TimeSunCustom: {
+            value: 'pdsTimeCustom',
+            label: node._('node-red-contrib-sun-position/position-config:common.types.timesuncustom'),
+            icon: 'icons/node-red-contrib-sun-position/inputTypeSunClockCustom.svg',
+            hasValue: true,
+            // @ts-ignore
+            validate: RED.validators.regex(/^(?![0-9])[a-zA-Z0-9$_]+$/),
+            autoComplete(val, done) {
+                if (getConfig) {
+                    // @ts-ignore
+                    const url = 'sun-position/data?' + jQuery.param({
+                        nodeId:         node.id,
+                        kind:           'autoComplete',
+                        config:         getConfig(),
+                        type:           'pdsTimeCustom',
+                        value:          val
+                    });
+                    // @ts-ignore
+                    $.getJSON(url, done);
+                }
+            }
+        },
         TimeMoon: {
             value: 'pdmTime',
             label: node._('node-red-contrib-sun-position/position-config:common.types.timemoon','moon time'),
@@ -488,18 +514,29 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             validate(v) {
                 const n = parseFloat(v);
                 // @ts-ignore
-                return (/** @type {runtimeRED} */ RED.validators.number()(v) && (n >= -360) && (n <= 720));
+                return ( RED.validators.number()(v) && (n >= -360) && (n <= 720));
             }
         },
-        numAzimuthRad: {
-            value: 'numAzimuthRad',
-            label: node._('node-red-contrib-sun-position/position-config:common.types.numAzimuthRad'),
-            icon: 'icons/node-red-contrib-sun-position/inputTypeSunAzimuthRad.svg',
+        numAnglePreDef: {
+            value: 'numAnglePreDef',
+            label: node._('node-red-contrib-sun-position/position-config:common.types.numAnglePreDef'),
+            icon: 'icons/node-red-contrib-sun-position/inputTypeSunAzimuthCfg.svg',
             hasValue: true,
-            validate(v) {
-                const n = parseFloat(v);
-                // @ts-ignore
-                return (/** @type {runtimeRED} */ RED.validators.number()(v) && (n > -6.3) && (n < 12.6));
+            // @ts-ignore
+            validate: RED.validators.regex(/^[0-9a-zA-Z_\s]+$/),
+            autoComplete(val, done) {
+                if (getConfig) {
+                    // @ts-ignore
+                    const url = 'sun-position/data?' + jQuery.param({
+                        nodeId:         node.id,
+                        kind:           'autoComplete',
+                        config:         getConfig(),
+                        type:           'numAnglePreDef',
+                        value:          val
+                    });
+                    // @ts-ignore
+                    $.getJSON(url, done);
+                }
             }
         },
         numAltitude: {
@@ -510,18 +547,7 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             validate(v) {
                 const n = parseFloat(v);
                 // @ts-ignore
-                return (/** @type {runtimeRED} */ RED.validators.number()(v) && (n >= -90) && (n <= 90));
-            }
-        },
-        numAltitudeRad: {
-            value: 'numAltitudeRad',
-            label: node._('node-red-contrib-sun-position/position-config:common.types.numAltitudeRad'),
-            icon: 'icons/node-red-contrib-sun-position/inputTypeSunElevationRad.svg',
-            hasValue: true,
-            validate(v) {
-                const n = parseFloat(v);
-                // @ts-ignore
-                return (/** @type {runtimeRED} */ RED.validators.number()(v) && (n > -1.56) && (n < 1.56));
+                return ( RED.validators.number()(v) && (n >= -90) && (n <= 90));
             }
         },
         SunAzimuth: {
@@ -530,39 +556,19 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             icon: 'icons/node-red-contrib-sun-position/inputTypeSunAzimuth.svg',
             hasValue: false
         },
-        SunAzimuthRad: {
-            value: 'pdsCalcAzimuthRad',
-            label: node._('node-red-contrib-sun-position/position-config:common.types.sunAzimuthRad','Azimuth'),
-            icon: 'icons/node-red-contrib-sun-position/inputTypeSunAzimuthRad.svg',
-            hasValue: false
-        },
         SunElevation: {
             value: 'pdsCalcElevation',
             label: node._('node-red-contrib-sun-position/position-config:common.types.sunElevation'),
             icon: 'icons/node-red-contrib-sun-position/inputTypeSunElevation.svg',
             hasValue: false
         },
-        SunElevationRad: {
-            value: 'pdsCalcElevationRad',
-            label: node._('node-red-contrib-sun-position/position-config:common.types.sunElevationRad'),
-            icon: 'icons/node-red-contrib-sun-position/inputTypeSunElevationRad.svg',
-            hasValue: false
-        },
         SunTimeByAzimuth: {
             value: 'pdsTimeByAzimuth',
             label: node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByAzimuth','Time by Azimuth'),
             icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeAzimuth.svg',
             hasValue: true,
             // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
-        },
-        SunTimeByAzimuthRad: {
-            value: 'pdsTimeByAzimuthRad',
-            label: node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByAzimuthRad','Time by Azimuth Rad'),
-            icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeAzimuthRad.svg',
-            hasValue: true,
-            // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
+            validate: RED.validators.number()
         },
         SunTimeByElevationObj: {
             value: 'pdsTimeByElevation',
@@ -570,15 +576,7 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeElevation.svg',
             hasValue: true,
             // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
-        },
-        SunTimeByElevationObjRad: {
-            value: 'pdsTimeByElevationRad',
-            label: node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationObjRad','next Time by Elevation Rad'),
-            icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeElevationRad.svg',
-            hasValue: true,
-            // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
+            validate: RED.validators.number()
         },
         SunTimeByElevationNext: {
             value: 'pdsTimeByElevationNext',
@@ -586,15 +584,7 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeElevation.svg',
             hasValue: true,
             // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
-        },
-        SunTimeByElevationNextRad: {
-            value: 'pdsTimeByElevationNextRad',
-            label: node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationNextRad','next Time by Elevation Rad'),
-            icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeElevationRad.svg',
-            hasValue: true,
-            // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
+            validate: RED.validators.number()
         },
         SunTimeByElevationRise: {
             value: 'pdsTimeByElevationRise',
@@ -602,15 +592,7 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeElevationRise.svg',
             hasValue: true,
             // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
-        },
-        SunTimeByElevationRiseRad: {
-            value: 'pdsTimeByElevationRiseRad',
-            label: node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationRiseRad','next rise Time by Elevation Rad'),
-            icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeElevationRiseRad.svg',
-            hasValue: true,
-            // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
+            validate: RED.validators.number()
         },
         SunTimeByElevationSet: {
             value: 'pdsTimeByElevationSet',
@@ -618,15 +600,7 @@ function getTypes(node) { // eslint-disable-line no-unused-vars
             icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeElevationSet.svg',
             hasValue: true,
             // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
-        },
-        SunTimeByElevationSetRad: {
-            value: 'pdsTimeByElevationSetRad',
-            label: node._('node-red-contrib-sun-position/position-config:common.types.SunTimeByElevationSetRad','next set Time by Elevation Rad'),
-            icon: 'icons/node-red-contrib-sun-position/inputTypeSunTimeElevationSetRad.svg',
-            hasValue: true,
-            // @ts-ignore
-            validate: /** @type {runtimeRED} */ RED.validators.number()
+            validate: RED.validators.number()
         },
         isDST: {
             value: 'pdbIsDST',
@@ -874,13 +848,14 @@ function initializeValue(data, id, newVal) { // eslint-disable-line no-unused-va
 
 /**
  * initializes an inputbos with autocomplete
- * @param {object} inputBox - jsQuery selector of the input box
+ * @param {JQuery<HTMLElement>} $inputBox - jsQuery selector of the input box
  * @param {string} dataListID - id of the datalist from getAutocompleteFormats()
  */
-function autocomplete(inputBox, dataListID) { // eslint-disable-line no-unused-vars
+function autocomplete($inputBox, dataListID) { // eslint-disable-line no-unused-vars
     const dataList = getAutocompleteFormats()[dataListID];
     // don't navigate away from the field on tab when selecting an item
-    inputBox.on('keydown', function (event) {
+
+    $inputBox.on('keydown', function (event) {
         // @ts-ignore
         if (event.keyCode === $.ui.keyCode.TAB && $(this).autocomplete('instance') && $(this).autocomplete('instance').menu.active) {
             event.preventDefault();
@@ -888,7 +863,8 @@ function autocomplete(inputBox, dataListID) { // eslint-disable-line no-unused-v
     }).autocomplete({
         minLength: 0,
         source(request, response) {
-            if (inputBox.getCursorPosition() < request.term.length) {
+            // @ts-ignore
+            if ($inputBox.getCursorPosition() < request.term.length) {
                 return;
             }
 
@@ -902,6 +878,7 @@ function autocomplete(inputBox, dataListID) { // eslint-disable-line no-unused-v
             return false;
         },
         select(event, ui) {
+            // @ts-ignore
             const terms = this.value.split(/\W+/);
             // remove the current input
             terms.pop();
@@ -909,6 +886,7 @@ function autocomplete(inputBox, dataListID) { // eslint-disable-line no-unused-v
             terms.push(ui.item.value);
             // add placeholder to get the comma-and-space at the end
             terms.push('');
+            // @ts-ignore
             this.value = terms.join(' ');
             return false;
         }
@@ -918,7 +896,7 @@ function autocomplete(inputBox, dataListID) { // eslint-disable-line no-unused-v
 /**
  * append options to a select field
  * @param {*} node - node representation for access to i18N function (node._())
- * @param {object} parent - jQuery selector of the parent element (<select> - field)
+ * @param {JQuery<HTMLElement>} parent - jQuery selector of the parent element (<select> - field)
  * @param {string} elementName - name of the element from getSelectFields()
  * @param {Function} [filter] - function for filter the elements
  */
@@ -976,12 +954,10 @@ function appendOptions(node, parent, elementName, filter) { // eslint-disable-li
  * setup a typedInput for node-red
  * @param {*} node - node representation for access to i18N function (node._())
  * @param {tiData} data - data of the typed input
- * @returns {object} jQuery selector of the typeInput field - ideal for chaining
+ * @returns {JQuery<HTMLElement>} jQuery selector of the typeInput field - ideal for chaining
  */
 function setupTInput(node, data) { // eslint-disable-line no-unused-vars
-    // @ts-ignore
     const $inputField = $('#node-input-' + data.valueProp);
-    // @ts-ignore
     const $typeField = $('#node-input-' + data.typeProp);
     let type='';
     if (typeof node[data.typeProp] === 'undefined' || node[data.typeProp] === null) {
@@ -994,6 +970,10 @@ function setupTInput(node, data) { // eslint-disable-line no-unused-vars
         type = node[data.typeProp];
         $typeField.val(type);
     }
+    if (type.endsWith('Rad')) {
+        // deprecated Radiant types
+        type = type.replace('Rad','');
+    }
     // @ts-ignore
     if (Array.isArray(data.types) && !data.types.find(el => (el === type || el.value === type))) {
         console.error(`unknown typeInput type: ${data.typeProp} = '${type}', using default '${data.defaultType}' allowed types=`,data.types); // eslint-disable-line no-console
@@ -1079,8 +1059,8 @@ function initCheckboxesBlock(element, val) { // eslint-disable-line no-unused-va
 /**
  * initializes a combobox (combination of input and select box)
  * @param {*} node - node representation for access to i18N function (node._())
- * @param {object} $inputSelect - jQuery selector of the select element
- * @param {object} $inputBox - jQuery selector of the input element
+ * @param {JQuery<HTMLElement>} $inputSelect - jQuery selector of the select element
+ * @param {JQuery<HTMLElement>} $inputBox - jQuery selector of the input element
  * @param {string} dataListID - id of the datalist from getAutocompleteFormats()
  * @param {string} optionElementName - name of the element from getSelectFields()
  * @param {string} value - value of the input/select field
@@ -1106,7 +1086,7 @@ function initCombobox(node, $inputSelect, $inputBox, dataListID, optionElementNa
             const width = (205 + baseWidth);
             $inputBox.css({ width: 'calc(100% - ' + width + 'px)' });
             $inputBox.show();
-            if (!isNaN($inputBox.val())) {
+            if (!isNaN(Number($inputBox.val()))) {
                 $inputBox.val(node._('node-red-contrib-sun-position/position-config:common.timeFormat.' + timeFormat));
             }
         } else {
@@ -1123,12 +1103,12 @@ function initCombobox(node, $inputSelect, $inputBox, dataListID, optionElementNa
 
 /**
  * add a label to a html element
- * @param {object} parent - element (row) to append the label
+ * @param {JQuery<HTMLElement>} parent - element (row) to append the label
  * @param {string} forEl - name of the element to what the label is
  * @param {string} [symb] - class name of the symbol e.g. 'fa fa-clock'
  * @param {string} [text] - text of the label
  * @param {string} [width] - width of the label
- * @returns {object} jQuery selector of the new label
+ * @returns {JQuery<HTMLElement>} jQuery selector of the new label
  */
 function addLabel(parent, forEl, symb, text, width) { // eslint-disable-line no-unused-vars
     // @ts-ignore
@@ -1178,7 +1158,7 @@ function getMultiselectText(val, length, types) { // eslint-disable-line no-unus
 /**
  * set the checkboxes in a multiselect combo box to a value
  * @param {string} value - value of the array
- * @param {object} field - parent jquery selector element
+ * @param {JQuery<HTMLElement>} field - parent jquery selector element
  * @param {Array.<multiselectTypes>} types - array of types
  */
 function setMultiselect(value, field, types) { // eslint-disable-line no-unused-vars
@@ -1198,11 +1178,11 @@ function setMultiselect(value, field, types) { // eslint-disable-line no-unused-
 /**
  * adds a multiselect combo box to the form
  * @param {*} node - Node Red Source Node
- * @param {object} parent - parent jQuery selector to add multiselect
+ * @param {JQuery<HTMLElement>} parent - parent jQuery selector to add multiselect
  * @param {string} elementName - Name of the element in the node, e.g. 'operatorTypes'
  * @param {string} i18N - i18N element name, e.g. 'time-comp.operatorTypes'
  * @param {string} id - element id, e.g. 'node-input-rule-operatorType-1'
- * @returns {object} jQuery selector of the multiselect
+ * @returns {JQuery<HTMLElement>} jQuery selector of the multiselect
  */
 function multiselect(node, parent, elementName, i18N, id) { // eslint-disable-line no-unused-vars
     const types = getSelectFields()[elementName + 'Short'];
@@ -1396,7 +1376,7 @@ function bdDateToTime(d, add) { // eslint-disable-line no-unused-vars
 
 /**
  * get the value for the day checkbox array
- * @param {object} value - the checkbox array
+ * @param {JQuery<HTMLElement>} value - the checkbox array
  * * @param {number} max - the maximum count of elements
  * @returns {string} the value of the checkboxes
  */
diff --git a/nodes/types/10-position-config.d.ts b/nodes/types/10-position-config.d.ts
new file mode 100644
index 00000000..70a7a352
--- /dev/null
+++ b/nodes/types/10-position-config.d.ts
@@ -0,0 +1,557 @@
+declare function _exports(RED: runtimeRED): void;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type ITimeObject = import("./lib/dateTimeHelper").ITimeObject;
+/**
+ * --- Type Defs ---
+ */
+export type ILimitationsObj = import("./lib/dateTimeHelper").ILimitationsObj;
+/**
+ * --- Type Defs ---
+ */
+export type ISunTimeDef = any;
+/**
+ * --- Type Defs ---
+ */
+export type ISunTimeSingle = any;
+/**
+ * --- Type Defs ---
+ */
+export type ISunTimeList = any;
+/**
+ * --- Type Defs ---
+ */
+export type ISunPosition = any;
+/**
+ * --- Type Defs ---
+ */
+export type IMoonPosition = any;
+/**
+ * --- Type Defs ---
+ */
+export type IMoonIllumination = any;
+/**
+ * --- Type Defs ---
+ */
+export type IMoonData = any;
+/**
+ * --- Type Defs ---
+ */
+export type IMoonTimes = any;
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type IPositionConfigNode = {
+    valid: boolean;
+    latitude: number;
+    longitude: number;
+    angleType: ('deg' | 'rad');
+    tzOffset: number;
+    tzDST: number;
+    contextStore: string;
+    cache: object;
+    /**
+     * register a node as child
+     */
+    register: FktRegister;
+    /**
+     * remove a previous registered node as child
+     */
+    deregister: FktDeregister;
+    /**
+     * checks the node configuration
+     */
+    checkNode: FktCheckNode;
+    /**
+     * Formate a Date Object to a Date and Time String
+     */
+    toDateTimeString: FktFormatDate;
+    /**
+     * Formate a Date Object to a Time String
+     */
+    toTimeString: FktFormatDate;
+    /**
+     * Formate a Date Object to a Date String
+     */
+    toDateString: FktFormatDate;
+    /**
+     * get list of custom angles
+     */
+    getCustomAngles: FktGetCustomAngles;
+    /**
+     * get list of all suntimes including custom ones
+     */
+    getSunTimesList: FktGetSunTimesList;
+    /**
+     * get a float value from a type input in Node-Red
+     */
+    getFloatProp: FktGetFloatProp;
+    /**
+     * get an formated date prepared for output
+     */
+    formatOutDate: FktFormatOutDate;
+    /**
+     * get the time Data prepared for output
+     */
+    getOutDataProp: FktGetOutDataProp;
+    /**
+     * Creates a out object, based on input data
+     */
+    setMessageProp: FktSetMessageProp;
+    /**
+     * get the time Data from a typed input
+     */
+    getTimeProp: FktGetTimeProp;
+    /**
+     * get a prepared JSONATA Expression
+     */
+    getJSONataExpression: FktGetJSONataExpression;
+    /**
+     * get a property value from a type input in Node-Red
+     */
+    getPropValue: FktGetPropValue;
+    /**
+     * compared two property's
+     */
+    comparePropValue: FktComparePropValue;
+    getSunCalc: FktGetSunCalc;
+    /**
+     * ... obviously there are more ...
+     */
+    getMoonCalc: FktGetMoonCalc;
+};
+/**
+ * This callback is displayed as a global member.
+ */
+export type IValuePropertyTypeCallback = (result: any, data: IValuePropertyType) => any;
+export type ITypedValue = {
+    /**
+     * - type of the value
+     */
+    type: string;
+    /**
+     * - value
+     */
+    value: any;
+};
+export type IValuePropertyType = {
+    /**
+     * - type of the value
+     */
+    type: string;
+    /**
+     * - value
+     */
+    value: any;
+    /**
+     * - optional prepared Jsonata expression
+     */
+    expr?: any;
+    /**
+     * - function which should be called after value was recived
+     */
+    callback?: IValuePropertyTypeCallback;
+    /**
+     * - true if no error shoudl be given in GUI
+     */
+    noError?: boolean;
+    /**
+     * base Date to use for Date time functions
+     */
+    now?: Date;
+};
+export type INodeCacheSunData = {
+    times: any;
+    dayId: number;
+    sunPosAtSolarNoon?: any;
+};
+export type INodeCacheMoonData = {
+    times: any;
+    dayId: number;
+    positionAtRise: any;
+    positionAtSet: any;
+};
+export type INodeCacheData = {
+    /**
+     * - last mooncalc
+     */
+    lastSunCalc: ISunDataResult | {
+        ts: number;
+    };
+    /**
+     * - last mooncalc
+     */
+    lastMoonCalc: any;
+    /**
+     * - last mooncalc
+     */
+    sunTimesToday: INodeCacheSunData;
+    /**
+     * - last mooncalc
+     */
+    sunTimesTomorrow: INodeCacheSunData;
+    /**
+     * - last mooncalc
+     */
+    sunTimesAdd1: INodeCacheSunData;
+    /**
+     * - last mooncalc
+     */
+    sunTimesAdd2: INodeCacheSunData;
+    /**
+     * - last mooncalc
+     */
+    moonTimesToday: INodeCacheMoonData;
+    /**
+     * - last mooncalc
+     */
+    moonTimesTomorrow: INodeCacheMoonData;
+    /**
+     * - last mooncalc
+     */
+    moonTimes2Days: INodeCacheMoonData;
+};
+export type ISunDataResult = {
+    /**
+     * - the date of the calculated sun data as timestamp
+     */
+    ts: number;
+    /**
+     * - the date of the calculated sun data
+     */
+    lastUpdate: Date;
+    /**
+     * - date as string
+     */
+    lastUpdateStr: string;
+    /**
+     * - latitude
+     */
+    latitude: number;
+    /**
+     * - longitude
+     */
+    longitude: number;
+    /**
+     * -observer height
+     */
+    height: number;
+    angleType: ('deg' | 'rad');
+    azimuth: number;
+    altitude: number;
+    altitudeDegrees: number;
+    azimuthDegrees: number;
+    altitudeRadians: number;
+    azimuthRadians: number;
+    times: any;
+    positionAtSolarNoon?: any;
+    altitudePercent?: number;
+};
+export type IMoonDataResult = {
+    /**
+     * - the date of the calculated sun data as timestamp
+     */
+    ts: number;
+    /**
+     * - the date of the calculated sun data
+     */
+    lastUpdate: Date;
+    /**
+     * - date as string
+     */
+    lastUpdateStr: string;
+    /**
+     * - latitude
+     */
+    latitude: number;
+    /**
+     * - longitude
+     */
+    longitude: number;
+    angleType: ('deg' | 'rad');
+    azimuth: number;
+    altitude: number;
+    altitudeDegrees: number;
+    azimuthDegrees: number;
+    altitudeRadians: number;
+    azimuthRadians: number;
+    distance: number;
+    parallacticAngle: number;
+    illumination: any;
+    zenithAngle: number;
+    times: any;
+    timesNext?: any;
+    positionAtRise?: any;
+    positionAtSet?: any;
+    altitudePercent?: number;
+    highestPosition?: any;
+    isUp?: boolean;
+};
+export type ITimeResult = {
+    /**
+     * - a Date object of the neesed date/time
+     */
+    value: Date;
+    /**
+     * - The time as unix timestamp
+     */
+    ts: number;
+    /**
+     * - The position of the sun on the time
+     */
+    pos: number;
+    /**
+     * - Angle of the sun on the time
+     */
+    angle: number;
+    /**
+     * - The time as julian calendar
+     */
+    julian: number;
+    /**
+     * - indicates if the time is valid or not
+     */
+    valid: boolean;
+    /**
+     * - string of an error message if an error occurs
+     */
+    error?: string;
+};
+export type ISunTimeDefRed = {
+    /**
+     * - The Name of the time
+     */
+    name: string;
+    /**
+     * - Date object with the calculated sun-time
+     */
+    value: Date;
+    /**
+     * - The position of the sun on the time
+     */
+    pos: number;
+    /**
+     * - The elevation angle
+     */
+    elevation: number;
+    /**
+     * - indicates if the time is valid or not
+     */
+    valid: boolean;
+};
+export type ISunTimeDefNextLast = {
+    /**
+     * - next sun time
+     */
+    next: ISunTimeDefRed;
+    /**
+     * - previous sun time
+     */
+    last: ISunTimeDefRed;
+};
+export type IMoonTime = {
+    /**
+     * - a Date object of the neesed date/time
+     */
+    value: Date | number;
+    /**
+     * - string of an error message if an error occurs
+     */
+    error?: string;
+};
+export type IOffsetData = {
+    /**
+     * - value of the offset
+     */
+    offset?: string;
+    /**
+     * - type name of the offset
+     */
+    offsetType?: string;
+    /**
+     * - callback function for getting getPropValue
+     */
+    offsetCallback?: IValuePropertyTypeCallback;
+    /**
+     * - true if no error should be given in GUI
+     */
+    noOffsetError?: boolean;
+    /**
+     * - multiplier to the time
+     */
+    multiplier?: number;
+};
+export type ITimePropertyTypeInt = {
+    /**
+     * - format of the input
+     */
+    format?: string;
+    /**
+     * - valid days
+     */
+    days?: string;
+    /**
+     * - valid monthss
+     */
+    months?: string;
+    /**
+     * - base date, current time as default
+     */
+    now?: Date;
+    /**
+     * - latitude
+     */
+    latitude?: number;
+    /**
+     * - longitude
+     */
+    longitude?: number;
+    /**
+     * - height definition
+     */
+    height?: number;
+    /**
+     * - optional prepared Jsonata expression
+     */
+    expr?: any;
+};
+export type ITimePropertyType = ITimePropertyTypeInt & ILimitationsObj & ITypedValue & IOffsetData;
+/**
+ * get a float value from a type input in Node-Red
+ */
+export type IGetFloatPropData = {
+    /**
+     * - type of the value
+     */
+    type: string;
+    /**
+     * - value
+     */
+    value: any;
+    /**
+     * - optional prepared Jsonata expression
+     */
+    expr?: any;
+    /**
+     * - default value if can not get float value
+     */
+    def?: number;
+    /**
+     * - callback function for getting getPropValue
+     */
+    callback?: IValuePropertyTypeCallback;
+    /**
+     * - true if no error should be given in GUI
+     */
+    noError?: boolean;
+    /**
+     * base Date to use for Date time functions
+     */
+    now?: Date;
+};
+export type ITimePropertyResult = {
+    /**
+     * - the Date value
+     */
+    value: Date;
+    /**
+     * - error message if an error has occured
+     */
+    error: string;
+    /**
+     * - indicator if the given time value is a fix date
+     */
+    fix: boolean;
+};
+/**
+ * check this node for configuration errors
+ */
+export type FktRegister = Function;
+/**
+ * check this node for configuration errors
+ */
+export type FktDeregister = Function;
+/**
+ * check this node for configuration errors
+ */
+export type FktCheckNode = Function;
+/**
+ * Formate a Date Object
+ */
+export type FktFormatDate = Function;
+/**
+ * get list of custom angles
+ */
+export type FktGetCustomAngles = Function;
+/**
+ * get list of all suntimes including custom ones
+ */
+export type FktGetSunTimesList = Function;
+/**
+ * get a float value from a type input in Node-Red
+ */
+export type FktGetFloatProp = Function;
+/**
+ * get an formated date prepared for output
+ */
+export type FktFormatOutDate = Function;
+/**
+ * get the time Data prepared for output
+ */
+export type FktGetOutDataProp = Function;
+/**
+ * Creates a out object, based on input data
+ */
+export type FktSetMessageProp = Function;
+/**
+ * get the time Data from a typed input
+ */
+export type FktGetTimeProp = Function;
+/**
+ * get a prepared JSONATA Expression
+ */
+export type FktGetJSONataExpression = Function;
+/**
+ * get a property value from a type input in Node-Red
+ */
+export type FktGetPropValue = Function;
+/**
+ * compared two property's
+ */
+export type FktComparePropValue = Function;
+/**
+ * compared two property's
+ */
+export type FktGetSunCalc = Function;
+/**
+ * compared two property's
+ */
+export type FktGetMoonCalc = Function;
+/**
+ * check an array if an array has duplicates.
+ */
+export type FktHasDuplicates = (arr: Array<string>) => boolean;
+/**
+ * check an array if an array has duplicates.
+ */
+export type FktValidateCustomTimes = (riseName: Array<{
+    riseName: string;
+    setName: string;
+    angle: number;
+    rad: boolean;
+}>) => boolean;
+//# sourceMappingURL=10-position-config.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/10-position-config.d.ts.map b/nodes/types/10-position-config.d.ts.map
new file mode 100644
index 00000000..29d0b082
--- /dev/null
+++ b/nodes/types/10-position-config.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"10-position-config.d.ts","sourceRoot":"","sources":["../10-position-config.js"],"names":[],"mappings":"AA+aiB,+BAAqB,UAAU,QAw7D/C;;;;;yBAt0EY,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;0BAC/C,OAAO,sBAAsB,EAAE,WAAW;;;;8BAC1C,OAAO,sBAAsB,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAgB7C,OAAO;cACP,MAAM;eACN,MAAM;eACN,CAAC,KAAK,GAAC,KAAK,CAAC;cACb,MAAM;WACN,MAAM;kBACN,MAAM;WACN,MAAM;;;;cAEN,WAAW;;;;gBACX,aAAa;;;;eACb,YAAY;;;;sBACZ,aAAa;;;;kBACb,aAAa;;;;kBACb,aAAa;;;;qBACb,kBAAkB;;;;qBAClB,kBAAkB;;;;kBAClB,eAAe;;;;mBACf,gBAAgB;;;;oBAChB,iBAAiB;;;;oBACjB,iBAAiB;;;;iBACjB,cAAc;;;;0BACd,uBAAuB;;;;kBACvB,eAAe;;;;sBACf,mBAAmB;gBACnB,aAAa;;;;iBACb,cAAc;;;;;6DAWjB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;eAef,0BAA0B;;;;;;;;UAE1B,IAAI;;;;;;;;;;;;;;;;;iBAoBJ,cAAc,GAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC;;;;;;;;mBAE3B,iBAAiB;;;;sBACjB,iBAAiB;;;;kBACjB,iBAAiB;;;;kBACjB,iBAAiB;;;;oBACjB,kBAAkB;;;;uBAClB,kBAAkB;;;;oBAClB,kBAAkB;;;;;;;;;;gBAMlB,IAAI;;;;;;;;;;;;;;;;;eAKJ,CAAC,KAAK,GAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;gBAeb,IAAI;;;;;;;;;;;;;eAIJ,CAAC,KAAK,GAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;WAuBb,IAAI;;;;QACJ,MAAM;;;;SACN,MAAM;;;;WACN,MAAM;;;;YACN,MAAM;;;;;;;;;;;;;;;;;;WAQN,IAAI;;;;SACJ,MAAM;;;;eACN,MAAM;;;;;;;;;;UAMN,cAAc;;;;UACd,cAAc;;;;;;WAKd,IAAI,SAAI;;;;;;;;;;;;;;;;;;qBAQR,0BAA0B;;;;;;;;iBAE1B,MAAM;;;;;;;;;;;;;;;;;;UAQN,IAAI;;;;eACJ,MAAM;;;;gBACN,MAAM;;;;aACN,MAAM;;;;;;gCAGP,oBAAoB,GAAG,eAAe,GAAG,WAAW,GAAG,WAAW;;;;;;;;;;;;;;;;;;;;UASjE,MAAM;;;;eACN,0BAA0B;;;;;;;;UAE1B,IAAI;;;;;;WAKJ,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAgKP,aAAc;;;;gDAQd,MAAO;IAAC,QAAQ,SAAS;IAAC,OAAO,SAAS;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,UAAS;CAAC,CAAC"}
\ No newline at end of file
diff --git a/nodes/types/20-time-inject.d.ts b/nodes/types/20-time-inject.d.ts
new file mode 100644
index 00000000..7105fd80
--- /dev/null
+++ b/nodes/types/20-time-inject.d.ts
@@ -0,0 +1,276 @@
+declare const _exports: runtimeRED;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type ITimeObject = import("./lib/dateTimeHelper.js").ITimeObject;
+/**
+ * --- Type Defs ---
+ */
+export type ILimitationsObj = import("./lib/dateTimeHelper.js").ILimitationsObj;
+/**
+ * --- Type Defs ---
+ */
+export type ITypedValue = import("./10-position-config.js").ITypedValue;
+/**
+ * --- Type Defs ---
+ */
+export type IValuePropertyType = import("./10-position-config.js").IValuePropertyType;
+/**
+ * --- Type Defs ---
+ */
+export type ITimePropertyType = import("./10-position-config.js").ITimePropertyType;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("./10-position-config.js").IPositionConfigNode;
+/**
+ * --- Type Defs ---
+ */
+export type IOffsetData = import("./10-position-config.js").IOffsetData;
+export type ITIPropertyTypeInt = {
+    /**
+     * - valid days
+     */
+    outType: string;
+    /**
+     * - valid days
+     */
+    outValue: any;
+    /**
+     * - optional prepared Jsonata expression
+     */
+    expr?: string;
+};
+export type ITIPropertyType = ILimitationsObj & ITypedValue & IOffsetData & ITIPropertyTypeInt;
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type ITimeInjectNodeInstance = {
+    /**
+     * -   tbd
+     */
+    positionConfig: IPositionConfigNode;
+    /**
+     * internal used additional id
+     */
+    addId: string;
+    /**
+     * type of the inject node
+     */
+    injType: number;
+    /**
+     * -   count of the interval
+     */
+    intervalCount: number;
+    /**
+     * -   ??
+     */
+    intervalCountType: string;
+    /**
+     * -   ??
+     */
+    intervalCountMultiplier: number;
+    /**
+     * -   ??
+     */
+    intervalStart: Date;
+    /**
+     * -   ??
+     */
+    intervalAmount: number;
+    /**
+     * -   ??
+     */
+    intervalCountCurrent: number;
+    /**
+     * -   ??
+     */
+    intervalCountMax: number;
+    /**
+     * -   the text of the interval
+     */
+    intervalText: string;
+    /**
+     * -   ??
+     */
+    timeStartData: ITimePropertyType;
+    /**
+     * -   ??
+     */
+    property: IValuePropertyType;
+    /**
+     * -   ??
+     */
+    propertyThreshold: ITypedValue;
+    /**
+     * -   ??
+     */
+    propertyOperator: string;
+    /**
+     * -   ??
+     */
+    timeStartAltData: ITimePropertyType;
+    /**
+     * -   ??
+     */
+    timeEndData: ITimePropertyType;
+    /**
+     * -   ??
+     */
+    cronJobObj: any;
+    /**
+     * -   ??
+     */
+    cronExpr: string;
+    /**
+     * -   output data
+     */
+    props: Array<ITIPropertyType>;
+    /**
+     * -   ??
+     */
+    recalcTime: number;
+    /**
+     * -   ??
+     */
+    timeOutStartObj: NodeJS.Timeout;
+    /**
+     * -   ??
+     */
+    timeOutEndObj: NodeJS.Timeout;
+    /**
+     * -   ??
+     */
+    intervalObj: NodeJS.Timer;
+    /**
+     * -   ??
+     */
+    onceTimeOutObj: NodeJS.Timeout;
+    /**
+     * -   ??
+     */
+    intervalTime: number;
+    /**
+     * -   ??
+     */
+    nextStartTime: Date;
+    /**
+     * -   ??
+     */
+    nextStartTimeAlt: Date;
+    /**
+     * -   ??
+     */
+    nextEndTime: Date;
+    /**
+     * -   ??
+     */
+    onceDelay: number;
+    /**
+     * -   ??
+     */
+    timedatestart: Date;
+    /**
+     * -   ??
+     */
+    timedateend: Date;
+    /**
+     * -   ??
+     */
+    isAltAvailable: boolean;
+    /**
+     * -   ??
+     */
+    isAltFirst: boolean;
+    /**
+     * -   ??
+     */
+    cacheYear: number;
+    /**
+     * -   ??
+     */
+    cacheStart: Date;
+    /**
+     * -   ??
+     */
+    cacheEnd: Date;
+    /**
+     * - get the limitation for time
+     */
+    getTimeLimitation: Function;
+    /**
+     * - initializes the start timer
+     */
+    initializeStartTimer: Function;
+    /**
+     * - initializes the node itself
+     */
+    initialize: Function;
+    /**
+     * - get the end time in millisecond
+     */
+    getMillisecEnd: IGetTimeAsMillisecond;
+    /**
+     * - creates the start timeout
+     */
+    doCreateStartTimeout: Function;
+    /**
+     * - creates the end timeout
+     */
+    doCreateEndTimeout: Function;
+    /**
+     * - creates the CRON interval
+     */
+    doCreateCRONSetup: Function;
+    /**
+     * - Recalculate the Start timeout
+     */
+    doRecalcStartTimeOut: Function;
+    /**
+     * - start an Intervall
+     */
+    doStartInterval: Function;
+    /**
+     * - creates the text for an interval
+     */
+    getIntervalText: Function;
+    /**
+     * - Recalculate the Interval
+     */
+    createNextInterval: Function;
+    /**
+     * - Prepares a message object for sending
+     */
+    prepOutMsg: Function;
+    /**
+     * - get and validate a given interval
+     */
+    getIntervalTime: Function;
+    /**
+     * - get and validate a given interval
+     * ... obviously there are more ...
+     */
+    doSetStatus: Function;
+};
+/**
+ * Description of the function
+ */
+export type IGetTimeAsMillisecond = Function;
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type ITimeInjectNode = ITimeInjectNodeInstance & runtimeNode;
+//# sourceMappingURL=20-time-inject.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/20-time-inject.d.ts.map b/nodes/types/20-time-inject.d.ts.map
new file mode 100644
index 00000000..bb14aa1e
--- /dev/null
+++ b/nodes/types/20-time-inject.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"20-time-inject.d.ts","sourceRoot":"","sources":["../20-time-inject.js"],"names":[],"mappings":"wBA8HU,UAAU;;;;;yBAnGP,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;0BAC/C,OAAO,yBAAyB,EAAE,WAAW;;;;8BAC7C,OAAO,yBAAyB,EAAE,eAAe;;;;0BACjD,OAAO,yBAAyB,EAAE,WAAW;;;;iCAC7C,OAAO,yBAAyB,EAAE,kBAAkB;;;;gCACpD,OAAO,yBAAyB,EAAE,iBAAiB;;;;kCACnD,OAAO,yBAAyB,EAAE,mBAAmB;;;;0BACrD,OAAO,yBAAyB,EAAE,WAAW;;;;;aAK5C,MAAM;;;;;;;;WAGN,MAAM;;8BAEP,eAAe,GAAG,WAAW,GAAG,WAAW,GAAG,kBAAkB;;;;;;;;oBAK/D,mBAAmB;;;;WACnB,MAAM;;;;aAEN,MAAM;;;;mBACN,MAAM;;;;uBACN,MAAM;;;;6BACN,MAAM;;;;mBACN,IAAI;;;;oBACJ,MAAM;;;;0BACN,MAAM;;;;sBACN,MAAM;;;;kBACN,MAAM;;;;mBAEN,iBAAiB;;;;cACjB,kBAAkB;;;;uBAClB,WAAW;;;;sBACX,MAAM;;;;sBACN,iBAAiB;;;;iBACjB,iBAAiB;;;;;;;;cAEjB,MAAM;;;;WAEN,MAAO,eAAe,CAAC;;;;gBAEvB,MAAM;;;;qBAEN,OAAO,OAAO;;;;mBACd,OAAO,OAAO;;;;iBACd,OAAO,KAAK;;;;oBACZ,OAAO,OAAO;;;;kBAEd,MAAM;;;;mBACN,IAAI;;;;sBACJ,IAAI;;;;iBACJ,IAAI;;;;eACJ,MAAM;;;;mBACN,IAAI;;;;iBACJ,IAAI;;;;oBACJ,OAAO;;;;gBACP,OAAO;;;;eAGP,MAAM;;;;gBACN,IAAI;;;;cACJ,IAAI;;;;;;;;;;;;;;;;oBAKJ,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAsBtB,uBAAuB,GAAG,WAAW"}
\ No newline at end of file
diff --git a/nodes/types/21-within-time-switch.d.ts b/nodes/types/21-within-time-switch.d.ts
new file mode 100644
index 00000000..2f6fea30
--- /dev/null
+++ b/nodes/types/21-within-time-switch.d.ts
@@ -0,0 +1,148 @@
+declare const _exports: runtimeRED;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type ITimeObject = import("./lib/dateTimeHelper.js").ITimeObject;
+/**
+ * --- Type Defs ---
+ */
+export type ILimitationsObj = import("./lib/dateTimeHelper.js").ILimitationsObj;
+/**
+ * --- Type Defs ---
+ */
+export type ITypedValue = import("./10-position-config.js").ITypedValue;
+/**
+ * --- Type Defs ---
+ */
+export type IValuePropertyType = import("./10-position-config.js").IValuePropertyType;
+/**
+ * --- Type Defs ---
+ */
+export type ITimePropertyType = import("./10-position-config.js").ITimePropertyType;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("./10-position-config.js").IPositionConfigNode;
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type IWithinTimeNodeInstance = {
+    /**
+     * -   tbd
+     */
+    positionConfig: IPositionConfigNode;
+    /**
+     * -   ??
+     */
+    timeStart: ITimePropertyType;
+    /**
+     * -   ??
+     */
+    timeStartAlt: ITimePropertyType;
+    /**
+     * -   ??
+     */
+    propertyStart: IValuePropertyType;
+    /**
+     * -   ??
+     */
+    propertyStartOperator: string;
+    /**
+     * -   ??
+     */
+    propertyStartThreshold: IValuePropertyType;
+    /**
+     * -   ??
+     */
+    timeEnd: ITimePropertyType;
+    /**
+     * -   ??
+     */
+    timeEndAlt: ITimePropertyType;
+    /**
+     * -   ??
+     */
+    propertyEnd: IValuePropertyType;
+    /**
+     * -   ??
+     */
+    propertyEndOperator: string;
+    /**
+     * -   ??
+     */
+    propertyEndThreshold: IValuePropertyType;
+    /**
+     * -   ??
+     */
+    timeRestrictions: IValuePropertyType;
+    /**
+     * -   ??
+     */
+    withinTimeValue: ITypedValue;
+    /**
+     * -   ??
+     */
+    outOfTimeValue: ITypedValue;
+    /**
+     * -   ??
+     */
+    timeOnlyEvenDays: boolean;
+    /**
+     * -   ??
+     */
+    timeOnlyOddDays: boolean;
+    /**
+     * -   ??
+     */
+    timeOnlyEvenWeeks: boolean;
+    /**
+     * -   ??
+     */
+    timeOnlyOddWeeks: boolean;
+    /**
+     * -   ??
+     */
+    timeStartDate: Date;
+    /**
+     * -   ??
+     */
+    timeEndDate: Date;
+    /**
+     * -   ??
+     */
+    timeDays: Array<number>;
+    /**
+     * -   ??
+     */
+    timeMonths: Array<number>;
+    /**
+     * -   ??
+     */
+    timeOutObj: NodeJS.Timer;
+    /**
+     * -   ??
+     */
+    lastMsgObj: any;
+    /**
+     * -   ??
+     */
+    tsCompare: number;
+};
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type IWithinTimeNode = IWithinTimeNodeInstance & runtimeNode;
+//# sourceMappingURL=21-within-time-switch.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/21-within-time-switch.d.ts.map b/nodes/types/21-within-time-switch.d.ts.map
new file mode 100644
index 00000000..d809304e
--- /dev/null
+++ b/nodes/types/21-within-time-switch.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"21-within-time-switch.d.ts","sourceRoot":"","sources":["../21-within-time-switch.js"],"names":[],"mappings":"wBA+EU,UAAU;;;;;yBApDN,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;0BAC/C,OAAO,yBAAyB,EAAE,WAAW;;;;8BAC7C,OAAO,yBAAyB,EAAE,eAAe;;;;0BACjD,OAAO,yBAAyB,EAAE,WAAW;;;;iCAC7C,OAAO,yBAAyB,EAAE,kBAAkB;;;;gCACpD,OAAO,yBAAyB,EAAE,iBAAiB;;;;kCACnD,OAAO,yBAAyB,EAAE,mBAAmB;;;;;;;;oBAKrD,mBAAmB;;;;eAEnB,iBAAiB;;;;kBACjB,iBAAiB;;;;mBACjB,kBAAkB;;;;2BAClB,MAAM;;;;4BACN,kBAAkB;;;;aAElB,iBAAiB;;;;gBACjB,iBAAiB;;;;iBACjB,kBAAkB;;;;yBAClB,MAAM;;;;0BACN,kBAAkB;;;;sBAElB,kBAAkB;;;;qBAClB,WAAW;;;;oBACX,WAAW;;;;sBAEX,OAAO;;;;qBACP,OAAO;;;;uBACP,OAAO;;;;sBACP,OAAO;;;;mBACP,IAAI;;;;iBACJ,IAAI;;;;cACJ,MAAO,MAAM,CAAC;;;;gBACd,MAAO,MAAM,CAAC;;;;gBAGd,OAAO,KAAK;;;;;;;;eAGZ,MAAM;;;;;8BAIP,uBAAuB,GAAG,WAAW"}
\ No newline at end of file
diff --git a/nodes/types/22-delay-until.d.ts b/nodes/types/22-delay-until.d.ts
new file mode 100644
index 00000000..6df60e15
--- /dev/null
+++ b/nodes/types/22-delay-until.d.ts
@@ -0,0 +1,111 @@
+declare const _exports: runtimeRED;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type ITimeObject = import("./lib/dateTimeHelper.js").ITimeObject;
+/**
+ * --- Type Defs ---
+ */
+export type ILimitationsObj = import("./lib/dateTimeHelper.js").ILimitationsObj;
+/**
+ * --- Type Defs ---
+ */
+export type ITypedValue = import("./10-position-config.js").ITypedValue;
+/**
+ * --- Type Defs ---
+ */
+export type IValuePropertyType = import("./10-position-config.js").IValuePropertyType;
+/**
+ * --- Type Defs ---
+ */
+export type ITimePropertyType = import("./10-position-config.js").ITimePropertyType;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("./10-position-config.js").IPositionConfigNode;
+/**
+ * --- Type Defs ---
+ */
+export type ITimePropertyResult = import("./10-position-config.js").ITimePropertyResult;
+export type IDUPropertyTypeInst = {
+    /**
+     * - valid days
+     */
+    compare: any;
+};
+export type IDUPropertyType = ITypedValue & IDUPropertyTypeInst;
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type IDelayUntilNodeInstance = {
+    /**
+     * -   tbd
+     */
+    positionConfig: IPositionConfigNode;
+    /**
+     * -   time definition
+     */
+    timeData: ITimePropertyType;
+    /**
+     * -   kind of queue messages
+     */
+    queuingBehavior: ('all' | 'first' | 'last');
+    /**
+     * -   flush mesage control property definition
+     */
+    flushMsgs: IDUPropertyType;
+    /**
+     * -   drop mesage control property definition
+     */
+    dropMsgs: IDUPropertyType;
+    /**
+     * -   enqueue mesage control property definition
+     */
+    enqueueMsg: IDUPropertyType;
+    /**
+     * -   control property handling
+     */
+    ctrlProp: ITypedValue;
+    /**
+     * -   base time definition
+     */
+    tsCompare: number;
+    /**
+     * -   the message queue
+     */
+    msgQueue: any[];
+    /**
+     * -   the message queue
+     */
+    delayTimer: NodeJS.Timer;
+    /**
+     * -   next time object
+     */
+    nextTime: ITimePropertyResult;
+    /**
+     * -   indicator if intermedia node state
+     */
+    nextTimeIntermedia: boolean;
+    /**
+     * -   indicator if time is calculared by message
+     */
+    calcByMsg: boolean;
+};
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type IDelayUntilNode = IDelayUntilNodeInstance & runtimeNode;
+//# sourceMappingURL=22-delay-until.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/22-delay-until.d.ts.map b/nodes/types/22-delay-until.d.ts.map
new file mode 100644
index 00000000..baa8f51e
--- /dev/null
+++ b/nodes/types/22-delay-until.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"22-delay-until.d.ts","sourceRoot":"","sources":["../22-delay-until.js"],"names":[],"mappings":"wBA0EU,UAAU;;;;;yBA/CN,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;0BAC/C,OAAO,yBAAyB,EAAE,WAAW;;;;8BAC7C,OAAO,yBAAyB,EAAE,eAAe;;;;0BACjD,OAAO,yBAAyB,EAAE,WAAW;;;;iCAC7C,OAAO,yBAAyB,EAAE,kBAAkB;;;;gCACpD,OAAO,yBAAyB,EAAE,iBAAiB;;;;kCACnD,OAAO,yBAAyB,EAAE,mBAAmB;;;;kCACrD,OAAO,yBAAyB,EAAE,mBAAmB;;;;;;;8BAOtD,WAAW,GAAG,mBAAmB;;;;;;;;oBAKhC,mBAAmB;;;;cAEnB,iBAAiB;;;;qBACjB,CAAC,KAAK,GAAC,OAAO,GAAC,MAAM,CAAC;;;;eACtB,eAAe;;;;cACf,eAAe;;;;gBACf,eAAe;;;;cACf,WAAW;;;;eAEX,MAAM;;;;;;;;gBAIN,OAAO,KAAK;;;;cAEZ,mBAAmB;;;;wBACnB,OAAO;;;;eACP,OAAO;;;;;8BAKR,uBAAuB,GAAG,WAAW"}
\ No newline at end of file
diff --git a/nodes/types/30-sun-position.d.ts b/nodes/types/30-sun-position.d.ts
new file mode 100644
index 00000000..fdf0f362
--- /dev/null
+++ b/nodes/types/30-sun-position.d.ts
@@ -0,0 +1,84 @@
+declare const _exports: runtimeRED;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("./10-position-config.js").IPositionConfigNode;
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type ISunPositionNodeInstance = {
+    /**
+     * -   tbd
+     */
+    positionConfig: IPositionConfigNode;
+    /**
+     * output topic
+     */
+    topic: string;
+    /**
+     * output topic
+     */
+    rules: any[];
+    /**
+     * type of start value
+     */
+    start: any;
+    /**
+     * start value
+     */
+    startType: string;
+    /**
+     * start offset value
+     */
+    startOffset: any;
+    /**
+     * type of the start offset value
+     */
+    startOffsetType: string;
+    /**
+     * start offset multipier
+     */
+    startOffsetMultiplier: number;
+    /**
+     * type of end value
+     */
+    end: any;
+    /**
+     * end value
+     */
+    endType: string;
+    /**
+     * end offset value
+     */
+    endOffset: any;
+    /**
+     * type of the end offset value
+     */
+    endOffsetType: string;
+    /**
+     * end offset multipier
+     */
+    endOffsetMultiplier: number;
+    /**
+     * end offset multipier
+     */
+    azimuthPos: any;
+};
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type ISunPositionNode = ISunPositionNodeInstance & runtimeNode;
+//# sourceMappingURL=30-sun-position.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/30-sun-position.d.ts.map b/nodes/types/30-sun-position.d.ts.map
new file mode 100644
index 00000000..5bdcfcab
--- /dev/null
+++ b/nodes/types/30-sun-position.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"30-sun-position.d.ts","sourceRoot":"","sources":["../30-sun-position.js"],"names":[],"mappings":"wBA6DU,UAAU;;;;;yBAlCN,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;kCAC/C,OAAO,yBAAyB,EAAE,mBAAmB;;;;;;;;oBAKrD,mBAAmB;;;;WAEnB,MAAM;;;;;;;;;;;;eAIN,MAAM;;;;;;;;qBAEN,MAAM;;;;2BACN,MAAM;;;;;;;;aAGN,MAAM;;;;;;;;mBAEN,MAAM;;;;yBACN,MAAM;;;;;;;;;+BAOP,wBAAwB,GAAG,WAAW"}
\ No newline at end of file
diff --git a/nodes/types/31-moon-position.d.ts b/nodes/types/31-moon-position.d.ts
new file mode 100644
index 00000000..c8839606
--- /dev/null
+++ b/nodes/types/31-moon-position.d.ts
@@ -0,0 +1,84 @@
+declare const _exports: runtimeRED;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("./10-position-config.js").IPositionConfigNode;
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type IMoonPositionNodeInstance = {
+    /**
+     * -   tbd
+     */
+    positionConfig: IPositionConfigNode;
+    /**
+     * output topic
+     */
+    topic: string;
+    /**
+     * output topic
+     */
+    rules: any[];
+    /**
+     * type of start value
+     */
+    start: any;
+    /**
+     * start value
+     */
+    startType: string;
+    /**
+     * start offset value
+     */
+    startOffset: any;
+    /**
+     * type of the start offset value
+     */
+    startOffsetType: string;
+    /**
+     * start offset multipier
+     */
+    startOffsetMultiplier: number;
+    /**
+     * type of end value
+     */
+    end: any;
+    /**
+     * end value
+     */
+    endType: string;
+    /**
+     * end offset value
+     */
+    endOffset: any;
+    /**
+     * type of the end offset value
+     */
+    endOffsetType: string;
+    /**
+     * end offset multipier
+     */
+    endOffsetMultiplier: number;
+    /**
+     * end offset multipier
+     */
+    azimuthPos: any;
+};
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type IMoonPositionNode = IMoonPositionNodeInstance & runtimeNode;
+//# sourceMappingURL=31-moon-position.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/31-moon-position.d.ts.map b/nodes/types/31-moon-position.d.ts.map
new file mode 100644
index 00000000..d9fa1f25
--- /dev/null
+++ b/nodes/types/31-moon-position.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"31-moon-position.d.ts","sourceRoot":"","sources":["../31-moon-position.js"],"names":[],"mappings":"wBA4DW,UAAU;;;;;yBAjCN,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;kCAC/C,OAAO,yBAAyB,EAAE,mBAAmB;;;;;;;;oBAKrD,mBAAmB;;;;WAEnB,MAAM;;;;;;;;;;;;eAIN,MAAM;;;;;;;;qBAEN,MAAM;;;;2BACN,MAAM;;;;;;;;aAGN,MAAM;;;;;;;;mBAEN,MAAM;;;;yBACN,MAAM;;;;;;;;;gCAMP,yBAAyB,GAAG,WAAW"}
\ No newline at end of file
diff --git a/nodes/types/60-time-comp.d.ts b/nodes/types/60-time-comp.d.ts
new file mode 100644
index 00000000..f7f0ff2b
--- /dev/null
+++ b/nodes/types/60-time-comp.d.ts
@@ -0,0 +1,52 @@
+declare const _exports: runtimeRED;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type ITimePropertyType = import("./10-position-config.js").ITimePropertyType;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("./10-position-config.js").IPositionConfigNode;
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type ITimeCompareNodeInstance = {
+    /**
+     * -   tbd
+     */
+    positionConfig: IPositionConfigNode;
+    /**
+     * -   input data
+     */
+    input: ITimePropertyType;
+    /**
+     * -   output data
+     */
+    results: any[];
+    /**
+     * -   input data
+     */
+    rules: any[];
+    /**
+     * -   define if check all rules
+     */
+    checkall: boolean | string;
+};
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type ITimeCompareNode = ITimeCompareNodeInstance & runtimeNode;
+//# sourceMappingURL=60-time-comp.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/60-time-comp.d.ts.map b/nodes/types/60-time-comp.d.ts.map
new file mode 100644
index 00000000..b6464955
--- /dev/null
+++ b/nodes/types/60-time-comp.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"60-time-comp.d.ts","sourceRoot":"","sources":["../60-time-comp.js"],"names":[],"mappings":"wBAmDW,UAAU;;;;;yBAxBP,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;gCAC/C,OAAO,yBAAyB,EAAE,iBAAiB;;;;kCACnD,OAAO,yBAAyB,EAAE,mBAAmB;;;;;;;;oBAMpD,mBAAmB;;;;WAEpB,iBAAiB;;;;;;;;;;;;cAGjB,OAAO,GAAC,MAAM;;;;;+BAKd,wBAAwB,GAAG,WAAW"}
\ No newline at end of file
diff --git a/nodes/types/61-time-span.d.ts b/nodes/types/61-time-span.d.ts
new file mode 100644
index 00000000..0ae2f446
--- /dev/null
+++ b/nodes/types/61-time-span.d.ts
@@ -0,0 +1,60 @@
+declare const _exports: runtimeRED;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type ITimePropertyType = import("./10-position-config.js").ITimePropertyType;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("./10-position-config.js").IPositionConfigNode;
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type ITimeSpanNodeInstance = {
+    /**
+     * -   tbd
+     */
+    positionConfig: IPositionConfigNode;
+    /**
+     * -   operand1 data
+     */
+    operand1: ITimePropertyType;
+    /**
+     * -   operand2 data
+     */
+    operand2: ITimePropertyType;
+    /**
+     * -   operand
+     */
+    operand: number;
+    /**
+     * -   output data
+     */
+    results: any[];
+    /**
+     * -   input data
+     */
+    rules: any[];
+    /**
+     * -   define if check all rules
+     */
+    checkall: boolean | string;
+};
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type ITimeSpanNode = ITimeSpanNodeInstance & runtimeNode;
+//# sourceMappingURL=61-time-span.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/61-time-span.d.ts.map b/nodes/types/61-time-span.d.ts.map
new file mode 100644
index 00000000..f19175e9
--- /dev/null
+++ b/nodes/types/61-time-span.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"61-time-span.d.ts","sourceRoot":"","sources":["../61-time-span.js"],"names":[],"mappings":"wBAqDW,UAAU;;;;;yBA1BP,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;gCAC/C,OAAO,yBAAyB,EAAE,iBAAiB;;;;kCACnD,OAAO,yBAAyB,EAAE,mBAAmB;;;;;;;;oBAMpD,mBAAmB;;;;cAEpB,iBAAiB;;;;cACjB,iBAAiB;;;;aACjB,MAAM;;;;;;;;;;;;cAGN,OAAO,GAAC,MAAM;;;;;4BAKd,qBAAqB,GAAG,WAAW"}
\ No newline at end of file
diff --git a/nodes/types/80-blind-control.d.ts b/nodes/types/80-blind-control.d.ts
new file mode 100644
index 00000000..e891fc83
--- /dev/null
+++ b/nodes/types/80-blind-control.d.ts
@@ -0,0 +1,257 @@
+declare const _exports: runtimeRED;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type ITimeObject = import("./lib/dateTimeHelper").ITimeObject;
+/**
+ * --- Type Defs ---
+ */
+export type ITypedValue = import("./10-position-config.js").ITypedValue;
+/**
+ * --- Type Defs ---
+ */
+export type ITimeControlNode = import("./lib/timeControlHelper.js").ITimeControlNode;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("./lib/timeControlHelper.js").IPositionConfigNode;
+/**
+ * Node data object
+ */
+export type IBlindNodeData = {
+    /**
+     * - is the node disabled
+     */
+    isDisabled: boolean;
+    /**
+     * - the blind top level
+     */
+    levelTop: number;
+    /**
+     * - the blind bottom level
+     */
+    levelBottom: number;
+    /**
+     * - the blind top level offset
+     */
+    levelTopOffset?: number;
+    /**
+     * - the blind bottom level
+     */
+    levelBottomOffset?: number;
+    /**
+     * - open/closing increment
+     */
+    increment: number;
+    /**
+     * - defaulot level
+     */
+    levelDefault: ITypedValue;
+    /**
+     * - minimum level
+     */
+    levelMin: ITypedValue;
+    /**
+     * - maximum levell
+     */
+    levelMax: ITypedValue;
+    /**
+     * - default slat setting
+     */
+    slat: ITypedValue;
+    /**
+     * - default topic
+     */
+    topic: string;
+    /**
+     * - additional id of the node
+     */
+    addId: ITypedValue;
+    /**
+     * - open/closing increment
+     */
+    overwrite: {
+        active: boolean;
+        importance: number;
+        expireDuration: number;
+    };
+};
+/**
+ * the window settings
+ */
+export type IBlindWindowSettings = {
+    /**
+     * - the top of the window
+     */
+    top: any;
+    /**
+     * - type of the top of the window
+     */
+    topType: string;
+    /**
+     * - the bottom of the window
+     */
+    bottom: any;
+    /**
+     * - type of the bottom of the window
+     */
+    bottomType: string;
+    /**
+     * - mode of the start/end angles
+     */
+    setMode: ('setMode' | 'orientation');
+    /**
+     * - the start position angle to the geographical north
+     */
+    azimuthStart: any;
+    /**
+     * - type of the start position angle to the geographical north
+     */
+    azimuthStartType: string;
+    /**
+     * - the end position angle to the geographical north
+     */
+    azimuthEnd: any;
+    /**
+     * - type of the end position angle to the geographical north
+     */
+    azimuthEndType: string;
+    /**
+     * - the orientation angle to the geographical north
+     */
+    windowOrientation: any;
+    /**
+     * - type of the  the orientation angle to the geographical north
+     */
+    windowOrientationType: string;
+    /**
+     * - an offset for the angle clockwise offset
+     */
+    windowOffsetP: number;
+    /**
+     * - an offset for the angle anti-clockwise offset
+     */
+    windowOffsetN: number;
+};
+/**
+ * the window settings
+ */
+export type IOversteerSettings = {
+    /**
+     * - the top of the window
+     */
+    isChecked: boolean;
+    /**
+     * - type of the top of the window
+     */
+    active: boolean;
+    /**
+     * - the topic of the oversteer
+     */
+    topic: string;
+};
+/**
+ * the window settings
+ */
+export type IOversteerData = {
+    /**
+     * - position
+     */
+    pos: number;
+    /**
+     * - the top of the window
+     */
+    mode: (0 | 1 | 3 | 16);
+    /**
+     * - type of the top of the window
+     */
+    value: any;
+    /**
+     * - type of the value operator 1
+     */
+    valueType: string;
+    /**
+     * - value operator 1
+     */
+    valueExpr: Function;
+    /**
+     * - compare operator
+     */
+    operator: string;
+    /**
+     * - compare operator text
+     */
+    operatorText?: string;
+    /**
+     * - type of the value operator 2
+     */
+    thresholdType: string;
+    /**
+     * - value operator 2
+     */
+    threshold: string;
+    /**
+     * - blind position
+     */
+    blindPos: ITypedValue;
+    /**
+     * - slat position
+     */
+    slatPos: ITypedValue;
+    /**
+     * - slat position
+     */
+    onlySunInWindow: boolean;
+};
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type IBlindControlNodeInstance = {
+    /**
+     * get/set generic Data of the node
+     */
+    nodeData: IBlindNodeData;
+    /**
+     * -   the window settings Object
+     */
+    windowSettings: IBlindWindowSettings;
+    /**
+     * smoothTime
+     */
+    smoothTime: number;
+    /**
+     * -   tbd
+     */
+    oversteers: Array<IOversteerData>;
+    /**
+     * -   tbd
+     */
+    oversteer: IOversteerSettings;
+    /**
+     * -   tbd
+     */
+    level: any;
+    /**
+     * -   tbd
+     * ... obviously there are more ...
+     */
+    results: Array<any>;
+};
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type IBlindControlNode = ITimeControlNode & IBlindControlNodeInstance;
+//# sourceMappingURL=80-blind-control.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/80-blind-control.d.ts.map b/nodes/types/80-blind-control.d.ts.map
new file mode 100644
index 00000000..b3a848c5
--- /dev/null
+++ b/nodes/types/80-blind-control.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"80-blind-control.d.ts","sourceRoot":"","sources":["../80-blind-control.js"],"names":[],"mappings":"wBAqHU,UAAU;;;;;yBAxFP,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;0BAC/C,OAAO,sBAAsB,EAAE,WAAW;;;;0BAC1C,OAAO,yBAAyB,EAAE,WAAW;;;;+BAC7C,OAAO,4BAA4B,EAAE,gBAAgB;;;;kCACrD,OAAO,4BAA4B,EAAE,mBAAmB;;;;;;;;gBAKvD,OAAO;;;;cACP,MAAM;;;;iBACN,MAAM;;;;qBACN,MAAM;;;;wBACN,MAAM;;;;eACN,MAAM;;;;kBACN,WAAW;;;;cACX,WAAW;;;;cACX,WAAW;;;;UACX,WAAW;;;;WACX,MAAM;;;;WACN,WAAW;;;;;QAES,MAAM,EAA1B,OAAO;QACa,UAAU,EAA9B,MAAM;QACc,cAAc,EAAlC,MAAM;;;;;;;;;;;;;;aAON,MAAM;;;;;;;;gBAEN,MAAM;;;;aACN,CAAC,SAAS,GAAC,aAAa,CAAC;;;;;;;;sBAEzB,MAAM;;;;;;;;oBAEN,MAAM;;;;;;;;2BAEN,MAAM;;;;mBACN,MAAM;;;;mBACN,MAAM;;;;;;;;;eAKN,OAAO;;;;YACP,OAAO;;;;WACP,MAAM;;;;;;;;;SAKN,MAAM;;;;UACN,CAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,EAAE,CAAC;;;;WACV,GAAG;;;;eACH,MAAM;;;;;;;;cAEN,MAAM;;;;mBACN,MAAM;;;;mBACN,MAAM;;;;eACN,MAAM;;;;cACN,WAAW;;;;aACX,WAAW;;;;qBACX,OAAO;;;;;;;;;cAKP,cAAc;;;;oBACd,oBAAoB;;;;gBACpB,MAAM;;;;gBACN,MAAO,cAAc,CAAC;;;;eACtB,kBAAkB;;;;;;;;;aAElB,UAAc;;;;;gCAKf,gBAAgB,GAAG,yBAAyB"}
\ No newline at end of file
diff --git a/nodes/types/81-clock-timer.d.ts b/nodes/types/81-clock-timer.d.ts
new file mode 100644
index 00000000..6c270ee6
--- /dev/null
+++ b/nodes/types/81-clock-timer.d.ts
@@ -0,0 +1,65 @@
+declare const _exports: runtimeRED;
+export = _exports;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('./types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('./types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('./types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type ITimeObject = import("./lib/dateTimeHelper").ITimeObject;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("./10-position-config.js").IPositionConfigNode;
+/**
+ * --- Type Defs ---
+ */
+export type ITimeControlNodeInstance = import("./lib/timeControlHelper.js").ITimeControlNodeInstance;
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type IClockTimerNodeInstance = {
+    /**
+     * get/set generic Data of the node
+     */
+    nodeData: any;
+    /**
+     * -   tbd
+     */
+    reason: any;
+    /**
+     * -   used context store
+     */
+    contextStore: string;
+    /**
+     * -   tbd
+     */
+    oversteer: any;
+    /**
+     * -   tbd
+     */
+    rules: any;
+    /**
+     * -   tbd
+     */
+    payload: any;
+    /**
+     * -   tbd
+     * ... obviously there are more ...
+     */
+    results: Array<any>;
+};
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type IClockTimerNode = ITimeControlNodeInstance & IClockTimerNodeInstance & runtimeNode;
+//# sourceMappingURL=81-clock-timer.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/81-clock-timer.d.ts.map b/nodes/types/81-clock-timer.d.ts.map
new file mode 100644
index 00000000..67906ff4
--- /dev/null
+++ b/nodes/types/81-clock-timer.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"81-clock-timer.d.ts","sourceRoot":"","sources":["../81-clock-timer.js"],"names":[],"mappings":"wBAqDU,UAAU;;;;;yBAzBP,OAAO,qBAAqB,EAAE,UAAU;;;;0BACxC,OAAO,qBAAqB,EAAE,WAAW;;;;gCACzC,OAAO,qBAAqB,EAAE,iBAAiB;;;;0BAC/C,OAAO,sBAAsB,EAAE,WAAW;;;;kCAC1C,OAAO,yBAAyB,EAAE,mBAAmB;;;;uCACrD,OAAO,4BAA4B,EAAE,wBAAwB;;;;;;;;;;;;;;;;kBAO5D,MAAM;;;;;;;;;;;;;;;;;aAIN,UAAc;;;;;8BAKf,wBAAwB,GAAG,uBAAuB,GAAG,WAAW"}
\ No newline at end of file
diff --git a/nodes/types/lib/dateTimeHelper.d.ts b/nodes/types/lib/dateTimeHelper.d.ts
new file mode 100644
index 00000000..193d7066
--- /dev/null
+++ b/nodes/types/lib/dateTimeHelper.d.ts
@@ -0,0 +1,502 @@
+export type IIsFoundNumberFunc = (res: number) => any;
+export type INotFoundFunc = (msg: any) => any;
+export type IIsFoundBoolFunc = (result: boolean, realResult: any, topic: string) => any;
+/**
+ * Data
+ */
+export type ITimeObject = any;
+export type ILimitationsObj = {
+    /**
+     * - if __true__ the next date will be delivered starting from now, otherwise the matching date of the date from now
+     */
+    next?: boolean;
+    /**
+     * - days for which should be calculated the sun time
+     */
+    days?: Array<number> | string;
+    /**
+     * - months for which should be calculated the sun time
+     */
+    months?: Array<number> | string;
+    /**
+     * - if true only odd days will be used
+     */
+    onlyOddDays?: boolean;
+    /**
+     * - if true only even days will be used
+     */
+    onlyEvenDays?: boolean;
+    /**
+     * - if true only odd weeks will be used
+     */
+    onlyOddWeeks?: boolean;
+    /**
+     * - if true only even weeks will be used
+     */
+    onlyEvenWeeks?: boolean;
+    /**
+     * - Date for start range
+     */
+    dateStart?: Date;
+    /**
+     * - Date for end range
+     * dateStart
+     */
+    dateEnd?: Date;
+};
+export type ILimitedDate = {
+    /**
+     * - The limited Date
+     */
+    date: Date;
+    /**
+     * - indicator if the input Date has changed
+     */
+    hasChanged: boolean;
+    /**
+     * - if an error occurs the string is not empty
+     */
+    error: string;
+};
+export const TIME_WEEK: 604800000;
+export const TIME_5d: 432000000;
+export const TIME_4d: 345600000;
+export const TIME_3d: 259200000;
+export const TIME_36h: 129600000;
+export const TIME_24h: 86400000;
+export const TIME_12h: 43200000;
+export const TIME_1h: 3600000;
+export const TIME_1min: 60000;
+export const TIME_1s: 1000;
+/*******************************************************************************************************/
+/*******************************************************************************************************/
+/*******************************************************************************************************/
+/**
+ * returns **true** if the parameter value is a valid boolean value for **false** or **true**
+ * @param {*} val a parameter which should be checked if  it is a valid false boolean
+ * @returns {boolean} true if the parameter value is a valid boolean value for for **false** or **true**
+ */
+export function isBool(val: any): boolean;
+/**
+ * returns **true** if the parameter value is a valid boolean value for **true**
+ * @param {*} val a parameter which should be checked if  it is a valid true boolean
+ * @returns {boolean} true if the parameter value is a valid boolean value for **true**
+ */
+export function isTrue(val: any): boolean;
+/**
+ * returns **true** if the parameter value is a valid boolean value for **false**
+ * @param {*} val a parameter which should be checked if  it is a valid false boolean
+ * @returns {boolean} true if the parameter value is a valid boolean value for **false**
+ */
+export function isFalse(val: any): boolean;
+/**
+ * Exclusive OR
+ * @param {*} a  -  operand one
+ * @param {*} b  -  operand two
+ * @returns {boolean}  -  **true** if the a expression or b expression is **true** (like ||), but not if both are **true**
+ */
+export function XOR(a: any, b: any): boolean;
+/**
+ * Exclusive AND
+ * @param {*} a  -  operand one
+ * @param {*} b  -  operand two
+ * @returns {boolean}  -  **true** if the a expression and b expression is **true** (like &&) or if both are **false**
+ */
+export function XAND(a: any, b: any): boolean;
+/*******************************************************************************************************/
+/**
+ * creates a string with two digits
+ * @param {number} n number to format
+ * @returns {string} number with minimum two digits
+ */
+export function pad2(n: number): string;
+/**
+ * creates a string from a number with leading zeros
+ * @param {any} val number to format
+ * @param {number} [len] length of number (default 2)
+ * @returns {string} number with minimum digits as defined in length
+ */
+export function pad(val: any, len?: number): string;
+/**
+ * normalizes an angle
+ * @param {number} angle to normalize
+ */
+export function angleNorm(angle: number): number;
+/**
+ * normalizes an angle
+ * @param {number} angle to normalize
+ */
+export function angleNormRad(angle: number): number;
+/**
+ * radians to decimal grad
+ * @param {number} rad angle in radians
+ * @return {number} angle in decimal grad
+ */
+export function toDec(rad: number): number;
+/**
+ * decimal grad to radians
+ * @param {number} dec angle in decimal grad
+ * @return {number} angle in radians
+ */
+export function toRad(dec: number): number;
+/*******************************************************************************************************/
+/**
+ * clip a text to a maximum length
+ * @param {string} v text to clip
+ * @param {number} [l] length to clip the text
+* @returns {string} string not longer than the given length
+ */
+export function clipStrLength(v: string, l?: number): string;
+/**
+ * count the number of decimals of a number
+ * @param {*} value number to check
+ */
+export function countDecimals(value: any): any;
+/*******************************************************************************************************/
+/*******************************************************************************************************/
+/*******************************************************************************************************/
+/**
+ * generic function for handle a error in a node
+ * @param {any} node the node where the error occurs
+ * @param {String} messageText the message text
+ * @param {Error} [err] the error object
+ * @param {string} [stateText] the state text which should be set to the node
+ */
+export function handleError(node: any, messageText: string, err?: Error, stateText?: string): void;
+/*******************************************************************************************************/
+/**
+ * check if a value is filled or returns default value
+ * @param {any} val to check for undefined, null, empty
+ * @param {any} defaultVal default value to use
+ * @returns {any} result to use if value is undefined, null or empty string
+ */
+export function chkValueFilled(val: any, defaultVal: any): any;
+/*******************************************************************************************************/
+/**
+ * check if a given number is in given limits
+ * @param {number} num number angle to compare
+ * @param {number} [low] low limit
+ * @param {number} [high] high limit
+ * @return {boolean}  **true** if the number is inside given limits, at least one limit must be validate, otherwise returns **false**
+ */
+export function checkLimits(num: number, low?: number, high?: number): boolean;
+/**
+ * @callback IIsFoundBoolFunc
+ * @param  {boolean} result -   found value converted to boolean
+ * @param  {*} realResult   -   real value which was found or the complete payload
+ * @param  {string} topic   -   topic of the message
+ */
+/**
+ * check if the msg or msg.property contains a property with value true or the topic contains the given name
+ * @param {*} msg message
+ * @param {string|Array.<string>} ids property names to check
+ * @param {string|Array.<string>} [names] topic names to check
+ * @param {IIsFoundBoolFunc} [isFound] if the topic is found this function will be called with the found value
+ * @param {INotFoundFunc} [notFound] topic names to check
+ * @return {boolean|any}
+ */
+export function getMsgBoolValue(msg: any, ids: string | Array<string>, names?: string | Array<string>, isFound?: IIsFoundBoolFunc, notFound?: INotFoundFunc): boolean | any;
+/**
+ * check if the msg contains a property with value true (no payload check)
+ * @param {*} msg message
+ * @param {string|Array.<string>} ids property names to check
+ * @param {IIsFoundBoolFunc} [isFound] if the topic is found this function will be called with the found value
+ * @param {INotFoundFunc} [notFound] topic names to check
+ * @return {boolean|any}
+ */
+export function getMsgBoolValue2(msg: any, ids: string | Array<string>, isFound?: IIsFoundBoolFunc, notFound?: INotFoundFunc): boolean | any;
+/**
+ * check if thetopic contains one of the given names
+ * @param {*} msg message
+ * @param {string|Array.<string>} [names] topic names to check
+ * @param {IIsFoundBoolFunc} [isFound] if the topic is found this function will be called with the found value
+ * @param {INotFoundFunc} [notFound] topic names to check
+ * @return {boolean}
+ */
+export function getMsgTopicContains(msg: any, names?: string | Array<string>, isFound?: IIsFoundBoolFunc, notFound?: INotFoundFunc): boolean;
+/**
+ * @callback IIsFoundNumberFunc
+ * @param  {number} res -   Value of the found value
+ */
+/**
+ * @callback INotFoundFunc
+ * @param  {*} msg  -   message
+ *  @return {any}
+ */
+/**
+ * check the type of the message
+ * @param {*} msg message
+ * @param {string|Array.<string>} ids property names to check
+ * @param {string|Array.<string>} [names] topic names to check
+ * @param {IIsFoundNumberFunc} [isFound] if the topic is found this function will be called with the found value
+ * @param {INotFoundFunc} [notFound] topic names to check
+ * @return {number|any}
+ */
+export function getMsgNumberValue(msg: any, ids: string | Array<string>, names?: string | Array<string>, isFound?: IIsFoundNumberFunc, notFound?: INotFoundFunc): number | any;
+/**
+ * check the type of the message
+ * @param {*} msg message
+ * @param {string|Array.<string>} ids property names to check
+ * @param {IIsFoundNumberFunc} [isFound] if the topic is found this function will be called with the found value
+ * @param {INotFoundFunc} [notFound] topic names to check
+ * @return {number|any}
+ */
+export function getMsgNumberValue2(msg: any, ids: string | Array<string>, isFound?: IIsFoundNumberFunc, notFound?: INotFoundFunc): number | any;
+/**
+ * get a date for the special day in the given month
+ * @param {number} year year to check
+ * @param {number} month month to check
+ * @param {string} dayName  Name of the special day
+ * @returns {Date|null} last day of given month or null
+ */
+export function getSpecialDayOfMonth(year: number, month: number, dayName: string): Date | null;
+/*******************************************************************************************************/
+/**
+ * get a date for the first day of week in the given month
+ * @param {number} year year to check
+ * @param {number} month month to check
+ * @param {number} [dayOfWeek]  Day of week, where 0 is Sunday, 1 Monday ... 6 Saturday
+ * @returns {Date} first day of given month
+ */
+/**
+ * get a date for the specific day of week in the given month
+ * @param {number} year year to check
+ * @param {number} month month to check
+ * @param {number} [dayOfWeek] day of week 0=Sunday, 1=Monday, ..., 6=Saturday
+ * @param {number} [n] the nTh Numer of the day of week - 0 based
+ * @returns {Date} weekday of given month
+ */
+export function getNthWeekdayOfMonth(year: number, month: number, dayOfWeek?: number, n?: number): Date;
+/**
+ * get a date for the last day of week in the given month
+ * @param {number} year year to check
+ * @param {number} month month to check
+ * @param {number} [dayOfWeek]  Day of week, where 0 is Sunday, 1 Monday ... 6 Saturday
+ * @returns {Date} last day of given month
+ */
+export function getLastDayOfMonth(year: number, month: number, dayOfWeek?: number): Date;
+/*******************************************************************************************************/
+/**
+ * get the standard timezone offset without DST
+ * @param {Date} d - Date to check
+ * @returns {number} minutes of the timezone offset
+ */
+export function getStdTimezoneOffset(d: Date): number;
+/**
+ * check mif a given Date is DST
+ * @param {Date} d - Date to check
+ * @returns {boolean} _true_ if the given Date has DST
+ */
+export function isDSTObserved(d: Date): boolean;
+/*******************************************************************************************************/
+/**
+ * adds an offset to a given Date object (Warning: No copy of Date Object will be created and original Date Object could be changed!!)
+ * @param {Date} d Date object where the offset should be added
+ * @param {number} offset the offset (positive or negative) which should be added to the date. If no multiplier is given, the offset must be in milliseconds.
+ * @param {number} [multiplier] additional multiplier for the offset. Should be a positive Number. Special value -1 if offset is in month and -2 if offset is in years
+ * @return {Date|undefined|null}  Date with added offset
+ */
+export function addOffset(d: Date, offset: number, multiplier?: number): Date | undefined | null;
+/*******************************************************************************************************/
+/**
+ * calculates the number of days to get a positive date object
+ * @param {Array.<number>} days array of allowed days
+ * @param {number} daystart start day (0=Sunday)
+ * @return {number} number of days for the next valid day as offset to the daystart
+ */
+export function calcDayOffset(days: Array<number>, daystart: number): number;
+/**
+ * calculates the number of month to get a positive date object
+ * @param {Array.<number>} months array of allowed months
+ * @param {number} monthstart start month (0=January)
+ * @return {number} number of months for the next valid day as offset to the monthstart
+ */
+export function calcMonthOffset(months: Array<number>, monthstart: number): number;
+/**
+ * changes the time based on a timezone
+ * @param {Date} date Javascript Date object
+ * @param {number} timeZoneOffset Offset in Minutes
+  * @return {date} new date object with changed timezone to use with .toLocaleString()
+ */
+export function convertDateTimeZone(date: Date, timeZoneOffset: number): Date;
+/**
+ * checks if a value is a valid Date object
+ * @param {*} d - a value to check
+ * @returns {boolean} returns __true__ if it is a valid Date, otherwhise __false__
+ */
+export function isValidDate(d: any): boolean;
+/**
+ * Parse an ISO date string (i.e. "2019-01-18T00:00:00.000Z",
+ * "2019-01-17T17:00:00.000-07:00", or "2019-01-18T07:00:00.000+07:00",
+ * which are the same time) and return a JavaScript Date object with the
+ * value represented by the string.
+ * @param {string} isoString - a ISO 8601 format string
+ * @returns {Date} returns Date represtntation of the string
+ */
+export function isoStringToDate(isoString: string): Date;
+/**
+ * Round a date to the nearest full Hour
+ * @param {Date} date Date to round
+ * @returns {Date} Date round to next full Hour
+ */
+export function roundToHour(date: Date): Date;
+/*******************************************************************************************************/
+/**
+ * normalize date by adding offset, get only the next valid date, etc...
+ * @param {Date|number|object} d input Date to normalize
+ * @param {number} offset offset to add tot he Date object
+ * @param {number} multiplier multiplier for the offset
+ * @param {ILimitationsObj} [limit] additional limitations for the calculation
+ * @return {Date} a normalized date moved tot the future to fulfill all conditions
+ */
+export function normalizeDate(d: Date | number | object, offset: number, multiplier: number, limit?: ILimitationsObj): Date;
+/**
+ * calculates limitation of a date
+ * @param {ILimitationsObj} limit    -   limitation object
+ * @param {Date} d  -   Date to check
+ * @returns {ILimitedDate} result limited Date Object.
+ */
+export function limitDate(limit: ILimitationsObj, d: Date): ILimitedDate;
+/*******************************************************************************************************/
+/**
+ * parses a string which contains only a time to a Date object of today
+ * @param {string} t text representation of a time
+ * @param {Date} [date] bade Date object for parsing the time, now will be used if not defined
+ * @param {boolean} [utc] define if the time should be in utc
+ * @param {number} [timeZoneOffset] define a time zone offset if required
+ * @return {Date|null} the parsed date object or **null** if can not parsed
+ */
+export function getTimeOfText(t: string, date?: Date, utc?: boolean, timeZoneOffset?: number): Date | null;
+/*******************************************************************************************************/
+/**
+ * parses a string which contains a date or only a time to a Date object
+ * @param {any} dt number or text which contains a date or a time
+ * @param {boolean} preferMonthFirst if true, Dates with moth first should be preferd, otherwise month last (european)
+ * @param {boolean} [utc] indicates if the date should be in utc
+ * @param {number} [timeZoneOffset] timezone offset in minutes of the input date
+ * @param {Date} [dNow] base Date, if defined missing parts will be used from this Date object
+ * @return {Date} the parsed date object, throws an error if can not parsed
+ */
+export function getDateOfText(dt: any, preferMonthFirst: boolean, utc?: boolean, timeZoneOffset?: number, dNow?: Date): Date;
+/**
+ * For a given date, get the day number
+ * @param {Date} date date to get day number
+ * @returns {Array} day number, [UTCFullYear, dayNumber]
+ */
+export function getDayOfYear(date: Date): any[];
+/**
+ * For a given date, get the ISO week number
+ *
+ * Based on information at:
+ *
+ *    http://www.merlyn.demon.co.uk/weekcalc.htm#WNR
+ *
+ * Algorithm is to find nearest thursday, it's year
+ * is the year of the week number. Then get weeks
+ * between that date and the first day of that year.
+ *
+ * Note that dates in one year can be weeks of previous
+ * or next year, overlap is up to 3 days.
+ *
+ * e.g. 2014/12/29 is Monday in week  1 of 2015
+ *      2012/1/1   is Sunday in week 52 of 2011
+ *
+ * @param {Date} date date to get week number
+ * @returns {Array} ISO week number, [UTCFullYear, weekNumber]
+ */
+export function getWeekOfYear(date: Date): any[];
+/**
+ * gets a day id from a date
+ * @param {Date} d date to get day id from
+ */
+export function getUTCDayId(d: Date): number;
+/**
+ * gets a day id from a date
+ * @param {Date} d date to get day id from
+ */
+export function getDayId(d: Date): number;
+/*******************************************************************************************************/
+/*******************************************************************************************************/
+/**
+ * convert the time part of a date into a comparable number
+ * @param {Date} date  - date to convert
+ * @return {number}   numeric representation of the time part of the date
+ */
+export function getTimeNumberUTC(date: Date): number;
+/*******************************************************************************************************/
+/**
+ * get the timeout time
+ * @param {Date} base - base time (tyically new Date())
+ * @param {Date} time - time to schedule the timeout
+ * @returns {number} milliseconds until the defined Date
+ */
+export function getTimeOut(base: Date, time: Date): number;
+/*******************************************************************************************************/
+/**
+ * gives a ID of a node
+ * @param {any} node a node
+ * @returns {string} id of the given node
+ */
+export function getNodeId(node: any): string;
+/**
+ * pre defined formats of a given date
+ * @param  {Array.<string>}  [dayNames]      -  Array of day Names in short and ["Sunday", "Monday", ..., "Mo", "Tu", ...]
+ * @param  {Array.<string>}  [monthNames]    -  Array of month Names long and short ["January", "February", ..., "Jan", "Feb", ...]
+ * @param  {Array.<string>}  [dayDiffNames]  -  Array of names for relative day, starting 7 days ago ["1 week ago", "6 days ago", ..., "Yesterday", "Today", "Tomorrow", ...]
+ * @return {any}   returns a number, string or object depending on the given Format
+ */
+export function initializeParser(dayNames?: Array<string>, monthNames?: Array<string>, dayDiffNames?: Array<string>): any;
+/**
+ * pre defined formats of a given date
+ * @param  {Date | number}            date            -  JavaScript Date to format
+ * @param  {string | number}          [format]        -  format of the date
+ * @param  {boolean} [utc] - indicates if the formatted date should be in utc or not
+ * @param  {number} [timeZoneOffset] - timezone offset for conversation in minutes
+ * @return {any}   returns a number, string or object depending on the given Format
+ */
+export function getFormattedDateOut(date: Date | number, format?: string | number, utc?: boolean, timeZoneOffset?: number): any;
+/**
+ * parses a date string to given format definition
+ * @param {string} date date string to parse
+ * @param {number|string} format Format definition, if it is a number a predefined format will be try
+ * @param {Array.<string>} [dayNames] list of day names
+ * @param {Array.<string>} [monthNames] list of month names
+ * @param {Array.<string>} [dayDiffNames] list of day diff names
+ * @param {boolean} [utc] indicates if the date should be in utc
+ * @param {number} [timeZoneOffset] timezone offset in minutes of the input date
+ * @param {Date} [dNow] base Date, if defined missing parts will be used from this Date object
+ * @returns {Date} a Date object or throws an error if no patterns match.
+ */
+export function parseDateFromFormat(date: string, format: number | string, dayNames?: Array<string>, monthNames?: Array<string>, dayDiffNames?: Array<string>, utc?: boolean, timeZoneOffset?: number, dNow?: Date): Date;
+/**
+ * replaces placeholder in a string
+ * @param {string} text - the text to replace placeholders
+ * @param {object} textAttrs - an object with different propertys who are allowed as placeholders
+ * @param {object} RED - the object for the Node-Red API
+ * @param {object} [msg] - (optional) the message object for additional replace of message properties
+ * @returns {string} the text with replaced placeholders
+ */
+export function textReplace(text: string, textAttrs: object, RED: object, msg?: object): string;
+/******************************************************************************************/
+/**
+ * the definition of the time to compare
+ * @param {*} node the current node object
+ * @param {*} msg the message object
+* @returns {Date} Date object of given Date or now
+ */
+export function getNowTimeStamp(node: any, msg: any): Date;
+/**
+* the definition of the time to compare
+* @param {*} node the current node object
+* @param {*} msg the message object
+* @returns {ITimeObject} Date object of given Date or now
+*/
+export function getNowObject(node: any, msg: any): ITimeObject;
+/**
+ * get a value by a path
+ * @param {object} obj      object to get path from
+ * @param {string} path     path to property
+ * @returns the value of the property
+ */
+export function getDeepValue(obj: object, path: string): any;
+//# sourceMappingURL=dateTimeHelper.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/lib/dateTimeHelper.d.ts.map b/nodes/types/lib/dateTimeHelper.d.ts.map
new file mode 100644
index 00000000..8c78fab6
--- /dev/null
+++ b/nodes/types/lib/dateTimeHelper.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"dateTimeHelper.d.ts","sourceRoot":"","sources":["../../lib/dateTimeHelper.js"],"names":[],"mappings":"uCAinBY,MAAM;0CAML,GAAG;wCAmGJ,OAAO,0BAEP,MAAM;;;;;;;;;WAlrBJ,OAAO;;;;WACP,MAAO,MAAM,CAAC,GAAC,MAAM;;;;aACrB,MAAO,MAAM,CAAC,GAAC,MAAM;;;;kBACrB,OAAO;;;;mBACP,OAAO;;;;mBACP,OAAO;;;;oBACP,OAAO;;;;gBACP,IAAI;;;;;cACJ,IAAI;;;;;;UAOJ,IAAI;;;;gBACJ,OAAO;;;;WACP,MAAM;;AAIpB,kCAA4B;AAC5B,gCAA0B;AAC1B,gCAA0B;AAC1B,gCAA0B;AAC1B,iCAA2B;AAC3B,gCAA0B;AAC1B,gCAA0B;AAC1B,8BAAwB;AACxB,8BAAwB;AACxB,2BAAqB;AAkErB,yGAAyG;AA0BzG,yGAAyG;AAEzG,yGAAyG;AAEzG;;;;GAIG;AACH,kCAFa,OAAO,CAKnB;AACD;;;;GAIG;AACH,kCAFa,OAAO,CAKnB;AAED;;;;GAIG;AACH,mCAFa,OAAO,CAKnB;AAED;;;;;GAKG;AACH,qCAFa,OAAO,CAInB;AAED;;;;;GAKG;AACH,sCAFa,OAAO,CAInB;AAiED,yGAAyG;AACzG;;;;GAIG;AACH,wBAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;;;GAKG;AACH,yBAJW,GAAG,QACH,MAAM,GACJ,MAAM,CASlB;AA9ED;;;GAGG;AACH,iCAFW,MAAM,UAUhB;AAED;;;GAGG;AACH,oCAFW,MAAM,UAWhB;AAED;;;;GAIG;AACH,2BAHW,MAAM,GACL,MAAM,CAIjB;AAED;;;;GAIG;AACH,2BAHW,MAAM,GACL,MAAM,CAIjB;AAyFD,yGAAyG;AACzG;;;;;GAKG;AACH,iCAJW,MAAM,MACN,MAAM,GACL,MAAM,CASjB;AA5JD;;;GAGG;AACH,+CAEC;AAkFD,yGAAyG;AAKzG,yGAAyG;AAEzG,yGAAyG;AACzG;;;;;;GAMG;AACH,kCALW,GAAG,6BAEH,KAAK,cACL,MAAM,QA4BhB;AAED,yGAAyG;AACzG;;;;;GAKG;AACH,oCAJW,GAAG,cACH,GAAG,GACD,GAAG,CAIf;AAgPD,yGAAyG;AACzG;;;;;;GAMG;AACH,iCALW,MAAM,QACN,MAAM,SACN,MAAM,GACL,OAAO,CAkBlB;AA2GD;;;;;GAKG;AAEH;;;;;;;;GAQG;AACH,+CANW,MAAM,GAAC,MAAO,MAAM,CAAC,UACrB,MAAM,GAAC,MAAO,MAAM,CAAC,YACrB,gBAAgB,aAChB,aAAa,GACZ,OAAO,GAAC,GAAG,CAwBtB;AAED;;;;;;;GAOG;AACH,gDALW,MAAM,GAAC,MAAO,MAAM,CAAC,YACrB,gBAAgB,aAChB,aAAa,GACZ,OAAO,GAAC,GAAG,CAuBtB;AAED;;;;;;;GAOG;AACH,sDALW,MAAM,GAAC,MAAO,MAAM,CAAC,YACrB,gBAAgB,aAChB,aAAa,GACZ,OAAO,CAuBlB;AA7MD;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,iDANW,MAAM,GAAC,MAAO,MAAM,CAAC,UACrB,MAAM,GAAC,MAAO,MAAM,CAAC,YACrB,kBAAkB,aAClB,aAAa,GACZ,MAAM,GAAC,GAAG,CAmDrB;AAED;;;;;;;GAOG;AACH,kDALW,MAAM,GAAC,MAAO,MAAM,CAAC,YACrB,kBAAkB,aAClB,aAAa,GACZ,MAAM,GAAC,GAAG,CA0BrB;AA9SD;;;;;;GAMG;AACH,2CALW,MAAM,SACN,MAAM,WACN,MAAM,GACJ,IAAI,GAAC,IAAI,CAkCrB;AAzFD,yGAAyG;AACzG;;;;;;GAMG;AAUH;;;;;;;GAOG;AACH,2CANW,MAAM,SACN,MAAM,cACN,MAAM,MACN,MAAM,GACJ,IAAI,CAShB;AAED;;;;;;GAMG;AACH,wCALW,MAAM,SACN,MAAM,cACN,MAAM,GACJ,IAAI,CAShB;AAuZD,yGAAyG;AACzG;;;;GAIG;AACH,wCAHW,IAAI,GACF,MAAM,CAOlB;AAED;;;;GAIG;AACH,iCAHW,IAAI,GACF,OAAO,CAKnB;AAqHD,yGAAyG;AACzG;;;;;;GAMG;AACH,6BALW,IAAI,UACJ,MAAM,eACN,MAAM,GACL,IAAI,GAAC,SAAS,GAAC,IAAI,CAe9B;AAED,yGAAyG;AACzG;;;;;GAKG;AACH,oCAJW,MAAO,MAAM,CAAC,YACd,MAAM,GACL,MAAM,CAejB;AAED;;;;;GAKG;AACH,wCAJW,MAAO,MAAM,CAAC,cACd,MAAM,GACL,MAAM,CAejB;AAnLD;;;;;GAKG;AACH,0CAJW,IAAI,kBACJ,MAAM,QAShB;AAED;;;;GAIG;AACH,qCAFa,OAAO,CAMnB;AAED;;;;;;;GAOG;AACH,2CAHW,MAAM,GACJ,IAAI,CAiEhB;AAUD;;;;GAIG;AACH,kCAHW,IAAI,GACF,IAAI,CAIhB;AAoED,yGAAyG;AACzG;;;;;;;GAOG;AACH,iCANW,IAAI,GAAC,MAAM,GAAC,MAAM,UAClB,MAAM,cACN,MAAM,UACN,eAAe,GACd,IAAI,CAsBf;AAED;;;;;GAKG;AACH,iCAJW,eAAe,KACf,IAAI,GACF,YAAY,CA2FxB;AAED,yGAAyG;AACzG;;;;;;;GAOG;AACH,iCANW,MAAM,SACN,IAAI,QACJ,OAAO,mBACP,MAAM,GACL,IAAI,GAAC,IAAI,CAiDpB;AACD,yGAAyG;AACzG;;;;;;;;GAQG;AACH,kCAPW,GAAG,oBACH,OAAO,QACP,OAAO,mBACP,MAAM,SACN,IAAI,GACH,IAAI,CAoEf;AA3xBD;;;;GAIG;AACH,mCAHW,IAAI,SAOd;AA3CD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,oCAHW,IAAI,SAed;AAaD;;;GAGG;AACH,+BAFW,IAAI,UAId;AAED;;;GAGG;AACH,4BAFW,IAAI,UAId;AAgDD,yGAAyG;AAEzG,yGAAyG;AACzG;;;;GAIG;AACH,uCAHW,IAAI,GACH,MAAM,CAIjB;AACD,yGAAyG;AACzG;;;;;GAKG;AACH,iCAJW,IAAI,QACJ,IAAI,GACF,MAAM,CAQlB;AArUD,yGAAyG;AACzG;;;;GAIG;AACH,gCAHW,GAAG,GACD,MAAM,CAIlB;AAmpCD;;;;;;GAMG;AACH,4CALY,MAAO,MAAM,CAAC,eACd,MAAO,MAAM,CAAC,iBACd,MAAO,MAAM,CAAC,GACd,GAAG,CASd;AA0ED;;;;;;;GAOG;AACH,0CANY,IAAI,GAAG,MAAM,WACb,MAAM,GAAG,MAAM,QACf,OAAO,mBACP,MAAM,GACN,GAAG,CA2Kd;AAqdD;;;;;;;;;;;GAWG;AACH,0CAVW,MAAM,UACN,MAAM,GAAC,MAAM,aACb,MAAO,MAAM,CAAC,eACd,MAAO,MAAM,CAAC,iBACd,MAAO,MAAM,CAAC,QACd,OAAO,mBACP,MAAM,SACN,IAAI,GACF,IAAI,CA2HhB;AAeD;;;;;;;GAOG;AACH,kCANW,MAAM,aACN,MAAM,OACN,MAAM,QACN,MAAM,GACJ,MAAM,CA6ClB;AAj0DD,4FAA4F;AAC5F;;;;;GAKG;AACH,sDAFY,IAAI,CAoBf;AAED;;;;;EAKE;AACF,mDAFY,WAAW,CActB;AAotDD;;;;;GAKG;AACH,kCAJW,MAAM,QACN,MAAM,OAQhB"}
\ No newline at end of file
diff --git a/nodes/types/lib/timeControlHelper.d.ts b/nodes/types/lib/timeControlHelper.d.ts
new file mode 100644
index 00000000..9bc57925
--- /dev/null
+++ b/nodes/types/lib/timeControlHelper.d.ts
@@ -0,0 +1,689 @@
+/**
+ * Timestamp compare function
+ */
+export type ICompareTimeStamp = (timeStamp: number) => boolean;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeRED = import('../types/typedefs.js').runtimeRED;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNode = import('../types/typedefs.js').runtimeNode;
+/**
+ * --- Type Defs ---
+ */
+export type runtimeNodeConfig = import('../types/typedefs.js').runtimeNodeConfig;
+/**
+ * --- Type Defs ---
+ */
+export type ITimeObject = import("./dateTimeHelper.js").ITimeObject;
+/**
+ * --- Type Defs ---
+ */
+export type ILimitationsObj = import("./dateTimeHelper.js").ILimitationsObj;
+/**
+ * --- Type Defs ---
+ */
+export type IPositionConfigNode = import("../10-position-config.js").IPositionConfigNode;
+/**
+ * --- Type Defs ---
+ */
+export type ITimePropertyResult = import("../10-position-config.js").ITimePropertyResult;
+/**
+ * object for sore autotrigger data
+ */
+export type IAutoTrigger = {
+    /**
+     * - default next autotriggering time
+     */
+    defaultTime: number;
+    /**
+     * - type of next autotriggering
+     */
+    type: (0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9);
+    /**
+     * - next autotrigger in milliseconds
+     */
+    time: number;
+    /**
+     * - autotrigger TimeOut Object
+     */
+    timer?: NodeJS.Timeout;
+};
+/**
+ * object for a rule condition
+ */
+export type IRuleCondition = {
+    /**
+     * - position of the condition
+     */
+    condition: number;
+    /**
+     * - description of the condition
+     */
+    conditionText?: string;
+    /**
+     * - first operand
+     */
+    value: string | number;
+    /**
+     * - first operand type
+     */
+    valueType: string;
+    /**
+     * - JSONATA expression
+     */
+    valueExpr?: Function;
+    /**
+     * - first operand description
+     */
+    valueName?: string;
+    /**
+     * - first operand description (short version)
+     */
+    valueNameShort?: string;
+    /**
+     * - opCallback value
+     */
+    valueWorth?: string;
+    /**
+     * - operator
+     */
+    operator: string;
+    /**
+     * - operator description
+     */
+    operatorText?: string;
+    /**
+     * - operator description enhanced
+     */
+    operatorDescription?: string;
+    /**
+     * - second operand
+     */
+    threshold: string;
+    /**
+     * - second operand type
+     */
+    thresholdType: string;
+    /**
+     * - JSONATA expression
+     */
+    thresholdExpr?: Function;
+    /**
+     * - second operand description
+     */
+    thresholdName?: string;
+    /**
+     * - second operand description (short version)
+     */
+    thresholdNameShort?: string;
+    /**
+     * - opCallback value
+     */
+    thresholdWorth?: string;
+    /**
+     * - comparision text
+     */
+    text?: string;
+    /**
+     * - comparision text (short version)
+     */
+    textShort?: string;
+    /**
+     * - result of the condition evaluation
+     */
+    result: boolean;
+};
+/**
+ * object for a rule condition
+ */
+export type IRuleConditionResult = {
+    /**
+     * - selected condition index
+     */
+    index: number;
+    /**
+     * - comparision text
+     */
+    text?: string;
+    /**
+     * - comparision text (short version)
+     */
+    textShort?: string;
+    /**
+     * - result of the condition evaluation
+     */
+    result: boolean;
+};
+/**
+ * object for a rule time definition
+ */
+export type IRuleTimeDefSingle = {
+    /**
+     * - time value
+     */
+    value: string;
+    /**
+     * - type of the time
+     */
+    type: string;
+    /**
+     * - time offset value
+     */
+    offset: string | number;
+    /**
+     * - time offset type
+     */
+    offsetType: string;
+    /**
+     * - time offset value
+     */
+    multiplier: number;
+    /**
+     * - time offset value
+     */
+    next: boolean;
+    /**
+     * - start time definition
+     */
+    now?: Date;
+};
+/**
+ * object for a rule time definition
+ */
+export type IRuleTimeDef = {
+    /**
+     * - time value
+     */
+    value: string;
+    /**
+     * - type of the time
+     */
+    type: string;
+    /**
+     * - time offset value
+     */
+    offset: string | number;
+    /**
+     * - time offset type
+     */
+    offsetType: string;
+    /**
+     * - time offset value
+     */
+    multiplier: number;
+    /**
+     * - time offset value
+     */
+    next: boolean;
+    /**
+     * - start time definition
+     */
+    now?: Date;
+    /**
+     * - minimum limitation to the time
+     */
+    min?: IRuleTimeDefSingle;
+    /**
+     * - maximum limitation to the time
+     */
+    max?: IRuleTimeDefSingle;
+};
+/**
+ * object for a rule time definition
+ */
+export type IRuleTimesDefInt = {
+    /**
+     * - start time definition
+     */
+    start?: IRuleTimeDef;
+    /**
+     * - end time definition
+     */
+    end?: IRuleTimeDef;
+};
+/**
+ * object for a rule time definition
+ */
+export type IRuleTimesDef = ILimitationsObj & IRuleTimesDefInt;
+/**
+ * object for a rule time definition
+ */
+export type ITimePropertyResultInt = {
+    /**
+     * - time in milliseconds
+     */
+    ts: number;
+    /**
+     * - day id of the date
+     */
+    dayId: number;
+    /**
+     * - time representation
+     */
+    timeLocal?: string;
+    /**
+     * - time representation
+     */
+    timeLocalDate?: string;
+    /**
+     * - time representation
+     */
+    dateISO?: string;
+    /**
+     * - time representation
+     */
+    dateUTC?: string;
+    /**
+     * - source of the data if it comes from minimum or maximum limitation
+     */
+    source?: ('default' | 'min' | 'max');
+};
+/**
+ * object for a rule time definition
+ */
+export type ITimePropResult = ITimePropertyResultInt & ITimePropertyResult;
+/**
+ * object for a rule time definition
+ */
+export type IRuleTimeDataDef = {
+    /**
+     * - start time definition
+     */
+    start?: ITimePropResult;
+    /**
+     * - end time definition
+     */
+    end?: ITimePropResult;
+    /**
+     * - start time definition
+     */
+    now?: number;
+};
+/**
+ * object for a rule time definition
+ */
+export type IRuleTimeDataMinMaxDef = {
+    /**
+     * - start time definition
+     */
+    start?: ITimePropResult;
+    /**
+     * - end time definition
+     */
+    end?: ITimePropResult;
+};
+/**
+ * object for a rule
+ */
+export type IRuleData = {
+    /**
+     * - defines if a rle is enabled or disabled
+     */
+    enabled: boolean;
+    /**
+     * - rule position
+     */
+    pos: number;
+    /**
+     * - name of the rule
+     */
+    name: string;
+    /**
+     * - executuion type of a rule which is defined
+     */
+    exec: number;
+    /**
+     * - executuion type of a rule which is used
+     */
+    execUse: number;
+    /**
+     * - overwrites reset
+     */
+    resetOverwrite: boolean;
+    /**
+     * - importance of the rule
+     */
+    importance: number;
+    /**
+     * - defines if the rule has conditions
+     */
+    conditional: boolean;
+    /**
+     * - conditions for a rule
+     */
+    conditions: Array<IRuleCondition>;
+    /**
+     * - condition resule
+     */
+    conditonResult: IRuleConditionResult;
+    /**
+     * - rule time Data
+     */
+    time?: IRuleTimesDef;
+    /**
+     * - object for storing time Data
+     */
+    timeResult?: IRuleTimeDataDef;
+    /**
+     * - object for storing time Data
+     */
+    timeResultMin?: IRuleTimeDataMinMaxDef;
+    /**
+     * - object for storing time Data
+     */
+    timeResultMax?: IRuleTimeDataMinMaxDef;
+    /**
+     * - rule time Data
+     */
+    payload?: any;
+    /**
+     * - rule time Data
+     */
+    level?: any;
+    /**
+     * - rule time Data
+     */
+    slat?: any;
+    /**
+     * - rule time Data
+     */
+    topic: string;
+    /**
+     * - rule time Data
+     */
+    outputValue?: any;
+    /**
+     * - rule time Data
+     */
+    outputType?: string;
+};
+/**
+ * object for a rule result
+ */
+export type IRuleResultData = {
+    /**
+     * - index of selected rule
+     */
+    ruleindex: number;
+    /**
+     * - selected rule
+     */
+    ruleSel?: IRuleData;
+    /**
+     * - selected rule
+     */
+    ruleSlatOvs?: IRuleData;
+    /**
+     * - selected rule
+     */
+    ruleTopicOvs?: IRuleData;
+    /**
+     * - selected rule
+     */
+    ruleSelMin?: IRuleData;
+    /**
+     * - selected rule
+     */
+    ruleSelMax?: IRuleData;
+    /**
+     * - object for storing time Data
+     */
+    timeResult?: IRuleTimeDataDef;
+    /**
+     * - object for storing time Data
+     */
+    timeResultMin?: IRuleTimeDataDef;
+    /**
+     * - object for storing time Data
+     */
+    timeResultMax?: IRuleTimeDataDef;
+};
+/**
+ * object for a rule
+ */
+export type IRulesData = {
+    /**
+     * - the rules itself
+     */
+    data: Array<IRuleData>;
+    /**
+     * - executuion type of a rule which is defined
+     */
+    count: number;
+    /**
+     * - last rule for first evaluation loop
+     */
+    last1stRun: number;
+    /**
+     * - maximum inportance of all rules
+     */
+    maxImportance: number;
+    /**
+     * - __true__ if any rule can overwrite reset
+     */
+    canResetOverwrite: boolean;
+};
+/**
+ * object for a rule
+ */
+export type ISunData = {
+    /**
+     * - mode of the sun
+     */
+    mode: (0 | 1 | 3 | 16);
+    /**
+     * - maximum mode
+     */
+    modeMax: (0 | 1 | 3 | 16);
+    /**
+     * - floorLength value
+     */
+    floorLength: string;
+    /**
+     * - type of the floorLength
+     */
+    floorLengthType: string;
+    /**
+     * - timestamp of the next change
+     */
+    changeAgain: number;
+    /**
+     * - minimum delta
+     */
+    minDelta: number;
+    /**
+     * - rule time Data
+     */
+    level?: any;
+    /**
+     * - rule time Data
+     */
+    slat?: any;
+    /**
+     * - rule time Data
+     */
+    topic: string;
+};
+/**
+ * Extensions for the nodeInstance object type
+ */
+export type ITimeControlNodeInstance = {
+    /**
+     * -   tbd
+     */
+    positionConfig: IPositionConfigNode;
+    /**
+     * internal used additional id
+     */
+    addId: string;
+    /**
+     * get/set generic Data of the node
+     */
+    nodeData: any;
+    /**
+     * -   tbd
+     */
+    reason: any;
+    /**
+     * -   used context store
+     */
+    contextStore: string;
+    /**
+     * -   definition of the rule Data
+     */
+    rules: IRulesData;
+    /**
+     * -   indicator if the Level is in reverse order
+     */
+    levelReverse?: boolean;
+    /**
+     * -   the sun data Object
+     */
+    sunData?: ISunData;
+    /**
+     * -   tbd
+     */
+    nowarn: any;
+    /**
+     * -   tbd
+     */
+    results: Array<any>;
+    /**
+     * autotrigger options
+     */
+    autoTrigger: IAutoTrigger;
+    /**
+     * -   tbd
+     */
+    startDelayTimeOut: any;
+    /**
+     * -   tbd
+     */
+    startDelayTimeOutObj: NodeJS.Timeout;
+    /**
+     * -   Overwrite Reset TimeOut Object
+     * ... obviously there are more ...
+     */
+    timeOutObj: NodeJS.Timeout;
+};
+/**
+ * Combine nodeInstance with additional, optional functions
+ */
+export type ITimeControlNode = ITimeControlNodeInstance & runtimeNode;
+/******************************************************************************************/
+/**
+* Timestamp compare function
+* @callback ICompareTimeStamp
+* @param {number} timeStamp The timestamp which should be compared
+* @returns {Boolean} return true if if the timestamp is valid, otherwise false
+*/
+/******************************************************************************************/
+/**
+ * Returns true if the given object is null or undefined. Otherwise, returns false.
+ * @param {*} object    object to check
+ * @returns {boolean}   true if the given object is null or undefined. Otherwise, returns false.
+ */
+export function isNullOrUndefined(object: any): boolean;
+/**
+ * evaluate temporary Data
+ * @param {ITimeControlNode} node   node Data
+ * @param {string} type  type of type input
+ * @param {string} value  value of typeinput
+ * @param {*} data  data to cache
+ * @param {Object} tempData  object which holding the chached data
+ * @returns {*}  data which was cached
+ */
+export function evalTempData(node: ITimeControlNode, type: string, value: string, data: any, tempData: any): any;
+/**
+* reset any existing override
+* @param {ITimeControlNode} node node data
+*/
+export function posOverwriteReset(node: ITimeControlNode): void;
+/**
+* setup the expiring of n override or update an existing expiring
+* @param {ITimeControlNode} node node data
+* @param {ITimeObject} oNow the *current* date Object
+* @param {number} dExpire the expiring time, (if it is NaN, default time will be tried to use) if it is not used, nor a Number or less than 1 no expiring activated
+*/
+export function setExpiringOverwrite(node: ITimeControlNode, oNow: ITimeObject, dExpire: number, reason: any): void;
+/**
+* check if an override can be reset
+* @param {ITimeControlNode} node node data
+* @param {Object} msg message object
+* @param {ITimeObject} oNow the *current* date Object
+*/
+export function checkOverrideReset(node: ITimeControlNode, msg: any, oNow: ITimeObject, isSignificant: any): void;
+/**
+* setting the reason for override
+* @param {ITimeControlNode} node node data
+*/
+export function setOverwriteReason(node: ITimeControlNode): boolean;
+/******************************************************************************************/
+/**
+ * pre-checking conditions to may be able to store temp data
+ * @param {ITimeControlNode} node node data
+ * @param {Object} msg the message object
+ * @param {Object} tempData the temporary storage object
+ * @param {Date} dNow simple Date Object
+ */
+export function prepareRules(node: ITimeControlNode, msg: any, tempData: any, dNow: Date): void;
+/**
+ * get time constrainty of a rule
+ * @param {ITimeControlNode} node node data
+ * @param {Object} msg the message object
+ * @param {IRuleData} rule the rule data
+ * @param {('start'|'end')} timep rule type
+ * @param {Date} dNow base timestamp
+ * @param {number} def default value
+ */
+export function getRuleTimeData(node: ITimeControlNode, msg: any, rule: IRuleData, timep: ('start' | 'end'), dNow: Date, def: number): void;
+/*************************************************************************************************************************/
+/**
+ * check if a level has a valid value
+ * @param {ITimeControlNode} node the node data
+ * @param {number} level the level to check
+ * @returns {boolean} true if the level is valid, otherwise false
+ */
+export function validPosition(node: ITimeControlNode, level: number, allowRound: any): boolean;
+/*************************************************************************************************************************/
+/**
+ * function to check a rule
+ * @param {ITimeControlNode} node the node object
+ * @param {Object} msg the message object
+ * @param {IRuleData} rule a rule object to test
+ * @param {ITimeObject} tData Now time object
+ * @returns {IRuleData|null} returns the rule if rule is valid, otherwhise null
+ */
+export function compareRules(node: ITimeControlNode, msg: any, rule: IRuleData, tData: ITimeObject): IRuleData | null;
+/******************************************************************************************/
+/**
+ * check all rules and determinate the active rule
+ * @param {ITimeControlNode} node node data
+ * @param {Object} msg the message object
+ * @param {ITimeObject} oNow the *current* date Object
+ * @param {Object} tempData the object storing the temporary caching data
+ * @returns {IRuleResultData} the active rule or null
+ */
+export function getActiveRule(node: ITimeControlNode, msg: any, oNow: ITimeObject, tempData: any): IRuleResultData;
+/**
+ * initializes the node
+ * @param {runtimeRED} REDLib the level to check
+ * @param {ITimeControlNode} node the node data
+ * @param {Object} config the level to check
+ */
+export function initializeCtrl(REDLib: runtimeRED, node: ITimeControlNode, config: any): void;
+export namespace cRuleType {
+    const absolute: number;
+    const levelMinOversteer: number;
+    const levelMaxOversteer: number;
+    const slatOversteer: number;
+    const topicOversteer: number;
+    const off: number;
+}
+export const cRuleDefault: -1;
+export const cRuleLogOperatorAnd: 2;
+export const cRuleLogOperatorOr: 1;
+//# sourceMappingURL=timeControlHelper.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/lib/timeControlHelper.d.ts.map b/nodes/types/lib/timeControlHelper.d.ts.map
new file mode 100644
index 00000000..1ff45469
--- /dev/null
+++ b/nodes/types/lib/timeControlHelper.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"timeControlHelper.d.ts","sourceRoot":"","sources":["../../lib/timeControlHelper.js"],"names":[],"mappings":";;;4CAwRU,MAAM;;;;yBA5PH,OAAO,sBAAsB,EAAE,UAAU;;;;0BACzC,OAAO,sBAAsB,EAAE,WAAW;;;;gCAC1C,OAAO,sBAAsB,EAAE,iBAAiB;;;;0BAChD,OAAO,qBAAqB,EAAE,WAAW;;;;8BACzC,OAAO,qBAAqB,EAAE,eAAe;;;;kCAC7C,OAAO,0BAA0B,EAAE,mBAAmB;;;;kCACtD,OAAO,0BAA0B,EAAE,mBAAmB;;;;;;;;iBAKrD,MAAM;;;;UACN,CAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,CAAC,CAAC;;;;UACrB,MAAM;;;;YACN,OAAO,OAAO;;;;;;;;;eAMd,MAAM;;;;oBACN,MAAM;;;;WACN,MAAM,GAAC,MAAM;;;;eACb,MAAM;;;;;;;;gBAEN,MAAM;;;;qBACN,MAAM;;;;iBACN,MAAM;;;;cACN,MAAM;;;;mBACN,MAAM;;;;0BACN,MAAM;;;;eACN,MAAM;;;;mBACN,MAAM;;;;;;;;oBAEN,MAAM;;;;yBACN,MAAM;;;;qBACN,MAAM;;;;WACN,MAAM;;;;gBACN,MAAM;;;;YACN,OAAO;;;;;;;;;WAMP,MAAM;;;;WACN,MAAM;;;;gBACN,MAAM;;;;YACN,OAAO;;;;;;;;;WAMP,MAAM;;;;UACN,MAAM;;;;YACN,MAAM,GAAC,MAAM;;;;gBACb,MAAM;;;;gBACN,MAAM;;;;UACN,OAAO;;;;UACP,IAAI;;;;;;;;;WAMJ,MAAM;;;;UACN,MAAM;;;;YACN,MAAM,GAAC,MAAM;;;;gBACb,MAAM;;;;gBACN,MAAM;;;;UACN,OAAO;;;;UACP,IAAI;;;;UACJ,kBAAkB;;;;UAClB,kBAAkB;;;;;;;;;YAMlB,YAAY;;;;UACZ,YAAY;;;;;4BAIb,eAAe,GAAG,gBAAgB;;;;;;;;QAMjC,MAAM;;;;WACN,MAAM;;;;gBACN,MAAM;;;;oBACN,MAAM;;;;cACN,MAAM;;;;cACN,MAAM;;;;aACN,CAAC,SAAS,GAAC,KAAK,GAAC,KAAK,CAAC;;;;;8BAIxB,sBAAsB,GAAG,mBAAmB;;;;;;;;YAM3C,eAAe;;;;UACf,eAAe;;;;UACf,MAAM;;;;;;;;;YAMN,eAAe;;;;UACf,eAAe;;;;;;;;;aAKf,OAAO;;;;SACP,MAAM;;;;UACN,MAAM;;;;UACN,MAAM;;;;aACN,MAAM;;;;oBACN,OAAO;;;;gBACP,MAAM;;;;iBACN,OAAO;;;;gBACP,MAAO,cAAc,CAAC;;;;oBACtB,oBAAoB;;;;WACpB,aAAa;;;;iBACb,gBAAgB;;;;oBAChB,sBAAsB;;;;oBACtB,sBAAsB;;;;;;;;;;;;;;;;WAItB,MAAM;;;;;;;;iBAEN,MAAM;;;;;;;;;eAKN,MAAM;;;;cACN,SAAS;;;;kBACT,SAAS;;;;mBACT,SAAS;;;;iBACT,SAAS;;;;iBACT,SAAS;;;;iBACT,gBAAgB;;;;oBAChB,gBAAgB;;;;oBAChB,gBAAgB;;;;;;;;;UAKhB,MAAO,SAAS,CAAC;;;;WACjB,MAAM;;;;gBACN,MAAM;;;;mBACN,MAAM;;;;uBACN,OAAO;;;;;;;;;UAKP,CAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,EAAE,CAAC;;;;aACV,CAAC,CAAC,GAAC,CAAC,GAAC,CAAC,GAAC,EAAE,CAAC;;;;iBACV,MAAM;;;;qBACN,MAAM;;;;iBACN,MAAM;;;;cACN,MAAM;;;;;;;;;;;;WAGN,MAAM;;;;;;;;;oBAKN,mBAAmB;;;;WACnB,MAAM;;;;;;;;;;;;kBAGN,MAAM;;;;WACN,UAAU;;;;mBAEV,OAAO;;;;cACP,QAAQ;;;;;;;;aAGR,UAAc;;;;iBAEd,YAAY;;;;;;;;0BAGZ,OAAO,OAAO;;;;;gBACd,OAAO,OAAO;;;;;+BAKf,wBAAwB,GAAG,WAAW;AA8CnD,4FAA4F;AAC5F;;;;;EAKE;AAEF,4FAA4F;AAE5F;;;;GAIG;AACH,gDAFa,OAAO,CAInB;AAED;;;;;;;;GAQG;AACH,mCAPW,gBAAgB,QAChB,MAAM,SACN,MAAM,iCAwBhB;AAgBD;;;EAGE;AACF,wCAFU,gBAAgB,QAczB;AAED;;;;;EAKE;AACF,2CAJU,gBAAgB,QAChB,WAAW,WACX,MAAM,qBAoCf;AAED;;;;;EAKE;AACF,yCAJU,gBAAgB,kBAEhB,WAAW,4BAqBpB;AACD;;;EAGE;AACF,yCAFU,gBAAgB,WAyBzB;AACD,4FAA4F;AAC5F;;;;;;GAMG;AACH,mCALW,gBAAgB,iCAGhB,IAAI,QAgEd;AAED;;;;;;;;GAQG;AACH,sCAPW,gBAAgB,kBAEhB,SAAS,SACT,CAAC,OAAO,GAAC,KAAK,CAAC,QACf,IAAI,OACJ,MAAM,QA2DhB;AAmND,2HAA2H;AAC3H;;;;;GAKG;AACH,oCAJW,gBAAgB,SAChB,MAAM,oBACJ,OAAO,CAqCnB;AA3PD,2HAA2H;AAC3H;;;;;;;GAOG;AACH,mCANW,gBAAgB,kBAEhB,SAAS,SACT,WAAW,GACT,SAAS,GAAC,IAAI,CAoG1B;AACD,4FAA4F;AAC5F;;;;;;;GAOG;AACH,qCANW,gBAAgB,kBAEhB,WAAW,kBAET,eAAe,CA6F3B;AA6CD;;;;;GAKG;AACH,uCAJW,UAAU,QACV,gBAAgB,qBAoe1B;;;;;;;;;AAhkCD,8BAAwB;AACxB,oCAA8B;AAC9B,mCAA6B"}
\ No newline at end of file
diff --git a/nodes/types/typedefs.js b/nodes/types/typedefs.js
index 0bbd8d32..bf5603f4 100644
--- a/nodes/types/typedefs.js
+++ b/nodes/types/typedefs.js
@@ -22,6 +22,12 @@
  *
  */
 
+/** editorRED
+ * @typedef {Object} RED The Node-RED core object available to a custom node's .html file
+ *
+ */
+
+
 /** editorRED
  * @typedef {Object} editorRED The Node-RED core object available to a custom node's .html file
  *
diff --git a/nodes/types/types/typedefs.d.ts b/nodes/types/types/typedefs.d.ts
new file mode 100644
index 00000000..243feb83
--- /dev/null
+++ b/nodes/types/types/typedefs.d.ts
@@ -0,0 +1,734 @@
+/**
+ * The Node-RED core object available to a custom node's .html file
+ */
+export type RED = any;
+/**
+ * The Node-RED core object available to a custom node's .html file
+ */
+export type editorRED = any;
+/**
+ * Logging. Levels that are output to the Node-RED log are controlled by the logging.console.level setting in settings.js
+ */
+export type runtimeLogging = {
+    /**
+     * Lvel 0. Lowest level, things that have broken Node-RED only.
+     */
+    fatal: Function;
+    /**
+     * Level 1. Copy is sent to Editor debug panel as well as error log.
+     */
+    error: Function;
+    /**
+     * Level 2.
+     */
+    warn: Function;
+    /**
+     * Level 3.
+     */
+    log: Function;
+    /**
+     * Level 4.
+     */
+    debug: Function;
+    /**
+     * Level 5. Very verbose output. Should tell the operator everything that is going on.
+     */
+    trace: Function;
+    metric: Function;
+    audit: Function;
+    addHandler: Function;
+    removeHandler: Function;
+};
+/**
+ * Gives access to other active nodes in the flows.
+ */
+export type runtimeNodes = {
+    /**
+     * Register a new type of node to Node-RED.
+     */
+    registerType: Function;
+    /**
+     * Create a node instance (called from within registerType function).
+     */
+    createNode: Function;
+    /**
+     * Get a reference to another node instance in the current flows. Can then access its properties.
+     */
+    getNode: Function;
+    /**
+     * : [Function: eachNode],
+     */
+    eachNode: Function;
+    /**
+     * : [Function: add],
+     */
+    addCredentials: Function;
+    /**
+     * : [Function: get],
+     */
+    getCredentials: Function;
+    /**
+     * : [Function: delete],
+     */
+    deleteCredentials: Function;
+};
+/**
+ * The core Node-RED runtime object
+ */
+export type runtimeRED = {
+    /**
+     * Reference to the ExpressJS app for Node-RED Admin including the Editor
+     */
+    httpAdmin: expressApp;
+    /**
+     * Reference to the ExpressJS app for Node-RED user-facing nodes including http-in/-out and Dashboard
+     */
+    httpNode: expressApp;
+    /**
+     * Node.js http(s) Server object
+     */
+    server: any;
+    /**
+     * Logging.
+     */
+    log: runtimeLogging;
+    /**
+     * Gives access to other active nodes in the flows.
+     */
+    nodes: runtimeNodes;
+    /**
+     * Static and Dynamic settings for Node-RED runtime
+     */
+    settings: any;
+    /**
+     * Get the Node-RED version
+     */
+    version: Function;
+    /**
+     * : [Function: requireModule],
+     */
+    require: Function;
+    comms: {
+        publish: Function;
+    };
+    library: {
+        register: Function;
+    };
+    auth: {
+        needsPermission: Function;
+    };
+    /**
+     * : get a i18N string,
+     */
+    _: Function;
+    /**
+     * Event handler object
+     */
+    events: {
+        on: Function;
+        once: Function;
+        addListener: Function;
+    };
+    hooks: {
+        has: Function;
+        clear: Function;
+        add: Function;
+        remove: Function;
+        trigger: Function;
+    };
+    util: {
+        encodeObject: Function;
+        ensureString: Function;
+        ensureBuffer: Function;
+        cloneMessage: Function;
+        compareObjects: Function;
+        generateId: Function;
+        getMessageProperty: Function;
+        setMessageProperty: Function;
+        getObjectProperty: Function;
+        setObjectProperty: Function;
+        evaluateNodeProperty: Function;
+        normalisePropertyExpression: Function;
+        normaliseNodeTypeName: Function;
+        prepareJSONataExpression: Function;
+        evaluateJSONataExpression: Function;
+        parseContextStore: Function;
+    };
+};
+/**
+ * Local copy of the node instance config + other info
+ */
+export type runtimeNode = {
+    /**
+     * Send a Node-RED msg to an output port
+     */
+    send: Function;
+    /**
+     * function for let node emit a message
+     */
+    emit: Function;
+    /**
+     * Dummy done function for pre-Node-RED 1.0 servers
+     */
+    done: Function;
+    /**
+     * get/set context data. Also .flow and .global contexts
+     */
+    context: Function;
+    /**
+     * Event listeners for the node instance ('input', 'close')
+     */
+    on: Function;
+    /**
+     * Event handling
+     */
+    removeListener: Function;
+    /**
+     * Error log output, also logs to the Editor's debug panel
+     */
+    error: Function;
+    /**
+     * Warning log output, also logs to the Editor's debug panel
+     */
+    warn: Function;
+    /**
+     * information log output
+     */
+    log: Function;
+    /**
+     * debugging log output
+     */
+    debug: Function;
+    /**
+     * set the node status
+     */
+    status: Function;
+    /**
+     * Optional secured credentials
+     */
+    credentials?: any | undefined;
+    /**
+     * Internal.
+     */
+    name?: any | undefined;
+    /**
+     * Internal. uid of node instance.
+     */
+    id?: any | undefined;
+    /**
+     * Internal.
+     */
+    _path?: any | undefined;
+    /**
+     * Internal. Type of node instance.
+     */
+    type?: any | undefined;
+    /**
+     * Internal. uid of ???
+     */
+    z?: any | undefined;
+    /**
+     * Internal. Array of Array of Strings. The wires attached to this node instance (uid's)
+     * ... obviously there are more ...
+     */
+    wires?: [Array<string>] | undefined;
+};
+/**
+ * Configuration of node instance. Will also have Editor panel's defined variables as properties.
+ */
+export type runtimeNodeConfig = {
+    /**
+     * Internal. uid of node instance.
+     */
+    id?: any | undefined;
+    /**
+     * Internal. Type of node instance.
+     */
+    type?: any | undefined;
+    /**
+     * Internal
+     */
+    x?: any | undefined;
+    /**
+     * Internal
+     */
+    y?: any | undefined;
+    /**
+     * Internal
+     */
+    z?: any | undefined;
+    /**
+     * Internal. The wires attached to this node instance (uid's)
+     */
+    wires?: any | undefined;
+};
+/**
+ * Local copy of the node instance config + other info
+ */
+export type uibNode = {
+    /**
+     * Unique identifier for this instance
+     */
+    id: string;
+    /**
+     * What type of node is this an instance of? (uibuilder)
+     */
+    type: string;
+    /**
+     * Descriptive name, only used by Editor
+     */
+    name: string;
+    /**
+     * msg.topic overrides incoming msg.topic
+     */
+    topic: string;
+    /**
+     * The url path (and folder path) to be used by this instance
+     */
+    url: string;
+    /**
+     * The PREVIOUS url path (and folder path) after a url rename
+     */
+    oldUrl: string;
+    /**
+     * Forward input msgs to output #1?
+     */
+    fwdInMessages: boolean;
+    /**
+     * Allow scripts to be sent to front-end via msg? WARNING: can be a security issue.
+     */
+    allowScripts: boolean;
+    /**
+     * Allow CSS to be sent to the front-end via msg? WARNING: can be a security issue.
+     */
+    allowStyles: boolean;
+    /**
+     * DEPRECATED Copy index.(html|js|css) files from templates if they don't exist?
+     */
+    copyIndex: boolean;
+    /**
+     * Folder name for the source of the chosen template
+     */
+    templateFolder: string;
+    /**
+     * Degit url reference for an external template (e.g. from GitHub)
+     */
+    extTemplate: string;
+    /**
+     * Provide a folder index web page?
+     */
+    showfolder: boolean;
+    /**
+     * Use uibuilder's built-in security features?
+     */
+    useSecurity: boolean;
+    /**
+     * Extend token life when msg's received from client?
+     */
+    tokenAutoExtend: boolean;
+    /**
+     * Lifespan of token (in seconds)
+     */
+    sessionLength: number;
+    /**
+     * If true, notify all clients to reload on a change to any source file
+     */
+    reload: boolean;
+    /**
+     * (src or dist) the instance FE code folder to be served by ExpressJS
+     */
+    sourceFolder: string;
+    /**
+     * Seed string for encryption of JWT
+     */
+    jwtSecret: string;
+    /**
+     * Name of the fs path used to hold custom files & folders for THIS INSTANCE
+     */
+    customFolder: string;
+    /**
+     * How many Socket clients connected to this instance?
+     */
+    ioClientsCount: number;
+    /**
+     * How many msg's received since last reset or redeploy?
+     */
+    rcvMsgCount: number;
+    /**
+     * The channel names for Socket.IO
+     */
+    ioChannels: {
+        control: string;
+        client: string;
+        server: string;
+    };
+    /**
+     * Make sure each node instance uses a separate Socket.IO namespace
+     */
+    ioNamespace: string;
+    /**
+     * Send a Node-RED msg to an output port
+     */
+    send: Function;
+    /**
+     * Dummy done function for pre-Node-RED 1.0 servers
+     */
+    done?: Function | undefined;
+    /**
+     * Event handler
+     */
+    on?: Function | undefined;
+    /**
+     * Event handling
+     */
+    removeListener?: Function | undefined;
+    /**
+     * Optional secured credentials
+     */
+    credentials?: any | undefined;
+    /**
+     * Internal
+     */
+    z?: any | undefined;
+    /**
+     * Internal. The wires attached to this node instance (uid's)
+     */
+    wires?: any | undefined;
+    /**
+     * Whether the common static folder has been added
+     */
+    commonStaticLoaded: boolean;
+    /**
+     * Has the initial template copy been done?
+     */
+    initCopyDone: boolean;
+};
+/**
+ * ExpessJS `app` object
+ */
+export type expressApp = {
+    /**
+     * : [Object: null prototype] { mount: [Function: onmount] },
+     */
+    _events: any;
+    /**
+     * : 1,
+     */
+    _eventsCount: number;
+    /**
+     * : undefined,
+     */
+    _maxListeners: number;
+    /**
+     * : [Function: setMaxListeners],
+     */
+    setMaxListeners: Function;
+    /**
+     * : [Function: getMaxListeners],
+     */
+    getMaxListeners: Function;
+    /**
+     * : [Function: emit],
+     */
+    emit: Function;
+    /**
+     * : [Function: addListener],
+     */
+    addListener: Function;
+    /**
+     * : [Function: addListener],
+     */
+    on: Function;
+    /**
+     * : [Function: prependListener],
+     */
+    prependListener: Function;
+    /**
+     * : [Function: once],
+     */
+    once: Function;
+    /**
+     * : [Function: prependOnceListener],
+     */
+    prependOnceListener: Function;
+    /**
+     * : [Function: removeListener],
+     */
+    removeListener: Function;
+    /**
+     * : [Function: removeListener],
+     */
+    off: Function;
+    /**
+     * : [Function: removeAllListeners],
+     */
+    removeAllListeners: Function;
+    /**
+     * : [Function: listeners],
+     */
+    listeners: Function;
+    /**
+     * : [Function: rawListeners],
+     */
+    rawListeners: Function;
+    /**
+     * : [Function: listenerCount],
+     */
+    listenerCount: Function;
+    /**
+     * : [Function: eventNames],
+     */
+    eventNames: Function;
+    /**
+     * : [Function: init],
+     */
+    init: Function;
+    /**
+     * : [Function: defaultConfiguration],
+     */
+    defaultConfiguration: Function;
+    /**
+     * : [Function: lazyrouter],
+     */
+    lazyrouter: Function;
+    /**
+     * : [Function: handle],
+     */
+    handle: Function;
+    /**
+     * : [Function: use],
+     */
+    use: Function;
+    /**
+     * : [Function: route],
+     */
+    route: Function;
+    /**
+     * : [Function: engine],
+     */
+    engine: Function;
+    /**
+     * : [Function: param],
+     */
+    param: Function;
+    /**
+     * : [Function: set],
+     */
+    set: Function;
+    /**
+     * : [Function: path],
+     */
+    path: Function;
+    /**
+     * : [Function: enabled],
+     */
+    enabled: Function;
+    /**
+     * : [Function: disabled],
+     */
+    disabled: Function;
+    /**
+     * : [Function: enable],
+     */
+    enable: Function;
+    /**
+     * : [Function: disable],
+     */
+    disable: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    acl: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    bind: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    checkout: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    connect: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    copy: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    delete: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    get: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    head: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    link: Function;
+    /**
+     * : [Function (anonymous)],
+     * // @ property {function} m-search: [Function (anonymous)],
+     */
+    lock: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    merge: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    mkactivity: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    mkcalendar: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    mkcol: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    move: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    notify: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    options: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    patch: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    post: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    pri: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    propfind: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    proppatch: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    purge: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    put: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    rebind: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    report: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    search: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    source: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    subscribe: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    trace: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    unbind: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    unlink: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    unlock: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    unsubscribe: Function;
+    /**
+     * : [Function: all],
+     */
+    all: Function;
+    /**
+     * : [Function (anonymous)],
+     */
+    del: Function;
+    /**
+     * : [Function: render],
+     */
+    render: Function;
+    /**
+     * : [Function: listen],
+     */
+    listen: Function;
+    /**
+     * : IncomingMessage { app: [Circular *1] },
+     */
+    request: Function;
+    /**
+     * : ServerResponse { app: [Circular *1] },
+     */
+    response: Function;
+    /**
+     * : {},
+     */
+    cache: any;
+    /**
+     * : {},
+     */
+    engines: any;
+    /**
+     * :
+     * // @ property {boolean}  settings.'x-powered-by': true,
+     */
+    settings: {
+        etag: string;
+        env: string;
+        view: Function;
+        views: string;
+    };
+    /**
+     * : [Object: null prototype] { settings: [Object] },
+     */
+    locals: any;
+    /**
+     * : '/nr/',
+     */
+    mountpath: string;
+    /**
+     * : [Function: app] {
+     */
+    parent: Function;
+    /**
+     * : [Function]
+     */
+    _router: Function;
+};
+//# sourceMappingURL=typedefs.d.ts.map
\ No newline at end of file
diff --git a/nodes/types/types/typedefs.d.ts.map b/nodes/types/types/typedefs.d.ts.map
new file mode 100644
index 00000000..5fd2cdb1
--- /dev/null
+++ b/nodes/types/types/typedefs.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"typedefs.d.ts","sourceRoot":"","sources":["../typedefs.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eA8Dc,UAAU;;;;cACV,UAAU;;;;;;;;SAEV,cAAc;;;;WACd,YAAY;;;;;;;;;;;;;;QAOI,OAAO;;;QAGL,QAAQ;;;QAGX,eAAe;;;;;;;;;;QAKb,EAAE;QACF,IAAI;QACJ,WAAW;;;QAGZ,GAAG;QACH,KAAK;QACL,GAAG;QACH,MAAM;QACN,OAAO;;;QAGR,YAAY;QACZ,YAAY;QACZ,YAAY;QACZ,YAAY;QACZ,cAAc;QACd,UAAU;QACV,kBAAkB;QAClB,kBAAkB;QAClB,iBAAiB;QACjB,iBAAiB;QACjB,oBAAoB;QACpB,2BAA2B;QAC3B,qBAAqB;QACrB,wBAAwB;QACxB,yBAAyB;QACzB,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAsBhC,CAAC,MAAM,MAAM,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAsBf,OAAO;;;;kBACP,OAAO;;;;iBACP,OAAO;;;;eACP,OAAO;;;;;;;;;;;;gBAGP,OAAO;;;;iBACP,OAAO;;;;qBACP,OAAO;;;;;;;;YAEP,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;QAOoB,OAAO;QACP,MAAM;QACN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAUjC,OAAO;;;;kBACP,OAAO;;;;;;;;;;;;;kBASP,MAAM;;;;mBACN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4Ea,IAAI,EAAvB,MAAM;QAEa,GAAG,EAAtB,MAAM;QAIa,IAAI;QACJ,KAAK,EAAxB,MAAM;;;;;;;;;eAIN,MAAM"}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 61840c89..207da4db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,38 +1,38 @@
 {
   "name": "node-red-contrib-sun-position",
-  "version": "2.2.0-beta4",
+  "version": "3.0.0-alpha2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "node-red-contrib-sun-position",
-      "version": "2.2.0-beta4",
+      "version": "3.0.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
         "cronosjs": "^1.7.1",
         "lodash.clonedeep": "^4.5.0",
         "lodash.isequal": "^4.5.0",
-        "suncalc3": "^2.0.1"
+        "suncalc3": "^2.0.5"
       },
       "devDependencies": {
-        "@types/express": "^4.17.13",
-        "@types/jquery": "^3.5.14",
-        "@types/node-red": "^1.2.0",
-        "eslint": ">=8.11.0",
+        "@types/express": "^5.0.1",
+        "@types/jquery": "^3.5.32",
+        "@types/node-red": "^1.3.5",
+        "eslint": ">=8.13.0",
         "eslint-plugin-html": ">=6.2.0",
         "eslint-plugin-json": ">=3.1.0",
         "eslint-plugin-node": ">=11.1.0",
-        "jsonata": "^1.8.6",
-        "mocha": "^10.0.0",
-        "node-red": ">=2.0.0",
-        "node-red-dev": "^0.1.5",
-        "node-red-node-test-helper": "^0.3.0",
+        "jsonata": "^2.0.6",
+        "mocha": "^11.1.0",
+        "node-red": "4.0.9",
+        "node-red-dev": "^0.1.6",
+        "node-red-node-test-helper": "^0.3.4",
         "should": "^13.2.3",
         "should-sinon": "^0.0.6",
-        "sinon": "^14.0.0"
+        "sinon": "^20.0.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=12"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -236,21 +236,21 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
-      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
+      "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
       "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "regenerator-runtime": "^0.14.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
       "dev": true
     },
     "node_modules/@babel/template": {
@@ -310,6 +310,37 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@emnapi/core": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.0.tgz",
+      "integrity": "sha512-H+N/FqT07NmLmt6OFFtDfwe8PNygprzBikrEMyQfgqSmT0vzE515Pz7R8izwB9q/zsH/MA64AKoul3sA6/CzVg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.0.1",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/runtime": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.0.tgz",
+      "integrity": "sha512-64WYIf4UYcdLnbKn/umDlNjQDSS8AgZrI/R9+x5ilkUVFxXcA1Ebl+gQLc/6mERA4407Xof0R7wEyEuj091CVw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/wasi-threads": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz",
+      "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
@@ -366,136 +397,218 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
-    "node_modules/@mapbox/node-pre-gyp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz",
-      "integrity": "sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==",
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
       "dev": true,
-      "optional": true,
       "dependencies": {
-        "detect-libc": "^2.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "make-dir": "^3.1.0",
-        "node-fetch": "^2.6.7",
-        "nopt": "^5.0.0",
-        "npmlog": "^5.0.1",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.11"
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
       },
-      "bin": {
-        "node-pre-gyp": "bin/node-pre-gyp"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
-      "optional": true,
       "dependencies": {
-        "semver": "^6.0.0"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@isaacs/fs-minipass/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/@napi-rs/wasm-runtime": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.7.tgz",
+      "integrity": "sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==",
       "dev": true,
       "optional": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "@emnapi/core": "^1.3.1",
+        "@emnapi/runtime": "^1.3.1",
+        "@tybys/wasm-util": "^0.9.0"
       }
     },
     "node_modules/@node-red/editor-api": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-3.0.2.tgz",
-      "integrity": "sha512-eyWObGLXVKhQDOHX9Fe+oOhC5nZAU8A92M5f4BwCXY1c9wx8QnWZVqOhPleVu3UJxZJEZ44OUdPb+HtsRNmD7Q==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-4.0.9.tgz",
+      "integrity": "sha512-jGr5fQAXXfxIVM41FZlTbcnelA6vkL9uweX6FjYnu4VPzePfcV61TM3awyTiw0YGTonm/RYPKRpZu3cZ3/pX+w==",
       "dev": true,
       "dependencies": {
-        "@node-red/editor-client": "3.0.2",
-        "@node-red/util": "3.0.2",
+        "@node-red/editor-client": "4.0.9",
+        "@node-red/util": "4.0.9",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.20.0",
+        "body-parser": "1.20.3",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express": "4.18.1",
-        "express-session": "1.17.3",
+        "express": "4.21.2",
+        "express-session": "1.18.1",
         "memorystore": "1.6.7",
         "mime": "3.0.0",
         "multer": "1.4.5-lts.1",
         "mustache": "4.2.0",
-        "oauth2orize": "1.11.1",
-        "passport": "0.6.0",
+        "oauth2orize": "1.12.0",
+        "passport": "0.7.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "ws": "7.5.6"
+        "ws": "7.5.10"
       },
       "optionalDependencies": {
-        "bcrypt": "5.0.1"
+        "@node-rs/bcrypt": "1.10.4"
       }
     },
     "node_modules/@node-red/editor-client": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-3.0.2.tgz",
-      "integrity": "sha512-UlbsoEnIfpQO0yKf55Kd2qCwItDjfM9ut6FUfd2x10yKk9RxrA1rQPsW7PiB7gV/E1aW1JPmMxrmfHbb9Gdf8w==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-4.0.9.tgz",
+      "integrity": "sha512-1XVNVmYtCDkQVKEh1bSzLS0GPjI9GEV5CeFdz/k/zjU4Qe63dmSzc76KmRBaDrjOMpvfaJAdZQ+ZuSqocOv5zA==",
       "dev": true
     },
     "node_modules/@node-red/nodes": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/nodes/-/nodes-3.0.2.tgz",
-      "integrity": "sha512-H2rH2U5uEic4nwyabkiTIYNYGLTJL6TIccdPwz7AAykTmD5naKLs3nhuPHjzb54iPen/SU9jkJoU7iecslOk6g==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/nodes/-/nodes-4.0.9.tgz",
+      "integrity": "sha512-gVcaocuAjq1p7XmY5nKmBjyEXcLCQYosj1ZPTRqtABPRdUKSGCfN4Shr9oGBEkwd+HNSWaKia7/GKnow9F63kg==",
       "dev": true,
       "dependencies": {
-        "acorn": "8.7.1",
-        "acorn-walk": "8.2.0",
-        "ajv": "8.11.0",
-        "body-parser": "1.20.0",
+        "acorn": "8.12.1",
+        "acorn-walk": "8.3.4",
+        "ajv": "8.17.1",
+        "body-parser": "1.20.3",
         "cheerio": "1.0.0-rc.10",
-        "content-type": "1.0.4",
-        "cookie": "0.5.0",
-        "cookie-parser": "1.4.6",
+        "content-type": "1.0.5",
+        "cookie": "0.7.2",
+        "cookie-parser": "1.4.7",
         "cors": "2.8.5",
         "cronosjs": "1.7.1",
         "denque": "2.1.0",
         "form-data": "4.0.0",
-        "fs-extra": "10.1.0",
-        "got": "11.8.5",
+        "fs-extra": "11.2.0",
+        "got": "12.6.1",
         "hash-sum": "2.0.0",
-        "hpagent": "1.0.0",
+        "hpagent": "1.2.0",
         "https-proxy-agent": "5.0.1",
         "iconv-lite": "0.6.3",
         "is-utf8": "0.2.1",
         "js-yaml": "4.1.0",
         "media-typer": "1.1.0",
-        "mqtt": "4.3.7",
+        "mqtt": "5.7.0",
         "multer": "1.4.5-lts.1",
         "mustache": "4.2.0",
-        "node-watch": "0.7.3",
+        "node-watch": "0.7.4",
         "on-headers": "1.0.2",
-        "raw-body": "2.5.1",
-        "tough-cookie": "4.0.0",
-        "uuid": "8.3.2",
-        "ws": "7.5.6",
-        "xml2js": "0.4.23"
+        "raw-body": "3.0.0",
+        "tough-cookie": "^5.0.0",
+        "uuid": "9.0.1",
+        "ws": "7.5.10",
+        "xml2js": "0.6.2"
       }
     },
     "node_modules/@node-red/nodes/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -517,9 +630,9 @@
       }
     },
     "node_modules/@node-red/nodes/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -527,55 +640,46 @@
         "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14.14"
       }
     },
-    "node_modules/@node-red/nodes/node_modules/fs-extra/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+    "node_modules/@node-red/nodes/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@node-red/nodes/node_modules/got": {
-      "version": "11.8.5",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
-      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+      "version": "12.6.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
+      "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
       "dev": true,
       "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.2",
+        "@sindresorhus/is": "^5.2.0",
+        "@szmarczak/http-timer": "^5.0.1",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.8",
         "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
+        "form-data-encoder": "^2.1.2",
+        "get-stream": "^6.0.1",
+        "http2-wrapper": "^2.1.10",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^3.0.0",
+        "responselike": "^3.0.0"
       },
       "engines": {
-        "node": ">=10.19.0"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/got?sponsor=1"
       }
     },
-    "node_modules/@node-red/nodes/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@node-red/nodes/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -594,74 +698,88 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/@node-red/nodes/node_modules/jsonfile/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/@node-red/nodes/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@node-red/nodes/node_modules/media-typer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
-      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
+    "node_modules/@node-red/nodes/node_modules/tough-cookie": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
       "dev": true,
+      "dependencies": {
+        "tldts": "^6.1.32"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=16"
       }
     },
-    "node_modules/@node-red/nodes/node_modules/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+    "node_modules/@node-red/nodes/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
-      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 10.0.0"
       }
     },
     "node_modules/@node-red/nodes/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
       "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/@node-red/registry": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/registry/-/registry-3.0.2.tgz",
-      "integrity": "sha512-+vf9R4j+p2nM7awzicIzu6liJgXyoQfhHGv3OxmK9OfBsISn5eWIj9u2HiJtG3ChYfuediK2FEhc+Pb+mhfTJA==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/registry/-/registry-4.0.9.tgz",
+      "integrity": "sha512-hczmbEGVNJm4HX20rvGjxYnEcl9TF3x3hAzKtpr8OWWMWvGS3UHzZPM13c3KeItzg3WN/bap8/12wGRzHE1RdA==",
       "dev": true,
       "dependencies": {
-        "@node-red/util": "3.0.2",
+        "@node-red/util": "4.0.9",
         "clone": "2.1.2",
-        "fs-extra": "10.1.0",
-        "semver": "7.3.7",
-        "tar": "6.1.11",
-        "uglify-js": "3.16.3"
+        "fs-extra": "11.2.0",
+        "semver": "7.6.3",
+        "tar": "7.4.3",
+        "uglify-js": "3.17.4"
+      }
+    },
+    "node_modules/@node-red/registry/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@node-red/registry/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@node-red/registry/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -669,7 +787,27 @@
         "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/@node-red/registry/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@node-red/registry/node_modules/jsonfile": {
@@ -684,34 +822,128 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/@node-red/registry/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@node-red/registry/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/@node-red/registry/node_modules/minizlib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
+      "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@node-red/registry/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@node-red/registry/node_modules/rimraf": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@node-red/registry/node_modules/tar": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@node-red/registry/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/@node-red/registry/node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@node-red/runtime": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/runtime/-/runtime-3.0.2.tgz",
-      "integrity": "sha512-lEx6riLeEHMshvW84BEN/oUESG1F2AirLCkH6xbws8Ta8fgE6YfsOvgKBMnfbwoUME2O+I/QCkIYZqlqUhqJXg==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/runtime/-/runtime-4.0.9.tgz",
+      "integrity": "sha512-frKqZl6VESSgosJcMqu0ADO3p3zO+HNHQSQaqe+BlsPKLmJCZfM82jPXGFf741hoRDvN6naei4QkwdZiHCuRTA==",
       "dev": true,
       "dependencies": {
-        "@node-red/registry": "3.0.2",
-        "@node-red/util": "3.0.2",
-        "async-mutex": "0.3.2",
+        "@node-red/registry": "4.0.9",
+        "@node-red/util": "4.0.9",
+        "async-mutex": "0.5.0",
         "clone": "2.1.2",
-        "express": "4.18.1",
-        "fs-extra": "10.1.0",
-        "json-stringify-safe": "5.0.1"
+        "express": "4.21.2",
+        "fs-extra": "11.2.0",
+        "json-stringify-safe": "5.0.1",
+        "rfdc": "^1.3.1"
       }
     },
     "node_modules/@node-red/runtime/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -719,7 +951,7 @@
         "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14.14"
       }
     },
     "node_modules/@node-red/runtime/node_modules/jsonfile": {
@@ -735,33 +967,33 @@
       }
     },
     "node_modules/@node-red/runtime/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
       }
     },
     "node_modules/@node-red/util": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/util/-/util-3.0.2.tgz",
-      "integrity": "sha512-zhxmFk48QEC4coBN0G0JDHt727+BlZS2QZarWs9hLeNDBdhjlU58RY0lhDgqODu/Z3JvBmIdPhCtDcvHpe4zmw==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/util/-/util-4.0.9.tgz",
+      "integrity": "sha512-JAeHlwq7BgNvDyTPzN5uXY03WWJKEnTakYJ4t/Awq1eKjSVLLuGbEZkn5bDI5muhJgHuN0uDOzE9lc86bWUlxQ==",
       "dev": true,
       "dependencies": {
-        "fs-extra": "10.1.0",
-        "i18next": "21.8.16",
+        "fs-extra": "11.2.0",
+        "i18next": "21.10.0",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.6",
+        "jsonata": "2.0.5",
         "lodash.clonedeep": "^4.5.0",
-        "moment": "2.29.4",
-        "moment-timezone": "0.5.34"
+        "moment": "2.30.1",
+        "moment-timezone": "0.5.46"
       }
     },
     "node_modules/@node-red/util/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -769,7 +1001,16 @@
         "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/@node-red/util/node_modules/jsonata": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/jsonata/-/jsonata-2.0.5.tgz",
+      "integrity": "sha512-wEse9+QLIIU5IaCgtJCPsFi/H4F3qcikWzF4bAELZiRz08ohfx3Q6CjDRf4ZPF5P/92RI3KIHtb7u3jqPaHXdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
       }
     },
     "node_modules/@node-red/util/node_modules/jsonfile": {
@@ -785,31 +1026,285 @@
       }
     },
     "node_modules/@node-red/util/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "node_modules/@node-rs/bcrypt": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt/-/bcrypt-1.10.4.tgz",
+      "integrity": "sha512-Kzs8HKt2eBeT5VnkeKgiz/QKTjOO3URcvSNEQZahNwZnL6dBeeJQTxxYisc/6969+5n6c3+gNwKvqJsZzmGe7g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "optionalDependencies": {
+        "@node-rs/bcrypt-android-arm-eabi": "1.10.4",
+        "@node-rs/bcrypt-android-arm64": "1.10.4",
+        "@node-rs/bcrypt-darwin-arm64": "1.10.4",
+        "@node-rs/bcrypt-darwin-x64": "1.10.4",
+        "@node-rs/bcrypt-freebsd-x64": "1.10.4",
+        "@node-rs/bcrypt-linux-arm-gnueabihf": "1.10.4",
+        "@node-rs/bcrypt-linux-arm64-gnu": "1.10.4",
+        "@node-rs/bcrypt-linux-arm64-musl": "1.10.4",
+        "@node-rs/bcrypt-linux-x64-gnu": "1.10.4",
+        "@node-rs/bcrypt-linux-x64-musl": "1.10.4",
+        "@node-rs/bcrypt-wasm32-wasi": "1.10.4",
+        "@node-rs/bcrypt-win32-arm64-msvc": "1.10.4",
+        "@node-rs/bcrypt-win32-ia32-msvc": "1.10.4",
+        "@node-rs/bcrypt-win32-x64-msvc": "1.10.4"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-android-arm-eabi": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-android-arm-eabi/-/bcrypt-android-arm-eabi-1.10.4.tgz",
+      "integrity": "sha512-55ajutuTdfK1hKseyliflnxzNtxszQQ/EoLtgJlgCe7rI24vGP9EEEZDznB/u9OaJ14/AYzZtIhkEOYdbIdw0A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-android-arm64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-android-arm64/-/bcrypt-android-arm64-1.10.4.tgz",
+      "integrity": "sha512-dCgQT7nH65tORmJw2hQ6zQgFmmC+/JBYZUWtf7pPZI76AVAn5tc7cIUrxYoV4OT1+uD63b9Av+mS1fT2EPzWEg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-darwin-arm64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-darwin-arm64/-/bcrypt-darwin-arm64-1.10.4.tgz",
+      "integrity": "sha512-gmHdWikHL3YVZgqXAHT+X/PG+kqIyNlPeFAWKdby83RkDI8FUiPV4qqGilgNnBmVWKkobRae9/I1HDbc4Sbhyg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-darwin-x64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-darwin-x64/-/bcrypt-darwin-x64-1.10.4.tgz",
+      "integrity": "sha512-WDzL1WKRtoyTkH6IMPx95Mkd6XaeN0VWJbSDMqQY6AFBOk03yJEj7YYXshCcF+Ur6KBBVSwRf6sdFJ15NI1Z3g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-freebsd-x64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-freebsd-x64/-/bcrypt-freebsd-x64-1.10.4.tgz",
+      "integrity": "sha512-seSPJi+4MIUd1faL/n/wmDdDwaynd/FTkvTnb7qzCk8LBT+/dxi7MTz+uaD8KYDREcB9Wmhv+lwr0S9/jBTcjg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-linux-arm-gnueabihf": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm-gnueabihf/-/bcrypt-linux-arm-gnueabihf-1.10.4.tgz",
+      "integrity": "sha512-YcMLUtN9cGNTWKnaXslxGO1M0S5b4QN9KYhuyG6Kju27RfqvU5UbmpKElCsEUO2EIjxGwzvPu59T+Fyh6sVbwg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-linux-arm64-gnu": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-gnu/-/bcrypt-linux-arm64-gnu-1.10.4.tgz",
+      "integrity": "sha512-uYGUK/mO8SiftqmVSAePWxgK82vg+X/gtrVRJi95yq2iwp1+fYJX3ndxCyYPmeplBbd3NJ/F5lPT3FC/IHTTGw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-linux-arm64-musl": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-musl/-/bcrypt-linux-arm64-musl-1.10.4.tgz",
+      "integrity": "sha512-rLvSMW/gVUBd2k2gAqQfuOReHWd9+jvz58E3i1TbkRE3a5ChvjOFc9qKPEmXuXuD9Mdj7gUwcYwpq8MdB5MtNw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-linux-x64-gnu": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-gnu/-/bcrypt-linux-x64-gnu-1.10.4.tgz",
+      "integrity": "sha512-I++6bh+BIp70X/D/crlSgCq8K0s9nGvzmvAGFkqSG4h3LBtjJx4RKbygnoWvcBV9ErK1rvcjfMyjwZt1ukueFA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-linux-x64-musl": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-musl/-/bcrypt-linux-x64-musl-1.10.4.tgz",
+      "integrity": "sha512-f9RPl/5n2NS0mMJXB4IYbodKnq5HzOK5x1b9eKbcjsY0rw3mJC3K0XRFc8iaw1a5chA+xV1TPXz5mkykmr2CQQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-wasm32-wasi": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-wasm32-wasi/-/bcrypt-wasm32-wasi-1.10.4.tgz",
+      "integrity": "sha512-VaDOf+wic0yoHFimMkC5VMa/33BNqg6ieD+C/ibb7Av3NnVW4/W9YpDpqAWMR2w3fA40uTLWZ7FZSrcFck27oA==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@napi-rs/wasm-runtime": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-win32-arm64-msvc": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-win32-arm64-msvc/-/bcrypt-win32-arm64-msvc-1.10.4.tgz",
+      "integrity": "sha512-M7sGnbKPvhYJ5b76ywXiEwR4mIs/JSDHjRrhm9fshKAvltQrwc3Mou22TJggvDN3gKOF1W85uPiM2OgGX/jxMg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-win32-ia32-msvc": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-win32-ia32-msvc/-/bcrypt-win32-ia32-msvc-1.10.4.tgz",
+      "integrity": "sha512-zn/n4DYnuOfC2JgmVDa0JHP+5DUqAOTl2jmV3yrMrmN+StDT4Om5wtvWxvEmgv3CkeZAuAU3Y/fwjSXIpZ0Fhg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@node-rs/bcrypt-win32-x64-msvc": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-win32-x64-msvc/-/bcrypt-win32-x64-msvc-1.10.4.tgz",
+      "integrity": "sha512-ynQokTTGbuLu/cckaD8dNcE+Zsfam1zElE+teNol8AxcL7Jv+ghJItSnRthPRV/vLxuycDF2DIICgpXG/p9jrQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
       "engines": {
         "node": ">= 8"
@@ -1006,13 +1501,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@sindresorhus/is": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
+      "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/is?sponsor=1"
@@ -1054,15 +1559,25 @@
       "dev": true
     },
     "node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
       "dev": true,
       "dependencies": {
-        "defer-to-connect": "^2.0.0"
+        "defer-to-connect": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@tybys/wasm-util": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
+      "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/@types/ace": {
@@ -1081,18 +1596,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
-      }
-    },
     "node_modules/@types/connect": {
       "version": "3.4.35",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
@@ -1109,58 +1612,43 @@
       "dev": true
     },
     "node_modules/@types/express": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-      "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.1.tgz",
+      "integrity": "sha512-UZUw8vjpWFXuDnjFTh7/5c2TWDlQqeXHi6hcN7F2XSVT5P+WmUnnbFS3KA6Jnc6IsEqI2qCVu2bK0R0J4A8ZQQ==",
       "dev": true,
       "dependencies": {
         "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
-        "@types/qs": "*",
+        "@types/express-serve-static-core": "^5.0.0",
         "@types/serve-static": "*"
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.28",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
-      "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz",
+      "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
-        "@types/range-parser": "*"
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
     "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
+      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
       "dev": true
     },
     "node_modules/@types/jquery": {
-      "version": "3.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
-      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz",
+      "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==",
       "dev": true,
       "dependencies": {
         "@types/sizzle": "*"
       }
     },
-    "node_modules/@types/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==",
-      "dev": true
-    },
-    "node_modules/@types/keyv": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/mime": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -1174,9 +1662,9 @@
       "dev": true
     },
     "node_modules/@types/node-red": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@types/node-red/-/node-red-1.2.1.tgz",
-      "integrity": "sha512-v9azjmzDqgBHbc3DRn3/4J8TkyeeiRbfzELNb9yQHqEAMhTDFkjAyEnc4ZtM05QYD/9PhO5K8/afezqkRMadpA==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/node-red/-/node-red-1.3.5.tgz",
+      "integrity": "sha512-LBP8TmXJszHOoRgieyxgUrspvatmTZlkPRftlSNGE9TVJCQzSSyX3tF/Qe4evQlIUBmMGOijxcUOcKZSvq4piQ==",
       "dev": true,
       "dependencies": {
         "@types/express": "*",
@@ -1253,12 +1741,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
     "node_modules/@types/passport": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@types/passport/-/passport-1.0.7.tgz",
@@ -1269,23 +1751,40 @@
       }
     },
     "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "version": "6.9.18",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
+      "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
       "dev": true
     },
     "node_modules/@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
       "dev": true
     },
-    "node_modules/@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+    "node_modules/@types/readable-stream": {
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.18.tgz",
+      "integrity": "sha512-21jK/1j+Wg+7jVw1xnSwy/2Q1VgVjWuFssbYGTREPUBeZ+rqVFl2udq0IkxzPC0ZhOzVceUbyIACFZKLqKEBlA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/@types/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/@types/send": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
       "dev": true,
       "dependencies": {
+        "@types/mime": "^1",
         "@types/node": "*"
       }
     },
@@ -1305,12 +1804,33 @@
       "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
       "dev": true
     },
+    "node_modules/@types/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dev": true,
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -1325,9 +1845,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -1346,10 +1866,13 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
       "engines": {
         "node": ">=0.4.0"
       }
@@ -1435,9 +1958,9 @@
       }
     },
     "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -1495,27 +2018,6 @@
       "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==",
       "dev": true
     },
-    "node_modules/aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1534,7 +2036,7 @@
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
       "dev": true
     },
     "node_modules/array-union": {
@@ -1598,12 +2100,12 @@
       }
     },
     "node_modules/async-mutex": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.2.tgz",
-      "integrity": "sha512-HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz",
+      "integrity": "sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==",
       "dev": true,
       "dependencies": {
-        "tslib": "^2.3.1"
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/asynckit": {
@@ -1690,21 +2192,6 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
-    "node_modules/bcrypt": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
-      "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "dependencies": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "node-addon-api": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -1730,32 +2217,33 @@
       }
     },
     "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.0.tgz",
+      "integrity": "sha512-ClDyJGQkc8ZtzdAAbAwBmhMSpwN/sC9HA8jxdYm6nVUbCfZbe2mgza4qh7AuEYyEPB/c4Kznf9s66bnsKMQDjw==",
       "dev": true,
       "dependencies": {
-        "buffer": "^5.5.0",
+        "@types/readable-stream": "^4.0.0",
+        "buffer": "^6.0.3",
         "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
+        "readable-stream": "^4.2.0"
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "dev": true,
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.10.3",
-        "raw-body": "2.5.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -1773,19 +2261,31 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
-      "dev": true,
+    "node_modules/body-parser/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/body-parser/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dev": true,
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -1794,6 +2294,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/body-parser/node_modules/raw-body": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
@@ -1982,9 +2497,9 @@
       "dev": true
     },
     "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "dev": true,
       "funding": [
         {
@@ -2002,7 +2517,7 @@
       ],
       "dependencies": {
         "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "ieee754": "^1.2.1"
       }
     },
     "node_modules/buffer-from": {
@@ -2045,64 +2560,68 @@
       }
     },
     "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
       "dev": true,
       "engines": {
-        "node": ">=10.6.0"
+        "node": ">=14.16"
       }
     },
     "node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "version": "10.2.14",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
+      "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
       "dev": true,
       "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
+        "@types/http-cache-semantics": "^4.0.2",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.3",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.0",
+        "responselike": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
       }
     },
     "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2565,18 +3084,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -2614,16 +3121,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "color-support": "bin.js"
-      }
-    },
     "node_modules/colors": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
@@ -2646,32 +3143,18 @@
       }
     },
     "node_modules/commist": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz",
-      "integrity": "sha512-rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==",
-      "dev": true,
-      "dependencies": {
-        "leven": "^2.1.0",
-        "minimist": "^1.1.0"
-      }
-    },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/commist/-/commist-3.2.0.tgz",
+      "integrity": "sha512-4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw==",
       "dev": true
     },
-    "node_modules/compress-brotli": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.8.tgz",
-      "integrity": "sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==",
+    "node_modules/component-emitter": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
       "dev": true,
-      "dependencies": {
-        "@types/json-buffer": "~3.0.0",
-        "json-buffer": "~3.0.1"
-      },
-      "engines": {
-        "node": ">= 12"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/concat-map": {
@@ -2695,6 +3178,20 @@
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/configstore": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.5.tgz",
@@ -2712,13 +3209,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -2732,55 +3222,46 @@
       }
     },
     "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie-parser": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz",
-      "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz",
+      "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==",
       "dev": true,
       "dependencies": {
-        "cookie": "0.4.1",
+        "cookie": "0.7.2",
         "cookie-signature": "1.0.6"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/cookie-parser/node_modules/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
       "dev": true
     },
     "node_modules/cookiejar": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
-      "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
+      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
       "dev": true
     },
     "node_modules/core-js": {
@@ -2831,9 +3312,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
@@ -2855,16 +3336,6 @@
         "which": "^1.2.8"
       }
     },
-    "node_modules/cross-spawn-async/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
     "node_modules/cross-spawn-async/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -2877,12 +3348,6 @@
         "which": "bin/which"
       }
     },
-    "node_modules/cross-spawn-async/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
-    },
     "node_modules/crypto-random-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -2951,12 +3416,12 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -3036,13 +3501,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/denque": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
@@ -3134,20 +3592,10 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/detect-libc": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dezalgo": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-      "integrity": "sha512-K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
       "dev": true,
       "dependencies": {
         "asap": "^2.0.0",
@@ -3263,23 +3711,31 @@
         "node": ">=4"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/duplexer3": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
       "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
       "dev": true
     },
-    "node_modules/duplexify": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
-      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.4.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
-      }
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
     },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
@@ -3304,30 +3760,22 @@
       "dev": true
     },
     "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
     "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "dependencies": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8.6"
@@ -3363,10 +3811,55 @@
         "stackframe": "^0.3.1"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -3375,7 +3868,7 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
     "node_modules/escape-string-regexp": {
@@ -3611,16 +4104,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/js-sdsl": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
     "node_modules/eslint/node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -3704,18 +4187,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
@@ -3783,12 +4254,30 @@
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
     "node_modules/execa": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/execa/-/execa-0.2.2.tgz",
@@ -3836,37 +4325,37 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.0",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
-        "qs": "6.10.3",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -3875,16 +4364,20 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express-session": {
-      "version": "1.17.3",
-      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz",
-      "integrity": "sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz",
+      "integrity": "sha512-a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==",
       "dev": true,
       "dependencies": {
-        "cookie": "0.4.2",
-        "cookie-signature": "1.0.6",
+        "cookie": "0.7.2",
+        "cookie-signature": "1.0.7",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-headers": "~1.0.2",
@@ -3896,14 +4389,11 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/express-session/node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "node_modules/express-session/node_modules/cookie-signature": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+      "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
+      "dev": true
     },
     "node_modules/express-session/node_modules/debug": {
       "version": "2.6.9",
@@ -3920,6 +4410,15 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/express/node_modules/cookie": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3936,12 +4435,12 @@
       "dev": true
     },
     "node_modules/express/node_modules/qs": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dev": true,
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -4017,6 +4516,35 @@
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "dev": true
     },
+    "node_modules/fast-unique-numbers": {
+      "version": "8.0.13",
+      "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz",
+      "integrity": "sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.23.8",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.1.0"
+      }
+    },
+    "node_modules/fast-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ]
+    },
     "node_modules/fastq": {
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
@@ -4073,13 +4601,13 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dev": true,
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -4152,9 +4680,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "dev": true,
       "funding": [
         {
@@ -4171,12 +4699,40 @@
         }
       }
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "dev": true,
-      "engines": {
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true,
+      "engines": {
         "node": "*"
       }
     },
@@ -4194,31 +4750,27 @@
         "node": ">= 0.12"
       }
     },
-    "node_modules/formidable": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.0.1.tgz",
-      "integrity": "sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ==",
+    "node_modules/form-data-encoder": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
+      "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
       "dev": true,
-      "dependencies": {
-        "dezalgo": "1.0.3",
-        "hexoid": "1.0.0",
-        "once": "1.4.0",
-        "qs": "6.9.3"
-      },
-      "funding": {
-        "url": "https://ko-fi.com/tunnckoCore/commissions"
+      "engines": {
+        "node": ">= 14.17"
       }
     },
-    "node_modules/formidable/node_modules/qs": {
-      "version": "6.9.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-      "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
+    "node_modules/formidable": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz",
+      "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==",
       "dev": true,
-      "engines": {
-        "node": ">=0.6"
+      "dependencies": {
+        "dezalgo": "^1.0.4",
+        "hexoid": "^2.0.0",
+        "once": "^1.4.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
     },
     "node_modules/forwarded": {
@@ -4233,7 +4785,7 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -4286,30 +4838,12 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
-      "optional": true,
-      "dependencies": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.1",
-        "object-assign": "^4.1.1",
-        "signal-exit": "^3.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/get-caller-file": {
@@ -4322,19 +4856,42 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
@@ -4492,6 +5049,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/got": {
       "version": "6.7.1",
       "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
@@ -4549,18 +5118,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -4592,9 +5149,9 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -4603,12 +5160,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
-      "optional": true
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/hash-sum": {
       "version": "2.0.0",
@@ -4616,6 +5181,18 @@
       "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
       "dev": true
     },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -4626,19 +5203,15 @@
       }
     },
     "node_modules/help-me": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz",
-      "integrity": "sha512-hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.6",
-        "readable-stream": "^3.6.0"
-      }
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
+      "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==",
+      "dev": true
     },
     "node_modules/hexoid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
-      "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz",
+      "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -4745,9 +5318,9 @@
       "dev": true
     },
     "node_modules/hpagent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hpagent/-/hpagent-1.0.0.tgz",
-      "integrity": "sha512-SCleE2Uc1bM752ymxg8QXYGW0TWtAV4ZW3TqH1aOnyi6T6YW2xadCcclm5qeVjvMvfQ2RKNtZxO7uVb9CTPt1A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/hpagent/-/hpagent-1.2.0.tgz",
+      "integrity": "sha512-A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==",
       "dev": true,
       "engines": {
         "node": ">=14"
@@ -4816,9 +5389,9 @@
       }
     },
     "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
       "dev": true
     },
     "node_modules/http-errors": {
@@ -4853,13 +5426,13 @@
       }
     },
     "node_modules/http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
       "dev": true,
       "dependencies": {
         "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
+        "resolve-alpn": "^1.2.0"
       },
       "engines": {
         "node": ">=10.19.0"
@@ -4879,9 +5452,9 @@
       }
     },
     "node_modules/i18next": {
-      "version": "21.8.16",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.8.16.tgz",
-      "integrity": "sha512-acJLCk38YMfEPjBR/1vS13SFY7rBQLs9E5m1tSRnWc9UW3f+SZszgH+NP1fZRA1+O+CdG2eLGGmuUMJW52EwzQ==",
+      "version": "21.10.0",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz",
+      "integrity": "sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==",
       "dev": true,
       "funding": [
         {
@@ -4902,12 +5475,12 @@
       }
     },
     "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -5380,11 +5953,30 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/js-sdsl": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-2.1.4.tgz",
-      "integrity": "sha512-/Ew+CJWHNddr7sjwgxaVeIORIH4AMVC9dy0hPf540ZGMVgS9d3ajwuVdyhDt6/QUvT8ATjR3yuYBKsS79F+H4A==",
-      "dev": true
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
+      "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
     },
     "node_modules/js-tokens": {
       "version": "3.0.2",
@@ -5428,12 +6020,6 @@
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
       "dev": true
     },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -5459,9 +6045,9 @@
       "dev": true
     },
     "node_modules/jsonata": {
-      "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/jsonata/-/jsonata-1.8.6.tgz",
-      "integrity": "sha512-ZH2TPYdNP2JecOl/HvrH47Xc+9imibEMQ4YqKy/F/FrM+2a6vfbGxeCX23dB9Fr6uvGwv+ghf1KxWB3iZk09wA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/jsonata/-/jsonata-2.0.6.tgz",
+      "integrity": "sha512-WhQB5tXQ32qjkx2GYHFw2XbL90u+LLzjofAYwi+86g6SyZeXHz9F1Q0amy3dWRYczshOC3Haok9J4pOCgHtwyQ==",
       "dev": true,
       "engines": {
         "node": ">= 8"
@@ -5504,12 +6090,11 @@
       "dev": true
     },
     "node_modules/keyv": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.3.3.tgz",
-      "integrity": "sha512-AcysI17RvakTh8ir03+a3zJr5r0ovnAH/XTXei/4HIv3bL2K/jzvgivLK9UuI/JbU1aJjM3NSAnVvVVd3n+4DQ==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
       "dependencies": {
-        "compress-brotli": "^1.3.8",
         "json-buffer": "3.0.1"
       }
     },
@@ -5537,15 +6122,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/leven": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-      "integrity": "sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -5559,12 +6135,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
     "node_modules/load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -5722,17 +6292,21 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
+    "node_modules/lru-cache/node_modules/yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+      "dev": true
+    },
     "node_modules/make-dir": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
@@ -5763,13 +6337,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
+      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
       "dev": true,
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/memorystore": {
@@ -5785,22 +6368,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/memorystore/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/memorystore/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-      "dev": true
-    },
     "node_modules/meow": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -5823,10 +6390,13 @@
       }
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/merge2": {
       "version": "1.4.1",
@@ -5840,7 +6410,7 @@
     "node_modules/methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -5893,12 +6463,15 @@
       }
     },
     "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/minimatch": {
@@ -5914,10 +6487,13 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/minipass": {
       "version": "3.1.6",
@@ -5957,43 +6533,38 @@
       }
     },
     "node_modules/mocha": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
-      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.3",
-        "debug": "4.3.4",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.2.0",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "5.0.1",
-        "ms": "2.1.3",
-        "nanoid": "3.3.3",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "workerpool": "6.2.1",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.1.0.tgz",
+      "integrity": "sha512-8uJR5RTC2NgpY3GrYcgpZrsEd9zKbPDpob1RezyR2upGHRQtHWofmzTMzTMSV6dru3tj5Ukt0+Vnq1qhFEEwAg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.3",
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.5",
+        "diff": "^5.2.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^10.4.5",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^5.1.6",
+        "ms": "^2.1.3",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^6.5.1",
+        "yargs": "^17.7.2",
+        "yargs-parser": "^21.1.1",
+        "yargs-unparser": "^2.0.0"
       },
       "bin": {
         "_mocha": "bin/_mocha",
         "mocha": "bin/mocha.js"
       },
       "engines": {
-        "node": ">= 14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/mocha/node_modules/brace-expansion": {
@@ -6006,14 +6577,26 @@
       }
     },
     "node_modules/mocha/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "dependencies": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^6.0.1",
         "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/mocha/node_modules/diff": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
       }
     },
     "node_modules/mocha/node_modules/find-up": {
@@ -6032,6 +6615,41 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/mocha/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/mocha/node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/mocha/node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -6048,9 +6666,9 @@
       }
     },
     "node_modules/mocha/node_modules/minimatch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -6059,11 +6677,14 @@
         "node": ">=10"
       }
     },
-    "node_modules/mocha/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
+    "node_modules/mocha/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
     },
     "node_modules/mocha/node_modules/p-limit": {
       "version": "3.1.0",
@@ -6129,101 +6750,128 @@
       }
     },
     "node_modules/mocha/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "dependencies": {
-        "cliui": "^7.0.2",
+        "cliui": "^8.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
+        "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/mocha/node_modules/yargs-parser": {
-      "version": "20.2.4",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
       "dev": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/moment-timezone": {
-      "version": "0.5.34",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz",
-      "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==",
+      "version": "0.5.46",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz",
+      "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==",
       "dev": true,
       "dependencies": {
-        "moment": ">= 2.9.0"
+        "moment": "^2.29.4"
       },
       "engines": {
         "node": "*"
       }
     },
     "node_modules/mqtt": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.3.7.tgz",
-      "integrity": "sha512-ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.0.tgz",
+      "integrity": "sha512-/o0CBYSjZzddmQDV2iglCafsA0xWKpqnS62tGbOLOliubBxszpXO1DAQPyfI7ZcPDG0b9ni7QITn+5FW1E2UTg==",
       "dev": true,
       "dependencies": {
-        "commist": "^1.0.0",
+        "@types/readable-stream": "^4.0.5",
+        "@types/ws": "^8.5.9",
+        "commist": "^3.2.0",
         "concat-stream": "^2.0.0",
-        "debug": "^4.1.1",
-        "duplexify": "^4.1.1",
-        "help-me": "^3.0.0",
-        "inherits": "^2.0.3",
-        "lru-cache": "^6.0.0",
-        "minimist": "^1.2.5",
-        "mqtt-packet": "^6.8.0",
-        "number-allocator": "^1.0.9",
-        "pump": "^3.0.0",
-        "readable-stream": "^3.6.0",
+        "debug": "^4.3.4",
+        "help-me": "^5.0.0",
+        "lru-cache": "^10.0.1",
+        "minimist": "^1.2.8",
+        "mqtt": "^5.2.0",
+        "mqtt-packet": "^9.0.0",
+        "number-allocator": "^1.0.14",
+        "readable-stream": "^4.4.2",
         "reinterval": "^1.1.0",
         "rfdc": "^1.3.0",
-        "split2": "^3.1.0",
-        "ws": "^7.5.5",
-        "xtend": "^4.0.2"
+        "split2": "^4.2.0",
+        "worker-timers": "^7.1.4",
+        "ws": "^8.14.2"
       },
       "bin": {
-        "mqtt": "bin/mqtt.js",
-        "mqtt_pub": "bin/pub.js",
-        "mqtt_sub": "bin/sub.js"
+        "mqtt": "build/bin/mqtt.js",
+        "mqtt_pub": "build/bin/pub.js",
+        "mqtt_sub": "build/bin/sub.js"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/mqtt-packet": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.10.0.tgz",
-      "integrity": "sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.2.tgz",
+      "integrity": "sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==",
       "dev": true,
       "dependencies": {
-        "bl": "^4.0.2",
-        "debug": "^4.1.1",
+        "bl": "^6.0.8",
+        "debug": "^4.3.4",
         "process-nextick-args": "^2.0.1"
       }
     },
+    "node_modules/mqtt/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
+    "node_modules/mqtt/node_modules/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "node_modules/multer": {
@@ -6278,9 +6926,9 @@
       }
     },
     "node_modules/multer/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -6322,18 +6970,6 @@
       "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
       "dev": true
     },
-    "node_modules/nanoid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -6380,13 +7016,6 @@
         "isarray": "0.0.1"
       }
     },
-    "node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/node-emoji": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
@@ -6396,252 +7025,128 @@
         "lodash": "^4.17.21"
       }
     },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-red": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/node-red/-/node-red-3.0.2.tgz",
-      "integrity": "sha512-B6q576kLw96eKOiqNpNJsUiwl5vRipc46T0w/LUI7O3fPAVxwu5zklIBhE6Iefj8FV1IdbLwXULESqMWlwjlGQ==",
-      "dev": true,
-      "dependencies": {
-        "@node-red/editor-api": "3.0.2",
-        "@node-red/nodes": "3.0.2",
-        "@node-red/runtime": "3.0.2",
-        "@node-red/util": "3.0.2",
-        "basic-auth": "2.0.1",
-        "bcryptjs": "2.4.3",
-        "express": "4.18.1",
-        "fs-extra": "10.1.0",
-        "node-red-admin": "^3.0.0",
-        "nopt": "5.0.0",
-        "semver": "7.3.7"
-      },
-      "bin": {
-        "node-red": "red.js",
-        "node-red-pi": "bin/node-red-pi"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "optionalDependencies": {
-        "bcrypt": "5.0.1"
-      }
-    },
-    "node_modules/node-red-admin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/node-red-admin/-/node-red-admin-3.0.0.tgz",
-      "integrity": "sha512-1J1tcV+zkCIy24n0rcJ/DSPSCziEgLGld+QBYk1rNESIo+gFyL5RMkCOcII2IrBTZF/kcDTElepMTCILXbMDfQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1",
-        "axios": "0.27.2",
-        "bcryptjs": "^2.4.3",
-        "cli-table": "^0.3.11",
-        "enquirer": "^2.3.6",
-        "minimist": "^1.2.6",
-        "mustache": "^4.2.0",
-        "read": "^1.0.7"
-      },
-      "bin": {
-        "node-red-admin": "node-red-admin.js"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "optionalDependencies": {
-        "bcrypt": "5.0.1"
-      }
-    },
-    "node_modules/node-red-admin/node_modules/axios": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-      "dev": true,
-      "dependencies": {
-        "follow-redirects": "^1.14.9",
-        "form-data": "^4.0.0"
-      }
-    },
-    "node_modules/node-red-admin/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/node-red-dev": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/node-red-dev/-/node-red-dev-0.1.5.tgz",
-      "integrity": "sha512-NtpQnbEl2NT2sYe7MvLeNK0OtyKAc4SN1sTBEnvHgj2Nea36HVxRDnI/SLi2BPJA2JbGh6l/PSIldsvhZ/GmXQ==",
-      "dev": true,
-      "dependencies": {
-        "@oclif/command": "^1.8.0",
-        "@oclif/config": "^1.17.0",
-        "@oclif/plugin-help": "^3.2.3",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "axios": "^0.21.4",
-        "npm-check": "^5.9.2",
-        "npm-remote-ls": "^1.3.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.11"
-      },
-      "bin": {
-        "node-red-dev": "bin/run"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/node-red-node-test-helper": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/node-red-node-test-helper/-/node-red-node-test-helper-0.3.0.tgz",
-      "integrity": "sha512-mgeMEsRDbxmF16dQeBHEF0n944i09V4d1tMYpll83P2kxu/78Iqc6kuP9E12duqQSgWR8SOGNUqMxz9vpog1DA==",
-      "dev": true,
-      "dependencies": {
-        "body-parser": "1.20.0",
-        "express": "4.18.1",
-        "read-pkg-up": "7.0.1",
-        "semver": "7.3.7",
-        "should": "^13.2.3",
-        "should-sinon": "0.0.6",
-        "sinon": "11.1.2",
-        "stoppable": "1.1.0",
-        "supertest": "6.2.3"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/node-red-node-test-helper/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/node-red-node-test-helper/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/node-red-node-test-helper/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/node-red": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/node-red/-/node-red-4.0.9.tgz",
+      "integrity": "sha512-E4oo64ieP8GGSbdBhNtzDdXDVX5/nxEIJg89TyhpUT7aWLxvn+Q75V+jUGUUd6M3/B1A7vEn6HBmIlGNvgv/9g==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "@node-red/editor-api": "4.0.9",
+        "@node-red/nodes": "4.0.9",
+        "@node-red/runtime": "4.0.9",
+        "@node-red/util": "4.0.9",
+        "basic-auth": "2.0.1",
+        "bcryptjs": "2.4.3",
+        "cors": "2.8.5",
+        "express": "4.21.2",
+        "fs-extra": "11.2.0",
+        "node-red-admin": "^4.0.1",
+        "nopt": "5.0.0",
+        "semver": "7.6.3"
+      },
+      "bin": {
+        "node-red": "red.js",
+        "node-red-pi": "bin/node-red-pi"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18.5"
+      },
+      "optionalDependencies": {
+        "@node-rs/bcrypt": "1.10.4"
       }
     },
-    "node_modules/node-red-node-test-helper/node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+    "node_modules/node-red-admin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.0.1.tgz",
+      "integrity": "sha512-NLZgAM8JgFa/2/7Z4+nSSQrtkuBbfS9m+kxegadhHfuta5rErOx6zrrNhF+yAglMTPlVmdoqgso7VSt3nTRBGQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
+        "ansi-colors": "^4.1.3",
+        "axios": "^1.7.7",
+        "bcryptjs": "^2.4.3",
+        "cli-table": "^0.3.11",
+        "enquirer": "^2.3.6",
+        "minimist": "^1.2.8",
+        "mustache": "^4.2.0",
+        "read": "^3.0.1"
+      },
+      "bin": {
+        "node-red-admin": "node-red-admin.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "optionalDependencies": {
+        "@node-rs/bcrypt": "1.10.4"
       }
     },
-    "node_modules/node-red-node-test-helper/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+    "node_modules/node-red-admin/node_modules/axios": {
+      "version": "1.8.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
+      "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/node-red-node-test-helper/node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+    "node_modules/node-red-admin/node_modules/form-data": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dev": true,
       "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 6"
       }
     },
-    "node_modules/node-red-node-test-helper/node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+    "node_modules/node-red-dev": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/node-red-dev/-/node-red-dev-0.1.6.tgz",
+      "integrity": "sha512-zbm6Frl4ZAbSLeW3apLjCYoB+pIxyJFs254DQa29+9Q+fcgufDkzXmemchI7fIoRzDsffv8U6sqOvAK/89tQkA==",
       "dev": true,
       "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
+        "@oclif/command": "^1.8.0",
+        "@oclif/config": "^1.17.0",
+        "@oclif/plugin-help": "^3.2.3",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "axios": "^0.21.4",
+        "npm-check": "^5.9.2",
+        "npm-remote-ls": "^1.3.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "node-red-dev": "bin/run"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/node-red-node-test-helper/node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+    "node_modules/node-red-node-test-helper": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/node-red-node-test-helper/-/node-red-node-test-helper-0.3.4.tgz",
+      "integrity": "sha512-OFXGEkKZpLkgoijAgpUIjzn5RF8QnbwPX9RjfI2LWXq1ACfeXkXcW0i1ioiphrokdE3MiWQJtH5omLNnSNdyaQ==",
       "dev": true,
+      "dependencies": {
+        "body-parser": "^1.20.2",
+        "express": "^4.19.2",
+        "semver": "^7.5.4",
+        "should": "^13.2.3",
+        "should-sinon": "^0.0.6",
+        "sinon": "^11.1.2",
+        "stoppable": "^1.1.0",
+        "supertest": "^7.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=14"
       }
     },
     "node_modules/node-red-node-test-helper/node_modules/sinon": {
@@ -6662,19 +7167,10 @@
         "url": "https://opencollective.com/sinon"
       }
     },
-    "node_modules/node-red-node-test-helper/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/node-red/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -6682,7 +7178,7 @@
         "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14.14"
       }
     },
     "node_modules/node-red/node_modules/jsonfile": {
@@ -6698,9 +7194,9 @@
       }
     },
     "node_modules/node-red/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
@@ -6716,9 +7212,9 @@
       }
     },
     "node_modules/node-watch": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.7.3.tgz",
-      "integrity": "sha512-3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ==",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.7.4.tgz",
+      "integrity": "sha512-RinNxoz4W1cep1b928fuFhvAQ5ag/+1UlMDV7rbyGthBIgsiEouS4kvRayvvboxii4m8eolKOIBo3OjDqbc+uQ==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -6770,12 +7266,12 @@
       }
     },
     "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
+      "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -7145,19 +7641,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "are-we-there-yet": "^2.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
-        "set-blocking": "^2.0.0"
-      }
-    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -7171,13 +7654,13 @@
       }
     },
     "node_modules/number-allocator": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.10.tgz",
-      "integrity": "sha512-K4AvNGKo9lP6HqsZyfSr9KDaqnwFzW203inhQEOwFrmFaYevpdX4VNwdOLk197aHujzbT//z6pCBrCOUYSM5iw==",
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz",
+      "integrity": "sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==",
       "dev": true,
       "dependencies": {
         "debug": "^4.3.1",
-        "js-sdsl": "^2.1.2"
+        "js-sdsl": "4.3.0"
       }
     },
     "node_modules/number-is-nan": {
@@ -7199,9 +7682,9 @@
       }
     },
     "node_modules/oauth2orize": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.11.1.tgz",
-      "integrity": "sha512-9dSx/Gwm0J2Rvj4RH9+h7iXVnRXZ6biwWRgb2dCeQhCosODS0nYdM9I/G7BUGsjbgn0pHjGcn1zcCRtzj2SlRA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.12.0.tgz",
+      "integrity": "sha512-j4XtFDQUBsvUHPjUmvmNDUDMYed2MphMIJBhyxVVe8hGCjkuYnjIsW+D9qk8c5ciXRdnk6x6tEbiO6PLeOZdCQ==",
       "dev": true,
       "dependencies": {
         "debug": "2.x.x",
@@ -7241,10 +7724,13 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -7397,12 +7883,12 @@
       }
     },
     "node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+      "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12.20"
       }
     },
     "node_modules/p-finally": {
@@ -7465,6 +7951,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true
+    },
     "node_modules/package-json/node_modules/semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -7532,9 +8024,9 @@
       }
     },
     "node_modules/passport": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
-      "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
+      "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
       "dev": true,
       "dependencies": {
         "passport-strategy": "1.x.x",
@@ -7624,10 +8116,41 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
+    "node_modules/path-scurry/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
       "dev": true
     },
     "node_modules/path-type": {
@@ -7767,6 +8290,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -7786,6 +8318,12 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
     "node_modules/pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -7798,16 +8336,6 @@
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -7886,14 +8414,14 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
+      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
       "dev": true,
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
+        "iconv-lite": "0.6.3",
         "unpipe": "1.0.0"
       },
       "engines": {
@@ -7925,15 +8453,15 @@
       }
     },
     "node_modules/read": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-      "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz",
+      "integrity": "sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==",
       "dev": true,
       "dependencies": {
-        "mute-stream": "~0.0.4"
+        "mute-stream": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/read-pkg": {
@@ -7990,18 +8518,29 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/read/node_modules/mute-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
       "dev": true,
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/readdirp": {
@@ -8225,24 +8764,30 @@
       }
     },
     "node_modules/responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
       "dev": true,
       "dependencies": {
-        "lowercase-keys": "^2.0.0"
+        "lowercase-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/responselike/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/restore-cursor": {
@@ -8269,9 +8814,9 @@
       }
     },
     "node_modules/rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true
     },
     "node_modules/rimraf": {
@@ -8354,19 +8899,16 @@
       "dev": true
     },
     "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
       "dev": true
     },
     "node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -8402,9 +8944,9 @@
       }
     },
     "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dev": true,
       "dependencies": {
         "debug": "2.6.9",
@@ -8440,6 +8982,15 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -8452,31 +9003,25 @@
         "node": ">=4"
       }
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
     "node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dev": true,
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -8579,14 +9124,72 @@
       "dev": true
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8599,16 +9202,15 @@
       "dev": true
     },
     "node_modules/sinon": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.2.tgz",
-      "integrity": "sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==",
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-20.0.0.tgz",
+      "integrity": "sha512-+FXOAbdnj94AQIxH0w1v8gzNxkawVvNqE3jUzRLptR71Oykeu2RrQXXl/VQjKay+Qnh73fDt/oDfMo6xMeDQbQ==",
       "dev": true,
       "dependencies": {
-        "@sinonjs/commons": "^2.0.0",
-        "@sinonjs/fake-timers": "^9.1.2",
-        "@sinonjs/samsam": "^7.0.1",
-        "diff": "^5.0.0",
-        "nise": "^5.1.2",
+        "@sinonjs/commons": "^3.0.1",
+        "@sinonjs/fake-timers": "^13.0.5",
+        "@sinonjs/samsam": "^8.0.1",
+        "diff": "^7.0.0",
         "supports-color": "^7.2.0"
       },
       "funding": {
@@ -8617,41 +9219,50 @@
       }
     },
     "node_modules/sinon/node_modules/@sinonjs/commons": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
-      "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
       "dev": true,
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
     "node_modules/sinon/node_modules/@sinonjs/fake-timers": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
+      "version": "13.0.5",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+      "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
       "dev": true,
       "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
+        "@sinonjs/commons": "^3.0.1"
       }
     },
-    "node_modules/sinon/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.5.tgz",
-      "integrity": "sha512-rTpCA0wG1wUxglBSFdMMY0oTrKYvgf4fNgv/sXbfCVAdf+FnPBdKJR/7XbpTCwbCrvCbdPYnlWaUUYz4V2fPDA==",
+    "node_modules/sinon/node_modules/@sinonjs/samsam": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz",
+      "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==",
       "dev": true,
       "dependencies": {
-        "type-detect": "4.0.8"
+        "@sinonjs/commons": "^3.0.1",
+        "lodash.get": "^4.4.2",
+        "type-detect": "^4.1.0"
       }
     },
-    "node_modules/sinon/node_modules/@sinonjs/samsam": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-7.0.1.tgz",
-      "integrity": "sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==",
+    "node_modules/sinon/node_modules/@sinonjs/samsam/node_modules/type-detect": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+      "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
       "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^2.0.0",
-        "lodash.get": "^4.4.2",
-        "type-detect": "^4.0.8"
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sinon/node_modules/diff": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
+      "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
       }
     },
     "node_modules/slash": {
@@ -8705,12 +9316,12 @@
       "dev": true
     },
     "node_modules/split2": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
       "dev": true,
-      "dependencies": {
-        "readable-stream": "^3.0.0"
+      "engines": {
+        "node": ">= 10.x"
       }
     },
     "node_modules/sprintf-js": {
@@ -8769,12 +9380,6 @@
         "npm": ">=6"
       }
     },
-    "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
     "node_modules/streamsearch": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
@@ -8793,7 +9398,22 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string-width": {
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
@@ -8819,6 +9439,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-bom": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
@@ -8873,52 +9506,34 @@
       "integrity": "sha512-Hi8earJouQOzxwSoRjF75d8kl8ZzX/Zwzsr6pKkdgP1rNnOenPRrB6GDhx56j6PeOdghQCos/rA4YT95oqOvcA=="
     },
     "node_modules/superagent": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-7.1.5.tgz",
-      "integrity": "sha512-HQYyGuDRFGmZ6GNC4hq2f37KnsY9Lr0/R1marNZTgMweVDQLTLJJ6DGQ9Tj/xVVs5HEnop9EMmTbywb5P30aqw==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz",
+      "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==",
       "dev": true,
       "dependencies": {
         "component-emitter": "^1.3.0",
-        "cookiejar": "^2.1.3",
+        "cookiejar": "^2.1.4",
         "debug": "^4.3.4",
         "fast-safe-stringify": "^2.1.1",
         "form-data": "^4.0.0",
-        "formidable": "^2.0.1",
+        "formidable": "^3.5.1",
         "methods": "^1.1.2",
-        "mime": "^2.5.0",
-        "qs": "^6.10.3",
-        "readable-stream": "^3.6.0",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": ">=6.4.0 <13 || >=14"
-      }
-    },
-    "node_modules/superagent/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
+        "mime": "2.6.0",
+        "qs": "^6.11.0"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=14.18.0"
       }
     },
     "node_modules/superagent/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dev": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -8938,12 +9553,12 @@
       }
     },
     "node_modules/superagent/node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
       "dev": true,
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -8953,16 +9568,16 @@
       }
     },
     "node_modules/supertest": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/supertest/-/supertest-6.2.3.tgz",
-      "integrity": "sha512-3GSdMYTMItzsSYjnIcljxMVZKPW1J9kYHZY+7yLfD0wpPwww97GeImZC1oOk0S5+wYl2niJwuFusBJqwLqYM3g==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz",
+      "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==",
       "dev": true,
       "dependencies": {
         "methods": "^1.1.2",
-        "superagent": "^7.1.3"
+        "superagent": "^9.0.1"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=14.18.0"
       }
     },
     "node_modules/supports-color": {
@@ -9035,16 +9650,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/term-size/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
     "node_modules/term-size/node_modules/npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -9099,12 +9704,6 @@
         "which": "bin/which"
       }
     },
-    "node_modules/term-size/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -9132,6 +9731,24 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/tldts": {
+      "version": "6.1.85",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz",
+      "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==",
+      "dev": true,
+      "dependencies": {
+        "tldts-core": "^6.1.85"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "6.1.85",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz",
+      "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==",
+      "dev": true
+    },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -9175,13 +9792,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/treeify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz",
@@ -9201,9 +9811,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true
     },
     "node_modules/tunnel-agent": {
@@ -9270,6 +9880,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/type-is/node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -9277,9 +9896,9 @@
       "dev": true
     },
     "node_modules/uglify-js": {
-      "version": "3.16.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.3.tgz",
-      "integrity": "sha512-uVbFqx9vvLhQg0iBaau9Z75AxWJ8tqM9AV890dIZCLApF4rTcyHwmAvLeEdYRs+BzYWu8Iw81F79ah0EfTXbaw==",
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
       "dev": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -9330,7 +9949,7 @@
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -9461,13 +10080,13 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true,
       "engines": {
         "node": ">= 0.4.0"
@@ -9496,7 +10115,7 @@
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -9575,24 +10194,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -9636,16 +10237,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
     "node_modules/widest-line": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -9679,10 +10270,44 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/worker-timers": {
+      "version": "7.1.8",
+      "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz",
+      "integrity": "sha512-R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.24.5",
+        "tslib": "^2.6.2",
+        "worker-timers-broker": "^6.1.8",
+        "worker-timers-worker": "^7.0.71"
+      }
+    },
+    "node_modules/worker-timers-broker": {
+      "version": "6.1.8",
+      "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz",
+      "integrity": "sha512-FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.24.5",
+        "fast-unique-numbers": "^8.0.13",
+        "tslib": "^2.6.2",
+        "worker-timers-worker": "^7.0.71"
+      }
+    },
+    "node_modules/worker-timers-worker": {
+      "version": "7.0.71",
+      "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz",
+      "integrity": "sha512-ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.24.5",
+        "tslib": "^2.6.2"
+      }
+    },
     "node_modules/workerpool": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
-      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
       "dev": true
     },
     "node_modules/wrap-ansi": {
@@ -9702,6 +10327,24 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -9720,9 +10363,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
-      "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "dev": true,
       "engines": {
         "node": ">=8.3.0"
@@ -9750,9 +10393,9 @@
       }
     },
     "node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+      "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
       "dev": true,
       "dependencies": {
         "sax": ">=0.6.0",
@@ -10078,18 +10721,18 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
-      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
+      "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
       "dev": true,
       "requires": {
-        "regenerator-runtime": "^0.13.4"
+        "regenerator-runtime": "^0.14.0"
       },
       "dependencies": {
         "regenerator-runtime": {
-          "version": "0.13.9",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-          "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+          "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
           "dev": true
         }
       }
@@ -10141,6 +10784,37 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@emnapi/core": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.0.tgz",
+      "integrity": "sha512-H+N/FqT07NmLmt6OFFtDfwe8PNygprzBikrEMyQfgqSmT0vzE515Pz7R8izwB9q/zsH/MA64AKoul3sA6/CzVg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@emnapi/wasi-threads": "1.0.1",
+        "tslib": "^2.4.0"
+      }
+    },
+    "@emnapi/runtime": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.0.tgz",
+      "integrity": "sha512-64WYIf4UYcdLnbKn/umDlNjQDSS8AgZrI/R9+x5ilkUVFxXcA1Ebl+gQLc/6mERA4407Xof0R7wEyEuj091CVw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "@emnapi/wasi-threads": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz",
+      "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tslib": "^2.4.0"
+      }
+    },
     "@eslint/eslintrc": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
@@ -10181,126 +10855,181 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
-    "@mapbox/node-pre-gyp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz",
-      "integrity": "sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==",
+    "@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "detect-libc": "^2.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "make-dir": "^3.1.0",
-        "node-fetch": "^2.6.7",
-        "nopt": "^5.0.0",
-        "npmlog": "^5.0.1",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.11"
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
       },
       "dependencies": {
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+        "ansi-regex": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+          "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "semver": "^6.0.0"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "6.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-              "dev": true,
-              "optional": true
-            }
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        },
+        "wrap-ansi": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+          "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^6.1.0",
+            "string-width": "^5.0.1",
+            "strip-ansi": "^7.0.1"
           }
         }
       }
     },
+    "@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "dev": true,
+      "requires": {
+        "minipass": "^7.0.4"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+          "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+          "dev": true
+        }
+      }
+    },
+    "@napi-rs/wasm-runtime": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.7.tgz",
+      "integrity": "sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@emnapi/core": "^1.3.1",
+        "@emnapi/runtime": "^1.3.1",
+        "@tybys/wasm-util": "^0.9.0"
+      }
+    },
     "@node-red/editor-api": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-3.0.2.tgz",
-      "integrity": "sha512-eyWObGLXVKhQDOHX9Fe+oOhC5nZAU8A92M5f4BwCXY1c9wx8QnWZVqOhPleVu3UJxZJEZ44OUdPb+HtsRNmD7Q==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-4.0.9.tgz",
+      "integrity": "sha512-jGr5fQAXXfxIVM41FZlTbcnelA6vkL9uweX6FjYnu4VPzePfcV61TM3awyTiw0YGTonm/RYPKRpZu3cZ3/pX+w==",
       "dev": true,
       "requires": {
-        "@node-red/editor-client": "3.0.2",
-        "@node-red/util": "3.0.2",
-        "bcrypt": "5.0.1",
+        "@node-red/editor-client": "4.0.9",
+        "@node-red/util": "4.0.9",
+        "@node-rs/bcrypt": "1.10.4",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.20.0",
+        "body-parser": "1.20.3",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express": "4.18.1",
-        "express-session": "1.17.3",
+        "express": "4.21.2",
+        "express-session": "1.18.1",
         "memorystore": "1.6.7",
         "mime": "3.0.0",
         "multer": "1.4.5-lts.1",
         "mustache": "4.2.0",
-        "oauth2orize": "1.11.1",
-        "passport": "0.6.0",
+        "oauth2orize": "1.12.0",
+        "passport": "0.7.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "ws": "7.5.6"
+        "ws": "7.5.10"
       }
     },
     "@node-red/editor-client": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-3.0.2.tgz",
-      "integrity": "sha512-UlbsoEnIfpQO0yKf55Kd2qCwItDjfM9ut6FUfd2x10yKk9RxrA1rQPsW7PiB7gV/E1aW1JPmMxrmfHbb9Gdf8w==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-4.0.9.tgz",
+      "integrity": "sha512-1XVNVmYtCDkQVKEh1bSzLS0GPjI9GEV5CeFdz/k/zjU4Qe63dmSzc76KmRBaDrjOMpvfaJAdZQ+ZuSqocOv5zA==",
       "dev": true
     },
     "@node-red/nodes": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/nodes/-/nodes-3.0.2.tgz",
-      "integrity": "sha512-H2rH2U5uEic4nwyabkiTIYNYGLTJL6TIccdPwz7AAykTmD5naKLs3nhuPHjzb54iPen/SU9jkJoU7iecslOk6g==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/nodes/-/nodes-4.0.9.tgz",
+      "integrity": "sha512-gVcaocuAjq1p7XmY5nKmBjyEXcLCQYosj1ZPTRqtABPRdUKSGCfN4Shr9oGBEkwd+HNSWaKia7/GKnow9F63kg==",
       "dev": true,
       "requires": {
-        "acorn": "8.7.1",
-        "acorn-walk": "8.2.0",
-        "ajv": "8.11.0",
-        "body-parser": "1.20.0",
+        "acorn": "8.12.1",
+        "acorn-walk": "8.3.4",
+        "ajv": "8.17.1",
+        "body-parser": "1.20.3",
         "cheerio": "1.0.0-rc.10",
-        "content-type": "1.0.4",
-        "cookie": "0.5.0",
-        "cookie-parser": "1.4.6",
+        "content-type": "1.0.5",
+        "cookie": "0.7.2",
+        "cookie-parser": "1.4.7",
         "cors": "2.8.5",
         "cronosjs": "1.7.1",
         "denque": "2.1.0",
         "form-data": "4.0.0",
-        "fs-extra": "10.1.0",
-        "got": "11.8.5",
+        "fs-extra": "11.2.0",
+        "got": "12.6.1",
         "hash-sum": "2.0.0",
-        "hpagent": "1.0.0",
+        "hpagent": "1.2.0",
         "https-proxy-agent": "5.0.1",
         "iconv-lite": "0.6.3",
         "is-utf8": "0.2.1",
         "js-yaml": "4.1.0",
         "media-typer": "1.1.0",
-        "mqtt": "4.3.7",
+        "mqtt": "5.7.0",
         "multer": "1.4.5-lts.1",
         "mustache": "4.2.0",
-        "node-watch": "0.7.3",
+        "node-watch": "0.7.4",
         "on-headers": "1.0.2",
-        "raw-body": "2.5.1",
-        "tough-cookie": "4.0.0",
-        "uuid": "8.3.2",
-        "ws": "7.5.6",
-        "xml2js": "0.4.23"
+        "raw-body": "3.0.0",
+        "tough-cookie": "^5.0.0",
+        "uuid": "9.0.1",
+        "ws": "7.5.10",
+        "xml2js": "0.6.2"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "version": "8.17.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+          "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
+            "fast-deep-equal": "^3.1.3",
+            "fast-uri": "^3.0.1",
             "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
+            "require-from-string": "^2.0.2"
           }
         },
         "form-data": {
@@ -10315,50 +11044,39 @@
           }
         },
         "fs-extra": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "version": "11.2.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+          "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
             "jsonfile": "^6.0.1",
             "universalify": "^2.0.0"
-          },
-          "dependencies": {
-            "universalify": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-              "dev": true
-            }
           }
         },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
+        },
         "got": {
-          "version": "11.8.5",
-          "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
-          "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+          "version": "12.6.1",
+          "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
+          "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
           "dev": true,
           "requires": {
-            "@sindresorhus/is": "^4.0.0",
-            "@szmarczak/http-timer": "^4.0.5",
-            "@types/cacheable-request": "^6.0.1",
-            "@types/responselike": "^1.0.0",
-            "cacheable-lookup": "^5.0.3",
-            "cacheable-request": "^7.0.2",
+            "@sindresorhus/is": "^5.2.0",
+            "@szmarczak/http-timer": "^5.0.1",
+            "cacheable-lookup": "^7.0.0",
+            "cacheable-request": "^10.2.8",
             "decompress-response": "^6.0.0",
-            "http2-wrapper": "^1.0.0-beta.5.2",
-            "lowercase-keys": "^2.0.0",
-            "p-cancelable": "^2.0.0",
-            "responselike": "^2.0.0"
-          }
-        },
-        "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
+            "form-data-encoder": "^2.1.2",
+            "get-stream": "^6.0.1",
+            "http2-wrapper": "^2.1.10",
+            "lowercase-keys": "^3.0.0",
+            "p-cancelable": "^3.0.0",
+            "responselike": "^3.0.0"
           }
         },
         "json-schema-traverse": {
@@ -10375,65 +11093,70 @@
           "requires": {
             "graceful-fs": "^4.1.6",
             "universalify": "^2.0.0"
-          },
-          "dependencies": {
-            "universalify": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-              "dev": true
-            }
           }
         },
         "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-          "dev": true
-        },
-        "media-typer": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
-          "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+          "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
           "dev": true
         },
         "tough-cookie": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-          "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+          "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
           "dev": true,
           "requires": {
-            "psl": "^1.1.33",
-            "punycode": "^2.1.1",
-            "universalify": "^0.1.2"
+            "tldts": "^6.1.32"
           }
         },
+        "universalify": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+          "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+          "dev": true
+        },
         "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+          "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
           "dev": true
         }
       }
     },
     "@node-red/registry": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/registry/-/registry-3.0.2.tgz",
-      "integrity": "sha512-+vf9R4j+p2nM7awzicIzu6liJgXyoQfhHGv3OxmK9OfBsISn5eWIj9u2HiJtG3ChYfuediK2FEhc+Pb+mhfTJA==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/registry/-/registry-4.0.9.tgz",
+      "integrity": "sha512-hczmbEGVNJm4HX20rvGjxYnEcl9TF3x3hAzKtpr8OWWMWvGS3UHzZPM13c3KeItzg3WN/bap8/12wGRzHE1RdA==",
       "dev": true,
       "requires": {
-        "@node-red/util": "3.0.2",
+        "@node-red/util": "4.0.9",
         "clone": "2.1.2",
-        "fs-extra": "10.1.0",
-        "semver": "7.3.7",
-        "tar": "6.1.11",
-        "uglify-js": "3.16.3"
+        "fs-extra": "11.2.0",
+        "semver": "7.6.3",
+        "tar": "7.4.3",
+        "uglify-js": "3.17.4"
       },
       "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "chownr": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+          "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+          "dev": true
+        },
         "fs-extra": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "version": "11.2.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+          "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -10441,43 +11164,118 @@
             "universalify": "^2.0.0"
           }
         },
-        "jsonfile": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+        "glob": {
+          "version": "10.4.5",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+          "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+          "dev": true,
+          "requires": {
+            "foreground-child": "^3.1.0",
+            "jackspeak": "^3.1.2",
+            "minimatch": "^9.0.4",
+            "minipass": "^7.1.2",
+            "package-json-from-dist": "^1.0.0",
+            "path-scurry": "^1.11.1"
+          }
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "minipass": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+          "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+          "dev": true
+        },
+        "minizlib": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
+          "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
+          "dev": true,
+          "requires": {
+            "minipass": "^7.0.4",
+            "rimraf": "^5.0.5"
+          }
+        },
+        "mkdirp": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+          "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "5.0.10",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+          "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+          "dev": true,
+          "requires": {
+            "glob": "^10.3.7"
+          }
+        },
+        "tar": {
+          "version": "7.4.3",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+          "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6",
-            "universalify": "^2.0.0"
+            "@isaacs/fs-minipass": "^4.0.0",
+            "chownr": "^3.0.0",
+            "minipass": "^7.1.2",
+            "minizlib": "^3.0.1",
+            "mkdirp": "^3.0.1",
+            "yallist": "^5.0.0"
           }
         },
         "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+          "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+          "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
           "dev": true
         }
       }
     },
     "@node-red/runtime": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/runtime/-/runtime-3.0.2.tgz",
-      "integrity": "sha512-lEx6riLeEHMshvW84BEN/oUESG1F2AirLCkH6xbws8Ta8fgE6YfsOvgKBMnfbwoUME2O+I/QCkIYZqlqUhqJXg==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/runtime/-/runtime-4.0.9.tgz",
+      "integrity": "sha512-frKqZl6VESSgosJcMqu0ADO3p3zO+HNHQSQaqe+BlsPKLmJCZfM82jPXGFf741hoRDvN6naei4QkwdZiHCuRTA==",
       "dev": true,
       "requires": {
-        "@node-red/registry": "3.0.2",
-        "@node-red/util": "3.0.2",
-        "async-mutex": "0.3.2",
+        "@node-red/registry": "4.0.9",
+        "@node-red/util": "4.0.9",
+        "async-mutex": "0.5.0",
         "clone": "2.1.2",
-        "express": "4.18.1",
-        "fs-extra": "10.1.0",
-        "json-stringify-safe": "5.0.1"
+        "express": "4.21.2",
+        "fs-extra": "11.2.0",
+        "json-stringify-safe": "5.0.1",
+        "rfdc": "^1.3.1"
       },
       "dependencies": {
         "fs-extra": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "version": "11.2.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+          "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -10496,32 +11294,32 @@
           }
         },
         "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+          "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
           "dev": true
         }
       }
     },
     "@node-red/util": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@node-red/util/-/util-3.0.2.tgz",
-      "integrity": "sha512-zhxmFk48QEC4coBN0G0JDHt727+BlZS2QZarWs9hLeNDBdhjlU58RY0lhDgqODu/Z3JvBmIdPhCtDcvHpe4zmw==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@node-red/util/-/util-4.0.9.tgz",
+      "integrity": "sha512-JAeHlwq7BgNvDyTPzN5uXY03WWJKEnTakYJ4t/Awq1eKjSVLLuGbEZkn5bDI5muhJgHuN0uDOzE9lc86bWUlxQ==",
       "dev": true,
       "requires": {
-        "fs-extra": "10.1.0",
-        "i18next": "21.8.16",
+        "fs-extra": "11.2.0",
+        "i18next": "21.10.0",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.6",
+        "jsonata": "2.0.5",
         "lodash.clonedeep": "^4.5.0",
-        "moment": "2.29.4",
-        "moment-timezone": "0.5.34"
+        "moment": "2.30.1",
+        "moment-timezone": "0.5.46"
       },
       "dependencies": {
         "fs-extra": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "version": "11.2.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+          "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -10529,6 +11327,12 @@
             "universalify": "^2.0.0"
           }
         },
+        "jsonata": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/jsonata/-/jsonata-2.0.5.tgz",
+          "integrity": "sha512-wEse9+QLIIU5IaCgtJCPsFi/H4F3qcikWzF4bAELZiRz08ohfx3Q6CjDRf4ZPF5P/92RI3KIHtb7u3jqPaHXdQ==",
+          "dev": true
+        },
         "jsonfile": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -10540,13 +11344,137 @@
           }
         },
         "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+          "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
           "dev": true
         }
       }
     },
+    "@node-rs/bcrypt": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt/-/bcrypt-1.10.4.tgz",
+      "integrity": "sha512-Kzs8HKt2eBeT5VnkeKgiz/QKTjOO3URcvSNEQZahNwZnL6dBeeJQTxxYisc/6969+5n6c3+gNwKvqJsZzmGe7g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@node-rs/bcrypt-android-arm-eabi": "1.10.4",
+        "@node-rs/bcrypt-android-arm64": "1.10.4",
+        "@node-rs/bcrypt-darwin-arm64": "1.10.4",
+        "@node-rs/bcrypt-darwin-x64": "1.10.4",
+        "@node-rs/bcrypt-freebsd-x64": "1.10.4",
+        "@node-rs/bcrypt-linux-arm-gnueabihf": "1.10.4",
+        "@node-rs/bcrypt-linux-arm64-gnu": "1.10.4",
+        "@node-rs/bcrypt-linux-arm64-musl": "1.10.4",
+        "@node-rs/bcrypt-linux-x64-gnu": "1.10.4",
+        "@node-rs/bcrypt-linux-x64-musl": "1.10.4",
+        "@node-rs/bcrypt-wasm32-wasi": "1.10.4",
+        "@node-rs/bcrypt-win32-arm64-msvc": "1.10.4",
+        "@node-rs/bcrypt-win32-ia32-msvc": "1.10.4",
+        "@node-rs/bcrypt-win32-x64-msvc": "1.10.4"
+      }
+    },
+    "@node-rs/bcrypt-android-arm-eabi": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-android-arm-eabi/-/bcrypt-android-arm-eabi-1.10.4.tgz",
+      "integrity": "sha512-55ajutuTdfK1hKseyliflnxzNtxszQQ/EoLtgJlgCe7rI24vGP9EEEZDznB/u9OaJ14/AYzZtIhkEOYdbIdw0A==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-android-arm64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-android-arm64/-/bcrypt-android-arm64-1.10.4.tgz",
+      "integrity": "sha512-dCgQT7nH65tORmJw2hQ6zQgFmmC+/JBYZUWtf7pPZI76AVAn5tc7cIUrxYoV4OT1+uD63b9Av+mS1fT2EPzWEg==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-darwin-arm64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-darwin-arm64/-/bcrypt-darwin-arm64-1.10.4.tgz",
+      "integrity": "sha512-gmHdWikHL3YVZgqXAHT+X/PG+kqIyNlPeFAWKdby83RkDI8FUiPV4qqGilgNnBmVWKkobRae9/I1HDbc4Sbhyg==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-darwin-x64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-darwin-x64/-/bcrypt-darwin-x64-1.10.4.tgz",
+      "integrity": "sha512-WDzL1WKRtoyTkH6IMPx95Mkd6XaeN0VWJbSDMqQY6AFBOk03yJEj7YYXshCcF+Ur6KBBVSwRf6sdFJ15NI1Z3g==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-freebsd-x64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-freebsd-x64/-/bcrypt-freebsd-x64-1.10.4.tgz",
+      "integrity": "sha512-seSPJi+4MIUd1faL/n/wmDdDwaynd/FTkvTnb7qzCk8LBT+/dxi7MTz+uaD8KYDREcB9Wmhv+lwr0S9/jBTcjg==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-linux-arm-gnueabihf": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm-gnueabihf/-/bcrypt-linux-arm-gnueabihf-1.10.4.tgz",
+      "integrity": "sha512-YcMLUtN9cGNTWKnaXslxGO1M0S5b4QN9KYhuyG6Kju27RfqvU5UbmpKElCsEUO2EIjxGwzvPu59T+Fyh6sVbwg==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-linux-arm64-gnu": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-gnu/-/bcrypt-linux-arm64-gnu-1.10.4.tgz",
+      "integrity": "sha512-uYGUK/mO8SiftqmVSAePWxgK82vg+X/gtrVRJi95yq2iwp1+fYJX3ndxCyYPmeplBbd3NJ/F5lPT3FC/IHTTGw==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-linux-arm64-musl": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-musl/-/bcrypt-linux-arm64-musl-1.10.4.tgz",
+      "integrity": "sha512-rLvSMW/gVUBd2k2gAqQfuOReHWd9+jvz58E3i1TbkRE3a5ChvjOFc9qKPEmXuXuD9Mdj7gUwcYwpq8MdB5MtNw==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-linux-x64-gnu": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-gnu/-/bcrypt-linux-x64-gnu-1.10.4.tgz",
+      "integrity": "sha512-I++6bh+BIp70X/D/crlSgCq8K0s9nGvzmvAGFkqSG4h3LBtjJx4RKbygnoWvcBV9ErK1rvcjfMyjwZt1ukueFA==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-linux-x64-musl": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-musl/-/bcrypt-linux-x64-musl-1.10.4.tgz",
+      "integrity": "sha512-f9RPl/5n2NS0mMJXB4IYbodKnq5HzOK5x1b9eKbcjsY0rw3mJC3K0XRFc8iaw1a5chA+xV1TPXz5mkykmr2CQQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-wasm32-wasi": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-wasm32-wasi/-/bcrypt-wasm32-wasi-1.10.4.tgz",
+      "integrity": "sha512-VaDOf+wic0yoHFimMkC5VMa/33BNqg6ieD+C/ibb7Av3NnVW4/W9YpDpqAWMR2w3fA40uTLWZ7FZSrcFck27oA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@napi-rs/wasm-runtime": "^0.2.3"
+      }
+    },
+    "@node-rs/bcrypt-win32-arm64-msvc": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-win32-arm64-msvc/-/bcrypt-win32-arm64-msvc-1.10.4.tgz",
+      "integrity": "sha512-M7sGnbKPvhYJ5b76ywXiEwR4mIs/JSDHjRrhm9fshKAvltQrwc3Mou22TJggvDN3gKOF1W85uPiM2OgGX/jxMg==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-win32-ia32-msvc": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-win32-ia32-msvc/-/bcrypt-win32-ia32-msvc-1.10.4.tgz",
+      "integrity": "sha512-zn/n4DYnuOfC2JgmVDa0JHP+5DUqAOTl2jmV3yrMrmN+StDT4Om5wtvWxvEmgv3CkeZAuAU3Y/fwjSXIpZ0Fhg==",
+      "dev": true,
+      "optional": true
+    },
+    "@node-rs/bcrypt-win32-x64-msvc": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-win32-x64-msvc/-/bcrypt-win32-x64-msvc-1.10.4.tgz",
+      "integrity": "sha512-ynQokTTGbuLu/cckaD8dNcE+Zsfam1zElE+teNol8AxcL7Jv+ghJItSnRthPRV/vLxuycDF2DIICgpXG/p9jrQ==",
+      "dev": true,
+      "optional": true
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -10722,10 +11650,17 @@
         }
       }
     },
+    "@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true
+    },
     "@sindresorhus/is": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
+      "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
       "dev": true
     },
     "@sinonjs/commons": {
@@ -10764,12 +11699,22 @@
       "dev": true
     },
     "@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
+      "dev": true,
+      "requires": {
+        "defer-to-connect": "^2.0.1"
+      }
+    },
+    "@tybys/wasm-util": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
+      "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "defer-to-connect": "^2.0.0"
+        "tslib": "^2.4.0"
       }
     },
     "@types/ace": {
@@ -10788,18 +11733,6 @@
         "@types/node": "*"
       }
     },
-    "@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-      "dev": true,
-      "requires": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
-      }
-    },
     "@types/connect": {
       "version": "3.4.35",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
@@ -10816,58 +11749,43 @@
       "dev": true
     },
     "@types/express": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-      "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.1.tgz",
+      "integrity": "sha512-UZUw8vjpWFXuDnjFTh7/5c2TWDlQqeXHi6hcN7F2XSVT5P+WmUnnbFS3KA6Jnc6IsEqI2qCVu2bK0R0J4A8ZQQ==",
       "dev": true,
       "requires": {
         "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
-        "@types/qs": "*",
+        "@types/express-serve-static-core": "^5.0.0",
         "@types/serve-static": "*"
       }
     },
     "@types/express-serve-static-core": {
-      "version": "4.17.28",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
-      "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz",
+      "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==",
       "dev": true,
       "requires": {
         "@types/node": "*",
         "@types/qs": "*",
-        "@types/range-parser": "*"
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
     "@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
+      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
       "dev": true
     },
     "@types/jquery": {
-      "version": "3.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
-      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz",
+      "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==",
       "dev": true,
       "requires": {
         "@types/sizzle": "*"
       }
     },
-    "@types/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==",
-      "dev": true
-    },
-    "@types/keyv": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/mime": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -10881,9 +11799,9 @@
       "dev": true
     },
     "@types/node-red": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@types/node-red/-/node-red-1.2.1.tgz",
-      "integrity": "sha512-v9azjmzDqgBHbc3DRn3/4J8TkyeeiRbfzELNb9yQHqEAMhTDFkjAyEnc4ZtM05QYD/9PhO5K8/afezqkRMadpA==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/node-red/-/node-red-1.3.5.tgz",
+      "integrity": "sha512-LBP8TmXJszHOoRgieyxgUrspvatmTZlkPRftlSNGE9TVJCQzSSyX3tF/Qe4evQlIUBmMGOijxcUOcKZSvq4piQ==",
       "dev": true,
       "requires": {
         "@types/express": "*",
@@ -10959,12 +11877,6 @@
         }
       }
     },
-    "@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
     "@types/passport": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@types/passport/-/passport-1.0.7.tgz",
@@ -10975,23 +11887,42 @@
       }
     },
     "@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "version": "6.9.18",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
+      "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
       "dev": true
     },
     "@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
       "dev": true
     },
-    "@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+    "@types/readable-stream": {
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.18.tgz",
+      "integrity": "sha512-21jK/1j+Wg+7jVw1xnSwy/2Q1VgVjWuFssbYGTREPUBeZ+rqVFl2udq0IkxzPC0ZhOzVceUbyIACFZKLqKEBlA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "safe-buffer": "~5.1.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
+      }
+    },
+    "@types/send": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
       "dev": true,
       "requires": {
+        "@types/mime": "^1",
         "@types/node": "*"
       }
     },
@@ -11011,12 +11942,30 @@
       "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
       "dev": true
     },
+    "@types/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dev": true,
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
     "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -11028,9 +11977,9 @@
       }
     },
     "acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true
     },
     "acorn-jsx": {
@@ -11041,10 +11990,13 @@
       "requires": {}
     },
     "acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.11.0"
+      }
     },
     "agent-base": {
       "version": "6.0.2",
@@ -11110,9 +12062,9 @@
       }
     },
     "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true
     },
     "ansi-escapes": {
@@ -11152,24 +12104,6 @@
       "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==",
       "dev": true
     },
-    "aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
-      "dev": true,
-      "optional": true
-    },
-    "are-we-there-yet": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      }
-    },
     "argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -11185,7 +12119,7 @@
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
       "dev": true
     },
     "array-union": {
@@ -11237,12 +12171,12 @@
       }
     },
     "async-mutex": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.2.tgz",
-      "integrity": "sha512-HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz",
+      "integrity": "sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==",
       "dev": true,
       "requires": {
-        "tslib": "^2.3.1"
+        "tslib": "^2.4.0"
       }
     },
     "asynckit": {
@@ -11311,17 +12245,6 @@
         }
       }
     },
-    "bcrypt": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
-      "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "node-addon-api": "^3.1.0"
-      }
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -11344,32 +12267,33 @@
       "dev": true
     },
     "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.0.tgz",
+      "integrity": "sha512-ClDyJGQkc8ZtzdAAbAwBmhMSpwN/sC9HA8jxdYm6nVUbCfZbe2mgza4qh7AuEYyEPB/c4Kznf9s66bnsKMQDjw==",
       "dev": true,
       "requires": {
-        "buffer": "^5.5.0",
+        "@types/readable-stream": "^4.0.0",
+        "buffer": "^6.0.3",
         "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
+        "readable-stream": "^4.2.0"
       }
     },
     "body-parser": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "dev": true,
       "requires": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.10.3",
-        "raw-body": "2.5.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -11383,6 +12307,15 @@
             "ms": "2.0.0"
           }
         },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -11390,12 +12323,24 @@
           "dev": true
         },
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.13.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+          "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
           "dev": true,
           "requires": {
-            "side-channel": "^1.0.4"
+            "side-channel": "^1.0.6"
+          }
+        },
+        "raw-body": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+          "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+          "dev": true,
+          "requires": {
+            "bytes": "3.1.2",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
           }
         }
       }
@@ -11551,13 +12496,13 @@
       "dev": true
     },
     "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "dev": true,
       "requires": {
         "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "ieee754": "^1.2.1"
       }
     },
     "buffer-from": {
@@ -11588,51 +12533,52 @@
       "dev": true
     },
     "cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
       "dev": true
     },
     "cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "version": "10.2.14",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
+      "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
       "dev": true,
       "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
+        "@types/http-cache-semantics": "^4.0.2",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.3",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.0",
+        "responselike": "^3.0.0"
       },
       "dependencies": {
         "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
           "dev": true
         }
       }
     },
-    "call-bind": {
+    "call-bind-apply-helpers": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      }
+    },
+    "call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       }
     },
     "callsite": {
@@ -11985,15 +12931,6 @@
       "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
       "dev": true
     },
-    "clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -12021,13 +12958,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true,
-      "optional": true
-    },
     "colors": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
@@ -12044,31 +12974,17 @@
       }
     },
     "commist": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz",
-      "integrity": "sha512-rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==",
-      "dev": true,
-      "requires": {
-        "leven": "^2.1.0",
-        "minimist": "^1.1.0"
-      }
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/commist/-/commist-3.2.0.tgz",
+      "integrity": "sha512-4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw==",
+      "dev": true
     },
     "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
       "dev": true
     },
-    "compress-brotli": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.8.tgz",
-      "integrity": "sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==",
-      "dev": true,
-      "requires": {
-        "@types/json-buffer": "~3.0.0",
-        "json-buffer": "~3.0.1"
-      }
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -12085,6 +13001,19 @@
         "inherits": "^2.0.3",
         "readable-stream": "^3.0.2",
         "typedarray": "^0.0.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
     "configstore": {
@@ -12101,13 +13030,6 @@
         "xdg-basedir": "^3.0.0"
       }
     },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
-      "dev": true,
-      "optional": true
-    },
     "content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -12118,45 +13040,37 @@
       }
     },
     "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true
     },
     "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "dev": true
     },
     "cookie-parser": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz",
-      "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz",
+      "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==",
       "dev": true,
       "requires": {
-        "cookie": "0.4.1",
+        "cookie": "0.7.2",
         "cookie-signature": "1.0.6"
-      },
-      "dependencies": {
-        "cookie": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-          "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
-          "dev": true
-        }
       }
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
       "dev": true
     },
     "cookiejar": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
-      "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
+      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
       "dev": true
     },
     "core-js": {
@@ -12196,9 +13110,9 @@
       "integrity": "sha512-d6S6+ep7dJxsAG8OQQCdKuByI/S/AV64d9OF5mtmcykOyPu92cAkAnF3Tbc9s5oOaLQBYYQmTNvjqYRkPJ/u5Q=="
     },
     "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "requires": {
         "path-key": "^3.1.0",
@@ -12216,16 +13130,6 @@
         "which": "^1.2.8"
       },
       "dependencies": {
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -12234,12 +13138,6 @@
           "requires": {
             "isexe": "^2.0.0"
           }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
         }
       }
     },
@@ -12293,12 +13191,12 @@
       "dev": true
     },
     "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
       "requires": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       }
     },
     "decamelize": {
@@ -12348,13 +13246,6 @@
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-      "dev": true,
-      "optional": true
-    },
     "denque": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
@@ -12429,17 +13320,10 @@
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
-    "detect-libc": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-      "dev": true,
-      "optional": true
-    },
     "dezalgo": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-      "integrity": "sha512-K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
       "dev": true,
       "requires": {
         "asap": "^2.0.0",
@@ -12524,24 +13408,29 @@
         "is-obj": "^1.0.0"
       }
     },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true
-    },
-    "duplexify": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
-      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
+    "dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.4.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
       }
     },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -12565,27 +13454,19 @@
       "dev": true
     },
     "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true
     },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
     "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
       }
     },
     "entities": {
@@ -12612,16 +13493,49 @@
         "stackframe": "^0.3.1"
       }
     },
+    "es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true
+    },
+    "es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0"
+      }
+    },
+    "es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      }
+    },
     "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true
     },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
     "escape-string-regexp": {
@@ -12716,12 +13630,6 @@
           "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
           "dev": true
         },
-        "js-sdsl": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-          "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
-          "dev": true
-        },
         "locate-path": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -12850,12 +13758,6 @@
         "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-          "dev": true
-        },
         "eslint-visitor-keys": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
@@ -12903,7 +13805,19 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true
+    },
+    "event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "dev": true
+    },
+    "events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true
     },
     "execa": {
@@ -12943,37 +13857,37 @@
       }
     },
     "express": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.0",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
-        "qs": "6.10.3",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -12981,6 +13895,12 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "cookie": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+          "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+          "dev": true
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -12997,24 +13917,24 @@
           "dev": true
         },
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.13.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+          "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
           "dev": true,
           "requires": {
-            "side-channel": "^1.0.4"
+            "side-channel": "^1.0.6"
           }
         }
       }
     },
     "express-session": {
-      "version": "1.17.3",
-      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz",
-      "integrity": "sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz",
+      "integrity": "sha512-a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==",
       "dev": true,
       "requires": {
-        "cookie": "0.4.2",
-        "cookie-signature": "1.0.6",
+        "cookie": "0.7.2",
+        "cookie-signature": "1.0.7",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-headers": "~1.0.2",
@@ -13023,10 +13943,10 @@
         "uid-safe": "~2.1.5"
       },
       "dependencies": {
-        "cookie": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+        "cookie-signature": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+          "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
           "dev": true
         },
         "debug": {
@@ -13106,6 +14026,22 @@
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "dev": true
     },
+    "fast-unique-numbers": {
+      "version": "8.0.13",
+      "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz",
+      "integrity": "sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.23.8",
+        "tslib": "^2.6.2"
+      }
+    },
+    "fast-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "dev": true
+    },
     "fastq": {
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
@@ -13152,13 +14088,13 @@
       }
     },
     "finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -13221,11 +14157,29 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "dev": true
     },
+    "foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "dependencies": {
+        "signal-exit": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+          "dev": true
+        }
+      }
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -13243,24 +14197,21 @@
         "mime-types": "^2.1.12"
       }
     },
+    "form-data-encoder": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
+      "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
+      "dev": true
+    },
     "formidable": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.0.1.tgz",
-      "integrity": "sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz",
+      "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==",
       "dev": true,
       "requires": {
-        "dezalgo": "1.0.3",
-        "hexoid": "1.0.0",
-        "once": "1.4.0",
-        "qs": "6.9.3"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.9.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-          "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
-          "dev": true
-        }
+        "dezalgo": "^1.0.4",
+        "hexoid": "^2.0.0",
+        "once": "^1.4.0"
       }
     },
     "forwarded": {
@@ -13272,7 +14223,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true
     },
     "fs-extra": {
@@ -13309,29 +14260,11 @@
       "optional": true
     },
     "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true
     },
-    "gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.1",
-        "object-assign": "^4.1.1",
-        "signal-exit": "^3.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
-      }
-    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -13339,14 +14272,31 @@
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      }
+    },
+    "get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "requires": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
       }
     },
     "get-stdin": {
@@ -13466,6 +14416,12 @@
         "slash": "^3.0.0"
       }
     },
+    "gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "dev": true
+    },
     "got": {
       "version": "6.7.1",
       "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
@@ -13513,15 +14469,6 @@
         "har-schema": "^2.0.0"
       }
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -13546,17 +14493,19 @@
       "dev": true
     },
     "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true
     },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+    "has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "has-symbols": "^1.0.3"
+      }
     },
     "hash-sum": {
       "version": "2.0.0",
@@ -13564,6 +14513,15 @@
       "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
       "dev": true
     },
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
+    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -13571,19 +14529,15 @@
       "dev": true
     },
     "help-me": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz",
-      "integrity": "sha512-hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.6",
-        "readable-stream": "^3.6.0"
-      }
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
+      "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==",
+      "dev": true
     },
     "hexoid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
-      "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz",
+      "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==",
       "dev": true
     },
     "highlight-es": {
@@ -13671,9 +14625,9 @@
       "dev": true
     },
     "hpagent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hpagent/-/hpagent-1.0.0.tgz",
-      "integrity": "sha512-SCleE2Uc1bM752ymxg8QXYGW0TWtAV4ZW3TqH1aOnyi6T6YW2xadCcclm5qeVjvMvfQ2RKNtZxO7uVb9CTPt1A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/hpagent/-/hpagent-1.2.0.tgz",
+      "integrity": "sha512-A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==",
       "dev": true
     },
     "htmlparser2": {
@@ -13722,9 +14676,9 @@
       }
     },
     "http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
       "dev": true
     },
     "http-errors": {
@@ -13752,13 +14706,13 @@
       }
     },
     "http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
       "dev": true,
       "requires": {
         "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
+        "resolve-alpn": "^1.2.0"
       }
     },
     "https-proxy-agent": {
@@ -13772,21 +14726,21 @@
       }
     },
     "i18next": {
-      "version": "21.8.16",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.8.16.tgz",
-      "integrity": "sha512-acJLCk38YMfEPjBR/1vS13SFY7rBQLs9E5m1tSRnWc9UW3f+SZszgH+NP1fZRA1+O+CdG2eLGGmuUMJW52EwzQ==",
+      "version": "21.10.0",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz",
+      "integrity": "sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.17.2"
       }
     },
     "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
       "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       }
     },
     "ieee754": {
@@ -14127,10 +15081,20 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "requires": {
+        "@isaacs/cliui": "^8.0.2",
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "js-sdsl": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-2.1.4.tgz",
-      "integrity": "sha512-/Ew+CJWHNddr7sjwgxaVeIORIH4AMVC9dy0hPf540ZGMVgS9d3ajwuVdyhDt6/QUvT8ATjR3yuYBKsS79F+H4A==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
+      "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
       "dev": true
     },
     "js-tokens": {
@@ -14166,12 +15130,6 @@
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
       "dev": true
     },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
     "json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -14197,9 +15155,9 @@
       "dev": true
     },
     "jsonata": {
-      "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/jsonata/-/jsonata-1.8.6.tgz",
-      "integrity": "sha512-ZH2TPYdNP2JecOl/HvrH47Xc+9imibEMQ4YqKy/F/FrM+2a6vfbGxeCX23dB9Fr6uvGwv+ghf1KxWB3iZk09wA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/jsonata/-/jsonata-2.0.6.tgz",
+      "integrity": "sha512-WhQB5tXQ32qjkx2GYHFw2XbL90u+LLzjofAYwi+86g6SyZeXHz9F1Q0amy3dWRYczshOC3Haok9J4pOCgHtwyQ==",
       "dev": true
     },
     "jsonc-parser": {
@@ -14236,12 +15194,11 @@
       "dev": true
     },
     "keyv": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.3.3.tgz",
-      "integrity": "sha512-AcysI17RvakTh8ir03+a3zJr5r0ovnAH/XTXei/4HIv3bL2K/jzvgivLK9UuI/JbU1aJjM3NSAnVvVVd3n+4DQ==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
       "requires": {
-        "compress-brotli": "^1.3.8",
         "json-buffer": "3.0.1"
       }
     },
@@ -14263,12 +15220,6 @@
         "invert-kv": "^1.0.0"
       }
     },
-    "leven": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-      "integrity": "sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA==",
-      "dev": true
-    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -14279,12 +15230,6 @@
         "type-check": "~0.4.0"
       }
     },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -14416,12 +15361,21 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "requires": {
-        "yallist": "^4.0.0"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+          "dev": true
+        }
       }
     },
     "make-dir": {
@@ -14447,10 +15401,16 @@
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
       "dev": true
     },
+    "math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true
+    },
     "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
+      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
       "dev": true
     },
     "memorystore": {
@@ -14461,24 +15421,6 @@
       "requires": {
         "debug": "^4.3.0",
         "lru-cache": "^4.0.3"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
-        }
       }
     },
     "meow": {
@@ -14500,9 +15442,9 @@
       }
     },
     "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
       "dev": true
     },
     "merge2": {
@@ -14514,7 +15456,7 @@
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true
     },
     "micromatch": {
@@ -14549,9 +15491,9 @@
       }
     },
     "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
       "dev": true
     },
     "minimatch": {
@@ -14564,9 +15506,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true
     },
     "minipass": {
@@ -14595,32 +15537,31 @@
       "dev": true
     },
     "mocha": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
-      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.3",
-        "debug": "4.3.4",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.2.0",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "5.0.1",
-        "ms": "2.1.3",
-        "nanoid": "3.3.3",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "workerpool": "6.2.1",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.1.0.tgz",
+      "integrity": "sha512-8uJR5RTC2NgpY3GrYcgpZrsEd9zKbPDpob1RezyR2upGHRQtHWofmzTMzTMSV6dru3tj5Ukt0+Vnq1qhFEEwAg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.3",
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.5",
+        "diff": "^5.2.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^10.4.5",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^5.1.6",
+        "ms": "^2.1.3",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^6.5.1",
+        "yargs": "^17.7.2",
+        "yargs-parser": "^21.1.1",
+        "yargs-unparser": "^2.0.0"
       },
       "dependencies": {
         "brace-expansion": {
@@ -14633,16 +15574,22 @@
           }
         },
         "cliui": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
           "dev": true,
           "requires": {
             "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
+            "strip-ansi": "^6.0.1",
             "wrap-ansi": "^7.0.0"
           }
         },
+        "diff": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+          "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
+          "dev": true
+        },
         "find-up": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -14653,6 +15600,31 @@
             "path-exists": "^4.0.0"
           }
         },
+        "glob": {
+          "version": "10.4.5",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+          "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+          "dev": true,
+          "requires": {
+            "foreground-child": "^3.1.0",
+            "jackspeak": "^3.1.2",
+            "minimatch": "^9.0.4",
+            "minipass": "^7.1.2",
+            "package-json-from-dist": "^1.0.0",
+            "path-scurry": "^1.11.1"
+          },
+          "dependencies": {
+            "minimatch": {
+              "version": "9.0.5",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+              "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+              "dev": true,
+              "requires": {
+                "brace-expansion": "^2.0.1"
+              }
+            }
+          }
+        },
         "locate-path": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -14663,18 +15635,18 @@
           }
         },
         "minimatch": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
           }
         },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+        "minipass": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+          "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
           "dev": true
         },
         "p-limit": {
@@ -14717,83 +15689,98 @@
           "dev": true
         },
         "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
           "dev": true,
           "requires": {
-            "cliui": "^7.0.2",
+            "cliui": "^8.0.1",
             "escalade": "^3.1.1",
             "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
+            "string-width": "^4.2.3",
             "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
+            "yargs-parser": "^21.1.1"
           }
         },
         "yargs-parser": {
-          "version": "20.2.4",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+          "version": "21.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
           "dev": true
         }
       }
     },
     "moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
       "dev": true
     },
     "moment-timezone": {
-      "version": "0.5.34",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz",
-      "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==",
+      "version": "0.5.46",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz",
+      "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==",
       "dev": true,
       "requires": {
-        "moment": ">= 2.9.0"
+        "moment": "^2.29.4"
       }
     },
     "mqtt": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.3.7.tgz",
-      "integrity": "sha512-ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.0.tgz",
+      "integrity": "sha512-/o0CBYSjZzddmQDV2iglCafsA0xWKpqnS62tGbOLOliubBxszpXO1DAQPyfI7ZcPDG0b9ni7QITn+5FW1E2UTg==",
       "dev": true,
       "requires": {
-        "commist": "^1.0.0",
+        "@types/readable-stream": "^4.0.5",
+        "@types/ws": "^8.5.9",
+        "commist": "^3.2.0",
         "concat-stream": "^2.0.0",
-        "debug": "^4.1.1",
-        "duplexify": "^4.1.1",
-        "help-me": "^3.0.0",
-        "inherits": "^2.0.3",
-        "lru-cache": "^6.0.0",
-        "minimist": "^1.2.5",
-        "mqtt-packet": "^6.8.0",
-        "number-allocator": "^1.0.9",
-        "pump": "^3.0.0",
-        "readable-stream": "^3.6.0",
+        "debug": "^4.3.4",
+        "help-me": "^5.0.0",
+        "lru-cache": "^10.0.1",
+        "minimist": "^1.2.8",
+        "mqtt": "^5.2.0",
+        "mqtt-packet": "^9.0.0",
+        "number-allocator": "^1.0.14",
+        "readable-stream": "^4.4.2",
         "reinterval": "^1.1.0",
         "rfdc": "^1.3.0",
-        "split2": "^3.1.0",
-        "ws": "^7.5.5",
-        "xtend": "^4.0.2"
+        "split2": "^4.2.0",
+        "worker-timers": "^7.1.4",
+        "ws": "^8.14.2"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "10.4.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+          "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+          "dev": true
+        },
+        "ws": {
+          "version": "8.18.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+          "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+          "dev": true,
+          "requires": {}
+        }
       }
     },
     "mqtt-packet": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.10.0.tgz",
-      "integrity": "sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.2.tgz",
+      "integrity": "sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==",
       "dev": true,
       "requires": {
-        "bl": "^4.0.2",
-        "debug": "^4.1.1",
+        "bl": "^6.0.8",
+        "debug": "^4.3.4",
         "process-nextick-args": "^2.0.1"
       }
     },
     "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "multer": {
@@ -14839,9 +15826,9 @@
           }
         },
         "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "version": "2.3.8",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+          "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -14882,12 +15869,6 @@
       "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
       "dev": true
     },
-    "nanoid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
-      "dev": true
-    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -14933,13 +15914,6 @@
         }
       }
     },
-    "node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-      "dev": true,
-      "optional": true
-    },
     "node-emoji": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
@@ -14949,40 +15923,31 @@
         "lodash": "^4.17.21"
       }
     },
-    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
     "node-red": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/node-red/-/node-red-3.0.2.tgz",
-      "integrity": "sha512-B6q576kLw96eKOiqNpNJsUiwl5vRipc46T0w/LUI7O3fPAVxwu5zklIBhE6Iefj8FV1IdbLwXULESqMWlwjlGQ==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/node-red/-/node-red-4.0.9.tgz",
+      "integrity": "sha512-E4oo64ieP8GGSbdBhNtzDdXDVX5/nxEIJg89TyhpUT7aWLxvn+Q75V+jUGUUd6M3/B1A7vEn6HBmIlGNvgv/9g==",
       "dev": true,
       "requires": {
-        "@node-red/editor-api": "3.0.2",
-        "@node-red/nodes": "3.0.2",
-        "@node-red/runtime": "3.0.2",
-        "@node-red/util": "3.0.2",
+        "@node-red/editor-api": "4.0.9",
+        "@node-red/nodes": "4.0.9",
+        "@node-red/runtime": "4.0.9",
+        "@node-red/util": "4.0.9",
+        "@node-rs/bcrypt": "1.10.4",
         "basic-auth": "2.0.1",
-        "bcrypt": "5.0.1",
         "bcryptjs": "2.4.3",
-        "express": "4.18.1",
-        "fs-extra": "10.1.0",
-        "node-red-admin": "^3.0.0",
+        "cors": "2.8.5",
+        "express": "4.21.2",
+        "fs-extra": "11.2.0",
+        "node-red-admin": "^4.0.1",
         "nopt": "5.0.0",
-        "semver": "7.3.7"
+        "semver": "7.6.3"
       },
       "dependencies": {
         "fs-extra": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "version": "11.2.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+          "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -15001,57 +15966,59 @@
           }
         },
         "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+          "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
           "dev": true
         }
       }
     },
     "node-red-admin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/node-red-admin/-/node-red-admin-3.0.0.tgz",
-      "integrity": "sha512-1J1tcV+zkCIy24n0rcJ/DSPSCziEgLGld+QBYk1rNESIo+gFyL5RMkCOcII2IrBTZF/kcDTElepMTCILXbMDfQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.0.1.tgz",
+      "integrity": "sha512-NLZgAM8JgFa/2/7Z4+nSSQrtkuBbfS9m+kxegadhHfuta5rErOx6zrrNhF+yAglMTPlVmdoqgso7VSt3nTRBGQ==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^4.1.1",
-        "axios": "0.27.2",
-        "bcrypt": "5.0.1",
+        "@node-rs/bcrypt": "1.10.4",
+        "ansi-colors": "^4.1.3",
+        "axios": "^1.7.7",
         "bcryptjs": "^2.4.3",
         "cli-table": "^0.3.11",
         "enquirer": "^2.3.6",
-        "minimist": "^1.2.6",
+        "minimist": "^1.2.8",
         "mustache": "^4.2.0",
-        "read": "^1.0.7"
+        "read": "^3.0.1"
       },
       "dependencies": {
         "axios": {
-          "version": "0.27.2",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-          "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+          "version": "1.8.4",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
+          "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
           "dev": true,
           "requires": {
-            "follow-redirects": "^1.14.9",
-            "form-data": "^4.0.0"
+            "follow-redirects": "^1.15.6",
+            "form-data": "^4.0.0",
+            "proxy-from-env": "^1.1.0"
           }
         },
         "form-data": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+          "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
           "dev": true,
           "requires": {
             "asynckit": "^0.4.0",
             "combined-stream": "^1.0.8",
+            "es-set-tostringtag": "^2.1.0",
             "mime-types": "^2.1.12"
           }
         }
       }
     },
     "node-red-dev": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/node-red-dev/-/node-red-dev-0.1.5.tgz",
-      "integrity": "sha512-NtpQnbEl2NT2sYe7MvLeNK0OtyKAc4SN1sTBEnvHgj2Nea36HVxRDnI/SLi2BPJA2JbGh6l/PSIldsvhZ/GmXQ==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/node-red-dev/-/node-red-dev-0.1.6.tgz",
+      "integrity": "sha512-zbm6Frl4ZAbSLeW3apLjCYoB+pIxyJFs254DQa29+9Q+fcgufDkzXmemchI7fIoRzDsffv8U6sqOvAK/89tQkA==",
       "dev": true,
       "requires": {
         "@oclif/command": "^1.8.0",
@@ -15067,99 +16034,21 @@
       }
     },
     "node-red-node-test-helper": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/node-red-node-test-helper/-/node-red-node-test-helper-0.3.0.tgz",
-      "integrity": "sha512-mgeMEsRDbxmF16dQeBHEF0n944i09V4d1tMYpll83P2kxu/78Iqc6kuP9E12duqQSgWR8SOGNUqMxz9vpog1DA==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/node-red-node-test-helper/-/node-red-node-test-helper-0.3.4.tgz",
+      "integrity": "sha512-OFXGEkKZpLkgoijAgpUIjzn5RF8QnbwPX9RjfI2LWXq1ACfeXkXcW0i1ioiphrokdE3MiWQJtH5omLNnSNdyaQ==",
       "dev": true,
       "requires": {
-        "body-parser": "1.20.0",
-        "express": "4.18.1",
-        "read-pkg-up": "7.0.1",
-        "semver": "7.3.7",
+        "body-parser": "^1.20.2",
+        "express": "^4.19.2",
+        "semver": "^7.5.4",
         "should": "^13.2.3",
-        "should-sinon": "0.0.6",
-        "sinon": "11.1.2",
-        "stoppable": "1.1.0",
-        "supertest": "6.2.3"
+        "should-sinon": "^0.0.6",
+        "sinon": "^11.1.2",
+        "stoppable": "^1.1.0",
+        "supertest": "^7.0.0"
       },
       "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "parse-json": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-          "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "error-ex": "^1.3.1",
-            "json-parse-even-better-errors": "^2.3.0",
-            "lines-and-columns": "^1.1.6"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-          "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-          "dev": true,
-          "requires": {
-            "@types/normalize-package-data": "^2.4.0",
-            "normalize-package-data": "^2.5.0",
-            "parse-json": "^5.0.0",
-            "type-fest": "^0.6.0"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.6.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-              "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-              "dev": true
-            }
-          }
-        },
-        "read-pkg-up": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-          "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.1.0",
-            "read-pkg": "^5.2.0",
-            "type-fest": "^0.8.1"
-          }
-        },
         "sinon": {
           "version": "11.1.2",
           "resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.2.tgz",
@@ -15173,12 +16062,6 @@
             "nise": "^5.1.0",
             "supports-color": "^7.2.0"
           }
-        },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-          "dev": true
         }
       }
     },
@@ -15192,9 +16075,9 @@
       }
     },
     "node-watch": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.7.3.tgz",
-      "integrity": "sha512-3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ==",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.7.4.tgz",
+      "integrity": "sha512-RinNxoz4W1cep1b928fuFhvAQ5ag/+1UlMDV7rbyGthBIgsiEouS4kvRayvvboxii4m8eolKOIBo3OjDqbc+uQ==",
       "dev": true
     },
     "nopt": {
@@ -15233,9 +16116,9 @@
       "dev": true
     },
     "normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
+      "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
       "dev": true
     },
     "npm-check": {
@@ -15541,19 +16424,6 @@
         }
       }
     },
-    "npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "are-we-there-yet": "^2.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
-        "set-blocking": "^2.0.0"
-      }
-    },
     "nth-check": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -15564,13 +16434,13 @@
       }
     },
     "number-allocator": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.10.tgz",
-      "integrity": "sha512-K4AvNGKo9lP6HqsZyfSr9KDaqnwFzW203inhQEOwFrmFaYevpdX4VNwdOLk197aHujzbT//z6pCBrCOUYSM5iw==",
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz",
+      "integrity": "sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==",
       "dev": true,
       "requires": {
         "debug": "^4.3.1",
-        "js-sdsl": "^2.1.2"
+        "js-sdsl": "4.3.0"
       }
     },
     "number-is-nan": {
@@ -15586,9 +16456,9 @@
       "dev": true
     },
     "oauth2orize": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.11.1.tgz",
-      "integrity": "sha512-9dSx/Gwm0J2Rvj4RH9+h7iXVnRXZ6biwWRgb2dCeQhCosODS0nYdM9I/G7BUGsjbgn0pHjGcn1zcCRtzj2SlRA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.12.0.tgz",
+      "integrity": "sha512-j4XtFDQUBsvUHPjUmvmNDUDMYed2MphMIJBhyxVVe8hGCjkuYnjIsW+D9qk8c5ciXRdnk6x6tEbiO6PLeOZdCQ==",
       "dev": true,
       "requires": {
         "debug": "2.x.x",
@@ -15620,9 +16490,9 @@
       "dev": true
     },
     "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true
     },
     "on-finished": {
@@ -15739,9 +16609,9 @@
       }
     },
     "p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+      "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
       "dev": true
     },
     "p-finally": {
@@ -15794,6 +16664,12 @@
         }
       }
     },
+    "package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -15840,9 +16716,9 @@
       "dev": true
     },
     "passport": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
-      "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
+      "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
       "dev": true,
       "requires": {
         "passport-strategy": "1.x.x",
@@ -15907,10 +16783,34 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "10.4.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+          "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+          "dev": true
+        },
+        "minipass": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+          "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+          "dev": true
+        }
+      }
+    },
     "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
       "dev": true
     },
     "path-type": {
@@ -16018,6 +16918,12 @@
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
       "dev": true
     },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true
+    },
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -16034,6 +16940,12 @@
         "ipaddr.js": "1.9.1"
       }
     },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -16046,16 +16958,6 @@
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -16102,14 +17004,14 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
+      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
       "dev": true,
       "requires": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
+        "iconv-lite": "0.6.3",
         "unpipe": "1.0.0"
       }
     },
@@ -16134,12 +17036,20 @@
       }
     },
     "read": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-      "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz",
+      "integrity": "sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==",
       "dev": true,
       "requires": {
-        "mute-stream": "~0.0.4"
+        "mute-stream": "^1.0.0"
+      },
+      "dependencies": {
+        "mute-stream": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+          "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+          "dev": true
+        }
       }
     },
     "read-pkg": {
@@ -16189,14 +17099,16 @@
       }
     },
     "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
       }
     },
     "readdirp": {
@@ -16381,18 +17293,18 @@
       "dev": true
     },
     "responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
       "dev": true,
       "requires": {
-        "lowercase-keys": "^2.0.0"
+        "lowercase-keys": "^3.0.0"
       },
       "dependencies": {
         "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+          "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
           "dev": true
         }
       }
@@ -16414,9 +17326,9 @@
       "dev": true
     },
     "rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true
     },
     "rimraf": {
@@ -16465,19 +17377,16 @@
       "dev": true
     },
     "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
       "dev": true
     },
     "semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true
     },
     "semver-compare": {
       "version": "1.0.0",
@@ -16503,9 +17412,9 @@
       }
     },
     "send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
@@ -16540,39 +17449,39 @@
             }
           }
         },
+        "encodeurl": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+          "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+          "dev": true
+        },
         "mime": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
           "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
           "dev": true
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
         }
       }
     },
     "serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
       }
     },
     "serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dev": true,
       "requires": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       }
     },
     "set-blocking": {
@@ -16664,14 +17573,51 @@
       "dev": true
     },
     "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      }
+    },
+    "side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      }
+    },
+    "side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      }
+    },
+    "side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "requires": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       }
     },
     "signal-exit": {
@@ -16681,58 +17627,60 @@
       "dev": true
     },
     "sinon": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.2.tgz",
-      "integrity": "sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==",
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-20.0.0.tgz",
+      "integrity": "sha512-+FXOAbdnj94AQIxH0w1v8gzNxkawVvNqE3jUzRLptR71Oykeu2RrQXXl/VQjKay+Qnh73fDt/oDfMo6xMeDQbQ==",
       "dev": true,
       "requires": {
-        "@sinonjs/commons": "^2.0.0",
-        "@sinonjs/fake-timers": "^9.1.2",
-        "@sinonjs/samsam": "^7.0.1",
-        "diff": "^5.0.0",
-        "nise": "^5.1.2",
+        "@sinonjs/commons": "^3.0.1",
+        "@sinonjs/fake-timers": "^13.0.5",
+        "@sinonjs/samsam": "^8.0.1",
+        "diff": "^7.0.0",
         "supports-color": "^7.2.0"
       },
       "dependencies": {
         "@sinonjs/commons": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
-          "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+          "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
           "dev": true,
           "requires": {
             "type-detect": "4.0.8"
           }
         },
         "@sinonjs/fake-timers": {
-          "version": "9.1.2",
-          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-          "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
+          "version": "13.0.5",
+          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+          "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
           "dev": true,
           "requires": {
-            "@sinonjs/commons": "^1.7.0"
-          },
-          "dependencies": {
-            "@sinonjs/commons": {
-              "version": "1.8.5",
-              "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.5.tgz",
-              "integrity": "sha512-rTpCA0wG1wUxglBSFdMMY0oTrKYvgf4fNgv/sXbfCVAdf+FnPBdKJR/7XbpTCwbCrvCbdPYnlWaUUYz4V2fPDA==",
-              "dev": true,
-              "requires": {
-                "type-detect": "4.0.8"
-              }
-            }
+            "@sinonjs/commons": "^3.0.1"
           }
         },
         "@sinonjs/samsam": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-7.0.1.tgz",
-          "integrity": "sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==",
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz",
+          "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==",
           "dev": true,
           "requires": {
-            "@sinonjs/commons": "^2.0.0",
+            "@sinonjs/commons": "^3.0.1",
             "lodash.get": "^4.4.2",
-            "type-detect": "^4.0.8"
+            "type-detect": "^4.1.0"
+          },
+          "dependencies": {
+            "type-detect": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+              "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
+              "dev": true
+            }
           }
+        },
+        "diff": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
+          "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
+          "dev": true
         }
       }
     },
@@ -16781,13 +17729,10 @@
       "dev": true
     },
     "split2": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^3.0.0"
-      }
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "dev": true
     },
     "sprintf-js": {
       "version": "1.0.3",
@@ -16830,12 +17775,6 @@
       "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==",
       "dev": true
     },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
     "streamsearch": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
@@ -16862,6 +17801,17 @@
         "strip-ansi": "^6.0.1"
       }
     },
+    "string-width-cjs": {
+      "version": "npm:string-width@4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -16871,6 +17821,15 @@
         "ansi-regex": "^5.0.1"
       }
     },
+    "strip-ansi-cjs": {
+      "version": "npm:strip-ansi@6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
     "strip-bom": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
@@ -16907,41 +17866,31 @@
       "integrity": "sha512-Hi8earJouQOzxwSoRjF75d8kl8ZzX/Zwzsr6pKkdgP1rNnOenPRrB6GDhx56j6PeOdghQCos/rA4YT95oqOvcA=="
     },
     "superagent": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-7.1.5.tgz",
-      "integrity": "sha512-HQYyGuDRFGmZ6GNC4hq2f37KnsY9Lr0/R1marNZTgMweVDQLTLJJ6DGQ9Tj/xVVs5HEnop9EMmTbywb5P30aqw==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz",
+      "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==",
       "dev": true,
       "requires": {
         "component-emitter": "^1.3.0",
-        "cookiejar": "^2.1.3",
+        "cookiejar": "^2.1.4",
         "debug": "^4.3.4",
         "fast-safe-stringify": "^2.1.1",
         "form-data": "^4.0.0",
-        "formidable": "^2.0.1",
+        "formidable": "^3.5.1",
         "methods": "^1.1.2",
-        "mime": "^2.5.0",
-        "qs": "^6.10.3",
-        "readable-stream": "^3.6.0",
-        "semver": "^7.3.7"
+        "mime": "2.6.0",
+        "qs": "^6.11.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "form-data": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+          "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
           "dev": true,
           "requires": {
             "asynckit": "^0.4.0",
             "combined-stream": "^1.0.8",
+            "es-set-tostringtag": "^2.1.0",
             "mime-types": "^2.1.12"
           }
         },
@@ -16952,24 +17901,24 @@
           "dev": true
         },
         "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "version": "6.14.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+          "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
           "dev": true,
           "requires": {
-            "side-channel": "^1.0.4"
+            "side-channel": "^1.1.0"
           }
         }
       }
     },
     "supertest": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/supertest/-/supertest-6.2.3.tgz",
-      "integrity": "sha512-3GSdMYTMItzsSYjnIcljxMVZKPW1J9kYHZY+7yLfD0wpPwww97GeImZC1oOk0S5+wYl2niJwuFusBJqwLqYM3g==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz",
+      "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==",
       "dev": true,
       "requires": {
         "methods": "^1.1.2",
-        "superagent": "^7.1.3"
+        "superagent": "^9.0.1"
       }
     },
     "supports-color": {
@@ -17030,16 +17979,6 @@
             "strip-eof": "^1.0.0"
           }
         },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
         "npm-run-path": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -17078,12 +18017,6 @@
           "requires": {
             "isexe": "^2.0.0"
           }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
         }
       }
     },
@@ -17111,6 +18044,21 @@
       "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
       "dev": true
     },
+    "tldts": {
+      "version": "6.1.85",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz",
+      "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==",
+      "dev": true,
+      "requires": {
+        "tldts-core": "^6.1.85"
+      }
+    },
+    "tldts-core": {
+      "version": "6.1.85",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz",
+      "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==",
+      "dev": true
+    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -17142,13 +18090,6 @@
         "punycode": "^2.1.1"
       }
     },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true,
-      "optional": true
-    },
     "treeify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz",
@@ -17162,9 +18103,9 @@
       "dev": true
     },
     "tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true
     },
     "tunnel-agent": {
@@ -17211,6 +18152,14 @@
       "requires": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
+      },
+      "dependencies": {
+        "media-typer": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+          "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+          "dev": true
+        }
       }
     },
     "typedarray": {
@@ -17220,9 +18169,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.16.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.3.tgz",
-      "integrity": "sha512-uVbFqx9vvLhQg0iBaau9Z75AxWJ8tqM9AV890dIZCLApF4rTcyHwmAvLeEdYRs+BzYWu8Iw81F79ah0EfTXbaw==",
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
       "dev": true
     },
     "uid-safe": {
@@ -17258,7 +18207,7 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true
     },
     "unzip-response": {
@@ -17364,13 +18313,13 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true
     },
     "uuid": {
@@ -17392,7 +18341,7 @@
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true
     },
     "verror": {
@@ -17459,24 +18408,6 @@
       "integrity": "sha512-0Twghia4Z5wDGDYWURlhZmI47GvERMCsXIu0QZWVVZyW9ZjpbbZvD9Zy9M6cWiQQRRbAcYajIyKNavaZZDt1Uw==",
       "dev": true
     },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true,
-      "optional": true
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -17510,16 +18441,6 @@
         }
       }
     },
-    "wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
     "widest-line": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -17541,10 +18462,44 @@
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
+    "worker-timers": {
+      "version": "7.1.8",
+      "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz",
+      "integrity": "sha512-R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.24.5",
+        "tslib": "^2.6.2",
+        "worker-timers-broker": "^6.1.8",
+        "worker-timers-worker": "^7.0.71"
+      }
+    },
+    "worker-timers-broker": {
+      "version": "6.1.8",
+      "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz",
+      "integrity": "sha512-FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.24.5",
+        "fast-unique-numbers": "^8.0.13",
+        "tslib": "^2.6.2",
+        "worker-timers-worker": "^7.0.71"
+      }
+    },
+    "worker-timers-worker": {
+      "version": "7.0.71",
+      "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz",
+      "integrity": "sha512-ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.24.5",
+        "tslib": "^2.6.2"
+      }
+    },
     "workerpool": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
-      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
       "dev": true
     },
     "wrap-ansi": {
@@ -17558,6 +18513,17 @@
         "strip-ansi": "^6.0.0"
       }
     },
+    "wrap-ansi-cjs": {
+      "version": "npm:wrap-ansi@7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -17576,9 +18542,9 @@
       }
     },
     "ws": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
-      "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "dev": true,
       "requires": {}
     },
@@ -17589,9 +18555,9 @@
       "dev": true
     },
     "xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+      "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
       "dev": true,
       "requires": {
         "sax": ">=0.6.0",
diff --git a/package.json b/package.json
index 1ef88cc3..c9529a0c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-sun-position",
-  "version": "2.2.0-beta4",
+  "version": "3.0.0-alpha2",
   "description": "NodeRED nodes to get sun and moon position",
   "keywords": [
     "node-red",
@@ -50,7 +50,7 @@
   ],
   "main": "none",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=12"
   },
   "scripts": {
     "test": "eslint \"./**/*.js\" \"./**/*.html\" && node-red-dev validate && mocha \"test/**/*_spec.js\"",
@@ -60,7 +60,7 @@
     "lint": "eslint \"./**/*.js\" \"./**/*.html\"",
     "predev": "npm i -g",
     "dev": "node-red -v",
-    "prepublishOnly": "eslint \"./**/*.js\" \"./**/*.html\" && node-red-dev validate && mocha \"test/**/*_spec.js\""
+    "prepublishOnly_off": "eslint \"./**/*.js\" \"./**/*.html\" && node-red-dev validate && mocha \"test/**/*_spec.js\""
   },
   "repository": {
     "type": "git",
@@ -95,7 +95,7 @@
   },
   "homepage": "https://github.com/rdmtc/node-red-contrib-sun-position#readme",
   "node-red": {
-    "version": ">=1.0.0",
+    "version": ">=1.2.9",
     "nodes": {
       "position-config": "nodes/10-position-config.js",
       "time-inject": "nodes/20-time-inject.js",
@@ -110,27 +110,27 @@
     }
   },
   "dependencies": {
-    "suncalc3": "^2.0.1",
+    "suncalc3": "^2.0.5",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",
     "cronosjs": "^1.7.1"
   },
   "devDependencies": {
-    "eslint": ">=8.11.0",
+    "eslint": ">=8.13.0",
     "eslint-plugin-html": ">=6.2.0",
     "eslint-plugin-json": ">=3.1.0",
     "eslint-plugin-node": ">=11.1.0",
-    "@types/express": "^4.17.13",
-    "@types/jquery": "^3.5.14",
-    "@types/node-red": "^1.2.0",
-    "jsonata": "^1.8.6",
-    "mocha": "^10.0.0",
-    "node-red": ">=2.0.0",
-    "node-red-dev": "^0.1.5",
-    "node-red-node-test-helper": "^0.3.0",
+    "@types/express": "^5.0.1",
+    "@types/jquery": "^3.5.32",
+    "@types/node-red": "^1.3.5",
+    "jsonata": "^2.0.6",
+    "mocha": "^11.1.0",
+    "node-red": "4.0.9",
+    "node-red-dev": "^0.1.6",
+    "node-red-node-test-helper": "^0.3.4",
     "should": "^13.2.3",
     "should-sinon": "^0.0.6",
-    "sinon": "^14.0.0"
+    "sinon": "^20.0.0"
   },
   "eslintConfig": {
     "env": {
diff --git a/test/20_time-inject_spec.js b/test/20_time-inject_spec.js
index 7da72f87..8b8a7849 100644
--- a/test/20_time-inject_spec.js
+++ b/test/20_time-inject_spec.js
@@ -50,6 +50,28 @@ const cfgNode = {
     stateDateFormat: '12',
     contextStore: ''
 };
+const cfgNode2 = {
+    id: 'nc1',
+    type: 'position-config',
+    name: 'Mitte von Deutschland',
+    isValide: 'true',
+    angleType: 'deg',
+    timeZoneOffset: '99',
+    timeZoneDST: '0',
+    stateTimeFormat: '3',
+    stateDateFormat: '12',
+    contextStore: '',
+    sunPositions: [
+        { angle: -2, riseName: 'robHourDawn', setName: 'robHourDusk'},
+        { angle: -6, riseName: 'civilDawnRob', setName: 'civilDuskRob'}
+    ],
+    predefAngles: [
+        { angle: 0, name: 'North'},
+        { angle: 90, name: 'East'},
+        { angle: 180, name: 'South'},
+        { angle: 270, name: 'West'}
+    ]
+};
 const tabNode = {id: 'flow', type: 'tab', label: 'FLOW' };
 const groupNode = {id: 'g0', type: 'group', name: 'GROUP' };
 const hlpNode = {id: 'n2', type: 'helper'};
@@ -110,8 +132,10 @@ describe('time inject node', () => {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
                     done();
                 } catch (err) {
                     done(err);
@@ -138,8 +162,10 @@ describe('time inject node', () => {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
                     done();
                 } catch (err) {
                     done(err);
@@ -166,8 +192,10 @@ describe('time inject node', () => {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
                     done();
                 } catch (err) {
                     done(err);
@@ -194,8 +222,232 @@ describe('time inject node', () => {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if height invalid ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-inject',
+                    name: '',
+                    nameInt: 'Zeitpunkt',
+                    positionConfig: 'nc1',
+                    props: [{p: '', pt: 'msgPayload', v: 'foo', vt: 'str'}],
+                    injectTypeSelect: 'none',
+                    once: false,
+                    wires: [[]]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '51', 'posLongitude': '180', 'height': 'NA'}};
+            helper.load([nodeConfig, nodeTimeInject], flow, invalidCreds, () => {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.height-wrong');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if custom angle invalid ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-inject',
+                    name: '',
+                    nameInt: 'Zeitpunkt',
+                    positionConfig: 'nc1',
+                    props: [{p: '', pt: 'msgPayload', v: 'foo', vt: 'str'}],
+                    injectTypeSelect: 'none',
+                    once: false,
+                    wires: [[]]
+                }, {
+                    id: 'nc1',
+                    type: 'position-config',
+                    name: 'Mitte von Deutschland',
+                    isValide: 'true',
+                    angleType: 'deg',
+                    timeZoneOffset: '99',
+                    timeZoneDST: '0',
+                    stateTimeFormat: '3',
+                    stateDateFormat: '12',
+                    contextStore: '',
+                    sunPositions: [
+                        { angle: -2, riseName: 'robHourDawn', setName: 'robHourDusk'},
+                        { angle: -6, riseName: 'civilDawnRob', setName: 'civilDuskRob'}
+                    ],
+                    predefAngles: [
+                        { angle: 0, name: 'North'},
+                        { angle: 90, name: 'East'},
+                        { angle: 180, name: 'South'},
+                        { angle: null, name: 'West'}
+                    ]
+                }];
+            helper.load([nodeConfig, nodeTimeInject], flow, credentials, () => {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.custom-angles');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if custom angle duplicated ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-inject',
+                    name: '',
+                    nameInt: 'Zeitpunkt',
+                    positionConfig: 'nc1',
+                    props: [{p: '', pt: 'msgPayload', v: 'foo', vt: 'str'}],
+                    injectTypeSelect: 'none',
+                    once: false,
+                    wires: [[]]
+                }, {
+                    id: 'nc1',
+                    type: 'position-config',
+                    name: 'Mitte von Deutschland',
+                    isValide: 'true',
+                    angleType: 'deg',
+                    timeZoneOffset: '99',
+                    timeZoneDST: '0',
+                    stateTimeFormat: '3',
+                    stateDateFormat: '12',
+                    contextStore: '',
+                    sunPositions: [
+                        { angle: -2, riseName: 'robHourDawn', setName: 'robHourDusk'},
+                        { angle: -6, riseName: 'civilDawnRob', setName: 'civilDuskRob'}
+                    ],
+                    predefAngles: [
+                        { angle: 0, name: 'North'},
+                        { angle: 90, name: 'East'},
+                        { angle: 180, name: 'South'},
+                        { angle: 270, name: 'South'}
+                    ]
+                }];
+            helper.load([nodeConfig, nodeTimeInject], flow, credentials, () => {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.custom-angles-duplicate');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if custom sun time invalid ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-inject',
+                    name: '',
+                    nameInt: 'Zeitpunkt',
+                    positionConfig: 'nc1',
+                    props: [{p: '', pt: 'msgPayload', v: 'foo', vt: 'str'}],
+                    injectTypeSelect: 'none',
+                    once: false,
+                    wires: [[]]
+                }, {
+                    id: 'nc1',
+                    type: 'position-config',
+                    name: 'Mitte von Deutschland',
+                    isValide: 'true',
+                    angleType: 'deg',
+                    timeZoneOffset: '99',
+                    timeZoneDST: '0',
+                    stateTimeFormat: '3',
+                    stateDateFormat: '12',
+                    contextStore: '',
+                    sunPositions: [
+                        { angle: -2, riseName: 'robHourDawn', setName: 'robHourDusk'},
+                        { angle: -6, riseName: 'civilDawn', setName: 'civilDuskRob'}
+                    ],
+                    predefAngles: [
+                        { angle: 0, name: 'North'},
+                        { angle: 90, name: 'East'},
+                        { angle: 180, name: 'South'},
+                        { angle: 270, name: 'West'}
+                    ]
+                }];
+            helper.load([nodeConfig, nodeTimeInject], flow, credentials, () => {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.invalid-custom-suntime');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if custom sun time duplicated ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-inject',
+                    name: '',
+                    nameInt: 'Zeitpunkt',
+                    positionConfig: 'nc1',
+                    props: [{p: '', pt: 'msgPayload', v: 'foo', vt: 'str'}],
+                    injectTypeSelect: 'none',
+                    once: false,
+                    wires: [[]]
+                }, {
+                    id: 'nc1',
+                    type: 'position-config',
+                    name: 'Mitte von Deutschland',
+                    isValide: 'true',
+                    angleType: 'deg',
+                    timeZoneOffset: '99',
+                    timeZoneDST: '0',
+                    stateTimeFormat: '3',
+                    stateDateFormat: '12',
+                    contextStore: '',
+                    sunPositions: [
+                        { angle: -2, riseName: 'robHourDawn', setName: 'robHourDusk'},
+                        { angle: null, riseName: 'civilDawnRob', setName: 'civilDuskRob'}
+                    ],
+                    predefAngles: [
+                        { angle: 0, name: 'North'},
+                        { angle: 90, name: 'East'},
+                        { angle: 180, name: 'South'},
+                        { angle: 270, name: 'West'}
+                    ]
+                }];
+            helper.load([nodeConfig, nodeTimeInject], flow, credentials, () => {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.invalid-custom-suntime');
                     done();
                 } catch (err) {
                     done(err);
@@ -569,6 +821,46 @@ describe('time inject node', () => {
             });
         });
 
+        it('inject value (pdsTimeCustom) ', function(done) {
+            const flow1 = [
+                {
+                    id: 'n1',
+                    type: 'time-inject',
+                    name: 'myNode',
+                    nameInt: 'test',
+                    positionConfig: 'nc1',
+                    props: [
+                        {
+                            p: '', pt: 'msgPayload', v: 'civilDawnRob', vt: 'pdsTimeCustom',
+                            o: '', oT: 'none', oM: '60000',
+                            f: 0, fS: 0, fI: '0',
+                            next: true,
+                            days: '*', months: '*',
+                            onlyOddDays: false, onlyEvenDays: false, onlyOddWeeks: false, onlyEvenWeeks: false },
+                        {p: '', pt: 'msgTopic', v: 'tx2', vt: 'str'}],
+                    injectTypeSelect: 'none',
+                    once: false,
+                    wires: [['n2']]
+                }, cfgNode2, hlpNode];
+            helper.load([nodeConfig, nodeTimeInject], flow1, credentials, () => {
+                const n1 = helper.getNode('n1');
+                const n2 = helper.getNode('n2');
+                n1.status.should.be.calledOnce();
+                n1.should.have.property('name', 'myNode');
+                n2.on('input', function(msg) {
+                    try {
+                        msg.should.have.property('topic', 'tx2');
+                        msg.should.have.property('payload');
+                        msg.payload.should.equal(1577861034863); // Wed Jan 01 2020 06:43:54 GMT+0000
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                n1.receive({ __ts__input_date: new Date(1577851200000)}); // 1577851200000 - 1.1.2020 5:00
+            });
+        });
+
         it('inject value (pdmTime-rise) ', function(done) {
             const flow1 = [
                 {
@@ -745,12 +1037,11 @@ describe('time inject node', () => {
         types.MoonPhase,
         types.SunAzimuth,
         types.SunElevation,
-        types.SunAzimuthRad,
-        types.SunElevationRad,
         types.SunTimeByAzimuth,
         types.SunTimeByElevationObj,
-        types.SunTimeByAzimuthRad,
-        types.SunTimeByElevationObjRad,
+        types.SunTimeByElevationNext,
+        types.SunTimeByElevationRise,
+        types.SunTimeByElevationSet,
         types.isDST,
         types.WeekOfYear,
         types.WeekOfYearEven,
@@ -1412,11 +1703,15 @@ describe('time inject node', () => {
             helper.load([nodeConfig, nodeTimeInject], flow, credentials, () => {
                 const n2 = helper.getNode('n2');
                 n2.on('input', function(msg) {
-                    msg.should.have.property('topic', 't1');
-                    msg.should.have.property('payload');
-                    msg.should.have.property('_inject_type', 'once/startup');
-                    should(msg.payload).be.greaterThan(timestamp.getTime());
-                    done();
+                    try {
+                        msg.should.have.property('topic', 't1');
+                        msg.should.have.property('payload');
+                        msg.should.have.property('_inject_type', 'once/startup');
+                        should(msg.payload).be.greaterThan(timestamp.getTime());
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
                 });
             });
         });
@@ -1446,13 +1741,17 @@ describe('time inject node', () => {
                 const n2 = helper.getNode('n2');
                 let count = 0;
                 n2.on('input', function(msg) {
-                    msg.should.have.property('topic', 't2');
-                    msg.should.have.property('payload', 'payload');
-                    count += 1;
-                    if (count > 2) {
-                        helper.clearFlows().then(() => {
-                            done();
-                        });
+                    try {
+                        msg.should.have.property('topic', 't2');
+                        msg.should.have.property('payload', 'payload');
+                        count += 1;
+                        if (count > 2) {
+                            helper.clearFlows().then(() => {
+                                done();
+                            });
+                        }
+                    } catch(err) {
+                        done(err);
                     }
                 });
             });
@@ -1485,13 +1784,17 @@ describe('time inject node', () => {
                 const n2 = helper.getNode('n2');
                 let count = 0;
                 n2.on('input', function(msg) {
-                    msg.should.have.property('topic', 'tx2');
-                    should(msg.payload).be.greaterThan(timestamp.getTime());
-                    count += 1;
-                    if (count > 2) {
-                        helper.clearFlows().then(() => {
-                            done();
-                        });
+                    try {
+                        msg.should.have.property('topic', 'tx2');
+                        should(msg.payload).be.greaterThan(timestamp.getTime());
+                        count += 1;
+                        if (count > 2) {
+                            helper.clearFlows().then(() => {
+                                done();
+                            });
+                        }
+                    } catch(err) {
+                        done(err);
                     }
                 });
             });
@@ -1654,11 +1957,15 @@ describe('time inject node', () => {
             helper.load([nodeConfig, nodeTimeInject], flow, credentials, () => {
                 const n3 = helper.getNode('n3');
                 n3.on('input', function(msg) {
-                    msg.should.have.property('topic', 't3');
-                    msg.should.have.property('payload').be.a.Number();
-                    helper.clearFlows().then(function() {
-                        done();
-                    });
+                    try{
+                        msg.should.have.property('topic', 't3');
+                        msg.should.have.property('payload').be.a.Number();
+                        helper.clearFlows().then(function() {
+                            done();
+                        });
+                    } catch(err) {
+                        done(err);
+                    }
                 });
             });
         }); /* should inject with cron */
@@ -1686,11 +1993,15 @@ describe('time inject node', () => {
             helper.load([nodeConfig, nodeTimeInject], flow, credentials, () => {
                 const n4 = helper.getNode('n4');
                 n4.on('input', function(msg) {
-                    msg.should.have.property('topic', 't4');
-                    msg.should.have.property('payload', 'hello');
-                    helper.clearFlows().then(() => {
-                        done();
-                    });
+                    try{
+                        msg.should.have.property('topic', 't4');
+                        msg.should.have.property('payload', 'hello');
+                        helper.clearFlows().then(() => {
+                            done();
+                        });
+                    } catch(err) {
+                        done(err);
+                    }
                 });
                 try {
                     helper.request()
@@ -1730,15 +2041,19 @@ describe('time inject node', () => {
             helper.load([nodeConfig, nodeTimeInject], flow, credentials, () => {
                 const n4 = helper.getNode('n4');
                 n4.on('input', function(msg) {
-                    msg.should.not.have.property('payload'); // payload removed
-                    msg.should.have.property('topic', 't_override'); // changed value to t_override
-                    msg.should.have.property('str1', '1'); // injected prop
-                    msg.should.have.property('num1', 1); // injected prop
-                    msg.should.have.property('bool1', true); // injected prop
+                    try{
+                        msg.should.not.have.property('payload'); // payload removed
+                        msg.should.have.property('topic', 't_override'); // changed value to t_override
+                        msg.should.have.property('str1', '1'); // injected prop
+                        msg.should.have.property('num1', 1); // injected prop
+                        msg.should.have.property('bool1', true); // injected prop
 
-                    helper.clearFlows().then(() => {
-                        done();
-                    });
+                        helper.clearFlows().then(() => {
+                            done();
+                        });
+                    } catch(err) {
+                        done(err);
+                    }
                 });
                 try {
                     helper.request()
diff --git a/test/21-within-time-switch_spec.js b/test/21-within-time-switch_spec.js
index 4eb9bc17..ceffdf43 100644
--- a/test/21-within-time-switch_spec.js
+++ b/test/21-within-time-switch_spec.js
@@ -203,8 +203,10 @@ describe('within time switch node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -273,8 +275,10 @@ describe('within time switch node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -343,8 +347,10 @@ describe('within time switch node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -413,8 +419,10 @@ describe('within time switch node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
                     done();
                 } catch(err) {
                     done(err);
diff --git a/test/22-delay-until_spec.js b/test/22-delay-until_spec.js
index da2714c4..288bc000 100644
--- a/test/22-delay-until_spec.js
+++ b/test/22-delay-until_spec.js
@@ -119,8 +119,10 @@ describe('delay until node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -147,8 +149,10 @@ describe('delay until node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -175,8 +179,10 @@ describe('delay until node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -203,8 +209,10 @@ describe('delay until node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
                     done();
                 } catch(err) {
                     done(err);
diff --git a/test/30-sun-position_spec.js b/test/30-sun-position_spec.js
new file mode 100644
index 00000000..fee7a235
--- /dev/null
+++ b/test/30-sun-position_spec.js
@@ -0,0 +1,776 @@
+/* eslint-disable no-template-curly-in-string */
+/* eslint-disable require-jsdoc */
+/* eslint-disable prefer-arrow-callback */
+/* eslint-disable no-unused-vars */
+/*
+ * This code is licensed under the Apache License Version 2.0.
+ *
+ * Copyright (c) 2022 Robert Gester
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ */
+/* global Context context describe beforeEach before afterEach after it */
+
+/**
+ * Test cases for delay until node
+ *
+ * @example:
+ * to run all tests: npm test
+ * to run only testcases: npm run testnode
+ * to run single test: mocha -g "sun-position"
+ */
+
+const should = require('should');
+const sinon = require('sinon');
+require('should-sinon');
+
+const helper = require('node-red-node-test-helper');
+
+// Nodes
+const nodeConfig = require('../nodes/10-position-config.js');
+const nodeSunPosition = require('../nodes/30-sun-position.js');
+
+helper.init(require.resolve('node-red'));
+
+const credentials = {'nc1': {'posLatitude': '51.16406769771653', 'posLongitude': '10.447609909242438'}};
+const cfgNode = {
+    id: 'nc1',
+    type: 'position-config',
+    name: 'Mitte von Deutschland',
+    isValide: 'true',
+    angleType: 'deg',
+    timeZoneOffset: '99',
+    timeZoneDST: '0',
+    stateTimeFormat: '3',
+    stateDateFormat: '12',
+    contextStore: ''
+};
+const tabNode = {id: 'flow', type: 'tab', label: 'FLOW' };
+const hlpNode = {id: 'n2', type: 'helper'};
+const sunPositions = ['solarNoon','nadir',
+    'goldenHourDawnEnd', 'goldenHourDuskStart',
+    'sunriseEnd',  'sunsetStart',
+    'sunriseStart',  'sunsetEnd',
+    'goldenHourDawnStart',  'goldenHourDuskEnd',
+    'blueHourDawnEnd',  'blueHourDuskStart',
+    'civilDawn', 'civilDusk',
+    'blueHourDawnStart',  'blueHourDuskEnd',
+    'nauticalDawn',  'nauticalDusk',
+    'amateurDawn',  'amateurDusk',
+    'astronomicalDawn', 'astronomicalDusk'];
+
+describe('sun-position node', function() {
+    beforeEach(function (done) {
+        helper.startServer(done);
+    });
+
+    afterEach(function (done) {
+        helper.unload().then(function () {
+            helper.stopServer(done);
+        });
+    });
+
+    describe('test configuration (sun-position)', function() {
+        it('fail if missing configuration ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: '',
+                    positionConfig: '',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode];
+            helper.load([nodeConfig, nodeSunPosition], flow, credentials, function() {
+                const n1 = helper.getNode('n1'); // sun-position node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.status.should.be.calledOnce();
+                    n1.error.should.be.calledOnce().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if latitude missing ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: '',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLongitude': '10'}};
+            helper.load([nodeConfig, nodeSunPosition], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.warn.should.be.called();
+                    n1.warn.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if longitude missing ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: '',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '5'}};
+            helper.load([nodeConfig, nodeSunPosition], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.warn.should.be.called();
+                    n1.warn.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if latitude invalid ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: '',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '90.1',  'posLongitude': '10'}};
+            helper.load([nodeConfig, nodeSunPosition], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.warn.should.be.called();
+                    n1.warn.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if longitude invalid ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: '',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '51', 'posLongitude': '180.1'}};
+            helper.load([nodeConfig, nodeSunPosition], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.warn.should.be.called();
+                    n1.warn.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('test if correctly loaded', function (done) {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: 'sun position',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'my #Topic',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode];
+
+            helper.load([nodeConfig, nodeSunPosition], flow, credentials, function() {
+                const n1 = helper.getNode('n1');
+                try {
+                    n1.status.should.be.calledOnce();
+                    n1.should.have.property('name', 'sun position');
+                    n1.should.have.property('type', 'sun-position');
+                    n1.should.have.property('positionConfig');
+                    n1.should.have.property('positionConfigValid', true);
+                    n1.should.have.property('topic', 'my #Topic');
+                    n1.should.have.property('rules');
+                    n1.should.have.property('start');
+                    n1.start.should.have.property('type', 'none');
+                    n1.start.should.have.property('value', '');
+                    n1.start.should.have.property('offsetType', 'none');
+                    n1.start.should.have.property('offset', 0);
+                    n1.start.should.have.property('multiplier', 60000);
+                    n1.start.should.have.property('next', false);
+                    n1.should.have.property('end');
+                    n1.end.should.have.property('type', 'none');
+                    n1.end.should.have.property('value', '');
+                    n1.end.should.have.property('offsetType', 'none');
+                    n1.end.should.have.property('offset', 0);
+                    n1.end.should.have.property('multiplier', 60000);
+                    n1.end.should.have.property('next', false);
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('message passing invalid creditials - missing latitude', function(done) {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: 'sun position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'my #Topic',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            const invalidCreds = {'nc1': { 'posLongitude': '10'}};
+            helper.load([nodeConfig, nodeSunPosition], flow, invalidCreds, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'sun position');
+
+                    n2.on('input', function (msg) {
+                        done(); // should not be called!
+                    });
+                    n1.warn.should.be.called();
+                    n1.receive({});
+                    n1.status.should.be.calledThrice(); // on startup config node + node itself + on message recive
+                    n1.status.firstCall.calledWith('position-config.errors.latitude-missing');
+                    n1.status.secondCall.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    n1.status.thirdCall.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('message passing invalid creditials - missing longitude', function(done) {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: 'sun position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'my #Topic',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '5'}};
+            helper.load([nodeConfig, nodeSunPosition], flow, invalidCreds, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'sun position');
+
+                    n2.on('input', function (msg) {
+                        done(); // should not be called!
+                    });
+                    n1.warn.should.be.called();
+                    n1.receive({});
+                    n1.status.should.be.calledThrice(); // on startup config node + node itself + on message recive
+                    n1.status.firstCall.calledWith('position-config.errors.longitude-missing');
+                    n1.status.secondCall.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    n1.status.thirdCall.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+    });
+
+    describe('test message passing', function() {
+        it('message passing - basic', function(done) {
+            // this.timeout(5000); // have to wait for the inject with delay of two seconds
+            const timestamp = new Date();
+            timestamp.setSeconds(timestamp.getSeconds());
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: 'sun position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'my #Top',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            helper.load([nodeConfig, nodeSunPosition], flow, credentials, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'sun position');
+
+                    n2.on('input', function (msg) {
+                        try {
+                            n1.error.should.not.be.called();
+                            n1.warn.should.not.be.called();
+                            n1.status.should.be.calledTwice(); // on startup config node + node itself + on message recive
+
+                            msg.should.have.property('topic', 'my #Top');
+                            msg.should.have.property('payload');
+                            msg.payload.should.have.property('ts');
+                            should(msg.payload.ts).be.greaterThan(timestamp.getTime());
+                            should(msg.payload.ts).be.lessThan(timestamp.getTime() + 80);
+                            msg.payload.should.have.property('latitude',51.16406769771653);
+                            msg.payload.should.have.property('longitude',10.447609909242438);
+                            msg.payload.should.have.property('height',0);
+                            msg.payload.should.have.property('angleType','deg');
+                            msg.payload.should.have.property('azimuth');
+                            msg.payload.should.have.property('altitude');
+                            msg.payload.should.have.property('azimuthDegrees');
+                            msg.payload.should.have.property('altitudeDegrees');
+                            msg.payload.should.have.property('azimuthRadians');
+                            msg.payload.should.have.property('altitudeRadians');
+                            should(msg.payload.azimuth).be.equal(msg.payload.azimuthDegrees);
+                            should(msg.payload.altitude).be.equal(msg.payload.altitudeDegrees);
+                            msg.payload.should.have.property('times');
+                            for (let index = 0; index < sunPositions.length; index++) {
+                                const sp = sunPositions[index];
+                                msg.payload.times.should.have.property(sp);
+                                msg.payload.times[sp].should.have.property('value');
+                                msg.payload.times[sp].should.have.property('ts');
+                                msg.payload.times[sp].should.have.property('name', sp);
+                                msg.payload.times[sp].should.have.property('julian');
+                                msg.payload.times[sp].should.have.property('valid');
+                                msg.payload.times[sp].should.have.property('pos');
+                            }
+                            msg.payload.should.have.property('positionAtSolarNoon');
+                            msg.payload.positionAtSolarNoon.should.have.property('azimuth');
+                            msg.payload.positionAtSolarNoon.should.have.property('altitude');
+                            msg.payload.positionAtSolarNoon.should.have.property('zenith');
+                            msg.payload.positionAtSolarNoon.should.have.property('azimuthDegrees');
+                            msg.payload.positionAtSolarNoon.should.have.property('altitudeDegrees');
+                            msg.payload.positionAtSolarNoon.should.have.property('zenithDegrees');
+                            msg.payload.positionAtSolarNoon.should.have.property('azimuthRadians');
+                            msg.payload.positionAtSolarNoon.should.have.property('altitudeRadians');
+                            msg.payload.positionAtSolarNoon.should.have.property('zenithRadians');
+                            msg.payload.positionAtSolarNoon.should.have.property('declination');
+                            msg.payload.should.have.property('altitudePercent');
+                            msg.payload.should.have.property('posChanged');
+                            done();
+                        } catch (err) {
+                            done(err);
+                        }
+                    });
+                    // '289.59/-7.49 - 5.4.2022 20:41:34'
+                    n1.receive({});
+
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('message passing - fixed time', function(done) {
+            // this.timeout(5000); // have to wait for the inject with delay of two seconds
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: 'sun position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'test3',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            helper.load([nodeConfig, nodeSunPosition], flow, credentials, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'sun position');
+
+                    n2.on('input', function (msg) {
+                        try {
+                            n1.error.should.not.be.called();
+                            n1.warn.should.not.be.called();
+                            n1.status.should.be.calledTwice(); // on startup config node + node itself + on message recive
+                            msg.should.have.property('topic', 'test3');
+                            msg.should.have.property('payload');
+                            msg.payload.should.have.property('ts', 1577880000000);
+                            msg.payload.should.have.property('latitude',51.16406769771653);
+                            msg.payload.should.have.property('longitude',10.447609909242438);
+                            msg.payload.should.have.property('height', 0);
+                            msg.payload.should.have.property('angleType','deg');
+                            msg.payload.should.have.property('azimuth', 189.06678316838486);
+                            msg.payload.should.have.property('altitude', 15.315769887624558);
+                            msg.payload.should.have.property('zenith', 74.68423011237545);
+                            msg.payload.should.have.property('azimuthDegrees');
+                            msg.payload.should.have.property('altitudeDegrees');
+                            msg.payload.should.have.property('zenithDegrees');
+                            msg.payload.should.have.property('azimuthRadians');
+                            msg.payload.should.have.property('altitudeRadians');
+                            msg.payload.should.have.property('zenithRadians');
+                            msg.payload.should.have.property('lastUpdateStr', '2020-01-01T13:00:00');
+                            msg.payload.should.have.property('lastUpdate');
+                            msg.payload.should.have.property('lastUpdate');
+                            msg.payload.should.have.property('lastUpdate');
+                            should(msg.payload.azimuth).be.equal(msg.payload.azimuthDegrees);
+                            should(msg.payload.altitude).be.equal(msg.payload.altitudeDegrees);
+                            msg.payload.should.have.property('times');
+                            for (let index = 0; index < sunPositions.length; index++) {
+                                const sp = sunPositions[index];
+                                msg.payload.times.should.have.property(sp);
+                                msg.payload.times[sp].should.have.property('value');
+                                msg.payload.times[sp].should.have.property('ts');
+                                msg.payload.times[sp].should.have.property('name', sp);
+                                msg.payload.times[sp].should.have.property('julian');
+                                msg.payload.times[sp].should.have.property('valid');
+                                msg.payload.times[sp].should.have.property('pos');
+                            }
+                            msg.payload.should.have.property('posChanged');
+                            done();
+                        } catch (err) {
+                            done(err);
+                        }
+                    });
+                    // '289.59/-7.49 - 5.4.2022 20:41:34'
+                    n1.receive({ts:Date.UTC(2020,0, 1, 12, 0, 0)});
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('message passing - own position', function(done) {
+            // this.timeout(5000); // have to wait for the inject with delay of two seconds
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: 'sun position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'test4',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            helper.load([nodeConfig, nodeSunPosition], flow, credentials, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'sun position');
+
+                    n2.on('input', function (msg) {
+                        try {
+                            n1.error.should.not.be.called();
+                            n1.warn.should.not.be.called();
+                            n1.status.should.be.calledTwice(); // on startup config node + node itself + on message recive
+                            msg.should.have.property('topic', 'test4');
+                            msg.should.have.property('payload');
+                            msg.payload.should.have.property('ts', 1577880000000);
+                            msg.payload.should.have.property('latitude',40.5);
+                            msg.payload.should.have.property('longitude',10);
+                            msg.payload.should.have.property('height', 0);
+                            msg.payload.should.have.property('angleType','deg');
+                            msg.payload.should.have.property('azimuth', 189.26870091794416);
+                            msg.payload.should.have.property('altitude', 25.893939119327335);
+                            msg.payload.should.have.property('zenith',64.10606088067266);
+                            msg.payload.should.have.property('azimuthDegrees');
+                            msg.payload.should.have.property('altitudeDegrees');
+                            msg.payload.should.have.property('zenithDegrees');
+                            msg.payload.should.have.property('azimuthRadians');
+                            msg.payload.should.have.property('altitudeRadians');
+                            msg.payload.should.have.property('zenithRadians');
+                            msg.payload.should.have.property('lastUpdateStr', '2020-01-01T13:00:00');
+                            msg.payload.should.have.property('lastUpdate');
+                            msg.payload.should.have.property('lastUpdate');
+                            msg.payload.should.have.property('lastUpdate');
+                            should(msg.payload.azimuth).be.equal(msg.payload.azimuthDegrees);
+                            should(msg.payload.altitude).be.equal(msg.payload.altitudeDegrees);
+                            msg.payload.should.have.property('times');
+                            for (let index = 0; index < sunPositions.length; index++) {
+                                const sp = sunPositions[index];
+                                msg.payload.times.should.have.property(sp);
+                                msg.payload.times[sp].should.have.property('value');
+                                msg.payload.times[sp].should.have.property('ts');
+                                msg.payload.times[sp].should.have.property('name', sp);
+                                msg.payload.times[sp].should.have.property('julian');
+                                msg.payload.times[sp].should.have.property('valid');
+                                msg.payload.times[sp].should.have.property('pos');
+                            }
+                            msg.payload.should.have.property('posChanged');
+                            done();
+                        } catch (err) {
+                            done(err);
+                        }
+                    });
+                    // '289.59/-7.49 - 5.4.2022 20:41:34'
+                    n1.receive({
+                        ts          : Date.UTC(2020,0, 1, 12, 0, 0),
+                        latitude    : 40.5,
+                        longitude   : 10
+                    });
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+        /*
+        it('message passing invalid creditials - missing latitude 2', function(done) {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'sun-position',
+                    name: 'sun position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'my #Topic',
+                    outputs: 1,
+                    start: '',
+                    startType: 'none',
+                    startOffset: 0,
+                    startOffsetType: 'none',
+                    startOffsetMultiplier: 60000,
+                    end: '',
+                    endType: 'none',
+                    endOffset: 0,
+                    endOffsetType: 'none',
+                    endOffsetMultiplier: 60000,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            const invalidCreds = {'nc1': { 'posLongitude': '10'}};
+            helper.load([nodeConfig, nodeSunPosition], flow, invalidCreds, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.status.should.be.calledOnce();
+                    n1.should.have.property('name', 'injectNodeName');
+
+                    n2.on('input', function (msg) {
+                        try {
+                            msg.should.have.property('topic', topic);
+                            if (rval) {
+                                msg.should.have.property('payload');
+                                // console.log(msg);
+                                // console.log(rval);
+                                should.deepEqual(msg.payload, rval);
+                            } else {
+                                msg.should.have.property('payload', val);
+                            }
+                            done();
+                        } catch (err) {
+                            done(err);
+                        }
+                    });
+                    n1.receive({});
+                } catch (err) {
+                    done(err);
+                }
+            });
+        }); */
+
+        it('test of rules / multiple outputs', function(done) {
+            this.skip();
+        });
+
+        it('test of start / end', function(done) {
+            this.skip();
+        });
+
+        it('test needs to be implemented', function() {
+            this.skip();
+        });
+    });
+});
\ No newline at end of file
diff --git a/test/31-moon-position_spec.js b/test/31-moon-position_spec.js
new file mode 100644
index 00000000..1475a0bc
--- /dev/null
+++ b/test/31-moon-position_spec.js
@@ -0,0 +1,643 @@
+/* eslint-disable no-template-curly-in-string */
+/* eslint-disable require-jsdoc */
+/* eslint-disable prefer-arrow-callback */
+/* eslint-disable no-unused-vars */
+/*
+ * This code is licensed under the Apache License Version 2.0.
+ *
+ * Copyright (c) 2022 Robert Gester
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ */
+/* global Context context describe beforeEach before afterEach after it */
+
+/**
+ * Test cases for delay until node
+ *
+ * @example:
+ * to run all tests: npm test
+ * to run only testcases: npm run testnode
+ * to run single test: mocha -g "moon-position"
+ */
+
+const should = require('should');
+const sinon = require('sinon');
+require('should-sinon');
+
+const helper = require('node-red-node-test-helper');
+
+// Nodes
+const nodeConfig = require('../nodes/10-position-config.js');
+const nodeMoonPosition = require('../nodes/31-moon-position.js');
+
+helper.init(require.resolve('node-red'));
+
+const credentials = {'nc1': {'posLatitude': '51.16406769771653', 'posLongitude': '10.447609909242438'}};
+const cfgNode = {
+    id: 'nc1',
+    type: 'position-config',
+    name: 'Mitte von Deutschland',
+    isValide: 'true',
+    angleType: 'deg',
+    timeZoneOffset: '99',
+    timeZoneDST: '0',
+    stateTimeFormat: '3',
+    stateDateFormat: '12',
+    contextStore: ''
+};
+const tabNode = {id: 'flow', type: 'tab', label: 'FLOW' };
+const hlpNode = {id: 'n2', type: 'helper'};
+
+describe('moon-position node', function() {
+    beforeEach(function (done) {
+        helper.startServer(done);
+    });
+
+    afterEach(function (done) {
+        helper.unload().then(function () {
+            helper.stopServer(done);
+        });
+    });
+
+    describe('test configuration (moon-position)', function() {
+        it('fail if missing configuration ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: '',
+                    positionConfig: '',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode];
+            helper.load([nodeConfig, nodeMoonPosition], flow, credentials, function() {
+                const n1 = helper.getNode('n1'); // moon-position node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.status.should.be.calledOnce();
+                    n1.error.should.be.calledOnce().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if latitude missing ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: '',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLongitude': '10'}};
+            helper.load([nodeConfig, nodeMoonPosition], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.warn.should.be.called();
+                    n1.warn.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if longitude missing ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: '',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '5'}};
+            helper.load([nodeConfig, nodeMoonPosition], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.warn.should.be.called();
+                    n1.warn.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if latitude invalid ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: '',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '90.1',  'posLongitude': '10'}};
+            helper.load([nodeConfig, nodeMoonPosition], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.warn.should.be.called();
+                    n1.warn.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if longitude invalid ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: '',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: '',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '51', 'posLongitude': '180.1'}};
+            helper.load([nodeConfig, nodeMoonPosition], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.warn.should.be.called();
+                    n1.warn.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('test if correctly loaded', function (done) {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: 'moon position',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'my #Topic',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode];
+
+            helper.load([nodeConfig, nodeMoonPosition], flow, credentials, function() {
+                const n1 = helper.getNode('n1');
+                try {
+                    n1.status.should.be.calledOnce();
+                    n1.should.have.property('name', 'moon position');
+                    n1.should.have.property('type', 'moon-position');
+                    n1.should.have.property('positionConfig');
+                    n1.should.have.property('positionConfigValid', true);
+                    n1.should.have.property('topic', 'my #Topic');
+                    n1.should.have.property('rules');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('message passing invalid creditials - missing latitude', function(done) {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: 'moon position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'my #Topic',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            const invalidCreds = {'nc1': { 'posLongitude': '10'}};
+            helper.load([nodeConfig, nodeMoonPosition], flow, invalidCreds, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'moon position');
+
+                    n2.on('input', function (msg) {
+                        done(); // should not be called!
+                    });
+                    n1.warn.should.be.called();
+                    n1.receive({});
+                    n1.status.should.be.calledThrice(); // on startup config node + node itself + on message recive
+                    n1.status.firstCall.calledWith('position-config.errors.latitude-missing');
+                    n1.status.secondCall.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    n1.status.thirdCall.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('message passing invalid creditials - missing longitude', function(done) {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: 'moon position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'my #Topic',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '5'}};
+            helper.load([nodeConfig, nodeMoonPosition], flow, invalidCreds, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'moon position');
+
+                    n2.on('input', function (msg) {
+                        done(); // should not be called!
+                    });
+                    n1.warn.should.be.called();
+                    n1.receive({});
+                    n1.status.should.be.calledThrice(); // on startup config node + node itself + on message recive
+                    n1.status.firstCall.calledWith('position-config.errors.longitude-missing');
+                    n1.status.secondCall.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    n1.status.thirdCall.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+        /* */
+    });
+
+    describe('test message passing', function() {
+        it('message passing - basic', function(done) {
+            // this.timeout(5000); // have to wait for the inject with delay of two seconds
+            const timestamp = new Date();
+            timestamp.setSeconds(timestamp.getSeconds());
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: 'moon position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'my #Top',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            helper.load([nodeConfig, nodeMoonPosition], flow, credentials, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'moon position');
+
+                    n2.on('input', function (msg) {
+                        try {
+                            n1.error.should.not.be.called();
+                            n1.warn.should.not.be.called();
+                            n1.status.should.be.calledTwice(); // on startup config node + node itself + on message recive
+
+                            msg.should.have.property('topic', 'my #Top');
+                            msg.should.have.property('payload');
+                            msg.payload.should.have.property('ts');
+                            should(msg.payload.ts).be.greaterThan(timestamp.getTime());
+                            should(msg.payload.ts).be.lessThan(timestamp.getTime() + 80);
+                            msg.payload.should.have.property('latitude',51.16406769771653);
+                            msg.payload.should.have.property('longitude',10.447609909242438);
+                            msg.payload.should.have.property('angleType','deg');
+
+                            msg.payload.should.have.property('azimuth');
+                            msg.payload.should.have.property('altitude');
+                            msg.payload.should.have.property('parallacticAngle');
+                            msg.payload.should.have.property('azimuthDegrees');
+                            msg.payload.should.have.property('altitudeDegrees');
+                            msg.payload.should.have.property('parallacticAngleDegrees');
+                            msg.payload.should.have.property('azimuthRadians');
+                            msg.payload.should.have.property('altitudeRadians');
+                            msg.payload.should.have.property('parallacticAngleRadians');
+                            msg.payload.should.have.property('distance');
+                            should(msg.payload.azimuth).be.equal(msg.payload.azimuthDegrees);
+                            should(msg.payload.altitude).be.equal(msg.payload.altitudeDegrees);
+                            should(msg.payload.parallacticAngle).be.equal(msg.payload.parallacticAngleDegrees);
+                            msg.payload.should.have.property('illumination');
+                            msg.payload.illumination.should.have.property('fraction');
+                            msg.payload.illumination.should.have.property('phase');
+                            msg.payload.illumination.phase.should.have.property('from');
+                            msg.payload.illumination.phase.should.have.property('to');
+                            msg.payload.illumination.phase.should.have.property('id');
+                            msg.payload.illumination.phase.should.have.property('emoji');
+                            msg.payload.illumination.phase.should.have.property('code');
+                            msg.payload.illumination.phase.should.have.property('name');
+                            msg.payload.illumination.phase.should.have.property('weight');
+                            msg.payload.illumination.phase.should.have.property('css');
+                            msg.payload.illumination.should.have.property('phaseValue');
+                            msg.payload.illumination.should.have.property('angle');
+                            msg.payload.illumination.should.have.property('next');
+                            msg.payload.illumination.next.should.have.property('value');
+                            msg.payload.illumination.next.should.have.property('date');
+                            msg.payload.illumination.next.should.have.property('type');
+                            msg.payload.illumination.next.should.have.property('newMoon');
+                            msg.payload.illumination.next.should.have.property('fullMoon');
+                            msg.payload.illumination.next.should.have.property('firstQuarter');
+                            msg.payload.illumination.next.should.have.property('thirdQuarter');
+                            msg.payload.should.have.property('times');
+                            msg.payload.times.should.have.property('rise');
+                            msg.payload.times.should.have.property('set');
+                            msg.payload.times.should.have.property('alwaysUp');
+                            msg.payload.times.should.have.property('alwaysDown');
+                            msg.payload.times.should.have.property('highest');
+                            msg.payload.should.have.property('timesNext');
+                            msg.payload.timesNext.should.have.property('rise');
+                            msg.payload.timesNext.should.have.property('set');
+                            msg.payload.timesNext.should.have.property('alwaysUp');
+                            msg.payload.timesNext.should.have.property('alwaysDown');
+                            msg.payload.timesNext.should.have.property('highest');
+
+                            msg.payload.should.have.property('positionAtRise');
+                            msg.payload.positionAtRise.should.have.property('azimuth');
+                            msg.payload.positionAtRise.should.have.property('altitude');
+                            msg.payload.positionAtRise.should.have.property('parallacticAngle');
+                            msg.payload.positionAtRise.should.have.property('azimuthDegrees');
+                            msg.payload.positionAtRise.should.have.property('altitudeDegrees');
+                            msg.payload.positionAtRise.should.have.property('parallacticAngleDegrees');
+                            msg.payload.positionAtRise.should.have.property('azimuthRadians');
+                            msg.payload.positionAtRise.should.have.property('altitudeRadians');
+                            msg.payload.positionAtRise.should.have.property('parallacticAngleRadians');
+                            msg.payload.positionAtRise.should.have.property('distance');
+                            should(msg.payload.positionAtRise.azimuth).be.equal(msg.payload.positionAtRise.azimuthDegrees);
+                            should(msg.payload.positionAtRise.altitude).be.equal(msg.payload.positionAtRise.altitudeDegrees);
+                            should(msg.payload.positionAtRise.parallacticAngle).be.equal(msg.payload.positionAtRise.parallacticAngleDegrees);
+                            msg.payload.should.have.property('positionAtSet');
+                            msg.payload.positionAtSet.should.have.property('azimuth');
+                            msg.payload.positionAtSet.should.have.property('altitude');
+                            msg.payload.positionAtSet.should.have.property('parallacticAngle');
+                            msg.payload.positionAtSet.should.have.property('azimuthDegrees');
+                            msg.payload.positionAtSet.should.have.property('altitudeDegrees');
+                            msg.payload.positionAtSet.should.have.property('parallacticAngleDegrees');
+                            msg.payload.positionAtSet.should.have.property('azimuthRadians');
+                            msg.payload.positionAtSet.should.have.property('altitudeRadians');
+                            msg.payload.positionAtSet.should.have.property('parallacticAngleRadians');
+                            msg.payload.positionAtSet.should.have.property('distance');
+                            should(msg.payload.positionAtSet.azimuth).be.equal(msg.payload.positionAtSet.azimuthDegrees);
+                            should(msg.payload.positionAtSet.altitude).be.equal(msg.payload.positionAtSet.altitudeDegrees);
+                            should(msg.payload.positionAtSet.parallacticAngle).be.equal(msg.payload.positionAtSet.parallacticAngleDegrees);
+                            msg.payload.should.have.property('highestPosition');
+                            msg.payload.highestPosition.should.have.property('azimuth');
+                            msg.payload.highestPosition.should.have.property('altitude');
+                            msg.payload.highestPosition.should.have.property('parallacticAngle');
+                            msg.payload.highestPosition.should.have.property('azimuthDegrees');
+                            msg.payload.highestPosition.should.have.property('altitudeDegrees');
+                            msg.payload.highestPosition.should.have.property('parallacticAngleDegrees');
+                            msg.payload.highestPosition.should.have.property('azimuthRadians');
+                            msg.payload.highestPosition.should.have.property('altitudeRadians');
+                            msg.payload.highestPosition.should.have.property('parallacticAngleRadians');
+                            msg.payload.highestPosition.should.have.property('distance');
+                            should(msg.payload.highestPosition.azimuth).be.equal(msg.payload.highestPosition.azimuthDegrees);
+                            should(msg.payload.highestPosition.altitude).be.equal(msg.payload.highestPosition.altitudeDegrees);
+                            should(msg.payload.highestPosition.parallacticAngle).be.equal(msg.payload.highestPosition.parallacticAngleDegrees);
+                            msg.payload.should.have.property('altitudePercent');
+                            msg.payload.should.have.property('isUp');
+                            // msg.payload.should.have.property('pos');
+                            msg.payload.should.have.property('posChanged');
+                            done();
+                        } catch (err) {
+                            done(err);
+                        }
+                    });
+                    // '289.59/-7.49 - 5.4.2022 20:41:34'
+                    n1.receive({});
+
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+        /*
+        it('message passing - fixed time', function(done) {
+            // this.timeout(5000); // have to wait for the inject with delay of two seconds
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: 'moon position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'test3',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            helper.load([nodeConfig, nodeMoonPosition], flow, credentials, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'moon position');
+
+                    n2.on('input', function (msg) {
+                        try {
+                            n1.error.should.not.be.called();
+                            n1.warn.should.not.be.called();
+                            n1.status.should.be.calledTwice(); // on startup config node + node itself + on message recive
+                            msg.should.have.property('topic', 'test3');
+                            msg.should.have.property('payload');
+                            msg.payload.should.have.property('ts', 1577880000000);
+                            msg.payload.should.have.property('latitude',51.16406769771653);
+                            msg.payload.should.have.property('longitude',10.447609909242438);
+                            msg.payload.should.have.property('height', 0);
+                            msg.payload.should.have.property('angleType','deg');
+                            msg.payload.should.have.property('azimuth', 189.06678316838486);
+                            msg.payload.should.have.property('altitude', 15.315769887624558);
+                            msg.payload.should.have.property('zenith', 74.68423011237545);
+                            msg.payload.should.have.property('azimuthDegrees');
+                            msg.payload.should.have.property('altitudeDegrees');
+                            msg.payload.should.have.property('zenithDegrees');
+                            msg.payload.should.have.property('azimuthRadians');
+                            msg.payload.should.have.property('altitudeRadians');
+                            msg.payload.should.have.property('zenithRadians');
+                            msg.payload.should.have.property('lastUpdateStr', '2020-01-01T13:00:00');
+                            msg.payload.should.have.property('lastUpdate');
+                            msg.payload.should.have.property('lastUpdate');
+                            msg.payload.should.have.property('lastUpdate');
+                            should(msg.payload.azimuth).be.equal(msg.payload.azimuthDegrees);
+                            should(msg.payload.altitude).be.equal(msg.payload.altitudeDegrees);
+                            msg.payload.should.have.property('times');
+                            for (let index = 0; index < sunPositions.length; index++) {
+                                const sp = sunPositions[index];
+                                msg.payload.times.should.have.property(sp);
+                                msg.payload.times[sp].should.have.property('value');
+                                msg.payload.times[sp].should.have.property('ts');
+                                msg.payload.times[sp].should.have.property('name', sp);
+                                msg.payload.times[sp].should.have.property('julian');
+                                msg.payload.times[sp].should.have.property('valid');
+                                msg.payload.times[sp].should.have.property('pos');
+                            }
+                            msg.payload.should.have.property('posChanged');
+                            done();
+                        } catch (err) {
+                            done(err);
+                        }
+                    });
+                    // '289.59/-7.49 - 5.4.2022 20:41:34'
+                    n1.receive({ts:Date.UTC(2020,0, 1, 12, 0, 0)});
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('message passing - own position', function(done) {
+            // this.timeout(5000); // have to wait for the inject with delay of two seconds
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'moon-position',
+                    name: 'moon position',
+                    z: 'flow',
+                    positionConfig: 'nc1',
+                    rules: [],
+                    onlyOnChange: 'true',
+                    topic: 'test4',
+                    outputs: 1,
+                    wires: [['n2']]
+                }, cfgNode, hlpNode, tabNode];
+            helper.load([nodeConfig, nodeMoonPosition], flow, credentials, () => {
+                const n1 = helper.getNode('n1'); // inject node
+                // const nc1 = helper.getNode('nc1'); // inject node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.should.have.property('name', 'moon position');
+
+                    n2.on('input', function (msg) {
+                        try {
+                            n1.error.should.not.be.called();
+                            n1.warn.should.not.be.called();
+                            n1.status.should.be.calledTwice(); // on startup config node + node itself + on message recive
+                            msg.should.have.property('topic', 'test4');
+                            msg.should.have.property('payload');
+                            msg.payload.should.have.property('ts', 1577880000000);
+                            msg.payload.should.have.property('latitude',40.5);
+                            msg.payload.should.have.property('longitude',10);
+                            msg.payload.should.have.property('height', 0);
+                            msg.payload.should.have.property('angleType','deg');
+                            msg.payload.should.have.property('azimuth', 189.26870091794416);
+                            msg.payload.should.have.property('altitude', 25.893939119327335);
+                            msg.payload.should.have.property('zenith',64.10606088067266);
+                            msg.payload.should.have.property('azimuthDegrees');
+                            msg.payload.should.have.property('altitudeDegrees');
+                            msg.payload.should.have.property('zenithDegrees');
+                            msg.payload.should.have.property('azimuthRadians');
+                            msg.payload.should.have.property('altitudeRadians');
+                            msg.payload.should.have.property('zenithRadians');
+                            msg.payload.should.have.property('lastUpdateStr', '2020-01-01T13:00:00');
+                            msg.payload.should.have.property('lastUpdate');
+                            msg.payload.should.have.property('lastUpdate');
+                            msg.payload.should.have.property('lastUpdate');
+                            should(msg.payload.azimuth).be.equal(msg.payload.azimuthDegrees);
+                            should(msg.payload.altitude).be.equal(msg.payload.altitudeDegrees);
+                            msg.payload.should.have.property('times');
+                            for (let index = 0; index < sunPositions.length; index++) {
+                                const sp = sunPositions[index];
+                                msg.payload.times.should.have.property(sp);
+                                msg.payload.times[sp].should.have.property('value');
+                                msg.payload.times[sp].should.have.property('ts');
+                                msg.payload.times[sp].should.have.property('name', sp);
+                                msg.payload.times[sp].should.have.property('julian');
+                                msg.payload.times[sp].should.have.property('valid');
+                                msg.payload.times[sp].should.have.property('pos');
+                            }
+                            msg.payload.should.have.property('posChanged');
+                            done();
+                        } catch (err) {
+                            done(err);
+                        }
+                    });
+                    // '289.59/-7.49 - 5.4.2022 20:41:34'
+                    n1.receive({
+                        ts          : Date.UTC(2020,0, 1, 12, 0, 0),
+                        latitude    : 40.5,
+                        longitude   : 10
+                    });
+                } catch (err) {
+                    done(err);
+                }
+            });
+        });
+/* */
+        it('test of rules / multiple outputs', function(done) {
+            this.skip();
+        });
+
+        it('test needs to be implemented', function() {
+            this.skip();
+        });
+    });
+});
\ No newline at end of file
diff --git a/test/60-time-comp_spec.js b/test/60-time-comp_spec.js
index 34af4a46..32ea5db0 100644
--- a/test/60-time-comp_spec.js
+++ b/test/60-time-comp_spec.js
@@ -171,8 +171,10 @@ describe('time-comp node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -225,8 +227,10 @@ describe('time-comp node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -279,8 +283,10 @@ describe('time-comp node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -333,8 +339,10 @@ describe('time-comp node', function() {
                 const nc1 = helper.getNode('nc1');
                 try {
                     n1.status.should.be.called();
-                    n1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
                     nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
                     done();
                 } catch(err) {
                     done(err);
@@ -599,6 +607,7 @@ describe('time-comp node', function() {
                 });
             });
         });
+
         it('test needs to be implemented', function() {
             this.skip();
         });
diff --git a/test/61-time-span_spec.js b/test/61-time-span_spec.js
new file mode 100644
index 00000000..ccf55ce4
--- /dev/null
+++ b/test/61-time-span_spec.js
@@ -0,0 +1,582 @@
+/* eslint-disable no-template-curly-in-string */
+/* eslint-disable require-jsdoc */
+/* eslint-disable prefer-arrow-callback */
+/* eslint-disable no-unused-vars */
+/*
+ * This code is licensed under the Apache License Version 2.0.
+ *
+ * Copyright (c) 2022 Robert Gester
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ */
+/* global Context context describe beforeEach before afterEach after it */
+
+/**
+ * Test cases for delay until node
+ *
+ * @example:
+ * to run all tests: npm test
+ * to run only testcases: npm run testnode
+ * to run single test: mocha -g "time-span"
+ */
+
+const should = require('should');
+const sinon = require('sinon');
+require('should-sinon');
+
+const helper = require('node-red-node-test-helper');
+
+// Nodes
+const nodeConfig = require('../nodes/10-position-config.js');
+const nodeTimeSpan = require('../nodes/61-time-span.js');
+
+helper.init(require.resolve('node-red'));
+
+const credentials = {'nc1': {'posLatitude': '51.16406769771653', 'posLongitude': '10.447609909242438'}};
+const cfgNode = {
+    id: 'nc1',
+    type: 'position-config',
+    name: 'Mitte von Deutschland',
+    isValide: 'true',
+    angleType: 'deg',
+    timeZoneOffset: '99',
+    timeZoneDST: '0',
+    stateTimeFormat: '3',
+    stateDateFormat: '12',
+    contextStore: ''
+};
+const tabNode = {id: 'flow', type: 'tab', label: 'FLOW' };
+const hlpNode1 = {id: 'n2', type: 'helper'};
+const hlpNode2 = {id: 'n3', type: 'helper'};
+
+describe('time-span node', function() {
+    beforeEach(function (done) {
+        helper.startServer(done);
+    });
+
+    afterEach(function (done) {
+        helper.unload().then(function () {
+            helper.stopServer(done);
+        });
+    });
+
+    describe('test configuration (time-span)', function() {
+        it('fail if missing configuration ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-span',
+                    outputs: 1,
+                    name: '',
+                    positionConfig: '',
+                    operand1: '',
+                    operand1Type: 'date',
+                    operand1Format: '0',
+                    operand1Offset: 0,
+                    operand1OffsetType: 'none',
+                    operand1OffsetMultiplier: 60000,
+                    operand2: 'payload',
+                    operand2Type: 'msg',
+                    operand2Format: 'dd.MM.yyyy HH:mm:ss',
+                    operand2Offset: 0,
+                    operand2OffsetType: 'none',
+                    operand2OffsetMultiplier: 60000,
+                    rules: [],
+                    checkall: 'true',
+                    results: [{
+                        p: '',
+                        pt: 'msgPayload',
+                        v: '',
+                        vt: 'timespan',
+                        o: '',
+                        oT: 'none',
+                        oM: '60000',
+                        fTs: 1,
+                        fTsS: 1,
+                        fTsT: 'Sekunden',
+                        fTsI: '1',
+                        f: 0,
+                        fS: 0,
+                        fT: 'Millisekunden UNIX-Zeit',
+                        fI: '0',
+                        next: false,
+                        days: '',
+                        months: '',
+                        onlyEvenDays: false,
+                        onlyOddDays: false
+                    }],
+                    wires: [['n2']]
+                }, cfgNode, hlpNode1];
+            helper.load([nodeConfig, nodeTimeSpan], flow, credentials, function() {
+                const n1 = helper.getNode('n1'); // time-comp node
+                const n2 = helper.getNode('n2'); // helper node
+                try {
+                    n1.status.should.be.calledOnce();
+                    n1.error.should.be.calledOnce().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if latitude missing ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-span',
+                    outputs: 1,
+                    name: '',
+                    positionConfig: 'nc1',
+                    operand1: '',
+                    operand1Type: 'date',
+                    operand1Format: '0',
+                    operand1Offset: 0,
+                    operand1OffsetType: 'none',
+                    operand1OffsetMultiplier: 60000,
+                    operand2: 'payload',
+                    operand2Type: 'msg',
+                    operand2Format: 'dd.MM.yyyy HH:mm:ss',
+                    operand2Offset: 0,
+                    operand2OffsetType: 'none',
+                    operand2OffsetMultiplier: 60000,
+                    rules: [],
+                    checkall: 'true',
+                    results: [{
+                        p: '',
+                        pt: 'msgPayload',
+                        v: '',
+                        vt: 'timespan',
+                        o: '',
+                        oT: 'none',
+                        oM: '60000',
+                        fTs: 1,
+                        fTsS: 1,
+                        fTsT: 'Sekunden',
+                        fTsI: '1',
+                        f: 0,
+                        fS: 0,
+                        fT: 'Millisekunden UNIX-Zeit',
+                        fI: '0',
+                        next: false,
+                        days: '',
+                        months: '',
+                        onlyEvenDays: false,
+                        onlyOddDays: false
+                    }],
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLongitude': '10'}};
+            helper.load([nodeConfig, nodeTimeSpan], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if longitude missing ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-span',
+                    outputs: 1,
+                    name: '',
+                    positionConfig: 'nc1',
+                    operand1: '',
+                    operand1Type: 'date',
+                    operand1Format: '0',
+                    operand1Offset: 0,
+                    operand1OffsetType: 'none',
+                    operand1OffsetMultiplier: 60000,
+                    operand2: 'payload',
+                    operand2Type: 'msg',
+                    operand2Format: 'dd.MM.yyyy HH:mm:ss',
+                    operand2Offset: 0,
+                    operand2OffsetType: 'none',
+                    operand2OffsetMultiplier: 60000,
+                    rules: [],
+                    checkall: 'true',
+                    results: [{
+                        p: '',
+                        pt: 'msgPayload',
+                        v: '',
+                        vt: 'timespan',
+                        o: '',
+                        oT: 'none',
+                        oM: '60000',
+                        fTs: 1,
+                        fTsS: 1,
+                        fTsT: 'Sekunden',
+                        fTsI: '1',
+                        f: 0,
+                        fS: 0,
+                        fT: 'Millisekunden UNIX-Zeit',
+                        fI: '0',
+                        next: false,
+                        days: '',
+                        months: '',
+                        onlyEvenDays: false,
+                        onlyOddDays: false
+                    }],
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '5'}};
+            helper.load([nodeConfig, nodeTimeSpan], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if latitude invalid ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-span',
+                    outputs: 1,
+                    name: '',
+                    positionConfig: 'nc1',
+                    operand1: '',
+                    operand1Type: 'date',
+                    operand1Format: '0',
+                    operand1Offset: 0,
+                    operand1OffsetType: 'none',
+                    operand1OffsetMultiplier: 60000,
+                    operand2: 'payload',
+                    operand2Type: 'msg',
+                    operand2Format: 'dd.MM.yyyy HH:mm:ss',
+                    operand2Offset: 0,
+                    operand2OffsetType: 'none',
+                    operand2OffsetMultiplier: 60000,
+                    rules: [],
+                    checkall: 'true',
+                    results: [{
+                        p: '',
+                        pt: 'msgPayload',
+                        v: '',
+                        vt: 'timespan',
+                        o: '',
+                        oT: 'none',
+                        oM: '60000',
+                        fTs: 1,
+                        fTsS: 1,
+                        fTsT: 'Sekunden',
+                        fTsI: '1',
+                        f: 0,
+                        fS: 0,
+                        fT: 'Millisekunden UNIX-Zeit',
+                        fI: '0',
+                        next: false,
+                        days: '',
+                        months: '',
+                        onlyEvenDays: false,
+                        onlyOddDays: false
+                    }],
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '90.1',  'posLongitude': '10'}};
+            helper.load([nodeConfig, nodeTimeSpan], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.latitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('fail if longitude invalid ', done => {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-span',
+                    outputs: 1,
+                    name: '',
+                    positionConfig: 'nc1',
+                    operand1: '',
+                    operand1Type: 'date',
+                    operand1Format: '0',
+                    operand1Offset: 0,
+                    operand1OffsetType: 'none',
+                    operand1OffsetMultiplier: 60000,
+                    operand2: 'payload',
+                    operand2Type: 'msg',
+                    operand2Format: 'dd.MM.yyyy HH:mm:ss',
+                    operand2Offset: 0,
+                    operand2OffsetType: 'none',
+                    operand2OffsetMultiplier: 60000,
+                    rules: [],
+                    checkall: 'true',
+                    results: [{
+                        p: '',
+                        pt: 'msgPayload',
+                        v: '',
+                        vt: 'timespan',
+                        o: '',
+                        oT: 'none',
+                        oM: '60000',
+                        fTs: 1,
+                        fTsS: 1,
+                        fTsT: 'Sekunden',
+                        fTsI: '1',
+                        f: 0,
+                        fS: 0,
+                        fT: 'Millisekunden UNIX-Zeit',
+                        fI: '0',
+                        next: false,
+                        days: '',
+                        months: '',
+                        onlyEvenDays: false,
+                        onlyOddDays: false
+                    }],
+                    wires: [['n2']]
+                }, cfgNode];
+            const invalidCreds = {'nc1': { 'posLatitude': '51', 'posLongitude': '180.1'}};
+            helper.load([nodeConfig, nodeTimeSpan], flow, invalidCreds, function() {
+                const n1 = helper.getNode('n1');
+                const nc1 = helper.getNode('nc1');
+                try {
+                    n1.status.should.be.called();
+                    n1.error.should.be.called();
+                    n1.error.should.be.called().and.calledWith('node-red-contrib-sun-position/position-config:errors.config-error');
+                    nc1.error.should.be.called();
+                    nc1.error.should.be.called().and.calledWith('position-config.errors.longitude-missing');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('test if correctly loaded', function (done) {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-span',
+                    outputs: 1,
+                    name: 'time span',
+                    positionConfig: 'nc1',
+                    operand1: '',
+                    operand1Type: 'date',
+                    operand1Format: '0',
+                    operand1Offset: 0,
+                    operand1OffsetType: 'none',
+                    operand1OffsetMultiplier: 60000,
+                    operand2: 'payload',
+                    operand2Type: 'msg',
+                    operand2Format: 'dd.MM.yyyy HH:mm:ss',
+                    operand2Offset: 0,
+                    operand2OffsetType: 'none',
+                    operand2OffsetMultiplier: 60000,
+                    rules: [],
+                    checkall: 'true',
+                    results: [{
+                        p: '',
+                        pt: 'msgPayload',
+                        v: '',
+                        vt: 'timespan',
+                        o: '',
+                        oT: 'none',
+                        oM: '60000',
+                        fTs: 1,
+                        fTsS: 1,
+                        fTsT: 'Sekunden',
+                        fTsI: '1',
+                        f: 0,
+                        fS: 0,
+                        fT: 'Millisekunden UNIX-Zeit',
+                        fI: '0',
+                        next: false,
+                        days: '',
+                        months: '',
+                        onlyEvenDays: false,
+                        onlyOddDays: false
+                    }],
+                    wires: [['n2']]
+                }, cfgNode];
+
+            helper.load([nodeConfig, nodeTimeSpan], flow, credentials, function() {
+                const n1 = helper.getNode('n1');
+                try {
+                    n1.status.should.be.calledOnce();
+                    // should.not.exist(err);
+                    // should.exist(n1);
+                    n1.should.have.property('name', 'time span');
+                    n1.should.have.property('type', 'time-span');
+                    n1.should.have.property('positionConfig');
+
+                    n1.should.have.property('operand1');
+                    n1.operand1.should.have.property('type', 'date');
+                    n1.operand1.should.have.property('value', '');
+                    n1.operand1.should.have.property('format', '0');
+                    n1.operand1.should.have.property('offsetType', 'none');
+                    n1.operand1.should.have.property('offset', 0);
+                    n1.operand1.should.have.property('multiplier', 60000);
+
+                    n1.should.have.property('operand2');
+                    n1.operand2.should.have.property('type', 'msg');
+                    n1.operand2.should.have.property('value', 'payload');
+                    n1.operand2.should.have.property('format', 'dd.MM.yyyy HH:mm:ss');
+                    n1.operand2.should.have.property('offsetType', 'none');
+                    n1.operand2.should.have.property('offset', 0);
+                    n1.operand2.should.have.property('multiplier', 60000);
+
+                    n1.should.have.property('rules');
+                    n1.should.have.property('checkall', true);
+
+                    n1.should.have.property('results');
+                    n1.results.should.be.an.Array().length(1);
+                    n1.results[0].should.have.property('outType', 'msgPayload');
+                    n1.results[0].should.have.property('outValue', '');
+                    n1.results[0].should.have.property('type', 'timespan');
+                    n1.results[0].should.have.property('value', '');
+                    n1.results[0].should.have.property('format', 0);
+                    n1.results[0].should.have.property('offsetType', 'none');
+                    n1.results[0].should.have.property('offset', '');
+                    n1.results[0].should.have.property('multiplier', 60000);
+                    n1.results[0].should.have.property('next', false);
+                    n1.results[0].should.have.property('days');
+                    n1.results[0].should.have.property('months');
+                    n1.results[0].should.have.property('onlyEvenDays', false);
+                    n1.results[0].should.have.property('onlyOddDays', false);
+                    n1.results[0].should.have.property('onlyEvenWeeks', false);
+                    n1.results[0].should.have.property('onlyOddWeeks', false);
+                    /* */
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+    });
+
+    describe('test message passing', function() {
+        it('test basic message passing', function(done) {
+            const flow = [
+                {
+                    id: 'n1',
+                    type: 'time-span',
+                    z: 'flow',
+                    outputs: 2,
+                    name: 'timeDifferenz',
+                    positionConfig: 'nc1',
+                    operand1: '2021-02-21 00:00:00',
+                    operand1Type: 'dateEntered',
+                    operand1Format: '0',
+                    operand1Offset: 0,
+                    operand1OffsetType: 'none',
+                    operand1OffsetMultiplier: 60000,
+                    operand2: 'payload',
+                    operand2Type: 'msg',
+                    operand2Format: 'dd.MM.yyyy HH:mm:ss',
+                    operand2Offset: 0,
+                    operand2OffsetType: 'none',
+                    operand2OffsetMultiplier: 60000,
+                    rules: [{
+                        operator: '4',
+                        operatorText: '>=     (greater or equal)',
+                        operandType: 'num',
+                        operandValue: '10',
+                        multiplier: '3600000'
+                    }],
+                    checkall: 'true',
+                    results: [{
+                        p: '',
+                        pt: 'msgPayload',
+                        v: '',
+                        vt: 'timespan',
+                        fTs: 1
+                    },{
+                        p: '',
+                        pt: 'msgTopic',
+                        v: 'test-topic',
+                        vt: 'str'
+                    }],
+                    wires: [['n2'],['n3']]
+                }, cfgNode, hlpNode1, hlpNode2, tabNode];
+
+            helper.load([nodeConfig, nodeTimeSpan], flow, credentials, function() {
+                const n1 = helper.getNode('n1');
+                const n2 = helper.getNode('n2'); // helper node
+                const n3 = helper.getNode('n3'); // helper node
+                try {
+                    n1.status.should.be.calledOnce();
+                    // should.not.exist(err);
+                    // should.exist(n1);
+                    n1.should.have.property('name', 'timeDifferenz');
+                    n1.should.have.property('type', 'time-span');
+                    n1.should.have.property('positionConfig');
+                    let doneCnt =0;
+                    n2.on('input', function (msg) {
+                        try {
+                            msg.should.have.property('topic', 'test-topic');
+                            msg.should.have.property('payload', 36000);
+                            doneCnt++;
+                            if (doneCnt>1)
+                                done();
+                        } catch (err) {
+                            done(err);
+                        }
+                    });
+                    n3.on('input', function (msg) {
+                        try {
+                            msg.should.have.property('topic', 'test-topic');
+                            msg.should.have.property('payload', 36000);
+                            doneCnt++;
+                            if (doneCnt>1)
+                                done();
+                        } catch (err) {
+                            done(err);
+                        }
+                    });
+                    n1.receive({payload:'20.02.2021 14:00:00'});
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
+        it('test needs to be implemented', function() {
+            this.skip();
+        });
+    });
+
+});
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..6062bda0
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,23 @@
+{
+	// Change this to match your project
+	"include": ["./nodes/"],
+	"exclude": [],
+	"compilerOptions": {
+	  // Tells TypeScript to read JS files, as
+	  // normally they are ignored as source files
+	  "allowJs": true,
+	  // Generate d.ts files
+	  "declaration": true,
+	  // This compiler run should
+	  // only output d.ts files
+	  "emitDeclarationOnly": true,
+	  // Types should go into this directory.
+	  // Removing this would place the .d.ts files
+	  // next to the .js files
+	  "outDir": "./nodes/types",
+	  // go to js file when using IDE functions like
+	  // "Go to Definition" in VSCode
+	  "declarationMap": true,
+	  "lib": ["es2015"]
+	}
+  }
\ No newline at end of file