added a hotkey on ctrl+0 for settings. fixes #91

Co-authored-by: Diogo Oliveira <dromarques@outlook.com>

.github/workflows/build.yml

@@ -9,10 +9,12 @@ jobs:
   build_on_linux:
     runs-on: ubuntu-latest
     steps:
+      - name: Install libarchive-tools
+        run: sudo apt-get install -y libarchive-tools
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
 
@@ -22,7 +24,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
 
@@ -32,6 +34,6 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build

.github/workflows/release.yml

@@ -9,10 +9,12 @@ jobs:
   build_on_linux:
     runs-on: ubuntu-latest
     steps:
+      - name: Install libarchive-tools
+        run: sudo apt-get install -y libarchive-tools
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -26,7 +28,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -40,7 +42,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master

CHANGELOG.md

@@ -4,6 +4,94 @@ 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.7.1
+
+- Fixed bug: Triggering fullscreen from the Tidal web app would cause the menubar to be visible even if it was disabled in the settings
+
+## 2.7.0
+
+- Switched to the native Notifier (removed node-notifier)
+- Album art now also has a name, based on [best effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847)
+
+## 2.6.0
+
+- Add album images to mediainfo and discord
+
+## 2.5.0
+
+- Notify-send now correctly shows "Tidal Hifi" as the program name
+- Updated dependencies (including electron itself)
+
+### known issues
+
+- Requires older version of nodejs due to electron-builder (use lts/gallium)
+
+### builds
+
+updated to nodejs 16 in actions
+
+## 2.4.0
+
+- Added more mpris settings
+- Added instruction for rescrobbler to get last.fm working without sandbox mode
+
+## 2.3.0
+
+- Added a setting to minimize to tray on app close (off by default)
+- Added the main menu to the trayicon
+
+## 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

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)
 
