@switchbot/homebridge-switchbot 5.0.0-beta.20 → 5.0.0-beta.22

package/CHANGELOG.md

@@ -8,6 +8,12 @@ All notable changes to this project will be documented in this file. This projec
 - Matter platform: register only devices discovered via the SwitchBot OpenAPI by default. Per-device config overrides (by deviceId) are correctly merged into discovered devices.
 - Add `options.allowConfigOnlyDevices` (boolean) to opt-in to registering devices that exist only in config (not discovered).
 - Add unit tests for per-device merging and config-only behavior.
+ - Matter (Matter platform): default to discovery-first registration and automatically remove previously-registered "stale" accessories that are no longer discovered or configured.
+ - Add `options.keepStaleAccessories` (Advanced Settings) — opt-in to preserve previously-registered accessories when set to true. Default: false (stale accessories are removed automatically).
+ - Implement per-device OpenAPI polling with tracked timers and proper lifecycle cleanup (timers and BLE handlers cleared on unregister/shutdown).
+ - Centralize OpenAPI/BLE -> Matter mapping and expand BLE/OpenAPI parsing to include PM2.5/PM10/VOC/CO2, temperature/humidity, improved color parsing, and additional sensor/robot-vacuum fields.
+ - Prefer accessory-specific update helpers where available; fall back to generic Matter updates otherwise.
+ - Add unit tests covering BLE parsing, stale-accessory behavior, mapping helpers, and lifecycle cleanup.
 
 ## [4.3.1](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v4.3.1) (2025-03-04)
 

package/config.schema.json

@@ -13082,6 +13082,11 @@
             "type": "boolean",
             "description": "If true, devices declared in options.devices that are not discovered by the SwitchBot OpenAPI will still be included (config-only devices). Default: false."
           },
+          "keepStaleAccessories": {
+            "title": "Keep Stale Accessories",
+            "type": "boolean",
+            "description": "If true, accessories that are no longer found via the SwitchBot OpenAPI will be kept in HomeKit. Default: false."
+          },
           "allowInvalidCharacters": {
             "title": "Allow Invalid Characters",
             "type": "boolean",
@@ -14835,6 +14840,10 @@
           "key": "options.allowConfigOnlyDevices",
           "description": "<em class='primary-text'>If true, devices declared in options.devices that are not discovered by the SwitchBot OpenAPI will still be included (config-only devices). Default: false.</em>"
         },
+        {
+          "key": "options.keepStaleAccessories",
+          "description": "<em class='primary-text'>If true, previously-registered accessories for devices that are no longer discovered or configured will be kept on the bridge. Default: false (stale accessories are removed automatically).</em>"
+        },
         {
           "key": "options.allowInvalidCharacters",
           "description": "<em class='primary-text'>Allows device names with characters that are normally invalid in HomeKit. Use with caution, as this may lead to unexpected behavior.</em>"

package/dist/platform-matter.cleanup.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=platform-matter.cleanup.test.d.ts.map

package/dist/platform-matter.cleanup.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"platform-matter.cleanup.test.d.ts","sourceRoot":"","sources":["../src/platform-matter.cleanup.test.ts"],"names":[],"mappings":""}

package/dist/platform-matter.cleanup.test.js

