Skip to content

fix: prevent broken script execution in widget iframe #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GeneralJerel merged 3 commits into from
Mar 25, 2026
Merged

fix: prevent broken script execution in widget iframe #46

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a44c0d5
fix: pass DOM node instead of innerHTML string to Idiomorph.morph
GeneralJerel Mar 24, 2026
a5890e2
fix: prevent broken script execution during streaming in widget iframe
GeneralJerel Mar 25, 2026
67d5753
fix: log script execution errors instead of silently swallowing them
GeneralJerel Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions apps/app/src/components/generative-ui/widget-renderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,13 @@ window.addEventListener('message', function(e) {
if (!content) return;

// Strip script tags from HTML before inserting — scripts are handled separately below
var rawHtml = e.data.html;
var tmp = document.createElement('div');
tmp.innerHTML = e.data.html;
tmp.innerHTML = rawHtml;
var incomingScripts = [];
var scriptOpens = (rawHtml.match(/<script[\\s>]/gi) || []).length;
var scriptCloses = (rawHtml.match(/<\\/script>/gi) || []).length;
var allScriptsClosed = scriptOpens <= scriptCloses;
tmp.querySelectorAll('script').forEach(function(s) {
incomingScripts.push({ src: s.src, text: s.textContent });
s.remove();
Expand All @@ -388,7 +392,7 @@ window.addEventListener('message', function(e) {
// Use idiomorph to diff/patch DOM (preserves existing nodes, no flicker)
if (window.Idiomorph) {
try {
Idiomorph.morph(content, tmp.innerHTML, {
Idiomorph.morph(content, tmp, {
morphStyle: 'innerHTML',
callbacks: {
beforeNodeAdded: function(node) {
Expand All @@ -410,19 +414,25 @@ window.addEventListener('message', function(e) {
content.innerHTML = tmp.innerHTML;
}

// Execute only new scripts (not previously executed)
incomingScripts.forEach(function(scriptInfo) {
var key = scriptInfo.src || scriptInfo.text;
if (content.getAttribute('data-exec-' + btoa(key).slice(0, 16))) return;
content.setAttribute('data-exec-' + btoa(key).slice(0, 16), '1');
var newScript = document.createElement('script');
if (scriptInfo.src) {
newScript.src = scriptInfo.src;
} else {
newScript.textContent = scriptInfo.text;
}
content.appendChild(newScript);
});
// Execute only new scripts — skip entirely while a <script> tag is still streaming
if (allScriptsClosed) {
incomingScripts.forEach(function(scriptInfo) {
var key = scriptInfo.src || scriptInfo.text;
if (!key || !key.trim()) return;
var hash = btoa(unescape(encodeURIComponent(key))).slice(0, 16).replace(/[^a-zA-Z0-9]/g, '');
if (!hash || content.getAttribute('data-exec-' + hash)) return;
content.setAttribute('data-exec-' + hash, '1');
try {
var newScript = document.createElement('script');
if (scriptInfo.src) {
newScript.src = scriptInfo.src;
} else {
newScript.textContent = scriptInfo.text;
}
content.appendChild(newScript);
} catch(e) { console.warn('[widget] script exec failed:', e); }
});
}
reportHeight();
}
});
Expand Down
Loading