Merge pull request #680 from Mastermindzh/renovate/node-abi-4.x-lockfile

chore(deps): update node-abi to 4.14.0

.drone.yml

@@ -4,12 +4,12 @@ name: default
 
 steps:
   - name: install
-    image: node:19.4.0
+    image: node:22.17.0
     commands:
       - npm install
 
   - name: build_with_linux
-    image: node:19.4.0
+    image: node:22.17.0
     commands:
       - apt-get update && apt-get upgrade -y
       - apt-get install -y libarchive-tools rpm

.github/workflows/build.yml

@@ -21,26 +21,30 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 22.12.0
       - run: npm install
       - run: npm run build
+      # - uses: actions/upload-artifact@master
+      #   with:
+      #     name: linux-builds
+      #     path: dist/
 
-  build_on_mac:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
-        with:
-          node-version: 22.4
-      - run: npm install
-      - run: npm run build
+  # build_on_mac:
+  #   runs-on: macos-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - uses: actions/setup-node@master
+  #       with:
+  #         node-version: 22.4
+  #     - run: npm install
+  #     - run: npm run build
 
-  build_on_win:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
-        with:
-          node-version: 22.4
-      - run: npm install
-      - run: npm run build
+  # build_on_win:
+  #   runs-on: windows-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - uses: actions/setup-node@master
+  #       with:
+  #         node-version: 22.4
+  #     - run: npm install
+  #     - run: npm run build

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 22.12.0
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -29,30 +29,30 @@ jobs:
           name: linux-builds
           path: dist/
 
-  build_on_mac:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
-        with:
-          node-version: 22.4
-      - run: npm install
-      - run: npm run build
-      - uses: actions/upload-artifact@master
-        with:
-          name: mac-builds
-          path: ./dist/
+  # build_on_mac:
+  #   runs-on: macos-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - uses: actions/setup-node@master
+  #       with:
+  #         node-version: 22.4
+  #     - run: npm install
+  #     - run: npm run build
+  #     - uses: actions/upload-artifact@master
+  #       with:
+  #         name: mac-builds
+  #         path: ./dist/
 
-  build_on_win:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
-        with:
-          node-version: 22.4
-      - run: npm install
-      - run: npm run build
-      - uses: actions/upload-artifact@master
-        with:
-          name: windows-builds
-          path: dist/
+  # build_on_win:
+  #   runs-on: windows-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - uses: actions/setup-node@master
+  #       with:
+  #         node-version: 22.4
+  #     - run: npm install
+  #     - run: npm run build
+  #     - uses: actions/upload-artifact@master
+  #       with:
+  #         name: windows-builds
+  #         path: dist/

.nvmrc

@@ -1 +1 @@
-19.8.1
+v22.12.0

.stylelintrc.json

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

.vscode/settings.json

@@ -17,7 +17,9 @@
     "trackid",
     "tracklist",
     "widevine",
