Clean up module dependencies.

- LoggerFactory does not depend on SIP
- Constants depends only on SIP.name and SIP.version
- Exceptions does not depend on SIP
- Timers does not depend on SIP
- Transport depends on window
- SIP.MediaHandler depends on EventEmitter, not SIP
- WebRTC depends on Utils, not SIP
- Hacks depends on window, not SIP
- DigestAuthentication depends on Utils, not SIP

Author: joseph-onsip

src/Constants.js

@@ -7,9 +7,9 @@
  * @augments SIP
  */
 
-module.exports = function (SIP) {
-SIP.C= {
-  USER_AGENT: SIP.name +'/'+ SIP.version,
+module.exports = function (name, version) {
+return {
+  USER_AGENT: name +'/'+ version,
 
   // SIP scheme
   SIP:  'sip',

src/DigestAuthentication.js

@@ -9,7 +9,7 @@
  * @function Digest Authentication
  * @param {SIP.UA} ua
  */
-module.exports = function (SIP) {
+module.exports = function (Utils) {
 var DigestAuthentication;
 
 DigestAuthentication = function(ua) {
@@ -78,7 +78,7 @@ DigestAuthentication.prototype.authenticate = function(request, challenge) {
 
   this.method = request.method;
   this.uri = request.ruri;
-  this.cnonce = SIP.Utils.createRandomToken(12);
+  this.cnonce = Utils.createRandomToken(12);
   this.nc += 1;
   this.updateNcHex();
 
@@ -103,25 +103,25 @@ DigestAuthentication.prototype.calculateResponse = function() {
   var ha1, ha2;
 
   // HA1 = MD5(A1) = MD5(username:realm:password)
-  ha1 = SIP.Utils.calculateMD5(this.username + ":" + this.realm + ":" + this.password);
+  ha1 = Utils.calculateMD5(this.username + ":" + this.realm + ":" + this.password);
 
   if (this.qop === 'auth') {
     // HA2 = MD5(A2) = MD5(method:digestURI)
-    ha2 = SIP.Utils.calculateMD5(this.method + ":" + this.uri);
+    ha2 = Utils.calculateMD5(this.method + ":" + this.uri);
     // response = MD5(HA1:nonce:nonceCount:credentialsNonce:qop:HA2)
-    this.response = SIP.Utils.calculateMD5(ha1 + ":" + this.nonce + ":" + this.ncHex + ":" + this.cnonce + ":auth:" + ha2);
+    this.response = Utils.calculateMD5(ha1 + ":" + this.nonce + ":" + this.ncHex + ":" + this.cnonce + ":auth:" + ha2);
 
   } else if (this.qop === 'auth-int') {
     // HA2 = MD5(A2) = MD5(method:digestURI:MD5(entityBody))
-    ha2 = SIP.Utils.calculateMD5(this.method + ":" + this.uri + ":" + SIP.Utils.calculateMD5(this.body ? this.body : ""));
+    ha2 = Utils.calculateMD5(this.method + ":" + this.uri + ":" + Utils.calculateMD5(this.body ? this.body : ""));
     // response = MD5(HA1:nonce:nonceCount:credentialsNonce:qop:HA2)
-    this.response = SIP.Utils.calculateMD5(ha1 + ":" + this.nonce + ":" + this.ncHex + ":" + this.cnonce + ":auth-int:" + ha2);
+    this.response = Utils.calculateMD5(ha1 + ":" + this.nonce + ":" + this.ncHex + ":" + this.cnonce + ":auth-int:" + ha2);
 
   } else if (this.qop === null) {
     // HA2 = MD5(A2) = MD5(method:digestURI)
-    ha2 = SIP.Utils.calculateMD5(this.method + ":" + this.uri);
+    ha2 = Utils.calculateMD5(this.method + ":" + this.uri);
     // response = MD5(HA1:nonce:HA2)
-    this.response = SIP.Utils.calculateMD5(ha1 + ":" + this.nonce + ":" + ha2);
+    this.response = Utils.calculateMD5(ha1 + ":" + this.nonce + ":" + ha2);
   }
 };
 
@@ -164,5 +164,5 @@ DigestAuthentication.prototype.updateNcHex = function() {
   this.ncHex = '00000000'.substr(0, 8-hex.length) + hex;
 };
 
-SIP.DigestAuthentication = DigestAuthentication;
+return DigestAuthentication;
 };

src/Exceptions.js

@@ -6,10 +6,7 @@
  * SIP Exceptions.
  * @augments SIP
  */
-module.exports = function (SIP) {
-var Exceptions;
-
-Exceptions= {
+module.exports = {
   ConfigurationError: (function(){
     var exception = function(parameter, value) {
       this.code = 1;
@@ -53,6 +50,3 @@ Exceptions= {
     return exception;
   }())
 };
-
-SIP.Exceptions = Exceptions;
-};

src/Hacks.js

@@ -6,7 +6,7 @@
  * as to most easily track when particular hacks may not be necessary anymore.
  */
 
-module.exports = function (SIP) {
+module.exports = function (window) {
 
 var Hacks;
 
@@ -94,5 +94,5 @@ Hacks = {
 };
 
 
-SIP.Hacks = Hacks;
+return Hacks;
 };

src/LoggerFactory.js

@@ -1,5 +1,5 @@
 
-module.exports = function (SIP, window, Logger) {
+module.exports = function (window, Logger) {
 
 // Console is not defined in ECMAScript, so just in case...
 var console = window.console || {
@@ -149,5 +149,5 @@ LoggerFactory.prototype.getLogger = function(category, label) {
   }
 };
 
-SIP.LoggerFactory = LoggerFactory;
+return LoggerFactory;
 };

src/MediaHandler.js

@@ -7,14 +7,14 @@
  * @param {SIP.Session} session
  * @param {Object} [options]
  */
-module.exports = function (SIP) {
+module.exports = function (EventEmitter) {
 var MediaHandler = function(session, options) {
   // keep jshint happy
   session = session;
   options = options;
 };
 
-MediaHandler.prototype = Object.create(SIP.EventEmitter.prototype, {
+MediaHandler.prototype = Object.create(EventEmitter.prototype, {
   isReady: {value: function isReady () {}},
 
   close: {value: function close () {}},
@@ -46,5 +46,5 @@ MediaHandler.prototype = Object.create(SIP.EventEmitter.prototype, {
   }}
 });
 
-SIP.MediaHandler = MediaHandler;
+return MediaHandler;
 };

src/SIP.js

@@ -18,11 +18,11 @@ module.exports = (function(window) {
 
   require('./Utils.js')(SIP);
   var Logger = require('./Logger.js');
-  require('./LoggerFactory.js')(SIP, window, Logger);
+  SIP.LoggerFactory = require('./LoggerFactory.js')(window, Logger);
   require('./EventEmitter.js')(SIP);
-  require('./Constants.js')(SIP);
-  require('./Exceptions.js')(SIP);
-  require('./Timers.js')(SIP);
+  SIP.C = require('./Constants.js')(SIP.name, SIP.version);
+  SIP.Exceptions = require('./Exceptions.js');
+  SIP.Timers = require('./Timers.js');
   require('./Transport.js')(SIP, window);
   require('./Parser.js')(SIP);
   require('./SIPMessage.js')(SIP);
@@ -33,19 +33,19 @@ module.exports = (function(window) {
   require('./Dialogs.js')(SIP, DialogRequestSender);
   require('./RequestSender.js')(SIP);
   require('./RegisterContext.js')(SIP, window);
-  require('./MediaHandler.js')(SIP);
+  SIP.MediaHandler = require('./MediaHandler.js')(SIP.EventEmitter);
   require('./ClientContext.js')(SIP);
   require('./ServerContext.js')(SIP);
   var SessionDTMF = require('./Session/DTMF.js')(SIP);
   require('./Session.js')(SIP, window, SessionDTMF);
   require('./Subscription.js')(SIP, window);
   var WebRTCMediaHandler = require('./WebRTC/MediaHandler.js')(SIP);
   var WebRTCMediaStreamManager = require('./WebRTC/MediaStreamManager.js')(SIP);
-  require('./WebRTC.js')(SIP, window, WebRTCMediaHandler, WebRTCMediaStreamManager);
+  SIP.WebRTC = require('./WebRTC.js')(SIP.Utils, window, WebRTCMediaHandler, WebRTCMediaStreamManager);
   require('./UA.js')(SIP, window);
-  require('./Hacks.js')(SIP, window);
+  SIP.Hacks = require('./Hacks.js')(window);
   require('./SanityCheck.js')(SIP);
-  require('./DigestAuthentication.js')(SIP);
+  SIP.DigestAuthentication = require('./DigestAuthentication.js')(SIP.Utils);
   SIP.Grammar = require('./Grammar/dist/Grammar');
 
   return SIP;

src/Timers.js

@@ -5,13 +5,11 @@
 /**
  * @augments SIP
  */
-module.exports = function (SIP) {
-var Timers,
+var
   T1 = 500,
   T2 = 4000,
   T4 = 5000;
-
-Timers = {
+module.exports = {
   T1: T1,
   T2: T2,
   T4: T4,
@@ -27,6 +25,3 @@ Timers = {
   TIMER_N: 64 * T1,
   PROVISIONAL_RESPONSE_INTERVAL: 60000  // See RFC 3261 Section 13.3.1.1
 };
-
-SIP.Timers = Timers;
-};

src/Transport.js

@@ -8,7 +8,7 @@
  * @param {SIP.UA} ua
  * @param {Object} server ws_server Object
  */
-module.exports = function (SIP) {
+module.exports = function (SIP, window) {
 var Transport,
   C = {
     // Transport status codes

src/WebRTC.js

@@ -2,18 +2,18 @@
  * @fileoverview WebRTC
  */
 
-module.exports = function (SIP, window, MediaHandler, MediaStreamManager) {
+module.exports = function (Utils, window, MediaHandler, MediaStreamManager) {
 var WebRTC;
 
 WebRTC = {};
 
 WebRTC.MediaHandler = MediaHandler;
 WebRTC.MediaStreamManager = MediaStreamManager;
 
-WebRTC.MediaStream = SIP.Utils.getPrefixedProperty(window, 'MediaStream');
-WebRTC.getUserMedia = SIP.Utils.getPrefixedProperty(window.navigator, 'getUserMedia');
-WebRTC.RTCPeerConnection = SIP.Utils.getPrefixedProperty(window, 'RTCPeerConnection');
-WebRTC.RTCSessionDescription = SIP.Utils.getPrefixedProperty(window, 'RTCSessionDescription');
+WebRTC.MediaStream = Utils.getPrefixedProperty(window, 'MediaStream');
+WebRTC.getUserMedia = Utils.getPrefixedProperty(window.navigator, 'getUserMedia');
+WebRTC.RTCPeerConnection = Utils.getPrefixedProperty(window, 'RTCPeerConnection');
+WebRTC.RTCSessionDescription = Utils.getPrefixedProperty(window, 'RTCSessionDescription');
 
 if (WebRTC.getUserMedia && WebRTC.RTCPeerConnection && WebRTC.RTCSessionDescription) {
   WebRTC.getUserMedia = WebRTC.getUserMedia.bind(window.navigator);
@@ -23,5 +23,5 @@ else {
   WebRTC.isSupported = false;
 }
 
-SIP.WebRTC = WebRTC;
+return WebRTC;
 };