XiaoMo/anyproxy
1
0
Fork 0
mirror of https://github.com/alibaba/anyproxy.git synced 2025-04-24 16:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #308 from alibaba/brotli-fix

Browse Source 
update dependency to brotli
This commit is contained in:
Otto Mao 2018-01-02 10:19:59 +08:00 committed by GitHub
commit 1696577f9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/requestHandler.js
View File

@ -12,7 +12,7 @@ const http = require('http'),
logUtil = require('./log'), logUtil = require('./log'),
co = require('co'), co = require('co'),
HttpsServerMgr = require('./httpsServerMgr'), HttpsServerMgr = require('./httpsServerMgr'),
brotliTorb = require('iltorb'), brotliTorb = require('brotli'),
Readable = require('stream').Readable; Readable = require('stream').Readable;
const requestErrorHandler = require('./requestErrorHandler'); const requestErrorHandler = require('./requestErrorHandler');
@ -138,13 +138,13 @@ function fetchRemoteResponse(protocol, options, reqData, config) {
} else if (isBrotlied && originContentLen) { } else if (isBrotlied && originContentLen) {
refactContentEncoding(); refactContentEncoding();
brotliTorb.decompress(serverResData, (err, buff) => { try {
if (err) { // an Unit8Array returned by decompression
rejectParsing(err); const result = brotliTorb.decompress(serverResData);
} else { fulfill(Buffer.from(result));
fulfill(buff); } catch (e) {
rejectParsing(e);
} }
});
} else { } else {
fulfill(serverResData); fulfill(serverResData);
} }

2
package.json
View File

@ -11,6 +11,7 @@
"async": "~0.9.0", "async": "~0.9.0",
"async-task-mgr": ">=1.1.0", "async-task-mgr": ">=1.1.0",
"body-parser": "^1.13.1", "body-parser": "^1.13.1",
"brotli": "^1.3.2",
"classnames": "^2.2.5", "classnames": "^2.2.5",
"clipboard-js": "^0.3.3", "clipboard-js": "^0.3.3",
"co": "^4.6.0", "co": "^4.6.0",
@ -21,7 +22,6 @@
"es6-promise": "^3.3.1", "es6-promise": "^3.3.1",
"express": "^4.8.5", "express": "^4.8.5",
"iconv-lite": "^0.4.6", "iconv-lite": "^0.4.6",
"iltorb": "^2.0.3",
"inquirer": "^3.0.1", "inquirer": "^3.0.1",
"ip": "^0.3.2", "ip": "^0.3.2",
"juicer": "^0.6.6-stable", "juicer": "^0.6.6-stable",