5 files changed, 156 insertions, 21 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 593bf341e..da6055e5f 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -52,7 +52,7 @@ export default class AppStore extends Store {
 
   @observable getAppCacheSizeRequest = new Request(this.api.local, 'getAppCacheSize');
 
-  @observable clearAppCacheRequest = new Request(this.api.local, 'clearAppCache');
+  @observable clearAppCacheRequest = new Request(this.api.local, 'clearCache');
 
   @observable autoLaunchOnStart = true;
 
@@ -179,6 +179,10 @@ export default class AppStore extends Store {
       this.stores.router.push(url);
     });
 
+    ipcRenderer.on('muteApp', () => {
+      this._toggleMuteApp();
+    });
+
     this.locale = this._getDefaultLocale();
 
     setTimeout(() => {
@@ -214,13 +218,16 @@ export default class AppStore extends Store {
     // macOS catalina notifications hack
     // notifications got stuck after upgrade but forcing a notification
     // via `new Notification` triggered the permission request
-    if (isMac && !localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
-      // eslint-disable-next-line no-new
-      new window.Notification('Welcome to Franz 5', {
-        body: 'Have a wonderful day & happy messaging.',
-      });
+    if (isMac) {
+      if (!localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
+        debug('Triggering macOS Catalina notification permission trigger');
+        // eslint-disable-next-line no-new
+        new window.Notification('Welcome to Franz 5', {
+          body: 'Have a wonderful day & happy messaging.',
+        });
 
-      localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, true);
+        localStorage.setItem(CATALINA_NOTIFICATION_HACK_KEY, true);
+      }
     }
   }
 
@@ -374,8 +381,11 @@ export default class AppStore extends Store {
     const allServiceIds = await getServiceIdsFromPartitions();
     const allOrphanedServiceIds = allServiceIds.filter(id => !this.stores.services.all.find(s => id.replace('service-', '') === s.id));
 
-    await Promise.all(allOrphanedServiceIds.map(id => removeServicePartitionDirectory(id)));
-
+    try {
+      await Promise.all(allOrphanedServiceIds.map(id => removeServicePartitionDirectory(id)));
+    } catch (ex) {
+      console.log('Error while deleting service partition directory - ', ex);
+    }
     await Promise.all(this.stores.services.all.map(s => this.actions.service.clearCache({ serviceId: s.id })));
 
     await clearAppCache._promise;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 985887d2d..80c7d7e81 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -5,7 +5,7 @@ import {
   computed,
   observable,
 } from 'mobx';
-import { remove } from 'lodash';
+import { debounce, remove } from 'lodash';
 import ms from 'ms';
 import fs from 'fs-extra';
 import path from 'path';
@@ -127,6 +127,60 @@ export default class ServicesStore extends Store {
     );
   }
 
+  initialize() {
+    super.initialize();
+
+    // Check services to become hibernated
+    this.serviceMaintenanceTick();
+  }
+
+  teardown() {
+    super.teardown();
+
+    // Stop checking services for hibernation
+    this.serviceMaintenanceTick.cancel();
+  }
+
+  /**
+   * Сheck for services to become hibernated.
+   */
+  serviceMaintenanceTick = debounce(() => {
+    this._serviceMaintenance();
+    this.serviceMaintenanceTick();
+    debug('Service maintenance tick');
+  }, ms('10s'));
+
+  /**
+   * Run various maintenance tasks on services
+   */
+  _serviceMaintenance() {
+    this.all.forEach((service) => {
+      // 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('30s')) {
+        // If service did not reply for more than 30s try to reload.
+        if (!service.isActive) {
+          if (this.stores.app.isOnline && service.lostRecipeReloadAttempt < 3) {
+            service.webview.reload();
+            service.lostRecipeReloadAttempt += 1;
+
+            service.lostRecipeConnection = false;
+          }
+        } else {
+          service.lostRecipeConnection = true;
+        }
+      } else {
+        service.lostRecipeConnection = false;
+        service.lostRecipeReloadAttempt = 0;
+      }
+    });
+  }
+
+  // Computed props
   @computed get all() {
     if (this.stores.user.isLoggedIn) {
       const services = this.allServicesRequest.execute().result;
@@ -351,7 +405,17 @@ export default class ServicesStore extends Store {
 
     // Create and open file
     const filePath = path.join(directory, file);
-    await fs.ensureFile(filePath);
+    if (file === 'user.js') {
+      if (!await fs.exists(filePath)) {
+        await fs.writeFile(filePath, `module.exports = (config, Ferdi) => {
+  // Write your scripts here
+  console.log("Hello, World!", config);
+}
+`);
+      }
+    } else {
+      await fs.ensureFile(filePath);
+    }
     shell.showItemInFolder(filePath);
   }
 
@@ -369,6 +433,7 @@ export default class ServicesStore extends Store {
       this.all[index].isActive = false;
     });
     service.isActive = true;
+    service.lastUsed = Date.now();
 
     // Update list of last used services
     this.lastUsedServices = this.lastUsedServices.filter(id => id !== serviceId);
@@ -465,10 +530,16 @@ export default class ServicesStore extends Store {
     const service = this.one(serviceId);
 
     if (channel === 'hello') {
+      debug('Received hello event from', serviceId);
+
       this._initRecipePolling(service.id);
       this._initializeServiceRecipeInWebview(serviceId);
       this._shareSettingsWithServiceProcess();
+    } else if (channel === 'alive') {
+      service.lastPollAnswer = Date.now();
     } else if (channel === 'messages') {
+      debug(`Received unread message info from '${serviceId}'`, args[0]);
+
       this.actions.service.setUnreadMessageCount({
         serviceId,
         count: {
@@ -590,6 +661,7 @@ export default class ServicesStore extends Store {
     if (!service.isEnabled) return;
 
     service.resetMessageCount();
+    service.lostRecipeConnection = false;
 
     // service.webview.loadURL(service.url);
     service.webview.reload();
@@ -699,6 +771,7 @@ export default class ServicesStore extends Store {
     const service = this.active;
     if (service) {
       this.actions.service.focusService({ serviceId: service.id });
+      document.title = `Ferdi - ${service.name}`;
     }
   }
 
@@ -766,7 +839,7 @@ export default class ServicesStore extends Store {
       const isMuted = isAppMuted || service.isMuted;
 
       if (isAttached) {
-        service.webview.setAudioMuted(isMuted);
+        service.webview.audioMuted = isMuted;
       }
     });
   }
@@ -852,6 +925,7 @@ export default class ServicesStore extends Store {
         service.webview.send('poll');
 
         service.timer = setTimeout(loop, delay);
+        service.lastPoll = Date.now();
       };
 
       loop();
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 71d4e1702..227eb2145 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -110,6 +110,7 @@ export default class SettingsStore extends Store {
       }
       debug('Get appSettings resolves', resp.type, resp.data);
       Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
+      ipcRenderer.send('initialAppSettings', resp);
     });
 
     this.fileSystemSettingsTypes.forEach((type) => {
@@ -263,5 +264,42 @@ export default class SettingsStore extends Store {
         },
       });
     }
+
+    if (!this.all.migration['5.4.4-beta.4-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          todoServer: 'isUsingCustomTodoService',
+          customTodoServer: legacySettings.todoServer,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.4.4-beta.4-settings': true,
+        },
+      });
+
+      debug('Migrated old todo setting to new custom todo setting');
+    }
+
+    if (!this.all.migration['5.4.4-beta.4-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          automaticUpdates: !(legacySettings.noUpdates),
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.4.4-beta.4-settings': true,
+        },
+      });
+
+      debug('Migrated updates settings');
+    }
   }
 }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 6941cf086..f6e059bfb 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -5,14 +5,14 @@ import { theme } from '@meetfranz/theme';
 import { remote } from 'electron';
 
 import Store from './lib/Store';
