chore(deps): update axios to 1.13.0

chore(deps): update typescript-eslint monorepo to 8.46.2

.stylelintrc.json

@@ -1,7 +1,13 @@
 {
-  "plugins": ["stylelint-prettier"],
+  "plugins": [
-  "extends": ["stylelint-config-standard-scss"],
+    "stylelint-prettier"
-  "ignoreFiles": ["src/themes/**.scss"],
+  ],
+  "extends": [
+    "stylelint-config-standard-scss"
+  ],
+  "ignoreFiles": [
+    "src/themes/**.scss"
+  ],
   "rules": {
     "prettier/prettier": true,
     "scss/at-extend-no-missing-placeholder": null,

.vscode/launch.json

@@ -1,36 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      // we can use this to debug the main process
-      "name": "Electron: Main",
-      "type": "node",
-      "request": "launch",
-      "runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/electron",
-      "args": [
-        "${workspaceFolder}/ts-dist/main.js",
-        "--no-sandbox",
-        "--disable-gpu",
-        "--disable-software-rasterizer",
-        "--in-process-gpu",
-        "--inspect=0.0.0.0:5858",
-        "--remote-debugging-port=8315"
-      ],
-      "protocol": "inspector",
-      "env": {
-        "ELECTRON_DISABLE_SECURITY_WARNINGS": "false"
-      },
-      "outputCapture": "std"
-    },
-    // first run, then connect this to make sure we debug the UI
-    {
-      "name": "Electron: Renderer",
-      "type": "chrome",
-      "request": "attach",
-      "port": 8315,
-      "webRoot": "${workspaceFolder}",
-      "sourceMaps": true,
-      "skipFiles": ["<node_internals>/**"]
-    }
-  ]
-}

CHANGELOG.md

@@ -57,7 +57,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)
 - Updated most dependency versions
-
   - This includes Electron 31!
 
 - Added a channel selector so we can now use Tidal's staging environment directly from the app
