@sbhjt-gr/react-native-webrtc 124.0.2 → 124.0.3

package/android/src/main/java/com/oney/WebRTCModule/palabra/PalabraClient.java

@@ -17,6 +17,7 @@ import org.webrtc.AudioTrackSink;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
@@ -158,18 +159,54 @@ public class PalabraClient implements AudioTrackSink {
 
         int responseCode = conn.getResponseCode();
         if (responseCode < 200 || responseCode >= 300) {
-            throw new IOException("session_http_error_" + responseCode);
+            throw new IOException(buildSessionError(conn, responseCode));
+        }
+
+        String response = readStream(conn.getInputStream());
+
+        return new JSONObject(response);
+    }
+
+    private String buildSessionError(HttpURLConnection conn, int responseCode) throws IOException {
+        String fallback = "session_http_error_" + responseCode;
+        String payload = readStream(conn.getErrorStream());
+        if (payload.isEmpty()) {
+            return fallback;
+        }
+
+        try {
+            JSONObject json = new JSONObject(payload);
+            JSONArray errors = json.optJSONArray("errors");
+            if (errors != null && errors.length() > 0) {
+                JSONObject first = errors.optJSONObject(0);
+                if (first != null) {
+                    String detail = first.optString("detail");
+                    if (detail != null && !detail.isEmpty()) {
+                        return fallback + ": " + detail;
+                    }
+                }
+            }
+        } catch (JSONException e) {
+            Log.d(TAG, "session_error_parse_failed", e);
+        }
+
+        return fallback;
+    }
+
+    private String readStream(InputStream stream) throws IOException {
+        if (stream == null) {
+            return "";
         }
 
         StringBuilder response = new StringBuilder();
-        try (BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
             String line;
             while ((line = br.readLine()) != null) {
                 response.append(line);
             }
         }
 
-        return new JSONObject(response.toString());
+        return response.toString();
     }
 
     private void connectWebSocket() {

package/ios/RCTWebRTC/PalabraClient.m

@@ -165,9 +165,10 @@ static const int kChunkBytes = kChunkSamples * 2;
             
             NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
             if (httpResponse.statusCode < 200 || httpResponse.statusCode >= 300) {
+                NSString *message = [self sessionErrorMessageForStatusCode:httpResponse.statusCode data:data];
                 NSError *httpError = [NSError errorWithDomain:@"PalabraClient"
                                                         code:httpResponse.statusCode
-                                                    userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"session_http_error_%ld", (long)httpResponse.statusCode]}];
+                                                    userInfo:@{NSLocalizedDescriptionKey: message}];
                 dispatch_async(dispatch_get_main_queue(), ^{
                     completion(nil, httpError);
                 });
@@ -185,6 +186,36 @@ static const int kChunkBytes = kChunkSamples * 2;
     [task resume];
 }
 
+    - (NSString *)sessionErrorMessageForStatusCode:(NSInteger)statusCode data:(NSData *)data {
+        NSString *fallback = [NSString stringWithFormat:@"session_http_error_%ld", (long)statusCode];
+        if (!data || data.length == 0) {
+            return fallback;
+        }
+
+        NSError *parseError;
+        id json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&parseError];
+        if (parseError || ![json isKindOfClass:[NSDictionary class]]) {
+            return fallback;
+        }
+
+        NSArray *errors = ((NSDictionary *)json)[@"errors"];
+        if (![errors isKindOfClass:[NSArray class]] || errors.count == 0) {
+            return fallback;
+        }
+
+        NSDictionary *first = errors.firstObject;
+        if (![first isKindOfClass:[NSDictionary class]]) {
+            return fallback;
+        }
+
+        NSString *detail = first[@"detail"];
+        if (![detail isKindOfClass:[NSString class]] || detail.length == 0) {
+            return fallback;
+        }
+
+        return [NSString stringWithFormat:@"%@: %@", fallback, detail];
+    }
+
 - (void)connectWebSocket {
     NSString *endpoint = [NSString stringWithFormat:@"%@?token=%@", self.wsUrl, self.publisherToken];
     NSLog(@"palabra_connecting_ws: %@", endpoint);
@@ -194,23 +225,36 @@ static const int kChunkBytes = kChunkSamples * 2;
     [self.webSocket resume];
     
     [self receiveMessage];
-    
+}
+
+- (void)handleWebSocketOpened {
+    if (self.connected || self.translating || !self.webSocket) {
+        return;
+    }
+
     self.connected = YES;
     self.translating = YES;
-    
+
     [self.remoteTrack addRenderer:self];
-    
+
     NSError *audioError;
     [self.audioEngine startAndReturnError:&audioError];
     if (audioError) {
         NSLog(@"palabra_audio_engine_error: %@", audioError);
-    } else {
-        [self.playerNode play];
-        NSLog(@"palabra_audio_engine_started");
+        [self.remoteTrack removeRenderer:self];
+        self.translating = NO;
+        self.connected = NO;
+        [self.webSocket cancelWithCloseCode:NSURLSessionWebSocketCloseCodeInternalServerError reason:nil];
+        self.webSocket = nil;
+        [self notifyError:audioError];
+        return;
     }
-    
+
+    [self.playerNode play];
+    NSLog(@"palabra_audio_engine_started");
+
     [self notifyConnectionState:@"connected"];
-    
+
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self sendSetTask];
     });
