@memori.ai/memori-react 8.41.0 → 8.41.1

package/dist/helpers/nats/isSessionExpiredError.d.ts

@@ -0,0 +1,3 @@
+import type { NatsDialogResponseEvent, NatsErrorEvent } from './useNatsSession';
+export declare function isSessionExpiredNatsError(event: NatsErrorEvent): boolean;
+export declare function isSessionExpiredNatsResponse(event: NatsDialogResponseEvent): boolean;

package/dist/helpers/nats/isSessionExpiredError.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSessionExpiredNatsResponse = exports.isSessionExpiredNatsError = void 0;
+const SESSION_NOT_FOUND = -101;
+const SESSION_EXPIRED = -103;
+const SESSION_NOT_FOUND_MESSAGE = /session\s+with\s+id\s+["']?[^"']+["']?\s+not\s+found/i;
+function isExpiredResultCode(resultCode) {
+    return (resultCode === 404 ||
+        resultCode === SESSION_EXPIRED ||
+        resultCode === SESSION_NOT_FOUND);
+}
+function isExpiredErrorMessage(message) {
+    if (!message)
+        return false;
+    return SESSION_NOT_FOUND_MESSAGE.test(message);
+}
+function isSessionExpiredNatsError(event) {
+    if (isExpiredResultCode(event.errorCode)) {
+        return true;
+    }
+    if (typeof event.errorCode === 'string') {
+        const code = event.errorCode.toUpperCase();
+        if (code.includes('SESSION_EXPIRED') || code.includes('SESSION_NOT_FOUND')) {
+            return true;
+        }
+    }
+    return isExpiredErrorMessage(event.errorMessage);
+}
+exports.isSessionExpiredNatsError = isSessionExpiredNatsError;
+function isSessionExpiredNatsResponse(event) {
+    if (isExpiredResultCode(event.resultCode)) {
+        return true;
+    }
+    return isExpiredErrorMessage(event.resultMessage);
+}
+exports.isSessionExpiredNatsResponse = isSessionExpiredNatsResponse;
+//# sourceMappingURL=isSessionExpiredError.js.map

package/dist/helpers/nats/isSessionExpiredError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isSessionExpiredError.js","sourceRoot":"","sources":["../../../src/helpers/nats/isSessionExpiredError.ts"],"names":[],"mappings":";;;AAMA,MAAM,iBAAiB,GAAG,CAAC,GAAG,CAAC;AAC/B,MAAM,eAAe,GAAG,CAAC,GAAG,CAAC;AAE7B,MAAM,yBAAyB,GAC7B,uDAAuD,CAAC;AAE1D,SAAS,mBAAmB,CAAC,UAAmB;IAC9C,OAAO,CACL,UAAU,KAAK,GAAG;QAClB,UAAU,KAAK,eAAe;QAC9B,UAAU,KAAK,iBAAiB,CACjC,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAgB;IAC7C,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,OAAO,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACjD,CAAC;AAGD,SAAgB,yBAAyB,CAAC,KAAqB;IAC7D,IAAI,mBAAmB,CAAC,KAAK,CAAC,SAA+B,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE;QACvC,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;YAC1E,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,qBAAqB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;AACnD,CAAC;AAbD,8DAaC;AAGD,SAAgB,4BAA4B,CAC1C,KAA8B;IAE9B,IAAI,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;QACzC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,qBAAqB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;AACpD,CAAC;AARD,oEAQC"}

package/dist/locales/de.json

@@ -75,6 +75,7 @@
     "errorFetchingSession": "Fehler beim Laden der Sitzung",
     "errorGettingReferralURL": "Fehler beim Laden des Referrals",
     "errorReopeningSession": "Fehler beim erneuten Öffnen der Sitzung",
+    "sessionExpiredReopening": "Sitzung abgelaufen, Sitzung wird neu geöffnet",
     "ageVerification": "Altersüberprüfung",
     "ageVerificationText": "Um mit diesem Zwilling interagieren zu können, müssen Sie mindestens sein {{minAge}} Jahre alt.",
     "nsfw": "NSFW: Dieser Agent enthält Inhalte für Erwachsene",

package/dist/locales/en.json

