iobroker.javascript 7.9.3 → 7.9.4

package/README.md

@@ -46,6 +46,11 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
 <!--
 	### **WORK IN PROGRESS**
 -->
+### 7.9.4 (2024-03-20)
+
+* (klein0r) Fixed urlencoding for basic auth in url (user:pass)
+* (klein0r) Add warning icon if trigger is positioned inside of another trigger or loop
+
 ### 7.9.3 (2024-03-19)
 
 * (klein0r) Added timeout option for http blocks
@@ -69,12 +74,6 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
 * (klein0r) Raise warning if more than 100 triggers have been registered (per script)
 * (klein0r) Fixed astro state calculation (and display server time in dialog)
 
-### 7.8.0 (2024-01-29)
-
-* (klein0r) Added block for multiple or conditions
-* (klein0r) Raised supported ecmaVersion from es2018 to es2021
-* (klein0r) Fixed getIdByName (returned the same id as array)
-
 ## License
 The MIT License (MIT)
 

package/admin/asset-manifest.json

@@ -1,8 +1,8 @@
 {
   "files": {
-    "main.js": "/static/js/main.86e49ae9.js",
+    "main.js": "/static/js/main.333e4250.js",
     "static/css/184.7463f8b6.chunk.css": "/static/css/184.7463f8b6.chunk.css",
-    "static/js/184.2d8f4f6a.chunk.js": "/static/js/184.2d8f4f6a.chunk.js",
+    "static/js/184.e7ed24fc.chunk.js": "/static/js/184.e7ed24fc.chunk.js",
     "static/js/966.088c1225.chunk.js": "/static/js/966.088c1225.chunk.js",
     "static/js/30.8bf17a3b.chunk.js": "/static/js/30.8bf17a3b.chunk.js",
     "static/js/704.4ede9892.chunk.js": "/static/js/704.4ede9892.chunk.js",
@@ -32,7 +32,7 @@
     "static/js/9.1974e3b5.chunk.js": "/static/js/9.1974e3b5.chunk.js",
     "static/js/310.b6dfc5a1.chunk.js": "/static/js/310.b6dfc5a1.chunk.js",
     "static/js/360.10c9e6c6.chunk.js": "/static/js/360.10c9e6c6.chunk.js",
-    "static/js/77.97f379b6.chunk.js": "/static/js/77.97f379b6.chunk.js",
+    "static/js/77.b19f5770.chunk.js": "/static/js/77.b19f5770.chunk.js",
     "static/media/tileRules.png": "/static/media/tileRules.7ed5885a66686cc288b1.png",
     "static/media/docs.md": "/static/media/docs.1f96bec81cf08933d921.md",
     "static/media/back.jpg": "/static/media/back.bda2bbe51be338a0f657.jpg",
@@ -160,9 +160,9 @@
     "static/media/Garage Doors.svg": "/static/media/Garage Doors.0c2a1cfca7ad1ea59625.svg",
     "static/media/Outdoor Blinds.svg": "/static/media/Outdoor Blinds.37b85a9c060a4af48da9.svg",
     "static/media/Upstairs.svg": "/static/media/Upstairs.441813e54e0daca0882d.svg",
-    "main.86e49ae9.js.map": "/static/js/main.86e49ae9.js.map",
+    "main.333e4250.js.map": "/static/js/main.333e4250.js.map",
     "184.7463f8b6.chunk.css.map": "/static/css/184.7463f8b6.chunk.css.map",
-    "184.2d8f4f6a.chunk.js.map": "/static/js/184.2d8f4f6a.chunk.js.map",
+    "184.e7ed24fc.chunk.js.map": "/static/js/184.e7ed24fc.chunk.js.map",
     "966.088c1225.chunk.js.map": "/static/js/966.088c1225.chunk.js.map",
     "30.8bf17a3b.chunk.js.map": "/static/js/30.8bf17a3b.chunk.js.map",
     "704.4ede9892.chunk.js.map": "/static/js/704.4ede9892.chunk.js.map",
@@ -192,9 +192,9 @@
     "9.1974e3b5.chunk.js.map": "/static/js/9.1974e3b5.chunk.js.map",
     "310.b6dfc5a1.chunk.js.map": "/static/js/310.b6dfc5a1.chunk.js.map",
     "360.10c9e6c6.chunk.js.map": "/static/js/360.10c9e6c6.chunk.js.map",
-    "77.97f379b6.chunk.js.map": "/static/js/77.97f379b6.chunk.js.map"
+    "77.b19f5770.chunk.js.map": "/static/js/77.b19f5770.chunk.js.map"
   },
   "entrypoints": [
-    "static/js/main.86e49ae9.js"
+    "static/js/main.333e4250.js"
   ]
 }

