Use lowercase header names when reading expiry (h/t @nab0y4enko) (#13626)

GitOrigin-RevId: ac9bf77bfb3f16446ecdd8f16e293f8dedc0ed08

Author: nab0y4enko

src/util/tile_request_cache.ts

@@ -60,7 +60,7 @@ export function cachePut(request: Request, response: Response, requestTime: numb
     cacheOpen();
     if (sharedCache == null) return;
 
-    const cacheControl = parseCacheControl(response.headers.get('Cache-Control') || '');
+    const cacheControl = parseCacheControl(response.headers.get('cache-control') || '');
     if (cacheControl['no-store']) return;
 
     const options: ResponseOptions = {
@@ -75,7 +75,7 @@ export function cachePut(request: Request, response: Response, requestTime: numb
         options.headers.set('Expires', new Date(requestTime + cacheControl['max-age'] * 1000).toUTCString());
     }
 
-    const expires = options.headers.get('Expires');
+    const expires = options.headers.get('expires');
     if (!expires) return;
 
     const timeUntilExpiry = new Date(expires).getTime() - requestTime;
@@ -137,8 +137,8 @@ export function cacheGet(
 
 function isFresh(response: Response) {
     if (!response) return false;
-    const expires = new Date(response.headers.get('Expires') || 0);
-    const cacheControl = parseCacheControl(response.headers.get('Cache-Control') || '');
+    const expires = new Date(response.headers.get('expires') || 0);
+    const cacheControl = parseCacheControl(response.headers.get('cache-control') || '');
     return Number(expires) > Date.now() && !cacheControl['no-cache'];
 }
 

src/util/util.ts

@@ -668,8 +668,8 @@ export function parseCacheControl(cacheControl: string): Record<string, number>
 
 export function getExpiryDataFromHeaders(responseHeaders: Headers | Map<string, string> | undefined) {
     if (!responseHeaders) return {cacheControl: undefined, expires: undefined};
-    const cacheControl = responseHeaders.get('Cache-Control');
-    const expires = responseHeaders.get('Expires');
+    const cacheControl = responseHeaders.get('cache-control');
+    const expires = responseHeaders.get('expires');
     return {cacheControl, expires};
 }
 

test/unit/source/vector_tile_worker_source.test.ts

@@ -7,8 +7,11 @@ import VectorTileWorkerSource from '../../../src/source/vector_tile_worker_sourc
 import StyleLayerIndex from '../../../src/style/style_layer_index';
 import perf from '../../../src/util/performance';
 import {getProjection} from '../../../src/geo/projection/index';
-import rawTileData from '../../fixtures/mbsv5-6-18-23.vector.pbf?arraybuffer';
+import rawTileDataImport from '../../fixtures/mbsv5-6-18-23.vector.pbf?arraybuffer';
 
+import type {LoadVectorDataCallback} from '../../../src/source/load_vector_tile';
+
+const rawTileData = rawTileDataImport as ArrayBuffer;
 const actor = {send: () => {}};
 
 test('VectorTileWorkerSource#abortTile aborts pending request', () => {
@@ -202,13 +205,45 @@ test('VectorTileWorkerSource#reloadTile does not reparse tiles with no vectorTil
     expect(callback).toHaveBeenCalledTimes(1);
 });
 
+test('VectorTileWorkerSource#loadTile forwards cache headers from response headers Map', () => {
+    const headers = new Headers();
+    headers.set('Cache-Control', 'max-age=30');
+    headers.set('Expires', 'Thu, 01 Jan 2099 00:00:00 GMT');
+
+    function loadVectorData(params, callback: LoadVectorDataCallback) {
+        return callback(null, {
+            vectorTile: new VectorTile(new Protobuf(rawTileData)),
+            rawData: rawTileData,
+            responseHeaders: new Map(headers.entries())
+        });
+    }
+
+    const layerIndex = new StyleLayerIndex([{
+        id: 'test',
+        source: 'source',
+        'source-layer': 'test',
+        type: 'fill'
+    }]);
+
+    const source = new VectorTileWorkerSource(actor, layerIndex, [], [], true, loadVectorData);
+
+    source.loadTile({
+        source: 'source',
+        uid: 0,
+        tileID: {overscaledZ: 0, wrap: 0, canonical: {x: 0, y: 0, z: 0, w: 0}},
+        projection: getProjection({name: 'mercator'}),
+        request: {url: 'http://localhost:2900/faketile.pbf'}
+    }, (err, res) => {
+        expect(err).toBeFalsy();
+        expect(res.cacheControl).toBe('max-age=30');
+        expect(res.expires).toBe('Thu, 01 Jan 2099 00:00:00 GMT');
+    });
+});
+
 test('VectorTileWorkerSource provides resource timing information', () => {
-    function loadVectorData(params, callback) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    function loadVectorData(params, callback: LoadVectorDataCallback) {
         return callback(null, {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             vectorTile: new VectorTile(new Protobuf(rawTileData)),
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             rawData: rawTileData,
             cacheControl: null,
             expires: null

test/unit/util/tile_request_cache.test.ts

@@ -60,9 +60,9 @@ describe('tile_request_cache', () => {
         const cachedResponse = {
             headers: {get: vi.fn().mockImplementation((name) => {
                 switch (name) {
-                case 'Expires':
+                case 'expires':
                     return '2300-01-01';
-                case 'Cache-Control':
+                case 'cache-control':
                     return null;
                 }
             })},

test/unit/util/util.test.ts

@@ -2,7 +2,7 @@
 // @ts-nocheck
 import Point from '@mapbox/point-geometry';
 import {describe, test, expect} from '../../util/vitest';
-import {mapValue, degToRad, radToDeg, easeCubicInOut, getAABBPointSquareDist, furthestTileCorner, keysDifference, pick, uniqueId, bindAll, asyncAll, clamp, smoothstep, wrap, bezier, mapObject, filterObject, deepEqual, clone, arraysIntersect, isCounterClockwise, parseCacheControl, uuid, validateUuid, nextPowerOfTwo, isPowerOfTwo, bufferConvexPolygon, prevPowerOfTwo, shortestAngle, _resetSafariCheckForTest, isSafariWithAntialiasingBug} from '../../../src/util/util';
+import {mapValue, degToRad, radToDeg, easeCubicInOut, getAABBPointSquareDist, furthestTileCorner, keysDifference, pick, uniqueId, bindAll, asyncAll, clamp, smoothstep, wrap, bezier, mapObject, filterObject, deepEqual, clone, arraysIntersect, isCounterClockwise, parseCacheControl, getExpiryDataFromHeaders, uuid, validateUuid, nextPowerOfTwo, isPowerOfTwo, bufferConvexPolygon, prevPowerOfTwo, shortestAngle, _resetSafariCheckForTest, isSafariWithAntialiasingBug} from '../../../src/util/util';
 
 const EPSILON = 1e-8;
 
@@ -368,6 +368,35 @@ describe('util', () => {
         });
     });
 
+    describe('getExpiryDataFromHeaders', () => {
+        test('returns undefined values when responseHeaders is undefined', () => {
+            expect(getExpiryDataFromHeaders(undefined)).toEqual({
+                cacheControl: undefined,
+                expires: undefined
+            });
+        });
+
+        test('reads cache headers from a Fetch API Headers object', () => {
+            const headers = new Headers();
+            headers.set('Cache-Control', 'max-age=60');
+            headers.set('Expires', 'Thu, 01 Jan 2099 00:00:00 GMT');
+
+            const result = getExpiryDataFromHeaders(headers);
+            expect(result.cacheControl).toBe('max-age=60');
+            expect(result.expires).toBe('Thu, 01 Jan 2099 00:00:00 GMT');
+        });
+
+        test('reads cache headers from a Map serialized via Headers.entries()', () => {
+            const headers = new Headers();
+            headers.set('Cache-Control', 'max-age=30');
+            headers.set('Expires', 'Thu, 01 Jan 2099 00:00:00 GMT');
+
+            const result = getExpiryDataFromHeaders(new Map(headers.entries()));
+            expect(result.cacheControl).toBe('max-age=30');
+            expect(result.expires).toBe('Thu, 01 Jan 2099 00:00:00 GMT');
+        });
+    });
+
     test('validateUuid', () => {
         expect(validateUuid(uuid())).toBeTruthy();
         expect(validateUuid(uuid().substr(0, 10))).toBeFalsy();