@metamask-previews/perps-controller 22.1.0-preview-eb5c879 → 22.1.0-preview-770db011a

package/CHANGELOG.md

@@ -11,11 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Bump `uuid` from `^14.0.0` to `^14.0.1` ([#11179](https://github.com/MetaMask/core/pull/11179))
 
-### Fixed
-
-- Prevent HyperLiquid `userFills` from going silent after a WebSocket reconnect when an in-flight subscribe races with `restoreSubscriptions` (same pending + generation pattern TWAP already uses) ([#11160](https://github.com/MetaMask/core/pull/11160))
-  - Without this, live fills can keep attaching to a dead pre-reconnect listener (MetaMask/metamask-extension#47287).
-
 ## [22.1.0]
 
 ### Added

package/dist/services/HyperLiquidSubscriptionService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperLiquidSubscriptionService.d.ts","sourceRoot":"","sources":["../../src/services/HyperLiquidSubscriptionService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HyperLiquidSubscriptionService.d.ts","sourceRoot":"","sources":["../../src/services/HyperLiquidSubscriptionService.ts"],"names":[],"mappings":"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"}

package/dist/services/HyperLiquidSubscriptionService.js

@@ -92,20 +92,6 @@ export class HyperLiquidSubscriptionService {
     #pendingBboPromises = new Map();
     // Order fill subscriptions keyed by accountId (normalized: undefined -> 'default')
     #orderFillSubscriptions = new Map();
-    // In-flight userFills subscribe calls, so concurrent subscribers / reconnect
-    // share one socket open instead of racing two opens onto the same map key.
-    #pendingOrderFillSubscriptions = new Map();
-    // Bumped per account by teardown and reconnect so an in-flight open for
-    // that account discards its subscription instead of rehydrating a cleared
-    // map (same race TWAP already guards; without it live fills can stick to a
-    // dead pre-reconnect listener — MetaMask/metamask-extension#47287).
-    #orderFillSubscriptionGenerations = new Map();
-    #orderFillGeneration(normalizedAccountId) {
-        return this.#orderFillSubscriptionGenerations.get(normalizedAccountId) ?? 0;
-    }
-    #bumpOrderFillGeneration(normalizedAccountId) {
-        this.#orderFillSubscriptionGenerations.set(normalizedAccountId, this.#orderFillGeneration(normalizedAccountId) + 1);
-    }
     // TWAP subscriptions keyed by accountId (normalized: undefined -> 'default')
     #twapOrderSubscriptions = new Map();
     // In-flight TWAP subscribe calls, so concurrent subscribers share one socket
@@ -1968,10 +1954,6 @@ export class HyperLiquidSubscriptionService {
                     });
                     this.#orderFillSubscriptions.delete(normalizedAccountId);
                 }
-                // Invalidate any open still in flight for this account: without this
-                // its continuation installs a live socket nobody is listening to.
-                this.#bumpOrderFillGeneration(normalizedAccountId);
-                this.#pendingOrderFillSubscriptions.delete(normalizedAccountId);
             }
         };
     }
@@ -1989,71 +1971,19 @@ export class HyperLiquidSubscriptionService {
         if (this.#orderFillSubscriptions.has(normalizedAccountId)) {
             return;
         }
-        // Another caller is already opening this account's socket. Await it so
-        // subscribe + reconnect do not race two userFills opens onto one key.
-        // The owner of the pending open logs its failure, so swallow it here and
-        // fall through to open our own. Re-read after each wait: several waiters
-        // resume together and only the first should start the replacement open.
-        let pending = this.#pendingOrderFillSubscriptions.get(normalizedAccountId);
-        while (pending) {
-            await pending.catch(() => undefined);
-            if (this.#orderFillSubscriptions.has(normalizedAccountId)) {
-                return;
-            }
-            pending = this.#pendingOrderFillSubscriptions.get(normalizedAccountId);
-        }
-        // A discarded open resolves without registering; if the last subscriber
-        // left meanwhile, opening now would cache frames nobody is listening to.
-        const subscribers = this.#orderFillSubscribers.get(normalizedAccountId);
-        if (!subscribers || subscribers.size === 0) {
-            return;
-        }
-        // Captured once here, spanning the whole open including the client
-        // handshake. Capturing inside the open would let a bump that lands during
-        // the handshake be adopted as the baseline and silently forgotten.
-        const startGeneration = this.#orderFillGeneration(normalizedAccountId);
-        const subscriptionPromise = this.#createOrderFillSubscription(normalizedAccountId, accountId, startGeneration);
-        this.#pendingOrderFillSubscriptions.set(normalizedAccountId, subscriptionPromise);
-        try {
-            await subscriptionPromise;
-        }
-        finally {
-            // Delete by identity: a reconnect may have cleared the map and installed
-            // a newer open behind this one, which must not be evicted here.
-            if (this.#pendingOrderFillSubscriptions.get(normalizedAccountId) ===
-                subscriptionPromise) {
-                this.#pendingOrderFillSubscriptions.delete(normalizedAccountId);
-            }
-        }
-    }
-    /**
-     * Open one userFills subscription and register it for teardown.
-     *
-     * @param normalizedAccountId - Map key for this account ('default' when unset).
-     * @param accountId - Optional CAIP account ID to resolve the address from.
-     * @param startGeneration - This account's generation when the open began.
-     * @returns A promise that resolves once the subscription is registered.
-     */
-    async #createOrderFillSubscription(normalizedAccountId, accountId, startGeneration) {
-        // Bootstrap the client inline rather than recursing: a recursive call
-        // would re-read the generation after the handshake and adopt a bump that
-        // landed during it as its own baseline.
-        let subscriptionClient = this.#clientService.getSubscriptionClient();
+        const subscriptionClient = this.#clientService.getSubscriptionClient();
         if (!subscriptionClient) {
             await this.#clientService.ensureSubscriptionClient(this.#walletService.createWalletAdapter());
-            subscriptionClient = this.#clientService.getSubscriptionClient();
-            if (!subscriptionClient) {
+            const client = this.#clientService.getSubscriptionClient();
+            if (!client) {
                 throw new Error('SubscriptionClient not available');
             }
+            await this.#ensureOrderFillISubscription(accountId);
+            return;
         }
         const userAddress = await this.#walletService.getUserAddressWithDefault(accountId);
         // userFills returns a Promise<ISubscription>, need to await it
         const subscription = await subscriptionClient.userFills({ user: userAddress }, (data) => {
-            // A frame queued before an unsubscribe or reconnect must not mutate
-            // the replacement's cache or reach its subscribers.
-            if (startGeneration !== this.#orderFillGeneration(normalizedAccountId)) {
-                return;
-            }
             // Build a Map for O(1) lookup instead of O(n) find per fill
             const orderMap = new Map();
             if (this.#cachedOrders) {
@@ -2116,17 +2046,6 @@ export class HyperLiquidSubscriptionService {
                 });
             }
         });
