Merge 1b4c1e1cd8 into 6e43cbb4d7

CHANGELOG.md

@@ -4,10 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [5.12.0]
-
-- Added Shuffle and Repeat state to API response - By [ThatGravyBoat](https://github.com/ThatGravyBoat)
-
 ## [5.11.0]
 
 - Re-implemented the API, added support for duration/current in seconds & shuffle+repeat

package-lock.json

@@ -1,16 +1,17 @@
 {
   "name": "tidal-hifi",
-  "version": "5.12.0",
+  "version": "5.11.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "tidal-hifi",
-      "version": "5.12.0",
+      "version": "5.11.0",
       "license": "MIT",
       "dependencies": {
         "@electron/remote": "^2.1.2",
         "axios": "^1.6.8",
+        "cors": "^2.8.5",
         "discord-rpc": "^4.0.1",
         "electron-store": "^8.2.0",
         "express": "^4.19.2",
@@ -21,6 +22,7 @@
       },
       "devDependencies": {
         "@mastermindzh/prettier-config": "^1.0.0",
+        "@types/cors": "^2.8.17",
         "@types/discord-rpc": "^4.0.8",
         "@types/express": "^4.17.21",
         "@types/node": "^20.10.6",
@@ -1030,6 +1032,15 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/cors": {
+      "version": "2.8.17",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
+      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/debug": {
       "version": "4.1.12",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
@@ -2679,6 +2690,18 @@
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/cosmiconfig": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
@@ -5983,6 +6006,14 @@
         "node": "*"
       }
     },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-inspect": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.12.0",
+  "version": "5.11.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -41,6 +41,7 @@
   "dependencies": {
     "@electron/remote": "^2.1.2",
     "axios": "^1.6.8",
+    "cors": "^2.8.5",
     "discord-rpc": "^4.0.1",
     "electron-store": "^8.2.0",
     "express": "^4.19.2",
@@ -51,6 +52,7 @@
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
+    "@types/cors": "^2.8.17",
     "@types/discord-rpc": "^4.0.8",
     "@types/express": "^4.17.21",
     "@types/node": "^20.10.6",

src/features/api/index.ts

@@ -5,12 +5,14 @@ import { settingsStore } from "../../scripts/settings";
 import { addCurrentInfo } from "./features/current";
 import { addPlaybackControl } from "./features/player";
 import { addLegacyApi } from "./legacy";
+import cors from "cors";
 
 /**
  * Function to enable TIDAL Hi-Fi's express api
  */
 export const startApi = (mainWindow: BrowserWindow) => {
   const expressApp = express();
+  expressApp.use(cors());
   expressApp.get("/", (req, res) => res.send("Hello World!"));
 
   // add features

src/models/mediaInfo.ts

@@ -1,5 +1,4 @@
 import { MediaStatus } from "./mediaStatus";
-import { MediaPlayerInfo } from "./mediaPlayerInfo";
 
 export interface MediaInfo {
   title: string;
@@ -14,5 +13,4 @@ export interface MediaInfo {
   durationInSeconds?: number;
   image: string;
   favorite: boolean;
-  player: MediaPlayerInfo;
 }

src/models/mediaPlayerInfo.ts

@@ -1,8 +0,0 @@
-import { RepeatState } from "./repeatState";
-import { MediaStatus } from "./mediaStatus";
-
-export interface MediaPlayerInfo {
-  status: MediaStatus;
-  shuffle: boolean;
-  repeat: RepeatState;
-}

src/models/repeatState.ts

@@ -1,5 +0,0 @@
-export enum RepeatState {
-  off = "off",
-  all = "all",
-  single = "single",
-}

src/pages/settings/settings.html

@@ -433,7 +433,7 @@
           <h4>TIDAL Hi-Fi</h4>
           <div class="about-section__version">
             <a target="_blank" rel="noopener"
-              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.12.0">5.12.0</a>
+              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.11.0">5.11.0</a>
           </div>
           <div class="about-section__links">
             <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"

src/preload.ts

@@ -19,7 +19,6 @@ import { downloadFile } from "./scripts/download";
 import { addHotkey } from "./scripts/hotkeys";
 import { settingsStore } from "./scripts/settings";
 import { setTitle } from "./scripts/window-functions";
-import { RepeatState } from "./models/repeatState";
 
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
 const appName = "TIDAL Hi-Fi";
@@ -30,8 +29,6 @@ let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
 let scrobbleWaitingForDelay = false;
 
 let currentlyPlaying = MediaStatus.paused;
-let currentRepeatState: RepeatState = RepeatState.off;
-let currentShuffleState = false;
 let currentMediaInfo: Options;
 let currentNotification: Electron.Notification;
 
@@ -351,23 +348,6 @@ function getCurrentlyPlayingStatus() {
   return status;
 }
 
-function getCurrentShuffleState() {
-  const shuffle = elements.get("shuffle");
-  return shuffle?.getAttribute("aria-checked") === "true";
-}
-
-function getCurrentRepeatState() {
-  const repeat = elements.get("repeat");
-  switch (repeat?.getAttribute("data-type")) {
-    case "button__repeatAll":
-      return RepeatState.all;
-    case "button__repeatSingle":
-      return RepeatState.single;
-    default:
-      return RepeatState.off;
-  }
-}
-
 /**
  * Convert the duration from MM:SS to seconds
  * @param {*} duration
@@ -531,21 +511,14 @@ setInterval(function () {
   const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
   const current = elements.getText("current");
   const currentStatus = getCurrentlyPlayingStatus();
-  const shuffleState = getCurrentShuffleState();
-  const repeatState = getCurrentRepeatState();
 
   const playStateChanged = currentStatus != currentlyPlaying;
-  const shuffleStateChanged = shuffleState != currentShuffleState;
-  const repeatStateChanged = repeatState != currentRepeatState;
-
-  const hasStateChanged = playStateChanged || shuffleStateChanged || repeatStateChanged;
 
   // update info if song changed or was just paused/resumed
-  if (titleOrArtistsChanged || hasStateChanged) {
+  if (titleOrArtistsChanged || playStateChanged) {
-    if (playStateChanged) currentlyPlaying = currentStatus;
+    if (playStateChanged) {
-    if (shuffleStateChanged) currentShuffleState = shuffleState;
+      currentlyPlaying = currentStatus;
-    if (repeatStateChanged) currentRepeatState = repeatState;
+    }
-
     skipArtistsIfFoundInSkippedArtistsList(artistsArray);
 
     const album = elements.getAlbumName();
@@ -564,12 +537,6 @@ setInterval(function () {
       image: "",
       icon: "",
       favorite: elements.isFavorite(),
-
-      player: {
-        status: currentStatus,
-        shuffle: shuffleState,
-        repeat: repeatState,
-      },
     };
 
     // update title, url and play info with new info

src/scripts/mediaInfo.ts

@@ -1,6 +1,5 @@
 import { MediaInfo } from "../models/mediaInfo";
 import { MediaStatus } from "../models/mediaStatus";
-import { RepeatState } from "../models/repeatState";
 
 export const mediaInfo = {
   title: "",
@@ -15,12 +14,6 @@ export const mediaInfo = {
   durationInSeconds: 0,
   image: "tidal-hifi-icon",
   favorite: false,
-
-  player: {
-    status: MediaStatus.paused as string,
-    shuffle: false,
-    repeat: RepeatState.off as string,
-  }
 };
 
 export const updateMediaInfo = (arg: MediaInfo) => {
@@ -36,10 +29,6 @@ export const updateMediaInfo = (arg: MediaInfo) => {
   mediaInfo.durationInSeconds = arg.durationInSeconds ?? 0;
   mediaInfo.image = propOrDefault(arg.image);
   mediaInfo.favorite = arg.favorite;
-
-  mediaInfo.player.status = propOrDefault(arg.player?.status);
-  mediaInfo.player.shuffle = arg.player.shuffle;
-  mediaInfo.player.repeat = propOrDefault(arg.player?.repeat);
 };
 
 /**