queue user profile avatars update
also add some tests for the promise utilspull/2242/head
Audric Ackermann
2 years ago
parent
a9cc9a7294
commit
00d70db0be
@ -1,13 +0,0 @@
|
||||
import React from 'react';
|
||||
|
||||
export const LoadingIndicator = () => {
|
||||
return (
|
||||
<div className="loading-widget">
|
||||
<div className="container">
|
||||
<span className="dot" />
|
||||
<span className="dot" />
|
||||
<span className="dot" />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@ -0,0 +1,157 @@
|
||||
import Queue from 'queue-promise';
|
||||
import ByteBuffer from 'bytebuffer';
|
||||
import _ from 'lodash';
|
||||
|
||||
import { downloadAttachment } from './attachments';
|
||||
|
||||
import { allowOnlyOneAtATime, hasAlreadyOneAtaTimeMatching } from '../session/utils/Promise';
|
||||
import { toHex } from '../session/utils/String';
|
||||
import { processNewAttachment } from '../types/MessageAttachment';
|
||||
import { MIME } from '../types';
|
||||
import { autoScaleForIncomingAvatar } from '../util/attachmentsUtil';
|
||||
import { decryptProfile } from '../util/crypto/profileEncrypter';
|
||||
import { ConversationModel, ConversationTypeEnum } from '../models/conversation';
|
||||
import { SignalService } from '../protobuf';
|
||||
import { getConversationController } from '../session/conversations';
|
||||
import { UserUtils } from '../session/utils';
|
||||
|
||||
const queue = new Queue({
|
||||
concurrent: 1,
|
||||
interval: 500,
|
||||
});
|
||||
|
||||
queue.on('dequeue', () => {
|
||||
// window.log.info('[profile-update] queue is dequeuing');
|
||||
});
|
||||
queue.on('resolve', () => {
|
||||
// window.log.info('[profile-update] task resolved');
|
||||
});
|
||||
queue.on('reject', error => {
|
||||
window.log.warn('[profile-update] task profile image update failed with', error);
|
||||
});
|
||||
queue.on('start', () => {
|
||||
window.log.info('[profile-update] queue is starting');
|
||||
});
|
||||
queue.on('stop', () => {
|
||||
window.log.info('[profile-update] queue is stopping');
|
||||
});
|
||||
queue.on('end', () => {
|
||||
window.log.info('[profile-update] queue is ending');
|
||||
});
|
||||
|
||||
export async function appendFetchAvatarAndProfileJob(
|
||||
conversation: ConversationModel,
|
||||
profile: SignalService.DataMessage.ILokiProfile,
|
||||
profileKey?: Uint8Array | null // was any
|
||||
) {
|
||||
if (!conversation?.id) {
|
||||
window?.log?.warn('[profile-update] Cannot update profile with empty convoid');
|
||||
return;
|
||||
}
|
||||
const oneAtaTimeStr = `appendFetchAvatarAndProfileJob:${conversation.id}`;
|
||||
|
||||
if (hasAlreadyOneAtaTimeMatching(oneAtaTimeStr)) {
|
||||
window.log.info(
|
||||
'[profile-update] not adding another task of "appendFetchAvatarAndProfileJob" as there is already one scheduled for the conversation: ',
|
||||
conversation.id
|
||||
);
|
||||
return;
|
||||
}
|
||||
window.log.info(
|
||||
'[profile-update] "appendFetchAvatarAndProfileJob" as there is already one scheduled for the conversation: ',
|
||||
conversation.id
|
||||
);
|
||||
const task = allowOnlyOneAtATime(oneAtaTimeStr, async () => {
|
||||
return createOrUpdateProfile(conversation, profile, profileKey);
|
||||
});
|
||||
|
||||
queue.enqueue(async () => task);
|
||||
}
|
||||
|
||||
/**
|
||||
* This function should be used only when we have to do a sync update to our conversation with a new profile/avatar image or display name
|
||||
* It tries to fetch the profile image, scale it, save it, and update the conversationModel
|
||||
*/
|
||||
export async function updateOurProfileSync(
|
||||
profile: SignalService.DataMessage.ILokiProfile,
|
||||
profileKey?: Uint8Array | null // was any
|
||||
) {
|
||||
const ourConvo = getConversationController().get(UserUtils.getOurPubKeyStrFromCache());
|
||||
if (!ourConvo?.id) {
|
||||
window?.log?.warn('[profile-update] Cannot update our profile with empty convoid');
|
||||
return;
|
||||
}
|
||||
const oneAtaTimeStr = `appendFetchAvatarAndProfileJob:${ourConvo.id}`;
|
||||
return allowOnlyOneAtATime(oneAtaTimeStr, async () => {
|
||||
return createOrUpdateProfile(ourConvo, profile, profileKey);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new profile from the profile provided. Creates the profile if it doesn't exist.
|
||||
*/
|
||||
async function createOrUpdateProfile(
|
||||
conversation: ConversationModel,
|
||||
profile: SignalService.DataMessage.ILokiProfile,
|
||||
profileKey?: Uint8Array | null
|
||||
) {
|
||||
// Retain old values unless changed:
|
||||
const newProfile = conversation.get('profile') || {};
|
||||
|
||||
newProfile.displayName = profile.displayName;
|
||||
|
||||
if (profile.profilePicture && profileKey) {
|
||||
const prevPointer = conversation.get('avatarPointer');
|
||||
const needsUpdate = !prevPointer || !_.isEqual(prevPointer, profile.profilePicture);
|
||||
|
||||
if (needsUpdate) {
|
||||
try {
|
||||
const downloaded = await downloadAttachment({
|
||||
url: profile.profilePicture,
|
||||
isRaw: true,
|
||||
});
|
||||
|
||||
// null => use placeholder with color and first letter
|
||||
let path = null;
|
||||
if (profileKey) {
|
||||
// Convert profileKey to ArrayBuffer, if needed
|
||||
const encoding = typeof profileKey === 'string' ? 'base64' : undefined;
|
||||
try {
|
||||
const profileKeyArrayBuffer = ByteBuffer.wrap(profileKey, encoding).toArrayBuffer();
|
||||
const decryptedData = await decryptProfile(downloaded.data, profileKeyArrayBuffer);
|
||||
window.log.info(
|
||||
`[profile-update] about to auto scale avatar for convo ${conversation.id}`
|
||||
);
|
||||
|
||||
const scaledData = await autoScaleForIncomingAvatar(decryptedData);
|
||||
const upgraded = await processNewAttachment({
|
||||
data: await scaledData.blob.arrayBuffer(),
|
||||
contentType: MIME.IMAGE_UNKNOWN, // contentType is mostly used to generate previews and screenshot. We do not care for those in this case.
|
||||
});
|
||||
// Only update the convo if the download and decrypt is a success
|
||||
conversation.set('avatarPointer', profile.profilePicture);
|
||||
conversation.set('profileKey', toHex(profileKey));
|
||||
({ path } = upgraded);
|
||||
} catch (e) {
|
||||
window?.log?.error(`[profile-update] Could not decrypt profile image: ${e}`);
|
||||
}
|
||||
}
|
||||
newProfile.avatar = path;
|
||||
} catch (e) {
|
||||
window.log.warn(
|
||||
`[profile-update] Failed to download attachment at ${profile.profilePicture}. Maybe it expired? ${e.message}`
|
||||
);
|
||||
// do not return here, we still want to update the display name even if the avatar failed to download
|
||||
}
|
||||
}
|
||||
} else if (profileKey) {
|
||||
newProfile.avatar = null;
|
||||
}
|
||||
|
||||
const conv = await getConversationController().getOrCreateAndWait(
|
||||
conversation.id,
|
||||
ConversationTypeEnum.PRIVATE
|
||||
);
|
||||
await conv.setLokiProfile(newProfile);
|
||||
await conv.commit();
|
||||
}
|
||||
Loading…
Reference in New Issue