refactor: application dependency management (#2363)

packages/snjs/lib/Services/Features/FeaturesService.spec.ts

@@ -1,15 +1,15 @@
 import { ItemInterface, SNFeatureRepo } from '@standardnotes/models'
-import { SNSyncService } from '../Sync/SyncService'
+import { SyncService } from '../Sync/SyncService'
 import { SettingName } from '@standardnotes/settings'
-import { SNFeaturesService } from '@Lib/Services/Features'
+import { FeaturesService } from '@Lib/Services/Features'
 import { RoleName, ContentType } from '@standardnotes/domain-core'
 import { FeatureIdentifier, GetFeatures } from '@standardnotes/features'
-import { SNWebSocketsService } from '../Api/WebsocketsService'
-import { SNSettingsService } from '../Settings'
+import { WebSocketsService } from '../Api/WebsocketsService'
+import { SettingsService } from '../Settings'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import {
   AlertService,
-  ApiServiceInterface,
+  LegacyApiServiceInterface,
   FeaturesEvent,
   FeatureStatus,
   InternalEventBusInterface,
@@ -23,7 +23,7 @@ import {
   UserClientInterface,
   UserService,
 } from '@standardnotes/services'
-import { SNApiService, SNSessionManager } from '../Api'
+import { LegacyApiService, SessionManager } from '../Api'
 import { ItemManager } from '../Items'
 import { DiskStorageService } from '../Storage/DiskStorageService'
 import { SettingsClientInterface } from '../Settings/SettingsClientInterface'
@@ -33,8 +33,8 @@ describe('FeaturesService', () => {
   let itemManager: ItemManagerInterface
   let mutator: MutatorClientInterface
   let subscriptions: SubscriptionManagerInterface
-  let apiService: ApiServiceInterface
-  let webSocketsService: SNWebSocketsService
+  let apiService: LegacyApiServiceInterface
+  let webSocketsService: WebSocketsService
   let settingsService: SettingsClientInterface
   let userService: UserClientInterface
   let syncService: SyncServiceInterface
@@ -46,7 +46,7 @@ describe('FeaturesService', () => {
   let internalEventBus: InternalEventBusInterface
 
   const createService = () => {
-    return new SNFeaturesService(
+    return new FeaturesService(
       storageService,
       itemManager,
       mutator,
@@ -72,7 +72,7 @@ describe('FeaturesService', () => {
     storageService.setValue = jest.fn()
     storageService.getValue = jest.fn()
 
-    apiService = {} as jest.Mocked<SNApiService>
+    apiService = {} as jest.Mocked<LegacyApiService>
     apiService.addEventObserver = jest.fn()
     apiService.isThirdPartyHostUsed = jest.fn().mockReturnValue(false)
 
@@ -92,23 +92,23 @@ describe('FeaturesService', () => {
     subscriptions.getOnlineSubscription = jest.fn()
     subscriptions.addEventObserver = jest.fn()
 
-    webSocketsService = {} as jest.Mocked<SNWebSocketsService>
+    webSocketsService = {} as jest.Mocked<WebSocketsService>
     webSocketsService.addEventObserver = jest.fn()
 
-    settingsService = {} as jest.Mocked<SNSettingsService>
+    settingsService = {} as jest.Mocked<SettingsService>
     settingsService.updateSetting = jest.fn()
 
     userService = {} as jest.Mocked<UserService>
     userService.addEventObserver = jest.fn()
 
-    syncService = {} as jest.Mocked<SNSyncService>
+    syncService = {} as jest.Mocked<SyncService>
     syncService.sync = jest.fn()
 
     alertService = {} as jest.Mocked<AlertService>
     alertService.confirm = jest.fn().mockReturnValue(true)
     alertService.alert = jest.fn()
 
-    sessionManager = {} as jest.Mocked<SNSessionManager>
+    sessionManager = {} as jest.Mocked<SessionManager>
     sessionManager.isSignedIntoFirstPartyServer = jest.fn()
     sessionManager.getUser = jest.fn()
 

packages/snjs/lib/Services/Features/FeaturesService.ts

@@ -4,7 +4,7 @@ import { ClientDisplayableError } from '@standardnotes/responses'
 import { RoleName, ContentType } from '@standardnotes/domain-core'
 import { PROD_OFFLINE_FEATURES_URL } from '../../Hosts'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
-import { SNWebSocketsService } from '../Api/WebsocketsService'
+import { WebSocketsService } from '../Api/WebsocketsService'
 import { WebSocketsServiceEvent } from '../Api/WebSocketsServiceEvent'
 import { TRUSTED_CUSTOM_EXTENSIONS_HOSTS, TRUSTED_FEATURE_HOSTS } from '@Lib/Hosts'
 import { UserRolesChangedEvent } from '@standardnotes/domain-events'
@@ -39,7 +39,7 @@ import {
   StorageKey,
   MutatorClientInterface,
   StorageServiceInterface,
-  ApiServiceInterface,
+  LegacyApiServiceInterface,
   ItemManagerInterface,
   SyncServiceInterface,
   SessionsClientInterface,
@@ -47,6 +47,8 @@ import {
   SubscriptionManagerInterface,
   AccountEvent,
   SubscriptionManagerEvent,
+  ApplicationEvent,
+  ApplicationStageChangedEventPayload,
 } from '@standardnotes/services'
 
 import { DownloadRemoteThirdPartyFeatureUseCase } from './UseCase/DownloadRemoteThirdPartyFeature'
@@ -56,7 +58,7 @@ import { SettingsClientInterface } from '../Settings/SettingsClientInterface'
 
 type GetOfflineSubscriptionDetailsResponse = OfflineSubscriptionEntitlements | ClientDisplayableError
 
-export class SNFeaturesService
+export class FeaturesService
   extends AbstractService<FeaturesEvent>
   implements FeaturesClientInterface, InternalEventHandlerInterface
 {
@@ -71,8 +73,8 @@ export class SNFeaturesService
     private items: ItemManagerInterface,
     private mutator: MutatorClientInterface,
     private subscriptions: SubscriptionManagerInterface,
-    private api: ApiServiceInterface,
-    sockets: SNWebSocketsService,
+    private api: LegacyApiServiceInterface,
+    sockets: WebSocketsService,
     private settings: SettingsClientInterface,
     private user: UserClientInterface,
     private sync: SyncServiceInterface,
@@ -152,20 +154,19 @@ export class SNFeaturesService
       const { userRoles } = event.payload as MetaReceivedData
       void this.updateOnlineRolesWithNewValues(userRoles.map((role) => role.name))
     }
-  }
 
-  override async handleApplicationStage(stage: ApplicationStage): Promise<void> {
-    if (stage === ApplicationStage.FullSyncCompleted_13) {
-      if (!this.hasFirstPartyOnlineSubscription()) {
-        const offlineRepo = this.getOfflineRepo()
+    if (event.type === ApplicationEvent.ApplicationStageChanged) {
+      const stage = (event.payload as ApplicationStageChangedEventPayload).stage
+      if (stage === ApplicationStage.FullSyncCompleted_13) {
+        if (!this.hasFirstPartyOnlineSubscription()) {
+          const offlineRepo = this.getOfflineRepo()
 
-        if (offlineRepo) {
-          void this.downloadOfflineRoles(offlineRepo)
+          if (offlineRepo) {
+            void this.downloadOfflineRoles(offlineRepo)
+          }
         }
       }
     }
-
-    return super.handleApplicationStage(stage)
   }
 
   public enableExperimentalFeature(identifier: FeatureIdentifier): void {

packages/snjs/lib/Services/Features/UseCase/DownloadRemoteThirdPartyFeature.ts

@@ -9,13 +9,17 @@ import {
 import {
   AlertService,
   API_MESSAGE_FAILED_DOWNLOADING_EXTENSION,
-  ApiServiceInterface,
+  LegacyApiServiceInterface,
   ItemManagerInterface,
 } from '@standardnotes/services'
 import { isString } from '@standardnotes/utils'
 
 export class DownloadRemoteThirdPartyFeatureUseCase {
-  constructor(private api: ApiServiceInterface, private items: ItemManagerInterface, private alerts: AlertService) {}
+  constructor(
+    private api: LegacyApiServiceInterface,
+    private items: ItemManagerInterface,
+    private alerts: AlertService,
+  ) {}
 
   async execute(url: string): Promise<ComponentInterface | undefined> {
     const response = await this.api.downloadFeatureUrl(url)