@iobroker/adapter-react-v5 4.3.0 → 4.3.2

package/LegacyConnection.d.ts

@@ -372,7 +372,7 @@ declare class Connection {
      * Unset the handler for standard output of a command.
      * @param {(id: string, text: string) => void} handler The handler.
      */
-    unregisterCmdStdoutHandler(handler: (id: string, text: string) => void): void;
+    unregisterCmdStdoutHandler(): void;
     /**
      * Set the handler for standard error of a command.
      * @param {(id: string, text: string) => void} handler The handler.
@@ -383,7 +383,7 @@ declare class Connection {
      * Unset the handler for standard error of a command.
      * @param {(id: string, text: string) => void} handler The handler.
      */
-    unregisterCmdStderrHandler(handler: (id: string, text: string) => void): void;
+    unregisterCmdStderrHandler(): void;
     /**
      * Set the handler for exit of a command.
      * @param {(id: string, exitCode: number) => void} handler The handler.
@@ -394,7 +394,7 @@ declare class Connection {
      * Unset the handler for exit of a command.
      * @param {(id: string, exitCode: number) => void} handler The handler.
      */
-    unregisterCmdExitHandler(handler: (id: string, exitCode: number) => void): void;
+    unregisterCmdExitHandler(): void;
     /**
      * Get all enums with the given name.
      * @param {string} [_enum] The name of the enum
@@ -557,8 +557,8 @@ declare class Connection {
     /**
      * Rename file in ioBroker DB
      * @param adapter instance name
-     * @param oldName current file name, e.g main/vis-views.json
-     * @param newName new file name, e.g main/vis-views-new.json
+     * @param oldName current file name, e.g, main/vis-views.json
+     * @param newName new file name, e.g, main/vis-views-new.json
      */
     renameFile(adapter: any, oldName: any, newName: any): Promise<any>;
     /**
@@ -780,7 +780,7 @@ declare class Connection {
     getCompactInstalled(host: any, update: any, cmdTimeout: any): any;
     getCompactSystemRepositories(update: any, cmdTimeout: any): Promise<any>;
     getInstalledResetCache(host: any): void;
-    getInstalledResetCache(host: any): void;
+    getInstalledResetCache(): void;
     getCompactSystemConfig(update: any): Promise<any>;
     /**
      * Get the repository in compact form (only version and icon).

package/LegacyConnection.js

@@ -132,7 +132,7 @@ var Connection = /*#__PURE__*/function () {
     this.filesSubscribes = {}; // subscribe for files
     this.onProgress = this.props.onProgress || function () {};
     this.onError = this.props.onError || function (err) {
-      console.error(err);
+      return console.error(err);
     };
     this.loaded = false;
     this.loadTimer = null;
@@ -192,9 +192,8 @@ var Connection = /*#__PURE__*/function () {
               return _this2.startSocket();
             }, 100);
             return;
-          } else {
-            window.alert('Cannot load socket.io.js!');
           }
+          window.alert('Cannot load socket.io.js!');
         } else {
           // register on load
           window.registerSocketOnLoad(function () {
@@ -202,11 +201,10 @@ var Connection = /*#__PURE__*/function () {
           });
         }
         return;
-      } else {
+      }
+      if (this._socket) {
         // socket was initialized, do not repeat
-        if (this._socket) {
-          return;
-        }
+        return;
       }
       var host = this.props.host;
       var port = this.props.port;
