chore: bot comment

Author: joker23

packages/sdk/electron/__tests__/platform/ElectronStorage.test.ts

@@ -2,7 +2,10 @@ import * as fs from 'fs/promises';
 
 import type { LDLogger } from '@launchdarkly/js-client-sdk-common';
 
-import ElectronStorage from '../../src/platform/ElectronStorage';
+import ElectronStorage, {
+  getElectronStorage,
+  resetElectronStorage,
+} from '../../src/platform/ElectronStorage';
 
 jest.mock('fs/promises');
 jest.mock('electron', () => ({
@@ -23,6 +26,7 @@ const logger: LDLogger = {
 
 beforeEach(() => {
   jest.clearAllMocks();
+  resetElectronStorage();
 });
 
 it('handles failed initialization when clearing values', async () => {
@@ -230,3 +234,16 @@ it('handles error when setting values', async () => {
     'Error setting key in storage: key3, reason: write failed',
   );
 });
+
+it('getElectronStorage returns the same instance on subsequent calls', () => {
+  const a = getElectronStorage(logger);
+  const b = getElectronStorage(logger);
+  expect(a).toBe(b);
+});
+
+it('resetElectronStorage causes a fresh instance on next call', () => {
+  const a = getElectronStorage(logger);
+  resetElectronStorage();
+  const b = getElectronStorage(logger);
+  expect(a).not.toBe(b);
+});

packages/sdk/electron/contract-tests/entity/src/ClientEntity.ts

@@ -140,12 +140,6 @@ export class ClientEntity {
   async close() {
     try {
       await this._client.close();
-      if (fs.existsSync(this._storagePath)) {
-        fs.rmSync(this._storagePath, { recursive: true });
-      }
-      if (fs.existsSync(`${this._storagePath}.tmp`)) {
-        fs.rmSync(`${this._storagePath}.tmp`, { recursive: true });
-      }
       this._logger.info('Test ended');
     } catch (error) {
       this._logger.error(`Error closing client: ${error}`);

packages/sdk/electron/src/platform/ElectronPlatform.ts

@@ -5,7 +5,7 @@ import ElectronCrypto from './ElectronCrypto';
 import ElectronEncoding from './ElectronEncoding';
 import ElectronInfo from './ElectronInfo';
 import ElectronRequests from './ElectronRequests';
-import ElectronStorage from './ElectronStorage';
+import { getElectronStorage } from './ElectronStorage';
 
 // NOTE: Because Electron main process runs on Node.js, this platform should be
 // very similar to the Node server sdk platform.
@@ -22,7 +22,7 @@ export default class ElectronPlatform implements platform.Platform {
   requests: platform.Requests;
 
   constructor(logger: LDLogger, options: ElectronOptions) {
-    this.storage = new ElectronStorage(logger);
+    this.storage = getElectronStorage(logger);
     this.requests = new ElectronRequests(
       options.tlsParams,
       options.proxyOptions,

packages/sdk/electron/src/platform/ElectronStorage.ts

@@ -113,3 +113,19 @@ export default class ElectronStorage implements Storage {
     }
   }
 }
+
+// Storage should be a singleton to support multiple instances of the SDK. This should have
+// the same limitations as the browser sdk using the shared localStorage cache.
+let instance: ElectronStorage | undefined;
+
+export function getElectronStorage(logger?: LDLogger): ElectronStorage {
+  if (!instance) {
+    instance = new ElectronStorage(logger);
+  }
+  return instance;
+}
+
+/** @internal Visible for testing only. */
+export function resetElectronStorage(): void {
+  instance = undefined;
+}