Merge pull request #564 from Mastermindzh/snyk-fix-1995dd90a05e86ea7c2e4f0f7a284930

[Snyk] Security upgrade @xhayper/discord-rpc from 1.2.0 to 1.2.1

CHANGELOG.md

@@ -4,6 +4,12 @@ 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.18.0]
+
+- [Dianoga](https://github.com/Dianoga) fixed the duration selector, restoring mpris & partial API data.
+  - PR: #554
+- Added `xesam:url` property to mpris metadata fixes [#506](https://github.com/Mastermindzh/tidal-hifi/issues/506)
+
 ## [5.17.0]
 
 - Added an option to disable the dynamic title and set it to a static one, [#491](https://github.com/Mastermindzh/tidal-hifi/pull/491)

package-lock.json

@@ -1,17 +1,17 @@
 {
   "name": "tidal-hifi",
-  "version": "5.17.0",
+  "version": "5.18.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "tidal-hifi",
-      "version": "5.17.0",
+      "version": "5.18.0",
       "license": "MIT",
       "dependencies": {
         "@electron/remote": "^2.1.2",
         "@types/swagger-jsdoc": "^6.0.4",
-        "@xhayper/discord-rpc": "^1.2.0",
+        "@xhayper/discord-rpc": "^1.2.1",
         "axios": "^1.7.9",
         "cors": "^2.8.5",
         "electron-store": "^8.2.0",
@@ -414,9 +414,9 @@
       }
     },
     "node_modules/@discordjs/rest": {
-      "version": "2.4.0",
+      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.4.3.tgz",
-      "integrity": "sha512-Xb2irDqNcq+O8F0/k/NaDp7+t091p+acb51iA4bCKfIn+WFWd6HrNvcsSbMMxIR9NjcMZS6NReTKygqiQN+ntw==",
+      "integrity": "sha512-+SO4RKvWsM+y8uFHgYQrcTl/3+cY02uQOH7/7bKbVZsTfrfpoE62o5p+mmV+s7FVhTX82/kQUGGbu4YlV60RtA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@discordjs/collection": "^2.1.1",
@@ -424,10 +424,10 @@
         "@sapphire/async-queue": "^1.5.3",
         "@sapphire/snowflake": "^3.5.3",
         "@vladfrangu/async_event_emitter": "^2.4.6",
-        "discord-api-types": "0.37.97",
+        "discord-api-types": "^0.37.119",
         "magic-bytes.js": "^1.10.0",
         "tslib": "^2.6.3",
-        "undici": "6.19.8"
+        "undici": "6.21.1"
       },
       "engines": {
         "node": ">=18"
@@ -436,12 +436,6 @@
         "url": "https://github.com/discordjs/discord.js?sponsor"
       }
     },
-    "node_modules/@discordjs/rest/node_modules/discord-api-types": {
-      "version": "0.37.97",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.97.tgz",
-      "integrity": "sha512-No1BXPcVkyVD4ZVmbNgDKaBoqgeQ+FJpzZ8wqHkfmBnTZig1FcH3iPPersiK1TUIAzgClh2IvOuVUYfcWLQAOA==",
-      "license": "MIT"
-    },
     "node_modules/@discordjs/util": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.1.1.tgz",
@@ -1168,9 +1162,9 @@
       }
     },
     "node_modules/@sapphire/async-queue": {
-      "version": "1.5.3",
+      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.5.tgz",
-      "integrity": "sha512-x7zadcfJGxFka1Q3f8gCts1F0xMwCKbZweM85xECGI0hBTeIZJGGCrHgLggihBoprlQ/hBmDR5LKfIPqnmHM3w==",
+      "integrity": "sha512-cvGzxbba6sav2zZkH8GPf2oGk9yYoD5qrNWdu9fRehifgnFZJMV+nuy2nON2roRO4yQQ+v7MK/Pktl/HgfsUXg==",
       "license": "MIT",
       "engines": {
         "node": ">=v14.0.0",
@@ -1178,9 +1172,9 @@
       }
     },
     "node_modules/@sapphire/snowflake": {
-      "version": "3.5.3",
+      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.5.tgz",
-      "integrity": "sha512-jjmJywLAFoWeBi1W7994zZyiNWPIiqRRNAmSERxyg93xRGzNYvGjlZ0gR6x0F4gPRi2+0O6S71kOZYyr3cxaIQ==",
+      "integrity": "sha512-xzvBr1Q1c4lCe7i6sRnrofxeO1QTP/LKQ6A6qy0iB4x5yfiSfARMEQEghojzTNALDTcv8En04qYNIco9/K9eZQ==",
       "license": "MIT",
       "engines": {
         "node": ">=v14.0.0",
@@ -1886,39 +1880,18 @@
       }
     },
     "node_modules/@xhayper/discord-rpc": {
-      "version": "1.2.0",
+      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@xhayper/discord-rpc/-/discord-rpc-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@xhayper/discord-rpc/-/discord-rpc-1.2.1.tgz",
-      "integrity": "sha512-cKjs9TKzN/7JoozijjszQjUEK1qnLHpEvcJQ2OGFBZjymUzIOH7l14KUu7TQtaIEk0Aw9Bx2w7TfQ0O6tp5mCw==",
+      "integrity": "sha512-Ch04/7hq0nfV47nJzDcLIKx0SLUcPOMlkYV43faWpKtEO9SgLrTD4FAOMBBT+JORceQytnzBMPvktW2q9ZCMiw==",
       "license": "ISC",
       "dependencies": {
-        "@discordjs/rest": "^2.3.0",
+        "@discordjs/rest": "^2.4.3",
-        "@vladfrangu/async_event_emitter": "^2.4.4",
+        "@vladfrangu/async_event_emitter": "^2.4.6",
-        "discord-api-types": "^0.37.93",
+        "discord-api-types": "^0.37.119",
-        "ws": "^8.18.0"
+        "ws": "^8.18.1"
       },
       "engines": {
-        "node": ">=16.11.0"
+        "node": ">=18.20.7"
-      }
-    },
-    "node_modules/@xhayper/discord-rpc/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
       }
     },
     "node_modules/@xmldom/xmldom": {
@@ -3490,9 +3463,9 @@
       }
     },
     "node_modules/discord-api-types": {
-      "version": "0.37.103",
+      "version": "0.37.119",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.103.tgz",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.119.tgz",
-      "integrity": "sha512-r+qitxXKe2l6KFw5odPdZSSqdEou+7eNC7BfbZ7mny5Me/K06wCTeKUMVeH/YsI9+4QQudskeQ307kr/7ppQ1A==",
+      "integrity": "sha512-WasbGFXEB+VQWXlo6IpW3oUv73Yuau1Ig4AZF/m13tXcTKnMpc/mHjpztIlz4+BM9FG9BHQkEXiPto3bKduQUg==",
       "license": "MIT"
     },
     "node_modules/dmg-builder": {
@@ -8742,9 +8715,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.8.0",
+      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
     "node_modules/tunnel-agent": {
@@ -8825,9 +8798,9 @@
       "dev": true
     },
     "node_modules/undici": {
-      "version": "6.19.8",
+      "version": "6.21.1",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.1.tgz",
-      "integrity": "sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==",
+      "integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18.17"
@@ -9018,6 +8991,27 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/xml2js": {
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.17.0",
+  "version": "5.18.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -42,7 +42,7 @@
   "dependencies": {
     "@electron/remote": "^2.1.2",
     "@types/swagger-jsdoc": "^6.0.4",
-    "@xhayper/discord-rpc": "^1.2.0",
+    "@xhayper/discord-rpc": "^1.2.1",
     "axios": "^1.7.9",
     "cors": "^2.8.5",
     "electron-store": "^8.2.0",
@@ -80,4 +80,4 @@
     "typescript": "^5.5.3"
   },
   "prettier": "@mastermindzh/prettier-config"
-}
+}

