Updated io.Socket initialization to work on hosts other than localhost

Updated client
Fixed htmlfile
2026-01-11 16:08:24 -05:00 · 2010-05-27 21:45:01 -03:00 · 2010-05-27 21:33:07 -03:00 · 2010-05-21 13:09:14 +02:00 · 2010-05-13 22:05:31 -03:00
6 changed files with 34 additions and 22 deletions
--- a/README.md
+++ b/README.md
@@ -36,12 +36,15 @@ By default, the server will intercept requests that contain `socket.io` in the p
 	
 On the client side, you should use the [Socket.IO client](https://github.com/LearnBoost/Socket.IO) to connect.

-## Checking out
+## Notes

-After cloning the repository, remember to run
+IMPORTANT! When checking out the git repo, make sure to include the submodules. One way to do it is:

-	git submodule init
-	git submodule update
+	git clone [repo] --recursive
+  
+Another, once cloned
+
+	git submodule update --init --recursive

 ## Demo

--- a/lib/socket.io/transports/htmlfile.js
+++ b/lib/socket.io/transports/htmlfile.js
@@ -8,12 +8,21 @@ this['htmlfile'] = Client.extend({
 		switch (req.method){
 			case 'GET':
 				this.__super__(req, res);
-				this.request.connection.addListener('end', function(){ self._onClose(); });
-				this.response.useChunkedEncodingByDefault = false;
+				this.request.connection.addListener('close', function(){ self._onClose(); });
+				this.response.useChunkedEncodingByDefault = true;
 				this.response.shouldKeepAlive = true;
-				this.response.writeHead(200, { 'Content-type': 'text/html' });
+				this.response.writeHead(200, {
+					'Content-Type': 'text/html',
+					'Connection': 'keep-alive',
+					'Transfer-Encoding': 'chunked'
+				});
+				this.response.write('<html><body>' + new Array(244).join(' '));
 				this.response.flush();
 				this._payload();
+				setInterval(function(){
+					self.response.write('<!-- heartbeat -->');
+					self.response.flush();
+				}, 1000);
 				break;
 				
 			case 'POST':
@@ -24,7 +33,7 @@ this['htmlfile'] = Client.extend({
 					try {
 						var msg = qs.parse(body);
 						self._onMessage(msg.data);
-					} catch(e){}			
+					} catch(e){}
 					res.writeHead(200);
 					res.write('ok');
 					res.end();
@@ -34,8 +43,8 @@ this['htmlfile'] = Client.extend({
 	},
 	
 	_write: function(message){
-		// not sure if this is enough escaping. looks lousy
-		this.response.write("<script>parent.callback('"+ message.replace(/'/, "\'") +"')</script>");
+		this.response.write('<script>parent.s._('+ message +', document);</script>');
+		this.response.flush();
 	}
 	
 });
--- a/lib/socket.io/transports/xhr-polling.js
+++ b/lib/socket.io/transports/xhr-polling.js
@@ -13,10 +13,10 @@ this['xhr-polling'] = Client.extend({
 		var self = this, body = '';
 		switch (req.method){
 			case 'GET':
-				this.__super__(req, res);			
+				this.__super__(req, res);
 				this._closeTimeout = setTimeout(function(){
 					self._write('');
-				}, this.options.duration);					
+				}, this.options.duration);
 				this._payload();
 				break;
 				
--- a/lib/socket.io/util/object.js
+++ b/lib/socket.io/util/object.js
@@ -2,15 +2,15 @@
 // Copyright (c) 2006-2009 Valerio Proietti, <http://mad4milk.net/>

 var clone = this.clone = function(item){
-	var clone;
+	var cloned;
 	if (item instanceof Array){
-		clone = [];
-		for (var i = 0; i < item.length; i++) clone[i] = clone(item[i]);
-		return clone;
+		cloned = [];
+		for (var i = 0; i < item.length; i++) cloned[i] = clone(item[i]);
+		return cloned;
 	} else if (typeof item == 'object') {
-		clone = {};
-		for (var key in object) clone[key] = clone(object[key]);
-		return clone;
+		cloned = {};
+		for (var key in object) cloned[key] = clone(object[key]);
+		return cloned;
 	} else {
 		return item;
 	}
@@ -35,4 +35,4 @@ this.merge = function(source, k, v){
 		for (var key in object) mergeOne(source, key, object[key]);
 	}
 	return source;
-};
+};
--- a/test/chat.html
+++ b/test/chat.html
@@ -25,7 +25,7 @@
        document.getElementById('text').value = '';
      }
    
-      var socket = new io.Socket('localhost', {rememberTransport: false, port: 8080});
+      var socket = new io.Socket(null, {rememberTransport: false, port: 8080});
      socket.connect();
      socket.addEvent('message', function(data){
        var obj = JSON.parse(data);
--- a/test/client
+++ b/test/client
Author	SHA1	Message	Date
Guillermo Rauch	3134940ed6	Updated io.Socket initialization to work on hosts other than localhost Updated client	2010-05-27 21:45:01 -03:00
Guillermo Rauch	0f783bc06a	Fixed htmlfile - end > close for detecting closed connections - Added hearbeats - added flush() in write	2010-05-27 21:33:07 -03:00
Virtuo	dd3d829173	Correct bug due to variable name clash. IMO: this kind of code should be put in an external lib and 100% tested.	2010-05-21 13:09:14 +02:00
Guillermo Rauch	fbce6379a5	Note about submodules	2010-05-13 22:05:31 -03:00