feat: Special state for group members

Fixed #110

package.json

@@ -21,7 +21,7 @@
  "test": "eslint ./src/*.ts"
  },
  "dependencies": {
- "@svrooij/sonos": "^2.4.1",
+ "@svrooij/sonos": "^2.5.0-beta.1",
  "mqtt": "4.2.8",
  "serilogger": "^0.3.1",
  "yalm": "4.1.0",

src/sonos-state.ts

@@ -1,4 +1,4 @@
-import { Track, ChannelValue } from '@svrooij/sonos/lib/models'
+import { Track, ChannelValue, ExtendedTransportState } from '@svrooij/sonos/lib/models'
 /**
  * Object that keeps the state of each device,
  * this is what is changed by the events and published to mqtt as a full object.
@@ -19,13 +19,13 @@ export interface SonosState extends SonosStateBase {
  currentTrack: Track | string;
  nextTrack: Track | string;
  enqueuedMetadata: Track | string;
- transportState: string;
+ transportState: ExtendedTransportState;
  playmode: string;
  bass: number;
  treble: number;
 
 }
 
 interface SonosStateBase {
- [key: string]: string | number | Track | ChannelValue<number> | ChannelValue<boolean>;
+ [key: string]: string | number | Track | ChannelValue<number> | ChannelValue<boolean> | ExtendedTransportState;
 }

src/sonos-to-mqtt.ts

@@ -99,7 +99,11 @@ export class SonosToMqtt {
  }
  this.log.debug('Executed {command} for {device} ({uuid})', payload.command ?? payload.sonosCommand, correctDevice.Name, correctDevice.Uuid)
  } catch (e) {
- this.log.warn(e, 'Error executing {command} for {device} ({uuid})', payload.command ?? payload.sonosCommand, correctDevice.Name, correctDevice.Uuid)
+ if (e instanceof Error) {
+ this.log.warn(e, 'Error executing {command} for {device} ({uuid})', payload.command ?? payload.sonosCommand, correctDevice.Name, correctDevice.Uuid)
+ } else {
+ this.log.warn('Error executing {command} for {device} ({uuid})', payload.command ?? payload.sonosCommand, correctDevice.Name, correctDevice.Uuid)
+ }
  this.mqtt.publish(`${correctDevice.Uuid}/error`, {
  command: payload.command ?? payload.sonosCommand,
  error: e
@@ -135,6 +139,12 @@ export class SonosToMqtt {
  this.mqtt.publish(`status/${this.topicId(d.Name, d.Uuid)}/coordinator`, coordinatorUuid)
  }
  })
+ d.Events.on('transportState', (transportState) => {
+ this.updateState(d.Uuid, { transportState } );
+ if (this.config.distinct === true) {
+ this.mqtt.publish(`status/${this.topicId(d.Name, d.Uuid)}/state`, transportState)
+ }
+ })
  if(this.config.distinct === true) {
  d.Events.on(SonosEvents.CurrentTrackMetadata, (track) => {
  this.mqtt.publish(`status/${this.topicId(d.Name, d.Uuid)}/track`, track)
@@ -145,9 +155,6 @@ export class SonosToMqtt {
  d.Events.on(SonosEvents.Mute, (mute) => {
  this.mqtt.publish(`status/${this.topicId(d.Name, d.Uuid)}/muted`, mute)
  })
- d.Events.on(SonosEvents.CurrentTransportStateSimple, (state) => {
- this.mqtt.publish(`status/${this.topicId(d.Name, d.Uuid)}/state`, state)
- })
  d.Events.on(SonosEvents.Volume, (volume) => {
  this.mqtt.publish(`status/${this.topicId(d.Name, d.Uuid)}/volume`, volume)
  })
@@ -194,7 +201,7 @@ export class SonosToMqtt {
  currentTrack: data.CurrentTrackMetaData,
  enqueuedMetadata: data.EnqueuedTransportURIMetaData,
  nextTrack: data.NextTrackMetaData,
- transportState: data.TransportState,
+ // transportState: data.TransportState,
  playmode: data.CurrentPlayMode,
  })
  }