diff --git a/LICENSE b/LICENSE
index f288702d..aae767c4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,674 +1,21 @@
- 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
-.
+MIT License
+
+Copyright (c) 2020 TheEmeraldStarr
+
+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.
diff --git a/README.md b/README.md
index 2e05768d..e04f1504 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,14 @@
-
-# Holy Unblocker
+# Holy Unblocker
-#### Titanium Network is sponsored by:
+A website that can be used to bypass web filters; both extension and firewall. This is the public source code for Holy Unblocker, a rather fancy website with some cool dynamic backgrounds while also focusing with detail put into the design, mechanics and features overall like custom Tab Cloaks with more to come in the future.
-
+Works with a large number of sites including YouTube, Discord and more! Be sure to read below for information if the official site is blocked or for obtaining more links.
-Holy Unblocker, an official flagship Titanium Network site, can bypass web filters regardless of whether it is an extension or network-based. Being a secure web proxy service, it supports numerous sites while being updated frequently and concentrating on detail with design, mechanics, and features.
+YouTube has specialized support with the ablity to view steams, comments, bypass restricted mode, and have full quality on videos.
-Works with a large number of sites, including YouTube, Discord, and more!
+Be sure to check the various branches as I update Holy Unblocker often with open access to yet to be released versions.
-Read below for information if the official site is blocked or for obtaining more links.
+Also has a good amount of locally hosted games featured on the site.
#### Supports
- Youtube.com
@@ -17,24 +16,20 @@ Read below for information if the official site is blocked or for obtaining more
- Google.com
- Reddit.com
- Bing.com
-- And more!
-
-#### Features:
-- Tab customization using the Options menu for improved stealth
-- Considerable variety with the open selection of proxy types
-- Game library with moderately decent titles like A Dark Room
-- Has frequent support articles for issues relating to the various proxy instances
-
-Be sure to join Titanium Network's Discord for more official site links: https://discord.gg/hcUUceSCtj
-
-Do %proxy hu for more Holy Unblocker links on the Titanium Network Discord server.
-
-**Official Site:** https://www.holyubofficial.net
-
-**Site Documentation:** Documentation
+- And more sites!
+Official Site: https://www.holyubofficial.net
+
+Site Documentation: Documentation
+
+Instance Status: Status
+
+Be sure to join Titanium Network's Discord for more official site links: https://discord.gg/unblock
+
+Simply do `%proxy hu` for more Holy Unblocker links on the TN Discord server.
+
@@ -42,14 +37,15 @@ Do %proxy hu for more Holy Unblocker links on the Titanium Network Discord serve
-
+
## Table of contents:
- [Setup](#how-to-install)
- [Structure](#structure)
- [Structure Information](#structure)
- - [Static Files](#details-of-views)
+ - [Static Files](#details-of-public)
- [Proxy Scripts](#scripts-located-in-expr)
+ - [Cookie Auth](#details-of-authjs)
- [Future Additions](#future-additions)
- [Beginner's Explanation](#vauge-explanation-for-beginners-with-external-proxies-and-hosting)
- [Hosting Providers](#list-of-some-good-hosting-options)
@@ -61,21 +57,23 @@ Do %proxy hu for more Holy Unblocker links on the Titanium Network Discord serve
- [More Information](#more-information)
## How to Setup
+
Either use the button above to deploy to Heroku or do the below:
-```
-$ git clone https://github.com/QuiteAFancyEmerald/HolyUnblockerPublic.git
-$ cd HolyUnblockerPublic
-$ npm install
-```
-Afterward, run:
-```
-$ npm start
-```
-For more detailed documentation on workspace setup, please view this.
-The default place for the proxy when it started is `http://localhost:8080`, but it can be changed if needed in config.json
+```
+git clone https://github.com/QuiteAFancyEmerald/HolyUnblockerPublic.git
+
+cd HolyUnblockerPublic
+
+npm install
+
+npm start
+```
+
+The default place for the proxy when its started is `http://localhost:8080` but you can change it if needed in config.json
+
+This website has been hosted locally on Alloy Proxy. More more information go to the Alloy Proxy repository below.
-This website has been hosted locally on Alloy Proxy. For more information, head over to the Alloy Proxy repository below.
## Structure
- `index.html` : The official homepage of the site.
@@ -121,176 +119,144 @@ This website has been hosted locally on Alloy Proxy. For more information, head
- Expansive game library
- Various parity changes.
-## An explanation for Beginners With External Proxies and Hosting
-You will first want to host your proxies locally or externally. Note that an older version of Alloy proxy is the only proxy hosted locally with this distribution of Holy Unblocker.
+## Vauge Explanation for Beginners With External Proxies and Hosting
+You will first want to host your proxies locally or externally.
-**Proxies that you will need for a complete setup for Holy Unblocker:**
+#### List of some good hosting options:
+- Heroku (Free)
+- NodeClusters (Paid)
+- Glitch (Free)
+- Repl.it (Free)
+- Azure (Free and Paid)
-Womginx - https://github.com/binary-person/womginx
+Out of the list of hosting providers Heroku and NodeClusters rank first as a preference. You may also self-host. Currently at this time Azure is used to host the official Holy Unblocker sites.
-SysYA Proxy - https://github.com/sysce/proxy
+After you have selected a decent VPS, use Cloudflare for the DNS records for both the site and the subdomains for the proxies.
-Via Unblocker/PyDodge -https://github.com/BinBashBanana/PyDodge
+This is an example of DNS records involving Heroku. Self-hosting will require `A records` preferably.
+
-Alloy Proxy - https://github.com/titaniumnetwork-dev/alloy
+- `a.deepsoil.ml` is being used for Node Unblocker.
+- `p.deepsoil.ml` is being used for SysYa Proxy.
+- `pd.deepsoil.ml` is being used for PyDodge B.
+- `cdn.deepsoil.ml` is being used for a private Alloy host on the official sites.
-The source used for Via Unblocker on the official sites is not public.
+Update, the new configuration is:
-**List of some good hosting options:**
+- `a.example.com` is being used for Node Unblocker.
+- `d.example.com` is being used for Ocean proxy.
+- `c.example.com` is being used for SysYa and the Chatbox.
+- `cdn.example.com` is being used for a private Alloy and Via which is hosted on the official sites.
-- Dedipath (Paid and Dedicated)
-- Heroku (Free)
-- NodeClusters (Paid)
-- Glitch (Free)
-- Repl.it (Free)
-- Azure (Free and Paid)
--
-Out of the list of hosting providers Heroku and Dedipath rank first as a preference.
+As stated previously, Holy Unblocker is hosted locally with Alloy.
-You may also self-host. Currently, at this time, Dedipath is used to host the official Holy Unblocker sites.
+#### Heroku Steps
+So use Heroku to host. I personally favor it as a free choice.
-After you have selected a decent VPS, use Cloudflare for DNS records for both the site and the subdomains for the proxies.
-The image below is an example of DNS records involving Heroku. Self-hosting will require A records, preferably.
+- First obtain a card; (Prepaid, Debit, and Credit Cards work). You need this to add custom domains to your Heroku instance.
-
+Make sure you connect your Heroku app to your GitHub and enable automatic deploys. Will make things easier. :)
-**The configuration being used on the official sites currently are the below:**
+#### Freenom/Domain Steps
+For beginners, Freenom is a good provider for obtaining domains for free. However the catch is that you can only use properly "Freenom" domains for free being .cf, .ml, .gq, ga and .tk. However these can be blocked rather easily.
-- `a.example.com` is used for Womginx.
-- `c.example.com` is used for SysYA Proxy, Via Unblocker, and the Chatbox.
-- `cdn.example.com` is used for a private, updated Alloy instance.
-### Heroku Steps
-So use Heroku to host. I favor it as a free choice.
+- Get some Freenom domains then add them to your Heroku instance (Personal > [App Name] > Settings > Domains)
+Add a domain for both `www.youdomainhere.cf` and `yourdomainhere.cf` with .cf being interchangeable with other Freedom domain names.
+- If you prefer to obtain premium domains (TLDs) then use Porkbun, which offers domains for amazing prices. Literally a `.net` domain normally costs around $10. On Porkbun for the first year it costs $3 so its definitely a deal.
-- First, obtain a card; (Prepaid, Debit, and Credit Cards work). It would be best if you had this to add custom domains to your Heroku instance.
-- Make sure you connect your Heroku app to your GitHub and enable automatic deploys. It will make things easier. :)
+#### Cloudflare Steps
+- Use Cloudflare (make an account), add your site (Freenom Domain or Domain) and then add your various DNS targets to Cloudflare. Make sure you add Cloudflare's Nameservers which will be specified more when you are adding your site.
-### Freenom/Domain Steps
-For beginners, Freenom is a good provider for obtaining domains for free. However, the catch is that you can only use properly "Freenom" domains for free, being .cf, .ml, .gq, ga, and .tk. However, these can be blocked relatively easily.
+Make sure they are CNAME although A records also work and try to follow this structure:
-- Get some Freenom domains, then add them to your Heroku instance (Personal > [App Name] > Settings > Domains).
-- Add a domain for both www.youdomainhere.cf and yourdomainhere.cf with .cf being interchangeable with other Freedom domain names.
+**Type | Name | Target**
-If you prefer to obtain premium domains (TLDs), then use Porkbun, which offers domains for excellent prices. A .net domain typically costs around $10. On Porkbun for the first year, it costs $3, so it is a deal.
+`CNAME | www | yourherokutargethere.herokudns.com `
+`CNAME | @ | yourherokudnstargethere.herokudns.com`
-### Cloudflare Steps
-Use Cloudflare (make an account), add your site (Freenom Domain or Domain), and then add your various DNS targets to Cloudflare. Make sure you add Cloudflare's Nameservers which will be specified more when you are adding your site.
+**Below are if you want external proxies also with your site:**
-Lastly, for targets, make sure they are either a CNAME, AAAA, or A records and try to follow this structure:
+`CNAME | a | yournodeinstance.herokudns.com`
+`CNAME | pd | yourpydodgebinstancehere.herokudns.com`
+`CNAME | p | yoursysyainstancehere.herokudns.com`
-Type | Name | Target
+Make sure HTTPS is forced and have SSL set to Flexible for Heroku. Otherwise you can have SSL set to Full.
-`CNAME | @ | yourherokudnstargethere.herokudns.com` or `CNAME | @ | example.com`
+#### Workspace Configurations
+Preferably if you have your own device use Visual Studio Code. Pretty much the best option you can get but obviously this is an opinion. Also make sure you have Node.JS installed on your machine.
-`CNAME | www | yourherokutargethere.herokudns.com` or `CNAME | www | example.com`
+Not going to go too in depth with this part but first fork this repository. The clone it locally through a Terminal of some sort depending on what OS you are on. Make sure you navigate to the folder you want to set this up in.
-Below are if you want external proxies also with your site:
-
-`CNAME | a | yourwomginxinstance.herokudns.com` or `CNAME | a | example.com`
-`CNAME | c | yoursysyaproxyinstancehere.herokudns.com` or `CNAME | c | example.com`
-
-(You get the idea.)
-
-Make sure HTTPS is forced and have SSL set to Flexible for Heroku. Otherwise, you may have SSL set to Full. Use LetsEncrypt for SSL certificates or Cloudflare.
-
-## Workspace Configurations
-Preferably use Visual Studio Code for an IDE. Pretty much the best option you can get, but obviously, this is an opinion. Also, make sure you have Node.JS installed on your machine.
-
-Not going to go too in-depth with this part but first, fork or clone this repository. Clone it locally through a terminal of some sort, depending on what OS you are on.
-
-Make sure you navigate to the folder you want to set this up in.
```
-$ git clone https://github.com/QuiteAFancyEmerald/HolyUnblockerPublic.git
-$ cd HolyUnblockerPublic
-$ npm install
-```
-Setup pm2 (Optional - Node.js Process Manager)
-```
-$ npm install pm2@latest -g
-$ pm2 start app.js
-```
-Useful pm2 Flags
-```
-# Specify an app name
---name
+git clone https://github.com/QuiteAFancyEmerald/HolyUnblockerPublic.git
-# Watch and Restart app when files change
---watch
+cd HolyUnblockerPublic
-# Set memory threshold for app reload
---max-memory-restart <200MB>
+npm install
```
-For more information, view the official pm2 documentation here.
-#### Workspace Setup (continued)
-Now add the folder you cloned in VSC. Then run npm install. It is recommended that if you are releasing this publically on GitHub that you add a .gitignore in your root directory with the following exclusions:
+Now simply add the folder you cloned this repo in in VSC. Then run `npm install`. I recommend that if you are releasing this publically on GitHub that you add a `.gitignore` in your root directory with the following exclusions:
`node_modules`
-Now you have your following workspace environment setup. To deploy the following workspace you just created, you will need to lookup depending on your hosting provider.
+Now you have your following workspace environment setup. To deploy the following workspace you just created you will need to look up depending on your hosting provider.
-- For an online IDE that you can use on your school computer or Chromebook, use GitPod. The equivalent of Visual Studio Code but with in-browser support.
-- Make an account: https://gitpod.io/.
-- Fork this repo and enter in this URL to set up your workspace: `https://gitpod.io#https://github.com/YourNameHere/HolyUnblockerPublic/`
+For an online IDE that you can use on your school computer and/or chromebook use GitPod. Basically the equivalent of Visual Studio Code but with in-browser support.
+- Make an account: `https://gitpod.io/`
+- Fork this repo and enter in this URL to setup your workspace: `https://gitpod.io#https://github.com/YourNameHere/HolyUnblockerPublic/`
-Use the same steps above by running npm install in your repository and adding a .gitignore in your root directory specifying to exclude `node_modules`.
+Use the same steps above by running `npm install` in your repository and adding a `.gitignore` in your root directory specifying to exclude `node_modules`.
## Detailed FAQ
-A detailed FAQ with common issues and solutions can be found here or on any official HU site on the FAQ page.
-
-**Why are YouTube videos not working?**
-
-If you have persistent issues even after doing the steps above, the instance is down temporarily, especially if large groups of people are also having the issue. The latest release of Alloy currently does not have support for YouTube. However, manually putting in full links like `https://www.youtube.com/watch?v=mauV2NdCs60` will work. You may also try doing a Hard Reload (Ctrl+Shift+R)
-A later release of Alloy may fix this issue. Sorry.
+A detailed FAQ with common issues and solutions can be found here or on any official HU site on the FAQ page.
**Why is the site I am on not working correctly or having CAPTCHA errors?**
-Captcha has limited support on Womginx. However, support is not available on some of the older proxies, sadly. Therefore some sites may not work with any of the sites. Read below for issues with links on sites.
+Captcha support is currently not available on all of the current proxies sadly. Therefore some sites may not work with any of the sites. Read below for issues with links on sites.
-**Why are page links not working or leading to 404 pages?**
+**Why are some page links not working or leading to 404 pages?**
-This is an issue with Alloy proxy's latest release, but it may also occur with other proxies. In this case, manually entering the URL of the page you would like to view can solve this, or try navigating using the home button. (Reddit, Twitter) The next release of Alloy may fix this also.
+This is an issue with the latest release of Alloy proxy but it may also occur with other proxies.
-**When using YouTube on any of the proxy sites, why does the page not load entirely, or the video just white?**
+In this case manually entering the URL of the page you would like to view can solve this or try navigating using the home button. (Reddit, Twitter) The next release of Alloy may fix this also.
+
+**When using YouTube on any of the proxy sites, why does the page not load fully or the video is just white?**
There are two methods for fixing this:
-- Reloading the page usually when the error above happens should load the video.
-- Alternatively, right-clicking the page and doing Reload Frame if you are using some form of Stealth Mode may work.
-**When using Discord under Alloy or SysYa, why does the page stay gray/white, or the QR code not loading? **
+- Reloading the page normally when the error above happens should load the video.
+- Or right-clicking the page and doing Reload Frame if you are using some form of Stealth Mode.
-Womginx now supports logging in, usually for Discord. However, here are the steps related to Alloy troubleshooting.
-Note that this is for the older discord proxy steps with Alloy and SysYA Proxy.
+**When using Discord under Alloy or SysYa, why does the page stay gray/white or the QR code not load?**
-**On the official sites, I am getting 502 errors. What do I do?**
+Once again do the same steps above:
+- Reloading the page normally when the error above happens should load the video
+- Or right-clicking the page and doing Reload Frame if you are using some form of Stealth Mode.
+
+Make sure you are also doing the steps correctly. Simply view link above for extended Discord proxy information/steps.
+
+**I am getting 502 errors. What do I do?**
+
+When this happens you may either switch sites to fix the error or wait a bit. Sometimes clearing your cache can help.
+
+If you still have any questions feel free to ask them in the discord linked here.
-The proxy may be down, being worked on, or is under high load.
-When this happens, you may either switch sites to fix the error or wait a bit. Sometimes clearing your cache can help by doing Ctrl+Shift+R or reloading the page usually. (Hard Reload, which purges cache.)
## More Information
-This project is maintained by Quite A Fancy Emerald with massive help from BinBashBanana (OlyB) and is an official flagship Titanium Network proxy site.
+This project uses Alloy Proxy, Node Unblocker, SysYa and PyDodge which are linked below.
+
+View the official website for more detail and credits.
-- https://titaniumnetwork.org/
- https://github.com/titaniumnetwork-dev/
+- https://github.com/titaniumnetwork-dev/alloy
+- https://github.com/binary-person/womginx
+- https://github.com/sysce/proxy
+- https://github.com/BinBashBanana/PyDodge
+- https://github.com/nfriedly/node-unblocker
+- https://nodeclusters.com
+- https://titaniumnetwork.org/
+- https://github.com/vibedivide/vibeOS
-View the official website for more details or credits.
+This project is maintained by QuiteAFancyEmerald and collaborative with Titanium Network.
-### Proxy Sources:
-This project uses Alloy Proxy, Womginx, SysYA Proxy, and Via Unblocker, linked below.
-
-- https://github.com/titaniumnetwork-dev/alloy (Alloy)*
-- https://github.com/binary-person/womginx (Womginx)
-- https://github.com/sysce/proxy (SysYA Proxy)
-- https://github.com/hypothesis/via (Via)**
-- https://github.com/BinBashBanana/PyDodge (PyDodge)**
-- https://github.com/nfriedly/node-unblocker (Node Unblocker)***
-
-### Notable Mentions:
-- https://dedipath.com (Hosting Provider)
-
-### Footnotes:
-- This distribution of Holy Unblocker uses an older version of Alloy Proxy.
-- The official Holy Unblocker sites use a private, modified version of Via and goes under the name PyDodge for any modified version.
-- Node Unblocker is no longer used on any of the official Titanium Network flagship sites.
-
-Thanks. :D
+Thanks.
diff --git a/app.js b/app.js
index f4599e3a..96c1329a 100644
--- a/app.js
+++ b/app.js
@@ -1,102 +1,86 @@
/* -----------------------------------------------
- * Authors: QuiteAFancyEmerald, YÖCTDÖNALD'S, BinBashBanana (OlyB), SexyDuceDuce
- * Additional help from Divide
+ * Authors: QuiteAFancyEmerald, BinBashBanana (OlyB), YÖCTDÖNALD'S
+ * Additional help from Divide and SexyDuceDuce
* MIT license: http://opensource.org/licenses/MIT
* ----------------------------------------------- */
const
- char_insert = require('./src/charinsert.js'),
- alloy = require('./src/alloyproxy'),
- path = require('path'),
- config = require('./config.json'),
- fs = require('fs'),
- http = require('http'),
- express = require('express'),
- app = express(),
- port = process.env.PORT || config.port,
- server = http.createServer(app);
+ char_insert = require('./src/charinsert.js'),
+ path = require('path'),
+ config = require('./config.json'),
+ fs = require('fs'),
+ http = require('http'),
+ express = require('express'),
+ app = express(),
+ port = process.env.PORT || config.port,
+ server = http.createServer(app);
btoa = (str) => {
- return new Buffer.from(str).toString('base64');
+ return new Buffer.from(str).toString('base64');
}
atob = (str) => {
- return new Buffer.from(str, 'base64').toString('utf-8');
+ return new Buffer.from(str, 'base64').toString('utf-8');
}
-const text404 = fs.readFileSync(path.normalize(__dirname + '/views/404.html'), 'utf8'),
- siteIndex = 'index.html',
- pages = {
- /* Main */
- 'in': 'info.html',
- 'faq': 'faq.html',
- 'status': 'status.html',
- 'j': 'hidden.html',
- 's': 'pages/frame.html',
- 'z': 'pages/surf.html',
- 'c': 'pages/nav/credits.html',
- 'x': 'pages/nav/bookmarklets.html',
- 'i': 'pages/nav/icons.html',
- 't': 'pages/nav/terms.html',
- /* Games */
- 'g': 'pages/nav/gtools.html',
- 'h': 'pages/nav/games5.html',
- 'el': 'pages/nav/emulators.html',
- 'f': 'pages/nav/flash.html',
- /* Proxies */
- 'a': 'pages/proxnav/alloy.html',
- 'w': 'pages/proxnav/womginx.html',
- 'p': 'pages/proxnav/pmprox.html',
- 'e': 'pages/proxnav/pydodge.html',
- 'y': 'pages/proxnav/youtube.html',
- 'd': 'pages/proxnav/discordhub.html',
- /* Ruffle and Webretro */
- 'fg': 'archive/gfiles/flash/index.html',
- 'eg': 'archive/gfiles/rarch/index.html'
- },
- /* Randomize Keywords */
- cookingInserts = [
- "This is a cool example cooking sentence.",
- "I wish I could boil hot water. Try to fill this sentence with a lot of cooking related keywords."
- ],
- vegetables = ['Beet', 'Potato'],
- charrandom = ['',''];
+const text404 = fs.readFileSync(path.normalize(__dirname + '/views/404.html'), 'utf8'),
+ siteIndex = 'index.html',
+ pages = {
+ /* Main */
+ 'in': 'info.html',
+ 'faq': 'faq.html',
+ 'j': 'hidden.html',
+ 's': 'pages/frame.html',
+ 'z': 'pages/surf.html',
+ 'c': 'pages/nav/credits.html',
+ 'x': 'pages/nav/bookmarklets.html',
+ 'i': 'pages/nav/icons.html',
+ 't': 'pages/nav/terms.html',
+ /* Games */
+ 'g': 'pages/nav/gtools.html',
+ 'h': 'pages/nav/games5.html',
+ 'el': 'pages/nav/emulators.html',
+ 'f': 'pages/nav/flash.html',
+ /* Proxies */
+ 'a': 'pages/proxnav/alloy.html',
+ 'w': 'pages/proxnav/womginx.html',
+ 'p': 'pages/proxnav/pmprox.html',
+ 'e': 'pages/proxnav/pydodge.html',
+ 'y': 'pages/proxnav/youtube.html',
+ 'd': 'pages/proxnav/discordhub.html',
+ /* Ruffle and Webretro */
+ 'fg': 'archive/gfiles/flash/index.html',
+ 'eg': 'archive/gfiles/rarch/index.html'
+ },
+ /* Randomize Keywords */
+ cookingInserts = [
+ "This is a cool example cooking sentence.",
+ "I wish I could boil hot water. Try to fill this sentence with a lot of cooking related keywords."
+ ],
+ vegetables = ['Beet', 'Potato'],
+ charrandom = ['', ''];
function randomListItem(lis) {
- return lis[Math.floor(Math.random() * lis.length)];
+ return lis[Math.floor(Math.random() * lis.length)];
}
function insertCharset(str) {
- return str.replace(/||/g, randomListItem(charrandom));
+ return str.replace(/||/g, randomListItem(charrandom));
}
function insertCooking(str) {
- return str.replace(//g, '' + randomListItem(cookingInserts) + '');
+ return str.replace(//g, '' + randomListItem(cookingInserts) + '');
}
function tryReadFile(file) {
- return fs.existsSync(file) ? fs.readFileSync(file, 'utf8') : text404;
+ return fs.existsSync(file) ? fs.readFileSync(file, 'utf8') : text404;
}
-// Local Alloy Proxy
-const localAlloy = new alloy({
- prefix: '/fetch/',
- error: (proxy) => { proxy.res.send(tryReadFile(path.normalize(__dirname + '/views/error.html')).replace('%ERR%', proxy.error.info.message.replace(/<|>/g, ''))); },
- request: [],
- response: [],
- injection: true
-});
-
-app.use(localAlloy.app);
-localAlloy.ws(server);
-
-// Querystring navigation
+/* Querystring Navigation */
app.get('/', async(req, res) => res.send(insertCooking(insertCharset(tryReadFile(path.normalize(__dirname + '/views/' + (['/', '/?'].includes(req.url) ? siteIndex : pages[Object.keys(req.query)[0]])))))));
-// Static files served
+/* Static Files Served */
app.use(char_insert.static(path.normalize(__dirname + '/views')));
-
-// 404 Page
app.use((req, res) => res.status(404, res.send(insertCooking(text404))));
server.listen(port);
-console.log('Public distribution of Holy Unblocker available on port ' + port + '!');
+console.log('Public distribution of Holy Unblocker available on port ' + port + '!');
\ No newline at end of file
diff --git a/package.json b/package.json
index 08283f47..60520f5f 100644
--- a/package.json
+++ b/package.json
@@ -1,23 +1,21 @@
{
- "name": "holyub",
- "version": "4.5.0",
- "repository": "https://github.com/QuiteAFancyEmerald/HolyUnblockerPublic",
- "description": "A pretty fancy website.",
- "main": "app.js",
- "scripts": {
- "start": "node app.js"
- },
- "keywords": [
- "proxy",
- "node.js",
- "unblocker"
- ],
- "author": "Titanium Network",
- "license": "MIT",
- "dependencies": {
- "express": "^4.17.1",
- "express-session": "^1.17.1",
- "mime-types": "^2.1.27",
- "pm2": "^4.5.5"
- }
+ "name": "holyub",
+ "version": "4.5.0",
+ "repository": "https://github.com/QuiteAFancyEmerald/HolyUnblockerPublic",
+ "description": "A pretty fancy website.",
+ "main": "app.js",
+ "scripts": {
+ "start": "node app.js"
+ },
+ "keywords": [
+ "proxy",
+ "node.js",
+ "unblocker"
+ ],
+ "author": "Titanium Network",
+ "license": "MIT",
+ "dependencies": {
+ "express": "^4.17.1",
+ "mime-types": "^2.1.27"
+ }
}
diff --git a/views/404.html b/views/404.html
index 2520cfb2..db6c82d3 100644
--- a/views/404.html
+++ b/views/404.html
@@ -35,28 +35,34 @@
-# Holy Unblocker
+# Holy Unblocker 
-#### Titanium Network is sponsored by:
+A website that can be used to bypass web filters; both extension and firewall. This is the public source code for Holy Unblocker, a rather fancy website with some cool dynamic backgrounds while also focusing with detail put into the design, mechanics and features overall like custom Tab Cloaks with more to come in the future.
-
+Works with a large number of sites including YouTube, Discord and more! Be sure to read below for information if the official site is blocked or for obtaining more links.
-Holy Unblocker, an official flagship Titanium Network site, can bypass web filters regardless of whether it is an extension or network-based. Being a secure web proxy service, it supports numerous sites while being updated frequently and concentrating on detail with design, mechanics, and features.
+YouTube has specialized support with the ablity to view steams, comments, bypass restricted mode, and have full quality on videos.
-Works with a large number of sites, including YouTube, Discord, and more!
+Be sure to check the various branches as I update Holy Unblocker often with open access to yet to be released versions.
-Read below for information if the official site is blocked or for obtaining more links.
+Also has a good amount of locally hosted games featured on the site.
#### Supports
- Youtube.com
@@ -17,24 +16,20 @@ Read below for information if the official site is blocked or for obtaining more
- Google.com
- Reddit.com
- Bing.com
-- And more!
-
-#### Features:
-- Tab customization using the Options menu for improved stealth
-- Considerable variety with the open selection of proxy types
-- Game library with moderately decent titles like A Dark Room
-- Has frequent support articles for issues relating to the various proxy instances
-
-Be sure to join Titanium Network's Discord for more official site links: https://discord.gg/hcUUceSCtj
-
-Do %proxy hu for more Holy Unblocker links on the Titanium Network Discord server.
-
-**Official Site:** https://www.holyubofficial.net
-
-**Site Documentation:** Documentation
+- And more sites!
+Official Site: https://www.holyubofficial.net
+
+Site Documentation: Documentation
+
+Instance Status: Status
+
+Be sure to join Titanium Network's Discord for more official site links: https://discord.gg/unblock
+
+Simply do `%proxy hu` for more Holy Unblocker links on the TN Discord server.
+
-Alloy Proxy - https://github.com/titaniumnetwork-dev/alloy
+- `a.deepsoil.ml` is being used for Node Unblocker.
+- `p.deepsoil.ml` is being used for SysYa Proxy.
+- `pd.deepsoil.ml` is being used for PyDodge B.
+- `cdn.deepsoil.ml` is being used for a private Alloy host on the official sites.
-The source used for Via Unblocker on the official sites is not public.
+Update, the new configuration is:
-**List of some good hosting options:**
+- `a.example.com` is being used for Node Unblocker.
+- `d.example.com` is being used for Ocean proxy.
+- `c.example.com` is being used for SysYa and the Chatbox.
+- `cdn.example.com` is being used for a private Alloy and Via which is hosted on the official sites.
-- Dedipath (Paid and Dedicated)
-- Heroku (Free)
-- NodeClusters (Paid)
-- Glitch (Free)
-- Repl.it (Free)
-- Azure (Free and Paid)
--
-Out of the list of hosting providers Heroku and Dedipath rank first as a preference.
+As stated previously, Holy Unblocker is hosted locally with Alloy.
-You may also self-host. Currently, at this time, Dedipath is used to host the official Holy Unblocker sites.
+#### Heroku Steps
+So use Heroku to host. I personally favor it as a free choice.
-After you have selected a decent VPS, use Cloudflare for DNS records for both the site and the subdomains for the proxies.
-The image below is an example of DNS records involving Heroku. Self-hosting will require A records, preferably.
+- First obtain a card; (Prepaid, Debit, and Credit Cards work). You need this to add custom domains to your Heroku instance.
-
+Make sure you connect your Heroku app to your GitHub and enable automatic deploys. Will make things easier. :)
-**The configuration being used on the official sites currently are the below:**
+#### Freenom/Domain Steps
+For beginners, Freenom is a good provider for obtaining domains for free. However the catch is that you can only use properly "Freenom" domains for free being .cf, .ml, .gq, ga and .tk. However these can be blocked rather easily.
-- `a.example.com` is used for Womginx.
-- `c.example.com` is used for SysYA Proxy, Via Unblocker, and the Chatbox.
-- `cdn.example.com` is used for a private, updated Alloy instance.
-### Heroku Steps
-So use Heroku to host. I favor it as a free choice.
+- Get some Freenom domains then add them to your Heroku instance (Personal > [App Name] > Settings > Domains)
+Add a domain for both `www.youdomainhere.cf` and `yourdomainhere.cf` with .cf being interchangeable with other Freedom domain names.
+- If you prefer to obtain premium domains (TLDs) then use Porkbun, which offers domains for amazing prices. Literally a `.net` domain normally costs around $10. On Porkbun for the first year it costs $3 so its definitely a deal.
-- First, obtain a card; (Prepaid, Debit, and Credit Cards work). It would be best if you had this to add custom domains to your Heroku instance.
-- Make sure you connect your Heroku app to your GitHub and enable automatic deploys. It will make things easier. :)
+#### Cloudflare Steps
+- Use Cloudflare (make an account), add your site (Freenom Domain or Domain) and then add your various DNS targets to Cloudflare. Make sure you add Cloudflare's Nameservers which will be specified more when you are adding your site.
-### Freenom/Domain Steps
-For beginners, Freenom is a good provider for obtaining domains for free. However, the catch is that you can only use properly "Freenom" domains for free, being .cf, .ml, .gq, ga, and .tk. However, these can be blocked relatively easily.
+Make sure they are CNAME although A records also work and try to follow this structure:
-- Get some Freenom domains, then add them to your Heroku instance (Personal > [App Name] > Settings > Domains).
-- Add a domain for both www.youdomainhere.cf and yourdomainhere.cf with .cf being interchangeable with other Freedom domain names.
+**Type | Name | Target**
-If you prefer to obtain premium domains (TLDs), then use Porkbun, which offers domains for excellent prices. A .net domain typically costs around $10. On Porkbun for the first year, it costs $3, so it is a deal.
+`CNAME | www | yourherokutargethere.herokudns.com `
+`CNAME | @ | yourherokudnstargethere.herokudns.com`
-### Cloudflare Steps
-Use Cloudflare (make an account), add your site (Freenom Domain or Domain), and then add your various DNS targets to Cloudflare. Make sure you add Cloudflare's Nameservers which will be specified more when you are adding your site.
+**Below are if you want external proxies also with your site:**
-Lastly, for targets, make sure they are either a CNAME, AAAA, or A records and try to follow this structure:
+`CNAME | a | yournodeinstance.herokudns.com`
+`CNAME | pd | yourpydodgebinstancehere.herokudns.com`
+`CNAME | p | yoursysyainstancehere.herokudns.com`
-Type | Name | Target
+Make sure HTTPS is forced and have SSL set to Flexible for Heroku. Otherwise you can have SSL set to Full.
-`CNAME | @ | yourherokudnstargethere.herokudns.com` or `CNAME | @ | example.com`
+#### Workspace Configurations
+Preferably if you have your own device use Visual Studio Code. Pretty much the best option you can get but obviously this is an opinion. Also make sure you have Node.JS installed on your machine.
-`CNAME | www | yourherokutargethere.herokudns.com` or `CNAME | www | example.com`
+Not going to go too in depth with this part but first fork this repository. The clone it locally through a Terminal of some sort depending on what OS you are on. Make sure you navigate to the folder you want to set this up in.
-Below are if you want external proxies also with your site:
-
-`CNAME | a | yourwomginxinstance.herokudns.com` or `CNAME | a | example.com`
-`CNAME | c | yoursysyaproxyinstancehere.herokudns.com` or `CNAME | c | example.com`
-
-(You get the idea.)
-
-Make sure HTTPS is forced and have SSL set to Flexible for Heroku. Otherwise, you may have SSL set to Full. Use LetsEncrypt for SSL certificates or Cloudflare.
-
-## Workspace Configurations
-Preferably use Visual Studio Code for an IDE. Pretty much the best option you can get, but obviously, this is an opinion. Also, make sure you have Node.JS installed on your machine.
-
-Not going to go too in-depth with this part but first, fork or clone this repository. Clone it locally through a terminal of some sort, depending on what OS you are on.
-
-Make sure you navigate to the folder you want to set this up in.
```
-$ git clone https://github.com/QuiteAFancyEmerald/HolyUnblockerPublic.git
-$ cd HolyUnblockerPublic
-$ npm install
-```
-Setup pm2 (Optional - Node.js Process Manager)
-```
-$ npm install pm2@latest -g
-$ pm2 start app.js
-```
-Useful pm2 Flags
-```
-# Specify an app name
---name 
- 
- 
-