xxf_react 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,19 +1,11 @@
1
- import { EventSourceMessage } from '@microsoft/fetch-event-source';
1
+ import { EventSourceMessage } from "@microsoft/fetch-event-source";
2
2
  import { SSEStatus } from "./SSEStatus";
3
3
  type UseSSEParams = {
4
- url: string | null;
5
- headers?: Record<string, string>;
4
+ url?: string | null | Promise<string | null>;
5
+ headers?: Record<string, string> | Promise<Record<string, string>>;
6
6
  onMessage: (event: EventSourceMessage) => void;
7
7
  enabled?: boolean;
8
8
  };
9
- /**
10
- * 内部会复用链接,无需关心实现,即使多次调用也没有关系
11
- * @param url
12
- * @param headers
13
- * @param onMessage
14
- * @param enabled /// 可以控制,比如未登录的情况下不要订阅
15
- * @return {status} 状态
16
- */
17
9
  export declare function useSSE({ url, headers, onMessage, enabled, }: UseSSEParams): {
18
10
  status: SSEStatus;
19
11
  };
@@ -1 +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"}
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,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;;EA0CrC"}
@@ -1,36 +1,38 @@
1
- import { useEffect, useRef, useState } from 'react';
1
+ import { useEffect, useRef, useState } from "react";
2
2
  import { SSEStatus } from "./SSEStatus";
3
3
  import { sseRegistry } from "./SSERegistry";
4
4
  import { SSEManager } from "./SSEManager";
5
- /**
6
- * 内部会复用链接,无需关心实现,即使多次调用也没有关系
7
- * @param url
8
- * @param headers
9
- * @param onMessage
10
- * @param enabled /// 可以控制,比如未登录的情况下不要订阅
11
- * @return {status} 状态
12
- */
13
5
  export function useSSE({ url, headers, onMessage, enabled = true, }) {
14
- // 保证回调不因 render 变化导致重复订阅
15
6
  const callbackRef = useRef(onMessage);
16
7
  callbackRef.current = onMessage;
17
8
  const [status, setStatus] = useState(SSEStatus.idle);
18
9
  useEffect(() => {
19
- if (!url || !enabled)
10
+ if (!enabled)
20
11
  return;
21
- const manager = sseRegistry.getOrCreate(url, () => {
22
- return new SSEManager(url, headers || {});
23
- });
24
- const unsubscribe = manager.subscribe((event) => {
25
- callbackRef.current(event);
26
- });
27
- const stateUnsubscribe = manager.subscribeStatus((status) => {
28
- setStatus(status);
29
- });
12
+ let canceled = false; // 用于处理 cleanup
13
+ let manager = null;
14
+ let unsubscribe = null;
15
+ let stateUnsubscribe = null;
16
+ async function setupSSE() {
17
+ // 先解析异步 url 和 headers
18
+ const resolvedUrl = typeof url === "function" || url instanceof Promise ? await url : url;
19
+ if (!resolvedUrl)
20
+ return;
21
+ const resolvedHeaders = headers instanceof Promise ? await headers : headers || {};
22
+ if (canceled)
23
+ return; // 组件卸载或依赖变化时直接返回
24
+ manager = sseRegistry.getOrCreate(resolvedUrl, () => new SSEManager(resolvedUrl, resolvedHeaders));
25
+ unsubscribe = manager.subscribe((event) => {
26
+ callbackRef.current(event);
27
+ });
28
+ stateUnsubscribe = manager.subscribeStatus((s) => setStatus(s));
29
+ }
30
+ setupSSE().catch(console.error);
30
31
  return () => {
31
- stateUnsubscribe();
32
- unsubscribe();
32
+ canceled = true;
33
+ unsubscribe === null || unsubscribe === void 0 ? void 0 : unsubscribe();
34
+ stateUnsubscribe === null || stateUnsubscribe === void 0 ? void 0 : stateUnsubscribe();
33
35
  };
34
- }, [url, enabled]);
36
+ }, [url, headers, enabled]);
35
37
  return { status };
36
38
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xxf_react",
3
- "version": "0.1.3",
3
+ "version": "0.1.4",
4
4
  "private": false,
5
5
 
6
6
  "type": "module",