feat: Support conditions for GET/HEAD requests

* fix: updated WrappedExpiringStorage tests and timer.unref calls

* fix: removed finalizable configs and inheritors that only used timer

* fix: updated test function to test setSafeInterval and timer.unref

* fix: added NotModifiedHttpError class

* fix: added 304 error test to HttpError test file

* fix: 304 errors when making read request with matching ETag

* Update src/util/errors/NotModifiedHttpError.ts

Co-authored-by: Ted Thibodeau Jr <tthibodeau@openlinksw.com>

* fix: updated tests

* fix: try notMatchesEtag in test

* fix: DataAccessorBasedStore test passes

* fix: removed conditions check and added extra test

---------

Co-authored-by: Ted Thibodeau Jr <tthibodeau@openlinksw.com>

test/integration/Conditions.test.ts

@@ -170,6 +170,27 @@ describe.each(stores)('A server supporting conditions with %s', (name, { storeCo
     expect(await deleteResource(documentUrl!)).toBeUndefined();
   });
 
+  it('throws 304 error if "if-none-match" header matches and request type is GET or HEAD.', async(): Promise<void> => {
+    // GET root ETag
+    let response = await getResource(baseUrl);
+    const eTag = response.headers.get('ETag');
+    expect(typeof eTag).toBe('string');
+
+    // GET fails because of header
+    response = await fetch(baseUrl, {
+      method: 'GET',
+      headers: { 'if-none-match': eTag! },
+    });
+    expect(response.status).toBe(304);
+
+    // HEAD fails because of header
+    response = await fetch(baseUrl, {
+      method: 'HEAD',
+      headers: { 'if-none-match': eTag! },
+    });
+    expect(response.status).toBe(304);
+  });
+
   it('prevents operations if the "if-unmodified-since" header is before the modified date.', async(): Promise<void> => {
     const documentUrl = `${baseUrl}document3.txt`;
     // PUT

test/unit/storage/DataAccessorBasedStore.test.ts

@@ -19,6 +19,7 @@ import { ForbiddenHttpError } from '../../../src/util/errors/ForbiddenHttpError'
 import { MethodNotAllowedHttpError } from '../../../src/util/errors/MethodNotAllowedHttpError';
 import { NotFoundHttpError } from '../../../src/util/errors/NotFoundHttpError';
 import { NotImplementedHttpError } from '../../../src/util/errors/NotImplementedHttpError';
+import { NotModifiedHttpError } from '../../../src/util/errors/NotModifiedHttpError';
 import { PreconditionFailedHttpError } from '../../../src/util/errors/PreconditionFailedHttpError';
 import type { Guarded } from '../../../src/util/GuardedStream';
 import { SingleRootIdentifierStrategy } from '../../../src/util/identifiers/SingleRootIdentifierStrategy';
@@ -26,6 +27,7 @@ import { trimTrailingSlashes } from '../../../src/util/PathUtil';
 import { guardedStreamFrom } from '../../../src/util/StreamUtil';
 import { CONTENT_TYPE, SOLID_HTTP, LDP, PIM, RDF, SOLID_META, DC, SOLID_AS, AS } from '../../../src/util/Vocabularies';
 import { SimpleSuffixStrategy } from '../../util/SimpleSuffixStrategy';
+
 const { namedNode, quad, literal } = DataFactory;
 
 const GENERATED_PREDICATE = namedNode('generated');
@@ -216,6 +218,18 @@ describe('A DataAccessorBasedStore', (): void => {
       );
       expect(result.metadata.contentType).toBe(INTERNAL_QUADS);
     });
+
+    it('throws a 304 if the request is a read type error.', async(): Promise<void> => {
+      const resourceID = { path: root };
+      const conditions = new BasicConditions({ notMatchesETag: [ '*' ]});
+      await expect(store.getRepresentation(resourceID, undefined, conditions)).rejects.toThrow(NotModifiedHttpError);
+    });
+
+    it('has conditions but throws no error.', async(): Promise<void> => {
+      const resourceID = { path: root };
+      const conditions = new BasicConditions({ matchesETag: [ '*' ]});
+      await expect(store.getRepresentation(resourceID, undefined, conditions)).resolves.toBeTruthy();
+    });
   });
 
   describe('adding a Resource', (): void => {

test/unit/util/errors/HttpError.test.ts

@@ -9,16 +9,19 @@ import { InternalServerError } from '../../../../src/util/errors/InternalServerE
 import { MethodNotAllowedHttpError } from '../../../../src/util/errors/MethodNotAllowedHttpError';
 import { NotFoundHttpError } from '../../../../src/util/errors/NotFoundHttpError';
 import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError';
+import { NotModifiedHttpError } from '../../../../src/util/errors/NotModifiedHttpError';
 import { PayloadHttpError } from '../../../../src/util/errors/PayloadHttpError';
 import { PreconditionFailedHttpError } from '../../../../src/util/errors/PreconditionFailedHttpError';
 import { UnauthorizedHttpError } from '../../../../src/util/errors/UnauthorizedHttpError';
 import { UnprocessableEntityHttpError } from '../../../../src/util/errors/UnprocessableEntityHttpError';
 import { UnsupportedMediaTypeHttpError } from '../../../../src/util/errors/UnsupportedMediaTypeHttpError';
 import { SOLID_ERROR } from '../../../../src/util/Vocabularies';
+
 const { literal, namedNode, quad } = DataFactory;
 
 describe('HttpError', (): void => {
   const errors: [string, number, HttpErrorClass][] = [
+    [ 'NotModifiedHttpError', 304, NotModifiedHttpError ],
     [ 'BadRequestHttpError', 400, BadRequestHttpError ],
     [ 'UnauthorizedHttpError', 401, UnauthorizedHttpError ],
     [ 'ForbiddenHttpError', 403, ForbiddenHttpError ],