Develop.try catch

js/modules/qbChat.js

@@ -99,7 +99,7 @@ function ChatProxy(service, webrtcModule, conn) {
     //
     if(composing || paused){
       if (typeof self.onMessageTypingListener === 'function' && (type === 'chat' || type === 'groupchat' || !delay)){
-        self.onMessageTypingListener(composing != null, userId, dialogId);
+        Utils.safeCallbackCall(self.onMessageTypingListener, composing != null, userId, dialogId);
       }
       return true;
     }
@@ -109,11 +109,11 @@ function ChatProxy(service, webrtcModule, conn) {
     if (marker) {
       if (delivered) {
         if (typeof self.onDeliveredStatusListener === 'function' && type === 'chat') {
-          self.onDeliveredStatusListener(delivered.getAttribute('id'), dialogId, userId);
+          Utils.safeCallbackCall(self.onDeliveredStatusListener, delivered.getAttribute('id'), dialogId, userId);
         }
       } else {
         if (typeof self.onReadStatusListener === 'function' && type === 'chat') {
-          self.onReadStatusListener(read.getAttribute('id'), dialogId, userId);
+          Utils.safeCallbackCall(self.onReadStatusListener, read.getAttribute('id'), dialogId, userId);
         }
       }
       return true;
@@ -144,7 +144,7 @@ function ChatProxy(service, webrtcModule, conn) {
       message.markable = 1;
     }
     if (typeof self.onMessageListener === 'function' && (type === 'chat' || type === 'groupchat')){
-      self.onMessageListener(userId, message);
+      Utils.safeCallbackCall(self.onMessageListener, userId, message);
     }
 
     // we must return true to keep the handler alive
@@ -159,7 +159,7 @@ function ChatProxy(service, webrtcModule, conn) {
 
     if (!type) {
       if (typeof self.onContactListListener === 'function' && roster[userId] && roster[userId].subscription !== 'none')
-        self.onContactListListener(userId);
+        Utils.safeCallbackCall(self.onContactListListener, userId);
     } else {
 
       // subscriptions callbacks
@@ -176,7 +176,7 @@ function ChatProxy(service, webrtcModule, conn) {
           });
         } else {
           if (typeof self.onSubscribeListener === 'function')
-            self.onSubscribeListener(userId);
+            Utils.safeCallbackCall(self.onSubscribeListener, userId);
         }
         break;
       case 'subscribed':
@@ -191,7 +191,7 @@ function ChatProxy(service, webrtcModule, conn) {
             ask: null
           };
           if (typeof self.onConfirmSubscribeListener === 'function')
-            self.onConfirmSubscribeListener(userId);
+            Utils.safeCallbackCall(self.onConfirmSubscribeListener, userId);
         }
         break;
       case 'unsubscribed':
@@ -200,7 +200,7 @@ function ChatProxy(service, webrtcModule, conn) {
           ask: null
         };
         if (typeof self.onRejectSubscribeListener === 'function')
-          self.onRejectSubscribeListener(userId);
+          Utils.safeCallbackCall(self.onRejectSubscribeListener, userId);
         break;
       case 'unsubscribe':
         roster[userId] = {
@@ -212,7 +212,7 @@ function ChatProxy(service, webrtcModule, conn) {
         break;
       case 'unavailable':
         if (typeof self.onContactListListener === 'function' && roster[userId] && roster[userId].subscription !== 'none')
-          self.onContactListListener(userId, type);
+          Utils.safeCallbackCall(self.onContactListListener, userId, type);
         break;
       }
 
@@ -251,7 +251,7 @@ function ChatProxy(service, webrtcModule, conn) {
         extension: extraParamsParsed.extension
       };
 
-      self.onSystemMessageListener(message);
+      Utils.safeCallbackCall(self.onSystemMessageListener, message);
     }
 
     return true;
@@ -341,7 +341,7 @@ ChatProxy.prototype = {
 
               // fire 'onReconnectListener'
               if (typeof self.onReconnectListener === 'function'){
-                self.onReconnectListener();
+                Utils.safeCallbackCall(self.onReconnectListener);
               }
             }
           });
@@ -358,7 +358,7 @@ ChatProxy.prototype = {
 
         // fire 'onDisconnectedListener' only once
         if (!self._isDisconnected && typeof self.onDisconnectedListener === 'function'){
-          self.onDisconnectedListener();
+          Utils.safeCallbackCall(self.onDisconnectedListener);
         }
 
         self._isDisconnected = true;

js/qbUtils.js

@@ -24,6 +24,27 @@ var ObjectId = {
 };
 
 var Utils = {
+  safeCallbackCall: function() {
+    if(!isBrowser) throw unsupported;
+
+    var listenerString = arguments[0].toString(),
+        listenerName = listenerString.split('(')[0].split(' ')[1],
+        argumentsCopy = [],
+        listenerCall;
+
+      for (var i = 0; i < arguments.length; i++) {
+        argumentsCopy.push(arguments[i]);
+      }
+
+      listenerCall = argumentsCopy.shift();
+
+    try {
+      listenerCall.apply(null, argumentsCopy);
+    } catch (err) {
+      console.error('Error in the ' + listenerName + ': ' + err);
+    } 
+  },
+
   randomNonce: function() {
     return Math.floor(Math.random() * 10000);
   },

samples/chat/js/messages.js

@@ -275,8 +275,9 @@ function showUserIsTypingView(isTyping, userId, dialogId) {
 
 // filter for current dialog
 function isMessageForCurrentDialog(userId, dialogId) {
+  var result = false;
 	if (dialogId == currentDialog._id || (dialogId === null && currentDialog.type == 3 && opponentId == userId)) {
-		return true;
+		result = true;
 	}
-	return false;
+	return result;
 }

spec/QB-HelpersSpec.js

@@ -7,8 +7,30 @@ describe('Helpers', function() {
   });
 
   it("can generate user's jid", function() {
-    var userJid = QB.chat.helpers.getUserJid(5, 92);
-    expect(userJid).toEqual("5-92@chat.quickblox.com");
+    var userJid = QB.chat.helpers.getUserJid(5, 29650);
+    expect(userJid).toEqual("5-29650@chat.quickblox.com");
   });
 
+  it("can return jid from jid or from user's id", function() {
+    var jid = QB.chat.helpers.jidOrUserId(100500);
+    expect(jid).toEqual("100500-29650@chat.quickblox.com");
+  });
+
+  it("can get type chat from jid or from user's id", function() {
+    var id = QB.chat.helpers.typeChat(100500);
+    expect(id).toEqual("chat");
+    var jid = QB.chat.helpers.typeChat("100500-29650@chat.quickblox.com");
+    expect(jid).toEqual("chat");
+    var room = QB.chat.helpers.typeChat("29650_562f271ba28f9aa53e004788@muc.chat.quickblox.com");
+    expect(room).toEqual("groupchat");
+  });
+
+  it("can get recipient id from privat chat", function() {
+  	var occupantsIds = [100500, 707070];
+  	var userId = 100500;
+    var recipientId = QB.chat.helpers.getRecipientId(occupantsIds, userId);
+    expect(recipientId).toEqual(707070);
+  });
+
 });
+