Fixes

GPTOG · Apr 3, 2021 · ea0cd0c · ea0cd0c
1 parent c7f2ab9
commit ea0cd0c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "homepage": "https://evgeny-nadymov.github.io/telegram-react",
   "name": "telegram_react",
-  "version": "0.0.978",
+  "version": "0.0.979",
   "private": true,
   "dependencies": {
     "tdweb": "^1.7.2",

diff --git a/src/Calls/P2P/P2PSdpBuilder.js b/src/Calls/P2P/P2PSdpBuilder.js
@@ -25,8 +25,7 @@ export function p2pParseCandidate(candidate) {
         component,
         protocol,
         priority,
-        ip,
-        port
+        address: { ip, port }
     };
 
     for (let i = 0; i < other.length; i += 2) {
@@ -36,11 +35,19 @@ export function p2pParseCandidate(candidate) {
                 break;
             }
             case 'raddr': {
-                c.relAddr = other[i + 1];
+                if (!c.relAddress) {
+                    c.relAddress = { };
+                }
+
+                c.relAddress.ip = other[i + 1];
                 break;
             }
             case 'rport': {
-                c.relPort = other[i + 1];
+                if (!c.relAddress) {
+                    c.relAddress = { };
+                }
+
+                c.relAddress.port = other[i + 1];
                 break;
             }
             case 'generation': {
@@ -186,7 +193,7 @@ export function p2pParseSdp(sdp) {
         for (let i = 0; i < types.length; i++) {
             const { id } = types[i];
             if (rtcpFb.has(id)) {
-                types[i].feedback = rtcpFb.get(id);
+                types[i].feedbackTypes = rtcpFb.get(id);
             }
             if (fmtp.has(id)) {
                 types[i].parameters = fmtp.get(id);
@@ -252,11 +259,11 @@ export function addPayloadTypes(types) {
 
     for (let i = 0; i < types.length; i++) {
         const type = types[i];
-        const { id, name, clockrate, channels, feedback, parameters } = type;
+        const { id, name, clockrate, channels, feedbackTypes, parameters } = type;
         sdp += `
 a=rtpmap:${id} ${name}/${clockrate}${channels ? '/' + channels : ''}`;
-        if (feedback) {
-            feedback.forEach(x => {
+        if (feedbackTypes) {
+            feedbackTypes.forEach(x => {
                 const { type, subtype } = x;
                 sdp += `
 a=rtcp-fb:${id} ${[type, subtype].join(' ')}`;
@@ -320,17 +327,15 @@ export class P2PSdpBuilder {
     static generateCandidate(info) {
         if (!info) return null;
 
-        const { sdpMLineIndex, sdpMid, foundation, component, protocol, priority, ip, port, type, relAddr, relPort, generation, tcpType, networkId, networkCost, username } = info;
-        let candidate = `candidate:${foundation} ${component} ${protocol} ${priority} ${ip} ${port}`;
+        const { sdpMLineIndex, sdpMid, foundation, component, protocol, priority, address, type, relAddress, generation, tcpType, networkId, networkCost, username } = info;
+        let candidate = `candidate:${foundation} ${component} ${protocol} ${priority} ${address.ip} ${address.port}`;
         const attrs = []
         if (type) {
             attrs.push(`typ ${type}`);
         }
-        if (relAddr) {
-            attrs.push(`raddr ${relAddr}`);
-        }
-        if (relPort) {
-            attrs.push(`rport ${relPort}`);
+        if (relAddress) {
+            attrs.push(`raddr ${relAddress.ip}`);
+            attrs.push(`rport ${relAddress.port}`);
         }
         if (generation) {
             attrs.push(`generation ${generation}`);

diff --git a/src/Stores/CallStore.js b/src/Stores/CallStore.js
@@ -1500,9 +1500,9 @@ class CallStore extends EventEmitter {
             '@type': 'callProtocol',
             udp_p2p: true,
             udp_reflector: true,
-            min_layer: 126,
-            max_layer: 126,
-            library_versions: ['3.0.0']
+            min_layer: 92,
+            max_layer: 92,
+            library_versions: ['4.0.0']
         };
     }