@cyanheads/pixoo-mcp-server 1.1.3 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. package/AGENTS.md +19 -13
  2. package/CLAUDE.md +19 -13
  3. package/README.md +16 -14
  4. package/changelog/1.1.x/1.1.4.md +22 -0
  5. package/changelog/1.2.x/1.2.0.md +28 -0
  6. package/dist/mcp-server/resources/definitions/pixoo-design-guide.resource.d.ts.map +1 -1
  7. package/dist/mcp-server/resources/definitions/pixoo-design-guide.resource.js +1 -0
  8. package/dist/mcp-server/resources/definitions/pixoo-design-guide.resource.js.map +1 -1
  9. package/dist/mcp-server/tools/definitions/pixoo-compose-scene.tool.d.ts +6 -0
  10. package/dist/mcp-server/tools/definitions/pixoo-compose-scene.tool.d.ts.map +1 -1
  11. package/dist/mcp-server/tools/definitions/pixoo-compose-scene.tool.js +32 -41
  12. package/dist/mcp-server/tools/definitions/pixoo-compose-scene.tool.js.map +1 -1
  13. package/dist/mcp-server/tools/definitions/pixoo-control-device.tool.d.ts +3 -1
  14. package/dist/mcp-server/tools/definitions/pixoo-control-device.tool.d.ts.map +1 -1
  15. package/dist/mcp-server/tools/definitions/pixoo-control-device.tool.js +20 -20
  16. package/dist/mcp-server/tools/definitions/pixoo-control-device.tool.js.map +1 -1
  17. package/dist/mcp-server/tools/definitions/pixoo-design-brief.tool.d.ts +3 -3
  18. package/dist/mcp-server/tools/definitions/pixoo-design-brief.tool.d.ts.map +1 -1
  19. package/dist/mcp-server/tools/definitions/pixoo-design-brief.tool.js +56 -44
  20. package/dist/mcp-server/tools/definitions/pixoo-design-brief.tool.js.map +1 -1
  21. package/dist/mcp-server/tools/definitions/pixoo-display-text.tool.d.ts +7 -0
  22. package/dist/mcp-server/tools/definitions/pixoo-display-text.tool.d.ts.map +1 -1
  23. package/dist/mcp-server/tools/definitions/pixoo-display-text.tool.js +128 -32
  24. package/dist/mcp-server/tools/definitions/pixoo-display-text.tool.js.map +1 -1
  25. package/dist/mcp-server/tools/definitions/pixoo-overlay-text.tool.d.ts +5 -0
  26. package/dist/mcp-server/tools/definitions/pixoo-overlay-text.tool.d.ts.map +1 -1
  27. package/dist/mcp-server/tools/definitions/pixoo-overlay-text.tool.js +38 -13
  28. package/dist/mcp-server/tools/definitions/pixoo-overlay-text.tool.js.map +1 -1
  29. package/dist/mcp-server/tools/definitions/pixoo-push-image.tool.d.ts +6 -0
  30. package/dist/mcp-server/tools/definitions/pixoo-push-image.tool.d.ts.map +1 -1
  31. package/dist/mcp-server/tools/definitions/pixoo-push-image.tool.js +16 -8
  32. package/dist/mcp-server/tools/definitions/pixoo-push-image.tool.js.map +1 -1
  33. package/dist/mcp-server/tools/device-push.d.ts +24 -0
  34. package/dist/mcp-server/tools/device-push.d.ts.map +1 -0
  35. package/dist/mcp-server/tools/device-push.js +50 -0
  36. package/dist/mcp-server/tools/device-push.js.map +1 -0
  37. package/dist/renderer/preview.d.ts +17 -19
  38. package/dist/renderer/preview.d.ts.map +1 -1
  39. package/dist/renderer/preview.js +55 -34
  40. package/dist/renderer/preview.js.map +1 -1
  41. package/dist/renderer/remote-image.d.ts +6 -2
  42. package/dist/renderer/remote-image.d.ts.map +1 -1
  43. package/dist/renderer/remote-image.js +31 -7
  44. package/dist/renderer/remote-image.js.map +1 -1
  45. package/dist/renderer/scene-renderer.d.ts +14 -9
  46. package/dist/renderer/scene-renderer.d.ts.map +1 -1
  47. package/dist/renderer/scene-renderer.js +51 -30
  48. package/dist/renderer/scene-renderer.js.map +1 -1
  49. package/dist/renderer/text-engine.d.ts +14 -1
  50. package/dist/renderer/text-engine.d.ts.map +1 -1
  51. package/dist/renderer/text-engine.js +22 -4
  52. package/dist/renderer/text-engine.js.map +1 -1
  53. package/dist/services/pixoo/pixoo-service.d.ts +14 -1
  54. package/dist/services/pixoo/pixoo-service.d.ts.map +1 -1
  55. package/dist/services/pixoo/pixoo-service.js +39 -16
  56. package/dist/services/pixoo/pixoo-service.js.map +1 -1
  57. package/package.json +1 -1
  58. package/server.json +3 -3
