Load-sdk-once

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

@@ -92,6 +92,7 @@
 import { KeyGenerationService as KeyGenerationServiceAbstraction } from "@bitwarden/common/platform/abstractions/key-generation.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
 import {
@@ -125,6 +126,7 @@
 import { KeyGenerationService } from "@bitwarden/common/platform/services/key-generation.service";
 import { MigrationBuilderService } from "@bitwarden/common/platform/services/migration-builder.service";
 import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
+import { DefaultSdkClientFactory } from "@bitwarden/common/platform/services/sdk/default-sdk-client-factory";
 import { DefaultSdkService } from "@bitwarden/common/platform/services/sdk/default-sdk.service";
 import { NoopSdkClientFactory } from "@bitwarden/common/platform/services/sdk/noop-sdk-client-factory";
 import { StateService } from "@bitwarden/common/platform/services/state.service";
@@ -260,7 +262,7 @@
 import { BackgroundPlatformUtilsService } from "../platform/services/platform-utils/background-platform-utils.service";
 import { BrowserPlatformUtilsService } from "../platform/services/platform-utils/browser-platform-utils.service";
 import { PopupViewCacheBackgroundService } from "../platform/services/popup-view-cache-background.service";
-import { BrowserSdkClientFactory } from "../platform/services/sdk/browser-sdk-client-factory";
+import { BrowserSdkLoadService } from "../platform/services/sdk/browser-sdk-load.service";
 import { BackgroundTaskSchedulerService } from "../platform/services/task-scheduler/background-task-scheduler.service";
 import { BackgroundMemoryStorageService } from "../platform/storage/background-memory-storage.service";
 import { BrowserStorageServiceProvider } from "../platform/storage/browser-storage-service.provider";
@@ -380,6 +382,7 @@
   themeStateService: DefaultThemeStateService;
   autoSubmitLoginBackground: AutoSubmitLoginBackground;
   sdkService: SdkService;
+  sdkLoadService: SdkLoadService;
   cipherAuthorizationService: CipherAuthorizationService;
   inlineMenuFieldQualificationService: InlineMenuFieldQualificationService;
 
@@ -731,8 +734,9 @@
     );
 
     const sdkClientFactory = flagEnabled("sdk")
-      ? new BrowserSdkClientFactory(this.logService)
+      ? new DefaultSdkClientFactory()
       : new NoopSdkClientFactory();
+    this.sdkLoadService = new BrowserSdkLoadService(this.logService);
     this.sdkService = new DefaultSdkService(
       sdkClientFactory,
       this.environmentService,
@@ -1267,6 +1271,7 @@
   async bootstrap() {
     this.containerService.attachToGlobal(self);
 
+    await this.sdkLoadService.load();
     // Only the "true" background should run migrations
     await this.stateService.init({ runMigrations: true });
 

apps/browser/src/platform/browser/run-inside-angular.operator.ts

@@ -19,3 +19,55 @@ export function runInsideAngular<T>(ngZone: NgZone): MonoTypeOperatorFunction<T>
       return () => subscription.unsubscribe();
     });
 }
+
+// function now() {
+//   const userId = "userId" as UserId;
+//   const otherService: { someSetting: Observable<any> } = null;
+//   const sdkService: DefaultSdkService = null;
+
+//   combineLatest([otherService.someSetting, sdkService.userClient$(userId)]).subscribe(
+//     ([someSetting, sdkClient]) => {
+//       using client = sdkClient.take();
+//       if (someSetting) {
+//         client.value.echo("some setting");
+//       } else {
+//         client.value.echo("no setting");
+//       }
+//     },
+//   );
+// }
+
+// function callback() {
+//   const userId = "userId" as UserId;
+//   const otherService: { someSetting: Observable<any> } = null;
+//   const sdkService: DefaultSdkService = null;
+
+//   someSetting.pipe(
+//     switchMap((someSettings) =>
+//       sdkService.userClientWithCallback$(userId, (client) => {
+//         // take done in userClient With Callback while calling this callback
+//         if (someSettings) {
+//           client.echo("some setting");
+//         } else {
+//           client.echo("no setting");
+//         }
+//       }),
+//     ),
+//   );
+// }
+
+// function operator() {
+//   const userId = "userId" as UserId;
+//   const otherService: { someSetting: Observable<any> } = null;
+//   const sdkService: DefaultSdkService = null;
+
+//   someSetting.pipe(
+//     sdkService.withUserClient, // this transforms the stream into [value, client] tuple while ensuring the client it taken
+//   ).subscribe(([someSetting, client]) => {
+//     if (someSetting) {
+//       client.echo("some setting");
+//     } else {
+//       client.echo("no setting");
+//     }
+//   });
+// }

