refactor: network logic

Author: purrseus

src/core/global.d.ts

@@ -1,29 +1,3 @@
 interface XMLHttpRequest {
   _interceptionId?: string;
 }
-
-declare module 'react-native/Libraries/WebSocket/NativeWebSocketModule' {
-  interface NativeWebSocketModule extends NativeModule {
-    connect(
-      url: string,
-      protocols?: string | string[],
-      options?: {
-        headers: { [headerName: string]: string };
-        [optionName: string]: any;
-      },
-      socketId: number,
-    ): void;
-
-    send(data: string, socketId: number): void;
-
-    sendBinary(base64String: string, socketId: number): void;
-
-    close(code: number, reason: string, socketId: number): void;
-
-    addListener: (eventType: string) => void;
-    removeListeners: (count: number) => void;
-  }
-
-  const NativeWebSocketModule: NativeWebSocketModule;
-  export default NativeWebSocketModule;
-}

src/hooks/useNetworkInterceptor.ts

@@ -43,14 +43,17 @@ export default function useNetworkInterceptor({
     setNetworkRequests(initRequests);
   };
 
+  const isMatchedDomain = (url: string) => {
+    if (!includeDomains?.length) return true;
+
+    return includeDomains.some(domain => url.includes(domain));
+  };
+
   const enableHttpInterceptions = useCallback(() => {
     const openCallback: HttpHandlers['open'] = (id, type, method, url) => {
       if (!id) return;
 
-      const isNotMatchedDomain =
-        !!joinedIncludeDomains.length && !includeDomains?.some(domain => url.includes(domain));
-
-      if (isNotMatchedDomain) return;
+      if (!isMatchedDomain(url)) return;
 
       setNetworkRequests((draft: NetworkRequests<HttpRequest>) => {
         draft.set(id, { type, method, url });
@@ -162,6 +165,8 @@ export default function useNetworkInterceptor({
     ) => {
       if (typeof socketId !== 'number') return;
 
+      if (!isMatchedDomain(url)) return;
+
       setNetworkRequests((draft: NetworkRequests<WebSocketRequest>) => {
         draft.set(`${socketId}`, {
           startTime,
@@ -245,7 +250,8 @@ export default function useNetworkInterceptor({
       .set('onError', onErrorCallback)
       .set('onClose', onCloseCallback)
       .enableInterception();
-  }, [setNetworkRequests]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [joinedIncludeDomains, setNetworkRequests]);
 
   const enableInterception = useCallback(() => {
     if (isEnabled()) return;