homebridge-bluos 1.1.4 → 1.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/README.md +1 -1
- package/homebridge-ui/public/index.html +34 -1
- package/homebridge-ui/public/index.js +32 -5
- package/homebridge-ui/server.js +8 -5
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [1.1.5](https://github.com/tbaur/homebridge-bluos/compare/v1.1.4...v1.1.5) (2026-08-31)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* keep discover progress in view and leave volume opt-in ([#33](https://github.com/tbaur/homebridge-bluos/issues/33)) ([1dec836](https://github.com/tbaur/homebridge-bluos/commit/1dec8361f2a82d2a1c355f74c4258078bcb945d2))
|
|
9
|
+
|
|
3
10
|
## [1.1.4](https://github.com/tbaur/homebridge-bluos/compare/v1.1.3...v1.1.4) (2026-08-31)
|
|
4
11
|
|
|
5
12
|
|
package/README.md
CHANGED
|
@@ -56,7 +56,7 @@ Nothing needs enabling on the player, because the BluOS LAN API is always on. A
|
|
|
56
56
|
|
|
57
57
|
### 3. Configure
|
|
58
58
|
|
|
59
|
-
**Homebridge UI** (recommended): open the plugin settings and press **Discover Players**. Every zone that answers is listed
|
|
59
|
+
**Homebridge UI** (recommended): open the plugin settings and press **Discover Players**. Every zone that answers is listed. Tick the players and accessories you want, then press the Homebridge Save button.
|
|
60
60
|
|
|
61
61
|
Or in `config.json`:
|
|
62
62
|
|
|
@@ -10,7 +10,39 @@
|
|
|
10
10
|
-->
|
|
11
11
|
<style>
|
|
12
12
|
.bluos-intro { margin-bottom: 1rem; }
|
|
13
|
-
.bluos-toolbar {
|
|
13
|
+
.bluos-toolbar {
|
|
14
|
+
display: flex;
|
|
15
|
+
gap: .5rem;
|
|
16
|
+
align-items: flex-end;
|
|
17
|
+
flex-wrap: wrap;
|
|
18
|
+
position: sticky;
|
|
19
|
+
top: 0;
|
|
20
|
+
z-index: 5;
|
|
21
|
+
margin: 0 0 1rem;
|
|
22
|
+
padding: .55rem 0;
|
|
23
|
+
/* Frosted so cards do not show through while this bar stays on screen. */
|
|
24
|
+
background: rgba(128, 128, 128, .12);
|
|
25
|
+
backdrop-filter: blur(10px);
|
|
26
|
+
}
|
|
27
|
+
.bluos-busy {
|
|
28
|
+
display: inline-flex;
|
|
29
|
+
align-items: center;
|
|
30
|
+
align-self: center;
|
|
31
|
+
gap: .4rem;
|
|
32
|
+
font-size: .85rem;
|
|
33
|
+
white-space: nowrap;
|
|
34
|
+
}
|
|
35
|
+
.bluos-busy[hidden] { display: none !important; }
|
|
36
|
+
.bluos-busy::before {
|
|
37
|
+
content: '';
|
|
38
|
+
width: .85rem;
|
|
39
|
+
height: .85rem;
|
|
40
|
+
border: 2px solid currentColor;
|
|
41
|
+
border-right-color: transparent;
|
|
42
|
+
border-radius: 50%;
|
|
43
|
+
animation: bluos-spin .7s linear infinite;
|
|
44
|
+
}
|
|
45
|
+
@keyframes bluos-spin { to { transform: rotate(360deg); } }
|
|
14
46
|
.bluos-toolbar .form-group { margin-bottom: 0; }
|
|
15
47
|
.bluos-card { border: 1px solid rgba(128, 128, 128, .3); border-radius: .5rem; padding: .85rem 1rem; margin-bottom: .75rem; }
|
|
16
48
|
.bluos-card.is-selected { border-color: #007bff; box-shadow: 0 0 0 1px rgba(0, 123, 255, .35); }
|
|
@@ -46,6 +78,7 @@
|
|
|
46
78
|
|
|
47
79
|
<div class="bluos-toolbar">
|
|
48
80
|
<button class="btn btn-primary" id="discover">Discover Players</button>
|
|
81
|
+
<span id="discover-status" class="bluos-busy text-muted" hidden></span>
|
|
49
82
|
<div class="form-group">
|
|
50
83
|
<label for="timeout" class="mb-0" style="font-size: .8rem;">Listen for</label>
|
|
51
84
|
<select class="form-control form-control-sm" id="timeout">
|
|
@@ -157,7 +157,10 @@
|
|
|
157
157
|
derivedIdentity: player.derivedIdentity,
|
|
158
158
|
online: true,
|
|
159
159
|
selected: false,
|
|
160
|
-
|
|
160
|
+
// Discover listing a zone is not a request for a HomeKit accessory.
|
|
161
|
+
// Volume is a fan tile; leaving it ticked on every new player would
|
|
162
|
+
// mint one per zone the moment the user pressed Save.
|
|
163
|
+
volumeSlider: false,
|
|
161
164
|
mute: player.suggested.mute,
|
|
162
165
|
battery: player.suggested.battery,
|
|
163
166
|
reboot: player.suggested.reboot,
|
|
@@ -454,9 +457,30 @@
|
|
|
454
457
|
|
|
455
458
|
// --- Actions ------------------------------------------------------------
|
|
456
459
|
|
|
460
|
+
let requestInFlight = false
|
|
461
|
+
|
|
462
|
+
/**
|
|
463
|
+
* Show progress next to Discover, which is where the user just pressed.
|
|
464
|
+
*
|
|
465
|
+
* Homebridge's spinner is centred on the whole settings page. With a long
|
|
466
|
+
* list of players that centre sits below the fold, so a user who pressed
|
|
467
|
+
* Discover would see nothing happen for several seconds.
|
|
468
|
+
*/
|
|
469
|
+
function setBusy(isBusy, message) {
|
|
470
|
+
requestInFlight = isBusy
|
|
471
|
+
byId('discover').disabled = isBusy
|
|
472
|
+
byId('manual-probe').disabled = isBusy
|
|
473
|
+
const status = byId('discover-status')
|
|
474
|
+
status.hidden = !isBusy
|
|
475
|
+
status.textContent = isBusy ? message : ''
|
|
476
|
+
}
|
|
477
|
+
|
|
457
478
|
async function discover() {
|
|
479
|
+
if (requestInFlight) {
|
|
480
|
+
return
|
|
481
|
+
}
|
|
458
482
|
const timeoutSec = Number(byId('timeout').value) || DEFAULT_TIMEOUT_SEC
|
|
459
|
-
|
|
483
|
+
setBusy(true, 'Listening for players…')
|
|
460
484
|
try {
|
|
461
485
|
const response = await homebridge.request('/discover', { timeoutSec })
|
|
462
486
|
const found = Array.isArray(response && response.players) ? response.players : []
|
|
@@ -481,11 +505,14 @@
|
|
|
481
505
|
} catch (error) {
|
|
482
506
|
homebridge.toast.error(describeError(error), 'Discovery failed')
|
|
483
507
|
} finally {
|
|
484
|
-
|
|
508
|
+
setBusy(false)
|
|
485
509
|
}
|
|
486
510
|
}
|
|
487
511
|
|
|
488
512
|
async function probe() {
|
|
513
|
+
if (requestInFlight) {
|
|
514
|
+
return
|
|
515
|
+
}
|
|
489
516
|
const host = byId('manual-host').value.trim()
|
|
490
517
|
const portValue = byId('manual-port').value.trim()
|
|
491
518
|
if (host.length === 0) {
|
|
@@ -496,7 +523,7 @@
|
|
|
496
523
|
if (portValue.length > 0) {
|
|
497
524
|
payload.port = Number(portValue)
|
|
498
525
|
}
|
|
499
|
-
|
|
526
|
+
setBusy(true, 'Probing…')
|
|
500
527
|
try {
|
|
501
528
|
const response = await homebridge.request('/probe', payload)
|
|
502
529
|
const found = Array.isArray(response && response.players) ? response.players : []
|
|
@@ -512,7 +539,7 @@
|
|
|
512
539
|
} catch (error) {
|
|
513
540
|
homebridge.toast.error(describeError(error), 'Probe failed')
|
|
514
541
|
} finally {
|
|
515
|
-
|
|
542
|
+
setBusy(false)
|
|
516
543
|
}
|
|
517
544
|
}
|
|
518
545
|
|
package/homebridge-ui/server.js
CHANGED
|
@@ -155,11 +155,14 @@ class BluOSUiServer extends HomebridgePluginUiServer {
|
|
|
155
155
|
}
|
|
156
156
|
|
|
157
157
|
/**
|
|
158
|
-
* Shape a discovered player for the page, including
|
|
158
|
+
* Shape a discovered player for the page, including opt-in accessory defaults.
|
|
159
159
|
*
|
|
160
|
-
*
|
|
161
|
-
*
|
|
162
|
-
*
|
|
160
|
+
* Volume, mute and reboot stay off until the user asks for them: Discover
|
|
161
|
+
* listing a zone is not a request for a HomeKit accessory. A player with a
|
|
162
|
+
* battery pack is offered that sensor, because it is a reading rather than a
|
|
163
|
+
* control. A player that reports a fixed output cannot take a slider at all,
|
|
164
|
+
* which the page learns from `fixedVolume`. A player with no usable MAC is
|
|
165
|
+
* given a generated identity here, once, so that it stays stable from then on.
|
|
163
166
|
*/
|
|
164
167
|
describe(player) {
|
|
165
168
|
const api = this.loadApi()
|
|
@@ -176,7 +179,7 @@ class BluOSUiServer extends HomebridgePluginUiServer {
|
|
|
176
179
|
hasBattery: player.hasBattery === true,
|
|
177
180
|
derivedIdentity: !(player.mac && player.mac.length > 0),
|
|
178
181
|
suggested: {
|
|
179
|
-
volumeSlider:
|
|
182
|
+
volumeSlider: false,
|
|
180
183
|
mute: false,
|
|
181
184
|
battery: player.hasBattery === true,
|
|
182
185
|
// Never suggested. Restarting a player interrupts whatever it is doing,
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "homebridge-bluos",
|
|
3
3
|
"displayName": "Homebridge BluOS",
|
|
4
|
-
"version": "1.1.
|
|
4
|
+
"version": "1.1.5",
|
|
5
5
|
"description": "Homebridge plugin for BluOS players — per-zone volume, mute, volume-preset and battery accessories over the LAN Custom Integration API. Verified on NAD and Bluesound hardware",
|
|
6
6
|
"main": "dist/index.js",
|
|
7
7
|
"types": "dist/index.d.ts",
|