Update app.py

app.py

@@ -25,64 +25,167 @@ def add_log(msg):
             bot_logs.pop(0)
     print(msg)
 
-def get_tiktok_sessionid():
+def parse_cookies_string(cookie_str):
+    """Parse cookie string (one-line format) into dict"""
+    cookies = {}
+    for part in cookie_str.strip().split(';'):
+        part = part.strip()
+        if '=' in part:
+            k, v = part.split('=', 1)
+            cookies[k.strip()] = v.strip()
+    return cookies
+
+def get_tiktok_cookies():
+    """Read cookies.txt and return dict"""
     try:
-        content = open(TIKTOK_COOKIE_FILE, 'r').read()
-        for part in content.replace('\n', ';').split(';'):
-            if part.strip().startswith('sessionid='):
-                return part.split('=', 1)[1]
-    except:
-        return None
-    return None
+        content = open(TIKTOK_COOKIE_FILE, 'r').read().strip()
+        return parse_cookies_string(content)
+    except Exception as e:
+        add_log(f'❌ Cookie read error: {e}')
+        return {}
+
+def get_tiktok_sessionid():
+    cookies = get_tiktok_cookies()
+    return cookies.get('sessionid')
 
 def upload_to_tiktok(video_path, title):
-    sessionid = get_tiktok_sessionid()
+    cookies = get_tiktok_cookies()
+    sessionid = cookies.get('sessionid')
     if not sessionid:
-        add_log('❌ TikTok sessionid not found')
+        add_log('❌ TikTok sessionid not found in cookies.txt')
         return False
-    
+
+    ms_token = cookies.get('msToken', '')
+    csrf     = cookies.get('tt_csrf_token', '')
+
     add_log(f'📤 Uploading: {title[:50]}...')
-    
-    url = 'https://www.tiktok.com/api/v1/video/upload/'
-    headers = {'User-Agent': 'Mozilla/5.0', 'Cookie': f'sessionid={sessionid}'}
     caption = f"{title}\n#movierecap #myanmar #fyp #viral"
-    
+
+    cookie_header = '; '.join([f'{k}={v}' for k, v in cookies.items()])
+    base_headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 Chrome/120.0.0.0 Safari/537.36',
+        'Referer': 'https://www.tiktok.com/',
+        'Origin': 'https://www.tiktok.com',
+        'X-Csrf-Token': csrf,
+        'Cookie': cookie_header,
+    }
+
+    video_size = os.path.getsize(video_path)
+
+    # ── Step 1: Init upload ──
+    init_url = 'https://open.tiktokapis.com/v2/post/publish/inbox/video/init/'
+    init_payload = {
+        'post_info': {
+            'title': caption,
+            'privacy_level': 'PUBLIC_TO_EVERYONE',
+            'disable_duet': False,
+            'disable_comment': False,
+            'disable_stitch': False,
+        },
+        'source_info': {
+            'source': 'FILE_UPLOAD',
+            'video_size': video_size,
+            'chunk_size': video_size,
+            'total_chunk_count': 1,
+        }
+    }
+
+    try:
+        init_headers = {**base_headers, 'Content-Type': 'application/json; charset=UTF-8'}
+        r = requests.post(init_url, headers=init_headers, json=init_payload, timeout=30)
+        add_log(f'Init response: {r.status_code} | {r.text[:300]}')
+        data = r.json()
+        upload_url = data.get('data', {}).get('upload_url')
+        publish_id  = data.get('data', {}).get('publish_id', '')
+        if not upload_url:
+            add_log('❌ No upload_url — trying fallback method...')
+            return _upload_fallback(video_path, caption, base_headers, video_size)
+    except Exception as e:
+        add_log(f'❌ Init error: {e}')
+        return False
+
+    # ── Step 2: Upload video chunk ──
+    try:
+        with open(video_path, 'rb') as f:
+            video_data = f.read()
+
+        upload_headers = {
+            'Content-Type': 'video/mp4',
+            'Content-Range': f'bytes 0-{video_size - 1}/{video_size}',
+            'Content-Length': str(video_size),
+        }
+        r2 = requests.put(upload_url, headers=upload_headers, data=video_data, timeout=300)
+        add_log(f'Upload chunk response: {r2.status_code} | {r2.text[:100]}')
+        if r2.status_code in (200, 201, 206):
+            add_log(f'✅ Upload success! publish_id={publish_id}')
+            return True
+        else:
+            add_log(f'❌ Chunk upload failed: {r2.status_code}')
+            return False
+    except Exception as e:
+        add_log(f'❌ Upload error: {e}')
+        return False
+
+
+def _upload_fallback(video_path, caption, base_headers, video_size):
+    """Fallback: TikTok web creator upload endpoint"""
+    add_log('🔄 Trying web creator fallback...')
     try:
