social_stream-presence 0.5.0 → 0.5.2

data/app/assets/javascripts/chat_persistence.js

@@ -0,0 +1,179 @@
+////////////////////
+// Store and restore conversations using session storage.
+////////////////////
+
+
+function storeChatData(){
+  //Check for Session Storage support
+  if (! window.sessionStorage){
+    return
+  }
+	
+	storeUserChatStatus();
+  storeChatConnectionParametres();
+	storeConversations();
+}
+
+function storeConversations() {
+
+  var chatboxes = getAllChatBoxes();
+	var visibleChatBoxes = getVisibleChatBoxes();
+	var storedSlugs = [];
+	var visibleMaxSlugs = [];
+	var visibleMinSlugs = [];
+	
+	//window[getChatVariableFromSlug("eric-white")].is(":visible")
+	
+	//Stored all conversations
+	for (var i=0;i<chatboxes.length;i++){
+	  var slug = chatboxes[i].id
+	  var log = $(chatboxes[i]).html()
+		sessionStorage.setItem("chat_log_" + slug, log);
+		storedSlugs.push(slug)
+	}
+	
+	if(storedSlugs.length>0){
+		//Stored slugs with stored conversations
+    sessionStorage.setItem("slugs_with_stored_log", storedSlugs.join(","));
+	} else {
+		sessionStorage.setItem("slugs_with_stored_log", null);
+	}
+	
+	//Stored slugs with visible chatbox
+	for (var j=0;j<visibleChatBoxes.length;j++){
+		if(visibleChatBoxes[j].is(":visible")){
+			visibleMaxSlugs.push($(visibleChatBoxes[j]).attr("id"))
+		} else {
+			visibleMinSlugs.push($(visibleChatBoxes[j]).attr("id"))
+		}
+  }
+	
+	if (visibleMaxSlugs.length > 0) {
+  	sessionStorage.setItem("slugs_with_visible_max_chatbox", visibleMaxSlugs.join(","));
+  } else {
+		sessionStorage.setItem("slugs_with_visible_max_chatbox", null);
+	}
+	
+	if (visibleMinSlugs.length > 0) {
+    sessionStorage.setItem("slugs_with_visible_min_chatbox", visibleMinSlugs.join(","));
+  } else {
+    sessionStorage.setItem("slugs_with_visible_min_chatbox", null);
+  }
+}
+
+
+function storeChatConnectionParametres() {
+	if (sessionStorage.getItem("cookie") == null){
+    sessionStorage.setItem("cookie", cookie);
+    sessionStorage.setItem("chat_user_name", user_name);
+    sessionStorage.setItem("chat_user_slug", user_slug);
+    sessionStorage.setItem("chat_user_jid", user_jid);
+	}	
+}
+
+function storeUserChatStatus(){
+	sessionStorage.setItem("chat_user_status", userStatus);
+}
+
+function getRestoreUserChatStatus(){
+	if (!window.sessionStorage) {
+		return "available";
+	}
+	
+	var restoreUserChatStatus = sessionStorage.getItem("chat_user_status");
+	if ((restoreUserChatStatus != null)&&((restoreUserChatStatus in sstreamChatStatus)||(restoreUserChatStatus=="offline"))){
+		return restoreUserChatStatus;
+  } else {
+		return "available";
+	}
+}
+
+
+function restoreChatData(){
+  //Check for Session Storage support
+  if (! window.sessionStorage){
+    return
+  }
+  restoreConversations();
+}
+
+function restoreConversations() {
+	
+	  //Get Stored slugs
+	  var storedSlugsString = sessionStorage.getItem("slugs_with_stored_log");
+		
+		if (storedSlugsString != null){
+			var storedSlugs=storedSlugsString.split(",")
+			
+			//Get slugs with visible chatbox
+			var visibleMaxSlugsString = sessionStorage.getItem("slugs_with_visible_max_chatbox");
+			var visibleMinSlugsString = sessionStorage.getItem("slugs_with_visible_min_chatbox");
+			
+			if(visibleMaxSlugsString!=null){
+				var visibleMaxSlugs = visibleMaxSlugsString.split(",")
+			} else {
+				var visibleMaxSlugs = [];
+			}
+			
+			if(visibleMinSlugsString!=null){
+        var visibleMinSlugs = visibleMinSlugsString.split(",")
+      } else {
+        var visibleMinSlugs = [];
+      }
+			
+			
+			for (var i=0;i<storedSlugs.length;i++){
+		    restoreLog = sessionStorage.getItem("chat_log_" + storedSlugs[i]);
+				
+				if (restoreLog != null){
+
+					//Create window (if it not exists)
+					
+					var guest_slug = storedSlugs[i];
+					
+					//Check for slug name and connectionBox visibility
+				  if (typeof($('div.user_presence[slug=' + guest_slug + ']').attr('name')) == 'undefined') {
+				    //No connectionBox for this user (user disconnect)
+						var guest_name = getNameFromSlug(guest_slug)
+				  } else {
+				    var guest_name = $('div.user_presence[slug=' + guest_slug + ']').attr('name');
+				  }
+					 
+          var guest_jid = guest_slug + "@" + domain;
+					
+					
+					if (createChatBox(guest_slug, guest_name, guest_jid, user_name, user_jid)) {
+						if ((visibleMinSlugs.indexOf(guest_slug)!=-1)){
+							 //Minimize chatbox
+							 window[getChatVariableFromSlug(guest_slug)].parent().toggle(false);
+						}			
+						if ((visibleMaxSlugs.indexOf(guest_slug)==-1)&&(visibleMinSlugs.indexOf(guest_slug)==-1)){
+              window[getChatVariableFromSlug(guest_slug)].chatbox("option", "boxManager").toggleBox(false);  
+            }
+          } else {
+						//Always created.
+          }
+					
+					window[getChatVariableFromSlug(guest_slug)].html(restoreLog)
+					
+					//Mark as disconnect if user is offline.
+					if (typeof($('div.user_presence[slug=' + guest_slug + ']').attr('name')) == 'undefined') {
+            //No connectionBox for this user!
+            showChatNotificationForSlug(guest_slug,guest_name + " is offline");
+          }
+					
+        }
+      }  	
+		}  
+}   
+
+
+
+////////////////////
+// Events
+////////////////////
+
+$(window).unload(function() {
+	storeChatData();
+	disconnectStrophe();
+});

