jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-21 08:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Webrtc use RTCIceCandidateInit messages with backend (#22667)

Browse Source 
* Add sdp m line index to ICE Candidates

* Remove ? from candidate

Co-authored-by: Bram Kragten <mail@bramkragten.nl>

* Send full candidate in message

* Revert launch.json change

* Use RTCIceCandidate for messaging

---------

Co-authored-by: Bram Kragten <mail@bramkragten.nl>
This commit is contained in:
Steven B. 2024-11-23 12:56:19 +00:00 committed by GitHub
parent 528fcecd16
commit 10b8627f51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/components/ha-web-rtc-player.ts
View File

@ -54,7 +54,7 @@ class HaWebRtcPlayer extends LitElement {
private _sessionId?: string; private _sessionId?: string;
private _candidatesList: string[] = []; private _candidatesList: RTCIceCandidate[] = [];
protected override render(): TemplateResult { protected override render(): TemplateResult {
if (this._error) { if (this._error) {
@ -252,7 +252,8 @@ class HaWebRtcPlayer extends LitElement {
this.hass, this.hass,
this.entityid!, this.entityid!,
event.session_id, event.session_id,
candidate // toJSON returns RTCIceCandidateInit
candidate.toJSON()
) )
); );
this._candidatesList = []; this._candidatesList = [];
@ -266,9 +267,17 @@ class HaWebRtcPlayer extends LitElement {
this._logEvent("remote ice candidate", event.candidate); this._logEvent("remote ice candidate", event.candidate);
try { try {
await this._peerConnection?.addIceCandidate( // The spdMid or sdpMLineIndex is required so set sdpMid="0" if not
new RTCIceCandidate({ candidate: event.candidate, sdpMid: "0" }) // sent from the backend.
); const candidate =
event.candidate.sdpMid || event.candidate.sdpMLineIndex != null
? new RTCIceCandidate(event.candidate)
: new RTCIceCandidate({
candidate: event.candidate.candidate,
sdpMid: "0",
});
await this._peerConnection?.addIceCandidate(candidate);
} catch (err: any) { } catch (err: any) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.error(err); console.error(err);
@ -285,17 +294,22 @@ class HaWebRtcPlayer extends LitElement {
return; return;
} }
this._logEvent("local ice candidate", event.candidate?.candidate); this._logEvent(
"local ice candidate",
event.candidate?.candidate,
event.candidate?.sdpMLineIndex
);
if (this._sessionId) { if (this._sessionId) {
addWebRtcCandidate( addWebRtcCandidate(
this.hass, this.hass,
this.entityid, this.entityid,
this._sessionId, this._sessionId,
event.candidate?.candidate // toJSON returns RTCIceCandidateInit
event.candidate.toJSON()
); );
} else { } else {
this._candidatesList.push(event.candidate?.candidate); this._candidatesList.push(event.candidate);
} }
}; };

6
src/data/camera.ts
View File

@ -59,7 +59,7 @@ export interface WebRtcAnswer {
export interface WebRtcCandidate { export interface WebRtcCandidate {
type: "candidate"; type: "candidate";
candidate: string; candidate: RTCIceCandidateInit;
} }
export interface WebRtcError { export interface WebRtcError {
@ -139,13 +139,13 @@ export const addWebRtcCandidate = (
hass: HomeAssistant, hass: HomeAssistant,
entity_id: string, entity_id: string,
session_id: string, session_id: string,
candidate: string candidate: RTCIceCandidateInit
) => ) =>
hass.callWS({ hass.callWS({
type: "camera/webrtc/candidate", type: "camera/webrtc/candidate",
entity_id, entity_id,
session_id, session_id,
candidate, candidate: candidate,
}); });
export const fetchCameraPrefs = (hass: HomeAssistant, entityId: string) => export const fetchCameraPrefs = (hass: HomeAssistant, entityId: string) =>