Skip to content

Fix for crash on uncaught exception #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
staaldraad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for crash on uncaught exception #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions wsproxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ var verbose = config.verbose

var getTimeStamp = processor.getTimeStamp;


if (config.logStdOutToFile) {
var fs = require('fs');
var path = require('path');
Expand Down Expand Up @@ -73,6 +72,7 @@ https_mitm = https.createServer(ssloptions, function (req, res) {
var proxy_request = https.request(options);
proxyRequestor(req,res,proxy_request)
}catch(err){
console.trace()
}
}).listen(config.sslport);

Expand All @@ -88,7 +88,9 @@ http_mitm = http.createServer(function(req,res){
try{
var proxy_request = http.request(options);
proxyRequestor(req,res,proxy_request)
}catch(err){}
}catch(err){
console.trace()
}
}).listen(config.httpport)

//Handle CONNECT request for HTTPS sessions
Expand Down Expand Up @@ -335,13 +337,19 @@ wsServer.on('request', function(request) {
doLog(['Open',request.resourceURL.path]);
processor.socketOpen(request.resourceURL.path);
createClient(proto, host, request, origin, connection);

});



proxyRequestor = function(req,res,proxy_request){
proxy_request.addListener('response', function (proxy_response) {
proxy_request.on('error', function(err) {
// Handle error
proxy_request.end();
res.end()
});

proxy_request.addListener('response', function (proxy_response) {
proxy_response.addListener('data', function(chunk) {
res.write(chunk, 'binary');
});
Expand All @@ -356,4 +364,4 @@ proxyRequestor = function(req,res,proxy_request){
req.addListener('end', function() {
proxy_request.end();
});
}
}