diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index f288702..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- 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.
-
- 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
-.
diff --git a/README.md b/README.md
index 3705536..5c5a2b7 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,8 @@ pip install cdp-patches[automation_linting]
### Concept: Input Domain Leaks
Bypass CDP Leaks in [Input](https://chromedevtools.github.io/devtools-protocol/tot/Input/) domains
+[](https://github.com/kaliiiiiiiiii/brotector)
+
For an interaction event `e`, the page coordinates won't ever equal the screen coordinates, unless Chrome is in fullscreen.
However, all `CDP` input commands just set it the same by default (see [crbug#1477537](https://bugs.chromium.org/p/chromium/issues/detail?id=1477537)).
```js
diff --git a/cdp_patches/__init__.py b/cdp_patches/__init__.py
index 1b7699d..b927ad1 100644
--- a/cdp_patches/__init__.py
+++ b/cdp_patches/__init__.py
@@ -9,6 +9,7 @@
elif system_name == "Linux":
is_windows = False
else:
+ is_windows = False
warnings.warn("Unknown system (You´re probably using MacOS, which is currently not supported).", RuntimeWarning)
__all__ = ["VERSION", "is_windows"]
diff --git a/cdp_patches/input/async_input.py b/cdp_patches/input/async_input.py
index db510f5..9c35ed1 100644
--- a/cdp_patches/input/async_input.py
+++ b/cdp_patches/input/async_input.py
@@ -15,6 +15,7 @@
from cdp_patches import is_windows
from cdp_patches.input.exceptions import WindowClosedException
+from cdp_patches.input.utils import _mk_kwargs
if is_windows:
from pywinauto.application import ProcessNotFoundError
@@ -51,7 +52,7 @@ class AsyncInput:
def __init__(
self, pid: Optional[int] = None, browser: Optional[async_browsers] = None, scale_factor: Optional[float] = 1.0, emulate_behaviour: Optional[bool] = True, window_timeout: Optional[float] = 30.0
) -> None:
- if platform.system() not in ('Windows', 'Linux'):
+ if platform.system() not in ("Windows", "Linux"):
raise SystemError("Unknown system (You´re probably using MacOS, which is currently not supported).")
self.pid = pid
@@ -113,17 +114,19 @@ async def _sleep_timeout(self, timeout: Optional[float] = None) -> None:
await asyncio.sleep(timeout)
- async def click(self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None) -> None:
+ async def click(
+ self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], pressed: str = "", emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None
+ ) -> None:
x, y = int(x), int(y)
- await self.down(button=button, x=x, y=y, emulate_behaviour=emulate_behaviour, timeout=timeout)
+ await self.down(button=button, x=x, y=y, emulate_behaviour=emulate_behaviour, timeout=timeout, pressed=pressed)
if self.emulate_behaviour and emulate_behaviour:
await self._sleep_timeout(timeout=timeout)
- await self.up(button=button, x=x, y=y)
+ await self.up(button=button, x=x, y=y, pressed=pressed)
self.last_x, self.last_y = x, y
async def double_click(
- self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None
+ self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], pressed: str = "", emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None
) -> None:
x, y = int(x), int(y)
@@ -131,25 +134,30 @@ async def double_click(
if self.emulate_behaviour and emulate_behaviour:
await self._sleep_timeout(random.uniform(0.14, 0.21))
# await self._sleep_timeout(timeout=timeout)
- await self.click(button=button, x=x, y=y, emulate_behaviour=False, timeout=timeout)
+ await self.click(button=button, x=x, y=y, emulate_behaviour=False, timeout=timeout, pressed=pressed)
self.last_x, self.last_y = x, y
- async def down(self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None) -> None:
+ async def down(
+ self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], pressed: str = "", emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None
+ ) -> None:
x, y = int(x), int(y)
if self.emulate_behaviour and emulate_behaviour:
- await self.move(x=x, y=y, timeout=timeout, emulate_behaviour=emulate_behaviour)
- self._base.down(button=button, x=x, y=y)
+ await self.move(x=x, y=y, timeout=timeout, emulate_behaviour=emulate_behaviour, pressed=pressed)
+ kwargs = _mk_kwargs(pressed)
+ self._base.down(button=button, x=x, y=y, **kwargs)
self.last_x, self.last_y = x, y
- async def up(self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float]) -> None:
+ async def up(self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], pressed: str = "") -> None:
x, y = int(x), int(y)
- self._base.up(button=button, x=x, y=y)
+ kwargs = _mk_kwargs(pressed)
+ self._base.up(button=button, x=x, y=y, **kwargs)
self.last_x, self.last_y = x, y
- async def move(self, x: Union[int, float], y: Union[int, float], emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None) -> None:
+ async def move(self, x: Union[int, float], y: Union[int, float], emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None, pressed: str = "") -> None:
+ kwargs = _mk_kwargs(pressed)
async with self._move_lock:
x, y = int(x), int(y)
@@ -158,11 +166,11 @@ async def move(self, x: Union[int, float], y: Union[int, float], emulate_behavio
# Move Mouse to new random locations
for i, (human_x, human_y) in enumerate(humanized_points.points):
- self._base.move(x=int(human_x), y=int(human_y))
+ self._base.move(x=int(human_x), y=int(human_y), **kwargs)
await self._sleep_timeout(timeout=timeout)
else:
- self._base.move(x=x, y=y)
+ self._base.move(x=x, y=y, **kwargs)
self.last_x, self.last_y = x, y
async def scroll(self, direction: Literal["up", "down", "left", "right"], amount: int) -> None:
diff --git a/cdp_patches/input/browsers.py b/cdp_patches/input/browsers.py
index e511ac7..00269e2 100644
--- a/cdp_patches/input/browsers.py
+++ b/cdp_patches/input/browsers.py
@@ -27,14 +27,14 @@
try:
from selenium.webdriver import Chrome as SeleniumChrome
except ImportError:
- SeleniumChrome: Type["SeleniumChrome"] = "SeleniumChrome" # type: ignore[no-redef]
+ SeleniumChrome: Type["SeleniumChrome"] = type("SeleniumChrome", (object,), {}) # type: ignore[no-redef]
try:
from selenium_driverless.sync.webdriver import Chrome as DriverlessSyncChrome
from selenium_driverless.webdriver import Chrome as DriverlessAsyncChrome
except ImportError:
- DriverlessAsyncChrome: Type["DriverlessAsyncChrome"] = "DriverlessAsyncChrome" # type: ignore[no-redef]
- DriverlessSyncChrome: Type["DriverlessSyncChrome"] = "DriverlessSyncChrome" # type: ignore[no-redef]
+ DriverlessAsyncChrome: Type["DriverlessAsyncChrome"] = type("DriverlessAsyncChrome", (object,), {}) # type: ignore[no-redef]
+ DriverlessSyncChrome: Type["DriverlessSyncChrome"] = type("DriverlessSyncChrome", (object,), {}) # type: ignore[no-redef]
all_browsers = Union[AsyncContext, AsyncBrowser, SyncContext, SyncBrowser, BotrightContext, SeleniumChrome, DriverlessAsyncChrome, DriverlessSyncChrome]
sync_browsers = Union[SeleniumChrome, SyncContext, SyncBrowser, DriverlessSyncChrome]
diff --git a/cdp_patches/input/os_base/windows.py b/cdp_patches/input/os_base/windows.py
index 84ffacc..8c6adb6 100644
--- a/cdp_patches/input/os_base/windows.py
+++ b/cdp_patches/input/os_base/windows.py
@@ -2,7 +2,7 @@
import ctypes
import re
import warnings
-from typing import Literal, Union, List
+from typing import List, Literal, Union
from pywinauto import application, timings
from pywinauto.application import WindowSpecification
@@ -24,7 +24,7 @@
warnings.filterwarnings("ignore", category=UserWarning, message="32-bit application should be automated using 32-bit Python (you use 64-bit Python)")
-def get_top_window(app:application.Application, windows=List[Union[WindowSpecification, HwndWrapper]]) -> WindowSpecification:
+def get_top_window(app: application.Application, windows=List[Union[WindowSpecification, HwndWrapper]]) -> WindowSpecification:
if windows is None:
windows = app
# win32_app.top_window(), but without timeout
@@ -127,17 +127,19 @@ async def async_get_window(self, timeout: float = 1) -> WindowSpecification:
return self.browser_window
- def down(self, button: Literal["left", "right", "middle"], x: int, y: int) -> None:
+ def down(self, button: Literal["left", "right", "middle"], x: int, y: int, pressed: str = "") -> None:
+ if not pressed:
+ pressed = button
self.ensure_window()
- self.browser_window.press_mouse(button=button, coords=(int(x * self.scale_factor), int(y * self.scale_factor)))
+ self.browser_window.press_mouse(button=button, pressed=pressed, coords=(int(x * self.scale_factor), int(y * self.scale_factor)))
- def up(self, button: Literal["left", "right", "middle"], x: int, y: int) -> None:
+ def up(self, button: Literal["left", "right", "middle"], x: int, y: int, pressed: str = "") -> None:
self.ensure_window()
- self.browser_window.release_mouse(button=button, coords=(int(x * self.scale_factor), int(y * self.scale_factor)))
+ self.browser_window.release_mouse(button=button, pressed=pressed, coords=(int(x * self.scale_factor), int(y * self.scale_factor)))
- def move(self, x: int, y: int) -> None:
+ def move(self, x: int, y: int, pressed: str = "") -> None:
self.ensure_window()
- self.browser_window.move_mouse(coords=(int(x * self.scale_factor), int(y * self.scale_factor)), pressed="left")
+ self.browser_window.move_mouse(coords=(int(x * self.scale_factor), int(y * self.scale_factor)), pressed=pressed)
def scroll(self, direction: Literal["up", "down", "left", "right"], amount: int) -> None:
self.ensure_window()
diff --git a/cdp_patches/input/sync_input.py b/cdp_patches/input/sync_input.py
index 7b396ba..4032e2c 100644
--- a/cdp_patches/input/sync_input.py
+++ b/cdp_patches/input/sync_input.py
@@ -13,6 +13,7 @@
from cdp_patches import is_windows
from cdp_patches.input.exceptions import WindowClosedException
+from cdp_patches.input.utils import _mk_kwargs
if is_windows:
from pywinauto.application import ProcessNotFoundError
@@ -50,7 +51,7 @@ class SyncInput:
def __init__(
self, pid: Optional[int] = None, browser: Optional[sync_browsers] = None, scale_factor: Optional[float] = 1.0, emulate_behaviour: Optional[bool] = True, window_timeout: Optional[float] = 30.0
) -> None:
- if platform.system() not in ('Windows', 'Linux'):
+ if platform.system() not in ("Windows", "Linux"):
raise SystemError("Unknown system (You´re probably using MacOS, which is currently not supported).")
self._scale_factor = scale_factor or self._scale_factor
@@ -111,41 +112,48 @@ def _sleep_timeout(self, timeout: Optional[float] = None) -> None:
# while time.perf_counter() - start < timeout:
# pass
- def click(self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = 0.07) -> None:
+ def click(
+ self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], pressed: str = "", emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = 0.07
+ ) -> None:
x, y = int(x), int(y)
- self.down(button=button, x=x, y=y, emulate_behaviour=emulate_behaviour, timeout=timeout)
+ self.down(button=button, x=x, y=y, emulate_behaviour=emulate_behaviour, timeout=timeout, pressed=pressed)
if self.emulate_behaviour and emulate_behaviour:
self._sleep_timeout(timeout=timeout)
- self.up(button=button, x=x, y=y)
+ self.up(button=button, x=x, y=y, pressed=pressed)
self.last_x, self.last_y = x, y
- def double_click(self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None) -> None:
+ def double_click(
+ self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], pressed: str = "", emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None
+ ) -> None:
x, y = int(x), int(y)
- self.click(button=button, x=x, y=y, timeout=timeout, emulate_behaviour=emulate_behaviour)
+ self.click(button=button, x=x, y=y, timeout=timeout, emulate_behaviour=emulate_behaviour, pressed=pressed)
if emulate_behaviour and self.emulate_behaviour:
self._sleep_timeout(random.uniform(0.14, 0.21))
# self._sleep_timeout(timeout=timeout)
- self.click(button=button, x=x, y=y, emulate_behaviour=False, timeout=timeout)
+ self.click(button=button, x=x, y=y, emulate_behaviour=False, timeout=timeout, pressed=pressed)
self.last_x, self.last_y = x, y
- def down(self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None) -> None:
+ def down(
+ self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], pressed: str = "", emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None
+ ) -> None:
x, y = int(x), int(y)
if self.emulate_behaviour and emulate_behaviour:
- self.move(x=x, y=y, emulate_behaviour=emulate_behaviour, timeout=timeout)
- self._base.down(button=button, x=x, y=y)
+ self.move(x=x, y=y, emulate_behaviour=emulate_behaviour, timeout=timeout, pressed=pressed)
+ self._base.down(button=button, x=x, y=y, **_mk_kwargs(pressed))
self.last_x, self.last_y = x, y
- def up(self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float]) -> None:
+ def up(self, button: Literal["left", "right", "middle"], x: Union[int, float], y: Union[int, float], pressed: str = "") -> None:
x, y = int(x), int(y)
- self._base.up(button=button, x=x, y=y)
+ self._base.up(button=button, x=x, y=y, **_mk_kwargs(pressed))
self.last_x, self.last_y = x, y
- def move(self, x: Union[int, float], y: Union[int, float], emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None) -> None:
+ def move(self, x: Union[int, float], y: Union[int, float], pressed: str = "", emulate_behaviour: Optional[bool] = True, timeout: Optional[float] = None) -> None:
+ kwargs = _mk_kwargs(pressed)
with self._move_lock:
x, y = int(x), int(y)
@@ -154,10 +162,10 @@ def move(self, x: Union[int, float], y: Union[int, float], emulate_behaviour: Op
# Move Mouse to new random locations
for i, (human_x, human_y) in enumerate(humanized_points.points):
- self._base.move(x=int(human_x), y=int(human_y))
+ self._base.move(x=int(human_x), y=int(human_y), **kwargs)
self._sleep_timeout(timeout=timeout)
- self._base.move(x=x, y=y)
+ self._base.move(x=x, y=y, **kwargs)
self.last_x, self.last_y = x, y
def scroll(self, direction: Literal["up", "down", "left", "right"], amount: int) -> None:
diff --git a/cdp_patches/input/utils.py b/cdp_patches/input/utils.py
new file mode 100644
index 0000000..14de38c
--- /dev/null
+++ b/cdp_patches/input/utils.py
@@ -0,0 +1,12 @@
+from typing import Optional
+
+from cdp_patches import is_windows
+
+
+def _mk_kwargs(pressed: Optional[str]) -> dict[str, str]:
+ kwargs = {}
+ if pressed is not None:
+ if not is_windows:
+ raise NotImplementedError("specifying pressed buttons currently only supported for windows")
+ kwargs["pressed"] = pressed
+ return kwargs
diff --git a/requirements-test.txt b/requirements-test.txt
index ef592c0..92faf2b 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,14 +1,13 @@
# This requirements are for development and testing only, not for production.
-flake8==7.0.0
-pytest==8.1.1
-pytest_asyncio==0.23.6
-mypy==1.9.0
-types-setuptools==69.2.0.20240317
-black==24.3.0
+flake8==7.1.0
+pytest==8.2.2
+pytest_asyncio==0.23.7
+mypy==1.10.1
+types-setuptools==69.5.*
+black==24.4.2
isort==5.13.2
-playwright==1.42.0
-selenium==4.18.1
-selenium_driverless==1.8.0.2
+playwright==1.44.0
+selenium==4.22.0
+selenium_driverless==1.9.3.1
twisted==24.3.0
-types-requests==2.31.*
-webdriver_manager==4.0.1
\ No newline at end of file
+types-requests==2.31.*
\ No newline at end of file
diff --git a/tests/assets/input/mouse-helper.js b/tests/assets/input/mouse-helper.js
index c3d17eb..469d3b2 100644
--- a/tests/assets/input/mouse-helper.js
+++ b/tests/assets/input/mouse-helper.js
@@ -59,4 +59,10 @@
for (let i = 0; i < 5; i++)
box.classList.toggle('button-' + i, buttons & (1 << i));
}
+
+ window.last_hover_elem = undefined
+ document.body.addEventListener("mousemove", ()=>{
+ var elem = document.querySelector('button:hover')
+ if (typeof elem !== 'undefined'){window.last_hover_elem = elem}
+ })
})();
\ No newline at end of file
diff --git a/tests/conftest.py b/tests/conftest.py
index cf3d59d..8673e09 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,3 +1,7 @@
+import os
+import signal
+import subprocess
+import tempfile
from typing import AsyncGenerator, Generator, List
import pytest
@@ -7,14 +11,13 @@
from playwright.sync_api import Page as SyncPage
from playwright.sync_api import sync_playwright
from selenium import webdriver as selenium_webdriver
-from selenium.webdriver.chrome.service import Service as SeleniumChromeService
from selenium_driverless import webdriver as async_webdriver
from selenium_driverless.sync import webdriver as sync_webdriver
-from webdriver_manager.chrome import ChromeDriverManager
from cdp_patches.input import AsyncInput, SyncInput
from .server import Server, test_server
+from .utils import find_chrome_executable, random_port
flags: List[str] = [
"--incognito",
@@ -146,7 +149,7 @@ def selenium_driver() -> Generator[selenium_webdriver.Chrome, None, None]:
# start url at about:blank
options.add_argument("about:blank")
- with selenium_webdriver.Chrome(options, service=SeleniumChromeService(ChromeDriverManager().install())) as driver:
+ with selenium_webdriver.Chrome(options) as driver:
driver.sync_input = SyncInput(browser=driver)
yield driver
@@ -160,3 +163,24 @@ async def async_driver() -> AsyncGenerator[async_webdriver.Chrome, None]:
async with async_webdriver.Chrome(options) as driver:
driver.async_input = await AsyncInput(browser=driver)
yield driver
+
+
+@pytest.fixture
+def chrome_proc() -> Generator[subprocess.Popen[bytes], None, None]:
+ with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as tempdir:
+ path = find_chrome_executable()
+ proc = subprocess.Popen([path, f"--remote-debugging-port={random_port()}", f"--user-data-dir={tempdir}", "--no-first-run"])
+ try:
+ yield proc
+ finally:
+ if os.name == "posix":
+ os.killpg(os.getpgid(proc.pid), signal.SIGTERM) # type: ignore[attr-defined]
+ else:
+ proc.terminate()
+ try:
+ proc.wait(10)
+ except subprocess.TimeoutExpired:
+ if os.name == "posix":
+ os.killpg(os.getpgid(proc.pid), signal.SIGKILL) # type: ignore[attr-defined]
+ else:
+ proc.kill()
diff --git a/tests/server.py b/tests/server.py
index 6285bf3..affb0e1 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -7,15 +7,15 @@
import threading
from contextlib import closing
from http import HTTPStatus
+from pathlib import Path
from typing import Any, Callable, Dict, Generator, Generic, Optional, Set, Tuple, TypeVar, cast
from urllib.parse import urlparse
-from playwright._impl._path_utils import get_file_dirname
from twisted.internet import reactor as _twisted_reactor
from twisted.internet.selectreactor import SelectReactor
from twisted.web import http
-_dirname = get_file_dirname()
+_dirname = Path(__file__).parent.absolute()
reactor = cast(SelectReactor, _twisted_reactor)
diff --git a/tests/test_async_driverless.py b/tests/test_async_driverless.py
index 4dcf423..741fad4 100644
--- a/tests/test_async_driverless.py
+++ b/tests/test_async_driverless.py
@@ -23,9 +23,11 @@ async def get_locator_pos(locator: WebElement):
return x, y
+@pytest.mark.skip("Currently bugged by Driverless. Skipping until Update.")
@pytest.mark.asyncio
async def test_input_leak(async_driver: Chrome, server: Server) -> None:
await async_driver.get(server.PREFIX + "/input/button.html")
+ await async_driver.sleep(1)
await async_driver.execute_script(
"""
const click_elem = document.querySelector("button")
@@ -52,6 +54,7 @@ async def test_input_leak(async_driver: Chrome, server: Server) -> None:
@pytest.mark.asyncio
async def test_click_the_button(async_driver: Chrome, server: Server) -> None:
await async_driver.get(server.PREFIX + "/input/button.html")
+ await async_driver.sleep(1)
sync_locator = await async_driver.find_element(By.XPATH, "//button")
x, y = await get_locator_pos(sync_locator)
await async_driver.async_input.click("left", x, y) # type: ignore[attr-defined]
@@ -61,6 +64,7 @@ async def test_click_the_button(async_driver: Chrome, server: Server) -> None:
@pytest.mark.asyncio
async def test_double_click_the_button(async_driver: Chrome, server: Server) -> None:
await async_driver.get(server.PREFIX + "/input/button.html")
+ await async_driver.sleep(1)
await async_driver.execute_script(
"""window.double = false;
button = document.querySelector('button');
@@ -70,6 +74,7 @@ async def test_double_click_the_button(async_driver: Chrome, server: Server) ->
sync_locator = await async_driver.find_element(By.XPATH, "//button")
x, y = await get_locator_pos(sync_locator)
await async_driver.async_input.double_click("left", x, y) # type: ignore[attr-defined]
+ await asyncio.sleep(0.1)
assert await async_driver.execute_script("return window.double")
assert await async_driver.execute_script("return result") == "Clicked"
@@ -111,6 +116,7 @@ async def test_locators_hover(async_driver: Chrome, server: Server) -> None:
# sync_page.add_init_script(x)
await async_driver.get(server.PREFIX + "/input/scrollable.html")
+ await async_driver.sleep(1)
await async_driver.async_input.move(500, 100) # type: ignore[attr-defined]
sync_locator = await async_driver.find_element(By.ID, "button-12")
@@ -118,12 +124,13 @@ async def test_locators_hover(async_driver: Chrome, server: Server) -> None:
await async_driver.async_input.move(x, y) # type: ignore[attr-defined]
await asyncio.sleep(0.5)
- assert await async_driver.execute_script("return document.querySelector('button:hover').id") == "button-12"
+ assert await async_driver.execute_script("return window.last_hover_elem.id") == "button-12"
@pytest.mark.asyncio
async def test_fill_input(async_driver: Chrome, server: Server) -> None:
await async_driver.get(server.PREFIX + "/input/textarea.html")
+ await async_driver.sleep(1)
sync_locator = await async_driver.find_element(By.XPATH, "//input")
assert sync_locator
@@ -142,6 +149,7 @@ async def test_keyboard_type_into_a_textarea(async_driver: Chrome) -> None:
textarea.focus();
"""
)
+ await async_driver.sleep(1)
text = "Hello world. I +am the %text that was typed!"
sync_locator = await async_driver.find_element(By.XPATH, "//textarea")
diff --git a/tests/test_async_playwright.py b/tests/test_async_playwright.py
index 7caf069..703f8bc 100644
--- a/tests/test_async_playwright.py
+++ b/tests/test_async_playwright.py
@@ -69,6 +69,7 @@ async def test_double_click_the_button(async_page: Page, server: Server) -> None
locator = async_page.locator("button")
x, y = await get_locator_pos(locator)
await async_page.async_input.double_click("left", x, y) # type: ignore[attr-defined]
+ await asyncio.sleep(0.1)
assert await async_page.evaluate("double")
assert await async_page.evaluate("result") == "Clicked"
@@ -83,9 +84,10 @@ async def test_locators_hover(async_page: Page, server: Server) -> None:
await async_page.async_input.move(x, y) # type: ignore[attr-defined]
await asyncio.sleep(0.5)
- assert await async_page.evaluate("document.querySelector('button:hover').id") == "button-12"
+ assert await async_page.evaluate("window.last_hover_elem.id") == "button-12"
+@pytest.mark.skip(reason="Scroll Tests currently arent implemented properly.")
@pytest.mark.asyncio
async def test_scroll(async_page: Page, server: Server) -> None:
await async_page.goto(server.PREFIX + "/offscreenbuttons.html")
diff --git a/tests/test_other.py b/tests/test_other.py
new file mode 100644
index 0000000..be089ab
--- /dev/null
+++ b/tests/test_other.py
@@ -0,0 +1,29 @@
+import subprocess
+
+import pytest
+
+from cdp_patches.input import AsyncInput, SyncInput
+
+
+def test_raises_from_pid():
+ with pytest.raises(TimeoutError):
+ sync_input = SyncInput(pid=-1, window_timeout=1)
+ sync_input.click("left", 100, 100)
+
+
+@pytest.mark.asyncio
+async def test_async_raises_from_pid():
+ with pytest.raises(TimeoutError):
+ sync_input = await AsyncInput(pid=-1, window_timeout=1)
+ await sync_input.click("left", 100, 100)
+
+
+@pytest.mark.asyncio
+async def test_async_from_pid(chrome_proc: subprocess.Popen[bytes]):
+ sync_input = await AsyncInput(pid=chrome_proc.pid, window_timeout=1)
+ await sync_input.click("left", 100, 100)
+
+
+def test_sync_from_pid(chrome_proc: subprocess.Popen[bytes]):
+ sync_input = SyncInput(pid=chrome_proc.pid, window_timeout=1)
+ sync_input.click("left", 100, 100)
diff --git a/tests/test_selenium.py b/tests/test_selenium.py
index 38bf7e2..c365601 100644
--- a/tests/test_selenium.py
+++ b/tests/test_selenium.py
@@ -66,6 +66,7 @@ def test_double_click_the_button(selenium_driver: Chrome, server: Server) -> Non
sync_locator = selenium_driver.find_element(By.XPATH, "//button")
x, y = get_locator_pos(sync_locator)
selenium_driver.sync_input.double_click("left", x, y) # type: ignore[attr-defined]
+ time.sleep(0.1)
assert selenium_driver.execute_script("return window.double")
assert selenium_driver.execute_script("return result") == "Clicked"
@@ -113,7 +114,7 @@ def test_locators_hover(selenium_driver: Chrome, server: Server) -> None:
selenium_driver.sync_input.move(x, y) # type: ignore[attr-defined]
time.sleep(0.5)
- assert selenium_driver.execute_script("return document.querySelector('button:hover').id") == "button-12"
+ assert selenium_driver.execute_script("return window.last_hover_elem.id") == "button-12"
def test_fill_input(selenium_driver: Chrome, server: Server) -> None:
diff --git a/tests/test_sync_driverless.py b/tests/test_sync_driverless.py
index e34781b..c346dc4 100644
--- a/tests/test_sync_driverless.py
+++ b/tests/test_sync_driverless.py
@@ -25,6 +25,7 @@ def get_locator_pos(locator: WebElement):
def test_input_leak(sync_driver: Chrome, server: Server) -> None:
sync_driver.get(server.PREFIX + "/input/button.html")
+ sync_driver.sleep(1)
sync_driver.execute_script(
"""
const click_elem = document.querySelector("button")
@@ -50,6 +51,7 @@ def test_input_leak(sync_driver: Chrome, server: Server) -> None:
def test_click_the_button(sync_driver: Chrome, server: Server) -> None:
sync_driver.get(server.PREFIX + "/input/button.html")
+ sync_driver.sleep(1)
sync_locator = sync_driver.find_element(By.XPATH, "//button")
x, y = get_locator_pos(sync_locator)
sync_driver.sync_input.click("left", x, y) # type: ignore[attr-defined]
@@ -58,6 +60,7 @@ def test_click_the_button(sync_driver: Chrome, server: Server) -> None:
def test_double_click_the_button(sync_driver: Chrome, server: Server) -> None:
sync_driver.get(server.PREFIX + "/input/button.html")
+ sync_driver.sleep(1)
sync_driver.execute_script(
"""window.double = false;
button = document.querySelector('button');
@@ -67,6 +70,7 @@ def test_double_click_the_button(sync_driver: Chrome, server: Server) -> None:
sync_locator = sync_driver.find_element(By.XPATH, "//button")
x, y = get_locator_pos(sync_locator)
sync_driver.sync_input.double_click("left", x, y) # type: ignore[attr-defined]
+ time.sleep(0.1)
assert sync_driver.execute_script("return window.double")
assert sync_driver.execute_script("return result") == "Clicked"
@@ -107,6 +111,7 @@ def test_locators_hover(sync_driver: Chrome, server: Server) -> None:
# sync_page.add_init_script(x)
sync_driver.get(server.PREFIX + "/input/scrollable.html")
+ sync_driver.sleep(1)
sync_driver.sync_input.move(500, 100) # type: ignore[attr-defined]
sync_locator = sync_driver.find_element(By.ID, "button-12")
@@ -114,11 +119,12 @@ def test_locators_hover(sync_driver: Chrome, server: Server) -> None:
sync_driver.sync_input.move(x, y) # type: ignore[attr-defined]
time.sleep(0.5)
- assert sync_driver.execute_script("return document.querySelector('button:hover').id") == "button-12"
+ assert sync_driver.execute_script("return window.last_hover_elem.id") == "button-12"
def test_fill_input(sync_driver: Chrome, server: Server) -> None:
sync_driver.get(server.PREFIX + "/input/textarea.html")
+ sync_driver.sleep(1)
sync_locator = sync_driver.find_element(By.XPATH, "//input")
assert sync_locator
@@ -136,6 +142,7 @@ def test_keyboard_type_into_a_textarea(sync_driver: Chrome) -> None:
textarea.focus();
"""
)
+ sync_driver.sleep(1)
text = "Hello world. I +am the %text that was typed!"
sync_locator = sync_driver.find_element(By.XPATH, "//textarea")
diff --git a/tests/test_sync_playwright.py b/tests/test_sync_playwright.py
index 3ab013c..d00c4a3 100644
--- a/tests/test_sync_playwright.py
+++ b/tests/test_sync_playwright.py
@@ -66,6 +66,7 @@ def test_double_click_the_button(sync_page: Page, server: Server) -> None:
locator = sync_page.locator("button")
x, y = get_locator_pos(locator)
sync_page.sync_input.double_click("left", x, y) # type: ignore[attr-defined]
+ time.sleep(0.1)
assert sync_page.evaluate("double")
assert sync_page.evaluate("result") == "Clicked"
@@ -79,9 +80,10 @@ def test_locators_hover(sync_page: Page, server: Server) -> None:
sync_page.sync_input.move(x, y) # type: ignore[attr-defined]
time.sleep(0.5)
- assert sync_page.evaluate("document.querySelector('button:hover').id") == "button-12"
+ assert sync_page.evaluate("window.last_hover_elem.id") == "button-12"
+@pytest.mark.skip(reason="Scroll Tests currently arent implemented properly.")
def test_scroll(sync_page: Page, server: Server) -> None:
sync_page.goto(server.PREFIX + "/offscreenbuttons.html")
for i in range(11):
diff --git a/tests/utils.py b/tests/utils.py
new file mode 100644
index 0000000..704e5ff
--- /dev/null
+++ b/tests/utils.py
@@ -0,0 +1,60 @@
+import os
+import socket
+import sys
+from contextlib import closing
+from typing import Optional
+
+IS_POSIX = sys.platform.startswith(("darwin", "cygwin", "linux", "linux2"))
+
+
+def find_chrome_executable() -> str:
+ """
+ Finds the Chrome, Chrome beta, Chrome canary, Chromium executable
+
+ Returns
+ -------
+ executable_path : str
+ the full file path to found executable
+
+ """
+ candidates = set()
+ if IS_POSIX:
+ for posix_item in os.environ.get("PATH", "").split(os.pathsep):
+ for subitem in (
+ "google-chrome",
+ "chromium",
+ "chromium-browser",
+ "chrome",
+ "google-chrome-stable",
+ ):
+ candidates.add(os.sep.join((posix_item, subitem)))
+ if "darwin" in sys.platform:
+ candidates.update(
+ [
+ "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+ "/Applications/Chromium.app/Contents/MacOS/Chromium",
+ ]
+ )
+ else:
+ for windows_item in map(
+ os.environ.get,
+ ("PROGRAMFILES", "PROGRAMFILES(X86)", "LOCALAPPDATA", "PROGRAMW6432"),
+ ):
+ if windows_item is not None:
+ for subitem in (
+ "Google/Chrome/Application",
+ "Google/Chrome Beta/Application",
+ "Google/Chrome Canary/Application",
+ ):
+ candidates.add(os.sep.join((windows_item, subitem, "chrome.exe")))
+ for candidate in candidates:
+ if os.path.exists(candidate) and os.access(candidate, os.X_OK):
+ return os.path.normpath(candidate)
+ raise FileNotFoundError("Couldn't find installed Chrome or Chromium executable")
+
+
+def random_port(host: Optional[str] = "") -> int:
+ with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s:
+ s.bind((host, 0))
+ s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+ return int(s.getsockname()[1])