diff --git a/Changelog.md b/Changelog.md index 676818f0..8fc9fb32 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,24 @@ https://github.com/Etherna/YoutubeExplode/releases # Changelog +## v6.3.2 (18-Aug-2023) + +- Fixed an issue where calling `StreamClient.GetManifestAsync(...)` failed on videos from the "YouTube Movies & TV" system channel. +- Fixed an issue where calling `ChannelClient.GetAsync(...)` failed on the "YouTube Movies & TV" system channel. + +## v6.3.1 (23-Jul-2023) + +- Fixed an issue where calling `StreamClient.GetManifestAsync(...)` failed on some videos with an error saying `The format of value is invalid`. + +## v6.3 (21-Jul-2023) + +- Added support for providing cookies directly to `YoutubeClient` with the help of two new constructor overloads: `new YoutubeClient(IReadOnlyList initialCookies)` and `new YoutubeClient(HttpClient http, IReadOnlyList initialCookies)`. You will still need to obtain the cookies yourself (see the [readme](https://github.com/Tyrrrz/YoutubeExplode/blob/6.3/Readme.md#authentication) for some guidance), but YoutubeExplode will take care of generating the required headers and sending them with every request. + +## v6.2.17 (12-Jul-2023) + +- Changed the implementation of the `HttpMessageHandler` used by default in `YoutubeClient` from `HttpClientHandler` to `SocketsHttpHandler` on platforms that support it. +- Fixed an issue where certain system playlist IDs were considered invalid, such as `LL`. + ## v6.2.16 (28-Jun-2023) - Fixed an issue where `ClosedCaptionClient.WriteToAsync(...)` and `ClosedCaptionClient.DownloadAsync(...)` produced invalid SRT timestamps for caption tracks that exceeded 24 hours in length. diff --git a/LICENSE b/LICENSE index 7ea950d5..e5bb5517 100644 --- a/LICENSE +++ b/LICENSE @@ -1,863 +1,25 @@ - YoutubeExplode - Copyright (C) 2016-2023 Oleksii Holub - - Etherna YoutubeDownloader fork - Copyright (C) 2023-present Etherna Sagl - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - - ====================================================================== - - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. - -====================================================================== - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. +MIT License - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file +YoutubeExplode +Copyright (C) 2016-2023 Oleksii Holub + +Etherna YoutubeDownloader fork +Copyright (C) 2023-present Etherna Sagl + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/Readme.md b/Readme.md index c252927b..223f7436 100644 --- a/Readme.md +++ b/Readme.md @@ -387,6 +387,23 @@ await foreach (var batch in youtube.Search.GetResultBatchesAsync("blender tutori } ``` +### Authentication + +You can access private videos and playlists by providing cookies that correspond to a pre-authenticated YouTube account. +To do that, create an instance of `YoutubeClient` using a constructor that accepts `IReadOnlyList`: + +```csharp +using YoutubeExplode; + +// Perform authentication and extract cookies +var cookies = ...; + +// Cookie collection must be of type IReadOnlyList +var youtube = new YoutubeClient(cookies); +``` + +In order to actually perform the authentication, you can use an embedded browser such as [WebView](https://nuget.org/packages/Microsoft.Web.WebView2) to navigate the user to the [YouTube login page](https://accounts.google.com/ServiceLogin?continue=https%3A%2F%2Fwww.youtube.com), let them log in, and then extract the cookies from the browser. + ## Etymology The "Explode" in **YoutubeExplode** comes from the name of a PHP function that splits up strings, [`explode(...)`](https://php.net/manual/en/function.explode.php). When I was starting the development of this library, most of the reference source code I read was written in PHP, hence the inspiration for the name. diff --git a/YoutubeDownloader.Converter.Tests/Utils/Extensions/HttpExtensions.cs b/YoutubeDownloader.Converter.Tests/Utils/Extensions/HttpExtensions.cs index 62f83333..b3a8e6b9 100644 --- a/YoutubeDownloader.Converter.Tests/Utils/Extensions/HttpExtensions.cs +++ b/YoutubeDownloader.Converter.Tests/Utils/Extensions/HttpExtensions.cs @@ -6,9 +6,9 @@ namespace YoutubeExplode.Converter.Tests.Utils.Extensions; internal static class HttpExtensions { - public static async Task DownloadAsync(this HttpClient httpClient, string url, string filePath) + public static async Task DownloadAsync(this HttpClient http, string url, string filePath) { - using var response = await httpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); + using var response = await http.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); response.EnsureSuccessStatusCode(); await using var source = await response.Content.ReadAsStreamAsync(); diff --git a/YoutubeDownloader.Converter.Tests/Utils/FFmpeg.cs b/YoutubeDownloader.Converter.Tests/Utils/FFmpeg.cs index 669ef215..c132d518 100644 --- a/YoutubeDownloader.Converter.Tests/Utils/FFmpeg.cs +++ b/YoutubeDownloader.Converter.Tests/Utils/FFmpeg.cs @@ -137,7 +137,12 @@ private static async ValueTask DownloadAsync() // Add the execute permission on Unix if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - File.SetUnixFileMode(FilePath, UnixFileMode.UserExecute); + { + File.SetUnixFileMode( + FilePath, + File.GetUnixFileMode(FilePath) | UnixFileMode.UserExecute + ); + } } public static async ValueTask InitializeAsync() diff --git a/YoutubeDownloader.Converter.Tests/YoutubeDownloader.Converter.Tests.csproj b/YoutubeDownloader.Converter.Tests/YoutubeDownloader.Converter.Tests.csproj index a7efea48..48c3e715 100644 --- a/YoutubeDownloader.Converter.Tests/YoutubeDownloader.Converter.Tests.csproj +++ b/YoutubeDownloader.Converter.Tests/YoutubeDownloader.Converter.Tests.csproj @@ -9,13 +9,13 @@ + - - - - + + + diff --git a/YoutubeDownloader.Converter/YoutubeDownloader.Converter.csproj b/YoutubeDownloader.Converter/YoutubeDownloader.Converter.csproj index 4ff43ddf..3f7d57c3 100644 --- a/YoutubeDownloader.Converter/YoutubeDownloader.Converter.csproj +++ b/YoutubeDownloader.Converter/YoutubeDownloader.Converter.csproj @@ -22,7 +22,7 @@ - + diff --git a/YoutubeDownloader.Tests/ChannelSpecs.cs b/YoutubeDownloader.Tests/ChannelSpecs.cs index 5fdec1b5..b8fe6b24 100644 --- a/YoutubeDownloader.Tests/ChannelSpecs.cs +++ b/YoutubeDownloader.Tests/ChannelSpecs.cs @@ -73,6 +73,24 @@ public async Task I_can_get_the_metadata_of_a_channel_by_handle() channel.Thumbnails.Should().NotBeEmpty(); } + [Theory] + [InlineData(ChannelIds.Normal)] + [InlineData(ChannelIds.Movies)] + public async Task I_can_get_the_metadata_of_any_available_channel(string channelId) + { + // Arrange + var youtube = new YoutubeClient(); + + // Act + var channel = await youtube.Channels.GetAsync(channelId); + + // Assert + channel.Id.Value.Should().Be(channelId); + channel.Url.Should().NotBeNullOrWhiteSpace(); + channel.Title.Should().NotBeNullOrWhiteSpace(); + channel.Thumbnails.Should().NotBeEmpty(); + } + [Fact] public async Task I_can_get_videos_uploaded_by_a_channel() { diff --git a/YoutubeDownloader.Tests/PlaylistIdSpecs.cs b/YoutubeDownloader.Tests/PlaylistIdSpecs.cs index 399b5953..4cc28c30 100644 --- a/YoutubeDownloader.Tests/PlaylistIdSpecs.cs +++ b/YoutubeDownloader.Tests/PlaylistIdSpecs.cs @@ -8,6 +8,9 @@ namespace YoutubeExplode.Tests; public class PlaylistIdSpecs { [Theory] + [InlineData("WL")] + [InlineData("LL")] + [InlineData("RDMM")] [InlineData("PL601B2E69B03FAB9D")] [InlineData("PLI5YfMzCfRtZ8eV576YoY3vIYrHjyVm_e")] [InlineData("PLWwAypAcFRgKFlxtLbn_u14zddtDJj3mk")] @@ -48,7 +51,6 @@ public void I_can_parse_a_playlist_ID_from_a_URL_string(string playlistUrl, stri [InlineData("PLm_3vnTS-pvmZFuF L1Pyhqf8kTTYVKjW")] [InlineData("PLm_3vnTS-pvmZFuF3L=Pyhqf8kTTYVKjW")] [InlineData("youtube.com/playlist?lisp=PLOU2XLYxmsIJGErt5rrCqaSGTMyyqNt2H")] - [InlineData("youtube.com/playlist?list=asd")] [InlineData("youtube.com/")] public void I_cannot_parse_a_playlist_ID_from_an_invalid_string(string playlistIdOrUrl) { diff --git a/YoutubeDownloader.Tests/StreamSpecs.cs b/YoutubeDownloader.Tests/StreamSpecs.cs index ba138388..309ef283 100644 --- a/YoutubeDownloader.Tests/StreamSpecs.cs +++ b/YoutubeDownloader.Tests/StreamSpecs.cs @@ -141,7 +141,7 @@ public async Task I_can_get_a_specific_stream_from_a_video(string videoId) foreach (var streamInfo in manifest.Streams) { - await using var stream = await youtube.Videos.Streams.GetAsync(streamInfo); + using var stream = await youtube.Videos.Streams.GetAsync(streamInfo); var bytesRead = await stream.ReadAsync(buffer.Memory); // Assert @@ -219,14 +219,14 @@ public async Task I_can_download_the_highest_quality_stream_from_a_video() public async Task I_can_seek_to_a_specific_position_on_a_stream_from_a_video() { // Arrange - await using var buffer = new MemoryStream(); + using var buffer = new MemoryStream(); var youtube = new YoutubeClient(); // Act var manifest = await youtube.Videos.Streams.GetManifestAsync(VideoIds.Normal); var streamInfo = manifest.GetAudioStreams().OrderBy(s => s.Size).First(); - await using var stream = await youtube.Videos.Streams.GetAsync(streamInfo); + using var stream = await youtube.Videos.Streams.GetAsync(streamInfo); stream.Seek(1000, SeekOrigin.Begin); await stream.CopyToAsync(buffer); diff --git a/YoutubeDownloader.Tests/TestData/ChannelIds.cs b/YoutubeDownloader.Tests/TestData/ChannelIds.cs index dcb238fa..7ca6b977 100644 --- a/YoutubeDownloader.Tests/TestData/ChannelIds.cs +++ b/YoutubeDownloader.Tests/TestData/ChannelIds.cs @@ -3,4 +3,5 @@ internal static class ChannelIds { public const string Normal = "UCX6OQ3DkcsbYNE6H8uQQuVA"; + public const string Movies = "UCuVPpxrm2VAgpH3Ktln4HXg"; } \ No newline at end of file diff --git a/YoutubeDownloader.Tests/YoutubeDownloader.Tests.csproj b/YoutubeDownloader.Tests/YoutubeDownloader.Tests.csproj index 9e4f2712..3bc84f63 100644 --- a/YoutubeDownloader.Tests/YoutubeDownloader.Tests.csproj +++ b/YoutubeDownloader.Tests/YoutubeDownloader.Tests.csproj @@ -1,7 +1,8 @@  - net7.0 + net7.0 + $(TargetFrameworks);net48 @@ -9,12 +10,13 @@ + - - - - + + + + diff --git a/YoutubeDownloader/Channels/ChannelClient.cs b/YoutubeDownloader/Channels/ChannelClient.cs index 44f41e42..81a69963 100644 --- a/YoutubeDownloader/Channels/ChannelClient.cs +++ b/YoutubeDownloader/Channels/ChannelClient.cs @@ -65,8 +65,26 @@ private Channel Get(ChannelPage channelPage) /// public async ValueTask GetAsync( ChannelId channelId, - CancellationToken cancellationToken = default) => - Get(await _controller.GetChannelPageAsync(channelId, cancellationToken)); + CancellationToken cancellationToken = default) + { + // Special case for the "Movies & TV" channel, which has a custom page + if (channelId == "UCuVPpxrm2VAgpH3Ktln4HXg") + { + return new Channel( + "UCuVPpxrm2VAgpH3Ktln4HXg", + "Movies & TV", + new[] + { + new Thumbnail( + "https://www.gstatic.com/youtube/img/tvfilm/clapperboard_profile.png", + new Resolution(1024, 1024) + ) + } + ); + } + + return Get(await _controller.GetChannelPageAsync(channelId, cancellationToken)); + } /// /// Gets the metadata associated with the channel of the specified user. diff --git a/YoutubeDownloader/Playlists/PlaylistId.cs b/YoutubeDownloader/Playlists/PlaylistId.cs index 1e104be8..36583f20 100644 --- a/YoutubeDownloader/Playlists/PlaylistId.cs +++ b/YoutubeDownloader/Playlists/PlaylistId.cs @@ -25,9 +25,8 @@ public readonly partial struct PlaylistId public partial struct PlaylistId { private static bool IsValid(string playlistId) => - // "Watch later" and "My mix" playlists are special - playlistId is "WL" or "RDMM" || - playlistId.Length >= 13 && + // Playlist IDs vary greatly in length, but they are at least 2 characters long + playlistId.Length >= 2 && playlistId.All(c => char.IsLetterOrDigit(c) || c is '_' or '-'); private static string? TryNormalize(string? playlistIdOrUrl) diff --git a/YoutubeDownloader/Utils/ClientDelegatingHandler.cs b/YoutubeDownloader/Utils/ClientDelegatingHandler.cs new file mode 100644 index 00000000..83f8a856 --- /dev/null +++ b/YoutubeDownloader/Utils/ClientDelegatingHandler.cs @@ -0,0 +1,31 @@ +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; + +namespace YoutubeExplode.Utils; + +// Used to extend an externally provided HttpClient with additional behavior +internal abstract class ClientDelegatingHandler : HttpMessageHandler +{ + private readonly HttpClient _http; + private readonly bool _disposeClient; + + protected ClientDelegatingHandler(HttpClient http, bool disposeClient = false) + { + _http = http; + _disposeClient = disposeClient; + } + + protected override async Task SendAsync( + HttpRequestMessage request, + CancellationToken cancellationToken) => + await _http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken); + + protected override void Dispose(bool disposing) + { + if (disposing && _disposeClient) + _http.Dispose(); + + base.Dispose(disposing); + } +} \ No newline at end of file diff --git a/YoutubeDownloader/Utils/Extensions/BinaryExtensions.cs b/YoutubeDownloader/Utils/Extensions/BinaryExtensions.cs new file mode 100644 index 00000000..52b5e80b --- /dev/null +++ b/YoutubeDownloader/Utils/Extensions/BinaryExtensions.cs @@ -0,0 +1,21 @@ +using System.Globalization; +using System.Text; + +namespace YoutubeExplode.Utils.Extensions; + +internal static class BinaryExtensions +{ + public static string ToHex(this byte[] data, bool isUpperCase = true) + { + var buffer = new StringBuilder(2 * data.Length); + + foreach (var b in data) + { + buffer.Append( + b.ToString(isUpperCase ? "X2" : "x2", CultureInfo.InvariantCulture) + ); + } + + return buffer.ToString(); + } +} \ No newline at end of file diff --git a/YoutubeDownloader/Utils/Extensions/UriExtensions.cs b/YoutubeDownloader/Utils/Extensions/UriExtensions.cs new file mode 100644 index 00000000..bb7434e3 --- /dev/null +++ b/YoutubeDownloader/Utils/Extensions/UriExtensions.cs @@ -0,0 +1,8 @@ +using System; + +namespace YoutubeExplode.Utils.Extensions; + +internal static class UriExtensions +{ + public static string GetDomain(this Uri uri) => uri.Scheme + Uri.SchemeDelimiter + uri.Host; +} \ No newline at end of file diff --git a/YoutubeDownloader/Utils/Hash.cs b/YoutubeDownloader/Utils/Hash.cs new file mode 100644 index 00000000..543a59df --- /dev/null +++ b/YoutubeDownloader/Utils/Hash.cs @@ -0,0 +1,12 @@ +using System.Security.Cryptography; + +namespace YoutubeExplode.Utils; + +internal static class Hash +{ + public static byte[] Compute(HashAlgorithm algorithm, byte[] data) + { + using (algorithm) + return algorithm.ComputeHash(data); + } +} \ No newline at end of file diff --git a/YoutubeDownloader/Utils/Http.cs b/YoutubeDownloader/Utils/Http.cs index 404cdb0e..b102994f 100644 --- a/YoutubeDownloader/Utils/Http.cs +++ b/YoutubeDownloader/Utils/Http.cs @@ -1,24 +1,11 @@ using System; -using System.Net; using System.Net.Http; namespace YoutubeExplode.Utils; internal static class Http { - private static readonly Lazy HttpClientLazy = new(() => - { - var handler = new HttpClientHandler - { - // https://github.com/Tyrrrz/YoutubeExplode/issues/530 - UseCookies = false - }; - - if (handler.SupportsAutomaticDecompression) - handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate; - - return new HttpClient(handler, true); - }); + private static readonly Lazy HttpClientLazy = new(() => new HttpClient()); public static HttpClient Client => HttpClientLazy.Value; } \ No newline at end of file diff --git a/YoutubeDownloader/Videos/ClosedCaptions/ClosedCaptionClient.cs b/YoutubeDownloader/Videos/ClosedCaptions/ClosedCaptionClient.cs index 82b38973..b6817f3e 100644 --- a/YoutubeDownloader/Videos/ClosedCaptions/ClosedCaptionClient.cs +++ b/YoutubeDownloader/Videos/ClosedCaptions/ClosedCaptionClient.cs @@ -76,7 +76,7 @@ private async IAsyncEnumerable GetClosedCaptionsAsync( if (string.IsNullOrEmpty(text)) continue; - // Auto-generated captions may be missing offset or duration. + // Auto-generated captions may be missing offset or duration // https://github.com/Tyrrrz/YoutubeExplode/discussions/619 if (captionData.Offset is not { } offset || captionData.Duration is not { } duration) diff --git a/YoutubeDownloader/Videos/Streams/IStreamInfo.cs b/YoutubeDownloader/Videos/Streams/IStreamInfo.cs index 3e59b441..669c9812 100644 --- a/YoutubeDownloader/Videos/Streams/IStreamInfo.cs +++ b/YoutubeDownloader/Videos/Streams/IStreamInfo.cs @@ -13,6 +13,11 @@ public interface IStreamInfo /// /// Stream URL. /// + /// + /// While this URL can be used to access the underlying stream, you need a series of carefully crafted + /// HTTP requests to properly resolve it. It's recommended to use + /// or instead, as they do all the heavy lifting for you. + /// string Url { get; } /// diff --git a/YoutubeDownloader/Videos/Streams/StreamClient.cs b/YoutubeDownloader/Videos/Streams/StreamClient.cs index 95f94400..49089824 100644 --- a/YoutubeDownloader/Videos/Streams/StreamClient.cs +++ b/YoutubeDownloader/Videos/Streams/StreamClient.cs @@ -201,13 +201,26 @@ private async IAsyncEnumerable GetStreamInfosAsync( // Extract streams from the DASH manifest if (!string.IsNullOrWhiteSpace(playerResponse.DashManifestUrl)) { - var dashManifest = await _controller.GetDashManifestAsync( - playerResponse.DashManifestUrl, - cancellationToken - ); + var dashManifest = default(DashManifest?); - await foreach (var streamInfo in GetStreamInfosAsync(dashManifest.Streams, cancellationToken)) - yield return streamInfo; + try + { + dashManifest = await _controller.GetDashManifestAsync( + playerResponse.DashManifestUrl, + cancellationToken + ); + } + // Some DASH manifest URLs return 404 for whatever reason + // https://github.com/Tyrrrz/YoutubeExplode/issues/728 + catch (HttpRequestException) + { + } + + if (dashManifest is not null) + { + await foreach (var streamInfo in GetStreamInfosAsync(dashManifest.Streams, cancellationToken)) + yield return streamInfo; + } } } diff --git a/YoutubeDownloader/YoutubeClient.cs b/YoutubeDownloader/YoutubeClient.cs index e575d813..28cdb732 100644 --- a/YoutubeDownloader/YoutubeClient.cs +++ b/YoutubeDownloader/YoutubeClient.cs @@ -1,3 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Net; using System.Net.Http; using YoutubeExplode.Channels; using YoutubeExplode.Playlists; @@ -35,9 +38,12 @@ public class YoutubeClient : IYoutubeClient /// /// Initializes an instance of . /// - public YoutubeClient(HttpClient http) + public YoutubeClient(HttpClient http, IReadOnlyList initialCookies) { - var youtubeHttp = new HttpClient(new YoutubeHttpMessageHandler(http), true); + var youtubeHttp = new HttpClient( + new YoutubeHttpHandler(http, initialCookies), + true + ); Videos = new VideoClient(youtubeHttp); Playlists = new PlaylistClient(youtubeHttp); @@ -48,7 +54,24 @@ public YoutubeClient(HttpClient http) /// /// Initializes an instance of . /// - public YoutubeClient() : this(Http.Client) + public YoutubeClient(HttpClient http) + : this(http, Array.Empty()) + { + } + + /// + /// Initializes an instance of . + /// + public YoutubeClient(IReadOnlyList initialCookies) + : this(Http.Client, initialCookies) + { + } + + /// + /// Initializes an instance of . + /// + public YoutubeClient() + : this(Http.Client) { } } \ No newline at end of file diff --git a/YoutubeDownloader/YoutubeDownloader.csproj b/YoutubeDownloader/YoutubeDownloader.csproj index b9d517f2..1eeb93b3 100644 --- a/YoutubeDownloader/YoutubeDownloader.csproj +++ b/YoutubeDownloader/YoutubeDownloader.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -22,7 +22,7 @@ - + diff --git a/YoutubeDownloader/YoutubeHttpHandler.cs b/YoutubeDownloader/YoutubeHttpHandler.cs new file mode 100644 index 00000000..0f1520bb --- /dev/null +++ b/YoutubeDownloader/YoutubeHttpHandler.cs @@ -0,0 +1,170 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Security.Cryptography; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using YoutubeExplode.Exceptions; +using YoutubeExplode.Utils; +using YoutubeExplode.Utils.Extensions; + +namespace YoutubeExplode; + +internal class YoutubeHttpHandler : ClientDelegatingHandler +{ + private readonly CookieContainer _cookieContainer = new(); + + public YoutubeHttpHandler(HttpClient http, IReadOnlyList initialCookies, bool disposeClient = false) + : base(http, disposeClient) + { + // Pre-fill cookies + foreach (var cookie in initialCookies) + _cookieContainer.Add(cookie); + } + + private string? TryGenerateAuthHeaderValue(Uri uri) + { + var cookies = _cookieContainer.GetCookies(uri).Cast().ToArray(); + + var sessionId = + cookies.FirstOrDefault(c => string.Equals(c.Name, "__Secure-3PAPISID", StringComparison.Ordinal))?.Value ?? + cookies.FirstOrDefault(c => string.Equals(c.Name, "SAPISID", StringComparison.Ordinal))?.Value; + + if (string.IsNullOrWhiteSpace(sessionId)) + return null; + + var timestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds(); + var domain = uri.GetDomain(); + + var token = $"{timestamp} {sessionId} {domain}"; + var tokenHash = Hash.Compute(SHA1.Create(), Encoding.UTF8.GetBytes(token)).ToHex(); + + return $"SAPISIDHASH {timestamp}_{tokenHash}"; + } + + private HttpRequestMessage HandleRequest(HttpRequestMessage request) + { + // Shouldn't happen? + if (request.RequestUri is null) + return request; + + // Set internal API key + if (request.RequestUri.AbsolutePath.StartsWith("/youtubei/", StringComparison.Ordinal) && + !UrlEx.ContainsQueryParameter(request.RequestUri.Query, "key")) + { + request.RequestUri = new Uri( + UrlEx.SetQueryParameter( + request.RequestUri.OriginalString, + "key", + // This key doesn't appear to change + "AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w" + ) + ); + } + + // Set localization language + if (!UrlEx.ContainsQueryParameter(request.RequestUri.Query, "hl")) + { + request.RequestUri = new Uri( + UrlEx.SetQueryParameter( + request.RequestUri.OriginalString, + "hl", + "en" + ) + ); + } + + // Set origin + if (!request.Headers.Contains("Origin")) + { + request.Headers.Add("Origin", request.RequestUri.GetDomain()); + } + + // Set user agent + if (!request.Headers.Contains("User-Agent")) + { + request.Headers.Add( + "User-Agent", + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36" + ); + } + + // Set cookies + if (!request.Headers.Contains("Cookie") && _cookieContainer.Count > 0) + { + var cookieHeaderValue = _cookieContainer.GetCookieHeader(request.RequestUri); + if (!string.IsNullOrWhiteSpace(cookieHeaderValue)) + request.Headers.Add("Cookie", cookieHeaderValue); + } + + // Set authorization + if (!request.Headers.Contains("Authorization") && + TryGenerateAuthHeaderValue(request.RequestUri) is { } authHeaderValue) + { + request.Headers.Add("Authorization", authHeaderValue); + } + + return request; + } + + private HttpResponseMessage HandleResponse(HttpResponseMessage response) + { + if (response.RequestMessage?.RequestUri is null) + return response; + + // Custom exception for rate limit errors + if ((int)response.StatusCode == 429) + { + throw new RequestLimitExceededException( + "Exceeded request rate limit. " + + "Please try again in a few hours. " + + "Alternatively, inject cookies corresponding to a pre-authenticated user when initializing an instance of `YoutubeClient`." + ); + } + + // Set cookies + if (response.Headers.TryGetValues("Set-Cookie", out var cookieHeaderValues)) + { + foreach (var cookieHeaderValue in cookieHeaderValues) + _cookieContainer.SetCookies(response.RequestMessage.RequestUri, cookieHeaderValue); + } + + return response; + } + + protected override async Task SendAsync( + HttpRequestMessage request, + CancellationToken cancellationToken) + { + for (var retriesRemaining = 5;; retriesRemaining--) + { + try + { + using var clonedRequest = request.Clone(); + + var response = HandleResponse( + await base.SendAsync( + HandleRequest(clonedRequest), + cancellationToken + ) + ); + + // Retry on 5XX errors + if ((int)response.StatusCode >= 500 && retriesRemaining > 0) + { + response.Dispose(); + continue; + } + + return response; + } + // Retry on connectivity issues + catch (HttpRequestException) when (retriesRemaining > 0) + { + } + } + } +} \ No newline at end of file diff --git a/YoutubeDownloader/YoutubeHttpMessageHandler.cs b/YoutubeDownloader/YoutubeHttpMessageHandler.cs deleted file mode 100644 index 4ffd6994..00000000 --- a/YoutubeDownloader/YoutubeHttpMessageHandler.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System; -using System.Net.Http; -using System.Threading; -using System.Threading.Tasks; -using YoutubeExplode.Exceptions; -using YoutubeExplode.Utils; -using YoutubeExplode.Utils.Extensions; - -namespace YoutubeExplode; - -internal class YoutubeHttpMessageHandler : HttpMessageHandler -{ - private readonly HttpClient _http; - - public YoutubeHttpMessageHandler(HttpClient http) => _http = http; - - private async ValueTask SendCoreAsync( - HttpRequestMessage request, - CancellationToken cancellationToken = default) - { - // Set the API key if necessary - if (request.RequestUri is not null && - request.RequestUri.AbsolutePath.StartsWith("/youtubei/") && - !UrlEx.ContainsQueryParameter(request.RequestUri.Query, "key")) - { - request.RequestUri = new Uri( - UrlEx.SetQueryParameter( - request.RequestUri.OriginalString, - "key", - // This key doesn't appear to change - "AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w" - ) - ); - } - - // Set the language if necessary - if (request.RequestUri is not null && !UrlEx.ContainsQueryParameter(request.RequestUri.Query, "hl")) - { - request.RequestUri = new Uri( - UrlEx.SetQueryParameter( - request.RequestUri.OriginalString, - "hl", - "en" - ) - ); - } - - // Set the user agent if necessary - if (!request.Headers.Contains("User-Agent")) - { - request.Headers.Add( - "User-Agent", - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36" - ); - } - - // Set required cookies - request.Headers.Add("Cookie", "CONSENT=YES+cb; YSC=DwKYllHNwuw"); - - var response = await _http.SendAsync( - request, - HttpCompletionOption.ResponseHeadersRead, - cancellationToken - ); - - // Special case check for rate limiting errors - if ((int)response.StatusCode == 429) - { - throw new RequestLimitExceededException( - "Exceeded request rate limit. " + - "Please try again in a few hours. " + - "Alternatively, inject an instance of HttpClient that includes cookies for a pre-authenticated user." - ); - } - - return response; - } - - protected override async Task SendAsync( - HttpRequestMessage request, - CancellationToken cancellationToken) - { - for (var retriesRemaining = 5;; retriesRemaining--) - { - try - { - using var clonedRequest = request.Clone(); - var response = await SendCoreAsync(clonedRequest, cancellationToken); - - // Retry on 5XX errors - if ((int)response.StatusCode >= 500 && retriesRemaining > 0) - { - response.Dispose(); - continue; - } - - return response; - } - // Retry on connectivity issues - catch (HttpRequestException) when (retriesRemaining > 0) - { - } - } - } -} \ No newline at end of file