@iobroker/adapter-react-v5 4.4.3 → 4.4.5

package/LegacyConnection.d.ts

@@ -822,7 +822,7 @@ declare class Connection {
      * 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>}
      */
     unsubscribeFromInstance(targetInstance?: string, messageType?: string, callback?: Function): Promise<boolean>;

package/LegacyConnection.js

@@ -3353,14 +3353,16 @@ var Connection = /*#__PURE__*/function () {
           } else if (result && result.error) {
             reject(result.error);
           } else {
+            if (!targetInstance.startsWith('system.adapter.')) {
+              targetInstance = "system.adapter.".concat(targetInstance);
+            }
             // save callback
             _this79._instanceSubscriptions[targetInstance] = _this79._instanceSubscriptions[targetInstance] || [];
             if (!_this79._instanceSubscriptions[targetInstance].find(function (sub) {
-              return sub.messageType === messageType && sub.targetInstance === targetInstance && sub.callback === callback;
+              return sub.messageType === messageType && sub.callback === callback;
             })) {
               _this79._instanceSubscriptions[targetInstance].push({
                 messageType: messageType,
-                targetInstance: targetInstance,
                 callback: callback
               });
             }
@@ -3374,39 +3376,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 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) {
-        var _messageType = this._instanceSubscriptions[targetInstance][index].messageType;
-        this._instanceSubscriptions[targetInstance].splice(index, 1);
-        if (!this._instanceSubscriptions[targetInstance].length) {
-          delete this._instanceSubscriptions[targetInstance];
-        }
+      var _this80 = this;
+      if (!targetInstance.startsWith('system.adapter.')) {
+        targetInstance = "system.adapter.".concat(targetInstance);
+      }
+      var deleted;
+      var promiseResults = [];
+      var _loop = function _loop() {
+        var _this80$_instanceSubs;
+        deleted = false;
+        var index = (_this80$_instanceSubs = _this80._instanceSubscriptions[targetInstance]) === null || _this80$_instanceSubs === void 0 ? void 0 : _this80$_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 = _this80._instanceSubscriptions[targetInstance][index].messageType;
+          _this80._instanceSubscriptions[targetInstance].splice(index, 1);
+          if (!_this80._instanceSubscriptions[targetInstance].length) {
+            delete _this80._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 = _this80._instanceSubscriptions[targetInstance] && _this80._instanceSubscriptions[targetInstance].find(function (sub) {
+            return sub.messageType === _messageType;
           });
+          if (!found) {
+            promiseResults.push(new Promise(function (resolve, reject) {
+              return _this80._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);
     }