chore: consistent error messages, hide stacktrace in HTTP response

Signed-off-by: Martin d'Allens <martin.dallens@liberty-rider.com>
liberty-rider · Nov 26, 2023 · d0e4c92 · d0e4c92
1 parent 40ade06
commit d0e4c92
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/src/render.js b/src/render.js
@@ -24,7 +24,7 @@ const precisePx = (ll, zoom) => {
  * @param {number} z Map zoom level.
  */
 const drawMarker = (ctx, marker, z) => {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     const img = new Image();
     const pixelCoords = precisePx(marker.location, z);
 
@@ -79,7 +79,7 @@ const drawMarker = (ctx, marker, z) => {
 
     img.onload = drawOnCanvas;
     img.onerror = (err) => {
-      throw err;
+      reject(err);
     };
     img.src = marker.icon;
   });

diff --git a/src/serve_font.js b/src/serve_font.js
@@ -32,7 +32,11 @@ export const serve_font = async (options, allowedFonts) => {
         res.header('Last-Modified', lastModified);
         return res.send(concatenated);
       } catch (err) {
-        res.status(400).header('Content-Type', 'text/plain').send(err);
+        console.error('ERROR: font serving failed', err);
+        res
+          .status(400)
+          .header('Content-Type', 'text/plain')
+          .send('Font serving failed');
       }
     },
   );

diff --git a/src/serve_rendered.js b/src/serve_rendered.js
@@ -436,8 +436,11 @@ const respondImage = (
     renderer.render(params, (err, data) => {
       pool.release(renderer);
       if (err) {
-        console.error(err);
-        return res.status(500).header('Content-Type', 'text/plain').send(err);
+        console.error('ERROR: render failed', err);
+        return res
+          .status(500)
+          .header('Content-Type', 'text/plain')
+          .send('Render failed');
       }
 
       const image = sharp(data, {
@@ -898,8 +901,9 @@ export const serve_rendered = {
                 let data = tileinfo.data;
                 let headers = tileinfo.header;
                 if (data == undefined) {
-                  if (options.verbose)
-                    console.log('MBTiles error, serving empty', err);
+                  if (options.verbose) {
+                    console.log('PMTiles error, serving empty', err);
+                  }
                   createEmptyResponse(
                     sourceInfo.format,
                     sourceInfo.color,
@@ -931,8 +935,9 @@ export const serve_rendered = {
               } else if (sourceType === 'mbtiles') {
                 source.getTile(z, x, y, (err, data, headers) => {
                   if (err) {
-                    if (options.verbose)
+                    if (options.verbose) {
                       console.log('MBTiles error, serving empty', err);
+                    }
                     createEmptyResponse(
                       sourceInfo.format,
                       sourceInfo.color,
@@ -1001,6 +1006,12 @@ export const serve_rendered = {
                 parsedResponse.data = responseData;
                 callback(null, parsedResponse);
               } catch (error) {
+                if (options.verbose) {
+                  console.log(
+                    `Resource error for ${req.url}, serving empty`,
+                    err,
+                  );
+                }
                 const parts = url.parse(req.url);
                 const extension = path.extname(parts.pathname).toLowerCase();
                 const format = extensionToFormat[extension] || '';
@@ -1027,7 +1038,7 @@ export const serve_rendered = {
     try {
       styleJSON = JSON.parse(fs.readFileSync(styleJSONPath));
     } catch (e) {
-      console.log('Error parsing style file');
+      console.error('ERROR: Error parsing style file');
       return false;
     }
 
@@ -1171,7 +1182,7 @@ export const serve_rendered = {
               map.sources[name] = new MBTiles(inputFile + '?mode=ro', (err) => {
                 map.sources[name].getInfo((err, info) => {
                   if (err) {
-                    console.error(err);
+                    console.error('ERROR: getInfo failed', err);
                     return;
                   }
                   map.sourceTypes[name] = 'mbtiles';