@metamask-previews/ramps-controller 8.0.0-preview-b271ae9 → 8.0.0-preview-92d89c2

package/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Refactor: Consolidate reset logic with a shared resetResource helper and fix abort handling for dependent resources ([#7818](https://github.com/MetaMask/core/pull/7818))
+
 ## [8.0.0]
 
 ### Changed

package/dist/RampsController.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _RampsController_instances, _RampsController_requestCacheTTL, _RampsController_requestCacheMaxSize, _RampsController_pendingRequests, _RampsController_pendingResourceCount, _RampsController_quotePollingInterval, _RampsController_quotePollingOptions, _RampsController_clearPendingResourceCountForDependentResources, _RampsController_removeRequestState, _RampsController_cleanupState, _RampsController_fireAndForget, _RampsController_restartPollingIfActive, _RampsController_updateResourceField, _RampsController_setResourceLoading, _RampsController_setResourceError, _RampsController_updateRequestState;
+var _RampsController_instances, _RampsController_requestCacheTTL, _RampsController_requestCacheMaxSize, _RampsController_pendingRequests, _RampsController_pendingResourceCount, _RampsController_quotePollingInterval, _RampsController_quotePollingOptions, _RampsController_clearPendingResourceCountForDependentResources, _RampsController_abortDependentRequests, _RampsController_mutateRequests, _RampsController_removeRequestState, _RampsController_cleanupState, _RampsController_fireAndForget, _RampsController_restartPollingIfActive, _RampsController_requireRegion, _RampsController_isRegionCurrent, _RampsController_isTokenCurrent, _RampsController_isProviderCurrent, _RampsController_updateResourceField, _RampsController_setResourceLoading, _RampsController_setResourceError, _RampsController_updateRequestState;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RampsController = exports.getDefaultRampsControllerState = exports.RAMPS_CONTROLLER_REQUIRED_SERVICE_ACTIONS = exports.controllerName = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -125,6 +125,21 @@ function getDefaultRampsControllerState() {
     };
 }
 exports.getDefaultRampsControllerState = getDefaultRampsControllerState;
+const DEPENDENT_RESOURCE_KEYS = [
+    'providers',
+    'tokens',
+    'paymentMethods',
+    'quotes',
+];
+const DEPENDENT_RESOURCE_KEYS_SET = new Set(DEPENDENT_RESOURCE_KEYS);
+function resetResource(state, resourceType, defaultResource) {
+    const def = defaultResource ?? getDefaultRampsControllerState()[resourceType];
+    const resource = state[resourceType];
+    resource.data = def.data;
+    resource.selected = def.selected;
+    resource.isLoading = def.isLoading;
+    resource.error = def.error;
+}
 /**
  * Resets region-dependent resources (userRegion, providers, tokens, paymentMethods, quotes).
  * Mutates state in place; use from within controller update() for atomic updates.
@@ -137,22 +152,10 @@ function resetDependentResources(state, options) {
     if (options?.clearUserRegionData) {
         state.userRegion = null;
     }
-    state.providers.selected = null;
-    state.providers.data = [];
-    state.providers.isLoading = false;
-    state.providers.error = null;
-    state.tokens.selected = null;
-    state.tokens.data = null;
-    state.tokens.isLoading = false;
-    state.tokens.error = null;
-    state.paymentMethods.data = [];
-    state.paymentMethods.selected = null;
-    state.paymentMethods.isLoading = false;
-    state.paymentMethods.error = null;
-    state.quotes.data = null;
-    state.quotes.selected = null;
-    state.quotes.isLoading = false;
-    state.quotes.error = null;
+    const defaultState = getDefaultRampsControllerState();
+    for (const key of DEPENDENT_RESOURCE_KEYS) {
+        resetResource(state, key, defaultState[key]);
+    }
 }
 // === HELPER FUNCTIONS ===
 /**
@@ -276,31 +279,49 @@ class RampsController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _RampsController_requestCacheMaxSize, requestCacheMaxSize, "f");
     }
     /**
-     * Executes a request with caching and deduplication.
+     * Executes a request with caching, deduplication, and at most one in-flight
+     * request per resource type.
      *
-     * If a request with the same cache key is already in flight, returns the
-     * existing promise. If valid cached data exists, returns it without making
-     * a new request.
+     * 1. **Same cache key in flight** – If a request with this cache key is
+     *    already pending, returns that promise (deduplication; no second request).
      *
-     * @param cacheKey - Unique identifier for this request.
-     * @param fetcher - Function that performs the actual fetch. Receives an AbortSignal.
-     * @param options - Options for cache behavior.
-     * @returns The result of the request.
+     * 2. **Cache hit** – If valid, non-expired data exists in state.requests for
+     *    this key and forceRefresh is not set, returns that data without fetching.
+     *
+     * 3. **New request** – Creates an AbortController and fires the fetcher.
+     *    If options.resourceType is set, tags the pending request with that
+     *    resource type (so #abortDependentRequests can cancel it on region
+     *    change or cleanup) and ref-counts resource-level loading state.
+     *    On success or error, updates request state and resource error;
+     *    in finally, clears resource loading only if this request was not
+     *    aborted.
+     *
+     * @param cacheKey - Unique identifier for this request (e.g. from createCacheKey).
+     * @param fetcher - Async function that performs the fetch. Receives an AbortSignal
+     *   that is aborted when this request is superseded by another for the same resource.
+     * @param options - Optional forceRefresh, ttl, and resourceType for loading/error state.
+     * @returns The result of the request (from cache, joined promise, or fetcher).
      */
     async executeRequest(cacheKey, fetcher, options) {
+        // Get TTL for verifying cache expiration
         const ttl = options?.ttl ?? __classPrivateFieldGet(this, _RampsController_requestCacheTTL, "f");
-        // Check for existing pending request - join it instead of making a duplicate
+        // DEDUPLICATION:
+        // Check if a request is already in flight for this cache key
+        // If so, return the original promise for that request
         const pending = __classPrivateFieldGet(this, _RampsController_pendingRequests, "f").get(cacheKey);
         if (pending) {
             return pending.promise;
         }
+        // CACHE HIT:
+        // If cache is not expired, return the cached data
         if (!options?.forceRefresh) {
             const cached = this.state.requests[cacheKey];
             if (cached && !(0, RequestCache_1.isCacheExpired)(cached, ttl)) {
                 return cached.data;
             }
         }
-        // Create abort controller for this request
+        // Create a new abort controller for this request
+        // Record the time the request was started
         const abortController = new AbortController();
         const lastFetchedAt = Date.now();
         const { resourceType } = options ?? {};
@@ -319,15 +340,11 @@ class RampsController extends base_controller_1.BaseController {
         const promise = (async () => {
             try {
                 const data = await fetcher(abortController.signal);
-                // Don't update state if aborted
                 if (abortController.signal.aborted) {
                     throw new Error('Request was aborted');
                 }
                 __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_updateRequestState).call(this, cacheKey, (0, RequestCache_1.createSuccessState)(data, lastFetchedAt));
                 if (resourceType) {
-                    // We need the extra logic because there are two situations where we’re allowed to clear the error:
-                    // No callback → always clear
-                    // Callback present → clear only when isResultCurrent() returns true.
                     const isCurrent = !options?.isResultCurrent || options.isResultCurrent();
                     if (isCurrent) {
                         __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_setResourceError).call(this, resourceType, null);
@@ -336,7 +353,6 @@ class RampsController extends base_controller_1.BaseController {
                 return data;
             }
             catch (error) {
-                // Don't update state if aborted
                 if (abortController.signal.aborted) {
                     throw error;
                 }
@@ -351,13 +367,12 @@ class RampsController extends base_controller_1.BaseController {
                 throw error;
             }
             finally {
-                // Only delete if this is still our entry (not replaced by a new request)
-                const currentPending = __classPrivateFieldGet(this, _RampsController_pendingRequests, "f").get(cacheKey);
-                if (currentPending?.abortController === abortController) {
+                if (__classPrivateFieldGet(this, _RampsController_pendingRequests, "f").get(cacheKey)?.abortController ===
+                    abortController) {
                     __classPrivateFieldGet(this, _RampsController_pendingRequests, "f").delete(cacheKey);
                 }
                 // Clear resource-level loading state only when no requests for this resource remain
-                if (resourceType) {
+                if (resourceType && !abortController.signal.aborted) {
                     const count = __classPrivateFieldGet(this, _RampsController_pendingResourceCount, "f").get(resourceType) ?? 0;
                     const next = Math.max(0, count - 1);
                     if (next === 0) {
@@ -370,8 +385,11 @@ class RampsController extends base_controller_1.BaseController {
                 }
             }
         })();
-        // Store pending request for deduplication
-        __classPrivateFieldGet(this, _RampsController_pendingRequests, "f").set(cacheKey, { promise, abortController });
+        __classPrivateFieldGet(this, _RampsController_pendingRequests, "f").set(cacheKey, {
+            promise,
+            abortController,
+            resourceType,
+        });
         return promise;
     }
     /**
@@ -425,9 +443,8 @@ class RampsController extends base_controller_1.BaseController {
                 !this.state.tokens.data ||
                 this.state.providers.data.length === 0;
             if (regionChanged) {
+                __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_abortDependentRequests).call(this);
                 __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_clearPendingResourceCountForDependentResources).call(this);
-            }
-            if (regionChanged) {
                 this.stopQuotePolling();
             }
             this.update((state) => {
@@ -468,15 +485,11 @@ class RampsController extends base_controller_1.BaseController {
             this.stopQuotePolling();
             this.update((state) => {
                 state.providers.selected = null;
-                state.paymentMethods.data = [];
-                state.paymentMethods.selected = null;
+                resetResource(state, 'paymentMethods');
             });
             return;
         }
-        const regionCode = this.state.userRegion?.regionCode;
-        if (!regionCode) {
-            throw new Error('Region is required. Cannot set selected provider without valid region information.');
-        }
+        const regionCode = __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_requireRegion).call(this);
         const providers = this.state.providers.data;
         if (!providers || providers.length === 0) {
             throw new Error('Providers not loaded. Cannot set selected provider before providers are fetched.');
@@ -487,8 +500,7 @@ class RampsController extends base_controller_1.BaseController {
         }
         this.update((state) => {
             state.providers.selected = provider;
-            state.paymentMethods.data = [];
-            state.paymentMethods.selected = null;
+            resetResource(state, 'paymentMethods');
             state.quotes.selected = null;
         });
         __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_fireAndForget).call(this, this.getPaymentMethods(regionCode, { provider: provider.id }).then(() => {
@@ -517,10 +529,7 @@ class RampsController extends base_controller_1.BaseController {
         await this.setUserRegion(regionCode, options);
     }
     hydrateState(options) {
-        const regionCode = this.state.userRegion?.regionCode;
-        if (!regionCode) {
-            throw new Error('Region code is required. Cannot hydrate state without valid region information.');
-        }
+        const regionCode = __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_requireRegion).call(this);
         __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_fireAndForget).call(this, this.getTokens(regionCode, 'buy', options));
         __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_fireAndForget).call(this, this.getProviders(regionCode, options));
     }
@@ -538,7 +547,7 @@ class RampsController extends base_controller_1.BaseController {
             return this.messenger.call('RampsService:getCountries');
         }, { ...options, resourceType: 'countries' });
         this.update((state) => {
-            state.countries.data = countries;
+            state.countries.data = Array.isArray(countries) ? [...countries] : [];
         });
         return countries;
     }
@@ -553,10 +562,7 @@ class RampsController extends base_controller_1.BaseController {
      * @returns The tokens response containing topTokens and allTokens.
      */
     async getTokens(region, action = 'buy', options) {
-        const regionToUse = region ?? this.state.userRegion?.regionCode;
-        if (!regionToUse) {
-            throw new Error('Region is required. Either provide a region parameter or ensure userRegion is set in controller state.');
-        }
+        const regionToUse = region ?? __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_requireRegion).call(this);
         const normalizedRegion = regionToUse.toLowerCase().trim();
         const cacheKey = (0, RequestCache_1.createCacheKey)('getTokens', [
             normalizedRegion,
@@ -570,8 +576,7 @@ class RampsController extends base_controller_1.BaseController {
         }, {
             ...options,
             resourceType: 'tokens',
-            isResultCurrent: () => this.state.userRegion?.regionCode === undefined ||
-                this.state.userRegion?.regionCode === normalizedRegion,
+            isResultCurrent: () => __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_isRegionCurrent).call(this, normalizedRegion),
         });
         this.update((state) => {
             const userRegionCode = state.userRegion?.regionCode;
@@ -594,15 +599,11 @@ class RampsController extends base_controller_1.BaseController {
             this.stopQuotePolling();
             this.update((state) => {
                 state.tokens.selected = null;
-                state.paymentMethods.data = [];
-                state.paymentMethods.selected = null;
+                resetResource(state, 'paymentMethods');
             });
             return;
         }
-        const regionCode = this.state.userRegion?.regionCode;
-        if (!regionCode) {
-            throw new Error('Region is required. Cannot set selected token without valid region information.');
-        }
+        const regionCode = __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_requireRegion).call(this);
         const tokens = this.state.tokens.data;
         if (!tokens) {
             throw new Error('Tokens not loaded. Cannot set selected token before tokens are fetched.');
@@ -614,8 +615,7 @@ class RampsController extends base_controller_1.BaseController {
         }
         this.update((state) => {
             state.tokens.selected = token;
-            state.paymentMethods.data = [];
-            state.paymentMethods.selected = null;
+            resetResource(state, 'paymentMethods');
             state.quotes.selected = null;
         });
         __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_fireAndForget).call(this, this.getPaymentMethods(regionCode, { assetId: token.assetId }).then(() => {
@@ -636,10 +636,7 @@ class RampsController extends base_controller_1.BaseController {
      * @returns The providers response containing providers array.
      */
     async getProviders(region, options) {
-        const regionToUse = region ?? this.state.userRegion?.regionCode;
-        if (!regionToUse) {
-            throw new Error('Region is required. Either provide a region parameter or ensure userRegion is set in controller state.');
-        }
+        const regionToUse = region ?? __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_requireRegion).call(this);
         const normalizedRegion = regionToUse.toLowerCase().trim();
         const cacheKey = (0, RequestCache_1.createCacheKey)('getProviders', [
             normalizedRegion,
@@ -658,8 +655,7 @@ class RampsController extends base_controller_1.BaseController {
         }, {
             ...options,
             resourceType: 'providers',
-            isResultCurrent: () => this.state.userRegion?.regionCode === undefined ||
-                this.state.userRegion?.regionCode === normalizedRegion,
+            isResultCurrent: () => __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_isRegionCurrent).call(this, normalizedRegion),
         });
         this.update((state) => {
             const userRegionCode = state.userRegion?.regionCode;
@@ -681,13 +677,10 @@ class RampsController extends base_controller_1.BaseController {
      * @returns The payment methods response containing payments array.
      */
     async getPaymentMethods(region, options) {
-        const regionCode = region ?? this.state.userRegion?.regionCode ?? null;
+        const regionCode = region ?? __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_requireRegion).call(this);
         const fiatToUse = options?.fiat ?? this.state.userRegion?.country?.currency ?? null;
         const assetIdToUse = options?.assetId ?? this.state.tokens.selected?.assetId ?? '';
         const providerToUse = options?.provider ?? this.state.providers.selected?.id ?? '';
-        if (!regionCode) {
-            throw new Error('Region is required. Either provide a region parameter or ensure userRegion is set in controller state.');
-        }
         if (!fiatToUse) {
             throw new Error('Fiat currency is required. Either provide a fiat parameter or ensure userRegion is set in controller state.');
         }
@@ -710,10 +703,9 @@ class RampsController extends base_controller_1.BaseController {
             ...options,
             resourceType: 'paymentMethods',
             isResultCurrent: () => {
-                const regionMatch = this.state.userRegion?.regionCode === undefined ||
-                    this.state.userRegion?.regionCode === normalizedRegion;
-                const tokenMatch = (this.state.tokens.selected?.assetId ?? '') === assetIdToUse;
-                const providerMatch = (this.state.providers.selected?.id ?? '') === providerToUse;
+                const regionMatch = __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_isRegionCurrent).call(this, normalizedRegion);
+                const tokenMatch = __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_isTokenCurrent).call(this, assetIdToUse);
+                const providerMatch = __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_isProviderCurrent).call(this, providerToUse);
                 return regionMatch && tokenMatch && providerMatch;
             },
         });
@@ -783,7 +775,7 @@ class RampsController extends base_controller_1.BaseController {
      * @returns The quotes response containing success, sorted, error, and customActions.
      */
     async getQuotes(options) {
-        const regionToUse = options.region ?? this.state.userRegion?.regionCode;
+        const regionToUse = options.region ?? __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_requireRegion).call(this);
         const fiatToUse = options.fiat ?? this.state.userRegion?.country?.currency;
         const paymentMethodsToUse = options.paymentMethods ??
             this.state.paymentMethods.data.map((pm) => pm.id);
@@ -791,9 +783,6 @@ class RampsController extends base_controller_1.BaseController {
             this.state.providers.data.map((provider) => provider.id);
         const action = options.action ?? 'buy';
         const assetIdToUse = options.assetId ?? this.state.tokens.selected?.assetId;
-        if (!regionToUse) {
-            throw new Error('Region is required. Either provide a region parameter or ensure userRegion is set in controller state.');
-        }
         if (!fiatToUse) {
             throw new Error('Fiat currency is required. Either provide a fiat parameter or ensure userRegion is set in controller state.');
         }
@@ -844,8 +833,7 @@ class RampsController extends base_controller_1.BaseController {
             forceRefresh: options.forceRefresh,
             ttl: options.ttl ?? DEFAULT_QUOTES_TTL,
             resourceType: 'quotes',
-            isResultCurrent: () => this.state.userRegion?.regionCode === undefined ||
-                this.state.userRegion?.regionCode === normalizedRegion,
+            isResultCurrent: () => __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_isRegionCurrent).call(this, normalizedRegion),
         });
         this.update((state) => {
             const userRegionCode = state.userRegion?.regionCode;
@@ -868,14 +856,10 @@ class RampsController extends base_controller_1.BaseController {
      * @throws If required dependencies (region, token, provider, payment method) are not set.
      */
     startQuotePolling(options) {
-        // Validate required dependencies
-        const regionCode = this.state.userRegion?.regionCode;
+        __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_requireRegion).call(this);
         const token = this.state.tokens.selected;
         const provider = this.state.providers.selected;
         const paymentMethod = this.state.paymentMethods.selected;
-        if (!regionCode) {
-            throw new Error('Region is required. Cannot start quote polling without valid region information.');
-        }
         if (!token) {
             throw new Error('Token is required. Cannot start quote polling without a selected token.');
         }
@@ -980,26 +964,32 @@ class RampsController extends base_controller_1.BaseController {
 }
 exports.RampsController = RampsController;
 _RampsController_requestCacheTTL = new WeakMap(), _RampsController_requestCacheMaxSize = new WeakMap(), _RampsController_pendingRequests = new WeakMap(), _RampsController_pendingResourceCount = new WeakMap(), _RampsController_quotePollingInterval = new WeakMap(), _RampsController_quotePollingOptions = new WeakMap(), _RampsController_instances = new WeakSet(), _RampsController_clearPendingResourceCountForDependentResources = function _RampsController_clearPendingResourceCountForDependentResources() {
-    const types = [
-        'providers',
-        'tokens',
-        'paymentMethods',
-        'quotes',
-    ];
-    for (const resourceType of types) {
+    for (const resourceType of DEPENDENT_RESOURCE_KEYS) {
         __classPrivateFieldGet(this, _RampsController_pendingResourceCount, "f").delete(resourceType);
     }
-}, _RampsController_removeRequestState = function _RampsController_removeRequestState(cacheKey) {
+}, _RampsController_abortDependentRequests = function _RampsController_abortDependentRequests() {
+    for (const [cacheKey, pending] of __classPrivateFieldGet(this, _RampsController_pendingRequests, "f").entries()) {
+        if (pending.resourceType &&
+            DEPENDENT_RESOURCE_KEYS_SET.has(pending.resourceType)) {
+            pending.abortController.abort();
+            __classPrivateFieldGet(this, _RampsController_pendingRequests, "f").delete(cacheKey);
+            __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_removeRequestState).call(this, cacheKey);
+        }
+    }
+}, _RampsController_mutateRequests = function _RampsController_mutateRequests(fn) {
     this.update((state) => {
         const requests = state.requests;
+        fn(requests);
+    });
+}, _RampsController_removeRequestState = function _RampsController_removeRequestState(cacheKey) {
+    __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_mutateRequests).call(this, (requests) => {
         delete requests[cacheKey];
     });
 }, _RampsController_cleanupState = function _RampsController_cleanupState() {
     this.stopQuotePolling();
+    __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_abortDependentRequests).call(this);
     __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_clearPendingResourceCountForDependentResources).call(this);
-    this.update((state) => resetDependentResources(state, {
-        clearUserRegionData: true,
-    }));
+    this.update((state) => resetDependentResources(state, { clearUserRegionData: true }));
 }, _RampsController_fireAndForget = function _RampsController_fireAndForget(promise) {
     promise.catch((_error) => undefined);
 }, _RampsController_restartPollingIfActive = function _RampsController_restartPollingIfActive() {
@@ -1014,6 +1004,21 @@ _RampsController_requestCacheTTL = new WeakMap(), _RampsController_requestCacheM
             // when dependencies are available
         }
     }
+}, _RampsController_requireRegion = function _RampsController_requireRegion() {
+    const regionCode = this.state.userRegion?.regionCode;
+    if (!regionCode) {
+        throw new Error('Region is required. Cannot proceed without valid region information.');
+    }
+    return regionCode;
+}, _RampsController_isRegionCurrent = function _RampsController_isRegionCurrent(normalizedRegion) {
+    const current = this.state.userRegion?.regionCode;
+    return current === undefined || current === normalizedRegion;
+}, _RampsController_isTokenCurrent = function _RampsController_isTokenCurrent(normalizedAssetId) {
+    const current = this.state.tokens.selected?.assetId ?? '';
+    return current === normalizedAssetId;
+}, _RampsController_isProviderCurrent = function _RampsController_isProviderCurrent(normalizedProviderId) {
+    const current = this.state.providers.selected?.id ?? '';
+    return current === normalizedProviderId;
 }, _RampsController_updateResourceField = function _RampsController_updateResourceField(resourceType, field, value) {
     this.update((state) => {
         const resource = state[resourceType];
@@ -1028,11 +1033,8 @@ _RampsController_requestCacheTTL = new WeakMap(), _RampsController_requestCacheM
 }, _RampsController_updateRequestState = function _RampsController_updateRequestState(cacheKey, requestState) {
     const maxSize = __classPrivateFieldGet(this, _RampsController_requestCacheMaxSize, "f");
     const ttl = __classPrivateFieldGet(this, _RampsController_requestCacheTTL, "f");
-    this.update((state) => {
-        const requests = state.requests;
+    __classPrivateFieldGet(this, _RampsController_instances, "m", _RampsController_mutateRequests).call(this, (requests) => {
         requests[cacheKey] = requestState;
-        // Evict expired entries based on TTL
-        // Only evict SUCCESS states that have exceeded their TTL
         const keys = Object.keys(requests);
         for (const key of keys) {
             const entry = requests[key];
@@ -1041,16 +1043,13 @@ _RampsController_requestCacheTTL = new WeakMap(), _RampsController_requestCacheM
                 delete requests[key];
             }
         }
-        // Evict oldest entries if cache still exceeds max size
         const remainingKeys = Object.keys(requests);
         if (remainingKeys.length > maxSize) {
-            // Sort by timestamp (oldest first)
             const sortedKeys = remainingKeys.sort((a, b) => {
                 const aTime = requests[a]?.timestamp ?? 0;
                 const bTime = requests[b]?.timestamp ?? 0;
                 return aTime - bTime;
             });
-            // Remove oldest entries until we're under the limit
             const entriesToRemove = remainingKeys.length - maxSize;
             for (let i = 0; i < entriesToRemove; i++) {
                 const keyToRemove = sortedKeys[i];