apps/browser/src/platform/services/sdk/browser-sdk-client-factory.ts → apps/browser/src/platform/services/sdk/browser-sdk-load.service.ts

@@ -1,11 +1,12 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { SdkClientFactory } from "@bitwarden/common/platform/abstractions/sdk/sdk-client-factory";
-import type { BitwardenClient } from "@bitwarden/sdk-internal";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 
 import { BrowserApi } from "../../browser/browser-api";
 
+export type GlobalWithWasmInit = typeof globalThis & {
+  initSdk: () => void;
+};
+
 // https://stackoverflow.com/a/47880734
 const supported = (() => {
   try {
@@ -17,9 +18,7 @@
         return new WebAssembly.Instance(module) instanceof WebAssembly.Instance;
       }
     }
-    // FIXME: Remove when updating file. Eslint update
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  } catch (e) {
+  } catch {
     // ignore
   }
   return false;
@@ -33,54 +32,42 @@
 if (BrowserApi.isManifestVersion(3)) {
   if (supported) {
     // eslint-disable-next-line no-console
-    console.debug("WebAssembly is supported in this environment");
+    console.info("WebAssembly is supported in this environment");
     loadingPromise = import("./wasm");
   } else {
     // eslint-disable-next-line no-console
-    console.debug("WebAssembly is not supported in this environment");
+    console.info("WebAssembly is not supported in this environment");
     loadingPromise = import("./fallback");
   }
 }
 
 // Manifest v2 expects dynamic imports to prevent timing issues.
