mirror of
https://github.com/Mastermindzh/tidal-hifi.git
synced 2025-09-17 09:09:19 +02:00
Compare commits
133 Commits
6385375fd6
...
feature/ti
Author | SHA1 | Date | |
---|---|---|---|
40907f7b7f | |||
9cbb55fae7 | |||
8d4dd1ec9d | |||
d012ecb04e | |||
|
fa4b4da9a5 | ||
|
8f1a5dc344 | ||
604f34b31f | |||
3ff37f78e8 | |||
8eaca2221f | |||
8e9e9fed4f | |||
|
d839dba58d | ||
bbbd919655 | |||
d4104b21e4 | |||
6a23873d3d | |||
8d6f08a7bb | |||
521b8b2170 | |||
|
99e4cb7f48 | ||
|
4cd130ee0d | ||
|
a2a2c800b6 | ||
|
83210f9e1d | ||
5d40d2d736 | |||
405c2d7c9f | |||
|
9f860d2eec | ||
|
86487863f8 | ||
3312211df2 | |||
|
a84bb9efde | ||
31c37b6c7f | |||
be9724f0cb | |||
|
7277482c06 | ||
|
323b591f4f | ||
c63b46ee06 | |||
|
b4a8e155af | ||
2702d99aca | |||
|
7cf9ae5c36 | ||
3a1402b47a | |||
|
4366caa16a | ||
|
9389b4195e | ||
87d8bc07ad | |||
|
316bf054f5 | ||
0d4975ce62 | |||
|
912f064fed | ||
bff95bcf10 | |||
b59dce9c9b | |||
|
f71fb60d38 | ||
|
fab566e9da | ||
d2e93e7062 | |||
|
52a78a6a01 | ||
f878371fab | |||
e81aaf1384 | |||
|
98b4068b62 | ||
|
b7c1cee64d | ||
350b4434be | |||
702a16357f | |||
c6619be068 | |||
bf7cd70f20 | |||
03cb14e31e | |||
697298da38 | |||
5f5b3b11a8 | |||
d474b7b78f | |||
ef374ea283 | |||
|
96ff46737b | ||
|
dee0044876 | ||
3b1f456d4c | |||
|
f380839631 | ||
fca5194873 | |||
|
92d1fc159d | ||
b632c287b0 | |||
5a98b13e70 | |||
3543253f3a | |||
|
fff8399c9b | ||
|
78b9b32dbd | ||
|
c773e59432 | ||
535de65e17 | |||
b80599eab2 | |||
c161ef8f60 | |||
7ed160f266 | |||
b23975227f | |||
314e69dd4b | |||
|
10251e2f30 | ||
|
cf06655008 | ||
|
d5804ed4da | ||
|
76500ca6b8 | ||
|
f5c80e97c5 | ||
|
154698c084 | ||
9837e77768 | |||
340bd82fe6 | |||
b765ab9f48 | |||
6562549897 | |||
9089bc1d4e | |||
5a3609676e | |||
76c3082d5c | |||
7f7a8b7f5b | |||
|
2d49504818 | ||
|
5f4f0c67d5 | ||
|
3a5f1f155a | ||
|
3c9328fb92 | ||
|
f262c54be2 | ||
|
cb6e3e8b18 | ||
|
7f9b8dcee4 | ||
|
99740f4335 | ||
985bc0f1d5 | |||
1f9b3a297a | |||
98ca73d17d | |||
396ed223d3 | |||
|
b0458f4de5 | ||
|
b875d091ec | ||
|
1a0b69d042 | ||
|
e23a71a1a6 | ||
510ffa1509 | |||
|
e17ef32cde | ||
d4c3999d9c | |||
b0695600b1 | |||
|
22ecc7ade7 | ||
a5102ebd03 | |||
|
d01f08508f | ||
e87d8f6922 | |||
|
c044476014 | ||
75df43864b | |||
|
174d0a38a1 | ||
|
cf1aeefe67 | ||
280d927a03 | |||
|
f62294ef20 | ||
237e354f80 | |||
|
3a5172cb23 | ||
|
f8f12cca62 | ||
c5082e546b | |||
79bbab6a82 | |||
7376df7f30 | |||
53e7f42c59 | |||
7f8760c4e9 | |||
4330994b32 | |||
90d81d2178 | |||
|
1cf5a01ad7 |
@@ -4,12 +4,12 @@ name: default
|
||||
|
||||
steps:
|
||||
- name: install
|
||||
image: node:19.4.0
|
||||
image: node:22.17.0
|
||||
commands:
|
||||
- npm install
|
||||
|
||||
- name: build_with_linux
|
||||
image: node:19.4.0
|
||||
image: node:22.17.0
|
||||
commands:
|
||||
- apt-get update && apt-get upgrade -y
|
||||
- apt-get install -y libarchive-tools rpm
|
||||
|
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 22.4
|
||||
node-version: 22.12.0
|
||||
- run: npm install
|
||||
- run: npm run build
|
||||
# - uses: actions/upload-artifact@master
|
||||
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/setup-node@master
|
||||
with:
|
||||
node-version: 22.4
|
||||
node-version: 22.12.0
|
||||
- run: npm install
|
||||
- run: npm run build
|
||||
- uses: actions/upload-artifact@master
|
||||
|
36
.vscode/launch.json
vendored
Normal file
36
.vscode/launch.json
vendored
Normal file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
// we can use this to debug the main process
|
||||
"name": "Electron: Main",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/electron",
|
||||
"args": [
|
||||
"${workspaceFolder}/ts-dist/main.js",
|
||||
"--no-sandbox",
|
||||
"--disable-gpu",
|
||||
"--disable-software-rasterizer",
|
||||
"--in-process-gpu",
|
||||
"--inspect=0.0.0.0:5858",
|
||||
"--remote-debugging-port=8315"
|
||||
],
|
||||
"protocol": "inspector",
|
||||
"env": {
|
||||
"ELECTRON_DISABLE_SECURITY_WARNINGS": "false"
|
||||
},
|
||||
"outputCapture": "std"
|
||||
},
|
||||
// first run, then connect this to make sure we debug the UI
|
||||
{
|
||||
"name": "Electron: Renderer",
|
||||
"type": "chrome",
|
||||
"request": "attach",
|
||||
"port": 8315,
|
||||
"webRoot": "${workspaceFolder}",
|
||||
"sourceMaps": true,
|
||||
"skipFiles": ["<node_internals>/**"]
|
||||
}
|
||||
]
|
||||
}
|
4
.vscode/settings.json
vendored
4
.vscode/settings.json
vendored
@@ -17,7 +17,9 @@
|
||||
"trackid",
|
||||
"tracklist",
|
||||
"widevine",
|
||||
"xesam"
|
||||
"wvcus",
|
||||
"xesam",
|
||||
"xhayper"
|
||||
],
|
||||
"sonarlint.connectedMode.project": {
|
||||
"connectionId": "public-sonarcloud",
|
||||
|
17
CHANGELOG.md
17
CHANGELOG.md
@@ -4,6 +4,23 @@ 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.20.1]
|
||||
|
||||
- Updated electron to 37.2.5
|
||||
|
||||
## [5.20.0]
|
||||
|
||||
- Removes the `--enable-features=UseOzonePlatform` flag, as the Ozone platform has been the default on Linux since Electron 28 and this flag is no longer necessary.
|
||||
- Adds the `--enable-wayland-ime` flag to enable Input Method Editor (IME) support in Wayland environments, improving the input experience for CJK and other users.
|
||||
- Updated various dependencies
|
||||
- Updated Electron to 37, potentially fixing [#580](https://github.com/Mastermindzh/tidal-hifi/issues/580)
|
||||
|
||||
## [5.19.0]
|
||||
|
||||
- Fixed the issue where media updates would cease to work after album names can't be found
|
||||
- Will simply report an empty string when it can't find the album
|
||||
- Updated various dependencies
|
||||
|
||||
## [5.18.2]
|
||||
|
||||
- Reverted to sass 1.79.4 to fix `Nix` builds
|
||||
|
@@ -1,7 +1,7 @@
|
||||
appId: com.rickvanlieshout.tidal-hifi
|
||||
electronVersion: 35.1.1
|
||||
electronVersion: 37.2.5
|
||||
electronDownload:
|
||||
version: 35.1.1+wvcus
|
||||
version: 37.2.5+wvcus
|
||||
mirror: https://github.com/castlabs/electron-releases/releases/download/v
|
||||
snap:
|
||||
plugs:
|
||||
@@ -17,9 +17,10 @@ linux:
|
||||
executableName: tidal-hifi
|
||||
executableArgs:
|
||||
[
|
||||
"--enable-features=UseOzonePlatform",
|
||||
"--ozone-platform-hint=auto",
|
||||
"--enable-features=WaylandWindowDecorations",
|
||||
"--enable-wayland-ime",
|
||||
"--use-angle",
|
||||
]
|
||||
desktop:
|
||||
entry:
|
||||
|
1784
package-lock.json
generated
1784
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
55
package.json
55
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tidal-hifi",
|
||||
"version": "5.18.2",
|
||||
"version": "5.20.1",
|
||||
"description": "Tidal on Electron with widevine(hifi) support",
|
||||
"main": "ts-dist/main.js",
|
||||
"scripts": {
|
||||
@@ -41,44 +41,45 @@
|
||||
"homepage": "https://github.com/Mastermindzh/tidal-hifi",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@electron/remote": "^2.1.2",
|
||||
"@electron/remote": "^2.1.3",
|
||||
"@types/swagger-jsdoc": "^6.0.4",
|
||||
"@xhayper/discord-rpc": "^1.2.1",
|
||||
"axios": "^1.8.4",
|
||||
"electron-store": "^8.2.0",
|
||||
"express": "^4.21.2",
|
||||
"hotkeys-js": "^3.13.9",
|
||||
"mpris-service": "^2.1.2",
|
||||
"sass": "1.85.1",
|
||||
"swagger-ui-express": "^5.0.1",
|
||||
"@xhayper/discord-rpc": "1.3.0",
|
||||
"axios": "^1.10.0",
|
||||
"cors": "^2.8.5",
|
||||
"request": "^2.88.2"
|
||||
"electron-store": "^8.2.0",
|
||||
"express": "^5.1.0",
|
||||
"hotkeys-js": "^3.13.15",
|
||||
"mpris-service": "^2.1.2",
|
||||
"request": "^2.88.2",
|
||||
"sass": "1.91.0",
|
||||
"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/cors": "^2.8.19",
|
||||
"@types/express": "^5.0.3",
|
||||
"@types/node": "^22.16.2",
|
||||
"@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",
|
||||
"@types/swagger-ui-express": "^4.1.8",
|
||||
"@typescript-eslint/eslint-plugin": "^8.36.0",
|
||||
"@typescript-eslint/parser": "^8.36.0",
|
||||
"copyfiles": "^2.4.1",
|
||||
"electron": "github:castlabs/electron-releases#v35.1.1+wvcus",
|
||||
"electron": "github:castlabs/electron-releases#v37.2.5+wvcus",
|
||||
"electron-builder": "~26.0.12",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint": "^9.30.1",
|
||||
"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",
|
||||
"node-abi": "^4.12.0",
|
||||
"nodemon": "^3.1.10",
|
||||
"prettier": "^3.6.2",
|
||||
"stylelint": "^16.21.1",
|
||||
"stylelint-config-standard": "^39.0.0",
|
||||
"stylelint-config-standard-scss": "^15.0.1",
|
||||
"stylelint-prettier": "^5.0.3",
|
||||
"swagger-jsdoc": "^6.2.8",
|
||||
"ts-node": "^10.9.2",
|
||||
"tsc-watch": "^6.2.0",
|
||||
"typescript": "^5.5.3"
|
||||
"tsc-watch": "^7.1.1",
|
||||
"typescript": "^5.8.3"
|
||||
},
|
||||
"prettier": "@mastermindzh/prettier-config"
|
||||
}
|
||||
|
4
renovate.json
Normal file
4
renovate.json
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"ignoreDeps": ["@types/node", "electron-store", "@xhayper/discord-rpc"]
|
||||
}
|
@@ -92,34 +92,40 @@ export class DomTidalController implements TidalController<DomControllerOptions>
|
||||
},
|
||||
|
||||
getAlbumName: function () {
|
||||
//If listening to an album, get its name from the header title
|
||||
if (globalThis.location.href.includes("/album/")) {
|
||||
const albumName = globalThis.document.querySelector(this.album_header_title);
|
||||
if (albumName) {
|
||||
return albumName.textContent;
|
||||
}
|
||||
//If listening to a playlist or a mix, get album name from the list
|
||||
} else if (
|
||||
globalThis.location.href.includes("/playlist/") ||
|
||||
globalThis.location.href.includes("/mix/")
|
||||
) {
|
||||
if (this.getCurrentlyPlayingStatus() === 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;
|
||||
try {
|
||||
//If listening to an album, get its name from the header title
|
||||
if (globalThis.location.href.includes("/album/")) {
|
||||
const albumName = globalThis.document.querySelector(this.album_header_title);
|
||||
if (albumName) {
|
||||
return albumName.textContent;
|
||||
}
|
||||
//If listening to a playlist or a mix, get album name from the list
|
||||
} else if (
|
||||
globalThis.location.href.includes("/playlist/") ||
|
||||
globalThis.location.href.includes("/mix/")
|
||||
) {
|
||||
if (this.currentlyPlaying === MediaStatus.playing) {
|
||||
// find the currently playing element from the list (which might be in an album icon), traverse back up to the mediaItem (row) and select the album cell.
|
||||
// document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent
|
||||
const row = window.document
|
||||
.querySelector(this.currentlyPlaying)
|
||||
.closest(this.mediaItem);
|
||||
if (row) {
|
||||
return row.querySelector(this.album_name_cell).textContent;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// see whether we're on the queue page and get it from there
|
||||
const queueAlbumName = this.getText("queue_album");
|
||||
if (queueAlbumName) {
|
||||
return queueAlbumName;
|
||||
}
|
||||
// see whether we're on the queue page and get it from there
|
||||
const queueAlbumName = this.getText("queue_album");
|
||||
if (queueAlbumName) {
|
||||
return queueAlbumName;
|
||||
}
|
||||
|
||||
return "";
|
||||
return "";
|
||||
} catch {
|
||||
return "";
|
||||
}
|
||||
},
|
||||
|
||||
isMuted: function () {
|
||||
|
@@ -1,14 +1,16 @@
|
||||
import { MediaInfo } from "../models/mediaInfo";
|
||||
import { MediaStatus } from "../models/mediaStatus";
|
||||
import { RepeatState } from "../models/repeatState";
|
||||
import { DomTidalController } from "./DomController/DomTidalController";
|
||||
import { TidalController } from "./TidalController";
|
||||
import { Logger } from "../../features/logger";
|
||||
import { MediaInfo } from "../../models/mediaInfo";
|
||||
import { MediaStatus } from "../../models/mediaStatus";
|
||||
import { RepeatState } from "../../models/repeatState";
|
||||
import { DomTidalController } from "../DomController/DomTidalController";
|
||||
import { TidalController } from "../TidalController";
|
||||
|
||||
export class MediaSessionTidalController implements TidalController {
|
||||
export class TidalApiController implements TidalController {
|
||||
public domMediaController: TidalController;
|
||||
|
||||
constructor() {
|
||||
this.domMediaController = new DomTidalController();
|
||||
Logger.log("[TidalApiController] - Initialized domController as a backup controller");
|
||||
}
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void {
|
||||
@@ -132,8 +134,4 @@ export class MediaSessionTidalController implements TidalController {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
hookup(): void {
|
||||
globalThis.alert("Method not implemented");
|
||||
throw new Error("Method not implemented.");
|
||||
}
|
||||
}
|
4
src/constants/controller.ts
Normal file
4
src/constants/controller.ts
Normal file
@@ -0,0 +1,4 @@
|
||||
export const tidalControllers = {
|
||||
domController: "domController",
|
||||
tidalApiController: "tidalApiController",
|
||||
};
|
@@ -13,6 +13,7 @@ export const settings = {
|
||||
advanced: {
|
||||
root: "advanced",
|
||||
tidalUrl: "advanced.tidalUrl",
|
||||
controllerType: "advanced.controllerType",
|
||||
},
|
||||
api: "api",
|
||||
apiSettings: {
|
||||
|
@@ -88,8 +88,9 @@ export const addCurrentInfo = (expressApp: Router) => {
|
||||
* schema:
|
||||
* $ref: '#/components/schemas/MediaInfo'
|
||||
*/
|
||||
expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
|
||||
|
||||
expressApp.get("/current", (_req, res) => {
|
||||
res.json({ ...mediaInfo, artist: mediaInfo.artists });
|
||||
});
|
||||
/**
|
||||
* @swagger
|
||||
* /current/image:
|
||||
|
@@ -21,8 +21,12 @@ export const startApi = (mainWindow: BrowserWindow) => {
|
||||
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));
|
||||
expressApp.get("/", (req, res) => {
|
||||
res.send("Hello World!");
|
||||
});
|
||||
expressApp.get("/swagger.json", (req, res) => {
|
||||
res.json(swaggerSpec);
|
||||
});
|
||||
|
||||
// add features
|
||||
addLegacyApi(expressApp, mainWindow);
|
||||
|
@@ -2,7 +2,7 @@
|
||||
"openapi": "3.1.0",
|
||||
"info": {
|
||||
"title": "TIDAL Hi-Fi API",
|
||||
"version": "5.18.2",
|
||||
"version": "5.20.1",
|
||||
"description": "",
|
||||
"license": {
|
||||
"name": "MIT",
|
||||
@@ -21,7 +21,9 @@
|
||||
"/current": {
|
||||
"get": {
|
||||
"summary": "Get current media info",
|
||||
"tags": ["current"],
|
||||
"tags": [
|
||||
"current"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Current media info",
|
||||
@@ -39,7 +41,9 @@
|
||||
"/current/image": {
|
||||
"get": {
|
||||
"summary": "Get current media image",
|
||||
"tags": ["current"],
|
||||
"tags": [
|
||||
"current"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Current media image",
|
||||
@@ -61,7 +65,9 @@
|
||||
"/player/play": {
|
||||
"post": {
|
||||
"summary": "Play the current media",
|
||||
"tags": ["player"],
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
@@ -79,7 +85,9 @@
|
||||
"/player/favorite/toggle": {
|
||||
"post": {
|
||||
"summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
|
||||
"tags": ["player"],
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
@@ -97,7 +105,9 @@
|
||||
"/player/pause": {
|
||||
"post": {
|
||||
"summary": "Pause the current media",
|
||||
"tags": ["player"],
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
@@ -115,7 +125,9 @@
|
||||
"/player/next": {
|
||||
"post": {
|
||||
"summary": "Play the next song",
|
||||
"tags": ["player"],
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
@@ -133,7 +145,9 @@
|
||||
"/player/previous": {
|
||||
"post": {
|
||||
"summary": "Play the previous song",
|
||||
"tags": ["player"],
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
@@ -151,7 +165,9 @@
|
||||
"/player/shuffle/toggle": {
|
||||
"post": {
|
||||
"summary": "Play the previous song",
|
||||
"tags": ["player"],
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
@@ -169,7 +185,9 @@
|
||||
"/player/repeat/toggle": {
|
||||
"post": {
|
||||
"summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
|
||||
"tags": ["player"],
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
@@ -187,7 +205,9 @@
|
||||
"/player/playpause": {
|
||||
"post": {
|
||||
"summary": "Start playing the media if paused, or pause the media if playing",
|
||||
"tags": ["player"],
|
||||
"tags": [
|
||||
"player"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok",
|
||||
@@ -205,7 +225,9 @@
|
||||
"/settings/skipped-artists": {
|
||||
"get": {
|
||||
"summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
|
||||
"tags": ["settings"],
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "The list book.",
|
||||
@@ -221,7 +243,9 @@
|
||||
},
|
||||
"post": {
|
||||
"summary": "Add new artists to the list of skipped artists",
|
||||
"tags": ["settings"],
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"requestBody": {
|
||||
"required": true,
|
||||
"content": {
|
||||
@@ -242,7 +266,9 @@
|
||||
"/settings/skipped-artists/delete": {
|
||||
"post": {
|
||||
"summary": "Remove artists from the list of skipped artists",
|
||||
"tags": ["settings"],
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"requestBody": {
|
||||
"required": true,
|
||||
"content": {
|
||||
@@ -263,7 +289,9 @@
|
||||
"/settings/skipped-artists/current": {
|
||||
"post": {
|
||||
"summary": "Add the current artist to the list of skipped artists",
|
||||
"tags": ["settings"],
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok"
|
||||
@@ -272,7 +300,9 @@
|
||||
},
|
||||
"delete": {
|
||||
"summary": "Remove the current artist from the list of skipped artists",
|
||||
"tags": ["settings"],
|
||||
"tags": [
|
||||
"settings"
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Ok"
|
||||
@@ -283,7 +313,9 @@
|
||||
"/image": {
|
||||
"get": {
|
||||
"summary": "Get current image",
|
||||
"tags": ["legacy"],
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
@@ -306,7 +338,9 @@
|
||||
"/play": {
|
||||
"get": {
|
||||
"summary": "Play the current media",
|
||||
"tags": ["legacy"],
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
@@ -325,7 +359,9 @@
|
||||
"/favorite/toggle": {
|
||||
"get": {
|
||||
"summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
|
||||
"tags": ["legacy"],
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
@@ -344,7 +380,9 @@
|
||||
"/pause": {
|
||||
"get": {
|
||||
"summary": "Pause the current media",
|
||||
"tags": ["legacy"],
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
@@ -363,7 +401,9 @@
|
||||
"/next": {
|
||||
"get": {
|
||||
"summary": "Play the next song",
|
||||
"tags": ["legacy"],
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
@@ -382,7 +422,9 @@
|
||||
"/previous": {
|
||||
"get": {
|
||||
"summary": "Play the previous song",
|
||||
"tags": ["legacy"],
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
@@ -401,7 +443,9 @@
|
||||
"/playpause": {
|
||||
"get": {
|
||||
"summary": "Toggle play/pause",
|
||||
"tags": ["legacy"],
|
||||
"tags": [
|
||||
"legacy"
|
||||
],
|
||||
"deprecated": true,
|
||||
"responses": {
|
||||
"200": {
|
||||
@@ -514,7 +558,10 @@
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"example": ["Artist1", "Artist2"]
|
||||
"example": [
|
||||
"Artist1",
|
||||
"Artist2"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -532,4 +579,4 @@
|
||||
"description": "The settings management API"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
@@ -32,7 +32,8 @@ const PROTOCOL_PREFIX = "tidal";
|
||||
const windowPreferences = {
|
||||
sandbox: false,
|
||||
plugins: true,
|
||||
devTools: true, // I like tinkering, others might too
|
||||
devTools: true, // Ensure devTools is enabled for debugging
|
||||
contextIsolation: false, // Disable context isolation for debugging
|
||||
};
|
||||
|
||||
setDefaultFlags(app);
|
||||
|
@@ -61,7 +61,8 @@ let adBlock: HTMLInputElement,
|
||||
discord_show_song: HTMLInputElement,
|
||||
discord_show_idle: HTMLInputElement,
|
||||
discord_idle_text: HTMLInputElement,
|
||||
discord_using_text: HTMLInputElement;
|
||||
discord_using_text: HTMLInputElement,
|
||||
controllerType: HTMLSelectElement;
|
||||
|
||||
addCustomCss(app);
|
||||
|
||||
@@ -157,6 +158,7 @@ function refreshSettings() {
|
||||
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);
|
||||
controllerType.value = settingsStore.get(settings.advanced.controllerType);
|
||||
|
||||
// set state of all switches with additional settings
|
||||
Object.values(switchesWithSettings).forEach((settingSwitch) => {
|
||||
@@ -277,6 +279,7 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
discord_show_idle = get("discord_show_idle");
|
||||
discord_using_text = get("discord_using_text");
|
||||
discord_idle_text = get("discord_idle_text");
|
||||
controllerType = get<HTMLSelectElement>("controllerType");
|
||||
|
||||
refreshSettings();
|
||||
addInputListener(adBlock, settings.adBlock);
|
||||
@@ -322,4 +325,5 @@ window.addEventListener("DOMContentLoaded", () => {
|
||||
addInputListener(discord_show_idle, settings.discord.showIdle);
|
||||
addInputListener(discord_idle_text, settings.discord.idleText);
|
||||
addInputListener(discord_using_text, settings.discord.usingText);
|
||||
addSelectListener(controllerType, settings.advanced.controllerType);
|
||||
});
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||
<link rel="stylesheet" href="./settings.css" />
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.0/css/font-awesome.min.css">
|
||||
</head>
|
||||
|
||||
<body class="settings-window">
|
||||
@@ -382,6 +382,16 @@
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="group__option">
|
||||
<div class="group__description">
|
||||
<h4>Controller Type</h4>
|
||||
<p>Select the type of controller to use.</p>
|
||||
<select id="controllerType" class="select-input">
|
||||
<option value="domController">DOM Controller</option>
|
||||
<option value="tidalApiController">Tidal Api Controller (beta)</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="group">
|
||||
<p class="group__title">Flags</p>
|
||||
@@ -487,7 +497,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.2">5.18.2</a>
|
||||
href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.20.1">5.20.1</a>
|
||||
</div>
|
||||
<div class="about-section__links">
|
||||
<a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
|
||||
|
@@ -1,6 +1,7 @@
|
||||
import { app, dialog, Notification } from "@electron/remote";
|
||||
import { clipboard, ipcRenderer } from "electron";
|
||||
import Player from "mpris-service";
|
||||
import { tidalControllers } from "./constants/controller";
|
||||
import { globalEvents } from "./constants/globalEvents";
|
||||
import { settings } from "./constants/settings";
|
||||
import { downloadIcon } from "./features/icon/downloadIcon";
|
||||
@@ -20,9 +21,9 @@ import { addHotkey } from "./scripts/hotkeys";
|
||||
import { ObjectToDotNotation } from "./scripts/objectUtilities";
|
||||
import { settingsStore } from "./scripts/settings";
|
||||
import { setTitle } from "./scripts/window-functions";
|
||||
import { TidalApiController } from "./TidalControllers/apiController/TidalApiController";
|
||||
import { DomControllerOptions } from "./TidalControllers/DomController/DomControllerOptions";
|
||||
import { DomTidalController } from "./TidalControllers/DomController/DomTidalController";
|
||||
import { MediaSessionTidalController } from "./TidalControllers/MediaSessionTidalController";
|
||||
import { TidalController } from "./TidalControllers/TidalController";
|
||||
|
||||
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
|
||||
@@ -39,16 +40,22 @@ let tidalController: TidalController;
|
||||
let controllerOptions = {};
|
||||
let currentMediaInfo = getEmptyMediaInfo();
|
||||
|
||||
// TODO: replace with setting
|
||||
// eslint-disable-next-line no-constant-condition
|
||||
if (true) {
|
||||
tidalController = new DomTidalController();
|
||||
const domControllerOptions: DomControllerOptions = {
|
||||
refreshInterval: getDomUpdateFrequency(),
|
||||
};
|
||||
controllerOptions = domControllerOptions;
|
||||
} else {
|
||||
tidalController = new MediaSessionTidalController();
|
||||
switch (settingsStore.get(settings.advanced.controllerType)) {
|
||||
case tidalControllers.tidalApiController: {
|
||||
tidalController = new TidalApiController();
|
||||
Logger.log("TidalApiController initialized");
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
tidalController = new DomTidalController();
|
||||
const domControllerOptions: DomControllerOptions = {
|
||||
refreshInterval: getDomUpdateFrequency(),
|
||||
};
|
||||
controllerOptions = domControllerOptions;
|
||||
Logger.log("domController initialized");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -343,11 +350,11 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
|
||||
mediaInfo.title,
|
||||
mediaInfo.artists,
|
||||
mediaInfo.status,
|
||||
convertDurationToSeconds(mediaInfo.duration)
|
||||
convertDurationToSeconds(mediaInfo.duration),
|
||||
);
|
||||
scrobbleWaitingForDelay = false;
|
||||
},
|
||||
settingsStore.get(settings.ListenBrainz.delay) ?? 0
|
||||
settingsStore.get(settings.ListenBrainz.delay) ?? 0,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@@ -30,6 +30,7 @@ export const settingsStore = new Store({
|
||||
adBlock: false,
|
||||
advanced: {
|
||||
tidalUrl: "https://listen.tidal.com",
|
||||
controllerType: "domController",
|
||||
},
|
||||
api: true,
|
||||
apiSettings: {
|
||||
@@ -120,6 +121,11 @@ export const settingsStore = new Store({
|
||||
"5.16.0": (migrationStore) => {
|
||||
buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
|
||||
},
|
||||
"5.19.0": (migrationStore) => {
|
||||
buildMigration("5.19.0", migrationStore, [
|
||||
{ key: settings.advanced.controllerType, value: "domController" },
|
||||
]);
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
|
Reference in New Issue
Block a user