Skip to content

fix: relax device constraints on NotFoundError DOMException #1680

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
myandrienko merged 1 commit into from
Feb 12, 2025
Merged

fix: relax device constraints on NotFoundError DOMException #1680

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
33 changes: 22 additions & 11 deletions packages/client/src/devices/devices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,26 @@ const getStream = async (constraints: MediaStreamConstraints) => {
return stream;
};

function isOverconstrainedError(error: unknown) {
return (
error &&
typeof error === 'object' &&
(('name' in error && error.name === 'OverconstrainedError') ||
('message' in error &&
typeof error.message === 'string' &&
error.message.startsWith('OverconstrainedError')))
);
function isNotFoundOrOverconstrainedError(error: unknown) {
if (!error || typeof error !== 'object') {
return false;
}

if ('name' in error && typeof error.name === 'string') {
const name = error.name;
if (['OverconstrainedError', 'NotFoundError'].includes(name)) {
return true;
}
}

if ('message' in error && typeof error.message === 'string') {
const message = error.message;
if (message.startsWith('OverconstrainedError')) {
return true;
}
}

return false;
}

/**
Expand Down Expand Up @@ -205,7 +216,7 @@ export const getAudioStream = async (
});
return await getStream(constraints);
} catch (error) {
if (isOverconstrainedError(error) && trackConstraints?.deviceId) {
if (isNotFoundOrOverconstrainedError(error) && trackConstraints?.deviceId) {
const { deviceId, ...relaxedConstraints } = trackConstraints;
getLogger(['devices'])(
'warn',
Expand Down Expand Up @@ -247,7 +258,7 @@ export const getVideoStream = async (
});
return await getStream(constraints);
} catch (error) {
if (isOverconstrainedError(error) && trackConstraints?.deviceId) {
if (isNotFoundOrOverconstrainedError(error) && trackConstraints?.deviceId) {
const { deviceId, ...relaxedConstraints } = trackConstraints;
getLogger(['devices'])(
'warn',
Expand Down
Loading