@xh/hoist 46.0.0 → 46.1.0

package/svc/IdleService.js

@@ -4,7 +4,7 @@
  *
  * Copyright © 2021 Extremely Heavy Industries Inc.
  */
-import {AppState, HoistService, XH, managed} from '@xh/hoist/core';
+import {HoistService, XH, managed} from '@xh/hoist/core';
 import {Timer} from '@xh/hoist/utils/async';
 import {MINUTES, olderThan} from '@xh/hoist/utils/datetime';
 
@@ -55,14 +55,8 @@ export class IdleService extends HoistService {
     }
 
     checkInactivityTimeout() {
-        if (XH.appState === AppState.SUSPENDED) return;
-        if (olderThan(XH.lastActivityMs, this.timeout)) this.suspendApp();
-    }
-
-    suspendApp() {
-        if (XH.appState === AppState.SUSPENDED) return;
-        XH.setAppState(AppState.SUSPENDED);
-        XH.webSocketService.shutdown();
-        Timer.cancelAll();
+        if (olderThan(XH.lastActivityMs, this.timeout)) {
+            XH.suspendApp({reason: 'IDLE'});
+        }
     }
 }

package/svc/WebSocketService.js

@@ -39,7 +39,7 @@ export class WebSocketService extends HoistService {
 
     HEARTBEAT_TOPIC = 'xhHeartbeat';
     REG_SUCCESS_TOPIC = 'xhRegistrationSuccess';
-    TEST_MSG_TOPIC = 'xhTestMessage';
+    FORCE_APP_SUSPEND_TOPIC = 'xhForceAppSuspend';
 
     /** @property {string} - unique channel assigned by server upon successful connection. */
     @observable channelKey = null;
@@ -57,7 +57,8 @@ export class WebSocketService extends HoistService {
     _socket;
     _subsByTopic = {};
 
-    get enabled() {return XH.appSpec.webSocketsEnabled}
+    /** @property {boolean} **/
+    enabled = XH.appSpec.webSocketsEnabled;
 
     constructor() {
         super();
@@ -66,6 +67,15 @@ export class WebSocketService extends HoistService {
 
     async initAsync() {
         if (!this.enabled) return;
+        if (XH.environmentService.get('webSocketsEnabled') === false) {
+            console.error(
+                'WebSockets have been enabled on this client app, but are disabled on the server. ' +
+                'Please adjust your server-side configuration to use WebSockets.'
+            );
+            this.enabled = false;
+            return;
+        }
+
 
         this.connect();
 
@@ -196,8 +206,9 @@ export class WebSocketService extends HoistService {
                 case this.REG_SUCCESS_TOPIC:
                     this.installChannelKey(data.channelKey);
                     break;
-                case this.TEST_MSG_TOPIC:
-                    this.showTestMessageAlert(data);
+                case this.FORCE_APP_SUSPEND_TOPIC:
+                    XH.suspendApp({reason: 'SERVER_FORCE', message: data});
+                    XH.track({category: 'App', message: 'App suspended via WebSocket'});
                     break;
             }