stremiok 2.1.0 → 2.2.0

package/js/player-core.js

@@ -299,15 +299,29 @@ var PlayerParts = {};
         } catch (er2) {}
         return out;
     }
+    // An IPTV channel's TV guide (js/epg.js): { now, next } or null.
+    function guideNow() { return (typeof EPG !== 'undefined' && S.ctx && /^iptv:/.test(S.ctx.id || '')) ? EPG.now(S.ctx.id) : null; }
+    function clock(sec) { var d = new Date(sec * 1000); return (d.getHours() < 10 ? '0' : '') + d.getHours() + ':' + (d.getMinutes() < 10 ? '0' : '') + d.getMinutes(); }
+    if (typeof EPG !== 'undefined' && EPG.onChange) { EPG.onChange(function () { if (S.active && S.isLive) { renderOSD(); } }); }
     function renderOSD() {
         U.byId('osd-title').textContent = S.ctx ? S.ctx.name : '';
+        var ck = U.byId('osd-clock');   // (the time of day, top right while the bar is on screen)
+        if (ck) { ck.textContent = clock(Date.now() / 1000); }
         renderTags();
         renderChapters();
         if (S.isLive) {
+            var cur = U.byId('osd-cur'), g = guideNow();
+            cur.className = 'live';
+            if (g && g.now) {   // an IPTV channel with a TV guide: what's on, how far along, and next
+                var t = Date.now() / 1000;
+                U.byId('osd-bar').style.display = '';
+                U.byId('osd-progress').style.width = Math.max(0, Math.min(100, Math.round((t - g.now.start) / (g.now.stop - g.now.start) * 100))) + '%';
+                cur.textContent = '● LIVE   ' + clock(g.now.start) + '–' + clock(g.now.stop) + '   ' + g.now.title;
+                U.byId('osd-dur').textContent = g.next ? 'Next  ' + clock(g.next.start) + '   ' + g.next.title : '';
+                return;
+            }
             U.byId('osd-bar').style.display = 'none';
-            var cur = U.byId('osd-cur');
             cur.textContent = '● LIVE';
-            cur.className = 'live';
             U.byId('osd-dur').textContent = '';
             return;
         }
@@ -331,6 +345,41 @@ var PlayerParts = {};
             yt: page, ytLang: lang, type: 'YouTube', id: 'yt_id:' + link.id, parent: 'yt_id:' + link.id, name: link.title || 'YouTube',
             poster: 'https://i.ytimg.com/vi/' + link.id + '/hqdefault.jpg', streams: [], private: !!(S.ctx && S.ctx.private) || undefined }, _onExit);   // (from a private one: private too)
     }