-    "xesam"
+    "wvcus",
+    "xesam",
+    "xhayper"
   ],
   "sonarlint.connectedMode.project": {
     "connectionId": "public-sonarcloud",

CHANGELOG.md

@@ -4,6 +4,42 @@ 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.20.1]
+
+- Updated electron to 37.2.5
+
+## [5.20.0]
+
+- Removes the `--enable-features=UseOzonePlatform` flag, as the Ozone platform has been the default on Linux since Electron 28 and this flag is no longer necessary.
+- Adds the `--enable-wayland-ime` flag to enable Input Method Editor (IME) support in Wayland environments, improving the input experience for CJK and other users.
+- Updated various dependencies
+- Updated Electron to 37, potentially fixing [#580](https://github.com/Mastermindzh/tidal-hifi/issues/580)
+
+## [5.19.0]
+
+- Fixed the issue where media updates would cease to work after album names can't be found
+  - Will simply report an empty string when it can't find the album
+- Updated various dependencies
+
+## [5.18.2]
+
+- Reverted to sass 1.79.4 to fix `Nix` builds
+- Changed electron-builder.base.yml to now generate the correct .desktop entries again
+  - Should fix flatpak build
+
+## [5.18.1]
+
+- Fixed the login bug
+- Upgraded electron to 35.1.1
+- Added Widevine/CDM info to startup
+- delayed remote electron initializer
+
+## [5.18.0]
+
+- [Dianoga](https://github.com/Dianoga) fixed the duration selector, restoring mpris & partial API data.
+  - PR: #554
+- Added `xesam:url` property to mpris metadata fixes [#506](https://github.com/Mastermindzh/tidal-hifi/issues/506)
+
 ## [5.17.0]
 
 - Added an option to disable the dynamic title and set it to a static one, [#491](https://github.com/Mastermindzh/tidal-hifi/pull/491)
@@ -21,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
@@ -113,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).
+

build/electron-builder.base.yml

@@ -1,7 +1,7 @@
 appId: com.rickvanlieshout.tidal-hifi
-electronVersion: 28.1.1
+electronVersion: 37.2.5
 electronDownload:
-  version: 28.1.1+wvcus
+  version: 37.2.5+wvcus
   mirror: https://github.com/castlabs/electron-releases/releases/download/v
 snap:
   plugs:
@@ -17,24 +17,25 @@ linux:
   executableName: tidal-hifi
   executableArgs:
     [
-      "--enable-features=UseOzonePlatform",
       "--ozone-platform-hint=auto",
       "--enable-features=WaylandWindowDecorations",
+      "--enable-wayland-ime",
+      "--use-angle",
     ]
   desktop:
-    Encoding: UTF-8
-    Name: TIDAL Hi-Fi
-    GenericName: TIDAL Hi-Fi
-    Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
-    Icon: tidal-hifi
-    StartupNotify: true
-    Terminal: false
-    Type: Application
-    Categories: Network;Application;AudioVideo;Audio;Video
-    StartupWMClass: tidal-hifi
-    X-PulseAudio-Properties: media.role=music
-    MimeType: x-scheme-handler/tidal;
-
+    entry:
+      Encoding: "UTF-8"
+      Name: "TIDAL Hi-Fi"
+      GenericName: "TIDAL Hi-Fi"
+      Comment: "The web version of listen.tidal.com running in electron with hifi support thanks to widevine."
+      Icon: "tidal-hifi"
+      StartupNotify: "true"
+      Terminal: "false"
+      Type: "Application"
+      Categories: "Network;Application;AudioVideo;Audio;Video"
+      StartupWMClass: "tidal-hifi"
+      X-PulseAudio-Properties: "media.role=music"
+      MimeType: "x-scheme-handler/tidal;"
 mac:
   category: public.app-category.entertainment
 win:

package.json

@@ -1,10 +1,10 @@
 {
   "name": "tidal-hifi",
-  "version": "5.17.0",
+  "version": "5.20.1",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
-    "start": "electron --inspect=0.0.0.0:5858 .",
+    "start": "electron --inspect=0.0.0.0:5858 --remote-debugging-port=8315 --remote-allow-origins=* .",
     "watchStart": "nodemon dist -x \"npm run start\"",
     "compile": "tsc && npm run sass-and-copy",
     "deps": "npm run watch",
@@ -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",
@@ -41,44 +40,45 @@
   "homepage": "https://github.com/Mastermindzh/tidal-hifi",
   "license": "MIT",
   "dependencies": {
-    "@electron/remote": "^2.1.2",
+    "@electron/remote": "^2.1.3",
     "@types/swagger-jsdoc": "^6.0.4",
-    "@xhayper/discord-rpc": "^1.2.0",
-    "axios": "^1.7.7",
+    "@xhayper/discord-rpc": "1.3.0",
+    "axios": "^1.10.0",
     "cors": "^2.8.5",
     "electron-store": "^8.2.0",
-    "express": "^4.21.1",
-    "hotkeys-js": "^3.13.7",
+    "express": "^5.1.0",
+    "hotkeys-js": "^3.13.15",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.79.4",
+    "sass": "1.92.0",
     "swagger-ui-express": "^5.0.1"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
-    "@types/node": "^20.14.10",
+    "@types/cors": "^2.8.19",
+    "@types/express": "^5.0.3",
+    "@types/node": "^22.16.2",
     "@types/request": "^2.48.12",
-    "@types/swagger-ui-express": "^4.1.6",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.15.0",
+    "@types/swagger-ui-express": "^4.1.8",
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
+    "@typescript-eslint/parser": "^8.36.0",
     "copyfiles": "^2.4.1",
-    "electron": "git+https://github.com/castlabs/electron-releases#v31.1.0+wvcus",
-    "electron-builder": "~24.9.4",
-    "eslint": "^8.57.0",
+    "electron": "github:castlabs/electron-releases#v37.2.5+wvcus",
+    "electron-builder": "~26.0.12",
+    "eslint": "^9.30.1",
     "js-yaml": "^4.1.0",
     "markdown-toc": "^1.2.0",
-    "nodemon": "^3.1.4",
-    "prettier": "^3.3.2",
-    "stylelint": "^16.6.1",
-    "stylelint-config-standard": "^36.0.1",
-    "stylelint-config-standard-scss": "^13.1.0",
-    "stylelint-prettier": "^5.0.0",
+    "node-abi": "^4.12.0",
+    "nodemon": "^3.1.10",
+    "prettier": "^3.6.2",
+    "stylelint": "^16.21.1",
+    "stylelint-config-standard": "^39.0.0",
+    "stylelint-config-standard-scss": "^15.0.1",
+    "stylelint-prettier": "^5.0.3",
     "swagger-jsdoc": "^6.2.8",
     "ts-node": "^10.9.2",
-    "tsc-watch": "^6.2.0",
-    "typescript": "^5.5.3"
+    "tsc-watch": "^7.1.1",
+    "typescript": "^5.8.3"
   },
   "prettier": "@mastermindzh/prettier-config"
 }

renovate.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "ignoreDeps": ["@types/node", "electron-store", "@xhayper/discord-rpc"]
+}

scripts/verifyElements.js

@@ -22,12 +22,13 @@
     media: '*[data-test="current-media-imagery"]',
     image: "img",
     current: '*[data-test="current-time"]',
-    duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
+    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)',
-    playingFrom: '*[class^="playingFrom"] span:nth-child(2)',
+    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"]',

src/features/api/features/current.ts

@@ -88,8 +88,9 @@ export const addCurrentInfo = (expressApp: Router) => {
    *             schema:
    *               $ref: '#/components/schemas/MediaInfo'
    */
-  expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
-
+  expressApp.get("/current", (_req, res) => {
+    res.json({ ...mediaInfo, artist: mediaInfo.artists });
+  });
   /**
    * @swagger
    * /current/image:

src/features/api/index.ts

@@ -21,8 +21,12 @@ export const startApi = (mainWindow: BrowserWindow) => {
   expressApp.use(cors());
   expressApp.use(express.json());
   expressApp.use("/docs", swaggerUi.serve, swaggerUi.setup(swaggerSpec));
-  expressApp.get("/", (req, res) => res.send("Hello World!"));
-  expressApp.get("/swagger.json", (req, res) => res.json(swaggerSpec));
+  expressApp.get("/", (req, res) => {
+    res.send("Hello World!");
+  });
+  expressApp.get("/swagger.json", (req, res) => {
+    res.json(swaggerSpec);
+  });
 
   // add features
   addLegacyApi(expressApp, mainWindow);

src/features/api/swagger.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "TIDAL Hi-Fi API",
-    "version": "5.17.0",
+    "version": "5.20.1",
     "description": "",
     "license": {
       "name": "MIT",

src/main.ts

@@ -26,7 +26,6 @@ import {
 import { addTray, refreshTray } from "./scripts/tray";
 let mainInhibitorId = -1;
 
-initialize();
 let mainWindow: BrowserWindow;
 const icon = path.join(__dirname, "../assets/icon.png");
 const PROTOCOL_PREFIX = "tidal";
@@ -98,6 +97,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
       },
     },
   });
+
   enable(mainWindow.webContents);
   registerHttpProtocols();
   syncMenuBarWithStore();
@@ -126,6 +126,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
     }
     return false;
   });
+
   // Emitted when the window is closed.
   mainWindow.on("closed", function () {
     releaseInhibitorIfActive(mainInhibitorId);
@@ -178,6 +179,7 @@ app.on("ready", async () => {
 
   if (isMainInstance() || isMultipleInstancesAllowed()) {
     await components.whenReady();
+    initialize();
 
     // Adblock
     if (settingsStore.get(settings.adBlock)) {
@@ -188,6 +190,8 @@ app.on("ready", async () => {
       });
     }
 
+    Logger.log("components ready:", components.status());
+
     createWindow();
     addMenu(mainWindow);
     createSettingsWindow();

src/pages/settings/settings.html

@@ -1,34 +1,25 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
-  <head>
+
+<head>
   <title>Tidal Hi-Fi settings</title>
   <meta charset="UTF-8" />
   <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/4.7.0/css/font-awesome.min.css"
-    />
-  </head>
+  <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">
+<body class="settings-window">
   <div class="settings-window__wrapper">
     <div class="settings-window__drag-area"></div>
     <a id="close" class="settings-window__close-button" title="Close settings">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 348.333 348.334"
-          class="settings-window__svg-icon"
-        >
-          <path
-            fill="white"
-            d="M336.559,68.611L231.016,174.165l105.543,105.549c15.699,15.705,15.699,41.145,0,56.85
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 348.333 348.334" class="settings-window__svg-icon">
+        <path fill="white" d="M336.559,68.611L231.016,174.165l105.543,105.549c15.699,15.705,15.699,41.145,0,56.85
             c-7.844,7.844-18.128,11.769-28.407,11.769c-10.296,0-20.581-3.919-28.419-11.769L174.167,231.003L68.609,336.563
             c-7.843,7.844-18.128,11.769-28.416,11.769c-10.285,0-20.563-3.919-28.413-11.769c-15.699-15.698-15.699-41.139,0-56.85
             l105.54-105.549L11.774,68.611c-15.699-15.699-15.699-41.145,0-56.844c15.696-15.687,41.127-15.687,56.829,0l105.563,105.554
-            L279.721,11.767c15.705-15.687,41.139-15.687,56.832,0C352.258,27.466,352.258,52.912,336.559,68.611z"
-          />
+            L279.721,11.767c15.705-15.687,41.139-15.687,56.832,0C352.258,27.466,352.258,52.912,336.559,68.611z" />
       </svg>
     </a>
 
@@ -75,13 +66,7 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
-              <textarea
-                id="skippedArtists"
-                class="textarea"
-                cols="40"
-                rows="5"
-                spellcheck="false"
-              ></textarea>
+            <textarea id="skippedArtists" class="textarea" cols="40" rows="5" spellcheck="false"></textarea>
             <div class="group__option">
               <div class="group__description">
                 <h4>Block ads</h4>
@@ -124,10 +109,7 @@
             <div class="group__option">
               <div class="group__description">
                 <h4>Static Window Title</h4>
-                  <p>
-                    Makes the window title "TIDAL Hi-Fi" instead of changing to the currently
-                    playing song.
-                  </p>
+                <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" />
@@ -149,9 +131,7 @@
                 <h4>Hotkeys</h4>
                 <p>
                   Enable extra hotkeys to achieve feature parity with the
-                    <a class="external-link" data-url="https://defkey.com/tidal-desktop-shortcuts"
-                      >desktop apps</a
-                    >.
+                  <a class="external-link" data-url="https://defkey.com/tidal-desktop-shortcuts">desktop apps</a>.
                 </p>
               </div>
               <label class="switch">
@@ -177,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
-                  information. You can optionally enable playback control as well.
+                TIDAL Hi-Fi has a built-in web API to allow users to get current media information.
+                You can optionally enable playback control as well.
               </p>
             </div>
             <div class="group__option">
@@ -200,8 +180,7 @@
             <div class="group__option">
               <div class="group__description">
                 <h4>API hostname</h4>
-                  <p>
-                    By default (127.0.0.1) only local apps can interface with the API. <br />
+                <p>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>
@@ -257,6 +236,7 @@
               </label>
             </div>
             <div id="discord_options">
+
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <h4>Show Idle Text</h4>
@@ -272,27 +252,15 @@
                 <div class="group__description">
                   <h4>Idle Text</h4>
                   <p>The text displayed on Discord's rich presence while idling in the app.</p>
-                    <input
-                      id="discord_idle_text"
-                      type="text"
-                      class="text-input"
-                      name="discord_idle_text"
-                    />
+                  <input id="discord_idle_text" type="text" class="text-input" name="discord_idle_text" />
                 </div>
               </div>
 
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <h4>Using Tidal Text</h4>
-                    <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"
-                    />
+                  <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>
 
@@ -308,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>
@@ -323,12 +292,7 @@
                   <div class="group__description">
                     <h4>Details prefix</h4>
                     <p>Prefix for the "details" field of Discord's rich presence.</p>
-                      <input
-                        id="discord_details_prefix"
-                        type="text"
-                        class="text-input"
-                        name="discord_details_prefix"
-                      />
+                    <input id="discord_details_prefix" type="text" class="text-input" name="discord_details_prefix" />
                   </div>
                 </div>
 
@@ -336,15 +300,11 @@
                   <div class="group__description">
                     <h4>Button text</h4>
                     <p>Text to display on the button below the media information.</p>
-                      <input
-                        id="discord_button_text"
-                        type="text"
-                        class="text-input"
-                        name="discord_button_text"
-                      />
+                    <input id="discord_button_text" type="text" class="text-input" name="discord_button_text" />
                   </div>
                 </div>
               </div>
+
             </div>
           </div>
           <div class="group">
@@ -363,43 +323,23 @@
               <div class="group__option">
                 <div class="group__description">
                   <h4>ListenBrainz API Url</h4>
-                    <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"
-                    />
+                  <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>
               <div class="group__option">
                 <div class="group__description">
                   <h4>ListenBrainz User Token</h4>
                   <p>Provide the user token you can get from the settings page.</p>
-                    <input
-                      id="ListenBrainzToken"
-                      type="text"
-                      class="text-input"
-                      name="ListenBrainzToken"
-                    />
+                  <input id="ListenBrainzToken" type="text" class="text-input" name="ListenBrainzToken" />
                 </div>
               </div>
             </div>
             <div class="group__description">
               <h4>ScrobbleDelay</h4>
-                <p>
-                  The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when
-                  you fast forward immediately
-                </p>
-                <input
-                  id="listenbrainz_delay"
-                  type="number"
-                  class="text-input"
-                  name="listenbrainz_delay"
-                />
+              <p>The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when you fast forward
+                immediately</p>
+              <input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" />
             </div>
           </div>
         </section>
@@ -411,16 +351,12 @@
               <div class="group__description">
                 <h4>Update frequency</h4>
                 <p>
-                    The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback
-                    info by scraping the website. 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.
+                  The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback info by scraping the
+                  website.
+                  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"
-                  />
+                <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
               </div>
             </div>
 
@@ -433,9 +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">
-                      Staging (listen.stage.tidal.com)
-                    </option>
+                  <option value="https://listen.stage.tidal.com">Staging (listen.stage.tidal.com)</option>
                 </select>
               </div>
             </div>
@@ -481,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
-                    window system.
+                  Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland window system.
                 </p>
               </div>
               <label class="switch">
@@ -500,19 +433,12 @@
               <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 document.
+                  The css that you put in here will be injected into a style tag in the head of the document.
                 </p>
               </div>
             </div>
           </div>
-            <textarea
-              id="customCSS"
-              class="textarea"
-              cols="40"
-              rows="8"
-              spellcheck="false"
-            ></textarea>
+          <textarea id="customCSS" class="textarea" cols="40" rows="8" spellcheck="false"></textarea>
 
           <div class="group">
             <p class="group__title">Theme files</p>
@@ -522,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>
 
@@ -530,20 +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
-                    theme list automatically.
+                  Click the button and select the css files to import. They will be added to the theme list
+                  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>
@@ -555,35 +477,17 @@
           <img alt="tidal icon" class="about-section__icon" src="./icon.png" />
           <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.17.0"
-                >5.17.0</a
-              >
+            <a target="_blank" rel="noopener"
+              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.20.1">5.20.1</a>
           </div>
           <div class="about-section__links">
-              <a
-                target="_blank"
-                rel="noopener"
-                href="https://github.com/mastermindzh/tidal-hifi/"
-                class="about-section__button"
-                >Github <i class="fa fa-external-link"></i
-              ></a>
-              <a
-                target="_blank"
-                rel="noopener"
-                href="https://github.com/Mastermindzh/tidal-hifi/issues"
-                class="about-section__button"
-                >Report an issue <i class="fa fa-external-link"></i
-              ></a>
-              <a
-                target="_blank"
-                rel="noopener"
-                href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
-                class="about-section__button"
-                >Contributors <i class="fa fa-external-link"></i
-              ></a>
+            <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
+              class="about-section__button">Github
+              <i class="fa fa-external-link"></i></a>
+            <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/issues"
+              class="about-section__button">Report an issue <i class="fa fa-external-link"></i></a>
+            <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
+              class="about-section__button">Contributors <i class="fa fa-external-link"></i></a>
           </div>
         </section>
 
@@ -595,5 +499,6 @@
       </div>
     </main>
   </div>
-  </body>
+</body>
+
 </html>

src/preload.ts

@@ -54,12 +54,12 @@ const elements = {
   media: '*[data-test="current-media-imagery"]',
   image: "img",
   current: '*[data-test="current-time"]',
-  duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
+  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)',
+  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"]',
@@ -115,18 +115,19 @@ const elements = {
   },
 
   getAlbumName: function () {
+    try {
       //If listening to an album, get its name from the header title
-    if (window.location.href.includes("/album/")) {
-      const albumName = window.document.querySelector(this.album_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 (
-      window.location.href.includes("/playlist/") ||
-      window.location.href.includes("/mix/")
+        globalThis.location.href.includes("/playlist/") ||
+        globalThis.location.href.includes("/mix/")
       ) {
-      if (currentPlayStatus === MediaStatus.playing) {
+        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);
@@ -137,12 +138,15 @@ const elements = {
       }
 
       // see whether we're on the queue page and get it from there
-    const queueAlbumName = elements.getText("queue_album");
+      const queueAlbumName = this.getText("queue_album");
       if (queueAlbumName) {
         return queueAlbumName;
       }
 
       return "";
+    } catch {
+      return "";
+    }
   },
 
   isMuted: function () {
@@ -483,6 +487,7 @@ function updateMpris(mediaInfo: MediaInfo) {
         "xesam:title": mediaInfo.title,
         "xesam:artist": [mediaInfo.artists],
         "xesam:album": mediaInfo.album,
+        "xesam:url": mediaInfo.url,
         "mpris:artUrl": mediaInfo.image,
         "mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
         "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),

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 = () => {
@@ -103,8 +103,7 @@ const getActivity = (): SetActivity => {
     if (includeTimestamps) {
       const currentSeconds = convertDurationToSeconds(mediaInfo.current);
       const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
-      const date = new Date();
-      const now = Math.floor(date.getTime() / 1000);
+      const now = Math.trunc((Date.now() + 500) / 1000);
       presence.startTimestamp = now - currentSeconds;
       presence.endTimestamp = presence.startTimestamp + durationSeconds;
     }
@@ -118,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(
-        `Failed to connect to Discord, retrying in ${RETRY_DELAY / 1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`
-      );
+      Logger.log(`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');
     }
   }
 };
@@ -137,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();
 };