chore(deps): update axios to 1.13.0

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

.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:
+  # 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

@@ -14,11 +14,12 @@
     "rescrobbler",
     "scrobble",
     "scrobbling",
-    "Songwhip",
     "trackid",
     "tracklist",
     "widevine",
-    "xesam"
+    "wvcus",
+    "xesam",
+    "xhayper"
   ],
   "sonarlint.connectedMode.project": {
     "connectionId": "public-sonarcloud",

CHANGELOG.md

@@ -4,6 +4,55 @@ 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)
+- Discord integration now says "Listening to" instead of "playing" [#488](https://github.com/Mastermindzh/tidal-hifi/pull/488) && [#454](https://github.com/Mastermindzh/tidal-hifi/pull/454)
+- Fixed several element names in the dom scraper
+- Removed the Songwhip (they shut down) integration and replaced it with TIDAL's universal link system
+
+## [5.16.0]
+
+- Fix issue #449 Discord RPC stuck on "Browsing Tidal".
+- Fix issue #448 Add option to disable the discord rpc idle text
+- Notifications are now send at the end of the update process, allowing other events to happen sooner.
+
 ## [5.15.0]
 
 - Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)

README.md

@@ -48,7 +48,6 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 - AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
 - Custom [integrations](#integrations)
   - [ListenBrainz](https://listenbrainz.org/?redirect=false) integration
-  - Songwhip.com integration (hotkey `ctrl + w`)
   - Discord RPC integration (showing "now listening", "Browsing", etc)
     - Flatpak version only works if both Discord and Tidal-HiFi are flatpaks
   - MPRIS integration

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
+    entry:
-    Name: TIDAL Hi-Fi
+      Encoding: "UTF-8"
-    GenericName: TIDAL Hi-Fi
+      Name: "TIDAL Hi-Fi"
-    Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
+      GenericName: "TIDAL Hi-Fi"
-    Icon: tidal-hifi
+      Comment: "The web version of listen.tidal.com running in electron with hifi support thanks to widevine."
-    StartupNotify: true
+      Icon: "tidal-hifi"
-    Terminal: false
+      StartupNotify: "true"
-    Type: Application
+      Terminal: "false"
-    Categories: Network;Application;AudioVideo;Audio;Video
+      Type: "Application"
-    StartupWMClass: tidal-hifi
+      Categories: "Network;Application;AudioVideo;Audio;Video"
-    X-PulseAudio-Properties: media.role=music
+      StartupWMClass: "tidal-hifi"
-    MimeType: x-scheme-handler/tidal;
+      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.15.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",
@@ -40,45 +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",
-    "axios": "^1.7.2",
+    "@xhayper/discord-rpc": "1.3.0",
+    "axios": "^1.12.0",
     "cors": "^2.8.5",
-    "discord-rpc": "^4.0.1",
     "electron-store": "^8.2.0",
-    "express": "^4.19.2",
+    "express": "^5.1.0",
-    "hotkeys-js": "^3.13.7",
+    "hotkeys-js": "^3.13.15",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.77.7",
+    "sass": "1.93.2",
     "swagger-ui-express": "^5.0.1"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "@types/cors": "^2.8.17",
+    "@types/cors": "^2.8.19",
-    "@types/discord-rpc": "^4.0.8",
+    "@types/express": "^5.0.3",
-    "@types/express": "^4.17.21",
+    "@types/node": "^22.16.2",
-    "@types/node": "^20.14.10",
     "@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": "git+https://github.com/castlabs/electron-releases#v31.1.0+wvcus",
+    "electron": "github:castlabs/electron-releases#v37.2.5+wvcus",
-    "electron-builder": "~24.9.4",
+    "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": "^16.0.0",
+    "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"]
+}

scripts/verifyElements.js

@@ -16,17 +16,19 @@
     search: '[class^="searchField"]',
     shuffle: '*[data-test="shuffle"]',
     repeat: '*[data-test="repeat"]',
-    account: '*[class^="profileOptions"]',
+    account: '*[data-test^="profile-image-button"]',
-    settings: '*[data-test^="open-settings"]',
+    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"]',
+    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)',
-    playingFrom: '*[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/constants/globalEvents.ts