@@ -215,7 +213,7 @@ var Connection = /*#__PURE__*/function () {
       if (window.location.hostname === 'iobroker.net' || window.location.hostname === 'iobroker.pro') {
         path = '';
       } else {
-        // if web adapter, socket io could be on other port or even host
+        // if web adapter, socket io could be on another port or even host
         if (window.socketUrl) {
           var parts = window.socketUrl.split(':');
           host = parts[0] || host;
@@ -438,9 +436,8 @@ var Connection = /*#__PURE__*/function () {
     value: function _getUserPermissions(cb) {
       if (this.doNotLoadACL) {
         return cb && cb();
-      } else {
-        this._socket.emit('getUserPermissions', cb);
       }
+      this._socket.emit('getUserPermissions', cb);
     }
 
     /**
@@ -453,8 +450,10 @@ var Connection = /*#__PURE__*/function () {
       var _this4 = this;
       this._getUserPermissions(function (err, acl) {
         if (err) {
-          return _this4.onError("Cannot read user permissions: ".concat(err));
-        } else if (!_this4.doNotLoadACL) {
+          _this4.onError("Cannot read user permissions: ".concat(err));
+          return;
+        }
+        if (!_this4.doNotLoadACL) {
           if (_this4.loaded) {
             return;
           }
@@ -495,13 +494,12 @@ var Connection = /*#__PURE__*/function () {
               _this4.onProgress(PROGRESS.READY);
               _this4.props.onReady && _this4.props.onReady(_this4.objects);
             });
-          } else {
-            _this4.objects = _this4.admin5only ? {} : {
-              'system.config': data
-            };
-            _this4.onProgress(PROGRESS.READY);
-            _this4.props.onReady && _this4.props.onReady(_this4.objects);
           }
+          _this4.objects = _this4.admin5only ? {} : {
+            'system.config': data
+          };
+          _this4.onProgress(PROGRESS.READY);
+          _this4.props.onReady && _this4.props.onReady(_this4.objects);
           return undefined;
         })["catch"](function (e) {
           return _this4.onError("Cannot read system config: ".concat(e));
@@ -810,7 +808,7 @@ var Connection = /*#__PURE__*/function () {
       }
       Object.keys(this.objectsSubscribes).forEach(function (_id) {
         if (_id === id || _this5.objectsSubscribes[_id].reg.test(id)) {
-          //@ts-ignore
+          // @ts-ignore
           _this5.objectsSubscribes[_id].cbs.forEach(function (cb) {
             try {
               cb(id, obj, oldObj);
@@ -862,7 +860,7 @@ var Connection = /*#__PURE__*/function () {
       return new Promise(function (resolve, reject) {
         return _this6._socket.emit('getStates', function (err, res) {
           _this6.states = res;
-          //@ts-ignore
+          // @ts-ignore
           !disableProgressUpdate && _this6.onProgress(PROGRESS.STATES_LOADED);
           return err ? reject(err) : resolve(_this6.states);
         });
@@ -1023,18 +1021,17 @@ var Connection = /*#__PURE__*/function () {
       var _this11 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
-      } else {
-        return new Promise(function (resolve, reject) {
-          if (!update && _this11.objects) {
-            return resolve(_this11.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);
-          });
-        });
       }
+      return new Promise(function (resolve, reject) {
+        if (!update && _this11.objects) {
+          return resolve(_this11.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);
+        });
+      });
     }
 
     /**
@@ -1048,13 +1045,12 @@ var Connection = /*#__PURE__*/function () {
       var _this12 = this;
       if (!this.connected) {
         return Promise.reject(NOT_CONNECTED);
-      } else {
-        return new Promise(function (resolve, reject) {
-          return _this12._socket.emit('getObjects', list, function (err, res) {
-            return err ? reject(err) : resolve(res);
-          });
-        });
       }
+      return new Promise(function (resolve, reject) {
+        return _this12._socket.emit('getObjects', list, function (err, res) {
+          return err ? reject(err) : resolve(res);
+        });
+      });
     }
 
     /**
@@ -1270,7 +1266,7 @@ var Connection = /*#__PURE__*/function () {
           }
         });
       });
-      return this._promises['instances_' + adapter];
+      return this._promises["instances_".concat(adapter)];
     }
 
     /**
@@ -1370,7 +1366,7 @@ var Connection = /*#__PURE__*/function () {
         if (groups.length) {
           // find all elements
           var groupsToRename = groups.filter(function (group) {
-            return group._id.startsWith(id + '.');
+            return group._id.startsWith("".concat(id, "."));
           });
           groupsToRename.forEach(function (group) {
             return group.newId = newId + group._id.substring(id.length);
@@ -1506,7 +1502,8 @@ var Connection = /*#__PURE__*/function () {
      */
   }, {
     key: "unregisterCmdStdoutHandler",
-    value: function unregisterCmdStdoutHandler(handler) {
+    value: function unregisterCmdStdoutHandler( /* handler */
+    ) {
       this.onCmdStdoutHandler = null;
     }
 
@@ -1526,7 +1523,8 @@ var Connection = /*#__PURE__*/function () {
      */
   }, {
     key: "unregisterCmdStderrHandler",
-    value: function unregisterCmdStderrHandler(handler) {
+    value: function unregisterCmdStderrHandler( /* handler */
+    ) {
       this.onCmdStderrHandler = null;
     }
 
@@ -1546,7 +1544,8 @@ var Connection = /*#__PURE__*/function () {
      */
   }, {
     key: "unregisterCmdExitHandler",
-    value: function unregisterCmdExitHandler(handler) {
+    value: function unregisterCmdExitHandler( /* handler */
+    ) {
       this.onCmdExitHandler = null;
     }
 
@@ -1569,7 +1568,7 @@ var Connection = /*#__PURE__*/function () {
       this._promises["enums_".concat(_enum || 'all')] = new Promise(function (resolve, reject) {
         _this25._socket.emit('getObjectView', 'system', 'enum', {
           startkey: "enum.".concat(_enum || ''),
-          endkey: "enum.".concat(_enum ? _enum + '.' : '', "\u9999")
+          endkey: "enum.".concat(_enum ? "".concat(_enum, ".") : '', "\u9999")
         }, function (err, res) {
           if (!err && res) {
             var _res = {};
@@ -1618,6 +1617,7 @@ var Connection = /*#__PURE__*/function () {
         });
       });
     }
+
     /**
      * Query a predefined object view.
      * @param type The type of object.
@@ -1678,7 +1678,7 @@ var Connection = /*#__PURE__*/function () {
               name: c,
               type: ''
             };
-            // If it is filename, it could be everything
+            // If it is a filename, it could be everything
             if (cert.length < 700 && (cert.includes('/') || cert.includes('\\'))) {
               if (c.toLowerCase().includes('private')) {
                 _cert.type = 'private';
@@ -2140,7 +2140,7 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       if (!host.startsWith('system.host.')) {
-        host += 'system.host.' + host;
+        host += "system.host.".concat(host);
       }
       this._promises.repo = new Promise(function (resolve, reject) {
         var timeout = setTimeout(function () {
@@ -2237,8 +2237,8 @@ var Connection = /*#__PURE__*/function () {
     /**
      * Rename file in ioBroker DB
      * @param adapter instance name
-     * @param oldName current file name, e.g main/vis-views.json
-     * @param newName new file name, e.g main/vis-views-new.json
+     * @param oldName current file name, e.g, main/vis-views.json
+     * @param newName new file name, e.g, main/vis-views-new.json
      */
   }, {
     key: "renameFile",
@@ -2362,9 +2362,8 @@ var Connection = /*#__PURE__*/function () {
               }
             });
           });
-        } else {
-          return Promise.reject('Not supported');
         }
+        return Promise.reject('Not supported');
       });
     }
 
@@ -2398,18 +2397,17 @@ var Connection = /*#__PURE__*/function () {
                 clearTimeout(timeout);
                 timeout = null;
                 if (data === PERMISSION_ERROR) {
-                  reject('May not write "BaseSettings"');
+                  reject(new Error('May not write "BaseSettings"'));
                 } else if (!data) {
-                  reject('Cannot write "BaseSettings"');
+                  reject(new Error('Cannot write "BaseSettings"'));
                 } else {
                   resolve(data);
                 }
               }
             });
           });
-        } else {
-          return Promise.reject('Not supported');
         }
+        return Promise.reject(new Error('Not supported'));
       });
     }
 
@@ -2470,13 +2468,12 @@ var Connection = /*#__PURE__*/function () {
             return err ? reject(err) : resolve(states);
           });
         });
-      } else {
-        return new Promise(function (resolve, reject) {
-          return _this51._socket.emit('getForeignStates', 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 err ? reject(err) : resolve(states);
+        });
+      });
     }
 
     /**
@@ -2514,11 +2511,11 @@ var Connection = /*#__PURE__*/function () {
         return Promise.reject(NOT_CONNECTED);
       }
       this._promises.systemConfig = this.getObject('system.config').then(function (systemConfig) {
-        //@ts-ignore
+        // @ts-ignore
         systemConfig = systemConfig || {};
-        //@ts-ignore
+        // @ts-ignore
         systemConfig.common = systemConfig.common || {};
-        //@ts-ignore
+        // @ts-ignore
         systemConfig["native"] = systemConfig["native"] || {};
         return systemConfig;
       });
@@ -3190,7 +3187,8 @@ var Connection = /*#__PURE__*/function () {
     }
   }, {
     key: "getInstalledResetCache",
-    value: function getInstalledResetCache(host) {
+    value: function getInstalledResetCache( /* host */
+    ) {
       this._promises.repoCompact = null;
       this._promises.repo = null;
     }