tphim 2.3.0 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tphim",
-  "version": "2.3.0",
+  "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",
@@ -49,6 +49,7 @@
   "homepage": "https://film.nrotxa.online",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.999.0",
+    "@aws-sdk/lib-storage": "^3.1008.0",
     "@clack/prompts": "^1.0.1",
     "chalk": "^5.6.2",
     "cli-progress": "^3.12.0",
@@ -67,4 +68,4 @@
   "engines": {
     "node": ">=18.0.0"
   }
-}
+}

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...');

package/scripts/direct-process.mjs

@@ -0,0 +1,150 @@
+
+import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
+import { Upload } from "@aws-sdk/lib-storage";
+import { spawn } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import 'dotenv/config';
+import ffmpeg from 'ffmpeg-static';
+import { lookup } from 'mime-types';
+
+const FFMPEG_BIN = ffmpeg || 'ffmpeg';
+const s3 = new S3Client({
+    region: 'us-east-1',
+    endpoint: process.env.TEBI_ENDPOINT,
+    credentials: {
+        accessKeyId: process.env.TEBI_ACCESS_KEY_ID,
+        secretAccessKey: process.env.TEBI_SECRET_ACCESS_KEY,
+    },
+    forcePathStyle: true,
+});
+
+const slug = "ninh-an-nhu-mong-direct";
+const bucket = process.env.TEBI_BUCKET;
+const desktop = "C:\\Users\\TXA3000\\Desktop";
+
+const filesToUpload = [
+    { local: path.join(desktop, "360p - NINH AN NHƯ MỘNG - TM.mp4"), remote: `movies/${slug}/360p.mp4` },
+    { local: path.join(desktop, "144p - Ninh An Như Mộng - TM.mp4"), remote: `movies/${slug}/144p.mp4` },
+    { local: path.join(desktop, "720p Thuyết Minh_Ninh An Như Mộng.mp4"), remote: `movies/${slug}/720p.mp4` }
+];
+
+async function uploadFile(localPath, remotePath) {
+    if (!fs.existsSync(localPath)) {
+        console.log(`\n⚠️ Skip: ${path.basename(localPath)} (Not found)`);
+        return;
+    }
+    console.log(`\n📡 Uploading: ${path.basename(localPath)} -> ${remotePath}`);
+    const stream = fs.createReadStream(localPath);
+    try {
+        const uploader = new Upload({
+            client: s3,
+            params: {
+                Bucket: bucket,
+                Key: remotePath,
+                Body: stream,
+                ContentType: lookup(localPath) || 'video/mp4',
+                ACL: 'public-read',
+            },
+            queueSize: 4, 
+            partSize: 5 * 1024 * 1024,
+        });
+
+        uploader.on("httpUploadProgress", (progress) => {
+            const pct = Math.round((progress.loaded / (progress.total || 1)) * 100);
+            process.stdout.write(`\r   ⚡ Progress: ${pct}% (${(progress.loaded / 1024 / 1024).toFixed(1)} MB)`);
+        });
+
+        await uploader.done();
+        console.log(`\n✅ Done: ${path.basename(localPath)}`);
+    } catch (e) {
+        console.error(`\n❌ Upload failed for ${path.basename(localPath)}:`, e.message);
+    }
+}
+
+async function captureStoryboards(inputPath, outputDir) {
+    if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir, { recursive: true });
+    console.log(`\n🚀 Capturing Storyboards from ${path.basename(inputPath)} (Turbo Mode)...`);
+    
+    const args = [
+        '-skip_frame', 'nokey', '-threads', '0', '-i', inputPath,
+        '-filter_complex', [
+            '[0:v]split=3[v1][v2][v3]',
+            '[v1]fps=1/10,scale=160:90,tile=10x10[out1]',
+            '[v2]fps=1/30,scale=240:135,tile=5x5[out2]',
+            '[v3]fps=1/60,scale=320:180,tile=3x3[out3]'
+        ].join(';'),
+        '-map', '[out1]', '-q:v', '4', '-start_number', '0', '-vsync', '0', path.join(outputDir, 'L1_M%d.jpg'),
+        '-map', '[out2]', '-q:v', '4', '-start_number', '0', '-vsync', '0', path.join(outputDir, 'L2_M%d.jpg'),
+        '-map', '[out3]', '-q:v', '4', '-start_number', '0', '-vsync', '0', path.join(outputDir, 'L3_M%d.jpg'),
+        '-y'
+    ];
+
+    return new Promise((resolve, reject) => {
+        const proc = spawn(FFMPEG_BIN, args, { shell: false });
+        proc.on('close', code => code === 0 ? resolve() : reject(new Error('FFmpeg failed')));
+    });
+}
+
+async function uploadFolder(localDir, remotePrefix) {
+    console.log(`\n📡 Batch uploading storyboards...`);
+    const files = fs.readdirSync(localDir);
+    for (const file of files) {
+        const fullPath = path.join(localDir, file);
+        if (fs.statSync(fullPath).isFile()) {
+            await uploadFile(fullPath, `${remotePrefix}/${file}`);
+        }
+    }
+}
+
+async function main() {
+    const reportPath = path.join(desktop, "NINH_AN_NHU_MONG_LINKS.txt");
+    try {
+        // 1. Upload MP4s
+        for (const f of filesToUpload) {
+            await uploadFile(f.local, f.remote);
+        }
+
+        // 2. Capture Storyboard (from 720p)
+        const hqFile = filesToUpload[2].local; 
+        const storyboardDir = path.join(process.cwd(), 'temp_storyboard');
+        if (fs.existsSync(hqFile)) {
+            await captureStoryboards(hqFile, storyboardDir);
+            
+            // 3. Upload Storyboards
+            await uploadFolder(storyboardDir, `movies/${slug}/storyboard`);
+        }
+
+        // 4. Generate Report
+        const report = `
+========================================
+REPORT: NINH AN NHƯ MỘNG DIRECT LINKS
+========================================
+
+🎬 MP4 DIRECT LINKS:
+- 720p: https://s3.tebi.io/${bucket}/movies/${slug}/720p.mp4
+- 360p: https://s3.tebi.io/${bucket}/movies/${slug}/360p.mp4
+- 144p: https://s3.tebi.io/${bucket}/movies/${slug}/144p.mp4
+
+📸 STORYBOARD LINKS (L1, L2, L3):
+- Base Path: https://s3.tebi.io/${bucket}/movies/${slug}/storyboard/
+- Example L1: https://s3.tebi.io/${bucket}/movies/${slug}/storyboard/L1_M0.jpg
+- Example L2: https://s3.tebi.io/${bucket}/movies/${slug}/storyboard/L2_M0.jpg
+- Example L3: https://s3.tebi.io/${bucket}/movies/${slug}/storyboard/L3_M0.jpg
+
+🚀 Player usage: 
+   Sử dụng link MP4 ở trên. Player sẽ tự động tìm 
+   thông tin storyboard nếu được cập nhật theo TXA_AI_GUIDE.
+========================================
+`;
+        fs.writeFileSync(reportPath, report);
+        console.log(`\n✨ ALL DONE! Report saved to: ${reportPath}`);
+
+        // Cleanup
+        if (fs.existsSync(storyboardDir)) fs.rmSync(storyboardDir, { recursive: true, force: true });
+    } catch (err) {
+        console.error("❌ Error:", err);
+    }
+}
+
+main();

