chore: app group optimizations (#1027)

app/assets/javascripts/UIModels/ApplicationGroup.ts

@@ -16,10 +16,47 @@ import { AutolockService } from '@/Services/AutolockService'
 import { ThemeManager } from '@/Services/ThemeManager'
 import { WebOrDesktopDevice } from '@/Device/WebOrDesktopDevice'
 
+const createApplication = (
+  descriptor: ApplicationDescriptor,
+  deviceInterface: WebOrDesktopDevice,
+  defaultSyncServerHost: string,
+  device: WebOrDesktopDevice,
+  runtime: Runtime,
+  webSocketUrl: string,
+) => {
+  const platform = getPlatform()
+
+  const application = new WebApplication(
+    deviceInterface,
+    platform,
+    descriptor.identifier,
+    defaultSyncServerHost,
+    webSocketUrl,
+    runtime,
+  )
+
+  const appState = new AppState(application, device)
+  const archiveService = new ArchiveManager(application)
+  const io = new IOService(platform === Platform.MacWeb || platform === Platform.MacDesktop)
+  const autolockService = new AutolockService(application, new InternalEventBus())
+  const themeService = new ThemeManager(application)
+
+  application.setWebServices({
+    appState,
+    archiveService,
+    desktopService: isDesktopDevice(device) ? new DesktopManager(application, device) : undefined,
+    io,
+    autolockService,
+    themeService,
+  })
+
+  return application
+}
+
 export class ApplicationGroup extends SNApplicationGroup<WebOrDesktopDevice> {
   constructor(
     private defaultSyncServerHost: string,
-    private device: WebOrDesktopDevice,
+    device: WebOrDesktopDevice,
     private runtime: Runtime,
     private webSocketUrl: string,
   ) {
@@ -27,8 +64,14 @@ export class ApplicationGroup extends SNApplicationGroup<WebOrDesktopDevice> {
   }
 
   override async initialize(): Promise<void> {
+    const defaultSyncServerHost = this.defaultSyncServerHost
+    const runtime = this.runtime
+    const webSocketUrl = this.webSocketUrl
+
     await super.initialize({
-      applicationCreator: this.createApplication,
+      applicationCreator: async (descriptor, device) => {
+        return createApplication(descriptor, device, defaultSyncServerHost, device, runtime, webSocketUrl)
+      },
     })
 
     if (isDesktopApplication()) {
@@ -38,37 +81,15 @@ export class ApplicationGroup extends SNApplicationGroup<WebOrDesktopDevice> {
     }
   }
 
-  override handleAllWorkspacesSignedOut(): void {
-    isDesktopDevice(this.deviceInterface) && this.deviceInterface.destroyAllData()
+  override deinit() {
+    super.deinit()
+
+    if (isDesktopApplication()) {
+      delete window.webClient
+    }
   }
 
-  private createApplication = (descriptor: ApplicationDescriptor, deviceInterface: WebOrDesktopDevice) => {
-    const platform = getPlatform()
-
-    const application = new WebApplication(
-      deviceInterface,
-      platform,
-      descriptor.identifier,
-      this.defaultSyncServerHost,
-      this.webSocketUrl,
-      this.runtime,
-    )
-
-    const appState = new AppState(application, this.device)
-    const archiveService = new ArchiveManager(application)
-    const io = new IOService(platform === Platform.MacWeb || platform === Platform.MacDesktop)
-    const autolockService = new AutolockService(application, new InternalEventBus())
-    const themeService = new ThemeManager(application)
-
-    application.setWebServices({
-      appState,
-      archiveService,
-      desktopService: isDesktopDevice(this.device) ? new DesktopManager(application, this.device) : undefined,
-      io,
-      autolockService,
-      themeService,
-    })
-
-    return application
+  override handleAllWorkspacesSignedOut(): void {
+    isDesktopDevice(this.device) && this.device.destroyAllData()
   }
 }