Fire JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED events

via JSON messages received via the Chatroom

JitsiConferenceEventManager.js

@@ -300,6 +300,23 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function() {
                 JitsiConferenceEvents.USER_STATUS_CHANGED, id, status);
         });
 
+    chatRoom.addListener(XMPPEvents.JSON_MESSAGE_RECEIVED,
+        (from, payload) => {
+            const participant = conference.getParticipantById(
+                from.split('/')[1]);
+
+            if (participant) {
+                conference.eventEmitter.emit(
+                    JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED,
+                    participant, payload);
+            } else {
+                logger.warn(
+                    'Ignored ENDPOINT_MESSAGE_RECEIVED for not existing '
+                    + `participant: ${from}`,
+                    payload);
+            }
+        });
+
     chatRoom.addPresenceListener('startmuted', (data, from) => {
         let isModerator = false;
 

modules/xmpp/ChatRoom.js

@@ -79,6 +79,33 @@ function filterNodeFromPresenceJSON(pres, nodeName) {
     return res;
 }
 
+/**
+ * Check if the given argument is a valid JSON string by parsing it.
+ * If it successfully parses, the JSON object is returned.
+ *
+ * @param jsonString check if this string is a valid json string
+ * @returns {boolean, object} if given object is a valid JSON string, return
+ * the json object. Otherwise, return false;
+ */
+function tryParseJSON(jsonString) {
+    try {
+        const o = JSON.parse(jsonString);
+
+        // Handle non-exception-throwing cases:
+        // Neither JSON.parse(false) or JSON.parse(1234) throw errors,
+        // hence the type-checking,
+        // but... JSON.parse(null) returns null, and
+        // typeof null === "object",
+        // so we must check for that, too.
+        // Thankfully, null is falsey, so this suffices:
+        if (o && typeof o === 'object') {
+            return o;
+        }
+    } catch (e) {
+        return false;
+    }
+}
+
 // XXX As ChatRoom constructs XMPP stanzas and Strophe is build around the idea
 // of chaining function calls, allow long function call chains.
 /* eslint-disable newline-per-chained-call */
@@ -742,6 +769,19 @@ export default class ChatRoom extends Listenable {
             this.discoRoomInfo();
         }
 
+        // todo add a JSON layer such that not every json
+        // passed around in the chat is automatically assumed to be
+        // json used for messaging
+        const json = tryParseJSON(txt);
+
+        if (json) {
+            logger.log('chat json message', from, json);
+            this.eventEmitter.emit(XMPPEvents.JSON_MESSAGE_RECEIVED,
+                from, json);
+
+            return;
+        }
+
         if (txt) {
             logger.log('chat', nick, txt);
             this.eventEmitter.emit(XMPPEvents.MESSAGE_RECEIVED,

service/xmpp/XMPPEvents.js

@@ -210,7 +210,13 @@ const XMPPEvents = {
 
     // Designates an event indicating that the local ICE connection state has
     // changed.
-    ICE_CONNECTION_STATE_CHANGED: 'xmpp.ice_connection_state_changed'
+    ICE_CONNECTION_STATE_CHANGED: 'xmpp.ice_connection_state_changed',
+
+    /**
+     * Event which is emitted when the body in an XMPP message in the MUC
+     * contains JSON
+     */
+    JSON_MESSAGE_RECEIVED: 'xmmp.json_message_received'
 };
 
 module.exports = XMPPEvents;