@faasjs/react 8.0.0-beta.20 → 8.0.0-beta.21

package/dist/index.d.ts

@@ -1091,25 +1091,23 @@ declare const FaasDataWrapper: <PathOrData extends FaasActionUnionType$1 = any>(
  */
 declare function withFaasData<PathOrData extends FaasActionUnionType$1, TComponentProps extends Required<FaasDataInjection<PathOrData>> = Required<FaasDataInjection<PathOrData>>>(Component: React.FC<TComponentProps>, faasProps: FaasDataWrapperProps<PathOrData>): React.FC<Omit<TComponentProps, keyof FaasDataInjection<PathOrData>> & Record<string, any>>;
 //#endregion
+//#region src/useFaasRequest.d.ts
+type SharedUseFaasOptions<Params, Data> = {
+  params?: Params;
+  data?: Data;
+  setData?: React.Dispatch<React.SetStateAction<Data>>;
+  skip?: boolean | ((params: Params) => boolean);
+  debounce?: number;
+  baseUrl?: BaseUrl;
+};
+//#endregion
 //#region src/useFaas.d.ts
 /**
  * Options that customize the {@link useFaas} request lifecycle.
  *
  * @template PathOrData - Action path or response data type used for inference.
  */
-type useFaasOptions<PathOrData extends FaasActionUnionType$1> = {
-  /** Override the current request params without changing the hook's stored params state. */params?: FaasParams$1<PathOrData>; /** Controlled data value used instead of the hook's internal state. */
-  data?: FaasData$1<PathOrData>; /** Controlled setter that is called instead of the hook's internal `setData`. */
-  setData?: React.Dispatch<React.SetStateAction<FaasData$1<PathOrData>>>;
-  /**
-   * If skip is true, the request will not be sent.
-   *
-   * However, you can still use reload to send the request.
-   */
-  skip?: boolean | ((params: FaasParams$1<PathOrData>) => boolean); /** Delay the latest automatic request by the given number of milliseconds. */
-  debounce?: number; /** Override the default base URL for this hook instance. */
-  baseUrl?: BaseUrl;
-};
+type useFaasOptions<PathOrData extends FaasActionUnionType$1> = SharedUseFaasOptions<FaasParams$1<PathOrData>, FaasData$1<PathOrData>>;
 /**
  * Request FaasJS data and keep request state in React state.
  *
@@ -1359,7 +1357,7 @@ declare class ErrorBoundary extends Component<ErrorBoundaryProps, {
   /**
    * Render children or the configured fallback for the captured error.
    */
-  render(): string | number | bigint | boolean | _$react_jsx_runtime0.JSX.Element | Iterable<ReactNode> | Promise<string | number | bigint | boolean | _$react.ReactPortal | ReactElement<unknown, string | _$react.JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | null;
+  render(): string | number | bigint | boolean | Iterable<ReactNode> | Promise<string | number | bigint | boolean | _$react.ReactPortal | ReactElement<unknown, string | _$react.JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | _$react_jsx_runtime0.JSX.Element | null;
 }
 //#endregion
 //#region src/equal.d.ts
