Merge pull request #952 from YXL76/master

使用axios代替request

Merge pull request #952 from YXL76/master
使用axios代替request
8ad27ce3 · binaryify · GitHub · 123e1375 · f6319c8b · 8ad27ce3
11 changed file
--- a/app.test.js
+++ b/app.test.js
 const fs = require('fs')
 const path = require('path')
-const request = require('request')

 let app
 before(() => {
  app = require('./app.js')
  global.host = 'http://localhost:' + app.server.address().port
-  request.debug = false
 })
 after((done) => {
  app.server.close(done)

--- a/main.d.ts
+++ b/main.d.ts
@@ -34,7 +34,7 @@ declare module 'NeteaseCloudMusicApi' {

  export const enum SubAction {
    sub = 1,
-    ubsub = 0,
+    unsub = 0,
  }

  export function activate_init_profile(

--- a/package-lock.json
+++ b/package-lock.json
@@ -337,6 +337,7 @@
      "version": "6.12.4",
      "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.4.tgz?cache=0&sync_timestamp=1597480759610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.4.tgz",
      "integrity": "sha1-BhT6zEUiEn+nE0Rca/0+vTduIjQ=",
+      "dev": true,
      "requires": {
        "fast-deep-equal": "^3.1.1",
        "fast-json-stable-stringify": "^2.0.0",
@@ -442,19 +443,6 @@
        "is-string": "^1.0.4"
      }
    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npm.taobao.org/asn1/download/asn1-0.2.4.tgz",
-      "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
    "ast-types": {
      "version": "0.13.4",
      "resolved": "https://registry.npm.taobao.org/ast-types/download/ast-types-0.13.4.tgz?cache=0&sync_timestamp=1598279472396&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fast-types%2Fdownload%2Fast-types-0.13.4.tgz",
@@ -469,21 +457,6 @@
      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
      "dev": true
    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npm.taobao.org/aws4/download/aws4-1.10.1.tgz?cache=0&sync_timestamp=1597236947743&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faws4%2Fdownload%2Faws4-1.10.1.tgz",
-      "integrity": "sha1-4eguTz6Zniz9YbFhKA0WoRH4ZCg="
-    },
    "axios": {
      "version": "0.20.0",
      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.20.0.tgz?cache=0&sync_timestamp=1597979633356&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.20.0.tgz",
@@ -498,14 +471,6 @@
      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
      "dev": true
    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
    "binary-extensions": {
      "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-2.1.0.tgz",
@@ -597,11 +562,6 @@
      "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
      "dev": true
    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
    "chalk": {
      "version": "4.1.0",
      "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1591687076871&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz",
@@ -822,14 +782,6 @@
      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
      "dev": true
    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz",
-      "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
    "commander": {
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz",
@@ -925,14 +877,6 @@
        "type": "^1.0.1"
      }
    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
    "data-uri-to-buffer": {
      "version": "3.0.1",
      "resolved": "https://registry.npm.taobao.org/data-uri-to-buffer/download/data-uri-to-buffer-3.0.1.tgz?cache=0&sync_timestamp=1590800007667&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdata-uri-to-buffer%2Fdownload%2Fdata-uri-to-buffer-3.0.1.tgz",
@@ -954,7 +898,7 @@
    },
    "dedent": {
      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dedent/download/dedent-0.7.0.tgz",
      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
      "dev": true
    },
@@ -996,11 +940,6 @@
        "esprima": "^4.0.0"
      }
    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
    "depd": {
      "version": "1.1.2",
      "resolved": "https://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz",
@@ -1092,15 +1031,6 @@
      "integrity": "sha1-aWzi7Aqg5uqTo5f/zySqeEDIJ8s=",
      "dev": true
    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
    "ee-first": {
      "version": "1.1.1",
      "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
@@ -1813,20 +1743,11 @@
        }
      }
    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz",
-      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
    "fast-deep-equal": {
      "version": "3.1.3",
      "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz?cache=0&sync_timestamp=1591599697571&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-3.1.3.tgz",
-      "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU="
+      "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",
+      "dev": true
    },
    "fast-diff": {
      "version": "1.2.0",
@@ -1851,7 +1772,8 @@
    "fast-json-stable-stringify": {
      "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz?cache=0&sync_timestamp=1576340291001&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-json-stable-stringify%2Fdownload%2Ffast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM="
+      "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM=",
+      "dev": true
    },
    "fast-levenshtein": {
      "version": "2.0.6",
@@ -1963,21 +1885,6 @@
      "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.0.tgz?cache=0&sync_timestamp=1597057976909&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.13.0.tgz",
      "integrity": "sha1-tC6Nk6Kn7qXtiGM2dtZZe8jjhNs="
    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz",
-      "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
    "forwarded": {
      "version": "0.1.2",
      "resolved": "https://registry.npm.taobao.org/forwarded/download/forwarded-0.1.2.tgz",
@@ -2087,14 +1994,6 @@
        }
      }
    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
    "glob": {
      "version": "7.1.6",
      "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz?cache=0&sync_timestamp=1573078121947&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob%2Fdownload%2Fglob-7.1.6.tgz",
@@ -2152,20 +2051,6 @@
      "integrity": "sha1-8nNdwig2dPpnR4sQGBBZNVw2nl4=",
      "dev": true
    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npm.taobao.org/har-validator/download/har-validator-5.1.5.tgz?cache=0&sync_timestamp=1596082584903&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhar-validator%2Fdownload%2Fhar-validator-5.1.5.tgz",
-      "integrity": "sha1-HwgDufjLIMD6E4It8ezds2veHv0=",
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      }
-    },
    "has": {
      "version": "1.0.3",
      "resolved": "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz",
@@ -2242,16 +2127,6 @@
        }
      }
    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
    "https-proxy-agent": {
      "version": "5.0.0",
      "resolved": "https://registry.npm.taobao.org/https-proxy-agent/download/https-proxy-agent-5.0.0.tgz?cache=0&sync_timestamp=1581106803611&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttps-proxy-agent%2Fdownload%2Fhttps-proxy-agent-5.0.0.tgz",
@@ -2456,7 +2331,7 @@
    },
    "is-obj": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz",
      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
      "dev": true
    },
@@ -2477,7 +2352,7 @@
    },
    "is-regexp": {
      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/is-regexp/download/is-regexp-1.0.0.tgz",
      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
      "dev": true
    },
@@ -2508,11 +2383,6 @@
        "has-symbols": "^1.0.1"
      }
    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
    "is-url": {
      "version": "1.2.4",
      "resolved": "https://registry.npm.taobao.org/is-url/download/is-url-1.2.4.tgz",
@@ -2530,11 +2400,6 @@
      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
      "dev": true
    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
    "iterate-iterator": {
      "version": "1.0.1",
      "resolved": "https://registry.npm.taobao.org/iterate-iterator/download/iterate-iterator-1.0.1.tgz",
@@ -2567,26 +2432,17 @@
        "esprima": "^4.0.0"
      }
    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
    "json-parse-even-better-errors": {
      "version": "2.3.1",
      "resolved": "https://registry.npm.taobao.org/json-parse-even-better-errors/download/json-parse-even-better-errors-2.3.1.tgz?cache=0&sync_timestamp=1599064788298&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-parse-even-better-errors%2Fdownload%2Fjson-parse-even-better-errors-2.3.1.tgz",
      "integrity": "sha1-fEeAWpQxmSjgV3dAXcEuH3pO4C0=",
      "dev": true
    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
    "json-schema-traverse": {
      "version": "0.4.1",
      "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1599333856086&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "dev": true
    },
    "json-stable-stringify-without-jsonify": {
      "version": "1.0.1",
@@ -2594,11 +2450,6 @@
      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
      "dev": true
    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
    "jsonfile": {
      "version": "4.0.0",
      "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz",
@@ -2607,17 +2458,6 @@
        "graceful-fs": "^4.1.6"
      }
    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
    "levn": {
      "version": "0.3.0",
      "resolved": "https://registry.npm.taobao.org/levn/download/levn-0.3.0.tgz",
@@ -3070,11 +2910,6 @@
        "path-key": "^3.0.0"
      }
    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz",
-      "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU="
-    },
    "object-inspect": {
      "version": "1.8.0",
      "resolved": "https://registry.npm.taobao.org/object-inspect/download/object-inspect-1.8.0.tgz?cache=0&sync_timestamp=1592545231350&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-inspect%2Fdownload%2Fobject-inspect-1.8.0.tgz",
@@ -3305,11 +3140,6 @@
      "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=",
      "dev": true
    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
    "picomatch": {
      "version": "2.2.2",
      "resolved": "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz?cache=0&sync_timestamp=1584790434095&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpicomatch%2Fdownload%2Fpicomatch-2.2.2.tgz",
@@ -3510,11 +3340,6 @@
        "ipaddr.js": "1.9.1"
      }
    },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npm.taobao.org/psl/download/psl-1.8.0.tgz",
-      "integrity": "sha1-kyb4vPsBOtzABf3/BWrM4CDlHCQ="
-    },
    "pump": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -3528,7 +3353,8 @@
    "punycode": {
      "version": "2.1.1",
      "resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
-      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
+      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
+      "dev": true
    },
    "qs": {
      "version": "6.7.0",
@@ -3596,40 +3422,6 @@
      "integrity": "sha1-IG0K0KVkjP+9uK5GQ489xRyfeOI=",
      "dev": true
    },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npm.taobao.org/request/download/request-2.88.2.tgz",
-      "integrity": "sha1-1zyRhzHLWofaBH4gcjQUb2ZNErM=",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
-          "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
-        }
-      }
-    },
    "require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npm.taobao.org/require-directory/download/require-directory-2.1.1.tgz",
