@spoosh/react 0.15.1 → 0.15.3

package/dist/index.d.mts

@@ -71,6 +71,9 @@ type ExtractAllSubscriptionEvents<T> = SubscriptionReturnType<T> extends {
 type ExtractSubscriptionError<T> = SubscriptionReturnType<T> extends {
     error: infer E;
 } ? E : unknown;
+type ExtractSubscriptionParamNames<T> = SubscriptionReturnType<T> extends {
+    params: infer P;
+} ? P extends Record<infer K, string | number> ? K extends string ? K : never : never : never;
 
 /**
  * Base options for `useRead` hook.
@@ -476,7 +479,31 @@ interface UseSSEOptions extends UseSSEOptionsBase {
     /** Accumulate strategy for combining events. Defaults to 'replace'. */
     accumulate?: AccumulateStrategy | Record<string, AccumulateStrategy | AccumulatorFn>;
 }
-interface UseSSEResult<TEvents, TError> {
+type SSEReturnType<T> = T extends (...args: never[]) => infer R ? R : never;
+type ExtractSSETriggerQuery<R> = R extends {
+    query: infer Q;
+} ? {
+    query?: Q;
+} : unknown;
+type ExtractSSETriggerBody<R> = R extends {
+    body: infer B;
+} ? {
+    body?: B;
+} : unknown;
+type ExtractSSETriggerParams<R> = R extends {
+    params: infer P;
+} ? {
+    params?: P;
+} : unknown;
+type SSETriggerOptionsFromFn<TSubFn> = SSEReturnType<TSubFn> extends infer R ? ExtractSSETriggerQuery<R> & ExtractSSETriggerBody<R> & ExtractSSETriggerParams<R> : object;
+type SSETriggerOptions<TQuery, TBody, TParams> = (TQuery extends never ? unknown : {
+    query?: TQuery;
+}) & (TBody extends never ? unknown : {
+    body?: TBody;
+}) & (TParams extends never ? unknown : {
+    params?: TParams;
+});
+interface UseSSEResultBase<TEvents, TError> {
     /** Accumulated data keyed by event type */
     data: Partial<TEvents> | undefined;
     /** Connection or parse error */
@@ -487,19 +514,18 @@ interface UseSSEResult<TEvents, TError> {
     loading: boolean;
     /** Plugin metadata */
     meta: Record<string, never>;
-    /**
-     * Manually trigger connection with optional body/query overrides
-     * @param options - Optional body and query parameters
-     */
-    trigger: (options?: {
-        body?: unknown;
-        query?: unknown;
-    }) => Promise<void>;
     /** Disconnect from the SSE endpoint */
     disconnect: () => void;
     /** Reset accumulated data */
     reset: () => void;
 }
+type UseSSEResult<TEvents, TError, TSubFn> = UseSSEResultBase<TEvents, TError> & {
+    /**
+     * Manually trigger connection with optional body/query/params overrides
+     * @param options - Optional body, query, and params parameters
+     */
+    trigger: (options?: SSETriggerOptionsFromFn<TSubFn>) => Promise<void>;
+};
 
 type InferError<T, TDefaultError> = unknown extends T ? TDefaultError : T;
 type WriteResolverContext<TSchema, TMethod, TDefaultError> = ResolverContext<TSchema, ExtractMethodData<TMethod>, InferError<ExtractMethodError<TMethod>, TDefaultError>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>;
@@ -535,13 +561,13 @@ type UseSSEFn<TDefaultError, TSchema, TPlugins extends PluginArray> = {
         }>;
     }, const TSelectedEvents extends readonly Extract<ExtractAllSubscriptionEventKeys<TSubFn>, string>[]>(subFn: TSubFn, sseOptions: TypedUseSSEOptions<Extract<ExtractAllSubscriptionEventKeys<TSubFn>, string>, InferSSEEvents<TSubFn>, TSelectedEvents> & {
         events: TSelectedEvents;
-    }): UseSSEResult<FilteredEvents<InferSSEEvents<TSubFn>, TSelectedEvents>, InferError<ExtractMethodError<TSubFn>, TDefaultError>>;
+    }): UseSSEResult<FilteredEvents<InferSSEEvents<TSubFn>, TSelectedEvents>, InferError<ExtractMethodError<TSubFn>, TDefaultError>, TSubFn>;
     <TSubFn extends (api: SubscriptionApiClient<TSchema, TDefaultError>) => {
         _subscription: true;
         events: Record<string, {
             data: unknown;
         }>;
-    }>(subFn: TSubFn, sseOptions?: Omit<TypedUseSSEOptions<Extract<ExtractAllSubscriptionEventKeys<TSubFn>, string>, InferSSEEvents<TSubFn>>, "events">): UseSSEResult<InferSSEEvents<TSubFn>, InferError<ExtractMethodError<TSubFn>, TDefaultError>>;
+    }>(subFn: TSubFn, sseOptions?: Omit<TypedUseSSEOptions<Extract<ExtractAllSubscriptionEventKeys<TSubFn>, string>, InferSSEEvents<TSubFn>>, "events">): UseSSEResult<InferSSEEvents<TSubFn>, InferError<ExtractMethodError<TSubFn>, TDefaultError>, TSubFn>;
 };
 /**
  * Base hooks that are always available.
@@ -737,4 +763,4 @@ type PluginHooksConfig<TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[
     plugins: TPlugins;
 };
 
-export { type ApiClient, type BasePagesOptions, type BasePagesResult, type BaseReadOptions, type BaseReadResult, type BaseSubscriptionOptions, type BaseSubscriptionResult, type BaseWriteResult, type ExtractAllSubscriptionEventKeys, type ExtractAllSubscriptionEvents, type ExtractCoreMethodOptions, type ExtractMethodBody, type ExtractMethodData, type ExtractMethodError, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractResponseBody, type ExtractResponseParamNames, type ExtractResponseQuery, type ExtractResponseRequestOptions, type ExtractSubscriptionBody, type ExtractSubscriptionError, type ExtractSubscriptionEvents, type ExtractSubscriptionQuery, type PagesApiClient, type PagesTriggerOptions, type PluginHooksConfig, type QueueApiClient, type QueueTriggerInput, type ReactOptionsMap, type ReadApiClient, type ResponseInputFields, type SpooshReactHooks, type SubscriptionApiClient, type SubscriptionTriggerInput, type TriggerOptions, type TypedAccumulateConfig, type TypedParseConfig, type TypedUseSSEOptions, type UsePagesResult, type UseQueueOptions, type UseQueueResult, type UseReadResult, type UseSSEOptions, type UseSSEOptionsBase, type UseSSEResult, type UseWriteResult, type WriteApiClient, type WriteResponseInputFields, type WriteTriggerInput, create };
+export { type ApiClient, type BasePagesOptions, type BasePagesResult, type BaseReadOptions, type BaseReadResult, type BaseSubscriptionOptions, type BaseSubscriptionResult, type BaseWriteResult, type ExtractAllSubscriptionEventKeys, type ExtractAllSubscriptionEvents, type ExtractCoreMethodOptions, type ExtractMethodBody, type ExtractMethodData, type ExtractMethodError, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractResponseBody, type ExtractResponseParamNames, type ExtractResponseQuery, type ExtractResponseRequestOptions, type ExtractSubscriptionBody, type ExtractSubscriptionError, type ExtractSubscriptionEvents, type ExtractSubscriptionParamNames, type ExtractSubscriptionQuery, type PagesApiClient, type PagesTriggerOptions, type PluginHooksConfig, type QueueApiClient, type QueueTriggerInput, type ReactOptionsMap, type ReadApiClient, type ResponseInputFields, type SSETriggerOptions, type SSETriggerOptionsFromFn, type SpooshReactHooks, type SubscriptionApiClient, type SubscriptionTriggerInput, type TriggerOptions, type TypedAccumulateConfig, type TypedParseConfig, type TypedUseSSEOptions, type UsePagesResult, type UseQueueOptions, type UseQueueResult, type UseReadResult, type UseSSEOptions, type UseSSEOptionsBase, type UseSSEResult, type UseSSEResultBase, type UseWriteResult, type WriteApiClient, type WriteResponseInputFields, type WriteTriggerInput, create };

package/dist/index.d.ts

@@ -71,6 +71,9 @@ type ExtractAllSubscriptionEvents<T> = SubscriptionReturnType<T> extends {
 type ExtractSubscriptionError<T> = SubscriptionReturnType<T> extends {
     error: infer E;
 } ? E : unknown;
+type ExtractSubscriptionParamNames<T> = SubscriptionReturnType<T> extends {
+    params: infer P;
+} ? P extends Record<infer K, string | number> ? K extends string ? K : never : never : never;
 
 /**
  * Base options for `useRead` hook.
@@ -476,7 +479,31 @@ interface UseSSEOptions extends UseSSEOptionsBase {
     /** Accumulate strategy for combining events. Defaults to 'replace'. */
     accumulate?: AccumulateStrategy | Record<string, AccumulateStrategy | AccumulatorFn>;
 }
