imporved async callback adding, without setinterval

web3 · Jun 8, 2015 · 16252f3 · 16252f3
1 parent f242489
commit 16252f3
Show file tree

Hide file tree

Showing 7 changed files with 188 additions and 155 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/lib/web3/filter.js b/lib/web3/filter.js
@@ -74,6 +74,50 @@ var getOptions = function (options) {
     }; 
 };
 
+/**
+Adds the callback and sets up the methods, to iterate over the results.
+
+@method addCallback
+@param {Object} self
+@param {funciton} callback
+*/
+var addCallback = function(self, callback) {
+
+    var onMessage = function (error, messages) {
+        if (error) {
+            return self.callbacks.forEach(function (callback) {
+                callback(error);
+            });
+        }
+
+        messages.forEach(function (message) {
+            message = self.formatter ? self.formatter(message) : message;
+            self.callbacks.forEach(function (callback) {
+                callback(null, message);
+            });
+        });
+    };
+
+    // call getFilterLogs on start
+    if (!utils.isString(self.options)) {
+        self.get(function (err, messages) {
+            // don't send all the responses to all the watches again... just to self one
+            if (err) {
+                callback(err);
+            }
+
+            messages.forEach(function (message) {
+                callback(null, message);
+            });
+        });
+    }
+
+    RequestManager.getInstance().startPolling({
+        method: self.implementation.poll.call,
+        params: [self.filterId],
+    }, self.filterId, onMessage, self.stopWatching.bind(self));
+};
+
 var Filter = function (options, methods, formatter) {
     var self = this;
     var implementation = {};
@@ -83,64 +127,31 @@ var Filter = function (options, methods, formatter) {
     this.options = getOptions(options);
     this.implementation = implementation;
     this.callbacks = [];
+    this.addCallbacks = [];
     this.formatter = formatter;
     this.implementation.newFilter(this.options, function(error, id){
-        if(error)
+        if(error) {
             self.filterError = error;
-        else
+            self.addCallbacks.forEach(function(callback){
+                callback(error);
+            });
+        } else if(self.addCallbacks) {
             self.filterId = id;
+            self.addCallbacks.forEach(function(callback){
+                addCallback(self, callback);
+            });
+            self.addCallbacks = [];
+        }
     });
 };
 
 Filter.prototype.watch = function (callback) {
-    var self = this;
-
-    // check inf an interval of 10ms if the filter id has arrived
-    var intervalId = setInterval(function(){
-
-        if(self.filterId || self.filterError)
-            clearInterval(intervalId);
-
-        if(!self.filterId)
-            return;
+    this.callbacks.push(callback);
 
-        self.callbacks.push(callback);
-
-        var onMessage = function (error, messages) {
-            if (error) {
-                return self.callbacks.forEach(function (callback) {
-                    callback(error);
-                });
-            }
-
-            messages.forEach(function (message) {
-                message = self.formatter ? self.formatter(message) : message;
-                self.callbacks.forEach(function (callback) {
-                    callback(null, message);
-                });
-            });
-        };
-
-        // call getFilterLogs on start
-        if (!utils.isString(self.options)) {
-            self.get(function (err, messages) {
-                // don't send all the responses to all the watches again... just to self one
-                if (err) {
-                    callback(err);
-                }
-
-                messages.forEach(function (message) {
-                    callback(null, message);
-                });
-            });
-        }
-
-        RequestManager.getInstance().startPolling({
-            method: self.implementation.poll.call,
-            params: [self.filterId],
-        }, self.filterId, onMessage, self.stopWatching.bind(self));
-
-    }, 10);
+    if(this.filterId)
+        addCallback(this, callback);
+    else
+        this.addCallbacks.push(callback);
 };
 
 Filter.prototype.stopWatching = function () {