Prise en charge d'une url vers un SVG

Dockerfile

@@ -1,8 +1,8 @@
-FROM pluswerk/puppeteer
+FROM ghcr.io/puppeteer/puppeteer:latest
 
 WORKDIR /app
 
-RUN yarn add convert-svg-to-png express body-parser
+RUN yarn add convert-svg-to-png express body-parser axios
 
 COPY index.mjs /app/
 

index.mjs

@@ -1,35 +1,51 @@
 import convertSvgToPng from "convert-svg-to-png";
 import express from "express";
 import bodyParser from "body-parser";
+import axios from "axios";
 
 const serverPort = 3000;
 const app = express();
-const converter = convertSvgToPng.createConverter({
-  puppeteer: {
-    args: ['--no-sandbox', '--disable-setuid-sandbox']
-  }
-});
+
 app.use(bodyParser.text({
   type: '*/*',
   limit: '10mb',
 }));
 
-app.post('/convert', async (req, res) => {
+app.get('/convert', async (req, res) => {
+  var converter;
   try {
+    converter = convertSvgToPng.createConverter({
+      puppeteer: {
+        args: ['--no-sandbox', '--disable-setuid-sandbox']
+      }
+    });
+
     const options = {};
-    options.background = req.query.background || '#fff';
+    if (req.query.background) options.background = req.query.background;
     options.baseUrl = req.query.baseUrl || 'file:///app';
     options.scale = req.query.scale || 1;
     if (req.query.baseFile) options.baseFile = req.query.baseFile;
     if (req.query.height) options.height = req.query.height;
     if (req.query.width) options.width = req.query.width;
     console.log('convert svg', options);
-    const png = await converter.convert(req.body, options);
-    res.set('Content-Type', 'image/png');
-    res.send(png);
+    console.log('convert url', req.query.url);
+    var resp = await axios.get(req.query.url);
+    var svg = resp.data;
+    if (svg.trim().toLowerCase().startsWith("<svg")) {
+      const png = await converter.convert(svg, options);
+      res.set('Content-Type', 'image/png');
+      res.send(png);
+    } else {
+      res.redirect(req.query.url);
+    }
   } catch (e) {
     res.status(500).send(e.message);
     console.log('error', e);
+  } finally {
+    if(converter) {
+      console.log('graceful shutdown puppeteer');
+      await converter.destroy();
+    }
   }
 });
 
@@ -41,8 +57,6 @@ server.on('connection', function (socket) {
 });
 
 const shutdown = async () => {
-  console.log('graceful shutdown puppeteer');
-  await converter.destroy();
   console.log('graceful shutdown express');
   server.close(function () {
     console.log('closed express');