fix: remove rejected channel query promises from channel query lock (#…

…2549)
GetStream · Oct 29, 2024 · 631a928 · 631a928
1 parent aff47e8
commit 631a928
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/utils/getChannel.ts b/src/utils/getChannel.ts
@@ -68,9 +68,12 @@ export const getChannel = async <
   if (queryPromise) {
     await queryPromise;
   } else {
-    WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid] = theChannel.watch(options);
-    await WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid];
-    delete WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid];
+    try {
+      WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid] = theChannel.watch(options);
+      await WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid];
+    } finally {
+      delete WATCH_QUERY_IN_PROGRESS_FOR_CHANNEL[originalCid];
+    }
   }
 
   return theChannel;