@metamask-previews/network-connection-banner-controller 0.1.0-preview-2fc626b → 0.1.0-preview-3c0e8a808

package/CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Initial release ([#9041](https://github.com/MetaMask/core/pull/9041))
+- Add `NetworkConnectionBannerController`, which evaluates enabled network RPC
+  health after initialization and manages degraded and unavailable banner state,
+  dismissal, and switching custom RPC endpoints to an available Infura endpoint
+  ([#9041](https://github.com/MetaMask/core/pull/9041))
 
 [Unreleased]: https://github.com/MetaMask/core/

package/README.md

@@ -5,6 +5,19 @@ connection banner based on RPC endpoint health. It encapsulates the shared
 rule, the 5s/30s timer state machine, and the eTLD+1 grouping previously
 duplicated across MetaMask clients.
 
+## Initialization
+
+After constructing the controller, call `init()` only after the
+`NetworkController`, `NetworkEnablementController`, and
+`ConnectivityController` have initialized. Until then, upstream state changes
+are ignored and no banner timers run.
+
+```typescript
+networkConnectionBannerController.init();
+```
+
+`init()` is idempotent and immediately evaluates the latest upstream state.
+
 ## Installation
 
 `yarn add @metamask/network-connection-banner-controller`

package/dist/NetworkConnectionBannerController-method-action-types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkConnectionBannerController-method-action-types.cjs","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { NetworkConnectionBannerController } from './NetworkConnectionBannerController';\n\n/**\n * Clears the banner state regardless of the current rule outcome. The next\n * subscription-driven evaluation will re-show the banner if the conditions\n * still hold.\n */\nexport type NetworkConnectionBannerControllerDismissBannerAction = {\n  type: `NetworkConnectionBannerController:dismissBanner`;\n  handler: NetworkConnectionBannerController['dismissBanner'];\n};\n\n/**\n * Switches the chain's default RPC endpoint to its first Infura endpoint,\n * causing the banner to clear once the network becomes available again.\n *\n * @param args - The arguments to this action.\n * @param args.chainId - The chain whose default RPC should be switched.\n * @throws If the chain configuration cannot be found, or if it has no\n * Infura endpoint to switch to, or if the default is already Infura.\n */\nexport type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction = {\n  type: `NetworkConnectionBannerController:switchToDefaultInfuraRpc`;\n  handler: NetworkConnectionBannerController['switchToDefaultInfuraRpc'];\n};\n\n/**\n * Union of all NetworkConnectionBannerController action types.\n */\nexport type NetworkConnectionBannerControllerMethodActions =\n  | NetworkConnectionBannerControllerDismissBannerAction\n  | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction;\n"]}
+{"version":3,"file":"NetworkConnectionBannerController-method-action-types.cjs","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { NetworkConnectionBannerController } from './NetworkConnectionBannerController';\n\n/**\n * Starts evaluating network connection state.\n *\n * This method should be called after the upstream network, network\n * enablement, and connectivity controllers have been initialized.\n */\nexport type NetworkConnectionBannerControllerInitAction = {\n  type: `NetworkConnectionBannerController:init`;\n  handler: NetworkConnectionBannerController['init'];\n};\n\n/**\n * Clears the banner state such that the banner will be hidden.\n */\nexport type NetworkConnectionBannerControllerDismissBannerAction = {\n  type: `NetworkConnectionBannerController:dismissBanner`;\n  handler: NetworkConnectionBannerController['dismissBanner'];\n};\n\n/**\n * Switches the chain's default RPC endpoint to its first Infura endpoint,\n * causing the banner to clear once the network becomes available again.\n *\n * @param args - The arguments to this action.\n * @param args.chainId - The chain whose default RPC should be switched.\n * @throws If the chain configuration cannot be found, or if it has no\n * Infura endpoint to switch to, or if the default is already Infura.\n */\nexport type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction = {\n  type: `NetworkConnectionBannerController:switchToDefaultInfuraRpc`;\n  handler: NetworkConnectionBannerController['switchToDefaultInfuraRpc'];\n};\n\n/**\n * Union of all NetworkConnectionBannerController action types.\n */\nexport type NetworkConnectionBannerControllerMethodActions =\n  | NetworkConnectionBannerControllerInitAction\n  | NetworkConnectionBannerControllerDismissBannerAction\n  | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction;\n"]}

package/dist/NetworkConnectionBannerController-method-action-types.d.cts

@@ -4,9 +4,17 @@
  */
 import type { NetworkConnectionBannerController } from "./NetworkConnectionBannerController.cjs";
 /**
- * Clears the banner state regardless of the current rule outcome. The next
- * subscription-driven evaluation will re-show the banner if the conditions
- * still hold.
+ * Starts evaluating network connection state.
+ *
+ * This method should be called after the upstream network, network
+ * enablement, and connectivity controllers have been initialized.
+ */
+export type NetworkConnectionBannerControllerInitAction = {
+    type: `NetworkConnectionBannerController:init`;
+    handler: NetworkConnectionBannerController['init'];
+};
+/**
+ * Clears the banner state such that the banner will be hidden.
  */
 export type NetworkConnectionBannerControllerDismissBannerAction = {
     type: `NetworkConnectionBannerController:dismissBanner`;
@@ -28,5 +36,5 @@ export type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction = {
 /**
  * Union of all NetworkConnectionBannerController action types.
  */
-export type NetworkConnectionBannerControllerMethodActions = NetworkConnectionBannerControllerDismissBannerAction | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction;
+export type NetworkConnectionBannerControllerMethodActions = NetworkConnectionBannerControllerInitAction | NetworkConnectionBannerControllerDismissBannerAction | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction;
 //# sourceMappingURL=NetworkConnectionBannerController-method-action-types.d.cts.map

package/dist/NetworkConnectionBannerController-method-action-types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkConnectionBannerController-method-action-types.d.cts","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iCAAiC,EAAE,gDAA4C;AAE7F;;;;GAIG;AACH,MAAM,MAAM,oDAAoD,GAAG;IACjE,IAAI,EAAE,iDAAiD,CAAC;IACxD,OAAO,EAAE,iCAAiC,CAAC,eAAe,CAAC,CAAC;CAC7D,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,+DAA+D,GAAG;IAC5E,IAAI,EAAE,4DAA4D,CAAC;IACnE,OAAO,EAAE,iCAAiC,CAAC,0BAA0B,CAAC,CAAC;CACxE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,8CAA8C,GACtD,oDAAoD,GACpD,+DAA+D,CAAC"}
+{"version":3,"file":"NetworkConnectionBannerController-method-action-types.d.cts","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iCAAiC,EAAE,gDAA4C;AAE7F;;;;;GAKG;AACH,MAAM,MAAM,2CAA2C,GAAG;IACxD,IAAI,EAAE,wCAAwC,CAAC;IAC/C,OAAO,EAAE,iCAAiC,CAAC,MAAM,CAAC,CAAC;CACpD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oDAAoD,GAAG;IACjE,IAAI,EAAE,iDAAiD,CAAC;IACxD,OAAO,EAAE,iCAAiC,CAAC,eAAe,CAAC,CAAC;CAC7D,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,+DAA+D,GAAG;IAC5E,IAAI,EAAE,4DAA4D,CAAC;IACnE,OAAO,EAAE,iCAAiC,CAAC,0BAA0B,CAAC,CAAC;CACxE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,8CAA8C,GACtD,2CAA2C,GAC3C,oDAAoD,GACpD,+DAA+D,CAAC"}

package/dist/NetworkConnectionBannerController-method-action-types.d.mts

@@ -4,9 +4,17 @@
  */
 import type { NetworkConnectionBannerController } from "./NetworkConnectionBannerController.mjs";
 /**
- * Clears the banner state regardless of the current rule outcome. The next
- * subscription-driven evaluation will re-show the banner if the conditions
- * still hold.
+ * Starts evaluating network connection state.
+ *
+ * This method should be called after the upstream network, network
+ * enablement, and connectivity controllers have been initialized.
+ */
+export type NetworkConnectionBannerControllerInitAction = {
+    type: `NetworkConnectionBannerController:init`;
+    handler: NetworkConnectionBannerController['init'];
+};
+/**
+ * Clears the banner state such that the banner will be hidden.
  */
 export type NetworkConnectionBannerControllerDismissBannerAction = {
     type: `NetworkConnectionBannerController:dismissBanner`;
@@ -28,5 +36,5 @@ export type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction = {
 /**
  * Union of all NetworkConnectionBannerController action types.
  */
-export type NetworkConnectionBannerControllerMethodActions = NetworkConnectionBannerControllerDismissBannerAction | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction;
+export type NetworkConnectionBannerControllerMethodActions = NetworkConnectionBannerControllerInitAction | NetworkConnectionBannerControllerDismissBannerAction | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction;
 //# sourceMappingURL=NetworkConnectionBannerController-method-action-types.d.mts.map

package/dist/NetworkConnectionBannerController-method-action-types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkConnectionBannerController-method-action-types.d.mts","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iCAAiC,EAAE,gDAA4C;AAE7F;;;;GAIG;AACH,MAAM,MAAM,oDAAoD,GAAG;IACjE,IAAI,EAAE,iDAAiD,CAAC;IACxD,OAAO,EAAE,iCAAiC,CAAC,eAAe,CAAC,CAAC;CAC7D,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,+DAA+D,GAAG;IAC5E,IAAI,EAAE,4DAA4D,CAAC;IACnE,OAAO,EAAE,iCAAiC,CAAC,0BAA0B,CAAC,CAAC;CACxE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,8CAA8C,GACtD,oDAAoD,GACpD,+DAA+D,CAAC"}
+{"version":3,"file":"NetworkConnectionBannerController-method-action-types.d.mts","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iCAAiC,EAAE,gDAA4C;AAE7F;;;;;GAKG;AACH,MAAM,MAAM,2CAA2C,GAAG;IACxD,IAAI,EAAE,wCAAwC,CAAC;IAC/C,OAAO,EAAE,iCAAiC,CAAC,MAAM,CAAC,CAAC;CACpD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oDAAoD,GAAG;IACjE,IAAI,EAAE,iDAAiD,CAAC;IACxD,OAAO,EAAE,iCAAiC,CAAC,eAAe,CAAC,CAAC;CAC7D,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,+DAA+D,GAAG;IAC5E,IAAI,EAAE,4DAA4D,CAAC;IACnE,OAAO,EAAE,iCAAiC,CAAC,0BAA0B,CAAC,CAAC;CACxE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,8CAA8C,GACtD,2CAA2C,GAC3C,oDAAoD,GACpD,+DAA+D,CAAC"}

package/dist/NetworkConnectionBannerController-method-action-types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkConnectionBannerController-method-action-types.mjs","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { NetworkConnectionBannerController } from './NetworkConnectionBannerController';\n\n/**\n * Clears the banner state regardless of the current rule outcome. The next\n * subscription-driven evaluation will re-show the banner if the conditions\n * still hold.\n */\nexport type NetworkConnectionBannerControllerDismissBannerAction = {\n  type: `NetworkConnectionBannerController:dismissBanner`;\n  handler: NetworkConnectionBannerController['dismissBanner'];\n};\n\n/**\n * Switches the chain's default RPC endpoint to its first Infura endpoint,\n * causing the banner to clear once the network becomes available again.\n *\n * @param args - The arguments to this action.\n * @param args.chainId - The chain whose default RPC should be switched.\n * @throws If the chain configuration cannot be found, or if it has no\n * Infura endpoint to switch to, or if the default is already Infura.\n */\nexport type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction = {\n  type: `NetworkConnectionBannerController:switchToDefaultInfuraRpc`;\n  handler: NetworkConnectionBannerController['switchToDefaultInfuraRpc'];\n};\n\n/**\n * Union of all NetworkConnectionBannerController action types.\n */\nexport type NetworkConnectionBannerControllerMethodActions =\n  | NetworkConnectionBannerControllerDismissBannerAction\n  | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction;\n"]}
+{"version":3,"file":"NetworkConnectionBannerController-method-action-types.mjs","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { NetworkConnectionBannerController } from './NetworkConnectionBannerController';\n\n/**\n * Starts evaluating network connection state.\n *\n * This method should be called after the upstream network, network\n * enablement, and connectivity controllers have been initialized.\n */\nexport type NetworkConnectionBannerControllerInitAction = {\n  type: `NetworkConnectionBannerController:init`;\n  handler: NetworkConnectionBannerController['init'];\n};\n\n/**\n * Clears the banner state such that the banner will be hidden.\n */\nexport type NetworkConnectionBannerControllerDismissBannerAction = {\n  type: `NetworkConnectionBannerController:dismissBanner`;\n  handler: NetworkConnectionBannerController['dismissBanner'];\n};\n\n/**\n * Switches the chain's default RPC endpoint to its first Infura endpoint,\n * causing the banner to clear once the network becomes available again.\n *\n * @param args - The arguments to this action.\n * @param args.chainId - The chain whose default RPC should be switched.\n * @throws If the chain configuration cannot be found, or if it has no\n * Infura endpoint to switch to, or if the default is already Infura.\n */\nexport type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction = {\n  type: `NetworkConnectionBannerController:switchToDefaultInfuraRpc`;\n  handler: NetworkConnectionBannerController['switchToDefaultInfuraRpc'];\n};\n\n/**\n * Union of all NetworkConnectionBannerController action types.\n */\nexport type NetworkConnectionBannerControllerMethodActions =\n  | NetworkConnectionBannerControllerInitAction\n  | NetworkConnectionBannerControllerDismissBannerAction\n  | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcAction;\n"]}

package/dist/NetworkConnectionBannerController.cjs

@@ -10,14 +10,44 @@ 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 _NetworkConnectionBannerController_instances, _NetworkConnectionBannerController_degradedTimer, _NetworkConnectionBannerController_unavailableTimer, _NetworkConnectionBannerController_pendingNetworkClientId, _NetworkConnectionBannerController_evaluate, _NetworkConnectionBannerController_resetBanner, _NetworkConnectionBannerController_clearTimers, _NetworkConnectionBannerController_findFailedNetworkForBanner;
+var _NetworkConnectionBannerController_instances, _NetworkConnectionBannerController_degradedTimer, _NetworkConnectionBannerController_unavailableTimer, _NetworkConnectionBannerController_pendingNetworkClientId, _NetworkConnectionBannerController_initialized, _NetworkConnectionBannerController_onUpstreamChange, _NetworkConnectionBannerController_refreshState, _NetworkConnectionBannerController_resetBanner, _NetworkConnectionBannerController_clearTimers, _NetworkConnectionBannerController_findFailedNetwork, _NetworkConnectionBannerController_getEnabledEvmChainIds, _NetworkConnectionBannerController_collectNetworksWithMetadata, _NetworkConnectionBannerController_buildFailedNetwork, _NetworkConnectionBannerController_pickBannerNetwork;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkConnectionBannerController = exports.getDefaultNetworkConnectionBannerControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
 const connectivity_controller_1 = require("@metamask/connectivity-controller");
 const network_controller_1 = require("@metamask/network-controller");
+const network_enablement_controller_1 = require("@metamask/network-enablement-controller");
 const utils_1 = require("@metamask/utils");
+const reselect_1 = require("reselect");
 const url_utils_1 = require("./url-utils.cjs");
+/**
+ * Selects `networksMetadata` from the `NetworkController` state.
+ *
+ * @param state - The `NetworkController` state.
+ * @returns The networks metadata map keyed by network client id.
+ */
+const selectNetworksMetadata = (state) => state.networksMetadata;
+/**
+ * Selects `networkConfigurationsByChainId` from the `NetworkController`
+ * state.
+ *
+ * @param state - The `NetworkController` state.
+ * @returns The network configurations keyed by chain id.
+ */
+const selectNetworkConfigurationsByChainId = (state) => state.networkConfigurationsByChainId;
+/**
+ * Selects the `NetworkController` state fields that influence the banner
+ * rule. Composed with `createSelector` so the return object stays reference
+ * stable while unrelated `NetworkController` state (e.g.
+ * `selectedNetworkClientId`) changes.
+ *
+ * @param state - The `NetworkController` state.
+ * @returns The relevant network fields.
+ */
+const selectNetworkControllerFields = (0, reselect_1.createSelector)([selectNetworksMetadata, selectNetworkConfigurationsByChainId], (networksMetadata, networkConfigurationsByChainId) => ({
+    networksMetadata,
+    networkConfigurationsByChainId,
+}));
 /**
  * The name of the {@link NetworkConnectionBannerController}, used to namespace
  * the controller's actions and events and to namespace the controller's state
@@ -50,9 +80,18 @@ function getDefaultNetworkConnectionBannerControllerState() {
     };
 }
 exports.getDefaultNetworkConnectionBannerControllerState = getDefaultNetworkConnectionBannerControllerState;
-const DEGRADED_BANNER_TIMEOUT_MS = 5000;
-const UNAVAILABLE_BANNER_TIMEOUT_MS = 30000;
+/**
+ * How long (in milliseconds) a failing network must remain in a "failed"
+ * status ("degraded" or "unavailable") before the degraded banner appears.
+ */
+const DEGRADED_BANNER_TIMEOUT = 5000;
+/**
+ * How long (in milliseconds) a failing network must remain in a "failed"
+ * status before the banner escalates to "unavailable".
+ */
+const UNAVAILABLE_BANNER_TIMEOUT = 30000;
 const MESSENGER_EXPOSED_METHODS = [
+    'init',
     'dismissBanner',
     'switchToDefaultInfuraRpc',
 ];
@@ -67,8 +106,8 @@ const MESSENGER_EXPOSED_METHODS = [
  * - The first failing network's default RPC is a custom (non-Infura) endpoint
  *   — users always want to be informed about errors with RPCs they've chosen.
  * - Failed RPCs span more than one registrable domain (likely client-side).
- * - Every enabled EVM network is failing (escape hatch for single-network
- *   setups so they still get a signal).
+ * - Every enabled EVM network with known connectivity status is failing
+ *   (escape hatch for single-network setups so they still get a signal).
  *
  * A wide single-provider outage (e.g. every `*.infura.io` network goes down at
  * once) collapses to one domain and is suppressed, except in the all-down
@@ -97,20 +136,34 @@ class NetworkConnectionBannerController extends base_controller_1.BaseController
         _NetworkConnectionBannerController_degradedTimer.set(this, void 0);
         _NetworkConnectionBannerController_unavailableTimer.set(this, void 0);
         _NetworkConnectionBannerController_pendingNetworkClientId.set(this, void 0);
-        const onStateChange = () => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_evaluate).call(this);
+        _NetworkConnectionBannerController_initialized.set(this, false);
+        // Scoped selectors per controller guideline so unrelated upstream
+        // `stateChange` events (e.g. a `NetworkController` selected client id
+        // update) do not trigger a re-evaluation.
         // Upstream controllers still expose :stateChange; switch to :stateChanged
         // once those packages migrate their event types.
         /* eslint-disable no-restricted-syntax -- awaiting upstream :stateChanged migration */
-        this.messenger.subscribe('NetworkController:stateChange', onStateChange);
-        this.messenger.subscribe('NetworkEnablementController:stateChange', onStateChange);
-        this.messenger.subscribe('ConnectivityController:stateChange', onStateChange);
+        this.messenger.subscribe('NetworkController:stateChange', () => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_onUpstreamChange).call(this), selectNetworkControllerFields);
+        this.messenger.subscribe('NetworkEnablementController:stateChange', () => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_onUpstreamChange).call(this), network_enablement_controller_1.selectEnabledNetworkMap);
+        this.messenger.subscribe('ConnectivityController:stateChange', () => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_onUpstreamChange).call(this), connectivity_controller_1.connectivityControllerSelectors.selectConnectivityStatus);
         /* eslint-enable no-restricted-syntax */
         this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
     /**
-     * Clears the banner state regardless of the current rule outcome. The next
-     * subscription-driven evaluation will re-show the banner if the conditions
-     * still hold.
+     * Starts evaluating network connection state.
+     *
+     * This method should be called after the upstream network, network
+     * enablement, and connectivity controllers have been initialized.
+     */
+    init() {
+        if (__classPrivateFieldGet(this, _NetworkConnectionBannerController_initialized, "f")) {
+            return;
+        }
+        __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this);
+        __classPrivateFieldSet(this, _NetworkConnectionBannerController_initialized, true, "f");
+    }
+    /**
+     * Clears the banner state such that the banner will be hidden.
      */
     dismissBanner() {
         __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_resetBanner).call(this);
@@ -129,7 +182,7 @@ class NetworkConnectionBannerController extends base_controller_1.BaseController
         if (!networkConfiguration) {
             throw new Error(`No network configuration found for chain ID "${chainId}".`);
         }
-        const infuraEndpointIndex = networkConfiguration.rpcEndpoints.findIndex((endpoint) => isInfuraEndpoint(endpoint.url));
+        const infuraEndpointIndex = networkConfiguration.rpcEndpoints.findIndex((endpoint) => getIsInfuraEndpoint(endpoint.url));
         if (infuraEndpointIndex === -1) {
             throw new Error(`No Infura endpoint available for chain ID "${chainId}".`);
         }
@@ -144,66 +197,66 @@ class NetworkConnectionBannerController extends base_controller_1.BaseController
     }
 }
 exports.NetworkConnectionBannerController = NetworkConnectionBannerController;