@@ -0,0 +1,85 @@
+import { describe, expect, it, vi } from 'vitest';
+import { SwitchBotMatterPlatform } from './platform-matter.js';
+import { formatDeviceIdAsMac } from './utils.js';
+describe('platform-matter lifecycle cleanup', () => {
+    it('clearDeviceResources removes timers, instances and BLE handler entries', async () => {
+        // Setup stubbed API and logs
+        const handlers = {};
+        const api = {
+            matter: {
+                uuid: { generate: (s) => `uuid-${s}` },
+                registerPlatformAccessories: vi.fn(),
+                unregisterPlatformAccessories: vi.fn(),
+                clusterNames: { OnOff: 'OnOff' },
+            },
+            isMatterAvailable: () => true,
+            isMatterEnabled: () => true,
+            on: (ev, fn) => { handlers[ev] = fn; },
+            _handlers: handlers,
+        };
+        const log = { info: vi.fn(), debug: vi.fn(), warn: vi.fn(), error: vi.fn(), success: vi.fn() };
+        const platform = new SwitchBotMatterPlatform(log, {}, api);
+        // Insert a fake timer, accessory instance, and BLE handler
+        const deviceId = 'AA:BB:CC:11:22:33';
+        const nid = platform.normalizeDeviceId(deviceId);
+        const timer = setInterval(() => { }, 100000);
+        platform.refreshTimers.set(nid, timer);
+        platform.accessoryInstances.set(nid, { dummy: true });
+        platform.bleEventHandler[deviceId.toLowerCase()] = () => { };
+        // Ensure they exist prior
+        expect(platform.refreshTimers.get(nid)).toBeDefined();
+        expect(platform.accessoryInstances.get(nid)).toBeDefined();
+        expect(platform.bleEventHandler[deviceId.toLowerCase()]).toBeDefined();
+        platform.clearDeviceResources(deviceId);
+        // Now they should be removed
+        expect(platform.refreshTimers.get(nid)).toBeUndefined();
+        expect(platform.accessoryInstances.get(nid)).toBeUndefined();
+        expect(platform.bleEventHandler[deviceId.toLowerCase()]).toBeUndefined();
+    });
+    it('shutdown handler clears all timers and handlers when invoked', async () => {
+        // Setup stubbed API and logs
+        const handlers = {};
+        const api = {
+            matter: {
+                uuid: { generate: (s) => `uuid-${s}` },
+                registerPlatformAccessories: vi.fn(),
+                unregisterPlatformAccessories: vi.fn(),
+                clusterNames: { OnOff: 'OnOff' },
+            },
+            isMatterAvailable: () => true,
+            isMatterEnabled: () => true,
+            on: (ev, fn) => { handlers[ev] = fn; },
+            _handlers: handlers,
+        };
+        const log = { info: vi.fn(), debug: vi.fn(), warn: vi.fn(), error: vi.fn(), success: vi.fn() };
+        const platform = new SwitchBotMatterPlatform(log, {}, api);
+        // Add two timers to the platform (using normalized ids)
+        const ids = ['devA', 'devB'];
+        for (const id of ids) {
+            const nid = platform.normalizeDeviceId(id);
+            const t = setInterval(() => { }, 100000);
+            platform.refreshTimers.set(nid, t);
+            platform.accessoryInstances.set(nid, { dummy: true });
+            try {
+                const mac = formatDeviceIdAsMac(id).toLowerCase();
+                platform.bleEventHandler[mac] = () => { };
+            }
+            catch {
+                // ignore formatting errors in this test
+            }
+        }
+        // Invoke didFinishLaunching to ensure the platform registered its shutdown handler
+        await Promise.resolve(api._handlers.didFinishLaunching?.());
+        // Shutdown handler should now be registered on api._handlers.shutdown
+        expect(typeof api._handlers.shutdown).toBe('function');
+        // Call the shutdown handler
+        await Promise.resolve(api._handlers.shutdown());
+        // All refresh timers should be cleared
+        for (const id of ids) {
+            const nid = platform.normalizeDeviceId(id);
+            expect(platform.refreshTimers.get(nid)).toBeUndefined();
+            expect(platform.accessoryInstances.get(nid)).toBeUndefined();
+        }
+    });
+});
+//# sourceMappingURL=platform-matter.cleanup.test.js.map

package/dist/platform-matter.cleanup.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"platform-matter.cleanup.test.js","sourceRoot":"","sources":["../src/platform-matter.cleanup.test.ts"],"names":[],"mappings":"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"}

