Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

feat: improve MCP capture with timeout, panel content selector, and html2canvas dependency

esengine91fcbfa8cf2b
diff --git a/editor/package.json b/editor/package.json
index 57eb20155..fe55b763e 100644
--- a/editor/package.json
+++ b/editor/package.json
@@ -26,6 +26,7 @@
"dependencies": {
"esbuild-wasm": "^0.27.2",
"esengine": "workspace:*",
+ "html2canvas": "^1.4.1",
"lucide": "^0.563.0"
},
"devDependencies": {
diff --git a/editor/src/bridge/McpBridge.ts b/editor/src/bridge/McpBridge.ts
index db7121de0..f4d51d668 100644
--- a/editor/src/bridge/McpBridge.ts
+++ b/editor/src/bridge/McpBridge.ts
@@ -19,6 +19,7 @@ import { RingBuffer } from './RingBuffer';
import { ENTITY_TEMPLATES } from '../panels/hierarchy/EntityTemplates';
import { resolveUIParent } from '../panels/hierarchy/uiEntityUtils';
import type { Entity } from 'esengine';
+import html2canvas from 'html2canvas';
const LOG_BUFFER_CAPACITY = 500;
@@ -296,8 +297,20 @@ export class McpBridge {
private captureWebGL_(maxWidth?: number, _panel?: string): Promise<unknown> {
const ctx = getSharedRenderContext();
+ const CAPTURE_TIMEOUT_MS = 3000;
return new Promise((resolve, reject) => {
+ let settled = false;
+ const timer = setTimeout(() => {
+ if (settled) return;
+ settled = true;
+ ctx.setPostRenderCallback(null);
+ reject(new Error('WebGL capture timeout: render loop may not be active. Try capturing a DOM panel instead.'));
+ }, CAPTURE_TIMEOUT_MS);
+
ctx.setPostRenderCallback(() => {
+ if (settled) return;
+ settled = true;
+ clearTimeout(timer);
try {
const gl = (ctx as any).gl_ as WebGL2RenderingContext;
const canvas = (ctx as any).webglCanvas_ as HTMLCanvasElement;
@@ -343,16 +356,13 @@ export class McpBridge {
}
private async captureDomPanel_(panelId: string, maxWidth?: number): Promise<unknown> {
- const selector = `[data-panel-id="${panelId}"]`;
- const el = document.querySelector(selector) as HTMLElement | null;
+ const el = document.querySelector(`[data-panel-content="${panelId}"]`) as HTMLElement | null
+ ?? document.querySelector(`[data-panel-id="${panelId}"]`) as HTMLElement | null;
if (!el) throw new Error(`Panel not found: ${panelId}`);
try {
- const modName = 'html2' + 'canvas';
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- const mod = await (Function('m', 'return import(m)') as (m: string) => Promise<any>)(modName);
- const html2canvas = mod.default ?? mod;
- const canvas = await html2canvas(el, {
+ const html2canvasFn = html2canvas;
+ const canvas = await html2canvasFn(el, {
scale: 1,
useCORS: true,
logging: false,
diff --git a/editor/src/dock/DockRegion.ts b/editor/src/dock/DockRegion.ts
index 008d5e598..2cf6039af 100644
--- a/editor/src/dock/DockRegion.ts
+++ b/editor/src/dock/DockRegion.ts
@@ -94,6 +94,7 @@ export class DockRegion {
this.panels_.splice(idx, 0, entry);
entry.contentEl.classList.add('es-dock-panel');
+ entry.contentEl.dataset.panelContent = entry.id;
entry.contentEl.style.display = 'none';
this.contentArea.appendChild(entry.contentEl);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 103f187ef..ae9584b06 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -69,6 +69,9 @@ importers:
esengine:
specifier: workspace:*
version: link:../sdk
+ html2canvas:
+ specifier: ^1.4.1
+ version: 1.4.1
lucide:
specifier: ^0.563.0
version: 0.563.0
@@ -923,6 +926,10 @@ packages:
resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
engines: {node: 18 || 20 || >=22}
+ resolution: {integrity: sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==}
+ engines: {node: '>= 0.6.0'}
+
resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
engines: {node: '>=8'}
@@ -995,6 +1002,9 @@ packages:
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
engines: {node: '>= 8'}
+ resolution: {integrity: sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==}
+
resolution: {integrity: sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==}
engines: {node: '>=18'}
@@ -1189,6 +1199,10 @@ packages:
resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+ resolution: {integrity: sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==}
+ engines: {node: '>=8.0.0'}
+
resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
engines: {node: '>= 14'}
@@ -1540,6 +1554,9 @@ packages:
resolution: {integrity: sha512-u9E6A+ZDYdp7a4WnarkXPZOx8Ilz46+kby6p1yZ8zsGTz9gYa6FIS7lj2oezzNKmtdyyJNNmmXDppga5GB7kSw==}
engines: {node: '>=18'}
+ resolution: {integrity: sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==}
+
resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
@@ -1596,6 +1613,9 @@ packages:
resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
+ resolution: {integrity: sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==}
+
resolution: {integrity: sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -2291,6 +2311,8 @@ snapshots:
+
@@ -2364,6 +2386,10 @@ snapshots:
shebang-command: 2.0.0
which: 2.0.2
+ dependencies:
+ utrie: 1.0.2
+
dependencies:
'@asamuzakjp/css-color': 3.2.0
@@ -2589,6 +2615,11 @@ snapshots:
+ dependencies:
+ css-line-break: 2.1.0
+ text-segmentation: 1.0.3
+
dependencies:
agent-base: 7.1.4
@@ -2961,6 +2992,10 @@ snapshots:
glob: 10.5.0
minimatch: 10.2.4
+ dependencies:
+ utrie: 1.0.2
+
@@ -3002,6 +3037,10 @@ snapshots:
+ dependencies:
+ base64-arraybuffer: 1.0.2
+
dependencies:
cac: 6.7.14