stremiok 2.0.0 → 2.1.0

package/js/player-store.js

@@ -107,7 +107,9 @@
         for (var i = 0; i < SUB_FONTS.length; i++) { if (SUB_FONTS[i][0] === id) { return SUB_FONTS[i][2]; } }
         return '';
     }
-    function setSubCfg(cfg) { U.store.set(SUBCFG_KEY, cfg); }
+    var _subCfgVer = 0;   // bumped on every change: a styled line knows it's up to date
+    function setSubCfg(cfg) { U.store.set(SUBCFG_KEY, cfg); _subCfgVer++; }
+    function subCfgVersion() { return _subCfgVer; }
 
     // Preferred audio language ('default' = keep the stream's first audio track) and a
     // second choice used when the first isn't on the stream ('none' = no second choice).
@@ -236,13 +238,15 @@
         ['zoom', 'Zoom (fill the screen, trims edges)', 'PLAYER_DISPLAY_MODE_CROPPED_FULL', 'cover'],
         ['stretch', 'Stretch', 'PLAYER_DISPLAY_MODE_FULL_SCREEN', 'fill']
     ];
-    // + seek: how far LEFT / RIGHT jump (s); buffer: 'normal' (the TV's own) | 'more' | 'most'
+    // + seek: how far LEFT / RIGHT jump (s); buffer: 'normal' (the TV's own) | 'more' | 'most';
+    // reconnect: a live channel that drops, 'off' | 'few' | 'always' (see player-core's liveDropped)
     // (Settings › Playback › Seeking & buffering)
     var SEEK_STEPS = [5, 10, 15, 30];
     function playerCfg() {
         var d = U.store.get(PLAYERCFG_KEY, {}) || {};
         return { aspect: d.aspect || 'fit', seek: SEEK_STEPS.indexOf(+d.seek) !== -1 ? +d.seek : 10,
             buffer: d.buffer === 'more' || d.buffer === 'most' ? d.buffer : 'normal',
+            reconnect: d.reconnect === 'off' || d.reconnect === 'always' ? d.reconnect : 'few',
             phone: d.phone === 'infuse' || d.phone === 'link' ? d.phone : 'vlc' };   // (Continue on phone: what the QR opens)
     }
     function setPlayerCfg(cfg) {   // (what's given changes; the rest stays)
@@ -263,5 +267,5 @@
     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.SUB_EDGES = SUB_EDGES; P.SUB_POSITIONS = SUB_POSITIONS; P.ASPECTS = ASPECTS;
-    P.isPrivate = isPrivate; P.setPrivate = setPrivate;
+    P.isPrivate = isPrivate; P.setPrivate = setPrivate; P.privateNow = privateNow; P.subCfgVersion = subCfgVersion;
 })(PlayerParts);

package/js/player-subs.js

@@ -330,8 +330,12 @@
         el.className = '';
         var span = el.firstChild;
         if (!span) { span = document.createElement('span'); el.appendChild(span); }
-        styleSpan(span);
-        el.style.bottom = '';   // (styleSpan places the bottom one: this one stays at the top)
+        var ver = P.subCfgVersion ? P.subCfgVersion() : -1;
+        if (span.__styled !== ver || ver === -1) {   // (styled when made, and when the subtitle settings change: not every tick)
+            styleSpan(span);
+            el.style.bottom = '';   // (styleSpan places the bottom one: this one stays at the top)
+            span.__styled = ver;
+        }
         if (span.textContent !== show) { span.textContent = show; }
     }
     // Green › Second subtitle: Off, or a language the addons have (the same setting as Settings').
