1 files changed, 48 insertions, 14 deletions

diff --git a/packages/shared/src/stores/ServiceBase.ts b/packages/shared/src/stores/ServiceBase.ts
index cde403b..4a17bc5 100644
--- a/packages/shared/src/stores/ServiceBase.ts
+++ b/packages/shared/src/stores/ServiceBase.ts
@@ -23,20 +23,54 @@ import { IAnyModelType, Instance, types } from 'mobx-state-tree';
 import ServiceSettingsBase from './ServiceSettingsBase';
 
 export function defineServiceModel<TS extends IAnyModelType>(settings: TS) {
-  return types.model('Service', {
-    id: types.identifier,
-    settings,
-    currentUrl: types.maybe(types.string),
-    canGoBack: false,
-    canGoForward: false,
-    title: types.maybe(types.string),
-    state: types.optional(
-      types.enumeration('ServiceState', ['loading', 'loaded', 'crashed']),
-      'loading',
-    ),
-    directMessageCount: 0,
-    indirectMessageCount: 0,
-  });
+  return types
+    .model('Service', {
+      id: types.identifier,
+      settings,
+      currentUrl: types.maybe(types.string),
+      canGoBack: false,
+      canGoForward: false,
+      title: types.maybe(types.string),
+      state: types.optional(
+        types.union(
+          types.model({
+            type: types.literal('initializing'),
+          }),
+          types.model({
+            type: types.literal('loading'),
+          }),
+          types.model({
+            type: types.literal('loaded'),
+          }),
+          types.model({
+            type: types.literal('failed'),
+            errorCode: types.integer,
+            errorDesc: types.string,
+          }),
+          types.model({
+            type: types.literal('crashed'),
+            reason: types.string,
+            exitCode: types.integer,
+          }),
+        ),
+        { type: 'initializing' },
+      ),
+      directMessageCount: 0,
+      indirectMessageCount: 0,
+    })
+    .views((self) => ({
+      get loading(): boolean {
+        return (
+          self.state.type === 'initializing' || self.state.type === 'loading'
+        );
+      },
+      get failed(): boolean {
+        return self.state.type === 'failed';
+      },
+      get crashed(): boolean {
+        return self.state.type === 'crashed';
+      },
+    }));
 }
 
 const ServiceBase = /* @__PURE__ */ (() =>