14 files changed, 100 insertions, 63 deletions

diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index 561b025f0..85dd0f3df 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -6,25 +6,19 @@ import {
 } from '../environment';
 import {
   LOCAL_SERVER,
+  SERVER_NOT_LOADED,
 } from '../config';
 
-const apiBase = () => {
+const apiBase = (withVersion = true) => {
   let url;
 
   if (!window.ferdi
     || !window.ferdi.stores.settings
     || !window.ferdi.stores.settings.all
     || !window.ferdi.stores.settings.all.app.server) {
-    // Stores have not yet been loaded - send invalid URL to force a retry when stores are loaded
-    //  "Why 1.1.1.1 as the default, invalid URL?"
-    //    1.1.1.1 is the server for Cloudflare's DNS service and will be the same across most networks.
-    //    Using a random IP could result in unwanted connections, using localhost could unwantedly
-    //    connect to local develoment servers.
-    //    1.1.1.1 also sends a status 400 response for invalid routes. Other servers may return status 401
-    //    on some routes. This would result in Ferdi deleting its current authToken as it thinks it
-    //    has gone invalid.
-    url = 'https://1.1.1.1';
-  } else if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
+    // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
+    return SERVER_NOT_LOADED;
+  } if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
     // Use URL for local server
     url = `http://127.0.0.1:${window.ferdi.stores.requests.localServerPort}`;
   } else {
@@ -32,7 +26,10 @@ const apiBase = () => {
     url = window.ferdi.stores.settings.all.app.server;
   }
 
-  return `${url}/${API_VERSION}`;
+  if (withVersion) {
+    return `${url}/${API_VERSION}`;
+  }
+  return url;
 };
 
 export default apiBase;
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index a5d636b4e..164bc237b 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -14,8 +14,7 @@ import OrderModel from '../../models/Order';
 
 import { sleep } from '../../helpers/async-helpers';
 
