Skip to content

Commit b78ad83

Browse files
authored
[camera] Fix web facingMode capability handling (flutter#11728)
[camera_web] Fix facingMode capability handling Fixes flutter#174985 Prevents `availableCameras()` from throwing a TypeError when a browser returns an invalid `facingMode` capability. The plugin now treats invalid or missing facing mode capabilities as unavailable, allowing `availableCameras()` to continue and fall back to `CameraLensDirection.external`. Tests: - `dart format packages/camera/camera_web/lib/src/camera_service.dart packages/camera/camera_web/example/integration_test/camera_service_test.dart` - `flutter analyze` - `flutter test` - `flutter drive --release --driver=test_driver/integration_test.dart --target=integration_test/camera_service_test.dart -d chrome` - `flutter drive --release --driver=test_driver/integration_test.dart --target=integration_test/camera_web_test.dart -d chrome` ## Pre-Review Checklist
1 parent 2fb6a47 commit b78ad83

4 files changed

Lines changed: 66 additions & 15 deletions

File tree

‎packages/camera/camera_web/CHANGELOG.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
## NEXT
1+
## 0.3.5+4
22

3+
* Fixes a `TypeError` in `availableCameras()` caused by browsers (e.g. Firefox) returning
4+
an invalid `facingMode` capability value instead of the expected `DOMString` sequence.
35
* Updates minimum supported SDK version to Flutter 3.38/Dart 3.10.
46

57
## 0.3.5+3
68

79
* Fixes camera initialization failure on Safari by fixing a null check operator error using
8-
a nullable getter and null safe practices.
10+
a nullable getter and null-safe practices.
911

1012
## 0.3.5+2
1113

‎packages/camera/camera_web/example/integration_test/camera_service_test.dart‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,46 @@ void main() {
512512
expect(facingMode, equals('environment'));
513513
});
514514

515+
testWidgets('returns null '
516+
'when the facing mode setting is empty and '
517+
'the first facingMode capability is not a JavaScript string', (
518+
WidgetTester tester,
519+
) async {
520+
mockVideoTrack.getSettings = () {
521+
return web.MediaTrackSettings(facingMode: '');
522+
}.toJS;
523+
mockVideoTrack.getCapabilities = () {
524+
return createJSInteropWrapper(FakeMediaTrackCapabilities())
525+
as web.MediaTrackCapabilities;
526+
}.toJS;
527+
528+
when(jsUtil.hasProperty(videoTrack, 'getCapabilities'.toJS)).thenReturn(true);
529+
when(jsUtil.getProperty(any, 'facingMode'.toJS)).thenReturn(<JSAny>[true.toJS].toJS);
530+
531+
final String? facingMode = cameraService.getFacingModeForVideoTrack(videoTrack);
532+
533+
expect(facingMode, isNull);
534+
});
535+
536+
testWidgets('returns null '
537+
'when the facing mode setting is empty and '
538+
'the facingMode capability is not a JavaScript array', (WidgetTester tester) async {
539+
mockVideoTrack.getSettings = () {
540+
return web.MediaTrackSettings(facingMode: '');
541+
}.toJS;
542+
mockVideoTrack.getCapabilities = () {
543+
return createJSInteropWrapper(FakeMediaTrackCapabilities())
544+
as web.MediaTrackCapabilities;
545+
}.toJS;
546+
547+
when(jsUtil.hasProperty(videoTrack, 'getCapabilities'.toJS)).thenReturn(true);
548+
when(jsUtil.getProperty(any, 'facingMode'.toJS)).thenReturn(true.toJS);
549+
550+
final String? facingMode = cameraService.getFacingModeForVideoTrack(videoTrack);
551+
552+
expect(facingMode, isNull);
553+
});
554+
515555
testWidgets('returns null '
516556
'when the facing mode setting '
517557
'and capabilities are empty', (WidgetTester tester) async {

‎packages/camera/camera_web/lib/src/camera_service.dart‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,20 +196,29 @@ class CameraService {
196196
final web.MediaTrackCapabilities videoTrackCapabilities = videoTrack.getCapabilities();
197197

198198
// A list of facing mode capabilities as
199-
// the camera may support multiple facing modes.
200-
final List<String> facingModeCapabilities =
201-
videoTrackCapabilities.facingModeNullable?.toDart
202-
.map((JSString e) => e.toDart)
203-
.toList() ??
204-
<String>[];
205-
206-
if (facingModeCapabilities.isNotEmpty) {
207-
final String facingModeCapability = facingModeCapabilities.first;
208-
return facingModeCapability;
209-
} else {
210-
// Return null if there are no facing mode capabilities.
199+
//The camera may support multiple facing modes.
200+
// Some browsers (e.g., Firefox) do not conform to the MediaTrackCapabilities
201+
// spec and may return `facingMode` as a non-array value (e.g., an empty string,
202+
// a plain object, or a boolean) Rather than the expected DOMString sequence.
203+
// We use jsUtil.getProperty to safely read the raw JS value, then explicitly
204+
// validate it is a JSArray before accessing its elements to prevent a TypeError.
205+
206+
final JSAny? facingModeCapabilities = jsUtil.getProperty(
207+
videoTrackCapabilities,
208+
'facingMode'.toJS,
209+
);
210+
if (facingModeCapabilities == null || !facingModeCapabilities.isA<JSArray>()) {
211211
return null;
212212
}
213+
214+
final List<JSAny?> facingModes = (facingModeCapabilities as JSArray).toDart;
215+
216+
if (facingModes.isNotEmpty && facingModes.first.isA<JSString>()) {
217+
return (facingModes.first! as JSString).toDart;
218+
}
219+
220+
// Return null if there are no facing mode capabilities.
221+
return null;
213222
}
214223

215224
return facingMode;

‎packages/camera/camera_web/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: camera_web
22
description: A Flutter plugin for getting information about and controlling the camera on Web.
33
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_web
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
5-
version: 0.3.5+3
5+
version: 0.3.5+4
66

77
environment:
88
sdk: ^3.10.0

0 commit comments

Comments
 (0)