Merge bf33e1f into 704e7a3

web3 · Aug 2, 2019 · 2ce618c · 2ce618c
2 parents 704e7a3 + bf33e1f
commit 2ce618c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/packages/web3-providers/src/factories/ProvidersModuleFactory.js b/packages/web3-providers/src/factories/ProvidersModuleFactory.js
@@ -138,7 +138,7 @@ export default class ProvidersModuleFactory {
             connection = new window.WebSocket(url, options.protocol);
         }
 
-        return new WebsocketProvider(connection, options.timeout);
+        return new WebsocketProvider(connection, options.timeout, options.reconnectionTimeout);
     }
 
     /**

diff --git a/packages/web3-providers/src/providers/WebsocketProvider.js b/packages/web3-providers/src/providers/WebsocketProvider.js
@@ -26,13 +26,31 @@ import isArray from 'lodash/isArray';
 export default class WebsocketProvider extends AbstractSocketProvider {
     /**
      * @param {WebSocket} connection
-     * @param {Number} timeout
+     * @param {Number} responseTimeout
+     * @param {Number} reconnectionTimeout
      *
      * @constructor
      */
-    constructor(connection, timeout) {
-        super(connection, timeout);
+    constructor(connection, responseTimeout, reconnectionTimeout = 5000) {
+        super(connection, responseTimeout);
         this.host = this.connection.url;
+        this.reconnectionTimeout = reconnectionTimeout;
+        this.reconnecting = false;
+    }
+
+    /**
+     * Emits the connect event and checks if there are subscriptions defined that should be resubscribed.
+     *
+     * @method onConnect
+     */
+    async onConnect() {
+        if (this.reconnecting) {
+            this.emit('reconnected');
+        }
+
+        await super.onConnect()
+
+        this.reconnecting = false;
     }
 
     /**
@@ -86,6 +104,8 @@ export default class WebsocketProvider extends AbstractSocketProvider {
      * @method reconnect
      */
     reconnect() {
+        this.reconnecting = true;
+
         setTimeout(() => {
             this.removeAllSocketListeners();
 
@@ -106,7 +126,7 @@ export default class WebsocketProvider extends AbstractSocketProvider {
 
             this.connection = connection;
             this.registerEventListeners();
-        }, 5000);
+        }, this.reconnectionTimeout);
     }
 
     /**