1 files changed, 79 insertions, 30 deletions

diff --git a/packages/main/src/stores/Service.ts b/packages/main/src/stores/Service.ts
index 9bc6a43..78c57cb 100644
--- a/packages/main/src/stores/Service.ts
+++ b/packages/main/src/stores/Service.ts
@@ -18,46 +18,95 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { ServiceSnapshotIn } from '@sophie/shared';
+import type { UnreadCount } from '@sophie/service-shared';
+import {
+  service as originalService,
+  ServiceSettingsSnapshotIn,
+} from '@sophie/shared';
+import { Instance, getSnapshot, ReferenceIdentifier } from 'mobx-state-tree';
 
+import SettingsWithId from '../utils/SettingsWithId';
 import generateId from '../utils/generateId';
+import overrideProps from '../utils/overrideProps';
 
-import type { ProfileSnapshotIn } from './Profile';
+import { ProfileSettingsSnapshotWithId } from './Profile';
+import { serviceSettings } from './ServiceSettings';
 
-export interface PartialServiceSnapshotIn
-  extends Omit<ServiceSnapshotIn, 'id' | 'profile'> {
+export interface ServiceConfig
+  extends Omit<ServiceSettingsSnapshotIn, 'profile'> {
   id?: string | undefined;
-  profile?: string | undefined;
+
+  profile?: ReferenceIdentifier | undefined;
 }
 
+export const service = overrideProps(originalService, {
+  settings: serviceSettings,
+})
+  .views((self) => ({
+    get config(): ServiceConfig {
+      const { id, settings } = self;
+      return { ...getSnapshot(settings), id };
+    },
+  }))
+  .actions((self) => ({
+    setLocation({
+      url,
+      canGoBack,
+      canGoForward,
+    }: {
+      url: string;
+      canGoBack: boolean;
+      canGoForward: boolean;
+    }): void {
+      self.currentUrl = url;
+      self.canGoBack = canGoBack;
+      self.canGoForward = canGoForward;
+    },
+    setTitle(title: string): void {
+      self.title = title;
+    },
+    startedLoading(): void {
+      self.state = 'loading';
+    },
+    finishedLoading(): void {
+      if (self.state === 'loading') {
+        // Do not overwrite crashed state if the service haven't been reloaded yet.
+        self.state = 'loaded';
+      }
+    },
+    crashed(): void {
+      self.state = 'crashed';
+    },
+    setUnreadCount({ direct, indirect }: UnreadCount): void {
+      if (direct !== undefined) {
+        self.directMessageCount = direct;
+      }
+      if (indirect !== undefined) {
+        self.indirectMessageCount = indirect;
+      }
+    },
+  }));
+
+export interface Service extends Instance<typeof service> {}
+
+export type ServiceSettingsSnapshotWithId =
+  SettingsWithId<ServiceSettingsSnapshotIn>;
+
 export function addMissingServiceIdsAndProfiles(
-  partialServices: PartialServiceSnapshotIn[] | undefined,
-  profiles: ProfileSnapshotIn[],
-): ServiceSnapshotIn[] {
-  return (partialServices ?? []).map((service) => {
-    const { name } = service;
-    let { id, profile } = service;
-    if (typeof id === 'undefined') {
-      id = generateId(name);
-    }
-    if (typeof profile === 'undefined') {
-      profile = generateId(name);
-      profiles.push({
-        id: profile,
-        name: service.name,
-      });
+  serviceConfigs: ServiceConfig[] | undefined,
+  profiles: ProfileSettingsSnapshotWithId[],
+): ServiceSettingsSnapshotWithId[] {
+  return (serviceConfigs ?? []).map((serviceConfig) => {
+    const { id, ...settings } = serviceConfig;
+    const { name } = settings;
+    let { profile: profileId } = settings;
+    if (profileId === undefined) {
+      profileId = generateId(name);
+      profiles.push({ id: profileId, settings: { name } });
     }
     return {
-      ...service,
-      id,
-      profile,
+      id: id === undefined ? generateId(name) : id,
+      settings: { ...settings, profile: profileId },
     };
   });
 }
-
-export type {
-  Service,
-  ServiceSnapshotOut,
-  ServiceSnapshotIn,
-} from '@sophie/shared';
-export { service } from '@sophie/shared';