nuvio-tizen 1.0.0 → 1.2.0

package/README.md

@@ -9,17 +9,29 @@ core behaviour, targeting 2017 Samsung TVs (Tizen 3.0, ~Chromium 47).
 > metadata and streams) but is written as plain, old-Chromium-safe HTML/JS/CSS with
 > Samsung's **AVPlay** API for video.
 
-## What works (v1)
+## What works
 
-- Loads user-configured **Stremio addons** (defaults to Cinemeta for catalogs + metadata).
+- Loads user-configured **Stremio addons**. Fresh-install defaults:
+  **Cinemeta** (catalogs + metadata), **WatchHub** (streams), **OpenSubtitles v3** (subtitles).
 - Home screen with catalog rows + **Continue Watching**.
+- **Search** (🔍 in the header) across every addon catalog that supports the `search` extra.
 - Detail pages: movies (Play) and series (season/episode browser).
 - **Stream aggregation** across all installed stream addons.
+- **Subtitles from addons**: fetched per title/episode, SRT + VTT parsed and rendered as a
+  timed overlay; press **UP** during playback to pick a track (or turn them Off).
 - Playback via **AVPlay** (HLS/DASH/MP4/progressive) with an HTML5 `<video>` fallback
   when run in a desktop browser for development.
 - OSD with seek (±10s / ±30s), resume, and per-title progress saved to `localStorage`.
 - Full **D-pad + media-key** remote navigation (custom spatial focus engine).
-- Settings screen to add/remove addon manifest URLs.
+- Settings screen to add/remove addon manifest URLs (the add field is prefilled with `https://`).
+
+> **Note on WatchHub:** it's a "where to watch" addon — its results are Rent/Buy/Subscription
+> *links to external services*, not direct video URLs, so they show as non-playable. Add your
+> own stream addon(s) that return HTTP/HLS URLs for actual playback.
+
+> **Legacy addons:** this client speaks the **v3** (RESTful JSON) addon protocol only.
+> Old `/stremio/v1` addons (e.g. `opensubtitles.strem.io/stremio/v1`) are **not** supported —
+> use their v3 equivalents.
 
 ## Content / legal note
 
@@ -101,7 +113,9 @@ No `async`/`await`, no ES6 classes, no destructuring, no default params, no obje
 - **Untested on the physical TV** — AVPlay quirks (some HLS variants, DRM) will need
   device iteration. Start with the desktop `<video>` smoke test, then a known-good HTTP
   MP4/HLS stream addon on the set.
