@salesforce/core 8.15.0 → 8.16.0

package/lib/config/configAggregator.d.ts

@@ -54,8 +54,9 @@ export type ConfigInfo = {
  * ```
  */
 export declare class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggregator.Options> {
-    protected static instance: AsyncOptionalCreatable;
     protected static encrypted: boolean;
+    protected static instance: AsyncOptionalCreatable | undefined;
+    private static readonly mutex;
     private allowedProperties;
     private readonly localConfig?;
     private readonly globalConfig;
@@ -68,6 +69,12 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggre
     constructor(options?: ConfigAggregator.Options);
     private get config();
     static create<P extends ConfigAggregator.Options, T extends AsyncOptionalCreatable<P>>(this: new (options?: P) => T, options?: P): Promise<T>;
+    /**
+     * Clear the cache to force reading from disk.
+     *
+     * *NOTE: Only call this method if you must and you know what you are doing.*
+     */
+    static clearInstance(): Promise<void>;
     /**
      * Get the info for a given key. If the ConfigAggregator was not asynchronously created OR
      * the {@link ConfigAggregator.reload} was not called, the config value may be encrypted.

package/lib/config/configAggregator.js

@@ -11,6 +11,7 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const messages_1 = require("../messages");
 const lifecycleEvents_1 = require("../lifecycleEvents");
+const mutex_1 = require("../util/mutex");
 const envVars_1 = require("./envVars");
 const config_1 = require("./config");
 ;
@@ -31,8 +32,9 @@ const messages = new messages_1.Messages('@salesforce/core', 'config', new Map([
  * ```
  */
 class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
-    static instance;
     static encrypted = true;
+    static instance;
+    static mutex = new mutex_1.Mutex();
     // Initialized in loadProperties
     allowedProperties;
     localConfig;
@@ -64,18 +66,32 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
     // Use typing from AsyncOptionalCreatable to support extending ConfigAggregator.
     // We really don't want ConfigAggregator extended but typescript doesn't support a final.
     static async create(options) {
-        let config = ConfigAggregator.instance;
-        if (!config) {
-            config = ConfigAggregator.instance = new this(options);
-            await config.init();
-        }
-        if (ConfigAggregator.encrypted) {
-            await config.loadProperties();
-        }
-        if (options?.customConfigMeta) {
-            config_1.Config.addAllowedProperties(options.customConfigMeta);
-        }
-        return ConfigAggregator.instance;
+        return ConfigAggregator.mutex.lock(async () => {
+            let config = ConfigAggregator.instance;
+            if (!config) {
+                config = ConfigAggregator.instance = new this(options);
+                await config.init();
+            }
+            if (ConfigAggregator.encrypted) {
+                await config.loadProperties();
+            }
+            if (options?.customConfigMeta) {
+                config_1.Config.addAllowedProperties(options.customConfigMeta);
+            }
+            // console.log(ConfigAggregator.instance);
+            return ConfigAggregator.instance;
+        });
+    }
+    /**
+     * Clear the cache to force reading from disk.
+     *
+     * *NOTE: Only call this method if you must and you know what you are doing.*
+     */
+    static async clearInstance() {
+        return ConfigAggregator.mutex.lock(() => {
+            ConfigAggregator.instance = undefined;
+            ConfigAggregator.encrypted = true; // Reset encryption flag as well
+        });
     }
     /**
      * Get the info for a given key. If the ConfigAggregator was not asynchronously created OR

package/lib/stateAggregator/stateAggregator.d.ts

@@ -4,6 +4,7 @@ import { OrgAccessor } from './accessors/orgAccessor';
 import { SandboxAccessor } from './accessors/sandboxAccessor';
 export declare class StateAggregator extends AsyncOptionalCreatable {
     private static instanceMap;
+    private static readonly mutex;
     aliases: AliasAccessor;
     orgs: OrgAccessor;
     sandboxes: SandboxAccessor;
@@ -17,7 +18,14 @@ export declare class StateAggregator extends AsyncOptionalCreatable {
      * Clear the cache to force reading from disk.
      *
      * *NOTE: Only call this method if you must and you know what you are doing.*
+     * *NOTE: This call is NOT thread-safe, so it should only be called when no other threads are using the StateAggregator.*
      */
     static clearInstance(path?: string): void;
+    /**
+     * Clear the cache to force reading from disk in a thread-safe manner.
+     *
+     * *NOTE: Only call this method if you must and you know what you are doing.*
+     */
+    static clearInstanceAsync(path?: string): Promise<void>;
     protected init(): Promise<void>;
 }

