Eagerly load CLI SDK

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

@@ -65,6 +65,7 @@ import {
   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";
@@ -88,6 +89,7 @@ import { MemoryStorageService } from "@bitwarden/common/platform/services/memory
 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 { DefaultSdkLoadService } from "@bitwarden/common/platform/services/sdk/default-sdk-load.service";
 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";
@@ -265,6 +267,7 @@ export class ServiceContainer {
   kdfConfigService: KdfConfigService;
   taskSchedulerService: TaskSchedulerService;
   sdkService: SdkService;
+  sdkLoadService: SdkLoadService;
   cipherAuthorizationService: CipherAuthorizationService;
 
   constructor() {
@@ -543,6 +546,7 @@ export class ServiceContainer {
     const sdkClientFactory = flagEnabled("sdk")
       ? new DefaultSdkClientFactory()
       : new NoopSdkClientFactory();
+    this.sdkLoadService = new DefaultSdkLoadService();
     this.sdkService = new DefaultSdkService(
       sdkClientFactory,
       this.environmentService,
@@ -848,6 +852,7 @@ export class ServiceContainer {
       return;
     }
 
+    await this.sdkLoadService.load();
     await this.storageService.init();
     await this.stateService.init();
     this.containerService.attachToGlobal(global);

libs/common/src/platform/abstractions/sdk/sdk-client-factory.ts

@@ -4,6 +4,10 @@ import type { BitwardenClient } from "@bitwarden/sdk-internal";
  * Factory for creating SDK clients.
  */
 export abstract class SdkClientFactory {
+  /**
+   * Creates a new BitwardenClient. Assumes the SDK is already loaded.
+   * @param args Bitwarden client constructor parameters
+   */
   abstract createSdkClient(
     ...args: ConstructorParameters<typeof BitwardenClient>
   ): Promise<BitwardenClient>;

libs/common/src/platform/services/sdk/default-sdk-client-factory.ts

@@ -1,19 +1,19 @@
 import * as sdk from "@bitwarden/sdk-internal";
-import * as module from "@bitwarden/sdk-internal/bitwarden_wasm_internal_bg.wasm";
 
 import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
 
 /**
- * Directly imports the Bitwarden SDK and initializes it.
- *
- * **Warning**: This requires WASM support and will fail if the environment does not support it.
+ * Default SDK client factory.
  */
 export class DefaultSdkClientFactory implements SdkClientFactory {
+  /**
+   * Initializes a Bitwarden client. Assumes the SDK is already loaded.
+   * @param args Bitwarden client constructor parameters
+   * @returns A BitwardenClient
+   */
   async createSdkClient(
     ...args: ConstructorParameters<typeof sdk.BitwardenClient>
   ): Promise<sdk.BitwardenClient> {
-    (sdk as any).init(module);
-
     return Promise.resolve(new sdk.BitwardenClient(...args));
   }
 }

libs/common/src/platform/services/sdk/default-sdk-load.service.ts

@@ -0,0 +1,15 @@
+// eslint-disable-next-line no-restricted-imports -- TODO MDG: fix this import restriction error
+import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
+import * as sdk from "@bitwarden/sdk-internal";
+import * as module from "@bitwarden/sdk-internal/bitwarden_wasm_internal_bg.wasm";
+
+/**
+ * Directly imports the Bitwarden SDK and initializes it.
+ *
+ * **Warning**: This requires WASM support and will fail if the environment does not support it.
+ */
+export class DefaultSdkLoadService implements SdkLoadService {
+  async load(): Promise<void> {
+    (sdk as any).init(module);
+  }
+}