@@ -77,6 +77,7 @@
     "errorFetchingSession": "Error during session loading",
     "errorGettingReferralURL": "Error during referral loading",
     "errorReopeningSession": "Error during session reopening",
+    "sessionExpiredReopening": "Session expired, reopening session",
     "ageVerification": "Age verification",
     "ageVerificationText": "To interact with this agent, you must be at least {{minAge}} years old.",
     "nsfw": "NSFW: This agent contains adult contents",

package/dist/locales/es.json

@@ -75,6 +75,7 @@
     "errorFetchingSession": "Error durante el cargamento de la sesión",
     "errorGettingReferralURL": "Error durante el cargamento del référent",
     "errorReopeningSession": "Error durante el re-abrir la sesión",
+    "sessionExpiredReopening": "Sesión expirada, reabriendo sesión",
     "ageVerification": "Verificación de edad",
     "ageVerificationText": "Para interactuar con este Gemelo, debes tener al menos {{minAge}} años.",
     "nsfw": "NSFW: Este gemelo contiene contenido para adultos",

package/dist/locales/fr.json

@@ -74,6 +74,7 @@
     "errorFetchingSession": "Erreur lors du chargement de la session",
     "errorGettingReferralURL": "Erreur lors du chargement du référent",
     "errorReopeningSession": "Erreur lors de la re-ouverture de la session",
+    "sessionExpiredReopening": "Session expirée, réouverture en cours",
     "ageVerification": "Vérification de l'âge",
     "ageVerificationText": "Pour interagir avec ce Agent, vous devez être au minimum {{minAge}} ans.",
     "nsfw": "NSFW : Ce jumeau contient du contenu pour adultes",

package/dist/locales/it.json

@@ -78,6 +78,7 @@
     "errorFetchingSession": "Errore durante il caricamento della sessione",
     "errorGettingReferralURL": "Errore durante il caricamento del riferimento",
     "errorReopeningSession": "Errore durante il riapertura della sessione",
+    "sessionExpiredReopening": "Sessione scaduta, riapertura in corso",
     "ageVerification": "Verifica dell'età",
     "ageVerificationText": "Per interagire con questo agente, devi aver almeno {{minAge}} anni.",
     "nsfw": "NSFW: Questo agente contiene contenuti per adulti",

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "8.41.0";
+export declare const version = "8.41.1";

package/dist/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = '8.41.0';
+exports.version = '8.41.1';
 //# sourceMappingURL=version.js.map

package/esm/components/MemoriWidget/MemoriWidget.js

@@ -39,6 +39,7 @@ import { useTTS } from '../../helpers/tts/useTTS';
 import ChatHistoryDrawer from '../ChatHistoryDrawer/ChatHistory';
 import { useSTT } from '../../helpers/stt/useSTT';
 import { useNats } from '../../helpers/nats/useNats';
+import { isSessionExpiredNatsError, isSessionExpiredNatsResponse, } from '../../helpers/nats/isSessionExpiredError';
 const getMemoriState = (integrationId) => {
     var _a, _b, _c, _d, _f;
     let widget = integrationId
@@ -392,8 +393,8 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
         });
     };
     const [chatLogID, setChatLogID] = useState(undefined);
-    const sendMessage = async (text, media, newSessionId, translate = true, translatedText, hidden = false, typingText, useLoaderTextAsMsg = false, hasBatchQueued = false) => {
-        var _a, _b, _c, _d;
+    const sendMessage = async (text, media, newSessionId, translate = true, translatedText, hidden = false, typingText, useLoaderTextAsMsg = false, hasBatchQueued = false, skipHistoryPush = false) => {
+        var _a, _b;
         const sessionID = newSessionId ||
             sessionId ||
             ((_a = window.getMemoriState()) === null || _a === void 0 ? void 0 : _a.sessionID);
@@ -437,7 +438,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
                 return;
             }
         }
