更新配置

.travis.yml

@@ -1,19 +1,17 @@
+sudo: true
+language: node_js
+node_js: 12
+
 matrix:
   include:
     - os: osx
       osx_image: xcode10.2
-      language: node_js
-      node_js: "12"
       env:
         - ELECTRON_CACHE=$HOME/.cache/electron
         - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
     - os: linux
-      language: node_js
-      node_js: "12"
       dist: trusty
-      services: docker
-      language: generic
 
 cache:
   directories:
@@ -26,6 +24,8 @@ notifications:
   email: false
 
 script:
+  - node --version
+  - npm --version
   - |
     if [ "$TRAVIS_OS_NAME" == "linux" ]; then
       npm install && npm run publish:gh:linux

CHANGELOG.md

@@ -6,6 +6,17 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [0.10.0](https://github.com/lyswhut/lx-music-desktop/compare/v0.9.1...v0.10.0) - 2019-11-02
+
+#### 优化
+
+- 大幅减少程序**播放时**对CPU与GPU的使用，经测试CPU使用减少60%以上，GPU使用减少90%以上，这应该能解决MAC系统上的温度上涨的问题
+
+#### 修复
+
+- 修复酷我源**搜索提示**、**排行榜**无法获取的问题
+- 修复咪咕源无法播放的问题
+
 ## [0.9.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.9.0...v0.9.1) - 2019-10-27
 
 #### 修复

README.md

@@ -35,8 +35,8 @@
 
 所用技术栈：
 
-- Electron 6.x
-- Vue 2.x
+- Electron 7
+- Vue 2
 
 已支持的平台：
 
@@ -80,7 +80,7 @@ npm run pack
 ### 免责声明
 
 本项目**不开发或者破解直接获取音频数据**的功能，所有音频数据均来自**第三方接口**！<br>
-本软件仅用于**测试 `electron 6.x` 在各种系统上的兼容性**及用于**对比各大音乐平台歌单、排行榜等数据列表的差异性**，使用本软件产生的**任何涉及版权相关的数据**请于**24小时内删除**。<br>
+本软件仅用于**测试 `electron 7` 在各种系统上的兼容性**及用于**对比各大音乐平台歌单、排行榜等数据列表的差异性**，使用本软件产生的**任何涉及版权相关的数据**请于**24小时内删除**。<br>
 本软件仅用于学习交流使用，禁止用于商业用途，使用本软件所造成的的后果由使用者承担！<br>
 若对此有疑问请 mail to: lyswhut@qq.com
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "一个免费的音乐下载助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",
@@ -138,7 +138,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/polyfill": "^7.6.0",
     "@babel/preset-env": "^7.6.3",
-    "autoprefixer": "^9.6.5",
+    "autoprefixer": "^9.7.1",
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
     "babel-minify-webpack-plugin": "^0.3.1",
@@ -147,16 +147,16 @@
     "chalk": "^2.4.2",
     "changelog-parser": "^2.8.0",
     "copy-webpack-plugin": "^5.0.4",
-    "core-js": "^3.3.2",
-    "cos-nodejs-sdk-v5": "^2.5.12",
+    "core-js": "^3.3.6",
+    "cos-nodejs-sdk-v5": "^2.5.14",
     "cross-env": "^6.0.3",
     "css-loader": "^3.2.0",
     "del": "^5.1.0",
-    "electron": "^6.0.12",
-    "electron-builder": "^21.2.0",
+    "electron": "^7.0.1",
+    "electron-builder": "^22.1.0",
     "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^2.2.4",
-    "eslint": "^6.5.1",
+    "eslint": "^6.6.0",
     "eslint-config-standard": "^14.1.0",
     "eslint-formatter-friendly": "^7.0.0",
     "eslint-loader": "^3.0.2",
@@ -182,14 +182,14 @@
     "rimraf": "^3.0.0",
     "stylus": "^0.54.7",
     "stylus-loader": "^3.0.2",
-    "terser-webpack-plugin": "^2.1.3",
+    "terser-webpack-plugin": "^2.2.1",
     "url-loader": "^2.2.0",
     "vue-loader": "^15.7.1",
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.6.10",
     "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.9",
-    "webpack-dev-server": "^3.8.2",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-server": "^3.9.0",
     "webpack-hot-middleware": "^2.25.0",
     "webpack-merge": "^4.2.2"
   },
