@rozenite/network-activity-plugin 1.0.0-alpha.15 → 1.0.0-alpha.16

package/src/ui/state/store.ts

@@ -1,7 +1,9 @@
 import { createStore } from 'zustand';
+import { persist, createJSONStorage } from 'zustand/middleware';
 import {
   NetworkActivityDevToolsClient,
   NetworkActivityEventMap,
+  RequestOverride,
   RequestId,
 } from '../../shared/client';
 import {
@@ -20,12 +22,15 @@ import { applyReactNativeRequestHeadersLogic } from '../../utils/applyReactNativ
 const MAX_WEBSOCKET_MESSAGES_PER_CONNECTION = 32;
 const MAX_SSE_MESSAGES_PER_CONNECTION = 32;
 
+const STORE_VERSION = 1;
+
 export interface NetworkActivityState {
   // State
   isRecording: boolean;
   selectedRequestId: RequestId | null;
   networkEntries: Map<RequestId, NetworkEntry>;
   websocketMessages: Map<RequestId, WebSocketMessage[]>;
+  overrides: Map<string, RequestOverride>;
 
   // Internal state (not exposed in interface)
   _unsubscribeFunctions?: Array<{ remove: () => void }>;
@@ -36,6 +41,8 @@ export interface NetworkActivityState {
     setRecording: (isRecording: boolean) => void;
     setSelectedRequest: (requestId: RequestId | null) => void;
     clearRequests: () => void;
+    addOverride: (requestUrl: string, override: RequestOverride) => void;
+    clearOverride: (requestUrl: string) => void;
   };
 
   // Event handling
@@ -52,513 +59,589 @@ export interface NetworkActivityState {
 }
 
 export const createNetworkActivityStore = () =>
-  createStore<NetworkActivityState>((set, get) => ({
-    // Initial state
-    isRecording: false,
-    selectedRequestId: null,
-    networkEntries: new Map(),
-    websocketMessages: new Map(),
-
-    // Actions
-    actions: {
-      setRecording: (isRecording: boolean) => {
-        const { _client } = get();
-        assert(!!_client, 'Client is not set');
-
-        _client.send(isRecording ? 'network-enable' : 'network-disable', {});
-        set({ isRecording });
-      },
-      setSelectedRequest: (requestId: RequestId | null) =>
-        set({ selectedRequestId: requestId }),
-      clearRequests: () =>
-        set({
-          networkEntries: new Map(),
-          websocketMessages: new Map(),
-          selectedRequestId: null,
-        }),
-    },
-    // Event handling
-    handleEvent: <K extends keyof NetworkActivityEventMap>(
-      eventType: K,
-      data: NetworkActivityEventMap[K]
-    ) => {
-      switch (eventType) {
-        case 'request-sent': {
-          const eventData = data as NetworkActivityEventMap['request-sent'];
-          set((state) => {
-            const headersWithContentType = applyReactNativeRequestHeadersLogic(
-              eventData.request.headers,
-              eventData.request.postData
+  createStore<NetworkActivityState>()(
+    persist(
+      (set, get) => ({
+        // Initial state
+        isRecording: false,
+        selectedRequestId: null,
+        networkEntries: new Map(),
+        websocketMessages: new Map(),
+        overrides: new Map(),
+
+        // Actions
+        actions: {
+          setRecording: (isRecording: boolean) => {
+            const { _client } = get();
+            assert(!!_client, 'Client is not set');
+
+            _client.send(
+              isRecording ? 'network-enable' : 'network-disable',
+              {}
             );
-
-            const requestContentType =
-              getContentTypeMime(headersWithContentType) || 'text/plain';
-
-            const entry: HttpNetworkEntry = {
-              id: eventData.requestId,
-              type: 'http',
-              timestamp: eventData.timestamp,
-              request: {
-                url: eventData.request.url,
-                method: eventData.request.method,
-                headers: headersWithContentType,
-                body: eventData.request.postData
-                  ? {
-                      type: requestContentType,
-                      data: eventData.request.postData,
-                    }
-                  : undefined,
-              },
-              status: 'pending',
-              initiator: eventData.initiator,
-              resourceType: eventData.type,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(eventData.requestId, entry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'response-received': {
-          const eventData =
-            data as NetworkActivityEventMap['response-received'];
-          set((state) => {
-            const entry = state.networkEntries.get(eventData.requestId);
-            if (!entry || entry.type !== 'http') return state;
-
-            const httpEntry = entry as HttpNetworkEntry;
-            const updatedEntry: HttpNetworkEntry = {
-              ...httpEntry,
-              status: 'loading',
-              response: eventData.response,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(eventData.requestId, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'request-completed': {
-          const eventData =
-            data as NetworkActivityEventMap['request-completed'];
-          set((state) => {
-            const entry = state.networkEntries.get(eventData.requestId);
-            if (!entry || entry.type !== 'http') return state;
-
-            const httpEntry = entry as HttpNetworkEntry;
-            const updatedEntry: HttpNetworkEntry = {
-              ...httpEntry,
-              status: 'finished',
-              duration: eventData.duration,
-              size: eventData.size,
-              ttfb: eventData.ttfb,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(eventData.requestId, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'request-failed': {
-          const eventData = data as NetworkActivityEventMap['request-failed'];
-          set((state) => {
-            const entry = state.networkEntries.get(eventData.requestId);
-            if (!entry || entry.type !== 'http') return state;
-
-            const httpEntry = entry as HttpNetworkEntry;
-            const updatedEntry: HttpNetworkEntry = {
-              ...httpEntry,
-              status: 'failed',
-              error: eventData.error,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(eventData.requestId, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'response-body': {
-          const eventData = data as NetworkActivityEventMap['response-body'];
-          set((state) => {
-            const entry = state.networkEntries.get(eventData.requestId);
-            if (!entry || entry.type !== 'http') return state;
-
-            const httpEntry = entry as HttpNetworkEntry;
-            const updatedEntry: HttpNetworkEntry = {
-              ...httpEntry,
-              response: httpEntry.response
-                ? {
-                    ...httpEntry.response,
-                    body: eventData.body
+            set({ isRecording });
+          },
+          setSelectedRequest: (requestId: RequestId | null) =>
+            set({ selectedRequestId: requestId }),
+          clearRequests: () =>
+            set({
+              networkEntries: new Map(),
+              websocketMessages: new Map(),
+              selectedRequestId: null,
+            }),
+          addOverride: (requestUrl: string, override: RequestOverride) => {
+            const { overrides, _client } = get();
+            assert(!!_client, 'Client is not set');
+
+            const newOverrides = new Map(overrides);
+            newOverrides.set(requestUrl, override);
+
+            _client.send('set-overrides', {
+              overrides: Array.from(newOverrides.entries()),
+            });
+            set({ overrides: newOverrides });
+          },
+          clearOverride: (requestUrl: string) => {
+            const { overrides, _client } = get();
+            assert(!!_client, 'Client is not set');
+
+            const newOverrides = new Map(overrides);
+            newOverrides.delete(requestUrl);
+
+            _client.send('set-overrides', {
+              overrides: Array.from(newOverrides.entries()),
+            });
+            set({ overrides: newOverrides });
+          },
+        },
+        // Event handling
+        handleEvent: <K extends keyof NetworkActivityEventMap>(
+          eventType: K,
+          data: NetworkActivityEventMap[K]
+        ) => {
+          switch (eventType) {
+            case 'request-sent': {
+              const eventData = data as NetworkActivityEventMap['request-sent'];
+              set((state) => {
+                const headersWithContentType =
+                  applyReactNativeRequestHeadersLogic(
+                    eventData.request.headers,
+                    eventData.request.postData
+                  );
+
+                const requestContentType =
+                  getContentTypeMime(headersWithContentType) || 'text/plain';
+
+                const entry: HttpNetworkEntry = {
+                  id: eventData.requestId,
+                  type: 'http',
+                  timestamp: eventData.timestamp,
+                  request: {
+                    url: eventData.request.url,
+                    method: eventData.request.method,
+                    headers: headersWithContentType,
+                    body: eventData.request.postData
                       ? {
-                          type:
-                            getContentTypeMime(
-                              httpEntry.response?.headers ?? {}
-                            ) || 'text/plain',
-                          data: eventData.body,
+                          type: requestContentType,
+                          data: eventData.request.postData,
                         }
                       : undefined,
-                  }
-                : undefined,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(eventData.requestId, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'websocket-connect': {
-          const eventData =
-            data as NetworkActivityEventMap['websocket-connect'];
-          set((state) => {
-            const entry: WebSocketNetworkEntry = {
-              id: `ws-${eventData.socketId}`,
-              type: 'websocket',
-              timestamp: eventData.timestamp,
-              connection: {
-                url: eventData.url,
-                socketId: eventData.socketId,
-                protocols: eventData.protocols || undefined,
-                options: eventData.options,
-              },
-              status: 'connecting',
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(entry.id, entry);
-
-            const newMessages = new Map(state.websocketMessages);
-            newMessages.set(entry.id, []);
-
-            return {
-              networkEntries: newEntries,
-              websocketMessages: newMessages,
-            };
-          });
-          break;
-        }
-
-        case 'websocket-open': {
-          const eventData = data as NetworkActivityEventMap['websocket-open'];
-          set((state) => {
-            const entry = state.networkEntries.get(`ws-${eventData.socketId}`);
-            if (!entry || entry.type !== 'websocket') return state;
-
-            const wsEntry = entry as WebSocketNetworkEntry;
-            const updatedEntry: WebSocketNetworkEntry = {
-              ...wsEntry,
-              status: 'open',
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(entry.id, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'websocket-close': {
-          const eventData = data as NetworkActivityEventMap['websocket-close'];
-          set((state) => {
-            const entry = state.networkEntries.get(`ws-${eventData.socketId}`);
-            if (!entry || entry.type !== 'websocket') return state;
-
-            const wsEntry = entry as WebSocketNetworkEntry;
-            const updatedEntry: WebSocketNetworkEntry = {
-              ...wsEntry,
-              status: 'closed',
-              closeCode: eventData.code,
-              closeReason: eventData.reason,
-              duration: eventData.timestamp - wsEntry.timestamp,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(entry.id, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'websocket-message-sent': {
-          const eventData =
-            data as NetworkActivityEventMap['websocket-message-sent'];
-          set((state) => {
-            const socketId = `ws-${eventData.socketId}`;
-            const currentMessages = state.websocketMessages.get(socketId) || [];
-
-            const message: WebSocketMessage = {
-              id: getId(`${socketId}-message`),
-              direction: 'sent',
-              data: eventData.data,
-              messageType: eventData.messageType,
-              timestamp: eventData.timestamp,
-            };
-
-            const newMessages = new Map(state.websocketMessages);
-            newMessages.set(
-              socketId,
-              [...currentMessages, message].slice(
-                -MAX_WEBSOCKET_MESSAGES_PER_CONNECTION
-              )
-            );
-
-            return { websocketMessages: newMessages };
-          });
-          break;
-        }
-
-        case 'websocket-message-received': {
-          const eventData =
-            data as NetworkActivityEventMap['websocket-message-received'];
-          set((state) => {
-            const socketId = `ws-${eventData.socketId}`;
-            const currentMessages = state.websocketMessages.get(socketId) || [];
-
-            const message: WebSocketMessage = {
-              id: getId(`${socketId}-message`),
-              direction: 'received',
-              data: eventData.data,
-              messageType: eventData.messageType,
-              timestamp: eventData.timestamp,
-            };
-
-            const newMessages = new Map(state.websocketMessages);
-            newMessages.set(
-              socketId,
-              [...currentMessages, message].slice(
-                -MAX_WEBSOCKET_MESSAGES_PER_CONNECTION
-              )
-            );
-
-            return { websocketMessages: newMessages };
-          });
-          break;
-        }
-
-        case 'websocket-error': {
-          const eventData = data as NetworkActivityEventMap['websocket-error'];
-          set((state) => {
-            const entry = state.networkEntries.get(`ws-${eventData.socketId}`);
-            if (!entry || entry.type !== 'websocket') return state;
-
-            const wsEntry = entry as WebSocketNetworkEntry;
-            const updatedEntry: WebSocketNetworkEntry = {
-              ...wsEntry,
-              status: 'error',
-              error: eventData.error,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(entry.id, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'websocket-connection-status-changed': {
-          const eventData =
-            data as NetworkActivityEventMap['websocket-connection-status-changed'];
-          set((state) => {
-            const entry = state.networkEntries.get(`ws-${eventData.socketId}`);
-            if (!entry || entry.type !== 'websocket') return state;
-
-            const wsEntry = entry as WebSocketNetworkEntry;
-            const updatedEntry: WebSocketNetworkEntry = {
-              ...wsEntry,
-              status: eventData.status,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(entry.id, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'sse-open': {
-          const eventData = data as NetworkActivityEventMap['sse-open'];
-          set((state) => {
-            const entry = state.networkEntries.get(eventData.requestId);
-            if (!entry || entry.type !== 'http') return state;
-
-            // Transform the existing HTTP entry to SSE
-            const httpEntry = entry as HttpNetworkEntry;
-            const sseEntry: SSENetworkEntry = {
-              ...httpEntry,
-              type: 'sse', // Change type from 'http' to 'sse'
-              status: 'open', // Update status
-              messages: [], // Add SSE-specific field
-              response: eventData.response,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(eventData.requestId, sseEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'sse-message': {
-          const eventData = data as NetworkActivityEventMap['sse-message'];
-          set((state) => {
-            const entry = state.networkEntries.get(eventData.requestId);
-            if (!entry || entry.type !== 'sse') return state;
-
-            const sseEntry = entry as SSENetworkEntry;
-            const newMessage: SSEMessage = {
-              id: getId(`${eventData.requestId}-message`),
-              type: eventData.payload.type,
-              data: eventData.payload.data,
-              timestamp: eventData.timestamp,
-            };
-
-            const updatedEntry: SSENetworkEntry = {
-              ...sseEntry,
-              messages: [...sseEntry.messages, newMessage].slice(
-                -MAX_SSE_MESSAGES_PER_CONNECTION
+                  },
+                  status: 'pending',
+                  initiator: eventData.initiator,
+                  resourceType: eventData.type,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(eventData.requestId, entry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'response-received': {
+              const eventData =
+                data as NetworkActivityEventMap['response-received'];
+              set((state) => {
+                const entry = state.networkEntries.get(eventData.requestId);
+                if (!entry || entry.type !== 'http') return state;
+
+                const httpEntry = entry as HttpNetworkEntry;
+                const updatedEntry: HttpNetworkEntry = {
+                  ...httpEntry,
+                  status: 'loading',
+                  response: eventData.response,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(eventData.requestId, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'request-completed': {
+              const eventData =
+                data as NetworkActivityEventMap['request-completed'];
+              set((state) => {
+                const entry = state.networkEntries.get(eventData.requestId);
+                if (!entry || entry.type !== 'http') return state;
+
+                const httpEntry = entry as HttpNetworkEntry;
+                const updatedEntry: HttpNetworkEntry = {
+                  ...httpEntry,
+                  status: 'finished',
+                  duration: eventData.duration,
+                  size: eventData.size,
+                  ttfb: eventData.ttfb,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(eventData.requestId, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'request-failed': {
+              const eventData =
+                data as NetworkActivityEventMap['request-failed'];
+              set((state) => {
+                const entry = state.networkEntries.get(eventData.requestId);
+                if (!entry || entry.type !== 'http') return state;
+
+                const httpEntry = entry as HttpNetworkEntry;
+                const updatedEntry: HttpNetworkEntry = {
+                  ...httpEntry,
+                  status: 'failed',
+                  error: eventData.error,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(eventData.requestId, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'response-body': {
+              const eventData =
+                data as NetworkActivityEventMap['response-body'];
+              set((state) => {
+                const entry = state.networkEntries.get(eventData.requestId);
+                if (!entry || entry.type !== 'http') return state;
+
+                const httpEntry = entry as HttpNetworkEntry;
+                const updatedEntry: HttpNetworkEntry = {
+                  ...httpEntry,
+                  response: httpEntry.response
+                    ? {
+                        ...httpEntry.response,
+                        body: eventData.body
+                          ? {
+                              type:
+                                getContentTypeMime(
+                                  httpEntry.response?.headers ?? {}
+                                ) || 'text/plain',
+                              data: eventData.body,
+                            }
+                          : undefined,
+                      }
+                    : undefined,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(eventData.requestId, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'websocket-connect': {
+              const eventData =
+                data as NetworkActivityEventMap['websocket-connect'];
+              set((state) => {
+                const entry: WebSocketNetworkEntry = {
+                  id: `ws-${eventData.socketId}`,
+                  type: 'websocket',
+                  timestamp: eventData.timestamp,
+                  connection: {
+                    url: eventData.url,
+                    socketId: eventData.socketId,
+                    protocols: eventData.protocols || undefined,
+                    options: eventData.options,
+                  },
+                  status: 'connecting',
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(entry.id, entry);
+
+                const newMessages = new Map(state.websocketMessages);
+                newMessages.set(entry.id, []);
+
+                return {
+                  networkEntries: newEntries,
+                  websocketMessages: newMessages,
+                };
+              });
+              break;
+            }
+
+            case 'websocket-open': {
+              const eventData =
+                data as NetworkActivityEventMap['websocket-open'];
+              set((state) => {
+                const entry = state.networkEntries.get(
+                  `ws-${eventData.socketId}`
+                );
+                if (!entry || entry.type !== 'websocket') return state;
+
+                const wsEntry = entry as WebSocketNetworkEntry;
+                const updatedEntry: WebSocketNetworkEntry = {
+                  ...wsEntry,
+                  status: 'open',
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(entry.id, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'websocket-close': {
+              const eventData =
+                data as NetworkActivityEventMap['websocket-close'];
+              set((state) => {
+                const entry = state.networkEntries.get(
+                  `ws-${eventData.socketId}`
+                );
+                if (!entry || entry.type !== 'websocket') return state;
+
+                const wsEntry = entry as WebSocketNetworkEntry;
+                const updatedEntry: WebSocketNetworkEntry = {
+                  ...wsEntry,
+                  status: 'closed',
+                  closeCode: eventData.code,
+                  closeReason: eventData.reason,
+                  duration: eventData.timestamp - wsEntry.timestamp,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(entry.id, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'websocket-message-sent': {
+              const eventData =
+                data as NetworkActivityEventMap['websocket-message-sent'];
+              set((state) => {
+                const socketId = `ws-${eventData.socketId}`;
+                const currentMessages =
+                  state.websocketMessages.get(socketId) || [];
+
+                const message: WebSocketMessage = {
+                  id: getId(`${socketId}-message`),
+                  direction: 'sent',
+                  data: eventData.data,
+                  messageType: eventData.messageType,
+                  timestamp: eventData.timestamp,
+                };
+
+                const newMessages = new Map(state.websocketMessages);
+                newMessages.set(
+                  socketId,
+                  [...currentMessages, message].slice(
+                    -MAX_WEBSOCKET_MESSAGES_PER_CONNECTION
+                  )
+                );
+
+                return { websocketMessages: newMessages };
+              });
+              break;
+            }
+
+            case 'websocket-message-received': {
+              const eventData =
+                data as NetworkActivityEventMap['websocket-message-received'];
+              set((state) => {
+                const socketId = `ws-${eventData.socketId}`;
+                const currentMessages =
+                  state.websocketMessages.get(socketId) || [];
+
+                const message: WebSocketMessage = {
+                  id: getId(`${socketId}-message`),
+                  direction: 'received',
+                  data: eventData.data,
+                  messageType: eventData.messageType,
+                  timestamp: eventData.timestamp,
+                };
+
+                const newMessages = new Map(state.websocketMessages);
+                newMessages.set(
+                  socketId,
+                  [...currentMessages, message].slice(
+                    -MAX_WEBSOCKET_MESSAGES_PER_CONNECTION
+                  )
+                );
+
+                return { websocketMessages: newMessages };
+              });
+              break;
+            }
+
+            case 'websocket-error': {
+              const eventData =
+                data as NetworkActivityEventMap['websocket-error'];
+              set((state) => {
+                const entry = state.networkEntries.get(
+                  `ws-${eventData.socketId}`
+                );
+                if (!entry || entry.type !== 'websocket') return state;
+
+                const wsEntry = entry as WebSocketNetworkEntry;
+                const updatedEntry: WebSocketNetworkEntry = {
+                  ...wsEntry,
+                  status: 'error',
+                  error: eventData.error,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(entry.id, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'websocket-connection-status-changed': {
+              const eventData =
+                data as NetworkActivityEventMap['websocket-connection-status-changed'];
+              set((state) => {
+                const entry = state.networkEntries.get(
+                  `ws-${eventData.socketId}`
+                );
+                if (!entry || entry.type !== 'websocket') return state;
+
+                const wsEntry = entry as WebSocketNetworkEntry;
+                const updatedEntry: WebSocketNetworkEntry = {
+                  ...wsEntry,
+                  status: eventData.status,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(entry.id, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'sse-open': {
+              const eventData = data as NetworkActivityEventMap['sse-open'];
+              set((state) => {
+                const entry = state.networkEntries.get(eventData.requestId);
+                if (!entry || entry.type !== 'http') return state;
+
+                // Transform the existing HTTP entry to SSE
+                const httpEntry = entry as HttpNetworkEntry;
+                const sseEntry: SSENetworkEntry = {
+                  ...httpEntry,
+                  type: 'sse', // Change type from 'http' to 'sse'
+                  status: 'open', // Update status
+                  messages: [], // Add SSE-specific field
+                  response: eventData.response,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(eventData.requestId, sseEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'sse-message': {
+              const eventData = data as NetworkActivityEventMap['sse-message'];
+              set((state) => {
+                const entry = state.networkEntries.get(eventData.requestId);
+                if (!entry || entry.type !== 'sse') return state;
+
+                const sseEntry = entry as SSENetworkEntry;
+                const newMessage: SSEMessage = {
+                  id: getId(`${eventData.requestId}-message`),
+                  type: eventData.payload.type,
+                  data: eventData.payload.data,
+                  timestamp: eventData.timestamp,
+                };
+
+                const updatedEntry: SSENetworkEntry = {
+                  ...sseEntry,
+                  messages: [...sseEntry.messages, newMessage].slice(
+                    -MAX_SSE_MESSAGES_PER_CONNECTION
+                  ),
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(eventData.requestId, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'sse-error': {
+              const eventData = data as NetworkActivityEventMap['sse-error'];
+              set((state) => {
+                const entry = state.networkEntries.get(eventData.requestId);
+                if (!entry || entry.type !== 'sse') return state;
+
+                const sseEntry = entry as SSENetworkEntry;
+                const updatedEntry: SSENetworkEntry = {
+                  ...sseEntry,
+                  status: 'error',
+                  error: eventData.error.message,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(eventData.requestId, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+
+            case 'sse-close': {
+              const eventData = data as NetworkActivityEventMap['sse-close'];
+              set((state) => {
+                const entry = state.networkEntries.get(eventData.requestId);
+                if (!entry || entry.type !== 'sse') return state;
+
+                const sseEntry = entry as SSENetworkEntry;
+                const updatedEntry: SSENetworkEntry = {
+                  ...sseEntry,
+                  status: 'closed',
+                  duration: eventData.timestamp - sseEntry.timestamp,
+                };
+
+                const newEntries = new Map(state.networkEntries);
+                newEntries.set(eventData.requestId, updatedEntry);
+                return { networkEntries: newEntries };
+              });
+              break;
+            }
+          }
+        },
+
+        // Client management
+        client: {
+          setupClient: (client: NetworkActivityDevToolsClient) => {
+            const { handleEvent } = get();
+
+            // Subscribe to all events using the unified handler
+            const unsubscribeFunctions = [
+              client.onMessage('request-sent', (data) =>
+                handleEvent('request-sent', data)
+              ),
+              client.onMessage('response-received', (data) =>
+                handleEvent('response-received', data)
+              ),
+              client.onMessage('request-completed', (data) =>
+                handleEvent('request-completed', data)
+              ),
+              client.onMessage('request-failed', (data) =>
+                handleEvent('request-failed', data)
+              ),
+              client.onMessage('response-body', (data) =>
+                handleEvent('response-body', data)
+              ),
+              client.onMessage('websocket-connect', (data) =>
+                handleEvent('websocket-connect', data)
               ),
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(eventData.requestId, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'sse-error': {
-          const eventData = data as NetworkActivityEventMap['sse-error'];
-          set((state) => {
-            const entry = state.networkEntries.get(eventData.requestId);
-            if (!entry || entry.type !== 'sse') return state;
-
-            const sseEntry = entry as SSENetworkEntry;
-            const updatedEntry: SSENetworkEntry = {
-              ...sseEntry,
-              status: 'error',
-              error: eventData.error.message,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(eventData.requestId, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
-
-        case 'sse-close': {
-          const eventData = data as NetworkActivityEventMap['sse-close'];
-          set((state) => {
-            const entry = state.networkEntries.get(eventData.requestId);
-            if (!entry || entry.type !== 'sse') return state;
-
-            const sseEntry = entry as SSENetworkEntry;
-            const updatedEntry: SSENetworkEntry = {
-              ...sseEntry,
-              status: 'closed',
-              duration: eventData.timestamp - sseEntry.timestamp,
-            };
-
-            const newEntries = new Map(state.networkEntries);
-            newEntries.set(eventData.requestId, updatedEntry);
-            return { networkEntries: newEntries };
-          });
-          break;
-        }
+              client.onMessage('websocket-open', (data) =>
+                handleEvent('websocket-open', data)
+              ),
+              client.onMessage('websocket-close', (data) =>
+                handleEvent('websocket-close', data)
+              ),
+              client.onMessage('websocket-message-sent', (data) =>
+                handleEvent('websocket-message-sent', data)
+              ),
+              client.onMessage('websocket-message-received', (data) =>
+                handleEvent('websocket-message-received', data)
+              ),
+              client.onMessage('websocket-error', (data) =>
+                handleEvent('websocket-error', data)
+              ),
+              client.onMessage('websocket-connection-status-changed', (data) =>
+                handleEvent('websocket-connection-status-changed', data)
+              ),
+              client.onMessage('sse-open', (data) =>
+                handleEvent('sse-open', data)
+              ),
+              client.onMessage('sse-message', (data) =>
+                handleEvent('sse-message', data)
+              ),
+              client.onMessage('sse-error', (data) =>
+                handleEvent('sse-error', data)
+              ),
+              client.onMessage('sse-close', (data) =>
+                handleEvent('sse-close', data)
+              ),
+            ];
+
+            // Store unsubscribe functions in the state for cleanup
+            set({
+              _unsubscribeFunctions: unsubscribeFunctions,
+              _client: client,
+            });
+          },
+
+          cleanupClient: () => {
+            const { _unsubscribeFunctions, _client } = get();
+
+            if (_unsubscribeFunctions) {
+              _unsubscribeFunctions.forEach(
+                (unsubscribe: { remove: () => void }) => unsubscribe.remove()
+              );
+            }
+
+            if (_client) {
+              _client.send('network-disable', {});
+            }
+
+            set({
+              _unsubscribeFunctions: undefined,
+              _client: undefined,
+            });
+          },
+        },
+      }),
+      {
+        name: 'rozenite-network-activity-storage',
+        version: STORE_VERSION,
+        storage: createJSONStorage(() => localStorage, {
+          replacer: (key, value) => {
+            if (value instanceof Map) {
+              return {
+                _type: 'map',
+                value: Array.from(value.entries()),
+              };
+            }
+            return value;
+          },
+          reviver: (key, value) => {
+            if (
+              typeof value === 'object' &&
+              value !== null &&
+              value._type === 'map'
+            ) {
+              return new Map(value.value);
+            }
+            return value;
+          },
+        }),
+        partialize: (state) => ({ overrides: state.overrides }), // Persist only the overrides
       }
-    },
-
-    // Client management
-    client: {
-      setupClient: (client: NetworkActivityDevToolsClient) => {
-        const { handleEvent } = get();
-
-        // Subscribe to all events using the unified handler
-        const unsubscribeFunctions = [
-          client.onMessage('request-sent', (data) =>
-            handleEvent('request-sent', data)
-          ),
-          client.onMessage('response-received', (data) =>
-            handleEvent('response-received', data)
-          ),
-          client.onMessage('request-completed', (data) =>
-            handleEvent('request-completed', data)
-          ),
-          client.onMessage('request-failed', (data) =>
-            handleEvent('request-failed', data)
-          ),
-          client.onMessage('response-body', (data) =>
-            handleEvent('response-body', data)
-          ),
-          client.onMessage('websocket-connect', (data) =>
-            handleEvent('websocket-connect', data)
-          ),
-          client.onMessage('websocket-open', (data) =>
-            handleEvent('websocket-open', data)
-          ),
-          client.onMessage('websocket-close', (data) =>
-            handleEvent('websocket-close', data)
-          ),
-          client.onMessage('websocket-message-sent', (data) =>
-            handleEvent('websocket-message-sent', data)
-          ),
-          client.onMessage('websocket-message-received', (data) =>
-            handleEvent('websocket-message-received', data)
-          ),
-          client.onMessage('websocket-error', (data) =>
-            handleEvent('websocket-error', data)
-          ),
-          client.onMessage('websocket-connection-status-changed', (data) =>
-            handleEvent('websocket-connection-status-changed', data)
-          ),
-          client.onMessage('sse-open', (data) => handleEvent('sse-open', data)),
-          client.onMessage('sse-message', (data) =>
-            handleEvent('sse-message', data)
-          ),
-          client.onMessage('sse-error', (data) =>
-            handleEvent('sse-error', data)
-          ),
-          client.onMessage('sse-close', (data) =>
-            handleEvent('sse-close', data)
-          ),
-        ];
-
-        // Store unsubscribe functions in the state for cleanup
-        set({
-          _unsubscribeFunctions: unsubscribeFunctions,
-          _client: client,
-        });
-      },
-
-      cleanupClient: () => {
-        const { _unsubscribeFunctions, _client } = get();
-
-        if (_unsubscribeFunctions) {
-          _unsubscribeFunctions.forEach((unsubscribe: { remove: () => void }) =>
-            unsubscribe.remove()
-          );
-        }
-
-        if (_client) {
-          _client.send('network-disable', {});
-        }
-
-        set({
-          _unsubscribeFunctions: undefined,
-          _client: undefined,
-        });
-      },
-    },
-  }));
+    )
+  );
 
 export const store = createNetworkActivityStore();