Compare commits

..

173 Commits

Author SHA1 Message Date
40907f7b7f changed mediaSessionController to API Controller 2025-09-01 13:08:42 +02:00
9cbb55fae7 Merge branch 'master' of github.com:Mastermindzh/tidal-hifi into feature/tidalControllers 2025-09-01 11:33:40 +02:00
8d4dd1ec9d Merge pull request #672 from Mastermindzh/renovate/sass-1.x
fix(deps): update sass to 1.91.0
2025-08-26 09:15:51 +02:00
d012ecb04e Merge pull request #671 from Mastermindzh/renovate/typescript-eslint-monorepo
chore(deps): update typescript-eslint monorepo to 8.41.0
2025-08-26 09:15:34 +02:00
Renovate Bot
fa4b4da9a5 fix(deps): update sass to 1.91.0 2025-08-26 01:30:43 +02:00
Renovate Bot
8f1a5dc344 chore(deps): update typescript-eslint monorepo to 8.41.0 2025-08-26 01:30:30 +02:00
604f34b31f Merge pull request #670 from Mastermindzh/next
electron update to 37.2.5
2025-08-25 12:11:33 +02:00
3ff37f78e8 version 5.20.1 2025-08-25 11:42:55 +02:00
8eaca2221f Merge pull request #669 from Mastermindzh/renovate/eslint-monorepo
chore(deps): update eslint to 9.34.0
2025-08-25 11:13:10 +02:00
8e9e9fed4f electron update to 37.2.5 2025-08-25 11:06:41 +02:00
Renovate Bot
d839dba58d chore(deps): update eslint to 9.34.0 2025-08-25 09:31:58 +02:00
bbbd919655 Merge pull request #645 from Mastermindzh/renovate/font-awesome-7.x
chore(deps): update font-awesome to 7.0.0
2025-08-25 09:14:16 +02:00
d4104b21e4 Merge pull request #658 from Mastermindzh/renovate/typescript-5.x-lockfile
chore(deps): update typescript to 5.9.2
2025-08-25 09:13:42 +02:00
6a23873d3d Merge pull request #659 from Mastermindzh/renovate/eslint-monorepo
chore(deps): update eslint to 9.33.0
2025-08-25 09:11:04 +02:00
8d6f08a7bb Merge pull request #662 from Mastermindzh/snyk-upgrade-5cdb32eaab1d0704488b8d5ad4e3ff42
[Snyk] Upgrade @xhayper/discord-rpc from 1.2.1 to 1.3.0
2025-08-25 09:06:49 +02:00
521b8b2170 Merge pull request #660 from Mastermindzh/renovate/typescript-eslint-monorepo
chore(deps): update typescript-eslint monorepo to 8.40.0
2025-08-25 09:05:06 +02:00
Renovate Bot
99e4cb7f48 chore(deps): update typescript-eslint monorepo to 8.40.0 2025-08-18 20:01:08 +02:00
snyk-bot
4cd130ee0d fix: upgrade @xhayper/discord-rpc from 1.2.1 to 1.3.0
Snyk has created this PR to upgrade @xhayper/discord-rpc from 1.2.1 to 1.3.0.

