IPersistentStore wrapper around IPersistentState

Author: kimadeline

src/client/pythonEnvironments/base/envsCache.ts

@@ -3,8 +3,7 @@
 
 import { cloneDeep } from 'lodash';
 import { IFileSystem } from '../../common/platform/types';
-import { IPersistentState } from '../../common/types';
-import { getGlobalPersistentStore } from '../common/externalDependencies';
+import { getGlobalPersistentStore, IPersistentStore } from '../common/externalDependencies';
 import { areSameEnvironment, PartialPythonEnvironment } from '../info';
 import { PythonEnvInfo } from './info';
 
@@ -58,7 +57,7 @@ export class PythonEnvInfoCache implements IEnvsCache {
 
     private envsList: PythonEnvInfo[] | undefined;
 
-    private persistentStorage: IPersistentState<PythonEnvInfo[]> | undefined;
+    private persistentStorage: IPersistentStore<PythonEnvInfo[]> | undefined;
 
     constructor(private readonly isComplete: CompleteEnvInfoFunction) {}
 
@@ -69,7 +68,7 @@ export class PythonEnvInfoCache implements IEnvsCache {
 
         this.initialized = true;
         this.persistentStorage = getGlobalPersistentStore<PythonEnvInfo[]>('PYTHON_ENV_INFO_CACHE');
-        this.envsList = this.persistentStorage?.value;
+        this.envsList = this.persistentStorage?.get();
     }
 
     public getAllEnvs(): PythonEnvInfo[] | undefined {
@@ -100,7 +99,7 @@ export class PythonEnvInfoCache implements IEnvsCache {
         const completeEnvs = this.envsList?.filter(this.isComplete);
 
         if (completeEnvs?.length) {
-            await this.persistentStorage?.updateValue(completeEnvs);
+            await this.persistentStorage?.set(completeEnvs);
         }
     }
 }

src/client/pythonEnvironments/common/externalDependencies.ts

@@ -4,7 +4,7 @@
 import * as fsapi from 'fs-extra';
 import * as path from 'path';
 import { ExecutionResult, IProcessServiceFactory } from '../../common/process/types';
-import { IPersistentState, IPersistentStateFactory } from '../../common/types';
+import { IPersistentStateFactory } from '../../common/types';
 import { getOSType, OSType } from '../../common/utils/platform';
 import { IServiceContainer } from '../../ioc/types';
 
@@ -43,7 +43,17 @@ function getPersistentStateFactory(): IPersistentStateFactory {
     return internalServiceContainer.get<IPersistentStateFactory>(IPersistentStateFactory);
 }
 
-export function getGlobalPersistentStore<T>(key: string): IPersistentState<T> {
+export interface IPersistentStore<T> {
+    get(): T | undefined;
+    set(value: T): Promise<void>;
+}
+
+export function getGlobalPersistentStore<T>(key: string): IPersistentStore<T> {
     const factory = getPersistentStateFactory();
-    return factory.createGlobalPersistentState<T>(key, undefined);
+    const state = factory.createGlobalPersistentState<T>(key, undefined);
+
+    return {
+        get() { return state.value; },
+        set(value: T) { return state.updateValue(value); },
+    };
 }