Merge pull request #432 from trazyn/master

Add pac proxy support

docs/README.md

@@ -227,6 +227,8 @@ $ sudo docker run -d -p 3000:3000 netease-music-api
 
 **接口地址 :** `/login/cellphone`
 
+**可选参数 :** `countrycode`: 国家码，用于国外手机号登陆，例如美国传入：`1`
+
 **调用例子 :** `/login/cellphone?phone=xxx&password=yyy`
 
 #### 2. 邮箱登录

module/login_cellphone.js

@@ -5,6 +5,7 @@ const crypto = require('crypto')
 module.exports = (query, request) => {
     const data = {
         phone: query.phone,
+        countrycode: query.countrycode,
         password: crypto.createHash('md5').update(query.password).digest('hex'),
         rememberLogin: 'true'
     }
@@ -12,4 +13,4 @@ module.exports = (query, request) => {
         'POST', `https://music.163.com/weapi/login/cellphone`, data,
         {crypto: 'weapi', ua: 'pc', cookie: query.cookie, proxy: query.proxy}
     )
-}
+}

package.json

@@ -17,6 +17,7 @@
   "dependencies": {
     "apicache": "^1.2.1",
     "express": "^4.16.3",
+    "pac-proxy-agent": "^3.0.0",
     "request": "^2.85.0"
   },
   "devDependencies": {

util/request.js

@@ -1,6 +1,7 @@
 const encrypt = require('./crypto')
 const request = require('request')
 const queryString = require('querystring')
+const PacProxyAgent = require('pac-proxy-agent')
 
 // request.debug = true // 开启可看到更详细信息
 
@@ -67,14 +68,21 @@ const createRequest = (method, url, data, options) => {
     }
 
     const answer = { status: 500, body: {}, cookie: [] }
+    const settings = {
+      method: method,
+      url: url,
+      headers: headers,
+      body: queryString.stringify(data)
+    }
+
+    if (/\.pac$/i.test(options.proxy)) {
+      settings.agent = new PacProxyAgent(options.proxy)
+    } else {
+      settings.proxy = options.proxy
+    }
+
     request(
-      {
+      settings,
-        method: method,
-        url: url,
-        headers: headers,
-        body: queryString.stringify(data),
-        proxy: options.proxy
-      },
       (err, res, body) => {
         if (err) {
           answer.status = 502