stremiok 2.0.0 → 2.1.0

package/README.md

@@ -75,8 +75,10 @@ a direct HTTP(S)/HLS/DASH URL, and this app embeds no torrent or debrid engine.
 
 The **IPTV** feature likewise hosts no content: you supply your own M3U playlist URLs. For
 YouTube entries, the bundled service finds the video's stream; the video itself comes
-straight from YouTube. Nothing is saved anywhere unless you download a source to your own USB
-drive.
+straight from YouTube. No video or audio is kept: everything plays straight from its source,
+unless you download it to your own USB drive. What StremioK does keep, on the TV, is your
+progress, settings and copies that let it start faster (see
+[Privacy and data](docs/PRIVACY.md#what-stays-on-the-tv)).
 
 ## Known limitations
 

package/config.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets"
-        id="http://stremiok.tizen/StremioKTizen" version="2.0.0" viewmodes="maximized">
+        id="http://stremiok.tizen/StremioKTizen" version="2.1.0" viewmodes="maximized">
     <tizen:application id="StremioK01.StremioK" package="StremioK01" required_version="3.0"/>
     <content src="index.html"/>
     <feature name="http://tizen.org/feature/screen.size.all"/>

package/css/style.css

@@ -40,7 +40,7 @@ html, body {
 .header .spacer { flex: 1; }
 .header-title { font-size: 36px; font-weight: bold; }
 /* Search and Settings: pills like the tabs (the top menu fits every tab, Local included, at 1920 px) */
-.header .hchip { display: inline-flex; align-items: center; font-size: 22px; padding: 8px 13px; margin-right: 6px; border-radius: 28px; background: #1a1f2b; color: #aeb6c4; border: 4px solid transparent; white-space: nowrap; }
+.header .hchip { display: inline-flex; align-items: center; font-size: 22px; padding: 8px 9px; margin-right: 5px; border-radius: 28px; background: #1a1f2b; color: #aeb6c4; border: 4px solid transparent; white-space: nowrap; }
 .header .hchip.focusable.focused { background: #818cf8; color: #0e1117; border-color: #fff; opacity: 1; }
 
 /* --- Rows --- */
@@ -335,6 +335,13 @@ html, body {
 .playlist-row .playlist-item { flex: 1; margin-bottom: 0; }
 .feed-off .playlist-item { opacity: 0.5; }
 .playlist-item .addon-said:empty { display: none; }
+/* an addon's logo (Settings › Content › Addons): its initial until the logo has loaded, then the logo over it */
+.addon-item.has-logo { position: relative; padding-left: 92px; min-height: 56px; }
+.addon-logo { position: absolute; left: 18px; top: 16px; width: 56px; height: 56px; border-radius: 8px; overflow: hidden; background: #0d1119; color: #8b93a5; font-size: 26px; font-weight: bold; line-height: 56px; text-align: center; word-break: normal; }
+.addon-logo img { position: absolute; left: 0; top: 0; width: 100%; height: 100%; object-fit: contain; visibility: hidden; }
+.addon-logo:before { content: attr(data-initial); }
+.addon-logo.loaded:before { visibility: hidden; }
+.addon-logo.loaded img { visibility: visible; }
 /* list picker (single choice) */
 .pick-box { width: 720px; text-align: left; }
 .pick-box .modal-msg { text-align: left; margin-bottom: 20px; }
@@ -367,12 +374,13 @@ html, body {
 
 /* Home top row: tab pills + Search + Settings on the left, StremioK logo on the right */
 .home-header .tabbar-inline { display: flex; align-items: center; }
-.tab-pill { display: inline-flex; align-items: center; font-size: 22px; padding: 8px 13px; margin-right: 6px; border-radius: 28px; background: #1a1f2b; color: #aeb6c4; border: 4px solid transparent; white-space: nowrap; }
+.tab-pill { display: inline-flex; align-items: center; font-size: 22px; padding: 8px 9px; margin-right: 5px; border-radius: 28px; background: #1a1f2b; color: #aeb6c4; border: 4px solid transparent; white-space: nowrap; }
 .tab-ic { margin-left: 6px; font-size: 22px; }
 .tab-pill.active { background: #2a3346; color: #fff; }
 .tab-pill.focusable.focused { background: #818cf8; color: #0e1117; border-color: #fff; }
 .home-header .hchip.active { background: #2a3346; color: #fff; opacity: 1; }
 .row-empty { margin: 50px 60px; font-size: 26px; color: #8b93a3; }
+.row-loading .row-empty { margin: 10px 60px 26px 60px; font-size: 22px; }
 
 /* --- Subtitle fonts (bundled; SIL Open Font License, see css/fonts/OFL-*.txt) ---
    Latin, Latin-extended and Cyrillic subsets; unicode-range makes the webview

package/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=1920, height=1080, user-scalable=no">
     <title>StremioK</title>
-    <link rel="stylesheet" href="css/style.css?v=2.0.0">
+    <link rel="stylesheet" href="css/style.css?v=2.1.0">
 </head>
 <body>
     <!-- CSS-applied sentinel (kept off-screen); app.js waits for its width before rendering -->
@@ -52,35 +52,35 @@
 
     <!-- Load order matters: polyfills -> util -> iptv -> data -> input -> tvapps -> player parts -> player -> ytplay -> view parts -> views -> app -->
     <!-- ?v= busts the TV webview cache on every release (keep in sync with package.json) -->
-    <script src="js/polyfills.js?v=2.0.0"></script>
-    <script src="js/util.js?v=2.0.0"></script>
-    <script src="js/iptv.js?v=2.0.0"></script>
-    <script src="js/youtube.js?v=2.0.0"></script>
-    <script src="js/stremio.js?v=2.0.0"></script>
-    <script src="js/trakt.js?v=2.0.0"></script>
-    <script src="js/keys.js?v=2.0.0"></script>
-    <script src="js/focus.js?v=2.0.0"></script>
-    <script src="js/tvapps.js?v=2.0.0"></script>
-    <script src="js/player-core.js?v=2.0.0"></script>
-    <script src="js/player-store.js?v=2.0.0"></script>
-    <script src="js/player-lang.js?v=2.0.0"></script>
-    <script src="js/player-quality.js?v=2.0.0"></script>
-    <script src="js/player-subs.js?v=2.0.0"></script>
-    <script src="js/player-audio.js?v=2.0.0"></script>
-    <script src="js/player-controls.js?v=2.0.0"></script>
-    <script src="js/player.js?v=2.0.0"></script>
-    <script src="js/ytplay.js?v=2.0.0"></script>
-    <script src="js/local.js?v=2.0.0"></script>
-    <script src="js/downloads.js?v=2.0.0"></script>
-    <script src="js/stremio-account.js?v=2.0.0"></script>
-    <script src="js/view-core.js?v=2.0.0"></script>
-    <script src="js/view-home.js?v=2.0.0"></script>
-    <script src="js/view-detail.js?v=2.0.0"></script>
-    <script src="js/view-search.js?v=2.0.0"></script>
-    <script src="js/view-settings.js?v=2.0.0"></script>
-    <script src="js/view-discover.js?v=2.0.0"></script>
-    <script src="js/views.js?v=2.0.0"></script>
-    <script src="js/app.js?v=2.0.0"></script>
-    <script src="js/hubpreview.js?v=2.0.0"></script>
+    <script src="js/polyfills.js?v=2.1.0"></script>
+    <script src="js/util.js?v=2.1.0"></script>
+    <script src="js/iptv.js?v=2.1.0"></script>
+    <script src="js/youtube.js?v=2.1.0"></script>
+    <script src="js/stremio.js?v=2.1.0"></script>
+    <script src="js/trakt.js?v=2.1.0"></script>
+    <script src="js/keys.js?v=2.1.0"></script>
+    <script src="js/focus.js?v=2.1.0"></script>
+    <script src="js/tvapps.js?v=2.1.0"></script>
+    <script src="js/player-core.js?v=2.1.0"></script>
+    <script src="js/player-store.js?v=2.1.0"></script>
+    <script src="js/player-lang.js?v=2.1.0"></script>
+    <script src="js/player-quality.js?v=2.1.0"></script>
+    <script src="js/player-subs.js?v=2.1.0"></script>
+    <script src="js/player-audio.js?v=2.1.0"></script>
+    <script src="js/player-controls.js?v=2.1.0"></script>
+    <script src="js/player.js?v=2.1.0"></script>
+    <script src="js/ytplay.js?v=2.1.0"></script>
+    <script src="js/local.js?v=2.1.0"></script>
+    <script src="js/downloads.js?v=2.1.0"></script>
+    <script src="js/stremio-account.js?v=2.1.0"></script>
+    <script src="js/view-core.js?v=2.1.0"></script>
+    <script src="js/view-home.js?v=2.1.0"></script>
+    <script src="js/view-detail.js?v=2.1.0"></script>
+    <script src="js/view-search.js?v=2.1.0"></script>
+    <script src="js/view-settings.js?v=2.1.0"></script>
+    <script src="js/view-discover.js?v=2.1.0"></script>
+    <script src="js/views.js?v=2.1.0"></script>
+    <script src="js/app.js?v=2.1.0"></script>
+    <script src="js/hubpreview.js?v=2.1.0"></script>
 </body>
 </html>

package/js/downloads.js

@@ -13,7 +13,8 @@ var Downloads = (function () {
         return typeof YTPlay !== 'undefined' && YTPlay.installMode() === 'wgt' && typeof LocalMedia !== 'undefined' && LocalMedia.present && LocalMedia.present();
     }
     function kept() { var l = U.store.get(DL_KEY, []); return Array.isArray(l) ? l : []; }
-    function keep(l) { U.store.set(DL_KEY, l.slice(-MAX)); }
+    var _keptJson = null;   // (what was last written: the list polled every few seconds is written only when it changed)
+    function keep(l) { var v = l.slice(-MAX), j = JSON.stringify(v); if (j === _keptJson) { return; } _keptJson = j; U.store.set(DL_KEY, v); }
     function keyOf(x) { return x.dir + '/' + x.name; }
     // The same file, renamed or not ("Film.mkv", "Film (k3x9).mkv"): its folder and its name's stem.
     function sameFile(y, k) {
@@ -55,11 +56,13 @@ var Downloads = (function () {
             });
             _synced = true;
             emit();
-            return U.settleAll(again.map(function (k) { return function () { return send(k); }; }), 1).then(function () { return _items; });
+            return U.settleAll(again.map(function (k) { return function () { return send(k, true); }; }), 1).then(function () { return _items; });
         }, function () { return _items; });
     }
-    function send(k) {
-        return ask('/fsdl/add?' + qs({ dir: k.dir, name: k.name, url: k.url, ua: k.ua, ref: k.ref, size: k.size, title: k.title }), 20000).then(function (x) {
+    // again: the service no longer knows it (it restarted): it checks the drive first, so one it had
+    // finished isn't downloaded a second time.
+    function send(k, again) {
+        return ask('/fsdl/add?' + qs({ dir: k.dir, name: k.name, url: k.url, ua: k.ua, ref: k.ref, size: k.size, title: k.title, again: again ? '1' : '' }), 20000).then(function (x) {
             var mine = kept();
             mine.forEach(function (y) { if (keyOf(y) === keyOf(k)) { y.id = x.id; y.state = x.state; y.err = ''; } });
             keep(mine);
@@ -129,6 +132,14 @@ var Downloads = (function () {
 
     // ---- starting one, from a title's source (view-detail's source menu) ----
     var EXT = /\.(mkv|mp4|m4v|avi|ts|webm|mov|wmv|mpe?g)$/i;
+    // Only a file can be downloaded: a link (http/https) that isn't a streamed playlist (HLS
+    // .m3u8, DASH .mpd), which would save just the list, not the video. (One whose link doesn't
+    // say is checked by StremioK's service, by what the server answers.)
+    function isFileLink(stream) {
+        var u = '' + ((stream && stream.url) || ''), path = u.split(/[?#]/)[0], query = u.split('#')[0].split('?')[1] || '';
+        if (!/^https?:\/\//i.test(u)) { return false; }
+        return !/\.(m3u8?|mpd)$/i.test(path) && !/(^|&)(type|format|ext|output)=(m3u8|hls|mpd|dash)(&|$)/i.test(query);
+    }
     function fileNameFor(stream, label) {
         var bh = stream.behaviorHints || {}, path = ('' + (stream.url || '')).split(/[?#]/)[0];
         var named = typeof bh.filename === 'string' && EXT.test(bh.filename) ? bh.filename : '';
@@ -150,6 +161,7 @@ var Downloads = (function () {
     // ui: { pick(title, options, onPick), confirm(msg, ok, fn) } (the views' popups)
     function start(stream, t, ui) {
         if (!available()) { U.toast('Plug a USB drive into the TV first'); return; }
+        if (!isFileLink(stream)) { U.toast('This source is a streamed playlist (HLS or DASH), not a file: it can’t be downloaded. Pick another source.', 6000); return; }
         var name = fileNameFor(stream, t.label), bytes = +((stream.behaviorHints || {}).videoSize) || 0;
         spaces().then(function (list) {
             if (!list.length) { U.toast('No USB drive'); return; }
@@ -202,6 +214,6 @@ var Downloads = (function () {
         }, function () {});
     }
 
-    return { available: available, items: items, sync: sync, watch: watch, onChange: onChange, add: add, cancel: cancel, clear: clear, retry: retry,
+    return { available: available, isFileLink: isFileLink, items: items, sync: sync, watch: watch, onChange: onChange, add: add, cancel: cancel, clear: clear, retry: retry,
         start: start, fileNameFor: fileNameFor, busy: busy, synced: function () { return _synced; } };
 })();

package/js/hubpreview.js

@@ -8,6 +8,9 @@
 var HubPreview = (function () {
     'use strict';
     var SERVICE = 'StremioK01.service', EVERY_MS = 10 * 60 * 1000, SENT_KEY = 'stremiok.homepreview';
+    // Sent counts only once the preview service says the TV took them (SENT_KEY); a try is kept
+    // apart (_tried), for the 10 minutes between sends; a failure is tried again later (RETRY_MS).
+    var RETRY_MS = [60000, 300000, 900000], _tried = null, _fails = 0;
     var _timer = null;
     // Tizen 4 and later: the 2017 TV (Tizen 3) shows no preview for it, so there it's left out
     // (no setting, nothing sent).
@@ -28,15 +31,22 @@ var HubPreview = (function () {
     function send(now) {
         if (!available()) { return; }
         var json = JSON.stringify(payload()), last = U.store.get(SENT_KEY, null) || {}, t = Date.now();
-        if (!now && json === last.json) { return; }
-        if (!now && t - (last.at || 0) < EVERY_MS) { later(last.at + EVERY_MS - t); return; }
-        U.store.set(SENT_KEY, { json: json, at: t });
+        if (!now && json === last.json) { return; }   // (the TV has these already)
+        var lastTry = Math.max(last.at || 0, (_tried && _tried.at) || 0);
+        if (!now && t - lastTry < EVERY_MS) { later(lastTry + EVERY_MS - t); return; }
+        _tried = { json: json, at: t };
+        function failed(why) {
+            U.log('preview', 'Home bar preview not sent: ' + why);
+            if (_fails < RETRY_MS.length) { var wait = RETRY_MS[_fails++]; _tried = null; later(wait); }   // (then as usual: a change, 10 minutes apart)
+        }
         try {
             tizen.application.launchAppControl(
                 new tizen.ApplicationControl('http://tizen.org/appcontrol/operation/pick', null, 'image/jpeg', null,
                     [new tizen.ApplicationControlData('caller', ['ForegroundApp']), new tizen.ApplicationControlData('tiles', [json])]),
-                SERVICE, function () {}, function (e) { U.log('preview', 'Home bar preview not sent: ' + ((e && e.message) || e)); });
-        } catch (e) { U.log('preview', 'Home bar preview not sent: ' + (e && e.message)); }
+                SERVICE, function () {}, function (e) { failed((e && e.message) || e); },
+                { onsuccess: function () { U.store.set(SENT_KEY, { json: json, at: t }); _fails = 0; },
+                  onfailure: function () { failed('the TV didn’t take them'); } });
+        } catch (e) { failed(e && e.message); }
     }
     function later(ms) {
         if (_timer) { clearTimeout(_timer); }

package/js/iptv.js

@@ -75,9 +75,8 @@ var IPTV = (function () {
     // Up (-1) or down (1): a channel in two playlists comes from the first, and rows are
     // in playlist order.
     function movePlaylist(id, dir) {
-        var list = getPlaylists(), i = find(list, id), j = i + dir;
-        if (i === -1 || j < 0 || j >= list.length) { return false; }
-        var t = list[i]; list[i] = list[j]; list[j] = t;
+        var list = getPlaylists();
+        if (!U.moveIn(list, find(list, id), dir)) { return false; }   // (one place, or to the top / bottom)
         savePlaylists(list);
         return true;
     }
@@ -368,6 +367,7 @@ var IPTV = (function () {
         _progressFns.forEach(function (fn) { try { fn(total); } catch (e) {} });
     }
     function onProgress(fn) { _progressFns.push(fn); }
+    function isReady() { return !!_cache; }   // (the playlists read: synthAddon has their channels)
 
     // Each playlist is fetched once and saved (the big store). Passing a playlist id
     // forces only that entry to refresh; true refreshes every configured playlist.
@@ -478,7 +478,7 @@ var IPTV = (function () {
         getPlaylists: getPlaylists, addPlaylist: addPlaylist, updatePlaylist: updatePlaylist,
         removePlaylist: removePlaylist, renamePlaylist: renamePlaylist, setPlaylistOff: setPlaylistOff,
         movePlaylist: movePlaylist, label: labelOf, isEnabled: isEnabled, reset: reset, status: status,
-        load: load, reload: reload, catalog: catalog, meta: meta, streams: streams, synthAddon: synthAddon,
+        load: load, reload: reload, catalog: catalog, meta: meta, streams: streams, synthAddon: synthAddon, isReady: isReady,
         onProgress: onProgress
     };
 })();

package/js/player-controls.js

@@ -22,6 +22,7 @@
     function infoLang() { return P.infoLang.apply(null, arguments); }   // lang
     function trackInfo() { return P.trackInfo.apply(null, arguments); }   // lang
     function hasQualities() { return P.hasQualities.apply(null, arguments); }   // quality
+    function qualityUnread() { return P.qualityUnread ? P.qualityUnread() : false; }   // quality
     function qualityCount() { return P.qualityCount.apply(null, arguments); }   // quality
     function qualityLabel() { return P.qualityLabel.apply(null, arguments); }   // quality
     function qualityMenu() { return P.qualityMenu.apply(null, arguments); }   // quality
@@ -627,6 +628,8 @@
         }
         if (hasQualities()) {
             items.push({ label: 'Video quality', detail: qualityLabel(), run: function () { pushMenu(qualityMenu()); } });
+        } else if (qualityUnread()) {
+            items.push({ label: 'Video quality', detail: 'Auto: this stream’s qualities couldn’t be read', run: function () { U.toast('This stream’s qualities couldn’t be read: it plays on Auto', 4000); } });
         }
         if (chapters().length) {
             var ci = chapterAt(S.cur);
@@ -683,6 +686,7 @@
     function canDownload() {
         var c = S.ctx, st = c && c.stream;
         return !!(st && c.downloadAs && !S.isLive && !c.trailer && !c.yt && !c.localFile && !st._localFile && !st._yt && /^https?:\/\//i.test(st.url || '') &&
+            (typeof Downloads === 'undefined' || !Downloads.isFileLink || Downloads.isFileLink(st)) &&
             typeof Downloads !== 'undefined' && Downloads.available());
     }
     function downloadPlaying() {
@@ -807,6 +811,7 @@
         }
         lines.push(['Subtitles', subtitleSummary()]);
         if (hasQualities()) { lines.push(['Quality', qualityLabel() + '  (' + qualityCount() + ' available)']); }
+        else if (qualityUnread()) { lines.push(['Quality', 'Auto (this stream’s qualities couldn’t be read)']); }
         if (useAV) {
             try {
                 var bw = +avplay.getStreamingProperty('CURRENT_BANDWIDTH');

package/js/player-core.js

@@ -58,7 +58,8 @@ var PlayerParts = {};
         dur: 0,              // seconds
         cur: 0,              // seconds
         isLive: false,       // live stream (sports/IPTV): no fixed duration
-        playStarted: false,  // this AVPlay attempt reached playback (vs. failed early)
+        playStarted: false,  // this AVPlay attempt was prepared (opened, ready to play)
+        playing: false,      // ...and actually played: its position moved for a second (see oncurrentplaytime)
         // seek robustness (AVPlay can error if you seek mid-buffer)
         buffering: false,
         pendingSeek: null,
@@ -156,8 +157,14 @@ var PlayerParts = {};
 
     function isActive() { return S.active; }
 
-    function saveProgress() {
+    // fromTicker: the 5-second save while it plays: skipped when nothing moved since the last one
+    // (paused); a stop, a leave or a jump always saves.
+    var _savedSig = '';
+    function saveProgress(fromTicker) {
         if (!S.ctx || !S.dur || S.isLive || S.ctx.trailer || S.ctx.private || isNotice()) { return; }   // (a notice clip, private viewing: nothing saved, nothing removed)
+        var sig = progressKey(S.ctx) + '|' + Math.floor(S.cur) + '|' + Math.floor(S.dur);
+        if (fromTicker && sig === _savedSig) { return; }
+        _savedSig = sig;
         // Past the credits the episode is watched: its entry was removed and the next one
         // queued (handleCredits). Saving again would put it back next to the next episode.
         if (_creditsHandled) { return; }
@@ -376,7 +383,8 @@ var PlayerParts = {};
         resetQuality(ctx);
         resetControls();
         _stall = { t: -1, since: 0, bufSince: 0, recoveries: [] };
-        _prefetchedNext = false; S.playStarted = false;
+        recoReset();
+        _prefetchedNext = false; S.playStarted = false; S.playing = false;
         _segments = null; _creditsSec = null; _creditsHandled = false; _segmentsFor = null;
         S.buffering = false; S.pendingSeek = null; S.lastSeekAt = 0; S.settleFrom = 0; _seekRecovering = false; _jumpUndone = null; _pausedOnce = false;
         updateHint();
@@ -509,7 +517,7 @@ var PlayerParts = {};
         url = (S.ctx && S.ctx._relay && S.ctx._relayFor === url) ? S.ctx._relay : opened(url);   // (a live channel's sound repacked: see liveCheck)
         var token = ++_playToken;
         objEl.className = 'active';
-        S.playStarted = false;
+        S.playStarted = false; S.playing = false;
         _lastTickMs = null; _playedMs = 0;
         _tick = null; _pausedOnce = false;   // (a new open: the jump watch starts over, see checkJump)
         subsBeforeOpen();   // a built-in subtitle track is selected again once this attempt plays
@@ -564,6 +572,7 @@ var PlayerParts = {};
                     // Played, not just opened: a file can open and then fail (or show nothing)
                     if (_lastTickMs !== null && ms > _lastTickMs && ms - _lastTickMs < 1500) { _playedMs += ms - _lastTickMs; }
                     _lastTickMs = ms;
+                    if (!S.playing && _playedMs >= 1000) { S.playing = true; _reco.tries = 0; }   // (started: playing, not just opened; a reconnect's tries start over)
                     if (_playedMs >= 2000 && !isNotice()) { reportStart(true); }   // (a notice clip proves nothing about the format)
                     audioOnTick();
                     subsOnTick();
@@ -586,11 +595,15 @@ var PlayerParts = {};
                         setTimeout(function () { _seekRecovering = false; }, 4000);
                         return;
                     }
-                    // Failed before playback ever started → retry / step down / Auto.
-                    if (!S.playStarted && (relayFailed() || tryFallback())) { return; }
+                    // A live channel that played: its connection dropped → opened again (liveDropped).
+                    if (S.playing && liveReconnects()) { U.log('player', 'Playback error: ' + err + ' (' + where(S.ctx.url) + ')'); liveDropped('Connection lost'); return; }
+                    // A reconnect's try that didn't play → the next try.
+                    if (!S.playing && _reco.tries) { if (!relayFailed()) { liveDropped('Couldn’t reconnect'); } return; }
+                    // Failed before it ever played (opened, maybe, but nothing shown) → retry / step down / Auto.
+                    if (!S.playing && (relayFailed() || tryFallback())) { return; }
                     reportStart(false, err);   // (unless it had already played)
                     U.log('player', 'Playback error: ' + err + ' (' + where(S.ctx && S.ctx.url) + ')');
-                    if (!S.playStarted) { failedStart('Playback error: ' + err); return; }
+                    if (!S.playing) { failedStart('Playback error: ' + err); return; }
                     U.toast('Playback error: ' + err);
                     exitLater();
                 }
@@ -625,6 +638,7 @@ var PlayerParts = {};
                 if (!S.active || token !== _playToken) { return; }
                 U.spinner(false);
                 if (relayFailed()) { return; }
+                if (_reco.tries) { liveDropped('Couldn’t reconnect'); return; }   // (a reconnect's try: the next one)
                 // Prepare failed → retry / step down / Auto.
                 if (tryFallback()) { return; }
                 U.log('player', 'Could not open: ' + (err && (err.name || err.message || err)) + ' (' + where(url) + ')');
@@ -710,7 +724,7 @@ var PlayerParts = {};
         _ticker = setInterval(function () {
             if (inBackground()) { return; }   // (saved on the way there; nothing to watch until it's back)
             if (useAV) { try { S.cur = avplay.getCurrentTime() / 1000; } catch (e) {} onProgress(); checkStall(); }
-            saveProgress();
+            saveProgress(true);
         }, 5000);
     }
 
@@ -723,8 +737,8 @@ var PlayerParts = {};
         return !!S.ctx && !S.ctx.yt && !S.ctx.trailer && !S.isLive && (S.ctx.type === 'movie' || S.ctx.type === 'series') && S.dur > 0 && S.dur < NOTICE_MAX_S;
     }
     function onEnded() {
-        // a live channel whose stream ended (its server stopped it): opened again, as a stall is
-        if (S.isLive && S.ctx && !S.ctx.trailer && !S.ctx.yt) { recoverStall('The stream ended — opening the channel again…'); return; }
+        // a live channel whose stream ended (its server stopped it): opened again (liveDropped)
+        if (liveReconnects()) { liveDropped('The stream ended'); return; }
         if (isNotice()) {   // (back to its sources: another one, or this one later)
             U.toast('That source isn\'t ready yet (the debrid service is still getting it): try another, or this one later', 6000);
             exit();
@@ -834,6 +848,13 @@ var PlayerParts = {};
         if (_creditsHandled || !S.ctx || S.ctx.trailer || isNotice()) { return; }
         _creditsHandled = true;
         if (S.ctx.private) { return; }   // (private viewing: not marked watched, nothing queued)
+        // With Trakt: sent as a finish (Trakt's own way, which also clears a paused place it
+        // kept for it), not as a separate "watched"
+        if (S.dur > 0 && typeof Trakt !== 'undefined' && Trakt.onStopped && Trakt.isConnected && Trakt.isConnected()) {
+            markFinished(true);
+            Trakt.onStopped(S.ctx.type, S.ctx.id, S.cur, S.dur, S.ctx.name);
+            return;
+        }
         markFinished(false);
     }
     // Watched: off Continue Watching, the next episode queued. quiet: Trakt's been told another
@@ -937,7 +958,7 @@ var PlayerParts = {};
     var NEXT_TRIES = 3, AV_START_MS = 45000, _openedAt = 0;
     function nextSourceOnFail(notice) {
         var c = S.ctx;
-        if (!c || !S.active || S.playStarted || S.isLive || c.trailer || c.yt || c.localFile || !c.stream || typeof c.nextSource !== 'function') { return false; }
+        if (!c || !S.active || S.playing || S.isLive || c.trailer || c.yt || c.localFile || !c.stream || typeof c.nextSource !== 'function') { return false; }
         if (typeof Stremio === 'undefined' || !Stremio.getPrefs || !Stremio.getPrefs().nextOnFail) { return false; }
         var tried = (c._tried || []).concat([Stremio.sourceId(c.stream)]);
         if (tried.length > NEXT_TRIES) { return false; }
@@ -1000,11 +1021,17 @@ var PlayerParts = {};
         else { n.text = svc + ' couldn’t give this file (' + addon + ': “' + kind.replace(/_/g, ' ') + '”)'; }
         return n;
     }
-    // Not started after AV_START_MS (no answer from the server): as a refusal, when there's a
-    // next source to try (otherwise it's left to go on waiting).
+    // Not playing after AV_START_MS (no answer from the server, or opened and nothing shown): the
+    // next source when there's one; else it stops and says so (not while you've paused it).
     function startCheck() {
-        if (!S.active || S.playStarted || !useAV || !_openedAt || Date.now() - _openedAt < AV_START_MS) { return; }
-        nextSourceOnFail();
+        if (!S.active || S.playing || !useAV || !_openedAt || Date.now() - _openedAt < AV_START_MS) { return; }
+        if (_reco.tries) { liveDropped('Couldn’t reconnect'); return; }   // (a reconnect's try: the next one)
+        if (nextSourceOnFail()) { return; }
+        if (S.playStarted && isPaused()) { return; }
+        U.log('player', 'Didn’t start: nothing played in ' + (AV_START_MS / 1000) + ' s (' + where(S.ctx && S.ctx.url) + ')');
+        U.spinner(false);
+        U.toast('Didn’t start: nothing played in ' + (AV_START_MS / 1000) + ' seconds. Try another source.', 6000);
+        exitLater();
     }
     P.startCheck = startCheck;
 
@@ -1077,14 +1104,15 @@ var PlayerParts = {};
         var now = Date.now();
         if (S.buffering) {
             if (!_stall.bufSince) { _stall.bufSince = now; }
-            else if (now - _stall.bufSince > BUFFER_STALL_SECS * 1000) { recoverStall('Stream stopped loading — reloading…'); }
+            else if (now - _stall.bufSince > BUFFER_STALL_SECS * 1000) { recoverStall('Stream stopped loading'); }
             return;
         }
         _stall.bufSince = 0;
         if (isPaused() || S.cur !== _stall.t) { _stall.t = S.cur; _stall.since = now; return; }
-        if (_stall.since && now - _stall.since > STALL_SECS * 1000) { recoverStall('Playback stalled — reloading…'); }
+        if (_stall.since && now - _stall.since > STALL_SECS * 1000) { recoverStall('Playback stalled'); }
     }
-    function recoverStall(message) {
+    function recoverStall(why) {
+        if (liveReconnects()) { liveDropped(why); return; }
         var now = Date.now();
         _stall.recoveries = _stall.recoveries.filter(function (t) { return now - t < STALL_WINDOW_MS; });
         if (_stall.recoveries.length >= STALL_MAX) {
@@ -1094,7 +1122,51 @@ var PlayerParts = {};
             return;
         }
         _stall.recoveries.push(now);
-        reopen(message);
+        reopen(why + ' — reloading…');
+    }
+
+    // ---------- a live channel that drops ----------
+    // A live channel that stops (an error once it played, its connection lost; frozen, stuck
+    // loading, or ended by its server) is opened again at the live edge, as Settings › Playback ›
+    // Seeking & buffering › Reconnect live channels says: Off (the player closes), A few times
+    // (STALL_MAX within STALL_WINDOW_MS, as any stall) or Keep trying (no limit). A try that
+    // doesn't play is followed by another, each a little later (RECO_WAIT_S); BACK stops it.
+    // Not for a trailer or YouTube (a stall there reloads as a video's does).
+    var RECO_WAIT_S = [0, 5, 10, 20, 40, 60], _reco = { tries: 0, timer: null };
+    function liveReconnects() { return S.isLive && !!S.ctx && !S.ctx.trailer && !S.ctx.yt; }
+    function recoReset() {
+        if (_reco.timer) { clearTimeout(_reco.timer); }
+        _reco = { tries: 0, timer: null };
+    }
+    function liveDropped(why) {
+        if (_reco.timer) { return; }   // (a try already waiting)
+        var mode = P.playerCfg().reconnect, now = Date.now();
+        if (mode === 'off') {
+            U.log('player', 'Live channel: ' + why + '; reconnecting is off');
+            U.spinner(false); U.toast(why + ': the channel stopped (reconnecting is off)', 5000);
+            exitLater();
+            return;
+        }
+        _stall.recoveries = _stall.recoveries.filter(function (t) { return now - t < STALL_WINDOW_MS; });
+        if (mode !== 'always' && _stall.recoveries.length >= STALL_MAX) {
+            U.log('player', 'Live channel: ' + why + '; dropped ' + STALL_MAX + ' times in ' + (STALL_WINDOW_MS / 60000) + ' minutes, given up');
+            U.spinner(false); U.toast('This channel keeps dropping — try it again later', 5000);
+            exit();
+            return;
+        }
+        _stall.recoveries.push(now);
+        var n = ++_reco.tries, wait = RECO_WAIT_S[Math.min(n - 1, RECO_WAIT_S.length - 1)] * 1000, ctx = S.ctx;
+        var msg = why + ' — reconnecting' + (n > 1 ? ' (try ' + n + ')' : '') + '…';
+        U.log('player', 'Live channel: ' + why + ', reconnecting (try ' + n + (wait ? ', in ' + (wait / 1000) + ' s' : '') + ')');
+        if (!wait) { reopen(msg); return; }
+        U.spinner(true, msg);
+        function due() {
+            _reco.timer = null;
+            if (!S.active || S.ctx !== ctx) { return; }
+            if (inBackground()) { _reco.timer = setTimeout(due, 5000); return; }   // (back first)
+            reopen(msg);
+        }
+        _reco.timer = setTimeout(due, wait);
     }
     // The stream opened again in place: VOD at the same position, live at the edge.
     function reopen(message) {
@@ -1126,6 +1198,7 @@ var PlayerParts = {};
         closeControls();
         screenSaver(true);
         _playToken++;   // invalidate AVPlay/HTML5 callbacks before stop/close emits any
+        recoReset();
         if (_ticker) { clearInterval(_ticker); _ticker = null; }
         if (_osdTimer) { clearTimeout(_osdTimer); _osdTimer = null; }
         hideOSD();

package/js/player-lang.js

@@ -10,7 +10,7 @@
         var info = tr && tr.extra_info;
         if (typeof info === 'string') {
             try { info = JSON.parse(info); } catch (e) {
-                var out = {}, re = /["']?([A-Za-z_]+)["']?\s*[:=]\s*["']?([^"',}]*)/g, m;
+                var out = Object.create(null), re = /["']?([A-Za-z_]+)["']?\s*[:=]\s*["']?([^"',}]*)/g, m;   // (no inherited names)
                 while ((m = re.exec(info))) { out[m[1]] = m[2].trim(); }
                 info = out;
             }

package/js/player-quality.js

@@ -26,7 +26,7 @@
     function resetQuality(ctx) {
         _variants = []; _qualityBw = null; _ytRetried = false; _switchNote = null;
         _userPicked = false; _autoRetried = false; _startNote = '';
-        loadVariants(ctx.variantUrl || ctx.url, ctx.initialQualityHeight || 0, !!ctx.variantUrl);
+        loadVariants(ctx.variantUrl || ctx.url, ctx.initialQualityHeight || 0, !!ctx.variantUrl, ctx._headers);
     }
     // Playback started: a switch is done; say where a fallback landed.
     function qualityOnStart() {
@@ -38,6 +38,8 @@
     function qualityHeight() { var v = variantByBw(_qualityBw); return v ? v.h : 0; }
     function qualityCount() { return _variants.length; }
     function hasQualities() { return _variants.length > 1; }
+    var _unread = false;   // an HLS stream whose quality list couldn't be read
+    function qualityUnread() { return _unread && !_variants.length; }
 
     // Auto lets AVPlay adapt to bandwidth; an explicit pick caps the ladder via ADAPTIVE_INFO.
     // Two cap strategies, because YouTube-style HLS breaks the usual one:
@@ -187,8 +189,11 @@
         var u = '' + (url || ''), path = u.split('#')[0].split('?')[0], query = u.split('#')[0].split('?')[1] || '';
         return /\.m3u8$/i.test(path) || /(^|&)(type|format|ext|output)=m3u8(&|$)/i.test(query);
     }
-    function getHlsMaster(url) {
-        return U.getText(url, 8000, HLS_MASTER_MAX).then(function (text) {
+    // h: the stream's own User-Agent / Referer ({ ua, ref }): the list is then read through
+    // StremioK's service, which can send them (as the TV's player does); a web page can't.
+    function getHlsMaster(url, h) {
+        var viaService = !!(h && (h.ua || h.ref) && typeof YTPlay !== 'undefined' && YTPlay.hlsMaster && YTPlay.installMode && YTPlay.installMode() !== 'browser');
+        return (viaService ? YTPlay.hlsMaster(url, h) : U.getText(url, 8000, HLS_MASTER_MAX)).then(function (text) {
             var t = ('' + (text || '')).replace(/^\uFEFF/, '').replace(/^\s+/, '');
             if (t.indexOf('#EXTM3U') !== 0) { throw new Error('not an HLS playlist'); }
             return t;
@@ -205,12 +210,13 @@
         CLASSES.forEach(function (c) { if (Math.abs(c - t) <= c * 0.06) { best = c; } });
         return best;
     }
-    function loadVariants(url, initialHeight, isMaster) {
+    function loadVariants(url, initialHeight, isMaster, headers) {
         var tok = ++_variantsToken;   // a list arriving after you've moved on is for the old stream
         _variants = [];
         _sepAudio = false;
+        _unread = false;
         if (!url || !(isMaster || isHlsUrl(url))) { return; }
-        getHlsMaster(url).then(function (text) {
+        getHlsMaster(url, headers).then(function (text) {
             if (tok !== _variantsToken) { return; }
             var t = '' + text;
             _sepAudio = t.indexOf('#EXT-X-MEDIA:TYPE=AUDIO') !== -1 || /#EXT-X-STREAM-INF[^\r\n]*[,:]AUDIO=/.test(t);
@@ -239,7 +245,9 @@
                     }
                 }
             }
-        }, function () { if (tok === _variantsToken) { _variants = []; _sepAudio = false; } });
+        }, function (e) {   // (couldn't be read: said so, not "one quality"; an answer that isn't a playlist at all: no list, as before)
+            if (tok === _variantsToken) { _variants = []; _sepAudio = false; _unread = !/not an HLS playlist/.test((e && e.message) || ''); }
+        });
     }
 
     // Switch to a different source mid-playback, keeping position (VOD): a playback of its
@@ -312,7 +320,7 @@
 
     // ----- for the other parts (and js/player.js) -----
     P.resetQuality = resetQuality; P.qualityOnStart = qualityOnStart; P.clearStartNote = clearStartNote;
-    P.qualityHeight = qualityHeight; P.qualityCount = qualityCount; P.hasQualities = hasQualities;
+    P.qualityHeight = qualityHeight; P.qualityCount = qualityCount; P.hasQualities = hasQualities; P.qualityUnread = qualityUnread;
     P.adaptiveInfo = adaptiveInfo; P.tryFallback = tryFallback; P.switchSource = switchSource;
     P.qualityLabel = qualityLabel; P.qualityMenu = qualityMenu;
     P.hasYtLanguages = hasYtLanguages; P.ytLanguageLabel = ytLanguageLabel; P.ytLanguageMenu = ytLanguageMenu;