See this package in npm:
@xhayper/discord-rpc

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-08-16 09:19:45 +00:00
Renovate Bot
a2a2c800b6 chore(deps): update eslint to 9.33.0 2025-08-09 06:31:41 +02:00
Renovate Bot
83210f9e1d chore(deps): update typescript to 5.9.2 2025-08-08 12:47:13 +02:00
5d40d2d736 Merge pull request #654 from Mastermindzh/renovate/typescript-eslint-monorepo
chore(deps): update typescript-eslint monorepo to 8.39.0
2025-08-08 10:03:47 +02:00
405c2d7c9f Merge pull request #657 from Mastermindzh/renovate/stylelint-16.x-lockfile
chore(deps): update stylelint to 16.23.1
2025-08-08 09:58:46 +02:00
Renovate Bot
9f860d2eec chore(deps): update stylelint to 16.23.1 2025-08-07 20:39:11 +02:00
Renovate Bot
86487863f8 chore(deps): update typescript-eslint monorepo to 8.39.0 2025-08-06 12:42:07 +02:00
3312211df2 Merge pull request #656 from Mastermindzh/renovate/sass-1.x
fix(deps): update sass to 1.90.0
2025-08-06 11:04:03 +02:00
Renovate Bot
a84bb9efde fix(deps): update sass to 1.90.0 2025-08-06 04:43:00 +02:00
31c37b6c7f Merge pull request #650 from Mastermindzh/renovate/stylelint-16.x-lockfile
chore(deps): update stylelint to 16.23.0
2025-07-30 13:23:38 +02:00
be9724f0cb Merge pull request #651 from Mastermindzh/renovate/stylelint-config-standard-39.x
chore(deps): update stylelint-config-standard to 39.0.0
2025-07-30 13:23:14 +02:00
Renovate Bot
7277482c06 chore(deps): update stylelint-config-standard to 39.0.0 2025-07-29 20:42:09 +02:00
Renovate Bot
323b591f4f chore(deps): update stylelint to 16.23.0 2025-07-29 20:41:47 +02:00
c63b46ee06 Merge pull request #649 from Mastermindzh/renovate/request-2.x-lockfile
chore(deps): update @types/request to 2.48.13
2025-07-29 10:05:43 +02:00
Renovate Bot
b4a8e155af chore(deps): update @types/request to 2.48.13 2025-07-29 04:43:02 +02:00
2702d99aca Merge pull request #648 from Mastermindzh/renovate/eslint-monorepo
chore(deps): update eslint to 9.32.0
2025-07-28 09:39:07 +02:00
Renovate Bot
7cf9ae5c36 chore(deps): update eslint to 9.32.0 2025-07-25 20:56:13 +02:00
3a1402b47a Merge pull request #647 from Mastermindzh/renovate/npm-axios-vulnerability
fix(deps): update axios to 1.11.0 [security]
2025-07-24 10:22:05 +02:00
Renovate Bot
4366caa16a fix(deps): update axios to 1.11.0 [security] 2025-07-23 20:52:01 +02:00
Renovate Bot
9389b4195e chore(deps): update font-awesome to 7.0.0 2025-07-22 20:35:28 +02:00
87d8bc07ad Merge pull request #644 from Mastermindzh/renovate/typescript-eslint-monorepo
chore(deps): update typescript-eslint monorepo to 8.38.0
2025-07-22 01:40:04 +02:00
Renovate Bot
316bf054f5 chore(deps): update typescript-eslint monorepo to 8.38.0 2025-07-21 20:47:06 +02:00
0d4975ce62 Merge pull request #641 from Mastermindzh/renovate/stylelint-16.x-lockfile
chore(deps): update stylelint to 16.22.0
2025-07-18 13:52:11 +02:00
Renovate Bot
912f064fed chore(deps): update stylelint to 16.22.0 2025-07-18 13:18:24 +02:00
bff95bcf10 Merge pull request #639 from Mastermindzh/renovate/mastermindzh-prettier-config-1.x-lockfile
chore(deps): update @mastermindzh/prettier-config to 1.1.0
2025-07-16 00:49:23 +02:00
b59dce9c9b Merge pull request #640 from Mastermindzh/renovate/electron-35.x
chore(deps): update electron to v35.7.2+wvcus
2025-07-16 00:49:14 +02:00
Renovate Bot
f71fb60d38 chore(deps): update electron to v35.7.2+wvcus 2025-07-15 22:35:31 +02:00
Renovate Bot
fab566e9da chore(deps): update @mastermindzh/prettier-config to 1.1.0 2025-07-15 14:50:26 +02:00
d2e93e7062 Merge pull request #638 from Mastermindzh/renovate/typescript-eslint-monorepo
chore(deps): update typescript-eslint monorepo to 8.37.0
2025-07-15 09:23:16 +02:00
Renovate Bot
52a78a6a01 chore(deps): update typescript-eslint monorepo to 8.37.0 2025-07-14 19:46:27 +02:00
f878371fab Merge pull request #634 from Mastermindzh/renovate/eslint-monorepo
chore(deps): update eslint to 9.31.0
2025-07-14 10:51:12 +02:00
e81aaf1384 Merge pull request #635 from Mastermindzh/renovate/electron-35.x
chore(deps): update electron to v35.7.1+wvcus
2025-07-14 10:51:04 +02:00
Renovate Bot
98b4068b62 chore(deps): update electron to v35.7.1+wvcus 2025-07-12 01:50:08 +02:00
Renovate Bot
b7c1cee64d chore(deps): update eslint to 9.31.0 2025-07-11 22:50:18 +02:00
350b4434be Merge pull request #633 from Mastermindzh/next
Next
2025-07-10 14:57:19 +02:00
702a16357f chore: copilot review changes 2025-07-10 11:18:46 +02:00
c6619be068 chore: update version numbers 2025-07-10 11:11:57 +02:00
bf7cd70f20 updated some dev deps 2025-07-10 11:10:43 +02:00
03cb14e31e added nvmrc 2025-07-10 11:05:26 +02:00
697298da38 fix: updated Electron to 37, fixes #580 2025-07-10 10:56:58 +02:00
5f5b3b11a8 pulled in edocli PR and updated dependencies 2025-07-10 10:44:57 +02:00
d474b7b78f Merge pull request #632 from Mastermindzh/renovate/hotkeys-js-3.x-lockfile
fix(deps): update hotkeys-js to 3.13.15
2025-07-10 10:31:59 +02:00
ef374ea283 Merge pull request #631 from Mastermindzh/renovate/node-22.x-lockfile
chore(deps): update @types/node to 22.16.2
2025-07-10 10:31:44 +02:00
Renovate Bot
96ff46737b fix(deps): update hotkeys-js to 3.13.15 2025-07-09 11:52:31 +02:00
Renovate Bot
dee0044876 chore(deps): update @types/node to 22.16.2 2025-07-09 02:28:17 +02:00
3b1f456d4c Merge pull request #630 from Mastermindzh/renovate/node-22.x-lockfile
chore(deps): update @types/node to 22.16.1
2025-07-08 20:24:05 +02:00
Renovate Bot
f380839631 chore(deps): update @types/node to 22.16.1 2025-07-08 19:21:47 +02:00
fca5194873 Merge pull request #628 from Mastermindzh/renovate/electron-remote-2.x-lockfile
fix(deps): update @electron/remote to 2.1.3
2025-07-07 23:24:38 +02:00
Renovate Bot
92d1fc159d fix(deps): update @electron/remote to 2.1.3 2025-07-07 20:31:42 +02:00
b632c287b0 Merge pull request #622 from Mastermindzh/renovate/stylelint-config-standard-scss-15.x
chore(deps): update stylelint-config-standard-scss to 15.0.1
2025-07-07 20:27:40 +02:00
5a98b13e70 Merge pull request #627 from Mastermindzh/renovate/major-eslint-monorepo
chore(deps): update eslint to 9.30.1
2025-07-07 20:19:51 +02:00
3543253f3a Merge pull request #626 from Mastermindzh/renovate/typescript-eslint-monorepo
chore(deps): update typescript-eslint monorepo to 8.36.0
2025-07-07 20:19:22 +02:00
Renovate Bot
fff8399c9b chore(deps): update stylelint-config-standard-scss to 15.0.1 2025-07-07 19:46:47 +02:00
Renovate Bot
78b9b32dbd chore(deps): update eslint to 9.30.1 2025-07-07 19:46:30 +02:00
Renovate Bot
c773e59432 chore(deps): update typescript-eslint monorepo to 8.36.0 2025-07-07 19:46:15 +02:00
535de65e17 Merge pull request #624 from Mastermindzh/renovate/major-typescript-eslint-monorepo
chore(deps): update typescript-eslint monorepo to 8.36.0 (major)
2025-07-07 19:38:53 +02:00
b80599eab2 Merge pull request #623 from Mastermindzh/renovate/tsc-watch-7.x
chore(deps): update tsc-watch to 7.1.1
2025-07-07 19:32:21 +02:00
c161ef8f60 Merge pull request #621 from Mastermindzh/renovate/stylelint-config-standard-38.x
chore(deps): update stylelint-config-standard to 38.0.0
2025-07-07 19:02:14 +02:00
7ed160f266 Merge pull request #620 from Mastermindzh/renovate/node-22.x
chore(deps): update node.js to v22.17.0
2025-07-07 18:41:31 +02:00
b23975227f Merge pull request #619 from Mastermindzh/renovate/font-awesome-6.x
chore(deps): update font-awesome to 6.7.2
2025-07-07 18:37:38 +02:00
314e69dd4b Merge pull request #618 from Mastermindzh/renovate/major-eslint-monorepo
chore(deps): update eslint to 9.30.1
2025-07-07 18:37:18 +02:00
Renovate Bot
10251e2f30 chore(deps): update typescript-eslint monorepo to 8.35.1 2025-07-07 18:10:32 +02:00
Renovate Bot
cf06655008 chore(deps): update tsc-watch to 7.1.1 2025-07-07 18:10:17 +02:00
Renovate Bot
d5804ed4da chore(deps): update stylelint-config-standard to 38.0.0 2025-07-07 18:09:52 +02:00
Renovate Bot
76500ca6b8 chore(deps): update node.js to v22.17.0 2025-07-07 18:07:30 +02:00
Renovate Bot
f5c80e97c5 chore(deps): update font-awesome to 6.7.2 2025-07-07 18:05:39 +02:00
Renovate Bot
154698c084 chore(deps): update eslint to 9.30.1 2025-07-07 17:50:09 +02:00
9837e77768 Merge pull request #616 from Mastermindzh/renovate/axios-1.x-lockfile
fix(deps): update axios to 1.10.0
2025-07-07 16:25:54 +02:00
340bd82fe6 Merge pull request #615 from Mastermindzh/renovate/tsc-watch-6.x-lockfile
chore(deps): update tsc-watch to 6.3.1
2025-07-07 16:24:04 +02:00
b765ab9f48 Merge pull request #614 from Mastermindzh/renovate/stylelint-16.x-lockfile
chore(deps): update stylelint to 16.21.1
2025-07-07 16:23:28 +02:00
6562549897 Merge pull request #612 from Mastermindzh/renovate/prettier-3.x-lockfile
chore(deps): update prettier to 3.6.2
2025-07-07 16:23:02 +02:00
9089bc1d4e Merge pull request #607 from Mastermindzh/renovate/hotkeys-js-3.x-lockfile
fix(deps): update hotkeys-js to 3.13.14
2025-07-07 16:22:42 +02:00
5a3609676e Merge pull request #609 from Mastermindzh/renovate/node-20.x-lockfile
chore(deps): update @types/node to 20.19.4
2025-07-07 16:22:26 +02:00
76c3082d5c Merge pull request #605 from Mastermindzh/renovate/nodemon-3.x-lockfile
chore(deps): update nodemon to 3.1.10
2025-07-07 15:49:18 +02:00
7f7a8b7f5b Merge pull request #604 from Mastermindzh/renovate/express-5.x-lockfile
chore(deps): update @types/express to 5.0.3
2025-07-07 15:22:11 +02:00
Renovate Bot
2d49504818 fix(deps): update axios to 1.10.0 2025-07-07 14:32:14 +02:00
Renovate Bot
5f4f0c67d5 chore(deps): update tsc-watch to 6.3.1 2025-07-07 14:32:10 +02:00
Renovate Bot
3a5f1f155a chore(deps): update stylelint to 16.21.1 2025-07-07 14:32:06 +02:00
Renovate Bot
3c9328fb92 chore(deps): update prettier to 3.6.2 2025-07-07 14:32:02 +02:00
Renovate Bot
f262c54be2 chore(deps): update @types/node to 20.19.4 2025-07-07 14:31:58 +02:00
Renovate Bot
cb6e3e8b18 fix(deps): update hotkeys-js to 3.13.14 2025-07-07 14:31:54 +02:00
Renovate Bot
7f9b8dcee4 chore(deps): update nodemon to 3.1.10 2025-07-07 14:31:45 +02:00
Renovate Bot
99740f4335 chore(deps): update @types/express to 5.0.3 2025-07-07 14:31:41 +02:00
985bc0f1d5 Merge pull request #610 from Mastermindzh/renovate/electron-35.x
chore(deps): update electron to v35.7.0+wvcus
2025-07-07 14:31:22 +02:00
1f9b3a297a Merge pull request #611 from Mastermindzh/renovate/node-19.x
chore(deps): update node.js to v19.9.0
2025-07-07 14:28:41 +02:00
98ca73d17d Merge pull request #608 from Mastermindzh/renovate/sass-1.x
fix(deps): update sass to 1.89.2
2025-07-07 14:27:35 +02:00
396ed223d3 Merge pull request #603 from Mastermindzh/renovate/cors-2.x-lockfile
chore(deps): update @types/cors to 2.8.19
2025-07-07 13:27:08 +02:00
Renovate Bot
b0458f4de5 chore(deps): update node.js to v19.9.0 2025-07-07 13:09:34 +02:00
Renovate Bot
b875d091ec chore(deps): update electron to v35.7.0+wvcus 2025-07-07 13:09:30 +02:00
Renovate Bot
1a0b69d042 fix(deps): update sass to 1.89.2 2025-07-07 13:09:16 +02:00
Renovate Bot
e23a71a1a6 chore(deps): update @types/cors to 2.8.19 2025-07-07 13:08:49 +02:00
510ffa1509 Merge pull request #602 from Mastermindzh/renovate/configure
chore: Configure Renovate
2025-07-07 13:05:04 +02:00
Renovate Bot
e17ef32cde Add renovate.json 2025-07-07 12:00:56 +02:00
d4c3999d9c Merge pull request #593 from edocli/master
feat(build): Update Wayland launch flags for Linux
2025-07-07 09:11:38 +02:00
b0695600b1 Merge pull request #599 from Mastermindzh/snyk-upgrade-c222f288d19352ce1096b7bea79acbab
[Snyk] Upgrade hotkeys-js from 3.13.10 to 3.13.11
2025-07-07 09:10:17 +02:00
snyk-bot
22ecc7ade7 fix: upgrade hotkeys-js from 3.13.10 to 3.13.11
Snyk has created this PR to upgrade hotkeys-js from 3.13.10 to 3.13.11.

