From f67688857de0622257d3635937d8062d296fe071 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Mon, 14 Apr 2014 07:58:20 -0700
Subject: [PATCH] - minor changes
---
client/bbb-html5-client/lib/controller.coffee | 5 +++++
client/bbb-html5-client/lib/messagebus.coffee | 8 ++++----
client/bbb-html5-client/lib/redispubsub.coffee | 16 ++++++++--------
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/client/bbb-html5-client/lib/controller.coffee b/client/bbb-html5-client/lib/controller.coffee
index f3187fee31..5b4f49ec8f 100755
--- a/client/bbb-html5-client/lib/controller.coffee
+++ b/client/bbb-html5-client/lib/controller.coffee
@@ -1,6 +1,11 @@
bus = require './messagebus'
log = require './bbblogger'
+messageReceiver = null
+
+exports.registerMessageReceiver = (callback) ->
+ messageReceiver = callback
+
exports.processLoginMessage = (data, callback) ->
bus.sendMessage(data, (err, result) ->
if (err)
diff --git a/client/bbb-html5-client/lib/messagebus.coffee b/client/bbb-html5-client/lib/messagebus.coffee
index 6ed23a237a..58d134f138 100755
--- a/client/bbb-html5-client/lib/messagebus.coffee
+++ b/client/bbb-html5-client/lib/messagebus.coffee
@@ -2,12 +2,12 @@ postal = require('postal')
redisrpc = require './redispubsub'
crypto = require 'crypto'
-receiveMessage = (callback) ->
+exports.receiveMessage = (callback) ->
postal.subscribe({
- channel: replyTo.channel,
- topic: replyTo.topic,
+ channel: "receiveChannel"
+ topic: "broadcast",
callback: (msg, envelope) ->
- callback( msg.err, msg.data )
+ callback( msg )
})
diff --git a/client/bbb-html5-client/lib/redispubsub.coffee b/client/bbb-html5-client/lib/redispubsub.coffee
index 079f2ca5ee..5f9d580ba0 100755
--- a/client/bbb-html5-client/lib/redispubsub.coffee
+++ b/client/bbb-html5-client/lib/redispubsub.coffee
@@ -81,16 +81,16 @@ subClient.on("message", (channel, jsonMsg) ->
data: response
})
else
- if message.meetingId?
- postal.publish({
- channel: "bigbluebuttonAppChannel"
- topic: message.meetingId,
- data: message
- })
- else
- console.log("Invalid message: #{jsonMsg}")
+ sendToController message
)
+sendToController = (message) ->
+ postal.publish({
+ channel: "receiveChannel"
+ topic: "broadcast",
+ data: message
+ })
+
initialize()
console.log("RPC: Subscribing message on channel [responseChannel]")
--
GitLab