package/admin/google-blockly/own/blocks_sendto.js

@@ -256,27 +256,27 @@ Blockly.Blocks['sendto_custom'] = {
                     names[i] = Blockly.Translate('sendto_custom_argument') + (i + 1);
                 }
                 _input.appendField(new Blockly.FieldTextInput(names[i]));
-                setTimeout(function (_input) {
-                    if (!_input.connection.isConnected()) {
+                setTimeout(function (input) {
+                    if (!input.connection.isConnected()) {
                         const _shadow = wp.newBlock('text');
                         _shadow.setShadow(true);
                         _shadow.initSvg();
                         _shadow.render();
-                        _shadow.outputConnection.connect(_input.connection);
+                        _shadow.outputConnection.connect(input.connection);
                         //console.log('New ' + names[i]);
                     }
                 }, 100, _input);
             } else {
                 _input.fieldRow[0].setValue(names[i]);
                 //console.log('Exist ' + names[i]);
-                setTimeout(function (_input, name) {
-                    if (!_input.connection.isConnected()) {
+                setTimeout(function (input, name) {
+                    if (!input.connection.isConnected()) {
                         //console.log('Create ' + name);
                         const shadow = wp.newBlock('text');
                         shadow.setShadow(true);
                         shadow.initSvg();
                         shadow.render();
-                        shadow.outputConnection.connect(_input.connection);
+                        shadow.outputConnection.connect(input.connection);
                     }
                 }, 100, _input, names[i]);
             }

package/admin/google-blockly/own/blocks_trigger.js

@@ -9,10 +9,14 @@ if (typeof goog !== 'undefined') {
 Blockly.CustomBlocks = Blockly.CustomBlocks || [];
 Blockly.CustomBlocks.push('Trigger');
 
-
 Blockly.Trigger = {
     HUE: 330,
     blocks: {},
+    WARNING_PARENTS: [
+        'on', 'on_ext', 'schedule', 'schedule_by_id', 'schedule_create', 'astro', 'onMessage', 'onFile', // trigger blocks
+        'timeouts_setinterval', 'timeouts_setinterval_variable', // timeouts
+        'controls_repeat_ext', 'controls_repeat_ext', 'controls_for', 'controls_forEach', // loops
+    ],
 };
 
 // --- ON Extended-----------------------------------------------------------
@@ -207,21 +211,21 @@ Blockly.Blocks['on_ext'] = {
                 if (i === 0) {
                     _input.appendField(Blockly.Translate('on_ext'));
                 }
-                setTimeout((_input) => {
-                    if (!_input.connection.isConnected()) {
+                setTimeout((input) => {
+                    if (!input.connection.isConnected()) {
                         const shadow = wp.newBlock('field_oid');
                         shadow.setShadow(true);
-                        shadow.outputConnection.connect(_input.connection);
+                        shadow.outputConnection.connect(input.connection);
                         shadow.initSvg();
                         shadow.render();
                     }
                 }, 100, _input);
             } else {
-                setTimeout((_input) => {
-                    if (!_input.connection.isConnected()) {
+                setTimeout((input) => {
+                    if (!input.connection.isConnected()) {
                         const shadow = wp.newBlock('field_oid');
                         shadow.setShadow(true);
-                        shadow.outputConnection.connect(_input.connection);
+                        shadow.outputConnection.connect(input.connection);
                         shadow.initSvg();
                         shadow.render();
                     }
@@ -267,6 +271,30 @@ Blockly.Blocks['on_ext'] = {
             this.appendStatementInput('STATEMENT')
                 .setCheck(null)
         }
+    },
+    /**
+     * Called whenever anything on the workspace changes.
+     * Add warning if this flow block is not nested inside a loop.
+     * @param {!Blockly.Events.Abstract} e Change event.
+     * @this Blockly.Block
+     */
+    onchange: function(e) {
+        let legal = true;
+
+        // Is the block nested in a trigger?
+        let block = this;
+        while (block = block.getSurroundParent()) {
+            if (block && Blockly.Trigger.WARNING_PARENTS.includes(block.type)) {
+                legal = false;
+                break;
+            }
+        }
+
+        if (legal) {
+            this.setWarningText(null, this.id);
+        } else {
+            this.setWarningText(Blockly.Translate('trigger_in_trigger_warning'), this.id);
+        }
     }
 };
 Blockly.JavaScript['on_ext'] = function(block) {
@@ -353,6 +381,30 @@ Blockly.Blocks['on'] = {
         this.setColour(Blockly.Trigger.HUE);
         this.setTooltip(Blockly.Translate('on_tooltip'));
         this.setHelpUrl(getHelp('on_help'));
+    },
+    /**
+     * Called whenever anything on the workspace changes.
+     * Add warning if this flow block is not nested inside a loop.
+     * @param {!Blockly.Events.Abstract} e Change event.
+     * @this Blockly.Block
+     */
+    onchange: function(e) {
+        let legal = true;
+
+        // Is the block nested in a trigger?
+        let block = this;
+        while (block = block.getSurroundParent()) {
+            if (block && Blockly.Trigger.WARNING_PARENTS.includes(block.type)) {
+                legal = false;
+                break;
+            }
+        }
+
+        if (legal) {
+            this.setWarningText(null, this.id);
+        } else {
+            this.setWarningText(Blockly.Translate('trigger_in_trigger_warning'), this.id);
+        }
     }
 };
 Blockly.JavaScript['on'] = function(block) {
@@ -500,6 +552,30 @@ Blockly.Blocks['schedule'] = {
         this.setColour(Blockly.Trigger.HUE);
         this.setTooltip(Blockly.Translate('schedule_tooltip'));
         this.setHelpUrl(getHelp('schedule_help'));
+    },
+    /**
+     * Called whenever anything on the workspace changes.
+     * Add warning if this flow block is not nested inside a loop.
+     * @param {!Blockly.Events.Abstract} e Change event.
+     * @this Blockly.Block
+     */
+    onchange: function(e) {
+        let legal = true;
+
+        // Is the block nested in a trigger?
+        let block = this;
+        while (block = block.getSurroundParent()) {
+            if (block && Blockly.Trigger.WARNING_PARENTS.includes(block.type)) {
+                legal = false;
+                break;
+            }
+        }
+
+        if (legal) {
+            this.setWarningText(null, this.id);
+        } else {
+            this.setWarningText(Blockly.Translate('trigger_in_trigger_warning'), this.id);
+        }
     }
 };
 Blockly.JavaScript['schedule'] = function(block) {
@@ -620,6 +696,30 @@ Blockly.Blocks['astro'] = {
         this.setColour(Blockly.Trigger.HUE);
         this.setTooltip(Blockly.Translate('astro_tooltip'));
         this.setHelpUrl(getHelp('astro_help'));
+    },
+    /**
+     * Called whenever anything on the workspace changes.
+     * Add warning if this flow block is not nested inside a loop.
+     * @param {!Blockly.Events.Abstract} e Change event.
+     * @this Blockly.Block
+     */
+    onchange: function(e) {
+        let legal = true;
+
+        // Is the block nested in a trigger?
+        let block = this;
+        while (block = block.getSurroundParent()) {
+            if (block && Blockly.Trigger.WARNING_PARENTS.includes(block.type)) {
+                legal = false;
+                break;
+            }
+        }
+
+        if (legal) {
+            this.setWarningText(null, this.id);
+        } else {
+            this.setWarningText(Blockly.Translate('trigger_in_trigger_warning'), this.id);
+        }
     }
 };
 Blockly.JavaScript['astro'] = function(block) {
@@ -734,14 +834,6 @@ Blockly.Blocks['schedule_create'] = {
         this.setColour(Blockly.Trigger.HUE);
         this.setTooltip(Blockly.Translate('schedule_create_tooltip'));
         this.setHelpUrl(getHelp('schedule_create_help'));
-    },
-    isSchedule_: true,
-    getVars: function () {
-        return [this.getFieldValue('NAME')];
-    },
-    getVarModels: function () {
-        const name = this.getFieldValue('NAME');
-        return [{ getId: () => { return name; }, name: name, type: 'cron' }];
     }
 };
 
@@ -750,7 +842,7 @@ Blockly.JavaScript['schedule_create'] = function (block) {
     const schedule = Blockly.JavaScript.valueToCode(block, 'SCHEDULE', Blockly.JavaScript.ORDER_ATOMIC);
     const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
 
-    return name + ' = schedule(' + schedule + ', async () => {\n' +
+    return `${name} = schedule(${schedule}, async () => {\n` +
         statement +
         '});\n';
 };
@@ -783,8 +875,8 @@ Blockly.Trigger.getAllSchedules = function (workspace) {
 
 Blockly.Trigger.blocks['schedule_clear'] =
     '<block type="schedule_clear">'
-    + '     <value name="NAME">'
-    + '     </value>'
+    + '    <value name="NAME">'
+    + '    </value>'
     + '</block>';
 
 Blockly.Blocks['schedule_clear'] = {
@@ -834,7 +926,7 @@ Blockly.Blocks['field_cron'] = {
 
 Blockly.JavaScript['field_cron'] = function(block) {
     const cron = block.getFieldValue('CRON');
-    return [`'${cron}'`, Blockly.JavaScript.ORDER_ATOMIC]
+    return [`'${cron}'`, Blockly.JavaScript.ORDER_ATOMIC];
 };
 
 // --- CRON builder --------------------------------------------------
@@ -874,60 +966,60 @@ Blockly.Blocks['cron_builder'] = {
 
         const wp = this.workspace;
 
-        setTimeout((_input) => {
-            if (!_input.connection.isConnected()) {
+        setTimeout((input) => {
+            if (!input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
                 _shadow.setShadow(true);
                 _shadow.setFieldValue('*', 'TEXT');
-                _shadow.outputConnection.connect(_input.connection);
+                _shadow.outputConnection.connect(input.connection);
             }
         }, 100, _input);
 
         _input = this.appendValueInput('MONTHS')
             .appendField(Blockly.Translate('cron_builder_month'));
 
-        setTimeout((_input) => {
-            if (!_input.connection.isConnected()) {
+        setTimeout((input) => {
+            if (!input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
                 _shadow.setShadow(true);
                 _shadow.setFieldValue('*', 'TEXT');
-                _shadow.outputConnection.connect(_input.connection);
+                _shadow.outputConnection.connect(input.connection);
             }
         }, 100, _input);
 
         _input = this.appendValueInput('DAYS')
             .appendField(Blockly.Translate('cron_builder_day'));
 
-        setTimeout((_input) => {
-            if (!_input.connection.isConnected()) {
+        setTimeout((input) => {
+            if (!input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
                 _shadow.setShadow(true);
                 _shadow.setFieldValue('*', 'TEXT');
-                _shadow.outputConnection.connect(_input.connection);
+                _shadow.outputConnection.connect(input.connection);
             }
         }, 100, _input);
 
         _input = this.appendValueInput('HOURS')
             .appendField(Blockly.Translate('cron_builder_hour'));
 
-        setTimeout((_input) => {
-            if (!_input.connection.isConnected()) {
+        setTimeout((input) => {
+            if (!input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
                 _shadow.setShadow(true);
                 _shadow.setFieldValue('*', 'TEXT');
-                _shadow.outputConnection.connect(_input.connection);
+                _shadow.outputConnection.connect(input.connection);
             }
         }, 100, _input);
 
         _input = this.appendValueInput('MINUTES')
             .appendField(Blockly.Translate('cron_builder_minutes'));
 
-        setTimeout((_input) => {
-            if (!_input.connection.isConnected()) {
+        setTimeout((input) => {
+            if (!input.connection.isConnected()) {
                 const _shadow = wp.newBlock('text');
                 _shadow.setShadow(true);
                 _shadow.setFieldValue('*', 'TEXT');
-                _shadow.outputConnection.connect(_input.connection);
+                _shadow.outputConnection.connect(input.connection);
             }
         }, 100, _input);
 
@@ -978,14 +1070,14 @@ Blockly.Blocks['cron_builder'] = {
                 const _input = this.appendValueInput('SECONDS');
                 _input.appendField(Blockly.Translate('cron_builder_seconds'));
                 const wp = this.workspace;
-                setTimeout((_input) => {
-                    if (!_input.connection.isConnected()) {
+                setTimeout((input) => {
+                    if (!input.connection.isConnected()) {
                         const _shadow = wp.newBlock('text');
                         _shadow.setShadow(true);
                         _shadow.setFieldValue('*', 'TEXT');
                         _shadow.initSvg();
                         _shadow.render();
-                        _shadow.outputConnection.connect(_input.connection);
+                        _shadow.outputConnection.connect(input.connection);
                     }
                 }, 100, _input);
             }
@@ -1045,6 +1137,30 @@ Blockly.Blocks['onMessage'] = {
         this.setColour(Blockly.Trigger.HUE);
         this.setTooltip(Blockly.Translate('onMessage_tooltip'));
         this.setHelpUrl(getHelp('onMessage_help'));
+    },
+    /**
+     * Called whenever anything on the workspace changes.
+     * Add warning if this flow block is not nested inside a loop.
+     * @param {!Blockly.Events.Abstract} e Change event.
+     * @this Blockly.Block
+     */
+    onchange: function(e) {
+        let legal = true;
+
+        // Is the block nested in a trigger?
+        let block = this;
+        while (block = block.getSurroundParent()) {
+            if (block && Blockly.Trigger.WARNING_PARENTS.includes(block.type)) {
+                legal = false;
+                break;
+            }
+        }
+
+        if (legal) {
+            this.setWarningText(null, this.id);
+        } else {
+            this.setWarningText(Blockly.Translate('trigger_in_trigger_warning'), this.id);
+        }
     }
 };
 
@@ -1100,6 +1216,30 @@ Blockly.Blocks['onFile'] = {
         this.setColour(Blockly.Trigger.HUE);
         this.setTooltip(Blockly.Translate('onFile_tooltip'));
         this.setHelpUrl(getHelp('onFile_help'));
+    },
+    /**
+     * Called whenever anything on the workspace changes.
+     * Add warning if this flow block is not nested inside a loop.
+     * @param {!Blockly.Events.Abstract} e Change event.
+     * @this Blockly.Block
+     */
+    onchange: function(e) {
+        let legal = true;
+
+        // Is the block nested in a trigger?
+        let block = this;
+        while (block = block.getSurroundParent()) {
+            if (block && Blockly.Trigger.WARNING_PARENTS.includes(block.type)) {
+                legal = false;
+                break;
+            }
+        }
+
+        if (legal) {
+            this.setWarningText(null, this.id);
+        } else {
+            this.setWarningText(Blockly.Translate('trigger_in_trigger_warning'), this.id);
+        }
     }
 };
 

package/admin/google-blockly/own/blocks_words.js

@@ -411,6 +411,8 @@ Blockly.Words['timeouts_getinterval_help']            = {'en': 'getinterval',
 // --- TRIGGER --------------------------------------------------
 Blockly.Words['Trigger']                              = {'en': 'Trigger',                                         'de': 'Trigger',                                         'ru': 'События',                                         'pt': 'Trigger',                                         'nl': 'In gang zetten',                                  'fr': 'Déclencheur',                                     'it': 'Grilletto',                                       'es': 'Desencadenar',                                    'pl': 'Trigger',                                         'zh-cn': '触发',                                              'uk': 'Тригер'};
 
+Blockly.Words['trigger_in_trigger_warning']           = {'en': 'This may create a lot of triggers',               'de': 'Dies kann eine Menge Auslöser erstellen',         'ru': 'Это может создать много триггеров',               'pt': 'Isso pode criar muitos gatilhos',                 'nl': 'Dit kan veel triggers creëren',                   'fr': 'Cela peut créer beaucoup de déclencheurs',        'it': 'Questo può creare un sacco di trigger',           'es': 'Esto puede crear muchos desencadenantes',         'pl': 'To może stworzyć wiele wyzwalaczy',               'zh-cn': '这会造成很多触发器',                                   'uk': 'Це може створити багато райдерів'};
+
 // --- trigger on --------------------------------------------------
 Blockly.Words['on_onchange']                          = {'en': 'was changed',                                     'de': 'wurde geändert',                                  'ru': 'изменился',                                       'pt': 'foi alterado',                                    'nl': 'was veranderd',                                   'fr': 'a été changé',                                    'it': 'era cambiato',                                    'es': 'fue cambiado',                                    'pl': 'was changed',                                     'zh-cn': '已改变',                                             'uk': 'було змінено'};
 Blockly.Words['on_any']                               = {'en': 'was updated',                                     'de': 'wurde aktualisiert',                              'ru': 'обновился',                                       'pt': 'foi atualizado',                                  'nl': 'is geupdated',                                    'fr': 'a été mis à jour',                                'it': 'è stato aggiornato',                              'es': 'fue actualizado',                                 'pl': 'was updated',                                     'zh-cn': '已更新',                                             'uk': 'було оновлено'};