npm - nuvio-tizen - Versions diffs - 1.9.5 → 1.9.7 - Mend

nuvio-tizen 1.9.5 → 1.9.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/config.xml CHANGED Viewed

@@ -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://nuvio.tizen/NuvioTizen" version="1.9.5" viewmodes="maximized">
+        id="http://nuvio.tizen/NuvioTizen" version="1.9.7" viewmodes="maximized">
     <tizen:application id="Nuvio00001.Nuvio" package="Nuvio00001" required_version="3.0"/>
     <content src="index.html"/>
     <feature name="http://tizen.org/feature/screen.size.all"/>

package/index.html CHANGED Viewed

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=1920, height=1080, user-scalable=no">
     <title>Nuvio</title>
-    <link rel="stylesheet" href="css/style.css?v=1.9.5">
+    <link rel="stylesheet" href="css/style.css?v=1.9.7">
 </head>
 <body>
     <!-- CSS-applied sentinel (kept off-screen); app.js waits for its width before rendering -->
@@ -50,15 +50,15 @@
     <!-- Load order matters: polyfills -> util -> iptv -> data -> input -> player -> ytplay -> views -> app -->
     <!-- ?v= busts the TV webview cache on every release (keep in sync with package.json) -->
-    <script src="js/polyfills.js?v=1.9.5"></script>
-    <script src="js/util.js?v=1.9.5"></script>
-    <script src="js/iptv.js?v=1.9.5"></script>
-    <script src="js/stremio.js?v=1.9.5"></script>
-    <script src="js/keys.js?v=1.9.5"></script>
-    <script src="js/focus.js?v=1.9.5"></script>
-    <script src="js/player.js?v=1.9.5"></script>
-    <script src="js/ytplay.js?v=1.9.5"></script>
-    <script src="js/views.js?v=1.9.5"></script>
-    <script src="js/app.js?v=1.9.5"></script>
+    <script src="js/polyfills.js?v=1.9.7"></script>
+    <script src="js/util.js?v=1.9.7"></script>
+    <script src="js/iptv.js?v=1.9.7"></script>
+    <script src="js/stremio.js?v=1.9.7"></script>
+    <script src="js/keys.js?v=1.9.7"></script>
+    <script src="js/focus.js?v=1.9.7"></script>
+    <script src="js/player.js?v=1.9.7"></script>
+    <script src="js/ytplay.js?v=1.9.7"></script>
+    <script src="js/views.js?v=1.9.7"></script>
+    <script src="js/app.js?v=1.9.7"></script>
 </body>
 </html>

package/js/app.js CHANGED Viewed