@@ -14,12 +14,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)
+    - [last.fm doesn't work out of the box. Use rescrobbler as a workaround](#lastfm-doesnt-work-out-of-the-box-use-rescrobbler-as-a-workaround)
 - [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 -->
 
@@ -33,13 +41,13 @@ Various packaged versions of the software are available on the [releases](https:
 
 To install with `snap` you need to download the pre-packaged snap-package from this repository, found under releases:
 
-1. Download:
+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:
+2. Install
 
 ```sh
 snap install --dangerous <path> #for instance: tidal-hifi_1.0.0_amd64.snap
@@ -57,7 +65,7 @@ trizen 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
 - npm install
 - npm start
@@ -66,17 +74,35 @@ 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+/`)
+- Custom [integrations](#integrations)
+- [Settings feature](./docs/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
+- AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
 
 ## 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).
+#### last.fm doesn't work out of the box. Use rescrobbler as a workaround
+
+The last.fm login doesn't work, as is evident from the following issue: [Last.fm login doesn't work](https://github.com/Mastermindzh/tidal-hifi/issues/4).
+However, in that same issue you can read about a workaround using [rescrobbler](https://github.com/InputUsername/rescrobbled).
+For now that will be the default workaround.
 
 ## Why
 
@@ -95,7 +121,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.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:
@@ -8,7 +10,7 @@ snap:
 linux:
   category: Audio
   target:
-    # - pacman
+    - pacman
     - tar.gz
     - deb
     - rpm
@@ -32,3 +34,7 @@ mac:
   category: public.app-category.entertainment
 win:
   target: msi
+  icon: build/icon.png
+  artifactName: "tidalhifi"
+  appId: com.rickvanlieshout.tidalhifi
+  executableName: tidalhifi

build/linux/arch/.SRCINFO

@@ -1,20 +0,0 @@
-pkgbase = tidal-hifi-git
-	pkgdesc = The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
-	pkgver = 1.1.0
-	pkgrel = 1
-	url = https://github.com/Mastermindzh/tidal-hifi
-	arch = x86_64
-	license = custom:MIT
-	makedepends = npm
-	makedepends = git
-	depends = libxss
-	depends = nss
-	depends = gtk3
-	provides = tidal-hifi
-	source = https://github.com/Mastermindzh/tidal-hifi/archive/1.1.0.zip
-	source = tidal-hifi.desktop
-	sha512sums = b855f6530b945e4b0f7891c04a8b0279cf642d9cfcf180b8ded629a85743899ac431d3de87fcecb605fae82e1df2dc86d0a72c3cc85d426bf8fe08b41630c299
-	sha512sums = fa5fa918ea890baa5f500db3153a6eff3d63966528ffa3349acda3ea02fbecb1ea78a1ba1d23ef7402de2228fc0a483252e0b7e72c73cfb25ed401bedaf856f5
-
-pkgname = tidal-hifi-git
-

build/linux/arch/PKGBUILD

@@ -1,56 +0,0 @@
-# Maintainer: Rick van Lieshout <info@rickvanlieshout.com>
-
-_pkgname=tidal-hifi
-pkgname="$_pkgname-git"
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="The web version of listen.tidal.com running in electron with hifi support thanks to widevine."
-arch=("x86_64")
-url="https://github.com/Mastermindzh/tidal-hifi"
-license=("custom:MIT")
-
-depends=("libxss" "nss" "gtk3")
-makedepends=("npm" "git")
-provides=("$_pkgname")
-
-source=("https://github.com/Mastermindzh/tidal-hifi/archive/$pkgver.zip"
-        "${_pkgname}.desktop")
-sha512sums=('b855f6530b945e4b0f7891c04a8b0279cf642d9cfcf180b8ded629a85743899ac431d3de87fcecb605fae82e1df2dc86d0a72c3cc85d426bf8fe08b41630c299'
-            'fa5fa918ea890baa5f500db3153a6eff3d63966528ffa3349acda3ea02fbecb1ea78a1ba1d23ef7402de2228fc0a483252e0b7e72c73cfb25ed401bedaf856f5')
-
-cdToPkg(){
-    cd "tidal-hifi-$pkgver"
-}
-
-prepare() {
-    cdToPkg
-
-    # install build dependencies
-    npm install
-}
-
-build() {
-    cdToPkg
-
-    # We are not using the systems Electron as we need castlab's Electron.
-    npx electron-builder --linux dir
-}
-
-package() {
-    cdToPkg
-
-    install -d "${pkgdir}/opt/${_pkgname}/" "${pkgdir}/usr/bin" "${pkgdir}/usr/share/doc" "${pkgdir}/usr/share/licenses"
-
-    cp -r dist/linux-unpacked/* "${pkgdir}/opt/${_pkgname}/"
-    chmod +x "${pkgdir}/opt/${_pkgname}/${_pkgname}"
-
-    ln -s "/opt/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
-
-    install -Dm 644 "build/icon.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
-    install -Dm 644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-
-    install -Dm 644 "README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md"
-    install -Dm 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    ln -s "/opt/${_pkgname}/LICENSE.electron.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.electron.txt"
-    ln -s "/opt/${_pkgname}/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSES.chromium.html"
-}

build/linux/arch/install.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-# Will generate a correctly formatted SRCINFO file
-
-SCRIPT_DIST=".SRCINFO"
-
-# generate SRCINFO
-makepkg --printsrcinfo > $SCRIPT_DIST
-
-# replace pkgbase with tidal-hifi-git
-pkgName="tidal-hifi-git"
-sed -i "1s/.*/pkgbase = $pkgName/" $SCRIPT_DIST
-
-# replace pkgbase with tidal-hifi-git
-sed -i '/^pkgname/ d' $SCRIPT_DIST
-echo "pkgname = $pkgName" >> $SCRIPT_DIST
-
-# remove double line breaks and replace with single line breaks
-sed -i '/^$/N;/^\n$/D' $SCRIPT_DIST

build/linux/arch/tidal-hifi.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-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.
-Exec=tidal-hifi %u
-Icon=tidal-hifi.png
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Network;Application;Audio;Video
-StartupWMClass=tidal-hifi
-X-PulseAudio-Properties=media.role=music

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "1.1.0",
+  "version": "2.7.1",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "src/main.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "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": "npm run build-without-release -c ./build/electron-builder.pacman.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"
   },
@@ -20,21 +20,22 @@
     "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.1",
+    "discord-rpc": "^4.0.1",
+    "electron-store": "^8.0.1",
     "express": "^4.17.1",
-    "hotkeys-js": "^3.7.6",
+    "hotkeys-js": "^3.8.7",
-    "node-notifier": "^6.0.0",
+    "mpris-service": "^2.1.2",
     "request": "^2.88.2"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "electron": "git+https://github.com/castlabs/electron-releases.git#v8.5.2-wvvmp",
+    "electron": "git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus",
-    "electron-builder": "^21.2.0",
+    "electron-builder": "^22.14.5",
     "electron-reload": "^1.5.0",
-    "prettier": "^2.0.4",
+    "prettier": "^2.5.0"
-    "dot-prop": ">=4.2.1"
   },
   "prettier": "@mastermindzh/prettier-config"
 }

src/constants/globalEvents.js

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

src/constants/settings.js

@@ -18,11 +18,15 @@ const settings = {
     port: "apiSettings.port",
   },
   mpris: "mpris",
+  enableCustomHotkeys: "enableCustomHotkeys",
+  trayIcon: "trayIcon",
+  enableDiscord: "enableDiscord",
   windowBounds: {
     root: "windowBounds",
     width: "windowBounds.width",
     height: "windowBounds.height",
   },
+  minimizeOnClose: "minimizeOnClose",
 };
 
 module.exports = settings;

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;
@@ -29,6 +29,14 @@ if (!app.isPackaged) {
   });
 }
 
