Merge branch 'master' into release

package.json

@@ -2,7 +2,7 @@
   "name": "sip.js",
   "title": "SIP.js",
   "description": "A simple, intuitive, and powerful JavaScript signaling library",
-  "version": "0.14.4",
+  "version": "0.14.5",
   "license": "MIT",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -26,12 +26,13 @@
     "typescript"
   ],
   "dependencies": {
-    "crypto-js": "^3.1.9-1"
+    "@types/node": "^12.0.8",
+    "crypto-js": "^3.1.9-1",
+    "tslib": "^1.10.0"
   },
   "devDependencies": {
     "@types/crypto-js": "^3.1.43",
     "@types/jasmine": "^3.3.13",
-    "@types/node": "^12.0.7",
     "circular-dependency-plugin": "^5.0.2",
     "jasmine-core": "^3.4.0",
     "karma": "^4.1.0",
@@ -41,14 +42,14 @@
     "karma-jasmine-html-reporter": "^1.4.2",
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^3.0.5",
+    "karma-webpack": "^4.0.2",
     "pegjs": "^0.10.0",
-    "ts-loader": "^6.0.2",
+    "ts-loader": "^6.0.3",
     "ts-pegjs": "0.2.5",
     "tslint": "^5.17.0",
-    "typescript": "^3.5.1",
-    "webpack": "^4.33.0",
-    "webpack-cli": "^3.3.3"
+    "typescript": "^3.5.2",
+    "webpack": "^4.34.0",
+    "webpack-cli": "^3.3.4"
   },
   "engines": {
     "node": ">=8.0"

src/PublishContext.ts

@@ -61,10 +61,6 @@ export class PublishContext extends ClientContext {
     this.logger = ua.getLogger("sip.publish");
 
     this.pubRequestExpires = this.options.expires;
-
-    ua.on("transportCreated", (transport: Transport) =>  {
-      transport.on("transportError", () => this.onTransportError());
-    });
   }
 
   /**

src/RegisterContext.ts

@@ -209,9 +209,7 @@ export class RegisterContext extends ClientContext {
     // Set status
     this.registered = false;
 
-    ua.on("transportCreated", (transport: Transport): void => {
-      transport.on("disconnected", () => this.onTransportDisconnected());
-    });
+    ua.transport.on("disconnected", () => this.onTransportDisconnected());
   }
 
   public register(options: any = {}): void {

src/UA.ts

@@ -45,7 +45,7 @@ import {
 } from "./Web/SessionDescriptionHandler";
 import { Transport as WebTransport } from "./Web/Transport";
 
-const environment = (global as any).window || global;
+declare var chrome: any;
 
 export namespace UA {
   export interface Options {
@@ -161,7 +161,9 @@ export class UA extends EventEmitter {
   private log: LoggerFactory;
   private error: number | undefined;
   private registerContext: RegisterContext;
-  private environListener: any;
+
+  /** Unload listener. */
+  private unloadListener = (() => { this.stop(); });
 
   constructor(configuration?: UA.Options) {
     super();
@@ -550,11 +552,11 @@ export class UA extends EventEmitter {
     this.transport.disconnect();
     this.userAgentCore.reset();
 
-    if (typeof environment.removeEventListener === "function") {
-      // Google Chrome Packaged Apps don't allow 'unload' listeners:
-      // unload is not available in packaged apps
-      if (!((global as any).chrome && (global as any).chrome.app && (global as any).chrome.app.runtime)) {
-        environment.removeEventListener("unload", this.environListener);
+    if (this.configuration.autostop) {
+      // Google Chrome Packaged Apps don't allow 'unload' listeners: unload is not available in packaged apps
+      const googleChromePackagedApp = typeof chrome !== "undefined" && chrome.app && chrome.app.runtime ? true : false;
+      if (window && !googleChromePackagedApp) {
+        window.removeEventListener("unload", this.unloadListener);
       }
     }
 
@@ -585,12 +587,11 @@ export class UA extends EventEmitter {
       this.logger.error("Connection is down. Auto-Recovery system is trying to connect");
     }
 
-    if (this.configuration.autostop && typeof environment.addEventListener === "function") {
-      // Google Chrome Packaged Apps don't allow 'unload' listeners:
-      // unload is not available in packaged apps
-      if (!((global as any).chrome && (global as any).chrome.app && (global as any).chrome.app.runtime)) {
-        this.environListener = this.stop;
-        environment.addEventListener("unload", () => this.environListener());
+    if (this.configuration.autostop) {
+      // Google Chrome Packaged Apps don't allow 'unload' listeners: unload is not available in packaged apps
+      const googleChromePackagedApp = typeof chrome !== "undefined" && chrome.app && chrome.app.runtime ? true : false;
+      if (window && !googleChromePackagedApp) {
+        window.addEventListener("unload", this.unloadListener);
       }
     }
 

src/Web/SessionDescriptionHandler.ts

@@ -59,7 +59,6 @@ export class SessionDescriptionHandler extends EventEmitter implements SessionDe
   private direction: string;
   private C: any;
   private modifiers: SessionDescriptionHandlerModifiers;
-  private WebRTC: any;
   private iceGatheringDeferred: Utils.Deferred<any> | undefined;
   private iceGatheringTimeout: boolean;
   private iceGatheringTimer: any | undefined;
@@ -98,13 +97,6 @@ export class SessionDescriptionHandler extends EventEmitter implements SessionDe
       this.modifiers = [this.modifiers];
     }
 
-    const environment = (global as any).window || global;
-    this.WebRTC = {
-      MediaStream           : environment.MediaStream,
-      getUserMedia          : environment.navigator.mediaDevices.getUserMedia.bind(environment.navigator.mediaDevices),
-      RTCPeerConnection     : environment.RTCPeerConnection
-    };
-
     this.iceGatheringTimeout = false;
 
     this.initPeerConnection(this.options.peerConnectionOptions);
@@ -513,7 +505,7 @@ export class SessionDescriptionHandler extends EventEmitter implements SessionDe
       this.peerConnection.close();
     }
 
-    this.peerConnection = new this.WebRTC.RTCPeerConnection(options.rtcConfiguration);
+    this.peerConnection = new RTCPeerConnection(options.rtcConfiguration);
 
     this.logger.log("New peer connection created");
 
@@ -610,7 +602,7 @@ export class SessionDescriptionHandler extends EventEmitter implements SessionDe
       this.emit("userMediaRequest", constraints);
 
       if (constraints.audio || constraints.video) {
-        this.WebRTC.getUserMedia(constraints).then((streams: any) => {
+        navigator.mediaDevices.getUserMedia(constraints).then((streams) => {
           this.observer.trackAdded();
           this.emit("userMedia", streams);
           resolve(streams);

src/Web/Simple.ts

@@ -72,7 +72,7 @@ export class Simple extends EventEmitter {
     this.options = options;
 
     // https://stackoverflow.com/questions/7944460/detect-safari-browser
-    const browserUa: string = (global as any).navigator.userAgent.toLowerCase();
+    const browserUa = navigator.userAgent.toLowerCase();
     let isSafari: boolean = false;
     let isFirefox: boolean = false;
     if (browserUa.indexOf("safari") > -1 && browserUa.indexOf("chrome") < 0) {
@@ -300,7 +300,7 @@ export class Simple extends EventEmitter {
     let remoteStream: any;
 
     if (pc.getReceivers) {
-      remoteStream = new (global as any).window.MediaStream();
+      remoteStream = new MediaStream();
       pc.getReceivers().forEach((receiver: any) => {
         const track = receiver.track;
         if (track) {
@@ -332,7 +332,7 @@ export class Simple extends EventEmitter {
       const pc = (this.session.sessionDescriptionHandler as SessionDescriptionHandler).peerConnection;
       let localStream: any;
       if (pc.getSenders) {
-        localStream = new (global as any).window.MediaStream();
+        localStream = new MediaStream();
         pc.getSenders().forEach((sender: any) => {
           const track = sender.track;
           if (track && track.kind === "video") {

src/Web/Transport.ts

@@ -53,10 +53,9 @@ export class Transport extends TransportBase {
   public server: WsServer;
   public ws: any;
 
-  private WebSocket = ((global as any).window || global).WebSocket;
-
   private connectionPromise: Promise<any> | undefined;
   private connectDeferredResolve: ((obj: any) => void) | undefined;
+  private connectDeferredReject: ((obj: any) => void) | undefined;
   private connectionTimeout: any | undefined;
 
   private disconnectionPromise: Promise<any> | undefined;
@@ -182,6 +181,7 @@ export class Transport extends TransportBase {
       }
 
       this.connectDeferredResolve = resolve;
+      this.connectDeferredReject = reject;
 
       this.status = TransportStatus.STATUS_CONNECTING;
       this.emit("connecting");
@@ -194,11 +194,15 @@ export class Transport extends TransportBase {
         this.statusTransition(TransportStatus.STATUS_CLOSED, true);
         this.onError("error connecting to WebSocket " + this.server.wsUri + ":" + e);
         reject("Failed to create a websocket");
+        this.connectDeferredResolve = undefined;
+        this.connectDeferredReject = undefined;
         return;
       }
 
       if (!this.ws) {
         reject("Unexpected instance websocket not set");
+        this.connectDeferredResolve = undefined;
+        this.connectDeferredReject = undefined;
         return;
       }
 
@@ -209,6 +213,8 @@ export class Transport extends TransportBase {
         this.emit("disconnected", {code: 1000});
         this.connectionPromise = undefined;
         reject("Connection timeout");
+        this.connectDeferredResolve = undefined;
+        this.connectDeferredReject = undefined;
       }, this.configuration.connectionTimeout * 1000);
 
       this.boundOnOpen = this.onOpen.bind(this);
@@ -304,6 +310,8 @@ export class Transport extends TransportBase {
 
     if (this.connectDeferredResolve) {
       this.connectDeferredResolve({overrideEvent: true});
+      this.connectDeferredResolve = undefined;
+      this.connectDeferredReject = undefined;
     } else {
       this.logger.warn("Unexpected websocket.onOpen with no connectDeferredResolve");
     }
@@ -327,9 +335,13 @@ export class Transport extends TransportBase {
     if (this.connectionTimeout) {
       clearTimeout(this.connectionTimeout);
     }
+    if (this.connectDeferredReject) {
+      this.connectDeferredReject("Websocket Closed");
+    }
     this.connectionTimeout = undefined;
     this.connectionPromise = undefined;
     this.connectDeferredResolve = undefined;
+    this.connectDeferredReject = undefined;
 
     // Check whether the user requested to close.
     if (this.disconnectDeferredResolve) {

src/core/dialogs/session-dialog.ts

@@ -557,6 +557,7 @@ export class SessionDialog extends Dialog implements Session {
         // https://tools.ietf.org/html/rfc3261#section-14.2
         {
           const uas = new ReInviteUserAgentServer(this, message);
+          this.signalingStateTransition(message);
           this.delegate && this.delegate.onInvite ?
             this.delegate.onInvite(uas) :
             uas.reject({ statusCode: 488 }); // TODO: Warning header field.

test/spec/SpecRegisterContext.js

@@ -27,8 +27,12 @@ describe('RegisterContext', function() {
       getLoggerFactory: () => loggerFactory,
       getSupportedResponseOptions: () => ["outbound"],
       normalizeTarget: function (target) { return target; },
-      listeners: function () { return [1]; }
-    };
+      listeners: function () { return [1]; },
+      transport: {
+        on: function () {},
+        send: function () {}
+      }
+  };
     ua.userAgentCore = new SIP.Core.UserAgentCore(SIP.makeUserAgentCoreConfigurationFromUA(ua));
     RegisterContext = new SIP.RegisterContext(ua, ua.configuration.registerOptions);