HH-569: guard replayed frontend realtime messages (#144)
* fix(HH-569): guard replayed realtime messages * fix(HH-569): gate dashboard message side effects --------- Co-authored-by: Rogee <rogee@ipao.vip>
This commit is contained in:
@@ -10,6 +10,7 @@ import {
|
||||
isOnUnattendedView,
|
||||
isOnFoldersView,
|
||||
} from './helpers/actionHelpers';
|
||||
import { findPendingMessageIndex } from './helpers';
|
||||
import messageReadActions from './actions/messageReadActions';
|
||||
import messageTranslateActions from './actions/messageTranslateActions';
|
||||
import * as Sentry from '@sentry/vue';
|
||||
@@ -31,6 +32,19 @@ export const hasMessageFailedWithExternalError = pendingMessage => {
|
||||
return status === MESSAGE_STATUS.FAILED && externalError !== '';
|
||||
};
|
||||
|
||||
const getConversation = (state, message) =>
|
||||
state?.allConversations?.find(item => item.id === message.conversation_id);
|
||||
|
||||
const getStoredMessage = (conversation, message) => {
|
||||
const index = findPendingMessageIndex(conversation, message);
|
||||
return conversation.messages[index];
|
||||
};
|
||||
|
||||
const isNewerMessage = (currentMessage, message) =>
|
||||
!currentMessage?.updated_at ||
|
||||
!message.updated_at ||
|
||||
message.updated_at > currentMessage.updated_at;
|
||||
|
||||
// actions
|
||||
const actions = {
|
||||
getConversation: async ({ commit }, conversationId) => {
|
||||
@@ -342,7 +356,13 @@ const actions = {
|
||||
}
|
||||
},
|
||||
|
||||
addMessage({ commit, rootGetters }, message) {
|
||||
addMessage({ commit, state, rootGetters }, message) {
|
||||
const conversation = getConversation(state, message);
|
||||
if (!conversation) return false;
|
||||
|
||||
const currentMessage = getStoredMessage(conversation, message);
|
||||
if (!isNewerMessage(currentMessage, message)) return false;
|
||||
|
||||
commit(types.ADD_MESSAGE, message);
|
||||
if (message.message_type === MESSAGE_TYPE.INCOMING) {
|
||||
commit(types.SET_CONVERSATION_CAN_REPLY, {
|
||||
@@ -352,11 +372,21 @@ const actions = {
|
||||
commit(types.ADD_CONVERSATION_ATTACHMENTS, message);
|
||||
}
|
||||
handleVoiceCallCreated(message, rootGetters?.getCurrentUserID);
|
||||
return true;
|
||||
},
|
||||
|
||||
updateMessage({ commit, rootGetters }, message) {
|
||||
updateMessage({ commit, state, rootGetters }, message) {
|
||||
const conversation = getConversation(state, message);
|
||||
if (
|
||||
!conversation ||
|
||||
!isNewerMessage(getStoredMessage(conversation, message), message)
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
|
||||
commit(types.ADD_MESSAGE, message);
|
||||
handleVoiceCallUpdated(commit, message, rootGetters?.getCurrentUserID);
|
||||
return true;
|
||||
},
|
||||
|
||||
deleteMessage: async function deleteLabels(
|
||||
|
||||
+70
-2
@@ -278,7 +278,11 @@ describe('#actions', () => {
|
||||
message_type: 0,
|
||||
conversation_id: 1,
|
||||
};
|
||||
actions.addMessage({ commit }, message);
|
||||
const state = {
|
||||
allConversations: [{ id: 1, messages: [] }],
|
||||
};
|
||||
const applied = actions.addMessage({ commit, state }, message);
|
||||
expect(applied).toBe(true);
|
||||
expect(commit.mock.calls).toEqual([
|
||||
[types.ADD_MESSAGE, message],
|
||||
[
|
||||
@@ -294,9 +298,73 @@ describe('#actions', () => {
|
||||
message_type: 1,
|
||||
conversation_id: 1,
|
||||
};
|
||||
actions.addMessage({ commit }, message);
|
||||
const state = {
|
||||
allConversations: [{ id: 1, messages: [] }],
|
||||
};
|
||||
actions.addMessage({ commit, state }, message);
|
||||
expect(commit.mock.calls).toEqual([[types.ADD_MESSAGE, message]]);
|
||||
});
|
||||
|
||||
it('returns false if the conversation is not loaded', () => {
|
||||
const message = {
|
||||
id: 1,
|
||||
message_type: 1,
|
||||
conversation_id: 1,
|
||||
};
|
||||
|
||||
const applied = actions.addMessage(
|
||||
{ commit, state: { allConversations: [] } },
|
||||
message
|
||||
);
|
||||
|
||||
expect(applied).toBe(false);
|
||||
expect(commit).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('ignores a replayed message with the same id and version', () => {
|
||||
const message = {
|
||||
id: 1,
|
||||
message_type: 1,
|
||||
conversation_id: 1,
|
||||
updated_at: '2026-08-24T02:00:00Z',
|
||||
};
|
||||
const state = {
|
||||
allConversations: [{ id: 1, messages: [message] }],
|
||||
};
|
||||
|
||||
const isNew = actions.addMessage({ commit, state }, message);
|
||||
|
||||
expect(isNew).toBe(false);
|
||||
expect(commit).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe('#updateMessage', () => {
|
||||
it('ignores an older realtime update', () => {
|
||||
const message = {
|
||||
id: 1,
|
||||
conversation_id: 1,
|
||||
updated_at: '2026-08-24T01:00:00Z',
|
||||
};
|
||||
const state = {
|
||||
allConversations: [
|
||||
{
|
||||
id: 1,
|
||||
messages: [
|
||||
{
|
||||
id: 1,
|
||||
updated_at: '2026-08-24T02:00:00Z',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
const applied = actions.updateMessage({ commit, state }, message);
|
||||
|
||||
expect(applied).toBe(false);
|
||||
expect(commit).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe('#sendMessageWithData', () => {
|
||||
|
||||
Reference in New Issue
Block a user