Merge branch 'master' of github.com:Mastermindzh/tidal-hifi

Co-authored-by: Cristian <54779545+callapa1@users.noreply.github.com>

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
       - uses: actions/upload-artifact@master
         with:
           name: mac-builds
-          path: dist/
+          path: ./dist/
 
   build_on_win:
     runs-on: windows-latest

.gitignore

@@ -1,2 +1,9 @@
 node_modules
 dist
+
+# ignore all build files except for the .desktop and PKGBUILD files
+build/linux/arch/*
+!build/linux/arch/PKGBUILD
+!build/linux/arch/.SRCINFO
+!build/linux/arch/tidal-hifi.desktop
+!build/linux/arch/install.sh

CHANGELOG.md

@@ -0,0 +1,66 @@
+# Changelog
+
+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).
+
+## 2.2.1
+
+- artists is now gotten specifically from the footer. This fixes the [unknown artists bug](https://github.com/Mastermindzh/tidal-hifi/issues/45).
+- the discord module will check whether the artists is empty and if so substitute it with a default message. This is to prevent sending an empty state to Discord (which it doesn't support). fixes [#45](https://github.com/Mastermindzh/tidal-hifi/issues/54)
+
+### removed arch build details from source control
+
+moved to: [https://github.com/Mastermindzh/tidal-hifi-aur](https://github.com/Mastermindzh/tidal-hifi-aur)
+
+## 2.2.0
+
+- The discord integration now adds a time remaining field based on the song duration
+- All fields (current, remaining, and url are also available in the API*)
+- the artist field is now correctly identified
+
+* current time only updates on play/pause.
+
+## 2.1.1
+
+- The discord integration now doesn't send an update every 15 seconds it sends an update whenever the media info changes
+- consolidated updating the media info changes with the status changes into a single global event
+
+## 2.1.0
+
+- [Mar0xy](https://github.com/Mar0xy) added Discord integration.
+- Several versions have been bumped to fix vulnerabilities
+
+## 2.0.0
+
+### Breaking changes
+
+- Changed settings hotkey from "ctrl+/" to "ctrl+=" to avoid a conflict with the default Tidal hotkeys
+
+## Other changes
+
+- Added a setting to disable custom hotkeys
+- Fixed the bug that the previous song hotkey would register 3 times. (Twice due to a duplicate block of code + once from the default tidal hotkey)
+
+## 1.3.0
+
+-- re-enabled mpris-service wit the electron downloader fixes
+
+## 1.2.0
+
+- Added the ability to disable the tray icon
+
+## 1.1.1
+
+Bugfixes:
+
+- Arch AUR install failed before, it is fixed now by using the included build scripts
+
+## 1.1.0
+
+- updated to electron 8.0.0
+- Added a beta-version of the mpris service
+
+- Bugfixes:
+  - icon on gnome not showing in launcher
+  - app not remembering size on startup

README.md

@@ -3,7 +3,7 @@ Tidal-hifi
 <img src = "./build/icon.png" height="40" align="right" />
 </h1>
 
-The web version of [listen.tidal.com](listen.tidal.com) running in electron with hifi support thanks to widevine.
+The web version of [listen.tidal.com](https://listen.tidal.com) running in electron with hifi support thanks to widevine.
 
 ![tidal-hifi preview](./docs/preview.png)
 
@@ -13,12 +13,20 @@ The web version of [listen.tidal.com](listen.tidal.com) running in electron with
 
 - [Installation](#installation)
   - [Using releases](#using-releases)
+    - [Snap install](#snap-install)
+  - [Arch Linux](#arch-linux)
   - [Using source](#using-source)
 - [features](#features)
 - [Integrations](#integrations)
+  - [not included](#not-included)
+  - [Known bugs](#known-bugs)
 - [Why](#why)
 - [Why not extend existing projects?](#why-not-extend-existing-projects)
-- [Special thanks to..](#special-thanks-to)
+- [Special thanks to...](#special-thanks-to)
+- [Buy me a coffee? Please don't](#buy-me-a-coffee-please-dont)
+- [Images](#images)
+  - [settings window](#settings-window)
+  - [user setups](#user-setups)
 
 <!-- tocstop -->
 
@@ -28,11 +36,35 @@ The web version of [listen.tidal.com](listen.tidal.com) running in electron with
 
 Various packaged versions of the software are available on the [releases](https://github.com/Mastermindzh/tidal-hifi/releases) tab.
 
+#### Snap install
+
+To install with `snap` you need to download the pre-packaged snap-package from this repository, found under releases:
+
+1. Download
+
+```sh
+wget <URI> #for instance: https://github.com/Mastermindzh/tidal-hifi/releases/download/1.0/tidal-hifi_1.0.0_amd64.snap
+```
+
+2. Install
+
+```sh
+snap install --dangerous <path> #for instance: tidal-hifi_1.0.0_amd64.snap
+```
+
+### Arch Linux
+
+Arch Linux users can use the AUR to install tidal-hifi:
+
+```sh
+trizen tidal-hifi
+```
+
 ### Using source
 
 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
 - npm install
 - npm start
@@ -41,15 +73,31 @@ To install and work with the code on this project follow these steps:
 
 - HiFi playback
 - Notifications
-- Shortcuts ([source](https://defkey.com/tidal-desktop-shortcuts))
+- Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
 - API for status and playback
-- [Settings feature](./docs/settings.png) to disable certain functionality. (`ctrl+/`)
-- Tray(/mini) player (coming soon)
+- Custom [integrations](#integrations)
+- [Settings feature](./docs/settings.png) to disable certain functionality. (`ctrl+=`)
 
 ## Integrations
 
+Tidal-hifi comes with several integrations out of the box.
+You can find these in the settings menu (`ctrl + =` by default) under the "integrations" tab.
+
+![integrations menu, showing a list of integrations](./docs/integrations.png)
+
+It currently includes:
+
+- mpris - mpris media player controls/status
+- Discord - Shows what you're listening to on Discord.
+
+### not included
+
 - [i3 blocks config](https://github.com/Mastermindzh/dotfiles/commit/9714b2fa1d670108ce811d5511fd3b7a43180647) - My dotfiles where I use this app to fetch currently playing music (direct commit)
 
+### Known bugs
+
+- [Last.fm login doesn't work](https://github.com/Mastermindzh/tidal-hifi/issues/4).
+
 ## Why
 
 I moved from Spotify over to Tidal and found Linux support to be lacking.
@@ -67,7 +115,23 @@ Whilst there are a handful of projects attempting to run Tidal on Electron they
 
 Sometimes it's just easier to start over, cover my own needs and then making it available to the public :)
 
-## Special thanks to..
+## Special thanks to...
 
 - [Castlabs](https://castlabs.com/)
   For maintaining Electron with Widevine CDM installation, Verified Media Path (VMP), and persistent licenses (StorageID)
+
+## Buy me a coffee? Please don't
+
+Instead spend some money on a charity I care for: [kwf.nl](https://secure.kwf.nl/donation).
+Inspired by [haydenjames' issue](https://github.com/Mastermindzh/tidal-hifi/issues/27#issuecomment-704198429)
+
+## Images
+
+### settings window
+
+![settings window](./docs/settings-preview.png)
+
+### user setups
+
+Some of our users are kind enough to share their usage pictures.
+If you want to see them or possibly even add one please do so in the following issue: [#3 - image thread](https://github.com/Mastermindzh/tidal-hifi/issues/3).

build/electron-builder.deb.yml

@@ -0,0 +1,6 @@
+extends: ./build/electron-builder.yml
+linux:
+  category: Audio
+  icon: ./assets/icon.png
+  target:
+    - deb

build/electron-builder.pacman.yml

@@ -0,0 +1,6 @@
+extends: ./build/electron-builder.yml
+linux:
+  category: Audio
+  icon: ./assets/icon.png
+  target:
+    - pacman

build/electron-builder.rpm.yml

@@ -0,0 +1,6 @@
+extends: ./build/electron-builder.yml
+linux:
+    category: Audio
+    icon: ./assets/TIDAL.icns
+    target:
+        - rpm

build/electron-builder.snap.yml

@@ -0,0 +1,6 @@
+extends: ./build/electron-builder.yml
+linux:
+  category: Audio
+  icon: ./assets/icon.png
+  target:
+    - snap

build/electron-builder.yml

@@ -1,5 +1,7 @@
 appId: com.rickvanlieshout.tidal-hifi
+electronVersion: 8.5.2
 electronDownload:
+  version: 8.5.2-wvvmp
   mirror: https://github.com/castlabs/electron-releases/releases/download/v
 snap:
   plugs:
@@ -11,8 +13,23 @@ linux:
     # - pacman
     - tar.gz
     - deb
+    - rpm
     - AppImage
     - snap
+    - freebsd
+  executableName: tidal-hifi
+  desktop:
+    Encoding: UTF-8
+    Name: tidal-hifi
+    GenericName: tidal-hifi
+    Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
+    Icon: assets/icon.png
+    StartupNotify: true
+    Terminal: false
+    Type: Application
+    Categories: Network;Application;Audio;Video
+    StartupWMClass: tidal-hifi
+    X-PulseAudio-Properties: media.role=music
 mac:
   category: public.app-category.entertainment
 win:

package.json

@@ -1,13 +1,17 @@
 {
   "name": "tidal-hifi",
-  "version": "0.1.0",
+  "version": "2.2.1",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "src/main.js",
   "scripts": {
     "start": "electron .",
-    "build": "electron-builder -c ./build/electron-builder.yml",
-    "build-wl": "electron-builder -c ./build/electron-builder.yml -wl",
-    "build-mac": "electron-builder -c ./build/electron-builder.yml -m"
+    "build": "electron-builder --publish=never -c ./build/electron-builder.yml",
+    "build-deb": "electron-builder --publish=never -c ./build/electron-builder.deb.yml",
+    "build-rpm": "electron-builder --publish=never -c ./build/electron-builder.rpm.yml",
+    "build-snap": "electron-builder --publish=never -c ./build/electron-builder.snap.yml",
+    "build-arch": "electron-builder --publish=never -c ./build/electron-builder.pacman.yml",
+    "build-wl": "electron-builder --publish=never -c ./build/electron-builder.yml -wl",
+    "build-mac": "electron-builder --publish=never -c ./build/electron-builder.yml -m"
   },
   "keywords": [
     "electron",
@@ -16,20 +20,24 @@
     "linux"
   ],
   "author": "Rick van Lieshout <info@rickvanlieshout.com> (http://rickvanlieshout.com)",
+  "homepage": "https://github.com/Mastermindzh/tidal-hifi",
   "license": "MIT",
   "dependencies": {
-    "electron-store": "^5.1.0",
+    "discord-rpc": "^3.2.0",
+    "electron-store": "^5.1.1",
     "express": "^4.17.1",
-    "hotkeys-js": "^3.7.1",
-    "node-notifier": "^6.0.0",
-    "request": "^2.88.0"
+    "hotkeys-js": "^3.7.6",
+    "mpris-service": "^2.1.0",
+    "node-notifier": "^9.0.1",
+    "request": "^2.88.2"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "electron": "https://github.com/castlabs/electron-releases#v6.1.0-wvvmp",
+    "dot-prop": ">=4.2.1",
+    "electron": "git+https://github.com/castlabs/electron-releases.git#v10.4.3-wvvmp",
     "electron-builder": "^21.2.0",
     "electron-reload": "^1.5.0",
-    "prettier": "^1.18.2"
+    "prettier": "^2.0.4"
   },
   "prettier": "@mastermindzh/prettier-config"
 }

src/constants/globalEvents.js

@@ -7,7 +7,6 @@ const globalEvents = {
   updateInfo: "update-info",
   hideSettings: "hideSettings",
   showSettings: "showSettings",
-  updateStatus: "update-status",
   storeChanged: "storeChanged",
   error: "error",
 };

src/constants/settings.js

@@ -17,6 +17,10 @@ const settings = {
     root: "apiSettings",
     port: "apiSettings.port",
   },
+  mpris: "mpris",
+  enableCustomHotkeys: "enableCustomHotkeys",
+  trayIcon: "trayIcon",
+  enableDiscord: "enableDiscord",
   windowBounds: {
     root: "windowBounds",
     width: "windowBounds.width",

src/main.js

@@ -9,12 +9,12 @@ const {
 } = require("./scripts/settings");
 const { addTray, refreshTray } = require("./scripts/tray");
 const { addMenu } = require("./scripts/menu");
-
 const path = require("path");
 const tidalUrl = "https://listen.tidal.com";
 const expressModule = require("./scripts/express");
 const mediaKeys = require("./constants/mediaKeys");
 const mediaInfoModule = require("./scripts/mediaInfo");
+const discordModule = require("./scripts/discord");
 const globalEvents = require("./constants/globalEvents");
 
 let mainWindow;
@@ -34,8 +34,8 @@ function createWindow(options = {}) {
   mainWindow = new BrowserWindow({
     x: options.x,
     y: options.y,
-    width: 1024,
-    height: 800,
+    width: store && store.get(settings.windowBounds.width),
+    height: store && store.get(settings.windowBounds.height),
     icon,
     tray: true,
     backgroundColor: options.backgroundColor,
@@ -43,7 +43,8 @@ function createWindow(options = {}) {
       affinity: "window",
       preload: path.join(__dirname, "preload.js"),
       plugins: true,
-      devTools: !app.isPackaged,
+      devTools: true, // I like tinkering, others might too
+      enableRemoteModule: true,
     },
   });
 
@@ -56,7 +57,7 @@ function createWindow(options = {}) {
   mainWindow.webContents.once("did-finish-load", () => {});
 
   // Emitted when the window is closed.
-  mainWindow.on("closed", function() {
+  mainWindow.on("closed", function () {
     closeSettingsWindow();
     app.quit();
   });
@@ -83,12 +84,12 @@ app.on("ready", () => {
   addMenu();
   createSettingsWindow();
   addGlobalShortcuts();
-  addTray({ icon });
-  refreshTray();
+  store.get(settings.trayIcon) && addTray({ icon }) && refreshTray();
   store.get(settings.api) && expressModule.run(mainWindow);
+  store.get(settings.enableDiscord) && discordModule.initRPC();
 });
 
-app.on("activate", function() {
+app.on("activate", function () {
   // On OS X it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
   if (mainWindow === null) {
@@ -97,7 +98,6 @@ app.on("activate", function() {
 });
 
 // IPC
-
 ipcMain.on(globalEvents.updateInfo, (event, arg) => {
   mediaInfoModule.update(arg);
 });
@@ -109,11 +109,14 @@ ipcMain.on(globalEvents.showSettings, (event, arg) => {
   showSettingsWindow();
 });
 
-ipcMain.on(globalEvents.updateStatus, (event, arg) => {
-  mediaInfoModule.updateStatus(arg);
-});
 ipcMain.on(globalEvents.storeChanged, (event, arg) => {
   mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
+
+  if (store.get(settings.enableDiscord) && !discordModule.rpc) {
+    discordModule.initRPC();
+  } else if (!store.get(settings.enableDiscord) && discordModule.rpc) {
+    discordModule.unRPC();
+  }
 });
 
 ipcMain.on(globalEvents.error, (event, arg) => {

src/pages/settings/preload.js

@@ -17,12 +17,16 @@ function refreshSettings() {
   api.checked = store.get(settings.api);
   port.value = store.get(settings.apiSettings.port);
   menuBar.checked = store.get(settings.menuBar);
+  trayIcon.checked = store.get(settings.trayIcon);
+  mpris.checked = store.get(settings.mpris);
+  enableCustomHotkeys.checked = store.get(settings.enableCustomHotkeys);
+  enableDiscord.checked = store.get(settings.enableDiscord);
 }
 
 /**
  * Open an url in the default browsers
  */
