feat: register ICO/HEIC/HEIF converters in the worker and pass iconSize through
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
+8
-1
@@ -8,6 +8,8 @@ import { resolve as resolveConverter } from './converters/registry.js';
|
|||||||
import { registerImageConverters } from './converters/image.js';
|
import { registerImageConverters } from './converters/image.js';
|
||||||
import { registerImageToPdfConverter } from './converters/imageToPdf.js';
|
import { registerImageToPdfConverter } from './converters/imageToPdf.js';
|
||||||
import { registerDocumentConverters } from './converters/document.js';
|
import { registerDocumentConverters } from './converters/document.js';
|
||||||
|
import { registerIcoConverter } from './converters/ico.js';
|
||||||
|
import { registerHeicConverter } from './converters/heic.js';
|
||||||
import { findPendingJobs, markProcessing, markDone, markFailed } from './jobs/jobRepository.js';
|
import { findPendingJobs, markProcessing, markDone, markFailed } from './jobs/jobRepository.js';
|
||||||
|
|
||||||
const JOB_TIMEOUT_MS = 60000;
|
const JOB_TIMEOUT_MS = 60000;
|
||||||
@@ -33,7 +35,10 @@ async function processJob(prisma, config, job) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const startedAt = Date.now();
|
const startedAt = Date.now();
|
||||||
await withTimeout(entry.convert(inputFilePath, outputFilePath, { quality: job.quality }), JOB_TIMEOUT_MS);
|
await withTimeout(
|
||||||
|
entry.convert(inputFilePath, outputFilePath, { quality: job.quality, iconSize: job.iconSize }),
|
||||||
|
JOB_TIMEOUT_MS
|
||||||
|
);
|
||||||
const conversionDurationSeconds = (Date.now() - startedAt) / 1000;
|
const conversionDurationSeconds = (Date.now() - startedAt) / 1000;
|
||||||
const { size: outputSizeBytes } = await fs.stat(outputFilePath);
|
const { size: outputSizeBytes } = await fs.stat(outputFilePath);
|
||||||
|
|
||||||
@@ -75,6 +80,8 @@ async function main() {
|
|||||||
registerImageConverters();
|
registerImageConverters();
|
||||||
registerImageToPdfConverter();
|
registerImageToPdfConverter();
|
||||||
registerDocumentConverters();
|
registerDocumentConverters();
|
||||||
|
registerIcoConverter();
|
||||||
|
registerHeicConverter();
|
||||||
|
|
||||||
startWorker(prisma, config);
|
startWorker(prisma, config);
|
||||||
console.log(`Worker started, polling every ${config.workerPollIntervalMs}ms`);
|
console.log(`Worker started, polling every ${config.workerPollIntervalMs}ms`);
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { loadConfig } from '../src/config.js';
|
|||||||
import { ensureStorageDirs, uploadPath, outputPath } from '../src/storage.js';
|
import { ensureStorageDirs, uploadPath, outputPath } from '../src/storage.js';
|
||||||
import { createJob, getJobByUuid, getJobErrorLog } from '../src/jobs/jobRepository.js';
|
import { createJob, getJobByUuid, getJobErrorLog } from '../src/jobs/jobRepository.js';
|
||||||
import { registerImageConverters } from '../src/converters/image.js';
|
import { registerImageConverters } from '../src/converters/image.js';
|
||||||
|
import { registerIcoConverter } from '../src/converters/ico.js';
|
||||||
import { processPendingJobs } from '../src/worker.js';
|
import { processPendingJobs } from '../src/worker.js';
|
||||||
|
|
||||||
let prisma;
|
let prisma;
|
||||||
@@ -15,6 +16,7 @@ let config;
|
|||||||
|
|
||||||
beforeAll(async () => {
|
beforeAll(async () => {
|
||||||
registerImageConverters();
|
registerImageConverters();
|
||||||
|
registerIcoConverter();
|
||||||
config = { ...loadConfig(), storageDir: await fs.mkdtemp(path.join(os.tmpdir(), 'converter-worker-')) };
|
config = { ...loadConfig(), storageDir: await fs.mkdtemp(path.join(os.tmpdir(), 'converter-worker-')) };
|
||||||
await ensureStorageDirs(config);
|
await ensureStorageDirs(config);
|
||||||
prisma = getPrismaClient(config);
|
prisma = getPrismaClient(config);
|
||||||
@@ -154,4 +156,35 @@ describe('processPendingJobs', () => {
|
|||||||
|
|
||||||
expect(processedCount).toBe(2);
|
expect(processedCount).toBe(2);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('processes a png -> ico job honoring iconSize', async () => {
|
||||||
|
const { decodeIco } = await import('icojs');
|
||||||
|
const uuid = 'bbbbbbbb-1111-4bbb-8bbb-bbbbbbbbbbb1';
|
||||||
|
const fixturePath = path.join(import.meta.dirname, 'fixtures', 'sample.png');
|
||||||
|
const inputFilePath = uploadPath(config, uuid, 'png');
|
||||||
|
await fs.copyFile(fixturePath, inputFilePath);
|
||||||
|
const { size: inputSizeBytes } = await fs.stat(inputFilePath);
|
||||||
|
|
||||||
|
await createJob(prisma, {
|
||||||
|
uuid,
|
||||||
|
family: 'image',
|
||||||
|
sourceFormat: 'png',
|
||||||
|
targetFormat: 'ico',
|
||||||
|
originalFilename: 'photo.png',
|
||||||
|
inputPath: `${uuid}.png`,
|
||||||
|
inputMimeType: 'image/png',
|
||||||
|
inputSizeBytes,
|
||||||
|
expiresAt: new Date(Date.now() + 3600 * 1000),
|
||||||
|
iconSize: 32,
|
||||||
|
});
|
||||||
|
|
||||||
|
await processPendingJobs(prisma, config);
|
||||||
|
|
||||||
|
const job = await getJobByUuid(prisma, uuid);
|
||||||
|
expect(job.status).toBe('done');
|
||||||
|
|
||||||
|
const outputFilePath = outputPath(config, uuid, 'ico');
|
||||||
|
const [image] = await decodeIco(await fs.readFile(outputFilePath), 'image/png');
|
||||||
|
expect(image.width).toBe(32);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user