-async function load() {
+async function importModule(): Promise<GlobalWithWasmInit["initSdk"]> {
   if (BrowserApi.isManifestVersion(3)) {
     // Ensure we have loaded the module
     await loadingPromise;
-    return;
-  }
-
-  if (supported) {
+  } else if (supported) {
     // eslint-disable-next-line no-console
-    console.debug("WebAssembly is supported in this environment");
+    console.info("WebAssembly is supported in this environment");
     await import("./wasm");
   } else {
     // eslint-disable-next-line no-console
-    console.debug("WebAssembly is not supported in this environment");
+    console.info("WebAssembly is not supported in this environment");
     await import("./fallback");
   }
+
+  // the wasm and fallback imports mutate globalThis to add the initSdk function
+  return (globalThis as GlobalWithWasmInit).initSdk;
 }
 
-/**
- * SDK client factory with a js fallback for when WASM is not supported.
- *
- * Works both in popup and service worker.
- */
-export class BrowserSdkClientFactory implements SdkClientFactory {
-  constructor(private logService: LogService) {}
+export class BrowserSdkLoadService implements SdkLoadService {
+  constructor(readonly logService: LogService) {}
 
-  async createSdkClient(
-    ...args: ConstructorParameters<typeof BitwardenClient>
-  ): Promise<BitwardenClient> {
+  async load(): Promise<void> {
     const startTime = performance.now();
-    await load();
-
+    await importModule().then((initSdk) => initSdk());
     const endTime = performance.now();
 
-    const instance = (globalThis as any).init_sdk(...args);
-
-    this.logService.info("WASM SDK loaded in", Math.round(endTime - startTime), "ms");
-
-    return instance;
+    this.logService.info(`WASM SDK loaded in ${Math.round(endTime - startTime)}ms`);
   }
 }

apps/browser/src/platform/services/sdk/fallback.ts

@@ -1,8 +1,8 @@
 import * as sdk from "@bitwarden/sdk-internal";
 import * as wasm from "@bitwarden/sdk-internal/bitwarden_wasm_internal_bg.wasm.js";
 
-(globalThis as any).init_sdk = (...args: ConstructorParameters<typeof sdk.BitwardenClient>) => {
-  (sdk as any).init(wasm);
+import { GlobalWithWasmInit } from "./browser-sdk-load.service";
 
-  return new sdk.BitwardenClient(...args);
+(globalThis as GlobalWithWasmInit).initSdk = () => {
+  (sdk as any).init(wasm);
 };

apps/browser/src/platform/services/sdk/wasm.ts

@@ -1,8 +1,8 @@
 import * as sdk from "@bitwarden/sdk-internal";
 import * as wasm from "@bitwarden/sdk-internal/bitwarden_wasm_internal_bg.wasm";
 
-(globalThis as any).init_sdk = (...args: ConstructorParameters<typeof sdk.BitwardenClient>) => {
-  (sdk as any).init(wasm);
+import { GlobalWithWasmInit } from "./browser-sdk-load.service";
 
-  return new sdk.BitwardenClient(...args);
+(globalThis as GlobalWithWasmInit).initSdk = () => {
+  (sdk as any).init(wasm);
 };

apps/browser/src/popup/services/init.service.ts

@@ -6,6 +6,7 @@
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
@@ -22,11 +23,13 @@
     private twoFactorService: TwoFactorService,
     private logService: LogServiceAbstraction,
     private themingService: AbstractThemingService,
+    private sdkLoadService: SdkLoadService,
     @Inject(DOCUMENT) private document: Document,
   ) {}
 
   init() {
     return async () => {
+      await this.sdkLoadService.load();
       await this.stateService.init({ runMigrations: false }); // Browser background is responsible for migrations
       await this.i18nService.init();
       this.twoFactorService.init();

apps/browser/src/popup/services/services.module.ts

@@ -70,6 +70,7 @@
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SdkClientFactory } from "@bitwarden/common/platform/abstractions/sdk/sdk-client-factory";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import {
   AbstractStorageService,
@@ -82,6 +83,7 @@
 import { TaskSchedulerService } from "@bitwarden/common/platform/scheduling";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
+import { DefaultSdkClientFactory } from "@bitwarden/common/platform/services/sdk/default-sdk-client-factory";
 import { NoopSdkClientFactory } from "@bitwarden/common/platform/services/sdk/noop-sdk-client-factory";
 import { StorageServiceProvider } from "@bitwarden/common/platform/services/storage-service.provider";
 import { WebCryptoFunctionService } from "@bitwarden/common/platform/services/web-crypto-function.service";
@@ -144,7 +146,7 @@
 import { BrowserScriptInjectorService } from "../../platform/services/browser-script-injector.service";
 import I18nService from "../../platform/services/i18n.service";
 import { ForegroundPlatformUtilsService } from "../../platform/services/platform-utils/foreground-platform-utils.service";
-import { BrowserSdkClientFactory } from "../../platform/services/sdk/browser-sdk-client-factory";
+import { BrowserSdkLoadService } from "../../platform/services/sdk/browser-sdk-load.service";
 import { ForegroundTaskSchedulerService } from "../../platform/services/task-scheduler/foreground-task-scheduler.service";
 import { BrowserStorageServiceProvider } from "../../platform/storage/browser-storage-service.provider";
 import { ForegroundMemoryStorageService } from "../../platform/storage/foreground-memory-storage.service";
@@ -566,11 +568,16 @@
     deps: [MessageSender, MessageListener],
   }),
   safeProvider({
-    provide: SdkClientFactory,
-    useFactory: (logService: LogService) =>
-      flagEnabled("sdk") ? new BrowserSdkClientFactory(logService) : new NoopSdkClientFactory(),
+    provide: SdkLoadService,
+    useClass: BrowserSdkLoadService,
     deps: [LogService],
   }),
+  safeProvider({
+    provide: SdkClientFactory,
+    useFactory: () =>
+      flagEnabled("sdk") ? new DefaultSdkClientFactory() : new NoopSdkClientFactory(),
+    deps: [],
+  }),
   safeProvider({
     provide: LoginEmailService,
     useClass: LoginEmailService,

apps/cli/src/platform/services/cli-sdk-load.service.ts

@@ -0,0 +1,9 @@
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
+import * as sdk from "@bitwarden/sdk-internal";
+
+export class CliSdkLoadService implements SdkLoadService {
+  async load(): Promise<void> {
+    const module = await import("@bitwarden/sdk-internal/bitwarden_wasm_internal_bg.wasm");
+    (sdk as any).init(module);
+  }
+}

apps/cli/src/service-container/service-container.ts

@@ -65,6 +65,7 @@
   RegionConfig,
 } from "@bitwarden/common/platform/abstractions/environment.service";
 import { KeyGenerationService as KeyGenerationServiceAbstraction } from "@bitwarden/common/platform/abstractions/key-generation.service";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { KeySuffixOptions, LogLevelType } from "@bitwarden/common/platform/enums";
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
@@ -168,6 +169,7 @@
 import { CliBiometricsService } from "../key-management/cli-biometrics-service";
 import { flagEnabled } from "../platform/flags";
 import { CliPlatformUtilsService } from "../platform/services/cli-platform-utils.service";
+import { CliSdkLoadService } from "../platform/services/cli-sdk-load.service";
 import { ConsoleLogService } from "../platform/services/console-log.service";
 import { I18nService } from "../platform/services/i18n.service";
 import { LowdbStorageService } from "../platform/services/lowdb-storage.service";
@@ -266,6 +268,7 @@
   kdfConfigService: KdfConfigService;
   taskSchedulerService: TaskSchedulerService;
   sdkService: SdkService;
+  sdkLoadService: SdkLoadService;
   cipherAuthorizationService: CipherAuthorizationService;
 
   constructor() {
@@ -566,6 +569,7 @@
     const sdkClientFactory = flagEnabled("sdk")
       ? new DefaultSdkClientFactory()
       : new NoopSdkClientFactory();
+    this.sdkLoadService = new CliSdkLoadService();
     this.sdkService = new DefaultSdkService(
       sdkClientFactory,
       this.environmentService,
@@ -854,6 +858,7 @@
       return;
     }
 
+    await this.sdkLoadService.load();
     await this.storageService.init();
     await this.stateService.init();
     this.containerService.attachToGlobal(global);

apps/desktop/src/app/services/init.service.ts

@@ -11,6 +11,7 @@
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
 import { UserAutoUnlockKeyService } from "@bitwarden/common/platform/services/user-auto-unlock-key.service";
@@ -47,11 +48,13 @@
     private versionService: VersionService,
     private sshAgentService: SshAgentService,
     private autofillService: DesktopAutofillService,
+    private sdkLoadService: SdkLoadService,
     @Inject(DOCUMENT) private document: Document,
   ) {}
 
   init() {
     return async () => {
+      await this.sdkLoadService.load();
       await this.sshAgentService.init();
       this.nativeMessagingService.init();
       await this.stateService.init({ runMigrations: false }); // Desktop will run them in main process

apps/desktop/src/app/services/services.module.ts

@@ -67,6 +67,7 @@
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SdkClientFactory } from "@bitwarden/common/platform/abstractions/sdk/sdk-client-factory";
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/platform/abstractions/system.service";
@@ -77,7 +78,9 @@
 import { Fido2AuthenticatorService } from "@bitwarden/common/platform/services/fido2/fido2-authenticator.service";
 import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
 import { DefaultSdkClientFactory } from "@bitwarden/common/platform/services/sdk/default-sdk-client-factory";
+import { DefaultSdkLoadService } from "@bitwarden/common/platform/services/sdk/default-sdk-load.service";
 import { NoopSdkClientFactory } from "@bitwarden/common/platform/services/sdk/noop-sdk-client-factory";
+import { NoopSdkLoadService } from "@bitwarden/common/platform/services/sdk/noop-sdk-load.service";
 import { SystemService } from "@bitwarden/common/platform/services/system.service";
 import { GlobalStateProvider, StateProvider } from "@bitwarden/common/platform/state";
 // eslint-disable-next-line import/no-restricted-paths -- Implementation for memory storage
@@ -393,6 +396,11 @@
     useClass: flagEnabled("sdk") ? DefaultSdkClientFactory : NoopSdkClientFactory,
     deps: [],
   }),
+  safeProvider({
+    provide: SdkLoadService,
+    useClass: flagEnabled("sdk") ? DefaultSdkLoadService : NoopSdkLoadService,
+    deps: [],
+  }),
   safeProvider({
     provide: LoginEmailService,
     useClass: LoginEmailService,