-import { API } from '../../environment';
-import { RECIPES_PATH } from '../../config';
+import { RECIPES_PATH, SERVER_NOT_LOADED } from '../../config';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
@@ -39,8 +38,6 @@ module.paths.unshift(
 const { app } = remote;
 const { default: fetch } = remote.require('electron-fetch');
 
-const SERVER_URL = API;
-
 export default class ServerApi {
   recipePreviews = [];
 
@@ -121,6 +118,10 @@ export default class ServerApi {
   }
 
   async userInfo() {
+    if (apiBase() === SERVER_NOT_LOADED) {
+      throw new Error('Server not loaded');
+    }
+
     const request = await sendAuthRequest(`${apiBase()}/me`);
     if (!request.ok) {
       throw request;
@@ -163,6 +164,10 @@ export default class ServerApi {
 
   // Services
   async getServices() {
+    if (apiBase() === SERVER_NOT_LOADED) {
+      throw new Error('Server not loaded');
+    }
+
     const request = await sendAuthRequest(`${apiBase()}/me/services`);
     if (!request.ok) {
       throw request;
@@ -287,6 +292,10 @@ export default class ServerApi {
   }
 
   async getFeatures() {
+    if (apiBase() === SERVER_NOT_LOADED) {
+      throw new Error('Server not loaded');
+    }
+
     const request = await sendAuthRequest(`${apiBase()}/features`);
     if (!request.ok) {
       throw request;
@@ -466,7 +475,11 @@ export default class ServerApi {
 
   // Health Check
   async healthCheck() {
-    const request = await sendAuthRequest(`${SERVER_URL}/health`, {
+    if (apiBase() === SERVER_NOT_LOADED) {
+      throw new Error('Server not loaded');
+    }
+
+    const request = await sendAuthRequest(`${apiBase(false)}/health`, {
       method: 'GET',
     }, false);
     if (!request.ok) {
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 49ee24361..1fff5ef7a 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -42,10 +42,10 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
     forceRepaint: false,
     targetUrl: '',
     statusBarVisible: false,
-    hibernate: false,
-    hibernationTimer: null,
   };
 
+  hibernationTimer = null;
+
   autorunDisposer = null;
 
   forceRepaintTimeout = null;
@@ -73,15 +73,12 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
           // Service is inactive - start hibernation countdown
           this.startHibernationTimer();
         } else {
-          if (this.state.hibernationTimer) {
+          if (this.hibernationTimer) {
             // Service is active but we have an active hibernation timer: Clear timeout
-            clearTimeout(this.state.hibernationTimer);
+            clearTimeout(this.hibernationTimer);
           }
 
           // Service is active, wake up service from hibernation
-          this.setState({
-            hibernate: false,
-          });
           this.props.actions.service.setHibernation({
             serviceId: this.props.service.id,
             hibernating: false,
@@ -90,16 +87,6 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
       },
     );
 
-    // Store hibernation status to state, otherwise the webview won't get unloaded correctly
-    reaction(
-      () => this.props.service.isHibernating,
-      () => {
-        this.setState({
-          hibernate: this.props.service.isHibernating,
-        });
-      },
-    );
-
     // Start hibernation counter if we are in background
     if (!this.props.service.isActive && this.props.stores.settings.all.app.hibernate) {
       this.startHibernationTimer();
@@ -126,18 +113,13 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
     const timerDuration = (Number(this.props.stores.settings.all.app.hibernationStrategy) || 300) * 1000;
 
     const hibernationTimer = setTimeout(() => {
-      this.setState({
-        hibernate: true,
-      });
       this.props.actions.service.setHibernation({
         serviceId: this.props.service.id,
         hibernating: true,
       });
     }, timerDuration);
 
-    this.setState({
-      hibernationTimer,
-    });
+    this.hibernationTimer = hibernationTimer;
   }
 
   render() {
@@ -208,7 +190,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
           </Fragment>
         ) : (
           <>
-            {!this.state.hibernate ? (
+            {!service.isHibernating ? (
               <>
                 {(service.recipe.id === CUSTOM_WEBSITE_ID || showServiceNavigationBar) && (
                   <WebControlsScreen service={service} />
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index e6ebb6afb..652647470 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { observable, reaction } from 'mobx';
 import ElectronWebView from 'react-electron-web-view';
+import path from 'path';
 
 import ServiceModel from '../../../models/Service';
 
@@ -51,6 +52,8 @@ class ServiceWebview extends Component {
       setWebviewReference,
     } = this.props;
 
+    const preloadScript = path.join(__dirname, '../../../', 'webview', 'recipe.js');
+
     return (
       <ElectronWebView
         ref={(webview) => {
@@ -61,7 +64,7 @@ class ServiceWebview extends Component {
         }}
         autosize
         src={service.url}
-        preload="./webview/recipe.js"
+        preload={preloadScript}
         partition={`persist:service-${service.id}`}
         onDidAttach={() => {
           setWebviewReference({
diff --git a/src/components/ui/FeatureList.js b/src/components/ui/FeatureList.js
index 7ba8b54d7..f1039709c 100644
--- a/src/components/ui/FeatureList.js
+++ b/src/components/ui/FeatureList.js
@@ -72,7 +72,7 @@ export class FeatureList extends Component {
   static propTypes = {
     className: PropTypes.string,
     featureClassName: PropTypes.string,
-    plan: PropTypes.oneOf(PLANS),
+    plan: PropTypes.oneOf(Object.values(PLANS)),
   };
 
   static defaultProps = {
diff --git a/src/config.js b/src/config.js
index a7389b8bc..bd67aee6b 100644
--- a/src/config.js
+++ b/src/config.js
@@ -112,6 +112,7 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [
 ];
 
 export const LOCAL_SERVER = 'You are using Ferdi without a server';
+export const SERVER_NOT_LOADED = 'Ferdi::SERVER_NOT_LOADED';
 
 // Set app directory before loading user modules
 if (process.env.FERDI_APPDATA_DIR != null) {
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index f3fbb0c73..826fe843f 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -678,7 +678,8 @@ const _titleBarTemplateFactory = intl => [
     ],
   },
   {
-    label: '&?',
+    label: '?',
+    accelerator: 'Alt+?',
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 894c19347..0756a05eb 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -181,7 +181,9 @@ export default class AppStore extends Store {
 
     this.locale = this._getDefaultLocale();
 
-    this._healthCheck();
+    setTimeout(() => {
+      this._healthCheck();
+    }, 1000);
 
     this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
 
@@ -251,7 +253,7 @@ export default class AppStore extends Store {
           hasCrashed: service.hasCrashed,
           isDarkModeEnabled: service.isDarkModeEnabled,
         })),
-        errors: this.stores.globalError.errors,
+        messages: this.stores.globalError.messages,
         workspaces: this.stores.workspaces.workspaces.map(workspace => ({ id: workspace.id, services: workspace.services })),
         windowSettings: readJsonSync(path.join(app.getPath('userData'), 'window-state.json')),
         settings,
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index ab5d762c7..780cde3a7 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -57,7 +57,10 @@ export default class FeaturesStore extends Store {
   _updateFeatures = () => {
     const features = Object.assign({}, DEFAULT_FEATURES_CONFIG);
     if (this.stores.user.isLoggedIn) {
-      const requestResult = this.featuresRequest.execute().result;
+      let requestResult = {};
+      try {
+        requestResult = this.featuresRequest.execute().result;
+      } catch (e) {} // eslint-disable-line no-empty
       Object.assign(features, requestResult);
     }
     runInAction('FeaturesStore::_updateFeatures', () => {
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index 09c215c3e..aacaa247f 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -5,30 +5,52 @@ import Request from './lib/Request';
 export default class GlobalErrorStore extends Store {
   @observable error = null;
 
-  @observable errors = [];
+  @observable messages = [];
 
   @observable response = {};
 
   constructor(...args) {
     super(...args);
 
-    window.onerror = this._handleConsoleError.bind(this);
+    window.onerror = (...errorArgs) => {
+      this._handleConsoleError.call(this, ['error', ...errorArgs]);
+    };
 
     const origConsoleError = console.error;
-    console.error = (...errorArgs) => {
-      this._handleConsoleError.call(this, errorArgs);
+    window.console.error = (...errorArgs) => {
+      this._handleConsoleError.call(this, ['error', ...errorArgs]);
       origConsoleError.apply(this, errorArgs);
     };
 
+    const origConsoleLog = console.log;
+    window.console.log = (...logArgs) => {
+      this._handleConsoleError.call(this, ['log', ...logArgs]);
+      origConsoleLog.apply(this, logArgs);
+    };
+
+    const origConsoleInfo = console.info;
+    window.console.info = (...infoArgs) => {
+      this._handleConsoleError.call(this, ['info', ...infoArgs]);
+      origConsoleInfo.apply(this, infoArgs);
+    };
+
     Request.registerHook(this._handleRequests);
   }
 
-  _handleConsoleError(error, url, line) {
-    this.errors.push({
-      error,
-      url,
-      line,
-    });
+  _handleConsoleError(type, error, url, line) {
+    if (typeof type === 'object' && type.length && type.length >= 1) {
+      this.messages.push({
+        type: type[0],
+        info: type,
+      });
+    } else {
+      this.messages.push({
+        type,
+        error,
+        url,
+        line,
+      });
+    }
   }
 
   _handleRequests = action(async (request) => {
@@ -47,7 +69,8 @@ export default class GlobalErrorStore extends Store {
         }
       }
 
-      this.errors.push({
+      this.messages.push({
+        type: 'error',
         request: {
           result: request.result,
           wasExecuted: request.wasExecuted,
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 934a8a6e0..f65faa5a5 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -585,7 +585,8 @@ export default class ServicesStore extends Store {
 
     service.resetMessageCount();
 
-    service.webview.loadURL(service.url);
+    // service.webview.loadURL(service.url);
+    service.webview.reload();
   }
 
   @action _reloadActive() {
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index d6a2e5fde..ec0b0cf8d 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -348,7 +348,12 @@ export default class UserStore extends Store {
   // Reactions
   async _getUserData() {
     if (this.isLoggedIn) {
-      const data = await this.getUserInfoRequest.execute()._promise;
+      let data;
+      try {
+        data = await this.getUserInfoRequest.execute()._promise;
+      } catch (e) {
+        return false;
+      }
 
       // We need to set the beta flag for the SettingsStore
       this.actions.settings.update({
@@ -408,7 +413,11 @@ export default class UserStore extends Store {
   }
 
   async _migrateUserLocale() {
-    await this.getUserInfoRequest._promise;
+    try {
+      await this.getUserInfoRequest._promise;
+    } catch (e) {
+      return false;
+    }
 
     if (!this.data.locale) {
       debug('Migrate "locale" to user data');
diff --git a/src/stores/lib/CachedRequest.js b/src/stores/lib/CachedRequest.js
index ac8b2bd81..31c7ce241 100644
--- a/src/stores/lib/CachedRequest.js
+++ b/src/stores/lib/CachedRequest.js
@@ -39,7 +39,7 @@ export default class CachedRequest extends Request {
     }), 0);
 
     // Issue api call & save it as promise that is handled to update the results of the operation
-    this._promise = new Promise((resolve, reject) => {
+    this._promise = new Promise((resolve) => {
       this._api[this._method](...callArgs)
         .then((result) => {
           setTimeout(action(() => {
@@ -63,7 +63,7 @@ export default class CachedRequest extends Request {
             this.wasExecuted = true;
             this._isWaitingForResponse = false;
             this._triggerHooks();
-            reject(error);
+            // reject(error);
           }), 1);
         }));
     });
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index e500830ed..5bd0555d2 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -72,6 +72,8 @@
       font-size: 0px;
       min-height: 10px;
       min-width: 10px;
+      right: auto;
+      left: 8px;
     }
   }