+    // ---------- a live Xtream channel's format ----------
+    // An Xtream server sends a channel as MPEG-TS (…/live/USER/PASS/123.ts) or as HLS (….m3u8).
+    // The menu's Format plays it the other way and keeps that for the channel (FORMAT_KEY, by its
+    // id, the last FORMAT_KEEP), so it starts that way next time; its playlist's own way isn't
+    // kept. ctx._ownUrl: the link as its playlist gives it.
+    var FORMAT_KEY = 'stremiok.liveformat', FORMAT_KEEP = 300;
+    var XT_LIVE = /^(https?:\/\/[^?#]+\/live\/[^\/?#]+\/[^\/?#]+\/[^\/?#.]+)\.(ts|m3u8)([?#].*)?$/i;
+    function liveFormat(url) { var m = XT_LIVE.exec(url || ''); return m ? (m[2].toLowerCase() === 'm3u8' ? 'hls' : 'ts') : ''; }
+    function withFormat(url, fmt) { var m = XT_LIVE.exec(url || ''); return m ? m[1] + '.' + (fmt === 'hls' ? 'm3u8' : 'ts') + (m[3] || '') : url; }
+    function formatStart(ctx) {
+        if (!S.isLive || !ctx.id || !liveFormat(ctx._ownUrl || ctx.url)) { return; }
+        if (!ctx._ownUrl) { ctx._ownUrl = ctx.url; }
+        var want = (U.store.get(FORMAT_KEY, {}) || {})[ctx.id];
+        ctx.url = (want === 'ts' || want === 'hls') ? withFormat(ctx._ownUrl, want) : ctx._ownUrl;
+    }
+    function setLiveFormat(fmt) {
+        var old = S.ctx;
+        if (!S.active || !old || !old._ownUrl || !liveFormat(old.url) || liveFormat(old.url) === fmt) { return; }
+        var all = U.store.get(FORMAT_KEY, {}) || {};
+        delete all[old.id];
+        if (fmt !== liveFormat(old._ownUrl)) {
+            all[old.id] = fmt;
+            var keys = Object.keys(all);
+            keys.slice(0, Math.max(0, keys.length - FORMAT_KEEP)).forEach(function (k) { delete all[k]; });   // (the oldest picked)
+        }
+        U.store.set(FORMAT_KEY, all);
+        var ctx = {};   // (the channel again, without what was learned from the other link: its relay, its look)
+        Object.keys(old).forEach(function (k) { if (!/^_(relay|relayFor|relayCc|ccOffer|liveChecked)$/.test(k)) { ctx[k] = old[k]; } });
+        ctx.switching = true;
+        play(ctx, _onExit);
+        U.spinner(true, 'Opening it as ' + (fmt === 'hls' ? 'HLS' : 'MPEG-TS') + '…');
+    }
+    P.liveFormat = function () { return S.active && S.ctx && S.isLive && S.ctx._ownUrl ? liveFormat(S.ctx.url) : ''; };
+    P.setLiveFormat = setLiveFormat;
+
     // Another source of what's playing (the player's source list): played in its place, at
     // the same point, as a playback of its own — its quality ladder, YouTube details,
     // captions, SponsorBlock sections, headers and file details are the new source's, and so
@@ -375,6 +424,7 @@ var PlayerParts = {};
         S.active = true; S.cur = 0; S.dur = 0; _bg = null; S.actual = null;
         // Stremio "tv" and "radio" types are strong live hints; refined after prepare.
         S.isLive = (ctx.type === 'tv' || ctx.type === 'radio') || /^iptv:/.test(ctx.id || '') || !!ctx.isLive;   // (an IPTV channel: live, a sports one too)
+        formatStart(ctx);
         S.ctx.resumeSec = (ctx.trailer || ctx.fromStart) ? 0 : (ctx.resumeSec || getResume(ctx.type, ctx.id));   // (Play from start: 0:00)
 
         // reset subtitle + audio + quality + on-screen controls state
@@ -1041,6 +1091,11 @@ var PlayerParts = {};
     // cut that way, the channel restarts through the service's relay, which repacks the sound.
     // The answer is kept per link (LIVE_KEY, LIVE_DAYS): a channel known to need it starts
     // through the relay (startLive), one known not to isn't asked about again.
+    // The same look says which closed-caption channels (CC1–CC4) are in its picture (cc, kept
+    // with it once sure). They're offered in the subtitle menu (ctx._ccOffer); turned on (picked
+    // there, remembered for the channel, or in your default subtitle language), the channel plays
+    // through the relay with them as subtitle tracks (ctx._relayCc), the sound as it is unless it
+    // needs repacking too.
     var LIVE_KEY = 'stremiok.livefix', LIVE_KEEP = 300, LIVE_DAYS = 14;
     function liveFixable(ctx) {
         return useAV && S.isLive && !!ctx && !ctx.yt && !ctx.trailer && /^https?:\/\//i.test(ctx.url || '') &&
@@ -1050,22 +1105,45 @@ var PlayerParts = {};
         var k = (U.store.get(LIVE_KEY, {}) || {})[url];
         return (k && Date.now() - k.at < LIVE_DAYS * 86400000) ? k : null;
     }
-    function liveKeep(url, fix) {
+    // The caption channels kept for a link: [{ ch: 'CC1', lang: 'en' }], or null (not known yet).
+    function ccOf(k) {
+        if (!k || !Array.isArray(k.cc)) { return null; }
+        return k.cc.filter(function (c) { return c && /^CC[1-4]$/.test(c.ch) && (!c.lang || /^[a-z]{2,3}$/.test(c.lang)); }).slice(0, 4);
+    }
+    function liveKeep(url, fix, cc) {
         var all = U.store.get(LIVE_KEY, {}) || {};
         all[url] = { fix: fix ? 1 : 0, at: Date.now() };
+        if (cc) { all[url].cc = cc; }
         var keys = Object.keys(all);
         if (keys.length > LIVE_KEEP) {
             keys.sort(function (a, b) { return all[a].at - all[b].at; }).slice(0, keys.length - LIVE_KEEP).forEach(function (k) { delete all[k]; });
         }
         U.store.set(LIVE_KEY, all);
     }
+    // Captions on from the start: your choice for this channel (a closed-caption track picked
+    // there last), else one in your default subtitle language (or second choice).
+    function ccWanted(ctx, cc) {
+        if (!cc || !cc.length) { return false; }
+        var mem = P.recallSub(ctx.id);
+        if (mem) { return !!mem.embedded; }
+        var cfg = P.getSubCfg(), langs = [cfg.lang, cfg.lang2].filter(function (l) { return l && l !== 'off' && l !== 'none'; });
+        return cc.some(function (c) { return c.lang && langs.some(function (l) { return P.langMatches(l, c.lang); }); });
+    }
+    function ccIndex(cc, w) { for (var i = 0; i < cc.length; i++) { if (cc[i].ch === w.ch) { return i; } } return 0; }
+    function relayed(ctx, r, cc) {
+        if (!r || typeof r.url !== 'string' || !/^http:\/\/localhost:\d+\/live\//.test(r.url)) { return false; }
+        ctx._relay = r.url; ctx._relayFor = ctx.url; ctx._relayCc = cc || null; ctx._ccOffer = cc ? null : ctx._ccOffer;
+        return true;
+    }
     function startLive(ctx, settle) {
-        var known = liveFixable(ctx) ? liveKnown(ctx.url) : null;
-        if (!known || !known.fix) { startAV(ctx.url, settle); return; }
-        ctx._liveChecked = true;
-        YTPlay.liveOpen(ctx.url, ctx._headers, true).then(function (r) {
+        var known = liveFixable(ctx) ? liveKnown(ctx.url) : null, cc = ccOf(known);
+        if (cc && cc.length) { ctx._ccOffer = cc; }
+        var withCc = ccWanted(ctx, cc) ? cc : null;
+        if (cc) { ctx._liveChecked = true; }   // (both answers in: not asked again)
+        if (!known || (!known.fix && !withCc)) { startAV(ctx.url, settle); return; }
+        YTPlay.liveOpen(ctx.url, ctx._headers, true, { fix: !!known.fix, cc: withCc }).then(function (r) {
             if (S.ctx !== ctx || !S.active) { return; }
-            if (r && typeof r.url === 'string' && /^http:\/\/localhost:\d+\/live\//.test(r.url)) { ctx._relay = r.url; ctx._relayFor = ctx.url; }
+            relayed(ctx, r, withCc);
             startAV(ctx.url, settle);
         }, function () { if (S.ctx === ctx && S.active) { startAV(ctx.url, settle); } });
     }
@@ -1073,17 +1151,37 @@ var PlayerParts = {};
         var ctx = S.ctx;
         if (!ctx || ctx._liveChecked || !liveFixable(ctx)) { return; }
         ctx._liveChecked = true;
-        if (liveKnown(ctx.url)) { return; }
+        var known = liveKnown(ctx.url);
+        if (known && ccOf(known)) { return; }
         var url = ctx.url;
         YTPlay.liveOpen(url, ctx._headers, false).then(function (r) {
             if (!r || !r.sure) { return; }   // (couldn't tell: asked again next time)
-            liveKeep(url, !!r.fix);
-            if (!r.fix || typeof r.url !== 'string' || !/^http:\/\/localhost:\d+\/live\//.test(r.url) || S.ctx !== ctx || !S.active || ctx.url !== url) { return; }
-            ctx._relay = r.url; ctx._relayFor = url;
+            var cc = (r.ccSure || r.cc === undefined) ? (ccOf(r) || []) : null, fix = known ? !!known.fix : !!r.fix;   // (captions with no text yet: asked again next time; the sound's answer: as first found)
+            liveKeep(url, fix, cc);
+            if (S.ctx !== ctx || !S.active || ctx.url !== url) { return; }
+            if (cc && cc.length && !ctx._relayCc) { ctx._ccOffer = cc; }
+            if (cc && cc.length && ccWanted(ctx, cc)) { ccOn(ctx, 'Adding this channel’s captions…'); return; }
+            if (known || !fix || ctx._relay || !relayed(ctx, r, null)) { return; }   // (the sound: restarted for on its first look only)
             U.log('player', 'Live sound repacked by StremioK\'s service (' + (r.why || '') + ')');
             reopen('Fixing this channel’s sound…');
         }, function () {});
     }
+    // The channel again through the relay with its closed captions as subtitle tracks (the sound
+    // repacked too when it needs it); then: true once it's reopening. want: a caption track to
+    // select once it plays ({ ch, lang }).
+    function ccOn(ctx, message, want) {
+        var known = liveKnown(ctx.url), cc = ccOf(known) || ctx._ccOffer;
+        if (!cc || !cc.length || !liveFixable(ctx)) { return Promise.resolve(false); }
+        return YTPlay.liveOpen(ctx.url, ctx._headers, true, { fix: !!(known && known.fix), cc: cc }).then(function (r) {
+            if (S.ctx !== ctx || !S.active || !relayed(ctx, r, cc)) { return false; }
+            var w = want || cc.filter(function (c) { return ccWanted(ctx, [c]); })[0] || null;
+            U.log('player', 'Live captions through StremioK\'s service (' + cc.map(function (c) { return c.ch; }).join(', ') + ')');
+            reopen(message);
+            if (w && P.wantEmbedded) { P.wantEmbedded({ nth: ccIndex(cc, w), lang: w.lang }); }   // (after the reopen: on its tracks)
+            return true;
+        }, function () { return false; });
+    }
+    P.ccOn = function (want) { return S.ctx ? ccOn(S.ctx, 'Adding this channel’s captions…', want) : Promise.resolve(false); };
     // The relay didn't start (StremioK's service gone): the channel as it is.
     function relayFailed() {
         if (S.playStarted || !S.ctx || !S.ctx._relay) { return false; }
@@ -1181,6 +1279,7 @@ var PlayerParts = {};
     function exit() {
         if (!S.active) { return; }
         if (U.crumb) { U.crumb('player closed'); }
+        if (P.sleepClear) { P.sleepClear(); }   // (the sleep timer: this playback's)
         saveProgress();
         // Record partial progress to Trakt (unfinished VOD) so it shows in Continue Watching. Past
         // 85% (Trakt connected): finished, Trakt's way (it marks it watched), and here as at the credits.
@@ -1227,4 +1326,5 @@ var PlayerParts = {};
     P.sponsorHighlight = sponsorHighlight;
     P.chapters = chapters; P.chapterAt = chapterAt; P.chapterLabel = chapterLabel;
     P.seekTo = seekTo; P.doAVSeek = doAVSeek; P.seekBy = seekBy; P.exit = exit;
+    P.reload = function () { if (S.active && S.ctx) { reopen(S.isLive ? 'Reloading the channel…' : 'Reloading…'); } };   // (the menu's Reload)
 })(PlayerParts);

package/js/player-store.js

@@ -255,6 +255,26 @@
         U.store.set(PLAYERCFG_KEY, d);
     }
     function aspectDef(id) { for (var i = 0; i < ASPECTS.length; i++) { if (ASPECTS[i][0] === id) { return ASPECTS[i]; } } return ASPECTS[0]; }
+    // A live channel's own picture mode (picked while it played): { channel id: mode }, the last
+    // ASPECTS_KEEP; one set back to the usual mode isn't kept apart. Anything else: the usual one.
+    var ASPECTS_KEY = 'stremiok.aspects', ASPECTS_KEEP = 300;
+    function aspectChannel() { var S = P.S; return (S && S.isLive && S.ctx && S.ctx.id) ? S.ctx.id : ''; }
+    function aspectNow() {
+        var ch = aspectChannel(), own = ch ? (U.store.get(ASPECTS_KEY, {}) || {})[ch] : '';
+        return own && aspectDef(own)[0] === own ? own : playerCfg().aspect;
+    }
+    function setAspectNow(mode) {
+        var ch = aspectChannel();
+        if (!ch) { setPlayerCfg({ aspect: mode }); return; }
+        var all = U.store.get(ASPECTS_KEY, {}) || {};
+        delete all[ch];
+        if (mode !== playerCfg().aspect) {
+            all[ch] = mode;
+            var keys = Object.keys(all);
+            keys.slice(0, Math.max(0, keys.length - ASPECTS_KEEP)).forEach(function (k) { delete all[k]; });   // (the oldest picked)
+        }
+        U.store.set(ASPECTS_KEY, all);
+    }
 
     // ----- for the other parts (and js/player.js) -----
     P.watchedState = watchedState; P.isWatched = isWatched; P.watchedAt = watchedAt; P.watchedSince = watchedSince;
@@ -265,7 +285,7 @@
     P.getResume = getResume; P.removeProgress = removeProgress; P.continueList = continueList;
     P.rememberSub = rememberSub; P.recallSub = recallSub; P.rememberAudio = rememberAudio;
     P.recallAudio = recallAudio; P.playerCfg = playerCfg; P.setPlayerCfg = setPlayerCfg;
-    P.aspectDef = aspectDef; P.SUB_FONTS = SUB_FONTS; P.SUB_COLORS = SUB_COLORS; P.SUB_BGS = SUB_BGS;
+    P.aspectDef = aspectDef; P.aspectNow = aspectNow; P.setAspectNow = setAspectNow; P.SUB_FONTS = SUB_FONTS; P.SUB_COLORS = SUB_COLORS; P.SUB_BGS = SUB_BGS;
     P.SUB_EDGES = SUB_EDGES; P.SUB_POSITIONS = SUB_POSITIONS; P.ASPECTS = ASPECTS;
     P.isPrivate = isPrivate; P.setPrivate = setPrivate; P.privateNow = privateNow; P.subCfgVersion = subCfgVersion;
 })(PlayerParts);

package/js/player-subs.js

@@ -113,7 +113,7 @@
                 if (mem.off) { return true; }
                 if (mem.embedded) {
                     if (partial) { return false; }
-                    wantEmbedded({ index: mem.index, lang: mem.lang }); _embDelay = Math.max(0, +mem.delay || 0); return true;
+                    wantEmbedded({ index: mem.index, lang: mem.lang, nth: mem.nth }); _embDelay = Math.max(0, +mem.delay || 0); return true;
                 }
                 var exact =
                     (mem.trackId != null ? _subTracks.find(function (t) { return t.id === mem.trackId; }) : null) ||
@@ -202,6 +202,21 @@
     var WEBVTT_ASIDE = /^(NOTE|STYLE|REGION)([ \t]|$)/;
     // Character codes (& > — …) as the characters they stand for.
     var CHAR_CODES = { amp: '&', lt: '<', gt: '>', quot: '"', apos: "'", nbsp: '\u00a0', lrm: '\u200e', rlm: '\u200f' };
+    // A subtitle's tags taken out, a stray < with them: one pass, in time with the text's length
+    // however it's made (a run of < with no > after it used to hold the remote for seconds).
+    // Its text is only ever shown as text (textContent): this is for how it reads.
+    function noTags(t) {
+        var out = '', i = 0, n = t.length;
+        while (i < n) {
+            var lt = t.indexOf('<', i);
+            if (lt === -1) { out += t.slice(i); break; }
+            out += t.slice(i, lt);
+            var gt = t.indexOf('>', lt + 1);
+            if (gt === -1) { out += t.slice(lt + 1).split('<').join(''); break; }   // (no tag ends after it: the rest, its < gone)
+            i = gt + 1;
+        }
+        return out;
+    }
     function charCodes(t) {
         if (t.indexOf('&') === -1) { return t; }
         return t.replace(/&(#[xX][0-9a-fA-F]{1,6}|#[0-9]{1,7}|[a-zA-Z]+);/g, function (all, c) {
@@ -213,13 +228,16 @@
             return CHAR_CODES.hasOwnProperty(c) ? CHAR_CODES[c] : all;
         });
     }
+    // A file's cues: CUES_MAX at most, CUE_TEXT_MAX characters of text each (a broken or hostile
+    // file can't hold the remote: the whole parse stays in time with the file's length).
+    var CUES_MAX = 20000, CUE_TEXT_MAX = 1000;
     function parseCues(text) {
         text = ('' + text).replace(/\r/g, '');
         var blocks = text.split(/\n\n+/);
         var cues = [], skip = skipper();   // (Skip lines with: your words)
         var re = /(?:(\d{1,3}):)?(\d{2}):(\d{2})[,.](\d{1,3})\s*-->\s*(?:(\d{1,3}):)?(\d{2}):(\d{2})[,.](\d{1,3})/;
         function ms(x) { return +((x + '00').slice(0, 3)) / 1000; }   // (".5" is half a second)
-        for (var i = 0; i < blocks.length; i++) {
+        for (var i = 0; i < blocks.length && cues.length < CUES_MAX; i++) {
             var lines = blocks[i].replace(/^\n+/, '').split('\n');
             if (WEBVTT_ASIDE.test(lines[0])) { continue; }   // (a WebVTT comment, style or region: not shown)
             var ti = -1;
@@ -229,7 +247,9 @@
             if (!m) { continue; }
             var start = (+(m[1] || 0)) * 3600 + (+m[2]) * 60 + (+m[3]) + ms(m[4]);
             var end = (+(m[5] || 0)) * 3600 + (+m[6]) * 60 + (+m[7]) + ms(m[8]);
-            var txt = skip(charCodes(lines.slice(ti + 1).join('\n').replace(/<[^>]+>/g, '').replace(/\{[^}]+\}/g, '')).replace(/\s+$/, ''));
+            // (tags out, a stray < with them, in one pass; then entities read: one written as &lt; is the file's own text,
+            // "<b>" shown as written. Never a tag: subtitles reach the screen as text only, textContent)
+            var txt = skip(charCodes(noTags(lines.slice(ti + 1).join('\n').slice(0, CUE_TEXT_MAX)).replace(/\{[^}]+\}/g, '')).replace(/\s+$/, ''));
             if (txt) { cues.push({ start: start, end: end, text: txt }); }
         }
         cues.sort(function (a, b) { return a.start - b.start; });
@@ -384,6 +404,7 @@
             pick = tracks.find(function (t) { return t.index === w.index && (!key || langKey(textLang(t)) === key); }) || null;
         }
         if (!pick && key) { pick = tracks.find(function (t) { return langMatches(key, textLang(t)); }) || null; }
+        if (!pick && w.nth != null && S.ctx && S.ctx._relayCc) { pick = tracks[w.nth] || null; }   // (a live channel's closed captions: in the order asked for)
         if (!pick && w.lang2) {   // nothing in the default language anywhere: the second choice, a track to download first
             var key2 = langKey(w.lang2);
             var dl = _subTracks.find(function (t) { return langMatches(key2, t.lang); });
@@ -398,7 +419,7 @@
         try { avplay.setSelectTrack('TEXT', tr.index); }
         catch (e2) { try { avplay.setSelectTrack('TEXT', '' + tr.index); } catch (e3) {} }
         _embSub = tr.index; _embLang = textLang(tr);
-        U.toast('Subtitles: ' + (_embLang || 'on') + ' (built-in)', 1800);
+        U.toast('Subtitles: ' + (_embLang || 'on') + (S.ctx && S.ctx._relayCc ? ' (closed captions)' : ' (built-in)'), 1800);
     }
     function embOff() {
         if (_embSub != null) { try { avplay.setSilentSubtitle(true); } catch (e) {} }
@@ -446,7 +467,7 @@
     function drawEmbedded(text, duration) {
         if (_embSub == null || _subOn) { return; }
         if (_embTimer) { clearTimeout(_embTimer); _embTimer = null; }
-        var t = ('' + (text || '')).replace(/<br\s*\/?>/gi, '\n').replace(/<[^>]+>/g, '').replace(/\{[^}]+\}/g, '').trim();
+        var t = noTags(('' + (text || '')).replace(/<br\s*\/?>/gi, '\n')).replace(/\{[^}]+\}/g, '').trim();
         if (!t) { S.subsEl.className = 'hidden'; return; }
         S.subsEl.className = '';
         var span = S.subsEl.firstChild;
@@ -515,7 +536,7 @@
         replaceTop(timingMenu(topMenu().idx));
         U.toast('Subtitles: ' + fmtDelay(_subDelay) + (_subDelay > 0 ? ' (later)' : _subDelay < 0 ? ' (earlier)' : ' (as in the file)'), 1800);
     }
-    function lineText(c) { return '“' + ('' + c.text).replace(/<[^>]+>/g, '').replace(/\s+/g, ' ').trim().slice(0, 70) + '”'; }
+    function lineText(c) { return '“' + noTags('' + c.text).replace(/\s+/g, ' ').trim().slice(0, 70) + '”'; }
     // The next line coming up (as timed now): OK the moment it's said.
     function earMenu() {
         var t = S.cur - _subDelay, next = null;
@@ -569,6 +590,8 @@
             groups[k].push(item);
         }
         getTextTracks().forEach(function (tr, i) { add(langKey(textLang(tr)), { emb: tr, n: i }); });
+        var offer = S.ctx && !S.ctx._relayCc ? S.ctx._ccOffer : null;   // (a live channel's closed captions, not on yet)
+        (offer || []).forEach(function (c, i) { add(langKey(c.lang || ''), { cc: c, n: i, emb: true }); });
         _subTracks.forEach(function (tr) { add(langKey(tr.lang), { track: tr }); });
         var curKey = _subOn ? langKey(_subLabel) : (_embSub != null ? langKey(_embLang) : null);
         var pref = getSubCfg().lang;
@@ -583,7 +606,7 @@
         order.forEach(function (k) {
             var list = groups[k], n = list.length, emb = list.filter(function (x) { return x.emb; }).length;
             items.push({ label: langName(k),
-                detail: n + ' option' + (n > 1 ? 's' : '') + (emb ? (emb === n ? ', in the file' : ', ' + emb + ' in the file') : ''),
+                detail: n + ' option' + (n > 1 ? 's' : '') + (emb ? (emb === n ? ', ' + inFile() : ', ' + emb + ' ' + inFile()) : ''),
                 sel: (k === curKey),
                 run: function () { pushMenu(langTracksMenu(k, list)); } });
         });
@@ -594,6 +617,7 @@
         return { title: 'Subtitle language', items: items, idx: idx, rebuild: langMenu };
     }
 
+    function inFile() { return S.ctx && (S.ctx._relayCc || S.ctx._ccOffer) ? 'closed captions' : 'in the file'; }
     // Level 2: the tracks in one language: the file's own first, then each addon's.
     // Picking a track keeps the menu open, the checkmark on it (an addon's once it loads), so
     // several can be tried in a row: the file's own the same as an addon's.
@@ -601,10 +625,15 @@
         var idx = 0, nAddon = 0;
         list = list.filter(function (x) { return x.emb; }).concat(list.filter(function (x) { return !x.emb; }));
         var items = list.map(function (x, i) {
+            if (x.cc) {   // (turning a live channel's closed captions on: it restarts with them)
+                var c = x.cc;
+                return { label: 'Closed captions (' + c.ch + ')', detail: 'The channel restarts with them',
+                    run: function () { closeMenu(); rememberSub(S.ctx.id, { embedded: true, nth: x.n, lang: c.lang }); P.ccOn(c); } };
+            }
             if (x.emb) {
                 var tr = x.emb, l = textLang(tr);
                 if (_embSub === tr.index) { idx = i; }
-                return { label: 'Built into the file' + (l ? '  (' + l + ')' : '  ·  track ' + (x.n + 1)), sel: _embSub === tr.index,
+                return { label: (S.ctx && S.ctx._relayCc ? 'Closed captions' : 'Built into the file') + (l ? '  (' + l + ')' : '  ·  track ' + (x.n + 1)), sel: _embSub === tr.index,
                     run: function () {
                         _embDelay = 0; _embQueue = []; _embNudge = null; selectEmbeddedSub(tr); rememberSub(S.ctx.id, { embedded: true, index: tr.index, lang: l });
                         if (menuOpen()) { replaceTop(langTracksMenu(key, list)); }
@@ -690,5 +719,6 @@
     P.fileHints = fileHints; P.parseCues = parseCues; P.loadTrack = loadTrack; P.subsOff = subsOff;
     P.resetSubs = resetSubs; P.closeSubs = closeSubs; P.startSubtitles = startSubtitles;
     P.subsBeforeOpen = subsBeforeOpen; P.subsOnTick = subsOnTick; P.subtitleSummary = subtitleSummary;
+    P.wantEmbedded = wantEmbedded;
     P.renderSubs = renderSubs; P.showEmbeddedText = showEmbeddedText; P.subConfigMenu = subConfigMenu; P.langMenu = langMenu;
 })(PlayerParts);

package/js/stremio.js

@@ -175,7 +175,8 @@ var Stremio = (function () {
             posterRatings: p.posterRatings === true,   // Settings > Appearance: IMDb rating on cards
             homePreview: p.homePreview !== false,      // Settings > Appearance: Continue Watching on the TV's home bar (js/hubpreview.js)
             homePreviewOrder: p.homePreviewOrder === 'watching' ? 'watching' : 'recent',   // ...its tiles: the latest first, or as in Watching
-            hiddenTabs: wordList(p.hiddenTabs, 20, 20),   // Settings > Appearance > Home tabs
+            hiddenTabs: wordList(p.hiddenTabs, 20, 20),   // Settings > Appearance > Menu: tabs hidden
+            menuOrder: wordList(p.menuOrder, 20, 20),     // ...and the menu's order (see ViewParts.menuOrder)
             hideWords: wordList(p.hideWords, 30, 40),     // Settings > Source ranking: sources with these words at the bottom
             watchRegion: /^[A-Z]{2}$/.test(p.watchRegion || '') ? p.watchRegion : '' };   // Settings > Integrations ('' = automatic)
     }
@@ -481,7 +482,18 @@ var Stremio = (function () {
         if (_hasIptv) { IPTV.removePlaylist(id); }
         configChanged();
     }
+    function iptvAddXtream(base, user, pass) {   // (as any playlist added: the addons' list made again)
+        var id = _hasIptv ? IPTV.addXtream(base, user, pass) : false;
+        configChanged();
+        return id;
+    }
+    function iptvSetXtreamFormat(id, fmt) {
+        var changed = _hasIptv ? IPTV.setXtreamFormat(id, fmt) : false;
+        configChanged();
+        return changed;
+    }
     function iptvRenamePlaylist(id, name) { return _hasIptv ? IPTV.renamePlaylist(id, name) : false; }
+    function iptvSetPlaylistGuide(id, url) { return _hasIptv && IPTV.setPlaylistGuide ? IPTV.setPlaylistGuide(id, url) : false; }
     function iptvSetPlaylistOff(id, off) { var ok = _hasIptv ? IPTV.setPlaylistOff(id, off) : false; configChanged(); return ok; }
     function iptvMovePlaylist(id, dir) { var ok = _hasIptv ? IPTV.movePlaylist(id, dir) : false; configChanged(); return ok; }
     function iptvLabel(id) { return _hasIptv ? IPTV.label(id) : ''; }
@@ -685,7 +697,8 @@ var Stremio = (function () {
     // ---- Feed lists: order + show / hide, as the user sets them ----
     // Home feeds (the Home rows: every catalog) and search sources (the Search rows:
     // every catalog that can search) each keep their own { order: [keys], hidden: [keys] }.
-    // Anything new (an addon added later) goes after the ordered ones, in addon order.
+    // Anything new (an addon added later) goes after the ordered ones, in addon order, but for a
+    // catalog that asks to come first (def._first: IPTV's Favorites) until you place it.
     var FEEDS_KEY = 'stremiok.feeds', SEARCH_FEEDS_KEY = 'stremiok.searchfeeds';
     function catalogKey(cat) {
         var aid = (cat.addon.manifest && cat.addon.manifest.id) || cat.addon.url;
@@ -698,8 +711,8 @@ var Stremio = (function () {
             var pos = {};
             cfg().order.forEach(function (k, i) { pos[k] = i; });
             return items.map(function (c, i) { return { c: c, i: i, k: keyOf(c) }; }).sort(function (a, b) {
-                var pa = (pos[a.k] !== undefined) ? pos[a.k] : (100000 + a.i);
-                var pb = (pos[b.k] !== undefined) ? pos[b.k] : (100000 + b.i);
+                var pa = (pos[a.k] !== undefined) ? pos[a.k] : (a.c && a.c.def && a.c.def._first) ? -1 : (100000 + a.i);
+                var pb = (pos[b.k] !== undefined) ? pos[b.k] : (b.c && b.c.def && b.c.def._first) ? -1 : (100000 + b.i);
                 return pa - pb;
             }).map(function (x) { return x.c; });
         }
@@ -1455,6 +1468,57 @@ var Stremio = (function () {
         return tmdbGet('/' + kind + '/' + tmdbId + '/external_ids', '', cancel).then(function (r) { return (r && r.imdb_id) || null; });
     }
 
+    // A film known only by a TV guide's program (the Guide's guide-only channels): { title (as
+    // shown, Spanish say), orig (its original title), year } -> Promise of { type, id (IMDb), name,
+    // poster } when exactly one film has that name (and that year, when known), else null.
+    // TMDB with your key (the original title, else the shown one in Spanish), else Cinemeta
+    // (original titles only).
+    function plainTitle(s) {   // ("El Señor de los Anillos:" -> "elsenordelosanillos")
+        var t = ('' + (s || '')).toLowerCase();
+        if (t.normalize) { try { t = t.normalize('NFD').replace(/[\u0300-\u036f]/g, ''); } catch (e) {} }
+        return t.replace(/[^a-z0-9]+/g, '');
+    }
+    function findFilm(p, cancel) {
+        var year = +p.year || 0;
+        function near(y) { return !year || (y && Math.abs(y - year) <= 1); }
+        function one(list, names) {
+            var want = names.map(plainTitle).filter(Boolean), hits = (list || []).filter(function (r) {
+                return near(r.year) && want.some(function (w) { return w === plainTitle(r.name) || w === plainTitle(r.orig); });
+            });
+            return hits.length === 1 ? hits[0] : null;
+        }
+        function tmdb(query, spanish) {
+            var extra = '&query=' + encodeURIComponent(query) + (year ? '&year=' + year : '') + (spanish ? '&language=es-AR' : '');
+            return tmdbGet('/search/movie', extra, cancel).then(function (r) {
+                return ((r && r.results) || []).map(function (x) {
+                    return { tmdbId: x.id, name: x.title || '', orig: x.original_title || '', year: +('' + (x.release_date || '')).slice(0, 4) || 0, poster: tmdbImg(x.poster_path, 'w342') };
+                });
+            }, function () { return []; });
+        }
+        function viaTmdb() {
+            if (!tmdbKey()) { return Promise.resolve(null); }
+            var first = p.orig ? tmdb(p.orig, false).then(function (l) { return one(l, [p.orig]); }) : Promise.resolve(null);
+            return first.then(function (hit) {
+                return hit || (p.title ? tmdb(p.title, true).then(function (l) { return one(l, [p.title]); }) : null);
+            }).then(function (hit) {
+                if (!hit) { return null; }
+                return tmdbImdbId('movie', hit.tmdbId, cancel).then(function (imdb) {
+                    return imdb ? { type: 'movie', id: imdb, name: hit.name || p.title, poster: hit.poster } : null;
+                }, function () { return null; });
+            });
+        }
+        function viaCinemeta() {
+            if (!p.orig) { return Promise.resolve(null); }
+            return U.getJSON('https://v3-cinemeta.strem.io/catalog/movie/top/search=' + encodeURIComponent(p.orig) + '.json', 10000, null, cancel).then(function (r) {
+                var hit = one(((r && r.metas) || []).map(function (m) {
+                    return { id: m.id, name: m.name || '', year: parseInt(m.releaseInfo || m.year || '', 10) || 0, poster: m.poster || '' };
+                }), [p.orig]);
+                return hit && /^tt\d+$/.test(hit.id) ? { type: 'movie', id: hit.id, name: p.title || hit.name, poster: hit.poster } : null;
+            }, function () { return null; });
+        }
+        return viaTmdb().then(function (hit) { return hit || viaCinemeta(); });
+    }
+
     // ---- MDBList ratings (Settings > Integrations > MDBList) ----
     // -> [{ key, label, text }] in a fixed order, only the ones the title has.
     var MDB_SOURCES = [['imdb', 'IMDb'], ['tomatoes', 'Rotten Tomatoes'], ['popcorn', 'Audience'],
@@ -2012,7 +2076,7 @@ var Stremio = (function () {
         getIntroSegments: getIntroSegments,
         tmdbValidate: tmdbValidate, mdblistValidate: mdblistValidate, omdbValidate: omdbValidate,
         tmdbFindTvId: tmdbFindTvId, tmdbSeasonEpisodes: tmdbSeasonEpisodes, tmdbImg: tmdbImg,
-        tmdbTitleExtras: tmdbTitleExtras, tmdbExtrasById: tmdbExtrasById, tmdbEpisodeCast: tmdbEpisodeCast, tmdbEpisodeTrailer: tmdbEpisodeTrailer, setHideWords: setHideWords, hideWordHit: hideWordHit, normalizeAddonUrl: normalizeManifestUrl, debridOf: debridOf, addonOrigin: addonOrigin, setAddonOrigin: setAddonOrigin, parseSetupList: parseSetupList, applySetupEntries: applySetupEntries, sizeLimitHit: sizeLimitHit, setSizeLimit: setSizeLimit, gbText: gbText, runtimeMinutes: runtimeMinutes, tmdbPeople: tmdbPeople, tmdbPerson: tmdbPerson, tmdbBrowse: tmdbBrowse, tmdbTitleTrailers: tmdbTitleTrailers, tmdbProviders: tmdbProviders, tmdbProvidersKept: tmdbProvidersKept, tmdbGenres: tmdbGenres, tmdbWhereToWatch: tmdbWhereToWatch, watchRegion: watchRegion, autoWatchRegion: autoWatchRegion, tmdbImdbId: tmdbImdbId, hasTmdb: function () { return !!tmdbKey(); },
+        tmdbTitleExtras: tmdbTitleExtras, tmdbExtrasById: tmdbExtrasById, tmdbEpisodeCast: tmdbEpisodeCast, tmdbEpisodeTrailer: tmdbEpisodeTrailer, setHideWords: setHideWords, hideWordHit: hideWordHit, normalizeAddonUrl: normalizeManifestUrl, debridOf: debridOf, addonOrigin: addonOrigin, setAddonOrigin: setAddonOrigin, parseSetupList: parseSetupList, applySetupEntries: applySetupEntries, sizeLimitHit: sizeLimitHit, setSizeLimit: setSizeLimit, gbText: gbText, runtimeMinutes: runtimeMinutes, tmdbPeople: tmdbPeople, tmdbPerson: tmdbPerson, tmdbBrowse: tmdbBrowse, tmdbTitleTrailers: tmdbTitleTrailers, tmdbProviders: tmdbProviders, tmdbProvidersKept: tmdbProvidersKept, tmdbGenres: tmdbGenres, tmdbWhereToWatch: tmdbWhereToWatch, watchRegion: watchRegion, autoWatchRegion: autoWatchRegion, tmdbImdbId: tmdbImdbId, findFilm: findFilm, hasTmdb: function () { return !!tmdbKey(); },
         mdblistRatings: mdblistRatings,
         omdbSeasonRatings: omdbSeasonRatings,
         loadAddons: loadAddons, listCatalogs: listCatalogs, getCatalog: getCatalog,
@@ -2042,7 +2106,7 @@ var Stremio = (function () {
         importSetupList: importSetupList, savedManifest: savedManifest, isAddonOff: isAddonOff, setAddonOff: setAddonOff, onIptvReady: onIptvReady, streamListenerCount: function (type, id) { var e = _streamCache[type + ':' + id]; return e ? e.listeners.length : 0; },
         iptvGetPlaylists: iptvGetPlaylists, iptvAddPlaylist: iptvAddPlaylist,
         iptvUpdatePlaylist: iptvUpdatePlaylist, iptvRemovePlaylist: iptvRemovePlaylist,
-        iptvRenamePlaylist: iptvRenamePlaylist, iptvSetPlaylistOff: iptvSetPlaylistOff, iptvMovePlaylist: iptvMovePlaylist, iptvLabel: iptvLabel,
+        iptvRenamePlaylist: iptvRenamePlaylist, iptvSetPlaylistGuide: iptvSetPlaylistGuide, iptvAddXtream: iptvAddXtream, iptvSetXtreamFormat: iptvSetXtreamFormat, iptvSetPlaylistOff: iptvSetPlaylistOff, iptvMovePlaylist: iptvMovePlaylist, iptvLabel: iptvLabel,
         iptvLoad: iptvLoad, iptvStatus: iptvStatus, iptvReload: iptvReload
     };
 })();

package/js/trakt.js

@@ -375,6 +375,7 @@ var Trakt = (function () {
         function next() {
             return authed('GET', path + (path.indexOf('?') === -1 ? '?' : '&') + 'page=' + page + '&limit=' + perPage, null).then(function (r) {
                 live(g);
+                if (!Array.isArray(r.data)) { var bad = new Error('Trakt sent a page that couldn\'t be read (' + path.split('?')[0] + ', page ' + page + ')'); bad.status = r.status || 0; throw bad; }   // (not the last page: the refresh fails, the copy kept)
                 var items = list(r.data, perPage), first = items.length ? JSON.stringify(items[0]) : '';
                 if (page > 1 && first && first === before) { return out.slice(0, max); }
                 before = first;

package/js/util.js

@@ -430,15 +430,20 @@ var U = (function () {
     /* GET via XHR with a timeout. Returns a Promise of the response text.
        maxBytes: give up as soon as more than that has arrived ("Too large (over …)");
        TEXT_MAX when not given. */
-    // A failed download, in Diagnostics. During a private playback, only its server: its link (a
-    // title's name can be in it) isn't kept, in the log or the copy saved for the next launch.
+    // A failed download, in Diagnostics. One asked during a private playback (when it started:
+    // it may fail after the playback ended) says only that, what kind of failure, and its
+    // server: not its link nor what the server answered (a title's name can be in either), in
+    // the log or the copy saved for the next launch.
     function privateNow() { try { return typeof Player !== 'undefined' && !!Player.privateNow && Player.privateNow(); } catch (e) { return false; } }
-    function logged(err) {
+    function logged(err, priv) {
         var msg = '' + err.message;
-        if (privateNow()) { msg = msg.replace(/(https?:\/\/[^\/\s?#]+)[^\s]*/g, '$1/…'); }
+        if (priv || privateNow()) {
+            var kind = /^(HTTP \d+|Timeout|Network error|Too large|Bad JSON|Redirected into the home network)/.exec(msg), host = /(https?:\/\/[^\/\s?#]+)/.exec(msg);
+            msg = 'Private viewing: a download' + (host ? ' from ' + host[1] : '') + ' failed' + (kind ? ' (' + kind[1] + ')' : '');
+        }
         log('network', msg); err.logged = true; return err;
     }
-    function noteNetwork(err) { return logged(err); }
+    function noteNetwork(err, priv) { return logged(err, priv); }
     // What a server said when it refused (an error answer's own message, e.g. AIOStreams'
     // { error: { message: "Invalid stream expression … Expected :" } }, or short plain text),
     // on one line, links in it masked, a long one kept to its start and end (where the what
@@ -464,8 +469,10 @@ var U = (function () {
     // quiet: a failure isn't noted in Diagnostics (a check that's expected to fail at times, like
     // the YouTube service's while it starts; the caller says so if it matters).
     // headers (optional): { name: value } sent with it.
-    function getText(url, timeoutMs, maxBytes, cancel, quiet, headers) {
-        function logged(err) { return quiet ? err : noteNetwork(err); }
+    // body (optional): sent as a POST (text), else it's a GET.
+    function getText(url, timeoutMs, maxBytes, cancel, quiet, headers, body) {
+        var priv = privateNow();   // (asked during a private playback: logged as one, however late it fails)
+        function logged(err) { return quiet ? err : noteNetwork(err, priv); }
         maxBytes = maxBytes || TEXT_MAX;
         return new Promise(function (resolveP, rejectP) {
             if (cancel && cancel.cancelled) { rejectP(cancelledError(url)); return; }   // (nothing started)
@@ -482,7 +489,7 @@ var U = (function () {
                 });
             }
             try {
-                xhr.open('GET', url, true);
+                xhr.open(body == null ? 'GET' : 'POST', url, true);
                 if (headers) { Object.keys(headers).forEach(function (h) { xhr.setRequestHeader(h, headers[h]); }); }
             } catch (e) { reject(e); return; }
             xhr.timeout = timeoutMs || 15000;
@@ -516,7 +523,7 @@ var U = (function () {
             };
             xhr.ontimeout = function () { if (!done) { done = true; reject(logged(new Error('Timeout: ' + redactUrl(url)))); } };
             xhr.onerror = function () { if (!done) { done = true; reject(logged(new Error('Network error: ' + redactUrl(url)))); } };
-            try { xhr.send(); } catch (e3) { reject(e3); }
+            try { if (body == null) { xhr.send(); } else { xhr.send('' + body); } } catch (e3) { reject(e3); }
         });
     }
 
@@ -557,10 +564,13 @@ var U = (function () {
 
     /* GET JSON via XHR with a timeout. Returns a Promise of the parsed body (JSON_MAX
        unless maxBytes says otherwise). cancel, headers: see getText. */
-    function getJSON(url, timeoutMs, maxBytes, cancel, headers) {
-        return getText(url, timeoutMs, maxBytes || JSON_MAX, cancel, false, headers).then(function (text) {
+    // A POST (body: text), its answer JSON.
+    function postJSON(url, body, timeoutMs, maxBytes, headers) { return getJSON(url, timeoutMs, maxBytes, null, headers, body); }
+    function getJSON(url, timeoutMs, maxBytes, cancel, headers, body) {
+        var priv = privateNow();   // (asked during a private playback: its answer unreadable later is logged as one too)
+        return getText(url, timeoutMs, maxBytes || JSON_MAX, cancel, false, headers, body).then(function (text) {
             try { return JSON.parse(text); }
-            catch (e) { throw logged(new Error('Bad JSON from ' + redactUrl(url))); }
+            catch (e) { throw logged(new Error('Bad JSON from ' + redactUrl(url)), priv); }
         });
     }
 
@@ -1491,7 +1501,8 @@ var U = (function () {
     }
 
     return {
-        byId: byId, el: el, clear: clear, moveIn: moveIn, getJSON: getJSON, getText: getText, redactUrl: redactUrl, problem: problem, problemDetail: problemDetail, listOf: listOf, lru: lru, cachedJSON: cachedJSON,
+        byId: byId, el: el, clear: clear, moveIn: moveIn, getJSON: getJSON, getText: getText,
+        postJSON: postJSON, redactUrl: redactUrl, problem: problem, problemDetail: problemDetail, listOf: listOf, lru: lru, cachedJSON: cachedJSON,
         parseUrl: parseUrl, urlProblem: urlProblem, isPlaylistUrl: isPlaylistUrl, isManifestUrl: isManifestUrl,
         isPrivateHost: isPrivateHost, urlIsPrivate: urlIsPrivate, setLocalPolicy: setLocalPolicy, sanitizeHeaders: sanitizeHeaders, drawable: drawable,
         log: log, logEntries: logEntries, clearLog: clearLog, bigStore: bigStore, diskInfo: diskInfo,