iobroker.spotify-connect 0.1.0 → 0.1.1
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/README.md +35 -32
- package/build/lib/installer.js.map +1 -1
- package/build/lib/pipewire.js +6 -1
- package/build/lib/pipewire.js.map +1 -1
- package/build/lib/soloist.js +21 -11
- package/build/lib/soloist.js.map +1 -1
- package/build/lib/states.js +212 -28
- package/build/lib/states.js.map +1 -1
- package/build/main.js +12 -3
- package/build/main.js.map +1 -1
- package/io-package.json +14 -1
- package/package.json +9 -3
package/README.md
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
**Spotify Connect receiver for ioBroker.** The adapter appears as a speaker in the Spotify app on your phone or PC.
|
|
8
8
|
Whatever you play there is streamed over HTTP to any player in ioBroker that accepts a URL, for example
|
|
9
|
-
the satellites of ioBroker.assistant (ThirdReality Voice & Music Assistant), Dune HD players or other
|
|
9
|
+
the satellites of `ioBroker.assistant` (ThirdReality Voice & Music Assistant), Dune HD players or other
|
|
10
10
|
devices with a `media.url` state.
|
|
11
11
|
|
|
12
12
|
It is based on [Spotify Soloist](https://developer.spotify.com/documentation/soloist), the official headless
|
|
@@ -44,18 +44,18 @@ The same instructions with direct links are shown in the instance settings.
|
|
|
44
44
|
|
|
45
45
|
## Configuration
|
|
46
46
|
|
|
47
|
-
| Tab
|
|
48
|
-
|
|
49
|
-
| Spotify
|
|
50
|
-
| Spotify
|
|
51
|
-
| Players
|
|
52
|
-
| Players
|
|
53
|
-
| Advanced | Address
|
|
54
|
-
| Advanced | Stream port
|
|
55
|
-
| Advanced | Stream format
|
|
56
|
-
| Advanced | Local Soloist API port
|
|
57
|
-
|
|
58
|
-
For a ThirdReality speaker in ioBroker.assistant use
|
|
47
|
+
| Tab | Setting | Description |
|
|
48
|
+
|----------|--------------------------|-----------------------------------------------------------------------------------------|
|
|
49
|
+
| Spotify | Soloist API key | Key from the Soloist API key page, stored encrypted |
|
|
50
|
+
| Spotify | Device name | Name shown in the Spotify app, e.g. "Living room" |
|
|
51
|
+
| Players | Players | States with role `media.url` that receive the stream URL while you play |
|
|
52
|
+
| Players | Stop players after pause | Seconds after a pause until the players are stopped (default 30) |
|
|
53
|
+
| Advanced | Address | Address the players use to reach ioBroker. Empty = detected automatically |
|
|
54
|
+
| Advanced | Stream port | HTTP port of the stream (default 8097) |
|
|
55
|
+
| Advanced | Stream format | MP3 256 kbit/s or FLAC |
|
|
56
|
+
| Advanced | Local Soloist API port | Port of the Soloist WebSocket API on 127.0.0.1 (default 9090). Must differ per instance |
|
|
57
|
+
|
|
58
|
+
For a ThirdReality speaker in `ioBroker.assistant` use
|
|
59
59
|
`assistant.0.satellites.<Name>.controls.linux_voice_assistant_media_player.url`.
|
|
60
60
|
|
|
61
61
|
On the first use open the Spotify app, tap the device icon and select the device name. This logs Soloist into
|
|
@@ -65,24 +65,24 @@ Several rooms: create one instance per Spotify Connect device, each with its own
|
|
|
65
65
|
|
|
66
66
|
## States
|
|
67
67
|
|
|
68
|
-
| State
|
|
69
|
-
|
|
70
|
-
| `info.connection`
|
|
71
|
-
| `info.loggedIn`, `info.active`
|
|
72
|
-
| `info.soloistVersion`, `info.buildDate`, `info.expiresInDays`
|
|
73
|
-
| `info.lastUpdateCheck`, `info.updateError`
|
|
74
|
-
| `player.status`
|
|
75
|
-
| `player.title`, `player.artist`, `player.album`, `player.cover`
|
|
76
|
-
| `player.duration`, `player.elapsed`
|
|
77
|
-
| `player.context`, `player.uri`
|
|
78
|
-
| `player.shuffle`, `player.repeat`
|
|
79
|
-
| `control.play`, `control.pause`, `control.next`, `control.previous` | Buttons
|
|
80
|
-
| `control.volume`
|
|
81
|
-
| `control.seek`
|
|
82
|
-
| `control.shuffle`, `control.repeat`
|
|
83
|
-
| `control.playUri`
|
|
84
|
-
| `control.activate`
|
|
85
|
-
| `stream.url`, `stream.clients`
|
|
68
|
+
| State | Description |
|
|
69
|
+
|---------------------------------------------------------------------|-------------------------------------------------------|
|
|
70
|
+
| `info.connection` | Soloist runs and is logged in to Spotify |
|
|
71
|
+
| `info.loggedIn`, `info.active` | Logged in / this is the active Spotify Connect device |
|
|
72
|
+
| `info.soloistVersion`, `info.buildDate`, `info.expiresInDays` | Installed Soloist build and remaining lifetime |
|
|
73
|
+
| `info.lastUpdateCheck`, `info.updateError` | Result of the last update check |
|
|
74
|
+
| `player.status` | `idle`, `playing`, `paused` or `buffering` |
|
|
75
|
+
| `player.title`, `player.artist`, `player.album`, `player.cover` | Current track |
|
|
76
|
+
| `player.duration`, `player.elapsed` | Duration and position in seconds |
|
|
77
|
+
| `player.context`, `player.uri` | Playlist or album, Spotify URI of the track |
|
|
78
|
+
| `player.shuffle`, `player.repeat` | Playback options |
|
|
79
|
+
| `control.play`, `control.pause`, `control.next`, `control.previous` | Buttons |
|
|
80
|
+
| `control.volume` | Volume 0 to 100 |
|
|
81
|
+
| `control.seek` | Jump to position (seconds) |
|
|
82
|
+
| `control.shuffle`, `control.repeat` | Shuffle on/off, repeat `off`, `context` or `track` |
|
|
83
|
+
| `control.playUri` | Play a Spotify URI (track, album, playlist, episode) |
|
|
84
|
+
| `control.activate` | Make this the active device |
|
|
85
|
+
| `stream.url`, `stream.clients` | Stream URL and number of connected players |
|
|
86
86
|
|
|
87
87
|
## Soloist updates
|
|
88
88
|
|
|
@@ -111,8 +111,11 @@ Spotify's official download server on your device.
|
|
|
111
111
|
Placeholder for the next version (at the beginning of the line):
|
|
112
112
|
### **WORK IN PROGRESS**
|
|
113
113
|
-->
|
|
114
|
+
### 0.1.1 (2026-11-07)
|
|
115
|
+
- (@GermanBluefox) Updated packages
|
|
116
|
+
|
|
114
117
|
### 0.1.0 (2026-11-07)
|
|
115
|
-
- (
|
|
118
|
+
- (@GermanBluefox) initial release: Spotify Connect receiver based on Spotify Soloist with automatic installation and updates
|
|
116
119
|
|
|
117
120
|
## License
|
|
118
121
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installer.js","sourceRoot":"","sources":["../../src/lib/installer.ts"],"names":[],"mappings":";;;AAiCA,kCAWC;AAED,gCAEC;AAMD,4CA8BC;AAGD,oCAYC;AAED,gCAMC;AAOD,sCAMC;AAMD,
|
|
1
|
+
{"version":3,"file":"installer.js","sourceRoot":"","sources":["../../src/lib/installer.ts"],"names":[],"mappings":";;;AAiCA,kCAWC;AAED,gCAEC;AAMD,4CA8BC;AAGD,oCAYC;AAED,gCAMC;AAOD,sCAMC;AAMD,0CA8CC;AA5KD,qCAAwE;AACxE,yCAAiC;AACjC,6CAAuC;AACvC,mDAAgD;AAChD,+BAAuC;AAEvC,wEAAwE;AACxE,MAAM,WAAW,GAAmC;IAChD,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE;IACpC,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,gBAAgB,EAAE;IAChD,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,EAAE;IAC1C,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,OAAO,EAAE;IACzC,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE;CACnC,CAAC;AAEF,MAAM,aAAa,GAAG,uCAAuC,CAAC;AAC9D,mFAAmF;AACtE,QAAA,mBAAmB,GAAG,EAAE,CAAC;AAetC,kDAAkD;AAClD,SAAgB,WAAW;IACvB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,OAAO;YACR,OAAO,OAAO,CAAC;QACnB,KAAK,KAAK;YACN,OAAO,OAAO,CAAC;QACnB,KAAK,KAAK;YACN,OAAO,QAAQ,CAAC;QACpB;YACI,MAAM,IAAI,KAAK,CAAC,sDAAsD,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;IAC/F,CAAC;AACL,CAAC;AAED,SAAgB,UAAU;IACtB,OAAO,GAAG,aAAa,oBAAoB,WAAW,EAAE,SAAS,CAAC;AACtE,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CAAC,GAAiB;IACpD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAClE,CAAC;IACD,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC1B,IAAI,CAAC,CAAC,MAAM,IAAA,eAAS,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;IACL,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,EAAE,CAAC;IACd,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,gCAAgC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,gBAAgB,EAAE,CAAC;IAClE,IAAI,GAAG,GAAG,MAAM,IAAA,SAAG,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,yBAAyB,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAChH,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,iDAAiD,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACpG,MAAM,IAAA,SAAG,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACxD,GAAG,GAAG,MAAM,IAAA,SAAG,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,yBAAyB,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAChH,CAAC;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACjB,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC1B,IAAI,CAAC,CAAC,MAAM,IAAA,eAAS,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC5B,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,4FAA4F;AAC5F,SAAgB,YAAY,CAAC,GAAW;IACpC,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAC3D,IAAI,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1C,OAAO;QACH,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACb,cAAc;QACd,SAAS,EAAE,cAAc,GAAG,IAAI,GAAG,2BAAmB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI;QACzE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE;KAClB,CAAC;AACN,CAAC;AAEM,KAAK,UAAU,UAAU,CAAC,MAAc;IAC3C,IAAI,CAAC,IAAA,oBAAU,EAAC,MAAM,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,IAAA,SAAG,EAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,OAAO,YAAY,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;AACjD,CAAC;AAOM,KAAK,UAAU,aAAa;IAC/B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,MAAM,QAAQ,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;AACzG,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,eAAe,CACjC,GAAW,EACX,GAAiB;IAEjB,MAAM,kBAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAA,gBAAI,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAClC,MAAM,kBAAE,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,MAAM,kBAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzC,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,GAAG,CAAC,IAAI,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;IAC7G,MAAM,OAAO,GAAG,IAAA,gBAAI,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAC5C,MAAM,IAAA,mBAAQ,EAAC,sBAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAW,CAAC,EAAE,IAAA,2BAAiB,EAAC,OAAO,CAAC,CAAC,CAAC;IAE9E,MAAM,GAAG,GAAG,MAAM,IAAA,SAAG,EAAC,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAC1D,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAA,SAAG,EAAC,MAAM,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IAC1F,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,kBAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,gBAAI,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACpC,IAAI,IAAA,oBAAU,EAAC,MAAM,CAAC,EAAE,CAAC;QACrB,MAAM,kBAAE,CAAC,EAAE,CAAC,IAAA,gBAAI,EAAC,GAAG,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,kBAAE,CAAC,MAAM,CAAC,MAAM,EAAE,IAAA,gBAAI,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC;IACtD,CAAC;IACD,MAAM,kBAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,kBAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9B,MAAM,kBAAE,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,GAAG,CAAC,IAAI,CACJ,mBAAmB,OAAO,CAAC,OAAO,qBAAqB,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAC/H,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC/B,CAAC"}
|
package/build/lib/pipewire.js
CHANGED
|
@@ -63,7 +63,12 @@ class PipeWire {
|
|
|
63
63
|
await this.waitFor((0, node_path_1.join)(this.runtimeDir, 'pulse', 'native'), 10_000);
|
|
64
64
|
// Null sink: Soloist plays into it, ffmpeg records its monitor
|
|
65
65
|
for (let i = 0; i < 10; i++) {
|
|
66
|
-
const res = await (0, run_1.run)('pactl', [
|
|
66
|
+
const res = await (0, run_1.run)('pactl', [
|
|
67
|
+
'load-module',
|
|
68
|
+
'module-null-sink',
|
|
69
|
+
`sink_name=${exports.SINK_NAME}`,
|
|
70
|
+
'sink_properties=device.description=SpotifyConnect',
|
|
71
|
+
], { env: this.env });
|
|
67
72
|
if (res.code === 0) {
|
|
68
73
|
return;
|
|
69
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipewire.js","sourceRoot":"","sources":["../../src/lib/pipewire.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pipewire.js","sourceRoot":"","sources":["../../src/lib/pipewire.ts"],"names":[],"mappings":"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"}
|
package/build/lib/soloist.js
CHANGED
|
@@ -34,14 +34,22 @@ class Soloist extends node_events_1.EventEmitter {
|
|
|
34
34
|
this.stopping = false;
|
|
35
35
|
const o = this.opts;
|
|
36
36
|
const args = [
|
|
37
|
-
'-n',
|
|
38
|
-
|
|
39
|
-
'-
|
|
40
|
-
|
|
41
|
-
'-
|
|
42
|
-
|
|
43
|
-
'-
|
|
44
|
-
|
|
37
|
+
'-n',
|
|
38
|
+
o.deviceName,
|
|
39
|
+
'-k',
|
|
40
|
+
o.apiKey,
|
|
41
|
+
'-D',
|
|
42
|
+
o.dataDir,
|
|
43
|
+
'-C',
|
|
44
|
+
o.cacheDir,
|
|
45
|
+
'-z',
|
|
46
|
+
'200',
|
|
47
|
+
'-d',
|
|
48
|
+
o.sink,
|
|
49
|
+
'-i',
|
|
50
|
+
String(o.initialVolume),
|
|
51
|
+
'-w',
|
|
52
|
+
`127.0.0.1:${o.wsPort}`,
|
|
45
53
|
];
|
|
46
54
|
this.log.info(`Starting Spotify Soloist as "${o.deviceName}"`);
|
|
47
55
|
const p = (0, node_child_process_1.spawn)(o.binary, args, { env: o.env, stdio: ['ignore', 'pipe', 'pipe'] });
|
|
@@ -110,12 +118,14 @@ class Soloist extends node_events_1.EventEmitter {
|
|
|
110
118
|
this.emit('api', true);
|
|
111
119
|
this.command('get_auth_state');
|
|
112
120
|
});
|
|
113
|
-
ws.on('message', data => {
|
|
121
|
+
ws.on('message', (data) => {
|
|
122
|
+
const buf = Buffer.isBuffer(data) ? data : Array.isArray(data) ? Buffer.concat(data) : Buffer.from(data);
|
|
123
|
+
const text = buf.toString('utf8');
|
|
114
124
|
try {
|
|
115
|
-
this.emit('message', JSON.parse(
|
|
125
|
+
this.emit('message', JSON.parse(text));
|
|
116
126
|
}
|
|
117
127
|
catch {
|
|
118
|
-
this.log.debug(`Invalid API message: ${
|
|
128
|
+
this.log.debug(`Invalid API message: ${text}`);
|
|
119
129
|
}
|
|
120
130
|
});
|
|
121
131
|
ws.on('error', err => this.log.debug(`API error: ${err.message}`));
|
package/build/lib/soloist.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"soloist.js","sourceRoot":"","sources":["../../src/lib/soloist.ts"],"names":[],"mappings":";;;;;;AAAA,2DAA8D;AAC9D,6CAA2C;AAC3C,4CAA2B;AAC3B,+BAA8B;AAE9B,uEAAuE;AAC1D,QAAA,YAAY,GAAG,EAAE,CAAC;AAgC/B;;;;GAIG;AACH,MAAa,OAAQ,SAAQ,0BAAY;IAOhB;IACA;IAPb,IAAI,CAAgB;IACpB,EAAE,CAAa;IACf,QAAQ,GAAG,KAAK,CAAC;IACjB,OAAO,CAAkB;IAEjC,YACqB,IAAoB,EACpB,GAAe;QAEhC,KAAK,EAAE,CAAC;QAHS,SAAI,GAAJ,IAAI,CAAgB;QACpB,QAAG,GAAH,GAAG,CAAY;IAGpC,CAAC;IAED,IAAW,OAAO;QACd,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC;IACtD,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QACpB,MAAM,IAAI,GAAG;YACT,IAAI,
|
|
1
|
+
{"version":3,"file":"soloist.js","sourceRoot":"","sources":["../../src/lib/soloist.ts"],"names":[],"mappings":"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"}
|
package/build/lib/states.js
CHANGED
|
@@ -9,36 +9,220 @@ exports.CHANNELS = {
|
|
|
9
9
|
const STATUS = { idle: 'idle', playing: 'playing', paused: 'paused', buffering: 'buffering' };
|
|
10
10
|
const REPEAT = { off: 'off', context: 'context', track: 'track' };
|
|
11
11
|
exports.STATES = {
|
|
12
|
-
'info.loggedIn': {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
'info.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
12
|
+
'info.loggedIn': {
|
|
13
|
+
name: { en: 'Spotify account connected', de: 'Spotify-Konto verbunden', ru: 'Аккаунт Spotify подключён' },
|
|
14
|
+
type: 'boolean',
|
|
15
|
+
role: 'indicator',
|
|
16
|
+
def: false,
|
|
17
|
+
},
|
|
18
|
+
'info.active': {
|
|
19
|
+
name: {
|
|
20
|
+
en: 'Active Spotify Connect device',
|
|
21
|
+
de: 'Aktives Spotify-Connect-Gerät',
|
|
22
|
+
ru: 'Активное устройство Spotify Connect',
|
|
23
|
+
},
|
|
24
|
+
type: 'boolean',
|
|
25
|
+
role: 'indicator',
|
|
26
|
+
def: false,
|
|
27
|
+
},
|
|
28
|
+
'info.soloistVersion': {
|
|
29
|
+
name: { en: 'Spotify Soloist version', de: 'Version von Spotify Soloist', ru: 'Версия Spotify Soloist' },
|
|
30
|
+
type: 'string',
|
|
31
|
+
role: 'text',
|
|
32
|
+
def: '',
|
|
33
|
+
},
|
|
34
|
+
'info.buildDate': {
|
|
35
|
+
name: { en: 'Soloist build date', de: 'Build-Datum von Soloist', ru: 'Дата сборки Soloist' },
|
|
36
|
+
type: 'string',
|
|
37
|
+
role: 'text',
|
|
38
|
+
def: '',
|
|
39
|
+
},
|
|
40
|
+
'info.expiresInDays': {
|
|
41
|
+
name: {
|
|
42
|
+
en: 'Days until the Soloist build expires',
|
|
43
|
+
de: 'Tage bis zum Ablauf des Soloist-Builds',
|
|
44
|
+
ru: 'Дней до истечения сборки Soloist',
|
|
45
|
+
},
|
|
46
|
+
type: 'number',
|
|
47
|
+
role: 'value',
|
|
48
|
+
unit: 'd',
|
|
49
|
+
def: 0,
|
|
50
|
+
},
|
|
51
|
+
'info.lastUpdateCheck': {
|
|
52
|
+
name: { en: 'Last update check', de: 'Letzte Update-Prüfung', ru: 'Последняя проверка обновлений' },
|
|
53
|
+
type: 'number',
|
|
54
|
+
role: 'date',
|
|
55
|
+
def: 0,
|
|
56
|
+
},
|
|
57
|
+
'info.updateError': {
|
|
58
|
+
name: { en: 'Last update error', de: 'Letzter Update-Fehler', ru: 'Последняя ошибка обновления' },
|
|
59
|
+
type: 'string',
|
|
60
|
+
role: 'text',
|
|
61
|
+
def: '',
|
|
62
|
+
},
|
|
63
|
+
'player.status': {
|
|
64
|
+
name: { en: 'Playback status', de: 'Wiedergabestatus', ru: 'Статус воспроизведения' },
|
|
65
|
+
type: 'string',
|
|
66
|
+
role: 'media.state',
|
|
67
|
+
def: 'idle',
|
|
68
|
+
states: STATUS,
|
|
69
|
+
},
|
|
70
|
+
'player.title': {
|
|
71
|
+
name: { en: 'Title', de: 'Titel', ru: 'Название' },
|
|
72
|
+
type: 'string',
|
|
73
|
+
role: 'media.title',
|
|
74
|
+
def: '',
|
|
75
|
+
},
|
|
76
|
+
'player.artist': {
|
|
77
|
+
name: { en: 'Artist', de: 'Interpret', ru: 'Исполнитель' },
|
|
78
|
+
type: 'string',
|
|
79
|
+
role: 'media.artist',
|
|
80
|
+
def: '',
|
|
81
|
+
},
|
|
22
82
|
'player.album': { name: { en: 'Album', de: 'Album', ru: 'Альбом' }, type: 'string', role: 'media.album', def: '' },
|
|
23
83
|
'player.cover': { name: { en: 'Cover', de: 'Cover', ru: 'Обложка' }, type: 'string', role: 'media.cover', def: '' },
|
|
24
|
-
'player.uri': {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
'
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
84
|
+
'player.uri': {
|
|
85
|
+
name: { en: 'Spotify URI', de: 'Spotify-URI', ru: 'Spotify URI' },
|
|
86
|
+
type: 'string',
|
|
87
|
+
role: 'text',
|
|
88
|
+
def: '',
|
|
89
|
+
},
|
|
90
|
+
'player.context': {
|
|
91
|
+
name: {
|
|
92
|
+
en: 'Playing from (playlist, album)',
|
|
93
|
+
de: 'Gespielt aus (Playlist, Album)',
|
|
94
|
+
ru: 'Источник (плейлист, альбом)',
|
|
95
|
+
},
|
|
96
|
+
type: 'string',
|
|
97
|
+
role: 'text',
|
|
98
|
+
def: '',
|
|
99
|
+
},
|
|
100
|
+
'player.duration': {
|
|
101
|
+
name: { en: 'Duration', de: 'Dauer', ru: 'Длительность' },
|
|
102
|
+
type: 'number',
|
|
103
|
+
role: 'media.duration',
|
|
104
|
+
unit: 's',
|
|
105
|
+
def: 0,
|
|
106
|
+
},
|
|
107
|
+
'player.elapsed': {
|
|
108
|
+
name: { en: 'Position', de: 'Position', ru: 'Позиция' },
|
|
109
|
+
type: 'number',
|
|
110
|
+
role: 'media.elapsed',
|
|
111
|
+
unit: 's',
|
|
112
|
+
def: 0,
|
|
113
|
+
},
|
|
114
|
+
'player.shuffle': {
|
|
115
|
+
name: { en: 'Shuffle', de: 'Zufallswiedergabe', ru: 'Перемешивание' },
|
|
116
|
+
type: 'boolean',
|
|
117
|
+
role: 'media.mode.shuffle',
|
|
118
|
+
def: false,
|
|
119
|
+
},
|
|
120
|
+
'player.repeat': {
|
|
121
|
+
name: { en: 'Repeat', de: 'Wiederholen', ru: 'Повтор' },
|
|
122
|
+
type: 'string',
|
|
123
|
+
role: 'media.mode.repeat',
|
|
124
|
+
def: 'off',
|
|
125
|
+
states: REPEAT,
|
|
126
|
+
},
|
|
127
|
+
'control.play': {
|
|
128
|
+
name: { en: 'Play / resume', de: 'Abspielen / fortsetzen', ru: 'Воспроизвести / продолжить' },
|
|
129
|
+
type: 'boolean',
|
|
130
|
+
role: 'button.play',
|
|
131
|
+
read: false,
|
|
132
|
+
write: true,
|
|
133
|
+
},
|
|
134
|
+
'control.pause': {
|
|
135
|
+
name: { en: 'Pause', de: 'Pause', ru: 'Пауза' },
|
|
136
|
+
type: 'boolean',
|
|
137
|
+
role: 'button.pause',
|
|
138
|
+
read: false,
|
|
139
|
+
write: true,
|
|
140
|
+
},
|
|
141
|
+
'control.next': {
|
|
142
|
+
name: { en: 'Next track', de: 'Nächster Titel', ru: 'Следующий трек' },
|
|
143
|
+
type: 'boolean',
|
|
144
|
+
role: 'button.next',
|
|
145
|
+
read: false,
|
|
146
|
+
write: true,
|
|
147
|
+
},
|
|
148
|
+
'control.previous': {
|
|
149
|
+
name: { en: 'Previous track', de: 'Vorheriger Titel', ru: 'Предыдущий трек' },
|
|
150
|
+
type: 'boolean',
|
|
151
|
+
role: 'button.prev',
|
|
152
|
+
read: false,
|
|
153
|
+
write: true,
|
|
154
|
+
},
|
|
155
|
+
'control.activate': {
|
|
156
|
+
name: {
|
|
157
|
+
en: 'Make this the active Spotify device',
|
|
158
|
+
de: 'Zum aktiven Spotify-Gerät machen',
|
|
159
|
+
ru: 'Сделать активным устройством Spotify',
|
|
160
|
+
},
|
|
161
|
+
type: 'boolean',
|
|
162
|
+
role: 'button',
|
|
163
|
+
read: false,
|
|
164
|
+
write: true,
|
|
165
|
+
},
|
|
166
|
+
'control.volume': {
|
|
167
|
+
name: { en: 'Volume', de: 'Lautstärke', ru: 'Громкость' },
|
|
168
|
+
type: 'number',
|
|
169
|
+
role: 'level.volume',
|
|
170
|
+
write: true,
|
|
171
|
+
min: 0,
|
|
172
|
+
max: 100,
|
|
173
|
+
unit: '%',
|
|
174
|
+
def: 0,
|
|
175
|
+
},
|
|
176
|
+
'control.seek': {
|
|
177
|
+
name: { en: 'Seek to position', de: 'Zu Position springen', ru: 'Перейти к позиции' },
|
|
178
|
+
type: 'number',
|
|
179
|
+
role: 'media.seek',
|
|
180
|
+
write: true,
|
|
181
|
+
unit: 's',
|
|
182
|
+
def: 0,
|
|
183
|
+
},
|
|
184
|
+
'control.shuffle': {
|
|
185
|
+
name: { en: 'Shuffle', de: 'Zufallswiedergabe', ru: 'Перемешивание' },
|
|
186
|
+
type: 'boolean',
|
|
187
|
+
role: 'media.mode.shuffle',
|
|
188
|
+
write: true,
|
|
189
|
+
def: false,
|
|
190
|
+
},
|
|
191
|
+
'control.repeat': {
|
|
192
|
+
name: {
|
|
193
|
+
en: 'Repeat (off, context, track)',
|
|
194
|
+
de: 'Wiederholen (off, context, track)',
|
|
195
|
+
ru: 'Повтор (off, context, track)',
|
|
196
|
+
},
|
|
197
|
+
type: 'string',
|
|
198
|
+
role: 'media.mode.repeat',
|
|
199
|
+
write: true,
|
|
200
|
+
def: 'off',
|
|
201
|
+
states: REPEAT,
|
|
202
|
+
},
|
|
39
203
|
// role "text", not "media.url": this state must not show up as a target player
|
|
40
|
-
'control.playUri': {
|
|
41
|
-
|
|
42
|
-
|
|
204
|
+
'control.playUri': {
|
|
205
|
+
name: {
|
|
206
|
+
en: 'Play Spotify URI (track, album, playlist)',
|
|
207
|
+
de: 'Spotify-URI abspielen (Titel, Album, Playlist)',
|
|
208
|
+
ru: 'Воспроизвести Spotify URI (трек, альбом, плейлист)',
|
|
209
|
+
},
|
|
210
|
+
type: 'string',
|
|
211
|
+
role: 'text',
|
|
212
|
+
write: true,
|
|
213
|
+
def: '',
|
|
214
|
+
},
|
|
215
|
+
'stream.url': {
|
|
216
|
+
name: { en: 'Stream URL', de: 'Stream-URL', ru: 'URL потока' },
|
|
217
|
+
type: 'string',
|
|
218
|
+
role: 'url',
|
|
219
|
+
def: '',
|
|
220
|
+
},
|
|
221
|
+
'stream.clients': {
|
|
222
|
+
name: { en: 'Connected players', de: 'Verbundene Player', ru: 'Подключённые плееры' },
|
|
223
|
+
type: 'number',
|
|
224
|
+
role: 'value',
|
|
225
|
+
def: 0,
|
|
226
|
+
},
|
|
43
227
|
};
|
|
44
228
|
//# sourceMappingURL=states.js.map
|
package/build/lib/states.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"states.js","sourceRoot":"","sources":["../../src/lib/states.ts"],"names":[],"mappings":";;;AAea,QAAA,QAAQ,GAAyB;IAC1C,MAAM,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,qBAAqB,EAAE,EAAE,EAAE,eAAe,EAAE;IAC7E,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,YAAY,EAAE;IAC7D,MAAM,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,YAAY,EAAE;CACvE,CAAC;AAEF,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AAC9F,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAErD,QAAA,MAAM,GAA6B;IAC5C,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"states.js","sourceRoot":"","sources":["../../src/lib/states.ts"],"names":[],"mappings":"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"}
|
package/build/main.js
CHANGED
|
@@ -116,7 +116,12 @@ class SpotifyConnect extends utils.Adapter {
|
|
|
116
116
|
try {
|
|
117
117
|
this.pipewire = new pipewire_1.PipeWire(dataDir, this.log, name => this.onAudioCrash(name));
|
|
118
118
|
await this.pipewire.start();
|
|
119
|
-
this.stream = new stream_server_1.StreamServer({
|
|
119
|
+
this.stream = new stream_server_1.StreamServer({
|
|
120
|
+
port: c.streamPort || 8097,
|
|
121
|
+
format: c.format || 'mp3',
|
|
122
|
+
source: `${pipewire_1.SINK_NAME}.monitor`,
|
|
123
|
+
env: this.pipewire.env,
|
|
124
|
+
}, this.log, n => void this.setState('stream.clients', n, true));
|
|
120
125
|
await this.stream.start();
|
|
121
126
|
}
|
|
122
127
|
catch (e) {
|
|
@@ -170,7 +175,8 @@ class SpotifyConnect extends utils.Adapter {
|
|
|
170
175
|
catch {
|
|
171
176
|
// first check after a manual installation
|
|
172
177
|
}
|
|
173
|
-
const changed = (remote.etag && remote.etag !== known.etag) ||
|
|
178
|
+
const changed = (remote.etag && remote.etag !== known.etag) ||
|
|
179
|
+
(remote.lastModified && remote.lastModified !== known.lastModified);
|
|
174
180
|
if (!changed && !force) {
|
|
175
181
|
if (this.daysLeft() <= UPDATE_FROM_DAYS) {
|
|
176
182
|
this.log.info(`Soloist build expires in ${this.daysLeft()} days, no newer build available yet`);
|
|
@@ -331,7 +337,10 @@ class SpotifyConnect extends utils.Adapter {
|
|
|
331
337
|
const covers = d?.visual_identity?.cover || [];
|
|
332
338
|
const cover = (covers.find(c => c.size === 'large') || covers.find(c => c.size === 'xlarge') || covers[0])?.url || '';
|
|
333
339
|
await this.setState('player.title', d?.identity?.name || '', true);
|
|
334
|
-
await this.setState('player.artist', (d?.creators || [])
|
|
340
|
+
await this.setState('player.artist', (d?.creators || [])
|
|
341
|
+
.map(c => c.entity?.decorations?.identity?.name)
|
|
342
|
+
.filter(Boolean)
|
|
343
|
+
.join(', '), true);
|
|
335
344
|
await this.setState('player.album', d?.parent?.entity?.decorations?.identity?.name || '', true);
|
|
336
345
|
await this.setState('player.cover', cover, true);
|
|
337
346
|
await this.setState('player.uri', item?.uri || '', true);
|
package/build/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "spotify-connect",
|
|
4
|
-
"version": "0.1.
|
|
4
|
+
"version": "0.1.1",
|
|
5
5
|
"news": {
|
|
6
|
+
"0.1.1": {
|
|
7
|
+
"en": "Updated packages",
|
|
8
|
+
"de": "Neue Pakete",
|
|
9
|
+
"ru": "Обновленные пакеты",
|
|
10
|
+
"pt": "Pacotes novos",
|
|
11
|
+
"nl": "Bijgewerkte pakketten",
|
|
12
|
+
"fr": "Packages mis à jour",
|
|
13
|
+
"it": "Pacchi nuovi",
|
|
14
|
+
"es": "Paquetes nuevos",
|
|
15
|
+
"pl": "Zaktualizowane pakiety",
|
|
16
|
+
"uk": "Оновлені пакети",
|
|
17
|
+
"zh-cn": "更新的软件包"
|
|
18
|
+
},
|
|
6
19
|
"0.1.0": {
|
|
7
20
|
"en": "initial release",
|
|
8
21
|
"de": "Erstveröffentlichung",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.spotify-connect",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.1",
|
|
4
4
|
"description": "Spotify Connect receiver for ioBroker based on Spotify Soloist; streams to any player with a media.url state",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Denis Haev",
|
|
@@ -28,6 +28,9 @@
|
|
|
28
28
|
"ws": "^8.22.1"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
|
+
"@alcalzone/release-script": "^5.2.1",
|
|
32
|
+
"@alcalzone/release-script-plugin-iobroker": "^5.2.0",
|
|
33
|
+
"@alcalzone/release-script-plugin-license": "^5.2.2",
|
|
31
34
|
"@iobroker/testing": "^6.3.1",
|
|
32
35
|
"@iobroker/eslint-config": "^2.3.4",
|
|
33
36
|
"@tsconfig/node22": "^22.0.6",
|
|
@@ -47,10 +50,13 @@
|
|
|
47
50
|
"watch": "tsc -p tsconfig.json --watch",
|
|
48
51
|
"lint": "eslint -c eslint.config.mjs",
|
|
49
52
|
"test:package": "mocha test/package.js --exit",
|
|
50
|
-
"test:integration": "mocha unit.test.js --exit",
|
|
53
|
+
"test:integration": "mocha test/unit.test.js --exit",
|
|
51
54
|
"test": "npm run build && npm run test:package && npm run test:integration",
|
|
52
55
|
"update-packages": "npx -y npm-check-updates -u",
|
|
53
|
-
"npm": "npm i --ignore-scripts"
|
|
56
|
+
"npm": "npm i --ignore-scripts",
|
|
57
|
+
"release-patch": "release-script patch --yes",
|
|
58
|
+
"release-minor": "release-script minor --yes",
|
|
59
|
+
"release-major": "release-script major --yes"
|
|
54
60
|
},
|
|
55
61
|
"bugs": {
|
|
56
62
|
"url": "https://github.com/ioBroker/ioBroker.spotify-connect/issues"
|