chore: giving up on state, reverted to MediaSessionController

.stylelintrc.json

@@ -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": {
     "prettier/prettier": true,
     "scss/at-extend-no-missing-placeholder": null,
     "no-descending-specificity": null
   }
-}
+}

.vscode/launch.json

@@ -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>/**"]
+    }
+  ]
+}

CHANGELOG.md

@@ -40,6 +40,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)
 - Updated most dependency versions
+
   - This includes Electron 31!
 
 - Added a channel selector so we can now use Tidal's staging environment directly from the app
@@ -131,10 +132,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 dependencies to latest
+
   - added theme files to stylelint ignore
   - fixed other stylelint errors
 
 - 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 the "favorite" field in the `mediaInfo` and the API `/current` endpoint
   - Added an endpoint to toggle favoriting a song: `http://localhost:47836/favorite/toggle`
@@ -155,10 +158,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added settings to customize the Discord rich presence information
   - 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
-    ![The new about page](./docs/images/new-about.png)
+  ![The new about page](./docs/images/new-about.png)
 - 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
-    ![Tokyo Night theme on settings window](./docs/images/customcss-menu.png)
+  ![Tokyo Night theme on settings window](./docs/images/customcss-menu.png)
 
 ## [5.6.0]
 

SECURITY.md

@@ -8,4 +8,3 @@ Only the very latest 😄.
 
 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).
-

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "tidal-hifi",
-  "version": "5.18.2",
+  "version": "5.19.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "tidal-hifi",
-      "version": "5.18.2",
+      "version": "5.19.0",
       "license": "MIT",
       "dependencies": {
         "@electron/remote": "^2.1.2",
@@ -15,11 +15,11 @@
         "axios": "^1.8.4",
         "cors": "^2.8.5",
         "electron-store": "^8.2.0",
-        "express": "^4.21.2",
+        "express": "^5.0.1",
         "hotkeys-js": "^3.13.9",
         "mpris-service": "^2.1.2",
         "request": "^2.88.2",
-        "sass": "^1.85.1",
+        "sass": "1.85.1",
         "swagger-ui-express": "^5.0.1"
       },
       "devDependencies": {
@@ -1655,13 +1655,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/@parcel/watcher/node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -1910,18 +1903,6 @@
         "undici-types": "~6.19.2"
       }
     },
-    "node_modules/@types/plist": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz",
-      "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*",
-        "xmlbuilder": ">=11.0.1"
-      }
-    },
     "node_modules/@types/qs": {
       "version": "6.9.18",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
@@ -2005,14 +1986,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/verror": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.11.tgz",
-      "integrity": "sha512-RlDm9K7+o5stv0Co8i8ZRGxDbrTxhJtgjqjFyVh/tXQyl/rYtTKlnTvZ88oSTeYREWurwx20Js4kTuKCsFkUtg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/@types/yauzl": {
       "version": "2.10.3",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
@@ -2292,18 +2265,48 @@
       }
     },
     "node_modules/accepts": {
-      "version": "1.3.8",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
       "license": "MIT",
       "dependencies": {
-        "mime-types": "~2.1.34",
+        "mime-types": "^3.0.0",
-        "negotiator": "0.6.3"
+        "negotiator": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/node_modules/mime-db": {
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/accepts/node_modules/mime-types": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
+      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "^1.54.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.14.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
@@ -2629,12 +2632,6 @@
       "dev": true,
       "license": "Python-2.0"
     },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "license": "MIT"
-    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -2854,56 +2851,25 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.3",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==",
       "license": "MIT",
       "dependencies": {
-        "bytes": "3.1.2",
+        "bytes": "^3.1.2",
-        "content-type": "~1.0.5",
+        "content-type": "^1.0.5",
-        "debug": "2.6.9",
+        "debug": "^4.4.0",
-        "depd": "2.0.0",
+        "http-errors": "^2.0.0",
-        "destroy": "1.2.0",
+        "iconv-lite": "^0.6.3",
-        "http-errors": "2.0.0",
+        "on-finished": "^2.4.1",
-        "iconv-lite": "0.4.24",
+        "qs": "^6.14.0",
-        "on-finished": "2.4.1",
+        "raw-body": "^3.0.0",
-        "qs": "6.13.0",
+        "type-is": "^2.0.0"
-        "raw-body": "2.5.2",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8",
+        "node": ">=18"
-        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "license": "MIT"
-    },
     "node_modules/boolean": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
@@ -3391,24 +3357,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -3639,9 +3587,9 @@
       }
     },
     "node_modules/content-disposition": {
-      "version": "0.5.4",
+      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
@@ -3669,10 +3617,13 @@
       }
     },
     "node_modules/cookie-signature": {
-      "version": "1.0.6",
+      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+      "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.6.0"
+      }
     },
     "node_modules/copyfiles": {
       "version": "2.4.1",
@@ -3765,17 +3716,6 @@
         }
       }
     },
-    "node_modules/crc": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
-      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "buffer": "^5.1.0"
-      }
-    },
     "node_modules/create-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -4034,16 +3974,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
     "node_modules/detect-libc": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
@@ -4191,33 +4121,6 @@
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/dmg-license": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
-      "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "@types/plist": "^3.0.1",
-        "@types/verror": "^1.10.3",
-        "ajv": "^6.10.0",
-        "crc": "^3.8.0",
-        "iconv-corefoundation": "^1.1.7",
-        "plist": "^3.0.4",
-        "smart-buffer": "^4.0.2",
-        "verror": "^1.10.0"
-      },
-      "bin": {
-        "dmg-license": "bin/dmg-license.js"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -4992,65 +4895,67 @@
       "license": "Apache-2.0"
     },
     "node_modules/express": {
-      "version": "4.21.2",
+      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+      "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
       "license": "MIT",
       "dependencies": {
-        "accepts": "~1.3.8",
+        "accepts": "^2.0.0",
-        "array-flatten": "1.1.1",
+        "body-parser": "^2.2.0",
-        "body-parser": "1.20.3",
+        "content-disposition": "^1.0.0",
-        "content-disposition": "0.5.4",
+        "content-type": "^1.0.5",
-        "content-type": "~1.0.4",
+        "cookie": "^0.7.1",
-        "cookie": "0.7.1",
+        "cookie-signature": "^1.2.1",
-        "cookie-signature": "1.0.6",
+        "debug": "^4.4.0",
-        "debug": "2.6.9",
+        "encodeurl": "^2.0.0",
-        "depd": "2.0.0",
+        "escape-html": "^1.0.3",
-        "encodeurl": "~2.0.0",
+        "etag": "^1.8.1",
-        "escape-html": "~1.0.3",
+        "finalhandler": "^2.1.0",
-        "etag": "~1.8.1",
+        "fresh": "^2.0.0",
-        "finalhandler": "1.3.1",
+        "http-errors": "^2.0.0",
-        "fresh": "0.5.2",
+        "merge-descriptors": "^2.0.0",
-        "http-errors": "2.0.0",
+        "mime-types": "^3.0.0",
-        "merge-descriptors": "1.0.3",
+        "on-finished": "^2.4.1",
-        "methods": "~1.1.2",
+        "once": "^1.4.0",
-        "on-finished": "2.4.1",
+        "parseurl": "^1.3.3",
-        "parseurl": "~1.3.3",
+        "proxy-addr": "^2.0.7",
-        "path-to-regexp": "0.1.12",
+        "qs": "^6.14.0",
-        "proxy-addr": "~2.0.7",
+        "range-parser": "^1.2.1",
-        "qs": "6.13.0",
+        "router": "^2.2.0",
-        "range-parser": "~1.2.1",
+        "send": "^1.1.0",
-        "safe-buffer": "5.2.1",
+        "serve-static": "^2.2.0",
-        "send": "0.19.0",
+        "statuses": "^2.0.1",
-        "serve-static": "1.16.2",
+        "type-is": "^2.0.1",
-        "setprototypeof": "1.2.0",
+        "vary": "^1.1.2"
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">= 18"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/express/node_modules/debug": {
+    "node_modules/express/node_modules/mime-db": {
-      "version": "2.6.9",
+      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
       "license": "MIT",
-      "dependencies": {
+      "engines": {
-        "ms": "2.0.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/express/node_modules/ms": {
+    "node_modules/express/node_modules/mime-types": {
-      "version": "2.0.0",
+      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "^1.54.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
     "node_modules/extend": {
       "version": "3.0.2",
@@ -5262,38 +5167,22 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.3.1",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==",
       "license": "MIT",
       "dependencies": {
-        "debug": "2.6.9",
+        "debug": "^4.4.0",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "^2.0.0",
-        "escape-html": "~1.0.3",
+        "escape-html": "^1.0.3",
-        "on-finished": "2.4.1",
+        "on-finished": "^2.4.1",
-        "parseurl": "~1.3.3",
+        "parseurl": "^1.3.3",
-        "statuses": "2.0.1",
+        "statuses": "^2.0.1"
-        "unpipe": "~1.0.0"
       },
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "license": "MIT"
-    },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -5429,12 +5318,12 @@
       }
     },
     "node_modules/fresh": {
-      "version": "0.5.2",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/from": {
@@ -5477,21 +5366,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -6117,29 +5991,10 @@
         "ms": "^2.0.0"
       }
     },
-    "node_modules/iconv-corefoundation": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
-      "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "node-addon-api": "^1.6.3"
-      },
-      "engines": {
-        "node": "^8.11.2 || >=10"
-      }
-    },
     "node_modules/iconv-lite": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -6458,6 +6313,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-promise": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
+      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
+      "license": "MIT"
+    },
     "node_modules/is-regex": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
@@ -7136,12 +6997,12 @@
       "license": "CC0-1.0"
     },
     "node_modules/media-typer": {
-      "version": "0.3.0",
+      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/meow": {
@@ -7158,10 +7019,13 @@
       }
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.3",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
       "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
@@ -7176,15 +7040,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/micromatch": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -7491,6 +7346,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -7510,10 +7366,9 @@
       }
     },
     "node_modules/node-addon-api": {
-      "version": "1.7.2",
+      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "dev": true,
       "license": "MIT",
       "optional": true
     },
@@ -8038,10 +7893,13 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.12",
+      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      }
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -8508,12 +8366,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.13.0",
+      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -8600,32 +8458,20 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.2",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
+        "iconv-lite": "0.6.3",
         "unpipe": "1.0.0"
       },
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/raw-body/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/read-binary-file-arch": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz",
@@ -8939,6 +8785,22 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/router": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
+      "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.0",
+        "depd": "^2.0.0",
+        "is-promise": "^4.0.0",
+        "parseurl": "^1.3.3",
+        "path-to-regexp": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -9073,63 +8935,46 @@
       "optional": true
     },
     "node_modules/send": {
-      "version": "0.19.0",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==",
       "license": "MIT",
       "dependencies": {
-        "debug": "2.6.9",
+        "debug": "^4.3.5",
-        "depd": "2.0.0",
+        "encodeurl": "^2.0.0",
-        "destroy": "1.2.0",
+        "escape-html": "^1.0.3",
-        "encodeurl": "~1.0.2",
+        "etag": "^1.8.1",
-        "escape-html": "~1.0.3",
+        "fresh": "^2.0.0",
-        "etag": "~1.8.1",
+        "http-errors": "^2.0.0",
-        "fresh": "0.5.2",
+        "mime-types": "^3.0.1",
-        "http-errors": "2.0.0",
+        "ms": "^2.1.3",
-        "mime": "1.6.0",
+        "on-finished": "^2.4.1",
-        "ms": "2.1.3",
+        "range-parser": "^1.2.1",
-        "on-finished": "2.4.1",
+        "statuses": "^2.0.1"
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 18"
       }
     },
-    "node_modules/send/node_modules/debug": {
+    "node_modules/send/node_modules/mime-db": {
-      "version": "2.6.9",
+      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/send/node_modules/mime-types": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
+      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
       "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "mime-db": "^1.54.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "license": "MIT"
-    },
-    "node_modules/send/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/send/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "license": "MIT",
-      "bin": {
-        "mime": "cli.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.6"
       }
     },
     "node_modules/serialize-error": {
@@ -9162,18 +9007,18 @@
       }
     },
     "node_modules/serve-static": {
-      "version": "1.16.2",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==",
       "license": "MIT",
       "dependencies": {
-        "encodeurl": "~2.0.0",
+        "encodeurl": "^2.0.0",
-        "escape-html": "~1.0.3",
+        "escape-html": "^1.0.3",
-        "parseurl": "~1.3.3",
+        "parseurl": "^1.3.3",
-        "send": "0.19.0"
+        "send": "^1.2.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 18"
       }
     },
     "node_modules/set-function-length": {
@@ -9352,22 +9197,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -10524,13 +10353,35 @@
       }
     },
     "node_modules/type-is": {
-      "version": "1.6.18",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
       "license": "MIT",
       "dependencies": {
-        "media-typer": "0.3.0",
+        "content-type": "^1.0.5",
-        "mime-types": "~2.1.24"
+        "media-typer": "^1.1.0",
+        "mime-types": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/type-is/node_modules/mime-db": {
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/type-is/node_modules/mime-types": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
+      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "^1.54.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -10656,15 +10507,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -10701,30 +10543,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/verror": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
-      "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/verror/node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.18.2",
+  "version": "5.19.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -23,6 +23,7 @@
     "build-mac": "npm run builder -- -c ./build/electron-builder.yml -m",
     "build-base": "npm run builder -- -c ./build/electron-builder.base.yml",
     "prebuilder": "npm run compile",
+    "prettier": "prettier . --write",
     "builder": "electron-builder --publish=never",
     "sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css && sass --no-source-map src/themes:themes",
     "style-lint": "npx stylelint **/*.scss",
