Compare commits
	
		
			358 Commits
		
	
	
		
			5.9.0
			...
			renovate/a
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | fe6137d549 | ||
| 3c782c460c | |||
|  | feb9e2cb53 | ||
| be2c00f3b4 | |||
|  | f992ca3ed0 | ||
| c89fe5e573 | |||
|  | 255b59c87c | ||
| 2bbca7df24 | |||
| eecae61405 | |||
|  | 15dbadcc73 | ||
|  | 14b92cc5de | ||
| 959fc6631f | |||
| 91f70752c8 | |||
|  | 4f0dcee359 | ||
|  | a4a963c17b | ||
| 2ecacff0e1 | |||
|  | b426f0857e | ||
| 36c9887552 | |||
|  | 9efdbb8234 | ||
| 4d5b6a35e2 | |||
|  | 7923303e18 | ||
| cc95089201 | |||
| 9b010ea2bf | |||
| 3828591177 | |||
|  | 1e471df549 | ||
|  | 96acbd3559 | ||
|  | 224689b15b | ||
| 5f1fc8731a | |||
| 02ad1289c5 | |||
| b684d290bd | |||
|  | f35fd542b2 | ||
|  | 6831e55681 | ||
| 69ad060485 | |||
| 985831e961 | |||
|  | 218f7652cd | ||
|  | e46b34e076 | ||
|  | 5f49d0d3a9 | ||
| c1850436e1 | |||
|  | 7efbd52553 | ||
| 5ea91bbfde | |||
| 76b8adb038 | |||
| a746e53f7a | |||
|  | 149c0c975f | ||
|  | 98339444f7 | ||
|  | fd5bc505da | ||
| 5f94cfbf63 | |||
| 466c39134f | |||
| da8baebf29 | |||
|  | aa6a8b3417 | ||
| 4a1152175c | |||
|  | 721c3f5047 | ||
|  | d4b0552c14 | ||
|  | 44c8c01b8b | ||
| 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 | ||
| 79bbab6a82 | |||
| 7376df7f30 | |||
| 7f8760c4e9 | |||
|  | 1cf5a01ad7 | ||
| 8fc49f500e | |||
|  | 49f5a01b58 | ||
| 48f4fe47ef | |||
| a819e1eb45 | |||
| 57e6342b5f | |||
| 58a543a3c8 | |||
| 1c915d99fe | |||
|  | 8994360415 | ||
| a5c0d9e6e8 | |||
| f8eb36f4c7 | |||
| 5ca90c25d3 | |||
| cf86969cfc | |||
| afd05ae88b | |||
| 72c25dfdc1 | |||
|  | 25b30edf31 | ||
| 35ed4807e3 | |||
| deff9524a8 | |||
| 34c7777eeb | |||
| 048e949f30 | |||
|  | 4a976bc58c | ||
| ff4c51234b | |||
|  | c4ee6b51b9 | ||
| 45fe336598 | |||
|  | fe9f50aaf5 | ||
| aaf7a1b662 | |||
| 755be0ee30 | |||
|  | 9d736b2bd9 | ||
| f4d4b1a1df | |||
|  | 0c27c815f5 | ||
|  | a3aa45a96b | ||
| ae699887b2 | |||
| a8c635932f | |||
| 66d0d004bf | |||
| d1e0321058 | |||
| 2ab5a556ab | |||
| baf719fc60 | |||
| 15c8f6a418 | |||
| f73521e2e5 | |||
|  | 0f5e00c4df | ||
|  | 974877ea4f | ||
|  | 6be5774001 | ||
|  | f96cf2e8da | ||
|  | f832bd2712 | ||
|  | cb8667bd41 | ||
| 91156e5936 | |||
|  | 57e9a2dcb8 | ||
|  | 21edcd6ad5 | ||
|  | 3dc42eceb0 | ||
|  | b1830f5684 | ||
|  | 1a0c15e17f | ||
| 6e59d59a1d | |||
|  | fab7497311 | ||
| fccbcc77ea | |||
|  | 041c19fb52 | ||
| e36c562afa | |||
| 1589aa5251 | |||
| 8c672dd1eb | |||
|  | 3769550f24 | ||
|  | 5a06b6c53f | ||
|  | 1d4ef66d27 | ||
| e02f07401b | |||
| 118f92e75a | |||
|  | 788d302ce8 | ||
|  | cc09f35b49 | ||
| ef13933c66 | |||
| 4f72e1b35d | |||
| 2c1c76d2d0 | |||
| e2a84e119a | |||
| 5b85e59fc3 | |||
| c3b772919a | |||
|  | 70f2f5c248 | ||
|  | ffcb563b35 | ||
|  | 2dd96dd48e | ||
| 65f3b251f4 | |||
| 45f8c13c5b | |||
| 9dc7267a4d | |||
| f5c56ae8c5 | |||
| 308b527469 | |||
| f4aa8e070e | |||
| 19c12b57de | |||
| b5713651de | |||
| 268027734c | |||
| f711ea9000 | |||
|  | 506f86f014 | ||
| 4e827e120f | |||
|  | 5b62154ebc | ||
| 15cc6bb6d4 | |||
| e0e9d99173 | |||
| daa797fc00 | |||
|  | 4e011a47d8 | ||
|  | 965d19318e | ||
| 9cd89c9f31 | |||
|  | c7b97a49c4 | ||
| c63e05357e | |||
| 42dac4a7f1 | |||
|  | 595895dbc1 | ||
| 1ff94e45a7 | |||
|  | 95776d1aab | ||
| 5669cb4c6a | |||
| 5946c47442 | |||
|  | 111238f6b2 | ||
|  | 65a4600c4d | ||
| dd6f81386f | |||
| 54316d31b5 | |||
| 28a9458dfc | |||
| 3641f07558 | |||
| ecbfa7e226 | |||
| 9321acc06e | |||
| 5b656ae229 | |||
| 0a8efc730d | |||
| b49bd925da | |||
| 1e6b9f7dcf | |||
| 51f7a96634 | |||
| 46074c5de5 | |||
| 2667f62674 | |||
| ac949dc211 | |||
| 40bc20582f | |||
|  | 180d9c97a7 | ||
| 5dc136138b | |||
| 1edc6a1b2b | |||
| 7c6831c771 | |||
| d47da91e93 | |||
| b481108af1 | |||
| 3740ce5a12 | |||
| a0f9faa753 | |||
| 5e3583534b | |||
|  | 5f8cf33249 | ||
|  | 2d94b4bf49 | ||
| 6e43cbb4d7 | |||
| f95f13b44a | |||
| f911564d8a | |||
| db8a2c2741 | |||
| 000853414e | |||
| 53603c4cad | |||
| 0b595f920f | |||
| 81143af3fa | |||
|  | 8d1ac3be3b | ||
|  | 666e602c02 | ||
|  | 04ec850005 | ||
| 943d9b5bd8 | |||
|  | 755816c2b8 | ||
| 25afd05ad7 | |||
| 6e5024742a | |||
| 417afaab85 | |||
| d225c0056b | |||
|  | a75b0336db | ||
|  | 29465ce13a | ||
|  | d333047269 | ||
|  | 712330f8f1 | ||
|  | 84fd35ce0e | ||
|  | 326038f262 | ||
| a6c1d35a60 | |||
|  | c09a4bc4a8 | ||
|  | 554cb12a01 | ||
| 2e31b5d913 | |||
| 2fd29c1b83 | |||
| b2f27a2afe | |||
| 8e11fd7f09 | |||
| 17b2818b70 | |||
| 4ef76c262e | |||
| fd0dae2762 | |||
| aa59bdc6dd | |||
| 5b5b6ecb38 | |||
| 5983145857 | |||
| 0c7d579951 | |||
|  | 235d916749 | ||
|  | 2d9f268866 | ||
| ae65e57e32 | |||
|  | 3f2d69f2f4 | ||
| 5ff2cc68d3 | |||
| daabe5bdbb | |||
|  | 456727c0e0 | ||
|  | ba50e0c095 | ||
|  | 312e90e8cb | ||
| 76769dfab3 | |||
|  | 565d32ae3d | ||
| 7be6f79040 | |||
|  | f894c82b12 | 
| @@ -4,12 +4,12 @@ name: default | |||||||
|  |  | ||||||
| steps: | steps: | ||||||
|   - name: install |   - name: install | ||||||
|     image: node:19.4.0 |     image: node:22.17.0 | ||||||
|     commands: |     commands: | ||||||
|       - npm install |       - npm install | ||||||
|  |  | ||||||
|   - name: build_with_linux |   - name: build_with_linux | ||||||
|     image: node:19.4.0 |     image: node:22.17.0 | ||||||
|     commands: |     commands: | ||||||
|       - apt-get update && apt-get upgrade -y |       - apt-get update && apt-get upgrade -y | ||||||
|       - apt-get install -y libarchive-tools rpm |       - apt-get install -y libarchive-tools rpm | ||||||
|   | |||||||
							
								
								
									
										43
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -9,6 +9,7 @@ on: | |||||||
|     branches-ignore: |     branches-ignore: | ||||||
|       - master |       - master | ||||||
|       - develop |       - develop | ||||||
|  |   workflow_dispatch: | ||||||
| jobs: | jobs: | ||||||
|   build_on_linux: |   build_on_linux: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
| @@ -20,26 +21,30 @@ jobs: | |||||||
|       - uses: actions/checkout@master |       - uses: actions/checkout@master | ||||||
|       - uses: actions/setup-node@master |       - uses: actions/setup-node@master | ||||||
|         with: |         with: | ||||||
|           node-version: 19 |           node-version: 22.12.0 | ||||||
|       - run: npm install |       - run: npm install | ||||||
|       - run: npm run build |       - run: npm run build | ||||||
|  |       # - uses: actions/upload-artifact@master | ||||||
|  |       #   with: | ||||||
|  |       #     name: linux-builds | ||||||
|  |       #     path: dist/ | ||||||
|  |  | ||||||
|   build_on_mac: |   # build_on_mac: | ||||||
|     runs-on: macos-latest |   #   runs-on: macos-latest | ||||||
|     steps: |   #   steps: | ||||||
|       - uses: actions/checkout@master |   #     - uses: actions/checkout@master | ||||||
|       - uses: actions/setup-node@master |   #     - uses: actions/setup-node@master | ||||||
|         with: |   #       with: | ||||||
|           node-version: 19 |   #         node-version: 22.4 | ||||||
|       - run: npm install |   #     - run: npm install | ||||||
|       - run: npm run build |   #     - run: npm run build | ||||||
|  |  | ||||||
|   build_on_win: |   # build_on_win: | ||||||
|     runs-on: windows-latest |   #   runs-on: windows-latest | ||||||
|     steps: |   #   steps: | ||||||
|       - uses: actions/checkout@master |   #     - uses: actions/checkout@master | ||||||
|       - uses: actions/setup-node@master |   #     - uses: actions/setup-node@master | ||||||
|         with: |   #       with: | ||||||
|           node-version: 19 |   #         node-version: 22.4 | ||||||
|       - run: npm install |   #     - run: npm install | ||||||
|       - run: npm run build |   #     - run: npm run build | ||||||
|   | |||||||
							
								
								
									
										55
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -8,6 +8,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - master |       - master | ||||||
|  |   workflow_dispatch: | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   build_on_linux: |   build_on_linux: | ||||||
| @@ -20,7 +21,7 @@ jobs: | |||||||
|       - uses: actions/checkout@master |       - uses: actions/checkout@master | ||||||
|       - uses: actions/setup-node@master |       - uses: actions/setup-node@master | ||||||
|         with: |         with: | ||||||
|           node-version: 19 |           node-version: 22.12.0 | ||||||
|       - run: npm install |       - run: npm install | ||||||
|       - run: npm run build |       - run: npm run build | ||||||
|       - uses: actions/upload-artifact@master |       - uses: actions/upload-artifact@master | ||||||
| @@ -28,30 +29,30 @@ jobs: | |||||||
|           name: linux-builds |           name: linux-builds | ||||||
|           path: dist/ |           path: dist/ | ||||||
|  |  | ||||||
|   build_on_mac: |   # build_on_mac: | ||||||
|     runs-on: macos-latest |   #   runs-on: macos-latest | ||||||
|     steps: |   #   steps: | ||||||
|       - uses: actions/checkout@master |   #     - uses: actions/checkout@master | ||||||
|       - uses: actions/setup-node@master |   #     - uses: actions/setup-node@master | ||||||
|         with: |   #       with: | ||||||
|           node-version: 19 |   #         node-version: 22.4 | ||||||
|       - run: npm install |   #     - run: npm install | ||||||
|       - run: npm run build |   #     - run: npm run build | ||||||
|       - uses: actions/upload-artifact@master |   #     - uses: actions/upload-artifact@master | ||||||
|         with: |   #       with: | ||||||
|           name: mac-builds |   #         name: mac-builds | ||||||
|           path: ./dist/ |   #         path: ./dist/ | ||||||
|  |  | ||||||
|   build_on_win: |   # build_on_win: | ||||||
|     runs-on: windows-latest |   #   runs-on: windows-latest | ||||||
|     steps: |   #   steps: | ||||||
|       - uses: actions/checkout@master |   #     - uses: actions/checkout@master | ||||||
|       - uses: actions/setup-node@master |   #     - uses: actions/setup-node@master | ||||||
|         with: |   #       with: | ||||||
|           node-version: 19 |   #         node-version: 22.4 | ||||||
|       - run: npm install |   #     - run: npm install | ||||||
|       - run: npm run build |   #     - run: npm run build | ||||||
|       - uses: actions/upload-artifact@master |   #     - uses: actions/upload-artifact@master | ||||||
|         with: |   #       with: | ||||||
|           name: windows-builds |   #         name: windows-builds | ||||||
|           path: dist/ |   #         path: dist/ | ||||||
|   | |||||||
							
								
								
									
										5
									
								
								.vscode/http/settings/skipped-artists/addArtists.http
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,5 @@ | |||||||
|  | POST /settings/skipped-artists HTTP/1.1 | ||||||
|  | Host: localhost:47836 | ||||||
|  | Content-Type: application/json | ||||||
|  |  | ||||||
|  | ["abc", "def"] | ||||||
							
								
								
									
										2
									
								
								.vscode/http/settings/skipped-artists/addCurrent.http
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,2 @@ | |||||||
|  | POST /settings/skipped-artists/current HTTP/1.1 | ||||||
|  | Host: localhost:47836 | ||||||
							
								
								
									
										5
									
								
								.vscode/http/settings/skipped-artists/removeArtists.http
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,5 @@ | |||||||
|  | POST /settings/skipped-artists/delete HTTP/1.1 | ||||||
|  | Host: localhost:47836 | ||||||
|  | Content-Type: application/json | ||||||
|  |  | ||||||
|  | ["abc", "def"] | ||||||
							
								
								
									
										2
									
								
								.vscode/http/settings/skipped-artists/removeCurrent.http
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,2 @@ | |||||||
|  | DELETE /settings/skipped-artists/current HTTP/1.1 | ||||||
|  | Host: localhost:47836 | ||||||
							
								
								
									
										6
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -2,6 +2,7 @@ | |||||||
|   "cSpell.words": [ |   "cSpell.words": [ | ||||||
|     "Brainz", |     "Brainz", | ||||||
|     "Castlabs", |     "Castlabs", | ||||||
|  |     "Fi's", | ||||||
|     "flac", |     "flac", | ||||||
|     "Flatpak", |     "Flatpak", | ||||||
|     "geqnfr", |     "geqnfr", | ||||||
| @@ -13,11 +14,12 @@ | |||||||
|     "rescrobbler", |     "rescrobbler", | ||||||
|     "scrobble", |     "scrobble", | ||||||
|     "scrobbling", |     "scrobbling", | ||||||
|     "Songwhip", |  | ||||||
|     "trackid", |     "trackid", | ||||||
|     "tracklist", |     "tracklist", | ||||||
|     "widevine", |     "widevine", | ||||||
|     "xesam" |     "wvcus", | ||||||
|  |     "xesam", | ||||||
|  |     "xhayper" | ||||||
|   ], |   ], | ||||||
|   "sonarlint.connectedMode.project": { |   "sonarlint.connectedMode.project": { | ||||||
|     "connectionId": "public-sonarcloud", |     "connectionId": "public-sonarcloud", | ||||||
|   | |||||||
							
								
								
									
										125
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						| @@ -4,6 +4,131 @@ All notable changes to this project will be documented in this file. | |||||||
| The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||||||
| and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | ||||||
|  |  | ||||||
|  | ## [5.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) | ||||||
|  | - Discord integration now says "Listening to" instead of "playing" [#488](https://github.com/Mastermindzh/tidal-hifi/pull/488) && [#454](https://github.com/Mastermindzh/tidal-hifi/pull/454) | ||||||
|  | - Fixed several element names in the dom scraper | ||||||
|  | - Removed the Songwhip (they shut down) integration and replaced it with TIDAL's universal link system | ||||||
|  |  | ||||||
|  | ## [5.16.0] | ||||||
|  |  | ||||||
|  | - Fix issue #449 Discord RPC stuck on "Browsing Tidal". | ||||||
|  | - Fix issue #448 Add option to disable the discord rpc idle text | ||||||
|  | - Notifications are now send at the end of the update process, allowing other events to happen sooner. | ||||||
|  |  | ||||||
|  | ## [5.15.0] | ||||||
|  |  | ||||||
|  | - Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z) | ||||||
|  | - Updated most dependency versions | ||||||
|  |   - This includes Electron 31! | ||||||
|  |  | ||||||
|  | - Added a channel selector so we can now use Tidal's staging environment directly from the app | ||||||
|  |   - implements [#437](https://github.com/Mastermindzh/tidal-hifi/issues/437) | ||||||
|  |  | ||||||
|  | ## [5.14.1] | ||||||
|  |  | ||||||
|  | - Fixed `getAlbumName` not finding album name whilst on queue page | ||||||
|  | - Added all mediaInfo to mpris interface using the `custom:` prefix | ||||||
|  |  | ||||||
|  | ## [5.14] | ||||||
|  |  | ||||||
|  | - Simplified `MediaInfo` & `Options` types | ||||||
|  | - Added `playingFrom` information to the info API | ||||||
|  |   - also changed the way we update Album info since Playing From now shows the correct Album. | ||||||
|  | - API now allows you to set the `hostname` so you can control who can interact with the API. | ||||||
|  | - Reworked swagger generation hotfix to properly generate `swagger.json` during the compile step | ||||||
|  |   - Might switch to tsoa in the future, idk yet. | ||||||
|  | - Added [Tidal Magazine](https://tidal.com/magazine/) integration (in the menubar or use `Ctrl + M`) | ||||||
|  |  | ||||||
|  | ## [5.13.1] | ||||||
|  |  | ||||||
|  | - removed Swagger generation step in favor of pre-generated file. | ||||||
|  |   - This also fixes the API issue [#409](https://github.com/Mastermindzh/tidal-hifi/issues/409) | ||||||
|  |   - This also stops TIDAL-hifi from scanning your entire home directory... the glob was very broad apparently. | ||||||
|  |  | ||||||
|  | ## [5.13.0] | ||||||
|  |  | ||||||
|  | - Fixed [#403](https://github.com/Mastermindzh/tidal-hifi/issues/403) "cannot read shuffle of undefined" error | ||||||
|  | - Added an API to add & delete entries from the skippedArtists list in the settings. fixes [#405](https://github.com/Mastermindzh/tidal-hifi/issues/405) | ||||||
|  |   - `GET /settings/skipped-artists` -> get list of skipped artists | ||||||
|  |   - `POST /settings/skipped-artists` -> add to the list of skipped artists | ||||||
|  |   - `POST /settings/skipped-artists/delete` -> delete from the list of skipped artists | ||||||
|  |   - `POST /settings/skipped-artists/current` -> skip the current artist | ||||||
|  |   - `DELETE /settings/skipped-artists/current` -> delete the current artist from the skip list | ||||||
|  |   - Added Swagger documentation to the new endpoints: | ||||||
|  |      | ||||||
|  | - CORS support added by [Mjokfox](https://github.com/Mjokfox) | ||||||
|  |  | ||||||
|  | ## [5.12.0] | ||||||
|  |  | ||||||
|  | - Added Shuffle and Repeat state to API response - By [ThatGravyBoat](https://github.com/ThatGravyBoat) | ||||||
|  |  | ||||||
|  | ## [5.11.0] | ||||||
|  |  | ||||||
|  | - Re-implemented the API, added support for duration/current in seconds & shuffle+repeat | ||||||
|  |   - made the original API "legacy" (still works the same) | ||||||
|  |   - Now using the correct HTTP verb for all new endpoints | ||||||
|  | - Implemented TIDAL's universal links. All links are now universal. | ||||||
|  | - Custom `tidal://` protocol fixed - By [TheRockYT](https://github.com/TheRockYT) | ||||||
|  | - Global media shortcuts removed since TIDAL includes them by default - By [TheRockYT](https://github.com/TheRockYT) | ||||||
|  |  | ||||||
|  | - Fixes | ||||||
|  |   - [#390](https://github.com/Mastermindzh/tidal-hifi/issues/390) | ||||||
|  |   - [#376](https://github.com/Mastermindzh/tidal-hifi/issues/376) | ||||||
|  |   - [#383](https://github.com/Mastermindzh/tidal-hifi/issues/383) | ||||||
|  |   - [#393](https://github.com/Mastermindzh/tidal-hifi/issues/393) | ||||||
|  |  | ||||||
|  | ## [5.10.0] | ||||||
|  |  | ||||||
|  | - TIDAL will now close the previous notification if a new one is sent whilst the old is still visible. [#364](https://github.com/Mastermindzh/tidal-hifi/pull/364) | ||||||
|  | - Updated developer documentation to get started in README [#365](https://github.com/Mastermindzh/tidal-hifi/pull/365) | ||||||
|  | - Links in the about window now open in the user's default browser. fixes [#360](https://github.com/Mastermindzh/tidal-hifi/issues/360) | ||||||
|  | - Refactored "nowPlaying" code to always display the current state, even when the built-in UI is updated. | ||||||
|  |   - fixes [#351](https://github.com/Mastermindzh/tidal-hifi/issues/351) | ||||||
|  |   - fixes [#356](https://github.com/Mastermindzh/tidal-hifi/issues/356) | ||||||
|  |   - fixes [#370](https://github.com/Mastermindzh/tidal-hifi/issues/370) | ||||||
|  | - Reverted to using old icon syntax with icons in the build directory. fixes [#350](https://github.com/Mastermindzh/tidal-hifi/issues/350) | ||||||
|  | - Enabled wayland platform flags by default when launching through .desktop file | ||||||
|  |   - fixes [#273](https://github.com/Mastermindzh/tidal-hifi/issues/273) | ||||||
|  |   - fixes [#347](https://github.com/Mastermindzh/tidal-hifi/issues/347) | ||||||
|  |  | ||||||
| ## [5.9.0] | ## [5.9.0] | ||||||
|  |  | ||||||
| - More Discord options: | - More Discord options: | ||||||
|   | |||||||
							
								
								
									
										21
									
								
								README.md
									
									
									
									
									
								
							
							
						
						| @@ -26,7 +26,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect | |||||||
|     - [Using source](#using-source) |     - [Using source](#using-source) | ||||||
|   - [Integrations](#integrations) |   - [Integrations](#integrations) | ||||||
|   - [Known bugs](#known-bugs) |   - [Known bugs](#known-bugs) | ||||||
|     - [DRM not working on Windows](#drm-not-working-on-windows) |     - [DRM not working on Windows (error S6007)](#drm-not-working-on-windows-error-s6007) | ||||||
|   - [Special thanks to](#special-thanks-to) |   - [Special thanks to](#special-thanks-to) | ||||||
|   - [Donations](#donations) |   - [Donations](#donations) | ||||||
|   - [Images](#images) |   - [Images](#images) | ||||||
| @@ -43,13 +43,13 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect | |||||||
| - Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts)) | - Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts)) | ||||||
| - Better icons thanks to [Papirus-icon-theme](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/) | - Better icons thanks to [Papirus-icon-theme](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/) | ||||||
| - [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`) | - [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`) | ||||||
| - API for status and playback | - API for status, playback and settings (see the [/docs](http://localhost:47836/docs/) route) | ||||||
| - Disabled audio & visual ads, unlocked lyrics, suggested track, track info, and unlimited skips thanks to uBlockOrigin custom filters ([source](https://github.com/uBlockOrigin/uAssets/issues/17495)) | - Disabled audio & visual ads, unlocked lyrics, suggested track, track info, and unlimited skips thanks to uBlockOrigin custom filters ([source](https://github.com/uBlockOrigin/uAssets/issues/17495)) | ||||||
| - AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847)) | - AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847)) | ||||||
| - Custom [integrations](#integrations) | - Custom [integrations](#integrations) | ||||||
|   - [ListenBrainz](https://listenbrainz.org/?redirect=false) integration |   - [ListenBrainz](https://listenbrainz.org/?redirect=false) integration | ||||||
|   - Songwhip.com integration (hotkey `ctrl + w`) |  | ||||||
|   - Discord RPC integration (showing "now listening", "Browsing", etc) |   - Discord RPC integration (showing "now listening", "Browsing", etc) | ||||||
|  |     - Flatpak version only works if both Discord and Tidal-HiFi are flatpaks | ||||||
|   - MPRIS integration |   - MPRIS integration | ||||||
| - UI + Json config (`~/.config/tidal-hifi/`, or `~/.var/app/com.mastermindzh.tidal-hifi/` for Flatpak) | - UI + Json config (`~/.config/tidal-hifi/`, or `~/.var/app/com.mastermindzh.tidal-hifi/` for Flatpak) | ||||||
|  |  | ||||||
| @@ -130,10 +130,13 @@ nix-env -iA nixpkgs.tidal-hifi | |||||||
|  |  | ||||||
| To install and work with the code on this project follow these steps: | To install and work with the code on this project follow these steps: | ||||||
|  |  | ||||||
| - git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git) | - `git clone https://github.com/Mastermindzh/tidal-hifi.git` | ||||||
| - cd TIDAL Hi-Fi | - `cd tidal-hifi` | ||||||
| - npm install | - `npm install` | ||||||
| - npm start | - `npm run watch` to watch for auto-reload of Typescript/SCSS changes. | ||||||
|  |   - `npm run compile` can be used to trigger it once | ||||||
|  | - `npm watchStart` to auto watch for any updates files and reload Tidal Hi-Fi | ||||||
|  |   - `npm start` can be used to run Tidal Hi-Fi manually once | ||||||
|  |  | ||||||
| ## Integrations | ## Integrations | ||||||
|  |  | ||||||
| @@ -149,11 +152,13 @@ Integrations with other projects that are not included natively: | |||||||
|  |  | ||||||
| ## Known bugs | ## Known bugs | ||||||
|  |  | ||||||
| ### DRM not working on Windows | ### DRM not working on Windows (error S6007) | ||||||
|  |  | ||||||
| Most Windows users run into DRM issues when trying to use TIDAL Hi-Fi. | Most Windows users run into DRM issues when trying to use TIDAL Hi-Fi. | ||||||
| Nothing I can do about that I'm afraid... Tidal is working on removing/changing DRM so when they finish with that we can give it another shot. | Nothing I can do about that I'm afraid... Tidal is working on removing/changing DRM so when they finish with that we can give it another shot. | ||||||
|  |  | ||||||
|  | Until then you'll have to use the official app unfortunately. | ||||||
|  |  | ||||||
| ## Special thanks to | ## Special thanks to | ||||||
|  |  | ||||||
| - [Castlabs](https://castlabs.com/) | - [Castlabs](https://castlabs.com/) | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| appId: com.rickvanlieshout.tidal-hifi | appId: com.rickvanlieshout.tidal-hifi | ||||||
| electronVersion: 28.1.1 | electronVersion: 37.2.5 | ||||||
| electronDownload: | electronDownload: | ||||||
|   version: 28.1.1+wvcus |   version: 37.2.5+wvcus | ||||||
|   mirror: https://github.com/castlabs/electron-releases/releases/download/v |   mirror: https://github.com/castlabs/electron-releases/releases/download/v | ||||||
| snap: | snap: | ||||||
|   plugs: |   plugs: | ||||||
| @@ -11,24 +11,31 @@ extraResources: | |||||||
|   - "themes/**" |   - "themes/**" | ||||||
| linux: | linux: | ||||||
|   category: AudioVideo |   category: AudioVideo | ||||||
|   icon: build/icons/256x256.png |   icon: build/icons | ||||||
|   target: |   target: | ||||||
|     - dir |     - dir | ||||||
|   executableName: tidal-hifi |   executableName: tidal-hifi | ||||||
|  |   executableArgs: | ||||||
|  |     [ | ||||||
|  |       "--ozone-platform-hint=auto", | ||||||
|  |       "--enable-features=WaylandWindowDecorations", | ||||||
|  |       "--enable-wayland-ime", | ||||||
|  |       "--use-angle", | ||||||
|  |     ] | ||||||
|   desktop: |   desktop: | ||||||
|     Encoding: UTF-8 |     entry: | ||||||
|     Name: TIDAL Hi-Fi |       Encoding: "UTF-8" | ||||||
|     GenericName: TIDAL Hi-Fi |       Name: "TIDAL Hi-Fi" | ||||||
|     Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine. |       GenericName: "TIDAL Hi-Fi" | ||||||
|     Icon: tidal-hifi |       Comment: "The web version of listen.tidal.com running in electron with hifi support thanks to widevine." | ||||||
|     StartupNotify: true |       Icon: "tidal-hifi" | ||||||
|     Terminal: false |       StartupNotify: "true" | ||||||
|     Type: Application |       Terminal: "false" | ||||||
|     Categories: Network;Application;AudioVideo;Audio;Video |       Type: "Application" | ||||||
|     StartupWMClass: tidal-hifi |       Categories: "Network;Application;AudioVideo;Audio;Video" | ||||||
|     X-PulseAudio-Properties: media.role=music |       StartupWMClass: "tidal-hifi" | ||||||
|     MimeType: x-scheme-handler/tidal; |       X-PulseAudio-Properties: "media.role=music" | ||||||
|  |       MimeType: "x-scheme-handler/tidal;" | ||||||
| mac: | mac: | ||||||
|   category: public.app-category.entertainment |   category: public.app-category.entertainment | ||||||
| win: | win: | ||||||
|   | |||||||
							
								
								
									
										
											BIN
										
									
								
								build/icons/128x128.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 4.4 KiB | 
							
								
								
									
										
											BIN
										
									
								
								build/icons/16x16.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1.2 KiB | 
							
								
								
									
										
											BIN
										
									
								
								build/icons/22x22.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1.4 KiB | 
							
								
								
									
										
											BIN
										
									
								
								build/icons/24x24.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1.5 KiB | 
							
								
								
									
										
											BIN
										
									
								
								build/icons/256x256 copy.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 9.0 KiB | 
							
								
								
									
										
											BIN
										
									
								
								build/icons/32x32.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1.7 KiB | 
							
								
								
									
										
											BIN
										
									
								
								build/icons/384x384.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 14 KiB | 
							
								
								
									
										
											BIN
										
									
								
								build/icons/48x48.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 2.2 KiB | 
							
								
								
									
										
											BIN
										
									
								
								build/icons/64x64.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 2.6 KiB | 
							
								
								
									
										
											BIN
										
									
								
								docs/images/swagger.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 88 KiB | 
							
								
								
									
										6369
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
							
								
								
									
										62
									
								
								package.json
									
									
									
									
									
								
							
							
						
						| @@ -1,16 +1,17 @@ | |||||||
| { | { | ||||||
|   "name": "tidal-hifi", |   "name": "tidal-hifi", | ||||||
|   "version": "5.9.0", |   "version": "5.20.1", | ||||||
|   "description": "Tidal on Electron with widevine(hifi) support", |   "description": "Tidal on Electron with widevine(hifi) support", | ||||||
|   "main": "ts-dist/main.js", |   "main": "ts-dist/main.js", | ||||||
|   "scripts": { |   "scripts": { | ||||||
|     "start": "electron --inspect=0.0.0.0:5858 .", |     "start": "electron --inspect=0.0.0.0:5858 --remote-debugging-port=8315 --remote-allow-origins=* .", | ||||||
|     "watchStart": "nodemon dist -x \"npm run start\"", |     "watchStart": "nodemon dist -x \"npm run start\"", | ||||||
|     "compile": "tsc && npm run sass-and-copy", |     "compile": "tsc && npm run sass-and-copy", | ||||||
|     "deps": "npm run watch", |     "deps": "npm run watch", | ||||||
|     "watch": "tsc-watch --onSuccess \"npm run sass-and-copy\"", |     "watch": "tsc-watch --onSuccess \"npm run compile-all\"", | ||||||
|     "copy-files": "copyfiles -u 1 --exclude './src/**/*.ts' --exclude './src/**/*.scss' \"./src/**/*\" ts-dist", |     "copy-files": "copyfiles -u 1 --exclude './src/**/*.ts' --exclude './src/**/*.scss' \"./src/**/*\" ts-dist", | ||||||
|     "copy-themes-dev": "copyfiles -u 1 \"./themes/*\" node_modules/electron/dist/resources", |     "copy-themes-dev": "copyfiles -u 1 \"./themes/*\" node_modules/electron/dist/resources", | ||||||
|  |     "compile-all": "npm run sass-and-copy && ts-node scripts/generate-swagger.ts", | ||||||
|     "sass-and-copy": "npm run sass && npm run copy-files && npm run copy-themes-dev", |     "sass-and-copy": "npm run sass && npm run copy-files && npm run copy-themes-dev", | ||||||
|     "build": "npm run builder -- -c ./build/electron-builder.yml", |     "build": "npm run builder -- -c ./build/electron-builder.yml", | ||||||
|     "build-deb": "npm run builder -- -c ./build/electron-builder.deb.yml", |     "build-deb": "npm run builder -- -c ./build/electron-builder.deb.yml", | ||||||
| @@ -39,38 +40,45 @@ | |||||||
|   "homepage": "https://github.com/Mastermindzh/tidal-hifi", |   "homepage": "https://github.com/Mastermindzh/tidal-hifi", | ||||||
|   "license": "MIT", |   "license": "MIT", | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@electron/remote": "^2.1.1", |     "@electron/remote": "^2.1.3", | ||||||
|     "axios": "^1.6.5", |     "@types/swagger-jsdoc": "^6.0.4", | ||||||
|     "discord-rpc": "^4.0.1", |     "@xhayper/discord-rpc": "1.3.0", | ||||||
|     "electron-store": "^8.1.0", |     "axios": "^1.12.0", | ||||||
|     "express": "^4.18.2", |     "cors": "^2.8.5", | ||||||
|     "hotkeys-js": "^3.13.5", |     "electron-store": "^8.2.0", | ||||||
|  |     "express": "^5.1.0", | ||||||
|  |     "hotkeys-js": "^3.13.15", | ||||||
|     "mpris-service": "^2.1.2", |     "mpris-service": "^2.1.2", | ||||||
|     "request": "^2.88.2", |     "request": "^2.88.2", | ||||||
|     "sass": "^1.70.0" |     "sass": "1.93.2", | ||||||
|  |     "swagger-ui-express": "^5.0.1" | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "@mastermindzh/prettier-config": "^1.0.0", |     "@mastermindzh/prettier-config": "^1.0.0", | ||||||
|     "@types/discord-rpc": "^4.0.8", |     "@types/cors": "^2.8.19", | ||||||
|     "@types/express": "^4.17.21", |     "@types/express": "^5.0.3", | ||||||
|     "@types/node": "^20.10.6", |     "@types/node": "^22.16.2", | ||||||
|     "@types/request": "^2.48.12", |     "@types/request": "^2.48.12", | ||||||
|     "@typescript-eslint/eslint-plugin": "^6.18.0", |     "@types/swagger-ui-express": "^4.1.8", | ||||||
|     "@typescript-eslint/parser": "^6.18.0", |     "@typescript-eslint/eslint-plugin": "^8.36.0", | ||||||
|  |     "@typescript-eslint/parser": "^8.36.0", | ||||||
|     "copyfiles": "^2.4.1", |     "copyfiles": "^2.4.1", | ||||||
|     "electron": "git+https://github.com/castlabs/electron-releases#v28.1.1+wvcus", |     "electron": "github:castlabs/electron-releases#v37.2.5+wvcus", | ||||||
|     "electron-builder": "^24.9.1", |     "electron-builder": "~26.0.12", | ||||||
|     "eslint": "^8.56.0", |     "eslint": "^9.30.1", | ||||||
|     "js-yaml": "^4.1.0", |     "js-yaml": "^4.1.0", | ||||||
|     "markdown-toc": "^1.2.0", |     "markdown-toc": "^1.2.0", | ||||||
|     "nodemon": "^3.0.2", |     "node-abi": "^4.12.0", | ||||||
|     "prettier": "^3.1.1", |     "nodemon": "^3.1.10", | ||||||
|     "stylelint": "^16.1.0", |     "prettier": "^3.6.2", | ||||||
|     "stylelint-config-standard": "^36.0.0", |     "stylelint": "^16.21.1", | ||||||
|     "stylelint-config-standard-scss": "^13.0.0", |     "stylelint-config-standard": "^39.0.0", | ||||||
|     "stylelint-prettier": "^5.0.0", |     "stylelint-config-standard-scss": "^16.0.0", | ||||||
|     "tsc-watch": "^6.0.4", |     "stylelint-prettier": "^5.0.3", | ||||||
|     "typescript": "^5.3.3" |     "swagger-jsdoc": "^6.2.8", | ||||||
|  |     "ts-node": "^10.9.2", | ||||||
|  |     "tsc-watch": "^7.1.1", | ||||||
|  |     "typescript": "^5.8.3" | ||||||
|   }, |   }, | ||||||
|   "prettier": "@mastermindzh/prettier-config" |   "prettier": "@mastermindzh/prettier-config" | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										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"] | ||||||
|  | } | ||||||
							
								
								
									
										30
									
								
								scripts/generate-swagger.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,30 @@ | |||||||
|  | import fs from "fs"; | ||||||
|  | import swaggerjsdoc from "swagger-jsdoc"; | ||||||
|  | import packagejson from "./../package.json"; | ||||||
|  |  | ||||||
|  | const specs = swaggerjsdoc({ | ||||||
|  |   definition: { | ||||||
|  |     openapi: "3.1.0", | ||||||
|  |     info: { | ||||||
|  |       title: "TIDAL Hi-Fi API", | ||||||
|  |       version: packagejson.version, | ||||||
|  |       description: "", | ||||||
|  |       license: { | ||||||
|  |         name: packagejson.license, | ||||||
|  |         url: "https://github.com/Mastermindzh/tidal-hifi/blob/master/LICENSE", | ||||||
|  |       }, | ||||||
|  |       contact: { | ||||||
|  |         name: "Rick <mastermindzh> van Lieshout", | ||||||
|  |         url: "https://www.rickvanlieshout.com", | ||||||
|  |       }, | ||||||
|  |     }, | ||||||
|  |     externalDocs: { | ||||||
|  |       description: "swagger.json", | ||||||
|  |       url: "swagger.json", | ||||||
|  |     }, | ||||||
|  |   }, | ||||||
|  |   apis: ["**/*.ts"], | ||||||
|  | }); | ||||||
|  |  | ||||||
|  | fs.writeFileSync("src/features/api/swagger.json", JSON.stringify(specs, null, 2), "utf8"); | ||||||
|  | console.log("Written swagger.json"); | ||||||
| @@ -16,16 +16,19 @@ | |||||||
|     search: '[class^="searchField"]', |     search: '[class^="searchField"]', | ||||||
|     shuffle: '*[data-test="shuffle"]', |     shuffle: '*[data-test="shuffle"]', | ||||||
|     repeat: '*[data-test="repeat"]', |     repeat: '*[data-test="repeat"]', | ||||||
|     account: '*[class^="profileOptions"]', |     account: '*[data-test^="profile-image-button"]', | ||||||
|     settings: '*[data-test^="open-settings"]', |     settings: '*[data-test^="sidebar-menu-button"]', | ||||||
|  |     openSettings: '*[data-test^="open-settings"]', | ||||||
|     media: '*[data-test="current-media-imagery"]', |     media: '*[data-test="current-media-imagery"]', | ||||||
|     image: "img", |     image: "img", | ||||||
|     current: '*[data-test="current-time"]', |     current: '*[data-test="current-time"]', | ||||||
|     duration: '*[class^=playbackControlsContainer] *[data-test="duration"]', |     duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]', | ||||||
|     bar: '*[data-test="progress-bar"]', |     bar: '*[data-test="progress-bar"]', | ||||||
|     footer: "#footerPlayer", |     footer: "#footerPlayer", | ||||||
|     mediaItem: "[data-type='mediaItem']", |     mediaItem: "[data-type='mediaItem']", | ||||||
|     album_header_title: '.header-details [data-test="title"]', |     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']", |     currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']", | ||||||
|     album_name_cell: '[class^="album"]', |     album_name_cell: '[class^="album"]', | ||||||
|     tracklist_row: '[data-test="tracklist-row"]', |     tracklist_row: '[data-test="tracklist-row"]', | ||||||
|   | |||||||
| @@ -10,7 +10,9 @@ export const globalEvents = { | |||||||
|   showSettings: "showSettings", |   showSettings: "showSettings", | ||||||
|   storeChanged: "storeChanged", |   storeChanged: "storeChanged", | ||||||
|   error: "error", |   error: "error", | ||||||
|   whip: "whip", |   getUniversalLink: "getUniversalLink", | ||||||
|   log: "log", |   log: "log", | ||||||
|   toggleFavorite: "toggleFavorite", |   toggleFavorite: "toggleFavorite", | ||||||
|  |   toggleShuffle: "toggleShuffle", | ||||||
|  |   toggleRepeat: "toggleRepeat", | ||||||
| }; | }; | ||||||
|   | |||||||
| @@ -10,10 +10,15 @@ | |||||||
|  */ |  */ | ||||||
| export const settings = { | export const settings = { | ||||||
|   adBlock: "adBlock", |   adBlock: "adBlock", | ||||||
|  |   advanced: { | ||||||
|  |     root: "advanced", | ||||||
|  |     tidalUrl: "advanced.tidalUrl", | ||||||
|  |   }, | ||||||
|   api: "api", |   api: "api", | ||||||
|   apiSettings: { |   apiSettings: { | ||||||
|     root: "apiSettings", |     root: "apiSettings", | ||||||
|     port: "apiSettings.port", |     port: "apiSettings.port", | ||||||
|  |     hostname: "apiSettings.hostname", | ||||||
|   }, |   }, | ||||||
|   customCSS: "customCSS", |   customCSS: "customCSS", | ||||||
|   disableBackgroundThrottle: "disableBackgroundThrottle", |   disableBackgroundThrottle: "disableBackgroundThrottle", | ||||||
| @@ -25,6 +30,7 @@ export const settings = { | |||||||
|     buttonText: "discord.buttonText", |     buttonText: "discord.buttonText", | ||||||
|     includeTimestamps: "discord.includeTimestamps", |     includeTimestamps: "discord.includeTimestamps", | ||||||
|     showSong: "discord.showSong", |     showSong: "discord.showSong", | ||||||
|  |     showIdle: "discord.showIdle", | ||||||
|     idleText: "discord.idleText", |     idleText: "discord.idleText", | ||||||
|     usingText: "discord.usingText", |     usingText: "discord.usingText", | ||||||
|   }, |   }, | ||||||
| @@ -49,6 +55,7 @@ export const settings = { | |||||||
|   singleInstance: "singleInstance", |   singleInstance: "singleInstance", | ||||||
|   skipArtists: "skipArtists", |   skipArtists: "skipArtists", | ||||||
|   skippedArtists: "skippedArtists", |   skippedArtists: "skippedArtists", | ||||||
|  |   staticWindowTitle: "staticWindowTitle", | ||||||
|   theme: "theme", |   theme: "theme", | ||||||
|   trayIcon: "trayIcon", |   trayIcon: "trayIcon", | ||||||
|   updateFrequency: "updateFrequency", |   updateFrequency: "updateFrequency", | ||||||
|   | |||||||
							
								
								
									
										124
									
								
								src/features/api/features/current.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,124 @@ | |||||||
|  | import { Request, Response, Router } from "express"; | ||||||
|  | import fs from "fs"; | ||||||
|  | import { mediaInfo } from "../../../scripts/mediaInfo"; | ||||||
|  |  | ||||||
|  | export const addCurrentInfo = (expressApp: Router) => { | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * tags: | ||||||
|  |    *   name: current | ||||||
|  |    *   description: The current media info API | ||||||
|  |    * components: | ||||||
|  |    *   schemas: | ||||||
|  |    *     MediaInfo: | ||||||
|  |    *       type: object | ||||||
|  |    *       properties: | ||||||
|  |    *         title: | ||||||
|  |    *           type: string | ||||||
|  |    *         artists: | ||||||
|  |    *           type: string | ||||||
|  |    *         album: | ||||||
|  |    *           type: string | ||||||
|  |    *         icon: | ||||||
|  |    *           type: string | ||||||
|  |    *           format: uri | ||||||
|  |    *         playingFrom: | ||||||
|  |    *           type: string | ||||||
|  |    *         status: | ||||||
|  |    *           type: string | ||||||
|  |    *         url: | ||||||
|  |    *           type: string | ||||||
|  |    *           format: uri | ||||||
|  |    *         current: | ||||||
|  |    *           type: string | ||||||
|  |    *         currentInSeconds: | ||||||
|  |    *           type: integer | ||||||
|  |    *         duration: | ||||||
|  |    *           type: string | ||||||
|  |    *         durationInSeconds: | ||||||
|  |    *           type: integer | ||||||
|  |    *         image: | ||||||
|  |    *           type: string | ||||||
|  |    *           format: uri | ||||||
|  |    *         favorite: | ||||||
|  |    *           type: boolean | ||||||
|  |    *         player: | ||||||
|  |    *           type: object | ||||||
|  |    *           properties: | ||||||
|  |    *             status: | ||||||
|  |    *               type: string | ||||||
|  |    *             shuffle: | ||||||
|  |    *               type: boolean | ||||||
|  |    *             repeat: | ||||||
|  |    *               type: string | ||||||
|  |    *         artist: | ||||||
|  |    *           type: string | ||||||
|  |    *       example: | ||||||
|  |    *         title: "Sample Title" | ||||||
|  |    *         artists: "Sample Artist" | ||||||
|  |    *         album: "Sample Album" | ||||||
|  |    *         icon: "/path/to/sample/icon.jpg" | ||||||
|  |    *         playingFrom: "Sample Playlist" | ||||||
|  |    *         status: "playing" | ||||||
|  |    *         url: "https://tidal.com/browse/track/sample" | ||||||
|  |    *         current: "1:23" | ||||||
|  |    *         currentInSeconds: 83 | ||||||
|  |    *         duration: "3:45" | ||||||
|  |    *         durationInSeconds: 225 | ||||||
|  |    *         image: "https://example.com/sample-image.jpg" | ||||||
|  |    *         favorite: true | ||||||
|  |    *         player: | ||||||
|  |    *           status: "playing" | ||||||
|  |    *           shuffle: true | ||||||
|  |    *           repeat: "one" | ||||||
|  |    *         artist: "Sample Artist" | ||||||
|  |    */ | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * /current: | ||||||
|  |    *   get: | ||||||
|  |    *     summary: Get current media info | ||||||
|  |    *     tags: [current] | ||||||
|  |    *     responses: | ||||||
|  |    *       200: | ||||||
|  |    *         description: Current media info | ||||||
|  |    *         content: | ||||||
|  |    *           application/json: | ||||||
|  |    *             schema: | ||||||
|  |    *               $ref: '#/components/schemas/MediaInfo' | ||||||
|  |    */ | ||||||
|  |   expressApp.get("/current", (_req, res) => { | ||||||
|  |     res.json({ ...mediaInfo, artist: mediaInfo.artists }); | ||||||
|  |   }); | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * /current/image: | ||||||
|  |    *   get: | ||||||
|  |    *     summary: Get current media image | ||||||
|  |    *     tags: [current] | ||||||
|  |    *     responses: | ||||||
|  |    *       200: | ||||||
|  |    *         description: Current media image | ||||||
|  |    *         content: | ||||||
|  |    *           image/png: | ||||||
|  |    *             schema: | ||||||
|  |    *               type: string | ||||||
|  |    *               format: binary | ||||||
|  |    *       404: | ||||||
|  |    *         description: Not found | ||||||
|  |    */ | ||||||
|  |   expressApp.get("/current/image", getCurrentImage); | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | export const getCurrentImage = (req: Request, res: Response) => { | ||||||
|  |   const stream = fs.createReadStream(mediaInfo.icon); | ||||||
|  |   stream.on("open", function () { | ||||||
|  |     res.set("Content-Type", "image/png"); | ||||||
|  |     stream.pipe(res); | ||||||
|  |   }); | ||||||
|  |   stream.on("error", function () { | ||||||
|  |     res.set("Content-Type", "text/plain"); | ||||||
|  |     res.status(404).end("Not found"); | ||||||
|  |   }); | ||||||
|  | }; | ||||||
							
								
								
									
										164
									
								
								src/features/api/features/player.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,164 @@ | |||||||
|  | import { BrowserWindow } from "electron"; | ||||||
|  | import { Router } from "express"; | ||||||
|  | import { globalEvents } from "../../../constants/globalEvents"; | ||||||
|  | import { settings } from "../../../constants/settings"; | ||||||
|  | import { MediaStatus } from "../../../models/mediaStatus"; | ||||||
|  | import { mediaInfo } from "../../../scripts/mediaInfo"; | ||||||
|  | import { settingsStore } from "../../../scripts/settings"; | ||||||
|  | import { handleWindowEvent } from "../helpers/handleWindowEvent"; | ||||||
|  |  | ||||||
|  | export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow) => { | ||||||
|  |   const windowEvent = handleWindowEvent(mainWindow); | ||||||
|  |   const createRoute = (route: string) => `/player${route}`; | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * tags: | ||||||
|  |    *   name: player | ||||||
|  |    *   description: The player control API | ||||||
|  |    * components: | ||||||
|  |    *   schemas: | ||||||
|  |    *     OkResponse: | ||||||
|  |    *       type: string | ||||||
|  |    *       example: "OK" | ||||||
|  |    */ | ||||||
|  |   const createPlayerAction = (route: string, action: string) => { | ||||||
|  |     expressApp.post(createRoute(route), (req, res) => windowEvent(res, action)); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   if (settingsStore.get(settings.playBackControl)) { | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /player/play: | ||||||
|  |      *   post: | ||||||
|  |      *     summary: Play the current media | ||||||
|  |      *     tags: [player] | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     createPlayerAction("/play", globalEvents.play); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /player/favorite/toggle: | ||||||
|  |      *   post: | ||||||
|  |      *     summary: Add the current media to your favorites, or remove it if its already added to your favorites | ||||||
|  |      *     tags: [player] | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     createPlayerAction("/favorite/toggle", globalEvents.toggleFavorite); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /player/pause: | ||||||
|  |      *   post: | ||||||
|  |      *     summary: Pause the current media | ||||||
|  |      *     tags: [player] | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     createPlayerAction("/pause", globalEvents.pause); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /player/next: | ||||||
|  |      *   post: | ||||||
|  |      *     summary: Play the next song | ||||||
|  |      *     tags: [player] | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     createPlayerAction("/next", globalEvents.next); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /player/previous: | ||||||
|  |      *   post: | ||||||
|  |      *     summary: Play the previous song | ||||||
|  |      *     tags: [player] | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     createPlayerAction("/previous", globalEvents.previous); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /player/shuffle/toggle: | ||||||
|  |      *   post: | ||||||
|  |      *     summary: Play the previous song | ||||||
|  |      *     tags: [player] | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     createPlayerAction("/shuffle/toggle", globalEvents.toggleShuffle); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /player/repeat/toggle: | ||||||
|  |      *   post: | ||||||
|  |      *     summary: Toggle the repeat status, toggles between "off" , "single" and "all" | ||||||
|  |      *     tags: [player] | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     createPlayerAction("/repeat/toggle", globalEvents.toggleRepeat); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /player/playpause: | ||||||
|  |      *   post: | ||||||
|  |      *     summary: Start playing the media if paused, or pause the media if playing | ||||||
|  |      *     tags: [player] | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     expressApp.post(createRoute("/playpause"), (req, res) => { | ||||||
|  |       if (mediaInfo.status === MediaStatus.playing) { | ||||||
|  |         windowEvent(res, globalEvents.pause); | ||||||
|  |       } else { | ||||||
|  |         windowEvent(res, globalEvents.play); | ||||||
|  |       } | ||||||
|  |     }); | ||||||
|  |   } | ||||||
|  | }; | ||||||
							
								
								
									
										121
									
								
								src/features/api/features/settings/settings.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,121 @@ | |||||||
|  | import { Request, Router } from "express"; | ||||||
|  | import { settings } from "../../../../constants/settings"; | ||||||
|  | import { mediaInfo } from "../../../../scripts/mediaInfo"; | ||||||
|  | import { | ||||||
|  |   addSkippedArtists, | ||||||
|  |   removeSkippedArtists, | ||||||
|  |   settingsStore, | ||||||
|  | } from "../../../../scripts/settings"; | ||||||
|  | import { BrowserWindow } from "electron"; | ||||||
|  | import { globalEvents } from "../../../../constants/globalEvents"; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @swagger | ||||||
|  |  * tags: | ||||||
|  |  *   name: settings | ||||||
|  |  *   description: The settings management API | ||||||
|  |  * components: | ||||||
|  |  *   schemas: | ||||||
|  |  *     StringArray: | ||||||
|  |  *       type: array | ||||||
|  |  *       items: | ||||||
|  |  *         type: string | ||||||
|  |  *       example: ["Artist1", "Artist2"] | ||||||
|  |  * | ||||||
|  |  * @param expressApp | ||||||
|  |  * @param mainWindow | ||||||
|  |  */ | ||||||
|  | export const addSettingsAPI = (expressApp: Router, mainWindow: BrowserWindow) => { | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * /settings/skipped-artists: | ||||||
|  |    *   get: | ||||||
|  |    *     summary: get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled | ||||||
|  |    *     tags: [settings] | ||||||
|  |    *     responses: | ||||||
|  |    *       200: | ||||||
|  |    *         description: The list book. | ||||||
|  |    *         content: | ||||||
|  |    *           application/json: | ||||||
|  |    *             schema: | ||||||
|  |    *              $ref: '#/components/schemas/StringArray' | ||||||
|  |    */ | ||||||
|  |   expressApp.get("/settings/skipped-artists", (req, res) => { | ||||||
|  |     res.json(settingsStore.get<string, string[]>(settings.skippedArtists)); | ||||||
|  |   }); | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * /settings/skipped-artists: | ||||||
|  |    *   post: | ||||||
|  |    *     summary: Add new artists to the list of skipped artists | ||||||
|  |    *     tags: [settings] | ||||||
|  |    *     requestBody: | ||||||
|  |    *       required: true | ||||||
|  |    *       content: | ||||||
|  |    *         application/json: | ||||||
|  |    *           schema: | ||||||
|  |    *             $ref: '#/components/schemas/StringArray' | ||||||
|  |    *     responses: | ||||||
|  |    *       200: | ||||||
|  |    *         description: Ok | ||||||
|  |    */ | ||||||
|  |   expressApp.post("/settings/skipped-artists", (req: Request<object, object, string[]>, res) => { | ||||||
|  |     addSkippedArtists(req.body); | ||||||
|  |     res.sendStatus(200); | ||||||
|  |   }); | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * /settings/skipped-artists/delete: | ||||||
|  |    *   post: | ||||||
|  |    *     summary: Remove artists from the list of skipped artists | ||||||
|  |    *     tags: [settings] | ||||||
|  |    *     requestBody: | ||||||
|  |    *       required: true | ||||||
|  |    *       content: | ||||||
|  |    *         application/json: | ||||||
|  |    *           schema: | ||||||
|  |    *             $ref: '#/components/schemas/StringArray' | ||||||
|  |    *     responses: | ||||||
|  |    *       200: | ||||||
|  |    *         description: Ok | ||||||
|  |    */ | ||||||
|  |   expressApp.post( | ||||||
|  |     "/settings/skipped-artists/delete", | ||||||
|  |     (req: Request<object, object, string[]>, res) => { | ||||||
|  |       removeSkippedArtists(req.body); | ||||||
|  |       res.sendStatus(200); | ||||||
|  |     } | ||||||
|  |   ); | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * /settings/skipped-artists/current: | ||||||
|  |    *   post: | ||||||
|  |    *     summary: Add the current artist to the list of skipped artists | ||||||
|  |    *     tags: [settings] | ||||||
|  |    *     responses: | ||||||
|  |    *       200: | ||||||
|  |    *        description: Ok | ||||||
|  |    */ | ||||||
|  |   expressApp.post("/settings/skipped-artists/current", (req, res) => { | ||||||
|  |     addSkippedArtists([mediaInfo.artists]); | ||||||
|  |     mainWindow.webContents.send("globalEvent", globalEvents.next); | ||||||
|  |     res.sendStatus(200); | ||||||
|  |   }); | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * /settings/skipped-artists/current: | ||||||
|  |    *   delete: | ||||||
|  |    *     summary: Remove the current artist from the list of skipped artists | ||||||
|  |    *     tags: [settings] | ||||||
|  |    *     responses: | ||||||
|  |    *       200: | ||||||
|  |    *        description: Ok | ||||||
|  |    */ | ||||||
|  |   expressApp.delete("/settings/skipped-artists/current", (req, res) => { | ||||||
|  |     removeSkippedArtists([mediaInfo.artists]); | ||||||
|  |     res.sendStatus(200); | ||||||
|  |   }); | ||||||
|  | }; | ||||||
							
								
								
									
										12
									
								
								src/features/api/helpers/handleWindowEvent.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,12 @@ | |||||||
|  | import { BrowserWindow } from "electron"; | ||||||
|  | import { Response } from "express"; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Shorthand to handle a fire and forget global event | ||||||
|  |  * @param {*} res | ||||||
|  |  * @param {*} action | ||||||
|  |  */ | ||||||
|  | export const handleWindowEvent = (mainWindow: BrowserWindow) => (res: Response, action: string) => { | ||||||
|  |   mainWindow.webContents.send("globalEvent", action); | ||||||
|  |   res.sendStatus(200); | ||||||
|  | }; | ||||||
							
								
								
									
										46
									
								
								src/features/api/index.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,46 @@ | |||||||
|  | import cors from "cors"; | ||||||
|  | import { BrowserWindow, dialog } from "electron"; | ||||||
|  | import express from "express"; | ||||||
|  | import swaggerUi from "swagger-ui-express"; | ||||||
|  | import { settingsStore } from "../../scripts/settings"; | ||||||
|  | import { settings } from "./../../constants/settings"; | ||||||
|  | import { addCurrentInfo } from "./features/current"; | ||||||
|  | import { addPlaybackControl } from "./features/player"; | ||||||
|  | import { addSettingsAPI } from "./features/settings/settings"; | ||||||
|  | import { addLegacyApi } from "./legacy"; | ||||||
|  | import swaggerSpec from "./swagger.json"; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Function to enable TIDAL Hi-Fi's express api | ||||||
|  |  */ | ||||||
|  | export const startApi = (mainWindow: BrowserWindow) => { | ||||||
|  |   const port = settingsStore.get<string, number>(settings.apiSettings.port); | ||||||
|  |   const hostname = settingsStore.get<string, string>(settings.apiSettings.hostname) ?? "127.0.0.1"; | ||||||
|  |  | ||||||
|  |   const expressApp = express(); | ||||||
|  |   expressApp.use(cors()); | ||||||
|  |   expressApp.use(express.json()); | ||||||
|  |   expressApp.use("/docs", swaggerUi.serve, swaggerUi.setup(swaggerSpec)); | ||||||
|  |   expressApp.get("/", (req, res) => { | ||||||
|  |     res.send("Hello World!"); | ||||||
|  |   }); | ||||||
|  |   expressApp.get("/swagger.json", (req, res) => { | ||||||
|  |     res.json(swaggerSpec); | ||||||
|  |   }); | ||||||
|  |  | ||||||
|  |   // add features | ||||||
|  |   addLegacyApi(expressApp, mainWindow); | ||||||
|  |   addPlaybackControl(expressApp, mainWindow); | ||||||
|  |   addCurrentInfo(expressApp); | ||||||
|  |   addSettingsAPI(expressApp, mainWindow); | ||||||
|  |  | ||||||
|  |   const expressInstance = expressApp.listen(port, hostname); | ||||||
|  |   expressInstance.on("error", function (e: { code: string }) { | ||||||
|  |     let message = e.code; | ||||||
|  |     if (e.code === "EADDRINUSE") { | ||||||
|  |       message = `Port ${port} in use.`; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     dialog.showErrorBox("Api failed to start.", message); | ||||||
|  |   }); | ||||||
|  | }; | ||||||
							
								
								
									
										160
									
								
								src/features/api/legacy.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,160 @@ | |||||||
|  | import { BrowserWindow } from "electron"; | ||||||
|  | import { Response, Router } from "express"; | ||||||
|  | import { globalEvents } from "../../constants/globalEvents"; | ||||||
|  | import { settings } from "../../constants/settings"; | ||||||
|  | import { MediaStatus } from "../../models/mediaStatus"; | ||||||
|  | import { mediaInfo } from "../../scripts/mediaInfo"; | ||||||
|  | import { settingsStore } from "../../scripts/settings"; | ||||||
|  | import { getCurrentImage } from "./features/current"; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * The legacy API, this will not be maintained and probably has duplicate code :) | ||||||
|  |  * @param expressApp | ||||||
|  |  * @param mainWindow | ||||||
|  |  */ | ||||||
|  | export const addLegacyApi = (expressApp: Router, mainWindow: BrowserWindow) => { | ||||||
|  |   /** | ||||||
|  |    * @swagger | ||||||
|  |    * /image: | ||||||
|  |    *   get: | ||||||
|  |    *     summary: Get current image | ||||||
|  |    *     tags: [legacy] | ||||||
|  |    *     deprecated: true | ||||||
|  |    *     responses: | ||||||
|  |    *       200: | ||||||
|  |    *         description: Current image | ||||||
|  |    *         content: | ||||||
|  |    *           image/png: | ||||||
|  |    *             schema: | ||||||
|  |    *               type: string | ||||||
|  |    *               format: binary | ||||||
|  |    *       404: | ||||||
|  |    *         description: Not found | ||||||
|  |    */ | ||||||
|  |   expressApp.get("/image", getCurrentImage); | ||||||
|  |  | ||||||
|  |   if (settingsStore.get(settings.playBackControl)) { | ||||||
|  |     addLegacyControls(); | ||||||
|  |   } | ||||||
|  |   function addLegacyControls() { | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /play: | ||||||
|  |      *   get: | ||||||
|  |      *     summary: Play the current media | ||||||
|  |      *     tags: [legacy] | ||||||
|  |      *     deprecated: true | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Action performed | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     expressApp.get("/play", ({ res }) => handleGlobalEvent(res, globalEvents.play)); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /favorite/toggle: | ||||||
|  |      *   get: | ||||||
|  |      *     summary: Add the current media to your favorites, or remove it if its already added to your favorites | ||||||
|  |      *     tags: [legacy] | ||||||
|  |      *     deprecated: true | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     expressApp.post("/favorite/toggle", (req, res) => | ||||||
|  |       handleGlobalEvent(res, globalEvents.toggleFavorite) | ||||||
|  |     ); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /pause: | ||||||
|  |      *   get: | ||||||
|  |      *     summary: Pause the current media | ||||||
|  |      *     tags: [legacy] | ||||||
|  |      *     deprecated: true | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     expressApp.get("/pause", (req, res) => handleGlobalEvent(res, globalEvents.pause)); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /next: | ||||||
|  |      *   get: | ||||||
|  |      *     summary: Play the next song | ||||||
|  |      *     tags: [legacy] | ||||||
|  |      *     deprecated: true | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     expressApp.get("/next", (req, res) => handleGlobalEvent(res, globalEvents.next)); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /previous: | ||||||
|  |      *   get: | ||||||
|  |      *     summary: Play the previous song | ||||||
|  |      *     tags: [legacy] | ||||||
|  |      *     deprecated: true | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     expressApp.get("/previous", (req, res) => handleGlobalEvent(res, globalEvents.previous)); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @swagger | ||||||
|  |      * /playpause: | ||||||
|  |      *   get: | ||||||
|  |      *     summary: Toggle play/pause | ||||||
|  |      *     tags: [legacy] | ||||||
|  |      *     deprecated: true | ||||||
|  |      *     responses: | ||||||
|  |      *       200: | ||||||
|  |      *         description: Ok | ||||||
|  |      *         content: | ||||||
|  |      *           text/plain: | ||||||
|  |      *             schema: | ||||||
|  |      *               $ref: '#/components/schemas/OkResponse' | ||||||
|  |      */ | ||||||
|  |     expressApp.get("/playpause", (req, res) => { | ||||||
|  |       if (mediaInfo.status === MediaStatus.playing) { | ||||||
|  |         handleGlobalEvent(res, globalEvents.pause); | ||||||
|  |       } else { | ||||||
|  |         handleGlobalEvent(res, globalEvents.play); | ||||||
|  |       } | ||||||
|  |     }); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * Shorthand to handle a fire and forget global event | ||||||
|  |    * @param {*} res | ||||||
|  |    * @param {*} action | ||||||
|  |    */ | ||||||
|  |   function handleGlobalEvent(res: Response, action: string) { | ||||||
|  |     mainWindow.webContents.send("globalEvent", action); | ||||||
|  |     res.sendStatus(200); | ||||||
|  |   } | ||||||
|  | }; | ||||||
							
								
								
									
										535
									
								
								src/features/api/swagger.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,535 @@ | |||||||
|  | { | ||||||
|  |   "openapi": "3.1.0", | ||||||
|  |   "info": { | ||||||
|  |     "title": "TIDAL Hi-Fi API", | ||||||
|  |     "version": "5.20.1", | ||||||
|  |     "description": "", | ||||||
|  |     "license": { | ||||||
|  |       "name": "MIT", | ||||||
|  |       "url": "https://github.com/Mastermindzh/tidal-hifi/blob/master/LICENSE" | ||||||
|  |     }, | ||||||
|  |     "contact": { | ||||||
|  |       "name": "Rick <mastermindzh> van Lieshout", | ||||||
|  |       "url": "https://www.rickvanlieshout.com" | ||||||
|  |     } | ||||||
|  |   }, | ||||||
|  |   "externalDocs": { | ||||||
|  |     "description": "swagger.json", | ||||||
|  |     "url": "swagger.json" | ||||||
|  |   }, | ||||||
|  |   "paths": { | ||||||
|  |     "/current": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "Get current media info", | ||||||
|  |         "tags": ["current"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Current media info", | ||||||
|  |             "content": { | ||||||
|  |               "application/json": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/MediaInfo" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/current/image": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "Get current media image", | ||||||
|  |         "tags": ["current"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Current media image", | ||||||
|  |             "content": { | ||||||
|  |               "image/png": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "type": "string", | ||||||
|  |                   "format": "binary" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           }, | ||||||
|  |           "404": { | ||||||
|  |             "description": "Not found" | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/player/play": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Play the current media", | ||||||
|  |         "tags": ["player"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/player/favorite/toggle": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Add the current media to your favorites, or remove it if its already added to your favorites", | ||||||
|  |         "tags": ["player"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/player/pause": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Pause the current media", | ||||||
|  |         "tags": ["player"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/player/next": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Play the next song", | ||||||
|  |         "tags": ["player"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/player/previous": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Play the previous song", | ||||||
|  |         "tags": ["player"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/player/shuffle/toggle": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Play the previous song", | ||||||
|  |         "tags": ["player"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/player/repeat/toggle": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"", | ||||||
|  |         "tags": ["player"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/player/playpause": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Start playing the media if paused, or pause the media if playing", | ||||||
|  |         "tags": ["player"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/settings/skipped-artists": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled", | ||||||
|  |         "tags": ["settings"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "The list book.", | ||||||
|  |             "content": { | ||||||
|  |               "application/json": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/StringArray" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       }, | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Add new artists to the list of skipped artists", | ||||||
|  |         "tags": ["settings"], | ||||||
|  |         "requestBody": { | ||||||
|  |           "required": true, | ||||||
|  |           "content": { | ||||||
|  |             "application/json": { | ||||||
|  |               "schema": { | ||||||
|  |                 "$ref": "#/components/schemas/StringArray" | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok" | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/settings/skipped-artists/delete": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Remove artists from the list of skipped artists", | ||||||
|  |         "tags": ["settings"], | ||||||
|  |         "requestBody": { | ||||||
|  |           "required": true, | ||||||
|  |           "content": { | ||||||
|  |             "application/json": { | ||||||
|  |               "schema": { | ||||||
|  |                 "$ref": "#/components/schemas/StringArray" | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok" | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/settings/skipped-artists/current": { | ||||||
|  |       "post": { | ||||||
|  |         "summary": "Add the current artist to the list of skipped artists", | ||||||
|  |         "tags": ["settings"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok" | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       }, | ||||||
|  |       "delete": { | ||||||
|  |         "summary": "Remove the current artist from the list of skipped artists", | ||||||
|  |         "tags": ["settings"], | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok" | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/image": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "Get current image", | ||||||
|  |         "tags": ["legacy"], | ||||||
|  |         "deprecated": true, | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Current image", | ||||||
|  |             "content": { | ||||||
|  |               "image/png": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "type": "string", | ||||||
|  |                   "format": "binary" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           }, | ||||||
|  |           "404": { | ||||||
|  |             "description": "Not found" | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/play": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "Play the current media", | ||||||
|  |         "tags": ["legacy"], | ||||||
|  |         "deprecated": true, | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Action performed", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/favorite/toggle": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "Add the current media to your favorites, or remove it if its already added to your favorites", | ||||||
|  |         "tags": ["legacy"], | ||||||
|  |         "deprecated": true, | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/pause": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "Pause the current media", | ||||||
|  |         "tags": ["legacy"], | ||||||
|  |         "deprecated": true, | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/next": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "Play the next song", | ||||||
|  |         "tags": ["legacy"], | ||||||
|  |         "deprecated": true, | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/previous": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "Play the previous song", | ||||||
|  |         "tags": ["legacy"], | ||||||
|  |         "deprecated": true, | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "/playpause": { | ||||||
|  |       "get": { | ||||||
|  |         "summary": "Toggle play/pause", | ||||||
|  |         "tags": ["legacy"], | ||||||
|  |         "deprecated": true, | ||||||
|  |         "responses": { | ||||||
|  |           "200": { | ||||||
|  |             "description": "Ok", | ||||||
|  |             "content": { | ||||||
|  |               "text/plain": { | ||||||
|  |                 "schema": { | ||||||
|  |                   "$ref": "#/components/schemas/OkResponse" | ||||||
|  |                 } | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           } | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     } | ||||||
|  |   }, | ||||||
|  |   "components": { | ||||||
|  |     "schemas": { | ||||||
|  |       "MediaInfo": { | ||||||
|  |         "type": "object", | ||||||
|  |         "properties": { | ||||||
|  |           "title": { | ||||||
|  |             "type": "string" | ||||||
|  |           }, | ||||||
|  |           "artists": { | ||||||
|  |             "type": "string" | ||||||
|  |           }, | ||||||
|  |           "album": { | ||||||
|  |             "type": "string" | ||||||
|  |           }, | ||||||
|  |           "icon": { | ||||||
|  |             "type": "string", | ||||||
|  |             "format": "uri" | ||||||
|  |           }, | ||||||
|  |           "playingFrom": { | ||||||
|  |             "type": "string" | ||||||
|  |           }, | ||||||
|  |           "status": { | ||||||
|  |             "type": "string" | ||||||
|  |           }, | ||||||
|  |           "url": { | ||||||
|  |             "type": "string", | ||||||
|  |             "format": "uri" | ||||||
|  |           }, | ||||||
|  |           "current": { | ||||||
|  |             "type": "string" | ||||||
|  |           }, | ||||||
|  |           "currentInSeconds": { | ||||||
|  |             "type": "integer" | ||||||
|  |           }, | ||||||
|  |           "duration": { | ||||||
|  |             "type": "string" | ||||||
|  |           }, | ||||||
|  |           "durationInSeconds": { | ||||||
|  |             "type": "integer" | ||||||
|  |           }, | ||||||
|  |           "image": { | ||||||
|  |             "type": "string", | ||||||
|  |             "format": "uri" | ||||||
|  |           }, | ||||||
|  |           "favorite": { | ||||||
|  |             "type": "boolean" | ||||||
|  |           }, | ||||||
|  |           "player": { | ||||||
|  |             "type": "object", | ||||||
|  |             "properties": { | ||||||
|  |               "status": { | ||||||
|  |                 "type": "string" | ||||||
|  |               }, | ||||||
|  |               "shuffle": { | ||||||
|  |                 "type": "boolean" | ||||||
|  |               }, | ||||||
|  |               "repeat": { | ||||||
|  |                 "type": "string" | ||||||
|  |               } | ||||||
|  |             } | ||||||
|  |           }, | ||||||
|  |           "artist": { | ||||||
|  |             "type": "string" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "example": { | ||||||
|  |           "title": "Sample Title", | ||||||
|  |           "artists": "Sample Artist", | ||||||
|  |           "album": "Sample Album", | ||||||
|  |           "icon": "/path/to/sample/icon.jpg", | ||||||
|  |           "playingFrom": "Sample Playlist", | ||||||
|  |           "status": "playing", | ||||||
|  |           "url": "https://tidal.com/browse/track/sample", | ||||||
|  |           "current": "1:23", | ||||||
|  |           "currentInSeconds": 83, | ||||||
|  |           "duration": "3:45", | ||||||
|  |           "durationInSeconds": 225, | ||||||
|  |           "image": "https://example.com/sample-image.jpg", | ||||||
|  |           "favorite": true, | ||||||
|  |           "player": { | ||||||
|  |             "status": "playing", | ||||||
|  |             "shuffle": true, | ||||||
|  |             "repeat": "one" | ||||||
|  |           }, | ||||||
|  |           "artist": "Sample Artist" | ||||||
|  |         } | ||||||
|  |       }, | ||||||
|  |       "OkResponse": { | ||||||
|  |         "type": "string", | ||||||
|  |         "example": "OK" | ||||||
|  |       }, | ||||||
|  |       "StringArray": { | ||||||
|  |         "type": "array", | ||||||
|  |         "items": { | ||||||
|  |           "type": "string" | ||||||
|  |         }, | ||||||
|  |         "example": ["Artist1", "Artist2"] | ||||||
|  |       } | ||||||
|  |     } | ||||||
|  |   }, | ||||||
|  |   "tags": [ | ||||||
|  |     { | ||||||
|  |       "name": "current", | ||||||
|  |       "description": "The current media info API" | ||||||
|  |     }, | ||||||
|  |     { | ||||||
|  |       "name": "player", | ||||||
|  |       "description": "The player control API" | ||||||
|  |     }, | ||||||
|  |     { | ||||||
|  |       "name": "settings", | ||||||
|  |       "description": "The settings management API" | ||||||
|  |     } | ||||||
|  |   ] | ||||||
|  | } | ||||||
| @@ -9,7 +9,6 @@ import { Logger } from "../logger"; | |||||||
|  */ |  */ | ||||||
| export function setDefaultFlags(app: App) { | export function setDefaultFlags(app: App) { | ||||||
|   setFlag(app, "disable-seccomp-filter-sandbox"); |   setFlag(app, "disable-seccomp-filter-sandbox"); | ||||||
|   setFlag(app, "disable-features", "MediaSessionService"); |  | ||||||
| } | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|   | |||||||
| @@ -48,6 +48,9 @@ export class ListenBrainz { | |||||||
|       } else { |       } else { | ||||||
|         // Fetches the oldData required for scrobbling and proceeds to construct a playing_now data payload for the Playing Now area |         // Fetches the oldData required for scrobbling and proceeds to construct a playing_now data payload for the Playing Now area | ||||||
|         const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData; |         const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData; | ||||||
|  |         const tidalUrl = | ||||||
|  |           settingsStore.get<string, string>(settings.advanced.tidalUrl) || | ||||||
|  |           "https://listen.tidal.com"; | ||||||
|         const playing_data = { |         const playing_data = { | ||||||
|           listen_type: "playing_now", |           listen_type: "playing_now", | ||||||
|           payload: [ |           payload: [ | ||||||
| @@ -95,7 +98,7 @@ export class ListenBrainz { | |||||||
|                     additional_info: { |                     additional_info: { | ||||||
|                       media_player: "Tidal Hi-Fi", |                       media_player: "Tidal Hi-Fi", | ||||||
|                       submission_client: "Tidal Hi-Fi", |                       submission_client: "Tidal Hi-Fi", | ||||||
|                       music_service: "listen.tidal.com", |                       music_service: tidalUrl, | ||||||
|                       duration: oldData.duration, |                       duration: oldData.duration, | ||||||
|                     }, |                     }, | ||||||
|                     artist_name: oldData.artists, |                     artist_name: oldData.artists, | ||||||
|   | |||||||
							
								
								
									
										10
									
								
								src/features/sharingService/sharingService.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,10 @@ | |||||||
|  | export class SharingService { | ||||||
|  |   /** | ||||||
|  |    * Retrieve the universal link given a regular track link | ||||||
|  |    * @param currentUrl | ||||||
|  |    * @returns | ||||||
|  |    */ | ||||||
|  |   public static getUniversalLink(currentUrl: string): string { | ||||||
|  |     return `${currentUrl}?u`; | ||||||
|  |   } | ||||||
|  | } | ||||||
| @@ -1,21 +0,0 @@ | |||||||
| import { ServiceLinks } from "./ServiceLinks"; |  | ||||||
|  |  | ||||||
| export interface Artist { |  | ||||||
|   type: string; |  | ||||||
|   id: number; |  | ||||||
|   path: string; |  | ||||||
|   name: string; |  | ||||||
|   sourceUrl: string; |  | ||||||
|   sourceCountry: string; |  | ||||||
|   url: string; |  | ||||||
|   image: string; |  | ||||||
|   createdAt: string; |  | ||||||
|   updatedAt: string; |  | ||||||
|   refreshedAt: string; |  | ||||||
|   serviceIds: { [key: string]: string }; |  | ||||||
|   orchardId: string; |  | ||||||
|   spotifyId: string; |  | ||||||
|   links: { [key: string]: ServiceLinks[] }; |  | ||||||
|   linksCountries: string[]; |  | ||||||
|   description: string; |  | ||||||
| } |  | ||||||
| @@ -1,4 +0,0 @@ | |||||||
| export interface ServiceLinks { |  | ||||||
|   link: string; |  | ||||||
|   countries: string[]; |  | ||||||
| } |  | ||||||
| @@ -1,27 +0,0 @@ | |||||||
| import { Artist } from "./Artist"; |  | ||||||
| import { ServiceLinks } from "./ServiceLinks"; |  | ||||||
|  |  | ||||||
| export interface WhippedResult { |  | ||||||
|   status: string; |  | ||||||
|   data: { |  | ||||||
|     item: { |  | ||||||
|       type: string; |  | ||||||
|       id: number; |  | ||||||
|       path: string; |  | ||||||
|       name: string; |  | ||||||
|       url: string; |  | ||||||
|       sourceUrl: string; |  | ||||||
|       sourceCountry: string; |  | ||||||
|       releaseDate: string; |  | ||||||
|       createdAt: string; |  | ||||||
|       updatedAt: string; |  | ||||||
|       refreshedAt: string; |  | ||||||
|       image: string; |  | ||||||
|       isrc: string; |  | ||||||
|       isExplicit: boolean; |  | ||||||
|       links: { [key: string]: ServiceLinks[] }; |  | ||||||
|       linksCountries: string[]; |  | ||||||
|       artists: Artist[]; |  | ||||||
|     }; |  | ||||||
|   }; |  | ||||||
| } |  | ||||||
| @@ -1,32 +0,0 @@ | |||||||
| import { WhippedResult } from "./models/whip"; |  | ||||||
| import axios from "axios"; |  | ||||||
|  |  | ||||||
| export class Songwhip { |  | ||||||
|   /** |  | ||||||
|    * Call the songwhip API and create a shareable songwhip page |  | ||||||
|    * @param currentUrl |  | ||||||
|    * @returns |  | ||||||
|    */ |  | ||||||
|   public static async whip(currentUrl: string): Promise<WhippedResult> { |  | ||||||
|     try { |  | ||||||
|       const response = await axios.post("https://songwhip.com/api/songwhip/create", { |  | ||||||
|         url: currentUrl, |  | ||||||
|         // doesn't actually matter.. returns everything the same way anyway |  | ||||||
|         country: "NL", |  | ||||||
|       }); |  | ||||||
|  |  | ||||||
|       return response.data; |  | ||||||
|     } catch (error) { |  | ||||||
|       console.log(JSON.stringify(error)); |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   /** |  | ||||||
|    * Transform a songwhip response into a shareable url |  | ||||||
|    * @param response |  | ||||||
|    * @returns |  | ||||||
|    */ |  | ||||||
|   public static getWhipUrl(response: WhippedResult) { |  | ||||||
|     return `https://songwhip.com${response.data.item.url}`; |  | ||||||
|   } |  | ||||||
| } |  | ||||||
							
								
								
									
										14
									
								
								src/features/time/parse.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,14 @@ | |||||||
|  | /** | ||||||
|  |  * Convert a HH:MM:SS string (or variants such as MM:SS or SS) to plain seconds | ||||||
|  |  * @param duration in HH:MM:SS format | ||||||
|  |  * @returns number of seconds in duration | ||||||
|  |  */ | ||||||
|  | export const convertDurationToSeconds = (duration: string) => { | ||||||
|  |   return duration | ||||||
|  |     .split(":") | ||||||
|  |     .reverse() | ||||||
|  |     .map((val) => Number(val)) | ||||||
|  |     .reduce((previous, current, index) => { | ||||||
|  |       return index === 0 ? current : previous + current * Math.pow(60, index); | ||||||
|  |     }, 0); | ||||||
|  | }; | ||||||
							
								
								
									
										106
									
								
								src/main.ts
									
									
									
									
									
								
							
							
						
						| @@ -1,28 +1,19 @@ | |||||||
| import { enable, initialize } from "@electron/remote/main"; | import { enable, initialize } from "@electron/remote/main"; | ||||||
| import { | import { BrowserWindow, app, components, ipcMain, session } from "electron"; | ||||||
|   app, |  | ||||||
|   BrowserWindow, |  | ||||||
|   components, |  | ||||||
|   globalShortcut, |  | ||||||
|   ipcMain, |  | ||||||
|   protocol, |  | ||||||
|   session, |  | ||||||
| } from "electron"; |  | ||||||
| import path from "path"; | import path from "path"; | ||||||
| import { globalEvents } from "./constants/globalEvents"; | import { globalEvents } from "./constants/globalEvents"; | ||||||
| import { mediaKeys } from "./constants/mediaKeys"; |  | ||||||
| import { settings } from "./constants/settings"; | import { settings } from "./constants/settings"; | ||||||
|  | import { startApi } from "./features/api"; | ||||||
| import { setDefaultFlags, setManagedFlagsFromSettings } from "./features/flags/flags"; | import { setDefaultFlags, setManagedFlagsFromSettings } from "./features/flags/flags"; | ||||||
| import { | import { | ||||||
|   acquireInhibitorIfInactive, |   acquireInhibitorIfInactive, | ||||||
|   releaseInhibitorIfActive, |   releaseInhibitorIfActive, | ||||||
| } from "./features/idleInhibitor/idleInhibitor"; | } from "./features/idleInhibitor/idleInhibitor"; | ||||||
| import { Logger } from "./features/logger"; | import { Logger } from "./features/logger"; | ||||||
| import { Songwhip } from "./features/songwhip/songwhip"; | import { SharingService } from "./features/sharingService/sharingService"; | ||||||
| import { MediaInfo } from "./models/mediaInfo"; | import { MediaInfo } from "./models/mediaInfo"; | ||||||
| import { MediaStatus } from "./models/mediaStatus"; | import { MediaStatus } from "./models/mediaStatus"; | ||||||
| import { initRPC, rpc, unRPC } from "./scripts/discord"; | import { initRPC, rpc, unRPC } from "./scripts/discord"; | ||||||
| import { startExpress } from "./scripts/express"; |  | ||||||
| import { updateMediaInfo } from "./scripts/mediaInfo"; | import { updateMediaInfo } from "./scripts/mediaInfo"; | ||||||
| import { addMenu } from "./scripts/menu"; | import { addMenu } from "./scripts/menu"; | ||||||
| import { | import { | ||||||
| @@ -33,10 +24,8 @@ import { | |||||||
|   showSettingsWindow, |   showSettingsWindow, | ||||||
| } from "./scripts/settings"; | } from "./scripts/settings"; | ||||||
| import { addTray, refreshTray } from "./scripts/tray"; | import { addTray, refreshTray } from "./scripts/tray"; | ||||||
| const tidalUrl = "https://listen.tidal.com"; |  | ||||||
| let mainInhibitorId = -1; | let mainInhibitorId = -1; | ||||||
|  |  | ||||||
| initialize(); |  | ||||||
| let mainWindow: BrowserWindow; | let mainWindow: BrowserWindow; | ||||||
| const icon = path.join(__dirname, "../assets/icon.png"); | const icon = path.join(__dirname, "../assets/icon.png"); | ||||||
| const PROTOCOL_PREFIX = "tidal"; | const PROTOCOL_PREFIX = "tidal"; | ||||||
| @@ -49,6 +38,9 @@ const windowPreferences = { | |||||||
| setDefaultFlags(app); | setDefaultFlags(app); | ||||||
| setManagedFlagsFromSettings(app); | setManagedFlagsFromSettings(app); | ||||||
|  |  | ||||||
|  | const tidalUrl = | ||||||
|  |   settingsStore.get<string, string>(settings.advanced.tidalUrl) || "https://listen.tidal.com"; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Update the menuBarVisibility according to the store value |  * Update the menuBarVisibility according to the store value | ||||||
|  * |  * | ||||||
| @@ -61,20 +53,31 @@ function syncMenuBarWithStore() { | |||||||
| } | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Determine whether the current window is the main window |  * @returns true/false based on whether the current window is the main window | ||||||
|  * if singleInstance is requested. |  | ||||||
|  * If singleInstance isn't requested simply return true |  | ||||||
|  * @returns true if singInstance is not requested, otherwise true/false based on whether the current window is the main window |  | ||||||
|  */ |  */ | ||||||
| function isMainInstanceOrMultipleInstancesAllowed() { | function isMainInstance() { | ||||||
|   if (settingsStore.get(settings.singleInstance)) { |   return app.requestSingleInstanceLock(); | ||||||
|     const gotTheLock = app.requestSingleInstanceLock(); | } | ||||||
|  |  | ||||||
|     if (!gotTheLock) { | /** | ||||||
|       return false; |  * @returns true/false based on whether multiple instances are allowed | ||||||
|     } |  */ | ||||||
|  | function isMultipleInstancesAllowed() { | ||||||
|  |   return !settingsStore.get(settings.singleInstance); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @param args the arguments passed to the app | ||||||
|  |  * @returns the custom protocol url if it exists, otherwise null | ||||||
|  |  */ | ||||||
|  | function getCustomProtocolUrl(args: string[]) { | ||||||
|  |   const customProtocolArg = args.find((arg) => arg.startsWith(PROTOCOL_PREFIX)); | ||||||
|  |  | ||||||
|  |   if (!customProtocolArg) { | ||||||
|  |     return null; | ||||||
|   } |   } | ||||||
|   return true; |  | ||||||
|  |   return tidalUrl + "/" + customProtocolArg.substring(PROTOCOL_PREFIX.length + 3); | ||||||
| } | } | ||||||
|  |  | ||||||
| function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) { | function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) { | ||||||
| @@ -94,12 +97,21 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) { | |||||||
|       }, |       }, | ||||||
|     }, |     }, | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   enable(mainWindow.webContents); |   enable(mainWindow.webContents); | ||||||
|   registerHttpProtocols(); |   registerHttpProtocols(); | ||||||
|   syncMenuBarWithStore(); |   syncMenuBarWithStore(); | ||||||
|  |  | ||||||
|   // load the Tidal website |   // find the custom protocol argument | ||||||
|   mainWindow.loadURL(tidalUrl); |   const customProtocolUrl = getCustomProtocolUrl(process.argv); | ||||||
|  |  | ||||||
|  |   if (customProtocolUrl) { | ||||||
|  |     // load the url received from the custom protocol | ||||||
|  |     mainWindow.loadURL(customProtocolUrl); | ||||||
|  |   } else { | ||||||
|  |     // load the Tidal website | ||||||
|  |     mainWindow.loadURL(tidalUrl); | ||||||
|  |   } | ||||||
|  |  | ||||||
|   if (settingsStore.get(settings.disableBackgroundThrottle)) { |   if (settingsStore.get(settings.disableBackgroundThrottle)) { | ||||||
|     // prevent setInterval lag |     // prevent setInterval lag | ||||||
| @@ -114,6 +126,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) { | |||||||
|     } |     } | ||||||
|     return false; |     return false; | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   // Emitted when the window is closed. |   // Emitted when the window is closed. | ||||||
|   mainWindow.on("closed", function () { |   mainWindow.on("closed", function () { | ||||||
|     releaseInhibitorIfActive(mainInhibitorId); |     releaseInhibitorIfActive(mainInhibitorId); | ||||||
| @@ -139,28 +152,34 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) { | |||||||
| } | } | ||||||
|  |  | ||||||
| function registerHttpProtocols() { | function registerHttpProtocols() { | ||||||
|   protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request) => { |  | ||||||
|     mainWindow.loadURL(`${tidalUrl}/${request.url.substring(PROTOCOL_PREFIX.length + 3)}`); |  | ||||||
|   }); |  | ||||||
|   if (!app.isDefaultProtocolClient(PROTOCOL_PREFIX)) { |   if (!app.isDefaultProtocolClient(PROTOCOL_PREFIX)) { | ||||||
|     app.setAsDefaultProtocolClient(PROTOCOL_PREFIX); |     app.setAsDefaultProtocolClient(PROTOCOL_PREFIX); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| function addGlobalShortcuts() { |  | ||||||
|   Object.keys(mediaKeys).forEach((key) => { |  | ||||||
|     globalShortcut.register(`${key}`, () => { |  | ||||||
|       mainWindow.webContents.send("globalEvent", `${(mediaKeys as any)[key]}`); |  | ||||||
|     }); |  | ||||||
|   }); |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // This method will be called when Electron has finished | // This method will be called when Electron has finished | ||||||
| // initialization and is ready to create browser windows. | // initialization and is ready to create browser windows. | ||||||
| // Some APIs can only be used after this event occurs. | // Some APIs can only be used after this event occurs. | ||||||
| app.on("ready", async () => { | app.on("ready", async () => { | ||||||
|   if (isMainInstanceOrMultipleInstancesAllowed()) { |   // check if the app is the main instance and multiple instances are not allowed | ||||||
|  |   if (isMainInstance() && !isMultipleInstancesAllowed()) { | ||||||
|  |     app.on("second-instance", (_, commandLine) => { | ||||||
|  |       const customProtocolUrl = getCustomProtocolUrl(commandLine); | ||||||
|  |  | ||||||
|  |       if (customProtocolUrl) { | ||||||
|  |         mainWindow.loadURL(customProtocolUrl); | ||||||
|  |       } | ||||||
|  |  | ||||||
|  |       if (mainWindow) { | ||||||
|  |         if (mainWindow.isMinimized()) mainWindow.restore(); | ||||||
|  |         mainWindow.focus(); | ||||||
|  |       } | ||||||
|  |     }); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   if (isMainInstance() || isMultipleInstancesAllowed()) { | ||||||
|     await components.whenReady(); |     await components.whenReady(); | ||||||
|  |     initialize(); | ||||||
|  |  | ||||||
|     // Adblock |     // Adblock | ||||||
|     if (settingsStore.get(settings.adBlock)) { |     if (settingsStore.get(settings.adBlock)) { | ||||||
| @@ -171,15 +190,16 @@ app.on("ready", async () => { | |||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     Logger.log("components ready:", components.status()); | ||||||
|  |  | ||||||
|     createWindow(); |     createWindow(); | ||||||
|     addMenu(mainWindow); |     addMenu(mainWindow); | ||||||
|     createSettingsWindow(); |     createSettingsWindow(); | ||||||
|     addGlobalShortcuts(); |  | ||||||
|     if (settingsStore.get(settings.trayIcon)) { |     if (settingsStore.get(settings.trayIcon)) { | ||||||
|       addTray(mainWindow, { icon }); |       addTray(mainWindow, { icon }); | ||||||
|       refreshTray(mainWindow); |       refreshTray(mainWindow); | ||||||
|     } |     } | ||||||
|     settingsStore.get(settings.api) && startExpress(mainWindow); |     settingsStore.get(settings.api) && startApi(mainWindow); | ||||||
|     settingsStore.get(settings.enableDiscord) && initRPC(); |     settingsStore.get(settings.enableDiscord) && initRPC(); | ||||||
|   } else { |   } else { | ||||||
|     app.quit(); |     app.quit(); | ||||||
| @@ -234,8 +254,8 @@ ipcMain.on(globalEvents.error, (event) => { | |||||||
|   console.log(event); |   console.log(event); | ||||||
| }); | }); | ||||||
|  |  | ||||||
| ipcMain.handle(globalEvents.whip, async (event, url) => { | ipcMain.handle(globalEvents.getUniversalLink, async (event, url) => { | ||||||
|   return Songwhip.whip(url); |   return SharingService.getUniversalLink(url); | ||||||
| }); | }); | ||||||
|  |  | ||||||
| Logger.watch(ipcMain); | Logger.watch(ipcMain); | ||||||
|   | |||||||
| @@ -1,3 +1,4 @@ | |||||||
|  | import { MediaPlayerInfo } from "./mediaPlayerInfo"; | ||||||
| import { MediaStatus } from "./mediaStatus"; | import { MediaStatus } from "./mediaStatus"; | ||||||
|  |  | ||||||
| export interface MediaInfo { | export interface MediaInfo { | ||||||
| @@ -7,8 +8,12 @@ export interface MediaInfo { | |||||||
|   icon: string; |   icon: string; | ||||||
|   status: MediaStatus; |   status: MediaStatus; | ||||||
|   url: string; |   url: string; | ||||||
|  |   playingFrom: string; | ||||||
|   current: string; |   current: string; | ||||||
|  |   currentInSeconds?: number; | ||||||
|   duration: string; |   duration: string; | ||||||
|  |   durationInSeconds?: number; | ||||||
|   image: string; |   image: string; | ||||||
|   favorite: boolean; |   favorite: boolean; | ||||||
|  |   player?: MediaPlayerInfo; | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										8
									
								
								src/models/mediaPlayerInfo.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,8 @@ | |||||||
|  | import { RepeatState } from "./repeatState"; | ||||||
|  | import { MediaStatus } from "./mediaStatus"; | ||||||
|  |  | ||||||
|  | export interface MediaPlayerInfo { | ||||||
|  |   status: MediaStatus; | ||||||
|  |   shuffle: boolean; | ||||||
|  |   repeat: RepeatState; | ||||||
|  | } | ||||||
| @@ -1,13 +0,0 @@ | |||||||
| export interface Options { |  | ||||||
|   title: string; |  | ||||||
|   artists: string; |  | ||||||
|   album: string; |  | ||||||
|   status: string; |  | ||||||
|   url: string; |  | ||||||
|   current: string; |  | ||||||
|   duration: string; |  | ||||||
|   "app-name": string; |  | ||||||
|   image: string; |  | ||||||
|   icon: string; |  | ||||||
|   favorite: boolean; |  | ||||||
| } |  | ||||||
							
								
								
									
										5
									
								
								src/models/repeatState.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,5 @@ | |||||||
|  | export enum RepeatState { | ||||||
|  |   off = "off", | ||||||
|  |   all = "all", | ||||||
|  |   single = "single", | ||||||
|  | } | ||||||
| @@ -24,17 +24,19 @@ const switchesWithSettings = { | |||||||
|     switch: "discord_show_song", |     switch: "discord_show_song", | ||||||
|     classToHide: "discord_show_song_options", |     classToHide: "discord_show_song_options", | ||||||
|     settingsKey: settings.discord.showSong, |     settingsKey: settings.discord.showSong, | ||||||
|   } |   }, | ||||||
| }; | }; | ||||||
|  |  | ||||||
| let adBlock: HTMLInputElement, | let adBlock: HTMLInputElement, | ||||||
|   api: HTMLInputElement, |   api: HTMLInputElement, | ||||||
|  |   channel: HTMLSelectElement, | ||||||
|   customCSS: HTMLInputElement, |   customCSS: HTMLInputElement, | ||||||
|   disableBackgroundThrottle: HTMLInputElement, |   disableBackgroundThrottle: HTMLInputElement, | ||||||
|   disableHardwareMediaKeys: HTMLInputElement, |   disableHardwareMediaKeys: HTMLInputElement, | ||||||
|   enableCustomHotkeys: HTMLInputElement, |   enableCustomHotkeys: HTMLInputElement, | ||||||
|   enableDiscord: HTMLInputElement, |   enableDiscord: HTMLInputElement, | ||||||
|   gpuRasterization: HTMLInputElement, |   gpuRasterization: HTMLInputElement, | ||||||
|  |   hostname: HTMLInputElement, | ||||||
|   menuBar: HTMLInputElement, |   menuBar: HTMLInputElement, | ||||||
|   minimizeOnClose: HTMLInputElement, |   minimizeOnClose: HTMLInputElement, | ||||||
|   mpris: HTMLInputElement, |   mpris: HTMLInputElement, | ||||||
| @@ -44,6 +46,7 @@ let adBlock: HTMLInputElement, | |||||||
|   singleInstance: HTMLInputElement, |   singleInstance: HTMLInputElement, | ||||||
|   skipArtists: HTMLInputElement, |   skipArtists: HTMLInputElement, | ||||||
|   skippedArtists: HTMLInputElement, |   skippedArtists: HTMLInputElement, | ||||||
|  |   staticWindowTitle: HTMLInputElement, | ||||||
|   theme: HTMLSelectElement, |   theme: HTMLSelectElement, | ||||||
|   trayIcon: HTMLInputElement, |   trayIcon: HTMLInputElement, | ||||||
|   updateFrequency: HTMLInputElement, |   updateFrequency: HTMLInputElement, | ||||||
| @@ -56,6 +59,7 @@ let adBlock: HTMLInputElement, | |||||||
|   discord_include_timestamps: HTMLInputElement, |   discord_include_timestamps: HTMLInputElement, | ||||||
|   discord_button_text: HTMLInputElement, |   discord_button_text: HTMLInputElement, | ||||||
|   discord_show_song: HTMLInputElement, |   discord_show_song: HTMLInputElement, | ||||||
|  |   discord_show_idle: HTMLInputElement, | ||||||
|   discord_idle_text: HTMLInputElement, |   discord_idle_text: HTMLInputElement, | ||||||
|   discord_using_text: HTMLInputElement; |   discord_using_text: HTMLInputElement; | ||||||
|  |  | ||||||
| @@ -120,6 +124,7 @@ function refreshSettings() { | |||||||
|   try { |   try { | ||||||
|     adBlock.checked = settingsStore.get(settings.adBlock); |     adBlock.checked = settingsStore.get(settings.adBlock); | ||||||
|     api.checked = settingsStore.get(settings.api); |     api.checked = settingsStore.get(settings.api); | ||||||
|  |     channel.value = settingsStore.get(settings.advanced.tidalUrl); | ||||||
|     customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n"); |     customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n"); | ||||||
|     disableBackgroundThrottle.checked = settingsStore.get(settings.disableBackgroundThrottle); |     disableBackgroundThrottle.checked = settingsStore.get(settings.disableBackgroundThrottle); | ||||||
|     disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys); |     disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys); | ||||||
| @@ -127,6 +132,7 @@ function refreshSettings() { | |||||||
|     enableDiscord.checked = settingsStore.get(settings.enableDiscord); |     enableDiscord.checked = settingsStore.get(settings.enableDiscord); | ||||||
|     enableWaylandSupport.checked = settingsStore.get(settings.flags.enableWaylandSupport); |     enableWaylandSupport.checked = settingsStore.get(settings.flags.enableWaylandSupport); | ||||||
|     gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization); |     gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization); | ||||||
|  |     hostname.value = settingsStore.get(settings.apiSettings.hostname); | ||||||
|     menuBar.checked = settingsStore.get(settings.menuBar); |     menuBar.checked = settingsStore.get(settings.menuBar); | ||||||
|     minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose); |     minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose); | ||||||
|     mpris.checked = settingsStore.get(settings.mpris); |     mpris.checked = settingsStore.get(settings.mpris); | ||||||
| @@ -135,8 +141,9 @@ function refreshSettings() { | |||||||
|     port.value = settingsStore.get(settings.apiSettings.port); |     port.value = settingsStore.get(settings.apiSettings.port); | ||||||
|     singleInstance.checked = settingsStore.get(settings.singleInstance); |     singleInstance.checked = settingsStore.get(settings.singleInstance); | ||||||
|     skipArtists.checked = settingsStore.get(settings.skipArtists); |     skipArtists.checked = settingsStore.get(settings.skipArtists); | ||||||
|     theme.value = settingsStore.get(settings.theme); |  | ||||||
|     skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n"); |     skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n"); | ||||||
|  |     staticWindowTitle.checked = settingsStore.get(settings.staticWindowTitle); | ||||||
|  |     theme.value = settingsStore.get(settings.theme); | ||||||
|     trayIcon.checked = settingsStore.get(settings.trayIcon); |     trayIcon.checked = settingsStore.get(settings.trayIcon); | ||||||
|     updateFrequency.value = settingsStore.get(settings.updateFrequency); |     updateFrequency.value = settingsStore.get(settings.updateFrequency); | ||||||
|     enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled); |     enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled); | ||||||
| @@ -147,6 +154,7 @@ function refreshSettings() { | |||||||
|     discord_include_timestamps.checked = settingsStore.get(settings.discord.includeTimestamps); |     discord_include_timestamps.checked = settingsStore.get(settings.discord.includeTimestamps); | ||||||
|     discord_button_text.value = settingsStore.get(settings.discord.buttonText); |     discord_button_text.value = settingsStore.get(settings.discord.buttonText); | ||||||
|     discord_show_song.checked = settingsStore.get(settings.discord.showSong); |     discord_show_song.checked = settingsStore.get(settings.discord.showSong); | ||||||
|  |     discord_show_idle.checked = settingsStore.get(settings.discord.showIdle); | ||||||
|     discord_idle_text.value = settingsStore.get(settings.discord.idleText); |     discord_idle_text.value = settingsStore.get(settings.discord.idleText); | ||||||
|     discord_using_text.value = settingsStore.get(settings.discord.usingText); |     discord_using_text.value = settingsStore.get(settings.discord.usingText); | ||||||
|  |  | ||||||
| @@ -236,6 +244,7 @@ window.addEventListener("DOMContentLoaded", () => { | |||||||
|  |  | ||||||
|   adBlock = get("adBlock"); |   adBlock = get("adBlock"); | ||||||
|   api = get("apiCheckbox"); |   api = get("apiCheckbox"); | ||||||
|  |   channel = get<HTMLSelectElement>("channel"); | ||||||
|   customCSS = get("customCSS"); |   customCSS = get("customCSS"); | ||||||
|   disableBackgroundThrottle = get("disableBackgroundThrottle"); |   disableBackgroundThrottle = get("disableBackgroundThrottle"); | ||||||
|   disableHardwareMediaKeys = get("disableHardwareMediaKeys"); |   disableHardwareMediaKeys = get("disableHardwareMediaKeys"); | ||||||
| @@ -243,6 +252,7 @@ window.addEventListener("DOMContentLoaded", () => { | |||||||
|   enableDiscord = get("enableDiscord"); |   enableDiscord = get("enableDiscord"); | ||||||
|   enableWaylandSupport = get("enableWaylandSupport"); |   enableWaylandSupport = get("enableWaylandSupport"); | ||||||
|   gpuRasterization = get("gpuRasterization"); |   gpuRasterization = get("gpuRasterization"); | ||||||
|  |   hostname = get("hostname"); | ||||||
|   menuBar = get("menuBar"); |   menuBar = get("menuBar"); | ||||||
|   minimizeOnClose = get("minimizeOnClose"); |   minimizeOnClose = get("minimizeOnClose"); | ||||||
|   mpris = get("mprisCheckbox"); |   mpris = get("mprisCheckbox"); | ||||||
| @@ -253,6 +263,7 @@ window.addEventListener("DOMContentLoaded", () => { | |||||||
|   trayIcon = get("trayIcon"); |   trayIcon = get("trayIcon"); | ||||||
|   skipArtists = get("skipArtists"); |   skipArtists = get("skipArtists"); | ||||||
|   skippedArtists = get("skippedArtists"); |   skippedArtists = get("skippedArtists"); | ||||||
|  |   staticWindowTitle = get("staticWindowTitle"); | ||||||
|   singleInstance = get("singleInstance"); |   singleInstance = get("singleInstance"); | ||||||
|   updateFrequency = get("updateFrequency"); |   updateFrequency = get("updateFrequency"); | ||||||
|   enableListenBrainz = get("enableListenBrainz"); |   enableListenBrainz = get("enableListenBrainz"); | ||||||
| @@ -263,12 +274,14 @@ window.addEventListener("DOMContentLoaded", () => { | |||||||
|   listenbrainz_delay = get("listenbrainz_delay"); |   listenbrainz_delay = get("listenbrainz_delay"); | ||||||
|   discord_button_text = get("discord_button_text"); |   discord_button_text = get("discord_button_text"); | ||||||
|   discord_show_song = get("discord_show_song"); |   discord_show_song = get("discord_show_song"); | ||||||
|  |   discord_show_idle = get("discord_show_idle"); | ||||||
|   discord_using_text = get("discord_using_text"); |   discord_using_text = get("discord_using_text"); | ||||||
|   discord_idle_text = get("discord_idle_text") |   discord_idle_text = get("discord_idle_text"); | ||||||
|  |  | ||||||
|   refreshSettings(); |   refreshSettings(); | ||||||
|   addInputListener(adBlock, settings.adBlock); |   addInputListener(adBlock, settings.adBlock); | ||||||
|   addInputListener(api, settings.api); |   addInputListener(api, settings.api); | ||||||
|  |   addSelectListener(channel, settings.advanced.tidalUrl); | ||||||
|   addTextAreaListener(customCSS, settings.customCSS); |   addTextAreaListener(customCSS, settings.customCSS); | ||||||
|   addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle); |   addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle); | ||||||
|   addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys); |   addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys); | ||||||
| @@ -276,6 +289,7 @@ window.addEventListener("DOMContentLoaded", () => { | |||||||
|   addInputListener(enableDiscord, settings.enableDiscord, switchesWithSettings.discord); |   addInputListener(enableDiscord, settings.enableDiscord, switchesWithSettings.discord); | ||||||
|   addInputListener(enableWaylandSupport, settings.flags.enableWaylandSupport); |   addInputListener(enableWaylandSupport, settings.flags.enableWaylandSupport); | ||||||
|   addInputListener(gpuRasterization, settings.flags.gpuRasterization); |   addInputListener(gpuRasterization, settings.flags.gpuRasterization); | ||||||
|  |   addInputListener(hostname, settings.apiSettings.hostname); | ||||||
|   addInputListener(menuBar, settings.menuBar); |   addInputListener(menuBar, settings.menuBar); | ||||||
|   addInputListener(minimizeOnClose, settings.minimizeOnClose); |   addInputListener(minimizeOnClose, settings.minimizeOnClose); | ||||||
|   addInputListener(mpris, settings.mpris); |   addInputListener(mpris, settings.mpris); | ||||||
| @@ -284,6 +298,7 @@ window.addEventListener("DOMContentLoaded", () => { | |||||||
|   addInputListener(port, settings.apiSettings.port); |   addInputListener(port, settings.apiSettings.port); | ||||||
|   addInputListener(skipArtists, settings.skipArtists); |   addInputListener(skipArtists, settings.skipArtists); | ||||||
|   addTextAreaListener(skippedArtists, settings.skippedArtists); |   addTextAreaListener(skippedArtists, settings.skippedArtists); | ||||||
|  |   addInputListener(staticWindowTitle, settings.staticWindowTitle); | ||||||
|   addInputListener(singleInstance, settings.singleInstance); |   addInputListener(singleInstance, settings.singleInstance); | ||||||
|   addSelectListener(theme, settings.theme); |   addSelectListener(theme, settings.theme); | ||||||
|   addInputListener(trayIcon, settings.trayIcon); |   addInputListener(trayIcon, settings.trayIcon); | ||||||
| @@ -299,7 +314,12 @@ window.addEventListener("DOMContentLoaded", () => { | |||||||
|   addInputListener(discord_details_prefix, settings.discord.detailsPrefix); |   addInputListener(discord_details_prefix, settings.discord.detailsPrefix); | ||||||
|   addInputListener(discord_include_timestamps, settings.discord.includeTimestamps); |   addInputListener(discord_include_timestamps, settings.discord.includeTimestamps); | ||||||
|   addInputListener(discord_button_text, settings.discord.buttonText); |   addInputListener(discord_button_text, settings.discord.buttonText); | ||||||
|   addInputListener(discord_show_song, settings.discord.showSong, switchesWithSettings.discord_show_song); |   addInputListener( | ||||||
|  |     discord_show_song, | ||||||
|  |     settings.discord.showSong, | ||||||
|  |     switchesWithSettings.discord_show_song | ||||||
|  |   ); | ||||||
|  |   addInputListener(discord_show_idle, settings.discord.showIdle); | ||||||
|   addInputListener(discord_idle_text, settings.discord.idleText); |   addInputListener(discord_idle_text, settings.discord.idleText); | ||||||
|   addInputListener(discord_using_text, settings.discord.usingText); |   addInputListener(discord_using_text, settings.discord.usingText); | ||||||
| }); | }); | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ | |||||||
|   <meta name="viewport" content="width=device-width, initial-scale=1.0" /> |   <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||||||
|   <meta http-equiv="X-UA-Compatible" content="ie=edge" /> |   <meta http-equiv="X-UA-Compatible" content="ie=edge" /> | ||||||
|   <link rel="stylesheet" href="./settings.css" /> |   <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.1/css/font-awesome.min.css"> | ||||||
| </head> | </head> | ||||||
|  |  | ||||||
| <body class="settings-window"> | <body class="settings-window"> | ||||||
| @@ -49,7 +49,7 @@ | |||||||
|             <div class="group__option"> |             <div class="group__option"> | ||||||
|               <div class="group__description"> |               <div class="group__description"> | ||||||
|                 <h4>Notifications</h4> |                 <h4>Notifications</h4> | ||||||
|                 <p>Show a notification when a new song starts.</p> |                 <p>Show a notification when new media starts.</p> | ||||||
|               </div> |               </div> | ||||||
|               <label class="switch"> |               <label class="switch"> | ||||||
|                 <input id="notifications" type="checkbox" /> |                 <input id="notifications" type="checkbox" /> | ||||||
| @@ -106,6 +106,16 @@ | |||||||
|                 <span class="switch__slider"></span> |                 <span class="switch__slider"></span> | ||||||
|               </label> |               </label> | ||||||
|             </div> |             </div> | ||||||
|  |             <div class="group__option"> | ||||||
|  |               <div class="group__description"> | ||||||
|  |                 <h4>Static Window Title</h4> | ||||||
|  |                 <p>Makes the window title "TIDAL Hi-Fi" instead of changing to the currently playing song.</p> | ||||||
|  |               </div> | ||||||
|  |               <label class="switch"> | ||||||
|  |                 <input id="staticWindowTitle" type="checkbox" /> | ||||||
|  |                 <span class="switch__slider"></span> | ||||||
|  |               </label> | ||||||
|  |             </div> | ||||||
|             <div class="group__option"> |             <div class="group__option"> | ||||||
|               <div class="group__description"> |               <div class="group__description"> | ||||||
|                 <h4>Minimize on Close</h4> |                 <h4>Minimize on Close</h4> | ||||||
| @@ -147,7 +157,7 @@ | |||||||
|             <p class="group__title">API</p> |             <p class="group__title">API</p> | ||||||
|             <div class="group__description"> |             <div class="group__description"> | ||||||
|               <p> |               <p> | ||||||
|                 TIDAL Hi-Fi has a built-in web API to allow users to get current song information. |                 TIDAL Hi-Fi has a built-in web API to allow users to get current media information. | ||||||
|                 You can optionally enable playback control as well. |                 You can optionally enable playback control as well. | ||||||
|               </p> |               </p> | ||||||
|             </div> |             </div> | ||||||
| @@ -167,6 +177,16 @@ | |||||||
|                 <input id="port" type="number" class="text-input" name="port" /> |                 <input id="port" type="number" class="text-input" name="port" /> | ||||||
|               </div> |               </div> | ||||||
|             </div> |             </div> | ||||||
|  |             <div class="group__option"> | ||||||
|  |               <div class="group__description"> | ||||||
|  |                 <h4>API hostname</h4> | ||||||
|  |                 <p>By default (127.0.0.1) only local apps can interface with the API. <br /> | ||||||
|  |                   Change to 0.0.0.0 to allow <strong>anyone</strong> to interact with it. <br /> | ||||||
|  |                   Other options are available | ||||||
|  |                 </p> | ||||||
|  |                 <input id="hostname" type="text" class="text-input" name="hostname" /> | ||||||
|  |               </div> | ||||||
|  |             </div> | ||||||
|             <div class="group__option"> |             <div class="group__option"> | ||||||
|               <div class="group__description"> |               <div class="group__description"> | ||||||
|                 <h4>Playback control</h4> |                 <h4>Playback control</h4> | ||||||
| @@ -217,6 +237,17 @@ | |||||||
|             </div> |             </div> | ||||||
|             <div id="discord_options"> |             <div id="discord_options"> | ||||||
|  |  | ||||||
|  |               <div class="group__option" class="hidden"> | ||||||
|  |                 <div class="group__description"> | ||||||
|  |                   <h4>Show Idle Text</h4> | ||||||
|  |                   <p>Should the idle text be shown when idle?</p> | ||||||
|  |                 </div> | ||||||
|  |                 <label class="switch"> | ||||||
|  |                   <input id="discord_show_idle" type="checkbox" /> | ||||||
|  |                   <span class="switch__slider"></span> | ||||||
|  |                 </label> | ||||||
|  |               </div> | ||||||
|  |  | ||||||
|               <div class="group__option" class="hidden"> |               <div class="group__option" class="hidden"> | ||||||
|                 <div class="group__description"> |                 <div class="group__description"> | ||||||
|                   <h4>Idle Text</h4> |                   <h4>Idle Text</h4> | ||||||
| @@ -235,8 +266,8 @@ | |||||||
|  |  | ||||||
|               <div class="group__option" class="hidden"> |               <div class="group__option" class="hidden"> | ||||||
|                 <div class="group__description"> |                 <div class="group__description"> | ||||||
|                   <h4>Show song</h4> |                   <h4>Show media</h4> | ||||||
|                   <p>Show the current song in the Discord client</p> |                   <p>Show the current media in the Discord client</p> | ||||||
|                 </div> |                 </div> | ||||||
|                 <label class="switch"> |                 <label class="switch"> | ||||||
|                   <input id="discord_show_song" type="checkbox" /> |                   <input id="discord_show_song" type="checkbox" /> | ||||||
| @@ -268,7 +299,7 @@ | |||||||
|                 <div class="group__option"> |                 <div class="group__option"> | ||||||
|                   <div class="group__description"> |                   <div class="group__description"> | ||||||
|                     <h4>Button text</h4> |                     <h4>Button text</h4> | ||||||
|                     <p>Text to display on the button below the song information.</p> |                     <p>Text to display on the button below the media information.</p> | ||||||
|                     <input id="discord_button_text" type="text" class="text-input" name="discord_button_text" /> |                     <input id="discord_button_text" type="text" class="text-input" name="discord_button_text" /> | ||||||
|                   </div> |                   </div> | ||||||
|                 </div> |                 </div> | ||||||
| @@ -306,7 +337,7 @@ | |||||||
|             </div> |             </div> | ||||||
|             <div class="group__description"> |             <div class="group__description"> | ||||||
|               <h4>ScrobbleDelay</h4> |               <h4>ScrobbleDelay</h4> | ||||||
|               <p>The delay (in ms) to send a song to ListenBrainz. Prevents spamming the API when you fast forward |               <p>The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when you fast forward | ||||||
|                 immediately</p> |                 immediately</p> | ||||||
|               <input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" /> |               <input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" /> | ||||||
|             </div> |             </div> | ||||||
| @@ -328,6 +359,20 @@ | |||||||
|                 <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" /> |                 <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" /> | ||||||
|               </div> |               </div> | ||||||
|             </div> |             </div> | ||||||
|  |  | ||||||
|  |             <div class="group__option"> | ||||||
|  |               <div class="group__description"> | ||||||
|  |                 <h4>Tidal channel / URL</h4> | ||||||
|  |                 <p> | ||||||
|  |                   Which URL Tidal Hi-Fi should use. | ||||||
|  |                   <strong>note! Beta might break at any time</strong> | ||||||
|  |                 </p> | ||||||
|  |                 <select class="select-input" id="channel" name="channel"> | ||||||
|  |                   <option value="https://listen.tidal.com">Stable (listen.tidal.com)</option> | ||||||
|  |                   <option value="https://listen.stage.tidal.com">Staging (listen.stage.tidal.com)</option> | ||||||
|  |                 </select> | ||||||
|  |               </div> | ||||||
|  |             </div> | ||||||
|           </div> |           </div> | ||||||
|           <div class="group"> |           <div class="group"> | ||||||
|             <p class="group__title">Flags</p> |             <p class="group__title">Flags</p> | ||||||
| @@ -432,14 +477,16 @@ | |||||||
|           <img alt="tidal icon" class="about-section__icon" src="./icon.png" /> |           <img alt="tidal icon" class="about-section__icon" src="./icon.png" /> | ||||||
|           <h4>TIDAL Hi-Fi</h4> |           <h4>TIDAL Hi-Fi</h4> | ||||||
|           <div class="about-section__version"> |           <div class="about-section__version"> | ||||||
|             <a href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.9.0">5.9.0</a> |             <a target="_blank" rel="noopener" | ||||||
|  |               href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.20.1">5.20.1</a> | ||||||
|           </div> |           </div> | ||||||
|           <div class="about-section__links"> |           <div class="about-section__links"> | ||||||
|             <a href="https://github.com/mastermindzh/tidal-hifi/" class="about-section__button">Github <i |             <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/" | ||||||
|                 class="fa fa-external-link"></i></a> |               class="about-section__button">Github | ||||||
|             <a href="https://github.com/Mastermindzh/tidal-hifi/issues" class="about-section__button">Report an issue <i |               <i class="fa fa-external-link"></i></a> | ||||||
|                 class="fa fa-external-link"></i></a> |             <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/issues" | ||||||
|             <a href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors" |               class="about-section__button">Report an issue <i class="fa fa-external-link"></i></a> | ||||||
|  |             <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors" | ||||||
|               class="about-section__button">Contributors <i class="fa fa-external-link"></i></a> |               class="about-section__button">Contributors <i class="fa fa-external-link"></i></a> | ||||||
|           </div> |           </div> | ||||||
|         </section> |         </section> | ||||||
|   | |||||||
| @@ -415,7 +415,6 @@ html { | |||||||
| } | } | ||||||
|  |  | ||||||
| // file upload | // file upload | ||||||
|  |  | ||||||
| .file-drop-area { | .file-drop-area { | ||||||
|   position: relative; |   position: relative; | ||||||
|   display: flex; |   display: flex; | ||||||
|   | |||||||
							
								
								
									
										241
									
								
								src/preload.ts
									
									
									
									
									
								
							
							
						
						| @@ -10,24 +10,30 @@ import { | |||||||
| } from "./features/listenbrainz/listenbrainz"; | } from "./features/listenbrainz/listenbrainz"; | ||||||
| import { StoreData } from "./features/listenbrainz/models/storeData"; | import { StoreData } from "./features/listenbrainz/models/storeData"; | ||||||
| import { Logger } from "./features/logger"; | import { Logger } from "./features/logger"; | ||||||
| import { Songwhip } from "./features/songwhip/songwhip"; | import { SharingService } from "./features/sharingService/sharingService"; | ||||||
| import { addCustomCss } from "./features/theming/theming"; | import { addCustomCss } from "./features/theming/theming"; | ||||||
|  | import { convertDurationToSeconds } from "./features/time/parse"; | ||||||
|  | import { MediaInfo } from "./models/mediaInfo"; | ||||||
| import { MediaStatus } from "./models/mediaStatus"; | import { MediaStatus } from "./models/mediaStatus"; | ||||||
| import { Options } from "./models/options"; | import { RepeatState } from "./models/repeatState"; | ||||||
| import { downloadFile } from "./scripts/download"; | import { downloadFile } from "./scripts/download"; | ||||||
| import { addHotkey } from "./scripts/hotkeys"; | import { addHotkey } from "./scripts/hotkeys"; | ||||||
|  | import { ObjectToDotNotation } from "./scripts/objectUtilities"; | ||||||
| import { settingsStore } from "./scripts/settings"; | import { settingsStore } from "./scripts/settings"; | ||||||
| import { setTitle } from "./scripts/window-functions"; | import { setTitle } from "./scripts/window-functions"; | ||||||
|  |  | ||||||
| const notificationPath = `${app.getPath("userData")}/notification.jpg`; | const notificationPath = `${app.getPath("userData")}/notification.jpg`; | ||||||
| const appName = "TIDAL Hi-Fi"; |  | ||||||
| let currentSong = ""; | let currentSong = ""; | ||||||
| let player: Player; | let player: Player; | ||||||
| let currentPlayStatus = MediaStatus.paused; | let currentPlayStatus = MediaStatus.paused; | ||||||
| let currentListenBrainzDelayId: ReturnType<typeof setTimeout>; | let currentListenBrainzDelayId: ReturnType<typeof setTimeout>; | ||||||
| let scrobbleWaitingForDelay = false; | let scrobbleWaitingForDelay = false; | ||||||
| let wasJustPausedOrResumed = false; |  | ||||||
| let currentMediaInfo: Options; | let currentlyPlaying = MediaStatus.paused; | ||||||
|  | let currentRepeatState: RepeatState = RepeatState.off; | ||||||
|  | let currentShuffleState = false; | ||||||
|  | let currentMediaInfo: MediaInfo; | ||||||
|  | let currentNotification: Electron.Notification; | ||||||
|  |  | ||||||
| const elements = { | const elements = { | ||||||
|   play: '*[data-test="play"]', |   play: '*[data-test="play"]', | ||||||
| @@ -42,16 +48,19 @@ const elements = { | |||||||
|   search: '[class^="searchField"]', |   search: '[class^="searchField"]', | ||||||
|   shuffle: '*[data-test="shuffle"]', |   shuffle: '*[data-test="shuffle"]', | ||||||
|   repeat: '*[data-test="repeat"]', |   repeat: '*[data-test="repeat"]', | ||||||
|   account: '*[class^="profileOptions"]', |   account: '*[data-test^="profile-image-button"]', | ||||||
|   settings: '*[data-test^="open-settings"]', |   settings: '*[data-test^="sidebar-menu-button"]', | ||||||
|  |   openSettings: '*[data-test^="open-settings"]', | ||||||
|   media: '*[data-test="current-media-imagery"]', |   media: '*[data-test="current-media-imagery"]', | ||||||
|   image: "img", |   image: "img", | ||||||
|   current: '*[data-test="current-time"]', |   current: '*[data-test="current-time"]', | ||||||
|   duration: '*[class^=playbackControlsContainer] *[data-test="duration"]', |   duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]', | ||||||
|   bar: '*[data-test="progress-bar"]', |   bar: '*[data-test="progress-bar"]', | ||||||
|   footer: "#footerPlayer", |   footer: "#footerPlayer", | ||||||
|   mediaItem: "[data-type='mediaItem']", |   mediaItem: "[data-type='mediaItem']", | ||||||
|   album_header_title: '.header-details [data-test="title"]', |   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']", |   currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']", | ||||||
|   album_name_cell: '[class^="album"]', |   album_name_cell: '[class^="album"]', | ||||||
|   tracklist_row: '[data-test="tracklist-row"]', |   tracklist_row: '[data-test="tracklist-row"]', | ||||||
| @@ -66,7 +75,7 @@ const elements = { | |||||||
|   }, |   }, | ||||||
|  |  | ||||||
|   /** |   /** | ||||||
|    * Get the icon of the current song |    * Get the icon of the current media | ||||||
|    */ |    */ | ||||||
|   getSongIcon: function () { |   getSongIcon: function () { | ||||||
|     const figure = this.get("media"); |     const figure = this.get("media"); | ||||||
| @@ -82,7 +91,7 @@ const elements = { | |||||||
|   }, |   }, | ||||||
|  |  | ||||||
|   /** |   /** | ||||||
|    * returns an array of all artists in the current song |    * returns an array of all artists in the current media | ||||||
|    * @returns {Array} artists |    * @returns {Array} artists | ||||||
|    */ |    */ | ||||||
|   getArtistsArray: function () { |   getArtistsArray: function () { | ||||||
| @@ -106,28 +115,38 @@ const elements = { | |||||||
|   }, |   }, | ||||||
|  |  | ||||||
|   getAlbumName: function () { |   getAlbumName: function () { | ||||||
|     //If listening to an album, get its name from the header title |     try { | ||||||
|     if (window.location.href.includes("/album/")) { |       //If listening to an album, get its name from the header title | ||||||
|       const albumName = window.document.querySelector(this.album_header_title); |       if (globalThis.location.href.includes("/album/")) { | ||||||
|       if (albumName) { |         const albumName = globalThis.document.querySelector(this.album_header_title); | ||||||
|         return albumName.textContent; |         if (albumName) { | ||||||
|       } |           return albumName.textContent; | ||||||
|       //If listening to a playlist or a mix, get album name from the list |         } | ||||||
|     } else if ( |         //If listening to a playlist or a mix, get album name from the list | ||||||
|       window.location.href.includes("/playlist/") || |       } else if ( | ||||||
|       window.location.href.includes("/mix/") |         globalThis.location.href.includes("/playlist/") || | ||||||
|     ) { |         globalThis.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. |         if (this.currentlyPlaying === MediaStatus.playing) { | ||||||
|         // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent |           // 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. | ||||||
|         const row = window.document.querySelector(this.currentlyPlaying).closest(this.mediaItem); |           // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent | ||||||
|         if (row) { |           const row = window.document.querySelector(this.currentlyPlaying).closest(this.mediaItem); | ||||||
|           return row.querySelector(this.album_name_cell).textContent; |           if (row) { | ||||||
|  |             return row.querySelector(this.album_name_cell).textContent; | ||||||
|  |           } | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     } |  | ||||||
|  |  | ||||||
|     return ""; |       // 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 () { |   isMuted: function () { | ||||||
| @@ -181,10 +200,9 @@ function getUpdateFrequency() { | |||||||
| } | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Play or pause the current song |  * Play or pause the current media | ||||||
|  */ |  */ | ||||||
| function playPause() { | function playPause() { | ||||||
|   wasJustPausedOrResumed = true; |  | ||||||
|   const play = elements.get("play"); |   const play = elements.get("play"); | ||||||
|  |  | ||||||
|   if (play) { |   if (play) { | ||||||
| @@ -207,9 +225,9 @@ ListenBrainzStore.clear(); | |||||||
| function addHotKeys() { | function addHotKeys() { | ||||||
|   if (settingsStore.get(settings.enableCustomHotkeys)) { |   if (settingsStore.get(settings.enableCustomHotkeys)) { | ||||||
|     addHotkey("Control+p", function () { |     addHotkey("Control+p", function () { | ||||||
|       elements.click("account"); |       elements.click("settings"); | ||||||
|       setTimeout(() => { |       setTimeout(() => { | ||||||
|         elements.click("settings"); |         elements.click("openSettings"); | ||||||
|       }, 100); |       }, 100); | ||||||
|     }); |     }); | ||||||
|     addHotkey("Control+l", function () { |     addHotkey("Control+l", function () { | ||||||
| @@ -241,11 +259,10 @@ function addHotKeys() { | |||||||
|       elements.click("repeat"); |       elements.click("repeat"); | ||||||
|     }); |     }); | ||||||
|     addHotkey("control+w", async function () { |     addHotkey("control+w", async function () { | ||||||
|       const result = await ipcRenderer.invoke(globalEvents.whip, getTrackURL()); |       const url = SharingService.getUniversalLink(getTrackURL()); | ||||||
|       const url = Songwhip.getWhipUrl(result); |  | ||||||
|       clipboard.writeText(url); |       clipboard.writeText(url); | ||||||
|       new Notification({ |       new Notification({ | ||||||
|         title: `Successfully whipped: `, |         title: `Universal link generated: `, | ||||||
|         body: `URL copied to clipboard: ${url}`, |         body: `URL copied to clipboard: ${url}`, | ||||||
|       }).show(); |       }).show(); | ||||||
|     }); |     }); | ||||||
| @@ -317,6 +334,12 @@ function addIPCEventListeners() { | |||||||
|         case globalEvents.toggleFavorite: |         case globalEvents.toggleFavorite: | ||||||
|           elements.click("favorite"); |           elements.click("favorite"); | ||||||
|           break; |           break; | ||||||
|  |         case globalEvents.toggleShuffle: | ||||||
|  |           elements.click("shuffle"); | ||||||
|  |           break; | ||||||
|  |         case globalEvents.toggleRepeat: | ||||||
|  |           elements.click("repeat"); | ||||||
|  |           break; | ||||||
|         default: |         default: | ||||||
|           break; |           break; | ||||||
|       } |       } | ||||||
| @@ -340,6 +363,23 @@ function getCurrentlyPlayingStatus() { | |||||||
|   return status; |   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 |  * Convert the duration from MM:SS to seconds | ||||||
|  * @param {*} duration |  * @param {*} duration | ||||||
| @@ -352,17 +392,36 @@ function convertDuration(duration: string) { | |||||||
| /** | /** | ||||||
|  * Update Tidal-hifi's media info |  * Update Tidal-hifi's media info | ||||||
|  * |  * | ||||||
|  * @param {*} options |  * @param {*} mediaInfo | ||||||
|  */ |  */ | ||||||
| function updateMediaInfo(options: Options, notify: boolean) { | function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) { | ||||||
|   if (options) { |   if (mediaInfo) { | ||||||
|     currentMediaInfo = options; |     currentMediaInfo = mediaInfo; | ||||||
|     ipcRenderer.send(globalEvents.updateInfo, options); |     ipcRenderer.send(globalEvents.updateInfo, mediaInfo); | ||||||
|     if (settingsStore.get(settings.notifications) && notify) { |     updateMpris(mediaInfo); | ||||||
|       new Notification({ title: options.title, body: options.artists, icon: options.icon }).show(); |     updateListenBrainz(mediaInfo); | ||||||
|  |     if (notify) { | ||||||
|  |       sendNotification(mediaInfo); | ||||||
|     } |     } | ||||||
|     updateMpris(options); |   } | ||||||
|     updateListenBrainz(options); | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * send a desktop notification if enabled in settings | ||||||
|  |  * @param mediaInfo | ||||||
|  |  * @param notify Whether to notify | ||||||
|  |  */ | ||||||
|  | async function sendNotification(mediaInfo: MediaInfo) { | ||||||
|  |   if (settingsStore.get(settings.notifications)) { | ||||||
|  |     if (currentNotification) { | ||||||
|  |       currentNotification.close(); | ||||||
|  |     } | ||||||
|  |     currentNotification = new Notification({ | ||||||
|  |       title: mediaInfo.title, | ||||||
|  |       body: mediaInfo.artists, | ||||||
|  |       icon: mediaInfo.icon, | ||||||
|  |     }); | ||||||
|  |     currentNotification.show(); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -420,32 +479,34 @@ function addMPRIS() { | |||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| function updateMpris(options: Options) { | function updateMpris(mediaInfo: MediaInfo) { | ||||||
|   if (player) { |   if (player) { | ||||||
|     player.metadata = { |     player.metadata = { | ||||||
|       ...player.metadata, |       ...player.metadata, | ||||||
|       ...{ |       ...{ | ||||||
|         "xesam:title": options.title, |         "xesam:title": mediaInfo.title, | ||||||
|         "xesam:artist": [options.artists], |         "xesam:artist": [mediaInfo.artists], | ||||||
|         "xesam:album": options.album, |         "xesam:album": mediaInfo.album, | ||||||
|         "mpris:artUrl": options.image, |         "xesam:url": mediaInfo.url, | ||||||
|         "mpris:length": convertDuration(options.duration) * 1000 * 1000, |         "mpris:artUrl": mediaInfo.image, | ||||||
|  |         "mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000, | ||||||
|         "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(), |         "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(), | ||||||
|       }, |       }, | ||||||
|  |       ...ObjectToDotNotation(mediaInfo, "custom:"), | ||||||
|     }; |     }; | ||||||
|     player.playbackStatus = options.status === MediaStatus.paused ? "Paused" : "Playing"; |     player.playbackStatus = mediaInfo.status === MediaStatus.paused ? "Paused" : "Playing"; | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Update the listenbrainz service with new data based on a few conditions |  * Update the listenbrainz service with new data based on a few conditions | ||||||
|  */ |  */ | ||||||
| function updateListenBrainz(options: Options) { | function updateListenBrainz(mediaInfo: MediaInfo) { | ||||||
|   if (settingsStore.get(settings.ListenBrainz.enabled)) { |   if (settingsStore.get(settings.ListenBrainz.enabled)) { | ||||||
|     const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData; |     const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData; | ||||||
|     if ( |     if ( | ||||||
|       (!oldData && options.status === MediaStatus.playing) || |       (!oldData && mediaInfo.status === MediaStatus.playing) || | ||||||
|       (oldData && oldData.title !== options.title) |       (oldData && oldData.title !== mediaInfo.title) | ||||||
|     ) { |     ) { | ||||||
|       if (!scrobbleWaitingForDelay) { |       if (!scrobbleWaitingForDelay) { | ||||||
|         scrobbleWaitingForDelay = true; |         scrobbleWaitingForDelay = true; | ||||||
| @@ -453,10 +514,10 @@ function updateListenBrainz(options: Options) { | |||||||
|         currentListenBrainzDelayId = setTimeout( |         currentListenBrainzDelayId = setTimeout( | ||||||
|           () => { |           () => { | ||||||
|             ListenBrainz.scrobble( |             ListenBrainz.scrobble( | ||||||
|               options.title, |               mediaInfo.title, | ||||||
|               options.artists, |               mediaInfo.artists, | ||||||
|               options.status, |               mediaInfo.status, | ||||||
|               convertDuration(options.duration) |               convertDuration(mediaInfo.duration) | ||||||
|             ); |             ); | ||||||
|             scrobbleWaitingForDelay = false; |             scrobbleWaitingForDelay = false; | ||||||
|           }, |           }, | ||||||
| @@ -486,23 +547,6 @@ function getTrackID() { | |||||||
|   return window.location; |   return window.location; | ||||||
| } | } | ||||||
|  |  | ||||||
| function updateMediaSession(options: Options) { |  | ||||||
|   if ("mediaSession" in navigator) { |  | ||||||
|     navigator.mediaSession.metadata = new MediaMetadata({ |  | ||||||
|       title: options.title, |  | ||||||
|       artist: options.artists, |  | ||||||
|       album: options.album, |  | ||||||
|       artwork: [ |  | ||||||
|         { |  | ||||||
|           src: options.icon, |  | ||||||
|           sizes: "640x640", |  | ||||||
|           type: "image/png", |  | ||||||
|         }, |  | ||||||
|       ], |  | ||||||
|     }); |  | ||||||
|   } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Watch for song changes and update title + notify |  * Watch for song changes and update title + notify | ||||||
|  */ |  */ | ||||||
| @@ -511,35 +555,54 @@ setInterval(function () { | |||||||
|   const artistsArray = elements.getArtistsArray(); |   const artistsArray = elements.getArtistsArray(); | ||||||
|   const artistsString = elements.getArtistsString(artistsArray); |   const artistsString = elements.getArtistsString(artistsArray); | ||||||
|   const songDashArtistTitle = `${title} - ${artistsString}`; |   const songDashArtistTitle = `${title} - ${artistsString}`; | ||||||
|  |   const staticTitle = "TIDAL Hi-Fi"; | ||||||
|   const titleOrArtistsChanged = currentSong !== songDashArtistTitle; |   const titleOrArtistsChanged = currentSong !== songDashArtistTitle; | ||||||
|   const current = elements.getText("current"); |   const current = elements.getText("current"); | ||||||
|   const currentStatus = getCurrentlyPlayingStatus(); |   const currentStatus = getCurrentlyPlayingStatus(); | ||||||
|  |   const shuffleState = getCurrentShuffleState(); | ||||||
|  |   const repeatState = getCurrentRepeatState(); | ||||||
|  |  | ||||||
|  |   const playStateChanged = currentStatus != currentlyPlaying; | ||||||
|  |   const shuffleStateChanged = shuffleState != currentShuffleState; | ||||||
|  |   const repeatStateChanged = repeatState != currentRepeatState; | ||||||
|  |  | ||||||
|  |   const hasStateChanged = playStateChanged || shuffleStateChanged || repeatStateChanged; | ||||||
|  |  | ||||||
|   // update info if song changed or was just paused/resumed |   // update info if song changed or was just paused/resumed | ||||||
|   if (titleOrArtistsChanged || wasJustPausedOrResumed) { |   if (titleOrArtistsChanged || hasStateChanged) { | ||||||
|     if (wasJustPausedOrResumed) { |     if (playStateChanged) currentlyPlaying = currentStatus; | ||||||
|       wasJustPausedOrResumed = false; |     if (shuffleStateChanged) currentShuffleState = shuffleState; | ||||||
|     } |     if (repeatStateChanged) currentRepeatState = repeatState; | ||||||
|     skipArtistsIfFoundInSkippedArtistsList(artistsArray); |  | ||||||
|  |  | ||||||
|  |     skipArtistsIfFoundInSkippedArtistsList(artistsArray); | ||||||
|     const album = elements.getAlbumName(); |     const album = elements.getAlbumName(); | ||||||
|     const duration = elements.getText("duration"); |     const duration = elements.getText("duration"); | ||||||
|     const options = { |     const options: MediaInfo = { | ||||||
|       title, |       title, | ||||||
|       artists: artistsString, |       artists: artistsString, | ||||||
|       album: album, |       album: album, | ||||||
|  |       playingFrom: elements.getText("playing_from"), | ||||||
|       status: currentStatus, |       status: currentStatus, | ||||||
|       url: getTrackURL(), |       url: getTrackURL(), | ||||||
|       current, |       current, | ||||||
|  |       currentInSeconds: convertDurationToSeconds(current), | ||||||
|       duration, |       duration, | ||||||
|       "app-name": appName, |       durationInSeconds: convertDurationToSeconds(duration), | ||||||
|       image: "", |       image: "", | ||||||
|       icon: "", |       icon: "", | ||||||
|       favorite: elements.isFavorite(), |       favorite: elements.isFavorite(), | ||||||
|  |  | ||||||
|  |       player: { | ||||||
|  |         status: currentStatus, | ||||||
|  |         shuffle: shuffleState, | ||||||
|  |         repeat: repeatState, | ||||||
|  |       }, | ||||||
|     }; |     }; | ||||||
|  |  | ||||||
|     // update title, url and play info with new info |     // update title, url and play info with new info | ||||||
|     setTitle(songDashArtistTitle); |     settingsStore.get(settings.staticWindowTitle) | ||||||
|  |       ? setTitle(staticTitle) | ||||||
|  |       : setTitle(songDashArtistTitle); | ||||||
|     getTrackURL(); |     getTrackURL(); | ||||||
|     currentSong = songDashArtistTitle; |     currentSong = songDashArtistTitle; | ||||||
|     currentPlayStatus = currentStatus; |     currentPlayStatus = currentStatus; | ||||||
| @@ -565,13 +628,13 @@ setInterval(function () { | |||||||
|       } |       } | ||||||
|     }).then(() => { |     }).then(() => { | ||||||
|       updateMediaInfo(options, titleOrArtistsChanged); |       updateMediaInfo(options, titleOrArtistsChanged); | ||||||
|       if (titleOrArtistsChanged) { |  | ||||||
|         updateMediaSession(options); |  | ||||||
|       } |  | ||||||
|     }); |     }); | ||||||
|   } else { |   } else { | ||||||
|     // just update the time |     // just update the time | ||||||
|     updateMediaInfo({ ...currentMediaInfo, ...{ current } }, false); |     updateMediaInfo( | ||||||
|  |       { ...currentMediaInfo, ...{ current, currentInSeconds: convertDurationToSeconds(current) } }, | ||||||
|  |       false | ||||||
|  |     ); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   /** |   /** | ||||||
|   | |||||||
| @@ -1,25 +1,24 @@ | |||||||
| import { Client, Presence } from "discord-rpc"; | import { Client, SetActivity } from "@xhayper/discord-rpc"; | ||||||
| import { app, ipcMain } from "electron"; | import { app, ipcMain } from "electron"; | ||||||
| import { globalEvents } from "../constants/globalEvents"; | import { globalEvents } from "../constants/globalEvents"; | ||||||
| import { settings } from "../constants/settings"; | import { settings } from "../constants/settings"; | ||||||
| import { Logger } from "../features/logger"; | import { Logger } from "../features/logger"; | ||||||
|  | import { convertDurationToSeconds } from "../features/time/parse"; | ||||||
| import { MediaStatus } from "../models/mediaStatus"; | import { MediaStatus } from "../models/mediaStatus"; | ||||||
| import { mediaInfo } from "./mediaInfo"; | import { mediaInfo } from "./mediaInfo"; | ||||||
| import { settingsStore } from "./settings"; | import { settingsStore } from "./settings"; | ||||||
|  |  | ||||||
| const clientId = "833617820704440341"; | const clientId = "833617820704440341"; | ||||||
|  |  | ||||||
| function timeToSeconds(timeArray: string[]) { |  | ||||||
|   const minutes = parseInt(timeArray[0]) * 1; |  | ||||||
|   const seconds = minutes * 60 + parseInt(timeArray[1]) * 1; |  | ||||||
|   return seconds; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| export let rpc: Client; | export let rpc: Client; | ||||||
|  |  | ||||||
|  | const ACTIVITY_LISTENING = 2; | ||||||
|  | const MAX_RETRIES = 5; | ||||||
|  | const RETRY_DELAY = 10000; | ||||||
|  |  | ||||||
| const observer = () => { | const observer = () => { | ||||||
|   if (rpc) { |   if (rpc) { | ||||||
|     rpc.setActivity(getActivity()); |     updateActivity(); | ||||||
|   } |   } | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -27,10 +26,20 @@ const defaultPresence = { | |||||||
|   largeImageKey: "tidal-hifi-icon", |   largeImageKey: "tidal-hifi-icon", | ||||||
|   largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`, |   largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`, | ||||||
|   instance: false, |   instance: false, | ||||||
|  |   type: ACTIVITY_LISTENING | ||||||
| }; | }; | ||||||
|  |  | ||||||
| const getActivity = (): Presence => { | const updateActivity = () => { | ||||||
|   const presence: Presence = { ...defaultPresence }; |   const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true; | ||||||
|  |   if (mediaInfo.status === MediaStatus.paused && !showIdle) { | ||||||
|  |     rpc.user?.clearActivity(); | ||||||
|  |   } else { | ||||||
|  |     rpc.user?.setActivity(getActivity()); | ||||||
|  |   } | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | const getActivity = (): SetActivity => { | ||||||
|  |   const presence: SetActivity = { ...defaultPresence }; | ||||||
|  |  | ||||||
|   if (mediaInfo.status === MediaStatus.paused) { |   if (mediaInfo.status === MediaStatus.paused) { | ||||||
|     presence.details = |     presence.details = | ||||||
| @@ -46,6 +55,7 @@ const getActivity = (): Presence => { | |||||||
|         settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL"; |         settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL"; | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   return presence; |   return presence; | ||||||
|  |  | ||||||
|   function getFromStore() { |   function getFromStore() { | ||||||
| @@ -59,30 +69,63 @@ const getActivity = (): Presence => { | |||||||
|     return { includeTimestamps, detailsPrefix, buttonText }; |     return { includeTimestamps, detailsPrefix, buttonText }; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   function setPresenceFromMediaInfo(detailsPrefix: any, buttonText: any) { |   /** | ||||||
|  |    * Pad a string using spaces to at least 2 characters | ||||||
|  |    * @param input string to pad with 2 characters | ||||||
|  |    * @returns | ||||||
|  |    */ | ||||||
|  |   function pad(input: string): string { | ||||||
|  |     return input.padEnd(2, " "); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) { | ||||||
|  |     // discord requires a minimum of 2 characters | ||||||
|  |     const title = pad(mediaInfo.title); | ||||||
|  |     const album = pad(mediaInfo.album); | ||||||
|  |     const artists = pad(mediaInfo.artists); | ||||||
|  |  | ||||||
|     if (mediaInfo.url) { |     if (mediaInfo.url) { | ||||||
|       presence.details = `${detailsPrefix}${mediaInfo.title}`; |       presence.details = `${detailsPrefix}${title}`; | ||||||
|       presence.state = mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)"; |       presence.state = artists ? artists : "unknown artist(s)"; | ||||||
|       presence.largeImageKey = mediaInfo.image; |       presence.largeImageKey = mediaInfo.image; | ||||||
|       if (mediaInfo.album) { |       if (album) { | ||||||
|         presence.largeImageText = mediaInfo.album; |         presence.largeImageText = album; | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       presence.buttons = [{ label: buttonText, url: mediaInfo.url }]; |       presence.buttons = [{ label: buttonText, url: mediaInfo.url }]; | ||||||
|     } else { |     } else { | ||||||
|       presence.details = `Watching ${mediaInfo.title}`; |       presence.details = `Watching ${title}`; | ||||||
|       presence.state = mediaInfo.artists; |       presence.state = artists; | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   function includeTimeStamps(includeTimestamps: any) { |   function includeTimeStamps(includeTimestamps: boolean) { | ||||||
|     if (includeTimestamps) { |     if (includeTimestamps) { | ||||||
|       const currentSeconds = timeToSeconds(mediaInfo.current.split(":")); |       const currentSeconds = convertDurationToSeconds(mediaInfo.current); | ||||||
|       const durationSeconds = timeToSeconds(mediaInfo.duration.split(":")); |       const durationSeconds = convertDurationToSeconds(mediaInfo.duration); | ||||||
|       const date = new Date(); |       const now = Math.trunc((Date.now() + 500) / 1000); | ||||||
|       const now = (date.getTime() / 1000) | 0; |       presence.startTimestamp = now - currentSeconds; | ||||||
|       const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds)); |       presence.endTimestamp = presence.startTimestamp + durationSeconds; | ||||||
|       presence.startTimestamp = now; |     } | ||||||
|       presence.endTimestamp = remaining; |   } | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Try to login to RPC and retry if it errors | ||||||
|  |  * @param retryCount Max retry count | ||||||
|  |  */ | ||||||
|  | const connectWithRetry = async (retryCount = 0) => { | ||||||
|  |   try { | ||||||
|  |     await rpc.login(); | ||||||
|  |     Logger.log('Connected to Discord'); | ||||||
|  |     rpc.on("ready", updateActivity); | ||||||
|  |     Object.values(globalEvents).forEach(event => ipcMain.on(event, observer)); | ||||||
|  |   } catch (error) { | ||||||
|  |     if (retryCount < MAX_RETRIES) { | ||||||
|  |       Logger.log(`Failed to connect to Discord, retrying in ${RETRY_DELAY/1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`); | ||||||
|  |       setTimeout(() => connectWithRetry(retryCount + 1), RETRY_DELAY); | ||||||
|  |     } else { | ||||||
|  |       Logger.log('Failed to connect to Discord after maximum retry attempts'); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| }; | }; | ||||||
| @@ -91,18 +134,8 @@ const getActivity = (): Presence => { | |||||||
|  * Set up the discord rpc and listen on globalEvents.updateInfo |  * Set up the discord rpc and listen on globalEvents.updateInfo | ||||||
|  */ |  */ | ||||||
| export const initRPC = () => { | export const initRPC = () => { | ||||||
|   rpc = new Client({ transport: "ipc" }); |   rpc = new Client({ transport: {type: "ipc"}, clientId }); | ||||||
|   rpc.login({ clientId }).then( |   connectWithRetry(); | ||||||
|     () => { |  | ||||||
|       rpc.on("ready", () => { |  | ||||||
|         rpc.setActivity(getActivity()); |  | ||||||
|       }); |  | ||||||
|       ipcMain.on(globalEvents.updateInfo, observer); |  | ||||||
|     }, |  | ||||||
|     () => { |  | ||||||
|       Logger.log("Can't connect to Discord, is it running?"); |  | ||||||
|     } |  | ||||||
|   ); |  | ||||||
| }; | }; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -110,7 +143,7 @@ export const initRPC = () => { | |||||||
|  */ |  */ | ||||||
| export const unRPC = () => { | export const unRPC = () => { | ||||||
|   if (rpc) { |   if (rpc) { | ||||||
|     rpc.clearActivity(); |     rpc.user?.clearActivity(); | ||||||
|     rpc.destroy(); |     rpc.destroy(); | ||||||
|     rpc = null; |     rpc = null; | ||||||
|     ipcMain.removeListener(globalEvents.updateInfo, observer); |     ipcMain.removeListener(globalEvents.updateInfo, observer); | ||||||
|   | |||||||
| @@ -1,69 +0,0 @@ | |||||||
| import { BrowserWindow, dialog } from "electron"; |  | ||||||
| import express, { Response } from "express"; |  | ||||||
| import fs from "fs"; |  | ||||||
| import { settings } from "../constants/settings"; |  | ||||||
| import { MediaStatus } from "../models/mediaStatus"; |  | ||||||
| import { globalEvents } from "./../constants/globalEvents"; |  | ||||||
| import { mediaInfo } from "./mediaInfo"; |  | ||||||
| import { settingsStore } from "./settings"; |  | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * Function to enable TIDAL Hi-Fi's express api |  | ||||||
|  */ |  | ||||||
|  |  | ||||||
| // expressModule.run = function (mainWindow) |  | ||||||
| export const startExpress = (mainWindow: BrowserWindow) => { |  | ||||||
|   /** |  | ||||||
|    * Shorthand to handle a fire and forget global event |  | ||||||
|    * @param {*} res |  | ||||||
|    * @param {*} action |  | ||||||
|    */ |  | ||||||
|   function handleGlobalEvent(res: Response, action: string) { |  | ||||||
|     mainWindow.webContents.send("globalEvent", action); |  | ||||||
|     res.sendStatus(200); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   const expressApp = express(); |  | ||||||
|   expressApp.get("/", (req, res) => res.send("Hello World!")); |  | ||||||
|   expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists })); |  | ||||||
|   expressApp.get("/image", (req, res) => { |  | ||||||
|     const stream = fs.createReadStream(mediaInfo.icon); |  | ||||||
|     stream.on("open", function () { |  | ||||||
|       res.set("Content-Type", "image/png"); |  | ||||||
|       stream.pipe(res); |  | ||||||
|     }); |  | ||||||
|     stream.on("error", function () { |  | ||||||
|       res.set("Content-Type", "text/plain"); |  | ||||||
|       res.status(404).end("Not found"); |  | ||||||
|     }); |  | ||||||
|   }); |  | ||||||
|  |  | ||||||
|   if (settingsStore.get(settings.playBackControl)) { |  | ||||||
|     expressApp.get("/play", (req, res) => handleGlobalEvent(res, globalEvents.play)); |  | ||||||
|     expressApp.post("/favorite/toggle", (req, res) => |  | ||||||
|       handleGlobalEvent(res, globalEvents.toggleFavorite) |  | ||||||
|     ); |  | ||||||
|     expressApp.get("/pause", (req, res) => handleGlobalEvent(res, globalEvents.pause)); |  | ||||||
|     expressApp.get("/next", (req, res) => handleGlobalEvent(res, globalEvents.next)); |  | ||||||
|     expressApp.get("/previous", (req, res) => handleGlobalEvent(res, globalEvents.previous)); |  | ||||||
|     expressApp.get("/playpause", (req, res) => { |  | ||||||
|       if (mediaInfo.status === MediaStatus.playing) { |  | ||||||
|         handleGlobalEvent(res, globalEvents.pause); |  | ||||||
|       } else { |  | ||||||
|         handleGlobalEvent(res, globalEvents.play); |  | ||||||
|       } |  | ||||||
|     }); |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   const port = settingsStore.get<string, number>(settings.apiSettings.port); |  | ||||||
|  |  | ||||||
|   const expressInstance = expressApp.listen(port, "127.0.0.1"); |  | ||||||
|   expressInstance.on("error", function (e: { code: string }) { |  | ||||||
|     let message = e.code; |  | ||||||
|     if (e.code === "EADDRINUSE") { |  | ||||||
|       message = `Port ${port} in use.`; |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     dialog.showErrorBox("Api failed to start.", message); |  | ||||||
|   }); |  | ||||||
| }; |  | ||||||
| @@ -1,37 +1,45 @@ | |||||||
| import { MediaInfo } from "../models/mediaInfo"; | import { MediaInfo } from "../models/mediaInfo"; | ||||||
| import { MediaStatus } from "../models/mediaStatus"; | import { MediaStatus } from "../models/mediaStatus"; | ||||||
|  | import { RepeatState } from "../models/repeatState"; | ||||||
|  |  | ||||||
| export const mediaInfo = { | const defaultInfo: MediaInfo = { | ||||||
|   title: "", |   title: "", | ||||||
|   artists: "", |   artists: "", | ||||||
|   album: "", |   album: "", | ||||||
|   icon: "", |   icon: "", | ||||||
|   status: MediaStatus.paused as string, |   playingFrom: "", | ||||||
|  |   status: MediaStatus.paused, | ||||||
|   url: "", |   url: "", | ||||||
|   current: "", |   current: "", | ||||||
|  |   currentInSeconds: 0, | ||||||
|   duration: "", |   duration: "", | ||||||
|  |   durationInSeconds: 0, | ||||||
|   image: "tidal-hifi-icon", |   image: "tidal-hifi-icon", | ||||||
|   favorite: false, |   favorite: false, | ||||||
|  |  | ||||||
|  |   player: { | ||||||
|  |     status: MediaStatus.paused, | ||||||
|  |     shuffle: false, | ||||||
|  |     repeat: RepeatState.off, | ||||||
|  |   }, | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | export let mediaInfo: MediaInfo = { ...defaultInfo }; | ||||||
|  |  | ||||||
| export const updateMediaInfo = (arg: MediaInfo) => { | export const updateMediaInfo = (arg: MediaInfo) => { | ||||||
|   mediaInfo.title = propOrDefault(arg.title); |   mediaInfo = { ...defaultInfo, ...arg }; | ||||||
|   mediaInfo.artists = propOrDefault(arg.artists); |   mediaInfo.url = toUniversalUrl(mediaInfo.url); | ||||||
|   mediaInfo.album = propOrDefault(arg.album); |  | ||||||
|   mediaInfo.icon = propOrDefault(arg.icon); |  | ||||||
|   mediaInfo.url = propOrDefault(arg.url); |  | ||||||
|   mediaInfo.status = propOrDefault(arg.status); |  | ||||||
|   mediaInfo.current = propOrDefault(arg.current); |  | ||||||
|   mediaInfo.duration = propOrDefault(arg.duration); |  | ||||||
|   mediaInfo.image = propOrDefault(arg.image); |  | ||||||
|   mediaInfo.favorite = arg.favorite; |  | ||||||
| }; | }; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Return the property or a default value |  * Append the universal link syntax (?u) to any url | ||||||
|  * @param {*} prop property to check |  * @param url url to append the universal link syntax to | ||||||
|  * @param {*} defaultValue defaults to "" |  * @returns url with `?u` appended, or the original value of url if falsy | ||||||
|  */ |  */ | ||||||
| function propOrDefault(prop: string, defaultValue = "") { | function toUniversalUrl(url: string) { | ||||||
|   return prop ? prop : defaultValue; |   if (url) { | ||||||
|  |     const queryParamsSet = url.indexOf("?"); | ||||||
|  |     return queryParamsSet > -1 ? `${url}&u` : `${url}?u`; | ||||||
|  |   } | ||||||
|  |   return url; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -11,6 +11,23 @@ const settingsMenuEntry = { | |||||||
|   accelerator: "Control+=", |   accelerator: "Control+=", | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | const tidalMagazineEntry = { | ||||||
|  |   label: "Magazine", | ||||||
|  |   click() { | ||||||
|  |     const magazineWindow = new BrowserWindow({ | ||||||
|  |       autoHideMenuBar: true, | ||||||
|  |       webPreferences: { | ||||||
|  |         sandbox: false, | ||||||
|  |         plugins: true, | ||||||
|  |         devTools: true, // I like tinkering, others might too | ||||||
|  |       }, | ||||||
|  |     }); | ||||||
|  |     magazineWindow.loadURL("https://tidal.com/magazine/"); | ||||||
|  |     magazineWindow.show(); | ||||||
|  |   }, | ||||||
|  |   accelerator: "Control+M", | ||||||
|  | }; | ||||||
|  |  | ||||||
| const quitMenuEntry = { | const quitMenuEntry = { | ||||||
|   label: "Quit", |   label: "Quit", | ||||||
|   click() { |   click() { | ||||||
| @@ -41,6 +58,7 @@ export const getMenu = function (mainWindow: BrowserWindow) { | |||||||
|               { role: "hideothers" }, |               { role: "hideothers" }, | ||||||
|               { role: "unhide" }, |               { role: "unhide" }, | ||||||
|               { type: "separator" }, |               { type: "separator" }, | ||||||
|  |               tidalMagazineEntry, | ||||||
|               quitMenuEntry, |               quitMenuEntry, | ||||||
|             ], |             ], | ||||||
|           }, |           }, | ||||||
| @@ -48,7 +66,7 @@ export const getMenu = function (mainWindow: BrowserWindow) { | |||||||
|       : []), |       : []), | ||||||
|     { |     { | ||||||
|       label: "File", |       label: "File", | ||||||
|       submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry], |       submenu: [settingsMenuEntry, tidalMagazineEntry, isMac ? { role: "close" } : quitMenuEntry], | ||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|       label: "Edit", |       label: "Edit", | ||||||
| @@ -101,6 +119,7 @@ export const getMenu = function (mainWindow: BrowserWindow) { | |||||||
|     }, |     }, | ||||||
|     settingsMenuEntry, |     settingsMenuEntry, | ||||||
|     toggleWindow, |     toggleWindow, | ||||||
|  |     tidalMagazineEntry, | ||||||
|     quitMenuEntry, |     quitMenuEntry, | ||||||
|   ]; |   ]; | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										13
									
								
								src/scripts/objectUtilities.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,13 @@ | |||||||
|  | // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||||||
|  | export const ObjectToDotNotation = (obj: any, prefix: string = "", target: any = {}) => { | ||||||
|  |   Object.keys(obj).forEach((key: string) => { | ||||||
|  |     if (typeof obj[key] === "object" && obj[key] !== null) { | ||||||
|  |       ObjectToDotNotation(obj[key], prefix + key + ".", target); | ||||||
|  |     } else { | ||||||
|  |       const dotLocation = prefix + key; | ||||||
|  |       target[dotLocation] = obj[key]; | ||||||
|  |       return target; | ||||||
|  |     } | ||||||
|  |   }); | ||||||
|  |   return target; | ||||||
|  | }; | ||||||
| @@ -1,6 +1,6 @@ | |||||||
| import Store from "electron-store"; | import Store from "electron-store"; | ||||||
|  |  | ||||||
| import { BrowserWindow } from "electron"; | import { BrowserWindow, shell } from "electron"; | ||||||
| import path from "path"; | import path from "path"; | ||||||
| import { settings } from "../constants/settings"; | import { settings } from "../constants/settings"; | ||||||
|  |  | ||||||
| @@ -28,9 +28,13 @@ const buildMigration = ( | |||||||
| export const settingsStore = new Store({ | export const settingsStore = new Store({ | ||||||
|   defaults: { |   defaults: { | ||||||
|     adBlock: false, |     adBlock: false, | ||||||
|  |     advanced: { | ||||||
|  |       tidalUrl: "https://listen.tidal.com", | ||||||
|  |     }, | ||||||
|     api: true, |     api: true, | ||||||
|     apiSettings: { |     apiSettings: { | ||||||
|       port: 47836, |       port: 47836, | ||||||
|  |       hostname: "127.0.0.1", | ||||||
|     }, |     }, | ||||||
|     customCSS: [], |     customCSS: [], | ||||||
|     disableBackgroundThrottle: true, |     disableBackgroundThrottle: true, | ||||||
| @@ -39,6 +43,7 @@ export const settingsStore = new Store({ | |||||||
|     enableDiscord: false, |     enableDiscord: false, | ||||||
|     discord: { |     discord: { | ||||||
|       showSong: true, |       showSong: true, | ||||||
|  |       showIdle: true, | ||||||
|       idleText: "Browsing Tidal", |       idleText: "Browsing Tidal", | ||||||
|       usingText: "Playing media on TIDAL", |       usingText: "Playing media on TIDAL", | ||||||
|       includeTimestamps: true, |       includeTimestamps: true, | ||||||
| @@ -64,6 +69,7 @@ export const settingsStore = new Store({ | |||||||
|     singleInstance: true, |     singleInstance: true, | ||||||
|     skipArtists: false, |     skipArtists: false, | ||||||
|     skippedArtists: [""], |     skippedArtists: [""], | ||||||
|  |     staticWindowTitle: false, | ||||||
|     theme: "none", |     theme: "none", | ||||||
|     trayIcon: true, |     trayIcon: true, | ||||||
|     updateFrequency: 500, |     updateFrequency: 500, | ||||||
| @@ -101,6 +107,19 @@ export const settingsStore = new Store({ | |||||||
|         }, |         }, | ||||||
|       ]); |       ]); | ||||||
|     }, |     }, | ||||||
|  |     "5.14.0": (migrationStore) => { | ||||||
|  |       buildMigration("5.14.0", migrationStore, [ | ||||||
|  |         { key: settings.apiSettings.hostname, value: "127.0.0.1" }, | ||||||
|  |       ]); | ||||||
|  |     }, | ||||||
|  |     "5.15.0": (migrationStore) => { | ||||||
|  |       buildMigration("5.15.0", migrationStore, [ | ||||||
|  |         { key: settings.advanced.tidalUrl, value: "https://listen.tidal.com" }, | ||||||
|  |       ]); | ||||||
|  |     }, | ||||||
|  |     "5.16.0": (migrationStore) => { | ||||||
|  |       buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]); | ||||||
|  |     }, | ||||||
|   }, |   }, | ||||||
| }); | }); | ||||||
|  |  | ||||||
| @@ -134,6 +153,10 @@ export const createSettingsWindow = function () { | |||||||
|  |  | ||||||
|   settingsWindow.loadURL(`file://${__dirname}/../pages/settings/settings.html`); |   settingsWindow.loadURL(`file://${__dirname}/../pages/settings/settings.html`); | ||||||
|  |  | ||||||
|  |   settingsWindow.webContents.setWindowOpenHandler(({ url }) => { | ||||||
|  |     shell.openExternal(url); | ||||||
|  |     return { action: "deny" }; | ||||||
|  |   }); | ||||||
|   settingsModule.settingsWindow = settingsWindow; |   settingsModule.settingsWindow = settingsWindow; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -155,3 +178,25 @@ export const hideSettingsWindow = function () { | |||||||
| export const closeSettingsWindow = function () { | export const closeSettingsWindow = function () { | ||||||
|   settingsWindow = null; |   settingsWindow = null; | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * add artists to the list of skipped artists | ||||||
|  |  * @param artists list of artists to append | ||||||
|  |  */ | ||||||
|  | export const addSkippedArtists = (artists: string[]) => { | ||||||
|  |   const { skippedArtists } = settings; | ||||||
|  |   const previousStoreValue = settingsStore.get<string, string[]>(skippedArtists); | ||||||
|  |   settingsStore.set(skippedArtists, Array.from(new Set([...previousStoreValue, ...artists]))); | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Remove artists from the list of skipped artists | ||||||
|  |  * @param artists list of artists to remove | ||||||
|  |  */ | ||||||
|  | export const removeSkippedArtists = (artists: string[]) => { | ||||||
|  |   const { skippedArtists } = settings; | ||||||
|  |   const previousStoreValue = settingsStore.get<string, string[]>(skippedArtists); | ||||||
|  |   const filteredArtists = previousStoreValue.filter((value) => ![...artists].includes(value)); | ||||||
|  |  | ||||||
|  |   settingsStore.set(skippedArtists, filteredArtists); | ||||||
|  | }; | ||||||
|   | |||||||
| @@ -8,6 +8,7 @@ | |||||||
|     "sourceMap": true, |     "sourceMap": true, | ||||||
|     "allowJs": true, |     "allowJs": true, | ||||||
|     "outDir": "ts-dist", |     "outDir": "ts-dist", | ||||||
|  |     "resolveJsonModule": true, | ||||||
|     "esModuleInterop": true, |     "esModuleInterop": true, | ||||||
|     "baseUrl": ".", |     "baseUrl": ".", | ||||||
|     "paths": { |     "paths": { | ||||||
|   | |||||||