@@ -496,6 +540,19 @@ static const int kChunkBytes = kChunkSamples * 2;
     if (dstSamples == 0) dstSamples = 1;
     
     int16_t *dstData = malloc(dstSamples * sizeof(int16_t));
+
+    if (dstSamples == 1 || srcSamples == 1) {
+        float sample = monoSrc[0];
+        sample = fmaxf(-1.0f, fminf(1.0f, sample));
+        dstData[0] = (int16_t)(sample * 32767.0f);
+
+        if (monoBuffer) free(monoBuffer);
+        if (tempFloat) free(tempFloat);
+
+        NSData *result = [NSData dataWithBytes:dstData length:sizeof(int16_t)];
+        free(dstData);
+        return result;
+    }
     
     for (int i = 0; i < dstSamples; i++) {
         float srcIdx = (float)i * (srcSamples - 1) / (dstSamples - 1);
@@ -560,7 +617,7 @@ static const int kChunkBytes = kChunkSamples * 2;
     if ([self.delegate respondsToSelector:@selector(palabraDidReceiveTranscription:)]) {
         [self.delegate palabraDidReceiveTranscription:@{
             @"text": text,
-            @"language": lang,
+            @"lang": lang,
             @"isFinal": @(isFinal)
         }];
     }
@@ -570,6 +627,9 @@ static const int kChunkBytes = kChunkSamples * 2;
 
 - (void)URLSession:(NSURLSession *)session webSocketTask:(NSURLSessionWebSocketTask *)webSocketTask didOpenWithProtocol:(NSString *)protocol {
     NSLog(@"palabra_ws_opened");
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self handleWebSocketOpened];
+    });
 }
 
 - (void)URLSession:(NSURLSession *)session webSocketTask:(NSURLSessionWebSocketTask *)webSocketTask didCloseWithCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData *)reason {

package/lib/commonjs/RTCPeerConnection.js

@@ -79,12 +79,24 @@ class RTCPeerConnection extends _index.EventTarget {
     log.debug(`${this._pcId} ctor`);
   }
   async createOffer(options) {
+    var _sdpInfo$sdp$length, _sdpInfo$sdp;
+    const _t0 = Date.now();
+    console.log(`[RNWebRTC] pc:${this._pcId} create_offer_start`, {
+      signalingState: this.signalingState,
+      connectionState: this.connectionState,
+      iceConnectionState: this.iceConnectionState
+    });
     log.debug(`${this._pcId} createOffer`);
     const {
       sdpInfo,
       newTransceivers,
       transceiversInfo
     } = await WebRTCModule.peerConnectionCreateOffer(this._pcId, RTCUtil.normalizeOfferOptions(options));
+    console.log(`[RNWebRTC] pc:${this._pcId} create_offer_done`, {
+      durationMs: Date.now() - _t0,
+      sdpType: sdpInfo === null || sdpInfo === void 0 ? void 0 : sdpInfo.type,
+      sdpLen: (_sdpInfo$sdp$length = sdpInfo === null || sdpInfo === void 0 ? void 0 : (_sdpInfo$sdp = sdpInfo.sdp) === null || _sdpInfo$sdp === void 0 ? void 0 : _sdpInfo$sdp.length) !== null && _sdpInfo$sdp$length !== void 0 ? _sdpInfo$sdp$length : 0
+    });
     log.debug(`${this._pcId} createOffer OK`);
     newTransceivers === null || newTransceivers === void 0 ? void 0 : newTransceivers.forEach(t => {
       const {
@@ -111,11 +123,22 @@ class RTCPeerConnection extends _index.EventTarget {
     return sdpInfo;
   }
   async createAnswer() {
+    var _sdpInfo$sdp$length2, _sdpInfo$sdp2;
+    const _t0 = Date.now();
+    console.log(`[RNWebRTC] pc:${this._pcId} create_answer_start`, {
+      signalingState: this.signalingState,
+      connectionState: this.connectionState
+    });
     log.debug(`${this._pcId} createAnswer`);
     const {
       sdpInfo,
       transceiversInfo
     } = await WebRTCModule.peerConnectionCreateAnswer(this._pcId, {});
+    console.log(`[RNWebRTC] pc:${this._pcId} create_answer_done`, {
+      durationMs: Date.now() - _t0,
+      sdpType: sdpInfo === null || sdpInfo === void 0 ? void 0 : sdpInfo.type,
+      sdpLen: (_sdpInfo$sdp$length2 = sdpInfo === null || sdpInfo === void 0 ? void 0 : (_sdpInfo$sdp2 = sdpInfo.sdp) === null || _sdpInfo$sdp2 === void 0 ? void 0 : _sdpInfo$sdp2.length) !== null && _sdpInfo$sdp$length2 !== void 0 ? _sdpInfo$sdp$length2 : 0
+    });
     this._updateTransceivers(transceiversInfo);
     return sdpInfo;
   }
@@ -123,14 +146,20 @@ class RTCPeerConnection extends _index.EventTarget {
     WebRTCModule.peerConnectionSetConfiguration(configuration, this._pcId);
   }
   async setLocalDescription(sessionDescription) {
-    var _desc;
+    var _sessionDescription$s, _sessionDescription$s2, _desc;
+    const _t0 = Date.now();
+    console.log(`[RNWebRTC] pc:${this._pcId} set_local_desc_start`, {
+      type: sessionDescription === null || sessionDescription === void 0 ? void 0 : sessionDescription.type,
+      sdpLen: (_sessionDescription$s = sessionDescription === null || sessionDescription === void 0 ? void 0 : (_sessionDescription$s2 = sessionDescription.sdp) === null || _sessionDescription$s2 === void 0 ? void 0 : _sessionDescription$s2.length) !== null && _sessionDescription$s !== void 0 ? _sessionDescription$s : 0,
+      signalingState: this.signalingState
+    });
     log.debug(`${this._pcId} setLocalDescription`);
     let desc;
     if (sessionDescription) {
-      var _sessionDescription$s;
+      var _sessionDescription$s3;
       desc = {
         type: sessionDescription.type,
-        sdp: (_sessionDescription$s = sessionDescription.sdp) !== null && _sessionDescription$s !== void 0 ? _sessionDescription$s : ''
+        sdp: (_sessionDescription$s3 = sessionDescription.sdp) !== null && _sessionDescription$s3 !== void 0 ? _sessionDescription$s3 : ''
       };
       if (!RTCUtil.isSdpTypeValid(desc.type)) {
         throw new Error(`Invalid session description: invalid type: ${desc.type}`);
@@ -148,17 +177,28 @@ class RTCPeerConnection extends _index.EventTarget {
       this.localDescription = null;
     }
     this._updateTransceivers(transceiversInfo, /* removeStopped */((_desc = desc) === null || _desc === void 0 ? void 0 : _desc.type) === 'answer');
+    console.log(`[RNWebRTC] pc:${this._pcId} set_local_desc_done`, {
+      durationMs: Date.now() - _t0,
+      signalingState: this.signalingState
+    });
     log.debug(`${this._pcId} setLocalDescription OK`);
   }
   async setRemoteDescription(sessionDescription) {
-    var _sessionDescription$s2, _desc$type;
+    var _sessionDescription$s4, _sessionDescription$s5, _sessionDescription$s6, _desc$type;
+    const _t0 = Date.now();
+    console.log(`[RNWebRTC] pc:${this._pcId} set_remote_desc_start`, {
+      type: sessionDescription === null || sessionDescription === void 0 ? void 0 : sessionDescription.type,
+      sdpLen: (_sessionDescription$s4 = sessionDescription === null || sessionDescription === void 0 ? void 0 : (_sessionDescription$s5 = sessionDescription.sdp) === null || _sessionDescription$s5 === void 0 ? void 0 : _sessionDescription$s5.length) !== null && _sessionDescription$s4 !== void 0 ? _sessionDescription$s4 : 0,
+      signalingState: this.signalingState,
+      connectionState: this.connectionState
+    });
     log.debug(`${this._pcId} setRemoteDescription`);
     if (!sessionDescription) {
       return Promise.reject(new Error('No session description provided'));
     }
     const desc = {
       type: sessionDescription.type,
-      sdp: (_sessionDescription$s2 = sessionDescription.sdp) !== null && _sessionDescription$s2 !== void 0 ? _sessionDescription$s2 : ''
+      sdp: (_sessionDescription$s6 = sessionDescription.sdp) !== null && _sessionDescription$s6 !== void 0 ? _sessionDescription$s6 : ''
     };
     if (!RTCUtil.isSdpTypeValid((_desc$type = desc.type) !== null && _desc$type !== void 0 ? _desc$type : '')) {
       throw new Error(`Invalid session description: invalid type: ${desc.type}`);
@@ -246,9 +286,24 @@ class RTCPeerConnection extends _index.EventTarget {
       // Dispatch an unmute event for the track.
       track._setMutedInternal(false);
     }
+    console.log(`[RNWebRTC] pc:${this._pcId} set_remote_desc_done`, {
+      durationMs: Date.now() - _t0,
+      signalingState: this.signalingState,
+      pendingTrackEventsDispatched: this._pendingTrackEvents.length
+    });
     log.debug(`${this._pcId} setRemoteDescription OK`);
   }
   async addIceCandidate(candidate) {
+    console.log(`[RNWebRTC] pc:${this._pcId} add_ice_candidate`, {
+      type: candidate === null || candidate === void 0 ? void 0 : candidate.type,
+      protocol: candidate === null || candidate === void 0 ? void 0 : candidate.protocol,
+      sdpMid: candidate === null || candidate === void 0 ? void 0 : candidate.sdpMid,
+      sdpMLineIndex: candidate === null || candidate === void 0 ? void 0 : candidate.sdpMLineIndex,
+      empty: !(candidate !== null && candidate !== void 0 && candidate.candidate),
+      signalingState: this.signalingState,
+      connectionState: this.connectionState,
+      iceConnectionState: this.iceConnectionState
+    });
     log.debug(`${this._pcId} addIceCandidate`);
     if (!candidate || !candidate.candidate) {
       // XXX end-of candidates is not implemented: https://bugs.chromium.org/p/webrtc/issues/detail?id=9218
@@ -465,22 +520,43 @@ class RTCPeerConnection extends _index.EventTarget {
       if (ev.pcId !== this._pcId) {
         return;
       }
+      console.log(`[RNWebRTC] pc:${this._pcId} negotiation_needed`, {
+        signalingState: this.signalingState,
+        connectionState: this.connectionState,
+        iceConnectionState: this.iceConnectionState
+      });
       this.dispatchEvent(new _index.Event('negotiationneeded'));
     });
     (0, _EventEmitter.addListener)(this, 'peerConnectionIceConnectionChanged', ev => {
       if (ev.pcId !== this._pcId) {
         return;
       }
+      const prev = this.iceConnectionState;
       this.iceConnectionState = ev.iceConnectionState;
+      console.log(`[RNWebRTC] pc:${this._pcId} ice_connection_changed`, {
+        prev,
+        current: ev.iceConnectionState,
+        connectionState: this.connectionState,
+        signalingState: this.signalingState
+      });
       this.dispatchEvent(new _index.Event('iceconnectionstatechange'));
     });
     (0, _EventEmitter.addListener)(this, 'peerConnectionStateChanged', ev => {
       if (ev.pcId !== this._pcId) {
         return;
       }
+      const prev = this.connectionState;
       this.connectionState = ev.connectionState;
+      console.log(`[RNWebRTC] pc:${this._pcId} connection_state_changed`, {
+        prev,
+        current: ev.connectionState,
+        iceConnectionState: this.iceConnectionState,
+        iceGatheringState: this.iceGatheringState,
+        signalingState: this.signalingState
+      });
       this.dispatchEvent(new _index.Event('connectionstatechange'));
       if (ev.connectionState === 'closed') {
+        console.log(`[RNWebRTC] pc:${this._pcId} disposing`);
         // This PeerConnection is done, clean up.
         (0, _EventEmitter.removeListener)(this);
         WebRTCModule.peerConnectionDispose(this._pcId);
@@ -490,15 +566,28 @@ class RTCPeerConnection extends _index.EventTarget {
       if (ev.pcId !== this._pcId) {
         return;
       }
+      const prev = this.signalingState;
       this.signalingState = ev.signalingState;
+      console.log(`[RNWebRTC] pc:${this._pcId} signaling_state_changed`, {
+        prev,
+        current: ev.signalingState,
+        connectionState: this.connectionState
+      });
       this.dispatchEvent(new _index.Event('signalingstatechange'));
     });
 
     // Consider moving away from this event: https://github.com/WebKit/WebKit/pull/3953
     (0, _EventEmitter.addListener)(this, 'peerConnectionOnTrack', ev => {
+      var _ev$receiver, _ev$receiver2, _ev$receiver2$track, _ev$streams$length, _ev$streams;
       if (ev.pcId !== this._pcId) {
         return;
       }
+      console.log(`[RNWebRTC] pc:${this._pcId} track_event_queued`, {
+        receiverId: (_ev$receiver = ev.receiver) === null || _ev$receiver === void 0 ? void 0 : _ev$receiver.id,
+        trackKind: (_ev$receiver2 = ev.receiver) === null || _ev$receiver2 === void 0 ? void 0 : (_ev$receiver2$track = _ev$receiver2.track) === null || _ev$receiver2$track === void 0 ? void 0 : _ev$receiver2$track.kind,
+        streamCount: (_ev$streams$length = (_ev$streams = ev.streams) === null || _ev$streams === void 0 ? void 0 : _ev$streams.length) !== null && _ev$streams$length !== void 0 ? _ev$streams$length : 0,
+        pendingCount: this._pendingTrackEvents.length + 1
+      });
       log.debug(`${this._pcId} ontrack`);
 
       // NOTE: We need to make sure the track event fires right before sRD completes,
@@ -510,6 +599,9 @@ class RTCPeerConnection extends _index.EventTarget {
       if (ev.pcId !== this._pcId) {
         return;
       }
+      console.log(`[RNWebRTC] pc:${this._pcId} remove_track`, {
+        receiverId: ev.receiverId
+      });
       log.debug(`${this._pcId} onremovetrack ${ev.receiverId}`);
       const receiver = this.getReceivers().find(r => r.id === ev.receiverId);
       const track = receiver === null || receiver === void 0 ? void 0 : receiver.track;
@@ -535,9 +627,16 @@ class RTCPeerConnection extends _index.EventTarget {
       }
     });
     (0, _EventEmitter.addListener)(this, 'peerConnectionGotICECandidate', ev => {
+      var _ev$candidate, _ev$candidate2, _ev$candidate3;
       if (ev.pcId !== this._pcId) {
         return;
       }
+      console.log(`[RNWebRTC] pc:${this._pcId} local_ice_candidate`, {
+        type: (_ev$candidate = ev.candidate) === null || _ev$candidate === void 0 ? void 0 : _ev$candidate.type,
+        protocol: (_ev$candidate2 = ev.candidate) === null || _ev$candidate2 === void 0 ? void 0 : _ev$candidate2.protocol,
+        sdpMid: (_ev$candidate3 = ev.candidate) === null || _ev$candidate3 === void 0 ? void 0 : _ev$candidate3.sdpMid,
+        iceGatheringState: this.iceGatheringState
+      });
       const sdpInfo = ev.sdp;
 
       // Can happen when doing a rollback.
@@ -555,7 +654,13 @@ class RTCPeerConnection extends _index.EventTarget {
       if (ev.pcId !== this._pcId) {
         return;
       }
+      const prev = this.iceGatheringState;
       this.iceGatheringState = ev.iceGatheringState;
+      console.log(`[RNWebRTC] pc:${this._pcId} ice_gathering_state_changed`, {
+        prev,
+        current: ev.iceGatheringState,
+        connectionState: this.connectionState
+      });
       if (this.iceGatheringState === 'complete') {
         const sdpInfo = ev.sdp;