data/app/assets/javascripts/chat_utilities.js

@@ -214,6 +214,21 @@ function offlineDataSendControl(){
 }
 
 
+////////////////////
+//Build name from slug
+////////////////////
+
+function getNameFromSlug(slug){
+	var cname = slug.split("-");
+  var name = "";
+  for(i=0; i<cname.length; i++){
+		 if (i!=0){
+		 	name = name + " ";
+		 }
+     name = name + cname[i][0].toUpperCase() + cname[i].substring(1,cname[i].length);
+  }
+	return name;
+}
 
 
 ////////////////////

data/app/assets/javascripts/chat_window_manager.js

@@ -20,7 +20,7 @@ function createChatBox(guest_slug,guest_name,guest_jid,user_name,user_jid){
     if (typeof window[getChatVariableFromSlug(guest_slug)] == 'undefined') {
 			
           //Add div with id = guest_slug
-          $("#chat_divs").append("<div id=" + guest_slug + " name=" + guest_name + "></div>")
+          $("#chat_divs").append("<div id=" + guest_slug + " name=" + guest_name + " class=chatbox ></div>")
           
 					
 					//Offset Management for new box
@@ -114,6 +114,13 @@ function getSlugFromChatVariable(variable){
 	return variable.split("_")[1];
 }
 
+function getVisibleChatBoxes(){
+	return visibleChatBoxes
+}
+
+function getAllChatBoxes(){
+  return $(".chatbox")
+}
 
 ////////////////////
 //Box replacement

data/app/assets/javascripts/xmpp_client_management.js.erb

@@ -1,6 +1,25 @@
 ////////////////////
-//Hash table
+//Global constants
 ////////////////////
+var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
+var domain = '<%=SocialStream::Presence.domain%>';
+var sound_path = "/assets/audio/chat/onMessage";
+
+
+////////////////////
+//Hash tables
+////////////////////
+
+//Keys: Social Stream Chat Status
+//Value: Xmpp status
+var sstreamChatStatus = new Array();
+sstreamChatStatus['available'] = "chat";
+sstreamChatStatus['away'] = "away";
+sstreamChatStatus['autoaway'] = "away";
+sstreamChatStatus['dnd'] = "dnd";
+
+//Keys: Xmpp status
+//Value: Message associated with Xmpp Status
 var statusMessage = new Array();
 statusMessage[''] = "";
 statusMessage['chat'] = "";
@@ -8,27 +27,49 @@ statusMessage['away'] = "Away";
 statusMessage['xa'] = "Away";
 statusMessage['dnd'] = "Busy";
 
+//Keys: Xmpp status
+//Value: Icon name (Same as Social Stream Status)
+var statusIcons = new Array();
+statusIcons[''] = "available";
+statusIcons['chat'] = "available";
+statusIcons['away'] = "away";
+statusIcons['xa'] = "away";
+statusIcons['dnd'] = "dnd";
+
 
 
 ////////////////////
 //Connect functions
 ////////////////////
 
+function connectToChat(user_jid,cookie,password){
+	
+	if (isStropheConnected()){
+    return true;
+  } 
+		
+	if (authByCookie()){
+    if (connectToServerWithCookie(user_jid, cookie)==false){
+      refreshChatWindow();
+    }
+  } else {
+    if (connectToServerWithPassword(user_jid,password)==false){
+      refreshChatWindow();
+    }
+  }       
+}
+
+
 function isStropheConnected(){
-	if((connection!=null)&&(connection.connected)){
+  if((connection!=null)&&(connection.connected)){
       return true;
     } else {
-			return false;
-		}
+      return false;
+    }
 }
 
 
-function connectToServerWithCookie(){
-	
-		if (isStropheConnected()){
-			log("connectToServerWithCookie() returns: Strophe already connected");
-		}	   
-	    log("connectToServerWithCookie() calls");
+function connectToServerWithCookie(user_jid, cookie){ 
     try {
       connection = new Strophe.Connection(BOSH_SERVICE);
       connection.connect(user_jid, cookie, onConnect);
@@ -36,16 +77,13 @@ function connectToServerWithCookie(){
       //"Handle errors"
       return false;
     }
+		return true;
 }
 
 
 //Password: Get from chatPassword param if exists, instead try to get from sessionStorage.
-function connectToServerWithPassword(chatPassword){
+function connectToServerWithPassword(user_jid, chatPassword){
     
-		if (isStropheConnected()){
-      log("connectToServerWithPassword() returns: Strophe already connected");
-    }
-		
     //Get Password
     if ((chatPassword!=null)&&(chatPassword!="")){
       var password = chatPassword;
@@ -67,6 +105,7 @@ function connectToServerWithPassword(chatPassword){
     return true;
 }
 
+
 ////////
 //Auth Methods
 ///////
@@ -80,21 +119,17 @@ function authByPassword(){
   return authMethod=="password";
 }
 
-function ifCookie(){
-  return (!(typeof cookie == 'undefined'))
-}
-
 
 ////////////////////
 //Stanza management using Strophe
 ////////////////////
 
 //Global variables
-var userStatus = "chat";
+var userStatus;
 var awayTimerPeriod = 60000;
 var timerPeriod = 5000;
 var refreshMinTime = 3*timerPeriod;
-var awayTime = 20*60000; //20 minutes
+var awayTime = 10*60000; //10 minutes
 var awayCounter = 0;
 var timerCounter = 0;
 var connection = null;
@@ -103,116 +138,125 @@ var awayTimer;
 var timer;
 var reconnectTimer;
 var disconnectionFlag = true;
+var afterNewConnectionFlagFlag = false;
 var requestContacts=false;
 var cyclesToRefresh = (refreshMinTime/timerPeriod);
 
 
 function onConnect(status) {
-	
-	//Status.ERROR An error has occurred
-	//Status.CONNECTING The connection is currently being made
-	//Status.CONNFAIL The connection attempt failed
-	//Status.AUTHENTICATING The connection is authenticating
-	//Status.AUTHFAIL The authentication attempt failed
-	//Status.CONNECTED  The connection has succeeded
-	//Status.DISCONNECTED The connection has been terminated
-	//Status.DISCONNECTING  The connection is currently being terminated
-	//Status.ATTACHED The connection has been attached
-	
-	log('Strophe onConnect callback call with status ' + status);
-	
-	if (status == Strophe.Status.ATTACHED){
-	  log('Strophe connection attached');
-		return;
-	} 
-	
-	if (status == Strophe.Status.AUTHENTICATING ){
+  
+  //Status.ERROR An error has occurred
+  //Status.CONNECTING The connection is currently being made
+  //Status.CONNFAIL The connection attempt failed
+  //Status.AUTHENTICATING The connection is authenticating
+  //Status.AUTHFAIL The authentication attempt failed
+  //Status.CONNECTED  The connection has succeeded
+  //Status.DISCONNECTED The connection has been terminated
+  //Status.DISCONNECTING  The connection is currently being terminated
+  //Status.ATTACHED The connection has been attached
+  
+  log('Strophe onConnect callback call with status ' + status);
+  
+  if (status == Strophe.Status.ATTACHED){
+    log('Strophe connection attached');
+    return;
+  } 
+  
+  if (status == Strophe.Status.AUTHENTICATING ){
     log('Strophe connection AUTHENTICATING');
-		return;
+    return;
   }
-	
-	if (status == Strophe.Status.CONNECTING) {
+  
+  if (status == Strophe.Status.CONNECTING) {
     log('Strophe is connecting.');
-	  return;
+    return;
   } 
-	
-	if (status == Strophe.Status.DISCONNECTING) {
+  
+  if (status == Strophe.Status.DISCONNECTING) {
     log('Strophe is disconnecting.');
     return;
   } 
-		
-	clearTimeout(initialTimer);
-		
-	if (status == Strophe.Status.CONNFAIL) {
+    
+  clearTimeout(initialTimer);
+    
+  if (status == Strophe.Status.CONNFAIL) {
     log('Strophe failed to connect.');
     reconnectTimer = setTimeout ("onReconnect()", 5000);
-		disconnectionFlag = true;
+    disconnectionFlag = true;
   } else if (status == Strophe.Status.AUTHFAIL) {
     log('Strophe authentication fail.');
-	    if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)){
-	      sessionStorage.setItem("ss_user_pass",null);
-	    }
-			disconnectionFlag = true;
+      if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)){
+        sessionStorage.setItem("ss_user_pass",null);
+      }
+      disconnectionFlag = true;
   } else if (status == Strophe.Status.ERROR) {
     log('Strophe error.');
-		disconnectionFlag = true;
+    disconnectionFlag = true;
   } else if (status == Strophe.Status.DISCONNECTED) {
     log('Strophe is disconnected.');
-		disconnectionFlag = true;
-	  clearTimeout(awayTimer);
-		notifyWhenUsersDisconnect();
-	  reconnectTimer = setTimeout ("onReconnect()", 5000);
+    disconnectionFlag = true;
+    clearTimeout(awayTimer);
+    notifyWhenUsersDisconnect();
+    reconnectTimer = setTimeout ("onReconnect()", 5000);
   } else if (status == Strophe.Status.CONNECTED) {
+    //AFTER CONNECT ACTIONS
+    
     log('Strophe is connected.');
-    log('Presenze stanza send for:' + connection.jid);
-		clearTimeout(reconnectTimer);
-    connection.addHandler(onMessage, null, 'message', null, null,  null);
-	  connection.addHandler(onPresence, null, 'presence', null, null,  null); 
+		
+    clearTimeout(reconnectTimer);
+		
     //addHandler:(callback, namespace to match, stanza name, stanza type, stanza id , stanza from, options)
-		disconnectionFlag = false;
-	  userStatus = "chat";
-	  sendStatus(userStatus);
+    connection.addHandler(onMessage, null, 'message', null, null,  null);
+    connection.addHandler(onPresence, null, 'presence', null, null,  null); 
+		
+    disconnectionFlag = false;
+    afterNewConnectionFlag = true;
+		
+		log('Presenze stanza send for:' + connection.jid);
+		userStatus = getRestoreUserChatStatus();
+		if(userStatus=="offline"){
+			userStatus="chat";
+		}
+    sendStatus(userStatus);
+		
     awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
-	  timer = setInterval("timerFunction()", timerPeriod);
-		hideAllNotifications();
+    timer = setInterval("timerFunction()", timerPeriod);
+		
+    hideAllNotifications();
   }
-	
-	updateChatWindow();
+  
+  updateChatWindow();
 }
 
 function onReconnect(){
-	
-	if ((!isStropheConnected())&&(userStatus!="offline")) {
-		
-		if (reconnectAttempts>0) {
-			reconnectAttempts--;
+  
+  if ((!isStropheConnected())&&(userStatus!="offline")) {
+    
+    if (reconnectAttempts>0) {
+      reconnectAttempts--;
+      
+      $("#chat_header_title").html('<%=I18n.t('chat.reconnecting')%>')
 			
-			$("#chat_header_title").html(I18n.t('chat.reconnecting'))
+			connectToChat(user_jid,cookie,null);
 			
-			if (authByCookie()){
-        //Authentication by cookie
-        connectToServerWithCookie(); 
-      } else {
-        //Authentication by password
-        connectToServerWithPassword(null);
-      }
       reconnectTimer = setTimeout ("onReconnect()", 9000);
-		} else {
-			$("#chat_header_title").html(I18n.t('chat.unableconnect'))
-			//Notify issue to Rails App Server?
-		}
-		
-	}
+			
+    } else {
+      $("#chat_header_title").html('<%=I18n.t('chat.unableconnect')%>')
+      //Notify issue to Rails App Server?
+    }
+    
+  }
 }
 
 function disconnectStrophe(){
-	userStatus = "offline";
-	setStatusWidgetTitle("offline");
-	
-	if(isStropheConnected()){
-		connection.send($pres({type: "unavailable"}).tree()); 
+  userStatus = "offline";
+  setStatusWidgetTitle("offline");
+  
+  if(isStropheConnected()){
+    connection.send($pres({type: "unavailable"}).tree()); 
     connection.disconnect();
-	}	
+  } 
 }
 
 ////////
@@ -225,11 +269,11 @@ function onMessage(msg) {
     var elems = msg.getElementsByTagName('body');
 
     if (type == "chat" && elems.length > 0) {
-			var body = elems[0];
-			var from_slug = from.split("@")[0];
-			var from_jid = from_slug + "@" + domain;
-		
-		  putReceivedMessageOnChatWindow(from_jid,from_slug,body,null)	
+      var body = elems[0];
+      var from_slug = from.split("@")[0];
+      var from_jid = from_slug + "@" + domain;
+    
+      putReceivedMessageOnChatWindow(from_jid,from_slug,body,null)  
     }
 
     // we must return true to keep the handler alive.  
@@ -242,56 +286,56 @@ function onMessage(msg) {
 //Manage Presence stanzas
 ///////
 function onPresence(presence) {
-	  
-	  //Check presence stanza type
-		ptype = $(presence).attr('type');
-				
-		switch (ptype){
-			case undefined:
-			 processAvailablePresenceStanza(presence)
-			 break;
-			case "available":
-			  processAvailablePresenceStanza(presence)
+    
+    //Check presence stanza type
+    ptype = $(presence).attr('type');
+        
+    switch (ptype){
+      case undefined:
+       processAvailablePresenceStanza(presence)
+       break;
+      case "available":
+        processAvailablePresenceStanza(presence)
         break;
-			case "unavailable":
+      case "unavailable":
         processUnavailablePresenceStanza(presence)
         break;
-			default : 
-			  //Stanza type not recognize
-				processAvailablePresenceStanza(presence)
-		}
-				  
-	return true;
+      default : 
+        //Stanza type not recognize
+        processAvailablePresenceStanza(presence)
+    }
+          
+  return true;
 } 
 
 
 function processAvailablePresenceStanza(presence){
-	from = $(presence).attr('from');
+  from = $(presence).attr('from');
   slug = from.split("@")[0];
-	
-	if (slug != user_slug) {
-		if (getConnectionBoxFromSlug(slug)!=null){
-			status = $(presence).find('show').text(); 
+  
+  if (slug != user_slug) {
+    if (getConnectionBoxFromSlug(slug)!=null){
+      status = $(presence).find('show').text(); 
       setUserIconStatus(slug, status);
-			if (cacheConnectedUsers.indexOf(slug) != -1) {
-	  	  showConnectionBoxFromSlug(slug);
-				hideChatNotificationForSlug(slug);
-	    }	
-	  } else {
-	    setTimeout("refreshChatWindow()", 3000);
-	  }
-  }		
+      if (cacheConnectedUsers.indexOf(slug) != -1) {
+        showConnectionBoxFromSlug(slug);
+        hideChatNotificationForSlug(slug);
+      } 
+    } else {
+      setTimeout("refreshChatWindow()", 3000);
+    }
+  }   
 }
 
 function processUnavailablePresenceStanza(presence){
-	from = $(presence).attr('from');
+  from = $(presence).attr('from');
   slug = from.split("@")[0];
-	
-	if (slug != user_slug) {
-	  if (getConnectionBoxFromSlug(slug)!=null){
-	    hideConnectionBoxFromSlug(slug)
-			showChatNotificationForSlug(slug,$(getConnectionBoxFromSlug(slug)).attr("name") + " is offline");
-	  }
+  
+  if (slug != user_slug) {
+    if (getConnectionBoxFromSlug(slug)!=null){
+      hideConnectionBoxFromSlug(slug)
+      showChatNotificationForSlug(slug,$(getConnectionBoxFromSlug(slug)).attr("name") + " is offline");
+    }
   }
 }
 
@@ -303,9 +347,9 @@ function sendChatMessage(from,to,text){
     var body= $build("body");
     body.t(text);
     var message = $msg({to: to, from: from, type: 'chat'}).cnode(body.tree());
-    connection.send(message.tree());	  	
-		restartAwayTimer(false);
-		return true;
+    connection.send(message.tree());      
+    restartAwayTimer();
+    return true;
 }
 
 
@@ -313,6 +357,11 @@ function sendChatMessage(from,to,text){
 //Send Presence stanzas with status
 ///////
 function sendStatus(status){
+	
+	  if((status in sstreamChatStatus)){
+      status = sstreamChatStatus[status];
+    }
+	
     if (status in statusMessage){
       //Send status to the XMPP Server
       var pres = $pres()
@@ -321,6 +370,6 @@ function sendStatus(status){
       .c('show')
       .t(status);
        connection.send(pres.tree());
-			 setStatusWidgetTitle(status);
+       setStatusWidgetTitle(status);
     }
-}
+}