@@ -0,0 +1,24 @@
1
+ /**
2
+ * @fileoverview The post-render push path shared by the three push tools: keep the
3
+ * rendered preview when a push fails, and flag a successful push the panel won't show.
4
+ * @module mcp-server/tools/device-push
5
+ */
6
+ import { type PreviewWriter } from '../../renderer/preview.js';
7
+ import type { DeviceStateSnapshot } from '../../services/pixoo/pixoo-service.js';
8
+ /** Brightness at or below this reads as dark on the panel. */
9
+ export declare const DIM_BRIGHTNESS = 10;
10
+ /**
11
+ * Run a device push. A failed push rethrows its typed error — code, `reason`,
12
+ * `retryable`, and recovery hint untouched — with the preview's path added as
13
+ * `data.outputFiles` and named in the message: the files this call already saved, or
14
+ * a copy written under the OS temp dir when it saved none. Error results carry no
15
+ * `ctx.content` blocks, so the file is how the render outlives the failure.
16
+ */
17
+ export declare function pushKeepingPreview(push: () => Promise<DeviceStateSnapshot>, savedFiles: string[], writePreview: PreviewWriter): Promise<DeviceStateSnapshot>;
18
+ /**
19
+ * Name every reason a pushed render may not show on the panel, each with the call
20
+ * that fixes it. Undefined when the device reads as visible, or when the read-back
21
+ * never reached it and there is nothing to judge.
22
+ */
23
+ export declare function visibilityNotice(state: DeviceStateSnapshot): string | undefined;
24
+ //# sourceMappingURL=device-push.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"device-push.d.ts","sourceRoot":"","sources":["../../../src/mcp-server/tools/device-push.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,KAAK,aAAa,EAAmB,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAE7E,8DAA8D;AAC9D,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,EACxC,UAAU,EAAE,MAAM,EAAE,EACpB,YAAY,EAAE,aAAa,GAC1B,OAAO,CAAC,mBAAmB,CAAC,CAa9B;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,mBAAmB,GAAG,MAAM,GAAG,SAAS,CAgB/E"}
@@ -0,0 +1,50 @@
1
+ /**
2
+ * @fileoverview The post-render push path shared by the three push tools: keep the
3
+ * rendered preview when a push fails, and flag a successful push the panel won't show.
4
+ * @module mcp-server/tools/device-push
5
+ */
6
+ import { McpError } from '@cyanheads/mcp-ts-core/errors';
7
+ import { saveTempPreview } from '../../renderer/preview.js';
8
+ /** Brightness at or below this reads as dark on the panel. */
9
+ export const DIM_BRIGHTNESS = 10;
10
+ /**
11
+ * Run a device push. A failed push rethrows its typed error — code, `reason`,
12
+ * `retryable`, and recovery hint untouched — with the preview's path added as
13
+ * `data.outputFiles` and named in the message: the files this call already saved, or
14
+ * a copy written under the OS temp dir when it saved none. Error results carry no
15
+ * `ctx.content` blocks, so the file is how the render outlives the failure.
16
+ */
17
+ export async function pushKeepingPreview(push, savedFiles, writePreview) {
18
+ try {
19
+ return await push();
20
+ }
21
+ catch (err) {
22
+ if (!(err instanceof McpError))
23
+ throw err;
24
+ const outputFiles = savedFiles.length > 0 ? savedFiles : [await saveTempPreview(writePreview)];
25
+ throw new McpError(err.code, `${err.message.replace(/[^.!?]$/, '$&.')} Rendered preview saved to ${outputFiles.join(', ')}.`, { ...err.data, outputFiles }, { cause: err });
26
+ }
27
+ }
28
+ /**
29
+ * Name every reason a pushed render may not show on the panel, each with the call
30
+ * that fixes it. Undefined when the device reads as visible, or when the read-back
31
+ * never reached it and there is nothing to judge.
32
+ */
33
+ export function visibilityNotice(state) {
34
+ if (!state.reachable)
35
+ return;
36
+ const problems = [];
37
+ if (state.screenOn === false) {
38
+ problems.push('the screen is off (pixoo_control_device with screen: "on")');
39
+ }
40
+ if (state.brightness !== undefined && state.brightness <= DIM_BRIGHTNESS) {
41
+ problems.push(`brightness is ${state.brightness} (pixoo_control_device with brightness: 80)`);
42
+ }
43
+ if (state.channel !== undefined && state.channel !== 'custom') {
44
+ problems.push(`the device is on the ${state.channel} channel (pixoo_control_device with channel: "custom")`);
45
+ }
46
+ if (problems.length === 0)
47
+ return;
48
+ return `Pushed, but the render may not be visible: ${problems.join('; ')}.`;
49
+ }
50
+ //# sourceMappingURL=device-push.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"device-push.js","sourceRoot":"","sources":["../../../src/mcp-server/tools/device-push.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAsB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG5E,8DAA8D;AAC9D,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAC;AAEjC;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAwC,EACxC,UAAoB,EACpB,YAA2B;IAE3B,IAAI,CAAC;QACH,OAAO,MAAM,IAAI,EAAE,CAAC;IACtB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,CAAC,GAAG,YAAY,QAAQ,CAAC;YAAE,MAAM,GAAG,CAAC;QAC1C,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;QAC/F,MAAM,IAAI,QAAQ,CAChB,GAAG,CAAC,IAAI,EACR,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,8BAA8B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAC/F,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,EAC5B,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAA0B;IACzD,IAAI,CAAC,KAAK,CAAC,SAAS;QAAE,OAAO;IAC7B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC7B,QAAQ,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,IAAI,cAAc,EAAE,CAAC;QACzE,QAAQ,CAAC,IAAI,CAAC,iBAAiB,KAAK,CAAC,UAAU,6CAA6C,CAAC,CAAC;IAChG,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC9D,QAAQ,CAAC,IAAI,CACX,wBAAwB,KAAK,CAAC,OAAO,wDAAwD,CAC9F,CAAC;IACJ,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAClC,OAAO,8CAA8C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AAC9E,CAAC"}
@@ -1,5 +1,6 @@
1
1
  /**
2
- * @fileoverview Preview encoding utilities: PNG content blocks, contact sheets, GIF saving.
2
+ * @fileoverview Preview encoding utilities: PNG content blocks, contact sheets, and the
3
+ * PNG/GIF preview files written to PIXOO_OUTPUT_DIR or a temp directory.
3
4
  * @module renderer/preview
4
5
  */
