Skip to content

Commit 1696577

Browse files
authored
Merge pull request alibaba#308 from alibaba/brotli-fix
update dependency to brotli
2 parents 8c3727e + ecb9a71 commit 1696577

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

lib/requestHandler.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const http = require('http'),
1212
logUtil = require('./log'),
1313
co = require('co'),
1414
HttpsServerMgr = require('./httpsServerMgr'),
15-
brotliTorb = require('iltorb'),
15+
brotliTorb = require('brotli'),
1616
Readable = require('stream').Readable;
1717

1818
const requestErrorHandler = require('./requestErrorHandler');
@@ -138,13 +138,13 @@ function fetchRemoteResponse(protocol, options, reqData, config) {
138138
} else if (isBrotlied && originContentLen) {
139139
refactContentEncoding();
140140

141-
brotliTorb.decompress(serverResData, (err, buff) => {
142-
if (err) {
143-
rejectParsing(err);
144-
} else {
145-
fulfill(buff);
146-
}
147-
});
141+
try {
142+
// an Unit8Array returned by decompression
143+
const result = brotliTorb.decompress(serverResData);
144+
fulfill(Buffer.from(result));
145+
} catch (e) {
146+
rejectParsing(e);
147+
}
148148
} else {
149149
fulfill(serverResData);
150150
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"async": "~0.9.0",
1212
"async-task-mgr": ">=1.1.0",
1313
"body-parser": "^1.13.1",
14+
"brotli": "^1.3.2",
1415
"classnames": "^2.2.5",
1516
"clipboard-js": "^0.3.3",
1617
"co": "^4.6.0",
@@ -21,7 +22,6 @@
2122
"es6-promise": "^3.3.1",
2223
"express": "^4.8.5",
2324
"iconv-lite": "^0.4.6",
24-
"iltorb": "^2.0.3",
2525
"inquirer": "^3.0.1",
2626
"ip": "^0.3.2",
2727
"juicer": "^0.6.6-stable",

0 commit comments

Comments
 (0)