Merge e37b2f99cc into 1afd4d22a6

.github/workflows/build.yml

@@ -9,7 +9,6 @@ on:
     branches-ignore:
       - master
       - develop
-  workflow_dispatch:
 jobs:
   build_on_linux:
     runs-on: ubuntu-latest
@@ -21,7 +20,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
 
@@ -31,7 +30,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
 
@@ -41,6 +40,6 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build

.github/workflows/release.yml

@@ -8,7 +8,6 @@ on:
   pull_request:
     branches:
       - master
-  workflow_dispatch:
 
 jobs:
   build_on_linux:
@@ -21,7 +20,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -35,7 +34,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -49,7 +48,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master

.stylelintrc.json

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

.vscode/http/settings/skipped-artists/addArtists.http

@@ -1,5 +0,0 @@
-POST /settings/skipped-artists HTTP/1.1
-Host: localhost:47836
-Content-Type: application/json
-
-["abc", "def"]

.vscode/http/settings/skipped-artists/addCurrent.http

@@ -1,2 +0,0 @@
-POST /settings/skipped-artists/current HTTP/1.1
-Host: localhost:47836

.vscode/http/settings/skipped-artists/removeArtists.http

@@ -1,5 +0,0 @@
-POST /settings/skipped-artists/delete HTTP/1.1
-Host: localhost:47836
-Content-Type: application/json
-
-["abc", "def"]

.vscode/http/settings/skipped-artists/removeCurrent.http

@@ -1,2 +0,0 @@
-DELETE /settings/skipped-artists/current HTTP/1.1
-Host: localhost:47836

.vscode/settings.json

