Simplify CameraView MJPEG #4213

bgoncal · 2026-01-12T19:27:26Z

Summary

Screenshots

Link to pull request in Documentation repository

Documentation: home-assistant/companion.home-assistant#

Any other notes

Copilot

Pull request overview

This pull request refactors the MJPEG camera player implementation by extracting business logic into a dedicated ViewModel and reorganizing files into an MJPEG subfolder. The refactoring simplifies the architecture by replacing a UIViewControllerRepresentable wrapper with a pure SwiftUI implementation using an ObservableObject ViewModel pattern.

Changes:

Created CameraMJPEGPlayerViewModel to handle MJPEG streaming logic and state management
Simplified CameraMJPEGPlayerView to use SwiftUI with the new ViewModel instead of UIViewControllerRepresentable
Reorganized files into Sources/App/Cameras/CameraPlayer/MJPEG/ subfolder for better code organization

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 5 comments.

File	Description
Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerViewModel.swift	New ViewModel containing MJPEG streaming logic, state management, and API interactions
Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerView.swift	Refactored SwiftUI view using the new ViewModel pattern instead of UIKit wrapper
Sources/App/Cameras/CameraPlayer/CameraMJPEGPlayerView.swift	Deleted old implementation that used UIViewControllerRepresentable
HomeAssistant.xcodeproj/project.pbxproj	Updated Xcode project structure to include new ViewModel and reorganized file structure

Copilot · 2026-01-12T19:32:41Z

Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerViewModel.swift

+            DispatchQueue.main.async { [weak self] in
+                self?.isLoading = false
+                self?.hasStarted = false
+            }


The isLoading and hasStarted flags are being set to false in the pipe callback regardless of whether the stream successfully started or encountered an error. When the stream URL is successfully obtained and startStream is called, these flags are immediately reset before the stream actually begins. This means isLoading will be false even if the stream hasn't received its first frame yet, potentially showing incorrect loading state to the user.

@copilot open a new pull request to apply changes based on this feedback

Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerViewModel.swift

Copilot · 2026-01-12T19:32:42Z

Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerViewModel.swift

+                    DispatchQueue.main.async { [weak self] in
+                        self?.hasStarted = false


The hasStarted flag is being modified from a background thread without being dispatched to the main thread, even though this class is marked @mainactor. The assignment on line 43 should be wrapped in a DispatchQueue.main.async block to maintain thread safety.

@copilot open a new pull request to apply changes based on this feedback

Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerView.swift

Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerViewModel.swift

…del.swift Co-authored-by: Copilot <[email protected]>

Co-authored-by: Copilot <[email protected]>

Copilot · 2026-01-12T19:53:49Z

@bgoncal I've opened a new pull request, #4214, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot · 2026-01-12T19:53:56Z

@bgoncal I've opened a new pull request, #4215, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot · 2026-01-12T19:54:00Z

@bgoncal I've opened a new pull request, #4216, to work on those changes. Once the pull request is ready, I'll request review from you.

…acks (#4216) ## Summary The `CameraMJPEGPlayerViewModel` class is marked `@MainActor` but was accessing MainActor-isolated properties from background thread callbacks without proper synchronization. This creates race conditions and potential crashes. **Changes:** - Wrapped `startStream()` method call in `DispatchQueue.main.async` when invoked from background `.pipe` callback - Wrapped `errorMessage` property assignment in `DispatchQueue.main.async` in the rejected case - Removed redundant `hasStarted = false` assignment that could race with the cleanup block All MainActor-isolated members are now accessed exclusively on the main thread. ## Screenshots  N/A - Internal thread safety fix with no UI changes ## Link to pull request in Documentation repository  N/A - Internal implementation change ## Any other notes This PR merges into #4213 and addresses feedback from #4213 (comment)  --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: bgoncal <[email protected]>

…4215) ## Summary Addresses thread safety issue where `hasStarted` flag was being modified from background threads despite `@MainActor` annotation on the class. **Changes:** - Replace direct `hasStarted = false` assignment in error handler with `stop()` call to ensure flag modification happens on main thread - All `hasStarted` modifications now properly dispatched to main thread via `DispatchQueue.main.async` or through `@MainActor` methods ## Screenshots N/A - Internal state management change with no UI impact ## Link to pull request in Documentation repository Documentation: home-assistant/companion.home-assistant# ## Any other notes This is a stacked PR that merges into #4213 to address review feedback from #4213 (comment)  --- 💬 We'd love your input! Share your thoughts on Copilot coding agent in our [2 minute survey](https://gh.io/copilot-coding-agent-survey). Co-authored-by: copilot-swe-agent[bot] <[email protected]>

codecov · 2026-01-12T20:41:35Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (main@3f27274). Learn more about missing BASE report.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #4213   +/-   ##
=======================================
  Coverage        ?   44.85%           
=======================================
  Files           ?      250           
  Lines           ?    14414           
  Branches        ?        0           
=======================================
  Hits            ?     6466           
  Misses          ?     7948           
  Partials        ?        0

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Simplify CameraView MPEG

76cd30c

bgoncal self-assigned this Jan 12, 2026

Copilot AI review requested due to automatic review settings January 12, 2026 19:27

home-assistant bot added the cla-signed label Jan 12, 2026

Copilot started reviewing on behalf of bgoncal January 12, 2026 19:27 View session

Copilot AI reviewed Jan 12, 2026

View reviewed changes

bgoncal and others added 2 commits January 12, 2026 20:52

Update Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerViewMo…

5a80e7a

…del.swift Co-authored-by: Copilot <[email protected]>

Apply suggestions from code review

bd60aed

Co-authored-by: Copilot <[email protected]>

Copilot AI mentioned this pull request Jan 12, 2026

Fix MJPEG stream loading state management #4214

Open

Copilot AI mentioned this pull request Jan 12, 2026

Fix thread safety for hasStarted flag in CameraMJPEGPlayerViewModel #4215

Merged

Copilot AI mentioned this pull request Jan 12, 2026

Fix thread safety for MainActor property access in MJPEG stream callbacks #4216

Merged

Copilot AI and others added 2 commits January 12, 2026 21:05

bgoncal changed the title ~~Simplify CameraView MPEG~~ Simplify CameraView MJPEG Jan 12, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Simplify CameraView MJPEG #4213

Simplify CameraView MJPEG #4213

bgoncal commented Jan 12, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 12, 2026

Uh oh!

bgoncal Jan 12, 2026

Uh oh!

Uh oh!

Copilot AI Jan 12, 2026

Uh oh!

bgoncal Jan 12, 2026

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Jan 12, 2026

Uh oh!

Copilot AI commented Jan 12, 2026

Uh oh!

Copilot AI commented Jan 12, 2026

Uh oh!

codecov bot commented Jan 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		DispatchQueue.main.async { [weak self] in
		self?.hasStarted = false

Simplify CameraView MJPEG #4213

Are you sure you want to change the base?

Simplify CameraView MJPEG #4213

Conversation

bgoncal commented Jan 12, 2026

Summary

Screenshots

Link to pull request in Documentation repository

Any other notes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

bgoncal Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

bgoncal Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Jan 12, 2026

Uh oh!

Copilot AI commented Jan 12, 2026

Uh oh!

Copilot AI commented Jan 12, 2026

Uh oh!

codecov bot commented Jan 12, 2026

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants