unreal-toolkit-next 0.1.8 → 0.1.12

package/README.md

@@ -16,3 +16,14 @@ npm install unreal-toolkit-next
 ```javascript
 import UnrealToolkit from 'unreal-toolkit';
 ```
+
+* Unreal Toolkit Message Bus Usage
+```typescript
+// Post window message
+UnrealToolkit.EventBus.PostWindowMessage("myevent", ["Hello World!"]);
+
+// Handle window message
+UnrealToolkit.EventBus.OnWindowMessage("myevent", (args:string[]) => {
+   console.log("My Event Args: ", args);
+});
+```

package/dist/index.d.ts

@@ -8,13 +8,13 @@ export declare class UnrealToolkit {
     /** Unreal Toolkit event message bus
      * @example
      * ```typescript
-     * // Handle myevent message
-     * UnrealToolkit.EventBus.OnMessage("myevent", (data:string) => {
-     *    console.log("My Event Data: " + data);
-     * });
+     * // Post myevent window message
+     * UnrealToolkit.EventBus.PostWindowMessage("myevent", ["Hello World!"]);
      *
-     * // Post myevent message
-     * UnrealToolkit.EventBus.PostMessage("myevent", "Hello World!");
+     * // Handle myevent window message
+     * UnrealToolkit.EventBus.OnWindowMessage("myevent", (args:string[]) => {
+     *    console.log("My Event Args: ", args);
+     * });
      * ```
     */
     static get EventBus(): UnrealMessageBus;
@@ -24,29 +24,27 @@ export declare class UnrealToolkit {
  * @class UnrealMessageBus - All rights reserved (c) 2024 Mackey Kinard
  */
 export declare class UnrealMessageBus {
-    /** Unreal Message Bus API Key */
-    static ApiKey: string;
+    static AllowedOrigin: string;
+    static TargetOrigin: string;
     constructor();
-    /** Handle event bus message
-     * @param message The message to handle
-     * @param data The data to handle
+    /** Post event bus message
+     * @param name The message to post
+     * @param args The args to post
      * @returns void
      */
-    OnMessage(message: string, handler: (data: string) => void): void;
-    /** Post event bus message
-     * @param message The message to post
-     * @param data The data to post
-     * @param target The target to post
-     * @param transfer The transfer to post
+    PostWindowMessage(name: string, args?: string[]): void;
+    /** Handle event bus message
+     * @param name The name to handle
+     * @param args The args to handle
      * @returns void
      */
-    PostMessage(message: string, data?: string): void;
+    OnWindowMessage(name: string, handler: (args: string[]) => void): void;
     /** Remove event bus message handler
      * @param message The message to remove
      * @param handler The handler to remove
      * @returns void
      */
-    RemoveHandler(message: string, handler: (data: string) => void): void;
+    RemoveHandler(message: string, handler: (args: string[]) => void): void;
     /** Clear and reset all event bus message handlers
      * @returns void
      */
@@ -61,8 +59,8 @@ export declare class UnrealMessageBus {
      */
     private HandleWindowMessage;
     /** Dispatch internal event bus message
-     * @param message The message to dispatch
-     * @param data The data to dispatch
+     * @param name The name to dispatch
+     * @param args The args to dispatch
      * @returns void
      */
     private OnDispatchMessage;

package/dist/index.js

@@ -7,13 +7,13 @@ export class UnrealToolkit {
     /** Unreal Toolkit event message bus
      * @example
      * ```typescript
-     * // Handle myevent message
-     * UnrealToolkit.EventBus.OnMessage("myevent", (data:string) => {
-     *    console.log("My Event Data: " + data);
-     * });
+     * // Post myevent window message
+     * UnrealToolkit.EventBus.PostWindowMessage("myevent", ["Hello World!"]);
      *
-     * // Post myevent message
-     * UnrealToolkit.EventBus.PostMessage("myevent", "Hello World!");
+     * // Handle myevent window message
+     * UnrealToolkit.EventBus.OnWindowMessage("myevent", (args:string[]) => {
+     *    console.log("My Event Args: ", args);
+     * });
      * ```
     */
     static get EventBus() {
@@ -30,45 +30,40 @@ UnrealToolkit._EventBus = null;
 export class UnrealMessageBus {
     constructor() {
         this.ListenerDictionary = {};
-        if (window && window.top) {
-            this.HandleWindowMessage = this.HandleWindowMessage.bind(this);
-            window.top.addEventListener("message", this.HandleWindowMessage);
+        this.HandleWindowMessage = this.HandleWindowMessage.bind(this);
+        window.top.addEventListener("message", this.HandleWindowMessage);
+    }
+    /** Post event bus message
+     * @param name The message to post
+     * @param args The args to post
+     * @returns void
+     */
+    PostWindowMessage(name, args) {
+        try {
+            window.top.postMessage({ source: "unrealtoolkit", message: name, args: args }, UnrealMessageBus.TargetOrigin);
         }
-        else {
-            console.warn("UnrealMessageBus: No Top Window Available");
+        catch (e) {
+            console.warn(e);
         }
     }
     /** Handle event bus message
-     * @param message The message to handle
-     * @param data The data to handle
+     * @param name The name to handle
+     * @param args The args to handle
      * @returns void
      */
-    OnMessage(message, handler) {
+    OnWindowMessage(name, handler) {
         let listeners;
-        if (this.ListenerDictionary[message] == null) {
+        if (this.ListenerDictionary[name] == null) {
             listeners = [];
-            this.ListenerDictionary[message] = listeners;
+            this.ListenerDictionary[name] = listeners;
         }
         else {
-            listeners = this.ListenerDictionary[message];
+            listeners = this.ListenerDictionary[name];
         }
         const index = listeners.findIndex((e) => { return handler == e; });
         if (index < 0)
             listeners.push(handler);
     }
-    /** Post event bus message
-     * @param message The message to post
-     * @param data The data to post
-     * @param target The target to post
-     * @param transfer The transfer to post
-     * @returns void
-     */
-    PostMessage(message, data) {
-        if (window && window.top)
-            window.top.postMessage({ source: "unrealmessagebus", message: message, data: data, key: UnrealMessageBus.ApiKey });
-        else
-            console.warn("UnrealMessageBus: No Top Window Available");
-    }
     /** Remove event bus message handler
      * @param message The message to remove
      * @param handler The handler to remove
@@ -93,43 +88,46 @@ export class UnrealMessageBus {
      */
     Dispose() {
         this.ResetHandlers();
-        if (window && window.top)
-            window.top.removeEventListener("message", this.HandleWindowMessage);
+        window.top.removeEventListener("message", this.HandleWindowMessage);
     }
     /** Handle window message event
      * @param event The message event to handle
      * @returns void
      */
     HandleWindowMessage(event) {
-        if (event != null && event.data != null && event.data.message != null && event.data.source != null && event.data.source == "unrealmessagebus") {
-            const apiKeyRequired = (UnrealMessageBus.ApiKey != null && UnrealMessageBus.ApiKey !== "");
-            if (apiKeyRequired === true && (event.data.key == null || event.data.key === "" || event.data.key != UnrealMessageBus.ApiKey)) {
-                console.warn("UnrealMessageBus: Missing Or Invalid API Key");
+        if (event == null || event.origin == null || event.data == null || event.data.source == null || event.data.message == null)
+            return;
+        try {
+            if (UnrealMessageBus.AllowedOrigin != null && UnrealMessageBus.AllowedOrigin !== "" && UnrealMessageBus.AllowedOrigin !== "*" && event.origin !== UnrealMessageBus.AllowedOrigin) {
+                console.warn("UnrealMessageBus: Invalid Origin: " + event.origin);
                 return;
             }
-            this.OnDispatchMessage(event.data.message, (event.data.data != null) ? event.data.data : null);
+            this.OnDispatchMessage(event.data.message, (event.data.args != null) ? event.data.args : null);
+        }
+        catch (e) {
+            console.warn(e);
         }
     }
     /** Dispatch internal event bus message
-     * @param message The message to dispatch
-     * @param data The data to dispatch
+     * @param name The name to dispatch
+     * @param args The args to dispatch
      * @returns void
      */
-    OnDispatchMessage(message, data = null) {
-        const listeners = this.ListenerDictionary[message];
+    OnDispatchMessage(name, args = null) {
+        const listeners = this.ListenerDictionary[name];
         if (listeners == null)
             return;
         listeners.forEach((listener) => { try {
             if (listener)
-                listener(data);
+                listener(args);
         }
         catch (e) {
             console.warn(e);
         } });
     }
 }
-/** Unreal Message Bus API Key */
-UnrealMessageBus.ApiKey = null;
+UnrealMessageBus.AllowedOrigin = "*";
+UnrealMessageBus.TargetOrigin = "*";
 /** Unreal Toolkit Runtime Module */
 console.log("Unreal Toolkit Runtime - Version 0.1.8");
 export default UnrealToolkit;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "unreal-toolkit-next",
-    "version": "0.1.8",
+    "version": "0.1.12",
     "description": "Unreal Toolkit Runtime Library (ES6)",
     "module": "dist/index.js",
     "types": "dist/index.d.ts",