arocapi 2.1.0 → 4.0.0
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 +70 -26
- package/dist/app.d.ts +3 -9
- package/dist/app.js +20 -34
- package/dist/app.js.map +1 -1
- package/dist/app.test.js +5 -40
- package/dist/app.test.js.map +1 -1
- package/dist/index.dev.d.ts +1 -8
- package/dist/index.dev.js +12 -2
- package/dist/index.dev.js.map +1 -1
- package/dist/routes/crate.d.ts +2 -0
- package/dist/routes/crate.js +8 -27
- package/dist/routes/crate.js.map +1 -1
- package/dist/routes/crate.test.js +21 -23
- package/dist/routes/crate.test.js.map +1 -1
- package/dist/routes/entities.d.ts +2 -0
- package/dist/routes/entities.js +16 -20
- package/dist/routes/entities.js.map +1 -1
- package/dist/routes/entities.test.js +20 -19
- package/dist/routes/entities.test.js.map +1 -1
- package/dist/routes/entity.d.ts +2 -0
- package/dist/routes/entity.js +7 -14
- package/dist/routes/entity.js.map +1 -1
- package/dist/routes/entity.test.js +13 -17
- package/dist/routes/entity.test.js.map +1 -1
- package/dist/routes/file.d.ts +2 -0
- package/dist/routes/file.js +8 -27
- package/dist/routes/file.js.map +1 -1
- package/dist/routes/file.test.js +19 -23
- package/dist/routes/file.test.js.map +1 -1
- package/dist/routes/files.d.ts +2 -0
- package/dist/routes/files.js +15 -20
- package/dist/routes/files.js.map +1 -1
- package/dist/routes/files.test.js +13 -35
- package/dist/routes/files.test.js.map +1 -1
- package/dist/routes/search.d.ts +4 -0
- package/dist/routes/search.js +21 -24
- package/dist/routes/search.js.map +1 -1
- package/dist/routes/search.test.js +56 -24
- package/dist/routes/search.test.js.map +1 -1
- package/dist/test/helpers/fastify.js +0 -6
- package/dist/test/helpers/fastify.js.map +1 -1
- package/dist/test/integration.setup.d.ts +2 -4
- package/dist/test/integration.setup.js +41 -21
- package/dist/test/integration.setup.js.map +1 -1
- package/dist/test/integration.test.js +59 -0
- package/dist/test/integration.test.js.map +1 -1
- package/dist/transformers/default.d.ts +11 -18
- package/dist/transformers/default.js +5 -18
- package/dist/transformers/default.js.map +1 -1
- package/dist/transformers/default.test.js +6 -15
- package/dist/transformers/default.test.js.map +1 -1
- package/dist/transformers/transformer.test.js +2 -6
- package/dist/transformers/transformer.test.js.map +1 -1
- package/dist/utils/errors.d.ts +7 -1
- package/dist/utils/errors.js +2 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/utils/headers.d.ts +7 -0
- package/dist/utils/headers.js +11 -0
- package/dist/utils/headers.js.map +1 -0
- package/dist/utils/queryBuilder.d.ts +2 -2
- package/dist/utils/queryBuilder.js +2 -3
- package/dist/utils/queryBuilder.js.map +1 -1
- package/package.json +24 -24
- package/prisma/models/entity.prisma +17 -13
- package/prisma/models/file.prisma +9 -13
- package/prisma.config.ts +0 -2
- package/src/app.test.ts +5 -44
- package/src/app.ts +25 -47
- package/src/index.dev.ts +13 -9
- package/src/routes/__snapshots__/search.test.ts.snap +2 -2
- package/src/routes/crate.test.ts +21 -23
- package/src/routes/crate.ts +11 -33
- package/src/routes/entities.test.ts +23 -19
- package/src/routes/entities.ts +19 -23
- package/src/routes/entity.test.ts +15 -17
- package/src/routes/entity.ts +9 -14
- package/src/routes/file.test.ts +19 -23
- package/src/routes/file.ts +11 -33
- package/src/routes/files.test.ts +14 -39
- package/src/routes/files.ts +18 -23
- package/src/routes/search.test.ts +65 -26
- package/src/routes/search.ts +30 -23
- package/src/test/helpers/fastify.ts +0 -12
- package/src/test/integration.setup.ts +44 -21
- package/src/test/integration.test.ts +72 -1
- package/src/transformers/default.test.ts +10 -20
- package/src/transformers/default.ts +14 -27
- package/src/transformers/transformer.test.ts +4 -6
- package/src/utils/errors.ts +10 -6
- package/src/utils/headers.ts +16 -0
- package/src/utils/queryBuilder.ts +3 -5
- package/prisma/migrations/20250515034400_entities/migration.sql +0 -14
- package/prisma/migrations/20250515050009_extend_entity_fields/migration.sql +0 -7
- package/prisma/migrations/20250804225438_add_record_type/migration.sql +0 -8
- package/prisma/migrations/20250805040110_add_rocrate_field/migration.sql +0 -2
- package/prisma/migrations/20250827033956_record_type_scalar/migration.sql +0 -10
- package/prisma/migrations/20250923032753_api_refactor/migration.sql +0 -39
- package/prisma/migrations/20250923223119_entity_type_to_string/migration.sql +0 -8
- package/prisma/migrations/20251020140329_add_meta_column/migration.sql +0 -2
- package/prisma/migrations/20251027010713_add_file_table/migration.sql +0 -17
- package/prisma/migrations/20251027221138_add_file_id_to_entity/migration.sql +0 -2
- package/prisma/migrations/20251211025510_remove_rocrate_column/migration.sql +0 -8
- package/prisma/migrations/migration_lock.toml +0 -3
- package/prisma/schema.prisma +0 -17
- package/src/__snapshots__/app.test.ts.snap +0 -8
package/README.md
CHANGED
|
@@ -79,14 +79,6 @@ import Fastify from 'fastify';
|
|
|
79
79
|
import { PrismaClient } from './generated/prisma/client.js';
|
|
80
80
|
import { Readable } from 'stream';
|
|
81
81
|
|
|
82
|
-
// NOTE: Only needed if you are going to use these yourself
|
|
83
|
-
declare module 'fastify' {
|
|
84
|
-
interface FastifyInstance {
|
|
85
|
-
prisma: PrismaClient;
|
|
86
|
-
opensearch: Client;
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
|
|
90
82
|
const prisma = new PrismaClient();
|
|
91
83
|
|
|
92
84
|
if (!process.env.OPENSEARCH_URL) {
|
|
@@ -283,7 +275,7 @@ await server.register(arocapi, {
|
|
|
283
275
|
**For restricted content**, implement a custom access transformer:
|
|
284
276
|
|
|
285
277
|
```typescript
|
|
286
|
-
const accessTransformer = async (entity, { request
|
|
278
|
+
const accessTransformer = async (entity, { request }) => {
|
|
287
279
|
// Custom logic to determine access
|
|
288
280
|
const user = await authenticateUser(request);
|
|
289
281
|
const canAccessContent = await checkLicense(entity.contentLicenseId, user);
|
|
@@ -323,10 +315,10 @@ await server.register(arocapi, {
|
|
|
323
315
|
displayName: `${entity.name} [${entity.entityType.split('/').pop()}]`,
|
|
324
316
|
}),
|
|
325
317
|
// Add counts
|
|
326
|
-
async (entity
|
|
318
|
+
async (entity) => {
|
|
327
319
|
const objectCount = entity.memberOf
|
|
328
|
-
? await
|
|
329
|
-
where: { memberOf: entity.
|
|
320
|
+
? await prisma.entity.count({
|
|
321
|
+
where: { memberOf: entity.id },
|
|
330
322
|
})
|
|
331
323
|
: 0;
|
|
332
324
|
|
|
@@ -349,12 +341,16 @@ Every entity response flows through this three-stage pipeline:
|
|
|
349
341
|
2. **Access transformer** - Adds access control information
|
|
350
342
|
3. **Entity transformers** - Optional additional transformations
|
|
351
343
|
|
|
344
|
+
### Transformer Context
|
|
345
|
+
|
|
346
|
+
Access and entity transformers receive a `TransformerContext` as their second argument with the shape `{ request, fastify }`. The `request` is the Fastify request for per-call data (headers, auth, query). The `fastify` instance is provided as an extension point — arocapi does not decorate it with anything itself, but consumers who decorate `fastify` with their own helpers (e.g. via `fastify.decorate('userService', ...)`) can read those decorations through `context.fastify` from inside their transformers. For database access, prefer closing over your own client reference as shown in the examples below.
|
|
347
|
+
|
|
352
348
|
### Common Use Cases
|
|
353
349
|
|
|
354
350
|
**Access control for restricted content:**
|
|
355
351
|
|
|
356
352
|
```typescript
|
|
357
|
-
accessTransformer: async (entity, { request
|
|
353
|
+
accessTransformer: async (entity, { request }) => {
|
|
358
354
|
const hasAccess = await checkUserPermissions(request, entity.contentLicenseId);
|
|
359
355
|
return {
|
|
360
356
|
...entity,
|
|
@@ -382,9 +378,9 @@ entityTransformers: [
|
|
|
382
378
|
|
|
383
379
|
```typescript
|
|
384
380
|
entityTransformers: [
|
|
385
|
-
async (entity
|
|
381
|
+
async (entity) => ({
|
|
386
382
|
...entity,
|
|
387
|
-
stats: await fetchEntityStats(entity.id,
|
|
383
|
+
stats: await fetchEntityStats(entity.id, prisma),
|
|
388
384
|
}),
|
|
389
385
|
]
|
|
390
386
|
```
|
|
@@ -415,7 +411,7 @@ await server.register(arocapi, {
|
|
|
415
411
|
**For restricted content**, implement a custom file access transformer:
|
|
416
412
|
|
|
417
413
|
```typescript
|
|
418
|
-
const fileAccessTransformer = async (file, { request
|
|
414
|
+
const fileAccessTransformer = async (file, { request }) => {
|
|
419
415
|
// Custom logic to determine file content access
|
|
420
416
|
const user = await authenticateUser(request);
|
|
421
417
|
const canAccessContent = await checkLicense(file.contentLicenseId, user);
|
|
@@ -464,8 +460,8 @@ await server.register(arocapi, {
|
|
|
464
460
|
extension: file.filename.split('.').pop(),
|
|
465
461
|
}),
|
|
466
462
|
// Fetch parent entity information
|
|
467
|
-
async (file
|
|
468
|
-
const parent = await
|
|
463
|
+
async (file) => {
|
|
464
|
+
const parent = await prisma.entity.findFirst({
|
|
469
465
|
where: { rocrateId: file.memberOf },
|
|
470
466
|
});
|
|
471
467
|
|
|
@@ -638,12 +634,60 @@ The `/file/:id` endpoint supports these query parameters:
|
|
|
638
634
|
|
|
639
635
|
### HTTP Range Support
|
|
640
636
|
|
|
641
|
-
|
|
642
|
-
|
|
637
|
+
Range request support for media streaming can be implemented in your file
|
|
638
|
+
handler by parsing the `Range` header from the request context and returning
|
|
639
|
+
a partial stream:
|
|
640
|
+
|
|
641
|
+
```typescript
|
|
642
|
+
fileHandler: {
|
|
643
|
+
get: async (file, { request }) => {
|
|
644
|
+
const range = request.headers.range;
|
|
645
|
+
// Parse range header and return partial content stream
|
|
646
|
+
// Your storage backend (S3, filesystem, etc.) likely supports range reads natively
|
|
647
|
+
},
|
|
648
|
+
}
|
|
649
|
+
```
|
|
650
|
+
|
|
651
|
+
### Authentication and Authorisation
|
|
652
|
+
|
|
653
|
+
The library delegates authentication and authorisation to your transformers.
|
|
654
|
+
The access transformer receives the full Fastify request context, so you can
|
|
655
|
+
verify credentials and set access flags accordingly:
|
|
656
|
+
|
|
657
|
+
```typescript
|
|
658
|
+
accessTransformer: async (entity, { request }) => {
|
|
659
|
+
const token = request.headers.authorization;
|
|
660
|
+
const user = await verifyToken(token);
|
|
661
|
+
|
|
662
|
+
if (!user) {
|
|
663
|
+
// Unauthenticated — metadata visible but content restricted
|
|
664
|
+
return {
|
|
665
|
+
...entity,
|
|
666
|
+
access: {
|
|
667
|
+
metadata: true,
|
|
668
|
+
content: false,
|
|
669
|
+
contentAuthorizationUrl: 'https://auth.example.com/login',
|
|
670
|
+
},
|
|
671
|
+
};
|
|
672
|
+
}
|
|
673
|
+
|
|
674
|
+
const canAccess = await checkUserLicense(user, entity.contentLicenseId);
|
|
675
|
+
|
|
676
|
+
return {
|
|
677
|
+
...entity,
|
|
678
|
+
access: {
|
|
679
|
+
metadata: true,
|
|
680
|
+
content: canAccess,
|
|
681
|
+
contentAuthorizationUrl: canAccess
|
|
682
|
+
? undefined
|
|
683
|
+
: 'https://rems.example.com/request-access',
|
|
684
|
+
},
|
|
685
|
+
};
|
|
686
|
+
}
|
|
687
|
+
```
|
|
643
688
|
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
- Sets appropriate `Content-Range` and `Accept-Ranges` headers
|
|
689
|
+
The same pattern applies to `fileAccessTransformer` for controlling file
|
|
690
|
+
content downloads.
|
|
647
691
|
|
|
648
692
|
### Entity Meta Field
|
|
649
693
|
|
|
@@ -653,10 +697,10 @@ metadata for your file handler:
|
|
|
653
697
|
```typescript
|
|
654
698
|
await prisma.entity.create({
|
|
655
699
|
data: {
|
|
656
|
-
|
|
700
|
+
id: 'http://example.com/file/123',
|
|
657
701
|
name: 'audio.wav',
|
|
658
702
|
entityType: 'http://schema.org/MediaObject',
|
|
659
|
-
// ... other required fields
|
|
703
|
+
// ... other required fields (memberOf, rootCollection, metadataLicenseId, contentLicenseId)
|
|
660
704
|
meta: {
|
|
661
705
|
bucket: 's3://my-bucket',
|
|
662
706
|
storagePath: 'collections/col-01',
|
|
@@ -739,7 +783,7 @@ your-project/
|
|
|
739
783
|
├── prisma/
|
|
740
784
|
│ ├── schema.prisma # Prisma schema
|
|
741
785
|
│ ├── models/ # Your custom models
|
|
742
|
-
│ └──
|
|
786
|
+
│ └── arocapi/ # Symlink to arocapi models
|
|
743
787
|
├── prisma.config.ts # Prisma configuration
|
|
744
788
|
├── .env # Environment variables
|
|
745
789
|
└── package.json
|
package/dist/app.d.ts
CHANGED
|
@@ -9,14 +9,8 @@ export type { AuthorisedEntity, AuthorisedFile, StandardEntity, StandardFile } f
|
|
|
9
9
|
export { AllPublicAccessTransformer, AllPublicFileAccessTransformer } from './transformers/default.js';
|
|
10
10
|
export type { FileHandler, FileHandlerContext, FileMetadata, FilePathResult, FileRedirectResult, FileResult, FileStreamResult, GetFileHandler, GetRoCrateHandler, HeadFileHandler, HeadRoCrateHandler, RoCrateHandler, } from './types/fileHandlers.js';
|
|
11
11
|
export type { AccessTransformer, EntityTransformer, FileAccessTransformer, FileTransformer, TransformerContext, } from './types/transformers.js';
|
|
12
|
-
export { OpensearchQueryBuilder };
|
|
13
12
|
export type { QueryBuilderOptions };
|
|
14
|
-
|
|
15
|
-
interface FastifyInstance {
|
|
16
|
-
prisma: PrismaClient;
|
|
17
|
-
opensearch: Client;
|
|
18
|
-
}
|
|
19
|
-
}
|
|
13
|
+
export { OpensearchQueryBuilder };
|
|
20
14
|
export type Options = {
|
|
21
15
|
prisma: PrismaClient;
|
|
22
16
|
opensearch: Client;
|
|
@@ -30,5 +24,5 @@ export type Options = {
|
|
|
30
24
|
fileHandler: FileHandler;
|
|
31
25
|
roCrateHandler: RoCrateHandler;
|
|
32
26
|
};
|
|
33
|
-
declare const
|
|
34
|
-
export default
|
|
27
|
+
declare const app: FastifyPluginAsync<Options>;
|
|
28
|
+
export default app;
|
package/dist/app.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import cors from '@fastify/cors';
|
|
2
2
|
import sensible from '@fastify/sensible';
|
|
3
|
-
import fp from 'fastify-plugin';
|
|
4
3
|
import { hasZodFastifySchemaValidationErrors, serializerCompiler, validatorCompiler } from 'fastify-type-provider-zod';
|
|
5
4
|
import crate from './routes/crate.js';
|
|
6
5
|
import entities from './routes/entities.js';
|
|
@@ -17,34 +16,16 @@ const setupValidation = (fastify) => {
|
|
|
17
16
|
fastify.setSerializerCompiler(serializerCompiler);
|
|
18
17
|
fastify.setErrorHandler((error, _req, reply) => {
|
|
19
18
|
if (hasZodFastifySchemaValidationErrors(error)) {
|
|
20
|
-
|
|
19
|
+
const violations = error.validation.map((v) => ({
|
|
20
|
+
field: v.instancePath,
|
|
21
|
+
message: v.message,
|
|
22
|
+
}));
|
|
23
|
+
return reply.code(400).send(createValidationError('The request parameters are invalid', violations));
|
|
21
24
|
}
|
|
22
25
|
const err = error;
|
|
23
|
-
return reply.code(500).send({
|
|
24
|
-
error: 'Internal Server Error',
|
|
25
|
-
message: err.message,
|
|
26
|
-
});
|
|
26
|
+
return reply.code(500).send({ error: 'Internal Server Error', message: err.message });
|
|
27
27
|
});
|
|
28
28
|
};
|
|
29
|
-
const setupDatabase = async (fastify, prisma) => {
|
|
30
|
-
await prisma.$connect();
|
|
31
|
-
fastify.decorate('prisma', prisma);
|
|
32
|
-
fastify.addHook('onClose', async () => {
|
|
33
|
-
await prisma.$disconnect();
|
|
34
|
-
});
|
|
35
|
-
};
|
|
36
|
-
const setupSearch = async (fastify, opensearch) => {
|
|
37
|
-
try {
|
|
38
|
-
await opensearch.ping();
|
|
39
|
-
fastify.log.info(`Connected to OpenSearch`);
|
|
40
|
-
}
|
|
41
|
-
catch (error) {
|
|
42
|
-
fastify.log.error(`Failed to connect to OpenSearch: ${error}`);
|
|
43
|
-
throw error;
|
|
44
|
-
}
|
|
45
|
-
fastify.decorate('opensearch', opensearch);
|
|
46
|
-
fastify.addHook('onClose', () => opensearch.close());
|
|
47
|
-
};
|
|
48
29
|
const app = async (fastify, options) => {
|
|
49
30
|
const { prisma, opensearch, queryBuilderClass, queryBuilderOptions, disableCors = false, accessTransformer, entityTransformers, fileAccessTransformer, fileTransformers, fileHandler, roCrateHandler, } = options;
|
|
50
31
|
if (!prisma) {
|
|
@@ -70,14 +51,19 @@ const app = async (fastify, options) => {
|
|
|
70
51
|
fastify.register(cors);
|
|
71
52
|
}
|
|
72
53
|
setupValidation(fastify);
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
fastify.register(
|
|
76
|
-
fastify.register(
|
|
77
|
-
fastify.register(
|
|
78
|
-
fastify.register(
|
|
79
|
-
|
|
80
|
-
|
|
54
|
+
fastify.register(entities, { prisma, accessTransformer, entityTransformers });
|
|
55
|
+
fastify.register(entity, { prisma, accessTransformer, entityTransformers });
|
|
56
|
+
fastify.register(files, { prisma, fileAccessTransformer, fileTransformers });
|
|
57
|
+
fastify.register(file, { prisma, fileHandler });
|
|
58
|
+
fastify.register(crate, { prisma, roCrateHandler });
|
|
59
|
+
fastify.register(search, {
|
|
60
|
+
prisma,
|
|
61
|
+
opensearch,
|
|
62
|
+
accessTransformer,
|
|
63
|
+
entityTransformers,
|
|
64
|
+
queryBuilderClass,
|
|
65
|
+
queryBuilderOptions,
|
|
66
|
+
});
|
|
81
67
|
};
|
|
82
|
-
export default
|
|
68
|
+
export default app;
|
|
83
69
|
//# sourceMappingURL=app.js.map
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,eAAe,CAAC;AACjC,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAGzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
package/dist/app.test.js
CHANGED
|
@@ -70,27 +70,7 @@ describe('Entity Route', () => {
|
|
|
70
70
|
});
|
|
71
71
|
await expect(() => fastify.ready()).rejects.toThrowError('roCrateHandler is required');
|
|
72
72
|
});
|
|
73
|
-
it('should
|
|
74
|
-
opensearch.ping.mockRejectedValue(new Error('Connection failed'));
|
|
75
|
-
const fastify = Fastify({ logger: false });
|
|
76
|
-
fastify.register(app, {
|
|
77
|
-
prisma,
|
|
78
|
-
opensearch,
|
|
79
|
-
disableCors: false,
|
|
80
|
-
accessTransformer: AllPublicAccessTransformer,
|
|
81
|
-
fileAccessTransformer: AllPublicFileAccessTransformer,
|
|
82
|
-
fileHandler: {
|
|
83
|
-
get: vi.fn(),
|
|
84
|
-
head: vi.fn(),
|
|
85
|
-
},
|
|
86
|
-
roCrateHandler: {
|
|
87
|
-
get: vi.fn(),
|
|
88
|
-
head: vi.fn(),
|
|
89
|
-
},
|
|
90
|
-
});
|
|
91
|
-
await expect(() => fastify.ready()).rejects.toThrowError('Connection failed');
|
|
92
|
-
});
|
|
93
|
-
it('should handle random errors', async () => {
|
|
73
|
+
it('should register successfully with all required options', async () => {
|
|
94
74
|
const fastify = Fastify({ logger: false });
|
|
95
75
|
await fastify.register(app, {
|
|
96
76
|
prisma,
|
|
@@ -98,26 +78,11 @@ describe('Entity Route', () => {
|
|
|
98
78
|
disableCors: false,
|
|
99
79
|
accessTransformer: AllPublicAccessTransformer,
|
|
100
80
|
fileAccessTransformer: AllPublicFileAccessTransformer,
|
|
101
|
-
fileHandler: {
|
|
102
|
-
|
|
103
|
-
head: vi.fn(),
|
|
104
|
-
},
|
|
105
|
-
roCrateHandler: {
|
|
106
|
-
get: vi.fn(),
|
|
107
|
-
head: vi.fn(),
|
|
108
|
-
},
|
|
109
|
-
});
|
|
110
|
-
fastify.get('/error', async () => {
|
|
111
|
-
throw new Error('Random');
|
|
112
|
-
});
|
|
113
|
-
await fastify.ready();
|
|
114
|
-
const response = await fastify.inject({
|
|
115
|
-
method: 'GET',
|
|
116
|
-
url: '/error',
|
|
81
|
+
fileHandler: { get: vi.fn(), head: vi.fn() },
|
|
82
|
+
roCrateHandler: { get: vi.fn(), head: vi.fn() },
|
|
117
83
|
});
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
expect(body).toMatchSnapshot();
|
|
84
|
+
await expect(fastify.ready()).resolves.toBeDefined();
|
|
85
|
+
await fastify.close();
|
|
121
86
|
});
|
|
122
87
|
});
|
|
123
88
|
});
|
package/dist/app.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../src/app.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../src/app.test.ts"],"names":[],"mappings":"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"}
|
package/dist/index.dev.d.ts
CHANGED
package/dist/index.dev.js
CHANGED
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
import { createReadStream, existsSync, readFileSync, statSync } from 'node:fs';
|
|
2
2
|
import { Readable } from 'node:stream';
|
|
3
3
|
import { Client } from '@opensearch-project/opensearch';
|
|
4
|
+
import { PrismaMariaDb } from '@prisma/adapter-mariadb';
|
|
4
5
|
import Fastify from 'fastify';
|
|
5
6
|
import arocapi, { AllPublicAccessTransformer, AllPublicFileAccessTransformer, } from './app.js';
|
|
6
7
|
import { PrismaClient } from './generated/prisma/client.js';
|
|
7
|
-
const
|
|
8
|
+
const adapter = new PrismaMariaDb({
|
|
9
|
+
host: 'localhost',
|
|
10
|
+
user: 'root',
|
|
11
|
+
password: 'password',
|
|
12
|
+
database: 'catalog',
|
|
13
|
+
port: 3306,
|
|
14
|
+
connectionLimit: 5,
|
|
15
|
+
allowPublicKeyRetrieval: true,
|
|
16
|
+
});
|
|
17
|
+
const prisma = new PrismaClient({ adapter });
|
|
8
18
|
if (!process.env.OPENSEARCH_URL) {
|
|
9
19
|
throw new Error('OPENSEARCH_URL environment variable is not set');
|
|
10
20
|
}
|
|
@@ -110,7 +120,7 @@ const roCrateHandler = {
|
|
|
110
120
|
};
|
|
111
121
|
},
|
|
112
122
|
};
|
|
113
|
-
const oniTransformer = (entity
|
|
123
|
+
const oniTransformer = (entity) => {
|
|
114
124
|
return {
|
|
115
125
|
...entity,
|
|
116
126
|
accessControl: 'Public',
|
package/dist/index.dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.dev.js","sourceRoot":"","sources":["../src/index.dev.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,OAAO,EAAE,EACd,0BAA0B,EAC1B,8BAA8B,GAI/B,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.dev.js","sourceRoot":"","sources":["../src/index.dev.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/crate.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { FastifyPluginAsync } from 'fastify';
|
|
2
|
+
import type { PrismaClient } from '../generated/prisma/client.js';
|
|
2
3
|
import type { RoCrateHandler } from '../types/fileHandlers.js';
|
|
3
4
|
type CrateRouteOptions = {
|
|
5
|
+
prisma: PrismaClient;
|
|
4
6
|
roCrateHandler: RoCrateHandler;
|
|
5
7
|
};
|
|
6
8
|
declare const crate: FastifyPluginAsync<CrateRouteOptions>;
|
package/dist/routes/crate.js
CHANGED
|
@@ -1,21 +1,12 @@
|
|
|
1
1
|
import { createReadStream } from 'node:fs';
|
|
2
2
|
import { z } from 'zod/v4';
|
|
3
3
|
import { createInternalError, createNotFoundError } from '../utils/errors.js';
|
|
4
|
+
import { setFileHeaders } from '../utils/headers.js';
|
|
4
5
|
const paramsSchema = z.object({
|
|
5
6
|
id: z.url(),
|
|
6
7
|
});
|
|
7
|
-
const setFileHeaders = (reply, metadata) => {
|
|
8
|
-
reply.header('Content-Type', metadata.contentType);
|
|
9
|
-
reply.header('Content-Length', metadata.contentLength.toString());
|
|
10
|
-
if (metadata.etag) {
|
|
11
|
-
reply.header('ETag', metadata.etag);
|
|
12
|
-
}
|
|
13
|
-
if (metadata.lastModified) {
|
|
14
|
-
reply.header('Last-Modified', metadata.lastModified.toUTCString());
|
|
15
|
-
}
|
|
16
|
-
};
|
|
17
8
|
const crate = async (fastify, opts) => {
|
|
18
|
-
const { roCrateHandler } = opts;
|
|
9
|
+
const { prisma, roCrateHandler } = opts;
|
|
19
10
|
fastify.withTypeProvider().head('/entity/:id/rocrate', {
|
|
20
11
|
schema: {
|
|
21
12
|
params: paramsSchema,
|
|
@@ -23,18 +14,13 @@ const crate = async (fastify, opts) => {
|
|
|
23
14
|
}, async (request, reply) => {
|
|
24
15
|
const { id } = request.params;
|
|
25
16
|
try {
|
|
26
|
-
const entity = await
|
|
27
|
-
where: {
|
|
28
|
-
rocrateId: id,
|
|
29
|
-
},
|
|
17
|
+
const entity = await prisma.entity.findUnique({
|
|
18
|
+
where: { id },
|
|
30
19
|
});
|
|
31
20
|
if (!entity) {
|
|
32
21
|
return reply.code(404).send(createNotFoundError('The requested entity was not found', id));
|
|
33
22
|
}
|
|
34
|
-
const metadata = await roCrateHandler.head(entity, {
|
|
35
|
-
request,
|
|
36
|
-
fastify,
|
|
37
|
-
});
|
|
23
|
+
const metadata = await roCrateHandler.head(entity, { request, fastify });
|
|
38
24
|
if (!metadata) {
|
|
39
25
|
return reply.code(404).send(createNotFoundError('The requested RO-Crate metadata was not found', id));
|
|
40
26
|
}
|
|
@@ -54,18 +40,13 @@ const crate = async (fastify, opts) => {
|
|
|
54
40
|
}, async (request, reply) => {
|
|
55
41
|
const { id } = request.params;
|
|
56
42
|
try {
|
|
57
|
-
const entity = await
|
|
58
|
-
where: {
|
|
59
|
-
rocrateId: id,
|
|
60
|
-
},
|
|
43
|
+
const entity = await prisma.entity.findUnique({
|
|
44
|
+
where: { id },
|
|
61
45
|
});
|
|
62
46
|
if (!entity) {
|
|
63
47
|
return reply.code(404).send(createNotFoundError('The requested entity was not found', id));
|
|
64
48
|
}
|
|
65
|
-
const result = await roCrateHandler.get(entity, {
|
|
66
|
-
request,
|
|
67
|
-
fastify,
|
|
68
|
-
});
|
|
49
|
+
const result = await roCrateHandler.get(entity, { request, fastify });
|
|
69
50
|
if (!result) {
|
|
70
51
|
return reply.code(404).send(createNotFoundError('The requested RO-Crate could not be retrieved', id));
|
|
71
52
|
}
|
package/dist/routes/crate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crate.js","sourceRoot":"","sources":["../../src/routes/crate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAG3C,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"crate.js","sourceRoot":"","sources":["../../src/routes/crate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAG3C,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG3B,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE;CACZ,CAAC,CAAC;AAOH,MAAM,KAAK,GAA0C,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC3E,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAExC,OAAO,CAAC,gBAAgB,EAAmB,CAAC,IAAI,CAC9C,qBAAqB,EACrB;QACE,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;SACrB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC5C,KAAK,EAAE,EAAE,EAAE,EAAE;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,oCAAoC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC7F,CAAC;YAED,MAAM,QAAQ,GAAyB,MAAM,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YAE/F,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,+CAA+C,EAAE,EAAE,CAAC,CAAC,CAAC;YACxG,CAAC;YAED,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAEhC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,GAAG,EAAE,CAAC,CAAC;YAE/D,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CACF,CAAC;IAEF,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,qBAAqB,EACrB;QACE,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;SACrB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC5C,KAAK,EAAE,EAAE,EAAE,EAAE;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,oCAAoC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC7F,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YAEtE,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,+CAA+C,EAAE,EAAE,CAAC,CAAC,CAAC;YACxG,CAAC;YAED,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC9C,CAAC;YAGD,MAAM,QAAQ,GAAG;gBACf,GAAG,MAAM,CAAC,QAAQ;gBAClB,WAAW,EAAE,qBAAqB;aACnC,CAAC;YAEF,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAGhC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7C,CAAC;YAED,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC3B,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;oBACrB,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;oBACnD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;gBAChC,CAAC;gBAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC7C,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtC,CAAC;YAGD,MAAM,IAAI,KAAK,CAAC,oCAAqC,MAA2B,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAE9D,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|