@@ -1506,7 +1504,7 @@ type OptionalWrapperProps<TWrapper extends ComponentType<{
  * )
  * ```
  */
-declare function OptionalWrapper(props: OptionalWrapperProps): string | number | bigint | boolean | _$react_jsx_runtime0.JSX.Element | Iterable<ReactNode> | Promise<string | number | bigint | boolean | _$react.ReactPortal | _$react.ReactElement<unknown, string | _$react.JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | null | undefined;
+declare function OptionalWrapper(props: OptionalWrapperProps): string | number | bigint | boolean | Iterable<ReactNode> | Promise<string | number | bigint | boolean | _$react.ReactPortal | _$react.ReactElement<unknown, string | _$react.JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | _$react_jsx_runtime0.JSX.Element | null | undefined;
 declare namespace OptionalWrapper {
   var displayName: string;
 }
@@ -1662,19 +1660,7 @@ declare function useSplittingState<T extends Record<string, unknown>>(initialSta
 /**
  * Options that customize the {@link useFaasStream} request lifecycle.
  */
-type UseFaasStreamOptions = {
-  /** Override the current request params without changing the hook's stored params state. */params?: Record<string, any>; /** Controlled stream text used instead of the hook's internal state. */
-  data?: string; /** Controlled setter that is called instead of the hook's internal `setData`. */
-  setData?: React.Dispatch<React.SetStateAction<string>>;
-  /**
-   * If skip is true, the request will not be sent.
-   *
-   * However, you can still use reload to send the request.
-   */
-  skip?: boolean | ((params: Record<string, any>) => boolean); /** Delay the latest automatic request by the given number of milliseconds. */
-  debounce?: number; /** Override the default base URL for this hook instance. */
-  baseUrl?: BaseUrl;
-};
+type UseFaasStreamOptions = SharedUseFaasOptions<Record<string, any>, string>;
 /**
  * Result returned by {@link useFaasStream}.
  */

package/dist/index.mjs

@@ -1083,6 +1083,126 @@ function withFaasData(Component, faasProps) {
 	});
 }
 //#endregion
+//#region src/useFaasRequest.ts
+function useFaasRequest({ action, defaultParams, options, beforeSend, onSuccess, send }) {
+	const [loading, setLoading] = useState(true);
+	const [error, setError] = useState();
+	const [params, setParams] = useState(defaultParams);
+	const [reloadTimes, setReloadTimes] = useState(0);
+	const [skip, setSkip] = useState(typeof options.skip === "function" ? options.skip(defaultParams) : options.skip);
+	const promiseRef = useRef(null);
+	const controllerRef = useRef(null);
+	const failedOnceRef = useRef(false);
+	const pendingReloadsRef = useRef(/* @__PURE__ */ new Map());
+	const reloadCounterRef = useRef(0);
+	const beforeSendRef = useRef(beforeSend);
+	const onSuccessRef = useRef(onSuccess);
+	const sendRef = useRef(send);
+	beforeSendRef.current = beforeSend;
+	onSuccessRef.current = onSuccess;
+	sendRef.current = send;
+	useEqualEffect(() => {
+		setSkip(typeof options.skip === "function" ? options.skip(params) : options.skip);
+	}, [typeof options.skip === "function" ? params : options.skip]);
+	useEqualEffect(() => {
+		if (!equal(defaultParams, params)) setParams(defaultParams);
+	}, [defaultParams]);
+	useEqualEffect(() => {
+		if (!action || skip) {
+			setLoading(false);
+			return;
+		}
+		setLoading(true);
+		beforeSendRef.current?.();
+		failedOnceRef.current = false;
+		const controller = new AbortController();
+		controllerRef.current = controller;
+		const client = getClient(options.baseUrl);
+		const requestParams = options.params || params;
+		const rejectPending = (reason) => {
+			for (const { reject } of pendingReloadsRef.current.values()) reject(reason);
+			pendingReloadsRef.current.clear();
+		};
+		const resolvePending = (value) => {
+			for (const { resolve } of pendingReloadsRef.current.values()) resolve(value);
+			pendingReloadsRef.current.clear();
+		};
+		const run = () => {
+			sendRef.current({
+				action,
+				params: requestParams,
+				signal: controller.signal,
+				client,
+				setPromise: (promise) => {
+					promiseRef.current = promise;
+				}
+			}).then((result) => {
+				failedOnceRef.current = false;
+				setError(null);
+				onSuccessRef.current?.(result);
+				setLoading(false);
+				resolvePending(result);
+			}).catch(async (e) => {
+				if (typeof e?.message === "string" && e.message.toLowerCase().includes("aborted")) return;
+				if (!failedOnceRef.current && typeof e?.message === "string" && e.message.includes("Failed to fetch")) {
+					failedOnceRef.current = true;
+					console.warn(`FaasReactClient: ${e.message} retry...`);
+					run();
+					return;
+				}
+				let nextError = e;
+				if (client.onError) try {
+					await client.onError(action, requestParams || Object.create(null))(e);
+				} catch (newError) {
+					nextError = newError;
+				}
+				setError(nextError);
+				setLoading(false);
+				rejectPending(nextError);
+			});
+		};
+		if (options.debounce) {
+			const timeout = setTimeout(run, options.debounce);
+			return () => {
+				clearTimeout(timeout);
+				controllerRef.current?.abort();
+				setLoading(false);
+			};
+		}
+		run();
+		return () => {
+			controllerRef.current?.abort();
+			setLoading(false);
+		};
+	}, [
+		action,
+		options.params || params,
+		reloadTimes,
+		skip
+	]);
+	return {
+		loading,
+		error,
+		params,
+		reloadTimes,
+		reload: useEqualCallback((nextParams) => {
+			if (skip) setSkip(false);
+			if (nextParams) setParams(nextParams);
+			const reloadCounter = ++reloadCounterRef.current;
+			return new Promise((resolve, reject) => {
+				pendingReloadsRef.current.set(reloadCounter, {
+					resolve,
+					reject
+				});
+				setReloadTimes((prev) => prev + 1);
+			});
+		}, [skip]),
+		promiseRef,
+		setError,
+		setLoading
+	};
+}
+//#endregion
 //#region src/useFaas.tsx
 /**
 * Request FaasJS data and keep request state in React state.
@@ -1136,113 +1256,40 @@ function withFaasData(Component, faasProps) {
 * ```
 */
 function useFaas(action, defaultParams, options = {}) {
-	const [loading, setLoading] = useState(true);
 	const [data, setData] = useState();
-	const [error, setError] = useState();
-	const [params, setParams] = useState(defaultParams);
-	const [reloadTimes, setReloadTimes] = useState(0);
-	const [fails, setFails] = useState(0);
-	const [skip, setSkip] = useState(typeof options.skip === "function" ? options.skip(defaultParams) : options.skip);
-	const promiseRef = useRef(null);
-	const controllerRef = useRef(null);
 	const localSetData = setData;
-	const pendingReloadsRef = useRef(/* @__PURE__ */ new Map());
-	const reloadCounterRef = useRef(0);
-	useEqualEffect(() => {
-		setSkip(typeof options.skip === "function" ? options.skip(params) : options.skip);
-	}, [typeof options.skip === "function" ? params : options.skip]);
-	useEqualEffect(() => {
-		if (!equal(defaultParams, params)) setParams(defaultParams);
-	}, [defaultParams]);
-	useEqualEffect(() => {
-		if (!action || skip) {
-			setLoading(false);
-			return;
-		}
-		setLoading(true);
-		const controller = new AbortController();
-		controllerRef.current = controller;
-		const client = getClient(options.baseUrl);
-		const requestParams = options.params ?? params;
-		function send() {
-			const request = client.faas(action, requestParams, { signal: controller.signal });
-			promiseRef.current = request;
-			request.then((r) => {
-				const nextData = r.data;
-				setFails(0);
-				setError(null);
-				if (options.setData) options.setData(nextData);
-				else localSetData(nextData);
-				setLoading(false);
-				for (const { resolve } of pendingReloadsRef.current.values()) resolve(nextData);
-				pendingReloadsRef.current.clear();
-			}).catch(async (e) => {
-				if (typeof e?.message === "string" && e.message.toLowerCase().indexOf("aborted") >= 0) return;
-				if (!fails && typeof e?.message === "string" && e.message.indexOf("Failed to fetch") >= 0) {
-					console.warn(`FaasReactClient: ${e.message} retry...`);
-					setFails(1);
-					return send();
-				}
-				let error = e;
-				if (client.onError) try {
-					await client.onError(action, requestParams)(e);
-				} catch (newError) {
-					error = newError;
-				}
-				setError(error);
-				setLoading(false);
-				for (const { reject } of pendingReloadsRef.current.values()) reject(error);
-				pendingReloadsRef.current.clear();
-			});
-		}
-		if (options.debounce) {
-			const timeout = setTimeout(send, options.debounce);
-			return () => {
-				clearTimeout(timeout);
-				controllerRef.current?.abort();
-				setLoading(false);
-			};
-		}
-		send();
-		return () => {
-			controllerRef.current?.abort();
-			setLoading(false);
-		};
-	}, [
+	const request = useFaasRequest({
 		action,
-		options.params || params,
-		reloadTimes,
-		skip
-	]);
-	const reload = useEqualCallback((params) => {
-		if (skip) setSkip(false);
-		if (params) setParams(params);
-		const reloadCounter = ++reloadCounterRef.current;
-		return new Promise((resolve, reject) => {
-			pendingReloadsRef.current.set(reloadCounter, {
-				resolve,
-				reject
-			});
-			setReloadTimes((prev) => prev + 1);
-		});
-	}, [params, skip]);
+		defaultParams,
+		options,
+		onSuccess: (nextData) => {
+			if (options.setData) options.setData(nextData);
+			else localSetData(nextData);
+		},
+		send: ({ action, params, signal, client, setPromise }) => {
+			const promise = client.faas(action, params, { signal });
+			setPromise(promise);
+			return promise.then((response) => response.data);
+		}
+	});
 	const currentData = options.data ?? data;
-	const currentPromise = promiseRef.current ?? Promise.resolve({});
+	const currentPromise = request.promiseRef.current ?? Promise.resolve({});
+	const updateData = options.setData ?? localSetData;
 	return {
 		action,
-		params,
-		loading,
+		params: request.params,
+		loading: request.loading,
 		data: currentData,
-		reloadTimes,
-		error,
+		reloadTimes: request.reloadTimes,
+		error: request.error,
 		promise: currentPromise,
-		reload,
-		setData: options.setData ?? localSetData,
-		setLoading,
+		reload: request.reload,
+		setData: updateData,
+		setLoading: request.setLoading,
 		setPromise: (newPromise) => {
-			promiseRef.current = typeof newPromise === "function" ? newPromise(currentPromise) : newPromise;
+			request.promiseRef.current = typeof newPromise === "function" ? newPromise(currentPromise) : newPromise;
 		},
-		setError
+		setError: request.setError
 	};
 }
 //#endregion
