[bug] make MessageBus more reliable

This commit is contained in:
Sosthene 2025-07-15 21:18:44 +02:00
parent b7f725bcfd
commit bd4c9205d9

View File

@ -759,17 +759,15 @@ export default class MessageBus {
} }
private sendMessage(message: any): void { private sendMessage(message: any): void {
const targetOrigin = IframeReference.getTargetOrigin(); this.isReady().then(() => {
if (!targetOrigin) { try {
console.error('[MessageBus] sendMessage: targetOrigin not found'); const targetOrigin = IframeReference.getTargetOrigin();
return; const iframe = IframeReference.getIframe();
} iframe.contentWindow?.postMessage(message, targetOrigin);
const iframe = IframeReference.getIframe(); } catch (error) {
if (!iframe) { console.error('[MessageBus] sendMessage: error', error);
console.error('[MessageBus] sendMessage: iframe not found'); }
return; }).catch(console.error);
}
iframe.contentWindow?.postMessage(message, targetOrigin);
} }
private handleMessage(event: MessageEvent): void { private handleMessage(event: MessageEvent): void {
@ -777,30 +775,25 @@ export default class MessageBus {
return; return;
} }
const iframe = IframeReference.getIframe(); try {
if (!iframe) { const iframe = IframeReference.getIframe();
console.error('[MessageBus] handleMessage: iframe not found');
return;
}
if (event.source !== iframe.contentWindow) { if (event.source !== iframe.contentWindow) {
console.error('[MessageBus] handleMessage: source not match'); console.error('[MessageBus] handleMessage: source not match');
return; return;
} }
const targetOrigin = IframeReference.getTargetOrigin(); const targetOrigin = IframeReference.getTargetOrigin();
if (!targetOrigin) {
console.error('[MessageBus] handleMessage: targetOrigin not found');
return;
}
if (event.origin !== targetOrigin) { if (event.origin !== targetOrigin) {
console.error('[MessageBus] handleMessage: origin not match'); throw new Error('origin not match');
return; }
}
if (!event.data || typeof event.data !== 'object') { if (!event.data || typeof event.data !== 'object') {
console.error('[MessageBus] handleMessage: data not found'); throw new Error('data not found');
}
} catch (error) {
console.error('[MessageBus] handleMessage:', error);
return; return;
} }