From 198238d4b56b5ef359eef817d92d7f43aa14c126 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 16 Jun 2021 10:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E7=BB=9C=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=EF=BC=8C=E5=B0=9D=E8=AF=95=E5=8E=BB=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BF=9E=E6=8E=A5=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                       | 17 ++---------------
 package.json                            |  1 -
 publish/changeLog.md                    |  4 ++++
 src/renderer/App.vue                    |  6 ------
 src/renderer/utils/music/bd/api-test.js |  3 +++
 src/renderer/utils/music/kg/api-test.js |  3 +++
 src/renderer/utils/music/kw/api-temp.js |  3 +++
 src/renderer/utils/music/kw/api-test.js |  3 +++
 src/renderer/utils/music/mg/api-test.js |  3 +++
 src/renderer/utils/music/tx/api-test.js |  3 +++
 src/renderer/utils/music/utils.js       | 20 ++++++++++++++++++++
 src/renderer/utils/music/wy/api-test.js |  3 +++
 src/renderer/utils/request.js           |  1 +
 13 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5e072e0f..7bd33b50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3739,7 +3739,8 @@
     "asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true
     },
     "asar": {
       "version": "3.0.3",
@@ -6663,15 +6664,6 @@
         "buffer-indexof": "^1.0.0"
       }
     },
