Merge pull request #558 from Mastermindzh/next

2025-09-10 22:04:53 +02:00 · 2025-03-18 09:10:40 +01:00 · 2025-03-17 11:05:10 +01:00 · 2025-03-17 10:27:42 +01:00 · 2025-03-17 09:54:06 +01:00 · 2025-03-12 14:21:13 -05:00
8 changed files with 46 additions and 33 deletions
--- a/CHANGELOG.md
+++ b/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)
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,22 +1,22 @@
 {
  "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",
-        "axios": "^1.7.7",
+        "axios": "^1.7.9",
        "cors": "^2.8.5",
        "electron-store": "^8.2.0",
-        "express": "^4.21.1",
-        "hotkeys-js": "^3.13.7",
+        "express": "^4.21.2",
+        "hotkeys-js": "^3.13.9",
        "mpris-service": "^2.1.2",
        "request": "^2.88.2",
        "sass": "^1.79.4",
@@ -2364,9 +2364,9 @@
      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
    },
    "node_modules/axios": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
      "license": "MIT",
      "dependencies": {
        "follow-redirects": "^1.15.6",
@@ -4167,9 +4167,9 @@
      }
    },
    "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
      "license": "MIT",
      "dependencies": {
        "accepts": "~1.3.8",
@@ -4191,7 +4191,7 @@
        "methods": "~1.1.2",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
        "proxy-addr": "~2.0.7",
        "qs": "6.13.0",
        "range-parser": "~1.2.1",
@@ -4206,6 +4206,10 @@
      },
      "engines": {
        "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/express/node_modules/debug": {
@@ -5091,9 +5095,10 @@
      }
    },
    "node_modules/hotkeys-js": {
-      "version": "3.13.7",
-      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.7.tgz",
-      "integrity": "sha512-ygFIdTqqwG4fFP7kkiYlvayZppeIQX2aPpirsngkv1xM1lP0piDY5QEh68nQnIKvz64hfocxhBaD/uK3sSK1yQ==",
+      "version": "3.13.9",
+      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.9.tgz",
+      "integrity": "sha512-3TRCj9u9KUH6cKo25w4KIdBfdBfNRjfUwrljCLDC2XhmPDG0SjAZFcFZekpUZFmXzfYoGhFDcdx2gX/vUVtztQ==",
+      "license": "MIT",
      "funding": {
        "url": "https://jaywcjlove.github.io/#/sponsor"
      }
@@ -6685,9 +6690,10 @@
      }
    },
    "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "license": "MIT"
    },
    "node_modules/path-type": {
      "version": "4.0.0",
--- a/package.json
+++ b/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": {
@@ -43,11 +43,11 @@
    "@electron/remote": "^2.1.2",
    "@types/swagger-jsdoc": "^6.0.4",
    "@xhayper/discord-rpc": "^1.2.0",
-    "axios": "^1.7.7",
+    "axios": "^1.7.9",
    "cors": "^2.8.5",
    "electron-store": "^8.2.0",
-    "express": "^4.21.1",
-    "hotkeys-js": "^3.13.7",
+    "express": "^4.21.2",
+    "hotkeys-js": "^3.13.9",
    "mpris-service": "^2.1.2",
    "request": "^2.88.2",
    "sass": "^1.79.4",
--- a/scripts/verifyElements.js
+++ b/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)',
-    playingFrom: '*[class^="playingFrom"] span:nth-child(2)',
+    album_header_title: '*[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"]',
--- a/src/features/api/swagger.json
+++ b/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",
--- a/src/pages/settings/settings.html
+++ b/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/"
--- a/src/preload.ts
+++ b/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)',
-  playing_from: '*[class^="playingFrom"] span:nth-child(2)',
+  album_header_title: '*[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(),
--- a/src/scripts/discord.ts
+++ b/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.floor(date.getTime() / 1000);
+      const now = Math.trunc((Date.now() + 500) / 1000);
      presence.startTimestamp = now - currentSeconds;
      presence.endTimestamp = presence.startTimestamp + durationSeconds;
    }
Author	SHA1	Message	Date
Rick van Lieshout	35ed4807e3	Merge pull request #558 from Mastermindzh/next Next	2025-03-18 09:10:40 +01:00
Rick van Lieshout	deff9524a8	album & playingfrom info added to mediaInfo again. fixes #548	2025-03-17 11:05:10 +01:00
Rick van Lieshout	34c7777eeb	Merge pull request #554 from Dianoga/duration-fix fix duration selector	2025-03-17 10:27:42 +01:00
Rick van Lieshout	048e949f30	Merge branch 'master' of github.com:Mastermindzh/tidal-hifi into next	2025-03-17 09:54:06 +01:00
Brian Steere	4a976bc58c	fix duration selector Should fix the MPRIS issue as long as duration doesn't break again.	2025-03-12 14:21:13 -05:00
Rick van Lieshout	ff4c51234b	Merge pull request #524 from Mastermindzh/snyk-upgrade-278f4ec84db5f4ebc26d987909c6c73f [Snyk] Upgrade hotkeys-js from 3.13.7 to 3.13.9	2025-01-06 17:48:43 +01:00
snyk-bot	c4ee6b51b9	fix: upgrade hotkeys-js from 3.13.7 to 3.13.9 Snyk has created this PR to upgrade hotkeys-js from 3.13.7 to 3.13.9. See this package in npm: hotkeys-js See this project in Snyk: https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr	2025-01-04 01:22:24 +00:00
Rick van Lieshout	45fe336598	Merge pull request #522 from Mastermindzh/snyk-upgrade-7f82ddec0efc65c72c6f7f2f182ace7c [Snyk] Upgrade axios from 1.7.8 to 1.7.9	2024-12-28 12:45:52 +01:00
snyk-bot	fe9f50aaf5	fix: upgrade axios from 1.7.8 to 1.7.9 Snyk has created this PR to upgrade axios from 1.7.8 to 1.7.9. See this package in npm: axios See this project in Snyk: https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr	2024-12-27 23:17:27 +00:00
Rick van Lieshout	aaf7a1b662	Merge pull request #504 from darkiox/master Fix Discord RPC Timestamp jitter	2024-12-09 11:21:27 +01:00
Rick van Lieshout	755be0ee30	Merge pull request #515 from Mastermindzh/snyk-fix-82857ea1745fc2cfbc5f06a87a8ff0b8 [Snyk] Security upgrade express from 4.21.1 to 4.21.2	2024-12-09 11:05:23 +01:00
snyk-bot	9d736b2bd9	fix: package.json & package-lock.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-PATHTOREGEXP-8482416	2024-12-06 20:33:54 +00:00
Rick van Lieshout	f4d4b1a1df	Merge pull request #508 from Mastermindzh/snyk-fix-a6630fbdb3c8f0161d0b939cf0ec3ca3 [Snyk] Security upgrade axios from 1.7.7 to 1.7.8	2024-12-02 09:03:11 +01:00
snyk-bot	0c27c815f5	fix: package.json & package-lock.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-AXIOS-6671926	2024-11-30 06:57:38 +00:00
Darkiox	a3aa45a96b	fix: discord rpc timestamp jitter	2024-11-25 19:15:26 -03:00