更新到0.1.4版本

src/renderer/utils/music/tx/api-messoer.js

@@ -0,0 +1,21 @@
+import { httpFatch } from '../../request'
+
+const api_messoer = {
+  getMusicUrl(songInfo, type) {
+    const requestObj = httpFatch(`https://v1.itooi.cn/tencent/url?id=${songInfo.strMediaMid}&quality=${type.replace(/k$/, '')}&isRedirect=0`, {
+      method: 'get',
+      timeout: 5000,
+    })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(body.msg))
+    })
+    return requestObj
+  },
+  getPic(songInfo) {
+    return {
+      promise: Promise.resolve(`https://y.gtimg.cn/music/photo_new/T002R500x500M000${songInfo.albumId}.jpg`),
+    }
+  },
+}
+
+export default api_messoer

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

@@ -1,46 +1,19 @@
-import { httpGet, cancelHttp } from '../../request'
 import leaderboard from './leaderboard'
 import lyric from './lyric'
+import api_source from '../api-source'
 
 const tx = {
   leaderboard,
 
   getMusicUrl(songInfo, type) {
-    let requestObj
-    let cancelFn
-    const p = new Promise((resolve, reject) => {
-      cancelFn = reject
-      requestObj = httpGet(`https://v1.itooi.cn/tencent/url?id=${songInfo.strMediaMid}&quality=${type.replace(/k$/, '')}&isRedirect=0`, (err, resp, body) => {
-        requestObj = null
-        cancelFn = null
-        if (err) {
-          console.log(err)
-          const { promise, cancelHttp } = this.getMusicUrl(songInfo, type)
-          obj.cancelHttp = cancelHttp
-          return promise
-        }
-        body.code === 200 ? resolve({ type, url: body.data }) : reject(new Error(body.msg))
-      })
-    })
-    const obj = {
-      promise: p,
-      cancelHttp() {
-        console.log('cancel')
-        if (!requestObj) return
-        cancelHttp(requestObj)
-        cancelFn(new Error('取消http请求'))
-        requestObj = null
-        cancelFn = null
-      },
-    }
-    return obj
+    return api_source('tx').getMusicUrl(songInfo, type)
   },
   getLyric(songInfo) {
     // let singer = songInfo.singer.indexOf('、') > -1 ? songInfo.singer.split('、')[0] : songInfo.singer
     return lyric.getLyric(songInfo.songmid)
   },
   getPic(songInfo) {
-    return Promise.resolve(`https://y.gtimg.cn/music/photo_new/T002R500x500M000${songInfo.albumId}.jpg`)
+    return api_source('tx').getPic(songInfo)
   },
 }
 

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

@@ -1,32 +1,19 @@
-import { httpGet, cancelHttp } from '../../request'
+import { httpFatch } from '../../request'
 import { b64DecodeUnicode } from '../../index'
 
 export default {
-  _musicLrcRequestObj: null,
-  _musicLrcPromiseCancelFn: null,
   regexps: {
     matchLrc: /.+"lyric":"([\w=+/]*)".+/,
   },
   getLyric(songmid) {
-    if (this._musicLrcRequestObj != null) {
-      cancelHttp(this._musicLrcRequestObj)
-      this._musicLrcPromiseCancelFn(new Error('取消http请求'))
-    }
-    return new Promise((resolve, reject) => {
-      this._musicLrcPromiseCancelFn = reject
-      this._musicLrcRequestObj = httpGet(`https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg?songmid=${songmid}&g_tk=2001461048&loginUin=0&hostUin=0&format=jsonp&inCharset=utf8&outCharset=utf-8&platform=yqq`, {
-        headers: {
-          Referer: 'https://y.qq.com/portal/player.html',
-        },
-      }, (err, resp, body) => {
-        this._musicLrcRequestObj = null
-        this._musicLrcPromiseCancelFn = null
-        if (err) {
-          console.log(err)
-          reject(err)
-        }
-        resolve(b64DecodeUnicode(body.replace(this.regexps.matchLrc, '$1')))
-      })
+    const requestObj = httpFatch(`https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg?songmid=${songmid}&g_tk=2001461048&loginUin=0&hostUin=0&format=jsonp&inCharset=utf8&outCharset=utf-8&platform=yqq`, {
+      headers: {
+        Referer: 'https://y.qq.com/portal/player.html',
+      },
     })
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return b64DecodeUnicode(body.replace(this.regexps.matchLrc, '$1'))
+    })
+    return requestObj
   },
 }