(bluefox) fix import of old scripts

(bluefox) ignore ".xxx" folders and names by mirroring
(bluefox) fix extendForeignObject problem of js-controller 2.0

Author: GermanBluefox

admin/google-blockly/own/field_script.js

@@ -40,11 +40,17 @@ Blockly.b64EncodeUnicode = function(text) {
 
 // Decoding base64 ⇢ UTF8
 Blockly.b64DecodeUnicode = function(text) {
-    return decodeURIComponent(Array.prototype.map.call(atob(text), function(s) {
-        return '%' + ('00' + s.charCodeAt(0).toString(16)).slice(-2)
-    }).join(''));
+    try {
+        return decodeURIComponent(Array.prototype.map.call(atob(text), function(s) {
+            return '%' + ('00' + s.charCodeAt(0).toString(16)).slice(-2)
+        }).join(''));
+    } catch (e) {
+        // old style
+        return atob(text || '');
+    }
 };
 
+
 /**
  * Class for an editable text field.
  * @param {string} text The initial content of the field.

docs/en/javascript.md

@@ -1064,7 +1064,7 @@ Format of selector:
 "name[commonAttr=something1](enumName=something2){nativeName=something3}[id=idfilter][state.id=idfilter]"
 ```
 
-name can be: state, channel or device
+name can be: state, channel, device or schedule
 "idfilter" can have wildcards '*'
 
 Prefixes ***(not implemented - should be discussed)*** :
@@ -1081,6 +1081,7 @@ Prefixes ***(not implemented - should be discussed)*** :
 - `$('channel{TYPE=BLIND}[state.id=*.LEVEL]')` - Get all shutter of Homematic
 - `$('channel[role=switch](rooms=Living room)[state.id=*.STATE]').setState(false)` - Switch all states with .STATE of channels with role "switch" in "Living room" to false
 - `$('channel[state.id=*.STATE](functions=Windows)').each(function (id, i) {log(id);});` - print all states of enum "windows" in log
+- `$('schedule[id=*65]').each(function (id, i) {log(id);});` - print all schedules with 65 at the end
 
 
 - `$('.switch §"Living room")` - Take states with all switches in 'Living room' ***(not implemented - should be discussed)***

lib/mirror.js

@@ -59,11 +59,12 @@ class Mirror {
     watchFolders(root_) {
         root_ = root_.endsWith('/') ? root_ : root_ + '/';
 
-        const files = fs.readdirSync(root_);
+        // ignore all .xxx folders, like ".git", ".idea", so users may not have scripts starting with "."
+        const files = fs.readdirSync(root_).filter(name => !name.startsWith('.'));
         files.forEach(file => {
             const name = path.join(root_, file).replace(/\\/g, '/');
             const stat = fs.statSync(name);
-            stat.isDirectory()&& this.watchFolders(name);
+            stat.isDirectory() && this.watchFolders(name);
         });
 
         if (!this.watchedFolder[root_]) {
@@ -159,6 +160,7 @@ class Mirror {
         }
     }
 
+    // TODO: node.js supports mkdirSync('filter/folder', {recursive: true}) => rewrite
     // create the folder recursively if not exists
     static createRecursiveDir(dirDisk) {
         const parts = dirDisk.replace(/\\/g, '/').split('/');
@@ -318,7 +320,8 @@ class Mirror {
                 if (exists) {
                     !this.watchedFolder[file] && this.watchFolders(file);
                     // scan folder anew
-                    const files = fs.readdirSync(file);
+                    const files = fs.readdirSync(file).filter(name => !name.startsWith('.'));
+
                     // update all files in this directory
                     files.forEach(f => this.onFileChange('change', path.join(file, f).replace(/\\/g, '/')));
                 } else {
@@ -484,7 +487,7 @@ class Mirror {
         dirPath = dirPath || this.diskRoot;
         list = list || {};
         if (fs.existsSync(dirPath)) {
-            const files = fs.readdirSync(dirPath);
+            const files = fs.readdirSync(dirPath).filter(name => !name.startsWith('.'));
             files.forEach(file => {
                 const fullName = path.join(dirPath, file);
                 const stats = fs.statSync(fullName);

lib/sandbox.js

@@ -215,8 +215,8 @@ function sandBox(script, name, verbose, debug, context) {
     function getCommonTypeOf(value) {
         // @ts-ignore we do not support bigint
         return isArray(value) ? 'array'
-            : isObject(value) ? 'object'
-            : typeof value;
+            : (isObject(value) ? 'object'
+                : typeof value);
     }
 
     function setStateHelper(sandbox, isBinary, id, state, isAck, callback) {
@@ -674,10 +674,10 @@ function sandBox(script, name, verbose, debug, context) {
 
                 // make sure this object satisfies all selectors
                 return commonSelectors.every(selector =>
-                        // ensure a property exists
-                        (selector.value === undefined && objCommon[selector.attr] !== undefined)
-                        // or match exact values
-                        || looselyEqualsString(objCommon[selector.attr], selector.value));
+                    // ensure a property exists
+                    (selector.value === undefined && objCommon[selector.attr] !== undefined)
+                    // or match exact values
+                    || looselyEqualsString(objCommon[selector.attr], selector.value));
             }
 
             /**
@@ -690,10 +690,10 @@ function sandBox(script, name, verbose, debug, context) {
                 const objNative = obj.native;
                 // make sure this object satisfies all selectors
                 return nativeSelectors.every(selector =>
-                        // ensure a property exists
-                        (selector.value === undefined && objNative[selector.attr] !== undefined)
-                        // or match exact values
-                        || looselyEqualsString(objNative[selector.attr], selector.value));
+                    // ensure a property exists
+                    (selector.value === undefined && objNative[selector.attr] !== undefined)
+                    // or match exact values
+                    || looselyEqualsString(objNative[selector.attr], selector.value));
             }
 
             /**
@@ -1345,7 +1345,7 @@ function sandBox(script, name, verbose, debug, context) {
             }
 
             let ts = mods.suncalc.getTimes(date, adapter.config.latitude, adapter.config.longitude)[pattern];
-            let nadir = mods.suncalc.getTimes(date, adapter.config.latitude, adapter.config.longitude)['nadir'];
+            const nadir = mods.suncalc.getTimes(date, adapter.config.latitude, adapter.config.longitude)['nadir'];
             if (nadir.getDate() === date.getDate() && nadir.getHours() < 12) {
                 ts = mods.suncalc.getTimes(date.setDate(date.getDate() + 1), adapter.config.latitude, adapter.config.longitude)[pattern];
             }
@@ -2752,7 +2752,7 @@ function sandBox(script, name, verbose, debug, context) {
                 }
             } else {
                 sandbox.verbose && sandbox.log('extendObject(id=' + id + ', obj=' + JSON.stringify(obj) + ')', 'info');
-                adapter.extendForeignObject(id, obj, callback);
+                adapter.extendForeignObject(id, JSON.parse(JSON.stringify(obj)), callback);
             }
         };
     }

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

@@ -40,11 +40,17 @@ Blockly.b64EncodeUnicode = function(text) {
 
 // Decoding base64 ⇢ UTF8
 Blockly.b64DecodeUnicode = function(text) {
-    return decodeURIComponent(Array.prototype.map.call(atob(text), function(s) {
-        return '%' + ('00' + s.charCodeAt(0).toString(16)).slice(-2)
-    }).join(''));
+    try {
+        return decodeURIComponent(Array.prototype.map.call(atob(text), function(s) {
+            return '%' + ('00' + s.charCodeAt(0).toString(16)).slice(-2)
+        }).join(''));
+    } catch (e) {
+        // old style
+        return atob(text || '');
+    }
 };
 
+
 /**
  * Class for an editable text field.
  * @param {string} text The initial content of the field.
@@ -138,7 +144,7 @@ Blockly.FieldScript.prototype.render_ = function() {
             this.textElement_.setAttribute('x', 0);
         }
 
-  //      this.size_.height = Blockly.BlockSvg.MIN_BLOCK_Y;
+        //      this.size_.height = Blockly.BlockSvg.MIN_BLOCK_Y;
 //        this.size_.width = Blockly.Field.getCachedWidth(this.textElement_);
     } else {
         width = 0;