Prevent duplicate poll calls

lighterio · Jun 13, 2014 · d72179b · d72179b
1 parent e04bdd0
commit d72179b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/beams-client.js b/beams-client.js
@@ -1,9 +1,9 @@
 /**
- *  ____                              ____ _ _            _            ___   ___   _  ___
- * | __ )  ___  __ _ _ __ ___  ___   / ___| (_) ___ _ __ | |_  __   __/ _ \ / _ \ / |/ _ \
- * |  _ \ / _ \/ _` | '_ ` _ \/ __| | |   | | |/ _ \ '_ \| __| \ \ / / | | | | | || | | | |
- * | |_) |  __/ (_| | | | | | \__ \ | |___| | |  __/ | | | |_   \ V /| |_| | |_| || | |_| |
- * |____/ \___|\__,_|_| |_| |_|___/  \____|_|_|\___|_| |_|\__|   \_/  \___(_)___(_)_|\___/
+ *  ____                              ____ _ _            _            ___   ___   _ _
+ * | __ )  ___  __ _ _ __ ___  ___   / ___| (_) ___ _ __ | |_  __   __/ _ \ / _ \ / / |
+ * |  _ \ / _ \/ _` | '_ ` _ \/ __| | |   | | |/ _ \ '_ \| __| \ \ / / | | | | | || | |
+ * | |_) |  __/ (_| | | | | | \__ \ | |___| | |  __/ | | | |_   \ V /| |_| | |_| || | |
+ * |____/ \___|\__,_|_| |_| |_|___/  \____|_|_|\___|_| |_|\__|   \_/  \___(_)___(_)_|_|
  *
  *
  * http://lighter.io/beams
@@ -368,7 +368,7 @@ var Beams = function () {
   };
 
   client._ON = client.on = function (name, callback) {
-    var list = callbacks[name]
+    var list = callbacks[name];
     if (!list) {
       list = callbacks[name] = [];
     }
@@ -413,21 +413,21 @@ var Beams = function () {
         trigger(name, data);
       });
       // Poll again.
-      poll();
+      addTimeout(Beams, poll, 0);
     },
     function (response) {
-      log('ERROR: Failed to connect (' + endpointUrl + ').');
+      error('Beams: Failed to connect (' + endpointUrl + ').');
       // Try again later.
-      setTimeout(poll, BEAMS_RETRY_TIMEOUT);
+      addTimeout(Beams, poll, BEAMS_RETRY_TIMEOUT);
     }, 1);
-  };
+  }
 
   // Trigger any related callbacks with received data.
   function trigger(name, data) {
     forEach(callbacks[name], function (callback) {
       callback.call(client, data);
     });
-  };
+  }
 
   // When a client connects, set the client id.
   client._CONNECT(function (data) {

diff --git a/beams-client.min.js b/beams-client.min.js
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "socket",
     "io"
   ],
-  "version": "0.0.10",
+  "version": "0.0.11",
   "main": "beams.js",
   "homepage": "http://lighter.io/beams",
   "repository": "git://github.com/zerious/beams.git",

diff --git a/scripts/beams-jymin.js b/scripts/beams-jymin.js
@@ -47,7 +47,7 @@ var Beams = function () {
   };
 
   client._ON = client.on = function (name, callback) {
-    var list = callbacks[name]
+    var list = callbacks[name];
     if (!list) {
       list = callbacks[name] = [];
     }
@@ -92,21 +92,21 @@ var Beams = function () {
         trigger(name, data);
       });
       // Poll again.
-      poll();
+      addTimeout(Beams, poll, 0);
     },
     function (response) {
-      log('ERROR: Failed to connect (' + endpointUrl + ').');
+      error('Beams: Failed to connect (' + endpointUrl + ').');
       // Try again later.
-      setTimeout(poll, BEAMS_RETRY_TIMEOUT);
+      addTimeout(Beams, poll, BEAMS_RETRY_TIMEOUT);
     }, 1);
-  };
+  }
 
   // Trigger any related callbacks with received data.
   function trigger(name, data) {
     forEach(callbacks[name], function (callback) {
       callback.call(client, data);
     });
-  };
+  }
 
   // When a client connects, set the client id.
   client._CONNECT(function (data) {