Skip to content

DRM: Fix KEY_UPDATE_ERROR by not translating it into a KEY_LOAD_ERROR #1670

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

Merged
merged 1 commit into from
Mar 27, 2025
Merged

DRM: Fix KEY_UPDATE_ERROR by not translating it into a KEY_LOAD_ERROR #1670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions src/main_thread/decrypt/session_events_listener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,23 +111,23 @@ export default function SessionEventsListener(
() => runGetLicense(message, messageType),
backoffOptions,
manualCanceller.signal,
)
.then((licenseObject) => {
).then(
async (licenseObject) => {
if (manualCanceller.isUsed()) {
return Promise.resolve();
return;
Copy link
Collaborator Author

@peaBerberian peaBerberian Mar 26, 2025

Choose a reason for hiding this comment

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

NOTE: removed because unnecessary

}
if (isNullOrUndefined(licenseObject)) {
log.info("DRM: No license given, skipping session.update");
} else {
try {
return updateSessionWithMessage(session, licenseObject);
await updateSessionWithMessage(session, licenseObject);
Copy link
Collaborator Author

@peaBerberian peaBerberian Mar 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

NOTE: awaited to make the try / catch catch rejections, not just errors thrown synchronously. Also, we don't actually care about the returned value

} catch (err) {
manualCanceller.cancel();
callbacks.onError(err);
}
}
})
.catch((err: unknown) => {
Copy link
Collaborator Author

@peaBerberian peaBerberian Mar 26, 2025

Choose a reason for hiding this comment

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

The idea is to now do licenseFetchingPromise.then(onSucceed, onFailure) instead of: licenseFetchingPromise.then(onSucceed).catch(onFailure).

},
(err: unknown) => {
if (manualCanceller.isUsed()) {
return;
}
Expand All @@ -148,7 +148,8 @@ export default function SessionEventsListener(
}
}
callbacks.onError(formattedError);
});
},
);
},
manualCanceller.signal,
);
Expand Down
Loading