Use SignalContext instead of SignalWindow

This commit is contained in:
Josh Perez 2021-10-07 19:28:47 -04:00 committed by GitHub
parent a70a8a88d6
commit 75dab30367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 180 additions and 231 deletions

View file

@ -11,7 +11,7 @@
window.Whisper.Database.nolog = true;
Whisper.Database.handleDOMException = (prefix, error, reject) => {
window.SignalWindow.log.error(
window.SignalContext.log.error(
`${prefix}:`,
error && error.name,
error && error.message,

View file

@ -13,13 +13,13 @@
async function destroyExpiredMessages() {
try {
window.SignalWindow.log.info(
window.SignalContext.log.info(
'destroyExpiredMessages: Loading messages...'
);
const messages = await window.Signal.Data.getExpiredMessages({
MessageCollection: Whisper.MessageCollection,
});
window.SignalWindow.log.info(
window.SignalContext.log.info(
`destroyExpiredMessages: found ${messages.length} messages to expire`
);
@ -40,7 +40,7 @@
await Promise.all(messageCleanup);
inMemoryMessages.forEach(message => {
window.SignalWindow.log.info('Message expired', {
window.SignalContext.log.info('Message expired', {
sentAt: message.get('sent_at'),
});
@ -52,25 +52,25 @@
}
});
} catch (error) {
window.SignalWindow.log.error(
window.SignalContext.log.error(
'destroyExpiredMessages: Error deleting expired messages',
error && error.stack ? error.stack : error
);
}
window.SignalWindow.log.info('destroyExpiredMessages: complete');
window.SignalContext.log.info('destroyExpiredMessages: complete');
checkExpiringMessages();
}
let timeout;
async function checkExpiringMessages() {
window.SignalWindow.log.info(
window.SignalContext.log.info(
'checkExpiringMessages: checking for expiring messages'
);
const soonestExpiry = await window.Signal.Data.getSoonestMessageExpiry();
if (!soonestExpiry) {
window.SignalWindow.log.info(
window.SignalContext.log.info(
'checkExpiringMessages: found no messages to expire'
);
return;
@ -88,7 +88,7 @@
wait = 2147483647;
}
window.SignalWindow.log.info(
window.SignalContext.log.info(
`checkExpiringMessages: next message expires ${new Date(
soonestExpiry
).toISOString()}; waiting ${wait} ms before clearing`

View file

@ -13,7 +13,7 @@
async function eraseTapToViewMessages() {
try {
window.SignalWindow.log.info(
window.SignalContext.log.info(
'eraseTapToViewMessages: Loading messages...'
);
const messages = await window.Signal.Data.getTapToViewMessagesNeedingErase(
@ -26,7 +26,7 @@
messages.map(async fromDB => {
const message = MessageController.register(fromDB.id, fromDB);
window.SignalWindow.log.info(
window.SignalContext.log.info(
'eraseTapToViewMessages: message data erased',
message.idForLogging()
);
@ -35,13 +35,13 @@
})
);
} catch (error) {
window.SignalWindow.log.error(
window.SignalContext.log.error(
'eraseTapToViewMessages: Error erasing messages',
error && error.stack ? error.stack : error
);
}
window.SignalWindow.log.info('eraseTapToViewMessages: complete');
window.SignalContext.log.info('eraseTapToViewMessages: complete');
}
let timeout;
@ -59,7 +59,7 @@
const nextCheck = receivedAt + THIRTY_DAYS;
Whisper.TapToViewMessagesListener.nextCheck = nextCheck;
window.SignalWindow.log.info(
window.SignalContext.log.info(
'checkTapToViewMessages: next check at',
new Date(nextCheck).toISOString()
);

View file

@ -58,7 +58,7 @@ exports.createConversation = async ({
await Promise.all(
range(0, numMessages).map(async index => {
await sleep(index * 100);
window.SignalWindow.log.info(`Create message ${index + 1}`);
window.SignalContext.log.info(`Create message ${index + 1}`);
const message = await createRandomMessage({ conversationId });
return Signal.Data.saveMessage(message);
})
@ -110,7 +110,7 @@ const createRandomMessage = async ({ conversationId } = {}) => {
const message = _createMessage({ commonProperties, conversationId, type });
return Message.initializeSchemaVersion({
message,
logger: window.SignalWindow.log,
logger: window.SignalContext.log,
});
};

View file

@ -16,7 +16,7 @@ class IdleDetector extends EventEmitter {
}
start() {
window.SignalWindow.log.info('Start idle detector');
window.SignalContext.log.info('Start idle detector');
this._scheduleNextCallback();
}
@ -25,7 +25,7 @@ class IdleDetector extends EventEmitter {
return;
}
window.SignalWindow.log.info('Stop idle detector');
window.SignalContext.log.info('Stop idle detector');
this._clearScheduledCallbacks();
}

View file

@ -12,7 +12,7 @@ module.exports = {
};
async function doesDatabaseExist() {
window.SignalWindow.log.info(
window.SignalContext.log.info(
'Checking for the existence of IndexedDB data...'
);
return new Promise((resolve, reject) => {
@ -22,7 +22,7 @@ async function doesDatabaseExist() {
let existed = true;
setTimeout(() => {
window.SignalWindow.log.warn(
window.SignalContext.log.warn(
'doesDatabaseExist: Timed out attempting to check IndexedDB status'
);
return resolve(false);
@ -43,7 +43,7 @@ async function doesDatabaseExist() {
}
function removeDatabase() {
window.SignalWindow.log.info(
window.SignalContext.log.info(
`Deleting IndexedDB database '${Whisper.Database.id}'`
);
window.indexedDB.deleteDatabase(Whisper.Database.id);

View file

@ -45,7 +45,7 @@ exports.processNext = async ({
}
);
} catch (error) {
window.SignalWindow.log.error(
window.SignalContext.log.error(
'processNext error:',
error && error.stack ? error.stack : error
);

View file

@ -66,7 +66,7 @@
a2 = args[1],
a3 = args[2];
const logError = function (error) {
window.SignalWindow.log.error(
window.SignalContext.log.error(
'Model caught error triggering',
name,
'event:',

View file

@ -21,13 +21,13 @@
}
async function run() {
window.SignalWindow.log.info('Rotating signed prekey...');
window.SignalContext.log.info('Rotating signed prekey...');
try {
await getAccountManager().rotateSignedPreKey();
scheduleNextRotation();
setTimeoutForNextRun();
} catch (error) {
window.SignalWindow.log.error(
window.SignalContext.log.error(
'rotateSignedPrekey() failed. Trying again in five minutes'
);
setTimeout(setTimeoutForNextRun, 5 * 60 * 1000);
@ -38,7 +38,7 @@
if (navigator.onLine) {
run();
} else {
window.SignalWindow.log.info(
window.SignalContext.log.info(
'We are offline; keys will be rotated when we are next online'
);
const listener = () => {
@ -53,7 +53,7 @@
const now = Date.now();
const time = storage.get('nextSignedKeyRotationTime', now);
window.SignalWindow.log.info(
window.SignalContext.log.info(
'Next signed key rotation scheduled for',
new Date(time).toISOString()
);
@ -71,7 +71,7 @@
Whisper.RotateSignedPreKeyListener = {
init(events, newVersion) {
if (initComplete) {
window.SignalWindow.log.info(
window.SignalContext.log.info(
'Rotate signed prekey listener: Already initialized'
);
return;

View file

@ -49,7 +49,7 @@
try {
cb();
} catch (error) {
window.SignalWindow.log.error(
window.SignalContext.log.error(
'ReactWrapperView.update error:',
error && error.stack ? error.stack : error
);