-        // Teardown, clearAll, or a reconnect may have run while this open was in
-        // flight. Rehydrating the map here would leave a socket with no
-        // subscribers, or clobber the live replacement — so drop ours instead.
-        const subscribers = this.#orderFillSubscribers.get(normalizedAccountId);
-        if (startGeneration !== this.#orderFillGeneration(normalizedAccountId) ||
-            this.#orderFillSubscriptions.has(normalizedAccountId) ||
-            !subscribers ||
-            subscribers.size === 0) {
-            subscription.unsubscribe().catch(() => undefined);
-            return;
-        }
         this.#orderFillSubscriptions.set(normalizedAccountId, subscription);
     }
     /**
@@ -3624,19 +3543,8 @@ export class HyperLiquidSubscriptionService {
         }
         // Re-establish order fill subscriptions if there are fill subscribers
         if (this.#orderFillSubscribers.size > 0) {
-            // Existing subscription references are dead after reconnection. Bump
-            // each account's generation first so a pre-reconnect open still in
-            // flight discards itself instead of occupying the map ahead of its
-            // replacement (MetaMask/metamask-extension#47287).
-            for (const normalizedAccountId of new Set([
-                ...this.#orderFillSubscribers.keys(),
-                ...this.#orderFillSubscriptions.keys(),
-                ...this.#pendingOrderFillSubscriptions.keys(),
-            ])) {
-                this.#bumpOrderFillGeneration(normalizedAccountId);
-            }
+            // Clear existing subscription references (they're dead after reconnection)
             this.#orderFillSubscriptions.clear();
-            this.#pendingOrderFillSubscriptions.clear();
             // Re-establish subscriptions for all accountIds with subscribers
             // Note: normalizedAccountId is 'default' for undefined, need to convert back
             const normalizedAccountIds = Array.from(this.#orderFillSubscribers.keys());
@@ -3808,15 +3716,6 @@ export class HyperLiquidSubscriptionService {
         ])) {
             this.#bumpTwapOrderGeneration(normalizedAccountId);
         }
-        // Same for order fills: bump before subscriber keys are cleared so an
-        // in-flight userFills open cannot rehydrate after clearAll.
-        for (const normalizedAccountId of new Set([
-            ...this.#orderFillSubscribers.keys(),
-            ...this.#orderFillSubscriptions.keys(),
-            ...this.#pendingOrderFillSubscriptions.keys(),
-        ])) {
-            this.#bumpOrderFillGeneration(normalizedAccountId);
-        }
         // Clear all local subscriber collections
         this.#priceSubscribers.clear();
         this.#positionSubscribers.clear();
@@ -3827,14 +3726,13 @@ export class HyperLiquidSubscriptionService {
         this.#accountSubscribers.clear();
         this.#marketDataSubscribers.clear();
         this.#orderBookSubscribers.clear();
-        // Clear order fill subscriptions; generations were bumped above.
+        // Clear order fill subscriptions
         this.#orderFillSubscriptions.forEach((subscription) => {
             subscription.unsubscribe().catch(() => {
                 // Ignore errors during cleanup
             });
         });
         this.#orderFillSubscriptions.clear();
-        this.#pendingOrderFillSubscriptions.clear();
         // Clear TWAP subscriptions; generations were bumped above, before the
         // subscriber keys naming those accounts were cleared.
         this.#cachedTwapOrders.clear();