diff --git a/.gh-pages/guide_en.xml b/.gh-pages/guide_en.xml new file mode 100644 index 00000000..74b60703 --- /dev/null +++ b/.gh-pages/guide_en.xml @@ -0,0 +1,32 @@ + +BBC News + Breakfast + BBC News at 9 + BBC News + BBC News at One; Weather + BBC News + BBC News + BBC News + BBC News at Six; Weather + Sportsday + BBC News + Outside Source + BBC News + BBC News with Katty and Christian + BBC News at Ten + The Papers + BBC News + BBC News + The Papers + BBC World News + HARDtalk + BBC World News + Our World + BBC News + The Week in Parliament + BBC News + The Travel Show + BBC News + HARDtalk + BBC World News + World Business Report \ No newline at end of file diff --git a/bin/epg-grabber/index.js b/bin/epg-grabber/index.js index 859328e6..0405e38e 100755 --- a/bin/epg-grabber/index.js +++ b/bin/epg-grabber/index.js @@ -40,6 +40,7 @@ async function main() { dates.forEach(date => { requests.push({ url: site.url({ date, channel }), + date, channel }) }) @@ -54,7 +55,11 @@ async function main() { const site = sites[channel.site] console.log(`${channel.site} - ${channel.xmltv_id}`) - return site.parser({ channel, content: response.data }) + return site.parser({ + channel, + content: response.data, + date: request.date + }) }) .then(utils.sleep(3000)) .catch(console.log) diff --git a/bin/epg-grabber/utils.js b/bin/epg-grabber/utils.js index e721857a..572b9990 100644 --- a/bin/epg-grabber/utils.js +++ b/bin/epg-grabber/utils.js @@ -14,17 +14,21 @@ utils.convertToXMLTV = function ({ channels, programs }) { } for (let program of programs) { - const start = dayjs(program.start).format('YYYYMMDDHHmmss ZZ') - const stop = dayjs(program.stop).format('YYYYMMDDHHmmss ZZ') + const start = program.start ? dayjs(program.start).format('YYYYMMDDHHmmss ZZ') : null + const stop = program.stop ? dayjs(program.stop).format('YYYYMMDDHHmmss ZZ') : null + const title = program.title ? program.title.toString().trim().replace('&', '&') : null + const lang = program.lang ? program.lang : 'en' - output += ` -${program.title}` + if (start && title) { + output += ` + ${title}` - if (program.category) { - output += `${program.category}` + if (program.category) { + output += `${program.category}` + } + + output += '' } - - output += '' } output += '' diff --git a/config/en/config.xml b/config/en/config.xml index adfcc745..e3144de1 100755 --- a/config/en/config.xml +++ b/config/en/config.xml @@ -2,14 +2,550 @@ ../../.gh-pages/guide_en.xml - - rex Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36 Edg/79.0.309.71 - off - 4 - 0 - f + 1 - BBC News + &TV + ?TV + 3e + 4Music + 4seven + 4seven HD + 5* (Freeview) + 5* +1 + 5STAR + 5USA + 5USA +1 + ABN TV + AIT International + Al Jazeera English + Al Jazeera English HD + Alibi + Alibi HD + Alibi+1 + AMC + Animal Planet + Animal Planet +1 + Animal Planet HD + ARY News + at the races + B4U Movies + Baby TV + BBC 1 HD Wales + BBC Alba + BBC Entertainment + BBC News + BBC News HD + BBC Oxford DAB + BBC Parliament + BBC Red Button 1 + BBC Red Button 2 + BBC Red Button 3 + BBC Red Button 4 + BBC Red Button 5 + BBC Red Button HD + BBC Sport Interactive BBC1 + BBC Sport Interactive BBC2 + BBC Sport Interactive BBC3 + BBC World News + BBC1 + BBC1 Cambridgeshire + BBC1 Channel Islands + BBC1 Digital + BBC1 East + BBC1 East Midlands + BBC1 HD + BBC1 HD N Ireland + BBC1 HD Scotland + BBC1 London + BBC1 Midlands + BBC1 N East + BBC1 N Ireland + BBC1 N West + BBC1 North + BBC1 Oxfordshire + BBC1 S East + BBC1 S West + BBC1 Scotland + BBC1 Scotland Digital + BBC1 South + BBC1 Wales + BBC1 Wales Digital + BBC1 West + BBC1 Yorkshire and Lincolnshire + BBC2 + BBC2 Digital + BBC2 East + BBC2 East Midlands + BBC2 HD + BBC2 London + BBC2 Midlands + BBC2 N East + BBC2 N Ireland + BBC2 N West + BBC2 North + BBC2 S East + BBC2 S West + BBC2 Scotland + BBC2 South + BBC2 Wales + BBC2 West + BBC2 West Midlands + BBC4 + BBC4 + BBC4 HD + BEN + Best Direct + BET + BET +1 + bid tv + Bliss + Bloomberg TV + BON TV + Boomerang + Boomerang +1 + Boomerang HD + BT Sport 1 + BT Sport 1 HD + BT Sport 2 + BT Sport 2 HD + BT Sport Europe + BT Sport Europe HD + BT Sport Extra 1 + BT Sport Extra 2 + BT Sport Extra 3 + BT Sport Extra 4 + BT Sport Extra 5 + BT Sport Extra 6 + BT Sport//ESPN + BT Sport//ESPN HD + Capital TV + Cartoon Network + Cartoon Network +1 + Cartoon Network HD + Cartoonito + CBBC + CBBC HD + CBeebies + CBeebies HD + CBS Action + CBS Drama + CBS Reality + CBS Reality +1 + Challenge + Challenge +1 + Channel 4 + Channel 4 + 1 + Channel 4 HD + Channel 4 HD +1 + Channel 5 + Channel 5 +1 + Channel 5 HD + Channel 5+24 + Channel 5+24 (Freeview) + Channel 7 + Channel AKA + Channel S + Chart Show Dance + Chart Show TV + Chelsea TV + Chelsea TV HD + Christmas 24 +1 + CI + CI +1 + CI HD + CITV + Clubland TV + CNBC UK + CNN + Colors + Comedy Central + Comedy Central +1 + Comedy Central Extra + Comedy Central Extra +1 + Comedy Central HD + Community Channel + Community Channel HD + Create and Craft + Dave + Dave HD + Dave ja vu + Deutsche Welle + Discovery + Discovery +1 + Discovery HD + Discovery History + Discovery History +1 + Discovery Home & Health + Discovery Home & Health +1 + Discovery Science + Discovery Science +1 + Discovery Shed + Discovery Turbo + Disney Channel + Disney Channel +1 + Disney Channel HD + Disney Cinemagic + Disney Cinemagic +1 + Disney Cinemagic HD + Disney Junior + Disney Junior +1 + Disney Junior HD + Disney XD + Disney XD +1 + Disney XD HD + DMAX + DMAX+1 + Drama + E! + E! +1 + E! Entertainment Europe + E! Entertainment HD + E4 + E4 +1 + E4 HD + Eden + Eden +1 + Eden HD + Estuary TV + EuroNews + Eurosport + Eurosport 1 HD + Eurosport 2 + Eurosport 2 HD + Eurosport 2 HD + Extreme Sports + FAB TV + Film4 + Film4 +1 + Film4 HD + FilmOn.TV + Flava + Food Network + Food Network +1 + Forces TV + FOX + FOX HD + FOX+1 + FRANCE 24 English + GBC + Gems TV + GOD Channel + GOLD + GOLD +1 + Good Food + Good Food +1 + Good Food HD + H2 + Heart TV + Heat TV + HISTORY + HISTORY +1 + HISTORY HD + Holiday & Cruise Channel + Home + Home +1 + Horror Channel + Horror Channel +1 + Horse & Country + Ideal World + Ideal World + Information TV + Information TV +1 + Investigation Discovery + Investigation Discovery +1 + Irish TV +1 + ITV Anglia + ITV Anglia +1 + ITV Border + ITV Border Scotland + ITV Central + ITV Central +1 + ITV Channel + ITV Encore + ITV Encore HD + ITV Granada + ITV Granada +1 + ITV HD + ITV HD Central + ITV HD Granada + ITV HD Meridian + ITV London + ITV London +1 + ITV Meridian + ITV Meridian +1 + ITV South East +1 + ITV Thames Valley North + ITV Thames Valley South + ITV Tyne Tees + ITV Tynes Tees +1 + ITV Wales + ITV Wales +1 + ITV West + ITV West +1 + ITV Westcountry + ITV Westcountry +1 + ITV Yorkshire + ITV Yorkshire +1 + ITV2 + ITV2 +1 + ITV2 HD + ITV3 + ITV3 HD + ITV3+1 + ITV3+1 (Freeview) + ITV4 + ITV4 + 1 + ITV4 HD + ITVBe + ITVBe HD + ITVBe+1 + JSTV1 + JSTV2 + Kerrang! TV + Kiss TV + Kix + LFCTV HD + Lifetime + Lifetime +1 + Lifetime HD + Liverpool FC TV + London Live + M95 TV Marbella + Made in Bristol + Made in Cardiff + Made in Leeds + Made in Tyne & Wear + Magic TV + MGM Channel + More4 + More4 +1 + More4 HD + Motors TV + Movie Mix + Movies 24 + Movies 24+ + Movies4Men + Movies4Men +1 + MTV + MTV + 1 + MTV Base + MTV Dance + MTV HD + MTV Hits + MTV Live + MTV Live HD + MTV Music + MTV Rocks + MTV Xmas + MUTV + MUTV HD + Nat Geo Wild + Nat Geo Wild HD + National Geographic + National Geographic +1 + National Geographic HD + National Geographic HD +1 + News18 India + NHK World + NHK World HD + Nick Jr + Nick Jr +1 + Nick Jr Too + Nickelodeon + Nickelodeon +1 + Nickelodeon HD + Nicktoons + Notts TV + NOW Christmas + OHTV + OSN Ya Hala! + PBS America + Phoenix CNE + Pick + Pick+1 + Planet Pop + Playboy TV + Plus 1 + Pop + Pop +1 + PopGirl + Premier Sports + price-drop.tv + PTV + QUEST + QUEST +1 + QVC + Racing UK + Real Lives + Real Lives +1 + Really + Red Hot 18s + Red Hot Amateur + Revelation TV + Rishtey + RT + RT HD + RTÉ Jr + RTÉ News Now + RTÉ One + RTÉ One +1 + RTÉ One HD + RTÉ Two + RTÉ Two HD + S4C + Scuzz + Setanta Ireland + Setanta Sports 1 + Showcase + Showcase +1 + Sky 1 + Sky 2 + Sky 3D + Sky Arts + Sky Arts 2 + Sky Arts 2 HD + Sky Arts HD + Sky Atlantic + Sky Atlantic +1 + Sky Atlantic HD + Sky Box Office Digital + Sky Box Office HD1 + Sky Box Office HD2 + Sky Box Office HD3 + Sky Living + Sky Living +1 + Sky Living HD + Sky Movies Action & Adventure + Sky Movies Action & Adventure HD + Sky Movies Comedy + Sky Movies Comedy HD + Sky Movies Crime & Thriller + Sky Movies Crime & Thriller HD + Sky Movies Disney + Sky Movies Disney HD + Sky Movies Drama & Romance + Sky Movies Drama & Romance HD + Sky Movies Family + Sky Movies Family HD + Sky Movies Greats + Sky Movies Greats HD + Sky Movies Premiere + Sky Movies Premiere +1 + Sky Movies Premiere HD + Sky Movies Sci-Fi & Horror + Sky Movies Sci-Fi & Horror HD + Sky Movies Select + Sky Movies Select HD + Sky Movies Showcase + Sky Movies Showcase HD + Sky Movies Superheroes HD + Sky News + Sky News HD + Sky Sports 1 + Sky Sports 1 Interactive + Sky Sports 2 + Sky Sports 2 HD + Sky Sports 2 Interactive + Sky Sports 3 + Sky Sports 3 Interactive + Sky Sports 4 + Sky Sports 4 HD + Sky Sports 4 Interactive + Sky Sports 5 + Sky Sports 5 HD + Sky Sports Box Office + Sky Sports Box Office HD + Sky Sports F1 + Sky Sports F1 HD + Sky Sports HD1 + Sky Sports HD3 + Sky Sports News + Sky Sports News HD + Sky1 +1 + Sky1 HD + Smash Hits! + Sony Channel + Sony Channel +1 + Sony Entertainment TV Asia + Sony Movie Channel + Sony Movie Channel +1 + Sony SAB + Spike + Star Gold + Star Jalsha + Star Life OK + Star Plus + Star Plus HD + Starz TV + STV +1 + STV Central + STV Glasgow + STV HD + STV North + STV North+1 + STV North+1 + Syfy + Syfy +1 + Syfy HD + Talking Pictures + TCM + TCM +1 + TCM HD + Television X + TG4 + TG4 HD + The Active Channel + The Adult Channel + The Africa Channel + The Box + The Jewellery Channel + The Vault + Tiny Pop + Tiny Pop +1 + TLC + TLC +1 + TLC HD + TLC+2 + Travel Channel + Travel Channel +1 + True Christmas + True Crime + True Drama + True Entertainment +1 + True Movies 1 + True Movies 2 + TrueEntertainment + truTV + truTV +1 + TV3 + TV3 (Spanish) + TV5 + Universal Channel + Universal Channel +1 + Universal Channel HD + UTV + UTV +1 + UTV HD + UTV Ireland + UTV Ireland HD + VH1 + Viewers' Wives + Vijay + Vintage TV + Virgin Movies + Viva + Vox Africa + W + W (+1) + W HD + Xtreme Filth + YESTERDAY + YESTERDAY +1 + YourTV + YourTV +1 + Zee Cinema + Zee TV + Zing diff --git a/config/en/guide.html b/config/en/guide.html new file mode 100644 index 00000000..2423bb36 --- /dev/null +++ b/config/en/guide.html @@ -0,0 +1,5689 @@ + + +BBC News Channel TV Listings - TVGuide.co.uk + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

BBC News Channel

+ Back to Grid + + BBC News Channel TV Listings + +
+ +
+ + +
+ +
+ +

Thu 11 Mar

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
6:00am + +
+ Breakfast +
+
+ 11/03/2021
Season 2021

Naga Munchetty and Charlie Stayt present a round-up of national and international news, plus current affairs, arts and entertainment, and weather +
+ +
+
+ + +
Rating: 1.9
+ +
+
+
9:00am + +
+ BBC News at 9 +
+
+ 11/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 3
+ +
+
+
10:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
1:00pm + +
+ BBC News at One; Weather +
+
+ 11/03/2021
+
+ (Sign Language) +
+
+ + +
+
+
1:30pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
5:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
6:00pm + +
+ BBC News at Six; Weather +
+
+ 11/03/2021
+
+ (Subtitles) +
+
+ + +
+
+
6:30pm + +
+ Sportsday +
+
+ Results and analysis from countrywide events +
+ +
+
+ + +
Rating: 3.5
+ +
+
+
6:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
7:00pm + +
+ Outside Source +
+
+ 11/03/2021
Live from the heart of the BBC newsroom, Ros Atkins with an innovative take on the latest global stories. +
+ +
+
+ + +
Rating: 5
+ +
+
+
8:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
9:00pm + +
+ BBC News with Katty and Christian +
+
+ 11/03/2021
Katty Kay in Washington and Christian Fraser in London report on the events that are shaping the world. +
+ +
+
+ + +
+
+
10:00pm + +
+ BBC News at Ten +
+
+ 11/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 2.9
+ +
+
+
10:30pm + +
+ The Papers +
+
+ 11/03/2021 - 1
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
10:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:30pm + +
+ The Papers +
+
+ 11/03/2021 - 2
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
12:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
12:30am + +
+ HARDtalk +
+
+ 11/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ (Repeat) +
+
+ + +
Rating: 4.1
+ +
+
+
1:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
1:30am + +
+ Our World +
+
+ Ischgl: The Super-Spreader Ski Resort
BBC Europe Editor Katya Adler explores what went wrong at the Austrian resort of Ischgl at the start of the global pandemic and asks what lessons can be learned. +
+ (Repeat) +
+
+ + +
Rating: 6
+ +
+
+
2:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:30am + +
+ The Week in Parliament +
+
+ 11/03/2021
A round-up of the week's proceedings in Parliament, presented by David Cornock +
+ (Subtitles) +
+
+ + +
Rating: 2.7
+ +
+
+
3:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:30am + +
+ The Travel Show +
+
+ 06/03/2021
Ade Adepitan looks back at some of The Travel Show's top European adventures, including Rajan Datar testing a Ferrari-themed rollercoaster in Spain. +
+ (Repeat) +
+
+ + +
Rating: 4.6
+ +
+
+
4:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
4:30am + +
+ HARDtalk +
+
+ 11/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ +
+
+ + +
Rating: 4.1
+ +
+
+
5:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
5:30am + +
+ World Business Report +
+
+ 12/03/2021
The latest business news with informed analysis from the world's financial centres. +
+ +
+
+ + +
Rating: 4.7
+ +
+
+

Fri 12 Mar

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
6:00am + +
+ Breakfast +
+
+ 12/03/2021
Season 2021

Naga Munchetty and Charlie Stayt present a round-up of national and international news, plus current affairs, arts and entertainment, and weather +
+ +
+
+ + +
Rating: 1.9
+ +
+
+
9:00am + +
+ BBC News at 9 +
+
+ 12/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 3
+ +
+
+
10:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ (Subtitles) +
+
+ + +
Rating: 3.2
+ +
+
+
1:00pm + +
+ BBC News at One; Weather +
+
+ 12/03/2021
+
+ (Sign Language) +
+
+ + +
+
+
1:30pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
5:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
5:45pm + +
+ The Film Review +
+
+ 12/03/2021
Season 2021

Mark Kermode gives his unique take on the best and worst of the week's film and DVD releases. +
+ +
+
+ + +
Rating: 3.9
+ +
+
+
6:00pm + +
+ BBC News at Six; Weather +
+
+ 12/03/2021
+
+ (Subtitles) +
+
+ + +
+
+
6:30pm + +
+ Sportsday +
+
+ Results and analysis from countrywide events +
+ +
+
+ + +
Rating: 3.5
+ +
+
+
6:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
7:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
8:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
9:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
9:30pm + +
+ HARDtalk +
+
+ 11/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ (Repeat) +
+
+ + +
Rating: 4.1
+ +
+
+
10:00pm + +
+ BBC News at Ten +
+
+ 12/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 2.9
+ +
+
+
10:30pm + +
+ The Papers +
+
+ 12/03/2021 - 1
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
10:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:30pm + +
+ The Papers +
+
+ 12/03/2021 - 2
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
12:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
12:30am + +
+ I Can't Say My Name: Stammering in the Spotlight +
+
+ BBC producer Felicity Baker has a stammer that she has spent her whole life trying to hide. She struggles to say her own name. Now she is stepping out in front of the camera for the first time to talk about what it is like to live with the condition - and she soon finds she is not alone. She meets a rugby player who blames his stammer for his aggressive behaviour on the pitch, a rapper who found music stopped him stammering and the comedy star Michael Palin, whose father stammered but never ever spoke about it +
+ (Subtitles) +
+
+ + +
+
+
1:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
1:30am + +
+ Click +
+
+ 13/03/2021
Season 2021

Click looks at a new way of buying and authenticating very high-value assets online. The team looks at how it works and why it is so secure. +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:30am + +
+ The Week in Parliament +
+
+ 11/03/2021
A round-up of the week's proceedings in Parliament, presented by David Cornock +
+ (Subtitles) (Repeat) +
+
+ + +
Rating: 2.7
+ +
+
+
3:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:30am + +
+ Click +
+
+ 13/03/2021
Season 2021

A comprehensive guide to all the latest gadgets, websites, games and computer industry news. +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:45am + +
+ The Film Review +
+
+ 12/03/2021
Season 2021

Mark Kermode gives his unique take on the best and worst of the week's film and DVD releases. +
+ (Repeat) +
+
+ + +
Rating: 3.9
+ +
+
+
4:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
4:30am + +
+ Our World +
+
+ GameStop: To The Moon and Back
James Clayton meets the investors who made a fortune trading from their bedrooms, the tech supremos who were watching on astonished and the hedge fund giants nursing their losses. +
+ +
+
+ + +
Rating: 6
+ +
+
+
5:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
5:30am + +
+ The Travel Show +
+
+ 13/03/2021
The Travel Show visits Fukushima, northeastern Japan, meeting the surfers hoping to revive the region's fortunes, ten years on from the devastating nuclear disaster. +
+ +
+
+ + +
Rating: 4.6
+ +
+
+

Sat 13 Mar

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
6:00am + +
+ Breakfast +
+
+ 13/03/2021
Season 2021

Charlie Stayt and Naga Munchetty present a round-up of national and international news, plus sports reports, weather forecasts and arts and entertainment features +
+ +
+
+ + +
Rating: 1.9
+ +
+
+
10:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
10:30am + +
+ The Travel Show +
+
+ 13/03/2021
The Travel Show visits Fukushima, northeastern Japan, meeting the surfers hoping to revive the region's fortunes, ten years on from the devastating nuclear disaster. +
+ (Repeat) +
+
+ + +
Rating: 4.6
+ +
+
+
11:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:30am + +
+ Dateline London +
+
+ 13/03/2021
Foreign correspondents currently posted to London look at events in the UK through outsiders' eyes, and at how the issues of the week are being tackled around the world. +
+ +
+
+ + +
Rating: 6.2
+ +
+
+
12:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
12:30pm + +
+ Click +
+
+ 13/03/2021
Season 2021

Click looks at a new way of buying and authenticating very high-value assets online. The team looks at how it works and why it is so secure. +
+ (Repeat) +
+
+ + +
Rating: 3.2
+ +
+
+
1:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
1:30pm + +
+ I Can't Say My Name: Stammering in the Spotlight +
+
+ BBC producer Felicity Baker has a stammer that she has spent her whole life trying to hide. She struggles to say her own name. Now she is stepping out in front of the camera for the first time to talk about what it is like to live with the condition - and she soon finds she is not alone. She meets a rugby player who blames his stammer for his aggressive behaviour on the pitch, a rapper who found music stopped him stammering and the comedy star Michael Palin, whose father stammered but never ever spoke about it +
+ (Subtitles) (Repeat) +
+
+ + +
+
+
2:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:30pm + +
+ HARDtalk +
+
+ 11/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ (Repeat) +
+
+ + +
Rating: 4.1
+ +
+
+
3:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:30pm + +
+ Click +
+
+ 13/03/2021
Season 2021

Click looks at a new way of buying and authenticating very high-value assets online. The team looks at how it works and why it is so secure. +
+ (Repeat) +
+
+ + +
Rating: 3.2
+ +
+
+
4:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
4:30pm + +
+ The Media Show +
+
+ 13/03/2021
Social media, anti-social media, breaking news, faking news. This is the programme about a revolution in media, with Amol Rajan, the BBC's media editor. +
+ (Repeat) +
+
+ + +
+
+
5:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
5:30pm + +
+ I Can't Say My Name: Stammering in the Spotlight +
+
+ BBC producer Felicity Baker has a stammer that she has spent her whole life trying to hide. She struggles to say her own name. Now she is stepping out in front of the camera for the first time to talk about what it is like to live with the condition - and she soon finds she is not alone. She meets a rugby player who blames his stammer for his aggressive behaviour on the pitch, a rapper who found music stopped him stammering and the comedy star Michael Palin, whose father stammered but never ever spoke about it +
+ (Subtitles) (Repeat) +
+
+ + +
+
+
6:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
6:30pm + +
+ Sportsday +
+
+ Results and analysis from countrywide events +
+ +
+
+ + +
Rating: 3.5
+ +
+
+
6:45pm + +
+ Click +
+
+ 13/03/2021
Season 2021

A comprehensive guide to all the latest gadgets, websites, games and computer industry news. +
+ (Repeat) +
+
+ + +
Rating: 3.2
+ +
+
+
7:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
7:30pm + +
+ The Film Review +
+
+ 12/03/2021
Season 2021

Mark Kermode gives his unique take on the best and worst of the week's film and DVD releases. +
+ (Repeat) +
+
+ + +
Rating: 3.9
+ +
+
+
7:45pm + +
+ Sportsday +
+
+ Results and analysis from countrywide events +
+ +
+
+ + +
Rating: 3.5
+ +
+
+
8:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
8:30pm + +
+ I Can't Say My Name: Stammering in the Spotlight +
+
+ BBC producer Felicity Baker has a stammer that she has spent her whole life trying to hide. She struggles to say her own name. Now she is stepping out in front of the camera for the first time to talk about what it is like to live with the condition - and she soon finds she is not alone. She meets a rugby player who blames his stammer for his aggressive behaviour on the pitch, a rapper who found music stopped him stammering and the comedy star Michael Palin, whose father stammered but never ever spoke about it +
+ (Subtitles) (Repeat) +
+
+ + +
+
+
9:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
9:30pm + +
+ Our World +
+
+ GameStop: To The Moon and Back
James Clayton meets the investors who made a fortune trading from their bedrooms, the tech supremos who were watching on astonished and the hedge fund giants nursing their losses. +
+ (Repeat) +
+
+ + +
Rating: 6
+ +
+
+
10:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
10:30pm + +
+ The Papers +
+
+ 13/03/2021 - 1
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
11:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:30pm + +
+ The Papers +
+
+ 13/03/2021 - 2
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
11:45pm + +
+ The Film Review +
+
+ 12/03/2021
Season 2021

Mark Kermode gives his unique take on the best and worst of the week's film and DVD releases. +
+ (Repeat) +
+
+ + +
Rating: 3.9
+ +
+
+
12:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
12:30am + +
+ HARDtalk +
+
+ 11/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ (Repeat) +
+
+ + +
Rating: 4.1
+ +
+
+
1:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
1:30am + +
+ The Travel Show +
+
+ 13/03/2021
The Travel Show visits Fukushima, northeastern Japan, meeting the surfers hoping to revive the region's fortunes, ten years on from the devastating nuclear disaster. +
+ (Repeat) +
+
+ + +
Rating: 4.6
+ +
+
+
2:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:30am + +
+ Dateline London +
+
+ 13/03/2021
Foreign correspondents currently posted to London look at events in the UK through outsiders' eyes, and at how the issues of the week are being tackled around the world. +
+ (Repeat) +
+
+ + +
Rating: 6.2
+ +
+
+
3:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:30am + +
+ Our World +
+
+ GameStop: To The Moon and Back
James Clayton meets the investors who made a fortune trading from their bedrooms, the tech supremos who were watching on astonished and the hedge fund giants nursing their losses. +
+ (Repeat) +
+
+ + +
Rating: 6
+ +
+
+
4:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
4:30am + +
+ Click +
+
+ 13/03/2021
Season 2021

Click looks at a new way of buying and authenticating very high-value assets online. The team looks at how it works and why it is so secure. +
+ (Repeat) +
+
+ + +
Rating: 3.2
+ +
+
+
5:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
5:30am + +
+ The Week in Parliament +
+
+ 11/03/2021
A round-up of the week's proceedings in Parliament, presented by David Cornock +
+ (Subtitles) (Repeat) +
+
+ + +
Rating: 2.7
+ +
+
+

Sun 14 Mar

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
6:00am + +
+ Breakfast +
+
+ 14/03/2021
Season 2021

Ben Thompson and Nina Warhurst present a round-up of national and international news, plus current affairs, arts and entertainment, and weather +
+ +
+
+ + +
Rating: 1.9
+ +
+
+
9:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
9:30am + +
+ The Papers +
+
+ 14/03/2021 - 1
A lively, informed and in-depth conversation about the Sunday papers. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
10:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
10:30am + +
+ I Can't Say My Name: Stammering in the Spotlight +
+
+ BBC producer Felicity Baker has a stammer that she has spent her whole life trying to hide. She struggles to say her own name. Now she is stepping out in front of the camera for the first time to talk about what it is like to live with the condition - and she soon finds she is not alone. She meets a rugby player who blames his stammer for his aggressive behaviour on the pitch, a rapper who found music stopped him stammering and the comedy star Michael Palin, whose father stammered but never ever spoke about it +
+ (Subtitles) (Repeat) +
+
+ + +
+
+
11:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:30am + +
+ Dateline London +
+
+ 13/03/2021
Foreign correspondents currently posted to London look at events in the UK through outsiders' eyes, and at how the issues of the week are being tackled around the world. +
+ (Repeat) +
+
+ + +
Rating: 6.2
+ +
+
+
12:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
12:30pm + +
+ Click +
+
+ 13/03/2021
Season 2021

Click looks at a new way of buying and authenticating very high-value assets online. The team looks at how it works and why it is so secure. +
+ (Repeat) +
+
+ + +
Rating: 3.2
+ +
+
+
1:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
1:30pm + +
+ The Travel Show +
+
+ 13/03/2021
The Travel Show visits Fukushima, northeastern Japan, meeting the surfers hoping to revive the region's fortunes, ten years on from the devastating nuclear disaster. +
+ (Repeat) +
+
+ + +
Rating: 4.6
+ +
+
+
2:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:30pm + +
+ The Week in Parliament +
+
+ 11/03/2021
A round-up of the week's proceedings in Parliament, presented by David Cornock +
+ (Subtitles) (Repeat) +
+
+ + +
Rating: 2.7
+ +
+
+
3:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:30pm + +
+ The Media Show +
+
+ 13/03/2021
Social media, anti-social media, breaking news, faking news. This is the programme about a revolution in media, with Amol Rajan, the BBC's media editor. +
+ (Repeat) +
+
+ + +
+
+
4:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
4:30pm + +
+ I Can't Say My Name: Stammering in the Spotlight +
+
+ BBC producer Felicity Baker has a stammer that she has spent her whole life trying to hide. She struggles to say her own name. Now she is stepping out in front of the camera for the first time to talk about what it is like to live with the condition - and she soon finds she is not alone. She meets a rugby player who blames his stammer for his aggressive behaviour on the pitch, a rapper who found music stopped him stammering and the comedy star Michael Palin, whose father stammered but never ever spoke about it +
+ (Subtitles) (Repeat) +
+
+ + +
+
+
5:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
6:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
6:30pm + +
+ Sportsday +
+
+ Results and analysis from countrywide events +
+ +
+
+ + +
Rating: 3.5
+ +
+
+
6:45pm + +
+ The Film Review +
+
+ 12/03/2021
Season 2021

Mark Kermode gives his unique take on the best and worst of the week's film and DVD releases. +
+ (Repeat) +
+
+ + +
Rating: 3.9
+ +
+
+
7:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
7:30pm + +
+ Sellafield's 'Toxic Culture' +
+
+ Reporter Jim Reed investigates allegations of a culture of bullying and harassment at the Sellafield nuclear site +
+ +
+
+ + +
+
+
7:45pm + +
+ Sportsday +
+
+ Results and analysis from countrywide events +
+ +
+
+ + +
Rating: 3.5
+ +
+
+
8:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
8:30pm + +
+ The Travel Show +
+
+ 13/03/2021
The Travel Show visits Fukushima, northeastern Japan, meeting the surfers hoping to revive the region's fortunes, ten years on from the devastating nuclear disaster. +
+ (Repeat) +
+
+ + +
Rating: 4.6
+ +
+
+
9:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
9:30pm + +
+ Our World +
+
+ GameStop: To The Moon and Back
James Clayton meets the investors who made a fortune trading from their bedrooms, the tech supremos who were watching on astonished and the hedge fund giants nursing their losses. +
+ (Repeat) +
+
+ + +
Rating: 6
+ +
+
+
10:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
10:30pm + +
+ The Papers +
+
+ 14/03/2021 - 2
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
11:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:30pm + +
+ The Papers +
+
+ 14/03/2021 - 3
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
11:45pm + +
+ The Film Review +
+
+ 12/03/2021
Season 2021

Mark Kermode gives his unique take on the best and worst of the week's film and DVD releases. +
+ (Repeat) +
+
+ + +
Rating: 3.9
+ +
+
+
12:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
12:30am + +
+ HARDtalk +
+
+ 15/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ +
+
+ + +
Rating: 4.1
+ +
+
+
1:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
1:30am + +
+ I Can't Say My Name: Stammering in the Spotlight +
+
+ BBC producer Felicity Baker has a stammer that she has spent her whole life trying to hide. She struggles to say her own name. Now she is stepping out in front of the camera for the first time to talk about what it is like to live with the condition - and she soon finds she is not alone. She meets a rugby player who blames his stammer for his aggressive behaviour on the pitch, a rapper who found music stopped him stammering and the comedy star Michael Palin, whose father stammered but never ever spoke about it +
+ (Subtitles) (Repeat) +
+
+ + +
+
+
2:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:30am + +
+ The Week in Parliament +
+
+ 11/03/2021
A round-up of the week's proceedings in Parliament, presented by David Cornock +
+ (Subtitles) (Repeat) +
+
+ + +
Rating: 2.7
+ +
+
+
3:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:30am + +
+ Dateline London +
+
+ 13/03/2021
Foreign correspondents currently posted to London look at events in the UK through outsiders' eyes, and at how the issues of the week are being tackled around the world. +
+ (Repeat) +
+
+ + +
Rating: 6.2
+ +
+
+
4:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
4:30am + +
+ HARDtalk +
+
+ 15/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ (Repeat) +
+
+ + +
Rating: 4.1
+ +
+
+
5:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
5:30am + +
+ World Business Report +
+
+ 15/03/2021
The latest business news with informed analysis from the world's financial centres. +
+ +
+
+ + +
Rating: 4.7
+ +
+
+

Mon 15 Mar

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
6:00am + +
+ Breakfast +
+
+ 15/03/2021
Season 2021

Louise Minchin and Dan Walker present a round-up of national and international news, plus current affairs, arts and entertainment, and weather +
+ +
+
+ + +
Rating: 1.9
+ +
+
+
9:00am + +
+ BBC News at 9 +
+
+ 15/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 3
+ +
+
+
10:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
1:00pm + +
+ BBC News at One; Weather +
+
+ 15/03/2021
+
+ (Sign Language) +
+
+ + +
+
+
1:15pm + +
+ The Oscars +
+
+ The Nominations
Season 2021

Jane Hill presents live coverage of the nominations for the 93rd Academy Awards +
+ +
+
+ + +
+
+
2:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
5:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
6:00pm + +
+ BBC News at Six; Weather +
+
+ 15/03/2021
+
+ (Subtitles) +
+
+ + +
+
+
6:30pm + +
+ Sportsday +
+
+ Results and analysis from countrywide events +
+ +
+
+ + +
Rating: 3.5
+ +
+
+
6:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
7:00pm + +
+ Outside Source +
+
+ 15/03/2021
Live from the heart of the BBC newsroom, Ros Atkins with an innovative take on the latest global stories. +
+ +
+
+ + +
Rating: 5
+ +
+
+
8:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
9:00pm + +
+ BBC World News America +
+
+ 15/03/2021
In-depth reports on the major international and US news of the day, presented from Washington DC. +
+ +
+
+ + +
Rating: 2.5
+ +
+
+
9:30pm + +
+ BBC News with Katty and Christian +
+
+ 15/03/2021
Katty Kay in Washington and Christian Fraser in London report on the events that are shaping the world. +
+ +
+
+ + +
+
+
10:00pm + +
+ BBC News at Ten +
+
+ 15/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 2.9
+ +
+
+
10:30pm + +
+ The Papers +
+
+ 15/03/2021 - 1
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
10:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:30pm + +
+ The Papers +
+
+ 15/03/2021 - 2
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
12:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
12:30am + +
+ HARDtalk +
+
+ 16/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ +
+
+ + +
Rating: 4.1
+ +
+
+
1:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
1:30am + +
+ The Media Show +
+
+ 13/03/2021
Social media, anti-social media, breaking news, faking news. This is the programme about a revolution in media, with Amol Rajan, the BBC's media editor. +
+ (Repeat) +
+
+ + +
+
+
2:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:30am + +
+ Monday in Parliament +
+
+ 15/03/2021
Highlights of the day's proceedings in Parliament, presented by David Cornock +
+ (Repeat) +
+
+ + +
Rating: 4
+ +
+
+
3:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:30am + +
+ The Travel Show +
+
+ 13/03/2021
The Travel Show visits Fukushima, northeastern Japan, meeting the surfers hoping to revive the region's fortunes, ten years on from the devastating nuclear disaster. +
+ (Repeat) +
+
+ + +
Rating: 4.6
+ +
+
+
4:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
4:30am + +
+ HARDtalk +
+
+ 16/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ (Repeat) +
+
+ + +
Rating: 4.1
+ +
+
+
5:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
5:30am + +
+ World Business Report +
+
+ 16/03/2021
The latest business news with informed analysis from the world's financial centres. +
+ +
+
+ + +
Rating: 4.7
+ +
+
+

Tue 16 Mar

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
6:00am + +
+ Breakfast +
+
+ 16/03/2021
Season 2021

Louise Minchin and Dan Walker present a round-up of national and international news, plus current affairs, arts and entertainment, and weather +
+ +
+
+ + +
Rating: 1.9
+ +
+
+
9:00am + +
+ BBC News at 9 +
+
+ 16/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 3
+ +
+
+
10:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
1:00pm + +
+ BBC News at One; Weather +
+
+ 16/03/2021
+
+ (Sign Language) +
+
+ + +
+
+
1:30pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
5:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
6:00pm + +
+ BBC News at Six; Weather +
+
+ 16/03/2021
+
+ (Subtitles) +
+
+ + +
+
+
6:30pm + +
+ Sportsday +
+
+ Results and analysis from countrywide events +
+ +
+
+ + +
Rating: 3.5
+ +
+
+
6:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
7:00pm + +
+ Outside Source +
+
+ 16/03/2021
Live from the heart of the BBC newsroom, Ros Atkins with an innovative take on the latest global stories. +
+ +
+
+ + +
Rating: 5
+ +
+
+
8:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
9:00pm + +
+ BBC World News America +
+
+ 16/03/2021
In-depth reports on the major international and US news of the day, presented from Washington DC. +
+ +
+
+ + +
Rating: 2.5
+ +
+
+
9:30pm + +
+ BBC News with Katty and Christian +
+
+ 16/03/2021
Katty Kay in Washington and Christian Fraser in London report on the events that are shaping the world. +
+ +
+
+ + +
+
+
10:00pm + +
+ BBC News at Ten +
+
+ 16/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 2.9
+ +
+
+
10:30pm + +
+ The Papers +
+
+ 16/03/2021 - 1
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
10:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:30pm + +
+ The Papers +
+
+ 16/03/2021 - 2
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
12:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
12:30am + +
+ HARDtalk +
+
+ 17/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ +
+
+ + +
Rating: 4.1
+ +
+
+
1:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
1:30am + +
+ Our World +
+
+ GameStop: To The Moon and Back
James Clayton meets the investors who made a fortune trading from their bedrooms, the tech supremos who were watching on astonished and the hedge fund giants nursing their losses. +
+ (Repeat) +
+
+ + +
Rating: 6
+ +
+
+
2:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:30am + +
+ Tuesday in Parliament +
+
+ 16/03/2021
Presented by David Cornock +
+ (Repeat) +
+
+ + +
Rating: 10
+ +
+
+
3:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:30am + +
+ Panorama +
+
+ Cashing in on Covid - Panorama
As the government faces mounting criticism that well-connected people made millions out of Britain's PPE crisis, Panorama investigates who won out. More than £12billion was spent in the first six months of the pandemic on contracts to provide personal protective equipment. Reporter Richard Bilton meets one man who made £40million on a deal, and speaks to others who felt ignored in favour of less experienced suppliers. As the government refuses to reveal the full details of all its so-called VIP deals, the programme reveals the high-profile connections to one lucrative contract +
+ (Subtitles) (Repeat) +
+
+ + +
Rating: 6.1
+ +
+
+
4:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
4:30am + +
+ HARDtalk +
+
+ 17/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ (Repeat) +
+
+ + +
Rating: 4.1
+ +
+
+
5:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
5:30am + +
+ World Business Report +
+
+ 17/03/2021
The latest business news with informed analysis from the world's financial centres. +
+ +
+
+ + +
Rating: 4.7
+ +
+
+

Wed 17 Mar

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
6:00am + +
+ Breakfast +
+
+ 17/03/2021
Season 2021

Louise Minchin and Dan Walker present a round-up of national and international news, plus current affairs, arts and entertainment, and weather +
+ +
+
+ + +
Rating: 1.9
+ +
+
+
9:00am + +
+ BBC News at 9 +
+
+ 17/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 3
+ +
+
+
10:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
1:00pm + +
+ BBC News at One; Weather +
+
+ 17/03/2021
+
+ (Sign Language) +
+
+ + +
+
+
1:30pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
5:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
6:00pm + +
+ BBC News at Six; Weather +
+
+ 17/03/2021
+
+ (Subtitles) +
+
+ + +
+
+
6:30pm + +
+ Sportsday +
+
+ Results and analysis from countrywide events +
+ +
+
+ + +
Rating: 3.5
+ +
+
+
6:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
7:00pm + +
+ Outside Source +
+
+ 18/03/2021
Live from the heart of the BBC newsroom, Ros Atkins with an innovative take on the latest global stories. +
+ +
+
+ + +
Rating: 5
+ +
+
+
8:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
9:00pm + +
+ BBC World News America +
+
+ 17/03/2021
In-depth reports on the major international and US news of the day, presented from Washington DC. +
+ +
+
+ + +
Rating: 2.5
+ +
+
+
9:30pm + +
+ BBC News with Katty and Christian +
+
+ 17/03/2021
Katty Kay in Washington and Christian Fraser in London report on the events that are shaping the world. +
+ +
+
+ + +
+
+
10:00pm + +
+ BBC News at Ten +
+
+ 17/03/2021
+
+ (Subtitles) +
+
+ + +
Rating: 2.9
+ +
+
+
10:30pm + +
+ The Papers +
+
+ 17/03/2021 - 1
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
10:45pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:00pm + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
11:30pm + +
+ The Papers +
+
+ 17/03/2021 - 2
No need to wait until tomorrow morning to see what's in the papers - tune in for a lively and informed conversation about the next day's headlines. +
+ +
+
+ + +
Rating: 2.8
+ +
+
+
12:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
12:30am + +
+ HARDtalk +
+
+ 18/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ +
+
+ + +
Rating: 4.1
+ +
+
+
1:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
1:30am + +
+ The Travel Show +
+
+ 13/03/2021
The Travel Show visits Fukushima, northeastern Japan, meeting the surfers hoping to revive the region's fortunes, ten years on from the devastating nuclear disaster. +
+ (Repeat) +
+
+ + +
Rating: 4.6
+ +
+
+
2:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
2:30am + +
+ Wednesday in Parliament +
+
+ 17/03/2021
The day's political proceedings, presented by David Cornock +
+ (Repeat) +
+
+ + +
Rating: 6
+ +
+
+
3:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
3:30am + +
+ Click +
+
+ 13/03/2021
Season 2021

Click looks at a new way of buying and authenticating very high-value assets online. The team looks at how it works and why it is so secure. +
+ (Repeat) +
+
+ + +
Rating: 3.2
+ +
+
+
4:00am + +
+ BBC News +
+
+ The latest national and international stories as they break +
+ +
+
+ + +
Rating: 3.2
+ +
+
+
4:30am + +
+ HARDtalk +
+
+ 18/03/2021
In-depth interviews with hard-hitting questions and sensitive topics being covered as famous personalities from all walks of life talk about the highs and lows in their lives. +
+ (Repeat) +
+
+ + +
Rating: 4.1
+ +
+
+
5:00am + +
+ BBC World News +
+
+ The latest international news from the BBC. +
+ +
+
+ + +
Rating: 2.9
+ +
+
+
5:30am + +
+ World Business Report +
+
+ 18/03/2021
The latest business news with informed analysis from the world's financial centres. +
+ +
+
+ + +
Rating: 4.7
+ +
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/en/sites/tvguide.co.uk.js b/config/en/sites/tvguide.co.uk.js new file mode 100644 index 00000000..453415b3 --- /dev/null +++ b/config/en/sites/tvguide.co.uk.js @@ -0,0 +1,45 @@ +const jsdom = require('jsdom') +const { JSDOM } = jsdom +const dayjs = require('dayjs') +var customParseFormat = require('dayjs/plugin/customParseFormat') +dayjs.extend(customParseFormat) + +module.exports = { + url: function ({ date, channel }) { + return `https://www.tvguide.co.uk/mobile/channellisting.asp?ch=${channel.site_id}` + }, + parser: function ({ channel, content, date }) { + const programs = [] + const dom = new JSDOM(content) + const channelListings = dom.window.document.querySelector('#channel-listings') + const rows = channelListings.querySelectorAll('table:first-of-type > tbody > tr') + + rows.forEach(tr => { + const time = (tr.getElementsByClassName('time')[0] || { innerHTML: '' }).innerHTML + .toString() + .trim() + const title = (tr.getElementsByClassName('title')[0] || { innerHTML: '' }).innerHTML + .toString() + .trim() + + if (time && title) { + const start = dayjs(time, 'h:mma') + .set('D', date.get('D')) + .set('M', date.get('M')) + .set('y', date.get('y')) + .toString() + + programs.push({ + title, + description: null, + start, + stop: null, + lang: 'en', + channel: channel['xmltv_id'] + }) + } + }) + + return programs + } +} diff --git a/config/ru/siteini.pack/tv.yandex.ru.ini b/config/ru/siteini.pack/tv.yandex.ru.ini deleted file mode 100755 index 53566d00..00000000 --- a/config/ru/siteini.pack/tv.yandex.ru.ini +++ /dev/null @@ -1,152 +0,0 @@ -**------------------------------------------------------------------------------------------------ -* @header_start -* WebGrab+Plus ini for grabbing EPG data from TvGuide websites -* @Site: tv.yandex.ru -* @MinSWversion: V1.57 -* @Revision 7 - [18/02/2019] EgiszZ -* - ini fixes based on new web site design (title) -* @Revision 6 - [14/10/2018] FlyGoneCrazy -* - ini fixes based on new web site design -* @Revision 5 - [08/11/2017] Blackbear199 -* - added UA and TR to channels.xml creation -* @Revision 4 - [30/10/2017] Blackbear199 -* - site changes -* @Revision 3 - [05/04/2017] Blackbear199 -* - site changes -* @Revision 2 - [28/07/2016] Blackbear199 -* - title match fix -* @Revision 1 - [25/07/2016] Blackbear199 -* - added subtitle -* - added country -* - added urlchannellogo -* - added showicon -* - rewrote season/episode to version 56.25+ format. -* - set desired output,onscreen(S5 E9/10) or xmltv_ns(4.8/9.) on site{...} line.default onscreen. -* @Revision 0 - [02/03/2016] Blackbear199 -* - creation -* @Remarks: your_remarks -* @header_end -**------------------------------------------------------------------------------------------------ - -*site {loadcookie=cookie_file.txt} -site {url=tv.yandex.ru|timezone=Europe/Moscow|maxdays=6|cultureinfo=ru-RU|charset=UTF-8|titlematchfactor=90} -site {ratingsystem=RU|episodesystem=onscreen} -* -url_index{url|https://tv.yandex.ru/##region##/channels/##channel##?date=|urldate|&period=all-day} -url_index.headers {customheader=Accept-Encoding=gzip,deflate} -urldate.format {datestring|yyyy-MM-dd} -* -scope.range{(urlindex)|end} -global_temp_1.modify {substring(type=regex)|'config_site_id' "^(\d+)##"} -global_temp_2.modify {substring(type=regex)|'config_site_id' "##(\d+)$"} -url_index.modify {replace|##region##|'global_temp_1'} -url_index.modify {replace|##channel##|'global_temp_2'} -end_scope -* -index_urlchannellogo {url(scope=datelogo)|https:||/>} -* -index_showsplit.scrub {multi|"events":[{||}]}|}]}} -index_showsplit.modify {replace|\},\{|\|} -* -index_urlshow {url|https://tv.yandex.ru|"url":"||",|",} -index_urlshow.headers {customheader=Accept-Encoding=gzip,deflate} -* -index_temp_1.scrub {regex||"start":"\d{4}-\d{2}-\d{2}T\d{1,2}:\d{2}:\d{2}([-+]\d{2}:\d{2})"||} -index_start.scrub {regex||"start":"(\d{4}-\d{2}-\d{2}T\d{1,2}:\d{2}:\d{2})[-+]\d{2}:\d{2}"||} -index_stop.scrub {regex||"finish":"(\d{4}-\d{2}-\d{2}T\d{1,2}:\d{2}:\d{2})[-+]\d{2}:\d{2}"||} -*index_title.scrub {(debug)single||||} -index_title.scrub {regex||"finish":"[^"]*"(?:,"liveId":\d*,"yacFamilyId":\d*)?,"title":"(.*?)","||} -index_title.scrub {regex||"finish":"[^"]*"(?:,"yacFamilyId":\d*)?,"title":"(.*?)","||} -*index_title.scrub {single|,"title":"||"|"} -*index_title.scrub {(debug)single|

||

|} -index_subtitle.scrub {single|"episodeTitle":"||","|","} -* -scope.range{(indexshowdetails)|end} -index_start.modify {calculate(format=date,unix)} -index_stop.modify {calculate(format=date,unix)} -index_temp_2.modify {substring(type=char)|'index_temp_1' 0 1} -index_temp_1.modify {remove(type=char)|0 1} -index_temp_1.modify {calculate(format=F0)|3600 *} -index_start.modify {calculate('index_temp_2' "-" format=F0)|'index_start' 'index_temp_1' +} -index_start.modify {calculate('index_temp_2' "+" format=F0)|'index_start' 'index_temp_1' -} -index_stop.modify {calculate('index_temp_2' "-" format=F0)|'index_stop' 'index_temp_1' +} -index_stop.modify {calculate('index_temp_2' "+" format=F0)|'index_stop' 'index_temp_1' -} -index_title.modify {cleanup(style=jsondecode)} -index_title.modify {replace(type=regex)|(.*)(","title":")|} -index_subtitle.modify {clear('index_title')} -index_subtitle.modify {substring(type=regex)|"\s-\s\"(.*?)\""} -* -index_episode.modify {substring(type=regex pattern="Сезон 'S1'. 'E1'/'Et1'""Сезон 'S1'. 'E1'""'E1'/'Et1'""'E1'")|'index_title' "\s((?:Сезон\s\d+\.\s)?(?:\d+-я\s[и-]\s)?\d+-я\sсери[ия])"} -*index_episode.modify {replace|-я и |/} -*index_episode.modify {replace|-я - |/} -*index_episode.modify {remove(type=regex)|-я сери[ия]} -index_title.modify {remove(type=regex)|\.*\s(?:Сезон \d+\.\s)?(?:\d+-я\s[и-]\s)?\d+-я\sсери[ия](?:\s-*\s*\".*?\")?} -* -*index_subtitle.modify {substring(type=regex)|"\s-\s\"(.*?)\""} -index_category.scrub {single|"type":{|"name":"|"|}} -end_scope -* -title.modify {addstart|'index_title'} *index_title and details title often different -title.modify {replace(type=regex)|(.*)(","title":")|} -*description.scrub {(debug)||||} -description.scrub {single||" />} -*description.scrub {(debug)regex||"description":"(.+?)","countries"||} -*description.modify {replace(type=regex)|(","(.*))|} -description.modify {cleanup} -*director.scrub {multi|Режиссёр|||} -director.scrub {multi|Режиссёр|||} -*director.scrub {(debug)regex||Режиссёр(.+?)||} -*actor.scrub {(debug)multi||||} -*actor.scrub {multi|В ролях|||} -actor.scrub {regex||\{"id":\d+,"name":"(.+?)","role":"actor","||} -actor.modify {replace(type=regex)|(.*)(,"name":")|} -*actor.scrub {(debug)multi|"name":"||","role":"actor","|","role":"actor","} -*actor.modify {(debug)regex||"name":"(.+?)","role":"actor","||} -*presenter.scrub {multi|Ведущие|||} -presenter.scrub {multi|Ведущий|itemProp="presenter">||} -rating.scrub {single||||} -rating.modify {cleanup(tags="<"">")} -*rating.scrub {single|class="program-statistics__value">|||} -*starrating.scrub {single|Рейтинг КиноПоиска|">||} -starrating.scrub {single|class="program-statistics__value">|||} -productiondate.scrub {single|Страна и год|class="program-details__text">||} -productiondate.modify {replace(type=regex)|(.*)(, )|} -country.scrub {single|Страна и год|class="program-details__text">||} -country.modify {replace(type=regex)|(, \d{4})|} -showicon.scrub {single|
|')">} -showicon.modify {addstart(not "")|https:} -* -** _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ -** ##### CHANNEL FILE CREATION (only to create the xxx-channel.xml file) -** -** @auto_xml_channel_start -*url_index{url|https://tv.yandex.ru/ajax?params=%5B%7B%22name%22%3A%22i-tv-region%22%2C%22method%22%3A%22get%22%2C%22args%22%3A%7B%22params%22%3A%22%7B%5C%22type%5C%22%3A%5C%22regional%5C%22%2C%5C%22packageIds%5C%22%3A%5B%5D%2C%5C%22limit%5C%22%3A500%2C%5C%22fields%5C%22%3A%5C%22schedules%2Cchannels%2Cfinish%2Cchannel%2Cid%2Ctitle%2Cfavourite%5C%22%2C%5C%22lang%5C%22%3A%5C%22ru%5C%22%7D%22%2C%22cacheKey%22%3A%22channels%3Fparams%3D%7B%5C%22type%5C%22%3A%5C%22regional%5C%22%2C%5C%22packageIds%5C%22%3A%5B%5D%2C%5C%22limit%5C%22%3A500%2C%5C%22fields%5C%22%3A%5B%5C%22schedules%5C%22%2C%5C%22channels%5C%22%2C%5C%22finish%5C%22%2C%5C%22channel%5C%22%2C%5C%22id%5C%22%2C%5C%22title%5C%22%2C%5C%22favourite%5C%22%5D%7D%22%2C%22userRegion%22%3A%22|subpage|%22%2C%22resource%22%3A%22channels%22%2C%22ncrd%22%3A1469479392374%7D%7D%2C%7B%22name%22%3A%22i-tv-region%22%2C%22method%22%3A%22get%22%2C%22args%22%3A%7B%22params%22%3A%22%7B%5C%22type%5C%22%3A%5C%22local%5C%22%2C%5C%22packageIds%5C%22%3A%5B%5D%2C%5C%22limit%5C%22%3A500%2C%5C%22fields%5C%22%3A%5C%22schedules%2Cchannels%2Cfinish%2Cchannel%2Cid%2Ctitle%2Cfavourite%5C%22%2C%5C%22lang%5C%22%3A%5C%22ru%5C%22%7D%22%2C%22cacheKey%22%3A%22channels%3Fparams%3D%7B%5C%22type%5C%22%3A%5C%22local%5C%22%2C%5C%22packageIds%5C%22%3A%5B%5D%2C%5C%22limit%5C%22%3A500%2C%5C%22fields%5C%22%3A%5B%5C%22schedules%5C%22%2C%5C%22channels%5C%22%2C%5C%22finish%5C%22%2C%5C%22channel%5C%22%2C%5C%22id%5C%22%2C%5C%22title%5C%22%2C%5C%22favourite%5C%22%5D%7D%22%2C%22userRegion%22%3A%22|subpage|%22%2C%22resource%22%3A%22channels%22%2C%22ncrd%22%3A1469479392374%7D%7D%2C%7B%22name%22%3A%22i-tv-region%22%2C%22method%22%3A%22get%22%2C%22args%22%3A%7B%22params%22%3A%22%7B%5C%22type%5C%22%3A%5C%22satelite%5C%22%2C%5C%22packageIds%5C%22%3A%5B%5D%2C%5C%22limit%5C%22%3A500%2C%5C%22fields%5C%22%3A%5C%22schedules%2Cchannels%2Cfinish%2Cchannel%2Cid%2Ctitle%2Cfavourite%5C%22%2C%5C%22lang%5C%22%3A%5C%22ru%5C%22%7D%22%2C%22cacheKey%22%3A%22channels%3Fparams%3D%7B%5C%22type%5C%22%3A%5C%22satelite%5C%22%2C%5C%22packageIds%5C%22%3A%5B%5D%2C%5C%22limit%5C%22%3A500%2C%5C%22fields%5C%22%3A%5B%5C%22schedules%5C%22%2C%5C%22channels%5C%22%2C%5C%22finish%5C%22%2C%5C%22channel%5C%22%2C%5C%22id%5C%22%2C%5C%22title%5C%22%2C%5C%22favourite%5C%22%5D%7D%22%2C%22userRegion%22%3A%22|subpage|%22%2C%22resource%22%3A%22channels%22%2C%22ncrd%22%3A1469479392374%7D%7D%5D&sk=42a26daf72c9b3c34a81c144d6a754f0&userRegion=|subpage|&resource=null&ncrd=} -*subpage.format {list|187|213|983} -*index_site_id.scrub {|} -*index_temp_9.scrub {regex||^.*$||} -*index_temp_9.modify {replace|]\}"\}]|\|} -*index_temp_9.modify {remove(type=element)|-1 1} -*scope.range{(channellist)|end} -*index_temp_4.modify {set|187\|213\|983} -*index_temp_3.modify {set|0} -*loop{(each "index_temp_8" in 'index_temp_9')|end} -*index_temp_7.modify {substring(type=element)|'index_temp_4' 'index_temp_3' 1} -*index_temp_6.modify {substring(type=regex)|'index_temp_8' ":(\d+)\}} -*index_temp_5.modify {substring(type=regex)|'index_temp_8' "\\\"title\\\":\\\"(.+?)\\\","} -*index_temp_6.modify {addstart|'index_temp_7'##} -*index_temp_5.modify {addstart('index_temp_7' "187")|UA-} -*index_temp_5.modify {addstart('index_temp_7' "213")|RU-} -*index_temp_5.modify {addstart('index_temp_7' "983")|TR-} -*index_temp_6.modify {replace|\||#_#} -*index_temp_5.modify {replace|\||#_#} -*index_site_id.modify {addend|'index_temp_6'#_#} -*index_site_channel.modify {addend|'index_temp_5'#_#} -*index_temp_3.modify {calculate(format=F0)|1 +} -*end_loop -*index_site_id.modify {replace|#_#|\|} -*index_site_channel.modify {replace|#_#|\|} -*index_site_id.modify {remove(type=element)|-1 1} -*index_site_channel.modify {remove(type=element)|-1 1} -*index_site_id.modify {cleanup(removeduplicates=equal,100 link="index_site_channel")} -*end_scope -** @auto_xml_channel_end diff --git a/package-lock.json b/package-lock.json index 38e05e8d..1031759c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,12 +8,107 @@ "dependencies": { "axios": "^0.21.1", "axios-delay": "^1.0.0-rc6", + "cheerio": "^1.0.0-rc.5", "commander": "^7.1.0", "dayjs": "^1.10.4", "glob": "^7.1.6", + "jsdom": "^16.5.0", "xml-js": "^1.6.11" } }, + "node_modules/abab": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==" + }, + "node_modules/acorn": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz", + "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" + }, "node_modules/axios": { "version": "0.21.1", "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", @@ -56,6 +151,19 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -65,6 +173,60 @@ "concat-map": "0.0.1" } }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "node_modules/cheerio": { + "version": "1.0.0-rc.5", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.5.tgz", + "integrity": "sha512-yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw==", + "dependencies": { + "cheerio-select-tmp": "^0.1.0", + "dom-serializer": "~1.2.0", + "domhandler": "^4.0.0", + "entities": "~2.1.0", + "htmlparser2": "^6.0.0", + "parse5": "^6.0.0", + "parse5-htmlparser2-tree-adapter": "^6.0.0" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/cheerio-select-tmp": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz", + "integrity": "sha512-YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ==", + "deprecated": "Use cheerio-select instead", + "dependencies": { + "css-select": "^3.1.2", + "css-what": "^4.0.0", + "domelementtype": "^2.1.0", + "domhandler": "^4.0.0", + "domutils": "^2.4.4" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", @@ -78,6 +240,82 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "node_modules/css-select": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-3.1.2.tgz", + "integrity": "sha512-qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA==", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^4.0.0", + "domhandler": "^4.0.0", + "domutils": "^2.4.3", + "nth-check": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-what": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz", + "integrity": "sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/dayjs": { "version": "1.10.4", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz", @@ -91,6 +329,189 @@ "ms": "2.0.0" } }, + "node_modules/decimal.js": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz", + "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==" + }, + "node_modules/deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/dom-serializer": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz", + "integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz", + "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ] + }, + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/domhandler": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz", + "integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==", + "dependencies": { + "domelementtype": "^2.1.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.5.0.tgz", + "integrity": "sha512-Ho16rzNMOFk2fPwChGh3D2D9OEHAfG19HgmRR2l+WLSsIstNsAYBzePH412bL0y5T44ejABIVfTHQ8nqi/tBCg==", + "dependencies": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/entities": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", + "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/escodegen": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", + "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "engines": [ + "node >=0.6.0" + ] + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, "node_modules/follow-redirects": { "version": "1.13.3", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", @@ -110,11 +531,40 @@ } } }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dependencies": { + "assert-plus": "^1.0.0" + } + }, "node_modules/glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -134,6 +584,81 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "deprecated": "this library is no longer supported", + "dependencies": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/htmlparser2": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.1.tgz", + "integrity": "sha512-GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.4.4", + "entities": "^2.0.0" + } + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -170,6 +695,140 @@ "node": ">=4" } }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", + "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=" + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "node_modules/jsdom": { + "version": "16.5.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.0.tgz", + "integrity": "sha512-QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.0.5", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "html-encoding-sniffer": "^2.0.1", + "is-potential-custom-element-name": "^1.0.0", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "request": "^2.88.2", + "request-promise-native": "^1.0.9", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0", + "ws": "^7.4.4", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "node_modules/jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" + }, + "node_modules/mime-db": { + "version": "1.46.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", + "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.29", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", + "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", + "dependencies": { + "mime-db": "1.46.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -186,6 +845,30 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "node_modules/nth-check": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz", + "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==" + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "engines": { + "node": "*" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -194,6 +877,35 @@ "wrappy": "1" } }, + "node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + }, + "node_modules/parse5-htmlparser2-tree-adapter": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", + "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "dependencies": { + "parse5": "^6.0.1" + } + }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -202,16 +914,386 @@ "node": ">=0.10.0" } }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "dependencies": { + "lodash": "^4.17.19" + }, + "engines": { + "node": ">=0.10.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/request-promise-native": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", + "dependencies": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "engines": { + "node": ">=0.12.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/request-promise-native/node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/request/node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "node_modules/sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "bin": { + "sshpk-conv": "bin/sshpk-conv", + "sshpk-sign": "bin/sshpk-sign", + "sshpk-verify": "bin/sshpk-verify" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, + "node_modules/tough-cookie": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", + "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" + }, + "node_modules/whatwg-url": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz", + "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==", + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.2", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, + "node_modules/ws": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", + "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/xml-js": { "version": "1.6.11", "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz", @@ -222,9 +1304,89 @@ "bin": { "xml-js": "bin/cli.js" } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" } }, "dependencies": { + "abab": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==" + }, + "acorn": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz", + "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==" + }, + "acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "requires": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" + } + } + }, + "acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" + }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" + }, "axios": { "version": "0.21.1", "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", @@ -265,6 +1427,19 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "^0.14.3" + } + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -274,6 +1449,50 @@ "concat-map": "0.0.1" } }, + "browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "cheerio": { + "version": "1.0.0-rc.5", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.5.tgz", + "integrity": "sha512-yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw==", + "requires": { + "cheerio-select-tmp": "^0.1.0", + "dom-serializer": "~1.2.0", + "domhandler": "^4.0.0", + "entities": "~2.1.0", + "htmlparser2": "^6.0.0", + "parse5": "^6.0.0", + "parse5-htmlparser2-tree-adapter": "^6.0.0" + } + }, + "cheerio-select-tmp": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz", + "integrity": "sha512-YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ==", + "requires": { + "css-select": "^3.1.2", + "css-what": "^4.0.0", + "domelementtype": "^2.1.0", + "domhandler": "^4.0.0", + "domutils": "^2.4.4" + } + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, "commander": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", @@ -284,6 +1503,66 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "css-select": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-3.1.2.tgz", + "integrity": "sha512-qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA==", + "requires": { + "boolbase": "^1.0.0", + "css-what": "^4.0.0", + "domhandler": "^4.0.0", + "domutils": "^2.4.3", + "nth-check": "^2.0.0" + } + }, + "css-what": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz", + "integrity": "sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==" + }, + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + }, + "cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "requires": { + "cssom": "~0.3.6" + }, + "dependencies": { + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + } + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "requires": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + } + }, "dayjs": { "version": "1.10.4", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz", @@ -297,16 +1576,168 @@ "ms": "2.0.0" } }, + "decimal.js": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz", + "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==" + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "dom-serializer": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz", + "integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "entities": "^2.0.0" + } + }, + "domelementtype": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz", + "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==" + }, + "domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "requires": { + "webidl-conversions": "^5.0.0" + }, + "dependencies": { + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==" + } + } + }, + "domhandler": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz", + "integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==", + "requires": { + "domelementtype": "^2.1.0" + } + }, + "domutils": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.5.0.tgz", + "integrity": "sha512-Ho16rzNMOFk2fPwChGh3D2D9OEHAfG19HgmRR2l+WLSsIstNsAYBzePH412bL0y5T44ejABIVfTHQ8nqi/tBCg==", + "requires": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0" + } + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "entities": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", + "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==" + }, + "escodegen": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", + "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "requires": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + }, + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==" + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, "follow-redirects": { "version": "1.13.3", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==" }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } + }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -320,6 +1751,57 @@ "path-is-absolute": "^1.0.0" } }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "requires": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + } + }, + "html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "requires": { + "whatwg-encoding": "^1.0.5" + } + }, + "htmlparser2": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.1.tgz", + "integrity": "sha512-GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.4.4", + "entities": "^2.0.0" + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -339,6 +1821,117 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" }, + "is-potential-custom-element-name": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", + "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=" + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "jsdom": { + "version": "16.5.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.0.tgz", + "integrity": "sha512-QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==", + "requires": { + "abab": "^2.0.5", + "acorn": "^8.0.5", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "html-encoding-sniffer": "^2.0.1", + "is-potential-custom-element-name": "^1.0.0", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "request": "^2.88.2", + "request-promise-native": "^1.0.9", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0", + "ws": "^7.4.4", + "xml-name-validator": "^3.0.0" + } + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" + }, + "mime-db": { + "version": "1.46.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", + "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==" + }, + "mime-types": { + "version": "2.1.29", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", + "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", + "requires": { + "mime-db": "1.46.0" + } + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -352,6 +1945,24 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "nth-check": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz", + "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==", + "requires": { + "boolbase": "^1.0.0" + } + }, + "nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==" + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -360,21 +1971,311 @@ "wrappy": "1" } }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + }, + "parse5-htmlparser2-tree-adapter": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", + "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "requires": { + "parse5": "^6.0.1" + } + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" + }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, + "request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "requires": { + "lodash": "^4.17.19" + } + }, + "request-promise-native": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "requires": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "dependencies": { + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, + "saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "requires": { + "xmlchars": "^2.2.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, + "tough-cookie": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", + "requires": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" + } + }, + "tr46": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", + "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", + "requires": { + "punycode": "^2.1.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "requires": { + "prelude-ls": "~1.1.2" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + }, + "uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "requires": { + "punycode": "^2.1.0" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "requires": { + "browser-process-hrtime": "^1.0.0" + } + }, + "w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "requires": { + "xml-name-validator": "^3.0.0" + } + }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==" + }, + "whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "requires": { + "iconv-lite": "0.4.24" + } + }, + "whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" + }, + "whatwg-url": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz", + "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==", + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.2", + "webidl-conversions": "^6.1.0" + } + }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, + "ws": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", + "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==", + "requires": {} + }, "xml-js": { "version": "1.6.11", "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz", @@ -382,6 +2283,16 @@ "requires": { "sax": "^1.2.4" } + }, + "xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" + }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" } } } diff --git a/package.json b/package.json index 47e21ed8..b5366fda 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "epg", "scripts": { - "update": "./bin/epg-grabber/index.js --config=config/ru/config.xml --sites=config/ru/sites" + "update": "./bin/epg-grabber/index.js --config=config/en/config.xml --sites=config/en/sites" }, "private": true, "author": "Arhey", @@ -9,9 +9,11 @@ "dependencies": { "axios": "^0.21.1", "axios-delay": "^1.0.0-rc6", + "cheerio": "^1.0.0-rc.5", "commander": "^7.1.0", "dayjs": "^1.10.4", "glob": "^7.1.6", + "jsdom": "^16.5.0", "xml-js": "^1.6.11" } } diff --git a/update.sh b/update.sh deleted file mode 100755 index c1f22e99..00000000 --- a/update.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -#backup the current working dir -WG_BCKP_DIR="$(pwd)" - -function quit { - #restore previous working dir - cd "$WG_BCKP_DIR" - exit $1; -} - -# check if mono can be found -which mono >/dev/null 2>&1 || { echo >&2 "Mono required, but it's not installed."; quit 1; } - -# get the absolute path of the link (or relative path) -if [ -L $0 ] ; then - DIR=$(dirname $(readlink -f $0)) ; -else - DUTDIR=$(dirname $0) ; - if [ "${DUTDIR:0:1}" = "/" ]; then - DIR="$DUTDIR"; - else - DIR=$PWD/$(dirname $0) ; - fi -fi ; - -mono "$DIR/bin/WebGrab+Plus.exe" "$DIR/config/en" -mono "$DIR/bin/WebGrab+Plus.exe" "$DIR/config/ru" - -quit 0; -