@mapwhit/tileserver 3.5.3 → 3.6.1

package/lib/tiles.js

@@ -1,7 +1,8 @@
 const fs = require('node:fs');
 const path = require('node:path');
-const zlib = require('node:zlib');
+const { createHash } = require('node:crypto');
 
+const fresh = require('fresh');
 const Router = require('@pirxpilot/router');
 const mbtiles = require('@mapwhit/mbtiles');
 
@@ -67,10 +68,22 @@ function serveData(mountPath, options, item) {
     if (options.removeETag) {
       delete headers['ETag']; // do not trust the tile ETag -- regenerate
     }
+    if (!options.noETag && !headers['ETag']) {
+      headers['ETag'] = etag(tile);
+    }
     headers['Content-Type'] ??= 'application/x-protobuf';
-    headers['Content-Length'] = tile.byteLength;
     res.setHeaders(new Headers(headers));
-    res.end(tile);
+    if (
+      fresh(req.headers, {
+        etag: headers['ETag'],
+        'last-modified': headers['Last-Modified']
+      })
+    ) {
+      res.writeHead(304).end();
+    } else {
+      res.setHeader('Content-Length', tile.byteLength);
+      res.end(tile);
+    }
   }
 
   function sendData(req, res) {
@@ -111,3 +124,9 @@ function initZoomRanges(min, max) {
   }
   return ranges;
 }
+
+function etag(buffer) {
+  const hash = createHash('sha1').update(buffer).digest('base64').slice(0, -1);
+  const len = buffer.byteLength.toString(16);
+  return `"${len}-${hash}"`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapwhit/tileserver",
-  "version": "3.5.3",
+  "version": "3.6.1",
   "description": "Map tile server for JSON GL styles - serving vector tiles",
   "bin": {
     "tileserver": "bin/tileserver",
@@ -22,6 +22,7 @@
     "@mapwhit/mbtiles": "^1.0.1",
     "@pirxpilot/connect": "~4",
     "@pirxpilot/router": "~1",
+    "fresh": "~2",
     "ms": "~2",
     "rc": "~1",
     "server-timings": "~2"