mirror of
https://github.com/alibaba/anyproxy.git
synced 2025-04-24 04:41:26 +00:00
Merge remote-tracking branch 'origin'
This commit is contained in:
commit
8e0dc781d3
@ -345,7 +345,27 @@ function setRules(newRule){
|
||||
}
|
||||
|
||||
userRule = util.merge(defaultRule,newRule);
|
||||
'function' == typeof(userRule.summary) && console.log(userRule.summary());
|
||||
|
||||
var functions = [];
|
||||
if('function' == typeof(userRule.init)){
|
||||
functions.push(function(cb){
|
||||
userRule.init(cb);
|
||||
});
|
||||
}
|
||||
if('function' == typeof(userRule.summary)){
|
||||
functions.push(function(cb){
|
||||
userRule.summary();
|
||||
cb(null);
|
||||
});
|
||||
}
|
||||
async.series(functions,function(errors,result){
|
||||
if(!errors){
|
||||
console.log(color.green('Anyproxy initialize finished, have a fun!'));
|
||||
}
|
||||
});
|
||||
|
||||
//'function' == typeof(userRule.init) && console.log(userRule.init());
|
||||
//'function' == typeof(userRule.summary) && console.log(userRule.summary());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "anyproxy",
|
||||
"version": "2.8.8",
|
||||
"version": "2.8.10",
|
||||
"description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.",
|
||||
"main": "proxy.js",
|
||||
"bin": {
|
||||
@ -24,6 +24,7 @@
|
||||
"test": "nodeunit test.js"
|
||||
},
|
||||
"optionalDependencies":{
|
||||
"underscore":"^1.7.0",
|
||||
"cookie":"^0.1.2",
|
||||
"mysql":"^2.5.2",
|
||||
"iconv-lite": "^0.4.4",
|
||||
@ -34,7 +35,8 @@
|
||||
"socks5-https-client": "^0.2.2",
|
||||
"http-proxy-agent":"^0.2.6",
|
||||
"https-proxy-agent":"^0.3.5",
|
||||
"tcp-ping":"^0.1.1"
|
||||
"tcp-ping":"^0.1.1",
|
||||
"request":"^2.48.0"
|
||||
},
|
||||
"repository": {
|
||||
"type":"git",
|
||||
|
1
proxy.js
1
proxy.js
@ -13,6 +13,7 @@ try{
|
||||
GLOBAL.util['HttpProxyAgent'] = require('http-proxy-agent');
|
||||
GLOBAL.util['HttpsProxyAgent'] = require('https-proxy-agent');
|
||||
GLOBAL.util['tcp-ping'] = require('tcp-ping');
|
||||
GLOBAL.util['request'] = require('request');
|
||||
GLOBAL.util['async'] = require('async');
|
||||
}catch(e){}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user