drachtio-srf 4.4.64 → 4.4.65

package/lib/srf.js

@@ -27,6 +27,8 @@ DialogState.Cancelled = 'cancelled';
 DialogDirection.Initiator = 'initiator';
 DialogDirection.Recipient = 'recipient';
 
+const sleepFor = async(ms) => await new Promise((resolve) => setTimeout(resolve, ms));
+
 const noncopyableHdrs = ['via', 'from', 'to', 'call-id', 'cseq', 'contact', 'content-length', 'content-type'];
 function copyAllHeaders(msg, obj) {
   if (msg) Object.keys(msg.headers).forEach((h) => {
@@ -833,37 +835,42 @@ class Srf extends Emitter {
     let remoteSdpB, translatedRemoteSdpB ;
 
     /* returns a Promise that resolves with the sdp to use responding to the A leg */
-    function generateSdpA(res) {
+    const generateSdpA = async(res) => {
       debug('createB2BUA: generateSdpA');
 
       const sdpB = res.body ;
       if (res.getParsedHeader('CSeq').method === 'SUBSCRIBE' || !sdpB) {
-        return Promise.resolve(sdpB) ;
+        return sdpB ;
       }
 
       if (remoteSdpB && remoteSdpB === sdpB) {
         // called again with same remote SDP, return previous result
-        return Promise.resolve(translatedRemoteSdpB) ;
+        if (translatedRemoteSdpB) return translatedRemoteSdpB;
+
+        /* race condition: we are still producing the translatedSdp from 183 */
+        await sleepFor(100);
+        if (translatedRemoteSdpB) return translatedRemoteSdpB;
+        await sleepFor(500);
+        if (translatedRemoteSdpB) return translatedRemoteSdpB;
+        await sleepFor(1000);
+        return translatedRemoteSdpB;
       }
 
       remoteSdpB = sdpB ;
       if (!opts.localSdpA) {
         // passthru B leg SDP
-        return Promise.resolve(translatedRemoteSdpB = sdpB);
+        return translatedRemoteSdpB = sdpB;
       }
       else if ('function' === typeof opts.localSdpA) {
         // call function that returns either the sdp, or a Promise that resolves to the sdp
-        const p = opts.localSdpA(sdpB, res);
-        if (typeof p === 'string') return Promise.resolve(translatedRemoteSdpB = p);
-        return p
-          .then((sdpA) => translatedRemoteSdpB = sdpA)
-          .catch((err) => Promise.reject(err));
+        const sdpA = await opts.localSdpA(sdpB, res);
+        return translatedRemoteSdpB = sdpA;
       }
       else {
         // insert provided SDP
-        return Promise.resolve(translatedRemoteSdpB = opts.localSdpA) ;
+        return translatedRemoteSdpB = opts.localSdpA ;
       }
-    }
+    };
 
     /* uac request sent, set handler to propagate CANCEL from A leg if we get it */
     function handleUACSent(err, uacReq) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "4.4.64",
+  "version": "4.4.65",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "scripts": {