[Spotify] Only allow expected track to play

thislooksfun · thislooksfun · commit 6931295c204f · 2020-01-17T16:40:08.000-06:00
diff --git a/src/plugins/spotify/connect.ts b/src/plugins/spotify/connect.ts
@@ -167,6 +167,12 @@ export default {
   play(uri?: string) {
     return ensureAuthenticated()
       .then(ensurePlayer)
+      .tap(() => log.debug(`spotify.play(${uri})`))
+      .then(() => {
+        if (uri) {
+          player.setExpectedURI(uri);
+        }
+      })
       .then(() => (uri ? [uri] : undefined))
       .then(uris => spotify.play({ uris }))
       .then(() => player.waitForPlayback(uri))
diff --git a/src/plugins/spotify/player.ts b/src/plugins/spotify/player.ts
@@ -46,6 +46,19 @@ export default {
       .then(el => el.getText());
   },
 
+  setExpectedURI(id: string) {
+    if (!driver) {
+      return Promise.reject(new Error("No driver"));
+    }
+
+    let d: Driver = driver;
+    // Get the device ID
+    return Promise.resolve()
+      .then(() => d.findElement(By.id("expectedURI")))
+      .tap(e => e.clear())
+      .tap(e => e.sendKeys(id));
+  },
+
   getStatus() {
     if (!driver) {
       return Promise.reject(new Error("No driver"));
diff --git a/support/plugins/spotify/page.html b/support/plugins/spotify/page.html
@@ -7,6 +7,8 @@
     <title>Spotify Web Player (loading)</title>
   </head>
   <body>
+    <input type="text" id="expectedURI" />
+
     <span id="device_id"></span>
     <span id="device_state">loading</span>
 
@@ -48,6 +50,12 @@
           const track = state.track_window.current_track;
 
           if (!state.paused) {
+            if (track.uri != expectedURI.value) {
+              console.log(
+                `MISMATCHED TRACKS -- Expected ${expectedURI.value}, got ${track.id}`
+              );
+              player.pause().then(() => player.seek(0));
+            }
             document.getElementById("device_state").innerText = "playing";
           } else {
             document.getElementById("device_state").innerText = "paused";
