admin/bodyshop-media-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial Queue Changes.

Browse Source
This commit is contained in:
Patrick Fic
2024-08-30 12:17:08 -07:00
parent d5a47fda14
commit b6066f9149
7 changed files with 832 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
util/heicConverter.ts
View File

@@ -1,13 +1,19 @@
import { Job, Queue, QueueEvents, Worker } from "bullmq";
import dotenv from "dotenv";
import { fileTypeFromFile } from "file-type";
import { FileTypeResult } from "file-type/core";
import fs from "fs-extra";
import gm from "gm";
import path from "path";
import { fileURLToPath } from "url";
import { logger } from "../server.js";
import { generateUniqueHeicFilename } from "./generateUniqueFilename.js";
import { FolderPaths } from "./serverInit.js";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const HeicQueue = new Queue("HEIC Queue", { connection: { host: "localhost", port: 6379 } });
dotenv.config({
path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
});
@@ -16,19 +22,22 @@ const imageMagick = gm.subClass({ imageMagick: true });
export async function ConvertHeicFiles(files: Express.Multer.File[]) {
const validFiles = await filterValidHeicFiles(files);
await Promise.all(
validFiles.map(async (file) => {
const convertedFileName = generateUniqueHeicFilename(file);
try {
await ConvertToJpeg(file.path, `${file.destination}/${convertedFileName}`);
logger.log("debug", `Converted ${file.filename} image to JPEG from HEIC.`);
await handleOriginalFile(file, convertedFileName);
file.filename = convertedFileName;
file.mimetype = "image/jpeg";
file.path = `${file.destination}/${convertedFileName}`;
} catch (error) {
logger.log("error", `Error converting ${file.filename} image to JPEG from HEIC. ${JSON.stringify(error)}`);
}
await HeicQueue.add(convertedFileName, { convertedFileName, file });
// try {
// await ConvertToJpeg(file.path, `${file.destination}/${convertedFileName}`);
// logger.log("debug", `Converted ${file.filename} image to JPEG from HEIC.`);
// await handleOriginalFile(file, convertedFileName);
// file.filename = convertedFileName;
// file.mimetype = "image/jpeg";
// file.path = `${file.destination}/${convertedFileName}`;
// } catch (error) {
// logger.log("error", `Error converting ${file.filename} image to JPEG from HEIC. ${JSON.stringify(error)}`);
// }
})
);
}
@@ -65,3 +74,41 @@ async function ConvertToJpeg(file: string, newPath: string) {
});
});
}
//Previos implementation using sandboxing. Cannot set up because the imports try to launch the server again.
// const processorUrl = pathToFileURL(__dirname + "/heicQueueProcessor.ts");
// const HeicWorker = new Worker("HEIC Queue", processorUrl, {
// connection: { host: "localhost", port: 6379 }
// });
const HeicWorker = new Worker(
"HEIC Queue",
async (job: Job) => {
const { file, convertedFileName } = job.data;
try {
await ConvertToJpeg(file.path, `${file.destination}/${convertedFileName}`);
logger.log("debug", `Converted ${file.filename} image to JPEG from HEIC.`);
await handleOriginalFile(file, convertedFileName);
file.filename = convertedFileName;
file.mimetype = "image/jpeg";
file.path = `${file.destination}/${convertedFileName}`;
} catch (error) {
logger.log("error", `Error converting ${file.filename} image to JPEG from HEIC. ${JSON.stringify(error)}`);
}
},
{
connection: { host: "localhost", port: 6379 }
}
);
HeicWorker.on("ready", () => {
console.log(`Worker Ready`);
});
HeicWorker.on("active", (job, prev) => {
console.log(`Job ${job} is now active; previous status was ${prev}`);
});
HeicWorker.on("completed", (jobId, returnvalue) => {
console.log(`${jobId} has completed and returned ${returnvalue}`);
});
HeicWorker.on("failed", (jobId, failedReason) => {
console.log(`${jobId} has failed with reason ${failedReason}`);
});

45
util/heicQueueProcessor.ts Normal file
View File

@@ -0,0 +1,45 @@
import { SandboxedJob } from "bullmq";
import { logger } from "../server.js";
import dotenv from "dotenv";
import fs from "fs-extra";
import path from "path";
import { FolderPaths } from "./serverInit.js";
import gm from "gm";
const imageMagick = gm.subClass({ imageMagick: true });
export default async function (job: SandboxedJob) {
// Do something with job
console.log("*** We're in the processing Queue")
const { file, convertedFileName } = job.data;
try {
logger.log("debug", `Attempting to convert ${file.filename} image to JPEG from HEIC.`);
await ConvertToJpeg(file.path, `${file.destination}/${convertedFileName}`);
logger.log("debug", `Converted ${file.filename} image to JPEG from HEIC.`);
await handleOriginalFile(file, convertedFileName);
file.filename = convertedFileName;
file.mimetype = "image/jpeg";
file.path = `${file.destination}/${convertedFileName}`;
} catch (error) {
logger.log("error", `Error converting ${file.filename} image to JPEG from HEIC. ${JSON.stringify(error)}`);
}
}
async function handleOriginalFile(file: Express.Multer.File, convertedFileName: string) {
if (process.env.KEEP_CONVERTED_ORIGINALS) {
await fs.ensureDir(path.join(file.destination, FolderPaths.ConvertedOriginalSubDir));
await fs.move(file.path, `${path.join(file.destination, FolderPaths.ConvertedOriginalSubDir)}/${file.filename}`);
} else {
await fs.unlink(file.path);
}
}
async function ConvertToJpeg(file: string, newPath: string) {
const fileOnDisk: Buffer = await fs.readFile(file);
return new Promise<string>((resolve, reject) => {
imageMagick(fileOnDisk)
.setFormat("jpg")
.write(newPath, (error) => {
if (error) reject(error.message);
resolve(newPath);
});
});
}