On: unstick LIVE with no FFmpeg — nudge despite idle hub; drop planned events without id
Browse files- app.py +7 -2
- youtube_manager.py +25 -2
app.py
CHANGED
|
@@ -735,7 +735,9 @@ def _check_account(user):
|
|
| 735 |
log(user,'[MONITOR] @%s session/room changed; source will be refreshed'%user)
|
| 736 |
_set_state(user,'LIVE','LIVE',**extra)
|
| 737 |
_maybe_start_direct(user, obs)
|
| 738 |
-
|
|
|
|
|
|
|
| 739 |
try:
|
| 740 |
youtube.nudge_live(user, obs)
|
| 741 |
except Exception:
|
|
@@ -829,11 +831,13 @@ def health_public():
|
|
| 829 |
'youtube_status':str(ye.get('youtube_status') or '')})
|
| 830 |
res=resource_snapshot()
|
| 831 |
mgr=bool(youtube.manager_thread and youtube.manager_thread.is_alive())
|
| 832 |
-
y_events=0; y_hist=0; y_senders=0; y_status=''; y_skip=''
|
| 833 |
try:
|
| 834 |
jd=youtube.journal.read()
|
| 835 |
y_events=len(jd.get('events') or {})
|
| 836 |
y_hist=len(jd.get('history') or [])
|
|
|
|
|
|
|
| 837 |
y_status=str(getattr(youtube,'status_text','') or '')[:160]
|
| 838 |
y_senders=sum(1 for e in (youtube.senders or {}).values() if e.get('thread') and e['thread'].is_alive())
|
| 839 |
skip=getattr(youtube,'_skip_last',None) or {}
|
|
@@ -861,6 +865,7 @@ def health_public():
|
|
| 861 |
'youtube_manager':'running' if mgr else 'stopped',
|
| 862 |
'youtube_status':y_status,'youtube_events':y_events,'youtube_history':y_hist,
|
| 863 |
'youtube_senders':y_senders,'youtube_skip':y_skip,
|
|
|
|
| 864 |
'broadcasters':per}
|
| 865 |
_health_cache['t']=time.monotonic(); _health_cache['v']=payload
|
| 866 |
return payload
|
|
|
|
| 735 |
log(user,'[MONITOR] @%s session/room changed; source will be refreshed'%user)
|
| 736 |
_set_state(user,'LIVE','LIVE',**extra)
|
| 737 |
_maybe_start_direct(user, obs)
|
| 738 |
+
# Do not require hub.busy()==False: an idle supervisor without FFmpeg used to
|
| 739 |
+
# block nudge forever while /health showed LIVE and rel=0 (On 4 LIVE, 0 senders).
|
| 740 |
+
if _oauth_automation_on() and (obs.get('sources') or []):
|
| 741 |
try:
|
| 742 |
youtube.nudge_live(user, obs)
|
| 743 |
except Exception:
|
|
|
|
| 831 |
'youtube_status':str(ye.get('youtube_status') or '')})
|
| 832 |
res=resource_snapshot()
|
| 833 |
mgr=bool(youtube.manager_thread and youtube.manager_thread.is_alive())
|
| 834 |
+
y_events=0; y_hist=0; y_senders=0; y_status=''; y_skip=''; y_evu=''
|
| 835 |
try:
|
| 836 |
jd=youtube.journal.read()
|
| 837 |
y_events=len(jd.get('events') or {})
|
| 838 |
y_hist=len(jd.get('history') or [])
|
| 839 |
+
y_evu=','.join('%s:%s:%s'%(e.get('username') or '?', e.get('phase') or '', e.get('youtube_status') or '')
|
| 840 |
+
for e in (jd.get('events') or {}).values())[:240]
|
| 841 |
y_status=str(getattr(youtube,'status_text','') or '')[:160]
|
| 842 |
y_senders=sum(1 for e in (youtube.senders or {}).values() if e.get('thread') and e['thread'].is_alive())
|
| 843 |
skip=getattr(youtube,'_skip_last',None) or {}
|
|
|
|
| 865 |
'youtube_manager':'running' if mgr else 'stopped',
|
| 866 |
'youtube_status':y_status,'youtube_events':y_events,'youtube_history':y_hist,
|
| 867 |
'youtube_senders':y_senders,'youtube_skip':y_skip,
|
| 868 |
+
'youtube_event_users':y_evu,
|
| 869 |
'broadcasters':per}
|
| 870 |
_health_cache['t']=time.monotonic(); _health_cache['v']=payload
|
| 871 |
return payload
|
youtube_manager.py
CHANGED
|
@@ -572,7 +572,9 @@ class ManagedYouTube:
|
|
| 572 |
# يسمح بلوغ الحدث مرة أخرى كل دورة رفض متكررة (الرفض حصل لأن المفتاح في history).
|
| 573 |
if self._403_blocked(key,user):
|
| 574 |
return False
|
| 575 |
-
if key in d['events'] or any(h
|
|
|
|
|
|
|
| 576 |
dt=datetime.now(ZoneInfo('Asia/Baghdad'));settings=d['settings']
|
| 577 |
nickname=str(observation.get('nickname') or '').strip()
|
| 578 |
live_title=str(observation.get('live_title') or '').strip()
|
|
@@ -789,7 +791,16 @@ class ManagedYouTube:
|
|
| 789 |
self.log(ev['username'],'[RELAY] @%s waiting: at MAX_CONCURRENT_RELAYS=%s'%(ev['username'], max_concurrent_relays() or 'open'))
|
| 790 |
return
|
| 791 |
if hub.busy(ev['username']):
|
| 792 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 793 |
if (not public) and time.monotonic()-float(self._spawn_at.get(ev['username']) or 0)<8:
|
| 794 |
return
|
| 795 |
# لا نلمس entry هنا: بعد موت خيط الإرسال تُبقي tick() القيد الميت في self.senders،
|
|
@@ -1383,6 +1394,7 @@ class ManagedYouTube:
|
|
| 1383 |
if any(e.get('username')==user for e in d['events'].values()):
|
| 1384 |
return False
|
| 1385 |
if self.max_events>0 and len(d['events'])>=self.max_events:
|
|
|
|
| 1386 |
return False
|
| 1387 |
key=user+':'+str(obs['room_id'])
|
| 1388 |
entry=next((h for h in d['history'] if h.get('session_key')==key),None)
|
|
@@ -1474,6 +1486,17 @@ class ManagedYouTube:
|
|
| 1474 |
if not d['enabled']:
|
| 1475 |
self.set_status('تعطيل الأتمتة وإنهاء الأحداث الجارية' if d['events'] else 'الأتمتة معطلة')
|
| 1476 |
return
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1477 |
# 2) Discover new live sessions, one event per account, up to the concurrency cap.
|
| 1478 |
cap=self.max_events;active=len(d['events']);capped=False
|
| 1479 |
for user in accounts:
|
|
|
|
| 572 |
# يسمح بلوغ الحدث مرة أخرى كل دورة رفض متكررة (الرفض حصل لأن المفتاح في history).
|
| 573 |
if self._403_blocked(key,user):
|
| 574 |
return False
|
| 575 |
+
if key in d['events'] or any(h.get('session_key')==key for h in d['history']):
|
| 576 |
+
self._skip_note(user,'نفس الجلسة في السجل/الأحداث؛ ننتظر استئناف أو تحرير القفل')
|
| 577 |
+
return False
|
| 578 |
dt=datetime.now(ZoneInfo('Asia/Baghdad'));settings=d['settings']
|
| 579 |
nickname=str(observation.get('nickname') or '').strip()
|
| 580 |
live_title=str(observation.get('live_title') or '').strip()
|
|
|
|
| 791 |
self.log(ev['username'],'[RELAY] @%s waiting: at MAX_CONCURRENT_RELAYS=%s'%(ev['username'], max_concurrent_relays() or 'open'))
|
| 792 |
return
|
| 793 |
if hub.busy(ev['username']):
|
| 794 |
+
slot=hub.snapshot(ev['username']) or {}
|
| 795 |
+
snd=slot.get('sender')
|
| 796 |
+
try:
|
| 797 |
+
ff=bool(snd and snd.alive())
|
| 798 |
+
except Exception:
|
| 799 |
+
ff=False
|
| 800 |
+
if ff:
|
| 801 |
+
return
|
| 802 |
+
hub.release(ev['username'])
|
| 803 |
+
self.log(ev['username'],'[RELAY] أُخلي مقعد مشرف بلا FFmpeg حتى يبدأ copy')
|
| 804 |
if (not public) and time.monotonic()-float(self._spawn_at.get(ev['username']) or 0)<8:
|
| 805 |
return
|
| 806 |
# لا نلمس entry هنا: بعد موت خيط الإرسال تُبقي tick() القيد الميت في self.senders،
|
|
|
|
| 1394 |
if any(e.get('username')==user for e in d['events'].values()):
|
| 1395 |
return False
|
| 1396 |
if self.max_events>0 and len(d['events'])>=self.max_events:
|
| 1397 |
+
self._skip_note(user,'سقف أحداث يوتيوب ممتلئ (%d)'%self.max_events)
|
| 1398 |
return False
|
| 1399 |
key=user+':'+str(obs['room_id'])
|
| 1400 |
entry=next((h for h in d['history'] if h.get('session_key')==key),None)
|
|
|
|
| 1486 |
if not d['enabled']:
|
| 1487 |
self.set_status('تعطيل الأتمتة وإنهاء الأحداث الجارية' if d['events'] else 'الأتمتة معطلة')
|
| 1488 |
return
|
| 1489 |
+
# Drop shells that never got a YouTube id — they occupy the cap with no FFmpeg
|
| 1490 |
+
# (measured On: events=1 senders=0 while 4 TikTok LIVE).
|
| 1491 |
+
now_ts=time.time()
|
| 1492 |
+
for key,ev in list(d['events'].items()):
|
| 1493 |
+
if ev.get('broadcast_id') or ev.get('closing'):
|
| 1494 |
+
continue
|
| 1495 |
+
if now_ts-float(ev.get('created_at') or 0)>=90:
|
| 1496 |
+
self.log(ev.get('username') or key,'[RELAY] حدث بلا broadcast_id >90ث؛ نُنهيه لفتح مقعد copy')
|
| 1497 |
+
try:self.finish_event(key)
|
| 1498 |
+
except Exception as e:self.archive_event(key,'stale_planned')
|
| 1499 |
+
d=self.journal.read()
|
| 1500 |
# 2) Discover new live sessions, one event per account, up to the concurrency cap.
|
| 1501 |
cap=self.max_events;active=len(d['events']);capped=False
|
| 1502 |
for user in accounts:
|