@@ -198,8 +198,8 @@
     "crypto-js": "^3.1.9-1",
     "dnscache": "^1.0.2",
     "electron-log": "^3.0.8",
-    "electron-store": "^5.0.0",
-    "electron-updater": "^4.1.2",
+    "electron-store": "^5.1.0",
+    "electron-updater": "^4.2.0",
     "flac-metadata": "^0.1.1",
     "js-htmlencode": "^0.3.0",
     "lrc-file-parser": "^0.1.14",

publish/changeLog.md

@@ -1,3 +1,8 @@
+#### 优化
+
+- 大幅减少程序**播放时**对CPU与GPU的使用，经测试CPU使用减少60%以上，GPU使用减少90%以上，这应该能解决MAC系统上的温度上涨的问题
+
 #### 修复
 
-- 修复没有配置文件时程序启动出错的问题
+- 修复酷我源**搜索提示**、**排行榜**无法获取的问题
+- 修复咪咕源无法播放的问题

publish/version.json

@@ -1,7 +1,11 @@
 {
-  "version": "0.9.1",
-  "desc": "<h4>修复</h4>\n<ul>\n<li>修复没有配置文件时程序启动出错的问题</li>\n</ul>\n",
+  "version": "0.10.0",
+  "desc": "<h4>优化</h4>\n<ul>\n<li>大幅减少程序<strong>播放时</strong>对CPU与GPU的使用，经测试CPU使用减少60%以上，GPU使用减少90%以上，这应该能解决MAC系统上的温度上涨的问题</li>\n</ul>\n<h4>修复</h4>\n<ul>\n<li>修复酷我源<strong>搜索提示</strong>、<strong>排行榜</strong>无法获取的问题</li>\n<li>修复咪咕源无法播放的问题</li>\n</ul>\n",
   "history": [
+    {
+      "version": "0.9.1",
+      "desc": "<h4>修复</h4>\n<ul>\n<li>修复没有配置文件时程序启动出错的问题</li>\n</ul>\n"
+    },
     {
       "version": "0.9.0",
       "desc": "<h4>新增</h4>\n<ul>\n<li>新增窗口大小设置，若觉得软件窗口小可以到设置页调大点</li>\n<li>新增定位当前播放歌曲，点击播放栏左侧的<strong>歌曲图片</strong>可在播放列表定位当前播放的歌曲（该功能对播放下载列表的歌曲无效）</li>\n</ul>\n<h4>修复</h4>\n<ul>\n<li>修复搜索提示失效的问题</li>\n<li>修复从歌单或列表点击搜索按钮搜索目标歌曲时，搜索框未聚焦仍然弹出候选搜索列表的问题</li>\n</ul>\n"

src/renderer/App.vue

@@ -22,6 +22,7 @@ import dnscache from 'dnscache'
 import { mapMutations, mapGetters, mapActions } from 'vuex'
 import { rendererOn } from '../common/icp'
 import { isLinux } from '../common/utils'
+import music from './utils/music'
 window.ELECTRON_DISABLE_SECURITY_WARNINGS = process.env.ELECTRON_DISABLE_SECURITY_WARNINGS
 dnscache({
   enable: true,
@@ -145,6 +146,9 @@ export default {
       this.globalObj.apiSource = this.setting.apiSource
       this.globalObj.proxy = Object.assign({}, this.setting.network.proxy)
       window.globalObj = this.globalObj
+
+      // 初始化音乐sdk
+      music.init()
     },
     enableIgnoreMouseEvents() {
       if (isLinux) return

src/renderer/components/core/Player.vue

@@ -27,7 +27,7 @@ div(:class="$style.player")
     div(:class="$style.column2")
       div(:class="$style.progress")
         //- div(:class="[$style.progressBar, $style.progressBar1]" :style="{ transform: `scaleX(${progress || 0})` }")
-        div(:class="[$style.progressBar, $style.progressBar2]" :style="{ transform: `scaleX(${progress || 0})` }")
+        div(:class="[$style.progressBar, $style.progressBar2, isActiveTransition ? $style.barTransition : '']" @transitionend="handleTransitionEnd" :style="{ transform: `scaleX(${progress || 0})` }")
       div(:class="$style.progressMask" @click='setProgess' ref="dom_progress")
     div(:class="$style.column3")
       span {{nowPlayTimeStr}}
@@ -88,6 +88,7 @@ export default {
         msDownX: 0,
         msDownVolume: 0,
       },
+      isActiveTransition: false,
     }
   },
   computed: {
@@ -367,13 +368,14 @@ export default {
     },
     setProgess(e) {
       if (!this.audio.src) return
+      this.isActiveTransition = true
       this.audio.currentTime =
         (e.offsetX / this.pregessWidth) * this.maxPlayTime
       if (!this.isPlay) this.audio.play()
     },
     setProgessWidth() {
       this.pregessWidth = parseInt(
-        window.getComputedStyle(this.$refs.dom_progress, null).width
+        window.getComputedStyle(this.$refs.dom_progress, null).width,
       )
     },
     togglePlay() {
@@ -503,6 +505,10 @@ export default {
         },
       })
     },
+    handleTransitionEnd(e) {
+      // console.log(e)
+      this.isActiveTransition = false
+    },
   },
 }
 </script>
@@ -693,21 +699,23 @@ export default {
   width: 100%;
   height: 100%;
   transform-origin: 0;
-  transition-property: transform;
-  transition-timing-function: ease-out;
   border-radius: @radius-progress-border;
 }
 .progress-bar1 {
-  transition-duration: 0.6s;
   background-color: @color-player-progress-bar1;
 }
 
 .progress-bar2 {
-  transition-duration: 0.2s;
   background-color: @color-player-progress-bar2;
   box-shadow: 0 0 2px rgba(0, 0, 0, 0.3);
 }
 
+.bar-transition {
+  transition-property: transform;
+  transition-timing-function: ease-out;
+  transition-duration: 0.2s;
+}
+
 .column3 {
   transition: @transition-theme;
   transition-property: color;

src/renderer/components/index.js

@@ -2,16 +2,12 @@ import Vue from 'vue'
 import upperFirst from 'lodash/upperFirst'
 import camelCase from 'lodash/camelCase'
 
-const requireComponent = require.context(
-  './', true, /\.vue$/
-)
+const requireComponent = require.context('./', true, /\.vue$/)
 
 requireComponent.keys().forEach(fileName => {
   const componentConfig = requireComponent(fileName)
 
-  const componentName = upperFirst(
-    camelCase(fileName.replace(/^\.\//, '').replace(/\.\w+$/, ''))
-  )
+  const componentName = upperFirst(camelCase(fileName.replace(/^\.\//, '').replace(/\.\w+$/, '')))
 
   Vue.component(componentName, componentConfig.default || componentConfig)
 })

src/renderer/route/index.js

@@ -10,9 +10,7 @@ function route(path, view, name, meta, props) {
     path,
     meta,
     props,
-    component: (resovle) => import(
-      `../views/${view}.vue`
-    ).then(resovle),
+    component: (resovle) => import(`../views/${view}.vue`).then(resovle),
   }
 }
 

src/renderer/utils/download/util.js

@@ -14,11 +14,11 @@ export const pauseResumeTimer = (_dl, wait) => {
         setTimeout(() => {
           if (!_dl.isResumable()) {
             console.warn(
-              "This URL doesn't support resume, it will start from the beginning"
+              "This URL doesn't support resume, it will start from the beginning",
             )
           }
           return _dl.resume()
-        }, wait)
+        }, wait),
       )
   }, wait)
 }

src/renderer/utils/music/bd/songList.js

@@ -145,9 +145,7 @@ export default {
   getList(sortId, tagId, page, tryNum = 0) {
     if (this._requestObj_list) this._requestObj_list.cancelHttp()
     if (tryNum > 2) return Promise.reject(new Error('try max num'))
-    this._requestObj_list = httpFetch(
-      this.getListUrl(sortId, tagId, page)
-    )
+    this._requestObj_list = httpFetch(this.getListUrl(sortId, tagId, page))
     return this._requestObj_list.promise.then(({ body }) => {
       if (body.error_code !== this.successCode) return this.getList(sortId, tagId, page, ++tryNum)
       return {

src/renderer/utils/music/index.js

@@ -4,7 +4,7 @@ import tx from './tx'
 import wy from './wy'
 import mg from './mg'
 import bd from './bd'
-export default {
+const sources = {
   sources: [
     {
       name: '酷我音乐',
@@ -38,3 +38,12 @@ export default {
   mg,
   bd,
 }
+export default {
+  ...sources,
+  init() {
+    for (let source of sources.sources) {
+      let sm = sources[source.id]
+      sm && sm.init && sm.init()
+    }
+  },
+}

src/renderer/utils/music/kg/pic.js

@@ -32,7 +32,7 @@ export default {
           userid: 2626431536,
           vip: 1,
         },
-      }
+      },
     )
     requestObj.promise = requestObj.promise.then(({ body }) => {
       if (body.error_code !== 0) return Promise.reject('图片获取失败')

src/renderer/utils/music/kg/songList.js

@@ -92,7 +92,7 @@ export default {
     if (this._requestObj_list) this._requestObj_list.cancelHttp()
     if (tryNum > 2) return Promise.reject(new Error('try max num'))
     this._requestObj_list = httpFetch(
-      this.getSongListUrl(sortId, tagId, page)
+      this.getSongListUrl(sortId, tagId, page),
     )
     return this._requestObj_list.promise.then(({ body }) => {
       if (body.status !== 1) return this.getSongList(sortId, tagId, page, ++tryNum)
@@ -120,7 +120,7 @@ export default {
           return_min: 6,
           return_max: 15,
         },
-      }
+      },
     )
     return this._requestObj_listRecommend.promise.then(({ body }) => {
       if (body.status !== 1) return this.getSongListRecommend(++tryNum)
@@ -253,7 +253,7 @@ export default {
           this.currentTagInfo.id = tagId
           this.currentTagInfo.info = Object.assign({}, info)
           return info
-        })
+        }),
     )
     if (!tagId && page === 1 && sortId === this.sortList[0].id) tasks.push(this.getSongListRecommend()) // 如果是所有类别，则顺便获取推荐列表
     return Promise.all(tasks).then(([list, info, recommendList]) => {

src/renderer/utils/music/kw/index.js

@@ -1,7 +1,7 @@
 import { httpGet, cancelHttp } from '../../request'
 import tempSearch from './tempSearch'
 import musicSearch from './musicSearch'
-import { formatSinger } from './util'
+import { formatSinger, getToken } from './util'
 import leaderboard from './leaderboard'
 import lyric from './lyric'
 import pic from './pic'
@@ -96,6 +96,10 @@ const kw = {
   getPic(songInfo) {
     return pic.getPic(songInfo)
   },
+
+  init() {
+    getToken()
+  },
 }
 
 export default kw

src/renderer/utils/music/kw/leaderboard.js

@@ -1,7 +1,6 @@
 import { httpGet, cancelHttp } from '../../request'
 import { formatPlayTime, decodeName } from '../../index'
-import { formatSinger } from './util'
-
+import { formatSinger, getToken, matchToken } from './util'
 
 export default {
   list: [
@@ -89,20 +88,29 @@ export default {
       })
     })
   },
-  getData2(url) {
+  async getData2(url) {
     if (this._cancelRequestObj2 != null) {
       cancelHttp(this._cancelRequestObj2)
       this._cancelPromiseCancelFn2(new Error('取消http请求'))
     }
+    let token = window.kw_token.token
+    if (!token) token = await getToken()
     return new Promise((resolve, reject) => {
       this._cancelPromiseCancelFn2 = reject
-      this._cancelRequestObj2 = httpGet(url, (err, resp, body) => {
+      this._cancelRequestObj2 = httpGet(url, {
+        headers: {
+          Referer: 'http://www.kuwo.cn/',
+          csrf: token,
+          cookie: 'kw_token=' + token,
+        },
+      }, (err, resp, body) => {
         this._cancelRequestObj2 = null
         this._cancelPromiseCancelFn2 = null
         if (err) {
           console.log(err)
-          reject(err)
+          return reject(err)
         }
+        window.kw_token.token = matchToken(resp.headers)
         resolve(body)
       })
     })

src/renderer/utils/music/kw/tempSearch.js

@@ -1,20 +1,26 @@
 import { httpFetch } from '../../request'
 import { decodeName } from '../../index'
+import { getToken, matchToken } from './util'
+
 
 export default {
   regExps: {
     relWord: /RELWORD=(.+)/,
   },
   requestObj: null,
-  tempSearch(str) {
+  tempSearch(str, token) {
     this.cancelTempSearch()
     this.requestObj = httpFetch(`http://www.kuwo.cn/api/www/search/searchKey?key=${encodeURIComponent(str)}`, {
       headers: {
         Referer: 'http://www.kuwo.cn/',
+        csrf: token,
+        cookie: 'kw_token=' + token,
       },
     })
-    return this.requestObj.promise.then(({ statusCode, body }) => {
-      if (statusCode != 200 || body.code !== 200) return Promise.reject(new Error('请求失败'))
+    return this.requestObj.promise.then(({ statusCode, body, headers }) => {
+      if (statusCode != 200) return Promise.reject(new Error('请求失败'))
+      window.kw_token.token = matchToken(headers)
+      if (body.code !== 200) return Promise.reject(new Error('请求失败'))
       return body
     })
   },
@@ -27,7 +33,9 @@ export default {
   cancelTempSearch() {
     if (this.requestObj && this.requestObj.cancelHttp) this.requestObj.cancelHttp()
   },
-  search(str) {
-    return this.tempSearch(str).then(result => this.handleResult(result.data))
+  async search(str) {
+    let token = window.kw_token.token
+    if (!token) token = await getToken()
+    return this.tempSearch(str, token).then(result => this.handleResult(result.data))
   },
 }

src/renderer/utils/music/kw/util.js

@@ -1,2 +1,34 @@
+import { httpGet } from '../../request'
+
+if (!window.kw_token) {
+  window.kw_token = {
+    token: null,
+    isGetingToken: false,
+  }
+}
 
 export const formatSinger = rawData => rawData.replace(/&/g, '、')
+
+export const matchToken = headers => {
+  try {
+    return headers['set-cookie'][0].match(/kw_token=(\w+)/)[1]
+  } catch (err) {
+    return null
+  }
+}
+
+const wait = time => new Promise(resolve => setTimeout(() => resolve(), time))
+
+
+export const getToken = () => new Promise((resolve, reject) => {
+  if (window.kw_token.isGetingToken) return wait(1000).then(() => getToken().then(token => resolve(token)))
+  if (window.kw_token.token) return resolve(window.kw_token.token)
+  window.kw_token.isGetingToken = true
+  httpGet('http://www.kuwo.cn', (err, resp) => {
+    window.kw_token.isGetingToken = false
+    if (err) return reject(err)
+    if (resp.statusCode != 200) return reject(new Error('获取失败'))
+    const token = window.kw_token.token = matchToken(resp.headers)
+    resolve(token)
+  })
+})

src/renderer/utils/music/mg/api-test.js

@@ -11,7 +11,7 @@ const api_test = {
       family: 4,
     })
     requestObj.promise = requestObj.promise.then(({ body }) => {
-      return body.code === 0 ? Promise.resolve({ type, url: encodeURI(body.data) }) : Promise.reject(new Error(requestMsg.fail))
+      return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail))
     })
     return requestObj
   },

src/renderer/utils/music/tx/songList.js

@@ -109,7 +109,7 @@ export default {
     if (this._requestObj_list) this._requestObj_list.cancelHttp()
     if (tryNum > 2) return Promise.reject(new Error('try max num'))
     this._requestObj_list = httpFetch(
-      this.getListUrl(sortId, tagId, page)
+      this.getListUrl(sortId, tagId, page),
     )
     return this._requestObj_list.promise.then(({ body }) => {
       if (body.code !== this.successCode) return this.getList(sortId, tagId, page, ++tryNum)

src/renderer/views/Leaderboard.vue

@@ -95,7 +95,7 @@ export default {
         this.listAdd({ id: 'default', musicInfo: targetSong })
       }
       let targetIndex = this.defaultList.list.findIndex(
-        s => s.songmid === targetSong.songmid
+        s => s.songmid === targetSong.songmid,
       )
       if (targetIndex > -1) {
         this.setList({

src/renderer/views/Search.vue

@@ -194,7 +194,7 @@ export default {
         this.listAdd({ id: 'default', musicInfo: targetSong })
       }
       let targetIndex = this.defaultList.list.findIndex(
-        s => s.songmid === targetSong.songmid
+        s => s.songmid === targetSong.songmid,
       )
       if (targetIndex > -1) {
         this.setList({

src/renderer/views/SongList.vue

@@ -190,7 +190,7 @@ export default {
         this.listAdd({ id: 'default', musicInfo: targetSong })
       }
       let targetIndex = this.defaultList.list.findIndex(
-        s => s.songmid === targetSong.songmid
+        s => s.songmid === targetSong.songmid,
       )
       if (targetIndex > -1) {
         this.setList({