@@ -10,7 +10,7 @@ export const globalEvents = {
   showSettings: "showSettings",
   storeChanged: "storeChanged",
   error: "error",
-  whip: "whip",
+  getUniversalLink: "getUniversalLink",
   log: "log",
   toggleFavorite: "toggleFavorite",
   toggleShuffle: "toggleShuffle",

src/constants/settings.ts

@@ -30,6 +30,7 @@ export const settings = {
     buttonText: "discord.buttonText",
     includeTimestamps: "discord.includeTimestamps",
     showSong: "discord.showSong",
+    showIdle: "discord.showIdle",
     idleText: "discord.idleText",
     usingText: "discord.usingText",
   },
@@ -54,6 +55,7 @@ export const settings = {
   singleInstance: "singleInstance",
   skipArtists: "skipArtists",
   skippedArtists: "skippedArtists",
+  staticWindowTitle: "staticWindowTitle",
   theme: "theme",
   trayIcon: "trayIcon",
   updateFrequency: "updateFrequency",

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.15.0",
+    "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"
-        ]
       }
     }
   },

src/features/sharingService/sharingService.ts

@@ -0,0 +1,10 @@
+export class SharingService {
+  /**
+   * Retrieve the universal link given a regular track link
+   * @param currentUrl
+   * @returns
+   */
+  public static getUniversalLink(currentUrl: string): string {
+    return `${currentUrl}?u`;
+  }
+}

src/features/songwhip/models/Artist.ts

@@ -1,21 +0,0 @@
-import { ServiceLinks } from "./ServiceLinks";
-
-export interface Artist {
-  type: string;
-  id: number;
-  path: string;
-  name: string;
-  sourceUrl: string;
-  sourceCountry: string;
-  url: string;
-  image: string;
-  createdAt: string;
-  updatedAt: string;
-  refreshedAt: string;
-  serviceIds: { [key: string]: string };
-  orchardId: string;
-  spotifyId: string;
-  links: { [key: string]: ServiceLinks[] };
-  linksCountries: string[];
-  description: string;
-}

src/features/songwhip/models/ServiceLinks.ts

@@ -1,4 +0,0 @@
-export interface ServiceLinks {
-  link: string;
-  countries: string[];
-}

src/features/songwhip/models/whip.ts

@@ -1,27 +0,0 @@
-import { Artist } from "./Artist";
-import { ServiceLinks } from "./ServiceLinks";
-
-export interface WhippedResult {
-  status: string;
-  data: {
-    item: {
-      type: string;
-      id: number;
-      path: string;
-      name: string;
-      url: string;
-      sourceUrl: string;
-      sourceCountry: string;
-      releaseDate: string;
-      createdAt: string;
-      updatedAt: string;
-      refreshedAt: string;
-      image: string;
-      isrc: string;
-      isExplicit: boolean;
-      links: { [key: string]: ServiceLinks[] };
-      linksCountries: string[];
-      artists: Artist[];
-    };
-  };
-}

src/features/songwhip/songwhip.ts

@@ -1,32 +0,0 @@
-import { WhippedResult } from "./models/whip";
-import axios from "axios";
-
-export class Songwhip {
-  /**
-   * Call the songwhip API and create a shareable songwhip page
-   * @param currentUrl
-   * @returns
-   */
-  public static async whip(currentUrl: string): Promise<WhippedResult> {
-    try {
-      const response = await axios.post("https://songwhip.com/api/songwhip/create", {
-        url: currentUrl,
-        // doesn't actually matter.. returns everything the same way anyway
-        country: "NL",
-      });
-
-      return response.data;
-    } catch (error) {
-      console.log(JSON.stringify(error));
-    }
-  }
-
-  /**
-   * Transform a songwhip response into a shareable url
-   * @param response
-   * @returns
-   */
-  public static getWhipUrl(response: WhippedResult) {
-    return `https://songwhip.com${response.data.item.url}`;
-  }
-}

src/main.ts

@@ -10,7 +10,7 @@ import {
   releaseInhibitorIfActive,
 } from "./features/idleInhibitor/idleInhibitor";
 import { Logger } from "./features/logger";