+/**
+ * Update the menuBarVisbility according to the store value
+ *
+ */
+function syncMenuBarWithStore() {
+  mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
+}
+
 function createWindow(options = {}) {
   // Create the browser window.
   mainWindow = new BrowserWindow({
@@ -44,10 +52,11 @@ function createWindow(options = {}) {
       preload: path.join(__dirname, "preload.js"),
       plugins: true,
       devTools: true, // I like tinkering, others might too
+      enableRemoteModule: true,
     },
   });
 
-  mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
+  syncMenuBarWithStore();
 
   // load the Tidal website
   mainWindow.loadURL(tidalUrl);
@@ -55,6 +64,14 @@ function createWindow(options = {}) {
   // run stuff after first load
   mainWindow.webContents.once("did-finish-load", () => {});
 
+  mainWindow.on("close", function (event) {
+    if (!app.isQuiting && store.get(settings.minimizeOnClose)) {
+      event.preventDefault();
+      mainWindow.hide();
+      refreshTray(mainWindow);
+    }
+    return false;
+  });
   // Emitted when the window is closed.
   mainWindow.on("closed", function () {
     closeSettingsWindow();
@@ -83,9 +100,10 @@ app.on("ready", () => {
   addMenu();
   createSettingsWindow();
   addGlobalShortcuts();
-  addTray({ icon });
+  store.get(settings.trayIcon) && addTray({ icon }) && refreshTray();
-  refreshTray();
   store.get(settings.api) && expressModule.run(mainWindow);
+  store.get(settings.enableDiscord) && discordModule.initRPC();
+  // mainWindow.webContents.openDevTools();
 });
 
 app.on("activate", function () {
@@ -97,7 +115,6 @@ app.on("activate", function () {
 });
 
 // IPC
-
 ipcMain.on(globalEvents.updateInfo, (event, arg) => {
   mediaInfoModule.update(arg);
 });
@@ -109,11 +126,18 @@ ipcMain.on(globalEvents.showSettings, (event, arg) => {
   showSettingsWindow();
 });
 
-ipcMain.on(globalEvents.updateStatus, (event, arg) => {
+ipcMain.on(globalEvents.refreshMenuBar, (event, arg) => {
-  mediaInfoModule.updateStatus(arg);
+  syncMenuBarWithStore();
 });
+
 ipcMain.on(globalEvents.storeChanged, (event, arg) => {
-  mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
+  syncMenuBarWithStore();
+
+  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,7 +17,11 @@ 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);
+  minimizeOnClose.checked = store.get(settings.minimizeOnClose);
 }
 
 /**
@@ -76,7 +80,11 @@ window.addEventListener("DOMContentLoaded", () => {
   api = get("apiCheckbox");
   port = get("port");
   menuBar = get("menuBar");
+  trayIcon = get("trayIcon");
+  minimizeOnClose = get("minimizeOnClose");
   mpris = get("mprisCheckbox");
+  enableCustomHotkeys = get("enableCustomHotkeys");
+  enableDiscord = get("enableDiscord");
 
   refreshSettings();
 
@@ -85,5 +93,9 @@ 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);
+  addInputListener(minimizeOnClose, settings.minimizeOnClose);
 });

src/pages/settings/settings.html

@@ -68,15 +68,45 @@
                             </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>Minimize on Close</h4>
+                        <p>
+                            Minimize window on close instead <br />
+                        </p>
+                        <label class="switch">
+                            <input id="minimizeOnClose" 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">
@@ -104,18 +134,14 @@
                             </label>
                         </div>
                     </div>
-                    <button onClick="restart()">Restart Tidal-hifi</button>
                 </section>
                 <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
-                          <br />
-                          * not all integrations require restarting but some do, your best bet is to restart :)
                       </p>
-                      <!-- disabled until the 403 with mpris-service/dbus is fixed  -->
+                      <div class="option">
-                      <!-- <div class="option">
                           <h4>mpris-player</h4>
                           <p>
                               Whether to enable the mpris media player controls for Linux systems
@@ -124,8 +150,17 @@
                               <input id="mprisCheckbox" type="checkbox">
                               <span class="slider round"></span>
                           </label>
-                      </div> -->
+                      </div>
-                      <button onClick="restart()">Restart Tidal-hifi</button>
+                      <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">
@@ -138,6 +173,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>

src/preload.js

@@ -1,5 +1,5 @@
-const { setTitle, getTitle } = require("./scripts/window-functions");
+const { setTitle } = require("./scripts/window-functions");
-const { dialog, process } = require("electron").remote;
+const { dialog, process, Notification } = require("electron").remote;
 const { store, settings } = require("./scripts/settings");
 const { ipcRenderer } = require("electron");
 const { app } = require("electron").remote;
@@ -7,10 +7,14 @@ const { downloadFile } = require("./scripts/download");
 const statuses = require("./constants/statuses");
 const hotkeys = require("./scripts/hotkeys");
 const globalEvents = require("./constants/globalEvents");
-const notifier = require("node-notifier");
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
 let currentSong = "";
-// let player;
+let player;
+let currentPlayStatus = statuses.paused;
+let progressBarTime;
+let currentTimeChanged = false;
+let currentTime;
+let currentURL = undefined;
 
 const elements = {
   play: '*[data-test="play"]',
@@ -18,7 +22,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"]',
@@ -29,7 +33,15 @@ 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",
+  album_header_title: '.header-details [data-test="title"]',
+  playing_title: 'span[data-test="table-cell-title"].css-geqnfr',
+  album_name_cell: '[data-test="table-cell-album"]',
+  tracklist_row: '[data-test="tracklist-row"]',
 
   /**
    * Get an element from the dom
@@ -48,7 +60,43 @@ const elements = {
     if (figure) {
       const mediaElement = figure.querySelector(this["image"]);
       if (mediaElement) {
-        return mediaElement.src;
+        return mediaElement.src.replace("80x80", "640x640");
+      }
+    }
+
+    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)";
+  },
+
+  getAlbumName: function () {
+    //If listening to an album, get its name from the header title
+    if (window.location.href.includes("/album/")) {
+      const albumName = window.document.querySelector(this.album_header_title);
+      if (albumName) {
+        return albumName.textContent;
+      }
+      //If listening to a playlist or a mix, get album name from the list
+    } else if (
+      window.location.href.includes("/playlist/") ||
+      window.location.href.includes("/mix/")
+    ) {
+      if (currentPlayStatus === statuses.playing) {
+        const row = window.document.querySelector(this.playing_title).closest(this.tracklist_row);
+        if (row) {
+          return row.querySelector(this.album_name_cell).textContent;
+        }
       }
     }
 
@@ -101,55 +149,41 @@ function playPause() {
  * https://defkey.com/tidal-desktop-shortcuts
  */
 function addHotKeys() {
-  hotkeys.add("Control+p", function () {
+  if (store.get(settings.enableCustomHotkeys)) {
-    elements.click("account").click("settings");
+    hotkeys.add("Control+p", function () {
-  });
+      elements.click("account").click("settings");
-  hotkeys.add("Control+l", function () {
+    });
-    handleLogout();
+    hotkeys.add("Control+l", function () {
-  });
+      handleLogout();
+    });
 
-  hotkeys.add("Control+h", function () {
+    hotkeys.add("Control+h", function () {
-    elements.click("home");
+      elements.click("home");
-  });
+    });
 
-  hotkeys.add("backspace", function () {
+    hotkeys.add("backspace", function () {
-    elements.click("back");
+      elements.click("back");
-  });
+    });
 
-  hotkeys.add("shift+backspace", function () {
+    hotkeys.add("shift+backspace", function () {
-    elements.click("forward");
+      elements.click("forward");
-  });
+    });
 
-  hotkeys.add("control+f", function () {
+    hotkeys.add("control+u", function () {
-    elements.focus("search");
+      // reloading window without cache should show the update bar if applicable
-  });
+      window.location.reload(true);
+    });
 
-  hotkeys.add("control+u", function () {
+    hotkeys.add("control+r", function () {
-    // reloading window without cache should show the update bar if applicable
+      elements.click("repeat");
-    window.location.reload(true);
+    });
-  });
+  }
 
-  hotkeys.add("control+left", function () {
+  // always add the hotkey for the settings window
-    elements.click("previous");
+  hotkeys.add("control+=", function () {
+    ipcRenderer.send(globalEvents.showSettings);
   });
-
+  hotkeys.add("control+0", function () {
-  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 () {
     ipcRenderer.send(globalEvents.showSettings);
   });
 }
@@ -172,8 +206,8 @@ function handleLogout() {
     },
     function (response) {
       if (logoutOptions.indexOf("Yes, please") == response) {
-        for (i = 0; i < window.localStorage.length; i++) {
+        for (let i = 0; i < window.localStorage.length; i++) {
-          key = window.localStorage.key(i);
+          const key = window.localStorage.key(i);
           if (key.startsWith("_TIDAL_activeSession")) {
             window.localStorage.removeItem(key);
             i = window.localStorage.length + 1;
@@ -185,6 +219,12 @@ function handleLogout() {
   );
 }
 
+function addFullScreenListeners() {
+  window.document.addEventListener("fullscreenchange", (event) => {
+    ipcRenderer.send(globalEvents.refreshMenuBar);
+  });
+}
+
 /**
  * Add ipc event listeners.
  * Some actions triggered outside of the site need info from the site.
@@ -216,9 +256,9 @@ function addIPCEventListeners() {
 /**
  * Update the current status of tidal (e.g playing or paused)
  */
-function updateStatus() {
+function getCurrentlyPlayingStatus() {
   let pause = elements.get("pause");
-  let status;
+  let status = undefined;
 
   // if pause button is visible tidal is playing
   if (pause) {
@@ -226,12 +266,59 @@ function updateStatus() {
   } else {
     status = statuses.paused;
   }
+  return status;
+}
 
-  if (status) {
+/**
-    ipcRenderer.send(globalEvents.updateStatus, status);
+ * Convert the duration from MM:SS to seconds
-    // if (player) {
+ * @param {*} duration
-    //   player.playbackStatus = status == statuses.paused ? "Paused" : "Playing";
+ */
-    // }
+function convertDuration(duration) {
+  const parts = duration.split(":");
+  return parseInt(parts[1]) + 60 * parseInt(parts[0]);
+}
+
+/**
+ * Update Tidal-hifi's media info
+ *
+ * @param {*} options
+ */
+function updateMediaInfo(options, notify) {
+  if (options) {
+    ipcRenderer.send(globalEvents.updateInfo, options);
+    if (store.get(settings.notifications) && notify) {
+      new Notification({ title: options.title, body: options.message, icon: options.icon }).show();
+    }
+    if (player) {
+      player.metadata = {
+        ...player.metadata,
+        ...{
+          "xesam:title": options.title,
+          "xesam:artist": [options.message],
+          "xesam:album": options.album,
+          "mpris:artUrl": options.image,
+          "mpris:length": convertDuration(options.duration) * 1000 * 1000,
+        },
+      };
+      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;
   }
 }
 
@@ -240,109 +327,141 @@ function updateStatus() {
  */
 setInterval(function () {
   const title = elements.getText("title");
-  const artists = elements.getText("artists");
+  const artists = elements.getArtists();
+  const album = elements.getAlbumName();
+  const current = elements.getText("current");
+  const duration = elements.getText("duration");
+  const appName = "Tidal Hifi";
+  const progressBarcurrentTime = elements.get("bar").getAttribute("aria-valuenow");
   const songDashArtistTitle = `${title} - ${artists}`;
+  const currentStatus = getCurrentlyPlayingStatus();
+  const options = {
+    title,
+    message: artists,
+    album: album,
+    status: currentStatus,
+    url: currentURL,
+    current: current,
+    duration: duration,
+    "app-name": appName,
+  };
 
-  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) {
+    // check progress bar value and make sure current stays up to date after switch
-      currentSong = songDashArtistTitle;
+    if (progressBarTime != progressBarcurrentTime && !titleOrArtistChanged) {
-      const image = elements.getSongIcon();
+      progressBarTime = progressBarcurrentTime;
-
+      currentTime = options.current;
-      const options = {
+      options.duration = duration;
-        title,
+      currentTimeChanged = true;
-        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);
-
-          // if (player) {
-          //   player.metadata = {
-          //     ...player.metadata,
-          //     ...{
-          //       "xesam:title": title,
-          //       "xesam:artist": [artists],
-          //       "mpris:artUrl": image,
-          //     },
-          //   };
-          // }
-        },
-        () => {}
-      );
     }
+
+    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")) {
+        options.image = image;
+        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)) {
+if (process.platform === "linux" && store.get(settings.mpris)) {
-//   try {
+  try {
-//     const Player = require("mpris-service");
+    const Player = require("mpris-service");
-//     player = Player({
+    player = Player({
-//       name: "tidal-hifi",
+      name: "tidal-hifi",
-//       identity: "tidal-hifi",
+      identity: "tidal-hifi",
-//       supportedUriSchemes: ["file"],
+      supportedUriSchemes: ["file"],
-//       supportedMimeTypes: [
+      supportedMimeTypes: [
-//         "audio/mpeg",
+        "audio/mpeg",
-//         "audio/flac",
+        "audio/flac",
-//         "audio/x-flac",
+        "audio/x-flac",
-//         "application/ogg",
+        "application/ogg",
-//         "audio/wav",
+        "audio/wav",
-//       ],
+      ],
-//       supportedInterfaces: ["player"],
+      supportedInterfaces: ["player"],
-//       desktopEntry: "tidal-hifi",
+      desktopEntry: "tidal-hifi",
-//     });
+    });
 
-//     // Events
+    // Events
-//     var events = {
+    var events = {
-//       next: "next",
+      next: "next",
-//       previous: "previous",
+      previous: "previous",
-//       pause: "pause",
+      pause: "pause",
-//       playpause: "playpause",
+      playpause: "playpause",
-//       stop: "stop",
+      stop: "stop",
-//       play: "play",
+      play: "play",
-//       loopStatus: "repeat",
+      loopStatus: "repeat",
-//       shuffle: "shuffle",
+      shuffle: "shuffle",
-//       seek: "seek",
+      seek: "seek",
-//     };
+    };
-//     Object.keys(events).forEach(function (eventName) {
+    Object.keys(events).forEach(function (eventName) {
-//       player.on(eventName, function () {
+      player.on(eventName, function () {
-//         const eventValue = events[eventName];
+        const eventValue = events[eventName];
-//         switch (events[eventValue]) {
+        switch (events[eventValue]) {
-//           case events.playpause:
+          case events.playpause:
-//             playPause();
+            playPause();
-//             break;
+            break;
 
-//           default:
+          default:
-//             elements.click(eventValue);
+            elements.click(eventValue);
-//         }
+        }
-//       });
+      });
-//     });
+    });
+    // Override get position function
+    player.getPosition = function () {
+      return convertDuration(elements.getText("current")) * 1000 * 1000;
+    };
 
-//     player.on("quit", function () {
+    player.on("quit", function () {
-//       app.quit();
+      app.quit();
-//     });
+    });
-//   } catch (exception) {
+  } catch (exception) {
-//     console.log("player api not working");
+    console.log("player api not working");
-//   }
+  }
-// }
+}
 
 addHotKeys();
 addIPCEventListeners();
+addFullScreenListeners();

src/scripts/discord.js

@@ -0,0 +1,85 @@
+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),
+          largeImageKey: mediaInfoModule.mediaInfo.image,
+          largeImageText: (mediaInfoModule.mediaInfo.album) ? mediaInfoModule.mediaInfo.album : `${idleStatus.largeImageText}`,
+          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/mediaInfo.js

@@ -3,8 +3,13 @@ const statuses = require("./../constants/statuses");
 const mediaInfo = {
   title: "",
   artist: "",
+  album: "",
   icon: "",
   status: statuses.paused,
+  url: "",
+  current: "",
+  duration: "",
+  image: "tidal-hifi-icon"
 };
 const mediaInfoModule = {
   mediaInfo,
@@ -13,19 +18,16 @@ 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.album = propOrDefault(arg.album);
   mediaInfo.icon = propOrDefault(arg.icon);
-};
+  mediaInfo.url = propOrDefault(arg.url);
-
+  mediaInfo.status = propOrDefault(arg.status);
-/**
+  mediaInfo.current = propOrDefault(arg.current);
- * Update tidal's status in the mediaInfo constant
+  mediaInfo.duration = propOrDefault(arg.duration);
- */
+  mediaInfo.image = propOrDefault(arg.image);
-mediaInfoModule.updateStatus = function(status) {
-  if (Object.values(statuses).includes(status)) {
-    mediaInfo.status = status;
-  }
 };
 
 /**

src/scripts/settings.js

@@ -14,7 +14,11 @@ const store = new Store({
     apiSettings: {
       port: 47836,
     },
+    trayIcon: true,
+    minimizeOnClose : false,
     mpris: false,
+    enableCustomHotkeys: false,
+    enableDiscord: false,
     windowBounds: { width: 800, height: 600 },
   },
 });

src/scripts/tray.js

@@ -1,19 +1,49 @@
-const { Tray } = require("electron");
+const { Tray, app } = require("electron");
-const { getMenu } = require("./menu");
+const { Menu } = require("electron");
+const { getMenu, mainMenu } = require("./menu");
+const { store, settings } = require("./settings");
 const trayModule = {};
 let tray;
 
-trayModule.addTray = function(options = { icon: "" }) {
+trayModule.addTray = function (options = { icon: "" }) {
   tray = new Tray(options.icon);
 };
 
-trayModule.refreshTray = function() {
+trayModule.refreshTray = function (mainWindow) {
-  tray.on("click", function(e) {
+  if (!tray) {
-    // do nothing on click
+    trayModule.addTray();
+  }
+
+  tray.on("click", function (e) {
+    if (mainWindow) {
+      mainWindow.show();
+    }
   });
 
   tray.setToolTip("Tidal-hifi");
-  tray.setContextMenu(getMenu());
+
+  if (mainWindow && store.get(settings.minimizeOnClose)) {
+    tray.setContextMenu(
+      Menu.buildFromTemplate([
+        {
+          label: "Toggle Window",
+          click: function () {
+            mainWindow.isVisible() ? mainWindow.hide() : mainWindow.show();
+          },
+        },
+        {
+          label: "Quit",
+          click: function () {
+            mainWindow.destroy();
+            app.quit();
+          },
+        },
+        ...mainMenu, //we add menu items from the other context
+      ])
+    );
+  } else {
+    tray.setContextMenu(getMenu());
+  }
 };
 
 module.exports = trayModule;