joshua
/
websockify
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit '46450577c2fb119fc5bf0ac09664f22651a080d0'

This commit is contained in:
Peter Åstrand (astrand) 2013-11-27 13:29:54 +01:00
parent 122985bd67 46450577c2
commit cf901ddac5
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
other/websockify.js
View File

@ -7,14 +7,6 @@
// Known to work with node 0.8.9 // Known to work with node 0.8.9
// Requires node modules: ws, optimist and policyfile // Requires node modules: ws, optimist and policyfile
// npm install ws optimist policyfile // npm install ws optimist policyfile
//
// NOTE:
// This version requires a patched version of einaros/ws that supports
// subprotocol negotiation. You can use the patched version like this:
//
// cd websockify/other
// git clone https://github.com/kanaka/ws
// npm link ./ws
var argv = require('optimist').argv, var argv = require('optimist').argv,
@ -37,6 +29,7 @@ var argv = require('optimist').argv,
// Handle new WebSocket client // Handle new WebSocket client
new_client = function(client) { new_client = function(client) {
var clientAddr = client._socket.remoteAddress, log; var clientAddr = client._socket.remoteAddress, log;
console.log(client.upgradeReq.url);
log = function (msg) { log = function (msg) {
console.log(' ' + clientAddr + ': '+ msg); console.log(' ' + clientAddr + ': '+ msg);
}; };
@ -61,6 +54,12 @@ new_client = function(client) {
}); });
target.on('end', function() { target.on('end', function() {
log('target disconnected'); log('target disconnected');
client.close();
});
target.on('error', function() {
log('target connection error');
target.end();
client.close();
}); });
client.on('message', function(msg) { client.on('message', function(msg) {
@ -126,11 +125,9 @@ http_request = function (request, response) {
// Select 'binary' or 'base64' subprotocol, preferring 'binary' // Select 'binary' or 'base64' subprotocol, preferring 'binary'
selectProtocol = function(protocols, callback) { selectProtocol = function(protocols, callback) {
var plist = protocols ? protocols.split(',') : ""; if (protocols.indexOf('binary') >= 0) {
var plist = protocols.split(',');
if (plist.indexOf('binary') >= 0) {
callback(true, 'binary'); callback(true, 'binary');
} else if (plist.indexOf('base64') >= 0) { } else if (protocols.indexOf('base64') >= 0) {
callback(true, 'base64'); callback(true, 'base64');
} else { } else {
console.log("Client must support 'binary' or 'base64' protocol"); console.log("Client must support 'binary' or 'base64' protocol");