-import { isMac } from '../environment';
+import { isMac, isWindows } from '../environment';
 
 const { nativeTheme, systemPreferences } = remote;
 
 export default class UIStore extends Store {
   @observable showServicesUpdatedInfoBar = false;
 
-  @observable isOsDarkThemeActive = isMac
+  @observable isOsDarkThemeActive = (isMac || isWindows)
     ? nativeTheme.shouldUseDarkColors
     : false;
 
@@ -36,6 +36,13 @@ export default class UIStore extends Store {
         },
       );
     }
+
+    if (isWindows) {
+      nativeTheme.on('updated', () => {
+        this.isOsDarkThemeActive = nativeTheme.shouldUseDarkColors;
+        this.actions.service.shareSettingsWithServiceProcess();
+      });
+    }
   }
 
   setup() {
@@ -56,16 +63,16 @@ export default class UIStore extends Store {
   }
 
   @computed get isDarkThemeActive() {
-    const isMacWithAdaptableInDarkMode = isMac
+    const isMacOrWindowsWithAdaptableInDarkMode = (isMac || isWindows)
       && this.stores.settings.all.app.adaptableDarkMode
       && this.isOsDarkThemeActive;
-    const isMacWithoutAdaptableInDarkMode = isMac
+    const isMacOrWindowsWithoutAdaptableInDarkMode = (isMac || isWindows)
       && this.stores.settings.all.app.darkMode
       && !this.stores.settings.all.app.adaptableDarkMode;
-    const isNotMacInDarkMode = !isMac && this.stores.settings.all.app.darkMode;
-    return !!(isMacWithAdaptableInDarkMode
-      || isMacWithoutAdaptableInDarkMode
-      || isNotMacInDarkMode);
+    const isMacOrWindowsNotInDarkMode = !(isMac || isWindows) && this.stores.settings.all.app.darkMode;
+    return !!(isMacOrWindowsWithAdaptableInDarkMode
+      || isMacOrWindowsWithoutAdaptableInDarkMode
+      || isMacOrWindowsNotInDarkMode);
   }
 
   @computed get theme() {
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index ec0b0cf8d..3a53d150d 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -34,6 +34,8 @@ export default class UserStore extends Store {
 
   PASSWORD_ROUTE = `${this.BASE_ROUTE}/password`;
 
+  CHANGE_SERVER_ROUTE = `${this.BASE_ROUTE}/server`;
+
   @observable loginRequest = new Request(this.api.user, 'login');
 
   @observable signupRequest = new Request(this.api.user, 'signup');
@@ -97,7 +99,7 @@ export default class UserStore extends Store {
 
     // Reactions
     this.registerReactions([
-      // this._requireAuthenticatedUser,
+      this._requireAuthenticatedUser,
       this._getUserData.bind(this),
       this._resetTrialActivationState.bind(this),
     ]);
@@ -137,6 +139,10 @@ export default class UserStore extends Store {
     return this.PASSWORD_ROUTE;
   }
 
+  get changeServerRoute() {
+    return this.CHANGE_SERVER_ROUTE;
+  }
+
   // Data
   @computed get isLoggedIn() {
     return Boolean(localStorage.getItem('authToken'));