@@ -3888,22 +3680,6 @@
      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
      "dev": true
    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npm.taobao.org/sshpk/download/sshpk-1.16.1.tgz",
-      "integrity": "sha1-+2YcC+8ps520B2nuOfpwCT1vaHc=",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
    "statuses": {
      "version": "1.5.0",
      "resolved": "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1587327902535&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz",
@@ -4045,7 +3821,7 @@
    },
    "through": {
      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
      "dev": true
    },
@@ -4063,15 +3839,6 @@
      "resolved": "https://registry.npm.taobao.org/toidentifier/download/toidentifier-1.0.0.tgz",
      "integrity": "sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM="
    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.5.0.tgz?cache=0&sync_timestamp=1584646121003&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftough-cookie%2Fdownload%2Ftough-cookie-2.5.0.tgz",
-      "integrity": "sha1-zZ+yoKodWhK0c72fuW+j3P9lreI=",
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
    "traverse": {
      "version": "0.6.6",
      "resolved": "https://registry.npm.taobao.org/traverse/download/traverse-0.6.6.tgz",
@@ -4100,19 +3867,6 @@
        }
      }
    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz?cache=0&sync_timestamp=1581364203962&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftweetnacl%2Fdownload%2Ftweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
    "type": {
      "version": "1.2.0",
      "resolved": "https://registry.npm.taobao.org/type/download/type-1.2.0.tgz?cache=0&sync_timestamp=1598016585110&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftype%2Fdownload%2Ftype-1.2.0.tgz",
@@ -4179,6 +3933,7 @@
      "version": "4.4.0",
      "resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.0.tgz?cache=0&sync_timestamp=1598814377097&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.0.tgz",
      "integrity": "sha1-qnFCYd55PoqCNHp7zJznTobyhgI=",
+      "dev": true,
      "requires": {
        "punycode": "^2.1.0"
      }
@@ -4188,11 +3943,6 @@
      "resolved": "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz",
      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npm.taobao.org/uuid/download/uuid-3.4.0.tgz?cache=0&sync_timestamp=1595886641252&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuuid%2Fdownload%2Fuuid-3.4.0.tgz",
-      "integrity": "sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4="
-    },
    "v8-compile-cache": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
