review

Signed-off-by: flakey5 <[email protected]>

Author: flakey5

src/utils/request.ts

@@ -30,16 +30,7 @@ export function parseUrl(request: Request): URL | undefined {
 }
 
 export function parseConditionalHeaders(headers: Headers): ConditionalHeaders {
-  let ifModifiedSince = headers.has('if-modified-since')
-    ? new Date(headers.get('if-modified-since')!)
-    : undefined;
-
-  if (ifModifiedSince instanceof Date) {
-    ifModifiedSince.setSeconds(ifModifiedSince.getSeconds() + 1);
-  } else {
-    // Invalid date
-    ifModifiedSince = undefined;
-  }
+  const ifModifiedSince = getDateFromHeader(headers.get('if-modified-since'))
 
   const ifMatch = headers.has('if-match')
     ? headers.get('if-match')!.replaceAll('"', '')
@@ -49,14 +40,7 @@ export function parseConditionalHeaders(headers: Headers): ConditionalHeaders {
     ? headers.get('if-none-match')!.replaceAll('"', '')
     : undefined;
 
-  let ifUnmodifiedSince = headers.has('if-unmodified-since')
-    ? new Date(headers.get('if-unmodified-since')!)
-    : undefined;
-
-  if (!(ifUnmodifiedSince instanceof Date)) {
-    // Invalid date
-    ifUnmodifiedSince = undefined;
-  }
+  const ifUnmodifiedSince = getDateFromHeader(headers.get('if-unmodified-since'))
 
   const range = headers.has('range')
     ? parseRangeHeader(headers.get('range')!)
@@ -71,6 +55,17 @@ export function parseConditionalHeaders(headers: Headers): ConditionalHeaders {
   };
 }
 
+function getDateFromHeader(dateString: string | null): Date | undefined {
+  if (dateString === null) {
+    return undefined;
+  }
+
+  const date = new Date(dateString);
+
+  // @ts-expect-error date to number conversion
+  return date instanceof Date && !isNaN(date) ? date : undefined;
+}
+
 /**
  * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Range
  * @returns undefined if header is invalid

tests/unit/utils/request.test.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
-import { parseRangeHeader } from '../../../src/utils/request';
+import { parseConditionalHeaders, parseRangeHeader } from '../../../src/utils/request';
 
 describe('parseRangeHeader', () => {
   it('`bytes=0-10`', () => {
@@ -49,3 +49,20 @@ describe('parseRangeHeader', () => {
     assert.strictEqual(result, undefined);
   });
 });
+
+describe('parseConditionalHeaders', () => {
+  it('invalid dates', () => {
+    const headers = new Headers({
+      'if-modified-since': 'asd',
+      'if-unmodified-since': 'asd'
+    });
+    
+    assert.deepStrictEqual(parseConditionalHeaders(headers), {
+      ifMatch: undefined,
+      ifNoneMatch: undefined,
+      ifModifiedSince: undefined,
+      ifUnmodifiedSince: undefined,
+      range: undefined
+    })
+  })
+})