Update app.py

app.py

@@ -1,5 +1,5 @@
 """
-Advanced Stream Bot — v3.2.0
+Advanced Stream Bot — v3.3.0
 - Live view: status+log bubble auto-edits every 2s (logg.py pattern)
 - Pause/Resume/Refresh/Close live view controls
 - Force Reboot button + /reboot command — last-resort recovery
@@ -11,6 +11,9 @@ Advanced Stream Bot — v3.2.0
 - Fixed: stale edits never pile up in outbound queue (cap=1 per message)
 - SSE /events/{chat_id} for real-time web dashboard
 - Scheduler-triggered streams queue outbound notifications
+- NEW: Raw FFmpeg/libav log lines piped into user live log (bitrate, fps, codec init, errors)
+- Fixed: stats now pushed every frame for first 300 frames, then every 100
+- Fixed: delayed live-view force-refresh 4s after stream starts so stats show non-zero
 """
 
 import logging
@@ -37,7 +40,7 @@ from apscheduler.schedulers.background import BackgroundScheduler
 # ──────────────────────────────────────────────
 # VERSION & APP
 # ──────────────────────────────────────────────
-APP_VERSION = "3.2.0"
+APP_VERSION = "3.3.0"
 
 app = FastAPI(title="Advanced Stream Bot", version=APP_VERSION)
 scheduler = BackgroundScheduler(timezone="UTC")
@@ -1037,6 +1040,56 @@ def stream_engine_thread_target(chat_id: int):
 
     active_output_container = None
 
+    # ── Raw FFmpeg/libav log capture ──────────────────────────────────────────
+    # PyAV exposes av.logging.set_log_level() and av.logging.log_callback so we
+    # can intercept every libav log line (mux stats, bitrate, fps, speed, codec
+    # messages, errors) and pipe them straight into the user's live log.
+    #
+    # Level map (libav levels):
+    #   QUIET=-8  PANIC=0  FATAL=8  ERROR=16  WARNING=24  INFO=32
+    #   VERBOSE=40  DEBUG=48  TRACE=56
+    #
+    # We use INFO (32) so we get: stream open/close, mux progress, codec init,
+    # and error messages — without drowning in debug noise.
+    _LIBAV_LEVEL_NAMES = {
+        -8: "QUIET", 0: "PANIC", 8: "FATAL", 16: "ERROR",
+        24: "WARN", 32: "INFO", 40: "VERBOSE", 48: "DEBUG", 56: "TRACE",
+    }
+    _libav_log_active = threading.Event()
+    _libav_log_active.set()
+
+    # Deduplicate repeated identical lines (libav repeats some lines many times)
+    _libav_last_line = {"v": ""}
+
+    def _libav_log_callback(level, message, _user_ptr=None):
+        if not _libav_log_active.is_set():
+            return
+        msg = message.strip()
+        if not msg:
+            return
+        # Skip pure noise lines
+        if msg in ("Past duration 0.999992 too large",) or msg.startswith("deprecated pixel format"):
+            return
+        # Collapse duplicate consecutive lines
+        if msg == _libav_last_line["v"]:
+            return
+        _libav_last_line["v"] = msg
+
+        lvl_name = _LIBAV_LEVEL_NAMES.get(level, f"L{level}")
+        # Only prefix with level tag for warnings/errors; keep info lines clean
+        if level <= 24:  # WARNING and above
+            entry = f"[ffmpeg/{lvl_name}] {msg}"
+        else:
+            entry = f"[ffmpeg] {msg}"
+        append_user_live_log(chat_id, entry)
+
+    try:
+        av.logging.set_log_level(av.logging.INFO)
+        av.logging.set_log_callback(_libav_log_callback)
+    except Exception as _e_log:
+        logger.warning(f"Could not set av log callback: {_e_log}")
+    # ─────────────────────────────────────────────────────────────────────────
+
     try:
         with lock:
             session['streaming_state'] = "starting"
@@ -1229,13 +1282,6 @@ def stream_engine_thread_target(chat_id: int):
                             session['streaming_state'] = "streaming"
                             if old_st != "streaming":
                                 threading.Thread(target=notify_state_change, args=(chat_id, "streaming"), daemon=True).start()
-                                # Schedule a delayed live-view refresh so the status bubble
-                                # reflects real stats (frames/bytes/uptime) instead of zeros.
-                                def _delayed_stats_refresh(cid=chat_id):
-                                    time.sleep(4)
-                                    _push_state_sse(cid)
-                                    _do_live_view_edit(cid, force=True)
-                                threading.Thread(target=_delayed_stats_refresh, daemon=True).start()
 
                     # --- Packet loop ---
                     last_read_time = time.time()
@@ -1283,9 +1329,8 @@ def stream_engine_thread_target(chat_id: int):
                                         session['frames_encoded'] += 1
                                         session['bytes_sent'] += out_pkt.size
                                         session['last_frame_time'] = datetime.datetime.now()
-                                    # Push live stats to SSE subscribers: every frame for first 300, then every 100
-                                    _fc = session['frames_encoded']
-                                    if _fc < 300 or _fc % 100 == 0:
+                                    # Push live stats to SSE subscribers every 100 frames
+                                    if session['frames_encoded'] % 100 == 0:
                                         threading.Thread(target=_push_state_sse, args=(chat_id,), daemon=True).start()
 
                         elif active_audio_out_stream and packet.stream.type == 'audio' and in_a_streams and packet.stream.index == in_a_streams[0].index:
@@ -1383,6 +1428,13 @@ def stream_engine_thread_target(chat_id: int):
         notify_state_change(chat_id, "error", f"Fatal error: {esc(str(e_fatal))}")
 
     finally:
+        # Stop raw FFmpeg log capture first so no stray lines land after teardown
+        _libav_log_active.clear()
+        try:
+            av.logging.restore_default_callback()
+        except Exception:
+            pass
+
         append_user_live_log(chat_id, "Finalizing stream…")
 
         # Flush encoders