Refactor State Providers (#8273)

* Delete A Lot Of Code

* Fix Tests

* Create SingleUserState Provider Once

* Update Manual Instantiations

* Fix Service Factory

* Delete More

* Delete Unused `updatePromise`

* `postStorageSave` -> `doStorageSave`

* Update Comment

* Fix jslib-services

apps/browser/src/background/main.background.ts

@@ -409,8 +409,7 @@ export default class MainBackground {
     );
     this.activeUserStateProvider = new DefaultActiveUserStateProvider(
       this.accountService,
-      storageServiceProvider,
-      stateEventRegistrarService,
+      this.singleUserStateProvider,
     );
     this.derivedStateProvider = new BackgroundDerivedStateProvider(
       this.memoryStorageForStateProviders,

apps/browser/src/platform/background/service-factories/active-user-state-provider.factory.ts

@@ -9,20 +9,15 @@ import {
 
 import { CachedServices, FactoryOptions, factory } from "./factory-options";
 import {
-  StateEventRegistrarServiceInitOptions,
-  stateEventRegistrarServiceFactory,
-} from "./state-event-registrar-service.factory";
-import {
-  StorageServiceProviderInitOptions,
-  storageServiceProviderFactory,
-} from "./storage-service-provider.factory";
+  SingleUserStateProviderInitOptions,
+  singleUserStateProviderFactory,
+} from "./single-user-state-provider.factory";
 
 type ActiveUserStateProviderFactory = FactoryOptions;
 
 export type ActiveUserStateProviderInitOptions = ActiveUserStateProviderFactory &
   AccountServiceInitOptions &
-  StorageServiceProviderInitOptions &
-  StateEventRegistrarServiceInitOptions;
+  SingleUserStateProviderInitOptions;
 
 export async function activeUserStateProviderFactory(
   cache: { activeUserStateProvider?: ActiveUserStateProvider } & CachedServices,
@@ -35,8 +30,7 @@ export async function activeUserStateProviderFactory(
     async () =>
       new DefaultActiveUserStateProvider(
         await accountServiceFactory(cache, opts),
-        await storageServiceProviderFactory(cache, opts),
-        await stateEventRegistrarServiceFactory(cache, opts),
+        await singleUserStateProviderFactory(cache, opts),
       ),
   );
 }

apps/cli/src/bw.ts

@@ -294,8 +294,7 @@ export class Main {
 
     this.activeUserStateProvider = new DefaultActiveUserStateProvider(
       this.accountService,
-      storageServiceProvider,
-      stateEventRegistrarService,
+      this.singleUserStateProvider,
     );
 
     this.derivedStateProvider = new DefaultDerivedStateProvider(

apps/desktop/src/main.ts

@@ -124,13 +124,14 @@ export class Main {
       storageServiceProvider,
     );
 
+    const singleUserStateProvider = new DefaultSingleUserStateProvider(
+      storageServiceProvider,
+      stateEventRegistrarService,
+    );
+
     const stateProvider = new DefaultStateProvider(
-      new DefaultActiveUserStateProvider(
-        accountService,
-        storageServiceProvider,
-        stateEventRegistrarService,
-      ),
-      new DefaultSingleUserStateProvider(storageServiceProvider, stateEventRegistrarService),
+      new DefaultActiveUserStateProvider(accountService, singleUserStateProvider),
+      singleUserStateProvider,
       globalStateProvider,
       new DefaultDerivedStateProvider(this.memoryStorageForStateProviders),
     );