changed mediaSessionController to API Controller

.stylelintrc.json

@@ -1,13 +1,7 @@
 {
-  "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,

.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

@@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)
 - 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
@@ -148,10 +149,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Updated Electron to 28.1.1 (fixes [325](https://github.com/Mastermindzh/tidal-hifi/issues/325))
 - Updated 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`

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

@@ -12,14 +12,14 @@
         "@electron/remote": "^2.1.3",
         "@types/swagger-jsdoc": "^6.0.4",
         "@xhayper/discord-rpc": "1.3.0",
-        "axios": "^1.12.0",
+        "axios": "^1.10.0",
         "cors": "^2.8.5",
         "electron-store": "^8.2.0",
         "express": "^5.1.0",
         "hotkeys-js": "^3.13.15",
         "mpris-service": "^2.1.2",
         "request": "^2.88.2",
-        "sass": "1.93.2",
+        "sass": "1.91.0",
         "swagger-ui-express": "^5.0.1"
       },
       "devDependencies": {
@@ -32,7 +32,7 @@
         "@typescript-eslint/eslint-plugin": "^8.36.0",
         "@typescript-eslint/parser": "^8.36.0",
         "copyfiles": "^2.4.1",
-        "electron": "github:castlabs/electron-releases#v38.2.0+wvcus",
+        "electron": "github:castlabs/electron-releases#v37.2.5+wvcus",
         "electron-builder": "~26.0.12",
         "eslint": "^9.30.1",
         "js-yaml": "^4.1.0",
@@ -42,7 +42,7 @@
         "prettier": "^3.6.2",
         "stylelint": "^16.21.1",
         "stylelint-config-standard": "^39.0.0",
-        "stylelint-config-standard-scss": "^16.0.0",
+        "stylelint-config-standard-scss": "^15.0.1",
         "stylelint-prettier": "^5.0.3",
         "swagger-jsdoc": "^6.2.8",
         "ts-node": "^10.9.2",
@@ -152,7 +152,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -176,7 +175,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -807,9 +805,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.8.0",
+      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-      "integrity": "sha512-MJQFqrZgcW0UNYLGOuQpey/oTN59vyWwplvCGZztn1cKz9agZPPYpJB7h2OMmuu7VLqkvEjN8feFZJmxNF9D+Q==",
+      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -946,9 +944,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.36.0",
+      "version": "9.34.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.36.0.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz",
-      "integrity": "sha512-uhCbYtYynH30iZErszX78U+nR3pJU3RHGQ57NXy5QupD4SBVwDeU8TNBy+MjMngc1UyIW9noKqsRqfjQTBU2dw==",
+      "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1676,13 +1674,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",
@@ -1933,23 +1924,10 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.2.tgz",
       "integrity": "sha512-Cdqa/eJTvt4fC4wmq1Mcc0CPUjp/Qy2FGqLza3z3pKymsI969TcZ54diNJv8UYUgeWxyb8FSbCkhdR6WqmUFhA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
     },
-    "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",
@@ -2033,14 +2011,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",
@@ -2052,17 +2022,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz",
-      "integrity": "sha512-HC3y9CVuevvWCl/oyZuI47dOeDF9ztdMEfMH8/DW/Mhwa9cCLnK1oD7JoTVGW/u7kFzNZUKUoyJEqkaJh5y3Wg==",
+      "integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/type-utils": "8.45.0",
+        "@typescript-eslint/type-utils": "8.41.0",
-        "@typescript-eslint/utils": "8.45.0",
+        "@typescript-eslint/utils": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.41.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -2076,7 +2046,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.45.0",
+        "@typescript-eslint/parser": "^8.41.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
@@ -2092,17 +2062,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.41.0.tgz",
-      "integrity": "sha512-TGf22kon8KW+DeKaUmOibKWktRY8b2NSAZNdtWh798COm1NWx8+xJ6iFBtk3IvLdv6+LGLJLRlyhrhEDZWargQ==",
+      "integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.45.0",
+        "@typescript-eslint/typescript-estree": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.41.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2118,14 +2087,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
-      "integrity": "sha512-3pcVHwMG/iA8afdGLMuTibGR7pDsn9RjDev6CCB+naRsSYs2pns5QbinF4Xqw6YC/Sj3lMrm/Im0eMfaa61WUg==",
+      "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.45.0",
+        "@typescript-eslint/tsconfig-utils": "^8.41.0",
-        "@typescript-eslint/types": "^8.45.0",
+        "@typescript-eslint/types": "^8.41.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2140,14 +2109,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
-      "integrity": "sha512-clmm8XSNj/1dGvJeO6VGH7EUSeA0FMs+5au/u3lrA3KfG8iJ4u8ym9/j2tTEoacAffdW1TVUzXO30W1JTJS7dA==",
+      "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.45.0"
+        "@typescript-eslint/visitor-keys": "8.41.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2158,9 +2127,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
-      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
+      "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2175,15 +2144,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.41.0.tgz",
-      "integrity": "sha512-bpjepLlHceKgyMEPglAeULX1vixJDgaKocp0RVJ5u4wLJIMNuKtUXIczpJCPcn2waII0yuvks/5m5/h3ZQKs0A==",
+      "integrity": "sha512-63qt1h91vg3KsjVVonFJWjgSK7pZHSQFKH6uwqxAH9bBrsyRhO6ONoKyXxyVBzG1lJnFAJcKAcxLS54N1ee1OQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.45.0",
+        "@typescript-eslint/typescript-estree": "8.41.0",
-        "@typescript-eslint/utils": "8.45.0",
+        "@typescript-eslint/utils": "8.41.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -2200,9 +2169,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
-      "integrity": "sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==",
+      "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2214,16 +2183,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
-      "integrity": "sha512-GfE1NfVbLam6XQ0LcERKwdTTPlLvHvXXhOeUGC1OXi4eQBoyy1iVsW+uzJ/J9jtCz6/7GCQ9MtrQ0fml/jWCnA==",
+      "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.45.0",
+        "@typescript-eslint/project-service": "8.41.0",
-        "@typescript-eslint/tsconfig-utils": "8.45.0",
+        "@typescript-eslint/tsconfig-utils": "8.41.0",
-        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.41.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -2243,16 +2212,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz",
-      "integrity": "sha512-bxi1ht+tLYg4+XV2knz/F7RVhU0k6VrSMc9sb8DQ6fyCTrGQLHfo7lDtN0QJjZjKkLA2ThrKuCdHEvLReqtIGg==",
+      "integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.45.0"
+        "@typescript-eslint/typescript-estree": "8.41.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2267,13 +2236,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.45.0",
+      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.45.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
-      "integrity": "sha512-qsaFBA3e09MIDAGFUrTk+dzqtfv1XPVz8t8d1f0ybTzrCY7BKiMC5cjrl1O/P7UmHsNyW90EYSkU/ZWpmXelag==",
+      "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/types": "8.41.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -2414,7 +2383,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2487,7 +2455,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2841,9 +2808,9 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.12.2",
+      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz",
-      "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
+      "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -3220,14 +3187,14 @@
       }
     },
     "node_modules/cacheable": {
-      "version": "1.10.4",
+      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.10.4.tgz",
+      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.10.3.tgz",
-      "integrity": "sha512-Gd7ccIUkZ9TE2odLQVS+PDjIvQCdJKUlLdJRVvZu0aipj07Qfx+XIej7hhDrKGGoIxV5m5fT/kOJNJPQhQneRg==",
+      "integrity": "sha512-M6p10iJ/VT0wT7TLIGUnm958oVrU2cUK8pQAVU21Zu7h8rbk/PeRtRWrvHJBql97Bhzk3g1N6+2VKC+Rjxna9Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "hookified": "^1.11.0",
+        "hookified": "^1.10.0",
-        "keyv": "^5.5.0"
+        "keyv": "^5.4.0"
       }
     },
     "node_modules/cacheable-lookup": {
@@ -3258,9 +3225,9 @@
       }
     },
     "node_modules/cacheable/node_modules/keyv": {
-      "version": "5.5.0",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.4.0.tgz",
-      "integrity": "sha512-QG7qR2tijh1ftOvClut4YKKg1iW6cx3GZsKoGyJPxHkGWK9oJhG9P3j5deP0QQOGDowBMVQFaP+Vm4NpGYvmIQ==",
+      "integrity": "sha512-TMckyVjEoacG5IteUpUrOBsFORtheqziVyyY2dLUwg1jwTb8u48LX4TgmtogkNl9Y9unaEJ1luj10fGyjMGFOQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3461,24 +3428,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",
@@ -3838,17 +3787,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",
@@ -4198,7 +4136,6 @@
       "integrity": "sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "app-builder-lib": "26.0.12",
         "builder-util": "26.0.11",
@@ -4249,33 +4186,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",
@@ -4399,11 +4309,10 @@
       }
     },
     "node_modules/electron": {
-      "version": "38.0.0+wvcus",
+      "version": "35.7.2+wvcus",
-      "resolved": "git+ssh://git@github.com/castlabs/electron-releases.git#209c2de2f39757f36720937eb6e10aa375ad1b8c",
+      "resolved": "git+ssh://git@github.com/castlabs/electron-releases.git#fc7ae5166495414c9ebeed02c53e7d03df44a083",
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@electron/get": "^2.0.0",
         "@types/node": "^22.7.7",
@@ -4628,6 +4537,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@electron/asar": "^3.2.1",
         "debug": "^4.1.1",
@@ -4648,6 +4558,7 @@
       "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "jsonfile": "^4.0.0",
@@ -4801,20 +4712,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.36.0",
+      "version": "9.34.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.36.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz",
-      "integrity": "sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ==",
+      "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.8.0",
+        "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.0",
         "@eslint/config-helpers": "^0.3.1",
         "@eslint/core": "^0.15.2",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.36.0",
+        "@eslint/js": "9.34.0",
         "@eslint/plugin-kit": "^0.3.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -5536,21 +5446,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",
@@ -6160,24 +6055,6 @@
         "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",
@@ -7530,9 +7407,9 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "4.14.0",
+      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.12.0.tgz",
-      "integrity": "sha512-E4n91K4Nk1Rch2KzD+edU2bfZTP4W42GypAUDXU4vu1A+4u9PvUNDkGI0dXbsy8ZeF3WGj0SD/uHxnXD/sW+3w==",
+      "integrity": "sha512-bPSN9a/qIEiURzVVO/I7P/8oPeYTSl+vnvVZBXM/8XerKOgA3dMAIUjl+a+lz9VwTowwSKS3EMsgz/vWDXOkuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7543,10 +7420,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
     },
@@ -8256,7 +8132,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -8340,7 +8215,6 @@
       "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -8372,7 +8246,6 @@
       "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -9013,9 +8886,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.93.2",
+      "version": "1.91.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.91.0.tgz",
-      "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==",
+      "integrity": "sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==",
       "license": "MIT",
       "dependencies": {
         "chokidar": "^4.0.0",
@@ -9348,22 +9221,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",
@@ -9646,9 +9503,9 @@
       }
     },
     "node_modules/stylelint": {
-      "version": "16.24.0",
+      "version": "16.23.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.24.0.tgz",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.23.1.tgz",
-      "integrity": "sha512-7ksgz3zJaSbTUGr/ujMXvLVKdDhLbGl3R/3arNudH7z88+XZZGNLMTepsY28WlnvEFcuOmUe7fg40Q3lfhOfSQ==",
+      "integrity": "sha512-dNvDTsKV1U2YtiUDfe9d2gp902veFeo3ecCWdGlmLm2WFrAV0+L5LoOj/qHSBABQwMsZPJwfC4bf39mQm1S5zw==",
       "dev": true,
       "funding": [
         {
@@ -9661,7 +9518,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@csstools/css-parser-algorithms": "^3.0.5",
         "@csstools/css-tokenizer": "^3.0.4",
@@ -9676,7 +9532,7 @@
         "debug": "^4.4.1",
         "fast-glob": "^3.3.3",
         "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^10.1.4",
+        "file-entry-cache": "^10.1.3",
         "global-modules": "^2.0.0",
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
@@ -9710,9 +9566,9 @@
       }
     },
     "node_modules/stylelint-config-recommended": {
-      "version": "17.0.0",
+      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-17.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-16.0.0.tgz",
-      "integrity": "sha512-WaMSdEiPfZTSFVoYmJbxorJfA610O0tlYuU2aEwY33UQhSPgFbClrVJYWvy3jGJx+XW37O+LyNLiZOEXhKhJmA==",
+      "integrity": "sha512-4RSmPjQegF34wNcK1e1O3Uz91HN8P1aFdFzio90wNK9mjgAI19u5vsU868cVZboKzCaa5XbpvtTzAAGQAxpcXA==",
       "dev": true,
       "funding": [
         {
@@ -9729,26 +9585,26 @@
         "node": ">=18.12.0"
       },
       "peerDependencies": {
-        "stylelint": "^16.23.0"
+        "stylelint": "^16.16.0"
       }
     },
     "node_modules/stylelint-config-recommended-scss": {
-      "version": "16.0.1",
+      "version": "15.0.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-16.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-15.0.1.tgz",
-      "integrity": "sha512-wfpU6kmTUwPEHMACYdpt5wLM/aS44+sqE8yk82LkOkA7yVpAuTZDwd3m9762d0mRnNCn0JMUx4XfDVDmbb8hTA==",
+      "integrity": "sha512-V24bxkNkFGggqPVJlP9iXaBabwSGEG7QTz+PyxrRtjPkcF+/NsWtB3tKYvFYEmczRkWiIEfuFMhGpJFj9Fxe6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "postcss-scss": "^4.0.9",
-        "stylelint-config-recommended": "^17.0.0",
+        "stylelint-config-recommended": "^16.0.0",
-        "stylelint-scss": "^6.12.1"
+        "stylelint-scss": "^6.12.0"
       },
       "engines": {
         "node": ">=20"
       },
       "peerDependencies": {
         "postcss": "^8.3.3",
-        "stylelint": "^16.23.1"
+        "stylelint": "^16.16.0"
       },
       "peerDependenciesMeta": {
         "postcss": {
@@ -9783,21 +9639,21 @@
       }
     },
     "node_modules/stylelint-config-standard-scss": {
-      "version": "16.0.0",
+      "version": "15.0.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-16.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-15.0.1.tgz",
-      "integrity": "sha512-/FHECLUu+med/e6OaPFpprG86ShC4SYT7Tzb2PTVdDjJsehhFBOioSlWqYFqJxmGPIwO3AMBxNo+kY3dxrbczA==",
+      "integrity": "sha512-8pmmfutrMlPHukLp+Th9asmk21tBXMVGxskZCzkRVWt1d8Z0SrXjUUQ3vn9KcBj1bJRd5msk6yfEFM0UYHBRdg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "stylelint-config-recommended-scss": "^16.0.1",
+        "stylelint-config-recommended-scss": "^15.0.1",
-        "stylelint-config-standard": "^39.0.0"
+        "stylelint-config-standard": "^38.0.0"
       },
       "engines": {
         "node": ">=20"
       },
       "peerDependencies": {
         "postcss": "^8.3.3",
-        "stylelint": "^16.23.1"
+        "stylelint": "^16.18.0"
       },
       "peerDependenciesMeta": {
         "postcss": {
@@ -9805,6 +9661,55 @@
         }
       }
     },
+    "node_modules/stylelint-config-standard-scss/node_modules/stylelint-config-standard": {
+      "version": "38.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-38.0.0.tgz",
+      "integrity": "sha512-uj3JIX+dpFseqd/DJx8Gy3PcRAJhlEZ2IrlFOc4LUxBX/PNMEQ198x7LCOE2Q5oT9Vw8nyc4CIL78xSqPr6iag==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/stylelint"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/stylelint"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "stylelint-config-recommended": "^16.0.0"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^16.18.0"
+      }
+    },
+    "node_modules/stylelint-config-standard/node_modules/stylelint-config-recommended": {
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-17.0.0.tgz",
+      "integrity": "sha512-WaMSdEiPfZTSFVoYmJbxorJfA610O0tlYuU2aEwY33UQhSPgFbClrVJYWvy3jGJx+XW37O+LyNLiZOEXhKhJmA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/stylelint"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/stylelint"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^16.23.0"
+      }
+    },
     "node_modules/stylelint-prettier": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/stylelint-prettier/-/stylelint-prettier-5.0.3.tgz",
@@ -9860,25 +9765,25 @@
       "license": "MIT"
     },
     "node_modules/stylelint/node_modules/file-entry-cache": {
-      "version": "10.1.4",
+      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.1.3.tgz",
-      "integrity": "sha512-5XRUFc0WTtUbjfGzEwXc42tiGxQHBmtbUG1h9L2apu4SulCGN3Hqm//9D6FAolf8MYNL7f/YlJl9vy08pj5JuA==",
+      "integrity": "sha512-D+w75Ub8T55yor7fPgN06rkCAUbAYw2vpxJmmjv/GDAcvCnv9g7IvHhIZoxzRZThrXPFI2maeY24pPbtyYU7Lg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "flat-cache": "^6.1.13"
+        "flat-cache": "^6.1.12"
       }
     },
     "node_modules/stylelint/node_modules/flat-cache": {
-      "version": "6.1.13",
+      "version": "6.1.12",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.13.tgz",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.12.tgz",
-      "integrity": "sha512-gmtS2PaUjSPa4zjObEIn4WWliKyZzYljgxODBfxugpK6q6HU9ClXzgCJ+nlcPKY9Bt090ypTOLIFWkV0jbKFjw==",
+      "integrity": "sha512-U+HqqpZPPXP5d24bWuRzjGqVqUcw64k4nZAbruniDwdRg0H10tvN7H6ku1tjhA4rg5B9GS3siEvwO2qjJJ6f8Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cacheable": "^1.10.4",
+        "cacheable": "^1.10.3",
         "flatted": "^3.3.3",
-        "hookified": "^1.11.0"
+        "hookified": "^1.10.0"
       }
     },
     "node_modules/stylelint/node_modules/ignore": {
@@ -10163,6 +10068,7 @@
       "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "mkdirp": "^0.5.1",
         "rimraf": "~2.6.2"
@@ -10226,6 +10132,7 @@
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -10240,6 +10147,7 @@
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -10447,9 +10355,9 @@
       }
     },
     "node_modules/tsc-watch": {
-      "version": "7.2.0",
+      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/tsc-watch/-/tsc-watch-7.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/tsc-watch/-/tsc-watch-7.1.1.tgz",
-      "integrity": "sha512-4gRFawQD1cVSaILvG7wl2x6NtteKbS2dGBMbL7Q6n1ldLIOKXCJUoEwUXdGuee4dp+zcnA6tukBBLz1lZrNI9w==",
+      "integrity": "sha512-r6t37Dkk4vK44HwxOe+OzjpE/gDamZAwqXhtcAJD/hPVblcjJK45NxbK0HcDASXG0U4pEnCh640JZbeDVSC6yA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10565,7 +10473,6 @@
       "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -10709,30 +10616,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

@@ -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",
@@ -43,14 +44,14 @@
     "@electron/remote": "^2.1.3",
     "@types/swagger-jsdoc": "^6.0.4",
     "@xhayper/discord-rpc": "1.3.0",
-    "axios": "^1.12.0",
+    "axios": "^1.10.0",
     "cors": "^2.8.5",
     "electron-store": "^8.2.0",
     "express": "^5.1.0",
     "hotkeys-js": "^3.13.15",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "1.93.2",
+    "sass": "1.91.0",
     "swagger-ui-express": "^5.0.1"
   },
   "devDependencies": {
@@ -63,7 +64,7 @@
     "@typescript-eslint/eslint-plugin": "^8.36.0",
     "@typescript-eslint/parser": "^8.36.0",
     "copyfiles": "^2.4.1",
-    "electron": "github:castlabs/electron-releases#v38.2.0+wvcus",
+    "electron": "github:castlabs/electron-releases#v37.2.5+wvcus",
     "electron-builder": "~26.0.12",
     "eslint": "^9.30.1",
     "js-yaml": "^4.1.0",
@@ -73,7 +74,7 @@
     "prettier": "^3.6.2",
     "stylelint": "^16.21.1",
     "stylelint-config-standard": "^39.0.0",
-    "stylelint-config-standard-scss": "^16.0.0",
+    "stylelint-config-standard-scss": "^15.0.1",
     "stylelint-prettier": "^5.0.3",
     "swagger-jsdoc": "^6.2.8",
     "ts-node": "^10.9.2",

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/apiController/TidalApiController.ts

@@ -0,0 +1,137 @@
+import { Logger } from "../../features/logger";
+import { MediaInfo } from "../../models/mediaInfo";
+import { MediaStatus } from "../../models/mediaStatus";
+import { RepeatState } from "../../models/repeatState";
+import { DomTidalController } from "../DomController/DomTidalController";
+import { TidalController } from "../TidalController";
+
+export class TidalApiController implements TidalController {
+  public domMediaController: TidalController;
+
+  constructor() {
+    this.domMediaController = new DomTidalController();
+    Logger.log("[TidalApiController] - Initialized domController as a backup controller");
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  onMediaInfoUpdate(callback: (state: Partial<MediaInfo>) => void): void {
+    globalThis.alert("method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  bootstrap(): void {
+    globalThis.alert("Method not implemented: ");
+    throw new Error("Method not implemented.");
+  }
+  // example of using the original domMediaController as a fallback
+  goToHome(): void {
+    this.domMediaController.goToHome();
+  }
+
+  getDuration(): string {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getAlbumName(): string {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getTitle(): string {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getArtists(): string[] {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getArtistsString(): string {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getPlayingFrom(): string {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  isFavorite(): boolean {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getSongIcon(): string {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getCurrentTime(): string {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getCurrentPosition(): string {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getCurrentPositionInSeconds(): number {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getTrackId(): string {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  play(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  pause(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  stop(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getCurrentShuffleState(): boolean {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getCurrentRepeatState(): RepeatState {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  getCurrentlyPlayingStatus(): MediaStatus {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  back(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  forward(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  repeat(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  next(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  previous(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  toggleShuffle(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  openSettings(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  toggleFavorite(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+  playPause(): void {
+    globalThis.alert("Method not implemented");
+    throw new Error("Method not implemented.");
+  }
+}

src/constants/controller.ts

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

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

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

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/7.0.1/css/font-awesome.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.0/css/font-awesome.min.css">
 </head>
 
 <body class="settings-window">
@@ -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="tidalApiController">Tidal Api Controller (beta)</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

@@ -1,8 +1,10 @@
 import { app, dialog, Notification } from "@electron/remote";
 import { clipboard, ipcRenderer } from "electron";
 import Player from "mpris-service";
+import { tidalControllers } from "./constants/controller";
 import { globalEvents } from "./constants/globalEvents";
 import { settings } from "./constants/settings";
+import { downloadIcon } from "./features/icon/downloadIcon";
 import {
   ListenBrainz,
   ListenBrainzConstants,
@@ -10,185 +12,57 @@ import {
 } from "./features/listenbrainz/listenbrainz";
 import { StoreData } from "./features/listenbrainz/models/storeData";
 import { Logger } from "./features/logger";
-import { SharingService } from "./features/sharingService/sharingService";
 import { addCustomCss } from "./features/theming/theming";
+import { getTrackURL, getUniversalLink } from "./features/tidal/url";
 import { convertDurationToSeconds } from "./features/time/parse";
-import { MediaInfo } from "./models/mediaInfo";
+import { getEmptyMediaInfo, MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
-import { RepeatState } from "./models/repeatState";
-import { downloadFile } from "./scripts/download";
 import { addHotkey } from "./scripts/hotkeys";
 import { ObjectToDotNotation } from "./scripts/objectUtilities";
 import { settingsStore } from "./scripts/settings";
 import { setTitle } from "./scripts/window-functions";
+import { TidalApiController } from "./TidalControllers/apiController/TidalApiController";
+import { DomControllerOptions } from "./TidalControllers/DomController/DomControllerOptions";
+import { DomTidalController } from "./TidalControllers/DomController/DomTidalController";
+import { TidalController } from "./TidalControllers/TidalController";
 
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
+const staticTitle = "TIDAL Hi-Fi";
+
 let currentSong = "";
 let player: Player;
-let currentPlayStatus = MediaStatus.paused;
 let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
 let scrobbleWaitingForDelay = false;
 
-let currentlyPlaying = MediaStatus.paused;
-let currentRepeatState: RepeatState = RepeatState.off;
-let currentShuffleState = false;
-let currentMediaInfo: MediaInfo;
 let currentNotification: Electron.Notification;
 
-const elements = {
+let tidalController: TidalController;
-  play: '*[data-test="play"]',
+let controllerOptions = {};
-  pause: '*[data-test="pause"]',
+let currentMediaInfo = getEmptyMediaInfo();
-  next: '*[data-test="next"]',
-  previous: 'button[data-test="previous"]',
-  title: '*[data-test^="footer-track-title"]',
-  artists: '*[data-test^="grid-item-detail-text-title-artist"]',
-  home: '*[data-test="menu--home"]',
-  back: '[title^="Back"]',
-  forward: '[title^="Next"]',
-  search: '[class^="searchField"]',
-  shuffle: '*[data-test="shuffle"]',
-  repeat: '*[data-test="repeat"]',
-  account: '*[data-test^="profile-image-button"]',
-  settings: '*[data-test^="sidebar-menu-button"]',
-  openSettings: '*[data-test^="open-settings"]',
-  media: '*[data-test="current-media-imagery"]',
-  image: "img",
-  current: '*[data-test="current-time"]',
-  duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
-  bar: '*[data-test="progress-bar"]',
-  footer: "#footerPlayer",
-  mediaItem: "[data-type='mediaItem']",
-  album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
-  playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
-  queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
-  currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
-  album_name_cell: '[class^="album"]',
-  tracklist_row: '[data-test="tracklist-row"]',
-  volume: '*[data-test="volume"]',
-  favorite: '*[data-test="footer-favorite-button"]',
-  /**
-   * Get an element from the dom
-   * @param {*} key key in elements object to fetch
-   */
-  get: function (key: string) {
-    return window.document.querySelector(this[key.toLowerCase()]);
-  },
 
-  /**
+switch (settingsStore.get(settings.advanced.controllerType)) {
-   * Get the icon of the current media
+  case tidalControllers.tidalApiController: {
-   */
+    tidalController = new TidalApiController();
-  getSongIcon: function () {
+    Logger.log("TidalApiController initialized");
-    const figure = this.get("media");
+    break;
-
-    if (figure) {
-      const mediaElement = figure.querySelector(this["image"]);
-      if (mediaElement) {
-        return mediaElement.src.replace("80x80", "640x640");
-      }
   }
 
-    return "";
+  default: {
-  },
+    tidalController = new DomTidalController();
-
+    const domControllerOptions: DomControllerOptions = {
-  /**
+      refreshInterval: getDomUpdateFrequency(),
-   * returns an array of all artists in the current media
+    };
-   * @returns {Array} artists
+    controllerOptions = domControllerOptions;
-   */
+    Logger.log("domController initialized");
-  getArtistsArray: function () {
+    break;
-    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();
-  },
-};
 
 /**
  * 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;
 
@@ -199,19 +73,6 @@ function getUpdateFrequency() {
   }
 }
 
-/**
- * Play or pause the current media
- */
-function playPause() {
-  const play = elements.get("play");
-
-  if (play) {
-    elements.click("play");
-  } else {
-    elements.click("pause");
-  }
-}
-
 /**
  * Clears the old listenbrainz data on launch
  */
@@ -224,30 +85,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 () {
@@ -256,10 +113,10 @@ function addHotKeys() {
     });
 
     addHotkey("control+r", function () {
-      elements.click("repeat");
+      tidalController.repeat();
     });
     addHotkey("control+w", async function () {
-      const url = SharingService.getUniversalLink(getTrackURL());
+      const url = getUniversalLink(getTrackURL(tidalController.getTrackId()));
       clipboard.writeText(url);
       new Notification({
         title: `Universal link generated: `,
@@ -323,22 +180,22 @@ function addIPCEventListeners() {
         case globalEvents.playPause:
         case globalEvents.play:
         case globalEvents.pause:
-          playPause();
+          tidalController.playPause();
           break;
         case globalEvents.next:
-          elements.click("next");
+          tidalController.next();
           break;
         case globalEvents.previous:
-          elements.click("previous");
+          tidalController.previous();
           break;
         case globalEvents.toggleFavorite:
-          elements.click("favorite");
+          tidalController.toggleFavorite();
           break;
         case globalEvents.toggleShuffle:
-          elements.click("shuffle");
+          tidalController.toggleShuffle();
           break;
         case globalEvents.toggleRepeat:
-          elements.click("repeat");
+          tidalController.repeat();
           break;
         default:
           break;
@@ -347,48 +204,6 @@ function addIPCEventListeners() {
   });
 }
 
-/**
- * Update the current status of tidal (e.g playing or paused)
- */
-function getCurrentlyPlayingStatus() {
-  const pause = elements.get("pause");
-  let status = undefined;
-
-  // if pause button is visible tidal is playing
-  if (pause) {
-    status = MediaStatus.playing;
-  } else {
-    status = MediaStatus.paused;
-  }
-  return status;
-}
-
-function getCurrentShuffleState() {
-  const shuffle = elements.get("shuffle");
-  return shuffle?.getAttribute("aria-checked") === "true";
-}
-
-function getCurrentRepeatState() {
-  const repeat = elements.get("repeat");
-  switch (repeat?.getAttribute("data-type")) {
-    case "button__repeatAll":
-      return RepeatState.all;
-    case "button__repeatSingle":
-      return RepeatState.single;
-    default:
-      return RepeatState.off;
-  }
-}
-
-/**
- * Convert the duration from MM:SS to seconds
- * @param {*} duration
- */
-function convertDuration(duration: string) {
-  const parts = duration.split(":");
-  return parseInt(parts[1]) + 60 * parseInt(parts[0]);
-}
-
 /**
  * Update Tidal-hifi's media info
  *
@@ -396,7 +211,6 @@ function convertDuration(duration: string) {
  */
 function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
   if (mediaInfo) {
-    currentMediaInfo = mediaInfo;
     ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
     updateMpris(mediaInfo);
     updateListenBrainz(mediaInfo);
@@ -459,16 +273,35 @@ function addMPRIS() {
           const eventValue = events[eventName];
           switch (events[eventValue]) {
             case events.playpause:
-              playPause();
+              tidalController.playPause();
+              break;
+            case events.next:
+              tidalController.next();
+              break;
+            case events.previous:
+              tidalController.previous();
+              break;
+            case events.pause:
+              tidalController.pause();
+              break;
+            case events.stop:
+              tidalController.stop();
+              break;
+            case events.play:
+              tidalController.play();
+              break;
+            case events.loopStatus:
+              tidalController.repeat();
+              break;
+            case events.shuffle:
+              tidalController.toggleShuffle();
               break;
-            default:
-              elements.click(eventValue);
           }
         });
       });
       // Override get position function
       player.getPosition = function () {
-        return convertDuration(elements.getText("current")) * 1000 * 1000;
+        return tidalController.getCurrentPositionInSeconds();
       };
       player.on("quit", function () {
         app.quit();
@@ -489,8 +322,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:"),
     };
@@ -517,124 +350,47 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
               mediaInfo.title,
               mediaInfo.artists,
               mediaInfo.status,
-              convertDuration(mediaInfo.duration)
+              convertDurationToSeconds(mediaInfo.duration),
             );
             scrobbleWaitingForDelay = false;
           },
-          settingsStore.get(settings.ListenBrainz.delay) ?? 0
+          settingsStore.get(settings.ListenBrainz.delay) ?? 0,
         );
       }
     }
   }
 }
 
-/**
+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
+    // if titleOrArtists didn't change then only minor mediaInfo (like timings) changed, so don't bother the user with notifications
-        resolve();
+    updateMediaInfo(currentMediaInfo, false);
-      }
-    }).then(() => {
-      updateMediaInfo(options, titleOrArtistsChanged);
-    });
-  } else {
-    // just update the time
-    updateMediaInfo(
-      { ...currentMediaInfo, ...{ current, currentInSeconds: convertDurationToSeconds(current) } },
-      false
-    );
   }
 
   /**
@@ -649,13 +405,12 @@ setInterval(function () {
         const artistNames = Object.values(artists).map((artist) => artist);
         const foundArtist = artistNames.some((artist) => artistsToSkip.includes(artist));
         if (foundArtist) {
-          elements.click("next");
+          tidalController.next();
         }
       }
     }
   }
-}, getUpdateFrequency());
+});
-
 addMPRIS();
 addCustomCss(app);
 addHotKeys();

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