+        # Step A: get upload ticket
+        ticket_url = 'https://www.tiktok.com/api/v1/web/creator/video/upload/'
+        payload = {
+            'video_size': video_size,
+            'chunk_size': video_size,
+            'total_chunk_count': 1,
+        }
+        r = requests.post(ticket_url, headers={**base_headers, 'Content-Type': 'application/json'}, json=payload, timeout=30)
+        add_log(f'Ticket response: {r.status_code} | {r.text[:200]}')
+        data = r.json()
+        upload_url = data.get('data', {}).get('upload_url') or data.get('upload_url')
+        if not upload_url:
+            add_log('❌ Fallback also failed — no upload_url')
+            return False
+
+        # Step B: upload chunk
         with open(video_path, 'rb') as f:
-            files = {'video': ('video.mp4', f, 'video/mp4')}
-            data = {'caption': caption}
-            response = requests.post(url, headers=headers, data=data, files=files, timeout=120)
-            if response.status_code == 200 and response.json().get('status_code') == 0:
-                add_log('✅ Upload success!')
-                return True
-            else:
-                add_log(f'❌ Upload failed: {response.text[:100]}')
-                return False
+            video_data = f.read()
+        r2 = requests.put(upload_url, headers={
+            'Content-Type': 'video/mp4',
+            'Content-Range': f'bytes 0-{video_size - 1}/{video_size}',
+            'Content-Length': str(video_size),
+        }, data=video_data, timeout=300)
+        add_log(f'Fallback chunk: {r2.status_code} | {r2.text[:100]}')
+        if r2.status_code in (200, 201):
+            add_log('✅ Fallback upload success!')
+            return True
+        return False
     except Exception as e:
-        add_log(f'❌ Error: {e}')
+        add_log(f'❌ Fallback error: {e}')
         return False
 
+
 def download_video(url, quality='720'):
     tid = uuid.uuid4().hex[:8]
     out_path = OUTPUT_DIR / f'{tid}.mp4'
-    
+
     fmt_map = {'1080': 'best[height<=1080]', '720': 'best[height<=720]', '480': 'best[height<=480]'}
     fmt = fmt_map.get(quality, 'best[height<=720]')
-    
+
     cmd = ['yt-dlp', '-f', fmt, '--merge-output-format', 'mp4', '-o', str(out_path), url]
     if os.path.exists(COOKIES_FILE):
         cmd += ['--cookies', COOKIES_FILE]
-    
+
     add_log(f'📥 Downloading: {url[:60]}...')
     result = subprocess.run(cmd, capture_output=True, text=True)
-    
+
     if result.returncode == 0 and out_path.exists():
         add_log(f'✅ Downloaded: {out_path.name}')
         return str(out_path)
     else:
-        add_log(f'❌ Download failed: {result.stderr[:100]}')
+        add_log(f'❌ Download failed: {result.stderr[:200]}')
         return None
 
+
 # ── Routes ──
 @app.route('/')
 def index():
@@ -90,56 +193,42 @@ def index():
 
 @app.route('/api/upload/manual', methods=['POST'])
 def api_upload_manual():
