Merge pull request #265 from Mastermindzh/feature/5.6.0

Feature/5.6.0

.drone.yml

@@ -0,0 +1,16 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: install
+    image: node:19.4.0
+    commands:
+      - npm install
+
+  - name: build_with_linux
+    image: node:19.4.0
+    commands:
+      - apt-get update && apt-get upgrade -y
+      - apt-get install -y libarchive-tools rpm
+      - npm run build-unpacked

.editorconfig

@@ -10,6 +10,10 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
+[**.ts]
+indent_style = space
+indent_size = 2
+
 [**.json]
 indent_style = space
 indent_size = 2
@@ -50,4 +54,4 @@ trim_trailing_whitespace = ignore
 charset = ignore
 
 [{test/fixtures,deps,tools/eslint,tools/gyp,tools/icu,tools/msvs}/**]
-insert_final_newline = false
+insert_final_newline = false

.eslintrc

@@ -0,0 +1,16 @@
+{
+  "root": true,
+  "env": {
+    "node": true,
+    "browser": true
+  },
+  "parser": "@typescript-eslint/parser",
+  "plugins": [
+    "@typescript-eslint"
+  ],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended"
+  ]
+}

.github/workflows/build.yml

@@ -5,6 +5,10 @@ on:
     branches-ignore:
       - master
       - develop
+  pull_request:
+    branches-ignore:
+      - master
+      - develop
 jobs:
   build_on_linux:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -5,6 +5,10 @@ on:
     branches:
       - master
       - develop
+  pull_request:
+    branches:
+      - master
+
 jobs:
   build_on_linux:
     runs-on: ubuntu-latest
@@ -16,7 +20,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 16
+          node-version: 19
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -25,12 +29,12 @@ jobs:
           path: dist/
 
   build_on_mac:
-    runs-on: macOS-latest
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 16
+          node-version: 19
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -44,7 +48,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 16
+          node-version: 19
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master

.gitignore

@@ -12,3 +12,8 @@ build/linux/arch/*
 
 # JetBrains IDE configuration
 .idea
+ts-dist/**
+ts-dist
+themes
+!src/themes
+.sass-cache

.stylelintrc.json

@@ -0,0 +1,13 @@
+{
+  "plugins": [
+    "stylelint-prettier"
+  ],
+  "extends": [
+    "stylelint-config-standard-scss"
+  ],
+  "rules": {
+    "prettier/prettier": true,
+    "scss/at-extend-no-missing-placeholder": null,
+    "no-descending-specificity": null
+  }
+}

.vscode/settings.json

@@ -1,3 +1,20 @@
 {
-  "cSpell.words": ["hifi", "rescrobbler", "widevine"]
+  "cSpell.words": [
+    "Brainz",
+    "Castlabs",
+    "flac",
+    "Flatpak",
+    "geqnfr",
+    "hifi",
+    "listenbrainz",
+    "playpause",
+    "rescrobbler",
+    "scrobble",
+    "scrobbling",
+    "Songwhip",
+    "trackid",
+    "tracklist",
+    "widevine",
+    "xesam"
+  ]
 }

CHANGELOG.md

@@ -4,6 +4,45 @@ 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.6.0]
+
+- Added support for Wayland (on by default) fixes [#262](https://github.com/Mastermindzh/tidal-hifi/issues/262) and [#157](https://github.com/Mastermindzh/tidal-hifi/issues/157)
+- Made it clear in the readme that this tidal-hifi client supports High & Max audio settings. fixes [#261](https://github.com/Mastermindzh/tidal-hifi/issues/261)
+- Added app suspension inhibitors when music is playing. fixes [#257](https://github.com/Mastermindzh/tidal-hifi/issues/257)
+- Fixed bug with theme files from user directory trying to load: "an error occurred reading the theme file"
+- Fixed: config flags not being set correctly
+- [DEV]:
+  - Logger is now static and will automatically call either ipcRenderer or ipcMain
+
+## 5.5.0
+
+- ListenBrainz integration added (thanks @Mar0xy)
+
+## 5.4.0
+
+- Removed Windows builds (from publishes) as they don't work anymore.
+- Added [Songwhip](https://songwhip.com/) integration
+- Fixed bug with several hotkeys not working due to Tidal's HTML/css changes
+- [DEV]:
+  - added a logger to log into STDout
+  - added "watchStart" which will automatically restart electron when it detects a source code change
+  - added "listen.tidal.com-parsing-scripts" folder with a script to verify whether all elements (in the main preload.ts) are present on the page
+
+## 5.3.0
+
+- SPKChaosPhoenix updated the beautiful Tokyo Night theme:
+
+![tidal with the tokyo night theme applied](./docs/images/tokyo-night.png)
+
+## 5.2.0
+
+- moved from Javascript to Typescript for all files
+
+  - use `npm run watch` to watch for changes & recompile typescript and sass files
+
+- Added support for theming the application
+- Added drone build file use `drone exec` or drone.ci to build it
+
 ## 5.1.0
 
 ### New features

README.md

@@ -1,42 +1,85 @@
 # Tidal-hifi<img src = "./build/icon.png" height="40" align="right"/>
 
-![GitHub release](https://img.shields.io/github/release/Mastermindzh/tidal-hifi.svg)
+![GitHub release](https://img.shields.io/github/release/Mastermindzh/tidal-hifi.svg) [![github builds](https://github.com/mastermindzh/tidal-hifi/actions/workflows/build.yml/badge.svg)](https://github.com/Mastermindzh/tidal-hifi/actions) [![Build Status](https://ci.mastermindzh.tech/api/badges/Mastermindzh/tidal-hifi/status.svg)](https://ci.mastermindzh.tech/Mastermindzh/tidal-hifi) [![Discord logo](./docs/images/discord.png)](https://discord.gg/yhNwf4v4He)
 
-The web version of [listen.tidal.com](https://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 (High & Max) support thanks to widevine.
 
-![tidal-hifi preview](./docs/preview.png)
+![tidal-hifi preview](./docs/images/preview.png)
 
 ## Table of Contents
 
 <!-- toc -->
 
-- [Installation](#installation)
-  - [Dependencies](#dependencies)
-  - [Using releases](#using-releases)
-  - [Snap](#snap)
-  - [Arch Linux](#arch-linux)
-  - [Flatpak](#flatpak)
-  - [Nix](#nix)
-  - [Using source](#using-source)
-- [Features](#features)
-- [Integrations](#integrations)
+- [Tidal-hifi](#tidal-hifi)
+  - [Table of Contents](#table-of-contents)
+  - [Features](#features)
+  - [Contributions](#contributions)
+  - [Why did I create tidal-hifi?](#why-did-i-create-tidal-hifi)
+    - [Why not extend existing projects?](#why-not-extend-existing-projects)
+  - [Installation](#installation)
+    - [Dependencies](#dependencies)
+    - [Using releases](#using-releases)
+    - [Snap](#snap)
+    - [Arch Linux](#arch-linux)
+    - [Flatpak](#flatpak)
+    - [Nix](#nix)
+    - [Using source](#using-source)
+  - [Integrations](#integrations)
   - [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)
-- [Buy me a coffee? Please don't](#buy-me-a-coffee-please-dont)
-- [Images](#images)
-  - [Settings window](#settings-window)
-  - [User setups](#user-setups)
+    - [DRM not working on Windows](#drm-not-working-on-windows)
+  - [Special thanks to](#special-thanks-to)
+  - [Donations](#donations)
+  - [Images](#images)
+    - [Settings window](#settings-window)
+    - [User setups](#user-setups)
 
 <!-- tocstop -->
 
+## Features
+
+- HiFi playback (High & Max settings)
+- Notifications
+- Custom [theming](./docs/theming.md)
+- Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
+- [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
+- 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)
+  - MPRIS integration
+
+## Contributions
+
+To contribute you can use the standard GitHub features (issues, prs, etc) or join the discord server to talk with like-minded individuals.
+
+- ![Discord logo](./docs/images/discord.png) [Join the Discord server](https://discord.gg/yhNwf4v4He)
+
+## Why did I create tidal-hifi?
+
+I moved from Spotify over to Tidal and found Linux support to be lacking.
+When I started this project there weren't any Linux apps that offered Tidal's "hifi" options nor any scripts to control it.
+I made this app to support the highest quality audio available on the Linux platform. It used to be "hifi" but now is ["High & Max"](https://tidal.com/sound-quality).
+
+### Why not extend existing projects?
+
+Whilst there are a handful of projects attempting to run Tidal on Electron they are all unappealing to me because of various reasons:
+
+- Lack of maintainers/developers. (no hotfixes, no issues being handled etc)
+- Most are simple web wrappers, not my cup of tea.
+- Some are DE-oriented. I want this to work on WM's too.
+- None have Widevine working at the moment
+
+Sometimes it's just easier to start over, cover my own needs and after that making it available to the public :)
+
 ## Installation
 
 ### Dependencies
 
-Note that you **need** a notification library such as [libnotify](https://github.com/GNOME/libnotify) or [dunst](https://github.com/dunst-project/dunst) in order for the software to work properly.
+Note that you **need** a notification library such as [libnotify](https://github.com/GNOME/libnotify) or [dunst](https://github.com/dunst-project/dunst) for the software to work properly.
 
 ### Using releases
 
@@ -48,15 +91,15 @@ To install with `snap` you need to download the pre-packaged snap-package from t
 
 1. Download
 
-```sh
-wget <URI> #for instance: https://github.com/Mastermindzh/tidal-hifi/releases/download/1.0/tidal-hifi_1.0.0_amd64.snap
-```
+   ```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
-```
+   ```sh
+   snap install --dangerous <path> #for instance: tidal-hifi_1.0.0_amd64.snap
+   ```
 
 ### Arch Linux
 
@@ -91,73 +134,45 @@ To install and work with the code on this project follow these steps:
 - npm install
 - npm start
 
-## Features
-
-- HiFi playback
-- Notifications
-- Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
-- 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))
-- 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.
+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)
+![integrations menu, showing a list of integrations](./docs/images/integrations.png)
 
-It currently includes:
-
-- MPRIS - MPRIS media player controls/status
-- Discord - Shows what you're listening to on Discord.
-
-Not included:
+Integrations with other projects that are not included natively:
 
 - [i3 blocks config](https://github.com/Mastermindzh/dotfiles/commit/9714b2fa1d670108ce811d5511fd3b7a43180647) - My dotfiles where I use this app to fetch currently playing music (direct commit)
+- [neptune](https://github.com/uwu/neptune) third party plugins & theming
 
-### Known bugs
+## Known bugs
 
-#### last.fm doesn't work out of the box. Use rescrobbler as a workaround
+### 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.
+For now, that will be the default workaround.
 
-## Why
+### DRM not working on Windows
 
-I moved from Spotify over to Tidal and found Linux support to be lacking.
-
-When I started this project there weren't any Linux apps that offered Tidal's "hifi" options nor any scripts to control it.
-
-## Why not extend existing projects?
-
-Whilst there are a handful of projects attempting to run Tidal on Electron they are all unappealing to me because of various reasons:
-
-- Lack of a maintainers/developers. (no hotfixes, no issues being handled etc)
-- Most are simple web wrappers, not my cup of tea.
-- Some are DE oriented. I want this to work on WM's too.
-- None have widevine working at the moment
-
-Sometimes it's just easier to start over, cover my own needs and then making it available to the public :)
+Most Windows users run into DRM issues when trying to use tidal-hifi.
+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.
 
 ## 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
+## Donations
 
-Instead spend some money on a charity I care for: [kwf.nl](https://www.kwf.nl/donatie/donation).
-Inspired by [haydenjames' issue](https://github.com/Mastermindzh/tidal-hifi/issues/27#issuecomment-704198429)
+You can find my Github sponsorship page at: [https://github.com/sponsors/Mastermindzh](https://github.com/sponsors/Mastermindzh)
 
 ## Images
 
 ### Settings window
 
-![settings window](./docs/settings-preview.png)
+![settings window](./docs/images/settings-preview.png)
 
 ### User setups
 

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+Only the very latest 😄.
+
+## Reporting a Vulnerability
+
+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

@@ -7,6 +7,8 @@ snap:
   plugs:
     - default
     - screen-inhibit-control
+extraResources:
+  - "themes/**"
 linux:
   category: AudioVideo
   icon: assets/icons

docs/theming.md

@@ -0,0 +1,38 @@
+# Theming tidal-hifi
+
+## Table of contents
+
+<!-- toc -->
+
+- [Theming tidal-hifi](#theming-tidal-hifi)
+  - [Table of contents](#table-of-contents)
+  - [Custom CSS](#custom-css)
+  - [config](#config)
+  - [Warning! Themes might break](#warning-themes-might-break)
+
+<!-- tocstop -->
+
+By default tidal-hifi comes with a few themes.
+You can select these in the settings window under the theming tab as shown below.
+
+![Settings window with the theming tab opened](./images/theming.png)
+
+## Custom CSS
+
+The custom CSS will be added to the HTML document last.
+This means that it will overwrite any existing CSS, even that of themes, unless the original has an access modifier such as `$important`.
+
+![settings window on the theming tab with a custom CSS override](./images/customcss.png)
+
+## config
+
+The theme selector and customCSS are stored in the config file.
+The custom CSS is stored as a list of lines.
+
+![settings window on the theming tab next to the config file](./images/customcss-config.png)
+
+## Warning! Themes might break
+
+Themes might break at any point. Tidal changes their webpage structure a ton (they probably generate classNames and don't provide roles/ids/attributes.)
+
+If one breaks you can create an Issue on GitHub or ask for assistance in the [Discord channel](https://discord.gg/yhNwf4v4He).

listen.tidal.com-parsing-scripts/verifyElements.js

@@ -0,0 +1,43 @@
+// for some dumb reason `listen.tidal.com` has disabled console.log
+// we can simply return an array with values though...
+// run this on a playlist or mix page and observe the result
+// NOTE: play & pause can't live together so one or the other will throw an error
+(() => {
+  let elements = {
+    play: '*[data-test="play"]',
+    pause: '*[data-test="pause"]',
+    next: '*[data-test="next"]',
+    previous: 'button[data-test="previous"]',
+    title: '*[data-test^="footer-track-title"]',
+    artists: '*[data-test^="grid-item-detail-text-title-artist"]',
+    home: '*[data-test="menu--home"]',
+    back: '[title^="Back"]',
+    forward: '[title^="Next"]',
+    search: '[class^="searchField"]',
+    shuffle: '*[data-test="shuffle"]',
+    repeat: '*[data-test="repeat"]',
+    account: '*[data-test^="profile-image-button"]',
+    media: '*[data-test="current-media-imagery"]',
+    image: "img",
+    current: '*[data-test="current-time"]',
+    duration: '*[data-test="duration"]',
+    bar: '*[data-test="progress-bar"]',
+    footer: "#footerPlayer",
+    mediaItem: "[data-type='mediaItem']",
+    album_header_title: '.header-details [data-test="title"]',
+    currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
+    album_name_cell: '[class^="album"]',
+    tracklist_row: '[data-test="tracklist-row"]',
+    volume: '*[data-test="volume"]',
+  };
+
+  let results = [];
+
+  Object.entries(elements).forEach(([key, value]) => {
+    const returnValue = document.querySelector(`${value}`);
+    if (!returnValue) {
+      results.push(`element ${key} not found`);
+    }
+  });
+  return results;
+})();

package.json

@@ -1,10 +1,16 @@
 {
   "name": "tidal-hifi",
-  "version": "5.1.0",
+  "version": "5.6.0",
   "description": "Tidal on Electron with widevine(hifi) support",
-  "main": "src/main.js",
+  "main": "ts-dist/main.js",
   "scripts": {
-    "start": "electron .",
+    "start": "electron --inspect=0.0.0.0:5858 .",
+    "watchStart": "nodemon dist -x \"npm run start\"",
+    "compile": "tsc && npm run sass-and-copy",
+    "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",
+    "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",
     "build-unpacked": "npm run builder -- -c ./build/electron-builder.unpacked.yml",
@@ -14,41 +20,56 @@
     "build-wl": "npm run builder -- -c ./build/electron-builder.yml -wl",
     "build-mac": "npm run builder -- -c ./build/electron-builder.yml -m",
     "build-base": "npm run builder -- -c ./build/electron-builder.base.yml",
-    "prestart": "npm run sass",
-    "prebuilder": "npm run sass",
+    "prebuilder": "npm run compile",
     "builder": "electron-builder --publish=never",
-    "sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css",
-    "sass-lint": "sass-lint -vc ./sass-lint.yml ./src/pages/settings/settings.scss",
-    "sass-lint-fix": "sass-lint-auto-fix ./src/pages/settings/settings.scss --config-sass-lint ./sass-lint.yml"
+    "sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css && sass --no-source-map src/themes:themes",
+    "style-lint": "npx stylelint **/*.scss",
+    "style-lint-fix": "npx stylelint --fix **/*.scss"
   },
   "keywords": [
     "electron",
     "hifi",
     "widevine",
-    "linux"
+    "linux",
+    "drm",
+    "castlabs"
   ],
   "author": "Rick van Lieshout <info@rickvanlieshout.com> (http://rickvanlieshout.com)",
   "homepage": "https://github.com/Mastermindzh/tidal-hifi",
   "license": "MIT",
   "dependencies": {
-    "@electron/remote": "^2.0.9",
+    "@electron/remote": "^2.0.10",
+    "axios": "^1.4.0",
     "discord-rpc": "^4.0.1",
     "electron-store": "^8.1.0",
     "express": "^4.18.2",
-    "hotkeys-js": "^3.10.2",
+    "hotkeys-js": "^3.11.2",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.62.0"
+    "sass": "^1.64.1"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
+    "@types/discord-rpc": "^4.0.5",
+    "@types/express": "^4.17.17",
+    "@types/node": "^20.4.4",
+    "@types/request": "^2.48.8",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "^6.1.0",
+    "copyfiles": "^2.4.1",
     "electron": "git+https://github.com/castlabs/electron-releases.git#v24.1.2+wvcus",
-    "electron-builder": "^24.2.1",
+    "electron-builder": "^24.4.0",
+    "eslint": "^8.45.0",
     "js-yaml": "^4.1.0",
     "markdown-toc": "^1.2.0",
-    "prettier": "^2.8.7",
-    "sass-lint": "^1.13.1",
-    "sass-lint-auto-fix": "^0.21.2"
+    "nodemon": "^3.0.1",
+    "prettier": "^3.0.0",
+    "stylelint": "^15.10.2",
+    "stylelint-config-standard": "^34.0.0",
+    "stylelint-config-standard-scss": "^10.0.0",
+    "stylelint-prettier": "^4.0.0",
+    "tsc-watch": "^6.0.4",
+    "typescript": "^5.1.6"
   },
   "prettier": "@mastermindzh/prettier-config"
