### 4.6.2 (2020-05-13)

* (bluefox) Corrected blockly blocks: request, exec

Author: GermanBluefox

README.md

@@ -33,6 +33,9 @@ And then call "npm run build".
 - ...
 
 ## Changelog
+### 4.6.2 (2020-05-13)
+* (bluefox) Corrected block: request, exec
+
 ### 4.6.1 (2020-05-11)
 * (bluefox) Updated blockly to 3.20200402.1
 * (bluefox) Added to blockly the switch/case block. 

io-package.json

@@ -1,7 +1,7 @@
 {
     "common": {
         "name": "javascript",
-        "version": "4.6.1",
+        "version": "4.6.2",
         "title": "Script Engine",
         "titleLang": {
             "en": "Script Engine",
@@ -22,6 +22,18 @@
             "AlCalzone"
         ],
         "news": {
+            "4.6.2": {
+                "en": "Corrected block: request, exec",
+                "de": "Korrigierter Block: Anfrage, Exec",
+                "ru": "Исправленный блок: запрос, exec",
+                "pt": "Bloco corrigido: solicitação, exec",
+                "nl": "Gecorrigeerd blok: verzoek, exec",
+                "fr": "Bloc corrigé: demande, exécut",
+                "it": "Blocco corretto: richiesta, esec",
+                "es": "Bloque corregido: solicitud, ejecutivo",
+                "pl": "Poprawiony blok: żądanie, wykon",
+                "zh-cn": "更正的块：请求，执行"
+            },
             "4.6.1": {
                 "en": "Updated blockly to 3.20200402.1\nAdded to blockly the switch/case block\ncreateState and deleteState now also support 0_userdata.0 states",
                 "de": "Blockweise auf 3.20200402.1 aktualisiert\nHinzugefügt, um den Schalter- / Gehäuseblock zu blockieren\ncreateState und deleteState unterstützen jetzt auch die Zustände 0_userdata.0",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.javascript",
-    "version": "4.6.1",
+    "version": "4.6.2",
     "description": "Javascript/Coffescript Script Engine for ioBroker",
     "author": "bluefox <dogafox@gmail.com>",
     "contributors": [
@@ -30,7 +30,7 @@
     },
     "dependencies": {
         "@iobroker/adapter-core": "^2.4.0",
-        "@types/node": "^12.12.38",
+        "@types/node": "^14.0.1",
         "@types/request": "^2.48.4",
         "coffee-compiler": "^0.3.2",
         "coffee-script": "^1.12.7",
@@ -39,7 +39,7 @@
         "request": "^2.88.2",
         "semver": "^7.3.2",
         "suncalc2": "^1.8.1",
-        "typescript": "^3.8.3",
+        "typescript": "^3.9.2",
         "virtual-tsc": "^0.5.0",
         "wake_on_lan": "^1.0.0"
     },
@@ -48,7 +48,7 @@
         "alcalzone-shared": "^2.2.0",
         "chai": "^4.2.0",
         "del": "^5.1.0",
-        "eslint": "^7.0.0",
+        "eslint": "^6.6.0",
         "gulp": "^4.0.2",
         "gulp-connect": "^5.7.0",
         "gulp-exec": "^4.0.0",

src/package.json

@@ -1,23 +1,23 @@
 {
   "name": "js",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "^4.9.11",
-    "@iobroker/adapter-react": "^0.3.8",
+    "@material-ui/core": "^4.9.14",
+    "@iobroker/adapter-react": "^0.4.4",
     "@sentry/browser": "^5.15.5",
     "@sentry/integrations": "^5.15.5",
     "classnames": "^2.2.6",
-    "cronstrue": "^1.93.0",
-    "eslint": "^6.8.0",
+    "cronstrue": "^1.94.0",
+    "eslint": "^6.6.0",
     "monaco-editor": "^0.20.0",
     "react": "^16.13.1",
     "react-beautiful-dnd": "^13.0.0",
     "react-bem-helper": "^1.4.1",
     "react-dom": "^16.13.1",
-    "react-dropzone": "^10.2.2",
+    "react-dropzone": "^11.0.1",
     "react-fullscreen": "^0.1.0",
-    "react-i18next": "^11.3.5",
+    "react-i18next": "^11.4.0",
     "react-icons": "^3.10.0",
     "react-monaco-editor": "^0.36.0",
     "react-scripts": "^3.4.1",
@@ -41,4 +41,4 @@
     "not op_mini all"
   ],
   "devDependencies": {}
-}
+}

src/public/google-blockly/own/blocks_action.js

@@ -41,7 +41,7 @@ Blockly.Blocks['exec'] = {
         this.appendDummyInput('WITH_STATEMENT')
             .appendField(Blockly.Translate('exec_statement'))
             .appendField(new Blockly.FieldCheckbox('FALSE', function (option) {
-                var delayInput = (option == true);
+                var delayInput = option === true || option === 'true' || option === 'TRUE';
                 this.sourceBlock_.updateShape_(delayInput);
             }), 'WITH_STATEMENT');
 
@@ -69,7 +69,7 @@ Blockly.Blocks['exec'] = {
         return container;
     },
     domToMutation: function(xmlElement) {
-        this.updateShape_(xmlElement.getAttribute('with_statement') == 'true');
+        this.updateShape_(xmlElement.getAttribute('with_statement') === 'true');
     },
     updateShape_: function(withStatement) {
         // Add or remove a statement Input.
@@ -138,7 +138,7 @@ Blockly.Blocks['request'] = {
         this.appendDummyInput('WITH_STATEMENT')
             .appendField(Blockly.Translate('request_statement'))
             .appendField(new Blockly.FieldCheckbox('FALSE', function (option) {
-                var delayInput = (option == true);
+                var delayInput = option === true || option === 'true' || option === 'TRUE';
                 this.sourceBlock_.updateShape_(delayInput);
             }), 'WITH_STATEMENT');
 

src/public/index.html

@@ -10,7 +10,18 @@
       homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <script type="text/javascript" src="vendor/socket.io.js"></script>
+    <script>
+      var script = document.createElement('script');
+      window.registerSocketOnLoad = function (cb) {
+          window.socketLoadedHandler = cb;
+      };
+      script.onload = function () { 
+          typeof window.socketLoadedHandler === 'function' && window.socketLoadedHandler(); 
+      };
+      script.src = window.location.port === '3000' ? window.location.protocol + '//' + window.location.hostname + ':8081/lib/js/socket.io.js' : '%PUBLIC_URL%/../../lib/js/socket.io.js';
+
+      document.head.appendChild(script);
+    </script>
     <!--
        Notice the use of %PUBLIC_URL% in the tags above.
        It will be replaced with the URL of the `public` folder during the build.

src/public/vendor/socket.io.js

@@ -171,6 +171,7 @@ class App extends Component {
             onReady: (objects, scripts) => {
                 I18n.setLanguage(this.socket.systemLang);
                 window.systemLang = this.socket.systemLang;
+                this.subscribeOnAlive();
                 this.onObjectChange(objects, scripts, true);
             },
             onObjectChange: (objects, scripts) => this.onObjectChange(objects, scripts),
@@ -186,18 +187,23 @@ class App extends Component {
                 //this.setState({logMessage: {index: this.logIndex, message}})
             }
         });
+    }
 
-        this.socket.subscribeState('system.adapter.javascript.*.alive', (id, state) => {
-            if (id) {
-                id = id && id.substring(0, id.length - 6); // - .alive
-
-                if (this.state.runningInstances[id] !== (state ? state.val : false)) {
-                    const runningInstances = JSON.parse(JSON.stringify(this.state.runningInstances));
-                    runningInstances[id] = (state ? state.val : false);
-                    this.setState({runningInstances});
+    subscribeOnAlive() {
+        if (!this.subscribeDone && this.socket) {
+            this.subscribeDone = true;
+            this.socket.subscribeState('system.adapter.javascript.*.alive', (id, state) => {
+                if (id) {
+                    id = id && id.substring(0, id.length - 6); // - .alive
+
+                    if (this.state.runningInstances[id] !== (state ? state.val : false)) {
+                        const runningInstances = JSON.parse(JSON.stringify(this.state.runningInstances));
+                        runningInstances[id] = (state ? state.val : false);
+                        this.setState({runningInstances});
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     onObjectChange(objects, scripts, isReady) {