-_NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnectionBannerController_unavailableTimer = new WeakMap(), _NetworkConnectionBannerController_pendingNetworkClientId = new WeakMap(), _NetworkConnectionBannerController_instances = new WeakSet(), _NetworkConnectionBannerController_evaluate = function _NetworkConnectionBannerController_evaluate() {
+_NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnectionBannerController_unavailableTimer = new WeakMap(), _NetworkConnectionBannerController_pendingNetworkClientId = new WeakMap(), _NetworkConnectionBannerController_initialized = new WeakMap(), _NetworkConnectionBannerController_instances = new WeakSet(), _NetworkConnectionBannerController_onUpstreamChange = function _NetworkConnectionBannerController_onUpstreamChange() {
+    if (__classPrivateFieldGet(this, _NetworkConnectionBannerController_initialized, "f")) {
+        __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this);
+    }
+}, _NetworkConnectionBannerController_refreshState = function _NetworkConnectionBannerController_refreshState() {
     const { connectivityStatus } = this.messenger.call('ConnectivityController:getState');
     if (connectivityStatus === connectivity_controller_1.CONNECTIVITY_STATUSES.Offline) {
         __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_resetBanner).call(this);
         return;
     }
-    const failed = __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_findFailedNetworkForBanner).call(this);
-    if (!failed) {
+    const failedNetwork = __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_findFailedNetwork).call(this);
+    if (!failedNetwork) {
         __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_resetBanner).call(this);
         return;
     }
     if (this.state.status !== 'available' &&
-        this.state.network?.networkClientId === failed.networkClientId) {
-        this.update((draft) => {
-            draft.network = failed;
+        this.state.network?.networkClientId === failedNetwork.networkClientId) {
+        this.update((state) => {
+            state.network = failedNetwork;
         });
         return;
     }
-    if (__classPrivateFieldGet(this, _NetworkConnectionBannerController_pendingNetworkClientId, "f") === failed.networkClientId) {
+    if (__classPrivateFieldGet(this, _NetworkConnectionBannerController_pendingNetworkClientId, "f") === failedNetwork.networkClientId) {
         return;
     }
     __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_clearTimers).call(this);
-    this.update((draft) => {
-        draft.status = 'available';
-        draft.network = null;
+    this.update((state) => {
+        state.status = 'available';
+        state.network = null;
     });
-    __classPrivateFieldSet(this, _NetworkConnectionBannerController_pendingNetworkClientId, failed.networkClientId, "f");
+    // Capture the failing network at schedule time. We trust the messenger
+    // contract: if the failure resolves or the target changes during the
+    // wait, our upstream subscriptions will have cancelled or replaced this
+    // timer via `#clearTimers` before it fires.
+    __classPrivateFieldSet(this, _NetworkConnectionBannerController_pendingNetworkClientId, failedNetwork.networkClientId, "f");
     __classPrivateFieldSet(this, _NetworkConnectionBannerController_degradedTimer, setTimeout(() => {
         __classPrivateFieldSet(this, _NetworkConnectionBannerController_degradedTimer, undefined, "f");
         __classPrivateFieldSet(this, _NetworkConnectionBannerController_pendingNetworkClientId, undefined, "f");
-        const stillFailed = __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_findFailedNetworkForBanner).call(this);
-        if (!stillFailed) {
-            return;
-        }
-        this.update((draft) => {
-            draft.status = 'degraded';
-            draft.network = stillFailed;
+        this.update((state) => {
+            state.status = 'degraded';
+            state.network = failedNetwork;
         });
         __classPrivateFieldSet(this, _NetworkConnectionBannerController_unavailableTimer, setTimeout(() => {
             __classPrivateFieldSet(this, _NetworkConnectionBannerController_unavailableTimer, undefined, "f");
-            const stillFailedAtEscalation = __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_findFailedNetworkForBanner).call(this);
-            if (!stillFailedAtEscalation) {
-                return;
-            }
-            this.update((draft) => {
-                draft.status = 'unavailable';
-                draft.network = stillFailedAtEscalation;
+            this.update((state) => {
+                state.status = 'unavailable';
+                state.network = failedNetwork;
             });
-        }, UNAVAILABLE_BANNER_TIMEOUT_MS - DEGRADED_BANNER_TIMEOUT_MS), "f");
-    }, DEGRADED_BANNER_TIMEOUT_MS), "f");
+        }, UNAVAILABLE_BANNER_TIMEOUT - DEGRADED_BANNER_TIMEOUT), "f");
+    }, DEGRADED_BANNER_TIMEOUT), "f");
 }, _NetworkConnectionBannerController_resetBanner = function _NetworkConnectionBannerController_resetBanner() {
     __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_clearTimers).call(this);