@@ -2,7 +2,6 @@
   "cSpell.words": [
     "Brainz",
     "Castlabs",
-    "Fi's",
     "flac",
     "Flatpak",
     "geqnfr",
@@ -14,6 +13,7 @@
     "rescrobbler",
     "scrobble",
     "scrobbling",
+    "Songwhip",
     "trackid",
     "tracklist",
     "widevine",

CHANGELOG.md

@@ -4,121 +4,14 @@ 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.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)
-- 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
-  - implements [#437](https://github.com/Mastermindzh/tidal-hifi/issues/437)
-
-## [5.14.1]
-
-- Fixed `getAlbumName` not finding album name whilst on queue page
-- Added all mediaInfo to mpris interface using the `custom:` prefix
-
-## [5.14]
-
-- Simplified `MediaInfo` & `Options` types
-- Added `playingFrom` information to the info API
-  - also changed the way we update Album info since Playing From now shows the correct Album.
-- API now allows you to set the `hostname` so you can control who can interact with the API.
-- Reworked swagger generation hotfix to properly generate `swagger.json` during the compile step
-  - Might switch to tsoa in the future, idk yet.
-- Added [Tidal Magazine](https://tidal.com/magazine/) integration (in the menubar or use `Ctrl + M`)
-
-## [5.13.1]
-
-- removed Swagger generation step in favor of pre-generated file.
-  - This also fixes the API issue [#409](https://github.com/Mastermindzh/tidal-hifi/issues/409)
-  - This also stops TIDAL-hifi from scanning your entire home directory... the glob was very broad apparently.
-
-## [5.13.0]
-
-- Fixed [#403](https://github.com/Mastermindzh/tidal-hifi/issues/403) "cannot read shuffle of undefined" error
-- Added an API to add & delete entries from the skippedArtists list in the settings. fixes [#405](https://github.com/Mastermindzh/tidal-hifi/issues/405)
-  - `GET /settings/skipped-artists` -> get list of skipped artists
-  - `POST /settings/skipped-artists` -> add to the list of skipped artists
-  - `POST /settings/skipped-artists/delete` -> delete from the list of skipped artists
-  - `POST /settings/skipped-artists/current` -> skip the current artist
-  - `DELETE /settings/skipped-artists/current` -> delete the current artist from the skip list
-  - Added Swagger documentation to the new endpoints:
-    ![picture of swagger documentation](./docs/images/swagger.png)
-- CORS support added by [Mjokfox](https://github.com/Mjokfox)
-
-## [5.12.0]
-
-- Added Shuffle and Repeat state to API response - By [ThatGravyBoat](https://github.com/ThatGravyBoat)
-
-## [5.11.0]
-
-- Re-implemented the API, added support for duration/current in seconds & shuffle+repeat
-  - made the original API "legacy" (still works the same)
-  - Now using the correct HTTP verb for all new endpoints
-- Implemented TIDAL's universal links. All links are now universal.
-- Custom `tidal://` protocol fixed - By [TheRockYT](https://github.com/TheRockYT)
-- Global media shortcuts removed since TIDAL includes them by default - By [TheRockYT](https://github.com/TheRockYT)
-
-- Fixes
-  - [#390](https://github.com/Mastermindzh/tidal-hifi/issues/390)
-  - [#376](https://github.com/Mastermindzh/tidal-hifi/issues/376)
-  - [#383](https://github.com/Mastermindzh/tidal-hifi/issues/383)
-  - [#393](https://github.com/Mastermindzh/tidal-hifi/issues/393)
-
-## [5.10.0]
-
-- TIDAL will now close the previous notification if a new one is sent whilst the old is still visible. [#364](https://github.com/Mastermindzh/tidal-hifi/pull/364)
-- Updated developer documentation to get started in README [#365](https://github.com/Mastermindzh/tidal-hifi/pull/365)
-- Links in the about window now open in the user's default browser. fixes [#360](https://github.com/Mastermindzh/tidal-hifi/issues/360)
-- Refactored "nowPlaying" code to always display the current state, even when the built-in UI is updated.
-  - fixes [#351](https://github.com/Mastermindzh/tidal-hifi/issues/351)
-  - fixes [#356](https://github.com/Mastermindzh/tidal-hifi/issues/356)
-  - fixes [#370](https://github.com/Mastermindzh/tidal-hifi/issues/370)
-- Reverted to using old icon syntax with icons in the build directory. fixes [#350](https://github.com/Mastermindzh/tidal-hifi/issues/350)
-- Enabled wayland platform flags by default when launching through .desktop file
-  - fixes [#273](https://github.com/Mastermindzh/tidal-hifi/issues/273)
-  - fixes [#347](https://github.com/Mastermindzh/tidal-hifi/issues/347)
-
-## [5.9.0]
-
-- More Discord options:
-  - Added the ability to hide the current song from the discord activity and display a custom text instead
-  - Added the ability to customize the text that is shown when no song is playing
-  - Discord now reacts to pausing/unpausing events
-- Refactored media info updates so it only updates the required info, fixes #342, #306
-- Added 5.9.0 logs/versions/migrations
-
-### Fixed
-
-- Fixed chromium mediaSession instance showing up. fixes #338 #198
-- Set a new icon, should fix #302
-- Made sure settingsWindow exists before operating on it. fixes #344
-
 ## [5.8.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`

README.md

@@ -26,7 +26,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
     - [Using source](#using-source)
   - [Integrations](#integrations)
   - [Known bugs](#known-bugs)
-    - [DRM not working on Windows (error S6007)](#drm-not-working-on-windows-error-s6007)
+    - [DRM not working on Windows](#drm-not-working-on-windows)
   - [Special thanks to](#special-thanks-to)
   - [Donations](#donations)
   - [Images](#images)
@@ -43,13 +43,13 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 - Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
 - Better icons thanks to [Papirus-icon-theme](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/)
 - [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
-- API for status, playback and settings (see the [/docs](http://localhost:47836/docs/) route)
+- API for status and playback
 - Disabled audio & visual ads, unlocked lyrics, suggested track, track info, and unlimited skips thanks to uBlockOrigin custom filters ([source](https://github.com/uBlockOrigin/uAssets/issues/17495))
 - 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
 - UI + Json config (`~/.config/tidal-hifi/`, or `~/.var/app/com.mastermindzh.tidal-hifi/` for Flatpak)
 
@@ -130,13 +130,10 @@ nix-env -iA nixpkgs.tidal-hifi
 
 To install and work with the code on this project follow these steps:
 
-- `git clone https://github.com/Mastermindzh/tidal-hifi.git`
+- git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git)
-- `cd tidal-hifi`
+- cd TIDAL Hi-Fi
-- `npm install`
+- npm install
-- `npm run watch` to watch for auto-reload of Typescript/SCSS changes.
+- npm start
-  - `npm run compile` can be used to trigger it once
-- `npm watchStart` to auto watch for any updates files and reload Tidal Hi-Fi
-  - `npm start` can be used to run Tidal Hi-Fi manually once
 
 ## Integrations
 
@@ -152,13 +149,11 @@ Integrations with other projects that are not included natively:
 
 ## Known bugs
 
-### DRM not working on Windows (error S6007)
+### DRM not working on Windows
 
 Most Windows users run into DRM issues when trying to use TIDAL Hi-Fi.
 Nothing I can do about that I'm afraid... Tidal is working on removing/changing DRM so when they finish with that we can give it another shot.
 
-Until then you'll have to use the official app unfortunately.
-
 ## Special thanks to
 
 - [Castlabs](https://castlabs.com/)

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

@@ -11,16 +11,10 @@ extraResources:
   - "themes/**"
 linux:
   category: AudioVideo
-  icon: build/icons
+  icon: assets/icons
   target:
     - dir
   executableName: tidal-hifi
-  executableArgs:
-    [
-      "--enable-features=UseOzonePlatform",
-      "--ozone-platform-hint=auto",
-      "--enable-features=WaylandWindowDecorations",
-    ]
   desktop:
     Encoding: UTF-8
     Name: TIDAL Hi-Fi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.17.0",
+  "version": "5.8.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -8,10 +8,9 @@
     "watchStart": "nodemon dist -x \"npm run start\"",
     "compile": "tsc && npm run sass-and-copy",
     "deps": "npm run watch",
-    "watch": "tsc-watch --onSuccess \"npm run compile-all\"",
+    "watch": "tsc-watch --onSuccess \"npm run sass-and-copy\"",
     "copy-files": "copyfiles -u 1 --exclude './src/**/*.ts' --exclude './src/**/*.scss' \"./src/**/*\" ts-dist",
     "copy-themes-dev": "copyfiles -u 1 \"./themes/*\" node_modules/electron/dist/resources",
-    "compile-all": "npm run sass-and-copy && ts-node scripts/generate-swagger.ts",
     "sass-and-copy": "npm run sass && npm run copy-files && npm run copy-themes-dev",
     "build": "npm run builder -- -c ./build/electron-builder.yml",
     "build-deb": "npm run builder -- -c ./build/electron-builder.deb.yml",
@@ -23,7 +22,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 +39,38 @@
   "homepage": "https://github.com/Mastermindzh/tidal-hifi",
   "license": "MIT",
   "dependencies": {
-    "@electron/remote": "^2.1.2",
+    "@electron/remote": "^2.1.1",
-    "@types/swagger-jsdoc": "^6.0.4",
+    "axios": "^1.6.5",
-    "@xhayper/discord-rpc": "^1.2.0",
+    "discord-rpc": "^4.0.1",
-    "axios": "^1.7.7",
+    "electron-store": "^8.1.0",
-    "cors": "^2.8.5",
+    "express": "^4.18.2",
-    "electron-store": "^8.2.0",
+    "hotkeys-js": "^3.13.5",
-    "express": "^4.21.1",
-    "hotkeys-js": "^3.13.7",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.79.4",
+    "sass": "^1.69.7"
-    "swagger-ui-express": "^5.0.1"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "@types/cors": "^2.8.17",
+    "@types/discord-rpc": "^4.0.8",
     "@types/express": "^4.17.21",
-    "@types/node": "^20.14.10",
+    "@types/node": "^20.10.6",
     "@types/request": "^2.48.12",
-    "@types/swagger-ui-express": "^4.1.6",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
+    "@typescript-eslint/parser": "^6.18.0",
-    "@typescript-eslint/parser": "^7.15.0",
     "copyfiles": "^2.4.1",
-    "electron": "git+https://github.com/castlabs/electron-releases#v31.1.0+wvcus",
+    "electron": "git+https://github.com/castlabs/electron-releases#v28.1.1+wvcus",
-    "electron-builder": "~24.9.4",
+    "electron-builder": "^24.9.1",
-    "eslint": "^8.57.0",
+    "eslint": "^8.56.0",
     "js-yaml": "^4.1.0",
     "markdown-toc": "^1.2.0",
-    "nodemon": "^3.1.4",
+    "nodemon": "^3.0.2",
-    "prettier": "^3.3.2",
+    "prettier": "^3.1.1",
-    "stylelint": "^16.6.1",
+    "stylelint": "^16.1.0",
-    "stylelint-config-standard": "^36.0.1",
+    "stylelint-config-standard": "^36.0.0",
-    "stylelint-config-standard-scss": "^13.1.0",
+    "stylelint-config-standard-scss": "^13.0.0",
     "stylelint-prettier": "^5.0.0",
-    "swagger-jsdoc": "^6.2.8",
+    "tsc-watch": "^6.0.4",
-    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
-    "tsc-watch": "^6.2.0",
-    "typescript": "^5.5.3"
   },
   "prettier": "@mastermindzh/prettier-config"
 }

scripts/generate-swagger.ts

@@ -1,30 +0,0 @@
-import fs from "fs";
-import swaggerjsdoc from "swagger-jsdoc";
-import packagejson from "./../package.json";
-
-const specs = swaggerjsdoc({
-  definition: {
-    openapi: "3.1.0",
-    info: {
-      title: "TIDAL Hi-Fi API",
-      version: packagejson.version,
-      description: "",
-      license: {
-        name: packagejson.license,
-        url: "https://github.com/Mastermindzh/tidal-hifi/blob/master/LICENSE",
-      },
-      contact: {
-        name: "Rick <mastermindzh> van Lieshout",
-        url: "https://www.rickvanlieshout.com",
-      },
-    },
-    externalDocs: {
-      description: "swagger.json",
-      url: "swagger.json",
-    },
-  },
-  apis: ["**/*.ts"],
-});
-
-fs.writeFileSync("src/features/api/swagger.json", JSON.stringify(specs, null, 2), "utf8");
-console.log("Written swagger.json");

scripts/verifyElements.js

@@ -16,9 +16,8 @@
     search: '[class^="searchField"]',
     shuffle: '*[data-test="shuffle"]',
     repeat: '*[data-test="repeat"]',
-    account: '*[data-test^="profile-image-button"]',
+    account: '*[class^="profileOptions"]',
-    settings: '*[data-test^="sidebar-menu-button"]',
+    settings: '*[data-test^="open-settings"]',
-    openSettings: '*[data-test^="open-settings"]',
     media: '*[data-test="current-media-imagery"]',
     image: "img",
     current: '*[data-test="current-time"]',
@@ -26,8 +25,7 @@
     bar: '*[data-test="progress-bar"]',
     footer: "#footerPlayer",
     mediaItem: "[data-type='mediaItem']",
-    album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
+    album_header_title: '.header-details [data-test="title"]',
-    playingFrom: '*[class^="playingFrom"] 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,9 +10,7 @@ export const globalEvents = {
   showSettings: "showSettings",
   storeChanged: "storeChanged",
   error: "error",
-  getUniversalLink: "getUniversalLink",
+  whip: "whip",
   log: "log",
   toggleFavorite: "toggleFavorite",
-  toggleShuffle: "toggleShuffle",
-  toggleRepeat: "toggleRepeat",
 };

src/constants/settings.ts

@@ -10,15 +10,10 @@
  */
 export const settings = {
   adBlock: "adBlock",
-  advanced: {
-    root: "advanced",
-    tidalUrl: "advanced.tidalUrl",
-  },
   api: "api",
   apiSettings: {
     root: "apiSettings",
     port: "apiSettings.port",
-    hostname: "apiSettings.hostname",
   },
   customCSS: "customCSS",
   disableBackgroundThrottle: "disableBackgroundThrottle",
@@ -30,9 +25,8 @@ export const settings = {
     buttonText: "discord.buttonText",
     includeTimestamps: "discord.includeTimestamps",
     showSong: "discord.showSong",
-    showIdle: "discord.showIdle",
     idleText: "discord.idleText",
-    usingText: "discord.usingText",
+    listeningText: "discord.listeningText",
   },
   ListenBrainz: {
     root: "ListenBrainz",
@@ -55,7 +49,6 @@ export const settings = {
   singleInstance: "singleInstance",
   skipArtists: "skipArtists",
   skippedArtists: "skippedArtists",
-  staticWindowTitle: "staticWindowTitle",
   theme: "theme",
   trayIcon: "trayIcon",
   updateFrequency: "updateFrequency",

src/features/api/features/current.ts

@@ -1,123 +0,0 @@
-import { Request, Response, Router } from "express";
-import fs from "fs";
-import { mediaInfo } from "../../../scripts/mediaInfo";
-
-export const addCurrentInfo = (expressApp: Router) => {
-  /**
-   * @swagger
-   * tags:
-   *   name: current
-   *   description: The current media info API
-   * components:
-   *   schemas:
-   *     MediaInfo:
-   *       type: object
-   *       properties:
-   *         title:
-   *           type: string
-   *         artists:
-   *           type: string
-   *         album:
-   *           type: string
-   *         icon:
-   *           type: string
-   *           format: uri
-   *         playingFrom:
-   *           type: string
-   *         status:
-   *           type: string
-   *         url:
-   *           type: string
-   *           format: uri
-   *         current:
-   *           type: string
-   *         currentInSeconds:
-   *           type: integer
-   *         duration:
-   *           type: string
-   *         durationInSeconds:
-   *           type: integer
-   *         image:
-   *           type: string
-   *           format: uri
-   *         favorite:
-   *           type: boolean
-   *         player:
-   *           type: object
-   *           properties:
-   *             status:
-   *               type: string
-   *             shuffle:
-   *               type: boolean
-   *             repeat:
-   *               type: string
-   *         artist:
-   *           type: string
-   *       example:
-   *         title: "Sample Title"
-   *         artists: "Sample Artist"
-   *         album: "Sample Album"
-   *         icon: "/path/to/sample/icon.jpg"
-   *         playingFrom: "Sample Playlist"
-   *         status: "playing"
-   *         url: "https://tidal.com/browse/track/sample"
-   *         current: "1:23"
-   *         currentInSeconds: 83
-   *         duration: "3:45"
-   *         durationInSeconds: 225
-   *         image: "https://example.com/sample-image.jpg"
-   *         favorite: true
-   *         player:
-   *           status: "playing"
-   *           shuffle: true
-   *           repeat: "one"
-   *         artist: "Sample Artist"
-   */
-
-  /**
-   * @swagger
-   * /current:
-   *   get:
-   *     summary: Get current media info
-   *     tags: [current]
-   *     responses:
-   *       200:
-   *         description: Current media info
-   *         content:
-   *           application/json:
-   *             schema:
-   *               $ref: '#/components/schemas/MediaInfo'
-   */
-  expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
-
-  /**
-   * @swagger
-   * /current/image:
-   *   get:
-   *     summary: Get current media image
-   *     tags: [current]
-   *     responses:
-   *       200:
-   *         description: Current media image
-   *         content:
-   *           image/png:
-   *             schema:
-   *               type: string
-   *               format: binary
-   *       404:
-   *         description: Not found
-   */
-  expressApp.get("/current/image", getCurrentImage);
-};
-
-export const getCurrentImage = (req: Request, res: Response) => {
-  const stream = fs.createReadStream(mediaInfo.icon);
-  stream.on("open", function () {
-    res.set("Content-Type", "image/png");
-    stream.pipe(res);
-  });
-  stream.on("error", function () {
-    res.set("Content-Type", "text/plain");
-    res.status(404).end("Not found");
-  });
-};

src/features/api/features/player.ts

@@ -1,164 +0,0 @@
-import { BrowserWindow } from "electron";
-import { Router } from "express";
-import { globalEvents } from "../../../constants/globalEvents";
-import { settings } from "../../../constants/settings";
-import { MediaStatus } from "../../../models/mediaStatus";
-import { mediaInfo } from "../../../scripts/mediaInfo";
-import { settingsStore } from "../../../scripts/settings";
-import { handleWindowEvent } from "../helpers/handleWindowEvent";
-
-export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow) => {
-  const windowEvent = handleWindowEvent(mainWindow);
-  const createRoute = (route: string) => `/player${route}`;
-
-  /**
-   * @swagger
-   * tags:
-   *   name: player
-   *   description: The player control API
-   * components:
-   *   schemas:
-   *     OkResponse:
-   *       type: string
-   *       example: "OK"
-   */
-  const createPlayerAction = (route: string, action: string) => {
-    expressApp.post(createRoute(route), (req, res) => windowEvent(res, action));
-  };
-
-  if (settingsStore.get(settings.playBackControl)) {
-    /**
-     * @swagger
-     * /player/play:
-     *   post:
-     *     summary: Play the current media
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    createPlayerAction("/play", globalEvents.play);
-
-    /**
-     * @swagger
-     * /player/favorite/toggle:
-     *   post:
-     *     summary: Add the current media to your favorites, or remove it if its already added to your favorites
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    createPlayerAction("/favorite/toggle", globalEvents.toggleFavorite);
-
-    /**
-     * @swagger
-     * /player/pause:
-     *   post:
-     *     summary: Pause the current media
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    createPlayerAction("/pause", globalEvents.pause);
-
-    /**
-     * @swagger
-     * /player/next:
-     *   post:
-     *     summary: Play the next song
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    createPlayerAction("/next", globalEvents.next);
-
-    /**
-     * @swagger
-     * /player/previous:
-     *   post:
-     *     summary: Play the previous song
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    createPlayerAction("/previous", globalEvents.previous);
-
-    /**
-     * @swagger
-     * /player/shuffle/toggle:
-     *   post:
-     *     summary: Play the previous song
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    createPlayerAction("/shuffle/toggle", globalEvents.toggleShuffle);
-
-    /**
-     * @swagger
-     * /player/repeat/toggle:
-     *   post:
-     *     summary: Toggle the repeat status, toggles between "off" , "single" and "all"
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    createPlayerAction("/repeat/toggle", globalEvents.toggleRepeat);
-
-    /**
-     * @swagger
-     * /player/playpause:
-     *   post:
-     *     summary: Start playing the media if paused, or pause the media if playing
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    expressApp.post(createRoute("/playpause"), (req, res) => {
-      if (mediaInfo.status === MediaStatus.playing) {
-        windowEvent(res, globalEvents.pause);
-      } else {
-        windowEvent(res, globalEvents.play);
-      }
-    });
-  }
-};

src/features/api/features/settings/settings.ts

@@ -1,121 +0,0 @@
-import { Request, Router } from "express";
-import { settings } from "../../../../constants/settings";
-import { mediaInfo } from "../../../../scripts/mediaInfo";
-import {
-  addSkippedArtists,
-  removeSkippedArtists,
-  settingsStore,
-} from "../../../../scripts/settings";
-import { BrowserWindow } from "electron";
-import { globalEvents } from "../../../../constants/globalEvents";
-
-/**
- * @swagger
- * tags:
- *   name: settings
- *   description: The settings management API
- * components:
- *   schemas:
- *     StringArray:
- *       type: array
- *       items:
- *         type: string
- *       example: ["Artist1", "Artist2"]
- *
- * @param expressApp
- * @param mainWindow
- */
-export const addSettingsAPI = (expressApp: Router, mainWindow: BrowserWindow) => {
-  /**
-   * @swagger
-   * /settings/skipped-artists:
-   *   get:
-   *     summary: get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled
-   *     tags: [settings]
-   *     responses:
-   *       200:
-   *         description: The list book.
-   *         content:
-   *           application/json:
-   *             schema:
-   *              $ref: '#/components/schemas/StringArray'
-   */
-  expressApp.get("/settings/skipped-artists", (req, res) => {
-    res.json(settingsStore.get<string, string[]>(settings.skippedArtists));
-  });
-
-  /**
-   * @swagger
-   * /settings/skipped-artists:
-   *   post:
-   *     summary: Add new artists to the list of skipped artists
-   *     tags: [settings]
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             $ref: '#/components/schemas/StringArray'
-   *     responses:
-   *       200:
-   *         description: Ok
-   */
-  expressApp.post("/settings/skipped-artists", (req: Request<object, object, string[]>, res) => {
-    addSkippedArtists(req.body);
-    res.sendStatus(200);
-  });
-
-  /**
-   * @swagger
-   * /settings/skipped-artists/delete:
-   *   post:
-   *     summary: Remove artists from the list of skipped artists
-   *     tags: [settings]
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             $ref: '#/components/schemas/StringArray'
-   *     responses:
-   *       200:
-   *         description: Ok
-   */
-  expressApp.post(
-    "/settings/skipped-artists/delete",
-    (req: Request<object, object, string[]>, res) => {
-      removeSkippedArtists(req.body);
-      res.sendStatus(200);
-    }
-  );
-
-  /**
-   * @swagger
-   * /settings/skipped-artists/current:
-   *   post:
-   *     summary: Add the current artist to the list of skipped artists
-   *     tags: [settings]
-   *     responses:
-   *       200:
-   *        description: Ok
-   */
-  expressApp.post("/settings/skipped-artists/current", (req, res) => {
-    addSkippedArtists([mediaInfo.artists]);
-    mainWindow.webContents.send("globalEvent", globalEvents.next);
-    res.sendStatus(200);
-  });
-  /**
-   * @swagger
-   * /settings/skipped-artists/current:
-   *   delete:
-   *     summary: Remove the current artist from the list of skipped artists
-   *     tags: [settings]
-   *     responses:
-   *       200:
-   *        description: Ok
-   */
-  expressApp.delete("/settings/skipped-artists/current", (req, res) => {
-    removeSkippedArtists([mediaInfo.artists]);
-    res.sendStatus(200);
-  });
-};

src/features/api/helpers/handleWindowEvent.ts

@@ -1,12 +0,0 @@
-import { BrowserWindow } from "electron";
-import { Response } from "express";
-
-/**
- * Shorthand to handle a fire and forget global event
- * @param {*} res
- * @param {*} action
- */
-export const handleWindowEvent = (mainWindow: BrowserWindow) => (res: Response, action: string) => {
-  mainWindow.webContents.send("globalEvent", action);
-  res.sendStatus(200);
-};

src/features/api/index.ts

@@ -1,42 +0,0 @@
-import cors from "cors";
-import { BrowserWindow, dialog } from "electron";
-import express from "express";
-import swaggerUi from "swagger-ui-express";
-import { settingsStore } from "../../scripts/settings";
-import { settings } from "./../../constants/settings";
-import { addCurrentInfo } from "./features/current";
-import { addPlaybackControl } from "./features/player";
-import { addSettingsAPI } from "./features/settings/settings";
-import { addLegacyApi } from "./legacy";
-import swaggerSpec from "./swagger.json";
-
-/**
- * Function to enable TIDAL Hi-Fi's express api
- */
-export const startApi = (mainWindow: BrowserWindow) => {
-  const port = settingsStore.get<string, number>(settings.apiSettings.port);
-  const hostname = settingsStore.get<string, string>(settings.apiSettings.hostname) ?? "127.0.0.1";
-
-  const expressApp = express();
-  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));
-
-  // add features
-  addLegacyApi(expressApp, mainWindow);
-  addPlaybackControl(expressApp, mainWindow);
-  addCurrentInfo(expressApp);
-  addSettingsAPI(expressApp, mainWindow);
-
-  const expressInstance = expressApp.listen(port, hostname);
-  expressInstance.on("error", function (e: { code: string }) {
-    let message = e.code;
-    if (e.code === "EADDRINUSE") {
-      message = `Port ${port} in use.`;
-    }
-
-    dialog.showErrorBox("Api failed to start.", message);
-  });
-};

src/features/api/legacy.ts

@@ -1,160 +0,0 @@
-import { BrowserWindow } from "electron";
-import { Response, Router } from "express";
-import { globalEvents } from "../../constants/globalEvents";
-import { settings } from "../../constants/settings";
-import { MediaStatus } from "../../models/mediaStatus";
-import { mediaInfo } from "../../scripts/mediaInfo";
-import { settingsStore } from "../../scripts/settings";
-import { getCurrentImage } from "./features/current";
-
-/**
- * The legacy API, this will not be maintained and probably has duplicate code :)
- * @param expressApp
- * @param mainWindow
- */
-export const addLegacyApi = (expressApp: Router, mainWindow: BrowserWindow) => {
-  /**
-   * @swagger
-   * /image:
-   *   get:
-   *     summary: Get current image
-   *     tags: [legacy]
-   *     deprecated: true
-   *     responses:
-   *       200:
-   *         description: Current image
-   *         content:
-   *           image/png:
-   *             schema:
-   *               type: string
-   *               format: binary
-   *       404:
-   *         description: Not found
-   */
-  expressApp.get("/image", getCurrentImage);
-
-  if (settingsStore.get(settings.playBackControl)) {
-    addLegacyControls();
-  }
-  function addLegacyControls() {
-    /**
-     * @swagger
-     * /play:
-     *   get:
-     *     summary: Play the current media
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Action performed
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    expressApp.get("/play", ({ res }) => handleGlobalEvent(res, globalEvents.play));
-
-    /**
-     * @swagger
-     * /favorite/toggle:
-     *   get:
-     *     summary: Add the current media to your favorites, or remove it if its already added to your favorites
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    expressApp.post("/favorite/toggle", (req, res) =>
-      handleGlobalEvent(res, globalEvents.toggleFavorite)
-    );
-
-    /**
-     * @swagger
-     * /pause:
-     *   get:
-     *     summary: Pause the current media
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    expressApp.get("/pause", (req, res) => handleGlobalEvent(res, globalEvents.pause));
-
-    /**
-     * @swagger
-     * /next:
-     *   get:
-     *     summary: Play the next song
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    expressApp.get("/next", (req, res) => handleGlobalEvent(res, globalEvents.next));
-
-    /**
-     * @swagger
-     * /previous:
-     *   get:
-     *     summary: Play the previous song
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    expressApp.get("/previous", (req, res) => handleGlobalEvent(res, globalEvents.previous));
-
-    /**
-     * @swagger
-     * /playpause:
-     *   get:
-     *     summary: Toggle play/pause
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
-    expressApp.get("/playpause", (req, res) => {
-      if (mediaInfo.status === MediaStatus.playing) {
-        handleGlobalEvent(res, globalEvents.pause);
-      } else {
-        handleGlobalEvent(res, globalEvents.play);
-      }
-    });
-  }
-
-  /**
-   * Shorthand to handle a fire and forget global event
-   * @param {*} res
-   * @param {*} action
-   */
-  function handleGlobalEvent(res: Response, action: string) {
-    mainWindow.webContents.send("globalEvent", action);
-    res.sendStatus(200);
-  }
-};

src/features/api/swagger.json

@@ -1,535 +0,0 @@
-{
-  "openapi": "3.1.0",
-  "info": {
-    "title": "TIDAL Hi-Fi API",
-    "version": "5.17.0",
-    "description": "",
-    "license": {
-      "name": "MIT",
-      "url": "https://github.com/Mastermindzh/tidal-hifi/blob/master/LICENSE"
-    },
-    "contact": {
-      "name": "Rick <mastermindzh> van Lieshout",
-      "url": "https://www.rickvanlieshout.com"
-    }
-  },
-  "externalDocs": {
-    "description": "swagger.json",
-    "url": "swagger.json"
-  },
-  "paths": {
-    "/current": {
-      "get": {
-        "summary": "Get current media info",
-        "tags": ["current"],
-        "responses": {
-          "200": {
-            "description": "Current media info",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MediaInfo"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/current/image": {
-      "get": {
-        "summary": "Get current media image",
-        "tags": ["current"],
-        "responses": {
-          "200": {
-            "description": "Current media image",
-            "content": {
-              "image/png": {
-                "schema": {
-                  "type": "string",
-                  "format": "binary"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not found"
-          }
-        }
-      }
-    },
-    "/player/play": {
-      "post": {
-        "summary": "Play the current media",
-        "tags": ["player"],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/favorite/toggle": {
-      "post": {
-        "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": ["player"],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/pause": {
-      "post": {
-        "summary": "Pause the current media",
-        "tags": ["player"],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/next": {
-      "post": {
-        "summary": "Play the next song",
-        "tags": ["player"],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/previous": {
-      "post": {
-        "summary": "Play the previous song",
-        "tags": ["player"],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/shuffle/toggle": {
-      "post": {
-        "summary": "Play the previous song",
-        "tags": ["player"],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/repeat/toggle": {
-      "post": {
-        "summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
-        "tags": ["player"],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/playpause": {
-      "post": {
-        "summary": "Start playing the media if paused, or pause the media if playing",
-        "tags": ["player"],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/settings/skipped-artists": {
-      "get": {
-        "summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
-        "tags": ["settings"],
-        "responses": {
-          "200": {
-            "description": "The list book.",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StringArray"
-                }
-              }
-            }
-          }
-        }
-      },
-      "post": {
-        "summary": "Add new artists to the list of skipped artists",
-        "tags": ["settings"],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/StringArray"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Ok"
-          }
-        }
-      }
-    },
-    "/settings/skipped-artists/delete": {
-      "post": {
-        "summary": "Remove artists from the list of skipped artists",
-        "tags": ["settings"],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/StringArray"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Ok"
-          }
-        }
-      }
-    },
-    "/settings/skipped-artists/current": {
-      "post": {
-        "summary": "Add the current artist to the list of skipped artists",
-        "tags": ["settings"],
-        "responses": {
-          "200": {
-            "description": "Ok"
-          }
-        }
-      },
-      "delete": {
-        "summary": "Remove the current artist from the list of skipped artists",
-        "tags": ["settings"],
-        "responses": {
-          "200": {
-            "description": "Ok"
-          }
-        }
-      }
-    },
-    "/image": {
-      "get": {
-        "summary": "Get current image",
-        "tags": ["legacy"],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Current image",
-            "content": {
-              "image/png": {
-                "schema": {
-                  "type": "string",
-                  "format": "binary"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not found"
-          }
-        }
-      }
-    },
-    "/play": {
-      "get": {
-        "summary": "Play the current media",
-        "tags": ["legacy"],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Action performed",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/favorite/toggle": {
-      "get": {
-        "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": ["legacy"],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/pause": {
-      "get": {
-        "summary": "Pause the current media",
-        "tags": ["legacy"],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/next": {
-      "get": {
-        "summary": "Play the next song",
-        "tags": ["legacy"],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/previous": {
-      "get": {
-        "summary": "Play the previous song",
-        "tags": ["legacy"],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/playpause": {
-      "get": {
-        "summary": "Toggle play/pause",
-        "tags": ["legacy"],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  "components": {
-    "schemas": {
-      "MediaInfo": {
-        "type": "object",
-        "properties": {
-          "title": {
-            "type": "string"
-          },
-          "artists": {
-            "type": "string"
-          },
-          "album": {
-            "type": "string"
-          },
-          "icon": {
-            "type": "string",
-            "format": "uri"
-          },
-          "playingFrom": {
-            "type": "string"
-          },
-          "status": {
-            "type": "string"
-          },
-          "url": {
-            "type": "string",
-            "format": "uri"
-          },
-          "current": {
-            "type": "string"
-          },
-          "currentInSeconds": {
-            "type": "integer"
-          },
-          "duration": {
-            "type": "string"
-          },
-          "durationInSeconds": {
-            "type": "integer"
-          },
-          "image": {
-            "type": "string",
-            "format": "uri"
-          },
-          "favorite": {
-            "type": "boolean"
-          },
-          "player": {
-            "type": "object",
-            "properties": {
-              "status": {
-                "type": "string"
-              },
-              "shuffle": {
-                "type": "boolean"
-              },
-              "repeat": {
-                "type": "string"
-              }
-            }
-          },
-          "artist": {
-            "type": "string"
-          }
-        },
-        "example": {
-          "title": "Sample Title",
-          "artists": "Sample Artist",
-          "album": "Sample Album",
-          "icon": "/path/to/sample/icon.jpg",
-          "playingFrom": "Sample Playlist",
-          "status": "playing",
-          "url": "https://tidal.com/browse/track/sample",
-          "current": "1:23",
-          "currentInSeconds": 83,
-          "duration": "3:45",
-          "durationInSeconds": 225,
-          "image": "https://example.com/sample-image.jpg",
-          "favorite": true,
-          "player": {
-            "status": "playing",
-            "shuffle": true,
-            "repeat": "one"
-          },
-          "artist": "Sample Artist"
-        }
-      },
-      "OkResponse": {
-        "type": "string",
-        "example": "OK"
-      },
-      "StringArray": {
-        "type": "array",
-        "items": {
-          "type": "string"
-        },
-        "example": ["Artist1", "Artist2"]
-      }
-    }
-  },
-  "tags": [
-    {
-      "name": "current",
-      "description": "The current media info API"
-    },
-    {
-      "name": "player",
-      "description": "The player control API"
-    },
-    {
-      "name": "settings",
-      "description": "The settings management API"
-    }
-  ]
-}

src/features/listenbrainz/listenbrainz.ts

@@ -48,9 +48,6 @@ export class ListenBrainz {
       } else {
         // Fetches the oldData required for scrobbling and proceeds to construct a playing_now data payload for the Playing Now area
         const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
-        const tidalUrl =
-          settingsStore.get<string, string>(settings.advanced.tidalUrl) ||
-          "https://listen.tidal.com";
         const playing_data = {
           listen_type: "playing_now",
           payload: [
@@ -98,7 +95,7 @@ export class ListenBrainz {
                     additional_info: {
                       media_player: "Tidal Hi-Fi",
                       submission_client: "Tidal Hi-Fi",
-                      music_service: tidalUrl,
+                      music_service: "listen.tidal.com",
                       duration: oldData.duration,
                     },
                     artist_name: oldData.artists,

src/features/sharingService/sharingService.ts

@@ -1,10 +0,0 @@
-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

@@ -0,0 +1,21 @@
+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

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

src/features/songwhip/models/whip.ts

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,32 @@
+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/features/time/parse.ts

@@ -1,14 +0,0 @@
-/**
- * Convert a HH:MM:SS string (or variants such as MM:SS or SS) to plain seconds
- * @param duration in HH:MM:SS format
- * @returns number of seconds in duration
- */
-export const convertDurationToSeconds = (duration: string) => {
-  return duration
-    .split(":")
-    .reverse()
-    .map((val) => Number(val))
-    .reduce((previous, current, index) => {
-      return index === 0 ? current : previous + current * Math.pow(60, index);
-    }, 0);
-};

src/main.ts

@@ -1,19 +1,28 @@
 import { enable, initialize } from "@electron/remote/main";
-import { BrowserWindow, app, components, ipcMain, session } from "electron";
+import {
+  app,
+  BrowserWindow,
+  components,
+  globalShortcut,
+  ipcMain,
+  protocol,
+  session,
+} from "electron";
 import path from "path";
 import { globalEvents } from "./constants/globalEvents";
+import { mediaKeys } from "./constants/mediaKeys";
 import { settings } from "./constants/settings";
-import { startApi } from "./features/api";
 import { setDefaultFlags, setManagedFlagsFromSettings } from "./features/flags/flags";
 import {
   acquireInhibitorIfInactive,
   releaseInhibitorIfActive,
 } from "./features/idleInhibitor/idleInhibitor";
 import { Logger } from "./features/logger";
-import { SharingService } from "./features/sharingService/sharingService";
+import { Songwhip } from "./features/songwhip/songwhip";
 import { MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
 import { initRPC, rpc, unRPC } from "./scripts/discord";
+import { startExpress } from "./scripts/express";
 import { updateMediaInfo } from "./scripts/mediaInfo";
 import { addMenu } from "./scripts/menu";
 import {
@@ -24,6 +33,7 @@ import {
   showSettingsWindow,
 } from "./scripts/settings";
 import { addTray, refreshTray } from "./scripts/tray";
+const tidalUrl = "https://listen.tidal.com";
 let mainInhibitorId = -1;
 
 initialize();
@@ -39,9 +49,6 @@ const windowPreferences = {
 setDefaultFlags(app);
 setManagedFlagsFromSettings(app);
 
-const tidalUrl =
-  settingsStore.get<string, string>(settings.advanced.tidalUrl) || "https://listen.tidal.com";
-
 /**
  * Update the menuBarVisibility according to the store value
  *
@@ -54,31 +61,20 @@ function syncMenuBarWithStore() {
 }
 
 /**
- * @returns true/false based on whether the current window is the main window
+ * Determine whether the current window is the main window
+ * if singleInstance is requested.
+ * If singleInstance isn't requested simply return true
+ * @returns true if singInstance is not requested, otherwise true/false based on whether the current window is the main window
  */
-function isMainInstance() {
+function isMainInstanceOrMultipleInstancesAllowed() {
-  return app.requestSingleInstanceLock();
+  if (settingsStore.get(settings.singleInstance)) {
-}
+    const gotTheLock = app.requestSingleInstanceLock();
 
-/**
+    if (!gotTheLock) {
- * @returns true/false based on whether multiple instances are allowed
+      return false;
- */
-function isMultipleInstancesAllowed() {
-  return !settingsStore.get(settings.singleInstance);
-}
-
-/**
- * @param args the arguments passed to the app
- * @returns the custom protocol url if it exists, otherwise null
- */
-function getCustomProtocolUrl(args: string[]) {
-  const customProtocolArg = args.find((arg) => arg.startsWith(PROTOCOL_PREFIX));
-
-  if (!customProtocolArg) {
-    return null;
     }
-
+  }
-  return tidalUrl + "/" + customProtocolArg.substring(PROTOCOL_PREFIX.length + 3);
+  return true;
 }
 
 function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
@@ -102,16 +98,8 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
   registerHttpProtocols();
   syncMenuBarWithStore();
 
-  // find the custom protocol argument
-  const customProtocolUrl = getCustomProtocolUrl(process.argv);
-
-  if (customProtocolUrl) {
-    // load the url received from the custom protocol
-    mainWindow.loadURL(customProtocolUrl);
-  } else {
   // load the Tidal website
   mainWindow.loadURL(tidalUrl);
-  }
 
   if (settingsStore.get(settings.disableBackgroundThrottle)) {
     // prevent setInterval lag
@@ -151,32 +139,27 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
 }
 
 function registerHttpProtocols() {
+  protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request) => {
+    mainWindow.loadURL(`${tidalUrl}/${request.url.substring(PROTOCOL_PREFIX.length + 3)}`);
+  });
   if (!app.isDefaultProtocolClient(PROTOCOL_PREFIX)) {
     app.setAsDefaultProtocolClient(PROTOCOL_PREFIX);
   }
 }
 
+function addGlobalShortcuts() {
+  Object.keys(mediaKeys).forEach((key) => {
+    globalShortcut.register(`${key}`, () => {
+      mainWindow.webContents.send("globalEvent", `${(mediaKeys as any)[key]}`);
+    });
+  });
+}
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
 app.on("ready", async () => {
-  // check if the app is the main instance and multiple instances are not allowed
+  if (isMainInstanceOrMultipleInstancesAllowed()) {
-  if (isMainInstance() && !isMultipleInstancesAllowed()) {
-    app.on("second-instance", (_, commandLine) => {
-      const customProtocolUrl = getCustomProtocolUrl(commandLine);
-
-      if (customProtocolUrl) {
-        mainWindow.loadURL(customProtocolUrl);
-      }
-
-      if (mainWindow) {
-        if (mainWindow.isMinimized()) mainWindow.restore();
-        mainWindow.focus();
-      }
-    });
-  }
-
-  if (isMainInstance() || isMultipleInstancesAllowed()) {
     await components.whenReady();
 
     // Adblock
@@ -191,11 +174,12 @@ app.on("ready", async () => {
     createWindow();
     addMenu(mainWindow);
     createSettingsWindow();
+    addGlobalShortcuts();
     if (settingsStore.get(settings.trayIcon)) {
       addTray(mainWindow, { icon });
       refreshTray(mainWindow);
     }
-    settingsStore.get(settings.api) && startApi(mainWindow);
+    settingsStore.get(settings.api) && startExpress(mainWindow);
     settingsStore.get(settings.enableDiscord) && initRPC();
   } else {
     app.quit();
@@ -250,8 +234,8 @@ ipcMain.on(globalEvents.error, (event) => {
   console.log(event);
 });
 
-ipcMain.handle(globalEvents.getUniversalLink, async (event, url) => {
+ipcMain.handle(globalEvents.whip, async (event, url) => {
-  return SharingService.getUniversalLink(url);
+  return Songwhip.whip(url);
 });
 
 Logger.watch(ipcMain);

src/models/mediaInfo.ts

@@ -1,4 +1,3 @@
-import { MediaPlayerInfo } from "./mediaPlayerInfo";
 import { MediaStatus } from "./mediaStatus";
 
 export interface MediaInfo {
@@ -8,12 +7,8 @@ export interface MediaInfo {
   icon: string;
   status: MediaStatus;
   url: string;
-  playingFrom: string;
   current: string;
-  currentInSeconds?: number;
   duration: string;
-  durationInSeconds?: number;
   image: string;
   favorite: boolean;
-  player?: MediaPlayerInfo;
 }

src/models/mediaPlayerInfo.ts

@@ -1,8 +0,0 @@
-import { RepeatState } from "./repeatState";
-import { MediaStatus } from "./mediaStatus";
-
-export interface MediaPlayerInfo {
-  status: MediaStatus;
-  shuffle: boolean;
-  repeat: RepeatState;
-}

src/models/options.ts

@@ -0,0 +1,13 @@
+export interface Options {
+  title: string;
+  artists: string;
+  album: string;
+  status: string;
+  url: string;
+  current: string;
+  duration: string;
+  "app-name": string;
+  image: string;
+  icon: string;
+  favorite: boolean;
+}

src/models/repeatState.ts

@@ -1,5 +0,0 @@
-export enum RepeatState {
-  off = "off",
-  all = "all",
-  single = "single",
-}

src/pages/settings/preload.ts

@@ -24,19 +24,17 @@ const switchesWithSettings = {
     switch: "discord_show_song",
     classToHide: "discord_show_song_options",
     settingsKey: settings.discord.showSong,
-  },
+  }
 };
 
 let adBlock: HTMLInputElement,
   api: HTMLInputElement,
-  channel: HTMLSelectElement,
   customCSS: HTMLInputElement,
   disableBackgroundThrottle: HTMLInputElement,
   disableHardwareMediaKeys: HTMLInputElement,
   enableCustomHotkeys: HTMLInputElement,
   enableDiscord: HTMLInputElement,
   gpuRasterization: HTMLInputElement,
-  hostname: HTMLInputElement,
   menuBar: HTMLInputElement,
   minimizeOnClose: HTMLInputElement,
   mpris: HTMLInputElement,
@@ -46,7 +44,6 @@ let adBlock: HTMLInputElement,
   singleInstance: HTMLInputElement,
   skipArtists: HTMLInputElement,
   skippedArtists: HTMLInputElement,
-  staticWindowTitle: HTMLInputElement,
   theme: HTMLSelectElement,
   trayIcon: HTMLInputElement,
   updateFrequency: HTMLInputElement,
@@ -59,9 +56,8 @@ 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;
+  discord_listening_text: HTMLInputElement;
 
 addCustomCss(app);
 
@@ -124,7 +120,6 @@ function refreshSettings() {
   try {
     adBlock.checked = settingsStore.get(settings.adBlock);
     api.checked = settingsStore.get(settings.api);
-    channel.value = settingsStore.get(settings.advanced.tidalUrl);
     customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
     disableBackgroundThrottle.checked = settingsStore.get(settings.disableBackgroundThrottle);
     disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys);
@@ -132,7 +127,6 @@ function refreshSettings() {
     enableDiscord.checked = settingsStore.get(settings.enableDiscord);
     enableWaylandSupport.checked = settingsStore.get(settings.flags.enableWaylandSupport);
     gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization);
-    hostname.value = settingsStore.get(settings.apiSettings.hostname);
     menuBar.checked = settingsStore.get(settings.menuBar);
     minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose);
     mpris.checked = settingsStore.get(settings.mpris);
@@ -141,9 +135,8 @@ function refreshSettings() {
     port.value = settingsStore.get(settings.apiSettings.port);
     singleInstance.checked = settingsStore.get(settings.singleInstance);
     skipArtists.checked = settingsStore.get(settings.skipArtists);
-    skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
-    staticWindowTitle.checked = settingsStore.get(settings.staticWindowTitle);
     theme.value = settingsStore.get(settings.theme);
+    skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
     trayIcon.checked = settingsStore.get(settings.trayIcon);
     updateFrequency.value = settingsStore.get(settings.updateFrequency);
     enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
@@ -154,9 +147,8 @@ 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);
+    discord_listening_text.value = settingsStore.get(settings.discord.listeningText);
 
     // set state of all switches with additional settings
     Object.values(switchesWithSettings).forEach((settingSwitch) => {
@@ -244,7 +236,6 @@ window.addEventListener("DOMContentLoaded", () => {
 
   adBlock = get("adBlock");
   api = get("apiCheckbox");
-  channel = get<HTMLSelectElement>("channel");
   customCSS = get("customCSS");
   disableBackgroundThrottle = get("disableBackgroundThrottle");
   disableHardwareMediaKeys = get("disableHardwareMediaKeys");
@@ -252,7 +243,6 @@ window.addEventListener("DOMContentLoaded", () => {
   enableDiscord = get("enableDiscord");
   enableWaylandSupport = get("enableWaylandSupport");
   gpuRasterization = get("gpuRasterization");
-  hostname = get("hostname");
   menuBar = get("menuBar");
   minimizeOnClose = get("minimizeOnClose");
   mpris = get("mprisCheckbox");
@@ -263,7 +253,6 @@ window.addEventListener("DOMContentLoaded", () => {
   trayIcon = get("trayIcon");
   skipArtists = get("skipArtists");
   skippedArtists = get("skippedArtists");
-  staticWindowTitle = get("staticWindowTitle");
   singleInstance = get("singleInstance");
   updateFrequency = get("updateFrequency");
   enableListenBrainz = get("enableListenBrainz");
@@ -274,14 +263,12 @@ 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_listening_text = get("discord_listening_text");
-  discord_using_text = get("discord_using_text");
+  discord_idle_text = get("discord_idle_text")
-  discord_idle_text = get("discord_idle_text");
 
   refreshSettings();
   addInputListener(adBlock, settings.adBlock);
   addInputListener(api, settings.api);
-  addSelectListener(channel, settings.advanced.tidalUrl);
   addTextAreaListener(customCSS, settings.customCSS);
   addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
   addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
@@ -289,7 +276,6 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(enableDiscord, settings.enableDiscord, switchesWithSettings.discord);
   addInputListener(enableWaylandSupport, settings.flags.enableWaylandSupport);
   addInputListener(gpuRasterization, settings.flags.gpuRasterization);
-  addInputListener(hostname, settings.apiSettings.hostname);
   addInputListener(menuBar, settings.menuBar);
   addInputListener(minimizeOnClose, settings.minimizeOnClose);
   addInputListener(mpris, settings.mpris);
@@ -298,7 +284,6 @@ 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);
@@ -314,12 +299,7 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(discord_details_prefix, settings.discord.detailsPrefix);
   addInputListener(discord_include_timestamps, settings.discord.includeTimestamps);
   addInputListener(discord_button_text, settings.discord.buttonText);
-  addInputListener(
+  addInputListener(discord_show_song, settings.discord.showSong, switchesWithSettings.discord_show_song);
-    discord_show_song,
-    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);
+  addInputListener(discord_listening_text, settings.discord.listeningText);
 });

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
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-      rel="stylesheet"
+</head>
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/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
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 348.333 348.334" class="settings-window__svg-icon">
-          xmlns="http://www.w3.org/2000/svg"
+        <path fill="white" d="M336.559,68.611L231.016,174.165l105.543,105.549c15.699,15.705,15.699,41.145,0,56.85
-          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>
 
@@ -58,7 +49,7 @@
             <div class="group__option">
               <div class="group__description">
                 <h4>Notifications</h4>
-                  <p>Show a notification when new media starts.</p>
+                <p>Show a notification when a new song starts.</p>
               </div>
               <label class="switch">
                 <input id="notifications" type="checkbox" />
@@ -75,13 +66,7 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
-              <textarea
+            <textarea id="skippedArtists" class="textarea" cols="40" rows="5" spellcheck="false"></textarea>
-                id="skippedArtists"
-                class="textarea"
-                cols="40"
-                rows="5"
-                spellcheck="false"
-              ></textarea>
             <div class="group__option">
               <div class="group__description">
                 <h4>Block ads</h4>
@@ -121,19 +106,6 @@
                 <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>
@@ -149,9 +121,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"
+                  <a class="external-link" data-url="https://defkey.com/tidal-desktop-shortcuts">desktop apps</a>.
-                      >desktop apps</a
-                    >.
                 </p>
               </div>
               <label class="switch">
@@ -177,8 +147,8 @@
             <p class="group__title">API</p>
             <div class="group__description">
               <p>
-                  TIDAL Hi-Fi has a built-in web API to allow users to get current media
+                TIDAL Hi-Fi has a built-in web API to allow users to get current song information.
-                  information. You can optionally enable playback control as well.
+                You can optionally enable playback control as well.
               </p>
             </div>
             <div class="group__option">
@@ -197,17 +167,6 @@
                 <input id="port" type="number" class="text-input" name="port" />
               </div>
             </div>
-              <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 />
-                    Change to 0.0.0.0 to allow <strong>anyone</strong> to interact with it. <br />
-                    Other options are available
-                  </p>
-                  <input id="hostname" type="text" class="text-input" name="hostname" />
-                </div>
-              </div>
             <div class="group__option">
               <div class="group__description">
                 <h4>Playback control</h4>
@@ -257,49 +216,27 @@
               </label>
             </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>
                   <p>The text displayed on Discord's rich presence while idling in the app.</p>
-                    <input
+                  <input id="discord_idle_text" type="text" class="text-input" name="discord_idle_text" />
-                      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>
+                  <h4>Listening Text</h4>
-                    <p>
+                  <p>The text displayed on Discord's rich presence while listening to a song.</p>
-                      The text displayed on Discord's rich presence while "showSong" is turned off
+                  <input id="discord_listening_text" type="text" class="text-input" name="discord_listening_text" />
-                    </p>
-                    <input
-                      id="discord_using_text"
-                      type="text"
-                      class="text-input"
-                      name="discord_using_text"
-                    />
                 </div>
               </div>
 
               <div class="group__option" class="hidden">
                 <div class="group__description">
-                    <h4>Show media</h4>
+                  <h4>Show song</h4>
-                    <p>Show the current media in the Discord client</p>
+                  <p>Show the current song in the Discord client</p>
                 </div>
                 <label class="switch">
                   <input id="discord_show_song" type="checkbox" />
@@ -308,6 +245,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,28 +261,19 @@
                   <div class="group__description">
                     <h4>Details prefix</h4>
                     <p>Prefix for the "details" field of Discord's rich presence.</p>
-                      <input
+                    <input id="discord_details_prefix" type="text" class="text-input" name="discord_details_prefix" />
-                        id="discord_details_prefix"
-                        type="text"
-                        class="text-input"
-                        name="discord_details_prefix"
-                      />
                   </div>
                 </div>
 
                 <div class="group__option">
                   <div class="group__description">
                     <h4>Button text</h4>
-                      <p>Text to display on the button below the media information.</p>
+                    <p>Text to display on the button below the song information.</p>
-                      <input
+                    <input id="discord_button_text" type="text" class="text-input" name="discord_button_text" />
-                        id="discord_button_text"
-                        type="text"
-                        class="text-input"
-                        name="discord_button_text"
-                      />
                   </div>
                 </div>
               </div>
+
             </div>
           </div>
           <div class="group">
@@ -363,43 +292,23 @@
               <div class="group__option">
                 <div class="group__description">
                   <h4>ListenBrainz API Url</h4>
-                    <p>
+                  <p>There are multiple instances for ListenBrainz you can set the corresponding API url below.</p>
-                      There are multiple instances for ListenBrainz you can set the corresponding
+                  <input id="ListenBrainzAPI" type="text" class="text-input" name="ListenBrainzAPI" />
-                      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
+                  <input id="ListenBrainzToken" type="text" class="text-input" name="ListenBrainzToken" />
-                      id="ListenBrainzToken"
-                      type="text"
-                      class="text-input"
-                      name="ListenBrainzToken"
-                    />
                 </div>
               </div>
             </div>
             <div class="group__description">
               <h4>ScrobbleDelay</h4>
-                <p>
+              <p>The delay (in ms) to send a song to ListenBrainz. Prevents spamming the API when you fast forward
-                  The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when
+                immediately</p>
-                  you fast forward immediately
+              <input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" />
-                </p>
-                <input
-                  id="listenbrainz_delay"
-                  type="number"
-                  class="text-input"
-                  name="listenbrainz_delay"
-                />
             </div>
           </div>
         </section>
@@ -411,32 +320,12 @@
               <div class="group__description">
                 <h4>Update frequency</h4>
                 <p>
-                    The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback
+                  The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback info by scraping the
-                    info by scraping the website. The default of 500 seems to work in more cases but
+                  website.
-                    if you are fine with a bit more resource usage you can decrease it as well.
+                  The default of 500 seems to work in more cases but if you are fine with a bit more resource usage you
+                  can decrease it as well.
                 </p>
-                  <input
+                <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
-                    id="updateFrequency"
-                    type="number"
-                    class="text-input"
-                    name="updateFrequency"
-                  />
-                </div>
-              </div>
-
-              <div class="group__option">
-                <div class="group__description">
-                  <h4>Tidal channel / URL</h4>
-                  <p>
-                    Which URL Tidal Hi-Fi should use.
-                    <strong>note! Beta might break at any time</strong>
-                  </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>
-                  </select>
               </div>
             </div>
           </div>
@@ -481,8 +370,7 @@
               <div class="group__description">
                 <h4>Wayland support</h4>
                 <p>
-                    Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland
+                  Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland window system.
-                    window system.
                 </p>
               </div>
               <label class="switch">
@@ -500,19 +388,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 css that you put in here will be injected into a style tag in the head of the document.
-                    the document.
                 </p>
               </div>
             </div>
           </div>
-            <textarea
+          <textarea id="customCSS" class="textarea" cols="40" rows="8" spellcheck="false"></textarea>
-              id="customCSS"
-              class="textarea"
-              cols="40"
-              rows="8"
-              spellcheck="false"
-            ></textarea>
 
           <div class="group">
             <p class="group__title">Theme files</p>
@@ -522,7 +403,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 +413,14 @@
               <div class="group__description">
                 <h4>Upload new themes</h4>
                 <p>
-                    Click the button and select the css files to import. They will be added to the
+                  Click the button and select the css files to import. They will be added to the theme list
-                    theme list automatically.
+                  automatically.
                 </p>
                 <div class="file-drop-area">
                   <div>
                     <span class="file-btn">Choose files</span>
                     <span id="file-message" class="file-msg">or drag and drop files here</span>
-                      <input
+                    <input id="theme-files" class="file-input" type="file" accept=".css" multiple>
-                        id="theme-files"
-                        class="file-input"
-                        type="file"
-                        accept=".css"
-                        multiple
-                      />
                   </div>
                 </div>
               </div>
@@ -555,35 +432,15 @@
           <img alt="tidal icon" class="about-section__icon" src="./icon.png" />
           <h4>TIDAL Hi-Fi</h4>
           <div class="about-section__version">
-              <a
+            <a href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.8.0">5.8.0</a>
-                target="_blank"
-                rel="noopener"
-                href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.17.0"
-                >5.17.0</a
-              >
           </div>
           <div class="about-section__links">
-              <a
+            <a href="https://github.com/mastermindzh/tidal-hifi/" class="about-section__button">Github <i
-                target="_blank"
+                class="fa fa-external-link"></i></a>
-                rel="noopener"
+            <a href="https://github.com/Mastermindzh/tidal-hifi/issues" class="about-section__button">Report an issue <i
-                href="https://github.com/mastermindzh/tidal-hifi/"
+                class="fa fa-external-link"></i></a>
-                class="about-section__button"
+            <a href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
-                >Github <i class="fa fa-external-link"></i
+              class="about-section__button">Contributors <i class="fa fa-external-link"></i></a>
-              ></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 +452,6 @@
       </div>
     </main>
   </div>
-  </body>
+</body>
+
 </html>

src/pages/settings/settings.scss

@@ -415,6 +415,7 @@ html {
 }
 
 // file upload
+
 .file-drop-area {
   position: relative;
   display: flex;

src/preload.ts

@@ -10,31 +10,23 @@ import {
 } from "./features/listenbrainz/listenbrainz";
 import { StoreData } from "./features/listenbrainz/models/storeData";
 import { Logger } from "./features/logger";
-import { SharingService } from "./features/sharingService/sharingService";
+import { Songwhip } from "./features/songwhip/songwhip";
 import { addCustomCss } from "./features/theming/theming";
-import { convertDurationToSeconds } from "./features/time/parse";
-import { MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
-import { RepeatState } from "./models/repeatState";
+import { Options } from "./models/options";
 import { downloadFile } from "./scripts/download";
 import { addHotkey } from "./scripts/hotkeys";
-import { ObjectToDotNotation } from "./scripts/objectUtilities";
 import { settingsStore } from "./scripts/settings";
 import { setTitle } from "./scripts/window-functions";
 
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
+const appName = "TIDAL Hi-Fi";
 let currentSong = "";
 let player: Player;
 let currentPlayStatus = MediaStatus.paused;
 let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
 let scrobbleWaitingForDelay = false;
 
-let currentlyPlaying = MediaStatus.paused;
-let currentRepeatState: RepeatState = RepeatState.off;
-let currentShuffleState = false;
-let currentMediaInfo: MediaInfo;
-let currentNotification: Electron.Notification;
-
 const elements = {
   play: '*[data-test="play"]',
   pause: '*[data-test="pause"]',
@@ -48,9 +40,8 @@ const elements = {
   search: '[class^="searchField"]',
   shuffle: '*[data-test="shuffle"]',
   repeat: '*[data-test="repeat"]',
-  account: '*[data-test^="profile-image-button"]',
+  account: '*[class^="profileOptions"]',
-  settings: '*[data-test^="sidebar-menu-button"]',
+  settings: '*[data-test^="open-settings"]',
-  openSettings: '*[data-test^="open-settings"]',
   media: '*[data-test="current-media-imagery"]',
   image: "img",
   current: '*[data-test="current-time"]',
@@ -58,9 +49,7 @@ const elements = {
   bar: '*[data-test="progress-bar"]',
   footer: "#footerPlayer",
   mediaItem: "[data-type='mediaItem']",
-  album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
+  album_header_title: '.header-details [data-test="title"]',
-  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"]',
@@ -75,7 +64,7 @@ const elements = {
   },
 
   /**
-   * Get the icon of the current media
+   * Get the icon of the current song
    */
   getSongIcon: function () {
     const figure = this.get("media");
@@ -91,7 +80,7 @@ const elements = {
   },
 
   /**
-   * returns an array of all artists in the current media
+   * returns an array of all artists in the current song
    * @returns {Array} artists
    */
   getArtistsArray: function () {
@@ -136,12 +125,6 @@ const elements = {
       }
     }
 
-    // see whether we're on the queue page and get it from there
-    const queueAlbumName = elements.getText("queue_album");
-    if (queueAlbumName) {
-      return queueAlbumName;
-    }
-
     return "";
   },
 
@@ -196,7 +179,7 @@ function getUpdateFrequency() {
 }
 
 /**
- * Play or pause the current media
+ * Play or pause the current song
  */
 function playPause() {
   const play = elements.get("play");
@@ -221,9 +204,9 @@ ListenBrainzStore.clear();
 function addHotKeys() {
   if (settingsStore.get(settings.enableCustomHotkeys)) {
     addHotkey("Control+p", function () {
-      elements.click("settings");
+      elements.click("account");
       setTimeout(() => {
-        elements.click("openSettings");
+        elements.click("settings");
       }, 100);
     });
     addHotkey("Control+l", function () {
@@ -255,10 +238,11 @@ function addHotKeys() {
       elements.click("repeat");
     });
     addHotkey("control+w", async function () {
-      const url = SharingService.getUniversalLink(getTrackURL());
+      const result = await ipcRenderer.invoke(globalEvents.whip, getTrackURL());
+      const url = Songwhip.getWhipUrl(result);
       clipboard.writeText(url);
       new Notification({
-        title: `Universal link generated: `,
+        title: `Successfully whipped: `,
         body: `URL copied to clipboard: ${url}`,
       }).show();
     });
@@ -317,8 +301,6 @@ function addIPCEventListeners() {
     ipcRenderer.on("globalEvent", (_event, args) => {
       switch (args) {
         case globalEvents.playPause:
-        case globalEvents.play:
-        case globalEvents.pause:
           playPause();
           break;
         case globalEvents.next:
@@ -327,15 +309,15 @@ function addIPCEventListeners() {
         case globalEvents.previous:
           elements.click("previous");
           break;
+        case globalEvents.play:
+          elements.click("play");
+          break;
+        case globalEvents.pause:
+          elements.click("pause");
+          break;
         case globalEvents.toggleFavorite:
           elements.click("favorite");
           break;
-        case globalEvents.toggleShuffle:
-          elements.click("shuffle");
-          break;
-        case globalEvents.toggleRepeat:
-          elements.click("repeat");
-          break;
         default:
           break;
       }
@@ -359,23 +341,6 @@ function getCurrentlyPlayingStatus() {
   return status;
 }
 
-function getCurrentShuffleState() {
-  const shuffle = elements.get("shuffle");
-  return shuffle?.getAttribute("aria-checked") === "true";
-}
-
-function getCurrentRepeatState() {
-  const repeat = elements.get("repeat");
-  switch (repeat?.getAttribute("data-type")) {
-    case "button__repeatAll":
-      return RepeatState.all;
-    case "button__repeatSingle":
-      return RepeatState.single;
-    default:
-      return RepeatState.off;
-  }
-}
-
 /**
  * Convert the duration from MM:SS to seconds
  * @param {*} duration
@@ -388,36 +353,16 @@ function convertDuration(duration: string) {
 /**
  * Update Tidal-hifi's media info
  *
- * @param {*} mediaInfo
+ * @param {*} options
  */
-function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
+function updateMediaInfo(options: Options, notify: boolean) {
-  if (mediaInfo) {
+  if (options) {
-    currentMediaInfo = mediaInfo;
+    ipcRenderer.send(globalEvents.updateInfo, options);
-    ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
+    if (settingsStore.get(settings.notifications) && notify) {
-    updateMpris(mediaInfo);
+      new Notification({ title: options.title, body: options.artists, icon: options.icon }).show();
-    updateListenBrainz(mediaInfo);
-    if (notify) {
-      sendNotification(mediaInfo);
     }
-  }
+    updateMpris(options);
-}
+    updateListenBrainz(options);
-
-/**
- * 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,
-      icon: mediaInfo.icon,
-    });
-    currentNotification.show();
   }
 }
 
@@ -475,33 +420,32 @@ function addMPRIS() {
   }
 }
 
-function updateMpris(mediaInfo: MediaInfo) {
+function updateMpris(options: Options) {
   if (player) {
     player.metadata = {
       ...player.metadata,
       ...{
-        "xesam:title": mediaInfo.title,
+        "xesam:title": options.title,
-        "xesam:artist": [mediaInfo.artists],
+        "xesam:artist": [options.artists],
-        "xesam:album": mediaInfo.album,
+        "xesam:album": options.album,
-        "mpris:artUrl": mediaInfo.image,
+        "mpris:artUrl": options.image,
-        "mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
+        "mpris:length": convertDuration(options.duration) * 1000 * 1000,
         "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
       },
-      ...ObjectToDotNotation(mediaInfo, "custom:"),
     };
-    player.playbackStatus = mediaInfo.status === MediaStatus.paused ? "Paused" : "Playing";
+    player.playbackStatus = options.status === MediaStatus.paused ? "Paused" : "Playing";
   }
 }
 
 /**
  * Update the listenbrainz service with new data based on a few conditions
  */
-function updateListenBrainz(mediaInfo: MediaInfo) {
+function updateListenBrainz(options: Options) {
   if (settingsStore.get(settings.ListenBrainz.enabled)) {
     const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
     if (
-      (!oldData && mediaInfo.status === MediaStatus.playing) ||
+      (!oldData && options.status === MediaStatus.playing) ||
-      (oldData && oldData.title !== mediaInfo.title)
+      (oldData && oldData.title !== options.title)
     ) {
       if (!scrobbleWaitingForDelay) {
         scrobbleWaitingForDelay = true;
@@ -509,10 +453,10 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
         currentListenBrainzDelayId = setTimeout(
           () => {
             ListenBrainz.scrobble(
-              mediaInfo.title,
+              options.title,
-              mediaInfo.artists,
+              options.artists,
-              mediaInfo.status,
+              options.status,
-              convertDuration(mediaInfo.duration)
+              convertDuration(options.duration)
             );
             scrobbleWaitingForDelay = false;
           },
@@ -542,6 +486,23 @@ function getTrackID() {
   return window.location;
 }
 
+function updateMediaSession(options: Options) {
+  if ("mediaSession" in navigator) {
+    navigator.mediaSession.metadata = new MediaMetadata({
+      title: options.title,
+      artist: options.artists,
+      album: options.album,
+      artwork: [
+        {
+          src: options.icon,
+          sizes: "640x640",
+          type: "image/png",
+        },
+      ],
+    });
+  }
+}
+
 /**
  * Watch for song changes and update title + notify
  */
@@ -549,55 +510,31 @@ setInterval(function () {
   const title = elements.getText("title");
   const artistsArray = elements.getArtistsArray();
   const artistsString = elements.getArtistsString(artistsArray);
-  const songDashArtistTitle = `${title} - ${artistsString}`;
-  const staticTitle = "TIDAL Hi-Fi";
-  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
-  const current = elements.getText("current");
-  const currentStatus = getCurrentlyPlayingStatus();
-  const shuffleState = getCurrentShuffleState();
-  const repeatState = getCurrentRepeatState();
-
-  const playStateChanged = currentStatus != currentlyPlaying;
-  const shuffleStateChanged = shuffleState != currentShuffleState;
-  const repeatStateChanged = repeatState != currentRepeatState;
-
-  const hasStateChanged = playStateChanged || shuffleStateChanged || repeatStateChanged;
-
-  // update info if song changed or was just paused/resumed
-  if (titleOrArtistsChanged || hasStateChanged) {
-    if (playStateChanged) currentlyPlaying = currentStatus;
-    if (shuffleStateChanged) currentShuffleState = shuffleState;
-    if (repeatStateChanged) currentRepeatState = repeatState;
-
   skipArtistsIfFoundInSkippedArtistsList(artistsArray);
+
   const album = elements.getAlbumName();
+  const current = elements.getText("current");
   const duration = elements.getText("duration");
-    const options: MediaInfo = {
+  const songDashArtistTitle = `${title} - ${artistsString}`;
+  const currentStatus = getCurrentlyPlayingStatus();
+  const options = {
     title,
     artists: artistsString,
     album: album,
-      playingFrom: elements.getText("playing_from"),
     status: currentStatus,
     url: getTrackURL(),
     current,
-      currentInSeconds: convertDurationToSeconds(current),
     duration,
-      durationInSeconds: convertDurationToSeconds(duration),
+    "app-name": appName,
     image: "",
     icon: "",
     favorite: elements.isFavorite(),
-
-      player: {
-        status: currentStatus,
-        shuffle: shuffleState,
-        repeat: repeatState,
-      },
   };
 
+  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
+
   // update title, url and play info with new info
-    settingsStore.get(settings.staticWindowTitle)
+  setTitle(songDashArtistTitle);
-      ? setTitle(staticTitle)
-      : setTitle(songDashArtistTitle);
   getTrackURL();
   currentSong = songDashArtistTitle;
   currentPlayStatus = currentStatus;
@@ -623,14 +560,10 @@ setInterval(function () {
     }
   }).then(() => {
     updateMediaInfo(options, titleOrArtistsChanged);
-    });
+    if (titleOrArtistsChanged) {
-  } else {
+      updateMediaSession(options);
-    // just update the time
-    updateMediaInfo(
-      { ...currentMediaInfo, ...{ current, currentInSeconds: convertDurationToSeconds(current) } },
-      false
-    );
     }
+  });
 
   /**
    * automatically skip a song if the artists are found in the list of artists to skip

src/scripts/discord.ts

@@ -1,144 +1,89 @@
-import { Client, SetActivity } from "@xhayper/discord-rpc";
+import { Client, Presence } from "discord-rpc";
 import { app, ipcMain } from "electron";
 import { globalEvents } from "../constants/globalEvents";
 import { settings } from "../constants/settings";
 import { Logger } from "../features/logger";
-import { convertDurationToSeconds } from "../features/time/parse";
 import { MediaStatus } from "../models/mediaStatus";
 import { mediaInfo } from "./mediaInfo";
 import { settingsStore } from "./settings";
 
 const clientId = "833617820704440341";
 
-export let rpc: Client;
+function timeToSeconds(timeArray: string[]) {
+  const minutes = parseInt(timeArray[0]) * 1;
+  const seconds = minutes * 60 + parseInt(timeArray[1]) * 1;
+  return seconds;
+}
 
-const ACTIVITY_LISTENING = 2;
+export let rpc: Client;
-const MAX_RETRIES = 5;
-const RETRY_DELAY = 10000;
 
 const observer = () => {
   if (rpc) {
-    updateActivity();
+    rpc.setActivity(getActivity());
   }
 };
-
+const getActivity = (): Presence | undefined => {
-const defaultPresence = {
+  const presence: Presence | undefined = {
     largeImageKey: "tidal-hifi-icon",
     largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
     instance: false,
-  type: ACTIVITY_LISTENING,
+  };
-};
-
-const updateActivity = () => {
-  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 =
+    presence.details = settingsStore.get<string, string>(settings.discord.idleText) ?? "Browsing Tidal";
-      settingsStore.get<string, string>(settings.discord.idleText) ?? "Browsing Tidal";
   } else {
     const showSong = settingsStore.get<string, boolean>(settings.discord.showSong) ?? false;
     if (showSong) {
-      const { includeTimestamps, detailsPrefix, buttonText } = getFromStore();
-      includeTimeStamps(includeTimestamps);
-      setPresenceFromMediaInfo(detailsPrefix, buttonText);
-    } else {
-      presence.details =
-        settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
-    }
-  }
-
-  return presence;
-
-  function getFromStore() {
       const includeTimestamps =
         settingsStore.get<string, boolean>(settings.discord.includeTimestamps) ?? true;
-    const detailsPrefix =
-      settingsStore.get<string, string>(settings.discord.detailsPrefix) ?? "Listening to ";
-    const buttonText =
-      settingsStore.get<string, string>(settings.discord.buttonText) ?? "Play on TIDAL";
 
-    return { includeTimestamps, detailsPrefix, buttonText };
+      if (includeTimestamps) {
+        const currentSeconds = timeToSeconds(mediaInfo.current.split(":"));
+        const durationSeconds = timeToSeconds(mediaInfo.duration.split(":"));
+        const date = new Date();
+        const now = (date.getTime() / 1000) | 0;
+        const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
+        presence.startTimestamp = now;
+        presence.endTimestamp = remaining;
       }
 
-  /**
+      const detailsPrefix = settingsStore.get<string, string>(settings.discord.detailsPrefix) ?? "Listening to ";
-   * Pad a string using spaces to at least 2 characters
+      const buttonText = settingsStore.get<string, string>(settings.discord.buttonText) ?? "Play on TIDAL";
-   * @param input string to pad with 2 characters
-   * @returns
-   */
-  function pad(input: string): string {
-    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.details = `${detailsPrefix}${mediaInfo.title}`;
-      presence.state = artists ? artists : "unknown artist(s)";
+        presence.state = mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)";
         presence.largeImageKey = mediaInfo.image;
-      if (album) {
+        if (mediaInfo.album) {
-        presence.largeImageText = album;
+          presence.largeImageText = mediaInfo.album;
         }
-
         presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
       } else {
-      presence.details = `Watching ${title}`;
+        presence.details = `Watching ${mediaInfo.title}`;
-      presence.state = artists;
+        presence.state = mediaInfo.artists;
       }
-  }
-
-  function includeTimeStamps(includeTimestamps: boolean) {
-    if (includeTimestamps) {
-      const currentSeconds = convertDurationToSeconds(mediaInfo.current);
-      const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
-      const date = new Date();
-      const now = Math.floor(date.getTime() / 1000);
-      presence.startTimestamp = now - currentSeconds;
-      presence.endTimestamp = presence.startTimestamp + durationSeconds;
-    }
-  }
-};
-
-/**
- * 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");
+      presence.details = settingsStore.get<string, string>(settings.discord.listeningText) ?? "Listening Tidal";
     }
   }
+  return presence;
 };
 
 /**
  * Set up the discord rpc and listen on globalEvents.updateInfo
  */
 export const initRPC = () => {
-  rpc = new Client({ transport: { type: "ipc" }, clientId });
+  rpc = new Client({ transport: "ipc" });
-  connectWithRetry();
+  rpc.login({ clientId }).then(
+    () => {
+      rpc.on("ready", () => {
+        rpc.setActivity(getActivity());
+      });
+      ipcMain.on(globalEvents.updateInfo, observer);
+    },
+    () => {
+      Logger.log("Can't connect to Discord, is it running?");
+    }
+  );
 };
 
 /**
@@ -146,7 +91,7 @@ export const initRPC = () => {
  */
 export const unRPC = () => {
   if (rpc) {
-    rpc.user?.clearActivity();
+    rpc.clearActivity();
     rpc.destroy();
     rpc = null;
     ipcMain.removeListener(globalEvents.updateInfo, observer);

src/scripts/express.ts

@@ -0,0 +1,69 @@
+import { BrowserWindow, dialog } from "electron";
+import express, { Response } from "express";
+import fs from "fs";
+import { settings } from "../constants/settings";
+import { MediaStatus } from "../models/mediaStatus";
+import { globalEvents } from "./../constants/globalEvents";
+import { mediaInfo } from "./mediaInfo";
+import { settingsStore } from "./settings";
+
+/**
+ * Function to enable TIDAL Hi-Fi's express api
+ */
+
+// expressModule.run = function (mainWindow)
+export const startExpress = (mainWindow: BrowserWindow) => {
+  /**
+   * Shorthand to handle a fire and forget global event
+   * @param {*} res
+   * @param {*} action
+   */
+  function handleGlobalEvent(res: Response, action: string) {
+    mainWindow.webContents.send("globalEvent", action);
+    res.sendStatus(200);
+  }
+
+  const expressApp = express();
+  expressApp.get("/", (req, res) => res.send("Hello World!"));
+  expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
+  expressApp.get("/image", (req, res) => {
+    const stream = fs.createReadStream(mediaInfo.icon);
+    stream.on("open", function () {
+      res.set("Content-Type", "image/png");
+      stream.pipe(res);
+    });
+    stream.on("error", function () {
+      res.set("Content-Type", "text/plain");
+      res.status(404).end("Not found");
+    });
+  });
+
+  if (settingsStore.get(settings.playBackControl)) {
+    expressApp.get("/play", (req, res) => handleGlobalEvent(res, globalEvents.play));
+    expressApp.post("/favorite/toggle", (req, res) =>
+      handleGlobalEvent(res, globalEvents.toggleFavorite)
+    );
+    expressApp.get("/pause", (req, res) => handleGlobalEvent(res, globalEvents.pause));
+    expressApp.get("/next", (req, res) => handleGlobalEvent(res, globalEvents.next));
+    expressApp.get("/previous", (req, res) => handleGlobalEvent(res, globalEvents.previous));
+    expressApp.get("/playpause", (req, res) => {
+      if (mediaInfo.status === MediaStatus.playing) {
+        handleGlobalEvent(res, globalEvents.pause);
+      } else {
+        handleGlobalEvent(res, globalEvents.play);
+      }
+    });
+  }
+
+  const port = settingsStore.get<string, number>(settings.apiSettings.port);
+
+  const expressInstance = expressApp.listen(port, "127.0.0.1");
+  expressInstance.on("error", function (e: { code: string }) {
+    let message = e.code;
+    if (e.code === "EADDRINUSE") {
+      message = `Port ${port} in use.`;
+    }
+
+    dialog.showErrorBox("Api failed to start.", message);
+  });
+};

src/scripts/mediaInfo.ts

@@ -1,45 +1,37 @@
 import { MediaInfo } from "../models/mediaInfo";
 import { MediaStatus } from "../models/mediaStatus";
-import { RepeatState } from "../models/repeatState";
 
-const defaultInfo: MediaInfo = {
+export const mediaInfo = {
   title: "",
   artists: "",
   album: "",
   icon: "",
-  playingFrom: "",
+  status: MediaStatus.paused as string,
-  status: MediaStatus.paused,
   url: "",
   current: "",
-  currentInSeconds: 0,
   duration: "",
-  durationInSeconds: 0,
   image: "tidal-hifi-icon",
   favorite: false,
-
-  player: {
-    status: MediaStatus.paused,
-    shuffle: false,
-    repeat: RepeatState.off,
-  },
 };
 
-export let mediaInfo: MediaInfo = { ...defaultInfo };
-
 export const updateMediaInfo = (arg: MediaInfo) => {
-  mediaInfo = { ...defaultInfo, ...arg };
+  mediaInfo.title = propOrDefault(arg.title);
-  mediaInfo.url = toUniversalUrl(mediaInfo.url);
+  mediaInfo.artists = propOrDefault(arg.artists);
+  mediaInfo.album = propOrDefault(arg.album);
+  mediaInfo.icon = propOrDefault(arg.icon);
+  mediaInfo.url = propOrDefault(arg.url);
+  mediaInfo.status = propOrDefault(arg.status);
+  mediaInfo.current = propOrDefault(arg.current);
+  mediaInfo.duration = propOrDefault(arg.duration);
+  mediaInfo.image = propOrDefault(arg.image);
+  mediaInfo.favorite = arg.favorite;
 };
 
 /**
- * Append the universal link syntax (?u) to any url
+ * Return the property or a default value
- * @param url url to append the universal link syntax to
+ * @param {*} prop property to check
- * @returns url with `?u` appended, or the original value of url if falsy
+ * @param {*} defaultValue defaults to ""
  */
-function toUniversalUrl(url: string) {
+function propOrDefault(prop: string, defaultValue = "") {
-  if (url) {
+  return prop ? prop : defaultValue;
-    const queryParamsSet = url.indexOf("?");
-    return queryParamsSet > -1 ? `${url}&u` : `${url}?u`;
-  }
-  return url;
 }

src/scripts/menu.ts

@@ -11,23 +11,6 @@ const settingsMenuEntry = {
   accelerator: "Control+=",
 };
 
-const tidalMagazineEntry = {
-  label: "Magazine",
-  click() {
-    const magazineWindow = new BrowserWindow({
-      autoHideMenuBar: true,
-      webPreferences: {
-        sandbox: false,
-        plugins: true,
-        devTools: true, // I like tinkering, others might too
-      },
-    });
-    magazineWindow.loadURL("https://tidal.com/magazine/");
-    magazineWindow.show();
-  },
-  accelerator: "Control+M",
-};
-
 const quitMenuEntry = {
   label: "Quit",
   click() {
@@ -58,7 +41,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
               { role: "hideothers" },
               { role: "unhide" },
               { type: "separator" },
-              tidalMagazineEntry,
               quitMenuEntry,
             ],
           },
@@ -66,7 +48,7 @@ export const getMenu = function (mainWindow: BrowserWindow) {
       : []),
     {
       label: "File",
-      submenu: [settingsMenuEntry, tidalMagazineEntry, isMac ? { role: "close" } : quitMenuEntry],
+      submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry],
     },
     {
       label: "Edit",
@@ -119,7 +101,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
     },
     settingsMenuEntry,
     toggleWindow,
-    tidalMagazineEntry,
     quitMenuEntry,
   ];
 

src/scripts/objectUtilities.ts

@@ -1,13 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const ObjectToDotNotation = (obj: any, prefix: string = "", target: any = {}) => {
-  Object.keys(obj).forEach((key: string) => {
-    if (typeof obj[key] === "object" && obj[key] !== null) {
-      ObjectToDotNotation(obj[key], prefix + key + ".", target);
-    } else {
-      const dotLocation = prefix + key;
-      target[dotLocation] = obj[key];
-      return target;
-    }
-  });
-  return target;
-};

src/scripts/settings.ts

@@ -1,40 +1,17 @@
 import Store from "electron-store";
 
-import { BrowserWindow, shell } from "electron";
+import { BrowserWindow } from "electron";
 import path from "path";
 import { settings } from "../constants/settings";
 
 let settingsWindow: BrowserWindow;
-/**
- * Build a migration step for several settings.
- * All settings will be checked and set to the default if non-existent.
- * @param version
- * @param migrationStore
- * @param options
- */
-const buildMigration = (
-  version: string,
-  migrationStore: { get: (str: string) => string; set: (str: string, val: unknown) => void },
-  options: Array<{ key: string; value: unknown }>
-) => {
-  console.log(`running migrations for ${version}`);
-  options.forEach(({ key, value }) => {
-    const valueToSet = migrationStore.get(key) ?? value;
-    console.log(`  - setting ${key} to ${value}`);
-    migrationStore.set(key, valueToSet);
-  });
-};
 
 export const settingsStore = new Store({
   defaults: {
     adBlock: false,
-    advanced: {
-      tidalUrl: "https://listen.tidal.com",
-    },
     api: true,
     apiSettings: {
       port: 47836,
-      hostname: "127.0.0.1",
     },
     customCSS: [],
     disableBackgroundThrottle: true,
@@ -42,13 +19,12 @@ export const settingsStore = new Store({
     enableCustomHotkeys: false,
     enableDiscord: false,
     discord: {
-      showSong: true,
+      showSong: false,
-      showIdle: true,
       idleText: "Browsing Tidal",
-      usingText: "Playing media on TIDAL",
+      listeningText: "Listening Tidal",
-      includeTimestamps: true,
       detailsPrefix: "Listening to ",
       buttonText: "Play on Tidal",
+      includeTimestamps: true,
     },
     ListenBrainz: {
       enabled: false,
@@ -69,7 +45,6 @@ export const settingsStore = new Store({
     singleInstance: true,
     skipArtists: false,
     skippedArtists: [""],
-    staticWindowTitle: false,
     theme: "none",
     trayIcon: true,
     updateFrequency: 500,
@@ -97,29 +72,6 @@ export const settingsStore = new Store({
         migrationStore.get(settings.discord.includeTimestamps) ?? true
       );
     },
-    "5.9.0": (migrationStore) => {
-      buildMigration("5.9.0", migrationStore, [
-        { key: settings.discord.showSong, value: "true" },
-        { key: settings.discord.idleText, value: "Browsing Tidal" },
-        {
-          key: settings.discord.usingText,
-          value: "Playing media on TIDAL",
-        },
-      ]);
-    },
-    "5.14.0": (migrationStore) => {
-      buildMigration("5.14.0", migrationStore, [
-        { key: settings.apiSettings.hostname, value: "127.0.0.1" },
-      ]);
-    },
-    "5.15.0": (migrationStore) => {
-      buildMigration("5.15.0", migrationStore, [
-        { key: settings.advanced.tidalUrl, value: "https://listen.tidal.com" },
-      ]);
-    },
-    "5.16.0": (migrationStore) => {
-      buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
-    },
   },
 });
 
@@ -153,18 +105,10 @@ export const createSettingsWindow = function () {
 
   settingsWindow.loadURL(`file://${__dirname}/../pages/settings/settings.html`);
 
-  settingsWindow.webContents.setWindowOpenHandler(({ url }) => {
-    shell.openExternal(url);
-    return { action: "deny" };
-  });
   settingsModule.settingsWindow = settingsWindow;
 };
 
 export const showSettingsWindow = function (tab = "general") {
-  if (!settingsWindow) {
-    console.log("Settings window is not initialized. Attempting to create it.");
-    createSettingsWindow();
-  }
   settingsWindow.webContents.send("goToTab", tab);
 
   // refresh data just before showing the window
@@ -178,25 +122,3 @@ export const hideSettingsWindow = function () {
 export const closeSettingsWindow = function () {
   settingsWindow = null;
 };
-
-/**
- * add artists to the list of skipped artists
- * @param artists list of artists to append
- */
-export const addSkippedArtists = (artists: string[]) => {
-  const { skippedArtists } = settings;
-  const previousStoreValue = settingsStore.get<string, string[]>(skippedArtists);
-  settingsStore.set(skippedArtists, Array.from(new Set([...previousStoreValue, ...artists])));
-};
-
-/**
- * Remove artists from the list of skipped artists
- * @param artists list of artists to remove
- */
-export const removeSkippedArtists = (artists: string[]) => {
-  const { skippedArtists } = settings;
-  const previousStoreValue = settingsStore.get<string, string[]>(skippedArtists);
-  const filteredArtists = previousStoreValue.filter((value) => ![...artists].includes(value));
-
-  settingsStore.set(skippedArtists, filteredArtists);
-};

tsconfig.json

@@ -8,7 +8,6 @@
     "sourceMap": true,
     "allowJs": true,
     "outDir": "ts-dist",
-    "resolveJsonModule": true,
     "esModuleInterop": true,
     "baseUrl": ".",
     "paths": {