iobroker.js-controller 3.3.15 → 3.3.19

package/io-package.json

@@ -2,7 +2,7 @@
     "$schema": "./schemas/io-package.json",
     "common": {
         "name": "js-controller",
-        "version": "3.3.15",
+        "version": "3.3.19",
         "platform": "Javascript/Node.js",
         "controller": true,
         "mode": "daemon",
@@ -20,6 +20,54 @@
             "zh-cn": "JS控制器"
         },
         "news": {
+            "3.3.19": {
+                "en": "we fixed a crash due to multilingual instance objects",
+                "de": "wir haben einen Absturz aufgrund mehrsprachiger Instanzobjekte behoben",
+                "ru": "мы исправили сбой из-за многоязычных экземпляров объектов",
+                "pt": "corrigimos uma falha devido a objetos multilingues de instância",
+                "nl": "we hebben een crash verholpen vanwege meertalige instantieobjecten",
+                "fr": "nous avons corrigé un plantage dû à des objets d'instance multilingues",
+                "it": "abbiamo risolto un arresto anomalo dovuto a oggetti istanza multilingue",
+                "es": "arreglamos un bloqueo debido a objetos de instancia multilingües",
+                "pl": "naprawiliśmy awarię z powodu wielojęzycznych obiektów instancji",
+                "zh-cn": "我们修复了由于多语言实例对象导致的崩溃"
+            },
+            "3.3.18": {
+                "en": "Fix another edge case for UUID generation",
+                "de": "Beheben Sie einen weiteren Randfall für die UUID-Generierung",
+                "ru": "Исправить еще один крайний случай для генерации UUID",
+                "pt": "Corrigir outro caso extremo para a geração de UUID",
+                "nl": "Een andere edge-case repareren voor UUID-generatie",
+                "fr": "Correction d'un autre cas de bord pour la génération d'UUID",
+                "it": "Risolvi un altro caso limite per la generazione di UUID",
+                "es": "Arregle otro caso de borde para la generación de UUID",
+                "pl": "Napraw inny przypadek brzegowy do generowania UUID",
+                "zh-cn": "修复 UUID 生成的另一个边缘情况"
+            },
+            "3.3.17": {
+                "en": "Fix edge case for UUID generation",
+                "de": "Edge-Case für UUID-Generierung behoben",
+                "ru": "Исправить крайний случай для генерации UUID",
+                "pt": "Corrigir caso extremo para geração de UUID",
+                "nl": "Fix edge-case voor UUID-generatie",
+                "fr": "Correction du cas de bord pour la génération d'UUID",
+                "it": "Fix edge case per la generazione di UUID",
+                "es": "Arregle el caso de borde para la generación de UUID",
+                "pl": "Napraw przypadek krawędzi do generowania UUID",
+                "zh-cn": "修复 UUID 生成的边缘情况"
+            },
+            "3.3.16": {
+                "en": "Adjust generation of installation UUID",
+                "de": "Generierung der Installations-UUID anpassen",
+                "ru": "Настроить генерацию UUID установки",
+                "pt": "Ajuste a geração do UUID de instalação",
+                "nl": "Aanpassen generatie van installatie UUID",
+                "fr": "Ajuster la génération de l'UUID d'installation",
+                "it": "Regola la generazione dell'UUID di installazione",
+                "es": "Ajustar generación de UUID de instalación",
+                "pl": "Dostosuj generowanie UUID instalacji",
+                "zh-cn": "调整安装 UUID 的生成"
+            },
             "3.3.15": {
                 "en": "avoid deleting too many meta objects starting with the same name as adapter",
                 "de": "Vermeiden Sie das Löschen von zu vielen Metaobjekten, die mit dem gleichen Namen wie der Adapter beginnen",

package/lib/setup/setupInstall.js

@@ -1002,7 +1002,7 @@ function Install(options) {
                                     if (adapterConf.instanceObjects[i].common.name) {
                                         // if name has many languages
                                         if (typeof adapterConf.instanceObjects[i].common.name === 'object') {
-                                            Object.keys(adapterConf.instanceObjects[i].common.name).forEach(lang => adapterConf.instanceObjects[i].common.name[lang] = adapterConf.instanceObjects[i].common.name.replace('%INSTANCE%', instance));
+                                            Object.keys(adapterConf.instanceObjects[i].common.name).forEach(lang => adapterConf.instanceObjects[i].common.name[lang] = adapterConf.instanceObjects[i].common.name[lang].replace('%INSTANCE%', instance));
                                         } else {
                                             adapterConf.instanceObjects[i].common.name = adapterConf.instanceObjects[i].common.name.replace('%INSTANCE%', instance);
                                         }
@@ -1010,7 +1010,7 @@ function Install(options) {
                                     if (adapterConf.instanceObjects[i].common.desc) {
                                         // if name has many languages
                                         if (typeof adapterConf.instanceObjects[i].common.desc === 'object') {
-                                            Object.keys(adapterConf.instanceObjects[i].common.desc).forEach(lang => adapterConf.instanceObjects[i].common.desc[lang] = adapterConf.instanceObjects[i].common.desc.replace('%INSTANCE%', instance));
+                                            Object.keys(adapterConf.instanceObjects[i].common.desc).forEach(lang => adapterConf.instanceObjects[i].common.desc[lang] = adapterConf.instanceObjects[i].common.desc[lang].replace('%INSTANCE%', instance));
                                         } else {
                                             adapterConf.instanceObjects[i].common.desc = adapterConf.instanceObjects[i].common.desc.replace('%INSTANCE%', instance);
                                         }
@@ -1707,4 +1707,4 @@ function Install(options) {
     };
 }
 
-module.exports = Install;
+module.exports = Install;

package/lib/tools.js

@@ -7,6 +7,7 @@ const os        = require('os');
 const forge     = require('node-forge');
 const deepClone = require('deep-clone');
 const cpPromise = require('promisify-child-process');
+const jwt       = require('jsonwebtoken');
 const { createInterface } = require('readline');
 
 // @ts-ignore
@@ -278,6 +279,27 @@ function getMac(callback) {
     });
 }
 
+// Is docker environment
+function isDocker() {
+    let _isDocker = false;
+    try {
+        fs.statSync('/.dockerenv');
+        _isDocker = true;
+    } catch {
+        // ignore error
+    }
+
+    let _isDockerGroup = false;
+
+    try {
+        _isDockerGroup = fs.readFileSync('/proc/self/cgroup', 'utf8').includes('docker');
+    } catch {
+        // ignore error
+    }
+
+    return _isDocker || _isDockerGroup;
+}
+
 // Build unique uuid based on MAC address if possible
 function uuid(givenMac, callback) {
     if (typeof givenMac === 'function') {
@@ -285,10 +307,17 @@ function uuid(givenMac, callback) {
         givenMac = '';
     }
 
-    let mac = (givenMac !== null) ? (givenMac || '') : null;
+    const _isDocker = isDocker();
+
+    // return constant UUID for all CI environments to keep the statistics clean
+    if (require('ci-info').isCI) {
+        return callback('55travis-pipe-line-cior-githubaction');
+    }
+
+    let mac = givenMac !== null ? (givenMac || '') : null;
     let u;
 
-    if (mac === '') {
+    if (!_isDocker && mac === '') {
         const ifaces = require('os').networkInterfaces();
 
         // Find first not empty MAC
@@ -299,18 +328,18 @@ function uuid(givenMac, callback) {
                     break;
                 }
             }
+
             if (mac) {
                 break;
             }
         }
     }
 
-    if (mac === '') {
-        getMac((_err, mac) => uuid(mac || null, callback));
-        return;
+    if (!_isDocker && mac === '') {
+        return getMac((_err, mac) => uuid(mac || null, callback));
     }
 
-    if (mac) {
+    if (!_isDocker && mac) {
         const md5sum = require('crypto').createHash('md5');
         md5sum.update(mac);
         mac = md5sum.digest('hex');
@@ -330,92 +359,139 @@ function uuid(givenMac, callback) {
     callback(u);
 }
 
-function createUuid(_objects, callback) {
-    let tasks = 2;
-    let _uuid;
-    _objects.getObject('system.user.admin', (err, obj) => {
-        if (err || !obj) {
-            password = password || require('./password');
-
-            // Default Password for user 'admin' is application name in lower case
-            password(getAppName()).hash(null, null, (err, res) => {
-                if (err) {
-                    console.error(err);
+function updateUuid(newUuid, _objects, callback) {
+    uuid('', _uuid => {
+        _uuid = newUuid || _uuid;
+        // Add vendor prefix to UUID
+        if (fs.existsSync(VENDOR_FILE)) {
+            try {
+                const vendor = require(VENDOR_FILE);
+                if (vendor.vendor && vendor.vendor.uuidPrefix && vendor.vendor.uuidPrefix.length === 2) {
+                    _uuid = vendor.vendor.uuidPrefix + _uuid;
                 }
-                // Create user here and not in io-package.js because of hash password
-                let tasks = 0;
-
-                tasks++;
-                _objects.setObject('system.user.admin', {
-                    type: 'user',
-                    common: {
-                        name:      'admin',
-                        password:   res,
-                        dontDelete: true,
-                        enabled:    true
-                    },
-                    ts: new Date().getTime(),
-                    from: 'system.host.' + getHostName() + '.tools',
-                    native: {}
-                }, () => {
-                    console.log('object system.user.admin created');
-                    !--tasks && callback && callback(_uuid);
-                });
-            });
-        } else {
-            !--tasks && callback && callback(_uuid);
+            } catch {
+                console.error(`Cannot parse ${VENDOR_FILE}`);
+            }
         }
-    });
-
-    _objects.getObject('system.meta.uuid', (err, obj) => {
-        if (!err && obj && obj.native && obj.native.uuid) {
-            !--tasks && callback && callback();
-        } else {
-            uuid(__uuid => {
-                _uuid = __uuid;
 
-                // Add vendor prefix to UUID
-                if (fs.existsSync(VENDOR_FILE)) {
-                    try {
-                        const vendor = require(VENDOR_FILE);
-                        if (vendor.vendor && vendor.vendor.uuidPrefix && vendor.vendor.uuidPrefix.length === 2) {
-                            _uuid = vendor.vendor.uuidPrefix + _uuid;
-                        }
-                    } catch {
-                        console.error(`Cannot parse ${VENDOR_FILE}`);
+        _objects.setObject('system.meta.uuid', {
+            type: 'meta',
+            common: {
+                name: 'uuid',
+                type: 'uuid'
+            },
+            ts: new Date().getTime(),
+            from: 'system.host.' + getHostName() + '.tools',
+            native: {
+                uuid: _uuid
+            }
+        }, err => {
+            if (err) {
+                console.error('object system.meta.uuid cannot be updated: ' + err);
+                callback();
+            } else {
+                _objects.getObject('system.meta.uuid', (err, obj) => {
+                    if (obj.native.uuid !== _uuid) {
+                        console.error('object system.meta.uuid cannot be updated: write protected');
+                    } else {
+                        console.log('object system.meta.uuid created: ' + _uuid);
                     }
-                }
 
-                _objects.setObject('system.meta.uuid', {
-                    type: 'meta',
-                    common: {
-                        name: 'uuid',
-                        type: 'uuid'
-                    },
-                    ts: new Date().getTime(),
-                    from: 'system.host.' + getHostName() + '.tools',
-                    native: {
-                        uuid: _uuid
-                    }
-                }, err => {
-                    if (err) {
-                        console.error('object system.meta.uuid cannot be updated: ' + err);
-                        !--tasks && callback && callback(_uuid);
-                    } else {
-                        _objects.getObject('system.meta.uuid', (err, obj) => {
-                            if (obj.native.uuid !== _uuid) {
-                                console.error('object system.meta.uuid cannot be updated: write protected');
+                    callback(_uuid);
+                });
+            }
+        });
+    });
+}
+
+function createUuid(_objects, callback) {
+    const promiseCheckPassword = new Promise(resolve =>
+        _objects.getObject('system.user.admin', (err, obj) => {
+            if (err || !obj) {
+                password = password || require('./password');
+
+                // Default Password for user 'admin' is application name in lower case
+                password(getAppName()).hash(null, null, (err, res) => {
+                    err && console.error(err);
+
+                    // Create user here and not in io-package.js because of hash password
+                    _objects.setObject('system.user.admin', {
+                        type: 'user',
+                        common: {
+                            name:      'admin',
+                            password:   res,
+                            dontDelete: true,
+                            enabled:    true
+                        },
+                        ts: new Date().getTime(),
+                        from: 'system.host.' + getHostName() + '.tools',
+                        native: {}
+                    }, () => {
+                        console.log('object system.user.admin created');
+                        resolve();
+                    });
+                });
+            } else {
+                resolve();
+            }
+        })
+    );
+
+    const promiseCheckUuid = new Promise(resolve =>
+        _objects.getObject('system.meta.uuid', (err, obj) => {
+            if (!err && obj && obj.native && obj.native.uuid) {
+                const PROBLEM_UUIDS = [
+                    'ab265f4a-67f9-a46a-c0b2-61e4b95cefe5',
+                    '7abd3182-d399-f7bd-da19-9550d8babede',
+                    'deb6f2a8-fe69-5491-0a50-a9f9b8f3419c',
+                    'ec66c85e-fc36-f6f9-f1c9-f5a2882d23c7',
+                    'e6203b03-f5f4-253a-e4f6-b295fc543ab7',
+                    'd659fa3d-7ef9-202a-ea23-acd0aff67b24'
+                ];
+
+                // if COMMON invalid docker uuid
+                if (PROBLEM_UUIDS.find(u => u === obj.native.uuid)) {
+                    // Read vis license
+                    _objects.getObject('system.adapter.vis.0', (err, licObj) => {
+                        if (!licObj || !licObj.native || !licObj.native.license) {
+                            // generate new UUID
+                            updateUuid('',  _objects, _uuid => resolve(_uuid));
+                        } else {
+                            // decode obj.native.license
+                            let data;
+                            try {
+                                data = jwt.decode(licObj.native.license);
+                            } catch {
+                                data = null;
+                            }
+
+                            if (!data || !data.uuid) {
+                                // generate new UUID
+                                updateUuid('', _objects, __uuid => resolve(__uuid));
                             } else {
-                                console.log('object system.meta.uuid created: ' + _uuid);
+                                if (data.uuid !== obj.native.uuid) {
+                                    updateUuid(data.correct ? data.uuid : '', _objects, _uuid => resolve(_uuid));
+                                } else {
+                                    // Show error
+                                    console.warn(`Your iobroker.vis license must be updated. Please contact info@iobroker.net to get a new license!`);
+                                    console.warn(`Provide following information in email: ${data.email}, invoice: ${data.invoice}`);
+                                    resolve();
+                                }
                             }
+                        }
+                    });
+                } else {
+                    resolve();
+                }
+            } else {
+                // generate new UUID
+                updateUuid('',  _objects, _uuid => resolve(_uuid));
+            }
+        })
+    );
 
-                            !--tasks && callback && callback(_uuid);
-                        });
-                    }
-                });
-            });
-        }
-    });
+    return Promise.all([promiseCheckPassword, promiseCheckUuid])
+        .then(result => callback && callback(result[1]));
 }
 
 // Download file to tmp or return file name directly
@@ -425,10 +501,10 @@ function getFile(urlOrPath, fileName, callback) {
     // If object was read
     if (urlOrPath.substring(0, 'http://'.length) === 'http://' ||
         urlOrPath.substring(0, 'https://'.length) === 'https://') {
-        const tmpFile = __dirname + '/../tmp/' + (fileName || Math.floor(Math.random() * 0xFFFFFFE) + '.zip');
+        const tmpFile = `${__dirname}/../tmp/${fileName || Math.floor(Math.random() * 0xFFFFFFE) + '.zip'}`;
         // Add some information to user-agent, like chrome, IE and Firefox do
         request({url: urlOrPath, gzip: true, headers: {'User-Agent': `${module.exports.appName}, RND: ${randomID}, N: ${process.version}`}}).on('error', error => {
-            console.log('Cannot download "' + tmpFile + '": ' + error);
+            console.log(`Cannot download "${tmpFile}": ${error}`);
             if (callback) {
                 callback(tmpFile);
             }

package/main.js

@@ -834,7 +834,7 @@ function changeHost(objs, oldHostname, newHostname, callback) {
         if (row && row.value && row.value.common && row.value.common.host === oldHostname) {
             const obj = row.value;
             obj.common.host = newHostname;
-            logger.info(hostLogPrefix + ' Reassign instance ' + obj._id.substring('system.adapter.'.length) + ' from ' + oldHostname + ' to ' + newHostname);
+            logger.info(`${hostLogPrefix} Reassign instance ${obj._id.substring('system.adapter.'.length)} from ${oldHostname} to ${newHostname}`);
             obj.from = 'system.host.' + tools.getHostName();
             obj.ts = Date.now();
 
@@ -856,7 +856,7 @@ function cleanAutoSubscribe(instance, autoInstance, callback) {
         try {
             subs = JSON.parse(state.val);
         } catch {
-            logger.error(hostLogPrefix + ' Cannot parse subscribes: ' + state.val);
+            logger.error(`${hostLogPrefix} Cannot parse subscribes: ${state.val}`);
             return typeof callback === 'function' && setImmediate(() => callback());
         }
         let modified = false;
@@ -937,12 +937,11 @@ function delObjects(objs, callback) {
  * @return none
  */
 function checkHost(callback) {
-    const objectData = objects.getStatus();
     // only main host controller needs to check/fix the host assignments from the instances
-    if (compactGroupController || !objectData.server) {
-        callback && callback();
-        return;
+    if (compactGroupController) {
+        return callback && callback();
     }
+
     objects.getObjectView('system', 'host', {}, (_err, doc) => {
         if (!_err && doc && doc.rows &&
             doc.rows.length === 1 &&
@@ -961,7 +960,7 @@ function checkHost(callback) {
                 } else {
                     // reassign all instances
                     changeHost(doc.rows, oldHostname, hostname, () => {
-                        logger.info(hostLogPrefix + ' Delete host ' + oldId);
+                        logger.info(`${hostLogPrefix} Delete host ${oldId}`);
 
                         // delete host object
                         objects.delObject(oldId, () =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.js-controller",
-  "version": "3.3.15",
+  "version": "3.3.19",
   "engines": {
     "node": ">=10.0.0"
   },
@@ -27,6 +27,7 @@
     "@iobroker/db-states-redis": "~1.2.7",
     "@iobroker/plugin-base": "~1.2.1",
     "@iobroker/plugin-sentry": "~1.1.10",
+    "ci-info": "^3.2.0",
     "chokidar": "^3.5.1",
     "daemonize2": "^0.4.2",
     "debug": "^4.3.1",