mirror of
				https://github.com/Mastermindzh/tidal-hifi.git
				synced 2025-11-04 10:49:26 +01:00 
			
		
		
		
	Compare commits
	
		
			153 Commits
		
	
	
		
			5.18.1
			...
			feature/ti
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 40907f7b7f | |||
| 9cbb55fae7 | |||
| 8d4dd1ec9d | |||
| d012ecb04e | |||
| 
						 | 
					fa4b4da9a5 | ||
| 
						 | 
					8f1a5dc344 | ||
| 604f34b31f | |||
| 3ff37f78e8 | |||
| 8eaca2221f | |||
| 8e9e9fed4f | |||
| 
						 | 
					d839dba58d | ||
| bbbd919655 | |||
| d4104b21e4 | |||
| 6a23873d3d | |||
| 8d6f08a7bb | |||
| 521b8b2170 | |||
| 
						 | 
					99e4cb7f48 | ||
| 
						 | 
					4cd130ee0d | ||
| 
						 | 
					a2a2c800b6 | ||
| 
						 | 
					83210f9e1d | ||
| 5d40d2d736 | |||
| 405c2d7c9f | |||
| 
						 | 
					9f860d2eec | ||
| 
						 | 
					86487863f8 | ||
| 3312211df2 | |||
| 
						 | 
					a84bb9efde | ||
| 31c37b6c7f | |||
| be9724f0cb | |||
| 
						 | 
					7277482c06 | ||
| 
						 | 
					323b591f4f | ||
| c63b46ee06 | |||
| 
						 | 
					b4a8e155af | ||
| 2702d99aca | |||
| 
						 | 
					7cf9ae5c36 | ||
| 3a1402b47a | |||
| 
						 | 
					4366caa16a | ||
| 
						 | 
					9389b4195e | ||
| 87d8bc07ad | |||
| 
						 | 
					316bf054f5 | ||
| 0d4975ce62 | |||
| 
						 | 
					912f064fed | ||
| bff95bcf10 | |||
| b59dce9c9b | |||
| 
						 | 
					f71fb60d38 | ||
| 
						 | 
					fab566e9da | ||
| d2e93e7062 | |||
| 
						 | 
					52a78a6a01 | ||
| f878371fab | |||
| e81aaf1384 | |||
| 
						 | 
					98b4068b62 | ||
| 
						 | 
					b7c1cee64d | ||
| 350b4434be | |||
| 702a16357f | |||
| c6619be068 | |||
| bf7cd70f20 | |||
| 03cb14e31e | |||
| 697298da38 | |||
| 5f5b3b11a8 | |||
| d474b7b78f | |||
| ef374ea283 | |||
| 
						 | 
					96ff46737b | ||
| 
						 | 
					dee0044876 | ||
| 3b1f456d4c | |||
| 
						 | 
					f380839631 | ||
| fca5194873 | |||
| 
						 | 
					92d1fc159d | ||
| b632c287b0 | |||
| 5a98b13e70 | |||
| 3543253f3a | |||
| 
						 | 
					fff8399c9b | ||
| 
						 | 
					78b9b32dbd | ||
| 
						 | 
					c773e59432 | ||
| 535de65e17 | |||
| b80599eab2 | |||
| c161ef8f60 | |||
| 7ed160f266 | |||
| b23975227f | |||
| 314e69dd4b | |||
| 
						 | 
					10251e2f30 | ||
| 
						 | 
					cf06655008 | ||
| 
						 | 
					d5804ed4da | ||
| 
						 | 
					76500ca6b8 | ||
| 
						 | 
					f5c80e97c5 | ||
| 
						 | 
					154698c084 | ||
| 9837e77768 | |||
| 340bd82fe6 | |||
| b765ab9f48 | |||
| 6562549897 | |||
| 9089bc1d4e | |||
| 5a3609676e | |||
| 76c3082d5c | |||
| 7f7a8b7f5b | |||
| 
						 | 
					2d49504818 | ||
| 
						 | 
					5f4f0c67d5 | ||
| 
						 | 
					3a5f1f155a | ||
| 
						 | 
					3c9328fb92 | ||
| 
						 | 
					f262c54be2 | ||
| 
						 | 
					cb6e3e8b18 | ||
| 
						 | 
					7f9b8dcee4 | ||
| 
						 | 
					99740f4335 | ||
| 985bc0f1d5 | |||
| 1f9b3a297a | |||
| 98ca73d17d | |||
| 396ed223d3 | |||
| 
						 | 
					b0458f4de5 | ||
| 
						 | 
					b875d091ec | ||
| 
						 | 
					1a0b69d042 | ||
| 
						 | 
					e23a71a1a6 | ||
| 510ffa1509 | |||
| 
						 | 
					e17ef32cde | ||
| d4c3999d9c | |||
| b0695600b1 | |||
| 
						 | 
					22ecc7ade7 | ||
| a5102ebd03 | |||
| 
						 | 
					d01f08508f | ||
| e87d8f6922 | |||
| 
						 | 
					c044476014 | ||
| 75df43864b | |||
| 
						 | 
					174d0a38a1 | ||
| 
						 | 
					cf1aeefe67 | ||
| 280d927a03 | |||
| 
						 | 
					f62294ef20 | ||
| 237e354f80 | |||
| 
						 | 
					3a5172cb23 | ||
| 
						 | 
					f8f12cca62 | ||
| c5082e546b | |||
| 79bbab6a82 | |||
| 7376df7f30 | |||
| 53e7f42c59 | |||
| 7f8760c4e9 | |||
| 4330994b32 | |||
| 90d81d2178 | |||
| 
						 | 
					1cf5a01ad7 | ||
| 6385375fd6 | |||
| 8fc49f500e | |||
| 
						 | 
					49f5a01b58 | ||
| 48f4fe47ef | |||
| a819e1eb45 | |||
| 57e6342b5f | |||
| 58a543a3c8 | |||
| 1c915d99fe | |||
| 
						 | 
					8994360415 | ||
| a08fad421a | |||
| c975ecb16b | |||
| f553fe98e7 | |||
| aed40ec4ef | |||
| d3e126d86b | |||
| d36bc7480f | |||
| f608d42747 | |||
| 286c7789c0 | |||
| d67f62c0dc | |||
| 01c5ec7ebb | |||
| b2afd44dd6 | 
@@ -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
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										46
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										46
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							@@ -21,30 +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: 22.4
 | 
					          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
 | 
				
			||||||
        with:
 | 
					      #   with:
 | 
				
			||||||
          name: linux-builds
 | 
					      #     name: linux-builds
 | 
				
			||||||
          path: dist/
 | 
					      #     path: dist/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  build_on_mac:
 | 
					  # build_on_mac:
 | 
				
			||||||
    runs-on: macos-latest
 | 
					  #   runs-on: macos-latest
 | 
				
			||||||
    steps:
 | 
					  #   steps:
 | 
				
			||||||
      - uses: actions/checkout@master
 | 
					  #     - uses: actions/checkout@master
 | 
				
			||||||
      - uses: actions/setup-node@master
 | 
					  #     - uses: actions/setup-node@master
 | 
				
			||||||
        with:
 | 
					  #       with:
 | 
				
			||||||
          node-version: 22.4
 | 
					  #         node-version: 22.4
 | 
				
			||||||
      - run: npm install
 | 
					  #     - run: npm install
 | 
				
			||||||
      - run: npm run build
 | 
					  #     - run: npm run build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  build_on_win:
 | 
					  # build_on_win:
 | 
				
			||||||
    runs-on: windows-latest
 | 
					  #   runs-on: windows-latest
 | 
				
			||||||
    steps:
 | 
					  #   steps:
 | 
				
			||||||
      - uses: actions/checkout@master
 | 
					  #     - uses: actions/checkout@master
 | 
				
			||||||
      - uses: actions/setup-node@master
 | 
					  #     - uses: actions/setup-node@master
 | 
				
			||||||
        with:
 | 
					  #       with:
 | 
				
			||||||
          node-version: 22.4
 | 
					  #         node-version: 22.4
 | 
				
			||||||
      - run: npm install
 | 
					  #     - run: npm install
 | 
				
			||||||
      - run: npm run build
 | 
					  #     - run: npm run build
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										54
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										54
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@@ -21,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: 22.4
 | 
					          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
 | 
				
			||||||
@@ -29,30 +29,30 @@ jobs:
 | 
				
			|||||||
          name: linux-builds
 | 
					          name: linux-builds
 | 
				
			||||||
          path: dist/
 | 
					          path: dist/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  build_on_mac:
 | 
					  # build_on_mac:
 | 
				
			||||||
    runs-on: macos-latest
 | 
					  #   runs-on: macos-latest
 | 
				
			||||||
    steps:
 | 
					  #   steps:
 | 
				
			||||||
      - uses: actions/checkout@master
 | 
					  #     - uses: actions/checkout@master
 | 
				
			||||||
      - uses: actions/setup-node@master
 | 
					  #     - uses: actions/setup-node@master
 | 
				
			||||||
        with:
 | 
					  #       with:
 | 
				
			||||||
          node-version: 22.4
 | 
					  #         node-version: 22.4
 | 
				
			||||||
      - run: npm install
 | 
					  #     - run: npm install
 | 
				
			||||||
      - run: npm run build
 | 
					  #     - run: npm run build
 | 
				
			||||||
      - uses: actions/upload-artifact@master
 | 
					  #     - uses: actions/upload-artifact@master
 | 
				
			||||||
        with:
 | 
					  #       with:
 | 
				
			||||||
          name: mac-builds
 | 
					  #         name: mac-builds
 | 
				
			||||||
          path: ./dist/
 | 
					  #         path: ./dist/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  build_on_win:
 | 
					  # build_on_win:
 | 
				
			||||||
    runs-on: windows-latest
 | 
					  #   runs-on: windows-latest
 | 
				
			||||||
    steps:
 | 
					  #   steps:
 | 
				
			||||||
      - uses: actions/checkout@master
 | 
					  #     - uses: actions/checkout@master
 | 
				
			||||||
      - uses: actions/setup-node@master
 | 
					  #     - uses: actions/setup-node@master
 | 
				
			||||||
        with:
 | 
					  #       with:
 | 
				
			||||||
          node-version: 22.4
 | 
					  #         node-version: 22.4
 | 
				
			||||||
      - run: npm install
 | 
					  #     - run: npm install
 | 
				
			||||||
      - run: npm run build
 | 
					  #     - run: npm run build
 | 
				
			||||||
      - uses: actions/upload-artifact@master
 | 
					  #     - uses: actions/upload-artifact@master
 | 
				
			||||||
        with:
 | 
					  #       with:
 | 
				
			||||||
          name: windows-builds
 | 
					  #         name: windows-builds
 | 
				
			||||||
          path: dist/
 | 
					  #         path: dist/
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,16 +1,10 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "plugins": [
 | 
					  "plugins": ["stylelint-prettier"],
 | 
				
			||||||
    "stylelint-prettier"
 | 
					  "extends": ["stylelint-config-standard-scss"],
 | 
				
			||||||
  ],
 | 
					  "ignoreFiles": ["src/themes/**.scss"],
 | 
				
			||||||
  "extends": [
 | 
					 | 
				
			||||||
    "stylelint-config-standard-scss"
 | 
					 | 
				
			||||||
  ],
 | 
					 | 
				
			||||||
  "ignoreFiles": [
 | 
					 | 
				
			||||||
    "src/themes/**.scss"
 | 
					 | 
				
			||||||
  ],
 | 
					 | 
				
			||||||
  "rules": {
 | 
					  "rules": {
 | 
				
			||||||
    "prettier/prettier": true,
 | 
					    "prettier/prettier": true,
 | 
				
			||||||
    "scss/at-extend-no-missing-placeholder": null,
 | 
					    "scss/at-extend-no-missing-placeholder": null,
 | 
				
			||||||
    "no-descending-specificity": null
 | 
					    "no-descending-specificity": null
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										36
									
								
								.vscode/launch.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								.vscode/launch.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,36 @@
 | 
				
			|||||||
 | 
					{
 | 
				
			||||||
 | 
					  "version": "0.2.0",
 | 
				
			||||||
 | 
					  "configurations": [
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					      // we can use this to debug the main process
 | 
				
			||||||
 | 
					      "name": "Electron: Main",
 | 
				
			||||||
 | 
					      "type": "node",
 | 
				
			||||||
 | 
					      "request": "launch",
 | 
				
			||||||
 | 
					      "runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/electron",
 | 
				
			||||||
 | 
					      "args": [
 | 
				
			||||||
 | 
					        "${workspaceFolder}/ts-dist/main.js",
 | 
				
			||||||
 | 
					        "--no-sandbox",
 | 
				
			||||||
 | 
					        "--disable-gpu",
 | 
				
			||||||
 | 
					        "--disable-software-rasterizer",
 | 
				
			||||||
 | 
					        "--in-process-gpu",
 | 
				
			||||||
 | 
					        "--inspect=0.0.0.0:5858",
 | 
				
			||||||
 | 
					        "--remote-debugging-port=8315"
 | 
				
			||||||
 | 
					      ],
 | 
				
			||||||
 | 
					      "protocol": "inspector",
 | 
				
			||||||
 | 
					      "env": {
 | 
				
			||||||
 | 
					        "ELECTRON_DISABLE_SECURITY_WARNINGS": "false"
 | 
				
			||||||
 | 
					      },
 | 
				
			||||||
 | 
					      "outputCapture": "std"
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    // first run, then connect this to make sure we debug the UI
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					      "name": "Electron: Renderer",
 | 
				
			||||||
 | 
					      "type": "chrome",
 | 
				
			||||||
 | 
					      "request": "attach",
 | 
				
			||||||
 | 
					      "port": 8315,
 | 
				
			||||||
 | 
					      "webRoot": "${workspaceFolder}",
 | 
				
			||||||
 | 
					      "sourceMaps": true,
 | 
				
			||||||
 | 
					      "skipFiles": ["<node_internals>/**"]
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  ]
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										4
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							@@ -17,7 +17,9 @@
 | 
				
			|||||||
    "trackid",
 | 
					    "trackid",
 | 
				
			||||||
    "tracklist",
 | 
					    "tracklist",
 | 
				
			||||||
    "widevine",
 | 
					    "widevine",
 | 
				
			||||||
    "xesam"
 | 
					    "wvcus",
 | 
				
			||||||
 | 
					    "xesam",
 | 
				
			||||||
 | 
					    "xhayper"
 | 
				
			||||||
  ],
 | 
					  ],
 | 
				
			||||||
  "sonarlint.connectedMode.project": {
 | 
					  "sonarlint.connectedMode.project": {
 | 
				
			||||||
    "connectionId": "public-sonarcloud",
 | 
					    "connectionId": "public-sonarcloud",
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										30
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -4,6 +4,29 @@ 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]
 | 
					## [5.18.1]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Fixed the login bug
 | 
					- Fixed the login bug
 | 
				
			||||||
@@ -34,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
- Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)
 | 
					- Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)
 | 
				
			||||||
