fix(App): Improve lost recipe connection handler

Author: adlk

src/actions/service.js

@@ -97,4 +97,7 @@ export default {
   awake: {
     serviceId: PropTypes.string.isRequired,
   },
+  resetLastPollTimer: {
+    serviceId: PropTypes.string,
+  },
 };

src/models/Service.js

@@ -78,9 +78,9 @@ export default class Service {
 
   @observable lastUsed = Date.now(); // timestamp
 
-  @observable lastPoll = null;
+  @observable lastPoll = Date.now();
 
-  @observable lastPollAnswer = null;
+  @observable lastPollAnswer = Date.now();
 
   @observable lostRecipeConnection = false;
 

src/stores/AppStore.js

@@ -198,24 +198,12 @@ export default class AppStore extends Store {
       gaPage(pathname);
     });
 
-    powerMonitor.on('suspend', () => {
-      debug('System suspended starting timer');
-
-      this.timeSuspensionStart = moment();
-    });
-
     powerMonitor.on('resume', () => {
-      debug('System resumed, last suspended on', this.timeSuspensionStart.toString());
+      debug('System resumed');
 
-      if (this.timeSuspensionStart.add(10, 'm').isBefore(moment())) {
-        debug('Reloading services, user info and features');
+      this.actions.service.resetLastPollTimer();
 
-        setTimeout(() => {
-          window.location.reload();
-        }, ms('2s'));
-
-        statsEvent('resumed-app');
-      }
+      statsEvent('resumed-app');
     });
 
     // macOS catalina notifications hack

src/stores/ServicesStore.js

@@ -74,6 +74,7 @@ export default class ServicesStore extends Store {
     this.actions.service.openDevToolsForActiveService.listen(this._openDevToolsForActiveService.bind(this));
     this.actions.service.hibernate.listen(this._hibernate.bind(this));
     this.actions.service.awake.listen(this._awake.bind(this));
+    this.actions.service.resetLastPollTimer.listen(this._resetLastPollTimer.bind(this));
 
     this.registerReactions([
       this._focusServiceReaction.bind(this),
@@ -136,8 +137,8 @@ export default class ServicesStore extends Store {
         this._hibernate({ serviceId: service.id });
       }
 
-      if (service.lastPoll && (service.lastPoll) - service.lastPollAnswer > ms('30s')) {
-        // If service did not reply for more than 30s try to reload.
+      if (service.lastPoll && (service.lastPoll) - service.lastPollAnswer > ms('1m')) {
+        // If service did not reply for more than 1m try to reload.
         if (!service.isActive) {
           if (this.stores.app.isOnline && service.lostRecipeReloadAttempt < 3) {
             service.webview.reload();
@@ -681,6 +682,24 @@ export default class ServicesStore extends Store {
     service.liveFrom = Date.now();
   }
 
+  @action _resetLastPollTimer({ serviceId = null }) {
+    debug(`Reset last poll timer for ${serviceId ? `service: "${serviceId}"` : 'all services'}`);
+
+    const resetTimer = (service) => {
+      service.lastPollAnswer = Date.now();
+      service.lastPoll = Date.now();
+    };
+
+    if (!serviceId) {
+      this.allDisplayed.forEach(service => resetTimer(service));
+    } else {
+      const service = this.one(serviceId);
+      if (service) {
+        resetTimer(service);
+      }
+    }
+  }
+
   // Reactions
   _focusServiceReaction() {
     const service = this.active;