@homebridge-plugins/homebridge-smarthq 0.5.0-beta.4 → 0.5.0-beta.40

package/dist/platform.js

@@ -4,10 +4,20 @@ import { SmartHQIceMaker } from './devices/OpalIceMaker/index.js';
 import axios from 'axios';
 import pkg from 'lodash';
 import ws from 'ws';
+import { SmartHQAdvantium } from './devices/advantium.js';
 import { SmartHQAirConditioner } from './devices/airConditioner.js';
+import { SmartHQBeverageCenter } from './devices/beverageCenter.js';
+import { SmartHQClothesDryer } from './devices/clothesDryer.js';
+import { SmartHQClothesWasher } from './devices/clothesWasher.js';
+import { SmartHQCoffeeMaker } from './devices/coffeeMaker.js';
 import { SmartHQDishWasher } from './devices/dishwasher.js';
+import { SmartHQHood } from './devices/hood.js';
+import { SmartHQMicrowave } from './devices/microwave.js';
 import { SmartHQOven } from './devices/oven.js';
 import { SmartHQRefrigerator } from './devices/refrigerator.js';
+import { SmartHQWaterFilter } from './devices/waterFilter.js';
+import { SmartHQWaterHeater } from './devices/waterHeater.js';
+import { SmartHQWaterSoftener } from './devices/waterSoftener.js';
 import getAccessToken, { refreshAccessToken } from './getAccessToken.js';
 import { API_URL, ERD_CODES, ERD_TYPES, KEEPALIVE_TIMEOUT, PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
 const { find } = pkg;
@@ -33,6 +43,9 @@ export class SmartHQPlatform {
     platformUpdateRate;
     debugMode;
     version;
+    // Matter support tracking
+    matterEnabled = false;
+    matterAvailable = false;
     constructor(log, config, api) {
         this.accessories = [];
         this.api = api;
@@ -60,6 +73,8 @@ export class SmartHQPlatform {
         this.Service = this.api.hap.Service;
         this.Characteristic = this.api.hap.Characteristic;
         this.debugLog(`Finished initializing platform: ${config.name}`);
+        // Check Matter availability and enabled status
+        this.checkMatterSupport();
         // verify the config
         (async () => {
             try {
@@ -112,17 +127,57 @@ export class SmartHQPlatform {
         }
     }
     async startRefreshTokenLogic() {
+        if (!this.tokenSet) {
+            throw new Error('Token set is undefined');
+        }
         if (this.tokenSet.refresh_token) {
             try {
                 this.tokenSet = await refreshAccessToken(this.tokenSet.refresh_token);
             }
             catch (e) {
-                await this.errorLog(`Failed to refresh Access Token, Error Message: ${e.message ?? e}, Submit Bugs Here: https://bit.ly/smarthq-bug-report`);
+                await this.errorLog(`Failed to refresh Access Token, Error Message: ${e.message ?? e}`);
+                // Handle invalid_grant error (expired/revoked refresh token)
+                if (e.error === 'invalid_grant' || e.message?.includes('invalid_grant') || e.message?.includes('Invalid refresh token')) {
+                    await this.warnLog('Refresh token is invalid or expired. Attempting to re-authenticate with username and password...');
+                    // Try to get a new token using username/password
+                    const { username, password } = this.config.credentials ?? {};
+                    if (username && password) {
+                        try {
+                            this.tokenSet = await getAccessToken(username, password);
+                            await this.successLog('Successfully re-authenticated with credentials');
+                            // Set up axios with new token
+                            if (this.tokenSet.access_token) {
+                                axios.defaults.headers.common = {
+                                    Authorization: `Bearer ${this.tokenSet.access_token}`,
+                                };
+                                // Schedule next refresh
+                                if (this.tokenSet.expires_in) {
+                                    setTimeout(this.startRefreshTokenLogic.bind(this), 1000 * (this.tokenSet.expires_in - 2000));
+                                }
+                                return; // Successfully recovered
+                            }
+                        }
+                        catch (reAuthError) {
+                            await this.errorLog(`Failed to re-authenticate: ${reAuthError.message ?? reAuthError}`);
+                            await this.errorLog('Please verify your SmartHQ credentials are correct in the Homebridge config');
+                            await this.errorLog('You may need to log in to the GE SmartHQ app to ensure your account is active');
+                        }
+                    }
+                    else {
+                        await this.errorLog('No credentials available for re-authentication');
+                        await this.errorLog('Please ensure username and password are set in your Homebridge config');
+                    }
+                }
+                await this.errorLog('Submit Bugs Here: https://bit.ly/smarthq-bug-report');
+                throw e; // Re-throw to stop execution only if recovery failed
             }
         }
         else {
             throw new Error('Refresh token is undefined');
         }
+        if (!this.tokenSet.access_token) {
+            throw new Error('Access token is undefined after refresh');
+        }
         axios.defaults.headers.common = {
             Authorization: `Bearer ${this.tokenSet.access_token}`,
         };
@@ -148,12 +203,14 @@ export class SmartHQPlatform {
             }
             catch (e) {
                 await this.errorLog(`discoverDevices, Failed to get Access Token, Error Message: ${e.message ?? e}, Submit Bugs Here: https://bit.ly/smarthq-bug-report`);
+                return; // Stop execution if authentication fails
             }
             try {
                 await this.startRefreshTokenLogic();
             }
             catch (e) {
                 await this.errorLog(`discoverDevices, Failed to start Refresh Token Logic, Error Message: ${e.message ?? e}, Submit Bugs Here: https://bit.ly/smarthq-bug-report`);
+                return; // Stop execution if token refresh setup fails
             }
             try {
                 const wssData = await axios.get('/websocket');
@@ -226,6 +283,37 @@ export class SmartHQPlatform {
                         case 'Split Air Conditioner':
                             await this.createSmartHQAirConditioner(userId, device, details, features);
                             break;
+                        case 'Hood':
+                            await this.createSmartHQHood(userId, device, details, features);
+                            break;
+                        case 'Clothes Washer':
+                            await this.createSmartHQClothesWasher(userId, device, details, features);
+                            break;
+                        case 'Clothes Dryer':
+                            await this.createSmartHQClothesDryer(userId, device, details, features);
+                            break;
+                        case 'Whole Home Water Filter':
+                            await this.createSmartHQWaterFilter(userId, device, details, features);
+                            break;
+                        case 'Whole Home Water Softener':
+                            await this.createSmartHQWaterSoftener(userId, device, details, features);
+                            break;
+                        case 'Whole Home Water Heater':
+                            await this.createSmartHQWaterHeater(userId, device, details, features);
+                            break;
+                        case 'Advantium':
+                            await this.createSmartHQAdvantium(userId, device, details, features);
+                            break;
+                        case 'Microwave':
+                            await this.createSmartHQMicrowave(userId, device, details, features);
+                            break;
+                        case 'Coffee Maker':
+                        case 'Espresso Maker':
+                            await this.createSmartHQCoffeeMaker(userId, device, details, features);
+                            break;
+                        case 'Beverage Center':
+                            await this.createSmartHQBeverageCenter(userId, device, details, features);
+                            break;
                         default:
                             await this.warnLog(`Device Type Not Supported: ${device.type}`);
                             break;
@@ -241,232 +329,786 @@ 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();
-                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}`);
+            if (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    // Device removed from HAP, will be registered as Matter accessory in device class
+                    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}`);
+                }
+                else {
+                    // Still using HAP, restore normally
+                    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(`[${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', ...details, ...features }, userId };
-                existingAccessory.displayName = await this.validateAndCleanDisplayName(device.nickname, 'nickname', device.nickname);
-                existingAccessory.context.device.firmware = device.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}`);
+            if (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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}`);
+                }
+                else {
+                    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(`[${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) {
-        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);
         // 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
         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();
-                this.api.updatePlatformAccessories([existingAccessory]);
-                // Restore accessory
-                // create the accessory handler for the restored accessory
-                // this is imported from `platformAccessory.ts`
-                new SmartHQIceMaker(this, existingAccessory, device);
-                this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+            if (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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 SmartHQIceMaker(this, accessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+                else {
+                    // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
+                    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
+                    // create the accessory handler for the restored accessory
+                    // this is imported from `platformAccessory.ts`
+                    this.infoLog(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                    new SmartHQIceMaker(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);
+        else if (!deviceData.hide_device && !existingAccessory) {
+            this.infoLog(`[${protocol}] Adding new accessory: ${deviceData.nickname}`);
+            const accessory = new this.api.platformAccessory(deviceData.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();
+            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();
             // 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 SmartHQIceMaker(this, accessory, device);
-            this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+            new SmartHQIceMaker(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             // link the accessory to your platform
             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)}`);
         }
     }
+    /**
+     * Create Refrigerator accessory (unified HAP/Matter)
+     * The SmartHQRefrigerator class now handles both protocols internally
+     */
     async createSmartHQRefrigerator(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();
-                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 SmartHQRefrigerator(this, existingAccessory, device);
-                await this.debugLog(`${device.nickname} uuid: ${device.applianceId}`);
+            if (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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 SmartHQRefrigerator(this, accessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+                else {
+                    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(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                    new SmartHQRefrigerator(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 SmartHQRefrigerator(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 SmartHQRefrigerator(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 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();
-                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}`);
+            if (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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}`);
+                }
+                else {
+                    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(`[${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(deviceData.nickname)}`);
+        }
+    }
+    async createSmartHQHood(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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}`);
+                }
+                else {
+                    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(`[${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 (!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(deviceData.nickname)}`);
+        }
+    }
+    async createSmartHQClothesWasher(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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}`);
+                }
+                else {
+                    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(`[${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 (!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(deviceData.nickname)}`);
+        }
+    }
+    async createSmartHQClothesDryer(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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}`);
+                }
+                else {
+                    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(`[${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 (!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(deviceData.nickname)}`);
+        }
+    }
+    async createSmartHQWaterFilter(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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 SmartHQWaterFilter(this, accessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+                else {
+                    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(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                    new SmartHQWaterFilter(this, existingAccessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+            }
+            else {
+                this.unregisterPlatformAccessories(existingAccessory);
+            }
+        }
+        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 SmartHQWaterFilter(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(deviceData.nickname)}`);
+        }
+    }
+    async createSmartHQWaterSoftener(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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 SmartHQWaterSoftener(this, accessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+                else {
+                    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(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                    new SmartHQWaterSoftener(this, existingAccessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+            }
+            else {
+                this.unregisterPlatformAccessories(existingAccessory);
+            }
+        }
+        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 SmartHQWaterSoftener(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(deviceData.nickname)}`);
+        }
+    }
+    async createSmartHQWaterHeater(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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}`);
+                }
+                else {
+                    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(`[${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 (!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(deviceData.nickname)}`);
+        }
+    }
+    async createSmartHQAdvantium(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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 SmartHQAdvantium(this, accessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+                else {
+                    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(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                    new SmartHQAdvantium(this, existingAccessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+            }
+            else {
+                this.unregisterPlatformAccessories(existingAccessory);
+            }
+        }
+        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 SmartHQAdvantium(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)}`);
+        }
+    }
+    async createSmartHQMicrowave(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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}`);
+                }
+                else {
+                    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(`[${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 (!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(deviceData.nickname)}`);
+        }
+    }
+    async createSmartHQCoffeeMaker(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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 SmartHQCoffeeMaker(this, accessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+                else {
+                    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(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                    new SmartHQCoffeeMaker(this, existingAccessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+            }
+            else {
+                this.unregisterPlatformAccessories(existingAccessory);
+            }
+        }
+        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 SmartHQCoffeeMaker(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(deviceData.nickname)}`);
+        }
+    }
+    async createSmartHQBeverageCenter(userId, device, details, features) {
+        // 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 (!deviceData.hide_device) {
+                // Check if protocol changed to Matter - if so, remove from HAP bridge
+                if (this.shouldUnregisterForMatter(existingAccessory, deviceData)) {
+                    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 SmartHQBeverageCenter(this, accessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+                else {
+                    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(`[${protocol}] Restoring existing accessory from cache: ${existingAccessory.displayName}`);
+                    new SmartHQBeverageCenter(this, existingAccessory, deviceData);
+                    this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
+                }
+            }
+            else {
+                this.unregisterPlatformAccessories(existingAccessory);
+            }
+        }
+        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 SmartHQBeverageCenter(this, accessory, deviceData);
+            this.debugLog(`${deviceData.nickname} uuid: ${deviceData.applianceId}`);
             this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
             this.accessories.push(accessory);
         }
@@ -627,5 +1269,65 @@ export class SmartHQPlatform {
     async enablingPlatformLogging() {
         return this.platformLogging === 'debugMode' || this.platformLogging === 'debug' || this.platformLogging === 'standard';
     }
+    /**
+     * Check if Matter is available and enabled in Homebridge
+     */
+    checkMatterSupport() {
+        // Check if Matter API is available (Homebridge 2.0+)
+        const api = this.api;
+        if (typeof api.isMatterAvailable === 'function') {
+            this.matterAvailable = api.isMatterAvailable();
+            if (!this.matterAvailable) {
+                this.log.warn('Matter is not available in this version of Homebridge. Please update to Homebridge 2.0.0-beta.63 or later to use Matter.');
+            }
+        }
+        else {
+            this.log.debug('Matter API not detected - running on Homebridge < 2.0.0');
+        }
+        // Check if Matter is enabled by user
+        if (this.matterAvailable && typeof api.isMatterEnabled === 'function') {
+            this.matterEnabled = api.isMatterEnabled();
+            if (!this.matterEnabled) {
+                this.log.warn('Matter is available but not enabled. Please enable Matter in Homebridge settings to use Matter devices.');
+            }
+            else {
+                this.log.info('✓ Matter is available and enabled - devices will use Matter protocol');
+            }
+        }
+        // Log final status
+        if (this.matterAvailable && this.matterEnabled) {
+            this.log.success('Matter support: ENABLED - Devices will register as Matter accessories');
+        }
+        else {
+            this.log.info('Matter support: DISABLED - Devices will register as HAP accessories');
+        }
+    }
+    /**
+     * Determine if a device should use Matter based on platform and device config
+     */
+    shouldUseMatter(device) {
+        // If Matter isn't available or enabled, use HAP
+        if (!this.matterAvailable || !this.matterEnabled) {
+            return false;
+        }
+        // Check per-device preference (if specified in config)
+        if (device.useMatter !== undefined) {
+            return device.useMatter;
+        }
+        // Default: use Matter when available
+        return true;
+    }
+    /**
+     * Handle accessory that needs to switch from HAP to Matter
+     * Returns true if accessory was unregistered and needs to be recreated
+     */
+    shouldUnregisterForMatter(existingAccessory, deviceData) {
+        if (deviceData.useMatter && existingAccessory) {
+            this.infoLog(`Removing ${existingAccessory.displayName} from HAP bridge (switching to Matter)`);
+            this.unregisterPlatformAccessories(existingAccessory);
+            return true;
+        }
+        return false;
+    }
 }
 //# sourceMappingURL=platform.js.map