5
6
  import { Canvas } from '@cyanheads/pixoo-toolkit';
@@ -9,26 +10,23 @@ export interface ImageContentBlock {
9
10
  mimeType: 'image/png' | 'image/gif';
10
11
  type: 'image';
11
12
  }
12
- /** Output files record. */
13
- export interface OutputFiles {
14
- gif?: string;
15
- preview?: string;
16
- }
13
+ /** Writes a render's preview file into `dir` and resolves to the file's path. */
14
+ export type PreviewWriter = (dir: string) => Promise<string>;
17
15
  /** Encode a single canvas as a base64 PNG content block (8× upscaled → 512px). */
18
16
  export declare function encodePreviewBlock(canvas: Canvas): ImageContentBlock;
19
17
  /**
20
- * Build a contact-sheet preview from animation frames.
21
- * Returns the middle frame encoded as a PNG (works universally across MCP clients).
22
- */
23
- export declare function buildContactSheet(frames: Canvas[]): ImageContentBlock;
24
- /**
25
- * Optionally save a preview PNG to PIXOO_OUTPUT_DIR.
26
- * Returns the saved path, or undefined if no output dir is configured.
27
- */
28
- export declare function savePngPreview(canvas: Canvas, baseName: string): Promise<string | undefined>;
29
- /**
30
- * Optionally save an animation GIF to PIXOO_OUTPUT_DIR.
31
- * Returns the saved path, or undefined if no output dir is configured.
18
+ * Build a contact-sheet preview: every frame, in order, tiled left-to-right and
19
+ * top-to-bottom in a `ceil(sqrt(n))`-column grid, each tile an integer upscale that
20
+ * keeps the sheet within the 512px preview budget. A single frame encodes exactly as
21
+ * {@link encodePreviewBlock} does.
32
22
  */
33
- export declare function saveGifPreview(frames: Canvas[], speed: number, baseName: string): Promise<string | undefined>;
23
+ export declare function buildContactSheet(frames: Canvas[]): Promise<ImageContentBlock>;
24
+ /** Save a canvas as an 8× upscaled PNG in `dir`; returns the saved path. */
25
+ export declare function savePngPreview(canvas: Canvas, dir: string, baseName: string): Promise<string>;
26
+ /** Save animation frames as an 8× upscaled GIF in `dir`; returns the saved path. */
27
+ export declare function saveGifPreview(frames: Canvas[], speed: number, dir: string, baseName: string): Promise<string>;
28
+ /** Write the preview into PIXOO_OUTPUT_DIR when one is configured; returns the paths written. */
29
+ export declare function autoSavePreview(write: PreviewWriter): Promise<string[]>;
30
+ /** Write the preview into a fresh directory under the OS temp dir; returns its path. */
31
+ export declare function saveTempPreview(write: PreviewWriter): Promise<string>;
34
32
  //# sourceMappingURL=preview.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/renderer/preview.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,MAAM,EAAiC,MAAM,0BAA0B,CAAC;AAGjF,+BAA+B;AAC/B,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,WAAW,GAAG,WAAW,CAAC;IACpC,IAAI,EAAE,OAAO,CAAC;CACf;AAED,2BAA2B;AAC3B,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,kFAAkF;AAClF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAIpE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAiB,CASrE;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7B;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAO7B"}
1
+ {"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/renderer/preview.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,MAAM,EAA0C,MAAM,0BAA0B,CAAC;AAG1F,+BAA+B;AAC/B,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,WAAW,GAAG,WAAW,CAAC;IACpC,IAAI,EAAE,OAAO,CAAC;CACf;AAED,iFAAiF;AACjF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAS7D,kFAAkF;AAClF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAIpE;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA+BpF;AAED,4EAA4E;AAC5E,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,oFAAoF;AACpF,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,iGAAiG;AACjG,wBAAsB,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAG7E;AAED,wFAAwF;AACxF,wBAAsB,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAE3E"}
@@ -1,11 +1,18 @@
1
1
  /**
2
- * @fileoverview Preview encoding utilities: PNG content blocks, contact sheets, GIF saving.
2
+ * @fileoverview Preview encoding utilities: PNG content blocks, contact sheets, and the
3
+ * PNG/GIF preview files written to PIXOO_OUTPUT_DIR or a temp directory.
3
4
  * @module renderer/preview
4
5
  */
5
6
  import * as fs from 'node:fs/promises';
7
+ import * as os from 'node:os';
6
8
  import * as path from 'node:path';
7
- import { Canvas, canvasToPng, saveAnimationGif } from '@cyanheads/pixoo-toolkit';
9
+ import { Canvas, canvasToPng, saveAnimationGif, savePng } from '@cyanheads/pixoo-toolkit';
8
10
  import { getServerConfig } from '../config/server-config.js';
