Skip to content

Commit d9563dc

Browse files
committed
Replace .then/.catch with async/await
1 parent 90f2785 commit d9563dc

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

src/matrixrtc/MatrixRTCSession.ts

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -879,27 +879,29 @@ export class MatrixRTCSession extends TypedEventEmitter<MatrixRTCSessionEvent, M
879879
MEMBER_EVENT_CHECK_PERIOD,
880880
);
881881
} else {
882-
await this.client
883-
._unstable_sendStateFuture(
882+
try {
883+
const res = await this.client._unstable_sendStateFuture(
884884
this.room.roomId,
885885
{
886886
future_timeout: 20000,
887887
},
888888
EventType.GroupCallMemberPrefix,
889889
{}, // leave event
890890
stateKey,
891-
)
892-
.then((res) => {
893-
this.cancelFutureToken = res.cancel_token;
894-
this.scheduleRefreshFuture(res.refresh_token);
895-
})
896-
.catch((e) => logger.error("Failed to send future:", e));
891+
);
892+
this.cancelFutureToken = res.cancel_token;
893+
this.scheduleRefreshFuture(res.refresh_token);
894+
} catch (e) {
895+
logger.error("Failed to send future:", e);
896+
}
897897
}
898898
} else if (!legacy && this.cancelFutureToken !== undefined) {
899899
// TODO: remove this once the Synapse MSC4140 implementation cancels timeout futures on state change
900-
await this.client
901-
._unstable_updateFutureWithToken(this.cancelFutureToken)
902-
.catch((e) => logger.error("Failed to cancel future:", e));
900+
try {
901+
await this.client._unstable_updateFutureWithToken(this.cancelFutureToken);
902+
} catch (e) {
903+
logger.error("Failed to cancel future:", e);
904+
}
903905
}
904906
} catch (e) {
905907
const resendDelay = CALL_MEMBER_EVENT_RETRY_DELAY_MIN + Math.random() * 2000;
@@ -913,11 +915,13 @@ export class MatrixRTCSession extends TypedEventEmitter<MatrixRTCSessionEvent, M
913915
this.memberEventTimeout = setTimeout(() => this.refreshFuture(refreshToken), 6000);
914916
}
915917

916-
private refreshFuture(refreshToken: string): void {
917-
this.client
918-
._unstable_useFutureToken(refreshToken)
919-
.then(() => this.scheduleRefreshFuture(refreshToken))
920-
.catch((e) => logger.error("Failed to refresh future", e));
918+
private async refreshFuture(refreshToken: string): Promise<void> {
919+
try {
920+
await this.client._unstable_updateFutureWithToken(refreshToken);
921+
this.scheduleRefreshFuture(refreshToken);
922+
} catch (e) {
923+
logger.error("Failed to refresh future", e);
924+
}
921925
}
922926

923927
private stateEventsContainOngoingLegacySession(callMemberEvents: Map<string, MatrixEvent>): boolean {

0 commit comments

Comments
 (0)