fix issue #17

routes/v2.js

@@ -43,167 +43,4 @@ const convert = (req, res, next) => {
     }
 }
 
-const createServer = (config) => {
-    return new Promise((resolve, reject) => {
-        console.log(config)
-        request(config, (err, ret, body) => {
-            //console.log(ret)
-            if (!err && ret.statusCode === 200) {
-                // console.log(qs.parse(unescape(body)))
-                resolve(body)
-            } else {
-                reject(err)
-            }
-        })
-    })
-}
-
-function getJSON(req, res, next) {
-    var ip = req.headers['x-real-ip'] ? req.headers['x-real-ip'] : req.ip.replace(/::ffff:/, '');
-    var host = req.hostname;
-    var protocol = req.protocol;
-    var originalUrl = req.originalUrl;
-    var url = req.query.url || req.body.url;
-    var callback = req.query.callback || req.body.callback;
-    var params = req.body;
-    var output = {
-        data: {
-            IP: ip,
-            Info: 'Please Set URL Like This: ' + protocol + '://' + host + '/v1/?url=http[s]://YourWantProxyUrl.Com'
-        },
-        status: {
-            code: 200,
-            message: ''
-        }
-    };
-    if (disabledIP.indexOf(ip) > -1) {
-
-        output['data']['info'] = '很抱歉，您的IP因为滥用接口已被禁用，如有疑问，请致信 xioveliu@gmail.com ';
-        output['status'] = -1;
-        output['message'] = 'DISABLED IP';
-        res.json(output);
-
-    } else {
-
-        method = req.method.toUpperCase();
-        var _cookies = req.cookies;
-        var headers = { 'user-agent': req.headers['user-agent'] };
-        //console.log(headers);
-        if (url) {
-            var _temp = {};
-            switch (method) {
-                case 'GET':
-                    // get request
-                    if (/\?url\=/.test(originalUrl)) {
-                        url = originalUrl.split('url=')[1];
-                    }
-
-                    if (params) {
-                        for (var i in params) {
-                            _temp[i] = encodeURI(params[i]);
-                        }
-                    }
-                    url = url.indexOf('?') === -1 ? url.replace(/\&/, '?') : url;
-                    url = /^(http|https)\:\/\//.test(url) ? url : 'http://' + url;
-                    url = url.replace(/\&callback\=(\w+)/, '');
-                    request
-                        .get(url)
-                        .set(headers)
-                        .set(_cookies)
-                        .query(_temp)
-                        .end(function(err, response) {
-                            var body = {};
-                            if (response && response.text) {
-                                body = response.text;
-                            } else if (response && response.body) {
-                                body = response.body;
-                            }
-                            if (typeof body === 'string') {
-                                try {
-                                    body = JSON.parse(body);
-                                } catch (e) {
-                                    output.status = {
-                                        code: -1
-                                    };
-                                }
-                            }
-                            if (!err && response.statusCode == 200) {
-                                output = body;
-                            } else {
-                                output = {
-                                    data: {},
-                                    status: {
-                                        code: -1,
-                                        message: err || 'Something bad happend.'
-                                    }
-                                };
-                            }
-                            if (callback) {
-                                res.jsonp(output);
-                            } else {
-                                res.json(output);
-                            }
-                        });
-                    break;
-                default:
-                    // post request
-                    if (params) {
-                        for (var i in params) {
-                            _temp[i] = params[i];
-                        }
-                    }
-                    request
-                        .post(url)
-                        .set(headers)
-                        .set(_cookies)
-                        .type('form')
-                        .send(_temp)
-                        .end(function(err, response) {
-                            var body = {};
-                            if (response && response.text) {
-                                body = response.text;
-                            } else if (response && response.body) {
-                                body = response.body;
-                            }
-                            if (typeof body === 'string') {
-                                try {
-                                    body = JSON.parse(body);
-                                } catch (e) {
-                                    output.status = {
-                                        code: -1
-                                    };
-                                }
-                            }
-                            if (!err && response.statusCode == 200) {
-                                output = body;
-                            } else {
-                                output = {
-                                    data: {},
-                                    status: {
-                                        code: -1,
-                                        message: err || 'Something bad happend.'
-                                    }
-                                };
-                            }
-                            if (callback) {
-                                res.jsonp(output);
-                            } else {
-                                res.json(output);
-                            }
-                        });
-                    break;
-            }
-        } else {
-            if (callback) {
-                res.jsonp(output);
-            } else {
-                res.json(output);
-            }
-        }
-    }
-
-}
-
-
-
 module.exports = router;

utils/utils.js

@@ -6,6 +6,7 @@ const qs = require('qs');
  * @return {Object} Promise
  */
 const createServer = (config) => {
+    //console.log(config)
     return new Promise((resolve, reject) => {
         request(config, (err, ret, body) => {
             if (!err) {
@@ -28,8 +29,10 @@ const convert = (req,res,next,url) => {
     let host = req.hostname;
     let protocol = req.protocol;
     let method = req.method.toUpperCase();
+    //console.log(method)
     let ip = req.headers['x-real-ip'] ? req.headers['x-real-ip'] : req.ip.replace(/::ffff:/, '');
     let _params = method === 'GET' ? req.query : req.body;
+    _params['url'] = req.body.url || req.query.url;
     let cb = _params.callback;
     let headers = req.headers;
     let config = {
@@ -50,13 +53,27 @@ const convert = (req,res,next,url) => {
                     params[k[0]] = encodeURI(k[1]);
                 })
             }
+        }else if(i=='headers'){
+            let _t = temp || '{}'
+            let _chs = eval(`(${_t})`)
+            for(let ch in _chs){
+                headers[ch] = _chs[ch]
+            }
         } else {
             params[i] = temp;
         }
     }
-    if (method === 'POST') config['json'] = params;
+    let _hs = headers
+    let hs = {}
+    for(let _h in _hs){
+        let h = _hs[_h]
+        if(/(content-length)/.test(_h)) continue
+        else hs[_h] = _hs[_h]
+    }
+    //console.log(hs)
+    if (method === 'POST') config['form'] = params;
     else config['url'] = config['url'] ? `${config['url']}?${qs.stringify(params)}` : (url?`${url}?${qs.stringify(params)}`:null) ;
-    config['headers'] = headers;
+    config['headers'] = hs;
     return [config,protocol,host,cb,params]
 }