node package published

Author: sitegui

.gitignore

@@ -0,0 +1 @@
+*~

Connection.js

@@ -1,14 +1,4 @@
-/*
-Represents a connection (both client and server sides)
-*/
-
-var util = require("util")
-var events = require("events")
-var crypto = require("crypto")
-var InStream = require("./InStream.js")
-var OutStream = require("./OutStream.js")
-var frame = require("./frame.js")
-var Server = require("./Server.js")
+// Represents a connection (both client and server sides)
 
 // socket is a net or tls socket
 // parent can be a Server or, in case of client connection, a string with the path to connect to
@@ -57,6 +47,15 @@ function Connection(socket, parent, callback) {
 	this.on("connect", callback)
 }
 
+module.exports = Connection
+var util = require("util")
+var events = require("events")
+var crypto = require("crypto")
+var InStream = require("./InStream.js")
+var OutStream = require("./OutStream.js")
+var frame = require("./frame.js")
+var Server = require("./Server.js")
+
 // Minimum size of a pack of binary data to send in a single frame
 Connection.binaryFragmentation = 512*1024 // .5 MiB
 
@@ -391,5 +390,3 @@ Connection.prototype.processCloseFrame = function (payload) {
 	this.readyState = this.CLOSED
 	this.emit("close", code, reason)
 }
-
-module.exports = Connection

InStream.js

@@ -1,16 +1,15 @@
-/*
-Simple wrapper for stream.Readable, used for receiving binary data
-*/
-
-var util = require("util")
-var stream = require("stream")
+// Simple wrapper for stream.Readable, used for receiving binary data
 
 // Represents the readable stream for binary frames
 // Events: readable(), end()
 function InStream() {
 	stream.Readable.call(this)
 }
 
+module.exports = InStream
+var util = require("util")
+var stream = require("stream")
+
 // Extends the basic readable stream and implement _read
 util.inherits(InStream, stream.Readable)
 InStream.prototype._read = function (size) {
@@ -25,5 +24,3 @@ InStream.prototype.addData = function (data) {
 InStream.prototype.end = function () {
 	this.push(null)
 }
-
-module.exports = InStream

OutStream.js

@@ -1,10 +1,4 @@
-/*
-Simple wrapper for stream.Writable, used for sending binary data
-*/
-
-var util = require("util")
-var stream = require("stream")
-var frame = require("./frame.js")
+// Simple wrapper for stream.Writable, used for sending binary data
 
 // Represents the writable stream for binary frames
 // Events: 
@@ -23,6 +17,11 @@ function OutStream(connection, minSize) {
 	})
 }
 
+module.exports = OutStream
+var util = require("util")
+var stream = require("stream")
+var frame = require("./frame.js")
+
 // Extends the basic writable stream and implements _write
 util.inherits(OutStream, stream.Writable)
 OutStream.prototype._write = function (chunk, encoding, callback) {
@@ -41,5 +40,3 @@ OutStream.prototype._write = function (chunk, encoding, callback) {
 	} else
 		callback()
 }
-
-module.exports = OutStream

Server.js

@@ -1,12 +1,4 @@
-/*
-Represents a websocket server
-*/
-
-var util = require("util")
-var net = require("net")
-var tls = require("tls")
-var Connection = require("./Connection.js")
-var events = require("events")
+// Represents a websocket server
 
 // new Server() creates a new ws server and starts listening for new connections
 // Events: listening(), close(), error(err), connection(conn)
@@ -52,6 +44,13 @@ function Server(secure, options, callback) {
 		this.on("connection", callback)
 }
 
+module.exports = Server
+var util = require("util")
+var net = require("net")
+var tls = require("tls")
+var Connection = require("./Connection.js")
+var events = require("events")
+
 // Makes Server also an EventEmitter
 util.inherits(Server, events.EventEmitter)
 
@@ -74,5 +73,3 @@ Server.prototype.listen = function (port, host, callback) {
 
 	return this
 }
-
-module.exports = Server

frame.js

@@ -1,6 +1,4 @@
-/*
-Utility functions for creating frames
-*/
+// Utility functions for creating frames
 
 // Creates a text frame
 // data is a string

index.js

@@ -1,7 +1,3 @@
-/*
-
-*/
-
 var Server = require("./Server.js")
 var Connection = require("./Connection.js")
 var net = require("net")
@@ -12,6 +8,8 @@ var url = require("url")
 // options is an object to be passed to net.createServer() or tls.createServer(), with the additional property "secure" (a boolean)
 // callback will be added as "connection" listener
 exports.createServer = function (options, callback) {
+	if (typeof options == "function")
+		return new Server(false, options)
 	return new Server(Boolean(options.secure), options, callback)
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodejs-websocket",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "author": "Sitegui <[email protected]>",
   "description": "Basic server&client approach to websocket (text and binary frames)",
   "main": "./index.js",