@memori.ai/memori-react 8.41.0 → 8.41.2

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.
Files changed (55) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/components/Avatar/Avatar.js +5 -10
  3. package/dist/components/Avatar/Avatar.js.map +1 -1
  4. package/dist/components/MemoriWidget/MemoriWidget.js +123 -26
  5. package/dist/components/MemoriWidget/MemoriWidget.js.map +1 -1
  6. package/dist/components/layouts/website-assistant.css +2 -1
  7. package/dist/helpers/nats/isSessionExpiredError.d.ts +3 -0
  8. package/dist/helpers/nats/isSessionExpiredError.js +37 -0
  9. package/dist/helpers/nats/isSessionExpiredError.js.map +1 -0
  10. package/dist/locales/de.json +1 -0
  11. package/dist/locales/en.json +1 -0
  12. package/dist/locales/es.json +1 -0
  13. package/dist/locales/fr.json +1 -0
  14. package/dist/locales/it.json +1 -0
  15. package/dist/types/integration.d.ts +3 -0
  16. package/dist/types/integration.js +16 -0
  17. package/dist/types/integration.js.map +1 -0
  18. package/dist/version.d.ts +1 -1
  19. package/dist/version.js +1 -1
  20. package/esm/components/Avatar/Avatar.js +5 -10
  21. package/esm/components/Avatar/Avatar.js.map +1 -1
  22. package/esm/components/MemoriWidget/MemoriWidget.js +123 -26
  23. package/esm/components/MemoriWidget/MemoriWidget.js.map +1 -1
  24. package/esm/components/layouts/website-assistant.css +2 -1
  25. package/esm/helpers/nats/isSessionExpiredError.d.ts +3 -0
  26. package/esm/helpers/nats/isSessionExpiredError.js +32 -0
  27. package/esm/helpers/nats/isSessionExpiredError.js.map +1 -0
  28. package/esm/locales/de.json +1 -0
  29. package/esm/locales/en.json +1 -0
  30. package/esm/locales/es.json +1 -0
  31. package/esm/locales/fr.json +1 -0
  32. package/esm/locales/it.json +1 -0
  33. package/esm/types/integration.d.ts +3 -0
  34. package/esm/types/integration.js +11 -0
  35. package/esm/types/integration.js.map +1 -0
  36. package/esm/version.d.ts +1 -1
  37. package/esm/version.js +1 -1
  38. package/package.json +1 -1
  39. package/src/components/Avatar/Avatar.stories.tsx +45 -28
  40. package/src/components/Avatar/Avatar.test.tsx +27 -0
  41. package/src/components/Avatar/Avatar.tsx +8 -12
  42. package/src/components/Avatar/__snapshots__/Avatar.test.tsx.snap +63 -0
  43. package/src/components/MemoriWidget/MemoriWidget.tsx +195 -46
  44. package/src/components/layouts/website-assistant.css +2 -1
  45. package/src/helpers/nats/isSessionExpiredError.test.ts +38 -0
  46. package/src/helpers/nats/isSessionExpiredError.ts +51 -0
  47. package/src/index.stories.tsx +16 -0
  48. package/src/locales/de.json +1 -0
  49. package/src/locales/en.json +1 -0
  50. package/src/locales/es.json +1 -0
  51. package/src/locales/fr.json +1 -0
  52. package/src/locales/it.json +1 -0
  53. package/src/types/integration.test.ts +32 -0
  54. package/src/types/integration.ts +31 -0
  55. package/src/version.ts +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
 
2
2
 
