feat: data-backed rate limits, concurrency limiter, copy button fix (BUG-025, BUG-022)

This commit is contained in:
OpenClaw 2026-02-15 08:14:39 +00:00
parent 922230c108
commit f5a85c6fc3
5 changed files with 222 additions and 17 deletions

View file

@ -34,7 +34,8 @@ interface ConvertBody {
}
// POST /v1/convert/html
convertRouter.post("/html", async (req: Request, res: Response) => {
convertRouter.post("/html", async (req: Request & { acquirePdfSlot?: () => Promise<void>; releasePdfSlot?: () => void }, res: Response) => {
let slotAcquired = false;
try {
// Reject non-JSON content types
const ct = req.headers["content-type"] || "";
@ -50,6 +51,12 @@ convertRouter.post("/html", async (req: Request, res: Response) => {
return;
}
// Acquire concurrency slot
if (req.acquirePdfSlot) {
await req.acquirePdfSlot();
slotAcquired = true;
}
// Wrap bare HTML fragments
const fullHtml = body.html.includes("<html")
? body.html
@ -68,12 +75,21 @@ convertRouter.post("/html", async (req: Request, res: Response) => {
res.send(pdf);
} catch (err: any) {
console.error("Convert HTML error:", err);
if (err.message === "QUEUE_FULL") { const pool = getPoolStats(); res.status(429).json({ error: "Server busy", queueDepth: pool.queueDepth }); return; } res.status(500).json({ error: "PDF generation failed", detail: err.message });
if (err.message === "QUEUE_FULL") {
res.status(429).json({ error: "Server busy - too many concurrent PDF generations. Please try again in a few seconds." });
return;
}
res.status(500).json({ error: "PDF generation failed", detail: err.message });
} finally {
if (slotAcquired && req.releasePdfSlot) {
req.releasePdfSlot();
}
}
});
// POST /v1/convert/markdown
convertRouter.post("/markdown", async (req: Request, res: Response) => {
convertRouter.post("/markdown", async (req: Request & { acquirePdfSlot?: () => Promise<void>; releasePdfSlot?: () => void }, res: Response) => {
let slotAcquired = false;
try {
const body: ConvertBody =
typeof req.body === "string" ? { markdown: req.body } : req.body;
@ -83,6 +99,12 @@ convertRouter.post("/markdown", async (req: Request, res: Response) => {
return;
}
// Acquire concurrency slot
if (req.acquirePdfSlot) {
await req.acquirePdfSlot();
slotAcquired = true;
}
const html = markdownToHtml(body.markdown, body.css);
const pdf = await renderPdf(html, {
format: body.format,
@ -97,12 +119,21 @@ convertRouter.post("/markdown", async (req: Request, res: Response) => {
res.send(pdf);
} catch (err: any) {
console.error("Convert MD error:", err);
if (err.message === "QUEUE_FULL") { const pool = getPoolStats(); res.status(429).json({ error: "Server busy", queueDepth: pool.queueDepth }); return; } res.status(500).json({ error: "PDF generation failed", detail: err.message });
if (err.message === "QUEUE_FULL") {
res.status(429).json({ error: "Server busy - too many concurrent PDF generations. Please try again in a few seconds." });
return;
}
res.status(500).json({ error: "PDF generation failed", detail: err.message });
} finally {
if (slotAcquired && req.releasePdfSlot) {
req.releasePdfSlot();
}
}
});
// POST /v1/convert/url
convertRouter.post("/url", async (req: Request, res: Response) => {
convertRouter.post("/url", async (req: Request & { acquirePdfSlot?: () => Promise<void>; releasePdfSlot?: () => void }, res: Response) => {
let slotAcquired = false;
try {
const body = req.body as { url?: string; format?: string; landscape?: boolean; margin?: any; printBackground?: boolean; waitUntil?: string; filename?: string };
@ -136,6 +167,12 @@ convertRouter.post("/url", async (req: Request, res: Response) => {
return;
}
// Acquire concurrency slot
if (req.acquirePdfSlot) {
await req.acquirePdfSlot();
slotAcquired = true;
}
const pdf = await renderUrlPdf(body.url, {
format: body.format,
landscape: body.landscape,
@ -150,6 +187,14 @@ convertRouter.post("/url", async (req: Request, res: Response) => {
res.send(pdf);
} catch (err: any) {
console.error("Convert URL error:", err);
if (err.message === "QUEUE_FULL") { const pool = getPoolStats(); res.status(429).json({ error: "Server busy", queueDepth: pool.queueDepth }); return; } res.status(500).json({ error: "PDF generation failed", detail: err.message });
if (err.message === "QUEUE_FULL") {
res.status(429).json({ error: "Server busy - too many concurrent PDF generations. Please try again in a few seconds." });
return;
}
res.status(500).json({ error: "PDF generation failed", detail: err.message });
} finally {
if (slotAcquired && req.releasePdfSlot) {
req.releasePdfSlot();
}
}
});

View file

@ -8,7 +8,7 @@ const router = Router();
const recoverLimiter = rateLimit({
windowMs: 60 * 60 * 1000,
max: 5,
max: 3,
message: { error: "Too many recovery attempts. Please try again in 1 hour." },
standardHeaders: true,
legacyHeaders: false,