Use WeakRef

Author: jiexi

packages/selected-network-controller/src/SelectedNetworkController.ts

@@ -113,7 +113,7 @@ export class SelectedNetworkController extends BaseController<
   SelectedNetworkControllerState,
   SelectedNetworkControllerMessenger
 > {
-  #proxies = new Map<Domain, NetworkProxy>();
+  #proxies = new Map<Domain, WeakRef<NetworkProxy>>();
 
   #getUseRequestQueue: GetUseRequestQueue;
 
@@ -218,18 +218,9 @@ export class SelectedNetworkController extends BaseController<
       'NetworkController:getNetworkClientById',
       networkClientId,
     );
-    const networkProxy = this.#proxies.get(domain);
-    if (networkProxy === undefined) {
-      this.#proxies.set(domain, {
-        provider: createEventEmitterProxy(networkClient.provider),
-        blockTracker: createEventEmitterProxy(networkClient.blockTracker, {
-          eventFilter: 'skipInternal',
-        }),
-      });
-    } else {
-      networkProxy.provider.setTarget(networkClient.provider);
-      networkProxy.blockTracker.setTarget(networkClient.blockTracker);
-    }
+    const networkProxy = this.getProviderAndBlockTracker(domain)
+    networkProxy.provider.setTarget(networkClient.provider);
+    networkProxy.blockTracker.setTarget(networkClient.blockTracker);
 
     this.update((state) => {
       state.domains[domain] = networkClientId;
@@ -240,7 +231,7 @@ export class SelectedNetworkController extends BaseController<
     const globallySelectedNetworkClient = this.messagingSystem.call(
       'NetworkController:getSelectedNetworkClient',
     );
-    const networkProxy = this.#proxies.get(domain);
+    const networkProxy = this.#getProxy(domain)
     if (networkProxy && globallySelectedNetworkClient) {
       networkProxy.provider.setTarget(globallySelectedNetworkClient.provider);
       networkProxy.blockTracker.setTarget(
@@ -297,7 +288,7 @@ export class SelectedNetworkController extends BaseController<
    */
   getProviderAndBlockTracker(domain: Domain): NetworkProxy {
     const networkClientId = this.state.domains[domain];
-    let networkProxy = this.#proxies.get(domain);
+    let networkProxy = this.#getProxy(domain)
     if (networkProxy === undefined) {
       let networkClient;
       if (networkClientId === undefined) {
@@ -319,9 +310,20 @@ export class SelectedNetworkController extends BaseController<
           eventFilter: 'skipInternal',
         }),
       };
-      this.#proxies.set(domain, networkProxy);
+      this.#setProxy(domain, networkProxy);
     }
 
     return networkProxy;
   }
+
+  #getProxy(domain: Domain): NetworkProxy | undefined {
+    if (this.#proxies.has(domain)) {
+      return this.#proxies.get(domain)!.deref();
+    }
+    return undefined
+  }
+
+  #setProxy(domain: Domain, networkProxy: NetworkProxy) {
+    this.#proxies.set(domain, new WeakRef(networkProxy));
+  }
 }