@@ -4204,16 +3954,6 @@
      "resolved": "https://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz",
      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
    "which": {
      "version": "2.0.2",
      "resolved": "https://registry.npm.taobao.org/which/download/which-2.0.2.tgz?cache=0&sync_timestamp=1574116720213&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-2.0.2.tgz",
@@ -4231,7 +3971,7 @@
    },
    "which-pm-runs": {
      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/which-pm-runs/download/which-pm-runs-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
      "dev": true
    },

--- a/package.json
+++ b/package.json
@@ -44,8 +44,7 @@
    "axios": "^0.20.0",
    "express": "^4.17.1",
    "express-fileupload": "^1.1.9",
-    "pac-proxy-agent": "^4.0.0",
-    "request": "^2.88.0"
+    "pac-proxy-agent": "^4.0.0"
  },
  "devDependencies": {
    "@types/node": "14.11.2",

--- a/test/album.test.js
+++ b/test/album.test.js
 const assert = require('assert')
-const request = require('request')
+const axios = require('axios')
 const host = global.host || 'http://localhost:3000'

 describe('测试获取歌手专辑列表是否正常', () => {
@@ -8,14 +8,18 @@ describe('测试获取歌手专辑列表是否正常', () => {
      id: 32311,
    }

-    request.get({ url: `${host}/album`, qs: qs }, (err, res, body) => {
-      if (!err && res.statusCode == 200) {
-        body = JSON.parse(body)
-        assert(body.code === 200)
+    axios
+      .get(`${host}/album`, {
+        params: qs,
+      })
+      .then(({ status, data }) => {
+        if (status == 200) {
+          assert(data.code === 200)
+        }
        done()
-      } else {
+      })
+      .catch((err) => {
        done(err)
-      }
-    })
+      })
  })
 })
