@memori.ai/memori-react 8.44.0 → 8.45.0
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 +12 -0
- package/dist/components/MemoriWidget/MemoriWidget.d.ts +1 -0
- package/dist/components/MemoriWidget/MemoriWidget.js +59 -1
- package/dist/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/dist/helpers/nats/getNatsConfig.d.ts +1 -1
- package/dist/helpers/nats/getNatsConfig.js +2 -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 +49 -8
- package/dist/helpers/nats/useNatsSession.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +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/helpers/nats/getNatsConfig.d.ts +1 -1
- package/esm/helpers/nats/getNatsConfig.js +2 -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/version.d.ts +1 -1
- package/esm/version.js +1 -1
- package/package.json +1 -1
- package/src/components/MemoriWidget/MemoriWidget.tsx +65 -1
- package/src/helpers/nats/getNatsConfig.ts +8 -3
- 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
- package/dist/components/ChatHistoryDrawer/ChatResumeDrawer.css +0 -372
- package/dist/components/DrawerFooter/DrawerFooter.css +0 -62
- package/dist/components/IconButton/IconButton.css +0 -144
- package/dist/components/MobileSessionPanel/MobileSessionPanel.css +0 -459
- package/dist/components/PositionPopover/PositionPopover.css +0 -219
- package/dist/components/layouts/WebsiteAssistant/website-assistant.css +0 -806
- package/dist/components/layouts/fullpage.css +0 -522
- package/esm/components/ChatHistoryDrawer/ChatResumeDrawer.css +0 -372
- package/esm/components/ChatHistoryDrawer/ChatResumeDrawer.d.ts +0 -36
- package/esm/components/ChatHistoryDrawer/ChatResumeDrawer.js +0 -113
- package/esm/components/ChatHistoryDrawer/ChatResumeDrawer.js.map +0 -1
- package/esm/components/DrawerFooter/DrawerFooter.css +0 -62
- package/esm/components/DrawerFooter/DrawerFooter.d.ts +0 -12
- package/esm/components/DrawerFooter/DrawerFooter.js +0 -8
- package/esm/components/DrawerFooter/DrawerFooter.js.map +0 -1
- package/esm/components/IconButton/IconButton.css +0 -144
- package/esm/components/IconButton/IconButton.d.ts +0 -9
- package/esm/components/IconButton/IconButton.js +0 -33
- package/esm/components/IconButton/IconButton.js.map +0 -1
- package/esm/components/MobileSessionPanel/MobileSessionPanel.css +0 -459
- package/esm/components/MobileSessionPanel/MobileSessionPanel.d.ts +0 -65
- package/esm/components/MobileSessionPanel/MobileSessionPanel.js +0 -291
- package/esm/components/MobileSessionPanel/MobileSessionPanel.js.map +0 -1
- package/esm/components/PositionPopover/PositionPopover.css +0 -219
- package/esm/components/PositionPopover/PositionPopover.d.ts +0 -22
- package/esm/components/PositionPopover/PositionPopover.js +0 -190
- package/esm/components/PositionPopover/PositionPopover.js.map +0 -1
- package/esm/components/layouts/WebsiteAssistant/WebsiteAssistant.d.ts +0 -4
- package/esm/components/layouts/WebsiteAssistant/WebsiteAssistant.js +0 -61
- package/esm/components/layouts/WebsiteAssistant/WebsiteAssistant.js.map +0 -1
- package/esm/components/layouts/WebsiteAssistant/website-assistant.css +0 -806
- package/esm/components/layouts/fullpage.css +0 -522
- package/esm/context/widgetSurfaceContext.d.ts +0 -3
- package/esm/context/widgetSurfaceContext.js +0 -7
- package/esm/context/widgetSurfaceContext.js.map +0 -1
- package/esm/helpers/positionPopover.d.ts +0 -1
- package/esm/helpers/positionPopover.js +0 -4
- package/esm/helpers/positionPopover.js.map +0 -1
- package/esm/helpers/tts/muteSpeaker.d.ts +0 -13
- package/esm/helpers/tts/muteSpeaker.js +0 -21
- package/esm/helpers/tts/muteSpeaker.js.map +0 -1
- package/esm/helpers/usePressTooltip.d.ts +0 -13
- package/esm/helpers/usePressTooltip.js +0 -20
- package/esm/helpers/usePressTooltip.js.map +0 -1
- package/esm/icons/FacebookIcon.d.ts +0 -3
- package/esm/icons/FacebookIcon.js +0 -4
- package/esm/icons/FacebookIcon.js.map +0 -1
- package/esm/icons/LinkedinIcon.d.ts +0 -3
- package/esm/icons/LinkedinIcon.js +0 -4
- package/esm/icons/LinkedinIcon.js.map +0 -1
- package/esm/icons/MemoriIcon.d.ts +0 -3
- package/esm/icons/MemoriIcon.js +0 -6
- package/esm/icons/MemoriIcon.js.map +0 -1
- package/esm/icons/TelegramIcon.d.ts +0 -3
- package/esm/icons/TelegramIcon.js +0 -4
- package/esm/icons/TelegramIcon.js.map +0 -1
- package/esm/icons/TwitterIcon.d.ts +0 -3
- package/esm/icons/TwitterIcon.js +0 -4
- package/esm/icons/TwitterIcon.js.map +0 -1
- package/esm/icons/WhatsappIcon.d.ts +0 -3
- package/esm/icons/WhatsappIcon.js +0 -4
- package/esm/icons/WhatsappIcon.js.map +0 -1
- package/esm/icons/artifacts/DocumentIcon.d.ts +0 -3
- package/esm/icons/artifacts/DocumentIcon.js +0 -4
- package/esm/icons/artifacts/DocumentIcon.js.map +0 -1
- package/esm/icons/artifacts/HtmlIcon.d.ts +0 -3
- package/esm/icons/artifacts/HtmlIcon.js +0 -4
- package/esm/icons/artifacts/HtmlIcon.js.map +0 -1
- package/esm/icons/artifacts/JavascriptIcon.d.ts +0 -3
- package/esm/icons/artifacts/JavascriptIcon.js +0 -4
- package/esm/icons/artifacts/JavascriptIcon.js.map +0 -1
- package/esm/icons/artifacts/MarkdownIcon.d.ts +0 -3
- package/esm/icons/artifacts/MarkdownIcon.js +0 -4
- package/esm/icons/artifacts/MarkdownIcon.js.map +0 -1
- package/esm/icons/artifacts/PythonIcon.d.ts +0 -3
- package/esm/icons/artifacts/PythonIcon.js +0 -4
- package/esm/icons/artifacts/PythonIcon.js.map +0 -1
- package/esm/icons/artifacts/SvgIcon.d.ts +0 -3
- package/esm/icons/artifacts/SvgIcon.js +0 -4
- package/esm/icons/artifacts/SvgIcon.js.map +0 -1
- package/esm/icons/artifacts/XmlIcon.d.ts +0 -3
- package/esm/icons/artifacts/XmlIcon.js +0 -4
- package/esm/icons/artifacts/XmlIcon.js.map +0 -1
- package/esm/icons/artifacts/cssIcon.d.ts +0 -3
- package/esm/icons/artifacts/cssIcon.js +0 -4
- package/esm/icons/artifacts/cssIcon.js.map +0 -1
- package/esm/testUtils.d.ts +0 -5
- package/esm/testUtils.js +0 -15
- package/esm/testUtils.js.map +0 -1
|
@@ -4,30 +4,41 @@ exports.useNats = void 0;
|
|
|
4
4
|
const react_1 = require("react");
|
|
5
5
|
const getNatsConfig_1 = require("./getNatsConfig");
|
|
6
6
|
const useNatsSession_1 = require("./useNatsSession");
|
|
7
|
-
function useNats({ baseUrl, sessionId, onProgress, onDialogResponse, onError, }) {
|
|
7
|
+
function useNats({ baseUrl, sessionId, onProgress, onDialogResponse, onError, onCatchUp, }) {
|
|
8
8
|
const [config, setConfig] = (0, react_1.useState)(null);
|
|
9
9
|
const [configError, setConfigError] = (0, react_1.useState)(null);
|
|
10
10
|
const onProgressRef = (0, react_1.useRef)(onProgress);
|
|
11
11
|
const onDialogResponseRef = (0, react_1.useRef)(onDialogResponse);
|
|
12
12
|
const onErrorRef = (0, react_1.useRef)(onError);
|
|
13
|
+
const onCatchUpRef = (0, react_1.useRef)(onCatchUp);
|
|
14
|
+
const abortRef = (0, react_1.useRef)(null);
|
|
15
|
+
const catchUpAfterConnectRef = (0, react_1.useRef)(false);
|
|
16
|
+
const refreshInFlightRef = (0, react_1.useRef)(false);
|
|
17
|
+
const lastAuthRefreshRef = (0, react_1.useRef)(0);
|
|
13
18
|
(0, react_1.useEffect)(() => {
|
|
14
19
|
onProgressRef.current = onProgress;
|
|
15
20
|
onDialogResponseRef.current = onDialogResponse;
|
|
16
21
|
onErrorRef.current = onError;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
22
|
+
onCatchUpRef.current = onCatchUp;
|
|
23
|
+
}, [onProgress, onDialogResponse, onError, onCatchUp]);
|
|
24
|
+
const refreshConfig = (0, react_1.useCallback)(async (reason) => {
|
|
25
|
+
var _a;
|
|
26
|
+
if (!sessionId || refreshInFlightRef.current)
|
|
27
|
+
return;
|
|
28
|
+
if (reason === 'auth' && Date.now() - lastAuthRefreshRef.current < 5000) {
|
|
23
29
|
return;
|
|
24
30
|
}
|
|
31
|
+
refreshInFlightRef.current = true;
|
|
32
|
+
if (reason === 'auth')
|
|
33
|
+
lastAuthRefreshRef.current = Date.now();
|
|
34
|
+
(_a = abortRef.current) === null || _a === void 0 ? void 0 : _a.abort();
|
|
25
35
|
const controller = new AbortController();
|
|
26
|
-
|
|
27
|
-
console.info('[NATS] fetching config from', `${baseUrl}/api/nats`, 'for session', sessionId);
|
|
28
|
-
|
|
29
|
-
.
|
|
30
|
-
if (!
|
|
36
|
+
abortRef.current = controller;
|
|
37
|
+
console.info('[NATS] fetching config from', `${baseUrl}/api/nats`, 'for session', sessionId, `(${reason})`);
|
|
38
|
+
try {
|
|
39
|
+
const cfg = await (0, getNatsConfig_1.getNatsConfig)(baseUrl, sessionId, controller.signal);
|
|
40
|
+
if (!controller.signal.aborted) {
|
|
41
|
+
catchUpAfterConnectRef.current = reason !== 'initial';
|
|
31
42
|
console.info('[NATS] config received', {
|
|
32
43
|
url: cfg.url,
|
|
33
44
|
jetStream: !!cfg.stream,
|
|
@@ -36,19 +47,61 @@ function useNats({ baseUrl, sessionId, onProgress, onDialogResponse, onError, })
|
|
|
36
47
|
setConfig(cfg);
|
|
37
48
|
setConfigError(null);
|
|
38
49
|
}
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
if (!
|
|
50
|
+
}
|
|
51
|
+
catch (err) {
|
|
52
|
+
if (!controller.signal.aborted && (err === null || err === void 0 ? void 0 : err.name) !== 'AbortError') {
|
|
42
53
|
console.error('[NATS] config error', err);
|
|
43
54
|
setConfig(null);
|
|
44
55
|
setConfigError(err instanceof Error ? err : new Error(String(err)));
|
|
45
56
|
}
|
|
46
|
-
}
|
|
57
|
+
}
|
|
58
|
+
finally {
|
|
59
|
+
if (abortRef.current === controller) {
|
|
60
|
+
abortRef.current = null;
|
|
61
|
+
refreshInFlightRef.current = false;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}, [baseUrl, sessionId]);
|
|
65
|
+
(0, react_1.useEffect)(() => {
|
|
66
|
+
if (!sessionId) {
|
|
67
|
+
console.debug('[NATS] no sessionId, skipping config fetch');
|
|
68
|
+
setConfig(null);
|
|
69
|
+
setConfigError(null);
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
void refreshConfig('initial');
|
|
47
73
|
return () => {
|
|
48
|
-
|
|
49
|
-
|
|
74
|
+
var _a;
|
|
75
|
+
(_a = abortRef.current) === null || _a === void 0 ? void 0 : _a.abort();
|
|
76
|
+
abortRef.current = null;
|
|
77
|
+
refreshInFlightRef.current = false;
|
|
50
78
|
};
|
|
51
|
-
}, [
|
|
79
|
+
}, [sessionId, refreshConfig]);
|
|
80
|
+
(0, react_1.useEffect)(() => {
|
|
81
|
+
if (!sessionId)
|
|
82
|
+
return;
|
|
83
|
+
const requestResume = () => {
|
|
84
|
+
if (document.visibilityState === 'visible') {
|
|
85
|
+
void refreshConfig('resume');
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
const onVisibilityChange = () => {
|
|
89
|
+
if (document.visibilityState === 'visible')
|
|
90
|
+
requestResume();
|
|
91
|
+
};
|
|
92
|
+
const onPageShow = (event) => {
|
|
93
|
+
if (event.persisted)
|
|
94
|
+
requestResume();
|
|
95
|
+
};
|
|
96
|
+
document.addEventListener('visibilitychange', onVisibilityChange);
|
|
97
|
+
window.addEventListener('online', requestResume);
|
|
98
|
+
window.addEventListener('pageshow', onPageShow);
|
|
99
|
+
return () => {
|
|
100
|
+
document.removeEventListener('visibilitychange', onVisibilityChange);
|
|
101
|
+
window.removeEventListener('online', requestResume);
|
|
102
|
+
window.removeEventListener('pageshow', onPageShow);
|
|
103
|
+
};
|
|
104
|
+
}, [sessionId, refreshConfig]);
|
|
52
105
|
const handleMessage = (0, react_1.useCallback)((event) => {
|
|
53
106
|
var _a, _b, _c;
|
|
54
107
|
console.debug('[NATS] dispatching event', { eventType: event.eventType });
|
|
@@ -66,7 +119,21 @@ function useNats({ baseUrl, sessionId, onProgress, onDialogResponse, onError, })
|
|
|
66
119
|
console.warn('Unknown NATS event', event);
|
|
67
120
|
}
|
|
68
121
|
}, []);
|
|
69
|
-
(0,
|
|
122
|
+
const handleConnected = (0, react_1.useCallback)(() => {
|
|
123
|
+
var _a;
|
|
124
|
+
if (!catchUpAfterConnectRef.current)
|
|
125
|
+
return;
|
|
126
|
+
catchUpAfterConnectRef.current = false;
|
|
127
|
+
void ((_a = onCatchUpRef.current) === null || _a === void 0 ? void 0 : _a.call(onCatchUpRef));
|
|
128
|
+
}, []);
|
|
129
|
+
const handleAuthError = (0, react_1.useCallback)((error) => {
|
|
130
|
+
console.warn('[NATS] JWT rejected or expired; refreshing credentials', error);
|
|
131
|
+
void refreshConfig('auth');
|
|
132
|
+
}, [refreshConfig]);
|
|
133
|
+
(0, useNatsSession_1.useNatsSession)(sessionId, config !== null && config !== void 0 ? config : undefined, handleMessage, {
|
|
134
|
+
onConnected: handleConnected,
|
|
135
|
+
onAuthError: handleAuthError,
|
|
136
|
+
});
|
|
70
137
|
return {
|
|
71
138
|
connected: !!config,
|
|
72
139
|
configError,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useNats.js","sourceRoot":"","sources":["../../../src/helpers/nats/useNats.ts"],"names":[],"mappings":";;;AAKA,iCAAiE;AACjE,mDAA4D;AAC5D,qDAM0B;
|
|
1
|
+
{"version":3,"file":"useNats.js","sourceRoot":"","sources":["../../../src/helpers/nats/useNats.ts"],"names":[],"mappings":";;;AAKA,iCAAiE;AACjE,mDAA4D;AAC5D,qDAM0B;AA0B1B,SAAgB,OAAO,CAAC,EACtB,OAAO,EACP,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,OAAO,EACP,SAAS,GACM;IACf,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAoB,IAAI,CAAC,CAAC;IAC9D,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAAe,IAAI,CAAC,CAAC;IAGnE,MAAM,aAAa,GAAG,IAAA,cAAM,EAAC,UAAU,CAAC,CAAC;IACzC,MAAM,mBAAmB,GAAG,IAAA,cAAM,EAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,IAAA,cAAM,EAAC,OAAO,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,IAAA,cAAM,EAAC,SAAS,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,IAAA,cAAM,EAAyB,IAAI,CAAC,CAAC;IACtD,MAAM,sBAAsB,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,kBAAkB,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IACzC,MAAM,kBAAkB,GAAG,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC;IACrC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,aAAa,CAAC,OAAO,GAAG,UAAU,CAAC;QACnC,mBAAmB,CAAC,OAAO,GAAG,gBAAgB,CAAC;QAC/C,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;QAC7B,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IACnC,CAAC,EAAE,CAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IAEvD,MAAM,aAAa,GAAG,IAAA,mBAAW,EAC/B,KAAK,EAAE,MAAqC,EAAE,EAAE;;QAC9C,IAAI,CAAC,SAAS,IAAI,kBAAkB,CAAC,OAAO;YAAE,OAAO;QACrD,IAAI,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB,CAAC,OAAO,GAAG,IAAI,EAAE;YACvE,OAAO;SACR;QAED,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAC;QAClC,IAAI,MAAM,KAAK,MAAM;YAAE,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/D,MAAA,QAAQ,CAAC,OAAO,0CAAE,KAAK,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,QAAQ,CAAC,OAAO,GAAG,UAAU,CAAC;QAE9B,OAAO,CAAC,IAAI,CACV,6BAA6B,EAC7B,GAAG,OAAO,WAAW,EACrB,aAAa,EACb,SAAS,EACT,IAAI,MAAM,GAAG,CACd,CAAC;QACF,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,IAAA,6BAAa,EAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;YACvE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE;gBAC9B,sBAAsB,CAAC,OAAO,GAAG,MAAM,KAAK,SAAS,CAAC;gBACtD,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE;oBACrC,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM;oBACvB,MAAM,EAAE,GAAG,CAAC,MAAM;iBACnB,CAAC,CAAC;gBACH,SAAS,CAAC,GAAG,CAAC,CAAC;gBACf,cAAc,CAAC,IAAI,CAAC,CAAC;aACtB;SACF;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,YAAY,EAAE;gBAC5D,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;gBAC1C,SAAS,CAAC,IAAI,CAAC,CAAC;gBAChB,cAAc,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACrE;SACF;gBAAS;YACR,IAAI,QAAQ,CAAC,OAAO,KAAK,UAAU,EAAE;gBACnC,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;gBACxB,kBAAkB,CAAC,OAAO,GAAG,KAAK,CAAC;aACpC;SACF;IACH,CAAC,EACD,CAAC,OAAO,EAAE,SAAS,CAAC,CACrB,CAAC;IAGF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC5D,SAAS,CAAC,IAAI,CAAC,CAAC;YAChB,cAAc,CAAC,IAAI,CAAC,CAAC;YACrB,OAAO;SACR;QAED,KAAK,aAAa,CAAC,SAAS,CAAC,CAAC;QAC9B,OAAO,GAAG,EAAE;;YACV,MAAA,QAAQ,CAAC,OAAO,0CAAE,KAAK,EAAE,CAAC;YAC1B,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;YACxB,kBAAkB,CAAC,OAAO,GAAG,KAAK,CAAC;QACrC,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;IAI/B,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,MAAM,aAAa,GAAG,GAAG,EAAE;YACzB,IAAI,QAAQ,CAAC,eAAe,KAAK,SAAS,EAAE;gBAC1C,KAAK,aAAa,CAAC,QAAQ,CAAC,CAAC;aAC9B;QACH,CAAC,CAAC;QACF,MAAM,kBAAkB,GAAG,GAAG,EAAE;YAC9B,IAAI,QAAQ,CAAC,eAAe,KAAK,SAAS;gBAAE,aAAa,EAAE,CAAC;QAC9D,CAAC,CAAC;QACF,MAAM,UAAU,GAAG,CAAC,KAA0B,EAAE,EAAE;YAChD,IAAI,KAAK,CAAC,SAAS;gBAAE,aAAa,EAAE,CAAC;QACvC,CAAC,CAAC;QAEF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;QAClE,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QACjD,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAChD,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;YACrE,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;YACpD,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACrD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;IAE/B,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,CAAC,KAAuB,EAAE,EAAE;;QAC5D,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;QAC1E,QAAQ,KAAK,CAAC,SAAS,EAAE;YACvB,KAAK,UAAU;gBACb,MAAA,aAAa,CAAC,OAAO,8DAAG,KAAK,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,8BAA8B;gBACjC,MAAA,mBAAmB,CAAC,OAAO,oEAAG,KAAK,CAAC,CAAC;gBACrC,MAAM;YACR,KAAK,OAAO;gBACV,MAAA,UAAU,CAAC,OAAO,2DAAG,KAAK,CAAC,CAAC;gBAC5B,MAAM;YACR;gBACE,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;SAC7C;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;;QACvC,IAAI,CAAC,sBAAsB,CAAC,OAAO;YAAE,OAAO;QAC5C,sBAAsB,CAAC,OAAO,GAAG,KAAK,CAAC;QACvC,KAAK,CAAA,MAAA,YAAY,CAAC,OAAO,4DAAI,CAAA,CAAC;IAChC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,IAAA,mBAAW,EACjC,CAAC,KAAY,EAAE,EAAE;QACf,OAAO,CAAC,IAAI,CACV,wDAAwD,EACxD,KAAK,CACN,CAAC;QACF,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,IAAA,+BAAc,EAAC,SAAS,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,aAAa,EAAE;QAC5D,WAAW,EAAE,eAAe;QAC5B,WAAW,EAAE,eAAe;KAC7B,CAAC,CAAC;IAEH,OAAO;QAEL,SAAS,EAAE,CAAC,CAAC,MAAM;QAEnB,WAAW;KACZ,CAAC;AACJ,CAAC;AApKD,0BAoKC"}
|
|
@@ -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,9 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.useNatsSession = exports.normalizeNatsEvent = void 0;
|
|
3
|
+
exports.useNatsSession = exports.normalizeNatsEvent = exports.isNatsAuthError = void 0;
|
|
4
4
|
const react_1 = require("react");
|
|
5
5
|
const nats_core_1 = require("@nats-io/nats-core");
|
|
6
6
|
const jetstream_1 = require("@nats-io/jetstream");
|
|
7
|
+
function isNatsAuthError(error) {
|
|
8
|
+
return (error instanceof nats_core_1.AuthorizationError ||
|
|
9
|
+
error instanceof nats_core_1.UserAuthenticationExpiredError ||
|
|
10
|
+
(error instanceof Error &&
|
|
11
|
+
/authorization violation|authentication expired|user authentication expired/i.test(error.message)));
|
|
12
|
+
}
|
|
13
|
+
exports.isNatsAuthError = isNatsAuthError;
|
|
7
14
|
function readString(raw, camelKey, snakeKey) {
|
|
8
15
|
var _a;
|
|
9
16
|
const value = (_a = raw[camelKey]) !== null && _a !== void 0 ? _a : raw[snakeKey];
|
|
@@ -67,9 +74,10 @@ function decodeMessage(subject, received, raw, onMessage) {
|
|
|
67
74
|
console.debug(`[NATS] message #${received} on ${subject} (eventType=${payload.eventType})`, payload);
|
|
68
75
|
onMessage(payload);
|
|
69
76
|
}
|
|
70
|
-
async function consumeCoreSubscription(nc, subject, onMessage) {
|
|
77
|
+
async function consumeCoreSubscription(nc, subject, onMessage, onReady) {
|
|
71
78
|
const sub = nc.subscribe(subject);
|
|
72
79
|
console.info('[NATS] subscribed to subject', subject);
|
|
80
|
+
onReady();
|
|
73
81
|
let received = 0;
|
|
74
82
|
for await (const msg of sub) {
|
|
75
83
|
received += 1;
|
|
@@ -82,7 +90,7 @@ async function consumeCoreSubscription(nc, subject, onMessage) {
|
|
|
82
90
|
}
|
|
83
91
|
console.info(`[NATS] subscription on ${subject} closed (received ${received} messages)`);
|
|
84
92
|
}
|
|
85
|
-
async function consumeJetStream(nc, config, subject, mode, onMessage, setConsumerMessages) {
|
|
93
|
+
async function consumeJetStream(nc, config, subject, mode, onMessage, setConsumerMessages, onReady) {
|
|
86
94
|
const js = (0, jetstream_1.jetstream)(nc);
|
|
87
95
|
const consumer = config.consumer
|
|
88
96
|
? await js.consumers.get(config.stream, config.consumer)
|
|
@@ -97,6 +105,7 @@ async function consumeJetStream(nc, config, subject, mode, onMessage, setConsume
|
|
|
97
105
|
: { stream: config.stream, subject, mode });
|
|
98
106
|
const messages = await consumer.consume();
|
|
99
107
|
setConsumerMessages(messages);
|
|
108
|
+
onReady();
|
|
100
109
|
let received = 0;
|
|
101
110
|
for await (const msg of messages) {
|
|
102
111
|
received += 1;
|
|
@@ -116,15 +125,19 @@ function closeNatsSession(consumerMessagesRef, connRef) {
|
|
|
116
125
|
(_b = connRef.current) === null || _b === void 0 ? void 0 : _b.close();
|
|
117
126
|
connRef.current = null;
|
|
118
127
|
}
|
|
119
|
-
function useNatsSession(sessionId, config, onMessage) {
|
|
128
|
+
function useNatsSession(sessionId, config, onMessage, lifecycle = {}) {
|
|
120
129
|
const connRef = (0, react_1.useRef)(null);
|
|
121
130
|
const consumerMessagesRef = (0, react_1.useRef)(null);
|
|
122
131
|
const onMessageRef = (0, react_1.useRef)(onMessage);
|
|
132
|
+
const lifecycleRef = (0, react_1.useRef)(lifecycle);
|
|
123
133
|
const wasHiddenRef = (0, react_1.useRef)(false);
|
|
124
134
|
const [resumeGeneration, setResumeGeneration] = (0, react_1.useState)(0);
|
|
125
135
|
(0, react_1.useEffect)(() => {
|
|
126
136
|
onMessageRef.current = onMessage;
|
|
127
137
|
}, [onMessage]);
|
|
138
|
+
(0, react_1.useEffect)(() => {
|
|
139
|
+
lifecycleRef.current = lifecycle;
|
|
140
|
+
}, [lifecycle]);
|
|
128
141
|
(0, react_1.useEffect)(() => {
|
|
129
142
|
if (!sessionId || !(config === null || config === void 0 ? void 0 : config.stream)) {
|
|
130
143
|
return;
|
|
@@ -178,7 +191,7 @@ function useNatsSession(sessionId, config, onMessage) {
|
|
|
178
191
|
console.info('[NATS] connecting to', config.url, 'for session', sessionId, useJetStream ? `(JetStream/${jetStreamMode})` : '(core)');
|
|
179
192
|
const nc = await (0, nats_core_1.wsconnect)({
|
|
180
193
|
servers: [config.url],
|
|
181
|
-
|
|
194
|
+
authenticator: (0, nats_core_1.jwtAuthenticator)(config.token),
|
|
182
195
|
});
|
|
183
196
|
if (closed) {
|
|
184
197
|
console.debug('[NATS] connection established after cleanup, closing immediately');
|
|
@@ -190,15 +203,43 @@ function useNatsSession(sessionId, config, onMessage) {
|
|
|
190
203
|
const dispatch = (event) => {
|
|
191
204
|
onMessageRef.current(event);
|
|
192
205
|
};
|
|
206
|
+
const ready = () => { var _a, _b; return (_b = (_a = lifecycleRef.current).onConnected) === null || _b === void 0 ? void 0 : _b.call(_a); };
|
|
207
|
+
let authRefreshRequested = false;
|
|
208
|
+
const requestAuthRefresh = (error) => {
|
|
209
|
+
var _a, _b;
|
|
210
|
+
if (closed || authRefreshRequested)
|
|
211
|
+
return;
|
|
212
|
+
authRefreshRequested = true;
|
|
213
|
+
(_b = (_a = lifecycleRef.current).onAuthError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
|
|
214
|
+
};
|
|
215
|
+
void (async () => {
|
|
216
|
+
for await (const status of nc.status()) {
|
|
217
|
+
if (status.type === 'error' && isNatsAuthError(status.error)) {
|
|
218
|
+
requestAuthRefresh(status.error);
|
|
219
|
+
return;
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
})();
|
|
223
|
+
void nc.closed().then(error => {
|
|
224
|
+
if (error && isNatsAuthError(error)) {
|
|
225
|
+
requestAuthRefresh(error);
|
|
226
|
+
}
|
|
227
|
+
});
|
|
193
228
|
if (useJetStream) {
|
|
194
229
|
await consumeJetStream(nc, config, subject, jetStreamMode, dispatch, messages => {
|
|
195
230
|
consumerMessagesRef.current = messages;
|
|
196
|
-
});
|
|
231
|
+
}, ready);
|
|
197
232
|
}
|
|
198
233
|
else {
|
|
199
|
-
await consumeCoreSubscription(nc, subject, dispatch);
|
|
234
|
+
await consumeCoreSubscription(nc, subject, dispatch, ready);
|
|
235
|
+
}
|
|
236
|
+
})().catch(err => {
|
|
237
|
+
var _a, _b;
|
|
238
|
+
console.error('[NATS] connection error', err);
|
|
239
|
+
if (!closed && isNatsAuthError(err)) {
|
|
240
|
+
(_b = (_a = lifecycleRef.current).onAuthError) === null || _b === void 0 ? void 0 : _b.call(_a, err);
|
|
200
241
|
}
|
|
201
|
-
})
|
|
242
|
+
});
|
|
202
243
|
return () => {
|
|
203
244
|
console.info('[NATS] cleanup: closing connection for subject', subject);
|
|
204
245
|
closed = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useNatsSession.js","sourceRoot":"","sources":["../../../src/helpers/nats/useNatsSession.ts"],"names":[],"mappings":";;;AAYA,iCAA2E;AAC3E,
|
|
1
|
+
{"version":3,"file":"useNatsSession.js","sourceRoot":"","sources":["../../../src/helpers/nats/useNatsSession.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "8.
|
|
1
|
+
export declare const version = "8.45.0";
|
package/dist/version.js
CHANGED
|
@@ -7,6 +7,7 @@ import StartPanel, { Props as StartPanelProps } from '../StartPanel/StartPanel';
|
|
|
7
7
|
import Avatar, { Props as AvatarProps } from '../Avatar/Avatar';
|
|
8
8
|
import Header, { Props as HeaderProps } from '../Header/Header';
|
|
9
9
|
declare const getMemoriState: (integrationId?: string | undefined) => object | null;
|
|
10
|
+
export declare function dialogStateFingerprint(state: DialogState | undefined): string;
|
|
10
11
|
type MemoriTextEnteredEvent = CustomEvent<{
|
|
11
12
|
text: string;
|
|
12
13
|
waitForPrevious?: boolean;
|
|
@@ -78,6 +78,21 @@ function readCorrelationID(response) {
|
|
|
78
78
|
const value = response.correlationID;
|
|
79
79
|
return typeof value === 'string' && value.length > 0 ? value : undefined;
|
|
80
80
|
}
|
|
81
|
+
export function dialogStateFingerprint(state) {
|
|
82
|
+
if (!state)
|
|
83
|
+
return '';
|
|
84
|
+
return JSON.stringify({
|
|
85
|
+
state: state.state,
|
|
86
|
+
previousState: state.previousState,
|
|
87
|
+
emission: state.emission,
|
|
88
|
+
emitter: state.emitter,
|
|
89
|
+
lastMatchedMemoryID: state.lastMatchedMemoryID,
|
|
90
|
+
currentDate: state.currentDate,
|
|
91
|
+
currentMemoryID: state.currentMemoryID,
|
|
92
|
+
contextVars: state.contextVars,
|
|
93
|
+
emittedMedia: state.emittedMedia,
|
|
94
|
+
});
|
|
95
|
+
}
|
|
81
96
|
const typeMessage = (message, waitForPrevious = true, hidden = false, typingText, useLoaderTextAsMsg = false, hasBatchQueued = false) => {
|
|
82
97
|
const e = new CustomEvent('MemoriTextEntered', {
|
|
83
98
|
detail: {
|
|
@@ -492,6 +507,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
|
|
|
492
507
|
if (response.resultCode === 0 && correlationID) {
|
|
493
508
|
registerPendingEnterText(correlationID, {
|
|
494
509
|
msg,
|
|
510
|
+
stateBeforeRequest: dialogStateFingerprint(currentDialogState),
|
|
495
511
|
text,
|
|
496
512
|
media,
|
|
497
513
|
translate,
|
|
@@ -1380,6 +1396,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
|
|
|
1380
1396
|
reject(new Error('NATS enter-text response timeout'));
|
|
1381
1397
|
}, timeoutMs);
|
|
1382
1398
|
registerPendingEnterText(correlationID, {
|
|
1399
|
+
stateBeforeRequest: dialogStateFingerprint(currentDialogState),
|
|
1383
1400
|
waitForResponse: {
|
|
1384
1401
|
resolve: event => {
|
|
1385
1402
|
clearTimeout(timeoutId);
|
|
@@ -1392,7 +1409,45 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
|
|
|
1392
1409
|
timeoutId,
|
|
1393
1410
|
},
|
|
1394
1411
|
});
|
|
1395
|
-
}), [registerPendingEnterText, clearEnterTextPending]);
|
|
1412
|
+
}), [registerPendingEnterText, clearEnterTextPending, currentDialogState]);
|
|
1413
|
+
const catchUpPendingEnterText = useCallback(async () => {
|
|
1414
|
+
if (!sessionId || pendingEnterTextRef.current.size === 0)
|
|
1415
|
+
return;
|
|
1416
|
+
const latest = Array.from(pendingEnterTextRef.current.entries()).pop();
|
|
1417
|
+
if (!latest)
|
|
1418
|
+
return;
|
|
1419
|
+
const [correlationID, pending] = latest;
|
|
1420
|
+
try {
|
|
1421
|
+
const { currentState, resultCode, resultMessage, requestID } = await getSession(sessionId);
|
|
1422
|
+
if (resultCode !== 0 || !currentState) {
|
|
1423
|
+
deliverEnterTextNatsResponse(correlationID, {
|
|
1424
|
+
eventType: 'dialog_text_entered_response',
|
|
1425
|
+
correlationID,
|
|
1426
|
+
requestID,
|
|
1427
|
+
resultCode,
|
|
1428
|
+
resultMessage,
|
|
1429
|
+
currentState,
|
|
1430
|
+
});
|
|
1431
|
+
return;
|
|
1432
|
+
}
|
|
1433
|
+
if (dialogStateFingerprint(currentState) === pending.stateBeforeRequest) {
|
|
1434
|
+
console.info('[NATS] catch-up: pending turn has not completed yet');
|
|
1435
|
+
return;
|
|
1436
|
+
}
|
|
1437
|
+
console.info('[NATS] catch-up: applying current engine session state');
|
|
1438
|
+
deliverEnterTextNatsResponse(correlationID, {
|
|
1439
|
+
eventType: 'dialog_text_entered_response',
|
|
1440
|
+
correlationID,
|
|
1441
|
+
requestID,
|
|
1442
|
+
resultCode,
|
|
1443
|
+
resultMessage,
|
|
1444
|
+
currentState,
|
|
1445
|
+
});
|
|
1446
|
+
}
|
|
1447
|
+
catch (error) {
|
|
1448
|
+
logWidgetError('NATS catch-up failed', error);
|
|
1449
|
+
}
|
|
1450
|
+
}, [sessionId, deliverEnterTextNatsResponse]);
|
|
1396
1451
|
useNats({
|
|
1397
1452
|
baseUrl,
|
|
1398
1453
|
sessionId,
|
|
@@ -1412,6 +1467,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
|
|
|
1412
1467
|
deliverEnterTextNatsResponse(correlationID, event);
|
|
1413
1468
|
}, [deliverEnterTextNatsResponse]),
|
|
1414
1469
|
onError: deliverEnterTextNatsError,
|
|
1470
|
+
onCatchUp: catchUpPendingEnterText,
|
|
1415
1471
|
});
|
|
1416
1472
|
const focusChatInput = () => {
|
|
1417
1473
|
let textarea = document.querySelector('#chat-fieldset textarea');
|