merged

Author: Igor Khomenko

.gitignore

@@ -10,3 +10,6 @@ npm-debug.log
 
 # Use command grunt for create quickblox.js
 quickblox.js
+
+#jasmine-npm generate
+.grunt

.travis.yml

@@ -0,0 +1,8 @@
+language: node_js
+node_js:
+  - "4.1"
+
+before_script: "npm run-script setDependencies"
+
+script: "grunt"
+after_success: "jasmine"

README.md

@@ -1,9 +1,13 @@
 # QuickBlox JavaScript SDK
 
+[![travis-ci](https://api.travis-ci.org/QuickBlox/quickblox-javascript-sdk.svg?branch=gh-pages)](https://travis-ci.org/QuickBlox/quickblox-javascript-sdk)
+[![npm](https://img.shields.io/npm/v/quickblox.svg)](https://www.npmjs.com/package/quickblox)
+[![npm](https://img.shields.io/npm/dm/quickblox.svg)](https://www.npmjs.com/package/quickblox)
+
 The QuickBlox JavaScript SDK provides a JavaScript library making it even
 easier to access the QuickBlox cloud communication backend platform.
 
-[QuickBlox](https://quickblox.com) is a suite of communication features & data services (APIs, SDKs, code samples, admin panel, tutorials) which help digital agencies, mobile developers and publishers to add great communication functionality to smartphone applications like in Skype, WhatsApp, Viber. 
+[QuickBlox](https://quickblox.com) is a suite of communication features & data services (APIs, SDKs, code samples, admin panel, tutorials) which help digital agencies, mobile developers and publishers to add great communication functionality to smartphone applications like in Skype, WhatsApp, Viber.
 
 
 # Install
@@ -16,7 +20,7 @@ For correct work of JS SDK you must include the  library in your html before `qu
 
 ```html
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.0.3/quickblox.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/quickblox/2.0.4/quickblox.min.js"></script>
 ```
 
 ## Bower and RequireJS
@@ -75,6 +79,8 @@ The quickblox.js library is build from a number of **CommonJS modules** containe
 These modules are combined through [browserify](http://browserify.org/) into a single `quickblox.js` file in the root and so this is the only file that needs to be included in a `<script>` tag OR in a RequireJS application OR in Node.js environment (everywhere). To build the library, use the [Grunt](http://gruntjs.com/) task runner:
 
 * You need to have the dependencies listed in the package.json available, use `npm install` to load them.
+* Install grunt-cli `npm install -g grunt-cli`
+* Also you need install jasmine global `npm i -g jasmine` for tests.
 * Change the 'version' properties in next files:
   * https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/js/qbConfig.js
   * https://github.com/QuickBlox/quickblox-javascript-sdk/blob/gh-pages/bower.json

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "homepage": "http://quickblox.com/developers/Javascript",
   "main": "quickblox.js",
   "license": "MIT",
@@ -20,7 +20,8 @@
   ],
   "authors": [
     "Igor Khomenko <igor@quickblox.com>",
-    "Vlad Lukhanin <vladislav.lukhanin@quickblox.com>"
+    "Vlad Lukhanin <vladislav.lukhanin@quickblox.com>",
+    "Dima Lobanov <dmytro.lobanov@injoit.com>"
   ],
   "repository": {
     "type": "git",

js/modules/qbChat.js

@@ -13,7 +13,7 @@ var isBrowser = typeof window !== "undefined";
 var unsupported = "This function isn't supported outside of the browser (...yet)";
 
 if (isBrowser) {
-  require('../../lib/strophe/strophe.min');
+  require('strophe');
   // add extra namespaces for Strophe
   Strophe.addNamespace('CARBONS', 'urn:xmpp:carbons:2');
   Strophe.addNamespace('CHAT_MARKERS', 'urn:xmpp:chat-markers:0');

js/modules/qbPushNotifications.js

@@ -8,17 +8,22 @@
 var config = require('../qbConfig'),
     Utils = require('../qbUtils');
 
+var isBrowser = typeof window !== "undefined";
+
 function PushNotificationsProxy(service) {
   this.service = service;
   this.subscriptions = new SubscriptionsProxy(service);
   this.events = new EventsProxy(service);
 
   this.base64Encode = function(str) {
-    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
-      return String.fromCharCode('0x' + p1);
-    }));
-  }
-
+    if(isBrowser) {
+      return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
+        return String.fromCharCode('0x' + p1);
+      }));
+    } else {
+      return new Buffer(str).toString('base64');
+    }
+  };
 }
 
 // Subscriptions
@@ -43,7 +48,6 @@ SubscriptionsProxy.prototype = {
 
   delete: function(id, callback) {
     Utils.QBLog('[SubscriptionsProxy]', 'delete', id);
-
     this.service.ajax({url: Utils.getUrl(config.urls.subscriptions, id), type: 'DELETE', dataType:'text'},
                       function(err, res){
                         if (err) { callback(err, null);}
@@ -72,7 +76,7 @@ EventsProxy.prototype = {
       callback = params;
       params = null;
     }
-    
+
     Utils.QBLog('[EventsProxy]', 'list', params);
 
     this.service.ajax({url: Utils.getUrl(config.urls.events), data: params}, callback);
@@ -92,10 +96,8 @@ EventsProxy.prototype = {
 
   delete: function(id, callback) {
     Utils.QBLog('[EventsProxy]', 'delete', id);
-
     this.service.ajax({url: Utils.getUrl(config.urls.events, id), type: 'DELETE'}, callback);
   }
-
 };
 
 module.exports = PushNotificationsProxy;

js/modules/webrtc/qbWebRTCClient.js

@@ -18,6 +18,7 @@ var WebRTCSignalingProvider = require('./qbWebRTCSignalingProvider');
 var Helpers = require('./qbWebRTCHelpers');
 var RTCPeerConnection = require('./qbRTCPeerConnection');
 var SignalingConstants = require('./qbWebRTCSignalingConstants');
+var Utils = require('../../qbUtils');
 
 function WebRTCClient(service, connection) {
   if (WebRTCClient.__instance) {
@@ -127,7 +128,7 @@ WebRTCClient.prototype._onCallListener = function(userID, sessionID, extension)
 
     delete extension.sdp;
     delete extension.platform;
-    extension["sessionID"] = sessionID;
+    extension.sessionID = sessionID;
 
     this.signalingProvider.sendMessage(userID, extension, SignalingConstants.SignalingType.REJECT);
   } else {
@@ -140,7 +141,7 @@ WebRTCClient.prototype._onCallListener = function(userID, sessionID, extension)
       this._cleanupExtension(extensionClone);
 
       if (typeof this.onCallListener === 'function'){
-        this.onCallListener(session, extensionClone);
+        Utils.safeCallbackCall(this.onCallListener, session, extensionClone);
       }
     }
 
@@ -159,7 +160,7 @@ WebRTCClient.prototype._onAcceptListener = function(userID, sessionID, extension
       this._cleanupExtension(extensionClone);
 
       if (typeof this.onAcceptCallListener === 'function'){
-        this.onAcceptCallListener(session, userID, extensionClone);
+        Utils.safeCallbackCall(this.onAcceptCallListener,session, userID, extensionClone);
       }
 
       session.processOnAccept(userID, extension);
@@ -172,16 +173,17 @@ WebRTCClient.prototype._onAcceptListener = function(userID, sessionID, extension
 };
 
 WebRTCClient.prototype._onRejectListener = function(userID, sessionID, extension) {
-  var session = this.sessions[sessionID];
+  var that = this,
+    session = that.sessions[sessionID];
 
   Helpers.trace("onReject. UserID:" + userID + ". SessionID: " + sessionID);
 
   if(session){
     var extensionClone = JSON.parse(JSON.stringify(extension));
-    this._cleanupExtension(extensionClone);
+    that._cleanupExtension(extensionClone);
 
     if (typeof this.onRejectCallListener === 'function'){
-     this.onRejectCallListener(session, userID, extensionClone);
+      Utils.safeCallbackCall(that.onRejectCallListener, session, userID, extensionClone);
     }
 
     session.processOnReject(userID, extension);
@@ -195,12 +197,12 @@ WebRTCClient.prototype._onStopListener = function(userID, sessionID, extension)
 
   var session = this.sessions[sessionID],
       extensionClone = JSON.parse(JSON.stringify(extension));
-  
+
   if( session && (session.state === WebRTCSession.State.ACTIVE || session.state === WebRTCSession.State.NEW)){
     this._cleanupExtension(extensionClone);
 
     if (typeof this.onStopCallListener === 'function'){
-      this.onStopCallListener(session, userID, extensionClone);
+      Utils.safeCallbackCall(this.onStopCallListener, session, userID, extensionClone);
     }
 
     session.processOnStop(userID, extension);
@@ -231,7 +233,7 @@ WebRTCClient.prototype._onUpdateListener = function(userID, sessionID, extension
   Helpers.trace("onUpdate. UserID:" + userID + ". SessionID: " + sessionID + ". Extension: " + JSON.stringify(extension));
 
   if (typeof this.onUpdateCallListener === 'function'){
-    this.onUpdateCallListener(session, userID, extension);
+    Utils.safeCallbackCall(this.onUpdateCallListener, session, userID, extension);
   }
 };
 
@@ -278,4 +280,4 @@ function getOpponentsIdNASessions(sessions) {
   }
 
   return opponents;
-}
+}

js/modules/webrtc/qbWebRTCHelpers.js

@@ -4,7 +4,6 @@
  */
 
 var config = require('../../qbConfig');
-var download = require('../../../lib/download/download.min');
 
 var WebRTCHelpers = {};
 
@@ -77,9 +76,4 @@ WebRTCHelpers.CallType = {
   AUDIO: 2
 };
 
-/** Download Blob to local file system */
-Blob.prototype.download = function() {
-  download(this, this.name, this.type);
-};
-
 module.exports = WebRTCHelpers;

js/modules/webrtc/qbWebRTCSession.js

@@ -81,7 +81,7 @@ WebRTCSession.prototype.getUserMedia = function(params, callback) {
   /**
    * Additional parameters for Media Constraints
    * http://tools.ietf.org/html/draft-alvestrand-constraints-resolution-00
-   * 
+   *
    * googEchoCancellation: true
    * googAutoGainControl: true
    * googNoiseSuppression: true
@@ -125,14 +125,14 @@ WebRTCSession.prototype.attachMediaStream = function(id, stream, options) {
   if (elem) {
     var URL = window.URL || window.webkitURL;
     elem.src = URL.createObjectURL(stream);
-    
+
     if (options && options.muted) elem.muted = true;
-    
+
     if (options && options.mirror) {
       elem.style.webkitTransform = 'scaleX(-1)';
       elem.style.transform = 'scaleX(-1)';
     }
-  
+
     elem.play();
   } else {
     throw new Error('Unable to attach media stream, element ' + id  + ' is undefined');
@@ -169,7 +169,7 @@ WebRTCSession.prototype.detachMediaStream = function(id){
 /**
  * [Initiate a call]
  * @param  {object}   extension [custom parametrs]
- * @param  {Function} callback  
+ * @param  {Function} callback
  */
 WebRTCSession.prototype.call = function(extension, callback) {
   var self = this,
@@ -251,7 +251,7 @@ WebRTCSession.prototype.accept = function(extension) {
     var offerTime = (self.acceptCallTime - self.startCallTime) / 1000;
     self._startWaitingOfferOrAnswerTimer(offerTime);
 
-    /** 
+    /**
      * here we have to decide to which users the user should call.
      * We have a rule: If a userID1 > userID2 then a userID1 should call to userID2.
      */
@@ -452,7 +452,7 @@ WebRTCSession.prototype.processOnCall = function(callerID, extension) {
 
   oppIDs.forEach(function(opID, i, arr) {
     var pConn = self.peerConnections[opID];
-    
+
     if(pConn){
       if(opID == callerID){
         pConn.updateRemoteSDP(extension.sdp);
@@ -509,7 +509,7 @@ WebRTCSession.prototype.processOnReject = function(userID, extension) {
   }else{
     Helpers.traceError("Ignore 'OnReject', there is no information about peer connection by some reason.");
   }
-  
+
   this._closeSessionIfAllConnectionsClosed();
 };
 
@@ -579,7 +579,7 @@ WebRTCSession.prototype.processOnNotAnswer = function(peerConnection) {
   peerConnection.release();
 
   if(typeof this.onUserNotAnswerListener === 'function'){
-    this.onUserNotAnswerListener(this, peerConnection.userID);
+    Utils.safeCallbackCall(this.onUserNotAnswerListener, this, peerConnection.userID);
   }
 
   this._closeSessionIfAllConnectionsClosed();
@@ -590,15 +590,15 @@ WebRTCSession.prototype.processOnNotAnswer = function(peerConnection) {
  */
 WebRTCSession.prototype._onRemoteStreamListener = function(userID, stream) {
   if (typeof this.onRemoteStreamListener === 'function'){
-    this.onRemoteStreamListener(this, userID, stream);
+    Utils.safeCallbackCall(this.onRemoteStreamListener, this, userID, stream);
   }
 };
 
 WebRTCSession.prototype._onSessionConnectionStateChangedListener = function(userID, connectionState) {
   var self = this;
 
   if (typeof self.onSessionConnectionStateChangedListener === 'function'){
-    self.onSessionConnectionStateChangedListener(self, userID, connectionState);
+      Utils.safeCallbackCall(self.onSessionConnectionStateChangedListener, self, userID, connectionState);
   }
 };
 
@@ -613,7 +613,7 @@ WebRTCSession.prototype._createPeer = function(userID, peerConnectionType) {
   /**
    * Additional parameters for RTCPeerConnection options
    * new RTCPeerConnection(pcConfig, options)
-   * 
+   *
    * DtlsSrtpKeyAgreement: true
    * RtpDataChannels: true
    */
@@ -643,7 +643,7 @@ WebRTCSession.prototype._close = function() {
   this.state = WebRTCSession.State.CLOSED;
 
   if(typeof this.onSessionCloseListener === 'function'){
-    this.onSessionCloseListener(this);
+    Utils.safeCallbackCall(this.onSessionCloseListener, this);
   }
 };
 
@@ -775,7 +775,7 @@ WebRTCSession.prototype._uniqueOpponentsIDs = function(){
       opponents.push(parseInt(userID));
     }
   });
-  
+
   return opponents;
 };
 
@@ -788,7 +788,7 @@ WebRTCSession.prototype._uniqueOpponentsIDsWithoutInitiator = function(){
       opponents.push(parseInt(userID));
     }
   });
-  
+
   return opponents;
 };
 
@@ -832,4 +832,4 @@ function _prepareIceServers(iceServers) {
   return iceServersCopy;
 }
 
-module.exports = WebRTCSession;
+module.exports = WebRTCSession;

js/modules/webrtc/qbWebRTCSignalingProcessor.js

@@ -3,7 +3,7 @@
  * WebRTC Module (WebRTC signaling provider)
  */
 
-require('../../../lib/strophe/strophe.min');
+require('strophe');
 
 var Helpers = require('./qbWebRTCHelpers');
 var SignalingConstants = require('./qbWebRTCSignalingConstants');