fix(ignore): update dependencies (#23508)

* fix(ignore): update dependencies * update --------- Co-authored-by: Koenkk <2892853+Koenkk@users.noreply.github.com>
Koenkk · Aug 5, 2024 · bd7dec0 · bd7dec0
1 parent 9bb21f4
commit bd7dec0
Show file tree

Hide file tree

Showing 18 changed files with 1,187 additions and 371 deletions.
diff --git a/lib/controller.ts b/lib/controller.ts
@@ -66,6 +66,7 @@ type ExtensionArgs = [
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let sdNotify: any = null;
 try {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     sdNotify = process.env.NOTIFY_SOCKET ? require('sd-notify') : null;
 } catch {
     // sd-notify is optional
@@ -175,14 +176,14 @@ export class Controller {
 
             await this.zigbee.permitJoin(settings.get().permit_join);
         } catch (error) {
-            logger.error(`Failed to set permit join to ${settings.get().permit_join}`);
+            logger.error(`Failed to set permit join to ${settings.get().permit_join} (${error.message})`);
         }
 
         // MQTT
         try {
             await this.mqtt.connect();
         } catch (error) {
-            logger.error(`MQTT failed to connect, exiting...`);
+            logger.error(`MQTT failed to connect, exiting... (${error.message})`);
             await this.zigbee.stop();
             return this.exit(1);
         }
@@ -247,7 +248,7 @@ export class Controller {
             await this.zigbee.stop();
             logger.info('Stopped Zigbee2MQTT');
         } catch (error) {
-            logger.error('Failed to stop Zigbee2MQTT');
+            logger.error(`Failed to stop Zigbee2MQTT (${error.message})`);
             code = 1;
         }
 

diff --git a/lib/extension/availability.ts b/lib/extension/availability.ts
@@ -66,7 +66,9 @@ export default class Availability extends Extension {
 
     private removeFromPingQueue(device: Device): void {
         const index = this.pingQueue.findIndex((d) => d.ieeeAddr === device.ieeeAddr);
-        index != -1 && this.pingQueue.splice(index, 1);
+        if (index != -1) {
+            this.pingQueue.splice(index, 1);
+        }
     }
 
     private async pingQueueExecuteNext(): Promise<void> {

diff --git a/lib/extension/bind.ts b/lib/extension/bind.ts
@@ -429,7 +429,7 @@ export default class Bind extends Extension {
                         await endpoint.configureReporting(bind.cluster.name, items);
                         logger.info(`Successfully setup reporting for '${entity}' cluster '${bind.cluster.name}'`);
                     } catch (error) {
-                        logger.warning(`Failed to setup reporting for '${entity}' cluster '${bind.cluster.name}'`);
+                        logger.warning(`Failed to setup reporting for '${entity}' cluster '${bind.cluster.name}' (${error.message})`);
                     }
                 }
             }
@@ -489,7 +489,7 @@ export default class Bind extends Extension {
                     await endpoint.configureReporting(cluster, items);
                     logger.info(`Successfully disabled reporting for '${entity}' cluster '${cluster}'`);
                 } catch (error) {
-                    logger.warning(`Failed to disable reporting for '${entity}' cluster '${cluster}'`);
+                    logger.warning(`Failed to disable reporting for '${entity}' cluster '${cluster}' (${error.message})`);
                 }
             }
 
@@ -555,7 +555,9 @@ export default class Bind extends Extension {
                             try {
                                 await endpoint.read(poll.read.cluster, readAttrs);
                             } catch (error) {
-                                logger.error(`Failed to poll ${readAttrs} from ${this.zigbee.resolveEntity(endpoint.getDevice()).name}`);
+                                logger.error(
+                                    `Failed to poll ${readAttrs} from ${this.zigbee.resolveEntity(endpoint.getDevice()).name} (${error.message})`,
+                                );
                             }
                         }, 1000);
                     }