See this package in npm:
hotkeys-js

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-07-05 06:52:09 +00:00
a5102ebd03 Merge pull request #596 from Mastermindzh/snyk-upgrade-8471eaf4e087a1ad71b342b81e6741ae
[Snyk] Upgrade sass from 1.89.0 to 1.89.1
2025-06-23 12:46:05 +02:00
snyk-bot
d01f08508f fix: upgrade sass from 1.89.0 to 1.89.1
Snyk has created this PR to upgrade sass from 1.89.0 to 1.89.1.

See this package in npm:
sass

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-06-21 09:48:24 +00:00
e87d8f6922 Merge pull request #594 from Mastermindzh/snyk-upgrade-2487864f695c4105f8d0392b9d406127
[Snyk] Upgrade sass from 1.87.0 to 1.89.0
2025-06-15 10:13:13 +02:00
snyk-bot
c044476014 fix: upgrade sass from 1.87.0 to 1.89.0
Snyk has created this PR to upgrade sass from 1.87.0 to 1.89.0.

See this package in npm:
sass

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-06-14 11:15:21 +00:00
75df43864b Merge pull request #588 from Mastermindzh/snyk-upgrade-5a5f2fcd2f171f53dcc34ab5933a3c09
[Snyk] Upgrade sass from 1.86.3 to 1.87.0
2025-06-09 11:00:33 +03:00
Edoc
174d0a38a1 Update electron-builder.base.yml
Adds the `--use-angle` flag to work around driver compatibility issues that cause the NVIDIA GPU process to crash repeatedly on Wayland. The native EGL/GBM backend fails with "Cannot create bo" errors.
2025-06-09 03:09:37 -04:00
Edoc
cf1aeefe67 Update electron-builder.base.yml
- Remove obsolete --enable-features=UseOzonePlatform flag
- Add --enable-wayland-ime for IME support on Wayland
2025-06-08 18:46:01 -04:00
280d927a03 Merge pull request #590 from Mastermindzh/snyk-upgrade-218353a4201f743fe837fca092089385
[Snyk] Upgrade hotkeys-js from 3.13.9 to 3.13.10
2025-05-31 14:16:42 +02:00
snyk-bot
f62294ef20 fix: upgrade hotkeys-js from 3.13.9 to 3.13.10
Snyk has created this PR to upgrade hotkeys-js from 3.13.9 to 3.13.10.

See this package in npm:
hotkeys-js

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-05-31 08:20:25 +00:00
237e354f80 Merge pull request #587 from Mastermindzh/snyk-upgrade-7cf34416a89cb7ffe31756c1f2c4b62d
[Snyk] Upgrade axios from 1.8.4 to 1.9.0
2025-05-26 09:46:38 +02:00
snyk-bot
3a5172cb23 fix: upgrade sass from 1.86.3 to 1.87.0
Snyk has created this PR to upgrade sass from 1.86.3 to 1.87.0.

See this package in npm:
sass

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-05-24 08:12:39 +00:00
snyk-bot
f8f12cca62 fix: upgrade axios from 1.8.4 to 1.9.0
Snyk has created this PR to upgrade axios from 1.8.4 to 1.9.0.

See this package in npm:
axios

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-05-24 08:12:36 +00:00
c5082e546b Merge branch 'master' of github.com:Mastermindzh/tidal-hifi into feature/tidalControllers 2025-04-22 15:59:22 +02:00
79bbab6a82 Merge pull request #584 from Mastermindzh/next
albumInfo fix, updated dependencies
2025-04-22 11:40:41 +02:00
7376df7f30 albumInfo fix, updated dependencies 2025-04-22 11:14:19 +02:00
53e7f42c59 chore: giving up on state, reverted to MediaSessionController 2025-04-20 14:25:09 +02:00
7f8760c4e9 Merge pull request #583 from Mastermindzh/snyk-upgrade-36ee0aede4ca42df3db4bef87530e654
[Snyk] Upgrade sass from 1.85.1 to 1.86.0
2025-04-20 13:24:05 +02:00
4330994b32 chore: added debug possibilities 2025-04-20 13:04:01 +02:00
90d81d2178 feat: replace hardcoded selector with setting implements #543 2025-04-20 12:15:03 +02:00
snyk-bot
1cf5a01ad7 fix: upgrade sass from 1.85.1 to 1.86.0
Snyk has created this PR to upgrade sass from 1.85.1 to 1.86.0.

