XiaoMo/anyproxy
1
0
Fork 0
mirror of https://github.com/alibaba/anyproxy.git synced 2025-04-23 15:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/alipay-ct-wd/anyproxy

Browse Source
This commit is contained in:
加里 2014-09-03 15:21:03 +08:00
commit 87167ab01d
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/requestHandler.js
View File

@ -300,6 +300,7 @@ function setRules(newRule){
return; return;
}else{ }else{
userRule = util.merge(defaultRule,newRule); userRule = util.merge(defaultRule,newRule);
'function' == typeof(userRule.summary) && userRule.summary();
} }
} }

3
package.json
View File

@ -15,7 +15,8 @@
"express": "^4.8.5", "express": "^4.8.5",
"iconv-lite": "^0.4.4", "iconv-lite": "^0.4.4",
"nedb": "^0.11.0", "nedb": "^0.11.0",
"ws": "^0.4.32" "ws": "^0.4.32",
"iconv-lite": "^0.4.4"
}, },
"devDependencies": { "devDependencies": {
"tunnel": "0.0.3" "tunnel": "0.0.3"

15
proxy.js
View File

@ -1,3 +1,9 @@
//mix some modules to global.util
try{
GLOBAL.util = {};
GLOBAL.util['iconv-lite'] = require("iconv-lite");
}catch(e){}
var http = require('http'), var http = require('http'),
https = require('https'), https = require('https'),
fs = require('fs'), fs = require('fs'),
@ -15,12 +21,6 @@ var http = require('http'),
GLOBAL.recorder = new Recorder(); GLOBAL.recorder = new Recorder();
//mix some modules to global.util
try{
GLOBAL.util = {};
GLOBAL.util['iconv-lite'] = require("iconv-lite");
}catch(e){}
var T_TYPE_HTTP = 0, var T_TYPE_HTTP = 0,
T_TYPE_HTTPS = 1, T_TYPE_HTTPS = 1,
DEFAULT_PORT = 8001, DEFAULT_PORT = 8001,
@ -54,6 +54,9 @@ function proxyServer(type, port, hostname,ruleFile){
}else{ }else{
console.log(color.red("can not find rule file")); console.log(color.red("can not find rule file"));
} }
}else{
rules = require("./lib/rule_default.js");
requestHandler.setRules(rules);
} }
async.series( async.series(