From 10b8627f516c605720d0060d263a83032d866288 Mon Sep 17 00:00:00 2001
From: "Steven B." <51370195+sdb9696@users.noreply.github.com>
Date: Sat, 23 Nov 2024 12:56:19 +0000
Subject: [PATCH] Webrtc use RTCIceCandidateInit messages with backend (#22667)

* 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>
---
 src/components/ha-web-rtc-player.ts | 30 +++++++++++++++++++++--------
 src/data/camera.ts                  |  6 +++---
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/components/ha-web-rtc-player.ts b/src/components/ha-web-rtc-player.ts
index 91f2c71cd2..b6fd851d6d 100644
--- a/src/components/ha-web-rtc-player.ts
+++ b/src/components/ha-web-rtc-player.ts
@@ -54,7 +54,7 @@ class HaWebRtcPlayer extends LitElement {
 
   private _sessionId?: string;
 
-  private _candidatesList: string[] = [];
+  private _candidatesList: RTCIceCandidate[] = [];
 
   protected override render(): TemplateResult {
     if (this._error) {
@@ -252,7 +252,8 @@ class HaWebRtcPlayer extends LitElement {
           this.hass,
           this.entityid!,
           event.session_id,
-          candidate
+          // toJSON returns RTCIceCandidateInit
+          candidate.toJSON()
         )
       );
       this._candidatesList = [];
@@ -266,9 +267,17 @@ class HaWebRtcPlayer extends LitElement {
       this._logEvent("remote ice candidate", event.candidate);
 
       try {
-        await this._peerConnection?.addIceCandidate(
-          new RTCIceCandidate({ candidate: event.candidate, sdpMid: "0" })
-        );
+        // The spdMid or sdpMLineIndex is required so set sdpMid="0" if not
+        // 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) {
         // eslint-disable-next-line no-console
         console.error(err);
@@ -285,17 +294,22 @@ class HaWebRtcPlayer extends LitElement {
       return;
     }
 
-    this._logEvent("local ice candidate", event.candidate?.candidate);
+    this._logEvent(
+      "local ice candidate",
+      event.candidate?.candidate,
+      event.candidate?.sdpMLineIndex
+    );
 
     if (this._sessionId) {
       addWebRtcCandidate(
         this.hass,
         this.entityid,
         this._sessionId,
-        event.candidate?.candidate
+        // toJSON returns RTCIceCandidateInit
+        event.candidate.toJSON()
       );
     } else {
-      this._candidatesList.push(event.candidate?.candidate);
+      this._candidatesList.push(event.candidate);
     }
   };
 
diff --git a/src/data/camera.ts b/src/data/camera.ts
index 8c3bfe537f..b8bf02d5de 100644
--- a/src/data/camera.ts
+++ b/src/data/camera.ts
@@ -59,7 +59,7 @@ export interface WebRtcAnswer {
 
 export interface WebRtcCandidate {
   type: "candidate";
-  candidate: string;
+  candidate: RTCIceCandidateInit;
 }
 
 export interface WebRtcError {
@@ -139,13 +139,13 @@ export const addWebRtcCandidate = (
   hass: HomeAssistant,
   entity_id: string,
   session_id: string,
-  candidate: string
+  candidate: RTCIceCandidateInit
 ) =>
   hass.callWS({
     type: "camera/webrtc/candidate",
     entity_id,
     session_id,
-    candidate,
+    candidate: candidate,
   });
 
 export const fetchCameraPrefs = (hass: HomeAssistant, entityId: string) =>