See this package in npm:
sass

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-04-19 09:04:54 +00:00
6385375fd6 Merge branch 'master' of github.com:Mastermindzh/tidal-hifi into feature/tidalControllers 2025-04-18 14:53:12 +02:00
8fc49f500e Merge pull request #577 from Mastermindzh/snyk-upgrade-b144be84df6292449bfe4eacd9662b97
[Snyk] Upgrade sass from 1.79.4 to 1.85.1
2025-04-18 14:50:52 +02:00
snyk-bot
49f5a01b58 fix: upgrade sass from 1.79.4 to 1.85.1
Snyk has created this PR to upgrade sass from 1.79.4 to 1.85.1.

See this package in npm:
sass

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-04-05 07:45:32 +00:00
48f4fe47ef Merge pull request #573 from Mastermindzh/next
Next
2025-03-30 13:10:28 +02:00
a819e1eb45 removing mac/win builds, they aren't targetted anyway 2025-03-30 12:52:48 +02:00
57e6342b5f Merge branch 'next' of github.com:Mastermindzh/tidal-hifi into next 2025-03-30 12:50:31 +02:00
58a543a3c8 fixed .desktop file 2025-03-30 12:50:27 +02:00
1c915d99fe Merge pull request #572 from QF0xB/fix/nix-build-temporarily
Reverted sass to 1.79.4
2025-03-30 12:49:29 +02:00
Quirin Brändli
8994360415 Reverted sass to 1.79.4 2025-03-30 00:06:46 +01:00
a5c0d9e6e8 Merge pull request #570 from Mastermindzh/fix/login
Fix/login
2025-03-29 20:45:40 +01:00
f8eb36f4c7 bumped versions 2025-03-29 17:12:28 +01:00
5ca90c25d3 update builder to v35 as well 2025-03-29 17:05:17 +01:00
cf86969cfc updated builder, removed abstract-socket 2025-03-29 16:27:24 +01:00
afd05ae88b updated electron, deps, and moved remote calls after start 2025-03-29 15:58:28 +01:00
72c25dfdc1 Merge pull request #564 from Mastermindzh/snyk-fix-1995dd90a05e86ea7c2e4f0f7a284930
[Snyk] Security upgrade @xhayper/discord-rpc from 1.2.0 to 1.2.1
2025-03-23 21:32:20 +01:00
snyk-bot
25b30edf31 fix: package.json & package-lock.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-UNDICI-8641354
2025-03-22 08:54:58 +00:00
a08fad421a Merge branch 'master' of github.com:Mastermindzh/tidal-hifi into feature/tidalControllers 2025-03-18 10:55:07 +01:00
35ed4807e3 Merge pull request #558 from Mastermindzh/next
Next
2025-03-18 09:10:40 +01:00
deff9524a8 album & playingfrom info added to mediaInfo again. fixes #548 2025-03-17 11:05:10 +01:00
c975ecb16b incorporated next into this branch 2025-03-17 10:28:08 +01:00
34c7777eeb Merge pull request #554 from Dianoga/duration-fix
fix duration selector
2025-03-17 10:27:42 +01:00
048e949f30 Merge branch 'master' of github.com:Mastermindzh/tidal-hifi into next 2025-03-17 09:54:06 +01:00
Brian Steere
4a976bc58c fix duration selector
Should fix the MPRIS issue as long as duration doesn't break again.
2025-03-12 14:21:13 -05:00
f553fe98e7 finished interface for TidalController and moved most domLogic to the domController 2025-03-09 14:47:30 +01:00
aed40ec4ef Merge branch 'master' of github.com:Mastermindzh/tidal-hifi into feature/tidalControllers 2025-03-07 09:28:20 +01:00
ff4c51234b Merge pull request #524 from Mastermindzh/snyk-upgrade-278f4ec84db5f4ebc26d987909c6c73f
[Snyk] Upgrade hotkeys-js from 3.13.7 to 3.13.9
2025-01-06 17:48:43 +01:00
snyk-bot
c4ee6b51b9 fix: upgrade hotkeys-js from 3.13.7 to 3.13.9
Snyk has created this PR to upgrade hotkeys-js from 3.13.7 to 3.13.9.

See this package in npm:
hotkeys-js

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-01-04 01:22:24 +00:00
45fe336598 Merge pull request #522 from Mastermindzh/snyk-upgrade-7f82ddec0efc65c72c6f7f2f182ace7c
[Snyk] Upgrade axios from 1.7.8 to 1.7.9
2024-12-28 12:45:52 +01:00
snyk-bot
fe9f50aaf5 fix: upgrade axios from 1.7.8 to 1.7.9
Snyk has created this PR to upgrade axios from 1.7.8 to 1.7.9.

See this package in npm:
axios

See this project in Snyk:
https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr
2024-12-27 23:17:27 +00:00
aaf7a1b662 Merge pull request #504 from darkiox/master
Fix Discord RPC Timestamp jitter
2024-12-09 11:21:27 +01:00
755be0ee30 Merge pull request #515 from Mastermindzh/snyk-fix-82857ea1745fc2cfbc5f06a87a8ff0b8
[Snyk] Security upgrade express from 4.21.1 to 4.21.2
2024-12-09 11:05:23 +01:00
snyk-bot
9d736b2bd9 fix: package.json & package-lock.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-PATHTOREGEXP-8482416
2024-12-06 20:33:54 +00:00
f4d4b1a1df Merge pull request #508 from Mastermindzh/snyk-fix-a6630fbdb3c8f0161d0b939cf0ec3ca3
[Snyk] Security upgrade axios from 1.7.7 to 1.7.8
2024-12-02 09:03:11 +01:00
snyk-bot
0c27c815f5 fix: package.json & package-lock.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-AXIOS-6671926
2024-11-30 06:57:38 +00:00
Darkiox
a3aa45a96b fix: discord rpc timestamp jitter 2024-11-25 19:15:26 -03:00
d3e126d86b chore: bump modules 2024-10-28 22:52:33 +01:00
d36bc7480f extracted yet more of the domControl into the new tidalController 2024-10-28 22:49:00 +01:00
f608d42747 rename to TidalController 2024-10-27 23:07:52 +01:00
286c7789c0 Merge branch 'develop' of github.com:Mastermindzh/tidal-hifi into feature/tidalControllers 2024-10-27 23:06:40 +01:00
01c5ec7ebb PoC: separated tidal interface controller into separate controllers 2024-10-27 23:05:55 +01:00
32 changed files with 5127 additions and 2956 deletions

View File

@@ -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

View File

@@ -21,26 +21,30 @@ 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
# with:
# name: linux-builds
# path: dist/
build_on_mac:
runs-on: macos-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: 22.4
- run: npm install
- run: npm run build
# build_on_mac:
# runs-on: macos-latest
# steps:
# - uses: actions/checkout@master
# - uses: actions/setup-node@master
# with:
# node-version: 22.4
# - run: npm install
# - run: npm run build
build_on_win:
runs-on: windows-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: 22.4
- run: npm install
- run: npm run build
# build_on_win:
# runs-on: windows-latest
# steps:
# - uses: actions/checkout@master
# - uses: actions/setup-node@master
# with:
# node-version: 22.4
# - run: npm install
# - run: npm run build