--- a/test/comment.test.js
+++ b/test/comment.test.js
 const assert = require('assert')
-const request = require('request')
+const axios = require('axios')
 const host = global.host || 'http://localhost:3000'

 describe('测试获取评论是否正常', () => {
@@ -8,14 +8,18 @@ describe('测试获取评论是否正常', () => {
      id: 32311,
    }

-    request.get({ url: `${host}/comment/album`, qs: qs }, (err, res, body) => {
-      if (!err && res.statusCode == 200) {
-        body = JSON.parse(body)
-        assert(body.code === 200)
+    axios
+      .get(`${host}/comment/album`, {
+        params: qs,
+      })
+      .then(({ status, data }) => {
+        if (status == 200) {
+          assert(data.code === 200)
+        }
        done()
-      } else {
+      })
+      .catch((err) => {
        done(err)
-      }
-    })
+      })
  })
 })
--- a/test/login.test.js
+++ b/test/login.test.js
 const assert = require('assert')
-const request = require('request')
+const axios = require('axios')
 const host = global.host || 'http://localhost:3000'

 console.log('注意: 测试登录需在 test/login.test.js 中填写账号密码!!!')
@@ -12,18 +12,21 @@ describe('测试登录是否正常', () => {
      password: process.env.NCM_API_TEST_LOGIN_PASSWORD || password || '',
    }

-    request.get(
-      { url: `${host}/login/cellphone`, qs: qs },
-      (err, res, body) => {
-        if (!err && res.statusCode == 200) {
-          body = JSON.parse(body)
-          assert(body.code === 200)
-          console.log('昵称:' + body.profile.nickname)
+    axios
+      .get(`${host}/login/cellphone`, {
+        params: qs,
+      })
+      .then(({ status, data }) => {
+        if (status == 200) {
+          console.log('昵称:' + data.profile.nickname)
+          assert(data.code === 200)
          done()
        } else {
          done('登录错误')
        }
-      },
-    )
+      })
+      .catch((err) => {
+        done(err)
+      })
  })
 })
--- a/test/lyric.test.js
+++ b/test/lyric.test.js
 const assert = require('assert')
-const request = require('request')
+const axios = require('axios')
 const host = global.host || 'http://localhost:3000'

 describe('测试获取歌词是否正常', () => {
@@ -8,14 +8,18 @@ describe('测试获取歌词是否正常', () => {
      id: 347230,
    }

-    request.get({ url: `${host}/lyric`, qs: qs }, (err, res, body) => {
-      if (!err && res.statusCode == 200) {
-        body = JSON.parse(body)
-        assert(typeof body.lrc !== 'undefined')
+    axios
+      .get(`${host}/lyric`, {
+        params: qs,
+      })
+      .then(({ status, data }) => {
+        if (status == 200) {
+          assert(typeof data.lrc !== 'undefined')
+        }
        done()
-      } else {
+      })
+      .catch((err) => {
        done(err)
-      }
-    })
+      })
  })
 })
--- a/test/music_url.test.js
+++ b/test/music_url.test.js
 const assert = require('assert')
-const request = require('request')
+const axios = require('axios')
 const host = global.host || 'http://localhost:3000'

 describe('测试获取歌曲是否正常', () => {
@@ -9,14 +9,18 @@ describe('测试获取歌曲是否正常', () => {
      br: 999000,
    }

-    request.get({ url: `${host}/song/url`, qs: qs }, (err, res, body) => {
-      if (!err && res.statusCode == 200) {
-        body = JSON.parse(body)
-        assert(!!body.data[0].url)
+    axios
+      .get(`${host}/song/url`, {
+        params: qs,
+      })
+      .then(({ status, data }) => {
+        if (status == 200) {
+          assert(!!data.data[0].url)
+        }
        done()
-      } else {
+      })
+      .catch((err) => {
        done(err)
-      }
-    })
+      })
  })
 })