package/scripts/upload-tebi.mjs

@@ -16,12 +16,14 @@ const s3 = new S3Client({
     forcePathStyle: true,              // Tebi cần pathStyle, không dùng subdomain
 });
 
+import { Upload } from "@aws-sdk/lib-storage";
+import { createReadStream, statSync } from 'fs';
+
 export async function uploadHLSFolder(slug) {
     const localDir = join('hls', slug);
     const files = getAllFiles(localDir);
     const progressFile = join('hls', slug, '.upload-progress.json');
     
-    // Load existing progress
     let uploadedFiles = [];
     if (existsSync(progressFile)) {
         try {
@@ -33,58 +35,66 @@ export async function uploadHLSFolder(slug) {
         }
     }
 
-    // Filter files that haven't been uploaded yet
     const filesToUpload = files.filter(file => !uploadedFiles.includes(relative('.', file).replace(/\\/g, '/')));
     
-    console.log(`\n☁️  Uploading ${filesToUpload.length} files to Tebi.io... (${files.length - filesToUpload.length} already uploaded)`);
+    console.log(`\n☁️  Uploading ${filesToUpload.length} files to Tebi.io (Turbo Mode)...`);
     let uploaded = uploadedFiles.length;
+    const total = files.length;
+
+    const cacheMap = {
+        '.ts': 'public, max-age=31536000',
+        '.jpg': 'public, max-age=31536000',
+        '.m3u8': 'public, max-age=300',
+        '.vtt': 'public, max-age=86400',
+        '.txt': 'no-cache',
+    };
 
-    for (const filePath of filesToUpload) {
+    // Hàm upload từng file đơn lẻ sử dụng lib-storage
+    const uploadSingleFile = async (filePath) => {
         const s3Key = relative('.', filePath).replace(/\\/g, '/');
         const ext = extname(filePath).toLowerCase();
-
-        // Check if file already exists on cloud
+        
         try {
-            await s3.send(new HeadObjectCommand({
-                Bucket: process.env.TEBI_BUCKET,
-                Key: s3Key
-            }));
-            console.log(`\n   ⏭ Skipping ${s3Key} (already exists on cloud)`);
+            const stream = createReadStream(filePath);
+            const size = statSync(filePath).size;
+            
+            const uploader = new Upload({
+                client: s3,
+                params: {
+                    Bucket: process.env.TEBI_BUCKET,
+                    Key: s3Key,
+                    Body: stream,
+                    ACL: 'public-read',
+                    ContentType: lookup(filePath) || 'application/octet-stream',
+                    CacheControl: cacheMap[ext] || 'public, max-age=3600',
+                },
+                queueSize: 1, // Sẽ điều khiển concurrency ở cấp độ folder
+                partSize: 5 * 1024 * 1024,
+            });
+
+            await uploader.done();
+            
             uploaded++;
             uploadedFiles.push(s3Key);
-            continue;
+            
+            // Lưu progress
+            writeFileSync(progressFile, JSON.stringify({
+                uploadedFiles,
+                totalFiles: total,
+                lastUpdate: new Date().toISOString()
+            }));
+            
+            process.stdout.write(`\r   ↳ Progress: ${uploaded}/${total} files...`);
         } catch (e) {
-            // File doesn't exist, proceed with upload
+            console.error(`\n❌ Lỗi upload ${s3Key}:`, e.message);
         }
+    };
 
-        const cacheMap = {
-            '.ts': 'public, max-age=31536000',
-            '.jpg': 'public, max-age=31536000',
-            '.m3u8': 'public, max-age=300',
-            '.vtt': 'public, max-age=86400',
-            '.txt': 'no-cache',
-        };
-
-        await s3.send(new PutObjectCommand({
-            Bucket: process.env.TEBI_BUCKET,
-            Key: s3Key,
-            Body: readFileSync(filePath),
-            ACL: 'public-read', // Mở khóa file công khai ngay khi upload
-            ContentType: lookup(filePath) || 'application/octet-stream',
-            CacheControl: cacheMap[ext] || 'public, max-age=3600',
-        }));
-
-        uploaded++;
-        uploadedFiles.push(s3Key);
-        
-        // Save progress after each successful upload
-        writeFileSync(progressFile, JSON.stringify({
-            uploadedFiles,
-            totalFiles: files.length,
-            lastUpdate: new Date().toISOString()
-        }));
-        
-        process.stdout.write(`\r   ↳ ${uploaded}/${files.length} files...`);
+    // Chạy song song với concurrency limit (ví dụ: 10 file cùng lúc)
+    const CONCURRENCY = 10;
+    for (let i = 0; i < filesToUpload.length; i += CONCURRENCY) {
+        const chunk = filesToUpload.slice(i, i + CONCURRENCY);
+        await Promise.all(chunk.map(file => uploadSingleFile(file)));
     }
 
     // Clean up progress file when complete