Skip to content

Catch when CryptoClient can't find room members #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Catch when CryptoClient can't find room members #341

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b59dc0
Catch when CryptoClient can't find room members
AndrewFerr Sep 6, 2023
dab204a
Warn instead of error
AndrewFerr Sep 6, 2023
8fbe5e0
Don't print error object in warning
AndrewFerr Sep 6, 2023
47d7350
Use try/catch pattern
AndrewFerr Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/e2ee/CryptoClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,18 @@ export class CryptoClient {
* @param roomId The room ID.
* @param event The event.
*/
public async onRoomEvent(roomId: string, event: any) {
public async onRoomEvent(roomId: string, event: any): Promise<void> {
await this.roomTracker.onRoomEvent(roomId, event);
if (typeof event['state_key'] !== 'string') return;
if (event['type'] === 'm.room.member') {
const membership = new MembershipEvent(event);
if (membership.effectiveMembership !== 'join' && membership.effectiveMembership !== 'invite') return;
await this.engine.addTrackedUsers([membership.membershipFor]);
} else if (event['type'] === 'm.room.encryption') {
const members = await this.client.getRoomMembers(roomId, null, ['join', 'invite']);
await this.engine.addTrackedUsers(members.map(e => e.membershipFor));
return this.client.getRoomMembers(roomId, null, ['join', 'invite']).then(
members => this.engine.addTrackedUsers(members.map(e => e.membershipFor)),
e => void LogService.warn("CryptoClient", `Unable to get members of room ${roomId}`),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we use a try/catch pattern here using async/await.

);
}
}

Expand Down