@@ -4,6 +4,7 @@ var App = (function () {
     var _current = 'home';
     var _stack = [];   // frames: { screen, focus }
+    var _lastBackAt = 0;   // debounce BACK across keydown + tizenhwkey
     function screenEl(name) { return U.byId('screen-' + name); }
@@ -58,6 +59,7 @@ var App = (function () {
     }
     function back() {
+        if (typeof YTPlay !== 'undefined' && YTPlay.isOpen && YTPlay.isOpen()) { YTPlay.close(); return; }
         if (Player.isActive()) { Player.exit(); return; }
         if (Views.isModalOpen()) { Views.closeModal(); return; }
         if (_current === 'detail' && Views.backInDetail()) { return; }
@@ -102,7 +104,14 @@ var App = (function () {
                 else { Focus.clickCurrent(); }
                 return true;
             }
-            case 'BACK': back(); return true;
+            case 'BACK': {
+                // keydown(10009) and tizenhwkey can both fire for one press — debounce.
+                var now = Date.now();
+                if (now - _lastBackAt < 400) { return true; }
+                _lastBackAt = now;
+                back();
+                return true;
+            }
             default: return true;
         }
     }

package/js/keys.js CHANGED Viewed

@@ -67,10 +67,19 @@ var Keys = (function () {
         dispatch(held >= LONG_MS ? 'OK_LONG' : 'OK', ev);
     }
+    // Tizen delivers the hardware RETURN/BACK as a 'tizenhwkey' event to the app
+    // document even when a cross-origin iframe (e.g. the YouTube leanback overlay)
+    // holds focus — where a normal keydown never reaches us. Route it through the same
+    // handler and preventDefault so the platform doesn't exit the app behind our back.
+    function onHwKey(ev) {
+        if (ev && ev.keyName === 'back') { dispatch('BACK', ev); }
+    }
     function init() {
         register();
         document.addEventListener('keydown', onKeyDown, false);
         document.addEventListener('keyup', onKeyUp, false);
+        document.addEventListener('tizenhwkey', onHwKey, false);
     }
     return { init: init, setHandler: setHandler, CODE: CODE };

package/js/views.js CHANGED Viewed

@@ -526,6 +526,29 @@ var Views = (function () {
     }
     // ----- streams -----
+    // "Where to watch" / subscription links (Paramount+, Netflix, rent/buy, etc.) are
+    // pushed to the bottom, below directly-playable sources.
+    function isSubscriptionStream(stream) {
+        if (Stremio.isPlayable(stream)) {
+            var t = ('' + (stream.name || '') + ' ' + (stream.title || '') + ' ' + (stream.description || ''));
+            return /\b(subscription|subscribe|rent|buy|purchase)\b|paramount|netflix|disney\+|disney plus|hbo|max\b|hulu|peacock|prime video|apple tv|starz|showtime/i.test(t);
+        }
+        return true;   // non-playable (external "where to watch") always sinks to the bottom
+    }
+    function streamRank(stream) {
+        if (Stremio.isPlayable(stream) && !isSubscriptionStream(stream)) { return 0; }
+        if (Stremio.isPlayable(stream)) { return 1; }
+        return 2;
+    }
+    function sortStreams(list) {
+        return list.map(function (s, i) { return { s: s, i: i }; })
+            .sort(function (a, b) {
+                var ra = streamRank(a.s), rb = streamRank(b.s);
+                return ra !== rb ? ra - rb : a.i - b.i;   // stable within a rank
+            })
+            .map(function (x) { return x.s; });
+    }
     function openStreams(videoId, label) {
         _d.mode = 'streams';
         _d.streamId = videoId;
@@ -534,7 +557,7 @@ var Views = (function () {
         drawDetail();
         U.spinner(true);
         Stremio.getStreams(_d.type, videoId).then(function (list) {
-            _d.streams = list;
+            _d.streams = sortStreams(list);
             U.spinner(false);
             if (_d.mode === 'streams') { drawDetail(); }
         }, function () {
@@ -544,6 +567,11 @@ var Views = (function () {
         });
     }
+    // Re-fetch the current title's sources and land focus on the first result.
+    function rescanStreams() {
+        if (_d && _d.streamId) { openStreams(_d.streamId, _d.streamLabel); }
+    }
     function streamActionsBar() {
         var row = U.el('div', 'btn-row');
         row.appendChild(U.el('div', 'detail-meta', 'Sources for ' + (_d.streamLabel || '')));
@@ -588,6 +616,14 @@ var Views = (function () {
             };
             listScroll.appendChild(node);
         });
+        // Re-scan: refresh the source list (and jump back to the first result).
+        var rescan = U.el('div', 'stream focusable rescan-row');
+        rescan.appendChild(document.createTextNode('↻  Re-scan for sources'));
+        rescan.appendChild(U.el('span', 's-sub', 'Refresh the list from all stream addons'));
+        rescan.__onselect = function () { rescanStreams(); };
+        listScroll.appendChild(rescan);
         panel.appendChild(listScroll);
         return panel;
     }

package/js/ytplay.js CHANGED Viewed

@@ -1,25 +1,23 @@
 /* YouTube leanback playback. Global namespace: YTPlay
-   YouTube-live IPTV channels can't be extracted to a direct URL on-device and
-   youtube.com/tv can't be framed (X-Frame-Options). So we launch a bundled
-   localhost proxy (service/index.js) that serves youtube.com/tv with those
-   headers stripped, and load it in a fullscreen overlay iframe — the same
-   leanback approach TizenTube uses. See service/index.js for the proxy. */
+   YouTube-live IPTV channels can't be extracted to a direct URL on-device. We play
+   them through YouTube's own leanback TV app (youtube.com/tv) behind a bundled
+   localhost proxy (service/index.js) that strips X-Frame-Options/CSP and injects an
+   ad-block userscript — the same approach TizenTube uses.
+   IMPORTANT: leanback must run in the app's MAIN FRAME. On Tizen the platform media
+   APIs (webapis/AVPlay) that leanback needs to actually decode video are injected only
+   into the main frame, never a cross-origin iframe — in an iframe the UI works but the
+   picture stays black and Play does nothing. So we navigate the whole webview to the
+   proxy (like TizenTube standalone) and pass a return URL; the proxy injects a Back
+   handler that navigates back to Nuvio. */
 var YTPlay = (function () {
     'use strict';
     var PROXY = 'http://127.0.0.1:8099';   // 127.0.0.1 (not "localhost") resolves reliably on Tizen
-    var _open = false;
-    var _onExit = null;
     var _idCache = {};              // ytPage -> { id, ts }
     var ID_TTL = 5 * 60 * 1000;     // live video ids rotate; keep short
-    function overlay() { return U.byId('yt-leanback'); }
-    // Resolve once the proxy answers /health. Order:
-    //  1. Probe /health first — covers a warm service (TV) and a dev run of the proxy
-    //     under Node in a desktop browser (`node service/index.js`).
-    //  2. On Tizen, if it's not up, launch the <tizen:service> and poll.
-    //  3. Otherwise (browser, no proxy running) reject with a dev hint.
+    // Resolve once the proxy answers /health; launch the bundled <tizen:service> if needed.
     function ensureService() {
         return new Promise(function (resolve, reject) {
             function poll(left) {
@@ -28,9 +26,7 @@ var YTPlay = (function () {
                     setTimeout(function () { poll(left - 1); }, 500);
                 });
             }
-            // Already running? (warm TV service, or a locally-run proxy in dev)
             U.getText(PROXY + '/health', 1500).then(function () { resolve(); }, function () {
-                // Best-effort launch of the bundled <tizen:service>, then keep polling.
                 var launched = false;
                 try {
                     if (window.tizen && tizen.application && tizen.application.launchAppControl) {
@@ -49,8 +45,7 @@ var YTPlay = (function () {
     }
     // A youtube.com/<channel>/live (or /watch?v=) URL -> the current live video id.
-    // The page is fetched THROUGH the proxy's /cors-bypass so it works both on the TV
-    // and in a desktop dev browser (youtube.com sends no CORS header of its own).
+    // Fetched THROUGH the proxy's /cors-bypass so it works on the TV and in dev.
     function resolveVideoId(page) {
         var direct = ('' + page).match(/[?&]v=([A-Za-z0-9_-]{11})/);
         if (direct) { return Promise.resolve(direct[1]); }
@@ -64,49 +59,7 @@ var YTPlay = (function () {
         }, function () { return ''; });
     }
-    function onHwKey(e) {
-        if (e && e.keyName === 'back') { if (e.preventDefault) { e.preventDefault(); } close(); }
-    }
-    function onKeyDown(e) {
-        if (e && (e.keyCode === 10009 || e.keyCode === 461)) {
-            if (e.preventDefault) { e.preventDefault(); }
-            if (e.stopPropagation) { e.stopPropagation(); }
-            close();
-        }
-    }
-    function show(id) {
-        var o = overlay();
-        if (!o) { return; }
-        U.clear(o);
-        var iframe = document.createElement('iframe');
-        iframe.setAttribute('allow', 'autoplay; encrypted-media');
-        iframe.src = PROXY + '/tv#/watch?v=' + encodeURIComponent(id);
-        iframe.onload = function () { try { iframe.focus(); } catch (e) {} };
-        o.appendChild(iframe);
-        o.className = '';
-        U.byId('app').className = 'hidden';
-        _open = true;
-        // Hardware Back is delivered app-wide (tizenhwkey) even when the iframe has
-        // focus; the keydown capture covers the moment before the iframe grabs focus.
-        document.addEventListener('tizenhwkey', onHwKey, true);
-        document.addEventListener('keydown', onKeyDown, true);
-    }
-    function close() {
-        if (!_open) { return; }
-        _open = false;
-        document.removeEventListener('tizenhwkey', onHwKey, true);
-        document.removeEventListener('keydown', onKeyDown, true);
-        var o = overlay();
-        if (o) { o.className = 'hidden'; U.clear(o); }
-        U.byId('app').className = '';
-        var cb = _onExit; _onExit = null;
-        if (cb) { try { cb(); } catch (e) {} }   // redraw detail -> restores focus scope
-    }
-    function open(stream, onExit) {
-        _onExit = onExit || null;
+    function open(stream /*, onExit */) {
         var page = stream.ytPage || stream.url;
         U.spinner(true);
         ensureService().then(function () {
@@ -114,13 +67,22 @@ var YTPlay = (function () {
         }).then(function (id) {
             U.spinner(false);
             if (!id) { U.toast('Could not find the live stream for this channel', 3500); return; }
-            show(id);
-        }, function (err) {
+            // Navigate the MAIN FRAME to leanback (needed for real playback on Tizen).
+            // nvret = where to return on Back; the hash carries the video so youtube.com/tv
+            // doesn't 303-redirect and drop our query param.
+            var ret = location.href;
+            window.location.href = PROXY + '/tv?nvret=' + encodeURIComponent(ret) +
+                '#/watch?v=' + encodeURIComponent(id);
+        }, function () {
             U.spinner(false);
             U.toast('Couldn\'t reach the YouTube proxy (port 8099). Use the sideloaded Nuvio ' +
                 'build so its background service is installed. (Desktop dev: run node service/index.js.)', 5500);
         });
     }
-    return { open: open, close: close, isOpen: function () { return _open; } };
+    // Kept for API compatibility (playback now navigates away rather than overlaying).
+    function close() {}
+    function isOpen() { return false; }
+    return { open: open, close: close, isOpen: isOpen };
 })();

package/package.json CHANGED Viewed

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

package/service/index.js CHANGED Viewed

@@ -42,10 +42,24 @@ function hostAllowed(h) {
 function proxyPrefix() { return 'http://localhost:' + PORT + '/cors-bypass/'; }
-function rewriteText(text, isTvHtml) {
+// A Back-key handler injected into the leanback page so pressing Return goes back to
+// Nuvio (nvret = the app URL Nuvio navigated from). Runs in leanback's top frame, where
+// tizenhwkey fires. Capture phase + stopImmediatePropagation so leanback doesn't also
+// handle it. Falls back to history.back() if no return URL was supplied.
+function backHandlerScript(nvret) {
+    return '<script>(function(){var r=' + JSON.stringify(nvret || '') + ';' +
+        'function go(e){try{e.preventDefault();e.stopImmediatePropagation();}catch(x){}' +
+        'if(r){try{window.location.href=r;return;}catch(x2){}}try{history.back();}catch(x3){}}' +
+        'window.addEventListener("tizenhwkey",function(e){if(e&&e.keyName==="back")go(e);},true);' +
+        'window.addEventListener("keydown",function(e){if(e&&(e.keyCode===10009||e.keyCode===461))go(e);},true);' +
+        '})();</script>';
+}
+function rewriteText(text, isTvHtml, nvret) {
     var p = proxyPrefix();
     if (isTvHtml) {
-        var inject = '<script>window.__tizenTubeStandaloneVersion="nuvio";</script>' +
+        var inject = (nvret ? backHandlerScript(nvret) : '') +
+            '<script>window.__tizenTubeStandaloneVersion="nuvio";</script>' +
             '<script src="' + USERSCRIPT_CDN + '?ver=' + Date.now() +
             '" onerror="this.onerror=null;this.src=\'' + USERSCRIPT_FALLBACK + '\'"></script>';
         if (/<body[^>]*>/i.test(text)) {
@@ -143,6 +157,20 @@ function handle(req, res) {
     if (!hostAllowed(pu.hostname)) { res.writeHead(403); res.end('host not allowed'); return; }
     var isTvHtml = (!isCors && pathOnly === '/tv');
+    // Nuvio passes its return URL as ?nvret= on the /tv request so we can inject a
+    // Back handler that navigates back to the app.
+    var nvret = '';
+    if (isTvHtml) {
+        var qmatch = req.url.split('?')[1];
+        if (qmatch) {
+            var parts = qmatch.split('&');
+            for (var qi = 0; qi < parts.length; qi++) {
+                if (parts[qi].indexOf('nvret=') === 0) {
+                    try { nvret = decodeURIComponent(parts[qi].slice('nvret='.length)); } catch (e) {}
+                }
+            }
+        }
+    }
     var headers = {};
     for (var k in req.headers) {
@@ -196,7 +224,7 @@ function handle(req, res) {
             pres.on('end', function () {
                 decompress(Buffer.concat(chunks), enc, function (err, buf) {
                     if (err) { res.writeHead(502); res.end('decompress error'); return; }
-                    var text = rewriteText(buf.toString('utf8'), isTvHtml);
+                    var text = rewriteText(buf.toString('utf8'), isTvHtml, nvret);
                     // new Buffer(): Buffer.from() doesn't exist on the TV's old Node (< 4.5).
                     var body = new Buffer(text, 'utf8');
                     outHeaders['Content-Length'] = body.length;