View File

@@ -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
@@ -29,30 +29,30 @@ jobs:
name: linux-builds
path: dist/
build_on_mac:
runs-on: macos-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: 22.4
- run: npm install
- run: npm run build
- uses: actions/upload-artifact@master
with:
name: mac-builds
path: ./dist/
# build_on_mac:
# runs-on: macos-latest
# steps:
# - uses: actions/checkout@master
# - uses: actions/setup-node@master
# with:
# node-version: 22.4
# - run: npm install
# - run: npm run build
# - uses: actions/upload-artifact@master
# with:
# name: mac-builds
# path: ./dist/
build_on_win:
runs-on: windows-latest
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: 22.4
- run: npm install
- run: npm run build
- uses: actions/upload-artifact@master
with:
name: windows-builds
path: dist/
# build_on_win:
# runs-on: windows-latest
# steps:
# - uses: actions/checkout@master
# - uses: actions/setup-node@master
# with:
# node-version: 22.4
# - run: npm install
# - run: npm run build
# - uses: actions/upload-artifact@master
# with:
# name: windows-builds
# path: dist/

2
.nvmrc
View File

@@ -1 +1 @@
19.8.1
v22.12.0

36
.vscode/launch.json vendored Normal file
View 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>/**"]
}
]
}

View File

@@ -17,7 +17,9 @@
"trackid",
"tracklist",
"widevine",
"xesam"
"wvcus",
"xesam",
"xhayper"
],
"sonarlint.connectedMode.project": {
"connectionId": "public-sonarcloud",

View File

@@ -4,6 +4,42 @@ 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
- Changed electron-builder.base.yml to now generate the correct .desktop entries again
- Should fix flatpak build
## [5.18.1]
- Fixed the login bug
- Upgraded electron to 35.1.1
- Added Widevine/CDM info to startup
- delayed remote electron initializer
## [5.18.0]
- [Dianoga](https://github.com/Dianoga) fixed the duration selector, restoring mpris & partial API data.
- PR: #554
- Added `xesam:url` property to mpris metadata fixes [#506](https://github.com/Mastermindzh/tidal-hifi/issues/506)
## [5.17.0]
- Added an option to disable the dynamic title and set it to a static one, [#491](https://github.com/Mastermindzh/tidal-hifi/pull/491)

View File

@@ -1,7 +1,7 @@
appId: com.rickvanlieshout.tidal-hifi
electronVersion: 28.1.1
electronVersion: 37.2.5
electronDownload:
version: 28.1.1+wvcus
version: 37.2.5+wvcus
mirror: https://github.com/castlabs/electron-releases/releases/download/v
snap:
plugs:
@@ -17,24 +17,25 @@ linux:
executableName: tidal-hifi
executableArgs:
[
"--enable-features=UseOzonePlatform",
"--ozone-platform-hint=auto",
"--enable-features=WaylandWindowDecorations",
"--enable-wayland-ime",
"--use-angle",
]
desktop:
Encoding: UTF-8
Name: TIDAL Hi-Fi
GenericName: TIDAL Hi-Fi
Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
Icon: tidal-hifi
StartupNotify: true
Terminal: false
Type: Application
Categories: Network;Application;AudioVideo;Audio;Video
StartupWMClass: tidal-hifi
X-PulseAudio-Properties: media.role=music
MimeType: x-scheme-handler/tidal;
entry:
Encoding: "UTF-8"
Name: "TIDAL Hi-Fi"
GenericName: "TIDAL Hi-Fi"
Comment: "The web version of listen.tidal.com running in electron with hifi support thanks to widevine."
Icon: "tidal-hifi"
StartupNotify: "true"
Terminal: "false"
Type: "Application"
Categories: "Network;Application;AudioVideo;Audio;Video"
StartupWMClass: "tidal-hifi"
X-PulseAudio-Properties: "media.role=music"
MimeType: "x-scheme-handler/tidal;"
mac:
category: public.app-category.entertainment
win:

5610
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,10 +1,10 @@
{
"name": "tidal-hifi",
"version": "5.17.0",
"version": "5.20.1",
"description": "Tidal on Electron with widevine(hifi) support",
"main": "ts-dist/main.js",
"scripts": {
"start": "electron --inspect=0.0.0.0:5858 .",
"start": "electron --inspect=0.0.0.0:5858 --remote-debugging-port=8315 --remote-allow-origins=* .",
"watchStart": "nodemon dist -x \"npm run start\"",
"compile": "tsc && npm run sass-and-copy",
"deps": "npm run watch",
@@ -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.0",
"axios": "^1.7.7",
"@xhayper/discord-rpc": "1.3.0",
"axios": "^1.10.0",
"cors": "^2.8.5",
"electron-store": "^8.2.0",
"express": "^4.21.1",
"hotkeys-js": "^3.13.7",
"express": "^5.1.0",
"hotkeys-js": "^3.13.15",
"mpris-service": "^2.1.2",
"request": "^2.88.2",
"sass": "^1.79.4",
"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": "git+https://github.com/castlabs/electron-releases#v31.1.0+wvcus",
"electron-builder": "~24.9.4",
"eslint": "^8.57.0",
"electron": "github:castlabs/electron-releases#v37.2.5+wvcus",
"electron-builder": "~26.0.12",
"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
View File

@@ -0,0 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"ignoreDeps": ["@types/node", "electron-store", "@xhayper/discord-rpc"]
}

View File

@@ -22,12 +22,13 @@
media: '*[data-test="current-media-imagery"]',
image: "img",
current: '*[data-test="current-time"]',
duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
bar: '*[data-test="progress-bar"]',
footer: "#footerPlayer",
mediaItem: "[data-type='mediaItem']",
album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
playingFrom: '*[class^="playingFrom"] span:nth-child(2)',
album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
album_name_cell: '[class^="album"]',
tracklist_row: '[data-test="tracklist-row"]',

View File

@@ -0,0 +1,6 @@
export type DomControllerOptions = {
/**
* Interval that tidal-hifi scrapes the dom for information
*/
refreshInterval: number;
};

View File