diff --git a/lib/extension/bridge.ts b/lib/extension/bridge.ts
@@ -687,7 +687,9 @@ export default class Bridge extends Extension {
         const config = objectAssignDeep({}, settings.get());
         delete config.advanced.network_key;
         delete config.mqtt.password;
-        config.frontend && delete config.frontend.auth_token;
+        if (config.frontend) {
+            delete config.frontend.auth_token;
+        }
         const payload = {
             version: this.zigbee2mqttVersion.version,
             commit: this.zigbee2mqttVersion.commitHash,

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
@@ -596,8 +596,8 @@ export default class HomeAssistant extends Extension {
 
             // If curtains do not have `running`, `motor_state` or `moving` properties.
             if (!discoveryEntry.discovery_payload.value_template) {
-                (discoveryEntry.discovery_payload.value_template = `{{ value_json.${featurePropertyWithoutEndpoint(state)} }}`),
-                    (discoveryEntry.discovery_payload.state_open = 'OPEN');
+                discoveryEntry.discovery_payload.value_template = `{{ value_json.${featurePropertyWithoutEndpoint(state)} }}`;
+                discoveryEntry.discovery_payload.state_open = 'OPEN';
                 discoveryEntry.discovery_payload.state_closed = 'CLOSE';
                 discoveryEntry.discovery_payload.state_stopped = 'STOP';
             }
@@ -1014,7 +1014,7 @@ export default class HomeAssistant extends Extension {
                 };
 
                 if (lookup[firstExpose.name]?.device_class === 'temperature') {
-                    discoveryEntry.discovery_payload.device_class == lookup[firstExpose.name]?.device_class;
+                    discoveryEntry.discovery_payload.device_class = lookup[firstExpose.name]?.device_class;
                 } else {
                     delete discoveryEntry.discovery_payload.device_class;
                 }
@@ -1745,7 +1745,7 @@ export default class HomeAssistant extends Extension {
                 if (!isDeviceAutomation && (!message.availability || !message.availability[0].topic.startsWith(baseTopic))) {
                     return;
                 }
-            } catch (e) {
+            } catch {
                 return;
             }
 

diff --git a/lib/extension/legacy/bridgeLegacy.ts b/lib/extension/legacy/bridgeLegacy.ts
@@ -61,7 +61,7 @@ export default class BridgeLegacy extends Extension {
         let json = null;
         try {
             json = JSON.parse(message);
-        } catch (e) {
+        } catch {
             logger.error('Failed to parse message as JSON');
             return;
         }
@@ -86,7 +86,7 @@ export default class BridgeLegacy extends Extension {
         try {
             await this.zigbee.reset('soft');
             logger.info('Soft reset ZNP');
-        } catch (error) {
+        } catch {
             logger.error('Soft reset failed');
         }
     }
@@ -179,7 +179,7 @@ export default class BridgeLegacy extends Extension {
         let json = null;
         try {
             json = JSON.parse(message);
-        } catch (e) {
+        } catch {
             logger.error(invalid);
             return;
         }
@@ -213,7 +213,7 @@ export default class BridgeLegacy extends Extension {
             }
 
             await this.mqtt.publish('bridge/log', stringify({type: `${isGroup ? 'group' : 'device'}_renamed`, message: {from, to}}));
-        } catch (error) {
+        } catch {
             logger.error(`Failed to rename - ${from} to ${to}`);
         }
     }
@@ -231,7 +231,7 @@ export default class BridgeLegacy extends Extension {
             if (json.hasOwnProperty('friendly_name')) {
                 name = json.friendly_name;
             }
-        } catch (e) {
+        } catch {
             // just friendly_name
             name = message;
         }

diff --git a/lib/extension/legacy/report.ts b/lib/extension/legacy/report.ts
@@ -106,9 +106,11 @@ export default class Report extends Extension {
                             }
                         }
 
-                        this.enabled
-                            ? await ep.bind(cluster, this.zigbee.firstCoordinatorEndpoint())
-                            : await ep.unbind(cluster, this.zigbee.firstCoordinatorEndpoint());
+                        if (this.enabled) {
+                            await ep.bind(cluster, this.zigbee.firstCoordinatorEndpoint());
+                        } else {
+                            await ep.unbind(cluster, this.zigbee.firstCoordinatorEndpoint());
+                        }
 
                         await ep.configureReporting(cluster, items);
                         logger.info(`Successfully ${term2} reporting for '${device.ieeeAddr}' - ${ep.ID} - ${cluster}`);

diff --git a/lib/extension/legacy/softReset.ts b/lib/extension/legacy/softReset.ts
@@ -45,15 +45,15 @@ export default class SoftReset extends Extension {
             await this.zigbee.reset('soft');
             logger.warning('Soft reset ZNP due to timeout');
         } catch (error) {
-            logger.warning('Soft reset failed, trying stop/start');
+            logger.warning(`Soft reset failed, trying stop/start (${error.message})`);
 
             await this.zigbee.stop();
             logger.warning('Zigbee stopped');
 
             try {
                 await this.zigbee.start();
             } catch (error) {
-                logger.error('Failed to restart!');
+                logger.error(`Failed to restart! (${error.message})`);
             }
         }
 

diff --git a/lib/extension/networkMap.ts b/lib/extension/networkMap.ts
@@ -250,7 +250,7 @@ export default class NetworkMap extends Extension {
                     logger.debug(`Routing table succeeded for '${device.name}'`);
                 } catch (error) {
                     failed.get(device).push('routingTable');
-                    logger.error(`Failed to execute routing table for '${device.name}'`);
+                    logger.error(`Failed to execute routing table for '${device.name}' (${error.message})`);
                 }
             }
         }

