Upload 2 files

config.js

@@ -21,7 +21,8 @@ window.JM_CONFIG = Object.freeze({
   TRANSLATED_FN: 'movie-zilizotafsriwa',
 
   // Michezo (fawa-live) — mradi mpya (function imewekwa bila JWT, key haihitajiki lakini inatumwa tu)
-  FAWA_URL: 'https://kqqdsumvvbuvyoneanku.supabase.co',
+  FAWA_URL: 'https://fawa-live.jaynes-max.workers.dev',
+  FAWA_FALLBACK_URL: 'https://kqqdsumvvbuvyoneanku.supabase.co', // akiba: Supabase fawa-live (hutumika Cloudflare ikishindwa)
   FAWA_KEY: 'sb_publishable_0XQ9PQ0CRJnC0A_Tz18oGg_fSONkxB3',
 
   // Web Push (VAPID) — funguo YA UMMA tu. Private key iwe Supabase secrets pekee.

index.html

@@ -1226,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">
@@ -1486,6 +1479,8 @@ const SEARCH_FN_URL = JM_CONFIG.CONTENT_URL + '/functions/v1/search';
 // fawa-live (mechi/michezo moja kwa moja) — function tofauti, key ile ile
 const FAWA_BASE = (JM_CONFIG.FAWA_URL || JM_CONFIG.CONTENT_URL) + '/functions/v1/fawa-live';
 const FAWA_KEY = JM_CONFIG.FAWA_KEY || SUPABASE_ANON_KEY;
+// Seva ya akiba (Supabase) — inatumika TU pale Worker (Cloudflare) inaposhindwa kwa chaneli fulani
+const FAWA_BASE_FB = JM_CONFIG.FAWA_FALLBACK_URL ? JM_CONFIG.FAWA_FALLBACK_URL + '/functions/v1/fawa-live' : null;
 
 // jaynes-max-tv (LIVE TV — channel za kawaida, DASH/HLS + ClearKey) — function yetu wenyewe
 const JAYNES_MAX_TV_BASE = JM_CONFIG.CONTENT_URL + '/functions/v1/jaynes-max-tv';
@@ -1503,24 +1498,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();
@@ -1543,11 +1548,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',
@@ -2945,13 +2952,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() {
@@ -3835,78 +3835,25 @@ async function fetchTranslatedListRaw() {
     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() {
@@ -3914,8 +3861,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));
@@ -4147,6 +4093,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;
@@ -6396,10 +6343,15 @@ async function playHlsUrl(url, opts = {}) {
 
 async function openFawaMatch(item) {
   openPlayerShell(item.title);
-  const url = FAWA_BASE + '/proxy?slug=' + encodeURIComponent(item.id);
-  const opts = { authHeader: 'Bearer ' + FAWA_KEY, sameOriginBase: FAWA_BASE };
+  // Jaribu Worker (Cloudflare) kwanza; ikishindwa (mf. 502) jaribu Supabase
+  let url, opts, r = null;
+  for (const b of [FAWA_BASE, FAWA_BASE_FB].filter(Boolean)) {
+    url = b + '/proxy?slug=' + encodeURIComponent(item.id);
+    opts = { authHeader: 'Bearer ' + FAWA_KEY, sameOriginBase: b };
+    try { r = await fetch(url, { headers: { Authorization: opts.authHeader } }); if (r.ok) break; } catch (_) { r = null; }
+  }
   try {
-    const r = await fetch(url, { headers: { Authorization: opts.authHeader } });
+    if (!r) throw new Error(T('err_generic'));
     const ct = (r.headers.get('content-type') || '').toLowerCase();
     if (!r.ok) throw new Error(T('err_generic') + ' ' + r.status);