@@ -559,7 +563,7 @@
     // group), named in full, with the file's own tracks in the same groups as the addons'.
     // Order: the language showing now, the preferred language, then by name.
     function langMenu() {
-        var groups = {}, order = [];
+        var groups = Object.create(null), order = [];   // (no inherited names: a language an addon calls "__proto__" is just a key)
         function add(k, item) {
             if (!groups[k]) { groups[k] = []; order.push(k); }
             groups[k].push(item);

package/js/player.js

@@ -11,7 +11,7 @@ var Player = (function (P) {
         getSubCfg: P.getSubCfg, setSubCfg: P.setSubCfg, getAudioCfg: P.getAudioCfg, setAudioCfg: P.setAudioCfg,
         isWatched: P.isWatched, watchedState: P.watchedState, watchedAt: P.watchedAt, watchedSince: P.watchedSince, progressFor: P.progressFor,
         addToContinue: P.addToContinue, setWatched: P.setWatched, setWatchedMany: P.setWatchedMany, clearUnwatched: P.clearUnwatched,
-        isPrivate: P.isPrivate, setPrivate: P.setPrivate, playerCfg: P.playerCfg, setPlayerCfg: P.setPlayerCfg, langName: P.langName, lang2: P.lang2, langKey: P.langKey,
+        isPrivate: P.isPrivate, setPrivate: P.setPrivate, privateNow: P.privateNow, playerCfg: P.playerCfg, setPlayerCfg: P.setPlayerCfg, langName: P.langName, lang2: P.lang2, langKey: P.langKey,
         SUB_FONTS: P.SUB_FONTS, SUB_COLORS: P.SUB_COLORS, SUB_BGS: P.SUB_BGS, SUB_EDGES: P.SUB_EDGES, SUB_POSITIONS: P.SUB_POSITIONS
     };
 })(PlayerParts);

package/js/stremio-account.js

@@ -42,6 +42,9 @@ var StremioAccount = (function () {
             try { xhr.open('POST', API + method, true); } catch (e) { reject(new Error('couldn’t reach Stremio')); return; }
             xhr.timeout = 20000;
             xhr.setRequestHeader('Content-Type', 'application/json');
+            xhr.onprogress = function (ev) {   // (an answer over MAX_BYTES: stopped as it arrives, as every other request is)
+                if (!done && ev && ev.loaded > MAX_BYTES) { done = true; try { xhr.abort(); } catch (e) {} reject(new Error('too large an answer')); }
+            };
             xhr.onreadystatechange = function () {
                 if (xhr.readyState !== 4 || done) { return; }
                 done = true;

package/js/stremio.js

@@ -77,18 +77,31 @@ var Stremio = (function () {
 
     // Your order (Settings › Addons ▲▼): the higher addon is asked first wherever one answer
     // is used (a title's details: the first that has them) and listed first where several are.
+    // dir: -1 / 1 one place, -Infinity / Infinity to the top / bottom (U.moveIn)
     function moveAddon(url, dir) {
-        var list = getAddonUrls(), i = list.indexOf(url), j = i + dir;
-        if (i < 0 || j < 0 || j >= list.length) { return false; }
-        list.splice(i, 1); list.splice(j, 0, url);
+        var list = getAddonUrls();
+        if (!U.moveIn(list, list.indexOf(url), dir)) { return false; }
         saveAddonUrls(list);
         configChanged();   // (rebuilt from the saved manifests: nothing fetched)
         return true;
     }
 
+    // Addons you turned off (Settings › Content › Addons, OK on one): kept in your list, in
+    // their place, but not loaded, so nothing is asked of them (rows, details, sources,
+    // subtitles, search) until they're turned on again. A backup can wait there.
+    var OFF_KEY = 'stremiok.addonsoff';
+    function offUrls() { var l = U.store.get(OFF_KEY, []); return Array.isArray(l) ? l.filter(function (u) { return typeof u === 'string'; }) : []; }
+    function isAddonOff(url) { return offUrls().indexOf(url) !== -1; }
+    function setAddonOff(url, off) {
+        var l = offUrls().filter(function (u) { return u !== url; });
+        if (off) { l.push(url); }
+        U.store.set(OFF_KEY, l);
+        configChanged();   // (loaded again without it, or with it: from the saved manifests)
+    }
     function removeAddon(url) {
         var list = getAddonUrls().filter(function (u) { return u !== url; });
         saveAddonUrls(list);
+        if (isAddonOff(url)) { U.store.set(OFF_KEY, offUrls().filter(function (u) { return u !== url; })); }   // (added again: on)
         var o = originsAll();
         if (o[url]) { delete o[url]; U.store.set(ORIGIN_KEY, o); }   // (added again by hand: none)
         configChanged();
@@ -329,6 +342,21 @@ var Stremio = (function () {
     var MAX_METAS = 1000, MAX_STREAMS = 500, MAX_SUBTITLES = 300, MAX_EPISODES = 5000, MAX_CATALOGS = 200;
     var _manifestProblem = {};   // url -> why it didn't load ("too large (over 2 MB)", "not an addon manifest"…)
     var _manifestDetail = {};    // url -> what the addon itself said about it, if anything (its error message)
+    // An addon's logo (its manifest's "logo", else "icon"), for Settings › Content › Addons: an
+    // http(s) link by the artwork rules (U.cardImage), or a small base64 picture written into
+    // the manifest, whole (one as long as STR_MAX was cut short). From an internet addon (url:
+    // its link; none given, taken as one), never a link into your home network (blocksLocal).
+    // Else null: its initial shows instead.
+    var LOGO_DATA = /^data:image\/(?:png|jpeg|gif|webp|svg\+xml);base64,[A-Za-z0-9+\/]+=*$/i;
+    function addonLogo(m, url) {
+        if (!m || typeof m !== 'object') { return null; }
+        var u = typeof m.logo === 'string' && m.logo.trim() ? m.logo : typeof m.icon === 'string' ? m.icon : '';
+        u = u.trim();
+        if (!u) { return null; }
+        if (/^data:/i.test(u)) { return u.length < STR_MAX && LOGO_DATA.test(u) ? u : null; }
+        u = U.cardImage(u, 'logo');
+        return u && (url ? blocksLocal({ url: url }) : true) && U.urlIsPrivate(u) ? null : u;
+    }
     // A manifest as the app can use it, or null: an id, and lists that are lists.
     // Its lists too: resources (a name, or { name, types, idPrefixes }), types and id prefixes
     // (text), catalogs (a type and id; extras each a name, their options text).
@@ -385,13 +413,14 @@ var Stremio = (function () {
     function loadAddons() {
         if (_loaded) { return Promise.resolve(_loaded); }
         if (_loading) { return _loading; }
-        var urls = getAddonUrls();
+        var off = offUrls(), urls = getAddonUrls().filter(function (u) { return off.indexOf(u) === -1; });   // (the ones turned off: not loaded)
         var saved = U.store.get(MANIFESTS_KEY, {}) || {};
         var force = _forceNet; _forceNet = false;
         var need = urls.filter(function (u) { return force || !saved[u]; }), rev = _rev, p;
-        // IPTV playlists load alongside the manifests (the synthetic addon is built from them).
-        var pre = (_hasIptv && IPTV.isEnabled()) ? IPTV.load() : Promise.resolve(null);
-        p = Promise.all([pre, need.length ? fetchManifests(need) : Promise.resolve({})]).then(function (res) {
+        // The IPTV playlists aren't waited for (a big one takes a while to read): the synthetic
+        // addon joins once they're read (iptvJoin), and onIptvReady's listeners redraw its rows.
+        var iptvOn = _hasIptv && IPTV.isEnabled(), iptvNow = iptvOn && (!IPTV.isReady || IPTV.isReady());
+        p = Promise.all([null, need.length ? fetchManifests(need) : Promise.resolve({})]).then(function (res) {
             if (_loading === p) { _loading = null; }
             if (rev !== _rev) { return loadAddons(); }   // (your addons changed meanwhile: loaded as they are now)
             var got = res[1], addons = [];
@@ -401,7 +430,8 @@ var Stremio = (function () {
             });
             // Prepend so the IPTV rows sort first on Home (reorder them in Settings >
             // Appearance > Home feeds; there's no cap on how many rows or feeds).
-            if (_hasIptv && IPTV.isEnabled()) { addons.unshift(IPTV.synthAddon()); }
+            if (iptvNow) { addons.unshift(IPTV.synthAddon()); }
+            else if (iptvOn) { iptvJoin(addons, rev); }
             if (hasYouTube()) { addons.push(YouTube.synthAddon()); }   // (after your addons: its rows last on Home)
             if (typeof Trakt !== 'undefined' && Trakt.isConnected()) { addons.push(Trakt.synthAddon()); }   // (your Watchlist and Up next)
             _loaded = addons;
@@ -414,6 +444,17 @@ var Stremio = (function () {
         return p;
     }
 
+    // The IPTV playlists, read after the addons loaded: their synthetic addon put first among them
+    // (its rows sort first on Home), as if it had been there, and onIptvReady's listeners told.
+    var _iptvReadyFns = [];
+    function onIptvReady(fn) { _iptvReadyFns.push(fn); }
+    function iptvJoin(addons, rev) {
+        IPTV.load().then(function () {
+            if (rev !== _rev || _loaded !== addons) { return; }   // (your addons changed meanwhile: loaded afresh, with it)
+            if (!addons.some(function (a) { return a.url === 'local:iptv'; })) { addons.unshift(IPTV.synthAddon()); }
+            _iptvReadyFns.forEach(function (fn) { try { fn(); } catch (e) {} });
+        }, function () {});
+    }
     // Background refresh of manifests that came from the TV's saved copies. Updates the
     // loaded addons in place, so anything holding them sees the new manifest.
     function refreshSavedManifests(urls) {
@@ -668,9 +709,8 @@ var Stremio = (function () {
             visible: function () { return list().then(function (items) { return sort(items).filter(function (c) { return !isHidden(keyOf(c)); }); }); },
             move: function (key, dir) {
                 return list().then(function (items) {
-                    var ordered = sort(items).map(keyOf), i = ordered.indexOf(key), j = i + dir;
-                    if (i < 0 || j < 0 || j >= ordered.length) { return; }
-                    var t = ordered[i]; ordered[i] = ordered[j]; ordered[j] = t;
+                    var ordered = sort(items).map(keyOf);
+                    if (!U.moveIn(ordered, ordered.indexOf(key), dir)) { return; }
                     var c = cfg(); c.order = ordered; U.store.set(storeKey, c);
                 });
             },
@@ -747,9 +787,7 @@ var Stremio = (function () {
     function moveRanking(key, dir) {
         var g = getRanking(), i = -1;
         g.criteria.forEach(function (c, n) { if (c.key === key) { i = n; } });
-        var j = i + dir;
-        if (i < 0 || j < 0 || j >= g.criteria.length) { return; }
-        var t = g.criteria[i]; g.criteria[i] = g.criteria[j]; g.criteria[j] = t;
+        if (!U.moveIn(g.criteria, i, dir)) { return; }
         saveRanking(g);
     }
     function toggleRanking(key) {
@@ -802,6 +840,10 @@ var Stremio = (function () {
         return out.filter(Boolean);
     }
 
+    // An addon's error sent as a title's details (AIOStreams: "aiostreamserror.…", its name
+    // "[❌] <the addon that failed>", the error as its description; AIOMetadata: "aiom.error.…"):
+    // not the title, so the next addon is asked.
+    function isErrorMeta(m) { return /^(aiostreamserror\.|aiom\.error\.)/.test('' + (m && m.id)); }
     function getMeta(type, id, cancel) {
         if (/^ytk:/.test(id) && typeof YouTube !== 'undefined') {
             return YouTube.meta(id).then(function (m) { if (!m) { throw new Error('Not found on YouTube'); } return m; });
@@ -832,6 +874,11 @@ var Stremio = (function () {
                 var url = a.base + '/meta/' + encodeURIComponent(asType[a.url] || type) + '/' + encodeURIComponent(id) + '.json';
                 return U.getJSON(url, addonMs(12000), META_MAX, cancel).then(function (res) {
                     var meta = fromAddon(a, res, 'title details').meta;
+                    if (meta && typeof meta === 'object' && isErrorMeta(meta)) {
+                        U.log('addon', ((a.manifest && a.manifest.name) || 'An addon') + ' sent an error instead of details for ' + id + ': ' +
+                            String(meta.name || '').slice(0, 80) + (meta.description ? ' (' + String(meta.description).slice(0, 120) + ')' : ''));
+                        return tryNext();
+                    }
                     if (meta && typeof meta === 'object') {
                         if (meta.videos !== undefined) { meta.videos = oneEach(U.listOf(meta.videos, MAX_EPISODES), meta.id || id); }
                         meta._from = (a.manifest && a.manifest.name) || '';   // (the title page says which addon described it)
@@ -872,8 +919,8 @@ var Stremio = (function () {
         if (e && !force && (e.pending > 0 || Date.now() - e.at < STREAM_TTL)) {
             syncLocal(e, type, id);   // (the addons' answers kept; the USB drive's matches as they are now)
             if (onUpdate) {
-                e.listeners.push(onUpdate);
-                if (e.started) { onUpdate(e.list, e.pending); }
+                if (!e.done) { e.listeners.push(onUpdate); }   // (still loading: told as each addon answers)
+                if (e.started) { onUpdate(e.list, e.pending); }   // (done: told once, now, and not kept)
             }
             return e.promise.then(function () { syncLocal(e, type, id); return e.list; });
         }
@@ -902,7 +949,7 @@ var Stremio = (function () {
                     return function () {
                         var url = a.base + '/stream/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '.json';
                         return U.getJSON(url, addonMs(15000)).then(function (res) {
-                            var arr = U.listOf(fromAddon(a, res, 'sources').streams, MAX_STREAMS).map(youTubeSource);
+                            var arr = U.listOf(fromAddon(a, res, 'sources').streams, MAX_STREAMS).map(youTubeSource), said = notes.length;
                             arr = arr.filter(function (s) {   // (an addon's notices: what it removed and why, its errors; not sources)
                                 if (!isNotice(s)) { return true; }
                                 notes.push({ addon: a.manifest.name || 'Addon', title: ('' + (s.name || '')).replace(/\s+/g, ' ').trim().slice(0, 120),
@@ -916,18 +963,23 @@ var Stremio = (function () {
                                 if (h) { s._headers = h; }
                             });
                             slots[i] = arr; okCount++;
+                            if (!arr.length && notes.length === said) { note(a, i, 'no sources for this'); }   // (its notices say why, when it sent any)
                         }).then(function () { done(); }, function (err) {
                             // (no answer in time: what you played from it before, marked so — see keptSources)
                             if (isTimeout(err) && !slots[i].length) { slots[i] = keptSources(type, id, a, i); }
+                            note(a, i, whyNone(err));
                             done(); throw err;
                         });
                     };
                 }), 4);
             }
+            // Why an addon gave nothing ("No sources found" shows it), in your addon order
+            function note(a, i, why) { notes.push({ addon: a.manifest.name || 'Addon', title: why, text: '', rank: i }); }
             function done() {
                 e.pending--;
                 e.list = local.concat([].concat.apply([], slots));
-                _streamNotes.set(key, notes.slice(0, 6));
+                notes.sort(function (x, y) { return (x.rank === undefined ? -1 : x.rank) - (y.rank === undefined ? -1 : y.rank); });
+                _streamNotes.set(key, notes.slice(0, 10));
                 notify();
             }
             // Addons that gather from others (AIOStreams…) can answer nothing while those are
@@ -942,6 +994,7 @@ var Stremio = (function () {
                 return new Promise(function (r) { setTimeout(r, RETRY_EMPTY_STREAMS_MS); }).then(ask);
             }).then(function () {
                 e.at = Date.now();
+                e.done = true; e.listeners = [];   // (nothing more to tell: none kept)
                 // Nothing (no answer, or no sources): not kept, so opening it again asks again.
                 if (providers.length && (!okCount || fresh() <= local.length) && _streamCache[key] === e) { delete _streamCache[key]; }
                 return e.list;
@@ -954,6 +1007,16 @@ var Stremio = (function () {
     }
 
     function isTimeout(err) { return /^Timeout/.test((err && err.message) || ''); }
+    // Why an addon's sources didn't come, in a few words (its link, and any token in it, left out):
+    // "refused (HTTP 429 · rate_limited)", "didn't answer in time", "couldn't be reached"…
+    function whyNone(err) {
+        var m = String((err && err.message) || ''), h = /^HTTP (\d{3}) for \S+(?::\s+(.+))?$/.exec(m);   // (its message after ": ", not the link's "://")
+        if (h) { return 'refused (HTTP ' + h[1] + (h[2] ? ' · ' + h[2].replace(/https?:\/\/\S+/g, '…').slice(0, 80) : '') + ')'; }
+        if (isTimeout(err)) { return 'didn’t answer in time'; }
+        if (/^Network error/.test(m)) { return 'couldn’t be reached'; }
+        if (/^Too large/.test(m)) { return 'sent too much (' + (/\(([^)]+)\)/.exec(m) || ['', 'too large'])[1] + ')'; }
+        return 'failed (' + m.replace(/https?:\/\/\S+/g, '…').slice(0, 80) + ')';
+    }
 
     // The debrid service a source comes through, from its tag ("[TB⚡]", "[RD+]"): { tag, name } or null.
     var DEBRIDS = { TB: 'TorBox', RD: 'Real-Debrid', AD: 'AllDebrid', PM: 'Premiumize', DL: 'Debrid-Link', ED: 'EasyDebrid', OC: 'Offcloud', PP: 'PikPak' };
@@ -1488,9 +1551,11 @@ var Stremio = (function () {
         var ep = parts.length >= 3 ? { season: parts[1], episode: parts[2] } : null;
         return { imdb: parts[0], ep: ep };
     }
-    // GET https://api.theintrodb.org/v3/media?imdb_id=tt..[&season=&episode=][&duration_ms=]
+    // GET https://api.theintrodb.org/v4/media?imdb_id=tt..[&season=&episode=][&duration_ms=]
+    // (v4: answers keyed by the show's TheTVDB id, episodes in TheTVDB's default order; the
+    // segments as v3 gave them. v2 and v3 stop on 18 Jan 2027.)
     function theIntroDb(q, durationMs) {
-        var url = 'https://api.theintrodb.org/v3/media?imdb_id=' + encodeURIComponent(q.imdb);
+        var url = 'https://api.theintrodb.org/v4/media?imdb_id=' + encodeURIComponent(q.imdb);
         if (q.ep) { url += '&season=' + encodeURIComponent(q.ep.season) + '&episode=' + encodeURIComponent(q.ep.episode); }
         if (durationMs && durationMs > 0) { url += '&duration_ms=' + Math.floor(durationMs); }
         return U.getJSON(url, 10000).then(function (r) {
@@ -1943,7 +2008,7 @@ var Stremio = (function () {
         DEFAULT_ADDONS: DEFAULT_ADDONS, prettyType: prettyType,
         addonUrlProblem: function (v) { return U.urlProblem(v); },
         getAddonUrls: getAddonUrls, manifestProblem: function (url) { return _manifestProblem[url] || ''; }, manifestDetail: function (url) { return _manifestDetail[url] || ''; }, addAddon: addAddon, removeAddon: removeAddon, moveAddon: moveAddon, streamNotes: streamNotes, keepSource: keepSource, forgetSource: forgetSource, sourceId: sourceId, hasStreamAddons: hasStreamAddons, thirdPartyNote: thirdPartyNote, refreshAddons: refreshAddons, refreshAddon: refreshAddon,
-        getIntegrations: getIntegrations, setIntegration: setIntegration, getPrefs: getPrefs, setPref: setPref,
+        getIntegrations: getIntegrations, setIntegration: setIntegration, getPrefs: getPrefs, setPref: setPref, addonLogo: addonLogo,
         getIntroSegments: getIntroSegments,
         tmdbValidate: tmdbValidate, mdblistValidate: mdblistValidate, omdbValidate: omdbValidate,
         tmdbFindTvId: tmdbFindTvId, tmdbSeasonEpisodes: tmdbSeasonEpisodes, tmdbImg: tmdbImg,
@@ -1974,7 +2039,7 @@ var Stremio = (function () {
         streamInfo: streamInfo, formatTags: formatTags, formatKeys: formatKeys, recordFormats: recordFormats, setFormat: setFormat,
         resetFormats: resetFormats, badFormats: badFormats, formatList: formatList,
         resList: resList, setResAllowed: setResAllowed, blockedRes: blockedRes,
-        importSetupList: importSetupList, savedManifest: savedManifest,
+        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,

package/js/trakt.js

@@ -92,7 +92,9 @@ var Trakt = (function () {
                 try { data = text ? JSON.parse(text) : null; } catch (e2) { bad = true; }
                 var retry = 0;
                 try { retry = parseInt(xhr.getResponseHeader('Retry-After'), 10) || 0; } catch (e5) {}
-                if (xhr.status >= 200 && xhr.status < 300) { resolve({ status: xhr.status, data: data, bad: bad }); }
+                var pages = 0, limit = 0;   // (a list sent a page at a time: how many pages, how many a page)
+                try { pages = parseInt(xhr.getResponseHeader('X-Pagination-Page-Count'), 10) || 0; limit = parseInt(xhr.getResponseHeader('X-Pagination-Limit'), 10) || 0; } catch (e6) {}
+                if (xhr.status >= 200 && xhr.status < 300) { resolve({ status: xhr.status, data: data, bad: bad, pages: pages, limit: limit }); }
                 else { reject({ status: xhr.status, data: data, retryAfter: retry }); }
             };
             xhr.ontimeout = function () { if (!done) { done = true; reject({ status: 0, timeout: true }); } };
@@ -338,19 +340,66 @@ var Trakt = (function () {
         return out;
     }
     function isWatched(type, id) { return watchedAt(type, id) > 0; }
+    // Watched past a place kept (Trakt's paused one, or this TV's): a movie watched since; an
+    // episode watched since, or a later one of the show (on any device). A place kept after
+    // those were watched (watching again) still stands. e: { type, id, updated }.
+    var _byShow = null, _byShowFor = null;   // { imdb: [[season, episode, when]] }, built from _watched when it changes
+    function byShow() {
+        if (_byShowFor === _watched) { return _byShow; }
+        var m = {};
+        Object.keys(_watched).forEach(function (k) {
+            var p = /^series:(tt\d+):(\d+):(\d+)$/.exec(k), v = _watched[k];
+            if (p && typeof v === 'number' && v > 0) { (m[p[1]] = m[p[1]] || []).push([+p[2], +p[3], v]); }
+        });
+        _byShow = m; _byShowFor = _watched;
+        return m;
+    }
+    function watchedPast(e) {
+        var since = (e && e.updated) || 0;
+        if (!e || !since) { return false; }
+        if (e.type === 'movie') { return watchedAt('movie', e.id) > since; }
+        var p = /^(tt\d+):(\d+):(\d+)$/.exec('' + e.id);
+        if (e.type !== 'series' || !p) { return false; }
+        var sn = +p[2], en = +p[3];
+        return (byShow()[p[1]] || []).some(function (w) { return w[2] > since && (w[0] > sn || (w[0] === sn && w[1] >= en)); });
+    }
 
+    // Trakt's watched lists come a page at a time (since July 2026), and shows carry their
+    // episodes only when asked (extended=progress). Every page is read: up to the count Trakt
+    // gives, or, without one, until a page is shorter than its page size (Trakt's, or the one
+    // asked); PAGES_MAX at most, and no more items than max. A page that repeats the one
+    // before (a server that ignores the page asked) ends it too, and isn't kept twice.
+    var PAGES_MAX = 100;
+    function allPages(path, perPage, max, g) {
+        var out = [], page = 1, before = '';
+        function next() {
+            return authed('GET', path + (path.indexOf('?') === -1 ? '?' : '&') + 'page=' + page + '&limit=' + perPage, null).then(function (r) {
+                live(g);
+                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;
+                out = out.concat(items);
+                var last = !items.length || out.length >= max || page >= PAGES_MAX ||
+                    (r.pages ? page >= r.pages : items.length < (r.limit || perPage));
+                if (last) { return out.slice(0, max); }
+                page++;
+                return next();
+            });
+        }
+        return next();
+    }
     var SHOWS_MAX = 5000, SEASONS_MAX = 200, EPISODES_MAX = 1000;
     function fetchWatched(g) {
         var map = {};
-        return authed('GET', '/sync/watched/movies', null).then(function (r) {
-            list(r.data, 20000).forEach(function (m) {
+        return allPages('/sync/watched/movies', 250, 20000, g).then(function (movies) {
+            movies.forEach(function (m) {
                 var imdb = m && imdbOf(m.movie && m.movie.ids);
                 if (imdb) { map['movie:' + imdb] = when(m.last_watched_at) || 1; }
             });
-            return authed('GET', '/sync/watched/shows', null);
-        }).then(function (r) {
+            return allPages('/sync/watched/shows?extended=progress', 100, SHOWS_MAX, g);
+        }).then(function (all) {
             var shows = [];
-            list(r.data, SHOWS_MAX).forEach(function (sh) {
+            all.forEach(function (sh) {
                 var show = sh && sh.show, imdb = show && imdbOf(show.ids);
                 if (!imdb) { return; }
                 var trakt = num(show.ids.trakt, 1e10), at = when(sh.last_watched_at);
@@ -472,13 +521,15 @@ var Trakt = (function () {
 
     // ---- playback (Continue Watching) cache ----
     // Trakt's paused titles, but not one you removed from Continue Watching here, unless Trakt
-    // has newer progress for it since (you watched more of it, here or elsewhere).
+    // has newer progress for it since (you watched more of it, here or elsewhere), nor one
+    // you've watched past since (watchedPast: Trakt keeps a paused place it's been told of in
+    // other ways, a history entry, and the show's next episode would wait behind it).
     // And the shows you're watching (Trakt's Up next): their next episode, placed by when you
     // last watched the show, unless Trakt has a paused episode of it already.
     function continueList() {
         var gone = U.store.get(DISMISSED_KEY, {}) || {};
         function kept(e) { var at = gone[e.type + ':' + e.id]; return !at || (e.updated || 0) > at; }
-        var list = (U.store.get(PLAYBACK_KEY, []) || []).filter(kept), paused = {};
+        var list = (U.store.get(PLAYBACK_KEY, []) || []).filter(function (e) { return kept(e) && !watchedPast(e); }), paused = {};
         list.forEach(function (e) { if (e.type === 'series') { paused[('' + e.id).split(':')[0]] = true; } });
         (U.store.get(UPNEXT_KEY, []) || []).forEach(function (u) {
             if (!u || !u.imdb || paused[u.imdb]) { return; }
@@ -837,7 +888,7 @@ var Trakt = (function () {
     return {
         hasCreds: hasCreds, isConnected: isConnected, connectStatus: connectStatus,
         startDeviceFlow: startDeviceFlow, disconnect: disconnect, refreshCaches: refreshCaches,
-        isWatched: isWatched, watchedAt: watchedAt, watchedSince: watchedSince, continueList: continueList, dismiss: dismiss, synthAddon: synthAddon,
+        isWatched: isWatched, watchedAt: watchedAt, watchedSince: watchedSince, watchedPast: watchedPast, continueList: continueList, dismiss: dismiss, synthAddon: synthAddon,
         onWatched: onWatched, onMarked: onMarked, onProgress: onProgress, onStopped: onStopped, refreshSoon: refreshSoon, rate: rate, myRating: myRating,
         retryFailed: retryFailed, discardFailed: discardFailed, sendNow: sendNow, flush: flushOutbox, noteEpisodes: noteEpisodes
     };

package/js/util.js

@@ -410,6 +410,14 @@ var U = (function () {
        are dropped), and at most `max` of them. Addons and APIs are outside our control:
        a list that's a string, or has nulls in it, or runs to a million items, must not
        stop the app. */
+    // Moves list[i] in place: dir -1 / 1 one step, -Infinity / Infinity to the top / bottom
+    // (the others keep their order). False when it can't move (not found, already there).
+    function moveIn(list, i, dir) {
+        var j = dir === -Infinity ? 0 : dir === Infinity ? list.length - 1 : i + dir;
+        if (i < 0 || i >= list.length || j < 0 || j >= list.length || j === i) { return false; }
+        list.splice(j, 0, list.splice(i, 1)[0]);
+        return true;
+    }
     function listOf(x, max, keep) {   // keep(item): an extra test, applied before counting
         if (!Array.isArray(x)) { return []; }
         var out = [];
@@ -422,7 +430,14 @@ 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. */
-    function logged(err) { log('network', err.message); err.logged = true; return err; }
+    // 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.
+    function privateNow() { try { return typeof Player !== 'undefined' && !!Player.privateNow && Player.privateNow(); } catch (e) { return false; } }
+    function logged(err) {
+        var msg = '' + err.message;
+        if (privateNow()) { msg = msg.replace(/(https?:\/\/[^\/\s?#]+)[^\s]*/g, '$1/…'); }
+        log('network', msg); err.logged = true; return err;
+    }
     function noteNetwork(err) { return logged(err); }
     // 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),
@@ -1476,7 +1491,7 @@ var U = (function () {
     }
 
     return {
-        byId: byId, el: el, clear: clear, 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, 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,

package/js/view-core.js

@@ -191,6 +191,16 @@ var ViewParts = {};
         var cancel = U.el('div', 'pill focusable modal-btn', 'Cancel');
         var refresh = U.el('div', 'pill focusable modal-btn', 'Refresh');
         var remove = U.el('div', 'pill focusable modal-btn danger', 'Remove');
+        // Turn off / on: kept in your list, not asked for anything while it's off (a backup)
+        var isOff = !!(Stremio.isAddonOff && Stremio.isAddonOff(url));
+        var onoff = U.el('div', 'pill focusable modal-btn', isOff ? 'Turn on' : 'Turn off');
+        onoff.__onselect = function () {
+            closeModal();
+            Stremio.setAddonOff(url, !isOff);
+            refreshAddonRows();   // (its rows come or go; nothing else is fetched)
+            U.toast(isOff ? '“' + name + '” is on' : '“' + name + '” is off: not asked for anything until you turn it on', 4000);
+            renderSettings();
+        };
 
         cancel.__onselect = function () {
             closeModal();
@@ -237,6 +247,7 @@ var ViewParts = {};
         }
         row.appendChild(cancel);
         row.appendChild(refresh);
+        row.appendChild(onoff);
         if (configure) { row.appendChild(configure); }
         row.appendChild(share);
         row.appendChild(remove);

package/js/view-detail.js

@@ -62,10 +62,11 @@
             U.spinner(false);
             _d.streams = list;
             var playable = list.filter(Stremio.isPlayable);
-            if (!playable.length) {   // (and why, in Settings › Diagnostics)
+            if (!playable.length) {   // (and why: on screen, each addon's reason; in Settings › Diagnostics)
+                var why = list.length ? '' : (Stremio.streamNotes ? Stremio.streamNotes(type, id) : []).slice(0, 3).map(function (n) { return n.addon + ' ' + n.title; }).join('; ');
                 U.log('sources', 'No playable source for “' + ((_d.meta && _d.meta.name) || id) + '” (' + type + ' ' + id + '): ' +
-                    (list.length ? list.length + ' source(s), none playable here' : 'no addon sent any'));
-                U.toast('No playable source for this channel'); App.back(); return;
+                    (list.length ? list.length + ' source(s), none playable here' : 'no addon sent any') + (why ? ' (' + why + ')' : ''));
+                U.toast('No playable source for this channel' + (why ? ': ' + why : ''), why ? 6000 : 3000); App.back(); return;
             }
             if (playable.length === 1) {
                 startPlayback(playable[0], id, _d.streamLabel || _d.meta.name || 'Live');
@@ -1566,7 +1567,7 @@
     // offer, it's asked at once.
     function sourceMenu(stream) {
         var canStart = !howHere() && savedPlace(_d.streamId);
-        var canDownload = typeof Downloads !== 'undefined' && Downloads.available() && /^https?:\/\//i.test(stream.url || '') && !stream._localFile && !stream._yt;
+        var canDownload = typeof Downloads !== 'undefined' && Downloads.available() && (Downloads.isFileLink ? Downloads.isFileLink(stream) : /^https?:\/\//i.test(stream.url || '')) && !stream._localFile && !stream._yt;
         if (!canStart && !canDownload) { toggleUnsuitable(stream); return; }
         var unsuit = isUnsuitable(_d.id, stream), opts = [];
         if (canStart) { opts.push(['start', 'Play from the start']); }