evmux-app-framework 0.0.8 → 0.0.10

package/package.json

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

package/src/AppsObserver/AppsObserver.js

@@ -6,6 +6,20 @@ import PostMessageManager from '../PostMessageManager/PostMessageManager';
 import appsDataManager from '../AppsDataManager/AppsDataManager';
 import AppsObserverCommentsHandler from './AppsObserverCommentsHandler'
 
+import { availableEvents } from '../EvmuxAppsApi/EvmuxAppsApi'
+
+export const availableRequests = {
+    updateSettings: "updateSettings",
+    getSettings: "getSettings",
+    startLoad: "startLoad",
+    loaded: "loaded",
+    registerEvent: "registerEvent",
+    unregisterEvent: "unregisterEvent",
+    EvEvent: "EvEvent",
+    raiseAppMessagingEvent: "raiseAppMessagingEvent",
+  }
+
+
 let createEventResultObject = (requestName, eventName, result) => {
 
     let eventObj = {
@@ -37,15 +51,26 @@ let createEventResultObject = (requestName, eventName, result) => {
         this._requestHandlers.push(new AppsObserverCommentsHandler(app))
      }
 
+     _sendPostMessageToUsrAppInstancesComponents(userAppInstanceId, data, originComponentIdToExclude = null) {
+        let stringObjToSend = JSON.stringify(data)
+         for (const [componentId, instanceWindow] of Object.entries(this._userAppInstances[userAppInstanceId].instances)) {
+             if (originComponentIdToExclude != componentId){
+                 instanceWindow.window.postMessage(stringObjToSend, "*")
+            }
+        }
+     }
+
+     _raiseEventForSpecificUserAppInstance(userAppInstanceId, eventName, data, originComponentIdToExclude = null) {
+        let userAppInstance = this._userAppInstances[userAppInstanceId]
+        if (userAppInstance && userAppInstance.events && userAppInstance.events[eventName]) {
+            let eventObj = createEventResultObject("EvEvent", eventName, data)
+            this._sendPostMessageToUsrAppInstancesComponents(userAppInstanceId, eventObj, originComponentIdToExclude)
+        }
+     }
+
     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, "*")
-                }
-            }
+            this._raiseEventForSpecificUserAppInstance(userAppInstanceId, eventName, data)
         }
     }
 
@@ -61,16 +86,13 @@ let createEventResultObject = (requestName, eventName, result) => {
         this._userAppInstances[userAppInstanceId].events = this._userAppInstances[userAppInstanceId].events || {};
     }
      
-    updateAndNotifyAppInstancesOnSettingsUpdate(userAppInstanceId, data)
+    updateAndNotifyAppInstancesOnSettingsUpdate(userAppInstanceId, data, originComponentId)
     {
         appsDataManager.updateUserAppInstanceSettings(userAppInstanceId, data)
-        if (this._userAppInstances[userAppInstanceId].events['settingsUpdated'])
+        if (this._userAppInstances[userAppInstanceId].events[availableEvents.settingsUpdated])
         {
-            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, "*")
-            }
+            let eventObj = createEventResultObject("EvEvent", availableEvents.settingsUpdated, data)
+            this._sendPostMessageToUsrAppInstancesComponents(userAppInstanceId, eventObj, originComponentId)
         }
      }
       
@@ -78,42 +100,47 @@ let createEventResultObject = (requestName, eventName, result) => {
         
         let requestObj = {};
         try {
-            requestObj = JSON.parse(evt.data);
+            if (typeof evt.data === 'string' || evt.data instanceof String){
+                requestObj = JSON.parse(evt.data);
+            }else{
+                requestObj = evt.data
+            }
         } catch (error) {
-            console.log("xxxx", error)
         }
         
         let result = null
 
-        if (requestObj.request == "updateSettings")
+        if (requestObj.request == availableRequests.updateSettings)
         {
             
             if (this._userAppInstances[requestObj.userAppInstanceId]) {
                 this._eventHandler.publish("updateSettings", requestObj)
-
-                this.updateAndNotifyAppInstancesOnSettingsUpdate(requestObj.userAppInstanceId,  requestObj.data)
-
+                this._eventHandler.publish("updateEverywhere", requestObj)
+                this.updateAndNotifyAppInstancesOnSettingsUpdate(requestObj.userAppInstanceId,  requestObj.data, requestObj.componentId)
             }
         }
-        else if (requestObj.request == "getSettings")
+        else if (requestObj.request == availableRequests.raiseAppMessagingEvent)
         {
-      
             if (this._userAppInstances[requestObj.userAppInstanceId]) {
 
+                this._raiseEventForSpecificUserAppInstance(requestObj.userAppInstanceId, availableEvents.appMessaging, requestObj.data, requestObj.componentId)
+                this._eventHandler.publish("updateEverywhere", requestObj)
+            }
+        }
+        else if (requestObj.request == availableRequests.getSettings)
+        {
+            if (this._userAppInstances[requestObj.userAppInstanceId]) {
                 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, "*")
-
             }
         }
-        else if (requestObj.request == "startLoad")
+        else if (requestObj.request == availableRequests.startLoad)
         {
             this._makeSureAppInstanceExist(requestObj.userAppInstanceId);
             this._userAppInstances[requestObj.userAppInstanceId].instances[requestObj.componentId] = { window: evt.source }
-            return;
+
         }
