fix: seek

- auto-change: moved from devDependencies to npx

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: Setup NodeJS for macOS
         if: startsWith(matrix.os, 'macOS')
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
 
@@ -96,14 +96,14 @@ jobs:
 
       - name: Setup NodeJS
         if: startsWith(matrix.os, 'macOS') != true
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'pnpm'
 
       - name: Setup NodeJS for macOS
         if: startsWith(matrix.os, 'macOS')
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
 

changelog.md

@@ -2,8 +2,17 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [v2.2.0](https://github.com/th-ch/youtube-music/compare/v2.1.3...v2.2.0)
+
+- feat(ambient-mode): add config for `ambient-mode` plugin [`#1349`](https://github.com/th-ch/youtube-music/pull/1349)
+- bump deps [`4248d20`](https://github.com/th-ch/youtube-music/commit/4248d20e8ef926ce7b1d07eb83743755a341d9f6)
+- Update changelog for v2.1.3 [`dc73561`](https://github.com/th-ch/youtube-music/commit/dc73561c8a8acfc8ba91aff2dc78e4267869f2fd)
+- Bump version to 2.2.0 [`6288d0b`](https://github.com/th-ch/youtube-music/commit/6288d0b171a65ea015922cdf3af6c7bd9a1f269b)
+
 #### [v2.1.3](https://github.com/th-ch/youtube-music/compare/v2.1.2...v2.1.3)
 
+> 23 October 2023
+
 - fix: fixed bugs in downloader [`#1342`](https://github.com/th-ch/youtube-music/pull/1342)
 - feat(discord): rename `Listen Along` to `Play on YTM` [`#1341`](https://github.com/th-ch/youtube-music/issues/1341)
 - chore(deps): bump deps [`4333891`](https://github.com/th-ch/youtube-music/commit/4333891ccabe42aedf756fd48618be715db13262)

package.json

@@ -94,7 +94,6 @@
     "build": "yarpm-pnpm run rollup:preload && yarpm-pnpm run rollup:main",
     "start": "yarpm-pnpm run build && electron ./dist/index.js",
     "start:debug": "cross-env ELECTRON_ENABLE_LOGGING=1 yarpm-pnpm run start",
-    "postinstall": "patch-package",
     "clean": "del-cli dist && del-cli pack",
     "dist": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --win --mac --linux -p never",
     "dist:linux": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --linux -p never",
@@ -103,7 +102,7 @@
     "dist:win": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --win -p never",
     "dist:win:x64": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --win nsis-web:x64 -p never",
     "lint": "eslint .",
-    "changelog": "auto-changelog",
+    "changelog": "npx --yes auto-changelog",
     "release:linux": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --linux -p always -c.snap.publish=github",
     "release:mac": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --mac -p always",
     "release:win": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --win -p always",
@@ -114,25 +113,25 @@
   },
   "pnpm": {
     "overrides": {
-      "rollup": "4.1.4",
-      "node-gyp": "9.4.0",
+      "rollup": "4.2.0",
+      "node-gyp": "10.0.1",
       "xml2js": "0.6.2",
-      "node-fetch": "2.7.0",
-      "@electron/universal": "1.4.2",
+      "node-fetch": "3.3.2",
+      "@electron/universal": "1.4.4",
       "@babel/runtime": "7.23.2"
     }
   },
   "overrides": {
-    "rollup": "4.1.4",
-    "node-gyp": "9.4.0",
+    "rollup": "4.2.0",
+    "node-gyp": "10.0.1",
     "xml2js": "0.6.2",
-    "node-fetch": "2.7.0",
-    "@electron/universal": "1.4.2",
+    "node-fetch": "3.3.2",
+    "@electron/universal": "1.4.4",
     "@babel/runtime": "7.23.2"
   },
   "dependencies": {
-    "@cliqz/adblocker-electron": "1.26.8",
-    "@cliqz/adblocker-electron-preload": "1.26.8",
+    "@cliqz/adblocker-electron": "1.26.10",
+    "@cliqz/adblocker-electron-preload": "1.26.10",
     "@ffmpeg.wasm/core-mt": "0.12.0",
     "@ffmpeg.wasm/main": "0.12.0",
     "@foobar404/wave": "2.0.4",
@@ -160,10 +159,9 @@
     "simple-youtube-age-restriction-bypass": "git+https://github.com/organization/Simple-YouTube-Age-Restriction-Bypass.git#v2.5.8",
     "vudio": "2.1.1",
     "x11": "2.3.0",
-    "youtubei.js": "6.4.1"
+    "youtubei.js": "7.0.0"
   },
   "devDependencies": {
-    "@milahu/patch-package": "6.4.14",
     "@playwright/test": "1.39.0",
     "@rollup/plugin-commonjs": "25.0.7",
     "@rollup/plugin-image": "3.0.3",
@@ -176,20 +174,19 @@
     "@types/electron-localshortcut": "3.1.2",
     "@types/howler": "2.2.10",
     "@types/html-to-text": "9.0.3",
-    "@typescript-eslint/eslint-plugin": "6.9.0",
-    "auto-changelog": "2.4.0",
+    "@typescript-eslint/eslint-plugin": "6.9.1",
     "builtin-modules": "^3.3.0",
     "cross-env": "7.0.3",
     "del-cli": "5.1.0",
-    "electron": "27.0.2",
+    "electron": "27.0.3",
     "electron-builder": "24.6.4",
     "electron-devtools-installer": "3.2.0",
     "eslint": "8.52.0",
     "eslint-plugin-import": "2.29.0",
     "eslint-plugin-prettier": "5.0.1",
-    "node-gyp": "9.4.0",
+    "node-gyp": "10.0.1",
     "playwright": "1.39.0",
-    "rollup": "4.1.4",
+    "rollup": "4.2.0",
     "rollup-plugin-copy": "3.5.0",
     "rollup-plugin-import-css": "3.3.5",
     "rollup-plugin-string": "3.0.0",
@@ -202,5 +199,5 @@
     "unreleased": true,
     "output": "changelog.md"
   },
-  "packageManager": "pnpm@8.9.2"
+  "packageManager": "pnpm@8.10.2"
 }

patches/youtubei.js+6.4.1.patch

@@ -1,38 +0,0 @@
-diff --git a/node_modules/youtubei.js/bundle/node.cjs b/node_modules/youtubei.js/bundle/node.cjs
-index 7e3072e..bf5be6a 100644
---- a/node_modules/youtubei.js/bundle/node.cjs
-+++ b/node_modules/youtubei.js/bundle/node.cjs
-@@ -16969,7 +16969,13 @@ var _Cache_createCache;
- var meta_url = import_meta.url;
- var is_cjs = !meta_url;
- var __dirname__ = is_cjs ? __dirname : import_path.default.dirname((0, import_url.fileURLToPath)(meta_url));
--var package_json = JSON.parse((0, import_fs.readFileSync)(import_path.default.resolve(__dirname__, is_cjs ? "../package.json" : "../../package.json"), "utf-8"));
-+var package_json = {
-+  homepage: "https://github.com/LuanRT/YouTube.js#readme",
-+  version: "6.4.1",
-+  bugs: {
-+    url: "https://github.com/LuanRT/YouTube.js/issues"
-+  }
-+};
- var repo_url = (_a3 = package_json.homepage) === null || _a3 === void 0 ? void 0 : _a3.split("#")[0];
- var Cache = class {
-   constructor(persistent = false, persistent_directory) {
-diff --git a/node_modules/youtubei.js/dist/src/platform/node.js b/node_modules/youtubei.js/dist/src/platform/node.js
-index 0e1b2ca..17b437c 100644
---- a/node_modules/youtubei.js/dist/src/platform/node.js
-+++ b/node_modules/youtubei.js/dist/src/platform/node.js
-@@ -16,7 +16,13 @@ import evaluate from './jsruntime/jinter.js';
- const meta_url = import.meta.url;
- const is_cjs = !meta_url;
- const __dirname__ = is_cjs ? __dirname : path.dirname(fileURLToPath(meta_url));
--const package_json = JSON.parse(readFileSync(path.resolve(__dirname__, is_cjs ? '../package.json' : '../../package.json'), 'utf-8'));
-+const package_json = {
-+  homepage: "https://github.com/LuanRT/YouTube.js#readme",
-+  version: "6.4.1",
-+  bugs: {
-+    url: "https://github.com/LuanRT/YouTube.js/issues"
-+  }
-+};
- const repo_url = (_a = package_json.homepage) === null || _a === void 0 ? void 0 : _a.split('#')[0];
- class Cache {
-     constructor(persistent = false, persistent_directory) {

readme.md

@@ -38,7 +38,12 @@ this [wiki page](https://wiki.archlinux.org/index.php/Arch_User_Repository#Insta
 
 ### MacOS
 
-If you get an error "is damaged and can’t be opened." when launching the app, run the following in the Terminal:
+You can install the app using Homebrew:
+```bash
+brew install --cask https://raw.githubusercontent.com/th-ch/youtube-music/master/youtube-music.rb
+```
+
+If you install the app manually and get an error "is damaged and can’t be opened." when launching the app, run the following in the Terminal:
 
 ```bash
 xattr -cr /Applications/YouTube\ Music.app

src/config/defaults.ts

@@ -128,6 +128,7 @@ const defaultConfig = {
       skipExisting: false,
       playlistMaxItems: undefined as number | undefined,
     },
+    'http-api': {},
     'exponential-volume': {},
     'in-app-menu': {
       /**

src/index.ts

@@ -24,6 +24,7 @@ import captionsSelector from './plugins/captions-selector/back';
 import crossfade from './plugins/crossfade/back';
 import discord from './plugins/discord/back';
 import downloader from './plugins/downloader/back';
+import httpApi from './plugins/http-api/back';
 import inAppMenu from './plugins/in-app-menu/back';
 import lastFm from './plugins/last-fm/back';
 import lumiaStream from './plugins/lumiastream/back';
@@ -109,6 +110,7 @@ const mainPlugins = {
   'crossfade': crossfade,
   'discord': discord,
   'downloader': downloader,
+  'http-api': httpApi,
   'in-app-menu': inAppMenu,
   'last-fm': lastFm,
   'lumiastream': lumiaStream,

src/plugins/http-api/back.ts

@@ -0,0 +1,112 @@
+import http from 'node:http';
+
+import { BrowserWindow, ipcMain } from 'electron';
+import is from 'electron-is';
+
+import registerCallback, { SongInfo } from '../../providers/song-info';
+import getSongControls from '../../providers/song-controls';
+import { isEnabled } from '../../config/plugins';
+
+const port = 9669; // Choose a port number
+
+export default (win: BrowserWindow) => {
+  let songInfo: (SongInfo & { loopStatus?: string, volume?: number }) | undefined;
+
+  if (!is.linux() || (is.linux() && !isEnabled('shortcuts'))) {
+    ipcMain.on('apiLoaded', () => {
+      win.webContents.send('setupSeekedListener', 'webinterface');
+      win.webContents.send('setupTimeChangedListener', 'webinterface');
+      win.webContents.send('setupRepeatChangedListener', 'webinterface');
+      win.webContents.send('setupVolumeChangedListener', 'webinterface');
+    });
+  }
+
+  // updations
+  ipcMain.on('seeked', (_, t: number) => {
+    if (songInfo) {
+      songInfo.elapsedSeconds = t;
+    }
+  });
+
+  ipcMain.on('timeChanged', (_, t: number) => {
+    if (songInfo) {
+      songInfo.elapsedSeconds = t;
+    }
+  });
+
+  ipcMain.on('repeatChanged', (_, mode: string) => {
+    if (songInfo) {
+      songInfo.loopStatus = mode;
+    }
+  });
+
+  ipcMain.on('volumeChanged', (_, newVolume: number) => {
+    if(songInfo) {
+      songInfo.volume = newVolume;
+    }
+  });
+
+  registerCallback((info) => songInfo = info as SongInfo & { loopStatus?: string, volume?: number });
+
+  const doAction = (action: URLSearchParams) => {
+    //actions
+    const songControls = getSongControls(win);
+    const { playPause, next, previous, volumeMinus10, volumePlus10, shuffle } = songControls;
+    switch (action.get('action')) {
+      case 'play':
+      case 'pause':
+      case 'playpause':
+        if (songInfo) {
+          songInfo.isPaused = !songInfo.isPaused;
+        }
+        playPause();
+        break;
+      case 'next':
+        next();
+        break;
+      case 'previous':
+        previous();
+        break;
+      case 'shuffle':
+        shuffle();
+        break;
+      case 'looptoggle':
+        songControls.switchRepeat(1);
+        break;
+      case 'volumeplus10':
+        volumePlus10();
+        break;
+      case 'volumeminus10':
+        volumeMinus10();
+        break;
+      case 'seek':
+        console.log('seek', action.get('value'));
+        win.webContents.send('seekTo', action.get('value'));
+        break;
+      default:
+        throw Error(`web-interface: Requested action "${action.get('action')}" not found`);
+    }
+  };
+
+  const server = http.createServer((req,res) => {
+    if (req?.url?.slice(0,4) === '/api') {
+      const url = new URL(req.url, `http://${req.headers.host}`);
+      if (url.searchParams.has('action')) {
+        console.log('webinterface: received and trying action ' + url.searchParams.get('action'));
+        try {
+          doAction(url.searchParams);
+        } catch (e) {
+          res.statusCode = 404;
+          res.write(e);
+          return;
+        }
+      }
+      res.setHeader('Content-Type','application/json');
+      res.write(JSON.stringify(songInfo));
+    }
+    res.end();
+  });
+  server.listen(port, () => {
+    console.log(`web-interface API Server is running on port ${port}`);
+  });
+};

youtube-music.rb

@@ -0,0 +1,28 @@
+require 'json'
+require 'open-uri'
+
+cask "youtube-music" do
+  desc "YouTube Music Desktop App"
+  homepage "https://github.com/th-ch/youtube-music"
+
+  # Fetch the latest release version from GitHub API
+  latest_release = JSON.parse(open("https://api.github.com/repos/th-ch/youtube-music/releases/latest").read)['tag_name']
+  version latest_release
+
+  base_url = "https://github.com/th-ch/youtube-music/releases/download/#{latest_release}/YouTube-Music-#{latest_release.delete_prefix('v')}"
+  file_extension = Hardware::CPU.arm? ? "-arm64.dmg" : ".dmg"
+  url "#{base_url}#{file_extension}"
+
+  # TODO checksum
+  sha256 :no_check
+
+  app "YouTube Music.app"
+
+  postflight do
+    print("Removing quarantine attribute from YouTube Music.app.\n")
+    system "xattr -cr '/Applications/YouTube Music.app'"
+  end
+
+  auto_updates true
+
+end