Add Connection#send

Fixes #27

Author: sitegui

Connection.js

@@ -164,6 +164,21 @@ Connection.prototype.sendBinary = function (data, callback) {
 	this.emit('error', new Error('You can\'t write to a non-open connection'))
 }
 
+/**
+ * Sends a text or binary frame
+ * @param {string|Buffer} data
+ * @param {Function} [callback] will be executed when the data is finally written out
+ */
+Connection.prototype.send = function (data, callback) {
+	if (typeof data === 'string') {
+		this.sendText(data, callback)
+	} else if (Buffer.isBuffer(data)) {
+		this.sendBinary(data, callback)
+	} else {
+		throw new TypeError('data should be either a string or a Buffer instance')
+	}
+}
+
 /**
  * Sends a ping to the remote
  * @param {string} [data=''] - optional ping data

HISTORY.md

@@ -1,3 +1,6 @@
+# 1.5.0
+* Added: `Connection#send` as a short hand for `Connection#sendText` or `Connection#sendBinary`, depending on the data type (string or Buffer)
+
 # 1.4.1
 * Added: example to README
 

README.md

@@ -115,6 +115,11 @@ Sends a single chunk of binary data (like calling connection.beginBinary().end(d
 
 `callback` will be added as a listener to write operation over the socket
 
+## connection.send(data, [callback])
+Sends a given string or Buffer to the other side. This is simply an alias for `sendText()` if data is a string or `sendBinary()` if the data is a Buffer.
+
+`callback` will be added as a listener to write operation over the socket
+
 ## connection.sendPing([data=''])
 Sends a [ping](http://tools.ietf.org/html/rfc6455#section-5.5.2) with optional payload
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nodejs-websocket",
-	"version": "1.4.1",
+	"version": "1.5.0",
 	"author": "Sitegui <sitegui@sitegui.com.br>",
 	"description": "Basic server&client approach to websocket (text and binary frames)",
 	"main": "./index.js",

test/test.js

@@ -35,7 +35,7 @@ describe('extraHeaders', function () {
 	})
 })
 
-describe('text frames', function () {
+describe('frames', function () {
 	before(function (done) {
 		// Create a test server and one client
 		testServer = ws.createServer(function (conn) {
@@ -160,6 +160,31 @@ describe('text frames', function () {
 			done()
 		})
 	})
+
+	it('should send text and binary data', function (done) {
+		var client = getClient(),
+			expected = 'text frame',
+			textData = 'text data',
+			binaryData = new Buffer('binary data')
+
+		// Use send() for text and binary
+		client.send(textData)
+		client.send(binaryData)
+
+		// Test whether both were received
+		getServer(function (str) {
+			expected.should.be.equal('text frame')
+			expected = 'binary frame'
+			str.should.be.equal(textData)
+		}, function (inStream) {
+			expected.should.be.equal('binary frame')
+			expected = ''
+			inStream.once('readable', function () {
+				compareBuffers(inStream.read(), binaryData)
+			})
+			inStream.on('end', done)
+		})
+	})
 })
 
 describe('handshake', function () {