-window.openExternal = function(url) {
+window.openExternal = function (url) {
   const { shell } = require("electron");
   shell.openExternal(url);
 };
@@ -30,14 +34,14 @@ window.openExternal = function(url) {
 /**
  * hide the settings window
  */
-window.hide = function() {
+window.hide = function () {
   ipcRenderer.send(globalEvents.hideSettings);
 };
 
 /**
  * Restart tidal-hifi after changes
  */
-window.restart = function() {
+window.restart = function () {
   const remote = require("electron").remote;
   remote.app.relaunch();
   remote.app.exit(0);
@@ -52,7 +56,7 @@ window.addEventListener("DOMContentLoaded", () => {
   }
 
   function addInputListener(source, key) {
-    source.addEventListener("input", function(event, data) {
+    source.addEventListener("input", function (event, data) {
       if (this.value === "on") {
         store.set(key, source.checked);
       } else {
@@ -66,7 +70,7 @@ window.addEventListener("DOMContentLoaded", () => {
     refreshSettings();
   });
 
-  ipcRenderer.on("goToTab", (event, tab) => {
+  ipcRenderer.on("goToTab", (_, tab) => {
     document.getElementById(tab).click();
   });
 
@@ -75,6 +79,10 @@ window.addEventListener("DOMContentLoaded", () => {
   api = get("apiCheckbox");
   port = get("port");
   menuBar = get("menuBar");
+  trayIcon = get("trayIcon");
+  mpris = get("mprisCheckbox");
+  enableCustomHotkeys = get("enableCustomHotkeys");
+  enableDiscord = get("enableDiscord");
 
   refreshSettings();
 
@@ -83,4 +91,8 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(api, settings.api);
   addInputListener(port, settings.apiSettings.port);
   addInputListener(menuBar, settings.menuBar);
+  addInputListener(trayIcon, settings.trayIcon);
+  addInputListener(mpris, settings.mpris);
+  addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
+  addInputListener(enableDiscord, settings.enableDiscord);
 });

src/pages/settings/settings.html

@@ -26,14 +26,19 @@
     <div class="body">
         <div class="tabset">
             <!-- Tab 1 -->
-            <input type="radio" name="tabset" id="tab1" checked />
-            <label for="tab1">General</label>
+            <input type="radio" name="tabset" id="general" checked />
+            <label for="general">General</label>
             <!-- Tab 2 -->
-            <input type="radio" name="tabset" id="tab2" />
-            <label for="tab2">Api</label>
-            <!-- Tab 3 -->
-            <input type="radio" name="tabset" id="tab3" />
-            <label for="tab3">About</label>
+            <input type="radio" name="tabset" id="api" />
+            <label for="api">Api</label>
+
+            <!-- Integrations tab -->
+            <input type="radio" name="tabset" id="integrations" />
+            <label for="integrations">Integrations</label>
+
+            <!-- about tab -->
+            <input type="radio" name="tabset" id="about" />
+            <label for="about">About</label>
 
             <div class="tab-panels">
                 <section id="general" class="tab-panel">
@@ -63,15 +68,35 @@
                             </label>
                         </div>
                     </div>
+                    <div class="section">
+                      <h3>System</h3>
+                      <div class="option">
+                          <h4>Tray icon</h4>
+                          <p>
+                              Show Tidal-hifi's tray icon<br />
+                          </p>
+                          <label class="switch">
+                              <input id="trayIcon" type="checkbox">
+                              <span class="slider round"></span>
+                          </label>
+                      </div>
+                      <div class="option">
+                        <h4>Hotkeys</h4>
+                        <p>
+                            Enables extra hotkeys to achieve feature parity with the <a href = "javascript:openExternal('https://defkey.com/tidal-desktop-shortcuts')">desktop apps</a><br />
+                        </p>
+                        <label class="switch">
+                            <input id="enableCustomHotkeys" type="checkbox">
+                            <span class="slider round"></span>
+                        </label>
+                    </div>
+                  </div>
                 </section>
                 <section id="api" class="tab-panel">
                     <div class="section">
                         <h3>Api</h3>
                         <p style="margin-bottom: 15px;">
                             Tidal-hifi has a web api built in to allow users to get current song information. You can optionally enable playback control as well.
-                            <br />
-                            <br />
-                            <small>* api changes require a restart to update</small>
                         </p>
 
                         <div class="option">
@@ -99,9 +124,36 @@
                             </label>
                         </div>
                     </div>
-                    <button onClick="restart()">Restart Tidal-hifi</button>
                 </section>
-                <section id="general" class="tab-panel">
+                <section id="integrations" class="tab-panel">
+                  <div class="section">
+                      <h3>integrations</h3>
+                      <p style="margin-bottom: 15px;">
+                          Tidal-hifi is extensible trough the use of integrations. You can enable or disable integrations here
+                      </p>
+                      <div class="option">
+                          <h4>mpris-player</h4>
+                          <p>
+                              Whether to enable the mpris media player controls for Linux systems
+                          </p>
+                          <label class="switch">
+                              <input id="mprisCheckbox" type="checkbox">
+                              <span class="slider round"></span>
+                          </label>
+                      </div>
+                      <div class="option">
+                        <h4>Discord RPC</h4>
+                        <p>
+                            Show what you're listening to on Discord
+                        </p>
+                        <label class="switch">
+                            <input id="enableDiscord" type="checkbox">
+                            <span class="slider round"></span>
+                        </label>
+                    </div>
+                  </div>
+              </section>
+                <section id="about" class="tab-panel">
                   <div class="section">
                     <img style="width: 100px; height: auto; display: block; margin: 0 auto; margin-bottom: 20px; margin-top: 20px;" src = "./icon.png">
                     <p style="max-width: 350px; display:block; margin: 0 auto; text-align: center;">
@@ -111,6 +163,9 @@
 
                   </div>
                 </section>
+
+              <small>Some settings require a restart of Tidal-hifi. To do so click the button below:</small>
+              <button onClick="restart()" style ="width: 100%">Restart Tidal-hifi</button>
             </div>
         </div>
     </div>
@@ -170,6 +225,7 @@
 
     .exitWindow {
         border: none;
+        outline: none;
         text-decoration: none;
         font-size: 1.4rem;
         float: right;
@@ -178,6 +234,11 @@
         line-height: 50px;
     }
 
+    .exitWindow:focus {
+      border: none;
+      outline: none;
+    }
+
     .exitWindow svg {
         height: 50px;
         color: white;
@@ -263,7 +324,9 @@
 
     .tabset > input:first-child:checked ~ .tab-panels > .tab-panel:first-child,
     .tabset > input:nth-child(3):checked ~ .tab-panels > .tab-panel:nth-child(2),
-    .tabset > input:nth-child(5):checked ~ .tab-panels > .tab-panel:nth-child(3) {
+    .tabset > input:nth-child(5):checked ~ .tab-panels > .tab-panel:nth-child(3),
+    .tabset > input:nth-child(7):checked ~ .tab-panels > .tab-panel:nth-child(4)
+     {
         display: block;
     }
 

src/preload.js

@@ -1,5 +1,5 @@
-const { setTitle, getTitle } = require("./scripts/window-functions");
-const { dialog } = require("electron").remote;
+const { setTitle } = require("./scripts/window-functions");
+const { dialog, process } = require("electron").remote;
 const { store, settings } = require("./scripts/settings");
 const { ipcRenderer } = require("electron");
 const { app } = require("electron").remote;
@@ -10,6 +10,12 @@ const globalEvents = require("./constants/globalEvents");
 const notifier = require("node-notifier");
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
 let currentSong = "";
+let player;
+let currentPlayStatus = statuses.paused;
+let progressBarTime;
+let currentTimeChanged = false;
+let currentTime;
+let currentURL = undefined;
 
 const elements = {
   play: '*[data-test="play"]',
@@ -17,7 +23,7 @@ const elements = {
   next: '*[data-test="next"]',
   previous: 'button[data-test="previous"]',
   title: '*[data-test^="footer-track-title"]',
-  artists: '*[class^="mediaArtists"]',
+  artists: '*[data-test^="grid-item-detail-text-title-artist"]',
   home: '*[data-test="menu--home"]',
   back: '[class^="backwardButton"]',
   forward: '[class^="forwardButton"]',
@@ -28,20 +34,24 @@ const elements = {
   account: '*[data-test^="profile-image-button"]',
   settings: '*[data-test^="open-settings"]',
   media: '*[data-test="current-media-imagery"]',
-  image: '*[class^="image--"]',
+  image: "img",
+  current: '*[data-test="current-time"]',
+  duration: '*[data-test="duration-time"]',
+  bar: '*[data-test="progress-bar"]',
+  footer: "#footerPlayer",
 
   /**
    * Get an element from the dom
    * @param {*} key key in elements object to fetch
    */
-  get: function(key) {
+  get: function (key) {
     return window.document.querySelector(this[key.toLowerCase()]);
   },
 
   /**
    * Get the icon of the current song
    */
-  getSongIcon: function() {
+  getSongIcon: function () {
     const figure = this.get("media");
 
     if (figure) {
@@ -54,11 +64,24 @@ const elements = {
     return "";
   },
 
+  getArtists: function () {
+    const footer = this.get("footer");
+
+    if (footer) {
+      const artists = footer.querySelector(this["artists"]);
+      if (artists) {
+        return artists.innerText;
+      }
+    }
+
+    return "unknown artist(s)";
+  },
+
   /**
    * Shorthand function to get the text of a dom element
    * @param {*} key key in elements object to fetch
    */
-  getText: function(key) {
+  getText: function (key) {
     const element = this.get(key);
     return element ? element.textContent : "";
   },
@@ -67,7 +90,7 @@ const elements = {
    * Shorthand function to click a dom element
    * @param {*} key key in elements object to fetch
    */
-  click: function(key) {
+  click: function (key) {
     this.get(key).click();
     return this;
   },
@@ -76,7 +99,7 @@ const elements = {
    * Shorthand function to focus a dom element
    * @param {*} key key in elements object to fetch
    */
-  focus: function(key) {
+  focus: function (key) {
     return this.get(key).focus();
   },
 };
@@ -100,55 +123,38 @@ function playPause() {
  * https://defkey.com/tidal-desktop-shortcuts
  */
 function addHotKeys() {
-  hotkeys.add("Control+p", function() {
-    elements.click("account").click("settings");
-  });
-  hotkeys.add("Control+l", function() {
-    handleLogout();
-  });
+  if (store.get(settings.enableCustomHotkeys)) {
+    hotkeys.add("Control+p", function () {
+      elements.click("account").click("settings");
+    });
+    hotkeys.add("Control+l", function () {
+      handleLogout();
+    });
 
-  hotkeys.add("Control+h", function() {
-    elements.click("home");
-  });
+    hotkeys.add("Control+h", function () {
+      elements.click("home");
+    });
 
-  hotkeys.add("backspace", function() {
-    elements.click("back");
-  });
+    hotkeys.add("backspace", function () {
+      elements.click("back");
+    });
 
-  hotkeys.add("shift+backspace", function() {
-    elements.click("forward");
-  });
+    hotkeys.add("shift+backspace", function () {
+      elements.click("forward");
+    });
 
-  hotkeys.add("control+f", function() {
-    elements.focus("search");
-  });
+    hotkeys.add("control+u", function () {
+      // reloading window without cache should show the update bar if applicable
+      window.location.reload(true);
+    });
 
-  hotkeys.add("control+u", function() {
-    // reloading window without cache should show the update bar if applicable
-    window.location.reload(true);
-  });
+    hotkeys.add("control+r", function () {
+      elements.click("repeat");
+    });
+  }
 
-  hotkeys.add("control+left", function() {
-    elements.click("previous");
-  });
-
-  hotkeys.add("control+right", function() {
-    elements.click("next");
-  });
-
-  hotkeys.add("control+right", function() {
-    elements.click("next");
-  });
-
-  hotkeys.add("control+s", function() {
-    elements.click("shuffle");
-  });
-
-  hotkeys.add("control+r", function() {
-    elements.click("repeat");
-  });
-
-  hotkeys.add("control+/", function() {
+  // always add the hotkey for the settings window
+  hotkeys.add("control+=", function () {
     ipcRenderer.send(globalEvents.showSettings);
   });
 }
@@ -169,10 +175,10 @@ function handleLogout() {
       buttons: logoutOptions,
       defaultId: 2,
     },
-    function(response) {
+    function (response) {
       if (logoutOptions.indexOf("Yes, please") == response) {
-        for (i = 0; i < window.localStorage.length; i++) {
-          key = window.localStorage.key(i);
+        for (let i = 0; i < window.localStorage.length; i++) {
+          const key = window.localStorage.key(i);
           if (key.startsWith("_TIDAL_activeSession")) {
             window.localStorage.removeItem(key);
             i = window.localStorage.length + 1;
@@ -215,61 +221,190 @@ function addIPCEventListeners() {
 /**
  * Update the current status of tidal (e.g playing or paused)
  */
-function updateStatus() {
-  const play = elements.get("play");
-  let status = statuses.paused;
-  // if play button is NOT visible tidal is playing
-  if (!play) {
+function getCurrentlyPlayingStatus() {
+  let pause = elements.get("pause");
+  let status = undefined;
+
+  // if pause button is visible tidal is playing
+  if (pause) {
     status = statuses.playing;
+  } else {
+    status = statuses.paused;
+  }
+  return status;
+}
+
+/**
+ * Update Tidal-hifi's media info
+ *
+ * @param {*} options
+ */
+function updateMediaInfo(options, notify) {
+  if (options) {
+    ipcRenderer.send(globalEvents.updateInfo, options);
+    store.get(settings.notifications) && notify && notifier.notify(options);
+
+    if (player) {
+      player.metadata = {
+        ...player.metadata,
+        ...{
+          "xesam:title": options.title,
+          "xesam:artist": [options.artists],
+          "mpris:artUrl": options.image,
+        },
+      };
+      player.playbackStatus = options.status == statuses.paused ? "Paused" : "Playing";
+    }
+  }
+}
+
+/**
+ * Checks if Tidal is playing a video or song by grabbing the "a" element from the title.
+ * If it's a song it sets the track URL as currentURL, If it's a video it will set currentURL to undefined.
+ */
+function updateURL() {
+  const URLelement = elements.get("title").querySelector("a");
+  switch (URLelement) {
+    case null:
+      currentURL = undefined;
+      break;
+    default:
+      const id = URLelement.href.replace(/[^0-9]/g, "");
+      currentURL = `https://tidal.com/browse/track/${id}`;
+      break;
   }
-  ipcRenderer.send(globalEvents.updateStatus, status);
 }
 
 /**
  * Watch for song changes and update title + notify
  */
-setInterval(function() {
+setInterval(function () {
   const title = elements.getText("title");
-  const artists = elements.getText("artists");
+  const artists = elements.getArtists();
+  const current = elements.getText("current");
+  const duration = elements.getText("duration");
+  const progressBarcurrentTime = elements.get("bar").getAttribute("aria-valuenow");
   const songDashArtistTitle = `${title} - ${artists}`;
+  const currentStatus = getCurrentlyPlayingStatus();
+  const options = {
+    title,
+    message: artists,
+    status: currentStatus,
+    url: currentURL,
+    current: current,
+    duration: duration,
+  };
 
-  updateStatus();
+  const playStatusChanged = currentStatus !== currentPlayStatus;
+  const progressBarTimeChanged = progressBarcurrentTime !== progressBarTime;
+  const titleOrArtistChanged = currentSong !== songDashArtistTitle;
 
-  if (getTitle() !== songDashArtistTitle) {
+  if (titleOrArtistChanged || playStatusChanged || progressBarTimeChanged || currentTimeChanged) {
+    // update title, url and play info with new info
     setTitle(songDashArtistTitle);
+    updateURL();
+    currentSong = songDashArtistTitle;
+    currentPlayStatus = currentStatus;
 
-    if (currentSong !== songDashArtistTitle) {
-      currentSong = songDashArtistTitle;
-      const image = elements.getSongIcon();
-
-      const options = {
-        title,
-        message: artists,
-      };
-      new Promise((resolve, reject) => {
-        if (image.startsWith("http")) {
-          downloadFile(image, notificationPath).then(
-            () => {
-              options.icon = notificationPath;
-              resolve();
-            },
-            () => {
-              reject();
-            }
-          );
-        } else {
-          reject();
-        }
-      }).then(
-        () => {
-          ipcRenderer.send(globalEvents.updateInfo, options);
-          store.get(settings.notifications) && notifier.notify(options);
-        },
-        () => {}
-      );
+    // check progress bar value and make sure current stays up to date after switch
+    if (progressBarTime != progressBarcurrentTime && !titleOrArtistChanged) {
+      progressBarTime = progressBarcurrentTime;
+      currentTime = options.current;
+      options.duration = duration;
+      currentTimeChanged = true;
     }
+
+    if (currentTimeChanged) {
+      if (options.current == currentTime && currentStatus != "paused") return;
+      currentTime = options.current;
+      currentTimeChanged = false;
+    }
+
+    // make sure current is set to 0 if title changes
+    if (titleOrArtistChanged) {
+      options.current = "0:00";
+      currentTime = options.current;
+      progressBarTime = progressBarcurrentTime;
+    }
+
+    const image = elements.getSongIcon();
+
+    new Promise((resolve) => {
+      if (image.startsWith("http")) {
+        downloadFile(image, notificationPath).then(
+          () => {
+            options.icon = notificationPath;
+            resolve();
+          },
+          () => {
+            // if the image can't be downloaded then continue without it
+            resolve();
+          }
+        );
+      } else {
+        // if the image can't be found on the page continue without it
+        resolve();
+      }
+    }).then(
+      () => {
+        updateMediaInfo(options, titleOrArtistChanged);
+      },
+      () => {}
+    );
   }
 }, 200);
 
+if (process.platform === "linux" && store.get(settings.mpris)) {
+  try {
+    const Player = require("mpris-service");
+    player = Player({
+      name: "tidal-hifi",
+      identity: "tidal-hifi",
+      supportedUriSchemes: ["file"],
+      supportedMimeTypes: [
+        "audio/mpeg",
+        "audio/flac",
+        "audio/x-flac",
+        "application/ogg",
+        "audio/wav",
+      ],
+      supportedInterfaces: ["player"],
+      desktopEntry: "tidal-hifi",
+    });
+
+    // Events
+    var events = {
+      next: "next",
+      previous: "previous",
+      pause: "pause",
+      playpause: "playpause",
+      stop: "stop",
+      play: "play",
+      loopStatus: "repeat",
+      shuffle: "shuffle",
+      seek: "seek",
+    };
+    Object.keys(events).forEach(function (eventName) {
+      player.on(eventName, function () {
+        const eventValue = events[eventName];
+        switch (events[eventValue]) {
+          case events.playpause:
+            playPause();
+            break;
+
+          default:
+            elements.click(eventValue);
+        }
+      });
+    });
+
+    player.on("quit", function () {
+      app.quit();
+    });
+  } catch (exception) {
+    console.log("player api not working");
+  }
+}
+
 addHotKeys();
 addIPCEventListeners();

src/scripts/discord.js

@@ -0,0 +1,83 @@
+const discordrpc = require("discord-rpc");
+const { app, ipcMain } = require("electron");
+const globalEvents = require("../constants/globalEvents");
+const clientId = "833617820704440341";
+const mediaInfoModule = require("./mediaInfo");
+const discordModule = [];
+
+function timeToSeconds(timeArray) {
+  let minutes = timeArray[0] * 1;
+  let seconds = minutes * 60 + timeArray[1] * 1;
+  return seconds;
+}
+
+let rpc;
+const observer = (event, arg) => {
+  if (mediaInfoModule.mediaInfo.status == "paused" && rpc) {
+    rpc.setActivity(idleStatus);
+  } else if (rpc) {
+    const currentSeconds = timeToSeconds(mediaInfoModule.mediaInfo.current.split(":"));
+    const durationSeconds = timeToSeconds(mediaInfoModule.mediaInfo.duration.split(":"));
+    const date = new Date();
+    const now = (date.getTime() / 1000) | 0;
+    const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
+    if (mediaInfoModule.mediaInfo.url) {
+      rpc.setActivity({
+        ...idleStatus,
+        ...{
+          details: `Listening to ${mediaInfoModule.mediaInfo.title}`,
+          state: mediaInfoModule.mediaInfo.artist
+            ? mediaInfoModule.mediaInfo.artist
+            : "unknown artist(s)",
+          startTimestamp: parseInt(now),
+          endTimestamp: parseInt(remaining),
+          buttons: [{ label: "Play on Tidal", url: mediaInfoModule.mediaInfo.url }],
+        },
+      });
+    } else {
+      rpc.setActivity({
+        ...idleStatus,
+        ...{
+          details: `Watching ${mediaInfoModule.mediaInfo.title}`,
+          state: mediaInfoModule.mediaInfo.artist,
+          startTimestamp: parseInt(now),
+          endTimestamp: parseInt(remaining),
+        },
+      });
+    }
+  }
+};
+
+const idleStatus = {
+  details: `Browsing Tidal`,
+  largeImageKey: "tidal-hifi-icon",
+  largeImageText: `Tidal HiFi ${app.getVersion()}`,
+  instance: false,
+};
+
+/**
+ * Set up the discord rpc and listen on globalEvents.updateInfo
+ */
+discordModule.initRPC = function () {
+  rpc = new discordrpc.Client({ transport: "ipc" });
+  rpc.login({ clientId }).catch(console.error);
+  discordModule.rpc = rpc;
+
+  rpc.on("ready", () => {
+    rpc.setActivity(idleStatus);
+  });
+  ipcMain.on(globalEvents.updateInfo, observer);
+};
+
+/**
+ * Remove any RPC connection with discord and remove the event listener on globalEvents.updateInfo
+ */
+discordModule.unRPC = function () {
+  rpc.clearActivity();
+  rpc.destroy();
+  rpc = false;
+  discordModule.rpc = rpc;
+  ipcMain.removeListener(globalEvents.updateInfo, observer);
+};
+
+module.exports = discordModule;

src/scripts/express.js

@@ -53,7 +53,7 @@ expressModule.run = function(mainWindow) {
   if (store.get(settings.api)) {
     let port = store.get(settings.apiSettings.port);
 
-    expressInstance = expressApp.listen(port, () => {});
+    expressInstance = expressApp.listen(port, "127.0.0.1", () => {});
     expressInstance.on("error", function(e) {
       let message = e.code;
       if (e.code === "EADDRINUSE") {

src/scripts/mediaInfo.js

@@ -5,6 +5,9 @@ const mediaInfo = {
   artist: "",
   icon: "",
   status: statuses.paused,
+  url: "",
+  current: "",
+  duration: ""
 };
 const mediaInfoModule = {
   mediaInfo,
@@ -13,19 +16,14 @@ const mediaInfoModule = {
 /**
  * Update artist and song info in the mediaInfo constant
  */
-mediaInfoModule.update = function(arg) {
+mediaInfoModule.update = function (arg) {
   mediaInfo.title = propOrDefault(arg.title);
   mediaInfo.artist = propOrDefault(arg.message);
   mediaInfo.icon = propOrDefault(arg.icon);
-};
-
-/**
- * Update tidal's status in the mediaInfo constant
- */
-mediaInfoModule.updateStatus = function(status) {
-  if (Object.values(statuses).includes(status)) {
-    mediaInfo.status = status;
-  }
+  mediaInfo.url = propOrDefault(arg.url);
+  mediaInfo.status = propOrDefault(arg.status);
+  mediaInfo.current = propOrDefault(arg.current);
+  mediaInfo.duration = propOrDefault(arg.duration);
 };
 
 /**

src/scripts/menu.js

@@ -89,18 +89,18 @@ const mainMenu = [
   {
     label: "About",
     click() {
-      showSettingsWindow("tab3");
+      showSettingsWindow("about");
     },
   },
 ];
 
 const menuModule = { mainMenu };
 
-menuModule.getMenu = function() {
+menuModule.getMenu = function () {
   return Menu.buildFromTemplate(mainMenu);
 };
 
-menuModule.addMenu = function() {
+menuModule.addMenu = function () {
   Menu.setApplicationMenu(menuModule.getMenu());
 };
 

src/scripts/settings.js

@@ -14,7 +14,10 @@ const store = new Store({
     apiSettings: {
       port: 47836,
     },
-
+    trayIcon: true,
+    mpris: false,
+    enableCustomHotkeys: false,
+    enableDiscord: false,
     windowBounds: { width: 800, height: 600 },
   },
 });
@@ -25,7 +28,7 @@ const settingsModule = {
   settingsWindow,
 };
 
-settingsModule.createSettingsWindow = function() {
+settingsModule.createSettingsWindow = function () {
   settingsWindow = new BrowserWindow({
     width: 500,
     height: 600,
@@ -52,18 +55,18 @@ settingsModule.createSettingsWindow = function() {
   settingsModule.settingsWindow = settingsWindow;
 };
 
-settingsModule.showSettingsWindow = function(tab = "tab1") {
+settingsModule.showSettingsWindow = function (tab = "general") {
   settingsWindow.webContents.send("goToTab", tab);
 
   // refresh data just before showing the window
   settingsWindow.webContents.send("refreshData");
   settingsWindow.show();
 };
-settingsModule.hideSettingsWindow = function() {
+settingsModule.hideSettingsWindow = function () {
   settingsWindow.hide();
 };
 
-settingsModule.closeSettingsWindow = function() {
+settingsModule.closeSettingsWindow = function () {
   settingsWindow = null;
 };
 

src/scripts/tray.js

@@ -3,12 +3,15 @@ const { getMenu } = require("./menu");
 const trayModule = {};
 let tray;
 
-trayModule.addTray = function(options = { icon: "" }) {
+trayModule.addTray = function (options = { icon: "" }) {
   tray = new Tray(options.icon);
 };
 
-trayModule.refreshTray = function() {
-  tray.on("click", function(e) {
+trayModule.refreshTray = function () {
+  if (!tray) {
+    trayModule.addTray();
+  }
+  tray.on("click", function (e) {
     // do nothing on click
   });
 

stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 2
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - good first issue
+  - waiting for support
+  - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false