update: await 2

Exabyte-io · Apr 4, 2024 · bd188e3 · bd188e3
1 parent e6b6021
commit bd188e3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 16 deletions.
diff --git a/dist/other/iframe-messaging/IframeToFromHostMessageHandler.js b/dist/other/iframe-messaging/IframeToFromHostMessageHandler.js
@@ -6,7 +6,7 @@ class IframeToFromHostMessageHandler {
         this.hostOriginURL = "*";
         // The DOM id of the iframe that is loaded in the host page to send messages from/to
         this.iframeId = "";
-        this.receiveMessage = (event) => {
+        this.receiveMessage = async (event) => {
             if (this.iframeOriginURL !== "*" &&
                 event.origin !== this.iframeOriginURL &&
                 event.origin !== this.hostOriginURL) {
@@ -15,13 +15,23 @@ class IframeToFromHostMessageHandler {
             if (event.data.type === "from-iframe-to-host") {
                 const { action, payload } = event.data;
                 if (this.handlers[action]) {
-                    this.handlers["set-data"].forEach(async (handler) => {
-                        await handler(payload);
-                    });
-                    this.handlers["get-data"].forEach(async (handler) => {
-                        const data = await handler();
-                        this.sendData(data);
-                    });
+                    if (action === "set-data") {
+                        this.handlers["set-data"].forEach((handler) => {
+                            handler(payload);
+                        });
+                    }
+                    if (action === "get-data") {
+                        const handlers = this.handlers["get-data"];
+                        handlers.forEach((handler) => {
+                            handler()
+                                .then((data) => {
+                                this.sendData(data);
+                            })
+                                .catch((error) => {
+                                console.error(`Error in handler for get-data: ${error}`);
+                            });
+                        });
+                    }
                 }
             }
         };

diff --git a/src/other/iframe-messaging/IframeToFromHostMessageHandler.ts b/src/other/iframe-messaging/IframeToFromHostMessageHandler.ts
@@ -35,7 +35,7 @@ class IframeToFromHostMessageHandler {
         this.handlers[action].push(...handlers);
     }
 
-    private receiveMessage = (event: MessageEvent<IframeMessageSchema>) => {
+    private receiveMessage = async (event: MessageEvent<IframeMessageSchema>) => {
         if (
             this.iframeOriginURL !== "*" &&
             event.origin !== this.iframeOriginURL &&
@@ -47,13 +47,24 @@ class IframeToFromHostMessageHandler {
         if (event.data.type === "from-iframe-to-host") {
             const { action, payload } = event.data;
             if (this.handlers[action]) {
-                this.handlers["set-data"].forEach(async (handler) => {
-                    await handler(payload);
-                });
-                this.handlers["get-data"].forEach(async (handler) => {
-                    const data = await handler();
-                    this.sendData(data);
-                });
+                if (action === "set-data") {
+                    this.handlers["set-data"].forEach((handler) => {
+                        handler(payload);
+                    });
+                }
+
+                if (action === "get-data") {
+                    const handlers = this.handlers["get-data"];
+                    handlers.forEach((handler) => {
+                        handler()
+                            .then((data: any) => {
+                                this.sendData(data);
+                            })
+                            .catch((error: any) => {
+                                console.error(`Error in handler for get-data: ${error}`);
+                            });
+                    });
+                }
             }
         }
     };