fix cache quest lock condition

src/global-store.ts

@@ -1,5 +1,4 @@
 import { MetaQuery } from '@refinedev/core';
-import { isEqual } from 'lodash';
 import {
   KubeApi,
   UnstructuredList,
@@ -74,7 +73,11 @@ export class GlobalStore {
     }
 
     const cacheRequest = this.requestsCache.find(f => {
-      return f.resource === resource && isEqual(f.meta, meta);
+      // TODO: Its supposed to be strictly comparison of query path
+      return (
+        f.resource === resource &&
+        f.meta?.resourceBasePath === meta?.resourceBasePath
+      );
     });
 
     // return cached fetching request

src/kube-api.ts

@@ -202,9 +202,13 @@ class ApiVersionResourceCache {
     return resources.find(r => r.kind === kind)!;
   }
 
-  public async resourceByName(resourcePath: string, name: string) {
+  public async resourceByName(
+    resourcePath: string,
+    name: string,
+    signal?: AbortSignal
+  ) {
     const localVarPath = `${this.basePath}${resourcePath}`;
-    const { resources } = await this.fetchAndCache(localVarPath);
+    const { resources } = await this.fetchAndCache(localVarPath, signal);
     return resources.find(r => r.name === name)!;
   }
 
@@ -214,9 +218,11 @@ class ApiVersionResourceCache {
     return [this.basePath, api, apiVersion].join('/');
   }
 
-  private async fetchAndCache(localVarPath: string) {
+  private async fetchAndCache(localVarPath: string, signal?: AbortSignal) {
     if (!this.cache[localVarPath]) {
-      const resources = await ky.get(localVarPath).json<APIResourceList>();
+      const resources = await ky
+        .get(localVarPath, { signal })
+        .json<APIResourceList>();
       this.cache[localVarPath] = resources;
     }
     return this.cache[localVarPath];
@@ -299,7 +305,8 @@ export class KubeApi<T extends UnstructuredList> {
         query,
         onResponse,
         onEvent,
-      })
+      }),
+      signal
     );
     const stop = () => {
       stopWatch?.();
@@ -315,7 +322,8 @@ export class KubeApi<T extends UnstructuredList> {
     onResponse: KubeApiListWatchOptions<T>['onResponse'],
     onEvent: KubeApiListWatchOptions<T>['onEvent'],
     // let listwatch know it needs retry
-    retry: () => Promise<StopWatchHandler>
+    retry: () => Promise<StopWatchHandler>,
+    signal?: AbortSignal
   ): Promise<StopWatchHandler> {
     let { items } = response as unknown as UnstructuredList;
     const stops: Array<() => void> = [];
@@ -384,14 +392,17 @@ export class KubeApi<T extends UnstructuredList> {
     // server-side watch
     const resource = await this.apiVersionResourceCache.resourceByName(
       this.resourceBasePath,
-      this.resource
+      this.resource,
+      signal
     );
     const verbs = resource?.verbs || [];
     const supportServerWatch = verbs.includes('watch');
 
     if (supportServerWatch) {
       if (this.watchWsBasePath) {
-        stops.push(this.watchByWebsocket(url, response, handleEvent, retry));
+        stops.push(
+          this.watchByWebsocket(url, response, handleEvent, retry, signal)
+        );
       } else {
         stops.push(this.watchByHttp(url, response, handleEvent, retry));
       }
@@ -429,7 +440,8 @@ export class KubeApi<T extends UnstructuredList> {
     res: T,
     handleEvent: (event: WatchEvent) => void,
     // let listwatch know it needs retry
-    retry: () => Promise<StopWatchHandler>
+    retry: () => Promise<StopWatchHandler>,
+    signal?: AbortSignal
   ) {
     const { resourceVersion = '' } = (res as unknown as UnstructuredList)
       .metadata;
@@ -440,6 +452,15 @@ export class KubeApi<T extends UnstructuredList> {
         : `${protocol}://${location.host}/${url}?resourceVersion=${resourceVersion}&watch=1`
     );
     let shouldCloseAfterConnected = false;
+    const abortListener = () => {
+      if (socket.readyState === socket.CONNECTING) {
+        shouldCloseAfterConnected = true;
+      }
+    };
+    const removeAbortListener = () => {
+      signal?.removeEventListener('abort', abortListener);
+    };
+    signal?.addEventListener('abort', abortListener);
     let stopWatch: () => void = () => {
       if (socket.readyState === socket.OPEN) {
         socket.close(3001, 'KUBEAPI_MANUAL_CLOSE');
@@ -458,6 +479,7 @@ export class KubeApi<T extends UnstructuredList> {
         return;
       }
       heartbeat(socket);
+      removeAbortListener();
     });
     socket.addEventListener('message', function (msg) {
       const event = JSON.parse(msg.data) as WatchEvent;
@@ -467,11 +489,10 @@ export class KubeApi<T extends UnstructuredList> {
     });
     socket.addEventListener('close', evt => {
       clearTimeout((socket as ExtendedWebsocketClient).pingTimeout);
-
       if (evt.reason === 'KUBEAPI_MANUAL_CLOSE') {
         return;
       }
-
+      removeAbortListener();
       this.retryFunc(async () => {
         stopWatch = await retry();
       });