xxf_react 0.1.5 → 0.1.7

package/dist/fetch/Fetch.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 带超时时间的请求,默认没有超时时间限制
+ * @param input
+ * @param init
+ */
+export declare function fetchWithTimeout(input: string | URL | Request, init?: (RequestInit & {
+    timeout?: number;
+})): Promise<Response>;
+//# sourceMappingURL=Fetch.d.ts.map

package/dist/fetch/Fetch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Fetch.d.ts","sourceRoot":"","sources":["../../src/fetch/Fetch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAsB,gBAAgB,CAClC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC7B,IAAI,GAAE,CAAC,WAAW,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAM,GAChD,OAAO,CAAC,QAAQ,CAAC,CAkDnB"}

package/dist/fetch/Fetch.js

@@ -0,0 +1,49 @@
+/**
+ * 带超时时间的请求,默认没有超时时间限制
+ * @param input
+ * @param init
+ */
+export async function fetchWithTimeout(input, init = {}) {
+    const { timeout, signal, ...rest } = init;
+    if (timeout == null) {
+        return fetch(input, init);
+    }
+    const controller = new AbortController();
+    let timeoutFired = false;
+    const onAbort = () => controller.abort();
+    if (signal) {
+        if (signal.aborted) {
+            controller.abort();
+        }
+        else {
+            signal.addEventListener('abort', onAbort, { once: true });
+        }
+    }
+    const timer = setTimeout(() => {
+        timeoutFired = true;
+        controller.abort();
+    }, timeout);
+    try {
+        return await fetch(input, {
+            ...rest,
+            signal: controller.signal,
+        });
+    }
+    catch (e) {
+        if (e.name === 'AbortError' && timeoutFired) {
+            const url = typeof input === 'string'
+                ? input
+                : input instanceof Request
+                    ? input.url
+                    : input.toString();
+            console.error(`[http timeout] ${url} (${timeout}ms)`);
+        }
+        throw e;
+    }
+    finally {
+        clearTimeout(timer);
+        if (signal) {
+            signal.removeEventListener('abort', onAbort);
+        }
+    }
+}

package/dist/fetch/index.d.ts

@@ -0,0 +1,2 @@
+export * from './Fetch';
+//# sourceMappingURL=index.d.ts.map

package/dist/fetch/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fetch/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC"}

package/dist/fetch/index.js

@@ -0,0 +1 @@
+export * from './Fetch';

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './sse';
+export * from './fetch';
 export * from './utils';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -1,2 +1,3 @@
 export * from './sse';
+export * from './fetch';
 export * from './utils';

package/dist/sse/UseSSE.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UseSSE.d.ts","sourceRoot":"","sources":["../../src/sse/UseSSE.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC,KAAK,YAAY,GAAG;IAChB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,SAAS,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAgB,MAAM,CAAC,EACI,GAAG,EACH,OAAO,EACP,SAAS,EACT,OAAc,GACjB,EAAE,YAAY;;EA6DrC"}
+{"version":3,"file":"UseSSE.d.ts","sourceRoot":"","sources":["../../src/sse/UseSSE.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAItC,KAAK,YAAY,GAAG;IAChB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,SAAS,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAgB,MAAM,CAAC,EACI,GAAG,EACH,OAAO,EACP,SAAS,EACT,OAAc,GACjB,EAAE,YAAY;;EA2CrC"}

package/dist/sse/UseSSE.js

@@ -6,52 +6,34 @@ export function useSSE({ url, headers, onMessage, enabled = true, }) {
     const callbackRef = useRef(onMessage);
     callbackRef.current = onMessage;
     const [status, setStatus] = useState(SSEStatus.idle);
-    // ---------- Step 1: resolve async url and headers ----------
-    const [resolvedUrl, setResolvedUrl] = useState(null);
-    const [resolvedHeaders, setResolvedHeaders] = useState({});
     useEffect(() => {
         if (!enabled)
             return;
-        let canceled = false;
-        (async () => {
-            try {
-                const u = url instanceof Promise ? await url : url || null;
-                const h = headers instanceof Promise ? await headers : headers || {};
-                if (!canceled) {
-                    setResolvedUrl(u);
-                    setResolvedHeaders(h);
-                }
-            }
-            catch (err) {
-                console.error("useSSE resolve error:", err);
-            }
-        })();
-        return () => {
-            canceled = true;
-        };
-    }, [url, headers, enabled]);
-    // ---------- Step 2: create SSEManager ----------
-    useEffect(() => {
-        if (!enabled || !resolvedUrl)
-            return;
-        let canceled = false;
+        let canceled = false; // 用于处理 cleanup
         let manager = null;
         let unsubscribe = null;
         let stateUnsubscribe = null;
-        manager = sseRegistry.getOrCreate(resolvedUrl, () => new SSEManager(resolvedUrl, resolvedHeaders));
-        unsubscribe = manager.subscribe((event) => {
-            if (!canceled)
+        async function setupSSE() {
+            // 先解析异步 url 和 headers
+            const resolvedUrl = typeof url === "function" || url instanceof Promise ? await url : url;
+            if (!resolvedUrl)
+                return;
+            const resolvedHeaders = headers instanceof Promise ? await headers : headers || {};
+            if (canceled)
+                return; // 组件卸载或依赖变化时直接返回
+            manager = sseRegistry.getOrCreate(resolvedUrl, () => new SSEManager(resolvedUrl, resolvedHeaders));
+            unsubscribe = manager.subscribe((event) => {
                 callbackRef.current(event);
-        });
-        stateUnsubscribe = manager.subscribeStatus((s) => {
-            if (!canceled)
-                setStatus(s);
-        });
+            });
+            stateUnsubscribe = manager.subscribeStatus((s) => setStatus(s));
+        }
+        setupSSE().catch(console.error);
         return () => {
             canceled = true;
             unsubscribe === null || unsubscribe === void 0 ? void 0 : unsubscribe();
             stateUnsubscribe === null || stateUnsubscribe === void 0 ? void 0 : stateUnsubscribe();
         };
-    }, [resolvedUrl, resolvedHeaders, enabled]);
+        //}, [url, headers, enabled]);
+    }, [url, enabled]);
     return { status };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xxf_react",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "private": false,
 
   "type": "module",