feat!: update unsubscribe

Author: mikesposito

packages/core-backend/CHANGELOG.md

@@ -16,8 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - EVM (`eip155`) subscriptions are always enabled. Solana, Tron, and Stellar subscriptions are enabled when the corresponding `networkAssetsSnapsMigrationSolana` / `networkAssetsSnapsMigrationTron` / `networkAssetsSnapsMigrationStellar` feature flag has `stage >= 1`, and disabled otherwise.
   - Accounts whose scopes do not match an enabled chain are no longer subscribed at all.
   - When the enabled chains change via a feature flag update while the websocket is connected, the service automatically resubscribes the selected account.
-- **BREAKING:** `AccountActivityService.subscribe` now requires a `{ addresses: string[] }` argument ([#9531](https://github.com/MetaMask/core/pull/9531))
-  - Previously, the service only allowed a single address to be subscribed at a time.
+- **BREAKING:** `AccountActivityService.subscribe` and `AccountActivityService.unsubscribe` now require a `{ addresses: string[] }` argument ([#9531](https://github.com/MetaMask/core/pull/9531))
+  - Previously, the service only allowed a single address to be subscribed and unsubscribed at a time.
 - Add `@metamask/remote-feature-flag-controller` `^4.2.2` as a dependency ([#9379](https://github.com/MetaMask/core/pull/9379))
 - Bump `@metamask/messenger` from `^1.2.0` to `^2.0.0` ([#9392](https://github.com/MetaMask/core/pull/9392))
 - Bump `@metamask/profile-sync-controller` from `^28.2.0` to `^28.3.0` ([#9463](https://github.com/MetaMask/core/pull/9463))

packages/core-backend/src/ws/AccountActivityService-method-action-types.ts

@@ -19,10 +19,11 @@ export type AccountActivityServiceSubscribeAction = {
 };
 
 /**
- * Unsubscribe from account activity for specified address
- * Address should be in CAIP-10 format (e.g., "eip155:0:0x1234..." or "solana:0:ABC123...")
+ * Unsubscribe from account activity for specified addresses
+ * Addresses should be in CAIP-10 format (e.g., "eip155:0:0x1234..." or "solana:0:ABC123...")
  *
- * @param subscription - Account subscription configuration with address to unsubscribe
+ * @param subscription - The subscription configuration
+ * @param subscription.addresses - Array of addresses to unsubscribe from, each in CAIP-10 format
  */
 export type AccountActivityServiceUnsubscribeAction = {
   type: `AccountActivityService:unsubscribe`;

packages/core-backend/src/ws/AccountActivityService.test.ts

@@ -15,8 +15,12 @@ import type {
   AccountActivityServiceMessenger,
   SubscriptionOptions,
 } from './AccountActivityService';
-import type { ServerNotificationMessage } from './BackendWebSocketService';
+import type {
+  BackendWebSocketService,
+  ServerNotificationMessage,
+} from './BackendWebSocketService';
 import { WebSocketState } from './BackendWebSocketService';
+import { BackendWebSocketServiceSubscribeAction } from './BackendWebSocketService-method-action-types';
 
 type AllAccountActivityServiceActions =
   MessengerActions<AccountActivityServiceMessenger>;
@@ -618,7 +622,7 @@ describe('AccountActivityService', () => {
   // =============================================================================
   describe('unsubscribe', () => {
     const mockSubscription: SubscriptionOptions = {
-      address: 'eip155:1:0x1234567890123456789012345678901234567890',
+      addresses: ['eip155:1:0x1234567890123456789012345678901234567890'],
     };
 
     it('should handle unsubscribe when not subscribed by returning early without errors', async () => {
@@ -636,6 +640,56 @@ describe('AccountActivityService', () => {
       });
     });
 
+    it('should unsubscribe from active subscriptions for multiple addresses', async () => {
+      await withService(async ({ service, mocks }) => {
+        const mockUnsubscribe = jest.fn();
+        mocks.getSubscriptionsByChannel.mockReturnValueOnce([
+          {
+            subscriptionId: 'sub-123',
+            channels: ['account-activity.v1.eip155:1:0x123abc'],
+            unsubscribe: mockUnsubscribe,
+          },
+        ]);
+        mocks.getSubscriptionsByChannel.mockReturnValueOnce([
+          {
+            subscriptionId: 'sub-456',
+            channels: ['account-activity.v1.eip155:1:0x456def'],
+            unsubscribe: mockUnsubscribe,
+          },
+        ]);
+
+        await service.unsubscribe({
+          addresses: ['eip155:1:0x123abc', 'eip155:1:0x456def'],
+        });
+
+        expect(mockUnsubscribe).toHaveBeenCalledTimes(2);
+      });
+    });
+
+    it('should not unsubscribe multiple times from the same subscription when multiple addresses share the same subscription', async () => {
+      await withService(async ({ service, mocks }) => {
+        const mockUnsubscribe = jest.fn().mockReturnValue(undefined);
+        const subscriptions = [
+          {
+            subscriptionId: 'sub-123',
+            channels: [
+              'account-activity.v1.eip155:1:0x123abc',
+              'account-activity.v1.eip155:1:0x456def',
+            ],
+            unsubscribe: mockUnsubscribe,
+          },
+        ];
+        mocks.getSubscriptionsByChannel.mockReturnValue(subscriptions);
+
+        await service.unsubscribe({
+          addresses: ['eip155:1:0x123abc', 'eip155:1:0x456def'],
+        });
+
+        expect(mocks.getSubscriptionsByChannel).toHaveBeenCalledTimes(2);
+        expect(mockUnsubscribe).toHaveBeenCalledTimes(1);
+      });
+    });
+
     it('should handle unsubscribe errors by forcing WebSocket reconnection instead of throwing', async () => {
       await withService(
         { accountAddress: '0x1234567890123456789012345678901234567890' },

packages/core-backend/src/ws/AccountActivityService.ts

@@ -31,7 +31,10 @@ import type {
   BackendWebSocketServiceConnectionStateChangedEvent,
   ServerNotificationMessage,
 } from './BackendWebSocketService';
-import { WebSocketState } from './BackendWebSocketService';
+import {
+  WebSocketState,
+  WebSocketSubscription,
+} from './BackendWebSocketService';
 import type { BackendWebSocketServiceMethodActions } from './BackendWebSocketService-method-action-types';
 
 // =============================================================================
@@ -335,26 +338,30 @@ export class AccountActivityService {
   }
 
   /**
-   * Unsubscribe from account activity for specified address
-   * Address should be in CAIP-10 format (e.g., "eip155:0:0x1234..." or "solana:0:ABC123...")
+   * Unsubscribe from account activity for specified addresses
+   * Addresses should be in CAIP-10 format (e.g., "eip155:0:0x1234..." or "solana:0:ABC123...")
    *
-   * @param subscription - Account subscription configuration with address to unsubscribe
+   * @param subscription - The subscription configuration
+   * @param subscription.addresses - Array of addresses to unsubscribe from, each in CAIP-10 format
    */
-  async unsubscribe(subscription: SubscriptionOptions): Promise<void> {
-    const { address } = subscription;
+  async unsubscribe({ addresses }: SubscriptionOptions): Promise<void> {
     try {
-      // Find channel for the specified address
-      const channel = `${this.#options.subscriptionNamespace}.${address}`;
-      const subscriptions = this.#messenger.call(
-        'BackendWebSocketService:getSubscriptionsByChannel',
-        channel,
+      // Find all subscriptions for the specified addresses
+      const subscriptions = new Set<WebSocketSubscription>(
+        addresses
+          .map((address) =>
+            this.#messenger.call(
+              'BackendWebSocketService:getSubscriptionsByChannel',
+              `${this.#options.subscriptionNamespace}.${address}`,
+            ),
+          )
+          .flat(),
       );
 
-      if (subscriptions.length === 0) {
+      if (subscriptions.size === 0) {
         return;
       }
 
-      // Fast path: Direct unsubscribe using stored unsubscribe function
       // Unsubscribe from all matching subscriptions
       for (const subscriptionInfo of subscriptions) {
         await subscriptionInfo.unsubscribe();