@jrmc/adonis-attachment 6.0.0-alpha.2 → 6.0.0-alpha.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/build/commands/commands.json +1 -1
- package/build/commands/make/converter.d.ts +17 -0
- package/build/commands/make/converter.d.ts.map +1 -0
- package/build/commands/make/converter.js +27 -0
- package/build/commands/make/converter.js.map +1 -0
- package/build/index.d.ts +12 -6
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -5
- package/build/index.js.map +1 -1
- package/build/providers/attachment_provider.d.ts.map +1 -1
- package/build/providers/attachment_provider.js +20 -1
- package/build/providers/attachment_provider.js.map +1 -1
- package/build/services/converters.d.ts +10 -0
- package/build/services/converters.d.ts.map +1 -0
- package/build/services/converters.js +17 -0
- package/build/services/converters.js.map +1 -0
- package/build/src/adapters/adonis_drive_storage.d.ts.map +1 -1
- package/build/src/adapters/adonis_drive_storage.js +4 -1
- package/build/src/adapters/adonis_drive_storage.js.map +1 -1
- package/build/src/adapters/local_file_storage.d.ts.map +1 -1
- package/build/src/adapters/local_file_storage.js +9 -2
- package/build/src/adapters/local_file_storage.js.map +1 -1
- package/build/src/converters/autodetect_converter.d.ts +24 -0
- package/build/src/converters/autodetect_converter.d.ts.map +1 -0
- package/build/src/converters/autodetect_converter.js +113 -0
- package/build/src/converters/autodetect_converter.js.map +1 -0
- package/build/src/converters/configured_variant_converter_registry.d.ts +36 -0
- package/build/src/converters/configured_variant_converter_registry.d.ts.map +1 -0
- package/build/src/converters/configured_variant_converter_registry.js +81 -0
- package/build/src/converters/configured_variant_converter_registry.js.map +1 -0
- package/build/src/converters/converter.d.ts +148 -0
- package/build/src/converters/converter.d.ts.map +1 -0
- package/build/src/converters/converter.js +24 -0
- package/build/src/converters/converter.js.map +1 -0
- package/build/src/core/attachment.d.ts +7 -3
- package/build/src/core/attachment.d.ts.map +1 -1
- package/build/src/core/attachment.js +29 -4
- package/build/src/core/attachment.js.map +1 -1
- package/build/src/core/attachment_job_processor.d.ts +17 -1
- package/build/src/core/attachment_job_processor.d.ts.map +1 -1
- package/build/src/core/attachment_job_processor.js +81 -8
- package/build/src/core/attachment_job_processor.js.map +1 -1
- package/build/src/core/attachment_metadata_persister.d.ts +13 -0
- package/build/src/core/attachment_metadata_persister.d.ts.map +1 -0
- package/build/src/core/attachment_metadata_persister.js +8 -0
- package/build/src/core/attachment_metadata_persister.js.map +1 -0
- package/build/src/core/attachment_options.d.ts +3 -2
- package/build/src/core/attachment_options.d.ts.map +1 -1
- package/build/src/core/attachment_options.js.map +1 -1
- package/build/src/core/attachment_service.d.ts +24 -1
- package/build/src/core/attachment_service.d.ts.map +1 -1
- package/build/src/core/attachment_service.js +95 -4
- package/build/src/core/attachment_service.js.map +1 -1
- package/build/src/core/index.d.ts +9 -2
- package/build/src/core/index.d.ts.map +1 -1
- package/build/src/core/index.js +8 -2
- package/build/src/core/index.js.map +1 -1
- package/build/src/core/queue.d.ts +11 -1
- package/build/src/core/queue.d.ts.map +1 -1
- package/build/src/define_config.d.ts +27 -3
- package/build/src/define_config.d.ts.map +1 -1
- package/build/src/define_config.js +35 -1
- package/build/src/define_config.js.map +1 -1
- package/build/src/errors.d.ts +57 -0
- package/build/src/errors.d.ts.map +1 -0
- package/build/src/errors.js +96 -0
- package/build/src/errors.js.map +1 -0
- package/build/src/events/adonis_attachment_event_emitter.d.ts +17 -0
- package/build/src/events/adonis_attachment_event_emitter.d.ts.map +1 -0
- package/build/src/events/adonis_attachment_event_emitter.js +17 -0
- package/build/src/events/adonis_attachment_event_emitter.js.map +1 -0
- package/build/src/events/attachment_events.d.ts +43 -0
- package/build/src/events/attachment_events.d.ts.map +1 -0
- package/build/src/events/attachment_events.js +32 -0
- package/build/src/events/attachment_events.js.map +1 -0
- package/build/src/integrations/lucid/index.d.ts +1 -0
- package/build/src/integrations/lucid/index.d.ts.map +1 -1
- package/build/src/integrations/lucid/index.js +1 -0
- package/build/src/integrations/lucid/index.js.map +1 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.d.ts +3 -0
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.d.ts.map +1 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.js +7 -2
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment.js.map +1 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment_records.d.ts.map +1 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment_records.js +4 -1
- package/build/src/integrations/lucid/migrations/legacy/migrate_legacy_attachment_records.js.map +1 -1
- package/build/src/integrations/lucid/models/attachment_link_model.d.ts.map +1 -1
- package/build/src/integrations/lucid/models/attachment_link_model.js +2 -1
- package/build/src/integrations/lucid/models/attachment_link_model.js.map +1 -1
- package/build/src/integrations/lucid/models/attachment_model.d.ts +3 -1
- package/build/src/integrations/lucid/models/attachment_model.d.ts.map +1 -1
- package/build/src/integrations/lucid/models/attachment_model.js +4 -0
- package/build/src/integrations/lucid/models/attachment_model.js.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.d.ts +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.d.ts.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.js +92 -35
- package/build/src/integrations/lucid/persistence/lucid_attachment_lifecycle_service.js.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.d.ts +17 -0
- package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.d.ts.map +1 -0
- package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.js +18 -0
- package/build/src/integrations/lucid/persistence/lucid_attachment_metadata_persister.js.map +1 -0
- package/build/src/integrations/lucid/persistence/lucid_attachment_store.d.ts.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_attachment_store.js +5 -3
- package/build/src/integrations/lucid/persistence/lucid_attachment_store.js.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.d.ts +5 -2
- package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.d.ts.map +1 -1
- package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.js +9 -3
- package/build/src/integrations/lucid/persistence/lucid_variant_generation_service.js.map +1 -1
- package/build/src/integrations/lucid/relations/attachment_relation.d.ts +4 -1
- package/build/src/integrations/lucid/relations/attachment_relation.d.ts.map +1 -1
- package/build/src/integrations/lucid/relations/attachment_relation.js +15 -8
- package/build/src/integrations/lucid/relations/attachment_relation.js.map +1 -1
- package/build/src/integrations/lucid/schema/attachment_schema_service.d.ts +4 -0
- package/build/src/integrations/lucid/schema/attachment_schema_service.d.ts.map +1 -1
- package/build/src/integrations/lucid/schema/attachment_schema_service.js +13 -0
- package/build/src/integrations/lucid/schema/attachment_schema_service.js.map +1 -1
- package/build/src/integrations/lucid/schema/attachment_table_names.d.ts.map +1 -1
- package/build/src/integrations/lucid/schema/attachment_table_names.js +4 -1
- package/build/src/integrations/lucid/schema/attachment_table_names.js.map +1 -1
- package/build/src/media/binaries.d.ts +79 -0
- package/build/src/media/binaries.d.ts.map +1 -0
- package/build/src/media/binaries.js +288 -0
- package/build/src/media/binaries.js.map +1 -0
- package/build/src/media/blurhash.d.ts +48 -0
- package/build/src/media/blurhash.d.ts.map +1 -0
- package/build/src/media/blurhash.js +46 -0
- package/build/src/media/blurhash.js.map +1 -0
- package/build/src/media/exif.d.ts +23 -0
- package/build/src/media/exif.d.ts.map +1 -0
- package/build/src/media/exif.js +98 -0
- package/build/src/media/exif.js.map +1 -0
- package/build/src/media/media_metadata.d.ts +55 -0
- package/build/src/media/media_metadata.d.ts.map +1 -0
- package/build/src/media/media_metadata.js +27 -0
- package/build/src/media/media_metadata.js.map +1 -0
- package/build/src/media/sharp.d.ts +45 -0
- package/build/src/media/sharp.d.ts.map +1 -0
- package/build/src/media/sharp.js +76 -0
- package/build/src/media/sharp.js.map +1 -0
- package/build/src/media/v5_metadata.d.ts +20 -0
- package/build/src/media/v5_metadata.d.ts.map +1 -0
- package/build/src/media/v5_metadata.js +20 -0
- package/build/src/media/v5_metadata.js.map +1 -0
- package/build/src/queues/memory_queue.d.ts.map +1 -1
- package/build/src/queues/memory_queue.js +4 -1
- package/build/src/queues/memory_queue.js.map +1 -1
- package/build/src/sources/attachment_manager.d.ts +1 -3
- package/build/src/sources/attachment_manager.d.ts.map +1 -1
- package/build/src/sources/attachment_manager.js +19 -12
- package/build/src/sources/attachment_manager.js.map +1 -1
- package/build/src/variants/variant_converter.d.ts +4 -1
- package/build/src/variants/variant_converter.d.ts.map +1 -1
- package/build/src/variants/variant_generation_service.d.ts +9 -3
- package/build/src/variants/variant_generation_service.d.ts.map +1 -1
- package/build/src/variants/variant_generation_service.js +47 -6
- package/build/src/variants/variant_generation_service.js.map +1 -1
- package/build/stubs/config/attachment.stub +23 -2
- package/build/stubs/converters/converter.stub +18 -0
- package/build/tests/adonis_queue.spec.js +56 -1
- package/build/tests/adonis_queue.spec.js.map +1 -1
- package/build/tests/attachment_events.spec.d.ts +8 -0
- package/build/tests/attachment_events.spec.d.ts.map +1 -0
- package/build/tests/attachment_events.spec.js +65 -0
- package/build/tests/attachment_events.spec.js.map +1 -0
- package/build/tests/attachment_job_processor.spec.js +77 -2
- package/build/tests/attachment_job_processor.spec.js.map +1 -1
- package/build/tests/attachment_provider.spec.js +54 -0
- package/build/tests/attachment_provider.spec.js.map +1 -1
- package/build/tests/attachment_schema_service.spec.js +14 -0
- package/build/tests/attachment_schema_service.spec.js.map +1 -1
- package/build/tests/attachment_service.spec.js +81 -2
- package/build/tests/attachment_service.spec.js.map +1 -1
- package/build/tests/autodetect_converter.spec.d.ts +8 -0
- package/build/tests/autodetect_converter.spec.d.ts.map +1 -0
- package/build/tests/autodetect_converter.spec.js +55 -0
- package/build/tests/autodetect_converter.spec.js.map +1 -0
- package/build/tests/binary_media.spec.d.ts +8 -0
- package/build/tests/binary_media.spec.d.ts.map +1 -0
- package/build/tests/binary_media.spec.js +106 -0
- package/build/tests/binary_media.spec.js.map +1 -0
- package/build/tests/blurhash_media.spec.d.ts +8 -0
- package/build/tests/blurhash_media.spec.d.ts.map +1 -0
- package/build/tests/blurhash_media.spec.js +40 -0
- package/build/tests/blurhash_media.spec.js.map +1 -0
- package/build/tests/configure.spec.js +1 -0
- package/build/tests/configure.spec.js.map +1 -1
- package/build/tests/configured_variant_converter_registry.spec.d.ts +8 -0
- package/build/tests/configured_variant_converter_registry.spec.d.ts.map +1 -0
- package/build/tests/configured_variant_converter_registry.spec.js +73 -0
- package/build/tests/configured_variant_converter_registry.spec.js.map +1 -0
- package/build/tests/converter_config.types.d.ts +36 -0
- package/build/tests/converter_config.types.d.ts.map +1 -0
- package/build/tests/converter_config.types.js +60 -0
- package/build/tests/converter_config.types.js.map +1 -0
- package/build/tests/define_config.spec.js +91 -0
- package/build/tests/define_config.spec.js.map +1 -1
- package/build/tests/errors.spec.d.ts +8 -0
- package/build/tests/errors.spec.d.ts.map +1 -0
- package/build/tests/errors.spec.js +43 -0
- package/build/tests/errors.spec.js.map +1 -0
- package/build/tests/exif_media.spec.d.ts +8 -0
- package/build/tests/exif_media.spec.d.ts.map +1 -0
- package/build/tests/exif_media.spec.js +50 -0
- package/build/tests/exif_media.spec.js.map +1 -0
- package/build/tests/helpers/lucid_test_database.d.ts.map +1 -1
- package/build/tests/helpers/lucid_test_database.js +1 -0
- package/build/tests/helpers/lucid_test_database.js.map +1 -1
- package/build/tests/lucid_attachment_column.spec.js +1 -1
- package/build/tests/lucid_attachment_column.spec.js.map +1 -1
- package/build/tests/lucid_attachment_lifecycle_service.spec.js +54 -0
- package/build/tests/lucid_attachment_lifecycle_service.spec.js.map +1 -1
- package/build/tests/lucid_attachment_metadata_persister.spec.d.ts +8 -0
- package/build/tests/lucid_attachment_metadata_persister.spec.d.ts.map +1 -0
- package/build/tests/lucid_attachment_metadata_persister.spec.js +34 -0
- package/build/tests/lucid_attachment_metadata_persister.spec.js.map +1 -0
- package/build/tests/lucid_attachment_relation.spec.js +71 -10
- package/build/tests/lucid_attachment_relation.spec.js.map +1 -1
- package/build/tests/lucid_sqlite_integration.spec.js +2 -1
- package/build/tests/lucid_sqlite_integration.spec.js.map +1 -1
- package/build/tests/lucid_variant_generation_service.spec.js +17 -0
- package/build/tests/lucid_variant_generation_service.spec.js.map +1 -1
- package/build/tests/make_converter.spec.d.ts +8 -0
- package/build/tests/make_converter.spec.d.ts.map +1 -0
- package/build/tests/make_converter.spec.js +32 -0
- package/build/tests/make_converter.spec.js.map +1 -0
- package/build/tests/media_metadata.spec.d.ts +8 -0
- package/build/tests/media_metadata.spec.d.ts.map +1 -0
- package/build/tests/media_metadata.spec.js +51 -0
- package/build/tests/media_metadata.spec.js.map +1 -0
- package/build/tests/migrate_legacy_attachment.spec.js +15 -5
- package/build/tests/migrate_legacy_attachment.spec.js.map +1 -1
- package/build/tests/package_exports.spec.js +18 -2
- package/build/tests/package_exports.spec.js.map +1 -1
- package/build/tests/sharp_media.spec.d.ts +8 -0
- package/build/tests/sharp_media.spec.d.ts.map +1 -0
- package/build/tests/sharp_media.spec.js +84 -0
- package/build/tests/sharp_media.spec.js.map +1 -0
- package/build/tests/v5_metadata.spec.d.ts +8 -0
- package/build/tests/v5_metadata.spec.d.ts.map +1 -0
- package/build/tests/v5_metadata.spec.js +19 -0
- package/build/tests/v5_metadata.spec.js.map +1 -0
- package/build/tests/variant_generation_service.spec.js +122 -0
- package/build/tests/variant_generation_service.spec.js.map +1 -1
- package/package.json +50 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment_manager.js","sourceRoot":"","sources":["../../../src/sources/attachment_manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"attachment_manager.js","sourceRoot":"","sources":["../../../src/sources/attachment_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
6
|
*/
|
|
7
7
|
import type { Attachment } from '../core/attachment.js';
|
|
8
|
+
import type { BlurhashOptions } from '../media/blurhash.js';
|
|
8
9
|
export type VariantConversionInput = {
|
|
9
10
|
attachment: Attachment;
|
|
10
11
|
body: Uint8Array;
|
|
@@ -15,9 +16,11 @@ export type VariantConversionOutput = {
|
|
|
15
16
|
mimeType: string;
|
|
16
17
|
folder?: string;
|
|
17
18
|
metadata?: Record<string, unknown>;
|
|
19
|
+
blurhash?: string;
|
|
18
20
|
};
|
|
19
21
|
export interface VariantConverter {
|
|
20
22
|
key: string;
|
|
21
|
-
|
|
23
|
+
blurhash?: BlurhashOptions;
|
|
24
|
+
convert(input: VariantConversionInput): Promise<VariantConversionOutput | undefined>;
|
|
22
25
|
}
|
|
23
26
|
//# sourceMappingURL=variant_converter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant_converter.d.ts","sourceRoot":"","sources":["../../../src/variants/variant_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"variant_converter.d.ts","sourceRoot":"","sources":["../../../src/variants/variant_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE3D,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,UAAU,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE,eAAe,CAAA;IAC1B,OAAO,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC,CAAA;CACrF"}
|
|
@@ -8,13 +8,17 @@ import type { Attachment } from '../core/attachment.js';
|
|
|
8
8
|
import type { AttachmentService } from '../core/attachment_service.js';
|
|
9
9
|
import type { VariantGenerationRequest, VariantGenerator } from '../core/attachment_job_processor.js';
|
|
10
10
|
import type { VariantConverter } from './variant_converter.js';
|
|
11
|
+
import type { VariantConverterRegistry } from '../converters/configured_variant_converter_registry.js';
|
|
12
|
+
import { type BlurhashGenerator } from '../media/blurhash.js';
|
|
13
|
+
import { AttachmentError } from '../errors.js';
|
|
11
14
|
export type GeneratedVariant = {
|
|
12
15
|
key: string;
|
|
13
16
|
attachment: Attachment;
|
|
14
17
|
};
|
|
15
18
|
export type VariantGenerationServiceOptions = {
|
|
16
|
-
attachments: Pick<AttachmentService, 'create' | 'read'
|
|
17
|
-
converters: readonly VariantConverter[];
|
|
19
|
+
attachments: Pick<AttachmentService, 'create' | 'read'> & Partial<Pick<AttachmentService, 'createDraft'>>;
|
|
20
|
+
converters: readonly VariantConverter[] | VariantConverterRegistry;
|
|
21
|
+
blurhash?: BlurhashGenerator;
|
|
18
22
|
};
|
|
19
23
|
export declare class VariantGenerationService implements VariantGenerator {
|
|
20
24
|
#private;
|
|
@@ -22,7 +26,9 @@ export declare class VariantGenerationService implements VariantGenerator {
|
|
|
22
26
|
generate(request: VariantGenerationRequest): Promise<void>;
|
|
23
27
|
generateAll(request: VariantGenerationRequest): Promise<GeneratedVariant[]>;
|
|
24
28
|
}
|
|
25
|
-
export declare class UnknownVariantConverterError extends
|
|
29
|
+
export declare class UnknownVariantConverterError extends AttachmentError {
|
|
30
|
+
static code: string;
|
|
31
|
+
static status: number;
|
|
26
32
|
constructor(key: string);
|
|
27
33
|
}
|
|
28
34
|
//# sourceMappingURL=variant_generation_service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant_generation_service.d.ts","sourceRoot":"","sources":["../../../src/variants/variant_generation_service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAyB,MAAM,uBAAuB,CAAA;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AACrG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"variant_generation_service.d.ts","sourceRoot":"","sources":["../../../src/variants/variant_generation_service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAyB,MAAM,uBAAuB,CAAA;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AACrG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wDAAwD,CAAA;AACtG,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,+BAA+B,GAAG;IAC5C,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC,CAAA;IACzG,UAAU,EAAE,SAAS,gBAAgB,EAAE,GAAG,wBAAwB,CAAA;IAClE,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC7B,CAAA;AAED,qBAAa,wBAAyB,YAAW,gBAAgB;;gBAMnD,OAAO,EAAE,+BAA+B;IAU9C,QAAQ,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,WAAW,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CA8DlF;AAED,qBAAa,4BAA6B,SAAQ,eAAe;IAC/D,MAAM,CAAC,IAAI,SAAgC;IAC3C,MAAM,CAAC,MAAM,SAAM;gBAEP,GAAG,EAAE,MAAM;CAIxB"}
|
|
@@ -4,38 +4,79 @@
|
|
|
4
4
|
* @license MIT
|
|
5
5
|
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
6
|
*/
|
|
7
|
+
import { DynamicBlurhashGenerator, isBlurhashEnabled, resolveBlurhashComponents, } from '../media/blurhash.js';
|
|
8
|
+
import { AttachmentError } from '../errors.js';
|
|
7
9
|
export class VariantGenerationService {
|
|
8
10
|
#attachments;
|
|
9
11
|
#converters;
|
|
12
|
+
#registry;
|
|
13
|
+
#blurhash;
|
|
10
14
|
constructor(options) {
|
|
11
15
|
this.#attachments = options.attachments;
|
|
12
|
-
|
|
16
|
+
if ('get' in options.converters) {
|
|
17
|
+
this.#registry = options.converters;
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
this.#converters = new Map(options.converters.map((converter) => [converter.key, converter]));
|
|
21
|
+
}
|
|
22
|
+
this.#blurhash = options.blurhash ?? new DynamicBlurhashGenerator();
|
|
13
23
|
}
|
|
14
24
|
async generate(request) {
|
|
15
25
|
await this.generateAll(request);
|
|
16
26
|
}
|
|
17
27
|
async generateAll(request) {
|
|
18
28
|
const source = await this.#attachments.read(request.attachment);
|
|
19
|
-
const keys = request.variantKeys ??
|
|
20
|
-
|
|
21
|
-
const converter = this.#
|
|
29
|
+
const keys = request.variantKeys ?? await this.#keys();
|
|
30
|
+
const generated = await Promise.all(keys.map(async (key) => {
|
|
31
|
+
const converter = await this.#getConverter(key);
|
|
22
32
|
if (!converter) {
|
|
23
33
|
throw new UnknownVariantConverterError(key);
|
|
24
34
|
}
|
|
25
35
|
const output = await converter.convert({ attachment: request.attachment, body: source });
|
|
36
|
+
if (!output) {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
const blurhash = output.blurhash ?? await this.#generateBlurhash(converter, output.body);
|
|
26
40
|
const input = {
|
|
27
41
|
body: output.body,
|
|
28
42
|
originalName: output.fileName,
|
|
29
43
|
mimeType: output.mimeType,
|
|
30
44
|
...(output.folder ? { folder: output.folder } : {}),
|
|
31
45
|
...(output.metadata ? { metadata: output.metadata } : {}),
|
|
46
|
+
...(blurhash ? { blurhash } : {}),
|
|
32
47
|
disk: request.attachment.disk,
|
|
33
48
|
};
|
|
34
|
-
return { key, attachment: await this.#
|
|
49
|
+
return { key, attachment: await this.#persistVariant(input, request.meta) };
|
|
35
50
|
}));
|
|
51
|
+
return generated.filter((variant) => variant !== undefined);
|
|
52
|
+
}
|
|
53
|
+
#keys() {
|
|
54
|
+
return this.#registry?.keys() ?? Promise.resolve([...this.#converters.keys()]);
|
|
55
|
+
}
|
|
56
|
+
#getConverter(key) {
|
|
57
|
+
return this.#registry?.get(key) ?? Promise.resolve(this.#converters.get(key));
|
|
58
|
+
}
|
|
59
|
+
#persistVariant(input, meta) {
|
|
60
|
+
if (meta && this.#attachments.createDraft) {
|
|
61
|
+
return this.#attachments.createDraft(input).persist({ options: { meta: true } });
|
|
62
|
+
}
|
|
63
|
+
return this.#attachments.create(input);
|
|
64
|
+
}
|
|
65
|
+
async #generateBlurhash(converter, body) {
|
|
66
|
+
if (!isBlurhashEnabled(converter.blurhash)) {
|
|
67
|
+
return undefined;
|
|
68
|
+
}
|
|
69
|
+
try {
|
|
70
|
+
return await this.#blurhash.generate({ body, ...resolveBlurhashComponents(converter.blurhash) });
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
36
75
|
}
|
|
37
76
|
}
|
|
38
|
-
export class UnknownVariantConverterError extends
|
|
77
|
+
export class UnknownVariantConverterError extends AttachmentError {
|
|
78
|
+
static code = 'E_UNKNOWN_VARIANT_CONVERTER';
|
|
79
|
+
static status = 422;
|
|
39
80
|
constructor(key) {
|
|
40
81
|
super(`No variant converter is registered for "${key}"`);
|
|
41
82
|
this.name = 'UnknownVariantConverterError';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant_generation_service.js","sourceRoot":"","sources":["../../../src/variants/variant_generation_service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"variant_generation_service.js","sourceRoot":"","sources":["../../../src/variants/variant_generation_service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,33 @@
|
|
|
1
1
|
{{{
|
|
2
2
|
exports({ to: app.configPath('attachment.ts') })
|
|
3
3
|
}}}
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
defineConfig,
|
|
6
|
+
LocalFileStorage,
|
|
7
|
+
type InferConverters,
|
|
8
|
+
} from '@jrmc/adonis-attachment'
|
|
9
|
+
import { createV5CompatibleMetadataExtractors } from '@jrmc/adonis-attachment/media/metadata'
|
|
5
10
|
|
|
6
11
|
/**
|
|
7
12
|
* Attachments are stored locally by default. Lucid, Drive, external queues,
|
|
8
13
|
* custom storage, and read routes can be added as the application needs them.
|
|
9
14
|
*/
|
|
10
|
-
|
|
15
|
+
const attachmentConfig = defineConfig({
|
|
11
16
|
storage: LocalFileStorage.fromApp,
|
|
17
|
+
media: {
|
|
18
|
+
metadata: createV5CompatibleMetadataExtractors(),
|
|
19
|
+
// metadataPolicy: { mode: 'deferred', variants: false },
|
|
20
|
+
},
|
|
21
|
+
// converters: {
|
|
22
|
+
// thumbnail: {
|
|
23
|
+
// width: 320,
|
|
24
|
+
// format: 'webp',
|
|
25
|
+
// },
|
|
26
|
+
// },
|
|
12
27
|
})
|
|
28
|
+
|
|
29
|
+
export default attachmentConfig
|
|
30
|
+
|
|
31
|
+
declare module '@jrmc/adonis-attachment' {
|
|
32
|
+
interface AttachmentVariants extends InferConverters<typeof attachmentConfig> {}
|
|
33
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
{{#var entity = generators.createEntity(name)}}
|
|
2
|
+
{{#var className = string(entity.name).removeSuffix('converter').pascalCase().suffix('Converter').toString()}}
|
|
3
|
+
{{#var fileName = string(entity.name).snakeCase().suffix('_converter').ext('.ts').toString()}}
|
|
4
|
+
{{{ exports({ to: app.makePath('app/converters', entity.path, fileName) }) }}}
|
|
5
|
+
|
|
6
|
+
import Converter, {
|
|
7
|
+
type ConverterAttributes,
|
|
8
|
+
} from '@jrmc/adonis-attachment'
|
|
9
|
+
|
|
10
|
+
export default class {{ className }} extends Converter {
|
|
11
|
+
async handle({ attachment, body }: ConverterAttributes) {
|
|
12
|
+
return {
|
|
13
|
+
body,
|
|
14
|
+
fileName: attachment.name,
|
|
15
|
+
mimeType: attachment.mimeType,
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
6
|
*/
|
|
7
7
|
import { test } from '@japa/runner';
|
|
8
|
-
import { AdonisAttachmentQueue } from '../index.js';
|
|
8
|
+
import { AdonisAttachmentQueue, AttachmentJobProcessor, } from '../index.js';
|
|
9
9
|
test.group('AdonisAttachmentQueue', () => {
|
|
10
10
|
test('dispatches an attachment job to the configured queue', async ({ assert }) => {
|
|
11
11
|
const calls = [];
|
|
@@ -48,5 +48,60 @@ test.group('AdonisAttachmentQueue', () => {
|
|
|
48
48
|
await queue.enqueue({ type: 'generate-variants', attachmentId: 'attachment-id' });
|
|
49
49
|
assert.deepEqual(calls, ['run']);
|
|
50
50
|
});
|
|
51
|
+
test('preserves the serialized payload through an external worker', async ({ assert }) => {
|
|
52
|
+
const attachment = {
|
|
53
|
+
id: 'attachment-id',
|
|
54
|
+
disk: 'public',
|
|
55
|
+
name: 'attachment-id.jpg',
|
|
56
|
+
originalName: 'avatar.jpg',
|
|
57
|
+
path: 'users/42/attachment-id.jpg',
|
|
58
|
+
size: 3,
|
|
59
|
+
extname: 'jpg',
|
|
60
|
+
mimeType: 'image/jpeg',
|
|
61
|
+
};
|
|
62
|
+
const generated = [];
|
|
63
|
+
const processor = new AttachmentJobProcessor({
|
|
64
|
+
attachments: {
|
|
65
|
+
async findById(id) {
|
|
66
|
+
return id === attachment.id ? attachment : null;
|
|
67
|
+
},
|
|
68
|
+
},
|
|
69
|
+
variants: {
|
|
70
|
+
async generate(request) {
|
|
71
|
+
generated.push(request);
|
|
72
|
+
},
|
|
73
|
+
},
|
|
74
|
+
});
|
|
75
|
+
let payload;
|
|
76
|
+
const queue = new AdonisAttachmentQueue({
|
|
77
|
+
queue: 'attachments',
|
|
78
|
+
job: {
|
|
79
|
+
dispatch(job) {
|
|
80
|
+
payload = JSON.parse(JSON.stringify(job));
|
|
81
|
+
return {
|
|
82
|
+
toQueue() {
|
|
83
|
+
return this;
|
|
84
|
+
},
|
|
85
|
+
async run() {
|
|
86
|
+
await processor.process(payload);
|
|
87
|
+
},
|
|
88
|
+
};
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
});
|
|
92
|
+
await queue.enqueue({
|
|
93
|
+
type: 'generate-variants',
|
|
94
|
+
attachmentId: attachment.id,
|
|
95
|
+
variantKeys: ['thumbnail'],
|
|
96
|
+
meta: true,
|
|
97
|
+
});
|
|
98
|
+
assert.deepEqual(payload, {
|
|
99
|
+
type: 'generate-variants',
|
|
100
|
+
attachmentId: attachment.id,
|
|
101
|
+
variantKeys: ['thumbnail'],
|
|
102
|
+
meta: true,
|
|
103
|
+
});
|
|
104
|
+
assert.deepEqual(generated, [{ attachment, variantKeys: ['thumbnail'], meta: true }]);
|
|
105
|
+
});
|
|
51
106
|
});
|
|
52
107
|
//# sourceMappingURL=adonis_queue.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adonis_queue.spec.js","sourceRoot":"","sources":["../../tests/adonis_queue.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,
|
|
1
|
+
{"version":3,"file":"adonis_queue.spec.js","sourceRoot":"","sources":["../../tests/adonis_queue.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"attachment_events.spec.d.ts","sourceRoot":"","sources":["../../tests/attachment_events.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @jrmc/adonis-attachment
|
|
3
|
+
*
|
|
4
|
+
* @license MIT
|
|
5
|
+
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
|
+
*/
|
|
7
|
+
import { test } from '@japa/runner';
|
|
8
|
+
import { AttachmentService, } from '../index.js';
|
|
9
|
+
class FakeEmitter {
|
|
10
|
+
events = [];
|
|
11
|
+
emit(name, payload) {
|
|
12
|
+
this.events.push({ name, payload });
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
const storage = {
|
|
16
|
+
async write() { },
|
|
17
|
+
async read() {
|
|
18
|
+
return new Uint8Array();
|
|
19
|
+
},
|
|
20
|
+
async remove() { },
|
|
21
|
+
};
|
|
22
|
+
const queue = { async enqueue() { } };
|
|
23
|
+
test.group('Attachment events', () => {
|
|
24
|
+
test('emits file and synchronous metadata lifecycle events', async ({ assert }) => {
|
|
25
|
+
const events = new FakeEmitter();
|
|
26
|
+
const attachments = new AttachmentService({
|
|
27
|
+
storage,
|
|
28
|
+
queue,
|
|
29
|
+
events,
|
|
30
|
+
defaultDisk: 'fs',
|
|
31
|
+
createId: () => 'attachment-id',
|
|
32
|
+
metadataExtractors: [{ async extract() { return { width: 320 }; } }],
|
|
33
|
+
});
|
|
34
|
+
const attachment = await attachments.createDraft({
|
|
35
|
+
body: new Uint8Array([1]),
|
|
36
|
+
originalName: 'avatar.png',
|
|
37
|
+
}, { meta: true }).persist();
|
|
38
|
+
await attachments.remove(attachment);
|
|
39
|
+
assert.deepEqual(events.events.map(({ name }) => name), [
|
|
40
|
+
'attachment:metadata_started',
|
|
41
|
+
'attachment:metadata_completed',
|
|
42
|
+
'attachment:created',
|
|
43
|
+
'attachment:deleted',
|
|
44
|
+
]);
|
|
45
|
+
assert.equal(events.events[2]?.payload.attachment.id, 'attachment-id');
|
|
46
|
+
});
|
|
47
|
+
test('does not allow a failing observer to fail the attachment operation', async ({ assert }) => {
|
|
48
|
+
const attachments = new AttachmentService({
|
|
49
|
+
storage,
|
|
50
|
+
queue,
|
|
51
|
+
defaultDisk: 'fs',
|
|
52
|
+
events: {
|
|
53
|
+
emit() {
|
|
54
|
+
throw new Error('observer unavailable');
|
|
55
|
+
},
|
|
56
|
+
},
|
|
57
|
+
});
|
|
58
|
+
const attachment = await attachments.create({
|
|
59
|
+
body: new Uint8Array([1]),
|
|
60
|
+
originalName: 'avatar.png',
|
|
61
|
+
});
|
|
62
|
+
assert.equal(attachment.name.endsWith('.png'), true);
|
|
63
|
+
});
|
|
64
|
+
});
|
|
65
|
+
//# sourceMappingURL=attachment_events.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"attachment_events.spec.js","sourceRoot":"","sources":["../../tests/attachment_events.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EACL,iBAAiB,GAMlB,MAAM,aAAa,CAAA;AAEpB,MAAM,WAAW;IACf,MAAM,GAA0E,EAAE,CAAA;IAElF,IAAI,CAAC,IAAyB,EAAE,OAA+B;QAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IACrC,CAAC;CACF;AAED,MAAM,OAAO,GAAsB;IACjC,KAAK,CAAC,KAAK,KAAI,CAAC;IAChB,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,UAAU,EAAE,CAAA;IACzB,CAAC;IACD,KAAK,CAAC,MAAM,KAAI,CAAC;CAClB,CAAA;AAED,MAAM,KAAK,GAAoB,EAAE,KAAK,CAAC,OAAO,KAAI,CAAC,EAAE,CAAA;AAErD,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACnC,IAAI,CAAC,sDAAsD,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAChF,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAA;QAChC,MAAM,WAAW,GAAG,IAAI,iBAAiB,CAAC;YACxC,OAAO;YACP,KAAK;YACL,MAAM;YACN,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,eAAe;YAC/B,kBAAkB,EAAE,CAAC,EAAE,KAAK,CAAC,OAAO,KAAK,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA,CAAC,CAAC,EAAE,CAAC;SACpE,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC;YAC/C,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACzB,YAAY,EAAE,YAAY;SAC3B,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;QAC5B,MAAM,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAEpC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;YACtD,6BAA6B;YAC7B,+BAA+B;YAC/B,oBAAoB;YACpB,oBAAoB;SACrB,CAAC,CAAA;QACF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,CAAA;IACxE,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,oEAAoE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAC9F,MAAM,WAAW,GAAG,IAAI,iBAAiB,CAAC;YACxC,OAAO;YACP,KAAK;YACL,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE;gBACN,IAAI;oBACF,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;gBACzC,CAAC;aACF;SACF,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC;YAC1C,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACzB,YAAY,EAAE,YAAY;SAC3B,CAAC,CAAA;QAEF,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
|
|
6
6
|
*/
|
|
7
7
|
import { test } from '@japa/runner';
|
|
8
|
-
import { AttachmentJobProcessor, AttachmentNotFoundError, } from '../index.js';
|
|
8
|
+
import { AttachmentJobProcessor, AttachmentNotFoundError, DeferredMetadataProcessorNotConfiguredError, } from '../index.js';
|
|
9
9
|
const attachment = {
|
|
10
10
|
id: 'attachment-id',
|
|
11
11
|
disk: 'public',
|
|
@@ -31,6 +31,12 @@ class FakeVariantGenerator {
|
|
|
31
31
|
this.requests.push(request);
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
+
class FakeEmitter {
|
|
35
|
+
events = [];
|
|
36
|
+
emit(name, payload) {
|
|
37
|
+
this.events.push({ name, payload });
|
|
38
|
+
}
|
|
39
|
+
}
|
|
34
40
|
test.group('AttachmentJobProcessor', () => {
|
|
35
41
|
test('resolves an attachment before delegating variant generation', async ({ assert }) => {
|
|
36
42
|
const variants = new FakeVariantGenerator();
|
|
@@ -42,8 +48,9 @@ test.group('AttachmentJobProcessor', () => {
|
|
|
42
48
|
type: 'generate-variants',
|
|
43
49
|
attachmentId: 'attachment-id',
|
|
44
50
|
variantKeys: ['thumbnail'],
|
|
51
|
+
meta: true,
|
|
45
52
|
});
|
|
46
|
-
assert.deepEqual(variants.requests, [{ attachment, variantKeys: ['thumbnail'] }]);
|
|
53
|
+
assert.deepEqual(variants.requests, [{ attachment, variantKeys: ['thumbnail'], meta: true }]);
|
|
47
54
|
});
|
|
48
55
|
test('fails a job when its attachment no longer exists', async ({ assert }) => {
|
|
49
56
|
const processor = new AttachmentJobProcessor({
|
|
@@ -85,5 +92,73 @@ test.group('AttachmentJobProcessor', () => {
|
|
|
85
92
|
assert.equal(resolutions, 1);
|
|
86
93
|
assert.deepEqual(requests, ['first-id', 'second-id']);
|
|
87
94
|
});
|
|
95
|
+
test('delegates deferred metadata jobs without resolving the repository', async ({ assert }) => {
|
|
96
|
+
const processed = [];
|
|
97
|
+
const processor = new AttachmentJobProcessor({
|
|
98
|
+
attachments: new FakeRepository(null),
|
|
99
|
+
variants: new FakeVariantGenerator(),
|
|
100
|
+
metadata: {
|
|
101
|
+
async extractAndPersistMetadata(value) {
|
|
102
|
+
processed.push(value);
|
|
103
|
+
},
|
|
104
|
+
},
|
|
105
|
+
});
|
|
106
|
+
await processor.process({ type: 'extract-metadata', attachmentId: attachment.id, attachment });
|
|
107
|
+
assert.deepEqual(processed, [attachment]);
|
|
108
|
+
});
|
|
109
|
+
test('preserves the v5 variant events and adds the failed job error', async ({ assert }) => {
|
|
110
|
+
const events = new FakeEmitter();
|
|
111
|
+
const variants = new FakeVariantGenerator();
|
|
112
|
+
const processor = new AttachmentJobProcessor({
|
|
113
|
+
attachments: new FakeRepository(attachment),
|
|
114
|
+
variants,
|
|
115
|
+
events,
|
|
116
|
+
});
|
|
117
|
+
const eventContext = {
|
|
118
|
+
tableName: 'users',
|
|
119
|
+
attributeName: 'avatar',
|
|
120
|
+
primary: { key: 'id', value: '42' },
|
|
121
|
+
};
|
|
122
|
+
await processor.process({
|
|
123
|
+
type: 'generate-variants',
|
|
124
|
+
attachmentId: attachment.id,
|
|
125
|
+
variantKeys: ['thumbnail'],
|
|
126
|
+
eventContext,
|
|
127
|
+
});
|
|
128
|
+
assert.deepEqual(events.events.map(({ name }) => name), [
|
|
129
|
+
'attachment:variant_started',
|
|
130
|
+
'attachment:variant_completed',
|
|
131
|
+
]);
|
|
132
|
+
assert.deepEqual(events.events[0]?.payload, {
|
|
133
|
+
...eventContext,
|
|
134
|
+
attachment,
|
|
135
|
+
variants: ['thumbnail'],
|
|
136
|
+
});
|
|
137
|
+
const failed = new AttachmentJobProcessor({
|
|
138
|
+
attachments: new FakeRepository(attachment),
|
|
139
|
+
events,
|
|
140
|
+
variants: {
|
|
141
|
+
async generate() {
|
|
142
|
+
throw Object.assign(new Error('conversion failed'), { code: 'E_CONVERSION_FAILED' });
|
|
143
|
+
},
|
|
144
|
+
},
|
|
145
|
+
});
|
|
146
|
+
await assert.rejects(() => failed.process({ type: 'generate-variants', attachmentId: attachment.id, eventContext }), 'conversion failed');
|
|
147
|
+
assert.deepEqual(events.events.at(-1), {
|
|
148
|
+
name: 'attachment:variant_failed',
|
|
149
|
+
payload: {
|
|
150
|
+
...eventContext,
|
|
151
|
+
attachment,
|
|
152
|
+
error: { message: 'conversion failed', code: 'E_CONVERSION_FAILED' },
|
|
153
|
+
},
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
test('rejects deferred metadata jobs without a metadata processor', async ({ assert }) => {
|
|
157
|
+
const processor = new AttachmentJobProcessor({
|
|
158
|
+
attachments: new FakeRepository(attachment),
|
|
159
|
+
variants: new FakeVariantGenerator(),
|
|
160
|
+
});
|
|
161
|
+
await assert.rejects(() => processor.process({ type: 'extract-metadata', attachmentId: attachment.id, attachment }), DeferredMetadataProcessorNotConfiguredError);
|
|
162
|
+
});
|
|
88
163
|
});
|
|
89
164
|
//# sourceMappingURL=attachment_job_processor.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment_job_processor.spec.js","sourceRoot":"","sources":["../../tests/attachment_job_processor.spec.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,OAAO,EACL,sBAAsB,EACtB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"attachment_job_processor.spec.js","sourceRoot":"","sources":["../../tests/attachment_job_processor.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,5 +96,59 @@ test.group('AttachmentProvider', (group) => {
|
|
|
96
96
|
assert.equal(AttachmentModel.table, 'media_attachments');
|
|
97
97
|
assert.equal(AttachmentLinkModel.table, 'media_attachment_links');
|
|
98
98
|
});
|
|
99
|
+
test('registers the configured converter registry', async ({ assert }) => {
|
|
100
|
+
const bindings = new Map();
|
|
101
|
+
let imports = 0;
|
|
102
|
+
const config = defineConfig({
|
|
103
|
+
defaultDisk: 'public',
|
|
104
|
+
storage,
|
|
105
|
+
converters: {
|
|
106
|
+
thumbnail: {
|
|
107
|
+
converter: async () => {
|
|
108
|
+
imports += 1;
|
|
109
|
+
return {
|
|
110
|
+
default: {
|
|
111
|
+
key: 'ignored',
|
|
112
|
+
async convert() {
|
|
113
|
+
return undefined;
|
|
114
|
+
},
|
|
115
|
+
},
|
|
116
|
+
};
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
},
|
|
120
|
+
});
|
|
121
|
+
const app = {
|
|
122
|
+
config: { get: () => config },
|
|
123
|
+
container: {
|
|
124
|
+
singleton(binding, factory) {
|
|
125
|
+
bindings.set(binding, factory);
|
|
126
|
+
},
|
|
127
|
+
},
|
|
128
|
+
};
|
|
129
|
+
const provider = new AttachmentProvider(app);
|
|
130
|
+
provider.register();
|
|
131
|
+
const factory = bindings.get('jrmc.attachment.converters');
|
|
132
|
+
const registry = await factory?.();
|
|
133
|
+
assert.deepEqual(await registry.keys(), ['thumbnail']);
|
|
134
|
+
assert.equal(imports, 0);
|
|
135
|
+
assert.isDefined(await registry.get('thumbnail'));
|
|
136
|
+
assert.equal(imports, 1);
|
|
137
|
+
});
|
|
138
|
+
test('registers a configured attachment event emitter', async ({ assert }) => {
|
|
139
|
+
const bindings = new Map();
|
|
140
|
+
const events = { emit() { } };
|
|
141
|
+
const config = defineConfig({ defaultDisk: 'public', storage, events });
|
|
142
|
+
const provider = new AttachmentProvider({
|
|
143
|
+
config: { get: () => config },
|
|
144
|
+
container: {
|
|
145
|
+
singleton(binding, factory) {
|
|
146
|
+
bindings.set(binding, factory);
|
|
147
|
+
},
|
|
148
|
+
},
|
|
149
|
+
});
|
|
150
|
+
provider.register();
|
|
151
|
+
assert.equal(await bindings.get('jrmc.attachment.events')?.(), events);
|
|
152
|
+
});
|
|
99
153
|
});
|
|
100
154
|
//# sourceMappingURL=attachment_provider.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment_provider.spec.js","sourceRoot":"","sources":["../../tests/attachment_provider.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"attachment_provider.spec.js","sourceRoot":"","sources":["../../tests/attachment_provider.spec.ts"],"names":[],"mappings":"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"}
|