Merge pull request #570 from Mastermindzh/fix/login

Fix/login

.github/workflows/build.yml

@@ -24,6 +24,10 @@ jobs:
           node-version: 22.4
       - run: npm install
       - run: npm run build
+      - uses: actions/upload-artifact@master
+        with:
+          name: linux-builds
+          path: dist/
 
   build_on_mac:
     runs-on: macos-latest

.vscode/settings.json

@@ -14,7 +14,6 @@
     "rescrobbler",
     "scrobble",
     "scrobbling",
-    "Songwhip",
     "trackid",
     "tracklist",
     "widevine",

CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.18.1]
+
+- Fixed the login bug
+- Upgraded electron to 35.1.1
+- Added Widevine/CDM info to startup
+- delayed remote electron initializer
+
+## [5.18.0]
+
+- [Dianoga](https://github.com/Dianoga) fixed the duration selector, restoring mpris & partial API data.
+  - PR: #554
+- Added `xesam:url` property to mpris metadata fixes [#506](https://github.com/Mastermindzh/tidal-hifi/issues/506)
+
+## [5.17.0]
+
+- Added an option to disable the dynamic title and set it to a static one, [#491](https://github.com/Mastermindzh/tidal-hifi/pull/491)
+- Discord integration now says "Listening to" instead of "playing" [#488](https://github.com/Mastermindzh/tidal-hifi/pull/488) && [#454](https://github.com/Mastermindzh/tidal-hifi/pull/454)
+- Fixed several element names in the dom scraper
+- Removed the Songwhip (they shut down) integration and replaced it with TIDAL's universal link system
+
 ## [5.16.0]
 
 - Fix issue #449 Discord RPC stuck on "Browsing Tidal".

README.md

@@ -48,7 +48,6 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 - AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
 - Custom [integrations](#integrations)
   - [ListenBrainz](https://listenbrainz.org/?redirect=false) integration
-  - Songwhip.com integration (hotkey `ctrl + w`)
   - Discord RPC integration (showing "now listening", "Browsing", etc)
     - Flatpak version only works if both Discord and Tidal-HiFi are flatpaks
   - MPRIS integration

build/electron-builder.base.yml

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

package.json

@@ -1,10 +1,10 @@
 {
   "name": "tidal-hifi",
-  "version": "5.16.0",
+  "version": "5.18.1",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
-    "start": "electron --inspect=0.0.0.0:5858 .",
+    "start": "electron --inspect=0.0.0.0:5858 --remote-debugging-port=8315 --remote-allow-origins=* .",
     "watchStart": "nodemon dist -x \"npm run start\"",
     "compile": "tsc && npm run sass-and-copy",
     "deps": "npm run watch",
@@ -42,16 +42,16 @@
   "dependencies": {
     "@electron/remote": "^2.1.2",
     "@types/swagger-jsdoc": "^6.0.4",
-    "@xhayper/discord-rpc": "^1.2.0",
-    "axios": "^1.7.7",
-    "cors": "^2.8.5",
+    "@xhayper/discord-rpc": "^1.2.1",
+    "axios": "^1.8.4",
     "electron-store": "^8.2.0",
-    "express": "^4.21.1",
-    "hotkeys-js": "^3.13.7",
+    "express": "^4.21.2",
+    "hotkeys-js": "^3.13.9",
     "mpris-service": "^2.1.2",
-    "request": "^2.88.2",
     "sass": "^1.79.4",
-    "swagger-ui-express": "^5.0.1"
+    "swagger-ui-express": "^5.0.1",
+    "cors": "^2.8.5",
+    "request": "^2.88.2"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
@@ -63,8 +63,8 @@
     "@typescript-eslint/eslint-plugin": "^7.16.0",
     "@typescript-eslint/parser": "^7.15.0",
     "copyfiles": "^2.4.1",
-    "electron": "git+https://github.com/castlabs/electron-releases#v31.1.0+wvcus",
-    "electron-builder": "~24.9.4",
+    "electron": "github:castlabs/electron-releases#v35.1.1+wvcus",
+    "electron-builder": "~26.0.12",
     "eslint": "^8.57.0",
     "js-yaml": "^4.1.0",
     "markdown-toc": "^1.2.0",

scripts/verifyElements.js

@@ -16,17 +16,19 @@
     search: '[class^="searchField"]',
     shuffle: '*[data-test="shuffle"]',
     repeat: '*[data-test="repeat"]',
-    account: '*[class^="profileOptions"]',
-    settings: '*[data-test^="open-settings"]',
+    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"]',
+    duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
     bar: '*[data-test="progress-bar"]',
     footer: "#footerPlayer",
     mediaItem: "[data-type='mediaItem']",
-    album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
-    playingFrom: '*[class^="playingFrom"] span:nth-child(2)',
+    album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
+    playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
+    queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
     currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
     album_name_cell: '[class^="album"]',
     tracklist_row: '[data-test="tracklist-row"]',

src/constants/globalEvents.ts

@@ -10,7 +10,7 @@ export const globalEvents = {
   showSettings: "showSettings",
   storeChanged: "storeChanged",
   error: "error",
-  whip: "whip",
+  getUniversalLink: "getUniversalLink",
   log: "log",
   toggleFavorite: "toggleFavorite",
   toggleShuffle: "toggleShuffle",

src/constants/settings.ts

@@ -55,6 +55,7 @@ export const settings = {
   singleInstance: "singleInstance",
   skipArtists: "skipArtists",
   skippedArtists: "skippedArtists",
+  staticWindowTitle: "staticWindowTitle",
   theme: "theme",
   trayIcon: "trayIcon",
   updateFrequency: "updateFrequency",

src/features/api/swagger.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "TIDAL Hi-Fi API",
-    "version": "5.16.0",
+    "version": "5.18.1",
     "description": "",
     "license": {
       "name": "MIT",

src/features/sharingService/sharingService.ts

@@ -0,0 +1,10 @@
+export class SharingService {
+  /**
+   * Retrieve the universal link given a regular track link
+   * @param currentUrl
+   * @returns
+   */
+  public static getUniversalLink(currentUrl: string): string {
+    return `${currentUrl}?u`;
+  }
+}

src/features/songwhip/models/Artist.ts

@@ -1,21 +0,0 @@
-import { ServiceLinks } from "./ServiceLinks";
-
-export interface Artist {
-  type: string;
-  id: number;
-  path: string;
-  name: string;
-  sourceUrl: string;
-  sourceCountry: string;
-  url: string;
-  image: string;
-  createdAt: string;
-  updatedAt: string;
-  refreshedAt: string;
-  serviceIds: { [key: string]: string };
-  orchardId: string;
-  spotifyId: string;
-  links: { [key: string]: ServiceLinks[] };
-  linksCountries: string[];
-  description: string;
-}

src/features/songwhip/models/ServiceLinks.ts

@@ -1,4 +0,0 @@
-export interface ServiceLinks {
-  link: string;
-  countries: string[];
-}

src/features/songwhip/models/whip.ts

@@ -1,27 +0,0 @@
-import { Artist } from "./Artist";
-import { ServiceLinks } from "./ServiceLinks";
-
-export interface WhippedResult {
-  status: string;
-  data: {
-    item: {
-      type: string;
-      id: number;
-      path: string;
-      name: string;
-      url: string;
-      sourceUrl: string;
-      sourceCountry: string;
-      releaseDate: string;
-      createdAt: string;
-      updatedAt: string;
-      refreshedAt: string;
-      image: string;
-      isrc: string;
-      isExplicit: boolean;
-      links: { [key: string]: ServiceLinks[] };
-      linksCountries: string[];
-      artists: Artist[];
-    };
-  };
-}

src/features/songwhip/songwhip.ts

@@ -1,32 +0,0 @@
-import { WhippedResult } from "./models/whip";
-import axios from "axios";
-
-export class Songwhip {
-  /**
-   * Call the songwhip API and create a shareable songwhip page
-   * @param currentUrl
-   * @returns
-   */
-  public static async whip(currentUrl: string): Promise<WhippedResult> {
-    try {
-      const response = await axios.post("https://songwhip.com/api/songwhip/create", {
-        url: currentUrl,
-        // doesn't actually matter.. returns everything the same way anyway
-        country: "NL",
-      });
-
-      return response.data;
-    } catch (error) {
-      console.log(JSON.stringify(error));
-    }
-  }
-
-  /**
-   * Transform a songwhip response into a shareable url
-   * @param response
-   * @returns
-   */
-  public static getWhipUrl(response: WhippedResult) {
-    return `https://songwhip.com${response.data.item.url}`;
-  }
-}

src/main.ts

@@ -10,7 +10,7 @@ import {
   releaseInhibitorIfActive,
 } from "./features/idleInhibitor/idleInhibitor";
 import { Logger } from "./features/logger";
-import { Songwhip } from "./features/songwhip/songwhip";
+import { SharingService } from "./features/sharingService/sharingService";
 import { MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
 import { initRPC, rpc, unRPC } from "./scripts/discord";
@@ -26,7 +26,6 @@ import {
 import { addTray, refreshTray } from "./scripts/tray";
 let mainInhibitorId = -1;
 
-initialize();
 let mainWindow: BrowserWindow;
 const icon = path.join(__dirname, "../assets/icon.png");
 const PROTOCOL_PREFIX = "tidal";
@@ -98,6 +97,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
       },
     },
   });
+
   enable(mainWindow.webContents);
   registerHttpProtocols();
   syncMenuBarWithStore();
@@ -126,6 +126,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
     }
     return false;
   });
+
   // Emitted when the window is closed.
   mainWindow.on("closed", function () {
     releaseInhibitorIfActive(mainInhibitorId);
@@ -178,6 +179,7 @@ app.on("ready", async () => {
 
   if (isMainInstance() || isMultipleInstancesAllowed()) {
     await components.whenReady();
+    initialize();
 
     // Adblock
     if (settingsStore.get(settings.adBlock)) {
@@ -188,6 +190,8 @@ app.on("ready", async () => {
       });
     }
 
+    Logger.log("components ready:", components.status());
+
     createWindow();
     addMenu(mainWindow);
     createSettingsWindow();
@@ -250,8 +254,8 @@ ipcMain.on(globalEvents.error, (event) => {
   console.log(event);
 });
 
-ipcMain.handle(globalEvents.whip, async (event, url) => {
-  return Songwhip.whip(url);
+ipcMain.handle(globalEvents.getUniversalLink, async (event, url) => {
+  return SharingService.getUniversalLink(url);
 });
 
 Logger.watch(ipcMain);

src/pages/settings/preload.ts

@@ -46,6 +46,7 @@ let adBlock: HTMLInputElement,
   singleInstance: HTMLInputElement,
   skipArtists: HTMLInputElement,
   skippedArtists: HTMLInputElement,
+  staticWindowTitle: HTMLInputElement,
   theme: HTMLSelectElement,
   trayIcon: HTMLInputElement,
   updateFrequency: HTMLInputElement,
@@ -140,8 +141,9 @@ function refreshSettings() {
     port.value = settingsStore.get(settings.apiSettings.port);
     singleInstance.checked = settingsStore.get(settings.singleInstance);
     skipArtists.checked = settingsStore.get(settings.skipArtists);
-    theme.value = settingsStore.get(settings.theme);
     skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
+    staticWindowTitle.checked = settingsStore.get(settings.staticWindowTitle);
+    theme.value = settingsStore.get(settings.theme);
     trayIcon.checked = settingsStore.get(settings.trayIcon);
     updateFrequency.value = settingsStore.get(settings.updateFrequency);
     enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
@@ -261,6 +263,7 @@ window.addEventListener("DOMContentLoaded", () => {
   trayIcon = get("trayIcon");
   skipArtists = get("skipArtists");
   skippedArtists = get("skippedArtists");
+  staticWindowTitle = get("staticWindowTitle");
   singleInstance = get("singleInstance");
   updateFrequency = get("updateFrequency");
   enableListenBrainz = get("enableListenBrainz");
@@ -295,6 +298,7 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(port, settings.apiSettings.port);
   addInputListener(skipArtists, settings.skipArtists);
   addTextAreaListener(skippedArtists, settings.skippedArtists);
+  addInputListener(staticWindowTitle, settings.staticWindowTitle);
   addInputListener(singleInstance, settings.singleInstance);
   addSelectListener(theme, settings.theme);
   addInputListener(trayIcon, settings.trayIcon);

src/pages/settings/settings.html

@@ -106,6 +106,16 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
+            <div class="group__option">
+              <div class="group__description">
+                <h4>Static Window Title</h4>
+                <p>Makes the window title "TIDAL Hi-Fi" instead of changing to the currently playing song.</p>
+              </div>
+              <label class="switch">
+                <input id="staticWindowTitle" type="checkbox" />
+                <span class="switch__slider"></span>
+              </label>
+            </div>
             <div class="group__option">
               <div class="group__description">
                 <h4>Minimize on Close</h4>
@@ -468,7 +478,7 @@
           <h4>TIDAL Hi-Fi</h4>
           <div class="about-section__version">
             <a target="_blank" rel="noopener"
-              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.16.0">5.16.0</a>
+              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.18.1">5.18.1</a>
           </div>
           <div class="about-section__links">
             <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
@@ -491,4 +501,4 @@
   </div>
 </body>
 
-</html>
+</html>

src/preload.ts

@@ -10,7 +10,7 @@ import {
 } from "./features/listenbrainz/listenbrainz";
 import { StoreData } from "./features/listenbrainz/models/storeData";
 import { Logger } from "./features/logger";
-import { Songwhip } from "./features/songwhip/songwhip";
+import { SharingService } from "./features/sharingService/sharingService";
 import { addCustomCss } from "./features/theming/theming";
 import { convertDurationToSeconds } from "./features/time/parse";
 import { MediaInfo } from "./models/mediaInfo";
@@ -48,17 +48,18 @@ const elements = {
   search: '[class^="searchField"]',
   shuffle: '*[data-test="shuffle"]',
   repeat: '*[data-test="repeat"]',
-  account: '*[class^="profileOptions"]',
-  settings: '*[data-test^="open-settings"]',
+  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"]',
+  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)',
+  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"]',
@@ -220,9 +221,9 @@ ListenBrainzStore.clear();
 function addHotKeys() {
   if (settingsStore.get(settings.enableCustomHotkeys)) {
     addHotkey("Control+p", function () {
-      elements.click("account");
+      elements.click("settings");
       setTimeout(() => {
-        elements.click("settings");
+        elements.click("openSettings");
       }, 100);
     });
     addHotkey("Control+l", function () {
@@ -254,11 +255,10 @@ function addHotKeys() {
       elements.click("repeat");
     });
     addHotkey("control+w", async function () {
-      const result = await ipcRenderer.invoke(globalEvents.whip, getTrackURL());
-      const url = Songwhip.getWhipUrl(result);
+      const url = SharingService.getUniversalLink(getTrackURL());
       clipboard.writeText(url);
       new Notification({
-        title: `Successfully whipped: `,
+        title: `Universal link generated: `,
         body: `URL copied to clipboard: ${url}`,
       }).show();
     });
@@ -483,6 +483,7 @@ function updateMpris(mediaInfo: MediaInfo) {
         "xesam:title": mediaInfo.title,
         "xesam:artist": [mediaInfo.artists],
         "xesam:album": mediaInfo.album,
+        "xesam:url": mediaInfo.url,
         "mpris:artUrl": mediaInfo.image,
         "mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
         "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
@@ -550,6 +551,7 @@ setInterval(function () {
   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();
@@ -594,7 +596,9 @@ setInterval(function () {
     };
 
     // update title, url and play info with new info
-    setTitle(songDashArtistTitle);
+    settingsStore.get(settings.staticWindowTitle)
+      ? setTitle(staticTitle)
+      : setTitle(songDashArtistTitle);
     getTrackURL();
     currentSong = songDashArtistTitle;
     currentPlayStatus = currentStatus;

src/scripts/discord.ts

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

src/scripts/settings.ts

@@ -69,6 +69,7 @@ export const settingsStore = new Store({
     singleInstance: true,
     skipArtists: false,
     skippedArtists: [""],
+    staticWindowTitle: false,
     theme: "none",
     trayIcon: true,
     updateFrequency: 500,