package/lib/stateAggregator/stateAggregator.js

@@ -9,11 +9,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StateAggregator = void 0;
 const kit_1 = require("@salesforce/kit");
 const global_1 = require("../global");
+const mutex_1 = require("../util/mutex");
 const aliasAccessor_1 = require("./accessors/aliasAccessor");
 const orgAccessor_1 = require("./accessors/orgAccessor");
 const sandboxAccessor_1 = require("./accessors/sandboxAccessor");
 class StateAggregator extends kit_1.AsyncOptionalCreatable {
     static instanceMap = new Map();
+    static mutex = new mutex_1.Mutex();
     aliases;
     orgs;
     sandboxes;
@@ -23,20 +25,33 @@ class StateAggregator extends kit_1.AsyncOptionalCreatable {
      * HomeDir might be stubbed in tests
      */
     static async getInstance() {
-        if (!StateAggregator.instanceMap.has(global_1.Global.DIR)) {
-            StateAggregator.instanceMap.set(global_1.Global.DIR, await StateAggregator.create());
-        }
-        // TS assertion is valid because there either was one OR it was just now instantiated
-        return StateAggregator.instanceMap.get(global_1.Global.DIR);
+        return StateAggregator.mutex.lock(async () => {
+            if (!StateAggregator.instanceMap.has(global_1.Global.DIR)) {
+                StateAggregator.instanceMap.set(global_1.Global.DIR, await StateAggregator.create());
+            }
+            // TS assertion is valid because there either was one OR it was just now instantiated
+            return StateAggregator.instanceMap.get(global_1.Global.DIR);
+        });
     }
     /**
      * Clear the cache to force reading from disk.
      *
      * *NOTE: Only call this method if you must and you know what you are doing.*
+     * *NOTE: This call is NOT thread-safe, so it should only be called when no other threads are using the StateAggregator.*
      */
     static clearInstance(path = global_1.Global.DIR) {
         StateAggregator.instanceMap.delete(path);
     }
+    /**
+     * Clear the cache to force reading from disk in a thread-safe manner.
+     *
+     * *NOTE: Only call this method if you must and you know what you are doing.*
+     */
+    static async clearInstanceAsync(path = global_1.Global.DIR) {
+        return StateAggregator.mutex.lock(() => {
+            StateAggregator.clearInstance(path);
+        });
+    }
     async init() {
         this.orgs = await orgAccessor_1.OrgAccessor.create();
         this.sandboxes = await sandboxAccessor_1.SandboxAccessor.create();

package/lib/util/mutex.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Simple mutex implementation using promises
+ */
+export declare class Mutex {
+    private mutex;
+    lock<T>(fn: () => Promise<T> | T): Promise<T>;
+    private acquire;
+}

package/lib/util/mutex.js

@@ -0,0 +1,36 @@
+"use strict";
+/*
+ * Copyright (c) 2025, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Mutex = void 0;
+/**
+ * Simple mutex implementation using promises
+ */
+class Mutex {
+    mutex = Promise.resolve();
+    async lock(fn) {
+        const unlock = await this.acquire();
+        try {
+            return await fn();
+        }
+        finally {
+            unlock();
+        }
+    }
+    async acquire() {
+        let release;
+        const promise = new Promise((resolve) => {
+            release = resolve;
+        });
+        const currentMutex = this.mutex;
+        this.mutex = this.mutex.then(() => promise);
+        await currentMutex;
+        return release;
+    }
+}
+exports.Mutex = Mutex;
+//# sourceMappingURL=mutex.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "8.15.0",
+  "version": "8.16.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",