evmux-app-framework 0.0.5 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evmux-app-framework",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/AppsObserver/AppsObserver.js

@@ -6,10 +6,10 @@ import PostMessageManager from '../PostMessageManager/PostMessageManager';
 import appsDataManager from '../AppsDataManager/AppsDataManager';
 import AppsObserverCommentsHandler from './AppsObserverCommentsHandler'
 
-let createEventResultObject = (eventName, result) => {
+let createEventResultObject = (requestName, eventName, result) => {
 
     let eventObj = {
-      requestName: "EvEvent",
+      requestName,
       eventName,
       data: {...result}
     }
@@ -38,7 +38,15 @@ let createEventResultObject = (eventName, result) => {
      }
 
     raiseEvent(eventName, data) {
-        
+        for (const [userAppInstanceId, userAppInstance] of Object.entries(this._userAppInstances)) {
+            if (userAppInstance.events && userAppInstance.events[eventName]) {
+                let eventObj = createEventResultObject("EvEvent", eventName, data)
+                let stringObjToSend = JSON.stringify(eventObj)
+                for (const [key, instanceWindow] of Object.entries(this._userAppInstances[userAppInstanceId].instances)) {
+                    instanceWindow.window.postMessage(stringObjToSend, "*")
+                }
+            }
+        }
     }
 
     getAppSettingsForAppInstanceId(appInstanceId)
@@ -58,7 +66,7 @@ let createEventResultObject = (eventName, result) => {
         appsDataManager.updateUserAppInstanceSettings(userAppInstanceId, data)
         if (this._userAppInstances[userAppInstanceId].events['settingsUpdated'])
         {
-            let eventObj = createEventResultObject("settingsUpdated", data)
+            let eventObj = createEventResultObject("EvEvent","settingsUpdated", data)
             let stringObjToSend = JSON.stringify(eventObj)
             for (const [key, instanceWindow] of Object.entries(this._userAppInstances[userAppInstanceId].instances)) {
                 instanceWindow.window.postMessage(stringObjToSend, "*")
@@ -92,7 +100,7 @@ let createEventResultObject = (eventName, result) => {
       
             if (this._userAppInstances[requestObj.userAppInstanceId]) {
 
-                let eventObj = createEventResultObject("settings", requestObj.data)
+                let eventObj = createEventResultObject("EvMessage", "settings", requestObj.data)
                 let stringObjToSend = JSON.stringify(eventObj)
                 result = (await appsDataManager.getUserAppInstanceById(requestObj.userAppInstanceId, false)).settings
                 //this._userAppInstances[requestObj.userAppInstanceId].window.postMessage(stringObjToSend, "*")

package/src/EvmuxAppsApi/EvmuxAppsApi.js

@@ -2,7 +2,12 @@ import PostMessageManager from '../PostMessageManager/PostMessageManager.js'
 
 import EvmuxAppsApiComments from './EvmuxAppsApiComments.js'
 
-const availableEvents = ["settingsUpdated", "viewerCountChanged", "keystroke"]
+export const availableEvents = {
+  settingsUpdated: "settingsUpdated",
+  viewerCountChanged: "viewerCountChanged",
+  keystroke: "keystroke",
+  comments: "comments"
+}
 
 export default class EvmuxAppsApi {
   

package/src/PostMessageManager/PostMessageManager.js

@@ -58,16 +58,17 @@ export default class PostMessageManager {
     onPostMessage(evt) {
         try {
             let reqObj = evt && JSON.parse(evt.data)
-            if (reqObj.requestGuid && this._requests[reqObj.requestGuid])
+
+            if (reqObj.requestName == "EvEvent")
+            {
+                this._messagesEventHandlers.publish(reqObj.eventName, reqObj.data)
+            }
+            else if (reqObj.requestGuid && this._requests[reqObj.requestGuid])
             {
                 let res = this._requests[reqObj.requestGuid];
                 delete this._requests[reqObj.requestGuid]
                 return res.resolve(reqObj)
             }
-            else if (reqObj.requestName == "EvEvent")
-            {
-                this._messagesEventHandlers.publish(reqObj.eventName, reqObj.data)
-            }
         } catch (error) {
             
         }