tileserver-gl-light 5.5.0-pre.4 → 5.5.0-pre.5

package/CHANGELOG.md

@@ -1,12 +1,13 @@
 # tileserver-gl changelog
 
-## 5.5.0-pre.4
+## 5.5.0-pre.5
 * Add S3 support for PMTiles with multiple AWS credential profiles (https://github.com/maptiler/tileserver-gl/pull/1779) by @acalcutt
 * Create .aws directory passthrough folder in Dockerfile (https://github.com/maptiler/tileserver-gl/pull/1784) by @acalcutt
 * Update eslint to v9 (https://github.com/maptiler/tileserver-gl/pull/1473) by @acalcutt
 * Fix Renderer Crashes from Failed Fetches (https://github.com/maptiler/tileserver-gl/pull/1798) by @acalcutt
 * Add Visual Regression Tests for Static Image Overlays (https://github.com/maptiler/tileserver-gl/pull/1792) by @acalcutt
 * Fix S3 URL parsing for nested paths in AWS buckets (https://github.com/maptiler/tileserver-gl/pull/1819) by @acalcutt
+* Fix Renderer Crashes and Memory Leak (https://github.com/maptiler/tileserver-gl/pull/1825) by @acalcutt
 
 ## 5.4.0
 * Fix the issue where the tile URL cannot be correctly parsed with the HTTPS protocol when using an nginx proxy service (https://github.com/maptiler/tileserver-gl/pull/1578) by @dakanggo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl-light",
-  "version": "5.5.0-pre.4",
+  "version": "5.5.0-pre.5",
   "description": "Map tile server for JSON GL styles - serving vector tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -35,7 +35,7 @@
     "docker": "docker build . && docker run --rm -i -p 8080:8080 $(docker build -q .)"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.932.0",
+    "@aws-sdk/client-s3": "^3.935.0",
     "@jsse/pbfont": "^0.3.0",
     "@mapbox/mapbox-gl-rtl-text": "0.3.0",
     "@mapbox/mbtiles": "0.12.1",
@@ -61,7 +61,7 @@
     "morgan": "1.10.1",
     "pbf": "4.0.1",
     "pmtiles": "4.3.0",
-    "proj4": "2.20.0",
+    "proj4": "2.20.2",
     "sanitize-filename": "1.6.3",
     "semver": "^7.7.3",
     "tileserver-gl-styles": "2.0.0"

package/src/serve_rendered.js

@@ -531,30 +531,43 @@ async function respondImage(
     pool = item.map.renderersStatic[scale];
   }
 
+  if (!pool) {
+    console.error(`Pool not found for scale ${scale}, mode ${mode}`);
+    return res.status(500).send('Renderer pool not configured');
+  }
+
   pool.acquire(async (err, renderer) => {
     // Check if pool.acquire failed or returned null/invalid renderer
     if (err) {
       console.error('Failed to acquire renderer from pool:', err);
-      return res.status(503).send('Renderer pool error');
+      if (!res.headersSent) {
+        return res.status(503).send('Renderer pool error');
+      }
+      return;
     }
 
     if (!renderer) {
       console.error(
         'Renderer is null - likely crashed or failed to initialize',
       );
-      return res.status(503).send('Renderer unavailable');
+      if (!res.headersSent) {
+        return res.status(503).send('Renderer unavailable');
+      }
+      return;
     }
 
     // Validate renderer has required methods (basic health check)
     if (typeof renderer.render !== 'function') {
       console.error('Renderer is invalid - missing render method');
-      // Destroy the bad renderer and remove from pool
       try {
-        pool.destroy(renderer);
+        pool.removeBadObject(renderer);
       } catch (e) {
-        console.error('Error destroying invalid renderer:', e);
+        console.error('Error removing bad renderer:', e);
       }
-      return res.status(503).send('Renderer invalid');
+      if (!res.headersSent) {
+        return res.status(503).send('Renderer invalid');
+      }
+      return;
     }
 
     // For 512px tiles, use the actual maplibre-native zoom. For 256px tiles, use zoom - 1
@@ -588,13 +601,14 @@ async function respondImage(
 
     // Set a timeout for the render operation to detect hung renderers
     const renderTimeout = setTimeout(() => {
-      console.error('Renderer timeout - destroying potentially hung renderer');
+      console.error('Renderer timeout - destroying hung renderer');
+
       try {
-        // Don't release back to pool, destroy it
-        pool.destroy(renderer);
+        pool.removeBadObject(renderer);
       } catch (e) {
-        console.error('Error destroying timed-out renderer:', e);
+        console.error('Error removing timed-out renderer:', e);
       }
+
       if (!res.headersSent) {
         res.status(503).send('Renderer timeout');
       }
@@ -604,13 +618,17 @@ async function respondImage(
       renderer.render(params, (err, data) => {
         clearTimeout(renderTimeout);
 
+        if (res.headersSent) {
+          // Timeout already fired and sent response, don't process
+          return;
+        }
+
         if (err) {
           console.error('Render error:', err);
-          // Destroy renderer instead of releasing it back to pool since it may be corrupted
           try {
-            pool.destroy(renderer);
+            pool.removeBadObject(renderer);
           } catch (e) {
-            console.error('Error destroying failed renderer:', e);
+            console.error('Error removing failed renderer:', e);
           }
           if (!res.headersSent) {
             return res
@@ -646,12 +664,11 @@ async function respondImage(
             height: height * scale,
           });
         }
-        // HACK(Part 2) 256px tiles are a zoom level lower than maplibre-native default tiles. this hack allows tileserver-gl to support zoom 0 256px tiles, which would actually be zoom -1 in maplibre-native. Since zoom -1 isn't supported, a double sized zoom 0 tile is requested and resized here.
 
+        // HACK(Part 2) 256px tiles are a zoom level lower than maplibre-native default tiles. this hack allows tileserver-gl to support zoom 0 256px tiles, which would actually be zoom -1 in maplibre-native. Since zoom -1 isn't supported, a double sized zoom 0 tile is requested and resized here.
         if (z === 0 && width === 256) {
           image.resize(width * scale, height * scale);
         }
-        // END HACK(Part 2)
 
         const composites = [];
         if (overlay) {
@@ -659,7 +676,6 @@ async function respondImage(
         }
         if (item.watermark) {
           const canvas = renderWatermark(width, height, scale, item.watermark);
-
           composites.push({ input: canvas.toBuffer() });
         }
 
@@ -670,7 +686,6 @@ async function respondImage(
             scale,
             item.staticAttributionText,
           );
-
           composites.push({ input: canvas.toBuffer() });
         }
 
@@ -687,7 +702,6 @@ async function respondImage(
         }
         // eslint-disable-next-line security/detect-object-injection -- format is validated above
         const formatQuality = formatQualities[format];
-
         // eslint-disable-next-line security/detect-object-injection -- format is validated above
         const formatOptions = (options.formatOptions || {})[format] || {};
 
@@ -710,25 +724,32 @@ async function respondImage(
         } else if (format === 'webp') {
           image.webp({ quality: formatOptions.quality || formatQuality || 90 });
         }
+
         image.toBuffer((err, buffer, info) => {
-          if (!buffer) {
-            return res.status(404).send('Not found');
+          if (err || !buffer) {
+            console.error('Sharp error:', err);
+            if (!res.headersSent) {
+              return res.status(500).send('Image processing failed');
+            }
+            return;
           }
 
-          res.set({
-            'Last-Modified': item.lastModified,
-            'Content-Type': `image/${format}`,
-          });
-          return res.status(200).send(buffer);
+          if (!res.headersSent) {
+            res.set({
+              'Last-Modified': item.lastModified,
+              'Content-Type': `image/${format}`,
+            });
+            return res.status(200).send(buffer);
+          }
         });
       });
     } catch (error) {
       clearTimeout(renderTimeout);
       console.error('Unexpected error during render:', error);
       try {
-        pool.destroy(renderer);
+        pool.removeBadObject(renderer);
       } catch (e) {
-        console.error('Error destroying renderer after error:', e);
+        console.error('Error removing renderer after error:', e);
       }
       if (!res.headersSent) {
         return res.status(500).send('Render failed');