Merge branch '1.0' into fix/polling-contract-timeout

Author: adonley

dist/web3.js

@@ -95,18 +95,21 @@ RequestManager.prototype.setProvider = function (p, net) {
 
     // listen to incoming notifications
     if(this.provider && this.provider.on) {
-        this.provider.on('data', function requestManagerNotification(err, result){
-            if(!err) {
-                if(_this.subscriptions[result.params.subscription] && _this.subscriptions[result.params.subscription].callback)
-                    _this.subscriptions[result.params.subscription].callback(null, result.params.result);
-            } else {
-
-                Object.keys(_this.subscriptions).forEach(function(id){
-                    if(_this.subscriptions[id].callback)
-                        _this.subscriptions[id].callback(err);
-                });
+        this.provider.on('data', function requestManagerNotification(result, deprecatedResult){
+            result = result || deprecatedResult; // this is for possible old providers, which may had the error first handler
+
+            // check for result.method, to prevent old providers errors to pass as result
+            if(result.method && _this.subscriptions[result.params.subscription] && _this.subscriptions[result.params.subscription].callback) {
+                _this.subscriptions[result.params.subscription].callback(null, result.params.result);
             }
         });
+        // TODO add error, end, timeout, connect??
+        // this.provider.on('error', function requestManagerNotification(result){
+        //     Object.keys(_this.subscriptions).forEach(function(id){
+        //         if(_this.subscriptions[id].callback)
+        //             _this.subscriptions[id].callback(err);
+        //     });
+        // }
     }
 };
 

dist/web3.min.js

@@ -276,7 +276,9 @@ Subscription.prototype.subscribe = function() {
                     if(_this.options.requestManager.provider.once) {
                         _this._reconnectIntervalId = setInterval(function () {
                             // TODO check if that makes sense!
-                            _this.options.requestManager.provider.reconnect();
+                            if (_this.options.requestManager.provider.reconnect) {
+                                _this.options.requestManager.provider.reconnect();
+                            }
                         }, 500);
 
                         _this.options.requestManager.provider.once('connect', function () {

packages/web3-core-requestmanager/src/index.js

@@ -57,7 +57,7 @@ var IpcProvider = function IpcProvider(path, net) {
         if(!id && result.method.indexOf('_subscription') !== -1) {
             _this.notificationCallbacks.forEach(function(callback){
                 if(_.isFunction(callback))
-                    callback(null, result);
+                    callback(result);
             });
 
             // fire the callback
@@ -95,12 +95,6 @@ IpcProvider.prototype.addDefaultEvents = function(){
 
     this.connection.on('end', function(){
         _this._timeout();
-
-        // inform notifications
-        _this.notificationCallbacks.forEach(function (callback) {
-            if (_.isFunction(callback))
-                callback(new Error('IPC socket connection closed'));
-        });
     });
 
     this.connection.on('timeout', function(){
@@ -231,6 +225,7 @@ IpcProvider.prototype.on = function (type, callback) {
             this.notificationCallbacks.push(callback);
             break;
 
+        // adds error, end, timeout, connect
         default:
             this.connection.on(type, callback);
             break;

packages/web3-core-subscriptions/src/subscription.js

@@ -68,7 +68,7 @@ var WebsocketProvider = function WebsocketProvider(url)  {
             if(!id && result.method.indexOf('_subscription') !== -1) {
                 _this.notificationCallbacks.forEach(function(callback){
                     if(_.isFunction(callback))
-                        callback(null, result);
+                        callback(result);
                 });
 
                 // fire the callback
@@ -92,19 +92,11 @@ WebsocketProvider.prototype.addDefaultEvents = function(){
         _this._timeout();
     };
 
-    this.connection.onclose = function(e){
+    this.connection.onclose = function(){
         _this._timeout();
 
-        var noteCb = _this.notificationCallbacks;
-
         // reset all requests and callbacks
         _this.reset();
-
-        // cancel subscriptions
-        noteCb.forEach(function (callback) {
-            if (_.isFunction(callback))
-                callback(e);
-        });
     };
 
     // this.connection.on('timeout', function(){

packages/web3-providers-ipc/src/index.js

@@ -96,7 +96,7 @@ FakeIpcProvider.prototype.injectNotification = function (notification) {
     setTimeout(function(){
         _this.notificationCallbacks.forEach(function(cb){
             if(notification && cb)
-                cb(null, notification);
+                cb(notification);
         });
     }, 100 + this.notificationCount);