-    """Manual upload - provide video URL and title"""
     data = request.get_json() or {}
     video_url = data.get('url', '').strip()
-    title = data.get('title', '').strip()
-    quality = data.get('quality', '720')
-    
+    title     = data.get('title', '').strip()
+    quality   = data.get('quality', '720')
+
     if not video_url:
         return jsonify({'ok': False, 'msg': 'No URL provided'})
     if not title:
         return jsonify({'ok': False, 'msg': 'No title provided'})
-    
-    # Download first
+
     video_path = download_video(video_url, quality)
     if not video_path:
         return jsonify({'ok': False, 'msg': 'Download failed'})
-    
-    # Then upload to TikTok
+
     success = upload_to_tiktok(video_path, title)
-    
-    # Cleanup
-    try:
-        os.remove(video_path)
-    except:
-        pass
-    
-    return jsonify({'ok': success, 'msg': 'Upload completed' if success else 'Upload failed'})
+    try: os.remove(video_path)
+    except: pass
+
+    return jsonify({'ok': success, 'msg': 'Upload completed' if success else 'Upload failed — check logs'})
 
 @app.route('/api/upload/file', methods=['POST'])
 def api_upload_file():
-    """Manual upload - directly upload video file"""
     if 'video' not in request.files:
         return jsonify({'ok': False, 'msg': 'No video file'})
-    
+
     video = request.files['video']
     title = request.form.get('title', 'Video')
-    
-    # Save temp file
+
     temp_path = OUTPUT_DIR / f'temp_{uuid.uuid4().hex[:8]}.mp4'
     video.save(str(temp_path))
-    
-    # Upload to TikTok
+
     success = upload_to_tiktok(str(temp_path), title)
-    
-    # Cleanup
-    try:
-        temp_path.unlink()
-    except:
-        pass
-    
-    return jsonify({'ok': success, 'msg': 'Upload completed' if success else 'Upload failed'})
+    try: temp_path.unlink()
+    except: pass
+
+    return jsonify({'ok': success, 'msg': 'Upload completed' if success else 'Upload failed — check logs'})
 
 @app.route('/api/bot/start', methods=['POST'])
 def api_bot_start():
@@ -161,167 +250,230 @@ def api_bot_stop():
 
 @app.route('/api/bot/status', methods=['GET'])
 def api_bot_status():
-    return jsonify({'running': bot_running, 'logs': bot_logs[-50:], 'tiktok_cookie': get_tiktok_sessionid() is not None})
+    cookies = get_tiktok_cookies()
+    return jsonify({
+        'running': bot_running,
+        'logs': bot_logs[-50:],
+        'tiktok_cookie': bool(cookies.get('sessionid')),
+        'has_mstoken': bool(cookies.get('msToken')),
+    })
+
+@app.route('/api/cookie/check', methods=['GET'])
+def api_cookie_check():
+    """Debug endpoint — show which cookie keys are present"""
+    cookies = get_tiktok_cookies()
+    keys = list(cookies.keys())
+    return jsonify({
+        'total_keys': len(keys),
+        'has_sessionid': 'sessionid' in cookies,
+        'has_msToken': 'msToken' in cookies,
+        'has_csrf': 'tt_csrf_token' in cookies,
+        'keys': keys,
+    })
 
 def auto_poster_worker():
     global bot_running
     add_log('🤖 Auto Poster started')
     CHANNEL_ID = 'UCUZHFZ9jIKrLroW8LcyJEQQ'
     last_id = None
-    
+
     while bot_running:
         try:
             import feedparser
-            url = f'https://www.youtube.com/feeds/videos.xml?channel_id={CHANNEL_ID}'
-            feed = feedparser.parse(url)
-            
+            feed_url = f'https://www.youtube.com/feeds/videos.xml?channel_id={CHANNEL_ID}'
+            feed = feedparser.parse(feed_url)
+
             if feed.entries:
