Migrated signaling messages to channels.

muzzley · Oct 22, 2014 · 20ac8a9 · 20ac8a9
1 parent ecef57c
commit 20ac8a9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -709,9 +709,9 @@ MuzzleyClient.prototype.subscribe = function (options, callback) {
 
 MuzzleyClient.prototype.publish = function (options, callback) {
   var self = this;
-  callback = callback || function () {};
 
   self.remoteCalls.publish(options, function (err, muzzData) {
+    if (typeof callback !== 'function') return;
     if (err) {
       return callback(err);
     }
@@ -820,7 +820,7 @@ MuzzleyClient.prototype.__handleCreateResponse = function (options, channel, res
     if (options._backwardCompatible) {
       self.trigger('connect', activity);
     }
-    channel.trigger('created', activity);
+    channel.trigger('create', activity);
     return callback(null, activity);
   // }
 };

diff --git a/lib/middleware/signalingMessage.js b/lib/middleware/signalingMessage.js
@@ -20,12 +20,21 @@ function signalingMessage(muzzData, next){
     var msgType = muzzData.h.t;
     var signalData = (typeof muzzData.d.d === undefined) ? null : muzzData.d.d;
 
-    var participant = _this._user || _this.participants[muzzData.h.pid];
-    if (participant) {
+    var channel = _this.channelManager.get(muzzData.h.ch);
+    var receiver;
+    if (channel.getActivity()) {
+      receiver = channel.getActivity().getParticipant(muzzData.h.pid);
+    } else if (channel.getUser()) {
+      receiver = channel.getUser();
+    } else {
+      receiver = channel;
+    }
+
+    if (receiver) {
       switch (msgType) {
         case messageTypes.MESSAGE_TYPE_REQUEST:
           // RPC message, requires a response
-          participant.trigger('signalingMessage', muzzData.d.a, signalData, function (success, message, data) {
+          receiver.trigger('signalingMessage', muzzData.d.a, signalData, function (success, message, data) {
 
             if (typeof success === 'boolean') {
 
@@ -56,7 +65,7 @@ function signalingMessage(muzzData, next){
           });
           return;
         case messageTypes.MESSAGE_TYPE_SIGNAL:
-          participant.trigger('signalingMessage', muzzData.d.a, muzzData.d.d);
+          receiver.trigger('signalingMessage', muzzData.d.a, muzzData.d.d);
           return;
       }
     }