Only retrieve details for devices that have not been paired yet

athombv · Sep 16, 2024 · f1e8544 · f1e8544
1 parent add5992
commit f1e8544
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/TuyaOAuth2Client.ts b/lib/TuyaOAuth2Client.ts
@@ -328,6 +328,11 @@ export default class TuyaOAuth2Client extends OAuth2Client<TuyaOAuth2Token> {
     this.onUpdateWebhook();
   }
 
+  isRegistered(productId: string, deviceId: string, other = false): boolean {
+    const register = other ? this.registeredOtherDevices : this.registeredDevices;
+    return register.has(`${productId}:${deviceId}`);
+  }
+
   onUpdateWebhook(): void {
     if (this.__updateWebhookTimeout) {
       this.homey.clearTimeout(this.__updateWebhookTimeout);

diff --git a/lib/TuyaOAuth2Driver.ts b/lib/TuyaOAuth2Driver.ts
@@ -31,11 +31,14 @@ export default class TuyaOAuth2Driver extends OAuth2Driver<TuyaOAuth2Client> {
   async onPairListDevices({ oAuth2Client }: { oAuth2Client: TuyaOAuth2Client }): Promise<OAuth2DeviceResult[]> {
     const devices = await oAuth2Client.getDevices();
     const filteredDevices = devices.filter(device => {
-      this.log('Device:', JSON.stringify(TuyaOAuth2Util.redactFields(device)));
-      return this.onTuyaPairListDeviceFilter(device);
+      return !oAuth2Client.isRegistered(device.product_id, device.id) && this.onTuyaPairListDeviceFilter(device);
     });
     const listDevices: OAuth2DeviceResult[] = [];
+
+    this.log('Listing devices to pair:');
+
     for (const device of filteredDevices) {
+      this.log('Device:', JSON.stringify(TuyaOAuth2Util.redactFields(device)));
       const deviceSpecs =
         (await oAuth2Client
           .getSpecification(device.id)