@hed-hog/lms 0.0.361 → 0.0.365

package/src/course/course-video-conversion.service.ts

@@ -13,7 +13,7 @@ import {
 import { execFile } from 'child_process';
 import { existsSync, promises as fs, readdirSync } from 'fs';
 import { tmpdir } from 'os';
-import { basename, join } from 'path';
+import { basename, extname, join } from 'path';
 import { promisify } from 'util';
 
 export const LMS_VIDEO_CONVERSION_JOB = 'lms.video.convert';
@@ -32,6 +32,20 @@ type LessonFrameResult = {
 
 const execFileAsync = promisify(execFile);
 
+const VIDEO_FILE_EXTENSIONS = new Set([
+  '.mp4',
+  '.m4v',
+  '.mov',
+  '.mkv',
+  '.webm',
+  '.avi',
+  '.wmv',
+  '.flv',
+  '.ogv',
+  '.m2ts',
+  '.ts',
+]);
+
 type NotificationContext = {
   userId: number;
   notificationId: number;
@@ -187,7 +201,7 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
     }
 
     const mimetype = original.file_mimetype?.name ?? '';
-    if (!mimetype.startsWith('video/')) {
+    if (!this.isVideoOriginalFile(mimetype, original.filename, original.path)) {
       throw new BadRequestException('Original file must be a video');
     }
 
@@ -257,7 +271,14 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
 
   async handle(job: {
     id: number;
+    type: string;
+    queue_name: string;
     payload: Record<string, any>;
+    attempts: number;
+    max_attempts: number;
+    source_module?: string | null;
+    source_entity?: string | null;
+    source_entity_id?: string | null;
   }): Promise<any> {
     const { courseId, sessionId, lessonId, originalFileId, profiles, overwrite } =
       job.payload as {
@@ -299,6 +320,14 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
       throw new Error('Course has no active profiles to process');
     }
 
+    const workerConcurrency =
+      parseInt(process.env.QUEUE_WORKER_CONCURRENCY ?? '1', 10) || 1;
+    const queueDef = await (this.prisma as any).queue_definition.findUnique({
+      where: { name: LMS_VIDEO_CONVERSION_JOB },
+      select: { max_concurrency: true },
+    });
+    const queueMaxConcurrency: number | null = queueDef?.max_concurrency ?? null;
+
     const maxInputBytes = this.getPositiveIntegerEnv('LMS_VIDEO_MAX_INPUT_BYTES');
     const ffmpegTimeoutMs =
       this.getPositiveIntegerEnv('LMS_VIDEO_FFMPEG_TIMEOUT_MS') ?? 1000 * 60 * 60;
@@ -333,12 +362,17 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
       maxInputBytes ? { maxBytes: maxInputBytes } : undefined,
     );
 
+    const inputSizeBytes = downloadedOriginal.size;
+    const inputSizeMb = parseFloat((inputSizeBytes / (1024 * 1024)).toFixed(2));
+
     this.logger.log(
-      `Queue job ${job.id}: original file downloaded (lesson=${lessonId}, size=${downloadedOriginal.size})`,
+      `Queue job ${job.id}: original file downloaded (lesson=${lessonId}, size=${inputSizeBytes})`,
     );
-    await emitProgress('Vídeo original baixado. Lendo duração...', {
+    await emitProgress(`Vídeo original baixado (${inputSizeMb} MB). Lendo duração...`, {
       phase: 'probe_duration',
       lessonId,
+      inputSizeBytes,
+      inputSizeMb,
     });
 
     let probedDuration: number | null = null;
@@ -368,10 +402,65 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
       uploadMBps: number;
       totalMs: number;
     }> = [];
+
+    const buildMetrics = () => ({
+      totalMs: Date.now() - jobStartedAt,
+      totalOutputBytes: results.reduce((acc, item) => acc + item.outputBytes, 0),
+      inputSizeBytes,
+      inputSizeMb,
+      averageProfileMs:
+        results.length > 0
+          ? Math.round(results.reduce((acc, item) => acc + item.totalMs, 0) / results.length)
+          : 0,
+      averageConversionMBps:
+        results.length > 0
+          ? Number(
+              (results.reduce((acc, item) => acc + item.conversionMBps, 0) / results.length).toFixed(2),
+            )
+          : 0,
+      averageUploadMBps:
+        results.length > 0
+          ? Number(
+              (results.reduce((acc, item) => acc + item.uploadMBps, 0) / results.length).toFixed(2),
+            )
+          : 0,
+      workerConcurrency,
+      queueMaxConcurrency,
+    });
     let frameResults: LessonFrameResult[] = [];
 
+    // On retries (attempts > 1), skip profiles that were already successfully
+    // converted and uploaded in a previous attempt of this same job.
+    const alreadyDoneProfileIds = new Set<number>();
+    if (job.attempts > 1) {
+      const existingFiles = await (this.prisma as any).course_lesson_file.findMany({
+        where: {
+          course_lesson_id: lessonId,
+          type: { startsWith: 'video_profile:' },
+        },
+        select: { type: true },
+      });
+      for (const f of existingFiles as Array<{ type: string }>) {
+        const profileId = parseInt(f.type.split(':')[1], 10);
+        if (!isNaN(profileId)) alreadyDoneProfileIds.add(profileId);
+      }
+      if (alreadyDoneProfileIds.size > 0) {
+        this.logger.log(
+          `Queue job ${job.id}: retry attempt ${job.attempts}, skipping already-converted profiles: [${[...alreadyDoneProfileIds].join(', ')}]`,
+        );
+      }
+    }
+
     try {
       for (const profile of profilesToProcess) {
+        if (alreadyDoneProfileIds.has(profile.id)) {
+          await emitProgress(
+            `Perfil ${profile.name || profile.id} já convertido em tentativa anterior, pulando.`,
+            { phase: 'skip_profile', profileId: profile.id, profileName: profile.name },
+          );
+          continue;
+        }
+
         const profileStartedAt = Date.now();
         const outputPath = join(
           workDir,
@@ -381,7 +470,7 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
           `Queue job ${job.id}: converting profile ${profile.id} for lesson ${lessonId}`,
         );
         await emitProgress(
-          `Convertendo vídeo para o perfil ${profile.name || profile.id}...`,
+          `Convertendo vídeo para o perfil ${profile.name || profile.id} (entrada: ${inputSizeMb} MB)...`,
           {
             phase: 'convert_profile',
             lessonId,
@@ -389,6 +478,7 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
             profileName: profile.name,
             profileIndex: results.length + 1,
             profileCount: profilesToProcess.length,
+            inputSizeMb,
           },
         );
         this.logger.debug(
@@ -529,28 +619,7 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
           extractedFrames: frameResults.length,
           frames: frameResults,
           transcriptionJobId: transcriptionJob.id,
-          metrics: {
-            totalMs: Date.now() - jobStartedAt,
-            totalOutputBytes: results.reduce((acc, item) => acc + item.outputBytes, 0),
-            averageProfileMs:
-              results.length > 0
-                ? Math.round(results.reduce((acc, item) => acc + item.totalMs, 0) / results.length)
-                : 0,
-            averageConversionMBps:
-              results.length > 0
-                ? Number(
-                    (
-                      results.reduce((acc, item) => acc + item.conversionMBps, 0) / results.length
-                    ).toFixed(2),
-                  )
-                : 0,
-            averageUploadMBps:
-              results.length > 0
-                ? Number(
-                    (results.reduce((acc, item) => acc + item.uploadMBps, 0) / results.length).toFixed(2),
-                  )
-                : 0,
-          },
+          metrics: buildMetrics(),
         };
       } else {
         let transcriptionSkipReason = 'audio extraction returned no file id';
@@ -617,28 +686,7 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
               extractedFrames: frameResults.length,
               frames: frameResults,
               transcriptionJobId: transcriptionJob.id,
-              metrics: {
-                totalMs: Date.now() - jobStartedAt,
-                totalOutputBytes: results.reduce((acc, item) => acc + item.outputBytes, 0),
-                averageProfileMs:
-                  results.length > 0
-                    ? Math.round(results.reduce((acc, item) => acc + item.totalMs, 0) / results.length)
-                    : 0,
-                averageConversionMBps:
-                  results.length > 0
-                    ? Number(
-                        (
-                          results.reduce((acc, item) => acc + item.conversionMBps, 0) / results.length
-                        ).toFixed(2),
-                      )
-                    : 0,
-                averageUploadMBps:
-                  results.length > 0
-                    ? Number(
-                        (results.reduce((acc, item) => acc + item.uploadMBps, 0) / results.length).toFixed(2),
-                      )
-                    : 0,
-              },
+              metrics: buildMetrics(),
             };
           }
         } catch (fallbackError) {
@@ -693,11 +741,8 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
       this.logger.log(`Queue job ${job.id}: cleaned temporary folder ${workDir}`);
     }
 
-    const totalMs = Date.now() - jobStartedAt;
-    const totalOutputBytes = results.reduce((acc, item) => acc + item.outputBytes, 0);
-
     this.logger.log(
-      `Queue job ${job.id}: LMS conversion finished (lesson=${lessonId}, profiles=${results.length}, totalMs=${totalMs}, totalOutputBytes=${totalOutputBytes})`,
+      `Queue job ${job.id}: LMS conversion finished (lesson=${lessonId}, profiles=${results.length})`,
     );
 
     if (notificationContext) {
@@ -717,28 +762,7 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
       extractedFrames: frameResults.length,
       frames: frameResults,
       transcriptionJobId: null,
-      metrics: {
-        totalMs,
-        totalOutputBytes,
-        averageProfileMs:
-          results.length > 0
-            ? Math.round(results.reduce((acc, item) => acc + item.totalMs, 0) / results.length)
-            : 0,
-        averageConversionMBps:
-          results.length > 0
-            ? Number(
-                (
-                  results.reduce((acc, item) => acc + item.conversionMBps, 0) / results.length
-                ).toFixed(2),
-              )
-            : 0,
-        averageUploadMBps:
-          results.length > 0
-            ? Number(
-                (results.reduce((acc, item) => acc + item.uploadMBps, 0) / results.length).toFixed(2),
-              )
-            : 0,
-      },
+      metrics: buildMetrics(),
     };
   }
 
@@ -1378,4 +1402,18 @@ export class CourseVideoConversionService implements OnModuleInit, IJobHandler {
       return null;
     }
   }
+
+  private isVideoOriginalFile(
+    mimetype?: string | null,
+    filename?: string | null,
+    path?: string | null,
+  ): boolean {
+    if (typeof mimetype === 'string' && mimetype.startsWith('video/')) {
+      return true;
+    }
+
+    const candidateName = filename ?? path ?? '';
+    const extension = extname(candidateName).toLowerCase();
+    return VIDEO_FILE_EXTENSIONS.has(extension);
+  }
 }