Merge pull request #4533 from dimkroon/matrix-viwx-141

[plugin.video.viwx] v1.4.1
xbmc · Jul 3, 2024 · e6e8fca · e6e8fca
2 parents e18689f + 8db7d43
commit e6e8fca
Show file tree

Hide file tree

Showing 10 changed files with 257 additions and 76 deletions.
diff --git a/plugin.video.viwx/addon.xml b/plugin.video.viwx/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.viwx" name="viwX" version="1.3.0" provider-name="Dimitri Kroon">
+<addon id="plugin.video.viwx" name="viwX" version="1.4.1" provider-name="Dimitri Kroon">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="inputstream.adaptive" version="19.0.5"/>
@@ -30,16 +30,20 @@
       <fanart>resources/fanart.png</fanart>
     </assets>
     <news>
-[B]v1.3.0[/B]
+[B]v1.4.1[/B]
 [B]Fixes:[/B]
-* Freezing streams on Kodi 21 (Omega).
-* A lot of timeout errors, only experienced by new users, particularly when trying to sign in or open a stream.
-* All categories failed to open with KeyError('encodeEpisodeId') due to a change at ITVX.
-* A workaround for a bug in ITVX causing full news programmes to fail with FetchError('Not Found').
-* Sometimes an episodes listing failed with KeyError('guidance').
+* Yet again sign-in errors. Now affecting both new users and existing users who had signed out.
+
+[B]v1.4.0[/B]
+[B]Fixes:[/B]
+* Collection ITV sport failed with KeyError('collection')
+* Again occasional sign-in errors for new users. Hopefully the final fix.
+* A rare failure to list live channels.
+* Adapt to changes at ITVX causing submenu 'My ITVX' to fail sometimes.
 
 [B]New Features:[/B]
-* Support for IPTV Manager.
+* Support for signed programmes. (Enable the new setting 'Use signed programmes whenever available').
+* Live hero items (those in orange on the main menu) now have a context menu 'Watch from the start'.
     </news>
     <reuselanguageinvoker>true</reuselanguageinvoker>
   </extension>

diff --git a/plugin.video.viwx/changelog.txt b/plugin.video.viwx/changelog.txt
@@ -1,3 +1,18 @@
+v1.4.1
+Fixes:
+- Yet again sign-in errors. Now affecting both new users and existing users who had signed out.
+
+v1.4.0
+New features:
+- Support for signed programmes. (Enable the new setting 'Use signed programmes whenever available').
+- Live hero items (those in orange on the main menu) now have a context menu 'Watch from the start'.
+
+Fixes:
+- Collection ITV sport failed with KeyError('collection')
+- Again occasional sign-in errors for new users. Hopefully the final fix.
+- A rare failure to list live channels.
+- Adapt to changes at ITVX causing submenu 'My ITVX' to fail sometimes.
+
 v1.3.0
 Fixes:
 - Freezing streams on Kodi 21 (Omega).

diff --git a/plugin.video.viwx/resources/language/resource.language.en_gb/strings.po b/plugin.video.viwx/resources/language/resource.language.en_gb/strings.po
@@ -45,6 +45,10 @@ msgctxt "#30106"
 msgid "Minimum number of items for A-Z listing."
 msgstr ""
 
+msgctxt "#30107"
+msgid "Use signed programmes whenever available."
+msgstr ""
+
 msgctxt "#30110"
 msgid "Logging"
 msgstr ""

diff --git a/plugin.video.viwx/resources/lib/fetch.py b/plugin.video.viwx/resources/lib/fetch.py
@@ -20,9 +20,9 @@
 from resources.lib import utils
 
 
-WEB_TIMEOUT = (3.5, 7)
-USER_AGENT = 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/118.0'
-USER_AGENT_VERSION = '118.0'
+WEB_TIMEOUT = (3.5, 12)
+USER_AGENT = 'Mozilla/5.0 (X11; Linux x86_64; rv:127.0) Gecko/20100101 Firefox/127.0'
+USER_AGENT_VERSION = '127.0'
 
 
 logger = logging.getLogger('.'.join((logger_id, __name__.split('.', 2)[-1])))
