@iobroker/adapter-react-v5 4.4.4 → 4.4.6

package/LegacyConnection.js

@@ -571,23 +571,57 @@ var Connection = /*#__PURE__*/function () {
             return console.error("Cannot getForeignStates \"".concat(id, "\": ").concat(JSON.stringify(e)));
           });
         } else {
-          if (Connection.isWeb()) {
-            this._socket.emit('getStates', id, function (err, states) {
-              err && console.error("Cannot getForeignStates \"".concat(id, "\": ").concat(JSON.stringify(err)));
-              states && Object.keys(states).forEach(function (id) {
-                return cb(id, states[id]);
-              });
-            });
-          } else {
-            this._socket.emit('getForeignStates', id, function (err, states) {
-              err && console.error("Cannot getForeignStates \"".concat(id, "\": ").concat(JSON.stringify(err)));
-              states && Object.keys(states).forEach(function (id) {
-                return cb(id, states[id]);
-              });
+          this._socket.emit(Connection.isWeb() ? 'getStates' : 'getForeignStates', id, function (err, states) {
+            err && console.error("Cannot getForeignStates \"".concat(id, "\": ").concat(JSON.stringify(err)));
+            states && Object.keys(states).forEach(function (id) {
+              return cb(id, states[id]);
             });
+          });
+        }
+      }
+    }
+
+    /**
+     * Subscribe to changes of the given state.
+     * @param {string} id The ioBroker state ID.
+     * @param {ioBroker.StateChangeHandler} cb The callback.
+     */
+  }, {
+    key: "subscribeStateAsync",
+    value: function subscribeStateAsync(id, cb) {
+      var _this5 = this;
+      if (!this.statesSubscribes[id]) {
+        var reg = id.replace(/\./g, '\\.').replace(/\*/g, '.*').replace(/\(/g, '\\(').replace(/\)/g, '\\)').replace(/\+/g, '\\+').replace(/\[/g, '\\[');
+        if (!reg.includes('*')) {
+          reg += '$';
+        }
+        this.statesSubscribes[id] = {
+          reg: new RegExp(reg),
+          cbs: []
+        };
+        this.statesSubscribes[id].cbs.push(cb);
+        if (this.connected) {
+          if (this.connected && id !== this.ignoreState) {
+            // no answer from server required
+            this._socket.emit('subscribe', id);
           }
         }
+      } else {
+        !this.statesSubscribes[id].cbs.includes(cb) && this.statesSubscribes[id].cbs.push(cb);
       }
+      return new Promise(function (resolve, reject) {
+        if (typeof cb === 'function' && _this5.connected) {
+          _this5._socket.emit(Connection.isWeb() ? 'getStates' : 'getForeignStates', id, function (err, states) {
+            err && console.error("Cannot getForeignStates \"".concat(id, "\": ").concat(JSON.stringify(err)));
+            states && Object.keys(states).forEach(function (id) {
+              return cb(id, states[id]);
+            });
+            states ? resolve(null) : reject(new Error("Cannot getForeignStates \"".concat(id, "\": ").concat(JSON.stringify(err))));
+          });
+        } else {
+          _this5.connected ? reject(new Error('callback is not a function')) : reject(new Error('not connected'));
+        }
+      });
     }
 
     /**
@@ -781,7 +815,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "objectChange",
     value: function objectChange(id, obj) {
-      var _this5 = this;
+      var _this6 = this;
       // update main.objects cache
       if (!this.objects) {
         return;
@@ -813,9 +847,9 @@ var Connection = /*#__PURE__*/function () {
         changed = true;
       }
       Object.keys(this.objectsSubscribes).forEach(function (_id) {
-        if (_id === id || _this5.objectsSubscribes[_id].reg.test(id)) {
+        if (_id === id || _this6.objectsSubscribes[_id].reg.test(id)) {
           // @ts-ignore
-          _this5.objectsSubscribes[_id].cbs.forEach(function (cb) {
+          _this6.objectsSubscribes[_id].cbs.forEach(function (cb) {
             try {
               cb(id, obj, oldObj);
             } catch (e) {
@@ -877,16 +911,16 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getStates",
     value: function getStates(disableProgressUpdate) {
-      var _this6 = this;
+      var _this7 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this6._socket.emit('getStates', function (err, res) {
-          _this6.states = res;
+        return _this7._socket.emit('getStates', function (err, res) {
+          _this7.states = res;
           // @ts-ignore
-          !disableProgressUpdate && _this6.onProgress(PROGRESS.STATES_LOADED);
-          return err ? reject(err) : resolve(_this6.states);
+          !disableProgressUpdate && _this7.onProgress(PROGRESS.STATES_LOADED);
+          return err ? reject(err) : resolve(_this7.states);
         });
       });
     }
@@ -899,7 +933,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getState",
     value: function getState(id) {
-      var _this7 = this;
+      var _this8 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
@@ -910,7 +944,7 @@ var Connection = /*#__PURE__*/function () {
         });
       }
       return new Promise(function (resolve, reject) {
-        return _this7._socket.emit('getState', id, function (err, state) {
+        return _this8._socket.emit('getState', id, function (err, state) {
           return err ? reject(err) : resolve(state);
         });
       });
@@ -925,14 +959,14 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getBinaryState",
     value: function getBinaryState(id) {
-      var _this8 = this;
+      var _this9 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
 
       // the data will come in base64
       return new Promise(function (resolve, reject) {
-        return _this8._socket.emit('getBinaryState', id, function (err, state) {
+        return _this9._socket.emit('getBinaryState', id, function (err, state) {
           return err ? reject(err) : resolve(state);
         });
       });
@@ -948,14 +982,14 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "setBinaryState",
     value: function setBinaryState(id, base64) {
-      var _this9 = this;
+      var _this10 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
 
       // the data will come in base64
       return new Promise(function (resolve, reject) {
-        return _this9._socket.emit('setBinaryState', id, base64, function (err) {
+        return _this10._socket.emit('setBinaryState', id, base64, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -971,7 +1005,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "setState",
     value: function setState(id, val, ack) {
-      var _this10 = this;
+      var _this11 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
@@ -1022,7 +1056,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.resolve();
       }
       return new Promise(function (resolve, reject) {
-        return _this10._socket.emit('setState', id, val, function (err) {
+        return _this11._socket.emit('setState', id, val, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -1042,18 +1076,18 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getObjects",
     value: function getObjects(update, disableProgressUpdate) {
-      var _this11 = this;
+      var _this12 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        if (!update && _this11.objects) {
-          return resolve(_this11.objects);
+        if (!update && _this12.objects) {
+          return resolve(_this12.objects);
         }
-        _this11._socket.emit(Connection.isWeb() ? 'getObjects' : 'getAllObjects', function (err, res) {
-          _this11.objects = res;
-          disableProgressUpdate && _this11.onProgress(PROGRESS.OBJECTS_LOADED);
-          err ? reject(err) : resolve(_this11.objects);
+        _this12._socket.emit(Connection.isWeb() ? 'getObjects' : 'getAllObjects', function (err, res) {
+          _this12.objects = res;
+          disableProgressUpdate && _this12.onProgress(PROGRESS.OBJECTS_LOADED);
+          err ? reject(err) : resolve(_this12.objects);
         });
       });
     }
@@ -1066,12 +1100,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getObjectsById",
     value: function getObjectsById(list) {
-      var _this12 = this;
+      var _this13 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this12._socket.emit('getObjects', list, function (err, res) {
+        return _this13._socket.emit('getObjects', list, function (err, res) {
           return err ? reject(err) : resolve(res);
         });
       });
@@ -1085,37 +1119,37 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "_subscribe",
     value: function _subscribe(isEnable) {
-      var _this13 = this;
+      var _this14 = this;
       if (isEnable && !this.subscribed) {
         this.subscribed = true;
         this.autoSubscribes.forEach(function (id) {
-          return _this13._socket.emit('subscribeObjects', id);
+          return _this14._socket.emit('subscribeObjects', id);
         });
         // re subscribe objects
         Object.keys(this.objectsSubscribes).forEach(function (id) {
-          return _this13._socket.emit('subscribeObjects', id);
+          return _this14._socket.emit('subscribeObjects', id);
         });
         // re-subscribe logs
         this.autoSubscribeLog && this._socket.emit('requireLog', true);
         // re subscribe states
         Object.keys(this.statesSubscribes).forEach(function (id) {
-          return _this13._socket.emit('subscribe', id);
+          return _this14._socket.emit('subscribe', id);
         });
       } else if (!isEnable && this.subscribed) {
         this.subscribed = false;
         // un-subscribe objects
         this.autoSubscribes.forEach(function (id) {
-          return _this13._socket.emit('unsubscribeObjects', id);
+          return _this14._socket.emit('unsubscribeObjects', id);
         });
         Object.keys(this.objectsSubscribes).forEach(function (id) {
-          return _this13._socket.emit('unsubscribeObjects', id);
+          return _this14._socket.emit('unsubscribeObjects', id);
         });
         // un-subscribe logs
         this.autoSubscribeLog && this._socket.emit('requireLog', false);
 
         // un-subscribe states
         Object.keys(this.statesSubscribes).forEach(function (id) {
-          return _this13._socket.emit('unsubscribe', id);
+          return _this14._socket.emit('unsubscribe', id);
         });
       }
     }
@@ -1128,12 +1162,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "requireLog",
     value: function requireLog(isEnabled) {
-      var _this14 = this;
+      var _this15 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this14._socket.emit('requireLog', isEnabled, function (err) {
+        return _this15._socket.emit('requireLog', isEnabled, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -1148,12 +1182,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "delObject",
     value: function delObject(id, maintenance) {
-      var _this15 = this;
+      var _this16 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this15._socket.emit('delObject', id, {
+        return _this16._socket.emit('delObject', id, {
           maintenance: !!maintenance
         }, function (err) {
           return err ? reject(err) : resolve();
@@ -1170,12 +1204,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "delObjects",
     value: function delObjects(id, maintenance) {
-      var _this16 = this;
+      var _this17 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this16._socket.emit('delObjects', id, {
+        return _this17._socket.emit('delObjects', id, {
           maintenance: !!maintenance
         }, function (err) {
           return err ? reject(err) : resolve();
@@ -1192,7 +1226,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "setObject",
     value: function setObject(id, obj) {
-      var _this17 = this;
+      var _this18 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
@@ -1210,7 +1244,7 @@ var Connection = /*#__PURE__*/function () {
         delete obj.ts;
       }
       return new Promise(function (resolve, reject) {
-        return _this17._socket.emit('setObject', id, obj, function (err) {
+        return _this18._socket.emit('setObject', id, obj, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -1224,7 +1258,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getObject",
     value: function getObject(id) {
-      var _this18 = this;
+      var _this19 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
@@ -1239,7 +1273,7 @@ var Connection = /*#__PURE__*/function () {
         });
       }
       return new Promise(function (resolve, reject) {
-        return _this18._socket.emit('getObject', id, function (err, obj) {
+        return _this19._socket.emit('getObject', id, function (err, obj) {
           return err ? reject(err) : resolve(obj);
         });
       });
@@ -1259,7 +1293,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getAdapterInstances",
     value: function getAdapterInstances(adapter, update) {
-      var _this19 = this;
+      var _this20 = this;
       if (typeof adapter === 'boolean') {
         update = adapter;
         adapter = '';
@@ -1274,7 +1308,7 @@ var Connection = /*#__PURE__*/function () {
       this._promises["instances_".concat(adapter)] = new Promise(function (resolve, reject) {
         var timeout = setTimeout(function () {
           timeout = null;
-          _this19.getObjectView("system.adapter.".concat(adapter ? "".concat(adapter, ".") : ''), "system.adapter.".concat(adapter ? "".concat(adapter, ".") : '', "\u9999"), 'instance').then(function (items) {
+          _this20.getObjectView("system.adapter.".concat(adapter ? "".concat(adapter, ".") : ''), "system.adapter.".concat(adapter ? "".concat(adapter, ".") : '', "\u9999"), 'instance').then(function (items) {
             return resolve(Object.keys(items).map(function (id) {
               return fixAdminUI(items[id]);
             }));
@@ -1282,7 +1316,7 @@ var Connection = /*#__PURE__*/function () {
             return reject(e);
           });
         }, TIMEOUT_FOR_ADMIN4);
-        _this19._socket.emit('getAdapterInstances', adapter, function (err, instances) {
+        _this20._socket.emit('getAdapterInstances', adapter, function (err, instances) {
           if (timeout) {
             clearTimeout(timeout);
             timeout = null;
@@ -1307,7 +1341,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getAdapters",
     value: function getAdapters(adapter, update) {
-      var _this20 = this;
+      var _this21 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -1325,7 +1359,7 @@ var Connection = /*#__PURE__*/function () {
       this._promises["adapter_".concat(adapter)] = new Promise(function (resolve, reject) {
         var timeout = setTimeout(function () {
           timeout = null;
-          _this20.getObjectView("system.adapter.".concat(adapter, "."), "system.adapter.".concat(adapter, ".\u9999"), 'adapter').then(function (items) {
+          _this21.getObjectView("system.adapter.".concat(adapter, "."), "system.adapter.".concat(adapter, ".\u9999"), 'adapter').then(function (items) {
             return resolve(Object.keys(items).map(function (id) {
               return fixAdminUI(items[id]);
             }));
@@ -1333,7 +1367,7 @@ var Connection = /*#__PURE__*/function () {
             return reject(e);
           });
         }, TIMEOUT_FOR_ADMIN4);
-        _this20._socket.emit('getAdapters', adapter, function (err, adapters) {
+        _this21._socket.emit('getAdapters', adapter, function (err, adapters) {
           if (timeout) {
             clearTimeout(timeout);
             timeout = null;
@@ -1353,7 +1387,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "_renameGroups",
     value: function _renameGroups(objs, cb) {
-      var _this21 = this;
+      var _this22 = this;
       if (!objs || !objs.length) {
         cb && cb();
       } else {
@@ -1362,10 +1396,10 @@ var Connection = /*#__PURE__*/function () {
         obj._id = obj.newId;
         delete obj.newId;
         this.setObject(obj._id, obj).then(function () {
-          return _this21.delObject(oldId);
+          return _this22.delObject(oldId);
         }).then(function () {
           return setTimeout(function () {
-            return _this21._renameGroups(objs, cb);
+            return _this22._renameGroups(objs, cb);
           }, 0);
         })["catch"](function (err) {
           return cb && cb(err);
@@ -1382,7 +1416,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "renameGroup",
     value: function renameGroup(id, newId, newName) {
-      var _this22 = this;
+      var _this23 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -1396,7 +1430,7 @@ var Connection = /*#__PURE__*/function () {
             return group.newId = newId + group._id.substring(id.length);
           });
           return new Promise(function (resolve, reject) {
-            return _this22._renameGroups(groupsToRename, function (err) {
+            return _this23._renameGroups(groupsToRename, function (err) {
               return err ? reject(err) : resolve();
             });
           }).then(function () {
@@ -1409,8 +1443,8 @@ var Connection = /*#__PURE__*/function () {
                 obj.common = obj.common || {};
                 obj.common.name = newName;
               }
-              return _this22.setObject(obj._id, obj).then(function () {
-                return _this22.delObject(id);
+              return _this23.setObject(obj._id, obj).then(function () {
+                return _this23.delObject(id);
               });
             }
           });
@@ -1428,12 +1462,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "sendTo",
     value: function sendTo(instance, command, data) {
-      var _this23 = this;
+      var _this24 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve) {
-        return _this23._socket.emit('sendTo', instance, command, data, function (result) {
+        return _this24._socket.emit('sendTo', instance, command, data, function (result) {
           return resolve(result);
         });
       });
@@ -1447,7 +1481,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "extendObject",
     value: function extendObject(id, obj) {
-      var _this24 = this;
+      var _this25 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
@@ -1462,7 +1496,7 @@ var Connection = /*#__PURE__*/function () {
         delete obj.ts;
       }
       return new Promise(function (resolve, reject) {
-        return _this24._socket.emit('extendObject', id, obj, function (err) {
+        return _this25._socket.emit('extendObject', id, obj, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -1582,7 +1616,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getEnums",
     value: function getEnums(_enum, update) {
-      var _this25 = this;
+      var _this26 = this;
       if (!update && this._promises["enums_".concat(_enum || 'all')]) {
         return this._promises["enums_".concat(_enum || 'all')];
       }
@@ -1590,7 +1624,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises["enums_".concat(_enum || 'all')] = new Promise(function (resolve, reject) {
-        _this25._socket.emit('getObjectView', 'system', 'enum', {
+        _this26._socket.emit('getObjectView', 'system', 'enum', {
           startkey: "enum.".concat(_enum || ''),
           endkey: "enum.".concat(_enum ? "".concat(_enum, ".") : '', "\u9999")
         }, function (err, res) {
@@ -1621,9 +1655,9 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getObjectViewCustom",
     value: function getObjectViewCustom(design, type, start, end) {
-      var _this26 = this;
+      var _this27 = this;
       return new Promise(function (resolve, reject) {
-        _this26._socket.emit('getObjectView', design, type, {
+        _this27._socket.emit('getObjectView', design, type, {
           startkey: start,
           endkey: end
         }, function (err, res) {
@@ -1742,7 +1776,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getLogs",
     value: function getLogs(host, linesNumber) {
-      var _this27 = this;
+      var _this28 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -1750,7 +1784,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve) {
-        return _this27._socket.emit('sendToHost', host, 'getLogs', linesNumber || 200, function (lines) {
+        return _this28._socket.emit('sendToHost', host, 'getLogs', linesNumber || 200, function (lines) {
           return resolve(lines);
         });
       });
@@ -1763,7 +1797,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getLogsFiles",
     value: function getLogsFiles(host) {
-      var _this28 = this;
+      var _this29 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -1771,7 +1805,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this28._socket.emit('readLogs', host, function (err, files) {
+        return _this29._socket.emit('readLogs', host, function (err, files) {
           return err ? reject(err) : resolve(files);
         });
       });
@@ -1785,7 +1819,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "delLogs",
     value: function delLogs(host) {
-      var _this29 = this;
+      var _this30 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -1793,7 +1827,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this29._socket.emit('sendToHost', host, 'delLogs', null, function (error) {
+        return _this30._socket.emit('sendToHost', host, 'delLogs', null, function (error) {
           return error ? reject(error) : resolve();
         });
       });
@@ -1806,12 +1840,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "readMetaItems",
     value: function readMetaItems() {
-      var _this30 = this;
+      var _this31 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this30._socket.emit('getObjectView', 'system', 'meta', {
+        return _this31._socket.emit('getObjectView', 'system', 'meta', {
           startkey: '',
           endkey: "\u9999"
         }, function (err, objs) {
@@ -1831,12 +1865,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "readDir",
     value: function readDir(adapter, fileName) {
-      var _this31 = this;
+      var _this32 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this31._socket.emit('readDir', adapter, fileName, function (err, files) {
+        return _this32._socket.emit('readDir', adapter, fileName, function (err, files) {
           return err ? reject(err) : resolve(files);
         });
       });
@@ -1852,13 +1886,13 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "readFile",
     value: function readFile(adapter, fileName, base64) {
-      var _this32 = this;
+      var _this33 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
         if (!base64) {
-          _this32._socket.emit('readFile', adapter, fileName, function (err, data, type) {
+          _this33._socket.emit('readFile', adapter, fileName, function (err, data, type) {
             //@ts-ignore
             err ? reject(err) : resolve({
               data: data,
@@ -1866,7 +1900,7 @@ var Connection = /*#__PURE__*/function () {
             });
           });
         } else {
-          _this32._socket.emit('readFile64', adapter, fileName, base64, function (err, data) {
+          _this33._socket.emit('readFile64', adapter, fileName, base64, function (err, data) {
             return err ? reject(err) : resolve(data);
           });
         }
@@ -1883,20 +1917,20 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "writeFile64",
     value: function writeFile64(adapter, fileName, data) {
-      var _this33 = this;
+      var _this34 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
         if (typeof data === 'string') {
-          _this33._socket.emit('writeFile', adapter, fileName, data, function (err) {
+          _this34._socket.emit('writeFile', adapter, fileName, data, function (err) {
             return err ? reject(err) : resolve();
           });
         } else {
           var base64 = btoa(new Uint8Array(data).reduce(function (data, _byte) {
             return data + String.fromCharCode(_byte);
           }, ''));
-          _this33._socket.emit('writeFile64', adapter, fileName, base64, function (err) {
+          _this34._socket.emit('writeFile64', adapter, fileName, base64, function (err) {
             return err ? reject(err) : resolve();
           });
         }
@@ -1912,12 +1946,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "deleteFile",
     value: function deleteFile(adapter, fileName) {
-      var _this34 = this;
+      var _this35 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this34._socket.emit('unlink', adapter, fileName, function (err) {
+        return _this35._socket.emit('unlink', adapter, fileName, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -1933,12 +1967,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "deleteFolder",
     value: function deleteFolder(adapter, folderName) {
-      var _this35 = this;
+      var _this36 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this35._socket.emit('deleteFolder', adapter, folderName, function (err) {
+        return _this36._socket.emit('deleteFolder', adapter, folderName, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -1952,7 +1986,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getHosts",
     value: function getHosts(update) {
-      var _this36 = this;
+      var _this37 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -1963,7 +1997,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises.hosts = new Promise(function (resolve, reject) {
-        return _this36._socket.emit('getObjectView', 'system', 'host', {
+        return _this37._socket.emit('getObjectView', 'system', 'host', {
           startkey: 'system.host.',
           endkey: "system.host.\u9999"
         }, function (err, doc) {
@@ -1987,7 +2021,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getUsers",
     value: function getUsers(update) {
-      var _this37 = this;
+      var _this38 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -1998,7 +2032,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises.users = new Promise(function (resolve, reject) {
-        return _this37._socket.emit('getObjectView', 'system', 'user', {
+        return _this38._socket.emit('getObjectView', 'system', 'user', {
           startkey: 'system.user.',
           endkey: "system.user.\u9999"
         }, function (err, doc) {
@@ -2022,7 +2056,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getGroups",
     value: function getGroups(update) {
-      var _this38 = this;
+      var _this39 = this;
       if (!update && this._promises.groups) {
         return this._promises.groups;
       }
@@ -2030,7 +2064,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises.groups = new Promise(function (resolve, reject) {
-        return _this38._socket.emit('getObjectView', 'system', 'group', {
+        return _this39._socket.emit('getObjectView', 'system', 'group', {
           startkey: 'system.group.',
           endkey: "system.group.\u9999"
         }, function (err, doc) {
@@ -2056,7 +2090,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getHostInfo",
     value: function getHostInfo(host, update, timeoutMs) {
-      var _this39 = this;
+      var _this40 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2076,8 +2110,8 @@ var Connection = /*#__PURE__*/function () {
             timeout = null;
             reject('getHostInfo timeout');
           }
-        }, timeoutMs || _this39.props.cmdTimeout);
-        _this39._socket.emit('sendToHost', host, 'getHostInfo', null, function (data) {
+        }, timeoutMs || _this40.props.cmdTimeout);
+        _this40._socket.emit('sendToHost', host, 'getHostInfo', null, function (data) {
           if (timeout) {
             clearTimeout(timeout);
             timeout = null;
@@ -2104,7 +2138,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getHostInfoShort",
     value: function getHostInfoShort(host, update, timeoutMs) {
-      var _this40 = this;
+      var _this41 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2124,8 +2158,8 @@ var Connection = /*#__PURE__*/function () {
             timeout = null;
             reject('hostInfoShort timeout');
           }
-        }, timeoutMs || _this40.props.cmdTimeout);
-        _this40._socket.emit('sendToHost', host, 'getHostInfoShort', null, function (data) {
+        }, timeoutMs || _this41.props.cmdTimeout);
+        _this41._socket.emit('sendToHost', host, 'getHostInfoShort', null, function (data) {
           if (timeout) {
             clearTimeout(timeout);
             timeout = null;
@@ -2153,7 +2187,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getRepository",
     value: function getRepository(host, args, update, timeoutMs) {
-      var _this41 = this;
+      var _this42 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2172,8 +2206,8 @@ var Connection = /*#__PURE__*/function () {
             timeout = null;
             reject('getRepository timeout');
           }
-        }, timeoutMs || _this41.props.cmdTimeout);
-        _this41._socket.emit('sendToHost', host, 'getRepository', args, function (data) {
+        }, timeoutMs || _this42.props.cmdTimeout);
+        _this42._socket.emit('sendToHost', host, 'getRepository', args, function (data) {
           if (timeout) {
             clearTimeout(timeout);
             timeout = null;
@@ -2200,7 +2234,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getInstalled",
     value: function getInstalled(host, update, cmdTimeout) {
-      var _this42 = this;
+      var _this43 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2220,8 +2254,8 @@ var Connection = /*#__PURE__*/function () {
             timeout = null;
             reject('getInstalled timeout');
           }
-        }, cmdTimeout || _this42.props.cmdTimeout);
-        _this42._socket.emit('sendToHost', host, 'getInstalled', null, function (data) {
+        }, cmdTimeout || _this43.props.cmdTimeout);
+        _this43._socket.emit('sendToHost', host, 'getInstalled', null, function (data) {
           if (timeout) {
             clearTimeout(timeout);
             timeout = null;
@@ -2247,12 +2281,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "rename",
     value: function rename(adapter, oldName, newName) {
-      var _this43 = this;
+      var _this44 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this43._socket.emit('rename', adapter, oldName, newName, function (err) {
+        return _this44._socket.emit('rename', adapter, oldName, newName, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -2267,12 +2301,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "renameFile",
     value: function renameFile(adapter, oldName, newName) {
-      var _this44 = this;
+      var _this45 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this44._socket.emit('renameFile', adapter, oldName, newName, function (err) {
+        return _this45._socket.emit('renameFile', adapter, oldName, newName, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -2289,7 +2323,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "cmdExec",
     value: function cmdExec(host, cmd, cmdId, cmdTimeout) {
-      var _this45 = this;
+      var _this46 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2306,7 +2340,7 @@ var Connection = /*#__PURE__*/function () {
             reject('cmdExec timeout');
           }
         }, cmdTimeout);
-        _this45._socket.emit('cmdExec', host, cmdId, cmd, null, function (err) {
+        _this46._socket.emit('cmdExec', host, cmdId, cmd, null, function (err) {
           if (!cmdTimeout || timeout) {
             timeout && clearTimeout(timeout);
             timeout = null;
@@ -2329,7 +2363,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "checkFeatureSupported",
     value: function checkFeatureSupported(feature, update) {
-      var _this46 = this;
+      var _this47 = this;
       var cache = "supportedFeatures_".concat(feature);
       if (!update && this._promises[cache]) {
         return this._promises[cache];
@@ -2338,7 +2372,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises[cache] = new Promise(function (resolve, reject) {
-        return _this46._socket.emit('checkFeatureSupported', feature, function (err, features) {
+        return _this47._socket.emit('checkFeatureSupported', feature, function (err, features) {
           err ? reject(err) : resolve(features);
         });
       });
@@ -2353,13 +2387,13 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "readBaseSettings",
     value: function readBaseSettings(host) {
-      var _this47 = this;
+      var _this48 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
       return this.checkFeatureSupported('CONTROLLER_READWRITE_BASE_SETTINGS').then(function (result) {
         if (result) {
-          if (!_this47.connected) {
+          if (!_this48.connected) {
             return Promise.reject(NOT_CONNECTED);
           }
           return new Promise(function (resolve, reject) {
@@ -2368,11 +2402,11 @@ var Connection = /*#__PURE__*/function () {
                 timeout = null;
                 reject('readBaseSettings timeout');
               }
-            }, _this47.props.cmdTimeout);
+            }, _this48.props.cmdTimeout);
             if (host.startsWith('system.host.')) {
               host = host.replace(/^system\.host\./, '');
             }
-            _this47._socket.emit('sendToHost', host, 'readBaseSettings', null, function (data) {
+            _this48._socket.emit('sendToHost', host, 'readBaseSettings', null, function (data) {
               if (timeout) {
                 clearTimeout(timeout);
                 timeout = null;
@@ -2400,13 +2434,13 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "writeBaseSettings",
     value: function writeBaseSettings(host, config) {
-      var _this48 = this;
+      var _this49 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
       return this.checkFeatureSupported('CONTROLLER_READWRITE_BASE_SETTINGS').then(function (result) {
         if (result) {
-          if (!_this48.connected) {
+          if (!_this49.connected) {
             return Promise.reject(NOT_CONNECTED);
           }
           return new Promise(function (resolve, reject) {
@@ -2415,8 +2449,8 @@ var Connection = /*#__PURE__*/function () {
                 timeout = null;
                 reject('writeBaseSettings timeout');
               }
-            }, _this48.props.cmdTimeout);
-            _this48._socket.emit('sendToHost', host, 'writeBaseSettings', config, function (data) {
+            }, _this49.props.cmdTimeout);
+            _this49._socket.emit('sendToHost', host, 'writeBaseSettings', config, function (data) {
               if (timeout) {
                 clearTimeout(timeout);
                 timeout = null;
@@ -2443,12 +2477,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "restartController",
     value: function restartController(host) {
-      var _this49 = this;
+      var _this50 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
       return new Promise(function (resolve, reject) {
-        _this49._socket.emit('sendToHost', host, 'restartController', null, function (error) {
+        _this50._socket.emit('sendToHost', host, 'restartController', null, function (error) {
           error ? reject(error) : resolve(true);
         });
       });
@@ -2463,12 +2497,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getDiagData",
     value: function getDiagData(host, typeOfDiag) {
-      var _this50 = this;
+      var _this51 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
       return new Promise(function (resolve) {
-        _this50._socket.emit('sendToHost', host, 'getDiagData', typeOfDiag, function (result) {
+        _this51._socket.emit('sendToHost', host, 'getDiagData', typeOfDiag, function (result) {
           return resolve(result);
         });
       });
@@ -2482,19 +2516,19 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getForeignStates",
     value: function getForeignStates(pattern) {
-      var _this51 = this;
+      var _this52 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       if (Connection.isWeb()) {
         return new Promise(function (resolve, reject) {
-          return _this51._socket.emit('getStates', pattern || '*', function (err, states) {
+          return _this52._socket.emit('getStates', pattern || '*', function (err, states) {
             return err ? reject(err) : resolve(states);
           });
         });
       }
       return new Promise(function (resolve, reject) {
-        return _this51._socket.emit('getForeignStates', pattern || '*', function (err, states) {
+        return _this52._socket.emit('getForeignStates', pattern || '*', function (err, states) {
           return err ? reject(err) : resolve(states);
         });
       });
@@ -2509,12 +2543,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getForeignObjects",
     value: function getForeignObjects(pattern, type) {
-      var _this52 = this;
+      var _this53 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this52._socket.emit('getForeignObjects', pattern || '*', type, function (err, states) {
+        return _this53._socket.emit('getForeignObjects', pattern || '*', type, function (err, states) {
           return err ? reject(err) : resolve(states);
         });
       });
@@ -2554,9 +2588,9 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "setSystemConfig",
     value: function setSystemConfig(obj) {
-      var _this53 = this;
+      var _this54 = this;
       return this.setObject('system.config', obj).then(function () {
-        return _this53._promises.systemConfig = Promise.resolve(obj);
+        return _this54._promises.systemConfig = Promise.resolve(obj);
       });
     }
 
@@ -2579,12 +2613,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getHistory",
     value: function getHistory(id, options) {
-      var _this54 = this;
+      var _this55 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this54._socket.emit('getHistory', id, options, function (err, values) {
+        return _this55._socket.emit('getHistory', id, options, function (err, values) {
           return err ? reject(err) : resolve(values);
         });
       });
@@ -2599,12 +2633,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getHistoryEx",
     value: function getHistoryEx(id, options) {
-      var _this55 = this;
+      var _this56 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this55._socket.emit('getHistory', id, options, function (err, values, stepIgnore, sessionId) {
+        return _this56._socket.emit('getHistory', id, options, function (err, values, stepIgnore, sessionId) {
           return err ? reject(err) : resolve({
             values: values,
             sessionId: sessionId,
@@ -2623,12 +2657,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "changePassword",
     value: function changePassword(user, password) {
-      var _this56 = this;
+      var _this57 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
       return new Promise(function (resolve, reject) {
-        return _this56._socket.emit('changePassword', user, password, function (err) {
+        return _this57._socket.emit('changePassword', user, password, function (err) {
           return err ? reject(err) : resolve();
         });
       });
@@ -2667,7 +2701,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getHostByIp",
     value: function getHostByIp(ipOrHostName, update) {
-      var _this57 = this;
+      var _this58 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2679,7 +2713,7 @@ var Connection = /*#__PURE__*/function () {
         return this._promises[cache];
       }
       this._promises[cache] = new Promise(function (resolve) {
-        return _this57._socket.emit('getHostByIp', ipOrHostName, function (ip, host) {
+        return _this58._socket.emit('getHostByIp', ipOrHostName, function (ip, host) {
           var _host$native;
           var IPs4 = [{
             name: '[IPv4] 0.0.0.0 - Listen on all IPs',
@@ -2730,12 +2764,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "encrypt",
     value: function encrypt(text) {
-      var _this58 = this;
+      var _this59 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
       return new Promise(function (resolve, reject) {
-        return _this58._socket.emit('encrypt', text, function (err, text) {
+        return _this59._socket.emit('encrypt', text, function (err, text) {
           return err ? reject(err) : resolve(text);
         });
       });
@@ -2749,12 +2783,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "decrypt",
     value: function decrypt(encryptedText) {
-      var _this59 = this;
+      var _this60 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
       return new Promise(function (resolve, reject) {
-        return _this59._socket.emit('decrypt', encryptedText, function (err, text) {
+        return _this60._socket.emit('decrypt', encryptedText, function (err, text) {
           return err ? reject(err) : resolve(text);
         });
       });
@@ -2767,12 +2801,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getVersion",
     value: function getVersion(update) {
-      var _this60 = this;
+      var _this61 = this;
       if (update && this._promises.version) {
         this._promises.version = null;
       }
       this._promises.version = this._promises.version || new Promise(function (resolve, reject) {
-        return _this60._socket.emit('getVersion', function (err, version, serverName) {
+        return _this61._socket.emit('getVersion', function (err, version, serverName) {
           // support of old socket.io
           if (err && !version && typeof err === 'string' && err.match(/\d+\.\d+\.\d+/)) {
             resolve({
@@ -2797,9 +2831,9 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getWebServerName",
     value: function getWebServerName() {
-      var _this61 = this;
+      var _this62 = this;
       this._promises.webName = this._promises.webName || new Promise(function (resolve, reject) {
-        return _this61._socket.emit('getAdapterName', function (err, name) {
+        return _this62._socket.emit('getAdapterName', function (err, name) {
           return err ? reject(err) : resolve(name);
         });
       });
@@ -2828,7 +2862,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "chmodFile",
     value: function chmodFile(adapter, filename, options) {
-      var _this62 = this;
+      var _this63 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2836,7 +2870,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this62._socket.emit('chmodFile', adapter, filename, options, function (err, entries, id) {
+        return _this63._socket.emit('chmodFile', adapter, filename, options, function (err, entries, id) {
           return err ? reject(err) : resolve({
             entries: entries,
             id: id
@@ -2855,7 +2889,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "chownFile",
     value: function chownFile(adapter, filename, options) {
-      var _this63 = this;
+      var _this64 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2863,7 +2897,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this63._socket.emit('chownFile', adapter, filename, options, function (err, entries, id) {
+        return _this64._socket.emit('chownFile', adapter, filename, options, function (err, entries, id) {
           return err ? reject(err) : resolve({
             entries: entries,
             id: id
@@ -2881,12 +2915,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "fileExists",
     value: function fileExists(adapter, filename) {
-      var _this64 = this;
+      var _this65 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this64._socket.emit('fileExists', adapter, filename, function (err, exists) {
+        return _this65._socket.emit('fileExists', adapter, filename, function (err, exists) {
           return err ? reject(err) : resolve(exists);
         });
       });
@@ -2901,7 +2935,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getNotifications",
     value: function getNotifications(host, category) {
-      var _this65 = this;
+      var _this66 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2909,7 +2943,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve) {
-        return _this65._socket.emit('sendToHost', host, 'getNotifications', {
+        return _this66._socket.emit('sendToHost', host, 'getNotifications', {
           category: category
         }, function (notifications) {
           return resolve(notifications);
@@ -2926,7 +2960,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "clearNotifications",
     value: function clearNotifications(host, category) {
-      var _this66 = this;
+      var _this67 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2934,7 +2968,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve) {
-        return _this66._socket.emit('sendToHost', host, 'clearNotifications', {
+        return _this67._socket.emit('sendToHost', host, 'clearNotifications', {
           category: category
         }, function (notifications) {
           return resolve(notifications);
@@ -2949,7 +2983,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getIsEasyModeStrict",
     value: function getIsEasyModeStrict() {
-      var _this67 = this;
+      var _this68 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2957,7 +2991,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this67._socket.emit('getIsEasyModeStrict', function (error, isStrict) {
+        return _this68._socket.emit('getIsEasyModeStrict', function (error, isStrict) {
           return error ? reject(error) : resolve(isStrict);
         });
       });
@@ -2970,7 +3004,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getEasyMode",
     value: function getEasyMode() {
-      var _this68 = this;
+      var _this69 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -2978,7 +3012,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this68._socket.emit('getEasyMode', function (error, config) {
+        return _this69._socket.emit('getEasyMode', function (error, config) {
           return error ? reject(error) : resolve(config);
         });
       });
@@ -2991,12 +3025,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getCurrentUser",
     value: function getCurrentUser() {
-      var _this69 = this;
+      var _this70 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve) {
-        return _this69._socket.emit('authEnabled', function (isSecure, user) {
+        return _this70._socket.emit('authEnabled', function (isSecure, user) {
           return resolve(user);
         });
       });
@@ -3039,7 +3073,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getRatings",
     value: function getRatings(update) {
-      var _this70 = this;
+      var _this71 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -3047,7 +3081,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this70._socket.emit('getRatings', update, function (err, ratings) {
+        return _this71._socket.emit('getRatings', update, function (err, ratings) {
           return err ? reject(err) : resolve(ratings);
         });
       });
@@ -3060,12 +3094,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getCurrentInstance",
     value: function getCurrentInstance() {
-      var _this71 = this;
+      var _this72 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises.currentInstance = this._promises.currentInstance || new Promise(function (resolve, reject) {
-        return _this71._socket.emit('getCurrentInstance', function (err, namespace) {
+        return _this72._socket.emit('getCurrentInstance', function (err, namespace) {
           return err ? reject(err) : resolve(namespace);
         });
       });
@@ -3076,7 +3110,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getCompactAdapters",
     value: function getCompactAdapters(update) {
-      var _this72 = this;
+      var _this73 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -3087,7 +3121,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises.compactAdapters = new Promise(function (resolve, reject) {
-        return _this72._socket.emit('getCompactAdapters', function (err, adapters) {
+        return _this73._socket.emit('getCompactAdapters', function (err, adapters) {
           return err ? reject(err) : resolve(adapters);
         });
       });
@@ -3105,7 +3139,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getCompactInstances",
     value: function getCompactInstances(update) {
-      var _this73 = this;
+      var _this74 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -3116,7 +3150,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises.compactInstances = new Promise(function (resolve, reject) {
-        return _this73._socket.emit('getCompactInstances', function (err, instances) {
+        return _this74._socket.emit('getCompactInstances', function (err, instances) {
           return err ? reject(err) : resolve(instances);
         });
       });
@@ -3135,7 +3169,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getCompactInstalled",
     value: function getCompactInstalled(host, update, cmdTimeout) {
-      var _this74 = this;
+      var _this75 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -3155,8 +3189,8 @@ var Connection = /*#__PURE__*/function () {
             timeout = null;
             reject('getCompactInstalled timeout');
           }
-        }, cmdTimeout || _this74.props.cmdTimeout);
-        _this74._socket.emit('getCompactInstalled', host, function (data) {
+        }, cmdTimeout || _this75.props.cmdTimeout);
+        _this75._socket.emit('getCompactInstalled', host, function (data) {
           if (timeout) {
             clearTimeout(timeout);
             timeout = null;
@@ -3178,7 +3212,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getCompactSystemRepositories",
     value: function getCompactSystemRepositories(update, cmdTimeout) {
-      var _this75 = this;
+      var _this76 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -3192,8 +3226,8 @@ var Connection = /*#__PURE__*/function () {
             timeout = null;
             reject('getCompactSystemRepositories timeout');
           }
-        }, cmdTimeout || _this75.props.cmdTimeout);
-        _this75._socket.emit('getCompactSystemRepositories', function (data) {
+        }, cmdTimeout || _this76.props.cmdTimeout);
+        _this76._socket.emit('getCompactSystemRepositories', function (data) {
           if (timeout) {
             clearTimeout(timeout);
             timeout = null;
@@ -3227,7 +3261,7 @@ var Connection = /*#__PURE__*/function () {
     value:
     // returns very optimized information for adapters to minimize connection load
     function getCompactSystemConfig(update) {
-      var _this76 = this;
+      var _this77 = this;
       if (!update && this._promises.systemConfigCommon) {
         return this._promises.systemConfigCommon;
       }
@@ -3235,7 +3269,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises.systemConfigCommon = new Promise(function (resolve, reject) {
-        return _this76._socket.emit('getCompactSystemConfig', function (err, systemConfig) {
+        return _this77._socket.emit('getCompactSystemConfig', function (err, systemConfig) {
           return err ? reject(err) : resolve(systemConfig);
         });
       });
@@ -3252,7 +3286,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getCompactRepository",
     value: function getCompactRepository(host, update, timeoutMs) {
-      var _this77 = this;
+      var _this78 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -3271,8 +3305,8 @@ var Connection = /*#__PURE__*/function () {
             timeout = null;
             reject('getCompactRepository timeout');
           }
-        }, timeoutMs || _this77.props.cmdTimeout);
-        _this77._socket.emit('getCompactRepository', host, function (data) {
+        }, timeoutMs || _this78.props.cmdTimeout);
+        _this78._socket.emit('getCompactRepository', host, function (data) {
           if (timeout) {
             clearTimeout(timeout);
             timeout = null;
@@ -3291,7 +3325,7 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "getCompactHosts",
     value: function getCompactHosts(update) {
-      var _this78 = this;
+      var _this79 = this;
       if (Connection.isWeb()) {
         return Promise.reject('Allowed only in admin');
       }
@@ -3302,7 +3336,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises.hostsCompact = new Promise(function (resolve, reject) {
-        return _this78._socket.emit('getCompactHosts', function (err, hosts) {
+        return _this79._socket.emit('getCompactHosts', function (err, hosts) {
           return err ? reject(err) : resolve(hosts);
         });
       });
@@ -3342,12 +3376,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "subscribeOnInstance",
     value: function subscribeOnInstance(targetInstance, messageType, data, callback) {
-      var _this79 = this;
+      var _this80 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this79._socket.emit('clientSubscribe', targetInstance, messageType, data, function (err, result) {
+        return _this80._socket.emit('clientSubscribe', targetInstance, messageType, data, function (err, result) {
           if (err) {
             reject(err);
           } else if (result && result.error) {
@@ -3357,11 +3391,11 @@ var Connection = /*#__PURE__*/function () {
               targetInstance = "system.adapter.".concat(targetInstance);
             }
             // save callback
-            _this79._instanceSubscriptions[targetInstance] = _this79._instanceSubscriptions[targetInstance] || [];
-            if (!_this79._instanceSubscriptions[targetInstance].find(function (sub) {
+            _this80._instanceSubscriptions[targetInstance] = _this80._instanceSubscriptions[targetInstance] || [];
+            if (!_this80._instanceSubscriptions[targetInstance].find(function (sub) {
               return sub.messageType === messageType && sub.callback === callback;
             })) {
-              _this79._instanceSubscriptions[targetInstance].push({
+              _this80._instanceSubscriptions[targetInstance].push({
                 messageType: messageType,
                 callback: callback
               });
@@ -3376,43 +3410,59 @@ var Connection = /*#__PURE__*/function () {
      * Unsubscribe from instance message
      * @param {string} [targetInstance] instance, like 'cameras.0'
      * @param {string} [messageType] message type like 'startCamera/cam3'
-     * @param {function} [callback] message handler
+     * @param {function} [callback] message handler. Could be null if all callbacks for this messageType should be unsubscribed
      * @returns {Promise<boolean>}
      */
   }, {
     key: "unsubscribeFromInstance",
     value: function unsubscribeFromInstance(targetInstance, messageType, callback) {
-      var _this$_instanceSubscr,
-        _this80 = this;
+      var _this81 = this;
       if (!targetInstance.startsWith('system.adapter.')) {
         targetInstance = "system.adapter.".concat(targetInstance);
       }
-      var index = (_this$_instanceSubscr = this._instanceSubscriptions[targetInstance]) === null || _this$_instanceSubscr === void 0 ? void 0 : _this$_instanceSubscr.findIndex(function (sub) {
-        return sub.messageType === messageType && sub.callback === callback;
-      });
-      if (index !== undefined && index !== null && index !== -1) {
-        // remember messageType
-        var _messageType = this._instanceSubscriptions[targetInstance][index].messageType;
-        this._instanceSubscriptions[targetInstance].splice(index, 1);
-        if (!this._instanceSubscriptions[targetInstance].length) {
-          delete this._instanceSubscriptions[targetInstance];
-        }
+      var deleted;
+      var promiseResults = [];
+      var _loop = function _loop() {
+        var _this81$_instanceSubs;
+        deleted = false;
+        var index = (_this81$_instanceSubs = _this81._instanceSubscriptions[targetInstance]) === null || _this81$_instanceSubs === void 0 ? void 0 : _this81$_instanceSubs.findIndex(function (sub) {
+          return (!messageType || sub.messageType === messageType) && (!callback || sub.callback === callback);
+        });
+        if (index !== undefined && index !== null && index !== -1) {
+          deleted = true;
+          // remember messageType
+          var _messageType = _this81._instanceSubscriptions[targetInstance][index].messageType;
+          _this81._instanceSubscriptions[targetInstance].splice(index, 1);
+          if (!_this81._instanceSubscriptions[targetInstance].length) {
+            delete _this81._instanceSubscriptions[targetInstance];
+          }
 
-        // try to find another subscription for this instance and messageType
-        var found = this._instanceSubscriptions[targetInstance] && this._instanceSubscriptions[targetInstance].find(function (sub) {
-          return sub.messageType === _messageType;
-        });
-        if (!found) {
-          return new Promise(function (resolve, reject) {
-            return _this80._socket.emit('clientUnsubscribe', targetInstance, messageType, function (err, wasSubscribed) {
-              if (err) {
-                reject(err);
-              } else {
-                resolve(wasSubscribed);
-              }
-            });
+          // try to find another subscription for this instance and messageType
+          var found = _this81._instanceSubscriptions[targetInstance] && _this81._instanceSubscriptions[targetInstance].find(function (sub) {
+            return sub.messageType === _messageType;
           });
+          if (!found) {
+            promiseResults.push(new Promise(function (resolve, reject) {
+              return _this81._socket.emit('clientUnsubscribe', targetInstance, messageType, function (err, wasSubscribed) {
+                if (err) {
+                  reject(err);
+                } else {
+                  resolve(wasSubscribed);
+                }
+              });
+            }));
+          }
         }
+      };
+      do {
+        _loop();
+      } while (deleted && (!callback || !messageType));
+      if (promiseResults.length) {
+        return Promise.all(promiseResults).then(function (results) {
+          return results.find(function (result) {
+            return result;
+          }) || false;
+        });
       }
       return Promise.resolve(false);
     }
@@ -3436,12 +3486,12 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "logout",
     value: function logout() {
-      var _this81 = this;
+      var _this82 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
       }
       return new Promise(function (resolve, reject) {
-        return _this81._socket.emit('logout', function (err) {
+        return _this82._socket.emit('logout', function (err) {
           return err ? reject(err) : resolve(null);
         });
       });