Convert message cleanup services to TypeScript
This commit is contained in:
parent
16d180efac
commit
2a2f44a73a
7 changed files with 127 additions and 151 deletions
|
@ -1,112 +0,0 @@
|
|||
// Copyright 2016-2021 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
/* global
|
||||
_,
|
||||
MessageController,
|
||||
Whisper
|
||||
*/
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function () {
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
async function destroyExpiredMessages() {
|
||||
try {
|
||||
window.SignalContext.log.info(
|
||||
'destroyExpiredMessages: Loading messages...'
|
||||
);
|
||||
const messages = await window.Signal.Data.getExpiredMessages({
|
||||
MessageCollection: Whisper.MessageCollection,
|
||||
});
|
||||
window.SignalContext.log.info(
|
||||
`destroyExpiredMessages: found ${messages.length} messages to expire`
|
||||
);
|
||||
|
||||
const messageIds = [];
|
||||
const inMemoryMessages = [];
|
||||
const messageCleanup = [];
|
||||
|
||||
messages.forEach(dbMessage => {
|
||||
const message = MessageController.register(dbMessage.id, dbMessage);
|
||||
messageIds.push(message.id);
|
||||
inMemoryMessages.push(message);
|
||||
messageCleanup.push(message.cleanup());
|
||||
});
|
||||
|
||||
// We delete after the trigger to allow the conversation time to process
|
||||
// the expiration before the message is removed from the database.
|
||||
await window.Signal.Data.removeMessages(messageIds);
|
||||
await Promise.all(messageCleanup);
|
||||
|
||||
inMemoryMessages.forEach(message => {
|
||||
window.SignalContext.log.info('Message expired', {
|
||||
sentAt: message.get('sent_at'),
|
||||
});
|
||||
|
||||
const conversation = message.getConversation();
|
||||
if (conversation) {
|
||||
// An expired message only counts as decrementing the message count, not
|
||||
// the sent message count
|
||||
conversation.decrementMessageCount();
|
||||
}
|
||||
});
|
||||
} catch (error) {
|
||||
window.SignalContext.log.error(
|
||||
'destroyExpiredMessages: Error deleting expired messages',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
}
|
||||
|
||||
window.SignalContext.log.info('destroyExpiredMessages: complete');
|
||||
checkExpiringMessages();
|
||||
}
|
||||
|
||||
let timeout;
|
||||
async function checkExpiringMessages() {
|
||||
window.SignalContext.log.info(
|
||||
'checkExpiringMessages: checking for expiring messages'
|
||||
);
|
||||
|
||||
const soonestExpiry = await window.Signal.Data.getSoonestMessageExpiry();
|
||||
if (!soonestExpiry) {
|
||||
window.SignalContext.log.info(
|
||||
'checkExpiringMessages: found no messages to expire'
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
let wait = soonestExpiry - Date.now();
|
||||
|
||||
// In the past
|
||||
if (wait < 0) {
|
||||
wait = 0;
|
||||
}
|
||||
|
||||
// Too far in the future, since it's limited to a 32-bit value
|
||||
if (wait > 2147483647) {
|
||||
wait = 2147483647;
|
||||
}
|
||||
|
||||
window.SignalContext.log.info(
|
||||
`checkExpiringMessages: next message expires ${new Date(
|
||||
soonestExpiry
|
||||
).toISOString()}; waiting ${wait} ms before clearing`
|
||||
);
|
||||
|
||||
clearTimeout(timeout);
|
||||
timeout = setTimeout(destroyExpiredMessages, wait);
|
||||
}
|
||||
const debouncedCheckExpiringMessages = _.debounce(
|
||||
checkExpiringMessages,
|
||||
1000
|
||||
);
|
||||
|
||||
Whisper.ExpiringMessagesListener = {
|
||||
init(events) {
|
||||
checkExpiringMessages();
|
||||
events.on('timetravel', debouncedCheckExpiringMessages);
|
||||
},
|
||||
update: debouncedCheckExpiringMessages,
|
||||
};
|
||||
})();
|
|
@ -1,98 +0,0 @@
|
|||
// Copyright 2019-2020 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
/* global
|
||||
_,
|
||||
MessageController,
|
||||
Whisper
|
||||
*/
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function () {
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
async function eraseTapToViewMessages() {
|
||||
try {
|
||||
window.SignalContext.log.info(
|
||||
'eraseTapToViewMessages: Loading messages...'
|
||||
);
|
||||
const messages =
|
||||
await window.Signal.Data.getTapToViewMessagesNeedingErase({
|
||||
MessageCollection: Whisper.MessageCollection,
|
||||
});
|
||||
|
||||
await Promise.all(
|
||||
messages.map(async fromDB => {
|
||||
const message = MessageController.register(fromDB.id, fromDB);
|
||||
|
||||
window.SignalContext.log.info(
|
||||
'eraseTapToViewMessages: message data erased',
|
||||
message.idForLogging()
|
||||
);
|
||||
|
||||
await message.eraseContents();
|
||||
})
|
||||
);
|
||||
} catch (error) {
|
||||
window.SignalContext.log.error(
|
||||
'eraseTapToViewMessages: Error erasing messages',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
}
|
||||
|
||||
window.SignalContext.log.info('eraseTapToViewMessages: complete');
|
||||
}
|
||||
|
||||
let timeout;
|
||||
async function checkTapToViewMessages() {
|
||||
const SECOND = 1000;
|
||||
const MINUTE = 60 * SECOND;
|
||||
const HOUR = 60 * MINUTE;
|
||||
const THIRTY_DAYS = 30 * 24 * HOUR;
|
||||
|
||||
const receivedAt =
|
||||
await window.Signal.Data.getNextTapToViewMessageTimestampToAgeOut();
|
||||
if (!receivedAt) {
|
||||
return;
|
||||
}
|
||||
|
||||
const nextCheck = receivedAt + THIRTY_DAYS;
|
||||
|
||||
Whisper.TapToViewMessagesListener.nextCheck = nextCheck;
|
||||
window.SignalContext.log.info(
|
||||
'checkTapToViewMessages: next check at',
|
||||
new Date(nextCheck).toISOString()
|
||||
);
|
||||
|
||||
let wait = nextCheck - Date.now();
|
||||
|
||||
// In the past
|
||||
if (wait < 0) {
|
||||
wait = 0;
|
||||
}
|
||||
|
||||
// Too far in the future, since it's limited to a 32-bit value
|
||||
if (wait > 2147483647) {
|
||||
wait = 2147483647;
|
||||
}
|
||||
|
||||
clearTimeout(timeout);
|
||||
timeout = setTimeout(async () => {
|
||||
await eraseTapToViewMessages();
|
||||
checkTapToViewMessages();
|
||||
}, wait);
|
||||
}
|
||||
const debouncedCheckTapToViewMessages = _.debounce(
|
||||
checkTapToViewMessages,
|
||||
1000
|
||||
);
|
||||
|
||||
Whisper.TapToViewMessagesListener = {
|
||||
nextCheck: null,
|
||||
init(events) {
|
||||
checkTapToViewMessages();
|
||||
events.on('timetravel', debouncedCheckTapToViewMessages);
|
||||
},
|
||||
update: debouncedCheckTapToViewMessages,
|
||||
};
|
||||
})();
|
Loading…
Add table
Add a link
Reference in a new issue