diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
index 9827d6e33b8029a3495e6fa719c6bc9f61339a92..cbc3c9181d7676e318b99c49622bb550d5fe326a 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
@@ -45,7 +45,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.modules.screenshare.events.WebRTCViewStreamEvent;
import org.bigbluebutton.modules.screenshare.events.WebRTCViewWindowEvent;
import org.bigbluebutton.modules.screenshare.managers.WebRTCDeskshareManager;
- import org.bigbluebutton.modules.screenshare.services.red5.WebRTCConnectionEvent;
]]>
</fx:Script>
@@ -73,12 +72,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<MethodInvoker generator="{WebRTCDeskshareManager}" method="handleRequestStopSharingEvent"/>
</EventHandlers>
-<!--
- <EventHandlers type="{ShareStartRequestResponseEvent.SHARE_START_REQUEST_RESPONSE}">
- <MethodInvoker generator="{WebRTCDeskshareManager}" method="handleShareStartRequestResponseEvent" arguments="{event}"/>
- </EventHandlers>
--->
-
<EventHandlers type="{MadePresenterEvent.SWITCH_TO_PRESENTER_MODE}">
<MethodInvoker generator="{WebRTCDeskshareManager}" method="handleMadePresenterEvent" arguments="{event}"/>
</EventHandlers>
@@ -115,10 +108,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<MethodInvoker generator="{WebRTCDeskshareManager}" method="handleRequestStopSharingEvent"/>
</EventHandlers>
- <EventHandlers type="{WebRTCConnectionEvent.SUCCESS}">
- <MethodInvoker generator="{WebRTCDeskshareManager}" method="handleConnectionSuccessEvent"/>
- </EventHandlers>
-
<EventHandlers type="{StartedViewingEvent.STARTED_VIEWING_EVENT}">
<MethodInvoker generator="{WebRTCDeskshareManager}" method="handleStartedViewingEvent" arguments="{event.stream}"/>
</EventHandlers>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/WebRTCDeskshareService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/WebRTCDeskshareService.as
index a43556c12f16d73646212e351381e7f6258e7541..d1b6ece946aaf716fc8865bb3b9d579915032e40 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/WebRTCDeskshareService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/WebRTCDeskshareService.as
@@ -24,19 +24,12 @@ package org.bigbluebutton.modules.screenshare.services
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
- import org.bigbluebutton.modules.screenshare.services.red5.WebRTCConnection;
import org.bigbluebutton.modules.screenshare.services.red5.Connection;
- /**
- * The DeskShareProxy communicates with the Red5 deskShare server application
- * @author Snap
- *
- */
public class WebRTCDeskshareService
{
private static const LOGGER:ILogger = getClassLogger(ScreenshareService);
- private var conn:WebRTCConnection;
private var red5conn:Connection;
private var module:ScreenshareModule;
@@ -65,18 +58,14 @@ package org.bigbluebutton.modules.screenshare.services
this.uri = uri;
this.room = room;
LOGGER.debug("Deskshare Service connecting to {0}", [uri]);
- conn = new WebRTCConnection(room); //to red5 deskshare
-
- conn.setURI(uri);
- conn.connect();
}
public function getConnection():NetConnection{
- return conn.getConnection();
+ return red5conn.getConnection();
}
public function disconnect():void{
- conn.disconnect();
+ red5conn.disconnect();
}
}
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/WebRTCConnection.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/WebRTCConnection.as
deleted file mode 100755
index a362e16fef74968067106e731f76f40dacf04104..0000000000000000000000000000000000000000
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/WebRTCConnection.as
+++ /dev/null
@@ -1,330 +0,0 @@
-/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2015 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package org.bigbluebutton.modules.screenshare.services.red5
-{
- import com.asfusion.mate.events.Dispatcher;
-
- import flash.events.AsyncErrorEvent;
- import flash.events.NetStatusEvent;
- import flash.events.SecurityErrorEvent;
- import flash.events.TimerEvent;
- import flash.net.NetConnection;
- import flash.net.ObjectEncoding;
- import flash.net.Responder;
- import flash.utils.Timer;
-
- import mx.utils.ObjectUtil;
-
- import org.as3commons.logging.api.ILogger;
- import org.as3commons.logging.api.getClassLogger;
- import org.bigbluebutton.core.BBB;
- import org.bigbluebutton.core.UsersUtil;
- import org.bigbluebutton.core.managers.ReconnectionManager;
- import org.bigbluebutton.main.events.BBBEvent;
- import org.bigbluebutton.modules.screenshare.events.WebRTCViewStreamEvent;
- import org.bigbluebutton.modules.screenshare.services.red5.WebRTCConnectionEvent;
-
- public class WebRTCConnection {
- private static const LOGGER:ILogger = getClassLogger(Connection);
-
- private var nc:NetConnection;
- private var uri:String;
- private var retryTimer:Timer = null;
- private var retryCount:int = 0;
- private const MAX_RETRIES:int = 5;
- private var responder:Responder;
- private var width:Number;
- private var height:Number;
- private var room:String;
- private var logoutOnUserCommand:Boolean = false;
- private var reconnecting:Boolean = false;
- private var wasPresenterBeforeDisconnect:Boolean = false;
-
- private var dispatcher:Dispatcher = new Dispatcher();
-
- public function WebRTCConnection(room:String) {
- this.room = room;
-
- responder = new Responder(
- function(result:Object):void {
- if (result != null && (result.publishing as Boolean)){
- width = result.width as Number;
- height = result.height as Number;
- LOGGER.debug("Desk Share stream is streaming [{0},{1}]", [width, height]);
- var event:WebRTCViewStreamEvent = new WebRTCViewStreamEvent(WebRTCViewStreamEvent.START);
- event.videoWidth = width;
- event.videoHeight = height;
- dispatcher.dispatchEvent(event); //TODO why?
- } else {
- LOGGER.debug("No screenshare stream being published");
- var connEvent:WebRTCConnectionEvent = new WebRTCConnectionEvent();
- connEvent.status = WebRTCConnectionEvent.NO_DESKSHARE_STREAM;
- dispatcher.dispatchEvent(connEvent); //TODO why?
- }
- },
- function(status:Object):void{
- var checkFailedEvent:WebRTCConnectionEvent = new WebRTCConnectionEvent();
- checkFailedEvent.status = WebRTCConnectionEvent.FAIL_CHECK_FOR_DESKSHARE_STREAM;
- dispatcher.dispatchEvent(checkFailedEvent);
- LOGGER.debug("Error while trying to call remote mathod on server");
- }
- );
- }
-
- public function connect(retry:Boolean = false):void {
- nc = new NetConnection();
- nc.proxyType = "best";
- nc.objectEncoding = ObjectEncoding.AMF0;
- nc.client = this;
-
- nc.addEventListener(AsyncErrorEvent.ASYNC_ERROR, debugAsyncErrorHandler);
- nc.addEventListener(NetStatusEvent.NET_STATUS, debugNetStatusHandler);
- nc.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
- nc.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler);
-
- if (getURI().length == 0){
- LOGGER.error("please provide a valid URI connection string. URI Connection String missing");
- return;
- } else if (nc.connected){
- LOGGER.error("You are already connected to {0}", [getURI()]);
- return;
- }
-
- LOGGER.debug("Trying to connect to [{0}] retry=[{1}]", [getURI(), retry]);
- if (! (retryCount > 0)) {
- var ce:WebRTCConnectionEvent = new WebRTCConnectionEvent();
- ce.status = WebRTCConnectionEvent.CONNECTING;
-
- dispatcher.dispatchEvent(ce);
- }
-
- nc.connect(getURI(), UsersUtil.getInternalMeetingID());
- }
-
- private function connectTimeoutHandler(e:TimerEvent):void {
- LOGGER.debug("Connection attempt to [{0}] timedout. Retrying.", [getURI()]);
- retryTimer.stop();
- retryTimer = null;
-
- nc.close();
- nc = null;
-
- var ce:WebRTCConnectionEvent = new WebRTCConnectionEvent();;
-
- retryCount++;
- if (retryCount < MAX_RETRIES) {
- ce.status = WebRTCConnectionEvent.CONNECTING_RETRY;
- ce.retryAttempts = retryCount;
- dispatcher.dispatchEvent(ce);
-
- connect(false);
- } else {
- ce.status = WebRTCConnectionEvent.CONNECTING_MAX_RETRY;
- dispatcher.dispatchEvent(ce);
- }
- }
-
- public function close():void{
- nc.close();
- }
-
- public function setURI(p_URI:String):void{
- uri = p_URI;
- }
-
- public function getURI():String{
- return uri;
- }
-
- public function onBWCheck(... rest):Number {
- return 0;
- }
-
- public function onBWDone(... rest):void {
- var p_bw:Number;
- if (rest.length > 0) p_bw = rest[0];
- // your application should do something here
- // when the bandwidth check is complete
- LOGGER.debug("bandwidth = {0} Kbps.", [p_bw]);
- }
-
- private function netStatusHandler(event:NetStatusEvent):void {
- LOGGER.debug("Connected to [" + getURI() + "]. [" + event.info.code + "]");
-
- var logData:Object = {};
- logData.type = "ConnectionStatusChanged";
- logData.newStatus = event.info.code;
- logData.connection = getURI();
- LOGGER.info(JSON.stringify(logData));
-
- if (retryTimer) {
- retryCount = 0;
- LOGGER.debug("Cancelling retry timer.");
- retryTimer.stop();
- retryTimer = null;
- }
-
- var ce:WebRTCConnectionEvent = new WebRTCConnectionEvent();
-
- switch(event.info.code){
- case "NetConnection.Connect.Failed":
- if (reconnecting) {
- var attemptFailedEvent:BBBEvent = new BBBEvent(BBBEvent.RECONNECT_CONNECTION_ATTEMPT_FAILED_EVENT);
- attemptFailedEvent.payload.type = ReconnectionManager.DESKSHARE_CONNECTION;
- dispatcher.dispatchEvent(attemptFailedEvent);
- }
- ce.status = WebRTCConnectionEvent.FAILED;
-
- dispatcher.dispatchEvent(ce);
- break;
-
- case "NetConnection.Connect.Success":
- ce.status = WebRTCConnectionEvent.SUCCESS;
- if (reconnecting) {
- reconnecting = false;
- if (wasPresenterBeforeDisconnect) {
- wasPresenterBeforeDisconnect = false;
- // stopSharingDesktop(room, room) //TODO
- }
-
- var attemptSucceeded:BBBEvent = new BBBEvent(BBBEvent.RECONNECT_CONNECTION_ATTEMPT_SUCCEEDED_EVENT);
- attemptSucceeded.payload.type = ReconnectionManager.DESKSHARE_CONNECTION;
- dispatcher.dispatchEvent(attemptSucceeded);
- }
-
- // request desktop sharing info (as a late joiner)
- LOGGER.debug("Sending [desktopSharing.requestDeskShareInfo] to server.");
- var _nc:ConnectionManager = BBB.initConnectionManager();
- _nc.sendMessage("desktopSharing.requestDeskShareInfo",
- function(result:String):void { // On successful result
- LOGGER.debug(result);
- },
- function(status:String):void { // status - On error occurred
- LOGGER.error(status);
- }
- );
-
- dispatcher.dispatchEvent(ce);
- break;
-
- case "NetConnection.Connect.Rejected":
- ce.status = WebRTCConnectionEvent.REJECTED;
- dispatcher.dispatchEvent(ce);
- break;
-
- case "NetConnection.Connect.Closed":
- LOGGER.debug("Deskshare connection closed.");
- ce.status = WebRTCConnectionEvent.CLOSED;
- if (UsersUtil.amIPresenter()) {
- // Let's keep our presenter status before disconnected. We can't
- // tell the other user's to stop desktop sharing as our connection is broken. (ralam july 24, 2015)
- wasPresenterBeforeDisconnect = true;
-
- } else {
- // stopViewing(); //TODO
- }
-
- if (!logoutOnUserCommand) {
- reconnecting = true;
-
- var disconnectedEvent:BBBEvent = new BBBEvent(BBBEvent.RECONNECT_DISCONNECTED_EVENT);
- disconnectedEvent.payload.type = ReconnectionManager.DESKSHARE_CONNECTION;
- disconnectedEvent.payload.callback = connect;
- disconnectedEvent.payload.callbackParameters = [];
- dispatcher.dispatchEvent(disconnectedEvent);
- }
- break;
-
- case "NetConnection.Connect.InvalidApp":
- ce.status = WebRTCConnectionEvent.INVALIDAPP;
- dispatcher.dispatchEvent(ce);
- break;
-
- case "NetConnection.Connect.AppShutdown":
- ce.status = WebRTCConnectionEvent.APPSHUTDOWN;
- dispatcher.dispatchEvent(ce);
- break;
-
- case "NetConnection.Connect.NetworkChange":
- // LOGGER.info("Detected network change. User might be on a wireless and
- // temporarily dropped connection. Doing nothing. Just making a note.");
- break;
-
- default :
- // I dispatch DISCONNECTED incase someone just simply wants to know if we're not connected'
- // rather than having to subscribe to the events individually
- ce.status = WebRTCConnectionEvent.DISCONNECTED;
- dispatcher.dispatchEvent(ce);
- break;
- }
- }
-
- private function securityErrorHandler(event:SecurityErrorEvent):void{
- var ce:WebRTCConnectionEvent = new WebRTCConnectionEvent();
- ce.status = WebRTCConnectionEvent.SECURITYERROR;
- dispatcher.dispatchEvent(ce);
- }
-
- /**
- * Check if anybody is publishing the stream for this room
- * This method is useful for clients which have joined a room where somebody is already publishing
- *
- */
- private function checkIfStreamIsPublishing(room: String):void{
- LOGGER.debug("checking if desk share stream is publishing");
- var event:WebRTCConnectionEvent = new WebRTCConnectionEvent();
- event.status = WebRTCConnectionEvent.CHECK_FOR_DESKSHARE_STREAM;
- dispatcher.dispatchEvent(event); // TODO anton send to akka-bbb-apps
-
- nc.call("screenshare.checkIfStreamIsPublishing", responder, room);
- }
-
- public function disconnect():void{
- logoutOnUserCommand = true;
- if (nc != null) nc.close();
- }
-
- public function connectionSuccessHandler():void{
- LOGGER.debug("Successully connection to {0}", [uri]);
-
- checkIfStreamIsPublishing(room);
- }
-
- private function debugNetStatusHandler(e:NetStatusEvent):void {
- LOGGER.debug("netStatusHandler target={0} info={1}", [e.target, ObjectUtil.toString(e.info)]);
- }
-
- private function debugAsyncErrorHandler(e:AsyncErrorEvent):void {
- LOGGER.debug("asyncErrorHandler target={0} info={1}", [e.target, e.text]);
- }
-
- public function getConnection():NetConnection{
- return nc;
- }
-
- public function connectionFailedHandler(e:WebRTCConnectionEvent):void{
- LOGGER.error("connection failed to {0} with message {1}", [uri, e.toString()]);
- }
-
- public function connectionRejectedHandler(e:WebRTCConnectionEvent):void{
- LOGGER.error("connection rejected to {0} with message {1}", [uri, e.toString()]);
- }
- }
-}