diff --git a/package/lean/luci-app-unblockmusic/LICENSE b/package/lean/luci-app-unblockmusic/LICENSE
new file mode 100644
index 000000000..f288702d2
--- /dev/null
+++ b/package/lean/luci-app-unblockmusic/LICENSE
@@ -0,0 +1,674 @@
+ 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/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile
index 1e1b72ca0..7d75a70cf 100644
--- a/package/lean/luci-app-unblockmusic/Makefile
+++ b/package/lean/luci-app-unblockmusic/Makefile
@@ -1,25 +1,25 @@
# Copyright (C) 2016 Openwrt.org
#
-# This is free software, licensed under the Apache License, Version 2.0 .
+# This is a free software, use it under Apache License 2.0 & GNU General Public License v3.0.
#
# licheng
# www.maxlicheng.com
# 2019-06-08
#
+# Second revision by [CTCGFW]Project-OpenWRT
+# 2019.07.15
include $(TOPDIR)/rules.mk
-LUCI_TITLE:=LuCI support for Unblock NeteaseCloudMusic
-LUCI_DEPENDS:=+node
+LUCI_TITLE:=LuCI support for UnblockNeteaseMusic
+LUCI_DEPENDS:=+node +bash +dnsmasq-full +ipset
LUCI_PKGARCH:=all
PKG_NAME:=luci-app-unblockmusic
-PKG_VERSION:=1
-PKG_RELEASE:=36
+PKG_VERSION:=1.4
+PKG_RELEASE:=3
-PKG_MAINTAINER:=
+PKG_MAINTAINER:=
include $(TOPDIR)/feeds/luci/luci.mk
-
# call BuildPackage - OpenWrt buildroot signature
-
diff --git a/package/lean/luci-app-unblockmusic/README.md b/package/lean/luci-app-unblockmusic/README.md
new file mode 100644
index 000000000..7d8fb3cec
--- /dev/null
+++ b/package/lean/luci-app-unblockmusic/README.md
@@ -0,0 +1,49 @@
+ - ### 欢迎加入我的Telegram群组：[@ctcgfw_openwrt_discuss](https://t.me/ctcgfw_openwrt_discuss)
+
+# 说明
+- 用于恢复网易云音乐无版权歌曲的OpenWRT/LEDE Luci插件
+- 核心功能基于：[nondanee/UnblockNeteaseMusic](https://github.com/nondanee/UnblockNeteaseMusic)
+- 基于[maxlicheng](https://github.com/maxlicheng/luci-app-unblockmusic)的Luci插件进行二改，使源项目代码更方便的在路由器上运行
+- 温馨提示：本插件显式依赖node.js，如您的设备型号不支持，将无法使用
+
+## 原理
+- 其原理是采用 [网易云旧链/QQ/虾米/百度/酷狗/酷我/咕咪/JOOX] 等音源，替换网易云无版权歌曲链接
+- 通俗地理解就是通过脚本，将主流客户端的音乐链接汇集到一个客户端上
+
+## 编译
+- 插件显式依赖node.js，OpenWRT/LEDE源码默认是v8.10.0版本，编译过程中下载会比较慢，可以提前将node-v8.10.0下载好上传到dl目录
+- 下载链接(17.5M)：http://nodejs.org/dist/v8.10.0/node-v8.10.0.tar.xz
+```bash
+ #进入OpenWRT/LEDE源码package目录
+ cd package
+ #克隆插件源码
+ git clone https://github.com/project-openwrt/luci-app-unblockmusic.git
+ #返回上一层目录
+ cd ..
+ #配置
+ make menuconfig
+ #在luci->application选中插件,编译
+ make package/luci-app-unblockmusic/compile V=99
+```
+
+## 使用方法
+### 1.路由器web界面插件配置
+- a.在路由器web界面“服务”选项中找到“恢复网易云音乐无版权歌曲”
+- b.勾选“启用UnblockNeteaseMusic”
+- c.“音源接口”选择“默认”
+- d.勾选“启用IPSet劫持相关请求”
+- e.点击“保存&应用”
+- 现在您局域网下的所有设备，无需任何设置即可正常播放网易云音乐无版权歌曲
+
+## 效果图
+### luci界面
+ 
+ 
+ 
+### UWP网易云音乐客户端
+ 
+
+## 协议
+### [核心功能\(UnblockNeteaseMusic\)](https://github.com/nondanee/UnblockNeteaseMusic)使用[MIT](https://github.com/nondanee/UnblockNeteaseMusic/blob/master/LICENSE)协议
+### [源项目](https://github.com/maxlicheng/luci-app-unblockmusic)使用[Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0)协议
+### [本项目](https://github.com/project-openwrt/luci-app-unblockmusic)使用[GNU General Public License v3.0](https://github.com/project-openwrt/luci-app-unblockmusic/blob/master/LICENSE)协议
diff --git a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua
index 8cc7024d8..d62cffbf6 100644
--- a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua
+++ b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua
@@ -6,7 +6,7 @@ function index()
return
end
- entry({"admin", "services", "unblockmusic"},firstchild(), _("解锁网易云灰色歌曲"), 50).dependent = false
+ entry({"admin", "services", "unblockmusic"},firstchild(), _("恢复网易云音乐无版权歌曲"), 50).dependent = false
entry({"admin", "services", "unblockmusic", "general"},cbi("unblockmusic"), _("Base Setting"), 1)
entry({"admin", "services", "unblockmusic", "log"},form("unblockmusiclog"), _("Log"), 2)
diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua
index 4ec1c4f28..eff341d05 100644
--- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua
+++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua
@@ -1,6 +1,6 @@
-mp = Map("unblockmusic", translate("解锁网易云灰色歌曲"))
-mp.description = translate("原理：采用 [网易云旧链/QQ/虾米/百度/酷狗/酷我/咕咪/JOOX]等音源 替换网易云变灰歌曲链接 具体使用方法可查看github： https://github.com/maxlicheng/luci-app-unblockmusic")
+mp = Map("unblockmusic", translate("恢复网易云音乐无版权歌曲"))
+mp.description = translate("原理：采用 [网易云旧链/QQ/虾米/百度/酷狗/酷我/咕咪/JOOX] 等音源，替换网易云音乐无版权歌曲链接 具体使用方法参见：https://github.com/project-openwrt/luci-app-unblockmusic")
mp:section(SimpleSection).template = "unblockmusic/unblockmusic_status"
@@ -8,22 +8,98 @@ s = mp:section(TypedSection, "unblockmusic")
s.anonymous=true
s.addremove=false
-enabled = s:option(Flag, "enabled", translate("启用解锁"))
+enabled = s:option(Flag, "enabled", translate("启用UnblockNeteaseMusic"))
+enabled.description = translate("启用本插件以恢复网易云音乐无版权歌曲")
enabled.default = 0
enabled.rmempty = false
-speedtype = s:option(ListValue, "musicapptype", translate("音源选择"))
+account = s:option(Value, "http_port", translate("[HTTP] 监听端口"))
+account.description = translate("UnblockNeteaseMusic监听的HTTP端口，不可与其他程序/HTTPS共用一个端口")
+account.placeholder = "5200"
+account.default = "5200"
+account.datatype = "port"
+account:depends("enabled", 1)
+
+account = s:option(Value, "https_port", translate("[HTTPS] 监听端口"))
+account.description = translate("[如HTTP端口设置为80，请将HTTPS端口设置为443] UnblockNeteaseMusic监听的HTTPS端口，不可与其他程序/HTTP共用一个端口")
+account.placeholder = "5201"
+account.default = "5201"
+account.datatype = "port"
+account:depends("enabled", 1)
+
+enabled = s:option(Flag, "enable_ipset_forward", translate("使用IPSet劫持相关请求"))
+enabled.description = translate("开启后，网易云音乐相关请求会被强制劫持到UnblockNeteaseMusic进行处理")
+enabled.default = 1
+enabled.rmempty = false
+enabled:depends("enabled", 1)
+
+enabled = s:option(Flag, "use_hosts", translate("使用Hosts劫持相关请求"))
+enabled.description = translate("[仅限HTTP:HTTPS端口设置为80:443时可用] 开启后，网易云音乐相关请求会被劫持到UnblockNeteaseMusic进行处理")
+enabled.default = 0
+enabled.rmempty = false
+enabled:depends("enabled", 1)
+
+speedtype = s:option(ListValue, "musicapptype", translate("音源接口"))
speedtype:value("default", translate("默认"))
-speedtype:value("NeteaseCloud", translate("网易云音乐"))
-speedtype:value("QQ", translate("QQ音乐"))
+speedtype:value("netease", translate("网易云音乐"))
+speedtype:value("qq", translate("QQ音乐"))
speedtype:value("xiami", translate("虾米音乐"))
speedtype:value("baidu", translate("百度音乐"))
speedtype:value("kugou", translate("酷狗音乐"))
-speedtype:value("koowo", translate("酷我音乐"))
+speedtype:value("kuwo", translate("酷我音乐"))
speedtype:value("migu", translate("咕咪音乐"))
speedtype:value("joox", translate("JOOX音乐"))
+speedtype:value("all", translate("所有平台"))
+speedtype.description = translate("音源调用接口")
+speedtype.default = "default"
+speedtype:depends("enabled", 1)
-account = s:option(Value, "port", translate("端口号"))
+enabled = s:option(Flag, "advanced_mode", translate("启用进阶设置"))
+enabled.description = translate("仅推荐高级玩家使用")
+enabled.default = 0
+enabled.rmempty = false
+enabled:depends("enabled", 1)
+
+enabled = s:option(Flag, "pub_access", translate("部署到公网"))
+enabled.description = translate("默认仅监听局域网，如需提供公开访问请勾选此选项；与此同时，建议勾选“启用严格模式”")
+enabled.default = 0
+enabled.rmempty = false
+enabled:depends("advanced_mode", 1)
+
+enabled = s:option(Flag, "strict_mode", translate("启用严格模式"))
+enabled.description = translate("若将服务部署到公网，则强烈建议使用严格模式，此模式下仅放行网易云音乐所属域名的请求")
+enabled.default = 1
+enabled.rmempty = false
+enabled:depends("advanced_mode", 1)
+
+enabled = s:option(Flag, "ipset_forward_nohttps", translate("[IPSet] 不劫持HTTPS请求"))
+enabled.description = translate("默认同时劫持HTTP&HTTPS两种请求，如无相关需求，可勾选此选项")
+enabled.default = 0
+enabled.rmempty = false
+enabled:depends("advanced_mode", 1)
+
+enabled = s:option(Flag, "set_netease_server_ip", translate("自定义网易云服务器IP"))
+enabled.description = translate("如手动更改了Hosts文件则必选，否则将会导致连接死循环")
+enabled.default = 0
+enabled.rmempty = false
+enabled:depends("advanced_mode", 1)
+
+account = s:option(Value, "netease_server_ip", translate("网易云服务器IP"))
+account.description = translate("通过 ping music.163.com 即可获得IP地址，仅限填写一个")
+account.default = "59.111.181.38"
+account.placeholder = "59.111.181.38"
+account.datatype = "ipaddr"
+account:depends("set_netease_server_ip", 1)
+
+enabled = s:option(Flag, "enable_proxy", translate("使用代理服务器"))
+enabled.description = translate("如您的OpenWRT/LEDE系统部署在海外，则此选项必选，否则可能无法正常使用")
+enabled.default = 0
+enabled.rmempty = false
+enabled:depends("advanced_mode", 1)
+
+account = s:option(Value, "proxy_server_ip", translate("代理服务器IP"))
+account.description = translate("具体格式请参考：https://github.com/nondanee/UnblockNeteaseMusic")
account.datatype = "string"
+account:depends("enable_proxy", 1)
return mp
diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua
index 8d1d85193..b847a8368 100644
--- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua
+++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua
@@ -11,4 +11,4 @@ function t.cfgvalue()
end
t.readonly="readonly"
-return f
\ No newline at end of file
+return f
diff --git a/package/lean/luci-app-unblockmusic/luasrc/view/unblockmusic/unblockmusic_status.htm b/package/lean/luci-app-unblockmusic/luasrc/view/unblockmusic/unblockmusic_status.htm
index 01aca57c8..cd5e1e8d2 100644
--- a/package/lean/luci-app-unblockmusic/luasrc/view/unblockmusic/unblockmusic_status.htm
+++ b/package/lean/luci-app-unblockmusic/luasrc/view/unblockmusic/unblockmusic_status.htm
@@ -4,10 +4,10 @@ XHR.poll(3, '<%=url([[admin]], [[services]], [[unblockmusic]], [[status]])%>', n
var tb = document.getElementById('unblockmusic_status');
if (data && tb) {
if (data.running) {
- var links = 'Unblock NeteaseCloudMusic <%:RUNNING%>';
+ var links = 'UnblockNeteaseMusic <%:RUNNING%>';
tb.innerHTML = links;
} else {
- tb.innerHTML = 'Unblock NeteaseCloudMusic <%:NOT RUNNING%>';
+ tb.innerHTML = 'UnblockNeteaseMusic <%:NOT RUNNING%>';
}
}
}
@@ -19,4 +19,4 @@ XHR.poll(3, '<%=url([[admin]], [[services]], [[unblockmusic]], [[status]])%>', n
<%:Collecting data...%>
-
\ No newline at end of file
+
diff --git a/package/lean/luci-app-unblockmusic/root/etc/config/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/config/unblockmusic
index 673195727..95f405161 100644
--- a/package/lean/luci-app-unblockmusic/root/etc/config/unblockmusic
+++ b/package/lean/luci-app-unblockmusic/root/etc/config/unblockmusic
@@ -1,6 +1,16 @@
config unblockmusic
- option usicapptype 'default'
- option port '5200'
option enabled '0'
-
+ option enable_ipset_forward '0'
+ option http_port '5200'
+ option https_port '5201'
+ option musicapptype 'default'
+ option http_port '5200'
+ option https_port '5201'
+ option pub_access '0'
+ option advanced_mode '0'
+ option strict_mode '1'
+ option ipset_forward_nohttps '0'
+ option use_hosts '0'
+ option set_netease_server_ip '0'
+ option enable_proxy '0'
diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
index 839b29585..4d07fe7b0 100755
--- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
+++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
@@ -3,22 +3,99 @@
START=99
STOP=10
-TYPE=$(uci get unblockmusic.@unblockmusic[0].musicapptype)
-PORT=$(uci get unblockmusic.@unblockmusic[0].port)
+[ "$(uci get unblockmusic.@unblockmusic[0].strict_mode)" -eq "1" ] && strict_mode="-s"
+[ "$(uci get unblockmusic.@unblockmusic[0].set_netease_server_ip)" -ne "0" ] && netease_server_ip="-f $(uci get unblockmusic.@unblockmusic[0].netease_server_ip)"
+[ "$(uci get unblockmusic.@unblockmusic[0].enable_proxy)" -ne "0" ] && proxy_server_ip="-u $(uci get unblockmusic.@unblockmusic[0].proxy_server_ip)"
+[ "$(uci get unblockmusic.@unblockmusic[0].pub_access)" -ne "0" ] && addr="0.0.0.0" || addr="$(uci get network.lan.ipaddr)"
+enable="$(uci get unblockmusic.@unblockmusic[0].enabled)"
+type="$(uci get unblockmusic.@unblockmusic[0].musicapptype)"
+http_port="$(uci get unblockmusic.@unblockmusic[0].http_port)"
+https_port="$(uci get unblockmusic.@unblockmusic[0].https_port)"
+
+set_firewall(){
+ if [ "${set_type}" = "start" ]; then
+ echo "ipset=/.music.163.com/music" >> /etc/dnsmasq.conf
+ /etc/init.d/dnsmasq restart >/dev/null 2>&1
+
+ mkdir -p /var/etc
+ lan_addr="$(uci get network.lan.ipaddr)"
+ [ "$(uci get unblockmusic.@unblockmusic[0].ipset_forward_nohttps)" -ne "0" ] || forward_https="iptables -t nat -A cloud_music -i br-lan -p tcp --dport 443 -j DNAT --to ${lan_addr}:${https_port}"
+ cat > "/var/etc/unblockmusic.include" <<-EOF
+if ! ipset list music >/dev/null; then ipset create music hash:ip; fi
+iptables -t nat -N cloud_music
+iptables -t nat -A cloud_music -i br-lan -p tcp --dport 80 -j DNAT --to ${lan_addr}:${http_port}
+${forward_https}
+iptables -t nat -A prerouting_rule -i br-lan -p tcp -m set --match-set music dst -j cloud_music
+ EOF
+ /etc/init.d/firewall restart >/dev/null 2>&1
+ elif [ "${set_type}" = "stop" ]; then
+ echo "" > /var/etc/unblockmusic.include
+ /etc/init.d/firewall restart >/dev/null 2>&1
+ sed -i '/ipset=\/.music.163.com\/music/d' /etc/dnsmasq.conf
+ /etc/init.d/dnsmasq restart >/dev/null 2>&1
+ fi
+}
+
+set_hosts(){
+ if [ "${set_type}" = "start" ]; then
+ cfg_name="$(uci add dhcp domain)"
+ uci set dhcp."${cfg_name}".name='music.163.com'
+ uci set dhcp."${cfg_name}".ip="$(uci get network.lan.ipaddr)"
+ uci commit dhcp
+
+ cfg_name="$(uci add dhcp domain)"
+ uci set dhcp."${cfg_name}".name='interface.music.163.com'
+ uci set dhcp."${cfg_name}".ip="$(uci get network.lan.ipaddr)"
+ uci commit dhcp
+
+ cfg_name="$(uci add dhcp domain)"
+ uci set dhcp."${cfg_name}".name='music.httpdns.c.163.com'
+ uci set dhcp."${cfg_name}".ip="127.0.0.1"
+ uci commit dhcp
+
+ ip route add 223.252.199.10 dev lo
+ elif [ "${set_type}" = "stop" ]; then
+ music_id1="$(uci show dhcp| grep "interface.music.163.com"| grep -Eo "domain\[[0-9]+\]"| grep -Eo "[0-9]+")"
+ uci delete dhcp.@domain["${music_id1}"]
+ uci commit dhcp
+
+ music_id2="$(uci show dhcp| grep "music.httpdns.c.163.com"| grep -Eo "domain\[[0-9]+\]"| grep -Eo "[0-9]+")"
+ uci delete dhcp.@domain["${music_id2}"]
+ uci commit dhcp
+
+ music_id3="$(uci show dhcp| grep "music.163.com"| grep -Eo "domain\[[0-9]+\]"| grep -Eo "[0-9]+")"
+ uci delete dhcp.@domain["${music_id3}"]
+ uci commit dhcp
+
+ ip route del 223.252.199.10
+ fi
+}
start()
{
stop
- enable=$(uci get unblockmusic.@unblockmusic[0].enabled)
- [ $enable -eq 0 ] && exit 0
- node /usr/share/unblockmusic/app.js -p $PORT &
+
+ [ "${enable}" -eq "0" ] && exit 0
+
+ if [ "${type}" = "default" ]; then
+ node /usr/share/unblockmusic/app.js -a ${addr} -p ${http_port}:${https_port} ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >/tmp/unblockmusic.log 2>&1 &
+ elif [ "${type}" = "all" ]; then
+ node /usr/share/unblockmusic/app.js -a ${addr} -p ${http_port}:${https_port} -o kuwo migu xiami kugou qq joox netease ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >/tmp/unblockmusic.log 2>&1 &
+ else
+ node /usr/share/unblockmusic/app.js -a ${addr} -p ${http_port}:${https_port} -o ${type} ${netease_server_ip} ${proxy_server_ip} ${strict_mode} >/tmp/unblockmusic.log 2>&1 &
+ fi
+
+ [ "$(uci get unblockmusic.@unblockmusic[0].enable_ipset_forward)" -ne "0" ] && set_type="start" && set_firewall
+ [ "$(uci get unblockmusic.@unblockmusic[0].use_hosts)" -ne "0" ] && set_type="start" && set_hosts
+
+ /usr/share/unblockmusic/logcheck.sh >/dev/null 2>&1 &
}
stop()
{
- kill -9 $(ps | grep app.js | grep -v grep | awk '{print $1}') >/dev/null 2>&1
+ kill -9 "$(ps | grep app.js | grep -v grep | awk '{print $1}')" >/dev/null 2>&1
+ kill -9 "$(ps | grep logcheck.sh | grep -v grep | awk '{print $1}')" >/dev/null 2>&1
+ rm -f /tmp/unblockmusic.log
+ set_type="stop" && set_firewall && set_hosts
}
-
-
-
diff --git a/package/lean/luci-app-unblockmusic/root/etc/uci-defaults/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/uci-defaults/unblockmusic
index da2753838..38a16d695 100755
--- a/package/lean/luci-app-unblockmusic/root/etc/uci-defaults/unblockmusic
+++ b/package/lean/luci-app-unblockmusic/root/etc/uci-defaults/unblockmusic
@@ -5,6 +5,12 @@ uci -q batch <<-EOF >/dev/null
add ucitrack unblockmusic
set ucitrack.@unblockmusic[-1].init=unblockmusic
commit ucitrack
+ delete firewall.unblockmusic
+ set firewall.unblockmusic=include
+ set firewall.unblockmusic.type=script
+ set firewall.unblockmusic.path=/var/etc/unblockmusic.include
+ set firewall.unblockmusic.reload=1
+ commit firewall
EOF
rm -f /tmp/luci-indexcache
diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/.dockerignore b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/.dockerignore
deleted file mode 100644
index 0b75cc99b..000000000
--- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/.dockerignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.git
-.vscode
-.npmignore
-.gitignore
-.dockerignore
-
-LICENSE
-Procfile
-README.md
-
-node_modules
-npm-debug.log
-
-Dockerfile*
-docker-compose*
\ No newline at end of file
diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/.gitignore b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/.gitignore
deleted file mode 100644
index b8c8f6b01..000000000
--- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/.gitignore
+++ /dev/null
@@ -1,72 +0,0 @@
-# IDE
-.vscode
-.idea
-
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# next.js build output
-.next
-
-# pkg dist directory
-dist/
-
-# es6 transformation
-browser/provider
-browser/cache.js
\ No newline at end of file
diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/Dockerfile b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/Dockerfile
deleted file mode 100644
index 8dda10ab9..000000000
--- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM node:lts-alpine
-
-ENV NODE_ENV production
-
-WORKDIR /usr/src/app
-COPY package*.json ./
-RUN npm install --production
-COPY . .
-
-EXPOSE 8080
-
-ENTRYPOINT ["node", "app.js"]
\ No newline at end of file
diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/README.md b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/README.md
old mode 100644
new mode 100755
index 358ff6065..ba4d334be
--- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/README.md
+++ b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/README.md
@@ -6,16 +6,16 @@
## 特性
-- 使用网易云旧链 / QQ / 虾米 / 百度 / 酷狗 / 酷我 / 咕咪 / JOOX 音源替换变灰歌曲链接 (默认仅启用前四)
+- 使用~~网易云旧链~~ / QQ / 虾米 / 百度 / 酷狗 / 酷我 / 咕咪 / JOOX 音源替换变灰歌曲链接 (默认仅启用前四)
- 为请求增加 `X-Real-IP` 参数解锁海外限制，支持指定网易云服务器 IP，支持设置上游 HTTP / HTTPS 代理
- 完整的流量代理功能 (HTTP / HTTPS)，可直接作为系统代理 (同时支持 PAC)
## 运行
-从源码运行
+使用 npx
```
-$ node app.js
+$ npx @nondanee/unblockneteasemusic
```
或使用 Docker
@@ -31,22 +31,23 @@ $ docker-compose up
### 配置参数
```
-$ node app.js -h
-usage: unblockneteasemusic [-v] [-p port] [-u url] [-f host]
+$ unblockneteasemusic -h
+usage: unblockneteasemusic [-v] [-p port] [-a address] [-u url] [-f host]
[-o source [source ...]] [-t token] [-e url] [-s]
[-h]
optional arguments:
- -v, --version output the version number
- -p port, --port port specify server port
- -u url, --proxy-url url request through upstream proxy
- -f host, --force-host host force the netease server ip
+ -v, --version output the version number
+ -p port, --port port specify server port
+ -a address, --address address specify server host
+ -u url, --proxy-url url request through upstream proxy
+ -f host, --force-host host force the netease server ip
-o source [source ...], --match-order source [source ...]
- set priority of sources
- -t token, --token token set up http basic authentication
- -e url, --endpoint url replace virtual endpoint with public host
- -s, --strict enable proxy limitation
- -h, --help output usage information
+ set priority of sources
+ -t token, --token token set up proxy authentication
+ -e url, --endpoint url replace virtual endpoint with public host
+ -s, --strict enable proxy limitation
+ -h, --help output usage information
```
## 使用
@@ -102,11 +103,11 @@ PAC 自动代理脚本地址 `http:///proxy.pac`
作为依赖库使用
```
-$ npm install nondanee/UnblockNeteaseMusic
+$ npm install @nondanee/unblockneteasemusic
```
```javascript
-const match = require('unblockneteasemusic')
+const match = require('@nondanee/unblockneteasemusic')
/**
* Set proxy or hosts if needed
@@ -120,14 +121,14 @@ global.hosts = {'i.y.qq.com': '59.37.96.220'}
* @param {Array||undefined} source support netease, qq, xiami, baidu, kugou, kuwo, migu, joox
* @return {Promise