BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- re-route messages

Browse Source
This commit is contained in:
Richard Alam 2018-04-24 12:53:36 -07:00
parent e58c0a33ca
commit e3f1405746
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
View File

@ -618,8 +618,11 @@
console.log("FOOOO!!!!!");
};
var token = null;
BBB.sendAuthToken = function(data) {
eb.registerHandler("chat.to.client", function (msg) {
token = data;
eb.registerHandler("to-client-" + data, function (msg) {
//console.log("From server: " + JSON.stringify(msg) + "\n");
BBB.onMessageFromDS(msg);
});
@ -630,9 +633,7 @@
BBB.sendToDeepstream = function(data) {
// trace("SENDING " + data);
// var json = JSON.parse(data);
eb.send("chat.to.server", data, function(msg) {
//console.log("reply: " + msg + "\n");
});
eb.send("to-server", data);
};

15
labs/vertx-akka/src/main/java/org/bigbluebutton/vertx/SockJSHandlerVerticle.java
View File

@ -2,7 +2,6 @@ package org.bigbluebutton.vertx;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.eventbus.EventBus;
import io.vertx.core.json.JsonObject;
import io.vertx.ext.bridge.BridgeEventType;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.handler.BodyHandler;
@ -15,11 +14,6 @@ import io.vertx.ext.web.handler.sockjs.SockJSHandler;
import io.vertx.ext.web.handler.sockjs.SockJSHandlerOptions;
import io.vertx.ext.web.sstore.LocalSessionStore;
import org.bigbluebutton.ConnectionManager;
import org.bigbluebutton.VertxToAkkaGateway;
import java.text.DateFormat;
import java.time.Instant;
import java.util.Date;
public class SockJSHandlerVerticle extends AbstractVerticle {
private final ConnectionManager gw;
@ -44,10 +38,13 @@ public class SockJSHandlerVerticle extends AbstractVerticle {
// We need a user session handler too to make sure the user is stored in the session between requests
//router.route().handler(UserSessionHandler.create(authProvider));
// PermittedOptions outboundPermitted2 = new PermittedOptions().setAddressRegex("to-server-.+");
// PermittedOptions inboundPermitted2 = new PermittedOptions().setAddressRegex("to-client-.+");
// Allow events for the designated addresses in/out of the event bus bridge
BridgeOptions opts = new BridgeOptions()
.addInboundPermitted(new PermittedOptions().setAddress("chat.to.server"))
.addOutboundPermitted(new PermittedOptions().setAddress("chat.to.client"));
.addInboundPermitted(new PermittedOptions().setAddress("to-server"))
.addOutboundPermitted(new PermittedOptions().setAddressRegex("to-client-.+"));
SockJSHandlerOptions options = new SockJSHandlerOptions().setHeartbeatInterval(2000);
@ -108,7 +105,7 @@ public class SockJSHandlerVerticle extends AbstractVerticle {
vertx.createHttpServer().requestHandler(router::accept).listen(3001);
// Register to listen for messages coming IN to the server
eb.consumer("chat.to.server").handler(message -> {
eb.consumer("to.server").handler(message -> {
// Create a timestamp string
// String timestamp = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM).format(Date.from(Instant.now()));
// Send the message back out to all clients with the timestamp prepended.

8
labs/vertx-akka/src/main/scala/org/bigbluebutton/Connection.scala
View File

@ -51,7 +51,7 @@ class ConnectionActor(connId: String, vertx: Vertx, connEventBus: InternalMessag
connEventBus.publish(MsgFromConnBusMsg(ClientManagerActor.CLIENT_MANAGER_CHANNEL, ConnectionCreated(conn)))
val response = buildHandshakeReply(conn.meetingId, conn.userId, conn.token)
vertx.eventBus().publish("chat.to.client", response)
vertx.eventBus().publish("to-client-" + conn.token, response)
}
} else {
//println("************ FORWARDING TO CLIENT ACTOR *****************************")
@ -63,8 +63,10 @@ class ConnectionActor(connId: String, vertx: Vertx, connEventBus: InternalMessag
case m: MsgToConnMsg =>
//println("MsgToConnMsg " + m.json)
val jsonObject = new JsonObject(m.json)
vertx.eventBus().publish("chat.to.client", jsonObject)
connInfo foreach { conn =>
val jsonObject = new JsonObject(m.json)
vertx.eventBus().publish("to-client-" + conn.token, jsonObject)
}
case _ => log.debug("***** Connection cannot handle msg ")
}