homebridge-sonos-scenes 0.1.6 → 0.1.8

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="docs/assets/homebridge-sonos-scenes-icon-512x512.png" alt="homebridge-sonos-scenes icon" width="164">
+  <img src="docs/assets/icon-512.png" alt="homebridge-sonos-scenes icon" width="164">
 </p>
 
 <h1 align="center">homebridge-sonos-scenes</h1>
@@ -8,6 +8,9 @@
 
 `homebridge-sonos-scenes` is a Homebridge plugin scaffold for Sonos workflow scenes.
 
+> [!IMPORTANT]
+> This project is in an active early-testing phase. The local-first scene workflow is usable and published to npm, but cloud-backed Sonos playback is still planned work and some edge cases are still being hardened. If you try the plugin, please share bugs, UI feedback, and Sonos compatibility notes in [GitHub Issues](https://github.com/applemanj/homebridge-sonos-scenes/issues). Real-world feedback is especially helpful right now.
+
 The goal is not general Sonos control. The goal is a clean way to trigger multi-step Sonos workflows from Apple Home, such as:
 
 - grouping rooms around a coordinator,

package/homebridge-ui/public/index.html

@@ -307,12 +307,22 @@
     display: block;
   }
 
+  .scene-member-pill.selected {
+    border-color: rgba(10, 132, 255, 0.34);
+    background: rgba(10, 132, 255, 0.07);
+    box-shadow: inset 0 0 0 1px rgba(10, 132, 255, 0.08);
+  }
+
   .scene-member-row {
     display: flex;
     align-items: flex-start;
     gap: 0.65rem;
   }
 
+  .scene-member-toggle {
+    cursor: pointer;
+  }
+
   .scene-member-pill .form-check-input {
     margin-top: 0.2rem;
     flex: 0 0 auto;
@@ -336,6 +346,52 @@
     line-height: 1.35;
   }
 
+  .scene-member-volume {
+    display: grid;
+    gap: 0.35rem;
+    margin-top: 0.65rem;
+    padding-top: 0.65rem;
+    border-top: 1px solid rgba(22, 32, 51, 0.08);
+  }
+
+  .scene-member-volume-label {
+    color: #556579;
+    font-size: 0.78rem;
+    font-weight: 600;
+    line-height: 1.3;
+  }
+
+  .scene-member-volume-input {
+    max-width: 132px;
+  }
+
+  .scene-member-flags {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.35rem;
+    margin-top: 0.2rem;
+  }
+
+  .scene-member-flag {
+    display: inline-flex;
+    align-items: center;
+    padding: 0.15rem 0.45rem;
+    border-radius: 999px;
+    font-size: 0.72rem;
+    font-weight: 600;
+    line-height: 1.2;
+  }
+
+  .scene-member-flag.source {
+    background: rgba(10, 132, 255, 0.12);
+    color: #0a84ff;
+  }
+
+  .scene-member-flag.primary {
+    background: rgba(168, 85, 247, 0.16);
+    color: #7c3aed;
+  }
+
   .scene-log {
     max-height: 280px;
     overflow: auto;
@@ -602,7 +658,7 @@
             <input class="form-control" id="scene-name" type="text">
           </div>
           <input id="scene-id" type="hidden">
-          <div class="col-md-6">
+          <div class="col-12">
             <label class="form-label" for="household-select">
               <span class="scene-label-row">
                 <span>Household</span>
@@ -614,25 +670,13 @@
             </label>
             <select class="form-select" id="household-select"></select>
           </div>
-          <div class="col-md-6">
-            <label class="form-label" for="coordinator-select">
-              <span class="scene-label-row">
-                <span>Coordinator Room</span>
-                <span class="scene-info-tag" tabindex="0" role="button" aria-label="Explain Coordinator Room">
-                  ?
-                  <span class="scene-tooltip">The main room that anchors the group and receives the source change first. Choose the room that should lead the scene.</span>
-                </span>
-              </span>
-            </label>
-            <select class="form-select" id="coordinator-select"></select>
-          </div>
           <div class="col-12">
             <label class="form-label">
               <span class="scene-label-row">
-                <span>Group Members</span>
+                <span>Scene Rooms</span>
                 <span class="scene-info-tag" tabindex="0" role="button" aria-label="Explain Group Members">
                   ?
-                  <span class="scene-tooltip">Additional rooms to join the coordinator when the scene runs. Leave all unchecked for a single-room scene.</span>
+                  <span class="scene-tooltip">Pick the rooms that should be part of this scene. For line-in and TV scenes, the source room is included automatically. One selected room becomes the internal lead room behind the scenes.</span>
                 </span>
               </span>
             </label>
@@ -644,7 +688,7 @@
                 <span>Source Kind</span>
                 <span class="scene-info-tag" tabindex="0" role="button" aria-label="Explain Source Kind">
                   ?
-                  <span class="scene-tooltip">The type of thing this scene should load. The list changes based on what the coordinator room supports, such as favorites, line-in, or TV.</span>
+                  <span class="scene-tooltip">The type of thing this scene should load. The list is based on what is available in this household, such as favorites, line-in, or TV.</span>
                 </span>
               </span>
             </label>
@@ -665,10 +709,10 @@
           <div class="col-md-3">
             <label class="form-label" for="coordinator-volume">
               <span class="scene-label-row">
-                <span>Coordinator Volume</span>
+                <span>Lead Room Volume</span>
                 <span class="scene-info-tag" tabindex="0" role="button" aria-label="Explain Coordinator Volume">
                   ?
-                  <span class="scene-tooltip">Optional starting volume for the coordinator room. Leave this blank to keep whatever volume the room already has.</span>
+                  <span class="scene-tooltip">Optional starting volume for the scene's lead room. Leave this blank to keep whatever volume that room already has.</span>
                 </span>
               </span>
             </label>
@@ -737,18 +781,6 @@
               <option value="ungroup">Ungroup</option>
             </select>
           </div>
-          <div class="col-12">
-            <label class="form-label">
-              <span class="scene-label-row">
-                <span>Per-room Volumes</span>
-                <span class="scene-info-tag" tabindex="0" role="button" aria-label="Explain Per-room Volumes">
-                  ?
-                  <span class="scene-tooltip">Optional volume overrides for specific member rooms. Leave a room blank here to keep its current volume or let the group volume behavior apply.</span>
-                </span>
-              </span>
-            </label>
-            <div id="volume-list" class="scene-member-grid"></div>
-          </div>
         </div>
       </div>
     </section>
@@ -794,7 +826,6 @@
       sceneName: document.getElementById("scene-name"),
       sceneId: document.getElementById("scene-id"),
       householdSelect: document.getElementById("household-select"),
-      coordinatorSelect: document.getElementById("coordinator-select"),
       memberList: document.getElementById("member-list"),
       sourceKind: document.getElementById("source-kind"),
       sourceTarget: document.getElementById("source-target"),
@@ -804,7 +835,6 @@
       retryDelayMs: document.getElementById("retry-delay-ms"),
       autoResetMs: document.getElementById("auto-reset-ms"),
       offBehavior: document.getElementById("off-behavior"),
-      volumeList: document.getElementById("volume-list"),
       validationOutput: document.getElementById("validation-output"),
       logOutput: document.getElementById("log-output"),
       discoverySummary: document.getElementById("discovery-summary"),
@@ -942,22 +972,52 @@
       return (household?.favorites || []).filter((favorite) => favorite.playable !== false);
     }
 