-        else if (requestObj.request == "loaded")
+        else if (requestObj.request == availableRequests.loaded)
         {
             this._makeSureAppInstanceExist(requestObj.userAppInstanceId);
             
@@ -121,13 +148,13 @@ let createEventResultObject = (requestName, eventName, result) => {
 
             result = this.getAppSettingsForAppInstanceId(requestObj.userAppInstanceId)
         }
-        else if (requestObj.request == "registerEvent")
+        else if (requestObj.request == availableRequests.registerEvent)
         {
             // verify that the app can register to this event
             this._makeSureAppInstanceExist(requestObj.userAppInstanceId);
             this._userAppInstances[requestObj.userAppInstanceId].events[requestObj.data.eventName] = true
         }
-        else if (requestObj.request == "unregisterEvent")
+        else if (requestObj.request == availableRequests.unregisterEvent)
         {
             this._makeSureAppInstanceExist(requestObj.userAppInstanceId);
             delete this._userAppInstances[requestObj.userAppInstanceId].events[requestObj.data.eventName]
@@ -142,9 +169,11 @@ let createEventResultObject = (requestName, eventName, result) => {
             }
 
         }
-        
-        PostMessageManager.respondForPromiseBasedRequest(requestObj, evt.source, evt.origin, result);
-
+         
+        if (requestObj.promisedBased)
+        {
+            PostMessageManager.respondForPromiseBasedRequest(requestObj, evt.source, evt.origin, result);     
+        }
     }
      
      onUserAppComponentUnload(userAppInstanceId, componentId)

package/src/EvmuxAppsApi/EvmuxAppsApi.js

@@ -2,11 +2,14 @@ import PostMessageManager from '../PostMessageManager/PostMessageManager.js'
 
 import EvmuxAppsApiComments from './EvmuxAppsApiComments.js'
 
+import { availableRequests } from '../AppsObserver/AppsObserver.js'
+
 export const availableEvents = {
   settingsUpdated: "settingsUpdated",
   viewerCountChanged: "viewerCountChanged",
   keystroke: "keystroke",
-  comments: "comments"
+  comments: "comments",
+  appMessaging: "appMessaging"
 }
 
 export default class EvmuxAppsApi {
@@ -32,7 +35,7 @@ export default class EvmuxAppsApi {
         this._userAppInstanceId = userAppInstanceId;
         this._componentId = componentId;
 
-        let reqObj = {request: "startLoad", userAppInstanceId: this._userAppInstanceId, componentId: this._componentId}
+        let reqObj = {request: availableRequests.startLoad, userAppInstanceId: this._userAppInstanceId, componentId: this._componentId}
         this._postMessageManager.sendRequest(reqObj);
         
         this.comments = new EvmuxAppsApiComments(this);
@@ -42,7 +45,7 @@ export default class EvmuxAppsApi {
       {
         this._postMessageManager._messagesEventHandlers.subscribe(eventName, callback)
 
-        let reqObj = { request: "registerEvent", userAppInstanceId: this._userAppInstanceId, componentId: this._componentId }
+        let reqObj = { request: availableRequests.registerEvent, userAppInstanceId: this._userAppInstanceId, componentId: this._componentId }
         reqObj.data = {
           eventName
         }
@@ -52,7 +55,7 @@ export default class EvmuxAppsApi {
       async unregisterEvent(eventName, callback)
       {
         this._postMessageManager._messagesEventHandlers.unsubscribe(eventName, callback)
-        let reqObj = { request: "unregisterEvent", userAppInstanceId: this._userAppInstanceId, componentId: this._componentId }
+        let reqObj = { request: availableRequests.unregisterEvent, userAppInstanceId: this._userAppInstanceId, componentId: this._componentId }
         reqObj.data = {
           eventName
         }
@@ -60,20 +63,30 @@ export default class EvmuxAppsApi {
       }
   
       async reportLoaded() {
-        let reqObj = {request: "loaded", userAppInstanceId: this._userAppInstanceId, componentId: this._componentId}
+        let reqObj = {request: availableRequests.loaded, userAppInstanceId: this._userAppInstanceId, componentId: this._componentId}
         return this._postMessageManager.sendRequestAsync(reqObj);
       }
   
       async getSettings() {
-        
-        let reqObj = {request: "getSettings", userAppInstanceId: this._userAppInstanceId, componentId: this._componentId}
+        let reqObj = {request: availableRequests.getSettings, userAppInstanceId: this._userAppInstanceId, componentId: this._componentId}
         return this._postMessageManager.sendRequestAsync(reqObj);
       }
   
+      async raiseAppMessagingEvent(data) {
+        let requestObj = {
+          request: availableRequests.sendAppMessaging,
+          userAppInstanceId: this._userAppInstanceId,
+          componentId: this._componentId,
+          data
+        } 
+
+        return this._postMessageManager.sendRequest(requestObj);
+      }
+  
       async updateSettings(settingsObj) {
         
         let requestObj = {
-          request: "updateSettings",
+          request: availableRequests.updateSettings,
           userAppInstanceId: this._userAppInstanceId,
           componentId: this._componentId,
           data: { ...settingsObj }