-import { Songwhip } from "./features/songwhip/songwhip";
+import { SharingService } from "./features/sharingService/sharingService";
 import { MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
 import { initRPC, rpc, unRPC } from "./scripts/discord";
@@ -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();
@@ -250,8 +254,8 @@ ipcMain.on(globalEvents.error, (event) => {
   console.log(event);
 });
 
-ipcMain.handle(globalEvents.whip, async (event, url) => {
+ipcMain.handle(globalEvents.getUniversalLink, async (event, url) => {
-  return Songwhip.whip(url);
+  return SharingService.getUniversalLink(url);
 });
 
 Logger.watch(ipcMain);

src/pages/settings/preload.ts

@@ -46,6 +46,7 @@ let adBlock: HTMLInputElement,
   singleInstance: HTMLInputElement,
   skipArtists: HTMLInputElement,
   skippedArtists: HTMLInputElement,
+  staticWindowTitle: HTMLInputElement,
   theme: HTMLSelectElement,
   trayIcon: HTMLInputElement,
   updateFrequency: HTMLInputElement,
@@ -58,6 +59,7 @@ let adBlock: HTMLInputElement,
   discord_include_timestamps: HTMLInputElement,
   discord_button_text: HTMLInputElement,
   discord_show_song: HTMLInputElement,
+  discord_show_idle: HTMLInputElement,
   discord_idle_text: HTMLInputElement,
   discord_using_text: HTMLInputElement;
 
@@ -139,8 +141,9 @@ function refreshSettings() {
     port.value = settingsStore.get(settings.apiSettings.port);
     singleInstance.checked = settingsStore.get(settings.singleInstance);
     skipArtists.checked = settingsStore.get(settings.skipArtists);
-    theme.value = settingsStore.get(settings.theme);
     skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
+    staticWindowTitle.checked = settingsStore.get(settings.staticWindowTitle);
+    theme.value = settingsStore.get(settings.theme);
     trayIcon.checked = settingsStore.get(settings.trayIcon);
     updateFrequency.value = settingsStore.get(settings.updateFrequency);
     enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
@@ -151,6 +154,7 @@ function refreshSettings() {
     discord_include_timestamps.checked = settingsStore.get(settings.discord.includeTimestamps);
     discord_button_text.value = settingsStore.get(settings.discord.buttonText);
     discord_show_song.checked = settingsStore.get(settings.discord.showSong);
+    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);
 
@@ -259,6 +263,7 @@ window.addEventListener("DOMContentLoaded", () => {
   trayIcon = get("trayIcon");
   skipArtists = get("skipArtists");
   skippedArtists = get("skippedArtists");
+  staticWindowTitle = get("staticWindowTitle");
   singleInstance = get("singleInstance");
   updateFrequency = get("updateFrequency");
   enableListenBrainz = get("enableListenBrainz");
@@ -269,6 +274,7 @@ window.addEventListener("DOMContentLoaded", () => {
   listenbrainz_delay = get("listenbrainz_delay");
   discord_button_text = get("discord_button_text");
   discord_show_song = get("discord_show_song");
+  discord_show_idle = get("discord_show_idle");
   discord_using_text = get("discord_using_text");
   discord_idle_text = get("discord_idle_text");
 
@@ -292,6 +298,7 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(port, settings.apiSettings.port);
   addInputListener(skipArtists, settings.skipArtists);
   addTextAreaListener(skippedArtists, settings.skippedArtists);
+  addInputListener(staticWindowTitle, settings.staticWindowTitle);
   addInputListener(singleInstance, settings.singleInstance);
   addSelectListener(theme, settings.theme);
   addInputListener(trayIcon, settings.trayIcon);
@@ -312,6 +319,7 @@ window.addEventListener("DOMContentLoaded", () => {
     settings.discord.showSong,
     switchesWithSettings.discord_show_song
   );
+  addInputListener(discord_show_idle, settings.discord.showIdle);
   addInputListener(discord_idle_text, settings.discord.idleText);
   addInputListener(discord_using_text, settings.discord.usingText);
 });

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.1/css/font-awesome.min.css">
 </head>
 
 <body class="settings-window">
@@ -106,6 +106,16 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
+            <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>
+              </div>
+              <label class="switch">
+                <input id="staticWindowTitle" type="checkbox" />
+                <span class="switch__slider"></span>
+              </label>
+            </div>
             <div class="group__option">
               <div class="group__description">
                 <h4>Minimize on Close</h4>
@@ -227,6 +237,17 @@
             </div>
             <div id="discord_options">
 
+              <div class="group__option" class="hidden">
+                <div class="group__description">
+                  <h4>Show Idle Text</h4>
+                  <p>Should the idle text be shown when idle?</p>
+                </div>
+                <label class="switch">
+                  <input id="discord_show_idle" type="checkbox" />
+                  <span class="switch__slider"></span>
+                </label>
+              </div>
+
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <h4>Idle Text</h4>
@@ -457,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.15.0">5.15.0</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

@@ -10,7 +10,7 @@ import {
 } from "./features/listenbrainz/listenbrainz";
 import { StoreData } from "./features/listenbrainz/models/storeData";
 import { Logger } from "./features/logger";
-import { Songwhip } from "./features/songwhip/songwhip";
+import { SharingService } from "./features/sharingService/sharingService";
 import { addCustomCss } from "./features/theming/theming";
 import { convertDurationToSeconds } from "./features/time/parse";
 import { MediaInfo } from "./models/mediaInfo";
@@ -48,17 +48,18 @@ const elements = {
   search: '[class^="searchField"]',
   shuffle: '*[data-test="shuffle"]',
   repeat: '*[data-test="repeat"]',
-  account: '*[class^="profileOptions"]',
+  account: '*[data-test^="profile-image-button"]',
-  settings: '*[data-test^="open-settings"]',
+  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"]',
+  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"]',
@@ -114,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/")) {
+      if (globalThis.location.href.includes("/album/")) {
-      const albumName = window.document.querySelector(this.album_header_title);
+        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/") ||
+        globalThis.location.href.includes("/playlist/") ||
-      window.location.href.includes("/mix/")
+        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);
@@ -136,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 () {
@@ -220,9 +225,9 @@ ListenBrainzStore.clear();
 function addHotKeys() {
   if (settingsStore.get(settings.enableCustomHotkeys)) {
     addHotkey("Control+p", function () {
-      elements.click("account");
-      setTimeout(() => {
       elements.click("settings");
+      setTimeout(() => {
+        elements.click("openSettings");
       }, 100);
     });
     addHotkey("Control+l", function () {
@@ -254,11 +259,10 @@ function addHotKeys() {
       elements.click("repeat");
     });
     addHotkey("control+w", async function () {
-      const result = await ipcRenderer.invoke(globalEvents.whip, getTrackURL());
+      const url = SharingService.getUniversalLink(getTrackURL());
-      const url = Songwhip.getWhipUrl(result);
       clipboard.writeText(url);
       new Notification({
-        title: `Successfully whipped: `,
+        title: `Universal link generated: `,
         body: `URL copied to clipboard: ${url}`,
       }).show();
     });
@@ -394,8 +398,24 @@ function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
   if (mediaInfo) {
     currentMediaInfo = mediaInfo;
     ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
-    if (settingsStore.get(settings.notifications) && notify) {
+    updateMpris(mediaInfo);
-      if (currentNotification) currentNotification.close();
+    updateListenBrainz(mediaInfo);
+    if (notify) {
+      sendNotification(mediaInfo);
+    }
+  }
+}
+
+/**
+ * send a desktop notification if enabled in settings
+ * @param mediaInfo
+ * @param notify Whether to notify
+ */
+async function sendNotification(mediaInfo: MediaInfo) {
+  if (settingsStore.get(settings.notifications)) {
+    if (currentNotification) {
+      currentNotification.close();
+    }
     currentNotification = new Notification({
       title: mediaInfo.title,
       body: mediaInfo.artists,
@@ -403,10 +423,6 @@ function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
     });
     currentNotification.show();
   }
-
-    updateMpris(mediaInfo);
-    updateListenBrainz(mediaInfo);
-  }
 }
 
 function addMPRIS() {
@@ -471,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(),
@@ -538,6 +555,7 @@ setInterval(function () {
   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();
@@ -582,7 +600,9 @@ setInterval(function () {
     };
 
     // update title, url and play info with new info
-    setTitle(songDashArtistTitle);
+    settingsStore.get(settings.staticWindowTitle)
+      ? setTitle(staticTitle)
+      : setTitle(songDashArtistTitle);
     getTrackURL();
     currentSong = songDashArtistTitle;
     currentPlayStatus = currentStatus;

src/scripts/discord.ts

@@ -1,4 +1,4 @@
-import { Client, Presence } from "discord-rpc";
+import { Client, SetActivity } from "@xhayper/discord-rpc";
 import { app, ipcMain } from "electron";
 import { globalEvents } from "../constants/globalEvents";
 import { settings } from "../constants/settings";
@@ -12,9 +12,13 @@ const clientId = "833617820704440341";
 
 export let rpc: Client;
 
+const ACTIVITY_LISTENING = 2;
+const MAX_RETRIES = 5;
+const RETRY_DELAY = 10000;
+
 const observer = () => {
   if (rpc) {
-    rpc.setActivity(getActivity());
+    updateActivity();
   }
 };
 
@@ -22,10 +26,20 @@ const defaultPresence = {
   largeImageKey: "tidal-hifi-icon",
   largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
   instance: false,
+  type: ACTIVITY_LISTENING
 };
 
-const getActivity = (): Presence => {
+const updateActivity = () => {
-  const presence: Presence = { ...defaultPresence };
+  const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
+  if (mediaInfo.status === MediaStatus.paused && !showIdle) {
+    rpc.user?.clearActivity();
+  } else {
+    rpc.user?.setActivity(getActivity());
+  }
+};
+
+const getActivity = (): SetActivity => {
+  const presence: SetActivity = { ...defaultPresence };
 
   if (mediaInfo.status === MediaStatus.paused) {
     presence.details =
@@ -41,6 +55,7 @@ const getActivity = (): Presence => {
         settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
     }
   }
+
   return presence;
 
   function getFromStore() {
@@ -54,18 +69,33 @@ const getActivity = (): Presence => {
     return { includeTimestamps, detailsPrefix, buttonText };
   }
 
-  function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) {
+  /**
-    if (mediaInfo.url) {
+   * Pad a string using spaces to at least 2 characters
-      presence.details = `${detailsPrefix}${mediaInfo.title}`;
+   * @param input string to pad with 2 characters
-      presence.state = mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)";
+   * @returns
-      presence.largeImageKey = mediaInfo.image;
+   */
-      if (mediaInfo.album) {
+  function pad(input: string): string {
-        presence.largeImageText = mediaInfo.album;
+    return input.padEnd(2, " ");
   }
+
+  function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) {
+    // discord requires a minimum of 2 characters
+    const title = pad(mediaInfo.title);
+    const album = pad(mediaInfo.album);
+    const artists = pad(mediaInfo.artists);
+
+    if (mediaInfo.url) {
+      presence.details = `${detailsPrefix}${title}`;
+      presence.state = artists ? artists : "unknown artist(s)";
+      presence.largeImageKey = mediaInfo.image;
+      if (album) {
+        presence.largeImageText = album;
+      }
+
       presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
     } else {
-      presence.details = `Watching ${mediaInfo.title}`;
+      presence.details = `Watching ${title}`;
-      presence.state = mediaInfo.artists;
+      presence.state = artists;
     }
   }
 
@@ -73,11 +103,29 @@ const getActivity = (): Presence => {
     if (includeTimestamps) {
       const currentSeconds = convertDurationToSeconds(mediaInfo.current);
       const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
-      const date = new Date();
+      const now = Math.trunc((Date.now() + 500) / 1000);
-      const now = (date.getTime() / 1000) | 0;
+      presence.startTimestamp = now - currentSeconds;
-      const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
+      presence.endTimestamp = presence.startTimestamp + durationSeconds;
-      presence.startTimestamp = now;
+    }
-      presence.endTimestamp = remaining;
+  }
+};
+
+/**
+ * Try to login to RPC and retry if it errors
+ * @param retryCount Max retry count
+ */
+const connectWithRetry = async (retryCount = 0) => {
+  try {
+    await rpc.login();
+    Logger.log('Connected to Discord');
+    rpc.on("ready", updateActivity);
+    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})`);
+      setTimeout(() => connectWithRetry(retryCount + 1), RETRY_DELAY);
+    } else {
+      Logger.log('Failed to connect to Discord after maximum retry attempts');
     }
   }
 };
@@ -86,18 +134,8 @@ const getActivity = (): Presence => {
  * Set up the discord rpc and listen on globalEvents.updateInfo
  */
 export const initRPC = () => {
-  rpc = new Client({ transport: "ipc" });
+  rpc = new Client({ transport: {type: "ipc"}, clientId });
-  rpc.login({ clientId }).then(
+  connectWithRetry();
-    () => {
-      rpc.on("ready", () => {
-        rpc.setActivity(getActivity());
-      });
-      ipcMain.on(globalEvents.updateInfo, observer);
-    },
-    () => {
-      Logger.log("Can't connect to Discord, is it running?");
-    }
-  );
 };
 
 /**
@@ -105,7 +143,7 @@ export const initRPC = () => {
  */
 export const unRPC = () => {
   if (rpc) {
-    rpc.clearActivity();
+    rpc.user?.clearActivity();
     rpc.destroy();
     rpc = null;
     ipcMain.removeListener(globalEvents.updateInfo, observer);

src/scripts/settings.ts

@@ -43,6 +43,7 @@ export const settingsStore = new Store({
     enableDiscord: false,
     discord: {
       showSong: true,
+      showIdle: true,
       idleText: "Browsing Tidal",
       usingText: "Playing media on TIDAL",
       includeTimestamps: true,
@@ -68,6 +69,7 @@ export const settingsStore = new Store({
     singleInstance: true,
     skipArtists: false,
     skippedArtists: [""],
+    staticWindowTitle: false,
     theme: "none",
     trayIcon: true,
     updateFrequency: 500,
@@ -115,6 +117,9 @@ export const settingsStore = new Store({
         { key: settings.advanced.tidalUrl, value: "https://listen.tidal.com" },
       ]);
     },
+    "5.16.0": (migrationStore) => {
+      buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
+    },
   },
 });