Merge branch 'audio-video-on-api-v0.81' into 090-audio-video-on-api

Most of the work had to be done again because of the way BigBlueButton exchanges messages today.

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java

bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala

@@ -125,6 +125,7 @@ class CollectorActor(dispatcher: IDispatcher) extends Actor {
         case msg: UserJoined                    => handleUserJoined(msg)
         case msg: UserRaisedHand                => handleUserRaisedHand(msg)
         case msg: UserLoweredHand               => handleUserLoweredHand(msg)
+        case msg: UserListeningOnly             => handleUserListeningOnly(msg)
         case msg: UserSharedWebcam              => handleUserSharedWebcam(msg)
         case msg: UserUnsharedWebcam            => handleUserUnsharedWebcam(msg)
         case msg: UserStatusChange              => handleUserStatusChange(msg)
@@ -1652,6 +1653,21 @@ class CollectorActor(dispatcher: IDispatcher) extends Actor {
 //    println("***** DISPATCHING USER LOWERED HAND *****************")
     dispatcher.dispatch(buildJson(header, payload))
   }
+
+  private def handleUserListeningOnly(msg: UserListeningOnly) {
+    val payload = new java.util.HashMap[String, Any]()
+    payload.put(Constants.MEETING_ID, msg.meetingID)
+    payload.put(Constants.USER_ID, msg.userID)
+    payload.put(Constants.LISTEN_ONLY, msg.listenOnly)
+    
+    val header = new java.util.HashMap[String, Any]()
+    header.put(Constants.NAME, MessageNames.USER_LISTEN_ONLY)
+    header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp)
+    header.put(Constants.CURRENT_TIME, TimestampGenerator.getCurrentTime)
+    
+//    println("***** DISPATCHING USER LISTENING ONLY *****************")
+    dispatcher.dispatch(buildJson(header, payload))
+  }
   
   private def handleUserSharedWebcam(msg: UserSharedWebcam) {
     val payload = new java.util.HashMap[String, Any]()

bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy

@@ -741,10 +741,16 @@ class ApiController {
 				              meetingName(m.getName())
 				              createTime(m.getCreateTime())
 											createDate(formatPrettyDate(m.getCreateTime()))
+                      voiceBridge(m.getTelVoice())
+                      dialNumber(m.getDialNumber())
                       attendeePW(m.getViewerPassword())
                       moderatorPW(m.getModeratorPassword())
                       hasBeenForciblyEnded(m.isForciblyEnded() ? "true" : "false")
                       running(m.isRunning() ? "true" : "false")
+                      participantCount(m.getNumUsers())
+                      listenerCount(m.getNumListenOnly())
+                      voiceParticipantCount(m.getNumVoiceJoined())
+                      videoCount(m.getNumVideos())
 											duration(m.duration)
 											hasUserJoined(m.hasUserJoined())
                     }
@@ -1800,6 +1806,7 @@ class ApiController {
             returncode(RESP_CODE_SUCCESS)
 			      meetingName(meeting.getName())
             meetingID(meeting.getExternalId())
+            internalMeetingID(meeting.getInternalId())
 			      createTime(meeting.getCreateTime())
 						createDate(formatPrettyDate(meeting.getCreateTime()))
 			      voiceBridge(meeting.getTelVoice())
@@ -1814,6 +1821,8 @@ class ApiController {
             startTime(meeting.getStartTime())
             endTime(meeting.getEndTime())
             participantCount(meeting.getNumUsers())
+            listenerCount(meeting.getNumListenOnly())
+            voiceParticipantCount(meeting.getNumVoiceJoined())
             maxUsers(meeting.getMaxUsers())
             moderatorCount(meeting.getNumModerators())
             attendees() {
@@ -1822,6 +1831,14 @@ class ApiController {
                   userID("${att.externalUserId}")
                   fullName("${att.fullname}")
                   role("${att.role}")
+                  isPresenter("${att.isPresenter()}")
+                  isListeningOnly("${att.isListeningOnly()}")
+                  hasJoinedVoice("${att.isVoiceJoined()}")
+                  videoStreams(){
+                    att.getStreams().each { s ->
+                      streamName("${s}")
+                    }
+                  }
 				  customdata(){
 					  meeting.getUserCustomData(att.externalUserId).each{ k,v ->
 						  "$k"("$v")
@@ -1855,6 +1872,8 @@ class ApiController {
             attendeePW(meeting.getViewerPassword())
             moderatorPW(meeting.getModeratorPassword())
             createTime(meeting.getCreateTime())
+            voiceBridge(meeting.getTelVoice())
+            dialNumber(meeting.getDialNumber())
 						createDate(formatPrettyDate(meeting.getCreateTime()))
 						hasUserJoined(meeting.hasUserJoined())
 						duration(meeting.duration)

bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java

@@ -21,6 +21,13 @@ package org.bigbluebutton.api;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -28,16 +35,14 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-import java.util.*;
+
 import org.bigbluebutton.api.domain.Meeting;
 import org.bigbluebutton.api.domain.Playback;
 import org.bigbluebutton.api.domain.Recording;
 import org.bigbluebutton.api.domain.User;
 import org.bigbluebutton.api.domain.UserSession;
 import org.bigbluebutton.api.messaging.MessageListener;
-import org.bigbluebutton.api.messaging.MessagingConstants;
 import org.bigbluebutton.api.messaging.MessagingService;
-import org.bigbluebutton.api.messaging.ReceivedMessage;
 import org.bigbluebutton.api.messaging.messages.CreateMeeting;
 import org.bigbluebutton.api.messaging.messages.EndMeeting;
 import org.bigbluebutton.api.messaging.messages.IMessage;
@@ -47,10 +52,14 @@ import org.bigbluebutton.api.messaging.messages.MeetingStarted;
 import org.bigbluebutton.api.messaging.messages.RegisterUser;
 import org.bigbluebutton.api.messaging.messages.RemoveExpiredMeetings;
 import org.bigbluebutton.api.messaging.messages.UserJoined;
+import org.bigbluebutton.api.messaging.messages.UserJoinedVoice;
 import org.bigbluebutton.api.messaging.messages.UserLeft;
+import org.bigbluebutton.api.messaging.messages.UserLeftVoice;
+import org.bigbluebutton.api.messaging.messages.UserListeningOnly;
+import org.bigbluebutton.api.messaging.messages.UserSharedWebcam;
 import org.bigbluebutton.api.messaging.messages.UserStatusChanged;
+import org.bigbluebutton.api.messaging.messages.UserUnsharedWebcam;
 import org.bigbluebutton.web.services.ExpiredMeetingCleanupTimerTask;
-import org.bigbluebutton.web.services.KeepAliveService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -454,6 +463,85 @@ public class MeetingService implements MessageListener {
 		log.warn("The meeting " + message.meetingId + " doesn't exist");
 	}
 
+	public void userJoinedVoice(UserJoinedVoice message) {
+		Meeting m = getMeeting(message.meetingId);
+		if (m != null) {
+			User user = m.getUserById(message.userId);
+			if(user != null){
+				user.setVoiceJoined(true);
+				log.info("User {} joined the voice conference in the meeting {}", user.getFullname(), message.meetingId);
+				return;
+			}
+			log.warn("The participant " + message.userId + " doesn't exist in the meeting " + message.meetingId);
+			return;
+		}
+		log.warn("The meeting " + message.meetingId + " doesn't exist");
+	}
+
+	public void userLeftVoice(UserLeftVoice message) {
+		Meeting m = getMeeting(message.meetingId);
+		if (m != null) {
+			User user = m.getUserById(message.userId);
+			if(user != null){
+				user.setVoiceJoined(false);
+				log.info("User {} left the voice conference in the meeting {}", user.getFullname(), message.meetingId);
+				return;
+			}
+			log.warn("The participant " + message.userId + " doesn't exist in the meeting " + message.meetingId);
+			return;
+		}
+		log.warn("The meeting " + message.meetingId + " doesn't exist");
+	}
+
+	public void userListeningOnly(UserListeningOnly message) {
+		Meeting m = getMeeting(message.meetingId);
+		if (m != null) {
+			User user = m.getUserById(message.userId);
+			if(user != null){
+				user.setListeningOnly(message.listenOnly);
+				if (message.listenOnly) {
+					log.info("User {} started to listen only in the meeting {}", user.getFullname(), message.meetingId);
+				} else {
+					log.info("User {} stopped to listen only in the meeting {}", user.getFullname(), message.meetingId);
+				}
+				return;
+			}
+			log.warn("The participant " + message.userId + " doesn't exist in the meeting " + message.meetingId);
+			return;
+		}
+		log.warn("The meeting " + message.meetingId + " doesn't exist");
+	}
+
+	public void userSharedWebcam(UserSharedWebcam message) {
+		Meeting m = getMeeting(message.meetingId);
+		if (m != null) {
+			User user = m.getUserById(message.userId);
+			if(user != null){
+				user.addStream(message.stream);
+				log.info("User {} started to stream {} to the meeting {}", user.getFullname(), message.stream, message.meetingId);
+				return;
+			}
+			log.warn("The participant " + message.userId + " doesn't exist in the meeting " + message.meetingId);
+			return;
+		}
+		log.warn("The meeting " + message.meetingId + " doesn't exist");
+	}
+
+	public void userUnsharedWebcam(UserUnsharedWebcam message) {
+		Meeting m = getMeeting(message.meetingId);
+		if (m != null) {
+			User user = m.getUserById(message.userId);
+			if(user != null){
+				user.removeStream(message.stream);
+				log.info("User {} stopped to stream {} to the meeting {}", user.getFullname(), message.stream, message.meetingId);
+				return;
+			}
+			log.warn("The participant " + message.userId + " doesn't exist in the meeting " + message.meetingId);
+			return;
+		}
+		log.warn("The meeting " + message.meetingId + " doesn't exist");
+	}
+
 	private void processMessage(final IMessage message) {
 		Runnable task = new Runnable() {
 	    public void run() {
@@ -472,6 +560,21 @@ public class MeetingService implements MessageListener {
 	  			userLeft((UserLeft)message);
 	  		} else if (message instanceof UserStatusChanged) {
 	  			updatedStatus((UserStatusChanged)message);
+	  		} else if (message instanceof UserJoinedVoice) {
+	  			log.info("Processing voice user joined message.");
+	  			userJoinedVoice((UserJoinedVoice)message);
+	  		} else if (message instanceof UserLeftVoice) {
+	  			log.info("Processing voice user left message.");
+	  			userLeftVoice((UserLeftVoice)message);
+	  		} else if (message instanceof UserListeningOnly) {
+	  			log.info("Processing user listening only message.");
+	  			userListeningOnly((UserListeningOnly)message);
+	  		} else if (message instanceof UserSharedWebcam) {
+	  			log.info("Processing user shared webcam message.");
+	  			userSharedWebcam((UserSharedWebcam)message);
+	  		} else if (message instanceof UserUnsharedWebcam) {
+	  			log.info("Processing user unshared webcam message.");
+	  			userUnsharedWebcam((UserUnsharedWebcam)message);
 	  		} else if (message instanceof RemoveExpiredMeetings) {
 	  			checkAndRemoveExpiredMeetings();
 	  		} else if (message instanceof CreateMeeting) {

bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java

@@ -29,7 +29,6 @@ import java.util.concurrent.ConcurrentMap;
 import org.apache.commons.lang.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.bigbluebutton.api.MeetingService;
 
 public class Meeting {
 	private static Logger log = LoggerFactory.getLogger(Meeting.class);
@@ -300,6 +299,33 @@ public class Meeting {
 	private boolean hasEnded() {
 		return endTime > 0;
 	}
+
+	public int getNumListenOnly() {
+		int sum = 0;
+		for (String key : users.keySet()) {
+			User u =  (User) users.get(key);
+			if (u.isListeningOnly()) sum++;
+		}
+		return sum;
+	}
+	
+	public int getNumVoiceJoined() {
+		int sum = 0;
+		for (String key : users.keySet()) {
+			User u =  (User) users.get(key);
+			if (u.isVoiceJoined()) sum++;
+		}
+		return sum;
+	}
+
+	public int getNumVideos() {
+		int sum = 0;
+		for (String key : users.keySet()) {
+			User u =  (User) users.get(key);
+			sum += u.getStreams().size();
+		}
+		return sum;
+	}
 	
 	public void addUserCustomData(String userID, Map<String, String> data) {
 		userCustomData.put(userID, data);

bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java

@@ -19,6 +19,9 @@
 
 package org.bigbluebutton.api.domain;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -28,6 +31,9 @@ public class User {
 	private String fullname;
 	private String role;
 	private Map<String,String> status;
+	private Boolean listeningOnly = false;
+	private Boolean voiceJoined = false;
+	private List<String> streams;
 	
 	public User(String internalUserId, String externalUserId, String fullname, String role) {
 		this.internalUserId = internalUserId;
@@ -35,6 +41,7 @@ public class User {
 		this.fullname = fullname;
 		this.role = role;
 		this.status = new ConcurrentHashMap<String, String>();
+		this.streams = Collections.synchronizedList(new ArrayList<String>());
 	}
 	
 	public String getInternalUserId() {
@@ -78,4 +85,40 @@ public class User {
 	public Map<String,String> getStatus(){
 		return this.status;
 	}
+
+	public boolean isPresenter() {
+		String isPresenter = this.status.get("presenter");
+		if (isPresenter != null) {
+			return isPresenter.equalsIgnoreCase("true");
+		}
+		return false;
+	}
+	
+	public void addStream(String stream) {
+		streams.add(stream);
+	}
+	
+	public void removeStream(String stream) {
+		streams.remove(stream);
+	}
+	
+	public List<String> getStreams() {
+		return streams;
+	}
+
+	public Boolean isListeningOnly() {
+		return listeningOnly;
+	}
+
+	public void setListeningOnly(Boolean listeningOnly) {
+		this.listeningOnly = listeningOnly;
+	}
+
+	public Boolean isVoiceJoined() {
+		return voiceJoined;
+	}
+
+	public void setVoiceJoined(Boolean voiceJoined) {
+		this.voiceJoined = voiceJoined;
+	}
 }

bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java

@@ -1,7 +1,5 @@
 package org.bigbluebutton.api.messaging;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 import org.bigbluebutton.api.messaging.messages.KeepAliveReply;
@@ -9,14 +7,18 @@ import org.bigbluebutton.api.messaging.messages.MeetingDestroyed;
 import org.bigbluebutton.api.messaging.messages.MeetingEnded;
 import org.bigbluebutton.api.messaging.messages.MeetingStarted;
 import org.bigbluebutton.api.messaging.messages.UserJoined;
+import org.bigbluebutton.api.messaging.messages.UserJoinedVoice;
 import org.bigbluebutton.api.messaging.messages.UserLeft;
+import org.bigbluebutton.api.messaging.messages.UserLeftVoice;
+import org.bigbluebutton.api.messaging.messages.UserListeningOnly;
+import org.bigbluebutton.api.messaging.messages.UserSharedWebcam;
 import org.bigbluebutton.api.messaging.messages.UserStatusChanged;
+import org.bigbluebutton.api.messaging.messages.UserUnsharedWebcam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.google.gson.Gson;
+
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.google.gson.reflect.TypeToken;
 
 public class MeetingMessageHandler implements MessageHandler {
 	private static Logger log = LoggerFactory.getLogger(MeetingMessageHandler.class);
@@ -28,8 +30,6 @@ public class MeetingMessageHandler implements MessageHandler {
 	}
 	
 	public void handleMessage(String pattern, String channel, String message) {	
-	  Gson gson = new Gson();
-
 		JsonParser parser = new JsonParser();
 		JsonObject obj = (JsonObject) parser.parse(message);
 						
@@ -121,8 +121,51 @@ public class MeetingMessageHandler implements MessageHandler {
 						  for (MessageListener listener : listeners) {
 						  	listener.handle(new UserLeft(meetingId, userid));
 						  }
+						} else if (MessagingConstants.USER_JOINED_VOICE_EVENT.equalsIgnoreCase(messageName)) {
+							System.out.println("Handling [" + messageName + "] message.");
+							String meetingId = payload.get("meeting_id").getAsString();
+							JsonObject user = (JsonObject) payload.get("user");
+							
+							String userid = user.get("userid").getAsString();
+							for (MessageListener listener : listeners) {
+								listener.handle(new UserJoinedVoice(meetingId, userid));
+							}
+						} else if (MessagingConstants.USER_LEFT_VOICE_EVENT.equalsIgnoreCase(messageName)) {
+							System.out.println("Handling [" + messageName + "] message.");
+							String meetingId = payload.get("meeting_id").getAsString();
+							JsonObject user = (JsonObject) payload.get("user");
+							
+							String userid = user.get("userid").getAsString();
+							for (MessageListener listener : listeners) {
+								listener.handle(new UserLeftVoice(meetingId, userid));
+							}
+						} else if (MessagingConstants.USER_LISTEN_ONLY_EVENT.equalsIgnoreCase(messageName)) {
+							System.out.println("Handling [" + messageName + "] message.");
+							String meetingId = payload.get("meeting_id").getAsString();
+							String userid = payload.get("userid").getAsString();
+							Boolean listenOnly = payload.get("listen_only").getAsBoolean();
+
+							for (MessageListener listener : listeners) {
+								listener.handle(new UserListeningOnly(meetingId, userid, listenOnly));
+							}
+						} else if (MessagingConstants.USER_SHARE_WEBCAM_EVENT.equalsIgnoreCase(messageName)) {
+							System.out.println("Handling [" + messageName + "] message.");
+							String meetingId = payload.get("meeting_id").getAsString();
+							String userid = payload.get("userid").getAsString();
+							String stream = payload.get("stream").getAsString();
+							for (MessageListener listener : listeners) {
+								listener.handle(new UserSharedWebcam(meetingId, userid, stream));
+							}
+						} else if (MessagingConstants.USER_UNSHARE_WEBCAM_EVENT.equalsIgnoreCase(messageName)) {
+							System.out.println("Handling [" + messageName + "] message.");
+							String meetingId = payload.get("meeting_id").getAsString();
+							String userid = payload.get("userid").getAsString();
+							String stream = payload.get("stream").getAsString();
+							for (MessageListener listener : listeners) {
+								listener.handle(new UserUnsharedWebcam(meetingId, userid, stream));
+							}
 						}
-					}				
+					}
 				}
 		  } 
 	}

bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java

@@ -47,7 +47,11 @@ public class MessagingConstants {
 	public static final String USER_JOINED_EVENT             = "user_joined_message";
 	public static final String USER_LEFT_EVENT               = "user_left_message";
 	public static final String USER_STATUS_CHANGE_EVENT      = "user_status_changed_message";
-	
+	public static final String USER_JOINED_VOICE_EVENT       = "user_joined_voice_message";
+	public static final String USER_LEFT_VOICE_EVENT         = "user_left_voice_message";
+	public static final String USER_LISTEN_ONLY_EVENT        = "user_listening_only";
+	public static final String USER_SHARE_WEBCAM_EVENT       = "user_shared_webcam_message";
+	public static final String USER_UNSHARE_WEBCAM_EVENT     = "user_unshared_webcam_message";
 			
 	public static final String SEND_POLLS_EVENT = "SendPollsEvent";
 	public static final String KEEP_ALIVE_REPLY = "keep_alive_reply";

bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserJoinedVoice.java

@@ -0,0 +1,11 @@
+package org.bigbluebutton.api.messaging.messages;
+
+public class UserJoinedVoice implements IMessage {
+  public final String userId;
+  public final String meetingId;
+  
+  public UserJoinedVoice(String meetingId, String userId) {
+  	this.meetingId = meetingId;
+  	this.userId = userId;
+  }
+}

bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserLeftVoice.java

@@ -0,0 +1,11 @@
+package org.bigbluebutton.api.messaging.messages;
+
+public class UserLeftVoice implements IMessage {
+  public final String userId;
+  public final String meetingId;
+  
+  public UserLeftVoice(String meetingId, String userId) {
+  	this.meetingId = meetingId;
+  	this.userId = userId;
+  }
+}

bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserListeningOnly.java

@@ -0,0 +1,13 @@
+package org.bigbluebutton.api.messaging.messages;
+
+public class UserListeningOnly implements IMessage {
+  public final String userId;
+  public final String meetingId;
+  public final Boolean listenOnly;
+  
+  public UserListeningOnly(String meetingId, String userId, Boolean listenOnly) {
+  	this.meetingId = meetingId;
+  	this.userId = userId;
+  	this.listenOnly = listenOnly;
+  }
+}

bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserSharedWebcam.java

@@ -0,0 +1,13 @@
+package org.bigbluebutton.api.messaging.messages;
+
+public class UserSharedWebcam implements IMessage {
+  public final String userId;
+  public final String meetingId;
+  public final String stream;
+  
+  public UserSharedWebcam(String meetingId, String userId, String stream) {
+  	this.meetingId = meetingId;
+  	this.userId = userId;
+  	this.stream = stream;
+  }
+}

bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/UserUnsharedWebcam.java

@@ -0,0 +1,13 @@
+package org.bigbluebutton.api.messaging.messages;
+
+public class UserUnsharedWebcam implements IMessage {
+  public final String userId;
+  public final String meetingId;
+  public final String stream;
+  
+  public UserUnsharedWebcam(String meetingId, String userId, String stream) {
+  	this.meetingId = meetingId;
+  	this.userId = userId;
+  	this.stream = stream;
+  }
+}