@iobroker/adapter-react-v5 7.4.2 → 7.4.3

package/build/LegacyConnection.js

@@ -13,73 +13,10 @@ export const PROGRESS = {
 };
 const PERMISSION_ERROR = 'permissionError';
 const NOT_CONNECTED = 'notConnectedError';
-const TIMEOUT_FOR_ADMIN4 = 1300;
 export const ERRORS = {
     PERMISSION_ERROR,
     NOT_CONNECTED,
 };
-function fixAdminUI(obj) {
-    // @ts-expect-error it is deprecated, but still could appear
-    if (obj?.common && !obj.common.adminUI) {
-        if (obj.common.noConfig) {
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI = obj.common.adminUI || {};
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI.config = 'none';
-            // @ts-expect-error it is deprecated, but still could appear
-        }
-        else if (obj.common.jsonConfig) {
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI = obj.common.adminUI || {};
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI.config = 'json';
-        }
-        else if (obj.common.materialize) {
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI = obj.common.adminUI || {};
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI.config = 'materialize';
-        }
-        else {
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI = obj.common.adminUI || {};
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI.config = 'html';
-        }
-        // @ts-expect-error it is deprecated, but still could appear
-        if (obj.common.jsonCustom) {
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI = obj.common.adminUI || {};
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI.custom = 'json';
-        }
-        else if (obj.common.supportCustoms) {
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI = obj.common.adminUI || {};
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI.custom = 'json';
-        }
-        if (obj.common.materializeTab && obj.common.adminTab) {
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI = obj.common.adminUI || {};
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI.tab = 'materialize';
-        }
-        else if (obj.common.adminTab) {
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI = obj.common.adminUI || {};
-            // @ts-expect-error it is deprecated, but still could appear
-            obj.common.adminUI.tab = 'html';
-        }
-        // @ts-expect-error it is deprecated, but still could appear
-        if (obj.common.adminUI) {
-            console.debug(
-            // @ts-expect-error it is deprecated, but still could appear
-            `Please add to "${obj._id.replace(/\.\d+$/, '')}" common.adminUI=${JSON.stringify(obj.common.adminUI)}`);
-        }
-    }
-    return obj;
-}
 /** Converts ioB pattern into regex */
 export function pattern2RegEx(pattern) {
     pattern = (pattern || '').toString();
@@ -117,7 +54,6 @@ export class LegacyConnection {
     loaded = false;
     loadTimer = null;
     loadCounter = 0;
-    admin5only;
     ignoreState = '';
     simStates = {};
     autoSubscribes;
@@ -152,7 +88,6 @@ export class LegacyConnection {
         this.onError =
             this.props.onError ||
                 ((err) => console.error(err));
-        this.admin5only = this.props.admin5only || false;
         this.startSocket();
     }
     /**
@@ -412,14 +347,9 @@ export class LegacyConnection {
             this.acl = acl;
         }
         // Read system configuration
-        let data;
+        let systemConfig;
         try {
-            if (this.admin5only && !window.vendorPrefix) {
-                data = await this.getCompactSystemConfig();
-            }
-            else {
-                data = await this.getSystemConfig();
-            }
+            systemConfig = await this.getSystemConfig();
             if (this.doNotLoadACL) {
                 if (this.loaded) {
                     return;
@@ -430,7 +360,7 @@ export class LegacyConnection {
                 this.onProgress(PROGRESS.CONNECTED);
                 this.firstConnect = false;
             }
-            this.systemConfig = data;
+            this.systemConfig = systemConfig;
             if (this.systemConfig && this.systemConfig.common) {
                 this.systemLang = this.systemConfig.common.language;
             }
@@ -451,7 +381,7 @@ export class LegacyConnection {
                 this.props.onReady && this.objects && this.props.onReady(this.objects);
             }
             else {
-                this.objects = this.admin5only ? {} : { 'system.config': data };
+                this.objects = { 'system.config': systemConfig };
                 this.onProgress(PROGRESS.READY);
                 this.props.onReady && this.props.onReady(this.objects);
             }
@@ -478,7 +408,7 @@ export class LegacyConnection {
      * @param binary Set to true if the given state is binary and requires Base64 decoding
      * @param cb The callback
      */
-    subscribeState(id, binary, cb) {
+    async subscribeState(id, binary, cb) {
         if (typeof binary === 'function') {
             cb = binary;
             binary = false;
@@ -492,7 +422,7 @@ export class LegacyConnection {
         }
         if (!cb) {
             console.error('No callback found for subscribeState');
-            return;
+            return Promise.reject(new Error('No callback found for subscribeState'));
         }
         const toSubscribe = [];
         for (let i = 0; i < ids.length; i++) {
@@ -525,16 +455,35 @@ export class LegacyConnection {
             this._socket.emit('subscribe', toSubscribe);
         }
         if (binary) {
+            let base64;
             for (let i = 0; i < ids.length; i++) {
-                this.getBinaryState(ids[i])
-                    .then((base64) => cb && cb(ids[i], base64))
-                    .catch(e => console.error(`Cannot getBinaryState "${ids[i]}": ${JSON.stringify(e)}`));
+                try {
+                    // deprecated, but we still support it
+                    base64 = await this.getBinaryState(ids[i]);
+                }
+                catch (e) {
+                    console.error(`Cannot getBinaryState "${ids[i]}": ${JSON.stringify(e)}`);
+                    base64 = undefined;
+                }
+                if (base64 !== undefined && cb) {
+                    cb(ids[i], base64);
+                }
             }
         }
         else {
-            this._socket.emit(LegacyConnection.isWeb() ? 'getStates' : 'getForeignStates', id, (err, states) => {
-                err && console.error(`Cannot getForeignStates "${id}": ${JSON.stringify(err)}`);
-                states && Object.keys(states).forEach(_id => cb(_id, states[_id]));
+            return new Promise((resolve, reject) => {
+                this._socket.emit(LegacyConnection.isWeb() ? 'getStates' : 'getForeignStates', ids, (err, states) => {
+                    if (err) {
+                        console.error(`Cannot getForeignStates "${id}": ${JSON.stringify(err)}`);
+                        reject(new Error(err));
+                    }
+                    else {
+                        if (states) {
+                            Object.keys(states).forEach(_id => cb(_id, states[_id]));
+                        }
+                        resolve();
+                    }
+                });
             });
         }
     }
@@ -1169,26 +1118,14 @@ export class LegacyConnection {
             adapter = '';
         }
         adapter = adapter || '';
-        if (!update && this._promises[`instances_${adapter}`]) {
+        if (!update && this._promises[`instances_${adapter}`] instanceof Promise) {
             return this._promises[`instances_${adapter}`];
         }
         if (!this.connected) {
             return Promise.reject(new Error(NOT_CONNECTED));
         }
         this._promises[`instances_${adapter}`] = new Promise((resolve, reject) => {
-            let timeout = setTimeout(() => {
-                timeout = null;
-                this.getObjectView(`system.adapter.${adapter ? `${adapter}.` : ''}`, `system.adapter.${adapter ? `${adapter}.` : ''}\u9999`, 'instance')
-                    .then(items => resolve(Object.keys(items).map(id => fixAdminUI(items[id]))))
-                    .catch(e => reject(new Error(e)));
-            }, TIMEOUT_FOR_ADMIN4);
-            this._socket.emit('getAdapterInstances', adapter, (err, instances) => {
-                if (timeout) {
-                    clearTimeout(timeout);
-                    timeout = null;
-                    err ? reject(new Error(err)) : resolve(instances);
-                }
-            });
+            this._socket.emit('getAdapterInstances', adapter, (err, instances) => err ? reject(new Error(err)) : resolve(instances));
         });
         return this._promises[`instances_${adapter}`];
     }
@@ -1207,27 +1144,15 @@ export class LegacyConnection {
             adapter = '';
         }
         adapter = adapter || '';
-        if (!update && this._promises[`adapter_${adapter}`]) {
+        if (!update && this._promises[`adapter_${adapter}`] instanceof Promise) {
             return this._promises[`adapter_${adapter}`];
         }
         if (!this.connected) {
             return Promise.reject(new Error(NOT_CONNECTED));
         }
         this._promises[`adapter_${adapter}`] = new Promise((resolve, reject) => {
-            let timeout = setTimeout(() => {
-                timeout = null;
-                this.getObjectView(`system.adapter.${adapter}.`, `system.adapter.${adapter}.\u9999`, 'adapter')
-                    .then(items => {
-                    resolve(Object.keys(items).map(id => fixAdminUI(items[id])));
-                })
-                    .catch(e => reject(new Error(e)));
-            }, TIMEOUT_FOR_ADMIN4);
             this._socket.emit('getAdapters', adapter, (err, adapters) => {
-                if (timeout) {
-                    clearTimeout(timeout);
-                    timeout = null;
-                    err ? reject(new Error(err)) : resolve(adapters);
-                }
+                err ? reject(new Error(err)) : resolve(adapters);
             });
         });
         return this._promises[`adapter_${adapter}`];
@@ -1401,7 +1326,7 @@ export class LegacyConnection {
     _enum, 
     /** Force update. */
     update) {
-        if (!update && this._promises[`enums_${_enum || 'all'}`]) {
+        if (!update && this._promises[`enums_${_enum || 'all'}`] instanceof Promise) {
             return this._promises[`enums_${_enum || 'all'}`];
         }
         if (!this.connected) {
@@ -1498,7 +1423,7 @@ export class LegacyConnection {
         if (LegacyConnection.isWeb()) {
             return Promise.reject(new Error('Allowed only in admin'));
         }
-        if (this._promises.cert && !update) {
+        if (this._promises.cert instanceof Promise && !update) {
             return this._promises.cert;
         }
         if (!this.connected) {
@@ -1703,7 +1628,7 @@ export class LegacyConnection {
         if (LegacyConnection.isWeb()) {
             return Promise.reject(new Error('Allowed only in admin'));
         }
-        if (!update && this._promises.hosts) {
+        if (!update && this._promises.hosts instanceof Promise) {
             return this._promises.hosts;
         }
         if (!this.connected) {
@@ -1730,7 +1655,7 @@ export class LegacyConnection {
         if (LegacyConnection.isWeb()) {
             return Promise.reject(new Error('Allowed only in admin'));
         }
-        if (!update && this._promises.users) {
+        if (!update && this._promises.users instanceof Promise) {
             return this._promises.users;
         }
         if (!this.connected) {
@@ -1754,7 +1679,7 @@ export class LegacyConnection {
      * @param update Force update.
      */
     getGroups(update) {
-        if (!update && this._promises.groups) {
+        if (!update && this._promises.groups instanceof Promise) {
             return this._promises.groups;
         }
         if (!this.connected) {
@@ -1786,7 +1711,7 @@ export class LegacyConnection {
         if (!host.startsWith('system.host.')) {
             host += `system.host.${host}`;
         }
-        if (!update && this._promises[`hostInfo_${host}`]) {
+        if (!update && this._promises[`hostInfo_${host}`] instanceof Promise) {
             return this._promises[`hostInfo_${host}`];
         }
         if (!this.connected) {
@@ -1831,7 +1756,7 @@ export class LegacyConnection {
         if (!host.startsWith('system.host.')) {
             host += `system.host.${host}`;
         }
-        if (!update && this._promises[`hostInfoShort_${host}`]) {
+        if (!update && this._promises[`hostInfoShort_${host}`] instanceof Promise) {
             return this._promises[`hostInfoShort_${host}`];
         }
         if (!this.connected) {
@@ -1874,7 +1799,7 @@ export class LegacyConnection {
         if (LegacyConnection.isWeb()) {
             return Promise.reject(new Error('Allowed only in admin'));
         }
-        if (!update && this._promises.repo) {
+        if (!update && this._promises.repo instanceof Promise) {
             return this._promises.repo;
         }
         if (!this.connected) {
@@ -1920,7 +1845,7 @@ export class LegacyConnection {
             return Promise.reject(new Error('Allowed only in admin'));
         }
         this._promises.installed = this._promises.installed || {};
-        if (!update && this._promises.installed[host]) {
+        if (!update && this._promises.installed[host] instanceof Promise) {
             return this._promises.installed[host];
         }
         if (!this.connected) {
@@ -2038,7 +1963,7 @@ export class LegacyConnection {
     feature, 
     /** Force update. */
     update) {
-        if (!update && this._promises[`supportedFeatures_${feature}`]) {
+        if (!update && this._promises[`supportedFeatures_${feature}`] instanceof Promise) {
             return this._promises[`supportedFeatures_${feature}`];
         }
         if (!this.connected) {
@@ -2195,7 +2120,7 @@ export class LegacyConnection {
      * @param update Force update.
      */
     getSystemConfig(update) {
-        if (!update && this._promises.systemConfig) {
+        if (!update && this._promises.systemConfig instanceof Promise) {
             return this._promises.systemConfig;
         }
         if (!this.connected) {
@@ -2266,7 +2191,7 @@ export class LegacyConnection {
         if (!host.startsWith('system.host.')) {
             host = `system.host.${host}`;
         }
-        if (!update && this._promises[`IPs_${host}`]) {
+        if (!update && this._promises[`IPs_${host}`] instanceof Promise) {
             return this._promises[`IPs_${host}`];
         }
         this._promises[`IPs_${host}`] = this.getObject(host).then(obj => (obj?.common ? obj.common.address || [] : []));
@@ -2284,11 +2209,11 @@ export class LegacyConnection {
         if (ipOrHostName.startsWith('system.host.')) {
             ipOrHostName = ipOrHostName.replace(/^system\.host\./, '');
         }
-        if (!update && this._promises[`rIPs_${ipOrHostName}`]) {
+        if (!update && this._promises[`rIPs_${ipOrHostName}`] instanceof Promise) {
             return this._promises[`rIPs_${ipOrHostName}`];
         }
         this._promises[`rIPs_${ipOrHostName}`] = new Promise(resolve => {
-            this._socket.emit('getHostByIp', ipOrHostName, (ip, host) => {
+            this._socket.emit('getHostByIp', ipOrHostName, (_ip, host) => {
                 const IPs4 = [{ name: '[IPv4] 0.0.0.0 - Listen on all IPs', address: '0.0.0.0', family: 'ipv4' }];
                 const IPs6 = [{ name: '[IPv6] :: - Listen on all IPs', address: '::', family: 'ipv6' }];
                 if (host?.native?.hardware?.networkInterfaces) {
@@ -2348,33 +2273,32 @@ export class LegacyConnection {
      * Gets the version.
      */
     getVersion(update) {
-        if (update && this._promises.version) {
-            delete this._promises.version;
-        }
-        this._promises.version =
-            this._promises.version ||
-                new Promise((resolve, reject) => {
-                    this._socket.emit('getVersion', (err, version, serverName) => {
-                        // support of old socket.io
-                        if (err && !version && typeof err === 'string' && err.match(/\d+\.\d+\.\d+/)) {
-                            resolve({ version: err, serverName: 'socketio' });
-                        }
-                        else {
-                            err ? reject(new Error(err)) : resolve({ version, serverName });
-                        }
-                    });
-                });
+        if (!update && this._promises.version instanceof Promise) {
+            return this._promises.version;
+        }
+        this._promises.version = new Promise((resolve, reject) => {
+            this._socket.emit('getVersion', (err, version, serverName) => {
+                // support of old socket.io
+                if (err && !version && typeof err === 'string' && err.match(/\d+\.\d+\.\d+/)) {
+                    resolve({ version: err, serverName: 'socketio' });
+                }
+                else {
+                    err ? reject(new Error(err)) : resolve({ version, serverName });
+                }
+            });
+        });
         return this._promises.version;
     }
     /**
      * Gets the web server name.
      */
     getWebServerName() {
-        this._promises.webName =
-            this._promises.webName ||
-                new Promise((resolve, reject) => {
-                    this._socket.emit('getAdapterName', (err, name) => err ? reject(new Error(err)) : resolve(name));
-                });
+        if (this._promises.webName instanceof Promise) {
+            return this._promises.webName;
+        }
+        this._promises.webName = new Promise((resolve, reject) => {
+            this._socket.emit('getAdapterName', (err, name) => err ? reject(new Error(err)) : resolve(name));
+        });
         return this._promises.webName;
     }
     /**
@@ -2506,7 +2430,7 @@ export class LegacyConnection {
             return Promise.reject(new Error(NOT_CONNECTED));
         }
         return new Promise(resolve => {
-            this._socket.emit('authEnabled', (isSecure, user) => resolve(user));
+            this._socket.emit('authEnabled', (_isSecure, user) => resolve(user));
         });
     }
     getCurrentSession(cmdTimeout) {
@@ -2555,11 +2479,12 @@ export class LegacyConnection {
         if (!this.connected) {
             return Promise.reject(new Error(NOT_CONNECTED));
         }
-        this._promises.currentInstance =
-            this._promises.currentInstance ||
-                new Promise((resolve, reject) => {
-                    this._socket.emit('getCurrentInstance', (err, namespace) => err ? reject(new Error(err)) : resolve(namespace));
-                });
+        if (this._promises.currentInstance instanceof Promise) {
+            return this._promises.currentInstance;
+        }
+        this._promises.currentInstance = new Promise((resolve, reject) => {
+            this._socket.emit('getCurrentInstance', (err, namespace) => err ? reject(new Error(err)) : resolve(namespace));
+        });
         return this._promises.currentInstance;
     }
     // returns very optimized information for adapters to minimize a connection load
@@ -2567,7 +2492,7 @@ export class LegacyConnection {
         if (LegacyConnection.isWeb()) {
             return Promise.reject(new Error('Allowed only in admin'));
         }
-        if (!update && this._promises.compactAdapters) {
+        if (!update && this._promises.compactAdapters instanceof Promise) {
             return this._promises.compactAdapters;
         }
         if (!this.connected) {
@@ -2588,7 +2513,7 @@ export class LegacyConnection {
         if (LegacyConnection.isWeb()) {
             return Promise.reject(new Error('Allowed only in admin'));
         }
-        if (!update && this._promises.compactInstances) {
+        if (!update && this._promises.compactInstances instanceof Promise) {
             return this._promises.compactInstances;
         }
         if (!this.connected) {
@@ -2613,7 +2538,7 @@ export class LegacyConnection {
             return Promise.reject(new Error('Allowed only in admin'));
         }
         this._promises.installedCompact = this._promises.installedCompact || {};
-        if (!update && this._promises.installedCompact[host]) {
+        if (!update && this._promises.installedCompact[host] instanceof Promise) {
             return this._promises.installedCompact[host];
         }
         if (!this.connected) {
@@ -2653,7 +2578,7 @@ export class LegacyConnection {
         if (LegacyConnection.isWeb()) {
             return Promise.reject(new Error('Allowed only in admin'));
         }
-        if (!update && this._promises.getCompactSystemRepositories) {
+        if (!update && this._promises.getCompactSystemRepositories instanceof Promise) {
             return this._promises.getCompactSystemRepositories;
         }
         if (!this.connected) {
@@ -2686,7 +2611,7 @@ export class LegacyConnection {
     }
     // returns very optimized information for adapters to minimize a connection load
     getCompactSystemConfig(update) {
-        if (!update && this._promises.systemConfigPromise) {
+        if (!update && this._promises.systemConfigPromise instanceof Promise) {
             return this._promises.systemConfigPromise;
         }
         if (!this.connected) {
@@ -2708,7 +2633,7 @@ export class LegacyConnection {
         if (LegacyConnection.isWeb()) {
             return Promise.reject(new Error('Allowed only in admin'));
         }
-        if (!update && this._promises.repoCompact) {
+        if (!update && this._promises.repoCompact instanceof Promise) {
             return this._promises.repoCompact;
         }
         if (!this.connected) {
@@ -2753,7 +2678,7 @@ export class LegacyConnection {
         if (LegacyConnection.isWeb()) {
             return Promise.reject(new Error('Allowed only in admin'));
         }
-        if (!update && this._promises.hostsCompact) {
+        if (!update && this._promises.hostsCompact instanceof Promise) {
             return this._promises.hostsCompact;
         }
         if (!this.connected) {
@@ -2768,7 +2693,7 @@ export class LegacyConnection {
      * Get uuid
      */
     getUuid() {
-        if (this._promises.uuid) {
+        if (this._promises.uuid instanceof Promise) {
             return this._promises.uuid;
         }
         if (!this.connected) {