Refactor la création de vidéos pour utiliser des promesses et améliorer la gestion des erreurs, avec une réponse immédiate au démarrage du rendu.
This commit is contained in:
@@ -135,43 +135,41 @@ function serveFallbackVideo(res) {
|
|||||||
|
|
||||||
|
|
||||||
router.post('/videos/render/:video_id', async (req, res) => {
|
router.post('/videos/render/:video_id', async (req, res) => {
|
||||||
const videoId = req.params.video_id;
|
try {
|
||||||
const query = 'SELECT measurement_ids, project_id, duration FROM public.videos WHERE id = $1';
|
const videoId = req.params.video_id;
|
||||||
|
const result = await db.query(
|
||||||
|
'SELECT measurement_ids, project_id, duration FROM public.videos WHERE id = $1',
|
||||||
|
[videoId]
|
||||||
|
);
|
||||||
|
|
||||||
db.query(query, [videoId], async (err, results) => {
|
if (result.rows.length === 0) {
|
||||||
if (err) {
|
return res.status(404).json({ error: 'Vidéo non trouvée' });
|
||||||
return serverError.sendError('Error getting video:', res, err, 500);
|
}
|
||||||
}
|
|
||||||
if (results.rows.length === 0) {
|
|
||||||
return res.status(404).json({ error: 'Video not found' });
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('Video found:', results.rows[0]);
|
const { duration, measurement_ids, project_id } = result.rows[0];
|
||||||
const duration = results.rows[0].duration;
|
const pathList = await measureManager.getPathList(measurement_ids, project_id);
|
||||||
|
|
||||||
console.log('Rendering video:', videoId);
|
// Démarrage du traitement en arrière-plan
|
||||||
|
videoManager.createVideoWithList(project_id, pathList, duration, videoId)
|
||||||
|
.then(videoFile => {
|
||||||
|
console.log('Rendu vidéo terminé:', videoFile);
|
||||||
|
return videoManager.updateVideoFile(videoId, videoFile);
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('Échec du rendu vidéo:', error);
|
||||||
|
});
|
||||||
|
|
||||||
const measurementIds = results.rows[0].measurement_ids;
|
// Réponse immédiate
|
||||||
const project_id = results.rows[0].project_id;
|
res.json({
|
||||||
console.log('Measurement IDs:', measurementIds);
|
status: 'processing',
|
||||||
console.log('Project ID:', project_id);
|
message: 'Le rendu a démarré',
|
||||||
|
check_url: `/videos/status/${videoId}`
|
||||||
|
});
|
||||||
|
|
||||||
try {
|
} catch (error) {
|
||||||
const pathList = await measureManager.getPathList(measurementIds, project_id);
|
console.error('Erreur initiale:', error);
|
||||||
console.log('Path list:', pathList);
|
res.status(500).json({ error: 'Échec de l\'initialisation du rendu' });
|
||||||
res.json({ message: 'Render process started' });
|
}
|
||||||
|
|
||||||
const videoFile = await videoManager.createVideoWithList(project_id, pathList, duration, videoId);
|
|
||||||
console.log('Video file:', videoFile);
|
|
||||||
|
|
||||||
const update = await videoManager.updateVideoFile(videoId, videoFile);
|
|
||||||
|
|
||||||
console.log('Video rendering complete');
|
|
||||||
} catch (err) {
|
|
||||||
console.error('Error during video rendering:', err);
|
|
||||||
res.status(500).json({ error: 'Error during video rendering' });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
router.get('/videos/reset/:video_id', (req, res) => {
|
router.get('/videos/reset/:video_id', (req, res) => {
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const { execSync } = require('child_process');
|
const { execSync } = require('child_process');
|
||||||
|
const { exec } = require('child_process');
|
||||||
|
const util = require('util');
|
||||||
|
const execPromise = util.promisify(exec);
|
||||||
|
|
||||||
const serverError = require('../../utils/serverError');
|
const serverError = require('../../utils/serverError');
|
||||||
const db = require('../../db');
|
const db = require('../../db');
|
||||||
@@ -28,66 +31,88 @@ async function deleteVideoProject(videoId) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function createVideoWithList(projectId, pathList, duration, videoId) {
|
async function createVideoWithList(projectId, pathList, duration, videoId) {
|
||||||
//pathList étant la liste des chemins déjà triés
|
|
||||||
const tempFile = path.join('temp.txt');
|
const tempFile = path.join('temp.txt');
|
||||||
|
let ffmpegSuccess = false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Trouver tous les fichiers image pour le projet donné
|
const workdir = path.join(PROJECTS_DIR, 'storage', `${projectId}`);
|
||||||
const workdir = path.join(PROJECTS_DIR, 'storage', `${projectId}`);
|
const dir = path.join(PROJECTS_DIR, 'storage', `${projectId}`, 'images');
|
||||||
const dir = path.join(PROJECTS_DIR, 'storage', `${projectId}`, 'images');
|
|
||||||
console.log('dir:', dir);
|
// Vérification de l'existence du répertoire
|
||||||
const images = pathList;
|
if (!fs.existsSync(workdir)) {
|
||||||
console.log('images:', images);
|
fs.mkdirSync(workdir, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
// Trier les images numériquement
|
// Triage des images
|
||||||
const sortedImages = images.sort((a, b) => {
|
const sortedImages = pathList.sort((a, b) => {
|
||||||
const numA = parseInt(path.basename(a).match(/\d+/)[0], 10);
|
const numA = parseInt(path.basename(a).match(/\d+/)[0], 10);
|
||||||
const numB = parseInt(path.basename(b).match(/\d+/)[0], 10);
|
const numB = parseInt(path.basename(b).match(/\d+/)[0], 10);
|
||||||
return numA - numB;
|
return numA - numB;
|
||||||
});
|
});
|
||||||
|
|
||||||
// En déduire l'id de la première et dernière image utilisée
|
// Création du fichier temporaire
|
||||||
const firstImageId = parseInt(path.basename(sortedImages[0]).match(/\d+/)[0], 10);
|
fs.writeFileSync(tempFile, sortedImages.map(image => `file '${image}'`).join('\n'));
|
||||||
const lastImageId = parseInt(path.basename(sortedImages[sortedImages.length - 1]).match(/\d+/)[0], 10);
|
|
||||||
|
|
||||||
console.log('firstImageId:', firstImageId);
|
// Calcul du frame rate
|
||||||
console.log('lastImageId:', lastImageId);
|
const frameRate = Math.ceil(sortedImages.length / parseInt(duration));
|
||||||
|
|
||||||
// Créer un fichier temporaire pour la liste des images
|
// Génération du nom de fichier
|
||||||
fs.writeFileSync(tempFile, sortedImages.map(image => `file '${image}'`).join('\n'));
|
const timestamp = Date.now();
|
||||||
|
const outputVideo = path.join(
|
||||||
|
workdir,
|
||||||
|
`${projectId}_${path.basename(sortedImages[0], path.extname(sortedImages[0]))}_${path.basename(sortedImages[sortedImages.length - 1], path.extname(sortedImages[sortedImages.length - 1]))}-${timestamp}.mp4`
|
||||||
|
);
|
||||||
|
|
||||||
const frameRate = Math.ceil(sortedImages.length / parseInt(duration));
|
// Commande FFmpeg
|
||||||
|
const ffmpegCommand = [
|
||||||
|
'ffmpeg',
|
||||||
|
'-y', // Overwrite output file
|
||||||
|
'-r', frameRate,
|
||||||
|
'-f', 'concat',
|
||||||
|
'-safe', '0',
|
||||||
|
'-i', tempFile,
|
||||||
|
'-vsync', 'vfr',
|
||||||
|
'-pix_fmt', 'yuv420p',
|
||||||
|
outputVideo
|
||||||
|
].join(' ');
|
||||||
|
|
||||||
// le fichier final prend cette forme : {projectId}_{firstImageId}_{lastImageId}-{timestamp}.mp4
|
console.log(`Exécution de la commande FFmpeg: ${ffmpegCommand}`);
|
||||||
const timestamp = new Date().getTime();
|
const { stderr } = await execPromise(ffmpegCommand);
|
||||||
const outputVideo = path.join(workdir, `${projectId}_${firstImageId}_${lastImageId}-${timestamp}.mp4`);
|
|
||||||
|
|
||||||
// Commande ffmpeg pour créer la vidéo
|
// Vérification des erreurs FFmpeg
|
||||||
const ffmpegCommand = `ffmpeg -r ${frameRate} -f concat -safe 0 -i ${tempFile} -vsync vfr -pix_fmt yuv420p ${outputVideo}`;
|
if (stderr.includes('Error') || stderr.includes('failed')) {
|
||||||
console.log('Running ffmpeg command:', ffmpegCommand);
|
throw new Error(`Erreur FFmpeg: ${stderr}`);
|
||||||
execSync(ffmpegCommand).then(() => {
|
}
|
||||||
console.log('Video created successfully:', outputVideo);
|
|
||||||
|
|
||||||
// Mettre à jour le statut de la vidéo à "completed"
|
ffmpegSuccess = true;
|
||||||
const updateStatusQuery = 'UPDATE public.videos SET status = $2 WHERE id = $1 RETURNING *';
|
|
||||||
const updateStatusValues = [videoId, 1]; // 1 pour le statut "completed"
|
// Mise à jour de la base de données
|
||||||
const updateStatusRes = db.query(updateStatusQuery, updateStatusValues);
|
const updateStatusRes = await db.query(
|
||||||
console.log('Video status updated to completed:', updateStatusRes.rows[0]);
|
'UPDATE public.videos SET status = $1, file_path = $2 WHERE id = $3 RETURNING *',
|
||||||
}
|
[1, outputVideo, videoId]
|
||||||
).catch((error) => {
|
);
|
||||||
console.error('Error creating video:', error);
|
|
||||||
serverError.sendError('Error creating video', err=error);
|
console.log('Vidéo et statut mis à jour:', updateStatusRes.rows[0]);
|
||||||
});
|
return outputVideo;
|
||||||
|
|
||||||
return outputVideo;
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error creating video:', error);
|
console.error('Erreur lors de la création vidéo:', error);
|
||||||
serverError.sendError('Error creating video', err=error);
|
|
||||||
|
// Mise à jour du statut en erreur
|
||||||
|
if (ffmpegSuccess) {
|
||||||
|
await db.query(
|
||||||
|
'UPDATE public.videos SET status = $1 WHERE id = $2',
|
||||||
|
[3, videoId] // 3 = statut erreur
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw error;
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
// Supprimer le fichier temporaire
|
// Nettoyage du fichier temporaire
|
||||||
if (fs.existsSync(tempFile)) {
|
if (fs.existsSync(tempFile)) {
|
||||||
fs.unlinkSync(tempFile);
|
fs.unlinkSync(tempFile);
|
||||||
console.log('Temporary file deleted:', tempFile);
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user