3
+ ## [8.41.2](https://github.com/memori-ai/memori-react/compare/v8.41.1...v8.41.2) (2026-06-25)
4
+
5
+
6
+ ### Features
7
+
8
+ * add avatar-configurator support in Avatar component and related tests ([1575bd8](https://github.com/memori-ai/memori-react/commit/1575bd8c48b6a15f2790e3a0fb64aaca2f991861))
9
+
10
+ ## [8.41.1](https://github.com/memori-ai/memori-react/compare/v8.41.0...v8.41.1) (2026-06-25)
11
+
12
+
13
+ ### Features
14
+
15
+ * implement session expiration handling in MemoriWidget and add related tests ([65e96fa](https://github.com/memori-ai/memori-react/commit/65e96fa561462fc60abbcd71ef461cacd7b2b263))
16
+
3
17
  ## [8.41.0](https://github.com/memori-ai/memori-react/compare/v8.40.4...v8.41.0) (2026-06-22)
4
18
 
5
19
 
@@ -16,6 +16,7 @@ const Edit_1 = tslib_1.__importDefault(require("../icons/Edit"));
16
16
  const classnames_1 = tslib_1.__importDefault(require("classnames"));
17
17
  const AvatarView_1 = tslib_1.__importDefault(require("./AvatarView"));
18
18
  const visemeContext_1 = require("../../context/visemeContext");
19
+ const integration_1 = require("../../types/integration");
19
20
  const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = false, avatar3dVisible = false, setAvatar3dVisible, hasUserActivatedSpeak = false, isPlayingAudio = false, loading = false, baseUrl, apiUrl, animation, isZoomed = false, chatProps, avatarType = null, enablePositionControls, setEnablePositionControls, isTotem = false, }) => {
20
21
  const { t } = (0, react_i18next_1.useTranslation)();
21
22
  const [isClient, setIsClient] = (0, react_1.useState)(false);
@@ -38,11 +39,7 @@ const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = fal
38
39
  return undefined;
39
40
  };
40
41
  const renderAvatar = () => {
41
- if (((integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme' ||
42
- (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme-full' ||
43
- (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customglb' ||
44
- (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customrpm') &&
45
- (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatarURL) &&
42
+ if ((0, integration_1.is3dAvatarWithUrl)(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar, integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatarURL) &&
46
43
  avatarType &&
47
44
  avatarType !== 'blob') {
48
45
  return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("div", { className: (0, classnames_1.default)('memori--avatar-wrapper', `memori--avatar-${(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) || 'default'}`, {
@@ -53,14 +50,12 @@ const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = fal
53
50
  };
54
51
  const renderAvatarContent = () => {
55
52
  var _a;
56
- if (!isClient)
53
+ if (!isClient || !integrationConfig)
57
54
  return null;
58
- if ((integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme' ||
59
- (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme-full' ||
60
- (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customrpm') {
55
+ if ((0, integration_1.usesRpmAvatarView)(integrationConfig.avatar)) {
61
56
  return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.default, { fallback: (0, jsx_runtime_1.jsx)("div", { className: "memori--blob-container", children: isClient && ((0, jsx_runtime_1.jsx)(Blob_1.default, { speaking: isPlayingAudio, avatar: getAvatarUrl() })) }), children: (0, jsx_runtime_1.jsx)(AvatarView_1.default, { enablePositionControls: enablePositionControls, updateCurrentViseme: updateCurrentViseme, url: integrationConfig.avatarURL, sex: memori.voiceType === 'FEMALE' ? 'FEMALE' : 'MALE', fallbackImg: getAvatarUrl(), headMovement: true, eyeBlink: true, animation: animation, halfBody: integrationConfig.avatar === 'readyplayerme', speaking: isPlayingAudio, loading: loading, style: getAvatarStyle(), stopProcessing: stopProcessing, resetVisemeQueue: resetVisemeQueue, isZoomed: isZoomed, isTotem: isTotem, chatEmission: (_a = chatProps === null || chatProps === void 0 ? void 0 : chatProps.dialogState) === null || _a === void 0 ? void 0 : _a.emission, setEnablePositionControls: setEnablePositionControls }) }));
62
57
  }
63
- if ((integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customglb') {
58
+ if (integrationConfig.avatar === 'customglb') {
64
59
  return ((0, jsx_runtime_1.jsx)(ModelViewer_1.default, { poster: getAvatarUrl() || '', src: integrationConfig.avatarURL, alt: "" }));
65
60
  }
66
61
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":"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"}
@@ -42,6 +42,7 @@ const useTTS_1 = require("../../helpers/tts/useTTS");
42
42
  const ChatHistory_1 = tslib_1.__importDefault(require("../ChatHistoryDrawer/ChatHistory"));
43
43
  const useSTT_1 = require("../../helpers/stt/useSTT");
44
44
  const useNats_1 = require("../../helpers/nats/useNats");
45
+ const isSessionExpiredError_1 = require("../../helpers/nats/isSessionExpiredError");
45
46
  const getMemoriState = (integrationId) => {
46
47
  var _a, _b, _c, _d, _f;
47
48
  let widget = integrationId
@@ -395,8 +396,8 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
395
396
  });
396
397
  };
397
398
  const [chatLogID, setChatLogID] = (0, react_1.useState)(undefined);
398
- const sendMessage = async (text, media, newSessionId, translate = true, translatedText, hidden = false, typingText, useLoaderTextAsMsg = false, hasBatchQueued = false) => {
399
- var _a, _b, _c, _d;
399
+ const sendMessage = async (text, media, newSessionId, translate = true, translatedText, hidden = false, typingText, useLoaderTextAsMsg = false, hasBatchQueued = false, skipHistoryPush = false) => {
400
+ var _a, _b;
400
401
  const sessionID = newSessionId ||
401
402
  sessionId ||
402
403
  ((_a = window.getMemoriState()) === null || _a === void 0 ? void 0 : _a.sessionID);
@@ -440,7 +441,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
440
441
  return;
441
442
  }
442
443
  }
443
- if (!hidden)
444
+ if (!hidden && !skipHistoryPush)
444
445
  pushMessage({
445
446
  text: text,
446
447
  translatedText,
@@ -465,6 +466,11 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
465
466
  if (response.resultCode === 0 && correlationID) {
466
467
  registerPendingEnterText(correlationID, {
467
468
  msg,
469
+ text,
470
+ media,
471
+ translate,
472
+ translatedText,
473
+ hidden,
468
474
  typingText,
469
475
  useLoaderTextAsMsg,
470
476
  hasBatchQueued,
@@ -476,18 +482,17 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
476
482
  logWidgetError('enter-text missing correlationID', response);
477
483
  }
478
484
  else if (response.resultCode === 404) {
479
- setHistory(h => [...h.slice(0, h.length - 1)]);
480
- reopenSession(true, memoriPwd || memori.secretToken, memoriTokens, undefined, undefined, {
481
- LANG: userLang,
482
- PATHNAME: window.location.pathname,
483
- ROUTE: ((_d = (_c = window.location.pathname) === null || _c === void 0 ? void 0 : _c.split('/')) === null || _d === void 0 ? void 0 : _d.pop()) || '',
484
- ...(initialContextVars || {}),
485
- }, initialQuestion, undefined, undefined, undefined, undefined, true).then(state => {
486
- if (state === null || state === void 0 ? void 0 : state.sessionID) {
487
- setTimeout(() => {
488
- sendMessage(text, media, state === null || state === void 0 ? void 0 : state.sessionID);
489
- }, 500);
490
- }
485
+ retryAfterExpiredSessionRef.current({
486
+ text,
487
+ media,
488
+ translate,
489
+ translatedText,
490
+ hidden,
491
+ typingText,
492
+ useLoaderTextAsMsg,
493
+ hasBatchQueued,
494
+ expiredSessionID: sessionID,
495
+ continueFromChatLogID: chatLogID,
491
496
  });
492
497
  }
493
498
  else if (response.resultCode === 500 && response.resultMessage) {
@@ -792,7 +797,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
792
797
  logWidgetError('fetchSession failed', err);
793
798
  }
794
799
  };
795
- const reopenSession = async (updateDialogState = false, password, recoveryTokens, tag, pin, initialContextVars, initialQuestion, birthDate, additionalInfoProp, continueFromChatLogID, continueFromSessionID, isSessionExpired) => {
800
+ const reopenSession = async (updateDialogState = false, password, recoveryTokens, tag, pin, initialContextVars, initialQuestion, birthDate, additionalInfoProp, continueFromChatLogID, continueFromSessionID, isSessionExpired, suppressHistoryUpdate) => {
796
801
  var _a, _b, _c, _d, _f, _g, _h, _j, _k, _l, _m;
797
802
  setLoading(true);
798
803
  let storageBirthDate = (0, configuration_1.getLocalConfig)('birthDate', undefined);
@@ -851,9 +856,22 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
851
856
  setSessionId(sessionID);
852
857
  if (updateDialogState) {
853
858
  setCurrentDialogState(currentState);
854
- if (currentState.emission) {
855
- const initialStatus = isSessionExpired && history.length > 1
856
- ? 'Session Expired, reopening session'
859
+ const sessionExpiredStatus = isSessionExpired && history.length > 1
860
+ ? t('sessionExpiredReopening')
861
+ : null;
862
+ if (sessionExpiredStatus && suppressHistoryUpdate) {
863
+ pushMessage({
864
+ text: '',
865
+ emitter: 'system',
866
+ fromUser: false,
867
+ initial: sessionExpiredStatus,
868
+ contextVars: {},
869
+ date: new Date().toISOString(),
870
+ });
871
+ }
872
+ if (currentState.emission && !suppressHistoryUpdate) {
873
+ const initialStatus = sessionExpiredStatus
874
+ ? sessionExpiredStatus
857
875
  : history.length <= 1
858
876
  ? true
859
877
  : undefined;
@@ -920,6 +938,50 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
920
938
  setLoading(false);
921
939
  return null;
922
940
  };
941
+ const retryAfterExpiredSessionRef = (0, react_1.useRef)(() => Promise.resolve(null));
942
+ retryAfterExpiredSessionRef.current = (params) => {
943
+ const { text, media, translate = true, translatedText, hidden = false, typingText, useLoaderTextAsMsg = false, hasBatchQueued = false, expiredSessionID, continueFromChatLogID: continueFromChatLogIDParam, } = params;
944
+ const continueFromSessionID = expiredSessionID !== null && expiredSessionID !== void 0 ? expiredSessionID : sessionId;
945
+ const continueFromChatLogID = continueFromChatLogIDParam !== null && continueFromChatLogIDParam !== void 0 ? continueFromChatLogIDParam : chatLogID;
946
+ const reopenAfterExpiry = () => {
947
+ var _a, _b;
948
+ return reopenSession(true, memoriPwd || memori.secretToken, memoriTokens, undefined, undefined, {
949
+ LANG: userLang,
950
+ PATHNAME: window.location.pathname,
951
+ ROUTE: ((_b = (_a = window.location.pathname) === null || _a === void 0 ? void 0 : _a.split('/')) === null || _b === void 0 ? void 0 : _b.pop()) || '',
952
+ ...(initialContextVars || {}),
953
+ }, initialQuestion, undefined, undefined, continueFromChatLogID, continueFromSessionID, true, true);
954
+ };
955
+ const scheduleRetry = (newSessionID) => {
956
+ setTimeout(() => {
957
+ sendMessage(text, media, newSessionID, translate, translatedText, hidden, typingText, useLoaderTextAsMsg, hasBatchQueued, true);
958
+ }, 500);
959
+ };
960
+ const handleReopenFailure = (state) => {
961
+ setMemoriTyping(false);
962
+ setTypingText(undefined);
963
+ if (state === null && text && !hidden) {
964
+ react_hot_toast_1.default.error(t('errors.SESSION_EXPIRED'));
965
+ }
966
+ };
967
+ if (!text) {
968
+ return reopenAfterExpiry().then(state => {
969
+ if (!(state === null || state === void 0 ? void 0 : state.sessionID)) {
970
+ handleReopenFailure(state);
971
+ }
972
+ return state;
973
+ });
974
+ }
975
+ return reopenAfterExpiry().then(state => {
976
+ if (state === null || state === void 0 ? void 0 : state.sessionID) {
977
+ scheduleRetry(state.sessionID);
978
+ }
979
+ else {
980
+ handleReopenFailure(state);
981
+ }
982
+ return state;
983
+ });
984
+ };
923
985
  const changeTag = async (memoriId, sessionId, tag, pin) => {
924
986
  var _a, _b, _c, _d, _f, _g, _h, _j, _k;
925
987
  if (!memoriId || !sessionId) {
@@ -1115,6 +1177,23 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
1115
1177
  const { msg, typingText: pendingTypingText, useLoaderTextAsMsg, } = pending;
1116
1178
  const currentState = event.currentState;
1117
1179
  if (event.resultCode !== 0 || !currentState) {
1180
+ if ((0, isSessionExpiredError_1.isSessionExpiredNatsResponse)(event) && pending.text) {
1181
+ setMemoriTyping(false);
1182
+ setTypingText(undefined);
1183
+ retryAfterExpiredSessionRef.current({
1184
+ text: pending.text,
1185
+ media: pending.media,
1186
+ translate: pending.translate,
1187
+ translatedText: pending.translatedText,
1188
+ hidden: pending.hidden,
1189
+ typingText: pending.typingText,
1190
+ useLoaderTextAsMsg: pending.useLoaderTextAsMsg,
1191
+ hasBatchQueued: pending.hasBatchQueued,
1192
+ expiredSessionID: sessionId,
1193
+ continueFromChatLogID: chatLogID,
1194
+ });
1195
+ return;
1196
+ }
1118
1197
  if (event.resultCode === 500 && event.resultMessage) {
1119
1198
  setHistory(h => [
1120
1199
  ...h,
@@ -1195,6 +1274,31 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
1195
1274
  const deliverEnterTextNatsError = (0, react_1.useCallback)((event) => {
1196
1275
  var _a, _b, _c;
1197
1276
  const correlationID = event.correlationID;
1277
+ let pending;
1278
+ if (correlationID) {
1279
+ pending = pendingEnterTextRef.current.get(correlationID);
1280
+ if (pending) {
1281
+ clearEnterTextPending(correlationID, pending);
1282
+ (_a = pending.waitForResponse) === null || _a === void 0 ? void 0 : _a.reject(new Error((_b = event.errorMessage) !== null && _b !== void 0 ? _b : String((_c = event.errorCode) !== null && _c !== void 0 ? _c : 'NATS error')));
1283
+ }
1284
+ }
1285
+ if ((0, isSessionExpiredError_1.isSessionExpiredNatsError)(event) && (pending === null || pending === void 0 ? void 0 : pending.text)) {
1286
+ setMemoriTyping(false);
1287
+ setTypingText(undefined);
1288
+ retryAfterExpiredSessionRef.current({
1289
+ text: pending.text,
1290
+ media: pending.media,
1291
+ translate: pending.translate,
1292
+ translatedText: pending.translatedText,
1293
+ hidden: pending.hidden,
1294
+ typingText: pending.typingText,
1295
+ useLoaderTextAsMsg: pending.useLoaderTextAsMsg,
1296
+ hasBatchQueued: pending.hasBatchQueued,
1297
+ expiredSessionID: sessionId,
1298
+ continueFromChatLogID: chatLogID,
1299
+ });
1300
+ return;
1301
+ }
1198
1302
  const errorText = event.errorMessage
1199
1303
  ? `Error: ${event.errorMessage}`
1200
1304
  : event.errorCode
@@ -1208,13 +1312,6 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
1208
1312
  contextVars: {},
1209
1313
  date: new Date().toISOString(),
1210
1314
  });
1211
- if (correlationID) {
1212
- const pending = pendingEnterTextRef.current.get(correlationID);
1213
- if (pending) {
1214
- clearEnterTextPending(correlationID, pending);
1215
- (_a = pending.waitForResponse) === null || _a === void 0 ? void 0 : _a.reject(new Error((_b = event.errorMessage) !== null && _b !== void 0 ? _b : String((_c = event.errorCode) !== null && _c !== void 0 ? _c : 'NATS error')));
1216
- }
1217
- }
1218
1315
  setMemoriTyping(false);
1219
1316
  setTypingText(undefined);
1220
1317
  }, [clearEnterTextPending]);