@json-to-office/jto 0.28.1 → 0.30.0

package/dist/cli.js

@@ -1910,19 +1910,80 @@ import {
   clampVisualDpi,
   DEFAULT_VISUAL_DPI,
   MIN_VISUAL_DPI,
-  MAX_VISUAL_DPI
+  MAX_VISUAL_DPI,
+  MAX_RASTERIZE_BATCH_SLIDES
 } from "@json-to-office/shared";
-import { createLibreOfficePptxRasterizer } from "@json-to-office/jto-cli";
+import {
+  createLibreOfficePptxRasterizer,
+  createLibreOfficePptxBatchRasterizer
+} from "@json-to-office/jto-cli";
 function getSharedRasterizer() {
   if (!sharedRasterizer) {
     sharedRasterizer = createLibreOfficePptxRasterizer();
   }
   return sharedRasterizer;
 }
+function getSharedBatchRasterizer() {
+  if (!sharedBatchRasterizer) {
+    sharedBatchRasterizer = createLibreOfficePptxBatchRasterizer();
+  }
+  return sharedBatchRasterizer;
+}
+function estimateSlidePixels(presentation, dpi) {
+  const props = presentation?.props;
+  const dim = (value, fallback) => typeof value === "number" && Number.isFinite(value) && value > 0 ? value : fallback;
+  const widthIn = dim(props?.slideWidth, DEFAULT_SLIDE_WIDTH_IN);
+  const heightIn = dim(props?.slideHeight, DEFAULT_SLIDE_HEIGHT_IN);
+  return widthIn * dpi * (heightIn * dpi);
+}
+function assertPixelBudget(slides) {
+  let total = 0;
+  for (const slide of slides) {
+    const pixels = estimateSlidePixels(slide.presentation, slide.dpi);
+    if (pixels > MAX_SLIDE_PIXELS) {
+      throw new HTTPException3(400, {
+        message: "Requested slide dimensions are too large"
+      });
+    }
+    total += pixels;
+  }
+  if (total > MAX_BATCH_PIXELS) {
+    throw new HTTPException3(400, {
+      message: "Requested batch raster size is too large"
+    });
+  }
+}
+function resolveSafeBaseDir(baseDir) {
+  if (baseDir === void 0) return void 0;
+  const resolved = path6.resolve(baseDir);
+  const cwd = process.cwd();
+  if (resolved !== cwd && !resolved.startsWith(cwd + path6.sep)) {
+    throw new HTTPException3(400, {
+      message: "baseDir must be inside the server working directory"
+    });
+  }
+  return resolved;
+}
+function toHttpException(error) {
+  if (error instanceof HTTPException3) return error;
+  if (error instanceof UnsafeOutboundSourceError) {
+    return new HTTPException3(400, { message: error.message });
+  }
+  const msg = error instanceof Error ? error.message.toLowerCase() : String(error);
+  if (msg.includes("not found") || msg.includes("rasterization needs")) {
+    return new HTTPException3(503, { message: error.message });
+  }
+  if (msg.includes("invalid") || msg.includes("validation")) {
+    return new HTTPException3(400, { message: error.message });
+  }
+  return new HTTPException3(500, {
+    message: "Internal server error during rasterization"
+  });
+}
 function registerRasterizeRoute(router, options = {}) {
   const getRasterizer = options.getRasterizer ?? getSharedRasterizer;
-  router.post(
-    "/rasterize",
+  const getBatchRasterizer = options.getBatchRasterizer ?? getSharedBatchRasterizer;
+  const shared = [
     ...options.preMiddleware ?? [],
     bodyLimit({
       maxSize: 32 * 1024 * 1024,
@@ -1930,22 +1991,26 @@ function registerRasterizeRoute(router, options = {}) {
         throw new HTTPException3(413, { message: "Request body too large" });
       }
     }),
-    jsonOnly,
+    jsonOnly
+  ];
+  const guard = async (run) => {
+    try {
+      return await run();
+    } catch (error) {
+      options.onError?.(error);
+      throw toHttpException(error);
+    }
+  };
+  router.post(
+    "/rasterize",
+    ...shared,
     tbValidator(RasterizeRequestSchema),
     async (c) => {
       const { presentation, dpi, baseDir } = getValidated(c, "json");
-      let safeBaseDir;
-      if (baseDir !== void 0) {
-        const resolved = path6.resolve(baseDir);
-        const cwd = process.cwd();
-        if (resolved !== cwd && !resolved.startsWith(cwd + path6.sep)) {
-          throw new HTTPException3(400, {
-            message: "baseDir must be inside the server working directory"
-          });
-        }
-        safeBaseDir = resolved;
-      }
-      try {
+      const safeBaseDir = resolveSafeBaseDir(baseDir);
+      const effectiveDpi = clampVisualDpi(dpi ?? DEFAULT_VISUAL_DPI);
+      assertPixelBudget([{ presentation, dpi: effectiveDpi }]);
+      const result = await guard(async () => {
         if (options.sourcePolicy) {
           assertSafeOutboundSources(
             presentation,
@@ -1953,33 +2018,57 @@ function registerRasterizeRoute(router, options = {}) {
             "presentation"
           );
         }
-        const result = await getRasterizer()({
+        return getRasterizer()({
           presentation,
-          dpi: clampVisualDpi(dpi ?? DEFAULT_VISUAL_DPI),
+          dpi: effectiveDpi,
           baseDir: safeBaseDir
         });
-        return c.json(result);
-      } catch (error) {
-        options.onError?.(error);
-        if (error instanceof HTTPException3) throw error;
-        if (error instanceof UnsafeOutboundSourceError) {
-          throw new HTTPException3(400, { message: error.message });
-        }
-        const msg = error instanceof Error ? error.message.toLowerCase() : String(error);
-        if (msg.includes("not found") || msg.includes("rasterization needs")) {
-          throw new HTTPException3(503, { message: error.message });
-        }
-        if (msg.includes("invalid") || msg.includes("validation")) {
-          throw new HTTPException3(400, { message: error.message });
+      });
+      return c.json(result);
+    }
+  );
+  router.post(
+    "/rasterize/batch",
+    ...shared,
+    tbValidator(RasterizeBatchRequestSchema),
+    async (c) => {
+      const { slides, baseDir } = getValidated(c, "json");
+      const safeBaseDir = resolveSafeBaseDir(baseDir);
+      const effectiveSlides = slides.map((slide) => ({
+        presentation: slide.presentation,
+        dpi: clampVisualDpi(slide.dpi ?? DEFAULT_VISUAL_DPI)
+      }));
+      assertPixelBudget(effectiveSlides);
+      const result = await guard(async () => {
+        if (options.sourcePolicy) {
+          slides.forEach(
+            (slide, index) => assertSafeOutboundSources(
+              slide.presentation,
+              options.sourcePolicy,
+              `slides[${index}].presentation`
+            )
+          );
         }
-        throw new HTTPException3(500, {
-          message: "Internal server error during rasterization"
+        return getBatchRasterizer()({
+          slides: effectiveSlides,
+          baseDir: safeBaseDir
         });
-      }
+      });
+      return c.json({
+        results: result.results.map((slide) => {
+          if (slide.ok) return slide;
+          options.onError?.(new Error(slide.error));
+          return slide.stage === "build" ? { ok: false, error: slide.error, stage: slide.stage } : {
+            ok: false,
+            error: "Slide rasterization failed",
+            stage: slide.stage
+          };
+        })
+      });
     }
   );
 }
-var RasterizeRequestSchema, sharedRasterizer, jsonOnly;
+var RasterizeRequestSchema, RasterizeBatchRequestSchema, sharedRasterizer, sharedBatchRasterizer, jsonOnly, DEFAULT_SLIDE_WIDTH_IN, DEFAULT_SLIDE_HEIGHT_IN, MAX_SLIDE_PIXELS, MAX_BATCH_PIXELS;
 var init_rasterize_route = __esm({
   "src/server/rasterize-route.ts"() {
     "use strict";
@@ -1996,6 +2085,24 @@ var init_rasterize_route = __esm({
       },
       { additionalProperties: false }
     );
+    RasterizeBatchRequestSchema = Type2.Object(
+      {
+        slides: Type2.Array(
+          Type2.Object(
+            {
+              presentation: Type2.Object({}, { additionalProperties: true }),
+              dpi: Type2.Optional(
+                Type2.Number({ minimum: MIN_VISUAL_DPI, maximum: MAX_VISUAL_DPI })
+              )
+            },
+            { additionalProperties: false }
+          ),
+          { minItems: 1, maxItems: MAX_RASTERIZE_BATCH_SLIDES }
+        ),
+        baseDir: Type2.Optional(Type2.String())
+      },
+      { additionalProperties: false }
+    );
     jsonOnly = async (c, next) => {
       const contentType = c.req.header("content-type");
       if (!contentType || !contentType.includes("application/json")) {
@@ -2005,6 +2112,10 @@ var init_rasterize_route = __esm({
       }
       await next();
     };
+    DEFAULT_SLIDE_WIDTH_IN = 13.34;
+    DEFAULT_SLIDE_HEIGHT_IN = 7.5;
+    MAX_SLIDE_PIXELS = 64e6;
+    MAX_BATCH_PIXELS = 256e6;
   }
 });
 
@@ -2535,15 +2646,22 @@ function createFormatRouter(adapter) {
       try {
         assertRequestSources(jsonDefinition, "jsonDefinition");
         assertRequestSources(customThemes, "customThemes");
-        const config2 = typeof jsonDefinition === "string" ? JSON.parse(jsonDefinition) : jsonDefinition;
+        let config2;
+        try {
+          config2 = typeof jsonDefinition === "string" ? JSON.parse(jsonDefinition) : jsonDefinition;
+        } catch {
+          throw new HTTPException4(400, {
+            message: "jsonDefinition is not valid JSON"
+          });
+        }
         const registry = PluginRegistry2.getInstance();
         if (registry.hasPlugins()) {
           const plugins = registry.getPlugins();
           const generatorResult = await adapter.createGenerator(plugins, {
             theme: customThemes ? Object.values(customThemes)[0] : void 0
           });
-          if (generatorResult.getStandardComponentsDefinition) {
-            const standardComponents = await generatorResult.getStandardComponentsDefinition(config2);
+          if (generatorResult.getStandardDefinition) {
+            const standardComponents = await generatorResult.getStandardDefinition(config2);
             return c.json({
               success: true,
               data: standardComponents,
@@ -2562,6 +2680,12 @@ function createFormatRouter(adapter) {
           requestId
         });
         if (error instanceof HTTPException4) throw error;
+        if (error instanceof Error) {
+          const msg = error.message.toLowerCase();
+          if (msg.includes("invalid") || msg.includes("validation") || msg.includes("missing required") || msg.includes("unknown component")) {
+            throw new HTTPException4(400, { message: error.message });
+          }
+        }
         throw new HTTPException4(500, {
           message: "Failed to get standard components definition"
         });
@@ -2638,6 +2762,9 @@ function createFormatRouter(adapter) {
       rateLimiter({
         limit: process.env.NODE_ENV === "production" ? 10 : 1e3,
         window: 15 * 60 * 1e3,
+        // One bucket for /rasterize AND /rasterize/batch — without a shared
+        // namespace the default per-path key would double the budget.
+        namespace: "rasterize",
         trustProxy: config.rateLimit.trustProxy
       })
     ],
@@ -4311,7 +4438,7 @@ function createDevCommand(adapter) {
 }
 
 // src/cli.ts
-var PACKAGE_VERSION = true ? "0.28.1" : "dev-mode";
+var PACKAGE_VERSION = true ? "0.30.0" : "dev-mode";
 var program = new Command2();
 program.name("jto").description("JSON to Office CLI - Generate .docx and .pptx from JSON").version(PACKAGE_VERSION);
 registerCoreCommands(program, {