diff --git a/lib/extension/otaUpdate.ts b/lib/extension/otaUpdate.ts
@@ -16,7 +16,7 @@ function isValidUrl(url: string): boolean {
     let parsed;
     try {
         parsed = URI.parse(url);
-    } catch (_) {
+    } catch {
         // istanbul ignore next
         return false;
     }
@@ -138,7 +138,7 @@ export default class OTAUpdate extends Extension {
             const endpoint = device.zh.endpoints.find((e) => e.supportsInputCluster('genBasic'));
             const result = await endpoint.read('genBasic', ['dateCode', 'swBuildId'], {sendPolicy});
             return {softwareBuildID: result.swBuildId, dateCode: result.dateCode};
-        } catch (e) {
+        } catch {
             return null;
         }
     }
@@ -319,7 +319,9 @@ export default class OTAUpdate extends Extension {
 
         if (error) {
             logger.error(error);
-            errorStack && logger.debug(errorStack);
+            if (errorStack) {
+                logger.debug(errorStack);
+            }
         }
     }
 }
diff --git a/lib/extension/publish.ts b/lib/extension/publish.ts
@@ -74,13 +74,13 @@ export default class Publish extends Extension {
         if (parsedTopic.attribute) {
             try {
                 return {[parsedTopic.attribute]: JSON.parse(data.message)};
-            } catch (e) {
+            } catch {
                 return {[parsedTopic.attribute]: data.message};
             }
         } else {
             try {
                 return JSON.parse(data.message);
-            } catch (e) {
+            } catch {
                 if (stateValues.includes(data.message.toLowerCase())) {
                     return {state: data.message};
                 } else {

diff --git a/lib/state.ts b/lib/state.ts
@@ -65,8 +65,8 @@ class State {
             try {
                 this.state = JSON.parse(fs.readFileSync(this.file, 'utf8'));
                 logger.debug(`Loaded state from file ${this.file}`);
-            } catch (e) {
-                logger.debug(`Failed to load state from file ${this.file} (corrupt file?)`);
+            } catch (error) {
+                logger.debug(`Failed to load state from file ${this.file} (corrupt file?) (${error.message})`);
             }
         } else {
             logger.debug(`Can't load state from file ${this.file} (doesn't exist)`);