fix: Fix stardustFeed unsubscribe (remove subscribers when unsubscrib…

…e requests comes through socket disconnect) + Fix a possible nullpointer in useBlockFeed
iotaledger · Nov 21, 2023 · bb96444 · bb96444
1 parent 4c46520
commit bb96444
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/api/src/routes/feed/unsubscribe.ts b/api/src/routes/feed/unsubscribe.ts
@@ -43,12 +43,16 @@ export async function unsubscribe(
                 itemsService.unsubscribe(request.subscriptionId);
             }
         } else if (networkConfig.protocolVersion === STARDUST) {
-            ValidationHelper.string(request.feedSelect, "feedSelect");
-            ValidationHelper.oneOf(request.feedSelect, ["block", "milestone"], "feedSelect");
             const service = ServiceFactory.get<StardustFeed>(`feed-${request.network}`);
+
             if (request.feedSelect === "block") {
                 service?.unsubscribeBlocks(request.subscriptionId);
+            } else if (request.feedSelect === "milestone") {
+                service?.unsubscribeMilestones(request.subscriptionId);
             } else {
+                // when unsubscribe comes from index.ts socket callback (broswer page reload)
+                // we don't have the feedSelect so unsubscribe both
+                service?.unsubscribeBlocks(request.subscriptionId);
                 service?.unsubscribeMilestones(request.subscriptionId);
             }
         } else {

diff --git a/api/src/services/stardust/feed/stardustFeed.ts b/api/src/services/stardust/feed/stardustFeed.ts
@@ -57,6 +57,11 @@ export class StardustFeed {
      */
     private readonly networkProtocolVersion: number;
 
+    /**
+     * The network in context (from Init).
+     */
+    private readonly network: string;
+
     /**
      * Creates a new instance of StardustFeed.
      * @param networkId The network id.
@@ -65,6 +70,7 @@ export class StardustFeed {
         this.blockSubscribers = {};
         this.milestoneSubscribers = {};
         this.blockMetadataCache = new Map();
+        this.network = networkId;
         this._mqttClient = ServiceFactory.get<Client>(`mqtt-${networkId}`);
         const nodeInfoService = ServiceFactory.get<NodeInfoService>(`node-info-${networkId}`);
 
@@ -111,6 +117,7 @@ export class StardustFeed {
      * @param subscriptionId The id to unsubscribe.
      */
     public unsubscribeBlocks(subscriptionId: string): void {
+        logger.debug(`[StardustFeed] Removing subscriber ${subscriptionId} from blocks (${this.network})`);
         delete this.blockSubscribers[subscriptionId];
     }
 
@@ -119,6 +126,7 @@ export class StardustFeed {
      * @param subscriptionId The id to unsubscribe.
      */
     public unsubscribeMilestones(subscriptionId: string): void {
+        logger.debug(`[StardustFeed] Removing subscriber ${subscriptionId} from milestones (${this.network})`);
         delete this.milestoneSubscribers[subscriptionId];
     }
 

diff --git a/client/src/helpers/hooks/useBlockFeed.ts b/client/src/helpers/hooks/useBlockFeed.ts
@@ -31,7 +31,7 @@ export function useBlockFeed(network: string): [
     const fetchLatestCachedMilestones = useCallback(async () => {
         if (apiClient) {
             const latestMilestones: ILatestMilestonesReponse = await apiClient.latestMilestones(network);
-            if (isMounted) {
+            if (isMounted && latestMilestones.milestones.length > 0) {
                 setMilestones(
                     latestMilestones.milestones.slice(0, MAX_MILESTONE_ITEMS)
                 );