@@ -1637,123 +1684,46 @@ function createSplittingContext(defaultValue) {
 * ```
 */
 function useFaasStream(action, defaultParams, options = {}) {
-	const [loading, setLoading] = useState(true);
 	const [data, setData] = useState(options.data || "");
-	const [error, setError] = useState();
-	const [params, setParams] = useState(defaultParams);
-	const [reloadTimes, setReloadTimes] = useState(0);
-	const [fails, setFails] = useState(0);
-	const [skip, setSkip] = useState(typeof options.skip === "function" ? options.skip(defaultParams) : options.skip);
-	const controllerRef = useRef(null);
-	const pendingReloadsRef = useRef(/* @__PURE__ */ new Map());
-	const reloadCounterRef = useRef(0);
-	useEqualEffect(() => {
-		setSkip(typeof options.skip === "function" ? options.skip(params) : options.skip);
-	}, [typeof options.skip === "function" ? params : options.skip]);
-	useEqualEffect(() => {
-		if (!equal(defaultParams, params)) setParams(defaultParams);
-	}, [defaultParams]);
-	useEqualEffect(() => {
-		if (!action || skip) {
-			setLoading(false);
-			return;
-		}
-		setLoading(true);
-		setData("");
-		const controller = new AbortController();
-		controllerRef.current = controller;
-		const client = getClient(options.baseUrl);
-		const requestParams = options.params ?? params;
-		function send() {
-			client.browserClient.action(action, requestParams, {
-				signal: controller.signal,
+	const request = useFaasRequest({
+		action,
+		defaultParams,
+		options,
+		beforeSend: () => setData(""),
+		send: async ({ action, params, signal, client }) => {
+			const response = await client.browserClient.action(action, params, {
+				signal,
 				stream: true
-			}).then(async (response) => {
-				if (!response.body) {
-					setError(/* @__PURE__ */ new Error("Response body is null"));
-					setLoading(false);
-					return;
-				}
-				const reader = response.body.getReader();
-				const decoder = new TextDecoder();
-				let accumulatedText = "";
-				try {
-					while (true) {
-						const { done, value } = await reader.read();
-						if (done) break;
-						accumulatedText += decoder.decode(value, { stream: true });
-						setData(accumulatedText);
-					}
-					setFails(0);
-					setError(null);
-					setLoading(false);
-					for (const { resolve } of pendingReloadsRef.current.values()) resolve(accumulatedText);
-					pendingReloadsRef.current.clear();
-				} catch (readError) {
-					reader.releaseLock();
-					throw readError;
-				}
-			}).catch(async (e) => {
-				if (typeof e?.message === "string" && e.message.toLowerCase().indexOf("aborted") >= 0) return;
-				if (!fails && typeof e?.message === "string" && e.message.indexOf("Failed to fetch") >= 0) {
-					console.warn(`FaasReactClient: ${e.message} retry...`);
-					setFails(1);
-					return send();
-				}
-				let error = e;
-				if (client.onError) try {
-					await client.onError(action, requestParams)(e);
-				} catch (newError) {
-					error = newError;
-				}
-				setError(error);
-				setLoading(false);
-				for (const { reject } of pendingReloadsRef.current.values()) reject(error);
-				pendingReloadsRef.current.clear();
 			});
+			if (!response.body) throw new Error("Response body is null");
+			const reader = response.body.getReader();
+			const decoder = new TextDecoder();
+			let accumulatedText = "";
+			try {
+				while (true) {
+					const { done, value } = await reader.read();
+					if (done) break;
+					accumulatedText += decoder.decode(value, { stream: true });
+					setData(accumulatedText);
+				}
+				return accumulatedText;
+			} catch (error) {
+				reader.releaseLock();
+				throw error;
+			}
 		}
-		if (options.debounce) {
-			const timeout = setTimeout(send, options.debounce);
-			return () => {
-				clearTimeout(timeout);
-				controllerRef.current?.abort();
-				setLoading(false);
-			};
-		}
-		send();
-		return () => {
-			controllerRef.current?.abort();
-			setLoading(false);
-		};
-	}, [
-		action,
-		options.params || params,
-		reloadTimes,
-		skip
-	]);
-	const reload = useEqualCallback((params) => {
-		if (skip) setSkip(false);
-		if (params) setParams(params);
-		const reloadCounter = ++reloadCounterRef.current;
-		return new Promise((resolve, reject) => {
-			pendingReloadsRef.current.set(reloadCounter, {
-				resolve,
-				reject
-			});
-			setReloadTimes((prev) => prev + 1);
-		});
-	}, [params, skip]);
+	});
 	return {
 		action,
-		params,
-		loading,
+		params: request.params,
+		loading: request.loading,
+		reloadTimes: request.reloadTimes,
 		data: options.data || data,
-		reloadTimes,
-		error,
-		reload,
+		error: request.error,
+		reload: request.reload,
 		setData: options.setData || setData,
-		setLoading,
-		setError
+		setLoading: request.setLoading,
+		setError: request.setError
 	};
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/react",
-  "version": "8.0.0-beta.20",
+  "version": "8.0.0-beta.21",
   "homepage": "https://faasjs.com/doc/react/",
   "bugs": {
     "url": "https://github.com/faasjs/faasjs/issues"
@@ -26,12 +26,12 @@
     }
   },
   "devDependencies": {
-    "@faasjs/types": ">=8.0.0-beta.20",
+    "@faasjs/types": ">=8.0.0-beta.21",
     "@types/react": "^19.0.0",
     "react": "^19.0.0"
   },
   "peerDependencies": {
-    "@faasjs/types": ">=8.0.0-beta.20"
+    "@faasjs/types": ">=8.0.0-beta.21"
   },
   "engines": {
     "node": ">=24.0.0",