修复在线列表的请求取消问题

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

@@ -1,4 +1,4 @@
-import { httpGet, cancelHttp } from '../../request'
+import { httpFetch } from '../../request'
 import tempSearch from './tempSearch'
 import musicSearch from './musicSearch'
 import { formatSinger, getToken } from './util'
@@ -64,21 +64,10 @@ const kw = {
   },
 
   getMusicInfo(songInfo) {
-    if (this._musicInfoRequestObj != null) {
-      cancelHttp(this._musicInfoRequestObj)
-      this._musicInfoPromiseCancelFn(new Error('取消http请求'))
-    }
-    return new Promise((resolve, reject) => {
-      this._musicInfoPromiseCancelFn = reject
-      this._musicInfoRequestObj = httpGet(`http://www.kuwo.cn/api/www/music/musicInfo?mid=${songInfo.songmid}`, (err, resp, body) => {
-        this._musicInfoRequestObj = null
-        this._musicInfoPromiseCancelFn = null
-        if (err) {
-          console.log(err)
-          reject(err)
-        }
-        body.code === 200 ? resolve(body.data) : reject(new Error(body.msg))
-      })
+    if (this._musicInfoRequestObj) this._musicInfoRequestObj.cancelHttp()
+    this._musicInfoRequestObj = httpFetch(`http://www.kuwo.cn/api/www/music/musicInfo?mid=${songInfo.songmid}`)
+    return this._musicInfoRequestObj.promise.then(({ body }) => {
+      return body.code === 200 ? body.data : Promise.reject(new Error(body.msg))
     })
   },
 

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

@@ -1,4 +1,4 @@
-import { httpGet, cancelHttp, httpFetch } from '../../request'
+import { httpFetch } from '../../request'
 import { formatPlayTime, decodeName } from '../../index'
 import { formatSinger } from './util'
 
@@ -69,30 +69,16 @@ export default {
   limit: 100,
   _requestBoardsObj: null,
 
-  _cancelRequestObj: null,
-  _cancelPromiseCancelFn: null,
+  _requestDataObj: null,
   getBoardsData() {
     if (this._requestBoardsObj) this._requestBoardsObj.cancelHttp()
     this._requestBoardsObj = httpFetch('http://qukudata.kuwo.cn/q.k?op=query&cont=tree&node=2&pn=0&rn=1000&fmt=json&level=2')
     return this._requestBoardsObj.promise
   },
   getData(url) {
-    if (this._cancelRequestObj != null) {
-      cancelHttp(this._cancelRequestObj)
-      this._cancelPromiseCancelFn(new Error('取消http请求'))
-    }
-    return new Promise((resolve, reject) => {
-      this._cancelPromiseCancelFn = reject
-      this._cancelRequestObj = httpGet(url, (err, resp) => {
-        this._cancelRequestObj = null
-        this._cancelPromiseCancelFn = null
-        if (err) {
-          console.log(err)
-          reject(err)
-        }
-        resolve(resp)
-      })
-    })
+    if (this._requestDataObj) this._requestDataObj.cancelHttp()
+    this._requestDataObj = httpFetch(url)
+    return this._requestDataObj.promise
   },
   filterData(rawList) {
     // console.log(rawList)

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

@@ -1,6 +1,6 @@
 // import '../../polyfill/array.find'
 // import jshtmlencode from 'js-htmlencode'
-import { httpGet, cancelHttp } from '../../request'
+import { httpFetch } from '../../request'
 import { formatPlayTime, decodeName } from '../../index'
 // import { debug } from '../../utils/env'
 import { formatSinger } from './util'
@@ -10,29 +10,15 @@ export default {
     mInfo: /bitrate:(\d+),format:(\w+),size:([\w.]+)/,
   },
   _musicSearchRequestObj: null,
-  _musicSearchPromiseCancelFn: null,
   limit: 30,
   total: 0,
   page: 0,
   allPage: 1,
   // cancelFn: null,
   musicSearch(str, page, limit) {
-    if (this._musicSearchRequestObj != null) {
-      cancelHttp(this._musicSearchRequestObj)
-      this._musicSearchPromiseCancelFn(new Error('取消http请求'))
-    }
-    return new Promise((resolve, reject) => {
-      this._musicSearchPromiseCancelFn = reject
-      this._musicSearchRequestObj = httpGet(`http://search.kuwo.cn/r.s?client=kt&all=${encodeURIComponent(str)}&pn=${page - 1}&rn=${limit}&uid=794762570&ver=kwplayer_ar_9.2.2.1&vipver=1&show_copyright_off=1&newver=1&ft=music&cluster=0&strategy=2012&encoding=utf8&rformat=json&vermerge=1&mobi=1&issubtitle=1`, (err, resp, body) => {
-        this._musicSearchRequestObj = null
-        this._musicSearchPromiseCancelFn = null
-        if (err) {
-          console.log(err)
-          reject(err)
-        }
-        resolve(body)
-      })
-    })
+    if (this._musicSearchRequestObj) this._musicSearchRequestObj.cancelHttp()
+    this._musicSearchRequestObj = httpFetch(`http://search.kuwo.cn/r.s?client=kt&all=${encodeURIComponent(str)}&pn=${page - 1}&rn=${limit}&uid=794762570&ver=kwplayer_ar_9.2.2.1&vipver=1&show_copyright_off=1&newver=1&ft=music&cluster=0&strategy=2012&encoding=utf8&rformat=json&vermerge=1&mobi=1&issubtitle=1`)
+    return this._musicSearchRequestObj.promise
   },
   // getImg(songId) {
   //   return httpGet(`http://player.kuwo.cn/webmusic/sj/dtflagdate?flag=6&rid=MUSIC_${songId}`)
@@ -127,7 +113,7 @@ export default {
     if (retryNum > 2) return Promise.reject(new Error('try max num'))
     if (limit == null) limit = this.limit
     // http://newlyric.kuwo.cn/newlyric.lrc?62355680
-    return this.musicSearch(str, page, limit).then(result => {
+    return this.musicSearch(str, page, limit).then(({ body: result }) => {
       // console.log(result)
       if (!result || (result.TOTAL !== '0' && result.SHOW === '0')) return this.search(str, page, { limit }, ++retryNum)
       let list = this.handleResult(result.abslist)