mirror of
https://github.com/Qortal/Qortal-Hub.git
synced 2025-04-20 10:05:56 +00:00
fix double chat and parsed ui emoji
This commit is contained in:
parent
84b6535750
commit
8cb88a6380
@ -10,14 +10,16 @@ const uid = new ShortUniqueId({ length: 8 });
|
||||
export const MessageQueueProvider = ({ children }) => {
|
||||
const messageQueueRef = useRef([]);
|
||||
const [queueChats, setQueueChats] = useState({}); // Stores chats and status for display
|
||||
const isProcessingRef = useRef(false); // To track if the queue is being processed
|
||||
const maxRetries = 2;
|
||||
|
||||
const clearStatesMessageQueueProvider = useCallback(() => {
|
||||
setQueueChats({});
|
||||
messageQueueRef.current = [];
|
||||
isProcessingRef.current = false;
|
||||
}, []);
|
||||
|
||||
// Promise-based lock to prevent concurrent executions
|
||||
const processingPromiseRef = useRef(Promise.resolve());
|
||||
|
||||
// Function to add a message to the queue
|
||||
const addToQueue = useCallback((sendMessageFunc, messageObj, type, groupDirectId) => {
|
||||
const tempId = uid.rnd();
|
||||
@ -25,7 +27,7 @@ export const MessageQueueProvider = ({ children }) => {
|
||||
...messageObj,
|
||||
type,
|
||||
groupDirectId,
|
||||
signature: uid.rnd(),
|
||||
signature: uid.rnd(),
|
||||
identifier: tempId,
|
||||
retries: 0, // Retry count for display purposes
|
||||
status: 'pending' // Initial status is 'pending'
|
||||
@ -37,59 +39,63 @@ export const MessageQueueProvider = ({ children }) => {
|
||||
[groupDirectId]: [...(prev[groupDirectId] || []), chatData]
|
||||
}));
|
||||
|
||||
// Add the message to the global messageQueueRef.current
|
||||
messageQueueRef.current = [
|
||||
...messageQueueRef.current,
|
||||
{ func: sendMessageFunc, identifier: tempId, groupDirectId, specialId: messageObj?.message?.specialId }
|
||||
];
|
||||
// Add the message to the global messageQueueRef
|
||||
messageQueueRef.current.push({
|
||||
func: sendMessageFunc,
|
||||
identifier: tempId,
|
||||
groupDirectId,
|
||||
specialId: messageObj?.message?.specialId
|
||||
});
|
||||
|
||||
// Start processing the queue if not already processing
|
||||
// Start processing the queue
|
||||
processQueue([], groupDirectId);
|
||||
}, []);
|
||||
|
||||
// Method to process with new messages and groupDirectId
|
||||
const processWithNewMessages = (newMessages, groupDirectId) => {
|
||||
processQueue(newMessages, groupDirectId);
|
||||
};
|
||||
// Function to process the message queue
|
||||
const processQueue = useCallback((newMessages = [], groupDirectId) => {
|
||||
processingPromiseRef.current = processingPromiseRef.current
|
||||
.then(() => processQueueInternal(newMessages, groupDirectId))
|
||||
.catch((err) => console.error('Error in processQueue:', err));
|
||||
}, []);
|
||||
|
||||
// Function to process the messageQueueRef.current and handle new messages
|
||||
const processQueue = useCallback(async (newMessages = [], groupDirectId) => {
|
||||
// Filter out any message in the queue that matches the specialId from newMessages
|
||||
messageQueueRef.current = messageQueueRef.current.filter((msg) => {
|
||||
return !newMessages.some(newMsg => newMsg?.specialId === msg?.specialId);
|
||||
});
|
||||
// Internal function to handle queue processing
|
||||
const processQueueInternal = async (newMessages, groupDirectId) => {
|
||||
// Remove any messages from the queue that match the specialId from newMessages
|
||||
if (newMessages.length > 0) {
|
||||
messageQueueRef.current = messageQueueRef.current.filter((msg) => {
|
||||
return !newMessages.some(newMsg => newMsg?.specialId === msg?.specialId);
|
||||
});
|
||||
|
||||
// Remove any corresponding entries in queueChats for the provided groupDirectId
|
||||
setQueueChats((prev) => {
|
||||
const updatedChats = { ...prev };
|
||||
if (updatedChats[groupDirectId]) {
|
||||
// Remove any message in queueChats that has a matching specialId
|
||||
updatedChats[groupDirectId] = updatedChats[groupDirectId].filter((chat) => {
|
||||
|
||||
return !newMessages.some(newMsg => newMsg?.specialId === chat?.message?.specialId);
|
||||
});
|
||||
// Remove corresponding entries in queueChats for the provided groupDirectId
|
||||
setQueueChats((prev) => {
|
||||
const updatedChats = { ...prev };
|
||||
if (updatedChats[groupDirectId]) {
|
||||
updatedChats[groupDirectId] = updatedChats[groupDirectId].filter((chat) => {
|
||||
return !newMessages.some(newMsg => newMsg?.specialId === chat?.message?.specialId);
|
||||
});
|
||||
|
||||
updatedChats[groupDirectId] = updatedChats[groupDirectId].filter((chat) => {
|
||||
return chat?.status !== 'failed-permanent'
|
||||
});
|
||||
// Remove messages with status 'failed-permanent'
|
||||
updatedChats[groupDirectId] = updatedChats[groupDirectId].filter((chat) => {
|
||||
return chat?.status !== 'failed-permanent';
|
||||
});
|
||||
|
||||
// If no more chats for this group, delete the groupDirectId entry
|
||||
if (updatedChats[groupDirectId].length === 0) {
|
||||
delete updatedChats[groupDirectId];
|
||||
// If no more chats for this group, delete the groupDirectId entry
|
||||
if (updatedChats[groupDirectId].length === 0) {
|
||||
delete updatedChats[groupDirectId];
|
||||
}
|
||||
}
|
||||
}
|
||||
return updatedChats;
|
||||
});
|
||||
return updatedChats;
|
||||
});
|
||||
}
|
||||
|
||||
// If currently processing or the queue is empty, return
|
||||
if (isProcessingRef.current || messageQueueRef.current.length === 0) return;
|
||||
|
||||
isProcessingRef.current = true; // Lock the queue for processing
|
||||
|
||||
// If the queue is empty, no need to process
|
||||
if (messageQueueRef.current.length === 0) return;
|
||||
|
||||
// Process messages sequentially
|
||||
while (messageQueueRef.current.length > 0) {
|
||||
const currentMessage = messageQueueRef.current[0]; // Get the first message in the queue
|
||||
const { groupDirectId, identifier } = currentMessage;
|
||||
|
||||
|
||||
// Update the chat status to 'sending'
|
||||
setQueueChats((prev) => {
|
||||
const updatedChats = { ...prev };
|
||||
@ -103,24 +109,33 @@ export const MessageQueueProvider = ({ children }) => {
|
||||
}
|
||||
return updatedChats;
|
||||
});
|
||||
|
||||
|
||||
try {
|
||||
// Execute the function stored in the messageQueueRef.current
|
||||
// Execute the function stored in the messageQueueRef
|
||||
await currentMessage.func();
|
||||
// Remove the message from the messageQueueRef.current after successful sending
|
||||
messageQueueRef.current.shift(); // Slice here remains for successful messages
|
||||
|
||||
// Remove the message from queueChats after success
|
||||
// setQueueChats((prev) => {
|
||||
// const updatedChats = { ...prev };
|
||||
// updatedChats[groupDirectId] = updatedChats[groupDirectId].filter(
|
||||
// (item) => item.identifier !== identifier
|
||||
// );
|
||||
// return updatedChats;
|
||||
// });
|
||||
|
||||
// Remove the message from the queue after successful sending
|
||||
messageQueueRef.current.shift();
|
||||
|
||||
// Remove the message from queueChats
|
||||
setQueueChats((prev) => {
|
||||
const updatedChats = { ...prev };
|
||||
if (updatedChats[groupDirectId]) {
|
||||
updatedChats[groupDirectId] = updatedChats[groupDirectId].filter(
|
||||
(item) => item.identifier !== identifier
|
||||
);
|
||||
|
||||
// If no more chats for this group, delete the groupDirectId entry
|
||||
if (updatedChats[groupDirectId].length === 0) {
|
||||
delete updatedChats[groupDirectId];
|
||||
}
|
||||
}
|
||||
return updatedChats;
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error('Message sending failed', error);
|
||||
|
||||
|
||||
// Retry logic
|
||||
setQueueChats((prev) => {
|
||||
const updatedChats = { ...prev };
|
||||
@ -136,28 +151,25 @@ export const MessageQueueProvider = ({ children }) => {
|
||||
} else {
|
||||
// Max retries reached, set status to 'failed-permanent'
|
||||
updatedChats[groupDirectId][chatIndex].status = 'failed-permanent';
|
||||
|
||||
// Remove the message from the messageQueueRef.current after max retries
|
||||
messageQueueRef.current.shift();// Slice for failed messages after max retries
|
||||
|
||||
// // Remove the message from queueChats after failure
|
||||
// updatedChats[groupDirectId] = updatedChats[groupDirectId].filter(
|
||||
// (item) => item.identifier !== identifier
|
||||
// );
|
||||
|
||||
// Remove the message from the queue after max retries
|
||||
messageQueueRef.current.shift();
|
||||
}
|
||||
}
|
||||
return updatedChats;
|
||||
});
|
||||
}
|
||||
|
||||
// Delay between processing each message to avoid overlap
|
||||
await new Promise((res) => setTimeout(res, 5000));
|
||||
}
|
||||
|
||||
// Optional delay between processing messages
|
||||
// await new Promise((res) => setTimeout(res, 5000));
|
||||
}
|
||||
|
||||
// Reset the processing lock once all messages are processed
|
||||
isProcessingRef.current = false;
|
||||
}, []);
|
||||
|
||||
};
|
||||
|
||||
// Method to process with new messages and groupDirectId
|
||||
const processWithNewMessages = (newMessages, groupDirectId) => {
|
||||
processQueue(newMessages, groupDirectId);
|
||||
};
|
||||
|
||||
return (
|
||||
<MessageQueueContext.Provider value={{ addToQueue, queueChats, clearStatesMessageQueueProvider, processWithNewMessages }}>
|
||||
{children}
|
||||
|
||||
@ -193,7 +193,7 @@ export const decodeBase64ForUIChatMessages = (messages)=> {
|
||||
for(const msg of messages){
|
||||
try {
|
||||
const decoded = atob(msg?.data);
|
||||
const parseDecoded = JSON.parse(decoded)
|
||||
const parseDecoded =JSON.parse(decodeURIComponent(escape(decoded)))
|
||||
if(parseDecoded?.messageText){
|
||||
msgs.push({
|
||||
...msg,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user