try spotify fix

Signed-off-by: Jan N. Klug <>
smarthomej · Nov 3, 2023 · f4f6683 · f4f6683
1 parent 3816ab9
commit f4f6683
Show file tree

Hide file tree

Showing 9 changed files with 167 additions and 8 deletions.
diff --git a/...o/request/AnnouncementTargetDeviceTO.java → ...nechocontrol/internal/dto/DeviceIdTO.java b/...o/request/AnnouncementTargetDeviceTO.java → ...nechocontrol/internal/dto/DeviceIdTO.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.smarthomej.binding.amazonechocontrol.internal.dto.request;
+package org.smarthomej.binding.amazonechocontrol.internal.dto;
 
 import org.eclipse.jdt.annotation.NonNull;
 
 /**
- * The {@link AnnouncementTargetDeviceTO} encapsulates a target device for an announcement target
+ * The {@link DeviceIdTO} encapsulates a target device for an announcement target
  *
  * @author Jan N. Klug - Initial contribution
  */
-public class AnnouncementTargetDeviceTO {
+public class DeviceIdTO {
     public String deviceSerialNumber;
     public String deviceTypeId;
 

diff --git a/...control/src/main/java/org/smarthomej/binding/amazonechocontrol/internal/dto/TOMapper.java b/...control/src/main/java/org/smarthomej/binding/amazonechocontrol/internal/dto/TOMapper.java
@@ -25,7 +25,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.smarthomej.binding.amazonechocontrol.internal.dto.request.AnnouncementTargetDeviceTO;
 import org.smarthomej.binding.amazonechocontrol.internal.types.Notification;
 
 import com.google.gson.Gson;
@@ -51,8 +50,8 @@ public static Map<String, Object> mapToMap(Gson gson, Object o) {
         return Objects.requireNonNullElse(gson.fromJson(json, MAP_TYPE_TOKEN), Map.of());
     }
 
-    public static AnnouncementTargetDeviceTO mapAnnouncementTargetDevice(DeviceTO device) {
-        AnnouncementTargetDeviceTO targetDevice = new AnnouncementTargetDeviceTO();
+    public static DeviceIdTO mapAnnouncementTargetDevice(DeviceTO device) {
+        DeviceIdTO targetDevice = new DeviceIdTO();
         targetDevice.deviceTypeId = device.deviceType;
         targetDevice.deviceSerialNumber = device.serialNumber;
         return targetDevice;

diff --git a/...a/org/smarthomej/binding/amazonechocontrol/internal/dto/request/AnnouncementTargetTO.java b/...a/org/smarthomej/binding/amazonechocontrol/internal/dto/request/AnnouncementTargetTO.java
@@ -15,6 +15,7 @@
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.smarthomej.binding.amazonechocontrol.internal.dto.DeviceIdTO;
 
 /**
  * The {@link AnnouncementTargetTO} encapsulate the target section of an announcement
@@ -23,7 +24,7 @@
  */
 public class AnnouncementTargetTO {
     public String customerId;
-    public List<AnnouncementTargetDeviceTO> devices = List.of();
+    public List<DeviceIdTO> devices = List.of();
 
     @Override
     public @NonNull String toString() {

diff --git a/...in/java/org/smarthomej/binding/amazonechocontrol/internal/dto/response/EligibilityTO.java b/...in/java/org/smarthomej/binding/amazonechocontrol/internal/dto/response/EligibilityTO.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2021-2023 Contributors to the SmartHome/J project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.smarthomej.binding.amazonechocontrol.internal.dto.response;
+
+import org.eclipse.jdt.annotation.NonNull;
+
+/**
+ * The {@link EligibilityTO} encapsulates the eligibility section of a media session
+ *
+ * @author Jan N. Klug - Initial contribution
+ */
+public class EligibilityTO {
+    public boolean isEligible;
+    public String reasonCode;
+
+    @Override
+    public @NonNull String toString() {
+        return "EligibilityTO{isEligible=" + isEligible + ", reasonCode='" + reasonCode + "'}";
+    }
+}
diff --git a/...va/org/smarthomej/binding/amazonechocontrol/internal/dto/response/ListMediaSessionTO.java b/...va/org/smarthomej/binding/amazonechocontrol/internal/dto/response/ListMediaSessionTO.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2021-2023 Contributors to the SmartHome/J project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.smarthomej.binding.amazonechocontrol.internal.dto.response;
+
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNull;
+
+/**
+ * The {@link ListMediaSessionTO} encapsulates the response to /api/np/list-media.sessions
+ *
+ * @author Jan N. Klug - Initial contribution
+ */
+public class ListMediaSessionTO {
+    public List<MediaSessionTO> mediaSessionList = List.of();
+
+    @Override
+    public @NonNull String toString() {
+        return "ListMediaSessionTO{mediaSessionList=" + mediaSessionList + "}";
+    }
+}
diff --git a/...rg/smarthomej/binding/amazonechocontrol/internal/dto/response/MediaSessionEndpointTO.java b/...rg/smarthomej/binding/amazonechocontrol/internal/dto/response/MediaSessionEndpointTO.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2021-2023 Contributors to the SmartHome/J project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.smarthomej.binding.amazonechocontrol.internal.dto.response;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.smarthomej.binding.amazonechocontrol.internal.dto.DeviceIdTO;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * The {@link MediaSessionEndpointTO} encapsulates a single endpoint information for a media session
+ *
+ * @author Jan N. Klug - Initial contribution
+ */
+public class MediaSessionEndpointTO {
+    @SerializedName("__type")
+    public String type;
+    public String encryptedFriendlyName;
+    public DeviceIdTO id;
+
+    @Override
+    public @NonNull String toString() {
+        return "MediaSessionEndpointTO{type='" + type + "', encryptedFriendlyName='" + encryptedFriendlyName + "', id="
+                + id + "}";
+    }
+}
diff --git a/...n/java/org/smarthomej/binding/amazonechocontrol/internal/dto/response/MediaSessionTO.java b/...n/java/org/smarthomej/binding/amazonechocontrol/internal/dto/response/MediaSessionTO.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2021-2023 Contributors to the SmartHome/J project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.smarthomej.binding.amazonechocontrol.internal.dto.response;
+
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.smarthomej.binding.amazonechocontrol.internal.dto.PlayerStateInfoTO;
+
+/**
+ * The {@link MediaSessionTO} encapsulates a single media session
+ *
+ * @author Jan N. Klug - Initial contribution
+ */
+public class MediaSessionTO {
+    public EligibilityTO castEligibility;
+    public List<MediaSessionEndpointTO> endpointList = List.of();
+    public PlayerStateInfoTO nowPlayingData;
+
+    @Override
+    public @NonNull String toString() {
+        return "MediaSessionTO{castEligibility=" + castEligibility + ", endpointList=" + endpointList
+                + ", nowPlayingData=" + nowPlayingData + "}";
+    }
+}
diff --git a/...c/main/java/org/smarthomej/binding/amazonechocontrol/internal/handler/AccountHandler.java b/...c/main/java/org/smarthomej/binding/amazonechocontrol/internal/handler/AccountHandler.java
@@ -661,7 +661,8 @@ public void onPushCommandReceived(PushCommandTO pushCommand) {
                 break;
             case "NotifyMediaSessionsUpdated":
                 // we can't determine which session was updated, but it only makes sense for currently playing devices
-                echoHandlers.forEach(e -> e.refreshAudioPlayerState(true));
+                // echoHandlers.forEach(e -> e.refreshAudioPlayerState(true));
+                echoHandlers.forEach(EchoHandler::updateMediaSessions);
                 break;
             default:
                 logger.warn("Detected unknown command from activity stream: {}", pushCommand);

diff --git a/.../src/main/java/org/smarthomej/binding/amazonechocontrol/internal/handler/EchoHandler.java b/.../src/main/java/org/smarthomej/binding/amazonechocontrol/internal/handler/EchoHandler.java
@@ -88,6 +88,8 @@
 import org.smarthomej.binding.amazonechocontrol.internal.dto.response.BluetoothStateTO;
 import org.smarthomej.binding.amazonechocontrol.internal.dto.response.CustomerHistoryRecordTO;
 import org.smarthomej.binding.amazonechocontrol.internal.dto.response.CustomerHistoryRecordVoiceTO;
+import org.smarthomej.binding.amazonechocontrol.internal.dto.response.ListMediaSessionTO;
+import org.smarthomej.binding.amazonechocontrol.internal.dto.response.MediaSessionTO;
 import org.smarthomej.binding.amazonechocontrol.internal.dto.response.MusicProviderTO;
 import org.smarthomej.binding.amazonechocontrol.internal.dto.response.PlayerStateTO;
 import org.smarthomej.binding.amazonechocontrol.internal.types.Notification;
@@ -953,6 +955,30 @@ public void handleNowPlayingUpdated(PlayerStateInfoTO playerState) {
         }
     }
 
+    public void updateMediaSessions() {
+        findConnection().ifPresent(connection -> {
+            try {
+                DeviceTO device = this.device;
+                if (device == null || !isPlaying) {
+                    return;
+                }
+                String url = connection.getAlexaServer() + "/api/np/list-media-sessions?deviceSerialNumber="
+                        + device.serialNumber + "&deviceType=" + device.deviceType;
+                List<MediaSessionTO> mediaSessions = connection.getRequestBuilder().get(url)
+                        .syncSend(ListMediaSessionTO.class).mediaSessionList;
+                for (MediaSessionTO mediaSession : mediaSessions) {
+                    if (findIn(mediaSession.endpointList, e -> e.id.deviceSerialNumber, device.serialNumber)
+                            .isPresent()) {
+                        updateMediaPlayerState(mediaSession.nowPlayingData, connection.isSequenceNodeQueueRunning(),
+                                1000);
+                    }
+                }
+            } catch (ConnectionException e) {
+                logger.warn("Failed to update media sessions for {}: {}", thing.getUID(), e.getMessage());
+            }
+        });
+    }
+
     /**
      * Refresh the audio player state
      *