Improved error handling

Author: NorthernMan54

CHANGELOG.md

@@ -11,6 +11,8 @@ All notable changes to `@homebridge/hap-client` will be documented in this file.
 - Added new setCharacteristic option, setCharacteristicByType which allows finding the characteristic by type.
 - Added new getResource request to retrieve snapshot images from camera's
 - Minor tweak to serviceName, and if the name is blank, use the name value from Accessory Information
+- Fixed issue of error handler triggering error when contacting a homebridge instance that is down
+- Added restart of monitor when client connections close
 
 ## v2.0.4 (2024-11-07)
 

src/index.ts

@@ -470,7 +470,7 @@ export class HapClient extends EventEmitter {
       if (this.logger) {
         this.logger.error(`[HapClient] [${service.instance.ipAddress}:${service.instance.port} (${service.instance.username})] ` +
           `Failed to set value for ${service.serviceName}.`);
-        if (e.response && e.response.status === 470 || e.response.status === 401) {
+        if (e.response && e.response?.status === 470 || e.response?.status === 401) {
           this.logger.warn(`[HapClient] [${service.instance.ipAddress}:${service.instance.port} (${service.instance.username})] ` +
             `Make sure Homebridge pin for this instance is set to ${this.pin}.`);
           throw new Error(`Failed to control accessory. Make sure the Homebridge pin for ${service.instance.ipAddress}:${service.instance.port} ` +
@@ -514,7 +514,7 @@ export class HapClient extends EventEmitter {
       if (this.logger) {
         this.logger.error(`[HapClient] [${service.instance.ipAddress}:${service.instance.port} (${service.instance.username})] ` +
           `Failed to request resource from accessory ${service.serviceName}.`);
-        if (e.response && e.response.status === 470 || e.response.status === 401) {
+        if (e.response && e.response?.status === 470 || e.response?.status === 401) {
           this.logger.warn(`[HapClient] [${service.instance.ipAddress}:${service.instance.port} (${service.instance.username})] ` +
             `Make sure Homebridge pin for this instance is set to ${this.pin}.`);
           throw new Error(`Failed to request resource from accessory. Make sure the Homebridge pin for ${service.instance.ipAddress}:${service.instance.port} ` +

src/monitor.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'node:events';
 
-import { ServiceType, HapEvInstance } from './interfaces';
 import { createConnection, parseMessage } from './eventedHttpClient';
+import { HapEvInstance, ServiceType } from './interfaces';
 
 /**
  * HapMonitor - Creates a monitor to watch for changes in accessory characteristics.  And generates 'service-update' events when they change.
@@ -76,6 +76,18 @@ export class HapMonitor extends EventEmitter {
           }
         }
       });
+      let closeTimeout: NodeJS.Timeout | null = null;
+      instance.socket.on('close', (data) => {
+        this.emit('monitor-close', data);
+        if (closeTimeout) {
+          clearTimeout(closeTimeout); // Clear the existing timeout
+        }
+        closeTimeout = setTimeout(() => {
+          this.finish();
+          this.start();
+          closeTimeout = null; // Reset the timeout
+        }, 10000); // 10-second debounce period
+      });
     }
   }