feat: add auto-increment id, size/duration tracking, and soft cleanup to conversion_jobs
Rename the old CHAR(36) id to uuid (still used for public URLs and file naming) and add a real auto-increment id as the primary key. Track input/output file size and conversion duration per job. Cleanup no longer deletes rows; it marks cleaned_at and skips already-cleaned expired jobs on later runs. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
+20
-15
@@ -5,7 +5,7 @@ import os from 'node:os';
|
||||
import { getPool, closePool } from '../src/db.js';
|
||||
import { loadConfig } from '../src/config.js';
|
||||
import { ensureStorageDirs, uploadPath, outputPath } from '../src/storage.js';
|
||||
import { createJob, getJobById, getJobErrorLog } from '../src/jobs/jobRepository.js';
|
||||
import { createJob, getJobByUuid, getJobErrorLog } from '../src/jobs/jobRepository.js';
|
||||
import { registerImageConverters } from '../src/converters/image.js';
|
||||
import { processPendingJobs } from '../src/worker.js';
|
||||
|
||||
@@ -28,61 +28,66 @@ beforeEach(async () => {
|
||||
await pool.query('DELETE FROM conversion_jobs');
|
||||
});
|
||||
|
||||
async function createPendingImageJob(id, sourceFormat, targetFormat) {
|
||||
async function createPendingImageJob(uuid, sourceFormat, targetFormat) {
|
||||
const fixturePath = path.join(import.meta.dirname, 'fixtures', 'sample.png');
|
||||
const inputFilePath = uploadPath(config, id, sourceFormat);
|
||||
const inputFilePath = uploadPath(config, uuid, sourceFormat);
|
||||
await fs.copyFile(fixturePath, inputFilePath);
|
||||
const { size: inputSizeBytes } = await fs.stat(inputFilePath);
|
||||
|
||||
await createJob(pool, {
|
||||
id,
|
||||
uuid,
|
||||
family: 'image',
|
||||
sourceFormat,
|
||||
targetFormat,
|
||||
originalFilename: `photo.${sourceFormat}`,
|
||||
inputPath: `${id}.${sourceFormat}`,
|
||||
inputPath: `${uuid}.${sourceFormat}`,
|
||||
inputMimeType: 'image/png',
|
||||
inputSizeBytes,
|
||||
expiresAt: new Date(Date.now() + 3600 * 1000),
|
||||
});
|
||||
}
|
||||
|
||||
describe('processPendingJobs', () => {
|
||||
it('converts a pending image job to done', async () => {
|
||||
const id = '99999999-9999-4999-8999-999999999999';
|
||||
await createPendingImageJob(id, 'png', 'webp');
|
||||
const uuid = '99999999-9999-4999-8999-999999999999';
|
||||
await createPendingImageJob(uuid, 'png', 'webp');
|
||||
|
||||
const processedCount = await processPendingJobs(pool, config);
|
||||
|
||||
expect(processedCount).toBe(1);
|
||||
const job = await getJobById(pool, id);
|
||||
const job = await getJobByUuid(pool, uuid);
|
||||
expect(job.status).toBe('done');
|
||||
expect(job.outputPath).toBe(`${id}.webp`);
|
||||
expect(job.outputPath).toBe(`${uuid}.webp`);
|
||||
expect(job.outputMimeType).toBe('image/webp');
|
||||
expect(job.outputSizeBytes).toBeGreaterThan(0);
|
||||
expect(Number(job.conversionDurationSeconds)).toBeGreaterThanOrEqual(0);
|
||||
|
||||
const stat = await fs.stat(outputPath(config, id, 'webp'));
|
||||
const stat = await fs.stat(outputPath(config, uuid, 'webp'));
|
||||
expect(stat.size).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
it('marks a job failed with a safe message and a detailed log when the converter throws', async () => {
|
||||
const id = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa';
|
||||
const uuid = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa';
|
||||
await createJob(pool, {
|
||||
id,
|
||||
uuid,
|
||||
family: 'image',
|
||||
sourceFormat: 'png',
|
||||
targetFormat: 'webp',
|
||||
originalFilename: 'missing.png',
|
||||
inputPath: `${id}.png`,
|
||||
inputPath: `${uuid}.png`,
|
||||
inputMimeType: 'image/png',
|
||||
inputSizeBytes: 11,
|
||||
expiresAt: new Date(Date.now() + 3600 * 1000),
|
||||
});
|
||||
// Note: input file is intentionally never written, so sharp will throw ENOENT.
|
||||
|
||||
await processPendingJobs(pool, config);
|
||||
|
||||
const job = await getJobById(pool, id);
|
||||
const job = await getJobByUuid(pool, uuid);
|
||||
expect(job.status).toBe('failed');
|
||||
expect(job.errorMessage).toBe('Conversion failed, please try again.');
|
||||
|
||||
const errorLog = await getJobErrorLog(pool, id);
|
||||
const errorLog = await getJobErrorLog(pool, job.id);
|
||||
expect(errorLog).toMatch(/input file is missing/i);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user