2023-06-01 06:32:51 -04:00
|
|
|
import { getQueueToken } from '@nestjs/bullmq';
|
2023-12-14 11:55:40 -05:00
|
|
|
import { Injectable } from '@nestjs/common';
|
2023-05-26 08:52:52 -04:00
|
|
|
import { ModuleRef } from '@nestjs/core';
|
2023-10-31 21:19:12 +01:00
|
|
|
import { SchedulerRegistry } from '@nestjs/schedule';
|
2023-06-01 06:32:51 -04:00
|
|
|
import { Job, JobsOptions, Processor, Queue, Worker, WorkerOptions } from 'bullmq';
|
2023-10-31 21:19:12 +01:00
|
|
|
import { CronJob, CronTime } from 'cron';
|
2024-02-02 04:18:00 +01:00
|
|
|
import { setTimeout } from 'node:timers/promises';
|
2024-03-20 15:04:03 -05:00
|
|
|
import { bullConfig } from 'src/config';
|
2024-03-20 22:15:09 -05:00
|
|
|
import {
|
|
|
|
IJobRepository,
|
|
|
|
JobCounts,
|
|
|
|
JobItem,
|
|
|
|
JobName,
|
|
|
|
QueueCleanType,
|
|
|
|
QueueName,
|
|
|
|
QueueStatus,
|
|
|
|
} from 'src/interfaces/job.repository';
|
|
|
|
import { Instrumentation } from 'src/utils/instrumentation';
|
|
|
|
import { ImmichLogger } from 'src/utils/logger';
|
|
|
|
|
|
|
|
export const JOBS_TO_QUEUE: Record<JobName, QueueName> = {
|
|
|
|
// misc
|
|
|
|
[JobName.ASSET_DELETION]: QueueName.BACKGROUND_TASK,
|
|
|
|
[JobName.ASSET_DELETION_CHECK]: QueueName.BACKGROUND_TASK,
|
|
|
|
[JobName.USER_DELETE_CHECK]: QueueName.BACKGROUND_TASK,
|
|
|
|
[JobName.USER_DELETION]: QueueName.BACKGROUND_TASK,
|
|
|
|
[JobName.DELETE_FILES]: QueueName.BACKGROUND_TASK,
|
|
|
|
[JobName.CLEAN_OLD_AUDIT_LOGS]: QueueName.BACKGROUND_TASK,
|
|
|
|
[JobName.PERSON_CLEANUP]: QueueName.BACKGROUND_TASK,
|
|
|
|
[JobName.USER_SYNC_USAGE]: QueueName.BACKGROUND_TASK,
|
|
|
|
|
|
|
|
// conversion
|
|
|
|
[JobName.QUEUE_VIDEO_CONVERSION]: QueueName.VIDEO_CONVERSION,
|
|
|
|
[JobName.VIDEO_CONVERSION]: QueueName.VIDEO_CONVERSION,
|
|
|
|
|
|
|
|
// thumbnails
|
|
|
|
[JobName.QUEUE_GENERATE_THUMBNAILS]: QueueName.THUMBNAIL_GENERATION,
|
|
|
|
[JobName.GENERATE_JPEG_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
|
|
|
|
[JobName.GENERATE_WEBP_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
|
|
|
|
[JobName.GENERATE_THUMBHASH_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
|
|
|
|
[JobName.GENERATE_PERSON_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
|
|
|
|
|
|
|
|
// metadata
|
|
|
|
[JobName.QUEUE_METADATA_EXTRACTION]: QueueName.METADATA_EXTRACTION,
|
|
|
|
[JobName.METADATA_EXTRACTION]: QueueName.METADATA_EXTRACTION,
|
|
|
|
[JobName.LINK_LIVE_PHOTOS]: QueueName.METADATA_EXTRACTION,
|
|
|
|
|
|
|
|
// storage template
|
|
|
|
[JobName.STORAGE_TEMPLATE_MIGRATION]: QueueName.STORAGE_TEMPLATE_MIGRATION,
|
|
|
|
[JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE]: QueueName.STORAGE_TEMPLATE_MIGRATION,
|
|
|
|
|
|
|
|
// migration
|
|
|
|
[JobName.QUEUE_MIGRATION]: QueueName.MIGRATION,
|
|
|
|
[JobName.MIGRATE_ASSET]: QueueName.MIGRATION,
|
|
|
|
[JobName.MIGRATE_PERSON]: QueueName.MIGRATION,
|
|
|
|
|
|
|
|
// facial recognition
|
|
|
|
[JobName.QUEUE_FACE_DETECTION]: QueueName.FACE_DETECTION,
|
|
|
|
[JobName.FACE_DETECTION]: QueueName.FACE_DETECTION,
|
|
|
|
[JobName.QUEUE_FACIAL_RECOGNITION]: QueueName.FACIAL_RECOGNITION,
|
|
|
|
[JobName.FACIAL_RECOGNITION]: QueueName.FACIAL_RECOGNITION,
|
|
|
|
|
|
|
|
// smart search
|
|
|
|
[JobName.QUEUE_SMART_SEARCH]: QueueName.SMART_SEARCH,
|
|
|
|
[JobName.SMART_SEARCH]: QueueName.SMART_SEARCH,
|
|
|
|
|
|
|
|
// XMP sidecars
|
|
|
|
[JobName.QUEUE_SIDECAR]: QueueName.SIDECAR,
|
|
|
|
[JobName.SIDECAR_DISCOVERY]: QueueName.SIDECAR,
|
|
|
|
[JobName.SIDECAR_SYNC]: QueueName.SIDECAR,
|
|
|
|
[JobName.SIDECAR_WRITE]: QueueName.SIDECAR,
|
|
|
|
|
|
|
|
// Library management
|
|
|
|
[JobName.LIBRARY_SCAN_ASSET]: QueueName.LIBRARY,
|
|
|
|
[JobName.LIBRARY_SCAN]: QueueName.LIBRARY,
|
|
|
|
[JobName.LIBRARY_DELETE]: QueueName.LIBRARY,
|
|
|
|
[JobName.LIBRARY_REMOVE_OFFLINE]: QueueName.LIBRARY,
|
|
|
|
[JobName.LIBRARY_QUEUE_SCAN_ALL]: QueueName.LIBRARY,
|
|
|
|
[JobName.LIBRARY_QUEUE_CLEANUP]: QueueName.LIBRARY,
|
|
|
|
};
|
2023-01-21 11:11:55 -05:00
|
|
|
|
2024-03-12 01:19:12 -04:00
|
|
|
@Instrumentation()
|
2023-05-26 08:52:52 -04:00
|
|
|
@Injectable()
|
2023-01-21 11:11:55 -05:00
|
|
|
export class JobRepository implements IJobRepository {
|
2023-06-01 06:32:51 -04:00
|
|
|
private workers: Partial<Record<QueueName, Worker>> = {};
|
2023-12-14 11:55:40 -05:00
|
|
|
private logger = new ImmichLogger(JobRepository.name);
|
2023-06-01 06:32:51 -04:00
|
|
|
|
2023-10-31 21:19:12 +01:00
|
|
|
constructor(
|
2024-02-02 04:18:00 +01:00
|
|
|
private moduleReference: ModuleRef,
|
2023-10-31 21:19:12 +01:00
|
|
|
private schedulerReqistry: SchedulerRegistry,
|
|
|
|
) {}
|
2023-01-21 23:13:36 -05:00
|
|
|
|
2023-06-01 06:32:51 -04:00
|
|
|
addHandler(queueName: QueueName, concurrency: number, handler: (item: JobItem) => Promise<void>) {
|
|
|
|
const workerHandler: Processor = async (job: Job) => handler(job as JobItem);
|
|
|
|
const workerOptions: WorkerOptions = { ...bullConfig, concurrency };
|
|
|
|
this.workers[queueName] = new Worker(queueName, workerHandler, workerOptions);
|
|
|
|
}
|
|
|
|
|
2023-10-31 21:19:12 +01:00
|
|
|
addCronJob(name: string, expression: string, onTick: () => void, start = true): void {
|
2024-01-01 22:25:25 -05:00
|
|
|
const job = new CronJob<null, null>(
|
2023-10-31 21:19:12 +01:00
|
|
|
expression,
|
|
|
|
onTick,
|
|
|
|
// function to run onComplete
|
|
|
|
undefined,
|
|
|
|
// whether it should start directly
|
|
|
|
start,
|
|
|
|
// timezone
|
|
|
|
undefined,
|
|
|
|
// context
|
|
|
|
undefined,
|
|
|
|
// runOnInit
|
|
|
|
undefined,
|
|
|
|
// utcOffset
|
|
|
|
undefined,
|
|
|
|
// prevents memory leaking by automatically stopping when the node process finishes
|
|
|
|
true,
|
|
|
|
);
|
|
|
|
|
|
|
|
this.schedulerReqistry.addCronJob(name, job);
|
|
|
|
}
|
|
|
|
|
|
|
|
updateCronJob(name: string, expression?: string, start?: boolean): void {
|
|
|
|
const job = this.schedulerReqistry.getCronJob(name);
|
|
|
|
if (expression) {
|
|
|
|
job.setTime(new CronTime(expression));
|
|
|
|
}
|
|
|
|
if (start !== undefined) {
|
|
|
|
start ? job.start() : job.stop();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
deleteCronJob(name: string): void {
|
|
|
|
this.schedulerReqistry.deleteCronJob(name);
|
|
|
|
}
|
|
|
|
|
2023-06-01 06:32:51 -04:00
|
|
|
setConcurrency(queueName: QueueName, concurrency: number) {
|
|
|
|
const worker = this.workers[queueName];
|
|
|
|
if (!worker) {
|
|
|
|
this.logger.warn(`Unable to set queue concurrency, worker not found: '${queueName}'`);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
worker.concurrency = concurrency;
|
|
|
|
}
|
|
|
|
|
2023-04-01 22:46:07 +02:00
|
|
|
async getQueueStatus(name: QueueName): Promise<QueueStatus> {
|
2023-05-26 08:52:52 -04:00
|
|
|
const queue = this.getQueue(name);
|
2023-04-01 22:46:07 +02:00
|
|
|
|
|
|
|
return {
|
|
|
|
isActive: !!(await queue.getActiveCount()),
|
|
|
|
isPaused: await queue.isPaused(),
|
|
|
|
};
|
2023-01-21 23:13:36 -05:00
|
|
|
}
|
|
|
|
|
2023-03-20 11:55:28 -04:00
|
|
|
pause(name: QueueName) {
|
2023-05-26 08:52:52 -04:00
|
|
|
return this.getQueue(name).pause();
|
2023-03-20 11:55:28 -04:00
|
|
|
}
|
|
|
|
|
2023-03-28 14:25:22 -04:00
|
|
|
resume(name: QueueName) {
|
2023-05-26 08:52:52 -04:00
|
|
|
return this.getQueue(name).resume();
|
2023-03-28 14:25:22 -04:00
|
|
|
}
|
|
|
|
|
2023-01-21 23:13:36 -05:00
|
|
|
empty(name: QueueName) {
|
2023-06-01 06:32:51 -04:00
|
|
|
return this.getQueue(name).drain();
|
2023-01-21 23:13:36 -05:00
|
|
|
}
|
|
|
|
|
2023-12-05 10:07:20 +08:00
|
|
|
clear(name: QueueName, type: QueueCleanType) {
|
|
|
|
return this.getQueue(name).clean(0, 1000, type);
|
|
|
|
}
|
|
|
|
|
2023-01-21 23:13:36 -05:00
|
|
|
getJobCounts(name: QueueName): Promise<JobCounts> {
|
2023-06-01 06:32:51 -04:00
|
|
|
return this.getQueue(name).getJobCounts(
|
|
|
|
'active',
|
|
|
|
'completed',
|
|
|
|
'failed',
|
|
|
|
'delayed',
|
|
|
|
'waiting',
|
|
|
|
'paused',
|
|
|
|
) as unknown as Promise<JobCounts>;
|
2023-01-21 23:13:36 -05:00
|
|
|
}
|
2023-01-21 11:11:55 -05:00
|
|
|
|
2024-01-01 15:45:42 -05:00
|
|
|
async queueAll(items: JobItem[]): Promise<void> {
|
2024-02-02 04:18:00 +01:00
|
|
|
if (items.length === 0) {
|
2024-01-01 15:45:42 -05:00
|
|
|
return;
|
|
|
|
}
|
2023-01-21 23:13:36 -05:00
|
|
|
|
2024-01-18 00:08:48 -05:00
|
|
|
const promises = [];
|
|
|
|
const itemsByQueue = {} as Record<string, (JobItem & { data: any; options: JobsOptions | undefined })[]>;
|
|
|
|
for (const item of items) {
|
2024-01-01 15:45:42 -05:00
|
|
|
const queueName = JOBS_TO_QUEUE[item.name];
|
2024-01-18 00:08:48 -05:00
|
|
|
const job = {
|
2024-01-01 15:45:42 -05:00
|
|
|
name: item.name,
|
2024-01-18 00:08:48 -05:00
|
|
|
data: item.data || {},
|
2024-01-01 15:45:42 -05:00
|
|
|
options: this.getJobOptions(item) || undefined,
|
2024-01-18 00:08:48 -05:00
|
|
|
} as JobItem & { data: any; options: JobsOptions | undefined };
|
|
|
|
|
|
|
|
if (job.options?.jobId) {
|
|
|
|
// need to use add() instead of addBulk() for jobId deduplication
|
|
|
|
promises.push(this.getQueue(queueName).add(item.name, item.data, job.options));
|
|
|
|
} else {
|
|
|
|
itemsByQueue[queueName] = itemsByQueue[queueName] || [];
|
|
|
|
itemsByQueue[queueName].push(job);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (const [queueName, jobs] of Object.entries(itemsByQueue)) {
|
|
|
|
const queue = this.getQueue(queueName as QueueName);
|
|
|
|
promises.push(queue.addBulk(jobs));
|
2024-01-01 15:45:42 -05:00
|
|
|
}
|
2024-01-18 00:08:48 -05:00
|
|
|
|
|
|
|
await Promise.all(promises);
|
2024-01-01 15:45:42 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
async queue(item: JobItem): Promise<void> {
|
2024-01-18 00:08:48 -05:00
|
|
|
return this.queueAll([item]);
|
|
|
|
}
|
|
|
|
|
|
|
|
async waitForQueueCompletion(...queues: QueueName[]): Promise<void> {
|
|
|
|
let activeQueue: QueueStatus | undefined;
|
|
|
|
do {
|
|
|
|
const statuses = await Promise.all(queues.map((name) => this.getQueueStatus(name)));
|
|
|
|
activeQueue = statuses.find((status) => status.isActive);
|
|
|
|
} while (activeQueue);
|
|
|
|
{
|
|
|
|
this.logger.verbose(`Waiting for ${activeQueue} queue to stop...`);
|
|
|
|
await setTimeout(1000);
|
|
|
|
}
|
2023-05-26 08:52:52 -04:00
|
|
|
}
|
feat(server): xmp sidecar metadata (#2466)
* initial commit for XMP sidecar support
* Added support for 'missing' metadata files to include those without sidecar files, now detects sidecar files in the filesystem for media already ingested but the sidecar was created afterwards
* didn't mean to commit default log level during testing
* new sidecar logic for video metadata as well
* Added xml mimetype for sidecars only
* don't need capture group for this regex
* wrong default value reverted
* simplified the move here - keep it in the same try catch since the outcome is to move the media back anyway
* simplified setter logic
Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
* simplified logic per suggestions
* sidecar is now its own queue with a discover and sync, updated UI for the new job queueing
* queue a sidecar job for every asset based on discovery or sync, though the logic is almost identical aside from linking the sidecar
* now queue sidecar jobs for each assset, though logic is mostly the same between discovery and sync
* simplified logic of filename extraction and asset instantiation
* not sure how that got deleted..
* updated code per suggestions and comments in the PR
* stat was not being used, removed the variable set
* better type checking, using in-scope variables for exif getter instead of passing in every time
* removed commented out test
* ran and resolved all lints, formats, checks, and tests
* resolved suggested change in PR
* made getExifProperty more dynamic with multiple possible args for fallbacks, fixed typo, used generic in function for better type checking
* better error handling and moving files back to positions on move or save failure
* regenerated api
* format fixes
* Added XMP documentation
* documentation typo
* Merged in main
* missed merge conflict
* more changes due to a merge
* Resolving conflicts
* added icon for sidecar jobs
---------
Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
2023-05-24 21:59:30 -04:00
|
|
|
|
2023-06-01 06:32:51 -04:00
|
|
|
private getJobOptions(item: JobItem): JobsOptions | null {
|
2023-05-26 08:52:52 -04:00
|
|
|
switch (item.name) {
|
2024-02-02 04:18:00 +01:00
|
|
|
case JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE: {
|
2023-10-11 04:14:44 +02:00
|
|
|
return { jobId: item.data.id };
|
2024-02-02 04:18:00 +01:00
|
|
|
}
|
|
|
|
case JobName.GENERATE_PERSON_THUMBNAIL: {
|
2023-05-26 08:52:52 -04:00
|
|
|
return { priority: 1 };
|
2024-02-02 04:18:00 +01:00
|
|
|
}
|
|
|
|
case JobName.QUEUE_FACIAL_RECOGNITION: {
|
2024-01-18 00:08:48 -05:00
|
|
|
return { jobId: JobName.QUEUE_FACIAL_RECOGNITION };
|
2024-02-02 04:18:00 +01:00
|
|
|
}
|
2023-03-02 21:47:08 -05:00
|
|
|
|
2024-02-02 04:18:00 +01:00
|
|
|
default: {
|
2023-05-26 08:52:52 -04:00
|
|
|
return null;
|
2024-02-02 04:18:00 +01:00
|
|
|
}
|
2023-01-21 11:11:55 -05:00
|
|
|
}
|
|
|
|
}
|
2023-05-26 08:52:52 -04:00
|
|
|
|
2023-09-20 13:16:33 +02:00
|
|
|
private getQueue(queue: QueueName): Queue {
|
2024-02-02 04:18:00 +01:00
|
|
|
return this.moduleReference.get<Queue>(getQueueToken(queue), { strict: false });
|
2023-05-26 08:52:52 -04:00
|
|
|
}
|
2023-01-21 11:11:55 -05:00
|
|
|
}
|