Allow clients to be able to provide an alternate reconnect scheduler (a class implementing IOReconnectScheduler). The detault policy remains as was (reconnecting after a second).

ixalon · ixalon · commit 8e8e69441783 · 2012-04-28T19:38:28.000+01:00
diff --git a/src/io/socket/IOConnection.java b/src/io/socket/IOConnection.java
@@ -177,6 +177,23 @@ public void run() {
 			}
 		}
 	}
+	
+	private IOReconnectScheduler reconnectScheduler = new IOReconnectScheduler() {
+
+		@Override
+		public void scheduleReconnect(Timer timer, TimerTask task) {
+			timer.schedule(task, 1000);
+		}
+
+		@Override
+		public void onReconnect() {
+		}
+		
+	};
+	
+	public void setReconnectScheduler(IOReconnectScheduler scheduler) {
+		reconnectScheduler = scheduler;
+	}
 
 	/**
 	 * The Class ConnectThread. Handles connecting to the server with an
@@ -507,7 +524,9 @@ private IOCallback findCallback(IOMessage message) throws SocketIOException {
 	 */
 	public void transportConnected() {
 		setState(STATE_READY);
-		if (reconnectTask != null) {
+		
+		boolean isReconnecting = (reconnectTask != null);
+		if (isReconnecting) {
 			reconnectTask.cancel();
 			reconnectTask = null;
 		}
@@ -535,7 +554,11 @@ public void transportConnected() {
 				while ((text = outputBuffer.poll()) != null)
 					sendPlain(text);
 			}
+			
 			this.keepAliveInQueue = false;
+			if(isReconnecting) {
+				reconnectScheduler.onReconnect();
+			}
 		}
 	}
 
@@ -753,7 +776,7 @@ public void reconnect() {
 					reconnectTask.cancel();
 				}
 				reconnectTask = new ReconnectTask();
-				backgroundTimer.schedule(reconnectTask, 1000);
+				reconnectScheduler.scheduleReconnect(backgroundTimer, reconnectTask);
 			}
 		}
 	}
diff --git a/src/io/socket/IOReconnectScheduler.java b/src/io/socket/IOReconnectScheduler.java
@@ -0,0 +1,9 @@
+package io.socket;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+public interface IOReconnectScheduler {
+	public void scheduleReconnect(Timer timer, TimerTask task);
+	public void onReconnect();
+}
diff --git a/src/io/socket/SocketIO.java b/src/io/socket/SocketIO.java
@@ -330,6 +330,14 @@ public void reconnect() {
 		this.connection.reconnect();
 	}
 
+	/**
+	 * Set the reconnect scheduler. By default reconnects are attempted every
+	 * second.
+	 */
+	public void setReconnectScheduler(IOReconnectScheduler scheduler) {
+		this.connection.setReconnectScheduler(scheduler);
+	}
+	
 	/**
 	 * Returns, if a connection is established at the moment
 	 * 

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,23 @@ public void run() {`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`	`}`
	`180`	`+`
	`181`	`+ private IOReconnectScheduler reconnectScheduler = new IOReconnectScheduler() {`
	`182`	`+`
	`183`	`+ @Override`
	`184`	`+ public void scheduleReconnect(Timer timer, TimerTask task) {`
	`185`	`+ timer.schedule(task, 1000);`
	`186`	`+ }`
	`187`	`+`
	`188`	`+ @Override`
	`189`	`+ public void onReconnect() {`
	`190`	`+ }`
	`191`	`+`
	`192`	`+ };`
	`193`	`+`
	`194`	`+ public void setReconnectScheduler(IOReconnectScheduler scheduler) {`
	`195`	`+ reconnectScheduler = scheduler;`
	`196`	`+ }`
`180`	`197`
`181`	`198`	`/**`
`182`	`199`	`* The Class ConnectThread. Handles connecting to the server with an`
`@@ -507,7 +524,9 @@ private IOCallback findCallback(IOMessage message) throws SocketIOException {`
`507`	`524`	`*/`
`508`	`525`	`public void transportConnected() {`
`509`	`526`	`setState(STATE_READY);`
`510`		`- if (reconnectTask != null) {`
	`527`	`+`
	`528`	`+ boolean isReconnecting = (reconnectTask != null);`
	`529`	`+ if (isReconnecting) {`
`511`	`530`	`reconnectTask.cancel();`
`512`	`531`	`reconnectTask = null;`
`513`	`532`	`}`
`@@ -535,7 +554,11 @@ public void transportConnected() {`
`535`	`554`	`while ((text = outputBuffer.poll()) != null)`
`536`	`555`	`sendPlain(text);`
`537`	`556`	`}`
	`557`	`+`
`538`	`558`	`this.keepAliveInQueue = false;`
	`559`	`+ if(isReconnecting) {`
	`560`	`+ reconnectScheduler.onReconnect();`
	`561`	`+ }`
`539`	`562`	`}`
`540`	`563`	`}`
`541`	`564`
`@@ -753,7 +776,7 @@ public void reconnect() {`
`753`	`776`	`reconnectTask.cancel();`
`754`	`777`	`}`
`755`	`778`	`reconnectTask = new ReconnectTask();`
`756`		`- backgroundTimer.schedule(reconnectTask, 1000);`
	`779`	`+ reconnectScheduler.scheduleReconnect(backgroundTimer, reconnectTask);`
`757`	`780`	`}`
`758`	`781`	`}`
`759`	`782`	`}`
Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,14 @@ public void reconnect() {`
`330`	`330`	`this.connection.reconnect();`
`331`	`331`	`}`
`332`	`332`
	`333`	`+ /**`
	`334`	`+ * Set the reconnect scheduler. By default reconnects are attempted every`
	`335`	`+ * second.`
	`336`	`+ */`
	`337`	`+ public void setReconnectScheduler(IOReconnectScheduler scheduler) {`
	`338`	`+ this.connection.setReconnectScheduler(scheduler);`
	`339`	`+ }`
	`340`	`+`
`333`	`341`	`/**`
`334`	`342`	`* Returns, if a connection is established at the moment`
`335`	`343`	`*`