@memori.ai/memori-react 9.0.0-alpha.22 → 9.0.0-alpha.23
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/CHANGELOG.md +435 -0
- package/dist/components/ChatBubble/ChatBubble.js +12 -7
- package/dist/components/ChatBubble/ChatBubble.js.map +1 -1
- package/dist/components/FeedbackButtons/FeedbackButtons.js +2 -2
- package/dist/components/FeedbackButtons/FeedbackButtons.js.map +1 -1
- package/dist/components/MemoriWidget/MemoriWidget.d.ts +1 -0
- package/dist/components/MemoriWidget/MemoriWidget.js +58 -1
- package/dist/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/dist/components/layouts/chat.css +5 -2
- package/dist/helpers/nats/getNatsConfig.js.map +1 -1
- package/dist/helpers/nats/useNats.d.ts +2 -1
- package/dist/helpers/nats/useNats.js +87 -20
- package/dist/helpers/nats/useNats.js.map +1 -1
- package/dist/helpers/nats/useNatsSession.d.ts +6 -1
- package/dist/helpers/nats/useNatsSession.js +48 -7
- package/dist/helpers/nats/useNatsSession.js.map +1 -1
- package/dist/styles.css +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/esm/components/ChatBubble/ChatBubble.js +12 -7
- package/esm/components/ChatBubble/ChatBubble.js.map +1 -1
- package/esm/components/FeedbackButtons/FeedbackButtons.js +2 -2
- package/esm/components/FeedbackButtons/FeedbackButtons.js.map +1 -1
- package/esm/components/MemoriWidget/MemoriWidget.d.ts +1 -0
- package/esm/components/MemoriWidget/MemoriWidget.js +57 -1
- package/esm/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/esm/components/layouts/chat.css +5 -2
- package/esm/helpers/nats/getNatsConfig.js.map +1 -1
- package/esm/helpers/nats/useNats.d.ts +2 -1
- package/esm/helpers/nats/useNats.js +87 -20
- package/esm/helpers/nats/useNats.js.map +1 -1
- package/esm/helpers/nats/useNatsSession.d.ts +6 -1
- package/esm/helpers/nats/useNatsSession.js +48 -8
- package/esm/helpers/nats/useNatsSession.js.map +1 -1
- package/esm/styles.css +1 -1
- package/esm/version.d.ts +1 -1
- package/esm/version.js +1 -1
- package/package.json +4 -3
- package/src/components/Chat/__snapshots__/Chat.test.tsx.snap +71 -71
- package/src/components/ChatBubble/ChatBubble.stories.tsx +11 -0
- package/src/components/ChatBubble/ChatBubble.test.tsx +16 -0
- package/src/components/ChatBubble/ChatBubble.tsx +307 -292
- package/src/components/ChatBubble/__snapshots__/ChatBubble.test.tsx.snap +268 -121
- package/src/components/FeedbackButtons/FeedbackButtons.tsx +2 -0
- package/src/components/FeedbackButtons/__snapshots__/FeedbackButtons.test.tsx.snap +1 -1
- package/src/components/KnownFacts/__snapshots__/KnownFacts.test.tsx.snap +6 -2
- package/src/components/LoginDrawer/__snapshots__/LoginDrawer.test.tsx.snap +33 -11
- package/src/components/MemoriWidget/MemoriWidget.tsx +65 -1
- package/src/components/WhyThisAnswer/__snapshots__/WhyThisAnswer.test.tsx.snap +9 -3
- package/src/components/layouts/chat.css +5 -2
- package/src/helpers/nats/getNatsConfig.ts +4 -1
- package/src/helpers/nats/useNats.test.tsx +81 -0
- package/src/helpers/nats/useNats.ts +109 -29
- package/src/helpers/nats/useNatsSession.test.ts +16 -0
- package/src/helpers/nats/useNatsSession.ts +79 -13
- package/src/version.ts +1 -1
|
@@ -1,30 +1,41 @@
|
|
|
1
1
|
import { useEffect, useRef, useState, useCallback } from 'react';
|
|
2
2
|
import { getNatsConfig } from './getNatsConfig';
|
|
3
3
|
import { useNatsSession, } from './useNatsSession';
|
|
4
|
-
export function useNats({ baseUrl, sessionId, onProgress, onDialogResponse, onError, }) {
|
|
4
|
+
export function useNats({ baseUrl, sessionId, onProgress, onDialogResponse, onError, onCatchUp, }) {
|
|
5
5
|
const [config, setConfig] = useState(null);
|
|
6
6
|
const [configError, setConfigError] = useState(null);
|
|
7
7
|
const onProgressRef = useRef(onProgress);
|
|
8
8
|
const onDialogResponseRef = useRef(onDialogResponse);
|
|
9
9
|
const onErrorRef = useRef(onError);
|
|
10
|
+
const onCatchUpRef = useRef(onCatchUp);
|
|
11
|
+
const abortRef = useRef(null);
|
|
12
|
+
const catchUpAfterConnectRef = useRef(false);
|
|
13
|
+
const refreshInFlightRef = useRef(false);
|
|
14
|
+
const lastAuthRefreshRef = useRef(0);
|
|
10
15
|
useEffect(() => {
|
|
11
16
|
onProgressRef.current = onProgress;
|
|
12
17
|
onDialogResponseRef.current = onDialogResponse;
|
|
13
18
|
onErrorRef.current = onError;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
onCatchUpRef.current = onCatchUp;
|
|
20
|
+
}, [onProgress, onDialogResponse, onError, onCatchUp]);
|
|
21
|
+
const refreshConfig = useCallback(async (reason) => {
|
|
22
|
+
var _a;
|
|
23
|
+
if (!sessionId || refreshInFlightRef.current)
|
|
24
|
+
return;
|
|
25
|
+
if (reason === 'auth' && Date.now() - lastAuthRefreshRef.current < 5000) {
|
|
20
26
|
return;
|
|
21
27
|
}
|
|
28
|
+
refreshInFlightRef.current = true;
|
|
29
|
+
if (reason === 'auth')
|
|
30
|
+
lastAuthRefreshRef.current = Date.now();
|
|
31
|
+
(_a = abortRef.current) === null || _a === void 0 ? void 0 : _a.abort();
|
|
22
32
|
const controller = new AbortController();
|
|
23
|
-
|
|
24
|
-
console.info('[NATS] fetching config from', `${baseUrl}/api/nats`, 'for session', sessionId);
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
if (!
|
|
33
|
+
abortRef.current = controller;
|
|
34
|
+
console.info('[NATS] fetching config from', `${baseUrl}/api/nats`, 'for session', sessionId, `(${reason})`);
|
|
35
|
+
try {
|
|
36
|
+
const cfg = await getNatsConfig(baseUrl, sessionId, controller.signal);
|
|
37
|
+
if (!controller.signal.aborted) {
|
|
38
|
+
catchUpAfterConnectRef.current = reason !== 'initial';
|
|
28
39
|
console.info('[NATS] config received', {
|
|
29
40
|
url: cfg.url,
|
|
30
41
|
jetStream: !!cfg.stream,
|
|
@@ -33,19 +44,61 @@ export function useNats({ baseUrl, sessionId, onProgress, onDialogResponse, onEr
|
|
|
33
44
|
setConfig(cfg);
|
|
34
45
|
setConfigError(null);
|
|
35
46
|
}
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
if (!
|
|
47
|
+
}
|
|
48
|
+
catch (err) {
|
|
49
|
+
if (!controller.signal.aborted && (err === null || err === void 0 ? void 0 : err.name) !== 'AbortError') {
|
|
39
50
|
console.error('[NATS] config error', err);
|
|
40
51
|
setConfig(null);
|
|
41
52
|
setConfigError(err instanceof Error ? err : new Error(String(err)));
|
|
42
53
|
}
|
|
43
|
-
}
|
|
54
|
+
}
|
|
55
|
+
finally {
|
|
56
|
+
if (abortRef.current === controller) {
|
|
57
|
+
abortRef.current = null;
|
|
58
|
+
refreshInFlightRef.current = false;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}, [baseUrl, sessionId]);
|
|
62
|
+
useEffect(() => {
|
|
63
|
+
if (!sessionId) {
|
|
64
|
+
console.debug('[NATS] no sessionId, skipping config fetch');
|
|
65
|
+
setConfig(null);
|
|
66
|
+
setConfigError(null);
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
void refreshConfig('initial');
|
|
44
70
|
return () => {
|
|
45
|
-
|
|
46
|
-
|
|
71
|
+
var _a;
|
|
72
|
+
(_a = abortRef.current) === null || _a === void 0 ? void 0 : _a.abort();
|
|
73
|
+
abortRef.current = null;
|
|
74
|
+
refreshInFlightRef.current = false;
|
|
47
75
|
};
|
|
48
|
-
}, [
|
|
76
|
+
}, [sessionId, refreshConfig]);
|
|
77
|
+
useEffect(() => {
|
|
78
|
+
if (!sessionId)
|
|
79
|
+
return;
|
|
80
|
+
const requestResume = () => {
|
|
81
|
+
if (document.visibilityState === 'visible') {
|
|
82
|
+
void refreshConfig('resume');
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
const onVisibilityChange = () => {
|
|
86
|
+
if (document.visibilityState === 'visible')
|
|
87
|
+
requestResume();
|
|
88
|
+
};
|
|
89
|
+
const onPageShow = (event) => {
|
|
90
|
+
if (event.persisted)
|
|
91
|
+
requestResume();
|
|
92
|
+
};
|
|
93
|
+
document.addEventListener('visibilitychange', onVisibilityChange);
|
|
94
|
+
window.addEventListener('online', requestResume);
|
|
95
|
+
window.addEventListener('pageshow', onPageShow);
|
|
96
|
+
return () => {
|
|
97
|
+
document.removeEventListener('visibilitychange', onVisibilityChange);
|
|
98
|
+
window.removeEventListener('online', requestResume);
|
|
99
|
+
window.removeEventListener('pageshow', onPageShow);
|
|
100
|
+
};
|
|
101
|
+
}, [sessionId, refreshConfig]);
|
|
49
102
|
const handleMessage = useCallback((event) => {
|
|
50
103
|
var _a, _b, _c;
|
|
51
104
|
console.debug('[NATS] dispatching event', { eventType: event.eventType });
|
|
@@ -63,7 +116,21 @@ export function useNats({ baseUrl, sessionId, onProgress, onDialogResponse, onEr
|
|
|
63
116
|
console.warn('Unknown NATS event', event);
|
|
64
117
|
}
|
|
65
118
|
}, []);
|
|
66
|
-
|
|
119
|
+
const handleConnected = useCallback(() => {
|
|
120
|
+
var _a;
|
|
121
|
+
if (!catchUpAfterConnectRef.current)
|
|
122
|
+
return;
|
|
123
|
+
catchUpAfterConnectRef.current = false;
|
|
124
|
+
void ((_a = onCatchUpRef.current) === null || _a === void 0 ? void 0 : _a.call(onCatchUpRef));
|
|
125
|
+
}, []);
|
|
126
|
+
const handleAuthError = useCallback((error) => {
|
|
127
|
+
console.warn('[NATS] JWT rejected or expired; refreshing credentials', error);
|
|
128
|
+
void refreshConfig('auth');
|
|
129
|
+
}, [refreshConfig]);
|
|
130
|
+
useNatsSession(sessionId, config !== null && config !== void 0 ? config : undefined, handleMessage, {
|
|
131
|
+
onConnected: handleConnected,
|
|
132
|
+
onAuthError: handleAuthError,
|
|
133
|
+
});
|
|
67
134
|
return {
|
|
68
135
|
connected: !!config,
|
|
69
136
|
configError,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useNats.js","sourceRoot":"","sources":["../../../src/helpers/nats/useNats.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,aAAa,EAAc,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EACL,cAAc,GAKf,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"useNats.js","sourceRoot":"","sources":["../../../src/helpers/nats/useNats.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,5 +24,10 @@ export interface NatsErrorEvent {
|
|
|
24
24
|
correlationID?: string;
|
|
25
25
|
}
|
|
26
26
|
export type NatsSessionEvent = NatsProgressEvent | NatsDialogResponseEvent | NatsErrorEvent;
|
|
27
|
+
export interface NatsSessionLifecycle {
|
|
28
|
+
onConnected?: () => void;
|
|
29
|
+
onAuthError?: (error: Error) => void;
|
|
30
|
+
}
|
|
31
|
+
export declare function isNatsAuthError(error: unknown): error is Error;
|
|
27
32
|
export declare function normalizeNatsEvent(raw: Record<string, unknown>): NatsSessionEvent;
|
|
28
|
-
export declare function useNatsSession(sessionId: string | undefined, config: NatsConfig | undefined, onMessage: (event: NatsSessionEvent) => void): void;
|
|
33
|
+
export declare function useNatsSession(sessionId: string | undefined, config: NatsConfig | undefined, onMessage: (event: NatsSessionEvent) => void, lifecycle?: NatsSessionLifecycle): void;
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import { useEffect, useRef, useState } from 'react';
|
|
2
|
-
import { wsconnect } from '@nats-io/nats-core';
|
|
2
|
+
import { wsconnect, jwtAuthenticator, AuthorizationError, UserAuthenticationExpiredError, } from '@nats-io/nats-core';
|
|
3
3
|
import { jetstream, DeliverPolicy, } from '@nats-io/jetstream';
|
|
4
|
+
export function isNatsAuthError(error) {
|
|
5
|
+
return (error instanceof AuthorizationError ||
|
|
6
|
+
error instanceof UserAuthenticationExpiredError ||
|
|
7
|
+
(error instanceof Error &&
|
|
8
|
+
/authorization violation|authentication expired|user authentication expired/i.test(error.message)));
|
|
9
|
+
}
|
|
4
10
|
function readString(raw, camelKey, snakeKey) {
|
|
5
11
|
var _a;
|
|
6
12
|
const value = (_a = raw[camelKey]) !== null && _a !== void 0 ? _a : raw[snakeKey];
|
|
@@ -63,9 +69,10 @@ function decodeMessage(subject, received, raw, onMessage) {
|
|
|
63
69
|
console.debug(`[NATS] message #${received} on ${subject} (eventType=${payload.eventType})`, payload);
|
|
64
70
|
onMessage(payload);
|
|
65
71
|
}
|
|
66
|
-
async function consumeCoreSubscription(nc, subject, onMessage) {
|
|
72
|
+
async function consumeCoreSubscription(nc, subject, onMessage, onReady) {
|
|
67
73
|
const sub = nc.subscribe(subject);
|
|
68
74
|
console.info('[NATS] subscribed to subject', subject);
|
|
75
|
+
onReady();
|
|
69
76
|
let received = 0;
|
|
70
77
|
for await (const msg of sub) {
|
|
71
78
|
received += 1;
|
|
@@ -78,7 +85,7 @@ async function consumeCoreSubscription(nc, subject, onMessage) {
|
|
|
78
85
|
}
|
|
79
86
|
console.info(`[NATS] subscription on ${subject} closed (received ${received} messages)`);
|
|
80
87
|
}
|
|
81
|
-
async function consumeJetStream(nc, config, subject, mode, onMessage, setConsumerMessages) {
|
|
88
|
+
async function consumeJetStream(nc, config, subject, mode, onMessage, setConsumerMessages, onReady) {
|
|
82
89
|
const js = jetstream(nc);
|
|
83
90
|
const consumer = config.consumer
|
|
84
91
|
? await js.consumers.get(config.stream, config.consumer)
|
|
@@ -93,6 +100,7 @@ async function consumeJetStream(nc, config, subject, mode, onMessage, setConsume
|
|
|
93
100
|
: { stream: config.stream, subject, mode });
|
|
94
101
|
const messages = await consumer.consume();
|
|
95
102
|
setConsumerMessages(messages);
|
|
103
|
+
onReady();
|
|
96
104
|
let received = 0;
|
|
97
105
|
for await (const msg of messages) {
|
|
98
106
|
received += 1;
|
|
@@ -112,15 +120,19 @@ function closeNatsSession(consumerMessagesRef, connRef) {
|
|
|
112
120
|
(_b = connRef.current) === null || _b === void 0 ? void 0 : _b.close();
|
|
113
121
|
connRef.current = null;
|
|
114
122
|
}
|
|
115
|
-
export function useNatsSession(sessionId, config, onMessage) {
|
|
123
|
+
export function useNatsSession(sessionId, config, onMessage, lifecycle = {}) {
|
|
116
124
|
const connRef = useRef(null);
|
|
117
125
|
const consumerMessagesRef = useRef(null);
|
|
118
126
|
const onMessageRef = useRef(onMessage);
|
|
127
|
+
const lifecycleRef = useRef(lifecycle);
|
|
119
128
|
const wasHiddenRef = useRef(false);
|
|
120
129
|
const [resumeGeneration, setResumeGeneration] = useState(0);
|
|
121
130
|
useEffect(() => {
|
|
122
131
|
onMessageRef.current = onMessage;
|
|
123
132
|
}, [onMessage]);
|
|
133
|
+
useEffect(() => {
|
|
134
|
+
lifecycleRef.current = lifecycle;
|
|
135
|
+
}, [lifecycle]);
|
|
124
136
|
useEffect(() => {
|
|
125
137
|
if (!sessionId || !(config === null || config === void 0 ? void 0 : config.stream)) {
|
|
126
138
|
return;
|
|
@@ -174,7 +186,7 @@ export function useNatsSession(sessionId, config, onMessage) {
|
|
|
174
186
|
console.info('[NATS] connecting to', config.url, 'for session', sessionId, useJetStream ? `(JetStream/${jetStreamMode})` : '(core)');
|
|
175
187
|
const nc = await wsconnect({
|
|
176
188
|
servers: [config.url],
|
|
177
|
-
|
|
189
|
+
authenticator: jwtAuthenticator(config.token),
|
|
178
190
|
});
|
|
179
191
|
if (closed) {
|
|
180
192
|
console.debug('[NATS] connection established after cleanup, closing immediately');
|
|
@@ -186,15 +198,43 @@ export function useNatsSession(sessionId, config, onMessage) {
|
|
|
186
198
|
const dispatch = (event) => {
|
|
187
199
|
onMessageRef.current(event);
|
|
188
200
|
};
|
|
201
|
+
const ready = () => { var _a, _b; return (_b = (_a = lifecycleRef.current).onConnected) === null || _b === void 0 ? void 0 : _b.call(_a); };
|
|
202
|
+
let authRefreshRequested = false;
|
|
203
|
+
const requestAuthRefresh = (error) => {
|
|
204
|
+
var _a, _b;
|
|
205
|
+
if (closed || authRefreshRequested)
|
|
206
|
+
return;
|
|
207
|
+
authRefreshRequested = true;
|
|
208
|
+
(_b = (_a = lifecycleRef.current).onAuthError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
|
|
209
|
+
};
|
|
210
|
+
void (async () => {
|
|
211
|
+
for await (const status of nc.status()) {
|
|
212
|
+
if (status.type === 'error' && isNatsAuthError(status.error)) {
|
|
213
|
+
requestAuthRefresh(status.error);
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
})();
|
|
218
|
+
void nc.closed().then(error => {
|
|
219
|
+
if (error && isNatsAuthError(error)) {
|
|
220
|
+
requestAuthRefresh(error);
|
|
221
|
+
}
|
|
222
|
+
});
|
|
189
223
|
if (useJetStream) {
|
|
190
224
|
await consumeJetStream(nc, config, subject, jetStreamMode, dispatch, messages => {
|
|
191
225
|
consumerMessagesRef.current = messages;
|
|
192
|
-
});
|
|
226
|
+
}, ready);
|
|
193
227
|
}
|
|
194
228
|
else {
|
|
195
|
-
await consumeCoreSubscription(nc, subject, dispatch);
|
|
229
|
+
await consumeCoreSubscription(nc, subject, dispatch, ready);
|
|
230
|
+
}
|
|
231
|
+
})().catch(err => {
|
|
232
|
+
var _a, _b;
|
|
233
|
+
console.error('[NATS] connection error', err);
|
|
234
|
+
if (!closed && isNatsAuthError(err)) {
|
|
235
|
+
(_b = (_a = lifecycleRef.current).onAuthError) === null || _b === void 0 ? void 0 : _b.call(_a, err);
|
|
196
236
|
}
|
|
197
|
-
})
|
|
237
|
+
});
|
|
198
238
|
return () => {
|
|
199
239
|
console.info('[NATS] cleanup: closing connection for subject', subject);
|
|
200
240
|
closed = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useNatsSession.js","sourceRoot":"","sources":["../../../src/helpers/nats/useNatsSession.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAyB,MAAM,OAAO,CAAC;AAC3E,OAAO,
|
|
1
|
+
{"version":3,"file":"useNatsSession.js","sourceRoot":"","sources":["../../../src/helpers/nats/useNatsSession.ts"],"names":[],"mappings":"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"}
|