@mdjhnson/homebridge-yoto 0.1.4 → 0.1.6

package/README.md

@@ -2,7 +2,7 @@
 
 <img src="https://github.com/homebridge/branding/raw/latest/logos/homebridge-wordmark-logo-vertical.png" width="150">
 
-<img src="https://raw.githubusercontent.com/mdjhnson/homebridge-yoto/master/logo.png" width="150">
+<img src="https://raw.githubusercontent.com/mdjhnson/homebridge-yoto/master/homebridge-ui/public/logo.png" width="100">
 
 </p>
 
@@ -21,7 +21,7 @@
 
 </span>
 
-Homebridge plugin that exposes Yoto players to HomeKit: playback and volume, card and shortcut buttons, battery, temperature, nightlights, and more. Updates arrive in real time over MQTT, with HTTP polling as a fallback.
+Homebridge plugin that exposes Yoto players to HomeKit: playback and volume, card and shortcut buttons, a TV-style remote with your card library as inputs, a sleep timer slider, battery, temperature, nightlights, and more. Updates arrive in real time over MQTT, with HTTP polling as a fallback.
 
 This is a maintained fork of [bcomnes/homebridge-yoto](https://github.com/bcomnes/homebridge-yoto).
 
@@ -44,7 +44,7 @@ Requires Node.js 22, 24 or 26 and Homebridge 1.8+ or 2.x.
 
 Using your own Yoto developer app? Make it a **Public Client**, add `http://127.0.0.1:8787/callback` as an allowed callback URL, enable the `family:devices:*`, `family:library:view`, `user:content:view` and `offline_access` scopes, and enter its client ID in the **Advanced Settings** panel on the sign-in screen before signing in. (That panel is only shown while you're signed out, and is separate from the **Advanced** section of the plugin settings.)
 
-The plugin asks for access to view, configure and control your players, plus read-only access to your card library (used to name shortcut switches). If you signed in with an older version, sign in again so the new permissions apply.
+The plugin asks for access to view, configure and control your players, plus read-only access to your card library (used to name shortcut switches and to list your cards as TV inputs). If you signed in with an older version, sign in again so the new permissions apply.
 
 The plugin refreshes its tokens on its own. If the login ever expires or is revoked, the Homebridge log will say so. Sign in again from the plugin settings.
 
@@ -54,7 +54,8 @@ Most options live under **Accessory Services** in the plugin settings. The setti
 
 **Playback**
 - **Playback Controls**: Adds a play/pause switch and a volume dimmer to each player's bridged accessory. This is the simplest option and needs no extra pairing.
-- **TV Playback Accessory**: Publishes a separate TV-style accessory. You control it with the iOS remote (play/pause, volume buttons), and its inputs play your card controls and shortcuts.
+- **TV Playback Accessory**: Publishes a separate TV-style accessory. You control it with the iOS remote (play/pause, volume buttons), and its inputs play your library cards, card controls and shortcuts.
+  - **TV Inputs for Library Cards** (on by default, shown once the TV accessory is on): lists every card in your Yoto library, including Make Your Own cards, as an input. Turn it off to list only card controls and shortcuts.
 
 The TV accessory, and the legacy Smart Speaker below, are external accessories. External accessories must be added by hand in the Home app (**Add Accessory → More options**) using the setup code in the Homebridge log. Each one listens on its own port (logged as `... is running on port N`), so open those ports if Homebridge runs behind a firewall, or set a fixed port range under Homebridge **Settings → Network**.
 
@@ -68,6 +69,7 @@ The TV accessory, and the legacy Smart Speaker below, are external accessories.
 
 **Service toggles**
 - **Battery**, **Temperature Sensor** (v3), **Nightlight** (v3), **Card Slot**, **Day Mode**, **Sleep Timer**, **Bluetooth**, **Volume Limits**.
+  - **Sleep Timer Minutes per 1%** (shown once Sleep Timer is on): how many minutes each 1% on the sleep timer slider stands for. Defaults to 1, so the slider goes up to 100 minutes; 2 allows up to 200 minutes. Accepts 0.5 to 10.
 
 **Advanced** (collapsed section at the bottom of the plugin settings)
 - **HTTP Poll Interval**: How often to poll the Yoto API as a fallback to MQTT. Defaults to 60 seconds; the minimum is 10 seconds.
@@ -84,7 +86,9 @@ The TV accessory, and the legacy Smart Speaker below, are external accessories.
 
 **TV Playback (external)**
 - Active is on while the player is playing. Turning it off pauses.
-- Inputs: **Now Playing**, then one per card control and one per shortcut. Choosing an input plays its card.
+- Inputs: **Now Playing**, then your card controls, shortcuts and library cards (including Make Your Own cards), listed alphabetically. Choosing an input plays its card.
+- HomeKit allows about 90 inputs. Card controls and shortcuts always get one; library cards fill the rest in alphabetical order, and the log says how many were left out. Turn off **TV Inputs for Library Cards** to list only card controls and shortcuts.
+- New library cards appear within about six hours, or after restarting Homebridge.
 - Remote: Play/Pause and Select toggle playback. Volume buttons step the volume.
 
 **Card Controls and Shortcuts**
@@ -102,13 +106,19 @@ The TV accessory, and the legacy Smart Speaker below, are external accessories.
 **Other controls**
 - **Card Slot**: Contact sensor for card insertion.
 - **Day Mode**: Contact sensor. Contact Not Detected means day mode.
-- **Sleep Timer**: Switch that turns the sleep timer on or off.
+- **Sleep Timer**: Lightbulb whose brightness is the time left on the sleep timer.
+  - Each 1% is one minute by default, so 45% is a 45-minute timer. Change **Sleep Timer Minutes per 1%** for longer timers.
+  - Turning it on without picking a time reuses the last time you set (30 minutes at first, and again after Homebridge restarts). Turning it off cancels the timer.
+  - It counts down while the timer runs and follows timers started in the Yoto app.
+  - Because it's a light, a "turn off all the lights" scene or Siri request also cancels the timer.
 - **Bluetooth**: Switch that toggles Bluetooth.
 - **Day/Night Max Volume**: Lightbulbs whose brightness sets the max volume limits.
 
 ## Notes
 
 - **Switching from `homebridge-yoto`:** uninstall the original plugin first. Both register the `Yoto` platform and would conflict. Your existing `Yoto` config block keeps working, but bridged accessories are re-created, so you'll need to re-add them to rooms and automations.
+- **Upgrading to the sleep timer slider:** the old on/off Sleep Timer switch is replaced by the slider, so add the slider back to any scenes or automations that used the switch.
+- **Upgrading to library TV inputs:** existing TV inputs get new identifiers once, so scenes that choose a TV input need that input picked again. After that, identifiers stay the same when cards are added or removed.
 - **Removed external accessories:** if you turn off the Smart Speaker or TV accessory, or a player leaves your account, remove the old accessory from the Home app by hand. Homebridge can't unpublish external accessories.
 - **Yoto unreachable at startup:** if the network or Yoto's API is down when Homebridge starts, the plugin keeps retrying, waiting longer each time (up to 10 minutes between tries). You don't need to restart Homebridge. If Yoto rejects the saved login, the log asks you to sign in again instead of retrying.
 

package/config.schema.json

@@ -8,11 +8,16 @@
   "schema": {
     "type": "object",
     "properties": {
+      "name": {
+        "title": "Name",
+        "type": "string",
+        "default": "Yoto",
+        "description": "Name used for this plugin in the Homebridge log."
+      },
       "clientId": {
         "title": "OAuth Client ID",
         "type": "string",
         "default": "tpc_ot5BY24FLyZoCX9MnykipB",
-        "required": false,
         "description": "OAuth client ID for Yoto API authentication. The default works for most users. Only change if you've created your own OAuth app at yoto.dev.",
         "x-schema-form": {
           "hidden": false
@@ -21,7 +26,6 @@
       "accessToken": {
         "title": "Access Token",
         "type": "string",
-        "required": false,
         "description": "Automatically managed by the authentication flow. Do not edit manually.",
         "x-schema-form": {
           "type": "password"
@@ -30,7 +34,6 @@
       "refreshToken": {
         "title": "Refresh Token",
         "type": "string",
-        "required": false,
         "description": "Automatically managed by the authentication flow. Do not edit manually.",
         "x-schema-form": {
           "type": "password"
@@ -39,7 +42,6 @@
       "tokenExpiresAt": {
         "title": "Token Expiration",
         "type": "number",
-        "required": false,
         "description": "Automatically managed by the authentication flow. Do not edit manually.",
         "x-schema-form": {
           "hidden": true
@@ -50,7 +52,6 @@
         "type": "integer",
         "default": 60000,
         "minimum": 10000,
-        "required": false,
         "description": "How often to poll the Yoto API for device status and config as a fallback to MQTT updates. Defaults to 60000 (1 minute)."
       },
       "services": {
@@ -73,7 +74,13 @@
             "title": "TV Playback Accessory",
             "type": "boolean",
             "default": false,
-            "description": "Publish an external TV-style accessory: play/pause and volume from the iPhone remote, and inputs that play your card controls and shortcuts. Requires pairing and its own network port."
+            "description": "Publish an external TV-style accessory: play/pause and volume from the iPhone remote, and inputs that play your cards, card controls and shortcuts. Requires pairing and its own network port."
+          },
+          "televisionLibrary": {
+            "title": "TV Inputs for Library Cards",
+            "type": "boolean",
+            "default": true,
+            "description": "Add every card in your Yoto library as a TV input, listed alphabetically. HomeKit allows about 90 inputs; if your library is bigger, cards past the limit are left out."
           },
           "battery": {
             "title": "Battery",
@@ -110,13 +117,11 @@
                 "label": {
                   "title": "Label",
                   "type": "string",
-                  "required": true,
                   "description": "Name shown in HomeKit for this card control."
                 },
                 "cardId": {
                   "title": "Card ID",
                   "type": "string",
-                  "required": true,
                   "description": "The Yoto card ID to play."
                 },
                 "playOnAll": {
@@ -125,7 +130,11 @@
                   "default": false,
                   "description": "Create a separate accessory that plays this card on every Yoto."
                 }
-              }
+              },
+              "required": [
+                "label",
+                "cardId"
+              ]
             }
           },
           "shortcuts": {
@@ -144,7 +153,15 @@
             "title": "Sleep Timer",
             "type": "boolean",
             "default": false,
-            "description": "Expose sleep timer switch."
+            "description": "Expose the sleep timer as a slider. Each 1% is one minute unless changed below; turning it on without a time uses 30 minutes."
+          },
+          "sleepTimerMinutesPerPercent": {
+            "title": "Sleep Timer Minutes per 1%",
+            "type": "number",
+            "default": 1,
+            "minimum": 0.5,
+            "maximum": 10,
+            "description": "How many minutes each 1% on the sleep timer slider adds. 1 gives up to 100 minutes; 2 gives up to 200 minutes."
           },
           "bluetooth": {
             "title": "Bluetooth",
@@ -192,6 +209,12 @@
         },
         "services.playbackControls",
         "services.television",
+        {
+          "key": "services.televisionLibrary",
+          "condition": {
+            "functionBody": "return model.services && model.services.television === true"
+          }
+        },
         "services.volumeLimits",
         "services.battery",
         "services.temperature",
@@ -200,6 +223,12 @@
         "services.nightlight",
         "services.bluetooth",
         "services.sleepTimer",
+        {
+          "key": "services.sleepTimerMinutesPerPercent",
+          "condition": {
+            "functionBody": "return model.services && model.services.sleepTimer === true"
+          }
+        },
         "services.shortcuts",
         {
           "type": "help",
@@ -224,6 +253,7 @@
       "expandable": true,
       "expanded": false,
       "items": [
+        "name",
         "httpPollIntervalMs",
         {
           "type": "help",

package/homebridge-ui/public/client.js

@@ -16,6 +16,7 @@ const homebridge = window.homebridge
 /**
  * @typedef {Object} YotoConfig
  * @property {string} [platform] - Platform alias (always "Yoto")
+ * @property {string} [name] - Name used in the Homebridge log
  * @property {string} [clientId] - OAuth client ID (only stored when not the default)
  * @property {string} [refreshToken] - Stored refresh token
  * @property {string} [accessToken] - Stored access token
@@ -31,6 +32,8 @@ let authorizeUrl = null
 let pluginConfig = []
 /** @type {string | null} */
 let defaultClientId = null
+/** @type {string | null} */
+let defaultName = null
 /** @type {string[]} */
 let legacyClientIds = []
 
@@ -153,14 +156,13 @@ function getErrorMessage (error, fallback) {
 async function loadAuthConfig () {
   try {
     pluginConfig = await homebridge.getPluginConfig()
-    if (!pluginConfig.length) {
-      pluginConfig.push({ platform: 'Yoto' })
-    }
 
     /** @type {AuthConfigResponse} */
     const config = await homebridge.request('/auth/config')
     defaultClientId = config.defaultClientId
+    defaultName = config.defaultName
     legacyClientIds = config.legacyClientIds
+    getPlatformBlock()
 
     const redirectUriDisplay = document.getElementById('redirectUriDisplay')
     if (redirectUriDisplay) redirectUriDisplay.textContent = config.redirectUri
@@ -178,6 +180,18 @@ async function loadAuthConfig () {
   }
 }
 
+/**
+ * The plugin's config block, created if missing. Also fills in the name,
+ * which blocks saved by older versions don't have.
+ * @returns {YotoConfig}
+ */
+function getPlatformBlock () {
+  if (!pluginConfig[0]) pluginConfig[0] = { platform: 'Yoto' }
+  const config = pluginConfig[0]
+  if (!config.name && defaultName) config.name = defaultName
+  return config
+}
+
 /**
  * The client ID saved in config, ignoring retired ones
  * @returns {string | undefined}
@@ -265,8 +279,7 @@ async function finishAuthorization () {
       response: pasted,
     })
 
-    if (!pluginConfig[0]) pluginConfig[0] = { platform: 'Yoto' }
-    const config = pluginConfig[0]
+    const config = getPlatformBlock()
     config.refreshToken = result.refreshToken
     config.accessToken = result.accessToken
     config.tokenExpiresAt = result.tokenExpiresAt
@@ -306,11 +319,10 @@ async function logout () {
   try {
     homebridge.showSpinner()
 
-    if (pluginConfig[0]) {
-      delete pluginConfig[0].refreshToken
-      delete pluginConfig[0].accessToken
-      delete pluginConfig[0].tokenExpiresAt
-    }
+    const config = getPlatformBlock()
+    delete config.refreshToken
+    delete config.accessToken
+    delete config.tokenExpiresAt
 
     await homebridge.updatePluginConfig(pluginConfig)
     await homebridge.savePluginConfig()

package/homebridge-ui/public/index.html

@@ -2,6 +2,8 @@
 <script type="module" src="client.js"></script>
 
 <div class="card card-body">
+  <img src="logo.png" alt="Homebridge Yoto" width="80" height="80" class="d-block mx-auto mb-3" />
+
   <!-- Authentication Status -->
   <div id="authStatus">
     <h4>Authentication Status</h4>

package/homebridge-ui/server.js

@@ -11,6 +11,7 @@ import { HomebridgePluginUiServer, RequestError } from '@homebridge/plugin-ui-ut
 import { YotoClient } from 'yoto-nodejs-client'
 import {
   DEFAULT_CLIENT_ID,
+  DEFAULT_NAME,
   LEGACY_CLIENT_IDS,
   OAUTH_REDIRECT_URI,
   OAUTH_SCOPES,
@@ -59,6 +60,7 @@ class YotoUiServer extends HomebridgePluginUiServer {
  * Response from /auth/config endpoint
  * @typedef {Object} AuthConfigResponse
  * @property {string} defaultClientId - The default OAuth client ID
+ * @property {string} defaultName - The default plugin name, filled into config blocks that have none
  * @property {string[]} legacyClientIds - Client IDs that no longer support sign-in
  * @property {string} redirectUri - Redirect URI to register on a custom Yoto app
  */
@@ -70,6 +72,7 @@ class YotoUiServer extends HomebridgePluginUiServer {
 async function getAuthConfig () {
   return {
     defaultClientId: DEFAULT_CLIENT_ID,
+    defaultName: DEFAULT_NAME,
     legacyClientIds: LEGACY_CLIENT_IDS,
     redirectUri: OAUTH_REDIRECT_URI,
   }

package/lib/accessory.js

@@ -36,6 +36,7 @@
  * @property {boolean} shortcuts
  */
 
+import { setTimeout as delay } from 'node:timers/promises'
 import convert from 'color-convert'
 import {
   DEFAULT_MANUFACTURER,
@@ -46,7 +47,7 @@ import {
 import { sanitizeName } from './utils/sanitize-name.js'
 import { syncServiceNames } from './sync-service-names.js'
 import { serviceSchema } from '../config.schema.cjs'
-import { getPlaybackAccessoryConfig } from './service-config.js'
+import { getPlaybackAccessoryConfig, getServiceConfig, getSleepTimerIncrement } from './service-config.js'
 import { getCardControlConfigs } from './card-controls.js'
 import { getCardStartOptions, getShortcutEntries, getShortcutsSignature, toPlayableCard } from './shortcuts.js'
 import { formatError } from './utils/error-format.js'
@@ -59,6 +60,27 @@ import {
   percentToSteps,
   stepsToPercent,
 } from './utils/volume.js'
+import {
+  DEFAULT_SLEEP_TIMER_MINUTES,
+  DEFAULT_SLEEP_TIMER_MINUTES_PER_PERCENT,
+  sleepPercentToSeconds,
+  sleepSecondsToPercent,
+} from './utils/sleep-timer.js'
+
+/**
+ * Dragging the slider on an off sleep timer makes Home send On=1 and then the
+ * brightness. Wait this long before starting the default timer so the
+ * brightness can set the time instead.
+ */
+const SLEEP_TIMER_ON_DELAY_MS = 250
+/** How often the sleep timer slider counts down between player reports */
+const SLEEP_TIMER_TICK_MS = 30 * 1000
+/**
+ * Players take a few seconds to apply a sleep timer command and keep sending
+ * the old state meanwhile. For this long after a command, ignore reports that
+ * don't match it.
+ */
+const SLEEP_TIMER_CONFIRM_MS = 10 * 1000
 
 /**
  * @param {ServiceSchemaKey} key
@@ -107,6 +129,15 @@ export class YotoPlayerAccessory {
   /** @type {ListenerGroup<YotoDeviceModelEventMap>} */ #listeners
   /** @type {Map<string, Service>} */ #shortcutServices = new Map()
   /** @type {string} */ #shortcutsSignature = ''
+  // Sleep timer: the player reports seconds left only now and then, so count
+  // down locally from the last report
+  /** @type {number} */ #sleepTimerIncrement = DEFAULT_SLEEP_TIMER_MINUTES_PER_PERCENT
+  /** @type {number | null} */ #sleepTimerEndsAt = null
+  /** @type {ReturnType<typeof setInterval> | null} */ #sleepTimerTick = null
+  /** @type {number} */ #lastSleepTimerPercent = DEFAULT_SLEEP_TIMER_MINUTES
+  /** @type {number} */ #sleepTimerRequest = 0
+  /** @type {{ seconds: number, sentAt: number } | null} */ #sleepTimerPending = null
+  /** @type {boolean} */ #stopped = false
 
   /**
    * @param {Object} params
@@ -135,11 +166,7 @@ export class YotoPlayerAccessory {
    * @returns {YotoServiceToggles}
    */
   getServiceToggles () {
-    const config = this.#platform.config
-    const services = config && typeof config === 'object' ? config['services'] : undefined
-    const serviceConfig = typeof services === 'object' && services !== null
-      ? /** @type {Record<string, unknown>} */ (services)
-      : {}
+    const serviceConfig = getServiceConfig(this.#platform.config)
     const playbackConfig = getPlaybackAccessoryConfig(this.#platform.config)
 
     return {
@@ -578,23 +605,32 @@ export class YotoPlayerAccessory {
   }
 
   /**
-   * Setup sleep timer Switch service
-   * Toggle sleep timer on/off
+   * Setup sleep timer Lightbulb service
+   * On/off starts or cancels the timer; brightness is the time left
+   * (each 1% is `sleepTimerMinutesPerPercent` minutes).
+   * Replaces the Switch used by earlier versions, which setup() removes as stale.
    */
   setupSleepTimerService () {
     const { Service, Characteristic } = this.#platform
     const serviceName = this.generateServiceName('Sleep Timer')
+    this.#sleepTimerIncrement = getSleepTimerIncrement(this.#platform.config)
+    this.#lastSleepTimerPercent = sleepSecondsToPercent(DEFAULT_SLEEP_TIMER_MINUTES * 60, this.#sleepTimerIncrement)
 
-    const service = this.#accessory.getServiceById(Service.Switch, 'SleepTimer') ||
-      this.#accessory.addService(Service.Switch, serviceName, 'SleepTimer')
+    const service = this.#accessory.getServiceById(Service.Lightbulb, 'SleepTimer') ||
+      this.#accessory.addService(Service.Lightbulb, serviceName, 'SleepTimer')
     syncServiceNames({ Characteristic, service, name: serviceName })
 
     service.getCharacteristic(Characteristic.On)
       .onGet(this.getSleepTimerState.bind(this))
       .onSet(this.setSleepTimerState.bind(this))
 
+    service.getCharacteristic(Characteristic.Brightness)
+      .onGet(this.getSleepTimerPercent.bind(this))
+      .onSet(this.setSleepTimerPercent.bind(this))
+
     this.sleepTimerService = service
     this.#currentServices.add(service)
+    this.syncSleepTimerFromPlayback()
   }
 
   /**
@@ -1006,7 +1042,8 @@ export class YotoPlayerAccessory {
             break
 
           case 'sleepTimerActive':
-            this.updateSleepTimerCharacteristic()
+          case 'sleepTimerSeconds':
+            this.syncSleepTimerFromPlayback()
             break
 
           // Playback fields - informational only
@@ -1022,7 +1059,6 @@ export class YotoPlayerAccessory {
           case 'trackKey':
           case 'chapterTitle':
           case 'chapterKey':
-          case 'sleepTimerSeconds':
           case 'streaming':
           case 'updatedAt': {
             // Not exposed as characteristics
@@ -1784,44 +1820,163 @@ export class YotoPlayerAccessory {
       : Characteristic.ContactSensorState.CONTACT_DETECTED
   }
 
-  // ==================== Sleep Timer Switch Getter/Setter ====================
+  // ==================== Sleep Timer (Lightbulb) Getter/Setter ====================
+
+  /**
+   * Seconds left on the sleep timer, or null when the player hasn't said.
+   * @returns {number | null}
+   */
+  getSleepTimerRemainingSeconds () {
+    if (this.#sleepTimerEndsAt === null) return null
+    return Math.max(0, (this.#sleepTimerEndsAt - Date.now()) / 1000)
+  }
+
+  /**
+   * @returns {boolean}
+   */
+  isSleepTimerOn () {
+    const remaining = this.getSleepTimerRemainingSeconds()
+    if (remaining !== null) return remaining > 0
+    return this.#deviceModel.playback.sleepTimerActive === true
+  }
+
+  /**
+   * Slider position: the time left while running, otherwise the last time set.
+   * @returns {number}
+   */
+  getSleepTimerPercentValue () {
+    const remaining = this.getSleepTimerRemainingSeconds()
+    if (remaining !== null && remaining > 0) {
+      return sleepSecondsToPercent(remaining, this.#sleepTimerIncrement)
+    }
+    return this.#lastSleepTimerPercent
+  }
 
   /**
    * Get sleep timer state
    * @returns {Promise<CharacteristicValue>}
    */
   async getSleepTimerState () {
-    const playback = this.#deviceModel.playback
-    this.#log.debug(
-      LOG_PREFIX.ACCESSORY,
-      `[${this.#device.name}] Get sleep timer -> ${playback.sleepTimerActive ?? false}`
-    )
-    return playback.sleepTimerActive ?? false
+    const on = this.isSleepTimerOn()
+    this.#log.debug(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Get sleep timer -> ${on}`)
+    return on
   }
 
   /**
-   * Set sleep timer state
+   * Set sleep timer state. On starts the last time used (30 minutes at first).
    * @param {CharacteristicValue} value
    */
   async setSleepTimerState (value) {
-    const enabled = Boolean(value)
+    if (!value) {
+      this.#sleepTimerRequest++
+      await this.applySleepTimer(0)
+      return
+    }
+    if (this.isSleepTimerOn()) return
+
+    const request = ++this.#sleepTimerRequest
+    await delay(SLEEP_TIMER_ON_DELAY_MS)
+    // The slider was moved meanwhile; it sets the time itself
+    if (request !== this.#sleepTimerRequest) return
+    await this.applySleepTimer(this.#lastSleepTimerPercent)
+  }
+
+  /**
+   * Get sleep timer slider position
+   * @returns {Promise<CharacteristicValue>}
+   */
+  async getSleepTimerPercent () {
+    return this.getSleepTimerPercentValue()
+  }
+
+  /**
+   * Set sleep timer length from the slider
+   * @param {CharacteristicValue} value
+   */
+  async setSleepTimerPercent (value) {
+    this.#sleepTimerRequest++
+    const percent = clampPercent(Number(value))
+    if (percent > 0) this.#lastSleepTimerPercent = percent
+    await this.applySleepTimer(percent)
+  }
+
+  /**
+   * Send a sleep timer length to the player (0 cancels it).
+   * @param {number} percent
+   */
+  async applySleepTimer (percent) {
+    const seconds = sleepPercentToSeconds(percent, this.#sleepTimerIncrement)
+    this.#log.debug(
+      LOG_PREFIX.ACCESSORY,
+      `[${this.#device.name}] Set sleep timer: ${seconds > 0 ? `${Math.round(seconds / 60)} minutes` : 'off'}`
+    )
 
     try {
-      if (enabled) {
-        // Turn on sleep timer - default to 30 minutes
-        this.#log.debug(LOG_PREFIX.ACCESSORY, 'Activating sleep timer (30 minutes)')
-        await this.#deviceModel.setSleepTimer(30 * 60)
-      } else {
-        // Turn off sleep timer
-        this.#log.debug(LOG_PREFIX.ACCESSORY, 'Deactivating sleep timer')
-        await this.#deviceModel.setSleepTimer(0)
-      }
+      await this.#deviceModel.setSleepTimer(seconds)
     } catch (error) {
       this.#log.error(LOG_PREFIX.ACCESSORY, `[${this.#device.name}] Failed to set sleep timer:`, formatError(error))
       throw new this.#platform.api.hap.HapStatusError(
         this.#platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE
       )
     }
+
+    // Show the new time now rather than waiting for the player to report it.
+    // A cancel ends "now", so the tile doesn't flick back on while the player's
+    // last report still says the timer is running.
+    this.#sleepTimerPending = { seconds, sentAt: Date.now() }
+    this.setSleepTimerEnd(Date.now() + seconds * 1000)
+  }
+
+  /**
+   * Take the sleep timer state the player last reported.
+   */
+  syncSleepTimerFromPlayback () {
+    if (!this.sleepTimerService) return
+    const { sleepTimerActive, sleepTimerSeconds } = this.#deviceModel.playback
+
+    const pending = this.#sleepTimerPending
+    if (pending) {
+      const age = Date.now() - pending.sentAt
+      const expectedSeconds = pending.seconds - age / 1000
+      const confirmed = pending.seconds === 0
+        ? sleepTimerActive !== true
+        : sleepTimerActive === true && typeof sleepTimerSeconds === 'number' &&
+          Math.abs(sleepTimerSeconds - expectedSeconds) <= 5
+      // A report from before the player applied our command
+      if (!confirmed && age < SLEEP_TIMER_CONFIRM_MS) return
+      this.#sleepTimerPending = null
+    }
+
+    if (sleepTimerActive === true && typeof sleepTimerSeconds === 'number' && sleepTimerSeconds > 0) {
+      this.setSleepTimerEnd(Date.now() + sleepTimerSeconds * 1000)
+    } else if (sleepTimerActive !== true) {
+      this.setSleepTimerEnd(null)
+    } else {
+      // Running, but the player hasn't said how long is left. Drop an end time
+      // that has passed (e.g. from a cancel) so the tile follows the player.
+      if (this.getSleepTimerRemainingSeconds() === 0) this.#sleepTimerEndsAt = null
+      this.updateSleepTimerCharacteristic()
+    }
+  }
+
+  /**
+   * Record when the sleep timer ends and count the slider down until then.
+   * @param {number | null} endsAt - Epoch ms, or null when off
+   */
+  setSleepTimerEnd (endsAt) {
+    this.#sleepTimerEndsAt = endsAt
+    if (endsAt !== null && !this.#sleepTimerTick && !this.#stopped) {
+      this.#sleepTimerTick = setInterval(() => this.updateSleepTimerCharacteristic(), SLEEP_TIMER_TICK_MS)
+      this.#sleepTimerTick.unref?.()
+    }
+    this.updateSleepTimerCharacteristic()
+  }
+
+  stopSleepTimerTick () {
+    if (this.#sleepTimerTick) {
+      clearInterval(this.#sleepTimerTick)
+      this.#sleepTimerTick = null
+    }
   }
 
   // ==================== Bluetooth Switch Getter/Setter ====================
@@ -2248,19 +2403,18 @@ export class YotoPlayerAccessory {
   }
 
   /**
-   * Update sleep timer Switch characteristic
+   * Update sleep timer On and Brightness characteristics
    */
   updateSleepTimerCharacteristic () {
+    const on = this.isSleepTimerOn()
+    if (!on) this.stopSleepTimerTick()
     if (!this.sleepTimerService) {
       return
     }
 
     const { Characteristic } = this.#platform
-    const playback = this.#deviceModel.playback
-
-    this.sleepTimerService
-      .getCharacteristic(Characteristic.On)
-      .updateValue(playback.sleepTimerActive ?? false)
+    this.sleepTimerService.updateCharacteristic(Characteristic.On, on)
+    this.sleepTimerService.updateCharacteristic(Characteristic.Brightness, this.getSleepTimerPercentValue())
   }
 
   /**
@@ -2347,6 +2501,10 @@ export class YotoPlayerAccessory {
 
     // Only remove our own listeners; the device model is shared
     this.#listeners.removeAll()
+    // Drop a pending "On" so this handler doesn't start a timer after it's replaced
+    this.#sleepTimerRequest++
+    this.#stopped = true
+    this.stopSleepTimerTick()
 
     // Note: Don't call deviceModel.stop() here - that's handled by YotoAccount
   }