Merge pull request #304 from Mastermindzh/snyk-fix-200f82c042bab393c56350118c69a58e

[Snyk] Security upgrade axios from 1.5.1 to 1.6.0

CHANGELOG.md

@@ -4,6 +4,10 @@ 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.7.1]
+
+- Fixed mpris not being set up correctly due to capitalization of the instance name.
+
 ## [5.7.0]
 
 - Renamed app to TIDAL Hi-Fi.

package-lock.json

@@ -1,23 +1,23 @@
 {
-  "name": "TIDAL Hi-Fi",
-  "version": "5.6.0",
+  "name": "tidal-hifi",
+  "version": "5.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "TIDAL Hi-Fi",
-      "version": "5.6.0",
+      "name": "tidal-hifi",
+      "version": "5.7.1",
       "license": "MIT",
       "dependencies": {
         "@electron/remote": "^2.0.10",
-        "axios": "^1.4.0",
+        "axios": "^1.6.0",
         "discord-rpc": "^4.0.1",
         "electron-store": "^8.1.0",
         "express": "^4.18.2",
         "hotkeys-js": "^3.12.0",
         "mpris-service": "^2.1.2",
         "request": "^2.88.2",
-        "sass": "^1.64.1"
+        "sass": "^1.67.0"
       },
       "devDependencies": {
         "@mastermindzh/prettier-config": "^1.0.0",
@@ -1976,9 +1976,9 @@
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
     },
     "node_modules/axios": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
-      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
+      "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -6977,9 +6977,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.25",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz",
-      "integrity": "sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "funding": [
         {
@@ -7794,9 +7794,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.64.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz",
-      "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==",
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz",
+      "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==",
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.7.0",
+  "version": "5.7.1",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -39,14 +39,14 @@
   "license": "MIT",
   "dependencies": {
     "@electron/remote": "^2.0.10",
-    "axios": "^1.4.0",
+    "axios": "^1.6.0",
     "discord-rpc": "^4.0.1",
     "electron-store": "^8.1.0",
     "express": "^4.18.2",
     "hotkeys-js": "^3.12.0",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.64.1"
+    "sass": "^1.67.0"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
@@ -72,4 +72,4 @@
     "typescript": "^5.1.6"
   },
   "prettier": "@mastermindzh/prettier-config"
-}
+}

src/features/theming/theming.ts

@@ -4,7 +4,7 @@ import { settingsStore } from "../../scripts/settings";
 import { Logger } from "../logger";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function addCustomCss(app: any, logger: typeof Logger) {
+export function addCustomCss(app: any) {
   window.addEventListener("DOMContentLoaded", () => {
     const selectedTheme = settingsStore.get<string, string>(settings.theme);
     if (selectedTheme !== "none") {
@@ -13,7 +13,7 @@ export function addCustomCss(app: any, logger: typeof Logger) {
       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);
+          Logger.alert("An error ocurred reading the theme file.", err, alert);
           return;
         }
 

src/pages/settings/preload.ts

@@ -50,7 +50,7 @@ let adBlock: HTMLInputElement,
   discord_details_prefix: HTMLInputElement,
   discord_button_text: HTMLInputElement;
 
-addCustomCss(app, Logger.bind(this));
+addCustomCss(app);
 
 function getThemeFiles() {
   const selectElement = document.getElementById("themesList") as HTMLSelectElement;

src/preload.ts

@@ -354,6 +354,60 @@ function updateMediaInfo(options: Options, notify: boolean) {
   }
 }
 
+function addMPRIS() {
+  if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
+    try {
+      player = Player({
+        name: "tidal-hifi",
+        identity: "tidal-hifi",
+        supportedUriSchemes: ["file"],
+        supportedMimeTypes: [
+          "audio/mpeg",
+          "audio/flac",
+          "audio/x-flac",
+          "application/ogg",
+          "audio/wav",
+        ],
+        supportedInterfaces: ["player"],
+        desktopEntry: "tidal-hifi",
+      });
+      // Events
+      const events = {
+        next: "next",
+        previous: "previous",
+        pause: "pause",
+        playpause: "playpause",
+        stop: "stop",
+        play: "play",
+        loopStatus: "repeat",
+        shuffle: "shuffle",
+        seek: "seek",
+      } as { [key: string]: string };
+      Object.keys(events).forEach(function (eventName) {
+        player.on(eventName, function () {
+          const eventValue = events[eventName];
+          switch (events[eventValue]) {
+            case events.playpause:
+              playPause();
+              break;
+            default:
+              elements.click(eventValue);
+          }
+        });
+      });
+      // Override get position function
+      player.getPosition = function () {
+        return convertDuration(elements.getText("current")) * 1000 * 1000;
+      };
+      player.on("quit", function () {
+        app.quit();
+      });
+    } catch (exception) {
+      Logger.log("MPRIS player api not working", exception);
+    }
+  }
+}
+
 function updateMpris(options: Options) {
   if (player) {
     player.metadata = {
@@ -517,61 +571,8 @@ setInterval(function () {
   }
 }, getUpdateFrequency());
 
-if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
-  try {
-    player = Player({
-      name: "TIDAL Hi-Fi",
-      identity: "TIDAL Hi-Fi",
-      supportedUriSchemes: ["file"],
-      supportedMimeTypes: [
-        "audio/mpeg",
-        "audio/flac",
-        "audio/x-flac",
-        "application/ogg",
-        "audio/wav",
-      ],
-      supportedInterfaces: ["player"],
-      desktopEntry: "tidal-hifi",
-    });
-    // Events
-    const events = {
-      next: "next",
-      previous: "previous",
-      pause: "pause",
-      playpause: "playpause",
-      stop: "stop",
-      play: "play",
-      loopStatus: "repeat",
-      shuffle: "shuffle",
-      seek: "seek",
-    } as { [key: string]: string };
-    Object.keys(events).forEach(function (eventName) {
-      player.on(eventName, function () {
-        const eventValue = events[eventName];
-        switch (events[eventValue]) {
-          case events.playpause:
-            playPause();
-            break;
-
-          default:
-            elements.click(eventValue);
-        }
-      });
-    });
-    // Override get position function
-    player.getPosition = function () {
-      return convertDuration(elements.getText("current")) * 1000 * 1000;
-    };
-
-    player.on("quit", function () {
-      app.quit();
-    });
-  } catch (exception) {
-    console.log("player api not working");
-  }
-}
-
-addCustomCss(app, Logger.bind(this));
+addMPRIS();
+addCustomCss(app);
 addHotKeys();
 addIPCEventListeners();
 addFullScreenListeners();