-}
+}

sass-lint.yml

@@ -1,21 +0,0 @@
-rules:
-  property-sort-order:
-    - 1
-    - order: "smacss"
-  class-name-format:
-    - 1
-    - convention: "hyphenatedbem"
-  quotes:
-    - 1
-    - style: "double"
-  nesting-depth:
-    - 1
-    - max-depth: 3
-  placeholder-in-extend:
-    - 0
-  no-vendor-prefixes:
-    - 0
-  empty-line-between-blocks:
-    - 0
-  force-pseudo-nesting:
-    - 0

src/constants/flags.js

@@ -1,6 +0,0 @@
-const flags = {
-  gpuRasterization: [{ flag: "enable-gpu-rasterization", value: undefined }],
-  disableHardwareMediaKeys: [{ flag: "disable-features", value: "HardwareMediaKeyHandling" }],
-};
-
-module.exports = flags;

src/constants/flags.ts

@@ -0,0 +1,9 @@
+export const flags: { [key: string]: { flag: string; value?: string }[] } = {
+  gpuRasterization: [{ flag: "enable-gpu-rasterization", value: undefined }],
+  disableHardwareMediaKeys: [{ flag: "disable-features", value: "HardwareMediaKeyHandling" }],
+  enableWaylandSupport: [
+    { flag: "enable-features", value: "UseOzonePlatform" },
+    { flag: "ozone-platform-hint", value: "auto" },
+    { flag: "enable-features", value: "WaylandWindowDecorations" },
+  ],
+};

src/constants/globalEvents.ts

