mirror of
https://github.com/Mastermindzh/tidal-hifi.git
synced 2025-04-21 04:28:08 +02:00
Compare commits
66 Commits
Author | SHA1 | Date | |
---|---|---|---|
7f8760c4e9 | |||
|
1cf5a01ad7 | ||
8fc49f500e | |||
|
49f5a01b58 | ||
48f4fe47ef | |||
a819e1eb45 | |||
57e6342b5f | |||
58a543a3c8 | |||
1c915d99fe | |||
|
8994360415 | ||
a5c0d9e6e8 | |||
f8eb36f4c7 | |||
5ca90c25d3 | |||
cf86969cfc | |||
afd05ae88b | |||
72c25dfdc1 | |||
|
25b30edf31 | ||
35ed4807e3 | |||
deff9524a8 | |||
34c7777eeb | |||
048e949f30 | |||
|
4a976bc58c | ||
ff4c51234b | |||
|
c4ee6b51b9 | ||
45fe336598 | |||
|
fe9f50aaf5 | ||
aaf7a1b662 | |||
755be0ee30 | |||
|
9d736b2bd9 | ||
f4d4b1a1df | |||
|
0c27c815f5 | ||
|
a3aa45a96b | ||
ae699887b2 | |||
a8c635932f | |||
66d0d004bf | |||
d1e0321058 | |||
2ab5a556ab | |||
baf719fc60 | |||
15c8f6a418 | |||
f73521e2e5 | |||
|
0f5e00c4df | ||
|
974877ea4f | ||
|
6be5774001 | ||
|
f96cf2e8da | ||
|
f832bd2712 | ||
|
cb8667bd41 | ||
91156e5936 | |||
|
57e9a2dcb8 | ||
|
21edcd6ad5 | ||
|
3dc42eceb0 | ||
|
b1830f5684 | ||
|
1a0c15e17f | ||
6e59d59a1d | |||
|
fab7497311 | ||
fccbcc77ea | |||
|
041c19fb52 | ||
e36c562afa | |||
1589aa5251 | |||
8c672dd1eb | |||
|
3769550f24 | ||
|
5a06b6c53f | ||
|
1d4ef66d27 | ||
e02f07401b | |||
118f92e75a | |||
|
788d302ce8 | ||
|
cc09f35b49 |
40
.github/workflows/build.yml
vendored
40
.github/workflows/build.yml
vendored
@ -24,23 +24,27 @@ jobs:
|
|||||||
node-version: 22.4
|
node-version: 22.4
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npm run build
|
- run: npm run build
|
||||||
|
# - uses: actions/upload-artifact@master
|
||||||
|
# with:
|
||||||
|
# name: linux-builds
|
||||||
|
# path: dist/
|
||||||
|
|
||||||
build_on_mac:
|
# build_on_mac:
|
||||||
runs-on: macos-latest
|
# runs-on: macos-latest
|
||||||
steps:
|
# steps:
|
||||||
- uses: actions/checkout@master
|
# - uses: actions/checkout@master
|
||||||
- uses: actions/setup-node@master
|
# - uses: actions/setup-node@master
|
||||||
with:
|
# with:
|
||||||
node-version: 22.4
|
# node-version: 22.4
|
||||||
- run: npm install
|
# - run: npm install
|
||||||
- run: npm run build
|
# - run: npm run build
|
||||||
|
|
||||||
build_on_win:
|
# build_on_win:
|
||||||
runs-on: windows-latest
|
# runs-on: windows-latest
|
||||||
steps:
|
# steps:
|
||||||
- uses: actions/checkout@master
|
# - uses: actions/checkout@master
|
||||||
- uses: actions/setup-node@master
|
# - uses: actions/setup-node@master
|
||||||
with:
|
# with:
|
||||||
node-version: 22.4
|
# node-version: 22.4
|
||||||
- run: npm install
|
# - run: npm install
|
||||||
- run: npm run build
|
# - run: npm run build
|
||||||
|
52
.github/workflows/release.yml
vendored
52
.github/workflows/release.yml
vendored
@ -29,30 +29,30 @@ jobs:
|
|||||||
name: linux-builds
|
name: linux-builds
|
||||||
path: dist/
|
path: dist/
|
||||||
|
|
||||||
build_on_mac:
|
# build_on_mac:
|
||||||
runs-on: macos-latest
|
# runs-on: macos-latest
|
||||||
steps:
|
# steps:
|
||||||
- uses: actions/checkout@master
|
# - uses: actions/checkout@master
|
||||||
- uses: actions/setup-node@master
|
# - uses: actions/setup-node@master
|
||||||
with:
|
# with:
|
||||||
node-version: 22.4
|
# node-version: 22.4
|
||||||
- run: npm install
|
# - run: npm install
|
||||||
- run: npm run build
|
# - run: npm run build
|
||||||
- uses: actions/upload-artifact@master
|
# - uses: actions/upload-artifact@master
|
||||||
with:
|
# with:
|
||||||
name: mac-builds
|
# name: mac-builds
|
||||||
path: ./dist/
|
# path: ./dist/
|
||||||
|
|
||||||
build_on_win:
|
# build_on_win:
|
||||||
runs-on: windows-latest
|
# runs-on: windows-latest
|
||||||
steps:
|
# steps:
|
||||||
- uses: actions/checkout@master
|
# - uses: actions/checkout@master
|
||||||
- uses: actions/setup-node@master
|
# - uses: actions/setup-node@master
|
||||||
with:
|
# with:
|
||||||
node-version: 22.4
|
# node-version: 22.4
|
||||||
- run: npm install
|
# - run: npm install
|
||||||
- run: npm run build
|
# - run: npm run build
|
||||||
- uses: actions/upload-artifact@master
|
# - uses: actions/upload-artifact@master
|
||||||
with:
|
# with:
|
||||||
name: windows-builds
|
# name: windows-builds
|
||||||
path: dist/
|
# path: dist/
|
||||||
|
1
.vscode/settings.json
vendored
1
.vscode/settings.json
vendored
@ -14,7 +14,6 @@
|
|||||||
"rescrobbler",
|
"rescrobbler",
|
||||||
"scrobble",
|
"scrobble",
|
||||||
"scrobbling",
|
"scrobbling",
|
||||||
"Songwhip",
|
|
||||||
"trackid",
|
"trackid",
|
||||||
"tracklist",
|
"tracklist",
|
||||||
"widevine",
|
"widevine",
|
||||||
|
26
CHANGELOG.md
26
CHANGELOG.md
@ -4,6 +4,32 @@ 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/),
|
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).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [5.18.2]
|
||||||
|
|
||||||
|
- Reverted to sass 1.79.4 to fix `Nix` builds
|
||||||
|
- Changed electron-builder.base.yml to now generate the correct .desktop entries again
|
||||||
|
- Should fix flatpak build
|
||||||
|
|
||||||
|
## [5.18.1]
|
||||||
|
|
||||||
|
- Fixed the login bug
|
||||||
|
- Upgraded electron to 35.1.1
|
||||||
|
- Added Widevine/CDM info to startup
|
||||||
|
- delayed remote electron initializer
|
||||||
|
|
||||||
|
## [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)
|
||||||
|
- Discord integration now says "Listening to" instead of "playing" [#488](https://github.com/Mastermindzh/tidal-hifi/pull/488) && [#454](https://github.com/Mastermindzh/tidal-hifi/pull/454)
|
||||||
|
- Fixed several element names in the dom scraper
|
||||||
|
- Removed the Songwhip (they shut down) integration and replaced it with TIDAL's universal link system
|
||||||
|
|
||||||
## [5.16.0]
|
## [5.16.0]
|
||||||
|
|
||||||
- Fix issue #449 Discord RPC stuck on "Browsing Tidal".
|
- Fix issue #449 Discord RPC stuck on "Browsing Tidal".
|
||||||
|
@ -48,7 +48,6 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
|
|||||||
- AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
|
- AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
|
||||||
- Custom [integrations](#integrations)
|
- Custom [integrations](#integrations)
|
||||||
- [ListenBrainz](https://listenbrainz.org/?redirect=false) integration
|
- [ListenBrainz](https://listenbrainz.org/?redirect=false) integration
|
||||||
- Songwhip.com integration (hotkey `ctrl + w`)
|
|
||||||
- Discord RPC integration (showing "now listening", "Browsing", etc)
|
- Discord RPC integration (showing "now listening", "Browsing", etc)
|
||||||
- Flatpak version only works if both Discord and Tidal-HiFi are flatpaks
|
- Flatpak version only works if both Discord and Tidal-HiFi are flatpaks
|
||||||
- MPRIS integration
|
- MPRIS integration
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
appId: com.rickvanlieshout.tidal-hifi
|
appId: com.rickvanlieshout.tidal-hifi
|
||||||
electronVersion: 28.1.1
|
electronVersion: 35.1.1
|
||||||
electronDownload:
|
electronDownload:
|
||||||
version: 28.1.1+wvcus
|
version: 35.1.1+wvcus
|
||||||
mirror: https://github.com/castlabs/electron-releases/releases/download/v
|
mirror: https://github.com/castlabs/electron-releases/releases/download/v
|
||||||
snap:
|
snap:
|
||||||
plugs:
|
plugs:
|
||||||
@ -22,19 +22,19 @@ linux:
|
|||||||
"--enable-features=WaylandWindowDecorations",
|
"--enable-features=WaylandWindowDecorations",
|
||||||
]
|
]
|
||||||
desktop:
|
desktop:
|
||||||
Encoding: UTF-8
|
entry:
|
||||||
Name: TIDAL Hi-Fi
|
Encoding: "UTF-8"
|
||||||
GenericName: TIDAL Hi-Fi
|
Name: "TIDAL Hi-Fi"
|
||||||
Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
|
GenericName: "TIDAL Hi-Fi"
|
||||||
Icon: tidal-hifi
|
Comment: "The web version of listen.tidal.com running in electron with hifi support thanks to widevine."
|
||||||
StartupNotify: true
|
Icon: "tidal-hifi"
|
||||||
Terminal: false
|
StartupNotify: "true"
|
||||||
Type: Application
|
Terminal: "false"
|
||||||
Categories: Network;Application;AudioVideo;Audio;Video
|
Type: "Application"
|
||||||
StartupWMClass: tidal-hifi
|
Categories: "Network;Application;AudioVideo;Audio;Video"
|
||||||
X-PulseAudio-Properties: media.role=music
|
StartupWMClass: "tidal-hifi"
|
||||||
MimeType: x-scheme-handler/tidal;
|
X-PulseAudio-Properties: "media.role=music"
|
||||||
|
MimeType: "x-scheme-handler/tidal;"
|
||||||
mac:
|
mac:
|
||||||
category: public.app-category.entertainment
|
category: public.app-category.entertainment
|
||||||
win:
|
win:
|
||||||
|
4680
package-lock.json
generated
4680
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
25
package.json
25
package.json
@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"name": "tidal-hifi",
|
"name": "tidal-hifi",
|
||||||
"version": "5.16.0",
|
"version": "5.18.2",
|
||||||
"description": "Tidal on Electron with widevine(hifi) support",
|
"description": "Tidal on Electron with widevine(hifi) support",
|
||||||
"main": "ts-dist/main.js",
|
"main": "ts-dist/main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "electron --inspect=0.0.0.0:5858 .",
|
"start": "electron --inspect=0.0.0.0:5858 --remote-debugging-port=8315 --remote-allow-origins=* .",
|
||||||
"watchStart": "nodemon dist -x \"npm run start\"",
|
"watchStart": "nodemon dist -x \"npm run start\"",
|
||||||
"compile": "tsc && npm run sass-and-copy",
|
"compile": "tsc && npm run sass-and-copy",
|
||||||
"deps": "npm run watch",
|
"deps": "npm run watch",
|
||||||
@ -42,21 +42,20 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@electron/remote": "^2.1.2",
|
"@electron/remote": "^2.1.2",
|
||||||
"@types/swagger-jsdoc": "^6.0.4",
|
"@types/swagger-jsdoc": "^6.0.4",
|
||||||
"axios": "^1.7.2",
|
"@xhayper/discord-rpc": "^1.2.1",
|
||||||
"cors": "^2.8.5",
|
"axios": "^1.8.4",
|
||||||
"discord-rpc": "^4.0.1",
|
|
||||||
"electron-store": "^8.2.0",
|
"electron-store": "^8.2.0",
|
||||||
"express": "^4.19.2",
|
"express": "^4.21.2",
|
||||||
"hotkeys-js": "^3.13.7",
|
"hotkeys-js": "^3.13.9",
|
||||||
"mpris-service": "^2.1.2",
|
"mpris-service": "^2.1.2",
|
||||||
"request": "^2.88.2",
|
"sass": "1.86.0",
|
||||||
"sass": "^1.77.8",
|
"swagger-ui-express": "^5.0.1",
|
||||||
"swagger-ui-express": "^5.0.1"
|
"cors": "^2.8.5",
|
||||||
|
"request": "^2.88.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@mastermindzh/prettier-config": "^1.0.0",
|
"@mastermindzh/prettier-config": "^1.0.0",
|
||||||
"@types/cors": "^2.8.17",
|
"@types/cors": "^2.8.17",
|
||||||
"@types/discord-rpc": "^4.0.8",
|
|
||||||
"@types/express": "^4.17.21",
|
"@types/express": "^4.17.21",
|
||||||
"@types/node": "^20.14.10",
|
"@types/node": "^20.14.10",
|
||||||
"@types/request": "^2.48.12",
|
"@types/request": "^2.48.12",
|
||||||
@ -64,8 +63,8 @@
|
|||||||
"@typescript-eslint/eslint-plugin": "^7.16.0",
|
"@typescript-eslint/eslint-plugin": "^7.16.0",
|
||||||
"@typescript-eslint/parser": "^7.15.0",
|
"@typescript-eslint/parser": "^7.15.0",
|
||||||
"copyfiles": "^2.4.1",
|
"copyfiles": "^2.4.1",
|
||||||
"electron": "git+https://github.com/castlabs/electron-releases#v31.1.0+wvcus",
|
"electron": "github:castlabs/electron-releases#v35.1.1+wvcus",
|
||||||
"electron-builder": "~24.9.4",
|
"electron-builder": "~26.0.12",
|
||||||
"eslint": "^8.57.0",
|
"eslint": "^8.57.0",
|
||||||
"js-yaml": "^4.1.0",
|
"js-yaml": "^4.1.0",
|
||||||
"markdown-toc": "^1.2.0",
|
"markdown-toc": "^1.2.0",
|
||||||
|
@ -16,17 +16,19 @@
|
|||||||
search: '[class^="searchField"]',
|
search: '[class^="searchField"]',
|
||||||
shuffle: '*[data-test="shuffle"]',
|
shuffle: '*[data-test="shuffle"]',
|
||||||
repeat: '*[data-test="repeat"]',
|
repeat: '*[data-test="repeat"]',
|
||||||
account: '*[class^="profileOptions"]',
|
account: '*[data-test^="profile-image-button"]',
|
||||||
settings: '*[data-test^="open-settings"]',
|
settings: '*[data-test^="sidebar-menu-button"]',
|
||||||
|
openSettings: '*[data-test^="open-settings"]',
|
||||||
media: '*[data-test="current-media-imagery"]',
|
media: '*[data-test="current-media-imagery"]',
|
||||||
image: "img",
|
image: "img",
|
||||||
current: '*[data-test="current-time"]',
|
current: '*[data-test="current-time"]',
|
||||||
duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
|
duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
|
||||||
bar: '*[data-test="progress-bar"]',
|
bar: '*[data-test="progress-bar"]',
|
||||||
footer: "#footerPlayer",
|
footer: "#footerPlayer",
|
||||||
mediaItem: "[data-type='mediaItem']",
|
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']",
|
currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
|
||||||
album_name_cell: '[class^="album"]',
|
album_name_cell: '[class^="album"]',
|
||||||
tracklist_row: '[data-test="tracklist-row"]',
|
tracklist_row: '[data-test="tracklist-row"]',
|
||||||
|
@ -10,7 +10,7 @@ export const globalEvents = {
|
|||||||
showSettings: "showSettings",
|
showSettings: "showSettings",
|
||||||
storeChanged: "storeChanged",
|
storeChanged: "storeChanged",
|
||||||
error: "error",
|
error: "error",
|
||||||
whip: "whip",
|
getUniversalLink: "getUniversalLink",
|
||||||
log: "log",
|
log: "log",
|
||||||
toggleFavorite: "toggleFavorite",
|
toggleFavorite: "toggleFavorite",
|
||||||
toggleShuffle: "toggleShuffle",
|
toggleShuffle: "toggleShuffle",
|
||||||
|
@ -55,6 +55,7 @@ export const settings = {
|
|||||||
singleInstance: "singleInstance",
|
singleInstance: "singleInstance",
|
||||||
skipArtists: "skipArtists",
|
skipArtists: "skipArtists",
|
||||||
skippedArtists: "skippedArtists",
|
skippedArtists: "skippedArtists",
|
||||||
|
staticWindowTitle: "staticWindowTitle",
|
||||||
theme: "theme",
|
theme: "theme",
|
||||||
trayIcon: "trayIcon",
|
trayIcon: "trayIcon",
|
||||||
updateFrequency: "updateFrequency",
|
updateFrequency: "updateFrequency",
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"openapi": "3.1.0",
|
"openapi": "3.1.0",
|
||||||
"info": {
|
"info": {
|
||||||
"title": "TIDAL Hi-Fi API",
|
"title": "TIDAL Hi-Fi API",
|
||||||
"version": "5.16.0",
|
"version": "5.18.2",
|
||||||
"description": "",
|
"description": "",
|
||||||
"license": {
|
"license": {
|
||||||
"name": "MIT",
|
"name": "MIT",
|
||||||
@ -21,9 +21,7 @@
|
|||||||
"/current": {
|
"/current": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "Get current media info",
|
"summary": "Get current media info",
|
||||||
"tags": [
|
"tags": ["current"],
|
||||||
"current"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Current media info",
|
"description": "Current media info",
|
||||||
@ -41,9 +39,7 @@
|
|||||||
"/current/image": {
|
"/current/image": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "Get current media image",
|
"summary": "Get current media image",
|
||||||
"tags": [
|
"tags": ["current"],
|
||||||
"current"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Current media image",
|
"description": "Current media image",
|
||||||
@ -65,9 +61,7 @@
|
|||||||
"/player/play": {
|
"/player/play": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Play the current media",
|
"summary": "Play the current media",
|
||||||
"tags": [
|
"tags": ["player"],
|
||||||
"player"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok",
|
"description": "Ok",
|
||||||
@ -85,9 +79,7 @@
|
|||||||
"/player/favorite/toggle": {
|
"/player/favorite/toggle": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
|
"summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
|
||||||
"tags": [
|
"tags": ["player"],
|
||||||
"player"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok",
|
"description": "Ok",
|
||||||
@ -105,9 +97,7 @@
|
|||||||
"/player/pause": {
|
"/player/pause": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Pause the current media",
|
"summary": "Pause the current media",
|
||||||
"tags": [
|
"tags": ["player"],
|
||||||
"player"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok",
|
"description": "Ok",
|
||||||
@ -125,9 +115,7 @@
|
|||||||
"/player/next": {
|
"/player/next": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Play the next song",
|
"summary": "Play the next song",
|
||||||
"tags": [
|
"tags": ["player"],
|
||||||
"player"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok",
|
"description": "Ok",
|
||||||
@ -145,9 +133,7 @@
|
|||||||
"/player/previous": {
|
"/player/previous": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Play the previous song",
|
"summary": "Play the previous song",
|
||||||
"tags": [
|
"tags": ["player"],
|
||||||
"player"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok",
|
"description": "Ok",
|
||||||
@ -165,9 +151,7 @@
|
|||||||
"/player/shuffle/toggle": {
|
"/player/shuffle/toggle": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Play the previous song",
|
"summary": "Play the previous song",
|
||||||
"tags": [
|
"tags": ["player"],
|
||||||
"player"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok",
|
"description": "Ok",
|
||||||
@ -185,9 +169,7 @@
|
|||||||
"/player/repeat/toggle": {
|
"/player/repeat/toggle": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
|
"summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
|
||||||
"tags": [
|
"tags": ["player"],
|
||||||
"player"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok",
|
"description": "Ok",
|
||||||
@ -205,9 +187,7 @@
|
|||||||
"/player/playpause": {
|
"/player/playpause": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Start playing the media if paused, or pause the media if playing",
|
"summary": "Start playing the media if paused, or pause the media if playing",
|
||||||
"tags": [
|
"tags": ["player"],
|
||||||
"player"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok",
|
"description": "Ok",
|
||||||
@ -225,9 +205,7 @@
|
|||||||
"/settings/skipped-artists": {
|
"/settings/skipped-artists": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
|
"summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
|
||||||
"tags": [
|
"tags": ["settings"],
|
||||||
"settings"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "The list book.",
|
"description": "The list book.",
|
||||||
@ -243,9 +221,7 @@
|
|||||||
},
|
},
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Add new artists to the list of skipped artists",
|
"summary": "Add new artists to the list of skipped artists",
|
||||||
"tags": [
|
"tags": ["settings"],
|
||||||
"settings"
|
|
||||||
],
|
|
||||||
"requestBody": {
|
"requestBody": {
|
||||||
"required": true,
|
"required": true,
|
||||||
"content": {
|
"content": {
|
||||||
@ -266,9 +242,7 @@
|
|||||||
"/settings/skipped-artists/delete": {
|
"/settings/skipped-artists/delete": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Remove artists from the list of skipped artists",
|
"summary": "Remove artists from the list of skipped artists",
|
||||||
"tags": [
|
"tags": ["settings"],
|
||||||
"settings"
|
|
||||||
],
|
|
||||||
"requestBody": {
|
"requestBody": {
|
||||||
"required": true,
|
"required": true,
|
||||||
"content": {
|
"content": {
|
||||||
@ -289,9 +263,7 @@
|
|||||||
"/settings/skipped-artists/current": {
|
"/settings/skipped-artists/current": {
|
||||||
"post": {
|
"post": {
|
||||||
"summary": "Add the current artist to the list of skipped artists",
|
"summary": "Add the current artist to the list of skipped artists",
|
||||||
"tags": [
|
"tags": ["settings"],
|
||||||
"settings"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok"
|
"description": "Ok"
|
||||||
@ -300,9 +272,7 @@
|
|||||||
},
|
},
|
||||||
"delete": {
|
"delete": {
|
||||||
"summary": "Remove the current artist from the list of skipped artists",
|
"summary": "Remove the current artist from the list of skipped artists",
|
||||||
"tags": [
|
"tags": ["settings"],
|
||||||
"settings"
|
|
||||||
],
|
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
"description": "Ok"
|
"description": "Ok"
|
||||||
@ -313,9 +283,7 @@
|
|||||||
"/image": {
|
"/image": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "Get current image",
|
"summary": "Get current image",
|
||||||
"tags": [
|
"tags": ["legacy"],
|
||||||
"legacy"
|
|
||||||
],
|
|
||||||
"deprecated": true,
|
"deprecated": true,
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
@ -338,9 +306,7 @@
|
|||||||
"/play": {
|
"/play": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "Play the current media",
|
"summary": "Play the current media",
|
||||||
"tags": [
|
"tags": ["legacy"],
|
||||||
"legacy"
|
|
||||||
],
|
|
||||||
"deprecated": true,
|
"deprecated": true,
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
@ -359,9 +325,7 @@
|
|||||||
"/favorite/toggle": {
|
"/favorite/toggle": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
|
"summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
|
||||||
"tags": [
|
"tags": ["legacy"],
|
||||||
"legacy"
|
|
||||||
],
|
|
||||||
"deprecated": true,
|
"deprecated": true,
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
@ -380,9 +344,7 @@
|
|||||||
"/pause": {
|
"/pause": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "Pause the current media",
|
"summary": "Pause the current media",
|
||||||
"tags": [
|
"tags": ["legacy"],
|
||||||
"legacy"
|
|
||||||
],
|
|
||||||
"deprecated": true,
|
"deprecated": true,
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
@ -401,9 +363,7 @@
|
|||||||
"/next": {
|
"/next": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "Play the next song",
|
"summary": "Play the next song",
|
||||||
"tags": [
|
"tags": ["legacy"],
|
||||||
"legacy"
|
|
||||||
],
|
|
||||||
"deprecated": true,
|
"deprecated": true,
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
@ -422,9 +382,7 @@
|
|||||||
"/previous": {
|
"/previous": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "Play the previous song",
|
"summary": "Play the previous song",
|
||||||
"tags": [
|
"tags": ["legacy"],
|
||||||
"legacy"
|
|
||||||
],
|
|
||||||
"deprecated": true,
|
"deprecated": true,
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
@ -443,9 +401,7 @@
|
|||||||
"/playpause": {
|
"/playpause": {
|
||||||
"get": {
|
"get": {
|
||||||
"summary": "Toggle play/pause",
|
"summary": "Toggle play/pause",
|
||||||
"tags": [
|
"tags": ["legacy"],
|
||||||
"legacy"
|
|
||||||
],
|
|
||||||
"deprecated": true,
|
"deprecated": true,
|
||||||
"responses": {
|
"responses": {
|
||||||
"200": {
|
"200": {
|
||||||
@ -558,10 +514,7 @@
|
|||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"example": [
|
"example": ["Artist1", "Artist2"]
|
||||||
"Artist1",
|
|
||||||
"Artist2"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
10
src/features/sharingService/sharingService.ts
Normal file
10
src/features/sharingService/sharingService.ts
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
export class SharingService {
|
||||||
|
/**
|
||||||
|
* Retrieve the universal link given a regular track link
|
||||||
|
* @param currentUrl
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
public static getUniversalLink(currentUrl: string): string {
|
||||||
|
return `${currentUrl}?u`;
|
||||||
|
}
|
||||||
|
}
|
@ -1,21 +0,0 @@
|
|||||||
import { ServiceLinks } from "./ServiceLinks";
|
|
||||||
|
|
||||||
export interface Artist {
|
|
||||||
type: string;
|
|
||||||
id: number;
|
|
||||||
path: string;
|
|
||||||
name: string;
|
|
||||||
sourceUrl: string;
|
|
||||||
sourceCountry: string;
|
|
||||||
url: string;
|
|
||||||
image: string;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
refreshedAt: string;
|
|
||||||
serviceIds: { [key: string]: string };
|
|
||||||
orchardId: string;
|
|
||||||
spotifyId: string;
|
|
||||||
links: { [key: string]: ServiceLinks[] };
|
|
||||||
linksCountries: string[];
|
|
||||||
description: string;
|
|
||||||
}
|
|
@ -1,4 +0,0 @@
|
|||||||
export interface ServiceLinks {
|
|
||||||
link: string;
|
|
||||||
countries: string[];
|
|
||||||
}
|
|
@ -1,27 +0,0 @@
|
|||||||
import { Artist } from "./Artist";
|
|
||||||
import { ServiceLinks } from "./ServiceLinks";
|
|
||||||
|
|
||||||
export interface WhippedResult {
|
|
||||||
status: string;
|
|
||||||
data: {
|
|
||||||
item: {
|
|
||||||
type: string;
|
|
||||||
id: number;
|
|
||||||
path: string;
|
|
||||||
name: string;
|
|
||||||
url: string;
|
|
||||||
sourceUrl: string;
|
|
||||||
sourceCountry: string;
|
|
||||||
releaseDate: string;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
refreshedAt: string;
|
|
||||||
image: string;
|
|
||||||
isrc: string;
|
|
||||||
isExplicit: boolean;
|
|
||||||
links: { [key: string]: ServiceLinks[] };
|
|
||||||
linksCountries: string[];
|
|
||||||
artists: Artist[];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,32 +0,0 @@
|
|||||||
import { WhippedResult } from "./models/whip";
|
|
||||||
import axios from "axios";
|
|
||||||
|
|
||||||
export class Songwhip {
|
|
||||||
/**
|
|
||||||
* Call the songwhip API and create a shareable songwhip page
|
|
||||||
* @param currentUrl
|
|
||||||
* @returns
|
|
||||||
*/
|
|
||||||
public static async whip(currentUrl: string): Promise<WhippedResult> {
|
|
||||||
try {
|
|
||||||
const response = await axios.post("https://songwhip.com/api/songwhip/create", {
|
|
||||||
url: currentUrl,
|
|
||||||
// doesn't actually matter.. returns everything the same way anyway
|
|
||||||
country: "NL",
|
|
||||||
});
|
|
||||||
|
|
||||||
return response.data;
|
|
||||||
} catch (error) {
|
|
||||||
console.log(JSON.stringify(error));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Transform a songwhip response into a shareable url
|
|
||||||
* @param response
|
|
||||||
* @returns
|
|
||||||
*/
|
|
||||||
public static getWhipUrl(response: WhippedResult) {
|
|
||||||
return `https://songwhip.com${response.data.item.url}`;
|
|
||||||
}
|
|
||||||
}
|
|
12
src/main.ts
12
src/main.ts
@ -10,7 +10,7 @@ import {
|
|||||||
releaseInhibitorIfActive,
|
releaseInhibitorIfActive,
|
||||||
} from "./features/idleInhibitor/idleInhibitor";
|
} from "./features/idleInhibitor/idleInhibitor";
|
||||||
import { Logger } from "./features/logger";
|
import { Logger } from "./features/logger";
|
||||||
import { Songwhip } from "./features/songwhip/songwhip";
|
import { SharingService } from "./features/sharingService/sharingService";
|
||||||
import { MediaInfo } from "./models/mediaInfo";
|
import { MediaInfo } from "./models/mediaInfo";
|
||||||
import { MediaStatus } from "./models/mediaStatus";
|
import { MediaStatus } from "./models/mediaStatus";
|
||||||
import { initRPC, rpc, unRPC } from "./scripts/discord";
|
import { initRPC, rpc, unRPC } from "./scripts/discord";
|
||||||
@ -26,7 +26,6 @@ import {
|
|||||||
import { addTray, refreshTray } from "./scripts/tray";
|
import { addTray, refreshTray } from "./scripts/tray";
|
||||||
let mainInhibitorId = -1;
|
let mainInhibitorId = -1;
|
||||||
|
|
||||||
initialize();
|
|
||||||
let mainWindow: BrowserWindow;
|
let mainWindow: BrowserWindow;
|
||||||
const icon = path.join(__dirname, "../assets/icon.png");
|
const icon = path.join(__dirname, "../assets/icon.png");
|
||||||
const PROTOCOL_PREFIX = "tidal";
|
const PROTOCOL_PREFIX = "tidal";
|
||||||
@ -98,6 +97,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
enable(mainWindow.webContents);
|
enable(mainWindow.webContents);
|
||||||
registerHttpProtocols();
|
registerHttpProtocols();
|
||||||
syncMenuBarWithStore();
|
syncMenuBarWithStore();
|
||||||
@ -126,6 +126,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
// Emitted when the window is closed.
|
// Emitted when the window is closed.
|
||||||
mainWindow.on("closed", function () {
|
mainWindow.on("closed", function () {
|
||||||
releaseInhibitorIfActive(mainInhibitorId);
|
releaseInhibitorIfActive(mainInhibitorId);
|
||||||
@ -178,6 +179,7 @@ app.on("ready", async () => {
|
|||||||
|
|
||||||
if (isMainInstance() || isMultipleInstancesAllowed()) {
|
if (isMainInstance() || isMultipleInstancesAllowed()) {
|
||||||
await components.whenReady();
|
await components.whenReady();
|
||||||
|
initialize();
|
||||||
|
|
||||||
// Adblock
|
// Adblock
|
||||||
if (settingsStore.get(settings.adBlock)) {
|
if (settingsStore.get(settings.adBlock)) {
|
||||||
@ -188,6 +190,8 @@ app.on("ready", async () => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Logger.log("components ready:", components.status());
|
||||||
|
|
||||||
createWindow();
|
createWindow();
|
||||||
addMenu(mainWindow);
|
addMenu(mainWindow);
|
||||||
createSettingsWindow();
|
createSettingsWindow();
|
||||||
@ -250,8 +254,8 @@ ipcMain.on(globalEvents.error, (event) => {
|
|||||||
console.log(event);
|
console.log(event);
|
||||||
});
|
});
|
||||||
|
|
||||||
ipcMain.handle(globalEvents.whip, async (event, url) => {
|
ipcMain.handle(globalEvents.getUniversalLink, async (event, url) => {
|
||||||
return Songwhip.whip(url);
|
return SharingService.getUniversalLink(url);
|
||||||
});
|
});
|
||||||
|
|
||||||
Logger.watch(ipcMain);
|
Logger.watch(ipcMain);
|
||||||
|
@ -46,6 +46,7 @@ let adBlock: HTMLInputElement,
|
|||||||
singleInstance: HTMLInputElement,
|
singleInstance: HTMLInputElement,
|
||||||
skipArtists: HTMLInputElement,
|
skipArtists: HTMLInputElement,
|
||||||
skippedArtists: HTMLInputElement,
|
skippedArtists: HTMLInputElement,
|
||||||
|
staticWindowTitle: HTMLInputElement,
|
||||||
theme: HTMLSelectElement,
|
theme: HTMLSelectElement,
|
||||||
trayIcon: HTMLInputElement,
|
trayIcon: HTMLInputElement,
|
||||||
updateFrequency: HTMLInputElement,
|
updateFrequency: HTMLInputElement,
|
||||||
@ -140,8 +141,9 @@ function refreshSettings() {
|
|||||||
port.value = settingsStore.get(settings.apiSettings.port);
|
port.value = settingsStore.get(settings.apiSettings.port);
|
||||||
singleInstance.checked = settingsStore.get(settings.singleInstance);
|
singleInstance.checked = settingsStore.get(settings.singleInstance);
|
||||||
skipArtists.checked = settingsStore.get(settings.skipArtists);
|
skipArtists.checked = settingsStore.get(settings.skipArtists);
|
||||||
theme.value = settingsStore.get(settings.theme);
|
|
||||||
skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
|
skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
|
||||||
|
staticWindowTitle.checked = settingsStore.get(settings.staticWindowTitle);
|
||||||
|
theme.value = settingsStore.get(settings.theme);
|
||||||
trayIcon.checked = settingsStore.get(settings.trayIcon);
|
trayIcon.checked = settingsStore.get(settings.trayIcon);
|
||||||
updateFrequency.value = settingsStore.get(settings.updateFrequency);
|
updateFrequency.value = settingsStore.get(settings.updateFrequency);
|
||||||
enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
|
enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
|
||||||
@ -261,6 +263,7 @@ window.addEventListener("DOMContentLoaded", () => {
|
|||||||
trayIcon = get("trayIcon");
|
trayIcon = get("trayIcon");
|
||||||
skipArtists = get("skipArtists");
|
skipArtists = get("skipArtists");
|
||||||
skippedArtists = get("skippedArtists");
|
skippedArtists = get("skippedArtists");
|
||||||
|
staticWindowTitle = get("staticWindowTitle");
|
||||||
singleInstance = get("singleInstance");
|
singleInstance = get("singleInstance");
|
||||||
updateFrequency = get("updateFrequency");
|
updateFrequency = get("updateFrequency");
|
||||||
enableListenBrainz = get("enableListenBrainz");
|
enableListenBrainz = get("enableListenBrainz");
|
||||||
@ -295,6 +298,7 @@ window.addEventListener("DOMContentLoaded", () => {
|
|||||||
addInputListener(port, settings.apiSettings.port);
|
addInputListener(port, settings.apiSettings.port);
|
||||||
addInputListener(skipArtists, settings.skipArtists);
|
addInputListener(skipArtists, settings.skipArtists);
|
||||||
addTextAreaListener(skippedArtists, settings.skippedArtists);
|
addTextAreaListener(skippedArtists, settings.skippedArtists);
|
||||||
|
addInputListener(staticWindowTitle, settings.staticWindowTitle);
|
||||||
addInputListener(singleInstance, settings.singleInstance);
|
addInputListener(singleInstance, settings.singleInstance);
|
||||||
addSelectListener(theme, settings.theme);
|
addSelectListener(theme, settings.theme);
|
||||||
addInputListener(trayIcon, settings.trayIcon);
|
addInputListener(trayIcon, settings.trayIcon);
|
||||||
|
@ -106,6 +106,16 @@
|
|||||||
<span class="switch__slider"></span>
|
<span class="switch__slider"></span>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="group__option">
|
||||||
|
<div class="group__description">
|
||||||
|
<h4>Static Window Title</h4>
|
||||||
|
<p>Makes the window title "TIDAL Hi-Fi" instead of changing to the currently playing song.</p>
|
||||||
|
</div>
|
||||||
|
<label class="switch">
|
||||||
|
<input id="staticWindowTitle" type="checkbox" />
|
||||||
|
<span class="switch__slider"></span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
<div class="group__option">
|
<div class="group__option">
|
||||||
<div class="group__description">
|
<div class="group__description">
|
||||||
<h4>Minimize on Close</h4>
|
<h4>Minimize on Close</h4>
|
||||||
@ -468,7 +478,7 @@
|
|||||||
<h4>TIDAL Hi-Fi</h4>
|
<h4>TIDAL Hi-Fi</h4>
|
||||||
<div class="about-section__version">
|
<div class="about-section__version">
|
||||||
<a target="_blank" rel="noopener"
|
<a target="_blank" rel="noopener"
|
||||||
href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.16.0">5.16.0</a>
|
href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.18.2">5.18.2</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="about-section__links">
|
<div class="about-section__links">
|
||||||
<a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
|
<a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
|
||||||
|
@ -10,7 +10,7 @@ import {
|
|||||||
} from "./features/listenbrainz/listenbrainz";
|
} from "./features/listenbrainz/listenbrainz";
|
||||||
import { StoreData } from "./features/listenbrainz/models/storeData";
|
import { StoreData } from "./features/listenbrainz/models/storeData";
|
||||||
import { Logger } from "./features/logger";
|
import { Logger } from "./features/logger";
|
||||||
import { Songwhip } from "./features/songwhip/songwhip";
|
import { SharingService } from "./features/sharingService/sharingService";
|
||||||
import { addCustomCss } from "./features/theming/theming";
|
import { addCustomCss } from "./features/theming/theming";
|
||||||
import { convertDurationToSeconds } from "./features/time/parse";
|
import { convertDurationToSeconds } from "./features/time/parse";
|
||||||
import { MediaInfo } from "./models/mediaInfo";
|
import { MediaInfo } from "./models/mediaInfo";
|
||||||
@ -48,17 +48,18 @@ const elements = {
|
|||||||
search: '[class^="searchField"]',
|
search: '[class^="searchField"]',
|
||||||
shuffle: '*[data-test="shuffle"]',
|
shuffle: '*[data-test="shuffle"]',
|
||||||
repeat: '*[data-test="repeat"]',
|
repeat: '*[data-test="repeat"]',
|
||||||
account: '*[class^="profileOptions"]',
|
account: '*[data-test^="profile-image-button"]',
|
||||||
settings: '*[data-test^="open-settings"]',
|
settings: '*[data-test^="sidebar-menu-button"]',
|
||||||
|
openSettings: '*[data-test^="open-settings"]',
|
||||||
media: '*[data-test="current-media-imagery"]',
|
media: '*[data-test="current-media-imagery"]',
|
||||||
image: "img",
|
image: "img",
|
||||||
current: '*[data-test="current-time"]',
|
current: '*[data-test="current-time"]',
|
||||||
duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
|
duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
|
||||||
bar: '*[data-test="progress-bar"]',
|
bar: '*[data-test="progress-bar"]',
|
||||||
footer: "#footerPlayer",
|
footer: "#footerPlayer",
|
||||||
mediaItem: "[data-type='mediaItem']",
|
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)",
|
queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
|
||||||
currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
|
currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
|
||||||
album_name_cell: '[class^="album"]',
|
album_name_cell: '[class^="album"]',
|
||||||
@ -220,9 +221,9 @@ ListenBrainzStore.clear();
|
|||||||
function addHotKeys() {
|
function addHotKeys() {
|
||||||
if (settingsStore.get(settings.enableCustomHotkeys)) {
|
if (settingsStore.get(settings.enableCustomHotkeys)) {
|
||||||
addHotkey("Control+p", function () {
|
addHotkey("Control+p", function () {
|
||||||
elements.click("account");
|
|
||||||
setTimeout(() => {
|
|
||||||
elements.click("settings");
|
elements.click("settings");
|
||||||
|
setTimeout(() => {
|
||||||
|
elements.click("openSettings");
|
||||||
}, 100);
|
}, 100);
|
||||||
});
|
});
|
||||||
addHotkey("Control+l", function () {
|
addHotkey("Control+l", function () {
|
||||||
@ -254,11 +255,10 @@ function addHotKeys() {
|
|||||||
elements.click("repeat");
|
elements.click("repeat");
|
||||||
});
|
});
|
||||||
addHotkey("control+w", async function () {
|
addHotkey("control+w", async function () {
|
||||||
const result = await ipcRenderer.invoke(globalEvents.whip, getTrackURL());
|
const url = SharingService.getUniversalLink(getTrackURL());
|
||||||
const url = Songwhip.getWhipUrl(result);
|
|
||||||
clipboard.writeText(url);
|
clipboard.writeText(url);
|
||||||
new Notification({
|
new Notification({
|
||||||
title: `Successfully whipped: `,
|
title: `Universal link generated: `,
|
||||||
body: `URL copied to clipboard: ${url}`,
|
body: `URL copied to clipboard: ${url}`,
|
||||||
}).show();
|
}).show();
|
||||||
});
|
});
|
||||||
@ -483,6 +483,7 @@ function updateMpris(mediaInfo: MediaInfo) {
|
|||||||
"xesam:title": mediaInfo.title,
|
"xesam:title": mediaInfo.title,
|
||||||
"xesam:artist": [mediaInfo.artists],
|
"xesam:artist": [mediaInfo.artists],
|
||||||
"xesam:album": mediaInfo.album,
|
"xesam:album": mediaInfo.album,
|
||||||
|
"xesam:url": mediaInfo.url,
|
||||||
"mpris:artUrl": mediaInfo.image,
|
"mpris:artUrl": mediaInfo.image,
|
||||||
"mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
|
"mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
|
||||||
"mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
|
"mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
|
||||||
@ -550,6 +551,7 @@ setInterval(function () {
|
|||||||
const artistsArray = elements.getArtistsArray();
|
const artistsArray = elements.getArtistsArray();
|
||||||
const artistsString = elements.getArtistsString(artistsArray);
|
const artistsString = elements.getArtistsString(artistsArray);
|
||||||
const songDashArtistTitle = `${title} - ${artistsString}`;
|
const songDashArtistTitle = `${title} - ${artistsString}`;
|
||||||
|
const staticTitle = "TIDAL Hi-Fi";
|
||||||
const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
|
const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
|
||||||
const current = elements.getText("current");
|
const current = elements.getText("current");
|
||||||
const currentStatus = getCurrentlyPlayingStatus();
|
const currentStatus = getCurrentlyPlayingStatus();
|
||||||
@ -594,7 +596,9 @@ setInterval(function () {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// update title, url and play info with new info
|
// update title, url and play info with new info
|
||||||
setTitle(songDashArtistTitle);
|
settingsStore.get(settings.staticWindowTitle)
|
||||||
|
? setTitle(staticTitle)
|
||||||
|
: setTitle(songDashArtistTitle);
|
||||||
getTrackURL();
|
getTrackURL();
|
||||||
currentSong = songDashArtistTitle;
|
currentSong = songDashArtistTitle;
|
||||||
currentPlayStatus = currentStatus;
|
currentPlayStatus = currentStatus;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Client, Presence } from "discord-rpc";
|
import { Client, SetActivity } from "@xhayper/discord-rpc";
|
||||||
import { app, ipcMain } from "electron";
|
import { app, ipcMain } from "electron";
|
||||||
import { globalEvents } from "../constants/globalEvents";
|
import { globalEvents } from "../constants/globalEvents";
|
||||||
import { settings } from "../constants/settings";
|
import { settings } from "../constants/settings";
|
||||||
@ -12,6 +12,10 @@ const clientId = "833617820704440341";
|
|||||||
|
|
||||||
export let rpc: Client;
|
export let rpc: Client;
|
||||||
|
|
||||||
|
const ACTIVITY_LISTENING = 2;
|
||||||
|
const MAX_RETRIES = 5;
|
||||||
|
const RETRY_DELAY = 10000;
|
||||||
|
|
||||||
const observer = () => {
|
const observer = () => {
|
||||||
if (rpc) {
|
if (rpc) {
|
||||||
updateActivity();
|
updateActivity();
|
||||||
@ -22,19 +26,20 @@ const defaultPresence = {
|
|||||||
largeImageKey: "tidal-hifi-icon",
|
largeImageKey: "tidal-hifi-icon",
|
||||||
largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
|
largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
|
||||||
instance: false,
|
instance: false,
|
||||||
|
type: ACTIVITY_LISTENING
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateActivity = () => {
|
const updateActivity = () => {
|
||||||
const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
|
const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
|
||||||
if (mediaInfo.status === MediaStatus.paused && !showIdle) {
|
if (mediaInfo.status === MediaStatus.paused && !showIdle) {
|
||||||
rpc.clearActivity();
|
rpc.user?.clearActivity();
|
||||||
} else {
|
} else {
|
||||||
rpc.setActivity(getActivity());
|
rpc.user?.setActivity(getActivity());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const getActivity = (): Presence => {
|
const getActivity = (): SetActivity => {
|
||||||
const presence: Presence = { ...defaultPresence };
|
const presence: SetActivity = { ...defaultPresence };
|
||||||
|
|
||||||
if (mediaInfo.status === MediaStatus.paused) {
|
if (mediaInfo.status === MediaStatus.paused) {
|
||||||
presence.details =
|
presence.details =
|
||||||
@ -50,6 +55,7 @@ const getActivity = (): Presence => {
|
|||||||
settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
|
settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return presence;
|
return presence;
|
||||||
|
|
||||||
function getFromStore() {
|
function getFromStore() {
|
||||||
@ -97,11 +103,29 @@ const getActivity = (): Presence => {
|
|||||||
if (includeTimestamps) {
|
if (includeTimestamps) {
|
||||||
const currentSeconds = convertDurationToSeconds(mediaInfo.current);
|
const currentSeconds = convertDurationToSeconds(mediaInfo.current);
|
||||||
const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
|
const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
|
||||||
const date = new Date();
|
const now = Math.trunc((Date.now() + 500) / 1000);
|
||||||
const now = (date.getTime() / 1000) | 0;
|
presence.startTimestamp = now - currentSeconds;
|
||||||
const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
|
presence.endTimestamp = presence.startTimestamp + durationSeconds;
|
||||||
presence.startTimestamp = now;
|
}
|
||||||
presence.endTimestamp = remaining;
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Try to login to RPC and retry if it errors
|
||||||
|
* @param retryCount Max retry count
|
||||||
|
*/
|
||||||
|
const connectWithRetry = async (retryCount = 0) => {
|
||||||
|
try {
|
||||||
|
await rpc.login();
|
||||||
|
Logger.log('Connected to Discord');
|
||||||
|
rpc.on("ready", updateActivity);
|
||||||
|
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})`);
|
||||||
|
setTimeout(() => connectWithRetry(retryCount + 1), RETRY_DELAY);
|
||||||
|
} else {
|
||||||
|
Logger.log('Failed to connect to Discord after maximum retry attempts');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -110,22 +134,8 @@ const getActivity = (): Presence => {
|
|||||||
* Set up the discord rpc and listen on globalEvents.updateInfo
|
* Set up the discord rpc and listen on globalEvents.updateInfo
|
||||||
*/
|
*/
|
||||||
export const initRPC = () => {
|
export const initRPC = () => {
|
||||||
rpc = new Client({ transport: "ipc" });
|
rpc = new Client({ transport: {type: "ipc"}, clientId });
|
||||||
rpc.login({ clientId }).then(
|
connectWithRetry();
|
||||||
() => {
|
|
||||||
rpc.on("ready", () => {
|
|
||||||
updateActivity();
|
|
||||||
});
|
|
||||||
|
|
||||||
const { updateInfo, play, pause, playPause } = globalEvents;
|
|
||||||
[updateInfo, play, pause, playPause].forEach((status) => {
|
|
||||||
ipcMain.on(status, observer);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
() => {
|
|
||||||
Logger.log("Can't connect to Discord, is it running?");
|
|
||||||
}
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -133,7 +143,7 @@ export const initRPC = () => {
|
|||||||
*/
|
*/
|
||||||
export const unRPC = () => {
|
export const unRPC = () => {
|
||||||
if (rpc) {
|
if (rpc) {
|
||||||
rpc.clearActivity();
|
rpc.user?.clearActivity();
|
||||||
rpc.destroy();
|
rpc.destroy();
|
||||||
rpc = null;
|
rpc = null;
|
||||||
ipcMain.removeListener(globalEvents.updateInfo, observer);
|
ipcMain.removeListener(globalEvents.updateInfo, observer);
|
||||||
|
@ -69,6 +69,7 @@ export const settingsStore = new Store({
|
|||||||
singleInstance: true,
|
singleInstance: true,
|
||||||
skipArtists: false,
|
skipArtists: false,
|
||||||
skippedArtists: [""],
|
skippedArtists: [""],
|
||||||
|
staticWindowTitle: false,
|
||||||
theme: "none",
|
theme: "none",
|
||||||
trayIcon: true,
|
trayIcon: true,
|
||||||
updateFrequency: 500,
|
updateFrequency: 500,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user