@@ -149,12 +148,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Updated Electron to 28.1.1 (fixes [325](https://github.com/Mastermindzh/tidal-hifi/issues/325))
 - Updated dependencies to latest
-
   - added theme files to stylelint ignore
   - fixed other stylelint errors
 
 - Added functionality to favorite a song (fixes [#323](https://github.com/Mastermindzh/tidal-hifi/issues/323))
-
   - Added a hotkey to favorite ("Add to collection") songs: Control+a
   - Added the "favorite" field in the `mediaInfo` and the API `/current` endpoint
   - Added an endpoint to toggle favoriting a song: `http://localhost:47836/favorite/toggle`

SECURITY.md

@@ -8,3 +8,4 @@ Only the very latest 😄.
 
 If you find a vulnerability just add it as an issue.
 If there's an especially bad vulnerability that you don't want to make public just send me a private message (email, discord, wherever).
+

package.json

@@ -23,7 +23,6 @@
     "build-mac": "npm run builder -- -c ./build/electron-builder.yml -m",
     "build-base": "npm run builder -- -c ./build/electron-builder.base.yml",
     "prebuilder": "npm run compile",
-    "prettier": "prettier . --write",
     "builder": "electron-builder --publish=never",
     "sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css && sass --no-source-map src/themes:themes",
     "style-lint": "npx stylelint **/*.scss",
@@ -44,14 +43,14 @@
     "@electron/remote": "^2.1.3",
     "@types/swagger-jsdoc": "^6.0.4",
     "@xhayper/discord-rpc": "1.3.0",
-    "axios": "^1.10.0",
+    "axios": "^1.12.0",
     "cors": "^2.8.5",
     "electron-store": "^8.2.0",
     "express": "^5.1.0",
     "hotkeys-js": "^3.13.15",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "1.91.0",
+    "sass": "1.93.2",
     "swagger-ui-express": "^5.0.1"
   },
   "devDependencies": {
@@ -74,7 +73,7 @@
     "prettier": "^3.6.2",
     "stylelint": "^16.21.1",
     "stylelint-config-standard": "^39.0.0",
-    "stylelint-config-standard-scss": "^15.0.1",
+    "stylelint-config-standard-scss": "^16.0.0",
     "stylelint-prettier": "^5.0.3",
     "swagger-jsdoc": "^6.2.8",
     "ts-node": "^10.9.2",

src/TidalControllers/DomController/DomControllerOptions.ts

@@ -1,6 +0,0 @@
-export type DomControllerOptions = {
-  /**
-   * Interval that tidal-hifi scrapes the dom for information
-   */
-  refreshInterval: number;
-};

src/TidalControllers/DomController/DomTidalController.ts

@@ -1,354 +0,0 @@
-import { convertDurationToSeconds } from "../../features/time/parse";
-import { MediaInfo } from "../../models/mediaInfo";
-import { MediaStatus } from "../../models/mediaStatus";
-import { RepeatState } from "../../models/repeatState";
-import { TidalController } from "../TidalController";
-import { DomControllerOptions } from "./DomControllerOptions";
-
-export class DomTidalController implements TidalController<DomControllerOptions> {
-  private updateSubscriber: (state: Partial<MediaInfo>) => void;
-  private currentlyPlaying = MediaStatus.paused;
-  private currentRepeatState: RepeatState = RepeatState.off;
-  private currentShuffleState = false;
-
-  private readonly elements = {
-    play: '*[data-test="play"]',
-    pause: '*[data-test="pause"]',
-    next: '*[data-test="next"]',
-    previous: 'button[data-test="previous"]',
-    title: '*[data-test^="footer-track-title"]',
-    artists: '*[data-test^="grid-item-detail-text-title-artist"]',
-    home: '*[data-test="menu--home"]',
-    back: '[title^="Back"]',
-    forward: '[title^="Next"]',
-    search: '[class^="searchField"]',
-    shuffle: '*[data-test="shuffle"]',
-    repeat: '*[data-test="repeat"]',
-    account: '*[data-test^="profile-image-button"]',
-    settings: '*[data-test^="sidebar-menu-button"]',
-    openSettings: '*[data-test^="open-settings"]',
-    media: '*[data-test="current-media-imagery"]',
-    image: "img",
-    current: '*[data-test="current-time"]',
-    duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
-    bar: '*[data-test="progress-bar"]',
-    footer: "#footerPlayer",
-    mediaItem: "[data-type='mediaItem']",
-    album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
-    playing_from: '*[class^="playingFrom"] span:nth-child(2)',
-    queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
-    currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
-    album_name_cell: '[class^="album"]',
-    tracklist_row: '[data-test="tracklist-row"]',
-    volume: '*[data-test="volume"]',
-    favorite: '*[data-test="footer-favorite-button"]',
-    /**
-     * Get an element from the dom
-     * @param {*} key key in elements object to fetch
-     */
-    get: function (key: string) {
-      return globalThis.document.querySelector(this[key.toLowerCase()]) ?? "";
-    },
-
-    /**
-     * Get the icon of the current media
-     */
-    getSongIcon: function () {
-      const figure = this.get("media");
-
-      if (figure) {
-        const mediaElement = figure.querySelector(this["image"]);
-        if (mediaElement) {
-          return mediaElement.src.replace("80x80", "640x640");
-        }
-      }
-
-      return "";
-    },
-
-    /**
-     * returns an array of all artists in the current media
-     * @returns {Array} artists
-     */
-    getArtistsArray: function () {
-      const footer = this.get("footer");
-
-      if (footer) {
-        const artists = footer.querySelectorAll(this.artists);
-        if (artists)
-          return Array.from(artists).map((artist) => (artist as HTMLElement).textContent);
-      }
-      return [];
-    },
-
-    /**
-     * unify the artists array into a string separated by commas
-     * @param {Array} artistsArray
-     * @returns {String} artists
-     */
-    getArtistsString: function (artistsArray: string[]) {
-      if (artistsArray.length > 0) return artistsArray.join(", ");
-      return "unknown artist(s)";
-    },
-
-    getAlbumName: function () {
-      try {
-        //If listening to an album, get its name from the header title
-        if (globalThis.location.href.includes("/album/")) {
-          const albumName = globalThis.document.querySelector(this.album_header_title);
-          if (albumName) {
-            return albumName.textContent;
-          }
-          //If listening to a playlist or a mix, get album name from the list
-        } else if (
-          globalThis.location.href.includes("/playlist/") ||
-          globalThis.location.href.includes("/mix/")
-        ) {
-          if (this.currentlyPlaying === MediaStatus.playing) {
-            // find the currently playing element from the list (which might be in an album icon), traverse back up to the mediaItem (row) and select the album cell.
-            // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent
-            const row = window.document
-              .querySelector(this.currentlyPlaying)
-              .closest(this.mediaItem);
-            if (row) {
-              return row.querySelector(this.album_name_cell).textContent;
-            }
-          }
-        }
-
-        // see whether we're on the queue page and get it from there
-        const queueAlbumName = this.getText("queue_album");
-        if (queueAlbumName) {
-          return queueAlbumName;
-        }
-
-        return "";
-      } catch {
-        return "";
-      }
-    },
-
-    isMuted: function () {
-      return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
-    },
-
-    isFavorite: function () {
-      return this.get("favorite").getAttribute("aria-checked") === "true";
-    },
-
-    /**
-     * Shorthand function to get the text of a dom element
-     * @param {*} key key in elements object to fetch
-     */
-    getText: function (key: string) {
-      const element = this.get(key);
-      return element ? element.textContent : "";
-    },
-
-    /**
-     * Shorthand function to click a dom element
-     * @param {*} key key in elements object to fetch
-     */
-    click: function (key: string) {
-      this.get(key).click();
-      return this;
-    },
-
-    /**
-     * Shorthand function to focus a dom element
-     * @param {*} key key in elements object to fetch
-     */
-    focus: function (key: string) {
-      return this.get(key).focus();
-    },
-  };
-
-  onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void {
-    this.updateSubscriber = callback;
-  }
-
-  bootstrap(options: DomControllerOptions): void {
-    /**
-     * Checks if Tidal is playing a video or song by grabbing the "a" element from the title.
-     * If it's a song it returns the track URL, if not it will return undefined
-     */
-    const getTrackURL = () => {
-      const id = this.getTrackId();
-      return `https://tidal.com/browse/track/${id}`;
-    };
-
-    setInterval(async () => {
-      const title = this.getTitle();
-      const artistsArray = this.getArtists();
-      const artistsString = this.getArtistsString();
-
-      const current = this.getCurrentTime();
-      const currentStatus = this.getCurrentlyPlayingStatus();
-      const shuffleState = this.getCurrentShuffleState();
-      const repeatState = this.getCurrentRepeatState();
-
-      const playStateChanged = currentStatus != this.currentlyPlaying;
-      const shuffleStateChanged = shuffleState != this.currentShuffleState;
-      const repeatStateChanged = repeatState != this.currentRepeatState;
-
-      if (playStateChanged) this.currentlyPlaying = currentStatus;
-      if (shuffleStateChanged) this.currentShuffleState = shuffleState;
-      if (repeatStateChanged) this.currentRepeatState = repeatState;
-
-      const album = this.getAlbumName();
-      const duration = this.getDuration();
-      const updatedInfo = {
-        title,
-        artists: artistsString,
-        artistsArray,
-        album: album,
-        playingFrom: this.getPlayingFrom(),
-        status: currentStatus,
-        url: getTrackURL(),
-        current,
-        currentInSeconds: convertDurationToSeconds(current),
-        duration,
-        durationInSeconds: convertDurationToSeconds(duration),
-        image: this.getSongIcon(),
-        favorite: this.isFavorite(),
-        player: {
-          status: currentStatus,
-          shuffle: shuffleState,
-          repeat: repeatState,
-        },
-      };
-
-      this.updateSubscriber(updatedInfo);
-    }, options.refreshInterval);
-  }
-
-  playPause = (): void => {
-    const play = this.elements.get("play");
-
-    if (play) {
-      this.elements.click("play");
-    } else {
-      this.elements.click("pause");
-    }
-  };
-
-  goToHome(): void {
-    this.elements.click("home");
-  }
-
-  openSettings(): void {
-    this.elements.click("settings");
-    setTimeout(() => {
-      this.elements.click("openSettings");
-    }, 100);
-  }
-
-  toggleFavorite(): void {
-    this.elements.click("favorite");
-  }
-
-  back(): void {
-    this.elements.click("back");
-  }
-  forward(): void {
-    this.elements.click("forward");
-  }
-  repeat(): void {
-    this.elements.click("repeat");
-  }
-
-  next(): void {
-    this.elements.click("next");
-  }
-  previous(): void {
-    this.elements.click("previous");
-  }
-  toggleShuffle(): void {
-    this.elements.click("shuffle");
-  }
-  getCurrentlyPlayingStatus() {
-    const pause = this.elements.get("pause");
-
-    // if pause button is visible tidal is playing
-    if (pause) {
-      return MediaStatus.playing;
-    } else {
-      return MediaStatus.paused;
-    }
-  }
-
-  getCurrentShuffleState() {
-    const shuffle = this.elements.get("shuffle");
-    return shuffle?.getAttribute("aria-checked") === "true";
-  }
-
-  getCurrentRepeatState() {
-    const repeat = this.elements.get("repeat");
-    switch (repeat?.getAttribute("data-type")) {
-      case "button__repeatAll":
-        return RepeatState.all;
-      case "button__repeatSingle":
-        return RepeatState.single;
-      default:
-        return RepeatState.off;
-    }
-  }
-
-  play(): void {
-    this.playPause();
-  }
-  pause(): void {
-    this.playPause();
-  }
-  stop(): void {
-    this.playPause();
-  }
-
-  getCurrentPosition() {
-    return this.elements.getText("current");
-  }
-  getCurrentPositionInSeconds(): number {
-    return convertDurationToSeconds(this.getCurrentPosition());
-  }
-
-  getTrackId(): string {
-    const URLelement = this.elements.get("title").querySelector("a");
-    if (URLelement !== null) {
-      const id = URLelement.href.replace(/\D/g, "");
-      return id;
-    }
-
-    return window.location.toString();
-  }
-
-  getCurrentTime(): string {
-    return this.elements.getText("current");
-  }
-  getDuration(): string {
-    return this.elements.getText("duration");
-  }
-
-  getAlbumName(): string {
-    return this.elements.getAlbumName();
-  }
-  getTitle(): string {
-    return this.elements.getText("title");
-  }
-  getArtists(): string[] {
-    return this.elements.getArtistsArray();
-  }
-
-  getArtistsString(): string {
-    return this.elements.getArtistsString(this.getArtists());
-  }
-  getPlayingFrom(): string {
-    return this.elements.getText("playing_from");
-  }
-
-  isFavorite(): boolean {
-    return this.elements.isFavorite();
-  }
-  getSongIcon(): string {
-    return this.elements.getSongIcon();
-  }
-}

src/TidalControllers/TidalController.ts

@@ -1,53 +0,0 @@
-import { MediaInfo } from "../models/mediaInfo";
-import { MediaStatus } from "../models/mediaStatus";
-import { RepeatState } from "../models/repeatState";
-
-export interface TidalController<TBootstrapOptions = object> {
-  goToHome(): void;
-  openSettings(): void;
-
-  /**
-   * Play or pause the current media
-   */
-  playPause(): void;
-  play(): void;
-  pause(): void;
-  stop(): void;
-  toggleFavorite(): void;
-  back(): void;
-  forward(): void;
-  repeat(): void;
-  next(): void;
-  previous(): void;
-  toggleShuffle(): void;
-
-  /**
-   * Optional setup/startup/bootstrap for this controller
-   */
-  bootstrap(options: TBootstrapOptions): void;
-
-  /**
-   * Method that triggers every time the MediaInfo updates
-   * @param callback function that receives the updated media info
-   */
-  onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void;
-
-  /**
-   * Update the current status of tidal (e.g playing or paused)
-   */
-  getCurrentlyPlayingStatus(): MediaStatus;
-  getCurrentShuffleState(): boolean;
-  getCurrentRepeatState(): RepeatState;
-  getCurrentPosition(): string;
-  getCurrentPositionInSeconds(): number;
-  getTrackId(): string;
-  getCurrentTime(): string;
-  getDuration(): string;
-  getAlbumName(): string;
-  getTitle(): string;
-  getArtists(): string[];
-  getArtistsString(): string;
-  getPlayingFrom(): string;
-  getSongIcon(): string;
-  isFavorite(): boolean;
-}

src/TidalControllers/apiController/TidalApiController.ts

@@ -1,137 +0,0 @@
-import { Logger } from "../../features/logger";
-import { MediaInfo } from "../../models/mediaInfo";
-import { MediaStatus } from "../../models/mediaStatus";
-import { RepeatState } from "../../models/repeatState";
-import { DomTidalController } from "../DomController/DomTidalController";
-import { TidalController } from "../TidalController";
-
-export class TidalApiController implements TidalController {
-  public domMediaController: TidalController;
-
-  constructor() {
-    this.domMediaController = new DomTidalController();
-    Logger.log("[TidalApiController] - Initialized domController as a backup controller");
-  }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void {
-    globalThis.alert("method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  bootstrap(): void {
-    globalThis.alert("Method not implemented: ");
-    throw new Error("Method not implemented.");
-  }
-  // example of using the original domMediaController as a fallback
-  goToHome(): void {
-    this.domMediaController.goToHome();
-  }
-
-  getDuration(): string {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getAlbumName(): string {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getTitle(): string {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getArtists(): string[] {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getArtistsString(): string {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getPlayingFrom(): string {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  isFavorite(): boolean {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getSongIcon(): string {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getCurrentTime(): string {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getCurrentPosition(): string {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getCurrentPositionInSeconds(): number {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getTrackId(): string {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  play(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  pause(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  stop(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getCurrentShuffleState(): boolean {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getCurrentRepeatState(): RepeatState {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  getCurrentlyPlayingStatus(): MediaStatus {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  back(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  forward(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  repeat(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  next(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  previous(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  toggleShuffle(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  openSettings(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  toggleFavorite(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-  playPause(): void {
-    globalThis.alert("Method not implemented");
-    throw new Error("Method not implemented.");
-  }
-}

src/constants/controller.ts

@@ -1,4 +0,0 @@
-export const tidalControllers = {
-  domController: "domController",
-  tidalApiController: "tidalApiController",
-};

src/constants/settings.ts

@@ -13,7 +13,6 @@ export const settings = {
   advanced: {
     root: "advanced",
     tidalUrl: "advanced.tidalUrl",
-    controllerType: "advanced.controllerType",
   },
   api: "api",
   apiSettings: {

src/features/api/swagger.json

@@ -21,9 +21,7 @@
     "/current": {
       "get": {
         "summary": "Get current media info",
-        "tags": [
+        "tags": ["current"],
-          "current"
-        ],
         "responses": {
           "200": {
             "description": "Current media info",
@@ -41,9 +39,7 @@
     "/current/image": {
       "get": {
         "summary": "Get current media image",
-        "tags": [
+        "tags": ["current"],
-          "current"
-        ],
         "responses": {
           "200": {
             "description": "Current media image",
@@ -65,9 +61,7 @@
     "/player/play": {
       "post": {
         "summary": "Play the current media",
-        "tags": [
+        "tags": ["player"],
-          "player"
-        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -85,9 +79,7 @@
     "/player/favorite/toggle": {
       "post": {
         "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": [
+        "tags": ["player"],
-          "player"
-        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -105,9 +97,7 @@
     "/player/pause": {
       "post": {
         "summary": "Pause the current media",
-        "tags": [
+        "tags": ["player"],
-          "player"
-        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -125,9 +115,7 @@
     "/player/next": {
       "post": {
         "summary": "Play the next song",
-        "tags": [
+        "tags": ["player"],
-          "player"
-        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -145,9 +133,7 @@
     "/player/previous": {
       "post": {
         "summary": "Play the previous song",
-        "tags": [
+        "tags": ["player"],
-          "player"
-        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -165,9 +151,7 @@
     "/player/shuffle/toggle": {
       "post": {
         "summary": "Play the previous song",
-        "tags": [
+        "tags": ["player"],
-          "player"
-        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -185,9 +169,7 @@
     "/player/repeat/toggle": {
       "post": {
         "summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
-        "tags": [
+        "tags": ["player"],
-          "player"
-        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -205,9 +187,7 @@
     "/player/playpause": {
       "post": {
         "summary": "Start playing the media if paused, or pause the media if playing",
-        "tags": [
+        "tags": ["player"],
-          "player"
-        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -225,9 +205,7 @@
     "/settings/skipped-artists": {
       "get": {
         "summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
-        "tags": [
+        "tags": ["settings"],
-          "settings"
-        ],
         "responses": {
           "200": {
             "description": "The list book.",
@@ -243,9 +221,7 @@
       },
       "post": {
         "summary": "Add new artists to the list of skipped artists",
-        "tags": [
+        "tags": ["settings"],
-          "settings"
-        ],
         "requestBody": {
           "required": true,
           "content": {
@@ -266,9 +242,7 @@
     "/settings/skipped-artists/delete": {
       "post": {
         "summary": "Remove artists from the list of skipped artists",
-        "tags": [
+        "tags": ["settings"],
-          "settings"
-        ],
         "requestBody": {
           "required": true,
           "content": {
@@ -289,9 +263,7 @@
     "/settings/skipped-artists/current": {
       "post": {
         "summary": "Add the current artist to the list of skipped artists",
-        "tags": [
+        "tags": ["settings"],
-          "settings"
-        ],
         "responses": {
           "200": {
             "description": "Ok"
@@ -300,9 +272,7 @@
       },
       "delete": {
         "summary": "Remove the current artist from the list of skipped artists",
-        "tags": [
+        "tags": ["settings"],
-          "settings"
-        ],
         "responses": {
           "200": {
             "description": "Ok"
@@ -313,9 +283,7 @@
     "/image": {
       "get": {
         "summary": "Get current image",
-        "tags": [
+        "tags": ["legacy"],
-          "legacy"
-        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -338,9 +306,7 @@
     "/play": {
       "get": {
         "summary": "Play the current media",
-        "tags": [
+        "tags": ["legacy"],
-          "legacy"
-        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -359,9 +325,7 @@
     "/favorite/toggle": {
       "get": {
         "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": [
+        "tags": ["legacy"],
-          "legacy"
-        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -380,9 +344,7 @@
     "/pause": {
       "get": {
         "summary": "Pause the current media",
-        "tags": [
+        "tags": ["legacy"],
-          "legacy"
-        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -401,9 +363,7 @@
     "/next": {
       "get": {
         "summary": "Play the next song",
-        "tags": [
+        "tags": ["legacy"],
-          "legacy"
-        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -422,9 +382,7 @@
     "/previous": {
       "get": {
         "summary": "Play the previous song",
-        "tags": [
+        "tags": ["legacy"],
-          "legacy"
-        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -443,9 +401,7 @@
     "/playpause": {
       "get": {
         "summary": "Toggle play/pause",
-        "tags": [
+        "tags": ["legacy"],
-          "legacy"
-        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -558,10 +514,7 @@
         "items": {
           "type": "string"
         },
-        "example": [
+        "example": ["Artist1", "Artist2"]
-          "Artist1",
-          "Artist2"
-        ]
       }
     }
   },

src/features/icon/downloadIcon.ts

@@ -1,15 +0,0 @@
-import { downloadFile } from "../../scripts/download";
-import { Logger } from "../logger";
-
-export const downloadIcon = async (imagePath: string, destination: string): Promise<string> => {
-  if (imagePath.startsWith("http")) {
-    try {
-      return await downloadFile(imagePath, destination);
-    } catch (error) {
-      Logger.log("Downloading file failed", { error });
-      return "";
-    }
-  }
-
-  return "";
-};

src/features/tidal/url.ts

@@ -1,15 +0,0 @@
-/**
- * Build a track url given the id
- */
-export const getTrackURL = (trackId: string) => {
-  return `https://tidal.com/browse/track/${trackId}`;
-};
-
-/**
- * Retrieve the universal link given a regular track link
- * @param trackLink
- * @returns
- */
-export const getUniversalLink = (trackLink: string) => {
-  return `${trackLink}?u`;
-};

src/main.ts

@@ -32,8 +32,7 @@ const PROTOCOL_PREFIX = "tidal";
 const windowPreferences = {
   sandbox: false,
   plugins: true,
-  devTools: true, // Ensure devTools is enabled for debugging
+  devTools: true, // I like tinkering, others might too
-  contextIsolation: false, // Disable context isolation for debugging
 };
 
 setDefaultFlags(app);

src/models/mediaInfo.ts

@@ -1,11 +1,9 @@
 import { MediaPlayerInfo } from "./mediaPlayerInfo";
 import { MediaStatus } from "./mediaStatus";
-import { RepeatState } from "./repeatState";
 
 export interface MediaInfo {
   title: string;
   artists: string;
-  artistsArray?: string[];
   album: string;
   icon: string;
   status: MediaStatus;
@@ -19,30 +17,3 @@ export interface MediaInfo {
   favorite: boolean;
   player?: MediaPlayerInfo;
 }
-
-export const getEmptyMediaInfo = () => {
-  const emptyState: MediaInfo = {
-    title: "",
-    artists: "",
-    artistsArray: [],
-    album: "",
-    playingFrom: "",
-    status: MediaStatus.playing,
-    url: "",
-    current: "00:00",
-    currentInSeconds: 100,
-    duration: "00:00",
-    durationInSeconds: 100,
-    image: "",
-    icon: "",
-    favorite: true,
-
-    player: {
-      status: MediaStatus.playing,
-      shuffle: true,
-      repeat: RepeatState.all,
-    },
-  };
-
-  return emptyState;
-};

src/pages/settings/preload.ts

@@ -61,8 +61,7 @@ let adBlock: HTMLInputElement,
   discord_show_song: HTMLInputElement,
   discord_show_idle: HTMLInputElement,
   discord_idle_text: HTMLInputElement,
-  discord_using_text: HTMLInputElement,
+  discord_using_text: HTMLInputElement;
-  controllerType: HTMLSelectElement;
 
 addCustomCss(app);
 
@@ -158,7 +157,6 @@ function refreshSettings() {
     discord_show_idle.checked = settingsStore.get(settings.discord.showIdle);
     discord_idle_text.value = settingsStore.get(settings.discord.idleText);
     discord_using_text.value = settingsStore.get(settings.discord.usingText);
-    controllerType.value = settingsStore.get(settings.advanced.controllerType);
 
     // set state of all switches with additional settings
     Object.values(switchesWithSettings).forEach((settingSwitch) => {
@@ -279,7 +277,6 @@ window.addEventListener("DOMContentLoaded", () => {
   discord_show_idle = get("discord_show_idle");
   discord_using_text = get("discord_using_text");
   discord_idle_text = get("discord_idle_text");
-  controllerType = get<HTMLSelectElement>("controllerType");
 
   refreshSettings();
   addInputListener(adBlock, settings.adBlock);
@@ -325,5 +322,4 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(discord_show_idle, settings.discord.showIdle);
   addInputListener(discord_idle_text, settings.discord.idleText);
   addInputListener(discord_using_text, settings.discord.usingText);
-  addSelectListener(controllerType, settings.advanced.controllerType);
 });

src/pages/settings/settings.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta http-equiv="X-UA-Compatible" content="ie=edge" />
   <link rel="stylesheet" href="./settings.css" />
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.0/css/font-awesome.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.1/css/font-awesome.min.css">
 </head>
 
 <body class="settings-window">
@@ -109,10 +109,7 @@
             <div class="group__option">
               <div class="group__description">
                 <h4>Static Window Title</h4>
-                <p>
+                <p>Makes the window title "TIDAL Hi-Fi" instead of changing to the currently playing song.</p>
-                  Makes the window title "TIDAL Hi-Fi" instead of changing to the currently
-                  playing song.
-                </p>
               </div>
               <label class="switch">
                 <input id="staticWindowTitle" type="checkbox" />
@@ -160,8 +157,8 @@
             <p class="group__title">API</p>
             <div class="group__description">
               <p>
-                TIDAL Hi-Fi has a built-in web API to allow users to get current media
+                TIDAL Hi-Fi has a built-in web API to allow users to get current media information.
-                information. You can optionally enable playback control as well.
+                You can optionally enable playback control as well.
               </p>
             </div>
             <div class="group__option">
@@ -183,8 +180,7 @@
             <div class="group__option">
               <div class="group__description">
                 <h4>API hostname</h4>
-                <p>
+                <p>By default (127.0.0.1) only local apps can interface with the API. <br />
-                  By default (127.0.0.1) only local apps can interface with the API. <br />
                   Change to 0.0.0.0 to allow <strong>anyone</strong> to interact with it. <br />
                   Other options are available
                 </p>
@@ -240,6 +236,7 @@
               </label>
             </div>
             <div id="discord_options">
+
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <h4>Show Idle Text</h4>
@@ -262,9 +259,7 @@
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <h4>Using Tidal Text</h4>
-                  <p>
+                  <p>The text displayed on Discord's rich presence while "showSong" is turned off</p>
-                    The text displayed on Discord's rich presence while "showSong" is turned off
-                  </p>
                   <input id="discord_using_text" type="text" class="text-input" name="discord_using_text" />
                 </div>
               </div>
@@ -281,6 +276,7 @@
               </div>
 
               <div id="discord_show_song_options" class="hidden">
+
                 <div class="group__option" class="hidden">
                   <div class="group__description">
                     <h4>Include timestamps</h4>
@@ -308,6 +304,7 @@
                   </div>
                 </div>
               </div>
+
             </div>
           </div>
           <div class="group">
@@ -326,10 +323,7 @@
               <div class="group__option">
                 <div class="group__description">
                   <h4>ListenBrainz API Url</h4>
-                  <p>
+                  <p>There are multiple instances for ListenBrainz you can set the corresponding API url below.</p>
-                    There are multiple instances for ListenBrainz you can set the corresponding
-                    API url below.
-                  </p>
                   <input id="ListenBrainzAPI" type="text" class="text-input" name="ListenBrainzAPI" />
                 </div>
               </div>
@@ -343,10 +337,8 @@
             </div>
             <div class="group__description">
               <h4>ScrobbleDelay</h4>
-              <p>
+              <p>The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when you fast forward
-                The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when
+                immediately</p>
-                you fast forward immediately
-              </p>
               <input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" />
             </div>
           </div>
@@ -359,9 +351,10 @@
               <div class="group__description">
                 <h4>Update frequency</h4>
                 <p>
-                  The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback
+                  The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback info by scraping the
-                  info by scraping the website. The default of 500 seems to work in more cases but
+                  website.
-                  if you are fine with a bit more resource usage you can decrease it as well.
+                  The default of 500 seems to work in more cases but if you are fine with a bit more resource usage you
+                  can decrease it as well.
                 </p>
                 <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
               </div>
@@ -376,19 +369,7 @@
                 </p>
                 <select class="select-input" id="channel" name="channel">
                   <option value="https://listen.tidal.com">Stable (listen.tidal.com)</option>
-                  <option value="https://listen.stage.tidal.com">
+                  <option value="https://listen.stage.tidal.com">Staging (listen.stage.tidal.com)</option>
-                    Staging (listen.stage.tidal.com)
-                  </option>
-                </select>
-              </div>
-            </div>
-            <div class="group__option">
-              <div class="group__description">
-                <h4>Controller Type</h4>
-                <p>Select the type of controller to use.</p>
-                <select id="controllerType" class="select-input">
-                  <option value="domController">DOM Controller</option>
-                  <option value="tidalApiController">Tidal Api Controller (beta)</option>
                 </select>
               </div>
             </div>
@@ -434,8 +415,7 @@
               <div class="group__description">
                 <h4>Wayland support</h4>
                 <p>
-                  Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland
+                  Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland window system.
-                  window system.
                 </p>
               </div>
               <label class="switch">
@@ -453,8 +433,7 @@
               <div class="group__description">
                 <h4>Custom CSS</h4>
                 <p>
-                  The css that you put in here will be injected into a style tag in the head of
+                  The css that you put in here will be injected into a style tag in the head of the document.
-                  the document.
                 </p>
               </div>
             </div>
@@ -469,7 +448,9 @@
                 <p>
                   Select a theme below or "Tidal - Default" to return to the original Tidal look.
                 </p>
-                <select class="select-input" id="themesList" name="themesList"></select>
+                <select class="select-input" id="themesList" name="themesList">
+
+                </select>
               </div>
             </div>
 
@@ -477,14 +458,14 @@
               <div class="group__description">
                 <h4>Upload new themes</h4>
                 <p>
-                  Click the button and select the css files to import. They will be added to the
+                  Click the button and select the css files to import. They will be added to the theme list
-                  theme list automatically.
+                  automatically.
                 </p>
                 <div class="file-drop-area">
                   <div>
                     <span class="file-btn">Choose files</span>
                     <span id="file-message" class="file-msg">or drag and drop files here</span>
-                    <input id="theme-files" class="file-input" type="file" accept=".css" multiple />
+                    <input id="theme-files" class="file-input" type="file" accept=".css" multiple>
                   </div>
                 </div>
               </div>

src/preload.ts

@@ -1,10 +1,8 @@
 import { app, dialog, Notification } from "@electron/remote";
 import { clipboard, ipcRenderer } from "electron";
 import Player from "mpris-service";
-import { tidalControllers } from "./constants/controller";
 import { globalEvents } from "./constants/globalEvents";
 import { settings } from "./constants/settings";
-import { downloadIcon } from "./features/icon/downloadIcon";
 import {
   ListenBrainz,
   ListenBrainzConstants,
@@ -12,57 +10,185 @@ import {
 } from "./features/listenbrainz/listenbrainz";
 import { StoreData } from "./features/listenbrainz/models/storeData";
 import { Logger } from "./features/logger";
+import { SharingService } from "./features/sharingService/sharingService";
 import { addCustomCss } from "./features/theming/theming";
-import { getTrackURL, getUniversalLink } from "./features/tidal/url";
 import { convertDurationToSeconds } from "./features/time/parse";
-import { getEmptyMediaInfo, MediaInfo } from "./models/mediaInfo";
+import { MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
+import { RepeatState } from "./models/repeatState";
+import { downloadFile } from "./scripts/download";
 import { addHotkey } from "./scripts/hotkeys";
 import { ObjectToDotNotation } from "./scripts/objectUtilities";
 import { settingsStore } from "./scripts/settings";
 import { setTitle } from "./scripts/window-functions";
-import { TidalApiController } from "./TidalControllers/apiController/TidalApiController";
-import { DomControllerOptions } from "./TidalControllers/DomController/DomControllerOptions";
-import { DomTidalController } from "./TidalControllers/DomController/DomTidalController";
-import { TidalController } from "./TidalControllers/TidalController";
 
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
-const staticTitle = "TIDAL Hi-Fi";
-
 let currentSong = "";
 let player: Player;
+let currentPlayStatus = MediaStatus.paused;
 let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
 let scrobbleWaitingForDelay = false;
 
+let currentlyPlaying = MediaStatus.paused;
+let currentRepeatState: RepeatState = RepeatState.off;
+let currentShuffleState = false;
+let currentMediaInfo: MediaInfo;
 let currentNotification: Electron.Notification;
 
-let tidalController: TidalController;
+const elements = {
-let controllerOptions = {};
+  play: '*[data-test="play"]',
-let currentMediaInfo = getEmptyMediaInfo();
+  pause: '*[data-test="pause"]',
+  next: '*[data-test="next"]',
+  previous: 'button[data-test="previous"]',
+  title: '*[data-test^="footer-track-title"]',
+  artists: '*[data-test^="grid-item-detail-text-title-artist"]',
+  home: '*[data-test="menu--home"]',
+  back: '[title^="Back"]',
+  forward: '[title^="Next"]',
+  search: '[class^="searchField"]',
+  shuffle: '*[data-test="shuffle"]',
+  repeat: '*[data-test="repeat"]',
+  account: '*[data-test^="profile-image-button"]',
+  settings: '*[data-test^="sidebar-menu-button"]',
+  openSettings: '*[data-test^="open-settings"]',
+  media: '*[data-test="current-media-imagery"]',
+  image: "img",
+  current: '*[data-test="current-time"]',
+  duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
+  bar: '*[data-test="progress-bar"]',
+  footer: "#footerPlayer",
+  mediaItem: "[data-type='mediaItem']",
+  album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
+  playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
+  queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
+  currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
+  album_name_cell: '[class^="album"]',
+  tracklist_row: '[data-test="tracklist-row"]',
+  volume: '*[data-test="volume"]',
+  favorite: '*[data-test="footer-favorite-button"]',
+  /**
+   * Get an element from the dom
+   * @param {*} key key in elements object to fetch
+   */
+  get: function (key: string) {
+    return window.document.querySelector(this[key.toLowerCase()]);
+  },
 
-switch (settingsStore.get(settings.advanced.controllerType)) {
+  /**
-  case tidalControllers.tidalApiController: {
+   * Get the icon of the current media
-    tidalController = new TidalApiController();
+   */
-    Logger.log("TidalApiController initialized");
+  getSongIcon: function () {
-    break;
+    const figure = this.get("media");
+
+    if (figure) {
+      const mediaElement = figure.querySelector(this["image"]);
+      if (mediaElement) {
+        return mediaElement.src.replace("80x80", "640x640");
+      }
     }
 
-  default: {
+    return "";
-    tidalController = new DomTidalController();
+  },
-    const domControllerOptions: DomControllerOptions = {
+
-      refreshInterval: getDomUpdateFrequency(),
+  /**
-    };
+   * returns an array of all artists in the current media
-    controllerOptions = domControllerOptions;
+   * @returns {Array} artists
-    Logger.log("domController initialized");
+   */
-    break;
+  getArtistsArray: function () {
+    const footer = this.get("footer");
+
+    if (footer) {
+      const artists = footer.querySelectorAll(this.artists);
+      if (artists) return Array.from(artists).map((artist) => (artist as HTMLElement).textContent);
     }
-}
+    return [];
+  },
+
+  /**
+   * unify the artists array into a string separated by commas
+   * @param {Array} artistsArray
+   * @returns {String} artists
+   */
+  getArtistsString: function (artistsArray: string[]) {
+    if (artistsArray.length > 0) return artistsArray.join(", ");
+    return "unknown artist(s)";
+  },
+
+  getAlbumName: function () {
+    try {
+      //If listening to an album, get its name from the header title
+      if (globalThis.location.href.includes("/album/")) {
+        const albumName = globalThis.document.querySelector(this.album_header_title);
+        if (albumName) {
+          return albumName.textContent;
+        }
+        //If listening to a playlist or a mix, get album name from the list
+      } else if (
+        globalThis.location.href.includes("/playlist/") ||
+        globalThis.location.href.includes("/mix/")
+      ) {
+        if (this.currentlyPlaying === MediaStatus.playing) {
+          // find the currently playing element from the list (which might be in an album icon), traverse back up to the mediaItem (row) and select the album cell.
+          // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent
+          const row = window.document.querySelector(this.currentlyPlaying).closest(this.mediaItem);
+          if (row) {
+            return row.querySelector(this.album_name_cell).textContent;
+          }
+        }
+      }
+
+      // see whether we're on the queue page and get it from there
+      const queueAlbumName = this.getText("queue_album");
+      if (queueAlbumName) {
+        return queueAlbumName;
+      }
+
+      return "";
+    } catch {
+      return "";
+    }
+  },
+
+  isMuted: function () {
+    return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
+  },
+
+  isFavorite: function () {
+    return this.get("favorite").getAttribute("aria-checked") === "true";
+  },
+
+  /**
+   * Shorthand function to get the text of a dom element
+   * @param {*} key key in elements object to fetch
+   */
+  getText: function (key: string) {
+    const element = this.get(key);
+    return element ? element.textContent : "";
+  },
+
+  /**
+   * Shorthand function to click a dom element
+   * @param {*} key key in elements object to fetch
+   */
+  click: function (key: string) {
+    this.get(key).click();
+    return this;
+  },
+
+  /**
+   * Shorthand function to focus a dom element
+   * @param {*} key key in elements object to fetch
+   */
+  focus: function (key: string) {
+    return this.get(key).focus();
+  },
+};
 
 /**
  * Get the update frequency from the store
  * make sure it returns a number, if not use the default
  */
-function getDomUpdateFrequency() {
+function getUpdateFrequency() {
   const storeValue = settingsStore.get<string, number>(settings.updateFrequency);
   const defaultValue = 500;
 
@@ -73,6 +199,19 @@ function getDomUpdateFrequency() {
   }
 }
 
+/**
+ * Play or pause the current media
+ */
+function playPause() {
+  const play = elements.get("play");
+
+  if (play) {
+    elements.click("play");
+  } else {
+    elements.click("pause");
+  }
+}
+
 /**
  * Clears the old listenbrainz data on launch
  */
@@ -85,26 +224,30 @@ ListenBrainzStore.clear();
  */
 function addHotKeys() {
   if (settingsStore.get(settings.enableCustomHotkeys)) {
-    addHotkey("Control+p", () => {
+    addHotkey("Control+p", function () {
-      tidalController.openSettings();
+      elements.click("settings");
+      setTimeout(() => {
+        elements.click("openSettings");
+      }, 100);
     });
-    addHotkey("Control+l", () => {
+    addHotkey("Control+l", function () {
       handleLogout();
     });
-    addHotkey("Control+a", () => {
+
-      tidalController.toggleFavorite();
+    addHotkey("Control+a", function () {
+      elements.click("favorite");
     });
 
-    addHotkey("Control+h", () => {
+    addHotkey("Control+h", function () {
-      tidalController.goToHome();
+      elements.click("home");
     });
 
     addHotkey("backspace", function () {
-      tidalController.back();
+      elements.click("back");
     });
 
     addHotkey("shift+backspace", function () {
-      tidalController.forward();
+      elements.click("forward");
     });
 
     addHotkey("control+u", function () {
@@ -113,10 +256,10 @@ function addHotKeys() {
     });
 
     addHotkey("control+r", function () {
-      tidalController.repeat();
+      elements.click("repeat");
     });
     addHotkey("control+w", async function () {
-      const url = getUniversalLink(getTrackURL(tidalController.getTrackId()));
+      const url = SharingService.getUniversalLink(getTrackURL());
       clipboard.writeText(url);
       new Notification({
         title: `Universal link generated: `,
@@ -180,22 +323,22 @@ function addIPCEventListeners() {
         case globalEvents.playPause:
         case globalEvents.play:
         case globalEvents.pause:
-          tidalController.playPause();
+          playPause();
           break;
         case globalEvents.next:
-          tidalController.next();
+          elements.click("next");
           break;
         case globalEvents.previous:
-          tidalController.previous();
+          elements.click("previous");
           break;
         case globalEvents.toggleFavorite:
-          tidalController.toggleFavorite();
+          elements.click("favorite");
           break;
         case globalEvents.toggleShuffle:
-          tidalController.toggleShuffle();
+          elements.click("shuffle");
           break;
         case globalEvents.toggleRepeat:
-          tidalController.repeat();
+          elements.click("repeat");
           break;
         default:
           break;
@@ -204,6 +347,48 @@ function addIPCEventListeners() {
   });
 }
 
+/**
+ * Update the current status of tidal (e.g playing or paused)
+ */
+function getCurrentlyPlayingStatus() {
+  const pause = elements.get("pause");
+  let status = undefined;
+
+  // if pause button is visible tidal is playing
+  if (pause) {
+    status = MediaStatus.playing;
+  } else {
+    status = MediaStatus.paused;
+  }
+  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
+ */
+function convertDuration(duration: string) {
+  const parts = duration.split(":");
+  return parseInt(parts[1]) + 60 * parseInt(parts[0]);
+}
+
 /**
  * Update Tidal-hifi's media info
  *
@@ -211,6 +396,7 @@ function addIPCEventListeners() {
  */
 function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
   if (mediaInfo) {
+    currentMediaInfo = mediaInfo;
     ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
     updateMpris(mediaInfo);
     updateListenBrainz(mediaInfo);
@@ -273,35 +459,16 @@ function addMPRIS() {
           const eventValue = events[eventName];
           switch (events[eventValue]) {
             case events.playpause:
-              tidalController.playPause();
+              playPause();
-              break;
-            case events.next:
-              tidalController.next();
-              break;
-            case events.previous:
-              tidalController.previous();
-              break;
-            case events.pause:
-              tidalController.pause();
-              break;
-            case events.stop:
-              tidalController.stop();
-              break;
-            case events.play:
-              tidalController.play();
-              break;
-            case events.loopStatus:
-              tidalController.repeat();
-              break;
-            case events.shuffle:
-              tidalController.toggleShuffle();
               break;
+            default:
+              elements.click(eventValue);
           }
         });
       });
       // Override get position function
       player.getPosition = function () {
-        return tidalController.getCurrentPositionInSeconds();
+        return convertDuration(elements.getText("current")) * 1000 * 1000;
       };
       player.on("quit", function () {
         app.quit();
@@ -322,8 +489,8 @@ function updateMpris(mediaInfo: MediaInfo) {
         "xesam:album": mediaInfo.album,
         "xesam:url": mediaInfo.url,
         "mpris:artUrl": mediaInfo.image,
-        "mpris:length": convertDurationToSeconds(mediaInfo.duration) * 1000 * 1000,
+        "mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
-        "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + tidalController.getTrackId(),
+        "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
       },
       ...ObjectToDotNotation(mediaInfo, "custom:"),
     };
@@ -350,47 +517,124 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
               mediaInfo.title,
               mediaInfo.artists,
               mediaInfo.status,
-              convertDurationToSeconds(mediaInfo.duration),
+              convertDuration(mediaInfo.duration)
             );
             scrobbleWaitingForDelay = false;
           },
-          settingsStore.get(settings.ListenBrainz.delay) ?? 0,
+          settingsStore.get(settings.ListenBrainz.delay) ?? 0
         );
       }
     }
   }
 }
 
-tidalController.bootstrap(controllerOptions);
+/**
-tidalController.onMediaInfoUpdate(async (newState) => {
+ * Checks if Tidal is playing a video or song by grabbing the "a" element from the title.
-  currentMediaInfo = { ...currentMediaInfo, ...newState };
+ * If it's a song it returns the track URL, if not it will return undefined
+ */
+function getTrackURL() {
+  const id = getTrackID();
+  return `https://tidal.com/browse/track/${id}`;
+}
 
-  const songDashArtistTitle = `${currentMediaInfo.title} - ${currentMediaInfo.artists}`;
+function getTrackID() {
-  const isNewSong = currentSong !== songDashArtistTitle;
+  const URLelement = elements.get("title").querySelector("a");
-
+  if (URLelement !== null) {
-  if (isNewSong) {
+    const id = URLelement.href.replace(/\D/g, "");
-    // check whether one of the artists is in the "skip artist" array, if so, skip...
+    return id;
-    skipArtistsIfFoundInSkippedArtistsList(currentMediaInfo.artistsArray ?? []);
-
-    // update the currently playing song
-    currentSong = songDashArtistTitle;
-
-    // update the window title with the new info
-    settingsStore.get(settings.staticWindowTitle)
-      ? setTitle(staticTitle)
-      : setTitle(`${currentMediaInfo.title} - ${currentMediaInfo.artists}`);
-
-    // download a new icon and use it for the media info
-    if (!newState.icon && newState.image) {
-      currentMediaInfo.icon = await downloadIcon(currentMediaInfo.image, notificationPath);
-    } else {
-      currentMediaInfo.icon = "";
   }
 
-    updateMediaInfo(currentMediaInfo, true);
+  return window.location;
+}
+
+/**
+ * Watch for song changes and update title + notify
+ */
+setInterval(function () {
+  const title = elements.getText("title");
+  const artistsArray = elements.getArtistsArray();
+  const artistsString = elements.getArtistsString(artistsArray);
+  const songDashArtistTitle = `${title} - ${artistsString}`;
+  const staticTitle = "TIDAL Hi-Fi";
+  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 (playStateChanged) currentlyPlaying = currentStatus;
+    if (shuffleStateChanged) currentShuffleState = shuffleState;
+    if (repeatStateChanged) currentRepeatState = repeatState;
+
+    skipArtistsIfFoundInSkippedArtistsList(artistsArray);
+    const album = elements.getAlbumName();
+    const duration = elements.getText("duration");
+    const options: MediaInfo = {
+      title,
+      artists: artistsString,
+      album: album,
+      playingFrom: elements.getText("playing_from"),
+      status: currentStatus,
+      url: getTrackURL(),
+      current,
+      currentInSeconds: convertDurationToSeconds(current),
+      duration,
+      durationInSeconds: convertDurationToSeconds(duration),
+      image: "",
+      icon: "",
+      favorite: elements.isFavorite(),
+
+      player: {
+        status: currentStatus,
+        shuffle: shuffleState,
+        repeat: repeatState,
+      },
+    };
+
+    // update title, url and play info with new info
+    settingsStore.get(settings.staticWindowTitle)
+      ? setTitle(staticTitle)
+      : setTitle(songDashArtistTitle);
+    getTrackURL();
+    currentSong = songDashArtistTitle;
+    currentPlayStatus = currentStatus;
+
+    const image = elements.getSongIcon();
+
+    new Promise<void>((resolve) => {
+      if (image.startsWith("http")) {
+        options.image = image;
+        downloadFile(image, notificationPath).then(
+          () => {
+            options.icon = notificationPath;
+            resolve();
+          },
+          () => {
+            // if the image can't be downloaded then continue without it
+            resolve();
+          }
+        );
       } else {
-    // if titleOrArtists didn't change then only minor mediaInfo (like timings) changed, so don't bother the user with notifications
+        // if the image can't be found on the page continue without it
-    updateMediaInfo(currentMediaInfo, false);
+        resolve();
+      }
+    }).then(() => {
+      updateMediaInfo(options, titleOrArtistsChanged);
+    });
+  } else {
+    // just update the time
+    updateMediaInfo(
+      { ...currentMediaInfo, ...{ current, currentInSeconds: convertDurationToSeconds(current) } },
+      false
+    );
   }
 
   /**
@@ -405,12 +649,13 @@ tidalController.onMediaInfoUpdate(async (newState) => {
         const artistNames = Object.values(artists).map((artist) => artist);
         const foundArtist = artistNames.some((artist) => artistsToSkip.includes(artist));
         if (foundArtist) {
-          tidalController.next();
+          elements.click("next");
         }
       }
     }
   }
-});
+}, getUpdateFrequency());
+
 addMPRIS();
 addCustomCss(app);
 addHotKeys();

src/scripts/discord.ts

@@ -26,7 +26,7 @@ const defaultPresence = {
   largeImageKey: "tidal-hifi-icon",
   largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
   instance: false,
-  type: ACTIVITY_LISTENING,
+  type: ACTIVITY_LISTENING
 };
 
 const updateActivity = () => {
@@ -117,17 +117,15 @@ const getActivity = (): SetActivity => {
 const connectWithRetry = async (retryCount = 0) => {
   try {
     await rpc.login();
-    Logger.log("Connected to Discord");
+    Logger.log('Connected to Discord');
     rpc.on("ready", updateActivity);
-    Object.values(globalEvents).forEach((event) => ipcMain.on(event, observer));
+    Object.values(globalEvents).forEach(event => ipcMain.on(event, observer));
   } catch (error) {
     if (retryCount < MAX_RETRIES) {
-      Logger.log(
+      Logger.log(`Failed to connect to Discord, retrying in ${RETRY_DELAY/1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`);
-        `Failed to connect to Discord, retrying in ${RETRY_DELAY / 1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`
-      );
       setTimeout(() => connectWithRetry(retryCount + 1), RETRY_DELAY);
     } else {
-      Logger.log("Failed to connect to Discord after maximum retry attempts");
+      Logger.log('Failed to connect to Discord after maximum retry attempts');
     }
   }
 };
@@ -136,7 +134,7 @@ const connectWithRetry = async (retryCount = 0) => {
  * Set up the discord rpc and listen on globalEvents.updateInfo
  */
 export const initRPC = () => {
-  rpc = new Client({ transport: { type: "ipc" }, clientId });
+  rpc = new Client({ transport: {type: "ipc"}, clientId });
   connectWithRetry();
 };
 

src/scripts/download.ts

@@ -6,8 +6,8 @@ import request from "request";
  * @param {string} fileUrl url to download
  * @param {string} targetPath path to save it at
  */
-export const downloadFile = function (fileUrl: string, targetPath: string): Promise<string> {
+export const downloadFile = function (fileUrl: string, targetPath: string) {
-  return new Promise<string>((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     const req = request({
       method: "GET",
       uri: fileUrl,
@@ -16,9 +16,7 @@ export const downloadFile = function (fileUrl: string, targetPath: string): Prom
     const out = fs.createWriteStream(targetPath);
     req.pipe(out);
 
-    req.on("end", () => {
+    req.on("end", resolve);
-      resolve(targetPath);
-    });
 
     req.on("error", reject);
   });

src/scripts/mediaInfo.ts

@@ -1,6 +1,28 @@
-import { getEmptyMediaInfo, MediaInfo } from "../models/mediaInfo";
+import { MediaInfo } from "../models/mediaInfo";
+import { MediaStatus } from "../models/mediaStatus";
+import { RepeatState } from "../models/repeatState";
 
-const defaultInfo: MediaInfo = getEmptyMediaInfo();
+const defaultInfo: MediaInfo = {
+  title: "",
+  artists: "",
+  album: "",
+  icon: "",
+  playingFrom: "",
+  status: MediaStatus.paused,
+  url: "",
+  current: "",
+  currentInSeconds: 0,
+  duration: "",
+  durationInSeconds: 0,
+  image: "tidal-hifi-icon",
+  favorite: false,
+
+  player: {
+    status: MediaStatus.paused,
+    shuffle: false,
+    repeat: RepeatState.off,
+  },
+};
 
 export let mediaInfo: MediaInfo = { ...defaultInfo };
 

src/scripts/settings.ts

@@ -30,7 +30,6 @@ export const settingsStore = new Store({
     adBlock: false,
     advanced: {
       tidalUrl: "https://listen.tidal.com",
-      controllerType: "domController",
     },
     api: true,
     apiSettings: {
@@ -121,11 +120,6 @@ export const settingsStore = new Store({
     "5.16.0": (migrationStore) => {
       buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
     },
-    "5.19.0": (migrationStore) => {
-      buildMigration("5.19.0", migrationStore, [
-        { key: settings.advanced.controllerType, value: "domController" },
-      ]);
-    },
   },
 });