Skip to content

Add timeout to enumerateDevices call #1982

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 3 commits into from
Sep 26, 2025
Merged

Add timeout to enumerateDevices call #1982

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad52fbd
Add timeout to enumerateDevices call
jonathanKingston Sep 26, 2025
eeb637d
Clean up some boilerplate
jonathanKingston Sep 26, 2025
05c288d
Merge remote-tracking branch 'origin/main' into jkt/enumerateDevicesT…
jonathanKingston Sep 26, 2025
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
22 changes: 18 additions & 4 deletions injected/src/features/web-compat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,17 @@ export class WebCompat extends ContentFeature {
return deviceInfo;
}

/**
* Helper to wrap a promise with timeout
* @param {Promise} promise - Promise to wrap
* @param {number} timeoutMs - Timeout in milliseconds
* @returns {Promise} Promise that rejects on timeout
*/
withTimeout(promise, timeoutMs) {
const timeout = new Promise((_resolve, reject) => setTimeout(() => reject(new Error('Request timeout')), timeoutMs));
return Promise.race([promise, timeout]);
}

/**
* Fixes device enumeration to handle permission prompts gracefully
*/
Expand All @@ -883,10 +894,13 @@ export class WebCompat extends ContentFeature {
* @returns {Promise<MediaDeviceInfo[]>}
*/
apply: async (target, thisArg, args) => {
const settings = this.getFeatureSetting('enumerateDevices') || {};
const timeoutEnabled = settings.timeoutEnabled !== false;
const timeoutMs = settings.timeoutMs ?? 2000;

try {
// Request device enumeration information from native
/** @type {{willPrompt: boolean, videoInput: boolean, audioInput: boolean, audioOutput: boolean}} */
const response = await this.messaging.request(MSG_DEVICE_ENUMERATION, {});
const messagingPromise = this.messaging.request(MSG_DEVICE_ENUMERATION, {});
const response = timeoutEnabled ? await this.withTimeout(messagingPromise, timeoutMs) : await messagingPromise;

// Check if native indicates that prompts would be required
if (response.willPrompt) {
Expand All @@ -913,7 +927,7 @@ export class WebCompat extends ContentFeature {
return DDGReflect.apply(target, thisArg, args);
}
} catch (err) {
// If the native request fails, fall back to the original implementation
// If the native request fails or times out, fall back to the original implementation
return DDGReflect.apply(target, thisArg, args);
}
},
Expand Down
Loading