IRCConnection now increases timeout period when previous timeouts were successful.

1 files changed, 18 insertions, 12 deletions

diff --git a/js/irc/ircconnection.js b/js/irc/ircconnection.js
index 1b42859..136e057 100644
--- a/js/irc/ircconnection.js
+++ b/js/irc/ircconnection.js
@@ -4,7 +4,10 @@ qwebirc.irc.IRCConnection = new Class({
   Implements: [Events, Options],
   options: {
     initialNickname: "ircconnX",
-    timeout: 45000,
+    minTimeout: 45000,
+    maxTimeout: 5 * 60000,
+    timeoutIncrement: 10000,
+    initialTimeout: 65000,
     floodInterval: 200,
     floodMax: 10,
     floodReset: 5000,
@@ -27,6 +30,7 @@ qwebirc.irc.IRCConnection = new Class({
     this.__retryAttempts = 0;
     
     this.__timeoutId = null;
+    this.__timeout = this.options.initialTimeout;
     this.__lastActiveRequest = null;
     this.__activeRequest = null;
     
@@ -159,8 +163,7 @@ qwebirc.irc.IRCConnection = new Class({
     return true;
   },
   __scheduleTimeout: function() {
-    if(this.options.timeout)
-      this.__timeoutId = this.__timeoutEvent.delay(this.options.timeout, this);
+    this.__timeoutId = this.__timeoutEvent.delay(this.__timeout, this);
   },
   __cancelTimeout: function() {
     if($defined(this.__timeoutId)) {
@@ -174,16 +177,16 @@ qwebirc.irc.IRCConnection = new Class({
     if(!$defined(this.__activeRequest))
       return;
       
-    if(this.__checkRetries()) {
-      if(this.__lastActiveRequest)
-        this.__lastActiveRequest.cancel();
+    if(this.__lastActiveRequest)
+      this.__lastActiveRequest.cancel();
         
-      this.__activeRequest.__replaced = true;
-      this.__lastActiveRequest = this.__activeRequest;
-      this.recv();
-    } else {
-      this.__cancelRequests();
-    }
+    this.__activeRequest.__replaced = true;
+    this.__lastActiveRequest = this.__activeRequest;
+      
+    if(this.__timeout + this.options.timeoutIncrement <= this.options.maxTimeout)
+      this.__timeout+=this.options.timeoutIncrement;
+        
+    this.recv();
   },
   __checkRetries: function() {
     /* hmm, something went wrong! */
@@ -194,6 +197,9 @@ qwebirc.irc.IRCConnection = new Class({
       return false;
     }
     
+    if(this.__timeout - this.options.timeoutIncrement >= this.options.minTimeout)
+      this.__timeout-=this.options.timeoutIncrement;
+
     return true;
   },
   recv: function() {