@@ -1,4 +1,4 @@
-const globalEvents = {
+export const globalEvents = {
   play: "play",
   pause: "pause",
   playPause: "playPause",
@@ -10,6 +10,6 @@ const globalEvents = {
   showSettings: "showSettings",
   storeChanged: "storeChanged",
   error: "error",
+  whip: "whip",
+  log: "log",
 };
-
-module.exports = globalEvents;

src/constants/mediaKeys.ts

@@ -1,9 +1,7 @@
-const globalEvents = require("./globalEvents");
+import { globalEvents } from "./globalEvents";
 
-const mediaKeys = {
+export const mediaKeys = {
   MediaPlayPause: globalEvents.playPause,
   MediaNextTrack: globalEvents.next,
   MediaPreviousTrack: globalEvents.previous,
 };
-
-module.exports = mediaKeys;

src/constants/settings.ts

@@ -8,7 +8,7 @@
  *    },
  *    windowBounds: { width: 800, height: 600 },
  */
-const settings = {
+export const settings = {
   adBlock: "adBlock",
   api: "api",
   apiSettings: {
@@ -20,9 +20,17 @@ const settings = {
   disableHardwareMediaKeys: "disableHardwareMediaKeys",
   enableCustomHotkeys: "enableCustomHotkeys",
   enableDiscord: "enableDiscord",
+  ListenBrainz: {
+    root: "ListenBrainz",
+    enabled: "ListenBrainz.enabled",
+    api: "ListenBrainz.api",
+    token: "ListenBrainz.token",
+  },
   flags: {
+    root: "flags",
     disableHardwareMediaKeys: "flags.disableHardwareMediaKeys",
     gpuRasterization: "flags.gpuRasterization",
+    enableWaylandSupport: "flags.enableWaylandSupport",
   },
   menuBar: "menuBar",
   minimizeOnClose: "minimizeOnClose",
@@ -32,6 +40,7 @@ const settings = {
   singleInstance: "singleInstance",
   skipArtists: "skipArtists",
   skippedArtists: "skippedArtists",
+  theme: "theme",
   trayIcon: "trayIcon",
   updateFrequency: "updateFrequency",
   windowBounds: {
@@ -40,5 +49,3 @@ const settings = {
     height: "windowBounds.height",
   },
 };
-
-module.exports = settings;

src/constants/statuses.js

@@ -1,4 +0,0 @@
-module.exports = {
-  playing: "playing",
-  paused: "paused",
-};

src/constants/values.ts

@@ -1,3 +1,3 @@
-module.exports = {
+export default {
   name: "tidal-hifi",
 };

src/declarations.d.ts

@@ -0,0 +1 @@
+declare module "mpris-service";

src/features/flags/flags.ts

@@ -0,0 +1,41 @@
+import { App } from "electron";
+import { flags } from "../../constants/flags";
+import { settings } from "../../constants/settings";
+import { settingsStore } from "../../scripts/settings";
+import { Logger } from "../logger";
+
+/**
+ * Set default Electron flags
+ */
+export function setDefaultFlags(app: App) {
+  setFlag(app, "disable-seccomp-filter-sandbox");
+}
+
+/**
+ * Set Tidal's managed flags from the user settings
+ * @param app
+ */
+export function setManagedFlagsFromSettings(app: App) {
+  const flagsFromSettings = settingsStore.get(settings.flags.root);
+  if (flagsFromSettings) {
+    for (const [key, value] of Object.entries(flagsFromSettings)) {
+      if (value) {
+        flags[key].forEach((flag) => {
+          Logger.log(`enabling command line option ${flag.flag} with value ${flag.value}`);
+          setFlag(app, flag.flag, flag.value);
+        });
+      }
+    }
+  }
+}
+
+/**
+ * Set a single flag for Electron
+ * @param app app to set it on
+ * @param flag flag name
+ * @param value value to be set for the flag
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function setFlag(app: App, flag: string, value?: any) {
+  app.commandLine.appendSwitch(flag, value);
+}

src/features/idleInhibitor/idleInhibitor.ts

@@ -0,0 +1,65 @@
+import { PowerSaveBlocker, powerSaveBlocker } from "electron";
+import { Logger } from "../logger";
+
+/**
+ * Start blocking idle/screen timeouts
+ * @param blocker optional instance of the powerSaveBlocker to use
+ * @returns id of current block
+ */
+export const acquireInhibitor = (blocker?: PowerSaveBlocker): number => {
+  const currentBlocker = blocker ?? powerSaveBlocker;
+  const blockId = currentBlocker.start("prevent-app-suspension");
+  Logger.log(`Started preventing app suspension with id: ${blockId}`);
+  return blockId;
+};
+
+/**
+ * Check whether there is a blocker active for the current id, if not start it.
+ * @param id id of inhibitor you want to check activity against
+ * @param blocker optional instance of the powerSaveBlocker to use
+ */
+export const acquireInhibitorIfInactive = (id: number, blocker?: PowerSaveBlocker): number => {
+  const currentBlocker = blocker ?? powerSaveBlocker;
+  if (!isInhibitorActive(id, currentBlocker)) {
+    return acquireInhibitor();
+  }
+
+  return id;
+};
+
+/**
+ * stop blocking idle/screen timeouts
+ * @param id id of inhibitor you want to check activity against
+ * @param blocker optional instance of the powerSaveBlocker to use
+ */
+export const releaseInhibitor = (id: number, blocker?: PowerSaveBlocker) => {
+  try {
+    const currentBlocker = blocker ?? powerSaveBlocker;
+    currentBlocker.stop(id);
+    Logger.log(`Released inhibitor with id: ${id}`);
+  } catch (error) {
+    Logger.log("Releasing inhibitor failed");
+  }
+};
+
+/**
+ * stop blocking idle/screen timeouts if a inhibitor is active
+ * @param id id of inhibitor you want to check activity against
+ * @param blocker optional instance of the powerSaveBlocker to use
+ */
+export const releaseInhibitorIfActive = (id: number, blocker?: PowerSaveBlocker) => {
+  const currentBlocker = blocker ?? powerSaveBlocker;
+  if (isInhibitorActive(id, currentBlocker)) {
+    releaseInhibitor(id, currentBlocker);
+  }
+};
+
+/**
+ * check whether the inhibitor is active
+ * @param id id of inhibitor you want to check activity against
+ * @param blocker optional instance of the powerSaveBlocker to use
+ */
+export const isInhibitorActive = (id: number, blocker?: PowerSaveBlocker) => {
+  const currentBlocker = blocker ?? powerSaveBlocker;
+  return currentBlocker.isStarted(id);
+};

src/features/listenbrainz/listenbrainz.ts

@@ -0,0 +1,132 @@
+import axios from "axios";
+import Store from "electron-store";
+import { settings } from "../../constants/settings";
+import { MediaStatus } from "../../models/mediaStatus";
+import { settingsStore } from "../../scripts/settings";
+import { Logger } from "../logger";
+import { StoreData } from "./models/storeData";
+
+const ListenBrainzStore = new Store({ name: "listenbrainz" });
+
+export const ListenBrainzConstants = {
+  oldData: "oldData",
+};
+
+export class ListenBrainz {
+  /**
+   * Create the object to store old information in the Store :)
+   * @param title
+   * @param artists
+   * @param duration
+   * @returns data passed along in an object + a "listenedAt" key with the current time
+   */
+  private static constructStoreData(title: string, artists: string, duration: number): StoreData {
+    return {
+      listenedAt: Math.floor(new Date().getTime() / 1000),
+      title,
+      artists,
+      duration,
+    };
+  }
+
+  /**
+   * Call the ListenBrainz API and create playing now payload and scrobble old song
+   * @param title
+   * @param artists
+   * @param status
+   * @param duration
+   */
+  public static async scrobble(
+    title: string,
+    artists: string,
+    status: string,
+    duration: number
+  ): Promise<void> {
+    try {
+      if (status === MediaStatus.paused) {
+        return;
+      } 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 playing_data = {
+          listen_type: "playing_now",
+          payload: [
+            {
+              track_metadata: {
+                additional_info: {
+                  media_player: "Tidal Hi-Fi",
+                  submission_client: "Tidal Hi-Fi",
+                  music_service: "tidal.com",
+                  duration: duration,
+                },
+                artist_name: artists,
+                track_name: title,
+              },
+            },
+          ],
+        };
+
+        await axios.post(
+          `${settingsStore.get<string, string>(settings.ListenBrainz.api)}/1/submit-listens`,
+          playing_data,
+          {
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: `Token ${settingsStore.get<string, string>(
+                settings.ListenBrainz.token
+              )}`,
+            },
+          }
+        );
+        if (!oldData) {
+          ListenBrainzStore.set(
+            ListenBrainzConstants.oldData,
+            this.constructStoreData(title, artists, duration)
+          );
+        } else {
+          if (oldData.title !== title) {
+            // This constructs the data required to scrobble the data after the song finishes
+            const scrobble_data = {
+              listen_type: "single",
+              payload: [
+                {
+                  listened_at: oldData.listenedAt,
+                  track_metadata: {
+                    additional_info: {
+                      media_player: "Tidal Hi-Fi",
+                      submission_client: "Tidal Hi-Fi",
+                      music_service: "listen.tidal.com",
+                      duration: oldData.duration,
+                    },
+                    artist_name: oldData.artists,
+                    track_name: oldData.title,
+                  },
+                },
+              ],
+            };
+            await axios.post(
+              `${settingsStore.get<string, string>(settings.ListenBrainz.api)}/1/submit-listens`,
+              scrobble_data,
+              {
+                headers: {
+                  "Content-Type": "application/json",
+                  Authorization: `Token ${settingsStore.get<string, string>(
+                    settings.ListenBrainz.token
+                  )}`,
+                },
+              }
+            );
+            ListenBrainzStore.set(
+              ListenBrainzConstants.oldData,
+              this.constructStoreData(title, artists, duration)
+            );
+          }
+        }
+      }
+    } catch (error) {
+      Logger.log(JSON.stringify(error));
+    }
+  }
+}
+
+export { ListenBrainzStore };

src/features/listenbrainz/models/storeData.ts

@@ -0,0 +1,9 @@
+/**
+ * Data saved for ListenBrainz
+ */
+export interface StoreData {
+  listenedAt: number;
+  title: string;
+  artists: string;
+  duration: number;
+}

src/features/logger.ts

@@ -0,0 +1,52 @@
+import { IpcMain, ipcMain, IpcMainEvent, ipcRenderer } from "electron";
+import { globalEvents } from "../constants/globalEvents";
+
+export class Logger {
+  /**
+   * Subscribe to watch for logs from the IPC client
+   * @param ipcMain main thread IPC client so we can subscribe to events
+   */
+  public static watch(ipcMain: IpcMain) {
+    ipcMain.on(
+      globalEvents.log,
+      (event: IpcMainEvent | { content: string; message: string }, message) => {
+        const { content, object } = message ?? event;
+        this.logToSTDOut(content, object);
+      }
+    );
+  }
+  /**
+   * Log content to STDOut
+   * @param content
+   * @param object js(on) object that will be prettyPrinted
+   */
+  public static log(content: string, object: object = {}) {
+    if (ipcRenderer) {
+      ipcRenderer.send(globalEvents.log, { content, object });
+    } else {
+      ipcMain.emit(globalEvents.log, { content, object });
+    }
+  }
+
+  /**
+   * Log content to STDOut and use the provided alert function to alert
+   * @param content
+   * @param object js(on) object that will be prettyPrinted
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  public static alert(content: string, object: any = {}, alert?: (msg: string) => void) {
+    Logger.log(content, object);
+    if (alert) {
+      alert(`${content} \n\nwith details: \n${JSON.stringify(object, null, 2)}`);
+    }
+  }
+
+  /**
+   * Log to STDOut
+   * @param content
+   * @param object
+   */
+  private static logToSTDOut(content: string, object = {}) {
+    console.log(content, Object.keys(object).length > 0 ? JSON.stringify(object, null, 2) : "");
+  }
+}

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/main.ts

@@ -1,5 +1,5 @@
-require("@electron/remote/main").initialize();
-const {
+import { enable, initialize } from "@electron/remote/main";
+import {
   app,
   BrowserWindow,
   components,
@@ -7,57 +7,50 @@ const {
   ipcMain,
   protocol,
   session,
-} = require("electron");
-const {
-  settings,
-  store,
-  createSettingsWindow,
-  showSettingsWindow,
+} from "electron";
+import path from "path";
+import { globalEvents } from "./constants/globalEvents";
+import { mediaKeys } from "./constants/mediaKeys";
+import { settings } from "./constants/settings";
+import { setDefaultFlags, setManagedFlagsFromSettings } from "./features/flags/flags";
+import {
+  acquireInhibitorIfInactive,
+  releaseInhibitorIfActive,
+} from "./features/idleInhibitor/idleInhibitor";
+import { Logger } from "./features/logger";
+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 {
   closeSettingsWindow,
+  createSettingsWindow,
   hideSettingsWindow,
-} = require("./scripts/settings");
-const { addTray, refreshTray } = require("./scripts/tray");
-const { addMenu } = require("./scripts/menu");
-const path = require("path");
+  settingsStore,
+  showSettingsWindow,
+} from "./scripts/settings";
+import { addTray, refreshTray } from "./scripts/tray";
 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");
-const flagValues = require("./constants/flags");
+let mainInhibitorId = -1;
 
-let mainWindow;
-let icon = path.join(__dirname, "../assets/icon.png");
+initialize();
+
+let mainWindow: BrowserWindow;
+const icon = path.join(__dirname, "../assets/icon.png");
 const PROTOCOL_PREFIX = "tidal";
 
-setFlags();
-
-function setFlags() {
-  const flags = store.get().flags;
-  if (flags) {
-    for (const [key, value] of Object.entries(flags)) {
-      if (value) {
-        flagValues[key].forEach((flag) => {
-          console.log(`enabling command line switch ${flag.flag} with value ${flag.value}`);
-          app.commandLine.appendSwitch(flag.flag, flag.value);
-        });
-      }
-    }
-  }
-
-  /**
-   * Fix Display Compositor issue.
-   */
-  app.commandLine.appendSwitch("disable-seccomp-filter-sandbox");
-}
+setDefaultFlags(app);
+setManagedFlagsFromSettings(app);
 
 /**
- * Update the menuBarVisbility according to the store value
+ * Update the menuBarVisibility according to the store value
  *
  */
 function syncMenuBarWithStore() {
-  const fixedMenuBar = store.get(settings.menuBar);
+  const fixedMenuBar = !!settingsStore.get(settings.menuBar);
 
   mainWindow.autoHideMenuBar = !fixedMenuBar;
   mainWindow.setMenuBarVisibility(fixedMenuBar);
@@ -70,7 +63,7 @@ function syncMenuBarWithStore() {
  * @returns true if singInstance is not requested, otherwise true/false based on whether the current window is the main window
  */
 function isMainInstanceOrMultipleInstancesAllowed() {
-  if (store.get(settings.singleInstance)) {
+  if (settingsStore.get(settings.singleInstance)) {
     const gotTheLock = app.requestSingleInstanceLock();
 
     if (!gotTheLock) {
@@ -80,13 +73,13 @@ function isMainInstanceOrMultipleInstancesAllowed() {
   return true;
 }
 
-function createWindow(options = {}) {
+function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
   // Create the browser window.
   mainWindow = new BrowserWindow({
     x: options.x,
     y: options.y,
-    width: store && store.get(settings.windowBounds.width),
-    height: store && store.get(settings.windowBounds.height),
+    width: settingsStore?.get(settings.windowBounds.width),
+    height: settingsStore?.get(settings.windowBounds.height),
     icon,
     backgroundColor: options.backgroundColor,
     autoHideMenuBar: true,
@@ -97,23 +90,20 @@ function createWindow(options = {}) {
       devTools: true, // I like tinkering, others might too
     },
   });
-  require("@electron/remote/main").enable(mainWindow.webContents);
+  enable(mainWindow.webContents);
   registerHttpProtocols();
   syncMenuBarWithStore();
 
   // load the Tidal website
   mainWindow.loadURL(tidalUrl);
 
-  if (store.get(settings.disableBackgroundThrottle)) {
+  if (settingsStore.get(settings.disableBackgroundThrottle)) {
     // prevent setInterval lag
     mainWindow.webContents.setBackgroundThrottling(false);
   }
 
-  // run stuff after first load
-  mainWindow.webContents.once("did-finish-load", () => {});
-
-  mainWindow.on("close", function (event) {
-    if (!app.isQuiting && store.get(settings.minimizeOnClose)) {
+  mainWindow.on("close", function (event: CloseEvent) {
+    if (settingsStore.get(settings.minimizeOnClose)) {
       event.preventDefault();
       mainWindow.hide();
       refreshTray(mainWindow);
@@ -122,18 +112,18 @@ function createWindow(options = {}) {
   });
   // Emitted when the window is closed.
   mainWindow.on("closed", function () {
+    releaseInhibitorIfActive(mainInhibitorId);
     closeSettingsWindow();
     app.quit();
   });
   mainWindow.on("resize", () => {
-    let { width, height } = mainWindow.getBounds();
-
-    store.set(settings.windowBounds.root, { width, height });
+    const { width, height } = mainWindow.getBounds();
+    settingsStore.set(settings.windowBounds.root, { width, height });
   });
 }
 
 function registerHttpProtocols() {
-  protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request, _callback) => {
+  protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request) => {
     mainWindow.loadURL(`${tidalUrl}/${request.url.substring(PROTOCOL_PREFIX.length + 3)}`);
   });
   if (!app.isDefaultProtocolClient(PROTOCOL_PREFIX)) {
@@ -144,7 +134,7 @@ function registerHttpProtocols() {
 function addGlobalShortcuts() {
   Object.keys(mediaKeys).forEach((key) => {
     globalShortcut.register(`${key}`, () => {
-      mainWindow.webContents.send("globalEvent", `${mediaKeys[key]}`);
+      mainWindow.webContents.send("globalEvent", `${(mediaKeys as any)[key]}`);
     });
   });
 }
@@ -157,7 +147,7 @@ app.on("ready", async () => {
     await components.whenReady();
 
     // Adblock
-    if (store.get(settings.adBlock)) {
+    if (settingsStore.get(settings.adBlock)) {
       const filter = { urls: ["https://listen.tidal.com/*"] };
       session.defaultSession.webRequest.onBeforeRequest(filter, (details, callback) => {
         if (details.url.match(/\/users\/.*\d\?country/)) callback({ cancel: true });
@@ -169,9 +159,12 @@ app.on("ready", async () => {
     addMenu(mainWindow);
     createSettingsWindow();
     addGlobalShortcuts();
-    store.get(settings.trayIcon) && addTray(mainWindow, { icon }) && refreshTray();
-    store.get(settings.api) && expressModule.run(mainWindow);
-    store.get(settings.enableDiscord) && discordModule.initRPC();
+    if (settingsStore.get(settings.trayIcon)) {
+      addTray(mainWindow, { icon });
+      refreshTray(mainWindow);
+    }
+    settingsStore.get(settings.api) && startExpress(mainWindow);
+    settingsStore.get(settings.enableDiscord) && initRPC();
   } else {
     app.quit();
   }
@@ -186,35 +179,47 @@ app.on("activate", function () {
 });
 
 app.on("browser-window-created", (_, window) => {
-  require("@electron/remote/main").enable(window.webContents);
+  enable(window.webContents);
 });
 
 // IPC
-ipcMain.on(globalEvents.updateInfo, (_event, arg) => {
-  mediaInfoModule.update(arg);
-});
-
-ipcMain.on(globalEvents.hideSettings, (_event, _arg) => {
-  hideSettingsWindow();
-});
-ipcMain.on(globalEvents.showSettings, (_event, _arg) => {
-  showSettingsWindow();
-});
-
-ipcMain.on(globalEvents.refreshMenuBar, (_event, _arg) => {
-  syncMenuBarWithStore();
-});
-
-ipcMain.on(globalEvents.storeChanged, (_event, _arg) => {
-  syncMenuBarWithStore();
-
-  if (store.get(settings.enableDiscord) && !discordModule.rpc) {
-    discordModule.initRPC();
-  } else if (!store.get(settings.enableDiscord) && discordModule.rpc) {
-    discordModule.unRPC();
+ipcMain.on(globalEvents.updateInfo, (_event, arg: MediaInfo) => {
+  updateMediaInfo(arg);
+  if (arg.status === MediaStatus.playing) {
+    mainInhibitorId = acquireInhibitorIfInactive(mainInhibitorId);
+  } else {
+    releaseInhibitorIfActive(mainInhibitorId);
+    mainInhibitorId = -1;
   }
 });
 
-ipcMain.on(globalEvents.error, (event, _arg) => {
+ipcMain.on(globalEvents.hideSettings, () => {
+  hideSettingsWindow();
+});
+ipcMain.on(globalEvents.showSettings, () => {
+  showSettingsWindow();
+});
+
+ipcMain.on(globalEvents.refreshMenuBar, () => {
+  syncMenuBarWithStore();
+});
+
+ipcMain.on(globalEvents.storeChanged, () => {
+  syncMenuBarWithStore();
+
+  if (settingsStore.get(settings.enableDiscord) && !rpc) {
+    initRPC();
+  } else if (!settingsStore.get(settings.enableDiscord) && rpc) {
+    unRPC();
+  }
+});
+
+ipcMain.on(globalEvents.error, (event) => {
   console.log(event);
 });
+
+ipcMain.handle(globalEvents.whip, async (event, url) => {
+  return Songwhip.whip(url);
+});
+
+Logger.watch(ipcMain);

src/models/mediaInfo.ts

@@ -0,0 +1,13 @@
+import { MediaStatus } from "./mediaStatus";
+
+export interface MediaInfo {
+  title: string;
+  artists: string;
+  album: string;
+  icon: string;
+  status: MediaStatus;
+  url: string;
+  current: string;
+  duration: string;
+  image: string;
+}

src/models/mediaStatus.ts

@@ -0,0 +1,4 @@
+export enum MediaStatus {
+  playing = "playing",
+  paused = "paused",
+}

src/models/options.ts

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

src/pages/settings/preload.js

@@ -1,157 +0,0 @@
-let adBlock,
-  api,
-  customCSS,
-  disableBackgroundThrottle,
-  disableHardwareMediaKeys,
-  enableCustomHotkeys,
-  enableDiscord,
-  gpuRasterization,
-  menuBar,
-  minimizeOnClose,
-  mpris,
-  notifications,
-  playBackControl,
-  port,
-  singleInstance,
-  skipArtists,
-  skippedArtists,
-  trayIcon,
-  updateFrequency;
-
-const { store, settings } = require("./../../scripts/settings");
-const { ipcRenderer } = require("electron");
-const globalEvents = require("./../../constants/globalEvents");
-const remote = require("@electron/remote");
-const { app } = remote;
-/**
- * Sync the UI forms with the current settings
- */
-function refreshSettings() {
-  adBlock.checked = store.get(settings.adBlock);
-  api.checked = store.get(settings.api);
-  customCSS.value = store.get(settings.customCSS);
-  disableBackgroundThrottle.checked = store.get("disableBackgroundThrottle");
-  disableHardwareMediaKeys.checked = store.get(settings.flags.disableHardwareMediaKeys);
-  enableCustomHotkeys.checked = store.get(settings.enableCustomHotkeys);
-  enableDiscord.checked = store.get(settings.enableDiscord);
-  gpuRasterization.checked = store.get(settings.flags.gpuRasterization);
-  menuBar.checked = store.get(settings.menuBar);
-  minimizeOnClose.checked = store.get(settings.minimizeOnClose);
-  mpris.checked = store.get(settings.mpris);
-  notifications.checked = store.get(settings.notifications);
-  playBackControl.checked = store.get(settings.playBackControl);
-  port.value = store.get(settings.apiSettings.port);
-  singleInstance.checked = store.get(settings.singleInstance);
-  skipArtists.checked = store.get(settings.skipArtists);
-  skippedArtists.value = store.get(settings.skippedArtists).join("\n");
-  trayIcon.checked = store.get(settings.trayIcon);
-  updateFrequency.value = store.get(settings.updateFrequency);
-}
-
-/**
- * Open an url in the default browsers
- */
-function openExternal(url) {
-  const { shell } = require("electron");
-  shell.openExternal(url);
-}
-
-/**
- * hide the settings window
- */
-function hide() {
-  ipcRenderer.send(globalEvents.hideSettings);
-}
-
-/**
- * Restart tidal-hifi after changes
- */
-function restart() {
-  app.relaunch();
-  app.exit();
-}
-
-/**
- * Bind UI components to functions after DOMContentLoaded
- */
-window.addEventListener("DOMContentLoaded", () => {
-  function get(id) {
-    return document.getElementById(id);
-  }
-
-  document.getElementById("close").addEventListener("click", hide);
-  document.getElementById("restart").addEventListener("click", restart);
-  document.querySelectorAll(".external-link").forEach((elem) =>
-    elem.addEventListener("click", function (event) {
-      openExternal(event.target.getAttribute("data-url"));
-    })
-  );
-
-  function addInputListener(source, key) {
-    source.addEventListener("input", function (_event, _data) {
-      if (this.value === "on") {
-        store.set(key, source.checked);
-      } else {
-        store.set(key, this.value);
-      }
-      ipcRenderer.send(globalEvents.storeChanged);
-    });
-  }
-
-  function addTextAreaListener(source, key) {
-    source.addEventListener("input", function (_event, _data) {
-      store.set(key, source.value.split("\n"));
-      ipcRenderer.send(globalEvents.storeChanged);
-    });
-  }
-
-  ipcRenderer.on("refreshData", () => {
-    refreshSettings();
-  });
-
-  ipcRenderer.on("goToTab", (_, tab) => {
-    document.getElementById(tab).click();
-  });
-
-  adBlock = get("adBlock");
-  api = get("apiCheckbox");
-  customCSS = get("customCSS");
-  disableBackgroundThrottle = get("disableBackgroundThrottle");
-  disableHardwareMediaKeys = get("disableHardwareMediaKeys");
-  enableCustomHotkeys = get("enableCustomHotkeys");
-  enableDiscord = get("enableDiscord");
-  gpuRasterization = get("gpuRasterization");
-  menuBar = get("menuBar");
-  minimizeOnClose = get("minimizeOnClose");
-  mpris = get("mprisCheckbox");
-  notifications = get("notifications");
-  playBackControl = get("playBackControl");
-  port = get("port");
-  trayIcon = get("trayIcon");
-  skipArtists = get("skipArtists");
-  skippedArtists = get("skippedArtists");
-  singleInstance = get("singleInstance");
-  updateFrequency = get("updateFrequency");
-
-  refreshSettings();
-
-  addInputListener(adBlock, settings.adBlock);
-  addInputListener(api, settings.api);
-  addTextAreaListener(customCSS, settings.customCSS);
-  addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
-  addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
-  addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
-  addInputListener(enableDiscord, settings.enableDiscord);
-  addInputListener(gpuRasterization, settings.flags.gpuRasterization);
-  addInputListener(menuBar, settings.menuBar);
-  addInputListener(minimizeOnClose, settings.minimizeOnClose);
-  addInputListener(mpris, settings.mpris);
-  addInputListener(notifications, settings.notifications);
-  addInputListener(playBackControl, settings.playBackControl);
-  addInputListener(port, settings.apiSettings.port);
-  addInputListener(skipArtists, settings.skipArtists);
-  addTextAreaListener(skippedArtists, settings.skippedArtists);
-  addInputListener(singleInstance, settings.singleInstance);
-  addInputListener(trayIcon, settings.trayIcon);
-  addInputListener(updateFrequency, settings.updateFrequency);
-});

src/pages/settings/preload.ts

@@ -0,0 +1,240 @@
+import { app } from "@electron/remote";
+import { ipcRenderer, shell } from "electron";
+import fs from "fs";
+import { globalEvents } from "../../constants/globalEvents";
+import { settings } from "../../constants/settings";
+import { Logger } from "../../features/logger";
+import { settingsStore } from "./../../scripts/settings";
+import { getOptions, getOptionsHeader, getThemeListFromDirectory } from "./theming";
+
+let adBlock: HTMLInputElement,
+  api: HTMLInputElement,
+  customCSS: HTMLInputElement,
+  disableBackgroundThrottle: HTMLInputElement,
+  disableHardwareMediaKeys: HTMLInputElement,
+  enableCustomHotkeys: HTMLInputElement,
+  enableDiscord: HTMLInputElement,
+  gpuRasterization: HTMLInputElement,
+  menuBar: HTMLInputElement,
+  minimizeOnClose: HTMLInputElement,
+  mpris: HTMLInputElement,
+  notifications: HTMLInputElement,
+  playBackControl: HTMLInputElement,
+  port: HTMLInputElement,
+  singleInstance: HTMLInputElement,
+  skipArtists: HTMLInputElement,
+  skippedArtists: HTMLInputElement,
+  theme: HTMLSelectElement,
+  trayIcon: HTMLInputElement,
+  updateFrequency: HTMLInputElement,
+  enableListenBrainz: HTMLInputElement,
+  ListenBrainzAPI: HTMLInputElement,
+  ListenBrainzToken: HTMLInputElement,
+  enableWaylandSupport: HTMLInputElement;
+
+function getThemeFiles() {
+  const selectElement = document.getElementById("themesList") as HTMLSelectElement;
+  const builtInThemes = getThemeListFromDirectory(process.resourcesPath);
+  const userThemes = getThemeListFromDirectory(`${app.getPath("userData")}/themes`);
+
+  let allThemes = [
+    getOptionsHeader("Built-in Themes"),
+    new Option("Tidal - Default", "none"),
+  ].concat(getOptions(builtInThemes));
+
+  if (userThemes.length >= 1) {
+    allThemes = allThemes.concat([getOptionsHeader("User Themes")]).concat(getOptions(userThemes));
+  }
+
+  // empty old options
+  const oldOptions = document.querySelectorAll("#themesList option");
+  oldOptions.forEach((o) => o.remove());
+
+  allThemes.forEach((option) => {
+    selectElement.add(option, null);
+  });
+}
+
+function handleFileUploads() {
+  const fileMessage = document.getElementById("file-message");
+  fileMessage.innerText = "or drag and drop files here";
+
+  document.getElementById("theme-files").addEventListener("change", function (e: any) {
+    Array.from(e.target.files).forEach((file: File) => {
+      const destination = `${app.getPath("userData")}/themes/${file.name}`;
+      fs.copyFileSync(file.path, destination, null);
+    });
+    fileMessage.innerText = `${e.target.files.length} files successfully uploaded`;
+    getThemeFiles();
+  });
+}
+
+/**
+ * Sync the UI forms with the current settings
+ */
+function refreshSettings() {
+  try {
+    adBlock.checked = settingsStore.get(settings.adBlock);
+    api.checked = settingsStore.get(settings.api);
+    customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
+    disableBackgroundThrottle.checked = settingsStore.get(settings.disableBackgroundThrottle);
+    disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys);
+    enableCustomHotkeys.checked = settingsStore.get(settings.enableCustomHotkeys);
+    enableDiscord.checked = settingsStore.get(settings.enableDiscord);
+    enableWaylandSupport.checked = settingsStore.get(settings.flags.enableWaylandSupport);
+    gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization);
+    menuBar.checked = settingsStore.get(settings.menuBar);
+    minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose);
+    mpris.checked = settingsStore.get(settings.mpris);
+    notifications.checked = settingsStore.get(settings.notifications);
+    playBackControl.checked = settingsStore.get(settings.playBackControl);
+    port.value = settingsStore.get(settings.apiSettings.port);
+    singleInstance.checked = settingsStore.get(settings.singleInstance);
+    skipArtists.checked = settingsStore.get(settings.skipArtists);
+    theme.value = settingsStore.get(settings.theme);
+    skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
+    trayIcon.checked = settingsStore.get(settings.trayIcon);
+    updateFrequency.value = settingsStore.get(settings.updateFrequency);
+    enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
+    ListenBrainzAPI.value = settingsStore.get(settings.ListenBrainz.api);
+    ListenBrainzToken.value = settingsStore.get(settings.ListenBrainz.token);
+  } catch (error) {
+    Logger.log("Refreshing settings failed.", error);
+  }
+}
+
+/**
+ * Open an url in the default browsers
+ */
+function openExternal(url: string) {
+  shell.openExternal(url);
+}
+
+/**
+ * hide the settings window
+ */
+function hide() {
+  ipcRenderer.send(globalEvents.hideSettings);
+}
+
+/**
+ * Restart tidal-hifi after changes
+ */
+function restart() {
+  app.relaunch();
+  app.exit();
+}
+
+/**
+ * Bind UI components to functions after DOMContentLoaded
+ */
+window.addEventListener("DOMContentLoaded", () => {
+  function get<T = HTMLInputElement>(id: string): T {
+    return document.getElementById(id) as T;
+  }
+
+  getThemeFiles();
+  handleFileUploads();
+
+  document.getElementById("close").addEventListener("click", hide);
+  document.getElementById("restart").addEventListener("click", restart);
+  document.querySelectorAll(".external-link").forEach((elem) =>
+    elem.addEventListener("click", function (event) {
+      openExternal((event.target as HTMLElement).getAttribute("data-url"));
+    })
+  );
+
+  function addInputListener(source: HTMLInputElement, key: string) {
+    source.addEventListener("input", () => {
+      if (source.value === "on") {
+        settingsStore.set(key, source.checked);
+      } else {
+        settingsStore.set(key, source.value);
+      }
+      // Live update the view for ListenBrainz input, hide if disabled/show if enabled
+      if (source.value === "on" && source.id === "enableListenBrainz") {
+        source.checked
+          ? document.getElementById("listenbrainz__options").removeAttribute("hidden")
+          : document.getElementById("listenbrainz__options").setAttribute("hidden", "true");
+      }
+      ipcRenderer.send(globalEvents.storeChanged);
+    });
+  }
+
+  function addTextAreaListener(source: HTMLInputElement, key: string) {
+    source.addEventListener("input", () => {
+      settingsStore.set(key, source.value.split("\n"));
+      ipcRenderer.send(globalEvents.storeChanged);
+    });
+  }
+
+  function addSelectListener(source: HTMLSelectElement, key: string) {
+    source.addEventListener("change", () => {
+      settingsStore.set(key, source.value);
+      ipcRenderer.send(globalEvents.storeChanged);
+    });
+  }
+
+  ipcRenderer.on("refreshData", () => {
+    refreshSettings();
+  });
+
+  ipcRenderer.on("goToTab", (_, tab) => {
+    document.getElementById(tab).click();
+  });
+
+  adBlock = get("adBlock");
+  api = get("apiCheckbox");
+  customCSS = get("customCSS");
+  disableBackgroundThrottle = get("disableBackgroundThrottle");
+  disableHardwareMediaKeys = get("disableHardwareMediaKeys");
+  enableCustomHotkeys = get("enableCustomHotkeys");
+  enableDiscord = get("enableDiscord");
+  enableWaylandSupport = get("enableWaylandSupport");
+  gpuRasterization = get("gpuRasterization");
+  menuBar = get("menuBar");
+  minimizeOnClose = get("minimizeOnClose");
+  mpris = get("mprisCheckbox");
+  notifications = get("notifications");
+  playBackControl = get("playBackControl");
+  port = get("port");
+  theme = get<HTMLSelectElement>("themesList");
+  trayIcon = get("trayIcon");
+  skipArtists = get("skipArtists");
+  skippedArtists = get("skippedArtists");
+  singleInstance = get("singleInstance");
+  updateFrequency = get("updateFrequency");
+  enableListenBrainz = get("enableListenBrainz");
+  ListenBrainzAPI = get("ListenBrainzAPI");
+  ListenBrainzToken = get("ListenBrainzToken");
+
+  refreshSettings();
+  enableListenBrainz.checked
+    ? document.getElementById("listenbrainz__options").removeAttribute("hidden")
+    : document.getElementById("listenbrainz__options").setAttribute("hidden", "true");
+
+  addInputListener(adBlock, settings.adBlock);
+  addInputListener(api, settings.api);
+  addTextAreaListener(customCSS, settings.customCSS);
+  addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
+  addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
+  addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
+  addInputListener(enableDiscord, settings.enableDiscord);
+  addInputListener(enableWaylandSupport, settings.flags.enableWaylandSupport);
+  addInputListener(gpuRasterization, settings.flags.gpuRasterization);
+  addInputListener(menuBar, settings.menuBar);
+  addInputListener(minimizeOnClose, settings.minimizeOnClose);
+  addInputListener(mpris, settings.mpris);
+  addInputListener(notifications, settings.notifications);
+  addInputListener(playBackControl, settings.playBackControl);
+  addInputListener(port, settings.apiSettings.port);
+  addInputListener(skipArtists, settings.skipArtists);
+  addTextAreaListener(skippedArtists, settings.skippedArtists);
+  addInputListener(singleInstance, settings.singleInstance);
+  addSelectListener(theme, settings.theme);
+  addInputListener(trayIcon, settings.trayIcon);
+  addInputListener(updateFrequency, settings.updateFrequency);
+  addInputListener(enableListenBrainz, settings.ListenBrainz.enabled);
+  addTextAreaListener(ListenBrainzAPI, settings.ListenBrainz.api);
+  addTextAreaListener(ListenBrainzToken, settings.ListenBrainz.token);
+});

src/pages/settings/settings.html

@@ -35,6 +35,9 @@
       <input type="radio" name="tab" id="advanced" />
       <label for="advanced">Advanced</label>
 
+      <input type="radio" name="tab" id="theming" />
+      <label for="theming">Theming</label>
+
       <input type="radio" name="tab" id="about" />
       <label for="about">About</label>
 
@@ -209,6 +212,35 @@
               </label>
             </div>
           </div>
+          <div class="group">
+            <p class="group__title">ListenBrainz</p>
+            <div class="group__option">
+              <div class="group__description">
+                <h4>Enable ListenBrainz</h4>
+                <p>Scrobble your listens directly to ListenBrainz.</p>
+              </div>
+              <label class="switch">
+                <input id="enableListenBrainz" type="checkbox" />
+                <span class="switch__slider"></span>
+              </label>
+            </div>
+            <div id="listenbrainz__options" hidden="true">
+              <div class="group__option">
+                <div class="group__description">
+                  <h4>ListenBrainz API Url</h4>
+                  <p>There are multiple instances for ListenBrainz you can set the corresponding API url below.</p>
+                </div>
+              </div>
+              <textarea id="ListenBrainzAPI" class="textarea" cols="1" rows="1" spellcheck="false"></textarea>
+              <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>
+                </div>
+              </div>
+              <textarea id="ListenBrainzToken" class="textarea" cols="1" rows="1" spellcheck="false"></textarea>
+            </div>
+          </div>
         </section>
 
         <section id="advanced-section" class="tabs__section">
@@ -226,17 +258,7 @@
                 <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
               </div>
             </div>
-            <div class="group__option">
-              <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 document.
-                </p>
-              </div>
-            </div>
           </div>
-          <textarea id="customCSS" class="textarea" cols="40" rows="8" spellcheck="false"></textarea>
-
           <div class="group">
             <p class="group__title">Flags</p>
             <div class="group__option">
@@ -274,6 +296,65 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
+            <div class="group__option">
+              <div class="group__description">
+                <h4>Wayland support</h4>
+                <p>
+                  Adds a couple of Electron flags to help Tidal-hifi run smoothly on the Wayland window system.
+                </p>
+              </div>
+              <label class="switch">
+                <input id="enableWaylandSupport" type="checkbox" />
+                <span class="switch__slider"></span>
+              </label>
+            </div>
+          </div>
+        </section>
+
+        <section id="theming-section" class="tabs__section">
+          <div class="group">
+            <p class="group__title">Theming</p>
+            <div class="group__option">
+              <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 document.
+                </p>
+              </div>
+            </div>
+          </div>
+          <textarea id="customCSS" class="textarea" cols="40" rows="8" spellcheck="false"></textarea>
+
+          <div class="group">
+            <p class="group__title">Theme files</p>
+            <div class="group__option">
+              <div class="group__description">
+                <h4>Current theme</h4>
+                <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>
+              </div>
+            </div>
+
+            <div class="group__option">
+              <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 theme list
+                  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 id="theme-files" class="file-input" type="file" accept=".css" multiple>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
         </section>
 

src/pages/settings/settings.scss

@@ -3,7 +3,6 @@
 $black: #17171a;
 $grey-333: #333;
 $white: #f9f9f9;
-
 $tidal-blue: #0ff;
 $tidal-grey: #72777f;
 $tidal-grey-darker: #404248;
@@ -36,16 +35,14 @@ $tidal-grey-darkest: #242528;
   src: url("fonts/NotoSans-Bold.ttf") format("truetype");
 }
 
-$font1: "Noto Sans", Helvetica, sans-serif;
+$font1: "Noto Sans", helvetica, sans-serif;
 
 // --- Mixins ---
 
 @mixin drag($enabled: true) {
   @if $enabled {
     -webkit-app-region: drag;
-  }
-
-  @else {
+  } @else {
     -webkit-app-region: no-drag;
   }
 }
@@ -62,6 +59,7 @@ html {
 
 .external-link {
   @extend button;
+
   text-decoration: underline;
 }
 
@@ -80,6 +78,7 @@ html {
 
   &__drag-area {
     @include drag;
+
     position: absolute;
     width: 100%;
     height: 50px;
@@ -90,6 +89,7 @@ html {
   &__close-button {
     @extend button;
     @include drag(false);
+
     position: absolute;
     top: 12px;
     right: 10px;
@@ -106,7 +106,7 @@ html {
     display: block;
     width: 18px;
     height: 18px;
-    opacity: .7;
+    opacity: 0.7;
   }
 
   // --- Settings tabs ---
@@ -125,8 +125,9 @@ html {
       outline: none;
     }
 
-    &+label {
+    & + label {
       @include drag(false);
+
       display: inline-block;
       position: relative;
       margin-right: 35px;
@@ -138,7 +139,7 @@ html {
       user-select: none;
     }
 
-    &:checked+label {
+    &:checked + label {
       border-bottom: 2px solid $tidal-blue;
       color: $tidal-blue;
     }
@@ -155,8 +156,8 @@ html {
     display: none;
   }
 
-  @for $i from 1 to 6 {
-    .settings>input:nth-child(#{$i*2-1}):checked~&>.tabs__section:nth-child(#{$i}) {
+  @for $i from 1 to 7 {
+    .settings > input:nth-child(#{$i * 2 - 1}):checked ~ & > .tabs__section:nth-child(#{$i}) {
       display: block;
     }
   }
@@ -217,7 +218,7 @@ html {
       width: 100%;
       margin-bottom: 10px;
       padding: 5px 0;
-      transition: .2s;
+      transition: 0.2s;
       border: 0;
       border-bottom: solid 1px $grey-333;
       outline: none;
@@ -229,46 +230,42 @@ html {
         border-color: $tidal-blue;
         color: $white;
       }
-
-      // --- Switch slider component ---
     }
   }
 }
 
 .switch {
   $this: &;
+
   position: relative;
   min-width: 50px;
   height: 28px;
-
   margin-left: 10px;
 
   input {
     transform: scale(0);
     outline: none;
 
-    &:checked+#{$this}__slider {
+    &:checked + #{$this}__slider {
       background-color: $tidal-blue;
 
       &::before {
         transform: translateX(22px);
-        background-color: white;
+        background-color: $white;
       }
     }
 
-    &:focus+#{$this}__slider {
+    &:focus + #{$this}__slider {
       box-shadow: inset 0 0 0 1px $tidal-blue;
     }
   }
 
   &__slider {
     @extend button;
+
     position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    transition: .4s;
+    inset: 0;
+    transition: 0.4s;
     border-radius: 40px;
     background-color: $tidal-grey-darkest;
 
@@ -278,7 +275,7 @@ html {
       left: 2px;
       width: 24px;
       height: 24px;
-      transition: .4s;
+      transition: 0.4s;
       border-radius: 50%;
       background-color: $white;
       content: "";
@@ -294,7 +291,7 @@ html {
   min-height: 50px;
   max-height: 100px;
   padding: 8px;
-  transition: .2s;
+  transition: 0.2s;
   border: 0;
   border-bottom: 1px solid transparent;
   background: $tidal-grey-darkest;
@@ -345,11 +342,12 @@ html {
 
   &__button {
     @extend button;
+
     display: block;
     height: 48px;
     margin: auto;
     padding: 0 24px;
-    transition: .2s;
+    transition: 0.2s;
     border: 0;
     border-radius: 12px;
     background: $tidal-grey-darker;
@@ -361,3 +359,87 @@ html {
     }
   }
 }
+
+// file upload
+
+.file-drop-area {
+  position: relative;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  max-width: 100%;
+  padding: 25px 0 25px 0px;
+  border: 1px dashed $tidal-grey;
+  border-radius: 3px;
+  transition: 0.2s;
+  &.is-active {
+    background-color: $black;
+  }
+
+  div {
+    padding-left: 25px;
+  }
+}
+
+.file-btn {
+  flex-shrink: 0;
+  background-color: $black;
+  border: 1px solid $tidal-grey;
+  border-radius: 3px;
+  padding: 8px 15px;
+  margin-right: 10px;
+  font-size: 12px;
+  text-transform: uppercase;
+}
+
+.file-msg {
+  font-size: small;
+  font-weight: 300;
+  line-height: 1.4;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.file-input {
+  position: absolute;
+  left: 0;
+  top: 0;
+  height: 100%;
+  width: 100%;
+  cursor: pointer;
+  opacity: 0;
+  &:focus {
+    outline: none;
+  }
+}
+
+.select-input {
+  display: block;
+  width: 100%;
+  margin-bottom: 10px;
+  padding: 5px 0;
+  transition: 0.2s;
+  border: 0;
+  border-bottom: solid 1px $grey-333;
+  outline: none;
+  background: transparent;
+  color: $tidal-grey;
+  font-size: 14px;
+
+  &:focus {
+    border-color: $tidal-blue;
+    color: $white;
+  }
+
+  option {
+    background-color: $tidal-grey-darkest;
+
+    &:disabled {
+      font-size: 1.2em;
+      line-height: 1.5em;
+      text-align: center;
+      color: $white;
+    }
+  }
+}

src/pages/settings/theming.ts

@@ -0,0 +1,55 @@
+import fs from "fs";
+import { Logger } from "../../features/logger";
+
+const cssFilter = (file: string) => file.endsWith(".css");
+const sort = (a: string, b: string) => a.toLowerCase().localeCompare(b.toLowerCase());
+
+/**
+ * Create an "options header" (disabled option) based on a bit of text
+ * @param text of the header
+ * @returns
+ */
+export const getOptionsHeader = (text: string): HTMLOptionElement => {
+  const opt = new Option(text, undefined, false, false);
+  opt.disabled = true;
+  return opt;
+};
+
+/**
+ * Maps a list of filenames to a list of HTMLOptionElements
+ * Will strip ".css" from the name but keeps it in the value
+ * @param array array of filenames
+ * @returns
+ */
+export const getOptions = (array: string[]) => {
+  return array.map((name) => {
+    return new Option(name.replace(".css", ""), name);
+  });
+};
+
+/**
+ * Read .css files from a directory and return them in a sorted array.
+ * @param directory to read from. Will be created if it doesn't exist
+ * @returns
+ */
+export const getThemeListFromDirectory = (directory: string): string[] => {
+  try {
+    makeUserThemesDirectory(directory);
+    return fs.readdirSync(directory).filter(cssFilter).sort(sort);
+  } catch (err) {
+    Logger.log(`Failed to get files from ${directory}`, err);
+    return [];
+  }
+};
+
+/**
+ * Create the directory to store user themes in
+ * @param directory directory to create
+ */
+export const makeUserThemesDirectory = (directory: string) => {
+  try {
+    fs.mkdirSync(directory, { recursive: true });
+  } catch (err) {
+    Logger.log(`Failed to make user theme directory: ${directory}`, err);
+  }
+};

src/preload.ts

@@ -1,18 +1,29 @@
-const { setTitle } = require("./scripts/window-functions");
-const { dialog, process, Notification } = require("@electron/remote");
-const { store, settings } = require("./scripts/settings");
-const { ipcRenderer } = require("electron");
-const { app } = require("@electron/remote");
-const { downloadFile } = require("./scripts/download");
-const statuses = require("./constants/statuses");
-const hotkeys = require("./scripts/hotkeys");
-const globalEvents = require("./constants/globalEvents");
-const { skipArtists, updateFrequency, customCSS } = require("./constants/settings");
+import { app, dialog, Notification } from "@electron/remote";
+import { clipboard, ipcRenderer } from "electron";
+import fs from "fs";
+import Player from "mpris-service";
+import { globalEvents } from "./constants/globalEvents";
+import { settings } from "./constants/settings";
+import {
+  ListenBrainz,
+  ListenBrainzConstants,
+  ListenBrainzStore,
+} from "./features/listenbrainz/listenbrainz";
+import { StoreData } from "./features/listenbrainz/models/storeData";
+import { Logger } from "./features/logger";
+import { Songwhip } from "./features/songwhip/songwhip";
+import { MediaStatus } from "./models/mediaStatus";
+import { Options } from "./models/options";
+import { downloadFile } from "./scripts/download";
+import { addHotkey } from "./scripts/hotkeys";
+import { settingsStore } from "./scripts/settings";
+import { setTitle } from "./scripts/window-functions";
+
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
 const appName = "Tidal Hifi";
 let currentSong = "";
-let player;
-let currentPlayStatus = statuses.paused;
+let player: Player;
+let currentPlayStatus = MediaStatus.paused;
 
 const elements = {
   play: '*[data-test="play"]',
@@ -22,13 +33,12 @@ const elements = {
   title: '*[data-test^="footer-track-title"]',
   artists: '*[data-test^="grid-item-detail-text-title-artist"]',
   home: '*[data-test="menu--home"]',
-  back: '[class^="backwardButton"]',
-  forward: '[class^="forwardButton"]',
+  back: '[title^="Back"]',
+  forward: '[title^="Next"]',
   search: '[class^="searchField"]',
   shuffle: '*[data-test="shuffle"]',
   repeat: '*[data-test="repeat"]',
-  block: '[class="blockButton"]',
-  account: '*[data-test^="profile-image-button"]',
+  account: '*[class^="profileOptions"]',
   settings: '*[data-test^="open-settings"]',
   media: '*[data-test="current-media-imagery"]',
   image: "img",
@@ -36,16 +46,17 @@ const elements = {
   duration: '*[data-test="duration"]',
   bar: '*[data-test="progress-bar"]',
   footer: "#footerPlayer",
+  mediaItem: "[data-type='mediaItem']",
   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"]',
+  currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
+  album_name_cell: '[class^="album"]',
   tracklist_row: '[data-test="tracklist-row"]',
   volume: '*[data-test="volume"]',
   /**
    * Get an element from the dom
    * @param {*} key key in elements object to fetch
    */
-  get: function (key) {
+  get: function (key: string) {
     return window.document.querySelector(this[key.toLowerCase()]);
   },
 
@@ -74,7 +85,7 @@ const elements = {
 
     if (footer) {
       const artists = footer.querySelectorAll(this.artists);
-      if (artists) return Array.from(artists).map((artist) => artist.textContent);
+      if (artists) return Array.from(artists).map((artist) => (artist as HTMLElement).textContent);
     }
     return [];
   },
@@ -84,7 +95,7 @@ const elements = {
    * @param {Array} artistsArray
    * @returns {String} artists
    */
-  getArtistsString: function (artistsArray) {
+  getArtistsString: function (artistsArray: string[]) {
     if (artistsArray.length > 0) return artistsArray.join(", ");
     return "unknown artist(s)";
   },
@@ -101,8 +112,10 @@ const elements = {
       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 (currentPlayStatus === MediaStatus.playing) {
+        // find the currently playing element from the list (which might be in an album icon), traverse back up to the mediaItem (row) and select the album cell.
+        // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent
+        const row = window.document.querySelector(this.currentlyPlaying).closest(this.mediaItem);
         if (row) {
           return row.querySelector(this.album_name_cell).textContent;
         }
@@ -120,7 +133,7 @@ const elements = {
    * Shorthand function to get the text of a dom element
    * @param {*} key key in elements object to fetch
    */
-  getText: function (key) {
+  getText: function (key: string) {
     const element = this.get(key);
     return element ? element.textContent : "";
   },
@@ -129,7 +142,7 @@ const elements = {
    * Shorthand function to click a dom element
    * @param {*} key key in elements object to fetch
    */
-  click: function (key) {
+  click: function (key: string) {
     this.get(key).click();
     return this;
   },
@@ -138,15 +151,33 @@ const elements = {
    * Shorthand function to focus a dom element
    * @param {*} key key in elements object to fetch
    */
-  focus: function (key) {
+  focus: function (key: string) {
     return this.get(key).focus();
   },
 };
 
 function addCustomCss() {
   window.addEventListener("DOMContentLoaded", () => {
+    const selectedTheme = settingsStore.get<string, string>(settings.theme);
+    if (selectedTheme !== "none") {
+      const userThemePath = `${app.getPath("userData")}/themes/${selectedTheme}`;
+      const resourcesThemePath = `${process.resourcesPath}/${selectedTheme}`;
+      const themeFile = fs.existsSync(userThemePath) ? userThemePath : resourcesThemePath;
+      fs.readFile(themeFile, "utf-8", (err, data) => {
+        if (err) {
+          Logger.alert("An error ocurred reading the theme file.", err, alert);
+          return;
+        }
+
+        const themeStyle = document.createElement("style");
+        themeStyle.innerHTML = data;
+        document.head.appendChild(themeStyle);
+      });
+    }
+
+    // read customCSS (it will override the theme)
     const style = document.createElement("style");
-    style.innerHTML = store.get(customCSS);
+    style.innerHTML = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
     document.head.appendChild(style);
   });
 }
@@ -156,7 +187,7 @@ function addCustomCss() {
  * make sure it returns a number, if not use the default
  */
 function getUpdateFrequency() {
-  const storeValue = store.get(updateFrequency);
+  const storeValue = settingsStore.get<string, number>(settings.updateFrequency);
   const defaultValue = 500;
 
   if (!isNaN(storeValue)) {
@@ -179,47 +210,64 @@ function playPause() {
   }
 }
 
+/**
+ * Clears the old listenbrainz data on launch
+ */
+ListenBrainzStore.clear();
+
 /**
  * Add hotkeys for when tidal is focused
  * Reflects the desktop hotkeys found on:
  * https://defkey.com/tidal-desktop-shortcuts
  */
 function addHotKeys() {
-  if (store.get(settings.enableCustomHotkeys)) {
-    hotkeys.add("Control+p", function () {
-      elements.click("account").click("settings");
+  if (settingsStore.get(settings.enableCustomHotkeys)) {
+    addHotkey("Control+p", function () {
+      elements.click("account");
+      setTimeout(() => {
+        elements.click("settings");
+      }, 100);
     });
-    hotkeys.add("Control+l", function () {
+    addHotkey("Control+l", function () {
       handleLogout();
     });
 
-    hotkeys.add("Control+h", function () {
+    addHotkey("Control+h", function () {
       elements.click("home");
     });
 
-    hotkeys.add("backspace", function () {
+    addHotkey("backspace", function () {
       elements.click("back");
     });
 
-    hotkeys.add("shift+backspace", function () {
+    addHotkey("shift+backspace", function () {
       elements.click("forward");
     });
 
-    hotkeys.add("control+u", function () {
+    addHotkey("control+u", function () {
       // reloading window without cache should show the update bar if applicable
-      window.location.reload(true);
+      window.location.reload();
     });
 
-    hotkeys.add("control+r", function () {
+    addHotkey("control+r", function () {
       elements.click("repeat");
     });
+    addHotkey("control+w", async function () {
+      const result = await ipcRenderer.invoke(globalEvents.whip, getTrackURL());
+      const url = Songwhip.getWhipUrl(result);
+      clipboard.writeText(url);
+      new Notification({
+        title: `Successfully whipped: `,
+        body: `URL copied to clipboard: ${url}`,
+      }).show();
+    });
   }
 
   // always add the hotkey for the settings window
-  hotkeys.add("control+=", function () {
+  addHotkey("control+=", function () {
     ipcRenderer.send(globalEvents.showSettings);
   });
-  hotkeys.add("control+0", function () {
+  addHotkey("control+0", function () {
     ipcRenderer.send(globalEvents.showSettings);
   });
 }
@@ -231,28 +279,26 @@ function addHotKeys() {
 function handleLogout() {
   const logoutOptions = ["Cancel", "Yes, please", "No, thanks"];
 
-  dialog.showMessageBox(
-    null,
-    {
+  dialog
+    .showMessageBox(null, {
       type: "question",
       title: "Logging out",
       message: "Are you sure you want to log out?",
       buttons: logoutOptions,
       defaultId: 2,
-    },
-    function (response) {
-      if (logoutOptions.indexOf("Yes, please") == response) {
+    })
+    .then((result: { response: number }) => {
+      if (logoutOptions.indexOf("Yes, please") === result.response) {
         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;
+            break;
           }
         }
         window.location.reload();
       }
-    }
-  );
+    });
 }
 
 function addFullScreenListeners() {
@@ -284,6 +330,8 @@ function addIPCEventListeners() {
         case globalEvents.pause:
           elements.click("pause");
           break;
+        default:
+          break;
       }
     });
   });
@@ -293,14 +341,14 @@ function addIPCEventListeners() {
  * Update the current status of tidal (e.g playing or paused)
  */
 function getCurrentlyPlayingStatus() {
-  let pause = elements.get("pause");
+  const pause = elements.get("pause");
   let status = undefined;
 
   // if pause button is visible tidal is playing
   if (pause) {
-    status = statuses.playing;
+    status = MediaStatus.playing;
   } else {
-    status = statuses.paused;
+    status = MediaStatus.paused;
   }
   return status;
 }
@@ -309,7 +357,7 @@ function getCurrentlyPlayingStatus() {
  * Convert the duration from MM:SS to seconds
  * @param {*} duration
  */
-function convertDuration(duration) {
+function convertDuration(duration: string) {
   const parts = duration.split(":");
   return parseInt(parts[1]) + 60 * parseInt(parts[0]);
 }
@@ -319,25 +367,47 @@ function convertDuration(duration) {
  *
  * @param {*} options
  */
-function updateMediaInfo(options, notify) {
+function updateMediaInfo(options: Options, notify: boolean) {
   if (options) {
     ipcRenderer.send(globalEvents.updateInfo, options);
-    if (store.get(settings.notifications) && notify) {
+    if (settingsStore.get(settings.notifications) && notify) {
       new Notification({ title: options.title, body: options.artists, icon: options.icon }).show();
     }
-    if (player) {
-      player.metadata = {
-        ...player.metadata,
-        ...{
-          "xesam:title": options.title,
-          "xesam:artist": [options.artists],
-          "xesam:album": options.album,
-          "mpris:artUrl": options.image,
-          "mpris:length": convertDuration(options.duration) * 1000 * 1000,
-          "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
-        },
-      };
-      player.playbackStatus = options.status == statuses.paused ? "Paused" : "Playing";
+    updateMpris(options);
+    updateListenBrainz(options);
+  }
+}
+
+function updateMpris(options: Options) {
+  if (player) {
+    player.metadata = {
+      ...player.metadata,
+      ...{
+        "xesam:title": options.title,
+        "xesam:artist": [options.artists],
+        "xesam:album": options.album,
+        "mpris:artUrl": options.image,
+        "mpris:length": convertDuration(options.duration) * 1000 * 1000,
+        "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
+      },
+    };
+    player.playbackStatus = options.status === MediaStatus.paused ? "Paused" : "Playing";
+  }
+}
+
+function updateListenBrainz(options: Options) {
+  if (settingsStore.get(settings.ListenBrainz.enabled)) {
+    const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
+    if (
+      (!oldData && options.status === MediaStatus.playing) ||
+      (oldData && oldData.title !== options.title)
+    ) {
+      ListenBrainz.scrobble(
+        options.title,
+        options.artists,
+        options.status,
+        convertDuration(options.duration)
+      );
     }
   }
 }
@@ -361,7 +431,7 @@ function getTrackID() {
   return window.location;
 }
 
-function updateMediaSession(options) {
+function updateMediaSession(options: Options) {
   if ("mediaSession" in navigator) {
     navigator.mediaSession.metadata = new MediaMetadata({
       title: options.title,
@@ -401,6 +471,8 @@ setInterval(function () {
     current,
     duration,
     "app-name": appName,
+    image: "",
+    icon: "",
   };
 
   const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
@@ -413,7 +485,7 @@ setInterval(function () {
 
   const image = elements.getSongIcon();
 
-  new Promise((resolve) => {
+  new Promise<void>((resolve) => {
     if (image.startsWith("http")) {
       options.image = image;
       downloadFile(image, notificationPath).then(
@@ -430,23 +502,20 @@ setInterval(function () {
       // if the image can't be found on the page continue without it
       resolve();
     }
-  }).then(
-    () => {
-      updateMediaInfo(options, titleOrArtistsChanged);
-      if (titleOrArtistsChanged) {
-        updateMediaSession(options);
-      }
-    },
-    () => {}
-  );
+  }).then(() => {
+    updateMediaInfo(options, titleOrArtistsChanged);
+    if (titleOrArtistsChanged) {
+      updateMediaSession(options);
+    }
+  });
 
   /**
    * automatically skip a song if the artists are found in the list of artists to skip
    * @param {*} artists array of artists
    */
-  function skipArtistsIfFoundInSkippedArtistsList(artists) {
-    if (store.get(skipArtists)) {
-      const skippedArtists = store.get(settings.skippedArtists);
+  function skipArtistsIfFoundInSkippedArtistsList(artists: string[]) {
+    if (settingsStore.get(settings.skipArtists)) {
+      const skippedArtists = settingsStore.get<string, string[]>(settings.skippedArtists);
       if (skippedArtists.length > 0) {
         const artistsToSkip = skippedArtists.map((artist) => artist);
         const artistNames = Object.values(artists).map((artist) => artist);
@@ -459,9 +528,8 @@ setInterval(function () {
   }
 }, getUpdateFrequency());
 
-if (process.platform === "linux" && store.get(settings.mpris)) {
+if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
   try {
-    const Player = require("mpris-service");
     player = Player({
       name: "tidal-hifi",
       identity: "tidal-hifi",
@@ -478,7 +546,7 @@ if (process.platform === "linux" && store.get(settings.mpris)) {
     });
 
     // Events
-    var events = {
+    const events = {
       next: "next",
       previous: "previous",
       pause: "pause",
@@ -488,7 +556,7 @@ if (process.platform === "linux" && store.get(settings.mpris)) {
       loopStatus: "repeat",
       shuffle: "shuffle",
       seek: "seek",
-    };
+    } as { [key: string]: string };
     Object.keys(events).forEach(function (eventName) {
       player.on(eventName, function () {
         const eventValue = events[eventName];

src/scripts/discord.js

@@ -1,95 +0,0 @@
-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.artists
-            ? mediaInfoModule.mediaInfo.artists
-            : "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.artists,
-          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 }).then(
-    () => {
-      discordModule.rpc = rpc;
-
-      rpc.on("ready", () => {
-        rpc.setActivity(idleStatus);
-      });
-      ipcMain.on(globalEvents.updateInfo, observer);
-    },
-    () => {
-      console.error("Can't connect to Discord, is it running?");
-    }
-  );
-};
-
-/**
- * Remove any RPC connection with discord and remove the event listener on globalEvents.updateInfo
- */
-discordModule.unRPC = function () {
-  if (rpc) {
-    rpc.clearActivity();
-    rpc.destroy();
-    rpc = false;
-    discordModule.rpc = undefined;
-    ipcMain.removeListener(globalEvents.updateInfo, observer);
-  }
-};
-
-module.exports = discordModule;

src/scripts/discord.ts

@@ -0,0 +1,88 @@
+import { Client } from "discord-rpc";
+import { app, ipcMain } from "electron";
+import { globalEvents } from "../constants/globalEvents";
+import { MediaStatus } from "../models/mediaStatus";
+import { mediaInfo } from "./mediaInfo";
+
+const clientId = "833617820704440341";
+
+function timeToSeconds(timeArray: string[]) {
+  const minutes = parseInt(timeArray[0]) * 1;
+  const seconds = minutes * 60 + parseInt(timeArray[1]) * 1;
+  return seconds;
+}
+
+export let rpc: Client;
+
+const observer = () => {
+  if (mediaInfo.status == MediaStatus.paused && rpc) {
+    rpc.setActivity(idleStatus);
+  } else if (rpc) {
+    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));
+    if (mediaInfo.url) {
+      rpc.setActivity({
+        ...idleStatus,
+        ...{
+          details: `Listening to ${mediaInfo.title}`,
+          state: mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)",
+          startTimestamp: now,
+          endTimestamp: remaining,
+          largeImageKey: mediaInfo.image,
+          largeImageText: mediaInfo.album ? mediaInfo.album : `${idleStatus.largeImageText}`,
+          buttons: [{ label: "Play on Tidal", url: mediaInfo.url }],
+        },
+      });
+    } else {
+      rpc.setActivity({
+        ...idleStatus,
+        ...{
+          details: `Watching ${mediaInfo.title}`,
+          state: mediaInfo.artists,
+          startTimestamp: now,
+          endTimestamp: 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
+ */
+export const initRPC = () => {
+  rpc = new Client({ transport: "ipc" });
+  rpc.login({ clientId }).then(
+    () => {
+      rpc.on("ready", () => {
+        rpc.setActivity(idleStatus);
+      });
+      ipcMain.on(globalEvents.updateInfo, observer);
+    },
+    () => {
+      console.error("Can't connect to Discord, is it running?");
+    }
+  );
+};
+
+/**
+ * Remove any RPC connection with discord and remove the event listener on globalEvents.updateInfo
+ */
+export const unRPC = () => {
+  if (rpc) {
+    rpc.clearActivity();
+    rpc.destroy();
+    rpc = null;
+    ipcMain.removeListener(globalEvents.updateInfo, observer);
+  }
+};

src/scripts/download.js

@@ -1,26 +0,0 @@
-const download = {};
-const request = require("request");
-const fs = require("fs");
-
-/**
- * download and save a file
- * @param {*} fileUrl url to download
- * @param {*} targetPath path to save it at
- */
-download.downloadFile = function(fileUrl, targetPath) {
-  return new Promise((resolve, reject) => {
-    var req = request({
-      method: "GET",
-      uri: fileUrl,
-    });
-
-    var out = fs.createWriteStream(targetPath);
-    req.pipe(out);
-
-    req.on("end", resolve);
-
-    req.on("error", reject);
-  });
-};
-
-module.exports = download;

src/scripts/download.ts

@@ -0,0 +1,23 @@
+import fs from "fs";
+import request from "request";
+
+/**
+ * download and save a file
+ * @param {string} fileUrl url to download
+ * @param {string} targetPath path to save it at
+ */
+export const downloadFile = function (fileUrl: string, targetPath: string) {
+  return new Promise((resolve, reject) => {
+    const req = request({
+      method: "GET",
+      uri: fileUrl,
+    });
+
+    const out = fs.createWriteStream(targetPath);
+    req.pipe(out);
+
+    req.on("end", resolve);
+
+    req.on("error", reject);
+  });
+};

src/scripts/express.ts

@@ -1,23 +1,24 @@
-const express = require("express");
-const { mediaInfo } = require("./mediaInfo");
-const { store, settings } = require("./settings");
-const globalEvents = require("./../constants/globalEvents");
-const statuses = require("./../constants/statuses");
-const expressModule = {};
-const fs = require("fs");
-
-let expressInstance;
+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-hifi's express api
  */
-expressModule.run = function (mainWindow) {
+
+// 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, action) {
+  function handleGlobalEvent(res: Response, action: string) {
     mainWindow.webContents.send("globalEvent", action);
     res.sendStatus(200);
   }
@@ -26,7 +27,7 @@ expressModule.run = function (mainWindow) {
   expressApp.get("/", (req, res) => res.send("Hello World!"));
   expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
   expressApp.get("/image", (req, res) => {
-    var stream = fs.createReadStream(mediaInfo.icon);
+    const stream = fs.createReadStream(mediaInfo.icon);
     stream.on("open", function () {
       res.set("Content-Type", "image/png");
       stream.pipe(res);
@@ -37,34 +38,29 @@ expressModule.run = function (mainWindow) {
     });
   });
 
-  if (store.get(settings.playBackControl)) {
+  if (settingsStore.get(settings.playBackControl)) {
     expressApp.get("/play", (req, res) => handleGlobalEvent(res, globalEvents.play));
     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 == statuses.playing) {
+      if (mediaInfo.status === MediaStatus.playing) {
         handleGlobalEvent(res, globalEvents.pause);
       } else {
         handleGlobalEvent(res, globalEvents.play);
       }
     });
   }
-  if (store.get(settings.api)) {
-    let port = store.get(settings.apiSettings.port);
 
-    expressInstance = expressApp.listen(port, "127.0.0.1", () => {});
-    expressInstance.on("error", function (e) {
-      let message = e.code;
-      if (e.code === "EADDRINUSE") {
-        message = `Port ${port} in use.`;
-      }
-      const { dialog } = require("electron");
-      dialog.showErrorBox("Api failed to start.", message);
-    });
-  } else {
-    expressInstance = undefined;
-  }
+  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);
+  });
 };
-
-module.exports = expressModule;

src/scripts/hotkeys.js

@@ -1,11 +0,0 @@
-const hotkeyjs = require("hotkeys-js");
-const hotkeys = {};
-
-hotkeys.add = function(keys, func) {
-  hotkeyjs(keys, function(event, args) {
-    event.preventDefault();
-    func(event, args);
-  });
-};
-
-module.exports = hotkeys;

src/scripts/hotkeys.ts

@@ -0,0 +1,11 @@
+import hotkeyjs, { HotkeysEvent } from "hotkeys-js";
+
+export const addHotkey = function (
+  keys: string,
+  func: (event?: KeyboardEvent, args?: HotkeysEvent) => void
+) {
+  hotkeyjs(keys, function (event, args) {
+    event.preventDefault();
+    func(event, args);
+  });
+};

src/scripts/mediaInfo.ts

@@ -1,24 +1,19 @@
-const statuses = require("./../constants/statuses");
+import { MediaInfo } from "../models/mediaInfo";
+import { MediaStatus } from "../models/mediaStatus";
 
-const mediaInfo = {
+export const mediaInfo = {
   title: "",
   artists: "",
   album: "",
   icon: "",
-  status: statuses.paused,
+  status: MediaStatus.paused as string,
   url: "",
   current: "",
   duration: "",
   image: "tidal-hifi-icon",
 };
-const mediaInfoModule = {
-  mediaInfo,
-};
 
-/**
- * Update artist and song info in the mediaInfo constant
- */
-mediaInfoModule.update = function (arg) {
+export const updateMediaInfo = (arg: MediaInfo) => {
   mediaInfo.title = propOrDefault(arg.title);
   mediaInfo.artists = propOrDefault(arg.artists);
   mediaInfo.album = propOrDefault(arg.album);
@@ -35,8 +30,6 @@ mediaInfoModule.update = function (arg) {
  * @param {*} prop property to check
  * @param {*} defaultValue defaults to ""
  */
-function propOrDefault(prop, defaultValue = "") {
+function propOrDefault(prop: string, defaultValue = "") {
   return prop ? prop : defaultValue;
 }
-
-module.exports = mediaInfoModule;

src/scripts/menu.ts

@@ -1,7 +1,7 @@
-const { Menu, app } = require("electron");
-const { showSettingsWindow } = require("./settings");
+import { BrowserWindow, Menu, app } from "electron";
+import { showSettingsWindow } from "./settings";
 const isMac = process.platform === "darwin";
-const { name } = require("./../constants/values");
+import name from "./../constants/values";
 
 const settingsMenuEntry = {
   label: "Settings",
@@ -19,9 +19,7 @@ const quitMenuEntry = {
   accelerator: "Control+Q",
 };
 
-const menuModule = {};
-
-menuModule.getMenu = function (mainWindow) {
+export const getMenu = function (mainWindow: BrowserWindow) {
   const toggleWindow = {
     label: "Toggle Window",
     click: function () {
@@ -113,11 +111,9 @@ menuModule.getMenu = function (mainWindow) {
     quitMenuEntry,
   ];
 
-  return Menu.buildFromTemplate(mainMenu);
+  return Menu.buildFromTemplate(mainMenu as any);
 };
 
-menuModule.addMenu = function (mainWindow) {
-  Menu.setApplicationMenu(menuModule.getMenu(mainWindow));
+export const addMenu = function (mainWindow: BrowserWindow) {
+  Menu.setApplicationMenu(getMenu(mainWindow));
 };
-
-module.exports = menuModule;

src/scripts/settings.ts

@@ -1,25 +1,32 @@
-const Store = require("electron-store");
-const settings = require("./../constants/settings");
-const path = require("path");
-const { BrowserWindow } = require("electron");
+import Store from "electron-store";
 
-let settingsWindow;
+import { settings } from "../constants/settings";
+import path from "path";
+import { BrowserWindow } from "electron";
 
-const store = new Store({
+let settingsWindow: BrowserWindow;
+
+export const settingsStore = new Store({
   defaults: {
     adBlock: false,
     api: true,
     apiSettings: {
       port: 47836,
     },
-    customCSS: "",
+    customCSS: [],
     disableBackgroundThrottle: true,
     disableHardwareMediaKeys: false,
     enableCustomHotkeys: false,
     enableDiscord: false,
+    ListenBrainz: {
+      enabled: false,
+      api: "https://api.listenbrainz.org",
+      token: "",
+    },
     flags: {
-      gpuRasterization: true,
       disableHardwareMediaKeys: false,
+      enableWaylandSupport: true,
+      gpuRasterization: true,
     },
     menuBar: true,
     minimizeOnClose: false,
@@ -29,6 +36,7 @@ const store = new Store({
     singleInstance: true,
     skipArtists: false,
     skippedArtists: [""],
+    theme: "none",
     trayIcon: true,
     updateFrequency: 500,
     windowBounds: { width: 800, height: 600 },
@@ -45,16 +53,15 @@ const store = new Store({
 });
 
 const settingsModule = {
-  store,
-  settings,
+  // settings,
   settingsWindow,
 };
 
-settingsModule.createSettingsWindow = function () {
+export const createSettingsWindow = function () {
   settingsWindow = new BrowserWindow({
     width: 700,
     height: 600,
-    resizable: false,
+    resizable: true,
     show: false,
     transparent: true,
     frame: false,
@@ -66,7 +73,7 @@ settingsModule.createSettingsWindow = function () {
     },
   });
 
-  settingsWindow.on("close", (event) => {
+  settingsWindow.on("close", (event: Event) => {
     if (settingsWindow != null) {
       event.preventDefault();
       settingsWindow.hide();
@@ -78,19 +85,17 @@ settingsModule.createSettingsWindow = function () {
   settingsModule.settingsWindow = settingsWindow;
 };
 
-settingsModule.showSettingsWindow = function (tab = "general") {
+export const 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 () {
+export const hideSettingsWindow = function () {
   settingsWindow.hide();
 };
 
-settingsModule.closeSettingsWindow = function () {
+export const closeSettingsWindow = function () {
   settingsWindow = null;
 };
-
-module.exports = settingsModule;

src/scripts/tray.ts

@@ -1,9 +1,9 @@
-const { Tray } = require("electron");
-const { getMenu } = require("./menu");
-const trayModule = {};
-let tray;
+import { BrowserWindow, Tray } from "electron";
+import { getMenu } from "./menu";
 
-trayModule.addTray = function (mainWindow, options = { icon: "" }) {
+let tray: Tray;
+
+export const addTray = function (mainWindow: BrowserWindow, options = { icon: "" }) {
   tray = new Tray(options.icon);
   tray.setIgnoreDoubleClickEvents(true);
   tray.setToolTip("Tidal-hifi");
@@ -25,10 +25,8 @@ trayModule.addTray = function (mainWindow, options = { icon: "" }) {
   });
 };
 
-trayModule.refreshTray = function (mainWindow) {
+export const refreshTray = function (mainWindow: BrowserWindow) {
   if (!tray) {
-    trayModule.addTray(mainWindow);
+    addTray(mainWindow);
   }
 };
-
-module.exports = trayModule;

src/scripts/window-functions.js

@@ -1,11 +0,0 @@
-const windowFunctions = {};
-
-windowFunctions.setTitle = function(title) {
-  window.document.title = title;
-};
-
-windowFunctions.getTitle = function() {
-  return window.document.title;
-};
-
-module.exports = windowFunctions;

src/scripts/window-functions.ts

@@ -0,0 +1,7 @@
+export const setTitle = function (title: string) {
+  window.document.title = title;
+};
+
+export const getTitle = function () {
+  return window.document.title;
+};

src/themes/Blood.scss

@@ -0,0 +1,10 @@
+$foreground: red;
+$background: black;
+
+span {
+  color: $foreground;
+}
+
+.sidebar--WvRg_ {
+  background-color: $background;
+}

src/themes/Tokyo Night.scss

@@ -0,0 +1,85 @@
+:root {
+  --footer-player-background: #1a1b26;
+  --sidebar-background: #1a1b26;
+  --sidebar-hover-background: #414868;
+  --sidebar-menu-top-text: #565f89;
+  --sidebar-menu-playlist-text: #565f89;
+  --search-background: #1a1b26;
+  --main-background: #16161e;
+  --main-navigation-control-background: #1a1b26;
+  --main-feed-button-background: #1a1b26;
+  --player-control-background: #24283b;
+  --player-control-active-button: #ff9e64;
+  --player-progress-bar: #ff9e64;
+  --indicator-hifi-background: #9ece6a;
+  --indicator-hifi-span: #1a1b26;
+  --player-control-favorite: #f7768e;
+  --search-dialog-background: #24283b;
+  --right-queue-background: #24283b;
+}
+.player--gAOQG.notFullscreen--xbpBL {
+  background-color: var(--footer-player-background);
+}
+.sidebar--jVJai {
+  background-color: var(--sidebar-background);
+  contain: strict;
+  flex-grow: 1;
+  overflow-y: auto;
+}
+.item--buEQw:hover {
+  background-color: var(--sidebar-hover-background);
+}
+.main--jxfcQ {
+  background-color: var(--main-background);
+}
+button.button--yO9Cd {
+  background-color: var(--main-navigation-control-background);
+}
+.player--gAOQG.lossLess--ON3FI button.withBackground[aria-checked="true"] path {
+  fill: var(--player-control-active-button);
+}
+.player--gAOQG.lossLess--ON3FI button.withBackground[aria-checked="true"] {
+  background-color: var(--player-control-background);
+}
+.activeItem--kFIk0 .activeItem--kFIk0 .playlistItem--mQrxp .section--PSIay.playingItem--eWkYS {
+  color: #565f89;
+}
+.progressBarWrapper--IBBI9 {
+  color: var(--player-progress-bar);
+}
+.playbackControls--FhKVf button .tidal-ui__icon {
+  transform: scale(1);
+}
+.css-11m9iw3 {
+  background-color: var(--indicator-hifi-background);
+}
+.css-11m9iw3 span {
+  color: var(--indicator-hifi-span);
+}
+.activeItem--kFIk0 {
+  color: var(--sidebar-menu-top-text);
+}
+.activeItem--kFIk0 .playlistItem--mQrxp {
+  color: var(--sidebar-menu-playlist-text);
+}
+button.feedBell--kvAbD {
+  background-color: var(--main-feed-button-background);
+}
+.baseContainer--jxCbW {
+  background-color: var(--search-dialog-background);
+}
+.favoriteButton--Qladw.is-favorite path {
+  fill: var(--player-control-favorite);
+}
+.container--PFTHk {
+  background-color: var(--right-queue-background);
+}
+.container--cl4MJ{
+  background-color: var(--search-background);
+}
+.searchFieldHighlighted--Fitvs {
+  color: var(--snow-white);
+}
+.searchField--EGBSq {
+  background-color: var(--search-background);
+}

src/types/mpris-service.d.ts

@@ -0,0 +1,60 @@
+declare class InitOptions {
+  name: string;
+  identity: string;
+  supportedUriSchemes: string[];
+  supportedMimeTypes: string[];
+  supportedInterfaces: string[];
+  desktopEntry: string;
+}
+
+declare class Player {
+  metadata: {
+    "xesam:title": string;
+    "xesam:artist": string[];
+    "xesam:album": string;
+    "mpris:artUrl": string;
+    "mpris:length": number;
+    "mpris:trackid": string;
+    // other options
+    [key: string]: string | number | string[] | object;
+  };
+  playbackStatus: string;
+  identity: string;
+  fullscreen: boolean;
+  supportedUriSchemes: string[];
+  supportedMimeTypes: string[];
+  canQuit: boolean;
+  canRaise: boolean;
+  canSetFullscreen: boolean;
+  hasTrackList: boolean;
+  desktopEntry: string;
+  loopStatus: string;
+  shuffle: boolean;
+  volume: number;
+  canControl: boolean;
+  canPause: boolean;
+  canPlay: boolean;
+  canSeek: boolean;
+  canGoNext: boolean;
+  canGoPrevious: boolean;
+  rate: number;
+  minimumRate: number;
+  maximumRate: number;
+  playlists: string[];
+  activePlaylist: string;
+
+  constructor(opts: { name: string; supportedInterfaces?: string[] });
+  constructor(opts: InitOptions);
+
+  getPosition(): number;
+  seeked(): void;
+  getTrackIndex(trackId: number): number;
+  getTrack(trackId: number): string;
+  addTrack(track: object): void;
+  removeTrack(trackId: number): number;
+  getPlaylistIndex(playlistId: number): number;
+  setPlaylists(playlists: object): void;
+  setActivePlaylist(playlistId: number): void;
+
+  on(event: string | symbol, listener: (...args: object[]) => void): this;
+}

tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "typeRoots": ["src/types", "node_modules/@types"],
+    "module": "commonjs",
+    "target": "ES6",
+    "lib": ["ES2020", "DOM"],
+    "noImplicitAny": true,
+    "sourceMap": true,
+    "allowJs": true,
+    "outDir": "ts-dist",
+    "esModuleInterop": true,
+    "baseUrl": ".",
+    "paths": {
+      "*": ["node_modules/*"]
+    }
+  },
+  "include": ["src/**/*"]
+}