@mapwhit/tileserver 3.6.0 → 3.7.0

package/lib/tiles.js

@@ -1,13 +1,12 @@
 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');
 
 const { fixTileJSONCenter, getTileUrls } = require('./utils');
-const etag = require('etag');
 
 module.exports = serveData;
 
@@ -66,10 +65,7 @@ function serveData(mountPath, options, item) {
     if (tile == null) {
       return next(404);
     }
-    if (options.removeETag) {
-      delete headers['ETag']; // do not trust the tile ETag -- regenerate
-    }
-    if (!options.noETag && !headers['ETag']) {
+    if (!options.noETag) {
       headers['ETag'] = etag(tile);
     }
     headers['Content-Type'] ??= 'application/x-protobuf';
@@ -125,3 +121,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.6.0",
+  "version": "3.7.0",
   "description": "Map tile server for JSON GL styles - serving vector tiles",
   "bin": {
     "tileserver": "bin/tileserver",
@@ -22,7 +22,6 @@
     "@mapwhit/mbtiles": "^1.0.1",
     "@pirxpilot/connect": "~4",
     "@pirxpilot/router": "~1",
-    "etag": "~1",
     "fresh": "~2",
     "ms": "~2",
     "rc": "~1",