-        if (!hidden)
+        if (!hidden && !skipHistoryPush)
             pushMessage({
                 text: text,
                 translatedText,
@@ -462,6 +463,11 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
             if (response.resultCode === 0 && correlationID) {
                 registerPendingEnterText(correlationID, {
                     msg,
+                    text,
+                    media,
+                    translate,
+                    translatedText,
+                    hidden,
                     typingText,
                     useLoaderTextAsMsg,
                     hasBatchQueued,
@@ -473,18 +479,17 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
                 logWidgetError('enter-text missing correlationID', response);
             }
             else if (response.resultCode === 404) {
-                setHistory(h => [...h.slice(0, h.length - 1)]);
-                reopenSession(true, memoriPwd || memori.secretToken, memoriTokens, undefined, undefined, {
-                    LANG: userLang,
-                    PATHNAME: window.location.pathname,
-                    ROUTE: ((_d = (_c = window.location.pathname) === null || _c === void 0 ? void 0 : _c.split('/')) === null || _d === void 0 ? void 0 : _d.pop()) || '',
-                    ...(initialContextVars || {}),
-                }, initialQuestion, undefined, undefined, undefined, undefined, true).then(state => {
-                    if (state === null || state === void 0 ? void 0 : state.sessionID) {
-                        setTimeout(() => {
-                            sendMessage(text, media, state === null || state === void 0 ? void 0 : state.sessionID);
-                        }, 500);
-                    }
+                retryAfterExpiredSessionRef.current({
+                    text,
+                    media,
+                    translate,
+                    translatedText,
+                    hidden,
+                    typingText,
+                    useLoaderTextAsMsg,
+                    hasBatchQueued,
+                    expiredSessionID: sessionID,
+                    continueFromChatLogID: chatLogID,
                 });
             }
             else if (response.resultCode === 500 && response.resultMessage) {
@@ -789,7 +794,7 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
             logWidgetError('fetchSession failed', err);
         }
     };
-    const reopenSession = async (updateDialogState = false, password, recoveryTokens, tag, pin, initialContextVars, initialQuestion, birthDate, additionalInfoProp, continueFromChatLogID, continueFromSessionID, isSessionExpired) => {
+    const reopenSession = async (updateDialogState = false, password, recoveryTokens, tag, pin, initialContextVars, initialQuestion, birthDate, additionalInfoProp, continueFromChatLogID, continueFromSessionID, isSessionExpired, suppressHistoryUpdate) => {
         var _a, _b, _c, _d, _f, _g, _h, _j, _k, _l, _m;
         setLoading(true);
         let storageBirthDate = getLocalConfig('birthDate', undefined);
@@ -848,9 +853,22 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
                 setSessionId(sessionID);
                 if (updateDialogState) {
                     setCurrentDialogState(currentState);
-                    if (currentState.emission) {
-                        const initialStatus = isSessionExpired && history.length > 1
-                            ? 'Session Expired, reopening session'
+                    const sessionExpiredStatus = isSessionExpired && history.length > 1
+                        ? t('sessionExpiredReopening')
+                        : null;
+                    if (sessionExpiredStatus && suppressHistoryUpdate) {
+                        pushMessage({
+                            text: '',
+                            emitter: 'system',
+                            fromUser: false,
+                            initial: sessionExpiredStatus,
+                            contextVars: {},
+                            date: new Date().toISOString(),
+                        });
+                    }
+                    if (currentState.emission && !suppressHistoryUpdate) {
+                        const initialStatus = sessionExpiredStatus
+                            ? sessionExpiredStatus
                             : history.length <= 1
                                 ? true
                                 : undefined;
@@ -917,6 +935,50 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
         setLoading(false);
         return null;
     };
+    const retryAfterExpiredSessionRef = useRef(() => Promise.resolve(null));
+    retryAfterExpiredSessionRef.current = (params) => {
+        const { text, media, translate = true, translatedText, hidden = false, typingText, useLoaderTextAsMsg = false, hasBatchQueued = false, expiredSessionID, continueFromChatLogID: continueFromChatLogIDParam, } = params;
+        const continueFromSessionID = expiredSessionID !== null && expiredSessionID !== void 0 ? expiredSessionID : sessionId;
+        const continueFromChatLogID = continueFromChatLogIDParam !== null && continueFromChatLogIDParam !== void 0 ? continueFromChatLogIDParam : chatLogID;
+        const reopenAfterExpiry = () => {
+            var _a, _b;
+            return reopenSession(true, memoriPwd || memori.secretToken, memoriTokens, undefined, undefined, {
+                LANG: userLang,
+                PATHNAME: window.location.pathname,
+                ROUTE: ((_b = (_a = window.location.pathname) === null || _a === void 0 ? void 0 : _a.split('/')) === null || _b === void 0 ? void 0 : _b.pop()) || '',
+                ...(initialContextVars || {}),
+            }, initialQuestion, undefined, undefined, continueFromChatLogID, continueFromSessionID, true, true);
+        };
+        const scheduleRetry = (newSessionID) => {
+            setTimeout(() => {
+                sendMessage(text, media, newSessionID, translate, translatedText, hidden, typingText, useLoaderTextAsMsg, hasBatchQueued, true);
+            }, 500);
+        };
+        const handleReopenFailure = (state) => {
+            setMemoriTyping(false);
+            setTypingText(undefined);
+            if (state === null && text && !hidden) {
+                toast.error(t('errors.SESSION_EXPIRED'));
+            }
+        };
+        if (!text) {
+            return reopenAfterExpiry().then(state => {
+                if (!(state === null || state === void 0 ? void 0 : state.sessionID)) {
+                    handleReopenFailure(state);
+                }
+                return state;
+            });
+        }
+        return reopenAfterExpiry().then(state => {
+            if (state === null || state === void 0 ? void 0 : state.sessionID) {
+                scheduleRetry(state.sessionID);
+            }
+            else {
+                handleReopenFailure(state);
+            }
+            return state;
+        });
+    };
     const changeTag = async (memoriId, sessionId, tag, pin) => {
         var _a, _b, _c, _d, _f, _g, _h, _j, _k;
         if (!memoriId || !sessionId) {
@@ -1112,6 +1174,23 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
         const { msg, typingText: pendingTypingText, useLoaderTextAsMsg, } = pending;
         const currentState = event.currentState;
         if (event.resultCode !== 0 || !currentState) {
+            if (isSessionExpiredNatsResponse(event) && pending.text) {
+                setMemoriTyping(false);
+                setTypingText(undefined);
+                retryAfterExpiredSessionRef.current({
+                    text: pending.text,
+                    media: pending.media,
+                    translate: pending.translate,
+                    translatedText: pending.translatedText,
+                    hidden: pending.hidden,
+                    typingText: pending.typingText,
+                    useLoaderTextAsMsg: pending.useLoaderTextAsMsg,
+                    hasBatchQueued: pending.hasBatchQueued,
+                    expiredSessionID: sessionId,
+                    continueFromChatLogID: chatLogID,
+                });
+                return;
+            }
             if (event.resultCode === 500 && event.resultMessage) {
                 setHistory(h => [
                     ...h,
@@ -1192,6 +1271,31 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
     const deliverEnterTextNatsError = useCallback((event) => {
         var _a, _b, _c;
         const correlationID = event.correlationID;
+        let pending;
+        if (correlationID) {
+            pending = pendingEnterTextRef.current.get(correlationID);
+            if (pending) {
+                clearEnterTextPending(correlationID, pending);
+                (_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')));
+            }
+        }
+        if (isSessionExpiredNatsError(event) && (pending === null || pending === void 0 ? void 0 : pending.text)) {
+            setMemoriTyping(false);
+            setTypingText(undefined);
+            retryAfterExpiredSessionRef.current({
+                text: pending.text,
+                media: pending.media,
+                translate: pending.translate,
+                translatedText: pending.translatedText,
+                hidden: pending.hidden,
+                typingText: pending.typingText,
+                useLoaderTextAsMsg: pending.useLoaderTextAsMsg,
+                hasBatchQueued: pending.hasBatchQueued,
+                expiredSessionID: sessionId,
+                continueFromChatLogID: chatLogID,
+            });
+            return;
+        }
         const errorText = event.errorMessage
             ? `Error: ${event.errorMessage}`
             : event.errorCode
@@ -1205,13 +1309,6 @@ const MemoriWidget = ({ memori, memoriConfigs, ownerUserID, ownerUserName, tenan
             contextVars: {},
             date: new Date().toISOString(),
         });
-        if (correlationID) {
-            const pending = pendingEnterTextRef.current.get(correlationID);
-            if (pending) {
-                clearEnterTextPending(correlationID, pending);
-                (_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')));
-            }
-        }
         setMemoriTyping(false);
         setTypingText(undefined);
     }, [clearEnterTextPending]);