From fec56585102aea98393767a9056f709e0d6c3034 Mon Sep 17 00:00:00 2001 From: Omair Date: Mon, 24 Mar 2014 12:35:50 +0000 Subject: [PATCH 1/6] changed stream prototype --- multiplex_server.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/multiplex_server.js b/multiplex_server.js index f841246..c170dba 100644 --- a/multiplex_server.js +++ b/multiplex_server.js @@ -1,6 +1,8 @@ var events = require('events'); var stream = require('stream'); +var util = require('util'); + exports.MultiplexServer = MultiplexServer = function(service) { var that = this; @@ -57,7 +59,7 @@ var Channel = function(conn, topic, channels) { this.channels = channels; stream.Stream.call(this); }; -Channel.prototype = new stream.Stream(); +util.inherits(Channel, stream.Stream); Channel.prototype.write = function(data) { this.conn.write('msg,' + this.topic + ',' + data); From 4ac8ee59f45d2df4db2c543990d2fe22505231c0 Mon Sep 17 00:00:00 2001 From: Omair Date: Mon, 24 Mar 2014 12:39:48 +0000 Subject: [PATCH 2/6] changed stream --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a1c3f68..84f6d85 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +Fork Information +=================== +This is a fork of the websocket multiplex library with changes. + WebSocket-multiplex =================== From adf1f1f4a970e869936bdaeb0699c60201893d47 Mon Sep 17 00:00:00 2001 From: Omair Date: Mon, 24 Mar 2014 12:55:07 +0000 Subject: [PATCH 3/6] fixed issue --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 708fd94..3fe171d 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,10 @@ "version" : "0.1.0", "description" : "WebSocket-multiplex is a thin library on top of SockJS that allows you to do multiplexing of many virtual WebSockets connection over a single physical one.", "keywords" : ["websockets", "websocket", "sockjs", "multiplex", "multiplexing"], - "homepage" : "https://github.com/sockjs/websocket-multiplex", + "homepage" : "https://github.com/omairqadir/websocket-multiplex", "repository": {"type": "git", - "url": "https://github.com/sockjs/websocket-multiplex.git"}, + "url": "https://github.com/omairqadir/websocket-multiplex.git"}, "dependencies": { "sockjs" : "*" }, From 7538f303c881993656ba6eed3de5e19f36b8c63c Mon Sep 17 00:00:00 2001 From: Omair Date: Mon, 24 Mar 2014 12:57:04 +0000 Subject: [PATCH 4/6] fixed issue --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3fe171d..e61b578 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name" : "websocket-multiplex", + "name" : "pixel8-websocket-multiplex", "author" : "Marek Majkowski", "version" : "0.1.0", "description" : "WebSocket-multiplex is a thin library on top of SockJS that allows you to do multiplexing of many virtual WebSockets connection over a single physical one.", From 53d8cbd15108340d5dbcf7aaee0c0719950340ee Mon Sep 17 00:00:00 2001 From: Omair Date: Mon, 24 Mar 2014 12:59:03 +0000 Subject: [PATCH 5/6] fixed issue --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e61b578..3fe171d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name" : "pixel8-websocket-multiplex", + "name" : "websocket-multiplex", "author" : "Marek Majkowski", "version" : "0.1.0", "description" : "WebSocket-multiplex is a thin library on top of SockJS that allows you to do multiplexing of many virtual WebSockets connection over a single physical one.", From adff3cfcd99f2f46bbc0879fbaedb189fd078f65 Mon Sep 17 00:00:00 2001 From: Omair Date: Mon, 24 Mar 2014 13:05:17 +0000 Subject: [PATCH 6/6] readme changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84f6d85..34508bd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Fork Information =================== -This is a fork of the websocket multiplex library with changes. +This is a fork of the websocket multiplex library with changes to how stream is implemented. WebSocket-multiplex ===================