Bump version and changelog to 1.17.0

Bump ejs from 3.1.6 to 3.1.7

.github/workflows/build.yml

@@ -13,18 +13,18 @@ jobs:
         os: [macos-latest, ubuntu-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: "12.x"
+          node-version: "16.x"
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -35,6 +35,60 @@ jobs:
       - name: Install dependencies
         run: yarn --frozen-lockfile
 
+      ######################
+      # Patch SnoreToast to fix App ID - see https://github.com/th-ch/youtube-music/issues/479#issuecomment-965473559
+      - name: SnoreToast - parameters
+        id: snoretoast-params
+        if: startsWith(matrix.os, 'windows')
+        shell: bash
+        run: |
+          echo "::set-output name=version::v0.8.0"
+          echo "::set-output name=path::./vendor/snoretoast"
+
+      - name: SnoreToast - cache
+        id: snoretoast-cache
+        uses: actions/cache@v2
+        if: startsWith(matrix.os, 'windows')
+        with:
+          path: ${{ steps.snoretoast-params.outputs.path }}
+          key: snoretoast-${{ steps.snoretoast-params.outputs.version }}
+
+      - name: SnoreToast - compile
+        if: |
+          startsWith(matrix.os, 'windows') &&
+          steps.snoretoast-cache.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          SNORETOAST_TAG="${{ steps.snoretoast-params.outputs.version }}"
+          echo "Compiling SnoreToast $SNORETOAST_TAG"
+
+          git config --global user.email "th-ch@users.noreply.github.com"
+          git config --global user.name "YouTube Music"
+          git clone -c advice.detachedHead=false --branch $SNORETOAST_TAG --depth 1 https://github.com/KDE/snoretoast.git ${{ steps.snoretoast-params.outputs.path }}
+          cd ${{ steps.snoretoast-params.outputs.path }}
+
+          # Apply https://github.com/KDE/snoretoast/pull/15/commits/c5faeceaf36f4b9fb27e5269990b716a25ecbe43
+          # Patch generated with `git format-patch -1 c5faeceaf36f4b9fb27e5269990b716a25ecbe43`
+          git am < ../snoretoast-patch/0001-Fix-activation-not-writing-to-pipe.patch
+
+          # Compile for win32
+          cmake -A Win32 -B build32
+          cmake --build build32 --config Release
+
+          # Compile for x64
+          cmake -A x64 -B build64
+          cmake --build build64 --config Release
+
+      - name: SnoreToast - overwrite with custom build
+        if: startsWith(matrix.os, 'windows')
+        shell: bash
+        run: |
+          # Override SnoreToast with the patched versions
+          cp ${{ steps.snoretoast-params.outputs.path }}/build32/bin/Release/snoretoast.exe ./node_modules/node-notifier/vendor/snoreToast/snoretoast-x86.exe
+          cp ${{ steps.snoretoast-params.outputs.path }}/build64/bin/Release/snoretoast.exe ./node_modules/node-notifier/vendor/snoreToast/snoretoast-x64.exe
+      # End of SnoreToast patch
+      ######################
+
       - name: Test
         uses: GabrielBB/xvfb-action@v1
         with:

.gitignore

@@ -2,3 +2,4 @@ node_modules
 /dist
 /assets/generated
 electron-builder.yml
+.vscode/settings.json

changelog.md

@@ -0,0 +1,546 @@
+### Changelog
+
+All notable changes to this project will be documented in this file. Dates are displayed in UTC.
+
+#### [v1.17.0](https://github.com/th-ch/youtube-music/compare/v1.16.0...v1.17.0)
+
+- Bump ejs from 3.1.6 to 3.1.7 [`#712`](https://github.com/th-ch/youtube-music/pull/712)
+- fix injectCSS `did-finish-load` listener overload [`#693`](https://github.com/th-ch/youtube-music/pull/693)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.23.6 to 1.23.7 [`#689`](https://github.com/th-ch/youtube-music/pull/689)
+- [Snyk] Upgrade custom-electron-prompt from 1.4.1 to 1.4.2 [`#686`](https://github.com/th-ch/youtube-music/pull/686)
+- [Snyk] Upgrade @electron/remote from 2.0.7 to 2.0.8 [`#684`](https://github.com/th-ch/youtube-music/pull/684)
+- Improve plugin submenu ux [`#699`](https://github.com/th-ch/youtube-music/pull/699)
+- update build action [`#702`](https://github.com/th-ch/youtube-music/pull/702)
+- add different modes to video-toggle plugin [`#700`](https://github.com/th-ch/youtube-music/pull/700)
+- lint [`#701`](https://github.com/th-ch/youtube-music/pull/701)
+- [ImgBot] Optimize images [`#703`](https://github.com/th-ch/youtube-music/pull/703)
+- add album to lastfm if available [`#695`](https://github.com/th-ch/youtube-music/pull/695)
+- [in-app-menu] add hide icon option [`#680`](https://github.com/th-ch/youtube-music/pull/680)
+- Add plugin to bypass age restrictions [`#682`](https://github.com/th-ch/youtube-music/pull/682)
+- Add "Picture in picture" plugin [`#674`](https://github.com/th-ch/youtube-music/pull/674)
+- Set lyrics metadata from Genius [`#679`](https://github.com/th-ch/youtube-music/pull/679)
+- MacOS: bring back the app in dock when using tray + app hidden [`#677`](https://github.com/th-ch/youtube-music/pull/677)
+- [Snyk] Upgrade @electron/remote from 2.0.4 to 2.0.5 [`#644`](https://github.com/th-ch/youtube-music/pull/644)
+- [Snyk] Upgrade ytpl from 2.2.3 to 2.3.0 [`#660`](https://github.com/th-ch/youtube-music/pull/660)
+- [Snyk] Upgrade ytdl-core from 4.10.1 to 4.11.0 [`#659`](https://github.com/th-ch/youtube-music/pull/659)
+- Bump plist from 3.0.2 to 3.0.5 [`#678`](https://github.com/th-ch/youtube-music/pull/678)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.23.4 to 1.23.5 [`#624`](https://github.com/th-ch/youtube-music/pull/624)
+- [Precise-Volume] fix volumeHud position in miniplayer [`#645`](https://github.com/th-ch/youtube-music/pull/645)
+- add always-on-top option [`#655`](https://github.com/th-ch/youtube-music/pull/655)
+- [precise-volume] fix expand-volume-slider not updating its value [`#670`](https://github.com/th-ch/youtube-music/pull/670)
+- Fix lyrics genius missing parts [`#671`](https://github.com/th-ch/youtube-music/pull/671)
+- feat: option to force show like buttons [`#673`](https://github.com/th-ch/youtube-music/pull/673)
+- fix custom titlebar in prompt options [`#619`](https://github.com/th-ch/youtube-music/pull/619)
+- Process lyrics HTML in Genius util [`d0532d6`](https://github.com/th-ch/youtube-music/commit/d0532d691e56f955ef0b41f5fe2efe6295dddf9e)
+- Create first version of picture in picture plugin [`d2265b5`](https://github.com/th-ch/youtube-music/commit/d2265b59d78143cf51fe4dc3d5dee9da66873cc1)
+- Bump electron-builder to fix Mac build script [`ae8365f`](https://github.com/th-ch/youtube-music/commit/ae8365f721eafda6c502d02eee86d098f2b9e2a1)
+
+#### [v1.16.0](https://github.com/th-ch/youtube-music/compare/v1.15.0...v1.16.0)
+
+> 20 February 2022
+
+- update in-app-menu [`#596`](https://github.com/th-ch/youtube-music/pull/596)
+- Fix clientID [`#602`](https://github.com/th-ch/youtube-music/pull/602)
+- Add snoretoast custom compile script [`#600`](https://github.com/th-ch/youtube-music/pull/600)
+- fix interactive notifications icon + exclude platform specific plugins from build [`#591`](https://github.com/th-ch/youtube-music/pull/591)
+- Add album title to largeImage and change paused icon [`#587`](https://github.com/th-ch/youtube-music/pull/587)
+- make useragent override optional [`#595`](https://github.com/th-ch/youtube-music/pull/595)
+- get album name from DOM [`#588`](https://github.com/th-ch/youtube-music/pull/588)
+- fix various lyrics issues [`#584`](https://github.com/th-ch/youtube-music/pull/584)
+- discord set inactivity timeout prompt [`#580`](https://github.com/th-ch/youtube-music/pull/580)
+- add single instance lock option [`#578`](https://github.com/th-ch/youtube-music/pull/578)
+- fix "restart app on config change" option [`#561`](https://github.com/th-ch/youtube-music/pull/561)
+- fix window position save spam [`#562`](https://github.com/th-ch/youtube-music/pull/562)
+- load adblocker sooner [`#583`](https://github.com/th-ch/youtube-music/pull/583)
+- add description of new plugins to readme [`#585`](https://github.com/th-ch/youtube-music/pull/585)
+- Use `center` alignment for lyrics text [`#573`](https://github.com/th-ch/youtube-music/pull/573)
+- fix precise-volume hud positioning [`#567`](https://github.com/th-ch/youtube-music/pull/567)
+- update electron and dependencies [`#565`](https://github.com/th-ch/youtube-music/pull/565)
+- filenamify playlist folder name [`#557`](https://github.com/th-ch/youtube-music/pull/557)
+- [Snyk] Security upgrade node-fetch from 2.6.6 to 2.6.7 (3.1.1 incompatible) [`#554`](https://github.com/th-ch/youtube-music/pull/554)
+- fix app starting offscreen [`#548`](https://github.com/th-ch/youtube-music/pull/548)
+- Release Mac arm64 [`#566`](https://github.com/th-ch/youtube-music/pull/566)
+- Build command for Apple (m1) silicon macs  [`#553`](https://github.com/th-ch/youtube-music/pull/553)
+- [Snyk] Upgrade custom-electron-titlebar from 3.2.9 to 3.2.10 [`#545`](https://github.com/th-ch/youtube-music/pull/545)
+- Fix duplicate media session on linux [`#551`](https://github.com/th-ch/youtube-music/pull/551)
+- show a badge remaining items when downloading a playlist [`#550`](https://github.com/th-ch/youtube-music/pull/550)
+- allow downloading playlists from popup menu [`#549`](https://github.com/th-ch/youtube-music/pull/549)
+- xesam:artist should be a list [`#539`](https://github.com/th-ch/youtube-music/pull/539)
+- fix notifications showing thumbnail of last song [`#537`](https://github.com/th-ch/youtube-music/pull/537)
+- Fix https://github.com/th-ch/youtube-music/pull/578#issuecomment-1035517531 [`#578`](https://github.com/th-ch/youtube-music/pull/578)
+- Add automatic changelog [`1d9bfe8`](https://github.com/th-ch/youtube-music/commit/1d9bfe8ac8869cde648164979986964baa52c2f9)
+- update electron to v17.0.0 [`fef7115`](https://github.com/th-ch/youtube-music/commit/fef711549fa9862f8ea23301edde747c5802e352)
+- update dependencies [`8be07bc`](https://github.com/th-ch/youtube-music/commit/8be07bcb7ad8b727d97c36aa0760aed4e2fc481f)
+
+#### [v1.15.0](https://github.com/th-ch/youtube-music/compare/v1.14.0...v1.15.0)
+
+> 30 December 2021
+
+- Switch from spectron to playwright to fix tests [`#531`](https://github.com/th-ch/youtube-music/pull/531)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.23.0 to 1.23.1 [`#529`](https://github.com/th-ch/youtube-music/pull/529)
+- fix precise-volume options sync [`#525`](https://github.com/th-ch/youtube-music/pull/525)
+- Add album art/thumbnail to discord activity [`#524`](https://github.com/th-ch/youtube-music/pull/524)
+- fix skip-silences plugin [`#521`](https://github.com/th-ch/youtube-music/pull/521)
+- [Snyk] Upgrade electron-updater from 4.6.2 to 4.6.3 [`#520`](https://github.com/th-ch/youtube-music/pull/520)
+- update electron & remote & user agents [`#515`](https://github.com/th-ch/youtube-music/pull/515)
+- fixes mpris bug in snap [`#513`](https://github.com/th-ch/youtube-music/pull/513)
+- Add "Skip silences" plugin [`#519`](https://github.com/th-ch/youtube-music/pull/519)
+- Aligned lyric design [`#510`](https://github.com/th-ch/youtube-music/pull/510)
+- Fix mpris bugs - follows #480 [`#509`](https://github.com/th-ch/youtube-music/pull/509)
+- Various small fixes (discord, video-toggle, precise-volume, playback-speed, shortcuts, lyrics) [`#476`](https://github.com/th-ch/youtube-music/pull/476)
+- Mpris + obs-tuna fixes [`#480`](https://github.com/th-ch/youtube-music/pull/480)
+- [Snyk] Upgrade node-fetch from 2.6.5 to 2.6.6 [`#498`](https://github.com/th-ch/youtube-music/pull/498)
+- fix interaction between blur navbar & in-app-menu [`#491`](https://github.com/th-ch/youtube-music/pull/491)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.22.7 to 1.23.0 [`#475`](https://github.com/th-ch/youtube-music/pull/475)
+- New Plugin: Exponential Volume [`#488`](https://github.com/th-ch/youtube-music/pull/488)
+- [Snyk] Upgrade electron-updater from 4.6.0 to 4.6.1 [`#474`](https://github.com/th-ch/youtube-music/pull/474)
+- Fix loadeddata/metadata video events rarely not firing (+other small fixes) [`#477`](https://github.com/th-ch/youtube-music/pull/477)
+- fix #490 [`#490`](https://github.com/th-ch/youtube-music/issues/490)
+- fix #472 [`#472`](https://github.com/th-ch/youtube-music/issues/472)
+- fix mpris [`ccfe743`](https://github.com/th-ch/youtube-music/commit/ccfe7434bf708ee58156c2952234a049706edfc2)
+- lint [`4362101`](https://github.com/th-ch/youtube-music/commit/4362101c0a2ebb7f0536f615cecba8a55ac96702)
+- rework songInfo pause listener [`6726e26`](https://github.com/th-ch/youtube-music/commit/6726e2600b3ca3a8d68e3e1b95b50da211fa354d)
+
+#### [v1.14.0](https://github.com/th-ch/youtube-music/compare/v1.13.0...v1.14.0)
+
+> 7 November 2021
+
+- [Snyk] Upgrade custom-electron-prompt from 1.1.0 to 1.2.0 [`#467`](https://github.com/th-ch/youtube-music/pull/467)
+- Video Toggle Plugin [`#448`](https://github.com/th-ch/youtube-music/pull/448)
+- fix playback speed plugin [`#462`](https://github.com/th-ch/youtube-music/pull/462)
+- Fix sponsorblock skipping when not needed [`#465`](https://github.com/th-ch/youtube-music/pull/465)
+- Sponsorblock fix + use new apiLoaded event [`#463`](https://github.com/th-ch/youtube-music/pull/463)
+- use apiLoaded event in audio-compressor plugin [`#458`](https://github.com/th-ch/youtube-music/pull/458)
+- alert on initial hide-menu enabled [`#456`](https://github.com/th-ch/youtube-music/pull/456)
+- Blur plugin tweaks and integration with in-app-menu [`#451`](https://github.com/th-ch/youtube-music/pull/451)
+- set resume on start url to songInfo.url [`#449`](https://github.com/th-ch/youtube-music/pull/449)
+- quality-changer-plugin [`#446`](https://github.com/th-ch/youtube-music/pull/446)
+- get songInfo from youtube API [`#443`](https://github.com/th-ch/youtube-music/pull/443)
+- New plugin: Blur navigation bar [`#442`](https://github.com/th-ch/youtube-music/pull/442)
+- Discord plugin: Clean Up Export (follow-up #380) [`#440`](https://github.com/th-ch/youtube-music/pull/440)
+- remove upgrade button + makes images unselectable [`#434`](https://github.com/th-ch/youtube-music/pull/434)
+- new auto confirm when paused [`#433`](https://github.com/th-ch/youtube-music/pull/433)
+- fix: mpris instance not registering itself and media controls [`#431`](https://github.com/th-ch/youtube-music/pull/431)
+- Audio compressor plugin [`#288`](https://github.com/th-ch/youtube-music/pull/288)
+- precise-volume plugin fixes & updates [`#275`](https://github.com/th-ch/youtube-music/pull/275)
+- Custom Prompt for changing options [`#243`](https://github.com/th-ch/youtube-music/pull/243)
+- [Snyk] Upgrade async-mutex from 0.3.1 to 0.3.2 [`#412`](https://github.com/th-ch/youtube-music/pull/412)
+- build(deps): bump tmpl from 1.0.4 to 1.0.5 [`#414`](https://github.com/th-ch/youtube-music/pull/414)
+- [Snyk] Upgrade node-fetch from 2.6.1 to 2.6.2 [`#416`](https://github.com/th-ch/youtube-music/pull/416)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.22.5 to 1.22.6 [`#429`](https://github.com/th-ch/youtube-music/pull/429)
+- build(deps-dev): bump electron from 12.0.8 to 12.1.0 [`#430`](https://github.com/th-ch/youtube-music/pull/430)
+- Fix discord clearActivity, menu, listen along option [`#380`](https://github.com/th-ch/youtube-music/pull/380)
+- Bump dev deps [`41a01ba`](https://github.com/th-ch/youtube-music/commit/41a01ba58a17056ba5143fdbd10d3bae11dd8d52)
+- Discord add reconnecting functionality [`b5fd6b4`](https://github.com/th-ch/youtube-music/commit/b5fd6b4969a318b3738583e7f33eb2c0cf295237)
+- add custom-electron-prompt [`e4eed2e`](https://github.com/th-ch/youtube-music/commit/e4eed2e51979378e62dab902e425218cae5108dc)
+
+#### [v1.13.0](https://github.com/th-ch/youtube-music/compare/v1.12.2...v1.13.0)
+
+> 19 September 2021
+
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.22.4 to 1.22.5 [`#406`](https://github.com/th-ch/youtube-music/pull/406)
+- Fix incorrect Google alert caused by changing user agent coresponding to current platform [`#384`](https://github.com/th-ch/youtube-music/pull/384)
+- [Snyk] Upgrade electron-updater from 4.4.3 to 4.4.6 [`#401`](https://github.com/th-ch/youtube-music/pull/401)
+- [Snyk] Upgrade electron-updater from 4.4.0 to 4.4.1 [`#370`](https://github.com/th-ch/youtube-music/pull/370)
+- Bump path-parse from 1.0.6 to 1.0.7 [`#375`](https://github.com/th-ch/youtube-music/pull/375)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.22.2 to 1.22.3 [`#385`](https://github.com/th-ch/youtube-music/pull/385)
+- Bump jszip from 3.5.0 to 3.7.1 [`#388`](https://github.com/th-ch/youtube-music/pull/388)
+- List missing plugins [`#382`](https://github.com/th-ch/youtube-music/pull/382)
+- add tuna plugin for obs [`#397`](https://github.com/th-ch/youtube-music/pull/397)
+- Update menu buttons to new format [`#389`](https://github.com/th-ch/youtube-music/pull/389)
+- Plugin to fetch lyrics from Genius [`#387`](https://github.com/th-ch/youtube-music/pull/387)
+- Add mpris support with cherry picked commit from previous PR https://github.com/th-ch/youtube-music/pull/394 [`#395`](https://github.com/th-ch/youtube-music/pull/395)
+- Add "Listen Along" button, solve #353 [`#383`](https://github.com/th-ch/youtube-music/pull/383)
+- Bump node to v14 [`#386`](https://github.com/th-ch/youtube-music/pull/386)
+- [Snyk] Upgrade electron-updater from 4.3.9 to 4.3.10 [`#350`](https://github.com/th-ch/youtube-music/pull/350)
+- [Snyk] Upgrade chokidar from 3.5.1 to 3.5.2 [`#354`](https://github.com/th-ch/youtube-music/pull/354)
+- Bump ytdl/ytpl [`c01506d`](https://github.com/th-ch/youtube-music/commit/c01506dc441bfc538471dc2c552c1a8a2800c611)
+- Add mpris support [`e255777`](https://github.com/th-ch/youtube-music/commit/e255777283c7b16611404cbfe260bfcca75a1e40)
+- Add Genius lyrics plugin [`acbe0ac`](https://github.com/th-ch/youtube-music/commit/acbe0ac25d568c25fedb514e0e96c66497b0f2d6)
+
+#### [v1.12.2](https://github.com/th-ch/youtube-music/compare/v1.12.1...v1.12.2)
+
+> 1 July 2021
+
+- Fix downloader plugin [`#339`](https://github.com/th-ch/youtube-music/pull/339)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.22.0 to 1.22.1 [`#337`](https://github.com/th-ch/youtube-music/pull/337)
+- Update and simplify in-app-menu [`#249`](https://github.com/th-ch/youtube-music/pull/249)
+- Bump hosted-git-info from 2.8.8 to 2.8.9 [`#331`](https://github.com/th-ch/youtube-music/pull/331)
+- Bump lodash from 4.17.20 to 4.17.21 [`#330`](https://github.com/th-ch/youtube-music/pull/330)
+- [Snyk] Upgrade ytdl-core from 4.8.0 to 4.8.2 [`#328`](https://github.com/th-ch/youtube-music/pull/328)
+- [Snyk] Upgrade electron-updater from 4.3.8 to 4.3.9 [`#324`](https://github.com/th-ch/youtube-music/pull/324)
+- Bump normalize-url from 4.5.0 to 4.5.1 [`#323`](https://github.com/th-ch/youtube-music/pull/323)
+- Bump trim-newlines from 3.0.0 to 3.0.1 [`#320`](https://github.com/th-ch/youtube-music/pull/320)
+- [Snyk] Upgrade @ffmpeg/core from 0.9.0 to 0.10.0 [`#317`](https://github.com/th-ch/youtube-music/pull/317)
+- [Snyk] Upgrade @ffmpeg/ffmpeg from 0.9.8 to 0.10.0 [`#316`](https://github.com/th-ch/youtube-music/pull/316)
+- [Snyk] Upgrade custom-electron-titlebar from 3.2.6 to 3.2.7 [`#311`](https://github.com/th-ch/youtube-music/pull/311)
+- fix hidden webp thumbnail throwing MIME type error in downloader [`#318`](https://github.com/th-ch/youtube-music/pull/318)
+- Add Sponsorblock plugin [`#308`](https://github.com/th-ch/youtube-music/pull/308)
+- [Snyk] Upgrade @ffmpeg/ffmpeg from 0.9.7 to 0.9.8 [`#305`](https://github.com/th-ch/youtube-music/pull/305)
+- Bump dependencies to fix vulnerabilities [`496836b`](https://github.com/th-ch/youtube-music/commit/496836b33b116e06b8d1361ce1f47ab6c9138cae)
+- update refreshMenu() function [`33855f1`](https://github.com/th-ch/youtube-music/commit/33855f17dd80c099117a3d84bbd9b5021776771c)
+- Add SponsorBlock plugin [`ca64a77`](https://github.com/th-ch/youtube-music/commit/ca64a77ed0236fd9cfb4b40e450578a186638dc7)
+
+#### [v1.12.1](https://github.com/th-ch/youtube-music/compare/v1.12.0...v1.12.1)
+
+> 28 May 2021
+
+- Bump ws from 7.4.3 to 7.4.6 [`#303`](https://github.com/th-ch/youtube-music/pull/303)
+- Bump browserslist from 4.16.3 to 4.16.6 [`#301`](https://github.com/th-ch/youtube-music/pull/301)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.20.4 to 1.20.5 [`#300`](https://github.com/th-ch/youtube-music/pull/300)
+- [Snyk] Upgrade ytdl-core from 4.5.0 to 4.7.0 [`#299`](https://github.com/th-ch/youtube-music/pull/299)
+- [Snyk] Upgrade @ffmpeg/core from 0.8.5 to 0.9.0 [`#298`](https://github.com/th-ch/youtube-music/pull/298)
+- [Snyk] Upgrade filenamify from 4.2.0 to 4.3.0 [`#293`](https://github.com/th-ch/youtube-music/pull/293)
+- [Snyk] Upgrade ytpl from 2.1.1 to 2.2.0 [`#285`](https://github.com/th-ch/youtube-music/pull/285)
+- fix song-info callback duplication [`#269`](https://github.com/th-ch/youtube-music/pull/269)
+- fix notification showing appID instead of app name on windows [`#270`](https://github.com/th-ch/youtube-music/pull/270)
+- Upgrade electron to v12 [`#273`](https://github.com/th-ch/youtube-music/pull/273)
+- fix last-fm overwrite config on each start [`#267`](https://github.com/th-ch/youtube-music/pull/267)
+- Downloader tweaks + taskbar progress bar [`#265`](https://github.com/th-ch/youtube-music/pull/265)
+- remove `open` dependency from last-fm plugin [`#262`](https://github.com/th-ch/youtube-music/pull/262)
+- Fix downloader metadata if not currently playing [`#252`](https://github.com/th-ch/youtube-music/pull/252)
+- fix playPause bugs by directly playPause video element [`#259`](https://github.com/th-ch/youtube-music/pull/259)
+- Bump ua-parser-js from 0.7.23 to 0.7.28 [`#260`](https://github.com/th-ch/youtube-music/pull/260)
+- Fix precise volume listener override [`#253`](https://github.com/th-ch/youtube-music/pull/253)
+- fix css not inserting on reload [`#255`](https://github.com/th-ch/youtube-music/pull/255)
+- playlist download progressBar using `chokidar` [`53bf7c5`](https://github.com/th-ch/youtube-music/commit/53bf7c5068fdc14f5aa469d47b3174d27f40e05c)
+- download progress bar on taskbar [`a8ac2c3`](https://github.com/th-ch/youtube-music/commit/a8ac2c3af988f299be85010e7fea541096b7e261)
+- fix: upgrade @cliqz/adblocker-electron from 1.20.4 to 1.20.5 [`c5f84b5`](https://github.com/th-ch/youtube-music/commit/c5f84b568b0c3480af1abc8ff111771e2170a50e)
+
+#### [v1.12.0](https://github.com/th-ch/youtube-music/compare/v1.11.0...v1.12.0)
+
+> 4 May 2021
+
+- Menu tweaks [`#224`](https://github.com/th-ch/youtube-music/pull/224)
+- Interactive notifications for windows [`#228`](https://github.com/th-ch/youtube-music/pull/228)
+- [Plugin] Precise volume control [`#236`](https://github.com/th-ch/youtube-music/pull/236)
+- [Snyk] Upgrade electron-store from 7.0.2 to 7.0.3 [`#244`](https://github.com/th-ch/youtube-music/pull/244)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.20.3 to 1.20.4 [`#233`](https://github.com/th-ch/youtube-music/pull/233)
+- Dependencies update [`#231`](https://github.com/th-ch/youtube-music/pull/231)
+- Fix downloader metadata [`#245`](https://github.com/th-ch/youtube-music/pull/245)
+- Last.fm support [`#196`](https://github.com/th-ch/youtube-music/pull/196)
+- simple fix for discord plugin [`#239`](https://github.com/th-ch/youtube-music/pull/239)
+- In-app-menu plugin - rename plugin & configure menu builder [`#215`](https://github.com/th-ch/youtube-music/pull/215)
+- Allows downloading songs that aren't currently playing [`#221`](https://github.com/th-ch/youtube-music/pull/221)
+- Updated download plugin icon color to match other icons [`#222`](https://github.com/th-ch/youtube-music/pull/222)
+- [Notification Plugin] Fix duplicate notification [`#216`](https://github.com/th-ch/youtube-music/pull/216)
+- Pass metadata to front + use metadata URL in downloader [`#213`](https://github.com/th-ch/youtube-music/pull/213)
+- Refresh menu on plugin enable/disable (show/hide submenu) [`#217`](https://github.com/th-ch/youtube-music/pull/217)
+- remove 'shortcuts' from default plugins [`#218`](https://github.com/th-ch/youtube-music/pull/218)
+- [Plugin] styled-bars [`#201`](https://github.com/th-ch/youtube-music/pull/201)
+- Add configurable notification urgency [`#212`](https://github.com/th-ch/youtube-music/pull/212)
+- add Download Folder Chooser [`#207`](https://github.com/th-ch/youtube-music/pull/207)
+- Improved songinfo provider, by using the data from the '/player' request [`#194`](https://github.com/th-ch/youtube-music/pull/194)
+- Download plugin directory chooser [`#10`](https://github.com/th-ch/youtube-music/pull/10)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.20.0 to 1.20.1 [`#180`](https://github.com/th-ch/youtube-music/pull/180)
+- [Plugin] taskbar-mediacontrol  (for Windows) [`#200`](https://github.com/th-ch/youtube-music/pull/200)
+- merge source [`#3`](https://github.com/th-ch/youtube-music/pull/3)
+- merge source [`#2`](https://github.com/th-ch/youtube-music/pull/2)
+- Add playlist feature in downloader plugin + custom menus in plugin system [`#203`](https://github.com/th-ch/youtube-music/pull/203)
+- Added Discord timeout [`#192`](https://github.com/th-ch/youtube-music/pull/192)
+- Override hide(),show(),isVisible from inside plugin [`6427b34`](https://github.com/th-ch/youtube-music/commit/6427b3406c8d84c5b7ecbe6a28158d5dc895c3c2)
+- added back original yarn.lock [`24fea5a`](https://github.com/th-ch/youtube-music/commit/24fea5a24afd4f547628549962d24756cca5e413)
+- remove local prompt [`8dc486f`](https://github.com/th-ch/youtube-music/commit/8dc486f18fe02a218b149838dc7ab939ec1b698a)
+
+#### [v1.11.0](https://github.com/th-ch/youtube-music/compare/v1.10.0...v1.11.0)
+
+> 9 March 2021
+
+- [Snyk] Upgrade electron-store from 7.0.1 to 7.0.2 [`#178`](https://github.com/th-ch/youtube-music/pull/178)
+- Added function to toggle resuming of last song when app starts [`#177`](https://github.com/th-ch/youtube-music/pull/177)
+- [Snyk] Upgrade discord-rpc from 3.1.4 to 3.2.0 [`#175`](https://github.com/th-ch/youtube-music/pull/175)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.19.0 to 1.20.0 [`#154`](https://github.com/th-ch/youtube-music/pull/154)
+- Added metadata to downloader plugin, and updated packages [`dd1bdae`](https://github.com/th-ch/youtube-music/commit/dd1bdae9478ef831ee2a00b29be04c65626933f8)
+- Fix download/speed menu item [`796a7aa`](https://github.com/th-ch/youtube-music/commit/796a7aaaf1ecaf80b2ef113137f2222499803e29)
+- fix: upgrade @cliqz/adblocker-electron from 1.19.0 to 1.20.0 [`538ab52`](https://github.com/th-ch/youtube-music/commit/538ab52abd46c2e3c6abb529c5137b5286d29670)
+
+#### [v1.10.0](https://github.com/th-ch/youtube-music/compare/v1.9.0...v1.10.0)
+
+> 7 February 2021
+
+- [Snyk] Upgrade @ffmpeg/ffmpeg from 0.9.6 to 0.9.7 [`#146`](https://github.com/th-ch/youtube-music/pull/146)
+- Reuse the same notification, instead of creating a new one each time the song changes. [`#144`](https://github.com/th-ch/youtube-music/pull/144)
+- [Snyk] Upgrade ytdl-core from 4.2.1 to 4.3.0 [`#136`](https://github.com/th-ch/youtube-music/pull/136)
+- bring the new commits to this fork [`#1`](https://github.com/th-ch/youtube-music/pull/1)
+- GH page [`3bcf409`](https://github.com/th-ch/youtube-music/commit/3bcf409f2b1629333714b187c606891cedb12512)
+- Add plugin to control playback speed like in YouTube (from 0.25 to 2) [`f7f3185`](https://github.com/th-ch/youtube-music/commit/f7f31850d3d9879002dc47326e4f6ec9a52c25a1)
+- Update back.js [`1fdf241`](https://github.com/th-ch/youtube-music/commit/1fdf2416ad414035104bfb51b8450d82e566cb13)
+
+#### [v1.9.0](https://github.com/th-ch/youtube-music/compare/v1.8.2...v1.9.0)
+
+> 15 January 2021
+
+- [Snyk] Upgrade electron-debug from 3.1.0 to 3.2.0 [`#121`](https://github.com/th-ch/youtube-music/pull/121)
+- Refactor providers [`#125`](https://github.com/th-ch/youtube-music/pull/125)
+- Added Discord rich presence and added extra properties to songInfo provider [`#124`](https://github.com/th-ch/youtube-music/pull/124)
+- Fix plugins with context isolation [`#127`](https://github.com/th-ch/youtube-music/pull/127)
+- Windows portable exe [`#126`](https://github.com/th-ch/youtube-music/pull/126)
+- Split providers in 2 [`0743034`](https://github.com/th-ch/youtube-music/commit/0743034de0443e889ec11d7ea83727ff4fb96599)
+- Added Discord rich presence and added extra properties to songinfo provider [`a8ce87f`](https://github.com/th-ch/youtube-music/commit/a8ce87f2ccb4f0fdbd36676883e6a0497bebc263)
+- Update discord plugin for new provider + wait for ready [`aec542e`](https://github.com/th-ch/youtube-music/commit/aec542e95e2837f54bf19de675f311444789ea4e)
+
+#### [v1.8.2](https://github.com/th-ch/youtube-music/compare/v1.8.1...v1.8.2)
+
+> 12 January 2021
+
+- Downloader plugin - custom audio format [`#118`](https://github.com/th-ch/youtube-music/pull/118)
+- Globalized the song info and song controls, and updated Touch Bar for it. [`#102`](https://github.com/th-ch/youtube-music/pull/102)
+- Bump electron to v11 [`#120`](https://github.com/th-ch/youtube-music/pull/120)
+- Globalized the songinfo and song controls, and changed the pause/play button. [`9be3e1a`](https://github.com/th-ch/youtube-music/commit/9be3e1afe91f0aa3419040bba65e7b3b83b469c6)
+- Simplifies the notification plugin to use the globalized song info [`5bffdbd`](https://github.com/th-ch/youtube-music/commit/5bffdbd6285a6816749c467d6e912d14748f9959)
+- Loads providers before plugins [`3a5d9bd`](https://github.com/th-ch/youtube-music/commit/3a5d9bd973bdd67e77f8a7687c1430245a9490bd)
+
+#### [v1.8.1](https://github.com/th-ch/youtube-music/compare/v1.8.0...v1.8.1)
+
+> 8 January 2021
+
+- [Snyk] Upgrade electron-updater from 4.3.5 to 4.3.6 [`#116`](https://github.com/th-ch/youtube-music/pull/116)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.18.8 to 1.19.0 [`#117`](https://github.com/th-ch/youtube-music/pull/117)
+- [Snyk] Upgrade ytdl-core from 4.1.1 to 4.1.2 [`#109`](https://github.com/th-ch/youtube-music/pull/109)
+- Bump node-notifier from 8.0.0 to 8.0.1 [`#104`](https://github.com/th-ch/youtube-music/pull/104)
+- fix: upgrade electron-updater from 4.3.5 to 4.3.6 [`0bf77e5`](https://github.com/th-ch/youtube-music/commit/0bf77e592a87eb8a5222cf2c1588488a51044422)
+- fix: upgrade @cliqz/adblocker-electron from 1.18.8 to 1.19.0 [`5c0cc08`](https://github.com/th-ch/youtube-music/commit/5c0cc08d80d60c46e8b27343c6fc302f64fe89e2)
+- fix: upgrade ytdl-core from 4.1.1 to 4.1.2 [`e2cc262`](https://github.com/th-ch/youtube-music/commit/e2cc2628aea653739f878ec2cd2e72e2e70018a1)
+
+#### [v1.8.0](https://github.com/th-ch/youtube-music/compare/v1.7.5...v1.8.0)
+
+> 20 December 2020
+
+- Added Touch Bar plugin [`#101`](https://github.com/th-ch/youtube-music/pull/101)
+- [Snyk] Upgrade @ffmpeg/core from 0.8.4 to 0.8.5 [`#99`](https://github.com/th-ch/youtube-music/pull/99)
+- [Snyk] Upgrade @ffmpeg/ffmpeg from 0.9.5 to 0.9.6 [`#100`](https://github.com/th-ch/youtube-music/pull/100)
+- [Readme] Web folder for readme assets + new SVG animation [`#96`](https://github.com/th-ch/youtube-music/pull/96)
+- Add new Linux targets (deb, freebsd, rpm) [`#94`](https://github.com/th-ch/youtube-music/pull/94)
+- Web folder for readme assets + new svg animation [`01fc965`](https://github.com/th-ch/youtube-music/commit/01fc9651705f457da63615ff774f00957f783d3d)
+- touchbar plugin - fixed code style [`7473677`](https://github.com/th-ch/youtube-music/commit/7473677477071ca5e7b18bda3193e345d7fd549f)
+- added initial touchbar support [`c3e2c13`](https://github.com/th-ch/youtube-music/commit/c3e2c1380810d156d9d6863fffc804242171bec0)
+
+#### [v1.7.5](https://github.com/th-ch/youtube-music/compare/v1.7.4...v1.7.5)
+
+> 12 December 2020
+
+- Bump ini from 1.3.5 to 1.3.7 [`#92`](https://github.com/th-ch/youtube-music/pull/92)
+- Fix adblocking [`#90`](https://github.com/th-ch/youtube-music/pull/90)
+- Bump adblocker dependency [`49497d0`](https://github.com/th-ch/youtube-music/commit/49497d0efb28ee0be5b16d0f1c3660efafcd289c)
+- Fix adblocker preloading to inject scripts/styles [`66c5ce4`](https://github.com/th-ch/youtube-music/commit/66c5ce46caa85a7ae4ceb3d63a9e168827015c71)
+- Add uBlock Origin filters to default sources [`79c7959`](https://github.com/th-ch/youtube-music/commit/79c795927a3be96456a2f45159285c64166a29b8)
+
+#### [v1.7.4](https://github.com/th-ch/youtube-music/compare/v1.7.3...v1.7.4)
+
+> 8 December 2020
+
+#### [v1.7.3](https://github.com/th-ch/youtube-music/compare/v1.7.2...v1.7.3)
+
+> 8 December 2020
+
+- Adblocker: add option to disable default lists [`22c7f70`](https://github.com/th-ch/youtube-music/commit/22c7f70c938566a9db9c4d46a57224cfdee43df0)
+
+#### [v1.7.2](https://github.com/th-ch/youtube-music/compare/v1.7.1...v1.7.2)
+
+> 6 December 2020
+
+- Add AUR badge + beautify badges [`#82`](https://github.com/th-ch/youtube-music/pull/82)
+- Bugfix: only use cache with no additional blocklists [`467171a`](https://github.com/th-ch/youtube-music/commit/467171a17e648331d63f166c2da2f3134e95b37f)
+- Add AUR tag + beautify tags [`d212206`](https://github.com/th-ch/youtube-music/commit/d21220693b9ffa26e05fe1963376b636b40b9952)
+- Readme: add youtube-music logo to badges [`3022fac`](https://github.com/th-ch/youtube-music/commit/3022facbead40ccd81629c37b870ab33ce7fa106)
+
+#### [v1.7.1](https://github.com/th-ch/youtube-music/compare/v1.7.0...v1.7.1)
+
+> 3 December 2020
+
+- Option to restart the app on config changes [`fd97576`](https://github.com/th-ch/youtube-music/commit/fd97576611ae80b959ffe7984e88ddc8d28a1ffc)
+- Bump version to 1.7.1 [`e07cac2`](https://github.com/th-ch/youtube-music/commit/e07cac240691b1c9d6909e457824616182374c3a)
+
+#### [v1.7.0](https://github.com/th-ch/youtube-music/compare/v1.6.5...v1.7.0)
+
+> 3 December 2020
+
+- Refactor config, custom plugin options [`#79`](https://github.com/th-ch/youtube-music/pull/79)
+- Refactor config for simpler use and advanced options in plugins [`8ab2da0`](https://github.com/th-ch/youtube-music/commit/8ab2da0482b6211b6b6d43423ec06daed48dac4f)
+- Allow editing config (advanced) [`f4fe5c2`](https://github.com/th-ch/youtube-music/commit/f4fe5c2a58e1ad555c321f27c00d2d78184fc687)
+- Adblocker - advanced options (caching or not, additional lists) [`b94d0d4`](https://github.com/th-ch/youtube-music/commit/b94d0d4e8bd3a92bbb5e012a63fa782baa774be7)
+
+#### [v1.6.5](https://github.com/th-ch/youtube-music/compare/v1.6.4...v1.6.5)
+
+> 2 December 2020
+
+- Add option to disable hardware acceleration [`#77`](https://github.com/th-ch/youtube-music/pull/77)
+- Downloader plugin - retry and upgrade dependencies [`#76`](https://github.com/th-ch/youtube-music/pull/76)
+- Reflect Arch Linux package name change [`#70`](https://github.com/th-ch/youtube-music/pull/70)
+- Option to hide menu [`#67`](https://github.com/th-ch/youtube-music/pull/67)
+- Add Arch Linux installation instructions [`#68`](https://github.com/th-ch/youtube-music/pull/68)
+- Update ytdl-core to 4.1.1 [`33a11ef`](https://github.com/th-ch/youtube-music/commit/33a11efe9acad234e41ad9044ae9e67fd573b7f4)
+- Autoupdate modal: add download/disable updates buttons [`ae5b85d`](https://github.com/th-ch/youtube-music/commit/ae5b85d8d748659f2e23d417560026f24ab8ce9c)
+- Option to hide menu (win/linux) [`4bac3ac`](https://github.com/th-ch/youtube-music/commit/4bac3ace186c5be2cb9409d2b703f960bd662145)
+
+#### [v1.6.4](https://github.com/th-ch/youtube-music/compare/v1.6.3...v1.6.4)
+
+> 24 November 2020
+
+#### [v1.6.3](https://github.com/th-ch/youtube-music/compare/v1.6.2...v1.6.3)
+
+> 24 November 2020
+
+- Improve CI [`#64`](https://github.com/th-ch/youtube-music/pull/64)
+- Ensure menu is visible on all platforms [`#63`](https://github.com/th-ch/youtube-music/pull/63)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.18.3 to 1.18.4 [`#62`](https://github.com/th-ch/youtube-music/pull/62)
+- fix: upgrade @cliqz/adblocker-electron from 1.18.3 to 1.18.4 [`2b243f6`](https://github.com/th-ch/youtube-music/commit/2b243f6dcb00d3b6f27fd066c093e7b16bb384e2)
+- CI: cache yarn directory [`0fd4933`](https://github.com/th-ch/youtube-music/commit/0fd49330d3218ec5f1bc62b72ace28e79d02bc93)
+- Run CI on every push/PR [`cf4827d`](https://github.com/th-ch/youtube-music/commit/cf4827d780fee510a27eecf42453b0505c52bcf9)
+
+#### [v1.6.2](https://github.com/th-ch/youtube-music/compare/v1.6.0...v1.6.2)
+
+> 22 November 2020
+
+- Add github action to build/release [`#60`](https://github.com/th-ch/youtube-music/pull/60)
+- Bump to node 12 [`#59`](https://github.com/th-ch/youtube-music/pull/59)
+- Bump to node 12 [`#59`](https://github.com/th-ch/youtube-music/pull/59)
+- Add downloader (video -> mp3) plugin (in music menu) [`e197087`](https://github.com/th-ch/youtube-music/commit/e197087a5027af1ca71ecde7bbdf6351137555b9)
+- Delete AppVeyor/Travis CI integration [`941dd90`](https://github.com/th-ch/youtube-music/commit/941dd90d77a5c46ed5505918374693fcd892af1f)
+- GH action to build/release [`fc4754a`](https://github.com/th-ch/youtube-music/commit/fc4754a1709e6eb70d662f89eafd360aa4a77aa2)
+
+#### [v1.6.0](https://github.com/th-ch/youtube-music/compare/v1.5.0...v1.6.0)
+
+> 11 November 2020
+
+- [Snyk] Upgrade electron-store from 6.0.0 to 6.0.1 [`#54`](https://github.com/th-ch/youtube-music/pull/54)
+- Add notifications plugin (notify of song on play event) [`bcff6e5`](https://github.com/th-ch/youtube-music/commit/bcff6e51348645395549c206717225fb16a29cda)
+- Plugins/event handlers in each window [`9bc81da`](https://github.com/th-ch/youtube-music/commit/9bc81da6f2c7f5f35769489e179851bdd80a7da8)
+- Option to toggle devtools [`3e97e93`](https://github.com/th-ch/youtube-music/commit/3e97e9307cf0991adc5584a603c292b03bc6202d)
+
+#### [v1.5.0](https://github.com/th-ch/youtube-music/compare/v1.4.0...v1.5.0)
+
+> 4 October 2020
+
+- Bump node-fetch from 2.6.0 to 2.6.1 [`#45`](https://github.com/th-ch/youtube-music/pull/45)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.17.0 to 1.18.0 [`#47`](https://github.com/th-ch/youtube-music/pull/47)
+- [Snyk] Upgrade electron-updater from 4.3.3 to 4.3.4 [`#40`](https://github.com/th-ch/youtube-music/pull/40)
+- Bump elliptic from 6.5.2 to 6.5.3 [`#38`](https://github.com/th-ch/youtube-music/pull/38)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.16.0 to 1.16.1 [`#37`](https://github.com/th-ch/youtube-music/pull/37)
+- Bump lodash from 4.17.15 to 4.17.19 [`#34`](https://github.com/th-ch/youtube-music/pull/34)
+- Option to start at login [`#32`](https://github.com/th-ch/youtube-music/pull/32)
+- Bump dependencies [`97dce5a`](https://github.com/th-ch/youtube-music/commit/97dce5ad41ba7ff7a12d4e57a6a0acfeccd666d8)
+- Bump electron to v10 (+ remove devtron, bump spectron) [`5f0dcbb`](https://github.com/th-ch/youtube-music/commit/5f0dcbb3fc9b2912bba690db232184d32c599150)
+- Navigation plugin: fix arrow style [`8d74a0a`](https://github.com/th-ch/youtube-music/commit/8d74a0a9b52c5b5a04b0986e5fbec9b47a35823e)
+
+#### [v1.4.0](https://github.com/th-ch/youtube-music/compare/v1.3.3...v1.4.0)
+
+> 12 July 2020
+
+- Bump electron from 8.2.1 to 8.2.4 [`#31`](https://github.com/th-ch/youtube-music/pull/31)
+- [Snyk] Upgrade electron-store from 5.1.1 to 5.2.0 [`#30`](https://github.com/th-ch/youtube-music/pull/30)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.14.4 to 1.15.0 [`#29`](https://github.com/th-ch/youtube-music/pull/29)
+- [Snyk] Upgrade electron-debug from 3.0.1 to 3.1.0 [`#28`](https://github.com/th-ch/youtube-music/pull/28)
+- [Snyk] Upgrade electron-updater from 4.3.1 to 4.3.2 [`#27`](https://github.com/th-ch/youtube-music/pull/27)
+- [Snyk] Upgrade electron-updater from 4.3.0 to 4.3.1 [`#26`](https://github.com/th-ch/youtube-music/pull/26)
+- [Snyk] Upgrade @cliqz/adblocker-electron from 1.14.1 to 1.14.2 [`#25`](https://github.com/th-ch/youtube-music/pull/25)
+- [Tests] Add integration tests [`#24`](https://github.com/th-ch/youtube-music/pull/24)
+- Add jest, spectron and getPort util for tests [`736a706`](https://github.com/th-ch/youtube-music/commit/736a70680108620cdecab2da9dd48e10354c713e)
+- fix: upgrade electron-updater from 4.3.1 to 4.3.2 [`8c94510`](https://github.com/th-ch/youtube-music/commit/8c945100e24187885dbbe5bb7830b1da11e4eaa2)
+- Add jest config and test environment to launch app [`bce5b7d`](https://github.com/th-ch/youtube-music/commit/bce5b7d8ebd96886d462a3c999d72e6c69b6f807)
+
+#### [v1.3.3](https://github.com/th-ch/youtube-music/compare/v1.3.2...v1.3.3)
+
+> 29 April 2020
+
+- Move tray click callback in setUpTray [`4824dda`](https://github.com/th-ch/youtube-music/commit/4824dda5d52565deb5cd6ef4b51d2d742677a154)
+- Bump version to 1.3.3 [`37cac19`](https://github.com/th-ch/youtube-music/commit/37cac19d9ccae59b89a68b995eaf7e08c7d24d11)
+
+#### [v1.3.2](https://github.com/th-ch/youtube-music/compare/v1.3.1...v1.3.2)
+
+> 26 April 2020
+
+- [Snyk] Upgrade electron-updater from 4.2.5 to 4.3.0 [`#22`](https://github.com/th-ch/youtube-music/pull/22)
+- fix: upgrade electron-updater from 4.2.5 to 4.3.0 [`9821300`](https://github.com/th-ch/youtube-music/commit/98213005d09d00bf013d2217809736bdc334ede6)
+- Hide the app (no quit) on close if tray enabled [`430687f`](https://github.com/th-ch/youtube-music/commit/430687f4d6d301aaeaeeaa11ae34d971ac3280df)
+- Show/hide window when clicking on tray [`058371a`](https://github.com/th-ch/youtube-music/commit/058371ace8fbd3d9f126454fdc7dbff86df05506)
+
+#### [v1.3.1](https://github.com/th-ch/youtube-music/compare/v1.2.0...v1.3.1)
+
+> 12 April 2020
+
+- Add options and tray [`#21`](https://github.com/th-ch/youtube-music/pull/21)
+- Upgrade outdated dependencies [`#20`](https://github.com/th-ch/youtube-music/pull/20)
+- [Plugins] Migrate ad blocker [`#19`](https://github.com/th-ch/youtube-music/pull/19)
+- Upgrade xo [`297de08`](https://github.com/th-ch/youtube-music/commit/297de08278c2704b3baf65c455bba72f72acc06f)
+- Bump electron-builder (needed after electron upgrade) [`3d9e59d`](https://github.com/th-ch/youtube-music/commit/3d9e59dc90e0e994e20af55af9134477e68907a5)
+- Migrate from adblock-rs to cliqz [`422c3fc`](https://github.com/th-ch/youtube-music/commit/422c3fc28d83da309a80447dcd5064a4346580e8)
+
+#### [v1.2.0](https://github.com/th-ch/youtube-music/compare/v1.1.6...v1.2.0)
+
+> 15 March 2020
+
+- [Snyk] Upgrade electron-localshortcut from 3.1.0 to 3.2.1 [`#13`](https://github.com/th-ch/youtube-music/pull/13)
+- [Snyk] Upgrade electron-updater from 4.0.6 to 4.2.2 [`#12`](https://github.com/th-ch/youtube-music/pull/12)
+- [Snyk] Upgrade electron-debug from 2.1.0 to 2.2.0 [`#15`](https://github.com/th-ch/youtube-music/pull/15)
+- Fix vulnerability [`#16`](https://github.com/th-ch/youtube-music/pull/16)
+- Plugin: autoconfirm when paused [`#11`](https://github.com/th-ch/youtube-music/pull/11)
+- Migrate to yarn to install packages without package.json (but keep npm rebuild) [`9371a48`](https://github.com/th-ch/youtube-music/commit/9371a4827e2312258a4f692c18f964155d57ceb8)
+- Bump electron-store to fix a vulnerability [`7050dfc`](https://github.com/th-ch/youtube-music/commit/7050dfca5c6a545dabc334690572d7f88b37e027)
+- Bump electron updater [`f25bb59`](https://github.com/th-ch/youtube-music/commit/f25bb59065d84cde202b5192688847c528c6ef61)
+
+#### [v1.1.6](https://github.com/th-ch/youtube-music/compare/v1.1.5...v1.1.6)
+
+> 11 September 2019
+
+- Bump eslint-utils from 1.3.1 to 1.4.2 [`#7`](https://github.com/th-ch/youtube-music/pull/7)
+- Bump lodash.mergewith from 4.6.1 to 4.6.2 [`#4`](https://github.com/th-ch/youtube-music/pull/4)
+- Bump lodash from 4.17.11 to 4.17.14 [`#5`](https://github.com/th-ch/youtube-music/pull/5)
+- npm audit fix [`1a72129`](https://github.com/th-ch/youtube-music/commit/1a72129108935cbe732621d93b877e90d11a4195)
+- Fix Google login [`746b5f1`](https://github.com/th-ch/youtube-music/commit/746b5f13bb08c614df290e69946cfd116a550521)
+- Bump version to 1.1.6 [`6fd10ea`](https://github.com/th-ch/youtube-music/commit/6fd10ea4a0f63e9a46e7307d811977f4e0f3213f)
+
+#### [v1.1.5](https://github.com/th-ch/youtube-music/compare/v1.1.4...v1.1.5)
+
+> 6 July 2019
+
+- Fix navigation plugin [`b10a1bb`](https://github.com/th-ch/youtube-music/commit/b10a1bb32dbea187422a43487527c379a9ddbb26)
+- Bump version to 1.1.5 [`07c4a42`](https://github.com/th-ch/youtube-music/commit/07c4a429c15f22b173629618518abb97d9ec0100)
+
+#### [v1.1.4](https://github.com/th-ch/youtube-music/compare/v1.1.3...v1.1.4)
+
+> 8 June 2019
+
+- isDev -> is package [`a85325f`](https://github.com/th-ch/youtube-music/commit/a85325f33dbd40517b6029e500569fc1640af2ef)
+- Add titlebar/frame only on MacOS [`b1c4cc9`](https://github.com/th-ch/youtube-music/commit/b1c4cc9c45cc48413118aec8ce54767b1983a3e7)
+- Bump version to 1.1.4 [`0420f2e`](https://github.com/th-ch/youtube-music/commit/0420f2e49e295cede0db22dbb1f35ffafd6318ed)
+
+#### [v1.1.3](https://github.com/th-ch/youtube-music/compare/v1.1.2...v1.1.3)
+
+> 2 June 2019
+
+- Bump fstream from 1.0.11 to 1.0.12 [`#3`](https://github.com/th-ch/youtube-music/pull/3)
+- Version 1.1.3 + npm audit fix [`147ac48`](https://github.com/th-ch/youtube-music/commit/147ac48de6540c836e835fefe47e66e55dbdc9bc)
+- Fix case for {en/dis}ablePlugin [`e86d63d`](https://github.com/th-ch/youtube-music/commit/e86d63da8cb083b89c2a26e6514a5b0df8868b13)
+- Remove outdated download links [`ec58b5c`](https://github.com/th-ch/youtube-music/commit/ec58b5cbedda8d6f881f0e81f185a1707dbe5fab)
+
+#### [v1.1.2](https://github.com/th-ch/youtube-music/compare/v1.1.1...v1.1.2)
+
+> 1 May 2019
+
+- Display error/retry in case of failure [`5a1d7fb`](https://github.com/th-ch/youtube-music/commit/5a1d7fbf230fcd840a3ea654f31602fb5f504852)
+- Bump version to 1.1.2 [`eac2c5c`](https://github.com/th-ch/youtube-music/commit/eac2c5cf14d0a348704f7fbf0ff0bdce02758670)
+
+#### [v1.1.1](https://github.com/th-ch/youtube-music/compare/v1.1.0...v1.1.1)
+
+> 28 April 2019
+
+- Update package lock [`2d3f77d`](https://github.com/th-ch/youtube-music/commit/2d3f77d96211460bb81a73c8c62b9e5407a7cf30)
+- Add travis config [`5279a45`](https://github.com/th-ch/youtube-music/commit/5279a45f3537170006ba04cd5d59ac8b879d78a5)
+- Add Appveyor config [`abc2bb8`](https://github.com/th-ch/youtube-music/commit/abc2bb8a4f749704f2daf376c0d392030f030caf)
+
+#### [v1.1.0](https://github.com/th-ch/youtube-music/compare/v1.0.0...v1.1.0)
+
+> 19 April 2019
+
+- Build script + check for updates [`b3c24a5`](https://github.com/th-ch/youtube-music/commit/b3c24a521281c352c37d649e8334b581b2a1de4f)
+- Add download section in readme [`828e8d4`](https://github.com/th-ch/youtube-music/commit/828e8d472ca3d76dea71d95a85f8fa726404b8e7)
+- Add release/licence badge in readme [`9d343bf`](https://github.com/th-ch/youtube-music/commit/9d343bf779f2fa830302cc84c484bf4a93a25f36)
+
+#### v1.0.0
+
+> 19 April 2019
+
+- Initial commit - app + 4 plugins [`8787b5c`](https://github.com/th-ch/youtube-music/commit/8787b5c175d02b52de65f2c559b411d999fa51e4)
+- Fix screenshot shadow + compress image [`c5c128f`](https://github.com/th-ch/youtube-music/commit/c5c128fa0f77c69e9bf12f6ca551315b37c51e84)
+- Missing quote in readme [`4b446ac`](https://github.com/th-ch/youtube-music/commit/4b446ac7c816c660cf369f3b8b6e420f766ee35f)

config/defaults.js

@@ -30,11 +30,13 @@ const defaultConfig = {
 		// Disabled plugins
 		shortcuts: {
 			enabled: false,
+			overrideMediaKeys: false,
 		},
 		downloader: {
 			enabled: false,
 			ffmpegArgs: [], // e.g. ["-b:a", "192k"] for an audio bitrate of 192kb/s
 			downloadFolder: undefined, // Custom download folder (absolute path)
+			preset: "mp3",
 		},
 		"last-fm": {
 			enabled: false,
@@ -45,7 +47,8 @@ const defaultConfig = {
 		discord: {
 			enabled: false,
 			activityTimoutEnabled: true, // if enabled, the discord rich presence gets cleared when music paused after the time specified below
-			activityTimoutTime: 10 * 60 * 1000 // 10 minutes
+			activityTimoutTime: 10 * 60 * 1000, // 10 minutes
+			listenAlong: true, // add a "listen along" button to rich presence
 		},
 		notifications: {
 			enabled: false,
@@ -58,12 +61,28 @@ const defaultConfig = {
 			steps: 1, //percentage of volume to change
 			arrowsShortcut: true, //enable ArrowUp + ArrowDown local shortcuts
 			globalShortcuts: {
-				enabled: false, // enable global shortcuts
-				volumeUp: "Shift+PageUp", // Keybind default can be changed
-				volumeDown: "Shift+PageDown"
+				volumeUp: "",
+				volumeDown: ""
 			},
 			savedVolume: undefined //plugin save volume between session here
-		}
+		},
+		sponsorblock: {
+			enabled: false,
+			apiURL: "https://sponsor.ajay.app",
+			categories: [
+				"sponsor",
+				"intro",
+				"outro",
+				"interaction",
+				"selfpromo",
+				"music_offtopic",
+			],
+		},
+		"video-toggle": {
+			enabled: false,
+			mode: "custom",
+			forceHide: false,
+		},
 	},
 };
 

config/index.js

@@ -1,11 +1,17 @@
 const defaultConfig = require("./defaults");
 const plugins = require("./plugins");
 const store = require("./store");
+const { restart } = require("../providers/app-controls");
 
 const set = (key, value) => {
 	store.set(key, value);
 };
 
+function setMenuOption(key, value) {
+	set(key, value);
+	if (store.get("options.restartOnConfigChanges")) restart();
+}
+
 const get = (key) => {
 	return store.get(key);
 };
@@ -14,6 +20,7 @@ module.exports = {
 	defaultConfig,
 	get,
 	set,
+	setMenuOption,
 	edit: () => store.openInEditor(),
 	watch: (cb) => {
 		store.onDidChange("options", cb);

config/plugins.js

@@ -1,4 +1,5 @@
 const store = require("./store");
+const { restart } = require("../providers/app-controls");
 
 function getEnabled() {
 	const plugins = store.get("plugins");
@@ -24,16 +25,21 @@ function setOptions(plugin, options) {
 	});
 }
 
+function setMenuOptions(plugin, options) {
+	setOptions(plugin, options);
+	if (store.get("options.restartOnConfigChanges")) restart();
+}
+
 function getOptions(plugin) {
 	return store.get("plugins")[plugin];
 }
 
 function enable(plugin) {
-	setOptions(plugin, { enabled: true });
+	setMenuOptions(plugin, { enabled: true });
 }
 
 function disable(plugin) {
-	setOptions(plugin, { enabled: false });
+	setMenuOptions(plugin, { enabled: false });
 }
 
 module.exports = {
@@ -42,5 +48,6 @@ module.exports = {
 	enable,
 	disable,
 	setOptions,
+	setMenuOptions,
 	getOptions,
 };

config/store.js

@@ -3,6 +3,49 @@ const Store = require("electron-store");
 const defaults = require("./defaults");
 
 const migrations = {
+	">=1.17.0": (store) => {
+		if (store.get("plugins.video-toggle.mode") === undefined) {
+			store.set("plugins.video-toggle.mode", "custom");
+		}
+	},
+	">=1.14.0": (store) => {
+		if (
+			typeof store.get("plugins.precise-volume.globalShortcuts") !== "object"
+		) {
+			store.set("plugins.precise-volume.globalShortcuts", {});
+		}
+
+		if (store.get("plugins.hide-video-player.enabled")) {
+			store.delete("plugins.hide-video-player");
+			store.set("plugins.video-toggle.enabled", true);
+		}
+	},
+	">=1.13.0": (store) => {
+		if (store.get("plugins.discord.listenAlong") === undefined) {
+			store.set("plugins.discord.listenAlong", true);
+		}
+	},
+	">=1.12.0": (store) => {
+		const options = store.get("plugins.shortcuts");
+		let updated = false;
+		for (const optionType of ["global", "local"]) {
+			if (Array.isArray(options[optionType])) {
+				const updatedOptions = {};
+				for (const optionObject of options[optionType]) {
+					if (optionObject.action && optionObject.shortcut) {
+						updatedOptions[optionObject.action] = optionObject.shortcut;
+					}
+				}
+
+				options[optionType] = updatedOptions;
+				updated = true;
+			}
+		}
+
+		if (updated) {
+			store.set("plugins.shortcuts", options);
+		}
+	},
 	">=1.11.0": (store) => {
 		if (store.get("options.resumeOnStart") === undefined) {
 			store.set("options.resumeOnStart", true);

index.js

@@ -2,6 +2,9 @@
 const path = require("path");
 
 const electron = require("electron");
+const remote = require('@electron/remote/main');
+remote.initialize();
+const enhanceWebRequest = require("electron-better-web-request").default;
 const is = require("electron-is");
 const unhandled = require("electron-unhandled");
 const { autoUpdater } = require("electron-updater");
@@ -19,12 +22,32 @@ unhandled({
 	showDialog: false,
 });
 
+// Disable Node options if the env var is set
+process.env.NODE_OPTIONS = "";
+
 const app = electron.app;
+// Prevent window being garbage collected
+let mainWindow;
+autoUpdater.autoDownload = false;
+
+if(config.get("options.singleInstanceLock")){
+	const gotTheLock = app.requestSingleInstanceLock();
+	if (!gotTheLock) app.quit();
+
+	app.on('second-instance', () => {
+		if (!mainWindow) return;
+		if (mainWindow.isMinimized()) mainWindow.restore();
+		if (!mainWindow.isVisible()) mainWindow.show();
+		mainWindow.focus();
+	});
+}
+
 app.commandLine.appendSwitch(
 	"js-flags",
 	// WebAssembly flags
-	"--experimental-wasm-threads --experimental-wasm-bulk-memory"
+	"--experimental-wasm-threads"
 );
+app.commandLine.appendSwitch("enable-features", "SharedArrayBuffer"); // Required for downloader
 app.allowRendererProcessReuse = true; // https://github.com/electron/electron/issues/18397
 if (config.get("options.disableHardwareAcceleration")) {
 	if (is.dev()) {
@@ -33,16 +56,19 @@ if (config.get("options.disableHardwareAcceleration")) {
 	app.disableHardwareAcceleration();
 }
 
+if (is.linux() && config.plugins.isEnabled("shortcuts")) {
+	//stops chromium from launching it's own mpris service
+	app.commandLine.appendSwitch('disable-features', 'MediaSessionService');
+}
+
 if (config.get("options.proxy")) {
 	app.commandLine.appendSwitch("proxy-server", config.get("options.proxy"));
 }
 
 // Adds debug features like hotkeys for triggering dev tools and reload
-require("electron-debug")();
-
-// Prevent window being garbage collected
-let mainWindow;
-autoUpdater.autoDownload = false;
+require("electron-debug")({
+	showDevTools: false //disable automatic devTools on new window
+});
 
 let icon = "assets/youtube-music.png";
 if (process.platform == "win32") {
@@ -59,7 +85,7 @@ function onClosed() {
 
 function loadPlugins(win) {
 	injectCSS(win.webContents, path.join(__dirname, "youtube-music.css"));
-	win.webContents.on("did-finish-load", () => {
+	win.webContents.once("did-finish-load", () => {
 		if (is.dev()) {
 			console.log("did finish load");
 			win.webContents.openDevTools();
@@ -95,7 +121,6 @@ function createMainWindow() {
 			preload: path.join(__dirname, "preload.js"),
 			nodeIntegrationInSubFrames: true,
 			nativeWindowOpen: true, // window.open return Window object(like in regular browsers), not BrowserWindowProxy
-			enableRemoteModule: true,
 			affinity: "main-window", // main window, and addition windows should work in one process
 			...(isTesting()
 				? {
@@ -113,14 +138,37 @@ function createMainWindow() {
 			: "default",
 		autoHideMenuBar: config.get("options.hideMenu"),
 	});
+	remote.enable(win.webContents);
+
 	if (windowPosition) {
 		const { x, y } = windowPosition;
-		win.setPosition(x, y);
+		const winSize = win.getSize();
+		const displaySize =
+			electron.screen.getDisplayNearestPoint(windowPosition).bounds;
+		if (
+			x + winSize[0] < displaySize.x - 8 ||
+			x - winSize[0] > displaySize.x + displaySize.width ||
+			y < displaySize.y - 8 ||
+			y > displaySize.y + displaySize.height
+		) {
+			//Window is offscreen
+			if (is.dev()) {
+				console.log(
+					`Window tried to render offscreen, windowSize=${winSize}, displaySize=${displaySize}, position=${windowPosition}`
+				);
+			}
+		} else {
+			win.setPosition(x, y);
+		}
 	}
 	if (windowMaximized) {
 		win.maximize();
 	}
 
+	if(config.get("options.alwaysOnTop")){
+		win.setAlwaysOnTop(true);
+	}
+
 	const urlToLoad = config.get("options.resumeOnStart")
 		? config.get("url")
 		: config.defaultConfig.url;
@@ -128,36 +176,89 @@ function createMainWindow() {
 	win.on("closed", onClosed);
 
 	win.on("move", () => {
+		if (win.isMaximized()) return;
 		let position = win.getPosition();
-		config.set("window-position", { x: position[0], y: position[1] });
+		const isPiPEnabled =
+			config.plugins.isEnabled("picture-in-picture") &&
+			config.plugins.getOptions("picture-in-picture")["isInPiP"];
+		if (!isPiPEnabled) {
+			lateSave("window-position", { x: position[0], y: position[1] });
+		}
 	});
 
+	let winWasMaximized;
+
 	win.on("resize", () => {
 		const windowSize = win.getSize();
 
-		config.set("window-maximized", win.isMaximized());
-		if (!win.isMaximized()) {
-			config.set("window-size", {
+		const isMaximized = win.isMaximized();
+		if (winWasMaximized !== isMaximized) {
+			winWasMaximized = isMaximized;
+			config.set("window-maximized", isMaximized);
+		}
+		const isPiPEnabled =
+			config.plugins.isEnabled("picture-in-picture") &&
+			config.plugins.getOptions("picture-in-picture")["isInPiP"];
+		if (!isMaximized && !isPiPEnabled) {
+			lateSave("window-size", {
 				width: windowSize[0],
 				height: windowSize[1],
 			});
 		}
 	});
-	
+
+	let savedTimeouts = {};
+	function lateSave(key, value) {
+		if (savedTimeouts[key]) clearTimeout(savedTimeouts[key]);
+
+		savedTimeouts[key] = setTimeout(() => {
+			config.set(key, value);
+			savedTimeouts[key] = undefined;
+		}, 1000)
+	}
+
 	win.webContents.on("render-process-gone", (event, webContents, details) => {
 		showUnresponsiveDialog(win, details);
 	});
-	
+
 	win.once("ready-to-show", () => {
 		if (config.get("options.appVisible")) {
 			win.show();
 		}
 	});
 
+	removeContentSecurityPolicy();
+
 	return win;
 }
 
 app.once("browser-window-created", (event, win) => {
+	if (config.get("options.overrideUserAgent")) {
+		// User agents are from https://developers.whatismybrowser.com/useragents/explore/
+		const originalUserAgent = win.webContents.userAgent;
+		const userAgents = {
+			mac: "Mozilla/5.0 (Macintosh; Intel Mac OS X 12.1; rv:95.0) Gecko/20100101 Firefox/95.0",
+			windows: "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:95.0) Gecko/20100101 Firefox/95.0",
+			linux: "Mozilla/5.0 (Linux x86_64; rv:95.0) Gecko/20100101 Firefox/95.0",
+		}
+
+		const updatedUserAgent =
+			is.macOS() ? userAgents.mac :
+				is.windows() ? userAgents.windows :
+					userAgents.linux;
+
+		win.webContents.userAgent = updatedUserAgent;
+		app.userAgentFallback = updatedUserAgent;
+
+		win.webContents.session.webRequest.onBeforeSendHeaders((details, cb) => {
+			// this will only happen if login failed, and "retry" was pressed
+			if (win.webContents.getURL().startsWith("https://accounts.google.com") && details.url.startsWith("https://accounts.google.com")) {
+				details.requestHeaders["User-Agent"] = originalUserAgent;
+			}
+			cb({ requestHeaders: details.requestHeaders });
+		});
+	}
+
 	setupSongInfo(win);
 	loadPlugins(win);
 
@@ -192,28 +293,6 @@ app.once("browser-window-created", (event, win) => {
 		event.preventDefault();
 	});
 
-	win.webContents.on("did-navigate-in-page", () => {
-		const url = win.webContents.getURL();
-		if (url.startsWith("https://music.youtube.com")) {
-			config.set("url", url);
-		}
-	});
-
-	win.webContents.on("will-navigate", (_, url) => {
-		if (url.startsWith("https://accounts.google.com")) {
-			// Force user-agent "Firefox Windows" for Google OAuth to work
-			// From https://github.com/firebase/firebase-js-sdk/issues/2478#issuecomment-571356751
-			// Only set on accounts.google.com, otherwise querySelectors in preload scripts fail (?)
-			const userAgent =
-				"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:70.0) Gecko/20100101 Firefox/70.0";
-
-			win.webContents.session.webRequest.onBeforeSendHeaders((details, cb) => {
-				details.requestHeaders["User-Agent"] = userAgent;
-				cb({ requestHeaders: details.requestHeaders });
-			});
-		}
-	});
-
 	win.webContents.on(
 		"new-window",
 		(e, url, frameName, disposition, options) => {
@@ -288,12 +367,6 @@ app.on("ready", () => {
 
 	mainWindow = createMainWindow();
 	setApplicationMenu(mainWindow);
-	if (config.get("options.restartOnConfigChanges")) {
-		config.watch(() => {
-			app.relaunch();
-			app.exit();
-		});
-	}
 	setUpTray(app, mainWindow);
 
 	// Autostart at login
@@ -333,6 +406,14 @@ app.on("ready", () => {
 		});
 	}
 
+	if (config.get("options.hideMenu") && !config.get("options.hideMenuWarned")) {
+		electron.dialog.showMessageBox(mainWindow, {
+			type: 'info', title: 'Hide Menu Enabled',
+			message: "Menu is hidden, use 'Alt' to show it (or 'Escape' if using in-app-menu)"
+		});
+		config.set("options.hideMenuWarned", true);
+	}
+
 	// Optimized for Mac OS X
 	if (is.macOS() && !config.get("options.appVisible")) {
 		app.dock.hide();
@@ -373,7 +454,45 @@ function showUnresponsiveDialog(win, details) {
 				app.quit();
 				break;
 			default:
-				break; 
+				break;
 		}
 	});
 }
+
+function removeContentSecurityPolicy(
+	session = electron.session.defaultSession
+) {
+	// Allows defining multiple "onHeadersReceived" listeners
+	// by enhancing the session.
+	// Some plugins (e.g. adblocker) also define a "onHeadersReceived" listener
+	enhanceWebRequest(session);
+
+	// Custom listener to tweak the content security policy
+	session.webRequest.onHeadersReceived(function (details, callback) {
+		if (
+			!details.responseHeaders["content-security-policy-report-only"] &&
+			!details.responseHeaders["content-security-policy"]
+		)
+			return callback({ cancel: false });
+		delete details.responseHeaders["content-security-policy-report-only"];
+		delete details.responseHeaders["content-security-policy"];
+		callback({ cancel: false, responseHeaders: details.responseHeaders });
+	});
+
+	// When multiple listeners are defined, apply them all
+	session.webRequest.setResolver("onHeadersReceived", (listeners) => {
+		const response = listeners.reduce(
+			async (accumulator, listener) => {
+				if (accumulator.cancel) {
+					return accumulator;
+				}
+
+				const result = await listener.apply();
+				return { ...accumulator, ...result };
+			},
+			{ cancel: false }
+		);
+
+		return response;
+	});
+}

jest.config.js

@@ -2,6 +2,5 @@ module.exports = {
 	globals: {
 		__APP__: undefined, // A different app will be launched in each test environment
 	},
-	testEnvironment: "./tests/environment",
 	testTimeout: 30000, // 30s
 };

menu.js

@@ -1,18 +1,22 @@
 const { existsSync } = require("fs");
 const path = require("path");
 
-const { app, Menu } = require("electron");
+const { app, Menu, dialog } = require("electron");
 const is = require("electron-is");
 
 const { getAllPlugins } = require("./plugins/utils");
 const config = require("./config");
 
-const pluginEnabledMenu = (win, plugin, label = "", hasSubmenu = false) => ({
+const prompt = require("custom-electron-prompt");
+const promptOptions = require("./providers/prompt-options");
+
+// true only if in-app-menu was loaded on launch
+const inAppMenuActive = config.plugins.isEnabled("in-app-menu");
+
+const pluginEnabledMenu = (plugin, label = "", hasSubmenu = false, refreshMenu = undefined) => ({
 	label: label || plugin,
 	type: "checkbox",
 	checked: config.plugins.isEnabled(plugin),
-	//Submenu check used in in-app-menu
-	hasSubmenu: hasSubmenu || undefined,
 	click: (item) => {
 		if (item.checked) {
 			config.plugins.enable(plugin);
@@ -20,252 +24,294 @@ const pluginEnabledMenu = (win, plugin, label = "", hasSubmenu = false) => ({
 			config.plugins.disable(plugin);
 		}
 		if (hasSubmenu) {
-			this.setApplicationMenu(win);
+			refreshMenu();
 		}
 	},
 });
 
-const mainMenuTemplate = (win) => [
-	{
-		label: "Plugins",
-		submenu: [
-			...getAllPlugins().map((plugin) => {
-				const pluginPath = path.join(__dirname, "plugins", plugin, "menu.js")
-				if (existsSync(pluginPath)) {
-					if (!config.plugins.isEnabled(plugin)) {
-						return pluginEnabledMenu(win, plugin, "", true);
+const mainMenuTemplate = (win) => {
+	const refreshMenu = () => {
+		this.setApplicationMenu(win);
+		if (inAppMenuActive) {
+			win.webContents.send("refreshMenu");
+		}
+	}
+	return [
+		{
+			label: "Plugins",
+			submenu: [
+				...getAllPlugins().map((plugin) => {
+					const pluginPath = path.join(__dirname, "plugins", plugin, "menu.js")
+					if (existsSync(pluginPath)) {
+						if (!config.plugins.isEnabled(plugin)) {
+							return pluginEnabledMenu(plugin, "", true, refreshMenu);
+						}
+						const getPluginMenu = require(pluginPath);
+						return {
+							label: plugin,
+							submenu: [
+								pluginEnabledMenu(plugin, "Enabled", true, refreshMenu),
+								{ type: "separator" },
+								...getPluginMenu(win, config.plugins.getOptions(plugin), refreshMenu),
+							],
+						};
 					}
-					const getPluginMenu = require(pluginPath);
-					return {
-						label: plugin,
-						submenu: [
-							pluginEnabledMenu(win, plugin, "Enabled", true),
-							...getPluginMenu(win, config.plugins.getOptions(plugin), () =>
-								module.exports.setApplicationMenu(win)
-							),
-						],
-					};
-				}
 
-				return pluginEnabledMenu(win, plugin);
-			}),
-		],
-	},
-	{
-		label: "Options",
-		submenu: [
-			{
-				label: "Auto-update",
-				type: "checkbox",
-				checked: config.get("options.autoUpdates"),
-				click: (item) => {
-					config.set("options.autoUpdates", item.checked);
+					return pluginEnabledMenu(plugin);
+				}),
+			],
+		},
+		{
+			label: "Options",
+			submenu: [
+				{
+					label: "Auto-update",
+					type: "checkbox",
+					checked: config.get("options.autoUpdates"),
+					click: (item) => {
+						config.setMenuOption("options.autoUpdates", item.checked);
+					},
 				},
-			},
-			{
-				label: "Resume last song when app starts",
-				type: "checkbox",
-				checked: config.get("options.resumeOnStart"),
-				click: (item) => {
-					config.set("options.resumeOnStart", item.checked);
+				{
+					label: "Resume last song when app starts",
+					type: "checkbox",
+					checked: config.get("options.resumeOnStart"),
+					click: (item) => {
+						config.setMenuOption("options.resumeOnStart", item.checked);
+					},
 				},
-			},
-			...(is.windows() || is.linux()
-				? [
-					{
-						label: "Hide menu",
-						type: "checkbox",
-						checked: config.get("options.hideMenu"),
-						click: (item) => {
-							config.set("options.hideMenu", item.checked);
+				{
+					label: "Visual Tweaks",
+					submenu: [
+						{
+							label: "Remove upgrade button",
+							type: "checkbox",
+							checked: config.get("options.removeUpgradeButton"),
+							click: (item) => {
+								config.setMenuOption("options.removeUpgradeButton", item.checked);
+							},
 						},
-					},
-				]
-				: []),
-			...(is.windows() || is.macOS()
-				? // Only works on Win/Mac
-				// https://www.electronjs.org/docs/api/app#appsetloginitemsettingssettings-macos-windows
-				[
-					{
-						label: "Start at login",
-						type: "checkbox",
-						checked: config.get("options.startAtLogin"),
-						click: (item) => {
-							config.set("options.startAtLogin", item.checked);
+						{
+							label: "Force show like buttons",
+							type: "checkbox",
+							checked: config.get("options.ForceShowLikeButtons"),
+							click: (item) => {
+								config.set("options.ForceShowLikeButtons", item.checked);
+							},
 						},
+					],
+				},
+				{
+					label: "Single instance lock",
+					type: "checkbox",
+					checked: config.get("options.singleInstanceLock"),
+					click: (item) => {
+						config.setMenuOption("options.singleInstanceLock", item.checked);
+						if (item.checked && !app.hasSingleInstanceLock()) {
+							app.requestSingleInstanceLock();
+						} else if (!item.checked && app.hasSingleInstanceLock()) {
+							app.releaseSingleInstanceLock();
+						}
 					},
-				]
-				: []),
-			{
-				label: "Tray",
-				submenu: [
-					{
-						label: "Disabled",
-						type: "radio",
-						checked: !config.get("options.tray"),
-						click: () => {
-							config.set("options.tray", false);
-							config.set("options.appVisible", true);
+				},
+				{
+					label: "Always on top",
+					type: "checkbox",
+					checked: config.get("options.alwaysOnTop"),
+					click: (item) => {
+						config.setMenuOption("options.alwaysOnTop", item.checked);
+						win.setAlwaysOnTop(item.checked);
+					},
+				},
+				...(is.windows() || is.linux()
+					? [
+						{
+							label: "Hide menu",
+							type: "checkbox",
+							checked: config.get("options.hideMenu"),
+							click: (item) => {
+								config.setMenuOption("options.hideMenu", item.checked);
+								if (item.checked && !config.get("options.hideMenuWarned")) {
+									dialog.showMessageBox(win, {
+										type: 'info', title: 'Hide Menu Enabled',
+										message: "Menu will be hidden on next launch, use 'Alt' to show it (or 'Escape' if using in-app-menu)"
+									});
+								}
+							},
 						},
-					},
-					{
-						label: "Enabled + app visible",
-						type: "radio",
-						checked:
-							config.get("options.tray") && config.get("options.appVisible"),
-						click: () => {
-							config.set("options.tray", true);
-							config.set("options.appVisible", true);
+					]
+					: []),
+				...(is.windows() || is.macOS()
+					? // Only works on Win/Mac
+					// https://www.electronjs.org/docs/api/app#appsetloginitemsettingssettings-macos-windows
+					[
+						{
+							label: "Start at login",
+							type: "checkbox",
+							checked: config.get("options.startAtLogin"),
+							click: (item) => {
+								config.setMenuOption("options.startAtLogin", item.checked);
+							},
 						},
-					},
-					{
-						label: "Enabled + app hidden",
-						type: "radio",
-						checked:
-							config.get("options.tray") && !config.get("options.appVisible"),
-						click: () => {
-							config.set("options.tray", true);
-							config.set("options.appVisible", false);
+					]
+					: []),
+				{
+					label: "Tray",
+					submenu: [
+						{
+							label: "Disabled",
+							type: "radio",
+							checked: !config.get("options.tray"),
+							click: () => {
+								config.setMenuOption("options.tray", false);
+								config.setMenuOption("options.appVisible", true);
+							},
 						},
-					},
-					{ type: "separator" },
-					{
-						label: "Play/Pause on click",
-						type: "checkbox",
-						checked: config.get("options.trayClickPlayPause"),
-						click: (item) => {
-							config.set("options.trayClickPlayPause", item.checked);
+						{
+							label: "Enabled + app visible",
+							type: "radio",
+							checked:
+								config.get("options.tray") && config.get("options.appVisible"),
+							click: () => {
+								config.setMenuOption("options.tray", true);
+								config.setMenuOption("options.appVisible", true);
+							},
 						},
-					},
-				],
-			},
-			{ type: "separator" },
-			{
-				label: "Advanced options",
-				submenu: [
-					{
-						label: "Disable hardware acceleration",
-						type: "checkbox",
-						checked: config.get("options.disableHardwareAcceleration"),
-						click: (item) => {
-							config.set("options.disableHardwareAcceleration", item.checked);
+						{
+							label: "Enabled + app hidden",
+							type: "radio",
+							checked:
+								config.get("options.tray") && !config.get("options.appVisible"),
+							click: () => {
+								config.setMenuOption("options.tray", true);
+								config.setMenuOption("options.appVisible", false);
+							},
 						},
-					},
-					{
-						label: "Restart on config changes",
-						type: "checkbox",
-						checked: config.get("options.restartOnConfigChanges"),
-						click: (item) => {
-							config.set("options.restartOnConfigChanges", item.checked);
+						{ type: "separator" },
+						{
+							label: "Play/Pause on click",
+							type: "checkbox",
+							checked: config.get("options.trayClickPlayPause"),
+							click: (item) => {
+								config.setMenuOption("options.trayClickPlayPause", item.checked);
+							},
 						},
-					},
-					{
-						label: "Reset App cache when app starts",
-						type: "checkbox",
-						checked: config.get("options.autoResetAppCache"),
-						click: (item) => {
-							config.set("options.autoResetAppCache", item.checked);
+					],
+				},
+				{ type: "separator" },
+				{
+					label: "Advanced options",
+					submenu: [
+						{
+							label: "Proxy",
+							type: "checkbox",
+							checked: !!config.get("options.proxy"),
+							click: (item) => {
+								setProxy(item, win);
+							},
 						},
-					},
-					{ type: "separator" },
-					{
-						label: "Toggle DevTools",
-						// Cannot use "toggleDevTools" role in MacOS
-						click: () => {
-							const { webContents } = win;
-							if (webContents.isDevToolsOpened()) {
-								webContents.closeDevTools();
-							} else {
-								const devToolsOptions = {};
-								webContents.openDevTools(devToolsOptions);
+						{
+							label: "Override useragent",
+							type: "checkbox",
+							checked: config.get("options.overrideUserAgent"),
+							click: (item) => {
+								config.setMenuOption("options.overrideUserAgent", item.checked);
 							}
 						},
-					},
-					{
-						label: "Edit config.json",
-						click: () => {
-							config.edit();
+						{
+							label: "Disable hardware acceleration",
+							type: "checkbox",
+							checked: config.get("options.disableHardwareAcceleration"),
+							click: (item) => {
+								config.setMenuOption("options.disableHardwareAcceleration", item.checked);
+							},
 						},
+						{
+							label: "Restart on config changes",
+							type: "checkbox",
+							checked: config.get("options.restartOnConfigChanges"),
+							click: (item) => {
+								config.setMenuOption("options.restartOnConfigChanges", item.checked);
+							},
+						},
+						{
+							label: "Reset App cache when app starts",
+							type: "checkbox",
+							checked: config.get("options.autoResetAppCache"),
+							click: (item) => {
+								config.setMenuOption("options.autoResetAppCache", item.checked);
+							},
+						},
+						{ type: "separator" },
+						is.macOS() ?
+							{
+								label: "Toggle DevTools",
+								// Cannot use "toggleDevTools" role in MacOS
+								click: () => {
+									const { webContents } = win;
+									if (webContents.isDevToolsOpened()) {
+										webContents.closeDevTools();
+									} else {
+										const devToolsOptions = {};
+										webContents.openDevTools(devToolsOptions);
+									}
+								},
+							} :
+							{ role: "toggleDevTools" },
+						{
+							label: "Edit config.json",
+							click: () => {
+								config.edit();
+							},
+						},
+					]
+				},
+			],
+		},
+		{
+			label: "View",
+			submenu: [
+				{ role: "reload" },
+				{ role: "forceReload" },
+				{ type: "separator" },
+				{ role: "zoomIn" },
+				{ role: "zoomOut" },
+				{ role: "resetZoom" },
+				{ type: "separator" },
+				{ role: "togglefullscreen" },
+			],
+		},
+		{
+			label: "Navigation",
+			submenu: [
+				{
+					label: "Go back",
+					click: () => {
+						if (win.webContents.canGoBack()) {
+							win.webContents.goBack();
+						}
 					},
-				]
-			},
-		],
-	},
-	{
-		label: "View",
-		submenu: [
-			{
-				label: "Reload",
-				click: () => {
-					win.webContents.reload();
 				},
-			},
-			{
-				label: "Force Reload",
-				click: () => {
-					win.webContents.reloadIgnoringCache();
+				{
+					label: "Go forward",
+					click: () => {
+						if (win.webContents.canGoForward()) {
+							win.webContents.goForward();
+						}
+					},
 				},
-			},
-			{ type: "separator" },
-			{
-				label: "Zoom In",
-				click: () => {
-					win.webContents.setZoomLevel(
-						win.webContents.getZoomLevel() + 1
-					);
+				{
+					label: "Restart App",
+					click: () => {
+						app.relaunch();
+						app.quit();
+					},
 				},
-			},
-			{
-				label: "Zoom Out",
-				click: () => {
-					win.webContents.setZoomLevel(
-						win.webContents.getZoomLevel() - 1
-					);
-				},
-			},
-			{
-				label: "Reset Zoom",
-				click: () => {
-					win.webContents.setZoomLevel(0);
-				},
-			},
-		],
-	},
-	{
-		label: "Navigation",
-		submenu: [
-			{
-				label: "Go back",
-				click: () => {
-					if (win.webContents.canGoBack()) {
-						win.webContents.goBack();
-					}
-				},
-			},
-			{
-				label: "Go forward",
-				click: () => {
-					if (win.webContents.canGoForward()) {
-						win.webContents.goForward();
-					}
-				},
-			},
-			{
-				label: "Restart App",
-				click: () => {
-					app.relaunch();
-					app.quit();
-				},
-			},
-			{
-				label: "Quit App",
-				click: () => {
-					app.quit();
-				},
-			},
-		],
-	},
-];
+				{ role: "quit" },
+			],
+		},
+	];
+}
 
 module.exports.mainMenuTemplate = mainMenuTemplate;
 module.exports.setApplicationMenu = (win) => {
@@ -300,3 +346,25 @@ module.exports.setApplicationMenu = (win) => {
 	const menu = Menu.buildFromTemplate(menuTemplate);
 	Menu.setApplicationMenu(menu);
 };
+
+async function setProxy(item, win) {
+	const output = await prompt({
+		title: 'Set Proxy',
+		label: 'Enter Proxy Address: (leave empty to disable)',
+		value: config.get("options.proxy"),
+		type: 'input',
+		inputAttrs: {
+			type: 'url',
+			placeholder: "Example: 'socks5://127.0.0.1:9999"
+		},
+		width: 450,
+		...promptOptions()
+	}, win);
+
+	if (typeof output === "string") {
+		config.setMenuOption("options.proxy", output);
+		item.checked = output !== "";
+	} else { //user pressed cancel
+		item.checked = !item.checked; //reset checkbox
+	}
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "youtube-music",
 	"productName": "YouTube Music",
-	"version": "1.12.1",
+	"version": "1.17.0",
 	"description": "YouTube Music Desktop App - including custom plugins",
 	"license": "MIT",
 	"repository": "th-ch/youtube-music",
@@ -15,10 +15,25 @@
 		"productName": "YouTube Music",
 		"mac": {
 			"identity": null,
+			"files": [
+				"!plugins/taskbar-mediacontrol${/*}"
+			],
+			"target": [
+				{
+					"target": "dmg",
+					"arch": [
+						"x64",
+						"arm64"
+					]
+				}
+			],
 			"icon": "assets/generated/icons/mac/icon.icns"
 		},
 		"win": {
 			"icon": "assets/generated/icons/win/icon.ico",
+			"files": [
+				"!plugins/touchbar${/*}"
+			],
 			"target": [
 				"nsis",
 				"portable"
@@ -29,6 +44,9 @@
 		},
 		"linux": {
 			"icon": "assets/generated/icons/png",
+			"files": [
+				"!plugins/{touchbar,taskbar-mediacontrol}${/*}"
+			],
 			"category": "AudioVideo",
 			"target": [
 				"AppImage",
@@ -37,6 +55,15 @@
 				"deb",
 				"rpm"
 			]
+		},
+		"snap": {
+			"slots": [
+				{
+					"mpris": {
+						"interface": "mpris"
+					}
+				}
+			]
 		}
 	},
 	"scripts": {
@@ -49,56 +76,72 @@
 		"clean": "rimraf dist",
 		"build": "yarn run clean && electron-builder --win --mac --linux",
 		"build:linux": "yarn run clean && electron-builder --linux",
-		"build:mac": "yarn run clean && electron-builder --mac",
+		"build:mac": "yarn run clean && electron-builder --mac dmg:x64",
+		"build:mac:arm64": "yarn run clean && electron-builder --mac dmg:arm64",
 		"build:win": "yarn run clean && electron-builder --win",
-		"plugins": "yarn run plugin:adblocker && yarn run plugin:autoconfirm",
+		"lint": "xo",
+		"changelog": "auto-changelog",
+		"plugins": "yarn run plugin:adblocker",
 		"plugin:adblocker": "rimraf plugins/adblocker/ad-blocker-engine.bin && node plugins/adblocker/blocker.js",
-		"plugin:autoconfirm": "yarn run generate:package YoutubeNonStop",
 		"release:linux": "yarn run clean && electron-builder --linux -p always -c.snap.publish=github",
 		"release:mac": "yarn run clean && electron-builder --mac -p always",
 		"release:win": "yarn run clean && electron-builder --win -p always"
 	},
 	"engines": {
-		"node": ">=12.16.1",
+		"node": ">=14.0.0",
 		"npm": "Please use yarn and not npm"
 	},
 	"dependencies": {
-		"@cliqz/adblocker-electron": "^1.20.5",
-		"@ffmpeg/core": "^0.9.0",
-		"@ffmpeg/ffmpeg": "^0.9.7",
-		"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.9.0",
-		"async-mutex": "^0.3.1",
+		"@cliqz/adblocker-electron": "^1.23.7",
+		"@electron/remote": "^2.0.8",
+		"@ffmpeg/core": "^0.10.0",
+		"@ffmpeg/ffmpeg": "^0.10.1",
+		"Simple-YouTube-Age-Restriction-Bypass": "https://gitpkg.now.sh/zerodytrash/Simple-YouTube-Age-Restriction-Bypass/dist?v2.4.6",
+		"async-mutex": "^0.3.2",
 		"browser-id3-writer": "^4.4.0",
-		"chokidar": "^3.5.1",
-		"custom-electron-titlebar": "^3.2.6",
-		"discord-rpc": "^3.2.0",
+		"chokidar": "^3.5.3",
+		"custom-electron-prompt": "^1.4.2",
+		"custom-electron-titlebar": "^4.1.0",
+		"discord-rpc": "^4.0.1",
+		"electron-better-web-request": "^1.0.1",
 		"electron-debug": "^3.2.0",
 		"electron-is": "^3.0.0",
 		"electron-localshortcut": "^3.2.1",
-		"electron-store": "^7.0.3",
+		"electron-store": "^8.0.1",
 		"electron-unhandled": "^3.0.2",
-		"electron-updater": "^4.3.8",
+		"electron-updater": "^4.6.3",
 		"filenamify": "^4.3.0",
+		"hark": "^1.2.3",
+		"html-to-text": "^8.2.0",
 		"md5": "^2.3.0",
-		"node-fetch": "^2.6.1",
-		"node-notifier": "^9.0.1",
-		"ytdl-core": "^4.7.0",
-		"ytpl": "^2.2.0"
+		"mpris-service": "^2.1.2",
+		"node-fetch": "^2.6.7",
+		"node-notifier": "^10.0.1",
+		"ytdl-core": "^4.11.0",
+		"ytpl": "^2.3.0"
 	},
 	"devDependencies": {
-		"electron": "^12.0.8",
-		"electron-builder": "^22.10.5",
+		"auto-changelog": "^2.4.0",
+		"electron": "^17.0.0",
+		"electron-builder": "^23.0.3",
 		"electron-devtools-installer": "^3.1.1",
 		"electron-icon-maker": "0.0.5",
-		"get-port": "^5.1.1",
-		"jest": "^26.6.3",
+		"jest": "^27.3.1",
+		"playwright": "^1.17.1",
 		"rimraf": "^3.0.2",
-		"spectron": "^14.0.0",
-		"xo": "^0.38.2"
+		"xo": "^0.45.0"
 	},
 	"resolutions": {
+		"glob-parent": "5.1.2",
+		"minimist": "1.2.6",
 		"yargs-parser": "18.1.3"
 	},
+	"auto-changelog": {
+		"hideCredit": true,
+		"package": true,
+		"unreleased": true,
+		"output": "changelog.md"
+	},
 	"xo": {
 		"envs": [
 			"node",

plugins/adblocker/blocker.js

@@ -8,7 +8,9 @@ const SOURCES = [
 	"https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt",
 	// uBlock Origin
 	"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt",
-	"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2020.txt",
+	"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt",
+	// Fanboy Annoyances
+	"https://secure.fanboy.co.nz/fanboy-annoyance_ubo.txt",
 ];
 
 const loadAdBlockerEngine = (
@@ -31,7 +33,17 @@ const loadAdBlockerEngine = (
 		...additionalBlockLists,
 	];
 
-	ElectronBlocker.fromLists(fetch, lists, {}, cachingOptions)
+	ElectronBlocker.fromLists(
+		fetch,
+		lists,
+		{
+			// when generating the engine for caching, do not load network filters
+			// So that enhancing the session works as expected
+			// Allowing to define multiple webRequest listeners
+			loadNetworkFilters: session !== undefined,
+		},
+		cachingOptions
+	)
 		.then((blocker) => {
 			if (session) {
 				blocker.enableBlockingInSession(session);

plugins/audio-compressor/front.js

@@ -0,0 +1,17 @@
+const applyCompressor = () => {
+	const audioContext = new AudioContext();
+
+	const compressor = audioContext.createDynamicsCompressor();
+	compressor.threshold.value = -50;
+	compressor.ratio.value = 12;
+	compressor.knee.value = 40;
+	compressor.attack.value = 0;
+	compressor.release.value = 0.25;
+
+	const source = audioContext.createMediaElementSource(document.querySelector("video"));
+
+	source.connect(compressor);
+	compressor.connect(audioContext.destination);
+};
+
+module.exports = () => document.addEventListener('apiLoaded', applyCompressor, { once: true, passive: true });

plugins/auto-confirm-when-paused/front.js

@@ -1,12 +0,0 @@
-// Define global chrome object to be compliant with the extension code
-global.chrome = {
-	runtime: {
-		getManifest: () => ({
-			version: 1
-		})
-	}
-};
-
-module.exports = () => {
-	require("YoutubeNonStop/autoconfirm.js");
-};

plugins/blur-nav-bar/back.js

@@ -1,5 +1,5 @@
-const { injectCSS } = require("../utils");
 const path = require("path");
+const { injectCSS } = require("../utils");
 
 module.exports = win => {
 	injectCSS(win.webContents, path.join(__dirname, "style.css"));

plugins/blur-nav-bar/style.css

@@ -0,0 +1,10 @@
+#nav-bar-background,
+#header.ytmusic-item-section-renderer,
+ytmusic-tabs {
+	background: rgba(0, 0, 0, 0.3) !important;
+	backdrop-filter: blur(8px) !important;
+}
+
+#nav-bar-divider {
+	display: none !important;
+}

plugins/bypass-age-restrictions/front.js

@@ -0,0 +1,4 @@
+module.exports = () => {
+	// See https://github.com/zerodytrash/Simple-YouTube-Age-Restriction-Bypass#userscript
+	require("simple-youtube-age-restriction-bypass/Simple-YouTube-Age-Restriction-Bypass.user.js");
+};

plugins/disable-autoplay/front.js

@@ -1,25 +1,14 @@
-let videoElement = null;
-
-const observer = new MutationObserver((mutations, observer) => {
-	if (!videoElement) {
-		videoElement = document.querySelector("video");
-	}
-
-	if (videoElement) {
-		videoElement.ontimeupdate = () => {
-			if (videoElement.currentTime === 0 && videoElement.duration !== NaN) {
-				// auto-confirm-when-paused plugin can interfere here if not disabled!
-				videoElement.pause();
-			}
-		};
-	}
-});
-
-function observeVideoElement() {
-	observer.observe(document, {
-		childList: true,
-		subtree: true,
-	});
-}
-
-module.exports = observeVideoElement;
+module.exports = () => {
+	document.addEventListener('apiLoaded', apiEvent => {
+		apiEvent.detail.addEventListener('videodatachange', name => {
+			if (name === 'dataloaded') {
+				apiEvent.detail.pauseVideo();
+				document.querySelector('video').ontimeupdate = e => {
+					e.target.pause();
+				}
+			} else {
+				document.querySelector('video').ontimeupdate = null;
+		   }
+		})
+	}, { once: true, passive: true })
+};

plugins/discord/back.js

@@ -1,58 +1,145 @@
 const Discord = require("discord-rpc");
+const { dev } = require("electron-is");
+const { dialog, app } = require("electron");
 
 const registerCallback = require("../../providers/song-info");
 
-const rpc = new Discord.Client({
-	transport: "ipc",
-});
+// Application ID registered by @xn-oah
+const clientId = "942539762227630162";
 
-// Application ID registered by @semvis123
-const clientId = "790655993809338398";
+/**
+ * @typedef {Object} Info
+ * @property {import('discord-rpc').Client} rpc
+ * @property {boolean} ready
+ * @property {import('../../providers/song-info').SongInfo} lastSongInfo
+ */
+/**
+ * @type {Info}
+ */
+const info = {
+	rpc: null,
+	ready: false,
+	lastSongInfo: null,
+};
+/**
+ * @type {(() => void)[]}
+ */
+const refreshCallbacks = [];
+const resetInfo = () => {
+	info.rpc = null;
+	info.ready = false;
+	clearTimeout(clearActivity);
+	if (dev()) console.log("discord disconnected");
+	refreshCallbacks.forEach(cb => cb());
+};
 
-let clearActivity;
+let window;
+const connect = (showErr = false) => {
+	if (info.rpc) {
+		if (dev())
+			console.log('Attempted to connect with active RPC object');
+		return;
+	}
 
-module.exports = (win, {activityTimoutEnabled, activityTimoutTime}) => {
-	// If the page is ready, register the callback
-	win.once("ready-to-show", () => {
-		rpc.once("ready", () => {
-			// Register the callback
-			registerCallback((songInfo) => {
-				if (songInfo.title.length === 0 && songInfo.artist.length === 0) {
-					return;
-				}
-				// Song information changed, so lets update the rich presence
-				const activityInfo = {
-					details: songInfo.title,
-					state: songInfo.artist,
-					largeImageKey: "logo",
-					largeImageText: [
-						songInfo.uploadDate,
-						songInfo.views.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + " views"
-					].join(' || '),
-				};
+	info.rpc = new Discord.Client({
+		transport: "ipc",
+	});
+	info.ready = false;
 
-				if (songInfo.isPaused) {
-					// Add an idle icon to show that the song is paused
-					activityInfo.smallImageKey = "idle";
-					activityInfo.smallImageText = "idle/paused";
-					// Set start the timer so the activity gets cleared after a while if enabled
-					if (activityTimoutEnabled)
-						clearActivity = setTimeout(()=>rpc.clearActivity(), activityTimoutTime||10000);
-				} else {
-					// stop the clear activity timout
-					clearTimeout(clearActivity);
-					// Add the start and end time of the song
-					const songStartTime = Date.now() - songInfo.elapsedSeconds * 1000;
-					activityInfo.startTimestamp = songStartTime;
-					activityInfo.endTimestamp =
-						songStartTime + songInfo.songDuration * 1000;
-				}
+	info.rpc.once("connected", () => {
+		if (dev()) console.log("discord connected");
+		refreshCallbacks.forEach(cb => cb());
+	});
+	info.rpc.once("ready", () => {
+		info.ready = true;
+		if (info.lastSongInfo) updateActivity(info.lastSongInfo)
+	});
+	info.rpc.once("disconnected", resetInfo);
 
-				rpc.setActivity(activityInfo);
-			});
-		});
-
-		// Startup the rpc client
-		rpc.login({ clientId }).catch(console.error);
+	// Startup the rpc client
+	info.rpc.login({ clientId }).catch(err => {
+		resetInfo();
+		if (dev()) console.error(err);
+		if (showErr) dialog.showMessageBox(window, { title: 'Connection failed', message: err.message || String(err), type: 'error' });
 	});
 };
+
+let clearActivity;
+/**
+ * @type {import('../../providers/song-info').songInfoCallback}
+ */
+let updateActivity;
+
+module.exports = (win, { activityTimoutEnabled, activityTimoutTime, listenAlong }) => {
+	window = win;
+	// We get multiple events
+	// Next song: PAUSE(n), PAUSE(n+1), PLAY(n+1)
+	// Skip time: PAUSE(N), PLAY(N)
+	updateActivity = songInfo => {
+		if (songInfo.title.length === 0 && songInfo.artist.length === 0) {
+			return;
+		}
+		info.lastSongInfo = songInfo;
+
+		// stop the clear activity timout
+		clearTimeout(clearActivity);
+
+		// stop early if discord connection is not ready
+		// do this after clearTimeout to avoid unexpected clears
+		if (!info.rpc || !info.ready) {
+			return;
+		}
+
+		// clear directly if timeout is 0
+		if (songInfo.isPaused && activityTimoutEnabled && activityTimoutTime === 0) {
+			info.rpc.clearActivity().catch(console.error);
+			return;
+		}
+
+		// Song information changed, so lets update the rich presence
+		// @see https://discord.com/developers/docs/topics/gateway#activity-object
+		// not all options are transfered through https://github.com/discordjs/RPC/blob/6f83d8d812c87cb7ae22064acd132600407d7d05/src/client.js#L518-530
+		const activityInfo = {
+			type: 2, // Listening, addressed in https://github.com/discordjs/RPC/pull/149
+			details: songInfo.title,
+			state: songInfo.artist,
+			largeImageKey: songInfo.imageSrc,
+			largeImageText: songInfo.album,
+				buttons: listenAlong ? [
+				{ label: "Listen Along", url: songInfo.url },
+			] : undefined,
+		};
+
+		if (songInfo.isPaused) {
+			// Add a paused icon to show that the song is paused
+			activityInfo.smallImageKey = "paused";
+			activityInfo.smallImageText = "Paused";
+			// Set start the timer so the activity gets cleared after a while if enabled
+			if (activityTimoutEnabled)
+				clearActivity = setTimeout(() => info.rpc.clearActivity().catch(console.error), activityTimoutTime ?? 10000);
+		} else {
+			// Add the start and end time of the song
+			const songStartTime = Date.now() - songInfo.elapsedSeconds * 1000;
+			activityInfo.startTimestamp = songStartTime;
+			activityInfo.endTimestamp =
+				songStartTime + songInfo.songDuration * 1000;
+		}
+
+		info.rpc.setActivity(activityInfo).catch(console.error);
+	};
+
+	// If the page is ready, register the callback
+	win.once("ready-to-show", () => {
+		registerCallback(updateActivity);
+		connect();
+	});
+	app.on('window-all-closed', module.exports.clear)
+};
+
+module.exports.clear = () => {
+	if (info.rpc) info.rpc.clearActivity();
+	clearTimeout(clearActivity);
+};
+module.exports.connect = connect;
+module.exports.registerRefresh = (cb) => refreshCallbacks.push(cb);
+module.exports.isConnected = () => info.rpc !== null;

plugins/discord/menu.js

@@ -0,0 +1,65 @@
+const prompt = require("custom-electron-prompt");
+
+const { setMenuOptions } = require("../../config/plugins");
+const promptOptions = require("../../providers/prompt-options");
+const { clear, connect, registerRefresh, isConnected } = require("./back");
+
+let hasRegisterred = false;
+
+module.exports = (win, options, refreshMenu) => {
+	if (!hasRegisterred) {
+		registerRefresh(refreshMenu);
+		hasRegisterred = true;
+	}
+
+	return [
+		{
+			label: isConnected() ? "Connected" : "Reconnect",
+			enabled: !isConnected(),
+			click: connect,
+		},
+		{
+			label: "Clear activity",
+			click: clear,
+		},
+		{
+			label: "Clear activity after timeout",
+			type: "checkbox",
+			checked: options.activityTimoutEnabled,
+			click: (item) => {
+				options.activityTimoutEnabled = item.checked;
+				setMenuOptions('discord', options);
+			},
+		},
+		{
+			label: "Listen Along",
+			type: "checkbox",
+			checked: options.listenAlong,
+			click: (item) => {
+				options.listenAlong = item.checked;
+				setMenuOptions('discord', options);
+			},
+		},
+		{
+			label: "Set inactivity timeout",
+			click: () => setInactivityTimeout(win, options),
+		},
+	];
+};
+
+async function setInactivityTimeout(win, options) {
+	let output = await prompt({
+		title: 'Set Inactivity Timeout',
+		label: 'Enter inactivity timeout in seconds:',
+		value: Math.round((options.activityTimoutTime ?? 0) / 1e3),
+		type: "counter",
+		counterOptions: { minimum: 0, multiFire: true },
+		width: 450,
+		...promptOptions()
+	}, win)
+
+	if (output) {
+		options.activityTimoutTime = Math.round(output * 1e3);
+		setMenuOptions("discord", options);
+	}
+}

plugins/downloader/back.js

@@ -8,7 +8,9 @@ const registerCallback = require("../../providers/song-info");
 const { injectCSS, listenAction } = require("../utils");
 const { cropMaxWidth } = require("./utils");
 const { ACTIONS, CHANNEL } = require("./actions.js");
+const { isEnabled } = require("../../config/plugins");
 const { getImage } = require("../../providers/song-info");
+const { fetchFromGenius } = require("../lyrics-genius/back");
 
 const sendError = (win, error) => {
 	win.setProgressBar(-1); // close progress bar
@@ -55,7 +57,9 @@ function handle(win) {
 			{ ...nowPlayingMetadata, ...currentMetadata };
 
 		try {
-			const coverBuffer = songMetadata.image ? songMetadata.image.toPNG() : null;
+			const coverBuffer = songMetadata.image && !songMetadata.image.isEmpty() ?
+				songMetadata.image.toPNG() : null;
+
 			const writer = new ID3Writer(songBuffer);
 
 			// Create the metadata tags
@@ -69,6 +73,15 @@ function handle(win) {
 					description: ""
 				});
 			}
+			if (isEnabled("lyrics-genius")) {
+				const lyrics = await fetchFromGenius(songMetadata);
+				if (lyrics) {
+					writer.setFrame("USLT", {
+						description: lyrics,
+						lyrics: lyrics,
+					});
+				}
+			}
 			writer.addTag();
 			fileBuffer = Buffer.from(writer.arrayBuffer);
 		} catch (error) {

plugins/downloader/front.js

@@ -1,4 +1,4 @@
-const { contextBridge } = require("electron");
+const { ipcRenderer } = require("electron");
 
 const { defaultConfig } = require("../../config");
 const { getSongMenu } = require("../../providers/dom-elements");
@@ -13,15 +13,17 @@ const downloadButton = ElementFromFile(
 );
 let pluginOptions = {};
 
-const observer = new MutationObserver((mutations, observer) => {
+const observer = new MutationObserver(() => {
 	if (!menu) {
 		menu = getSongMenu();
+		if (!menu) return;
 	}
+	if (menu.contains(downloadButton)) return;
+	const menuUrl = document.querySelector('tp-yt-paper-listbox [tabindex="0"] #navigation-endpoint')?.href;
+	if (menuUrl && !menuUrl.includes('watch?')) return;
 
-	if (menu && !menu.contains(downloadButton)) {
-		menu.prepend(downloadButton);
-		progress = document.querySelector("#ytmcustom-download");
-	}
+	menu.prepend(downloadButton);
+	progress = document.querySelector("#ytmcustom-download");
 });
 
 const reinit = () => {
@@ -43,10 +45,16 @@ global.download = () => {
 	let metadata;
 	let videoUrl = getSongMenu()
 		// selector of first button which is always "Start Radio"
-		?.querySelector('ytmusic-menu-navigation-item-renderer.iron-selected[tabindex="0"] #navigation-endpoint')
+		?.querySelector('ytmusic-menu-navigation-item-renderer[tabindex="0"] #navigation-endpoint')
 		?.getAttribute("href");
 	if (videoUrl) {
-		videoUrl = baseUrl + "/" + videoUrl;
+		if (videoUrl.startsWith('watch?')) {
+			videoUrl = baseUrl + "/" + videoUrl;
+		}
+		if (videoUrl.includes('?playlist=')) {
+			ipcRenderer.send('download-playlist-request', videoUrl);
+			return;
+		}
 		metadata = null;
 	} else {
 		metadata = global.songInfo;
@@ -78,10 +86,13 @@ global.download = () => {
 
 function observeMenu(options) {
 	pluginOptions = { ...pluginOptions, ...options };
-	observer.observe(document, {
-		childList: true,
-		subtree: true,
-	});
+
+	document.addEventListener('apiLoaded', () => {
+		observer.observe(document.querySelector('ytmusic-popup-container'), {
+			childList: true,
+			subtree: true,
+		});
+	}, { once: true, passive: true })
 }
 
 module.exports = observeMenu;

plugins/downloader/menu.js

@@ -1,102 +1,44 @@
 const { existsSync, mkdirSync } = require("fs");
 const { join } = require("path");
-const { URL } = require("url");
 
-const { dialog } = require("electron");
+const { dialog, ipcMain } = require("electron");
 const is = require("electron-is");
 const ytpl = require("ytpl");
 const chokidar = require('chokidar');
+const filenamify = require('filenamify');
 
-const { setOptions } = require("../../config/plugins");
-const registerCallback = require("../../providers/song-info");
+const { setMenuOptions } = require("../../config/plugins");
 const { sendError } = require("./back");
-const { defaultMenuDownloadLabel, getFolder } = require("./utils");
+const { defaultMenuDownloadLabel, getFolder, presets, setBadge } = require("./utils");
 
 let downloadLabel = defaultMenuDownloadLabel;
-let metadataURL = undefined;
+let playingUrl = undefined;
 let callbackIsRegistered = false;
 
+// Playlist radio modifier needs to be cut from playlist ID
+const INVALID_PLAYLIST_MODIFIER = 'RDAMPL';
+
+const getPlaylistID = aURL => {
+	const result = aURL?.searchParams.get("list") || aURL?.searchParams.get("playlist");
+	if (result?.startsWith(INVALID_PLAYLIST_MODIFIER)) {
+		return result.slice(6)
+	}
+	return result;
+};
+
 module.exports = (win, options) => {
 	if (!callbackIsRegistered) {
-		registerCallback((info) => {
-			metadataURL = info.url;
+		ipcMain.on("video-src-changed", async (_, data) => {
+			playingUrl = JSON.parse(data)?.microformat?.microformatDataRenderer?.urlCanonical;
 		});
+		ipcMain.on("download-playlist-request", async (_event, url) => downloadPlaylist(url, win, options));
 		callbackIsRegistered = true;
 	}
 
 	return [
 		{
 			label: downloadLabel,
-			click: async () => {
-				const currentURL = metadataURL || win.webContents.getURL();
-				const playlistID = new URL(currentURL).searchParams.get("list");
-				if (!playlistID) {
-					sendError(win, new Error("No playlist ID found"));
-					return;
-				}
-
-				console.log(`trying to get playlist ID: '${playlistID}'`);
-				let playlist;
-				try {
-					playlist = await ytpl(playlistID, {
-						limit: options.playlistMaxItems || Infinity,
-					});
-				} catch (e) {
-					sendError(win, e);
-					return;
-				}
-				const playlistTitle = playlist.title;
-
-				const folder = getFolder(options.downloadFolder);
-				const playlistFolder = join(folder, playlistTitle);
-				if (existsSync(playlistFolder)) {
-					sendError(
-						win,
-						new Error(`The folder ${playlistFolder} already exists`)
-					);
-					return;
-				}
-				mkdirSync(playlistFolder, { recursive: true });
-
-				dialog.showMessageBox({
-					type: "info",
-					buttons: ["OK"],
-					title: "Started Download",
-					message: `Downloading Playlist "${playlistTitle}"`,
-					detail: `(${playlist.items.length} songs)`,
-				});
-
-				if (is.dev()) {
-					console.log(
-						`Downloading playlist "${playlistTitle}" (${playlist.items.length} songs)`
-					);
-				}
-
-				const steps = 1 / playlist.items.length;
-				let progress = 0;
-
-				win.setProgressBar(2); // starts with indefinite bar
-
-				let dirWatcher = chokidar.watch(playlistFolder);
-				dirWatcher.on('add', () => {
-					progress += steps;
-					if (progress >= 0.9999) {
-						win.setProgressBar(-1); // close progress bar
-						dirWatcher.close().then(() => dirWatcher = null);
-					} else {
-						win.setProgressBar(progress);
-					}
-				});
-
-				playlist.items.forEach((song) => {
-					win.webContents.send(
-						"downloader-download-playlist",
-						song.url,
-						playlistTitle,
-						options
-					);
-				});
-			},
+			click: () => downloadPlaylist(undefined, win, options),
 		},
 		{
 			label: "Choose download folder",
@@ -107,9 +49,103 @@ module.exports = (win, options) => {
 				});
 				if (result) {
 					options.downloadFolder = result[0];
-					setOptions("downloader", options);
+					setMenuOptions("downloader", options);
 				} // else = user pressed cancel
 			},
 		},
+		{
+			label: "Presets",
+			submenu: Object.keys(presets).map((preset) => ({
+				label: preset,
+				type: "radio",
+				click: () => {
+					options.preset = preset;
+					setMenuOptions("downloader", options);
+				},
+				checked: options.preset === preset || presets[preset] === undefined,
+			})),
+		},
 	];
 };
+
+async function downloadPlaylist(givenUrl, win, options) {
+	if (givenUrl) {
+		try {
+			givenUrl = new URL(givenUrl);
+		} catch {
+			givenUrl = undefined;
+		};
+	}
+	const playlistId = getPlaylistID(givenUrl)
+		|| getPlaylistID(new URL(win.webContents.getURL()))
+		|| getPlaylistID(new URL(playingUrl));
+
+	if (!playlistId) {
+		sendError(win, new Error("No playlist ID found"));
+		return;
+	}
+
+	console.log(`trying to get playlist ID: '${playlistId}'`);
+	let playlist;
+	try {
+		playlist = await ytpl(playlistId, {
+			limit: options.playlistMaxItems || Infinity,
+		});
+	} catch (e) {
+		sendError(win, e);
+		return;
+	}
+	const safePlaylistTitle = filenamify(playlist.title, {replacement: ' '});
+
+	const folder = getFolder(options.downloadFolder);
+	const playlistFolder = join(folder, safePlaylistTitle);
+	if (existsSync(playlistFolder)) {
+		sendError(
+			win,
+			new Error(`The folder ${playlistFolder} already exists`)
+		);
+		return;
+	}
+	mkdirSync(playlistFolder, { recursive: true });
+
+	dialog.showMessageBox({
+		type: "info",
+		buttons: ["OK"],
+		title: "Started Download",
+		message: `Downloading Playlist "${playlist.title}"`,
+		detail: `(${playlist.items.length} songs)`,
+	});
+
+	if (is.dev()) {
+		console.log(
+			`Downloading playlist "${playlist.title}" - ${playlist.items.length} songs (${playlistId})`
+		);
+	}
+
+	win.setProgressBar(2); // starts with indefinite bar
+
+	let downloadCount = 0;
+	setBadge(playlist.items.length);
+
+	let dirWatcher = chokidar.watch(playlistFolder);
+	dirWatcher.on('add', () => {
+		downloadCount += 1;
+		if (downloadCount >= playlist.items.length) {
+			win.setProgressBar(-1); // close progress bar
+			setBadge(0); // close badge counter
+			dirWatcher.close().then(() => (dirWatcher = null));
+		} else {
+			win.setProgressBar(downloadCount / playlist.items.length);
+			setBadge(playlist.items.length - downloadCount);
+		}
+	});
+
+	playlist.items.forEach((song) => {
+		win.webContents.send(
+			"downloader-download-playlist",
+			song.url,
+			safePlaylistTitle,
+			options
+		);
+	});
+}

plugins/downloader/style.css

@@ -6,8 +6,16 @@
 	cursor: pointer;
 }
 
+.menu-item > .yt-simple-endpoint:hover {
+	background-color: var(--ytmusic-menu-item-hover-background-color);
+}
+
 .menu-icon {
 	flex: var(--ytmusic-menu-item-icon_-_flex);
 	margin: var(--ytmusic-menu-item-icon_-_margin);
 	fill: var(--ytmusic-menu-item-icon_-_fill);
+	stroke: var(--iron-icon-stroke-color, none);
+	width: var(--iron-icon-width, 24px);
+	height: var(--iron-icon-height, 24px);
+	animation: var(--iron-icon_-_animation);
 }

plugins/downloader/templates/download.html

@@ -1,5 +1,5 @@
 <div
-	class="menu-item ytmusic-menu-popup-renderer"
+	class="style-scope menu-item ytmusic-menu-popup-renderer"
 	role="option"
 	tabindex="-1"
 	aria-disabled="false"
@@ -7,31 +7,39 @@
 	onclick="download()"
 >
 	<div
-		class="menu-icon yt-icon-container yt-icon ytmusic-toggle-menu-service-item-renderer"
+		id="navigation-endpoint"
+		class="yt-simple-endpoint style-scope ytmusic-menu-navigation-item-renderer"
+		tabindex="-1"
 	>
-		<svg
-			viewBox="0 0 24 24"
-			preserveAspectRatio="xMidYMid meet"
-			focusable="false"
-			class="style-scope yt-icon"
-			style="pointer-events: none; display: block; width: 100%; height: 100%;"
+		<div
+			class="icon menu-icon style-scope ytmusic-menu-navigation-item-renderer"
 		>
-			<g class="style-scope yt-icon">
-				<path
-					d="M25.462,19.105v6.848H4.515v-6.848H0.489v8.861c0,1.111,0.9,2.012,2.016,2.012h24.967c1.115,0,2.016-0.9,2.016-2.012v-8.861H25.462z"
-					class="style-scope yt-icon" fill="#aaaaaa"
-				/>
-				<path
-					d="M14.62,18.426l-5.764-6.965c0,0-0.877-0.828,0.074-0.828s3.248,0,3.248,0s0-0.557,0-1.416c0-2.449,0-6.906,0-8.723c0,0-0.129-0.494,0.615-0.494c0.75,0,4.035,0,4.572,0c0.536,0,0.524,0.416,0.524,0.416c0,1.762,0,6.373,0,8.742c0,0.768,0,1.266,0,1.266s1.842,0,2.998,0c1.154,0,0.285,0.867,0.285,0.867s-4.904,6.51-5.588,7.193C15.092,18.979,14.62,18.426,14.62,18.426z"
-					class="style-scope yt-icon" fill="#aaaaaa"
-				/>
-			</g>
-		</svg>
-	</div>
-	<div
-		class="text style-scope ytmusic-toggle-menu-service-item-renderer"
-		id="ytmcustom-download"
-	>
-		Download
+			<svg
+				viewBox="0 0 24 24"
+				preserveAspectRatio="xMidYMid meet"
+				focusable="false"
+				class="style-scope yt-icon"
+				style="pointer-events: none; display: block; width: 100%; height: 100%"
+			>
+				<g class="style-scope yt-icon">
+					<path
+						d="M25.462,19.105v6.848H4.515v-6.848H0.489v8.861c0,1.111,0.9,2.012,2.016,2.012h24.967c1.115,0,2.016-0.9,2.016-2.012v-8.861H25.462z"
+						class="style-scope yt-icon"
+						fill="#aaaaaa"
+					/>
+					<path
+						d="M14.62,18.426l-5.764-6.965c0,0-0.877-0.828,0.074-0.828s3.248,0,3.248,0s0-0.557,0-1.416c0-2.449,0-6.906,0-8.723c0,0-0.129-0.494,0.615-0.494c0.75,0,4.035,0,4.572,0c0.536,0,0.524,0.416,0.524,0.416c0,1.762,0,6.373,0,8.742c0,0.768,0,1.266,0,1.266s1.842,0,2.998,0c1.154,0,0.285,0.867,0.285,0.867s-4.904,6.51-5.588,7.193C15.092,18.979,14.62,18.426,14.62,18.426z"
+						class="style-scope yt-icon"
+						fill="#aaaaaa"
+					/>
+				</g>
+			</svg>
+		</div>
+		<div
+			class="text style-scope ytmusic-menu-navigation-item-renderer"
+			id="ytmcustom-download"
+		>
+			Download
+		</div>
 	</div>
 </div>

plugins/downloader/utils.js

@@ -1,7 +1,7 @@
 const electron = require("electron");
+const is = require('electron-is');
 
-module.exports.getFolder = (customFolder) =>
-	customFolder || (electron.app || electron.remote.app).getPath("downloads");
+module.exports.getFolder = customFolder => customFolder || electron.app.getPath("downloads");
 module.exports.defaultMenuDownloadLabel = "Download playlist";
 
 const orderedQualityList = ["maxresdefault", "hqdefault", "mqdefault", "sdddefault"];
@@ -29,3 +29,18 @@ module.exports.cropMaxWidth = (image) => {
 	}
 	return image;
 }
+
+// Presets for FFmpeg
+module.exports.presets = {
+	"None (defaults to mp3)": undefined,
+	opus: {
+		extension: "opus",
+		ffmpegArgs: ["-acodec", "libopus"],
+	},
+};
+
+module.exports.setBadge = n => {
+	if (is.linux() || is.macOS()) {
+		electron.app.setBadgeCount(n);
+	}
+}

plugins/downloader/youtube-dl.js

@@ -3,6 +3,7 @@ const { join } = require("path");
 
 const Mutex = require("async-mutex").Mutex;
 const { ipcRenderer } = require("electron");
+const remote = require('@electron/remote');
 const is = require("electron-is");
 const filenamify = require("filenamify");
 
@@ -14,8 +15,8 @@ const ytdl = require("ytdl-core");
 
 const { triggerAction, triggerActionSync } = require("../utils");
 const { ACTIONS, CHANNEL } = require("./actions.js");
-const { getFolder, urlToJPG } = require("./utils");
-const { cleanupArtistName } = require("../../providers/song-info");
+const { presets, urlToJPG } = require("./utils");
+const { cleanupName } = require("../../providers/song-info");
 
 const { createFFmpeg } = FFmpeg;
 const ffmpeg = createFFmpeg({
@@ -40,9 +41,12 @@ const downloadVideoToMP3 = async (
 		const { videoDetails } = await ytdl.getInfo(videoUrl);
 		const thumbnails = videoDetails?.thumbnails;
 		metadata = {
-			artist: videoDetails?.media?.artist || cleanupArtistName(videoDetails?.author?.name) || "",
+			artist:
+				videoDetails?.media?.artist ||
+				cleanupName(videoDetails?.author?.name) ||
+				"",
 			title: videoDetails?.media?.song || videoDetails?.title || "",
-			imageSrcYTPL: thumbnails ? 
+			imageSrcYTPL: thumbnails ?
 				urlToJPG(thumbnails[thumbnails.length - 1].url, videoDetails?.videoId)
 				: ""
 		}
@@ -109,8 +113,9 @@ const toMP3 = async (
 	existingMetadata = undefined,
 	subfolder = ""
 ) => {
+	const convertOptions = { ...presets[options.preset], ...options };
 	const safeVideoName = randomBytes(32).toString("hex");
-	const extension = options.extension || "mp3";
+	const extension = convertOptions.extension || "mp3";
 	const releaseFFmpegMutex = await ffmpegMutex.acquire();
 
 	try {
@@ -128,11 +133,11 @@ const toMP3 = async (
 			"-i",
 			safeVideoName,
 			...getFFmpegMetadataArgs(metadata),
-			...(options.ffmpegArgs || []),
+			...(convertOptions.ffmpegArgs || []),
 			safeVideoName + "." + extension
 		);
 
-		const folder = getFolder(options.downloadFolder);
+		const folder = options.downloadFolder || remote.app.getPath("downloads");
 		const name = metadata.title
 			? `${metadata.artist ? `${metadata.artist} - ` : ""}${metadata.title}`
 			: videoName;

plugins/exponential-volume/front.js

@@ -0,0 +1,47 @@
+// "Youtube Music fix volume ratio 0.4" by Marco Pfeiffer
+// https://greasyfork.org/en/scripts/397686-youtube-music-fix-volume-ratio/
+
+const exponentialVolume = () => {
+	// manipulation exponent, higher value = lower volume
+	// 3 is the value used by pulseaudio, which Barteks2x figured out this gist here: https://gist.github.com/Barteks2x/a4e189a36a10c159bb1644ffca21c02a
+	// 0.05 (or 5%) is the lowest you can select in the UI which with an exponent of 3 becomes 0.000125 or 0.0125%
+	const EXPONENT = 3;
+
+	const storedOriginalVolumes = new WeakMap();
+	const { get, set } = Object.getOwnPropertyDescriptor(
+		HTMLMediaElement.prototype,
+		"volume"
+	);
+	Object.defineProperty(HTMLMediaElement.prototype, "volume", {
+		get() {
+			const lowVolume = get.call(this);
+			const calculatedOriginalVolume = lowVolume ** (1 / EXPONENT);
+
+			// The calculated value has some accuracy issues which can lead to problems for implementations that expect exact values.
+			// To avoid this, I'll store the unmodified volume to return it when read here.
+			// This mostly solves the issue, but the initial read has no stored value and the volume can also change though external influences.
+			// To avoid ill effects, I check if the stored volume is somewhere in the same range as the calculated volume.
+			const storedOriginalVolume = storedOriginalVolumes.get(this);
+			const storedDeviation = Math.abs(
+				storedOriginalVolume - calculatedOriginalVolume
+			);
+
+			const originalVolume =
+				storedDeviation < 0.01
+					? storedOriginalVolume
+					: calculatedOriginalVolume;
+			return originalVolume;
+		},
+		set(originalVolume) {
+			const lowVolume = originalVolume ** EXPONENT;
+			storedOriginalVolumes.set(this, originalVolume);
+			set.call(this, lowVolume);
+		},
+	});
+};
+
+module.exports = () =>
+	document.addEventListener("apiLoaded", exponentialVolume, {
+		once: true,
+		passive: true,
+	});

plugins/in-app-menu/back.js

@@ -1,83 +1,33 @@
 const path = require("path");
 
-const { Menu } = require("electron");
 const electronLocalshortcut = require("electron-localshortcut");
 
 const config = require("../../config");
-const { setApplicationMenu } = require("../../menu");
 const { injectCSS } = require("../utils");
 
+const { setupTitlebar, attachTitlebarToWindow } = require('custom-electron-titlebar/main');
+setupTitlebar();
+
 //tracks menu visibility
-let visible = true;
-// win hook for fixing menu
-let win;
-
-const originalBuildMenu = Menu.buildFromTemplate;
-// This function natively gets called on all submenu so no more reason to use recursion
-Menu.buildFromTemplate = (template) => {
-	// Fix checkboxes and radio buttons
-	updateTemplate(template);
-
-	// return as normal
-	return originalBuildMenu(template);
-};
-
-module.exports = (winImport) => {
-	win = winImport;
+let visible = !config.get("options.hideMenu");
 
+module.exports = (win) => {
 	// css for custom scrollbar + disable drag area(was causing bugs)
 	injectCSS(win.webContents, path.join(__dirname, "style.css"));
 
 	win.once("ready-to-show", () => {
-
-		setApplicationMenu(win);
+		attachTitlebarToWindow(win);
 
 		//register keyboard shortcut && hide menu if hideMenu is enabled
 		if (config.get("options.hideMenu")) {
 			electronLocalshortcut.register(win, "Esc", () => {
-				switchMenuVisibility();
+				setMenuVisibility(!visible);
 			});
 		}
 	});
 
-	//set menu visibility on load
-	win.webContents.once("did-finish-load", () => {
-		// fix bug with menu not applying on start when no internet connection available
-		setMenuVisibility(!config.get("options.hideMenu"));
-	});
+	function setMenuVisibility(value) {
+		visible = value;
+		win.webContents.send("refreshMenu", visible);
+	}
 };
-
-function switchMenuVisibility() {
-	setMenuVisibility(!visible);
-}
-
-function setMenuVisibility(value) {
-	visible = value;
-	win.webContents.send("updateMenu", visible);
-}
-
-function updateCheckboxesAndRadioButtons(item, isRadio, hasSubmenu) {
-	if (!isRadio) {
-		//fix checkbox
-		item.checked = !item.checked;
-	}
-	//update menu if radio / hasSubmenu
-	if (isRadio || hasSubmenu) {
-		win.webContents.send("updateMenu", true);
-	}
-}
-
-// Update checkboxes/radio buttons
-function updateTemplate(template) {
-	for (let item of template) {
-		// Change onClick of checkbox+radio
-		if ((item.type === "checkbox" || item.type === "radio") && !item.fixed) {
-			const originalOnclick = item.click;
-			item.click = (itemClicked) => {
-				originalOnclick(itemClicked);
-				updateCheckboxesAndRadioButtons(itemClicked, item.type === "radio", item.hasSubmenu);
-			};
-			item.fixed = true;
-		}
-	}
-}

plugins/in-app-menu/front.js

@@ -1,24 +1,47 @@
-const { remote, ipcRenderer } = require("electron");
+const { ipcRenderer } = require("electron");
+const config = require("../../config");
+const { Titlebar, Color } = require("custom-electron-titlebar");
+function $(selector) { return document.querySelector(selector); }
 
-const customTitlebar = require("custom-electron-titlebar");
-
-module.exports = () => {
-	const bar = new customTitlebar.Titlebar({
-		backgroundColor: customTitlebar.Color.fromHex("#050505"),
-		itemBackgroundColor: customTitlebar.Color.fromHex("#121212"),
+module.exports = (options) => {
+	let visible = !config.get("options.hideMenu");
+	const bar = new Titlebar({
+		backgroundColor: Color.fromHex("#050505"),
+		itemBackgroundColor: Color.fromHex("#1d1d1d"),
+		svgColor: Color.WHITE,
+		menu: visible ? undefined : null
 	});
 	bar.updateTitle(" ");
 	document.title = "Youtube Music";
 
-	ipcRenderer.on("updateMenu", function (event, menu) {
-		if (menu) {
-			bar.updateMenu(remote.Menu.getApplicationMenu());
+	const hideIcon = hide => $('.cet-window-icon').style.display = hide ? 'none' : 'flex';
+
+	if (options.hideIcon) hideIcon(true);
+
+	ipcRenderer.on("refreshMenu", (_, showMenu) => {
+		if (showMenu === undefined && !visible) return;
+		if (showMenu === false) {
+			bar.updateMenu(null);
+			visible = false;
 		} else {
-			try {
-				bar.updateMenu(null);
-			} catch (e) {
-				//will always throw type error - null isn't menu, but it works
-			}
+			bar.refreshMenu();
+			visible = true;
 		}
 	});
+
+	ipcRenderer.on("hideIcon", (_, hide) => hideIcon(hide));
+
+	// Increases the right margin of Navbar background when the scrollbar is visible to avoid blocking it (z-index doesn't affect it)
+	document.addEventListener('apiLoaded', () => {
+		setNavbarMargin();
+		const playPageObserver = new MutationObserver(setNavbarMargin);
+		playPageObserver.observe($('ytmusic-app-layout'), { attributeFilter: ['player-page-open_', 'playerPageOpen_'] })
+	}, { once: true, passive: true })
 };
+
+function setNavbarMargin() {
+	$('#nav-bar-background').style.right =
+		$('ytmusic-app-layout').playerPageOpen_ ?
+			'0px' :
+			'12px';
+}

plugins/in-app-menu/menu.js

@@ -0,0 +1,14 @@
+const { setOptions } = require("../../config/plugins");
+
+module.exports = (win, options) => [
+    {
+        label: "Hide Icon",
+        type: "checkbox",
+        checked: options.hideIcon,
+        click: (item) => {
+            win.webContents.send("hideIcon", item.checked);
+            options.hideIcon = item.checked;
+            setOptions("in-app-menu", options);
+        },
+    }
+];

plugins/in-app-menu/style.css

@@ -4,14 +4,13 @@
 	font-size: 14px !important;
 }
 
-/* allow submenu's to show correctly */
-.menubar-menu-container {
-	overflow-y: visible !important;
-}
-
-/* fixes scrollbar positioning relative to nav bar  */
-#nav-bar-background.ytmusic-app-layout {
-	right: 15px !important;
+/* fixes nav-bar-background opacity bug, reposition it, and allows clicking scrollbar through it */
+#nav-bar-background {
+	opacity: 1 !important;
+	pointer-events: none !important;
+	position: sticky !important;
+	top: 0 !important;
+	height: 75px !important;
 }
 
 /* remove window dragging for nav bar (conflict with titlebar drag) */
@@ -21,14 +20,10 @@ ytmusic-pivot-bar-item-renderer {
 	-webkit-app-region: unset !important;
 }
 
-/* navbar background black */
-.center-content.ytmusic-nav-bar {
-	background: #030303;
-}
-
-/* move up item selectrion renderer by 15 px */
-ytmusic-item-section-renderer[has-item-section-tabbed-header-renderer_] #header.ytmusic-item-section-renderer {
-	top: 75 !important;
+/* move up item selection renderers */
+ytmusic-item-section-renderer.stuck #header.ytmusic-item-section-renderer,
+ytmusic-tabs.stuck {
+	top: calc(var(--ytmusic-nav-bar-height) - 15px) !important;
 }
 
 /* fix weird positioning in search screen*/
@@ -37,8 +32,7 @@ ytmusic-header-renderer.ytmusic-search-page {
 }
 
 /* Move navBar downwards */
-ytmusic-app-layout > [slot="nav-bar"],
-#nav-bar-background.ytmusic-app-layout {
+ytmusic-nav-bar[slot="nav-bar"] {
 	top: 17px !important;
 }
 
@@ -63,10 +57,10 @@ yt-page-navigation-progress,
 
 /* The scrollbar 'thumb' ...that marque oval shape in a scrollbar */
 ::-webkit-scrollbar-thumb:vertical {
-	background-clip: padding-box;
 	border: 2px solid rgba(0, 0, 0, 0);
 
 	background: #3a3a3a;
+	background-clip: padding-box;
 	border-radius: 100px;
 	-moz-border-radius: 100px;
 	-webkit-border-radius: 100px;
@@ -77,3 +71,7 @@ yt-page-navigation-progress,
 	-moz-border-radius: 100px;
 	-webkit-border-radius: 100px;
 }
+
+.cet-menubar-menu-container .cet-action-item {
+	background-color: inherit
+}

plugins/last-fm/back.js

@@ -89,6 +89,7 @@ const postSongDataToAPI = async (songInfo, config, data) => {
 		track: songInfo.title,
 		duration: songInfo.songDuration,
 		artist: songInfo.artist,
+		...(songInfo.album ? { album: songInfo.album } : undefined), // will be undefined if current song is a video
 		api_key: config.api_key,
 		sk: config.session_key,
 		format: 'json',
@@ -157,4 +158,4 @@ const lastfm = async (_win, config) => {
 	});
 }
 
-module.exports = lastfm;
+module.exports = lastfm;

plugins/lyrics-genius/back.js

@@ -0,0 +1,71 @@
+const { join } = require("path");
+
+const { ipcMain } = require("electron");
+const is = require("electron-is");
+const { convert } = require("html-to-text");
+const fetch = require("node-fetch");
+
+const { cleanupName } = require("../../providers/song-info");
+const { injectCSS } = require("../utils");
+
+module.exports = async (win) => {
+	injectCSS(win.webContents, join(__dirname, "style.css"));
+
+	ipcMain.on("search-genius-lyrics", async (event, extractedSongInfo) => {
+		const metadata = JSON.parse(extractedSongInfo);
+		event.returnValue = await fetchFromGenius(metadata);
+	});
+};
+
+const fetchFromGenius = async (metadata) => {
+	const queryString = `${cleanupName(metadata.artist)} ${cleanupName(
+		metadata.title
+	)}`;
+	let response = await fetch(
+		`https://genius.com/api/search/multi?per_page=5&q=${encodeURI(queryString)}`
+	);
+	if (!response.ok) {
+		return null;
+	}
+
+	const info = await response.json();
+	let url = "";
+	try {
+		url = info.response.sections.filter((section) => section.type === "song")[0]
+			.hits[0].result.url;
+	} catch {
+		return null;
+	}
+
+	if (is.dev()) {
+		console.log("Fetching lyrics from Genius:", url);
+	}
+
+	response = await fetch(url);
+	if (!response.ok) {
+		return null;
+	}
+
+	const html = await response.text();
+	const lyrics = convert(html, {
+		baseElements: {
+			selectors: ['[class^="Lyrics__Container"]', ".lyrics"],
+		},
+		selectors: [
+			{
+				selector: "a",
+				format: "linkFormatter",
+			},
+		],
+		formatters: {
+			// Remove links by keeping only the content
+			linkFormatter: (elem, walk, builder) => {
+				walk(elem.children, builder);
+			},
+		},
+	});
+
+	return lyrics;
+};
+
+module.exports.fetchFromGenius = fetchFromGenius;

plugins/lyrics-genius/front.js

@@ -0,0 +1,94 @@
+const { ipcRenderer } = require("electron");
+const is = require("electron-is");
+
+module.exports = () => {
+	ipcRenderer.on("update-song-info", (_, extractedSongInfo) => {
+		const tabList = document.querySelectorAll("tp-yt-paper-tab");
+		const tabs = {
+			upNext: tabList[0],
+			lyrics: tabList[1],
+			discover: tabList[2],
+		}
+
+		// Check if disabled
+		if (!tabs.lyrics?.hasAttribute("disabled")) {
+			return;
+		}
+
+		let hasLyrics = true;
+
+		const lyrics = ipcRenderer.sendSync(
+			"search-genius-lyrics",
+			extractedSongInfo
+		);
+		if (!lyrics) {
+			// Delete previous lyrics if tab is open and couldn't get new lyrics
+			checkLyricsContainer(() => {
+				hasLyrics = false;
+				setTabsOnclick(undefined);
+			});
+			return;
+		}
+
+		if (is.dev()) {
+			console.log("Fetched lyrics from Genius");
+		}
+
+		enableLyricsTab();
+
+		setTabsOnclick(enableLyricsTab);
+
+		checkLyricsContainer();
+
+		tabs.lyrics.onclick = () => {
+			const tabContainer = document.querySelector("ytmusic-tab-renderer");
+			const observer = new MutationObserver((_, observer) => {
+				checkLyricsContainer(() => observer.disconnect());
+			});
+			observer.observe(tabContainer, {
+				attributes: true,
+				childList: true,
+				subtree: true,
+			});
+		};
+
+		function checkLyricsContainer(callback = () => {}) {
+			const lyricsContainer = document.querySelector(
+				'[page-type="MUSIC_PAGE_TYPE_TRACK_LYRICS"] > ytmusic-message-renderer'
+			);
+			if (lyricsContainer) {
+				callback();
+				setLyrics(lyricsContainer)
+			}
+		}
+
+		function setLyrics(lyricsContainer) {
+			lyricsContainer.innerHTML = `<div id="contents" class="style-scope ytmusic-section-list-renderer description ytmusic-description-shelf-renderer genius-lyrics">
+			 		${
+						hasLyrics
+							? lyrics.replace(/(?:\r\n|\r|\n)/g, "<br/>")
+							: "Could not retrieve lyrics from genius"
+					}
+
+				</div>
+				<yt-formatted-string class="footer style-scope ytmusic-description-shelf-renderer" style="align-self: baseline"></yt-formatted-string>`;
+			if (hasLyrics) {
+				lyricsContainer.querySelector('.footer').textContent = 'Source: Genius';
+				enableLyricsTab();
+			}
+		}
+
+		function setTabsOnclick(callback) {
+			for (const tab of [tabs.upNext, tabs.discover]) {
+				if (tab) {
+					tab.onclick = callback;
+				}
+			}
+		}
+
+		function enableLyricsTab() {
+			tabs.lyrics.removeAttribute("disabled");
+			tabs.lyrics.removeAttribute("aria-disabled");
+		}
+	});
+};

plugins/lyrics-genius/style.css

@@ -0,0 +1,12 @@
+/* Disable links in Genius lyrics */
+.genius-lyrics a {
+	color: var(--ytmusic-text-primary);
+	display: inline-block;
+	pointer-events: none;
+	text-decoration: none;
+}
+
+.description {
+	font-size: 1.1vw !important;
+	text-align: center !important;
+}

plugins/navigation/style.css

@@ -3,7 +3,6 @@
 	font-size: 20px;
 	line-height: var(--ytmusic-title-1_-_line-height);
 	font-weight: 500;
-	color: #fff;
 	--yt-endpoint-color: #fff;
 	--yt-endpoint-hover-color: #fff;
 	--yt-endpoint-visited-color: #fff;

plugins/notifications/back.js

@@ -3,8 +3,6 @@ const is = require("electron-is");
 const registerCallback = require("../../providers/song-info");
 const { notificationImage } = require("./utils");
 
-const setupInteractive = require("./interactive")
-
 const notify = (info, options) => {
 
 	// Fill the notification with content
@@ -41,6 +39,6 @@ const setup = (options) => {
 module.exports = (win, options) => {
 	// Register the callback for new song information
 	is.windows() && options.interactive ?
-		setupInteractive(win, options.unpauseNotification) :
+		require("./interactive")(win, options.unpauseNotification) :
 		setup(options);
 };

plugins/notifications/interactive.js

@@ -1,7 +1,10 @@
 const { notificationImage, icons } = require("./utils");
 const getSongControls = require('../../providers/song-controls');
 const registerCallback = require("../../providers/song-info");
-const notifier = require("node-notifier");
+const is = require("electron-is");
+const WindowsToaster = require('node-notifier').WindowsToaster;
+
+const notifier = new WindowsToaster({ withFallback: true });
 
 //store song controls reference on launch
 let controls;
@@ -17,11 +20,11 @@ module.exports = (win, unpauseNotification) => {
 
     // Register songInfoCallback
     registerCallback(songInfo => {
-		if (!songInfo.isPaused && (songInfo.url !== currentUrl || notificationOnUnpause)) {
+        if (!songInfo.isPaused && (songInfo.url !== currentUrl || notificationOnUnpause)) {
             currentUrl = songInfo.url;
             sendToaster(songInfo);
-		}
-	});
+        }
+    });
 
     win.webContents.once("closed", () => {
         deleteNotification()
@@ -48,7 +51,7 @@ function sendToaster(songInfo) {
     //download image and get path
     let imgSrc = notificationImage(songInfo, true);
     toDelete = {
-        //app id undefined - will break buttons
+        appID: is.dev() ? undefined : "com.github.th-ch.youtube-music",
         title: songInfo.title || "Playing",
         message: songInfo.artist,
         id: parseInt(Math.random() * 1000000, 10),

plugins/notifications/utils.js

@@ -1,4 +1,4 @@
-const { setOptions } = require("../../config/plugins");
+const { setMenuOptions } = require("../../config/plugins");
 const path = require("path");
 const { app } = require("electron");
 const fs = require("fs");
@@ -15,7 +15,7 @@ module.exports.icons = {
 
 module.exports.setOption = (options, option, value) => {
 	options[option] = value;
-	setOptions("notifications", options)
+	setMenuOptions("notifications", options)
 }
 
 module.exports.urgencyLevels = [

plugins/picture-in-picture/back.js

@@ -0,0 +1,79 @@
+const path = require("path");
+
+const { app, ipcMain } = require("electron");
+
+const { setOptions } = require("../../config/plugins");
+const { injectCSS } = require("../utils");
+
+let isInPiPMode = false;
+let originalPosition;
+let originalSize;
+
+const pipPosition = [10, 10];
+const pipSize = [450, 275];
+
+const togglePiP = async (win) => {
+	isInPiPMode = !isInPiPMode;
+	setOptions("picture-in-picture", { isInPiP: isInPiPMode });
+
+	if (isInPiPMode) {
+		originalPosition = win.getPosition();
+		originalSize = win.getSize();
+
+		win.webContents.on("before-input-event", blockShortcutsInPiP);
+
+		win.setFullScreenable(false);
+		await win.webContents.executeJavaScript(
+			// Go fullscreen
+			`
+			if (!document.querySelector("ytmusic-player-page").playerPageOpen_) {
+  				document.querySelector(".toggle-player-page-button").click();
+			}
+			document.querySelector(".fullscreen-button").click();
+			document.querySelector("ytmusic-player-bar").classList.add("pip");
+			`
+		);
+		win.setFullScreenable(true);
+
+		app.dock?.hide();
+		win.setVisibleOnAllWorkspaces(true, {
+			visibleOnFullScreen: true,
+		});
+		app.dock?.show();
+		win.setAlwaysOnTop(true, "screen-saver", 1);
+	} else {
+		win.webContents.removeListener("before-input-event", blockShortcutsInPiP);
+
+		await win.webContents.executeJavaScript(
+			// Exit fullscreen
+			`
+			document.querySelector(".exit-fullscreen-button").click();
+			document.querySelector("ytmusic-player-bar").classList.remove("pip");
+			`
+		);
+
+		win.setVisibleOnAllWorkspaces(false);
+		win.setAlwaysOnTop(false);
+	}
+
+	const [x, y] = isInPiPMode ? pipPosition : originalPosition;
+	const [w, h] = isInPiPMode ? pipSize : originalSize;
+	win.setPosition(x, y);
+	win.setSize(w, h);
+
+	win.setWindowButtonVisibility?.(!isInPiPMode);
+};
+
+module.exports = (win) => {
+	injectCSS(win.webContents, path.join(__dirname, "style.css"));
+	ipcMain.on("picture-in-picture", async () => {
+		await togglePiP(win);
+	});
+};
+
+const blockShortcutsInPiP = (event, input) => {
+	const blockedShortcuts = ["f", "escape"];
+	if (blockedShortcuts.includes(input.key.toLowerCase())) {
+		event.preventDefault();
+	}
+};

plugins/picture-in-picture/front.js

@@ -0,0 +1,42 @@
+const { ipcRenderer } = require("electron");
+
+const { getSongMenu } = require("../../providers/dom-elements");
+const { ElementFromFile, templatePath } = require("../utils");
+
+let menu = null;
+const pipButton = ElementFromFile(
+	templatePath(__dirname, "picture-in-picture.html")
+);
+
+const observer = new MutationObserver(() => {
+	if (!menu) {
+		menu = getSongMenu();
+		if (!menu) return;
+	}
+	if (menu.contains(pipButton)) return;
+	const menuUrl = document.querySelector(
+		'tp-yt-paper-listbox [tabindex="0"] #navigation-endpoint'
+	)?.href;
+	if (menuUrl && !menuUrl.includes("watch?")) return;
+
+	menu.prepend(pipButton);
+});
+
+global.togglePictureInPicture = () => {
+	ipcRenderer.send("picture-in-picture");
+};
+
+function observeMenu(options) {
+	document.addEventListener(
+		"apiLoaded",
+		() => {
+			observer.observe(document.querySelector("ytmusic-popup-container"), {
+				childList: true,
+				subtree: true,
+			});
+		},
+		{ once: true, passive: true }
+	);
+}
+
+module.exports = observeMenu;

plugins/picture-in-picture/style.css

@@ -0,0 +1,11 @@
+ytmusic-player-bar.pip svg,
+ytmusic-player-bar.pip yt-formatted-string {
+	filter: drop-shadow(2px 4px 6px black);
+	color: white;
+}
+
+ytmusic-player-bar.pip ytmusic-player-expanding-menu {
+	border-radius: 30px;
+	background-color: rgba(0, 0, 0, 0.3);
+	backdrop-filter: blur(5px) brightness(20%);
+}

plugins/picture-in-picture/templates/picture-in-picture.html

@@ -0,0 +1,51 @@
+<div
+	class="style-scope menu-item ytmusic-menu-popup-renderer"
+	role="option"
+	tabindex="-1"
+	aria-disabled="false"
+	aria-selected="false"
+	onclick="togglePictureInPicture()"
+>
+	<div
+		id="navigation-endpoint"
+		class="yt-simple-endpoint style-scope ytmusic-menu-navigation-item-renderer"
+		tabindex="-1"
+	>
+		<div
+			class="icon menu-icon style-scope ytmusic-menu-navigation-item-renderer"
+		>
+			<svg
+				version="1.1"
+				id="Layer_1"
+				xmlns="http://www.w3.org/2000/svg"
+				xmlns:xlink="http://www.w3.org/1999/xlink"
+				x="0px"
+				y="0px"
+				viewBox="0 0 512 512"
+				style="enable-background: new 0 0 512 512"
+				xml:space="preserve"
+			>
+				<style type="text/css">
+					.st0 {
+						fill: #aaaaaa;
+					}
+				</style>
+				<g id="XMLID_6_">
+					<path
+						id="XMLID_11_"
+						class="st0"
+						d="M418.5,139.4H232.4v139.8h186.1V139.4z M464.8,46.7H46.3C20.5,46.7,0,68.1,0,93.1v325.9
+		c0,25.8,21.4,46.3,46.3,46.3h419.4c25.8,0,46.3-20.5,46.3-46.3V93.1C512,67.2,490.6,46.7,464.8,46.7z M464.8,418.9H46.3V92.2h419.4
+		v326.8H464.8z"
+					/>
+				</g>
+			</svg>
+		</div>
+		<div
+			class="text style-scope ytmusic-menu-navigation-item-renderer"
+			id="ytmcustom-pip"
+		>
+			Picture in picture
+		</div>
+	</div>
+</div>

plugins/playback-speed/front.js

@@ -1,83 +1,93 @@
-const {
-	getSongMenu,
-	watchDOMElement,
-} = require("../../providers/dom-elements");
+const { getSongMenu } = require("../../providers/dom-elements");
 const { ElementFromFile, templatePath } = require("../utils");
 
+function $(selector) { return document.querySelector(selector); }
+
 const slider = ElementFromFile(templatePath(__dirname, "slider.html"));
 
-const MIN_PLAYBACK_SPEED = 0.25;
-const MAX_PLAYBACK_SPEED = 2;
+const roundToTwo = n => Math.round(n * 1e2) / 1e2;
 
-let videoElement;
-let playbackSpeedPercentage = 50; // = Playback speed of 1
+const MIN_PLAYBACK_SPEED = 0.07;
+const MAX_PLAYBACK_SPEED = 16;
 
-const computePlayBackSpeed = () => {
-	if (playbackSpeedPercentage <= 50) {
-		// Slow down video by setting a playback speed between MIN_PLAYBACK_SPEED and 1
-		return (
-			MIN_PLAYBACK_SPEED +
-			((1 - MIN_PLAYBACK_SPEED) / 50) * playbackSpeedPercentage
-		);
-	}
-
-	// Accelerate video by setting a playback speed between 1 and MAX_PLAYBACK_SPEED
-	return 1 + ((MAX_PLAYBACK_SPEED - 1) / 50) * (playbackSpeedPercentage - 50);
-};
+let playbackSpeed = 1;
 
 const updatePlayBackSpeed = () => {
-	const playbackSpeed = Math.round(computePlayBackSpeed() * 100) / 100;
+	$('video').playbackRate = playbackSpeed;
 
-	if (!videoElement || videoElement.playbackRate === playbackSpeed) {
-		return;
-	}
-
-	videoElement.playbackRate = playbackSpeed;
-
-	const playbackSpeedElement = document.querySelector("#playback-speed-value");
+	const playbackSpeedElement = $("#playback-speed-value");
 	if (playbackSpeedElement) {
 		playbackSpeedElement.innerHTML = playbackSpeed;
 	}
 };
 
-module.exports = () => {
-	watchDOMElement(
-		"video",
-		(document) => document.querySelector("video"),
-		(element) => {
-			videoElement = element;
-			updatePlayBackSpeed();
-		}
-	);
+let menu;
+let observingSlider = false;
 
-	watchDOMElement(
-		"menu",
-		(document) => getSongMenu(document),
-		(menuElement) => {
-			if (!menuElement.contains(slider)) {
-				menuElement.prepend(slider);
+const observePopupContainer = () => {
+	const observer = new MutationObserver(() => {
+		if (!menu) {
+			menu = getSongMenu();
+		}
+
+		if (menu && menu.lastElementChild.lastElementChild.innerText.startsWith('Stats') && !menu.contains(slider)) {
+			menu.prepend(slider);
+			if (!observingSlider) {
+				setupSliderListener();
+				observingSlider = true;
 			}
-
-			const playbackSpeedElement = document.querySelector(
-				"#playback-speed-slider #sliderKnob .slider-knob-inner"
-			);
-
-			const playbackSpeedObserver = new MutationObserver((mutations) => {
-				mutations.forEach(function (mutation) {
-					if (mutation.type == "attributes") {
-						const value = playbackSpeedElement.getAttribute("value");
-						playbackSpeedPercentage = parseInt(value, 10);
-						if (isNaN(playbackSpeedPercentage)) {
-							playbackSpeedPercentage = 50;
-						}
-						updatePlayBackSpeed();
-						return;
-					}
-				});
-			});
-			playbackSpeedObserver.observe(playbackSpeedElement, {
-				attributes: true,
-			});
 		}
-	);
+	});
+
+	observer.observe($('ytmusic-popup-container'), {
+		childList: true,
+		subtree: true,
+	});
+};
+
+const observeVideo = () => {
+	$('video').addEventListener('ratechange', forcePlaybackRate)
+	$('video').addEventListener('srcChanged', forcePlaybackRate)
+}
+
+const setupWheelListener = () => {
+	slider.addEventListener('wheel', e => {
+		e.preventDefault();
+		if (isNaN(playbackSpeed)) {
+			playbackSpeed = 1;
+		}
+		// e.deltaY < 0 means wheel-up
+		playbackSpeed = roundToTwo(e.deltaY < 0 ?
+			Math.min(playbackSpeed + 0.01, MAX_PLAYBACK_SPEED) :
+			Math.max(playbackSpeed - 0.01, MIN_PLAYBACK_SPEED)
+		);
+
+		updatePlayBackSpeed();
+		// update slider position
+		$('#playback-speed-slider').value = playbackSpeed;
+	})
+}
+
+function setupSliderListener() {
+	$('#playback-speed-slider').addEventListener('immediate-value-changed', e => {
+		playbackSpeed = e.detail.value || MIN_PLAYBACK_SPEED;
+		if (isNaN(playbackSpeed)) {
+			playbackSpeed = 1;
+		}
+		updatePlayBackSpeed();
+	})
+}
+
+function forcePlaybackRate(e) {
+	if (e.target.playbackRate !== playbackSpeed) {
+		e.target.playbackRate = playbackSpeed
+	}
+}
+
+module.exports = () => {
+	document.addEventListener('apiLoaded', () => {
+		observePopupContainer();
+		observeVideo();
+		setupWheelListener();
+	}, { once: true, passive: true })
 };

plugins/playback-speed/templates/slider.html

@@ -1,79 +1,88 @@
 <div
-	class="menu-item ytmusic-menu-popup-renderer"
+	class="style-scope menu-item ytmusic-menu-popup-renderer"
 	role="option"
 	tabindex="-1"
 	aria-disabled="false"
 	aria-selected="false"
 >
-	<tp-yt-paper-slider
-		id="playback-speed-slider"
-		class="volume-slider style-scope ytmusic-player-bar on-hover"
-		max="100"
-		min="0"
-		step="5"
-		dir="ltr"
-		title="Playback speed"
-		aria-label="Playback speed"
-		role="slider"
-		tabindex="0"
-		aria-valuemin="0"
-		aria-valuemax="100"
-		aria-valuenow="50"
-		aria-disabled="false"
-		value="50"
-		><!--css-build:shady-->
-		<div id="sliderContainer" class="style-scope tp-yt-paper-slider">
-			<div class="bar-container style-scope tp-yt-paper-slider">
-				<tp-yt-paper-progress
-					id="sliderBar"
-					aria-hidden="true"
-					class="style-scope tp-yt-paper-slider"
-					role="progressbar"
-					value="50"
-					aria-valuenow="50"
-					aria-valuemin="0"
-					aria-valuemax="100"
-					aria-disabled="false"
-					style="touch-action: none"
-					><!--css-build:shady-->
+	<div
+		id="navigation-endpoint"
+		class="yt-simple-endpoint style-scope ytmusic-menu-navigation-item-renderer"
+		tabindex="-1"
+	>
+		<tp-yt-paper-slider
+			id="playback-speed-slider"
+			class="volume-slider style-scope ytmusic-player-bar on-hover"
+			style="display: inherit !important"
+			max="2"
+			min="0"
+			step="0.125"
+			dir="ltr"
+			title="Playback speed"
+			aria-label="Playback speed"
+			role="slider"
+			tabindex="0"
+			aria-valuemin="0"
+			aria-valuemax="2"
+			aria-valuenow="1"
+			aria-disabled="false"
+			value="1"
+			><!--css-build:shady-->
+			<div id="sliderContainer" class="style-scope tp-yt-paper-slider">
+				<div class="bar-container style-scope tp-yt-paper-slider">
+					<tp-yt-paper-progress
+						id="sliderBar"
+						aria-hidden="true"
+						class="style-scope tp-yt-paper-slider"
+						role="progressbar"
+						value="1"
+						aria-valuenow="1"
+						aria-valuemin="0"
+						aria-valuemax="2"
+						aria-disabled="false"
+						style="touch-action: none"
+						><!--css-build:shady-->
 
-					<div id="progressContainer" class="style-scope tp-yt-paper-progress">
 						<div
-							id="secondaryProgress"
+							id="progressContainer"
 							class="style-scope tp-yt-paper-progress"
-							hidden="true"
-							style="transform: scaleX(0)"
-						></div>
-						<div
-							id="primaryProgress"
-							class="style-scope tp-yt-paper-progress"
-							style="transform: scaleX(0.5)"
-						></div>
-					</div>
-				</tp-yt-paper-progress>
+						>
+							<div
+								id="secondaryProgress"
+								class="style-scope tp-yt-paper-progress"
+								hidden="true"
+								style="transform: scaleX(0)"
+							></div>
+							<div
+								id="primaryProgress"
+								class="style-scope tp-yt-paper-progress"
+								style="transform: scaleX(0.5)"
+							></div>
+						</div>
+					</tp-yt-paper-progress>
+				</div>
+				<dom-if class="style-scope tp-yt-paper-slider"
+					><template is="dom-if"></template
+				></dom-if>
+				<div
+					id="sliderKnob"
+					class="slider-knob style-scope tp-yt-paper-slider"
+					style="left: 50%; touch-action: none"
+				>
+					<div
+						class="slider-knob-inner style-scope tp-yt-paper-slider"
+						value="1"
+					></div>
+				</div>
 			</div>
 			<dom-if class="style-scope tp-yt-paper-slider"
-				><template is="dom-if"></template
-			></dom-if>
-			<div
-				id="sliderKnob"
-				class="slider-knob style-scope tp-yt-paper-slider"
-				style="left: 50%; touch-action: none"
-			>
-				<div
-					class="slider-knob-inner style-scope tp-yt-paper-slider"
-					value="50"
-				></div>
-			</div>
+				><template is="dom-if"></template></dom-if
+		></tp-yt-paper-slider>
+		<div
+			class="text style-scope ytmusic-menu-navigation-item-renderer"
+			id="ytmcustom-playback-speed"
+		>
+			Speed (<span id="playback-speed-value">1</span>)
 		</div>
-		<dom-if class="style-scope tp-yt-paper-slider"
-			><template is="dom-if"></template></dom-if
-	></tp-yt-paper-slider>
-
-	<div
-		class="text style-scope ytmusic-toggle-menu-service-item-renderer"
-		id="ytmcustom-playback-speed"
-	>
-		Speed (<span id="playback-speed-value">1</span>)
 	</div>
 </div>

plugins/precise-volume/back.js

@@ -1,4 +1,5 @@
-const { isEnabled } = require("../../config/plugins");
+const { injectCSS } = require("../utils");
+const path = require("path");
 
 /*
 This is used to determine if plugin is actually active
@@ -7,17 +8,8 @@ This is used to determine if plugin is actually active
 let enabled = false;
 
 module.exports = (win) => {
-	enabled = true;
+    enabled = true;
+    injectCSS(win.webContents, path.join(__dirname, "volume-hud.css"));
+}
 
-	// youtube-music register some of the target listeners after DOMContentLoaded
-	// did-finish-load is called after all elements finished loading, including said listeners
-	// Thats the reason the timing is controlled from main
-	win.webContents.once("did-finish-load", () => {
-		win.webContents.send("restoreAddEventListener");
-		win.webContents.send("setupVideoPlayerVolumeMousewheel", !isEnabled("hide-video-player"));
-	});
-};
-
-module.exports.enabled = () => {
-	return enabled;
-};
+module.exports.enabled = () => enabled;

plugins/precise-volume/front.js

@@ -1,29 +1,99 @@
-const { ipcRenderer, remote } = require("electron");
+const { ipcRenderer } = require("electron");
+const { globalShortcut } = require('@electron/remote');
 
-const { setOptions } = require("../../config/plugins");
+const { setOptions, setMenuOptions, isEnabled } = require("../../config/plugins");
 
 function $(selector) { return document.querySelector(selector); }
+let api;
 
 module.exports = (options) => {
+	document.addEventListener('apiLoaded', e => {
+		api = e.detail;
+		firstRun(options);
+	}, { once: true, passive: true })
+};
+
+module.exports.moveVolumeHud = moveVolumeHud;
+
+/** Restore saved volume and setup tooltip */
+function firstRun(options) {
+	if (typeof options.savedVolume === "number") {
+		// Set saved volume as tooltip
+		setTooltip(options.savedVolume);
+
+		if (api.getVolume() !== options.savedVolume) {
+			api.setVolume(options.savedVolume);
+		}
+	}
 
 	setupPlaybar(options);
 
-	setupSliderObserver(options);
-
 	setupLocalArrowShortcuts(options);
 
-	if (options.globalShortcuts?.enabled) {
-		setupGlobalShortcuts(options);
+	setupGlobalShortcuts(options);
+
+	const noVid = $("#main-panel")?.computedStyleMap().get("display").value === "none";
+	injectVolumeHud(noVid);
+	if (!noVid) {
+		setupVideoPlayerOnwheel(options);
+		if (!isEnabled('video-toggle')) {
+			//video-toggle handles hud positioning on its own
+			const videoMode = () => api.getPlayerResponse().videoDetails?.musicVideoType !== 'MUSIC_VIDEO_TYPE_ATV';
+			$("video").addEventListener("srcChanged", () => moveVolumeHud(videoMode()));
+		}
 	}
 
-	firstRun(options);
-
-	// This way the ipc listener gets cleared either way
-	ipcRenderer.once("setupVideoPlayerVolumeMousewheel", (_event, toEnable) => {
-		if (toEnable)
-			setupVideoPlayerOnwheel(options);
+	// Change options from renderer to keep sync
+	ipcRenderer.on("setOptions", (_event, newOptions = {}) => {
+		Object.assign(options, newOptions)
+		setMenuOptions("precise-volume", options);
 	});
-};
+}
+
+function injectVolumeHud(noVid) {
+	if (noVid) {
+		const position = "top: 18px; right: 60px;";
+		const mainStyle = "font-size: xx-large;";
+
+		$(".center-content.ytmusic-nav-bar").insertAdjacentHTML("beforeend",
+			`<span id="volumeHud" style="${position + mainStyle}"></span>`)
+	} else {
+		const position = `top: 10px; left: 10px;`;
+		const mainStyle = "font-size: xxx-large; webkit-text-stroke: 1px black; font-weight: 600;";
+
+		$("#song-video").insertAdjacentHTML('afterend',
+			`<span id="volumeHud" style="${position + mainStyle}"></span>`)
+	}
+}
+
+let hudMoveTimeout;
+function moveVolumeHud(showVideo) {
+	clearTimeout(hudMoveTimeout);
+	const volumeHud = $('#volumeHud');
+	if (!volumeHud) return;
+	hudMoveTimeout = setTimeout(() => {
+		volumeHud.style.top = showVideo ? `${($('ytmusic-player').clientHeight - $('video').clientHeight) / 2}px` : 0;
+	}, 250)
+}
+
+let hudFadeTimeout;
+
+function showVolumeHud(volume) {
+	let volumeHud = $("#volumeHud");
+	if (!volumeHud) return;
+
+	volumeHud.textContent = volume + '%';
+	volumeHud.style.opacity = 1;
+
+	if (hudFadeTimeout) {
+		clearTimeout(hudFadeTimeout);
+	}
+
+	hudFadeTimeout = setTimeout(() => {
+		volumeHud.style.opacity = 0;
+		hudFadeTimeout = null;
+	}, 2000);
+}
 
 /** Add onwheel event to video player */
 function setupVideoPlayerOnwheel(options) {
@@ -34,35 +104,20 @@ function setupVideoPlayerOnwheel(options) {
 	});
 }
 
-function toPercent(volume) {
-	return Math.round(Number.parseFloat(volume) * 100);
-}
-
 function saveVolume(volume, options) {
 	options.savedVolume = volume;
-	setOptions("precise-volume", options);
+	writeOptions(options);
 }
 
-/** Restore saved volume and setup tooltip */
-function firstRun(options) {
-	const videoStream = $(".video-stream");
-	const slider = $("#volume-slider");
-	// Those elements load abit after DOMContentLoaded
-	if (videoStream && slider) {
-		// Set saved volume IF it pass checks
-		if (options.savedVolume
-			&& options.savedVolume >= 0 && options.savedVolume <= 100
-			&& Math.abs(slider.value - options.savedVolume) < 5
-			// If plugin was disabled and volume changed then diff>4
-		) {
-			videoStream.volume = options.savedVolume / 100;
-			slider.value = options.savedVolume;
-		}
-		// Set current volume as tooltip
-		setTooltip(toPercent(videoStream.volume));
-	} else {
-		setTimeout(firstRun, 500, options); // Try again in 500 milliseconds
-	}
+//without this function it would rewrite config 20 time when volume change by 20
+let writeTimeout;
+function writeOptions(options) {
+	if (writeTimeout) clearTimeout(writeTimeout);
+
+	writeTimeout = setTimeout(() => {
+		setOptions("precise-volume", options);
+		writeTimeout = null;
+	}, 1000)
 }
 
 /** Add onwheel event to play bar and also track if play bar is hovered*/
@@ -83,32 +138,67 @@ function setupPlaybar(options) {
 	playerbar.addEventListener("mouseleave", () => {
 		playerbar.classList.remove("on-hover");
 	});
+
+	setupSliderObserver(options);
+}
+
+/** Save volume + Update the volume tooltip when volume-slider is manually changed */
+function setupSliderObserver(options) {
+	const sliderObserver = new MutationObserver(mutations => {
+		for (const mutation of mutations) {
+			// This checks that volume-slider was manually set
+			if (mutation.oldValue !== mutation.target.value &&
+				(typeof options.savedVolume !== "number" || Math.abs(options.savedVolume - mutation.target.value) > 4)) {
+				// Diff>4 means it was manually set
+				setTooltip(mutation.target.value);
+				saveVolume(mutation.target.value, options);
+			}
+		}
+	});
+
+	// Observing only changes in 'value' of volume-slider
+	sliderObserver.observe($("#volume-slider"), {
+		attributeFilter: ["value"],
+		attributeOldValue: true
+	});
 }
 
 /** if (toIncrease = false) then volume decrease */
 function changeVolume(toIncrease, options) {
-	// Need to change both the actual volume and the slider
-	const videoStream = $(".video-stream");
-	const slider = $("#volume-slider");
 	// Apply volume change if valid
-	const steps = (options.steps || 1) / 100;
-	videoStream.volume = toIncrease ?
-		Math.min(videoStream.volume + steps, 1) :
-		Math.max(videoStream.volume - steps, 0);
+	const steps = Number(options.steps || 1);
+	api.setVolume(toIncrease ?
+		Math.min(api.getVolume() + steps, 100) :
+		Math.max(api.getVolume() - steps, 0));
 
 	// Save the new volume
-	saveVolume(toPercent(videoStream.volume), options);
-	// Slider value automatically rounds to multiples of 5
-	slider.value = options.savedVolume;
+	saveVolume(api.getVolume(), options);
+
+	// change slider position (important)
+	updateVolumeSlider(options);
+
 	// Change tooltips to new value
 	setTooltip(options.savedVolume);
-	// Show volume slider on volume change
-	showVolumeSlider(slider);
+	// Show volume slider
+	showVolumeSlider();
+	// Show volume HUD
+	showVolumeHud(options.savedVolume);
+}
+
+function updateVolumeSlider(options) {
+	// Slider value automatically rounds to multiples of 5
+	for (const slider of ["#volume-slider", "#expand-volume-slider"]) {
+		$(slider).value =
+			options.savedVolume > 0 && options.savedVolume < 5
+				? 5
+				: options.savedVolume;
+	}
 }
 
 let volumeHoverTimeoutID;
 
-function showVolumeSlider(slider) {
+function showVolumeSlider() {
+	const slider = $("#volume-slider");
 	// This class display the volume slider if not in minimized mode
 	slider.classList.add("on-hover");
 	// Reset timeout if previous one hasn't completed
@@ -124,27 +214,6 @@ function showVolumeSlider(slider) {
 	}, 3000);
 }
 
-/** Save volume + Update the volume tooltip when volume-slider is manually changed */
-function setupSliderObserver(options) {
-	const sliderObserver = new MutationObserver(mutations => {
-		for (const mutation of mutations) {
-			// This checks that volume-slider was manually set
-			if (mutation.oldValue !== mutation.target.value &&
-				(!options.savedVolume || Math.abs(options.savedVolume - mutation.target.value) > 4)) {
-				// Diff>4 means it was manually set
-				setTooltip(mutation.target.value);
-				saveVolume(mutation.target.value, options);
-			}
-		}
-	});
-
-	// Observing only changes in 'value' of volume-slider
-	sliderObserver.observe($("#volume-slider"), {
-		attributeFilter: ["value"],
-		attributeOldValue: true
-	});
-}
-
 // Set new volume as tooltip for volume slider and icon + expanding slider (appears when window size is small)
 const tooltipTargets = [
 	"#volume-slider",
@@ -161,48 +230,26 @@ function setTooltip(volume) {
 
 function setupGlobalShortcuts(options) {
 	if (options.globalShortcuts.volumeUp) {
-		remote.globalShortcut.register((options.globalShortcuts.volumeUp), () => changeVolume(true, options));
+		globalShortcut.register((options.globalShortcuts.volumeUp), () => changeVolume(true, options));
 	}
 	if (options.globalShortcuts.volumeDown) {
-		remote.globalShortcut.register((options.globalShortcuts.volumeDown), () => changeVolume(false, options));
+		globalShortcut.register((options.globalShortcuts.volumeDown), () => changeVolume(false, options));
 	}
 }
 
 function setupLocalArrowShortcuts(options) {
 	if (options.arrowsShortcut) {
-		addListener();
-	}
-
-	// Change options from renderer to keep sync
-	ipcRenderer.on("setArrowsShortcut", (_event, isEnabled) => {
-		options.arrowsShortcut = isEnabled;
-		setOptions("precise-volume", options);
-		// This allows changing this setting without restarting app
-		if (isEnabled) {
-			addListener();
-		} else {
-			removeListener();
-		}
-	});
-
-	function addListener() {
-		window.addEventListener('keydown', callback);
-	}
-
-	function removeListener() {
-		window.removeEventListener("keydown", callback);
-	}
-
-	function callback(event) {
-		switch (event.code) {
-			case "ArrowUp":
-				event.preventDefault();
-				changeVolume(true, options);
-				break;
-			case "ArrowDown":
-				event.preventDefault();
-				changeVolume(false, options);
-				break;
-		}
+		window.addEventListener('keydown', (event) => {
+			switch (event.code) {
+				case "ArrowUp":
+					event.preventDefault();
+					changeVolume(true, options);
+					break;
+				case "ArrowDown":
+					event.preventDefault();
+					changeVolume(false, options);
+					break;
+			}
+		});
 	}
 }

plugins/precise-volume/menu.js

@@ -1,19 +1,82 @@
 const { enabled } = require("./back");
-const { setOptions } = require("../../config/plugins");
+const { setMenuOptions } = require("../../config/plugins");
+const prompt = require("custom-electron-prompt");
+const promptOptions = require("../../providers/prompt-options");
+
+function changeOptions(changedOptions, options, win) {
+	for (option in changedOptions) {
+		options[option] = changedOptions[option];
+	}
+	// Dynamically change setting if plugin is enabled
+	if (enabled()) {
+		win.webContents.send("setOptions", changedOptions);
+	} else { // Fallback to usual method if disabled
+		setMenuOptions("precise-volume", options);
+	}
+}
 
 module.exports = (win, options) => [
 	{
-		label: "Arrowkeys controls",
+		label: "Local Arrowkeys Controls",
 		type: "checkbox",
 		checked: !!options.arrowsShortcut,
-		click: (item) => {
-			// Dynamically change setting if plugin enabled
-			if (enabled()) {
-				win.webContents.send("setArrowsShortcut", item.checked);
-			} else { // Fallback to usual method if disabled
-				options.arrowsShortcut = item.checked;
-				setOptions("precise-volume", options);
-			}
+		click: item => {
+			changeOptions({ arrowsShortcut: item.checked }, options, win);
 		}
+	},
+	{
+		label: "Global Hotkeys",
+		type: "checkbox",
+		checked: !!options.globalShortcuts.volumeUp || !!options.globalShortcuts.volumeDown,
+		click: item => promptGlobalShortcuts(win, options, item)
+	},
+	{
+		label: "Set Custom Volume Steps",
+		click: () => promptVolumeSteps(win, options)
 	}
 ];
+
+// Helper function for globalShortcuts prompt
+const kb = (label_, value_, default_) => { return { value: value_, label: label_, default: default_ || undefined }; };
+
+async function promptVolumeSteps(win, options) {
+	const output = await prompt({
+		title: "Volume Steps",
+		label: "Choose Volume Increase/Decrease Steps",
+		value: options.steps || 1,
+		type: "counter",
+		counterOptions: { minimum: 0, maximum: 100, multiFire: true },
+		width: 380,
+		...promptOptions()
+	}, win)
+
+	if (output || output === 0) { // 0 is somewhat valid
+		changeOptions({ steps: output}, options, win);
+	}
+}
+
+async function promptGlobalShortcuts(win, options, item) {
+	const output = await prompt({
+		title: "Global Volume Keybinds",
+		label: "Choose Global Volume Keybinds:",
+		type: "keybind",
+		keybindOptions: [
+			kb("Increase Volume", "volumeUp", options.globalShortcuts?.volumeUp),
+			kb("Decrease Volume", "volumeDown", options.globalShortcuts?.volumeDown)
+		],
+		...promptOptions()
+	}, win)
+
+	if (output) {
+		let newGlobalShortcuts = {};
+		for (const { value, accelerator } of output) {
+			newGlobalShortcuts[value] = accelerator;
+		}
+		changeOptions({ globalShortcuts: newGlobalShortcuts }, options, win);
+
+		item.checked = !!options.globalShortcuts.volumeUp || !!options.globalShortcuts.volumeDown;
+	} else {
+		// Reset checkbox if prompt was canceled
+		item.checked = !item.checked;
+	}
+}

plugins/precise-volume/preload.js

@@ -1,4 +1,3 @@
-const { ipcRenderer } = require("electron");
 const is = require("electron-is");
 
 let ignored = {
@@ -24,10 +23,10 @@ function overrideAddEventListener() {
 
 module.exports = () => {
     overrideAddEventListener();
-    // Restore original function after did-finish-load to avoid keeping Element.prototype altered
-    ipcRenderer.once("restoreAddEventListener", () => { // Called from main to make sure page is completly loaded
+    // Restore original function after finished loading to avoid keeping Element.prototype altered
+    window.addEventListener('load', () => {
         Element.prototype.addEventListener = Element.prototype._addEventListener;
         Element.prototype._addEventListener = undefined;
         ignored = undefined;
-    });
+    }, { once: true });
 };

plugins/precise-volume/volume-hud.css

@@ -0,0 +1,11 @@
+#volumeHud {
+	z-index: 999;
+	position: absolute;
+	transition: opacity 0.6s;
+	pointer-events: none;
+	padding: 10px;
+}
+
+ytmusic-player[player-ui-state_="MINIPLAYER"] #volumeHud {
+	top: 0 !important;
+}

plugins/quality-changer/front.js

@@ -0,0 +1,41 @@
+const { ElementFromFile, templatePath } = require("../utils");
+const { dialog } = require('@electron/remote');
+
+function $(selector) { return document.querySelector(selector); }
+
+const qualitySettingsButton = ElementFromFile(
+    templatePath(__dirname, "qualitySettingsTemplate.html")
+);
+
+
+module.exports = () => {
+    document.addEventListener('apiLoaded', setup, { once: true, passive: true });
+}
+
+function setup(event) {
+    const api = event.detail;
+
+    $('.top-row-buttons.ytmusic-player').prepend(qualitySettingsButton);
+
+    qualitySettingsButton.onclick = function chooseQuality() {
+        if (api.getPlayerState() === 2) api.playVideo();
+        else if (api.getPlayerState() === 1) api.pauseVideo();
+
+        const currentIndex = api.getAvailableQualityLevels().indexOf(api.getPlaybackQuality())
+
+        dialog.showMessageBox({
+            type: "question",
+            buttons: api.getAvailableQualityLabels(),
+            defaultId: currentIndex,
+            title: "Choose Video Quality",
+            message: "Choose Video Quality:",
+            detail: `Current Quality: ${api.getAvailableQualityLabels()[currentIndex]}`,
+            cancelId: -1
+        }).then((promise) => {
+            if (promise.response === -1) return;
+            const newQuality = api.getAvailableQualityLevels()[promise.response];
+            api.setPlaybackQualityRange(newQuality);
+            api.setPlaybackQuality(newQuality)
+        })
+    }
+}

plugins/quality-changer/templates/qualitySettingsTemplate.html

@@ -0,0 +1,13 @@
+<tp-yt-paper-icon-button class="player-quality-button style-scope ytmusic-player" icon="yt-icons:settings"
+    title="Open player quality changer" aria-label="Open player quality changer" role="button" tabindex="0" aria-disabled="false">
+    <tp-yt-iron-icon id="icon" class="style-scope tp-yt-paper-icon-button"><svg viewBox="0 0 24 24"
+            preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope yt-icon"
+            style="pointer-events: none; display: block; width: 100%; height: 100%;">
+            <g class="style-scope yt-icon">
+                <path
+                    d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.1-1.65c.2-.15.25-.42.13-.64l-2-3.46c-.12-.22-.4-.3-.6-.22l-2.5 1c-.52-.4-1.08-.73-1.7-.98l-.37-2.65c-.06-.24-.27-.42-.5-.42h-4c-.27 0-.48.18-.5.42l-.4 2.65c-.6.25-1.17.6-1.7.98l-2.48-1c-.23-.1-.5 0-.6.22l-2 3.46c-.14.22-.08.5.1.64l2.12 1.65c-.04.32-.07.65-.07.98s.02.66.06.98l-2.1 1.65c-.2.15-.25.42-.13.64l2 3.46c.12.22.4.3.6.22l2.5-1c.52.4 1.08.73 1.7.98l.37 2.65c.04.24.25.42.5.42h4c.25 0 .46-.18.5-.42l.37-2.65c.6-.25 1.17-.6 1.7-.98l2.48 1c.23.1.5 0 .6-.22l2-3.46c.13-.22.08-.5-.1-.64l-2.12-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"
+                    class="style-scope yt-icon"></path>
+            </g>
+        </svg>
+    </tp-yt-iron-icon>
+</tp-yt-paper-icon-button>

plugins/shortcuts/back.js

@@ -1,7 +1,8 @@
 const { globalShortcut } = require("electron");
+const is = require("electron-is");
 const electronLocalshortcut = require("electron-localshortcut");
-
 const getSongControls = require("../../providers/song-controls");
+const registerMPRIS = require("./mpris");
 
 function _registerGlobalShortcut(webContents, shortcut, action) {
 	globalShortcut.register(shortcut, () => {
@@ -19,31 +20,43 @@ function registerShortcuts(win, options) {
 	const songControls = getSongControls(win);
 	const { playPause, next, previous, search } = songControls;
 
-	_registerGlobalShortcut(win.webContents, "MediaPlayPause", playPause);
-	_registerGlobalShortcut(win.webContents, "MediaNextTrack", next);
-	_registerGlobalShortcut(win.webContents, "MediaPreviousTrack", previous);
+	if (options.overrideMediaKeys) {
+		_registerGlobalShortcut(win.webContents, "MediaPlayPause", playPause);
+		_registerGlobalShortcut(win.webContents, "MediaNextTrack", next);
+		_registerGlobalShortcut(win.webContents, "MediaPreviousTrack", previous);
+	}
+
 	_registerLocalShortcut(win, "CommandOrControl+F", search);
 	_registerLocalShortcut(win, "CommandOrControl+L", search);
 
+	if (is.linux()) registerMPRIS(win);
+
 	const { global, local } = options;
-	(global || []).forEach(({ shortcut, action }) => {
-		console.debug("Registering global shortcut", shortcut, ":", action);
-		if (!action || !songControls[action]) {
-			console.warn("Invalid action", action);
-			return;
-		}
+	const shortcutOptions = { global, local };
 
-		_registerGlobalShortcut(win.webContents, shortcut, songControls[action]);
-	});
-	(local || []).forEach(({ shortcut, action }) => {
-		console.debug("Registering local shortcut", shortcut, ":", action);
-		if (!action || !songControls[action]) {
-			console.warn("Invalid action", action);
-			return;
-		}
+	for (const optionType in shortcutOptions) {
+		registerAllShortcuts(shortcutOptions[optionType], optionType);
+	}
 
-		_registerLocalShortcut(win, shortcut, songControls[action]);
-	});
+	function registerAllShortcuts(container, type) {
+		for (const action in container) {
+			if (!container[action]) {
+				continue; // Action accelerator is empty
+			}
+
+			console.debug(`Registering ${type} shortcut`, container[action], ":", action);
+			if (!songControls[action]) {
+				console.warn("Invalid action", action);
+				continue;
+			}
+
+			if (type === "global") {
+				_registerGlobalShortcut(win.webContents, container[action], songControls[action]);
+			} else { // type === "local"
+				_registerLocalShortcut(win, local[action], songControls[action]);
+			}
+		}
+	}
 }
 
 module.exports = registerShortcuts;

plugins/shortcuts/menu.js

@@ -0,0 +1,53 @@
+const { setMenuOptions } = require("../../config/plugins");
+const prompt = require("custom-electron-prompt");
+const promptOptions = require("../../providers/prompt-options");
+
+module.exports = (win, options) => [
+	{
+		label: "Set Global Song Controls",
+		click: () => promptKeybind(options, win)
+	},
+	{
+		label: "Override MediaKeys",
+		type: "checkbox",
+		checked: options.overrideMediaKeys,
+		click: item => setOption(options, "overrideMediaKeys", item.checked)
+	}
+];
+
+function setOption(options, key = null, newValue = null) {
+	if (key && newValue !== null) {
+		options[key] = newValue;
+	}
+
+	setMenuOptions("shortcuts", options);
+}
+
+// Helper function for keybind prompt
+const kb = (label_, value_, default_) => { return { value: value_, label: label_, default: default_ }; };
+
+async function promptKeybind(options, win) {
+	const output = await prompt({
+		title: "Global Keybinds",
+		label: "Choose Global Keybinds for Songs Control:",
+		type: "keybind",
+		keybindOptions: [ // If default=undefined then no default is used
+			kb("Previous", "previous", options.global?.previous),
+			kb("Play / Pause", "playPause", options.global?.playPause),
+			kb("Next", "next", options.global?.next)
+		],
+		height: 270,
+		...promptOptions()
+	}, win);
+
+	if (output) {
+		if (!options.global) {
+			options.global = {};
+		}
+		for (const { value, accelerator } of output) {
+			options.global[value] = accelerator;
+		}
+		setOption(options);
+	}
+	// else -> pressed cancel
+}

plugins/shortcuts/mpris.js

@@ -0,0 +1,85 @@
+const mpris = require("mpris-service");
+const { ipcMain } = require("electron");
+const registerCallback = require("../../providers/song-info");
+const getSongControls = require("../../providers/song-controls");
+
+function setupMPRIS() {
+	const player = mpris({
+		name: "youtube-music",
+		identity: "YouTube Music",
+		canRaise: true,
+		supportedUriSchemes: ["https"],
+		supportedMimeTypes: ["audio/mpeg"],
+		supportedInterfaces: ["player"],
+		desktopEntry: "youtube-music",
+	});
+
+	return player;
+}
+
+function registerMPRIS(win) {
+	const songControls = getSongControls(win);
+	const { playPause, next, previous } = songControls;
+	try {
+		const secToMicro = n => Math.round(Number(n) * 1e6);
+		const microToSec = n => Math.round(Number(n) / 1e6);
+
+		const seekTo = e => win.webContents.send("seekTo", microToSec(e.position));
+		const seekBy = o => win.webContents.send("seekBy", microToSec(o));
+
+		const player = setupMPRIS();
+
+		ipcMain.on('seeked', (_, t) => player.seeked(secToMicro(t)));
+
+		let currentSeconds = 0;
+		ipcMain.on('timeChanged', (_, t) => currentSeconds = t);
+
+		player.getPosition = () => secToMicro(currentSeconds)
+
+		player.on("raise", () => {
+			win.setSkipTaskbar(false);
+			win.show();
+		});
+
+		player.on("play", () => {
+			if (player.playbackStatus !== 'Playing') {
+				player.playbackStatus = 'Playing';
+				playPause()
+			}
+		});
+		player.on("pause", () => {
+			if (player.playbackStatus !== 'Paused') {
+				player.playbackStatus = 'Paused';
+				playPause()
+			}
+		});
+
+		player.on("playpause", playPause);
+		player.on("next", next);
+		player.on("previous", previous);
+
+		player.on('seek', seekBy);
+		player.on('position', seekTo);
+
+		registerCallback(songInfo => {
+			if (player) {
+				const data = {
+					'mpris:length': secToMicro(songInfo.songDuration),
+					'mpris:artUrl': songInfo.imageSrc,
+					'xesam:title': songInfo.title,
+					'xesam:artist': [songInfo.artist],
+					'mpris:trackid': '/'
+				};
+				if (songInfo.album) data['xesam:album'] = songInfo.album;
+				player.metadata = data;
+				player.seeked(secToMicro(songInfo.elapsedSeconds))
+				player.playbackStatus = songInfo.isPaused ? "Paused" : "Playing"
+			}
+		})
+
+	} catch (e) {
+		console.warn("Error in MPRIS", e);
+	}
+}
+
+module.exports = registerMPRIS;

plugins/skip-silences/front.js

@@ -0,0 +1,37 @@
+const hark = require("hark/hark.bundle.js");
+
+module.exports = () => {
+	let isSilent = false;
+
+	document.addEventListener("apiLoaded", () => {
+		const video = document.querySelector("video");
+		const speechEvents = hark(video, {
+			threshold: -100, // dB (-100 = absolute silence, 0 = loudest)
+			interval: 2, // ms
+		});
+		const skipSilence = () => {
+			if (isSilent && !video.paused) {
+				video.currentTime += 0.2; // in s
+			}
+		};
+
+		speechEvents.on("speaking", function () {
+			isSilent = false;
+		});
+
+		speechEvents.on("stopped_speaking", function () {			
+			if (!(video.paused || video.seeking || video.ended)) {
+				isSilent = true;
+				skipSilence();
+			}
+		});
+
+		video.addEventListener("play", function () {
+			skipSilence();
+		});
+
+		video.addEventListener("seeked", function () {
+			skipSilence();
+		});
+	});
+};

plugins/sponsorblock/back.js

@@ -0,0 +1,51 @@
+const fetch = require("node-fetch");
+const is = require("electron-is");
+const { ipcMain } = require("electron");
+
+const defaultConfig = require("../../config/defaults");
+const { sortSegments } = require("./segments");
+
+let videoID;
+
+module.exports = (win, options) => {
+	const { apiURL, categories } = {
+		...defaultConfig.plugins.sponsorblock,
+		...options,
+	};
+
+	ipcMain.on("video-src-changed", async (_, data) => {
+		videoID = JSON.parse(data)?.videoDetails?.videoId;
+		const segments = await fetchSegments(apiURL, categories);
+		win.webContents.send("sponsorblock-skip", segments);
+	});
+};
+
+
+const fetchSegments = async (apiURL, categories) => {
+	const sponsorBlockURL = `${apiURL}/api/skipSegments?videoID=${videoID}&categories=${JSON.stringify(
+		categories
+	)}`;
+	try {
+		const resp = await fetch(sponsorBlockURL, {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+			},
+			redirect: "follow",
+		});
+		if (resp.status !== 200) {
+			return [];
+		}
+		const segments = await resp.json();
+		const sortedSegments = sortSegments(
+			segments.map((submission) => submission.segment)
+		);
+
+		return sortedSegments;
+	} catch (e) {
+		if (is.dev()) {
+			console.log('error on sponsorblock request:', e);
+		}
+		return [];
+	}
+};

plugins/sponsorblock/front.js

@@ -0,0 +1,31 @@
+const { ipcRenderer } = require("electron");
+
+const is = require("electron-is");
+
+let currentSegments = [];
+
+module.exports = () => {
+	ipcRenderer.on("sponsorblock-skip", (_, segments) => {
+		currentSegments = segments;
+	});
+
+	document.addEventListener('apiLoaded', () => {
+		const video = document.querySelector('video');
+
+		video.addEventListener('timeupdate', e => {
+			currentSegments.forEach((segment) => {
+				if (
+					e.target.currentTime >= segment[0] &&
+					e.target.currentTime < segment[1]
+				) {
+					e.target.currentTime = segment[1];
+					if (is.dev()) {
+						console.log("SponsorBlock: skipping segment", segment);
+					}
+				}
+			});
+		})
+		// Reset segments on song end
+		video.addEventListener('emptied', () => currentSegments = []);
+	}, { once: true, passive: true })
+};

plugins/sponsorblock/segments.js

@@ -0,0 +1,29 @@
+// Segments are an array [ [start, end], … ]
+module.exports.sortSegments = (segments) => {
+	segments.sort((segment1, segment2) =>
+		segment1[0] === segment2[0]
+			? segment1[1] - segment2[1]
+			: segment1[0] - segment2[0]
+	);
+
+	const compiledSegments = [];
+	let currentSegment;
+
+	segments.forEach((segment) => {
+		if (!currentSegment) {
+			currentSegment = segment;
+			return;
+		}
+
+		if (currentSegment[1] < segment[0]) {
+			compiledSegments.push(currentSegment);
+			currentSegment = segment;
+			return;
+		}
+
+		currentSegment[1] = Math.max(currentSegment[1], segment[1]);
+	});
+	compiledSegments.push(currentSegment);
+
+	return compiledSegments;
+};

plugins/sponsorblock/tests/segments.test.js

@@ -0,0 +1,34 @@
+const { sortSegments } = require("../segments");
+
+test("Segment sorting", () => {
+	expect(
+		sortSegments([
+			[0, 3],
+			[7, 8],
+			[5, 6],
+		])
+	).toEqual([
+		[0, 3],
+		[5, 6],
+		[7, 8],
+	]);
+
+	expect(
+		sortSegments([
+			[0, 5],
+			[6, 8],
+			[4, 6],
+		])
+	).toEqual([[0, 8]]);
+
+	expect(
+		sortSegments([
+			[0, 6],
+			[7, 8],
+			[4, 6],
+		])
+	).toEqual([
+		[0, 6],
+		[7, 8],
+	]);
+});

plugins/tuna-obs/back.js

@@ -0,0 +1,52 @@
+const { ipcMain } = require("electron");
+const fetch = require('node-fetch');
+
+const registerCallback = require("../../providers/song-info");
+
+const secToMilisec = t => Math.round(Number(t) * 1e3);
+const data = {
+	cover_url: '',
+	title: '',
+	artists: [],
+	status: '',
+	progress: 0,
+	duration: 0,
+	album_url: '',
+	album: undefined
+};
+
+const post = async (data) => {
+	const port = 1608;
+	headers = {
+		'Content-Type': 'application/json',
+		'Accept': 'application/json',
+		'Access-Control-Allow-Headers': '*',
+		'Access-Control-Allow-Origin': '*'
+	}
+	const url = `http://localhost:${port}/`;
+	fetch(url, { method: 'POST', headers, body: JSON.stringify({ data }) }).catch(e => console.log(`Error: '${e.code || e.errno}' - when trying to access obs-tuna webserver at port ${port}`));
+}
+
+module.exports = async (win) => {
+	ipcMain.on('timeChanged', async (_, t) => {
+		if (!data.title) return;
+		data.progress = secToMilisec(t);
+		post(data);
+	});
+
+	registerCallback((songInfo) => {
+		if (!songInfo.title && !songInfo.artist) {
+			return;
+		}
+
+		data.duration = secToMilisec(songInfo.songDuration)
+		data.progress = secToMilisec(songInfo.elapsedSeconds)
+		data.cover_url = songInfo.imageSrc;
+		data.album_url = songInfo.imageSrc;
+		data.title = songInfo.title;
+		data.artists = [songInfo.artist];
+		data.status = songInfo.isPaused ? 'stopped' : 'playing';
+		data.album = songInfo.album;
+		post(data);
+	})
+}

plugins/utils.js

@@ -42,15 +42,22 @@ module.exports.fileExists = (path, callbackIfExists) => {
 	});
 };
 
+const cssToInject = new Map();
 module.exports.injectCSS = (webContents, filepath, cb = undefined) => {
-	webContents.on("did-finish-load", async () => {
-		await webContents.insertCSS(fs.readFileSync(filepath, "utf8"));
-		if (cb) {
-			cb();
-		}
-	});
+	if (!cssToInject.size) setupCssInjection(webContents);
+
+	cssToInject.set(filepath, cb);
 };
 
+const setupCssInjection = (webContents) => {
+	webContents.on("did-finish-load", () => {
+		cssToInject.forEach(async (cb, filepath) => {
+			await webContents.insertCSS(fs.readFileSync(filepath, "utf8"));
+			cb?.();
+		})
+	});
+}
+
 module.exports.getAllPlugins = () => {
 	const isDirectory = (source) => fs.lstatSync(source).isDirectory();
 	return fs

plugins/video-toggle/back.js

@@ -0,0 +1,10 @@
+const { injectCSS } = require("../utils");
+const path = require("path");
+
+module.exports = (win, options) => {
+	if (options.forceHide) {
+		injectCSS(win.webContents, path.join(__dirname, "force-hide.css"));
+	} else if (!options.mode || options.mode === "custom") {
+		injectCSS(win.webContents, path.join(__dirname, "button-switcher.css"));
+	}
+};

plugins/video-toggle/button-switcher.css

@@ -0,0 +1,82 @@
+#main-panel.ytmusic-player-page {
+    align-items: unset !important;
+}
+
+.video-switch-button {
+    z-index: 999;
+    box-sizing: border-box;
+    padding: 0;
+    margin-top: 20px;
+    margin-left: 10px;
+    background: rgba(33, 33, 33, 0.4);
+    border-radius: 30px;
+    overflow: hidden;
+    width: 240px;
+    text-align: center;
+    font-size: 18px;
+    letter-spacing: 1px;
+    color: #fff;
+    padding-right: 120px;
+    position: absolute;
+}
+
+.video-switch-button:before {
+    content: "Video";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    width: 120px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 3;
+    pointer-events: none;
+}
+
+.video-switch-button-checkbox {
+    cursor: pointer;
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+    z-index: 2;
+}
+
+.video-switch-button-label-span {
+    position: relative;
+}
+
+.video-switch-button-checkbox:checked+.video-switch-button-label:before {
+    transform: translateX(120px);
+    transition: transform 300ms linear;
+}
+
+.video-switch-button-checkbox+.video-switch-button-label {
+    position: relative;
+    padding: 15px 0;
+    display: block;
+    user-select: none;
+    pointer-events: none;
+}
+
+.video-switch-button-checkbox+.video-switch-button-label:before {
+    content: "";
+    background: rgba(60, 60, 60, 0.4);
+    height: 100%;
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    border-radius: 30px;
+    transform: translateX(0);
+    transition: transform 300ms;
+}
+
+/* disable the native toggler */
+#av-id {
+	display: none;
+}

plugins/video-toggle/front.js

@@ -0,0 +1,127 @@
+const { ElementFromFile, templatePath } = require("../utils");
+
+const { setOptions, isEnabled } = require("../../config/plugins");
+
+const moveVolumeHud = isEnabled("precise-volume") ? require("../precise-volume/front").moveVolumeHud : ()=>{};
+
+function $(selector) { return document.querySelector(selector); }
+
+let options, player, video, api;
+
+const switchButtonDiv = ElementFromFile(
+    templatePath(__dirname, "button_template.html")
+);
+
+module.exports = (_options) => {
+    if (_options.forceHide) return;
+    switch (_options.mode) {
+        case "native": {
+            $("ytmusic-player-page").setAttribute("has-av-switcher");
+            $("ytmusic-player").setAttribute("has-av-switcher");
+            return;
+        }
+        case "disabled": {
+            $("ytmusic-player-page").removeAttribute("has-av-switcher");
+            $("ytmusic-player").removeAttribute("has-av-switcher");
+            return;
+        }
+        default:
+        case "custom": {
+            options = _options;
+            document.addEventListener("apiLoaded", setup, { once: true, passive: true });
+        }
+    }
+};
+
+function setup(e) {
+    api = e.detail;
+    player = $('ytmusic-player');
+    video = $('video');
+
+    $('ytmusic-player-page').prepend(switchButtonDiv);
+
+    if (options.hideVideo) {
+        $('.video-switch-button-checkbox').checked = false;
+        changeDisplay(false);
+        forcePlaybackMode();
+        // fix black video
+        video.style.height = "auto";
+    }
+
+    // button checked = show video
+    switchButtonDiv.addEventListener('change', (e) => {
+        options.hideVideo = !e.target.checked;
+        changeDisplay(e.target.checked);
+        setOptions("video-toggle", options);
+    })
+
+    video.addEventListener('srcChanged', videoStarted);
+
+    observeThumbnail();
+}
+
+function changeDisplay(showVideo) {
+    player.style.margin = showVideo ? '' : 'auto 0px';
+    player.setAttribute('playback-mode', showVideo ? 'OMV_PREFERRED' : 'ATV_PREFERRED');
+
+    $('#song-video.ytmusic-player').style.display = showVideo ? 'block' : 'none';
+    $('#song-image').style.display = showVideo ? 'none' : 'block';
+
+    if (showVideo && !video.style.top) {
+        video.style.top = `${(player.clientHeight - video.clientHeight) / 2}px`;
+    }
+    moveVolumeHud(showVideo);
+}
+
+function videoStarted() {
+    if (api.getPlayerResponse().videoDetails.musicVideoType !== 'MUSIC_VIDEO_TYPE_ATV') {
+        // switch to high res thumbnail
+        forceThumbnail($('#song-image img'));
+        // show toggle button
+        switchButtonDiv.style.display = "initial";
+        // change display to video mode if video exist & video is hidden & option.hideVideo = false
+        if (!options.hideVideo && $('#song-video.ytmusic-player').style.display === "none") {
+            changeDisplay(true);
+        } else {
+            moveVolumeHud(!options.hideVideo);
+        }
+    } else {
+        // video doesn't exist -> switch to song mode
+        changeDisplay(false);
+        // hide toggle button
+        switchButtonDiv.style.display = "none";
+    }
+}
+
+// on load, after a delay, the page overrides the playback-mode to 'OMV_PREFERRED' which causes weird aspect ratio in the image container
+// this function fix the problem by overriding that override :)
+function forcePlaybackMode() {
+    const playbackModeObserver = new MutationObserver(mutations => {
+        mutations.forEach(mutation => {
+            if (mutation.target.getAttribute('playback-mode') !== "ATV_PREFERRED") {
+                playbackModeObserver.disconnect();
+                mutation.target.setAttribute('playback-mode', "ATV_PREFERRED");
+            }
+        });
+    });
+    playbackModeObserver.observe(player, { attributeFilter: ["playback-mode"] });
+}
+
+function observeThumbnail() {
+    const playbackModeObserver = new MutationObserver(mutations => {
+        if (!player.videoMode_) return;
+
+        mutations.forEach(mutation => {
+            if (!mutation.target.src.startsWith('data:')) return;
+            forceThumbnail(mutation.target)
+        });
+    });
+    playbackModeObserver.observe($('#song-image img'), { attributeFilter: ["src"] })
+}
+
+function forceThumbnail(img) {
+    const thumbnails = $('#movie_player').getPlayerResponse()?.videoDetails?.thumbnail?.thumbnails;
+    if (thumbnails && thumbnails.length > 0) {
+        img.src = thumbnails[thumbnails.length - 1].url.split("?")[0];
+    }
+}

plugins/video-toggle/menu.js

@@ -0,0 +1,45 @@
+const { setMenuOptions } = require("../../config/plugins");
+
+module.exports = (win, options) => [
+    {
+        label: "Mode",
+        submenu: [
+            {
+                label: "Custom toggle",
+                type: "radio",
+                checked: options.mode === 'custom',
+                click: () => {
+                    options.mode = 'custom';
+                    setMenuOptions("video-toggle", options);
+                }
+            },
+            {
+                label: "Native toggle",
+                type: "radio",
+                checked: options.mode === 'native',
+                click: () => {
+                    options.mode = 'native';
+                    setMenuOptions("video-toggle", options);
+                }
+            },
+            {
+                label: "Disabled",
+                type: "radio",
+                checked: options.mode === 'disabled',
+                click: () => {
+                    options.mode = 'disabled';
+                    setMenuOptions("video-toggle", options);
+                }
+            },
+        ]
+    },
+    {
+        label: "Force Remove Video Tab",
+        type: "checkbox",
+        checked: options.forceHide,
+        click: item => {
+            options.forceHide = item.checked;
+            setMenuOptions("video-toggle", options);
+        }
+    }
+];

plugins/video-toggle/templates/button_template.html

@@ -0,0 +1,4 @@
+<div class="video-switch-button">
+    <input class="video-switch-button-checkbox" type="checkbox" checked="true"></input>
+    <label class="video-switch-button-label" for=""><span class="video-switch-button-label-span">Song</span></label>
+</div>

preload.js

@@ -1,15 +1,17 @@
 const path = require("path");
 
-const { remote } = require("electron");
+const remote = require('@electron/remote');
 
 const config = require("./config");
 const { fileExists } = require("./plugins/utils");
 const setupFrontLogger = require("./providers/front-logger");
-const setupSongControl = require("./providers/song-controls-front");
 const setupSongInfo = require("./providers/song-info-front");
+const { setupSongControls } = require("./providers/song-controls-front");
 
 const plugins = config.plugins.getEnabled();
 
+let api;
+
 plugins.forEach(([plugin, options]) => {
 	const preloadPath = path.join(__dirname, "plugins", plugin, "preload.js");
 	fileExists(preloadPath, () => {
@@ -38,11 +40,14 @@ document.addEventListener("DOMContentLoaded", () => {
 		});
 	});
 
+	// wait for complete load of youtube api
+	listenForApiLoad();
+
 	// inject song-info provider
 	setupSongInfo();
 
-	// inject song-control provider
-	setupSongControl();
+	// inject song-controls
+	setupSongControls();
 
 	// inject front logger
 	setupFrontLogger();
@@ -50,4 +55,45 @@ document.addEventListener("DOMContentLoaded", () => {
 	// Add action for reloading
 	global.reload = () =>
 		remote.getCurrentWindow().webContents.loadURL(config.get("url"));
+
+	// Blocks the "Are You Still There?" popup by setting the last active time to Date.now every 15min
+	setInterval(() => window._lact = Date.now(), 900000);
 });
+
+function listenForApiLoad() {
+	api = document.querySelector('#movie_player');
+	if (api) {
+		onApiLoaded();
+		return;
+	}
+
+	const observer = new MutationObserver(() => {
+		api = document.querySelector('#movie_player');
+		if (api) {
+			observer.disconnect();
+			onApiLoaded();
+		}
+	})
+
+	observer.observe(document.documentElement, { childList: true, subtree: true });
+}
+
+function onApiLoaded() {
+	document.dispatchEvent(new CustomEvent('apiLoaded', { detail: api }));
+
+	// Remove upgrade button
+	if (config.get("options.removeUpgradeButton")) {
+		const upgradeButton = document.querySelector('ytmusic-pivot-bar-item-renderer[tab-id="SPunlimited"]')
+		if (upgradeButton) {
+			upgradeButton.style.display = "none";
+		}
+	}
+
+	// Force show like buttons
+	if (config.get("options.ForceShowLikeButtons")) {
+		const likeButtons = document.querySelector('ytmusic-like-button-renderer')
+		if (likeButtons) {
+			likeButtons.style.display = 'inherit';
+		}
+	}
+}

providers/app-controls.js

@@ -0,0 +1,6 @@
+const app = require("electron").app || require('@electron/remote').app;
+
+module.exports.restart = () => {
+    app.relaunch(); 
+ 	app.exit(); 
+};

providers/dom-elements.js

@@ -1,23 +1,4 @@
-let domElements = {};
-
-const watchDOMElement = (name, selectorFn, cb) => {
-	const observer = new MutationObserver((mutations, observer) => {
-		if (!domElements[name]) {
-			domElements[name] = selectorFn(document);
-		}
-
-		if (domElements[name]) {
-			cb(domElements[name]);
-		}
-	});
-
-	observer.observe(document, {
-		childList: true,
-		subtree: true,
-	});
-};
-
 const getSongMenu = () =>
 	document.querySelector("ytmusic-menu-popup-renderer tp-yt-paper-listbox");
 
-module.exports = { getSongMenu, watchDOMElement };
+module.exports = { getSongMenu };

providers/prompt-custom-titlebar.js

@@ -0,0 +1,14 @@
+const { Titlebar, Color } = require("custom-electron-titlebar");
+
+module.exports = () => {
+	new Titlebar({
+		backgroundColor: Color.fromHex("#050505"),
+		minimizable: false,
+		maximizable: false,
+		menu: null
+	});
+	const mainStyle = document.querySelector("#container").style;
+	mainStyle.width = "100%";
+	mainStyle.position = "fixed";
+	mainStyle.border = "unset";
+};

providers/prompt-options.js

@@ -0,0 +1,18 @@
+const path = require("path");
+const is = require("electron-is");
+const { isEnabled } = require("../config/plugins");
+
+const iconPath = path.join(__dirname, "..", "assets", "youtube-music-tray.png");
+const customTitlebarPath = path.join(__dirname, "prompt-custom-titlebar.js");
+
+const promptOptions = !is.macOS() && isEnabled("in-app-menu") ? {
+    customStylesheet: "dark",
+    // The following are used for custom titlebar
+    frame: false,
+    customScript: customTitlebarPath,
+} : {
+    customStylesheet: "dark",
+    icon: iconPath
+};
+
+module.exports = () => promptOptions;

providers/song-controls-front.js

@@ -1,18 +1,13 @@
 const { ipcRenderer } = require("electron");
+const config = require("../config");
+const is = require("electron-is");
 
-let videoStream = document.querySelector(".video-stream");
-module.exports = () => {
-    ipcRenderer.on("playPause", () => {
-        if (!videoStream) {
-            videoStream = document.querySelector(".video-stream");
+module.exports.setupSongControls = () => {
+    document.addEventListener('apiLoaded', e => {
+        ipcRenderer.on("seekTo", (_, t) => e.detail.seekTo(t));
+        ipcRenderer.on("seekBy", (_, t) => e.detail.seekBy(t));
+        if (is.linux() && config.plugins.isEnabled('shortcuts')) { // MPRIS Enabled
+            document.querySelector('video').addEventListener('seeked', v => ipcRenderer.send('seeked', v.target.currentTime));
         }
-
-        if (videoStream.paused) {
-            videoStream.play();
-        } else {
-            videoStream.yns_pause ?
-                videoStream.yns_pause() :
-                videoStream.pause();
-        }
-    });
+    }, { once: true, passive: true })
 };

providers/song-controls.js

@@ -12,9 +12,9 @@ module.exports = (win) => {
 		// Playback
 		previous: () => pressKey(win, "k"),
 		next: () => pressKey(win, "j"),
-		playPause: () => win.webContents.send("playPause"),
-		like: () => pressKey(win, "_"),
-		dislike: () => pressKey(win, "+"),
+		playPause: () => pressKey(win, "space"),
+		like: () => pressKey(win, "+"),
+		dislike: () => pressKey(win, "_"),
 		go10sBack: () => pressKey(win, "h"),
 		go10sForward: () => pressKey(win, "l"),
 		go1sBack: () => pressKey(win, "h", ["shift"]),
@@ -24,8 +24,6 @@ module.exports = (win) => {
 		// General
 		volumeMinus10: () => pressKey(win, "-"),
 		volumePlus10: () => pressKey(win, "="),
-		dislikeAndNext: () => pressKey(win, "-", ["shift"]),
-		like: () => pressKey(win, "=", ["shift"]),
 		fullscreen: () => pressKey(win, "f"),
 		muteUnmute: () => pressKey(win, "m"),
 		maximizeMinimisePlayer: () => pressKey(win, "q"),
@@ -38,14 +36,14 @@ module.exports = (win) => {
 			pressKey(win, "g");
 			pressKey(win, "l");
 		},
-		goToHotlist: () => {
-			pressKey(win, "g");
-			pressKey(win, "t");
-		},
 		goToSettings: () => {
 			pressKey(win, "g");
 			pressKey(win, ",");
 		},
+		goToExplore: () => {
+			pressKey(win, "g");
+			pressKey(win, "e");
+		},
 		search: () => pressKey(win, "/"),
 		showShortcuts: () => pressKey(win, "/", ["shift"]),
 	};

providers/song-info-front.js

@@ -1,31 +1,65 @@
 const { ipcRenderer } = require("electron");
-
+const is = require('electron-is');
 const { getImage } = require("./song-info");
 
+const config = require("../config");
+
 global.songInfo = {};
 
+const $ = s => document.querySelector(s);
+const $$ = s => Array.from(document.querySelectorAll(s));
+
 ipcRenderer.on("update-song-info", async (_, extractedSongInfo) => {
 	global.songInfo = JSON.parse(extractedSongInfo);
 	global.songInfo.image = await getImage(global.songInfo.imageSrc);
 });
 
-const injectListener = () => {
-	const oldXHR = window.XMLHttpRequest;
-	function newXHR() {
-		const realXHR = new oldXHR();
-		realXHR.addEventListener(
-			"readystatechange",
-			() => {
-				if (realXHR.readyState === 4 && realXHR.status === 200
-					&& realXHR.responseURL.includes("/player")) {
-						// if the request contains the song info, send the response to ipcMain
-						ipcRenderer.send("song-info-request", realXHR.responseText);
+// used because 'loadeddata' or 'loadedmetadata' weren't firing on song start for some users (https://github.com/th-ch/youtube-music/issues/473)
+const srcChangedEvent = new CustomEvent('srcChanged');
+
+module.exports = () => {
+	document.addEventListener('apiLoaded', apiEvent => {
+		if (config.plugins.isEnabled('tuna-obs') ||
+			(is.linux() && config.plugins.isEnabled('shortcuts'))) {
+			setupTimeChangeListener();
+		}
+		const video = $('video');
+		// name = "dataloaded" and abit later "dataupdated"
+		apiEvent.detail.addEventListener('videodatachange', (name, _dataEvent) => {
+			if (name !== 'dataloaded') return;
+			video.dispatchEvent(srcChangedEvent);
+			sendSongInfo();
+		})
+
+		for (const status of ['playing', 'pause']) {
+			video.addEventListener(status, e => {
+				if (Math.round(e.target.currentTime) > 0) {
+					ipcRenderer.send("playPaused", {
+						isPaused: status === 'pause',
+						elapsedSeconds: Math.floor(e.target.currentTime)
+					});
 				}
-			},
-			false
-		);
-		return realXHR;
-	}
-	window.XMLHttpRequest = newXHR;
+			});
+		}
+
+		function sendSongInfo() {
+			const data = apiEvent.detail.getPlayerResponse();
+
+			data.videoDetails.album = $$(
+				".byline.ytmusic-player-bar > .yt-simple-endpoint"
+			).find(e => e.href?.includes("browse"))?.textContent;
+
+			data.videoDetails.elapsedSeconds = Math.floor(video.currentTime);
+			data.videoDetails.isPaused = false;
+			ipcRenderer.send("video-src-changed", JSON.stringify(data));
+		}
+	}, { once: true, passive: true });
 };
-module.exports = injectListener;
+
+function setupTimeChangeListener() {
+	const progressObserver = new MutationObserver(mutations => {
+		ipcRenderer.send('timeChanged', mutations[0].target.value);
+		global.songInfo.elapsedSeconds = mutations[0].target.value;
+	});
+	progressObserver.observe($('#progress-bar'), { attributeFilter: ["value"] })
+}

providers/song-info.js

@@ -2,41 +2,12 @@ const { ipcMain, nativeImage } = require("electron");
 
 const fetch = require("node-fetch");
 
-// This selects the progress bar, used for current progress
-const progressSelector = "#progress-bar";
-
-
-// Grab the progress using the selector
-const getProgress = async (win) => {
-	// Get current value of the progressbar element
-	const elapsedSeconds = await win.webContents.executeJavaScript(
-		'document.querySelector("' + progressSelector + '").value'
-	);
-
-	return elapsedSeconds;
-};
-
-// Grab the native image using the src
-const getImage = async (src) => {
-	const result = await fetch(src);
-	const buffer = await result.buffer();
-	return nativeImage.createFromBuffer(buffer);
-};
-
-// To find the paused status, we check if the title contains `-`
-const getPausedStatus = async (win) => {
-	const title = await win.webContents.executeJavaScript("document.title");
-	return !title.includes("-");
-};
-
-const getArtist = async (win) => {
-	return await win.webContents.executeJavaScript(`
-		document.querySelector(".subtitle.ytmusic-player-bar .yt-formatted-string")
-			?.textContent
-	`);
-}
+const config = require("../config");
 
 // Fill songInfo with empty values
+/**
+ * @typedef {songInfo} SongInfo
+ */
 const songInfo = {
 	title: "",
 	artist: "",
@@ -48,68 +19,115 @@ const songInfo = {
 	songDuration: 0,
 	elapsedSeconds: 0,
 	url: "",
+	album: undefined,
+	videoId: "",
+	playlistId: "",
+};
+
+// Grab the native image using the src
+const getImage = async (src) => {
+	const result = await fetch(src);
+	const buffer = await result.buffer();
+	const output = nativeImage.createFromBuffer(buffer);
+	if (output.isEmpty() && !src.endsWith(".jpg") && src.includes(".jpg")) { // fix hidden webp files (https://github.com/th-ch/youtube-music/issues/315)
+		return getImage(src.slice(0, src.lastIndexOf(".jpg") + 4));
+	} else {
+		return output;
+	}
 };
 
 const handleData = async (responseText, win) => {
-	let data = JSON.parse(responseText);
-	songInfo.title = data?.videoDetails?.title;
-	songInfo.artist = await getArtist(win) || cleanupArtistName(data?.videoDetails?.author);
-	songInfo.views = data?.videoDetails?.viewCount;
-	songInfo.imageSrc = data?.videoDetails?.thumbnail?.thumbnails?.pop()?.url;
-	songInfo.songDuration = data?.videoDetails?.lengthSeconds;
-	songInfo.image = await getImage(songInfo.imageSrc);
-	songInfo.uploadDate = data?.microformat?.microformatDataRenderer?.uploadDate;
-	songInfo.url = data?.microformat?.microformatDataRenderer?.urlCanonical;
+	const data = JSON.parse(responseText);
+	if (!data) return;
 
-	win.webContents.send("update-song-info", JSON.stringify(songInfo));
+	const microformat = data.microformat?.microformatDataRenderer;
+	if (microformat) {
+		songInfo.uploadDate = microformat.uploadDate;
+		songInfo.url = microformat.urlCanonical?.split("&")[0];
+		songInfo.playlistId = new URL(microformat.urlCanonical).searchParams.get("list");
+		// used for options.resumeOnStart
+		config.set("url", microformat.urlCanonical);
+	}
+
+	const videoDetails = data.videoDetails;
+	if (videoDetails) {
+		songInfo.title = cleanupName(videoDetails.title);
+		songInfo.artist = cleanupName(videoDetails.author);
+		songInfo.views = videoDetails.viewCount;
+		songInfo.songDuration = videoDetails.lengthSeconds;
+		songInfo.elapsedSeconds = videoDetails.elapsedSeconds;
+		songInfo.isPaused = videoDetails.isPaused;
+		songInfo.videoId = videoDetails.videoId;
+		songInfo.album = data?.videoDetails?.album; // Will be undefined if video exist
+
+		const oldUrl = songInfo.imageSrc;
+		songInfo.imageSrc = videoDetails.thumbnail?.thumbnails?.pop()?.url.split("?")[0];
+		if (oldUrl !== songInfo.imageSrc) {
+			songInfo.image = await getImage(songInfo.imageSrc);
+		}
+
+		win.webContents.send("update-song-info", JSON.stringify(songInfo));
+	}
 };
 
 // This variable will be filled with the callbacks once they register
 const callbacks = [];
 
 // This function will allow plugins to register callback that will be triggered when data changes
+/**
+ * @callback songInfoCallback
+ * @param {songInfo} songInfo
+ * @returns {void}
+ */
+/**
+ * @param {songInfoCallback} callback
+ */
 const registerCallback = (callback) => {
 	callbacks.push(callback);
 };
 
+let handlingData = false;
+
 const registerProvider = (win) => {
-	win.on("page-title-updated", async () => {
-		// Get and set the new data
-		songInfo.isPaused = await getPausedStatus(win);
-
-		const elapsedSeconds = await getProgress(win);
-		songInfo.elapsedSeconds = elapsedSeconds;
-
-		// Trigger the callbacks
-		callbacks.forEach((c) => {
-			c(songInfo);
-		});
-	});
-
 	// This will be called when the song-info-front finds a new request with song data
-	ipcMain.on("song-info-request", async (_, responseText) => {
+	ipcMain.on("video-src-changed", async (_, responseText) => {
+		handlingData = true;
 		await handleData(responseText, win);
+		handlingData = false;
 		callbacks.forEach((c) => {
 			c(songInfo);
 		});
 	});
+	ipcMain.on("playPaused", (_, { isPaused, elapsedSeconds }) => {
+		songInfo.isPaused = isPaused;
+		songInfo.elapsedSeconds = elapsedSeconds;
+		if (handlingData) return;
+		callbacks.forEach((c) => {
+			c(songInfo);
+		});
+	})
 };
 
-const suffixesToRemove = [' - Topic', 'VEVO'];
-function cleanupArtistName(artist) {
-	if (!artist) {
-		return artist;
-	}
+const suffixesToRemove = [
+	" - topic",
+	"vevo",
+	" (performance video)",
+	" (clip officiel)",
+];
+
+function cleanupName(name) {
+	if (!name) return name;
+	name = name.replace(/\((?:official)?[ ]?(?:music)?[ ]?(?:lyric[s]?)?[ ]?(?:video)?\)$/i, '')
+	const lowCaseName = name.toLowerCase();
 	for (const suffix of suffixesToRemove) {
-		if (artist.endsWith(suffix)) {
-			return artist.slice(0, -suffix.length);
+		if (lowCaseName.endsWith(suffix)) {
+			return name.slice(0, -suffix.length);
 		}
 	}
-	return artist;
+	return name;
 }
 
 module.exports = registerCallback;
 module.exports.setupSongInfo = registerProvider;
 module.exports.getImage = getImage;
-module.exports.cleanupArtistName = cleanupArtistName;
-
+module.exports.cleanupName = cleanupName;

readme.md

@@ -35,15 +35,63 @@ Install the `youtube-music-bin` package from the AUR. For AUR installation instr
 
 ## Available plugins:
 
-- **Ad Blocker**: block all ads and tracking out of the box
-- **Downloader**: download to MP3 directly from the interface (youtube-dl)
-- **No Google Login**: remove Google login buttons and links from the interface
-- **Shortcuts**: use your usual shortcuts (media keys, Ctrl/CMD + F…) to control YouTube Music
-- **Navigation**: next/back navigation arrows directly integrated in the interface, like in your favorite browser
-- **Auto confirm when paused**: when the "Continue Watching?" modal appears, automatically click "Yes"
-- **Hide video player**: no video in the interface when playing music
-- **Notifications**: display a notification when a song starts playing
-- **Touchbar**: custom TouchBar layout for macOS
+- **Ad Blocker**: Block all ads and tracking out of the box
+
+- **Audio Compressor**: Apply compression to audio (lowers the volume of the loudest parts of the signal and raises the volume of the softest parts)
+
+- **Blur Nav Bar**: makes navigation bar transparent and blurry
+
+- **Bypass age restrictions**: bypass YouTube's age verification
+
+- **Disable Autoplay**: Makes every song start in "paused" mode
+
+- [**Discord**](https://discord.com/): Show your friends what you listen to with [Rich Presence](https://user-images.githubusercontent.com/28219076/104362104-a7a0b980-5513-11eb-9744-bb89eabe0016.png)
+
+- **Downloader**: downloads MP3 [directly from the interface](https://user-images.githubusercontent.com/61631665/129977677-83a7d067-c192-45e1-98ae-b5a4927393be.png) [(youtube-dl)](https://github.com/ytdl-org/youtube-dl)
+
+- **Exponential Volume**: Makes the volume slider [exponential](https://greasyfork.org/en/scripts/397686-youtube-music-fix-volume-ratio/) so it's easier to select lower volumes.
+
+- **In-App Menu**: [gives bars a fancy, dark look](https://user-images.githubusercontent.com/78568641/112215894-923dbf00-8c29-11eb-95c3-3ce15db27eca.png)
+
+  > (see [this post](https://github.com/th-ch/youtube-music/issues/410#issuecomment-952060709) if you have problem accessing the menu after enabling this plugin and hide-menu option)
+
+- [**Last.fm**](https://www.last.fm/): Scrobbles support
+
+- **Lyrics Genius**: Adds lyrics support for most songs
+
+- **Navigation**: Next/Back navigation arrows directly integrated in the interface, like in your favorite browser
+
+- **No Google Login**: Remove Google login buttons and links from the interface
+
+- **Notifications**: Display a notification when a song starts playing ([interactive notifications](https://user-images.githubusercontent.com/78568641/114102651-63ce0e00-98d0-11eb-9dfe-c5a02bb54f9c.png) are available on windows)
+
+- **Picture in picture**: allows to switch the app to picture-in-picture mode
+
+- **Playback Speed**: Listen fast, listen slow! [Adds a slider that controls song speed](https://user-images.githubusercontent.com/61631665/129976003-e55db5ba-bf42-448c-a059-26a009775e68.png)
+
+- **Precise Volume**: Control the volume precisely using mousewheel/hotkeys, with a custom hud and customizable volume steps
+
+- **Quality Changer**: Allows changing the video quality with a [button](https://user-images.githubusercontent.com/78568641/138574366-70324a5e-2d64-4f6a-acdd-dc2a2b9cecc5.png) on the video overlay
+
+- **Shortcuts**: Allows setting global hotkeys for playback (play/pause/next/previous) + disable [media osd](https://user-images.githubusercontent.com/84923831/128601225-afa38c1f-dea8-4209-9f72-0f84c1dd8b54.png) by overriding media keys + enable Ctrl/CMD + F to search + enable linux mpris support for mediakeys + [custom hotkeys](https://github.com/Araxeus/youtube-music/blob/1e591d6a3df98449bcda6e63baab249b28026148/providers/song-controls.js#L13-L50) for [advanced users](https://github.com/th-ch/youtube-music/issues/106#issuecomment-952156902)
+
+- **Skip-Silences** - Automatically skip silenced sections
+
+- [**SponsorBlock**](https://github.com/ajayyy/SponsorBlock): Automatically Skips non-music parts like intro/outro or parts of music videos where the song isn't playing
+
+- **Taskbar Media Control**: Control playback from your [Windows taskbar](https://user-images.githubusercontent.com/78568641/111916130-24a35e80-8a82-11eb-80c8-5021c1aa27f4.png)
+
+- **Touchbar**: Custom TouchBar layout for macOS
+
+- **Tuna-OBS**: Integration with [OBS](https://obsproject.com/)'s plugin [Tuna](https://obsproject.com/forum/resources/tuna.843/)
+
+- **Video Toggle**: Adds a button to switch between Video/Song mode. can also optionally remove the whole video tab
+
+---
+
+- **Auto confirm when paused** (Always Enabled): disable the ["Continue Watching?"](https://user-images.githubusercontent.com/61631665/129977894-01c60740-7ec6-4bf0-9a2c-25da24491b0e.png) popup that pause music after a certain time
+
+> If using `Hide Menu` option - you can show the menu with the `alt` key (or `escape` if using the in-app-menu plugin)
 
 ## Dev
 
@@ -122,7 +170,7 @@ Builds the app for macOS, Linux, and Windows, using [electron-builder](https://g
 yarn test
 ```
 
-Uses [Spectron](https://www.electronjs.org/spectron) to test the app.
+Uses [Playwright](https://playwright.dev/) to test the app.
 
 ## License
 

tests/environment.js

@@ -1,9 +1,7 @@
 const path = require("path");
 
-const getPort = require("get-port");
 const NodeEnvironment = require("jest-environment-node");
-const electronPath = require("electron");
-const { Application } = require("spectron");
+const { _electron: electron } = require("playwright");
 
 class TestEnvironment extends NodeEnvironment {
 	constructor(config) {
@@ -14,21 +12,12 @@ class TestEnvironment extends NodeEnvironment {
 		await super.setup();
 
 		const appPath = path.resolve(__dirname, "..");
-		const port = await getPort();
-
-		this.global.__APP__ = new Application({
-			path: electronPath,
-			args: [appPath],
-			port,
-		});
-		await this.global.__APP__.start();
-		const { client } = this.global.__APP__;
-		await client.waitUntilWindowLoaded();
+		this.global.__APP__ = await electron.launch({ args: [appPath] });
 	}
 
 	async teardown() {
-		if (this.global.__APP__.isRunning()) {
-			await this.global.__APP__.stop();
+		if (this.global.__APP__) {
+			await this.global.__APP__.close();
 		}
 		await super.teardown();
 	}

tests/index.test.js

@@ -1,23 +1,16 @@
+/**
+ * @jest-environment ./tests/environment
+ */
+
 describe("YouTube Music App", () => {
 	const app = global.__APP__;
 
 	test("With default settings, app is launched and visible", async () => {
-		expect(app.isRunning()).toBe(true);
-
-		const win = app.browserWindow;
-
-		const isMenuVisible = await win.isMenuBarVisible();
-		expect(isMenuVisible).toBe(true);
-
-		const isVisible = await win.isVisible();
-		expect(isVisible).toBe(true);
-
-		const { width, height } = await win.getBounds();
-		expect(width).toBeGreaterThan(0);
-		expect(height).toBeGreaterThan(0);
-
-		const { client } = app;
-		const title = await client.getTitle();
+		const window = await app.firstWindow();
+		const title = await window.title();
 		expect(title).toEqual("YouTube Music");
+
+		const url = window.url();
+		expect(url.startsWith("https://music.youtube.com")).toBe(true);
 	});
 });

tray.js

@@ -1,6 +1,6 @@
 const path = require("path");
 
-const { Menu, nativeImage, Tray } = require("electron");
+const { app, Menu, nativeImage, Tray } = require("electron");
 
 const config = require("./config");
 const getSongControls = require("./providers/song-controls");
@@ -27,7 +27,13 @@ module.exports.setUpTray = (app, win) => {
 		if (config.get("options.trayClickPlayPause")) {
 			playPause();
 		} else {
-			win.isVisible() ? win.hide() : win.show();
+			if (win.isVisible()) {
+				win.hide();
+				app.dock?.hide();
+			} else {
+				win.show();
+				app.dock?.show();
+			}
 		}
 	});
 
@@ -54,6 +60,7 @@ module.exports.setUpTray = (app, win) => {
 			label: "Show",
 			click: () => {
 				win.show();
+				app.dock?.show();
 			},
 		},
 		{
@@ -63,12 +70,7 @@ module.exports.setUpTray = (app, win) => {
 				app.quit();
 			},
 		},
-		{
-			label: "Quit",
-			click: () => {
-				app.quit();
-			},
-		},
+		{ role: "quit" },
 	];
 
 	const trayMenu = Menu.buildFromTemplate(template);

vendor/snoretoast-patch/0001-Fix-activation-not-writing-to-pipe.patch

@@ -0,0 +1,30 @@
+From c5faeceaf36f4b9fb27e5269990b716a25ecbe43 Mon Sep 17 00:00:00 2001
+From: Jake Barnes <me@jakebarn.es>
+Date: Mon, 3 May 2021 11:58:27 +1000
+Subject: [PATCH] Fix activation not writing to pipe
+
+---
+ src/toasteventhandler.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/toasteventhandler.cpp b/src/toasteventhandler.cpp
+index d45d92f..e239dde 100644
+--- a/src/toasteventhandler.cpp
++++ b/src/toasteventhandler.cpp
+@@ -79,6 +79,13 @@ IFACEMETHODIMP ToastEventHandler::Invoke(_In_ IToastNotification * /*sender*/,
+             std::wcout << dataMap.at(L"button") << std::endl;
+             m_userAction = SnoreToastActions::Actions::ButtonClicked;
+         }
++        if (!m_toast.pipeName().empty()) {
++            if (m_userAction == SnoreToastActions::Actions::ButtonClicked) {
++                Utils::writePipe(m_toast.pipeName(), m_toast.formatAction(m_userAction, { { L"button", dataMap.at(L"button") } }));
++            } else {
++                Utils::writePipe(m_toast.pipeName(), m_toast.formatAction(m_userAction));
++            }
++        }
+     }
+     SetEvent(m_event);
+     return S_OK;
+-- 
+2.35.1
+

youtube-music.css

@@ -28,3 +28,14 @@ ytmusic-search-box.ytmusic-nav-bar {
 ytmusic-mealbar-promo-renderer {
 	display: none !important;
 }
+
+/* Disable Image Selection */
+img {
+	-webkit-user-select: none;
+	user-select: none;
+}
+
+/* Hide cast button which doesn't work */
+ytmusic-cast-button {
+	display: none !important;
+}