1 files changed, 90 insertions, 14 deletions

diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 3b09518c5..49ee24361 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -1,7 +1,7 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { autorun } from 'mobx';
-import { observer } from 'mobx-react';
+import { autorun, reaction } from 'mobx';
+import { observer, inject } from 'mobx-react';
 import classnames from 'classnames';
 
 import ServiceModel from '../../../models/Service';
@@ -10,12 +10,12 @@ import WebviewLoader from '../../ui/WebviewLoader';
 import WebviewCrashHandler from './WebviewCrashHandler';
 import WebviewErrorHandler from './ErrorHandlers/WebviewErrorHandler';
 import ServiceDisabled from './ServiceDisabled';
-import ServiceRestricted from './ServiceRestricted';
 import ServiceWebview from './ServiceWebview';
+import SettingsStore from '../../../stores/SettingsStore';
 import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
 import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants';
 
-export default @observer class ServiceView extends Component {
+export default @inject('stores', 'actions') @observer class ServiceView extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
@@ -24,7 +24,14 @@ export default @observer class ServiceView extends Component {
     edit: PropTypes.func.isRequired,
     enable: PropTypes.func.isRequired,
     isActive: PropTypes.bool,
-    upgrade: PropTypes.func.isRequired,
+    stores: PropTypes.shape({
+      settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    }).isRequired,
+    actions: PropTypes.shape({
+      service: PropTypes.shape({
+        setHibernation: PropTypes.func.isRequired,
+      }).isRequired,
+    }).isRequired,
   };
 
   static defaultProps = {
@@ -35,12 +42,20 @@ export default @observer class ServiceView extends Component {
     forceRepaint: false,
     targetUrl: '',
     statusBarVisible: false,
+    hibernate: false,
+    hibernationTimer: null,
   };
 
   autorunDisposer = null;
 
   forceRepaintTimeout = null;
 
+  constructor(props) {
+    super(props);
+
+    this.startHibernationTimer = this.startHibernationTimer.bind(this);
+  }
+
   componentDidMount() {
     this.autorunDisposer = autorun(() => {
       if (this.props.service.isActive) {
@@ -50,6 +65,45 @@ export default @observer class ServiceView extends Component {
         }, 100);
       }
     });
+
+    reaction(
+      () => this.props.service.isActive,
+      () => {
+        if (!this.props.service.isActive && this.props.stores.settings.all.app.hibernate) {
+          // Service is inactive - start hibernation countdown
+          this.startHibernationTimer();
+        } else {
+          if (this.state.hibernationTimer) {
+            // Service is active but we have an active hibernation timer: Clear timeout
+            clearTimeout(this.state.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,
+          });
+        }
+      },
+    );
+
+    // 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();
+    }
   }
 
   componentWillUnmount() {
@@ -68,6 +122,24 @@ export default @observer class ServiceView extends Component {
     });
   };
 
+  startHibernationTimer() {
+    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,
+    });
+  }
+
   render() {
     const {
       detachService,
@@ -76,9 +148,13 @@ export default @observer class ServiceView extends Component {
       reload,
       edit,
       enable,
-      upgrade,
+      stores,
     } = this.props;
 
+    const {
+      showServiceNavigationBar,
+    } = stores.settings.app;
+
     const webviewClasses = classnames({
       services__webview: true,
       'services__webview-wrapper': true,
@@ -132,15 +208,9 @@ export default @observer class ServiceView extends Component {
           </Fragment>
         ) : (
           <>
-            {service.isServiceAccessRestricted ? (
-              <ServiceRestricted
-                name={service.recipe.name}
-                upgrade={upgrade}
-                type={service.restrictionType}
-              />
-            ) : (
+            {!this.state.hibernate ? (
               <>
-                {service.recipe.id === CUSTOM_WEBSITE_ID && (
+                {(service.recipe.id === CUSTOM_WEBSITE_ID || showServiceNavigationBar) && (
                   <WebControlsScreen service={service} />
                 )}
                 <ServiceWebview
@@ -149,6 +219,12 @@ export default @observer class ServiceView extends Component {
                   detachService={detachService}
                 />
               </>
+            ) : (
+              <div>
+                <span role="img" aria-label="Sleeping Emoji">😴</span>
+                {' '}
+                This service is currently hibernating. If this page doesn&#x27;t close soon, please try reloading Ferdi.
+              </div>
             )}
           </>
         )}