Merge pull request #475 from Expensify/marcaaron-fixPusher

Add reconnect logic for Pusher

src/lib/API.js

@@ -262,6 +262,16 @@ function processNetworkRequestQueue() {
 // Process our write queue very often
 setInterval(processNetworkRequestQueue, 1000);
 
+/**
+ * Pusher.reconnect() calls disconnect and connect on the
+ * Pusher socket. In some cases, the authorizer might fail
+ * or an error will be returned due to an out of date authToken.
+ * Reconnect will preserve our existing subscriptions and retry
+ * connecting until it succeeds. We're throttling this call so
+ * that we retry as few times as possible.
+ */
+const reconnectToPusher = _.throttle(Pusher.reconnect, 1000);
+
 /**
  * When authTokens expire they will automatically be refreshed.
  * The authorizer helps make sure that we are always passing the
@@ -284,6 +294,7 @@ Pusher.registerCustomAuthorizer((channel, {authEndpoint}) => ({
             .then(authResponse => authResponse.json())
             .then(data => callback(null, data))
             .catch((err) => {
+                reconnectToPusher();
                 console.debug('[Network] Failed to authorize Pusher');
                 callback(new Error(`Error calling auth endpoint: ${err}`));
             });
@@ -311,6 +322,9 @@ Pusher.registerSocketEventCallback((eventName, data) => {
                 isCurrentlyOffline = true;
             }
             break;
+        case 'error':
+            reconnectToPusher();
+            break;
         default:
             break;
     }

src/lib/Pusher/pusher.js

@@ -354,6 +354,14 @@ function disconnect() {
     socket = null;
 }
 
+/**
+ * Disconnect and Re-Connect Pusher
+ */
+function reconnect() {
+    socket.disconnect();
+    socket.connect();
+}
+
 if (window) {
     /**
      * Pusher socket for debugging purposes
@@ -376,4 +384,5 @@ export {
     registerSocketEventCallback,
     registerCustomAuthorizer,
     disconnect,
+    reconnect,
 };