@iobroker/adapter-react-v5 4.4.6 → 4.4.7

package/LegacyConnection.d.ts

@@ -125,20 +125,20 @@ declare class Connection {
     subscribeState(id: string, binary: boolean, cb: ioBroker.StateChangeHandler): void;
     /**
      * Subscribe to changes of the given state.
-     * @param {string} id The ioBroker state ID.
+     * @param {string | string[]} id The ioBroker state ID or array of states
      * @param {ioBroker.StateChangeHandler} cb The callback.
      */
-    subscribeStateAsync(id: string, cb: ioBroker.StateChangeHandler): Promise<any>;
+    subscribeStateAsync(id: string | string[], cb: ioBroker.StateChangeHandler): Promise<any>;
     /**
      * Unsubscribes all callbacks from changes of the given state.
-     * @param {string} id The ioBroker state ID.
+     * @param {string | string[]} id The ioBroker state ID or array of states
      */
     /**
      * Unsubscribes the given callback from changes of the given state.
-     * @param {string} id The ioBroker state ID.
+     * @param {string | string[]} id The ioBroker state ID or array of states
      * @param {ioBroker.StateChangeHandler} cb The callback.
      */
-    unsubscribeState(id: string, cb: ioBroker.StateChangeHandler): void;
+    unsubscribeState(id: string | string[], cb: ioBroker.StateChangeHandler): void;
     /**
      * Subscribe to changes of the given object.
      * @param {string} id The ioBroker object ID.
@@ -167,7 +167,7 @@ declare class Connection {
     fileChange(id: any, fileName: any, size: any): void;
     /**
      * Subscribe to changes of the files.
-     * @param {string} id The ioBroker state ID for meat object. Could be a pattern
+     * @param {string} id The ioBroker state ID for meta-object. Could be a pattern
      * @param {string} filePattern Pattern or file name, like 'main/*' or 'main/visViews.json`
      * @param {function} cb The callback.
      */

package/LegacyConnection.js

@@ -545,23 +545,35 @@ var Connection = /*#__PURE__*/function () {
         cb = binary;
         binary = false;
       }
-      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) {
-            this._socket.emit('subscribe', id);
+      var ids;
+      if (!Array.isArray(id)) {
+        ids = [id];
+      } else {
+        ids = id;
+      }
+      var toSubscribe = [];
+      for (var i = 0; i < ids.length; i++) {
+        var _id = ids[i];
+        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 (_id !== this.ignoreState) {
+            toSubscribe.push(_id);
+          }
+        } else {
+          !this.statesSubscribes[_id].cbs.includes(cb) && this.statesSubscribes[_id].cbs.push(cb);
         }
-      } else {
-        !this.statesSubscribes[id].cbs.includes(cb) && this.statesSubscribes[id].cbs.push(cb);
+      }
+      if (toSubscribe.length && this.connected) {
+        // no answer from server required
+        this._socket.emit('subscribe', toSubscribe);
       }
       if (typeof cb === 'function' && this.connected) {
         if (binary) {
@@ -583,31 +595,43 @@ var Connection = /*#__PURE__*/function () {
 
     /**
      * Subscribe to changes of the given state.
-     * @param {string} id The ioBroker state ID.
+     * @param {string | string[]} id The ioBroker state ID or array of states
      * @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) {
+      var ids;
+      if (!Array.isArray(id)) {
+        ids = [id];
+      } else {
+        ids = id;
+      }
+      var toSubscribe = [];
+      for (var i = 0; i < ids.length; i++) {
+        var _id = ids[i];
+        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 (_id !== this.ignoreState) {
             // no answer from server required
-            this._socket.emit('subscribe', id);
+            toSubscribe.push(_id);
           }
+        } else {
+          !this.statesSubscribes[_id].cbs.includes(cb) && this.statesSubscribes[_id].cbs.push(cb);
         }
-      } else {
-        !this.statesSubscribes[id].cbs.includes(cb) && this.statesSubscribes[id].cbs.push(cb);
+      }
+      if (toSubscribe.length && this.connected) {
+        // no answer from server required
+        this._socket.emit('subscribe', toSubscribe);
       }
       return new Promise(function (resolve, reject) {
         if (typeof cb === 'function' && _this5.connected) {
@@ -626,30 +650,44 @@ var Connection = /*#__PURE__*/function () {
 
     /**
      * Unsubscribes all callbacks from changes of the given state.
-     * @param {string} id The ioBroker state ID.
+     * @param {string | string[]} id The ioBroker state ID or array of states
      */
     /**
      * Unsubscribes the given callback from changes of the given state.
-     * @param {string} id The ioBroker state ID.
+     * @param {string | string[]} id The ioBroker state ID or array of states
      * @param {ioBroker.StateChangeHandler} cb The callback.
      */
   }, {
     key: "unsubscribeState",
     value: function unsubscribeState(id, cb) {
-      if (this.statesSubscribes[id]) {
-        if (cb) {
-          var pos = this.statesSubscribes[id].cbs.indexOf(cb);
-          pos !== -1 && this.statesSubscribes[id].cbs.splice(pos, 1);
-        } else {
-          this.statesSubscribes[id].cbs = [];
-        }
-        if (!this.statesSubscribes[id].cbs || !this.statesSubscribes[id].cbs.length) {
-          delete this.statesSubscribes[id];
-          if (this.connected && id !== this.ignoreState) {
-            this._socket.emit('unsubscribe', id);
+      var ids;
+      if (!Array.isArray(id)) {
+        ids = [id];
+      } else {
+        ids = id;
+      }
+      var toUnsubscribe = [];
+      for (var i = 0; i < ids.length; i++) {
+        var _id = ids[i];
+        if (this.statesSubscribes[_id]) {
+          if (cb) {
+            var pos = this.statesSubscribes[_id].cbs.indexOf(cb);
+            pos !== -1 && this.statesSubscribes[_id].cbs.splice(pos, 1);
+          } else {
+            this.statesSubscribes[_id].cbs = [];
+          }
+          if (!this.statesSubscribes[_id].cbs || !this.statesSubscribes[_id].cbs.length) {
+            delete this.statesSubscribes[_id];
+            if (_id !== this.ignoreState) {
+              toUnsubscribe.push(_id);
+            }
           }
         }
       }
+      if (toUnsubscribe.length && this.connected) {
+        // no answer from server required
+        this._socket.emit('unsubscribe', toUnsubscribe);
+      }
     }
 
     /**
@@ -661,19 +699,32 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "subscribeObject",
     value: function subscribeObject(id, cb) {
-      if (!this.objectsSubscribes[id]) {
-        var reg = id.replace(/\./g, '\\.').replace(/\*/g, '.*');
-        if (!reg.includes('*')) {
-          reg += '$';
-        }
-        this.objectsSubscribes[id] = {
-          reg: new RegExp(reg),
-          cbs: []
-        };
-        this.objectsSubscribes[id].cbs.push(cb);
-        this.connected && this._socket.emit('subscribeObjects', id);
+      var ids;
+      if (!Array.isArray(id)) {
+        ids = [id];
       } else {
-        !this.objectsSubscribes[id].cbs.includes(cb) && this.objectsSubscribes[id].cbs.push(cb);
+        ids = id;
+      }
+      var toSubscribe = [];
+      for (var i = 0; i < ids.length; i++) {
+        var _id = ids[i];
+        if (!this.objectsSubscribes[_id]) {
+          var reg = _id.replace(/\./g, '\\.').replace(/\*/g, '.*');
+          if (!reg.includes('*')) {
+            reg += '$';
+          }
+          this.objectsSubscribes[_id] = {
+            reg: new RegExp(reg),
+            cbs: []
+          };
+          this.objectsSubscribes[_id].cbs.push(cb);
+          ids.push(_id);
+        } else {
+          !this.objectsSubscribes[_id].cbs.includes(cb) && this.objectsSubscribes[_id].cbs.push(cb);
+        }
+      }
+      if (this.connected && toSubscribe.length) {
+        this._socket.emit('subscribeObjects', toSubscribe);
       }
       return Promise.resolve();
     }
@@ -692,18 +743,31 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "unsubscribeObject",
     value: function unsubscribeObject(id, cb) {
-      if (this.objectsSubscribes[id]) {
-        if (cb) {
-          var pos = this.objectsSubscribes[id].cbs.indexOf(cb);
-          pos !== -1 && this.objectsSubscribes[id].cbs.splice(pos, 1);
-        } else {
-          this.objectsSubscribes[id].cbs = [];
-        }
-        if (this.connected && (!this.objectsSubscribes[id].cbs || !this.objectsSubscribes[id].cbs.length)) {
-          delete this.objectsSubscribes[id];
-          this.connected && this._socket.emit('unsubscribeObjects', id);
+      var ids;
+      if (!Array.isArray(id)) {
+        ids = [id];
+      } else {
+        ids = id;
+      }
+      var toUnsubscribe = [];
+      for (var i = 0; i < ids.length; i++) {
+        var _id = ids[i];
+        if (this.objectsSubscribes[_id]) {
+          if (cb) {
+            var pos = this.objectsSubscribes[_id].cbs.indexOf(cb);
+            pos !== -1 && this.objectsSubscribes[_id].cbs.splice(pos, 1);
+          } else {
+            this.objectsSubscribes[_id].cbs = [];
+          }
+          if (this.connected && (!this.objectsSubscribes[_id].cbs || !this.objectsSubscribes[_id].cbs.length)) {
+            delete this.objectsSubscribes[_id];
+            toUnsubscribe.push(_id);
+          }
         }
       }
+      if (this.connected && toUnsubscribe.length) {
+        this._socket.emit('unsubscribeObjects', toUnsubscribe);
+      }
       return Promise.resolve();
     }
 
@@ -741,7 +805,7 @@ var Connection = /*#__PURE__*/function () {
 
     /**
      * Subscribe to changes of the files.
-     * @param {string} id The ioBroker state ID for meat object. Could be a pattern
+     * @param {string} id The ioBroker state ID for meta-object. Could be a pattern
      * @param {string} filePattern Pattern or file name, like 'main/*' or 'main/visViews.json`
      * @param {function} cb The callback.
      */
@@ -749,7 +813,7 @@ var Connection = /*#__PURE__*/function () {
     key: "subscribeFiles",
     value: function () {
       var _subscribeFiles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id, filePattern, cb) {
-        var key;
+        var filePatterns, toSubscribe, f, pattern, key;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -759,18 +823,30 @@ var Connection = /*#__PURE__*/function () {
               }
               throw new Error('The state change handler must be a function!');
             case 2:
-              key = "".concat(id, "$%$").concat(filePattern);
-              if (!this.filesSubscribes[key]) {
-                this.filesSubscribes[key] = {
-                  regId: new RegExp(pattern2RegEx(id)),
-                  regFilePattern: new RegExp(pattern2RegEx(filePattern)),
-                  cbs: [cb]
-                };
-                this.connected && this._socket.emit('subscribeFiles', id, filePattern);
+              if (Array.isArray(filePattern)) {
+                filePatterns = filePattern;
               } else {
-                !this.filesSubscribes[key].cbs.includes(cb) && this.filesSubscribes[key].cbs.push(cb);
+                filePatterns = [filePattern];
+              }
+              toSubscribe = [];
+              for (f = 0; f < filePatterns.length; f++) {
+                pattern = filePatterns[f];
+                key = "".concat(id, "$%$").concat(pattern);
+                if (!this.filesSubscribes[key]) {
+                  this.filesSubscribes[key] = {
+                    regId: new RegExp(pattern2RegEx(id)),
+                    regFilePattern: new RegExp(pattern2RegEx(pattern)),
+                    cbs: [cb]
+                  };
+                  toSubscribe.push(pattern);
+                } else {
+                  !this.filesSubscribes[key].cbs.includes(cb) && this.filesSubscribes[key].cbs.push(cb);
+                }
+              }
+              if (this.connected && toSubscribe.length) {
+                this._socket.emit('subscribeFiles', id, toSubscribe);
               }
-            case 4:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -790,20 +866,33 @@ var Connection = /*#__PURE__*/function () {
   }, {
     key: "unsubscribeFiles",
     value: function unsubscribeFiles(id, filePattern, cb) {
-      var key = "".concat(id, "$%$").concat(filePattern);
-      if (this.filesSubscribes[key]) {
-        var sub = this.filesSubscribes[key];
-        if (cb) {
-          var pos = sub.cbs.indexOf(cb);
-          pos !== -1 && sub.cbs.splice(pos, 1);
-        } else {
-          sub.cbs = [];
-        }
-        if (!sub.cbs || !sub.cbs.length) {
-          delete this.filesSubscribes[key];
-          this.connected && this._socket.emit('unsubscribeFiles', id, filePattern);
+      var filePatterns;
+      if (Array.isArray(filePattern)) {
+        filePatterns = filePattern;
+      } else {
+        filePatterns = [filePattern];
+      }
+      var toUnsubscribe = [];
+      for (var f = 0; f < filePatterns.length; f++) {
+        var pattern = filePatterns[f];
+        var key = "".concat(id, "$%$").concat(pattern);
+        if (this.filesSubscribes[key]) {
+          var sub = this.filesSubscribes[key];
+          if (cb) {
+            var pos = sub.cbs.indexOf(cb);
+            pos !== -1 && sub.cbs.splice(pos, 1);
+          } else {
+            sub.cbs = [];
+          }
+          if (!sub.cbs || !sub.cbs.length) {
+            delete this.filesSubscribes[key];
+            this.connected && toUnsubscribe.push(pattern);
+          }
         }
       }
+      if (this.connected && toUnsubscribe.length) {
+        this._socket.emit('unsubscribeFiles', id, toUnsubscribe);
+      }
     }
 
     /**