Upload index.html

index.html

@@ -117,6 +117,17 @@
   .jtv-bar{position:absolute; left:10px; right:10px; top:10px; padding:8px 10px; border-radius:12px; background:rgba(0,0,0,.6); color:#fff; font-size:13px; z-index:5; transition:opacity .3s;}
   .jtv-bar.hide{opacity:0; pointer-events:none;}
   .jtv-row{display:flex; gap:8px; align-items:center; flex-wrap:wrap;}
+  .jtv-bug{position:absolute; z-index:4; pointer-events:none; width:auto; max-width:30%; object-fit:contain; filter:drop-shadow(0 1px 4px rgba(0,0,0,.6));}
+  .jtv-top-right{top:12px; right:12px;} .jtv-top-left{top:12px; left:12px;} .jtv-bottom-right{bottom:64px; right:12px;} .jtv-bottom-left{bottom:64px; left:12px;}
+  .jtv-ident{position:absolute; inset:0; z-index:6; display:flex; flex-direction:column; align-items:center; justify-content:center; gap:10px; background:radial-gradient(circle at 50% 40%,#1b1640,#07070f); color:#fff; pointer-events:none; transition:opacity .6s;}
+  .jtv-ident img{height:34%; max-height:180px; width:auto; animation:jtvPop .9s ease-out;} .jtv-ident.out{opacity:0;}
+  .jtv-idn{font-weight:900; font-size:22px; letter-spacing:2px;} .jtv-idt{opacity:.75; font-size:13px;}
+  @keyframes jtvPop{from{transform:scale(.7); opacity:0;} to{transform:scale(1); opacity:1;}}
+  .jtv-lt{position:absolute; left:10px; bottom:64px; z-index:5; display:flex; gap:8px; align-items:center; background:rgba(0,0,0,.65); color:#fff; padding:6px 10px; border-radius:10px; font-size:13px; pointer-events:none; animation:jtvPop .5s ease-out;}
+  .jtv-ltk{border-radius:5px; padding:1px 6px; font-size:11px; font-weight:800; letter-spacing:.5px;}
+  .jtv-ticker{position:absolute; left:0; right:0; bottom:44px; z-index:4; overflow:hidden; background:rgba(0,0,0,.55); color:#fff; font-size:13px; padding:4px 0; pointer-events:none;}
+  .jtv-tk{display:inline-block; white-space:nowrap; padding-left:100%; animation:jtvTk linear infinite;}
+  @keyframes jtvTk{from{transform:translateX(0);} to{transform:translateX(-100%);}}
   .jtv-live{background:#e5484d; border-radius:6px; padding:2px 7px; font-weight:800; font-size:11px; letter-spacing:.5px;}
   .jtv-m{opacity:.8; font-size:12px; margin-top:2px;}
   .jtv-b{margin-left:auto; background:rgba(255,255,255,.18); color:#fff; border:0; border-radius:8px; padding:5px 10px; font:inherit; font-size:12px;}
@@ -1215,13 +1226,6 @@
   /* Nafasi ya kusogeza (scroll) ili kipengele chenye focus kisifichwe na topbar / nav */
   .poster,.cw-card,.tab-chip,.settings-row,.dq-item,.tr-ep,.cast-item{scroll-margin:110px 3vw 110px 3vw;}
 </style>
-<style>
-  .tr-filter{margin:0 0 10px;}
-  .tr-filter .tabs{padding:10px 16px 4px;}
-  .tr-filter .tr-dj-row{padding-top:4px;}
-  .tr-filter .tr-dj-row .tab-chip{font-size:12px; padding:6px 12px;}
-  .tr-filter-note{padding:4px 16px 6px; font-size:12px; color:var(--muted);}
-</style>
 </head>
 <body>
 <div id="gate">
@@ -1492,24 +1496,34 @@ const PIXTVMAX_KEY = SUPABASE_ANON_KEY;
 const TRAILER_BASE = JM_CONFIG.CONTENT_URL + '/functions/v1/movie-trailer';
 const TRAILER_KEY = SUPABASE_ANON_KEY;
 
-// Zilizotafsiriwa: chanzo kimoja (movie-translated-all) — n2-, ab-, abm- ids
-const TR_DJ_NOISE = /\b(movies?|filamu|zote|zilizotafsiriwa|zilizotafsiri|imetafsiriwa|iliyotafsiriwa|tafsiriwa|kiswahili|swahili|kwa|mpya|kali|translated|new|all|series|full|single|singo|action|cartoon|katuni|season|seasons|(?:19|20)\d{2})\b/gi;
+// movie-zilizotafsiriwa — mradi TOFAUTI (DJ movies/series), function ya umma pekee (GET)
+const TRANSLATED_BASE = JM_CONFIG.TRANSLATED_URL + '/functions/v1/' + JM_CONFIG.TRANSLATED_FN;
+const TRANSLATED_KEY = JM_CONFIG.TRANSLATED_KEY;
+// movie-zilizotafsriwa2 — filamu zenye MP4 (draft/public kutoka admin); project ile ile ya CONTENT_URL.
+// Id zake zinaanza na 'n2-' ili zisigongane na za chanzo cha zamani.
+const TRANSLATED2_BASE = JM_CONFIG.CONTENT_URL + '/functions/v1/movie-zilizotafsriwa2';
+const TR2_PREFIX = 'n2-';
+const TR_DJ_NOISE = /\b(movies?|filamu|zote|zilizotafsiriwa|zilizotafsiri|imetafsiriwa|iliyotafsiriwa|tafsiriwa|kiswahili|swahili|kwa|mpya|kali|translated|new|all|series|full)\b/gi;
 function normDj(raw) { // jina safi la DJ (bila maneno ya ziada na bila tofauti za herufi kubwa/ndogo)
   const s = String(raw || '').replace(/\(.*?\)|\[.*?\]/g, ' ').replace(TR_DJ_NOISE, ' ').replace(/[|_\-\u2013\u2014:,.]+/g, ' ').replace(/\s+/g, ' ').trim();
   if (!s || /^dj$/i.test(s)) return '';
-  const name = s.split(' ').map(w => /^dj$/i.test(w) ? 'DJ' : w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join(' ');
-  return TR_DJ_ALIAS[name.toLowerCase()] || name;
+  return s.split(' ').map(w => /^dj$/i.test(w) ? 'DJ' : w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join(' ');
 }
-// Majina tofauti ya DJ mmoja (andika kwa herufi ndogo upande wa kushoto)
-const TR_DJ_ALIAS = { 'dj blaki': 'DJ Black', 'blaki': 'DJ Black', 'black': 'DJ Black' };
 // Model iliyofunzwa (train.py -> HF Model). Ikikosekana, app inafanya kazi kama kawaida (Trending = mpya zaidi).
-const TRANSLATED_ALL = JM_CONFIG.CONTENT_URL + '/functions/v1/movie-translated-all';
 const TR_MODEL_URL = 'https://huggingface.co/jaynesmaxtv/translated-recommender/resolve/main/model.json';
 let trModelP = null;
 function loadTrModel() {
   if (!trModelP) trModelP = fetch(TR_MODEL_URL, { cache: 'no-cache' }).then(r => r.ok ? r.json() : null).catch(() => null);
   return trModelP;
 }
+function logTrPlay(id) { // rekodi uchezaji bila kuzuia player; kitambulisho cha kifaa ni cha nasibu (hakuna jina/email)
+  if (!id) return;
+  let dev = '';
+  try { dev = localStorage.getItem('jm_dev') || ''; if (!dev) { dev = (crypto.randomUUID && crypto.randomUUID()) || (Date.now() + '-' + Math.random().toString(36).slice(2)); localStorage.setItem('jm_dev', dev); } } catch (_) {}
+  fetch(TRANSLATED2_BASE + '?action=play', { method: 'POST', keepalive: true,
+    headers: { apikey: SUPABASE_ANON_KEY, 'Content-Type': 'application/json' },
+    body: JSON.stringify({ movie_id: String(id), device_id: dev }) }).catch(() => {});
+}
 // Rails za mlalo: Trending Now (Top 10, kwa model au mpya zaidi) -> New Releases -> kila DJ (DJ Mack kwanza) -> Series -> More to Watch
 function buildTranslatedSections(items, model) {
   const pop = (model && model.popularity) || {}, sections = [], covered = new Set();
@@ -1532,11 +1546,13 @@ function buildTranslatedSections(items, model) {
   if (more.length) sections.push({ title: t('tr_more'), items: more.slice(0, 40) });
   return sections;
 }
-async function fetchTranslatedMovie(id) { // -> { ok, error?, movie } kutoka movie-translated-all
-  const r = await fetch(TRANSLATED_ALL + '?id=' + encodeURIComponent(id), { headers: { apikey: SUPABASE_ANON_KEY } });
-  const d = await r.json().catch(() => ({}));
-  if (!r.ok || !d.ok) return { ok: false, error: d.error || ('HTTP ' + r.status) };
-  return d;
+async function fetchTranslatedMovie(id) { // -> { ok, error?, movie } kutoka chanzo sahihi
+  const isNew = String(id).startsWith(TR2_PREFIX);
+  const url = isNew ? TRANSLATED2_BASE + '?id=' + encodeURIComponent(String(id).slice(TR2_PREFIX.length))
+                    : TRANSLATED_BASE + '?id=' + encodeURIComponent(id);
+  const r = await fetch(url, { headers: { apikey: isNew ? SUPABASE_ANON_KEY : TRANSLATED_KEY } });
+  const d = await r.json();
+  return isNew ? { ok: r.ok && !d.error, error: d.error, movie: d } : d;
 }
 const PIXTVMAX_CATEGORY_SW = {
   'Sports': 'cat_sports', 'Movie Channels': 'cat_movies', 'News': 'cat_news',
@@ -1552,7 +1568,56 @@ function liveCategoryOf(name) {
   return 'cat_other';
 }
 
+// ── CACHE ya majibu ya Supabase functions (inapunguza invocations): kumbukumbu + localStorage, ombi moja kwa wote wanaoomba kwa pamoja,
+//    na nakala ya zamani ikiwa seva imeshindwa. Majibu yenye hitilafu hayahifadhiwi. ──
+const JM_MEM = new Map(), JM_INFLIGHT = new Map();
+const jmClone = v => { try { return structuredClone(v); } catch (_) { return JSON.parse(JSON.stringify(v)); } };
+async function jmCached(key, ttl, fn, opt = {}) {
+  const persist = opt.persist !== false, ok = opt.ok || (v => v != null);
+  let hit = JM_MEM.get(key);
+  if (!hit && persist) { try { const j = JSON.parse(localStorage.getItem('jmc:' + key)); if (j && j.t) { hit = j; JM_MEM.set(key, j); } } catch (_) {} }
+  if (hit && Date.now() - hit.t < ttl) return jmClone(hit.v);
+  if (JM_INFLIGHT.has(key)) return jmClone(await JM_INFLIGHT.get(key));
+  const p = (async () => {
+    try {
+      const v = await fn();
+      if (ok(v)) {
+        const rec = { t: Date.now(), v: jmClone(v) }; JM_MEM.set(key, rec);
+        if (persist) { try { const sj = JSON.stringify(rec); if (sj.length < 300000) localStorage.setItem('jmc:' + key, sj); } catch (_) {} }
+      }
+      return v;
+    } catch (e) { if (hit) return hit.v; throw e; }       // seva imeshindwa: tumia nakala ya zamani kuliko kuonyesha kosa
+    finally { JM_INFLIGHT.delete(key); }
+  })();
+  JM_INFLIGHT.set(key, p);
+  return jmClone(await p);
+}
+try { for (let i = localStorage.length - 1; i >= 0; i--) { const k = localStorage.key(i); if (k && k.startsWith('jmc:')) { const j = JSON.parse(localStorage.getItem(k) || 'null'); if (!j || Date.now() - j.t > 2 * 86400000) localStorage.removeItem(k); } } } catch (_) {}
+const jmOkObj = r => r && typeof r === 'object' && !r.error && r.success !== false;
+const RPC_CACHE = { // op -> [ttl ms, hifadhi localStorage?]; movies.play haihifadhiwi kamwe (viungo vya kucheza)
+  'movies.home': [600000, true], 'movies.tabs': [1800000, true], 'movies.tab': [600000, true],
+  'movies.related': [1800000, false], 'movies.series': [600000, false], 'movies.seasons': [600000, false], 'movies.episodes': [600000, false],
+  'movies.staffInfo': [3600000, false], 'movies.staffSubjectList': [3600000, false],
+};
+// Orodha zinazotumika na search, Home na tabs: ombi moja la mtandao kwa dakika chache badala ya kila mara
+function fetchAllLiveItems() { return jmCached('live', 300000, fetchAllLiveItemsRaw, { persist: false }); }
+function fetchAllSportsItems() { return jmCached('sports', 120000, fetchAllSportsItemsRaw, { persist: false }); }
+function fetchTranslatedList() { return jmCached('translated', 300000, fetchTranslatedListRaw, { persist: false }); }
+function searchMovieBox(keyword) { return jmCached('search:' + String(keyword).trim().toLowerCase(), 600000, () => searchMovieBoxRaw(keyword), { persist: false }); }
+function getHomeConfig() { return jmCached('homecfg', 600000, getHomeConfigRaw, { persist: false, ok: v => v && v !== HOME_CFG_DEFAULT }); }
+async function fetchTrailerJson(subjectId) {
+  return jmCached('trailer:' + subjectId, 86400000, async () => {
+    const res = await fetch(TRAILER_BASE + '?subjectId=' + encodeURIComponent(subjectId), { headers: { apikey: TRAILER_KEY, Authorization: 'Bearer ' + TRAILER_KEY } });
+    if (!res.ok) throw new Error('http_' + res.status);
+    return res.json();
+  }, { persist: false, ok: r => r && r.code === 0 });
+}
+
 async function rpc(op, args = {}) {
+  const c = RPC_CACHE[op];
+  return c ? jmCached('rpc:' + op + ':' + JSON.stringify(args), c[0], () => rpcRaw(op, args), { persist: c[1], ok: jmOkObj }) : rpcRaw(op, args);
+}
+async function rpcRaw(op, args = {}) {
   const res = await fetch(SUPABASE_FN_URL, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json', 'apikey': SUPABASE_ANON_KEY },
@@ -2885,13 +2950,6 @@ const I18N_EXTRA10 = {
   fr: { jtv_next: 'Ensuite', jtv_schedule: 'Programme', jtv_down: 'JaynesTV est indisponible', tr_trending: 'Tendances actuelles', tr_new: 'Nouveautés', tr_more: 'À découvrir' }
 };
 Object.keys(I18N_EXTRA10).forEach(l => { I18N[l] = Object.assign(I18N[l] || {}, I18N_EXTRA10[l]); });
-const I18N_EXTRA_TRF = {
-  sw: { trf_all: 'Zote', trf_new: 'Mpya', trf_trend_movie: 'Movie Zinazovuma', trf_trend_series: 'Series Zinazovuma', trf_movie: 'Movie', trf_series: 'Series', trf_dj: 'Kwa DJ', trf_no_trend: 'Bado hakuna takwimu za kutosha za zinazovuma, tunaonyesha mpya zaidi kwanza.' },
-  en: { trf_all: 'All', trf_new: 'New Releases', trf_trend_movie: 'Trending Movies', trf_trend_series: 'Trending Series', trf_movie: 'Movies', trf_series: 'Series', trf_dj: 'By DJ', trf_no_trend: 'Not enough viewing data yet, showing newest first.' },
-  ar: { trf_all: 'الكل', trf_new: 'الجديد', trf_trend_movie: 'أفلام رائجة', trf_trend_series: 'مسلسلات رائجة', trf_movie: 'أفلام', trf_series: 'مسلسلات', trf_dj: 'حسب DJ', trf_no_trend: 'لا توجد بيانات مشاهدة كافية بعد، نعرض الأحدث أولاً.' },
-  fr: { trf_all: 'Tout', trf_new: 'Nouveautés', trf_trend_movie: 'Films tendance', trf_trend_series: 'Séries tendance', trf_movie: 'Films', trf_series: 'Séries', trf_dj: 'Par DJ', trf_no_trend: "Pas encore assez de données, les plus récents d'abord." }
-};
-Object.keys(I18N_EXTRA_TRF).forEach(l => { I18N[l] = Object.assign(I18N[l] || {}, I18N_EXTRA_TRF[l]); });
 function T(k, v) { return t(k, v); }
 // Maandishi yaliyoandikwa kwenye HTML kupitia data-i18n / data-i18n-ph / data-i18n-title
 function applyI18nAttrs() {
@@ -3075,7 +3133,7 @@ function safeImgHTML(urls, alt, lazy){
  * matokeo tayari yamechujwa, tunayabadilisha tu kuwa muundo wa
  * poster card (sawa na toCard()).
  */
-async function searchMovieBox(keyword) {
+async function searchMovieBoxRaw(keyword) {
   const url = SEARCH_FN_URL + '?keyword=' + encodeURIComponent(keyword);
   const res = await fetch(url, { headers: { 'apikey': SUPABASE_ANON_KEY } });
   const arr = await res.json();
@@ -3592,7 +3650,7 @@ async function fetchChannelPosters() {
 
 // Inarudisha orodha bapa (flat) ya channels zote za Live TV — inatumika
 // na loadLive() (kuonyesha kwa rails) na search (kuchuja kwa query).
-// ── JAYNESTV: live TV ya kubuni kutoka video za dataset yako (ratiba: build_jaynestv.py) ──
+// ── JAYNESTV: TV yako (jina, nembo, rangi na vipengele vinatoka kwenye jaynestv/config.json; ratiba: build_jaynestv.py) ──
 const JTV_URL = 'https://huggingface.co/datasets/jaynesmaxtv/movie-file/resolve/main/jaynestv/schedule.json';
 let jtvP = null, jtvAt = 0;
 function jtvSchedule(force) { // ratiba inahifadhiwa dakika 5; ikikosekana JaynesTV haionekani
@@ -3610,23 +3668,76 @@ function jtvNow(s, nowMs) { // kipindi cha sasa + vinavyofuata, kwa saa: kila mt
   for (let k = 1; k <= 8; k++) { const it = s.items[(i + k) % s.items.length]; upcoming.push({ item: it, at }); at += it.dur * 1000; }
   return { idx: i, item: s.items[i], offset: pos, left: s.items[i].dur - pos, upcoming };
 }
+const JTV_DEFAULTS = { name: 'JaynesTV', tagline: '', logo: '', accent: '#7c5cff', card: 'logo',
+  features: { bug: true, ident: true, lowerthird: true, ticker: false, epg: true },
+  bug: { position: 'top-right', opacity: 0.85, size: 54 }, ticker: { messages: [], speed: 60 } };
+function jtvCfg(s) { // chaguo-msingi + config yako (funguo zisizojulikana zinapita ili vipengele vipya vizitumie)
+  const c = (s && s.config) || {}, m = (a, b) => Object.assign({}, a, b || {});
+  const cfg = Object.assign({}, JTV_DEFAULTS, c, { features: m(JTV_DEFAULTS.features, c.features), bug: m(JTV_DEFAULTS.bug, c.bug), ticker: m(JTV_DEFAULTS.ticker, c.ticker) });
+  if (!/^#[0-9a-f]{3,8}$/i.test(String(cfg.accent))) cfg.accent = JTV_DEFAULTS.accent;
+  if (!/^https:\/\//.test(String(cfg.logo || ''))) cfg.logo = '';
+  return cfg;
+}
+// ── MFUMO WA VIPENGELE (plugins): kuongeza kipengele kipya andika jtvFeature('jina', { open(c){}, program(c,n,it){}, close(c){} })
+//    kisha kiwashe kwenye config.json: "features": { "jina": true }. 'c' ina: stage, v (video), bar, s (ratiba), cfg, own[] (vipengele vya DOM
+//    vitakavyoondolewa kiotomatiki), timers[] (vitafutwa kiotomatiki). Kipengele chenye hitilafu hakiangushi TV.
+const JTV_FEATURES = {};
+function jtvFeature(name, def) { JTV_FEATURES[name] = def; }
+const jtvEl = (cls, html) => { const d = document.createElement('div'); d.className = cls; if (html) d.innerHTML = html; return d; };
+jtvFeature('bug', { // nembo ndogo kwenye kona ya video
+  open(c) {
+    if (!c.cfg.logo) return;
+    const b = document.createElement('img'); b.className = 'jtv-bug jtv-' + c.cfg.bug.position; b.src = c.cfg.logo; b.alt = '';
+    b.style.opacity = String(c.cfg.bug.opacity); b.style.height = (+c.cfg.bug.size || 54) + 'px';
+    c.stage.appendChild(b); c.own.push(b);
+  },
+});
+jtvFeature('ident', { // skrini ya utambulisho (nembo + jina + kauli mbiu) mwanzoni
+  open(c) {
+    const d = jtvEl('jtv-ident', (c.cfg.logo ? '<img src="' + esc(c.cfg.logo) + '" alt="">' : '') + '<div class="jtv-idn">' + esc(c.cfg.name) + '</div>' +
+      (c.cfg.tagline ? '<div class="jtv-idt">' + esc(c.cfg.tagline) + '</div>' : ''));
+    c.stage.appendChild(d); c.own.push(d);
+    const t0 = Date.now(), done = () => { d.classList.add('out'); c.timers.push(setTimeout(() => d.remove(), 600)); };
+    c.v.addEventListener('playing', () => c.timers.push(setTimeout(done, Math.max(0, 1500 - (Date.now() - t0)))), { once: true });
+    c.timers.push(setTimeout(done, 4000));
+  },
+});
+jtvFeature('lowerthird', { // "NOW: jina la filamu" kipindi kinapoanza
+  program(c, n, it) {
+    const d = jtvEl('jtv-lt', '<span class="jtv-ltk" style="background:' + esc(c.cfg.accent) + '">NOW</span><b>' + esc(it.title) + '</b>' + (it.dj ? ' <span class="jtv-m">' + esc(it.dj) + '</span>' : ''));
+    c.stage.appendChild(d); c.own.push(d); c.timers.push(setTimeout(() => d.remove(), 7000));
+  },
+});
+jtvFeature('ticker', { // maandishi yanayopita chini (config.ticker.messages)
+  open(c) {
+    const msgs = (c.cfg.ticker.messages || []).map(String).filter(Boolean); if (!msgs.length) return;
+    const text = msgs.join('   •   '), dur = Math.max(12, text.length / (Math.max(10, +c.cfg.ticker.speed || 60) / 10));
+    const d = jtvEl('jtv-ticker', '<div class="jtv-tk" style="animation-duration:' + dur.toFixed(0) + 's">' + esc(text) + '</div>');
+    c.stage.appendChild(d); c.own.push(d);
+  },
+});
 async function openJaynesTV() {
   openPlayerShell('JaynesTV');
   const s = await jtvSchedule(true);
   if (!s) return statusMsg('<span style="color:#ffb4ab">' + esc(T('jtv_down')) + '</span>');
+  const cfg = jtvCfg(s);
+  try { ptitle.textContent = cfg.name; } catch (_) {}
   stage.style.position = 'relative';
   stage.innerHTML = '<video id="vid" controls autoplay playsinline></video><div class="jtv-bar" id="jtvBar"></div>';
   const v = document.getElementById('vid'), bar = document.getElementById('jtvBar');
   attachPlayerEnhancements(v); ensureSound(v);
+  const ctx = { stage, v, bar, s, cfg, own: [], timers: [] };
+  const on = name => cfg.features[name] === true || (cfg.features[name] !== false && name in JTV_DEFAULTS.features && JTV_DEFAULTS.features[name]);
+  const hook = (h, ...a) => Object.keys(JTV_FEATURES).forEach(k => { if (on(k) && JTV_FEATURES[k][h]) { try { JTV_FEATURES[k][h](ctx, ...a); } catch (e) { console.warn('jtv feature', k, e); } } });
   const bad = new Set(); let cur = null, epg = false, hideT = null, last = null;
   const hhmm = ms => new Date(ms).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
   const show = (ms) => { bar.classList.remove('hide'); clearTimeout(hideT); if (ms) hideT = setTimeout(() => { if (!epg) bar.classList.add('hide'); }, ms); };
   const draw = (n, it) => {
-    const nx = n.upcoming[0];
-    bar.innerHTML = '<div class="jtv-row"><span class="jtv-live">● LIVE</span><b>' + esc(it.title) + '</b>' + (it.dj ? '<span class="jtv-m">' + esc(it.dj) + '</span>' : '') +
-      '<button class="jtv-b" data-j="epg">' + esc(T('jtv_schedule')) + '</button></div>' +
+    const nx = n.upcoming[0], canEpg = on('epg');
+    bar.innerHTML = '<div class="jtv-row"><span class="jtv-live" style="background:' + esc(cfg.accent) + '">● LIVE</span><b>' + esc(it.title) + '</b>' + (it.dj ? '<span class="jtv-m">' + esc(it.dj) + '</span>' : '') +
+      (canEpg ? '<button class="jtv-b" data-j="epg">' + esc(T('jtv_schedule')) + '</button>' : '') + '</div>' +
       '<div class="jtv-m">' + esc(T('jtv_next')) + ': ' + esc(nx.item.title) + ' · ' + hhmm(nx.at) + '</div>' +
-      (epg ? '<div class="jtv-epg">' + n.upcoming.map(u => '<div><span>' + hhmm(u.at) + '</span> ' + esc(u.item.title) + '</div>').join('') + '</div>' : '');
+      (epg && canEpg ? '<div class="jtv-epg">' + n.upcoming.map(u => '<div><span>' + hhmm(u.at) + '</span> ' + esc(u.item.title) + '</div>').join('') + '</div>' : '');
   };
   const sync = () => {
     const n = jtvNow(s, Date.now()), isBad = bad.has(n.idx);
@@ -3634,7 +3745,7 @@ async function openJaynesTV() {
     if (cur !== it.url) {
       cur = it.url; v.src = it.url + '#t=' + Math.floor(off);
       v.addEventListener('loadedmetadata', () => { if (Math.abs(v.currentTime - off) > 3) v.currentTime = off; const p = v.play(); if (p && p.catch) p.catch(() => {}); }, { once: true });
-      show(8000);
+      show(8000); hook('program', n, it);
     } else if (!isBad && v.readyState > 1 && Math.abs(v.currentTime - off) > 4) v.currentTime = off;   // rudi kwenye 'live'
     last = n; draw(n, it);
   };
@@ -3645,18 +3756,22 @@ async function openJaynesTV() {
   v.addEventListener('error', () => { if (last) { bad.add(last.idx); sync(); } });
   v.addEventListener('click', () => show(6000));
   const timer = setInterval(sync, 15000);
-  window.__jtvStop = () => { clearInterval(timer); clearTimeout(hideT); };
+  window.__jtvStop = () => { clearInterval(timer); clearTimeout(hideT); hook('close'); ctx.timers.forEach(clearTimeout); ctx.own.forEach(e => { try { e.remove(); } catch (_) {} }); };
+  hook('open');
   sync();
 }
 
-async function fetchAllLiveItems() {
+async function fetchAllLiveItemsRaw() {
   const items = [];
   let anyOk = false, lastErr = null;
   const posters = await fetchChannelPosters();
 
   try { // JaynesTV (ikiwa ratiba ipo): kadi inaonyesha kipindi kinachochezwa sasa
     const js = await jtvSchedule();
-    if (js) { const n = jtvNow(js, Date.now()); items.push({ id: 'jaynestv', kind: 'live', title: n.item.title, poster: n.item.poster || js.logo || null, subtitle: 'JaynesTV', imgFallbackOn: true }); }
+    if (js) { // kadi ina nembo yako (au picha ya kipindi, kulingana na config.card) na jina la kipindi cha sasa
+      const jc = jtvCfg(js), n = jtvNow(js, Date.now());
+      items.push({ id: 'jaynestv', kind: 'live', title: '● ' + n.item.title, poster: ((jc.card === 'program' ? (n.item.poster || jc.logo) : (jc.logo || n.item.poster)) || null), subtitle: jc.name, imgFallbackOn: true });
+    }
   } catch (_) {}
 
   try {
@@ -3713,83 +3828,30 @@ async function loadLive() {
 }
 
 // ── ZILIZOTAFSIRIWA (movies/series za DJ — mradi tofauti) ──
-async function fetchTranslatedList() {
+async function fetchTranslatedListRaw() {
   const card = (m, idPrefix) => ({
     id: idPrefix + m.id, kind: 'translated', title: m.title,
     poster: m.thumb_url || m.poster_url || null, imgFallbackOn: true,
     subtitle: normDj(m.dj) || (m.category === 'series' ? 'Series' : 'Movie'), isSeries: m.category === 'series',
-    added: m.created_at || m.updated_at || '',
-  });
-  const r = await fetch(TRANSLATED_ALL, { headers: { apikey: SUPABASE_ANON_KEY } });
-  if (!r.ok) throw new Error(T('err_generic') + ' ' + r.status);
-  const d = await r.json();
-  if (!d.ok) throw new Error(d.error || 'Imekataa ombi.');
-  return (d.movies || []).map(m => card(m, ''));
-}
-
-// ── KUPANGA ZILIZOTAFSIRIWA: Zote / Mpya / Movie Zinazovuma / Series Zinazovuma / Movie / Series / Kwa DJ ──
-let trCache = null; // { items, model } -- kubadilisha kichujio hakupakui upya
-let trFilter = 'all', trDj = '';
-try { trFilter = sessionStorage.getItem('jm_tr_filter') || 'all'; trDj = sessionStorage.getItem('jm_tr_dj') || ''; } catch (_) {}
-const TR_FILTERS = ['all', 'new', 'trend_movie', 'trend_series', 'movie', 'series', 'dj'];
-function trDjGroups(items) { // DJ Mack kwanza, kisha DJ mwenye kazi nyingi zaidi
-  const g = {};
-  items.forEach(it => {
-    const dj = String(it.subtitle || '').trim();
-    if (!dj || dj === 'Series' || dj === 'Movie') return;
-    (g[dj.toLowerCase()] = g[dj.toLowerCase()] || { name: dj, list: [] }).list.push(it);
   });
-  return Object.values(g).sort((a, b) => (/mack/i.test(b.name) - /mack/i.test(a.name)) || b.list.length - a.list.length || a.name.localeCompare(b.name));
-}
-function trByNewest(list) { // mpya -> zamani kwa tarehe ya kuongezwa; zisizo na tarehe zinabaki kwa mpangilio wa seva
-  return list.map((it, i) => [it, i])
-    .sort((a, b) => (Date.parse(b[0].added) || 0) - (Date.parse(a[0].added) || 0) || a[1] - b[1]).map(x => x[0]);
-}
-function trTrending(list, model) { // kwa uchezaji halisi (model); zikipungua, zinaongezwa mpya zaidi bila namba
-  const pop = (model && model.popularity) || {};
-  const hot = list.filter(it => pop[it.id] > 0).sort((a, b) => pop[b.id] - pop[a.id]);
-  const ranked = hot.slice(0, 30).map((it, i) => ({ ...it, rank: i < 10 ? i + 1 : undefined }));
-  if (ranked.length < 10) {
-    const have = new Set(ranked.map(it => it.id));
-    trByNewest(list).forEach(it => { if (ranked.length < 30 && !have.has(it.id)) ranked.push(it); });
-  }
-  return { items: ranked, fallback: hot.length === 0 };
-}
-function renderTranslatedView() {
-  if (!trCache) return;
-  const { items, model } = trCache;
-  const movies = items.filter(it => !it.isSeries), series = items.filter(it => it.isSeries);
-  const groups = trDjGroups(items);
-  if (!TR_FILTERS.includes(trFilter)) trFilter = 'all';
-  if (trFilter === 'dj' && !groups.some(g => g.name === trDj)) trDj = groups[0] ? groups[0].name : '';
-  let sections, grid = true, note = '';
-  if (trFilter === 'new') sections = [{ title: t('tr_new'), items: trByNewest(items) }];
-  else if (trFilter === 'trend_movie' || trFilter === 'trend_series') {
-    const r = trTrending(trFilter === 'trend_movie' ? movies : series, model);
-    if (r.fallback) note = t('trf_no_trend');
-    sections = [{ title: t('trf_' + trFilter), items: r.items }];
-  }
-  else if (trFilter === 'movie') sections = [{ title: t('trf_movie'), items: trByNewest(movies) }];
-  else if (trFilter === 'series') sections = [{ title: t('trf_series'), items: trByNewest(series) }];
-  else if (trFilter === 'dj') {
-    const g = groups.find(x => x.name === trDj);
-    sections = g ? [{ title: g.name, items: trByNewest(g.list).map(it => ({ ...it, subtitle: it.isSeries ? 'Series' : '' })) }] : [];
-  }
-  else { sections = buildTranslatedSections(items, model); grid = false; }
-  renderRails(sections, grid);
-  const bar = document.createElement('div');
-  bar.className = 'tr-filter';
-  bar.innerHTML = `<div class="tabs">${TR_FILTERS.map(f => `<div class="tab-chip${f === trFilter ? ' active' : ''}" data-trf="${f}">${esc(t('trf_' + f))}</div>`).join('')}</div>` +
-    (trFilter === 'dj' && groups.length ? `<div class="tabs tr-dj-row">${groups.map(g => `<div class="tab-chip${g.name === trDj ? ' active' : ''}" data-trdj="${esc(g.name)}">${esc(g.name)} · ${g.list.length}</div>`).join('')}</div>` : '') +
-    (note ? `<div class="tr-filter-note">${esc(note)}</div>` : '');
-  bar.onclick = (e) => {
-    const c = e.target.closest('.tab-chip'); if (!c) return;
-    if (c.dataset.trf) trFilter = c.dataset.trf; else if (c.dataset.trdj != null) trDj = c.dataset.trdj; else return;
-    try { sessionStorage.setItem('jm_tr_filter', trFilter); sessionStorage.setItem('jm_tr_dj', trDj); } catch (_) {}
-    renderTranslatedView();
-  };
-  railsEl.insertBefore(bar, railsEl.firstChild);
-  bar.querySelectorAll('.tab-chip.active').forEach(c => { const row = c.parentElement; row.scrollLeft = c.offsetLeft - (row.clientWidth - c.offsetWidth) / 2; });
+  const oldP = (async () => { // chanzo cha zamani
+    const r = await fetch(TRANSLATED_BASE + '?limit=100', { headers: { apikey: TRANSLATED_KEY } });
+    if (!r.ok) throw new Error(T('err_generic') + ' ' + r.status);
+    const d = await r.json();
+    if (!d.ok) throw new Error(d.error || 'Seva imekataa ombi.');
+    return (d.movies || []).map(m => card(m, ''));
+  })();
+  const newP = (async () => { // movie-zilizotafsriwa2: public tu (seva inachuja)
+    const r = await fetch(TRANSLATED2_BASE, { headers: { apikey: SUPABASE_ANON_KEY } });
+    if (!r.ok) throw new Error(T('err_generic') + ' ' + r.status);
+    const d = await r.json();
+    return (Array.isArray(d) ? d : []).map(m => card(m, TR2_PREFIX));
+  })();
+  const [a, b] = await Promise.allSettled([oldP, newP]);
+  if (a.status === 'rejected' && b.status === 'rejected') throw a.reason;
+  const fresh = b.status === 'fulfilled' ? b.value : [], older = a.status === 'fulfilled' ? a.value : [];
+  const seen = new Set(fresh.map(x => String(x.title || '').trim().toLowerCase()));
+  return fresh.concat(older.filter(x => !seen.has(String(x.title || '').trim().toLowerCase())));
 }
 
 async function loadTranslated() {
@@ -3797,8 +3859,7 @@ async function loadTranslated() {
   renderSkeletonRails(2);
   try {
     const [items, model] = await Promise.all([fetchTranslatedList(), loadTrModel()]);
-    trCache = { items, model };
-    renderTranslatedView();
+    renderRails(buildTranslatedSections(items, model), false);
   } catch (e) {
     railsEl.innerHTML = '';
     railsEl.appendChild(stateBox(t('err_failed', { e: esc(e.message || t('err_generic')) }), true, loadTranslated));
@@ -4030,6 +4091,7 @@ function playTranslatedUrl(url, title, playlist, meta) {
   v.addEventListener('ended', () => { const c = window.__pcPlaylist; if (c && typeof c.next === 'function') c.next(); });
   // Tangazo la video kwanza (likishindikana/likiruka, filamu inaanza mara moja)
   v.src = url;
+  try { logTrPlay(currentTranslatedDetail && currentTranslatedDetail.id); } catch (_) {}
   // Route ya player: #/translated/ID/play?se=..&ep=..
   try {
     const id = currentTranslatedDetail && currentTranslatedDetail.id;
@@ -4130,7 +4192,7 @@ async function shareTranslatedTitle(d) {
 // ── MICHEZO (fawa-live) ──
 // Inarudisha orodha bapa (flat) ya mechi zote — inatumika na loadSports()
 // (kuonyesha kwa rails, kikundi kwa ligi) na search (kuchuja kwa query).
-async function fetchAllSportsItems() {
+async function fetchAllSportsItemsRaw() {
   const res = await fetch(FAWA_BASE + '/matches', { headers: { Authorization: 'Bearer ' + FAWA_KEY } });
   if (!res.ok) throw new Error(T('err_generic') + ' ' + res.status);
   const d = await res.json();
@@ -6935,11 +6997,7 @@ async function loadTrailer(subjectId){
   if (!wrap) return;
   wrap.innerHTML = '<div class="trailer-state">' + T('trailer_loading') + '</div>';
   try {
-    const res = await fetch(TRAILER_BASE + '?subjectId=' + encodeURIComponent(subjectId), {
-      headers: { apikey: TRAILER_KEY, Authorization: 'Bearer ' + TRAILER_KEY },
-    });
-    if (!res.ok) throw new Error('http_' + res.status);
-    const result = await res.json();
+    const result = await fetchTrailerJson(subjectId);
     if (result.code !== 0) throw new Error(result.message || 'trailer_error');
     // Kagua kila hatua kabla ya kutumia — data.trailer, .url zote zinaweza kukosekana
     const trailer = result.data && result.data.trailer;
@@ -10008,8 +10066,9 @@ async function muxJob(videoUrl, subtitles, filename, onProgress){
   if (!startRes.ok || !startData.jobId) throw new Error(startData.error || t('dq_err_mux_start'));
   const jobId = startData.jobId;
 
-  for (let tries = 0; tries < 180; tries++) { // hadi ~15 dakika (5s * 180)
-    await new Promise(r => setTimeout(r, 5000));
+  const t0 = Date.now();
+  for (let tries = 0; Date.now() - t0 < 900000; tries++) { // hadi dakika 15; muda kati ya maombi unaongezeka (5s -> 15s) kupunguza invocations
+    await new Promise(r => setTimeout(r, Math.min(15000, 5000 + tries * 1000)));
     const st = await fetch(MUX_BASE + '?jobId=' + encodeURIComponent(jobId), {
       headers: { 'Authorization': 'Bearer ' + MUX_KEY, 'apikey': MUX_KEY },
     });
@@ -10606,7 +10665,7 @@ function nhSliderRender(box, sl){
   }
 }
 // Config ya Home inatoka Supabase (home-config); ikishindwa tunatumia nakala ya mwisho au chaguo-msingi
-async function getHomeConfig(){
+async function getHomeConfigRaw(){
   try {
     const ctl = new AbortController(); const to = setTimeout(() => ctl.abort(), 3000);
     const r = await fetch(HOME_CFG_URL, { method: 'POST', signal: ctl.signal, headers: { 'Content-Type': 'application/json', Authorization: 'Bearer ' + SUPABASE_ANON_KEY, apikey: SUPABASE_ANON_KEY }, body: JSON.stringify({ action: 'get' }) });