@@ -0,0 +1,354 @@
import { convertDurationToSeconds } from "../../features/time/parse";
import { MediaInfo } from "../../models/mediaInfo";
import { MediaStatus } from "../../models/mediaStatus";
import { RepeatState } from "../../models/repeatState";
import { TidalController } from "../TidalController";
import { DomControllerOptions } from "./DomControllerOptions";
export class DomTidalController implements TidalController<DomControllerOptions> {
private updateSubscriber: (state: Partial<MediaInfo>) => void;
private currentlyPlaying = MediaStatus.paused;
private currentRepeatState: RepeatState = RepeatState.off;
private currentShuffleState = false;
private readonly elements = {
play: '*[data-test="play"]',
pause: '*[data-test="pause"]',
next: '*[data-test="next"]',
previous: 'button[data-test="previous"]',
title: '*[data-test^="footer-track-title"]',
artists: '*[data-test^="grid-item-detail-text-title-artist"]',
home: '*[data-test="menu--home"]',
back: '[title^="Back"]',
forward: '[title^="Next"]',
search: '[class^="searchField"]',
shuffle: '*[data-test="shuffle"]',
repeat: '*[data-test="repeat"]',
account: '*[data-test^="profile-image-button"]',
settings: '*[data-test^="sidebar-menu-button"]',
openSettings: '*[data-test^="open-settings"]',
media: '*[data-test="current-media-imagery"]',
image: "img",
current: '*[data-test="current-time"]',
duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
bar: '*[data-test="progress-bar"]',
footer: "#footerPlayer",
mediaItem: "[data-type='mediaItem']",
album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
playing_from: '*[class^="playingFrom"] span:nth-child(2)',
queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
album_name_cell: '[class^="album"]',
tracklist_row: '[data-test="tracklist-row"]',
volume: '*[data-test="volume"]',
favorite: '*[data-test="footer-favorite-button"]',
/**
* Get an element from the dom
* @param {*} key key in elements object to fetch
*/
get: function (key: string) {
return globalThis.document.querySelector(this[key.toLowerCase()]) ?? "";
},
/**
* Get the icon of the current media
*/
getSongIcon: function () {
const figure = this.get("media");
if (figure) {
const mediaElement = figure.querySelector(this["image"]);
if (mediaElement) {
return mediaElement.src.replace("80x80", "640x640");
}
}
return "";
},
/**
* returns an array of all artists in the current media
* @returns {Array} artists
*/
getArtistsArray: function () {
const footer = this.get("footer");
if (footer) {
const artists = footer.querySelectorAll(this.artists);
if (artists)
return Array.from(artists).map((artist) => (artist as HTMLElement).textContent);
}
return [];
},
/**
* unify the artists array into a string separated by commas
* @param {Array} artistsArray
* @returns {String} artists
*/
getArtistsString: function (artistsArray: string[]) {
if (artistsArray.length > 0) return artistsArray.join(", ");
return "unknown artist(s)";
},
getAlbumName: function () {
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;
}
return "";
} catch {
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();
},
};
onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void {
this.updateSubscriber = callback;
}
bootstrap(options: DomControllerOptions): void {
/**
* 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
*/
const getTrackURL = () => {
const id = this.getTrackId();
return `https://tidal.com/browse/track/${id}`;
};
setInterval(async () => {
const title = this.getTitle();
const artistsArray = this.getArtists();
const artistsString = this.getArtistsString();
const current = this.getCurrentTime();
const currentStatus = this.getCurrentlyPlayingStatus();
const shuffleState = this.getCurrentShuffleState();
const repeatState = this.getCurrentRepeatState();
const playStateChanged = currentStatus != this.currentlyPlaying;
const shuffleStateChanged = shuffleState != this.currentShuffleState;
const repeatStateChanged = repeatState != this.currentRepeatState;
if (playStateChanged) this.currentlyPlaying = currentStatus;
if (shuffleStateChanged) this.currentShuffleState = shuffleState;
if (repeatStateChanged) this.currentRepeatState = repeatState;
const album = this.getAlbumName();
const duration = this.getDuration();
const updatedInfo = {
title,
artists: artistsString,
artistsArray,
album: album,
playingFrom: this.getPlayingFrom(),
status: currentStatus,
url: getTrackURL(),
current,
currentInSeconds: convertDurationToSeconds(current),
duration,
durationInSeconds: convertDurationToSeconds(duration),
image: this.getSongIcon(),
favorite: this.isFavorite(),
player: {
status: currentStatus,
shuffle: shuffleState,
repeat: repeatState,
},
};
this.updateSubscriber(updatedInfo);
}, options.refreshInterval);
}
playPause = (): void => {
const play = this.elements.get("play");
if (play) {
this.elements.click("play");
} else {
this.elements.click("pause");
}
};
goToHome(): void {
this.elements.click("home");
}
openSettings(): void {
this.elements.click("settings");
setTimeout(() => {
this.elements.click("openSettings");
}, 100);
}
toggleFavorite(): void {
this.elements.click("favorite");
}
back(): void {
this.elements.click("back");
}
forward(): void {
this.elements.click("forward");
}
repeat(): void {
this.elements.click("repeat");
}
next(): void {
this.elements.click("next");
}
previous(): void {
this.elements.click("previous");
}
toggleShuffle(): void {
this.elements.click("shuffle");
}
getCurrentlyPlayingStatus() {
const pause = this.elements.get("pause");
// if pause button is visible tidal is playing
if (pause) {
return MediaStatus.playing;
} else {
return MediaStatus.paused;
}
}
getCurrentShuffleState() {
const shuffle = this.elements.get("shuffle");
return shuffle?.getAttribute("aria-checked") === "true";
}
getCurrentRepeatState() {
const repeat = this.elements.get("repeat");
switch (repeat?.getAttribute("data-type")) {
case "button__repeatAll":
return RepeatState.all;
case "button__repeatSingle":
return RepeatState.single;
default:
return RepeatState.off;
}
}
play(): void {
this.playPause();
}
pause(): void {
this.playPause();
}
stop(): void {
this.playPause();
}
getCurrentPosition() {
return this.elements.getText("current");
}
getCurrentPositionInSeconds(): number {
return convertDurationToSeconds(this.getCurrentPosition());
}
getTrackId(): string {
const URLelement = this.elements.get("title").querySelector("a");
if (URLelement !== null) {
const id = URLelement.href.replace(/\D/g, "");
return id;
}
return window.location.toString();
}
getCurrentTime(): string {
return this.elements.getText("current");
}
getDuration(): string {
return this.elements.getText("duration");
}
getAlbumName(): string {
return this.elements.getAlbumName();
}
getTitle(): string {
return this.elements.getText("title");
}
getArtists(): string[] {
return this.elements.getArtistsArray();
}
getArtistsString(): string {
return this.elements.getArtistsString(this.getArtists());
}
getPlayingFrom(): string {
return this.elements.getText("playing_from");
}
isFavorite(): boolean {
return this.elements.isFavorite();
}
getSongIcon(): string {
return this.elements.getSongIcon();
}
}

View File

@@ -0,0 +1,53 @@
import { MediaInfo } from "../models/mediaInfo";
import { MediaStatus } from "../models/mediaStatus";
import { RepeatState } from "../models/repeatState";
export interface TidalController<TBootstrapOptions = object> {
goToHome(): void;
openSettings(): void;
/**
* Play or pause the current media
*/
playPause(): void;
play(): void;
pause(): void;
stop(): void;
toggleFavorite(): void;
back(): void;
forward(): void;
repeat(): void;
next(): void;
previous(): void;
toggleShuffle(): void;
/**
* Optional setup/startup/bootstrap for this controller
*/
bootstrap(options: TBootstrapOptions): void;
/**
* Method that triggers every time the MediaInfo updates
* @param callback function that receives the updated media info
*/
onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void;
/**
* Update the current status of tidal (e.g playing or paused)
*/
getCurrentlyPlayingStatus(): MediaStatus;
getCurrentShuffleState(): boolean;
getCurrentRepeatState(): RepeatState;
getCurrentPosition(): string;
getCurrentPositionInSeconds(): number;
getTrackId(): string;
getCurrentTime(): string;
getDuration(): string;
getAlbumName(): string;
getTitle(): string;
getArtists(): string[];
getArtistsString(): string;
getPlayingFrom(): string;
getSongIcon(): string;
isFavorite(): boolean;
}

View File

