Sitelet https://github.com/alibaba/anyproxy/commit/87167ab01de4eff39b85b697a8464053b65af733
Skip to content

Commit 87167ab

Browse files
author
加里
committed
2 parents e38d5fe + dd14d33 commit 87167ab

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

‎lib/requestHandler.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ function setRules(newRule){
300300
return;
301301
}else{
302302
userRule = util.merge(defaultRule,newRule);
303+
'function' == typeof(userRule.summary) && userRule.summary();
303304
}
304305
}
305306

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"express": "^4.8.5",
1616
"iconv-lite": "^0.4.4",
1717
"nedb": "^0.11.0",
18-
"ws": "^0.4.32"
18+
"ws": "^0.4.32",
19+
"iconv-lite": "^0.4.4"
1920
},
2021
"devDependencies": {
2122
"tunnel": "0.0.3"

‎proxy.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
//mix some modules to global.util
2+
try{
3+
GLOBAL.util = {};
4+
GLOBAL.util['iconv-lite'] = require("iconv-lite");
5+
}catch(e){}
6+
17
var http = require('http'),
28
https = require('https'),
39
fs = require('fs'),
@@ -15,12 +21,6 @@ var http = require('http'),
1521

1622
GLOBAL.recorder = new Recorder();
1723

18-
//mix some modules to global.util
19-
try{
20-
GLOBAL.util = {};
21-
GLOBAL.util['iconv-lite'] = require("iconv-lite");
22-
}catch(e){}
23-
2424
var T_TYPE_HTTP = 0,
2525
T_TYPE_HTTPS = 1,
2626
DEFAULT_PORT = 8001,
@@ -54,6 +54,9 @@ function proxyServer(type, port, hostname,ruleFile){
5454
}else{
5555
console.log(color.red("can not find rule file"));
5656
}
57+
}else{
58+
rules = require("./lib/rule_default.js");
59+
requestHandler.setRules(rules);
5760
}
5861

5962
async.series(

0 commit comments

Comments
 (0)