@@ -74,6 +74,7 @@ def __init__(self):
         super(HttpSession, self).__init__()
         self.headers.update({
             'User-Agent': USER_AGENT,
+            'Accept-Language':  'en-GB,en;q=0.5',
             'Origin': 'https://www.itv.com',
             'Referer': 'https://www.itv.com/',
             'Sec-Fetch-Dest': 'empty',
@@ -185,10 +186,10 @@ def set_default_cookies(cookiejar: RequestsCookieJar = None):
                     {"FieldID":"s137_c128","IsChecked":0}],
                 "appCodeName":"Mozilla",
                 "appName":"Netscape",
-                "appVersion":"5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
+                "appVersion":"5.0 (X11)",
                 "cookieEnabled":True,
                 "geolocation":"",
-                "language":"en",
+                "language":"en-GB",
                 "platform":"Linux x86_64",
                 "referrer":"",
                 "submissionSource":"prebanner_reject_all",

diff --git a/plugin.video.viwx/resources/lib/itv_account.py b/plugin.video.viwx/resources/lib/itv_account.py
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------------------------------------------------
-#  Copyright (c) 2022-2023 Dimitri Kroon.
+#  Copyright (c) 2022-2024 Dimitri Kroon.
 #  This file is part of plugin.video.viwx.
 #  SPDX-License-Identifier: GPL-2.0-or-later
 #  See LICENSE.txt
@@ -93,11 +93,13 @@ def login(self, uname: str, passw: str):
         Returns True on success, raises exception on failure.
         Raises AuthenticationError if login fails, or other exceptions as they occur, like e.g. FetchError.
         """
+        import requests
+        from resources.lib.telemetry_data import telemetry_factory
         self.account_data = {}
 
         req_data = {
             'grant_type': 'password',
-            'nonce': utils.random_string(20),
+            'nonce': 'cerberus-auth-request-' + str(int(time.time() * 1000)),
             'username': uname,
             'password': passw,
             'scope': 'content'
@@ -106,29 +108,49 @@ def login(self, uname: str, passw: str):
         logger.info("Trying to sign in to ITV account")
         try:
             # Post credentials
-            session_data = fetch.post_json(
-                'https://auth.prd.user.itv.com/auth',
-                req_data,
-                headers={'Accept': 'application/vnd.user.auth.v2+json',
-                         'Akamai-BM-Telemetry': 'a=&&&e=QzNGMDA0RjYzRDkxQ0IxOTgzOTg1NTYzNURDMkJEMjl+WUFBUU5NWWN1S2p0cHl1TEFRQUFJcUNhTkJXaWlSczVGWHRaWUtKRWdCd0VyWDI0L0ZiY051QkZwYUwyWTZldUxkWVQxYTNJSnRtQWxnQkh3UTA1MGt0cWVkR2t4YTVlbzZhZ2VhN1h0QjVTQXZDOE5CYkZsa3Y3cXJZbzB1WGJXbXd3cFlSQkZDeUNTUVZGNWRpTXQwc1RCWm84UGxGVEEvTVF5ZHlJemlob0NuSXpJMFpHRkVjVVJWNndockRLL0xnRzJLZ2poYVdiNDBTYitROW5oRjd3S2JoZW13eEVOazBnWFVJd2ZiRGNYSXNGbG5IUFZZWWswQUl6WWw4SHZ6d0xZaE45V1g3QmlTSnlBcDl3blhFVzVOSm5lbWNBemdYcVlhZzdwRDQ9fjM2ODc3NDV+MzQyMDcyMw==&&&sensor_data=2;3687745;3420723;51,1,0,3,7,144;@ct!5<%NXRG|jFjgYKgceeq[! XBK_A0Rc65Ycf5S^bq2T%w=9X*7`Z`-dYT8~Kk:~u~dyl^o7jis_#kLSea<T^79QMQUy4Wpqdr|ak.o[m8CrC@r4`KuFE]!~L+*NxEuCu9`Ua;!#Cv2{q.uY=)EJZ`D}&de{^m2aPoGFw=J~3oD9|8s@M;z6:Od@Hb~F}EYH+[3ZsT8YpL{vKp#,]b5}MeWPWn4hQ#tX,]5=`A=_xP8)1R?Q?bF BSN5cgK%dEkQ;uq->F-Tq]=E13%8/%s`xD;.TvR#vUQ,1^?ax}s>mX8E(e) >TC-MrykAX_Q4<?ovlt>x6K$B=A>Jv?$%yQLe~ICz=,gdSWIH)}CjmP,Y~o$w/CWgihR&dsvU!m_]PGMO7(^#,?zTD7U[z%QWtjh<%9Bk@6$4+:17$([&;EPC2i3?ad:GccdR$@K-mn]cVwm$ome+7N@{%5Mf2;.bmNUI2HTFutr!$MIdZZ1&AQ@5E>lrNiK^!/:*x?L=04#;Idr%/-r_vC:(<?v5j6h!Sjva[<E2&-,EP(5LKdM9i2!v1F~5y>(=s-G80`.tls}Mc6Gqt q_<ZeYw2g0xC%[3O]ab-ZeH~~Bc0OjvA/1]&35NnK Iy7/i&$M.-_.WB24S}jp, F}x}/<-#5b]-+Z=g4,AGM&%#^:Y;.1vm@!#fv,Ls^2=teE$V04S%noxLc<cFcPh0CF/gx9b8*[gBIwtBu(A}h((Ux_2$;(M|6F3o}6{S>3(uj[C(a{:~u)(i2|R?jIX81PI[ 6lXH6E:5.+U9Zwe]w$e.|WP$w>*7`TNn/pBQAJDO=G}l%WS?c{Ul)s]>,d@_2 z; ];=3LGP^P97R ! IYBzw_eF0v]vNQOvA<y0,HCUN_ICbF>@t<&VaFM76 a5ggg>me_qa$#SIZ`E VYi5aU;@7;(.x^7pz+Z4+&;9_t36_IL!ec03Nqa|nwf}VR0d} cEEBZd69rrC27vad h2527-<BOO:wag$dMMYz&Ws@Oqj#jHe1jJ>1JFrd:}lZ3ns]OWf(Ei3YtIH]E5Plo@G?^Ww*EEH3q>YV2i^y>-8{@gx<zo$PG)=?^i*9`YqKLb80|;J!6>&PL|(SDCo9$s~,Dc+<wx+qr@eaHr0m3p;-I-CaUPm33Lda>J}Bts2~ NzywGXOqi,nM*>mnvW!wt.Ey,n+cf~,+lB@Ik*oD6n_4{<hosR+14^sP[NpB[~q%XGMP|J8wYA=me+VhtcCDNi!g,y5x4Ulj_>JeEf]<2rhE6k:ZhU?FG{;$W8lCy?L_G8Fe@ae?@.1wkA*6V;ht#,A-cJ&mCvw+*k0A;a`IMFV/!hMa.qk#8mENH&4%Q1HdbKn7sMP9VH8nQ+n7NJI]!]B&eVB7ZIo2}q?mL;J6GCW@L/,Evtz5_EveXK2/k^oE=B`5(u%#8?LEM< Z,,)VwuTY1<%y_CkGON(SMX4mhv3;:0&U-AN(C7x{ju?kNMoO)d5r4Yq{8ThC4{~akv(a]#8I<RCH/,[3u3h>vra<7AADhgrH/iNQ6UPTPm_kkmG~1=(`ph:Gw5kp507te#H{NZ_lc#%73:iRp.|Xpt6lfdu.`[sYGW$hMNHns)<LFU: D`LA]a7L/?{2i|:rw=QQ2;9Vl-;YRbNHm.%w7=p5v<(Cu0A52h-!]. C.ac*?viT~GOE[%^x_1vEy6UKGx=;4ESz,>fX`g{b5{l]$D1R2pa7q+VKD,YdRk ^nN_O),U]@~ w=jJxiJBl_f78N2pgi%Ex>u@ilrz+vk &Tv^:<wkP&O05?y[ee/Q3ZDaHY),?t[w X,tMF,6sX,_~~fM`bDf<oO ]wphj]D[{G{oRT>N(vHD?SG;S`:K>qa* ?.g_%v3Y,mcSSUX4-gZk-}b+=$K)!X;)Y1LbQJi~oMN<SFO:G azFGBU{K)oXM4+Q5Zzwp5RC&/~;0G8B-xCcUW2H(_OQ:qnNM=M}#Gph^`Yj!/y-lr.mqm9qH/(wrdh< M));e;(#(-@Maezmc4jqjOpfGT;M*7|q1oo b(;#:?ek5?^EC}UkoK|xb^VyenPD Z[p`-61GH#+3AM,(Y:Y`D&rggi&&) )R9GO; +1Ic2@vtIDT8v-D)pbkl$/$R9E#X~, `i}@W.B 2Xft[Cj%vNZHmq6<TGa4vB^PE]X0CyG}9uu8if0TB+%4MR%%cPWS6V{}m|3g0a3b6Zw7/+GgrK[g69d{<EPGBr:>7Qh3XIz_(ao*.0e&~q,4[mRb)6N@IeC=Cs ](n]n$<T+(+[-.%MRu9z1{LR02b@NHt/y>7s[9(;ZmzG*5,T]8~ |&LlnwY8><x?j<7c/H3^tS;ygW:SnGnXgAXxLQ3z*9u!mL8JwJFuL#:u`l$DgBpe0l4hg#kHnkL {ecIB&t[<QfA:JY9R?l_)wBx}C,y2U9idOQ5C(4WJW#xa%<w;~nW0p?&@TTAXyb?biX.:$%qYq5/!?dBsjI<2Q^t:Z]P|H1e%E8l)&&iQiCK6e.h@:wn[T}u.XW`-KO0/)PKb[tBHn:9@w@.ee;?-)jd&WD[)qO:]Xbv5/G4)`/E?r^k/dalVa>5T19=|Ot-%_:lyPo^i;l)1j21x$ezs$kr@js*eDR;gt1;iw6%1mQif_+%e{{-3?$+Y6G_@.5-_e;Ev{GHZ:|8V5ribps7=I20|]t/(^tj8QC@sO-|bK2YtkGNFXe%3B;A)pCLK5CO#<k2i,]op`G.{Fj{xA=nn8@G,zGgeLf~IkFkLk>ZwkT}HK7ADl!LT{%?*w_W4b%AtC}J9Y0HdXg/`GD`j/Jn3Ldyzq7pze;R|Q<n].o,OIIzSUQfsQ[3X%?eSH-i`g5N=v`(&S8O{0*h@EAbw`z^uJi)55^ETO4Y5|_G7vZ(R_iT#96Z!U}b,[}>:>u!04.?$JeHR{nAp%B(qtz>#!>TAm(]lwdP]rQz|WfG9+oR}AZB47X!F:d+%nbi{?uB`N{X/vFc>#T!k/naNcWSNoP:D7b8J@_WB7|%*{Iz|=n g~G>i$:%GA}|]C Rr3$1RzfNA?NETNY:1Rxqj7J:q^ED@|WC_220Z~jUZ]jg-%?yo>l]k9gEy-ebSD6z?dyoX(s`lj#,IPcUO{ESh,TG~3x(usUXwJSO3hearz9Iloz!nL(=NsI:{,#4~D nDy*,}VVFnw=Iq|46:pPhmY-(v}y+&90&T=EhM2,(Mz3>*$9>K)v/E-abL$CM 108bR_3qUdl3F!8U$JEKB~LVD-?5>Gly%z)l`xI2o*5SvNmKi/BdJ6RxsHO_py>Typ}dQ C2+D]/=wH#Dy7O;3[*jvJ7<N$%NWbRHy4B/Ia=cUpK=/5.3{Wysdw-Vj5U~2A:2X73;QuFve3zV{A[biCzk^w-U$WmCHzq`:z!nAeOmb<6lGl98:sJUaz~]{_%[s07/oHVc6U<}vHCl_$aioS*;>]o[#k0V%EOc@x*9i9yycA4wa9mz@tP$W_WEmWrl#^djVATX9qjJR2,nf4 3E1vRy38wO0pO~M^0cEj(`C2#!o|hf7r#VD.GU<gF rO8nIZ|oe}6xVXDHY_?@{ 1FF7]|GzpGC#$E1M]ic-B/my_zq&uvSNs>67djh:3ie^D)j*MK@|?7 &&.+CEL=.G+~(Pk~rY#~gaH+P3{.b7/o-t@OampbW.faf?da<-15|-eTrWU_B}vl$ KNx!-{{M=I>1Y@(&*0(6 v:]y<ctdN}!Nr@SJWmE2I&^A$x,S=LH&Qe/; q4Z<-vZ,bmkT2QnwR6xgy[9E*%5OzGOOYMUpWhfO!VBFy{><!pdqAgeC&0o4MM$_cJym%2e|Ax-5<T_q~gYJHs+3{~Z3ACCDd8+Ra6sQKsri=h>)gm:wAs&M2vY[A,X=z#:`za*Q@V!slXoS)?jNO?H(6vZ5 gW~)y#*o(@|fc#5ON]{)?|kpeP_GW[5&L~bYkR+OD$y<a+UQTC5}kww{3jx?n;5rk1rY~Nd<TBSSHx~T=|.>WD3YT)8iO&w`IoQ%JC4ndSuD(.n~DVj[D{9sVWBmFpt~3Z!R&=f$T=s7~K4U^*%<M/JP8OS+R>];),BRdIuLx]fp4KXmt#uwC_&.Dr2.Cm2PlyK;~+5E9[5e|xZDEvjSu0dI:gcL<nC}/|l:UQ.8.8853Aon8[TQo9~QB/% f1rAipe.NG%0-LBVP^C9n77/Y$nVC29&k_8b0-3s:0~2 :Ff]re_5e`i9{7X4(/|.dY$NMcDjnmrq6?jkz{vI#(7pA;y!t#k$cc3_kvf=??Q` &_`%z&c5@W=`]WR`nb|UU8ly@~aid*)bn:TplyU;cmU-&&02CGMIE4~)R/mp.Te3Dt0TWkZ@b{W5=@PqQB22-v^w@&u8+bwOsCr74SH-KvZBNHe~CD`[rMGu50s,Ak4p?e*_!7uv3eV>N_&-Qi%(:%|Pxyh-4j7{C%Px7TJOuV@:GM|0Vz9JnSOvPKYl1[6zF9bHS|osA(}!?Ii&WnOZ!piEq)%OkJ%f=,eJb1+=xFIHj+T~SyR_,u Z<KW~@zcG-(iNm;MS4jwx>Y-Z<^@ex-%oNcnyeR3+MlK:m@siw/6et&70MDRJ${[qdu^kZR4fX!a({2H^@cHu}o)/xI6bf8Ue^o,sB6v)iyia3q=M:-AN/RN}h=<X:HdMDv*jCJ66@?1$bNl3,z3O)dS8,cP-V#@<.Orb<P=?x*WO$&FgeU/C!^V<9pfF!Chsg9UK>B4JCRW]M4x=86[YC(T.)~}[4`+@Au<+v$(EO`WpVYwS[d5aH)(x|qpVBp>LS5hVBYc0;KPi]j/hq}g8~def`ZcPJz]Vh; -xD>ho5JbXS@{56kGE41;GNG8<fRny_1B:ei3Fr*:JL(r/Iz[aQhVzt)}}^GekMB>Gh,L/|}| .,qz@5hafky;D^XQ;yBcU2KJ%5w<sxM^sjQx,s^ji|4WWo| tj-D:(;Nz@ C.DpuC(+R!fRdm5Gfr33B:.Wr m/;n@ W,Q$[[PI#EC/OY!<ht<GdMJwJXFk-Z1vG)Y;XqkrM|xh.5ewRnIIe`q8mpo;Y4jU<-[/K{s+Y<A0arIc>a0IgdoP!*8Y}u9EvmB}Orx5cPIR$:kCxAsT#rvcA(S_(qHO~&^Kvvbp{IcgU=_YAkUwGMR:$3K)QK+&~rUFySmub[glNeMsj3 @y;</p,I-gWD<4A(wY-JmL@P4$6V:wYApIY&ukz?}MUFULYAIxVwK@.CZ0m[I;fh2f-I51R#uLJ:OFcOV=sIll]$E2[M<=$o;{Auki3XHIA+GFUVcG/Z#3-fRq{%OT]|a[K*.z[I4~BsWZgHb/ tAi,H?4o{oy]]A-Z!3Tn::-D@#ZW;PC<tFn=b]aCG>MAA.{S+,Gz]eVep-Dd#9.3nPZbNrvVrf w!gb<{28#[kW*;czB[umte=_kO $p.$9<O@K~R!8{_ki6;}3]vAFO|)@i7t&v69UXyjdd7Sp^Qbp0NyHz:iuu9:~UBauo6>jg)zTX,,G=/JZ&A1S{Dq%;%&UupNe[13Wp.6IQ4Hx!qWto2Jo#~ <N}NBFf*MOq/VsaF}yIyEDATuEu6lHK!o`_70[k[N(Fgm]0kPvOTEYe|F{G[U%*2t(T~{?tq9U*Bj7m,C>M!umc;iJ+iN>75KH_lE!3&Sf<iOxDj,59rWc|EkP66ylH9^-KVRZR)]{W#mC!9mn)lVgxKtjg,V+4Kbg~4}y~5Y$sC#O9`/IcK3GbAxs_[BD*{b;YmXKhuZ$kC$hO Sj%uh,R2aSFXDUC:(`|E4*^i3nZVp-U1e+@ACYsazyAzE%Gu*{ihb[ m)S}])j6>v83U3VXp)!O16y?Af%H~{Qvj~1QDlY!0wDcn==vXD_N}s(.1$(Kz!A8Gng^=_6+rhGcgsD~v]o}<Dlo9I$ c_kbVV4mk)dhq_7+c5l6,0zz<h2?eW]=f,0|F3.2,D5B$%eH`iG !&JZy,bd0|6sKk m=Pe]7jUcVMGSRD*l}|G_{Qp)RTgJ,HaG($&<H]ktpsbD]y`Pip<SC%N# j-i^#H5soz39fm#0Bxd{O91M`(>uDwCl*4AWjgaDWb$-Y`%-oqO}ubNl/SdKg};z0C.:bGg5};`l2q[C54(U,(!DV4U=zS-ay56?0g_Enu [Qo=PpTi-ol;>X- .+YjM]EhJQ2} `2r56oKKv-)`Y.[(EqC3uiCwI )2eCNOu+^&o3u+PQW4!(=q:(LU+1g]|S^lT?HM~HqH{Q*Iy-=u`{%j-y^Y@J,yG$3T-)*8eH=X? W]L1E4o33.NJ;b+4m#ePcwZOf|M}]E3dGuXa~n_~4$fjVLIH^tAO*<!{MZ.(7N}hD)es=2.En_4=}9>yk}y`CY@:d*h=.xwSG asIF@^+#Yeb&x(!!kX.VZW:D!he?N3-_I{HPCwC6-,0AM^efaN,SsFZQ?1+ptctI<]159oL==VB%Sa-K>>pMGU*yM/^t-osRFPa^2dMM<_g)4L_xnxW-@J0aVEM=OKu.arTdu[<<;K(se'
-                         }
+            resp = requests.post(
+                'https://auth.prd.user.itv.com/v2/auth',
+                json=req_data,
+                headers={
+                    'user-agent':           fetch.USER_AGENT,
+                    'accept':               'application/vnd.user.auth.v2+json',
+                    'accept-language':      'en-GB,en;q=0.5',
+                    'accept-encoding':      'gzip, deflate',
+                    'content-type':         'application/json',
+                    'akamai-bm-telemetry':  telemetry_factory.get_data(),
+                    'origin':               'https://www.itv.com',
+                    'referer':              'https://www.itv.com/',
+                    'sec-fetch-dest':       'empty',
+                    'sec-fetch-mode':       'cors',
+                    'sec-fetch-site':       'same-site',
+                    'priority':             'u=1',
+                    'te':                   'trailers'
+                },
+                timeout=fetch.WEB_TIMEOUT
             )
-
+            resp.raise_for_status()
+            session_data = resp.json()
             self.account_data = {
                 'vers': SESS_DATA_VERS,
                 'refreshed': time.time(),
                 'itv_session': session_data,
                 'cookies': {'Itv.Session': build_cookie(session_data)}
             }
-        except FetchError as e:
-            # Testing showed that itv hub can return various HTTP status codes on a failed sign in attempt.
-            # Sometimes returning a json string containing the reason of failure, sometimes and HTML page.
+        except requests.HTTPError as e:
             logger.error("Error signing in to ITV account: %r" % e)
-            if isinstance(e, AuthenticationError) or (isinstance(e, HttpError) and e.code in (400, 401, 403)):
-                logger.info("Sign in failed: %r", e)
-                raise AuthenticationError(str(e)) from None
+            status_code = e.response.status_code
+            if status_code in (400, 403):
+                msg = {
+                    400: 'Invalid username or password',
+                    403: 'Forbidden\nIf this error persists wait a few hours before trying again.'
+                }.get(status_code, 'Sign in failed.')
+                logger.info("Sign in failed: %r: %r", e, e.response.content)
+                raise AuthenticationError(msg) from None
             else:
                 raise
+        except:
+            logger.error("Error signing in to ITV account:\n", exc_info=True)
+            raise
         else:
             logger.info("Sign in successful.")
             self._user_id, self._user_nickname, self._expire_time = parse_token(session_data.get('access_token'))