cleanup + flash socket support

jeromeetienne · Mar 2, 2011 · 6e1980c · 6e1980c
1 parent a74f568
commit 6e1980c
Show file tree

Hide file tree

Showing 85 changed files with 48 additions and 4,644 deletions.
diff --git a/contrib/chat/index.html b/contrib/chat/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 	<link rel="stylesheet" href="main.css" />

diff --git a/contrib/monitor/index.html b/contrib/monitor/index.html
@@ -2,11 +2,11 @@
 <html>
 <head>
 	<link rel="stylesheet" href="main.css" />
-	
+
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
 	<script src="jQuery.url.js"></script>
 	<!-- json2 is included because some browsers doesnt have it (e.g. ie8)	-->
-	<script src="http://ajax.cdnjs.com/ajax/libs/json2/20110223/json2.js"></script>		
+	<script src="http://ajax.cdnjs.com/ajax/libs/json2/20110223/json2.js"></script>
 	<script src="../../easyWebSocket.min.js"></script>
 	<script src="https://github.com/joewalnes/smoothie/raw/master/smoothie.js"></script>
 	<script src="main.js"></script>

diff --git a/easyWebSocket-node.min.js b/easyWebSocket-node.min.js
diff --git a/easyWebSocket.min.js b/easyWebSocket.min.js
diff --git a/example/devel-gapp.html b/example/devel-gapp.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <html>
 <head>
 	<script src="../gapp/easyWebSocket-gapp.js"></script>	

diff --git a/example/devel-node.html b/example/devel-node.html
@@ -1,7 +1,9 @@
+<!doctype html>
 <html>
 <head>
 	<!-- json2 is included because some browsers doesnt have it (e.g. ie8)	-->
-	<script src="http://ajax.cdnjs.com/ajax/libs/json2/20110223/json2.js"></script>		
+	<script src="http://ajax.cdnjs.com/ajax/libs/json2/20110223/json2.js"></script>
+
 	<script src="../node/server/node_modules/socket.io/support/socket.io-client/socket.io.js"></script>
 	<script src="../node/easyWebSocket-node.js"></script>
 <!--	<script src="../easyWebSocket-node.min.js"></script>

diff --git a/example/example.html b/example/example.html
@@ -1,6 +1,6 @@
+<!doctype html>
 <html>
-<head>
-</head>
+<head></head>
 <body>
 	<!-- json2 is included because some browsers doesnt have it (e.g. ie8)	-->
 	<script src="http://ajax.cdnjs.com/ajax/libs/json2/20110223/json2.js"></script>

diff --git a/node/easyWebSocket-node.js b/node/easyWebSocket-node.js
@@ -6,7 +6,6 @@
  *   is not suitable
 */
 
-
 /**
  * Constructor
  *
@@ -27,7 +26,7 @@ EasyWebSocket	= function(url, protocols)
 
 	// define the class logging function
 	this.log		= EasyWebSocket.logFunction;
-	
+
 	// init default binding
 	this["onopen"]		= function(){ self.log("default onopen method");	}
 	this["onmessage"]	= function(){ self.log("default onmessage method");	}
@@ -48,7 +47,17 @@ EasyWebSocket.prototype._sioCtor	= function()
 	var serverUrl	= this.parseUri(EasyWebSocket.serverUrl);
 	var listenHost	= serverUrl.host;
 	var listenPort	= parseInt(serverUrl.port);
-	this._sockio	= new io.Socket(listenHost, {port: listenPort, rememberTransport: false});
+
+	// configure the swf for the flash websocket
+	// - NOTE: not sure about this. i dont understand flash 'security'
+	WEB_SOCKET_SWF_LOCATION	= 'http://easywebsocket.org/node/server/node_modules/socket.io/support/socket.io-client/lib/vendor/web-socket-js/WebSocketMainInsecure.swf';
+
+	// create and config the socket
+	this._sockio	= new io.Socket(listenHost, {
+		port			: listenPort,
+		rememberTransport	: false,
+		transports		: ['websocket', 'flashsocket', 'htmlfile', 'xhr-multipart', 'xhr-polling']
+	});
 	this._sockio.connect();
 	this._sockio.on('connect', function(){
 		self.log("socket connected", self._sockio, self._clientId)

diff --git a/node/server/cluster.js b/node/server/cluster.js
@@ -6,9 +6,9 @@
 var cluster = require('cluster');
 
 cluster('./server.js')
-	.use(cluster.logger('logs'))
+	//.use(cluster.logger('logs'))
+	//.use(cluster.pidfiles('pids'))
 	.use(cluster.stats())
-	.use(cluster.pidfiles('pids'))
 	.use(cluster.cli())
 	.use(cluster.repl(8888))
 	.listen(8667);
diff --git a/node/server/logs/.gitignore b/node/server/logs/.gitignore
diff --git a/node/server/node_modules/cluster/._History.md b/node/server/node_modules/cluster/._History.md
diff --git a/node/server/node_modules/cluster/._Readme.md b/node/server/node_modules/cluster/._Readme.md
diff --git a/node/server/node_modules/cluster/._package.json b/node/server/node_modules/cluster/._package.json
diff --git a/node/server/node_modules/cluster/._test.js b/node/server/node_modules/cluster/._test.js
diff --git a/node/server/node_modules/cluster/.gitignore b/node/server/node_modules/cluster/.gitignore
diff --git a/node/server/node_modules/cluster/.gitmodules b/node/server/node_modules/cluster/.gitmodules
diff --git a/node/server/node_modules/cluster/.npmignore b/node/server/node_modules/cluster/.npmignore
diff --git a/node/server/node_modules/cluster/History.md b/node/server/node_modules/cluster/History.md
diff --git a/node/server/node_modules/cluster/LICENSE b/node/server/node_modules/cluster/LICENSE
diff --git a/node/server/node_modules/cluster/Makefile b/node/server/node_modules/cluster/Makefile