11
+ /** Edge length, in pixels, a preview image is scaled toward. */
12
+ const PREVIEW_BUDGET_PX = 512;
13
+ /** Gutter between contact-sheet tiles, which also fills the grid's unused cells. */
14
+ const SHEET_GAP_PX = 2;
15
+ const SHEET_GAP_COLOR = { r: 48, g: 48, b: 48 };
9
16
  /** Encode a single canvas as a base64 PNG content block (8× upscaled → 512px). */
10
17
  export function encodePreviewBlock(canvas) {
11
18
  const pngBuffer = canvasToPng(canvas, 8);
@@ -13,44 +20,58 @@ export function encodePreviewBlock(canvas) {
13
20
  return { type: 'image', data: base64, mimeType: 'image/png' };
14
21
  }
15
22
  /**
16
- * Build a contact-sheet preview from animation frames.
17
- * Returns the middle frame encoded as a PNG (works universally across MCP clients).
23
+ * Build a contact-sheet preview: every frame, in order, tiled left-to-right and
24
+ * top-to-bottom in a `ceil(sqrt(n))`-column grid, each tile an integer upscale that
25
+ * keeps the sheet within the 512px preview budget. A single frame encodes exactly as
26
+ * {@link encodePreviewBlock} does.
18
27
  */
19
- export function buildContactSheet(frames) {
20
- // Return the middle frame as a representative preview
21
- const midFrame = frames[Math.floor(frames.length / 2)] ?? frames[0];
22
- if (!midFrame) {
23
- // Empty frame set — return a black canvas
24
- const fallback = new Canvas(64);
25
- return encodePreviewBlock(fallback);
26
- }
27
- return encodePreviewBlock(midFrame);
28
+ export async function buildContactSheet(frames) {
29
+ const [first] = frames;
30
+ if (!first || frames.length === 1)
31
+ return encodePreviewBlock(first ?? new Canvas(64));
32
+ const cols = Math.ceil(Math.sqrt(frames.length));
33
+ const rows = Math.ceil(frames.length / cols);
34
+ const scale = Math.max(1, Math.floor((PREVIEW_BUDGET_PX - (cols - 1) * SHEET_GAP_PX) / (cols * first.width)));
35
+ const pitch = first.width * scale + SHEET_GAP_PX;
36
+ const { default: sharp } = await import('sharp');
37
+ const png = await sharp({
38
+ create: {
39
+ width: cols * pitch - SHEET_GAP_PX,
40
+ height: rows * pitch - SHEET_GAP_PX,
41
+ channels: 3,
42
+ background: SHEET_GAP_COLOR,
43
+ },
44
+ })
45
+ .composite(frames.map((frame, i) => ({
46
+ input: Buffer.from(canvasToPng(frame, scale)),
47
+ left: (i % cols) * pitch,
48
+ top: Math.floor(i / cols) * pitch,
49
+ })))
50
+ .png()
51
+ .toBuffer();
52
+ return { type: 'image', data: png.toString('base64'), mimeType: 'image/png' };
28
53
  }
29
- /**
30
- * Optionally save a preview PNG to PIXOO_OUTPUT_DIR.
31
- * Returns the saved path, or undefined if no output dir is configured.
32
- */
33
- export async function savePngPreview(canvas, baseName) {
34
- const cfg = getServerConfig();
35
- if (!cfg.pixooOutputDir)
36
- return;
37
- await fs.mkdir(cfg.pixooOutputDir, { recursive: true });
38
- const filePath = path.join(cfg.pixooOutputDir, `${baseName}.png`);
39
- const { savePng } = await import('@cyanheads/pixoo-toolkit');
54
+ /** Save a canvas as an 8× upscaled PNG in `dir`; returns the saved path. */
55
+ export async function savePngPreview(canvas, dir, baseName) {
56
+ await fs.mkdir(dir, { recursive: true });
57
+ const filePath = path.join(dir, `${baseName}.png`);
40
58
  await savePng(canvas, filePath, 8);
41
59
  return filePath;
42
60
  }
43
- /**
44
- * Optionally save an animation GIF to PIXOO_OUTPUT_DIR.
45
- * Returns the saved path, or undefined if no output dir is configured.
46
- */
47
- export async function saveGifPreview(frames, speed, baseName) {
48
- const cfg = getServerConfig();
49
- if (!cfg.pixooOutputDir)
50
- return;
51
- await fs.mkdir(cfg.pixooOutputDir, { recursive: true });
52
- const filePath = path.join(cfg.pixooOutputDir, `${baseName}.gif`);
61
+ /** Save animation frames as an 8× upscaled GIF in `dir`; returns the saved path. */
62
+ export async function saveGifPreview(frames, speed, dir, baseName) {
63
+ await fs.mkdir(dir, { recursive: true });
64
+ const filePath = path.join(dir, `${baseName}.gif`);
53
65
  await saveAnimationGif(frames, filePath, speed, 8);
54
66
  return filePath;
55
67
  }
68
+ /** Write the preview into PIXOO_OUTPUT_DIR when one is configured; returns the paths written. */
69
+ export async function autoSavePreview(write) {
70
+ const dir = getServerConfig().pixooOutputDir;
71
+ return dir ? [await write(dir)] : [];
72
+ }
73
+ /** Write the preview into a fresh directory under the OS temp dir; returns its path. */
74
+ export async function saveTempPreview(write) {
75
+ return write(await fs.mkdtemp(path.join(os.tmpdir(), 'pixoo-preview-')));
76
+ }
56
77
  //# sourceMappingURL=preview.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"preview.js","sourceRoot":"","sources":["../../src/renderer/preview.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAe5D,kFAAkF;AAClF,MAAM,UAAU,kBAAkB,CAAC,MAAc;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;AAChE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAgB;IAChD,sDAAsD;IACtD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IACpE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,0CAA0C;QAC1C,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;QAChC,OAAO,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,kBAAkB,CAAC,QAAQ,CAAC,CAAC;AACtC,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,QAAgB;IAEhB,MAAM,GAAG,GAAG,eAAe,EAAE,CAAC;IAC9B,IAAI,CAAC,GAAG,CAAC,cAAc;QAAE,OAAO;IAChC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,QAAQ,MAAM,CAAC,CAAC;IAClE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAC7D,MAAM,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACnC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAgB,EAChB,KAAa,EACb,QAAgB;IAEhB,MAAM,GAAG,GAAG,eAAe,EAAE,CAAC;IAC9B,IAAI,CAAC,GAAG,CAAC,cAAc;QAAE,OAAO;IAChC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,QAAQ,MAAM,CAAC,CAAC;IAClE,MAAM,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACnD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"preview.js","sourceRoot":"","sources":["../../src/renderer/preview.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@
4
4
  * image elements and the pixoo_push_image tool.
5
5
  * @module renderer/remote-image
6
6
  */
7
- import { type RequestContext } from '@cyanheads/mcp-ts-core/utils';
7
+ import type { Context } from '@cyanheads/mcp-ts-core';
8
8
  /** True when the string is a URL rather than a local filesystem path. */
9
9
  export declare function isRemoteSource(source: string): boolean;
10
10
  /**
@@ -14,8 +14,12 @@ export declare function isRemoteSource(source: string): boolean;
14
14
  * Private and loopback addresses are deliberately reachable: this server drives a
15
15
  * LAN device, so a NAS or local web server is a legitimate image host.
16
16
  *
17
+ * The download runs under `ctx.signal`: a cancelled request tears the response stream
18
+ * down instead of reading on to the deadline or the byte cap.
19
+ *
17
20
  * @throws {McpError} NotFound with `reason: 'asset_not_found'` for a non-https URL,
18
21
  * an unreachable or non-2xx endpoint, or a response over {@link MAX_IMAGE_BYTES}.
22
+ * @throws {McpError} RequestCancelled when `ctx.signal` aborts while the body streams.
19
23
  */
20
- export declare function fetchRemoteImageToTempPng(source: string, ctx: RequestContext): Promise<string>;
24
+ export declare function fetchRemoteImageToTempPng(source: string, ctx: Context): Promise<string>;
21
25
  //# sourceMappingURL=remote-image.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"remote-image.d.ts","sourceRoot":"","sources":["../../src/renderer/remote-image.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAQrF,yEAAyE;AACzE,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED;;;;;;;;;GASG;AACH,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,MAAM,CAAC,CA4CjB"}
1
+ {"version":3,"file":"remote-image.d.ts","sourceRoot":"","sources":["../../src/renderer/remote-image.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAUtD,yEAAyE;AACzE,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAiE7F"}
@@ -23,8 +23,12 @@ export function isRemoteSource(source) {
23
23
  * Private and loopback addresses are deliberately reachable: this server drives a
24
24
  * LAN device, so a NAS or local web server is a legitimate image host.
25
25
  *
26
+ * The download runs under `ctx.signal`: a cancelled request tears the response stream
27
+ * down instead of reading on to the deadline or the byte cap.
28
+ *
26
29
  * @throws {McpError} NotFound with `reason: 'asset_not_found'` for a non-https URL,
27
30
  * an unreachable or non-2xx endpoint, or a response over {@link MAX_IMAGE_BYTES}.
31
+ * @throws {McpError} RequestCancelled when `ctx.signal` aborts while the body streams.
28
32
  */
29
33
  export async function fetchRemoteImageToTempPng(source, ctx) {
30
34
  if (!source.startsWith('https://')) {
@@ -34,7 +38,11 @@ export async function fetchRemoteImageToTempPng(source, ctx) {
34
38
  recovery: { hint: 'Use an https URL, or pass an absolute local file path instead.' },
35
39
  });
36
40
  }
37
- const resp = await fetchWithTimeout(source, FETCH_TIMEOUT_MS, ctx).catch((err) => {
41
+ // A throw here after the signal fired still reaches the caller as a cancellation:
42
+ // the handler factory reclassifies any error once the request's signal has aborted.
43
+ const resp = await fetchWithTimeout(source, FETCH_TIMEOUT_MS, ctx, {
44
+ signal: ctx.signal,
45
+ }).catch((err) => {
38
46
  throw notFound(`Failed to fetch image from "${source}": ${err instanceof Error ? err.message : String(err)}`, {
39
47
  reason: 'asset_not_found',
40
48
  url: source,
@@ -48,14 +56,30 @@ export async function fetchRemoteImageToTempPng(source, ctx) {
48
56
  [field]: bytes,
49
57
  recovery: { hint: 'Downscale the image before hosting it, or point at a smaller file.' },
50
58
  });
51
- // content-length is advisory: it bails before the body is buffered, but the
52
- // measured length is the gate that actually holds.
59
+ // content-length is advisory: it bails before the body is read, but the byte
60
+ // count taken while streaming is the gate that actually holds.
53
61
  const contentLength = Number(resp.headers.get('content-length') ?? 0);
54
- if (contentLength > MAX_IMAGE_BYTES)
62
+ if (contentLength > MAX_IMAGE_BYTES) {
63
+ await resp.body?.cancel();
55
64
  throw tooLarge(contentLength, 'contentLength');
56
- const buf = Buffer.from(await resp.arrayBuffer());
57
- if (buf.byteLength > MAX_IMAGE_BYTES)
58
- throw tooLarge(buf.byteLength, 'byteLength');
65
+ }
66
+ const chunks = [];
67
+ let received = 0;
68
+ const reader = resp.body?.getReader();
69
+ if (reader) {
70
+ for (;;) {
71
+ const { done, value } = await reader.read();
72
+ if (done)
73
+ break;
74
+ received += value.byteLength;
75
+ if (received > MAX_IMAGE_BYTES) {
76
+ await reader.cancel();
77
+ throw tooLarge(received, 'byteLength');
78
+ }
79
+ chunks.push(value);
80
+ }
81
+ }
82
+ const buf = Buffer.concat(chunks, received);
59
83
  const { default: sharp } = await import('sharp');
60
84
  const tmpPath = path.join(os.tmpdir(), `pixoo-img-${Date.now()}-${Math.random().toString(36).slice(2)}.png`);
61
85
  await sharp(buf).png().toFile(tmpPath);
@@ -1 +1 @@
1
- {"version":3,"file":"remote-image.js","sourceRoot":"","sources":["../../src/renderer/remote-image.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAuB,MAAM,8BAA8B,CAAC;AAErF,wEAAwE;AACxE,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEhC,0DAA0D;AAC1D,MAAM,eAAe,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AAEzC,yEAAyE;AACzE,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,OAAO,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,GAAmB;IAEnB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,MAAM,QAAQ,CAAC,6CAA6C,MAAM,IAAI,EAAE;YACtE,MAAM,EAAE,iBAAiB;YACzB,GAAG,EAAE,MAAM;YACX,QAAQ,EAAE,EAAE,IAAI,EAAE,gEAAgE,EAAE;SACrF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACxF,MAAM,QAAQ,CACZ,+BAA+B,MAAM,MAAM,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAC7F;YACE,MAAM,EAAE,iBAAiB;YACzB,GAAG,EAAE,MAAM;YACX,QAAQ,EAAE,EAAE,IAAI,EAAE,8DAA8D,EAAE;SACnF,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,wFAAwF;IACxF,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,KAAqC,EAAE,EAAE,CACxE,QAAQ,CAAC,6BAA6B,KAAK,kBAAkB,eAAe,IAAI,EAAE;QAChF,MAAM,EAAE,iBAAiB;QACzB,GAAG,EAAE,MAAM;QACX,CAAC,KAAK,CAAC,EAAE,KAAK;QACd,QAAQ,EAAE,EAAE,IAAI,EAAE,oEAAoE,EAAE;KACzF,CAAC,CAAC;IAEL,4EAA4E;IAC5E,mDAAmD;IACnD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IACtE,IAAI,aAAa,GAAG,eAAe;QAAE,MAAM,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAEpF,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IAClD,IAAI,GAAG,CAAC,UAAU,GAAG,eAAe;QAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAEnF,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CACvB,EAAE,CAAC,MAAM,EAAE,EACX,aAAa,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CACrE,CAAC;IACF,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACvC,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"remote-image.js","sourceRoot":"","sources":["../../src/renderer/remote-image.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,8 @@
2
2
  * @fileoverview Scene renderer — element vocabulary, layout resolver, frame rendering.
3
3
  * @module renderer/scene-renderer
4
4
  */
5
- import type { RequestContext } from '@cyanheads/mcp-ts-core/utils';
6
- import { Canvas, downsampleSprite } from '@cyanheads/pixoo-toolkit';
5
+ import type { Context } from '@cyanheads/mcp-ts-core';
6
+ import { Canvas, downsampleSprite, type PixooSize } from '@cyanheads/pixoo-toolkit';
7
7
  import { type EffectName, type KeyframeMap } from './keyframes.js';
8
8
  import { type LayoutEntry, type SemanticX, type SemanticY, type TextStyle } from './text-engine.js';
9
9
  import { type PaletteName, type ThemeName } from './themes.js';
@@ -154,18 +154,23 @@ export interface SpriteElement extends BaseElement {
154
154
  y?: number;
155
155
  }
156
156
  export type SceneElement = TextElement | IconElement | RectElement | CircleElement | LineElement | ProgressElement | SparklineElement | BitmapElement | PixelsElement | ImageElement | SpriteElement;
157
- /** Pre-loaded asset cache for images and sprites. */
157
+ /**
158
+ * Pre-loaded asset cache for images and sprites. Images are keyed by element: the
159
+ * loader bakes each element's fit, size, and position into its canvas, so two
160
+ * elements sharing a source still need a canvas each.
161
+ */
158
162
  export interface AssetCache {
159
- images: Map<string, Canvas>;
163
+ images: Map<ImageElement, Canvas>;
160
164
  sprites: Map<string, Awaited<ReturnType<typeof downsampleSprite>>>;
161
165
  }
162
166
  /**
163
- * Preload all async assets referenced in elements.
167
+ * Preload all async assets referenced in elements. Images load onto a `size` canvas,
168
+ * the scene's own, so an image with no `w`/`h` fits the display.
164
169
  *
165
- * `ctx` is threaded through so a remote image fetch correlates to the
166
- * originating request in logs and traces.
170
+ * `ctx` is threaded through so a remote image fetch correlates to the originating
171
+ * request in logs and traces, and stops when that request is cancelled.
167
172
  */
168
- export declare function preloadAssets(elements: SceneElement[], ctx: RequestContext): Promise<AssetCache>;
173
+ export declare function preloadAssets(elements: SceneElement[], ctx: Context, size: PixooSize): Promise<AssetCache>;
169
174
  /** Apply a background spec to a canvas. */
170
175
  export declare function applyBackground(canvas: Canvas, bg: BackgroundSpec): void;
171
176
  /** Render a single element onto a canvas at a specific frame. */
@@ -176,7 +181,7 @@ export declare function renderFrame(frameIdx: number, totalFrames: number, backg
176
181
  layoutEntries: LayoutEntry[];
177
182
  };
178
183
  /** Render all frames of a scene. */
179
- export declare function renderScene(background: BackgroundSpec, elements: SceneElement[], frameCount: number, ctx: RequestContext, size?: 16 | 32 | 64): Promise<{
184
+ export declare function renderScene(background: BackgroundSpec, elements: SceneElement[], frameCount: number, ctx: Context, size?: PixooSize): Promise<{
180
185
  frames: Canvas[];
181
186
  layoutEntries: LayoutEntry[];
182
187
  }>;
@@ -1 +1 @@
1
- {"version":3,"file":"scene-renderer.d.ts","sourceRoot":"","sources":["../../src/renderer/scene-renderer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scene-renderer.d.ts","sourceRoot":"","sources":["../../src/renderer/scene-renderer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EACL,MAAM,EACN,gBAAgB,EAOhB,KAAK,SAAS,EAKf,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAiB,KAAK,UAAU,EAAoB,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEpG,OAAO,EAGL,KAAK,WAAW,EAGhB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAY,KAAK,WAAW,EAAU,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAEjF,gCAAgC;AAChC,MAAM,MAAM,cAAc,GACtB,MAAM,GACN;IAAE,QAAQ,EAAE;QAAE,IAAI,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACjE;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAEzB,yCAAyC;AACzC,MAAM,WAAW,UAAU;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,+BAA+B;AAC/B,UAAU,WAAW;IACnB,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,oBAAoB;AACpB,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC9B,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,SAAS,CAAC;IACd,CAAC,CAAC,EAAE,SAAS,CAAC;CACf;AAED,oBAAoB;AACpB,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,SAAS,CAAC;IACd,CAAC,CAAC,EAAE,SAAS,CAAC;CACf;AAED,yBAAyB;AACzB,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,GAAG,GAAG,GAAG,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,sBAAsB;AACtB,MAAM,WAAW,aAAc,SAAQ,WAAW;IAChD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,oBAAoB;AACpB,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,2BAA2B;AAC3B,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAClD,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,wBAAwB;AACxB,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACtB,IAAI,EAAE,WAAW,CAAC;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,wCAAwC;AACxC,MAAM,WAAW,aAAc,SAAQ,WAAW;IAChD,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,6BAA6B;AAC7B,MAAM,WAAW,aAAc,SAAQ,WAAW;IAChD,IAAI,EAAE,KAAK,CAAC;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrD,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,qBAAqB;AACrB,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C,GAAG,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;IACnC,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;CACZ;AAED,sBAAsB;AACtB,MAAM,WAAW,aAAc,SAAQ,WAAW;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,CAAC,CAAC,EAAE,SAAS,CAAC;IACd,CAAC,CAAC,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,MAAM,YAAY,GACpB,WAAW,GACX,WAAW,GACX,WAAW,GACX,aAAa,GACb,WAAW,GACX,eAAe,GACf,gBAAgB,GAChB,aAAa,GACb,aAAa,GACb,YAAY,GACZ,aAAa,CAAC;AAElB;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAClC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;CACpE;AAyBD;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,QAAQ,EAAE,YAAY,EAAE,EACxB,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,UAAU,CAAC,CAuCrB;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,cAAc,GAAG,IAAI,CAyCxE;AAED,iEAAiE;AACjE,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,YAAY,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,WAAW,EAAE,GAC3B,IAAI,CAuWN;AAED,+BAA+B;AAC/B,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,cAAc,EAC1B,QAAQ,EAAE,YAAY,EAAE,EACxB,MAAM,EAAE,UAAU,EAClB,IAAI,GAAE,EAAE,GAAG,EAAE,GAAG,EAAO,GACtB;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,WAAW,EAAE,CAAA;CAAE,CAYlD;AAED,oCAAoC;AACpC,wBAAsB,WAAW,CAC/B,UAAU,EAAE,cAAc,EAC1B,QAAQ,EAAE,YAAY,EAAE,EACxB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,OAAO,EACZ,IAAI,GAAE,SAAc,GACnB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAsB7D"}
@@ -3,7 +3,7 @@
3
3
  * @module renderer/scene-renderer
4
4
  */
5
5
  import * as fs from 'node:fs/promises';
6
- import { invalidParams } from '@cyanheads/mcp-ts-core/errors';
6
+ import { invalidParams, notFound } from '@cyanheads/mcp-ts-core/errors';
7
7
  import { Canvas, downsampleSprite, drawText, FONT_3x5, FONT_5x7, lerpColor, loadImage, measureText, renderSprite, renderSvgPath, resolveColor, } from '@cyanheads/pixoo-toolkit';
8
8
  import { ICONS } from './icons.js';
9
9
  import { compileEffect, getKeyframeValue } from './keyframes.js';
@@ -11,43 +11,64 @@ import { fetchRemoteImageToTempPng, isRemoteSource } from './remote-image.js';
11
11
  import { drawStyledText, resolveX, resolveY, } from './text-engine.js';
12
12
  import { PALETTES, THEMES } from './themes.js';
13
13
  /**
14
- * Preload all async assets referenced in elements.
14
+ * Confirm a local image or sprite-sheet path is readable before the toolkit's
15
+ * loader reaches it — the loader fails a missing file with an unclassified error.
15
16
  *
16
- * `ctx` is threaded through so a remote image fetch correlates to the
17
- * originating request in logs and traces.
17
+ * @throws {McpError} NotFound with `reason: 'asset_not_found'` when the path is
18
+ * missing or unreadable.
18
19
  */
19
- export async function preloadAssets(elements, ctx) {
20
+ async function assertReadableAsset(assetPath, label) {
21
+ try {
22
+ await fs.access(assetPath, fs.constants.R_OK);
23
+ }
24
+ catch (err) {
25
+ throw notFound(`${label} not found or unreadable: "${assetPath}".`, {
26
+ reason: 'asset_not_found',
27
+ path: assetPath,
28
+ recovery: { hint: 'Pass an absolute path to an existing, readable image file.' },
29
+ }, { cause: err });
30
+ }
31
+ }
32
+ /**
33
+ * Preload all async assets referenced in elements. Images load onto a `size` canvas,
34
+ * the scene's own, so an image with no `w`/`h` fits the display.
35
+ *
36
+ * `ctx` is threaded through so a remote image fetch correlates to the originating
37
+ * request in logs and traces, and stops when that request is cancelled.
38
+ */
39
+ export async function preloadAssets(elements, ctx, size) {
20
40
  const cache = { images: new Map(), sprites: new Map() };
21
41
  await Promise.all(elements.map(async (el) => {
22
42
  if (el.type === 'image') {
23
43
  const source = el.source;
24
- if (!cache.images.has(source)) {
25
- // The toolkit's loadImage reads from disk, so a remote source is
26
- // staged to a temp PNG first and unlinked once it has been read.
27
- const tmpPathToCleanup = isRemoteSource(source)
28
- ? await fetchRemoteImageToTempPng(source, ctx)
29
- : undefined;
30
- const localPath = tmpPathToCleanup ?? source;
31
- const loadOpts = {
32
- fit: el.fit ?? 'contain',
33
- kernel: el.kernel ?? 'nearest',
34
- x: typeof el.x === 'number' ? el.x : 0,
35
- y: typeof el.y === 'number' ? el.y : 0,
36
- };
37
- if (el.w !== undefined)
38
- loadOpts.width = el.w;
39
- if (el.h !== undefined)
40
- loadOpts.height = el.h;
41
- const canvas = await loadImage(localPath, loadOpts);
42
- if (tmpPathToCleanup) {
43
- fs.unlink(tmpPathToCleanup).catch(() => undefined);
44
- }
45
- cache.images.set(source, canvas);
44
+ // The toolkit's loadImage reads from disk, so a remote source is
45
+ // staged to a temp PNG first and unlinked once it has been read.
46
+ const remote = isRemoteSource(source);
47
+ if (!remote)
48
+ await assertReadableAsset(source, 'Image file');
49
+ const tmpPathToCleanup = remote ? await fetchRemoteImageToTempPng(source, ctx) : undefined;
50
+ const localPath = tmpPathToCleanup ?? source;
51
+ const loadOpts = {
52
+ size,
53
+ fit: el.fit ?? 'contain',
54
+ kernel: el.kernel ?? 'nearest',
55
+ x: typeof el.x === 'number' ? el.x : 0,
56
+ y: typeof el.y === 'number' ? el.y : 0,
57
+ };
58
+ if (el.w !== undefined)
59
+ loadOpts.width = el.w;
60
+ if (el.h !== undefined)
61
+ loadOpts.height = el.h;
62
+ const canvas = await loadImage(localPath, loadOpts);
63
+ if (tmpPathToCleanup) {
64
+ fs.unlink(tmpPathToCleanup).catch(() => undefined);
46
65
  }
66
+ cache.images.set(el, canvas);
47
67
  }
48
68
  else if (el.type === 'sprite') {
49
69
  const key = `${el.path}:${el.cols}:${el.rows}`;
50
70
  if (!cache.sprites.has(key)) {
71
+ await assertReadableAsset(el.path, 'Sprite sheet');
51
72
  const sprite = await downsampleSprite(el.path, el.cols, el.rows);
52
73
  cache.sprites.set(key, sprite);
53
74
  }
@@ -370,9 +391,9 @@ export function renderElement(canvas, el, elIdx, frameIdx, totalFrames, assets,
370
391
  break;
371
392
  }
372
393
  case 'image': {
373
- const cachedCanvas = assets.images.get(el.source);
394
+ const cachedCanvas = assets.images.get(el);
374
395
  if (cachedCanvas) {
375
- canvas.blit(cachedCanvas, dx, dy);
396
+ target.blit(cachedCanvas, dx, dy);
376
397
  }
377
398
  layoutEntries.push({
378
399
  element: elIdx,
@@ -443,7 +464,7 @@ export function renderFrame(frameIdx, totalFrames, background, elements, assets,
443
464
  }
444
465
  /** Render all frames of a scene. */
445
466
  export async function renderScene(background, elements, frameCount, ctx, size = 64) {
446
- const assets = await preloadAssets(elements, ctx);
467
+ const assets = await preloadAssets(elements, ctx, size);
447
468
  const allLayoutEntries = [];
448
469
  const frames = [];
449
470
  for (let i = 0; i < frameCount; i++) {