mirror of
https://github.com/avwo/whistle.git
synced 2026-10-22 17:39:12 +08:00
refactor: refine code
This commit is contained in:
+9
-10
@@ -22,6 +22,7 @@ var CONCURRENT = 3;
|
||||
var CLOSED_ERR = new Error('closed');
|
||||
var MSM = 1200;
|
||||
var PMCS = 3600;
|
||||
var REQ_OPTS = { endStream: true };
|
||||
|
||||
function onClose(stream, callback) {
|
||||
stream.on('error', callback);
|
||||
@@ -267,16 +268,14 @@ function requestH2(client, req, res, callback) {
|
||||
headers[':method'] = options.method;
|
||||
headers[':authority'] = req.headers.host;
|
||||
try {
|
||||
var h2Session = client.request(headers);
|
||||
if (req.noReqBody) {
|
||||
onClose(h2Session, function() {
|
||||
if (!responsed) {
|
||||
responsed = true;
|
||||
h2Session.destroy();
|
||||
callback();
|
||||
}
|
||||
});
|
||||
}
|
||||
var h2Session = client.request(headers, req.noReqBody ? REQ_OPTS : undefined);
|
||||
onClose(h2Session, function() {
|
||||
if (!responsed) {
|
||||
responsed = true;
|
||||
h2Session.destroy();
|
||||
req.noReqBody && callback();
|
||||
}
|
||||
});
|
||||
var additionalHeaders;
|
||||
h2Session.once('headers', function(headers) {
|
||||
try {
|
||||
|
||||
+3
-3
@@ -698,9 +698,9 @@ function resolveWebsocket(socket, wss) {
|
||||
var newUrl = params
|
||||
? util.replaceUrlQueryString(fullUrl, params)
|
||||
: fullUrl;
|
||||
var queryProps = util.parseDelQuery(socket);
|
||||
newUrl = util.parsePathReplace(newUrl, urlReplace) || newUrl;
|
||||
newUrl = util.deleteQuery(newUrl, queryProps, socket._delQueryString);
|
||||
var dProps = util.parseDelQuery(socket);
|
||||
newUrl = util.parsePathReplace(newUrl, urlReplace, dProps.paths) || newUrl;
|
||||
newUrl = util.deleteQuery(newUrl, dProps.query, socket._delQueryString);
|
||||
if (newUrl !== fullUrl) {
|
||||
fullUrl = newUrl;
|
||||
socket._realUrl = newUrl;
|
||||
|
||||
Reference in New Issue
Block a user