tphim 2.3.1 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tphim",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "TPHIM - Ultimate Video Pipeline: Download, Transcode HLS, AI Subtitles (with skip option), Resume Upload, and Cloud Upload.",
   "main": "index.js",
   "type": "module",

package/pipeline.mjs

@@ -419,11 +419,10 @@ export async function executePipeline({ input, slug, title, langArg = 'vi' }) {
         console.log(`\n⏭  [1/5] File đã có sẵn: ${mp4Path}`);
     }
 
-    // ─── BƯỚC 2: Transcode HLS ────────────────────────────────────
-    const masterName = `txa-${slug}.m3u8`;
-    const masterPath = path.join('hls', slug, masterName);
-    const spritePath = path.join('hls', slug, 'preview.jpg');
-    const nokia3gpPath = path.join('hls', slug, `${slug}.3gp`);
+    // --- STEP 2: PREVIEW SPRITE & STORYBOARD (Fast-Track) ---
+    const spriteLowPath = path.join('hls', slug, 'preview_low.jpg');
+    const storyboardCheckPath = path.join('hls', slug, 'L1_M0.jpg');
+    const outDir = path.join('hls', slug);
 
     // Detect VPS environment and optimize
     const vpsOpt = detectVPSOptimization();
@@ -432,6 +431,41 @@ export async function executePipeline({ input, slug, title, langArg = 'vi' }) {
         console.log(`   🚀 Ubuntu VPS Mode: Enabled (preset: ${vpsOpt.preset}, tune: ${vpsOpt.tune})`);
     }
 
+    console.log('\n📸 [2/5] Capturing Storyboards & Sprites (Turbo Mode)...');
+    
+    // 1. New Storyboard format (L1, L2, L3)
+    if (!existsSync(storyboardCheckPath)) {
+        try {
+            await generateStoryboards(mp4Path, outDir);
+        } catch (e) {
+            console.log('   ⚠ Storyboard generation failed:', e.message);
+        }
+    } else {
+        console.log(`   ⏭  Storyboard levels already exist`);
+    }
+
+    // 2. Legacy Dual Sprite format
+    if (!existsSync(spritePath) || !existsSync(spriteLowPath)) {
+        try {
+            await generateDualPreviewSprites(mp4Path, outDir);
+        } catch (e) {
+            console.log('   ⚠ Dual sprite generation failed, falling back to single sprite...');
+            const spriteCmd = `"${FFMPEG_BIN}" -i "${mp4Path}" -vf "fps=1/10,scale=160:90,tile=10x10" -q:v 3 "${spritePath}"`;
+            try {
+                execSync(spriteCmd, { stdio: 'inherit', ...SHELL_OPTS });
+                console.log('   ✅ Fallback Preview SpriteSheet ready.');
+            } catch (fallbackError) {
+                console.log('   ⚠ All sprite generation methods failed.');
+            }
+        }
+    } else {
+        console.log(`   ⏭  Dual Preview Sprites already exist`);
+    }
+
+    // ─── BƯỚC 3: Transcode HLS ────────────────────────────────────
+    const masterPath = path.join('hls', slug, masterName);
+    const nokia3gpPath = path.join('hls', slug, `${slug}.3gp`);
+
     // Danh sách toàn bộ chất lượng hỗ trợ
     const ALL_QUALITIES = [
         { label: '1080p', w: 1920, h: 1080, bv: '4500k', ba: '192k' },
@@ -442,15 +476,14 @@ export async function executePipeline({ input, slug, title, langArg = 'vi' }) {
         { label: '144p', w: 256, h: 144, bv: '200k', ba: '48k' }
     ];
 
-    // Lấy ngẫu nhiên từ 4 đến 6 chất lượng
     const count = Math.floor(Math.random() * (Math.min(6, ALL_QUALITIES.length) - 4 + 1)) + 4;
     const selectedQualities = [...ALL_QUALITIES]
         .sort(() => Math.random() - 0.5)
         .slice(0, count)
-        .sort((a, b) => b.h - a.h); // Sắp xếp cao -> thấp cho Master Playlist
+        .sort((a, b) => b.h - a.h);
 
     if (!existsSync(masterPath)) {
-        console.log(`\n📦 [2/5] Transcoding HLS (${selectedQualities.length} qualities randomized)...`);
+        console.log(`\n📦 [3/5] Transcoding HLS (${selectedQualities.length} qualities randomized)...`);
         console.log(`   ↳ Selected: ${selectedQualities.map(q => q.label).join(', ')}`);
 
         const outDir = path.join('hls', slug);
@@ -506,42 +539,6 @@ export async function executePipeline({ input, slug, title, langArg = 'vi' }) {
         console.log(`\n⏭  [2/5] HLS đã có sẵn`);
     }
 
-    // --- STEP 2.5: PREVIEW SPRITE & STORYBOARD --- (Independent check)
-    const spriteLowPath = path.join('hls', slug, 'preview_low.jpg');
-    const storyboardCheckPath = path.join('hls', slug, 'L1_M0.jpg');
-
-    const outDir = path.join('hls', slug);
-
-    // 1. New Storyboard format (L1, L2, L3)
-    if (!existsSync(storyboardCheckPath)) {
-        try {
-            await generateStoryboards(mp4Path, outDir);
-        } catch (e) {
-            console.log('   ⚠ Storyboard generation failed:', e.message);
-        }
-    } else {
-        console.log(`   ⏭  Storyboard levels already exist`);
-    }
-
-    // 2. Legacy Dual Sprite format (for backward compatibility)
-    if (!existsSync(spritePath) || !existsSync(spriteLowPath)) {
-        try {
-            const { highResPath, lowResPath } = await generateDualPreviewSprites(mp4Path, outDir);
-            console.log('   ✅ Dual Preview Sprites generated successfully.');
-        } catch (e) {
-            console.log('   ⚠ Dual sprite generation failed, falling back to single sprite...');
-            // Fallback to original method
-            const spriteCmd = `"${FFMPEG_BIN}" -i "${mp4Path}" -vf "fps=1/10,scale=160:90,tile=10x10" -q:v 3 "${spritePath}"`;
-            try {
-                execSync(spriteCmd, { stdio: 'ignore', ...SHELL_OPTS });
-                console.log('   ✅ Fallback Preview SpriteSheet ready.');
-            } catch (fallbackError) {
-                console.log('   ⚠ All sprite generation methods failed.');
-            }
-        }
-    } else {
-        console.log(`   ⏭  Dual Preview Sprites already exist`);
-    }
 
     // ─── BƯỚC 3: Tạo README ───────────────────────────────────────
     console.log('\n📄 [3/5] Generating README.txt...');