Merge branch 'master' of gitlab.alibaba-inc.com:alipay-ct-wd/anyproxy

This commit is contained in:
加里 2014-10-21 13:44:31 +08:00
commit 73786c6688
2 changed files with 6 additions and 2 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "anyproxy", "name": "anyproxy",
"version": "2.5.0", "version": "2.5.1",
"description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.", "description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.",
"main": "proxy.js", "main": "proxy.js",
"bin": { "bin": {
@ -20,7 +20,9 @@
"qrcode-npm": "0.0.3", "qrcode-npm": "0.0.3",
"socks5-http-client": "^0.1.6", "socks5-http-client": "^0.1.6",
"socks5-https-client": "^0.2.2", "socks5-https-client": "^0.2.2",
"ws": "^0.4.32" "ws": "^0.4.32",
"jsdom":"^1.0.3",
"jquery":"^2.1.1"
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {

View File

@ -4,6 +4,8 @@ try{
GLOBAL.util['iconv-lite'] = require("iconv-lite"); GLOBAL.util['iconv-lite'] = require("iconv-lite");
GLOBAL.util['colorful'] = require("colorful"); GLOBAL.util['colorful'] = require("colorful");
GLOBAL.util['path'] = require("path"); GLOBAL.util['path'] = require("path");
GLOBAL.util['jsdom'] = require('jsdom');
GLOBAL.util['jquery'] = require('jquery');
GLOBAL.util['Socks5ClientHttpAgent'] = require('socks5-http-client/lib/Agent'); GLOBAL.util['Socks5ClientHttpAgent'] = require('socks5-http-client/lib/Agent');
GLOBAL.util['Socks5ClientHttpsAgent'] = require('socks5-https-client/lib/Agent'); GLOBAL.util['Socks5ClientHttpsAgent'] = require('socks5-https-client/lib/Agent');
}catch(e){} }catch(e){}