@@ -45,7 +46,7 @@
     "@xhayper/discord-rpc": "^1.2.1",
     "axios": "^1.8.4",
     "electron-store": "^8.2.0",
-    "express": "^4.21.2",
+    "express": "^5.0.1",
     "hotkeys-js": "^3.13.9",
     "mpris-service": "^2.1.2",
     "sass": "1.85.1",

src/TidalControllers/DomController/DomControllerOptions.ts

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

src/TidalControllers/DomController/DomTidalController.ts

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

src/TidalControllers/TidalController.ts

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

src/TidalControllers/mediaSessionController/MediaSessionController.ts

@@ -0,0 +1,138 @@
+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 MediaSessionController implements TidalController {
+  public domMediaController: TidalController;
+
+  constructor() {
+    this.domMediaController = new DomTidalController();
+
+    Logger.log("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.");
+  }
+}

src/constants/controller.ts

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

src/constants/settings.ts

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

src/features/api/swagger.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "TIDAL Hi-Fi API",
-    "version": "5.18.2",
+    "version": "5.19.0",
     "description": "",
     "license": {
       "name": "MIT",
@@ -21,7 +21,9 @@
     "/current": {
       "get": {
         "summary": "Get current media info",
-        "tags": ["current"],
+        "tags": [
+          "current"
+        ],
         "responses": {
           "200": {
             "description": "Current media info",
@@ -39,7 +41,9 @@
     "/current/image": {
       "get": {
         "summary": "Get current media image",
-        "tags": ["current"],
+        "tags": [
+          "current"
+        ],
         "responses": {
           "200": {
             "description": "Current media image",
@@ -61,7 +65,9 @@
     "/player/play": {
       "post": {
         "summary": "Play the current media",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -79,7 +85,9 @@
     "/player/favorite/toggle": {
       "post": {
         "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -97,7 +105,9 @@
     "/player/pause": {
       "post": {
         "summary": "Pause the current media",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -115,7 +125,9 @@
     "/player/next": {
       "post": {
         "summary": "Play the next song",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -133,7 +145,9 @@
     "/player/previous": {
       "post": {
         "summary": "Play the previous song",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -151,7 +165,9 @@
     "/player/shuffle/toggle": {
       "post": {
         "summary": "Play the previous song",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -169,7 +185,9 @@
     "/player/repeat/toggle": {
       "post": {
         "summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -187,7 +205,9 @@
     "/player/playpause": {
       "post": {
         "summary": "Start playing the media if paused, or pause the media if playing",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -205,7 +225,9 @@
     "/settings/skipped-artists": {
       "get": {
         "summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "responses": {
           "200": {
             "description": "The list book.",
@@ -221,7 +243,9 @@
       },
       "post": {
         "summary": "Add new artists to the list of skipped artists",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "requestBody": {
           "required": true,
           "content": {
@@ -242,7 +266,9 @@
     "/settings/skipped-artists/delete": {
       "post": {
         "summary": "Remove artists from the list of skipped artists",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "requestBody": {
           "required": true,
           "content": {
@@ -263,7 +289,9 @@
     "/settings/skipped-artists/current": {
       "post": {
         "summary": "Add the current artist to the list of skipped artists",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "responses": {
           "200": {
             "description": "Ok"
@@ -272,7 +300,9 @@
       },
       "delete": {
         "summary": "Remove the current artist from the list of skipped artists",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "responses": {
           "200": {
             "description": "Ok"
@@ -283,7 +313,9 @@
     "/image": {
       "get": {
         "summary": "Get current image",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -306,7 +338,9 @@
     "/play": {
       "get": {
         "summary": "Play the current media",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -325,7 +359,9 @@
     "/favorite/toggle": {
       "get": {
         "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -344,7 +380,9 @@
     "/pause": {
       "get": {
         "summary": "Pause the current media",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -363,7 +401,9 @@
     "/next": {
       "get": {
         "summary": "Play the next song",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -382,7 +422,9 @@
     "/previous": {
       "get": {
         "summary": "Play the previous song",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -401,7 +443,9 @@
     "/playpause": {
       "get": {
         "summary": "Toggle play/pause",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -514,7 +558,10 @@
         "items": {
           "type": "string"
         },
-        "example": ["Artist1", "Artist2"]
+        "example": [
+          "Artist1",
+          "Artist2"
+        ]
       }
     }
   },
@@ -532,4 +579,4 @@
       "description": "The settings management API"
     }
   ]
-}
+}

src/features/icon/downloadIcon.ts

@@ -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 "";
+};

src/features/tidal/url.ts

@@ -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`;
+};

src/main.ts

@@ -32,7 +32,8 @@ const PROTOCOL_PREFIX = "tidal";
 const windowPreferences = {
   sandbox: false,
   plugins: true,
-  devTools: true, // I like tinkering, others might too
+  devTools: true, // Ensure devTools is enabled for debugging
+  contextIsolation: false, // Disable context isolation for debugging
 };
 
 setDefaultFlags(app);

src/models/mediaInfo.ts

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

src/pages/settings/preload.ts

@@ -61,7 +61,8 @@ let adBlock: HTMLInputElement,
   discord_show_song: HTMLInputElement,
   discord_show_idle: HTMLInputElement,
   discord_idle_text: HTMLInputElement,
-  discord_using_text: HTMLInputElement;
+  discord_using_text: HTMLInputElement,
+  controllerType: HTMLSelectElement;
 
 addCustomCss(app);
 
@@ -157,6 +158,7 @@ function refreshSettings() {
     discord_show_idle.checked = settingsStore.get(settings.discord.showIdle);
     discord_idle_text.value = settingsStore.get(settings.discord.idleText);
     discord_using_text.value = settingsStore.get(settings.discord.usingText);
+    controllerType.value = settingsStore.get(settings.advanced.controllerType);
 
     // set state of all switches with additional settings
     Object.values(switchesWithSettings).forEach((settingSwitch) => {
@@ -277,6 +279,7 @@ window.addEventListener("DOMContentLoaded", () => {
   discord_show_idle = get("discord_show_idle");
   discord_using_text = get("discord_using_text");
   discord_idle_text = get("discord_idle_text");
+  controllerType = get<HTMLSelectElement>("controllerType");
 
   refreshSettings();
   addInputListener(adBlock, settings.adBlock);
@@ -322,4 +325,5 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(discord_show_idle, settings.discord.showIdle);
   addInputListener(discord_idle_text, settings.discord.idleText);
   addInputListener(discord_using_text, settings.discord.usingText);
+  addSelectListener(controllerType, settings.advanced.controllerType);
 });

src/pages/settings/settings.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 
 <head>
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta http-equiv="X-UA-Compatible" content="ie=edge" />
   <link rel="stylesheet" href="./settings.css" />
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
 </head>
 
 <body class="settings-window">
@@ -109,7 +109,10 @@
             <div class="group__option">
               <div class="group__description">
                 <h4>Static Window Title</h4>
-                <p>Makes the window title "TIDAL Hi-Fi" instead of changing to the currently playing song.</p>
+                <p>
+                  Makes the window title "TIDAL Hi-Fi" instead of changing to the currently
+                  playing song.
+                </p>
               </div>
               <label class="switch">
                 <input id="staticWindowTitle" type="checkbox" />
@@ -157,8 +160,8 @@
             <p class="group__title">API</p>
             <div class="group__description">
               <p>
-                TIDAL Hi-Fi has a built-in web API to allow users to get current media information.
+                TIDAL Hi-Fi has a built-in web API to allow users to get current media
-                You can optionally enable playback control as well.
+                information. You can optionally enable playback control as well.
               </p>
             </div>
             <div class="group__option">
@@ -180,7 +183,8 @@
             <div class="group__option">
               <div class="group__description">
                 <h4>API hostname</h4>
-                <p>By default (127.0.0.1) only local apps can interface with the API. <br />
+                <p>
+                  By default (127.0.0.1) only local apps can interface with the API. <br />
                   Change to 0.0.0.0 to allow <strong>anyone</strong> to interact with it. <br />
                   Other options are available
                 </p>
@@ -236,7 +240,6 @@
               </label>
             </div>
             <div id="discord_options">
-
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <h4>Show Idle Text</h4>
@@ -259,7 +262,9 @@
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <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" />
                 </div>
               </div>
@@ -276,7 +281,6 @@
               </div>
 
               <div id="discord_show_song_options" class="hidden">
-
                 <div class="group__option" class="hidden">
                   <div class="group__description">
                     <h4>Include timestamps</h4>
@@ -304,7 +308,6 @@
                   </div>
                 </div>
               </div>
-
             </div>
           </div>
           <div class="group">
@@ -323,7 +326,10 @@
               <div class="group__option">
                 <div class="group__description">
                   <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" />
                 </div>
               </div>
@@ -337,8 +343,10 @@
             </div>
             <div class="group__description">
               <h4>ScrobbleDelay</h4>
-              <p>The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when you fast forward
+              <p>
-                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" />
             </div>
           </div>
@@ -351,10 +359,9 @@
               <div class="group__description">
                 <h4>Update frequency</h4>
                 <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>
                 <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
               </div>
@@ -369,7 +376,19 @@
                 </p>
                 <select class="select-input" id="channel" name="channel">
                   <option value="https://listen.tidal.com">Stable (listen.tidal.com)</option>
-                  <option value="https://listen.stage.tidal.com">Staging (listen.stage.tidal.com)</option>
+                  <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="mediaSessionController">Media Session Controller</option>
                 </select>
               </div>
             </div>
@@ -415,7 +434,8 @@
               <div class="group__description">
                 <h4>Wayland support</h4>
                 <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>
               </div>
               <label class="switch">
@@ -433,7 +453,8 @@
               <div class="group__description">
                 <h4>Custom CSS</h4>
                 <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>
               </div>
             </div>
@@ -448,9 +469,7 @@
                 <p>
                   Select a theme below or "Tidal - Default" to return to the original Tidal look.
                 </p>
-                <select class="select-input" id="themesList" name="themesList">
+                <select class="select-input" id="themesList" name="themesList"></select>
-
-                </select>
               </div>
             </div>
 
@@ -458,14 +477,14 @@
               <div class="group__description">
                 <h4>Upload new themes</h4>
                 <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>
                 <div class="file-drop-area">
                   <div>
                     <span class="file-btn">Choose files</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>

src/preload.ts

@@ -3,6 +3,7 @@ import { clipboard, ipcRenderer } from "electron";
 import Player from "mpris-service";
 import { globalEvents } from "./constants/globalEvents";
 import { settings } from "./constants/settings";
+import { downloadIcon } from "./features/icon/downloadIcon";
 import {
   ListenBrainz,
   ListenBrainzConstants,
@@ -10,181 +11,56 @@ import {
 } from "./features/listenbrainz/listenbrainz";
 import { StoreData } from "./features/listenbrainz/models/storeData";
 import { Logger } from "./features/logger";
-import { SharingService } from "./features/sharingService/sharingService";
 import { addCustomCss } from "./features/theming/theming";
+import { getTrackURL, getUniversalLink } from "./features/tidal/url";
 import { convertDurationToSeconds } from "./features/time/parse";
-import { MediaInfo } from "./models/mediaInfo";
+import { getEmptyMediaInfo, MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
-import { RepeatState } from "./models/repeatState";
-import { downloadFile } from "./scripts/download";
 import { addHotkey } from "./scripts/hotkeys";
 import { ObjectToDotNotation } from "./scripts/objectUtilities";
 import { settingsStore } from "./scripts/settings";
 import { setTitle } from "./scripts/window-functions";
+import { DomControllerOptions } from "./TidalControllers/DomController/DomControllerOptions";
+import { DomTidalController } from "./TidalControllers/DomController/DomTidalController";
+import { TidalController } from "./TidalControllers/TidalController";
+import { tidalControllers } from "./constants/controller";
 
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
+const staticTitle = "TIDAL Hi-Fi";
+
 let currentSong = "";
 let player: Player;
-let currentPlayStatus = MediaStatus.paused;
 let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
 let scrobbleWaitingForDelay = false;
 
-let currentlyPlaying = MediaStatus.paused;
-let currentRepeatState: RepeatState = RepeatState.off;
-let currentShuffleState = false;
-let currentMediaInfo: MediaInfo;
 let currentNotification: Electron.Notification;
 
-const elements = {
+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.mediaSessionController: {
-   */
+    Logger.log("mediaSessionController initialized");
-  getSongIcon: function () {
+    break;
-    const figure = this.get("media");
+  }
 
-    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
  * make sure it returns a number, if not use the default
  */
-function getUpdateFrequency() {
+function getDomUpdateFrequency() {
   const storeValue = settingsStore.get<string, number>(settings.updateFrequency);
   const defaultValue = 500;
 
@@ -195,19 +71,6 @@ function getUpdateFrequency() {
   }
 }
 
-/**
- * Play or pause the current media
- */
-function playPause() {
-  const play = elements.get("play");
-
-  if (play) {
-    elements.click("play");
-  } else {
-    elements.click("pause");
-  }
-}
-
 /**
  * Clears the old listenbrainz data on launch
  */
@@ -220,30 +83,26 @@ ListenBrainzStore.clear();
  */
 function addHotKeys() {
   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();
     });
-
+    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 () {
-      elements.click("back");
+      tidalController.back();
     });
 
     addHotkey("shift+backspace", function () {
-      elements.click("forward");
+      tidalController.forward();
     });
 
     addHotkey("control+u", function () {
@@ -252,10 +111,10 @@ function addHotKeys() {
     });
 
     addHotkey("control+r", function () {
-      elements.click("repeat");
+      tidalController.repeat();
     });
     addHotkey("control+w", async function () {
-      const url = SharingService.getUniversalLink(getTrackURL());
+      const url = getUniversalLink(getTrackURL(tidalController.getTrackId()));
       clipboard.writeText(url);
       new Notification({
         title: `Universal link generated: `,
@@ -319,22 +178,22 @@ function addIPCEventListeners() {
         case globalEvents.playPause:
         case globalEvents.play:
         case globalEvents.pause:
-          playPause();
+          tidalController.playPause();
           break;
         case globalEvents.next:
-          elements.click("next");
+          tidalController.next();
           break;
         case globalEvents.previous:
-          elements.click("previous");
+          tidalController.previous();
           break;
         case globalEvents.toggleFavorite:
-          elements.click("favorite");
+          tidalController.toggleFavorite();
           break;
         case globalEvents.toggleShuffle:
-          elements.click("shuffle");
+          tidalController.toggleShuffle();
           break;
         case globalEvents.toggleRepeat:
-          elements.click("repeat");
+          tidalController.repeat();
           break;
         default:
           break;
@@ -343,48 +202,6 @@ function addIPCEventListeners() {
   });
 }
 
-/**
- * Update the current status of tidal (e.g playing or paused)
- */
-function getCurrentlyPlayingStatus() {
-  const pause = elements.get("pause");
-  let status = undefined;
-
-  // if pause button is visible tidal is playing
-  if (pause) {
-    status = MediaStatus.playing;
-  } else {
-    status = MediaStatus.paused;
-  }
-  return status;
-}
-
-function getCurrentShuffleState() {
-  const shuffle = elements.get("shuffle");
-  return shuffle?.getAttribute("aria-checked") === "true";
-}
-
-function getCurrentRepeatState() {
-  const repeat = elements.get("repeat");
-  switch (repeat?.getAttribute("data-type")) {
-    case "button__repeatAll":
-      return RepeatState.all;
-    case "button__repeatSingle":
-      return RepeatState.single;
-    default:
-      return RepeatState.off;
-  }
-}
-
-/**
- * Convert the duration from MM:SS to seconds
- * @param {*} duration
- */
-function convertDuration(duration: string) {
-  const parts = duration.split(":");
-  return parseInt(parts[1]) + 60 * parseInt(parts[0]);
-}
-
 /**
  * Update Tidal-hifi's media info
  *
@@ -392,7 +209,6 @@ function convertDuration(duration: string) {
  */
 function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
   if (mediaInfo) {
-    currentMediaInfo = mediaInfo;
     ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
     updateMpris(mediaInfo);
     updateListenBrainz(mediaInfo);
@@ -455,16 +271,35 @@ function addMPRIS() {
           const eventValue = events[eventName];
           switch (events[eventValue]) {
             case events.playpause:
-              playPause();
+              tidalController.playPause();
+              break;
+            case events.next:
+              tidalController.next();
+              break;
+            case events.previous:
+              tidalController.previous();
+              break;
+            case events.pause:
+              tidalController.pause();
+              break;
+            case events.stop:
+              tidalController.stop();
+              break;
+            case events.play:
+              tidalController.play();
+              break;
+            case events.loopStatus:
+              tidalController.repeat();
+              break;
+            case events.shuffle:
+              tidalController.toggleShuffle();
               break;
-            default:
-              elements.click(eventValue);
           }
         });
       });
       // Override get position function
       player.getPosition = function () {
-        return convertDuration(elements.getText("current")) * 1000 * 1000;
+        return tidalController.getCurrentPositionInSeconds();
       };
       player.on("quit", function () {
         app.quit();
@@ -485,8 +320,8 @@ function updateMpris(mediaInfo: MediaInfo) {
         "xesam:album": mediaInfo.album,
         "xesam:url": mediaInfo.url,
         "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:"),
     };
@@ -513,7 +348,7 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
               mediaInfo.title,
               mediaInfo.artists,
               mediaInfo.status,
-              convertDuration(mediaInfo.duration)
+              convertDurationToSeconds(mediaInfo.duration)
             );
             scrobbleWaitingForDelay = false;
           },
@@ -524,113 +359,36 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
   }
 }
 
-/**
+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)
       ? 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 {
-    // 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 +403,12 @@ setInterval(function () {
         const artistNames = Object.values(artists).map((artist) => artist);
         const foundArtist = artistNames.some((artist) => artistsToSkip.includes(artist));
         if (foundArtist) {
-          elements.click("next");
+          tidalController.next();
         }
       }
     }
   }
-}, getUpdateFrequency());
+});
-
 addMPRIS();
 addCustomCss(app);
 addHotKeys();

src/scripts/discord.ts

@@ -26,7 +26,7 @@ const defaultPresence = {
   largeImageKey: "tidal-hifi-icon",
   largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
   instance: false,
-  type: ACTIVITY_LISTENING
+  type: ACTIVITY_LISTENING,
 };
 
 const updateActivity = () => {
@@ -117,15 +117,17 @@ const getActivity = (): SetActivity => {
 const connectWithRetry = async (retryCount = 0) => {
   try {
     await rpc.login();
-    Logger.log('Connected to Discord');
+    Logger.log("Connected to Discord");
     rpc.on("ready", updateActivity);
-    Object.values(globalEvents).forEach(event => ipcMain.on(event, observer));
+    Object.values(globalEvents).forEach((event) => ipcMain.on(event, observer));
   } catch (error) {
     if (retryCount < MAX_RETRIES) {
-      Logger.log(`Failed to connect to Discord, retrying in ${RETRY_DELAY/1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`);
+      Logger.log(
+        `Failed to connect to Discord, retrying in ${RETRY_DELAY / 1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`
+      );
       setTimeout(() => connectWithRetry(retryCount + 1), RETRY_DELAY);
     } else {
-      Logger.log('Failed to connect to Discord after maximum retry attempts');
+      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
  */
 export const initRPC = () => {
-  rpc = new Client({ transport: {type: "ipc"}, clientId });
+  rpc = new Client({ transport: { type: "ipc" }, clientId });
   connectWithRetry();
 };
 

src/scripts/download.ts

@@ -6,8 +6,8 @@ import request from "request";
  * @param {string} fileUrl url to download
  * @param {string} targetPath path to save it at
  */
-export const downloadFile = function (fileUrl: string, targetPath: string) {
+export const downloadFile = function (fileUrl: string, targetPath: string): Promise<string> {
-  return new Promise((resolve, reject) => {
+  return new Promise<string>((resolve, reject) => {
     const req = request({
       method: "GET",
       uri: fileUrl,
@@ -16,7 +16,9 @@ export const downloadFile = function (fileUrl: string, targetPath: string) {
     const out = fs.createWriteStream(targetPath);
     req.pipe(out);
 
-    req.on("end", resolve);
+    req.on("end", () => {
+      resolve(targetPath);
+    });
 
     req.on("error", reject);
   });

src/scripts/mediaInfo.ts

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

src/scripts/settings.ts

@@ -30,6 +30,7 @@ export const settingsStore = new Store({
     adBlock: false,
     advanced: {
       tidalUrl: "https://listen.tidal.com",
+      controllerType: "domController",
     },
     api: true,
     apiSettings: {
@@ -120,6 +121,11 @@ export const settingsStore = new Store({
     "5.16.0": (migrationStore) => {
       buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
     },
+    "5.19.0": (migrationStore) => {
+      buildMigration("5.19.0", migrationStore, [
+        { key: settings.advanced.controllerType, value: "domController" },
+      ]);
+    },
   },
 });