arocapi 5.0.0-beta.1 → 5.0.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +37 -802
- package/dist/app.d.ts +22 -9
- package/dist/app.js +46 -30
- package/dist/app.js.map +1 -1
- package/dist/app.test.js +41 -56
- package/dist/app.test.js.map +1 -1
- package/dist/errorHandling.test.d.ts +1 -0
- package/dist/errorHandling.test.js +222 -0
- package/dist/errorHandling.test.js.map +1 -0
- package/dist/index.dev.js +4 -3
- package/dist/index.dev.js.map +1 -1
- package/dist/routes/capabilities.d.ts +7 -0
- package/dist/routes/capabilities.js +13 -0
- package/dist/routes/capabilities.js.map +1 -0
- package/dist/routes/capabilities.test.d.ts +1 -0
- package/dist/routes/capabilities.test.js +81 -0
- package/dist/routes/capabilities.test.js.map +1 -0
- package/dist/routes/crate.test.js +67 -19
- package/dist/routes/crate.test.js.map +1 -1
- package/dist/routes/entities.d.ts +5 -2
- package/dist/routes/entities.js +31 -49
- package/dist/routes/entities.js.map +1 -1
- package/dist/routes/entities.test.js +16 -12
- package/dist/routes/entities.test.js.map +1 -1
- package/dist/routes/entity.d.ts +7 -2
- package/dist/routes/entity.js +14 -29
- package/dist/routes/entity.js.map +1 -1
- package/dist/routes/entity.test.js +19 -13
- package/dist/routes/entity.test.js.map +1 -1
- package/dist/routes/file.d.ts +6 -0
- package/dist/routes/file.js +67 -59
- package/dist/routes/file.js.map +1 -1
- package/dist/routes/file.test.js +99 -22
- package/dist/routes/file.test.js.map +1 -1
- package/dist/routes/files.d.ts +5 -2
- package/dist/routes/files.js +24 -39
- package/dist/routes/files.js.map +1 -1
- package/dist/routes/files.test.js +44 -21
- package/dist/routes/files.test.js.map +1 -1
- package/dist/routes/metadata.d.ts +6 -0
- package/dist/routes/metadata.js +49 -54
- package/dist/routes/metadata.js.map +1 -1
- package/dist/routes/search.d.ts +8 -5
- package/dist/routes/search.js +95 -101
- package/dist/routes/search.js.map +1 -1
- package/dist/routes/search.test.js +92 -39
- package/dist/routes/search.test.js.map +1 -1
- package/dist/test/helpers/fastify.d.ts +1 -1
- package/dist/test/helpers/fastify.js +2 -3
- package/dist/test/helpers/fastify.js.map +1 -1
- package/dist/test/integration.setup.d.ts +19 -1
- package/dist/test/integration.setup.js +15 -7
- package/dist/test/integration.setup.js.map +1 -1
- package/dist/test/integration.test.js +368 -2
- package/dist/test/integration.test.js.map +1 -1
- package/dist/transformers/default.d.ts +10 -18
- package/dist/transformers/default.js +41 -15
- package/dist/transformers/default.js.map +1 -1
- package/dist/transformers/default.test.js +109 -47
- package/dist/transformers/default.test.js.map +1 -1
- package/dist/transformers/transformer.test.js +12 -34
- package/dist/transformers/transformer.test.js.map +1 -1
- package/dist/types/access.d.ts +9 -0
- package/dist/types/access.js +2 -0
- package/dist/types/access.js.map +1 -0
- package/dist/types/context.d.ts +6 -0
- package/dist/types/context.js +2 -0
- package/dist/types/context.js.map +1 -0
- package/dist/types/fileHandlers.d.ts +5 -9
- package/dist/types/transformers.d.ts +4 -10
- package/dist/types/visibility.d.ts +5 -0
- package/dist/types/visibility.js +2 -0
- package/dist/types/visibility.js.map +1 -0
- package/dist/utils/access.d.ts +17 -0
- package/dist/utils/access.js +41 -0
- package/dist/utils/access.js.map +1 -0
- package/dist/utils/errors.d.ts +19 -10
- package/dist/utils/errors.js +44 -8
- package/dist/utils/errors.js.map +1 -1
- package/dist/utils/errors.test.js +14 -1
- package/dist/utils/errors.test.js.map +1 -1
- package/dist/utils/queryBuilder.d.ts +12 -0
- package/dist/utils/queryBuilder.js +9 -0
- package/dist/utils/queryBuilder.js.map +1 -1
- package/dist/utils/validation.d.ts +2 -0
- package/dist/utils/validation.js +8 -0
- package/dist/utils/validation.js.map +1 -0
- package/dist/utils/visibility.d.ts +18 -0
- package/dist/utils/visibility.js +16 -0
- package/dist/utils/visibility.js.map +1 -0
- package/package.json +34 -33
- package/src/app.test.ts +45 -66
- package/src/app.ts +92 -58
- package/src/errorHandling.test.ts +288 -0
- package/src/index.dev.ts +6 -4
- package/src/routes/__snapshots__/capabilities.test.ts.snap +34 -0
- package/src/routes/__snapshots__/search.test.ts.snap +2 -2
- package/src/routes/capabilities.test.ts +102 -0
- package/src/routes/capabilities.ts +22 -0
- package/src/routes/crate.test.ts +80 -19
- package/src/routes/entities.test.ts +16 -12
- package/src/routes/entities.ts +40 -59
- package/src/routes/entity.test.ts +19 -13
- package/src/routes/entity.ts +22 -35
- package/src/routes/file.test.ts +117 -22
- package/src/routes/file.ts +84 -62
- package/src/routes/files.test.ts +52 -26
- package/src/routes/files.ts +31 -47
- package/src/routes/metadata.ts +64 -58
- package/src/routes/search.test.ts +95 -39
- package/src/routes/search.ts +120 -125
- package/src/test/helpers/fastify.ts +2 -3
- package/src/test/integration.setup.ts +18 -7
- package/src/test/integration.test.ts +472 -1
- package/src/transformers/default.test.ts +139 -47
- package/src/transformers/default.ts +103 -83
- package/src/transformers/transformer.test.ts +18 -44
- package/src/types/access.ts +20 -0
- package/src/types/context.ts +15 -0
- package/src/types/fileHandlers.ts +5 -13
- package/src/types/transformers.ts +4 -32
- package/src/types/visibility.ts +18 -0
- package/src/utils/access.ts +80 -0
- package/src/utils/errors.test.ts +16 -1
- package/src/utils/errors.ts +68 -11
- package/src/utils/queryBuilder.ts +25 -0
- package/src/utils/validation.ts +11 -0
- package/src/utils/visibility.ts +56 -0
package/dist/app.d.ts
CHANGED
|
@@ -1,27 +1,40 @@
|
|
|
1
1
|
import type { Client } from '@opensearch-project/opensearch';
|
|
2
2
|
import type { FastifyPluginAsync } from 'fastify';
|
|
3
3
|
import type { PrismaClient } from './generated/prisma/client.js';
|
|
4
|
+
import type { AccessFunction } from './types/access.js';
|
|
5
|
+
import type { IsAuthenticated } from './types/context.js';
|
|
4
6
|
import type { FileHandler, RoCrateHandler } from './types/fileHandlers.js';
|
|
5
|
-
import type {
|
|
6
|
-
import type {
|
|
7
|
+
import type { EntityTransformer, FileTransformer } from './types/transformers.js';
|
|
8
|
+
import type { EntityVisibilityFilter, SearchVisibilityFilter } from './types/visibility.js';
|
|
9
|
+
import type { FacetCapability, FilterCapability, QueryBuilderOptions, SearchCapability } from './utils/queryBuilder.js';
|
|
7
10
|
import { OpensearchQueryBuilder } from './utils/queryBuilder.js';
|
|
8
|
-
export type { AuthorisedEntity, AuthorisedFile, StandardEntity, StandardFile } from './transformers/default.js';
|
|
9
|
-
export {
|
|
10
|
-
export type {
|
|
11
|
-
export type {
|
|
12
|
-
export type {
|
|
11
|
+
export type { AuthorisedEntity, AuthorisedFile, BaseEntity, StandardEntity, StandardFile, } from './transformers/default.js';
|
|
12
|
+
export type { AccessFunction, AccessInfo } from './types/access.js';
|
|
13
|
+
export type { IsAuthenticated, RequestContext } from './types/context.js';
|
|
14
|
+
export type { FileHandler, FileMetadata, FilePathResult, FileRedirectResult, FileResult, FileStreamResult, GetFileHandler, GetRoCrateHandler, HeadFileHandler, HeadRoCrateHandler, RoCrateHandler, } from './types/fileHandlers.js';
|
|
15
|
+
export type { EntityTransformer, FileTransformer } from './types/transformers.js';
|
|
16
|
+
export type { EntityVisibilityFilter, SearchVisibilityFilter } from './types/visibility.js';
|
|
17
|
+
export type { LicenceAccessOptions } from './utils/access.js';
|
|
18
|
+
export { AllPublicAccess, LicenceAccess } from './utils/access.js';
|
|
19
|
+
export type { ErrorCode, StandardErrorResponse } from './utils/errors.js';
|
|
20
|
+
export { createAuthenticationRequiredError, createError, createForbiddenError, createInternalError, createNotFoundError, createValidationError, ERROR_CODES, errorHandler, notFoundHandler, } from './utils/errors.js';
|
|
21
|
+
export { AllVisibleEntityFilter, AllVisibleSearchFilter } from './utils/visibility.js';
|
|
22
|
+
export type { FacetCapability, FilterCapability, QueryBuilderOptions, SearchCapability };
|
|
13
23
|
export { OpensearchQueryBuilder };
|
|
14
24
|
export type Options = {
|
|
15
25
|
prisma: PrismaClient;
|
|
16
26
|
opensearch: Client;
|
|
17
27
|
queryBuilderClass?: typeof OpensearchQueryBuilder;
|
|
18
28
|
queryBuilderOptions?: QueryBuilderOptions;
|
|
19
|
-
|
|
29
|
+
access: AccessFunction;
|
|
20
30
|
entityTransformers?: EntityTransformer[];
|
|
21
|
-
fileAccessTransformer: FileAccessTransformer;
|
|
22
31
|
fileTransformers?: FileTransformer[];
|
|
23
32
|
fileHandler: FileHandler;
|
|
24
33
|
roCrateHandler: RoCrateHandler;
|
|
34
|
+
entityVisibilityFilter: EntityVisibilityFilter;
|
|
35
|
+
searchVisibilityFilter: SearchVisibilityFilter;
|
|
36
|
+
isAuthenticated?: IsAuthenticated;
|
|
37
|
+
promptLoginForHidden?: boolean;
|
|
25
38
|
};
|
|
26
39
|
declare const app: FastifyPluginAsync<Options>;
|
|
27
40
|
export default app;
|
package/dist/app.js
CHANGED
|
@@ -1,43 +1,42 @@
|
|
|
1
1
|
import sensible from '@fastify/sensible';
|
|
2
|
-
import
|
|
2
|
+
import capabilities from './routes/capabilities.js';
|
|
3
3
|
import entities from './routes/entities.js';
|
|
4
4
|
import entity from './routes/entity.js';
|
|
5
5
|
import file from './routes/file.js';
|
|
6
6
|
import files from './routes/files.js';
|
|
7
7
|
import metadata from './routes/metadata.js';
|
|
8
8
|
import search from './routes/search.js';
|
|
9
|
-
import {
|
|
9
|
+
import { notFoundHandler } from './utils/errors.js';
|
|
10
10
|
import { OpensearchQueryBuilder } from './utils/queryBuilder.js';
|
|
11
|
-
|
|
11
|
+
import { setupValidation } from './utils/validation.js';
|
|
12
|
+
export { AllPublicAccess, LicenceAccess } from './utils/access.js';
|
|
13
|
+
export { createAuthenticationRequiredError, createError, createForbiddenError, createInternalError, createNotFoundError, createValidationError, ERROR_CODES, errorHandler, notFoundHandler, } from './utils/errors.js';
|
|
14
|
+
export { AllVisibleEntityFilter, AllVisibleSearchFilter } from './utils/visibility.js';
|
|
12
15
|
export { OpensearchQueryBuilder };
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
}));
|
|
22
|
-
return reply.code(400).send(createValidationError('The request parameters are invalid', violations));
|
|
23
|
-
}
|
|
24
|
-
const err = error;
|
|
25
|
-
return reply.code(500).send({ error: 'Internal Server Error', message: err.message });
|
|
26
|
-
});
|
|
16
|
+
const DOCS_URL = 'https://arocapi.crate-works.org';
|
|
17
|
+
const REMOVED_OPTIONS = {
|
|
18
|
+
accessTransformer: { replacement: 'access', docs: `${DOCS_URL}/configuration/access/` },
|
|
19
|
+
fileAccessTransformer: { replacement: 'access', docs: `${DOCS_URL}/configuration/access/` },
|
|
20
|
+
hiddenResponse: {
|
|
21
|
+
replacement: 'promptLoginForHidden and isAuthenticated',
|
|
22
|
+
docs: `${DOCS_URL}/configuration/visibility/#promptloginforhidden`,
|
|
23
|
+
},
|
|
27
24
|
};
|
|
28
25
|
const app = async (fastify, options) => {
|
|
29
|
-
const { prisma, opensearch, queryBuilderClass, queryBuilderOptions,
|
|
26
|
+
const { prisma, opensearch, queryBuilderClass, queryBuilderOptions, access, entityTransformers, fileTransformers, fileHandler, roCrateHandler, entityVisibilityFilter, searchVisibilityFilter, isAuthenticated, promptLoginForHidden = false, } = options;
|
|
30
27
|
if (!prisma) {
|
|
31
28
|
throw new Error('Prisma client is required');
|
|
32
29
|
}
|
|
33
30
|
if (!opensearch) {
|
|
34
31
|
throw new Error('OpenSearch client is required');
|
|
35
32
|
}
|
|
36
|
-
|
|
37
|
-
|
|
33
|
+
for (const [removed, { replacement, docs }] of Object.entries(REMOVED_OPTIONS)) {
|
|
34
|
+
if (options[removed] !== undefined) {
|
|
35
|
+
throw new Error(`${removed} has been replaced by ${replacement}, see ${docs}`);
|
|
36
|
+
}
|
|
38
37
|
}
|
|
39
|
-
if (!
|
|
40
|
-
throw new Error('
|
|
38
|
+
if (!access) {
|
|
39
|
+
throw new Error('access is required');
|
|
41
40
|
}
|
|
42
41
|
if (!fileHandler) {
|
|
43
42
|
throw new Error('fileHandler is required');
|
|
@@ -45,20 +44,37 @@ const app = async (fastify, options) => {
|
|
|
45
44
|
if (!roCrateHandler) {
|
|
46
45
|
throw new Error('roCrateHandler is required');
|
|
47
46
|
}
|
|
47
|
+
if (!entityVisibilityFilter) {
|
|
48
|
+
throw new Error('entityVisibilityFilter is required');
|
|
49
|
+
}
|
|
50
|
+
if (!searchVisibilityFilter) {
|
|
51
|
+
throw new Error('searchVisibilityFilter is required');
|
|
52
|
+
}
|
|
53
|
+
if (promptLoginForHidden && !isAuthenticated) {
|
|
54
|
+
throw new Error('promptLoginForHidden requires isAuthenticated');
|
|
55
|
+
}
|
|
56
|
+
const refusal = { isAuthenticated, promptLoginForHidden };
|
|
48
57
|
fastify.register(sensible);
|
|
49
58
|
setupValidation(fastify);
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
59
|
+
const { prefix } = options;
|
|
60
|
+
if (prefix && prefix !== '/') {
|
|
61
|
+
fastify.setNotFoundHandler(notFoundHandler);
|
|
62
|
+
}
|
|
63
|
+
const queryBuilder = new (queryBuilderClass ?? OpensearchQueryBuilder)(queryBuilderOptions);
|
|
64
|
+
fastify.register(capabilities, { queryBuilder });
|
|
65
|
+
fastify.register(entities, { prisma, access, entityTransformers, entityVisibilityFilter });
|
|
66
|
+
fastify.register(entity, { prisma, access, entityTransformers, entityVisibilityFilter, refusal });
|
|
67
|
+
fastify.register(files, { prisma, access, fileTransformers, entityVisibilityFilter });
|
|
68
|
+
fastify.register(file, { prisma, fileHandler, access, entityVisibilityFilter, refusal });
|
|
69
|
+
fastify.register(metadata, { prisma, roCrateHandler, access, entityVisibilityFilter, refusal });
|
|
55
70
|
fastify.register(search, {
|
|
56
71
|
prisma,
|
|
57
72
|
opensearch,
|
|
58
|
-
|
|
73
|
+
access,
|
|
59
74
|
entityTransformers,
|
|
60
|
-
|
|
61
|
-
|
|
75
|
+
queryBuilder,
|
|
76
|
+
entityVisibilityFilter,
|
|
77
|
+
searchVisibilityFilter,
|
|
62
78
|
});
|
|
63
79
|
};
|
|
64
80
|
export default app;
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
package/dist/app.test.js
CHANGED
|
@@ -1,79 +1,64 @@
|
|
|
1
1
|
import Fastify from 'fastify';
|
|
2
2
|
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
3
3
|
import { mockReset } from 'vitest-mock-extended';
|
|
4
|
-
import app, {
|
|
4
|
+
import app, { AllPublicAccess, AllVisibleEntityFilter, AllVisibleSearchFilter } from './app.js';
|
|
5
5
|
import { opensearch, prisma } from './test/helpers/fastify.js';
|
|
6
6
|
describe('Entity Route', () => {
|
|
7
7
|
beforeEach(() => {
|
|
8
8
|
mockReset(prisma);
|
|
9
9
|
mockReset(opensearch);
|
|
10
10
|
});
|
|
11
|
+
const requiredOptions = () => ({
|
|
12
|
+
prisma,
|
|
13
|
+
opensearch,
|
|
14
|
+
access: AllPublicAccess,
|
|
15
|
+
fileHandler: { get: vi.fn(), head: vi.fn() },
|
|
16
|
+
roCrateHandler: { get: vi.fn(), head: vi.fn() },
|
|
17
|
+
entityVisibilityFilter: AllVisibleEntityFilter,
|
|
18
|
+
searchVisibilityFilter: AllVisibleSearchFilter,
|
|
19
|
+
});
|
|
11
20
|
describe('App Registration', () => {
|
|
12
|
-
it(
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
21
|
+
it.each([
|
|
22
|
+
['prisma', 'Prisma client is required'],
|
|
23
|
+
['opensearch', 'OpenSearch client is required'],
|
|
24
|
+
['access', 'access is required'],
|
|
25
|
+
['fileHandler', 'fileHandler is required'],
|
|
26
|
+
['roCrateHandler', 'roCrateHandler is required'],
|
|
27
|
+
['entityVisibilityFilter', 'entityVisibilityFilter is required'],
|
|
28
|
+
['searchVisibilityFilter', 'searchVisibilityFilter is required'],
|
|
29
|
+
])('should handle missing %s', async (option, message) => {
|
|
20
30
|
const fastify = Fastify({ logger: false });
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
await expect(() => fastify.ready()).rejects.toThrowError('OpenSearch client is required');
|
|
31
|
+
const { [option]: _omitted, ...options } = requiredOptions();
|
|
32
|
+
fastify.register(app, options);
|
|
33
|
+
await expect(() => fastify.ready()).rejects.toThrowError(message);
|
|
25
34
|
});
|
|
26
|
-
it(
|
|
35
|
+
it.each([
|
|
36
|
+
['accessTransformer', 'access', 'https://arocapi.crate-works.org/configuration/access/'],
|
|
37
|
+
['fileAccessTransformer', 'access', 'https://arocapi.crate-works.org/configuration/access/'],
|
|
38
|
+
[
|
|
39
|
+
'hiddenResponse',
|
|
40
|
+
'promptLoginForHidden and isAuthenticated',
|
|
41
|
+
'https://arocapi.crate-works.org/configuration/visibility/#promptloginforhidden',
|
|
42
|
+
],
|
|
43
|
+
])('should reject the removed %s option', async (option, replacement, docs) => {
|
|
27
44
|
const fastify = Fastify({ logger: false });
|
|
28
|
-
fastify.register(app, {
|
|
29
|
-
|
|
30
|
-
opensearch,
|
|
31
|
-
});
|
|
32
|
-
await expect(() => fastify.ready()).rejects.toThrowError('accessTransformer is required');
|
|
45
|
+
fastify.register(app, { ...requiredOptions(), [option]: 'notFound' });
|
|
46
|
+
await expect(() => fastify.ready()).rejects.toThrowError(`${option} has been replaced by ${replacement}, see ${docs}`);
|
|
33
47
|
});
|
|
34
|
-
it('should
|
|
48
|
+
it('should reject promptLoginForHidden without isAuthenticated', async () => {
|
|
35
49
|
const fastify = Fastify({ logger: false });
|
|
36
|
-
fastify.register(app, {
|
|
37
|
-
|
|
38
|
-
opensearch,
|
|
39
|
-
accessTransformer: AllPublicAccessTransformer,
|
|
40
|
-
});
|
|
41
|
-
await expect(() => fastify.ready()).rejects.toThrowError('fileAccessTransformer is required');
|
|
50
|
+
fastify.register(app, { ...requiredOptions(), promptLoginForHidden: true });
|
|
51
|
+
await expect(() => fastify.ready()).rejects.toThrowError('promptLoginForHidden requires isAuthenticated');
|
|
42
52
|
});
|
|
43
|
-
it('should
|
|
53
|
+
it('should ignore a removed option left undefined', async () => {
|
|
44
54
|
const fastify = Fastify({ logger: false });
|
|
45
|
-
fastify.register(app, {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
accessTransformer: AllPublicAccessTransformer,
|
|
49
|
-
fileAccessTransformer: AllPublicFileAccessTransformer,
|
|
50
|
-
});
|
|
51
|
-
await expect(() => fastify.ready()).rejects.toThrowError('fileHandler is required');
|
|
52
|
-
});
|
|
53
|
-
it('should handle missing roCrateHandler', async () => {
|
|
54
|
-
const fastify = Fastify({ logger: false });
|
|
55
|
-
fastify.register(app, {
|
|
56
|
-
prisma,
|
|
57
|
-
opensearch,
|
|
58
|
-
accessTransformer: AllPublicAccessTransformer,
|
|
59
|
-
fileAccessTransformer: AllPublicFileAccessTransformer,
|
|
60
|
-
fileHandler: {
|
|
61
|
-
get: vi.fn(),
|
|
62
|
-
head: vi.fn(),
|
|
63
|
-
},
|
|
64
|
-
});
|
|
65
|
-
await expect(() => fastify.ready()).rejects.toThrowError('roCrateHandler is required');
|
|
55
|
+
await fastify.register(app, { ...requiredOptions(), accessTransformer: undefined });
|
|
56
|
+
await expect(fastify.ready()).resolves.toBeDefined();
|
|
57
|
+
await fastify.close();
|
|
66
58
|
});
|
|
67
59
|
it('should register successfully with all required options', async () => {
|
|
68
60
|
const fastify = Fastify({ logger: false });
|
|
69
|
-
await fastify.register(app,
|
|
70
|
-
prisma,
|
|
71
|
-
opensearch,
|
|
72
|
-
accessTransformer: AllPublicAccessTransformer,
|
|
73
|
-
fileAccessTransformer: AllPublicFileAccessTransformer,
|
|
74
|
-
fileHandler: { get: vi.fn(), head: vi.fn() },
|
|
75
|
-
roCrateHandler: { get: vi.fn(), head: vi.fn() },
|
|
76
|
-
});
|
|
61
|
+
await fastify.register(app, requiredOptions());
|
|
77
62
|
await expect(fastify.ready()).resolves.toBeDefined();
|
|
78
63
|
await fastify.close();
|
|
79
64
|
});
|
package/dist/app.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../src/app.test.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../src/app.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
import sensible from '@fastify/sensible';
|
|
2
|
+
import Fastify from 'fastify';
|
|
3
|
+
import { serializerCompiler, validatorCompiler } from 'fastify-type-provider-zod';
|
|
4
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
5
|
+
import { z } from 'zod';
|
|
6
|
+
import arocapi, { AllPublicAccess, AllVisibleEntityFilter, AllVisibleSearchFilter, errorHandler, notFoundHandler, } from './app.js';
|
|
7
|
+
import { opensearch, prisma } from './test/helpers/fastify.js';
|
|
8
|
+
const arocapiOptions = {
|
|
9
|
+
prisma,
|
|
10
|
+
opensearch,
|
|
11
|
+
access: AllPublicAccess,
|
|
12
|
+
fileHandler: { get: vi.fn(), head: vi.fn() },
|
|
13
|
+
roCrateHandler: { get: vi.fn(), head: vi.fn() },
|
|
14
|
+
entityVisibilityFilter: AllVisibleEntityFilter,
|
|
15
|
+
searchVisibilityFilter: AllVisibleSearchFilter,
|
|
16
|
+
};
|
|
17
|
+
const internalErrorBody = { error: { code: 'INTERNAL_ERROR', message: 'Internal server error' } };
|
|
18
|
+
const notFoundBody = { error: { code: 'NOT_FOUND', message: 'The requested resource was not found' } };
|
|
19
|
+
const message = 'Something specific went wrong';
|
|
20
|
+
const buildConsumer = () => {
|
|
21
|
+
const logs = [];
|
|
22
|
+
const fastify = Fastify({
|
|
23
|
+
logger: {
|
|
24
|
+
level: 'info',
|
|
25
|
+
stream: { write: (line) => logs.push(JSON.parse(line)) },
|
|
26
|
+
},
|
|
27
|
+
});
|
|
28
|
+
fastify.setValidatorCompiler(validatorCompiler);
|
|
29
|
+
fastify.setSerializerCompiler(serializerCompiler);
|
|
30
|
+
fastify.setErrorHandler(errorHandler);
|
|
31
|
+
fastify.setNotFoundHandler(notFoundHandler);
|
|
32
|
+
return { fastify, logs };
|
|
33
|
+
};
|
|
34
|
+
describe('Error handling for consumer routes', () => {
|
|
35
|
+
it('hides unexpected errors behind a generic 500 and logs them', async () => {
|
|
36
|
+
const { fastify, logs } = buildConsumer();
|
|
37
|
+
fastify.get('/boom', async () => {
|
|
38
|
+
throw new Error('db password is hunter2');
|
|
39
|
+
});
|
|
40
|
+
const response = await fastify.inject({ method: 'GET', url: '/boom' });
|
|
41
|
+
expect(response.statusCode).toBe(500);
|
|
42
|
+
expect(response.json()).toEqual(internalErrorBody);
|
|
43
|
+
expect(logs.some((l) => l.level === 50 && l.err.message === 'db password is hunter2')).toBe(true);
|
|
44
|
+
});
|
|
45
|
+
it.each([
|
|
46
|
+
[400, 400, { error: { code: 'VALIDATION_ERROR', message } }],
|
|
47
|
+
[401, 401, { error: { code: 'UNAUTHORIZED', message } }],
|
|
48
|
+
[403, 403, { error: { code: 'FORBIDDEN', message } }],
|
|
49
|
+
[404, 404, { error: { code: 'NOT_FOUND', message } }],
|
|
50
|
+
[405, 405, { error: { code: 'VALIDATION_ERROR', message } }],
|
|
51
|
+
[409, 409, { error: { code: 'CONFLICT', message } }],
|
|
52
|
+
[413, 413, { error: { code: 'VALIDATION_ERROR', message } }],
|
|
53
|
+
[416, 416, { error: { code: 'RANGE_NOT_SATISFIABLE', message } }],
|
|
54
|
+
[422, 422, { error: { code: 'VALIDATION_ERROR', message } }],
|
|
55
|
+
[429, 429, { error: { code: 'RATE_LIMIT_EXCEEDED', message } }],
|
|
56
|
+
[503, 500, internalErrorBody],
|
|
57
|
+
])('answers a thrown %i http error with %i in the spec shape', async (thrown, status, body) => {
|
|
58
|
+
const { fastify } = buildConsumer();
|
|
59
|
+
await fastify.register(sensible);
|
|
60
|
+
fastify.get('/fail', async () => {
|
|
61
|
+
throw fastify.httpErrors.createError(thrown, message);
|
|
62
|
+
});
|
|
63
|
+
const response = await fastify.inject({ method: 'GET', url: '/fail' });
|
|
64
|
+
expect(response.statusCode).toBe(status);
|
|
65
|
+
expect(response.json()).toEqual(body);
|
|
66
|
+
});
|
|
67
|
+
it('keeps headers carried by the error', async () => {
|
|
68
|
+
const { fastify } = buildConsumer();
|
|
69
|
+
await fastify.register(sensible);
|
|
70
|
+
fastify.get('/fail', async () => {
|
|
71
|
+
throw fastify.httpErrors.createError(401, message, { headers: { 'www-authenticate': 'Bearer' } });
|
|
72
|
+
});
|
|
73
|
+
const response = await fastify.inject({ method: 'GET', url: '/fail' });
|
|
74
|
+
expect(response.statusCode).toBe(401);
|
|
75
|
+
expect(response.headers['www-authenticate']).toBe('Bearer');
|
|
76
|
+
});
|
|
77
|
+
it('hides a library error with a 4xx status behind a generic 500 and logs it with its stack', async () => {
|
|
78
|
+
const { fastify, logs } = buildConsumer();
|
|
79
|
+
const raw = 'index_not_found_exception: no such index [items-v2]';
|
|
80
|
+
fastify.get('/fail', async () => {
|
|
81
|
+
throw Object.assign(new Error(raw), { name: 'ResponseError', statusCode: 404, meta: { statusCode: 404 } });
|
|
82
|
+
});
|
|
83
|
+
const response = await fastify.inject({ method: 'GET', url: '/fail' });
|
|
84
|
+
expect(response.statusCode).toBe(500);
|
|
85
|
+
expect(response.json()).toEqual(internalErrorBody);
|
|
86
|
+
expect(response.body).not.toContain('items-v2');
|
|
87
|
+
const logged = logs.find((l) => l.level === 50)?.err;
|
|
88
|
+
expect(logged?.message).toBe(raw);
|
|
89
|
+
expect(logged?.stack).toContain(raw);
|
|
90
|
+
});
|
|
91
|
+
it('keeps the status and message of a custom error marked expose', async () => {
|
|
92
|
+
class ConflictError extends Error {
|
|
93
|
+
statusCode = 409;
|
|
94
|
+
expose = true;
|
|
95
|
+
}
|
|
96
|
+
const { fastify } = buildConsumer();
|
|
97
|
+
fastify.get('/fail', async () => {
|
|
98
|
+
throw new ConflictError(message);
|
|
99
|
+
});
|
|
100
|
+
const response = await fastify.inject({ method: 'GET', url: '/fail' });
|
|
101
|
+
expect(response.statusCode).toBe(409);
|
|
102
|
+
expect(response.json()).toEqual({ error: { code: 'CONFLICT', message } });
|
|
103
|
+
});
|
|
104
|
+
it.each([
|
|
105
|
+
['an invalid JSON body', { 'content-type': 'application/json' }, '{"broken', 400],
|
|
106
|
+
['an oversized body', { 'content-type': 'application/json' }, JSON.stringify({ big: 'x'.repeat(200) }), 413],
|
|
107
|
+
['an unsupported media type', { 'content-type': 'application/x-unknown' }, 'whatever', 415],
|
|
108
|
+
])("keeps Fastify's own client error for %s", async (_label, headers, payload, status) => {
|
|
109
|
+
const { fastify } = buildConsumer();
|
|
110
|
+
fastify.post('/things', { bodyLimit: 100 }, async () => ({}));
|
|
111
|
+
const response = await fastify.inject({ method: 'POST', url: '/things', headers, payload });
|
|
112
|
+
expect(response.statusCode).toBe(status);
|
|
113
|
+
expect(response.json().error.code).toBe('VALIDATION_ERROR');
|
|
114
|
+
expect(response.json().error.message).not.toBe('');
|
|
115
|
+
});
|
|
116
|
+
it('hides errors that carry only a status behind a generic 500', async () => {
|
|
117
|
+
const { fastify } = buildConsumer();
|
|
118
|
+
fastify.get('/fail', async () => {
|
|
119
|
+
throw Object.assign(new Error(message), { status: 403 });
|
|
120
|
+
});
|
|
121
|
+
const response = await fastify.inject({ method: 'GET', url: '/fail' });
|
|
122
|
+
expect(response.statusCode).toBe(500);
|
|
123
|
+
expect(response.json()).toEqual(internalErrorBody);
|
|
124
|
+
});
|
|
125
|
+
it('maps a thrown plain object marked expose with no message', async () => {
|
|
126
|
+
const { fastify } = buildConsumer();
|
|
127
|
+
fastify.get('/fail', async () => {
|
|
128
|
+
throw { statusCode: 404, expose: true };
|
|
129
|
+
});
|
|
130
|
+
const response = await fastify.inject({ method: 'GET', url: '/fail' });
|
|
131
|
+
expect(response.statusCode).toBe(404);
|
|
132
|
+
expect(response.json()).toEqual({ error: { code: 'NOT_FOUND', message: '' } });
|
|
133
|
+
});
|
|
134
|
+
it('hides an error with a non-string code behind a generic 500', async () => {
|
|
135
|
+
const { fastify } = buildConsumer();
|
|
136
|
+
fastify.get('/fail', async () => {
|
|
137
|
+
throw Object.assign(new Error(message), { code: 14, statusCode: 400 });
|
|
138
|
+
});
|
|
139
|
+
const response = await fastify.inject({ method: 'GET', url: '/fail' });
|
|
140
|
+
expect(response.statusCode).toBe(500);
|
|
141
|
+
expect(response.json()).toEqual(internalErrorBody);
|
|
142
|
+
});
|
|
143
|
+
it('hides a thrown plain object with a status behind a generic 500', async () => {
|
|
144
|
+
const { fastify } = buildConsumer();
|
|
145
|
+
fastify.get('/fail', async () => {
|
|
146
|
+
throw { statusCode: 404 };
|
|
147
|
+
});
|
|
148
|
+
const response = await fastify.inject({ method: 'GET', url: '/fail' });
|
|
149
|
+
expect(response.statusCode).toBe(500);
|
|
150
|
+
expect(response.json()).toEqual(internalErrorBody);
|
|
151
|
+
});
|
|
152
|
+
it.each([null, undefined])('answers a thrown %s with a generic 500', async (thrown) => {
|
|
153
|
+
const { fastify } = buildConsumer();
|
|
154
|
+
fastify.get('/fail', async () => {
|
|
155
|
+
throw thrown;
|
|
156
|
+
});
|
|
157
|
+
const response = await fastify.inject({ method: 'GET', url: '/fail' });
|
|
158
|
+
expect(response.statusCode).toBe(500);
|
|
159
|
+
expect(response.json()).toEqual(internalErrorBody);
|
|
160
|
+
});
|
|
161
|
+
it('answers Zod validation failures with VALIDATION_ERROR violations', async () => {
|
|
162
|
+
const { fastify } = buildConsumer();
|
|
163
|
+
fastify
|
|
164
|
+
.withTypeProvider()
|
|
165
|
+
.get('/things', { schema: { querystring: z.object({ limit: z.coerce.number().int() }) } }, async () => ({}));
|
|
166
|
+
const response = await fastify.inject({ method: 'GET', url: '/things?limit=abc' });
|
|
167
|
+
expect(response.statusCode).toBe(400);
|
|
168
|
+
expect(response.json()).toMatchObject({
|
|
169
|
+
error: {
|
|
170
|
+
code: 'VALIDATION_ERROR',
|
|
171
|
+
message: 'The request parameters are invalid',
|
|
172
|
+
details: { violations: [{ field: '/limit' }] },
|
|
173
|
+
},
|
|
174
|
+
});
|
|
175
|
+
});
|
|
176
|
+
it('answers unknown routes with NOT_FOUND', async () => {
|
|
177
|
+
const { fastify } = buildConsumer();
|
|
178
|
+
const response = await fastify.inject({ method: 'GET', url: '/nowhere' });
|
|
179
|
+
expect(response.statusCode).toBe(404);
|
|
180
|
+
expect(response.json()).toEqual(notFoundBody);
|
|
181
|
+
});
|
|
182
|
+
it.each([
|
|
183
|
+
['without a prefix', undefined, '/entities'],
|
|
184
|
+
['under a prefix', '/api', '/api/entities'],
|
|
185
|
+
])('answers arocapi routes registered %s in the spec shape', async (_label, prefix, url) => {
|
|
186
|
+
const { fastify } = buildConsumer();
|
|
187
|
+
await fastify.register(arocapi, { ...arocapiOptions, prefix });
|
|
188
|
+
const invalid = await fastify.inject({ method: 'GET', url: `${url}?limit=abc` });
|
|
189
|
+
const unknown = await fastify.inject({ method: 'GET', url: `${url}/nowhere/else` });
|
|
190
|
+
expect(invalid.statusCode).toBe(400);
|
|
191
|
+
expect(invalid.json().error.code).toBe('VALIDATION_ERROR');
|
|
192
|
+
expect(unknown.statusCode).toBe(404);
|
|
193
|
+
expect(unknown.json().error.code).toBe('NOT_FOUND');
|
|
194
|
+
});
|
|
195
|
+
it('leaves 404s to a prefixed consumer scope that mounts arocapi without its own prefix', async () => {
|
|
196
|
+
const { fastify } = buildConsumer();
|
|
197
|
+
await fastify.register(async (api) => {
|
|
198
|
+
api.setNotFoundHandler((_request, reply) => reply.code(404).send({ scope: 'api' }));
|
|
199
|
+
await api.register(arocapi, arocapiOptions);
|
|
200
|
+
}, { prefix: '/api' });
|
|
201
|
+
const response = await fastify.inject({ method: 'GET', url: '/api/nowhere' });
|
|
202
|
+
expect(response.statusCode).toBe(404);
|
|
203
|
+
expect(response.json()).toEqual({ scope: 'api' });
|
|
204
|
+
});
|
|
205
|
+
it("leaves the consumer's root 404s alone when arocapi is registered with prefix '/'", async () => {
|
|
206
|
+
const fastify = Fastify({ logger: false });
|
|
207
|
+
fastify.setNotFoundHandler((_request, reply) => reply.code(404).send({ scope: 'root' }));
|
|
208
|
+
await fastify.register(arocapi, { ...arocapiOptions, prefix: '/' });
|
|
209
|
+
const response = await fastify.inject({ method: 'GET', url: '/nowhere' });
|
|
210
|
+
expect(response.json()).toEqual({ scope: 'root' });
|
|
211
|
+
});
|
|
212
|
+
});
|
|
213
|
+
describe('Error handling for arocapi on its own', () => {
|
|
214
|
+
it('answers unknown paths under its prefix with NOT_FOUND', async () => {
|
|
215
|
+
const fastify = Fastify({ logger: false });
|
|
216
|
+
await fastify.register(arocapi, { ...arocapiOptions, prefix: '/api' });
|
|
217
|
+
const response = await fastify.inject({ method: 'GET', url: '/api/nowhere' });
|
|
218
|
+
expect(response.statusCode).toBe(404);
|
|
219
|
+
expect(response.json()).toEqual(notFoundBody);
|
|
220
|
+
});
|
|
221
|
+
});
|
|
222
|
+
//# sourceMappingURL=errorHandling.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errorHandling.test.js","sourceRoot":"","sources":["../src/errorHandling.test.ts"],"names":[],"mappings":"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"}
|
package/dist/index.dev.js
CHANGED
|
@@ -3,7 +3,7 @@ import { Readable } from 'node:stream';
|
|
|
3
3
|
import { Client } from '@opensearch-project/opensearch';
|
|
4
4
|
import { PrismaMariaDb } from '@prisma/adapter-mariadb';
|
|
5
5
|
import Fastify from 'fastify';
|
|
6
|
-
import arocapi, {
|
|
6
|
+
import arocapi, { AllPublicAccess, AllVisibleEntityFilter, AllVisibleSearchFilter, } from './app.js';
|
|
7
7
|
import { PrismaClient } from './generated/prisma/client.js';
|
|
8
8
|
const adapter = new PrismaMariaDb({
|
|
9
9
|
host: 'localhost',
|
|
@@ -139,9 +139,10 @@ fastify.register(arocapi, {
|
|
|
139
139
|
opensearch,
|
|
140
140
|
fileHandler,
|
|
141
141
|
roCrateHandler,
|
|
142
|
-
|
|
142
|
+
access: AllPublicAccess,
|
|
143
143
|
entityTransformers: [oniTransformer],
|
|
144
|
-
|
|
144
|
+
entityVisibilityFilter: AllVisibleEntityFilter,
|
|
145
|
+
searchVisibilityFilter: AllVisibleSearchFilter,
|
|
145
146
|
});
|
|
146
147
|
const start = async () => {
|
|
147
148
|
try {
|