.github/workflows/build.yml

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

.github/workflows/release.yml

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

CHANGELOG.md

@@ -4,25 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [5.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)

build/electron-builder.base.yml

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

package.json

@@ -1,10 +1,10 @@
 {
   "name": "tidal-hifi",
-  "version": "5.18.2",
+  "version": "5.17.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
-    "start": "electron --inspect=0.0.0.0:5858 --remote-debugging-port=8315 --remote-allow-origins=* .",
+    "start": "electron --inspect=0.0.0.0:5858 .",
     "watchStart": "nodemon dist -x \"npm run start\"",
     "compile": "tsc && npm run sass-and-copy",
     "deps": "npm run watch",
@@ -42,16 +42,16 @@
   "dependencies": {
     "@electron/remote": "^2.1.2",
     "@types/swagger-jsdoc": "^6.0.4",
-    "@xhayper/discord-rpc": "^1.2.1",
+    "@xhayper/discord-rpc": "^1.2.0",
-    "axios": "^1.8.4",
+    "axios": "^1.7.7",
-    "electron-store": "^8.2.0",
-    "express": "^4.21.2",
-    "hotkeys-js": "^3.13.9",
-    "mpris-service": "^2.1.2",
-    "sass": "1.86.0",
-    "swagger-ui-express": "^5.0.1",
     "cors": "^2.8.5",
-    "request": "^2.88.2"
+    "electron-store": "^8.2.0",
+    "express": "^4.21.1",
+    "hotkeys-js": "^3.13.7",
+    "mpris-service": "^2.1.2",
+    "request": "^2.88.2",
+    "sass": "^1.79.4",
+    "swagger-ui-express": "^5.0.1"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
@@ -63,8 +63,8 @@
     "@typescript-eslint/eslint-plugin": "^7.16.0",
     "@typescript-eslint/parser": "^7.15.0",
     "copyfiles": "^2.4.1",
-    "electron": "github:castlabs/electron-releases#v35.1.1+wvcus",
+    "electron": "git+https://github.com/castlabs/electron-releases#v31.1.0+wvcus",
-    "electron-builder": "~26.0.12",
+    "electron-builder": "~24.9.4",
     "eslint": "^8.57.0",
     "js-yaml": "^4.1.0",
     "markdown-toc": "^1.2.0",

scripts/verifyElements.js

@@ -22,13 +22,12 @@
     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)',
+    album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
-    playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
+    playingFrom: '*[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/swagger.json

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

src/main.ts

@@ -26,6 +26,7 @@ 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";
@@ -97,7 +98,6 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
       },
     },
   });
-
   enable(mainWindow.webContents);
   registerHttpProtocols();
   syncMenuBarWithStore();
@@ -126,7 +126,6 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
     }
     return false;
   });
-
   // Emitted when the window is closed.
   mainWindow.on("closed", function () {
     releaseInhibitorIfActive(mainInhibitorId);
@@ -179,7 +178,6 @@ app.on("ready", async () => {
 
   if (isMainInstance() || isMultipleInstancesAllowed()) {
     await components.whenReady();
-    initialize();
 
     // Adblock
     if (settingsStore.get(settings.adBlock)) {
@@ -190,8 +188,6 @@ app.on("ready", async () => {
       });
     }
 
-    Logger.log("components ready:", components.status());
-
     createWindow();
     addMenu(mainWindow);
     createSettingsWindow();

src/pages/settings/settings.html

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

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)',
+  album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
-  playing_from: '*[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"]',
@@ -483,7 +483,6 @@ 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

@@ -103,7 +103,8 @@ const getActivity = (): SetActivity => {
     if (includeTimestamps) {
       const currentSeconds = convertDurationToSeconds(mediaInfo.current);
       const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
-      const now = Math.trunc((Date.now() + 500) / 1000);
+      const date = new Date();
+      const now = Math.floor(date.getTime() / 1000);
       presence.startTimestamp = now - currentSeconds;
       presence.endTimestamp = presence.startTimestamp + durationSeconds;
     }