+    function getSelectedSceneRoomIdsFromDraft() {
+      const selected = Array.from(new Set([state.draft.coordinatorPlayerId, ...(state.draft.memberPlayerIds || [])].filter(Boolean)));
+      const source = state.draft.source;
+      if ((source?.kind === "line_in" || source?.kind === "tv") && source.deviceId) {
+        if (!selected.includes(source.deviceId)) {
+          selected.unshift(source.deviceId);
+        }
+      }
+      return selected;
+    }
+
+    function resolveCoordinatorPlayerId(selectedRoomIds, source) {
+      const uniqueRooms = Array.from(new Set((selectedRoomIds || []).filter(Boolean)));
+
+      if ((source?.kind === "line_in" || source?.kind === "tv") && source.deviceId) {
+        return source.deviceId;
+      }
+
+      if (state.draft?.coordinatorPlayerId && uniqueRooms.includes(state.draft.coordinatorPlayerId)) {
+        return state.draft.coordinatorPlayerId;
+      }
+
+      return uniqueRooms[0] || "";
+    }
+
     function serializeDraft() {
       serializeCloudConfig();
       const draft = clone(state.draft);
       draft.name = elements.sceneName.value.trim() || "New Scene";
       draft.householdId = elements.householdSelect.value;
-      draft.coordinatorPlayerId = elements.coordinatorSelect.value;
-      draft.memberPlayerIds = Array.from(elements.memberList.querySelectorAll("input[type='checkbox']:checked")).map((checkbox) => checkbox.value);
       draft.source = buildSourcePayload();
+      const selectedRoomIds = Array.from(elements.memberList.querySelectorAll("input[type='checkbox']:checked")).map((checkbox) => checkbox.value);
+      draft.coordinatorPlayerId = resolveCoordinatorPlayerId(selectedRoomIds, draft.source);
+      if ((draft.source?.kind === "line_in" || draft.source?.kind === "tv") && draft.source.deviceId && !selectedRoomIds.includes(draft.source.deviceId)) {
+        selectedRoomIds.unshift(draft.source.deviceId);
+      }
+      draft.memberPlayerIds = selectedRoomIds.filter((playerId) => playerId !== draft.coordinatorPlayerId);
       draft.coordinatorVolume = elements.coordinatorVolume.value === "" ? undefined : Number(elements.coordinatorVolume.value);
       draft.settleMs = Number(elements.settleMs.value || 0);
       draft.retryCount = Number(elements.retryCount.value || 0);
       draft.retryDelayMs = Number(elements.retryDelayMs.value || 0);
       draft.autoResetMs = Number(elements.autoResetMs.value || 0);
       draft.offBehavior = { kind: elements.offBehavior.value };
-      draft.playerVolumes = Array.from(elements.volumeList.querySelectorAll("input[data-player-id]"))
+      draft.playerVolumes = Array.from(elements.memberList.querySelectorAll("input[data-player-id]"))
         .filter((input) => input.value !== "")
+        .filter((input) => selectedRoomIds.includes(input.dataset.playerId) && input.dataset.playerId !== draft.coordinatorPlayerId)
         .map((input) => ({
           playerId: input.dataset.playerId,
           volume: Number(input.value),
@@ -1111,46 +1171,64 @@
         .join("");
     }
 
-    function renderCoordinatorOptions() {
-      const household = getActiveHousehold();
-      const players = household?.players || [];
-      const currentCoordinator = players.some((player) => player.id === state.draft.coordinatorPlayerId)
-        ? state.draft.coordinatorPlayerId
-        : players[0]?.id || "";
-      state.draft.coordinatorPlayerId = currentCoordinator;
-      elements.coordinatorSelect.innerHTML = players
-        .map((player) => `<option value="${player.id}" ${player.id === currentCoordinator ? "selected" : ""}>${player.name}</option>`)
-        .join("");
-    }
-
     function renderMemberOptions() {
       const household = getActiveHousehold();
-      const coordinatorId = state.draft.coordinatorPlayerId;
-      const selected = new Set(state.draft.memberPlayerIds.filter((playerId) => playerId !== coordinatorId));
-      const players = (household?.players || []).filter((player) => player.id !== coordinatorId);
+      const selectedRoomIds = getSelectedSceneRoomIdsFromDraft();
+      const selected = new Set(selectedRoomIds);
+      const coordinatorId = resolveCoordinatorPlayerId(selectedRoomIds, state.draft.source);
+      state.draft.coordinatorPlayerId = coordinatorId;
+      state.draft.memberPlayerIds = selectedRoomIds.filter((playerId) => playerId !== coordinatorId);
+      const values = new Map((state.draft.playerVolumes || []).map((entry) => [entry.playerId, entry.volume]));
+      const forcedSourceId = (state.draft.source?.kind === "line_in" || state.draft.source?.kind === "tv")
+        ? state.draft.source.deviceId
+        : "";
+      const players = household?.players || [];
       elements.memberList.innerHTML = players.length === 0
-        ? `<div class="scene-help">No additional players are available for grouping.</div>`
+        ? `<div class="scene-help">No rooms are available in this household.</div>`
         : players
             .map(
-              (player) => `
-                <label class="scene-member-pill">
-                  <span class="scene-member-row">
-                    <input class="form-check-input" type="checkbox" value="${player.id}" ${selected.has(player.id) ? "checked" : ""}>
+              (player) => {
+                const isForcedSource = forcedSourceId === player.id;
+                const isSelected = isForcedSource || selected.has(player.id);
+                const flags = [
+                  isForcedSource ? `<span class="scene-member-flag source">Source Room</span>` : "",
+                  isSelected && coordinatorId === player.id ? `<span class="scene-member-flag primary">Lead Room</span>` : "",
+                ].filter(Boolean).join("");
+                return `
+                <div class="scene-member-pill ${isSelected ? "selected" : ""}">
+                  <label class="scene-member-row scene-member-toggle">
+                    <input class="form-check-input" data-member-checkbox type="checkbox" value="${player.id}" ${isSelected ? "checked" : ""} ${isForcedSource ? "disabled" : ""}>
                     <span class="scene-member-copy">
                       <span class="scene-member-title">${player.name}</span>
                       <span class="scene-member-meta">${player.model || "Unknown model"} - ${((player.sourceOptions || []).join(", ") || "favorite").replaceAll("_", " ")}</span>
+                      ${flags ? `<span class="scene-member-flags">${flags}</span>` : ""}
                     </span>
-                  </span>
-                </label>
-              `,
+                  </label>
+                  ${isSelected && coordinatorId !== player.id ? `
+                    <div class="scene-member-volume">
+                      <label class="scene-member-volume-label" for="member-volume-${player.id}">Volume Override</label>
+                      <input
+                        class="form-control form-control-sm scene-member-volume-input"
+                        id="member-volume-${player.id}"
+                        data-player-id="${player.id}"
+                        type="number"
+                        min="0"
+                        max="100"
+                        placeholder="Keep current"
+                        value="${values.get(player.id) ?? ""}">
+                    </div>
+                  ` : ""}
+                </div>
+              `;
+              },
             )
             .join("");
     }
 
     function renderSourceControls() {
       const household = getActiveHousehold();
-      const coordinator = household?.players.find((player) => player.id === state.draft.coordinatorPlayerId);
-      const supportedKinds = ["favorite", ...new Set((coordinator?.sourceOptions || []).filter((kind) => kind !== "favorite"))];
+      const players = household?.players || [];
+      const supportedKinds = ["favorite", ...new Set(players.flatMap((player) => player.sourceOptions || []).filter((kind) => kind !== "favorite"))];
       const sourceKind = supportedKinds.includes(state.draft.source?.kind) ? state.draft.source.kind : supportedKinds[0] || "favorite";
       state.draft.source = state.draft.source || { kind: sourceKind, favoriteId: "" };
       state.draft.source.kind = sourceKind;
@@ -1201,22 +1279,6 @@
         .join("");
     }
 
-    function renderVolumeControls() {
-      const household = getActiveHousehold();
-      const selectedMembers = state.draft.memberPlayerIds || [];
-      const values = new Map((state.draft.playerVolumes || []).map((entry) => [entry.playerId, entry.volume]));
-      elements.volumeList.innerHTML = selectedMembers.length === 0
-        ? `<div class="scene-help">Select one or more member rooms to configure per-room volume overrides.</div>`
-        : selectedMembers
-            .map((playerId) => `
-              <label class="scene-member-pill">
-                <span class="scene-member-title d-block mb-1">${getPlayerName(playerId)}</span>
-                <input class="form-control" data-player-id="${playerId}" type="number" min="0" max="100" value="${values.get(playerId) ?? ""}">
-              </label>
-            `)
-            .join("");
-    }
-
     function renderValidation() {
       if (!state.validation && !state.lastRun) {
         elements.validationOutput.innerHTML = `<div class="scene-help">Validation messages and test results will appear here.</div>`;
@@ -1333,16 +1395,14 @@
       elements.sceneName.value = state.draft.name || "";
       elements.sceneId.value = state.draft.id || "";
       renderHouseholdOptions();
-      renderCoordinatorOptions();
-      renderMemberOptions();
       renderSourceControls();
+      renderMemberOptions();
       elements.coordinatorVolume.value = state.draft.coordinatorVolume === "" ? "" : state.draft.coordinatorVolume ?? "";
       elements.settleMs.value = state.draft.settleMs ?? 750;
       elements.retryCount.value = state.draft.retryCount ?? 3;
       elements.retryDelayMs.value = state.draft.retryDelayMs ?? 750;
       elements.autoResetMs.value = state.draft.autoResetMs ?? 1000;
       elements.offBehavior.value = state.draft.offBehavior?.kind || "none";
-      renderVolumeControls();
     }
 
     function render() {
@@ -1510,6 +1570,23 @@
         });
       });
 
