mirror of
https://github.com/Mastermindzh/tidal-hifi.git
synced 2025-09-17 17:19:06 +02:00
Compare commits
15 Commits
d3e126d86b
...
5.18.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 35ed4807e3 | |||
| deff9524a8 | |||
| 34c7777eeb | |||
| 048e949f30 | |||
|
4a976bc58c | ||
| ff4c51234b | |||
|
c4ee6b51b9 | ||
| 45fe336598 | |||
|
|
fe9f50aaf5 | ||
| aaf7a1b662 | |||
| 755be0ee30 | |||
|
|
9d736b2bd9 | ||
| f4d4b1a1df | |||
|
|
0c27c815f5 | ||
|
a3aa45a96b |
@@ -1,10 +1,16 @@
|
||||
{
|
||||
"plugins": ["stylelint-prettier"],
|
||||
"extends": ["stylelint-config-standard-scss"],
|
||||
"ignoreFiles": ["src/themes/**.scss"],
|
||||
"plugins": [
|
||||
"stylelint-prettier"
|
||||
],
|
||||
"extends": [
|
||||
"stylelint-config-standard-scss"
|
||||
],
|
||||
"ignoreFiles": [
|
||||
"src/themes/**.scss"
|
||||
],
|
||||
"rules": {
|
||||
"prettier/prettier": true,
|
||||
"scss/at-extend-no-missing-placeholder": null,
|
||||
"no-descending-specificity": null
|
||||
}
|
||||
}
|
||||
}
|
||||
13
CHANGELOG.md
13
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)
|
||||
@@ -21,7 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
- Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)
|
||||
- Updated most dependency versions
|
||||
|
||||
- This includes Electron 31!
|
||||
|
||||
- Added a channel selector so we can now use Tidal's staging environment directly from the app
|
||||
@@ -113,12 +118,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
- Updated Electron to 28.1.1 (fixes [325](https://github.com/Mastermindzh/tidal-hifi/issues/325))
|
||||
- Updated dependencies to latest
|
||||
|
||||
- added theme files to stylelint ignore
|
||||
- fixed other stylelint errors
|
||||
|
||||
- Added functionality to favorite a song (fixes [#323](https://github.com/Mastermindzh/tidal-hifi/issues/323))
|
||||
|
||||
- Added a hotkey to favorite ("Add to collection") songs: Control+a
|
||||
- Added the "favorite" field in the `mediaInfo` and the API `/current` endpoint
|
||||
- Added an endpoint to toggle favoriting a song: `http://localhost:47836/favorite/toggle`
|
||||
@@ -139,10 +142,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Added settings to customize the Discord rich presence information
|
||||
- Discord settings are now also collapsible like the ListenBrainz ones are
|
||||
- Restyled settings menu to include version number and useful links on the about page
|
||||
|
||||
|
||||
- The ListenBrainz integration has been extended with a configurable (5 seconds by default) delay in song reporting so that it doesn't spam the API when you are cycling through songs.
|
||||
- Custom CSS now also applies to settings window
|
||||
|
||||
|
||||
|
||||
## [5.6.0]
|
||||
|
||||
|
||||
@@ -8,3 +8,4 @@ Only the very latest 😄.
|
||||
|
||||
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).
|
||||
|
||||
|
||||
48
package-lock.json
generated
48
package-lock.json
generated
@@ -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"
|
||||
}
|
||||
@@ -6015,9 +6020,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/micromatch": {
|
||||
"version": "4.0.8",
|
||||
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
|
||||
"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
|
||||
"version": "4.0.7",
|
||||
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
|
||||
"integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -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",
|
||||
|
||||
@@ -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": {
|
||||
@@ -23,7 +23,6 @@
|
||||
"build-mac": "npm run builder -- -c ./build/electron-builder.yml -m",
|
||||
"build-base": "npm run builder -- -c ./build/electron-builder.base.yml",
|
||||
"prebuilder": "npm run compile",
|
||||
"prettier": "prettier . --write",
|
||||
"builder": "electron-builder --publish=never",
|
||||
"sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css && sass --no-source-map src/themes:themes",
|
||||
"style-lint": "npx stylelint **/*.scss",
|
||||
@@ -44,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",
|
||||
|
||||
@@ -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"]',
|
||||
|
||||
@@ -1,295 +0,0 @@
|
||||
import { MediaStatus } from "../models/mediaStatus";
|
||||
import { RepeatState } from "../models/repeatState";
|
||||
import { TidalController } from "./TidalController";
|
||||
|
||||
export class DomTidalController implements TidalController {
|
||||
private currentPlayStatus = MediaStatus.paused;
|
||||
|
||||
/**
|
||||
* Convert the duration from MM:SS to seconds
|
||||
* @param {*} duration
|
||||
*/
|
||||
private convertDuration(duration: string) {
|
||||
const parts = duration.split(":");
|
||||
return parseInt(parts[1]) + 60 * parseInt(parts[0]);
|
||||
}
|
||||
|
||||
private readonly 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"]',
|
||||
settings: '*[data-test^="sidebar-menu-button"]',
|
||||
openSettings: '*[data-test^="open-settings"]',
|
||||
media: '*[data-test="current-media-imagery"]',
|
||||
image: "img",
|
||||
current: '*[data-test="current-time"]',
|
||||
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)',
|
||||
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"]',
|
||||
volume: '*[data-test="volume"]',
|
||||
favorite: '*[data-test="footer-favorite-button"]',
|
||||
/**
|
||||
* Get an element from the dom
|
||||
* @param {*} key key in elements object to fetch
|
||||
*/
|
||||
get: function (key: string) {
|
||||
return globalThis.document.querySelector(this[key.toLowerCase()]);
|
||||
},
|
||||
|
||||
/**
|
||||
* Get the icon of the current media
|
||||
*/
|
||||
getSongIcon: function () {
|
||||
const figure = this.get("media");
|
||||
|
||||
if (figure) {
|
||||
const mediaElement = figure.querySelector(this["image"]);
|
||||
if (mediaElement) {
|
||||
return mediaElement.src.replace("80x80", "640x640");
|
||||
}
|
||||
}
|
||||
|
||||
return "";
|
||||
},
|
||||
|
||||
/**
|
||||
* returns an array of all artists in the current media
|
||||
* @returns {Array} artists
|
||||
*/
|
||||
getArtistsArray: function () {
|
||||
const footer = this.get("footer");
|
||||
|
||||
if (footer) {
|
||||
const artists = footer.querySelectorAll(this.artists);
|
||||
if (artists)
|
||||
return Array.from(artists).map((artist) => (artist as HTMLElement).textContent);
|
||||
}
|
||||
return [];
|
||||
},
|
||||
|
||||
/**
|
||||
* unify the artists array into a string separated by commas
|
||||
* @param {Array} artistsArray
|
||||
* @returns {String} artists
|
||||
*/
|
||||
getArtistsString: function (artistsArray: string[]) {
|
||||
if (artistsArray.length > 0) return artistsArray.join(", ");
|
||||
return "unknown artist(s)";
|
||||
},
|
||||
|
||||
getAlbumName: function () {
|
||||
//If listening to an album, get its name from the header title
|
||||
if (globalThis.location.href.includes("/album/")) {
|
||||
const albumName = globalThis.document.querySelector(this.album_header_title);
|
||||
if (albumName) {
|
||||
return albumName.textContent;
|
||||
}
|
||||
//If listening to a playlist or a mix, get album name from the list
|
||||
} else if (
|
||||
globalThis.location.href.includes("/playlist/") ||
|
||||
globalThis.location.href.includes("/mix/")
|
||||
) {
|
||||
if (this.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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// see whether we're on the queue page and get it from there
|
||||
const queueAlbumName = this.getText("queue_album");
|
||||
if (queueAlbumName) {
|
||||
return queueAlbumName;
|
||||
}
|
||||
|
||||
return "";
|
||||
},
|
||||
|
||||
isMuted: function () {
|
||||
return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
|
||||
},
|
||||
|
||||
isFavorite: function () {
|
||||
return this.get("favorite").getAttribute("aria-checked") === "true";
|
||||
},
|
||||
|
||||
/**
|
||||
* Shorthand function to get the text of a dom element
|
||||
* @param {*} key key in elements object to fetch
|
||||
*/
|
||||
getText: function (key: string) {
|
||||
const element = this.get(key);
|
||||
return element ? element.textContent : "";
|
||||
},
|
||||
|
||||
/**
|
||||
* Shorthand function to click a dom element
|
||||
* @param {*} key key in elements object to fetch
|
||||
*/
|
||||
click: function (key: string) {
|
||||
this.get(key).click();
|
||||
return this;
|
||||
},
|
||||
|
||||
/**
|
||||
* Shorthand function to focus a dom element
|
||||
* @param {*} key key in elements object to fetch
|
||||
*/
|
||||
focus: function (key: string) {
|
||||
return this.get(key).focus();
|
||||
},
|
||||
};
|
||||
|
||||
playPause = (): void => {
|
||||
const play = this.elements.get("play");
|
||||
|
||||
if (play) {
|
||||
this.elements.click("play");
|
||||
} else {
|
||||
this.elements.click("pause");
|
||||
}
|
||||
};
|
||||
|
||||
goToHome(): void {
|
||||
this.elements.click("home");
|
||||
}
|
||||
|
||||
openSettings(): void {
|
||||
this.elements.click("settings");
|
||||
setTimeout(() => {
|
||||
this.elements.click("openSettings");
|
||||
}, 100);
|
||||
}
|
||||
|
||||
toggleFavorite(): void {
|
||||
this.elements.click("favorite");
|
||||
}
|
||||
|
||||
back(): void {
|
||||
this.elements.click("back");
|
||||
}
|
||||
forward(): void {
|
||||
this.elements.click("forward");
|
||||
}
|
||||
repeat(): void {
|
||||
this.elements.click("repeat");
|
||||
}
|
||||
|
||||
next(): void {
|
||||
this.elements.click("next");
|
||||
}
|
||||
previous(): void {
|
||||
this.elements.click("previous");
|
||||
}
|
||||
toggleShuffle(): void {
|
||||
this.elements.click("shuffle");
|
||||
}
|
||||
getCurrentlyPlayingStatus() {
|
||||
const pause = this.elements.get("pause");
|
||||
|
||||
// if pause button is visible tidal is playing
|
||||
if (pause) {
|
||||
return MediaStatus.playing;
|
||||
} else {
|
||||
return MediaStatus.paused;
|
||||
}
|
||||
}
|
||||
|
||||
getCurrentShuffleState() {
|
||||
const shuffle = this.elements.get("shuffle");
|
||||
return shuffle?.getAttribute("aria-checked") === "true";
|
||||
}
|
||||
|
||||
getCurrentRepeatState() {
|
||||
const repeat = this.elements.get("repeat");
|
||||
switch (repeat?.getAttribute("data-type")) {
|
||||
case "button__repeatAll":
|
||||
return RepeatState.all;
|
||||
case "button__repeatSingle":
|
||||
return RepeatState.single;
|
||||
default:
|
||||
return RepeatState.off;
|
||||
}
|
||||
}
|
||||
|
||||
play(): void {
|
||||
this.playPause();
|
||||
}
|
||||
pause(): void {
|
||||
this.playPause();
|
||||
}
|
||||
stop(): void {
|
||||
this.playPause();
|
||||
}
|
||||
|
||||
getCurrentPosition() {
|
||||
return this.elements.getText("current");
|
||||
}
|
||||
getCurrentPositionInSeconds(): number {
|
||||
return this.convertDuration(this.getCurrentPosition()) * 1000 * 1000;
|
||||
}
|
||||
|
||||
getTrackId(): string {
|
||||
const URLelement = this.elements.get("title").querySelector("a");
|
||||
if (URLelement !== null) {
|
||||
const id = URLelement.href.replace(/\D/g, "");
|
||||
return id;
|
||||
}
|
||||
|
||||
return window.location.toString();
|
||||
}
|
||||
|
||||
getCurrentTime(): string {
|
||||
return this.elements.getText("current");
|
||||
}
|
||||
getDuration(): string {
|
||||
return this.elements.getText("duration");
|
||||
}
|
||||
|
||||
getAlbumName(): string {
|
||||
return this.elements.getAlbumName();
|
||||
}
|
||||
getTitle(): string {
|
||||
return this.elements.getText("title");
|
||||
}
|
||||
getArtists(): string[] {
|
||||
return this.elements.getArtistsArray();
|
||||
}
|
||||
|
||||
getArtistsString(): string {
|
||||
return this.elements.getArtistsString(this.getArtists());
|
||||
}
|
||||
getPlayingFrom(): string {
|
||||
return this.elements.getText("playing_from");
|
||||
}
|
||||
|
||||
isFavorite(): boolean {
|
||||
return this.elements.isFavorite();
|
||||
}
|
||||
getSongIcon(): string {
|
||||
return this.elements.getSongIcon();
|
||||
}
|
||||
setPlayStatus(status: MediaStatus): void {
|
||||
this.currentPlayStatus = status;
|
||||
}
|
||||
}
|
||||
@@ -1,133 +0,0 @@
|
||||
import { MediaStatus } from "../models/mediaStatus";
|
||||
import { RepeatState } from "../models/repeatState";
|
||||
import { DomTidalController } from "./DomTidalController";
|
||||
import { TidalController } from "./TidalController";
|
||||
|
||||
export class MediaSessionTidalController implements TidalController {
|
||||
public domMediaController: TidalController;
|
||||
|
||||
constructor() {
|
||||
this.domMediaController = new DomTidalController();
|
||||
}
|
||||
// example of using the original domMediaController as a fallback
|
||||
goToHome(): void {
|
||||
this.domMediaController.goToHome();
|
||||
}
|
||||
|
||||
setPlayStatus(status: MediaStatus): void {
|
||||
globalThis.alert("Method not implemented: " + status);
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getDuration(): string {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getAlbumName(): string {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getTitle(): string {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getArtists(): string[] {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getArtistsString(): string {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getPlayingFrom(): string {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
isFavorite(): boolean {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getSongIcon(): string {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getCurrentTime(): string {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getCurrentPosition(): string {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getCurrentPositionInSeconds(): number {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getTrackId(): string {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
play(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
pause(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
stop(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getCurrentShuffleState(): boolean {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getCurrentRepeatState(): RepeatState {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
getCurrentlyPlayingStatus(): MediaStatus {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
back(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
forward(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
repeat(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
next(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
previous(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
toggleShuffle(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
openSettings(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
toggleFavorite(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
playPause(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
hookup(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
import { MediaStatus } from "../models/mediaStatus";
|
||||
import { RepeatState } from "../models/repeatState";
|
||||
|
||||
export interface TidalController {
|
||||
goToHome(): void;
|
||||
openSettings(): void;
|
||||
|
||||
/**
|
||||
* Play or pause the current media
|
||||
*/
|
||||
playPause(): void;
|
||||
play(): void;
|
||||
pause(): void;
|
||||
stop(): void;
|
||||
toggleFavorite(): void;
|
||||
back(): void;
|
||||
forward(): void;
|
||||
repeat(): void;
|
||||
next(): void;
|
||||
previous(): void;
|
||||
toggleShuffle(): void;
|
||||
|
||||
/**
|
||||
* Update the current status of tidal (e.g playing or paused)
|
||||
*/
|
||||
getCurrentlyPlayingStatus(): MediaStatus;
|
||||
getCurrentShuffleState(): boolean;
|
||||
getCurrentRepeatState(): RepeatState;
|
||||
getCurrentPosition(): string;
|
||||
getCurrentPositionInSeconds(): number;
|
||||
getTrackId(): string;
|
||||
getCurrentTime(): string;
|
||||
getDuration(): string;
|
||||
getAlbumName(): string;
|
||||
getTitle(): string;
|
||||
getArtists(): string[];
|
||||
getArtistsString(): string;
|
||||
getPlayingFrom(): string;
|
||||
getSongIcon(): string;
|
||||
|
||||
isFavorite(): boolean;
|
||||
// add an observable to react on instead of a hookup function
|
||||
// onMediaChange(): any;
|
||||
|
||||
// this can probably be removed after ^
|
||||
setPlayStatus(status: MediaStatus): void;
|
||||
}
|
||||
@@ -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",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
307
src/preload.ts
307
src/preload.ts
@@ -21,13 +21,11 @@ import { addHotkey } from "./scripts/hotkeys";
|
||||
import { ObjectToDotNotation } from "./scripts/objectUtilities";
|
||||
import { settingsStore } from "./scripts/settings";
|
||||
import { setTitle } from "./scripts/window-functions";
|
||||
import { DomTidalController } from "./TidalControllers/DomTidalController";
|
||||
import { MediaSessionTidalController } from "./TidalControllers/MediaSessionTidalController";
|
||||
import { TidalController } from "./TidalControllers/TidalController";
|
||||
|
||||
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
|
||||
let currentSong = "";
|
||||
let player: Player;
|
||||
let currentPlayStatus = MediaStatus.paused;
|
||||
let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
|
||||
let scrobbleWaitingForDelay = false;
|
||||
|
||||
@@ -37,15 +35,150 @@ let currentShuffleState = false;
|
||||
let currentMediaInfo: MediaInfo;
|
||||
let currentNotification: Electron.Notification;
|
||||
|
||||
let tidalController: TidalController;
|
||||
const 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"]',
|
||||
settings: '*[data-test^="sidebar-menu-button"]',
|
||||
openSettings: '*[data-test^="open-settings"]',
|
||||
media: '*[data-test="current-media-imagery"]',
|
||||
image: "img",
|
||||
current: '*[data-test="current-time"]',
|
||||
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)',
|
||||
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"]',
|
||||
volume: '*[data-test="volume"]',
|
||||
favorite: '*[data-test="footer-favorite-button"]',
|
||||
/**
|
||||
* Get an element from the dom
|
||||
* @param {*} key key in elements object to fetch
|
||||
*/
|
||||
get: function (key: string) {
|
||||
return window.document.querySelector(this[key.toLowerCase()]);
|
||||
},
|
||||
|
||||
// TODO: replace with setting
|
||||
// eslint-disable-next-line no-constant-condition
|
||||
if (true) {
|
||||
tidalController = new DomTidalController();
|
||||
} else {
|
||||
tidalController = new MediaSessionTidalController();
|
||||
}
|
||||
/**
|
||||
* Get the icon of the current media
|
||||
*/
|
||||
getSongIcon: function () {
|
||||
const figure = this.get("media");
|
||||
|
||||
if (figure) {
|
||||
const mediaElement = figure.querySelector(this["image"]);
|
||||
if (mediaElement) {
|
||||
return mediaElement.src.replace("80x80", "640x640");
|
||||
}
|
||||
}
|
||||
|
||||
return "";
|
||||
},
|
||||
|
||||
/**
|
||||
* returns an array of all artists in the current media
|
||||
* @returns {Array} artists
|
||||
*/
|
||||
getArtistsArray: function () {
|
||||
const footer = this.get("footer");
|
||||
|
||||
if (footer) {
|
||||
const artists = footer.querySelectorAll(this.artists);
|
||||
if (artists) return Array.from(artists).map((artist) => (artist as HTMLElement).textContent);
|
||||
}
|
||||
return [];
|
||||
},
|
||||
|
||||
/**
|
||||
* unify the artists array into a string separated by commas
|
||||
* @param {Array} artistsArray
|
||||
* @returns {String} artists
|
||||
*/
|
||||
getArtistsString: function (artistsArray: string[]) {
|
||||
if (artistsArray.length > 0) return artistsArray.join(", ");
|
||||
return "unknown artist(s)";
|
||||
},
|
||||
|
||||
getAlbumName: function () {
|
||||
//If listening to an album, get its name from the header title
|
||||
if (window.location.href.includes("/album/")) {
|
||||
const albumName = window.document.querySelector(this.album_header_title);
|
||||
if (albumName) {
|
||||
return albumName.textContent;
|
||||
}
|
||||
//If listening to a playlist or a mix, get album name from the list
|
||||
} else if (
|
||||
window.location.href.includes("/playlist/") ||
|
||||
window.location.href.includes("/mix/")
|
||||
) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// see whether we're on the queue page and get it from there
|
||||
const queueAlbumName = elements.getText("queue_album");
|
||||
if (queueAlbumName) {
|
||||
return queueAlbumName;
|
||||
}
|
||||
|
||||
return "";
|
||||
},
|
||||
|
||||
isMuted: function () {
|
||||
return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
|
||||
},
|
||||
|
||||
isFavorite: function () {
|
||||
return this.get("favorite").getAttribute("aria-checked") === "true";
|
||||
},
|
||||
|
||||
/**
|
||||
* Shorthand function to get the text of a dom element
|
||||
* @param {*} key key in elements object to fetch
|
||||
*/
|
||||
getText: function (key: string) {
|
||||
const element = this.get(key);
|
||||
return element ? element.textContent : "";
|
||||
},
|
||||
|
||||
/**
|
||||
* Shorthand function to click a dom element
|
||||
* @param {*} key key in elements object to fetch
|
||||
*/
|
||||
click: function (key: string) {
|
||||
this.get(key).click();
|
||||
return this;
|
||||
},
|
||||
|
||||
/**
|
||||
* Shorthand function to focus a dom element
|
||||
* @param {*} key key in elements object to fetch
|
||||
*/
|
||||
focus: function (key: string) {
|
||||
return this.get(key).focus();
|
||||
},
|
||||
};
|
||||
|
||||
/**
|
||||
* Get the update frequency from the store
|
||||
@@ -62,6 +195,19 @@ function getUpdateFrequency() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Play or pause the current media
|
||||
*/
|
||||
function playPause() {
|
||||
const play = elements.get("play");
|
||||
|
||||
if (play) {
|
||||
elements.click("play");
|
||||
} else {
|
||||
elements.click("pause");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clears the old listenbrainz data on launch
|
||||
*/
|
||||
@@ -74,26 +220,30 @@ ListenBrainzStore.clear();
|
||||
*/
|
||||
function addHotKeys() {
|
||||
if (settingsStore.get(settings.enableCustomHotkeys)) {
|
||||
addHotkey("Control+p", () => {
|
||||
tidalController.openSettings();
|
||||
addHotkey("Control+p", function () {
|
||||
elements.click("settings");
|
||||
setTimeout(() => {
|
||||
elements.click("openSettings");
|
||||
}, 100);
|
||||
});
|
||||
addHotkey("Control+l", () => {
|
||||
addHotkey("Control+l", function () {
|
||||
handleLogout();
|
||||
});
|
||||
addHotkey("Control+a", () => {
|
||||
tidalController.toggleFavorite();
|
||||
|
||||
addHotkey("Control+a", function () {
|
||||
elements.click("favorite");
|
||||
});
|
||||
|
||||
addHotkey("Control+h", () => {
|
||||
tidalController.goToHome();
|
||||
addHotkey("Control+h", function () {
|
||||
elements.click("home");
|
||||
});
|
||||
|
||||
addHotkey("backspace", function () {
|
||||
tidalController.back();
|
||||
elements.click("back");
|
||||
});
|
||||
|
||||
addHotkey("shift+backspace", function () {
|
||||
tidalController.forward();
|
||||
elements.click("forward");
|
||||
});
|
||||
|
||||
addHotkey("control+u", function () {
|
||||
@@ -102,7 +252,7 @@ function addHotKeys() {
|
||||
});
|
||||
|
||||
addHotkey("control+r", function () {
|
||||
tidalController.repeat();
|
||||
elements.click("repeat");
|
||||
});
|
||||
addHotkey("control+w", async function () {
|
||||
const url = SharingService.getUniversalLink(getTrackURL());
|
||||
@@ -169,22 +319,22 @@ function addIPCEventListeners() {
|
||||
case globalEvents.playPause:
|
||||
case globalEvents.play:
|
||||
case globalEvents.pause:
|
||||
tidalController.playPause();
|
||||
playPause();
|
||||
break;
|
||||
case globalEvents.next:
|
||||
tidalController.next();
|
||||
elements.click("next");
|
||||
break;
|
||||
case globalEvents.previous:
|
||||
tidalController.previous();
|
||||
elements.click("previous");
|
||||
break;
|
||||
case globalEvents.toggleFavorite:
|
||||
tidalController.toggleFavorite();
|
||||
elements.click("favorite");
|
||||
break;
|
||||
case globalEvents.toggleShuffle:
|
||||
tidalController.toggleShuffle();
|
||||
elements.click("shuffle");
|
||||
break;
|
||||
case globalEvents.toggleRepeat:
|
||||
tidalController.repeat();
|
||||
elements.click("repeat");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -193,6 +343,39 @@ function addIPCEventListeners() {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the current status of tidal (e.g playing or paused)
|
||||
*/
|
||||
function getCurrentlyPlayingStatus() {
|
||||
const pause = elements.get("pause");
|
||||
let status = undefined;
|
||||
|
||||
// if pause button is visible tidal is playing
|
||||
if (pause) {
|
||||
status = MediaStatus.playing;
|
||||
} else {
|
||||
status = MediaStatus.paused;
|
||||
}
|
||||
return status;
|
||||
}
|
||||
|
||||
function getCurrentShuffleState() {
|
||||
const shuffle = elements.get("shuffle");
|
||||
return shuffle?.getAttribute("aria-checked") === "true";
|
||||
}
|
||||
|
||||
function getCurrentRepeatState() {
|
||||
const repeat = elements.get("repeat");
|
||||
switch (repeat?.getAttribute("data-type")) {
|
||||
case "button__repeatAll":
|
||||
return RepeatState.all;
|
||||
case "button__repeatSingle":
|
||||
return RepeatState.single;
|
||||
default:
|
||||
return RepeatState.off;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert the duration from MM:SS to seconds
|
||||
* @param {*} duration
|
||||
@@ -272,35 +455,16 @@ function addMPRIS() {
|
||||
const eventValue = events[eventName];
|
||||
switch (events[eventValue]) {
|
||||
case events.playpause:
|
||||
tidalController.playPause();
|
||||
break;
|
||||
case events.next:
|
||||
tidalController.next();
|
||||
break;
|
||||
case events.previous:
|
||||
tidalController.previous();
|
||||
break;
|
||||
case events.pause:
|
||||
tidalController.pause();
|
||||
break;
|
||||
case events.stop:
|
||||
tidalController.stop();
|
||||
break;
|
||||
case events.play:
|
||||
tidalController.play();
|
||||
break;
|
||||
case events.loopStatus:
|
||||
tidalController.repeat();
|
||||
break;
|
||||
case events.shuffle:
|
||||
tidalController.toggleShuffle();
|
||||
playPause();
|
||||
break;
|
||||
default:
|
||||
elements.click(eventValue);
|
||||
}
|
||||
});
|
||||
});
|
||||
// Override get position function
|
||||
player.getPosition = function () {
|
||||
return tidalController.getCurrentPositionInSeconds();
|
||||
return convertDuration(elements.getText("current")) * 1000 * 1000;
|
||||
};
|
||||
player.on("quit", function () {
|
||||
app.quit();
|
||||
@@ -319,9 +483,10 @@ 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/" + tidalController.getTrackId(),
|
||||
"mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
|
||||
},
|
||||
...ObjectToDotNotation(mediaInfo, "custom:"),
|
||||
};
|
||||
@@ -364,24 +529,34 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
|
||||
* If it's a song it returns the track URL, if not it will return undefined
|
||||
*/
|
||||
function getTrackURL() {
|
||||
const id = tidalController.getTrackId();
|
||||
const id = getTrackID();
|
||||
return `https://tidal.com/browse/track/${id}`;
|
||||
}
|
||||
|
||||
function getTrackID() {
|
||||
const URLelement = elements.get("title").querySelector("a");
|
||||
if (URLelement !== null) {
|
||||
const id = URLelement.href.replace(/\D/g, "");
|
||||
return id;
|
||||
}
|
||||
|
||||
return window.location;
|
||||
}
|
||||
|
||||
/**
|
||||
* Watch for song changes and update title + notify
|
||||
*/
|
||||
setInterval(function () {
|
||||
const title = tidalController.getTitle();
|
||||
const artistsArray = tidalController.getArtists();
|
||||
const artistsString = tidalController.getArtistsString();
|
||||
const title = elements.getText("title");
|
||||
const artistsArray = elements.getArtistsArray();
|
||||
const artistsString = elements.getArtistsString(artistsArray);
|
||||
const songDashArtistTitle = `${title} - ${artistsString}`;
|
||||
const staticTitle = "TIDAL Hi-Fi";
|
||||
const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
|
||||
const current = tidalController.getCurrentTime();
|
||||
const currentStatus = tidalController.getCurrentlyPlayingStatus();
|
||||
const shuffleState = tidalController.getCurrentShuffleState();
|
||||
const repeatState = tidalController.getCurrentRepeatState();
|
||||
const current = elements.getText("current");
|
||||
const currentStatus = getCurrentlyPlayingStatus();
|
||||
const shuffleState = getCurrentShuffleState();
|
||||
const repeatState = getCurrentRepeatState();
|
||||
|
||||
const playStateChanged = currentStatus != currentlyPlaying;
|
||||
const shuffleStateChanged = shuffleState != currentShuffleState;
|
||||
@@ -396,13 +571,13 @@ setInterval(function () {
|
||||
if (repeatStateChanged) currentRepeatState = repeatState;
|
||||
|
||||
skipArtistsIfFoundInSkippedArtistsList(artistsArray);
|
||||
const album = tidalController.getAlbumName();
|
||||
const duration = tidalController.getDuration();
|
||||
const album = elements.getAlbumName();
|
||||
const duration = elements.getText("duration");
|
||||
const options: MediaInfo = {
|
||||
title,
|
||||
artists: artistsString,
|
||||
album: album,
|
||||
playingFrom: tidalController.getPlayingFrom(),
|
||||
playingFrom: elements.getText("playing_from"),
|
||||
status: currentStatus,
|
||||
url: getTrackURL(),
|
||||
current,
|
||||
@@ -411,7 +586,7 @@ setInterval(function () {
|
||||
durationInSeconds: convertDurationToSeconds(duration),
|
||||
image: "",
|
||||
icon: "",
|
||||
favorite: tidalController.isFavorite(),
|
||||
favorite: elements.isFavorite(),
|
||||
|
||||
player: {
|
||||
status: currentStatus,
|
||||
@@ -426,9 +601,9 @@ setInterval(function () {
|
||||
: setTitle(songDashArtistTitle);
|
||||
getTrackURL();
|
||||
currentSong = songDashArtistTitle;
|
||||
tidalController.setPlayStatus(currentStatus);
|
||||
currentPlayStatus = currentStatus;
|
||||
|
||||
const image = tidalController.getSongIcon();
|
||||
const image = elements.getSongIcon();
|
||||
|
||||
new Promise<void>((resolve) => {
|
||||
if (image.startsWith("http")) {
|
||||
@@ -470,7 +645,7 @@ setInterval(function () {
|
||||
const artistNames = Object.values(artists).map((artist) => artist);
|
||||
const foundArtist = artistNames.some((artist) => artistsToSkip.includes(artist));
|
||||
if (foundArtist) {
|
||||
tidalController.next();
|
||||
elements.click("next");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ const defaultPresence = {
|
||||
largeImageKey: "tidal-hifi-icon",
|
||||
largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
|
||||
instance: false,
|
||||
type: ACTIVITY_LISTENING,
|
||||
type: ACTIVITY_LISTENING
|
||||
};
|
||||
|
||||
const updateActivity = () => {
|
||||
@@ -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;
|
||||
}
|
||||
@@ -118,17 +117,15 @@ const getActivity = (): SetActivity => {
|
||||
const connectWithRetry = async (retryCount = 0) => {
|
||||
try {
|
||||
await rpc.login();
|
||||
Logger.log("Connected to Discord");
|
||||
Logger.log('Connected to Discord');
|
||||
rpc.on("ready", updateActivity);
|
||||
Object.values(globalEvents).forEach((event) => ipcMain.on(event, observer));
|
||||
Object.values(globalEvents).forEach(event => ipcMain.on(event, observer));
|
||||
} catch (error) {
|
||||
if (retryCount < MAX_RETRIES) {
|
||||
Logger.log(
|
||||
`Failed to connect to Discord, retrying in ${RETRY_DELAY / 1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`
|
||||
);
|
||||
Logger.log(`Failed to connect to Discord, retrying in ${RETRY_DELAY/1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`);
|
||||
setTimeout(() => connectWithRetry(retryCount + 1), RETRY_DELAY);
|
||||
} else {
|
||||
Logger.log("Failed to connect to Discord after maximum retry attempts");
|
||||
Logger.log('Failed to connect to Discord after maximum retry attempts');
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -137,7 +134,7 @@ const connectWithRetry = async (retryCount = 0) => {
|
||||
* Set up the discord rpc and listen on globalEvents.updateInfo
|
||||
*/
|
||||
export const initRPC = () => {
|
||||
rpc = new Client({ transport: { type: "ipc" }, clientId });
|
||||
rpc = new Client({ transport: {type: "ipc"}, clientId });
|
||||
connectWithRetry();
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user