Merge pull request #247 from loathers/upgrade-puppeteer-and-convert-to-svg

Upgrade puppeteer and svg-to-png

Author: gausie

packages/oaf/package.json

@@ -28,10 +28,10 @@
     "@remix-run/react": "^2.16.2",
     "@remix-run/serve": "^2.16.2",
     "@remix-run/server-runtime": "^2.16.2",
-    "@types/node": "^22.13.13",
+    "@types/node": "^24.0.13",
     "@types/serialize-error": "^4.0.1",
     "body-parser": "^1.20.3",
-    "convert-svg-to-png": "^0.6.4",
+    "convert-svg-to-png": "^0.7.1",
     "cors": "^2.8.5",
     "date-fns": "^4.1.0",
     "discord.js": "^14.18.0",
@@ -47,7 +47,7 @@
     "otplib": "^12.0.1",
     "pretty-ms": "^9.2.0",
     "proj4": "^2.15.0",
-    "puppeteer": "13.7.0",
+    "puppeteer": "24.12.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "remix-auth": "^4.1.0",

packages/oaf/src/svgConverter.ts

@@ -1,18 +1,21 @@
-import svgToPng from "convert-svg-to-png";
-import type { Converter } from "convert-svg-to-png";
+import { createConverter } from "convert-svg-to-png";
+import { executablePath } from "puppeteer";
 
 let timeout: ReturnType<typeof setTimeout> | null = null;
-let converter: Converter | null = null;
+let converter: Awaited<ReturnType<typeof createConverter>> | null = null;
 
 export async function renderSvg(svg: string) {
-  if (converter === null || converter.destroyed) {
-    converter = svgToPng.createConverter({
-      puppeteer: { args: ["--no-sandbox"] },
+  if (converter === null || converter.closed) {
+    converter = await createConverter({
+      launch: {
+        executablePath,
+        args: ["--no-sandbox"],
+      },
     });
 
     if (timeout !== null) clearTimeout(timeout);
     timeout = setTimeout(() => {
-      converter?.destroy();
+      converter?.close();
       timeout = null;
     }, 60000);
   }