@homebridge-plugins/homebridge-smarthq 0.5.0-beta.26 → 0.5.0-beta.28

package/dist/platform.js

@@ -329,97 +329,83 @@ export class SmartHQPlatform {
         }
     }
     async createSmartHQDishWasher(userId, device, details, features) {
-        const uuid = this.api.hap.uuid.generate(device.applianceId);
-        // see if an accessory with the same uuid has already been registered and restored from
-        // the cached devices we stored in the `configureAccessory` method above
+        // Merge device data
+        const deviceData = { brand: 'GE', ...details, ...features, ...device };
+        // Determine protocol (Matter or HAP)
+        deviceData.useMatter = this.shouldUseMatter(deviceData);
+        const uuid = this.api.hap.uuid.generate(deviceData.applianceId);
         const existingAccessory = this.accessories.find(accessory => accessory.UUID === uuid);
+        const protocol = deviceData.useMatter ? 'Matter' : 'HAP';
         if (existingAccessory) {
             // the accessory already exists
-            if (!device.hide_device) {
-                // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.device = device;
-                existingAccessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-                existingAccessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-                existingAccessory.context.device.firmware = device.firmware ?? await this.getVersion();
+            if (!deviceData.hide_device) {
+                existingAccessory.context.device = deviceData;
+                existingAccessory.context = { device: deviceData, userId };
+                existingAccessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+                existingAccessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
                 this.api.updatePlatformAccessories([existingAccessory]);
-                // Restore accessory
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName}`);
-                // create the accessory handler for the restored accessory
-                // this is imported from `platformAccessory.ts`
-                new SmartHQDishWasher(this, existingAccessory, device);
-                this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+                this.infoLog(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                new SmartHQDishWasher(this, existingAccessory, deviceData);
+                await this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             }
             else {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (!device.hide_device && !existingAccessory) {
-            this.infoLog(`Adding new accessory: ${device.nickname}`);
-            const accessory = new this.api.platformAccessory(device.nickname, uuid);
-            // store a copy of the device object in the `accessory.context`
-            // the `context` property can be used to store any data about the accessory you may need
-            accessory.context.device = device;
-            accessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-            accessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-            accessory.context.device.firmware = device.firmware ?? await this.getVersion();
-            // the accessory does not yet exist, so we need to create it
-            // create the accessory handler for the newly create accessory
-            // this is imported from `platformAccessory.ts`
-            new SmartHQDishWasher(this, accessory, device);
-            this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
-            // link the accessory to your platform
+        else if (!deviceData.hide_device && !existingAccessory) {
+            this.infoLog(`[${protocol}] Adding new accessory: ${deviceData.nickname}`);
+            const accessory = new this.api.platformAccessory(deviceData.nickname, uuid);
+            accessory.context.device = deviceData;
+            accessory.context = { device: deviceData, userId };
+            accessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+            accessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
+            new SmartHQDishWasher(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
             this.accessories.push(accessory);
         }
         else {
-            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(device.nickname)}`);
+            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(deviceData.nickname)}`);
         }
     }
     async createSmartHQOven(userId, device, details, features) {
-        const uuid = this.api.hap.uuid.generate(device.applianceId);
-        // see if an accessory with the same uuid has already been registered and restored from
-        // the cached devices we stored in the `configureAccessory` method above
+        // Merge device data
+        const deviceData = { brand: 'GE', ...details, ...features, ...device };
+        // Determine protocol (Matter or HAP)
+        deviceData.useMatter = this.shouldUseMatter(deviceData);
+        const uuid = this.api.hap.uuid.generate(deviceData.applianceId);
         const existingAccessory = this.accessories.find(accessory => accessory.UUID === uuid);
+        const protocol = deviceData.useMatter ? 'Matter' : 'HAP';
         if (existingAccessory) {
             // the accessory already exists
-            if (!device.hide_device) {
-                // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.device = device;
-                existingAccessory.context = { device: { brand: 'GE Appliances', ...details, ...features }, userId };
-                existingAccessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-                existingAccessory.context.device.firmware = device.firmware ?? await this.getVersion();
+            if (!deviceData.hide_device) {
+                existingAccessory.context.device = deviceData;
+                existingAccessory.context = { device: deviceData, userId };
+                existingAccessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+                existingAccessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
                 this.api.updatePlatformAccessories([existingAccessory]);
-                // Restore accessory
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName}`);
-                // create the accessory handler for the restored accessory
-                // this is imported from `platformAccessory.ts`
-                new SmartHQOven(this, existingAccessory, device);
-                await this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+                this.infoLog(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                new SmartHQOven(this, existingAccessory, deviceData);
+                await this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             }
             else {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (!device.hide_device && !existingAccessory) {
-            this.infoLog(`Adding new accessory: ${device.nickname}`);
-            const accessory = new this.api.platformAccessory(device.nickname, uuid);
-            // store a copy of the device object in the `accessory.context`
-            // the `context` property can be used to store any data about the accessory you may need
-            accessory.context.device = device;
-            accessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-            accessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-            accessory.context.device.firmware = device.firmware ?? await this.getVersion();
-            // the accessory does not yet exist, so we need to create it
-            // create the accessory handler for the newly create accessory
-            // this is imported from `platformAccessory.ts`
-            new SmartHQOven(this, accessory, device);
-            this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
-            // link the accessory to your platform
+        else if (!deviceData.hide_device && !existingAccessory) {
+            this.infoLog(`[${protocol}] Adding new accessory: ${deviceData.nickname}`);
+            const accessory = new this.api.platformAccessory(deviceData.nickname, uuid);
+            accessory.context.device = deviceData;
+            accessory.context = { device: deviceData, userId };
+            accessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+            accessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
+            new SmartHQOven(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
             this.accessories.push(accessory);
         }
         else {
-            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(device.nickname)}`);
+            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(deviceData.nickname)}`);
         }
     }
     async createSmartHQIceMaker(userId, device, details, features) {
@@ -513,154 +499,160 @@ export class SmartHQPlatform {
         }
     }
     async createSmartHQAirConditioner(userId, device, details, features) {
-        const uuid = this.api.hap.uuid.generate(device.applianceId);
-        // see if an accessory with the same uuid has already been registered and restored from
-        // the cached devices we stored in the `configureAccessory` method above
+        // Merge device data
+        const deviceData = { brand: 'GE', ...details, ...features, ...device };
+        // Determine protocol (Matter or HAP)
+        deviceData.useMatter = this.shouldUseMatter(deviceData);
+        const uuid = this.api.hap.uuid.generate(deviceData.applianceId);
         const existingAccessory = this.accessories.find(accessory => accessory.UUID === uuid);
+        const protocol = deviceData.useMatter ? 'Matter' : 'HAP';
         if (existingAccessory) {
             // the accessory already exists
-            if (!device.hide_device) {
-                // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.device = device;
-                existingAccessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-                existingAccessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-                existingAccessory.context.device.firmware = device.firmware ?? await this.getVersion();
+            if (!deviceData.hide_device) {
+                existingAccessory.context.device = deviceData;
+                existingAccessory.context = { device: deviceData, userId };
+                existingAccessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+                existingAccessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
                 this.api.updatePlatformAccessories([existingAccessory]);
-                // Restore accessory
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName}`);
-                // create the accessory handler for the restored accessory
-                // this is imported from `platformAccessory.ts`
-                new SmartHQAirConditioner(this, existingAccessory, device);
-                this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+                this.infoLog(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                new SmartHQAirConditioner(this, existingAccessory, deviceData);
+                this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             }
             else {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (!device.hide_device && !existingAccessory) {
-            this.infoLog(`Adding new accessory: ${device.nickname}`);
-            const accessory = new this.api.platformAccessory(device.nickname, uuid);
-            // store a copy of the device object in the `accessory.context`
-            // the `context` property can be used to store any data about the accessory you may need
-            accessory.context.device = device;
-            accessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-            accessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-            accessory.context.device.firmware = device.firmware ?? await this.getVersion();
-            // the accessory does not yet exist, so we need to create it
-            // create the accessory handler for the newly create accessory
-            // this is imported from `platformAccessory.ts`
-            new SmartHQAirConditioner(this, accessory, device);
-            this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
-            // link the accessory to your platform
+        else if (!deviceData.hide_device && !existingAccessory) {
+            this.infoLog(`[${protocol}] Adding new accessory: ${deviceData.nickname}`);
+            const accessory = new this.api.platformAccessory(deviceData.nickname, uuid);
+            accessory.context.device = deviceData;
+            accessory.context = { device: deviceData, userId };
+            accessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+            accessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
+            new SmartHQAirConditioner(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
             this.accessories.push(accessory);
         }
         else {
-            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(device.nickname)}`);
+            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(deviceData.nickname)}`);
         }
     }
     async createSmartHQHood(userId, device, details, features) {
-        const uuid = this.api.hap.uuid.generate(device.applianceId);
+        // Merge device data
+        const deviceData = { brand: 'GE', ...details, ...features, ...device };
+        // Determine protocol (Matter or HAP)
+        deviceData.useMatter = this.shouldUseMatter(deviceData);
+        const uuid = this.api.hap.uuid.generate(deviceData.applianceId);
         const existingAccessory = this.accessories.find(accessory => accessory.UUID === uuid);
+        const protocol = deviceData.useMatter ? 'Matter' : 'HAP';
         if (existingAccessory) {
-            if (!device.hide_device) {
-                existingAccessory.context.device = device;
-                existingAccessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-                existingAccessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-                existingAccessory.context.device.firmware = device.firmware ?? await this.getVersion();
+            if (!deviceData.hide_device) {
+                existingAccessory.context.device = deviceData;
+                existingAccessory.context = { device: deviceData, userId };
+                existingAccessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+                existingAccessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
                 this.api.updatePlatformAccessories([existingAccessory]);
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName}`);
-                new SmartHQHood(this, existingAccessory, device);
-                this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+                this.infoLog(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                new SmartHQHood(this, existingAccessory, deviceData);
+                this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             }
             else {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (!device.hide_device && !existingAccessory) {
-            this.infoLog(`Adding new accessory: ${device.nickname}`);
-            const accessory = new this.api.platformAccessory(device.nickname, uuid);
-            accessory.context.device = device;
-            accessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-            accessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-            accessory.context.device.firmware = device.firmware ?? await this.getVersion();
-            new SmartHQHood(this, accessory, device);
-            this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+        else if (!deviceData.hide_device && !existingAccessory) {
+            this.infoLog(`[${protocol}] Adding new accessory: ${deviceData.nickname}`);
+            const accessory = new this.api.platformAccessory(deviceData.nickname, uuid);
+            accessory.context.device = deviceData;
+            accessory.context = { device: deviceData, userId };
+            accessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+            accessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
+            new SmartHQHood(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
             this.accessories.push(accessory);
         }
         else {
-            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(device.nickname)}`);
+            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(deviceData.nickname)}`);
         }
     }
     async createSmartHQClothesWasher(userId, device, details, features) {
-        const uuid = this.api.hap.uuid.generate(device.applianceId);
+        // Merge device data
+        const deviceData = { brand: 'GE', ...details, ...features, ...device };
+        // Determine protocol (Matter or HAP)
+        deviceData.useMatter = this.shouldUseMatter(deviceData);
+        const uuid = this.api.hap.uuid.generate(deviceData.applianceId);
         const existingAccessory = this.accessories.find(accessory => accessory.UUID === uuid);
+        const protocol = deviceData.useMatter ? 'Matter' : 'HAP';
         if (existingAccessory) {
-            if (!device.hide_device) {
-                existingAccessory.context.device = device;
-                existingAccessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-                existingAccessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-                existingAccessory.context.device.firmware = device.firmware ?? await this.getVersion();
+            if (!deviceData.hide_device) {
+                existingAccessory.context.device = deviceData;
+                existingAccessory.context = { device: deviceData, userId };
+                existingAccessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+                existingAccessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
                 this.api.updatePlatformAccessories([existingAccessory]);
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName}`);
-                // create the accessory handler for the restored accessory
-                new SmartHQClothesWasher(this, existingAccessory, device);
-                this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+                this.infoLog(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                new SmartHQClothesWasher(this, existingAccessory, deviceData);
+                this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             }
             else {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (!device.hide_device && !existingAccessory) {
-            this.infoLog(`Adding new accessory: ${device.nickname}`);
-            const accessory = new this.api.platformAccessory(device.nickname, uuid);
-            accessory.context.device = device;
-            accessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-            accessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-            accessory.context.device.firmware = device.firmware ?? await this.getVersion();
-            new SmartHQClothesWasher(this, accessory, device);
-            this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+        else if (!deviceData.hide_device && !existingAccessory) {
+            this.infoLog(`[${protocol}] Adding new accessory: ${deviceData.nickname}`);
+            const accessory = new this.api.platformAccessory(deviceData.nickname, uuid);
+            accessory.context.device = deviceData;
+            accessory.context = { device: deviceData, userId };
+            accessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+            accessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
+            new SmartHQClothesWasher(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
             this.accessories.push(accessory);
         }
         else {
-            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(device.nickname)}`);
+            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(deviceData.nickname)}`);
         }
     }
     async createSmartHQClothesDryer(userId, device, details, features) {
-        const uuid = this.api.hap.uuid.generate(device.applianceId);
+        // Merge device data
+        const deviceData = { brand: 'GE', ...details, ...features, ...device };
+        // Determine protocol (Matter or HAP)
+        deviceData.useMatter = this.shouldUseMatter(deviceData);
+        const uuid = this.api.hap.uuid.generate(deviceData.applianceId);
         const existingAccessory = this.accessories.find(accessory => accessory.UUID === uuid);
+        const protocol = deviceData.useMatter ? 'Matter' : 'HAP';
         if (existingAccessory) {
-            if (!device.hide_device) {
-                existingAccessory.context.device = device;
-                existingAccessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-                existingAccessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-                existingAccessory.context.device.firmware = device.firmware ?? await this.getVersion();
+            if (!deviceData.hide_device) {
+                existingAccessory.context.device = deviceData;
+                existingAccessory.context = { device: deviceData, userId };
+                existingAccessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+                existingAccessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
                 this.api.updatePlatformAccessories([existingAccessory]);
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName}`);
-                // create the accessory handler for the restored accessory
-                new SmartHQClothesDryer(this, existingAccessory, device);
-                this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+                this.infoLog(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                new SmartHQClothesDryer(this, existingAccessory, deviceData);
+                this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             }
             else {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (!device.hide_device && !existingAccessory) {
-            this.infoLog(`Adding new accessory: ${device.nickname}`);
-            const accessory = new this.api.platformAccessory(device.nickname, uuid);
-            accessory.context.device = device;
-            accessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-            accessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-            accessory.context.device.firmware = device.firmware ?? await this.getVersion();
-            new SmartHQClothesDryer(this, accessory, device);
-            this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+        else if (!deviceData.hide_device && !existingAccessory) {
+            this.infoLog(`[${protocol}] Adding new accessory: ${deviceData.nickname}`);
+            const accessory = new this.api.platformAccessory(deviceData.nickname, uuid);
+            accessory.context.device = deviceData;
+            accessory.context = { device: deviceData, userId };
+            accessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+            accessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
+            new SmartHQClothesDryer(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
             this.accessories.push(accessory);
         }
         else {
-            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(device.nickname)}`);
+            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(deviceData.nickname)}`);
         }
     }
     async createSmartHQWaterFilter(userId, device, details, features) {
@@ -732,37 +724,42 @@ export class SmartHQPlatform {
         }
     }
     async createSmartHQWaterHeater(userId, device, details, features) {
-        const uuid = this.api.hap.uuid.generate(device.applianceId);
+        // Merge device data
+        const deviceData = { brand: 'GE', ...details, ...features, ...device };
+        // Determine protocol (Matter or HAP)
+        deviceData.useMatter = this.shouldUseMatter(deviceData);
+        const uuid = this.api.hap.uuid.generate(deviceData.applianceId);
         const existingAccessory = this.accessories.find(accessory => accessory.UUID === uuid);
+        const protocol = deviceData.useMatter ? 'Matter' : 'HAP';
         if (existingAccessory) {
-            if (!device.hide_device) {
-                existingAccessory.context.device = device;
-                existingAccessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-                existingAccessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-                existingAccessory.context.device.firmware = device.firmware ?? await this.getVersion();
+            if (!deviceData.hide_device) {
+                existingAccessory.context.device = deviceData;
+                existingAccessory.context = { device: deviceData, userId };
+                existingAccessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+                existingAccessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
                 this.api.updatePlatformAccessories([existingAccessory]);
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName}`);
-                new SmartHQWaterHeater(this, existingAccessory, device);
-                this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+                this.infoLog(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                new SmartHQWaterHeater(this, existingAccessory, deviceData);
+                this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             }
             else {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (!device.hide_device && !existingAccessory) {
-            this.infoLog(`Adding new accessory: ${device.nickname}`);
-            const accessory = new this.api.platformAccessory(device.nickname, uuid);
-            accessory.context.device = device;
-            accessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-            accessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-            accessory.context.device.firmware = device.firmware ?? await this.getVersion();
-            new SmartHQWaterHeater(this, accessory, device);
-            this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+        else if (!deviceData.hide_device && !existingAccessory) {
+            this.infoLog(`[${protocol}] Adding new accessory: ${deviceData.nickname}`);
+            const accessory = new this.api.platformAccessory(deviceData.nickname, uuid);
+            accessory.context.device = deviceData;
+            accessory.context = { device: deviceData, userId };
+            accessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+            accessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
+            new SmartHQWaterHeater(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
             this.accessories.push(accessory);
         }
         else {
-            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(device.nickname)}`);
+            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(deviceData.nickname)}`);
         }
     }
     async createSmartHQAdvantium(userId, device, details, features) {
@@ -800,37 +797,42 @@ export class SmartHQPlatform {
         }
     }
     async createSmartHQMicrowave(userId, device, details, features) {
-        const uuid = this.api.hap.uuid.generate(device.applianceId);
+        // Merge device data
+        const deviceData = { brand: 'GE', ...details, ...features, ...device };
+        // Determine protocol (Matter or HAP)
+        deviceData.useMatter = this.shouldUseMatter(deviceData);
+        const uuid = this.api.hap.uuid.generate(deviceData.applianceId);
         const existingAccessory = this.accessories.find(accessory => accessory.UUID === uuid);
+        const protocol = deviceData.useMatter ? 'Matter' : 'HAP';
         if (existingAccessory) {
-            if (!device.hide_device) {
-                existingAccessory.context.device = device;
-                existingAccessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-                existingAccessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-                existingAccessory.context.device.firmware = device.firmware ?? await this.getVersion();
+            if (!deviceData.hide_device) {
+                existingAccessory.context.device = deviceData;
+                existingAccessory.context = { device: deviceData, userId };
+                existingAccessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+                existingAccessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
                 this.api.updatePlatformAccessories([existingAccessory]);
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName}`);
-                new SmartHQMicrowave(this, existingAccessory, device);
-                this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+                this.infoLog(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                new SmartHQMicrowave(this, existingAccessory, deviceData);
+                this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             }
             else {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (!device.hide_device && !existingAccessory) {
-            this.infoLog(`Adding new accessory: ${device.nickname}`);
-            const accessory = new this.api.platformAccessory(device.nickname, uuid);
-            accessory.context.device = device;
-            accessory.context = { device: { brand: 'GE', ...details, ...features }, userId };
-            accessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-            accessory.context.device.firmware = device.firmware ?? await this.getVersion();
-            new SmartHQMicrowave(this, accessory, device);
-            this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+        else if (!deviceData.hide_device && !existingAccessory) {
+            this.infoLog(`[${protocol}] Adding new accessory: ${deviceData.nickname}`);
+            const accessory = new this.api.platformAccessory(deviceData.nickname, uuid);
+            accessory.context.device = deviceData;
+            accessory.context = { device: deviceData, userId };
+            accessory.displayName = await this.validateAndCleanDisplayName(deviceData.nickname, 'nickname', deviceData.nickname);
+            accessory.context.device.firmware = deviceData.firmware ?? await this.getVersion();
+            new SmartHQMicrowave(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
             this.accessories.push(accessory);
         }
         else {
-            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(device.nickname)}`);
+            this.debugErrorLog(`Unable to Register new device: ${JSON.stringify(deviceData.nickname)}`);
         }
     }
     async createSmartHQCoffeeMaker(userId, device, details, features) {