mirror of
https://github.com/Mastermindzh/tidal-hifi.git
synced 2025-09-14 23:59:18 +02:00
Compare commits
4 Commits
5.18.0
...
3f87ca82f1
| Author | SHA1 | Date | |
|---|---|---|---|
|
3f87ca82f1 | ||
|
9966561079 | ||
|
|
da0893392a | ||
|
|
3f8ead8a05 |
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
@@ -9,7 +9,6 @@ on:
|
||||
branches-ignore:
|
||||
- master
|
||||
- develop
|
||||
workflow_dispatch:
|
||||
jobs:
|
||||
build_on_linux:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -21,7 +20,7 @@ jobs:
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 22.4
|
||||
node-version: 19
|
||||
- run: npm install
|
||||
- run: npm run build
|
||||
|
||||
@@ -31,7 +30,7 @@ jobs:
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 22.4
|
||||
node-version: 19
|
||||
- run: npm install
|
||||
- run: npm run build
|
||||
|
||||
@@ -41,6 +40,6 @@ jobs:
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 22.4
|
||||
node-version: 19
|
||||
- run: npm install
|
||||
- run: npm run build
|
||||
|
||||
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
@@ -8,7 +8,6 @@ on:
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build_on_linux:
|
||||
@@ -21,7 +20,7 @@ jobs:
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 22.4
|
||||
node-version: 19
|
||||
- run: npm install
|
||||
- run: npm run build
|
||||
- uses: actions/upload-artifact@master
|
||||
@@ -35,7 +34,7 @@ jobs:
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 22.4
|
||||
node-version: 19
|
||||
- run: npm install
|
||||
- run: npm run build
|
||||
- uses: actions/upload-artifact@master
|
||||
@@ -49,7 +48,7 @@ jobs:
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 22.4
|
||||
node-version: 19
|
||||
- run: npm install
|
||||
- run: npm run build
|
||||
- uses: actions/upload-artifact@master
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
POST /settings/skipped-artists HTTP/1.1
|
||||
Host: localhost:47836
|
||||
Content-Type: application/json
|
||||
|
||||
["abc", "def"]
|
||||
@@ -1,2 +0,0 @@
|
||||
POST /settings/skipped-artists/current HTTP/1.1
|
||||
Host: localhost:47836
|
||||
@@ -1,5 +0,0 @@
|
||||
POST /settings/skipped-artists/delete HTTP/1.1
|
||||
Host: localhost:47836
|
||||
Content-Type: application/json
|
||||
|
||||
["abc", "def"]
|
||||
@@ -1,2 +0,0 @@
|
||||
DELETE /settings/skipped-artists/current HTTP/1.1
|
||||
Host: localhost:47836
|
||||
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@@ -2,7 +2,6 @@
|
||||
"cSpell.words": [
|
||||
"Brainz",
|
||||
"Castlabs",
|
||||
"Fi's",
|
||||
"flac",
|
||||
"Flatpak",
|
||||
"geqnfr",
|
||||
@@ -14,6 +13,7 @@
|
||||
"rescrobbler",
|
||||
"scrobble",
|
||||
"scrobbling",
|
||||
"Songwhip",
|
||||
"trackid",
|
||||
"tracklist",
|
||||
"widevine",
|
||||
|
||||
62
CHANGELOG.md
62
CHANGELOG.md
@@ -4,68 +4,6 @@ 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)
|
||||
- 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]
|
||||
|
||||
- Fix issue #449 Discord RPC stuck on "Browsing Tidal".
|
||||
- Fix issue #448 Add option to disable the discord rpc idle text
|
||||
- Notifications are now send at the end of the update process, allowing other events to happen sooner.
|
||||
|
||||
## [5.15.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
|
||||
- implements [#437](https://github.com/Mastermindzh/tidal-hifi/issues/437)
|
||||
|
||||
## [5.14.1]
|
||||
|
||||
- Fixed `getAlbumName` not finding album name whilst on queue page
|
||||
- Added all mediaInfo to mpris interface using the `custom:` prefix
|
||||
|
||||
## [5.14]
|
||||
|
||||
- Simplified `MediaInfo` & `Options` types
|
||||
- Added `playingFrom` information to the info API
|
||||
- also changed the way we update Album info since Playing From now shows the correct Album.
|
||||
- API now allows you to set the `hostname` so you can control who can interact with the API.
|
||||
- Reworked swagger generation hotfix to properly generate `swagger.json` during the compile step
|
||||
- Might switch to tsoa in the future, idk yet.
|
||||
- Added [Tidal Magazine](https://tidal.com/magazine/) integration (in the menubar or use `Ctrl + M`)
|
||||
|
||||
## [5.13.1]
|
||||
|
||||
- removed Swagger generation step in favor of pre-generated file.
|
||||
- This also fixes the API issue [#409](https://github.com/Mastermindzh/tidal-hifi/issues/409)
|
||||
- This also stops TIDAL-hifi from scanning your entire home directory... the glob was very broad apparently.
|
||||
|
||||
## [5.13.0]
|
||||
|
||||
- Fixed [#403](https://github.com/Mastermindzh/tidal-hifi/issues/403) "cannot read shuffle of undefined" error
|
||||
- Added an API to add & delete entries from the skippedArtists list in the settings. fixes [#405](https://github.com/Mastermindzh/tidal-hifi/issues/405)
|
||||
- `GET /settings/skipped-artists` -> get list of skipped artists
|
||||
- `POST /settings/skipped-artists` -> add to the list of skipped artists
|
||||
- `POST /settings/skipped-artists/delete` -> delete from the list of skipped artists
|
||||
- `POST /settings/skipped-artists/current` -> skip the current artist
|
||||
- `DELETE /settings/skipped-artists/current` -> delete the current artist from the skip list
|
||||
- Added Swagger documentation to the new endpoints:
|
||||
|
||||
- CORS support added by [Mjokfox](https://github.com/Mjokfox)
|
||||
|
||||
## [5.12.0]
|
||||
|
||||
- Added Shuffle and Repeat state to API response - By [ThatGravyBoat](https://github.com/ThatGravyBoat)
|
||||
|
||||
12
README.md
12
README.md
@@ -26,7 +26,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
|
||||
- [Using source](#using-source)
|
||||
- [Integrations](#integrations)
|
||||
- [Known bugs](#known-bugs)
|
||||
- [DRM not working on Windows (error S6007)](#drm-not-working-on-windows-error-s6007)
|
||||
- [DRM not working on Windows](#drm-not-working-on-windows)
|
||||
- [Special thanks to](#special-thanks-to)
|
||||
- [Donations](#donations)
|
||||
- [Images](#images)
|
||||
@@ -43,13 +43,13 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
|
||||
- Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
|
||||
- Better icons thanks to [Papirus-icon-theme](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/)
|
||||
- [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
|
||||
- API for status, playback and settings (see the [/docs](http://localhost:47836/docs/) route)
|
||||
- API for status and playback
|
||||
- Disabled audio & visual ads, unlocked lyrics, suggested track, track info, and unlimited skips thanks to uBlockOrigin custom filters ([source](https://github.com/uBlockOrigin/uAssets/issues/17495))
|
||||
- AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
|
||||
- Custom [integrations](#integrations)
|
||||
- [ListenBrainz](https://listenbrainz.org/?redirect=false) integration
|
||||
- Songwhip.com integration (hotkey `ctrl + w`)
|
||||
- Discord RPC integration (showing "now listening", "Browsing", etc)
|
||||
- Flatpak version only works if both Discord and Tidal-HiFi are flatpaks
|
||||
- MPRIS integration
|
||||
- UI + Json config (`~/.config/tidal-hifi/`, or `~/.var/app/com.mastermindzh.tidal-hifi/` for Flatpak)
|
||||
|
||||
@@ -130,7 +130,7 @@ nix-env -iA nixpkgs.tidal-hifi
|
||||
|
||||
To install and work with the code on this project follow these steps:
|
||||
|
||||
- `git clone https://github.com/Mastermindzh/tidal-hifi.git`
|
||||
- `git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git)`
|
||||
- `cd tidal-hifi`
|
||||
- `npm install`
|
||||
- `npm run watch` to watch for auto-reload of Typescript/SCSS changes.
|
||||
@@ -152,13 +152,11 @@ Integrations with other projects that are not included natively:
|
||||
|
||||
## Known bugs
|
||||
|
||||
### DRM not working on Windows (error S6007)
|
||||
### DRM not working on Windows
|
||||
|
||||
Most Windows users run into DRM issues when trying to use TIDAL Hi-Fi.
|
||||
Nothing I can do about that I'm afraid... Tidal is working on removing/changing DRM so when they finish with that we can give it another shot.
|
||||
|
||||
Until then you'll have to use the official app unfortunately.
|
||||
|
||||
## Special thanks to
|
||||
|
||||
- [Castlabs](https://castlabs.com/)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 88 KiB |
17263
package-lock.json
generated
17263
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
155
package.json
155
package.json
@@ -1,83 +1,76 @@
|
||||
{
|
||||
"name": "tidal-hifi",
|
||||
"version": "5.18.0",
|
||||
"description": "Tidal on Electron with widevine(hifi) support",
|
||||
"main": "ts-dist/main.js",
|
||||
"scripts": {
|
||||
"start": "electron --inspect=0.0.0.0:5858 .",
|
||||
"watchStart": "nodemon dist -x \"npm run start\"",
|
||||
"compile": "tsc && npm run sass-and-copy",
|
||||
"deps": "npm run watch",
|
||||
"watch": "tsc-watch --onSuccess \"npm run compile-all\"",
|
||||
"copy-files": "copyfiles -u 1 --exclude './src/**/*.ts' --exclude './src/**/*.scss' \"./src/**/*\" ts-dist",
|
||||
"copy-themes-dev": "copyfiles -u 1 \"./themes/*\" node_modules/electron/dist/resources",
|
||||
"compile-all": "npm run sass-and-copy && ts-node scripts/generate-swagger.ts",
|
||||
"sass-and-copy": "npm run sass && npm run copy-files && npm run copy-themes-dev",
|
||||
"build": "npm run builder -- -c ./build/electron-builder.yml",
|
||||
"build-deb": "npm run builder -- -c ./build/electron-builder.deb.yml",
|
||||
"build-unpacked": "npm run builder -- -c ./build/electron-builder.unpacked.yml",
|
||||
"build-rpm": "npm run builder -- -c ./build/electron-builder.rpm.yml",
|
||||
"build-snap": "npm run builder -- -c ./build/electron-builder.snap.yml",
|
||||
"build-arch": "npm run builder -- -c ./build/electron-builder.pacman.yml",
|
||||
"build-wl": "npm run builder -- -c ./build/electron-builder.yml -wl",
|
||||
"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",
|
||||
"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",
|
||||
"style-lint-fix": "npx stylelint --fix **/*.scss"
|
||||
},
|
||||
"keywords": [
|
||||
"electron",
|
||||
"hifi",
|
||||
"widevine",
|
||||
"linux",
|
||||
"drm",
|
||||
"castlabs"
|
||||
],
|
||||
"author": "Rick van Lieshout <info@rickvanlieshout.com> (http://rickvanlieshout.com)",
|
||||
"homepage": "https://github.com/Mastermindzh/tidal-hifi",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@electron/remote": "^2.1.2",
|
||||
"@types/swagger-jsdoc": "^6.0.4",
|
||||
"@xhayper/discord-rpc": "^1.2.0",
|
||||
"axios": "^1.7.9",
|
||||
"cors": "^2.8.5",
|
||||
"electron-store": "^8.2.0",
|
||||
"express": "^4.21.2",
|
||||
"hotkeys-js": "^3.13.9",
|
||||
"mpris-service": "^2.1.2",
|
||||
"request": "^2.88.2",
|
||||
"sass": "^1.79.4",
|
||||
"swagger-ui-express": "^5.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@mastermindzh/prettier-config": "^1.0.0",
|
||||
"@types/cors": "^2.8.17",
|
||||
"@types/express": "^4.17.21",
|
||||
"@types/node": "^20.14.10",
|
||||
"@types/request": "^2.48.12",
|
||||
"@types/swagger-ui-express": "^4.1.6",
|
||||
"@typescript-eslint/eslint-plugin": "^7.16.0",
|
||||
"@typescript-eslint/parser": "^7.15.0",
|
||||
"copyfiles": "^2.4.1",
|
||||
"electron": "git+https://github.com/castlabs/electron-releases#v31.1.0+wvcus",
|
||||
"electron-builder": "~24.9.4",
|
||||
"eslint": "^8.57.0",
|
||||
"js-yaml": "^4.1.0",
|
||||
"markdown-toc": "^1.2.0",
|
||||
"nodemon": "^3.1.4",
|
||||
"prettier": "^3.3.2",
|
||||
"stylelint": "^16.6.1",
|
||||
"stylelint-config-standard": "^36.0.1",
|
||||
"stylelint-config-standard-scss": "^13.1.0",
|
||||
"stylelint-prettier": "^5.0.0",
|
||||
"swagger-jsdoc": "^6.2.8",
|
||||
"ts-node": "^10.9.2",
|
||||
"tsc-watch": "^6.2.0",
|
||||
"typescript": "^5.5.3"
|
||||
},
|
||||
"prettier": "@mastermindzh/prettier-config"
|
||||
"name": "tidal-hifi",
|
||||
"version": "5.13.0",
|
||||
"description": "Tidal on Electron with widevine(hifi) support",
|
||||
"main": "ts-dist/main.js",
|
||||
"scripts": {
|
||||
"start": "electron --inspect=0.0.0.0:5858 .",
|
||||
"watchStart": "nodemon dist -x \"npm run start\"",
|
||||
"compile": "tsc && npm run sass-and-copy",
|
||||
"deps": "npm run watch",
|
||||
"watch": "tsc-watch --onSuccess \"npm run sass-and-copy\"",
|
||||
"copy-files": "copyfiles -u 1 --exclude './src/**/*.ts' --exclude './src/**/*.scss' \"./src/**/*\" ts-dist",
|
||||
"copy-themes-dev": "copyfiles -u 1 \"./themes/*\" node_modules/electron/dist/resources",
|
||||
"sass-and-copy": "npm run sass && npm run copy-files && npm run copy-themes-dev",
|
||||
"build": "npm run builder -- -c ./build/electron-builder.yml",
|
||||
"build-deb": "npm run builder -- -c ./build/electron-builder.deb.yml",
|
||||
"build-unpacked": "npm run builder -- -c ./build/electron-builder.unpacked.yml",
|
||||
"build-rpm": "npm run builder -- -c ./build/electron-builder.rpm.yml",
|
||||
"build-snap": "npm run builder -- -c ./build/electron-builder.snap.yml",
|
||||
"build-arch": "npm run builder -- -c ./build/electron-builder.pacman.yml",
|
||||
"build-wl": "npm run builder -- -c ./build/electron-builder.yml -wl",
|
||||
"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",
|
||||
"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",
|
||||
"style-lint-fix": "npx stylelint --fix **/*.scss"
|
||||
},
|
||||
"keywords": [
|
||||
"electron",
|
||||
"hifi",
|
||||
"widevine",
|
||||
"linux",
|
||||
"drm",
|
||||
"castlabs"
|
||||
],
|
||||
"author": "Rick van Lieshout <info@rickvanlieshout.com> (http://rickvanlieshout.com)",
|
||||
"homepage": "https://github.com/Mastermindzh/tidal-hifi",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@electron/remote": "^2.1.2",
|
||||
"axios": "^1.6.8",
|
||||
"discord-rpc": "^4.0.1",
|
||||
"electron-store": "^8.2.0",
|
||||
"express": "^4.19.2",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
"hotkeys-js": "^3.13.7",
|
||||
"mpris-service": "^2.1.2",
|
||||
"request": "^2.88.2",
|
||||
"sass": "^1.75.0",
|
||||
"zustand": "^4.5.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@mastermindzh/prettier-config": "^1.0.0",
|
||||
"@types/discord-rpc": "^4.0.8",
|
||||
"@types/express": "^4.17.21",
|
||||
"@types/node": "^20.10.6",
|
||||
"@types/request": "^2.48.12",
|
||||
"@typescript-eslint/eslint-plugin": "^6.18.0",
|
||||
"@typescript-eslint/parser": "^6.18.0",
|
||||
"copyfiles": "^2.4.1",
|
||||
"electron": "git+https://github.com/castlabs/electron-releases#v28.1.1+wvcus",
|
||||
"electron-builder": "^24.9.1",
|
||||
"eslint": "^8.56.0",
|
||||
"nodemon": "^3.0.2",
|
||||
"prettier": "^3.1.1",
|
||||
"stylelint": "^16.1.0",
|
||||
"stylelint-config-standard": "^36.0.0",
|
||||
"stylelint-config-standard-scss": "^13.0.0",
|
||||
"stylelint-prettier": "^5.0.0",
|
||||
"tsc-watch": "^6.0.4",
|
||||
"typescript": "^5.3.3"
|
||||
},
|
||||
"prettier": "@mastermindzh/prettier-config"
|
||||
}
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
import fs from "fs";
|
||||
import swaggerjsdoc from "swagger-jsdoc";
|
||||
import packagejson from "./../package.json";
|
||||
|
||||
const specs = swaggerjsdoc({
|
||||
definition: {
|
||||
openapi: "3.1.0",
|
||||
info: {
|
||||
title: "TIDAL Hi-Fi API",
|
||||
version: packagejson.version,
|
||||
description: "",
|
||||
license: {
|
||||
name: packagejson.license,
|
||||
url: "https://github.com/Mastermindzh/tidal-hifi/blob/master/LICENSE",
|
||||
},
|
||||
contact: {
|
||||
name: "Rick <mastermindzh> van Lieshout",
|
||||
url: "https://www.rickvanlieshout.com",
|
||||
},
|
||||
},
|
||||
externalDocs: {
|
||||
description: "swagger.json",
|
||||
url: "swagger.json",
|
||||
},
|
||||
},
|
||||
apis: ["**/*.ts"],
|
||||
});
|
||||
|
||||
fs.writeFileSync("src/features/api/swagger.json", JSON.stringify(specs, null, 2), "utf8");
|
||||
console.log("Written swagger.json");
|
||||
@@ -16,19 +16,16 @@
|
||||
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"]',
|
||||
account: '*[class^="profileOptions"]',
|
||||
settings: '*[data-test^="open-settings"]',
|
||||
media: '*[data-test="current-media-imagery"]',
|
||||
image: "img",
|
||||
current: '*[data-test="current-time"]',
|
||||
duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
|
||||
duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
|
||||
bar: '*[data-test="progress-bar"]',
|
||||
footer: "#footerPlayer",
|
||||
mediaItem: "[data-type='mediaItem']",
|
||||
album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
|
||||
playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
|
||||
queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
|
||||
album_header_title: '.header-details [data-test="title"]',
|
||||
currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
|
||||
album_name_cell: '[class^="album"]',
|
||||
tracklist_row: '[data-test="tracklist-row"]',
|
||||
|
||||
@@ -10,9 +10,10 @@ export const globalEvents = {
|
||||
showSettings: "showSettings",
|
||||
storeChanged: "storeChanged",
|
||||
error: "error",
|
||||
getUniversalLink: "getUniversalLink",
|
||||
whip: "whip",
|
||||
downloadCover: "downloadCover",
|
||||
log: "log",
|
||||
toggleFavorite: "toggleFavorite",
|
||||
toggleShuffle: "toggleShuffle",
|
||||
toggleRepeat: "toggleRepeat",
|
||||
};
|
||||
} as const;
|
||||
|
||||
@@ -10,15 +10,10 @@
|
||||
*/
|
||||
export const settings = {
|
||||
adBlock: "adBlock",
|
||||
advanced: {
|
||||
root: "advanced",
|
||||
tidalUrl: "advanced.tidalUrl",
|
||||
},
|
||||
api: "api",
|
||||
apiSettings: {
|
||||
root: "apiSettings",
|
||||
port: "apiSettings.port",
|
||||
hostname: "apiSettings.hostname",
|
||||
},
|
||||
customCSS: "customCSS",
|
||||
disableBackgroundThrottle: "disableBackgroundThrottle",
|
||||
@@ -30,7 +25,6 @@ export const settings = {
|
||||
buttonText: "discord.buttonText",
|
||||
includeTimestamps: "discord.includeTimestamps",
|
||||
showSong: "discord.showSong",
|
||||
showIdle: "discord.showIdle",
|
||||
idleText: "discord.idleText",
|
||||
usingText: "discord.usingText",
|
||||
},
|
||||
@@ -55,7 +49,6 @@ export const settings = {
|
||||
singleInstance: "singleInstance",
|
||||
skipArtists: "skipArtists",
|
||||
skippedArtists: "skippedArtists",
|
||||
staticWindowTitle: "staticWindowTitle",
|
||||
theme: "theme",
|
||||
trayIcon: "trayIcon",
|
||||
updateFrequency: "updateFrequency",
|
||||
@@ -64,4 +57,4 @@ export const settings = {
|
||||
width: "windowBounds.width",
|
||||
height: "windowBounds.height",
|
||||
},
|
||||
};
|
||||
} as const;
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
export default {
|
||||
name: "TIDAL Hi-Fi",
|
||||
};
|
||||
@@ -1,123 +1,15 @@
|
||||
import { Request, Response, Router } from "express";
|
||||
import fs from "fs";
|
||||
import { mediaInfo } from "../../../scripts/mediaInfo";
|
||||
import { getLegacyMediaInfo, mainTidalState } from "../../state";
|
||||
|
||||
export const addCurrentInfo = (expressApp: Router) => {
|
||||
/**
|
||||
* @swagger
|
||||
* tags:
|
||||
* name: current
|
||||
* description: The current media info API
|
||||
* components:
|
||||
* schemas:
|
||||
* MediaInfo:
|
||||
* type: object
|
||||
* properties:
|
||||
* title:
|
||||
* type: string
|
||||
* artists:
|
||||
* type: string
|
||||
* album:
|
||||
* type: string
|
||||
* icon:
|
||||
* type: string
|
||||
* format: uri
|
||||
* playingFrom:
|
||||
* type: string
|
||||
* status:
|
||||
* type: string
|
||||
* url:
|
||||
* type: string
|
||||
* format: uri
|
||||
* current:
|
||||
* type: string
|
||||
* currentInSeconds:
|
||||
* type: integer
|
||||
* duration:
|
||||
* type: string
|
||||
* durationInSeconds:
|
||||
* type: integer
|
||||
* image:
|
||||
* type: string
|
||||
* format: uri
|
||||
* favorite:
|
||||
* type: boolean
|
||||
* player:
|
||||
* type: object
|
||||
* properties:
|
||||
* status:
|
||||
* type: string
|
||||
* shuffle:
|
||||
* type: boolean
|
||||
* repeat:
|
||||
* type: string
|
||||
* artist:
|
||||
* type: string
|
||||
* example:
|
||||
* title: "Sample Title"
|
||||
* artists: "Sample Artist"
|
||||
* album: "Sample Album"
|
||||
* icon: "/path/to/sample/icon.jpg"
|
||||
* playingFrom: "Sample Playlist"
|
||||
* status: "playing"
|
||||
* url: "https://tidal.com/browse/track/sample"
|
||||
* current: "1:23"
|
||||
* currentInSeconds: 83
|
||||
* duration: "3:45"
|
||||
* durationInSeconds: 225
|
||||
* image: "https://example.com/sample-image.jpg"
|
||||
* favorite: true
|
||||
* player:
|
||||
* status: "playing"
|
||||
* shuffle: true
|
||||
* repeat: "one"
|
||||
* artist: "Sample Artist"
|
||||
*/
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /current:
|
||||
* get:
|
||||
* summary: Get current media info
|
||||
* tags: [current]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Current media info
|
||||
* content:
|
||||
* application/json:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/MediaInfo'
|
||||
*/
|
||||
expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /current/image:
|
||||
* get:
|
||||
* summary: Get current media image
|
||||
* tags: [current]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Current media image
|
||||
* content:
|
||||
* image/png:
|
||||
* schema:
|
||||
* type: string
|
||||
* format: binary
|
||||
* 404:
|
||||
* description: Not found
|
||||
*/
|
||||
expressApp.get("/current", (_, res) => res.json(getLegacyMediaInfo()));
|
||||
expressApp.get("/current/image", getCurrentImage);
|
||||
};
|
||||
|
||||
export const getCurrentImage = (req: Request, res: Response) => {
|
||||
const stream = fs.createReadStream(mediaInfo.icon);
|
||||
stream.on("open", function () {
|
||||
res.set("Content-Type", "image/png");
|
||||
stream.pipe(res);
|
||||
});
|
||||
stream.on("error", function () {
|
||||
res.set("Content-Type", "text/plain");
|
||||
res.status(404).end("Not found");
|
||||
});
|
||||
export const getCurrentImage = (_: Request, res: Response) => {
|
||||
if (!mainTidalState.currentTrack) {
|
||||
res.sendStatus(404).end("No song is playing");
|
||||
return;
|
||||
}
|
||||
res.redirect(mainTidalState.currentTrack.image);
|
||||
};
|
||||
|
||||
@@ -1,164 +1,27 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import { BrowserWindow } from "electron";
|
||||
import { Router } from "express";
|
||||
import { globalEvents } from "../../../constants/globalEvents";
|
||||
import { settings } from "../../../constants/settings";
|
||||
import { MediaStatus } from "../../../models/mediaStatus";
|
||||
import { mediaInfo } from "../../../scripts/mediaInfo";
|
||||
import { settingsStore } from "../../../scripts/settings";
|
||||
import { handleWindowEvent } from "../helpers/handleWindowEvent";
|
||||
|
||||
export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow) => {
|
||||
const windowEvent = handleWindowEvent(mainWindow);
|
||||
const createRoute = (route: string) => `/player${route}`;
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* tags:
|
||||
* name: player
|
||||
* description: The player control API
|
||||
* components:
|
||||
* schemas:
|
||||
* OkResponse:
|
||||
* type: string
|
||||
* example: "OK"
|
||||
*/
|
||||
const createPlayerAction = (route: string, action: string) => {
|
||||
expressApp.post(createRoute(route), (req, res) => windowEvent(res, action));
|
||||
expressApp.post(`/player${route}`, (_, res) => {
|
||||
mainWindow.webContents.send("globalEvent", action);
|
||||
res.sendStatus(200);
|
||||
});
|
||||
};
|
||||
|
||||
if (settingsStore.get(settings.playBackControl)) {
|
||||
/**
|
||||
* @swagger
|
||||
* /player/play:
|
||||
* post:
|
||||
* summary: Play the current media
|
||||
* tags: [player]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
createPlayerAction("/play", globalEvents.play);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /player/favorite/toggle:
|
||||
* post:
|
||||
* summary: Add the current media to your favorites, or remove it if its already added to your favorites
|
||||
* tags: [player]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
createPlayerAction("/favorite/toggle", globalEvents.toggleFavorite);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /player/pause:
|
||||
* post:
|
||||
* summary: Pause the current media
|
||||
* tags: [player]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
createPlayerAction("/pause", globalEvents.pause);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /player/next:
|
||||
* post:
|
||||
* summary: Play the next song
|
||||
* tags: [player]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
createPlayerAction("/next", globalEvents.next);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /player/previous:
|
||||
* post:
|
||||
* summary: Play the previous song
|
||||
* tags: [player]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
createPlayerAction("/previous", globalEvents.previous);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /player/shuffle/toggle:
|
||||
* post:
|
||||
* summary: Play the previous song
|
||||
* tags: [player]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
createPlayerAction("/shuffle/toggle", globalEvents.toggleShuffle);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /player/repeat/toggle:
|
||||
* post:
|
||||
* summary: Toggle the repeat status, toggles between "off" , "single" and "all"
|
||||
* tags: [player]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
createPlayerAction("/repeat/toggle", globalEvents.toggleRepeat);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /player/playpause:
|
||||
* post:
|
||||
* summary: Start playing the media if paused, or pause the media if playing
|
||||
* tags: [player]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
expressApp.post(createRoute("/playpause"), (req, res) => {
|
||||
if (mediaInfo.status === MediaStatus.playing) {
|
||||
windowEvent(res, globalEvents.pause);
|
||||
} else {
|
||||
windowEvent(res, globalEvents.play);
|
||||
}
|
||||
});
|
||||
createPlayerAction("/playpause", globalEvents.playPause);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,121 +0,0 @@
|
||||
import { Request, Router } from "express";
|
||||
import { settings } from "../../../../constants/settings";
|
||||
import { mediaInfo } from "../../../../scripts/mediaInfo";
|
||||
import {
|
||||
addSkippedArtists,
|
||||
removeSkippedArtists,
|
||||
settingsStore,
|
||||
} from "../../../../scripts/settings";
|
||||
import { BrowserWindow } from "electron";
|
||||
import { globalEvents } from "../../../../constants/globalEvents";
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* tags:
|
||||
* name: settings
|
||||
* description: The settings management API
|
||||
* components:
|
||||
* schemas:
|
||||
* StringArray:
|
||||
* type: array
|
||||
* items:
|
||||
* type: string
|
||||
* example: ["Artist1", "Artist2"]
|
||||
*
|
||||
* @param expressApp
|
||||
* @param mainWindow
|
||||
*/
|
||||
export const addSettingsAPI = (expressApp: Router, mainWindow: BrowserWindow) => {
|
||||
/**
|
||||
* @swagger
|
||||
* /settings/skipped-artists:
|
||||
* get:
|
||||
* summary: get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled
|
||||
* tags: [settings]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: The list book.
|
||||
* content:
|
||||
* application/json:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/StringArray'
|
||||
*/
|
||||
expressApp.get("/settings/skipped-artists", (req, res) => {
|
||||
res.json(settingsStore.get<string, string[]>(settings.skippedArtists));
|
||||
});
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /settings/skipped-artists:
|
||||
* post:
|
||||
* summary: Add new artists to the list of skipped artists
|
||||
* tags: [settings]
|
||||
* requestBody:
|
||||
* required: true
|
||||
* content:
|
||||
* application/json:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/StringArray'
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
*/
|
||||
expressApp.post("/settings/skipped-artists", (req: Request<object, object, string[]>, res) => {
|
||||
addSkippedArtists(req.body);
|
||||
res.sendStatus(200);
|
||||
});
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /settings/skipped-artists/delete:
|
||||
* post:
|
||||
* summary: Remove artists from the list of skipped artists
|
||||
* tags: [settings]
|
||||
* requestBody:
|
||||
* required: true
|
||||
* content:
|
||||
* application/json:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/StringArray'
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
*/
|
||||
expressApp.post(
|
||||
"/settings/skipped-artists/delete",
|
||||
(req: Request<object, object, string[]>, res) => {
|
||||
removeSkippedArtists(req.body);
|
||||
res.sendStatus(200);
|
||||
}
|
||||
);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /settings/skipped-artists/current:
|
||||
* post:
|
||||
* summary: Add the current artist to the list of skipped artists
|
||||
* tags: [settings]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
*/
|
||||
expressApp.post("/settings/skipped-artists/current", (req, res) => {
|
||||
addSkippedArtists([mediaInfo.artists]);
|
||||
mainWindow.webContents.send("globalEvent", globalEvents.next);
|
||||
res.sendStatus(200);
|
||||
});
|
||||
/**
|
||||
* @swagger
|
||||
* /settings/skipped-artists/current:
|
||||
* delete:
|
||||
* summary: Remove the current artist from the list of skipped artists
|
||||
* tags: [settings]
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
*/
|
||||
expressApp.delete("/settings/skipped-artists/current", (req, res) => {
|
||||
removeSkippedArtists([mediaInfo.artists]);
|
||||
res.sendStatus(200);
|
||||
});
|
||||
};
|
||||
@@ -1,12 +0,0 @@
|
||||
import { BrowserWindow } from "electron";
|
||||
import { Response } from "express";
|
||||
|
||||
/**
|
||||
* Shorthand to handle a fire and forget global event
|
||||
* @param {*} res
|
||||
* @param {*} action
|
||||
*/
|
||||
export const handleWindowEvent = (mainWindow: BrowserWindow) => (res: Response, action: string) => {
|
||||
mainWindow.webContents.send("globalEvent", action);
|
||||
res.sendStatus(200);
|
||||
};
|
||||
@@ -1,36 +1,25 @@
|
||||
import cors from "cors";
|
||||
import { BrowserWindow, dialog } from "electron";
|
||||
import express from "express";
|
||||
import swaggerUi from "swagger-ui-express";
|
||||
import { settings } from "../../constants/settings";
|
||||
import { settingsStore } from "../../scripts/settings";
|
||||
import { settings } from "./../../constants/settings";
|
||||
import { addCurrentInfo } from "./features/current";
|
||||
import { addPlaybackControl } from "./features/player";
|
||||
import { addSettingsAPI } from "./features/settings/settings";
|
||||
import { addLegacyApi } from "./legacy";
|
||||
import swaggerSpec from "./swagger.json";
|
||||
|
||||
/**
|
||||
* Function to enable TIDAL Hi-Fi's express api
|
||||
*/
|
||||
export const startApi = (mainWindow: BrowserWindow) => {
|
||||
const port = settingsStore.get<string, number>(settings.apiSettings.port);
|
||||
const hostname = settingsStore.get<string, string>(settings.apiSettings.hostname) ?? "127.0.0.1";
|
||||
|
||||
const expressApp = express();
|
||||
expressApp.use(cors());
|
||||
expressApp.use(express.json());
|
||||
expressApp.use("/docs", swaggerUi.serve, swaggerUi.setup(swaggerSpec));
|
||||
expressApp.get("/", (req, res) => res.send("Hello World!"));
|
||||
expressApp.get("/swagger.json", (req, res) => res.json(swaggerSpec));
|
||||
|
||||
// add features
|
||||
addLegacyApi(expressApp, mainWindow);
|
||||
addPlaybackControl(expressApp, mainWindow);
|
||||
addCurrentInfo(expressApp);
|
||||
addSettingsAPI(expressApp, mainWindow);
|
||||
|
||||
const expressInstance = expressApp.listen(port, hostname);
|
||||
const port = settingsStore.get<string, number>(settings.apiSettings.port);
|
||||
const expressInstance = expressApp.listen(port, "127.0.0.1");
|
||||
expressInstance.on("error", function (e: { code: string }) {
|
||||
let message = e.code;
|
||||
if (e.code === "EADDRINUSE") {
|
||||
|
||||
@@ -2,8 +2,6 @@ import { BrowserWindow } from "electron";
|
||||
import { Response, Router } from "express";
|
||||
import { globalEvents } from "../../constants/globalEvents";
|
||||
import { settings } from "../../constants/settings";
|
||||
import { MediaStatus } from "../../models/mediaStatus";
|
||||
import { mediaInfo } from "../../scripts/mediaInfo";
|
||||
import { settingsStore } from "../../scripts/settings";
|
||||
import { getCurrentImage } from "./features/current";
|
||||
|
||||
@@ -13,139 +11,20 @@ import { getCurrentImage } from "./features/current";
|
||||
* @param mainWindow
|
||||
*/
|
||||
export const addLegacyApi = (expressApp: Router, mainWindow: BrowserWindow) => {
|
||||
/**
|
||||
* @swagger
|
||||
* /image:
|
||||
* get:
|
||||
* summary: Get current image
|
||||
* tags: [legacy]
|
||||
* deprecated: true
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Current image
|
||||
* content:
|
||||
* image/png:
|
||||
* schema:
|
||||
* type: string
|
||||
* format: binary
|
||||
* 404:
|
||||
* description: Not found
|
||||
*/
|
||||
expressApp.get("/image", getCurrentImage);
|
||||
|
||||
if (settingsStore.get(settings.playBackControl)) {
|
||||
addLegacyControls();
|
||||
}
|
||||
function addLegacyControls() {
|
||||
/**
|
||||
* @swagger
|
||||
* /play:
|
||||
* get:
|
||||
* summary: Play the current media
|
||||
* tags: [legacy]
|
||||
* deprecated: true
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Action performed
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
expressApp.get("/play", ({ res }) => handleGlobalEvent(res, globalEvents.play));
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /favorite/toggle:
|
||||
* get:
|
||||
* summary: Add the current media to your favorites, or remove it if its already added to your favorites
|
||||
* tags: [legacy]
|
||||
* deprecated: true
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
expressApp.post("/favorite/toggle", (req, res) =>
|
||||
handleGlobalEvent(res, globalEvents.toggleFavorite)
|
||||
);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /pause:
|
||||
* get:
|
||||
* summary: Pause the current media
|
||||
* tags: [legacy]
|
||||
* deprecated: true
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
expressApp.get("/pause", (req, res) => handleGlobalEvent(res, globalEvents.pause));
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /next:
|
||||
* get:
|
||||
* summary: Play the next song
|
||||
* tags: [legacy]
|
||||
* deprecated: true
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
expressApp.get("/next", (req, res) => handleGlobalEvent(res, globalEvents.next));
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /previous:
|
||||
* get:
|
||||
* summary: Play the previous song
|
||||
* tags: [legacy]
|
||||
* deprecated: true
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
expressApp.get("/previous", (req, res) => handleGlobalEvent(res, globalEvents.previous));
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
* /playpause:
|
||||
* get:
|
||||
* summary: Toggle play/pause
|
||||
* tags: [legacy]
|
||||
* deprecated: true
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Ok
|
||||
* content:
|
||||
* text/plain:
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/OkResponse'
|
||||
*/
|
||||
expressApp.get("/playpause", (req, res) => {
|
||||
if (mediaInfo.status === MediaStatus.playing) {
|
||||
handleGlobalEvent(res, globalEvents.pause);
|
||||
} else {
|
||||
handleGlobalEvent(res, globalEvents.play);
|
||||
}
|
||||
});
|
||||
expressApp.get("/playpause", (req, res) => handleGlobalEvent(res, globalEvents.playPause));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,582 +0,0 @@
|
||||
{
|
||||
"openapi": "3.1.0",
|
||||
"info": {
|
||||
"title": "TIDAL Hi-Fi API",
|
||||
"version": "5.18.0",
|
||||
"description": "",
|
||||
"license": {
|
||||
"name": "MIT",
|
||||
"url": "https://github.com/Mastermindzh/tidal-hifi/blob/master/LICENSE"
|
||||
},
|
||||
"contact": {
|
||||
"name": "Rick <mastermindzh> van Lieshout",
|
||||
"url": "https://www.rickvanlieshout.com"
|
||||
}
|
||||
},
|
||||
"externalDocs": {
|
||||
"description": "swagger.json",
|
||||
"url": "swagger.json"
|
||||
},
|
||||
"paths": {
|
||||
"/current": {
|
||||
"get": {
|
||||
"summary": "Get current media info",
|
||||
"tags": [
|
||||
"current"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Current media info",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/MediaInfo"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/current/image": {
|
||||
"get": {
|
||||
"summary": "Get current media image",
|
||||
"tags": [
|
||||
"current"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Current media image",
|
||||
"content": {
|
||||
"image/png": {
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"format": "binary"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"404": {
|
||||
"description": "Not found"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/player/play": {
|
||||
"post": {
|
||||
"summary": "Play the current media",
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/player/favorite/toggle": {
|
||||
"post": {
|
||||
"summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/player/pause": {
|
||||
"post": {
|
||||
"summary": "Pause the current media",
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/player/next": {
|
||||
"post": {
|
||||
"summary": "Play the next song",
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/player/previous": {
|
||||
"post": {
|
||||
"summary": "Play the previous song",
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/player/shuffle/toggle": {
|
||||
"post": {
|
||||
"summary": "Play the previous song",
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/player/repeat/toggle": {
|
||||
"post": {
|
||||
"summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/player/playpause": {
|
||||
"post": {
|
||||
"summary": "Start playing the media if paused, or pause the media if playing",
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/settings/skipped-artists": {
|
||||
"get": {
|
||||
"summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "The list book.",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/StringArray"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"post": {
|
||||
"summary": "Add new artists to the list of skipped artists",
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"requestBody": {
|
||||
"required": true,
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/StringArray"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/settings/skipped-artists/delete": {
|
||||
"post": {
|
||||
"summary": "Remove artists from the list of skipped artists",
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"requestBody": {
|
||||
"required": true,
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/StringArray"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/settings/skipped-artists/current": {
|
||||
"post": {
|
||||
"summary": "Add the current artist to the list of skipped artists",
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok"
|
||||
}
|
||||
}
|
||||
},
|
||||
"delete": {
|
||||
"summary": "Remove the current artist from the list of skipped artists",
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/image": {
|
||||
"get": {
|
||||
"summary": "Get current image",
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Current image",
|
||||
"content": {
|
||||
"image/png": {
|
||||
"schema": {
|
||||
"type": "string",
|
||||
"format": "binary"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"404": {
|
||||
"description": "Not found"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/play": {
|
||||
"get": {
|
||||
"summary": "Play the current media",
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Action performed",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/favorite/toggle": {
|
||||
"get": {
|
||||
"summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/pause": {
|
||||
"get": {
|
||||
"summary": "Pause the current media",
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/next": {
|
||||
"get": {
|
||||
"summary": "Play the next song",
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/previous": {
|
||||
"get": {
|
||||
"summary": "Play the previous song",
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/playpause": {
|
||||
"get": {
|
||||
"summary": "Toggle play/pause",
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
"content": {
|
||||
"text/plain": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/OkResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"components": {
|
||||
"schemas": {
|
||||
"MediaInfo": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"title": {
|
||||
"type": "string"
|
||||
},
|
||||
"artists": {
|
||||
"type": "string"
|
||||
},
|
||||
"album": {
|
||||
"type": "string"
|
||||
},
|
||||
"icon": {
|
||||
"type": "string",
|
||||
"format": "uri"
|
||||
},
|
||||
"playingFrom": {
|
||||
"type": "string"
|
||||
},
|
||||
"status": {
|
||||
"type": "string"
|
||||
},
|
||||
"url": {
|
||||
"type": "string",
|
||||
"format": "uri"
|
||||
},
|
||||
"current": {
|
||||
"type": "string"
|
||||
},
|
||||
"currentInSeconds": {
|
||||
"type": "integer"
|
||||
},
|
||||
"duration": {
|
||||
"type": "string"
|
||||
},
|
||||
"durationInSeconds": {
|
||||
"type": "integer"
|
||||
},
|
||||
"image": {
|
||||
"type": "string",
|
||||
"format": "uri"
|
||||
},
|
||||
"favorite": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"player": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"status": {
|
||||
"type": "string"
|
||||
},
|
||||
"shuffle": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"repeat": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
},
|
||||
"artist": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"example": {
|
||||
"title": "Sample Title",
|
||||
"artists": "Sample Artist",
|
||||
"album": "Sample Album",
|
||||
"icon": "/path/to/sample/icon.jpg",
|
||||
"playingFrom": "Sample Playlist",
|
||||
"status": "playing",
|
||||
"url": "https://tidal.com/browse/track/sample",
|
||||
"current": "1:23",
|
||||
"currentInSeconds": 83,
|
||||
"duration": "3:45",
|
||||
"durationInSeconds": 225,
|
||||
"image": "https://example.com/sample-image.jpg",
|
||||
"favorite": true,
|
||||
"player": {
|
||||
"status": "playing",
|
||||
"shuffle": true,
|
||||
"repeat": "one"
|
||||
},
|
||||
"artist": "Sample Artist"
|
||||
}
|
||||
},
|
||||
"OkResponse": {
|
||||
"type": "string",
|
||||
"example": "OK"
|
||||
},
|
||||
"StringArray": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"example": [
|
||||
"Artist1",
|
||||
"Artist2"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"tags": [
|
||||
{
|
||||
"name": "current",
|
||||
"description": "The current media info API"
|
||||
},
|
||||
{
|
||||
"name": "player",
|
||||
"description": "The player control API"
|
||||
},
|
||||
{
|
||||
"name": "settings",
|
||||
"description": "The settings management API"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
import axios from "axios";
|
||||
import Store from "electron-store";
|
||||
import { settings } from "../../constants/settings";
|
||||
import { MediaStatus } from "../../models/mediaStatus";
|
||||
import { settingsStore } from "../../scripts/settings";
|
||||
import { Logger } from "../logger";
|
||||
import { StoreData } from "./models/storeData";
|
||||
@@ -43,87 +42,81 @@ export class ListenBrainz {
|
||||
duration: number
|
||||
): Promise<void> {
|
||||
try {
|
||||
if (status === MediaStatus.paused) {
|
||||
return;
|
||||
} else {
|
||||
// Fetches the oldData required for scrobbling and proceeds to construct a playing_now data payload for the Playing Now area
|
||||
const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
|
||||
const tidalUrl =
|
||||
settingsStore.get<string, string>(settings.advanced.tidalUrl) ||
|
||||
"https://listen.tidal.com";
|
||||
const playing_data = {
|
||||
listen_type: "playing_now",
|
||||
payload: [
|
||||
{
|
||||
track_metadata: {
|
||||
additional_info: {
|
||||
media_player: "Tidal Hi-Fi",
|
||||
submission_client: "Tidal Hi-Fi",
|
||||
music_service: "tidal.com",
|
||||
duration: duration,
|
||||
},
|
||||
artist_name: artists,
|
||||
track_name: title,
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
await axios.post(
|
||||
`${settingsStore.get<string, string>(settings.ListenBrainz.api)}/1/submit-listens`,
|
||||
playing_data,
|
||||
if (status === "Paused") return;
|
||||
// Fetches the oldData required for scrobbling and proceeds to construct a playing_now data payload for the Playing Now area
|
||||
const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
|
||||
const playing_data = {
|
||||
listen_type: "playing_now",
|
||||
payload: [
|
||||
{
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: `Token ${settingsStore.get<string, string>(
|
||||
settings.ListenBrainz.token
|
||||
)}`,
|
||||
track_metadata: {
|
||||
additional_info: {
|
||||
media_player: "Tidal Hi-Fi",
|
||||
submission_client: "Tidal Hi-Fi",
|
||||
music_service: "tidal.com",
|
||||
duration: duration,
|
||||
},
|
||||
artist_name: artists,
|
||||
track_name: title,
|
||||
},
|
||||
}
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
await axios.post(
|
||||
`${settingsStore.get<string, string>(settings.ListenBrainz.api)}/1/submit-listens`,
|
||||
playing_data,
|
||||
{
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: `Token ${settingsStore.get<string, string>(
|
||||
settings.ListenBrainz.token
|
||||
)}`,
|
||||
},
|
||||
}
|
||||
);
|
||||
if (!oldData) {
|
||||
ListenBrainzStore.set(
|
||||
ListenBrainzConstants.oldData,
|
||||
this.constructStoreData(title, artists, duration)
|
||||
);
|
||||
if (!oldData) {
|
||||
} else {
|
||||
if (oldData.title !== title) {
|
||||
// This constructs the data required to scrobble the data after the song finishes
|
||||
const scrobble_data = {
|
||||
listen_type: "single",
|
||||
payload: [
|
||||
{
|
||||
listened_at: oldData.listenedAt,
|
||||
track_metadata: {
|
||||
additional_info: {
|
||||
media_player: "Tidal Hi-Fi",
|
||||
submission_client: "Tidal Hi-Fi",
|
||||
music_service: "listen.tidal.com",
|
||||
duration: oldData.duration,
|
||||
},
|
||||
artist_name: oldData.artists,
|
||||
track_name: oldData.title,
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
await axios.post(
|
||||
`${settingsStore.get<string, string>(settings.ListenBrainz.api)}/1/submit-listens`,
|
||||
scrobble_data,
|
||||
{
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: `Token ${settingsStore.get<string, string>(
|
||||
settings.ListenBrainz.token
|
||||
)}`,
|
||||
},
|
||||
}
|
||||
);
|
||||
ListenBrainzStore.set(
|
||||
ListenBrainzConstants.oldData,
|
||||
this.constructStoreData(title, artists, duration)
|
||||
);
|
||||
} else {
|
||||
if (oldData.title !== title) {
|
||||
// This constructs the data required to scrobble the data after the song finishes
|
||||
const scrobble_data = {
|
||||
listen_type: "single",
|
||||
payload: [
|
||||
{
|
||||
listened_at: oldData.listenedAt,
|
||||
track_metadata: {
|
||||
additional_info: {
|
||||
media_player: "Tidal Hi-Fi",
|
||||
submission_client: "Tidal Hi-Fi",
|
||||
music_service: tidalUrl,
|
||||
duration: oldData.duration,
|
||||
},
|
||||
artist_name: oldData.artists,
|
||||
track_name: oldData.title,
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
await axios.post(
|
||||
`${settingsStore.get<string, string>(settings.ListenBrainz.api)}/1/submit-listens`,
|
||||
scrobble_data,
|
||||
{
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Authorization: `Token ${settingsStore.get<string, string>(
|
||||
settings.ListenBrainz.token
|
||||
)}`,
|
||||
},
|
||||
}
|
||||
);
|
||||
ListenBrainzStore.set(
|
||||
ListenBrainzConstants.oldData,
|
||||
this.constructStoreData(title, artists, duration)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
export class SharingService {
|
||||
/**
|
||||
* Retrieve the universal link given a regular track link
|
||||
* @param currentUrl
|
||||
* @returns
|
||||
*/
|
||||
public static getUniversalLink(currentUrl: string): string {
|
||||
return `${currentUrl}?u`;
|
||||
}
|
||||
}
|
||||
21
src/features/songwhip/models/Artist.ts
Normal file
21
src/features/songwhip/models/Artist.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
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;
|
||||
}
|
||||
4
src/features/songwhip/models/ServiceLinks.ts
Normal file
4
src/features/songwhip/models/ServiceLinks.ts
Normal file
@@ -0,0 +1,4 @@
|
||||
export interface ServiceLinks {
|
||||
link: string;
|
||||
countries: string[];
|
||||
}
|
||||
27
src/features/songwhip/models/whip.ts
Normal file
27
src/features/songwhip/models/whip.ts
Normal file
@@ -0,0 +1,27 @@
|
||||
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[];
|
||||
};
|
||||
};
|
||||
}
|
||||
32
src/features/songwhip/songwhip.ts
Normal file
32
src/features/songwhip/songwhip.ts
Normal file
@@ -0,0 +1,32 @@
|
||||
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}`;
|
||||
}
|
||||
}
|
||||
36
src/features/state.ts
Normal file
36
src/features/state.ts
Normal file
@@ -0,0 +1,36 @@
|
||||
import { TidalState } from "../models/tidalState";
|
||||
|
||||
export const mainTidalState: TidalState = {
|
||||
status: "Stopped",
|
||||
repeat: "Off",
|
||||
shuffle: false,
|
||||
};
|
||||
|
||||
export function getLegacyMediaInfo() {
|
||||
function formatDuration(seconds: number) {
|
||||
const minutes = Math.floor(seconds / 60);
|
||||
const secondsLeft = seconds % 60;
|
||||
return `${minutes}:${secondsLeft < 10 ? "0" : ""}${secondsLeft}`;
|
||||
}
|
||||
|
||||
return {
|
||||
title: mainTidalState.currentTrack?.title ?? "",
|
||||
artists: mainTidalState.currentTrack?.artists.join(", ") ?? "",
|
||||
artist: mainTidalState.currentTrack?.artists.join(", ") ?? "",
|
||||
album: mainTidalState.currentTrack?.album ?? "",
|
||||
icon: mainTidalState.currentTrack?.image ?? "",
|
||||
status: mainTidalState.status.toLowerCase(),
|
||||
url: mainTidalState.currentTrack?.url ?? "",
|
||||
current: formatDuration(mainTidalState.currentTrack?.current ?? 0),
|
||||
currentInSeconds: mainTidalState.currentTrack?.current ?? 0,
|
||||
duration: formatDuration(mainTidalState.currentTrack?.duration ?? 0),
|
||||
durationInSeconds: mainTidalState.currentTrack?.duration ?? 0,
|
||||
image: "tidal-hifi-icon",
|
||||
favorite: false,
|
||||
player: {
|
||||
status: mainTidalState.status.toLowerCase(),
|
||||
shuffle: mainTidalState.shuffle,
|
||||
repeat: mainTidalState.repeat,
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
/**
|
||||
* Convert a HH:MM:SS string (or variants such as MM:SS or SS) to plain seconds
|
||||
* @param duration in HH:MM:SS format
|
||||
* @returns number of seconds in duration
|
||||
*/
|
||||
export const convertDurationToSeconds = (duration: string) => {
|
||||
return duration
|
||||
.split(":")
|
||||
.reverse()
|
||||
.map((val) => Number(val))
|
||||
.reduce((previous, current, index) => {
|
||||
return index === 0 ? current : previous + current * Math.pow(60, index);
|
||||
}, 0);
|
||||
};
|
||||
41
src/main.ts
41
src/main.ts
@@ -10,11 +10,8 @@ import {
|
||||
releaseInhibitorIfActive,
|
||||
} from "./features/idleInhibitor/idleInhibitor";
|
||||
import { Logger } from "./features/logger";
|
||||
import { SharingService } from "./features/sharingService/sharingService";
|
||||
import { MediaInfo } from "./models/mediaInfo";
|
||||
import { MediaStatus } from "./models/mediaStatus";
|
||||
import { Songwhip } from "./features/songwhip/songwhip";
|
||||
import { initRPC, rpc, unRPC } from "./scripts/discord";
|
||||
import { updateMediaInfo } from "./scripts/mediaInfo";
|
||||
import { addMenu } from "./scripts/menu";
|
||||
import {
|
||||
closeSettingsWindow,
|
||||
@@ -24,6 +21,11 @@ import {
|
||||
showSettingsWindow,
|
||||
} from "./scripts/settings";
|
||||
import { addTray, refreshTray } from "./scripts/tray";
|
||||
import axios from "axios";
|
||||
import { existsSync, createWriteStream } from "fs";
|
||||
import { mainTidalState } from "./features/state";
|
||||
import { TidalState } from "./models/tidalState";
|
||||
const tidalUrl = "https://listen.tidal.com";
|
||||
let mainInhibitorId = -1;
|
||||
|
||||
initialize();
|
||||
@@ -39,9 +41,6 @@ const windowPreferences = {
|
||||
setDefaultFlags(app);
|
||||
setManagedFlagsFromSettings(app);
|
||||
|
||||
const tidalUrl =
|
||||
settingsStore.get<string, string>(settings.advanced.tidalUrl) || "https://listen.tidal.com";
|
||||
|
||||
/**
|
||||
* Update the menuBarVisibility according to the store value
|
||||
*
|
||||
@@ -93,9 +92,8 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
|
||||
autoHideMenuBar: true,
|
||||
webPreferences: {
|
||||
...windowPreferences,
|
||||
...{
|
||||
preload: path.join(__dirname, "preload.js"),
|
||||
},
|
||||
preload: path.join(__dirname, "preload/index.js"),
|
||||
contextIsolation: false,
|
||||
},
|
||||
});
|
||||
enable(mainWindow.webContents);
|
||||
@@ -215,9 +213,9 @@ app.on("browser-window-created", (_, window) => {
|
||||
});
|
||||
|
||||
// IPC
|
||||
ipcMain.on(globalEvents.updateInfo, (_event, arg: MediaInfo) => {
|
||||
updateMediaInfo(arg);
|
||||
if (arg.status === MediaStatus.playing) {
|
||||
ipcMain.on(globalEvents.updateInfo, (_event, arg: TidalState) => {
|
||||
Object.assign(mainTidalState, arg);
|
||||
if (arg.status === "Playing") {
|
||||
mainInhibitorId = acquireInhibitorIfInactive(mainInhibitorId);
|
||||
} else {
|
||||
releaseInhibitorIfActive(mainInhibitorId);
|
||||
@@ -250,8 +248,21 @@ ipcMain.on(globalEvents.error, (event) => {
|
||||
console.log(event);
|
||||
});
|
||||
|
||||
ipcMain.handle(globalEvents.getUniversalLink, async (event, url) => {
|
||||
return SharingService.getUniversalLink(url);
|
||||
ipcMain.handle(globalEvents.whip, async (_, url) => {
|
||||
return Songwhip.whip(url);
|
||||
});
|
||||
|
||||
ipcMain.handle(globalEvents.downloadCover, async (_, id, url) => {
|
||||
const targetPath = `${app.getPath("userData")}/cover-${id}.jpg`;
|
||||
if (existsSync(targetPath)) return targetPath;
|
||||
const res = await axios.get(url, {
|
||||
responseType: "stream",
|
||||
});
|
||||
res.data.pipe(createWriteStream(targetPath));
|
||||
return new Promise((resolve, reject) => {
|
||||
res.data.on("end", () => resolve(targetPath));
|
||||
res.data.on("error", reject);
|
||||
});
|
||||
});
|
||||
|
||||
Logger.watch(ipcMain);
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
import { MediaPlayerInfo } from "./mediaPlayerInfo";
|
||||
import { MediaStatus } from "./mediaStatus";
|
||||
|
||||
export interface MediaInfo {
|
||||
title: string;
|
||||
artists: string;
|
||||
album: string;
|
||||
icon: string;
|
||||
status: MediaStatus;
|
||||
url: string;
|
||||
playingFrom: string;
|
||||
current: string;
|
||||
currentInSeconds?: number;
|
||||
duration: string;
|
||||
durationInSeconds?: number;
|
||||
image: string;
|
||||
favorite: boolean;
|
||||
player?: MediaPlayerInfo;
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
import { RepeatState } from "./repeatState";
|
||||
import { MediaStatus } from "./mediaStatus";
|
||||
|
||||
export interface MediaPlayerInfo {
|
||||
status: MediaStatus;
|
||||
shuffle: boolean;
|
||||
repeat: RepeatState;
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
export enum MediaStatus {
|
||||
playing = "playing",
|
||||
paused = "paused",
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
export enum RepeatState {
|
||||
off = "off",
|
||||
all = "all",
|
||||
single = "single",
|
||||
}
|
||||
16
src/models/tidalState.ts
Normal file
16
src/models/tidalState.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
export type TidalState = {
|
||||
status: "Playing" | "Paused" | "Stopped";
|
||||
repeat: "Off" | "All" | "Single";
|
||||
shuffle: boolean;
|
||||
currentTrack?: {
|
||||
id: number;
|
||||
title: string;
|
||||
// undefined for videos
|
||||
album?: string;
|
||||
artists: string[];
|
||||
current: number;
|
||||
duration: number;
|
||||
url: string;
|
||||
image: string;
|
||||
};
|
||||
};
|
||||
@@ -25,18 +25,16 @@ const switchesWithSettings = {
|
||||
classToHide: "discord_show_song_options",
|
||||
settingsKey: settings.discord.showSong,
|
||||
},
|
||||
};
|
||||
} as const;
|
||||
|
||||
let adBlock: HTMLInputElement,
|
||||
api: HTMLInputElement,
|
||||
channel: HTMLSelectElement,
|
||||
customCSS: HTMLInputElement,
|
||||
disableBackgroundThrottle: HTMLInputElement,
|
||||
disableHardwareMediaKeys: HTMLInputElement,
|
||||
enableCustomHotkeys: HTMLInputElement,
|
||||
enableDiscord: HTMLInputElement,
|
||||
gpuRasterization: HTMLInputElement,
|
||||
hostname: HTMLInputElement,
|
||||
menuBar: HTMLInputElement,
|
||||
minimizeOnClose: HTMLInputElement,
|
||||
mpris: HTMLInputElement,
|
||||
@@ -46,7 +44,6 @@ let adBlock: HTMLInputElement,
|
||||
singleInstance: HTMLInputElement,
|
||||
skipArtists: HTMLInputElement,
|
||||
skippedArtists: HTMLInputElement,
|
||||
staticWindowTitle: HTMLInputElement,
|
||||
theme: HTMLSelectElement,
|
||||
trayIcon: HTMLInputElement,
|
||||
updateFrequency: HTMLInputElement,
|
||||
@@ -59,7 +56,6 @@ let adBlock: HTMLInputElement,
|
||||
discord_include_timestamps: HTMLInputElement,
|
||||
discord_button_text: HTMLInputElement,
|
||||
discord_show_song: HTMLInputElement,
|
||||
discord_show_idle: HTMLInputElement,
|
||||
discord_idle_text: HTMLInputElement,
|
||||
discord_using_text: HTMLInputElement;
|
||||
|
||||
@@ -124,7 +120,6 @@ function refreshSettings() {
|
||||
try {
|
||||
adBlock.checked = settingsStore.get(settings.adBlock);
|
||||
api.checked = settingsStore.get(settings.api);
|
||||
channel.value = settingsStore.get(settings.advanced.tidalUrl);
|
||||
customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
|
||||
disableBackgroundThrottle.checked = settingsStore.get(settings.disableBackgroundThrottle);
|
||||
disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys);
|
||||
@@ -132,7 +127,6 @@ function refreshSettings() {
|
||||
enableDiscord.checked = settingsStore.get(settings.enableDiscord);
|
||||
enableWaylandSupport.checked = settingsStore.get(settings.flags.enableWaylandSupport);
|
||||
gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization);
|
||||
hostname.value = settingsStore.get(settings.apiSettings.hostname);
|
||||
menuBar.checked = settingsStore.get(settings.menuBar);
|
||||
minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose);
|
||||
mpris.checked = settingsStore.get(settings.mpris);
|
||||
@@ -141,11 +135,10 @@ function refreshSettings() {
|
||||
port.value = settingsStore.get(settings.apiSettings.port);
|
||||
singleInstance.checked = settingsStore.get(settings.singleInstance);
|
||||
skipArtists.checked = settingsStore.get(settings.skipArtists);
|
||||
skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
|
||||
staticWindowTitle.checked = settingsStore.get(settings.staticWindowTitle);
|
||||
theme.value = settingsStore.get(settings.theme);
|
||||
skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
|
||||
trayIcon.checked = settingsStore.get(settings.trayIcon);
|
||||
updateFrequency.value = settingsStore.get(settings.updateFrequency);
|
||||
updateFrequency.value = settingsStore.get(settings.updateFrequency).toString();
|
||||
enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
|
||||
ListenBrainzAPI.value = settingsStore.get(settings.ListenBrainz.api);
|
||||
ListenBrainzToken.value = settingsStore.get(settings.ListenBrainz.token);
|
||||
@@ -154,14 +147,16 @@ function refreshSettings() {
|
||||
discord_include_timestamps.checked = settingsStore.get(settings.discord.includeTimestamps);
|
||||
discord_button_text.value = settingsStore.get(settings.discord.buttonText);
|
||||
discord_show_song.checked = settingsStore.get(settings.discord.showSong);
|
||||
discord_show_idle.checked = settingsStore.get(settings.discord.showIdle);
|
||||
discord_idle_text.value = settingsStore.get(settings.discord.idleText);
|
||||
discord_using_text.value = settingsStore.get(settings.discord.usingText);
|
||||
|
||||
// set state of all switches with additional settings
|
||||
Object.values(switchesWithSettings).forEach((settingSwitch) => {
|
||||
setElementHidden(settingsStore.get(settingSwitch.settingsKey), settingSwitch);
|
||||
});
|
||||
for (const settingSwitch of Object.values(switchesWithSettings)) {
|
||||
setElementHidden(
|
||||
settingsStore.get(settingSwitch.settingsKey as any) as boolean,
|
||||
settingSwitch
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
Logger.log("Refreshing settings failed.", error);
|
||||
}
|
||||
@@ -244,7 +239,6 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
|
||||
adBlock = get("adBlock");
|
||||
api = get("apiCheckbox");
|
||||
channel = get<HTMLSelectElement>("channel");
|
||||
customCSS = get("customCSS");
|
||||
disableBackgroundThrottle = get("disableBackgroundThrottle");
|
||||
disableHardwareMediaKeys = get("disableHardwareMediaKeys");
|
||||
@@ -252,7 +246,6 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
enableDiscord = get("enableDiscord");
|
||||
enableWaylandSupport = get("enableWaylandSupport");
|
||||
gpuRasterization = get("gpuRasterization");
|
||||
hostname = get("hostname");
|
||||
menuBar = get("menuBar");
|
||||
minimizeOnClose = get("minimizeOnClose");
|
||||
mpris = get("mprisCheckbox");
|
||||
@@ -263,7 +256,6 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
trayIcon = get("trayIcon");
|
||||
skipArtists = get("skipArtists");
|
||||
skippedArtists = get("skippedArtists");
|
||||
staticWindowTitle = get("staticWindowTitle");
|
||||
singleInstance = get("singleInstance");
|
||||
updateFrequency = get("updateFrequency");
|
||||
enableListenBrainz = get("enableListenBrainz");
|
||||
@@ -274,14 +266,12 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
listenbrainz_delay = get("listenbrainz_delay");
|
||||
discord_button_text = get("discord_button_text");
|
||||
discord_show_song = get("discord_show_song");
|
||||
discord_show_idle = get("discord_show_idle");
|
||||
discord_using_text = get("discord_using_text");
|
||||
discord_idle_text = get("discord_idle_text");
|
||||
|
||||
refreshSettings();
|
||||
addInputListener(adBlock, settings.adBlock);
|
||||
addInputListener(api, settings.api);
|
||||
addSelectListener(channel, settings.advanced.tidalUrl);
|
||||
addTextAreaListener(customCSS, settings.customCSS);
|
||||
addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
|
||||
addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
|
||||
@@ -289,7 +279,6 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
addInputListener(enableDiscord, settings.enableDiscord, switchesWithSettings.discord);
|
||||
addInputListener(enableWaylandSupport, settings.flags.enableWaylandSupport);
|
||||
addInputListener(gpuRasterization, settings.flags.gpuRasterization);
|
||||
addInputListener(hostname, settings.apiSettings.hostname);
|
||||
addInputListener(menuBar, settings.menuBar);
|
||||
addInputListener(minimizeOnClose, settings.minimizeOnClose);
|
||||
addInputListener(mpris, settings.mpris);
|
||||
@@ -298,7 +287,6 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
addInputListener(port, settings.apiSettings.port);
|
||||
addInputListener(skipArtists, settings.skipArtists);
|
||||
addTextAreaListener(skippedArtists, settings.skippedArtists);
|
||||
addInputListener(staticWindowTitle, settings.staticWindowTitle);
|
||||
addInputListener(singleInstance, settings.singleInstance);
|
||||
addSelectListener(theme, settings.theme);
|
||||
addInputListener(trayIcon, settings.trayIcon);
|
||||
@@ -319,7 +307,6 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
settings.discord.showSong,
|
||||
switchesWithSettings.discord_show_song
|
||||
);
|
||||
addInputListener(discord_show_idle, settings.discord.showIdle);
|
||||
addInputListener(discord_idle_text, settings.discord.idleText);
|
||||
addInputListener(discord_using_text, settings.discord.usingText);
|
||||
});
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>Notifications</h4>
|
||||
<p>Show a notification when new media starts.</p>
|
||||
<p>Show a notification when a new song starts.</p>
|
||||
</div>
|
||||
<label class="switch">
|
||||
<input id="notifications" type="checkbox" />
|
||||
@@ -106,16 +106,6 @@
|
||||
<span class="switch__slider"></span>
|
||||
</label>
|
||||
</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__description">
|
||||
<h4>Minimize on Close</h4>
|
||||
@@ -157,7 +147,7 @@
|
||||
<p class="group__title">API</p>
|
||||
<div class="group__description">
|
||||
<p>
|
||||
TIDAL Hi-Fi has a built-in web API to allow users to get current media information.
|
||||
TIDAL Hi-Fi has a built-in web API to allow users to get current song information.
|
||||
You can optionally enable playback control as well.
|
||||
</p>
|
||||
</div>
|
||||
@@ -177,16 +167,6 @@
|
||||
<input id="port" type="number" class="text-input" name="port" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>API hostname</h4>
|
||||
<p>By default (127.0.0.1) only local apps can interface with the API. <br />
|
||||
Change to 0.0.0.0 to allow <strong>anyone</strong> to interact with it. <br />
|
||||
Other options are available
|
||||
</p>
|
||||
<input id="hostname" type="text" class="text-input" name="hostname" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>Playback control</h4>
|
||||
@@ -237,17 +217,6 @@
|
||||
</div>
|
||||
<div id="discord_options">
|
||||
|
||||
<div class="group__option" class="hidden">
|
||||
<div class="group__description">
|
||||
<h4>Show Idle Text</h4>
|
||||
<p>Should the idle text be shown when idle?</p>
|
||||
</div>
|
||||
<label class="switch">
|
||||
<input id="discord_show_idle" type="checkbox" />
|
||||
<span class="switch__slider"></span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="group__option" class="hidden">
|
||||
<div class="group__description">
|
||||
<h4>Idle Text</h4>
|
||||
@@ -266,8 +235,8 @@
|
||||
|
||||
<div class="group__option" class="hidden">
|
||||
<div class="group__description">
|
||||
<h4>Show media</h4>
|
||||
<p>Show the current media in the Discord client</p>
|
||||
<h4>Show song</h4>
|
||||
<p>Show the current song in the Discord client</p>
|
||||
</div>
|
||||
<label class="switch">
|
||||
<input id="discord_show_song" type="checkbox" />
|
||||
@@ -299,7 +268,7 @@
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>Button text</h4>
|
||||
<p>Text to display on the button below the media information.</p>
|
||||
<p>Text to display on the button below the song information.</p>
|
||||
<input id="discord_button_text" type="text" class="text-input" name="discord_button_text" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -337,7 +306,7 @@
|
||||
</div>
|
||||
<div class="group__description">
|
||||
<h4>ScrobbleDelay</h4>
|
||||
<p>The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when you fast forward
|
||||
<p>The delay (in ms) to send a song to ListenBrainz. Prevents spamming the API when you fast forward
|
||||
immediately</p>
|
||||
<input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" />
|
||||
</div>
|
||||
@@ -359,20 +328,6 @@
|
||||
<input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>Tidal channel / URL</h4>
|
||||
<p>
|
||||
Which URL Tidal Hi-Fi should use.
|
||||
<strong>note! Beta might break at any time</strong>
|
||||
</p>
|
||||
<select class="select-input" id="channel" name="channel">
|
||||
<option value="https://listen.tidal.com">Stable (listen.tidal.com)</option>
|
||||
<option value="https://listen.stage.tidal.com">Staging (listen.stage.tidal.com)</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="group">
|
||||
<p class="group__title">Flags</p>
|
||||
@@ -478,7 +433,7 @@
|
||||
<h4>TIDAL Hi-Fi</h4>
|
||||
<div class="about-section__version">
|
||||
<a target="_blank" rel="noopener"
|
||||
href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.18.0">5.18.0</a>
|
||||
href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.12.0">5.12.0</a>
|
||||
</div>
|
||||
<div class="about-section__links">
|
||||
<a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
|
||||
|
||||
659
src/preload.ts
659
src/preload.ts
@@ -1,659 +0,0 @@
|
||||
import { app, dialog, Notification } from "@electron/remote";
|
||||
import { clipboard, ipcRenderer } from "electron";
|
||||
import Player from "mpris-service";
|
||||
import { globalEvents } from "./constants/globalEvents";
|
||||
import { settings } from "./constants/settings";
|
||||
import {
|
||||
ListenBrainz,
|
||||
ListenBrainzConstants,
|
||||
ListenBrainzStore,
|
||||
} from "./features/listenbrainz/listenbrainz";
|
||||
import { StoreData } from "./features/listenbrainz/models/storeData";
|
||||
import { Logger } from "./features/logger";
|
||||
import { SharingService } from "./features/sharingService/sharingService";
|
||||
import { addCustomCss } from "./features/theming/theming";
|
||||
import { convertDurationToSeconds } from "./features/time/parse";
|
||||
import { MediaInfo } from "./models/mediaInfo";
|
||||
import { MediaStatus } from "./models/mediaStatus";
|
||||
import { RepeatState } from "./models/repeatState";
|
||||
import { downloadFile } from "./scripts/download";
|
||||
import { addHotkey } from "./scripts/hotkeys";
|
||||
import { ObjectToDotNotation } from "./scripts/objectUtilities";
|
||||
import { settingsStore } from "./scripts/settings";
|
||||
import { setTitle } from "./scripts/window-functions";
|
||||
|
||||
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
|
||||
let currentSong = "";
|
||||
let player: Player;
|
||||
let currentPlayStatus = MediaStatus.paused;
|
||||
let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
|
||||
let scrobbleWaitingForDelay = false;
|
||||
|
||||
let currentlyPlaying = MediaStatus.paused;
|
||||
let currentRepeatState: RepeatState = RepeatState.off;
|
||||
let currentShuffleState = false;
|
||||
let currentMediaInfo: MediaInfo;
|
||||
let currentNotification: Electron.Notification;
|
||||
|
||||
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()]);
|
||||
},
|
||||
|
||||
/**
|
||||
* 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
|
||||
* make sure it returns a number, if not use the default
|
||||
*/
|
||||
function getUpdateFrequency() {
|
||||
const storeValue = settingsStore.get<string, number>(settings.updateFrequency);
|
||||
const defaultValue = 500;
|
||||
|
||||
if (!isNaN(storeValue)) {
|
||||
return storeValue;
|
||||
} else {
|
||||
return defaultValue;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
ListenBrainzStore.clear();
|
||||
|
||||
/**
|
||||
* Add hotkeys for when tidal is focused
|
||||
* Reflects the desktop hotkeys found on:
|
||||
* https://defkey.com/tidal-desktop-shortcuts
|
||||
*/
|
||||
function addHotKeys() {
|
||||
if (settingsStore.get(settings.enableCustomHotkeys)) {
|
||||
addHotkey("Control+p", function () {
|
||||
elements.click("settings");
|
||||
setTimeout(() => {
|
||||
elements.click("openSettings");
|
||||
}, 100);
|
||||
});
|
||||
addHotkey("Control+l", function () {
|
||||
handleLogout();
|
||||
});
|
||||
|
||||
addHotkey("Control+a", function () {
|
||||
elements.click("favorite");
|
||||
});
|
||||
|
||||
addHotkey("Control+h", function () {
|
||||
elements.click("home");
|
||||
});
|
||||
|
||||
addHotkey("backspace", function () {
|
||||
elements.click("back");
|
||||
});
|
||||
|
||||
addHotkey("shift+backspace", function () {
|
||||
elements.click("forward");
|
||||
});
|
||||
|
||||
addHotkey("control+u", function () {
|
||||
// reloading window without cache should show the update bar if applicable
|
||||
window.location.reload();
|
||||
});
|
||||
|
||||
addHotkey("control+r", function () {
|
||||
elements.click("repeat");
|
||||
});
|
||||
addHotkey("control+w", async function () {
|
||||
const url = SharingService.getUniversalLink(getTrackURL());
|
||||
clipboard.writeText(url);
|
||||
new Notification({
|
||||
title: `Universal link generated: `,
|
||||
body: `URL copied to clipboard: ${url}`,
|
||||
}).show();
|
||||
});
|
||||
}
|
||||
|
||||
// always add the hotkey for the settings window
|
||||
addHotkey("control+=", function () {
|
||||
ipcRenderer.send(globalEvents.showSettings);
|
||||
});
|
||||
addHotkey("control+0", function () {
|
||||
ipcRenderer.send(globalEvents.showSettings);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* This function will ask the user whether he/she wants to log out.
|
||||
* It will log the user out if he/she selects "yes"
|
||||
*/
|
||||
function handleLogout() {
|
||||
const logoutOptions = ["Cancel", "Yes, please", "No, thanks"];
|
||||
|
||||
dialog
|
||||
.showMessageBox(null, {
|
||||
type: "question",
|
||||
title: "Logging out",
|
||||
message: "Are you sure you want to log out?",
|
||||
buttons: logoutOptions,
|
||||
defaultId: 2,
|
||||
})
|
||||
.then((result: { response: number }) => {
|
||||
if (logoutOptions.indexOf("Yes, please") === result.response) {
|
||||
for (let i = 0; i < window.localStorage.length; i++) {
|
||||
const key = window.localStorage.key(i);
|
||||
if (key.startsWith("_TIDAL_activeSession")) {
|
||||
window.localStorage.removeItem(key);
|
||||
break;
|
||||
}
|
||||
}
|
||||
window.location.reload();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function addFullScreenListeners() {
|
||||
window.document.addEventListener("fullscreenchange", () => {
|
||||
ipcRenderer.send(globalEvents.refreshMenuBar);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Add ipc event listeners.
|
||||
* Some actions triggered outside of the site need info from the site.
|
||||
*/
|
||||
function addIPCEventListeners() {
|
||||
window.addEventListener("DOMContentLoaded", () => {
|
||||
ipcRenderer.on("globalEvent", (_event, args) => {
|
||||
switch (args) {
|
||||
case globalEvents.playPause:
|
||||
case globalEvents.play:
|
||||
case globalEvents.pause:
|
||||
playPause();
|
||||
break;
|
||||
case globalEvents.next:
|
||||
elements.click("next");
|
||||
break;
|
||||
case globalEvents.previous:
|
||||
elements.click("previous");
|
||||
break;
|
||||
case globalEvents.toggleFavorite:
|
||||
elements.click("favorite");
|
||||
break;
|
||||
case globalEvents.toggleShuffle:
|
||||
elements.click("shuffle");
|
||||
break;
|
||||
case globalEvents.toggleRepeat:
|
||||
elements.click("repeat");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
function convertDuration(duration: string) {
|
||||
const parts = duration.split(":");
|
||||
return parseInt(parts[1]) + 60 * parseInt(parts[0]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update Tidal-hifi's media info
|
||||
*
|
||||
* @param {*} mediaInfo
|
||||
*/
|
||||
function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
|
||||
if (mediaInfo) {
|
||||
currentMediaInfo = mediaInfo;
|
||||
ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
|
||||
updateMpris(mediaInfo);
|
||||
updateListenBrainz(mediaInfo);
|
||||
if (notify) {
|
||||
sendNotification(mediaInfo);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* send a desktop notification if enabled in settings
|
||||
* @param mediaInfo
|
||||
* @param notify Whether to notify
|
||||
*/
|
||||
async function sendNotification(mediaInfo: MediaInfo) {
|
||||
if (settingsStore.get(settings.notifications)) {
|
||||
if (currentNotification) {
|
||||
currentNotification.close();
|
||||
}
|
||||
currentNotification = new Notification({
|
||||
title: mediaInfo.title,
|
||||
body: mediaInfo.artists,
|
||||
icon: mediaInfo.icon,
|
||||
});
|
||||
currentNotification.show();
|
||||
}
|
||||
}
|
||||
|
||||
function addMPRIS() {
|
||||
if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
|
||||
try {
|
||||
player = Player({
|
||||
name: "tidal-hifi",
|
||||
identity: "tidal-hifi",
|
||||
supportedUriSchemes: ["file"],
|
||||
supportedMimeTypes: [
|
||||
"audio/mpeg",
|
||||
"audio/flac",
|
||||
"audio/x-flac",
|
||||
"application/ogg",
|
||||
"audio/wav",
|
||||
],
|
||||
supportedInterfaces: ["player"],
|
||||
desktopEntry: "tidal-hifi",
|
||||
});
|
||||
// Events
|
||||
const events = {
|
||||
next: "next",
|
||||
previous: "previous",
|
||||
pause: "pause",
|
||||
playpause: "playpause",
|
||||
stop: "stop",
|
||||
play: "play",
|
||||
loopStatus: "repeat",
|
||||
shuffle: "shuffle",
|
||||
seek: "seek",
|
||||
} as { [key: string]: string };
|
||||
Object.keys(events).forEach(function (eventName) {
|
||||
player.on(eventName, function () {
|
||||
const eventValue = events[eventName];
|
||||
switch (events[eventValue]) {
|
||||
case events.playpause:
|
||||
playPause();
|
||||
break;
|
||||
default:
|
||||
elements.click(eventValue);
|
||||
}
|
||||
});
|
||||
});
|
||||
// Override get position function
|
||||
player.getPosition = function () {
|
||||
return convertDuration(elements.getText("current")) * 1000 * 1000;
|
||||
};
|
||||
player.on("quit", function () {
|
||||
app.quit();
|
||||
});
|
||||
} catch (exception) {
|
||||
Logger.log("MPRIS player api not working", exception);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function updateMpris(mediaInfo: MediaInfo) {
|
||||
if (player) {
|
||||
player.metadata = {
|
||||
...player.metadata,
|
||||
...{
|
||||
"xesam:title": mediaInfo.title,
|
||||
"xesam:artist": [mediaInfo.artists],
|
||||
"xesam:album": mediaInfo.album,
|
||||
"xesam:url": mediaInfo.url,
|
||||
"mpris:artUrl": mediaInfo.image,
|
||||
"mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
|
||||
"mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
|
||||
},
|
||||
...ObjectToDotNotation(mediaInfo, "custom:"),
|
||||
};
|
||||
player.playbackStatus = mediaInfo.status === MediaStatus.paused ? "Paused" : "Playing";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the listenbrainz service with new data based on a few conditions
|
||||
*/
|
||||
function updateListenBrainz(mediaInfo: MediaInfo) {
|
||||
if (settingsStore.get(settings.ListenBrainz.enabled)) {
|
||||
const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
|
||||
if (
|
||||
(!oldData && mediaInfo.status === MediaStatus.playing) ||
|
||||
(oldData && oldData.title !== mediaInfo.title)
|
||||
) {
|
||||
if (!scrobbleWaitingForDelay) {
|
||||
scrobbleWaitingForDelay = true;
|
||||
clearTimeout(currentListenBrainzDelayId);
|
||||
currentListenBrainzDelayId = setTimeout(
|
||||
() => {
|
||||
ListenBrainz.scrobble(
|
||||
mediaInfo.title,
|
||||
mediaInfo.artists,
|
||||
mediaInfo.status,
|
||||
convertDuration(mediaInfo.duration)
|
||||
);
|
||||
scrobbleWaitingForDelay = false;
|
||||
},
|
||||
settingsStore.get(settings.ListenBrainz.delay) ?? 0
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if Tidal is playing a video or song by grabbing the "a" element from the title.
|
||||
* If it's a song it returns the track URL, if not it will return undefined
|
||||
*/
|
||||
function getTrackURL() {
|
||||
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 = 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 = elements.getText("current");
|
||||
const currentStatus = getCurrentlyPlayingStatus();
|
||||
const shuffleState = getCurrentShuffleState();
|
||||
const repeatState = getCurrentRepeatState();
|
||||
|
||||
const playStateChanged = currentStatus != currentlyPlaying;
|
||||
const shuffleStateChanged = shuffleState != currentShuffleState;
|
||||
const repeatStateChanged = repeatState != currentRepeatState;
|
||||
|
||||
const hasStateChanged = playStateChanged || shuffleStateChanged || repeatStateChanged;
|
||||
|
||||
// update info if song changed or was just paused/resumed
|
||||
if (titleOrArtistsChanged || hasStateChanged) {
|
||||
if (playStateChanged) currentlyPlaying = currentStatus;
|
||||
if (shuffleStateChanged) currentShuffleState = shuffleState;
|
||||
if (repeatStateChanged) currentRepeatState = repeatState;
|
||||
|
||||
skipArtistsIfFoundInSkippedArtistsList(artistsArray);
|
||||
const album = elements.getAlbumName();
|
||||
const duration = elements.getText("duration");
|
||||
const options: MediaInfo = {
|
||||
title,
|
||||
artists: artistsString,
|
||||
album: album,
|
||||
playingFrom: elements.getText("playing_from"),
|
||||
status: currentStatus,
|
||||
url: getTrackURL(),
|
||||
current,
|
||||
currentInSeconds: convertDurationToSeconds(current),
|
||||
duration,
|
||||
durationInSeconds: convertDurationToSeconds(duration),
|
||||
image: "",
|
||||
icon: "",
|
||||
favorite: elements.isFavorite(),
|
||||
|
||||
player: {
|
||||
status: currentStatus,
|
||||
shuffle: shuffleState,
|
||||
repeat: repeatState,
|
||||
},
|
||||
};
|
||||
|
||||
// update title, url and play info with new info
|
||||
settingsStore.get(settings.staticWindowTitle)
|
||||
? setTitle(staticTitle)
|
||||
: setTitle(songDashArtistTitle);
|
||||
getTrackURL();
|
||||
currentSong = songDashArtistTitle;
|
||||
currentPlayStatus = currentStatus;
|
||||
|
||||
const image = elements.getSongIcon();
|
||||
|
||||
new Promise<void>((resolve) => {
|
||||
if (image.startsWith("http")) {
|
||||
options.image = image;
|
||||
downloadFile(image, notificationPath).then(
|
||||
() => {
|
||||
options.icon = notificationPath;
|
||||
resolve();
|
||||
},
|
||||
() => {
|
||||
// if the image can't be downloaded then continue without it
|
||||
resolve();
|
||||
}
|
||||
);
|
||||
} else {
|
||||
// if the image can't be found on the page continue without it
|
||||
resolve();
|
||||
}
|
||||
}).then(() => {
|
||||
updateMediaInfo(options, titleOrArtistsChanged);
|
||||
});
|
||||
} else {
|
||||
// just update the time
|
||||
updateMediaInfo(
|
||||
{ ...currentMediaInfo, ...{ current, currentInSeconds: convertDurationToSeconds(current) } },
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* automatically skip a song if the artists are found in the list of artists to skip
|
||||
* @param {*} artists array of artists
|
||||
*/
|
||||
function skipArtistsIfFoundInSkippedArtistsList(artists: string[]) {
|
||||
if (settingsStore.get(settings.skipArtists)) {
|
||||
const skippedArtists = settingsStore.get<string, string[]>(settings.skippedArtists);
|
||||
if (skippedArtists.length > 0) {
|
||||
const artistsToSkip = skippedArtists.map((artist) => artist);
|
||||
const artistNames = Object.values(artists).map((artist) => artist);
|
||||
const foundArtist = artistNames.some((artist) => artistsToSkip.includes(artist));
|
||||
if (foundArtist) {
|
||||
elements.click("next");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}, getUpdateFrequency());
|
||||
|
||||
addMPRIS();
|
||||
addCustomCss(app);
|
||||
addHotKeys();
|
||||
addIPCEventListeners();
|
||||
addFullScreenListeners();
|
||||
15
src/preload/index.ts
Normal file
15
src/preload/index.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
import "./integrations/mpris";
|
||||
import "./integrations/listenbrainz";
|
||||
import "./integrations/hotkeys";
|
||||
import "./integrations/ipc";
|
||||
import "./integrations/notifications";
|
||||
import "./integrations/skipArtists";
|
||||
import { ipcRenderer } from "electron";
|
||||
import { globalEvents } from "../constants/globalEvents";
|
||||
import { addCustomCss } from "../features/theming/theming";
|
||||
import { app } from "@electron/remote";
|
||||
|
||||
window.document.addEventListener("fullscreenchange", () => {
|
||||
ipcRenderer.send(globalEvents.refreshMenuBar);
|
||||
});
|
||||
addCustomCss(app);
|
||||
96
src/preload/integrations/hotkeys.ts
Normal file
96
src/preload/integrations/hotkeys.ts
Normal file
@@ -0,0 +1,96 @@
|
||||
import { ipcRenderer, clipboard } from "electron";
|
||||
import { Notification, dialog } from "@electron/remote";
|
||||
import { addHotkey } from "../../scripts/hotkeys";
|
||||
import { globalEvents } from "../../constants/globalEvents";
|
||||
import { settingsStore } from "../../scripts/settings";
|
||||
import { settings } from "../../constants/settings";
|
||||
import { $tidalState, favoriteCurrentTrack, reduxStore, toggleRepeat } from "../state";
|
||||
import { Songwhip } from "../../features/songwhip/songwhip";
|
||||
|
||||
/**
|
||||
* Add hotkeys for when tidal is focused
|
||||
* Reflects the desktop hotkeys found on:
|
||||
* https://defkey.com/tidal-desktop-shortcuts
|
||||
*/
|
||||
if (settingsStore.get(settings.enableCustomHotkeys)) {
|
||||
addHotkey("Control+l", handleLogout);
|
||||
|
||||
addHotkey("Control+a", favoriteCurrentTrack);
|
||||
|
||||
addHotkey("Control+h", () => {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({
|
||||
type: "ROUTER_PUSH",
|
||||
payload: {
|
||||
pathname: "/",
|
||||
options: {},
|
||||
hash: "",
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
addHotkey("backspace", () => {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({ type: "ROUTER_GO_BACK" });
|
||||
});
|
||||
|
||||
addHotkey("shift+backspace", () => {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({ type: "ROUTER_GO_FORWARD" });
|
||||
});
|
||||
|
||||
addHotkey("control+u", () => {
|
||||
// reloading window without cache should show the update bar if applicable
|
||||
window.location.reload();
|
||||
});
|
||||
|
||||
addHotkey("control+r", toggleRepeat);
|
||||
addHotkey("control+w", async () => {
|
||||
const trackUrl = $tidalState.getState().currentTrack?.url;
|
||||
if (!trackUrl) return;
|
||||
const result = await ipcRenderer.invoke(globalEvents.whip, trackUrl);
|
||||
const url = Songwhip.getWhipUrl(result);
|
||||
clipboard.writeText(url);
|
||||
new Notification({
|
||||
title: `Successfully whipped: `,
|
||||
body: `URL copied to clipboard: ${url}`,
|
||||
}).show();
|
||||
});
|
||||
}
|
||||
|
||||
// always add the hotkey for the settings window
|
||||
addHotkey("control+=", function () {
|
||||
ipcRenderer.send(globalEvents.showSettings);
|
||||
});
|
||||
addHotkey("control+0", function () {
|
||||
ipcRenderer.send(globalEvents.showSettings);
|
||||
});
|
||||
|
||||
/**
|
||||
* This function will ask the user whether he/she wants to log out.
|
||||
* It will log the user out if he/she selects "yes"
|
||||
*/
|
||||
function handleLogout() {
|
||||
const logoutOptions = ["Cancel", "Yes, please", "No, thanks"];
|
||||
|
||||
dialog
|
||||
.showMessageBox(null, {
|
||||
type: "question",
|
||||
title: "Logging out",
|
||||
message: "Are you sure you want to log out?",
|
||||
buttons: logoutOptions,
|
||||
defaultId: 2,
|
||||
})
|
||||
.then((result: { response: number }) => {
|
||||
if (logoutOptions.indexOf("Yes, please") === result.response) {
|
||||
for (let i = 0; i < window.localStorage.length; i++) {
|
||||
const key = window.localStorage.key(i);
|
||||
if (key.startsWith("_TIDAL_activeSession")) {
|
||||
window.localStorage.removeItem(key);
|
||||
break;
|
||||
}
|
||||
}
|
||||
window.location.reload();
|
||||
}
|
||||
});
|
||||
}
|
||||
35
src/preload/integrations/ipc.ts
Normal file
35
src/preload/integrations/ipc.ts
Normal file
@@ -0,0 +1,35 @@
|
||||
import { ipcRenderer } from "electron";
|
||||
import { globalEvents } from "../../constants/globalEvents";
|
||||
import {
|
||||
$tidalState,
|
||||
favoriteCurrentTrack,
|
||||
next,
|
||||
pause,
|
||||
play,
|
||||
playPause,
|
||||
previous,
|
||||
toggleRepeat,
|
||||
toggleShuffle,
|
||||
} from "../state";
|
||||
|
||||
/**
|
||||
* Add ipc event listeners.
|
||||
* Some actions triggered outside of the site need info from the site.
|
||||
*/
|
||||
const handlers: Partial<Record<keyof typeof globalEvents, () => void>> = {
|
||||
[globalEvents.playPause]: playPause,
|
||||
[globalEvents.play]: play,
|
||||
[globalEvents.pause]: pause,
|
||||
[globalEvents.next]: next,
|
||||
[globalEvents.previous]: previous,
|
||||
[globalEvents.toggleFavorite]: favoriteCurrentTrack,
|
||||
[globalEvents.toggleShuffle]: toggleShuffle,
|
||||
[globalEvents.toggleRepeat]: toggleRepeat,
|
||||
};
|
||||
ipcRenderer.on("globalEvent", (_, event) => {
|
||||
handlers[event as keyof typeof globalEvents]?.();
|
||||
});
|
||||
|
||||
$tidalState.subscribe((state) => {
|
||||
ipcRenderer.send(globalEvents.updateInfo, state);
|
||||
});
|
||||
38
src/preload/integrations/listenbrainz.ts
Normal file
38
src/preload/integrations/listenbrainz.ts
Normal file
@@ -0,0 +1,38 @@
|
||||
import { settingsStore } from "../../scripts/settings";
|
||||
import {
|
||||
ListenBrainz,
|
||||
ListenBrainzConstants,
|
||||
ListenBrainzStore,
|
||||
} from "../../features/listenbrainz/listenbrainz";
|
||||
import { settings } from "../../constants/settings";
|
||||
import { StoreData } from "../../features/listenbrainz/models/storeData";
|
||||
import { $tidalState } from "../state";
|
||||
|
||||
ListenBrainzStore.clear();
|
||||
|
||||
let delayTimeout: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
$tidalState.subscribe((state) => {
|
||||
if (!settingsStore.get(settings.ListenBrainz.enabled)) return;
|
||||
if (delayTimeout !== null) return;
|
||||
|
||||
const track = state.currentTrack;
|
||||
if (!track) return;
|
||||
|
||||
const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
|
||||
if ((!oldData && state.status === "Playing") || (oldData && oldData.title !== track.title)) {
|
||||
clearTimeout(delayTimeout);
|
||||
delayTimeout = setTimeout(
|
||||
async () => {
|
||||
await ListenBrainz.scrobble(
|
||||
track.title,
|
||||
track.artists.join(),
|
||||
state.status,
|
||||
track.duration
|
||||
);
|
||||
delayTimeout = null;
|
||||
},
|
||||
settingsStore.get(settings.ListenBrainz.delay) ?? 0
|
||||
);
|
||||
}
|
||||
});
|
||||
77
src/preload/integrations/mpris.ts
Normal file
77
src/preload/integrations/mpris.ts
Normal file
@@ -0,0 +1,77 @@
|
||||
import Player from "mpris-service";
|
||||
import { settings } from "../../constants/settings";
|
||||
import { settingsStore } from "../../scripts/settings";
|
||||
import { Logger } from "../../features/logger";
|
||||
import {
|
||||
$tidalState,
|
||||
coverArtPaths,
|
||||
next,
|
||||
pause,
|
||||
play,
|
||||
playPause,
|
||||
previous,
|
||||
stop,
|
||||
toggleRepeat,
|
||||
toggleShuffle,
|
||||
} from "../state";
|
||||
import { app } from "@electron/remote";
|
||||
|
||||
function toMicroseconds(seconds: number) {
|
||||
return BigInt(seconds) * 1000_000n;
|
||||
}
|
||||
|
||||
if (settingsStore.get(settings.mpris) && process.platform === "linux") {
|
||||
try {
|
||||
const player = Player({
|
||||
name: "tidal-hifi2",
|
||||
identity: "tidal-hifi2",
|
||||
supportedUriSchemes: ["file"],
|
||||
supportedMimeTypes: [
|
||||
"audio/mpeg",
|
||||
"audio/flac",
|
||||
"audio/x-flac",
|
||||
"application/ogg",
|
||||
"audio/wav",
|
||||
],
|
||||
supportedInterfaces: ["player"],
|
||||
desktopEntry: "tidal-hifi2",
|
||||
});
|
||||
player.on("playPause", playPause);
|
||||
player.on("next", next);
|
||||
player.on("previous", previous);
|
||||
player.on("pause", pause);
|
||||
player.on("play", play);
|
||||
player.on("stop", stop);
|
||||
player.on("loopStatus", toggleRepeat);
|
||||
player.on("shuffle", toggleShuffle);
|
||||
player.on("quit", app.quit);
|
||||
|
||||
player.getPosition = function () {
|
||||
return toMicroseconds($tidalState.getState().currentTrack?.current ?? 0);
|
||||
};
|
||||
|
||||
$tidalState.subscribe(async (state) => {
|
||||
if (!player) return;
|
||||
|
||||
if (state.currentTrack) {
|
||||
const coverUrl = await coverArtPaths.get(state.currentTrack.image);
|
||||
player.metadata = {
|
||||
"xesam:title": state.currentTrack.title,
|
||||
"xesam:artist": state.currentTrack.artists,
|
||||
"xesam:album": state.currentTrack.album,
|
||||
"mpris:artUrl": coverUrl,
|
||||
"mpris:length": toMicroseconds(state.currentTrack.duration),
|
||||
"mpris:trackid": "/org/mpris/MediaPlayer2/track/" + state.currentTrack.id,
|
||||
};
|
||||
} else {
|
||||
player.metadata = {
|
||||
"mpris:trackid": "/org/mpris/MediaPlayer2/TrackList/NoTrack",
|
||||
};
|
||||
}
|
||||
player.playbackStatus = state.status;
|
||||
});
|
||||
} catch (exception) {
|
||||
console.error(exception);
|
||||
Logger.log("MPRIS player api not working", exception);
|
||||
}
|
||||
}
|
||||
23
src/preload/integrations/notifications.ts
Normal file
23
src/preload/integrations/notifications.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import { settingsStore } from "../../scripts/settings";
|
||||
import { $tidalState, coverArtPaths } from "../state";
|
||||
import { settings } from "../../constants/settings";
|
||||
import { Notification } from "@electron/remote";
|
||||
|
||||
let currentNotification: Electron.Notification | undefined;
|
||||
|
||||
$tidalState.subscribe(async (state, prevState) => {
|
||||
if (!settingsStore.get(settings.notifications)) return;
|
||||
if (!state.currentTrack) return;
|
||||
|
||||
if (state.currentTrack.id === prevState.currentTrack?.id) return;
|
||||
|
||||
currentNotification?.close();
|
||||
if (state.status !== "Playing") return;
|
||||
const icon = await coverArtPaths.get(state.currentTrack.image);
|
||||
currentNotification = new Notification({
|
||||
title: state.currentTrack.title,
|
||||
body: state.currentTrack.artists.join(", "),
|
||||
icon,
|
||||
});
|
||||
currentNotification.show();
|
||||
});
|
||||
15
src/preload/integrations/skipArtists.ts
Normal file
15
src/preload/integrations/skipArtists.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
import { settingsStore } from "../../scripts/settings";
|
||||
import { $tidalState, next } from "../state";
|
||||
import { settings } from "../../constants/settings";
|
||||
|
||||
$tidalState.subscribe((state) => {
|
||||
// don't skip when paused, as it can cause a loop
|
||||
if (!state.currentTrack || state.status !== "Playing") return;
|
||||
if (!settingsStore.get(settings.skipArtists)) return;
|
||||
const artistsToSkip = settingsStore.get(settings.skippedArtists) as string[];
|
||||
if (artistsToSkip.length === 0) return;
|
||||
|
||||
const shouldSkip = state.currentTrack?.artists.some((artist) => artistsToSkip.includes(artist));
|
||||
|
||||
if (shouldSkip) next();
|
||||
});
|
||||
188
src/preload/redux.ts
Normal file
188
src/preload/redux.ts
Normal file
@@ -0,0 +1,188 @@
|
||||
export function getTidalReduxStore() {
|
||||
// Find the react container
|
||||
let reactContainer: Record<string, unknown> | null = null;
|
||||
for (const child of document.body?.children ?? []) {
|
||||
const container = Object.entries(child).find(([key]) => key.startsWith("__reactContainer$"));
|
||||
// console.log(container);
|
||||
if (!container) continue;
|
||||
reactContainer = container[1];
|
||||
break;
|
||||
}
|
||||
if (!reactContainer) {
|
||||
throw new Error("Could not find React root");
|
||||
}
|
||||
// Traverse the react tree until we find the redux store
|
||||
const seen = new Set();
|
||||
const queue = [reactContainer];
|
||||
let store;
|
||||
|
||||
const properties = ["children", "child", "pendingProps", "memoizedProps", "props"];
|
||||
while (!store && queue.length) {
|
||||
const node = queue.shift();
|
||||
if (!node) break;
|
||||
if (
|
||||
"store" in node &&
|
||||
typeof node.store === "object" &&
|
||||
node.store !== null &&
|
||||
"getState" in node.store &&
|
||||
typeof node.store.getState === "function"
|
||||
) {
|
||||
store = node.store;
|
||||
break;
|
||||
}
|
||||
for (const property of properties) {
|
||||
const value = node[property];
|
||||
if (typeof value === "object" && value !== null) {
|
||||
if (seen.has(value)) continue;
|
||||
seen.add(value);
|
||||
queue.push(value as Record<string, unknown>);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!store) throw new Error("Could not find Redux store");
|
||||
return store as TidalReduxStore;
|
||||
}
|
||||
|
||||
export type TidalReduxStore = {
|
||||
getState: () => ReduxState;
|
||||
dispatch: (action: Action) => void;
|
||||
subscribe: (listener: () => void) => () => void;
|
||||
};
|
||||
|
||||
export type ReduxState = {
|
||||
[key: string]: unknown;
|
||||
content: {
|
||||
mediaItems: Record<string, MediaItem>;
|
||||
};
|
||||
favorites: {
|
||||
albums: number[];
|
||||
artists: number[];
|
||||
mixes: number[];
|
||||
playlists: number[];
|
||||
tracks: number[];
|
||||
users: number[];
|
||||
videos: number[];
|
||||
};
|
||||
playbackControls: {
|
||||
desiredPlaybackState: "NOT_PLAYING" | "PLAYING" | "IDLE" | string;
|
||||
latestCurrentTime: number;
|
||||
latestCurrentTimeSyncTimestamp: number;
|
||||
muted: boolean;
|
||||
playbackState: "NOT_PLAYING" | "PLAYING" | "IDLE" | "STALLED";
|
||||
startAt: number;
|
||||
volume: number;
|
||||
volumeUnmute: number;
|
||||
mediaProduct: {
|
||||
productId: string;
|
||||
productType: "track" | string;
|
||||
sourceId: string;
|
||||
sourceType: "PLAYLIST" | string;
|
||||
};
|
||||
};
|
||||
playQueue: {
|
||||
shuffleModeEnabled: boolean;
|
||||
repeatMode: RepeatMode;
|
||||
};
|
||||
};
|
||||
|
||||
export const enum RepeatMode {
|
||||
REPEAT_OFF = 0,
|
||||
REPEAT_ALL = 1,
|
||||
REPEAT_SINGLE = 2,
|
||||
}
|
||||
type MediaItem =
|
||||
| {
|
||||
type: "track";
|
||||
item: {
|
||||
album: {
|
||||
id: number;
|
||||
title: string;
|
||||
cover: string;
|
||||
vibrantColor: string;
|
||||
releaseDate: string;
|
||||
};
|
||||
artist: Artist;
|
||||
artists: Array<Artist>;
|
||||
audioModes: Array<"STEREO" | string>;
|
||||
audioQuality: "LOSSLESS" | string;
|
||||
bpm: number | null;
|
||||
copyright: string;
|
||||
dateAdded: string;
|
||||
description: string | null;
|
||||
duration: number;
|
||||
explicit: boolean;
|
||||
id: number;
|
||||
isrc: string;
|
||||
itemUuid: string;
|
||||
peak: number;
|
||||
popularity: number;
|
||||
title: string;
|
||||
trackNumber: number;
|
||||
url: string;
|
||||
};
|
||||
}
|
||||
| {
|
||||
type: "video";
|
||||
item: {
|
||||
artists: Array<Artist>;
|
||||
contentType: "video";
|
||||
duration: number;
|
||||
id: number;
|
||||
imageId: string;
|
||||
explicit: boolean;
|
||||
title: string;
|
||||
type: string;
|
||||
url: string;
|
||||
vibrantColor: string;
|
||||
};
|
||||
};
|
||||
|
||||
type Artist = {
|
||||
id: number;
|
||||
name: string;
|
||||
type: "MAIN" | string;
|
||||
picture: string;
|
||||
};
|
||||
|
||||
type Action =
|
||||
| {
|
||||
type:
|
||||
| "playbackControls/PAUSE"
|
||||
| "playbackControls/PLAY"
|
||||
| "playbackControls/STOP"
|
||||
| "playbackControls/SKIP_PREVIOUS"
|
||||
| "playbackControls/SKIP_NEXT"
|
||||
| "playQueue/TOGGLE_SHUFFLE"
|
||||
| "playQueue/TOGGLE_REPEAT_MODE"
|
||||
| "ROUTER_GO_BACK"
|
||||
| "ROUTER_GO_FORWARD";
|
||||
}
|
||||
| {
|
||||
type: "playbackControls/SET_VOLUME";
|
||||
payload: {
|
||||
/** 0 - 100 */
|
||||
volume: number;
|
||||
};
|
||||
}
|
||||
| {
|
||||
type: "playbackControls/SET_MUTE";
|
||||
payload: {
|
||||
mute: boolean;
|
||||
};
|
||||
}
|
||||
| {
|
||||
type: "ROUTER_PUSH";
|
||||
payload: {
|
||||
pathname: string;
|
||||
options: Record<string, unknown>;
|
||||
hash: string;
|
||||
};
|
||||
}
|
||||
| {
|
||||
type: "content/TOGGLE_FAVORITE_ITEMS";
|
||||
payload: {
|
||||
from: "heart";
|
||||
items: Array<{ itemId: number; itemType: "track" }>;
|
||||
moduleId?: string;
|
||||
};
|
||||
};
|
||||
165
src/preload/state.ts
Normal file
165
src/preload/state.ts
Normal file
@@ -0,0 +1,165 @@
|
||||
import { getTidalReduxStore, ReduxState, RepeatMode, TidalReduxStore } from "./redux";
|
||||
import { createStore } from "zustand/vanilla";
|
||||
import { ipcRenderer } from "electron";
|
||||
import { globalEvents } from "../constants/globalEvents";
|
||||
import equal from "fast-deep-equal";
|
||||
import { TidalState } from "../models/tidalState";
|
||||
|
||||
export const $tidalState = createStore<TidalState>(() => ({
|
||||
status: "Stopped",
|
||||
repeat: "Off",
|
||||
shuffle: false,
|
||||
}));
|
||||
|
||||
export let reduxStore: TidalReduxStore | undefined;
|
||||
|
||||
export function playPause() {
|
||||
if (!reduxStore) return;
|
||||
|
||||
const state = $tidalState.getState();
|
||||
if (state.status === "Playing") {
|
||||
reduxStore.dispatch({ type: "playbackControls/PAUSE" });
|
||||
} else {
|
||||
reduxStore.dispatch({ type: "playbackControls/PLAY" });
|
||||
}
|
||||
}
|
||||
export function next() {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({ type: "playbackControls/SKIP_NEXT" });
|
||||
}
|
||||
export function previous() {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({ type: "playbackControls/SKIP_PREVIOUS" });
|
||||
}
|
||||
export function pause() {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({ type: "playbackControls/PAUSE" });
|
||||
}
|
||||
export function play() {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({ type: "playbackControls/PLAY" });
|
||||
}
|
||||
export function stop() {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({ type: "playbackControls/STOP" });
|
||||
}
|
||||
export function toggleRepeat() {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({ type: "playQueue/TOGGLE_REPEAT_MODE" });
|
||||
}
|
||||
export function toggleShuffle() {
|
||||
if (!reduxStore) return;
|
||||
reduxStore.dispatch({ type: "playQueue/TOGGLE_SHUFFLE" });
|
||||
}
|
||||
export function favoriteCurrentTrack() {
|
||||
if (!reduxStore) return;
|
||||
const track = $tidalState.getState().currentTrack;
|
||||
if (!track) return;
|
||||
|
||||
reduxStore.dispatch({
|
||||
type: "content/TOGGLE_FAVORITE_ITEMS",
|
||||
payload: {
|
||||
from: "heart",
|
||||
items: [{ itemId: track.id, itemType: "track" }],
|
||||
moduleId: undefined,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export const coverArtPaths = new Map<string, Promise<string>>();
|
||||
|
||||
(async () => {
|
||||
while (!reduxStore) {
|
||||
try {
|
||||
reduxStore = getTidalReduxStore();
|
||||
} catch (e) {
|
||||
await new Promise((resolve) => setTimeout(resolve, 100));
|
||||
}
|
||||
}
|
||||
|
||||
// Update currentTime
|
||||
let rawCurrentTime: ReduxState["playbackControls"] = reduxStore.getState().playbackControls;
|
||||
setInterval(() => {
|
||||
const state = $tidalState.getState();
|
||||
const track = state.currentTrack;
|
||||
if (!track) return;
|
||||
const oldCurrentTime = track.current;
|
||||
let newCurrentTime: number;
|
||||
|
||||
if (state.status === "Playing") {
|
||||
newCurrentTime = Math.trunc(
|
||||
rawCurrentTime.latestCurrentTime +
|
||||
Math.abs(rawCurrentTime.latestCurrentTimeSyncTimestamp - Date.now()) / 1000
|
||||
);
|
||||
} else {
|
||||
newCurrentTime = rawCurrentTime.latestCurrentTime;
|
||||
}
|
||||
if (newCurrentTime !== oldCurrentTime) {
|
||||
$tidalState.setState({
|
||||
...state,
|
||||
currentTrack: {
|
||||
...track,
|
||||
current: newCurrentTime,
|
||||
},
|
||||
});
|
||||
}
|
||||
}, 1000);
|
||||
|
||||
reduxStore.subscribe(async () => {
|
||||
const state = reduxStore.getState();
|
||||
rawCurrentTime = state.playbackControls;
|
||||
const currentItem = getCurrentTrack(state);
|
||||
let track: TidalState["currentTrack"];
|
||||
if (currentItem) {
|
||||
const imageId =
|
||||
currentItem.type === "track" ? currentItem.item.album.cover : currentItem.item.imageId;
|
||||
const coverUrl = `https://resources.tidal.com/images/${imageId.replace(
|
||||
/-/g,
|
||||
"/"
|
||||
)}/640x640.jpg`;
|
||||
if (!coverArtPaths.has(coverUrl)) {
|
||||
coverArtPaths.set(
|
||||
coverUrl,
|
||||
ipcRenderer.invoke(globalEvents.downloadCover, imageId, coverUrl).catch(() => "") // ignore errors if the cover can't be downloaded
|
||||
);
|
||||
}
|
||||
track = {
|
||||
id: currentItem.item.id,
|
||||
title: currentItem.item.title,
|
||||
album: currentItem.type === "track" ? currentItem.item.album.title : undefined,
|
||||
artists: currentItem.item.artists.map((artist) => artist.name),
|
||||
current: state.playbackControls.latestCurrentTime,
|
||||
duration: currentItem.item.duration,
|
||||
url: currentItem.item.url,
|
||||
image: coverUrl,
|
||||
};
|
||||
}
|
||||
const oldState = $tidalState.getState();
|
||||
const newState: TidalState = {
|
||||
status: playbackStatusMap[state.playbackControls.playbackState] ?? "Stopped",
|
||||
repeat: repeatModeMap[state.playQueue.repeatMode] ?? "Off",
|
||||
shuffle: state.playQueue.shuffleModeEnabled,
|
||||
currentTrack: track,
|
||||
};
|
||||
if (!equal(oldState, newState)) {
|
||||
$tidalState.setState(newState);
|
||||
}
|
||||
});
|
||||
})();
|
||||
|
||||
function getCurrentTrack(state: ReduxState) {
|
||||
return state.content.mediaItems[state.playbackControls.mediaProduct?.productId];
|
||||
}
|
||||
|
||||
const playbackStatusMap = {
|
||||
PLAYING: "Playing",
|
||||
NOT_PLAYING: "Paused",
|
||||
IDLE: "Stopped",
|
||||
STALLED: "Stopped",
|
||||
} as const;
|
||||
|
||||
const repeatModeMap = {
|
||||
[RepeatMode.REPEAT_OFF]: "Off",
|
||||
[RepeatMode.REPEAT_ALL]: "All",
|
||||
[RepeatMode.REPEAT_SINGLE]: "Single",
|
||||
} as const;
|
||||
@@ -1,24 +1,18 @@
|
||||
import { Client, SetActivity } from "@xhayper/discord-rpc";
|
||||
import { Client, Presence } from "discord-rpc";
|
||||
import { app, ipcMain } from "electron";
|
||||
import { globalEvents } from "../constants/globalEvents";
|
||||
import { settings } from "../constants/settings";
|
||||
import { Logger } from "../features/logger";
|
||||
import { convertDurationToSeconds } from "../features/time/parse";
|
||||
import { MediaStatus } from "../models/mediaStatus";
|
||||
import { mediaInfo } from "./mediaInfo";
|
||||
import { settingsStore } from "./settings";
|
||||
import { mainTidalState } from "../features/state";
|
||||
|
||||
const clientId = "833617820704440341";
|
||||
|
||||
export let rpc: Client;
|
||||
|
||||
const ACTIVITY_LISTENING = 2;
|
||||
const MAX_RETRIES = 5;
|
||||
const RETRY_DELAY = 10000;
|
||||
|
||||
const observer = () => {
|
||||
if (rpc) {
|
||||
updateActivity();
|
||||
rpc.setActivity(getActivity());
|
||||
}
|
||||
};
|
||||
|
||||
@@ -26,22 +20,12 @@ const defaultPresence = {
|
||||
largeImageKey: "tidal-hifi-icon",
|
||||
largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
|
||||
instance: false,
|
||||
type: ACTIVITY_LISTENING
|
||||
};
|
||||
|
||||
const updateActivity = () => {
|
||||
const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
|
||||
if (mediaInfo.status === MediaStatus.paused && !showIdle) {
|
||||
rpc.user?.clearActivity();
|
||||
} else {
|
||||
rpc.user?.setActivity(getActivity());
|
||||
}
|
||||
};
|
||||
const getActivity = (): Presence => {
|
||||
const presence: Presence = { ...defaultPresence };
|
||||
|
||||
const getActivity = (): SetActivity => {
|
||||
const presence: SetActivity = { ...defaultPresence };
|
||||
|
||||
if (mediaInfo.status === MediaStatus.paused) {
|
||||
if (mainTidalState.status === "Paused") {
|
||||
presence.details =
|
||||
settingsStore.get<string, string>(settings.discord.idleText) ?? "Browsing Tidal";
|
||||
} else {
|
||||
@@ -55,7 +39,6 @@ const getActivity = (): SetActivity => {
|
||||
settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
|
||||
}
|
||||
}
|
||||
|
||||
return presence;
|
||||
|
||||
function getFromStore() {
|
||||
@@ -69,63 +52,32 @@ const getActivity = (): SetActivity => {
|
||||
return { includeTimestamps, detailsPrefix, buttonText };
|
||||
}
|
||||
|
||||
/**
|
||||
* Pad a string using spaces to at least 2 characters
|
||||
* @param input string to pad with 2 characters
|
||||
* @returns
|
||||
*/
|
||||
function pad(input: string): string {
|
||||
return input.padEnd(2, " ");
|
||||
}
|
||||
|
||||
function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) {
|
||||
// discord requires a minimum of 2 characters
|
||||
const title = pad(mediaInfo.title);
|
||||
const album = pad(mediaInfo.album);
|
||||
const artists = pad(mediaInfo.artists);
|
||||
|
||||
if (mediaInfo.url) {
|
||||
presence.details = `${detailsPrefix}${title}`;
|
||||
presence.state = artists ? artists : "unknown artist(s)";
|
||||
presence.largeImageKey = mediaInfo.image;
|
||||
if (album) {
|
||||
presence.largeImageText = album;
|
||||
const track = mainTidalState.currentTrack;
|
||||
if (!track) return;
|
||||
if (track.url) {
|
||||
presence.details = `${detailsPrefix}${track.title}`;
|
||||
presence.state = track.artists.join(", ");
|
||||
presence.largeImageKey = track.image;
|
||||
if (track.album) {
|
||||
presence.largeImageText = track.album;
|
||||
}
|
||||
|
||||
presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
|
||||
presence.buttons = [{ label: buttonText, url: track.url }];
|
||||
} else {
|
||||
presence.details = `Watching ${title}`;
|
||||
presence.state = artists;
|
||||
presence.details = `Watching ${track.title}`;
|
||||
presence.state = track.artists.join(", ");
|
||||
}
|
||||
}
|
||||
|
||||
function includeTimeStamps(includeTimestamps: boolean) {
|
||||
if (includeTimestamps) {
|
||||
const currentSeconds = convertDurationToSeconds(mediaInfo.current);
|
||||
const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
|
||||
const now = Math.trunc((Date.now() + 500) / 1000);
|
||||
presence.startTimestamp = now - currentSeconds;
|
||||
presence.endTimestamp = presence.startTimestamp + durationSeconds;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 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');
|
||||
const currentSeconds = mainTidalState.currentTrack?.current ?? 0;
|
||||
const durationSeconds = mainTidalState.currentTrack?.duration ?? 0;
|
||||
const date = new Date();
|
||||
const now = (date.getTime() / 1000) | 0;
|
||||
const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
|
||||
presence.startTimestamp = now;
|
||||
presence.endTimestamp = remaining;
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -134,8 +86,18 @@ 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 });
|
||||
connectWithRetry();
|
||||
rpc = new Client({ transport: "ipc" });
|
||||
rpc.login({ clientId }).then(
|
||||
() => {
|
||||
rpc.on("ready", () => {
|
||||
rpc.setActivity(getActivity());
|
||||
});
|
||||
ipcMain.on(globalEvents.updateInfo, observer);
|
||||
},
|
||||
() => {
|
||||
Logger.log("Can't connect to Discord, is it running?");
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -143,7 +105,7 @@ export const initRPC = () => {
|
||||
*/
|
||||
export const unRPC = () => {
|
||||
if (rpc) {
|
||||
rpc.user?.clearActivity();
|
||||
rpc.clearActivity();
|
||||
rpc.destroy();
|
||||
rpc = null;
|
||||
ipcMain.removeListener(globalEvents.updateInfo, observer);
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
import fs from "fs";
|
||||
import request from "request";
|
||||
|
||||
/**
|
||||
* download and save a file
|
||||
* @param {string} fileUrl url to download
|
||||
* @param {string} targetPath path to save it at
|
||||
*/
|
||||
export const downloadFile = function (fileUrl: string, targetPath: string) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const req = request({
|
||||
method: "GET",
|
||||
uri: fileUrl,
|
||||
});
|
||||
|
||||
const out = fs.createWriteStream(targetPath);
|
||||
req.pipe(out);
|
||||
|
||||
req.on("end", resolve);
|
||||
|
||||
req.on("error", reject);
|
||||
});
|
||||
};
|
||||
@@ -1,45 +1,8 @@
|
||||
import { MediaInfo } from "../models/mediaInfo";
|
||||
import { MediaStatus } from "../models/mediaStatus";
|
||||
import { RepeatState } from "../models/repeatState";
|
||||
import { TidalState } from "../models/tidalState";
|
||||
|
||||
const defaultInfo: MediaInfo = {
|
||||
title: "",
|
||||
artists: "",
|
||||
album: "",
|
||||
icon: "",
|
||||
playingFrom: "",
|
||||
status: MediaStatus.paused,
|
||||
url: "",
|
||||
current: "",
|
||||
currentInSeconds: 0,
|
||||
duration: "",
|
||||
durationInSeconds: 0,
|
||||
image: "tidal-hifi-icon",
|
||||
favorite: false,
|
||||
|
||||
player: {
|
||||
status: MediaStatus.paused,
|
||||
shuffle: false,
|
||||
repeat: RepeatState.off,
|
||||
},
|
||||
// This object is globally mutated
|
||||
export const tidalState: TidalState = {
|
||||
status: "Stopped",
|
||||
repeat: "Off",
|
||||
shuffle: false,
|
||||
};
|
||||
|
||||
export let mediaInfo: MediaInfo = { ...defaultInfo };
|
||||
|
||||
export const updateMediaInfo = (arg: MediaInfo) => {
|
||||
mediaInfo = { ...defaultInfo, ...arg };
|
||||
mediaInfo.url = toUniversalUrl(mediaInfo.url);
|
||||
};
|
||||
|
||||
/**
|
||||
* Append the universal link syntax (?u) to any url
|
||||
* @param url url to append the universal link syntax to
|
||||
* @returns url with `?u` appended, or the original value of url if falsy
|
||||
*/
|
||||
function toUniversalUrl(url: string) {
|
||||
if (url) {
|
||||
const queryParamsSet = url.indexOf("?");
|
||||
return queryParamsSet > -1 ? `${url}&u` : `${url}?u`;
|
||||
}
|
||||
return url;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { BrowserWindow, Menu, app } from "electron";
|
||||
import { showSettingsWindow } from "./settings";
|
||||
|
||||
const isMac = process.platform === "darwin";
|
||||
import name from "./../constants/values";
|
||||
|
||||
const settingsMenuEntry = {
|
||||
label: "Settings",
|
||||
@@ -11,23 +11,6 @@ const settingsMenuEntry = {
|
||||
accelerator: "Control+=",
|
||||
};
|
||||
|
||||
const tidalMagazineEntry = {
|
||||
label: "Magazine",
|
||||
click() {
|
||||
const magazineWindow = new BrowserWindow({
|
||||
autoHideMenuBar: true,
|
||||
webPreferences: {
|
||||
sandbox: false,
|
||||
plugins: true,
|
||||
devTools: true, // I like tinkering, others might too
|
||||
},
|
||||
});
|
||||
magazineWindow.loadURL("https://tidal.com/magazine/");
|
||||
magazineWindow.show();
|
||||
},
|
||||
accelerator: "Control+M",
|
||||
};
|
||||
|
||||
const quitMenuEntry = {
|
||||
label: "Quit",
|
||||
click() {
|
||||
@@ -48,7 +31,7 @@ export const getMenu = function (mainWindow: BrowserWindow) {
|
||||
...(isMac
|
||||
? [
|
||||
{
|
||||
label: name,
|
||||
label: "TIDAL Hi-Fi",
|
||||
submenu: [
|
||||
settingsMenuEntry,
|
||||
{ type: "separator" },
|
||||
@@ -58,7 +41,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
|
||||
{ role: "hideothers" },
|
||||
{ role: "unhide" },
|
||||
{ type: "separator" },
|
||||
tidalMagazineEntry,
|
||||
quitMenuEntry,
|
||||
],
|
||||
},
|
||||
@@ -66,7 +48,7 @@ export const getMenu = function (mainWindow: BrowserWindow) {
|
||||
: []),
|
||||
{
|
||||
label: "File",
|
||||
submenu: [settingsMenuEntry, tidalMagazineEntry, isMac ? { role: "close" } : quitMenuEntry],
|
||||
submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry],
|
||||
},
|
||||
{
|
||||
label: "Edit",
|
||||
@@ -119,7 +101,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
|
||||
},
|
||||
settingsMenuEntry,
|
||||
toggleWindow,
|
||||
tidalMagazineEntry,
|
||||
quitMenuEntry,
|
||||
];
|
||||
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
export const ObjectToDotNotation = (obj: any, prefix: string = "", target: any = {}) => {
|
||||
Object.keys(obj).forEach((key: string) => {
|
||||
if (typeof obj[key] === "object" && obj[key] !== null) {
|
||||
ObjectToDotNotation(obj[key], prefix + key + ".", target);
|
||||
} else {
|
||||
const dotLocation = prefix + key;
|
||||
target[dotLocation] = obj[key];
|
||||
return target;
|
||||
}
|
||||
});
|
||||
return target;
|
||||
};
|
||||
@@ -28,13 +28,9 @@ const buildMigration = (
|
||||
export const settingsStore = new Store({
|
||||
defaults: {
|
||||
adBlock: false,
|
||||
advanced: {
|
||||
tidalUrl: "https://listen.tidal.com",
|
||||
},
|
||||
api: true,
|
||||
apiSettings: {
|
||||
port: 47836,
|
||||
hostname: "127.0.0.1",
|
||||
},
|
||||
customCSS: [],
|
||||
disableBackgroundThrottle: true,
|
||||
@@ -43,7 +39,6 @@ export const settingsStore = new Store({
|
||||
enableDiscord: false,
|
||||
discord: {
|
||||
showSong: true,
|
||||
showIdle: true,
|
||||
idleText: "Browsing Tidal",
|
||||
usingText: "Playing media on TIDAL",
|
||||
includeTimestamps: true,
|
||||
@@ -69,7 +64,6 @@ export const settingsStore = new Store({
|
||||
singleInstance: true,
|
||||
skipArtists: false,
|
||||
skippedArtists: [""],
|
||||
staticWindowTitle: false,
|
||||
theme: "none",
|
||||
trayIcon: true,
|
||||
updateFrequency: 500,
|
||||
@@ -107,19 +101,6 @@ export const settingsStore = new Store({
|
||||
},
|
||||
]);
|
||||
},
|
||||
"5.14.0": (migrationStore) => {
|
||||
buildMigration("5.14.0", migrationStore, [
|
||||
{ key: settings.apiSettings.hostname, value: "127.0.0.1" },
|
||||
]);
|
||||
},
|
||||
"5.15.0": (migrationStore) => {
|
||||
buildMigration("5.15.0", migrationStore, [
|
||||
{ key: settings.advanced.tidalUrl, value: "https://listen.tidal.com" },
|
||||
]);
|
||||
},
|
||||
"5.16.0": (migrationStore) => {
|
||||
buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
@@ -136,6 +117,7 @@ export const createSettingsWindow = function () {
|
||||
show: false,
|
||||
transparent: true,
|
||||
frame: false,
|
||||
type: "dialog",
|
||||
title: "TIDAL Hi-Fi settings",
|
||||
webPreferences: {
|
||||
preload: path.join(__dirname, "../pages/settings/preload.js"),
|
||||
@@ -178,25 +160,3 @@ export const hideSettingsWindow = function () {
|
||||
export const closeSettingsWindow = function () {
|
||||
settingsWindow = null;
|
||||
};
|
||||
|
||||
/**
|
||||
* add artists to the list of skipped artists
|
||||
* @param artists list of artists to append
|
||||
*/
|
||||
export const addSkippedArtists = (artists: string[]) => {
|
||||
const { skippedArtists } = settings;
|
||||
const previousStoreValue = settingsStore.get<string, string[]>(skippedArtists);
|
||||
settingsStore.set(skippedArtists, Array.from(new Set([...previousStoreValue, ...artists])));
|
||||
};
|
||||
|
||||
/**
|
||||
* Remove artists from the list of skipped artists
|
||||
* @param artists list of artists to remove
|
||||
*/
|
||||
export const removeSkippedArtists = (artists: string[]) => {
|
||||
const { skippedArtists } = settings;
|
||||
const previousStoreValue = settingsStore.get<string, string[]>(skippedArtists);
|
||||
const filteredArtists = previousStoreValue.filter((value) => ![...artists].includes(value));
|
||||
|
||||
settingsStore.set(skippedArtists, filteredArtists);
|
||||
};
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
export const setTitle = function (title: string) {
|
||||
window.document.title = title;
|
||||
};
|
||||
|
||||
export const getTitle = function () {
|
||||
return window.document.title;
|
||||
};
|
||||
121
src/types/mpris-service.d.ts
vendored
121
src/types/mpris-service.d.ts
vendored
@@ -1,60 +1,63 @@
|
||||
declare class InitOptions {
|
||||
name: string;
|
||||
identity: string;
|
||||
supportedUriSchemes: string[];
|
||||
supportedMimeTypes: string[];
|
||||
supportedInterfaces: string[];
|
||||
desktopEntry: string;
|
||||
}
|
||||
|
||||
declare class Player {
|
||||
metadata: {
|
||||
"xesam:title": string;
|
||||
"xesam:artist": string[];
|
||||
"xesam:album": string;
|
||||
"mpris:artUrl": string;
|
||||
"mpris:length": number;
|
||||
"mpris:trackid": string;
|
||||
// other options
|
||||
[key: string]: string | number | string[] | object;
|
||||
};
|
||||
playbackStatus: string;
|
||||
identity: string;
|
||||
fullscreen: boolean;
|
||||
supportedUriSchemes: string[];
|
||||
supportedMimeTypes: string[];
|
||||
canQuit: boolean;
|
||||
canRaise: boolean;
|
||||
canSetFullscreen: boolean;
|
||||
hasTrackList: boolean;
|
||||
desktopEntry: string;
|
||||
loopStatus: string;
|
||||
shuffle: boolean;
|
||||
volume: number;
|
||||
canControl: boolean;
|
||||
canPause: boolean;
|
||||
canPlay: boolean;
|
||||
canSeek: boolean;
|
||||
canGoNext: boolean;
|
||||
canGoPrevious: boolean;
|
||||
rate: number;
|
||||
minimumRate: number;
|
||||
maximumRate: number;
|
||||
playlists: string[];
|
||||
activePlaylist: string;
|
||||
|
||||
constructor(opts: { name: string; supportedInterfaces?: string[] });
|
||||
constructor(opts: InitOptions);
|
||||
|
||||
getPosition(): number;
|
||||
seeked(): void;
|
||||
getTrackIndex(trackId: number): number;
|
||||
getTrack(trackId: number): string;
|
||||
addTrack(track: object): void;
|
||||
removeTrack(trackId: number): number;
|
||||
getPlaylistIndex(playlistId: number): number;
|
||||
setPlaylists(playlists: object): void;
|
||||
setActivePlaylist(playlistId: number): void;
|
||||
|
||||
on(event: string | symbol, listener: (...args: object[]) => void): this;
|
||||
declare module "mpris-service" {
|
||||
export interface InitOptions {
|
||||
name: string;
|
||||
identity: string;
|
||||
supportedUriSchemes: string[];
|
||||
supportedMimeTypes: string[];
|
||||
supportedInterfaces: string[];
|
||||
desktopEntry: string;
|
||||
}
|
||||
export interface Player {
|
||||
metadata: {
|
||||
"xesam:title"?: string;
|
||||
"xesam:artist"?: string[];
|
||||
"xesam:album"?: string;
|
||||
"mpris:artUrl"?: string;
|
||||
"mpris:length"?: number | bigint;
|
||||
"mpris:trackid": string;
|
||||
// other options
|
||||
[key: string]: string | number | string[] | bigint | object;
|
||||
};
|
||||
playbackStatus: "Playing" | "Paused" | "Stopped";
|
||||
identity: string;
|
||||
fullscreen: boolean;
|
||||
supportedUriSchemes: string[];
|
||||
supportedMimeTypes: string[];
|
||||
canQuit: boolean;
|
||||
canRaise: boolean;
|
||||
canSetFullscreen: boolean;
|
||||
hasTrackList: boolean;
|
||||
desktopEntry: string;
|
||||
loopStatus: string;
|
||||
shuffle: boolean;
|
||||
volume: number;
|
||||
canControl: boolean;
|
||||
canPause: boolean;
|
||||
canPlay: boolean;
|
||||
canSeek: boolean;
|
||||
canGoNext: boolean;
|
||||
canGoPrevious: boolean;
|
||||
rate: number;
|
||||
minimumRate: number;
|
||||
maximumRate: number;
|
||||
playlists: string[];
|
||||
activePlaylist: string;
|
||||
|
||||
getPosition(): number | bigint;
|
||||
seeked(): void;
|
||||
getTrackIndex(trackId: number): number;
|
||||
getTrack(trackId: number): string;
|
||||
addTrack(track: object): void;
|
||||
removeTrack(trackId: number): number;
|
||||
getPlaylistIndex(playlistId: number): number;
|
||||
setPlaylists(playlists: object): void;
|
||||
setActivePlaylist(playlistId: number): void;
|
||||
objectPath(path: string): string;
|
||||
|
||||
on(event: string | symbol, listener: (...args: object[]) => void): this;
|
||||
_bus: import("dbus-next").MessageBus;
|
||||
}
|
||||
|
||||
export default function Player(opts: { name: string; supportedInterfaces?: string[] }): Player;
|
||||
export default function Player(opts: InitOptions): Player;
|
||||
}
|
||||
|
||||
@@ -2,13 +2,12 @@
|
||||
"compilerOptions": {
|
||||
"typeRoots": ["src/types", "node_modules/@types"],
|
||||
"module": "commonjs",
|
||||
"target": "ES6",
|
||||
"lib": ["ES2020", "DOM"],
|
||||
"target": "ESNext",
|
||||
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||
"noImplicitAny": true,
|
||||
"sourceMap": true,
|
||||
"allowJs": true,
|
||||
"outDir": "ts-dist",
|
||||
"resolveJsonModule": true,
|
||||
"esModuleInterop": true,
|
||||
"baseUrl": ".",
|
||||
"paths": {
|
||||
|
||||
Reference in New Issue
Block a user