refactor(web): dependency management (#2386)

packages/snjs/lib/Application/Dependencies/Dependencies.ts

@@ -11,7 +11,7 @@ import { GetRecoveryCodes } from '../../Domain/UseCase/GetRecoveryCodes/GetRecov
 import { SignInWithRecoveryCodes } from '../../Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes'
 import { ListedService } from '../../Services/Listed/ListedService'
 import { MigrationService } from '../../Services/Migration/MigrationService'
-import { SNMfaService } from '../../Services/Mfa/MfaService'
+import { MfaService } from '../../Services/Mfa/MfaService'
 import { SNComponentManager } from '../../Services/ComponentManager/ComponentManager'
 import { FeaturesService } from '@Lib/Services/Features/FeaturesService'
 import { SettingsService } from '../../Services/Settings/SNSettingsService'
@@ -126,6 +126,10 @@ import {
   AlertService,
   DesktopDeviceInterface,
   ChangeVaultStorageMode,
+  ChangeAndSaveItem,
+  FullyResolvedApplicationOptions,
+  GetHost,
+  SetHost,
 } from '@standardnotes/services'
 import { ItemManager } from '../../Services/Items/ItemManager'
 import { PayloadManager } from '../../Services/Payloads/PayloadManager'
@@ -151,10 +155,8 @@ import {
   WebSocketApiService,
   WebSocketServer,
 } from '@standardnotes/api'
-import { FullyResolvedApplicationOptions } from '../Options/ApplicationOptions'
 import { TYPES } from './Types'
-import { isDeinitable } from './isDeinitable'
-import { Logger, isNotUndefined } from '@standardnotes/utils'
+import { Logger, isNotUndefined, isDeinitable } from '@standardnotes/utils'
 import { EncryptionOperators } from '@standardnotes/encryption'
 import { AsymmetricMessagePayload, AsymmetricMessageSharedVaultInvite } from '@standardnotes/models'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
@@ -219,6 +221,14 @@ export class Dependencies {
       )
     })
 
+    this.factory.set(TYPES.GetHost, () => {
+      return new GetHost(this.get<LegacyApiService>(TYPES.LegacyApiService))
+    })
+
+    this.factory.set(TYPES.SetHost, () => {
+      return new SetHost(this.get<HttpService>(TYPES.HttpService), this.get<LegacyApiService>(TYPES.LegacyApiService))
+    })
+
     this.factory.set(TYPES.GetKeyPairs, () => {
       return new GetKeyPairs(this.get<RootKeyManager>(TYPES.RootKeyManager))
     })
@@ -307,6 +317,14 @@ export class Dependencies {
       return new GetVaults(this.get<ItemManager>(TYPES.ItemManager))
     })
 
+    this.factory.set(TYPES.ChangeAndSaveItem, () => {
+      return new ChangeAndSaveItem(
+        this.get<ItemManager>(TYPES.ItemManager),
+        this.get<MutatorService>(TYPES.MutatorService),
+        this.get<SyncService>(TYPES.SyncService),
+      )
+    })
+
     this.factory.set(TYPES.GetSharedVaults, () => {
       return new GetSharedVaults(this.get<GetVaults>(TYPES.GetVaults))
     })
@@ -1080,7 +1098,7 @@ export class Dependencies {
     })
 
     this.factory.set(TYPES.MfaService, () => {
-      return new SNMfaService(
+      return new MfaService(
         this.get<SettingsService>(TYPES.SettingsService),
         this.get<PureCryptoInterface>(TYPES.Crypto),
         this.get<FeaturesService>(TYPES.FeaturesService),

packages/snjs/lib/Application/Dependencies/Types.ts

@@ -156,6 +156,9 @@ export const TYPES = {
   DecryptErroredPayloads: Symbol.for('DecryptErroredPayloads'),
   GetKeyPairs: Symbol.for('GetKeyPairs'),
   ChangeVaultStorageMode: Symbol.for('ChangeVaultStorageMode'),
+  ChangeAndSaveItem: Symbol.for('ChangeAndSaveItem'),
+  GetHost: Symbol.for('GetHost'),
+  SetHost: Symbol.for('SetHost'),
 
   // Mappers
   SessionStorageMapper: Symbol.for('SessionStorageMapper'),

packages/snjs/lib/Application/Dependencies/isDeinitable.ts

@@ -1,14 +0,0 @@
-export function isDeinitable(service: unknown): service is { deinit(): void } {
-  if (!service) {
-    throw new Error('Service is undefined')
-  }
-  return typeof (service as { deinit(): void }).deinit === 'function'
-}
-
-export function canBlockDeinit(service: unknown): service is { blockDeinit(): Promise<void> } {
-  if (!service) {
-    throw new Error('Service is undefined')
-  }
-
-  return typeof (service as { blockDeinit(): Promise<void> }).blockDeinit === 'function'
-}