- Updated most dependency versions
 | 
					- Updated most dependency versions
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  - This includes Electron 31!
 | 
					  - This includes Electron 31!
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Added a channel selector so we can now use Tidal's staging environment directly from the app
 | 
					- Added a channel selector so we can now use Tidal's staging environment directly from the app
 | 
				
			||||||
@@ -125,10 +149,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
- Updated Electron to 28.1.1 (fixes [325](https://github.com/Mastermindzh/tidal-hifi/issues/325))
 | 
					- Updated Electron to 28.1.1 (fixes [325](https://github.com/Mastermindzh/tidal-hifi/issues/325))
 | 
				
			||||||
- Updated dependencies to latest
 | 
					- Updated dependencies to latest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  - added theme files to stylelint ignore
 | 
					  - added theme files to stylelint ignore
 | 
				
			||||||
  - fixed other stylelint errors
 | 
					  - fixed other stylelint errors
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Added functionality to favorite a song (fixes [#323](https://github.com/Mastermindzh/tidal-hifi/issues/323))
 | 
					- Added functionality to favorite a song (fixes [#323](https://github.com/Mastermindzh/tidal-hifi/issues/323))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  - Added a hotkey to favorite ("Add to collection") songs: Control+a
 | 
					  - Added a hotkey to favorite ("Add to collection") songs: Control+a
 | 
				
			||||||
  - Added the "favorite" field in the `mediaInfo` and the API `/current` endpoint
 | 
					  - Added the "favorite" field in the `mediaInfo` and the API `/current` endpoint
 | 
				
			||||||
  - Added an endpoint to toggle favoriting a song: `http://localhost:47836/favorite/toggle`
 | 
					  - Added an endpoint to toggle favoriting a song: `http://localhost:47836/favorite/toggle`
 | 
				
			||||||
@@ -149,10 +175,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 | 
				
			|||||||
- Added settings to customize the Discord rich presence information
 | 
					- Added settings to customize the Discord rich presence information
 | 
				
			||||||
  - Discord settings are now also collapsible like the ListenBrainz ones are
 | 
					  - Discord settings are now also collapsible like the ListenBrainz ones are
 | 
				
			||||||
- Restyled settings menu to include version number and useful links on the about page
 | 
					- Restyled settings menu to include version number and useful links on the about page
 | 
				
			||||||
    
 | 
					  
 | 
				
			||||||
- The ListenBrainz integration has been extended with a configurable (5 seconds by default) delay in song reporting so that it doesn't spam the API when you are cycling through songs.
 | 
					- The ListenBrainz integration has been extended with a configurable (5 seconds by default) delay in song reporting so that it doesn't spam the API when you are cycling through songs.
 | 
				
			||||||
- Custom CSS now also applies to settings window
 | 
					- Custom CSS now also applies to settings window
 | 
				
			||||||
    
 | 
					  
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## [5.6.0]
 | 
					## [5.6.0]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,4 +8,3 @@ Only the very latest 😄.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
If you find a vulnerability just add it as an issue.
 | 
					If you find a vulnerability just add it as an issue.
 | 
				
			||||||
If there's an especially bad vulnerability that you don't want to make public just send me a private message (email, discord, wherever).
 | 
					If there's an especially bad vulnerability that you don't want to make public just send me a private message (email, discord, wherever).
 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
appId: com.rickvanlieshout.tidal-hifi
 | 
					appId: com.rickvanlieshout.tidal-hifi
 | 
				
			||||||
electronVersion: 35.1.1
 | 
					electronVersion: 37.2.5
 | 
				
			||||||
electronDownload:
 | 
					electronDownload:
 | 
				
			||||||
  version: 35.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:
 | 
				
			||||||
@@ -17,25 +17,25 @@ linux:
 | 
				
			|||||||
  executableName: tidal-hifi
 | 
					  executableName: tidal-hifi
 | 
				
			||||||
  executableArgs:
 | 
					  executableArgs:
 | 
				
			||||||
    [
 | 
					    [
 | 
				
			||||||
      "--enable-features=UseOzonePlatform",
 | 
					 | 
				
			||||||
      "--ozone-platform-hint=auto",
 | 
					      "--ozone-platform-hint=auto",
 | 
				
			||||||
      "--enable-features=WaylandWindowDecorations",
 | 
					      "--enable-features=WaylandWindowDecorations",
 | 
				
			||||||
 | 
					      "--enable-wayland-ime",
 | 
				
			||||||
 | 
					      "--use-angle",
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
  desktop:
 | 
					  desktop:
 | 
				
			||||||
    entry: |
 | 
					    entry:
 | 
				
			||||||
      [Desktop Entry]
 | 
					      Encoding: "UTF-8"
 | 
				
			||||||
      Encoding=UTF-8
 | 
					      Name: "TIDAL Hi-Fi"
 | 
				
			||||||
      Name=TIDAL Hi-Fi
 | 
					      GenericName: "TIDAL Hi-Fi"
 | 
				
			||||||
      GenericName=TIDAL Hi-Fi
 | 
					      Comment: "The web version of listen.tidal.com running in electron with hifi support thanks to widevine."
 | 
				
			||||||
      Comment=The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
 | 
					      Icon: "tidal-hifi"
 | 
				
			||||||
      Icon=tidal-hifi
 | 
					      StartupNotify: "true"
 | 
				
			||||||
      StartupNotify=true
 | 
					      Terminal: "false"
 | 
				
			||||||
      Terminal=false
 | 
					      Type: "Application"
 | 
				
			||||||
      Type=Application
 | 
					      Categories: "Network;Application;AudioVideo;Audio;Video"
 | 
				
			||||||
      Categories=Network;Application;AudioVideo;Audio;Video
 | 
					      StartupWMClass: "tidal-hifi"
 | 
				
			||||||
      StartupWMClass=tidal-hifi
 | 
					      X-PulseAudio-Properties: "media.role=music"
 | 
				
			||||||
      X-PulseAudio-Properties=media.role=music
 | 
					      MimeType: "x-scheme-handler/tidal;"
 | 
				
			||||||
      MimeType=x-scheme-handler/tidal;
 | 
					 | 
				
			||||||
mac:
 | 
					mac:
 | 
				
			||||||
  category: public.app-category.entertainment
 | 
					  category: public.app-category.entertainment
 | 
				
			||||||
win:
 | 
					win:
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										1947
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1947
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										56
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										56
									
								
								package.json
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "tidal-hifi",
 | 
					  "name": "tidal-hifi",
 | 
				
			||||||
  "version": "5.18.1",
 | 
					  "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": {
 | 
				
			||||||
@@ -23,6 +23,7 @@
 | 
				
			|||||||
    "build-mac": "npm run builder -- -c ./build/electron-builder.yml -m",
 | 
					    "build-mac": "npm run builder -- -c ./build/electron-builder.yml -m",
 | 
				
			||||||
    "build-base": "npm run builder -- -c ./build/electron-builder.base.yml",
 | 
					    "build-base": "npm run builder -- -c ./build/electron-builder.base.yml",
 | 
				
			||||||
    "prebuilder": "npm run compile",
 | 
					    "prebuilder": "npm run compile",
 | 
				
			||||||
 | 
					    "prettier": "prettier . --write",
 | 
				
			||||||
    "builder": "electron-builder --publish=never",
 | 
					    "builder": "electron-builder --publish=never",
 | 
				
			||||||
    "sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css && sass --no-source-map src/themes:themes",
 | 
					    "sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css && sass --no-source-map src/themes:themes",
 | 
				
			||||||
    "style-lint": "npx stylelint **/*.scss",
 | 
					    "style-lint": "npx stylelint **/*.scss",
 | 
				
			||||||
@@ -40,44 +41,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.2",
 | 
					    "@electron/remote": "^2.1.3",
 | 
				
			||||||
    "@types/swagger-jsdoc": "^6.0.4",
 | 
					    "@types/swagger-jsdoc": "^6.0.4",
 | 
				
			||||||
    "@xhayper/discord-rpc": "^1.2.1",
 | 
					    "@xhayper/discord-rpc": "1.3.0",
 | 
				
			||||||
    "axios": "^1.8.4",
 | 
					    "axios": "^1.10.0",
 | 
				
			||||||
    "electron-store": "^8.2.0",
 | 
					 | 
				
			||||||
    "express": "^4.21.2",
 | 
					 | 
				
			||||||
    "hotkeys-js": "^3.13.9",
 | 
					 | 
				
			||||||
    "mpris-service": "^2.1.2",
 | 
					 | 
				
			||||||
    "sass": "^1.79.4",
 | 
					 | 
				
			||||||
    "swagger-ui-express": "^5.0.1",
 | 
					 | 
				
			||||||
    "cors": "^2.8.5",
 | 
					    "cors": "^2.8.5",
 | 
				
			||||||
    "request": "^2.88.2"
 | 
					    "electron-store": "^8.2.0",
 | 
				
			||||||
 | 
					    "express": "^5.1.0",
 | 
				
			||||||
 | 
					    "hotkeys-js": "^3.13.15",
 | 
				
			||||||
 | 
					    "mpris-service": "^2.1.2",
 | 
				
			||||||
 | 
					    "request": "^2.88.2",
 | 
				
			||||||
 | 
					    "sass": "1.91.0",
 | 
				
			||||||
 | 
					    "swagger-ui-express": "^5.0.1"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "devDependencies": {
 | 
					  "devDependencies": {
 | 
				
			||||||
    "@mastermindzh/prettier-config": "^1.0.0",
 | 
					    "@mastermindzh/prettier-config": "^1.0.0",
 | 
				
			||||||
    "@types/cors": "^2.8.17",
 | 
					    "@types/cors": "^2.8.19",
 | 
				
			||||||
    "@types/express": "^4.17.21",
 | 
					    "@types/express": "^5.0.3",
 | 
				
			||||||
    "@types/node": "^20.14.10",
 | 
					    "@types/node": "^22.16.2",
 | 
				
			||||||
    "@types/request": "^2.48.12",
 | 
					    "@types/request": "^2.48.12",
 | 
				
			||||||
    "@types/swagger-ui-express": "^4.1.6",
 | 
					    "@types/swagger-ui-express": "^4.1.8",
 | 
				
			||||||
    "@typescript-eslint/eslint-plugin": "^7.16.0",
 | 
					    "@typescript-eslint/eslint-plugin": "^8.36.0",
 | 
				
			||||||
    "@typescript-eslint/parser": "^7.15.0",
 | 
					    "@typescript-eslint/parser": "^8.36.0",
 | 
				
			||||||
    "copyfiles": "^2.4.1",
 | 
					    "copyfiles": "^2.4.1",
 | 
				
			||||||
    "electron": "github:castlabs/electron-releases#v35.1.1+wvcus",
 | 
					    "electron": "github:castlabs/electron-releases#v37.2.5+wvcus",
 | 
				
			||||||
    "electron-builder": "~26.0.12",
 | 
					    "electron-builder": "~26.0.12",
 | 
				
			||||||
    "eslint": "^8.57.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.1.4",
 | 
					    "node-abi": "^4.12.0",
 | 
				
			||||||
    "prettier": "^3.3.2",
 | 
					    "nodemon": "^3.1.10",
 | 
				
			||||||
    "stylelint": "^16.6.1",
 | 
					    "prettier": "^3.6.2",
 | 
				
			||||||
    "stylelint-config-standard": "^36.0.1",
 | 
					    "stylelint": "^16.21.1",
 | 
				
			||||||
    "stylelint-config-standard-scss": "^13.1.0",
 | 
					    "stylelint-config-standard": "^39.0.0",
 | 
				
			||||||
    "stylelint-prettier": "^5.0.0",
 | 
					    "stylelint-config-standard-scss": "^15.0.1",
 | 
				
			||||||
 | 
					    "stylelint-prettier": "^5.0.3",
 | 
				
			||||||
    "swagger-jsdoc": "^6.2.8",
 | 
					    "swagger-jsdoc": "^6.2.8",
 | 
				
			||||||
    "ts-node": "^10.9.2",
 | 
					    "ts-node": "^10.9.2",
 | 
				
			||||||
    "tsc-watch": "^6.2.0",
 | 
					    "tsc-watch": "^7.1.1",
 | 
				
			||||||
    "typescript": "^5.5.3"
 | 
					    "typescript": "^5.8.3"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "prettier": "@mastermindzh/prettier-config"
 | 
					  "prettier": "@mastermindzh/prettier-config"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								renovate.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								renovate.json
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,4 @@
 | 
				
			|||||||
 | 
					{
 | 
				
			||||||
 | 
					  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
 | 
				
			||||||
 | 
					  "ignoreDeps": ["@types/node", "electron-store", "@xhayper/discord-rpc"]
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -0,0 +1,6 @@
 | 
				
			|||||||
 | 
					export type DomControllerOptions = {
 | 
				
			||||||
 | 
					  /**
 | 
				
			||||||
 | 
					   * Interval that tidal-hifi scrapes the dom for information
 | 
				
			||||||
 | 
					   */
 | 
				
			||||||
 | 
					  refreshInterval: number;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
							
								
								
									
										354
									
								
								src/TidalControllers/DomController/DomTidalController.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										354
									
								
								src/TidalControllers/DomController/DomTidalController.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,354 @@
 | 
				
			|||||||
 | 
					import { convertDurationToSeconds } from "../../features/time/parse";
 | 
				
			||||||
 | 
					import { MediaInfo } from "../../models/mediaInfo";
 | 
				
			||||||
 | 
					import { MediaStatus } from "../../models/mediaStatus";
 | 
				
			||||||
 | 
					import { RepeatState } from "../../models/repeatState";
 | 
				
			||||||
 | 
					import { TidalController } from "../TidalController";
 | 
				
			||||||
 | 
					import { DomControllerOptions } from "./DomControllerOptions";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export class DomTidalController implements TidalController<DomControllerOptions> {
 | 
				
			||||||
 | 
					  private updateSubscriber: (state: Partial<MediaInfo>) => void;
 | 
				
			||||||
 | 
					  private currentlyPlaying = MediaStatus.paused;
 | 
				
			||||||
 | 
					  private currentRepeatState: RepeatState = RepeatState.off;
 | 
				
			||||||
 | 
					  private currentShuffleState = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  private readonly elements = {
 | 
				
			||||||
 | 
					    play: '*[data-test="play"]',
 | 
				
			||||||
 | 
					    pause: '*[data-test="pause"]',
 | 
				
			||||||
 | 
					    next: '*[data-test="next"]',
 | 
				
			||||||
 | 
					    previous: 'button[data-test="previous"]',
 | 
				
			||||||
 | 
					    title: '*[data-test^="footer-track-title"]',
 | 
				
			||||||
 | 
					    artists: '*[data-test^="grid-item-detail-text-title-artist"]',
 | 
				
			||||||
 | 
					    home: '*[data-test="menu--home"]',
 | 
				
			||||||
 | 
					    back: '[title^="Back"]',
 | 
				
			||||||
 | 
					    forward: '[title^="Next"]',
 | 
				
			||||||
 | 
					    search: '[class^="searchField"]',
 | 
				
			||||||
 | 
					    shuffle: '*[data-test="shuffle"]',
 | 
				
			||||||
 | 
					    repeat: '*[data-test="repeat"]',
 | 
				
			||||||
 | 
					    account: '*[data-test^="profile-image-button"]',
 | 
				
			||||||
 | 
					    settings: '*[data-test^="sidebar-menu-button"]',
 | 
				
			||||||
 | 
					    openSettings: '*[data-test^="open-settings"]',
 | 
				
			||||||
 | 
					    media: '*[data-test="current-media-imagery"]',
 | 
				
			||||||
 | 
					    image: "img",
 | 
				
			||||||
 | 
					    current: '*[data-test="current-time"]',
 | 
				
			||||||
 | 
					    duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
 | 
				
			||||||
 | 
					    bar: '*[data-test="progress-bar"]',
 | 
				
			||||||
 | 
					    footer: "#footerPlayer",
 | 
				
			||||||
 | 
					    mediaItem: "[data-type='mediaItem']",
 | 
				
			||||||
 | 
					    album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
 | 
				
			||||||
 | 
					    playing_from: '*[class^="playingFrom"] span:nth-child(2)',
 | 
				
			||||||
 | 
					    queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
 | 
				
			||||||
 | 
					    currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
 | 
				
			||||||
 | 
					    album_name_cell: '[class^="album"]',
 | 
				
			||||||
 | 
					    tracklist_row: '[data-test="tracklist-row"]',
 | 
				
			||||||
 | 
					    volume: '*[data-test="volume"]',
 | 
				
			||||||
 | 
					    favorite: '*[data-test="footer-favorite-button"]',
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Get an element from the dom
 | 
				
			||||||
 | 
					     * @param {*} key key in elements object to fetch
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    get: function (key: string) {
 | 
				
			||||||
 | 
					      return globalThis.document.querySelector(this[key.toLowerCase()]) ?? "";
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Get the icon of the current media
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    getSongIcon: function () {
 | 
				
			||||||
 | 
					      const figure = this.get("media");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      if (figure) {
 | 
				
			||||||
 | 
					        const mediaElement = figure.querySelector(this["image"]);
 | 
				
			||||||
 | 
					        if (mediaElement) {
 | 
				
			||||||
 | 
					          return mediaElement.src.replace("80x80", "640x640");
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      return "";
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * returns an array of all artists in the current media
 | 
				
			||||||
 | 
					     * @returns {Array} artists
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    getArtistsArray: function () {
 | 
				
			||||||
 | 
					      const footer = this.get("footer");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      if (footer) {
 | 
				
			||||||
 | 
					        const artists = footer.querySelectorAll(this.artists);
 | 
				
			||||||
 | 
					        if (artists)
 | 
				
			||||||
 | 
					          return Array.from(artists).map((artist) => (artist as HTMLElement).textContent);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      return [];
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * unify the artists array into a string separated by commas
 | 
				
			||||||
 | 
					     * @param {Array} artistsArray
 | 
				
			||||||
 | 
					     * @returns {String} artists
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    getArtistsString: function (artistsArray: string[]) {
 | 
				
			||||||
 | 
					      if (artistsArray.length > 0) return artistsArray.join(", ");
 | 
				
			||||||
 | 
					      return "unknown artist(s)";
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    getAlbumName: function () {
 | 
				
			||||||
 | 
					      try {
 | 
				
			||||||
 | 
					        //If listening to an album, get its name from the header title
 | 
				
			||||||
 | 
					        if (globalThis.location.href.includes("/album/")) {
 | 
				
			||||||
 | 
					          const albumName = globalThis.document.querySelector(this.album_header_title);
 | 
				
			||||||
 | 
					          if (albumName) {
 | 
				
			||||||
 | 
					            return albumName.textContent;
 | 
				
			||||||
 | 
					          }
 | 
				
			||||||
 | 
					          //If listening to a playlist or a mix, get album name from the list
 | 
				
			||||||
 | 
					        } else if (
 | 
				
			||||||
 | 
					          globalThis.location.href.includes("/playlist/") ||
 | 
				
			||||||
 | 
					          globalThis.location.href.includes("/mix/")
 | 
				
			||||||
 | 
					        ) {
 | 
				
			||||||
 | 
					          if (this.currentlyPlaying === MediaStatus.playing) {
 | 
				
			||||||
 | 
					            // find the currently playing element from the list (which might be in an album icon), traverse back up to the mediaItem (row) and select the album cell.
 | 
				
			||||||
 | 
					            // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent
 | 
				
			||||||
 | 
					            const row = window.document
 | 
				
			||||||
 | 
					              .querySelector(this.currentlyPlaying)
 | 
				
			||||||
 | 
					              .closest(this.mediaItem);
 | 
				
			||||||
 | 
					            if (row) {
 | 
				
			||||||
 | 
					              return row.querySelector(this.album_name_cell).textContent;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					          }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // see whether we're on the queue page and get it from there
 | 
				
			||||||
 | 
					        const queueAlbumName = this.getText("queue_album");
 | 
				
			||||||
 | 
					        if (queueAlbumName) {
 | 
				
			||||||
 | 
					          return queueAlbumName;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return "";
 | 
				
			||||||
 | 
					      } catch {
 | 
				
			||||||
 | 
					        return "";
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    isMuted: function () {
 | 
				
			||||||
 | 
					      return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    isFavorite: function () {
 | 
				
			||||||
 | 
					      return this.get("favorite").getAttribute("aria-checked") === "true";
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Shorthand function to get the text of a dom element
 | 
				
			||||||
 | 
					     * @param {*} key key in elements object to fetch
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    getText: function (key: string) {
 | 
				
			||||||
 | 
					      const element = this.get(key);
 | 
				
			||||||
 | 
					      return element ? element.textContent : "";
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Shorthand function to click a dom element
 | 
				
			||||||
 | 
					     * @param {*} key key in elements object to fetch
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    click: function (key: string) {
 | 
				
			||||||
 | 
					      this.get(key).click();
 | 
				
			||||||
 | 
					      return this;
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Shorthand function to focus a dom element
 | 
				
			||||||
 | 
					     * @param {*} key key in elements object to fetch
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    focus: function (key: string) {
 | 
				
			||||||
 | 
					      return this.get(key).focus();
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void {
 | 
				
			||||||
 | 
					    this.updateSubscriber = callback;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  bootstrap(options: DomControllerOptions): void {
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Checks if Tidal is playing a video or song by grabbing the "a" element from the title.
 | 
				
			||||||
 | 
					     * If it's a song it returns the track URL, if not it will return undefined
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    const getTrackURL = () => {
 | 
				
			||||||
 | 
					      const id = this.getTrackId();
 | 
				
			||||||
 | 
					      return `https://tidal.com/browse/track/${id}`;
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    setInterval(async () => {
 | 
				
			||||||
 | 
					      const title = this.getTitle();
 | 
				
			||||||
 | 
					      const artistsArray = this.getArtists();
 | 
				
			||||||
 | 
					      const artistsString = this.getArtistsString();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      const current = this.getCurrentTime();
 | 
				
			||||||
 | 
					      const currentStatus = this.getCurrentlyPlayingStatus();
 | 
				
			||||||
 | 
					      const shuffleState = this.getCurrentShuffleState();
 | 
				
			||||||
 | 
					      const repeatState = this.getCurrentRepeatState();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      const playStateChanged = currentStatus != this.currentlyPlaying;
 | 
				
			||||||
 | 
					      const shuffleStateChanged = shuffleState != this.currentShuffleState;
 | 
				
			||||||
 | 
					      const repeatStateChanged = repeatState != this.currentRepeatState;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      if (playStateChanged) this.currentlyPlaying = currentStatus;
 | 
				
			||||||
 | 
					      if (shuffleStateChanged) this.currentShuffleState = shuffleState;
 | 
				
			||||||
 | 
					      if (repeatStateChanged) this.currentRepeatState = repeatState;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      const album = this.getAlbumName();
 | 
				
			||||||
 | 
					      const duration = this.getDuration();
 | 
				
			||||||
 | 
					      const updatedInfo = {
 | 
				
			||||||
 | 
					        title,
 | 
				
			||||||
 | 
					        artists: artistsString,
 | 
				
			||||||
 | 
					        artistsArray,
 | 
				
			||||||
 | 
					        album: album,
 | 
				
			||||||
 | 
					        playingFrom: this.getPlayingFrom(),
 | 
				
			||||||
 | 
					        status: currentStatus,
 | 
				
			||||||
 | 
					        url: getTrackURL(),
 | 
				
			||||||
 | 
					        current,
 | 
				
			||||||
 | 
					        currentInSeconds: convertDurationToSeconds(current),
 | 
				
			||||||
 | 
					        duration,
 | 
				
			||||||
 | 
					        durationInSeconds: convertDurationToSeconds(duration),
 | 
				
			||||||
 | 
					        image: this.getSongIcon(),
 | 
				
			||||||
 | 
					        favorite: this.isFavorite(),
 | 
				
			||||||
 | 
					        player: {
 | 
				
			||||||
 | 
					          status: currentStatus,
 | 
				
			||||||
 | 
					          shuffle: shuffleState,
 | 
				
			||||||
 | 
					          repeat: repeatState,
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					      };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      this.updateSubscriber(updatedInfo);
 | 
				
			||||||
 | 
					    }, options.refreshInterval);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  playPause = (): void => {
 | 
				
			||||||
 | 
					    const play = this.elements.get("play");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (play) {
 | 
				
			||||||
 | 
					      this.elements.click("play");
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					      this.elements.click("pause");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  goToHome(): void {
 | 
				
			||||||
 | 
					    this.elements.click("home");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  openSettings(): void {
 | 
				
			||||||
 | 
					    this.elements.click("settings");
 | 
				
			||||||
 | 
					    setTimeout(() => {
 | 
				
			||||||
 | 
					      this.elements.click("openSettings");
 | 
				
			||||||
 | 
					    }, 100);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  toggleFavorite(): void {
 | 
				
			||||||
 | 
					    this.elements.click("favorite");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  back(): void {
 | 
				
			||||||
 | 
					    this.elements.click("back");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  forward(): void {
 | 
				
			||||||
 | 
					    this.elements.click("forward");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  repeat(): void {
 | 
				
			||||||
 | 
					    this.elements.click("repeat");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  next(): void {
 | 
				
			||||||
 | 
					    this.elements.click("next");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  previous(): void {
 | 
				
			||||||
 | 
					    this.elements.click("previous");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  toggleShuffle(): void {
 | 
				
			||||||
 | 
					    this.elements.click("shuffle");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getCurrentlyPlayingStatus() {
 | 
				
			||||||
 | 
					    const pause = this.elements.get("pause");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // if pause button is visible tidal is playing
 | 
				
			||||||
 | 
					    if (pause) {
 | 
				
			||||||
 | 
					      return MediaStatus.playing;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					      return MediaStatus.paused;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  getCurrentShuffleState() {
 | 
				
			||||||
 | 
					    const shuffle = this.elements.get("shuffle");
 | 
				
			||||||
 | 
					    return shuffle?.getAttribute("aria-checked") === "true";
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  getCurrentRepeatState() {
 | 
				
			||||||
 | 
					    const repeat = this.elements.get("repeat");
 | 
				
			||||||
 | 
					    switch (repeat?.getAttribute("data-type")) {
 | 
				
			||||||
 | 
					      case "button__repeatAll":
 | 
				
			||||||
 | 
					        return RepeatState.all;
 | 
				
			||||||
 | 
					      case "button__repeatSingle":
 | 
				
			||||||
 | 
					        return RepeatState.single;
 | 
				
			||||||
 | 
					      default:
 | 
				
			||||||
 | 
					        return RepeatState.off;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  play(): void {
 | 
				
			||||||
 | 
					    this.playPause();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  pause(): void {
 | 
				
			||||||
 | 
					    this.playPause();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  stop(): void {
 | 
				
			||||||
 | 
					    this.playPause();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  getCurrentPosition() {
 | 
				
			||||||
 | 
					    return this.elements.getText("current");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getCurrentPositionInSeconds(): number {
 | 
				
			||||||
 | 
					    return convertDurationToSeconds(this.getCurrentPosition());
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  getTrackId(): string {
 | 
				
			||||||
 | 
					    const URLelement = this.elements.get("title").querySelector("a");
 | 
				
			||||||
 | 
					    if (URLelement !== null) {
 | 
				
			||||||
 | 
					      const id = URLelement.href.replace(/\D/g, "");
 | 
				
			||||||
 | 
					      return id;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return window.location.toString();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  getCurrentTime(): string {
 | 
				
			||||||
 | 
					    return this.elements.getText("current");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getDuration(): string {
 | 
				
			||||||
 | 
					    return this.elements.getText("duration");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  getAlbumName(): string {
 | 
				
			||||||
 | 
					    return this.elements.getAlbumName();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getTitle(): string {
 | 
				
			||||||
 | 
					    return this.elements.getText("title");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getArtists(): string[] {
 | 
				
			||||||
 | 
					    return this.elements.getArtistsArray();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  getArtistsString(): string {
 | 
				
			||||||
 | 
					    return this.elements.getArtistsString(this.getArtists());
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getPlayingFrom(): string {
 | 
				
			||||||
 | 
					    return this.elements.getText("playing_from");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  isFavorite(): boolean {
 | 
				
			||||||
 | 
					    return this.elements.isFavorite();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getSongIcon(): string {
 | 
				
			||||||
 | 
					    return this.elements.getSongIcon();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										53
									
								
								src/TidalControllers/TidalController.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										53
									
								
								src/TidalControllers/TidalController.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,53 @@
 | 
				
			|||||||
 | 
					import { MediaInfo } from "../models/mediaInfo";
 | 
				
			||||||
 | 
					import { MediaStatus } from "../models/mediaStatus";
 | 
				
			||||||
 | 
					import { RepeatState } from "../models/repeatState";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export interface TidalController<TBootstrapOptions = object> {
 | 
				
			||||||
 | 
					  goToHome(): void;
 | 
				
			||||||
 | 
					  openSettings(): void;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  /**
 | 
				
			||||||
 | 
					   * Play or pause the current media
 | 
				
			||||||
 | 
					   */
 | 
				
			||||||
 | 
					  playPause(): void;
 | 
				
			||||||
 | 
					  play(): void;
 | 
				
			||||||
 | 
					  pause(): void;
 | 
				
			||||||
 | 
					  stop(): void;
 | 
				
			||||||
 | 
					  toggleFavorite(): void;
 | 
				
			||||||
 | 
					  back(): void;
 | 
				
			||||||
 | 
					  forward(): void;
 | 
				
			||||||
 | 
					  repeat(): void;
 | 
				
			||||||
 | 
					  next(): void;
 | 
				
			||||||
 | 
					  previous(): void;
 | 
				
			||||||
 | 
					  toggleShuffle(): void;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  /**
 | 
				
			||||||
 | 
					   * Optional setup/startup/bootstrap for this controller
 | 
				
			||||||
 | 
					   */
 | 
				
			||||||
 | 
					  bootstrap(options: TBootstrapOptions): void;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  /**
 | 
				
			||||||
 | 
					   * Method that triggers every time the MediaInfo updates
 | 
				
			||||||
 | 
					   * @param callback function that receives the updated media info
 | 
				
			||||||
 | 
					   */
 | 
				
			||||||
 | 
					  onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  /**
 | 
				
			||||||
 | 
					   * Update the current status of tidal (e.g playing or paused)
 | 
				
			||||||
 | 
					   */
 | 
				
			||||||
 | 
					  getCurrentlyPlayingStatus(): MediaStatus;
 | 
				
			||||||
 | 
					  getCurrentShuffleState(): boolean;
 | 
				
			||||||
 | 
					  getCurrentRepeatState(): RepeatState;
 | 
				
			||||||
 | 
					  getCurrentPosition(): string;
 | 
				
			||||||
 | 
					  getCurrentPositionInSeconds(): number;
 | 
				
			||||||
 | 
					  getTrackId(): string;
 | 
				
			||||||
 | 
					  getCurrentTime(): string;
 | 
				
			||||||
 | 
					  getDuration(): string;
 | 
				
			||||||
 | 
					  getAlbumName(): string;
 | 
				
			||||||
 | 
					  getTitle(): string;
 | 
				
			||||||
 | 
					  getArtists(): string[];
 | 
				
			||||||
 | 
					  getArtistsString(): string;
 | 
				
			||||||
 | 
					  getPlayingFrom(): string;
 | 
				
			||||||
 | 
					  getSongIcon(): string;
 | 
				
			||||||
 | 
					  isFavorite(): boolean;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										137
									
								
								src/TidalControllers/apiController/TidalApiController.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										137
									
								
								src/TidalControllers/apiController/TidalApiController.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,137 @@
 | 
				
			|||||||
 | 
					import { Logger } from "../../features/logger";
 | 
				
			||||||
 | 
					import { MediaInfo } from "../../models/mediaInfo";
 | 
				
			||||||
 | 
					import { MediaStatus } from "../../models/mediaStatus";
 | 
				
			||||||
 | 
					import { RepeatState } from "../../models/repeatState";
 | 
				
			||||||
 | 
					import { DomTidalController } from "../DomController/DomTidalController";
 | 
				
			||||||
 | 
					import { TidalController } from "../TidalController";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export class TidalApiController implements TidalController {
 | 
				
			||||||
 | 
					  public domMediaController: TidalController;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  constructor() {
 | 
				
			||||||
 | 
					    this.domMediaController = new DomTidalController();
 | 
				
			||||||
 | 
					    Logger.log("[TidalApiController] - Initialized domController as a backup controller");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  // eslint-disable-next-line @typescript-eslint/no-unused-vars
 | 
				
			||||||
 | 
					  onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void {
 | 
				
			||||||
 | 
					    globalThis.alert("method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  bootstrap(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented: ");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  // example of using the original domMediaController as a fallback
 | 
				
			||||||
 | 
					  goToHome(): void {
 | 
				
			||||||
 | 
					    this.domMediaController.goToHome();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  getDuration(): string {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getAlbumName(): string {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getTitle(): string {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getArtists(): string[] {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getArtistsString(): string {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getPlayingFrom(): string {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  isFavorite(): boolean {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getSongIcon(): string {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getCurrentTime(): string {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getCurrentPosition(): string {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getCurrentPositionInSeconds(): number {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getTrackId(): string {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  play(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  pause(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  stop(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getCurrentShuffleState(): boolean {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getCurrentRepeatState(): RepeatState {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  getCurrentlyPlayingStatus(): MediaStatus {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  back(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  forward(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  repeat(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  next(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  previous(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  toggleShuffle(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  openSettings(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  toggleFavorite(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  playPause(): void {
 | 
				
			||||||
 | 
					    globalThis.alert("Method not implemented");
 | 
				
			||||||
 | 
					    throw new Error("Method not implemented.");
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										4
									
								
								src/constants/controller.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								src/constants/controller.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,4 @@
 | 
				
			|||||||
 | 
					export const tidalControllers = {
 | 
				
			||||||
 | 
					  domController: "domController",
 | 
				
			||||||
 | 
					  tidalApiController: "tidalApiController",
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
@@ -13,6 +13,7 @@ export const settings = {
 | 
				
			|||||||
  advanced: {
 | 
					  advanced: {
 | 
				
			||||||
    root: "advanced",
 | 
					    root: "advanced",
 | 
				
			||||||
    tidalUrl: "advanced.tidalUrl",
 | 
					    tidalUrl: "advanced.tidalUrl",
 | 
				
			||||||
 | 
					    controllerType: "advanced.controllerType",
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  api: "api",
 | 
					  api: "api",
 | 
				
			||||||
  apiSettings: {
 | 
					  apiSettings: {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -88,8 +88,9 @@ export const addCurrentInfo = (expressApp: Router) => {
 | 
				
			|||||||
   *             schema:
 | 
					   *             schema:
 | 
				
			||||||
   *               $ref: '#/components/schemas/MediaInfo'
 | 
					   *               $ref: '#/components/schemas/MediaInfo'
 | 
				
			||||||
   */
 | 
					   */
 | 
				
			||||||
  expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
 | 
					  expressApp.get("/current", (_req, res) => {
 | 
				
			||||||
 | 
					    res.json({ ...mediaInfo, artist: mediaInfo.artists });
 | 
				
			||||||
 | 
					  });
 | 
				
			||||||
  /**
 | 
					  /**
 | 
				
			||||||
   * @swagger
 | 
					   * @swagger
 | 
				
			||||||
   * /current/image:
 | 
					   * /current/image:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,8 +21,12 @@ export const startApi = (mainWindow: BrowserWindow) => {
 | 
				
			|||||||
  expressApp.use(cors());
 | 
					  expressApp.use(cors());
 | 
				
			||||||
  expressApp.use(express.json());
 | 
					  expressApp.use(express.json());
 | 
				
			||||||
  expressApp.use("/docs", swaggerUi.serve, swaggerUi.setup(swaggerSpec));
 | 
					  expressApp.use("/docs", swaggerUi.serve, swaggerUi.setup(swaggerSpec));
 | 
				
			||||||
  expressApp.get("/", (req, res) => res.send("Hello World!"));
 | 
					  expressApp.get("/", (req, res) => {
 | 
				
			||||||
  expressApp.get("/swagger.json", (req, res) => res.json(swaggerSpec));
 | 
					    res.send("Hello World!");
 | 
				
			||||||
 | 
					  });
 | 
				
			||||||
 | 
					  expressApp.get("/swagger.json", (req, res) => {
 | 
				
			||||||
 | 
					    res.json(swaggerSpec);
 | 
				
			||||||
 | 
					  });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // add features
 | 
					  // add features
 | 
				
			||||||
  addLegacyApi(expressApp, mainWindow);
 | 
					  addLegacyApi(expressApp, mainWindow);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@
 | 
				
			|||||||
  "openapi": "3.1.0",
 | 
					  "openapi": "3.1.0",
 | 
				
			||||||
  "info": {
 | 
					  "info": {
 | 
				
			||||||
    "title": "TIDAL Hi-Fi API",
 | 
					    "title": "TIDAL Hi-Fi API",
 | 
				
			||||||
    "version": "5.18.1",
 | 
					    "version": "5.20.1",
 | 
				
			||||||
    "description": "",
 | 
					    "description": "",
 | 
				
			||||||
    "license": {
 | 
					    "license": {
 | 
				
			||||||
      "name": "MIT",
 | 
					      "name": "MIT",
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										15
									
								
								src/features/icon/downloadIcon.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								src/features/icon/downloadIcon.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,15 @@
 | 
				
			|||||||
 | 
					import { downloadFile } from "../../scripts/download";
 | 
				
			||||||
 | 
					import { Logger } from "../logger";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export const downloadIcon = async (imagePath: string, destination: string): Promise<string> => {
 | 
				
			||||||
 | 
					  if (imagePath.startsWith("http")) {
 | 
				
			||||||
 | 
					    try {
 | 
				
			||||||
 | 
					      return await downloadFile(imagePath, destination);
 | 
				
			||||||
 | 
					    } catch (error) {
 | 
				
			||||||
 | 
					      Logger.log("Downloading file failed", { error });
 | 
				
			||||||
 | 
					      return "";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  return "";
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
							
								
								
									
										15
									
								
								src/features/tidal/url.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								src/features/tidal/url.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,15 @@
 | 
				
			|||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Build a track url given the id
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					export const getTrackURL = (trackId: string) => {
 | 
				
			||||||
 | 
					  return `https://tidal.com/browse/track/${trackId}`;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Retrieve the universal link given a regular track link
 | 
				
			||||||
 | 
					 * @param trackLink
 | 
				
			||||||
 | 
					 * @returns
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					export const getUniversalLink = (trackLink: string) => {
 | 
				
			||||||
 | 
					  return `${trackLink}?u`;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
@@ -32,7 +32,8 @@ const PROTOCOL_PREFIX = "tidal";
 | 
				
			|||||||
const windowPreferences = {
 | 
					const windowPreferences = {
 | 
				
			||||||
  sandbox: false,
 | 
					  sandbox: false,
 | 
				
			||||||
  plugins: true,
 | 
					  plugins: true,
 | 
				
			||||||
  devTools: true, // I like tinkering, others might too
 | 
					  devTools: true, // Ensure devTools is enabled for debugging
 | 
				
			||||||
 | 
					  contextIsolation: false, // Disable context isolation for debugging
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
setDefaultFlags(app);
 | 
					setDefaultFlags(app);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,9 +1,11 @@
 | 
				
			|||||||
import { MediaPlayerInfo } from "./mediaPlayerInfo";
 | 
					import { MediaPlayerInfo } from "./mediaPlayerInfo";
 | 
				
			||||||
import { MediaStatus } from "./mediaStatus";
 | 
					import { MediaStatus } from "./mediaStatus";
 | 
				
			||||||
 | 
					import { RepeatState } from "./repeatState";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export interface MediaInfo {
 | 
					export interface MediaInfo {
 | 
				
			||||||
  title: string;
 | 
					  title: string;
 | 
				
			||||||
  artists: string;
 | 
					  artists: string;
 | 
				
			||||||
 | 
					  artistsArray?: string[];
 | 
				
			||||||
  album: string;
 | 
					  album: string;
 | 
				
			||||||
  icon: string;
 | 
					  icon: string;
 | 
				
			||||||
  status: MediaStatus;
 | 
					  status: MediaStatus;
 | 
				
			||||||
@@ -17,3 +19,30 @@ export interface MediaInfo {
 | 
				
			|||||||
  favorite: boolean;
 | 
					  favorite: boolean;
 | 
				
			||||||
  player?: MediaPlayerInfo;
 | 
					  player?: MediaPlayerInfo;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export const getEmptyMediaInfo = () => {
 | 
				
			||||||
 | 
					  const emptyState: MediaInfo = {
 | 
				
			||||||
 | 
					    title: "",
 | 
				
			||||||
 | 
					    artists: "",
 | 
				
			||||||
 | 
					    artistsArray: [],
 | 
				
			||||||
 | 
					    album: "",
 | 
				
			||||||
 | 
					    playingFrom: "",
 | 
				
			||||||
 | 
					    status: MediaStatus.playing,
 | 
				
			||||||
 | 
					    url: "",
 | 
				
			||||||
 | 
					    current: "00:00",
 | 
				
			||||||
 | 
					    currentInSeconds: 100,
 | 
				
			||||||
 | 
					    duration: "00:00",
 | 
				
			||||||
 | 
					    durationInSeconds: 100,
 | 
				
			||||||
 | 
					    image: "",
 | 
				
			||||||
 | 
					    icon: "",
 | 
				
			||||||
 | 
					    favorite: true,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    player: {
 | 
				
			||||||
 | 
					      status: MediaStatus.playing,
 | 
				
			||||||
 | 
					      shuffle: true,
 | 
				
			||||||
 | 
					      repeat: RepeatState.all,
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  return emptyState;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,7 +61,8 @@ let adBlock: HTMLInputElement,
 | 
				
			|||||||
  discord_show_song: HTMLInputElement,
 | 
					  discord_show_song: HTMLInputElement,
 | 
				
			||||||
  discord_show_idle: HTMLInputElement,
 | 
					  discord_show_idle: HTMLInputElement,
 | 
				
			||||||
  discord_idle_text: HTMLInputElement,
 | 
					  discord_idle_text: HTMLInputElement,
 | 
				
			||||||
  discord_using_text: HTMLInputElement;
 | 
					  discord_using_text: HTMLInputElement,
 | 
				
			||||||
 | 
					  controllerType: HTMLSelectElement;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
addCustomCss(app);
 | 
					addCustomCss(app);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -157,6 +158,7 @@ function refreshSettings() {
 | 
				
			|||||||
    discord_show_idle.checked = settingsStore.get(settings.discord.showIdle);
 | 
					    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);
 | 
				
			||||||
 | 
					    controllerType.value = settingsStore.get(settings.advanced.controllerType);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // set state of all switches with additional settings
 | 
					    // set state of all switches with additional settings
 | 
				
			||||||
    Object.values(switchesWithSettings).forEach((settingSwitch) => {
 | 
					    Object.values(switchesWithSettings).forEach((settingSwitch) => {
 | 
				
			||||||
@@ -277,6 +279,7 @@ window.addEventListener("DOMContentLoaded", () => {
 | 
				
			|||||||
  discord_show_idle = get("discord_show_idle");
 | 
					  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");
 | 
				
			||||||
 | 
					  controllerType = get<HTMLSelectElement>("controllerType");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  refreshSettings();
 | 
					  refreshSettings();
 | 
				
			||||||
  addInputListener(adBlock, settings.adBlock);
 | 
					  addInputListener(adBlock, settings.adBlock);
 | 
				
			||||||
@@ -322,4 +325,5 @@ window.addEventListener("DOMContentLoaded", () => {
 | 
				
			|||||||
  addInputListener(discord_show_idle, settings.discord.showIdle);
 | 
					  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);
 | 
				
			||||||
 | 
					  addSelectListener(controllerType, settings.advanced.controllerType);
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
<!DOCTYPE html>
 | 
					<!doctype html>
 | 
				
			||||||
<html lang="en">
 | 
					<html lang="en">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<head>
 | 
					<head>
 | 
				
			||||||
@@ -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.0/css/font-awesome.min.css">
 | 
				
			||||||
</head>
 | 
					</head>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<body class="settings-window">
 | 
					<body class="settings-window">
 | 
				
			||||||
@@ -109,7 +109,10 @@
 | 
				
			|||||||
            <div class="group__option">
 | 
					            <div class="group__option">
 | 
				
			||||||
              <div class="group__description">
 | 
					              <div class="group__description">
 | 
				
			||||||
                <h4>Static Window Title</h4>
 | 
					                <h4>Static Window Title</h4>
 | 
				
			||||||
                <p>Makes the window title "TIDAL Hi-Fi" instead of changing to the currently playing song.</p>
 | 
					                <p>
 | 
				
			||||||
 | 
					                  Makes the window title "TIDAL Hi-Fi" instead of changing to the currently
 | 
				
			||||||
 | 
					                  playing song.
 | 
				
			||||||
 | 
					                </p>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
              <label class="switch">
 | 
					              <label class="switch">
 | 
				
			||||||
                <input id="staticWindowTitle" type="checkbox" />
 | 
					                <input id="staticWindowTitle" type="checkbox" />
 | 
				
			||||||
@@ -157,8 +160,8 @@
 | 
				
			|||||||
            <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 media information.
 | 
					                TIDAL Hi-Fi has a built-in web API to allow users to get current media
 | 
				
			||||||
                You can optionally enable playback control as well.
 | 
					                information. You can optionally enable playback control as well.
 | 
				
			||||||
              </p>
 | 
					              </p>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div class="group__option">
 | 
					            <div class="group__option">
 | 
				
			||||||
@@ -180,7 +183,8 @@
 | 
				
			|||||||
            <div class="group__option">
 | 
					            <div class="group__option">
 | 
				
			||||||
              <div class="group__description">
 | 
					              <div class="group__description">
 | 
				
			||||||
                <h4>API hostname</h4>
 | 
					                <h4>API hostname</h4>
 | 
				
			||||||
                <p>By default (127.0.0.1) only local apps can interface with the API. <br />
 | 
					                <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 />
 | 
					                  Change to 0.0.0.0 to allow <strong>anyone</strong> to interact with it. <br />
 | 
				
			||||||
                  Other options are available
 | 
					                  Other options are available
 | 
				
			||||||
                </p>
 | 
					                </p>
 | 
				
			||||||
@@ -236,7 +240,6 @@
 | 
				
			|||||||
              </label>
 | 
					              </label>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div id="discord_options">
 | 
					            <div id="discord_options">
 | 
				
			||||||
 | 
					 | 
				
			||||||
              <div class="group__option" class="hidden">
 | 
					              <div class="group__option" class="hidden">
 | 
				
			||||||
                <div class="group__description">
 | 
					                <div class="group__description">
 | 
				
			||||||
                  <h4>Show Idle Text</h4>
 | 
					                  <h4>Show Idle Text</h4>
 | 
				
			||||||
@@ -259,7 +262,9 @@
 | 
				
			|||||||
              <div class="group__option" class="hidden">
 | 
					              <div class="group__option" class="hidden">
 | 
				
			||||||
                <div class="group__description">
 | 
					                <div class="group__description">
 | 
				
			||||||
                  <h4>Using Tidal Text</h4>
 | 
					                  <h4>Using Tidal Text</h4>
 | 
				
			||||||
                  <p>The text displayed on Discord's rich presence while "showSong" is turned off</p>
 | 
					                  <p>
 | 
				
			||||||
 | 
					                    The text displayed on Discord's rich presence while "showSong" is turned off
 | 
				
			||||||
 | 
					                  </p>
 | 
				
			||||||
                  <input id="discord_using_text" type="text" class="text-input" name="discord_using_text" />
 | 
					                  <input id="discord_using_text" type="text" class="text-input" name="discord_using_text" />
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
@@ -276,7 +281,6 @@
 | 
				
			|||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
              <div id="discord_show_song_options" class="hidden">
 | 
					              <div id="discord_show_song_options" class="hidden">
 | 
				
			||||||
 | 
					 | 
				
			||||||
                <div class="group__option" class="hidden">
 | 
					                <div class="group__option" class="hidden">
 | 
				
			||||||
                  <div class="group__description">
 | 
					                  <div class="group__description">
 | 
				
			||||||
                    <h4>Include timestamps</h4>
 | 
					                    <h4>Include timestamps</h4>
 | 
				
			||||||
@@ -304,7 +308,6 @@
 | 
				
			|||||||
                  </div>
 | 
					                  </div>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
 | 
					 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
          <div class="group">
 | 
					          <div class="group">
 | 
				
			||||||
@@ -323,7 +326,10 @@
 | 
				
			|||||||
              <div class="group__option">
 | 
					              <div class="group__option">
 | 
				
			||||||
                <div class="group__description">
 | 
					                <div class="group__description">
 | 
				
			||||||
                  <h4>ListenBrainz API Url</h4>
 | 
					                  <h4>ListenBrainz API Url</h4>
 | 
				
			||||||
                  <p>There are multiple instances for ListenBrainz you can set the corresponding API url below.</p>
 | 
					                  <p>
 | 
				
			||||||
 | 
					                    There are multiple instances for ListenBrainz you can set the corresponding
 | 
				
			||||||
 | 
					                    API url below.
 | 
				
			||||||
 | 
					                  </p>
 | 
				
			||||||
                  <input id="ListenBrainzAPI" type="text" class="text-input" name="ListenBrainzAPI" />
 | 
					                  <input id="ListenBrainzAPI" type="text" class="text-input" name="ListenBrainzAPI" />
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
@@ -337,8 +343,10 @@
 | 
				
			|||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div class="group__description">
 | 
					            <div class="group__description">
 | 
				
			||||||
              <h4>ScrobbleDelay</h4>
 | 
					              <h4>ScrobbleDelay</h4>
 | 
				
			||||||
              <p>The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when you fast forward
 | 
					              <p>
 | 
				
			||||||
                immediately</p>
 | 
					                The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when
 | 
				
			||||||
 | 
					                you fast forward 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>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
@@ -351,10 +359,9 @@
 | 
				
			|||||||
              <div class="group__description">
 | 
					              <div class="group__description">
 | 
				
			||||||
                <h4>Update frequency</h4>
 | 
					                <h4>Update frequency</h4>
 | 
				
			||||||
                <p>
 | 
					                <p>
 | 
				
			||||||
                  The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback info by scraping the
 | 
					                  The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback
 | 
				
			||||||
                  website.
 | 
					                  info by scraping the website. The default of 500 seems to work in more cases but
 | 
				
			||||||
                  The default of 500 seems to work in more cases but if you are fine with a bit more resource usage you
 | 
					                  if you are fine with a bit more resource usage you can decrease it as well.
 | 
				
			||||||
                  can decrease it as well.
 | 
					 | 
				
			||||||
                </p>
 | 
					                </p>
 | 
				
			||||||
                <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
 | 
					                <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
@@ -369,7 +376,19 @@
 | 
				
			|||||||
                </p>
 | 
					                </p>
 | 
				
			||||||
                <select class="select-input" id="channel" name="channel">
 | 
					                <select class="select-input" id="channel" name="channel">
 | 
				
			||||||
                  <option value="https://listen.tidal.com">Stable (listen.tidal.com)</option>
 | 
					                  <option value="https://listen.tidal.com">Stable (listen.tidal.com)</option>
 | 
				
			||||||
                  <option value="https://listen.stage.tidal.com">Staging (listen.stage.tidal.com)</option>
 | 
					                  <option value="https://listen.stage.tidal.com">
 | 
				
			||||||
 | 
					                    Staging (listen.stage.tidal.com)
 | 
				
			||||||
 | 
					                  </option>
 | 
				
			||||||
 | 
					                </select>
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div class="group__option">
 | 
				
			||||||
 | 
					              <div class="group__description">
 | 
				
			||||||
 | 
					                <h4>Controller Type</h4>
 | 
				
			||||||
 | 
					                <p>Select the type of controller to use.</p>
 | 
				
			||||||
 | 
					                <select id="controllerType" class="select-input">
 | 
				
			||||||
 | 
					                  <option value="domController">DOM Controller</option>
 | 
				
			||||||
 | 
					                  <option value="tidalApiController">Tidal Api Controller (beta)</option>
 | 
				
			||||||
                </select>
 | 
					                </select>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
@@ -415,7 +434,8 @@
 | 
				
			|||||||
              <div class="group__description">
 | 
					              <div class="group__description">
 | 
				
			||||||
                <h4>Wayland support</h4>
 | 
					                <h4>Wayland support</h4>
 | 
				
			||||||
                <p>
 | 
					                <p>
 | 
				
			||||||
                  Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland window system.
 | 
					                  Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland
 | 
				
			||||||
 | 
					                  window system.
 | 
				
			||||||
                </p>
 | 
					                </p>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
              <label class="switch">
 | 
					              <label class="switch">
 | 
				
			||||||
@@ -433,7 +453,8 @@
 | 
				
			|||||||
              <div class="group__description">
 | 
					              <div class="group__description">
 | 
				
			||||||
                <h4>Custom CSS</h4>
 | 
					                <h4>Custom CSS</h4>
 | 
				
			||||||
                <p>
 | 
					                <p>
 | 
				
			||||||
                  The css that you put in here will be injected into a style tag in the head of the document.
 | 
					                  The css that you put in here will be injected into a style tag in the head of
 | 
				
			||||||
 | 
					                  the document.
 | 
				
			||||||
                </p>
 | 
					                </p>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
@@ -448,9 +469,7 @@
 | 
				
			|||||||
                <p>
 | 
					                <p>
 | 
				
			||||||
                  Select a theme below or "Tidal - Default" to return to the original Tidal look.
 | 
					                  Select a theme below or "Tidal - Default" to return to the original Tidal look.
 | 
				
			||||||
                </p>
 | 
					                </p>
 | 
				
			||||||
                <select class="select-input" id="themesList" name="themesList">
 | 
					                <select class="select-input" id="themesList" name="themesList"></select>
 | 
				
			||||||
 | 
					 | 
				
			||||||
                </select>
 | 
					 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -458,14 +477,14 @@
 | 
				
			|||||||
              <div class="group__description">
 | 
					              <div class="group__description">
 | 
				
			||||||
                <h4>Upload new themes</h4>
 | 
					                <h4>Upload new themes</h4>
 | 
				
			||||||
                <p>
 | 
					                <p>
 | 
				
			||||||
                  Click the button and select the css files to import. They will be added to the theme list
 | 
					                  Click the button and select the css files to import. They will be added to the
 | 
				
			||||||
                  automatically.
 | 
					                  theme list automatically.
 | 
				
			||||||
                </p>
 | 
					                </p>
 | 
				
			||||||
                <div class="file-drop-area">
 | 
					                <div class="file-drop-area">
 | 
				
			||||||
                  <div>
 | 
					                  <div>
 | 
				
			||||||
                    <span class="file-btn">Choose files</span>
 | 
					                    <span class="file-btn">Choose files</span>
 | 
				
			||||||
                    <span id="file-message" class="file-msg">or drag and drop files here</span>
 | 
					                    <span id="file-message" class="file-msg">or drag and drop files here</span>
 | 
				
			||||||
                    <input id="theme-files" class="file-input" type="file" accept=".css" multiple>
 | 
					                    <input id="theme-files" class="file-input" type="file" accept=".css" multiple />
 | 
				
			||||||
                  </div>
 | 
					                  </div>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
@@ -478,7 +497,7 @@
 | 
				
			|||||||
          <h4>TIDAL Hi-Fi</h4>
 | 
					          <h4>TIDAL Hi-Fi</h4>
 | 
				
			||||||
          <div class="about-section__version">
 | 
					          <div class="about-section__version">
 | 
				
			||||||
            <a target="_blank" rel="noopener"
 | 
					            <a target="_blank" rel="noopener"
 | 
				
			||||||
              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.18.1">5.18.1</a>
 | 
					              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 target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
 | 
					            <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										435
									
								
								src/preload.ts
									
									
									
									
									
								
							
							
						
						
									
										435
									
								
								src/preload.ts
									
									
									
									
									
								
							@@ -1,8 +1,10 @@
 | 
				
			|||||||
import { app, dialog, Notification } from "@electron/remote";
 | 
					import { app, dialog, Notification } from "@electron/remote";
 | 
				
			||||||
import { clipboard, ipcRenderer } from "electron";
 | 
					import { clipboard, ipcRenderer } from "electron";
 | 
				
			||||||
import Player from "mpris-service";
 | 
					import Player from "mpris-service";
 | 
				
			||||||
 | 
					import { tidalControllers } from "./constants/controller";
 | 
				
			||||||
import { globalEvents } from "./constants/globalEvents";
 | 
					import { globalEvents } from "./constants/globalEvents";
 | 
				
			||||||
import { settings } from "./constants/settings";
 | 
					import { settings } from "./constants/settings";
 | 
				
			||||||
 | 
					import { downloadIcon } from "./features/icon/downloadIcon";
 | 
				
			||||||
import {
 | 
					import {
 | 
				
			||||||
  ListenBrainz,
 | 
					  ListenBrainz,
 | 
				
			||||||
  ListenBrainzConstants,
 | 
					  ListenBrainzConstants,
 | 
				
			||||||
@@ -10,181 +12,57 @@ 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 { SharingService } from "./features/sharingService/sharingService";
 | 
					 | 
				
			||||||
import { addCustomCss } from "./features/theming/theming";
 | 
					import { addCustomCss } from "./features/theming/theming";
 | 
				
			||||||
 | 
					import { getTrackURL, getUniversalLink } from "./features/tidal/url";
 | 
				
			||||||
import { convertDurationToSeconds } from "./features/time/parse";
 | 
					import { convertDurationToSeconds } from "./features/time/parse";
 | 
				
			||||||
import { MediaInfo } from "./models/mediaInfo";
 | 
					import { getEmptyMediaInfo, MediaInfo } from "./models/mediaInfo";
 | 
				
			||||||
import { MediaStatus } from "./models/mediaStatus";
 | 
					import { MediaStatus } from "./models/mediaStatus";
 | 
				
			||||||
import { RepeatState } from "./models/repeatState";
 | 
					 | 
				
			||||||
import { downloadFile } from "./scripts/download";
 | 
					 | 
				
			||||||
import { addHotkey } from "./scripts/hotkeys";
 | 
					import { addHotkey } from "./scripts/hotkeys";
 | 
				
			||||||
import { ObjectToDotNotation } from "./scripts/objectUtilities";
 | 
					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";
 | 
				
			||||||
 | 
					import { TidalApiController } from "./TidalControllers/apiController/TidalApiController";
 | 
				
			||||||
 | 
					import { DomControllerOptions } from "./TidalControllers/DomController/DomControllerOptions";
 | 
				
			||||||
 | 
					import { DomTidalController } from "./TidalControllers/DomController/DomTidalController";
 | 
				
			||||||
 | 
					import { TidalController } from "./TidalControllers/TidalController";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const notificationPath = `${app.getPath("userData")}/notification.jpg`;
 | 
					const notificationPath = `${app.getPath("userData")}/notification.jpg`;
 | 
				
			||||||
 | 
					const staticTitle = "TIDAL Hi-Fi";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
let currentSong = "";
 | 
					let currentSong = "";
 | 
				
			||||||
let player: Player;
 | 
					let player: Player;
 | 
				
			||||||
let currentPlayStatus = MediaStatus.paused;
 | 
					 | 
				
			||||||
let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
 | 
					let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
 | 
				
			||||||
let scrobbleWaitingForDelay = false;
 | 
					let scrobbleWaitingForDelay = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
let currentlyPlaying = MediaStatus.paused;
 | 
					 | 
				
			||||||
let currentRepeatState: RepeatState = RepeatState.off;
 | 
					 | 
				
			||||||
let currentShuffleState = false;
 | 
					 | 
				
			||||||
let currentMediaInfo: MediaInfo;
 | 
					 | 
				
			||||||
let currentNotification: Electron.Notification;
 | 
					let currentNotification: Electron.Notification;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const elements = {
 | 
					let tidalController: TidalController;
 | 
				
			||||||
  play: '*[data-test="play"]',
 | 
					let controllerOptions = {};
 | 
				
			||||||
  pause: '*[data-test="pause"]',
 | 
					let currentMediaInfo = getEmptyMediaInfo();
 | 
				
			||||||
  next: '*[data-test="next"]',
 | 
					 | 
				
			||||||
  previous: 'button[data-test="previous"]',
 | 
					 | 
				
			||||||
  title: '*[data-test^="footer-track-title"]',
 | 
					 | 
				
			||||||
  artists: '*[data-test^="grid-item-detail-text-title-artist"]',
 | 
					 | 
				
			||||||
  home: '*[data-test="menu--home"]',
 | 
					 | 
				
			||||||
  back: '[title^="Back"]',
 | 
					 | 
				
			||||||
  forward: '[title^="Next"]',
 | 
					 | 
				
			||||||
  search: '[class^="searchField"]',
 | 
					 | 
				
			||||||
  shuffle: '*[data-test="shuffle"]',
 | 
					 | 
				
			||||||
  repeat: '*[data-test="repeat"]',
 | 
					 | 
				
			||||||
  account: '*[data-test^="profile-image-button"]',
 | 
					 | 
				
			||||||
  settings: '*[data-test^="sidebar-menu-button"]',
 | 
					 | 
				
			||||||
  openSettings: '*[data-test^="open-settings"]',
 | 
					 | 
				
			||||||
  media: '*[data-test="current-media-imagery"]',
 | 
					 | 
				
			||||||
  image: "img",
 | 
					 | 
				
			||||||
  current: '*[data-test="current-time"]',
 | 
					 | 
				
			||||||
  duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
 | 
					 | 
				
			||||||
  bar: '*[data-test="progress-bar"]',
 | 
					 | 
				
			||||||
  footer: "#footerPlayer",
 | 
					 | 
				
			||||||
  mediaItem: "[data-type='mediaItem']",
 | 
					 | 
				
			||||||
  album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
 | 
					 | 
				
			||||||
  playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
 | 
					 | 
				
			||||||
  queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
 | 
					 | 
				
			||||||
  currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
 | 
					 | 
				
			||||||
  album_name_cell: '[class^="album"]',
 | 
					 | 
				
			||||||
  tracklist_row: '[data-test="tracklist-row"]',
 | 
					 | 
				
			||||||
  volume: '*[data-test="volume"]',
 | 
					 | 
				
			||||||
  favorite: '*[data-test="footer-favorite-button"]',
 | 
					 | 
				
			||||||
  /**
 | 
					 | 
				
			||||||
   * Get an element from the dom
 | 
					 | 
				
			||||||
   * @param {*} key key in elements object to fetch
 | 
					 | 
				
			||||||
   */
 | 
					 | 
				
			||||||
  get: function (key: string) {
 | 
					 | 
				
			||||||
    return window.document.querySelector(this[key.toLowerCase()]);
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /**
 | 
					switch (settingsStore.get(settings.advanced.controllerType)) {
 | 
				
			||||||
   * Get the icon of the current media
 | 
					  case tidalControllers.tidalApiController: {
 | 
				
			||||||
   */
 | 
					    tidalController = new TidalApiController();
 | 
				
			||||||
  getSongIcon: function () {
 | 
					    Logger.log("TidalApiController initialized");
 | 
				
			||||||
    const figure = this.get("media");
 | 
					    break;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (figure) {
 | 
					  default: {
 | 
				
			||||||
      const mediaElement = figure.querySelector(this["image"]);
 | 
					    tidalController = new DomTidalController();
 | 
				
			||||||
      if (mediaElement) {
 | 
					    const domControllerOptions: DomControllerOptions = {
 | 
				
			||||||
        return mediaElement.src.replace("80x80", "640x640");
 | 
					      refreshInterval: getDomUpdateFrequency(),
 | 
				
			||||||
      }
 | 
					    };
 | 
				
			||||||
    }
 | 
					    controllerOptions = domControllerOptions;
 | 
				
			||||||
 | 
					    Logger.log("domController initialized");
 | 
				
			||||||
    return "";
 | 
					    break;
 | 
				
			||||||
  },
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
  /**
 | 
					 | 
				
			||||||
   * returns an array of all artists in the current media
 | 
					 | 
				
			||||||
   * @returns {Array} artists
 | 
					 | 
				
			||||||
   */
 | 
					 | 
				
			||||||
  getArtistsArray: function () {
 | 
					 | 
				
			||||||
    const footer = this.get("footer");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (footer) {
 | 
					 | 
				
			||||||
      const artists = footer.querySelectorAll(this.artists);
 | 
					 | 
				
			||||||
      if (artists) return Array.from(artists).map((artist) => (artist as HTMLElement).textContent);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    return [];
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  /**
 | 
					 | 
				
			||||||
   * unify the artists array into a string separated by commas
 | 
					 | 
				
			||||||
   * @param {Array} artistsArray
 | 
					 | 
				
			||||||
   * @returns {String} artists
 | 
					 | 
				
			||||||
   */
 | 
					 | 
				
			||||||
  getArtistsString: function (artistsArray: string[]) {
 | 
					 | 
				
			||||||
    if (artistsArray.length > 0) return artistsArray.join(", ");
 | 
					 | 
				
			||||||
    return "unknown artist(s)";
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  getAlbumName: function () {
 | 
					 | 
				
			||||||
    //If listening to an album, get its name from the header title
 | 
					 | 
				
			||||||
    if (window.location.href.includes("/album/")) {
 | 
					 | 
				
			||||||
      const albumName = window.document.querySelector(this.album_header_title);
 | 
					 | 
				
			||||||
      if (albumName) {
 | 
					 | 
				
			||||||
        return albumName.textContent;
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
      //If listening to a playlist or a mix, get album name from the list
 | 
					 | 
				
			||||||
    } else if (
 | 
					 | 
				
			||||||
      window.location.href.includes("/playlist/") ||
 | 
					 | 
				
			||||||
      window.location.href.includes("/mix/")
 | 
					 | 
				
			||||||
    ) {
 | 
					 | 
				
			||||||
      if (currentPlayStatus === MediaStatus.playing) {
 | 
					 | 
				
			||||||
        // find the currently playing element from the list (which might be in an album icon), traverse back up to the mediaItem (row) and select the album cell.
 | 
					 | 
				
			||||||
        // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent
 | 
					 | 
				
			||||||
        const row = window.document.querySelector(this.currentlyPlaying).closest(this.mediaItem);
 | 
					 | 
				
			||||||
        if (row) {
 | 
					 | 
				
			||||||
          return row.querySelector(this.album_name_cell).textContent;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    // see whether we're on the queue page and get it from there
 | 
					 | 
				
			||||||
    const queueAlbumName = elements.getText("queue_album");
 | 
					 | 
				
			||||||
    if (queueAlbumName) {
 | 
					 | 
				
			||||||
      return queueAlbumName;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    return "";
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  isMuted: function () {
 | 
					 | 
				
			||||||
    return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  isFavorite: function () {
 | 
					 | 
				
			||||||
    return this.get("favorite").getAttribute("aria-checked") === "true";
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  /**
 | 
					 | 
				
			||||||
   * Shorthand function to get the text of a dom element
 | 
					 | 
				
			||||||
   * @param {*} key key in elements object to fetch
 | 
					 | 
				
			||||||
   */
 | 
					 | 
				
			||||||
  getText: function (key: string) {
 | 
					 | 
				
			||||||
    const element = this.get(key);
 | 
					 | 
				
			||||||
    return element ? element.textContent : "";
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  /**
 | 
					 | 
				
			||||||
   * Shorthand function to click a dom element
 | 
					 | 
				
			||||||
   * @param {*} key key in elements object to fetch
 | 
					 | 
				
			||||||
   */
 | 
					 | 
				
			||||||
  click: function (key: string) {
 | 
					 | 
				
			||||||
    this.get(key).click();
 | 
					 | 
				
			||||||
    return this;
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  /**
 | 
					 | 
				
			||||||
   * Shorthand function to focus a dom element
 | 
					 | 
				
			||||||
   * @param {*} key key in elements object to fetch
 | 
					 | 
				
			||||||
   */
 | 
					 | 
				
			||||||
  focus: function (key: string) {
 | 
					 | 
				
			||||||
    return this.get(key).focus();
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Get the update frequency from the store
 | 
					 * Get the update frequency from the store
 | 
				
			||||||
 * make sure it returns a number, if not use the default
 | 
					 * make sure it returns a number, if not use the default
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
function getUpdateFrequency() {
 | 
					function getDomUpdateFrequency() {
 | 
				
			||||||
  const storeValue = settingsStore.get<string, number>(settings.updateFrequency);
 | 
					  const storeValue = settingsStore.get<string, number>(settings.updateFrequency);
 | 
				
			||||||
  const defaultValue = 500;
 | 
					  const defaultValue = 500;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -195,19 +73,6 @@ function getUpdateFrequency() {
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * Play or pause the current media
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
function playPause() {
 | 
					 | 
				
			||||||
  const play = elements.get("play");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if (play) {
 | 
					 | 
				
			||||||
    elements.click("play");
 | 
					 | 
				
			||||||
  } else {
 | 
					 | 
				
			||||||
    elements.click("pause");
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Clears the old listenbrainz data on launch
 | 
					 * Clears the old listenbrainz data on launch
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
@@ -220,30 +85,26 @@ ListenBrainzStore.clear();
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
function addHotKeys() {
 | 
					function addHotKeys() {
 | 
				
			||||||
  if (settingsStore.get(settings.enableCustomHotkeys)) {
 | 
					  if (settingsStore.get(settings.enableCustomHotkeys)) {
 | 
				
			||||||
    addHotkey("Control+p", function () {
 | 
					    addHotkey("Control+p", () => {
 | 
				
			||||||
      elements.click("settings");
 | 
					      tidalController.openSettings();
 | 
				
			||||||
      setTimeout(() => {
 | 
					 | 
				
			||||||
        elements.click("openSettings");
 | 
					 | 
				
			||||||
      }, 100);
 | 
					 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
    addHotkey("Control+l", function () {
 | 
					    addHotkey("Control+l", () => {
 | 
				
			||||||
      handleLogout();
 | 
					      handleLogout();
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
 | 
					    addHotkey("Control+a", () => {
 | 
				
			||||||
    addHotkey("Control+a", function () {
 | 
					      tidalController.toggleFavorite();
 | 
				
			||||||
      elements.click("favorite");
 | 
					 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    addHotkey("Control+h", function () {
 | 
					    addHotkey("Control+h", () => {
 | 
				
			||||||
      elements.click("home");
 | 
					      tidalController.goToHome();
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    addHotkey("backspace", function () {
 | 
					    addHotkey("backspace", function () {
 | 
				
			||||||
      elements.click("back");
 | 
					      tidalController.back();
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    addHotkey("shift+backspace", function () {
 | 
					    addHotkey("shift+backspace", function () {
 | 
				
			||||||
      elements.click("forward");
 | 
					      tidalController.forward();
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    addHotkey("control+u", function () {
 | 
					    addHotkey("control+u", function () {
 | 
				
			||||||
@@ -252,10 +113,10 @@ function addHotKeys() {
 | 
				
			|||||||
    });
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    addHotkey("control+r", function () {
 | 
					    addHotkey("control+r", function () {
 | 
				
			||||||
      elements.click("repeat");
 | 
					      tidalController.repeat();
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
    addHotkey("control+w", async function () {
 | 
					    addHotkey("control+w", async function () {
 | 
				
			||||||
      const url = SharingService.getUniversalLink(getTrackURL());
 | 
					      const url = getUniversalLink(getTrackURL(tidalController.getTrackId()));
 | 
				
			||||||
      clipboard.writeText(url);
 | 
					      clipboard.writeText(url);
 | 
				
			||||||
      new Notification({
 | 
					      new Notification({
 | 
				
			||||||
        title: `Universal link generated: `,
 | 
					        title: `Universal link generated: `,
 | 
				
			||||||
@@ -319,22 +180,22 @@ function addIPCEventListeners() {
 | 
				
			|||||||
        case globalEvents.playPause:
 | 
					        case globalEvents.playPause:
 | 
				
			||||||
        case globalEvents.play:
 | 
					        case globalEvents.play:
 | 
				
			||||||
        case globalEvents.pause:
 | 
					        case globalEvents.pause:
 | 
				
			||||||
          playPause();
 | 
					          tidalController.playPause();
 | 
				
			||||||
          break;
 | 
					          break;
 | 
				
			||||||
        case globalEvents.next:
 | 
					        case globalEvents.next:
 | 
				
			||||||
          elements.click("next");
 | 
					          tidalController.next();
 | 
				
			||||||
          break;
 | 
					          break;
 | 
				
			||||||
        case globalEvents.previous:
 | 
					        case globalEvents.previous:
 | 
				
			||||||
          elements.click("previous");
 | 
					          tidalController.previous();
 | 
				
			||||||
          break;
 | 
					          break;
 | 
				
			||||||
        case globalEvents.toggleFavorite:
 | 
					        case globalEvents.toggleFavorite:
 | 
				
			||||||
          elements.click("favorite");
 | 
					          tidalController.toggleFavorite();
 | 
				
			||||||
          break;
 | 
					          break;
 | 
				
			||||||
        case globalEvents.toggleShuffle:
 | 
					        case globalEvents.toggleShuffle:
 | 
				
			||||||
          elements.click("shuffle");
 | 
					          tidalController.toggleShuffle();
 | 
				
			||||||
          break;
 | 
					          break;
 | 
				
			||||||
        case globalEvents.toggleRepeat:
 | 
					        case globalEvents.toggleRepeat:
 | 
				
			||||||
          elements.click("repeat");
 | 
					          tidalController.repeat();
 | 
				
			||||||
          break;
 | 
					          break;
 | 
				
			||||||
        default:
 | 
					        default:
 | 
				
			||||||
          break;
 | 
					          break;
 | 
				
			||||||
@@ -343,48 +204,6 @@ function addIPCEventListeners() {
 | 
				
			|||||||
  });
 | 
					  });
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * Update the current status of tidal (e.g playing or paused)
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
function getCurrentlyPlayingStatus() {
 | 
					 | 
				
			||||||
  const pause = elements.get("pause");
 | 
					 | 
				
			||||||
  let status = undefined;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  // if pause button is visible tidal is playing
 | 
					 | 
				
			||||||
  if (pause) {
 | 
					 | 
				
			||||||
    status = MediaStatus.playing;
 | 
					 | 
				
			||||||
  } else {
 | 
					 | 
				
			||||||
    status = MediaStatus.paused;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
  return status;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
function getCurrentShuffleState() {
 | 
					 | 
				
			||||||
  const shuffle = elements.get("shuffle");
 | 
					 | 
				
			||||||
  return shuffle?.getAttribute("aria-checked") === "true";
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
function getCurrentRepeatState() {
 | 
					 | 
				
			||||||
  const repeat = elements.get("repeat");
 | 
					 | 
				
			||||||
  switch (repeat?.getAttribute("data-type")) {
 | 
					 | 
				
			||||||
    case "button__repeatAll":
 | 
					 | 
				
			||||||
      return RepeatState.all;
 | 
					 | 
				
			||||||
    case "button__repeatSingle":
 | 
					 | 
				
			||||||
      return RepeatState.single;
 | 
					 | 
				
			||||||
    default:
 | 
					 | 
				
			||||||
      return RepeatState.off;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * Convert the duration from MM:SS to seconds
 | 
					 | 
				
			||||||
 * @param {*} duration
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
function convertDuration(duration: string) {
 | 
					 | 
				
			||||||
  const parts = duration.split(":");
 | 
					 | 
				
			||||||
  return parseInt(parts[1]) + 60 * parseInt(parts[0]);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Update Tidal-hifi's media info
 | 
					 * Update Tidal-hifi's media info
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
@@ -392,7 +211,6 @@ function convertDuration(duration: string) {
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
 | 
					function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
 | 
				
			||||||
  if (mediaInfo) {
 | 
					  if (mediaInfo) {
 | 
				
			||||||
    currentMediaInfo = mediaInfo;
 | 
					 | 
				
			||||||
    ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
 | 
					    ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
 | 
				
			||||||
    updateMpris(mediaInfo);
 | 
					    updateMpris(mediaInfo);
 | 
				
			||||||
    updateListenBrainz(mediaInfo);
 | 
					    updateListenBrainz(mediaInfo);
 | 
				
			||||||
@@ -455,16 +273,35 @@ function addMPRIS() {
 | 
				
			|||||||
          const eventValue = events[eventName];
 | 
					          const eventValue = events[eventName];
 | 
				
			||||||
          switch (events[eventValue]) {
 | 
					          switch (events[eventValue]) {
 | 
				
			||||||
            case events.playpause:
 | 
					            case events.playpause:
 | 
				
			||||||
              playPause();
 | 
					              tidalController.playPause();
 | 
				
			||||||
 | 
					              break;
 | 
				
			||||||
 | 
					            case events.next:
 | 
				
			||||||
 | 
					              tidalController.next();
 | 
				
			||||||
 | 
					              break;
 | 
				
			||||||
 | 
					            case events.previous:
 | 
				
			||||||
 | 
					              tidalController.previous();
 | 
				
			||||||
 | 
					              break;
 | 
				
			||||||
 | 
					            case events.pause:
 | 
				
			||||||
 | 
					              tidalController.pause();
 | 
				
			||||||
 | 
					              break;
 | 
				
			||||||
 | 
					            case events.stop:
 | 
				
			||||||
 | 
					              tidalController.stop();
 | 
				
			||||||
 | 
					              break;
 | 
				
			||||||
 | 
					            case events.play:
 | 
				
			||||||
 | 
					              tidalController.play();
 | 
				
			||||||
 | 
					              break;
 | 
				
			||||||
 | 
					            case events.loopStatus:
 | 
				
			||||||
 | 
					              tidalController.repeat();
 | 
				
			||||||
 | 
					              break;
 | 
				
			||||||
 | 
					            case events.shuffle:
 | 
				
			||||||
 | 
					              tidalController.toggleShuffle();
 | 
				
			||||||
              break;
 | 
					              break;
 | 
				
			||||||
            default:
 | 
					 | 
				
			||||||
              elements.click(eventValue);
 | 
					 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
      });
 | 
					      });
 | 
				
			||||||
      // Override get position function
 | 
					      // Override get position function
 | 
				
			||||||
      player.getPosition = function () {
 | 
					      player.getPosition = function () {
 | 
				
			||||||
        return convertDuration(elements.getText("current")) * 1000 * 1000;
 | 
					        return tidalController.getCurrentPositionInSeconds();
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
      player.on("quit", function () {
 | 
					      player.on("quit", function () {
 | 
				
			||||||
        app.quit();
 | 
					        app.quit();
 | 
				
			||||||
@@ -485,8 +322,8 @@ function updateMpris(mediaInfo: MediaInfo) {
 | 
				
			|||||||
        "xesam:album": mediaInfo.album,
 | 
					        "xesam:album": mediaInfo.album,
 | 
				
			||||||
        "xesam:url": mediaInfo.url,
 | 
					        "xesam:url": mediaInfo.url,
 | 
				
			||||||
        "mpris:artUrl": mediaInfo.image,
 | 
					        "mpris:artUrl": mediaInfo.image,
 | 
				
			||||||
        "mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
 | 
					        "mpris:length": convertDurationToSeconds(mediaInfo.duration) * 1000 * 1000,
 | 
				
			||||||
        "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
 | 
					        "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + tidalController.getTrackId(),
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      ...ObjectToDotNotation(mediaInfo, "custom:"),
 | 
					      ...ObjectToDotNotation(mediaInfo, "custom:"),
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
@@ -513,124 +350,47 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
 | 
				
			|||||||
              mediaInfo.title,
 | 
					              mediaInfo.title,
 | 
				
			||||||
              mediaInfo.artists,
 | 
					              mediaInfo.artists,
 | 
				
			||||||
              mediaInfo.status,
 | 
					              mediaInfo.status,
 | 
				
			||||||
              convertDuration(mediaInfo.duration)
 | 
					              convertDurationToSeconds(mediaInfo.duration),
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
            scrobbleWaitingForDelay = false;
 | 
					            scrobbleWaitingForDelay = false;
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
          settingsStore.get(settings.ListenBrainz.delay) ?? 0
 | 
					          settingsStore.get(settings.ListenBrainz.delay) ?? 0,
 | 
				
			||||||
        );
 | 
					        );
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					tidalController.bootstrap(controllerOptions);
 | 
				
			||||||
 * Checks if Tidal is playing a video or song by grabbing the "a" element from the title.
 | 
					tidalController.onMediaInfoUpdate(async (newState) => {
 | 
				
			||||||
 * If it's a song it returns the track URL, if not it will return undefined
 | 
					  currentMediaInfo = { ...currentMediaInfo, ...newState };
 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
function getTrackURL() {
 | 
					 | 
				
			||||||
  const id = getTrackID();
 | 
					 | 
				
			||||||
  return `https://tidal.com/browse/track/${id}`;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
function getTrackID() {
 | 
					  const songDashArtistTitle = `${currentMediaInfo.title} - ${currentMediaInfo.artists}`;
 | 
				
			||||||
  const URLelement = elements.get("title").querySelector("a");
 | 
					  const isNewSong = currentSong !== songDashArtistTitle;
 | 
				
			||||||
  if (URLelement !== null) {
 | 
					 | 
				
			||||||
    const id = URLelement.href.replace(/\D/g, "");
 | 
					 | 
				
			||||||
    return id;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  return window.location;
 | 
					  if (isNewSong) {
 | 
				
			||||||
}
 | 
					    // check whether one of the artists is in the "skip artist" array, if so, skip...
 | 
				
			||||||
 | 
					    skipArtistsIfFoundInSkippedArtistsList(currentMediaInfo.artistsArray ?? []);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					    // update the currently playing song
 | 
				
			||||||
 * Watch for song changes and update title + notify
 | 
					    currentSong = songDashArtistTitle;
 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
setInterval(function () {
 | 
					 | 
				
			||||||
  const title = elements.getText("title");
 | 
					 | 
				
			||||||
  const artistsArray = elements.getArtistsArray();
 | 
					 | 
				
			||||||
  const artistsString = elements.getArtistsString(artistsArray);
 | 
					 | 
				
			||||||
  const songDashArtistTitle = `${title} - ${artistsString}`;
 | 
					 | 
				
			||||||
  const staticTitle = "TIDAL Hi-Fi";
 | 
					 | 
				
			||||||
  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
 | 
					 | 
				
			||||||
  const current = elements.getText("current");
 | 
					 | 
				
			||||||
  const currentStatus = getCurrentlyPlayingStatus();
 | 
					 | 
				
			||||||
  const shuffleState = getCurrentShuffleState();
 | 
					 | 
				
			||||||
  const repeatState = getCurrentRepeatState();
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  const playStateChanged = currentStatus != currentlyPlaying;
 | 
					    // update the window title with the new info
 | 
				
			||||||
  const shuffleStateChanged = shuffleState != currentShuffleState;
 | 
					 | 
				
			||||||
  const repeatStateChanged = repeatState != currentRepeatState;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  const hasStateChanged = playStateChanged || shuffleStateChanged || repeatStateChanged;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  // update info if song changed or was just paused/resumed
 | 
					 | 
				
			||||||
  if (titleOrArtistsChanged || hasStateChanged) {
 | 
					 | 
				
			||||||
    if (playStateChanged) currentlyPlaying = currentStatus;
 | 
					 | 
				
			||||||
    if (shuffleStateChanged) currentShuffleState = shuffleState;
 | 
					 | 
				
			||||||
    if (repeatStateChanged) currentRepeatState = repeatState;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    skipArtistsIfFoundInSkippedArtistsList(artistsArray);
 | 
					 | 
				
			||||||
    const album = elements.getAlbumName();
 | 
					 | 
				
			||||||
    const duration = elements.getText("duration");
 | 
					 | 
				
			||||||
    const options: MediaInfo = {
 | 
					 | 
				
			||||||
      title,
 | 
					 | 
				
			||||||
      artists: artistsString,
 | 
					 | 
				
			||||||
      album: album,
 | 
					 | 
				
			||||||
      playingFrom: elements.getText("playing_from"),
 | 
					 | 
				
			||||||
      status: currentStatus,
 | 
					 | 
				
			||||||
      url: getTrackURL(),
 | 
					 | 
				
			||||||
      current,
 | 
					 | 
				
			||||||
      currentInSeconds: convertDurationToSeconds(current),
 | 
					 | 
				
			||||||
      duration,
 | 
					 | 
				
			||||||
      durationInSeconds: convertDurationToSeconds(duration),
 | 
					 | 
				
			||||||
      image: "",
 | 
					 | 
				
			||||||
      icon: "",
 | 
					 | 
				
			||||||
      favorite: elements.isFavorite(),
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      player: {
 | 
					 | 
				
			||||||
        status: currentStatus,
 | 
					 | 
				
			||||||
        shuffle: shuffleState,
 | 
					 | 
				
			||||||
        repeat: repeatState,
 | 
					 | 
				
			||||||
      },
 | 
					 | 
				
			||||||
    };
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    // update title, url and play info with new info
 | 
					 | 
				
			||||||
    settingsStore.get(settings.staticWindowTitle)
 | 
					    settingsStore.get(settings.staticWindowTitle)
 | 
				
			||||||
      ? setTitle(staticTitle)
 | 
					      ? setTitle(staticTitle)
 | 
				
			||||||
      : setTitle(songDashArtistTitle);
 | 
					      : setTitle(`${currentMediaInfo.title} - ${currentMediaInfo.artists}`);
 | 
				
			||||||
    getTrackURL();
 | 
					 | 
				
			||||||
    currentSong = songDashArtistTitle;
 | 
					 | 
				
			||||||
    currentPlayStatus = currentStatus;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const image = elements.getSongIcon();
 | 
					    // download a new icon and use it for the media info
 | 
				
			||||||
 | 
					    if (!newState.icon && newState.image) {
 | 
				
			||||||
 | 
					      currentMediaInfo.icon = await downloadIcon(currentMediaInfo.image, notificationPath);
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					      currentMediaInfo.icon = "";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    new Promise<void>((resolve) => {
 | 
					    updateMediaInfo(currentMediaInfo, true);
 | 
				
			||||||
      if (image.startsWith("http")) {
 | 
					 | 
				
			||||||
        options.image = image;
 | 
					 | 
				
			||||||
        downloadFile(image, notificationPath).then(
 | 
					 | 
				
			||||||
          () => {
 | 
					 | 
				
			||||||
            options.icon = notificationPath;
 | 
					 | 
				
			||||||
            resolve();
 | 
					 | 
				
			||||||
          },
 | 
					 | 
				
			||||||
          () => {
 | 
					 | 
				
			||||||
            // if the image can't be downloaded then continue without it
 | 
					 | 
				
			||||||
            resolve();
 | 
					 | 
				
			||||||
          }
 | 
					 | 
				
			||||||
        );
 | 
					 | 
				
			||||||
      } else {
 | 
					 | 
				
			||||||
        // if the image can't be found on the page continue without it
 | 
					 | 
				
			||||||
        resolve();
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
    }).then(() => {
 | 
					 | 
				
			||||||
      updateMediaInfo(options, titleOrArtistsChanged);
 | 
					 | 
				
			||||||
    });
 | 
					 | 
				
			||||||
  } else {
 | 
					  } else {
 | 
				
			||||||
    // just update the time
 | 
					    // if titleOrArtists didn't change then only minor mediaInfo (like timings) changed, so don't bother the user with notifications
 | 
				
			||||||
    updateMediaInfo(
 | 
					    updateMediaInfo(currentMediaInfo, false);
 | 
				
			||||||
      { ...currentMediaInfo, ...{ current, currentInSeconds: convertDurationToSeconds(current) } },
 | 
					 | 
				
			||||||
      false
 | 
					 | 
				
			||||||
    );
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /**
 | 
					  /**
 | 
				
			||||||
@@ -645,13 +405,12 @@ setInterval(function () {
 | 
				
			|||||||
        const artistNames = Object.values(artists).map((artist) => artist);
 | 
					        const artistNames = Object.values(artists).map((artist) => artist);
 | 
				
			||||||
        const foundArtist = artistNames.some((artist) => artistsToSkip.includes(artist));
 | 
					        const foundArtist = artistNames.some((artist) => artistsToSkip.includes(artist));
 | 
				
			||||||
        if (foundArtist) {
 | 
					        if (foundArtist) {
 | 
				
			||||||
          elements.click("next");
 | 
					          tidalController.next();
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}, getUpdateFrequency());
 | 
					});
 | 
				
			||||||
 | 
					 | 
				
			||||||
addMPRIS();
 | 
					addMPRIS();
 | 
				
			||||||
addCustomCss(app);
 | 
					addCustomCss(app);
 | 
				
			||||||
addHotKeys();
 | 
					addHotKeys();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,7 @@ 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
 | 
					  type: ACTIVITY_LISTENING,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const updateActivity = () => {
 | 
					const updateActivity = () => {
 | 
				
			||||||
@@ -117,15 +117,17 @@ const getActivity = (): SetActivity => {
 | 
				
			|||||||
const connectWithRetry = async (retryCount = 0) => {
 | 
					const connectWithRetry = async (retryCount = 0) => {
 | 
				
			||||||
  try {
 | 
					  try {
 | 
				
			||||||
    await rpc.login();
 | 
					    await rpc.login();
 | 
				
			||||||
    Logger.log('Connected to Discord');
 | 
					    Logger.log("Connected to Discord");
 | 
				
			||||||
    rpc.on("ready", updateActivity);
 | 
					    rpc.on("ready", updateActivity);
 | 
				
			||||||
    Object.values(globalEvents).forEach(event => ipcMain.on(event, observer));
 | 
					    Object.values(globalEvents).forEach((event) => ipcMain.on(event, observer));
 | 
				
			||||||
  } catch (error) {
 | 
					  } catch (error) {
 | 
				
			||||||
    if (retryCount < MAX_RETRIES) {
 | 
					    if (retryCount < MAX_RETRIES) {
 | 
				
			||||||
      Logger.log(`Failed to connect to Discord, retrying in ${RETRY_DELAY/1000} seconds... (Attempt ${retryCount + 1}/${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);
 | 
					      setTimeout(() => connectWithRetry(retryCount + 1), RETRY_DELAY);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      Logger.log('Failed to connect to Discord after maximum retry attempts');
 | 
					      Logger.log("Failed to connect to Discord after maximum retry attempts");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
@@ -134,7 +136,7 @@ const connectWithRetry = async (retryCount = 0) => {
 | 
				
			|||||||
 * 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: {type: "ipc"}, clientId });
 | 
					  rpc = new Client({ transport: { type: "ipc" }, clientId });
 | 
				
			||||||
  connectWithRetry();
 | 
					  connectWithRetry();
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,8 +6,8 @@ import request from "request";
 | 
				
			|||||||
 * @param {string} fileUrl url to download
 | 
					 * @param {string} fileUrl url to download
 | 
				
			||||||
 * @param {string} targetPath path to save it at
 | 
					 * @param {string} targetPath path to save it at
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
export const downloadFile = function (fileUrl: string, targetPath: string) {
 | 
					export const downloadFile = function (fileUrl: string, targetPath: string): Promise<string> {
 | 
				
			||||||
  return new Promise((resolve, reject) => {
 | 
					  return new Promise<string>((resolve, reject) => {
 | 
				
			||||||
    const req = request({
 | 
					    const req = request({
 | 
				
			||||||
      method: "GET",
 | 
					      method: "GET",
 | 
				
			||||||
      uri: fileUrl,
 | 
					      uri: fileUrl,
 | 
				
			||||||
@@ -16,7 +16,9 @@ export const downloadFile = function (fileUrl: string, targetPath: string) {
 | 
				
			|||||||
    const out = fs.createWriteStream(targetPath);
 | 
					    const out = fs.createWriteStream(targetPath);
 | 
				
			||||||
    req.pipe(out);
 | 
					    req.pipe(out);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    req.on("end", resolve);
 | 
					    req.on("end", () => {
 | 
				
			||||||
 | 
					      resolve(targetPath);
 | 
				
			||||||
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    req.on("error", reject);
 | 
					    req.on("error", reject);
 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,28 +1,6 @@
 | 
				
			|||||||
import { MediaInfo } from "../models/mediaInfo";
 | 
					import { getEmptyMediaInfo, MediaInfo } from "../models/mediaInfo";
 | 
				
			||||||
import { MediaStatus } from "../models/mediaStatus";
 | 
					 | 
				
			||||||
import { RepeatState } from "../models/repeatState";
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
const defaultInfo: MediaInfo = {
 | 
					const defaultInfo: MediaInfo = getEmptyMediaInfo();
 | 
				
			||||||
  title: "",
 | 
					 | 
				
			||||||
  artists: "",
 | 
					 | 
				
			||||||
  album: "",
 | 
					 | 
				
			||||||
  icon: "",
 | 
					 | 
				
			||||||
  playingFrom: "",
 | 
					 | 
				
			||||||
  status: MediaStatus.paused,
 | 
					 | 
				
			||||||
  url: "",
 | 
					 | 
				
			||||||
  current: "",
 | 
					 | 
				
			||||||
  currentInSeconds: 0,
 | 
					 | 
				
			||||||
  duration: "",
 | 
					 | 
				
			||||||
  durationInSeconds: 0,
 | 
					 | 
				
			||||||
  image: "tidal-hifi-icon",
 | 
					 | 
				
			||||||
  favorite: false,
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  player: {
 | 
					 | 
				
			||||||
    status: MediaStatus.paused,
 | 
					 | 
				
			||||||
    shuffle: false,
 | 
					 | 
				
			||||||
    repeat: RepeatState.off,
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
export let mediaInfo: MediaInfo = { ...defaultInfo };
 | 
					export let mediaInfo: MediaInfo = { ...defaultInfo };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,6 +30,7 @@ export const settingsStore = new Store({
 | 
				
			|||||||
    adBlock: false,
 | 
					    adBlock: false,
 | 
				
			||||||
    advanced: {
 | 
					    advanced: {
 | 
				
			||||||
      tidalUrl: "https://listen.tidal.com",
 | 
					      tidalUrl: "https://listen.tidal.com",
 | 
				
			||||||
 | 
					      controllerType: "domController",
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    api: true,
 | 
					    api: true,
 | 
				
			||||||
    apiSettings: {
 | 
					    apiSettings: {
 | 
				
			||||||
@@ -120,6 +121,11 @@ export const settingsStore = new Store({
 | 
				
			|||||||
    "5.16.0": (migrationStore) => {
 | 
					    "5.16.0": (migrationStore) => {
 | 
				
			||||||
      buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
 | 
					      buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "5.19.0": (migrationStore) => {
 | 
				
			||||||
 | 
					      buildMigration("5.19.0", migrationStore, [
 | 
				
			||||||
 | 
					        { key: settings.advanced.controllerType, value: "domController" },
 | 
				
			||||||
 | 
					      ]);
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user