@@ -0,0 +1,137 @@
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 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 {
globalThis.alert("method not implemented");
throw new Error("Method not implemented.");
}
bootstrap(): void {
globalThis.alert("Method not implemented: ");
throw new Error("Method not implemented.");
}
// example of using the original domMediaController as a fallback
goToHome(): void {
this.domMediaController.goToHome();
}
getDuration(): string {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getAlbumName(): string {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getTitle(): string {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getArtists(): string[] {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getArtistsString(): string {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getPlayingFrom(): string {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
isFavorite(): boolean {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getSongIcon(): string {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getCurrentTime(): string {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getCurrentPosition(): string {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getCurrentPositionInSeconds(): number {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getTrackId(): string {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
play(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
pause(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
stop(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getCurrentShuffleState(): boolean {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getCurrentRepeatState(): RepeatState {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
getCurrentlyPlayingStatus(): MediaStatus {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
back(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
forward(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
repeat(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
next(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
previous(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
toggleShuffle(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
openSettings(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
toggleFavorite(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
playPause(): void {
globalThis.alert("Method not implemented");
throw new Error("Method not implemented.");
}
}

View File

@@ -0,0 +1,4 @@
export const tidalControllers = {
domController: "domController",
tidalApiController: "tidalApiController",
};

View File

@@ -13,6 +13,7 @@ export const settings = {
advanced: {
root: "advanced",
tidalUrl: "advanced.tidalUrl",
controllerType: "advanced.controllerType",
},
api: "api",
apiSettings: {

View File

@@ -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:

View File

@@ -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);

View File

@@ -2,7 +2,7 @@
"openapi": "3.1.0",
"info": {
"title": "TIDAL Hi-Fi API",
"version": "5.17.0",
"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"
}
]
}
}

View File

@@ -0,0 +1,15 @@
import { downloadFile } from "../../scripts/download";
import { Logger } from "../logger";
export const downloadIcon = async (imagePath: string, destination: string): Promise<string> => {
if (imagePath.startsWith("http")) {
try {
return await downloadFile(imagePath, destination);
} catch (error) {
Logger.log("Downloading file failed", { error });
return "";
}
}
return "";
};

15
src/features/tidal/url.ts Normal file
View File

@@ -0,0 +1,15 @@
/**
* Build a track url given the id
*/
export const getTrackURL = (trackId: string) => {
return `https://tidal.com/browse/track/${trackId}`;
};
/**
* Retrieve the universal link given a regular track link
* @param trackLink
* @returns
*/
export const getUniversalLink = (trackLink: string) => {
return `${trackLink}?u`;
};

View File

@@ -26,14 +26,14 @@ import {
import { addTray, refreshTray } from "./scripts/tray";
let mainInhibitorId = -1;
initialize();
let mainWindow: BrowserWindow;
const icon = path.join(__dirname, "../assets/icon.png");
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);
@@ -98,6 +98,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
},
},
});
enable(mainWindow.webContents);
registerHttpProtocols();
syncMenuBarWithStore();
@@ -126,6 +127,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
}
return false;
});
// Emitted when the window is closed.
mainWindow.on("closed", function () {
releaseInhibitorIfActive(mainInhibitorId);
@@ -178,6 +180,7 @@ app.on("ready", async () => {
if (isMainInstance() || isMultipleInstancesAllowed()) {
await components.whenReady();
initialize();
// Adblock
if (settingsStore.get(settings.adBlock)) {
@@ -188,6 +191,8 @@ app.on("ready", async () => {
});
}
Logger.log("components ready:", components.status());
createWindow();
addMenu(mainWindow);
createSettingsWindow();

View File

@@ -1,9 +1,11 @@
import { MediaPlayerInfo } from "./mediaPlayerInfo";
import { MediaStatus } from "./mediaStatus";
import { RepeatState } from "./repeatState";
export interface MediaInfo {
title: string;
artists: string;
artistsArray?: string[];
album: string;
icon: string;
status: MediaStatus;
@@ -17,3 +19,30 @@ export interface MediaInfo {
favorite: boolean;
player?: MediaPlayerInfo;
}
export const getEmptyMediaInfo = () => {
const emptyState: MediaInfo = {
title: "",
artists: "",
artistsArray: [],
album: "",
playingFrom: "",
status: MediaStatus.playing,
url: "",
current: "00:00",
currentInSeconds: 100,
duration: "00:00",
durationInSeconds: 100,
image: "",
icon: "",
favorite: true,
player: {
status: MediaStatus.playing,
shuffle: true,
repeat: RepeatState.all,
},
};
return emptyState;
};

View File

@@ -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);
});

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,10 @@
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";
import {
ListenBrainz,
ListenBrainzConstants,
@@ -10,181 +12,57 @@ import {
} 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 { getTrackURL, getUniversalLink } from "./features/tidal/url";
import { convertDurationToSeconds } from "./features/time/parse";
import { MediaInfo } from "./models/mediaInfo";
import { getEmptyMediaInfo, 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";
import { TidalApiController } from "./TidalControllers/apiController/TidalApiController";
import { DomControllerOptions } from "./TidalControllers/DomController/DomControllerOptions";
import { DomTidalController } from "./TidalControllers/DomController/DomTidalController";
import { TidalController } from "./TidalControllers/TidalController";
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
const staticTitle = "TIDAL Hi-Fi";
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()]);
},
let tidalController: TidalController;
let controllerOptions = {};
let currentMediaInfo = getEmptyMediaInfo();
/**
* Get the icon of the current media
*/
getSongIcon: function () {
const figure = this.get("media");
switch (settingsStore.get(settings.advanced.controllerType)) {
case tidalControllers.tidalApiController: {
tidalController = new TidalApiController();
Logger.log("TidalApiController initialized");
break;
}
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();
},
};
default: {
tidalController = new DomTidalController();
const domControllerOptions: DomControllerOptions = {
refreshInterval: getDomUpdateFrequency(),
};
controllerOptions = domControllerOptions;
Logger.log("domController initialized");
break;
}
}
/**
* Get the update frequency from the store
* make sure it returns a number, if not use the default
*/
function getUpdateFrequency() {
function getDomUpdateFrequency() {
const storeValue = settingsStore.get<string, number>(settings.updateFrequency);
const defaultValue = 500;
@@ -195,19 +73,6 @@ function getUpdateFrequency() {
}
}
/**
* Play or pause the current media
*/
function playPause() {
const play = elements.get("play");
if (play) {
elements.click("play");
} else {
elements.click("pause");
}
}
/**
* Clears the old listenbrainz data on launch
*/
@@ -220,30 +85,26 @@ ListenBrainzStore.clear();
*/
function addHotKeys() {
if (settingsStore.get(settings.enableCustomHotkeys)) {
addHotkey("Control+p", function () {
elements.click("settings");
setTimeout(() => {
elements.click("openSettings");
}, 100);
addHotkey("Control+p", () => {
tidalController.openSettings();
});
addHotkey("Control+l", function () {
addHotkey("Control+l", () => {
handleLogout();
});
addHotkey("Control+a", function () {
elements.click("favorite");
addHotkey("Control+a", () => {
tidalController.toggleFavorite();
});
addHotkey("Control+h", function () {
elements.click("home");
addHotkey("Control+h", () => {
tidalController.goToHome();
});
addHotkey("backspace", function () {
elements.click("back");
tidalController.back();
});
addHotkey("shift+backspace", function () {
elements.click("forward");
tidalController.forward();
});
addHotkey("control+u", function () {
@@ -252,10 +113,10 @@ function addHotKeys() {
});
addHotkey("control+r", function () {
elements.click("repeat");
tidalController.repeat();
});
addHotkey("control+w", async function () {
const url = SharingService.getUniversalLink(getTrackURL());
const url = getUniversalLink(getTrackURL(tidalController.getTrackId()));
clipboard.writeText(url);
new Notification({
title: `Universal link generated: `,
@@ -319,22 +180,22 @@ function addIPCEventListeners() {
case globalEvents.playPause:
case globalEvents.play:
case globalEvents.pause:
playPause();
tidalController.playPause();
break;
case globalEvents.next:
elements.click("next");
tidalController.next();
break;
case globalEvents.previous:
elements.click("previous");
tidalController.previous();
break;
case globalEvents.toggleFavorite:
elements.click("favorite");
tidalController.toggleFavorite();
break;
case globalEvents.toggleShuffle:
elements.click("shuffle");
tidalController.toggleShuffle();
break;
case globalEvents.toggleRepeat:
elements.click("repeat");
tidalController.repeat();
break;
default:
break;
@@ -343,48 +204,6 @@ function addIPCEventListeners() {
});
}
/**
* Update the current status of tidal (e.g playing or paused)
*/
function getCurrentlyPlayingStatus() {
const pause = elements.get("pause");
let status = undefined;
// if pause button is visible tidal is playing
if (pause) {
status = MediaStatus.playing;
} else {
status = MediaStatus.paused;
}
return status;
}
function getCurrentShuffleState() {
const shuffle = elements.get("shuffle");
return shuffle?.getAttribute("aria-checked") === "true";
}
function getCurrentRepeatState() {
const repeat = elements.get("repeat");
switch (repeat?.getAttribute("data-type")) {
case "button__repeatAll":
return RepeatState.all;
case "button__repeatSingle":
return RepeatState.single;
default:
return RepeatState.off;
}
}
/**
* Convert the duration from MM:SS to seconds
* @param {*} duration
*/
function convertDuration(duration: string) {
const parts = duration.split(":");
return parseInt(parts[1]) + 60 * parseInt(parts[0]);
}
/**
* Update Tidal-hifi's media info
*
@@ -392,7 +211,6 @@ function convertDuration(duration: string) {
*/
function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
if (mediaInfo) {
currentMediaInfo = mediaInfo;
ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
updateMpris(mediaInfo);
updateListenBrainz(mediaInfo);
@@ -455,16 +273,35 @@ function addMPRIS() {
const eventValue = events[eventName];
switch (events[eventValue]) {
case events.playpause:
playPause();
tidalController.playPause();
break;
case events.next:
tidalController.next();
break;
case events.previous:
tidalController.previous();
break;
case events.pause:
tidalController.pause();
break;
case events.stop:
tidalController.stop();
break;
case events.play:
tidalController.play();
break;
case events.loopStatus:
tidalController.repeat();
break;
case events.shuffle:
tidalController.toggleShuffle();
break;
default:
elements.click(eventValue);
}
});
});
// Override get position function
player.getPosition = function () {
return convertDuration(elements.getText("current")) * 1000 * 1000;
return tidalController.getCurrentPositionInSeconds();
};
player.on("quit", function () {
app.quit();
@@ -483,9 +320,10 @@ function updateMpris(mediaInfo: MediaInfo) {
"xesam:title": mediaInfo.title,
"xesam:artist": [mediaInfo.artists],
"xesam:album": mediaInfo.album,
"xesam:url": mediaInfo.url,
"mpris:artUrl": mediaInfo.image,
"mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
"mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
"mpris:length": convertDurationToSeconds(mediaInfo.duration) * 1000 * 1000,
"mpris:trackid": "/org/mpris/MediaPlayer2/track/" + tidalController.getTrackId(),
},
...ObjectToDotNotation(mediaInfo, "custom:"),
};
@@ -512,124 +350,47 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
mediaInfo.title,
mediaInfo.artists,
mediaInfo.status,
convertDuration(mediaInfo.duration)
convertDurationToSeconds(mediaInfo.duration),
);
scrobbleWaitingForDelay = false;
},
settingsStore.get(settings.ListenBrainz.delay) ?? 0
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}`;
}
tidalController.bootstrap(controllerOptions);
tidalController.onMediaInfoUpdate(async (newState) => {
currentMediaInfo = { ...currentMediaInfo, ...newState };
function getTrackID() {
const URLelement = elements.get("title").querySelector("a");
if (URLelement !== null) {
const id = URLelement.href.replace(/\D/g, "");
return id;
}
const songDashArtistTitle = `${currentMediaInfo.title} - ${currentMediaInfo.artists}`;
const isNewSong = currentSong !== songDashArtistTitle;
return window.location;
}
if (isNewSong) {
// check whether one of the artists is in the "skip artist" array, if so, skip...
skipArtistsIfFoundInSkippedArtistsList(currentMediaInfo.artistsArray ?? []);
/**
* 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();
// update the currently playing song
currentSong = songDashArtistTitle;
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
// update the window title with the new info
settingsStore.get(settings.staticWindowTitle)
? setTitle(staticTitle)
: setTitle(songDashArtistTitle);
getTrackURL();
currentSong = songDashArtistTitle;
currentPlayStatus = currentStatus;
: setTitle(`${currentMediaInfo.title} - ${currentMediaInfo.artists}`);
const image = elements.getSongIcon();
// download a new icon and use it for the media info
if (!newState.icon && newState.image) {
currentMediaInfo.icon = await downloadIcon(currentMediaInfo.image, notificationPath);
} else {
currentMediaInfo.icon = "";
}
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);
});
updateMediaInfo(currentMediaInfo, true);
} else {
// just update the time
updateMediaInfo(
{ ...currentMediaInfo, ...{ current, currentInSeconds: convertDurationToSeconds(current) } },
false
);
// if titleOrArtists didn't change then only minor mediaInfo (like timings) changed, so don't bother the user with notifications
updateMediaInfo(currentMediaInfo, false);
}
/**
@@ -644,13 +405,12 @@ setInterval(function () {
const artistNames = Object.values(artists).map((artist) => artist);
const foundArtist = artistNames.some((artist) => artistsToSkip.includes(artist));
if (foundArtist) {
elements.click("next");
tidalController.next();
}
}
}
}
}, getUpdateFrequency());
});
addMPRIS();
addCustomCss(app);
addHotKeys();

View File

@@ -103,8 +103,7 @@ const getActivity = (): SetActivity => {
if (includeTimestamps) {
const currentSeconds = convertDurationToSeconds(mediaInfo.current);
const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
const date = new Date();
const now = Math.floor(date.getTime() / 1000);
const now = Math.trunc((Date.now() + 500) / 1000);
presence.startTimestamp = now - currentSeconds;
presence.endTimestamp = presence.startTimestamp + durationSeconds;
}

View File

@@ -6,8 +6,8 @@ import request from "request";
* @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) => {
export const downloadFile = function (fileUrl: string, targetPath: string): Promise<string> {
return new Promise<string>((resolve, reject) => {
const req = request({
method: "GET",
uri: fileUrl,
@@ -16,7 +16,9 @@ export const downloadFile = function (fileUrl: string, targetPath: string) {
const out = fs.createWriteStream(targetPath);
req.pipe(out);
req.on("end", resolve);
req.on("end", () => {
resolve(targetPath);
});
req.on("error", reject);
});

View File

@@ -1,28 +1,6 @@
import { MediaInfo } from "../models/mediaInfo";
import { MediaStatus } from "../models/mediaStatus";
import { RepeatState } from "../models/repeatState";
import { getEmptyMediaInfo, MediaInfo } from "../models/mediaInfo";
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,
},
};
const defaultInfo: MediaInfo = getEmptyMediaInfo();
export let mediaInfo: MediaInfo = { ...defaultInfo };

View File

@@ -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" },
]);
},
},
});