From a5877be0e859f7c776ed3ce03c457064bc506bdd Mon Sep 17 00:00:00 2001 From: Samuel Imolorhe Date: Sun, 20 Jul 2025 05:31:45 +0200 Subject: [PATCH] dump --- .../services/pre-request/evaluator-client.factory.ts | 9 +++++---- .../altair-core/src/script/evaluator-worker-engine.ts | 5 ++++- packages/altair-core/src/script/events.ts | 1 + packages/altair-iframe-sandbox/src/evaluator.frame.ts | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/altair-app/src/app/modules/altair/services/pre-request/evaluator-client.factory.ts b/packages/altair-app/src/app/modules/altair/services/pre-request/evaluator-client.factory.ts index cc822873f2..109a80285c 100644 --- a/packages/altair-app/src/app/modules/altair/services/pre-request/evaluator-client.factory.ts +++ b/packages/altair-app/src/app/modules/altair/services/pre-request/evaluator-client.factory.ts @@ -39,9 +39,9 @@ export class EvaluatorFrameClient extends ScriptEvaluatorClient { handler: (type: T, e: ScriptEventData) => void ): void { const listener = (e: MessageEvent>) => { - if (e.origin !== new URL(this.sandboxUrl).origin) { - return; - } + // if (e.origin !== new URL(this.sandboxUrl).origin) { + // return; + // } const event = e.data; // Handle script events @@ -57,7 +57,8 @@ export class EvaluatorFrameClient extends ScriptEvaluatorClient { } send(type: string, payload: any): void { this.iframe.addEventListener('load', () => { - this.iframe.contentWindow?.postMessage({ type, payload }, this.sandboxUrl); + console.log('Sending message to iframe', type, payload, this.sandboxUrl); + this.iframe.contentWindow?.postMessage({ type, payload }, '*'); }); } onError(handler: (err: any) => void): void { diff --git a/packages/altair-core/src/script/evaluator-worker-engine.ts b/packages/altair-core/src/script/evaluator-worker-engine.ts index 54e6fcbd07..f4b642f643 100644 --- a/packages/altair-core/src/script/evaluator-worker-engine.ts +++ b/packages/altair-core/src/script/evaluator-worker-engine.ts @@ -1,6 +1,6 @@ import { v4 as uuid } from 'uuid'; import { ScriptEvaluatorClientEngine } from './evaluator-client-engine'; -import { SCRIPT_INIT_EXECUTE } from './events'; +import { SCRIPT_INIT_EXECUTE, SCRIPT_READY } from './events'; import { AllScriptEventHandlers, ScriptContextData, @@ -22,7 +22,10 @@ export class ScriptEvaluatorWorkerEngine { constructor(private worker: ScriptEvaluatorWorker) {} start() { + console.log('ScriptEvaluatorWorkerEngine started'); + // this.worker.send(SCRIPT_READY, {}); this.worker.onMessage(async (e) => { + console.log('ScriptEvaluatorWorkerEngine received message', e); switch (e.type) { case SCRIPT_INIT_EXECUTE: try { diff --git a/packages/altair-core/src/script/events.ts b/packages/altair-core/src/script/events.ts index e05bff30f4..e388b370c8 100644 --- a/packages/altair-core/src/script/events.ts +++ b/packages/altair-core/src/script/events.ts @@ -1,6 +1,7 @@ import { ScriptEvent, ScriptResponseEvent } from './types'; export const SCRIPT_INIT_EXECUTE = 'init_execute'; +export const SCRIPT_READY = 'ready'; export const getResponseEvent = ( type: T diff --git a/packages/altair-iframe-sandbox/src/evaluator.frame.ts b/packages/altair-iframe-sandbox/src/evaluator.frame.ts index 81d4f0dd97..663a47665c 100644 --- a/packages/altair-iframe-sandbox/src/evaluator.frame.ts +++ b/packages/altair-iframe-sandbox/src/evaluator.frame.ts @@ -19,10 +19,15 @@ export class EvaluatorFrameWorker extends ScriptEvaluatorWorker { } onMessage(handler: (e: ScriptWorkerMessageData) => void): void { + console.log(`Setting up message listener for origin: ${this.origin}`); window.addEventListener('message', (e) => { if (e.origin !== this.origin) { + console.warn( + `Message received from an unknown origin: ${e.origin}. Expected: ${this.origin}` + ); return; } + console.log('Message received in EvaluatorFrameWorker:', e.data); handler(e.data); }); }