--- a/test/search.test.js
+++ b/test/search.test.js
 const assert = require('assert')
-const request = require('request')
+const axios = require('axios')
 const host = global.host || 'http://localhost:3000'

 describe('测试搜索是否正常', () => {
@@ -8,14 +8,18 @@ describe('测试搜索是否正常', () => {
      keywords: '海阔天空',
      type: 1,
    }
-    request.get({ url: `${host}/search`, qs: qs }, (err, res, body) => {
-      if (!err && res.statusCode == 200) {
-        body = JSON.parse(body)
-        assert(body.result.songs[0].name === '海阔天空')
+    axios
+      .get(`${host}/search`, {
+        params: qs,
+      })
+      .then(({ status, data }) => {
+        if (status == 200) {
+          assert(data.result.songs[0].name === '海阔天空')
+        }
        done()
-      } else {
+      })
+      .catch((err) => {
        done(err)
-      }
-    })
+      })
  })
 })
--- a/util/request.js
+++ b/util/request.js
 const encrypt = require('./crypto')
-const request = require('request')
+const axios = require('axios')
 const queryString = require('querystring')
 const PacProxyAgent = require('pac-proxy-agent')
-const zlib = require('zlib')
+const http = require('http')
+const https = require('https')

 // request.debug = true // 开启可看到更详细信息

@@ -114,66 +115,47 @@ const createRequest = (method, url, data, options) => {
      method: method,
      url: url,
      headers: headers,
-      body: queryString.stringify(data),
+      data: queryString.stringify(data),
+      httpAgent: new http.Agent({ keepAlive: true }),
+      httpsAgent: new https.Agent({ keepAlive: true }),
    }

    if (options.crypto === 'eapi') settings.encoding = null

    if (/\.pac$/i.test(options.proxy)) {
-      settings.agent = new PacProxyAgent(options.proxy)
+      settings.httpAgent = new PacProxyAgent(options.proxy)
+      settings.httpsAgent = new PacProxyAgent(options.proxy)
    } else {
      settings.proxy = options.proxy
    }

-    request(settings, (err, res, body) => {
-      if (err) {
-        answer.status = 502
-        answer.body = { code: 502, msg: err.stack }
-        reject(answer)
-      } else {
+    axios(settings)
+      .then((res) => {
+        const body = res.data
        answer.cookie = (res.headers['set-cookie'] || []).map((x) =>
          x.replace(/\s*Domain=[^(;|$)]+;*/, ''),
        )
        try {
-          if (options.crypto === 'eapi') {
-            zlib.unzip(body, function (err, buffer) {
-              const _buffer = err ? body : buffer
-              try {
-                try {
-                  answer.body = JSON.parse(encrypt.decrypt(_buffer).toString())
-                  answer.status = answer.body.code || res.statusCode
-                } catch (e) {
-                  answer.body = JSON.parse(_buffer.toString())
-                  answer.status = res.statusCode
-                }
-              } catch (e) {
-                answer.body = _buffer.toString()
-                answer.status = res.statusCode
-              }
-              answer.status =
-                100 < answer.status && answer.status < 600 ? answer.status : 400
-              if (answer.status === 200) resolve(answer)
-              else reject(answer)
-            })
-            return false
-          } else {
-            answer.body = JSON.parse(body)
-            answer.status = answer.body.code || res.statusCode
-            if (answer.body.code === 502) {
-              answer.status = 200
-            }
+          answer.body = body
+          answer.status = answer.body.code || res.status
+          if (answer.body.code === 502) {
+            answer.status = 200
          }
        } catch (e) {
          answer.body = body
-          answer.status = res.statusCode
+          answer.status = res.status
        }

        answer.status =
          100 < answer.status && answer.status < 600 ? answer.status : 400
        if (answer.status == 200) resolve(answer)
        else reject(answer)
-      }
-    })
+      })
+      .catch((err) => {
+        answer.status = 502
+        answer.body = { code: 502, msg: err }
+        reject(answer)
+      })
  })
 }