Merge upstream: v0.4.7 → v0.4.8

.github/workflows/build.yaml

@@ -17,7 +17,7 @@ jobs:
 
  strategy:
  matrix:
- os: [macos-latest, windows-latest, ubuntu-18.04]
+ os: [macos-latest, windows-latest, ubuntu-22.04]
 
  steps:
  - name: Check out Git repository
@@ -36,7 +36,7 @@ jobs:
  run: |
  sudo apt-get update &&
  sudo apt-get install --no-install-recommends -y rpm &&
- sudo apt-get install --no-install-recommends -y bsdtar &&
+ sudo apt-get install --no-install-recommends -y libarchive-tools &&
  sudo apt-get install --no-install-recommends -y libopenjp2-tools
 
  - name: Install Snapcraft (on Ubuntu)
@@ -81,6 +81,7 @@ jobs:
  - name: Build/release Electron app
  uses: samuelmeuli/[email protected]
  env:
+ VUE_APP_NETEASE_API_URL: /api
  VUE_APP_ELECTRON_API_URL: /api
  VUE_APP_ELECTRON_API_URL_DEV: http://127.0.0.1:10754
  VUE_APP_LASTFM_API_KEY: 09c55292403d961aa517ff7f5e8a3d9c

.github/workflows/sync.yml

@@ -0,0 +1,48 @@
+name: Upstream Sync
+
+permissions:
+ contents: write
+ issues: write
+ actions: write
+
+on:
+ schedule:
+ - cron: '0 * * * *' # every hour
+ workflow_dispatch:
+
+jobs:
+ sync_latest_from_upstream:
+ name: Sync latest commits from upstream repo
+ runs-on: ubuntu-latest
+ if: ${{ github.event.repository.fork }}
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Clean issue notice
+ uses: actions-cool/issues-helper@v3
+ with:
+ actions: 'close-issues'
+ labels: '🚨 Sync Fail'
+
+ - name: Sync upstream changes
+ id: sync
+ uses: aormsby/[email protected]
+ with:
+ upstream_sync_repo: qier222/YesPlayMusic
+ upstream_sync_branch: master
+ target_sync_branch: master
+ target_repo_token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, no need to set
+ test_mode: false
+
+ - name: Sync check
+ if: failure()
+ uses: actions-cool/issues-helper@v3
+ with:
+ actions: 'create-issue'
+ title: '🚨 同步失败 | Sync Fail'
+ labels: '🚨 Sync Fail'
+ body: |
+ Due to a change in the workflow file of the upstream repository, GitHub has automatically suspended the scheduled automatic update. You need to manually sync your fork.
+
+ 由于上游仓库的 workflow 文件变更，导致 GitHub 自动暂停了本次自动更新，你需要手动 Sync Fork 一次。

Dockerfile

@@ -1,22 +1,25 @@
 FROM node:16.13.1-alpine as build
 ENV VUE_APP_NETEASE_API_URL=/api
 WORKDIR /app
-RUN apk add --no-cache python3 make g++ git
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories &&\
+ apk add --no-cache python3 make g++ git
 COPY package.json yarn.lock ./
 RUN yarn install
 COPY . .
-RUN yarn build
+RUN yarn config set electron_mirror https://npmmirror.com/mirrors/electron/ && \
+ yarn build
 
 FROM nginx:1.20.2-alpine as app
 
 COPY --from=build /app/package.json /usr/local/lib/
 
-RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.14/main libuv \
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories &&\
+ apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.14/main libuv \
  && apk add --no-cache --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.14/main nodejs npm \
  && npm i -g $(awk -F \" '{if($2=="NeteaseCloudMusicApi") print $2"@"$4}' /usr/local/lib/package.json) \
  && rm -f /usr/local/lib/package.json
 
 COPY --from=build /app/docker/nginx.conf.example /etc/nginx/conf.d/default.conf
 COPY --from=build /app/dist /usr/share/nginx/html
 
-CMD nginx ; exec npx NeteaseCloudMusicApi
+CMD nginx ; exec npx NeteaseCloudMusicApi

README.md

@@ -18,6 +18,11 @@
 
 [![Library][library-screenshot]](https://music.qier222.com)
 
+
+## 全新版本
+全新2.0 Alpha测试版已发布，欢迎前往 [Releases](https:/qier222/YesPlayMusic/releases) 页面下载。
+当前版本将会进入维护模式，除重大bug修复外，不会再更新新功能。
+
 ## ✨ 特性
 
 - ✅ 使用 Vue.js 全家桶开发
@@ -157,7 +162,7 @@ bash <(curl -s -L https://raw.githubusercontent.com/qier222/YesPlayMusic/main/in
 4. 由于 replit 个人版限制内存为 1G（教育版为 3G），构建过程中可能会失败，请再次运行上述命令或运行以下命令：
 
 ```sh
-cd /home/runner/${REPL_SLUG}/music && yarn installl && yarn run build
+cd /home/runner/${REPL_SLUG}/music && yarn install && yarn run build
 ```
 
 ## 👷‍♂️ 打包客户端

docker-compose.yml

@@ -7,6 +7,33 @@ services:
  volumes:
  - /etc/localtime:/etc/localtime:ro
  - /etc/timezone:/etc/timezone:ro
+ - ./docker/nginx.conf.example:/etc/nginx/conf.d/default.conf:ro
  ports:
  - 80:80
  restart: always
+ depends_on:
+ - UnblockNeteaseMusic
+ environment:
+ - NODE_TLS_REJECT_UNAUTHORIZED=0
+ networks:
+ my_network:
+
+ UnblockNeteaseMusic:
+ image: pan93412/unblock-netease-music-enhanced
+ command: -o kugou kuwo migu bilibili pyncmd -p 80:443 -f 45.127.129.53 -e -
+ # environment:
+ # JSON_LOG: true
+ # LOG_LEVEL: debug
+ networks:
+ my_network:
+ aliases:
+ - music.163.com
+ - interface.music.163.com
+ - interface3.music.163.com
+ - interface.music.163.com.163jiasu.com
+ - interface3.music.163.com.163jiasu.com
+ restart: always
+
+networks:
+ my_network:
+ driver: bridge

package.json

@@ -1,6 +1,6 @@
 {
  "name": "yesplaymusic",
- "version": "0.4.7",
+ "version": "0.4.8",
  "private": true,
  "description": "A third party music player for Netease Music",
  "author": "qier222<[email protected]>",
@@ -44,6 +44,8 @@
  "electron-log": "^4.3.0",
  "electron-store": "^8.0.1",
  "electron-updater": "^5.0.1",
+ "esbuild": "^0.20.1",
+ "esbuild-loader": "^4.0.3",
  "express": "^4.17.1",
  "express-fileupload": "^1.2.0",
  "express-http-proxy": "^1.6.2",
@@ -60,7 +62,6 @@
  "pac-proxy-agent": "^4.1.0",
  "pangu": "^4.0.7",
  "plyr": "^3.6.2",
- "prettier": "2.5.1",
  "qrcode": "^1.4.4",
  "register-service-worker": "^1.7.1",
  "svg-sprite-loader": "^6.0.11",
@@ -89,6 +90,7 @@
  "eslint-plugin-vue": "^7.9.0",
  "husky": "^4.3.0",
  "node-polyfill-webpack-plugin": "^2.0.1",
+ "prettier": "2.5.1",
  "sass": "^1.26.11",
  "sass-loader": "^10.0.2",
  "vue-cli-plugin-electron-builder": "~3.0.0-alpha.4",

src/background.js

@@ -31,7 +31,8 @@ import { EventEmitter } from 'events';
 import express from 'express';
 import expressProxy from 'express-http-proxy';
 import Store from 'electron-store';
-import { createMpris } from '@/electron/mpris';
+import { createMpris, createDbus } from '@/electron/mpris';
+import { spawn } from 'child_process';
 const clc = require('cli-color');
 const log = text => {
  console.log(`${clc.blueBright('[background.js]')} ${text}`);
@@ -420,6 +421,21 @@ class Background {
  registerGlobalShortcut(this.window, this.store);
  }
 
+ // try to start osdlyrics process on start
+ if (this.store.get('settings.enableOsdlyricsSupport')) {
+ await createDbus(this.window);
+ log('try to start osdlyrics process');
+ const osdlyricsProcess = spawn('osdlyrics');
+
+ osdlyricsProcess.on('error', err => {
+ log(`failed to start osdlyrics: ${err.message}`);
+ });
+
+ osdlyricsProcess.on('exit', (code, signal) => {
+ log(`osdlyrics process exited with code ${code}, signal ${signal}`);
+ });
+ }
+
  // create mpris
  if (isCreateMpris) {
  createMpris(this.window);

src/components/Cover.vue

@@ -136,7 +136,7 @@ img {
  cursor: default;
  transition: 0.2s;
  .svg-icon {
- height: 44%;
+ width: 50%;
  margin: {
  left: 4px;
  }

src/components/MvRow.vue

@@ -73,7 +73,7 @@ export default {
  artistName = mv.creator[0].userName;
  artistID = mv.creator[0].userId;
  }
- return `<a href="/#/artist/${artistID}">${artistName}</a>`;
+ return `<a href="/artist/${artistID}">${artistName}</a>`;
  } else if (this.subtitle === 'publishTime') {
  return mv.publishTime;
  }

src/components/Navbar.vue

@@ -194,7 +194,7 @@ nav {
 
 @media (max-width: 1336px) {
  nav {
- padding: 0 5vw;
+ padding: 0 max(5vw, 90px);
  }
 }
 

src/components/TrackList.vue

@@ -73,6 +73,7 @@
  v-for="(track, index) in tracks"
  :key="itemKey === 'id' ? track.id : `${track.id}${index}`"
  :track-prop="track"
+ :track-no="index + 1"
  :highlight-playing-track="highlightPlayingTrack"
  @dblclick.native="
  playThisList(track.mainTrackId || track.id || track.songId)

src/components/TrackListItem.vue

@@ -21,7 +21,7 @@
  style="height: 14px; width: 14px"
  ></svg-icon>
  </button>
- <span v-show="(!focus || !playable) && !isPlaying">{{ track.no }}</span>
+ <span v-show="(!focus || !playable) && !isPlaying">{{ trackNo }}</span>
  <button v-show="isPlaying">
  <svg-icon
  icon-class="volume"
@@ -108,6 +108,7 @@ export default {
 
  props: {
  trackProp: Object,
+ trackNo: Number,
  highlightPlayingTrack: {
  type: Boolean,
  default: true,

src/electron/mpris.js

@@ -1,3 +1,4 @@
+import dbus from 'dbus-next';
 import { ipcMain, app } from 'electron';
 
 export function createMpris(window) {
@@ -28,18 +29,26 @@ export function createMpris(window) {
  });
 
  ipcMain.on('metadata', (e, metadata) => {
+ // 更新 Mpris 状态前将位置设为0, 否则 OSDLyrics 获取到的进度是上首音乐切换时的进度
+ player.getPosition = () => 0;
  player.metadata = {
  'mpris:trackid': player.objectPath('track/' + metadata.trackId),
  'mpris:artUrl': metadata.artwork[0].src,
  'mpris:length': metadata.length * 1000 * 1000,
  'xesam:title': metadata.title,
  'xesam:album': metadata.album,
  'xesam:artist': metadata.artist.split(','),
+ 'xesam:url': metadata.url,
  };
  });
 
  ipcMain.on('playerCurrentTrackTime', (e, position) => {
  player.getPosition = () => position * 1000 * 1000;
+ player.seeked(position * 1000 * 1000);
+ });
+
+ ipcMain.on('seeked', (e, position) => {
+ player.seeked(position * 1000 * 1000);
  });
 
  ipcMain.on('switchRepeatMode', (e, mode) => {
@@ -60,3 +69,26 @@ export function createMpris(window) {
  player.shuffle = shuffle;
  });
 }
+
+export async function createDbus(window) {
+ const bus = dbus.sessionBus();
+ const Variant = dbus.Variant;
+
+ const osdService = await bus.getProxyObject(
+ 'org.osdlyrics.Daemon',
+ '/org/osdlyrics/Lyrics'
+ );
+
+ const osdInterface = osdService.getInterface('org.osdlyrics.Lyrics');
+
+ ipcMain.on('sendLyrics', async (e, { track, lyrics }) => {
+ const metadata = {
+ title: new Variant('s', track.name),
+ artist: new Variant('s', track.ar.map(ar => ar.name).join(', ')),
+ };
+
+ await osdInterface.SetLyricContent(metadata, Buffer.from(lyrics));
+
+ window.webContents.send('saveLyricFinished');
+ });
+}

src/electron/services.js

@@ -1,4 +1,5 @@
 import clc from 'cli-color';
+import checkAuthToken from '../utils/checkAuthToken';
 import server from 'NeteaseCloudMusicApi/server';
 
 export async function startNeteaseMusicApi() {

src/electron/tray.js

@@ -1,6 +1,6 @@
 /* global __static */
 import path from 'path';
-import { app, nativeImage, Tray, Menu } from 'electron';
+import { app, nativeImage, Tray, Menu, nativeTheme } from 'electron';
 import { isLinux } from '@/utils/platform';
 
 function createMenuTemplate(win) {
@@ -197,8 +197,11 @@ class YPMTrayWindowsImpl {
 }
 
 export function createTray(win, eventEmitter) {
+ // 感觉图标颜色应该不属于界面主题范畴，只需要跟随系统主题
+ let iconTheme = nativeTheme.shouldUseDarkColors ? 'light' : 'dark';
+
  let icon = nativeImage
- .createFromPath(path.join(__static, 'img/icons/[email protected]'))
+ .createFromPath(path.join(__static, `img/icons/menu-${iconTheme}@88.png`))
  .resize({
  height: 20,
  width: 20,