-interface UseSSEResult<TEvents, TError> {
+type SSEReturnType<T> = T extends (...args: never[]) => infer R ? R : never;
+type ExtractSSETriggerQuery<R> = R extends {
+    query: infer Q;
+} ? {
+    query?: Q;
+} : unknown;
+type ExtractSSETriggerBody<R> = R extends {
+    body: infer B;
+} ? {
+    body?: B;
+} : unknown;
+type ExtractSSETriggerParams<R> = R extends {
+    params: infer P;
+} ? {
+    params?: P;
+} : unknown;
+type SSETriggerOptionsFromFn<TSubFn> = SSEReturnType<TSubFn> extends infer R ? ExtractSSETriggerQuery<R> & ExtractSSETriggerBody<R> & ExtractSSETriggerParams<R> : object;
+type SSETriggerOptions<TQuery, TBody, TParams> = (TQuery extends never ? unknown : {
+    query?: TQuery;
+}) & (TBody extends never ? unknown : {
+    body?: TBody;
+}) & (TParams extends never ? unknown : {
+    params?: TParams;
+});
+interface UseSSEResultBase<TEvents, TError> {
     /** Accumulated data keyed by event type */
     data: Partial<TEvents> | undefined;
     /** Connection or parse error */
@@ -487,19 +514,18 @@ interface UseSSEResult<TEvents, TError> {
     loading: boolean;
     /** Plugin metadata */
     meta: Record<string, never>;
-    /**
-     * Manually trigger connection with optional body/query overrides
-     * @param options - Optional body and query parameters
-     */
-    trigger: (options?: {
-        body?: unknown;
-        query?: unknown;
-    }) => Promise<void>;
     /** Disconnect from the SSE endpoint */
     disconnect: () => void;
     /** Reset accumulated data */
     reset: () => void;
 }
+type UseSSEResult<TEvents, TError, TSubFn> = UseSSEResultBase<TEvents, TError> & {
+    /**
+     * Manually trigger connection with optional body/query/params overrides
+     * @param options - Optional body, query, and params parameters
+     */
+    trigger: (options?: SSETriggerOptionsFromFn<TSubFn>) => Promise<void>;
+};
 
 type InferError<T, TDefaultError> = unknown extends T ? TDefaultError : T;
 type WriteResolverContext<TSchema, TMethod, TDefaultError> = ResolverContext<TSchema, ExtractMethodData<TMethod>, InferError<ExtractMethodError<TMethod>, TDefaultError>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>;
@@ -535,13 +561,13 @@ type UseSSEFn<TDefaultError, TSchema, TPlugins extends PluginArray> = {
         }>;
     }, const TSelectedEvents extends readonly Extract<ExtractAllSubscriptionEventKeys<TSubFn>, string>[]>(subFn: TSubFn, sseOptions: TypedUseSSEOptions<Extract<ExtractAllSubscriptionEventKeys<TSubFn>, string>, InferSSEEvents<TSubFn>, TSelectedEvents> & {
         events: TSelectedEvents;
-    }): UseSSEResult<FilteredEvents<InferSSEEvents<TSubFn>, TSelectedEvents>, InferError<ExtractMethodError<TSubFn>, TDefaultError>>;
+    }): UseSSEResult<FilteredEvents<InferSSEEvents<TSubFn>, TSelectedEvents>, InferError<ExtractMethodError<TSubFn>, TDefaultError>, TSubFn>;
     <TSubFn extends (api: SubscriptionApiClient<TSchema, TDefaultError>) => {
         _subscription: true;
         events: Record<string, {
             data: unknown;
         }>;
-    }>(subFn: TSubFn, sseOptions?: Omit<TypedUseSSEOptions<Extract<ExtractAllSubscriptionEventKeys<TSubFn>, string>, InferSSEEvents<TSubFn>>, "events">): UseSSEResult<InferSSEEvents<TSubFn>, InferError<ExtractMethodError<TSubFn>, TDefaultError>>;
+    }>(subFn: TSubFn, sseOptions?: Omit<TypedUseSSEOptions<Extract<ExtractAllSubscriptionEventKeys<TSubFn>, string>, InferSSEEvents<TSubFn>>, "events">): UseSSEResult<InferSSEEvents<TSubFn>, InferError<ExtractMethodError<TSubFn>, TDefaultError>, TSubFn>;
 };
 /**
  * Base hooks that are always available.
@@ -737,4 +763,4 @@ type PluginHooksConfig<TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[
     plugins: TPlugins;
 };
 
-export { type ApiClient, type BasePagesOptions, type BasePagesResult, type BaseReadOptions, type BaseReadResult, type BaseSubscriptionOptions, type BaseSubscriptionResult, type BaseWriteResult, type ExtractAllSubscriptionEventKeys, type ExtractAllSubscriptionEvents, type ExtractCoreMethodOptions, type ExtractMethodBody, type ExtractMethodData, type ExtractMethodError, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractResponseBody, type ExtractResponseParamNames, type ExtractResponseQuery, type ExtractResponseRequestOptions, type ExtractSubscriptionBody, type ExtractSubscriptionError, type ExtractSubscriptionEvents, type ExtractSubscriptionQuery, type PagesApiClient, type PagesTriggerOptions, type PluginHooksConfig, type QueueApiClient, type QueueTriggerInput, type ReactOptionsMap, type ReadApiClient, type ResponseInputFields, type SpooshReactHooks, type SubscriptionApiClient, type SubscriptionTriggerInput, type TriggerOptions, type TypedAccumulateConfig, type TypedParseConfig, type TypedUseSSEOptions, type UsePagesResult, type UseQueueOptions, type UseQueueResult, type UseReadResult, type UseSSEOptions, type UseSSEOptionsBase, type UseSSEResult, type UseWriteResult, type WriteApiClient, type WriteResponseInputFields, type WriteTriggerInput, create };
+export { type ApiClient, type BasePagesOptions, type BasePagesResult, type BaseReadOptions, type BaseReadResult, type BaseSubscriptionOptions, type BaseSubscriptionResult, type BaseWriteResult, type ExtractAllSubscriptionEventKeys, type ExtractAllSubscriptionEvents, type ExtractCoreMethodOptions, type ExtractMethodBody, type ExtractMethodData, type ExtractMethodError, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractResponseBody, type ExtractResponseParamNames, type ExtractResponseQuery, type ExtractResponseRequestOptions, type ExtractSubscriptionBody, type ExtractSubscriptionError, type ExtractSubscriptionEvents, type ExtractSubscriptionParamNames, type ExtractSubscriptionQuery, type PagesApiClient, type PagesTriggerOptions, type PluginHooksConfig, type QueueApiClient, type QueueTriggerInput, type ReactOptionsMap, type ReadApiClient, type ResponseInputFields, type SSETriggerOptions, type SSETriggerOptionsFromFn, type SpooshReactHooks, type SubscriptionApiClient, type SubscriptionTriggerInput, type TriggerOptions, type TypedAccumulateConfig, type TypedParseConfig, type TypedUseSSEOptions, type UsePagesResult, type UseQueueOptions, type UseQueueResult, type UseReadResult, type UseSSEOptions, type UseSSEOptionsBase, type UseSSEResult, type UseSSEResultBase, type UseWriteResult, type WriteApiClient, type WriteResponseInputFields, type WriteTriggerInput, create };

package/dist/index.js

@@ -688,11 +688,9 @@ function createUseSubscription(options) {
     });
     const controllerRef = (0, import_react5.useRef)(null);
     const subscriptionVersionRef = (0, import_react5.useRef)(0);
-    const getOrCreateController = (0, import_react5.useCallback)(() => {
-      if (controllerRef.current) {
-        return controllerRef.current;
-      }
-      const controller = (0, import_core5.createSubscriptionController)({
+    const queryKeyChanged = controllerRef.current && controllerRef.current.queryKey !== queryKey;
+    if (!controllerRef.current || queryKeyChanged) {
+      const controller2 = (0, import_core5.createSubscriptionController)({
         channel: capturedCall.path,
         baseAdapter: adapter,
         stateManager,
@@ -703,33 +701,18 @@ function createUseSubscription(options) {
         path: capturedCall.path,
         method: capturedCall.method
       });
-      controllerRef.current = controller;
-      return controller;
-    }, [
-      queryKey,
-      adapter,
-      operationType,
-      capturedCall.path,
-      capturedCall.method
-    ]);
+      controllerRef.current = { controller: controller2, queryKey };
+    }
+    const controller = controllerRef.current.controller;
     const subscribe = (0, import_react5.useCallback)(
       (callback) => {
-        const controller = getOrCreateController();
         return controller.subscribe(callback);
       },
-      [getOrCreateController]
+      [controller]
     );
-    const emptyStateRef = (0, import_react5.useRef)({
-      data: void 0,
-      error: void 0,
-      isConnected: false
-    });
     const getSnapshot = (0, import_react5.useCallback)(() => {
-      if (!controllerRef.current) {
-        return emptyStateRef.current;
-      }
-      return controllerRef.current.getState();
-    }, []);
+      return controller.getState();
+    }, [controller]);
     const state = (0, import_react5.useSyncExternalStore)(subscribe, getSnapshot, getSnapshot);
     const [isPending, setIsPending] = (0, import_react5.useState)(enabled);
     (0, import_react5.useEffect)(() => {
@@ -737,14 +720,13 @@ function createUseSubscription(options) {
         return;
       }
       setIsPending(true);
-      const controller = getOrCreateController();
       controller.mount();
       controller.subscribe();
       return () => {
         subscriptionVersionRef.current++;
         controller.unsubscribe();
       };
-    }, [queryKey, enabled, getOrCreateController]);
+    }, [queryKey, enabled, controller]);
     (0, import_react5.useEffect)(() => {
       if (state.isConnected || state.data !== void 0 || state.error !== void 0) {
         setIsPending(false);
@@ -752,19 +734,17 @@ function createUseSubscription(options) {
     }, [state.isConnected, state.data, state.error]);
     const disconnect = (0, import_react5.useCallback)(() => {
       subscriptionVersionRef.current++;
-      if (controllerRef.current) {
-        controllerRef.current.unsubscribe();
-      }
-    }, []);
+      controller.unsubscribe();
+    }, [controller]);
     const trigger = (0, import_react5.useCallback)(async () => {
       setIsPending(true);
       subscriptionVersionRef.current++;
-      const controller = getOrCreateController();
       controller.unsubscribe();
       controller.mount();
       await controller.subscribe();
-    }, [getOrCreateController]);
+    }, [controller]);
     const loading = isPending;
+    const stateWithQueue = state;
     return {
       meta: {},
       data: state.data,
@@ -773,6 +753,8 @@ function createUseSubscription(options) {
       isConnected: state.isConnected,
       _queryKey: queryKey,
       _subscriptionVersion: subscriptionVersionRef.current,
+      _messageQueue: stateWithQueue._messageQueue,
+      _queueIndex: stateWithQueue._queueIndex ?? 0,
       trigger,
       disconnect
     };
@@ -822,12 +804,19 @@ function createUseSSE(options) {
     if (!capturedCall) {
       throw new Error("useSSE requires calling a method");
     }
+    const requestOptions = capturedCall.options;
+    const resolvedPath = (0, import_core6.resolvePathString)(
+      capturedCall.path,
+      requestOptions?.params
+    );
+    const paramsKey = requestOptions?.params ? JSON.stringify(requestOptions.params) : "";
     const currentOptionsRef = (0, import_react6.useRef)(
       capturedCall.options
     );
+    currentOptionsRef.current = capturedCall.options;
     const adapter = (0, import_react6.useMemo)(
       () => transport.createSubscriptionAdapter({
-        channel: capturedCall.path,
+        channel: resolvedPath,
         method: capturedCall.method,
         baseUrl: config.baseUrl,
         globalHeaders: config.defaultOptions.headers,
@@ -835,7 +824,7 @@ function createUseSSE(options) {
         eventEmitter,
         devtoolMeta: events ? { listenedEvents: events } : void 0
       }),
-      [capturedCall.path, capturedCall.method]
+      [resolvedPath, capturedCall.method, paramsKey]
     );
     const [accumulatedData, setAccumulatedData] = (0, import_react6.useState)({});
     const eventSet = (0, import_react6.useMemo)(
@@ -858,76 +847,87 @@ function createUseSSE(options) {
     });
     const prevVersionRef = (0, import_react6.useRef)(subscription._subscriptionVersion);
     const lastMessageIndexRef = (0, import_react6.useRef)({});
+    const lastProcessedQueueIndexRef = (0, import_react6.useRef)(0);
     (0, import_react6.useEffect)(() => {
       if (subscription._subscriptionVersion !== prevVersionRef.current) {
         setAccumulatedData({});
         lastMessageIndexRef.current = {};
+        lastProcessedQueueIndexRef.current = 0;
       }
       prevVersionRef.current = subscription._subscriptionVersion;
     }, [subscription._subscriptionVersion]);
+    const subscriptionState = subscription;
+    const messageQueue = subscriptionState._messageQueue ?? [];
+    const queueIndex = subscriptionState._queueIndex ?? 0;
     (0, import_react6.useEffect)(() => {
-      const data = subscription.data;
-      if (!data) {
+      if (queueIndex <= lastProcessedQueueIndexRef.current) {
         return;
       }
-      if (eventSet && !eventSet.has(data.event)) {
-        return;
-      }
-      const parser = transport.utils.resolveParser(
-        parseRef.current,
-        data.event
-      );
-      let parsed;
-      try {
-        parsed = parser(data.data);
-      } catch {
-        parsed = data.data;
-      }
-      if (parsed === void 0) {
-        return;
-      }
-      const accumulator = transport.utils.resolveAccumulator(
-        accumulateRef.current,
-        data.event
-      );
-      const parsedObj = parsed;
-      const messageIndex = typeof parsedObj?.index === "number" ? parsedObj.index : void 0;
-      if (messageIndex !== void 0) {
-        const lastIndex = lastMessageIndexRef.current[data.event];
-        if (lastIndex !== void 0 && messageIndex < lastIndex) {
-          setAccumulatedData({});
-          lastMessageIndexRef.current = {};
+      const startIndex = lastProcessedQueueIndexRef.current;
+      const messagesToProcess = messageQueue.slice(startIndex);
+      lastProcessedQueueIndexRef.current = queueIndex;
+      for (const data of messagesToProcess) {
+        if (!data) continue;
+        if (eventSet && !eventSet.has(data.event)) {
+          continue;
         }
-        lastMessageIndexRef.current[data.event] = messageIndex;
-      }
-      setAccumulatedData((prev) => {
-        const previousEventData = prev[data.event];
-        let newEventData;
+        const parser = transport.utils.resolveParser(
+          parseRef.current,
+          data.event
+        );
+        let parsed;
         try {
-          newEventData = accumulator(previousEventData, parsed);
+          parsed = parser(data.data);
         } catch {
-          newEventData = parsed;
+          parsed = data.data;
         }
-        const newAccumulated = {
-          ...prev,
-          [data.event]: newEventData
-        };
-        eventEmitter?.emit(
-          "spoosh:subscription:accumulate",
-          {
-            queryKey: subscription._queryKey,
-            eventType: data.event,
-            accumulatedData: newAccumulated,
-            timestamp: Date.now()
-          }
+        if (parsed === void 0) {
+          continue;
+        }
+        const accumulator = transport.utils.resolveAccumulator(
+          accumulateRef.current,
+          data.event
         );
-        return newAccumulated;
-      });
-    }, [subscription.data, subscription._queryKey, eventSet]);
+        const parsedObj = parsed;
+        const messageIndex = typeof parsedObj?.index === "number" ? parsedObj.index : void 0;
+        if (messageIndex !== void 0) {
+          const lastIndex = lastMessageIndexRef.current[data.event];
+          if (lastIndex !== void 0 && messageIndex < lastIndex) {
+            setAccumulatedData({});
+            lastMessageIndexRef.current = {};
+          }
+          lastMessageIndexRef.current[data.event] = messageIndex;
+        }
+        setAccumulatedData((prev) => {
+          const previousEventData = prev[data.event];
+          let newEventData;
+          try {
+            newEventData = accumulator(previousEventData, parsed);
+          } catch {
+            newEventData = parsed;
+          }
+          const newAccumulated = {
+            ...prev,
+            [data.event]: newEventData
+          };
+          eventEmitter?.emit(
+            "spoosh:subscription:accumulate",
+            {
+              queryKey: subscription._queryKey,
+              eventType: data.event,
+              accumulatedData: newAccumulated,
+              timestamp: Date.now()
+            }
+          );
+          return newAccumulated;
+        });
+      }
+    }, [queueIndex, subscription._queryKey, eventSet]);
     const reset = (0, import_react6.useCallback)(() => {
       setAccumulatedData({});
     }, []);
     const trigger = (0, import_react6.useCallback)(
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       async (opts) => {
         reset();
         const triggerOpts = {

package/dist/index.mjs

@@ -712,11 +712,9 @@ function createUseSubscription(options) {
     });
     const controllerRef = useRef5(null);
     const subscriptionVersionRef = useRef5(0);
-    const getOrCreateController = useCallback4(() => {
-      if (controllerRef.current) {
-        return controllerRef.current;
-      }
-      const controller = createSubscriptionController({
+    const queryKeyChanged = controllerRef.current && controllerRef.current.queryKey !== queryKey;
+    if (!controllerRef.current || queryKeyChanged) {
+      const controller2 = createSubscriptionController({
         channel: capturedCall.path,
         baseAdapter: adapter,
         stateManager,
@@ -727,33 +725,18 @@ function createUseSubscription(options) {
         path: capturedCall.path,
         method: capturedCall.method
       });
-      controllerRef.current = controller;
-      return controller;
-    }, [
-      queryKey,
-      adapter,
-      operationType,
-      capturedCall.path,
-      capturedCall.method
-    ]);
+      controllerRef.current = { controller: controller2, queryKey };
+    }
+    const controller = controllerRef.current.controller;
     const subscribe = useCallback4(
       (callback) => {
-        const controller = getOrCreateController();
         return controller.subscribe(callback);
       },
-      [getOrCreateController]
+      [controller]
     );
-    const emptyStateRef = useRef5({
-      data: void 0,
-      error: void 0,
-      isConnected: false
-    });
     const getSnapshot = useCallback4(() => {
-      if (!controllerRef.current) {
-        return emptyStateRef.current;
-      }
-      return controllerRef.current.getState();
-    }, []);
+      return controller.getState();
+    }, [controller]);
     const state = useSyncExternalStore5(subscribe, getSnapshot, getSnapshot);
     const [isPending, setIsPending] = useState4(enabled);
     useEffect4(() => {
@@ -761,14 +744,13 @@ function createUseSubscription(options) {
         return;
       }
       setIsPending(true);
-      const controller = getOrCreateController();
       controller.mount();
       controller.subscribe();
       return () => {
         subscriptionVersionRef.current++;
         controller.unsubscribe();
       };
-    }, [queryKey, enabled, getOrCreateController]);
+    }, [queryKey, enabled, controller]);
     useEffect4(() => {
       if (state.isConnected || state.data !== void 0 || state.error !== void 0) {
         setIsPending(false);
@@ -776,19 +758,17 @@ function createUseSubscription(options) {
     }, [state.isConnected, state.data, state.error]);
     const disconnect = useCallback4(() => {
       subscriptionVersionRef.current++;
-      if (controllerRef.current) {
-        controllerRef.current.unsubscribe();
-      }
-    }, []);
+      controller.unsubscribe();
+    }, [controller]);
     const trigger = useCallback4(async () => {
       setIsPending(true);
       subscriptionVersionRef.current++;
-      const controller = getOrCreateController();
       controller.unsubscribe();
       controller.mount();
       await controller.subscribe();
-    }, [getOrCreateController]);
+    }, [controller]);
     const loading = isPending;
+    const stateWithQueue = state;
     return {
       meta: {},
       data: state.data,
@@ -797,6 +777,8 @@ function createUseSubscription(options) {
       isConnected: state.isConnected,
       _queryKey: queryKey,
       _subscriptionVersion: subscriptionVersionRef.current,
+      _messageQueue: stateWithQueue._messageQueue,
+      _queueIndex: stateWithQueue._queueIndex ?? 0,
       trigger,
       disconnect
     };
@@ -806,7 +788,7 @@ function createUseSubscription(options) {
 
 // src/useSSE/index.ts
 import { useState as useState5, useRef as useRef6, useEffect as useEffect5, useCallback as useCallback5, useMemo } from "react";
-import { createSelectorProxy as createSelectorProxy6 } from "@spoosh/core";
+import { createSelectorProxy as createSelectorProxy6, resolvePathString } from "@spoosh/core";
 function isSSETransport(transport) {
   const t = transport;
   return typeof t.createSubscriptionAdapter === "function" && typeof t.utils?.resolveParser === "function" && typeof t.utils?.resolveAccumulator === "function";
@@ -846,12 +828,19 @@ function createUseSSE(options) {
     if (!capturedCall) {
       throw new Error("useSSE requires calling a method");
     }
+    const requestOptions = capturedCall.options;
+    const resolvedPath = resolvePathString(
+      capturedCall.path,
+      requestOptions?.params
+    );
+    const paramsKey = requestOptions?.params ? JSON.stringify(requestOptions.params) : "";
     const currentOptionsRef = useRef6(
       capturedCall.options
     );
+    currentOptionsRef.current = capturedCall.options;
     const adapter = useMemo(
       () => transport.createSubscriptionAdapter({
-        channel: capturedCall.path,
+        channel: resolvedPath,
         method: capturedCall.method,
         baseUrl: config.baseUrl,
         globalHeaders: config.defaultOptions.headers,
@@ -859,7 +848,7 @@ function createUseSSE(options) {
         eventEmitter,
         devtoolMeta: events ? { listenedEvents: events } : void 0
       }),
-      [capturedCall.path, capturedCall.method]
+      [resolvedPath, capturedCall.method, paramsKey]
     );
     const [accumulatedData, setAccumulatedData] = useState5({});
     const eventSet = useMemo(
@@ -882,76 +871,87 @@ function createUseSSE(options) {
     });
     const prevVersionRef = useRef6(subscription._subscriptionVersion);
     const lastMessageIndexRef = useRef6({});
+    const lastProcessedQueueIndexRef = useRef6(0);
     useEffect5(() => {
       if (subscription._subscriptionVersion !== prevVersionRef.current) {
         setAccumulatedData({});
         lastMessageIndexRef.current = {};
+        lastProcessedQueueIndexRef.current = 0;
       }
       prevVersionRef.current = subscription._subscriptionVersion;
     }, [subscription._subscriptionVersion]);
+    const subscriptionState = subscription;
+    const messageQueue = subscriptionState._messageQueue ?? [];
+    const queueIndex = subscriptionState._queueIndex ?? 0;
     useEffect5(() => {
-      const data = subscription.data;
-      if (!data) {
+      if (queueIndex <= lastProcessedQueueIndexRef.current) {
         return;
       }
-      if (eventSet && !eventSet.has(data.event)) {
-        return;
-      }
-      const parser = transport.utils.resolveParser(
-        parseRef.current,
-        data.event
-      );
-      let parsed;
-      try {
-        parsed = parser(data.data);
-      } catch {
-        parsed = data.data;
-      }
-      if (parsed === void 0) {
-        return;
-      }
-      const accumulator = transport.utils.resolveAccumulator(
-        accumulateRef.current,
-        data.event
-      );
-      const parsedObj = parsed;
-      const messageIndex = typeof parsedObj?.index === "number" ? parsedObj.index : void 0;
-      if (messageIndex !== void 0) {
-        const lastIndex = lastMessageIndexRef.current[data.event];
-        if (lastIndex !== void 0 && messageIndex < lastIndex) {
-          setAccumulatedData({});
-          lastMessageIndexRef.current = {};
+      const startIndex = lastProcessedQueueIndexRef.current;
+      const messagesToProcess = messageQueue.slice(startIndex);
+      lastProcessedQueueIndexRef.current = queueIndex;
+      for (const data of messagesToProcess) {
+        if (!data) continue;
+        if (eventSet && !eventSet.has(data.event)) {
+          continue;
         }
-        lastMessageIndexRef.current[data.event] = messageIndex;
-      }
-      setAccumulatedData((prev) => {
-        const previousEventData = prev[data.event];
-        let newEventData;
+        const parser = transport.utils.resolveParser(
+          parseRef.current,
+          data.event
+        );
+        let parsed;
         try {
-          newEventData = accumulator(previousEventData, parsed);
+          parsed = parser(data.data);
         } catch {
-          newEventData = parsed;
+          parsed = data.data;
         }
-        const newAccumulated = {
-          ...prev,
-          [data.event]: newEventData
-        };
-        eventEmitter?.emit(
-          "spoosh:subscription:accumulate",
-          {
-            queryKey: subscription._queryKey,
-            eventType: data.event,
-            accumulatedData: newAccumulated,
-            timestamp: Date.now()
-          }
+        if (parsed === void 0) {
+          continue;
+        }
+        const accumulator = transport.utils.resolveAccumulator(
+          accumulateRef.current,
+          data.event
         );
-        return newAccumulated;
-      });
-    }, [subscription.data, subscription._queryKey, eventSet]);
+        const parsedObj = parsed;
+        const messageIndex = typeof parsedObj?.index === "number" ? parsedObj.index : void 0;
+        if (messageIndex !== void 0) {
+          const lastIndex = lastMessageIndexRef.current[data.event];
+          if (lastIndex !== void 0 && messageIndex < lastIndex) {
+            setAccumulatedData({});
+            lastMessageIndexRef.current = {};
+          }
+          lastMessageIndexRef.current[data.event] = messageIndex;
+        }
+        setAccumulatedData((prev) => {
+          const previousEventData = prev[data.event];
+          let newEventData;
+          try {
+            newEventData = accumulator(previousEventData, parsed);
+          } catch {
+            newEventData = parsed;
+          }
+          const newAccumulated = {
+            ...prev,
+            [data.event]: newEventData
+          };
+          eventEmitter?.emit(
+            "spoosh:subscription:accumulate",
+            {
+              queryKey: subscription._queryKey,
+              eventType: data.event,
+              accumulatedData: newAccumulated,
+              timestamp: Date.now()
+            }
+          );
+          return newAccumulated;
+        });
+      }
+    }, [queueIndex, subscription._queryKey, eventSet]);
     const reset = useCallback5(() => {
       setAccumulatedData({});
     }, []);
     const trigger = useCallback5(
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       async (opts) => {
         reset();
         const triggerOpts = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/react",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "license": "MIT",
   "description": "React hooks for Spoosh API toolkit",
   "keywords": [
@@ -34,7 +34,7 @@
     }
   },
   "peerDependencies": {
-    "@spoosh/core": ">=0.18.2",
+    "@spoosh/core": ">=0.18.3",
     "@spoosh/transport-sse": ">=0.1.0",
     "react": "^18 || ^19"
   },
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@testing-library/react": "^16.0.0",
     "jsdom": "^26.0.0",
-    "@spoosh/core": "0.18.2",
+    "@spoosh/core": "0.18.3",
     "@spoosh/transport-sse": "0.1.2",
     "@spoosh/test-utils": "0.3.0"
   },