mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Add out of order mock test for read syncs

Browse source
This commit is contained in:
Josh Perez 2023-08-29 17:51:24 -04:00 • committed by GitHub
parent 1fef0ec208
commit ee9de52f9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 182 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ts/messageModifiers/ReadSyncs.ts
View file

@ -23,10 +23,10 @@ export type ReadSyncAttributesType = {
timestamp: number;
};
const readSyncs = new Map<string, ReadSyncAttributesType>();
const readSyncs = new Map<number, ReadSyncAttributesType>();
function remove(sync: ReadSyncAttributesType): void {
readSyncs.delete(sync.envelopeId);
readSyncs.delete(sync.timestamp);
sync.removeFromMessageReceiverCache();
}
@ -41,10 +41,13 @@ async function maybeItIsAReactionReadSync(
);
if (!readReaction) {
log.info(`${logId}: ReadSync-3 ${sync.envelopeId}`);
log.info(`${logId} not found:`, sync.senderId, sync.sender, sync.senderAci);
return;
}
log.info(`${logId}: ReadSync-4 ${sync.envelopeId}`);
remove(sync);
notificationService.removeBy({
@ -86,10 +89,12 @@ export function forMessage(
}
export async function onSync(sync: ReadSyncAttributesType): Promise<void> {
readSyncs.set(sync.envelopeId, sync);
readSyncs.set(sync.timestamp, sync);
const logId = `ReadSyncs.onSync(timestamp=${sync.timestamp})`;
log.info(`${logId}: ReadSync-1 ${sync.envelopeId}`);
try {
const messages = await window.Signal.Data.getMessagesBySentAt(
sync.timestamp
@ -106,10 +111,13 @@ export async function onSync(sync: ReadSyncAttributesType): Promise<void> {
});
if (!found) {
log.info(`${logId}: ReadSync-2 ${sync.envelopeId}`);
await maybeItIsAReactionReadSync(sync);
return;
}
log.info(`${logId}: ReadSync-5 ${sync.envelopeId}`);
notificationService.removeBy({ messageId: found.id });
const message = window.MessageController.register(found.id, found);
@ -119,10 +127,12 @@ export async function onSync(sync: ReadSyncAttributesType): Promise<void> {
// timer to the time specified by the read sync if it's earlier than
// the previous read time.
if (isMessageUnread(message.attributes)) {
log.info(`${logId}: ReadSync-6 ${sync.envelopeId}`);
// TODO DESKTOP-1509: use MessageUpdater.markRead once this is TS
message.markRead(readAt, { skipSave: true });
const updateConversation = async () => {
log.info(`${logId}: ReadSync-7 ${sync.envelopeId}`);
// onReadMessage may result in messages older than this one being
// marked read. We want those messages to have the same expire timer
// start time as this one, so we pass the readAt value through.
@ -131,8 +141,10 @@ export async function onSync(sync: ReadSyncAttributesType): Promise<void> {
// only available during initialization
if (StartupQueue.isAvailable()) {
log.info(`${logId}: ReadSync-8 ${sync.envelopeId}`);
const conversation = message.getConversation();
if (conversation) {
log.info(`${logId}: ReadSync-9 ${sync.envelopeId}`);
StartupQueue.add(
conversation.get('id'),
message.get('sent_at'),
@ -140,11 +152,13 @@ export async function onSync(sync: ReadSyncAttributesType): Promise<void> {
);
}
} else {
log.info(`${logId}: ReadSync-10 ${sync.envelopeId}`);
// not awaiting since we don't want to block work happening in the
// eventHandlerQueue
void updateConversation();
}
} else {
log.info(`${logId}: ReadSync-11 ${sync.envelopeId}`);
const now = Date.now();
const existingTimestamp = message.get('expirationStartTimestamp');
const expirationStartTimestamp = Math.min(
@ -154,10 +168,12 @@ export async function onSync(sync: ReadSyncAttributesType): Promise<void> {
message.set({ expirationStartTimestamp });
}
log.info(`${logId}: ReadSync-12 ${sync.envelopeId}`);
queueUpdateMessage(message.attributes);
remove(sync);
} catch (error) {
log.info(`${logId}: ReadSync-13 ${sync.envelopeId}`);
remove(sync);
log.error(`${logId} error:`, Errors.toLogFormat(error));
}

6
ts/messageModifiers/ViewSyncs.ts
View file

@ -26,10 +26,10 @@ export type ViewSyncAttributesType = {
viewedAt: number;
};
const viewSyncs = new Map<string, ViewSyncAttributesType>();
const viewSyncs = new Map<number, ViewSyncAttributesType>();
function remove(sync: ViewSyncAttributesType): void {
viewSyncs.delete(sync.envelopeId);
viewSyncs.delete(sync.timestamp);
sync.removeFromMessageReceiverCache();
}
@ -68,7 +68,7 @@ export function forMessage(
}
export async function onSync(sync: ViewSyncAttributesType): Promise<void> {
viewSyncs.set(sync.envelopeId, sync);
viewSyncs.set(sync.timestamp, sync);
const logId = `ViewSyncs.onSync(timestamp=${sync.timestamp})`;