From 8b9fefa4a2ff01ac2d939e1f95b64f7c1dc1ef4e Mon Sep 17 00:00:00 2001 From: velzie Date: Thu, 25 Sep 2025 14:11:34 -0400 Subject: [PATCH] fix puterjs throwing errors after consuming message events not meant for it (#1612) --- src/puter-js/src/modules/UI.js | 1 + src/puter-js/src/services/XDIncoming.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/puter-js/src/modules/UI.js b/src/puter-js/src/modules/UI.js index d302de15..42bdc822 100644 --- a/src/puter-js/src/modules/UI.js +++ b/src/puter-js/src/modules/UI.js @@ -275,6 +275,7 @@ class UI extends EventListener { // Bind the message event listener to the window let lastDraggedOverElement = null; (globalThis.document) && window.addEventListener('message', async (e) => { + if (!e.data) return; // `error` if(e.data.error){ throw e.data.error; diff --git a/src/puter-js/src/services/XDIncoming.js b/src/puter-js/src/services/XDIncoming.js index 10803192..5502e739 100644 --- a/src/puter-js/src/services/XDIncoming.js +++ b/src/puter-js/src/services/XDIncoming.js @@ -20,7 +20,7 @@ export class XDIncomingService extends putility.concepts.Service { } const data = event.data; - + if ( ! data ) return; const tag = data.$; if ( ! tag ) return; if ( ! this.tagged_listeners_[tag] ) return;