xxf_react 0.1.3 → 0.1.5

package/dist/sse/UseSSE.d.ts

@@ -1,19 +1,11 @@
-import { EventSourceMessage } from '@microsoft/fetch-event-source';
+import { EventSourceMessage } from "@microsoft/fetch-event-source";
 import { SSEStatus } from "./SSEStatus";
 type UseSSEParams = {
-    url: string | null;
-    headers?: Record<string, string>;
+    url?: string | null | Promise<string | null>;
+    headers?: Record<string, string> | Promise<Record<string, string>>;
     onMessage: (event: EventSourceMessage) => void;
     enabled?: boolean;
 };
-/**
- * 内部会复用链接,无需关心实现,即使多次调用也没有关系
- * @param url
- * @param headers
- * @param onMessage
- * @param enabled /// 可以控制,比如未登录的情况下不要订阅
- * @return {status} 状态
- */
 export declare function useSSE({ url, headers, onMessage, enabled, }: UseSSEParams): {
     status: SSEStatus;
 };

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,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAItC,KAAK,YAAY,GAAG;IAChB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,SAAS,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,EACI,GAAG,EACH,OAAO,EACP,SAAS,EACT,OAAc,GACjB,EAAE,YAAY;;EA0BrC"}
+{"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"}

package/dist/sse/UseSSE.js

@@ -1,36 +1,57 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from "react";
 import { SSEStatus } from "./SSEStatus";
 import { sseRegistry } from "./SSERegistry";
 import { SSEManager } from "./SSEManager";
-/**
- * 内部会复用链接,无需关心实现,即使多次调用也没有关系
- * @param url
- * @param headers
- * @param onMessage
- * @param enabled /// 可以控制,比如未登录的情况下不要订阅
- * @return {status} 状态
- */
 export function useSSE({ url, headers, onMessage, enabled = true, }) {
-    // 保证回调不因 render 变化导致重复订阅
     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 (!url || !enabled)
+        if (!enabled)
             return;
-        const manager = sseRegistry.getOrCreate(url, () => {
-            return new SSEManager(url, headers || {});
-        });
-        const unsubscribe = manager.subscribe((event) => {
-            callbackRef.current(event);
+        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 manager = null;
+        let unsubscribe = null;
+        let stateUnsubscribe = null;
+        manager = sseRegistry.getOrCreate(resolvedUrl, () => new SSEManager(resolvedUrl, resolvedHeaders));
+        unsubscribe = manager.subscribe((event) => {
+            if (!canceled)
+                callbackRef.current(event);
         });
-        const stateUnsubscribe = manager.subscribeStatus((status) => {
-            setStatus(status);
+        stateUnsubscribe = manager.subscribeStatus((s) => {
+            if (!canceled)
+                setStatus(s);
         });
         return () => {
-            stateUnsubscribe();
-            unsubscribe();
+            canceled = true;
+            unsubscribe === null || unsubscribe === void 0 ? void 0 : unsubscribe();
+            stateUnsubscribe === null || stateUnsubscribe === void 0 ? void 0 : stateUnsubscribe();
         };
-    }, [url, enabled]);
+    }, [resolvedUrl, resolvedHeaders, enabled]);
     return { status };
 }

package/package.json

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