Merge pull request #672 from Mastermindzh/renovate/sass-1.x

fix(deps): update sass to 1.91.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,30 +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
+      # - uses: actions/upload-artifact@master
-        with:
+      #   with:
-          name: linux-builds
+      #     name: linux-builds
-          path: dist/
+      #     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

@@ -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:
+  # 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/

.nvmrc

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

.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,29 @@ 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

build/electron-builder.base.yml

@@ -1,7 +1,7 @@
 appId: com.rickvanlieshout.tidal-hifi
-electronVersion: 35.1.1
+electronVersion: 37.2.5
 electronDownload:
-  version: 35.1.1+wvcus
+  version: 37.2.5+wvcus
   mirror: https://github.com/castlabs/electron-releases/releases/download/v
 snap:
   plugs:
@@ -17,25 +17,25 @@ linux:
   executableName: tidal-hifi
   executableArgs:
     [
-      "--enable-features=UseOzonePlatform",
       "--ozone-platform-hint=auto",
       "--enable-features=WaylandWindowDecorations",
+      "--enable-wayland-ime",
+      "--use-angle",
     ]
   desktop:
-    entry: |
+    entry:
-      [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,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.18.1",
+  "version": "5.20.1",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -40,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.1",
+    "@xhayper/discord-rpc": "1.3.0",
-    "axios": "^1.8.4",
+    "axios": "^1.10.0",
-    "electron-store": "^8.2.0",
-    "express": "^4.21.2",
-    "hotkeys-js": "^3.13.9",
-    "mpris-service": "^2.1.2",
-    "sass": "^1.79.4",
-    "swagger-ui-express": "^5.0.1",
     "cors": "^2.8.5",
-    "request": "^2.88.2"
+    "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",
+    "swagger-ui-express": "^5.0.1"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "@types/cors": "^2.8.17",
+    "@types/cors": "^2.8.19",
-    "@types/express": "^4.17.21",
+    "@types/express": "^5.0.3",
-    "@types/node": "^20.14.10",
+    "@types/node": "^22.16.2",
     "@types/request": "^2.48.12",
-    "@types/swagger-ui-express": "^4.1.6",
+    "@types/swagger-ui-express": "^4.1.8",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
-    "@typescript-eslint/parser": "^7.15.0",
+    "@typescript-eslint/parser": "^8.36.0",
     "copyfiles": "^2.4.1",
-    "electron": "github:castlabs/electron-releases#v35.1.1+wvcus",
+    "electron": "github:castlabs/electron-releases#v37.2.5+wvcus",
     "electron-builder": "~26.0.12",
-    "eslint": "^8.57.0",
+    "eslint": "^9.30.1",
     "js-yaml": "^4.1.0",
     "markdown-toc": "^1.2.0",
-    "nodemon": "^3.1.4",
+    "node-abi": "^4.12.0",
-    "prettier": "^3.3.2",
+    "nodemon": "^3.1.10",
-    "stylelint": "^16.6.1",
+    "prettier": "^3.6.2",
-    "stylelint-config-standard": "^36.0.1",
+    "stylelint": "^16.21.1",
-    "stylelint-config-standard-scss": "^13.1.0",
+    "stylelint-config-standard": "^39.0.0",
-    "stylelint-prettier": "^5.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",
+    "tsc-watch": "^7.1.1",
-    "typescript": "^5.5.3"
+    "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"]
+}

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("/", (req, res) => {
-  expressApp.get("/swagger.json", (req, res) => res.json(swaggerSpec));
+    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.18.1",
+    "version": "5.20.1",
     "description": "",
     "license": {
       "name": "MIT",
@@ -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"
-        ]
       }
     }
   },
@@ -579,4 +532,4 @@
       "description": "The settings management API"
     }
   ]
-}
+}

src/pages/settings/settings.html

@@ -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/4.7.0/css/font-awesome.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.0/css/font-awesome.min.css">
 </head>
 
 <body class="settings-window">
@@ -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.1">5.18.1</a>
+              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/"

src/preload.ts

@@ -115,34 +115,38 @@ const elements = {
   },
 
   getAlbumName: function () {
-    //If listening to an album, get its name from the header title
+    try {
-    if (window.location.href.includes("/album/")) {
+      //If listening to an album, get its name from the header title
-      const albumName = window.document.querySelector(this.album_header_title);
+      if (globalThis.location.href.includes("/album/")) {
-      if (albumName) {
+        const albumName = globalThis.document.querySelector(this.album_header_title);
-        return albumName.textContent;
+        if (albumName) {
-      }
+          return albumName.textContent;
-      //If listening to a playlist or a mix, get album name from the list
+        }
-    } else if (
+        //If listening to a playlist or a mix, get album name from the list
-      window.location.href.includes("/playlist/") ||
+      } else if (
-      window.location.href.includes("/mix/")
+        globalThis.location.href.includes("/playlist/") ||
-    ) {
+        globalThis.location.href.includes("/mix/")
-      if (currentPlayStatus === 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.
+        if (this.currentlyPlaying === MediaStatus.playing) {
-        // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent
+          // 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.
-        const row = window.document.querySelector(this.currentlyPlaying).closest(this.mediaItem);
+          // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent
-        if (row) {
+          const row = window.document.querySelector(this.currentlyPlaying).closest(this.mediaItem);
-          return row.querySelector(this.album_name_cell).textContent;
+          if (row) {
+            return row.querySelector(this.album_name_cell).textContent;
+          }
         }
       }
-    }
 
-    // see whether we're on the queue page and get it from there
+      // 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) {
+      if (queueAlbumName) {
-      return queueAlbumName;
+        return queueAlbumName;
-    }
+      }
 
-    return "";
+      return "";
+    } catch {
+      return "";
+    }
   },
 
   isMuted: function () {