@metamask-previews/notification-services-controller 26.0.1-preview-acb2929f3 → 26.0.1-preview-e3275932a

package/dist/NotificationServicesController/NotificationServicesController.mjs

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _NotificationServicesController_instances, _NotificationServicesController_keyringController, _NotificationServicesController_auth, _NotificationServicesController_pushNotifications, _NotificationServicesController_accounts, _NotificationServicesController_locale, _NotificationServicesController_featureAnnouncementEnv, _NotificationServicesController_env, _NotificationServicesController_clearLoadingStates, _NotificationServicesController_assertAuthEnabled, _NotificationServicesController_enableAuth, _NotificationServicesController_getBearerToken, _NotificationServicesController_isWalletActivityPushEnabled, _NotificationServicesController_registerPushNotifications, _NotificationServicesController_setIsUpdatingMetamaskNotifications, _NotificationServicesController_setIsFetchingMetamaskNotifications, _NotificationServicesController_setIsCheckingAccountsPresence, _NotificationServicesController_updateUpdatingAccountsState, _NotificationServicesController_clearUpdatingAccountsState;
+var _NotificationServicesController_instances, _NotificationServicesController_keyringController, _NotificationServicesController_auth, _NotificationServicesController_pushNotifications, _NotificationServicesController_accounts, _NotificationServicesController_locale, _NotificationServicesController_featureAnnouncementEnv, _NotificationServicesController_env, _NotificationServicesController_clearLoadingStates, _NotificationServicesController_assertAuthEnabled, _NotificationServicesController_enableAuth, _NotificationServicesController_getBearerToken, _NotificationServicesController_registerWalletActivityAddresses, _NotificationServicesController_setIsUpdatingMetamaskNotifications, _NotificationServicesController_setIsFetchingMetamaskNotifications, _NotificationServicesController_setIsCheckingAccountsPresence, _NotificationServicesController_updateUpdatingAccountsState, _NotificationServicesController_clearUpdatingAccountsState;
 function $importDefault(module) {
     if (module?.__esModule) {
         return module.default;
@@ -26,7 +26,7 @@ import $log from "loglevel";
 const log = $importDefault($log);
 import { TRIGGER_TYPES } from "./constants/notification-schema.mjs";
 import { processAndFilterNotifications, safeProcessNotification } from "./processors/process-notifications.mjs";
-import { getAPINotifications, getNotificationsApiConfigCached, markNotificationsAsRead, updateOnChainNotifications } from "./services/api-notifications.mjs";
+import { getAPINotifications, getNotificationsApiConfigCached, markNotificationsAsRead } from "./services/api-notifications.mjs";
 import { getFeatureAnnouncementNotifications } from "./services/feature-announcements.mjs";
 import { createPerpOrderNotification } from "./services/perp-notifications.mjs";
 // Unique name for the controller
@@ -129,46 +129,57 @@ export const DEFAULT_SOCIAL_AI_PREFERENCES = {
 };
 export { DEFAULT_AGENTIC_CLI_PREFERENCES, DEFAULT_PRICE_ALERT_PREFERENCES } from "@metamask/authenticated-user-storage";
 /**
- * Returns the subset of `accounts` that has a wallet-activity subscription in
- * the Trigger API, which is the source of truth for the per-address enabled bit.
+ * Builds wallet-activity preferences from the keyring's current accounts.
  *
- * The address universe is always supplied by the caller from the keyring, so the
- * result cannot contain an address this installation does not hold.
+ * @param accounts - The keyring accounts to build wallet-activity entries for.
+ * @returns An array of wallet-activity account entries (lower-cased addresses).
+ */
+const buildWalletActivityAccounts = (accounts) => accounts.map(({ address, enabled }) => {
+    const lowercased = address.toLowerCase();
+    return {
+        address: lowercased,
+        enabled,
+    };
+});
+/**
+ * Builds wallet-activity initialization from the Trigger API. If Trigger has no
+ * enabled entries for the current keyring accounts, this is a first-time
+ * notification setup and all current accounts should start enabled.
  *
- * @param bearerToken - JWT used to query the Trigger API.
- * @param accounts - The keyring accounts to check.
+ * @param bearerToken - JWT used to query Trigger API.
+ * @param accounts - The keyring accounts to initialize.
  * @param env - The environment to use for the Trigger API call.
- * @returns The enabled addresses, as returned by the Trigger API, or `null` if
- * the Trigger API could not be read.
+ * @returns Wallet-activity account initialization entries.
  */
-const getEnabledAccounts = async (bearerToken, accounts, env) => {
+const buildWalletActivityAccountsFromTriggerConfig = async (bearerToken, accounts, env) => {
     const triggerConfig = await getNotificationsApiConfigCached(bearerToken, accounts, env);
-    if (triggerConfig === null) {
-        return null;
-    }
-    return triggerConfig
-        .filter((addressConfig) => Boolean(addressConfig.enabled))
-        .map((addressConfig) => addressConfig.address);
+    const triggerConfigByAddress = new Map(triggerConfig.map(({ address, enabled }) => [
+        address.toLowerCase(),
+        enabled,
+    ]));
+    const hasEnabledTriggerAccount = accounts.some((address) => triggerConfigByAddress.get(address.toLowerCase()) === true);
+    return accounts.map((address) => ({
+        address,
+        enabled: hasEnabledTriggerAccount
+            ? (triggerConfigByAddress.get(address.toLowerCase()) ?? false)
+            : true,
+    }));
 };
 /**
  * Builds a fresh `NotificationPreferences` blob using hardcoded defaults for
- * Perps, Social AI, and Agentic CLI and the user's marketing/product-announcement
- * flags.
- *
- * `walletActivity.accounts` is deliberately left empty. Addresses are scoped to a
- * keyring, but this blob is keyed by canonical profile ID, which pairing shares
- * across every SRP belonging to the same user — so storing them here pools the
- * addresses of unrelated SRPs. Subscriptions live in the Trigger API instead.
+ * Perps, Social AI, and Agentic CLI, the supplied wallet-activity accounts and
+ * the user's marketing/product-announcement flags.
  *
+ * @param walletActivityAccounts - The wallet-activity account config to initialize.
  * @param hasMarketingConsent - Whether marketing push notifications should be enabled.
  * @param productAnnouncementEnabled - Whether marketing in-app notifications should be enabled.
  * @returns A complete `NotificationPreferences` object.
  */
-const buildFreshPreferences = (hasMarketingConsent, productAnnouncementEnabled) => ({
+const buildFreshPreferences = (walletActivityAccounts, hasMarketingConsent, productAnnouncementEnabled) => ({
     walletActivity: {
         inAppNotificationsEnabled: true,
         pushNotificationsEnabled: true,
-        accounts: [],
+        accounts: buildWalletActivityAccounts(walletActivityAccounts),
     },
     marketing: {
         inAppNotificationsEnabled: productAnnouncementEnabled,
@@ -470,20 +481,13 @@ export class NotificationServicesController extends BaseController {
      */
     async enablePushNotifications() {
         try {
-            if (!(await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_isWalletActivityPushEnabled).call(this))) {
-                await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").disablePushNotifications();
-                return;
-            }
-            const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-            const { accounts } = __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
-            const enabledAddresses = await getEnabledAccounts(bearerToken, accounts, __classPrivateFieldGet(this, _NotificationServicesController_env, "f"));
-            if (enabledAddresses === null) {
-                // "No addresses" unregisters the device, so an unreadable subscription
-                // list must not be treated as an empty one: leave the existing links
-                // alone until we can read the real state.
-                return;
+            const preferences = await this.messenger.call('AuthenticatedUserStorageService:getNotificationPreferences');
+            const enabledAddresses = (preferences?.walletActivity.accounts ?? [])
+                .filter((account) => account.enabled)
+                .map((account) => account.address);
+            if (enabledAddresses.length > 0) {
+                await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").enablePushNotifications(enabledAddresses);
             }
-            await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_registerPushNotifications).call(this, enabledAddresses);
         }
         catch {
             // Do nothing, failing silently.
@@ -498,16 +502,10 @@ export class NotificationServicesController extends BaseController {
     async checkAccountsPresence(accounts) {
         try {
             __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_setIsCheckingAccountsPresence).call(this, true);
-            const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-            const triggerConfig = await getNotificationsApiConfigCached(bearerToken, accounts, __classPrivateFieldGet(this, _NotificationServicesController_env, "f"));
-            if (triggerConfig === null) {
-                // Reporting every account as disabled would misrepresent the user's
-                // settings, so surface the failure instead.
-                throw new Error('Failed to read wallet-activity subscriptions');
-            }
-            const enabledByAddress = new Map(triggerConfig.map((addressConfig) => [
-                addressConfig.address.toLowerCase(),
-                Boolean(addressConfig.enabled),
+            const preferences = await this.messenger.call('AuthenticatedUserStorageService:getNotificationPreferences');
+            const enabledByAddress = new Map((preferences?.walletActivity.accounts ?? []).map((account) => [
+                account.address.toLowerCase(),
+                account.enabled,
             ]));
             const result = {};
             for (const address of accounts) {
@@ -566,46 +564,27 @@ export class NotificationServicesController extends BaseController {
             __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_setIsUpdatingMetamaskNotifications).call(this, true);
             const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
             const { accounts } = __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
-            // 1. Read existing AUS notification preferences. Their absence is what
-            // marks a first-time setup, and they are initialized in step 3.
+            // 1. Read existing AUS notification preferences and initialize only if absent.
             const preferences = await this.messenger.call('AuthenticatedUserStorageService:getNotificationPreferences');
             const hasMarketingConsent = Boolean(opts?.hasMarketingConsent);
             const productAnnouncementEnabled = Boolean(opts?.productAnnouncementEnabled);
-            const isFirstTimeSetup = preferences === null;
-            const isPushEnabled = preferences?.walletActivity.pushNotificationsEnabled ?? true;
-            // 2. Subscribe the keyring's accounts on first-time setup only.
-            //
-            // This method also runs on the daily re-subscribe, so the absence of a
-            // preferences blob — not the absence of subscriptions — is what marks a
-            // genuine first-time setup. Keying off "no subscriptions" would re-enable
-            // every account daily for a user who had turned them all off.
-            //
-            // Even at first-time setup, existing subscriptions win: a user upgrading
-            // from a client that never wrote a preferences blob keeps whichever
-            // accounts they had already disabled.
-            let accountsWithNotifications = await getEnabledAccounts(bearerToken, accounts, __classPrivateFieldGet(this, _NotificationServicesController_env, "f"));
-            if (accountsWithNotifications === null) {
-                // An unreadable subscription list is not an empty one. Subscribing
-                // every account here would re-enable ones the user had turned off, and
-                // registering push for that guessed list would send activity for them,
-                // so fail and let the caller retry.
-                throw new Error('Failed to read wallet-activity subscriptions');
-            }
-            if (isFirstTimeSetup && accountsWithNotifications.length === 0) {
-                await updateOnChainNotifications(bearerToken, accounts.map((address) => ({ address, enabled: true })), __classPrivateFieldGet(this, _NotificationServicesController_env, "f"));
-                accountsWithNotifications = accounts;
+            let nextPreferences;
+            if (preferences === null) {
+                const walletActivityAccounts = await buildWalletActivityAccountsFromTriggerConfig(bearerToken, accounts, __classPrivateFieldGet(this, _NotificationServicesController_env, "f"));
+                nextPreferences = buildFreshPreferences(walletActivityAccounts, hasMarketingConsent, productAnnouncementEnabled);
             }
-            // 3. Initialize the preferences blob, only once the subscriptions above
-            // are in place. Its existence is what makes the next run a re-subscribe
-            // rather than a first-time setup, so writing it earlier would let a
-            // failed subscribe leave the user enabled with no accounts subscribed
-            // and no second chance to seed them.
-            if (isFirstTimeSetup) {
-                await this.messenger.call('AuthenticatedUserStorageService:putNotificationPreferences', buildFreshPreferences(hasMarketingConsent, productAnnouncementEnabled), __classPrivateFieldGet(this, _NotificationServicesController_featureAnnouncementEnv, "f").platform);
+            if (nextPreferences) {
+                await this.messenger.call('AuthenticatedUserStorageService:putNotificationPreferences', nextPreferences, __classPrivateFieldGet(this, _NotificationServicesController_featureAnnouncementEnv, "f").platform);
             }
+            const effectivePreferences = nextPreferences ?? preferences;
+            const accountsWithNotifications = (effectivePreferences?.walletActivity.accounts ?? [])
+                .filter((account) => account.enabled)
+                .map((account) => account.address);
             if (opts.registerPushNotifications ?? true) {
                 // Attempt FCM/device registration only; clients must request OS permission separately.
-                __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_registerPushNotifications).call(this, isPushEnabled ? accountsWithNotifications : []).catch(() => {
+                __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f")
+                    .enablePushNotifications(accountsWithNotifications)
+                    .catch(() => {
                     // Do Nothing
                 });
             }
@@ -698,8 +677,9 @@ export class NotificationServicesController extends BaseController {
     async disableAccounts(accounts) {
         try {
             __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_updateUpdatingAccountsState).call(this, accounts);
-            const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-            await updateOnChainNotifications(bearerToken, accounts.map((address) => ({ address, enabled: false })), __classPrivateFieldGet(this, _NotificationServicesController_env, "f"));
+            // Sign-in gate.
+            await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
+            await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_registerWalletActivityAddresses).call(this, accounts.map((address) => ({ address, enabled: false })));
             await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").deletePushNotificationLinks(accounts);
         }
         catch {
@@ -727,8 +707,9 @@ export class NotificationServicesController extends BaseController {
     async enableAccounts(accounts) {
         try {
             __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_updateUpdatingAccountsState).call(this, accounts);
-            const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-            await updateOnChainNotifications(bearerToken, accounts.map((address) => ({ address, enabled: true })), __classPrivateFieldGet(this, _NotificationServicesController_env, "f"));
+            // Sign-in gate.
+            await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
+            await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_registerWalletActivityAddresses).call(this, accounts.map((address) => ({ address, enabled: true })));
             await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").addPushNotificationLinks(accounts);
         }
         catch (error) {
@@ -767,20 +748,14 @@ export class NotificationServicesController extends BaseController {
                 : [];
             // Raw On Chain Notifications
             const rawOnChainNotifications = [];
-            const isWalletActivityInAppEnabled = notificationPreferences?.walletActivity.inAppNotificationsEnabled ??
-                true;
-            if (isGlobalNotifsEnabled && isWalletActivityInAppEnabled) {
+            if (isGlobalNotifsEnabled) {
                 try {
                     const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-                    // Addresses come from the keyring, so this installation can only ever
-                    // ask for activity on accounts it actually holds. The Trigger API
-                    // narrows that to the ones the user has enabled.
-                    const { accounts } = __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
-                    const addressesWithNotifications = await getEnabledAccounts(bearerToken, accounts, __classPrivateFieldGet(this, _NotificationServicesController_env, "f"));
-                    if (addressesWithNotifications !== null) {
-                        const notifications = await getAPINotifications(bearerToken, addressesWithNotifications, __classPrivateFieldGet(this, _NotificationServicesController_locale, "f").call(this), __classPrivateFieldGet(this, _NotificationServicesController_featureAnnouncementEnv, "f").platform, __classPrivateFieldGet(this, _NotificationServicesController_env, "f")).catch(() => []);
-                        rawOnChainNotifications.push(...notifications);
-                    }
+                    const addressesWithNotifications = (notificationPreferences?.walletActivity.accounts ?? [])
+                        .filter((account) => account.enabled)
+                        .map((account) => account.address);
+                    const notifications = await getAPINotifications(bearerToken, addressesWithNotifications, __classPrivateFieldGet(this, _NotificationServicesController_locale, "f").call(this), __classPrivateFieldGet(this, _NotificationServicesController_featureAnnouncementEnv, "f").platform, __classPrivateFieldGet(this, _NotificationServicesController_env, "f")).catch(() => []);
+                    rawOnChainNotifications.push(...notifications);
                 }
                 catch {
                     // Do nothing
@@ -1003,44 +978,53 @@ _NotificationServicesController_keyringController = new WeakMap(), _Notification
         throw new Error('Missing BearerToken');
     }
     return { bearerToken };
-}, _NotificationServicesController_isWalletActivityPushEnabled = 
+}, _NotificationServicesController_registerWalletActivityAddresses = 
 /**
- * Reads the global wallet-activity push toggle from
- * {@link AuthenticatedUserStorageService}.
- *
- * Only the channel boolean is read. It is a user-level setting that contains
- * no addresses, so sharing it across a paired profile is correct. The address
- * list in the same blob is deliberately ignored — see
- * {@link buildFreshPreferences}.
+ * Updates the `walletActivity.accounts` entries in the user's
+ * notification-preferences blob in {@link AuthenticatedUserStorageService}.
  *
- * A missing or unreadable blob counts as enabled, matching the API's "every
- * toggle is on unless stated otherwise" default, so that a storage outage does
- * not silently stop notifications.
+ * `putNotificationPreferences` replaces the entire blob, so we read the
+ * current preferences, merge the supplied updates into
+ * `walletActivity.accounts`, and write the result back. This helper is only
+ * meant to be used for incremental updates (enable/disable individual
+ * accounts) after the preferences blob has already been initialized via
+ * {@link createOnChainTriggers}; callers should not rely on it to perform
+ * first-time initialization.
  *
- * @returns Whether wallet-activity push notifications are enabled.
+ * @param updates - Addresses to register, each with the desired `enabled` flag
  */
-async function _NotificationServicesController_isWalletActivityPushEnabled() {
-    const preferences = await this.messenger
+async function _NotificationServicesController_registerWalletActivityAddresses(updates) {
+    if (updates.length === 0) {
+        return;
+    }
+    const currentPreferences = await this.messenger
         .call('AuthenticatedUserStorageService:getNotificationPreferences')
-        .catch(() => null);
-    return preferences?.walletActivity.pushNotificationsEnabled ?? true;
-}, _NotificationServicesController_registerPushNotifications = 
-/**
- * Registers this device for push notifications on the given addresses.
- *
- * An empty list cannot be sent: the push API rejects a registration with no
- * addresses, and because that request is what performs the delete-and-reinsert
- * of the device's links, a rejection leaves the previous links in place and
- * push keeps arriving. So "no addresses" has to mean unregistering the device.
- *
- * @param addresses - The addresses to receive push notifications for.
- */
-async function _NotificationServicesController_registerPushNotifications(addresses) {
-    if (addresses.length === 0) {
-        await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").disablePushNotifications();
+        .catch((error) => {
+        log.error('Failed to get notification preferences. Re-initializing them instead.', error);
+        // TODO: return null once validation error captured
+        // return null;
+        throw error;
+    });
+    if (!currentPreferences) {
+        log.warn('Preferences blob not yet initialized; run `createOnChainTriggers` first.');
         return;
     }
-    await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").enablePushNotifications(addresses);
+    const accountsByAddress = new Map(currentPreferences.walletActivity.accounts.map((account) => [
+        account.address.toLowerCase(),
+        { ...account, address: account.address.toLowerCase() },
+    ]));
+    for (const update of updates) {
+        const address = update.address.toLowerCase();
+        accountsByAddress.set(address, { address, enabled: update.enabled });
+    }
+    const nextPreferences = {
+        ...currentPreferences,
+        walletActivity: {
+            ...currentPreferences.walletActivity,
+            accounts: [...accountsByAddress.values()],
+        },
+    };
+    await this.messenger.call('AuthenticatedUserStorageService:putNotificationPreferences', nextPreferences, __classPrivateFieldGet(this, _NotificationServicesController_featureAnnouncementEnv, "f").platform);
 }, _NotificationServicesController_setIsUpdatingMetamaskNotifications = function _NotificationServicesController_setIsUpdatingMetamaskNotifications(isUpdatingMetamaskNotifications) {
     this.update((state) => {
         state.isUpdatingMetamaskNotifications = isUpdatingMetamaskNotifications;