@unif/react-native-chat-sdk 0.2.3 → 0.2.5
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.
- package/lib/commonjs/hooks/useXChat.js +31 -1
- package/lib/commonjs/hooks/useXChat.js.map +1 -1
- package/lib/commonjs/tools/XRequest.js +18 -0
- package/lib/commonjs/tools/XRequest.js.map +1 -1
- package/lib/commonjs/tools/XStream.js +31 -4
- package/lib/commonjs/tools/XStream.js.map +1 -1
- package/lib/module/hooks/useXChat.js +31 -1
- package/lib/module/hooks/useXChat.js.map +1 -1
- package/lib/module/tools/XRequest.js +18 -0
- package/lib/module/tools/XRequest.js.map +1 -1
- package/lib/module/tools/XStream.js +31 -4
- package/lib/module/tools/XStream.js.map +1 -1
- package/lib/typescript/commonjs/hooks/useXChat.d.ts.map +1 -1
- package/lib/typescript/commonjs/tools/XRequest.d.ts.map +1 -1
- package/lib/typescript/commonjs/tools/XStream.d.ts +2 -0
- package/lib/typescript/commonjs/tools/XStream.d.ts.map +1 -1
- package/lib/typescript/commonjs/types/sse.d.ts +6 -2
- package/lib/typescript/commonjs/types/sse.d.ts.map +1 -1
- package/lib/typescript/module/hooks/useXChat.d.ts.map +1 -1
- package/lib/typescript/module/tools/XRequest.d.ts.map +1 -1
- package/lib/typescript/module/tools/XStream.d.ts +2 -0
- package/lib/typescript/module/tools/XStream.d.ts.map +1 -1
- package/lib/typescript/module/types/sse.d.ts +6 -2
- package/lib/typescript/module/types/sse.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/hooks/useXChat.ts +54 -29
- package/src/tools/XRequest.ts +35 -5
- package/src/tools/XStream.ts +47 -11
- package/src/types/sse.ts +9 -2
|
@@ -28,12 +28,35 @@ function useXChat(config) {
|
|
|
28
28
|
store.getState().setError(null);
|
|
29
29
|
store.getState().setSuggestions([]);
|
|
30
30
|
const localMessage = provider.transformLocalMessage(input);
|
|
31
|
-
|
|
31
|
+
const localChatMessage = localMessage;
|
|
32
|
+
store.getState().addMessage(localChatMessage);
|
|
33
|
+
|
|
34
|
+
// 注入 loading 占位消息（显示"正在思考"动画）
|
|
35
|
+
const loadingMessageId = `loading-${localChatMessage.id}`;
|
|
36
|
+
const loadingMessage = {
|
|
37
|
+
id: loadingMessageId,
|
|
38
|
+
text: '',
|
|
39
|
+
role: 'assistant',
|
|
40
|
+
createdAt: new Date(),
|
|
41
|
+
messageType: 'text',
|
|
42
|
+
status: 'loading',
|
|
43
|
+
turnId: localChatMessage.turnId
|
|
44
|
+
};
|
|
45
|
+
store.getState().addMessage(loadingMessage);
|
|
46
|
+
let loadingRemoved = false;
|
|
47
|
+
const removeLoading = () => {
|
|
48
|
+
if (!loadingRemoved) {
|
|
49
|
+
loadingRemoved = true;
|
|
50
|
+
store.getState().removeMessage(loadingMessageId);
|
|
51
|
+
}
|
|
52
|
+
};
|
|
32
53
|
provider.sendMessage(input, {
|
|
33
54
|
onUpdate: message => {
|
|
55
|
+
removeLoading();
|
|
34
56
|
store.getState().upsertMessage(message);
|
|
35
57
|
},
|
|
36
58
|
onSuccess: message => {
|
|
59
|
+
removeLoading();
|
|
37
60
|
const m = message;
|
|
38
61
|
store.getState().upsertMessage({
|
|
39
62
|
...m,
|
|
@@ -42,6 +65,7 @@ function useXChat(config) {
|
|
|
42
65
|
store.getState().setRequesting(false);
|
|
43
66
|
},
|
|
44
67
|
onError: error => {
|
|
68
|
+
removeLoading();
|
|
45
69
|
store.getState().setError(error.message);
|
|
46
70
|
store.getState().setRequesting(false);
|
|
47
71
|
if (config.requestFallback) {
|
|
@@ -58,6 +82,12 @@ function useXChat(config) {
|
|
|
58
82
|
}, [provider, store, config]);
|
|
59
83
|
const abort = (0, _react.useCallback)(() => {
|
|
60
84
|
provider.abort();
|
|
85
|
+
// 清理可能存在的 loading 占位消息
|
|
86
|
+
const msgs = store.getState().messages;
|
|
87
|
+
const loadingMsg = msgs.find(m => m.status === 'loading');
|
|
88
|
+
if (loadingMsg) {
|
|
89
|
+
store.getState().removeMessage(loadingMsg.id);
|
|
90
|
+
}
|
|
61
91
|
store.getState().setRequesting(false);
|
|
62
92
|
}, [provider, store]);
|
|
63
93
|
const resetChat = (0, _react.useCallback)(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_chatStore","useXChat","config","provider","storeRef","useRef","createChatStore","store","current","state","useSyncExternalStore","subscribe","getState","onRequest","useCallback","input","s","isRequesting","setRequesting","setError","setSuggestions","localMessage","transformLocalMessage","addMessage","sendMessage","onUpdate","message","upsertMessage","onSuccess","m","
|
|
1
|
+
{"version":3,"names":["_react","require","_chatStore","useXChat","config","provider","storeRef","useRef","createChatStore","store","current","state","useSyncExternalStore","subscribe","getState","onRequest","useCallback","input","s","isRequesting","setRequesting","setError","setSuggestions","localMessage","transformLocalMessage","localChatMessage","addMessage","loadingMessageId","id","loadingMessage","text","role","createdAt","Date","messageType","status","turnId","loadingRemoved","removeLoading","removeMessage","sendMessage","onUpdate","message","upsertMessage","onSuccess","m","onError","error","requestFallback","fallbackMsg","onSuggestion","items","abort","msgs","messages","loadingMsg","find","resetChat","loadSession","clearError","onReload","targetIdx","findIndex","setMessages","messagesOrFn","currentInfos","map","extra","next","info","setMessage","partialOrFn","partial","updated","undefined","Object","assign","useEffect","requesting","suggestions"],"sourceRoot":"../../../src","sources":["hooks/useXChat.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -12,6 +12,7 @@ var _SSEParser = require("./SSEParser");
|
|
|
12
12
|
* 组合 XStream + SSEParser 实现完整 SSE 请求链路
|
|
13
13
|
*/
|
|
14
14
|
|
|
15
|
+
const TAG = '[XRequest]';
|
|
15
16
|
class XRequest {
|
|
16
17
|
stream = null;
|
|
17
18
|
parser = new _SSEParser.SSEParser();
|
|
@@ -44,6 +45,7 @@ class XRequest {
|
|
|
44
45
|
}
|
|
45
46
|
}
|
|
46
47
|
const url = `${baseURL}${endpoint}`;
|
|
48
|
+
console.log(TAG, '发起请求', url);
|
|
47
49
|
this.stream = new _XStream.XStream({
|
|
48
50
|
url,
|
|
49
51
|
method: 'POST',
|
|
@@ -51,11 +53,25 @@ class XRequest {
|
|
|
51
53
|
body: params,
|
|
52
54
|
timeout
|
|
53
55
|
});
|
|
56
|
+
let eventCount = 0;
|
|
57
|
+
let heartbeatCount = 0;
|
|
54
58
|
this.stream.connect({
|
|
55
59
|
onMessage: output => {
|
|
56
60
|
// 通过 SSEParser 进行幂等去重和排序
|
|
57
61
|
const envelopes = this.parser.process(output.data);
|
|
58
62
|
for (const envelope of envelopes) {
|
|
63
|
+
// 心跳事件仅用于保持连接，不传给 UI
|
|
64
|
+
if (envelope.type === 'heartbeat') {
|
|
65
|
+
heartbeatCount++;
|
|
66
|
+
if (heartbeatCount <= 3 || heartbeatCount % 10 === 0) {
|
|
67
|
+
console.log(TAG, `heartbeat #${heartbeatCount}`);
|
|
68
|
+
}
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
eventCount++;
|
|
72
|
+
if (eventCount <= 3 || eventCount % 20 === 0) {
|
|
73
|
+
console.log(TAG, `event #${eventCount} type=${envelope.type} seq=${envelope.seq}`);
|
|
74
|
+
}
|
|
59
75
|
callbacks.onStream?.({
|
|
60
76
|
data: JSON.stringify(envelope),
|
|
61
77
|
event: envelope.type
|
|
@@ -63,12 +79,14 @@ class XRequest {
|
|
|
63
79
|
}
|
|
64
80
|
},
|
|
65
81
|
onError: error => {
|
|
82
|
+
console.error(TAG, `错误 events=${eventCount} heartbeats=${heartbeatCount}`, error.message);
|
|
66
83
|
callbacks.onError?.({
|
|
67
84
|
type: 'stream_error',
|
|
68
85
|
message: error.message
|
|
69
86
|
});
|
|
70
87
|
},
|
|
71
88
|
onComplete: () => {
|
|
89
|
+
console.log(TAG, `完成 events=${eventCount} heartbeats=${heartbeatCount}`);
|
|
72
90
|
callbacks.onSuccess?.('');
|
|
73
91
|
}
|
|
74
92
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_XStream","require","_SSEParser","XRequest","stream","parser","SSEParser","constructor","config","create","params","callbacks","abort","reset","baseURL","endpoint","headers","timeout","getToken","reqHeaders","token","url","XStream","method","body","connect","onMessage","output","envelopes","process","data","envelope","onStream","JSON","stringify","event","
|
|
1
|
+
{"version":3,"names":["_XStream","require","_SSEParser","TAG","XRequest","stream","parser","SSEParser","constructor","config","create","params","callbacks","abort","reset","baseURL","endpoint","headers","timeout","getToken","reqHeaders","token","url","console","log","XStream","method","body","eventCount","heartbeatCount","connect","onMessage","output","envelopes","process","data","envelope","type","seq","onStream","JSON","stringify","event","onError","error","message","onComplete","onSuccess","dispose","exports"],"sourceRoot":"../../../src","sources":["tools/XRequest.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -10,6 +10,7 @@ exports.XStream = void 0;
|
|
|
10
10
|
* 基于 react-native-sse 封装，支持 POST 方法 + 自定义请求体
|
|
11
11
|
*/
|
|
12
12
|
|
|
13
|
+
const TAG = '[XStream]';
|
|
13
14
|
const defaultTransform = event => ({
|
|
14
15
|
data: event.data,
|
|
15
16
|
event: event.event
|
|
@@ -17,11 +18,15 @@ const defaultTransform = event => ({
|
|
|
17
18
|
class XStream {
|
|
18
19
|
es = null;
|
|
19
20
|
timeoutTimer = null;
|
|
21
|
+
msgCount = 0;
|
|
22
|
+
connectTime = 0;
|
|
20
23
|
constructor(config) {
|
|
21
24
|
this.config = config;
|
|
22
25
|
}
|
|
23
26
|
connect(callbacks) {
|
|
24
27
|
this.abort();
|
|
28
|
+
this.msgCount = 0;
|
|
29
|
+
this.connectTime = Date.now();
|
|
25
30
|
const {
|
|
26
31
|
url,
|
|
27
32
|
method = 'POST',
|
|
@@ -30,6 +35,7 @@ class XStream {
|
|
|
30
35
|
timeout = 120000,
|
|
31
36
|
transformStream = defaultTransform
|
|
32
37
|
} = this.config;
|
|
38
|
+
console.log(TAG, '连接', url, `timeout=${timeout}ms`);
|
|
33
39
|
|
|
34
40
|
// react-native-sse 动态 require，避免非 RN 环境报错
|
|
35
41
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
@@ -43,15 +49,30 @@ class XStream {
|
|
|
43
49
|
body: body ? JSON.stringify(body) : undefined
|
|
44
50
|
});
|
|
45
51
|
this.es = es;
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
52
|
+
|
|
53
|
+
// read timeout：每次收到数据后重置，连续 timeout 毫秒无数据才超时
|
|
54
|
+
const resetTimeout = () => {
|
|
55
|
+
this.clearTimer();
|
|
56
|
+
this.timeoutTimer = setTimeout(() => {
|
|
57
|
+
const elapsed = ((Date.now() - this.connectTime) / 1000).toFixed(1);
|
|
58
|
+
console.warn(TAG, `读取超时 msgs=${this.msgCount} elapsed=${elapsed}s`);
|
|
59
|
+
this.abort();
|
|
60
|
+
callbacks.onError?.(new Error('SSE 读取超时'));
|
|
61
|
+
}, timeout);
|
|
62
|
+
};
|
|
63
|
+
resetTimeout();
|
|
50
64
|
es.addEventListener('open', () => {
|
|
65
|
+
console.log(TAG, '连接已建立');
|
|
66
|
+
resetTimeout();
|
|
51
67
|
callbacks.onOpen?.();
|
|
52
68
|
});
|
|
53
69
|
es.addEventListener('message', event => {
|
|
70
|
+
resetTimeout();
|
|
54
71
|
if (event.data) {
|
|
72
|
+
this.msgCount++;
|
|
73
|
+
if (this.msgCount <= 3 || this.msgCount % 20 === 0) {
|
|
74
|
+
console.log(TAG, `message #${this.msgCount} len=${event.data.length}`);
|
|
75
|
+
}
|
|
55
76
|
const output = transformStream({
|
|
56
77
|
data: event.data
|
|
57
78
|
});
|
|
@@ -59,11 +80,17 @@ class XStream {
|
|
|
59
80
|
}
|
|
60
81
|
});
|
|
61
82
|
es.addEventListener('error', event => {
|
|
83
|
+
const elapsed = ((Date.now() - this.connectTime) / 1000).toFixed(1);
|
|
84
|
+
console.error(TAG, `错误 msgs=${this.msgCount} elapsed=${elapsed}s`, event.message);
|
|
62
85
|
this.clearTimer();
|
|
63
86
|
callbacks.onError?.(new Error(event.message || 'SSE 连接错误'));
|
|
64
87
|
});
|
|
65
88
|
}
|
|
66
89
|
abort() {
|
|
90
|
+
if (this.es) {
|
|
91
|
+
const elapsed = ((Date.now() - this.connectTime) / 1000).toFixed(1);
|
|
92
|
+
console.log(TAG, `断开 msgs=${this.msgCount} elapsed=${elapsed}s`);
|
|
93
|
+
}
|
|
67
94
|
this.clearTimer();
|
|
68
95
|
if (this.es) {
|
|
69
96
|
this.es.close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["defaultTransform","event","data","XStream","es","timeoutTimer","constructor","config","connect","callbacks","abort","url","method","headers","body","timeout","transformStream","RNEventSource","require","default","JSON","stringify","undefined","setTimeout","onError","Error","addEventListener","onOpen","output","onMessage","
|
|
1
|
+
{"version":3,"names":["TAG","defaultTransform","event","data","XStream","es","timeoutTimer","msgCount","connectTime","constructor","config","connect","callbacks","abort","Date","now","url","method","headers","body","timeout","transformStream","console","log","RNEventSource","require","default","JSON","stringify","undefined","resetTimeout","clearTimer","setTimeout","elapsed","toFixed","warn","onError","Error","addEventListener","onOpen","length","output","onMessage","error","message","close","dispose","clearTimeout","exports"],"sourceRoot":"../../../src","sources":["tools/XStream.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;;AAKA,MAAMA,GAAG,GAAG,WAAW;AAkBvB,MAAMC,gBAAgB,GAAIC,KAGzB,KAAiB;EAChBC,IAAI,EAAED,KAAK,CAACC,IAAI;EAChBD,KAAK,EAAEA,KAAK,CAACA;AACf,CAAC,CAAC;AAEK,MAAME,OAAO,CAAC;EAEXC,EAAE,GAAuB,IAAI;EAC7BC,YAAY,GAAyC,IAAI;EACzDC,QAAQ,GAAG,CAAC;EACZC,WAAW,GAAG,CAAC;EAEvBC,WAAWA,CAACC,MAAqB,EAAE;IACjC,IAAI,CAACA,MAAM,GAAGA,MAAM;EACtB;EAEAC,OAAOA,CAACC,SAA2B,EAAQ;IACzC,IAAI,CAACC,KAAK,CAAC,CAAC;IACZ,IAAI,CAACN,QAAQ,GAAG,CAAC;IACjB,IAAI,CAACC,WAAW,GAAGM,IAAI,CAACC,GAAG,CAAC,CAAC;IAE7B,MAAM;MACJC,GAAG;MACHC,MAAM,GAAG,MAAM;MACfC,OAAO;MACPC,IAAI;MACJC,OAAO,GAAG,MAAM;MAChBC,eAAe,GAAGpB;IACpB,CAAC,GAAG,IAAI,CAACS,MAAM;IAEfY,OAAO,CAACC,GAAG,CAACvB,GAAG,EAAE,IAAI,EAAEgB,GAAG,EAAE,WAAWI,OAAO,IAAI,CAAC;;IAEnD;IACA;IACA,MAAMI,aAAa,GAAGC,OAAO,CAAC,kBAAkB,CAAC,CAACC,OAAO;IAEzD,MAAMrB,EAAE,GAAG,IAAImB,aAAa,CAACR,GAAG,EAAE;MAChCC,MAAM;MACNC,OAAO,EAAE;QACP,cAAc,EAAE,kBAAkB;QAClC,GAAGA;MACL,CAAC;MACDC,IAAI,EAAEA,IAAI,GAAGQ,IAAI,CAACC,SAAS,CAACT,IAAI,CAAC,GAAGU;IACtC,CAAC,CAAC;IAEF,IAAI,CAACxB,EAAE,GAAGA,EAAE;;IAEZ;IACA,MAAMyB,YAAY,GAAGA,CAAA,KAAM;MACzB,IAAI,CAACC,UAAU,CAAC,CAAC;MACjB,IAAI,CAACzB,YAAY,GAAG0B,UAAU,CAAC,MAAM;QACnC,MAAMC,OAAO,GAAG,CAAC,CAACnB,IAAI,CAACC,GAAG,CAAC,CAAC,GAAG,IAAI,CAACP,WAAW,IAAI,IAAI,EAAE0B,OAAO,CAAC,CAAC,CAAC;QACnEZ,OAAO,CAACa,IAAI,CAACnC,GAAG,EAAE,aAAa,IAAI,CAACO,QAAQ,YAAY0B,OAAO,GAAG,CAAC;QACnE,IAAI,CAACpB,KAAK,CAAC,CAAC;QACZD,SAAS,CAACwB,OAAO,GAAG,IAAIC,KAAK,CAAC,UAAU,CAAC,CAAC;MAC5C,CAAC,EAAEjB,OAAO,CAAC;IACb,CAAC;IACDU,YAAY,CAAC,CAAC;IAEdzB,EAAE,CAACiC,gBAAgB,CAAC,MAAM,EAAE,MAAM;MAChChB,OAAO,CAACC,GAAG,CAACvB,GAAG,EAAE,OAAO,CAAC;MACzB8B,YAAY,CAAC,CAAC;MACdlB,SAAS,CAAC2B,MAAM,GAAG,CAAC;IACtB,CAAC,CAAC;IAEFlC,EAAE,CAACiC,gBAAgB,CAAC,SAAS,EAAGpC,KAAwB,IAAK;MAC3D4B,YAAY,CAAC,CAAC;MACd,IAAI5B,KAAK,CAACC,IAAI,EAAE;QACd,IAAI,CAACI,QAAQ,EAAE;QACf,IAAI,IAAI,CAACA,QAAQ,IAAI,CAAC,IAAI,IAAI,CAACA,QAAQ,GAAG,EAAE,KAAK,CAAC,EAAE;UAClDe,OAAO,CAACC,GAAG,CACTvB,GAAG,EACH,YAAY,IAAI,CAACO,QAAQ,QAAQL,KAAK,CAACC,IAAI,CAACqC,MAAM,EACpD,CAAC;QACH;QACA,MAAMC,MAAM,GAAGpB,eAAe,CAAC;UAAElB,IAAI,EAAED,KAAK,CAACC;QAAK,CAAC,CAAC;QACpDS,SAAS,CAAC8B,SAAS,CAACD,MAAM,CAAC;MAC7B;IACF,CAAC,CAAC;IAEFpC,EAAE,CAACiC,gBAAgB,CACjB,OAAO,EACNpC,KAA0C,IAAK;MAC9C,MAAM+B,OAAO,GAAG,CAAC,CAACnB,IAAI,CAACC,GAAG,CAAC,CAAC,GAAG,IAAI,CAACP,WAAW,IAAI,IAAI,EAAE0B,OAAO,CAAC,CAAC,CAAC;MACnEZ,OAAO,CAACqB,KAAK,CACX3C,GAAG,EACH,WAAW,IAAI,CAACO,QAAQ,YAAY0B,OAAO,GAAG,EAC9C/B,KAAK,CAAC0C,OACR,CAAC;MACD,IAAI,CAACb,UAAU,CAAC,CAAC;MACjBnB,SAAS,CAACwB,OAAO,GAAG,IAAIC,KAAK,CAACnC,KAAK,CAAC0C,OAAO,IAAI,UAAU,CAAC,CAAC;IAC7D,CACF,CAAC;EACH;EAEA/B,KAAKA,CAAA,EAAS;IACZ,IAAI,IAAI,CAACR,EAAE,EAAE;MACX,MAAM4B,OAAO,GAAG,CAAC,CAACnB,IAAI,CAACC,GAAG,CAAC,CAAC,GAAG,IAAI,CAACP,WAAW,IAAI,IAAI,EAAE0B,OAAO,CAAC,CAAC,CAAC;MACnEZ,OAAO,CAACC,GAAG,CAACvB,GAAG,EAAE,WAAW,IAAI,CAACO,QAAQ,YAAY0B,OAAO,GAAG,CAAC;IAClE;IACA,IAAI,CAACF,UAAU,CAAC,CAAC;IACjB,IAAI,IAAI,CAAC1B,EAAE,EAAE;MACX,IAAI,CAACA,EAAE,CAACwC,KAAK,CAAC,CAAC;MACf,IAAI,CAACxC,EAAE,GAAG,IAAI;IAChB;EACF;EAEAyC,OAAOA,CAAA,EAAS;IACd,IAAI,CAACjC,KAAK,CAAC,CAAC;EACd;EAEQkB,UAAUA,CAAA,EAAS;IACzB,IAAI,IAAI,CAACzB,YAAY,EAAE;MACrByC,YAAY,CAAC,IAAI,CAACzC,YAAY,CAAC;MAC/B,IAAI,CAACA,YAAY,GAAG,IAAI;IAC1B;EACF;AACF;AAAC0C,OAAA,CAAA5C,OAAA,GAAAA,OAAA","ignoreList":[]}
|
|
@@ -24,12 +24,35 @@ export function useXChat(config) {
|
|
|
24
24
|
store.getState().setError(null);
|
|
25
25
|
store.getState().setSuggestions([]);
|
|
26
26
|
const localMessage = provider.transformLocalMessage(input);
|
|
27
|
-
|
|
27
|
+
const localChatMessage = localMessage;
|
|
28
|
+
store.getState().addMessage(localChatMessage);
|
|
29
|
+
|
|
30
|
+
// 注入 loading 占位消息（显示"正在思考"动画）
|
|
31
|
+
const loadingMessageId = `loading-${localChatMessage.id}`;
|
|
32
|
+
const loadingMessage = {
|
|
33
|
+
id: loadingMessageId,
|
|
34
|
+
text: '',
|
|
35
|
+
role: 'assistant',
|
|
36
|
+
createdAt: new Date(),
|
|
37
|
+
messageType: 'text',
|
|
38
|
+
status: 'loading',
|
|
39
|
+
turnId: localChatMessage.turnId
|
|
40
|
+
};
|
|
41
|
+
store.getState().addMessage(loadingMessage);
|
|
42
|
+
let loadingRemoved = false;
|
|
43
|
+
const removeLoading = () => {
|
|
44
|
+
if (!loadingRemoved) {
|
|
45
|
+
loadingRemoved = true;
|
|
46
|
+
store.getState().removeMessage(loadingMessageId);
|
|
47
|
+
}
|
|
48
|
+
};
|
|
28
49
|
provider.sendMessage(input, {
|
|
29
50
|
onUpdate: message => {
|
|
51
|
+
removeLoading();
|
|
30
52
|
store.getState().upsertMessage(message);
|
|
31
53
|
},
|
|
32
54
|
onSuccess: message => {
|
|
55
|
+
removeLoading();
|
|
33
56
|
const m = message;
|
|
34
57
|
store.getState().upsertMessage({
|
|
35
58
|
...m,
|
|
@@ -38,6 +61,7 @@ export function useXChat(config) {
|
|
|
38
61
|
store.getState().setRequesting(false);
|
|
39
62
|
},
|
|
40
63
|
onError: error => {
|
|
64
|
+
removeLoading();
|
|
41
65
|
store.getState().setError(error.message);
|
|
42
66
|
store.getState().setRequesting(false);
|
|
43
67
|
if (config.requestFallback) {
|
|
@@ -54,6 +78,12 @@ export function useXChat(config) {
|
|
|
54
78
|
}, [provider, store, config]);
|
|
55
79
|
const abort = useCallback(() => {
|
|
56
80
|
provider.abort();
|
|
81
|
+
// 清理可能存在的 loading 占位消息
|
|
82
|
+
const msgs = store.getState().messages;
|
|
83
|
+
const loadingMsg = msgs.find(m => m.status === 'loading');
|
|
84
|
+
if (loadingMsg) {
|
|
85
|
+
store.getState().removeMessage(loadingMsg.id);
|
|
86
|
+
}
|
|
57
87
|
store.getState().setRequesting(false);
|
|
58
88
|
}, [provider, store]);
|
|
59
89
|
const resetChat = useCallback(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useEffect","useRef","useSyncExternalStore","createChatStore","useXChat","config","provider","storeRef","store","current","state","subscribe","getState","onRequest","input","s","isRequesting","setRequesting","setError","setSuggestions","localMessage","transformLocalMessage","addMessage","sendMessage","onUpdate","message","upsertMessage","onSuccess","m","
|
|
1
|
+
{"version":3,"names":["useCallback","useEffect","useRef","useSyncExternalStore","createChatStore","useXChat","config","provider","storeRef","store","current","state","subscribe","getState","onRequest","input","s","isRequesting","setRequesting","setError","setSuggestions","localMessage","transformLocalMessage","localChatMessage","addMessage","loadingMessageId","id","loadingMessage","text","role","createdAt","Date","messageType","status","turnId","loadingRemoved","removeLoading","removeMessage","sendMessage","onUpdate","message","upsertMessage","onSuccess","m","onError","error","requestFallback","fallbackMsg","onSuggestion","items","abort","msgs","messages","loadingMsg","find","resetChat","loadSession","clearError","onReload","targetIdx","findIndex","setMessages","messagesOrFn","currentInfos","map","extra","next","info","setMessage","partialOrFn","partial","updated","undefined","Object","assign","requesting","suggestions"],"sourceRoot":"../../../src","sources":["hooks/useXChat.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
|
|
9
9
|
import { XStream } from "./XStream.js";
|
|
10
10
|
import { SSEParser } from "./SSEParser.js";
|
|
11
|
+
const TAG = '[XRequest]';
|
|
11
12
|
export class XRequest {
|
|
12
13
|
stream = null;
|
|
13
14
|
parser = new SSEParser();
|
|
@@ -40,6 +41,7 @@ export class XRequest {
|
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
43
|
const url = `${baseURL}${endpoint}`;
|
|
44
|
+
console.log(TAG, '发起请求', url);
|
|
43
45
|
this.stream = new XStream({
|
|
44
46
|
url,
|
|
45
47
|
method: 'POST',
|
|
@@ -47,11 +49,25 @@ export class XRequest {
|
|
|
47
49
|
body: params,
|
|
48
50
|
timeout
|
|
49
51
|
});
|
|
52
|
+
let eventCount = 0;
|
|
53
|
+
let heartbeatCount = 0;
|
|
50
54
|
this.stream.connect({
|
|
51
55
|
onMessage: output => {
|
|
52
56
|
// 通过 SSEParser 进行幂等去重和排序
|
|
53
57
|
const envelopes = this.parser.process(output.data);
|
|
54
58
|
for (const envelope of envelopes) {
|
|
59
|
+
// 心跳事件仅用于保持连接，不传给 UI
|
|
60
|
+
if (envelope.type === 'heartbeat') {
|
|
61
|
+
heartbeatCount++;
|
|
62
|
+
if (heartbeatCount <= 3 || heartbeatCount % 10 === 0) {
|
|
63
|
+
console.log(TAG, `heartbeat #${heartbeatCount}`);
|
|
64
|
+
}
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
eventCount++;
|
|
68
|
+
if (eventCount <= 3 || eventCount % 20 === 0) {
|
|
69
|
+
console.log(TAG, `event #${eventCount} type=${envelope.type} seq=${envelope.seq}`);
|
|
70
|
+
}
|
|
55
71
|
callbacks.onStream?.({
|
|
56
72
|
data: JSON.stringify(envelope),
|
|
57
73
|
event: envelope.type
|
|
@@ -59,12 +75,14 @@ export class XRequest {
|
|
|
59
75
|
}
|
|
60
76
|
},
|
|
61
77
|
onError: error => {
|
|
78
|
+
console.error(TAG, `错误 events=${eventCount} heartbeats=${heartbeatCount}`, error.message);
|
|
62
79
|
callbacks.onError?.({
|
|
63
80
|
type: 'stream_error',
|
|
64
81
|
message: error.message
|
|
65
82
|
});
|
|
66
83
|
},
|
|
67
84
|
onComplete: () => {
|
|
85
|
+
console.log(TAG, `完成 events=${eventCount} heartbeats=${heartbeatCount}`);
|
|
68
86
|
callbacks.onSuccess?.('');
|
|
69
87
|
}
|
|
70
88
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["XStream","SSEParser","XRequest","stream","parser","constructor","config","create","params","callbacks","abort","reset","baseURL","endpoint","headers","timeout","getToken","reqHeaders","token","url","method","body","connect","onMessage","output","envelopes","process","data","envelope","onStream","JSON","stringify","event","
|
|
1
|
+
{"version":3,"names":["XStream","SSEParser","TAG","XRequest","stream","parser","constructor","config","create","params","callbacks","abort","reset","baseURL","endpoint","headers","timeout","getToken","reqHeaders","token","url","console","log","method","body","eventCount","heartbeatCount","connect","onMessage","output","envelopes","process","data","envelope","type","seq","onStream","JSON","stringify","event","onError","error","message","onComplete","onSuccess","dispose"],"sourceRoot":"../../../src","sources":["tools/XRequest.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* 基于 react-native-sse 封装，支持 POST 方法 + 自定义请求体
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
|
+
const TAG = '[XStream]';
|
|
9
10
|
const defaultTransform = event => ({
|
|
10
11
|
data: event.data,
|
|
11
12
|
event: event.event
|
|
@@ -13,11 +14,15 @@ const defaultTransform = event => ({
|
|
|
13
14
|
export class XStream {
|
|
14
15
|
es = null;
|
|
15
16
|
timeoutTimer = null;
|
|
17
|
+
msgCount = 0;
|
|
18
|
+
connectTime = 0;
|
|
16
19
|
constructor(config) {
|
|
17
20
|
this.config = config;
|
|
18
21
|
}
|
|
19
22
|
connect(callbacks) {
|
|
20
23
|
this.abort();
|
|
24
|
+
this.msgCount = 0;
|
|
25
|
+
this.connectTime = Date.now();
|
|
21
26
|
const {
|
|
22
27
|
url,
|
|
23
28
|
method = 'POST',
|
|
@@ -26,6 +31,7 @@ export class XStream {
|
|
|
26
31
|
timeout = 120000,
|
|
27
32
|
transformStream = defaultTransform
|
|
28
33
|
} = this.config;
|
|
34
|
+
console.log(TAG, '连接', url, `timeout=${timeout}ms`);
|
|
29
35
|
|
|
30
36
|
// react-native-sse 动态 require，避免非 RN 环境报错
|
|
31
37
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
@@ -39,15 +45,30 @@ export class XStream {
|
|
|
39
45
|
body: body ? JSON.stringify(body) : undefined
|
|
40
46
|
});
|
|
41
47
|
this.es = es;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
48
|
+
|
|
49
|
+
// read timeout：每次收到数据后重置，连续 timeout 毫秒无数据才超时
|
|
50
|
+
const resetTimeout = () => {
|
|
51
|
+
this.clearTimer();
|
|
52
|
+
this.timeoutTimer = setTimeout(() => {
|
|
53
|
+
const elapsed = ((Date.now() - this.connectTime) / 1000).toFixed(1);
|
|
54
|
+
console.warn(TAG, `读取超时 msgs=${this.msgCount} elapsed=${elapsed}s`);
|
|
55
|
+
this.abort();
|
|
56
|
+
callbacks.onError?.(new Error('SSE 读取超时'));
|
|
57
|
+
}, timeout);
|
|
58
|
+
};
|
|
59
|
+
resetTimeout();
|
|
46
60
|
es.addEventListener('open', () => {
|
|
61
|
+
console.log(TAG, '连接已建立');
|
|
62
|
+
resetTimeout();
|
|
47
63
|
callbacks.onOpen?.();
|
|
48
64
|
});
|
|
49
65
|
es.addEventListener('message', event => {
|
|
66
|
+
resetTimeout();
|
|
50
67
|
if (event.data) {
|
|
68
|
+
this.msgCount++;
|
|
69
|
+
if (this.msgCount <= 3 || this.msgCount % 20 === 0) {
|
|
70
|
+
console.log(TAG, `message #${this.msgCount} len=${event.data.length}`);
|
|
71
|
+
}
|
|
51
72
|
const output = transformStream({
|
|
52
73
|
data: event.data
|
|
53
74
|
});
|
|
@@ -55,11 +76,17 @@ export class XStream {
|
|
|
55
76
|
}
|
|
56
77
|
});
|
|
57
78
|
es.addEventListener('error', event => {
|
|
79
|
+
const elapsed = ((Date.now() - this.connectTime) / 1000).toFixed(1);
|
|
80
|
+
console.error(TAG, `错误 msgs=${this.msgCount} elapsed=${elapsed}s`, event.message);
|
|
58
81
|
this.clearTimer();
|
|
59
82
|
callbacks.onError?.(new Error(event.message || 'SSE 连接错误'));
|
|
60
83
|
});
|
|
61
84
|
}
|
|
62
85
|
abort() {
|
|
86
|
+
if (this.es) {
|
|
87
|
+
const elapsed = ((Date.now() - this.connectTime) / 1000).toFixed(1);
|
|
88
|
+
console.log(TAG, `断开 msgs=${this.msgCount} elapsed=${elapsed}s`);
|
|
89
|
+
}
|
|
63
90
|
this.clearTimer();
|
|
64
91
|
if (this.es) {
|
|
65
92
|
this.es.close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["defaultTransform","event","data","XStream","es","timeoutTimer","constructor","config","connect","callbacks","abort","url","method","headers","body","timeout","transformStream","RNEventSource","require","default","JSON","stringify","undefined","setTimeout","onError","Error","addEventListener","onOpen","output","onMessage","
|
|
1
|
+
{"version":3,"names":["TAG","defaultTransform","event","data","XStream","es","timeoutTimer","msgCount","connectTime","constructor","config","connect","callbacks","abort","Date","now","url","method","headers","body","timeout","transformStream","console","log","RNEventSource","require","default","JSON","stringify","undefined","resetTimeout","clearTimer","setTimeout","elapsed","toFixed","warn","onError","Error","addEventListener","onOpen","length","output","onMessage","error","message","close","dispose","clearTimeout"],"sourceRoot":"../../../src","sources":["tools/XStream.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useXChat.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useXChat.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"useXChat.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useXChat.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,WAAW,WAAW,CAAC,OAAO,GAAG,WAAW;IAChD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,cAAc,CAC7B,OAAO,GAAG,WAAW,EACrB,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,EAC9B,MAAM,GAAG,SAAS;IAElB,QAAQ,EAAE,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACvD,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;IAC/C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,KAAK,OAAO,CAAC;IACpE,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc,CAC7B,OAAO,GAAG,WAAW,EACrB,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC;IAE9B,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAClC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7C,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAC/C,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,WAAW,EAAE,CACX,QAAQ,EACJ,WAAW,CAAC,OAAO,CAAC,EAAE,GACtB,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,KAAK,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,KAC3D,IAAI,CAAC;IACV,UAAU,EAAE,CACV,EAAE,EAAE,MAAM,EACV,OAAO,EACH,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GAC7B,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAC/D,IAAI,CAAC;IACV,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED,wBAAgB,QAAQ,CACtB,OAAO,GAAG,WAAW,EACrB,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,EAC9B,MAAM,GAAG,SAAS,EAElB,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,GAC7C,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAkPhC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XRequest.d.ts","sourceRoot":"","sources":["../../../../src/tools/XRequest.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"XRequest.d.ts","sourceRoot":"","sources":["../../../../src/tools/XRequest.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;IACtC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC7D,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,MAAM,CAAmB;gBAErB,MAAM,EAAE,cAAc;IAI5B,MAAM,CACV,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAsFhB,KAAK,IAAI,IAAI;IAOb,OAAO,IAAI,IAAI;CAGhB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XStream.d.ts","sourceRoot":"","sources":["../../../../src/tools/XStream.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"XStream.d.ts","sourceRoot":"","sources":["../../../../src/tools/XStream.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAInD,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;CAC1E;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IACrC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AAUD,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,EAAE,CAA4B;IACtC,OAAO,CAAC,YAAY,CAA8C;IAClE,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,WAAW,CAAK;gBAEZ,MAAM,EAAE,aAAa;IAIjC,OAAO,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IA+E1C,KAAK,IAAI,IAAI;IAYb,OAAO,IAAI,IAAI;IAIf,OAAO,CAAC,UAAU;CAMnB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* SSEEnvelope 协议类型定义
|
|
3
3
|
*/
|
|
4
|
-
export type SSEEventType = 'text' | 'card_data' | 'suggestion' | 'error' | 'done';
|
|
4
|
+
export type SSEEventType = 'text' | 'card_data' | 'suggestion' | 'error' | 'done' | 'heartbeat';
|
|
5
5
|
export interface SSEEnvelopeBase {
|
|
6
6
|
event_id: string;
|
|
7
7
|
turn_id: string;
|
|
@@ -44,7 +44,11 @@ export interface SSEDoneEvent extends SSEEnvelopeBase {
|
|
|
44
44
|
reason: 'ok' | 'abort' | 'error';
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
|
-
export
|
|
47
|
+
export interface SSEHeartbeatEvent extends SSEEnvelopeBase {
|
|
48
|
+
type: 'heartbeat';
|
|
49
|
+
payload: Record<string, never>;
|
|
50
|
+
}
|
|
51
|
+
export type SSEEnvelope = SSETextEvent | SSECardDataEvent | SSESuggestionEvent | SSEErrorEvent | SSEDoneEvent | SSEHeartbeatEvent;
|
|
48
52
|
export interface SuggestionItem {
|
|
49
53
|
id: string;
|
|
50
54
|
label: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../../src/types/sse.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,WAAW,GACX,YAAY,GACZ,OAAO,GACP,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../../src/types/sse.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,WAAW,GACX,YAAY,GACZ,OAAO,GACP,MAAM,GACN,WAAW,CAAC;AAEhB,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,WAAW,CAAC;KACtB,CAAC;CACH;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE;QACP,KAAK,EAAE,cAAc,EAAE,CAAC;KACzB,CAAC;CACH;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,OAAO,CAAC;QACnB,eAAe,CAAC,EAAE,aAAa,EAAE,CAAC;KACnC,CAAC;CACH;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QACP,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC;KAClC,CAAC;CACH;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAChC;AAED,MAAM,MAAM,WAAW,GACnB,YAAY,GACZ,gBAAgB,GAChB,kBAAkB,GAClB,aAAa,GACb,YAAY,GACZ,iBAAiB,CAAC;AAEtB,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;CACjC;AAED,MAAM,MAAM,UAAU,GAClB,eAAe,GACf,gBAAgB,GAChB,SAAS,GACT,aAAa,GACb,aAAa,GACb,aAAa,GACb,WAAW,GACX,aAAa,GACb,cAAc,GACd,iBAAiB,GACjB,aAAa,CAAC;AAElB,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useXChat.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useXChat.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"useXChat.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useXChat.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,WAAW,WAAW,CAAC,OAAO,GAAG,WAAW;IAChD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,cAAc,CAC7B,OAAO,GAAG,WAAW,EACrB,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,EAC9B,MAAM,GAAG,SAAS;IAElB,QAAQ,EAAE,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACvD,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;IAC/C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,KAAK,OAAO,CAAC;IACpE,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc,CAC7B,OAAO,GAAG,WAAW,EACrB,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC;IAE9B,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAClC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7C,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAC/C,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,WAAW,EAAE,CACX,QAAQ,EACJ,WAAW,CAAC,OAAO,CAAC,EAAE,GACtB,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,KAAK,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,KAC3D,IAAI,CAAC;IACV,UAAU,EAAE,CACV,EAAE,EAAE,MAAM,EACV,OAAO,EACH,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GAC7B,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAC/D,IAAI,CAAC;IACV,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED,wBAAgB,QAAQ,CACtB,OAAO,GAAG,WAAW,EACrB,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,EAC9B,MAAM,GAAG,SAAS,EAElB,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,GAC7C,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAkPhC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XRequest.d.ts","sourceRoot":"","sources":["../../../../src/tools/XRequest.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"XRequest.d.ts","sourceRoot":"","sources":["../../../../src/tools/XRequest.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;IACtC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC7D,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,MAAM,CAAmB;gBAErB,MAAM,EAAE,cAAc;IAI5B,MAAM,CACV,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAsFhB,KAAK,IAAI,IAAI;IAOb,OAAO,IAAI,IAAI;CAGhB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XStream.d.ts","sourceRoot":"","sources":["../../../../src/tools/XStream.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"XStream.d.ts","sourceRoot":"","sources":["../../../../src/tools/XStream.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAInD,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;CAC1E;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IACrC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AAUD,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,EAAE,CAA4B;IACtC,OAAO,CAAC,YAAY,CAA8C;IAClE,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,WAAW,CAAK;gBAEZ,MAAM,EAAE,aAAa;IAIjC,OAAO,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IA+E1C,KAAK,IAAI,IAAI;IAYb,OAAO,IAAI,IAAI;IAIf,OAAO,CAAC,UAAU;CAMnB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* SSEEnvelope 协议类型定义
|
|
3
3
|
*/
|
|
4
|
-
export type SSEEventType = 'text' | 'card_data' | 'suggestion' | 'error' | 'done';
|
|
4
|
+
export type SSEEventType = 'text' | 'card_data' | 'suggestion' | 'error' | 'done' | 'heartbeat';
|
|
5
5
|
export interface SSEEnvelopeBase {
|
|
6
6
|
event_id: string;
|
|
7
7
|
turn_id: string;
|
|
@@ -44,7 +44,11 @@ export interface SSEDoneEvent extends SSEEnvelopeBase {
|
|
|
44
44
|
reason: 'ok' | 'abort' | 'error';
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
|
-
export
|
|
47
|
+
export interface SSEHeartbeatEvent extends SSEEnvelopeBase {
|
|
48
|
+
type: 'heartbeat';
|
|
49
|
+
payload: Record<string, never>;
|
|
50
|
+
}
|
|
51
|
+
export type SSEEnvelope = SSETextEvent | SSECardDataEvent | SSESuggestionEvent | SSEErrorEvent | SSEDoneEvent | SSEHeartbeatEvent;
|
|
48
52
|
export interface SuggestionItem {
|
|
49
53
|
id: string;
|
|
50
54
|
label: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../../src/types/sse.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,WAAW,GACX,YAAY,GACZ,OAAO,GACP,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../../src/types/sse.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,WAAW,GACX,YAAY,GACZ,OAAO,GACP,MAAM,GACN,WAAW,CAAC;AAEhB,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,WAAW,CAAC;KACtB,CAAC;CACH;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE;QACP,KAAK,EAAE,cAAc,EAAE,CAAC;KACzB,CAAC;CACH;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,OAAO,CAAC;QACnB,eAAe,CAAC,EAAE,aAAa,EAAE,CAAC;KACnC,CAAC;CACH;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QACP,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC;KAClC,CAAC;CACH;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAChC;AAED,MAAM,MAAM,WAAW,GACnB,YAAY,GACZ,gBAAgB,GAChB,kBAAkB,GAClB,aAAa,GACb,YAAY,GACZ,iBAAiB,CAAC;AAEtB,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;CACjC;AAED,MAAM,MAAM,UAAU,GAClB,eAAe,GACf,gBAAgB,GAChB,SAAS,GACT,aAAa,GACb,aAAa,GACb,aAAa,GACb,WAAW,GACX,aAAa,GACb,cAAc,GACd,iBAAiB,GACjB,aAAa,CAAC;AAElB,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB"}
|
package/package.json
CHANGED
package/src/hooks/useXChat.ts
CHANGED
|
@@ -4,12 +4,12 @@
|
|
|
4
4
|
* 消费 ChatProvider，输出可渲染的 messages 列表
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {useCallback, useEffect, useRef, useSyncExternalStore} from 'react';
|
|
8
|
-
import {createChatStore} from '../stores/chatStore';
|
|
9
|
-
import type {AbstractChatProvider} from '../providers/AbstractChatProvider';
|
|
10
|
-
import type {ChatMessage, MessageStatus} from '../types/message';
|
|
11
|
-
import type {RequestParams, SSEOutput} from '../types/provider';
|
|
12
|
-
import type {SuggestionItem} from '../types/sse';
|
|
7
|
+
import { useCallback, useEffect, useRef, useSyncExternalStore } from 'react';
|
|
8
|
+
import { createChatStore } from '../stores/chatStore';
|
|
9
|
+
import type { AbstractChatProvider } from '../providers/AbstractChatProvider';
|
|
10
|
+
import type { ChatMessage, MessageStatus } from '../types/message';
|
|
11
|
+
import type { RequestParams, SSEOutput } from '../types/provider';
|
|
12
|
+
import type { SuggestionItem } from '../types/sse';
|
|
13
13
|
|
|
14
14
|
export interface MessageInfo<Message = ChatMessage> {
|
|
15
15
|
id: string;
|
|
@@ -21,7 +21,7 @@ export interface MessageInfo<Message = ChatMessage> {
|
|
|
21
21
|
export interface UseXChatConfig<
|
|
22
22
|
Message = ChatMessage,
|
|
23
23
|
Input = RequestParams<Message>,
|
|
24
|
-
Output = SSEOutput
|
|
24
|
+
Output = SSEOutput
|
|
25
25
|
> {
|
|
26
26
|
provider: AbstractChatProvider<Message, Input, Output>;
|
|
27
27
|
requestPlaceholder?: (input: Input) => Message;
|
|
@@ -31,7 +31,7 @@ export interface UseXChatConfig<
|
|
|
31
31
|
|
|
32
32
|
export interface UseXChatReturn<
|
|
33
33
|
Message = ChatMessage,
|
|
34
|
-
Input = RequestParams<Message
|
|
34
|
+
Input = RequestParams<Message>
|
|
35
35
|
> {
|
|
36
36
|
messages: MessageInfo<Message>[];
|
|
37
37
|
requesting: boolean;
|
|
@@ -46,13 +46,13 @@ export interface UseXChatReturn<
|
|
|
46
46
|
setMessages: (
|
|
47
47
|
messages:
|
|
48
48
|
| MessageInfo<Message>[]
|
|
49
|
-
| ((prev: MessageInfo<Message>[]) => MessageInfo<Message>[])
|
|
49
|
+
| ((prev: MessageInfo<Message>[]) => MessageInfo<Message>[])
|
|
50
50
|
) => void;
|
|
51
51
|
setMessage: (
|
|
52
52
|
id: string,
|
|
53
53
|
partial:
|
|
54
54
|
| Partial<MessageInfo<Message>>
|
|
55
|
-
| ((msg: MessageInfo<Message>) => Partial<MessageInfo<Message>>)
|
|
55
|
+
| ((msg: MessageInfo<Message>) => Partial<MessageInfo<Message>>)
|
|
56
56
|
) => void;
|
|
57
57
|
removeMessage: (id: string) => void;
|
|
58
58
|
}
|
|
@@ -60,7 +60,7 @@ export interface UseXChatReturn<
|
|
|
60
60
|
export function useXChat<
|
|
61
61
|
Message = ChatMessage,
|
|
62
62
|
Input = RequestParams<Message>,
|
|
63
|
-
Output = SSEOutput
|
|
63
|
+
Output = SSEOutput
|
|
64
64
|
>(
|
|
65
65
|
config: UseXChatConfig<Message, Input, Output>
|
|
66
66
|
): UseXChatReturn<Message, Input> {
|
|
@@ -73,7 +73,7 @@ export function useXChat<
|
|
|
73
73
|
const state = useSyncExternalStore(
|
|
74
74
|
store.subscribe,
|
|
75
75
|
store.getState,
|
|
76
|
-
store.getState
|
|
76
|
+
store.getState
|
|
77
77
|
);
|
|
78
78
|
|
|
79
79
|
const onRequest = useCallback(
|
|
@@ -86,15 +86,37 @@ export function useXChat<
|
|
|
86
86
|
store.getState().setSuggestions([]);
|
|
87
87
|
|
|
88
88
|
const localMessage = provider.transformLocalMessage(input);
|
|
89
|
-
|
|
89
|
+
const localChatMessage = localMessage as unknown as ChatMessage;
|
|
90
|
+
store.getState().addMessage(localChatMessage);
|
|
91
|
+
|
|
92
|
+
// 注入 loading 占位消息（显示"正在思考"动画）
|
|
93
|
+
const loadingMessageId = `loading-${localChatMessage.id}`;
|
|
94
|
+
const loadingMessage: ChatMessage = {
|
|
95
|
+
id: loadingMessageId,
|
|
96
|
+
text: '',
|
|
97
|
+
role: 'assistant',
|
|
98
|
+
createdAt: new Date(),
|
|
99
|
+
messageType: 'text',
|
|
100
|
+
status: 'loading',
|
|
101
|
+
turnId: localChatMessage.turnId,
|
|
102
|
+
};
|
|
103
|
+
store.getState().addMessage(loadingMessage);
|
|
104
|
+
|
|
105
|
+
let loadingRemoved = false;
|
|
106
|
+
const removeLoading = () => {
|
|
107
|
+
if (!loadingRemoved) {
|
|
108
|
+
loadingRemoved = true;
|
|
109
|
+
store.getState().removeMessage(loadingMessageId);
|
|
110
|
+
}
|
|
111
|
+
};
|
|
90
112
|
|
|
91
113
|
provider.sendMessage(input, {
|
|
92
114
|
onUpdate: (message) => {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
.upsertMessage(message as unknown as ChatMessage);
|
|
115
|
+
removeLoading();
|
|
116
|
+
store.getState().upsertMessage(message as unknown as ChatMessage);
|
|
96
117
|
},
|
|
97
118
|
onSuccess: (message) => {
|
|
119
|
+
removeLoading();
|
|
98
120
|
const m = message as unknown as ChatMessage;
|
|
99
121
|
store.getState().upsertMessage({
|
|
100
122
|
...m,
|
|
@@ -103,14 +125,13 @@ export function useXChat<
|
|
|
103
125
|
store.getState().setRequesting(false);
|
|
104
126
|
},
|
|
105
127
|
onError: (error) => {
|
|
128
|
+
removeLoading();
|
|
106
129
|
store.getState().setError(error.message);
|
|
107
130
|
store.getState().setRequesting(false);
|
|
108
131
|
|
|
109
132
|
if (config.requestFallback) {
|
|
110
133
|
const fallbackMsg = config.requestFallback(input, { error });
|
|
111
|
-
store
|
|
112
|
-
.getState()
|
|
113
|
-
.addMessage(fallbackMsg as unknown as ChatMessage);
|
|
134
|
+
store.getState().addMessage(fallbackMsg as unknown as ChatMessage);
|
|
114
135
|
}
|
|
115
136
|
},
|
|
116
137
|
onSuggestion: (items) => {
|
|
@@ -123,6 +144,12 @@ export function useXChat<
|
|
|
123
144
|
|
|
124
145
|
const abort = useCallback(() => {
|
|
125
146
|
provider.abort();
|
|
147
|
+
// 清理可能存在的 loading 占位消息
|
|
148
|
+
const msgs = store.getState().messages;
|
|
149
|
+
const loadingMsg = msgs.find((m) => m.status === 'loading');
|
|
150
|
+
if (loadingMsg) {
|
|
151
|
+
store.getState().removeMessage(loadingMsg.id);
|
|
152
|
+
}
|
|
126
153
|
store.getState().setRequesting(false);
|
|
127
154
|
}, [provider, store]);
|
|
128
155
|
|
|
@@ -156,9 +183,7 @@ export function useXChat<
|
|
|
156
183
|
|
|
157
184
|
provider.sendMessage(input, {
|
|
158
185
|
onUpdate: (message) => {
|
|
159
|
-
store
|
|
160
|
-
.getState()
|
|
161
|
-
.upsertMessage(message as unknown as ChatMessage);
|
|
186
|
+
store.getState().upsertMessage(message as unknown as ChatMessage);
|
|
162
187
|
},
|
|
163
188
|
onSuccess: (message) => {
|
|
164
189
|
const m = message as unknown as ChatMessage;
|
|
@@ -174,9 +199,7 @@ export function useXChat<
|
|
|
174
199
|
|
|
175
200
|
if (config.requestFallback) {
|
|
176
201
|
const fallbackMsg = config.requestFallback(input, { error });
|
|
177
|
-
store
|
|
178
|
-
.getState()
|
|
179
|
-
.addMessage(fallbackMsg as unknown as ChatMessage);
|
|
202
|
+
store.getState().addMessage(fallbackMsg as unknown as ChatMessage);
|
|
180
203
|
}
|
|
181
204
|
},
|
|
182
205
|
onSuggestion: (items) => {
|
|
@@ -191,7 +214,7 @@ export function useXChat<
|
|
|
191
214
|
(
|
|
192
215
|
messagesOrFn:
|
|
193
216
|
| MessageInfo<Message>[]
|
|
194
|
-
| ((prev: MessageInfo<Message>[]) => MessageInfo<Message>[])
|
|
217
|
+
| ((prev: MessageInfo<Message>[]) => MessageInfo<Message>[])
|
|
195
218
|
) => {
|
|
196
219
|
if (typeof messagesOrFn === 'function') {
|
|
197
220
|
const current = store.getState().messages;
|
|
@@ -204,12 +227,14 @@ export function useXChat<
|
|
|
204
227
|
const next = messagesOrFn(currentInfos);
|
|
205
228
|
store
|
|
206
229
|
.getState()
|
|
207
|
-
.setMessages(
|
|
230
|
+
.setMessages(
|
|
231
|
+
next.map((info) => info.message as unknown as ChatMessage)
|
|
232
|
+
);
|
|
208
233
|
} else {
|
|
209
234
|
store
|
|
210
235
|
.getState()
|
|
211
236
|
.setMessages(
|
|
212
|
-
messagesOrFn.map((info) => info.message as unknown as ChatMessage)
|
|
237
|
+
messagesOrFn.map((info) => info.message as unknown as ChatMessage)
|
|
213
238
|
);
|
|
214
239
|
}
|
|
215
240
|
},
|
|
@@ -221,7 +246,7 @@ export function useXChat<
|
|
|
221
246
|
id: string,
|
|
222
247
|
partialOrFn:
|
|
223
248
|
| Partial<MessageInfo<Message>>
|
|
224
|
-
| ((msg: MessageInfo<Message>) => Partial<MessageInfo<Message>>)
|
|
249
|
+
| ((msg: MessageInfo<Message>) => Partial<MessageInfo<Message>>)
|
|
225
250
|
) => {
|
|
226
251
|
store.getState().setMessage(id, (m) => {
|
|
227
252
|
const info: MessageInfo<Message> = {
|
package/src/tools/XRequest.ts
CHANGED
|
@@ -4,10 +4,12 @@
|
|
|
4
4
|
* 组合 XStream + SSEParser 实现完整 SSE 请求链路
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {XStream} from './XStream';
|
|
8
|
-
import {SSEParser} from './SSEParser';
|
|
9
|
-
import type {SSEOutput} from '../types/provider';
|
|
10
|
-
import type {SSEEnvelope} from '../types/sse';
|
|
7
|
+
import { XStream } from './XStream';
|
|
8
|
+
import { SSEParser } from './SSEParser';
|
|
9
|
+
import type { SSEOutput } from '../types/provider';
|
|
10
|
+
import type { SSEEnvelope } from '../types/sse';
|
|
11
|
+
|
|
12
|
+
const TAG = '[XRequest]';
|
|
11
13
|
|
|
12
14
|
export interface XRequestConfig {
|
|
13
15
|
baseURL: string;
|
|
@@ -50,7 +52,7 @@ export class XRequest {
|
|
|
50
52
|
} = this.config;
|
|
51
53
|
|
|
52
54
|
// 注入 auth token
|
|
53
|
-
const reqHeaders = {...headers};
|
|
55
|
+
const reqHeaders = { ...headers };
|
|
54
56
|
if (getToken) {
|
|
55
57
|
try {
|
|
56
58
|
const token = await getToken();
|
|
@@ -63,6 +65,7 @@ export class XRequest {
|
|
|
63
65
|
}
|
|
64
66
|
|
|
65
67
|
const url = `${baseURL}${endpoint}`;
|
|
68
|
+
console.log(TAG, '发起请求', url);
|
|
66
69
|
|
|
67
70
|
this.stream = new XStream({
|
|
68
71
|
url,
|
|
@@ -72,11 +75,29 @@ export class XRequest {
|
|
|
72
75
|
timeout,
|
|
73
76
|
});
|
|
74
77
|
|
|
78
|
+
let eventCount = 0;
|
|
79
|
+
let heartbeatCount = 0;
|
|
80
|
+
|
|
75
81
|
this.stream.connect({
|
|
76
82
|
onMessage: (output: SSEOutput) => {
|
|
77
83
|
// 通过 SSEParser 进行幂等去重和排序
|
|
78
84
|
const envelopes: SSEEnvelope[] = this.parser.process(output.data);
|
|
79
85
|
for (const envelope of envelopes) {
|
|
86
|
+
// 心跳事件仅用于保持连接，不传给 UI
|
|
87
|
+
if (envelope.type === 'heartbeat') {
|
|
88
|
+
heartbeatCount++;
|
|
89
|
+
if (heartbeatCount <= 3 || heartbeatCount % 10 === 0) {
|
|
90
|
+
console.log(TAG, `heartbeat #${heartbeatCount}`);
|
|
91
|
+
}
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
eventCount++;
|
|
95
|
+
if (eventCount <= 3 || eventCount % 20 === 0) {
|
|
96
|
+
console.log(
|
|
97
|
+
TAG,
|
|
98
|
+
`event #${eventCount} type=${envelope.type} seq=${envelope.seq}`
|
|
99
|
+
);
|
|
100
|
+
}
|
|
80
101
|
callbacks.onStream?.({
|
|
81
102
|
data: JSON.stringify(envelope),
|
|
82
103
|
event: envelope.type,
|
|
@@ -84,12 +105,21 @@ export class XRequest {
|
|
|
84
105
|
}
|
|
85
106
|
},
|
|
86
107
|
onError: (error: Error) => {
|
|
108
|
+
console.error(
|
|
109
|
+
TAG,
|
|
110
|
+
`错误 events=${eventCount} heartbeats=${heartbeatCount}`,
|
|
111
|
+
error.message
|
|
112
|
+
);
|
|
87
113
|
callbacks.onError?.({
|
|
88
114
|
type: 'stream_error',
|
|
89
115
|
message: error.message,
|
|
90
116
|
});
|
|
91
117
|
},
|
|
92
118
|
onComplete: () => {
|
|
119
|
+
console.log(
|
|
120
|
+
TAG,
|
|
121
|
+
`完成 events=${eventCount} heartbeats=${heartbeatCount}`
|
|
122
|
+
);
|
|
93
123
|
callbacks.onSuccess?.('');
|
|
94
124
|
},
|
|
95
125
|
});
|
package/src/tools/XStream.ts
CHANGED
|
@@ -5,7 +5,9 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import type EventSource from 'react-native-sse';
|
|
8
|
-
import type {SSEOutput} from '../types/provider';
|
|
8
|
+
import type { SSEOutput } from '../types/provider';
|
|
9
|
+
|
|
10
|
+
const TAG = '[XStream]';
|
|
9
11
|
|
|
10
12
|
export interface XStreamConfig {
|
|
11
13
|
url: string;
|
|
@@ -35,6 +37,8 @@ export class XStream {
|
|
|
35
37
|
private config: XStreamConfig;
|
|
36
38
|
private es: EventSource | null = null;
|
|
37
39
|
private timeoutTimer: ReturnType<typeof setTimeout> | null = null;
|
|
40
|
+
private msgCount = 0;
|
|
41
|
+
private connectTime = 0;
|
|
38
42
|
|
|
39
43
|
constructor(config: XStreamConfig) {
|
|
40
44
|
this.config = config;
|
|
@@ -42,6 +46,8 @@ export class XStream {
|
|
|
42
46
|
|
|
43
47
|
connect(callbacks: XStreamCallbacks): void {
|
|
44
48
|
this.abort();
|
|
49
|
+
this.msgCount = 0;
|
|
50
|
+
this.connectTime = Date.now();
|
|
45
51
|
|
|
46
52
|
const {
|
|
47
53
|
url,
|
|
@@ -52,6 +58,8 @@ export class XStream {
|
|
|
52
58
|
transformStream = defaultTransform,
|
|
53
59
|
} = this.config;
|
|
54
60
|
|
|
61
|
+
console.log(TAG, '连接', url, `timeout=${timeout}ms`);
|
|
62
|
+
|
|
55
63
|
// react-native-sse 动态 require，避免非 RN 环境报错
|
|
56
64
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
57
65
|
const RNEventSource = require('react-native-sse').default;
|
|
@@ -67,31 +75,59 @@ export class XStream {
|
|
|
67
75
|
|
|
68
76
|
this.es = es;
|
|
69
77
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
78
|
+
// read timeout：每次收到数据后重置，连续 timeout 毫秒无数据才超时
|
|
79
|
+
const resetTimeout = () => {
|
|
80
|
+
this.clearTimer();
|
|
81
|
+
this.timeoutTimer = setTimeout(() => {
|
|
82
|
+
const elapsed = ((Date.now() - this.connectTime) / 1000).toFixed(1);
|
|
83
|
+
console.warn(TAG, `读取超时 msgs=${this.msgCount} elapsed=${elapsed}s`);
|
|
84
|
+
this.abort();
|
|
85
|
+
callbacks.onError?.(new Error('SSE 读取超时'));
|
|
86
|
+
}, timeout);
|
|
87
|
+
};
|
|
88
|
+
resetTimeout();
|
|
74
89
|
|
|
75
90
|
es.addEventListener('open', () => {
|
|
91
|
+
console.log(TAG, '连接已建立');
|
|
92
|
+
resetTimeout();
|
|
76
93
|
callbacks.onOpen?.();
|
|
77
94
|
});
|
|
78
95
|
|
|
79
96
|
es.addEventListener('message', (event: { data?: string }) => {
|
|
97
|
+
resetTimeout();
|
|
80
98
|
if (event.data) {
|
|
99
|
+
this.msgCount++;
|
|
100
|
+
if (this.msgCount <= 3 || this.msgCount % 20 === 0) {
|
|
101
|
+
console.log(
|
|
102
|
+
TAG,
|
|
103
|
+
`message #${this.msgCount} len=${event.data.length}`
|
|
104
|
+
);
|
|
105
|
+
}
|
|
81
106
|
const output = transformStream({ data: event.data });
|
|
82
107
|
callbacks.onMessage(output);
|
|
83
108
|
}
|
|
84
109
|
});
|
|
85
110
|
|
|
86
|
-
es.addEventListener(
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
111
|
+
es.addEventListener(
|
|
112
|
+
'error',
|
|
113
|
+
(event: { type?: string; message?: string }) => {
|
|
114
|
+
const elapsed = ((Date.now() - this.connectTime) / 1000).toFixed(1);
|
|
115
|
+
console.error(
|
|
116
|
+
TAG,
|
|
117
|
+
`错误 msgs=${this.msgCount} elapsed=${elapsed}s`,
|
|
118
|
+
event.message
|
|
119
|
+
);
|
|
120
|
+
this.clearTimer();
|
|
121
|
+
callbacks.onError?.(new Error(event.message || 'SSE 连接错误'));
|
|
122
|
+
}
|
|
123
|
+
);
|
|
92
124
|
}
|
|
93
125
|
|
|
94
126
|
abort(): void {
|
|
127
|
+
if (this.es) {
|
|
128
|
+
const elapsed = ((Date.now() - this.connectTime) / 1000).toFixed(1);
|
|
129
|
+
console.log(TAG, `断开 msgs=${this.msgCount} elapsed=${elapsed}s`);
|
|
130
|
+
}
|
|
95
131
|
this.clearTimer();
|
|
96
132
|
if (this.es) {
|
|
97
133
|
this.es.close();
|
package/src/types/sse.ts
CHANGED
|
@@ -7,7 +7,8 @@ export type SSEEventType =
|
|
|
7
7
|
| 'card_data'
|
|
8
8
|
| 'suggestion'
|
|
9
9
|
| 'error'
|
|
10
|
-
| 'done'
|
|
10
|
+
| 'done'
|
|
11
|
+
| 'heartbeat';
|
|
11
12
|
|
|
12
13
|
export interface SSEEnvelopeBase {
|
|
13
14
|
event_id: string;
|
|
@@ -55,12 +56,18 @@ export interface SSEDoneEvent extends SSEEnvelopeBase {
|
|
|
55
56
|
};
|
|
56
57
|
}
|
|
57
58
|
|
|
59
|
+
export interface SSEHeartbeatEvent extends SSEEnvelopeBase {
|
|
60
|
+
type: 'heartbeat';
|
|
61
|
+
payload: Record<string, never>;
|
|
62
|
+
}
|
|
63
|
+
|
|
58
64
|
export type SSEEnvelope =
|
|
59
65
|
| SSETextEvent
|
|
60
66
|
| SSECardDataEvent
|
|
61
67
|
| SSESuggestionEvent
|
|
62
68
|
| SSEErrorEvent
|
|
63
|
-
| SSEDoneEvent
|
|
69
|
+
| SSEDoneEvent
|
|
70
|
+
| SSEHeartbeatEvent;
|
|
64
71
|
|
|
65
72
|
export interface SuggestionItem {
|
|
66
73
|
id: string;
|