@btsd/aitu-bridge 0.3.43 → 0.3.44

package/src/index.ts

@@ -191,22 +191,6 @@ const buildBridge = (): AituBridge => {
     window.addEventListener('aituEvents', (e: any) => {
       [...subs].map((fn) => fn.call(null, e));
     })
-
-    window.addEventListener('message', (e) => {
-      if (typeof e.data !== 'string') {
-        return;
-      }
-
-      const message = JSON.parse(e.data)
-
-      if (message && message['method']) {
-        if (message.method === 'setCustomBackArrowOnClickHandler') {
-          (window as any).onAituBridgeBackArrowClick()
-        } else if (message.method === 'setHeaderMenuItemClickHandler') {
-          (window as any).onAituBridgeHeaderMenuItemClick(message.param)
-        }
-      }
-    })
   }
 
   const invoke = (reqId, method, data = {}) => {

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.3.43";
+export const LIB_VERSION = "0.3.44";

package/src/webBridge.ts

@@ -35,7 +35,28 @@ if (aituOrigin) {
     }
     window.addEventListener('message', event => {
         if (event.origin === aituOrigin && event.data) {
+
+            // dispatch aitu events
             window.dispatchEvent(new CustomEvent('aituEvents', { detail: event.data }));
+
+            // try to detect handler call
+            if (typeof event.data !== 'string' || event.data === '') {
+                return;
+            }
+
+            try {
+                const message = JSON.parse(event.data)
+
+                if (message && message['method']) {
+                    if (message.method === 'setCustomBackArrowOnClickHandler') {
+                        (window as any).onAituBridgeBackArrowClick()
+                    } else if (message.method === 'setHeaderMenuItemClickHandler') {
+                        (window as any).onAituBridgeHeaderMenuItemClick(message.param)
+                    }
+                }
+            } catch (e) {
+                console.log('Error parsing message data: ' + e);
+            }
         }
     })
 }