-- No Trakt sync, no search UI, no subtitles yet (Stremio subtitle resource + AVPlay
-  `setSubtitleFile` is the next addition).
-- On-screen keyboard for adding addons relies on the TV IME focusing the `<input>`.
+- No Trakt sync yet.
+- Subtitles render as an **HTML overlay** (works across AVPlay + the HTML5 fallback and
+  avoids AVPlay's local-file requirement). Gzipped (`.gz`) subtitle URLs aren't decoded;
+  most addons (incl. OpenSubtitles v3) serve plain UTF-8 SRT, which works.
+- On-screen keyboard for search / adding addons relies on the TV IME focusing the `<input>`.
 - Catalog pagination ("load more") not yet wired (fetches first page only).

package/css/style.css

@@ -98,6 +98,36 @@ html, body {
 #osd-times { display: flex; justify-content: space-between; margin-top: 10px; font-size: 20px; color: #cfd3dc; }
 #osd-hint { margin-top: 14px; font-size: 18px; color: #8b93a5; }
 
+/* --- Subtitles --- */
+#subs { position: absolute; left: 0; right: 0; bottom: 130px; z-index: 18; text-align: center; padding: 0 140px; }
+#subs span { display: inline-block; background: rgba(0,0,0,0.6); color: #fff; font-size: 36px; line-height: 1.4; padding: 4px 16px; border-radius: 6px; white-space: pre-wrap; text-shadow: 0 2px 3px #000; }
+
+#sub-menu { position: absolute; right: 60px; bottom: 250px; width: 560px; max-height: 620px; overflow: hidden; z-index: 30; background: rgba(20,25,36,0.98); border-radius: 12px; padding: 18px; }
+#sub-menu .sm-title { font-size: 24px; font-weight: bold; margin-bottom: 12px; color: #c7cbd4; }
+#sub-menu .sm-list { max-height: 520px; overflow: hidden; }
+#sub-menu .sm-item { padding: 12px 16px; font-size: 22px; border-radius: 8px; border: 3px solid transparent; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+#sub-menu .sm-item.sel { background: #818cf8; color: #0e1117; }
+
+/* --- Search --- */
+.search-wrap { position: absolute; top: 120px; left: 60px; right: 60px; bottom: 40px; }
+.search-bar { display: flex; margin-bottom: 26px; }
+#search-input { flex: 1; padding: 16px 20px; font-size: 26px; background: #0e1117; color: #fff; border: 4px solid #2a3346; border-radius: 8px; }
+#search-input.focused { border-color: #818cf8; }
+.search-go { margin-left: 16px; }
+.search-results { position: absolute; top: 96px; left: 0; right: 0; bottom: 0; overflow: hidden; white-space: normal; }
+.search-results .card { margin: 0 22px 24px 0; }
+.search-empty { font-size: 24px; color: #8b93a5; margin-top: 30px; }
+
+/* --- Confirm modal --- */
+.modal-overlay { position: absolute; top: 0; left: 0; width: 1920px; height: 1080px; z-index: 45; background: rgba(0,0,0,0.72); display: flex; align-items: center; justify-content: center; }
+.modal-box { width: 820px; background: #161b26; border: 2px solid #2a3346; border-radius: 16px; padding: 44px 48px; text-align: center; }
+.modal-msg { font-size: 30px; line-height: 1.4; color: #e6e9ef; margin-bottom: 36px; }
+.modal-row { display: flex; justify-content: center; }
+.modal-btn { min-width: 200px; text-align: center; }
+.pill.danger { background: #3a2130; }
+.pill.danger.focusable.focused { background: #ef4444; color: #fff; }
+.reset-item .a-name { color: #f0a5a5; }
+
 /* --- Toast + spinner --- */
 #toast { position: absolute; bottom: 60px; left: 50%; margin-left: -300px; width: 600px; text-align: center; z-index: 40; background: rgba(0,0,0,0.85); padding: 18px 24px; border-radius: 10px; font-size: 22px; }
 #spinner { position: absolute; top: 0; left: 0; width: 1920px; height: 1080px; z-index: 50; display: flex; align-items: center; justify-content: center; background: rgba(0,0,0,0.3); }

package/index.html

@@ -15,9 +15,13 @@
     <div id="app">
         <div id="screen-home" class="screen"></div>
         <div id="screen-detail" class="screen hidden"></div>
+        <div id="screen-search" class="screen hidden"></div>
         <div id="screen-settings" class="screen hidden"></div>
     </div>
 
+    <!-- Subtitle overlay (over the video plane, under the OSD) -->
+    <div id="subs" class="hidden"></div>
+
     <!-- Player OSD overlay (over the video plane) -->
     <div id="player-osd" class="hidden">
         <div id="osd-title"></div>
@@ -26,6 +30,9 @@
         <div id="osd-hint">OK: Play/Pause &nbsp; &larr;/&rarr;: Seek &nbsp; RETURN: Back</div>
     </div>
 
+    <!-- Subtitle track picker (opened with UP during playback) -->
+    <div id="sub-menu" class="hidden"></div>
+
     <div id="toast" class="hidden"></div>
     <div id="spinner" class="hidden"><div class="spin"></div></div>
 

package/js/app.js

@@ -8,7 +8,7 @@ var App = (function () {
     function screenEl(name) { return U.byId('screen-' + name); }
 
     function showScreen(name) {
-        ['home', 'detail', 'settings'].forEach(function (n) {
+        ['home', 'detail', 'search', 'settings'].forEach(function (n) {
             screenEl(n).className = 'screen' + (n === name ? '' : ' hidden');
         });
         _current = name;
@@ -29,8 +29,15 @@ var App = (function () {
         Views.renderSettings();
     }
 
+    function openSearch() {
+        pushFrame();
+        showScreen('search');
+        Views.renderSearch();
+    }
+
     function back() {
         if (Player.isActive()) { Player.exit(); return; }
+        if (Views.isModalOpen()) { Views.closeModal(); return; }
         if (_current === 'detail' && Views.backInDetail()) { return; }
         var f = _stack.pop();
         if (!f) { tryExitApp(); return; }
@@ -71,7 +78,7 @@ var App = (function () {
 
     return {
         start: start, back: back,
-        openDetail: openDetail, openSettings: openSettings
+        openDetail: openDetail, openSettings: openSettings, openSearch: openSearch
     };
 })();
 

package/js/player.js

@@ -10,6 +10,8 @@ var Player = (function () {
 
     var videoEl = null;      // html5 fallback
     var objEl = null;
+    var subsEl = null;
+    var subMenuEl = null;
 
     var _active = false;
     var _onExit = null;
@@ -20,9 +22,19 @@ var Player = (function () {
     var _osdTimer = null;
     var _seekPending = 0;
 
+    // subtitles
+    var _subTracks = [];     // [{lang,url,_addon}]
+    var _cues = null;        // [{start,end,text}]
+    var _subOn = false;
+    var _subLabel = '';
+    var _menuOpen = false;
+    var _menuIdx = 0;
+
     function init() {
         objEl = U.byId('av-player');
         videoEl = U.byId('html5-player');
+        subsEl = U.byId('subs');
+        subMenuEl = U.byId('sub-menu');
     }
 
     function isActive() { return _active; }
@@ -79,12 +91,34 @@ var Player = (function () {
         _active = true; _cur = 0; _dur = 0;
         _ctx.resumeSec = ctx.resumeSec || getResume(ctx.type, ctx.id);
 
+        // reset subtitle state
+        _subTracks = []; _cues = null; _subOn = false; _subLabel = '';
+        _menuOpen = false; _menuIdx = 0;
+        subsEl.className = 'hidden'; U.clear(subsEl);
+        subMenuEl.className = 'hidden';
+        updateHint();
+
         U.byId('app').className = 'hidden';
         document.body.style.background = 'transparent';
         showOSD(true);
         U.spinner(true);
 
         if (useAV) { startAV(ctx.url); } else { startHTML5(ctx.url); }
+
+        // Fetch subtitle tracks in parallel; enables the UP menu when ready.
+        Stremio.getSubtitles(ctx.type, ctx.id).then(function (tracks) {
+            if (!_active) { return; }
+            _subTracks = tracks || [];
+            updateHint();
+            if (_subTracks.length) { U.toast(_subTracks.length + ' subtitle track(s) — press UP', 3000); }
+        }, function () {});
+    }
+
+    function updateHint() {
+        var base = 'OK: Play/Pause   ←/→: Seek   RETURN: Back';
+        if (_subTracks.length) { base += '   UP: Subtitles'; }
+        var h = U.byId('osd-hint');
+        if (h) { h.textContent = base; }
     }
 
     function startAV(url) {
@@ -98,7 +132,7 @@ var Player = (function () {
                 onbufferingstart: function () { U.spinner(true); },
                 onbufferingcomplete: function () { U.spinner(false); },
                 onstreamcompleted: function () { _cur = _dur; onEnded(); },
-                oncurrentplaytime: function (ms) { _cur = ms / 1000; renderOSD(); },
+                oncurrentplaytime: function (ms) { _cur = ms / 1000; renderOSD(); renderSubs(); },
                 onerror: function (err) { U.spinner(false); U.toast('Playback error: ' + err); setTimeout(exit, 1500); }
             });
             try { avplay.setStreamingProperty('ADAPTIVE_INFO', 'BITRATES=1'); } catch (e0) {}
@@ -128,7 +162,7 @@ var Player = (function () {
             if (_ctx.resumeSec > 5) { try { videoEl.currentTime = _ctx.resumeSec; } catch (e) {} }
             U.spinner(false); showOSD(false);
         };
-        videoEl.ontimeupdate = function () { _cur = videoEl.currentTime; renderOSD(); };
+        videoEl.ontimeupdate = function () { _cur = videoEl.currentTime; renderOSD(); renderSubs(); };
         videoEl.onended = onEnded;
         videoEl.onerror = function () { U.toast('Playback error'); setTimeout(exit, 1500); };
         var p = videoEl.play();
@@ -139,7 +173,7 @@ var Player = (function () {
     function startTicker() {
         if (_ticker) { clearInterval(_ticker); }
         _ticker = setInterval(function () {
-            if (useAV) { try { _cur = avplay.getCurrentTime() / 1000; } catch (e) {} renderOSD(); }
+            if (useAV) { try { _cur = avplay.getCurrentTime() / 1000; } catch (e) {} renderOSD(); renderSubs(); }
             saveProgress();
         }, 5000);
     }
@@ -174,7 +208,117 @@ var Player = (function () {
         }
     }
 
+    // ---------- subtitles ----------
+    // Parses SRT or VTT (both use HH:MM:SS,mmm / HH:MM:SS.mmm timing lines).
+    function parseCues(text) {
+        text = ('' + text).replace(/\r/g, '');
+        var blocks = text.split(/\n\n+/);
+        var cues = [];
+        var re = /(\d{1,2}):(\d{2}):(\d{2})[,.](\d{1,3})\s*-->\s*(\d{1,2}):(\d{2}):(\d{2})[,.](\d{1,3})/;
+        for (var i = 0; i < blocks.length; i++) {
+            var lines = blocks[i].split('\n');
+            var ti = -1;
+            for (var j = 0; j < lines.length; j++) { if (lines[j].indexOf('-->') !== -1) { ti = j; break; } }
+            if (ti === -1) { continue; }
+            var m = lines[ti].match(re);
+            if (!m) { continue; }
+            var start = (+m[1]) * 3600 + (+m[2]) * 60 + (+m[3]) + (+m[4]) / 1000;
+            var end = (+m[5]) * 3600 + (+m[6]) * 60 + (+m[7]) + (+m[8]) / 1000;
+            var txt = lines.slice(ti + 1).join('\n').replace(/<[^>]+>/g, '').replace(/\{[^}]+\}/g, '');
+            if (txt) { cues.push({ start: start, end: end, text: txt }); }
+        }
+        cues.sort(function (a, b) { return a.start - b.start; });
+        return cues;
+    }
+
+    function renderSubs() {
+        if (!_subOn || !_cues) { return; }
+        var t = _cur;
+        var show = '';
+        // linear scan; cue counts are small enough for a TV
+        for (var i = 0; i < _cues.length; i++) {
+            if (_cues[i].start <= t && t <= _cues[i].end) { show = _cues[i].text; break; }
+            if (_cues[i].start > t) { break; }
+        }
+        if (show) {
+            subsEl.className = '';
+            var span = subsEl.firstChild;
+            if (!span) { span = document.createElement('span'); subsEl.appendChild(span); }
+            if (span.textContent !== show) { span.textContent = show; }
+        } else {
+            subsEl.className = 'hidden';
+        }
+    }
+
+    function loadTrack(track) {
+        U.toast('Loading subtitles…', 1500);
+        U.getText(track.url, 15000).then(function (text) {
+            var cues = parseCues(text);
+            if (!cues.length) { U.toast('Could not parse subtitles'); return; }
+            _cues = cues; _subOn = true; _subLabel = track.lang || 'on';
+            renderSubs();
+            U.toast('Subtitles: ' + (track.lang || 'on'));
+        }, function () { U.toast('Failed to download subtitles'); });
+    }
+
+    function subsOff() {
+        _subOn = false; _cues = null; _subLabel = '';
+        subsEl.className = 'hidden'; U.clear(subsEl);
+    }
+
+    // ---------- subtitle menu ----------
+    function openSubMenu() {
+        if (!_subTracks.length) { return; }
+        _menuOpen = true;
+        // index 0 = Off; tracks start at 1
+        _menuIdx = 0;
+        renderSubMenu();
+        subMenuEl.className = '';
+        showOSD(true);
+    }
+
+    function closeSubMenu() {
+        _menuOpen = false;
+        subMenuEl.className = 'hidden';
+        showOSD(false);
+    }
+
+    function renderSubMenu() {
+        U.clear(subMenuEl);
+        subMenuEl.appendChild(U.el('div', 'sm-title', 'Subtitles'));
+        var list = U.el('div', 'sm-list');
+        var items = [{ label: 'Off' + (_subOn ? '' : '  ✓'), track: null }];
+        _subTracks.forEach(function (tr) {
+            var mark = (_subOn && _subLabel === (tr.lang || 'on')) ? '  ✓' : '';
+            items.push({ label: (tr.lang || 'unknown') + '  ·  ' + (tr._addon || '') + mark, track: tr });
+        });
+        _menuItems = items;
+        items.forEach(function (it, i) {
+            var node = U.el('div', 'sm-item' + (i === _menuIdx ? ' sel' : ''), it.label);
+            list.appendChild(node);
+        });
+        subMenuEl.appendChild(list);
+        // keep selected item visible
+        var sel = list.children[_menuIdx];
+        if (sel && sel.scrollIntoView) { try { sel.scrollIntoView(false); } catch (e) {} }
+    }
+
+    var _menuItems = [];
+
+    function menuKey(action) {
+        if (action === 'UP') { _menuIdx = Math.max(0, _menuIdx - 1); renderSubMenu(); return; }
+        if (action === 'DOWN') { _menuIdx = Math.min(_menuItems.length - 1, _menuIdx + 1); renderSubMenu(); return; }
+        if (action === 'OK') {
+            var it = _menuItems[_menuIdx];
+            if (!it || it.track === null) { subsOff(); } else { loadTrack(it.track); }
+            closeSubMenu();
+            return;
+        }
+        if (action === 'BACK' || action === 'STOP') { closeSubMenu(); return; }
+    }
+
     function handleKey(action) {
+        if (_menuOpen) { menuKey(action); return true; }
         showOSD(false);
         switch (action) {
             case 'OK': case 'PLAYPAUSE': togglePlay(); return true;
@@ -182,7 +326,8 @@ var Player = (function () {
             case 'PAUSE': if (useAV) { try { avplay.pause(); } catch (e) {} } else { videoEl.pause(); } return true;
             case 'RIGHT': case 'FF': seekBy(action === 'FF' ? 30 : 10); return true;
             case 'LEFT': case 'REW': seekBy(action === 'REW' ? -30 : -10); return true;
-            case 'UP': case 'DOWN': showOSD(false); return true;
+            case 'UP': if (_subTracks.length) { openSubMenu(); } return true;
+            case 'DOWN': showOSD(false); return true;
             case 'STOP': case 'BACK': exit(); return true;
         }
         return true;
@@ -195,6 +340,9 @@ var Player = (function () {
         if (_ticker) { clearInterval(_ticker); _ticker = null; }
         if (_osdTimer) { clearTimeout(_osdTimer); _osdTimer = null; }
         hideOSD();
+        subsEl.className = 'hidden'; U.clear(subsEl);
+        subMenuEl.className = 'hidden'; _menuOpen = false;
+        _subOn = false; _cues = null; _subTracks = [];
         if (useAV) {
             try { avplay.stop(); } catch (e) {}
             try { avplay.close(); } catch (e2) {}

package/js/stremio.js

@@ -6,9 +6,14 @@ var Stremio = (function () {
 
     var ADDONS_KEY = 'nuvio.addons';
 
-    // Default: Cinemeta (official catalog + metadata addon). Stream addons are
-    // added by the user in Settings — this app hosts no content itself.
-    var DEFAULT_ADDONS = ['https://v3-cinemeta.strem.io/manifest.json'];
+    // Defaults for a fresh install. Cinemeta = catalogs + metadata,
+    // WatchHub = streams, OpenSubtitles v3 = subtitles. The user can add/remove
+    // more in Settings; this app hosts no content itself.
+    var DEFAULT_ADDONS = [
+        'https://v3-cinemeta.strem.io/manifest.json',
+        'https://watchhub.strem.io/manifest.json',
+        'https://opensubtitles-v3.strem.io/manifest.json'
+    ];
 
     function normalizeManifestUrl(input) {
         var u = ('' + input).trim();
@@ -46,6 +51,12 @@ var Stremio = (function () {
         _loaded = null;
     }
 
+    // Clears the stored list so the fresh-install DEFAULT_ADDONS apply again.
+    function resetAddons() {
+        U.store.remove(ADDONS_KEY);
+        _loaded = null;
+    }
+
     // ---- Manifest loading (cached in-memory per session) ----
     var _loaded = null;
 
@@ -177,6 +188,79 @@ var Stremio = (function () {
         });
     }
 
+    // ---- Subtitles ----
+    // Aggregates subtitle tracks from every addon that supports (type,id).
+    function getSubtitles(type, id) {
+        return loadAddons().then(function (addons) {
+            var providers = addons.filter(function (a) { return supports(a, 'subtitles', type, id); });
+            var tasks = providers.map(function (a) {
+                return function () {
+                    var url = a.base + '/subtitles/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '.json';
+                    return U.getJSON(url, 12000).then(function (res) {
+                        var arr = (res && res.subtitles) ? res.subtitles : [];
+                        arr.forEach(function (s) { s._addon = a.manifest.name || 'Addon'; });
+                        return arr;
+                    });
+                };
+            });
+            return U.settleAll(tasks, 4).then(function (results) {
+                var seen = {}, out = [];
+                results.forEach(function (r) {
+                    if (!r.ok) { return; }
+                    r.value.forEach(function (s) {
+                        if (!s || !s.url || seen[s.url]) { return; }
+                        seen[s.url] = 1;
+                        out.push(s);
+                    });
+                });
+                out.sort(function (a, b) { return ('' + (a.lang || '')).localeCompare('' + (b.lang || '')); });
+                return out;
+            });
+        });
+    }
+
+    // ---- Search ----
+    // Catalogs (across addons) that declare support for the "search" extra.
+    function getSearchCatalogs() {
+        return loadAddons().then(function (addons) {
+            var out = [];
+            addons.forEach(function (addon) {
+                (addon.manifest.catalogs || []).forEach(function (c) {
+                    if (!c.type || !c.id) { return; }
+                    var searchable = false;
+                    if (c.extra && c.extra.length) {
+                        searchable = c.extra.some(function (e) { return e && e.name === 'search'; });
+                    }
+                    if (!searchable && c.extraSupported) {
+                        searchable = c.extraSupported.indexOf('search') !== -1;
+                    }
+                    if (searchable) { out.push({ addon: addon, type: c.type, id: c.id }); }
+                });
+            });
+            return out;
+        });
+    }
+
+    function search(query) {
+        var q = ('' + query).trim();
+        if (!q) { return Promise.resolve([]); }
+        return getSearchCatalogs().then(function (cats) {
+            var tasks = cats.map(function (cat) {
+                return function () { return getCatalog(cat, { search: q }); };
+            });
+            return U.settleAll(tasks, 4).then(function (results) {
+                var seen = {}, out = [];
+                results.forEach(function (r) {
+                    if (!r.ok) { return; }
+                    r.value.forEach(function (m) {
+                        if (m && m.id && !seen[m.id]) { seen[m.id] = 1; out.push(m); }
+                    });
+                });
+                return out;
+            });
+        });
+    }
+
     // A stream is directly playable on the TV only if it exposes an http(s) URL.
     // Torrent (infoHash) / external-only streams need an engine this app doesn't embed.
     function isPlayable(stream) {
@@ -190,9 +274,10 @@ var Stremio = (function () {
 
     return {
         DEFAULT_ADDONS: DEFAULT_ADDONS,
-        getAddonUrls: getAddonUrls, addAddon: addAddon, removeAddon: removeAddon,
+        getAddonUrls: getAddonUrls, addAddon: addAddon, removeAddon: removeAddon, resetAddons: resetAddons,
         loadAddons: loadAddons, listCatalogs: listCatalogs, getCatalog: getCatalog,
-        getMeta: getMeta, getStreams: getStreams,
+        getMeta: getMeta, getStreams: getStreams, getSubtitles: getSubtitles,
+        getSearchCatalogs: getSearchCatalogs, search: search,
         isPlayable: isPlayable, streamLabel: streamLabel
     };
 })();

package/js/util.js

@@ -36,6 +36,25 @@ var U = (function () {
         });
     }
 
+    /* GET raw text via XHR with timeout. Returns a Promise. */
+    function getText(url, timeoutMs) {
+        return new Promise(function (resolve, reject) {
+            var xhr = new XMLHttpRequest();
+            var done = false;
+            try { xhr.open('GET', url, true); } catch (e) { reject(e); return; }
+            xhr.timeout = timeoutMs || 15000;
+            xhr.onreadystatechange = function () {
+                if (xhr.readyState !== 4 || done) { return; }
+                done = true;
+                if (xhr.status >= 200 && xhr.status < 300) { resolve(xhr.responseText); }
+                else { reject(new Error('HTTP ' + xhr.status + ' for ' + url)); }
+            };
+            xhr.ontimeout = function () { if (!done) { done = true; reject(new Error('Timeout: ' + url)); } };
+            xhr.onerror = function () { if (!done) { done = true; reject(new Error('Network error: ' + url)); } };
+            try { xhr.send(); } catch (e3) { reject(e3); }
+        });
+    }
+
     /* localStorage JSON helpers, all guarded (storage can throw / be unavailable). */
     var store = {
         get: function (key, fallback) {
@@ -103,7 +122,7 @@ var U = (function () {
     }
 
     return {
-        byId: byId, el: el, clear: clear, getJSON: getJSON,
+        byId: byId, el: el, clear: clear, getJSON: getJSON, getText: getText,
         store: store, toast: toast, spinner: spinner,
         fmtTime: fmtTime, settleAll: settleAll
     };

package/js/views.js

@@ -5,13 +5,65 @@ var Views = (function () {
 
     function scr(name) { return U.byId('screen-' + name); }
 
+    // ---------- confirm modal (D-pad friendly) ----------
+    var _modalOpen = false;
+    var _modalPrevFocus = null;
+    var _modalScope = null;
+
+    function confirm(message, confirmLabel, onYes) {
+        // defensive: never stack modals
+        var existing = document.querySelector('.modal-overlay');
+        if (existing) { existing.parentNode.removeChild(existing); }
+        var overlay = U.el('div', 'modal-overlay');
+        var box = U.el('div', 'modal-box');
+        box.appendChild(U.el('div', 'modal-msg', message));
+        var row = U.el('div', 'modal-row');
+        var no = U.el('div', 'pill focusable modal-btn', 'Cancel');
+        var yes = U.el('div', 'pill focusable modal-btn danger', confirmLabel || 'Confirm');
+        no.__onselect = function () { closeModal(); };
+        yes.__onselect = function () { closeModal(); onYes(); };
+        row.appendChild(no);
+        row.appendChild(yes);
+        box.appendChild(row);
+        overlay.appendChild(box);
+        document.body.appendChild(overlay);
+
+        _modalPrevFocus = Focus.current();
+        _modalScope = _current();          // remember which screen is under the modal
+        _modalOpen = true;
+        Focus.setScope(overlay, no);       // default to Cancel (safe)
+    }
+
+    function closeModal() {
+        var o = document.querySelector('.modal-overlay');
+        if (o) { document.body.removeChild(o); }
+        _modalOpen = false;
+        if (_modalScope) { Focus.setScope(_modalScope, _modalPrevFocus); }
+        _modalScope = null; _modalPrevFocus = null;
+    }
+
+    function _current() {
+        var names = ['home', 'detail', 'search', 'settings'];
+        for (var i = 0; i < names.length; i++) {
+            var e = scr(names[i]);
+            if (e && e.className.indexOf('hidden') === -1) { return e; }
+        }
+        return scr('settings');
+    }
+
     // ---------- shared bits ----------
-    function header(withGear) {
+    function header(withGear, withSearch) {
         var h = U.el('div', 'header');
         var brand = U.el('div', 'brand');
         brand.innerHTML = 'NUVIO<span class="dot">.</span>';
         h.appendChild(brand);
         h.appendChild(U.el('div', 'spacer'));
+        if (withSearch) {
+            var srch = U.el('div', 'gear focusable', '🔍');
+            srch.style.marginRight = '24px';
+            srch.__onselect = function () { App.openSearch(); };
+            h.appendChild(srch);
+        }
         if (withGear) {
             var g = U.el('div', 'gear focusable', '⚙');
             g.__onselect = function () { App.openSettings(); };
@@ -40,7 +92,7 @@ var Views = (function () {
     function renderHome() {
         var s = scr('home');
         U.clear(s);
-        s.appendChild(header(true));
+        s.appendChild(header(true, true));
         var rows = U.el('div', 'rows');
         s.appendChild(rows);
 
@@ -252,7 +304,13 @@ var Views = (function () {
             var playable = Stremio.isPlayable(stream);
             var node = U.el('div', 'stream focusable');
             node.appendChild(document.createTextNode(Stremio.streamLabel(stream)));
-            var sub = (stream._addon || '') + (playable ? '' : '  —  needs torrent/debrid client (not supported)');
+            var why = '';
+            if (!playable) {
+                if (stream.infoHash) { why = '  —  torrent, needs a debrid/torrent client'; }
+                else if (stream.externalUrl) { why = '  —  opens in an external app (not playable here)'; }
+                else { why = '  —  not directly playable on the TV'; }
+            }
+            var sub = (stream._addon || '') + why;
             node.appendChild(U.el('span', 's-sub', sub));
             if (!playable) { node.style.opacity = '0.55'; }
             node.__onselect = function () {
@@ -278,6 +336,61 @@ var Views = (function () {
         return false;
     }
 
+    // ================= SEARCH =================
+    function renderSearch() {
+        var s = scr('search');
+        U.clear(s);
+        s.appendChild(header(false, false));
+
+        var wrap = U.el('div', 'search-wrap');
+        var bar = U.el('div', 'search-bar');
+
+        var input = document.createElement('input');
+        input.id = 'search-input';
+        input.type = 'text';
+        input.className = 'focusable';
+        input.placeholder = 'Search movies & series…';
+        input.__onselect = function () { input.focus(); };
+        input.onkeydown = function (ev) { if (ev.keyCode === 13) { runSearch(input.value); } };
+        input.onchange = function () { runSearch(input.value); };
+        bar.appendChild(input);
+
+        var go = U.el('div', 'pill focusable search-go', 'Search');
+        go.__onselect = function () { runSearch(input.value); };
+        bar.appendChild(go);
+        wrap.appendChild(bar);
+
+        var results = U.el('div', 'search-results');
+        results.id = 'search-results';
+        results.appendChild(U.el('div', 'search-empty', 'Type a title and press OK on Search. Results come from every addon catalog that supports search.'));
+        wrap.appendChild(results);
+
+        s.appendChild(wrap);
+        Focus.setScope(s, input);
+    }
+
+    function runSearch(query) {
+        query = ('' + query).trim();
+        var results = U.byId('search-results');
+        if (!query) { return; }
+        U.clear(results);
+        U.spinner(true);
+        Stremio.search(query).then(function (metas) {
+            U.spinner(false);
+            U.clear(results);
+            if (!metas.length) {
+                results.appendChild(U.el('div', 'search-empty', 'No results for “' + query + '”.'));
+                return;
+            }
+            metas.slice(0, 60).forEach(function (m) { results.appendChild(posterCard(m, m.type || 'movie')); });
+            Focus.setScope(scr('search'), results.querySelector('.card'));
+        }, function () {
+            U.spinner(false);
+            U.clear(results);
+            results.appendChild(U.el('div', 'search-empty', 'Search failed. Check your network.'));
+        });
+    }
+
     // ================= SETTINGS =================
     function renderSettings() {
         var s = scr('settings');
@@ -293,27 +406,49 @@ var Views = (function () {
                 var item = U.el('div', 'addon-item focusable');
                 item.appendChild(U.el('div', 'a-name', loaded ? (loaded.manifest.name || 'Addon') : '(failed to load)'));
                 item.appendChild(U.el('div', 'a-url', url));
+                var name = loaded ? (loaded.manifest.name || 'Addon') : 'this addon';
                 item.__onselect = function () {
-                    U.toast('Removed. Reopening…');
-                    Stremio.removeAddon(url);
-                    setTimeout(renderSettings, 500);
+                    confirm('Remove "' + name + '"?', 'Remove', function () {
+                        Stremio.removeAddon(url);
+                        U.toast('Removed');
+                        setTimeout(renderSettings, 300);
+                    });
                 };
                 wrap.appendChild(item);
             });
 
+            // Reset to defaults
+            var reset = U.el('div', 'addon-item focusable reset-item');
+            reset.appendChild(U.el('div', 'a-name', '↺  Reset to default addons'));
+            reset.appendChild(U.el('div', 'a-url', 'Removes all addons and restores Cinemeta, WatchHub, OpenSubtitles v3'));
+            reset.__onselect = function () {
+                confirm('Reset to default addons? This removes all addons you’ve added.', 'Reset', function () {
+                    Stremio.resetAddons();
+                    U.toast('Addons reset to default');
+                    setTimeout(renderSettings, 300);
+                });
+            };
+            wrap.appendChild(reset);
+
             // Add-addon input
             var addRow = U.el('div', 'addon-item focusable');
             addRow.appendChild(U.el('div', 'a-name', '+ Add addon (focus, then type a manifest URL)'));
             var input = document.createElement('input');
             input.type = 'text';
+            input.value = 'https://';
             input.placeholder = 'https://addon.example/manifest.json';
             input.style.cssText = 'width:100%;margin-top:10px;padding:12px;font-size:20px;background:#0e1117;color:#fff;border:2px solid #2a3346;border-radius:6px;';
             input.onchange = function () {
-                var v = input.value;
-                if (v) { Stremio.addAddon(v); U.toast('Addon added'); setTimeout(renderSettings, 500); }
+                var v = ('' + input.value).trim();
+                if (v && v !== 'https://') { Stremio.addAddon(v); U.toast('Addon added'); setTimeout(renderSettings, 500); }
             };
             addRow.appendChild(input);
-            addRow.__onselect = function () { input.focus(); };
+            addRow.__onselect = function () {
+                input.focus();
+                // place cursor at the end so the user types after https://
+                var n = input.value.length;
+                try { input.setSelectionRange(n, n); } catch (e) {}
+            };
             wrap.appendChild(addRow);
 
             wrap.appendChild(U.el('div', 'hint',
@@ -325,6 +460,7 @@ var Views = (function () {
 
     return {
         renderHome: renderHome, renderDetail: renderDetail, renderSettings: renderSettings,
-        backInDetail: backInDetail
+        renderSearch: renderSearch, backInDetail: backInDetail,
+        isModalOpen: function () { return _modalOpen; }, closeModal: closeModal
     };
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuvio-tizen",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Nuvio-style Stremio-addon streaming client for Tizen 3.0+ Samsung TVs (TizenBrew app module).",
   "packageType": "app",
   "appName": "Nuvio",