+    __classPrivateFieldSet(this, _NetworkConnectionBannerController_pendingNetworkClientId, undefined, "f");
     if (this.state.status !== 'available' || this.state.network !== null) {
-        this.update((draft) => {
-            draft.status = 'available';
-            draft.network = null;
+        this.update((state) => {
+            state.status = 'available';
+            state.network = null;
         });
     }
 }, _NetworkConnectionBannerController_clearTimers = function _NetworkConnectionBannerController_clearTimers() {
-    __classPrivateFieldSet(this, _NetworkConnectionBannerController_pendingNetworkClientId, undefined, "f");
     if (__classPrivateFieldGet(this, _NetworkConnectionBannerController_degradedTimer, "f") !== undefined) {
         clearTimeout(__classPrivateFieldGet(this, _NetworkConnectionBannerController_degradedTimer, "f"));
         __classPrivateFieldSet(this, _NetworkConnectionBannerController_degradedTimer, undefined, "f");
@@ -212,48 +265,64 @@ _NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnec
         clearTimeout(__classPrivateFieldGet(this, _NetworkConnectionBannerController_unavailableTimer, "f"));
         __classPrivateFieldSet(this, _NetworkConnectionBannerController_unavailableTimer, undefined, "f");
     }
-}, _NetworkConnectionBannerController_findFailedNetworkForBanner = function _NetworkConnectionBannerController_findFailedNetworkForBanner() {
+}, _NetworkConnectionBannerController_findFailedNetwork = function _NetworkConnectionBannerController_findFailedNetwork() {
+    const networksWithMetadata = __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_collectNetworksWithMetadata).call(this);
+    const failedNetworks = networksWithMetadata
+        .filter(({ metadata }) => metadata.status !== network_controller_1.NetworkStatus.Available)
+        .map((network) => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_buildFailedNetwork).call(this, network));
+    return __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_pickBannerNetwork).call(this, failedNetworks, networksWithMetadata.length);
+}, _NetworkConnectionBannerController_getEnabledEvmChainIds = function _NetworkConnectionBannerController_getEnabledEvmChainIds() {
     const { enabledNetworkMap } = this.messenger.call('NetworkEnablementController:getState');
-    const enabledEvmChainIds = Object.entries(enabledNetworkMap[utils_1.KnownCaipNamespace.Eip155] ?? {})
+    return Object.entries(enabledNetworkMap[utils_1.KnownCaipNamespace.Eip155] ?? {})
         .filter(([, enabled]) => enabled)
         .map(([chainId]) => chainId);
+}, _NetworkConnectionBannerController_collectNetworksWithMetadata = function _NetworkConnectionBannerController_collectNetworksWithMetadata() {
     const { networkConfigurationsByChainId, networksMetadata } = this.messenger.call('NetworkController:getState');
-    const failedNetworks = [];
-    let totalEnabled = 0;
-    for (const chainId of enabledEvmChainIds) {
+    return __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_getEnabledEvmChainIds).call(this).flatMap((chainId) => {
         const networkConfiguration = networkConfigurationsByChainId[chainId];
         if (!networkConfiguration) {
-            continue;
+            return [];
         }
         const { rpcEndpoints, defaultRpcEndpointIndex, name } = networkConfiguration;
         const defaultRpcEndpoint = rpcEndpoints[defaultRpcEndpointIndex];
         if (!defaultRpcEndpoint) {
-            continue;
+            return [];
         }
-        totalEnabled += 1;
         const metadata = networksMetadata[defaultRpcEndpoint.networkClientId];
-        if (metadata === undefined ||
-            metadata.status === network_controller_1.NetworkStatus.Available) {
-            continue;
-        }
-        const endpointIsInfura = isInfuraEndpoint(defaultRpcEndpoint.url);
-        // For custom endpoints (non-Infura), find an Infura endpoint on this
-        // chain that we could offer to switch to.
-        let infuraNetworkClientId = null;
-        if (!endpointIsInfura) {
-            const otherInfura = rpcEndpoints.find((endpoint, index) => index !== defaultRpcEndpointIndex && isInfuraEndpoint(endpoint.url));
-            infuraNetworkClientId = otherInfura?.networkClientId ?? null;
+        if (!metadata) {
+            return [];
         }
-        failedNetworks.push({
-            chainId,
-            networkClientId: defaultRpcEndpoint.networkClientId,
-            networkName: name,
-            rpcUrl: defaultRpcEndpoint.url,
-            isInfuraEndpoint: endpointIsInfura,
-            infuraNetworkClientId,
-            domain: (0, url_utils_1.getDomain)(defaultRpcEndpoint.url),
-        });
+        return [
+            {
+                chainId,
+                name,
+                rpcEndpoints,
+                defaultRpcEndpointIndex,
+                defaultRpcEndpoint,
+                metadata,
+            },
+        ];
+    });
+}, _NetworkConnectionBannerController_buildFailedNetwork = function _NetworkConnectionBannerController_buildFailedNetwork({ chainId, name, rpcEndpoints, defaultRpcEndpointIndex, defaultRpcEndpoint, }) {
+    const isInfuraEndpoint = getIsInfuraEndpoint(defaultRpcEndpoint.url);
+    // For custom endpoints (non-Infura), find an Infura endpoint on this
+    // chain that we could offer to switch to.
+    let switchableInfuraNetworkClientId = null;
+    if (!isInfuraEndpoint) {
+        const otherInfura = rpcEndpoints.find((endpoint, index) => index !== defaultRpcEndpointIndex &&
+            getIsInfuraEndpoint(endpoint.url));
+        switchableInfuraNetworkClientId = otherInfura?.networkClientId ?? null;
     }
+    return {
+        chainId,
+        networkClientId: defaultRpcEndpoint.networkClientId,
+        name,
+        rpcUrl: defaultRpcEndpoint.url,
+        isInfuraEndpoint,
+        switchableInfuraNetworkClientId,
+        domain: (0, url_utils_1.getDomain)(defaultRpcEndpoint.url),
+    };
+}, _NetworkConnectionBannerController_pickBannerNetwork = function _NetworkConnectionBannerController_pickBannerNetwork(failedNetworks, totalNetworksWithMetadata) {
     if (failedNetworks.length === 0) {
         return null;
     }
@@ -261,36 +330,26 @@ _NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnec
     const distinctDomains = new Set(failedNetworks
         .map((entry) => entry.domain)
         .filter((domain) => domain !== null)).size;
-    const areAllEnabledNetworksFailed = failedNetworks.length === totalEnabled;
+    const areAllKnownNetworksFailed = failedNetworks.length === totalNetworksWithMetadata;
     if (!firstCustomFailed &&
         distinctDomains <= 1 &&
-        !areAllEnabledNetworksFailed) {
+        !areAllKnownNetworksFailed) {
         return null;
     }
-    const selected = firstCustomFailed ?? failedNetworks[0];
-    return {
-        chainId: selected.chainId,
-        networkClientId: selected.networkClientId,
-        networkName: selected.networkName,
-        rpcUrl: selected.rpcUrl,
-        isInfuraEndpoint: selected.isInfuraEndpoint,
-        infuraNetworkClientId: selected.infuraNetworkClientId,
-    };
+    return firstCustomFailed ?? failedNetworks[0];
 };
 /**
- * Checks if an RPC URL is hosted on the Infura service. Detection is by
- * hostname suffix rather than the exact MetaMask-key URL pattern, so any
- * `*.infura.io` URL counts. That's the right shape for grouping by provider.
+ * Whether an RPC URL is a MetaMask Infura endpoint. Matches the
+ * `{infuraProjectId}` placeholder form that lives on stored network
+ * configurations before the wallet substitutes the real project id at
+ * request time. URLs that already carry a substituted key are treated as
+ * custom (we do not have the project id in this package).
  *
  * @param url - The RPC URL to check.
- * @returns True if the URL's host is on `infura.io`.
+ * @returns True if the URL is the placeholder form of a MetaMask Infura
+ * endpoint.
  */
-function isInfuraEndpoint(url) {
-    try {
-        return new URL(url).hostname.toLowerCase().endsWith('.infura.io');
-    }
-    catch {
-        return false;
-    }
+function getIsInfuraEndpoint(url) {
+    return /^https:\/\/[^./]+\.infura\.io\/v3\/\{infuraProjectId\}$/u.test(url);
 }
 //# sourceMappingURL=NetworkConnectionBannerController.cjs.map