Updates FFmpeg handling for platform-aware execution
Switches to platform- and architecture-specific FFmpeg binaries and dynamically resolves executable paths to improve cross-platform compatibility. Standardizes code style to use consistent double quotes. Corrects naming inconsistencies and ensures executables have proper permissions on startup. Enhances maintainability and reliability for image conversion across environments.
This commit is contained in:
1 parent
b7307a7a41
commit
c8be78de15
9 files changed
+76
-59
No files matched your search
Regular → Executable
File renamed without changes.
File renamed without changes.
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
export type ImageFormat = 'avif' | 'webp' | 'jpeg';
|
export type ImageFormat = "avif" | "webp" | "jpeg";
|
||||||
export interface ConversionOptions {
|
export interface ConversionOptions {
|
||||||
width: number;
|
width: number;
|
||||||
format: ImageFormat;
|
format: ImageFormat;
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"ffmpeg.d.ts","sourceRoot":"","sources":["../src/ffmpeg.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAEnD,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,eAAe;IAKjB,OAAO,CACT,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,iBAAiB,GAC3B,OAAO,CAAC,gBAAgB,CAAC;IA+C5B,OAAO,CAAC,aAAa;IAwBrB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM;CAQ9C"}
|
{"version":3,"file":"ffmpeg.d.ts","sourceRoot":"","sources":["../src/ffmpeg.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAEnD,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,eAAe;IAKjB,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,gBAAgB,CAAC;IA4C5B,OAAO,CAAC,aAAa;IAmCrB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM;CAQ5C"}
|
||||||
Vendored
+28
-26
@@ -1,35 +1,33 @@
|
|||||||
import { spawn } from 'child_process';
|
import { spawn } from "child_process";
|
||||||
import { mkdir, writeFile, readFile, unlink } from 'fs/promises';
|
import { mkdir, writeFile, readFile, unlink } from "fs/promises";
|
||||||
import { join } from 'path';
|
import { join } from "path";
|
||||||
import { tmpdir } from 'os';
|
import { tmpdir, arch, platform } from "os";
|
||||||
import { randomBytes } from 'crypto';
|
import { randomBytes } from "crypto";
|
||||||
|
import { fileURLToPath } from "url";
|
||||||
export class FFmpegConverter {
|
export class FFmpegConverter {
|
||||||
getTempFilePath(ext) {
|
getTempFilePath(ext) {
|
||||||
const randomName = randomBytes(16).toString('hex');
|
const randomName = randomBytes(16).toString("hex");
|
||||||
return join(tmpdir(), `img-${randomName}.${ext}`);
|
return join(tmpdir(), `img-${randomName}.${ext}`);
|
||||||
}
|
}
|
||||||
async convert(inputBuffer, options) {
|
async convert(inputBuffer, options) {
|
||||||
const inputPath = this.getTempFilePath('tmp');
|
const inputPath = this.getTempFilePath("tmp");
|
||||||
const outputPath = this.getTempFilePath(options.format);
|
const outputPath = this.getTempFilePath(options.format);
|
||||||
try {
|
try {
|
||||||
// Write input buffer to temp file
|
// Write input buffer to temp file
|
||||||
await writeFile(inputPath, inputBuffer);
|
await writeFile(inputPath, inputBuffer);
|
||||||
// Build FFmpeg command
|
// Build FFmpeg command
|
||||||
const args = [
|
const args = ["-i", inputPath, "-vf", `scale=${options.width}:-1`];
|
||||||
'-i', inputPath,
|
|
||||||
'-vf', `scale=${options.width}:-1`,
|
|
||||||
];
|
|
||||||
// Format-specific options
|
// Format-specific options
|
||||||
if (options.format === 'avif') {
|
if (options.format === "avif") {
|
||||||
args.push('-c:v', 'libaom-av1', '-crf', '30');
|
args.push("-c:v", "libaom-av1", "-crf", "30");
|
||||||
}
|
}
|
||||||
else if (options.format === 'webp') {
|
else if (options.format === "webp") {
|
||||||
args.push('-c:v', 'libwebp', '-quality', '80');
|
args.push("-c:v", "libwebp", "-quality", "80");
|
||||||
}
|
}
|
||||||
else if (options.format === 'jpeg') {
|
else if (options.format === "jpeg") {
|
||||||
args.push('-q:v', '5');
|
args.push("-q:v", "5");
|
||||||
}
|
}
|
||||||
args.push('-y', outputPath);
|
args.push("-y", outputPath);
|
||||||
// Execute FFmpeg
|
// Execute FFmpeg
|
||||||
await this.executeFFmpeg(args);
|
await this.executeFFmpeg(args);
|
||||||
// Read output file
|
// Read output file
|
||||||
@@ -53,13 +51,17 @@ export class FFmpegConverter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
executeFFmpeg(args) {
|
executeFFmpeg(args) {
|
||||||
|
const currentDirectory = fileURLToPath(import.meta.url);
|
||||||
|
const platformArchPrefix = `${platform()}-${arch()}`;
|
||||||
|
const ffmpegExecutable = join(currentDirectory, "..", "..", "bin", platformArchPrefix, platform() === "win32" ? "ffmpeg.exe" : "ffmpeg");
|
||||||
|
console.log(`Executing FFmpeg: ${ffmpegExecutable} ${args.join(" ")}`);
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const ffmpeg = spawn('ffmpeg', args);
|
const ffmpeg = spawn(ffmpegExecutable, args);
|
||||||
let stderr = '';
|
let stderr = "";
|
||||||
ffmpeg.stderr.on('data', (data) => {
|
ffmpeg.stderr.on("data", (data) => {
|
||||||
stderr += data.toString();
|
stderr += data.toString();
|
||||||
});
|
});
|
||||||
ffmpeg.on('close', (code) => {
|
ffmpeg.on("close", (code) => {
|
||||||
if (code === 0) {
|
if (code === 0) {
|
||||||
resolve();
|
resolve();
|
||||||
}
|
}
|
||||||
@@ -67,16 +69,16 @@ export class FFmpegConverter {
|
|||||||
reject(new Error(`FFmpeg exited with code ${code}\n${stderr}`));
|
reject(new Error(`FFmpeg exited with code ${code}\n${stderr}`));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
ffmpeg.on('error', (err) => {
|
ffmpeg.on("error", (err) => {
|
||||||
reject(new Error(`Failed to start FFmpeg: ${err.message}`));
|
reject(new Error(`Failed to start FFmpeg: ${err.message}`));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
getContentType(format) {
|
getContentType(format) {
|
||||||
const contentTypes = {
|
const contentTypes = {
|
||||||
avif: 'image/avif',
|
avif: "image/avif",
|
||||||
webp: 'image/webp',
|
webp: "image/webp",
|
||||||
jpeg: 'image/jpeg',
|
jpeg: "image/jpeg",
|
||||||
};
|
};
|
||||||
return contentTypes[format];
|
return contentTypes[format];
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"ffmpeg.js","sourceRoot":"","sources":["../src/ffmpeg.ts"],"names":[],"mappings":"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"}
|
{"version":3,"file":"ffmpeg.js","sourceRoot":"","sources":["../src/ffmpeg.ts"],"names":[],"mappings":"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"}
|
||||||
@@ -58,4 +58,11 @@ Get-Content $env:DAHYEON_GLOBAL_ENVIRONMENT_FILE | Where-Object { $_ -match '^\s
|
|||||||
|
|
||||||
Get-ChildItem Env: | Where-Object { $_.Name -like "*AWS*" -or $_.Name -eq "NODE_ENV" }
|
Get-ChildItem Env: | Where-Object { $_.Name -like "*AWS*" -or $_.Name -eq "NODE_ENV" }
|
||||||
|
|
||||||
|
|
||||||
|
if ($isMacOS) {
|
||||||
|
chmod +x "$PSScriptRoot/bin/darwin-arm64/ffmpeg"
|
||||||
|
} elseif ($isLinux) {
|
||||||
|
chmod +x "$PSScriptRoot/bin/linux-x64/ffmpeg"
|
||||||
|
}
|
||||||
|
|
||||||
node ./dist/main.js
|
node ./dist/main.js
|
||||||
Generated
+2
-3
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "image-derivaties-generation-service",
|
"name": "image-derivatives-generation-service",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "image-derivaties-generation-service",
|
"name": "image-derivatives-generation-service",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -330,7 +330,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.600.0.tgz",
|
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.600.0.tgz",
|
||||||
"integrity": "sha512-KQG97B7LvTtTiGmjlrG1LRAY8wUvCQzrmZVV5bjrJ/1oXAU7DITYwVbSJeX9NWg6hDuSk0VE3MFwIXS2SvfLIA==",
|
"integrity": "sha512-KQG97B7LvTtTiGmjlrG1LRAY8wUvCQzrmZVV5bjrJ/1oXAU7DITYwVbSJeX9NWg6hDuSk0VE3MFwIXS2SvfLIA==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aws-crypto/sha256-browser": "5.2.0",
|
"@aws-crypto/sha256-browser": "5.2.0",
|
||||||
"@aws-crypto/sha256-js": "5.2.0",
|
"@aws-crypto/sha256-js": "5.2.0",
|
||||||
|
|||||||
+36
-27
@@ -1,10 +1,11 @@
|
|||||||
import { spawn } from 'child_process';
|
import { spawn } from "child_process";
|
||||||
import { mkdir, writeFile, readFile, unlink } from 'fs/promises';
|
import { mkdir, writeFile, readFile, unlink } from "fs/promises";
|
||||||
import { join } from 'path';
|
import { join } from "path";
|
||||||
import { tmpdir } from 'os';
|
import { tmpdir, arch, platform } from "os";
|
||||||
import { randomBytes } from 'crypto';
|
import { randomBytes } from "crypto";
|
||||||
|
import { fileURLToPath } from "url";
|
||||||
|
|
||||||
export type ImageFormat = 'avif' | 'webp' | 'jpeg';
|
export type ImageFormat = "avif" | "webp" | "jpeg";
|
||||||
|
|
||||||
export interface ConversionOptions {
|
export interface ConversionOptions {
|
||||||
width: number;
|
width: number;
|
||||||
@@ -19,7 +20,7 @@ export interface ConversionResult {
|
|||||||
|
|
||||||
export class FFmpegConverter {
|
export class FFmpegConverter {
|
||||||
private getTempFilePath(ext: string): string {
|
private getTempFilePath(ext: string): string {
|
||||||
const randomName = randomBytes(16).toString('hex');
|
const randomName = randomBytes(16).toString("hex");
|
||||||
return join(tmpdir(), `img-${randomName}.${ext}`);
|
return join(tmpdir(), `img-${randomName}.${ext}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -27,7 +28,7 @@ export class FFmpegConverter {
|
|||||||
inputBuffer: Buffer,
|
inputBuffer: Buffer,
|
||||||
options: ConversionOptions
|
options: ConversionOptions
|
||||||
): Promise<ConversionResult> {
|
): Promise<ConversionResult> {
|
||||||
const inputPath = this.getTempFilePath('tmp');
|
const inputPath = this.getTempFilePath("tmp");
|
||||||
const outputPath = this.getTempFilePath(options.format);
|
const outputPath = this.getTempFilePath(options.format);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -35,21 +36,18 @@ export class FFmpegConverter {
|
|||||||
await writeFile(inputPath, inputBuffer);
|
await writeFile(inputPath, inputBuffer);
|
||||||
|
|
||||||
// Build FFmpeg command
|
// Build FFmpeg command
|
||||||
const args = [
|
const args = ["-i", inputPath, "-vf", `scale=${options.width}:-1`];
|
||||||
'-i', inputPath,
|
|
||||||
'-vf', `scale=${options.width}:-1`,
|
|
||||||
];
|
|
||||||
|
|
||||||
// Format-specific options
|
// Format-specific options
|
||||||
if (options.format === 'avif') {
|
if (options.format === "avif") {
|
||||||
args.push('-c:v', 'libaom-av1', '-crf', '30');
|
args.push("-c:v", "libaom-av1", "-crf", "30");
|
||||||
} else if (options.format === 'webp') {
|
} else if (options.format === "webp") {
|
||||||
args.push('-c:v', 'libwebp', '-quality', '80');
|
args.push("-c:v", "libwebp", "-quality", "80");
|
||||||
} else if (options.format === 'jpeg') {
|
} else if (options.format === "jpeg") {
|
||||||
args.push('-q:v', '5');
|
args.push("-q:v", "5");
|
||||||
}
|
}
|
||||||
|
|
||||||
args.push('-y', outputPath);
|
args.push("-y", outputPath);
|
||||||
|
|
||||||
// Execute FFmpeg
|
// Execute FFmpeg
|
||||||
await this.executeFFmpeg(args);
|
await this.executeFFmpeg(args);
|
||||||
@@ -74,16 +72,27 @@ export class FFmpegConverter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private executeFFmpeg(args: string[]): Promise<void> {
|
private executeFFmpeg(args: string[]): Promise<void> {
|
||||||
|
const currentDirectory = fileURLToPath(import.meta.url);
|
||||||
|
const platformArchPrefix = `${platform()}-${arch()}`;
|
||||||
|
const ffmpegExecutable = join(
|
||||||
|
currentDirectory,
|
||||||
|
"..",
|
||||||
|
"..",
|
||||||
|
"bin",
|
||||||
|
platformArchPrefix,
|
||||||
|
platform() === "win32" ? "ffmpeg.exe" : "ffmpeg"
|
||||||
|
);
|
||||||
|
// console.log(`Executing FFmpeg: ${ffmpegExecutable} ${args.join(" ")}`);
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const ffmpeg = spawn('ffmpeg', args);
|
const ffmpeg = spawn(ffmpegExecutable, args);
|
||||||
|
|
||||||
let stderr = '';
|
let stderr = "";
|
||||||
|
|
||||||
ffmpeg.stderr.on('data', (data: Buffer) => {
|
ffmpeg.stderr.on("data", (data: Buffer) => {
|
||||||
stderr += data.toString();
|
stderr += data.toString();
|
||||||
});
|
});
|
||||||
|
|
||||||
ffmpeg.on('close', (code) => {
|
ffmpeg.on("close", (code) => {
|
||||||
if (code === 0) {
|
if (code === 0) {
|
||||||
resolve();
|
resolve();
|
||||||
} else {
|
} else {
|
||||||
@@ -91,7 +100,7 @@ export class FFmpegConverter {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ffmpeg.on('error', (err) => {
|
ffmpeg.on("error", (err) => {
|
||||||
reject(new Error(`Failed to start FFmpeg: ${err.message}`));
|
reject(new Error(`Failed to start FFmpeg: ${err.message}`));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -99,9 +108,9 @@ export class FFmpegConverter {
|
|||||||
|
|
||||||
getContentType(format: ImageFormat): string {
|
getContentType(format: ImageFormat): string {
|
||||||
const contentTypes: Record<ImageFormat, string> = {
|
const contentTypes: Record<ImageFormat, string> = {
|
||||||
avif: 'image/avif',
|
avif: "image/avif",
|
||||||
webp: 'image/webp',
|
webp: "image/webp",
|
||||||
jpeg: 'image/jpeg',
|
jpeg: "image/jpeg",
|
||||||
};
|
};
|
||||||
return contentTypes[format];
|
return contentTypes[format];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user