+      elements.memberList.addEventListener("change", (event) => {
+        const target = event.target;
+        if (!(target instanceof HTMLInputElement)) {
+          return;
+        }
+
+        if (target.matches("input[data-member-checkbox]")) {
+          serializeDraft();
+          renderMemberOptions();
+          return;
+        }
+
+        if (target.matches("input[data-player-id]")) {
+          serializeDraft();
+        }
+      });
+
       elements.householdSelect.addEventListener("change", () => {
         serializeDraft();
         state.draft.coordinatorPlayerId = "";
@@ -1518,12 +1595,6 @@
         render();
       });
 
-      elements.coordinatorSelect.addEventListener("change", () => {
-        serializeDraft();
-        state.draft.memberPlayerIds = state.draft.memberPlayerIds.filter((playerId) => playerId !== state.draft.coordinatorPlayerId);
-        render();
-      });
-
       elements.sourceKind.addEventListener("change", () => {
         serializeDraft();
         state.draft.source = elements.sourceKind.value === "favorite"
@@ -1532,6 +1603,11 @@
         render();
       });
 
+      elements.sourceTarget.addEventListener("change", () => {
+        serializeDraft();
+        render();
+      });
+
       homebridge.addEventListener("scene-test-result", (event) => {
         state.lastRun = event.data;
         render();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-sonos-scenes",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Homebridge plugin for Sonos workflow scenes and orchestration.",
   "author": "applemanj",
   "homepage": "https://github.com/applemanj/homebridge-sonos-scenes#readme",