scripts/verifyElements.js

@@ -22,12 +22,13 @@
     media: '*[data-test="current-media-imagery"]',
     image: "img",
     current: '*[data-test="current-time"]',
-    duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
+    duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
     bar: '*[data-test="progress-bar"]',
     footer: "#footerPlayer",
     mediaItem: "[data-type='mediaItem']",
-    album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
+    album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
-    playingFrom: '*[class^="playingFrom"] span:nth-child(2)',
+    playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
+    queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
     currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
     album_name_cell: '[class^="album"]',
     tracklist_row: '[data-test="tracklist-row"]',

src/features/api/swagger.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "TIDAL Hi-Fi API",
-    "version": "5.17.0",
+    "version": "5.18.0",
     "description": "",
     "license": {
       "name": "MIT",

src/pages/settings/settings.html

@@ -478,7 +478,7 @@
           <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.17.0">5.17.0</a>
+              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.18.0">5.18.0</a>
           </div>
           <div class="about-section__links">
             <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"

src/preload.ts

@@ -54,12 +54,12 @@ const elements = {
   media: '*[data-test="current-media-imagery"]',
   image: "img",
   current: '*[data-test="current-time"]',
-  duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
+  duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
   bar: '*[data-test="progress-bar"]',
   footer: "#footerPlayer",
   mediaItem: "[data-type='mediaItem']",
-  album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
+  album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
-  playing_from: '*[class^="playingFrom"] span:nth-child(2)',
+  playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
   queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
   currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
   album_name_cell: '[class^="album"]',
@@ -483,6 +483,7 @@ function updateMpris(mediaInfo: MediaInfo) {
         "xesam:title": mediaInfo.title,
         "xesam:artist": [mediaInfo.artists],
         "xesam:album": mediaInfo.album,
+        "xesam:url": mediaInfo.url,
         "mpris:artUrl": mediaInfo.image,
         "mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
         "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),

src/scripts/discord.ts

@@ -103,8 +103,7 @@ const getActivity = (): SetActivity => {
     if (includeTimestamps) {
       const currentSeconds = convertDurationToSeconds(mediaInfo.current);
       const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
-      const date = new Date();
+      const now = Math.trunc((Date.now() + 500) / 1000);
-      const now = Math.floor(date.getTime() / 1000);
       presence.startTimestamp = now - currentSeconds;
       presence.endTimestamp = presence.startTimestamp + durationSeconds;
     }