Merge branch 'master' into release

Author: egreenmachine

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "sip.js",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "authors": [
     "James Criscuolo <[email protected]>",
     "Eric Green <[email protected]>",

package.json

@@ -2,7 +2,7 @@
   "name": "sip.js",
   "title": "SIP.js",
   "description": "A simple, intuitive, and powerful JavaScript signaling library",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "main": "dist/sip.js",
   "browser": {
     "./src/environment.js": "./src/environment_browser.js"
@@ -26,9 +26,7 @@
     "javascript"
   ],
   "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
-    "babel-preset-env": "^1.6.1",
+    "awesome-typescript-loader": "^5.2.1",
     "eslint": "^5.4.0",
     "jasmine-core": "^3.2.1",
     "karma": "^3.0.0",
@@ -40,6 +38,7 @@
     "karma-webpack": "^3.0.0",
     "pegjs": "^0.10.0",
     "pegjs-loader": "^0.5.4",
+    "typescript": "^3.0.3",
     "webpack": "^4.19.0",
     "webpack-cli": "^3.0.8"
   },

src/Session.js

@@ -1101,7 +1101,11 @@ InviteServerContext.prototype = Object.create({}, {
         }
       },
 
-      descriptionCreationFailed = function() {
+      descriptionCreationFailed = function(err) {
+        if (err instanceof SIP.Exceptions.SessionDescriptionHandlerError) {
+            self.logger.log(err.message);
+            self.logger.log(err.error);
+        }
         // TODO: This should check the actual error and make sure it is an
         //        "expected" error. Otherwise it should throw.
         if (self.status === C.STATUS_TERMINATED) {
@@ -1432,7 +1436,11 @@ InviteClientContext.prototype = Object.create({}, {
             self.status = C.STATUS_INVITE_SENT;
             self.send();
           },
-          function onFailure() {
+          function onFailure(err) {
+            if (err instanceof SIP.Exceptions.SessionDescriptionHandlerError) {
+              self.logger.log(err.message);
+              self.logger.log(err.error);
+            }
             if (self.status === C.STATUS_TERMINATED) {
               return;
             }

src/Web/Modifiers.js

@@ -54,8 +54,27 @@ function stripPayload(sdp, payload) {
 
 function stripMediaDescription(sdp, description) {
   const descriptionRegExp = new RegExp("m=" + description + ".*$", "gm");
+  const groupRegExp = new RegExp("^a=group:.*$", "gm");
+
   if (descriptionRegExp.test(sdp)) {
-    sdp = sdp.split(/^m=/gm).filter((section) => (section.substr(0, description.length) !== description)).join('m=');
+    let midLineToRemove;
+    sdp = sdp.split(/^m=/gm).filter((section) => {
+      if (section.substr(0, description.length) === description) {
+        midLineToRemove = section.match(/^a=mid:.*$/gm);
+        if (midLineToRemove) {
+          midLineToRemove = midLineToRemove[0].match(/:.+$/g)[0].substr(1);
+        }
+        return false;
+      }
+      return true;
+    }).join('m=');
+    let groupLine = sdp.match(groupRegExp);
+    if (groupLine && groupLine.length === 1) {
+      groupLine = groupLine[0];
+      const groupRegExpReplace = new RegExp("\ *" + midLineToRemove + "[^\ ]*", "g");
+      groupLine = groupLine.replace(groupRegExpReplace, "");
+      sdp = sdp.split(groupRegExp).join(groupLine);
+    }
   }
   return sdp;
 }
@@ -89,7 +108,24 @@ Modifiers = {
   },
 
   stripVideo: function(description) {
-    description.sdp = stripMediaDescription(description, "video");
+    description.sdp = stripMediaDescription(description.sdp, "video");
+    return SIP.Utils.Promise.resolve(description);
+  },
+
+  addMidLines: function(description) {
+    let sdp = description.sdp;
+    if (sdp.search(/^a=mid.*$/gm) === -1) {
+      const mlines = sdp.match(/^m=.*$/gm);
+      sdp = sdp.split(/^m=.*$/gm);
+      mlines.forEach((elem, idx) => {
+        mlines[idx] = elem + '\na=mid:' + idx;
+      });
+      sdp.forEach((elem, idx) => {
+        sdp[idx] = elem + mlines[idx];
+      });
+      sdp = sdp.join('');
+      description.sdp = sdp;
+    }
     return SIP.Utils.Promise.resolve(description);
   }
 };

src/Web/Transport.js

@@ -339,6 +339,7 @@ Transport.prototype = Object.create(SIP.Transport.prototype, {
     if (this.noAvailableServers()) {
       this.logger.warn('no available ws servers left - going to closed state');
       this.status = C.STATUS_CLOSED;
+      this.emit('closed');
       this.resetServerErrorStatus();
       return;
     }

tsconfig.json

@@ -0,0 +1,10 @@
+{
+    "compilerOptions": {
+        "outDir": "./dist",
+        "allowJs": true,
+        "target": "es5"
+    },
+    "include": [
+        "./src/**/*"
+    ]
+}

webpack.config.js

@@ -61,10 +61,7 @@ module.exports = function (env) {
         {
           test: /\.js$/,
           exclude: /node_modules/,
-          loader: "babel-loader",
-          options: {
-            presets: ['env']
-          }
+          loader: "awesome-typescript-loader"
         },
         {
           test: /\.pegjs$/,