package/dist/platform-matter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-matter.d.ts","sourceRoot":"","sources":["../src/platform-matter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,qBAAqB,EACrB,OAAO,EAEP,yBAAyB,EAC1B,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,KAAK,EAAiB,uBAAuB,EAAE,MAAM,eAAe,CAAA;AA8B3E,qBAAa,uBAAwB,YAAW,qBAAqB;aAkCjD,GAAG,EAAE,OAAO;aACZ,MAAM,EAAE,uBAAuB;aAC/B,GAAG,EAAE,GAAG;IA9B1B,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAY;IAErF,OAAO,CAAC,YAAY,CAAC,CAAkB;IACvC,OAAO,CAAC,YAAY,CAAC,CAAc;IAEnC,OAAO,CAAC,iBAAiB,CAAe;IAExC,OAAO,CAAC,kBAAkB,CAA8B;IAExD,OAAO,CAAC,aAAa,CAAyC;IAE9D,OAAO,CAAC,eAAe,CAA8C;IAErE,OAAO,CAAC,eAAe,CAAC,CAAS;IAGjC,OAAO,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAClC,UAAU,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACrC,eAAe,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAC1C,OAAO,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAClC,YAAY,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACvC,QAAQ,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACnC,aAAa,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACxC,QAAQ,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACnC,cAAc,EAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,uBAAuB,EAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;gBAG9B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,uBAAuB,EAC/B,GAAG,EAAE,GAAG;IAoK1B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAoC5B;;;OAGG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;OAGG;YACW,sBAAsB;IAuCpC;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAW5B;;;OAGG;YACW,yBAAyB;IA2gBvC;;OAEG;YACW,eAAe;IAwB7B;;OAEG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,SAAI,EAAE,mBAAmB,SAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,GAAG,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IA0BzJ;;;OAGG;IACH,OAAO,CAAC,2BAA2B;IAwDnC;;;;OAIG;YACW,sBAAsB;IA6LpC;;;OAGG;IACH,kBAAkB;IAMlB;;;;;OAKG;IACH,wBAAwB,CAAC,SAAS,EAAE,yBAAyB;IAK7D;;OAEG;YACW,yBAAyB;IAwFvC;;OAEG;YACW,yBAAyB;IA8CvC;;OAEG;YACW,wBAAwB;IA8CtC;;OAEG;YACW,0BAA0B;IAsBxC;;OAEG;YACW,wBAAwB;IAsBtC;;OAEG;YACW,uBAAuB;IA0DrC;;OAEG;YACW,uBAAuB;IAkCrC;;OAEG;YACW,oBAAoB;IA4BlC;;;;;OAKG;YACW,wBAAwB;IAsBtC;;;;;;OAMG;YACW,qBAAqB;CAqBpC"}
+{"version":3,"file":"platform-matter.d.ts","sourceRoot":"","sources":["../src/platform-matter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,qBAAqB,EACrB,OAAO,EAEP,yBAAyB,EAC1B,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,KAAK,EAAiB,uBAAuB,EAAE,MAAM,eAAe,CAAA;AA8B3E,qBAAa,uBAAwB,YAAW,qBAAqB;aAkCjD,GAAG,EAAE,OAAO;aACZ,MAAM,EAAE,uBAAuB;aAC/B,GAAG,EAAE,GAAG;IA9B1B,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAY;IAErF,OAAO,CAAC,YAAY,CAAC,CAAkB;IACvC,OAAO,CAAC,YAAY,CAAC,CAAc;IAEnC,OAAO,CAAC,iBAAiB,CAAe;IAExC,OAAO,CAAC,kBAAkB,CAA8B;IAExD,OAAO,CAAC,aAAa,CAAyC;IAE9D,OAAO,CAAC,eAAe,CAA8C;IAErE,OAAO,CAAC,eAAe,CAAC,CAAS;IAGjC,OAAO,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAClC,UAAU,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACrC,eAAe,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAC1C,OAAO,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAClC,YAAY,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACvC,QAAQ,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACnC,aAAa,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACxC,QAAQ,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACnC,cAAc,EAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,uBAAuB,EAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;gBAG9B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,uBAAuB,EAC/B,GAAG,EAAE,GAAG;IAoK1B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAoC5B;;;OAGG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;OAGG;YACW,sBAAsB;IAuCpC;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAW5B;;;OAGG;YACW,yBAAyB;IA2gBvC;;OAEG;YACW,eAAe;IAwB7B;;OAEG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,SAAI,EAAE,mBAAmB,SAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,GAAG,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IA0BzJ;;;OAGG;IACH,OAAO,CAAC,2BAA2B;IA6InC;;;;OAIG;YACW,sBAAsB;IA0OpC;;;OAGG;IACH,kBAAkB;IAMlB;;;;;OAKG;IACH,wBAAwB,CAAC,SAAS,EAAE,yBAAyB;IAK7D;;OAEG;YACW,yBAAyB;IAsIvC;;OAEG;YACW,yBAAyB;IA8CvC;;OAEG;YACW,wBAAwB;IA8CtC;;OAEG;YACW,0BAA0B;IAsBxC;;OAEG;YACW,wBAAwB;IAsBtC;;OAEG;YACW,uBAAuB;IA0DrC;;OAEG;YACW,uBAAuB;IAkCrC;;OAEG;YACW,oBAAoB;IA4BlC;;;;;OAKG;YACW,wBAAwB;IAsBtC;;;;;;OAMG;YACW,qBAAqB;CAqBpC"}

package/dist/platform-matter.js

@@ -909,6 +909,14 @@ export class SwitchBotMatterPlatform {
                     const parts = c.split(':').map(Number);
                     [r, g, b] = parts;
                 }
+                else if (c.includes(',')) {
+                    const parts = c.split(',').map(s => Number(s.trim()));
+                    [r, g, b] = parts;
+                }
+                else if (c.includes(' ')) {
+                    const parts = c.split(' ').map(s => Number(s.trim()));
+                    [r, g, b] = parts;
+                }
                 else if (c.startsWith('#')) {
                     const hex = c.replace('#', '');
                     r = Number.parseInt(hex.substring(0, 2), 16);
@@ -927,6 +935,72 @@ export class SwitchBotMatterPlatform {
             if (battery !== undefined) {
                 result.battery = Number(battery);
             }
+            // VOC / TVOC (some air quality devices report total volatile organic compounds)
+            const voc = sd.voc ?? sd.tvoc;
+            if (voc !== undefined) {
+                result.voc = Number(voc);
+            }
+            // PM10 (some devices report PM10 alongside PM2.5)
+            const pm10 = sd.pm10;
+            if (pm10 !== undefined) {
+                result.pm10 = Number(pm10);
+            }
+            // PM2.5 (some BLE adverts use pm25 / pm_2_5)
+            const pm25 = sd.pm2_5 ?? sd.pm25 ?? sd.pm_2_5;
+            if (pm25 !== undefined) {
+                result.pm25 = Number(pm25);
+            }
+            // CO2 (carbon dioxide ppm)
+            const co2 = sd.co2 ?? sd.co2ppm ?? sd.carbonDioxide;
+            if (co2 !== undefined) {
+                result.co2 = Number(co2);
+            }
+            // Temperature (C) and Humidity (%) — support common shorthand keys
+            const temperature = sd.temperature ?? sd.temp ?? sd.t;
+            if (temperature !== undefined) {
+                result.temperature = Number(temperature);
+            }
+            const humidity = sd.humidity ?? sd.h ?? sd.humid;
+            if (humidity !== undefined) {
+                result.humidity = Number(humidity);
+            }
+            // Motion, Contact, Leak
+            const motion = sd.motion ?? sd.m;
+            if (motion !== undefined) {
+                result.motion = Boolean(motion);
+            }
+            const contact = sd.contact ?? sd.open;
+            if (contact !== undefined) {
+                result.contact = contact;
+            }
+            const leak = sd.leak ?? sd.water;
+            if (leak !== undefined) {
+                result.leak = Boolean(leak);
+            }
+            // Position / Cover / Curtain synonyms
+            const position = sd.position ?? sd.percent ?? sd.slidePosition ?? sd.curtainPosition;
+            if (position !== undefined) {
+                result.position = Number(position);
+            }
+            // Fan speed/speed
+            const fanSpeed = sd.fanSpeed ?? sd.speed;
+            if (fanSpeed !== undefined) {
+                result.fanSpeed = Number(fanSpeed);
+            }
+            // Lock state
+            const lock = sd.lock;
+            if (lock !== undefined) {
+                result.lock = lock;
+            }
+            // Robot vacuum fields
+            const rvcRunMode = sd.rvcRunMode;
+            if (rvcRunMode !== undefined) {
+                result.rvcRunMode = rvcRunMode;
+            }
+            const rvcOperationalState = sd.rvcOperationalState;
+            if (rvcOperationalState !== undefined) {
+                result.rvcOperationalState = rvcOperationalState;
+            }
             return result;
         }
         catch (e) {
@@ -984,6 +1058,14 @@ export class SwitchBotMatterPlatform {
                     const parts = color.split(':').map(Number);
                     [r, g, b] = parts;
                 }
+                else if (color.includes(',')) {
+                    const parts = color.split(',').map(s => Number(s.trim()));
+                    [r, g, b] = parts;
+                }
+                else if (color.includes(' ')) {
+                    const parts = color.split(' ').map(s => Number(s.trim()));
+                    [r, g, b] = parts;
+                }
                 else if (color.startsWith('#')) {
                     const hex = color.replace('#', '');
                     r = Number.parseInt(hex.substring(0, 2), 16);
@@ -993,10 +1075,10 @@ export class SwitchBotMatterPlatform {
                 const [h, s] = rgb2hs(r, g, b);
                 await safeUpdate(this.api.matter.clusterNames.ColorControl, { currentHue: Math.round((h / 360) * 254), currentSaturation: Math.round((s / 100) * 254) }, 'updateHueSaturation');
             }
-            // Battery/powerSource
-            if (status?.battery !== undefined || status?.batt !== undefined) {
+            // Battery/powerSource (support many possible field names)
+            if (status?.battery !== undefined || status?.batt !== undefined || status?.batteryLevel !== undefined || status?.batteryPercentage !== undefined || status?.battery_level !== undefined) {
                 try {
-                    const percentage = Number(status?.battery ?? status?.batt);
+                    const percentage = Number(status?.battery ?? status?.batt ?? status?.batteryPercentage ?? status?.batteryLevel ?? status?.battery_level);
                     const batPercentRemaining = Math.max(0, Math.min(200, Math.round(percentage * 2)));
                     let batChargeLevel = 0;
                     if (percentage < 20) {
@@ -1005,7 +1087,8 @@ export class SwitchBotMatterPlatform {
                     else if (percentage < 40) {
                         batChargeLevel = 1;
                     }
-                    await safeUpdate('powerSource', { batPercentRemaining, batChargeLevel }, 'updateBatteryPercentage');
+                    const powerCluster = (this.api.matter?.clusterNames && this.api.matter.clusterNames.PowerSource) ? this.api.matter.clusterNames.PowerSource : 'powerSource';
+                    await safeUpdate(powerCluster, { batPercentRemaining, batChargeLevel }, 'updateBatteryPercentage');
                 }
                 catch (e) {
                     this.debugLog(`Failed to apply battery status for ${dev.deviceId}: ${e?.message ?? e}`);
@@ -1028,10 +1111,10 @@ export class SwitchBotMatterPlatform {
                     this.debugLog(`Failed to apply temperature for ${dev.deviceId}: ${e?.message ?? e}`);
                 }
             }
-            // Humidity
-            if (status?.humidity !== undefined || status?.h !== undefined) {
+            // Humidity (support different keys)
+            if (status?.humidity !== undefined || status?.h !== undefined || status?.humid !== undefined) {
                 try {
-                    const percent = Number(status?.humidity ?? status?.h);
+                    const percent = Number(status?.humidity ?? status?.h ?? status?.humid);
                     const measured = Math.round(percent * 100);
                     await safeUpdate('relativeHumidityMeasurement', { measuredValue: measured }, 'updateHumidity');
                 }
@@ -1118,6 +1201,46 @@ export class SwitchBotMatterPlatform {
                     this.debugLog(`Failed to apply rvcRunMode for ${dev.deviceId}: ${e?.message ?? e}`);
                 }
             }
+            // CO2 (carbon dioxide) - support common synonyms
+            if (status?.co2 !== undefined || status?.co2ppm !== undefined || status?.carbonDioxide !== undefined) {
+                try {
+                    const val = Number(status?.co2 ?? status?.co2ppm ?? status?.carbonDioxide);
+                    await safeUpdate('carbonDioxide', { carbonDioxideLevel: val }, 'updateCO2');
+                }
+                catch (e) {
+                    this.debugLog(`Failed to apply CO2 for ${dev.deviceId}: ${e?.message ?? e}`);
+                }
+            }
+            // PM2.5 / particulate matter
+            if (status?.pm2_5 !== undefined || status?.pm25 !== undefined || status?.pm_2_5 !== undefined) {
+                try {
+                    const pm = Number(status?.pm2_5 ?? status?.pm25 ?? status?.pm_2_5);
+                    await safeUpdate('pm2_5', { pm25: pm }, 'updatePM25');
+                }
+                catch (e) {
+                    this.debugLog(`Failed to apply PM2.5 for ${dev.deviceId}: ${e?.message ?? e}`);
+                }
+            }
+            // PM10 (some devices report pm10)
+            if (status?.pm10 !== undefined) {
+                try {
+                    const pm10 = Number(status?.pm10);
+                    await safeUpdate('pm10', { pm10 }, 'updatePM10');
+                }
+                catch (e) {
+                    this.debugLog(`Failed to apply PM10 for ${dev.deviceId}: ${e?.message ?? e}`);
+                }
+            }
+            // VOC / TVOC - volatile organic compounds
+            if (status?.voc !== undefined || status?.tvoc !== undefined) {
+                try {
+                    const val = Number(status?.voc ?? status?.tvoc);
+                    await safeUpdate('voc', { voc: val }, 'updateVOC');
+                }
+                catch (e) {
+                    this.debugLog(`Failed to apply VOC for ${dev.deviceId}: ${e?.message ?? e}`);
+                }
+            }
             if (status?.rvcOperationalState !== undefined) {
                 try {
                     await safeUpdate('rvcOperationalState', { operationalState: Number(status.rvcOperationalState) }, 'updateOperationalState');
@@ -1164,6 +1287,55 @@ export class SwitchBotMatterPlatform {
             this.infoLog(`Registering ${this.discoveredDevices.length} discovered SwitchBot device(s) as Matter accessories`);
             // Merge device config (deviceConfig per deviceType and per-device overrides) to match HAP behavior
             const devicesToProcess = await this.mergeDiscoveredDevices(this.discoveredDevices);
+            // By default, automatically remove previously-registered Matter
+            // accessories whose deviceId is not present in the merged discovered
+            // list. If the user explicitly sets `options.keepStaleAccessories` to
+            // true, then we will keep previously-registered accessories (legacy
+            // behavior).
+            if (this.config.options?.keepStaleAccessories) {
+                this.debugLog('Keeping previously-registered stale accessories because options.keepStaleAccessories=true');
+            }
+            else {
+                try {
+                    const desiredIds = new Set((devicesToProcess || []).map((d) => this.normalizeDeviceId(d.deviceId)));
+                    const toUnregister = [];
+                    for (const [uuid, acc] of Array.from(this.matterAccessories.entries())) {
+                        try {
+                            const deviceId = acc?.context?.deviceId;
+                            if (!deviceId) {
+                                continue;
+                            }
+                            const nid = this.normalizeDeviceId(deviceId);
+                            if (!desiredIds.has(nid)) {
+                                // Accessory exists but is no longer desired -> schedule for removal
+                                this.infoLog(`Removing previously-registered accessory for deviceId=${deviceId} (no longer discovered or configured)`);
+                                try {
+                                    this.clearDeviceResources(deviceId);
+                                }
+                                catch (e) {
+                                    this.debugLog(`Failed to clear resources for ${deviceId} before unregister: ${e?.message ?? e}`);
+                                }
+                                toUnregister.push(acc);
+                                this.matterAccessories.delete(uuid);
+                            }
+                        }
+                        catch (e) {
+                            this.debugLog(`Error while checking existing accessory ${uuid}: ${e?.message ?? e}`);
+                        }
+                    }
+                    if (toUnregister.length > 0) {
+                        try {
+                            await this.api.matter.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, toUnregister);
+                        }
+                        catch (e) {
+                            this.debugLog(`Failed to unregister accessories: ${e?.message ?? e}`);
+                        }
+                    }
+                }
+                catch (e) {
+                    this.debugLog(`Failed to remove stale accessories: ${e?.message ?? e}`);
+                }
+            }
             // We'll separate discovered devices into two buckets:
             // - platformAccessories: accessories that will be hosted under the plugin's Matter bridge
             // - roboticAccessories: robot vacuum devices which require standalone commissioning behaviour