homebridge-smartthings-oauth 1.0.66-beta.6 → 1.0.66

package/CHANGELOG.md

@@ -1,6 +1,32 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.0.66] - Samsung Frame & Tizen TV Control + Laundry/Dishwasher Countdown
+
+> Consolidates the `1.0.66-beta.0`–`beta.7` work (see the beta entries below for full detail). Two themes: Samsung **Frame & Tizen TV** control over the local WebSocket (#46), and a working **remaining-time countdown** for Samsung washers, dryers, and dishwashers in Apple Home (#13). Does not include the in-progress air-purifier work (PR #48).
+
+### Added
+- **Samsung Frame & Tizen TV Control** (#46) — the Apple TV Remote **D-pad** (arrows / Select / Back / Exit / Info) and the iPhone's **hardware volume buttons** drive paired Frame/Tizen TVs over the local `samsung.remote.control` WebSocket, and the **Info button is configurable** per TV (`KEY_INFO` / `KEY_AMBIENT` / `KEY_HOME` / `KEY_SOURCE` / `KEY_MENU` / `KEY_GUIDE`) from the settings UI. Works on The Frame and other Samsung Tizen TVs (OLED / QLED / Neo QLED / Crystal UHD). Thanks to @asafdav.
+- **`SetDuration` and `IsConfigured` characteristics** on the washer/dryer/dishwasher Valve, matching the reference HomeKit valve plugins so Apple Home reliably renders the cycle countdown.
+
+### Fixed
+- **Washer/Dryer/Dishwasher remaining-time countdown** (#13) — the appliance Valve now shows a live countdown in Apple Home's expanded tile while a cycle runs, for both webhook and polling setups. The countdown is seeded **once** at cycle start and decremented by Home itself; the previous per-poll push reset Home's client-side timer and left the tile stuck on "Waiting".
+- **Art Mode status read on modern Samsung TVs** (#46) — the Art Mode switch reflects the TV's actual state on the modern art API (v5.x) instead of always showing off.
+
+### Changed
+- **Renamed to "Samsung Frame & Tizen TV Control"** across the settings UI, config schema, README, and wiki — the local-WebSocket feature works on non-Frame Samsung Tizen TVs too. The `frameTvDevices` config key and wiki URL are unchanged, so existing configs keep working.
+- **Quieter Art Mode polling** (#46) — the routine 30s art-status poll no longer logs per-cycle; only genuine errors and real state changes are logged.
+
+## [1.0.66-beta.7] - Washer/Dryer/Dishwasher countdown: seed-once Valve pattern
+
+> Follow-up to beta.6 (#13). beta.6 pushed `RemainingDuration` on every poll, which kept **resetting Apple Home's client-side countdown** — so the tile stayed on "Waiting". This release adopts the pattern used by working HomeKit valve/irrigation plugins (RainBird, Orbit B-hyve, hap-nodejs `Sprinkler`): seed the countdown **once** at cycle start and let Home decrement it itself.
+
+### Fixed
+- **Washer/Dryer/Dishwasher countdown now renders in polling mode** (#13) — the drifting per-characteristic polls and the 60s self-push timer are replaced by a single consolidated poll that pushes `Active`/`InUse` each cycle but seeds `RemainingDuration` (and `SetDuration`) **only once**, on the cycle-start transition. Re-reads (e.g. when the Home app reopens) are served by the `onGet` handler, which computes the live remaining time from `completionTime`. The same fix is applied to the dryer, which shares the identical Valve code.
+
+### Added
+- **`SetDuration` and `IsConfigured` characteristics** on the washer/dryer/dishwasher Valve, matching the reference valve plugins so Apple Home reliably renders the countdown. `SetDuration` is read-only (the cycle can't be changed from HomeKit).
+
 ## [1.0.66-beta.6] - Washer/Dishwasher countdown for polling-mode users
 
 > Fixes the washer/dishwasher Valve tile showing **"Waiting"** instead of the remaining-time countdown for users without webhooks configured (#13). The Valve's `RemainingDuration` was only ever pushed to HomeKit from the webhook `processEvent` path — so polling-only setups (no `server_url`) never proactively pushed it, and Apple Home's tile stayed on "Waiting" (the value was still correct on demand, e.g. via the Swagger `/api/accessories` endpoint, but Home was never notified).

package/dist/services/dishwasherService.d.ts

@@ -5,10 +5,15 @@ import { MultiServiceAccessory } from '../multiServiceAccessory';
 import { ShortEvent } from '../webhook/subscriptionHandler';
 export declare class DishwasherService extends BaseService {
     private cachedCompletionTime;
-    private countdownTimer;
+    private lastInUse;
+    private remainingSeeded;
     private contactSensorService;
     constructor(platform: IKHomeBridgeHomebridgePlatform, accessory: PlatformAccessory, componentId: string, capabilities: string[], multiServiceAccessory: MultiServiceAccessory, name: string, deviceStatus: any);
     setActive(value: CharacteristicValue): Promise<void>;
+    setDuration(value: CharacteristicValue): Promise<void>;
+    pollValveState(): Promise<CharacteristicValue>;
+    private applyInUseTransition;
+    private seedRemainingDuration;
     getActive(): Promise<CharacteristicValue>;
     getInUse(): Promise<CharacteristicValue>;
     getContactSensorState(): Promise<CharacteristicValue>;
@@ -18,8 +23,6 @@ export declare class DishwasherService extends BaseService {
     private jobStateToContactSensor;
     private tryRemainingTimeFallback;
     private calculateRemainingSeconds;
-    private startCountdownTimer;
-    private stopCountdownTimer;
     processEvent(event: ShortEvent): void;
 }
 //# sourceMappingURL=dishwasherService.d.ts.map

package/dist/services/dishwasherService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dishwasherService.d.ts","sourceRoot":"","sources":["../../src/services/dishwasherService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,qBAAa,iBAAkB,SAAQ,WAAW;IAEhD,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,cAAc,CAA+C;IACrE,OAAO,CAAC,oBAAoB,CAAsB;gBAEtC,QAAQ,EAAE,8BAA8B,EAAE,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,EAC7H,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,MAAM,EAAE,YAAY,KAAA;IA0DtB,SAAS,CAAC,KAAK,EAAE,mBAAmB;IAIpC,SAAS,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBzC,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBxC,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAkBrD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA4B1D,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,wBAAwB;IAchC,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,kBAAkB;IAOnB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAkC7C"}
+{"version":3,"file":"dishwasherService.d.ts","sourceRoot":"","sources":["../../src/services/dishwasherService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,qBAAa,iBAAkB,SAAQ,WAAW;IAEhD,OAAO,CAAC,oBAAoB,CAAuB;IAEnD,OAAO,CAAC,SAAS,CAAuB;IAExC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,oBAAoB,CAAsB;gBAEtC,QAAQ,EAAE,8BAA8B,EAAE,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,EAC7H,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,MAAM,EAAE,YAAY,KAAA;IAuEtB,SAAS,CAAC,KAAK,EAAE,mBAAmB;IAKpC,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAMtC,cAAc,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA6CpD,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,qBAAqB;IAYvB,SAAS,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBzC,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBxC,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAoBrD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAwB1D,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,yBAAyB;IAa1B,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAyC7C"}

package/dist/services/dishwasherService.js

@@ -6,12 +6,17 @@ class DishwasherService extends baseService_1.BaseService {
     constructor(platform, accessory, componentId, capabilities, multiServiceAccessory, name, deviceStatus) {
         super(platform, accessory, componentId, capabilities, multiServiceAccessory, name, deviceStatus);
         this.cachedCompletionTime = null;
-        this.countdownTimer = null;
+        // Tracks the last InUse value so we only seed the countdown on the OFF->ON (cycle-start) transition.
+        this.lastInUse = null;
+        // Whether a non-zero RemainingDuration has been seeded for the current cycle (seed-once guard).
+        this.remainingSeeded = false;
         this.setServiceType(platform.Service.Valve);
         this.log.debug(`Adding DishwasherService to ${this.name}`);
         // ValveType: GENERIC_VALVE so Apple Home shows it as a generic valve with countdown
         this.service.getCharacteristic(platform.Characteristic.ValveType)
             .updateValue(platform.Characteristic.ValveType.GENERIC_VALVE);
+        // IsConfigured: working valve/irrigation plugins set this; unconfigured valves don't render reliably
+        this.service.setCharacteristic(platform.Characteristic.IsConfigured, platform.Characteristic.IsConfigured.CONFIGURED);
         // Active: machine is running or paused
         this.service.getCharacteristic(platform.Characteristic.Active)
             .onGet(this.getActive.bind(this))
@@ -19,21 +24,30 @@ class DishwasherService extends baseService_1.BaseService {
         // InUse: dishwasher job is actively working (wash/rinse/drying/etc)
         this.service.getCharacteristic(platform.Characteristic.InUse)
             .onGet(this.getInUse.bind(this));
-        // RemainingDuration: Apple Home auto-decrements the countdown display for Valve services
+        // SetDuration: read-only for an appliance, but Apple Home's countdown UI expects the
+        // SetDuration/RemainingDuration pair. onSet is a no-op (we can't change the wash cycle).
+        this.service.getCharacteristic(platform.Characteristic.SetDuration)
+            .setProps({ maxValue: 14400 })
+            .onGet(this.getRemainingDuration.bind(this))
+            .onSet(this.setDuration.bind(this));
+        // RemainingDuration: seeded ONCE at cycle start; Apple Home then decrements it client-side.
         this.service.getCharacteristic(platform.Characteristic.RemainingDuration)
             .setProps({ maxValue: 14400 })
             .onGet(this.getRemainingDuration.bind(this));
+        // Seed initial values so a stale cached value isn't shown after a restart (matches reference plugins).
+        this.service.updateCharacteristic(platform.Characteristic.RemainingDuration, 0);
+        this.service.updateCharacteristic(platform.Characteristic.SetDuration, 0);
         // Poll using switch/light interval (appliances change state infrequently)
         let pollSeconds = 10;
         if (this.platform.config.PollSwitchesAndLightsSeconds !== undefined) {
             pollSeconds = this.platform.config.PollSwitchesAndLightsSeconds;
         }
         if (pollSeconds > 0) {
-            multiServiceAccessory.startPollingState(pollSeconds, this.getActive.bind(this), this.service, platform.Characteristic.Active);
-            multiServiceAccessory.startPollingState(pollSeconds, this.getInUse.bind(this), this.service, platform.Characteristic.InUse);
-            // RemainingDuration must be pushed proactively too: in polling mode (no webhooks) processEvent
-            // never fires, so without this the Apple Home tile keeps showing "Waiting" instead of the countdown.
-            multiServiceAccessory.startPollingState(pollSeconds, this.getRemainingDuration.bind(this), this.service, platform.Characteristic.RemainingDuration);
+            // Single consolidated poll: pollValveState pushes InUse and (only on the cycle-start transition)
+            // seeds SetDuration/RemainingDuration, then returns Active for startPollingState to push.
+            // RemainingDuration is deliberately NOT re-pushed every poll - doing so resets Apple Home's
+            // client-side countdown and leaves the tile stuck on "Waiting".
+            multiServiceAccessory.startPollingState(pollSeconds, this.pollValveState.bind(this), this.service, platform.Characteristic.Active);
         }
         // Optional Contact Sensor for Activity Notifications
         if (this.platform.config.ExposeContactSensorForDishwashers) {
@@ -51,6 +65,77 @@ class DishwasherService extends baseService_1.BaseService {
     async setActive(value) {
         this.log.debug(`DishwasherService setActive(${value}) ignored for ${this.name} (read-only)`);
     }
+    // No-op setter for SetDuration (read-only appliance; we can't change the wash cycle length)
+    async setDuration(value) {
+        this.log.debug(`DishwasherService setDuration(${value}) ignored for ${this.name} (read-only)`);
+    }
+    // Consolidated poll: reads status once, pushes InUse, seeds the countdown on the cycle-start
+    // transition only, and returns Active (pushed by startPollingState).
+    async pollValveState() {
+        var _a, _b;
+        const success = await this.getStatus();
+        if (!success) {
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+        const operatingState = this.deviceStatus.status.dishwasherOperatingState;
+        if (!operatingState || !operatingState.machineState || !operatingState.dishwasherJobState) {
+            this.log.error(`Missing dishwasherOperatingState from ${this.name}`);
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+        const machineState = operatingState.machineState.value;
+        const jobState = operatingState.dishwasherJobState.value;
+        this.log.debug(`Dishwasher machineState=${machineState} jobState=${jobState} for ${this.name}`);
+        // Refresh the cached completion time from the current status (or the samsungce fallback).
+        const completionTime = (_a = operatingState.completionTime) === null || _a === void 0 ? void 0 : _a.value;
+        if (completionTime) {
+            this.cachedCompletionTime = completionTime;
+        }
+        else {
+            this.tryRemainingTimeFallback();
+        }
+        const active = this.machineStateToActive(machineState);
+        let inUse = this.jobStateToInUse(jobState);
+        // A stopped/off machine can't be "in use", even if the device leaves jobState stale at end of cycle.
+        if (active === this.platform.Characteristic.Active.INACTIVE) {
+            inUse = this.platform.Characteristic.InUse.NOT_IN_USE;
+        }
+        this.service.updateCharacteristic(this.platform.Characteristic.InUse, inUse);
+        (_b = this.contactSensorService) === null || _b === void 0 ? void 0 : _b.updateCharacteristic(this.platform.Characteristic.ContactSensorState, inUse === this.platform.Characteristic.InUse.IN_USE
+            ? this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
+            : this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED);
+        this.applyInUseTransition(inUse);
+        return active;
+    }
+    // Seed the countdown ONCE per cycle, clear it on ON->OFF. While running, only (re)seeds if it
+    // hasn't been seeded yet - e.g. when completionTime becomes available a poll after the cycle started.
+    applyInUseTransition(inUse) {
+        const IN_USE = this.platform.Characteristic.InUse.IN_USE;
+        const wasInUse = this.lastInUse === IN_USE;
+        const nowInUse = inUse === IN_USE;
+        if (nowInUse && (!wasInUse || !this.remainingSeeded)) {
+            this.seedRemainingDuration();
+        }
+        else if (!nowInUse && wasInUse) {
+            this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, 0);
+            this.remainingSeeded = false;
+            this.log.debug(`Dishwasher cycle ended for ${this.name}: RemainingDuration 0`);
+        }
+        this.lastInUse = inUse;
+    }
+    // Pushes SetDuration/RemainingDuration once. If completionTime isn't available yet (seconds == 0)
+    // it leaves remainingSeeded false so a later poll/event retries the seed.
+    seedRemainingDuration() {
+        const secs = this.calculateRemainingSeconds();
+        if (secs > 0) {
+            this.service.updateCharacteristic(this.platform.Characteristic.SetDuration, secs);
+            this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, secs);
+            this.remainingSeeded = true;
+            this.log.debug(`Dishwasher countdown seeded for ${this.name}: ${secs}s`);
+        }
+        else {
+            this.log.debug(`Dishwasher in use but no completionTime yet for ${this.name}; will retry`);
+        }
+    }
     async getActive() {
         return new Promise((resolve, reject) => {
             this.getStatus().then(success => {
@@ -107,33 +192,31 @@ class DishwasherService extends baseService_1.BaseService {
             });
         });
     }
+    // onGet for RemainingDuration / SetDuration. Serves Home app re-reads (e.g. when the app is
+    // reopened) by computing the live remaining seconds from completionTime; it does not push.
     async getRemainingDuration() {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
             this.getStatus().then(success => {
                 var _a;
                 if (!success) {
-                    reject(new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */));
+                    resolve(this.calculateRemainingSeconds());
                     return;
                 }
                 try {
-                    // completionTime is an attribute of dishwasherOperatingState, not a separate capability
                     const completionTime = (_a = this.deviceStatus.status.dishwasherOperatingState.completionTime) === null || _a === void 0 ? void 0 : _a.value;
                     if (completionTime) {
                         this.cachedCompletionTime = completionTime;
-                        this.startCountdownTimer();
                     }
                     else {
-                        // Fallback: use samsungce.dishwasherOperatingState.remainingTime (integer minutes)
                         this.tryRemainingTimeFallback();
                     }
-                    const remainingSeconds = this.calculateRemainingSeconds();
-                    this.log.debug(`Dishwasher RemainingDuration for ${this.name}: ${remainingSeconds}s`);
-                    resolve(remainingSeconds);
                 }
                 catch (error) {
                     this.log.debug(`No completionTime status available for ${this.name}`);
-                    resolve(0);
                 }
+                const remainingSeconds = this.calculateRemainingSeconds();
+                this.log.debug(`Dishwasher RemainingDuration for ${this.name}: ${remainingSeconds}s`);
+                resolve(remainingSeconds);
             });
         });
     }
@@ -173,10 +256,9 @@ class DishwasherService extends baseService_1.BaseService {
         try {
             const remainingMin = (_b = (_a = this.deviceStatus.status['samsungce.dishwasherOperatingState']) === null || _a === void 0 ? void 0 : _a.remainingTime) === null || _b === void 0 ? void 0 : _b.value;
             if (typeof remainingMin === 'number' && remainingMin > 0) {
-                // Convert relative minutes to an absolute completion timestamp for the countdown timer
+                // Convert relative minutes to an absolute completion timestamp for the countdown.
                 this.cachedCompletionTime = new Date(Date.now() + remainingMin * 60 * 1000).toISOString();
                 this.log.debug(`Dishwasher remainingTime fallback for ${this.name}: ${remainingMin} min`);
-                this.startCountdownTimer();
             }
         }
         catch (_c) {
@@ -195,26 +277,6 @@ class DishwasherService extends baseService_1.BaseService {
         const remaining = Math.max(0, Math.floor((parsed - Date.now()) / 1000));
         return Math.min(remaining, 14400);
     }
-    startCountdownTimer() {
-        this.stopCountdownTimer();
-        const remaining = this.calculateRemainingSeconds();
-        if (remaining <= 0) {
-            return;
-        }
-        this.countdownTimer = setInterval(() => {
-            const secs = this.calculateRemainingSeconds();
-            this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, secs);
-            if (secs <= 0) {
-                this.stopCountdownTimer();
-            }
-        }, 60 * 1000);
-    }
-    stopCountdownTimer() {
-        if (this.countdownTimer) {
-            clearInterval(this.countdownTimer);
-            this.countdownTimer = null;
-        }
-    }
     processEvent(event) {
         var _a, _b;
         if (event.capability === 'dishwasherOperatingState') {
@@ -222,26 +284,33 @@ class DishwasherService extends baseService_1.BaseService {
                 this.log.debug(`Event updating dishwasher machineState for ${this.name} to ${event.value}`);
                 const active = this.machineStateToActive(event.value);
                 this.service.updateCharacteristic(this.platform.Characteristic.Active, active);
-                // If machine stopped, clear timer and set remaining to 0
+                // If machine stopped, clear the cached completion time and set remaining to 0.
                 if (event.value === 'stop') {
                     this.cachedCompletionTime = null;
-                    this.stopCountdownTimer();
+                    this.lastInUse = this.platform.Characteristic.InUse.NOT_IN_USE;
+                    this.remainingSeeded = false;
                     this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, 0);
                     (_a = this.contactSensorService) === null || _a === void 0 ? void 0 : _a.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED);
                 }
             }
             else if (event.attribute === 'dishwasherJobState') {
                 this.log.debug(`Event updating dishwasher jobState for ${this.name} to ${event.value}`);
-                this.service.updateCharacteristic(this.platform.Characteristic.InUse, this.jobStateToInUse(event.value));
+                const inUse = this.jobStateToInUse(event.value);
+                this.service.updateCharacteristic(this.platform.Characteristic.InUse, inUse);
                 (_b = this.contactSensorService) === null || _b === void 0 ? void 0 : _b.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.jobStateToContactSensor(event.value));
+                // Seed the countdown once on the cycle-start transition.
+                this.applyInUseTransition(inUse);
             }
             else if (event.attribute === 'completionTime') {
                 // completionTime is an attribute of dishwasherOperatingState
                 this.log.debug(`Event updating dishwasher completionTime for ${this.name} to ${event.value}`);
                 this.cachedCompletionTime = event.value;
-                const remaining = this.calculateRemainingSeconds();
-                this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, remaining);
-                this.startCountdownTimer();
+                // Refresh RemainingDuration when a cycle is running (real change / late-arriving completionTime).
+                if (this.lastInUse === this.platform.Characteristic.InUse.IN_USE) {
+                    const secs = this.calculateRemainingSeconds();
+                    this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, secs);
+                    this.remainingSeeded = secs > 0;
+                }
             }
         }
     }

package/dist/services/dishwasherService.js.map

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

package/dist/services/dryerService.d.ts

@@ -5,10 +5,15 @@ import { MultiServiceAccessory } from '../multiServiceAccessory';
 import { ShortEvent } from '../webhook/subscriptionHandler';
 export declare class DryerService extends BaseService {
     private cachedCompletionTime;
-    private countdownTimer;
+    private lastInUse;
+    private remainingSeeded;
     private contactSensorService;
     constructor(platform: IKHomeBridgeHomebridgePlatform, accessory: PlatformAccessory, componentId: string, capabilities: string[], multiServiceAccessory: MultiServiceAccessory, name: string, deviceStatus: any);
     setActive(value: CharacteristicValue): Promise<void>;
+    setDuration(value: CharacteristicValue): Promise<void>;
+    pollValveState(): Promise<CharacteristicValue>;
+    private applyInUseTransition;
+    private seedRemainingDuration;
     getActive(): Promise<CharacteristicValue>;
     getInUse(): Promise<CharacteristicValue>;
     getContactSensorState(): Promise<CharacteristicValue>;
@@ -18,8 +23,6 @@ export declare class DryerService extends BaseService {
     private jobStateToContactSensor;
     private tryRemainingTimeFallback;
     private calculateRemainingSeconds;
-    private startCountdownTimer;
-    private stopCountdownTimer;
     processEvent(event: ShortEvent): void;
 }
 //# sourceMappingURL=dryerService.d.ts.map

package/dist/services/dryerService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dryerService.d.ts","sourceRoot":"","sources":["../../src/services/dryerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,qBAAa,YAAa,SAAQ,WAAW;IAE3C,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,cAAc,CAA+C;IACrE,OAAO,CAAC,oBAAoB,CAAsB;gBAEtC,QAAQ,EAAE,8BAA8B,EAAE,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,EAC7H,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,MAAM,EAAE,YAAY,KAAA;IAsDtB,SAAS,CAAC,KAAK,EAAE,mBAAmB;IAIpC,SAAS,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBzC,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBxC,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAkBrD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA0B1D,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,wBAAwB;IAchC,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,kBAAkB;IAOnB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAkC7C"}
+{"version":3,"file":"dryerService.d.ts","sourceRoot":"","sources":["../../src/services/dryerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,qBAAa,YAAa,SAAQ,WAAW;IAE3C,OAAO,CAAC,oBAAoB,CAAuB;IAEnD,OAAO,CAAC,SAAS,CAAuB;IAExC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,oBAAoB,CAAsB;gBAEtC,QAAQ,EAAE,8BAA8B,EAAE,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,EAC7H,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,MAAM,EAAE,YAAY,KAAA;IAuEtB,SAAS,CAAC,KAAK,EAAE,mBAAmB;IAKpC,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAMtC,cAAc,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA6CpD,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,qBAAqB;IAYvB,SAAS,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBzC,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBxC,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAoBrD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAwB1D,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,yBAAyB;IAa1B,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAyC7C"}

package/dist/services/dryerService.js

@@ -6,12 +6,17 @@ class DryerService extends baseService_1.BaseService {
     constructor(platform, accessory, componentId, capabilities, multiServiceAccessory, name, deviceStatus) {
         super(platform, accessory, componentId, capabilities, multiServiceAccessory, name, deviceStatus);
         this.cachedCompletionTime = null;
-        this.countdownTimer = null;
+        // Tracks the last InUse value so we only seed the countdown on the OFF->ON (cycle-start) transition.
+        this.lastInUse = null;
+        // Whether a non-zero RemainingDuration has been seeded for the current cycle (seed-once guard).
+        this.remainingSeeded = false;
         this.setServiceType(platform.Service.Valve);
         this.log.debug(`Adding DryerService to ${this.name}`);
         // ValveType: GENERIC_VALVE so Apple Home shows it as a generic valve with countdown
         this.service.getCharacteristic(platform.Characteristic.ValveType)
             .updateValue(platform.Characteristic.ValveType.GENERIC_VALVE);
+        // IsConfigured: working valve/irrigation plugins set this; unconfigured valves don't render reliably
+        this.service.setCharacteristic(platform.Characteristic.IsConfigured, platform.Characteristic.IsConfigured.CONFIGURED);
         // Active: machine is running or paused
         this.service.getCharacteristic(platform.Characteristic.Active)
             .onGet(this.getActive.bind(this))
@@ -19,18 +24,30 @@ class DryerService extends baseService_1.BaseService {
         // InUse: dryer job is actively working (drying/cooling/etc)
         this.service.getCharacteristic(platform.Characteristic.InUse)
             .onGet(this.getInUse.bind(this));
-        // RemainingDuration: Apple Home auto-decrements the countdown display for Valve services
+        // SetDuration: read-only for an appliance, but Apple Home's countdown UI expects the
+        // SetDuration/RemainingDuration pair. onSet is a no-op (we can't change the dry cycle).
+        this.service.getCharacteristic(platform.Characteristic.SetDuration)
+            .setProps({ maxValue: 14400 })
+            .onGet(this.getRemainingDuration.bind(this))
+            .onSet(this.setDuration.bind(this));
+        // RemainingDuration: seeded ONCE at cycle start; Apple Home then decrements it client-side.
         this.service.getCharacteristic(platform.Characteristic.RemainingDuration)
             .setProps({ maxValue: 14400 })
             .onGet(this.getRemainingDuration.bind(this));
+        // Seed initial values so a stale cached value isn't shown after a restart (matches reference plugins).
+        this.service.updateCharacteristic(platform.Characteristic.RemainingDuration, 0);
+        this.service.updateCharacteristic(platform.Characteristic.SetDuration, 0);
         // Poll using switch/light interval (appliances change state infrequently)
         let pollSeconds = 10;
         if (this.platform.config.PollSwitchesAndLightsSeconds !== undefined) {
             pollSeconds = this.platform.config.PollSwitchesAndLightsSeconds;
         }
         if (pollSeconds > 0) {
-            multiServiceAccessory.startPollingState(pollSeconds, this.getActive.bind(this), this.service, platform.Characteristic.Active);
-            multiServiceAccessory.startPollingState(pollSeconds, this.getInUse.bind(this), this.service, platform.Characteristic.InUse);
+            // Single consolidated poll: pollValveState pushes InUse and (only on the cycle-start transition)
+            // seeds SetDuration/RemainingDuration, then returns Active for startPollingState to push.
+            // RemainingDuration is deliberately NOT re-pushed every poll - doing so resets Apple Home's
+            // client-side countdown and leaves the tile stuck on "Waiting".
+            multiServiceAccessory.startPollingState(pollSeconds, this.pollValveState.bind(this), this.service, platform.Characteristic.Active);
         }
         // Optional Contact Sensor for Activity Notifications
         if (this.platform.config.ExposeContactSensorForDryers) {
@@ -48,6 +65,77 @@ class DryerService extends baseService_1.BaseService {
     async setActive(value) {
         this.log.debug(`DryerService setActive(${value}) ignored for ${this.name} (read-only)`);
     }
+    // No-op setter for SetDuration (read-only appliance; we can't change the dry cycle length)
+    async setDuration(value) {
+        this.log.debug(`DryerService setDuration(${value}) ignored for ${this.name} (read-only)`);
+    }
+    // Consolidated poll: reads status once, pushes InUse, seeds the countdown on the cycle-start
+    // transition only, and returns Active (pushed by startPollingState).
+    async pollValveState() {
+        var _a, _b;
+        const success = await this.getStatus();
+        if (!success) {
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+        const operatingState = this.deviceStatus.status.dryerOperatingState;
+        if (!operatingState || !operatingState.machineState || !operatingState.dryerJobState) {
+            this.log.error(`Missing dryerOperatingState from ${this.name}`);
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+        const machineState = operatingState.machineState.value;
+        const jobState = operatingState.dryerJobState.value;
+        this.log.debug(`Dryer machineState=${machineState} jobState=${jobState} for ${this.name}`);
+        // Refresh the cached completion time from the current status (or the samsungce fallback).
+        const completionTime = (_a = operatingState.completionTime) === null || _a === void 0 ? void 0 : _a.value;
+        if (completionTime) {
+            this.cachedCompletionTime = completionTime;
+        }
+        else {
+            this.tryRemainingTimeFallback();
+        }
+        const active = this.machineStateToActive(machineState);
+        let inUse = this.jobStateToInUse(jobState);
+        // A stopped/off machine can't be "in use", even if the device leaves jobState stale at end of cycle.
+        if (active === this.platform.Characteristic.Active.INACTIVE) {
+            inUse = this.platform.Characteristic.InUse.NOT_IN_USE;
+        }
+        this.service.updateCharacteristic(this.platform.Characteristic.InUse, inUse);
+        (_b = this.contactSensorService) === null || _b === void 0 ? void 0 : _b.updateCharacteristic(this.platform.Characteristic.ContactSensorState, inUse === this.platform.Characteristic.InUse.IN_USE
+            ? this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
+            : this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED);
+        this.applyInUseTransition(inUse);
+        return active;
+    }
+    // Seed the countdown ONCE per cycle, clear it on ON->OFF. While running, only (re)seeds if it
+    // hasn't been seeded yet - e.g. when completionTime becomes available a poll after the cycle started.
+    applyInUseTransition(inUse) {
+        const IN_USE = this.platform.Characteristic.InUse.IN_USE;
+        const wasInUse = this.lastInUse === IN_USE;
+        const nowInUse = inUse === IN_USE;
+        if (nowInUse && (!wasInUse || !this.remainingSeeded)) {
+            this.seedRemainingDuration();
+        }
+        else if (!nowInUse && wasInUse) {
+            this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, 0);
+            this.remainingSeeded = false;
+            this.log.debug(`Dryer cycle ended for ${this.name}: RemainingDuration 0`);
+        }
+        this.lastInUse = inUse;
+    }
+    // Pushes SetDuration/RemainingDuration once. If completionTime isn't available yet (seconds == 0)
+    // it leaves remainingSeeded false so a later poll/event retries the seed.
+    seedRemainingDuration() {
+        const secs = this.calculateRemainingSeconds();
+        if (secs > 0) {
+            this.service.updateCharacteristic(this.platform.Characteristic.SetDuration, secs);
+            this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, secs);
+            this.remainingSeeded = true;
+            this.log.debug(`Dryer countdown seeded for ${this.name}: ${secs}s`);
+        }
+        else {
+            this.log.debug(`Dryer in use but no completionTime yet for ${this.name}; will retry`);
+        }
+    }
     async getActive() {
         return new Promise((resolve, reject) => {
             this.getStatus().then(success => {
@@ -104,31 +192,31 @@ class DryerService extends baseService_1.BaseService {
             });
         });
     }
+    // onGet for RemainingDuration / SetDuration. Serves Home app re-reads (e.g. when the app is
+    // reopened) by computing the live remaining seconds from completionTime; it does not push.
     async getRemainingDuration() {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
             this.getStatus().then(success => {
                 var _a;
                 if (!success) {
-                    reject(new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */));
+                    resolve(this.calculateRemainingSeconds());
                     return;
                 }
                 try {
-                    // completionTime is an attribute of dryerOperatingState, not a separate capability
                     const completionTime = (_a = this.deviceStatus.status.dryerOperatingState.completionTime) === null || _a === void 0 ? void 0 : _a.value;
                     if (completionTime) {
                         this.cachedCompletionTime = completionTime;
-                        this.startCountdownTimer();
                     }
                     else {
-                        // Fallback: use samsungce.dryerOperatingState.remainingTime (integer minutes)
                         this.tryRemainingTimeFallback();
                     }
-                    resolve(this.calculateRemainingSeconds());
                 }
                 catch (error) {
                     this.log.debug(`No completionTime status available for ${this.name}`);
-                    resolve(0);
                 }
+                const remainingSeconds = this.calculateRemainingSeconds();
+                this.log.debug(`Dryer RemainingDuration for ${this.name}: ${remainingSeconds}s`);
+                resolve(remainingSeconds);
             });
         });
     }
@@ -168,10 +256,9 @@ class DryerService extends baseService_1.BaseService {
         try {
             const remainingMin = (_b = (_a = this.deviceStatus.status['samsungce.dryerOperatingState']) === null || _a === void 0 ? void 0 : _a.remainingTime) === null || _b === void 0 ? void 0 : _b.value;
             if (typeof remainingMin === 'number' && remainingMin > 0) {
-                // Convert relative minutes to an absolute completion timestamp for the countdown timer
+                // Convert relative minutes to an absolute completion timestamp for the countdown.
                 this.cachedCompletionTime = new Date(Date.now() + remainingMin * 60 * 1000).toISOString();
                 this.log.debug(`Dryer remainingTime fallback for ${this.name}: ${remainingMin} min`);
-                this.startCountdownTimer();
             }
         }
         catch (_c) {
@@ -190,26 +277,6 @@ class DryerService extends baseService_1.BaseService {
         const remaining = Math.max(0, Math.floor((parsed - Date.now()) / 1000));
         return Math.min(remaining, 14400);
     }
-    startCountdownTimer() {
-        this.stopCountdownTimer();
-        const remaining = this.calculateRemainingSeconds();
-        if (remaining <= 0) {
-            return;
-        }
-        this.countdownTimer = setInterval(() => {
-            const secs = this.calculateRemainingSeconds();
-            this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, secs);
-            if (secs <= 0) {
-                this.stopCountdownTimer();
-            }
-        }, 60 * 1000);
-    }
-    stopCountdownTimer() {
-        if (this.countdownTimer) {
-            clearInterval(this.countdownTimer);
-            this.countdownTimer = null;
-        }
-    }
     processEvent(event) {
         var _a, _b;
         if (event.capability === 'dryerOperatingState') {
@@ -217,26 +284,33 @@ class DryerService extends baseService_1.BaseService {
                 this.log.debug(`Event updating dryer machineState for ${this.name} to ${event.value}`);
                 const active = this.machineStateToActive(event.value);
                 this.service.updateCharacteristic(this.platform.Characteristic.Active, active);
-                // If machine stopped, clear timer and set remaining to 0
+                // If machine stopped, clear the cached completion time and set remaining to 0.
                 if (event.value === 'stop') {
                     this.cachedCompletionTime = null;
-                    this.stopCountdownTimer();
+                    this.lastInUse = this.platform.Characteristic.InUse.NOT_IN_USE;
+                    this.remainingSeeded = false;
                     this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, 0);
                     (_a = this.contactSensorService) === null || _a === void 0 ? void 0 : _a.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED);
                 }
             }
             else if (event.attribute === 'dryerJobState') {
                 this.log.debug(`Event updating dryer jobState for ${this.name} to ${event.value}`);
-                this.service.updateCharacteristic(this.platform.Characteristic.InUse, this.jobStateToInUse(event.value));
+                const inUse = this.jobStateToInUse(event.value);
+                this.service.updateCharacteristic(this.platform.Characteristic.InUse, inUse);
                 (_b = this.contactSensorService) === null || _b === void 0 ? void 0 : _b.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.jobStateToContactSensor(event.value));
+                // Seed the countdown once on the cycle-start transition.
+                this.applyInUseTransition(inUse);
             }
             else if (event.attribute === 'completionTime') {
                 // completionTime is an attribute of dryerOperatingState
                 this.log.debug(`Event updating dryer completionTime for ${this.name} to ${event.value}`);
                 this.cachedCompletionTime = event.value;
-                const remaining = this.calculateRemainingSeconds();
-                this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, remaining);
-                this.startCountdownTimer();
+                // Refresh RemainingDuration when a cycle is running (real change / late-arriving completionTime).
+                if (this.lastInUse === this.platform.Characteristic.InUse.IN_USE) {
+                    const secs = this.calculateRemainingSeconds();
+                    this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, secs);
+                    this.remainingSeeded = secs > 0;
+                }
             }
         }
     }

package/dist/services/dryerService.js.map

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

package/dist/services/washerService.d.ts

@@ -5,10 +5,15 @@ import { MultiServiceAccessory } from '../multiServiceAccessory';
 import { ShortEvent } from '../webhook/subscriptionHandler';
 export declare class WasherService extends BaseService {
     private cachedCompletionTime;
-    private countdownTimer;
+    private lastInUse;
+    private remainingSeeded;
     private contactSensorService;
     constructor(platform: IKHomeBridgeHomebridgePlatform, accessory: PlatformAccessory, componentId: string, capabilities: string[], multiServiceAccessory: MultiServiceAccessory, name: string, deviceStatus: any);
     setActive(value: CharacteristicValue): Promise<void>;
+    setDuration(value: CharacteristicValue): Promise<void>;
+    pollValveState(): Promise<CharacteristicValue>;
+    private applyInUseTransition;
+    private seedRemainingDuration;
     getActive(): Promise<CharacteristicValue>;
     getInUse(): Promise<CharacteristicValue>;
     getContactSensorState(): Promise<CharacteristicValue>;
@@ -18,8 +23,6 @@ export declare class WasherService extends BaseService {
     private jobStateToContactSensor;
     private tryRemainingTimeFallback;
     private calculateRemainingSeconds;
-    private startCountdownTimer;
-    private stopCountdownTimer;
     processEvent(event: ShortEvent): void;
 }
 //# sourceMappingURL=washerService.d.ts.map

package/dist/services/washerService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"washerService.d.ts","sourceRoot":"","sources":["../../src/services/washerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,qBAAa,aAAc,SAAQ,WAAW;IAE5C,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,cAAc,CAA+C;IACrE,OAAO,CAAC,oBAAoB,CAAsB;gBAEtC,QAAQ,EAAE,8BAA8B,EAAE,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,EAC7H,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,MAAM,EAAE,YAAY,KAAA;IA0DtB,SAAS,CAAC,KAAK,EAAE,mBAAmB;IAIpC,SAAS,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBzC,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBxC,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAkBrD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA4B1D,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,wBAAwB;IAchC,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,kBAAkB;IAOnB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAkC7C"}
+{"version":3,"file":"washerService.d.ts","sourceRoot":"","sources":["../../src/services/washerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,qBAAa,aAAc,SAAQ,WAAW;IAE5C,OAAO,CAAC,oBAAoB,CAAuB;IAEnD,OAAO,CAAC,SAAS,CAAuB;IAExC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,oBAAoB,CAAsB;gBAEtC,QAAQ,EAAE,8BAA8B,EAAE,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,EAC7H,qBAAqB,EAAE,qBAAqB,EAC5C,IAAI,EAAE,MAAM,EAAE,YAAY,KAAA;IAuEtB,SAAS,CAAC,KAAK,EAAE,mBAAmB;IAKpC,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAMtC,cAAc,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA6CpD,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,qBAAqB;IAYvB,SAAS,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBzC,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmBxC,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAoBrD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAwB1D,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,yBAAyB;IAa1B,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAyC7C"}

package/dist/services/washerService.js

@@ -6,12 +6,17 @@ class WasherService extends baseService_1.BaseService {
     constructor(platform, accessory, componentId, capabilities, multiServiceAccessory, name, deviceStatus) {
         super(platform, accessory, componentId, capabilities, multiServiceAccessory, name, deviceStatus);
         this.cachedCompletionTime = null;
-        this.countdownTimer = null;
+        // Tracks the last InUse value so we only seed the countdown on the OFF->ON (cycle-start) transition.
+        this.lastInUse = null;
+        // Whether a non-zero RemainingDuration has been seeded for the current cycle (seed-once guard).
+        this.remainingSeeded = false;
         this.setServiceType(platform.Service.Valve);
         this.log.debug(`Adding WasherService to ${this.name}`);
         // ValveType: GENERIC_VALVE so Apple Home shows it as a generic valve with countdown
         this.service.getCharacteristic(platform.Characteristic.ValveType)
             .updateValue(platform.Characteristic.ValveType.GENERIC_VALVE);
+        // IsConfigured: working valve/irrigation plugins set this; unconfigured valves don't render reliably
+        this.service.setCharacteristic(platform.Characteristic.IsConfigured, platform.Characteristic.IsConfigured.CONFIGURED);
         // Active: machine is running or paused
         this.service.getCharacteristic(platform.Characteristic.Active)
             .onGet(this.getActive.bind(this))
@@ -19,21 +24,30 @@ class WasherService extends baseService_1.BaseService {
         // InUse: washer job is actively working (wash/rinse/spin)
         this.service.getCharacteristic(platform.Characteristic.InUse)
             .onGet(this.getInUse.bind(this));
-        // RemainingDuration: Apple Home auto-decrements the countdown display for Valve services
+        // SetDuration: read-only for an appliance, but Apple Home's countdown UI expects the
+        // SetDuration/RemainingDuration pair. onSet is a no-op (we can't change the wash cycle).
+        this.service.getCharacteristic(platform.Characteristic.SetDuration)
+            .setProps({ maxValue: 14400 })
+            .onGet(this.getRemainingDuration.bind(this))
+            .onSet(this.setDuration.bind(this));
+        // RemainingDuration: seeded ONCE at cycle start; Apple Home then decrements it client-side.
         this.service.getCharacteristic(platform.Characteristic.RemainingDuration)
             .setProps({ maxValue: 14400 })
             .onGet(this.getRemainingDuration.bind(this));
+        // Seed initial values so a stale cached value isn't shown after a restart (matches reference plugins).
+        this.service.updateCharacteristic(platform.Characteristic.RemainingDuration, 0);
+        this.service.updateCharacteristic(platform.Characteristic.SetDuration, 0);
         // Poll using switch/light interval (appliances change state infrequently)
         let pollSeconds = 10;
         if (this.platform.config.PollSwitchesAndLightsSeconds !== undefined) {
             pollSeconds = this.platform.config.PollSwitchesAndLightsSeconds;
         }
         if (pollSeconds > 0) {
-            multiServiceAccessory.startPollingState(pollSeconds, this.getActive.bind(this), this.service, platform.Characteristic.Active);
-            multiServiceAccessory.startPollingState(pollSeconds, this.getInUse.bind(this), this.service, platform.Characteristic.InUse);
-            // RemainingDuration must be pushed proactively too: in polling mode (no webhooks) processEvent
-            // never fires, so without this the Apple Home tile keeps showing "Waiting" instead of the countdown.
-            multiServiceAccessory.startPollingState(pollSeconds, this.getRemainingDuration.bind(this), this.service, platform.Characteristic.RemainingDuration);
+            // Single consolidated poll: pollValveState pushes InUse and (only on the cycle-start transition)
+            // seeds SetDuration/RemainingDuration, then returns Active for startPollingState to push.
+            // RemainingDuration is deliberately NOT re-pushed every poll - doing so resets Apple Home's
+            // client-side countdown and leaves the tile stuck on "Waiting".
+            multiServiceAccessory.startPollingState(pollSeconds, this.pollValveState.bind(this), this.service, platform.Characteristic.Active);
         }
         // Optional Contact Sensor for Activity Notifications
         if (this.platform.config.ExposeContactSensorForWashers) {
@@ -51,6 +65,77 @@ class WasherService extends baseService_1.BaseService {
     async setActive(value) {
         this.log.debug(`WasherService setActive(${value}) ignored for ${this.name} (read-only)`);
     }
+    // No-op setter for SetDuration (read-only appliance; we can't change the wash cycle length)
+    async setDuration(value) {
+        this.log.debug(`WasherService setDuration(${value}) ignored for ${this.name} (read-only)`);
+    }
+    // Consolidated poll: reads status once, pushes InUse, seeds the countdown on the cycle-start
+    // transition only, and returns Active (pushed by startPollingState).
+    async pollValveState() {
+        var _a, _b;
+        const success = await this.getStatus();
+        if (!success) {
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+        const operatingState = this.deviceStatus.status.washerOperatingState;
+        if (!operatingState || !operatingState.machineState || !operatingState.washerJobState) {
+            this.log.error(`Missing washerOperatingState from ${this.name}`);
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+        const machineState = operatingState.machineState.value;
+        const jobState = operatingState.washerJobState.value;
+        this.log.debug(`Washer machineState=${machineState} jobState=${jobState} for ${this.name}`);
+        // Refresh the cached completion time from the current status (or the samsungce fallback).
+        const completionTime = (_a = operatingState.completionTime) === null || _a === void 0 ? void 0 : _a.value;
+        if (completionTime) {
+            this.cachedCompletionTime = completionTime;
+        }
+        else {
+            this.tryRemainingTimeFallback();
+        }
+        const active = this.machineStateToActive(machineState);
+        let inUse = this.jobStateToInUse(jobState);
+        // A stopped/off machine can't be "in use", even if the device leaves jobState stale at end of cycle.
+        if (active === this.platform.Characteristic.Active.INACTIVE) {
+            inUse = this.platform.Characteristic.InUse.NOT_IN_USE;
+        }
+        this.service.updateCharacteristic(this.platform.Characteristic.InUse, inUse);
+        (_b = this.contactSensorService) === null || _b === void 0 ? void 0 : _b.updateCharacteristic(this.platform.Characteristic.ContactSensorState, inUse === this.platform.Characteristic.InUse.IN_USE
+            ? this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
+            : this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED);
+        this.applyInUseTransition(inUse);
+        return active;
+    }
+    // Seed the countdown ONCE per cycle, clear it on ON->OFF. While running, only (re)seeds if it
+    // hasn't been seeded yet - e.g. when completionTime becomes available a poll after the cycle started.
+    applyInUseTransition(inUse) {
+        const IN_USE = this.platform.Characteristic.InUse.IN_USE;
+        const wasInUse = this.lastInUse === IN_USE;
+        const nowInUse = inUse === IN_USE;
+        if (nowInUse && (!wasInUse || !this.remainingSeeded)) {
+            this.seedRemainingDuration();
+        }
+        else if (!nowInUse && wasInUse) {
+            this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, 0);
+            this.remainingSeeded = false;
+            this.log.debug(`Washer cycle ended for ${this.name}: RemainingDuration 0`);
+        }
+        this.lastInUse = inUse;
+    }
+    // Pushes SetDuration/RemainingDuration once. If completionTime isn't available yet (seconds == 0)
+    // it leaves remainingSeeded false so a later poll/event retries the seed.
+    seedRemainingDuration() {
+        const secs = this.calculateRemainingSeconds();
+        if (secs > 0) {
+            this.service.updateCharacteristic(this.platform.Characteristic.SetDuration, secs);
+            this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, secs);
+            this.remainingSeeded = true;
+            this.log.debug(`Washer countdown seeded for ${this.name}: ${secs}s`);
+        }
+        else {
+            this.log.debug(`Washer in use but no completionTime yet for ${this.name}; will retry`);
+        }
+    }
     async getActive() {
         return new Promise((resolve, reject) => {
             this.getStatus().then(success => {
@@ -107,33 +192,31 @@ class WasherService extends baseService_1.BaseService {
             });
         });
     }
+    // onGet for RemainingDuration / SetDuration. Serves Home app re-reads (e.g. when the app is
+    // reopened) by computing the live remaining seconds from completionTime; it does not push.
     async getRemainingDuration() {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
             this.getStatus().then(success => {
                 var _a;
                 if (!success) {
-                    reject(new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */));
+                    resolve(this.calculateRemainingSeconds());
                     return;
                 }
                 try {
-                    // completionTime is an attribute of washerOperatingState, not a separate capability
                     const completionTime = (_a = this.deviceStatus.status.washerOperatingState.completionTime) === null || _a === void 0 ? void 0 : _a.value;
                     if (completionTime) {
                         this.cachedCompletionTime = completionTime;
-                        this.startCountdownTimer();
                     }
                     else {
-                        // Fallback: use samsungce.washerOperatingState.remainingTime (integer minutes)
                         this.tryRemainingTimeFallback();
                     }
-                    const remainingSeconds = this.calculateRemainingSeconds();
-                    this.log.debug(`Washer RemainingDuration for ${this.name}: ${remainingSeconds}s`);
-                    resolve(remainingSeconds);
                 }
                 catch (error) {
                     this.log.debug(`No completionTime status available for ${this.name}`);
-                    resolve(0);
                 }
+                const remainingSeconds = this.calculateRemainingSeconds();
+                this.log.debug(`Washer RemainingDuration for ${this.name}: ${remainingSeconds}s`);
+                resolve(remainingSeconds);
             });
         });
     }
@@ -170,10 +253,9 @@ class WasherService extends baseService_1.BaseService {
         try {
             const remainingMin = (_b = (_a = this.deviceStatus.status['samsungce.washerOperatingState']) === null || _a === void 0 ? void 0 : _a.remainingTime) === null || _b === void 0 ? void 0 : _b.value;
             if (typeof remainingMin === 'number' && remainingMin > 0) {
-                // Convert relative minutes to an absolute completion timestamp for the countdown timer
+                // Convert relative minutes to an absolute completion timestamp for the countdown.
                 this.cachedCompletionTime = new Date(Date.now() + remainingMin * 60 * 1000).toISOString();
                 this.log.debug(`Washer remainingTime fallback for ${this.name}: ${remainingMin} min`);
-                this.startCountdownTimer();
             }
         }
         catch (_c) {
@@ -192,26 +274,6 @@ class WasherService extends baseService_1.BaseService {
         const remaining = Math.max(0, Math.floor((parsed - Date.now()) / 1000));
         return Math.min(remaining, 14400);
     }
-    startCountdownTimer() {
-        this.stopCountdownTimer();
-        const remaining = this.calculateRemainingSeconds();
-        if (remaining <= 0) {
-            return;
-        }
-        this.countdownTimer = setInterval(() => {
-            const secs = this.calculateRemainingSeconds();
-            this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, secs);
-            if (secs <= 0) {
-                this.stopCountdownTimer();
-            }
-        }, 60 * 1000);
-    }
-    stopCountdownTimer() {
-        if (this.countdownTimer) {
-            clearInterval(this.countdownTimer);
-            this.countdownTimer = null;
-        }
-    }
     processEvent(event) {
         var _a, _b;
         if (event.capability === 'washerOperatingState') {
@@ -219,26 +281,33 @@ class WasherService extends baseService_1.BaseService {
                 this.log.debug(`Event updating washer machineState for ${this.name} to ${event.value}`);
                 const active = this.machineStateToActive(event.value);
                 this.service.updateCharacteristic(this.platform.Characteristic.Active, active);
-                // If machine stopped, clear timer and set remaining to 0
+                // If machine stopped, clear the cached completion time and set remaining to 0.
                 if (event.value === 'stop') {
                     this.cachedCompletionTime = null;
-                    this.stopCountdownTimer();
+                    this.lastInUse = this.platform.Characteristic.InUse.NOT_IN_USE;
+                    this.remainingSeeded = false;
                     this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, 0);
                     (_a = this.contactSensorService) === null || _a === void 0 ? void 0 : _a.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED);
                 }
             }
             else if (event.attribute === 'washerJobState') {
                 this.log.debug(`Event updating washer jobState for ${this.name} to ${event.value}`);
-                this.service.updateCharacteristic(this.platform.Characteristic.InUse, this.jobStateToInUse(event.value));
+                const inUse = this.jobStateToInUse(event.value);
+                this.service.updateCharacteristic(this.platform.Characteristic.InUse, inUse);
                 (_b = this.contactSensorService) === null || _b === void 0 ? void 0 : _b.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.jobStateToContactSensor(event.value));
+                // Seed the countdown once on the cycle-start transition.
+                this.applyInUseTransition(inUse);
             }
             else if (event.attribute === 'completionTime') {
                 // completionTime is an attribute of washerOperatingState
                 this.log.debug(`Event updating washer completionTime for ${this.name} to ${event.value}`);
                 this.cachedCompletionTime = event.value;
-                const remaining = this.calculateRemainingSeconds();
-                this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, remaining);
-                this.startCountdownTimer();
+                // Refresh RemainingDuration when a cycle is running (real change / late-arriving completionTime).
+                if (this.lastInUse === this.platform.Characteristic.InUse.IN_USE) {
+                    const secs = this.calculateRemainingSeconds();
+                    this.service.updateCharacteristic(this.platform.Characteristic.RemainingDuration, secs);
+                    this.remainingSeeded = secs > 0;
+                }
             }
         }
     }

package/dist/services/washerService.js.map

@@ -1 +1 @@
-{"version":3,"file":"washerService.js","sourceRoot":"","sources":["../../src/services/washerService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"washerService.js","sourceRoot":"","sources":["../../src/services/washerService.ts"],"names":[],"mappings":";;;AAEA,+CAA4C;AAI5C,MAAa,aAAc,SAAQ,yBAAW;IAS5C,YAAY,QAAwC,EAAE,SAA4B,EAAE,WAAmB,EAAE,YAAsB,EAC7H,qBAA4C,EAC5C,IAAY,EAAE,YAAY;QAC1B,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,qBAAqB,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAV3F,yBAAoB,GAAkB,IAAI,CAAC;QACnD,qGAAqG;QAC7F,cAAS,GAAkB,IAAI,CAAC;QACxC,gGAAgG;QACxF,oBAAe,GAAG,KAAK,CAAC;QAQ9B,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEvD,oFAAoF;QACpF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC;aAC9D,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAEhE,qGAAqG;QACrG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACjE,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEnD,uCAAuC;QACvC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;aAC3D,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAChC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpC,0DAA0D;QAC1D,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC;aAC1D,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEnC,qFAAqF;QACrF,yFAAyF;QACzF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC;aAChE,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;aAC7B,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC3C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEtC,4FAA4F;QAC5F,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAC;aACtE,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;aAC7B,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/C,uGAAuG;QACvG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAE1E,0EAA0E;QAC1E,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,4BAA4B,KAAK,SAAS,EAAE,CAAC;YACpE,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,4BAA4B,CAAC;QAClE,CAAC;QAED,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACpB,iGAAiG;YACjG,0FAA0F;YAC1F,4FAA4F;YAC5F,gEAAgE;YAChE,qBAAqB,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,EAC/F,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;QAED,qDAAqD;QACrD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC;YACvD,MAAM,cAAc,GAAG,uBAAuB,CAAC;YAC/C,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC;gBACnE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,IAAI,WAAW,EAAE,cAAc,CAAC,CAAC;YAErG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC;iBACpF,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAEhD,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;gBACpB,qBAAqB,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EACxF,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,KAAK,CAAC,SAAS,CAAC,KAA0B;QACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,KAAK,iBAAiB,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC;IAC3F,CAAC;IAED,4FAA4F;IAC5F,KAAK,CAAC,WAAW,CAAC,KAA0B;QAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,KAAK,iBAAiB,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC;IAC7F,CAAC;IAED,6FAA6F;IAC7F,qEAAqE;IACrE,KAAK,CAAC,cAAc;;QAClB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAA+D,CAAC;QAChH,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,oBAAoB,CAAC;QACrE,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,YAAY,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;YACtF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACjE,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAA+D,CAAC;QAChH,CAAC;QAED,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC;QACvD,MAAM,QAAQ,GAAG,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC;QACrD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,YAAY,aAAa,QAAQ,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5F,0FAA0F;QAC1F,MAAM,cAAc,GAAG,MAAA,cAAc,CAAC,cAAc,0CAAE,KAAK,CAAC;QAC5D,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,oBAAoB,GAAG,cAAc,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAClC,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QACvD,IAAI,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC3C,qGAAqG;QACrG,IAAI,MAAM,KAAK,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC5D,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7E,MAAA,IAAI,CAAC,oBAAoB,0CAAE,oBAAoB,CAC7C,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAC/C,KAAK,KAAK,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM;YACjD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB;YACtE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CACrE,CAAC;QAEF,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAEjC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,8FAA8F;IAC9F,sGAAsG;IAC9F,oBAAoB,CAAC,KAAa;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC;QAC3C,MAAM,QAAQ,GAAG,KAAK,KAAK,MAAM,CAAC;QAElC,IAAI,QAAQ,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC/B,CAAC;aAAM,IAAI,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;YACjC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;YACrF,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,IAAI,uBAAuB,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,kGAAkG;IAClG,0EAA0E;IAClE,qBAAqB;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC9C,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAClF,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YACxF,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,IAAI,CAAC,IAAI,KAAK,IAAI,GAAG,CAAC,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+CAA+C,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAA+D,CAAC,CAAC;oBAChH,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,oBAAoB,CAAC,YAAY,CAAC,KAAK,CAAC;oBACtF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC,CAAC;oBACxE,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,CAAC;gBACnD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kDAAkD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC9E,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAA+D,CAAC,CAAC;gBAClH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAA+D,CAAC,CAAC;oBAChH,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC;oBACpF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC,CAAC;oBAChE,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC1C,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oDAAoD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAChF,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAA+D,CAAC,CAAC;gBAClH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,qBAAqB;QACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAA+D,CAAC,CAAC;oBAChH,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC;oBACpF,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAClD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oDAAoD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAChF,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAA+D,CAAC,CAAC;gBAClH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,4FAA4F;IAC5F,2FAA2F;IAC3F,KAAK,CAAC,oBAAoB;QACxB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;;gBAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;oBAC1C,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,oBAAoB,CAAC,cAAc,0CAAE,KAAK,CAAC;oBAC3F,IAAI,cAAc,EAAE,CAAC;wBACnB,IAAI,CAAC,oBAAoB,GAAG,cAAc,CAAC;oBAC7C,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,wBAAwB,EAAE,CAAC;oBAClC,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0CAA0C,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACxE,CAAC;gBACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAC1D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,IAAI,KAAK,gBAAgB,GAAG,CAAC,CAAC;gBAClF,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,oBAAoB,CAAC,YAAoB;QAC/C,QAAQ,YAAY,EAAE,CAAC;YACvB,KAAK,KAAK,CAAC;YACX,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC;YACpD;gBACE,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC;QACtD,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,QAAgB;QACtC,QAAQ,QAAQ,EAAE,CAAC;YACnB,KAAK,MAAM,CAAC;YACZ,KAAK,OAAO,CAAC;YACb,KAAK,MAAM,CAAC;YACZ,KAAK,eAAe,CAAC;YACrB,KAAK,gBAAgB,CAAC;YACtB,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;YACnD;gBACE,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC;QACvD,CAAC;IACH,CAAC;IAEO,uBAAuB,CAAC,QAAgB;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC7C,OAAO,KAAK,KAAK,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM;YACxD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB;YACtE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;IACvE,CAAC;IAEO,wBAAwB;;QAC9B,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAA,MAAA,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,gCAAgC,CAAC,0CAAE,aAAa,0CAAE,KAAK,CAAC;YACtG,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;gBACzD,kFAAkF;gBAClF,IAAI,CAAC,oBAAoB,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;gBAC1F,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,IAAI,CAAC,IAAI,KAAK,YAAY,MAAM,CAAC,CAAC;YACxF,CAAC;QACH,CAAC;QAAC,WAAM,CAAC;YACP,wDAAwD;QAC1D,CAAC;IACH,CAAC;IAEO,yBAAyB;QAC/B,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/B,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;YAC7F,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;IAEM,YAAY,CAAC,KAAiB;;QACnC,IAAI,KAAK,CAAC,UAAU,KAAK,sBAAsB,EAAE,CAAC;YAChD,IAAI,KAAK,CAAC,SAAS,KAAK,cAAc,EAAE,CAAC;gBACvC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0CAA0C,IAAI,CAAC,IAAI,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBACxF,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACtD,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAE/E,+EAA+E;gBAC/E,IAAI,KAAK,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;oBAC3B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;oBACjC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC;oBAC/D,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;oBAC7B,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;oBACrF,MAAA,IAAI,CAAC,oBAAoB,0CAAE,oBAAoB,CAC7C,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAC/C,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CACjE,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,IAAI,KAAK,CAAC,SAAS,KAAK,gBAAgB,EAAE,CAAC;gBAChD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,IAAI,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBACpF,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAChD,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBAC7E,MAAA,IAAI,CAAC,oBAAoB,0CAAE,oBAAoB,CAC7C,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAC/C,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,KAAK,CAAC,CAC1C,CAAC;gBACF,yDAAyD;gBACzD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;iBAAM,IAAI,KAAK,CAAC,SAAS,KAAK,gBAAgB,EAAE,CAAC;gBAChD,yDAAyD;gBACzD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4CAA4C,IAAI,CAAC,IAAI,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC1F,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC,KAAK,CAAC;gBACxC,kGAAkG;gBAClG,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;oBACjE,MAAM,IAAI,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;oBAC9C,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;oBACxF,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF;AA5VD,sCA4VC"}

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "displayName": "Homebridge Smartthings oAuth Plugin",
   "name": "homebridge-smartthings-oauth",
-  "version": "1.0.66-beta.6",
+  "version": "1.0.66",
   "description": "Connects SmartThings devices to Homebridge.  Automatically discovers devices.",
   "license": "Apache-2.0",
   "repository": {