-                latest = feed.entries[0]
+                latest   = feed.entries[0]
                 video_id = latest.get('yt_videoid', '')
-                title = latest.get('title', '')
-                
+                title    = latest.get('title', '')
+
                 if last_id is None:
                     last_id = video_id
-                    add_log(f'📌 Initialized: {video_id}')
+                    add_log(f'📌 Initialized. Latest: {video_id} — {title[:40]}')
                 elif video_id != last_id:
-                    add_log(f'📹 New video: {title[:50]}')
+                    add_log(f'📹 New video detected: {title[:50]}')
                     video_path = download_video(f'https://youtube.com/watch?v={video_id}', '720')
                     if video_path:
                         upload_to_tiktok(video_path, title)
                         try: os.remove(video_path)
                         except: pass
                     last_id = video_id
+                else:
+                    add_log(f'💤 No new video. Last: {video_id}')
         except Exception as e:
-            add_log(f'⚠️ Error: {e}')
-        
+            add_log(f'⚠️ Worker error: {e}')
+
+        # wait 5 min
         for _ in range(300):
-            if not bot_running: break
+            if not bot_running:
+                break
             time.sleep(1)
 
-# ── HTML Template with Manual Upload ──
+    add_log('🛑 Auto Poster stopped')
+
+
+# ── HTML Template ──
 HTML_TEMPLATE = '''
 <!DOCTYPE html>
 <html>
 <head>
     <title>YouTube to TikTok Bot</title>
     <style>
-        body { font-family: monospace; max-width: 800px; margin: 0 auto; padding: 20px; background: #0a0a0a; color: #0f0; }
+        body { font-family: monospace; max-width: 820px; margin: 0 auto; padding: 20px; background: #0a0a0a; color: #0f0; }
         .card { background: #111; border: 1px solid #333; border-radius: 8px; padding: 16px; margin-bottom: 20px; }
-        button { background: #00aa00; color: black; border: none; padding: 8px 16px; cursor: pointer; margin-right: 8px; }
-        button.red { background: #aa0000; }
-        input, select, textarea { padding: 8px; margin: 5px 0; width: 100%; box-sizing: border-box; background: #222; color: #0f0; border: 1px solid #333; }
-        .log-box { height: 200px; overflow-y: scroll; background: #0a0a0a; border: 1px solid #333; padding: 10px; font-size: 11px; }
-        .status { padding: 8px; border-radius: 4px; margin-bottom: 10px; }
+        button { background: #00aa00; color: black; border: none; padding: 8px 16px; cursor: pointer; margin-right: 8px; border-radius: 4px; }
+        button:hover { background: #00cc00; }
+        button.red { background: #aa0000; color: #fff; }
+        button.red:hover { background: #cc0000; }
+        button.gray { background: #444; color: #fff; }
+        input, select, textarea { padding: 8px; margin: 5px 0; width: 100%; box-sizing: border-box; background: #222; color: #0f0; border: 1px solid #333; border-radius: 4px; }
+        .log-box { height: 220px; overflow-y: scroll; background: #050505; border: 1px solid #333; padding: 10px; font-size: 11px; line-height: 1.6; }
+        .status { padding: 8px 12px; border-radius: 4px; margin-bottom: 10px; font-weight: bold; }
         .status.running { background: #1a3a1a; color: #0f0; }
-        .status.stopped { background: #3a1a1a; color: #f00; }
-        hr { border-color: #333; }
+        .status.stopped { background: #3a1a1a; color: #f55; }
+        hr { border-color: #333; margin: 12px 0; }
+        .cookie-info { font-size: 11px; color: #888; margin-top: 6px; }
+        .cookie-info span { color: #0f0; }
+        .cookie-info span.bad { color: #f55; }
+        h2 { margin: 0 0 12px 0; font-size: 15px; }
+        h1 { font-size: 20px; }
+        .result { margin-top: 8px; font-size: 12px; min-height: 18px; }
     </style>
 </head>
 <body>
-    <h1>🎬 YouTube to TikTok Bot</h1>
-    
-    <!-- Auto Bot Control -->
+    <h1>🎬 YouTube → TikTok Bot</h1>
+
+    <!-- Cookie Status -->
+    <div class="card">
+        <h2>🍪 Cookie Status</h2>
+        <div id="cookie-status" class="cookie-info">Loading...</div>
+        <button class="gray" onclick="checkCookie()" style="margin-top:8px;">🔍 Check Cookies</button>
+    </div>
+
+    <!-- Auto Bot -->
     <div class="card">
         <h2>🤖 Auto Poster Bot</h2>
         <div id="status" class="status stopped">🔴 STOPPED</div>
         <button onclick="startBot()">▶️ START</button>
         <button class="red" onclick="stopBot()">⏹️ STOP</button>
-        <button onclick="refreshStatus()">🔄 Refresh</button>
+        <button class="gray" onclick="refreshStatus()">🔄 Refresh</button>
         <hr>
         <div id="log" class="log-box"></div>
     </div>
-    
+
     <!-- Manual Upload by URL -->
     <div class="card">
         <h2>📤 Manual Upload (by URL)</h2>
-        <input type="text" id="manual-url" placeholder="YouTube URL">
-        <input type="text" id="manual-title" placeholder="Video Title">
+        <input type="text" id="manual-url" placeholder="YouTube / Video URL">
+        <input type="text" id="manual-title" placeholder="Video Title (caption)">
         <select id="manual-quality">
             <option value="1080">1080p</option>
             <option value="720" selected>720p</option>
             <option value="480">480p</option>
         </select>
-        <button onclick="manualUpload()">⬆️ Download & Upload</button>
-        <div id="manual-result"></div>
+        <button onclick="manualUpload()">⬆️ Download & Upload to TikTok</button>
+        <div id="manual-result" class="result"></div>
     </div>
-    
+
     <!-- Manual Upload by File -->
     <div class="card">
         <h2>📁 Manual Upload (by File)</h2>
-        <input type="file" id="file-input" accept="video/mp4">
-        <input type="text" id="file-title" placeholder="Video Title">
+        <input type="file" id="file-input" accept="video/mp4,video/*">
+        <input type="text" id="file-title" placeholder="Video Title (caption)">
         <button onclick="manualUploadFile()">⬆️ Upload File to TikTok</button>
-        <div id="file-result"></div>
+        <div id="file-result" class="result"></div>
     </div>
-    
+
     <script>
+        async function checkCookie() {
+            const res = await fetch('/api/cookie/check');
+            const d = await res.json();
+            const el = document.getElementById('cookie-status');
+            const ok = v => `<span>${v ? '✅' : '<span class="bad">❌</span>'}</span>`;
+            el.innerHTML = `
+                sessionid: ${ok(d.has_sessionid)} &nbsp;|&nbsp;
+                msToken: ${ok(d.has_msToken)} &nbsp;|&nbsp;
+                csrf: ${ok(d.has_csrf)} &nbsp;|&nbsp;
+                Total keys: <span>${d.total_keys}</span>
+            `;
+        }
+
         async function refreshStatus() {
             const res = await fetch('/api/bot/status');
-            const data = await res.json();
+            const d = await res.json();
             const statusDiv = document.getElementById('status');
-            if (data.running) {
-                statusDiv.className = 'status running';
-                statusDiv.innerHTML = '🟢 RUNNING';
-            } else {
-                statusDiv.className = 'status stopped';
-                statusDiv.innerHTML = '🔴 STOPPED';
-            }
-            document.getElementById('log').innerHTML = data.logs.map(l => `<div>${escapeHtml(l)}</div>`).join('');
+            statusDiv.className = 'status ' + (d.running ? 'running' : 'stopped');
+            statusDiv.innerHTML = d.running ? '🟢 RUNNING' : '🔴 STOPPED';
+            const logEl = document.getElementById('log');
+            logEl.innerHTML = d.logs.map(l => `<div>${escapeHtml(l)}</div>`).join('');
+            logEl.scrollTop = logEl.scrollHeight;
         }
-        
+
         async function startBot() {
             const res = await fetch('/api/bot/start', {method: 'POST'});
-            const data = await res.json();
-            alert(data.msg);
+            const d = await res.json();
+            alert(d.msg);
             refreshStatus();
         }
-        
+
         async function stopBot() {
             const res = await fetch('/api/bot/stop', {method: 'POST'});
-            const data = await res.json();
-            alert(data.msg);
+            const d = await res.json();
+            alert(d.msg);
             refreshStatus();
         }
-        
+
         async function manualUpload() {
-            const url = document.getElementById('manual-url').value;
-            const title = document.getElementById('manual-title').value;
+            const url   = document.getElementById('manual-url').value.trim();
+            const title = document.getElementById('manual-title').value.trim();
             const quality = document.getElementById('manual-quality').value;
-            if (!url || !title) { alert('Enter URL and Title'); return; }
-            
-            document.getElementById('manual-result').innerHTML = '⏳ Processing...';
-            const res = await fetch('/api/upload/manual', {
-                method: 'POST',
-                headers: {'Content-Type': 'application/json'},
-                body: JSON.stringify({url, title, quality})
-            });
-            const data = await res.json();
-            document.getElementById('manual-result').innerHTML = data.ok ? '✅ ' + data.msg : '❌ ' + data.msg;
+            if (!url || !title) { alert('URL နဲ့ Title ထည့်ပါ'); return; }
+
+            const el = document.getElementById('manual-result');
+            el.innerHTML = '⏳ Downloading & uploading... (ခဏစောင့်ပါ)';
+            try {
+                const res = await fetch('/api/upload/manual', {
+                    method: 'POST',
+                    headers: {'Content-Type': 'application/json'},
+                    body: JSON.stringify({url, title, quality})
+                });
+                const d = await res.json();
+                el.innerHTML = d.ok ? '✅ ' + d.msg : '❌ ' + d.msg;
+            } catch(e) {
+                el.innerHTML = '❌ Request error: ' + e;
+            }
             refreshStatus();
         }
-        
+
         async function manualUploadFile() {
-            const file = document.getElementById('file-input').files[0];
-            const title = document.getElementById('file-title').value;
-            if (!file || !title) { alert('Select file and enter title'); return; }
-            
+            const file  = document.getElementById('file-input').files[0];
+            const title = document.getElementById('file-title').value.trim();
+            if (!file || !title) { alert('File ရွေးပြီး Title ထည့်ပါ'); return; }
+
+            const el = document.getElementById('file-result');
+            el.innerHTML = '⏳ Uploading file... (ခဏစောင့်ပါ)';
             const formData = new FormData();
             formData.append('video', file);
             formData.append('title', title);
-            
-            document.getElementById('file-result').innerHTML = '⏳ Uploading...';
-            const res = await fetch('/api/upload/file', {method: 'POST', body: formData});
-            const data = await res.json();
-            document.getElementById('file-result').innerHTML = data.ok ? '✅ ' + data.msg : '❌ ' + data.msg;
+            try {
+                const res = await fetch('/api/upload/file', {method: 'POST', body: formData});
+                const d = await res.json();
+                el.innerHTML = d.ok ? '✅ ' + d.msg : '❌ ' + d.msg;
+            } catch(e) {
+                el.innerHTML = '❌ Request error: ' + e;
+            }
             refreshStatus();
         }
-        
+
         function escapeHtml(text) {
             const div = document.createElement('div');
             div.textContent = text;
             return div.innerHTML;
         }
-        
+
+        // Init
+        checkCookie();
         refreshStatus();
         setInterval(refreshStatus, 5000);
     </script>
@@ -330,4 +482,4 @@ HTML_TEMPLATE = '''
 '''
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=7860, debug=False)
+    app.run(host='0.0.0.0', port=7860, debug=False)