Updated functions

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to `@homebridge/hap-client` will be documented in this file. This project tries to adhere to [Semantic Versioning](http://semver.org/).
 
+## v2.0.4 (2024-11-07)
+
+### Changed
+
+- Added public method destroy, to be used for testing
+- Update public method monitorCharacteristics to allow passing of a filtered services array.
+
 ## v2.0.2 (2024-08-31)
 
 ### Changed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homebridge/hap-client",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "A client for HAP-NodeJS.",
   "main": "./dist/index.js",
   "scripts": {
@@ -55,4 +55,4 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   }
-}
+}

src/index.ts

@@ -37,6 +37,9 @@ export class HapClient extends EventEmitter {
     Characteristics.Name,
   ];
 
+  private resetInstancePoolTimeout: NodeJS.Timeout | undefined = undefined
+  private startDiscoveryTimeout: NodeJS.Timeout | undefined = undefined
+
   constructor(opts: {
     pin: string;
     logger?: any;
@@ -66,7 +69,7 @@ export class HapClient extends EventEmitter {
 
     this.instances = [];
 
-    setTimeout(() => {
+    this.resetInstancePoolTimeout = setTimeout(() => {
       this.refreshInstances();
     }, 6000);
   }
@@ -94,7 +97,7 @@ export class HapClient extends EventEmitter {
     this.debug(`[HapClient] Discovery :: Started`);
 
     // stop discovery after 20 seconds
-    setTimeout(() => {
+    this.startDiscoveryTimeout = setTimeout(() => {
       this.browser.stop();
       this.debug(`[HapClient] Discovery :: Ended`);
       this.discoveryInProgress = false;
@@ -225,8 +228,9 @@ export class HapClient extends EventEmitter {
     return accessories;
   }
 
-  public async monitorCharacteristics() {
-    const services = await this.getAllServices();
+  public async monitorCharacteristics(services?: ServiceType[]) {
+    // If `services` is not provided, retrieve all services
+    services = services ?? await this.getAllServices();
     return new HapMonitor(this.logger, this.debug.bind(this), this.pin, services);
   }
 
@@ -447,4 +451,18 @@ export class HapClient extends EventEmitter {
     return titleize(decamelize(string));
   }
 
+  /**
+ * Destroy the HapClient instance, used for testing
+ */
+  public destroy() {
+    this.browser?.stop()
+    this.discoveryInProgress = false
+    if (this.resetInstancePoolTimeout) {
+      clearTimeout(this.resetInstancePoolTimeout)
+    }
+    if (this.startDiscoveryTimeout) {
+      clearTimeout(this.startDiscoveryTimeout)
+    }
+  }
+
 }