ios,android: fix sLD / sRD rollback

Fixes: #1223
react-native-webrtc · Nov 22, 2022 · 0247841 · 0247841
1 parent a58dcfb
commit 0247841
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 22 deletions.
diff --git a/android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java b/android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java
@@ -995,11 +995,16 @@ public void onCreateSuccess(SessionDescription sdp) {
 
                 @Override
                 public void onSetSuccess() {
-                    SessionDescription newSdp = peerConnection.getLocalDescription();
                     WritableMap newSdpMap = Arguments.createMap();
                     WritableMap params = Arguments.createMap();
-                    newSdpMap.putString("type", newSdp.type.canonicalForm());
-                    newSdpMap.putString("sdp", newSdp.description);
+
+                    SessionDescription newSdp = peerConnection.getLocalDescription();
+                    // Can happen when doing a rollback.
+                    if (newSdp != null) {
+                        newSdpMap.putString("type", newSdp.type.canonicalForm());
+                        newSdpMap.putString("sdp", newSdp.description);
+                    }
+
                     params.putMap("sdpInfo", newSdpMap);
                     params.putArray("transceiversInfo", getTransceiversInfo(pcId));
                     promise.resolve(params);
@@ -1058,11 +1063,16 @@ public void onCreateSuccess(final SessionDescription sdp) {
 
                 @Override
                 public void onSetSuccess() {
-                    SessionDescription newSdp = peerConnection.getRemoteDescription();
                     WritableMap newSdpMap = Arguments.createMap();
                     WritableMap params = Arguments.createMap();
-                    newSdpMap.putString("type", newSdp.type.canonicalForm());
-                    newSdpMap.putString("sdp", newSdp.description);
+
+                    SessionDescription newSdp = peerConnection.getRemoteDescription();
+                    // Be defensive for the rollback cases.
+                    if (newSdp != null) {
+                        newSdpMap.putString("type", newSdp.type.canonicalForm());
+                        newSdpMap.putString("sdp", newSdp.description);
+                    }
+
                     params.putArray("transceiversInfo", getTransceiversInfo(id));
                     params.putMap("sdpInfo", newSdpMap);
 

diff --git a/ios/RCTWebRTC/WebRTCModule+RTCPeerConnection.m b/ios/RCTWebRTC/WebRTCModule+RTCPeerConnection.m
@@ -215,14 +215,17 @@ @implementation WebRTCModule (RTCPeerConnection)
           reject(@"E_OPERATION_ERROR", error.localizedDescription, nil);
       } else {
         RTCPeerConnection *strongPc = weakPc;
-        id newSdp = @{
-
-            @"sdpInfo": @{@"type": [RTCSessionDescription stringForType:strongPc.localDescription.type],
-                          @"sdp": strongPc.localDescription.sdp
-            },
+        NSMutableDictionary *sdpInfo = [NSMutableDictionary new];
+        RTCSessionDescription *localDesc = strongPc.localDescription;
+        if (localDesc) {
+            sdpInfo[@"type"] = [RTCSessionDescription stringForType:localDesc.type];
+            sdpInfo[@"sdp"] = localDesc.sdp;
+        }
+        id data = @{
+            @"sdpInfo": sdpInfo,
             @"transceiversInfo": [SerializeUtils constructTransceiversInfoArrayWithPeerConnection:peerConnection peerConnectionId: objectID]
         };
-        resolve(newSdp);
+        resolve(data);
       }
   };
 
@@ -262,15 +265,19 @@ @implementation WebRTCModule (RTCPeerConnection)
                 [newTransceivers addObject:newTransceiver];
             }
         }
-
-        id newSdp = @{
-            @"sdpInfo": @{
-                          @"type": [RTCSessionDescription stringForType:peerConnection.remoteDescription.type],
-                          @"sdp": peerConnection.remoteDescription.sdp},
+
+        NSMutableDictionary *sdpInfo = [NSMutableDictionary new];
+        RTCSessionDescription *remoteDesc = peerConnection.remoteDescription;
+        if (remoteDesc) {
+            sdpInfo[@"type"] = [RTCSessionDescription stringForType:remoteDesc.type];
+            sdpInfo[@"sdp"] = remoteDesc.sdp;
+        }
+        id data = @{
+            @"sdpInfo": sdpInfo,
             @"transceiversInfo": [SerializeUtils constructTransceiversInfoArrayWithPeerConnection:peerConnection peerConnectionId: objectID],
             @"newTransceivers": newTransceivers
         };
-        callback(@[@(YES), newSdp]);
+        callback(@[@(YES), data]);
       }
   }];
 }

diff --git a/src/RTCPeerConnection.ts b/src/RTCPeerConnection.ts
@@ -156,7 +156,12 @@ export default class RTCPeerConnection extends defineCustomEventTarget(...PEER_C
             transceiversInfo
         } = await WebRTCModule.peerConnectionSetLocalDescription(this._pcId, desc);
 
-        this.localDescription = new RTCSessionDescription(sdpInfo);
+        if (sdpInfo.type && sdpInfo.sdp) {
+            this.localDescription = new RTCSessionDescription(sdpInfo);
+        } else {
+            this.localDescription = null;
+        }
+
         this._updateTransceivers(transceiversInfo);
 
         log.debug(`${this._pcId} setLocalDescription OK`);
@@ -186,9 +191,19 @@ export default class RTCPeerConnection extends defineCustomEventTarget(...PEER_C
                     if (successful) {
                         log.debug(`${this._pcId} setRemoteDescription OK`);
 
-                        this.remoteDescription = new RTCSessionDescription(data.sdpInfo);
+                        const {
+                            sdpInfo,
+                            newTransceivers,
+                            transceiversInfo
+                        } = data;
 
-                        data.newTransceivers?.forEach( t => {
+                        if (sdpInfo.type && sdpInfo.sdp) {
+                            this.remoteDescription = new RTCSessionDescription(sdpInfo);
+                        } else {
+                            this.remoteDescription = null;
+                        }
+
+                        newTransceivers?.forEach( t => {
                             const { transceiverOrder, transceiver } = t;
                             const newSender = new RTCRtpSender(transceiver.sender);
                             const newReceiver = new RTCRtpReceiver(transceiver.receiver);
@@ -201,7 +216,7 @@ export default class RTCPeerConnection extends defineCustomEventTarget(...PEER_C
                             this._insertTransceiverSorted(transceiverOrder, newTransceiver);
                         });
 
-                        this._updateTransceivers(data.transceiversInfo);
+                        this._updateTransceivers(transceiversInfo);
 
                         resolve();
                     } else {