stremiok 2.2.7 → 2.2.9

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.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,44 @@
3
3
  What changed in each version of StremioK, newest first. How everything works is in the
4
4
  [user guide](docs/USER-GUIDE.md).
5
5
 
6
+ ## 2.2.9 — 2026-11-05
7
+ - **A Modern look** (Settings › Appearance › *Look*): the focused title's backdrop behind Home and
8
+ its page, large logos, rounder posters, a centered menu, with any background. *Effects*: blur and
9
+ motion where the TV handles them (Auto: Tizen 6 and later), Light, or Full. Classic stays as it
10
+ was.
11
+ - **ClearKey channels with a key server** whose stream names only Widevine or PlayReady now ask
12
+ that server (they stopped with Shaka's error 6012) (#11).
13
+ - **HLS through StremioK's service** (Settings › Playback › Seeking & buffering), for hosts that want
14
+ a Referer, User-Agent or Cookie on every piece, which the TV's player can't always send: for the
15
+ sources that need it, or all HLS. Hold OK on a source › *Play through StremioK's service* for just
16
+ that one (#13).
17
+ - **Anime and "other" catalogs:** their shows open on their seasons and episodes from Discover and
18
+ Search too, not on sources, and a debrid download on its files (#13).
19
+ - **Episode pictures:** one that doesn't load (Cinemeta's for long shows past their first seasons)
20
+ gives way to TMDB's, with a TMDB key (#13).
21
+ - **Stalker films and series** (Settings › Content › IPTV): what's read of a portal is kept 10
22
+ minutes, 5, or not at all.
23
+ - **YouTube backdrops** in 1280×720 where the video has them.
24
+ - **Fixed:** a row's title cut off scrolling back up at high zooms; Discover's bar too wide at 140%;
25
+ LEFT / RIGHT on a single line of Discover titles; the Guide unreadable on Light Gray and White.
26
+
27
+ ## 2.2.8 — 2026-11-04
28
+ - **DRM channels** (a playlist's `#KODIPROP` lines): Widevine and PlayReady play in the TV's player
29
+ with the license server the playlist names; ClearKey with its keys or key server, through Shaka
30
+ Player (included, and used only for those). Only with streams you're entitled to: see the
31
+ README's legal note (#11).
32
+ - **Films in a playlist** behind a DASH or HLS link can be scrubbed through, as their manifest says
33
+ they're films, not live channels (#11).
34
+ - **Export configuration** (Settings › Content): your addons, playlists, Stalker portals, API keys and
35
+ settings as a file for your phone, to bring everything back after a reinstall. *Import
36
+ configuration file* takes it from your phone: its link, the file itself, or pasted (#12).
37
+ - **A stream's Cookie** (from a playlist or an addon) is sent with it, for providers whose servers
38
+ need one.
39
+ - **Stalker films and series:** a row, category or search shown again within 10 minutes isn't read
40
+ from the portal again.
41
+ - **Anime series from other addons:** a show whose card or row calls it a film, *anime* or *other*
42
+ opens on its seasons and episodes when its details say it's a series, not on sources.
43
+
6
44
  ## 2.2.7 — 2026-11-03
7
45
  - **A Stalker portal's films and series:** in the Movies and Series tabs, Discover by the
8
46
  portal's categories, and Search; on titles from your addons, the portal's copy is a source
package/README.md CHANGED
@@ -73,11 +73,8 @@ metadata come from the addons you install (**Cinemeta**, the official one, by de
73
73
  playable sources come from whatever **stream addons you add yourself** in Settings. Streams
74
74
  that only expose a torrent `infoHash` play only through a streaming server you run (Stremio's
75
75
  or TorrServer): this app embeds no torrent or debrid engine.
76
- > **Note on WatchHub:** StremioK doesn't install it. Its answers say it's only for clients
77
- > Stremio authorizes in writing, and StremioK isn't one; "where to watch" comes from TMDB
78
- > instead (with a TMDB key). You can still add it yourself as a third-party addon (Settings
79
- > shows that notice on it); its results are rent/buy/subscription *links to external
80
- > services*, not video URLs. Add stream addons that return HTTP/HLS URLs for actual playback.
76
+ > **Note on WatchHub:** StremioK doesn't install it: its answers say it's only for clients
77
+ > Stremio authorizes in writing. "Where to watch" comes from TMDB instead (with a TMDB key).
81
78
 
82
79
  The **IPTV** feature likewise hosts no content: you supply your own M3U playlist URLs, Xtream
83
80
  accounts or Stalker portals. For YouTube entries, the bundled service finds the video's stream; the video itself
@@ -86,6 +83,12 @@ source, unless you download it to your own USB drive. What StremioK does keep, o
86
83
  your progress, settings and copies that let it start faster (see
87
84
  [Privacy and data](docs/PRIVACY.md#what-stays-on-the-tv)).
88
85
 
86
+ **DRM:** StremioK doesn't break or bypass copy protection. A protected channel plays only with
87
+ the license server or keys its playlist gives (Widevine and PlayReady through the TV's player,
88
+ ClearKey through Shaka Player), as in Kodi and other players. StremioK can't tell where a
89
+ playlist's keys come from: use only streams and keys you're entitled to; what you add is your
90
+ responsibility.
91
+
89
92
  ## Known limitations
90
93
 
91
94
  - AVPlay behavior varies by TV generation, codec and HLS provider.
@@ -110,6 +113,10 @@ your progress, settings and copies that let it start faster (see
110
113
 
111
114
  MIT: see [LICENSE](LICENSE).
112
115
 
116
+ It includes [Shaka Player](https://github.com/shaka-project/shaka-player) 5.3.3 (© Google LLC,
117
+ Apache License 2.0: [js/vendor/SHAKA-LICENSE](js/vendor/SHAKA-LICENSE)), loaded only to play
118
+ ClearKey channels.
119
+
113
120
  Skip timestamps come partly from [SkipDB](https://skipdb.tv), whose data is published under
114
121
  the [ODbL 1.0](https://opendatacommons.org/licenses/odbl/1-0/) (see its
115
122
  [DATA-LICENSE](https://github.com/SkipDB-TV/skipdb/blob/main/DATA-LICENSE)). StremioK only
package/config.xml CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets"
3
- id="http://stremiok.tizen/StremioKTizen" version="2.2.7" viewmodes="maximized">
3
+ id="http://stremiok.tizen/StremioKTizen" version="2.2.9" viewmodes="maximized">
4
4
  <tizen:application id="StremioK01.StremioK" package="StremioK01" required_version="3.0"/>
5
5
  <content src="index.html"/>
6
6
  <feature name="http://tizen.org/feature/screen.size.all"/>
@@ -12,6 +12,8 @@
12
12
  <tizen:privilege name="http://tizen.org/privilege/tv.inputdevice"/>
13
13
  <tizen:privilege name="http://tizen.org/privilege/application.launch"/>
14
14
  <tizen:privilege name="http://developer.samsung.com/privilege/network.public"/>
15
+ <!-- DRM channels (Widevine, PlayReady) through the TV's player: see js/player-core.js, drmSetup -->
16
+ <tizen:privilege name="http://developer.samsung.com/privilege/drmplay"/>
15
17
  <!-- Local media probe: reading USB drives -->
16
18
  <tizen:privilege name="http://tizen.org/privilege/filesystem.read"/>
17
19
  <!-- Cross-origin XHR to any addon host, and to the local YouTube service -->
package/css/modern.css ADDED
@@ -0,0 +1,146 @@
1
+ /* StremioK — the Modern look (Settings › Appearance › Look). Every rule here is under
2
+ body.look-modern, so Classic stays exactly as style.css draws it. body.fx-full adds the
3
+ effects a newer TV handles (blur behind the menu, fades, cards easing into focus, a soft
4
+ shadow); without it (Effects: Light, and Auto on Tizen 3 to 5.5) the same look, drawn
5
+ without them: a large blur repainted on every move is what slows an older TV down.
6
+ Chromium 47 (Tizen 3): no CSS variables, no backdrop-filter; gradients, flexbox and
7
+ transforms are fine. */
8
+
9
+ body.look-modern { background: #0e1117; font-family: 'SK Roboto', Arial, "Tizen Sans", sans-serif; }
10
+ body.look-modern #screen-home { background: #0e1117; }
11
+
12
+ /* --- Home: the focused title's backdrop, behind everything (view-home.js homeBackdrop) --- */
13
+ .home-bg { display: none; }
14
+ body.look-modern .home-bg { display: block; position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; background: #0e1117; }
15
+ body.look-modern .home-bg .hb { position: absolute; top: 0; right: 0; width: 80%; height: 86%; background-size: cover; background-position: center top; opacity: 0; }
16
+ body.look-modern .home-bg .hb.on { opacity: 1; }
17
+ body.look-modern.fx-full .home-bg .hb { -webkit-transition: opacity 0.45s ease; transition: opacity 0.45s ease; }
18
+ /* dark on the left, under the text, and at the bottom, under the rows */
19
+ body.look-modern .home-bg .hb-shade { position: absolute; top: 0; left: 0; right: 0; bottom: 0;
20
+ background: linear-gradient(90deg, #0e1117 20%, rgba(14,17,23,0.78) 32%, rgba(14,17,23,0.3) 52%, rgba(14,17,23,0) 72%),
21
+ linear-gradient(0deg, #0e1117 30%, rgba(14,17,23,0.82) 44%, rgba(14,17,23,0) 66%),
22
+ linear-gradient(180deg, rgba(14,17,23,0.55) 0%, rgba(14,17,23,0) 16%); }
23
+
24
+ /* --- The top menu: light text on the picture, the current item a soft pill, focus white --- */
25
+ body.look-modern .header { position: relative; z-index: 3; height: 104px; padding: 30px 90px 0 90px; }
26
+ body.look-modern .home-header .tabbar-inline { background: rgba(22,27,38,0.78); border-radius: 36px; padding: 5px; }
27
+ body.look-modern.fx-full .home-header .tabbar-inline { background: rgba(42,51,70,0.42); -webkit-backdrop-filter: blur(20px); backdrop-filter: blur(20px); }
28
+ body.look-modern .tab-pill, body.look-modern .header .hchip { background: transparent; color: rgba(255,255,255,0.74); font-size: 23px; padding: 9px 22px; margin-right: 2px; border: 3px solid transparent; border-radius: 30px; }
29
+ body.look-modern .menu-scroll > .hchip { background: rgba(22,27,38,0.78); margin-left: 10px; } /* (Settings, after the bar) */
30
+ body.look-modern.fx-full .menu-scroll > .hchip { background: rgba(42,51,70,0.42); -webkit-backdrop-filter: blur(20px); backdrop-filter: blur(20px); }
31
+ body.look-modern .tab-ic { display: none; }
32
+ body.look-modern .tab-pill.active, body.look-modern .home-header .hchip.active { background: rgba(255,255,255,0.16); color: #ffffff; }
33
+ body.look-modern .tab-pill.focusable.focused, body.look-modern .header .hchip.focusable.focused { background: #fff; color: #000; border-color: #ffffff; box-shadow: none; }
34
+ body.look-modern .brand { font-size: 34px; color: #ffffff; letter-spacing: 0.5px; }
35
+ /* the menu centered on the screen: its items centered in their strip (auto margins, which give
36
+ way to sideways scrolling when they don't all fit), and a space on the left as wide as the
37
+ StremioK name and its gap on the right, the first to give way when the menu fills the line */
38
+ body.look-modern .home-header::before { content: ''; display: block; -webkit-flex: 0 1000 170px; flex: 0 1000 170px; min-width: 0; }
39
+ body.look-modern .home-header .menu-scroll > :first-child { margin-left: auto; }
40
+ body.look-modern .home-header .menu-scroll > :last-child { margin-right: auto; }
41
+ body.look-modern .brand .dot { color: #818cf8; }
42
+
43
+ /* --- Home: the focused title, large, over its backdrop (.hero: the title tabs) ---
44
+ Anchored to the rows: the synopsis just above them, a taller logo growing upward. Its room
45
+ is set for each zoom (U.setZoom's zoom-110 … zoom-140 on the page, which is laid out
46
+ 1080 / zoom tall): one row of posters always fits below it. */
47
+ body.look-modern .home-info.hero, body.look-modern .home-info.hero.on { top: 120px; left: 90px; right: auto; width: 940px; height: 446px; padding: 0;
48
+ border: 0; border-radius: 0; background: none; z-index: 2;
49
+ display: -webkit-flex; display: flex; -webkit-flex-direction: column; flex-direction: column; -webkit-justify-content: flex-end; justify-content: flex-end; }
50
+ body.look-modern .home-info.hero .home-info-title { height: auto; line-height: 1.1; font-size: 66px; font-weight: bold; letter-spacing: -1px; white-space: normal; max-height: 150px; -webkit-flex: none; flex: none; }
51
+ body.look-modern .home-info.hero .home-info-logo { display: block; max-height: 150px; max-width: 620px; }
52
+ body.look-modern .home-info.hero .home-info-meta { font-size: 25px; line-height: 32px; color: rgba(255,255,255,0.86); margin: 22px 0 12px 0; -webkit-flex: none; flex: none; }
53
+ body.look-modern .home-info.hero .home-info-desc { font-size: 25px; line-height: 36px; color: rgba(255,255,255,0.8); max-height: 144px; max-width: 900px; -webkit-flex: none; flex: none; }
54
+ body.look-modern .home-info.hero + .rows { top: 586px; }
55
+ body.look-modern.zoom-110 .home-info.hero { top: 112px; height: 398px; }
56
+ body.look-modern.zoom-110 .home-info.hero + .rows { top: 530px; }
57
+ body.look-modern.zoom-110 .home-info.hero .home-info-logo { max-height: 130px; }
58
+ body.look-modern.zoom-110 .home-info.hero .home-info-desc { max-height: 108px; }
59
+ body.look-modern.zoom-120 .home-info.hero { top: 106px; height: 346px; }
60
+ body.look-modern.zoom-120 .home-info.hero + .rows { top: 476px; }
61
+ body.look-modern.zoom-120 .home-info.hero .home-info-logo { max-height: 112px; }
62
+ body.look-modern.zoom-120 .home-info.hero .home-info-desc { max-height: 108px; }
63
+ body.look-modern.zoom-130 .home-info.hero { top: 100px; height: 296px; }
64
+ body.look-modern.zoom-130 .home-info.hero + .rows { top: 418px; }
65
+ body.look-modern.zoom-130 .home-info.hero .home-info-logo { max-height: 96px; }
66
+ body.look-modern.zoom-130 .home-info.hero .home-info-desc { max-height: 72px; }
67
+ body.look-modern.zoom-140 .home-info.hero { top: 94px; height: 248px; }
68
+ body.look-modern.zoom-140 .home-info.hero + .rows { top: 356px; }
69
+ body.look-modern.zoom-140 .home-info.hero .home-info-logo { max-height: 80px; }
70
+ body.look-modern.zoom-140 .home-info.hero .home-info-title { font-size: 48px; }
71
+ body.look-modern.zoom-140 .home-info.hero .home-info-meta { margin: 12px 0 8px 0; }
72
+ body.look-modern.zoom-140 .home-info.hero .home-info-desc { max-height: 72px; }
73
+ body.look-modern .rows { z-index: 2; }
74
+
75
+ /* the details strip elsewhere (the live tabs, Local, Discover): as in Classic, in its place,
76
+ with the Modern colors */
77
+ body.look-modern .home-info:not(.hero) { left: 72px; right: 72px; border-left: 0; border-radius: 16px; }
78
+ body.look-modern .home-info.on:not(.hero) { background: rgba(255,255,255,0.07); }
79
+ body.look-modern .home-info:not(.hero) .home-info-meta { color: rgba(255,255,255,0.78); }
80
+ body.look-modern .home-info:not(.hero) .home-info-desc { color: rgba(255,255,255,0.8); }
81
+
82
+ /* --- Rows and posters: rounder, no frame, focus a white ring --- */
83
+ body.look-modern .row-title { font-size: 28px; color: #ffffff; }
84
+ body.look-modern #screen-home .row-title { margin: 0 0 4px 90px; } /* (Home: in line with the title above; Search, Discover: their own margins) */
85
+ body.look-modern #screen-home .row-scroller { padding: 26px 90px; }
86
+ body.look-modern .card { border: 0; border-radius: 16px; background: rgba(255,255,255,0.07); margin-right: 26px; }
87
+ body.look-modern .card .cap { padding: 20px 12px 8px 12px; font-size: 18px; line-height: 22px; max-height: 72px; background: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.9)); } /* (two lines fit, a landscape poster's too) */
88
+ body.look-modern .card.focusable.focused { border: 0; box-shadow: 0 0 0 4px #fff; -webkit-transform: scale(1.06); transform: scale(1.06); }
89
+ body.look-modern .card.focusable.moving { border: 0; box-shadow: 0 0 0 4px #f59e0b; }
90
+ body.look-modern.fx-full .card { -webkit-transition: -webkit-transform 0.16s ease-out, box-shadow 0.16s ease-out; transition: transform 0.16s ease-out, box-shadow 0.16s ease-out; }
91
+ body.look-modern.fx-full .card.focusable.focused { box-shadow: 0 0 0 4px #fff, 0 18px 44px rgba(0,0,0,0.7); }
92
+ body.look-modern .card .prog { height: 6px; border-radius: 0 3px 3px 0; }
93
+ body.look-modern #screen-home .row-empty { margin-left: 90px; }
94
+
95
+ /* --- A light background (Light Gray, White: body.bg-light): the see-through white fills
96
+ see-through dark instead; the rest follows the background through U.applyTheme --- */
97
+ body.look-modern.bg-light .tab-pill.active, body.look-modern.bg-light .home-header .hchip.active { background: rgba(0,0,0,0.1); }
98
+ body.look-modern.bg-light .btn-row .pill, body.look-modern.bg-light .season-bar .pill { background: rgba(0,0,0,0.08); }
99
+ body.look-modern.bg-light .btn-row .pill:first-child { background: rgba(0,0,0,0.82); color: #f5f5f5; } /* (not #ffffff: that one turns dark on a light background) */
100
+ body.look-modern.bg-light .btn-row .pill.focusable.focused, body.look-modern.bg-light .tab-pill.focusable.focused, body.look-modern.bg-light .header .hchip.focusable.focused,
101
+ body.look-modern.bg-light .season-bar .pill.focusable.focused, body.look-modern.bg-light .stream.focusable.focused, body.look-modern.bg-light .ep.focusable.focused { background: #111111; color: #f5f5f5; border-color: #111111; }
102
+ body.look-modern.bg-light .card { background: rgba(0,0,0,0.06); }
103
+ body.look-modern.bg-light .card.focusable.focused { box-shadow: 0 0 0 4px #111111; }
104
+ body.look-modern.bg-light .home-info.on:not(.hero) { background: rgba(0,0,0,0.05); }
105
+
106
+ /* --- A title's page: its backdrop over the whole screen, a large logo, round buttons --- */
107
+ body.look-modern #screen-detail { background: #0e1117; }
108
+ body.look-modern .detail-hero, body.look-modern .detail-hero.hero-full { height: 100%; }
109
+ body.look-modern .detail-hero .shade, body.look-modern .detail-hero.hero-full .shade {
110
+ background: linear-gradient(90deg, #0e1117 6%, rgba(14,17,23,0.84) 30%, rgba(14,17,23,0.3) 60%, rgba(14,17,23,0) 82%),
111
+ linear-gradient(0deg, #0e1117 0%, rgba(14,17,23,0.6) 26%, rgba(14,17,23,0) 56%),
112
+ linear-gradient(180deg, rgba(14,17,23,0.5) 0%, rgba(14,17,23,0) 16%); }
113
+ body.look-modern .detail-body { left: 90px; right: 90px; top: 150px; }
114
+ body.look-modern .detail-title { font-size: 62px; letter-spacing: -1px; }
115
+ body.look-modern .detail-title.has-logo { height: 130px; }
116
+ body.look-modern .detail-logo { max-height: 130px; max-width: 640px; }
117
+ body.look-modern .series-body .detail-title.has-logo { height: 84px; }
118
+ body.look-modern .series-body .detail-logo { max-height: 84px; }
119
+ body.look-modern.zoom-120 .detail-title.has-logo, body.look-modern.zoom-130 .detail-title.has-logo, body.look-modern.zoom-140 .detail-title.has-logo { height: 84px; }
120
+ body.look-modern.zoom-120 .detail-logo, body.look-modern.zoom-130 .detail-logo, body.look-modern.zoom-140 .detail-logo { max-height: 84px; }
121
+ body.look-modern.zoom-130 .series-body .detail-title.has-logo, body.look-modern.zoom-140 .series-body .detail-title.has-logo { height: 64px; }
122
+ body.look-modern.zoom-130 .series-body .detail-logo, body.look-modern.zoom-140 .series-body .detail-logo { max-height: 64px; }
123
+ body.look-modern .detail-meta { color: rgba(255,255,255,0.86); font-size: 23px; }
124
+ body.look-modern .detail-desc { color: rgba(255,255,255,0.82); font-size: 23px; line-height: 32px; max-width: 980px; } /* (whole lines in its capped height) */
125
+ /* A series: its text block right under the menu, as in Classic (the episode panel starts where
126
+ it ends, view-detail.js fitPanel, and no lower than 512px); under a high zoom a shorter
127
+ synopsis, so two episodes show below it */
128
+ body.look-modern .series-body { top: 112px; }
129
+ body.look-modern.zoom-130 .series-body { max-height: 340px; }
130
+ body.look-modern.zoom-130 .series-body .detail-desc { max-height: 96px; }
131
+ body.look-modern.zoom-140 .series-body { max-height: 292px; }
132
+ body.look-modern.zoom-140 .series-body .detail-desc { max-height: 64px; }
133
+ body.look-modern.zoom-140 .series-body .detail-ratings { margin-bottom: 8px; }
134
+ body.look-modern.zoom-140 .series-body .detail-meta { margin-bottom: 8px; }
135
+ body.look-modern.zoom-120 .series-body .detail-title.has-logo { height: 64px; }
136
+ body.look-modern.zoom-120 .series-body .detail-logo { max-height: 64px; }
137
+ body.look-modern.zoom-140 .series-body .detail-title.has-logo { height: 56px; }
138
+ body.look-modern.zoom-140 .series-body .detail-logo { max-height: 56px; }
139
+ body.look-modern .btn-row .pill { background: rgba(255,255,255,0.16); color: #ffffff; border: 3px solid transparent; border-radius: 40px; padding: 14px 32px; font-size: 23px; }
140
+ body.look-modern .btn-row .pill:first-child { background: rgba(255,255,255,0.9); color: #000; }
141
+ body.look-modern .btn-row .pill.focusable.focused { background: #fff; color: #000; border-color: #ffffff; box-shadow: 0 0 0 4px rgba(255,255,255,0.35); }
142
+ body.look-modern.fx-full .btn-row .pill { -webkit-backdrop-filter: blur(16px); backdrop-filter: blur(16px); }
143
+ body.look-modern .season-bar .pill { background: rgba(255,255,255,0.12); color: #ffffff; border-radius: 30px; }
144
+ body.look-modern .season-bar .pill.focusable.focused { background: #fff; color: #000; }
145
+ body.look-modern .stream.focusable.focused, body.look-modern .ep.focusable.focused { background: #fff; color: #000; border-color: #ffffff; box-shadow: none; }
146
+ body.look-modern .stream, body.look-modern .ep { border-radius: 14px; background: rgba(22,27,38,0.72); }
package/css/style.css CHANGED
@@ -476,9 +476,13 @@ html, body {
476
476
  .format-row.focusable.focused .a-name { color: inherit; }
477
477
 
478
478
  /* --- Discover --- */
479
- .discover-bar { position: absolute; top: 112px; left: 60px; right: 60px; white-space: nowrap; }
480
- .discover-bar .pill { margin-right: 12px; }
481
- .discover-search { width: 300px; margin-right: 12px; padding: 12px 22px; font-size: 22px; vertical-align: middle; background: #1a1f2b; color: #e6e9ef; border: 4px solid transparent; border-radius: 30px; }
479
+ /* one line that fits under any zoom: the search field gives way first (down to 130px), then the
480
+ catalog's name and the count (cut short …); the other pickers and Clear keep their size */
481
+ .discover-bar { position: absolute; top: 112px; left: 60px; right: 60px; white-space: nowrap; display: -webkit-flex; display: flex; -webkit-align-items: center; align-items: center; }
482
+ .discover-bar .pill { margin-right: 12px; -webkit-flex: none; flex: none; }
483
+ .discover-bar .pill.discover-cat { -webkit-flex: 0 1 auto; flex: 0 1 auto; min-width: 180px; overflow: hidden; text-overflow: ellipsis; }
484
+ .discover-count { -webkit-flex: 0 2 auto; flex: 0 2 auto; min-width: 150px; overflow: hidden; text-overflow: ellipsis; }
485
+ .discover-search { -webkit-flex: 0 1 300px; flex: 0 4 300px; min-width: 130px; width: 300px; margin-right: 12px; padding: 12px 22px; font-size: 22px; vertical-align: middle; background: #1a1f2b; color: #e6e9ef; border: 4px solid transparent; border-radius: 30px; }
482
486
  .discover-search.focused { border-color: #818cf8; }
483
487
  .discover-count { display: inline-block; margin-left: 14px; font-size: 20px; color: #8b93a5; vertical-align: middle; }
484
488
  #screen-discover .home-info { top: 196px; height: 124px; }
package/index.html CHANGED
@@ -4,7 +4,8 @@
4
4
  <meta charset="utf-8">
5
5
  <meta name="viewport" content="width=1920, height=1080, user-scalable=no">
6
6
  <title>StremioK</title>
7
- <link rel="stylesheet" href="css/style.css?v=2.2.7">
7
+ <link rel="stylesheet" href="css/style.css?v=2.2.9">
8
+ <link rel="stylesheet" href="css/modern.css?v=2.2.9">
8
9
  </head>
9
10
  <body>
10
11
  <!-- CSS-applied sentinel (kept off-screen); app.js waits for its width before rendering -->
@@ -53,39 +54,39 @@
53
54
 
54
55
  <!-- Load order matters: polyfills -> util -> iptv -> data -> input -> tvapps -> player parts -> player -> ytplay -> view parts -> views -> app -->
55
56
  <!-- ?v= busts the TV webview cache on every release (keep in sync with package.json) -->
56
- <script src="js/polyfills.js?v=2.2.7"></script>
57
- <script src="js/util.js?v=2.2.7"></script>
58
- <script src="js/iptv.js?v=2.2.7"></script>
59
- <script src="js/xtvod.js?v=2.2.7"></script>
60
- <script src="js/stvod.js?v=2.2.7"></script>
61
- <script src="js/epg.js?v=2.2.7"></script>
62
- <script src="js/youtube.js?v=2.2.7"></script>
63
- <script src="js/stremio.js?v=2.2.7"></script>
64
- <script src="js/trakt.js?v=2.2.7"></script>
65
- <script src="js/keys.js?v=2.2.7"></script>
66
- <script src="js/focus.js?v=2.2.7"></script>
67
- <script src="js/tvapps.js?v=2.2.7"></script>
68
- <script src="js/player-core.js?v=2.2.7"></script>
69
- <script src="js/player-store.js?v=2.2.7"></script>
70
- <script src="js/player-lang.js?v=2.2.7"></script>
71
- <script src="js/player-quality.js?v=2.2.7"></script>
72
- <script src="js/player-subs.js?v=2.2.7"></script>
73
- <script src="js/player-audio.js?v=2.2.7"></script>
74
- <script src="js/player-controls.js?v=2.2.7"></script>
75
- <script src="js/player.js?v=2.2.7"></script>
76
- <script src="js/ytplay.js?v=2.2.7"></script>
77
- <script src="js/local.js?v=2.2.7"></script>
78
- <script src="js/downloads.js?v=2.2.7"></script>
79
- <script src="js/stremio-account.js?v=2.2.7"></script>
80
- <script src="js/view-core.js?v=2.2.7"></script>
81
- <script src="js/view-home.js?v=2.2.7"></script>
82
- <script src="js/view-guide.js?v=2.2.7"></script>
83
- <script src="js/view-detail.js?v=2.2.7"></script>
84
- <script src="js/view-search.js?v=2.2.7"></script>
85
- <script src="js/view-settings.js?v=2.2.7"></script>
86
- <script src="js/view-discover.js?v=2.2.7"></script>
87
- <script src="js/views.js?v=2.2.7"></script>
88
- <script src="js/app.js?v=2.2.7"></script>
89
- <script src="js/hubpreview.js?v=2.2.7"></script>
57
+ <script src="js/polyfills.js?v=2.2.9"></script>
58
+ <script src="js/util.js?v=2.2.9"></script>
59
+ <script src="js/iptv.js?v=2.2.9"></script>
60
+ <script src="js/xtvod.js?v=2.2.9"></script>
61
+ <script src="js/stvod.js?v=2.2.9"></script>
62
+ <script src="js/epg.js?v=2.2.9"></script>
63
+ <script src="js/youtube.js?v=2.2.9"></script>
64
+ <script src="js/stremio.js?v=2.2.9"></script>
65
+ <script src="js/trakt.js?v=2.2.9"></script>
66
+ <script src="js/keys.js?v=2.2.9"></script>
67
+ <script src="js/focus.js?v=2.2.9"></script>
68
+ <script src="js/tvapps.js?v=2.2.9"></script>
69
+ <script src="js/player-core.js?v=2.2.9"></script>
70
+ <script src="js/player-store.js?v=2.2.9"></script>
71
+ <script src="js/player-lang.js?v=2.2.9"></script>
72
+ <script src="js/player-quality.js?v=2.2.9"></script>
73
+ <script src="js/player-subs.js?v=2.2.9"></script>
74
+ <script src="js/player-audio.js?v=2.2.9"></script>
75
+ <script src="js/player-controls.js?v=2.2.9"></script>
76
+ <script src="js/player.js?v=2.2.9"></script>
77
+ <script src="js/ytplay.js?v=2.2.9"></script>
78
+ <script src="js/local.js?v=2.2.9"></script>
79
+ <script src="js/downloads.js?v=2.2.9"></script>
80
+ <script src="js/stremio-account.js?v=2.2.9"></script>
81
+ <script src="js/view-core.js?v=2.2.9"></script>
82
+ <script src="js/view-home.js?v=2.2.9"></script>
83
+ <script src="js/view-guide.js?v=2.2.9"></script>
84
+ <script src="js/view-detail.js?v=2.2.9"></script>
85
+ <script src="js/view-search.js?v=2.2.9"></script>
86
+ <script src="js/view-settings.js?v=2.2.9"></script>
87
+ <script src="js/view-discover.js?v=2.2.9"></script>
88
+ <script src="js/views.js?v=2.2.9"></script>
89
+ <script src="js/app.js?v=2.2.9"></script>
90
+ <script src="js/hubpreview.js?v=2.2.9"></script>
90
91
  </body>
91
92
  </html>
package/js/focus.js CHANGED
@@ -55,8 +55,11 @@ var Focus = (function () {
55
55
  else if (nr.right > pr.right - mx) { p.scrollLeft += (nr.right - (pr.right - mx)) / z; }
56
56
  }
57
57
  if (canY) {
58
- var my = 70;
59
- if (nr.top < pr.top + my) { p.scrollTop -= (pr.top + my - nr.top) / z; }
58
+ // going up into a row of posters: its title in view too (a margin in
59
+ // screen pixels is less of the page under a zoom: at 140% it cut the title)
60
+ var my = 70, top = nr.top, mt = my, row = rowAbove(node, p);
61
+ if (row) { var rr = row.getBoundingClientRect(); if (rr.top <= nr.top && rr.bottom >= nr.bottom && nr.top - rr.top < 160 * z) { top = rr.top; mt = 6 * z; } } // (its first line only; a rect that doesn't hold the node: not used)
62
+ if (top < pr.top + mt) { p.scrollTop -= (pr.top + mt - top) / z; }
60
63
  else if (nr.bottom > pr.bottom - my) { p.scrollTop += (nr.bottom - (pr.bottom - my)) / z; }
61
64
  }
62
65
  }
@@ -64,6 +67,14 @@ var Focus = (function () {
64
67
  }
65
68
  }
66
69
 
70
+ // The row of posters (.row: its title above them) the node is in, inside the box p.
71
+ function rowAbove(node, p) {
72
+ for (var n = node.parentNode; n && n !== p; n = n.parentNode) {
73
+ if (n.classList && n.classList.contains('row')) { return n; }
74
+ }
75
+ return null;
76
+ }
77
+
67
78
  function move(dir) {
68
79
  if (!_scope) { return; }
69
80
  var r = _current ? _current.getBoundingClientRect() : null;
package/js/iptv.js CHANGED
@@ -304,13 +304,84 @@ var IPTV = (function () {
304
304
  function idOf(s, exact) { return slug(s) + '-' + hash(exact === undefined ? s : exact); }
305
305
 
306
306
  function attr(line, re) { var m = line.match(re); return m ? m[1] : ''; }
307
- // A header a playlist gives a channel, by name: its User-Agent or Referer (the only two the
307
+ // A header a playlist gives a channel, by name: its User-Agent, Referer or Cookie (the ones the
308
308
  // TV's player takes: any other is left out). Checked when played (U.sanitizeHeaders).
309
309
  function headerInto(c, name, value) {
310
310
  var n = ('' + name).trim().toLowerCase(), v = ('' + (value || '')).trim();
311
311
  if (!v) { return; }
312
- if (n === 'user-agent') { c.ua = v; } else if (n === 'referer' || n === 'referrer') { c.ref = v; }
312
+ if (n === 'user-agent') { c.ua = v; } else if (n === 'referer' || n === 'referrer') { c.ref = v; } else if (n === 'cookie') { c.cookie = v; }
313
+ }
314
+
315
+ // A channel's DRM, from Kodi's #KODIPROP:inputstream.adaptive.<key>=<value> lines: { sys:
316
+ // 'widevine' | 'playready' | 'clearkey' | 'other', url: its license server, h: { name: value }
317
+ // for the license request, b64: its answer comes in base64, bad: a request or answer template
318
+ // StremioK can't follow, keys: ClearKey's { kid: key } (hex) when the playlist gives them }.
319
+ // Widevine or PlayReady with a license server: the TV's player (drmPlayable); ClearKey with keys
320
+ // or a key server: Shaka Player (drmShaka, see the player's startShaka). stream_headers /
321
+ // manifest_headers: the stream's own User-Agent and Referer.
322
+ function drmSys(v) { v = ('' + v).toLowerCase(); return /widevine/.test(v) ? 'widevine' : /playready/.test(v) ? 'playready' : /clearkey/.test(v) ? 'clearkey' : 'other'; }
323
+ function headersOf(text) { // "Name=value&Name2=value2" (values may be %-encoded) -> { Name: value }
324
+ var out = {}, n = 0;
325
+ ('' + (text || '')).split('&').forEach(function (kv) {
326
+ var eq = kv.indexOf('='), k = eq > 0 ? kv.slice(0, eq).trim() : '', v = eq > 0 ? kv.slice(eq + 1) : '';
327
+ try { v = decodeURIComponent(v); } catch (e) {}
328
+ if (/^[A-Za-z0-9-]{1,40}$/.test(k) && v && v.length <= 1000 && !/[\r\n]/.test(v) && n < 16) { out[k] = v; n++; }
329
+ });
330
+ return out;
331
+ }
332
+ function hexOf(v) { // a key id or key: hex (32 digits), or base64url (a JWK's)
333
+ v = ('' + (v || '')).trim();
334
+ if (/^[0-9a-f]{32}$/i.test(v)) { return v.toLowerCase(); }
335
+ if (!/^[A-Za-z0-9_-]{21,24}={0,2}$/.test(v)) { return ''; }
336
+ try {
337
+ var bin = atob(v.replace(/-/g, '+').replace(/_/g, '/').replace(/=+$/, '') + '=='.slice(0, (4 - v.replace(/=+$/, '').length % 4) % 4)), out = '';
338
+ for (var i = 0; i < bin.length; i++) { out += (bin.charCodeAt(i) < 16 ? '0' : '') + bin.charCodeAt(i).toString(16); }
339
+ return out.length === 32 ? out : '';
340
+ } catch (e) { return ''; }
341
+ }
342
+ // ClearKey's keys as a playlist gives them: kid:key[,kid:key], { "kid": "key" }, or a JWK set
343
+ // { "keys": [{ "kid", "k" }] } -> { kid: key } in hex, or null.
344
+ function keysOf(text) {
345
+ var out = {}, n = 0, j = null;
346
+ function put(kid, key) { kid = hexOf(kid); key = hexOf(key); if (kid && key && n < 32) { out[kid] = key; n++; } }
347
+ text = ('' + (text || '')).trim();
348
+ if (text.charAt(0) === '{') {
349
+ try { j = JSON.parse(text); } catch (e) { j = null; }
350
+ if (j && Array.isArray(j.keys)) { j.keys.forEach(function (k) { if (k) { put(k.kid, k.k); } }); }
351
+ else if (j && typeof j === 'object') { Object.keys(j).forEach(function (k) { put(k, j[k]); }); }
352
+ } else {
353
+ text.split(',').forEach(function (pair) { var p = pair.split(':'); if (p.length === 2) { put(p[0], p[1]); } });
354
+ }
355
+ return n ? out : null;
356
+ }
357
+ function drmServer(d, url, headers) {
358
+ if (/^https?:\/\/[^\s|]+$/i.test(url || '') && url.length <= 2000) { d.url = url; }
359
+ else if (url) { d.inline = true; d.keys = keysOf(url); } // (ClearKey's kid:key, or keys as JSON)
360
+ if (headers) { d.h = headersOf(headers); }
361
+ }
362
+ function drmInto(c, key, v) {
363
+ if (key === 'stream_headers' || key === 'manifest_headers') { var sh = headersOf(v); Object.keys(sh).forEach(function (k) { headerInto(c, k, sh[k]); }); return; }
364
+ var d = c.drm || (c.drm = { sys: '' });
365
+ if (key === 'license_type') { d.sys = drmSys(v); return; }
366
+ if (key === 'license_key') { // URL|headers|request template|answer template
367
+ var p = v.split('|');
368
+ drmServer(d, p[0], p[1]);
369
+ if (p[2] && p[2] !== 'R{SSM}') { d.bad = true; }
370
+ if (p[3] === 'B') { d.b64 = true; } else if (p[3]) { d.bad = true; }
371
+ return;
372
+ }
373
+ if (key === 'drm_legacy') { var q = v.split('|'); d.sys = drmSys(q[0]); drmServer(d, q[1], q[2]); return; }
374
+ if (key === 'drm') { // {"com.widevine.alpha": {"license": {"server_url": …, "req_headers": "Name=value&…"}}}
375
+ var j = null;
376
+ try { j = JSON.parse(v); } catch (e) { j = null; }
377
+ var sys = j && typeof j === 'object' ? Object.keys(j)[0] : '', lic = sys && j[sys] && j[sys].license;
378
+ d.sys = sys ? drmSys(sys) : 'other';
379
+ if (lic && typeof lic === 'object') { drmServer(d, typeof lic.server_url === 'string' ? lic.server_url : '', typeof lic.req_headers === 'string' ? lic.req_headers : ''); }
380
+ if (lic && (lic.keyids || lic.keys)) { d.inline = true; d.keys = keysOf(JSON.stringify(lic.keyids || { keys: lic.keys })); }
381
+ }
313
382
  }
383
+ function drmPlayable(d) { return !!d && (d.sys === 'widevine' || d.sys === 'playready') && !!d.url && !d.bad && !d.inline; }
384
+ function drmShaka(d) { return !!d && d.sys === 'clearkey' && !d.bad && (!!d.keys || (!!d.url && !d.inline)); }
314
385
 
315
386
  // A link to a file, not a stream: a film or an episode (an Xtream account's /movie/… and
316
387
  // /series/… links, or a video file's name), played as one (seeking; see Player's isLive).
@@ -327,7 +398,7 @@ var IPTV = (function () {
327
398
  // parseM3UAsync). max: channels kept; any beyond are only counted (dropped). guides: the TV
328
399
  // guides it names (url-tvg / x-tvg-url / tvg-url, several split by commas).
329
400
  function m3uReader(max) {
330
- var r = { channels: [], dropped: 0, title: '', guides: [] }, cur = null, seen = {};
401
+ var r = { channels: [], dropped: 0, title: '', guides: [] }, cur = null, seen = {}, pre = null; // (pre: #KODIPROP lines before a channel's #EXTINF)
331
402
  function add(c) {
332
403
  var base = 'iptv:' + idOf(c.tvgId || c.name);
333
404
  var id = base, n = 2;
@@ -360,6 +431,7 @@ var IPTV = (function () {
360
431
  sport: /^sports?$/i.test(kind), // (StremioK's own mark: the Sports tab)
361
432
  url: ''
362
433
  };
434
+ if (pre) { if (pre.drm) { cur.drm = pre.drm; } if (!cur.ua && pre.ua) { cur.ua = pre.ua; } if (!cur.ref && pre.ref) { cur.ref = pre.ref; } if (!cur.cookie && pre.cookie) { cur.cookie = pre.cookie; } pre = null; }
363
435
  if (/^guide$/i.test(kind)) { // (StremioK's own mark: a channel watched elsewhere, kept for its TV guide alone; a link after it is ignored)
364
436
  if (max && r.channels.length >= max) { r.dropped++; cur = null; return; }
365
437
  cur.guideOnly = true; cur.radio = false; cur.type = 'tv';
@@ -369,6 +441,9 @@ var IPTV = (function () {
369
441
  }
370
442
  } else if (/^#EXTVLCOPT:http-(user-agent|referr?er)=/i.test(s)) { // (http-referer: the one-r spelling too)
371
443
  if (cur) { var opt = /^#EXTVLCOPT:http-(user-agent|referr?er)=(.*)$/i.exec(s); headerInto(cur, opt[1], opt[2]); }
444
+ } else if (/^#KODIPROP:inputstream\.adaptive\.[a-z_]+=/i.test(s)) { // a channel's DRM (Kodi's: see drmInto)
445
+ var kp = /^#KODIPROP:inputstream\.adaptive\.([a-z_]+)=(.*)$/i.exec(s);
446
+ drmInto(cur || (pre = pre || {}), kp[1].toLowerCase(), kp[2].trim());
372
447
  } else if (s.indexOf('#EXTHTTP:') === 0) { // #EXTHTTP:{"User-Agent": "…", "Referer": "…"}
373
448
  var j = null;
374
449
  try { j = JSON.parse(s.slice(9)); } catch (e) { j = null; }
@@ -625,7 +700,7 @@ var IPTV = (function () {
625
700
 
626
701
  function sameKey(c) {
627
702
  var p = U.parseUrl(c.url); // (scheme and host in lower case)
628
- return [p ? p.href : c.url, c.name, c.group, c.type, c.ua || '', c.ref || ''].join('\u0001');
703
+ return [p ? p.href : c.url, c.name, c.group, c.type, c.ua || '', c.ref || '', c.cookie || ''].join('\u0001');
629
704
  }
630
705
 
631
706
  function reload(id) { // (its TV guide read again too: EPG.start)
@@ -732,7 +807,11 @@ var IPTV = (function () {
732
807
  var from = sourceOf(c);
733
808
  var st = { url: c.url, name: c.name, title: 'IPTV · ' + c.group + (from ? ' · ' + from : '') };
734
809
  if (c.vod) { st._vod = true; }
735
- var h = U.sanitizeHeaders({ ua: c.ua, ref: c.ref }); // (only what the player takes, checked)
810
+ if (c.drm) { // (see the player's drmSetup and startShaka)
811
+ st._drm = { sys: c.drm.sys || 'other', url: c.drm.url || '', h: c.drm.h || {}, b64: !!c.drm.b64, ok: drmPlayable(c.drm), shaka: drmShaka(c.drm) };
812
+ if (c.drm.keys) { st._drm.keys = c.drm.keys; }
813
+ }
814
+ var h = U.sanitizeHeaders({ ua: c.ua, ref: c.ref, cookie: c.cookie }); // (only what the player takes, checked)
736
815
  if (h) { st._headers = h; }
737
816
  return [st];
738
817
  }
@@ -750,7 +829,7 @@ var IPTV = (function () {
750
829
  if (!url && /^https?:\/\/(localhost|127\.0\.0\.1)(:\d+)?\//i.test(c.url)) { return []; }
751
830
  var st = plainStreams(c)[0];
752
831
  st.url = url || c.url;
753
- var h = U.sanitizeHeaders({ ua: STB_UA, ref: c.ref });
832
+ var h = U.sanitizeHeaders({ ua: STB_UA, ref: c.ref, cookie: c.cookie });
754
833
  if (h) { st._headers = h; }
755
834
  return [st];
756
835
  });
@@ -4,7 +4,7 @@
4
4
  (function (P) {
5
5
  'use strict';
6
6
  var S = P.S;
7
- var avplay = P.avplay, useAV = P.useAV;
7
+ var avplay = P.avplay; // (P.useAV: the TV's player's playback or the page's, as it is now: see player-core's engineFor)
8
8
 
9
9
  // ----- from the other parts -----
10
10
  function doAVSeek() { return P.doAVSeek.apply(null, arguments); } // core
@@ -59,7 +59,7 @@
59
59
  // buffering. true: picked (the caller seeks). Safe: once it plays, as before. Not on
60
60
  // live streams (nothing to seek) or YouTube videos.
61
61
  function audioOnReady() {
62
- if (!useAV || S.isLive || (S.ctx && S.ctx.yt) || getAudioCfg().switch === 'safe') { return false; }
62
+ if (!P.useAV || S.isLive || (S.ctx && S.ctx.yt) || getAudioCfg().switch === 'safe') { return false; }
63
63
  var tracks = getAudioTracks();
64
64
  _audioIdx = playingAudioIndex(tracks);
65
65
  _audioPending = false; // (decided here: not again once it plays)
@@ -73,7 +73,7 @@
73
73
  }
74
74
 
75
75
  function getAudioTracks() {
76
- if (useAV) {
76
+ if (P.useAV) {
77
77
  try {
78
78
  var all = avplay.getTotalTrackInfo() || [];
79
79
  var out = [];
@@ -166,7 +166,7 @@
166
166
  // The audio track the player is on: AVPlay reports it (a file can flag a track
167
167
  // other than the first as its default); otherwise assume the first track.
168
168
  function playingAudioIndex(tracks) {
169
- if (useAV) {
169
+ if (P.useAV) {
170
170
  try {
171
171
  var now = avplay.getCurrentStreamInfo() || [];
172
172
  for (var i = 0; i < now.length; i++) {
@@ -204,7 +204,7 @@
204
204
  // ignores re-picking the same track; stepping through a different track first makes
205
205
  // it switch for real (the manual workaround, in one press).
206
206
  function selectAudio(index, message, force) {
207
- if (useAV) {
207
+ if (P.useAV) {
208
208
  if (force) {
209
209
  var tracks = getAudioTracks();
210
210
  for (var k = 0; k < tracks.length; k++) {
@@ -4,7 +4,7 @@
4
4
  (function (P) {
5
5
  'use strict';
6
6
  var S = P.S;
7
- var avplay = P.avplay, useAV = P.useAV;
7
+ var avplay = P.avplay; // (P.useAV: the TV's player's playback or the page's, as it is now: see player-core's engineFor)
8
8
 
9
9
  // ----- from the other parts -----
10
10
  function exit() { return P.exit.apply(null, arguments); } // core
@@ -752,7 +752,7 @@
752
752
  // mode this TV rejects falls back to Fit (quiet = at stream start).
753
753
  function applyAspect(quiet) {
754
754
  var a = aspectDef(P.aspectNow());
755
- if (!useAV) { if (S.videoEl) { S.videoEl.style.objectFit = a[3]; } return true; }
755
+ if (!P.useAV) { if (S.videoEl) { S.videoEl.style.objectFit = a[3]; } return true; }
756
756
  try { avplay.setDisplayMethod(a[2]); return true; } catch (e) {
757
757
  try { avplay.setDisplayMethod(aspectDef('fit')[2]); } catch (e2) {}
758
758
  if (!quiet) { U.toast(a[1].split(' (')[0] + ' isn\'t available on this TV', 2500); }
@@ -831,7 +831,7 @@
831
831
  if (!el || !S.ctx) { return; }
832
832
  var lines = [], video = null, audio = null;
833
833
  sourceLines(lines);
834
- if (useAV) {
834
+ if (P.useAV) {
835
835
  try {
836
836
  var now = avplay.getCurrentStreamInfo() || [];
837
837
  for (var i = 0; i < now.length; i++) {
@@ -853,7 +853,7 @@
853
853
  lines.push(['Subtitles', subtitleSummary()]);
854
854
  if (hasQualities()) { lines.push(['Quality', qualityLabel() + ' (' + qualityCount() + ' available)']); }
855
855
  else if (qualityUnread()) { lines.push(['Quality', 'Auto (this stream’s qualities couldn’t be read)']); }
856
- if (useAV) {
856
+ if (P.useAV) {
857
857
  try {
858
858
  var bw = +avplay.getStreamingProperty('CURRENT_BANDWIDTH');
859
859
  if (bw > 0) { lines.push(['Bandwidth', (bw / 1e6).toFixed(1) + ' Mbps']); }