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

Use Buffer base64 support instead of pkrumins/node-base64

This commit is contained in:
Joel Martin 2013-02-19 13:12:10 -06:00
parent 3d37d21b5f
commit 805026360e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
other/websockify.js
View File

@ -5,8 +5,8 @@
// Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3) // Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
// Known to work with node 0.8.9 // Known to work with node 0.8.9
// Requires node modules: ws, base64, optimist and policyfile // Requires node modules: ws, optimist and policyfile
// npm install ws base64 optimist policyfile // npm install ws optimist policyfile
// //
// NOTE: // NOTE:
// This version requires a patched version of einaros/ws that supports // This version requires a patched version of einaros/ws that supports
@ -26,7 +26,6 @@ var argv = require('optimist').argv,
fs = require('fs'), fs = require('fs'),
policyfile = require('policyfile'), policyfile = require('policyfile'),
base64 = require('base64/build/Release/base64'),
Buffer = require('buffer').Buffer, Buffer = require('buffer').Buffer,
WebSocketServer = require('ws').Server, WebSocketServer = require('ws').Server,
@ -51,7 +50,7 @@ new_client = function(client) {
//log("sending message: " + data); //log("sending message: " + data);
try { try {
if (client.protocol === 'base64') { if (client.protocol === 'base64') {
client.send(base64.encode(new Buffer(data))); client.send(new Buffer(data).toString('base64'));
} else { } else {
client.send(data,{binary: true}); client.send(data,{binary: true});
} }
@ -67,7 +66,7 @@ new_client = function(client) {
client.on('message', function(msg) { client.on('message', function(msg) {
//log('got message: ' + msg); //log('got message: ' + msg);
if (client.protocol === 'base64') { if (client.protocol === 'base64') {
target.write(base64.decode(msg),'binary'); target.write(new Buffer(msg, 'base64'));
} else { } else {
target.write(msg,'binary'); target.write(msg,'binary');
} }