-    "dnscache": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/dnscache/-/dnscache-1.0.2.tgz",
-      "integrity": "sha512-2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ==",
-      "requires": {
-        "asap": "^2.0.6",
-        "lodash.clone": "^4.5.0"
-      }
-    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -10361,11 +10353,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash.clone": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
-      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y="
-    },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
diff --git a/package.json b/package.json
index 802d1535..8e4acedf 100644
--- a/package.json
+++ b/package.json
@@ -228,7 +228,6 @@
   },
   "dependencies": {
     "crypto-js": "^4.0.0",
-    "dnscache": "^1.0.2",
     "electron-log": "^4.3.5",
     "electron-store": "^8.0.0",
     "electron-updater": "^4.3.9",
diff --git a/publish/changeLog.md b/publish/changeLog.md
index 6faf2ba8..8135f124 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -3,6 +3,10 @@
 - 添加 win arm64 架构的安装包构建
 - 新增“添加歌曲到列表时的位置”设置，可选项为列表的“顶部”与“底部”
 
+### 优化
+
+- 优化网络请求，尝试去解决无法连接服务器的问题
+
 ### 变更
 
 - 添加歌曲到列表时从原来的底部改为顶部，若想要恢复原来的行为则可以去更改“添加歌曲到列表时的位置”设置项
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 1aba83a3..ade091e4 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -20,7 +20,6 @@
 </template>
 
 <script>
-import dnscache from 'dnscache'
 import { mapMutations, mapGetters, mapActions } from 'vuex'
 import { rendererOn, rendererSend, rendererInvoke, NAMES } from '../common/ipc'
 import { isLinux } from '../common/utils'
@@ -30,11 +29,6 @@ import { base as eventBaseName } from './event/names'
 import apiSourceInfo from './utils/music/api-source-info'
 
 window.ELECTRON_DISABLE_SECURITY_WARNINGS = process.env.ELECTRON_DISABLE_SECURITY_WARNINGS
-dnscache({
-  enable: true,
-  ttl: 21600,
-  cachesize: 1000,
-})
 
 const listThrottle = (fn, delay = 100) => {
   let timer = null
diff --git a/src/renderer/utils/music/bd/api-test.js b/src/renderer/utils/music/bd/api-test.js
index 36e9bfcb..b6818d83 100644
--- a/src/renderer/utils/music/bd/api-test.js
+++ b/src/renderer/utils/music/bd/api-test.js
@@ -1,13 +1,16 @@
 import { httpFetch } from '../../request'
 import { requestMsg } from '../../message'
 import { headers, timeout } from '../options'
+import { getHostIp } from '../utils'
 
 const api_test = {
   getMusicUrl(songInfo, type) {
+    const ip = getHostIp('ts.tempmusic.tk')
     const requestObj = httpFetch(`http://ts.tempmusic.tk/url/bd/${songInfo.songmid}/${type}`, {
       method: 'get',
       timeout,
       headers,
+      host: ip,
       family: 4,
     })
     requestObj.promise = requestObj.promise.then(({ body }) => {
diff --git a/src/renderer/utils/music/kg/api-test.js b/src/renderer/utils/music/kg/api-test.js
index 0d96fd95..85f7043c 100644
--- a/src/renderer/utils/music/kg/api-test.js
+++ b/src/renderer/utils/music/kg/api-test.js
@@ -1,13 +1,16 @@
 import { httpFetch } from '../../request'
 import { requestMsg } from '../../message'
 import { headers, timeout } from '../options'
+import { getHostIp } from '../utils'
 
 const api_test = {
   getMusicUrl(songInfo, type) {
+    const ip = getHostIp('ts.tempmusic.tk')
     const requestObj = httpFetch(`http://ts.tempmusic.tk/url/kg/${songInfo._types[type].hash}/${type}`, {
       method: 'get',
       timeout,
       headers,
+      host: ip,
       family: 4,
     })
     requestObj.promise = requestObj.promise.then(({ body }) => {
diff --git a/src/renderer/utils/music/kw/api-temp.js b/src/renderer/utils/music/kw/api-temp.js
index 7f673926..d13295bb 100644
--- a/src/renderer/utils/music/kw/api-temp.js
+++ b/src/renderer/utils/music/kw/api-temp.js
@@ -1,12 +1,15 @@
 import { httpFetch } from '../../request'
 import { headers, timeout } from '../options'
+import { getHostIp } from '../utils'
 
 const api_temp = {
   getMusicUrl(songInfo, type) {
+    const ip = getHostIp('tm.tempmusic.tk')
     const requestObj = httpFetch(`http://tm.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, {
       method: 'get',
       headers,
       timeout,
+      host: ip,
       family: 4,
     })
     requestObj.promise = requestObj.promise.then(({ body }) => {
diff --git a/src/renderer/utils/music/kw/api-test.js b/src/renderer/utils/music/kw/api-test.js
index 1308775d..ce7732b4 100644
--- a/src/renderer/utils/music/kw/api-test.js
+++ b/src/renderer/utils/music/kw/api-test.js
@@ -1,6 +1,7 @@
 import { httpFetch } from '../../request'
 import { requestMsg } from '../../message'
 import { headers, timeout } from '../options'
+import { getHostIp } from '../utils'
 
 const api_test = {
   // getMusicUrl(songInfo, type) {
@@ -15,10 +16,12 @@ const api_test = {
   //   return requestObj
   // },
   getMusicUrl(songInfo, type) {
+    const ip = getHostIp('ts.tempmusic.tk')
     const requestObj = httpFetch(`http://ts.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, {
       method: 'get',
       timeout,
       headers,
+      host: ip,
       family: 4,
     })
     requestObj.promise = requestObj.promise.then(({ body }) => {
diff --git a/src/renderer/utils/music/mg/api-test.js b/src/renderer/utils/music/mg/api-test.js
index a64b6b29..41bf5e69 100644
--- a/src/renderer/utils/music/mg/api-test.js
+++ b/src/renderer/utils/music/mg/api-test.js
@@ -1,13 +1,16 @@
 import { httpFetch } from '../../request'
 import { requestMsg } from '../../message'
 import { headers, timeout } from '../options'
+import { getHostIp } from '../utils'
 
 const api_test = {
   getMusicUrl(songInfo, type) {
+    const ip = getHostIp('ts.tempmusic.tk')
     const requestObj = httpFetch(`http://ts.tempmusic.tk/url/mg/${songInfo.copyrightId}/${type}`, {
       method: 'get',
       timeout,
       headers,
+      host: ip,
       family: 4,
     })
     requestObj.promise = requestObj.promise.then(({ body }) => {
diff --git a/src/renderer/utils/music/tx/api-test.js b/src/renderer/utils/music/tx/api-test.js
index 4fb4ea85..d998489e 100644
--- a/src/renderer/utils/music/tx/api-test.js
+++ b/src/renderer/utils/music/tx/api-test.js
@@ -1,13 +1,16 @@
 import { httpFetch } from '../../request'
 import { requestMsg } from '../../message'
 import { headers, timeout } from '../options'
+import { getHostIp } from '../utils'
 
 const api_messoer = {
   getMusicUrl(songInfo, type) {
+    const ip = getHostIp('ts.tempmusic.tk')
     const requestObj = httpFetch(`http://ts.tempmusic.tk/url/tx/${songInfo.songmid}/${type}`, {
       method: 'get',
       timeout,
       headers,
+      host: ip,
       family: 4,
     })
     requestObj.promise = requestObj.promise.then(({ body }) => {
diff --git a/src/renderer/utils/music/utils.js b/src/renderer/utils/music/utils.js
index 3427cb3d..a7f63b2d 100644
--- a/src/renderer/utils/music/utils.js
+++ b/src/renderer/utils/music/utils.js
@@ -1,4 +1,6 @@
 import crypto from 'crypto'
+import dns from 'dns'
+
 
 /**
  * 获取音乐音质
@@ -19,3 +21,21 @@ export const getMusicType = (info, type) => {
 }
 
 export const toMD5 = str => crypto.createHash('md5').update(str).digest('hex')
+
+
+const ipMap = new Map()
+export const getHostIp = hostname => {
+  const ip = ipMap.get(hostname)
+  if (typeof ip === 'string') return ip
+  if (ip === true) return
+  ipMap.set(hostname, true)
+  // console.log(hostname)
+  dns.lookup(hostname, {
+    // family: 4,
+    all: false,
+  }, (err, address, family) => {
+    if (err) return console.log(err)
+    // console.log(address, family)
+    ipMap.set(hostname, address)
+  })
+}
diff --git a/src/renderer/utils/music/wy/api-test.js b/src/renderer/utils/music/wy/api-test.js
index 42a3b496..b48df637 100644
--- a/src/renderer/utils/music/wy/api-test.js
+++ b/src/renderer/utils/music/wy/api-test.js
@@ -1,13 +1,16 @@
 import { httpFetch } from '../../request'
 import { requestMsg } from '../../message'
 import { headers, timeout } from '../options'
+import { getHostIp } from '../utils'
 
 const api_test = {
   getMusicUrl(songInfo, type) {
+    const ip = getHostIp('ts.tempmusic.tk')
     const requestObj = httpFetch(`http://ts.tempmusic.tk/url/wy/${songInfo.songmid}/${type}`, {
       method: 'get',
       timeout,
       headers,
+      host: ip,
       family: 4,
     })
     requestObj.promise = requestObj.promise.then(({ body }) => {
diff --git a/src/renderer/utils/request.js b/src/renderer/utils/request.js
index ee50decc..57c2ff83 100644
--- a/src/renderer/utils/request.js
+++ b/src/renderer/utils/request.js
@@ -21,6 +21,7 @@ const request = (url, options, callback) => {
     options.json = false
   }
   options.response_timeout = options.timeout
+  console.log(options)
   return needle.request(options.method || 'get', url, data, options, (err, resp, body) => {
     if (!err) {
       body = resp.body = resp.raw.toString()