Merge e37b2f99cc into 1afd4d22a6

CHANGELOG.md

@@ -4,50 +4,6 @@ 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.11.0]
-
-- Re-implemented the API, added support for duration/current in seconds & shuffle+repeat
-  - made the original API "legacy" (still works the same)
-  - Now using the correct HTTP verb for all new endpoints
-- Implemented TIDAL's universal links. All links are now universal.
-- Custom `tidal://` protocol fixed - By [TheRockYT](https://github.com/TheRockYT)
-- Global media shortcuts removed since TIDAL includes them by default - By [TheRockYT](https://github.com/TheRockYT)
-
-- Fixes
-  - [#390](https://github.com/Mastermindzh/tidal-hifi/issues/390)
-  - [#376](https://github.com/Mastermindzh/tidal-hifi/issues/376)
-  - [#383](https://github.com/Mastermindzh/tidal-hifi/issues/383)
-  - [#393](https://github.com/Mastermindzh/tidal-hifi/issues/393)
-
-## [5.10.0]
-
-- TIDAL will now close the previous notification if a new one is sent whilst the old is still visible. [#364](https://github.com/Mastermindzh/tidal-hifi/pull/364)
-- Updated developer documentation to get started in README [#365](https://github.com/Mastermindzh/tidal-hifi/pull/365)
-- Links in the about window now open in the user's default browser. fixes [#360](https://github.com/Mastermindzh/tidal-hifi/issues/360)
-- Refactored "nowPlaying" code to always display the current state, even when the built-in UI is updated.
-  - fixes [#351](https://github.com/Mastermindzh/tidal-hifi/issues/351)
-  - fixes [#356](https://github.com/Mastermindzh/tidal-hifi/issues/356)
-  - fixes [#370](https://github.com/Mastermindzh/tidal-hifi/issues/370)
-- Reverted to using old icon syntax with icons in the build directory. fixes [#350](https://github.com/Mastermindzh/tidal-hifi/issues/350)
-- Enabled wayland platform flags by default when launching through .desktop file
-  - fixes [#273](https://github.com/Mastermindzh/tidal-hifi/issues/273)
-  - fixes [#347](https://github.com/Mastermindzh/tidal-hifi/issues/347)
-
-## [5.9.0]
-
-- More Discord options:
-  - Added the ability to hide the current song from the discord activity and display a custom text instead
-  - Added the ability to customize the text that is shown when no song is playing
-  - Discord now reacts to pausing/unpausing events
-- Refactored media info updates so it only updates the required info, fixes #342, #306
-- Added 5.9.0 logs/versions/migrations
-
-### Fixed
-
-- Fixed chromium mediaSession instance showing up. fixes #338 #198
-- Set a new icon, should fix #302
-- Made sure settingsWindow exists before operating on it. fixes #344
-
 ## [5.8.0]
 
 - Updated Electron to 28.1.1 (fixes [325](https://github.com/Mastermindzh/tidal-hifi/issues/325))

README.md

@@ -130,13 +130,10 @@ nix-env -iA nixpkgs.tidal-hifi
 
 To install and work with the code on this project follow these steps:
 
-- `git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git)`
-- `cd tidal-hifi`
-- `npm install`
-- `npm run watch` to watch for auto-reload of Typescript/SCSS changes.
-  - `npm run compile` can be used to trigger it once
-- `npm watchStart` to auto watch for any updates files and reload Tidal Hi-Fi
-  - `npm start` can be used to run Tidal Hi-Fi manually once
+- git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git)
+- cd TIDAL Hi-Fi
+- npm install
+- npm start
 
 ## Integrations
 

build/electron-builder.base.yml

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.11.0",
+  "version": "5.8.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -39,15 +39,15 @@
   "homepage": "https://github.com/Mastermindzh/tidal-hifi",
   "license": "MIT",
   "dependencies": {
-    "@electron/remote": "^2.1.2",
-    "axios": "^1.6.8",
+    "@electron/remote": "^2.1.1",
+    "axios": "^1.6.5",
     "discord-rpc": "^4.0.1",
-    "electron-store": "^8.2.0",
-    "express": "^4.19.2",
-    "hotkeys-js": "^3.13.7",
+    "electron-store": "^8.1.0",
+    "express": "^4.18.2",
+    "hotkeys-js": "^3.13.5",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.75.0"
+    "sass": "^1.69.7"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",

src/constants/globalEvents.ts

@@ -13,6 +13,4 @@ export const globalEvents = {
   whip: "whip",
   log: "log",
   toggleFavorite: "toggleFavorite",
-  toggleShuffle: "toggleShuffle",
-  toggleRepeat: "toggleRepeat",
 };

src/constants/settings.ts

@@ -26,7 +26,7 @@ export const settings = {
     includeTimestamps: "discord.includeTimestamps",
     showSong: "discord.showSong",
     idleText: "discord.idleText",
-    usingText: "discord.usingText",
+    listeningText: "discord.listeningText",
   },
   ListenBrainz: {
     root: "ListenBrainz",

src/features/api/features/current.ts

@@ -1,20 +0,0 @@
-import { Request, Response, Router } from "express";
-import fs from "fs";
-import { mediaInfo } from "../../../scripts/mediaInfo";
-
-export const addCurrentInfo = (expressApp: Router) => {
-  expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
-  expressApp.get("/current/image", getCurrentImage);
-};
-
-export const getCurrentImage = (req: Request, res: Response) => {
-  const stream = fs.createReadStream(mediaInfo.icon);
-  stream.on("open", function () {
-    res.set("Content-Type", "image/png");
-    stream.pipe(res);
-  });
-  stream.on("error", function () {
-    res.set("Content-Type", "text/plain");
-    res.status(404).end("Not found");
-  });
-};

src/features/api/features/player.ts

@@ -1,36 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { BrowserWindow } from "electron";
-import { Router } from "express";
-import { globalEvents } from "../../../constants/globalEvents";
-import { settings } from "../../../constants/settings";
-import { MediaStatus } from "../../../models/mediaStatus";
-import { mediaInfo } from "../../../scripts/mediaInfo";
-import { settingsStore } from "../../../scripts/settings";
-import { handleWindowEvent } from "../helpers/handleWindowEvent";
-
-export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow) => {
-  const windowEvent = handleWindowEvent(mainWindow);
-  const createRoute = (route: string) => `/player${route}`;
-
-  const createPlayerAction = (route: string, action: string) => {
-    expressApp.post(createRoute(route), (req, res) => windowEvent(res, action));
-  };
-
-  if (settingsStore.get(settings.playBackControl)) {
-    createPlayerAction("/play", globalEvents.play);
-    createPlayerAction("/favorite/toggle", globalEvents.toggleFavorite);
-    createPlayerAction("/pause", globalEvents.pause);
-    createPlayerAction("/next", globalEvents.next);
-    createPlayerAction("/previous", globalEvents.previous);
-    createPlayerAction("/shuffle/toggle", globalEvents.toggleShuffle);
-    createPlayerAction("/repeat/toggle", globalEvents.toggleRepeat);
-
-    expressApp.post(createRoute("/playpause"), (req, res) => {
-      if (mediaInfo.status === MediaStatus.playing) {
-        windowEvent(res, globalEvents.pause);
-      } else {
-        windowEvent(res, globalEvents.play);
-      }
-    });
-  }
-};

src/features/api/helpers/handleWindowEvent.ts

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

src/features/api/index.ts

@@ -1,31 +0,0 @@
-import { BrowserWindow, dialog } from "electron";
-import express from "express";
-import { settings } from "../../constants/settings";
-import { settingsStore } from "../../scripts/settings";
-import { addCurrentInfo } from "./features/current";
-import { addPlaybackControl } from "./features/player";
-import { addLegacyApi } from "./legacy";
-
-/**
- * Function to enable TIDAL Hi-Fi's express api
- */
-export const startApi = (mainWindow: BrowserWindow) => {
-  const expressApp = express();
-  expressApp.get("/", (req, res) => res.send("Hello World!"));
-
-  // add features
-  addLegacyApi(expressApp, mainWindow);
-  addPlaybackControl(expressApp, mainWindow);
-  addCurrentInfo(expressApp);
-
-  const port = settingsStore.get<string, number>(settings.apiSettings.port);
-  const expressInstance = expressApp.listen(port, "127.0.0.1");
-  expressInstance.on("error", function (e: { code: string }) {
-    let message = e.code;
-    if (e.code === "EADDRINUSE") {
-      message = `Port ${port} in use.`;
-    }
-
-    dialog.showErrorBox("Api failed to start.", message);
-  });
-};

src/features/api/legacy.ts

@@ -1,47 +0,0 @@
-import { BrowserWindow } from "electron";
-import { Response, Router } from "express";
-import { globalEvents } from "../../constants/globalEvents";
-import { settings } from "../../constants/settings";
-import { MediaStatus } from "../../models/mediaStatus";
-import { mediaInfo } from "../../scripts/mediaInfo";
-import { settingsStore } from "../../scripts/settings";
-import { getCurrentImage } from "./features/current";
-
-/**
- * The legacy API, this will not be maintained and probably has duplicate code :)
- * @param expressApp
- * @param mainWindow
- */
-export const addLegacyApi = (expressApp: Router, mainWindow: BrowserWindow) => {
-  expressApp.get("/image", getCurrentImage);
-
-  if (settingsStore.get(settings.playBackControl)) {
-    addLegacyControls();
-  }
-  function addLegacyControls() {
-    expressApp.get("/play", ({ res }) => handleGlobalEvent(res, globalEvents.play));
-    expressApp.post("/favorite/toggle", (req, res) =>
-      handleGlobalEvent(res, globalEvents.toggleFavorite)
-    );
-    expressApp.get("/pause", (req, res) => handleGlobalEvent(res, globalEvents.pause));
-    expressApp.get("/next", (req, res) => handleGlobalEvent(res, globalEvents.next));
-    expressApp.get("/previous", (req, res) => handleGlobalEvent(res, globalEvents.previous));
-    expressApp.get("/playpause", (req, res) => {
-      if (mediaInfo.status === MediaStatus.playing) {
-        handleGlobalEvent(res, globalEvents.pause);
-      } else {
-        handleGlobalEvent(res, globalEvents.play);
-      }
-    });
-  }
-
-  /**
-   * Shorthand to handle a fire and forget global event
-   * @param {*} res
-   * @param {*} action
-   */
-  function handleGlobalEvent(res: Response, action: string) {
-    mainWindow.webContents.send("globalEvent", action);
-    res.sendStatus(200);
-  }
-};

src/features/time/parse.ts

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

src/main.ts

@@ -1,9 +1,17 @@
 import { enable, initialize } from "@electron/remote/main";
-import { BrowserWindow, app, components, ipcMain, session } from "electron";
+import {
+  app,
+  BrowserWindow,
+  components,
+  globalShortcut,
+  ipcMain,
+  protocol,
+  session,
+} from "electron";
 import path from "path";
 import { globalEvents } from "./constants/globalEvents";
+import { mediaKeys } from "./constants/mediaKeys";
 import { settings } from "./constants/settings";
-import { startApi } from "./features/api";
 import { setDefaultFlags, setManagedFlagsFromSettings } from "./features/flags/flags";
 import {
   acquireInhibitorIfInactive,
@@ -14,6 +22,7 @@ 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 {
@@ -52,31 +61,20 @@ function syncMenuBarWithStore() {
 }
 
 /**
- * @returns true/false based on whether the current window is the main window
+ * Determine whether the current window is the main window
+ * if singleInstance is requested.
+ * If singleInstance isn't requested simply return true
+ * @returns true if singInstance is not requested, otherwise true/false based on whether the current window is the main window
  */
-function isMainInstance() {
-  return app.requestSingleInstanceLock();
-}
+function isMainInstanceOrMultipleInstancesAllowed() {
+  if (settingsStore.get(settings.singleInstance)) {
+    const gotTheLock = app.requestSingleInstanceLock();
 
-/**
- * @returns true/false based on whether multiple instances are allowed
- */
-function isMultipleInstancesAllowed() {
-  return !settingsStore.get(settings.singleInstance);
-}
-
-/**
- * @param args the arguments passed to the app
- * @returns the custom protocol url if it exists, otherwise null
- */
-function getCustomProtocolUrl(args: string[]) {
-  const customProtocolArg = args.find((arg) => arg.startsWith(PROTOCOL_PREFIX));
-
-  if (!customProtocolArg) {
-    return null;
+    if (!gotTheLock) {
+      return false;
+    }
   }
-
-  return tidalUrl + "/" + customProtocolArg.substring(PROTOCOL_PREFIX.length + 3);
+  return true;
 }
 
 function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
@@ -100,16 +98,8 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
   registerHttpProtocols();
   syncMenuBarWithStore();
 
-  // find the custom protocol argument
-  const customProtocolUrl = getCustomProtocolUrl(process.argv);
-
-  if (customProtocolUrl) {
-    // load the url received from the custom protocol
-    mainWindow.loadURL(customProtocolUrl);
-  } else {
-    // load the Tidal website
-    mainWindow.loadURL(tidalUrl);
-  }
+  // load the Tidal website
+  mainWindow.loadURL(tidalUrl);
 
   if (settingsStore.get(settings.disableBackgroundThrottle)) {
     // prevent setInterval lag
@@ -149,32 +139,27 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
 }
 
 function registerHttpProtocols() {
+  protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request) => {
+    mainWindow.loadURL(`${tidalUrl}/${request.url.substring(PROTOCOL_PREFIX.length + 3)}`);
+  });
   if (!app.isDefaultProtocolClient(PROTOCOL_PREFIX)) {
     app.setAsDefaultProtocolClient(PROTOCOL_PREFIX);
   }
 }
 
+function addGlobalShortcuts() {
+  Object.keys(mediaKeys).forEach((key) => {
+    globalShortcut.register(`${key}`, () => {
+      mainWindow.webContents.send("globalEvent", `${(mediaKeys as any)[key]}`);
+    });
+  });
+}
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
 app.on("ready", async () => {
-  // check if the app is the main instance and multiple instances are not allowed
-  if (isMainInstance() && !isMultipleInstancesAllowed()) {
-    app.on("second-instance", (_, commandLine) => {
-      const customProtocolUrl = getCustomProtocolUrl(commandLine);
-
-      if (customProtocolUrl) {
-        mainWindow.loadURL(customProtocolUrl);
-      }
-
-      if (mainWindow) {
-        if (mainWindow.isMinimized()) mainWindow.restore();
-        mainWindow.focus();
-      }
-    });
-  }
-
-  if (isMainInstance() || isMultipleInstancesAllowed()) {
+  if (isMainInstanceOrMultipleInstancesAllowed()) {
     await components.whenReady();
 
     // Adblock
@@ -189,11 +174,12 @@ app.on("ready", async () => {
     createWindow();
     addMenu(mainWindow);
     createSettingsWindow();
+    addGlobalShortcuts();
     if (settingsStore.get(settings.trayIcon)) {
       addTray(mainWindow, { icon });
       refreshTray(mainWindow);
     }
-    settingsStore.get(settings.api) && startApi(mainWindow);
+    settingsStore.get(settings.api) && startExpress(mainWindow);
     settingsStore.get(settings.enableDiscord) && initRPC();
   } else {
     app.quit();

src/models/mediaInfo.ts

@@ -8,9 +8,7 @@ export interface MediaInfo {
   status: MediaStatus;
   url: string;
   current: string;
-  currentInSeconds?: number;
   duration: string;
-  durationInSeconds?: number;
   image: string;
   favorite: boolean;
 }

src/models/options.ts

@@ -5,9 +5,7 @@ export interface Options {
   status: string;
   url: string;
   current: string;
-  currentInSeconds: number;
   duration: string;
-  durationInSeconds: number;
   "app-name": string;
   image: string;
   icon: string;

src/pages/settings/preload.ts

@@ -57,7 +57,7 @@ let adBlock: HTMLInputElement,
   discord_button_text: HTMLInputElement,
   discord_show_song: HTMLInputElement,
   discord_idle_text: HTMLInputElement,
-  discord_using_text: HTMLInputElement;
+  discord_listening_text: HTMLInputElement;
 
 addCustomCss(app);
 
@@ -148,7 +148,7 @@ function refreshSettings() {
     discord_button_text.value = settingsStore.get(settings.discord.buttonText);
     discord_show_song.checked = settingsStore.get(settings.discord.showSong);
     discord_idle_text.value = settingsStore.get(settings.discord.idleText);
-    discord_using_text.value = settingsStore.get(settings.discord.usingText);
+    discord_listening_text.value = settingsStore.get(settings.discord.listeningText);
 
     // set state of all switches with additional settings
     Object.values(switchesWithSettings).forEach((settingSwitch) => {
@@ -263,7 +263,7 @@ window.addEventListener("DOMContentLoaded", () => {
   listenbrainz_delay = get("listenbrainz_delay");
   discord_button_text = get("discord_button_text");
   discord_show_song = get("discord_show_song");
-  discord_using_text = get("discord_using_text");
+  discord_listening_text = get("discord_listening_text");
   discord_idle_text = get("discord_idle_text")
 
   refreshSettings();
@@ -301,5 +301,5 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(discord_button_text, settings.discord.buttonText);
   addInputListener(discord_show_song, settings.discord.showSong, switchesWithSettings.discord_show_song);
   addInputListener(discord_idle_text, settings.discord.idleText);
-  addInputListener(discord_using_text, settings.discord.usingText);
+  addInputListener(discord_listening_text, settings.discord.listeningText);
 });

src/pages/settings/settings.html

@@ -227,9 +227,9 @@
 
               <div class="group__option" class="hidden">
                 <div class="group__description">
-                  <h4>Using Tidal Text</h4>
-                  <p>The text displayed on Discord's rich presence while "showSong" is turned off</p>
-                  <input id="discord_using_text" type="text" class="text-input" name="discord_using_text" />
+                  <h4>Listening Text</h4>
+                  <p>The text displayed on Discord's rich presence while listening to a song.</p>
+                  <input id="discord_listening_text" type="text" class="text-input" name="discord_listening_text" />
                 </div>
               </div>
 
@@ -432,16 +432,14 @@
           <img alt="tidal icon" class="about-section__icon" src="./icon.png" />
           <h4>TIDAL Hi-Fi</h4>
           <div class="about-section__version">
-            <a target="_blank" rel="noopener"
-              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.11.0">5.11.0</a>
+            <a href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.8.0">5.8.0</a>
           </div>
           <div class="about-section__links">
-            <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
-              class="about-section__button">Github
-              <i class="fa fa-external-link"></i></a>
-            <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/issues"
-              class="about-section__button">Report an issue <i class="fa fa-external-link"></i></a>
-            <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
+            <a href="https://github.com/mastermindzh/tidal-hifi/" class="about-section__button">Github <i
+                class="fa fa-external-link"></i></a>
+            <a href="https://github.com/Mastermindzh/tidal-hifi/issues" class="about-section__button">Report an issue <i
+                class="fa fa-external-link"></i></a>
+            <a href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
               class="about-section__button">Contributors <i class="fa fa-external-link"></i></a>
           </div>
         </section>
@@ -456,4 +454,4 @@
   </div>
 </body>
 
-</html>
+</html>

src/pages/settings/settings.scss

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

src/preload.ts

@@ -12,7 +12,6 @@ import { StoreData } from "./features/listenbrainz/models/storeData";
 import { Logger } from "./features/logger";
 import { Songwhip } from "./features/songwhip/songwhip";
 import { addCustomCss } from "./features/theming/theming";
-import { convertDurationToSeconds } from "./features/time/parse";
 import { MediaStatus } from "./models/mediaStatus";
 import { Options } from "./models/options";
 import { downloadFile } from "./scripts/download";
@@ -28,10 +27,6 @@ let currentPlayStatus = MediaStatus.paused;
 let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
 let scrobbleWaitingForDelay = false;
 
-let currentlyPlaying = MediaStatus.paused;
-let currentMediaInfo: Options;
-let currentNotification: Electron.Notification;
-
 const elements = {
   play: '*[data-test="play"]',
   pause: '*[data-test="pause"]',
@@ -306,8 +301,6 @@ function addIPCEventListeners() {
     ipcRenderer.on("globalEvent", (_event, args) => {
       switch (args) {
         case globalEvents.playPause:
-        case globalEvents.play:
-        case globalEvents.pause:
           playPause();
           break;
         case globalEvents.next:
@@ -316,15 +309,15 @@ function addIPCEventListeners() {
         case globalEvents.previous:
           elements.click("previous");
           break;
+        case globalEvents.play:
+          elements.click("play");
+          break;
+        case globalEvents.pause:
+          elements.click("pause");
+          break;
         case globalEvents.toggleFavorite:
           elements.click("favorite");
           break;
-        case globalEvents.toggleShuffle:
-          elements.click("shuffle");
-          break;
-        case globalEvents.toggleRepeat:
-          elements.click("repeat");
-          break;
         default:
           break;
       }
@@ -364,16 +357,9 @@ function convertDuration(duration: string) {
  */
 function updateMediaInfo(options: Options, notify: boolean) {
   if (options) {
-    currentMediaInfo = options;
     ipcRenderer.send(globalEvents.updateInfo, options);
     if (settingsStore.get(settings.notifications) && notify) {
-      if (currentNotification) currentNotification.close();
-      currentNotification = new Notification({
-        title: options.title,
-        body: options.artists,
-        icon: options.icon,
-      });
-      currentNotification.show();
+      new Notification({ title: options.title, body: options.artists, icon: options.icon }).show();
     }
     updateMpris(options);
     updateListenBrainz(options);
@@ -500,6 +486,23 @@ function getTrackID() {
   return window.location;
 }
 
+function updateMediaSession(options: Options) {
+  if ("mediaSession" in navigator) {
+    navigator.mediaSession.metadata = new MediaMetadata({
+      title: options.title,
+      artist: options.artists,
+      album: options.album,
+      artwork: [
+        {
+          src: options.icon,
+          sizes: "640x640",
+          type: "image/png",
+        },
+      ],
+    });
+  }
+}
+
 /**
  * Watch for song changes and update title + notify
  */
@@ -507,73 +510,60 @@ setInterval(function () {
   const title = elements.getText("title");
   const artistsArray = elements.getArtistsArray();
   const artistsString = elements.getArtistsString(artistsArray);
-  const songDashArtistTitle = `${title} - ${artistsString}`;
-  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
+  skipArtistsIfFoundInSkippedArtistsList(artistsArray);
+
+  const album = elements.getAlbumName();
   const current = elements.getText("current");
+  const duration = elements.getText("duration");
+  const songDashArtistTitle = `${title} - ${artistsString}`;
   const currentStatus = getCurrentlyPlayingStatus();
+  const options = {
+    title,
+    artists: artistsString,
+    album: album,
+    status: currentStatus,
+    url: getTrackURL(),
+    current,
+    duration,
+    "app-name": appName,
+    image: "",
+    icon: "",
+    favorite: elements.isFavorite(),
+  };
 
-  const playStateChanged = currentStatus != currentlyPlaying;
+  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
 
-  // update info if song changed or was just paused/resumed
-  if (titleOrArtistsChanged || playStateChanged) {
-    if (playStateChanged) {
-      currentlyPlaying = currentStatus;
+  // update title, url and play info with new info
+  setTitle(songDashArtistTitle);
+  getTrackURL();
+  currentSong = songDashArtistTitle;
+  currentPlayStatus = currentStatus;
+
+  const image = elements.getSongIcon();
+
+  new Promise<void>((resolve) => {
+    if (image.startsWith("http")) {
+      options.image = image;
+      downloadFile(image, notificationPath).then(
+        () => {
+          options.icon = notificationPath;
+          resolve();
+        },
+        () => {
+          // if the image can't be downloaded then continue without it
+          resolve();
+        }
+      );
+    } else {
+      // if the image can't be found on the page continue without it
+      resolve();
     }
-    skipArtistsIfFoundInSkippedArtistsList(artistsArray);
-
-    const album = elements.getAlbumName();
-    const duration = elements.getText("duration");
-    const options = {
-      title,
-      artists: artistsString,
-      album: album,
-      status: currentStatus,
-      url: getTrackURL(),
-      current,
-      currentInSeconds: convertDurationToSeconds(current),
-      duration,
-      durationInSeconds: convertDurationToSeconds(duration),
-      "app-name": appName,
-      image: "",
-      icon: "",
-      favorite: elements.isFavorite(),
-    };
-
-    // update title, url and play info with new info
-    setTitle(songDashArtistTitle);
-    getTrackURL();
-    currentSong = songDashArtistTitle;
-    currentPlayStatus = currentStatus;
-
-    const image = elements.getSongIcon();
-
-    new Promise<void>((resolve) => {
-      if (image.startsWith("http")) {
-        options.image = image;
-        downloadFile(image, notificationPath).then(
-          () => {
-            options.icon = notificationPath;
-            resolve();
-          },
-          () => {
-            // if the image can't be downloaded then continue without it
-            resolve();
-          }
-        );
-      } else {
-        // if the image can't be found on the page continue without it
-        resolve();
-      }
-    }).then(() => {
-      updateMediaInfo(options, titleOrArtistsChanged);
-    });
-  } else {
-    // just update the time
-    updateMediaInfo(
-      { ...currentMediaInfo, ...{ current, currentInSeconds: convertDurationToSeconds(current) } },
-      false
-    );
-  }
+  }).then(() => {
+    updateMediaInfo(options, titleOrArtistsChanged);
+    if (titleOrArtistsChanged) {
+      updateMediaSession(options);
+    }
+  });
 
   /**
    * automatically skip a song if the artists are found in the list of artists to skip

src/scripts/discord.ts

@@ -3,13 +3,18 @@ import { app, ipcMain } from "electron";
 import { globalEvents } from "../constants/globalEvents";
 import { settings } from "../constants/settings";
 import { Logger } from "../features/logger";
-import { convertDurationToSeconds } from "../features/time/parse";
 import { MediaStatus } from "../models/mediaStatus";
 import { mediaInfo } from "./mediaInfo";
 import { settingsStore } from "./settings";
 
 const clientId = "833617820704440341";
 
+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 = () => {
@@ -17,69 +22,50 @@ const observer = () => {
     rpc.setActivity(getActivity());
   }
 };
-
-const defaultPresence = {
-  largeImageKey: "tidal-hifi-icon",
-  largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
-  instance: false,
-};
-
-const getActivity = (): Presence => {
-  const presence: Presence = { ...defaultPresence };
-
+const getActivity = (): Presence | undefined => {
+  const presence: Presence | undefined = {
+    largeImageKey: "tidal-hifi-icon",
+    largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
+    instance: false,
+  };
   if (mediaInfo.status === MediaStatus.paused) {
-    presence.details =
-      settingsStore.get<string, string>(settings.discord.idleText) ?? "Browsing Tidal";
+    presence.details = settingsStore.get<string, string>(settings.discord.idleText) ?? "Browsing Tidal";
   } else {
     const showSong = settingsStore.get<string, boolean>(settings.discord.showSong) ?? false;
     if (showSong) {
-      const { includeTimestamps, detailsPrefix, buttonText } = getFromStore();
-      includeTimeStamps(includeTimestamps);
-      setPresenceFromMediaInfo(detailsPrefix, buttonText);
+      const includeTimestamps =
+        settingsStore.get<string, boolean>(settings.discord.includeTimestamps) ?? true;
+
+      if (includeTimestamps) {
+        const currentSeconds = timeToSeconds(mediaInfo.current.split(":"));
+        const durationSeconds = timeToSeconds(mediaInfo.duration.split(":"));
+        const date = new Date();
+        const now = (date.getTime() / 1000) | 0;
+        const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
+        presence.startTimestamp = now;
+        presence.endTimestamp = remaining;
+      }
+
+      const detailsPrefix = settingsStore.get<string, string>(settings.discord.detailsPrefix) ?? "Listening to ";
+      const buttonText = settingsStore.get<string, string>(settings.discord.buttonText) ?? "Play on TIDAL";
+
+      if (mediaInfo.url) {
+        presence.details = `${detailsPrefix}${mediaInfo.title}`;
+        presence.state = mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)";
+        presence.largeImageKey = mediaInfo.image;
+        if (mediaInfo.album) {
+          presence.largeImageText = mediaInfo.album;
+        }
+        presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
+      } else {
+        presence.details = `Watching ${mediaInfo.title}`;
+        presence.state = mediaInfo.artists;
+      }
     } else {
-      presence.details =
-        settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
+      presence.details = settingsStore.get<string, string>(settings.discord.listeningText) ?? "Listening Tidal";
     }
   }
   return presence;
-
-  function getFromStore() {
-    const includeTimestamps =
-      settingsStore.get<string, boolean>(settings.discord.includeTimestamps) ?? true;
-    const detailsPrefix =
-      settingsStore.get<string, string>(settings.discord.detailsPrefix) ?? "Listening to ";
-    const buttonText =
-      settingsStore.get<string, string>(settings.discord.buttonText) ?? "Play on TIDAL";
-
-    return { includeTimestamps, detailsPrefix, buttonText };
-  }
-
-  function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) {
-    if (mediaInfo.url) {
-      presence.details = `${detailsPrefix}${mediaInfo.title}`;
-      presence.state = mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)";
-      presence.largeImageKey = mediaInfo.image;
-      if (mediaInfo.album) {
-        presence.largeImageText = mediaInfo.album;
-      }
-      presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
-    } else {
-      presence.details = `Watching ${mediaInfo.title}`;
-      presence.state = mediaInfo.artists;
-    }
-  }
-
-  function includeTimeStamps(includeTimestamps: boolean) {
-    if (includeTimestamps) {
-      const currentSeconds = convertDurationToSeconds(mediaInfo.current);
-      const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
-      const date = new Date();
-      const now = (date.getTime() / 1000) | 0;
-      const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
-      presence.startTimestamp = now;
-      presence.endTimestamp = remaining;
-    }
-  }
 };
 
 /**

src/scripts/express.ts

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

src/scripts/mediaInfo.ts

@@ -9,9 +9,7 @@ export const mediaInfo = {
   status: MediaStatus.paused as string,
   url: "",
   current: "",
-  currentInSeconds: 0,
   duration: "",
-  durationInSeconds: 0,
   image: "tidal-hifi-icon",
   favorite: false,
 };
@@ -21,12 +19,10 @@ export const updateMediaInfo = (arg: MediaInfo) => {
   mediaInfo.artists = propOrDefault(arg.artists);
   mediaInfo.album = propOrDefault(arg.album);
   mediaInfo.icon = propOrDefault(arg.icon);
-  mediaInfo.url = toUniversalUrl(propOrDefault(arg.url));
+  mediaInfo.url = propOrDefault(arg.url);
   mediaInfo.status = propOrDefault(arg.status);
   mediaInfo.current = propOrDefault(arg.current);
-  mediaInfo.currentInSeconds = arg.currentInSeconds ?? 0;
   mediaInfo.duration = propOrDefault(arg.duration);
-  mediaInfo.durationInSeconds = arg.durationInSeconds ?? 0;
   mediaInfo.image = propOrDefault(arg.image);
   mediaInfo.favorite = arg.favorite;
 };
@@ -37,18 +33,5 @@ export const updateMediaInfo = (arg: MediaInfo) => {
  * @param {*} defaultValue defaults to ""
  */
 function propOrDefault(prop: string, defaultValue = "") {
-  return prop || defaultValue;
-}
-
-/**
- * Append the universal link syntax (?u) to any url
- * @param url url to append the universal link syntax to
- * @returns url with `?u` appended, or the original value of url if falsy
- */
-function toUniversalUrl(url: string) {
-  if (url) {
-    const queryParamsSet = url.indexOf("?");
-    return queryParamsSet > -1 ? `${url}&u` : `${url}?u`;
-  }
-  return url;
+  return prop ? prop : defaultValue;
 }

src/scripts/settings.ts

@@ -1,29 +1,10 @@
 import Store from "electron-store";
 
-import { BrowserWindow, shell } from "electron";
+import { BrowserWindow } from "electron";
 import path from "path";
 import { settings } from "../constants/settings";
 
 let settingsWindow: BrowserWindow;
-/**
- * Build a migration step for several settings.
- * All settings will be checked and set to the default if non-existent.
- * @param version
- * @param migrationStore
- * @param options
- */
-const buildMigration = (
-  version: string,
-  migrationStore: { get: (str: string) => string; set: (str: string, val: unknown) => void },
-  options: Array<{ key: string; value: unknown }>
-) => {
-  console.log(`running migrations for ${version}`);
-  options.forEach(({ key, value }) => {
-    const valueToSet = migrationStore.get(key) ?? value;
-    console.log(`  - setting ${key} to ${value}`);
-    migrationStore.set(key, valueToSet);
-  });
-};
 
 export const settingsStore = new Store({
   defaults: {
@@ -38,12 +19,12 @@ export const settingsStore = new Store({
     enableCustomHotkeys: false,
     enableDiscord: false,
     discord: {
-      showSong: true,
+      showSong: false,
       idleText: "Browsing Tidal",
-      usingText: "Playing media on TIDAL",
-      includeTimestamps: true,
+      listeningText: "Listening Tidal",
       detailsPrefix: "Listening to ",
       buttonText: "Play on Tidal",
+      includeTimestamps: true,
     },
     ListenBrainz: {
       enabled: false,
@@ -91,16 +72,6 @@ export const settingsStore = new Store({
         migrationStore.get(settings.discord.includeTimestamps) ?? true
       );
     },
-    "5.9.0": (migrationStore) => {
-      buildMigration("5.9.0", migrationStore, [
-        { key: settings.discord.showSong, value: "true" },
-        { key: settings.discord.idleText, value: "Browsing Tidal" },
-        {
-          key: settings.discord.usingText,
-          value: "Playing media on TIDAL",
-        },
-      ]);
-    },
   },
 });
 
@@ -134,18 +105,10 @@ export const createSettingsWindow = function () {
 
   settingsWindow.loadURL(`file://${__dirname}/../pages/settings/settings.html`);
 
-  settingsWindow.webContents.setWindowOpenHandler(({ url }) => {
-    shell.openExternal(url);
-    return { action: "deny" };
-  });
   settingsModule.settingsWindow = settingsWindow;
 };
 
 export const showSettingsWindow = function (tab = "general") {
-  if (!settingsWindow) {
-    console.log("Settings window is not initialized. Attempting to create it.");
-    createSettingsWindow();
-  }
   settingsWindow.webContents.send("goToTab", tab);
 
   // refresh data just before showing the window