1 files changed, 115 insertions, 16 deletions

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 448260638..21ed0a234 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -20,6 +20,8 @@ import { workspaceStore } from '../features/workspaces';
 import { serviceLimitStore } from '../features/serviceLimit';
 import { RESTRICTION_TYPES } from '../models/Service';
 import { KEEP_WS_LOADED_USID } from '../config';
+import { TODOS_RECIPE_ID } from '../features/todos';
+import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
 const debug = require('debug')('Ferdi:ServiceStore');
 
@@ -82,7 +84,9 @@ export default class ServicesStore extends Store {
     this.actions.service.toggleAudio.listen(this._toggleAudio.bind(this));
     this.actions.service.openDevTools.listen(this._openDevTools.bind(this));
     this.actions.service.openDevToolsForActiveService.listen(this._openDevToolsForActiveService.bind(this));
-    this.actions.service.setHibernation.listen(this._setHibernation.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.actions.service.shareSettingsWithServiceProcess.listen(this._shareSettingsWithServiceProcess.bind(this));
 
     this.registerReactions([
@@ -93,6 +97,7 @@ export default class ServicesStore extends Store {
       this._logoutReaction.bind(this),
       this._handleMuteSettings.bind(this),
       this._restrictServiceAccess.bind(this),
+      this._checkForActiveService.bind(this),
     ]);
 
     // Just bind this
@@ -155,16 +160,24 @@ export default class ServicesStore extends Store {
    */
   _serviceMaintenance() {
     this.all.forEach((service) => {
-      if (service.lastPoll && (service.lastPoll) - service.lastPollAnswer > ms('30s')) {
-        // If service did not reply for more than 30s try to reload.
+      // Defines which services should be hibernated.
+      if (!service.isActive && (Date.now() - service.lastUsed > ms('5m'))) {
+        // If service is stale for 5 min, hibernate it.
+        this._hibernate({ serviceId: service.id });
+      }
+
+      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();
+            debug(`Reloading service: ${service.name} (${service.id}). Attempt: ${service.lostRecipeReloadAttempt}`);
+            // service.webview.reload();
             service.lostRecipeReloadAttempt += 1;
 
             service.lostRecipeConnection = false;
           }
         } else {
+          debug(`Service lost connection: ${service.name} (${service.id}).`);
           service.lostRecipeConnection = true;
         }
       } else {
@@ -256,6 +269,14 @@ export default class ServicesStore extends Store {
     return null;
   }
 
+  @computed get isTodosServiceAdded() {
+    return this.allDisplayed.find(service => service.recipe.id === TODOS_RECIPE_ID && service.isEnabled) || null;
+  }
+
+  @computed get isTodosServiceActive() {
+    return this.active && this.active.recipe.id === TODOS_RECIPE_ID;
+  }
+
   one(id) {
     return this.all.find(service => service.id === id);
   }
@@ -265,10 +286,34 @@ export default class ServicesStore extends Store {
   }
 
   // Actions
-  @action async _createService({ recipeId, serviceData, redirect = true }) {
+  async _createService({
+    recipeId, serviceData, redirect = true, skipCleanup = false,
+  }) {
     if (serviceLimitStore.userHasReachedServiceLimit) return;
 
-    const data = this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
+    if (!this.stores.recipes.isInstalled(recipeId)) {
+      debug(`Recipe "${recipeId}" is not installed, installing recipe`);
+      await this.stores.recipes._install({ recipeId });
+      debug(`Recipe "${recipeId}" installed`);
+    }
+
+    // set default values for serviceData
+    Object.assign({
+      isEnabled: true,
+      isHibernationEnabled: false,
+      isNotificationEnabled: true,
+      isBadgeEnabled: true,
+      isMuted: false,
+      customIcon: false,
+      isDarkModeEnabled: false,
+      spellcheckerLanguage: SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
+    }, serviceData);
+
+    let data = serviceData;
+
+    if (!skipCleanup) {
+      data = this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
+    }
 
     const response = await this.createServiceRequest.execute(recipeId, data)._promise;
 
@@ -427,8 +472,13 @@ export default class ServicesStore extends Store {
       this.all[index].isActive = false;
     });
     service.isActive = true;
+    this._awake({ serviceId: service.id });
     service.lastUsed = Date.now();
 
+    if (this.active.recipe.id === TODOS_RECIPE_ID && !this.stores.todos.settings.isFeatureEnabledByUser) {
+      this.actions.todos.toggleTodosFeatureVisibility();
+    }
+
     // Update list of last used services
     this.lastUsedServices = this.lastUsedServices.filter(id => id !== serviceId);
     this.lastUsedServices.unshift(serviceId);
@@ -617,10 +667,10 @@ export default class ServicesStore extends Store {
   @action _sendIPCMessage({ serviceId, channel, args }) {
     const service = this.one(serviceId);
 
-    if (service.webview) {
-      // Make sure the args are clean, otherwise ElectronJS can't transmit them
-      const cleanArgs = JSON.parse(JSON.stringify(args));
+    // Make sure the args are clean, otherwise ElectronJS can't transmit them
+    const cleanArgs = JSON.parse(JSON.stringify(args));
 
+    if (service.webview) {
       service.webview.send(channel, cleanArgs);
     }
   }
@@ -659,8 +709,11 @@ export default class ServicesStore extends Store {
     service.resetMessageCount();
     service.lostRecipeConnection = false;
 
-    // service.webview.loadURL(service.url);
-    service.webview.reload();
+    if (service.recipe.id === TODOS_RECIPE_ID) {
+      return this.actions.todos.reload();
+    }
+
+    return service.webview.loadURL(service.url);
   }
 
   @action _reloadActive() {
@@ -743,23 +796,57 @@ export default class ServicesStore extends Store {
 
   @action _openDevTools({ serviceId }) {
     const service = this.one(serviceId);
-
-    service.webview.openDevTools();
+    if (service.recipe.id === TODOS_RECIPE_ID) {
+      this.actions.todos.openDevTools();
+    } else {
+      service.webview.openDevTools();
+    }
   }
 
   @action _openDevToolsForActiveService() {
     const service = this.active;
 
     if (service) {
-      service.webview.openDevTools();
+      this._openDevTools({ serviceId: service.id });
     } else {
       debug('No service is active');
     }
   }
 
-  @action _setHibernation({ serviceId, hibernating }) {
+  @action _hibernate({ serviceId }) {
+    const service = this.one(serviceId);
+    if (service.isActive || !service.isHibernationEnabled) {
+      debug('Skipping service hibernation');
+      return;
+    }
+
+    debug(`Hibernate ${service.name}`);
+
+    service.isHibernating = true;
+  }
+
+  @action _awake({ serviceId }) {
     const service = this.one(serviceId);
-    service.isHibernating = hibernating;
+    service.isHibernating = false;
+    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
@@ -893,6 +980,18 @@ export default class ServicesStore extends Store {
     });
   }
 
+  _checkForActiveService() {
+    if (!this.stores.router.location || this.stores.router.location.pathname.includes('auth/signup')) {
+      return;
+    }
+
+    if (this.allDisplayed.findIndex(service => service.isActive) === -1 && this.allDisplayed.length !== 0) {
+      debug('No active service found, setting active service to index 0');
+
+      this._setActive({ serviceId: this.allDisplayed[0].id });
+    }
+  }
+
   // Helper
   _initializeServiceRecipeInWebview(serviceId) {
     const service = this.one(serviceId);