Removed unwanted trace statements. Removed dependence on MonsterDebugger. Added method getConnectionUrl with intention of allowing FlashSocket to be extended.

Author: jimib

bin/Flash-Socket.IO.swc

@@ -99,7 +99,6 @@ public class WebSocket extends EventDispatcher {
     rawSocket.addEventListener(IOErrorEvent.IO_ERROR, onSocketIoError);
     rawSocket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, onSocketSecurityError);
     rawSocket.connect(host, port);
-	trace("connectint", host, port);
   }
 
   public function send(encData:String):int {

libs/MonsterDebugger.swc

@@ -17,8 +17,6 @@ import mx.events.*;
 import mx.utils.*;
 import bridge.FABridge;
 
-import com.demonsters.debugger.MonsterDebugger;
-
 public class WebSocketMain extends Sprite implements IWebSocketWrapper{
 
   private var callerUrl:String;
@@ -71,20 +69,20 @@ public class WebSocketMain extends Sprite implements IWebSocketWrapper{
   }
 
   public function log(message:String):void {
-    //if (debug) {
-	  MonsterDebugger.trace(this, message);
+	if (debug) {
+		trace("Log: " + message);
       //ExternalInterface.call("webSocketLog", encodeURIComponent("[WebSocket] " + message));
-    //}
+    }
   }
 
   public function error(message:String):void {
-	  MonsterDebugger.trace(this, "Error: "+message);
+	  trace(this, "Error: "+message);
 	  //ExternalInterface.call("webSocketError", encodeURIComponent("[WebSocket] " + message));
   }
 
   public function fatal(message:String):void {
-	MonsterDebugger.trace(this, "Fatal: "+message);
-	  //ExternalInterface.call("webSocketError", encodeURIComponent("[WebSocket] " + message));
+	trace(this, "Fatal: "+message);
+	//ExternalInterface.call("webSocketError", encodeURIComponent("[WebSocket] " + message));
     throw message;
   }
 

src/WebSocket.as

@@ -402,7 +402,6 @@ public class FABridge extends EventDispatcher implements IMXMLObject
                 }
 
                 result.newRefs[objRef] = className;
-                //trace("serializing new reference: " + className + " with value" + value);
 
                 //the result is a getProperty / invokeMethod call. How can we know how much you will need the object ? 
                 if (keep_refs && should_keep_ref) {

src/WebSocketMain.as

@@ -1,7 +1,6 @@
 package com.pnwrain.flashsocket
 {
 	import com.adobe.serialization.json.JSON;
-	import com.demonsters.debugger.MonsterDebugger;
 	import com.jimisaacs.data.URL;
 	import com.pnwrain.flashsocket.events.FlashSocketEvent;
 
@@ -60,8 +59,7 @@ package com.pnwrain.flashsocket
 			//}
 
 			this.socketURL = webSocketProtocal+"://" + domain + "/socket.io/1/flashsocket";
-			//this.socketURL = domain + "/socket.io/1/flashsocket";
-			this.callerUrl = httpProtocal+"://mobile-games.jimib.co.uk/pong.swf";
+			this.callerUrl = httpProtocal+"://"+domain;
 
 			this.domain = domain;
 			this.protocol = protocol;
@@ -75,19 +73,21 @@ package com.pnwrain.flashsocket
 			}
 
 			var r:URLRequest = new URLRequest();
-			var now:Date = new Date();
-			r.url = httpProtocal+"://" + domain + "/socket.io/1/?time=" + now.getTime();
+			r.url = getConnectionUrl(httpProtocal, domain);
 			r.method = URLRequestMethod.POST;
+			
 			var ul:URLLoader = new URLLoader(r);
 			ul.addEventListener(Event.COMPLETE, onDiscover);
 			ul.addEventListener(HTTPStatusEvent.HTTP_STATUS, onDiscoverError);
 			ul.addEventListener(IOErrorEvent.IO_ERROR , onDiscoverError);
-
+		}
+		
+		protected function getConnectionUrl(httpProtocal:String, domain:String):String
+		{
+			return httpProtocal+"://" + domain + "/socket.io/1/?time=" + new Date().getTime();
 		}
 
 		protected function onDiscover(event:Event):void{
-			MonsterDebugger.trace(this, "onDiscover: "+event.type);
-			
 			var response:String = event.target.data;
 			var respData:Array = response.split(":");
 			sessionID = respData[0];
@@ -113,8 +113,6 @@ package com.pnwrain.flashsocket
 
 		}
 		protected function onHandshake(event:Event):void{
-			MonsterDebugger.trace(this, "onHandshake: "+event.type);
-			
 			loadDefaultPolicyFile(socketURL);
 			webSocket = new WebSocket(this, socketURL, protocol, proxyHost, proxyPort, headers);
 			webSocket.addEventListener("event", onData);
@@ -128,9 +126,7 @@ package com.pnwrain.flashsocket
 		}
 
 		protected function onDiscoverError(event:Event):void{
-			MonsterDebugger.trace(this, "onDiscoverError: "+event.type);
 			if ( event is HTTPStatusEvent ){
-				MonsterDebugger.trace(this, "onDiscoverError status: "+(event as HTTPStatusEvent).status);
 				if ( (event as HTTPStatusEvent).status != 200){
 					//we were unsuccessful in connecting to server for discovery
 					var fe:FlashSocketEvent = new FlashSocketEvent(FlashSocketEvent.CONNECT_ERROR);
@@ -139,7 +135,6 @@ package com.pnwrain.flashsocket
 			}
 		}
 		protected function onHandshakeError(event:Event):void{
-			MonsterDebugger.trace(this, "onHandshakeError: "+event.type);
 			if ( event is HTTPStatusEvent ){
 				if ( (event as HTTPStatusEvent).status != 200){
 					//we were unsuccessful in connecting to server for discovery
@@ -150,23 +145,19 @@ package com.pnwrain.flashsocket
 		}
 
 		protected function onClose(event:Event):void{
-			MonsterDebugger.trace(this, "onClose" +  this.channel);
 			var fe:FlashSocketEvent = new FlashSocketEvent(FlashSocketEvent.CLOSE);
 			dispatchEvent(fe);
 		}
 
 		protected function onConnect(event:Event):void{
-			MonsterDebugger.trace(this, "onConnect" +  this.channel);
 			var fe:FlashSocketEvent = new FlashSocketEvent(FlashSocketEvent.CONNECT);
 			dispatchEvent(fe);
 		}
 		protected function onIoError(event:Event):void{
-			MonsterDebugger.trace(this, "onIoError");
 			var fe:FlashSocketEvent = new FlashSocketEvent(FlashSocketEvent.IO_ERROR);
 			dispatchEvent(fe);
 		}
 		protected function onSecurityError(event:Event):void{
-			MonsterDebugger.trace(this, "onSecurityError");
 			var fe:FlashSocketEvent = new FlashSocketEvent(FlashSocketEvent.SECURITY_ERROR);
 			dispatchEvent(fe);
 		}
@@ -190,19 +181,16 @@ package com.pnwrain.flashsocket
 			//return URLUtil.getServerName(this.callerUrl);
 		}
 		public function log(message:String):void {
-			MonsterDebugger.trace(this, "log: " +  message);
 			if (debug) {
 				trace("webSocketLog: " + message);
 			}
 		}
 
 		public function error(message:String):void {
-			MonsterDebugger.trace(this, "error: " +  message);
 			trace("webSocketError: "  + message);
 		}
 
 		public function fatal(message:String):void {
-			MonsterDebugger.trace(this, "fatal: " +  message);
 			trace("webSocketError: " + message);
 		}
 
@@ -238,7 +226,6 @@ package com.pnwrain.flashsocket
 		public var connecting:Boolean;
 
 		private function _onMessage(message:String):void{
-			trace("_onMessage", message);
 			//https://github.com/LearnBoost/socket.io-spec#Encoding
 			/*	0		Disconnect
 				1::	Connect
@@ -261,7 +248,7 @@ package com.pnwrain.flashsocket
 					if(dm.endpoint == this.channel){
 						this._onConnect();
 					}else{
-						trace("Connecting to: "+'1::'+this.channel);
+						log("Connecting to: "+'1::'+this.channel);
 						//connect to the endpoint
 						try{
 							webSocket.send('1::'+this.channel);
@@ -374,7 +361,7 @@ package com.pnwrain.flashsocket
 					webSocket.send('5:'+messageId+':'+this.channel+':' + com.adobe.serialization.json.JSON.encode({"name":event,"args":msg}));
 				}
 			}catch(err:Error){
-				trace("Unable to send message");
+				fatal("Unable to send message: "+err.message);
 			}
 		}