From 7f39235eb5908eb8d1d831c569d6ad820fdc2ec0 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Mon, 5 Aug 2019 03:53:26 -0700 Subject: [PATCH] rewrite luci-app-unblockmusic to simple mode --- package/lean/UnblockNeteaseMusic/Makefile | 54 ++ package/lean/luci-app-unblockmusic/LICENSE | 674 ---------------- package/lean/luci-app-unblockmusic/Makefile | 20 +- package/lean/luci-app-unblockmusic/README.md | 49 -- .../luasrc/controller/unblockmusic.lua | 2 +- .../luasrc/model/cbi/unblockmusic.lua | 90 +-- .../luasrc/model/cbi/unblockmusiclog.lua | 4 +- .../view/unblockmusic/unblockmusic_status.htm | 2 +- .../root/etc/config/unblockmusic | 18 +- .../root/etc/init.d/unblockmusic | 137 ++-- .../logcheck.sh | 1 + .../root/usr/share/unblockmusic/LICENSE | 21 - .../root/usr/share/unblockmusic/README.md | 191 ----- .../root/usr/share/unblockmusic/app.js | 86 -- .../root/usr/share/unblockmusic/bridge.js | 33 - .../usr/share/unblockmusic/browser/README.md | 25 - .../unblockmusic/browser/background.html | 4 - .../share/unblockmusic/browser/background.js | 22 - .../usr/share/unblockmusic/browser/convert.js | 43 - .../unblockmusic/browser/crypto-js/core.js | 760 ------------------ .../browser/crypto-js/enc-base64.js | 135 ---- .../unblockmusic/browser/crypto-js/md5.js | 268 ------ .../usr/share/unblockmusic/browser/crypto.js | 15 - .../usr/share/unblockmusic/browser/inject.js | 73 -- .../share/unblockmusic/browser/manifest.json | 19 - .../usr/share/unblockmusic/browser/request.js | 18 - .../usr/share/unblockmusic/browser/script.js | 5 - .../root/usr/share/unblockmusic/ca.crt | 21 - .../root/usr/share/unblockmusic/cache.js | 10 - .../root/usr/share/unblockmusic/cli.js | 162 ---- .../root/usr/share/unblockmusic/crypto.js | 98 --- .../root/usr/share/unblockmusic/hook.js | 308 ------- .../root/usr/share/unblockmusic/hooks/build | 15 - .../usr/share/unblockmusic/hooks/post_push | 20 - .../usr/share/unblockmusic/hooks/pre_build | 4 - .../usr/share/unblockmusic/hooks/pre_push | 4 - .../usr/share/unblockmusic/package-lock.json | 5 - .../root/usr/share/unblockmusic/package.json | 28 - .../usr/share/unblockmusic/provider/baidu.js | 41 - .../usr/share/unblockmusic/provider/find.js | 22 - .../usr/share/unblockmusic/provider/insure.js | 19 - .../usr/share/unblockmusic/provider/joox.js | 56 -- .../usr/share/unblockmusic/provider/kugou.js | 33 - .../usr/share/unblockmusic/provider/kuwo.js | 53 -- .../usr/share/unblockmusic/provider/match.js | 51 -- .../usr/share/unblockmusic/provider/migu.js | 42 - .../share/unblockmusic/provider/netease.js | 29 - .../usr/share/unblockmusic/provider/qq.js | 131 --- .../usr/share/unblockmusic/provider/xiami.js | 107 --- .../root/usr/share/unblockmusic/request.js | 96 --- .../root/usr/share/unblockmusic/server.crt | 21 - .../root/usr/share/unblockmusic/server.js | 189 ----- .../root/usr/share/unblockmusic/server.key | 27 - 53 files changed, 143 insertions(+), 4218 deletions(-) create mode 100644 package/lean/UnblockNeteaseMusic/Makefile delete mode 100644 package/lean/luci-app-unblockmusic/LICENSE delete mode 100644 package/lean/luci-app-unblockmusic/README.md rename package/lean/luci-app-unblockmusic/root/usr/share/{unblockmusic => UnblockNeteaseMusic}/logcheck.sh (99%) delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/LICENSE delete mode 100755 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/README.md delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/app.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/bridge.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/README.md delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/background.html delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/background.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/convert.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/core.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/enc-base64.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/md5.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/inject.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/manifest.json delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/request.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/script.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/ca.crt delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/cache.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/cli.js delete mode 100755 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/crypto.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hook.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/build delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/post_push delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/pre_build delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/pre_push delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/package-lock.json delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/package.json delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/baidu.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/find.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/insure.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/joox.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/kugou.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/kuwo.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/match.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/migu.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/netease.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/qq.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/xiami.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/request.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.crt delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.js delete mode 100644 package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.key diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile new file mode 100644 index 000000000..afeea6cbd --- /dev/null +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2015-2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v3. +# +# licheng +# www.maxlicheng.com +# 2019-07-28 +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=UnblockNeteaseMusic +PKG_VERSION:=0.17.0 +PKG_RELEASE:=5 + +PKG_LICENSE:=MIT + +PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic/archive/ +PKG_SOURCE:=v$(PKG_VERSION).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_HASH:=skip + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + SECTION:=net + CATEGORY:=Network + TITLE:=Revive unavailable songs for Netease Cloud Music + DEPENDS:=+node + URL:=https://github.com/nondanee/UnblockNeteaseMusic/releases + SUBMENU:=NeteaseMusic +endef + +define Package/$(PKG_NAME)/description +Revive unavailable songs for Netease Cloud Music +endef + +define Build/Prepare + tar -xzvf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME) + cp -pR $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/* $(1)/usr/share/$(PKG_NAME) +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/LICENSE b/package/lean/luci-app-unblockmusic/LICENSE deleted file mode 100644 index f288702d2..000000000 --- a/package/lean/luci-app-unblockmusic/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 79b4ef223..90f45bcb3 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -1,25 +1,27 @@ # Copyright (C) 2016 Openwrt.org # -# This is a free software, use it under Apache License 2.0 & GNU General Public License v3.0. +# This is free software, licensed under the Apache License, Version 2.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 UnblockNeteaseMusic -LUCI_DEPENDS:=+node +bash +dnsmasq-full +ipset -LUCI_PKGARCH:=all PKG_NAME:=luci-app-unblockmusic -PKG_VERSION:=1.4 -PKG_RELEASE:=3 +PKG_VERSION:=v2.1.0 +PKG_RELEASE:=5 -PKG_MAINTAINER:= +PKG_LICENSE:=Apache-2.0 + +LUCI_TITLE:=LuCI support for Unblock NeteaseCloudMusic +LUCI_DEPENDS:=+UnblockNeteaseMusic +bash +dnsmasq-full +ipset +LUCI_PKGARCH:=all + +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 deleted file mode 100644 index 7d8fb3cec..000000000 --- a/package/lean/luci-app-unblockmusic/README.md +++ /dev/null @@ -1,49 +0,0 @@ - - ### 欢迎加入我的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界面 - ![Image text](https://raw.githubusercontent.com/project-openwrt/luci-app-unblockmusic/master/views/views1.jpg) - ![Image text](https://raw.githubusercontent.com/project-openwrt/luci-app-unblockmusic/master/views/views2.jpg) - ![Image text](https://raw.githubusercontent.com/project-openwrt/luci-app-unblockmusic/master/views/views3.jpg) -### UWP网易云音乐客户端 - ![Image text](https://raw.githubusercontent.com/project-openwrt/luci-app-unblockmusic/master/views/views4.jpg) - -## 协议 -### [核心功能\(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 a4ea7c7d5..8cc7024d8 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 eff341d05..a92ac1712 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] 等音源，替换网易云音乐无版权歌曲链接
具体使用方法参见：https://github.com/project-openwrt/luci-app-unblockmusic") +mp = Map("unblockmusic", translate("解锁网易云灰色歌曲")) +mp.description = translate("原理：采用 [QQ/虾米/百度/酷狗/酷我/咕咪/JOOX]等音源 替换网易云变灰歌曲链接
具体使用方法可查看github：
https://github.com/maxlicheng/luci-app-unblockmusic") mp:section(SimpleSection).template = "unblockmusic/unblockmusic_status" @@ -8,98 +8,24 @@ s = mp:section(TypedSection, "unblockmusic") s.anonymous=true s.addremove=false -enabled = s:option(Flag, "enabled", translate("启用UnblockNeteaseMusic")) -enabled.description = translate("启用本插件以恢复网易云音乐无版权歌曲") +enabled = s:option(Flag, "enabled", translate("启用解锁")) enabled.default = 0 enabled.rmempty = false +enabled.description = translate("启用后，路由器自动分流解锁，大部分设备无需设置代理。
苹果系列设备需要设置 WIFI/有线代理方式为自动即可") -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 = s:option(ListValue, "musicapptype", translate("音源选择")) speedtype:value("default", translate("默认")) speedtype:value("netease", translate("网易云音乐")) speedtype:value("qq", translate("QQ音乐")) speedtype:value("xiami", translate("虾米音乐")) speedtype:value("baidu", translate("百度音乐")) speedtype:value("kugou", translate("酷狗音乐")) -speedtype:value("kuwo", 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) -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 = s:option(Value, "port", translate("端口号")) 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 b847a8368..83d05981f 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusiclog.lua @@ -1,12 +1,14 @@ local fs = require "nixio.fs" local conffile = "/tmp/unblockmusic.log" +local conffile = "/tmp/music.log" f = SimpleForm("logview") t = f:field(TextValue, "conf") t.rmempty = true -t.rows = 15 +t.rows = 20 function t.cfgvalue() + luci.sys.exec(" sed '/MITM/d' /tmp/unblockmusic.log > /tmp/music.log") return fs.readfile(conffile) or "" end t.readonly="readonly" 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 cd5e1e8d2..74dd92812 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 @@ -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 aacec5852..d321713fd 100644 --- a/package/lean/luci-app-unblockmusic/root/etc/config/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/config/unblockmusic @@ -1,16 +1,8 @@ config unblockmusic 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 '1' - option use_hosts '0' - option set_netease_server_ip '0' - option enable_proxy '0' + option musicapptype 'kuwo' + option port '5200' + option enable_ipset '1' + + 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 4d07fe7b0..295110b76 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -3,99 +3,80 @@ START=99 STOP=10 -[ "$(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) +PORT=$(uci get unblockmusic.@unblockmusic[0].port) +ROUTE_IP=$(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)" +ipt_n="iptables -t nat" -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 +add_rule() +{ + ipset -! -N music hash:ip + $ipt_n -N cloud_music + $ipt_n -A cloud_music -d 0.0.0.0/8 -j RETURN + $ipt_n -A cloud_music -d 10.0.0.0/8 -j RETURN + $ipt_n -A cloud_music -d 127.0.0.0/8 -j RETURN + $ipt_n -A cloud_music -d 169.254.0.0/16 -j RETURN + $ipt_n -A cloud_music -d 172.16.0.0/12 -j RETURN + $ipt_n -A cloud_music -d 192.168.0.0/16 -j RETURN + $ipt_n -A cloud_music -d 224.0.0.0/4 -j RETURN + $ipt_n -A cloud_music -d 240.0.0.0/4 -j RETURN + $ipt_n -A cloud_music -p tcp -j REDIRECT --to-ports $PORT + $ipt_n -I PREROUTING -p tcp -m set --match-set music dst -j cloud_music } -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 +del_rule(){ + $ipt_n -D PREROUTING -p tcp -m set --match-set music dst -j cloud_music 2>/dev/null + $ipt_n -F cloud_music 2>/dev/null + $ipt_n -X cloud_music 2>/dev/null + + sed -i '/ipset=\/.music.163.com\/music/d' /etc/dnsmasq.conf + sed -i '/proxy.pac/d' /etc/dnsmasq.conf + /etc/init.d/dnsmasq restart >/dev/null 2>&1 +} - 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 +set_firewall(){ + sed -i '/ipset=\/.music.163.com\/music/d' /etc/dnsmasq.conf + sed -i '/proxy.pac/d' /etc/dnsmasq.conf + echo "dhcp-option=252,http://$ROUTE_IP:$PORT/proxy.pac" >> /etc/dnsmasq.conf + echo "ipset=/.music.163.com/music" >> /etc/dnsmasq.conf + /etc/init.d/dnsmasq restart >/dev/null 2>&1 + + add_rule + + mkdir -p /var/etc + cat > "/var/etc/unblockmusic.include" <<-EOF +/etc/init.d/unblockmusic restart + EOF } start() { stop - - [ "${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 & + + [ $enable -eq "0" ] && exit 0 + + if [ $TYPE = "default" ]; then + node /usr/share/UnblockNeteaseMusic/app.js -p $PORT >/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 & + node /usr/share/UnblockNeteaseMusic/app.js -p $PORT -o $TYPE >/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 & + + set_firewall + + /usr/share/UnblockNeteaseMusic/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 logcheck.sh | grep -v grep | awk '{print $1}')" >/dev/null 2>&1 + kill -9 $(ps | grep monitor | 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 + + del_rule } + + + diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/logcheck.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh similarity index 99% rename from package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/logcheck.sh rename to package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh index 38e16d220..892eb74c2 100755 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/logcheck.sh +++ b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh @@ -9,3 +9,4 @@ do (( "${log_size}" >= "${log_max_size}" )) && echo "" > /tmp/unblockmusic.log sleep 5m done + diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/LICENSE b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/LICENSE deleted file mode 100644 index cba3c7afc..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 Nzix - -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/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/README.md b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/README.md deleted file mode 100755 index ba4d334be..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/README.md +++ /dev/null @@ -1,191 +0,0 @@ -logo - -# UnblockNeteaseMusic - -解锁网易云音乐客户端变灰歌曲 - -## 特性 - -- 使用~~网易云旧链~~ / QQ / 虾米 / 百度 / 酷狗 / 酷我 / 咕咪 / JOOX 音源替换变灰歌曲链接 (默认仅启用前四) -- 为请求增加 `X-Real-IP` 参数解锁海外限制，支持指定网易云服务器 IP，支持设置上游 HTTP / HTTPS 代理 -- 完整的流量代理功能 (HTTP / HTTPS)，可直接作为系统代理 (同时支持 PAC) - -## 运行 - -使用 npx - -``` -$ npx @nondanee/unblockneteasemusic -``` - -或使用 Docker - -``` -$ docker run nondanee/unblockneteasemusic -``` - -``` -$ docker-compose up -``` - -### 配置参数 - -``` -$ 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 - -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 proxy authentication - -e url, --endpoint url replace virtual endpoint with public host - -s, --strict enable proxy limitation - -h, --help output usage information -``` - -## 使用 - -**警告：本项目不提供线上 demo，请不要轻易信任使用他人提供的公开代理服务，以免发生安全问题** - -**若将服务部署到公网，强烈建议使用严格模式 (此模式下仅放行网易云音乐所属域名的请求) `-s` 限制代理范围 (需使用 PAC 或 hosts)，~~或启用 Proxy Authentication `-t :` 设置代理用户名密码~~ (目前密码认证在 Windows 客户端设置和 macOS 系统设置都无法生效，请不要使用)，以防代理被他人滥用** - -支持 Windows 客户端，UWP 客户端，Linux 客户端 (1.2 版本以上需要自签证书 MITM，启动客户端需要增加 `--ignore-certificate-errors` 参数)，macOS 客户端 (726 版本以上需要自签证书)，iOS 客户端 (配置 https endpoint 或使用自签证书)，Android 客户端和网页版 (需要自签证书，需要脚本配合) - -目前除 UWP 外其它客户端均优先请求 HTTPS 接口，默认配置下本代理对网易云所有 HTTPS API 连接返回空数据，促使客户端降级使用 HTTP 接口 (新版 Linux 客户端和 macOS 客户端已无法降级) - -因 UWP 应用存在网络隔离，限制流量发送到本机，若使用的代理在 localhost，或修改的 hosts 指向 localhost，需为 "网易云音乐 UWP" 手动开启 loopback 才能使用，请以**管理员身份**执行命令 - -```powershell -checknetisolation loopbackexempt -a -n="1F8B0F94.122165AE053F_j2p0p5q0044a6" -``` - -### 方法 1. 修改 hosts - -向 hosts 文件添加两条规则 - -``` - music.163.com - interface.music.163.com -``` - -> 使用此方法必须监听 80 端口 `-p 80` -> -> **若在本机运行程序**，请指定网易云服务器 IP `-f xxx.xxx.xxx.xxx` (可在修改 hosts 前通过 `ping music.163.com` 获得) **或** 使用代理 `-u http(s)://xxx.xxx.xxx.xxx:xxx`，以防请求死循环 -> -> **Android 客户端下修改 hosts 无法直接使用**，原因和解决方法详见[云音乐安卓又搞事啦](https://jixun.moe/post/netease-android-hosts-bypass/)，[安卓免 root 绕过网易云音乐 IP 限制](https://jixun.moe/post/android-block-netease-without-root/) - -### 方法 2. 设置代理 - -PAC 自动代理脚本地址 `http:///proxy.pac` - -全局代理地址填写服务器地址和端口号即可 - -| 平台 | 基础设置 | -| :------ | :------------------------------- | -| Windows | 设置 > 工具 > 自定义代理 (客户端内) | -| UWP | Windows 设置 > 网络和 Internet > 代理 | -| Linux | 系统设置 > 网络 > 网络代理 | -| macOS | 系统偏好设置 > 网络 > 高级 > 代理 | -| Android | WLAN > 修改网络 > 高级选项 > 代理 | -| iOS | 无线局域网 > HTTP 代理 > 配置代理 | - -> 代理工具和方法有很多请自行探索，欢迎在 issues 讨论 - -### ✳方法 3. 调用接口 - -作为依赖库使用 - -``` -$ npm install @nondanee/unblockneteasemusic -``` - -```javascript -const match = require('@nondanee/unblockneteasemusic') - -/** - * Set proxy or hosts if needed - */ -global.proxy = require('url').parse('http://127.0.0.1:1080') -global.hosts = {'i.y.qq.com': '59.37.96.220'} - -/** - * Find matching song from other platforms - * @param {Number} id netease song id - * @param {Array||undefined} source support netease, qq, xiami, baidu, kugou, kuwo, migu, joox - * @return {Promise} - */ -match(418602084, ['netease', 'qq', 'xiami', 'baidu']).then(console.log) -``` - -## 效果 - -#### Windows 客户端 - - - -#### UWP 客户端 - - - -#### Linux 客户端 - - - -#### macOS 客户端 - - - -#### Android 客户端 - - - -#### iOS 客户端 - - - -## 致谢 - -感谢大佬们为逆向 eapi 所做的努力 - -使用的其它平台音源 API 出自 - -[trazyn/ieaseMusic](https://github.com/trazyn/ieaseMusic) - -[listen1/listen1_chrome_extension](https://github.com/listen1/listen1_chrome_extension) - -向所有同类项目致敬 - -[EraserKing/CloudMusicGear](https://github.com/EraserKing/CloudMusicGear) - -[EraserKing/Unblock163MusicClient](https://github.com/EraserKing/Unblock163MusicClient) - -[ITJesse/UnblockNeteaseMusic](https://github.com/ITJesse/UnblockNeteaseMusic/) - -[bin456789/Unblock163MusicClient-Xposed](https://github.com/bin456789/Unblock163MusicClient-Xposed) - -[YiuChoi/Unlock163Music](https://github.com/YiuChoi/Unlock163Music) - -[yi-ji/NeteaseMusicAbroad](https://github.com/yi-ji/NeteaseMusicAbroad) - -[stomakun/NeteaseReverseLadder](https://github.com/stomakun/NeteaseReverseLadder/) - -[fengjueming/unblock-NetEaseMusic](https://github.com/fengjueming/unblock-NetEaseMusic) - -[acgotaku/NetEaseMusicWorld](https://github.com/acgotaku/NetEaseMusicWorld) - -[mengskysama/163-Cloud-Music-Unlock](https://github.com/mengskysama/163-Cloud-Music-Unlock) - -[azureplus/163-music-unlock](https://github.com/azureplus/163-music-unlock) - -[typcn/163music-mac-client-unlock](https://github.com/typcn/163music-mac-client-unlock) - -## 许可 - -The MIT License \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/app.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/app.js deleted file mode 100644 index e75f7731d..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/app.js +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env node - -const package = require('./package.json') -const config = require('./cli.js') -.program({name: package.name.replace(/@.+\//, ''), version: package.version}) -.option(['-v', '--version'], {action: 'version'}) -.option(['-p', '--port'], {metavar: 'port', help: 'specify server port'}) -.option(['-a', '--address'], {metavar: 'address', help: 'specify server host'}) -.option(['-u', '--proxy-url'], {metavar: 'url', help: 'request through upstream proxy'}) -.option(['-f', '--force-host'], {metavar: 'host', help: 'force the netease server ip'}) -.option(['-o', '--match-order'], {metavar: 'source', nargs: '+', help: 'set priority of sources'}) -.option(['-t', '--token'], {metavar: 'token', help: 'set up proxy authentication'}) -.option(['-e', '--endpoint'], {metavar: 'url', help: 'replace virtual endpoint with public host'}) -.option(['-s', '--strict'], {action: 'store_true', help: 'enable proxy limitation'}) -.option(['-h', '--help'], {action: 'help'}) -.parse(process.argv) - -global.address = config.address -config.port = (config.port || '8080').split(':').map(string => parseInt(string)) -const invalid = value => (isNaN(value) || value < 1 || value > 65535) -if(config.port.some(invalid)){ - console.log('Port must be a number higher than 0 and lower than 65535.') - process.exit(1) -} -if(config.proxyUrl && !/http(s?):\/\/.+:\d+/.test(config.proxyUrl)){ - console.log('Please check the proxy url.') - process.exit(1) -} -if(config.endpoint && !/http(s?):\/\/.+/.test(config.endpoint)){ - console.log('Please check the endpoint host.') - process.exit(1) -} -if(config.forceHost && !/\d+\.\d+\.\d+\.\d+/.test(config.forceHost)){ - console.log('Please check the server host.') - process.exit(1) -} -if(config.matchOrder){ - const provider = ['netease', 'qq', 'xiami', 'baidu', 'kugou', 'kuwo', 'migu', 'joox'] - const candidate = config.matchOrder - if(candidate.some((key, index) => index != candidate.indexOf(key))){ - console.log('Please check the duplication in match order.') - process.exit(1) - } - else if(candidate.some(key => !provider.includes(key))){ - console.log('Please check the availability of match sources.') - process.exit(1) - } - global.source = candidate -} -if(config.token && !/\S+:\S+/.test(config.token)){ - console.log('Please check the authentication token.') - process.exit(1) -} - -const parse = require('url').parse -const hook = require('./hook') -const server = require('./server') -const escape = string => string.replace(/\./g, '\\.') - -global.port = config.port -global.proxy = config.proxyUrl ? parse(config.proxyUrl) : null -global.hosts = {}, hook.target.host.forEach(host => global.hosts[host] = config.forceHost) -server.whitelist = ['music.126.net', 'vod.126.net'].map(escape) -if(config.strict) server.blacklist.push('.*') -server.authentication = config.token || null -global.endpoint = config.endpoint -if(config.endpoint) server.whitelist.push(escape(config.endpoint)) - -const dns = host => new Promise((resolve, reject) => require('dns').lookup(host, {all: true}, (error, records) => error? reject(error) : resolve(records.map(record => record.address)))) -const httpdns = host => require('./request')('POST', 'http://music.httpdns.c.163.com/d', {}, host).then(response => response.json()).then(jsonBody => jsonBody.dns[0].ips) - -Promise.all([httpdns(hook.target.host[0])].concat(hook.target.host.map(host => dns(host)))) -.then(result => { - let extra = Array.from(new Set(result.reduce((merged, array) => merged.concat(array), []))) - hook.target.host = hook.target.host.concat(extra) - server.whitelist = server.whitelist.concat(hook.target.host.map(escape)) - if(port[0]){ - server.http.listen(port[0], address) - console.log(`HTTP Server running @ http://${address || '0.0.0.0'}:${port[0]}`) - } - if(port[1]){ - server.https.listen(port[1], address) - console.log(`HTTPS Server running @ https://${address || '0.0.0.0'}:${port[1]}`) - } -}) -.catch(error => console.log(error)) \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/bridge.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/bridge.js deleted file mode 100644 index f680658d3..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/bridge.js +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env node -const cache = require('./cache') -const parse = require('url').parse - -const router = { - qq: require('./provider/qq'), - xiami: require('./provider/xiami'), - baidu: require('./provider/baidu'), - kugou: require('./provider/kugou'), - kuwo: require('./provider/kuwo'), - migu: require('./provider/migu'), - joox: require('./provider/joox') -} - -const distributor = (url, router) => Promise.resolve().then(() => { - const route = url.pathname.slice(1).split('/').map(path => decodeURIComponent(path)) - let pointer = router, argument = decodeURIComponent(url.query) - try{argument = JSON.parse(argument)}catch(e){} - const miss = route.some(path => { - if(path in pointer) pointer = pointer[path] - else return true - }) - if(miss || typeof pointer != 'function') return Promise.reject() - //return pointer.call(null, argument) - return cache(pointer, argument, 15 * 60 * 1000) -}) - -require('http').createServer().on('request', (req, res) => - distributor(parse(req.url), router) - .then(data => res.write(data)) - .catch(() => res.writeHead(404)) - .then(() => res.end()) -).listen(parseInt(process.argv[2]) || 9000) \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/README.md b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/README.md deleted file mode 100644 index 7f8fb170c..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# Web Extension Port - -For test - -## Implementation - -- Convert node module to ES6 module which can be directly executed in Chrome 61+ without Babel -- Rewrite crypto module (using CryptoJS) and request (using XMLHttpRequest) module for browser environment -- Do matching in background and transfer result with chrome runtime communication -- Inject content script for hijacking Netease Music Web Ajax response - -## Build - -``` -$ node convert.js -``` - -## Install - -Load unpacked extension in Developer mode - -## Reference - -- [brix/crypto-js](https://github.com/brix/crypto-js) -- [JixunMoe/cuwcl4c](https://github.com/JixunMoe/cuwcl4c) \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/background.html b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/background.html deleted file mode 100644 index d1b0245c7..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/background.html +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/background.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/background.js deleted file mode 100644 index 000740c5b..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/background.js +++ /dev/null @@ -1,22 +0,0 @@ -import match from './provider/match.js' - -chrome.runtime.onMessageExternal.addListener((request, sender, sendResponse) => { - match(request.match, ['netease', 'qq', 'xiami']) - .then(song => sendResponse(song)) - .catch(e => console.log(e)) - return true -}) - -chrome.webRequest.onBeforeSendHeaders.addListener(details => { - let headers = details.requestHeaders - headers.push({name: 'X-Real-IP', value: '118.88.88.88'}) - return {requestHeaders: headers} -}, {urls: ['*://music.163.com/*']}, ['blocking', 'requestHeaders']) - -chrome.webRequest.onHeadersReceived.addListener(details => { - let headers = details.responseHeaders - if(details.initiator == "https://music.163.com" && details.type == 'media'){ - headers.push({name: 'Access-Control-Allow-Origin', value: '*'}) - } - return {responseHeaders: headers} -}, {urls: ['*://*/*']}, ['blocking', 'responseHeaders']) \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/convert.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/convert.js deleted file mode 100644 index 28919353e..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/convert.js +++ /dev/null @@ -1,43 +0,0 @@ -const fs = require('fs') -const path = require('path') - -const importReplacer = (match, state, alias, file) => { - file = file.endsWith('.js') ? file : file + '.js' - return `import ${alias} from '${file}'` -} - -const converter = (input, output, processor) => { - let data = fs.readFileSync(input).toString() - if(processor){ - data = processor(data) - } - else{ - data = data.replace(/global\./g, 'window.') - data = data.replace(/(const|let|var)\s+(\w+)\s*=\s*require\(\s*['|"](.+)['|"]\s*\)/g, importReplacer) - data = data.replace(/module\.exports\s*=\s*/g, 'export default ') - } - fs.writeFileSync(output, data) -} - -converter(path.resolve(__dirname, '..', 'cache.js'), path.resolve(__dirname, '.', 'cache.js')) - -if(!fs.existsSync(path.resolve(__dirname, 'provider'))) fs.mkdirSync(path.resolve(__dirname, 'provider')) - -fs.readdirSync(path.resolve(__dirname, '..', 'provider')).filter(file => !file.includes('test')).forEach(file => { - converter(path.resolve(__dirname, '..', 'provider', file), path.resolve(__dirname, 'provider', file)) -}) - -const providerReplacer = (match, state, data) => { - let provider = [] - let imports = data.match(/\w+\s*:\s*require\(['|"].+['|"]\)/g).map(line => { - line = line.match(/(\w+)\s*:\s*require\(['|"](.+)['|"]\)/) - provider.push(line[1]) - return importReplacer(null, null, line[1], line[2]) - }) - return imports.join('\n') + '\n\n' + `${state} provider = {${provider.join(', ')}}` -} - -converter(path.resolve(__dirname, 'provider', 'match.js'), path.resolve(__dirname, 'provider', 'match.js'), data => { - data = data.replace(/(const|let|var)\s+provider\s*=\s*{([^}]+)}/g, providerReplacer) - return data -}) \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/core.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/core.js deleted file mode 100644 index 28e34c13c..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/core.js +++ /dev/null @@ -1,760 +0,0 @@ -;(function (root, factory) { - if (typeof exports === "object") { - // CommonJS - module.exports = exports = factory(); - } - else if (typeof define === "function" && define.amd) { - // AMD - define([], factory); - } - else { - // Global (browser) - root.CryptoJS = factory(); - } -}(this, function () { - - /** - * CryptoJS core components. - */ - var CryptoJS = CryptoJS || (function (Math, undefined) { - /* - * Local polyfil of Object.create - */ - var create = Object.create || (function () { - function F() {}; - - return function (obj) { - var subtype; - - F.prototype = obj; - - subtype = new F(); - - F.prototype = null; - - return subtype; - }; - }()) - - /** - * CryptoJS namespace. - */ - var C = {}; - - /** - * Library namespace. - */ - var C_lib = C.lib = {}; - - /** - * Base object for prototypal inheritance. - */ - var Base = C_lib.Base = (function () { - - - return { - /** - * Creates a new object that inherits from this object. - * - * @param {Object} overrides Properties to copy into the new object. - * - * @return {Object} The new object. - * - * @static - * - * @example - * - * var MyType = CryptoJS.lib.Base.extend({ - * field: 'value', - * - * method: function () { - * } - * }); - */ - extend: function (overrides) { - // Spawn - var subtype = create(this); - - // Augment - if (overrides) { - subtype.mixIn(overrides); - } - - // Create default initializer - if (!subtype.hasOwnProperty('init') || this.init === subtype.init) { - subtype.init = function () { - subtype.$super.init.apply(this, arguments); - }; - } - - // Initializer's prototype is the subtype object - subtype.init.prototype = subtype; - - // Reference supertype - subtype.$super = this; - - return subtype; - }, - - /** - * Extends this object and runs the init method. - * Arguments to create() will be passed to init(). - * - * @return {Object} The new object. - * - * @static - * - * @example - * - * var instance = MyType.create(); - */ - create: function () { - var instance = this.extend(); - instance.init.apply(instance, arguments); - - return instance; - }, - - /** - * Initializes a newly created object. - * Override this method to add some logic when your objects are created. - * - * @example - * - * var MyType = CryptoJS.lib.Base.extend({ - * init: function () { - * // ... - * } - * }); - */ - init: function () { - }, - - /** - * Copies properties into this object. - * - * @param {Object} properties The properties to mix in. - * - * @example - * - * MyType.mixIn({ - * field: 'value' - * }); - */ - mixIn: function (properties) { - for (var propertyName in properties) { - if (properties.hasOwnProperty(propertyName)) { - this[propertyName] = properties[propertyName]; - } - } - - // IE won't copy toString using the loop above - if (properties.hasOwnProperty('toString')) { - this.toString = properties.toString; - } - }, - - /** - * Creates a copy of this object. - * - * @return {Object} The clone. - * - * @example - * - * var clone = instance.clone(); - */ - clone: function () { - return this.init.prototype.extend(this); - } - }; - }()); - - /** - * An array of 32-bit words. - * - * @property {Array} words The array of 32-bit words. - * @property {number} sigBytes The number of significant bytes in this word array. - */ - var WordArray = C_lib.WordArray = Base.extend({ - /** - * Initializes a newly created word array. - * - * @param {Array} words (Optional) An array of 32-bit words. - * @param {number} sigBytes (Optional) The number of significant bytes in the words. - * - * @example - * - * var wordArray = CryptoJS.lib.WordArray.create(); - * var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]); - * var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6); - */ - init: function (words, sigBytes) { - words = this.words = words || []; - - if (sigBytes != undefined) { - this.sigBytes = sigBytes; - } else { - this.sigBytes = words.length * 4; - } - }, - - /** - * Converts this word array to a string. - * - * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex - * - * @return {string} The stringified word array. - * - * @example - * - * var string = wordArray + ''; - * var string = wordArray.toString(); - * var string = wordArray.toString(CryptoJS.enc.Utf8); - */ - toString: function (encoder) { - return (encoder || Hex).stringify(this); - }, - - /** - * Concatenates a word array to this word array. - * - * @param {WordArray} wordArray The word array to append. - * - * @return {WordArray} This word array. - * - * @example - * - * wordArray1.concat(wordArray2); - */ - concat: function (wordArray) { - // Shortcuts - var thisWords = this.words; - var thatWords = wordArray.words; - var thisSigBytes = this.sigBytes; - var thatSigBytes = wordArray.sigBytes; - - // Clamp excess bits - this.clamp(); - - // Concat - if (thisSigBytes % 4) { - // Copy one byte at a time - for (var i = 0; i < thatSigBytes; i++) { - var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff; - thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8); - } - } else { - // Copy one word at a time - for (var i = 0; i < thatSigBytes; i += 4) { - thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2]; - } - } - this.sigBytes += thatSigBytes; - - // Chainable - return this; - }, - - /** - * Removes insignificant bits. - * - * @example - * - * wordArray.clamp(); - */ - clamp: function () { - // Shortcuts - var words = this.words; - var sigBytes = this.sigBytes; - - // Clamp - words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8); - words.length = Math.ceil(sigBytes / 4); - }, - - /** - * Creates a copy of this word array. - * - * @return {WordArray} The clone. - * - * @example - * - * var clone = wordArray.clone(); - */ - clone: function () { - var clone = Base.clone.call(this); - clone.words = this.words.slice(0); - - return clone; - }, - - /** - * Creates a word array filled with random bytes. - * - * @param {number} nBytes The number of random bytes to generate. - * - * @return {WordArray} The random word array. - * - * @static - * - * @example - * - * var wordArray = CryptoJS.lib.WordArray.random(16); - */ - random: function (nBytes) { - var words = []; - - var r = (function (m_w) { - var m_w = m_w; - var m_z = 0x3ade68b1; - var mask = 0xffffffff; - - return function () { - m_z = (0x9069 * (m_z & 0xFFFF) + (m_z >> 0x10)) & mask; - m_w = (0x4650 * (m_w & 0xFFFF) + (m_w >> 0x10)) & mask; - var result = ((m_z << 0x10) + m_w) & mask; - result /= 0x100000000; - result += 0.5; - return result * (Math.random() > .5 ? 1 : -1); - } - }); - - for (var i = 0, rcache; i < nBytes; i += 4) { - var _r = r((rcache || Math.random()) * 0x100000000); - - rcache = _r() * 0x3ade67b7; - words.push((_r() * 0x100000000) | 0); - } - - return new WordArray.init(words, nBytes); - } - }); - - /** - * Encoder namespace. - */ - var C_enc = C.enc = {}; - - /** - * Hex encoding strategy. - */ - var Hex = C_enc.Hex = { - /** - * Converts a word array to a hex string. - * - * @param {WordArray} wordArray The word array. - * - * @return {string} The hex string. - * - * @static - * - * @example - * - * var hexString = CryptoJS.enc.Hex.stringify(wordArray); - */ - stringify: function (wordArray) { - // Shortcuts - var words = wordArray.words; - var sigBytes = wordArray.sigBytes; - - // Convert - var hexChars = []; - for (var i = 0; i < sigBytes; i++) { - var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff; - hexChars.push((bite >>> 4).toString(16)); - hexChars.push((bite & 0x0f).toString(16)); - } - - return hexChars.join(''); - }, - - /** - * Converts a hex string to a word array. - * - * @param {string} hexStr The hex string. - * - * @return {WordArray} The word array. - * - * @static - * - * @example - * - * var wordArray = CryptoJS.enc.Hex.parse(hexString); - */ - parse: function (hexStr) { - // Shortcut - var hexStrLength = hexStr.length; - - // Convert - var words = []; - for (var i = 0; i < hexStrLength; i += 2) { - words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4); - } - - return new WordArray.init(words, hexStrLength / 2); - } - }; - - /** - * Latin1 encoding strategy. - */ - var Latin1 = C_enc.Latin1 = { - /** - * Converts a word array to a Latin1 string. - * - * @param {WordArray} wordArray The word array. - * - * @return {string} The Latin1 string. - * - * @static - * - * @example - * - * var latin1String = CryptoJS.enc.Latin1.stringify(wordArray); - */ - stringify: function (wordArray) { - // Shortcuts - var words = wordArray.words; - var sigBytes = wordArray.sigBytes; - - // Convert - var latin1Chars = []; - for (var i = 0; i < sigBytes; i++) { - var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff; - latin1Chars.push(String.fromCharCode(bite)); - } - - return latin1Chars.join(''); - }, - - /** - * Converts a Latin1 string to a word array. - * - * @param {string} latin1Str The Latin1 string. - * - * @return {WordArray} The word array. - * - * @static - * - * @example - * - * var wordArray = CryptoJS.enc.Latin1.parse(latin1String); - */ - parse: function (latin1Str) { - // Shortcut - var latin1StrLength = latin1Str.length; - - // Convert - var words = []; - for (var i = 0; i < latin1StrLength; i++) { - words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8); - } - - return new WordArray.init(words, latin1StrLength); - } - }; - - /** - * UTF-8 encoding strategy. - */ - var Utf8 = C_enc.Utf8 = { - /** - * Converts a word array to a UTF-8 string. - * - * @param {WordArray} wordArray The word array. - * - * @return {string} The UTF-8 string. - * - * @static - * - * @example - * - * var utf8String = CryptoJS.enc.Utf8.stringify(wordArray); - */ - stringify: function (wordArray) { - try { - return decodeURIComponent(escape(Latin1.stringify(wordArray))); - } catch (e) { - throw new Error('Malformed UTF-8 data'); - } - }, - - /** - * Converts a UTF-8 string to a word array. - * - * @param {string} utf8Str The UTF-8 string. - * - * @return {WordArray} The word array. - * - * @static - * - * @example - * - * var wordArray = CryptoJS.enc.Utf8.parse(utf8String); - */ - parse: function (utf8Str) { - return Latin1.parse(unescape(encodeURIComponent(utf8Str))); - } - }; - - /** - * Abstract buffered block algorithm template. - * - * The property blockSize must be implemented in a concrete subtype. - * - * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0 - */ - var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({ - /** - * Resets this block algorithm's data buffer to its initial state. - * - * @example - * - * bufferedBlockAlgorithm.reset(); - */ - reset: function () { - // Initial values - this._data = new WordArray.init(); - this._nDataBytes = 0; - }, - - /** - * Adds new data to this block algorithm's buffer. - * - * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8. - * - * @example - * - * bufferedBlockAlgorithm._append('data'); - * bufferedBlockAlgorithm._append(wordArray); - */ - _append: function (data) { - // Convert string to WordArray, else assume WordArray already - if (typeof data == 'string') { - data = Utf8.parse(data); - } - - // Append - this._data.concat(data); - this._nDataBytes += data.sigBytes; - }, - - /** - * Processes available data blocks. - * - * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype. - * - * @param {boolean} doFlush Whether all blocks and partial blocks should be processed. - * - * @return {WordArray} The processed data. - * - * @example - * - * var processedData = bufferedBlockAlgorithm._process(); - * var processedData = bufferedBlockAlgorithm._process(!!'flush'); - */ - _process: function (doFlush) { - // Shortcuts - var data = this._data; - var dataWords = data.words; - var dataSigBytes = data.sigBytes; - var blockSize = this.blockSize; - var blockSizeBytes = blockSize * 4; - - // Count blocks ready - var nBlocksReady = dataSigBytes / blockSizeBytes; - if (doFlush) { - // Round up to include partial blocks - nBlocksReady = Math.ceil(nBlocksReady); - } else { - // Round down to include only full blocks, - // less the number of blocks that must remain in the buffer - nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0); - } - - // Count words ready - var nWordsReady = nBlocksReady * blockSize; - - // Count bytes ready - var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes); - - // Process blocks - if (nWordsReady) { - for (var offset = 0; offset < nWordsReady; offset += blockSize) { - // Perform concrete-algorithm logic - this._doProcessBlock(dataWords, offset); - } - - // Remove processed words - var processedWords = dataWords.splice(0, nWordsReady); - data.sigBytes -= nBytesReady; - } - - // Return processed words - return new WordArray.init(processedWords, nBytesReady); - }, - - /** - * Creates a copy of this object. - * - * @return {Object} The clone. - * - * @example - * - * var clone = bufferedBlockAlgorithm.clone(); - */ - clone: function () { - var clone = Base.clone.call(this); - clone._data = this._data.clone(); - - return clone; - }, - - _minBufferSize: 0 - }); - - /** - * Abstract hasher template. - * - * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits) - */ - var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({ - /** - * Configuration options. - */ - cfg: Base.extend(), - - /** - * Initializes a newly created hasher. - * - * @param {Object} cfg (Optional) The configuration options to use for this hash computation. - * - * @example - * - * var hasher = CryptoJS.algo.SHA256.create(); - */ - init: function (cfg) { - // Apply config defaults - this.cfg = this.cfg.extend(cfg); - - // Set initial values - this.reset(); - }, - - /** - * Resets this hasher to its initial state. - * - * @example - * - * hasher.reset(); - */ - reset: function () { - // Reset data buffer - BufferedBlockAlgorithm.reset.call(this); - - // Perform concrete-hasher logic - this._doReset(); - }, - - /** - * Updates this hasher with a message. - * - * @param {WordArray|string} messageUpdate The message to append. - * - * @return {Hasher} This hasher. - * - * @example - * - * hasher.update('message'); - * hasher.update(wordArray); - */ - update: function (messageUpdate) { - // Append - this._append(messageUpdate); - - // Update the hash - this._process(); - - // Chainable - return this; - }, - - /** - * Finalizes the hash computation. - * Note that the finalize operation is effectively a destructive, read-once operation. - * - * @param {WordArray|string} messageUpdate (Optional) A final message update. - * - * @return {WordArray} The hash. - * - * @example - * - * var hash = hasher.finalize(); - * var hash = hasher.finalize('message'); - * var hash = hasher.finalize(wordArray); - */ - finalize: function (messageUpdate) { - // Final message update - if (messageUpdate) { - this._append(messageUpdate); - } - - // Perform concrete-hasher logic - var hash = this._doFinalize(); - - return hash; - }, - - blockSize: 512/32, - - /** - * Creates a shortcut function to a hasher's object interface. - * - * @param {Hasher} hasher The hasher to create a helper for. - * - * @return {Function} The shortcut function. - * - * @static - * - * @example - * - * var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256); - */ - _createHelper: function (hasher) { - return function (message, cfg) { - return new hasher.init(cfg).finalize(message); - }; - }, - - /** - * Creates a shortcut function to the HMAC's object interface. - * - * @param {Hasher} hasher The hasher to use in this HMAC helper. - * - * @return {Function} The shortcut function. - * - * @static - * - * @example - * - * var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256); - */ - _createHmacHelper: function (hasher) { - return function (message, key) { - return new C_algo.HMAC.init(hasher, key).finalize(message); - }; - } - }); - - /** - * Algorithm namespace. - */ - var C_algo = C.algo = {}; - - return C; - }(Math)); - - - return CryptoJS; - -})); \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/enc-base64.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/enc-base64.js deleted file mode 100644 index d5d40824d..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/enc-base64.js +++ /dev/null @@ -1,135 +0,0 @@ -;(function (root, factory) { - if (typeof exports === "object") { - // CommonJS - module.exports = exports = factory(require("./core")); - } - else if (typeof define === "function" && define.amd) { - // AMD - define(["./core"], factory); - } - else { - // Global (browser) - factory(root.CryptoJS); - } -}(this, function (CryptoJS) { - - (function () { - // Shortcuts - var C = CryptoJS; - var C_lib = C.lib; - var WordArray = C_lib.WordArray; - var C_enc = C.enc; - - /** - * Base64 encoding strategy. - */ - var Base64 = C_enc.Base64 = { - /** - * Converts a word array to a Base64 string. - * - * @param {WordArray} wordArray The word array. - * - * @return {string} The Base64 string. - * - * @static - * - * @example - * - * var base64String = CryptoJS.enc.Base64.stringify(wordArray); - */ - stringify: function (wordArray) { - // Shortcuts - var words = wordArray.words; - var sigBytes = wordArray.sigBytes; - var map = this._map; - - // Clamp excess bits - wordArray.clamp(); - - // Convert - var base64Chars = []; - for (var i = 0; i < sigBytes; i += 3) { - var byte1 = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff; - var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff; - var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff; - - var triplet = (byte1 << 16) | (byte2 << 8) | byte3; - - for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) { - base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f)); - } - } - - // Add padding - var paddingChar = map.charAt(64); - if (paddingChar) { - while (base64Chars.length % 4) { - base64Chars.push(paddingChar); - } - } - - return base64Chars.join(''); - }, - - /** - * Converts a Base64 string to a word array. - * - * @param {string} base64Str The Base64 string. - * - * @return {WordArray} The word array. - * - * @static - * - * @example - * - * var wordArray = CryptoJS.enc.Base64.parse(base64String); - */ - parse: function (base64Str) { - // Shortcuts - var base64StrLength = base64Str.length; - var map = this._map; - var reverseMap = this._reverseMap; - - if (!reverseMap) { - reverseMap = this._reverseMap = []; - for (var j = 0; j < map.length; j++) { - reverseMap[map.charCodeAt(j)] = j; - } - } - - // Ignore padding - var paddingChar = map.charAt(64); - if (paddingChar) { - var paddingIndex = base64Str.indexOf(paddingChar); - if (paddingIndex !== -1) { - base64StrLength = paddingIndex; - } - } - - // Convert - return parseLoop(base64Str, base64StrLength, reverseMap); - - }, - - _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=' - }; - - function parseLoop(base64Str, base64StrLength, reverseMap) { - var words = []; - var nBytes = 0; - for (var i = 0; i < base64StrLength; i++) { - if (i % 4) { - var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2); - var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2); - words[nBytes >>> 2] |= (bits1 | bits2) << (24 - (nBytes % 4) * 8); - nBytes++; - } - } - return WordArray.create(words, nBytes); - } - }()); - - - return CryptoJS.enc.Base64; - -})); \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/md5.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/md5.js deleted file mode 100644 index 12b0fdd4b..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto-js/md5.js +++ /dev/null @@ -1,268 +0,0 @@ -;(function (root, factory) { - if (typeof exports === "object") { - // CommonJS - module.exports = exports = factory(require("./core")); - } - else if (typeof define === "function" && define.amd) { - // AMD - define(["./core"], factory); - } - else { - // Global (browser) - factory(root.CryptoJS); - } -}(this, function (CryptoJS) { - - (function (Math) { - // Shortcuts - var C = CryptoJS; - var C_lib = C.lib; - var WordArray = C_lib.WordArray; - var Hasher = C_lib.Hasher; - var C_algo = C.algo; - - // Constants table - var T = []; - - // Compute constants - (function () { - for (var i = 0; i < 64; i++) { - T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0; - } - }()); - - /** - * MD5 hash algorithm. - */ - var MD5 = C_algo.MD5 = Hasher.extend({ - _doReset: function () { - this._hash = new WordArray.init([ - 0x67452301, 0xefcdab89, - 0x98badcfe, 0x10325476 - ]); - }, - - _doProcessBlock: function (M, offset) { - // Swap endian - for (var i = 0; i < 16; i++) { - // Shortcuts - var offset_i = offset + i; - var M_offset_i = M[offset_i]; - - M[offset_i] = ( - (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) | - (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00) - ); - } - - // Shortcuts - var H = this._hash.words; - - var M_offset_0 = M[offset + 0]; - var M_offset_1 = M[offset + 1]; - var M_offset_2 = M[offset + 2]; - var M_offset_3 = M[offset + 3]; - var M_offset_4 = M[offset + 4]; - var M_offset_5 = M[offset + 5]; - var M_offset_6 = M[offset + 6]; - var M_offset_7 = M[offset + 7]; - var M_offset_8 = M[offset + 8]; - var M_offset_9 = M[offset + 9]; - var M_offset_10 = M[offset + 10]; - var M_offset_11 = M[offset + 11]; - var M_offset_12 = M[offset + 12]; - var M_offset_13 = M[offset + 13]; - var M_offset_14 = M[offset + 14]; - var M_offset_15 = M[offset + 15]; - - // Working varialbes - var a = H[0]; - var b = H[1]; - var c = H[2]; - var d = H[3]; - - // Computation - a = FF(a, b, c, d, M_offset_0, 7, T[0]); - d = FF(d, a, b, c, M_offset_1, 12, T[1]); - c = FF(c, d, a, b, M_offset_2, 17, T[2]); - b = FF(b, c, d, a, M_offset_3, 22, T[3]); - a = FF(a, b, c, d, M_offset_4, 7, T[4]); - d = FF(d, a, b, c, M_offset_5, 12, T[5]); - c = FF(c, d, a, b, M_offset_6, 17, T[6]); - b = FF(b, c, d, a, M_offset_7, 22, T[7]); - a = FF(a, b, c, d, M_offset_8, 7, T[8]); - d = FF(d, a, b, c, M_offset_9, 12, T[9]); - c = FF(c, d, a, b, M_offset_10, 17, T[10]); - b = FF(b, c, d, a, M_offset_11, 22, T[11]); - a = FF(a, b, c, d, M_offset_12, 7, T[12]); - d = FF(d, a, b, c, M_offset_13, 12, T[13]); - c = FF(c, d, a, b, M_offset_14, 17, T[14]); - b = FF(b, c, d, a, M_offset_15, 22, T[15]); - - a = GG(a, b, c, d, M_offset_1, 5, T[16]); - d = GG(d, a, b, c, M_offset_6, 9, T[17]); - c = GG(c, d, a, b, M_offset_11, 14, T[18]); - b = GG(b, c, d, a, M_offset_0, 20, T[19]); - a = GG(a, b, c, d, M_offset_5, 5, T[20]); - d = GG(d, a, b, c, M_offset_10, 9, T[21]); - c = GG(c, d, a, b, M_offset_15, 14, T[22]); - b = GG(b, c, d, a, M_offset_4, 20, T[23]); - a = GG(a, b, c, d, M_offset_9, 5, T[24]); - d = GG(d, a, b, c, M_offset_14, 9, T[25]); - c = GG(c, d, a, b, M_offset_3, 14, T[26]); - b = GG(b, c, d, a, M_offset_8, 20, T[27]); - a = GG(a, b, c, d, M_offset_13, 5, T[28]); - d = GG(d, a, b, c, M_offset_2, 9, T[29]); - c = GG(c, d, a, b, M_offset_7, 14, T[30]); - b = GG(b, c, d, a, M_offset_12, 20, T[31]); - - a = HH(a, b, c, d, M_offset_5, 4, T[32]); - d = HH(d, a, b, c, M_offset_8, 11, T[33]); - c = HH(c, d, a, b, M_offset_11, 16, T[34]); - b = HH(b, c, d, a, M_offset_14, 23, T[35]); - a = HH(a, b, c, d, M_offset_1, 4, T[36]); - d = HH(d, a, b, c, M_offset_4, 11, T[37]); - c = HH(c, d, a, b, M_offset_7, 16, T[38]); - b = HH(b, c, d, a, M_offset_10, 23, T[39]); - a = HH(a, b, c, d, M_offset_13, 4, T[40]); - d = HH(d, a, b, c, M_offset_0, 11, T[41]); - c = HH(c, d, a, b, M_offset_3, 16, T[42]); - b = HH(b, c, d, a, M_offset_6, 23, T[43]); - a = HH(a, b, c, d, M_offset_9, 4, T[44]); - d = HH(d, a, b, c, M_offset_12, 11, T[45]); - c = HH(c, d, a, b, M_offset_15, 16, T[46]); - b = HH(b, c, d, a, M_offset_2, 23, T[47]); - - a = II(a, b, c, d, M_offset_0, 6, T[48]); - d = II(d, a, b, c, M_offset_7, 10, T[49]); - c = II(c, d, a, b, M_offset_14, 15, T[50]); - b = II(b, c, d, a, M_offset_5, 21, T[51]); - a = II(a, b, c, d, M_offset_12, 6, T[52]); - d = II(d, a, b, c, M_offset_3, 10, T[53]); - c = II(c, d, a, b, M_offset_10, 15, T[54]); - b = II(b, c, d, a, M_offset_1, 21, T[55]); - a = II(a, b, c, d, M_offset_8, 6, T[56]); - d = II(d, a, b, c, M_offset_15, 10, T[57]); - c = II(c, d, a, b, M_offset_6, 15, T[58]); - b = II(b, c, d, a, M_offset_13, 21, T[59]); - a = II(a, b, c, d, M_offset_4, 6, T[60]); - d = II(d, a, b, c, M_offset_11, 10, T[61]); - c = II(c, d, a, b, M_offset_2, 15, T[62]); - b = II(b, c, d, a, M_offset_9, 21, T[63]); - - // Intermediate hash value - H[0] = (H[0] + a) | 0; - H[1] = (H[1] + b) | 0; - H[2] = (H[2] + c) | 0; - H[3] = (H[3] + d) | 0; - }, - - _doFinalize: function () { - // Shortcuts - var data = this._data; - var dataWords = data.words; - - var nBitsTotal = this._nDataBytes * 8; - var nBitsLeft = data.sigBytes * 8; - - // Add padding - dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32); - - var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000); - var nBitsTotalL = nBitsTotal; - dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = ( - (((nBitsTotalH << 8) | (nBitsTotalH >>> 24)) & 0x00ff00ff) | - (((nBitsTotalH << 24) | (nBitsTotalH >>> 8)) & 0xff00ff00) - ); - dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = ( - (((nBitsTotalL << 8) | (nBitsTotalL >>> 24)) & 0x00ff00ff) | - (((nBitsTotalL << 24) | (nBitsTotalL >>> 8)) & 0xff00ff00) - ); - - data.sigBytes = (dataWords.length + 1) * 4; - - // Hash final blocks - this._process(); - - // Shortcuts - var hash = this._hash; - var H = hash.words; - - // Swap endian - for (var i = 0; i < 4; i++) { - // Shortcut - var H_i = H[i]; - - H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) | - (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00); - } - - // Return final computed hash - return hash; - }, - - clone: function () { - var clone = Hasher.clone.call(this); - clone._hash = this._hash.clone(); - - return clone; - } - }); - - function FF(a, b, c, d, x, s, t) { - var n = a + ((b & c) | (~b & d)) + x + t; - return ((n << s) | (n >>> (32 - s))) + b; - } - - function GG(a, b, c, d, x, s, t) { - var n = a + ((b & d) | (c & ~d)) + x + t; - return ((n << s) | (n >>> (32 - s))) + b; - } - - function HH(a, b, c, d, x, s, t) { - var n = a + (b ^ c ^ d) + x + t; - return ((n << s) | (n >>> (32 - s))) + b; - } - - function II(a, b, c, d, x, s, t) { - var n = a + (c ^ (b | ~d)) + x + t; - return ((n << s) | (n >>> (32 - s))) + b; - } - - /** - * Shortcut function to the hasher's object interface. - * - * @param {WordArray|string} message The message to hash. - * - * @return {WordArray} The hash. - * - * @static - * - * @example - * - * var hash = CryptoJS.MD5('message'); - * var hash = CryptoJS.MD5(wordArray); - */ - C.MD5 = Hasher._createHelper(MD5); - - /** - * Shortcut function to the HMAC's object interface. - * - * @param {WordArray|string} message The message to hash. - * @param {WordArray|string} key The secret key. - * - * @return {WordArray} The HMAC. - * - * @static - * - * @example - * - * var hmac = CryptoJS.HmacMD5(message, key); - */ - C.HmacMD5 = Hasher._createHmacHelper(MD5); - }(Math)); - - - return CryptoJS.MD5; - -})); \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto.js deleted file mode 100644 index afd52f604..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/crypto.js +++ /dev/null @@ -1,15 +0,0 @@ -const uriKey = '3go8&$8*3*3h0k(2)2' - -export default { - uri: { - retrieve: id => { - id = id.toString().trim() - let string = Array.from(Array(id.length).keys()).map(index => String.fromCharCode(id.charCodeAt(index) ^ uriKey.charCodeAt(index % uriKey.length))).join('') - let result = CryptoJS.MD5(string).toString(CryptoJS.enc.Base64).replace(/\//g, '_').replace(/\+/g, '-') - return `http://p1.music.126.net/${result}/${id}` - } - }, - md5: { - digest: value => CryptoJS.MD5(value).toString() - } -} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/inject.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/inject.js deleted file mode 100644 index 5d5e6cfbb..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/inject.js +++ /dev/null @@ -1,73 +0,0 @@ -(() => { - const remote = 'oleomikdicccalekkpcbfgdmpjehnpkp' - const remoteMatch = id => new Promise(resolve => { - chrome.runtime.sendMessage(remote, {match: id}, response => { - resolve(response) - }) - }) - - const waitTimeout = wait => new Promise(resolve => { - setTimeout(() => { - resolve() - }, wait) - }) - - const searchFunction = (object, keyword) => - Object.keys(object) - .filter(key => object[key] && typeof object[key] == 'function') - .find(key => String(object[key]).match(keyword)) - - if(self.frameElement && self.frameElement.tagName == 'IFRAME'){ //in iframe - const keyOne = searchFunction(window.nej.e, '\\.dataset;if') - const keyTwo = searchFunction(window.nm.x, '\\.copyrightId==') - const keyThree = searchFunction(window.nm.x, '\\.privilege;if') - const functionOne = window.nej.e[keyOne] - - window.nej.e[keyOne] = (z, name) => { - if (name == 'copyright' || name == 'resCopyright') return 1 - return functionOne(z, name) - } - window.nm.x[keyTwo] = () => false - window.nm.x[keyThree] = song => { - song.status = 0 - if (song.privilege) song.privilege.pl = 320000 - return 0 - } - const table = document.querySelector('table tbody') - if(table) Array.from(table.childNodes) - .filter(element => element.classList.contains('js-dis')) - .forEach(element => element.classList.remove('js-dis')) - } - else{ - const keyAjax = searchFunction(window.nej.j, '\\.replace\\("api","weapi') - const functionAjax = window.nej.j[keyAjax] - window.nej.j[keyAjax] = (url, param) => { - const onload = param.onload - param.onload = data => { - Promise.resolve() - .then(() => { - if(url.includes('enhance/player/url')){ - if(data.data[0].url){ - data.data[0].url = data.data[0].url.replace(/(m\d+?)(?!c)\.music\.126\.net/, '$1c.music.126.net') - } - else{ - return Promise.race([remoteMatch(data.data[0].id), waitTimeout(4000)]) - .then(result => { - if(result){ - data.data[0].code = 200 - data.data[0].br = 320000 - data.data[0].type = 'mp3' - data.data[0].size = result.size - data.data[0].md5 = result.md5 - data.data[0].url = result.url.replace(/http:\/\//, 'https://') - } - }) - } - } - }) - .then(() => onload(data)) - } - functionAjax(url, param) - } - } -})() \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/manifest.json b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/manifest.json deleted file mode 100644 index f820a42c6..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/manifest.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "UnblockNeteaseMusic", - "description": "For test (es6 only)", - "version": "0.1", - "background": { - "page": "background.html" - }, - "content_scripts": [{ - "js": ["script.js"], - "matches": ["*://music.163.com/*"], - "all_frames": true - }], - "web_accessible_resources": ["inject.js"], - "externally_connectable": { - "matches": ["*://music.163.com/*"] - }, - "manifest_version": 2, - "permissions": ["*://*/*", "webRequest", "webRequestBlocking"] -} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/request.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/request.js deleted file mode 100644 index 07c1f9f94..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/request.js +++ /dev/null @@ -1,18 +0,0 @@ -export default (method, url, headers, body) => new Promise((resolve, reject) => { - headers = headers || {} - const xhr = new XMLHttpRequest() - xhr.onreadystatechange = () => {if(xhr.readyState == 4) resolve(xhr)} - xhr.onerror = error => reject(error) - xhr.open(method, url, true) - Object.keys(headers).filter(key => !['origin', 'referer'].includes(key.toLowerCase())).forEach(key => xhr.setRequestHeader(key, headers[key])) - xhr.send(body) -}).then(xhr => Object.assign(xhr, { - statusCode: xhr.status, - headers: - xhr.getAllResponseHeaders().split('\r\n').filter(line => line).map(line => line.split(/\s*:\s*/)) - .reduce((result, pair) => Object.assign(result, {[pair[0].toLowerCase()]: pair[1]}), {}), - url: {href: xhr.responseURL}, - body: () => xhr.responseText, - json: () => JSON.parse(xhr.responseText), - jsonp: () => JSON.parse(xhr.responseText.slice(xhr.responseText.indexOf('(') + 1, -')'.length)) -})) \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/script.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/script.js deleted file mode 100644 index 01eb7d84f..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/browser/script.js +++ /dev/null @@ -1,5 +0,0 @@ -(() => { - let script = (document.head || document.documentElement).appendChild(document.createElement('script')) - script.src = chrome.extension.getURL('inject.js') - script.onload = script.parentNode.removeChild(script) -})() \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/ca.crt b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/ca.crt deleted file mode 100644 index 4101eb345..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/ca.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIJAKX8LdIETDklMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV -BAYTAkNOMSQwIgYDVQQDDBtVbmJsb2NrTmV0ZWFzZU11c2ljIFJvb3QgQ0ExHTAb -BgNVBAoMFEdpdEh1Yi5jb20gQG5vbmRhbmVlMB4XDTE5MDUxODE2MDU0NVoXDTI0 -MDUxNjE2MDU0NVowUjELMAkGA1UEBhMCQ04xJDAiBgNVBAMMG1VuYmxvY2tOZXRl -YXNlTXVzaWMgUm9vdCBDQTEdMBsGA1UECgwUR2l0SHViLmNvbSBAbm9uZGFuZWUw -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD23K6Ti2TfLJToCmpCAVgE -Xb8+qTMfrifCpnKlJ+hrL+4KI1j4vSqTOOatqmxGSXZdF/j2kJuI40YThaokcgYx -GFcPcEftSCYGWy8o20u2hzTkkW3KW9wlsDRIXICFXVIsHeSDwz+aVSudkyJHjfaS -aLNb5pPovE7MRj8tDbp55scaSqhEcOe3m1ZlwlCeeXvD7RLKr3xhBKbGEqlJAjFq -RNGzuqylqyJVBLScNHC7Lcf4n6pKr1yPGOeLePOUrIwtj0ynHUcBfeMuCVCsIKL8 -vy/oNwlDrZaAMfu5QQslzEf87KY1QgtI6Ppii+tzbmVx1ZxnlaCKqiuwlgBoi/5r -AgMBAAGjUDBOMB0GA1UdDgQWBBRDhbGjnXEUouE9wNFS2k9PtgYYjDAfBgNVHSME -GDAWgBRDhbGjnXEUouE9wNFS2k9PtgYYjDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQDRUh5+JFLEALXQkhPfwrVf4sCXTwLMwVujTPo3NMbhpWiP4cnn -XHGCD5V57bBwjeD6NSrczDIdnN9uTJyFmLNVFMZBguEIeZfLUJLJ6w1ZhfgciX1D -9djyyo6eclkHvi+aPZKfzgMmc5BvHcjyUyS5MzI23kUW6WXUDn3IDIUKrfaH9Mjc -/d4DDZVKQCYrLoBL+XO7pEHUY0u9XZVYWEavQ5tSN8XY1SDrO0yGUpRWET0ltubE -zV7W0LOhuoVCiemboc5H8+njBjCis8obAo1XMmDZzW189L9GPFxHNWlka+KlajZB -tMo90PooZYEOw1rTUrzHb+VZY/tYIAAomGZ0 ------END CERTIFICATE----- diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/cache.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/cache.js deleted file mode 100644 index 56b52a197..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/cache.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = (job, parameter, live = 30 * 60 * 1000) => { - const cache = job.cache ? job.cache : job.cache = {} - const key = parameter == null ? 'default' : (parameter.id || parameter.key || parameter) - if(!(key in cache) || cache[key].expiration < Date.now()) - cache[key] = { - execution: job(parameter), - expiration: Date.now() + live - } - return cache[key].execution -} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/cli.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/cli.js deleted file mode 100644 index eced09e60..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/cli.js +++ /dev/null @@ -1,162 +0,0 @@ -const cli = { - width: 80, - _program: {}, - _options: [], - program: (information = {}) => { - cli._program = information - return cli - }, - option: (flags, addition = {}) => { - // name or flags - Either a name or a list of option strings, e.g. foo or -f, --foo. - // dest - The name of the attribute to be added to the object returned by parse_options(). - - // nargs - The number of command-line arguments that should be consumed. // N, ?, *, +, REMAINDER - // action - The basic type of action to be taken when this argument is encountered at the command line. // store, store_true, store_false, append, append_const, count, help, version - - // const - A constant value required by some action and nargs selections. (supporting store_const and append_const action) - - // metavar - A name for the argument in usage messages. - // help - A brief description of what the argument does. - - // required - Whether or not the command-line option may be omitted (optionals only). - // default - The value produced if the argument is absent from the command line. - // type - The type to which the command-line argument should be converted. - // choices - A container of the allowable values for the argument. - - flags = Array.isArray(flags) ? flags : [flags] - addition.dest = addition.dest || flags.slice(-1)[0].toLowerCase().replace(/^-+/, '').replace(/-[a-z]/g, character => character.slice(1).toUpperCase()) - addition.help = addition.help || {'help': 'output usage information', 'version': 'output the version number'}[addition.action] - cli._options.push(Object.assign(addition, {flags: flags, positional: !flags[0].startsWith('-')})) - return cli - }, - parse: argv => { - let positionals = cli._options.map((option, index) => option.positional ? index : null).filter(index => index !== null), optionals = {} - cli._options.forEach((option, index) => option.positional ? null : option.flags.forEach(flag => optionals[flag] = index)) - - cli._program.name = cli._program.name || require('path').parse(argv[1]).base - let args = argv.slice(2).reduce((result, part) => /^-[^-]/.test(part) ? result.concat(part.slice(1).split('').map(string => '-' + string)) : result.concat(part), []) - - let pointer = 0 - while(pointer < args.length){ - let part = args[pointer], value = null - let index = part.startsWith('-') ? optionals[part] : positionals.shift() - if(index == undefined) part.startsWith('-') ? error(`no such option: ${part}`) : error(`extra arguments found: ${part}`) - if(part.startsWith('-')) pointer += 1 - let action = cli._options[index].action - - if(['help', 'version'].includes(action)){ - if(action === 'help') help() - else if(action === 'version') version() - } - else if(['store_true', 'store_false'].includes(action)){ - value = action === 'store_true' - } - else{ - let gap = args.slice(pointer).findIndex(part => part in optionals) - let next = gap === -1 ? args.length : pointer + gap - value = args.slice(pointer, next) - if(value.length === 0){ - if(cli._options[index].positional) - error(`the following arguments are required: ${part}`) - else if(cli._options[index].nargs === '+') - error(`argument ${part}: expected at least one argument`) - else - error(`argument ${part}: expected one argument`) - } - if(cli._options[index].nargs != '+'){ - value = value[0] - pointer += 1 - } - else{ - pointer = next - } - } - cli[cli._options[index].dest] = value - } - if(positionals.length) error(`the following arguments are required: ${positionals.map(index => cli._options[index].flags[0]).join(', ')}`) - // cli._options.forEach(option => console.log(option.dest, cli[option.dest])) - return cli - } -} - -const pad = length => (new Array(length + 1)).join(' ') - -const usage = () => { - let options = cli._options.map(option => { - let flag = option.flags[0] - let name = option.metavar || option.dest - if(option.positional){ - if(option.nargs === '+') - return `${name} [${name} ...]` - else - return `${name}` - } - else{ - if(['store_true', 'store_false', 'help', 'version'].includes(option.action)) - return `[${flag}]` - else if(option.nargs === '+') - return `[${flag} ${name} [${name} ...]]` - else - return `[${flag} ${name}]` - } - }) - let maximum = cli.width - let title = `usage: ${cli._program.name}` - let lines = [title] - - options.map(name => ' ' + name).forEach(option => { - lines[lines.length - 1].length + option.length < maximum ? - lines[lines.length - 1] += option : - lines.push(pad(title.length) + option) - }) - console.log(lines.join('\n')) -} - -const help = () => { - usage() - let positionals = cli._options.filter(option => option.positional) - .map(option => [option.metavar || option.dest, option.help]) - let optionals = cli._options.filter(option => !option.positional) - .map(option => { - let flags = option.flags - let name = option.metavar || option.dest - let use = '' - if(['store_true', 'store_false', 'help', 'version'].includes(option.action)) - use = flags.map(flag => `${flag}`).join(', ') - else if(option.nargs === '+') - use = flags.map(flag => `${flag} ${name} [${name} ...]`).join(', ') - else - use = flags.map(flag => `${flag} ${name}`).join(', ') - return [use, option.help] - }) - let align = Math.max.apply(null, positionals.concat(optionals).map(option => option[0].length)) - align = align > 30 ? 30 : align - rest = cli.width - align - 4 - const publish = option => { - const slice = string => - Array.from(Array(Math.ceil(string.length / rest)).keys()) - .map(index => string.slice(index * rest, (index + 1) * rest)) - .join('\n' + pad(align + 4)) - option[0].length < align ? - console.log(` ${option[0]}${pad(align - option[0].length)} ${slice(option[1])}`) : - console.log(` ${option[0]}\n${pad(align + 4)}${slice(option[1])}`) - } - if(positionals.length) console.log('\npositional arguments:') - positionals.forEach(publish) - if(optionals.length) console.log('\noptional arguments:') - optionals.forEach(publish) - process.exit() -} - -const version = () => { - console.log(cli._program.version) - process.exit() -} - -const error = message => { - usage() - console.log(cli._program.name + ':', 'error:', message) - process.exit(1) -} - -module.exports = cli \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/crypto.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/crypto.js deleted file mode 100755 index 24117944a..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/crypto.js +++ /dev/null @@ -1,98 +0,0 @@ -'use strict' - -const crypto = require('crypto') -const bodyify = require('querystring').stringify -const parse = require('url').parse -const uriKey = '3go8&$8*3*3h0k(2)2' -const eapiKey = 'e82ckenh8dichen8' -const linuxapiKey = 'rFgB&h#%2?^eDg:Q' - -const decrypt = (buffer, key) => { - let decipher = crypto.createDecipheriv('aes-128-ecb', key, '') - return Buffer.concat([decipher.update(buffer), decipher.final()]) -} - -const encrypt = (buffer, key) => { - let cipher = crypto.createCipheriv('aes-128-ecb', key, '') - return Buffer.concat([cipher.update(buffer), cipher.final()]) -} - -module.exports = { - eapi: { - encrypt: buffer => encrypt(buffer, eapiKey), - decrypt: buffer => decrypt(buffer, eapiKey), - encryptRequest: (url, object) => { - url = parse(url) - let text = JSON.stringify(object) - let message = `nobody${url.path}use${text}md5forencrypt` - let digest = crypto.createHash('md5').update(message).digest('hex') - let data = `${url.path}-36cd479b6b5-${text}-36cd479b6b5-${digest}` - return { - url: url.href.replace(/\w*api/, 'eapi'), - body: bodyify({ - params: encrypt(Buffer.from(data), eapiKey).toString('hex').toUpperCase() - }) - } - } - }, - linuxapi: { - encrypt: buffer => encrypt(buffer, linuxapiKey), - decrypt: buffer => decrypt(buffer, linuxapiKey), - encryptRequest: (url, object) => { - url = parse(url) - let text = JSON.stringify({method: 'POST', url: url.href, params: object}) - return { - url: url.resolve('/api/linux/forward'), - body: bodyify({ - eparams: encrypt(Buffer.from(text), linuxapiKey).toString('hex').toUpperCase() - }) - } - } - }, - miguapi: { - encrypt: object => { - let text = JSON.stringify(object) - const derive = (password, salt, keyLength, ivSize) => { // EVP_BytesToKey - salt = salt || Buffer.alloc(0) - let keySize = keyLength / 8 - let repeat = Math.ceil((keySize + ivSize * 8) / 32) - let buffer = Buffer.concat(Array.from(Array(repeat).keys()).reduce(result => - result.concat(crypto.createHash('md5').update(Buffer.concat([result.slice(-1)[0], password, salt])).digest()) - , [Buffer.alloc(0)])) - return { - key: buffer.slice(0, keySize), - iv: buffer.slice(keySize, keySize + ivSize) - } - } - let password = Buffer.from(crypto.randomBytes(32).toString('hex')), salt = crypto.randomBytes(8), - key = '-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8asrfSaoOb4je+DSmKdriQJKWVJ2oDZrs3wi5W67m3LwTB9QVR+cE3XWU21Nx+YBxS0yun8wDcjgQvYt625ZCcgin2ro/eOkNyUOTBIbuj9CvMnhUYiR61lC1f1IGbrSYYimqBVSjpifVufxtx/I3exReZosTByYp4Xwpb1+WAQIDAQAB\n-----END PUBLIC KEY-----' - let secret = derive(password, salt, 256, 16) - let cipher = crypto.createCipheriv('aes-256-cbc', secret.key, secret.iv) - return bodyify({ - data: Buffer.concat([Buffer.from('Salted__'), salt, cipher.update(Buffer.from(text)), cipher.final()]).toString('base64'), - secKey: crypto.publicEncrypt({key, padding: crypto.constants.RSA_PKCS1_PADDING}, password).toString('base64') - }) - } - }, - base64: { - encode: text => Buffer.from(text).toString('base64').replace(/\+/g, '-').replace(/\//g, '_'), - decode: text => Buffer.from(text.replace(/-/g, '+').replace(/_/g, '/'), 'base64').toString('ascii') - }, - uri: { - retrieve: id => { - id = id.toString().trim() - let string = Array.from(Array(id.length).keys()).map(index => String.fromCharCode(id.charCodeAt(index) ^ uriKey.charCodeAt(index % uriKey.length))).join('') - let result = crypto.createHash('md5').update(string).digest('base64').replace(/\//g, '_').replace(/\+/g, '-') - return `http://p1.music.126.net/${result}/${id}` - } - }, - md5: { - digest: value => crypto.createHash('md5').update(value).digest('hex'), - pipe: source => new Promise((resolve, reject) => { - let digest = crypto.createHash('md5').setEncoding('hex') - source.pipe(digest) - .on('error', error => reject(error)) - .once('finish', () => resolve(digest.read())) - }) - } -} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hook.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hook.js deleted file mode 100644 index 6674491a6..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hook.js +++ /dev/null @@ -1,308 +0,0 @@ -const cache = require('./cache') -const parse = require('url').parse -const crypto = require('./crypto') -const request = require('./request') -const match = require('./provider/match') - -const hook = { - request: { - before: () => {}, - after: () => {}, - }, - connect: { - before: () => {} - }, - target: { - host: [], - path: [] - } -} - -hook.target.host = [ - 'music.163.com', - 'interface.music.163.com', - 'interface3.music.163.com', - 'apm.music.163.com', - 'apm3.music.163.com', - 'mam.netease.com', - 'api.iplay.163.com' - // 'crash.163.com', - // 'clientlog.music.163.com' -] - -hook.target.path = [ - '/api/v3/playlist/detail', - '/api/v3/song/detail', - '/api/v6/playlist/detail', - '/api/album/play', - '/api/artist/privilege', - '/api/album/privilege', - '/api/v1/artist', - '/api/v1/artist/songs', - '/api/artist/top/song', - '/api/v1/album', - '/api/playlist/privilege', - '/api/song/enhance/player/url', - '/api/song/enhance/player/url/v1', - '/api/song/enhance/download/url', - '/batch', - '/api/batch', - '/api/v1/search/get', - '/api/cloudsearch/pc', - '/api/v1/playlist/manipulate/tracks', - '/api/song/like', - '/api/v1/play/record', - '/api/playlist/v4/detail', - '/api/v1/radio/get', - '/api/v1/discovery/recommend/songs' -] - -hook.request.before = ctx => { - const req = ctx.req - req.url = (req.url.startsWith('http://') ? '' : (req.socket.encrypted ? 'https:' : 'http:') + '//music.163.com') + req.url - const url = parse(req.url) - if([url.hostname, req.headers.host].some(host => hook.target.host.includes(host)) && req.method == 'POST' && (url.path == '/api/linux/forward' || url.path.startsWith('/eapi/'))){ - return request.read(req) - .then(body => { - req.body = body - req.headers['X-Real-IP'] = '118.88.88.88' - if(body){ - let data = null - let netease = {} - netease.pad = (body.match(/%0+$/) || [''])[0] - netease.forward = (url.path == '/api/linux/forward') - if(netease.forward){ - data = JSON.parse(crypto.linuxapi.decrypt(Buffer.from(body.slice(8, body.length - netease.pad.length), 'hex')).toString()) - netease.path = parse(data.url).path - netease.param = data.params - } - else{ - data = crypto.eapi.decrypt(Buffer.from(body.slice(7, body.length - netease.pad.length), 'hex')).toString().split('-36cd479b6b5-') - netease.path = data[0] - netease.param = JSON.parse(data[1]) - } - netease.path = netease.path.replace(/\/\d*$/, '') - ctx.netease = netease - // console.log(netease.path, netease.param) - - if(netease.path == '/api/song/enhance/download/url') - return pretendPlay(ctx) - } - }) - .catch(error => { - console.log(error) - }) - } - if((hook.target.host.includes(url.hostname)) && url.path.startsWith('/weapi/')){ - ctx.req.headers['X-Real-IP'] = '118.88.88.88' - ctx.netease = {web: true, path: url.path.replace(/^\/weapi\//, '/api/').replace(/\?.+$/, '').replace(/\/\d*$/, '')} - } - else if(req.url.includes('package')){ - try{ - let data = req.url.split('package/').pop().split('/') - let url = parse(crypto.base64.decode(data[0])) - let id = data[1].replace('.mp3', '') - req.url = url.href - req.headers['host'] = url.hostname - ctx.package = {id} - ctx.decision = 'proxy' - } - catch(error){ - ctx.error = error - ctx.decision = 'close' - } - } -} - -hook.request.after = ctx => { - const netease = ctx.netease - const package = ctx.package - const proxyRes = ctx.proxyRes - if(netease && hook.target.path.includes(netease.path) && proxyRes.statusCode == 200){ - return request.read(proxyRes, true) - .then(buffer => { - proxyRes.body = buffer - const patch = string => string.replace(/([\[|{|:]\s*)(\d{16,})(\s*[\]|}|,])/g, '$1"$2L"$3') // for js precision - try{ - netease.encrypted = false - netease.jsonBody = JSON.parse(patch(buffer.toString())) - } - catch(error){ - netease.encrypted = true - netease.jsonBody = JSON.parse(patch(crypto.eapi.decrypt(buffer).toString())) - } - - if(netease.path.includes('manipulate') && [401, 512].includes(netease.jsonBody.code) && !netease.web) - return tryCollect(ctx) - else if(netease.path == '/api/song/like' && [401, 512].includes(netease.jsonBody.code) && !netease.web) - return tryLike(ctx) - else if(netease.path.includes('url')) - return tryMatch(ctx) - }) - .then(() => { - if('transfer-encoding' in proxyRes.headers) delete proxyRes.headers['transfer-encoding'] - if('content-encoding' in proxyRes.headers) delete proxyRes.headers['content-encoding'] - if('content-length' in proxyRes.headers) delete proxyRes.headers['content-length'] - - const inject = (key, value) => { - if(typeof(value) === 'object' && value != null){ - if('fee' in value) value['fee'] = 0 - if('st' in value && 'pl' in value && 'dl' in value && 'subp' in value){ // batch modify - value['st'] = 0 - value['subp'] = 1 - value['pl'] = (value['pl'] == 0) ? 320000 : value['pl'] - value['dl'] = (value['dl'] == 0) ? 320000 : value['dl'] - } - } - return value - } - - let body = JSON.stringify(netease.jsonBody, inject) - body = body.replace(/([\[|{|:]\s*)"(\d{16,})L"(\s*[\]|}|,])/g, '$1$2$3') // for js precision - proxyRes.body = (netease.encrypted ? crypto.eapi.encrypt(Buffer.from(body)) : body) - }) - } - else if(package){ - if(/p\d+c*.music.126.net/.test(ctx.req.url)){ - proxyRes.headers['content-type'] = 'audio/mpeg' - } - } -} - -hook.connect.before = ctx => { - let url = parse('https://' + ctx.req.url) - if([url.hostname, ctx.req.headers.host].some(host => hook.target.host.includes(host))){ - if(url.port == 80){ - ctx.req.url = `${global.address || 'localhost'}:${global.port[0]}` - ctx.req.local = true - } - else if(global.port[1]){ - ctx.req.url = `${global.address || 'localhost'}:${global.port[1]}` - ctx.req.local = true - } - else{ - ctx.decision = 'blank' - } - } -} - -const pretendPlay = ctx => { - const req = ctx.req - const netease = ctx.netease - let turn = 'http://music.163.com/api/song/enhance/player/url' - let query = null - if(netease.linux){ - netease.param = { - ids: `["${netease.param.id}"]`, - br: netease.param.br - } - query = crypto.linuxapi.encryptRequest(turn, netease.param) - } - else{ - netease.param = { - ids: `["${netease.param.id}"]`, - br: netease.param.br, - e_r: netease.param.e_r, - header: netease.param.header - } - query = crypto.eapi.encryptRequest(turn, netease.param) - } - req.url = query.url - req.body = query.body + netease.pad -} - -const tryCollect = ctx => { - const req = ctx.req - const netease = ctx.netease - let trackId = (netease.param.trackIds instanceof Array ? netease.param.trackIds : JSON.parse(netease.param.trackIds))[0] - return request('POST', 'http://music.163.com/api/playlist/manipulate/tracks', req.headers, `trackIds=[${trackId},${trackId}]&pid=${netease.param.pid}&op=${netease.param.op}`).then(response => response.json()) - .then(jsonBody => { - netease.jsonBody = jsonBody - }) - .catch(() => {}) -} - -const tryLike = ctx => { - const req = ctx.req - const netease = ctx.netease - let pid, userId, trackId = netease.param.trackId - return request('GET', 'http://music.163.com/api/v1/user/info', req.headers).then(response => response.json()) - .then(jsonBody => { - userId = jsonBody.userPoint.userId - return request('GET', `http://music.163.com/api/user/playlist?uid=${userId}&limit=1`, req.headers).then(response => response.json()) - }) - .then(jsonBody => { - pid = jsonBody.playlist[0].id - return request('POST', 'http://music.163.com/api/playlist/manipulate/tracks', req.headers, `trackIds=[${trackId},${trackId}]&pid=${pid}&op=add`).then(response => response.json()) - }) - .then(jsonBody => { - if(jsonBody.code == 200 || jsonBody.code == 502){ - netease.jsonBody = {code: 200, playlistId: pid} - } - }) - .catch(() => {}) -} - -const computeHash = task => request('GET', task.url).then(response => crypto.md5.pipe(response)) - -const tryMatch = ctx => { - const netease = ctx.netease - const jsonBody = netease.jsonBody - let tasks = [], target = 0 - - const inject = item => { - item.flag = 0 - if((item.code != 200 || item.freeTrialInfo) && (target == 0 || item.id == target)){ - return match(item.id) - .then(song => { - item.url = global.endpoint ? `${global.endpoint}/package/${crypto.base64.encode(song.url)}/${item.id}.mp3` : song.url - item.md5 = song.md5 || crypto.md5.digest(song.url) - item.size = song.size - item.code = 200 - item.br = 320000 - item.type = 'mp3' - return song - }) - .then(song => { - if(!netease.path.includes('download') || song.md5) return - const newer = (base, target) => { - let difference = - Array.from([base, target]) - .map(version => version.split('.').slice(0, 3).map(number => parseInt(number) || 0)) - .reduce((aggregation, current) => !aggregation.length ? current.map(element => [element]) : aggregation.map((element, index) => element.concat(current[index])), []) - .filter(pair => pair[0] != pair[1])[0] - return !difference || difference[0] <= difference[1] - } - const limit = {android: '0.0.0', osx: '2.0.0'} - const task = {key: song.url.replace(/\?.*$/, ''), url: song.url} - try{ - let header = netease.param.header - header = typeof(header) === 'string' ? JSON.parse(header) : header - let os = header.os, version = header.appver - if(os in limit && newer(limit[os], version)) - return cache(computeHash, task, 7 * 24 * 60 * 60 * 1000).then(value => item.md5 = value) - } - catch(e){} - }) - .catch(() => {}) - } - else if(item.code == 200 && netease.web){ - item.url = item.url.replace(/(m\d+?)(?!c)\.music\.126\.net/, '$1c.music.126.net') - } - } - - if(!jsonBody.data instanceof Array){ - tasks = [inject(jsonBody.data)] - } - else if(netease.path.includes('download')){ - jsonBody.data = jsonBody.data[0] - tasks = [inject(jsonBody.data)] - } - else{ - target = netease.web ? 0 : parseInt((netease.param.ids instanceof Array ? netease.param.ids : JSON.parse(netease.param.ids))[0].toString().replace('_0', '')) // reduce time cost - tasks = jsonBody.data.map(item => inject(item)) - } - return Promise.all(tasks).catch(() => {}) -} - -module.exports = hook \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/build b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/build deleted file mode 100644 index e0a38efd1..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -docker build \ - --build-arg ARCH="armhf" \ - -t $DOCKER_REPO:arm \ - -f $DOCKERFILE_PATH . - -docker build \ - --build-arg ARCH="aarch64" \ - -t $DOCKER_REPO:arm64 \ - -f $DOCKERFILE_PATH . - -docker build \ - --build-arg ARCH="amd64" \ - -t $DOCKER_REPO:amd64 \ - -f $DOCKERFILE_PATH . \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/post_push b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/post_push deleted file mode 100644 index 94a72c626..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/post_push +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -docker manifest create \ - $DOCKER_REPO:latest \ - $DOCKER_REPO:amd64 \ - $DOCKER_REPO:arm64 \ - $DOCKER_REPO:arm - -docker manifest annotate \ - $DOCKER_REPO:latest \ - $DOCKER_REPO:amd64 --os linux --arch amd64 - -docker manifest annotate \ - $DOCKER_REPO:latest \ - $DOCKER_REPO:arm64 --os linux --arch arm64 - -docker manifest annotate \ - $DOCKER_REPO:latest \ - $DOCKER_REPO:arm --os linux --arch arm - -docker manifest push --purge $DOCKER_REPO:latest \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/pre_build b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/pre_build deleted file mode 100644 index bff48f5a4..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/pre_build +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -apt-get -y update -apt-get -y --only-upgrade install docker-ee -docker run --rm --privileged multiarch/qemu-user-static:register --reset \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/pre_push b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/pre_push deleted file mode 100644 index db0e2e4c8..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/hooks/pre_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -docker push $DOCKER_REPO:arm -docker push $DOCKER_REPO:arm64 -#docker push $DOCKER_REPO:amd64 \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/package-lock.json b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/package-lock.json deleted file mode 100644 index a53dd70f1..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/package-lock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "unblockneteasemusic", - "version": "0.17.0", - "lockfileVersion": 1 -} diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/package.json b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/package.json deleted file mode 100644 index 6a367c897..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "@nondanee/unblockneteasemusic", - "version": "0.17.0", - "description": "Revive unavailable songs for Netease Cloud Music", - "main": "provider/match.js", - "bin": { - "unblockneteasemusic": "app.js" - }, - "scripts": { - "pkg": "pkg . --out-path=dist/" - }, - "pkg": { - "assets": [ - "server.key", - "server.crt" - ] - }, - "repository": { - "type": "git", - "url": "https://github.com/nondanee/UnblockNeteaseMusic.git" - }, - "author": "nondanee", - "license": "MIT", - "dependencies": {}, - "publishConfig": { - "access": "public" - } -} diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/baidu.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/baidu.js deleted file mode 100644 index 93b51122e..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/baidu.js +++ /dev/null @@ -1,41 +0,0 @@ -const cache = require('../cache') -const insure = require('./insure') -const request = require('../request') - -const search = info => { - let url = - 'http://sug.qianqian.com/info/suggestion?' + - 'word=' + encodeURIComponent(info.keyword) + '&version=2&from=0' - - return request('GET', url) - .then(response => response.json()) - .then(jsonBody => { - if('data' in jsonBody){ - let matched = jsonBody.data.song[0] - return matched.songid - } - else{ - return Promise.reject() - } - }) -} - -const track = id => { - let url = - 'http://music.taihe.com/data/music/fmlink?' + - 'songIds=' + id + '&type=mp3' - - return request('GET', url) - .then(response => response.json()) - .then(jsonBody => { - if('songList' in jsonBody.data) - return jsonBody.data.songList[0].songLink || null - else - return Promise.reject() - }) - .catch(() => insure().baidu.track(id)) -} - -const check = info => cache(search, info).then(track) - -module.exports = {check} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/find.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/find.js deleted file mode 100644 index 7c8cd78de..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/find.js +++ /dev/null @@ -1,22 +0,0 @@ -const cache = require('../cache') -const request = require('../request') - -const filter = (object, keys) => Object.keys(object).filter(key => keys.includes(key)).reduce((result, key) => Object.assign(result, {[key]: object[key]}), {}) -// Object.keys(object).filter(key => !keys.includes(key)).forEach(key => delete object[key]) - -const find = id => { - let url = - 'https://music.163.com/api/song/detail?ids=[' + id + ']' - - return request('GET', url) - .then(response => response.json()) - .then(jsonBody => { - let info = filter(jsonBody.songs[0], ['id', 'name', 'alias', 'duration']) - info.album = filter(jsonBody.songs[0].album, ['id', 'name']) - info.artists = jsonBody.songs[0].artists.map(artist => filter(artist, ['id', 'name'])) - info.keyword = info.name + ' - ' + info.artists.map(artist => artist.name).join(' / ') - return info - }) -} - -module.exports = id => cache(find, id) \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/insure.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/insure.js deleted file mode 100644 index e65e65e07..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/insure.js +++ /dev/null @@ -1,19 +0,0 @@ -const request = require('../request') -const host = 'https://public.nondanee.tk' - -module.exports = () => { - const proxy = new Proxy(() => {}, { - get: (target, property) => { - target.route = (target.route || []).concat(property) - return proxy - }, - apply: (target, _, payload) => { - let path = target.route.join('/'), query = payload[0] - query = encodeURIComponent(typeof(query) === 'object' ? JSON.stringify(query) : query) - if(path != 'qq/ticket') return Promise.reject() - return request('GET', `${host}/${path}?${query}`) - .then(response => response.body()) - } - }) - return proxy -} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/joox.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/joox.js deleted file mode 100644 index 260a02c9c..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/joox.js +++ /dev/null @@ -1,56 +0,0 @@ -const cache = require('../cache') -const insure = require('./insure') -const request = require('../request') - -let headers = { - 'origin': 'http://www.joox.com', - 'referer': 'http://www.joox.com' -} - -const fit = info => { - if(/[\u0800-\u4e00]/.test(info.name)) //is japanese - return info.name - else - return info.keyword -} - -const search = info => { - let keyword = fit(info) - let url = - 'http://api-jooxtt.sanook.com/web-fcgi-bin/web_search?' + - 'country=hk&lang=zh_TW&' + - 'search_input=' + encodeURIComponent(keyword) + '&sin=0&ein=30' - - return request('GET', url, headers) - .then(response => response.body()) - .then(body => { - let jsonBody = JSON.parse(body.replace(/(\')/g, '"')) - let matched = jsonBody.itemlist[0] - if(matched) - return matched.songid - else - return Promise.reject() - }) -} - -const track = id => { - let url = - 'http://api.joox.com/web-fcgi-bin/web_get_songinfo?' + - 'songid=' + id + '&country=hk&lang=zh_cn&from_type=-1&' + - 'channel_id=-1&_=' + (new Date).getTime() - - return request('GET', url, headers) - .then(response => response.jsonp()) - .then(jsonBody => { - let songUrl = (jsonBody.r320Url || jsonBody.r192Url || jsonBody.mp3Url || jsonBody.m4aUrl).replace(/M\d00([\w]+).mp3/, 'M800$1.mp3') - if(songUrl) - return songUrl - else - return Promise.reject() - }) - .catch(() => insure().joox.track(id)) -} - -const check = info => cache(search, info).then(track) - -module.exports = {check, track} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/kugou.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/kugou.js deleted file mode 100644 index 3f7010930..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/kugou.js +++ /dev/null @@ -1,33 +0,0 @@ -const cache = require('../cache') -const insure = require('./insure') -const request = require('../request') - -const search = info => { - let url = - 'http://songsearch.kugou.com/song_search_v2?' + - 'keyword=' + encodeURIComponent(info.keyword) + '&page=1' - - return request('GET', url) - .then(response => response.json()) - .then(jsonBody => { - let matched = jsonBody.data.lists[0] - if(matched) - return matched.FileHash - else - return Promise.reject() - }) - .catch(() => insure().kugou.search(info)) -} - -const track = id => { - let url = - 'http://m.kugou.com/app/i/getSongInfo.php?cmd=playInfo&hash=' + id - - return request('GET', url) - .then(response => response.json()) - .then(jsonBody => jsonBody.url || Promise.reject()) -} - -const check = info => cache(search, info).then(track) - -module.exports = {check, search} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/kuwo.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/kuwo.js deleted file mode 100644 index a43cc2c44..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/kuwo.js +++ /dev/null @@ -1,53 +0,0 @@ -const cache = require('../cache') -const insure = require('./insure') -const request = require('../request') - -const search = info => { - let url = - // 'http://search.kuwo.cn/r.s?' + - // 'ft=music&itemset=web_2013&client=kt&' + - // 'rformat=json&encoding=utf8&' + - // 'all=' + encodeURIComponent(info.keyword) + '&pn=0&rn=20' - 'http://search.kuwo.cn/r.s?' + - 'ft=music&rformat=json&encoding=utf8&' + - 'rn=8&callback=song&vipver=MUSIC_8.0.3.1&' + - 'SONGNAME=' + encodeURIComponent(info.name) + '&' + - 'ARTIST=' + encodeURIComponent(info.artists[0].name) - - return request('GET', url) - .then(response => response.body()) - .then(body => { - let jsonBody = eval( - '(' + body - .replace(/\n/g, '') - .match(/try\s*\{[^=]+=\s*(.+?)\s*\}\s*catch/)[1] - .replace(/;\s*song\s*\(.+\)\s*;\s*/, '') + ')' - ) - let matched = jsonBody.abslist[0] - if(matched) - return matched.MUSICRID.split('_').pop() - else - return Promise.reject() - }) -} - -const track = id => { - let url = - 'http://antiserver.kuwo.cn/anti.s?' + - 'type=convert_url&format=mp3&response=url&rid=MUSIC_' + id - // 'type=convert_url&format=aac|mp3|wma&response=url&rid=MUSIC_' + id - - return request('GET', url) - .then(response => response.body()) - .then(body => { - if(body.startsWith('http')) - return body - else - return Promise.reject() - }) - .catch(() => insure().kuwo.track(id)) -} - -const check = info => cache(search, info).then(track) - -module.exports = {check, track} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/match.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/match.js deleted file mode 100644 index 0c2b9695f..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/match.js +++ /dev/null @@ -1,51 +0,0 @@ -const find = require('./find') -const request = require('../request') - -const provider = { - netease: require('./netease'), - qq: require('./qq'), - xiami: require('./xiami'), - baidu: require('./baidu'), - kugou: require('./kugou'), - kuwo: require('./kuwo'), - migu: require('./migu'), - joox: require('./joox') -} - -const match = (id, source) => { - let meta = {} - let candidate = (source || global.source || ['qq', 'xiami', 'baidu']).filter(name => name in provider) - return find(id) - .then(info => { - meta = info - return Promise.all(candidate.map(name => provider[name].check(info).catch(() => {}))) - }) - .then(urls => { - urls = urls.filter(url => url) - return Promise.all(urls.map(url => check(url))) - }) - .then(songs => { - songs = songs.filter(song => song.url) - if(!songs.length) return Promise.reject() - console.log(`[${meta.id}] ${meta.name}\n${songs[0].url}`) - return songs[0] - }) -} - -const check = url => { - let song = {size: 0, url: null, md5: null} - return Promise.race([request('HEAD', url), new Promise((_, reject) => setTimeout(() => reject(504), 5 * 1000))]) - .then(response => { - if(response.statusCode != 200) return - if(url.includes('qq.com')) - song.md5 = response.headers['server-md5'] - else if(url.includes('xiami.net') || url.includes('qianqian.com')) - song.md5 = response.headers['etag'].replace(/"/g, '').toLowerCase() - song.size = parseInt(response.headers['content-length']) || 0 - song.url = response.url.href - }) - .catch(() => {}) - .then(() => song) -} - -module.exports = match \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/migu.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/migu.js deleted file mode 100644 index 80497d47f..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/migu.js +++ /dev/null @@ -1,42 +0,0 @@ -const cache = require('../cache') -const crypto = require('../crypto') -const request = require('../request') - -let headers = { - 'origin': 'http://music.migu.cn/', - 'referer': 'http://music.migu.cn/' -} - -const search = info => { - let url = - 'http://m.10086.cn/migu/remoting/scr_search_tag?' + - 'keyword=' + encodeURIComponent(info.keyword) + '&type=2&rows=20&pgc=1' - - return request('GET', url) - .then(response => response.json()) - .then(jsonBody => { - if('musics' in jsonBody) - return jsonBody.musics[0].copyrightId - else - return Promise.reject() - }) -} - -const track = id => { - let url = - 'http://music.migu.cn/v3/api/music/audioPlayer/getPlayInfo?' + - 'dataType=2&' + crypto.miguapi.encrypt({copyrightId: id.toString()}) - - return request('GET', url, headers) - .then(response => response.json()) - .then(jsonBody => { - if('walkmanInfo' in jsonBody) - return encodeURI(jsonBody.walkmanInfo.playUrl) - else - return Promise.reject() - }) -} - -const check = info => cache(search, info).then(track) - -module.exports = {check} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/netease.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/netease.js deleted file mode 100644 index f455134d2..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/netease.js +++ /dev/null @@ -1,29 +0,0 @@ -const cache = require('../cache') -const crypto = require('../crypto') -const request = require('../request') - -const search = info => { - let url = - 'http://music.163.com/api/album/' + info.album.id - - return request('GET', url) - .then(response => response.body()) - .then(body => { - let jsonBody = JSON.parse(body.replace(/"dfsId":(\d+)/g, '"dfsId":"$1"')) // for js precision - let matched = jsonBody.album.songs.find(song => song.id === info.id) - if(matched) - return matched.hMusic.dfsId || matched.mMusic.dfsId || matched.lMusic.dfsId - else - return Promise.reject() - }) -} - -const track = id => { - if(!id || id === '0') return Promise.reject() - let songUrl = crypto.uri.retrieve(id) - return songUrl -} - -const check = info => cache(search, info).then(track) - -module.exports = {check} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/qq.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/qq.js deleted file mode 100644 index 60bb7d0c2..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/qq.js +++ /dev/null @@ -1,131 +0,0 @@ -const cache = require('../cache') -const insure = require('./insure') -const request = require('../request') - -let headers = { - 'origin': 'http://y.qq.com/', - 'referer': 'http://y.qq.com/' -} - -const playable = song => { - let switchFlag = song['switch'].toString(2).split('') - switchFlag.pop() - switchFlag.reverse() - let playFlag = switchFlag[0] - let tryFlag = switchFlag[13] - return ((playFlag == 1) || ((playFlag == 1) && (tryFlag == 1))) -} - -const search = info => { - let url = - 'https://c.y.qq.com/soso/fcgi-bin/client_search_cp?' + - 'ct=24&qqmusic_ver=1298&new_json=1&remoteplace=txt.yqq.center' + - '&searchid=46804741196796149&t=0&aggr=1&cr=1&catZhida=1&lossless=0' + - '&flag_qc=0&p=1&n=20&w=' + encodeURIComponent(info.keyword) + - '&g_tk=5381&jsonpCallback=MusicJsonCallback10005317669353331&loginUin=0&hostUin=0' + - '&format=jsonp&inCharset=utf8&outCharset=utf-8¬ice=0&platform=yqq&needNewCode=0' - - return request('GET', url) - .then(response => response.jsonp()) - .then(jsonBody => { - let matched = jsonBody.data.song.list[0] - if(matched) - return matched.file.media_mid - else - return Promise.reject() - }) -} - -const ticket = () => { - const classic = ['001yS0N33yPm1B', '000bog5B2DYgHN', '002bongo1BDtKz', '004RDW5Q2ol2jj', '001oEME64eXNbp', '001e9dH11YeXGp', '0021onBk2QNjBu', '001YoUs11jvsIK', '000SNxc91Mw3UQ', '002k94ea4379uy'] - const id = classic[Math.floor(classic.length * Math.random())] - - // let url = - // 'https://c.y.qq.com/base/fcgi-bin/fcg_music_express_mobile3.fcg' + - // '?g_tk=0&loginUin=0&hostUin=0&format=json&inCharset=utf8' + - // '&outCharset=utf-8¬ice=0&platform=yqq&needNewCode=0' + - // '&cid=205361747&uin=0&guid=7332953645' + - // '&songmid='+ id + '&filename=C400'+ id + '.m4a' - - // return request('GET', url, headers) - // .then(response => response.json()) - // .then(jsonBody => { - // let vkey = jsonBody.data.items[0].vkey - // if(vkey) - // return vkey - // else - // return Promise.reject() - // }) - // .catch(() => insure().qq.ticket()) - - let url = - 'https://u.y.qq.com/cgi-bin/musicu.fcg?data=' + - encodeURIComponent(JSON.stringify({ - // req: { - // method: 'GetCdnDispatch', - // module: 'CDN.SrfCdnDispatchServer', - // param: { - // calltype: 0, - // guid: '7332953645', - // userip: '' - // } - // }, - req_0: { - module: 'vkey.GetVkeyServer', - method: 'CgiGetVkey', - param: { - guid: '7332953645', - loginflag: 1, - songmid: [id], - songtype: [0], - uin: '0', - platform: '20' - } - } - })) - - return request('GET', url) - .then(response => response.json()) - .then(jsonBody => { - let vkey = - jsonBody.req_0.data.midurlinfo[0].vkey || - (jsonBody.req_0.data.testfile2g.match(/vkey=(\w+)/) || [])[1] - if(vkey) - return vkey - else - return Promise.reject() - }) - .catch(() => insure().qq.ticket()) -} - -const track = id => { - return cache(ticket) - .then(vkey => { - let host = ['streamoc.music.tc.qq.com', 'isure.stream.qqmusic.qq.com', 'dl.stream.qqmusic.qq.com', 'aqqmusic.tc.qq.com/amobile.music.tc.qq.com'][1] - let songUrl = - 'http://' + host + '/M500' + id + - '.mp3?vkey=' + vkey + - '&uin=0&fromtag=8&guid=7332953645' - return songUrl - }) - - // return request( - // 'POST', 'http://acc.music.qq.com/base/fcgi-bin/fcg_music_express_mobile2.fcg', {}, - // ` - // 9070003190 - // 4600100100105 - // 02123456782 - // 352iosM800${id}.mp30 - // `.replace(/\s/, '') - // ) - // .then(response => response.body(true)) - // .then(body => { - // let xml = require('zlib').inflateSync(body.slice(5)).toString() - // let focus = xml.match(/(.+)<\/item>/) - // return `http://streamoc.music.tc.qq.com/${focus[1]}?vkey=${focus[2]}&guid=0&uin=12345678&fromtag=6` - // }) -} - -const check = info => cache(search, info).then(track) - -module.exports = {check, ticket} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/xiami.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/xiami.js deleted file mode 100644 index b13bae317..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/provider/xiami.js +++ /dev/null @@ -1,107 +0,0 @@ -const cache = require('../cache') -const insure = require('./insure') -const crypto = require('../crypto') -const request = require('../request') - -let headers = { - 'origin': 'http://www.xiami.com/', - 'referer': 'http://www.xiami.com/' -} - -const caesar = pattern => { - let height = parseInt(pattern[0]) - pattern = pattern.slice(1) - let width = Math.ceil(pattern.length / height) - let unpad = height - (width * height - pattern.length) - - let matrix = Array.from(Array(height).keys()).map(i => - pattern.slice(i < unpad ? i * width : unpad * width + (i - unpad) * (width - 1)).slice(0, i < unpad ? width : width - 1) - ) - - let transpose = Array.from(Array(width).keys()).map(x => - Array.from(Array(height).keys()).map(y => matrix[y][x]).join('') - ) - - return unescape(transpose.join('')).replace(/\^/g, '0') -} - -const token = () => { - return request('GET', 'https://www.xiami.com') - .then(response => - response.headers['set-cookie'].map(line => line.replace(/;.+$/, '')).reduce((cookie, line) => { - line = line.split(/\s*=\s*/) - return Object.assign(cookie, {[decodeURIComponent(line[0])]: decodeURIComponent(line[1])}) - }, {}) - ) -} - -const search = info => { - return cache(token) - .then(cookie => { - const query = JSON.stringify({key: info.keyword, pagingVO: {page: 1, pageSize: 60}}) - const message = cookie['xm_sg_tk'].split('_')[0] + '_xmMain_/api/search/searchSongs_' + query - return request('GET', 'https://www.xiami.com/api/search/searchSongs?_q=' + encodeURIComponent(query) + '&_s=' + crypto.md5.digest(message), { - referer: 'https://www.xiami.com/search?key=' + encodeURIComponent(info.keyword), - cookie: Object.keys(cookie).map(key => encodeURIComponent(key) + '=' + encodeURIComponent(cookie[key])).join('; ') - }) - .then(response => response.json()) - .then(jsonBody => { - let matched = jsonBody.result.data.songs[0] - if(matched) - return matched.songId - else - return Promise.reject() - }) - }) -} - -// const search = info => { -// let url = -// 'http://api.xiami.com/web?v=2.0&app_key=1' + -// '&key=' + encodeURIComponent(info.keyword) + '&page=1' + -// '&limit=20&callback=jsonp154&r=search/songs' - -// return request('GET', url, headers) -// .then(response => { -// let jsonBody = JSON.parse(response.body.slice('jsonp154('.length, -')'.length)) -// let matched = jsonBody.data.songs[0] -// if(matched){ -// if(matched.listen_file) -// return matched.listen_file -// else -// return matched.song_id -// } -// else -// return Promise.reject() -// }) -// } - -const track = id => { - let url = - 'https://emumo.xiami.com/song/playlist/id/' + id + - '/object_name/default/object_id/0/cat/json' - - return request('GET', url, headers) - .then(response => response.json()) - .then(jsonBody => { - if(jsonBody.data.trackList == null){ - return Promise.reject() - } - else{ - let location = jsonBody.data.trackList[0].location - let songUrl = 'http:' + caesar(location) - return songUrl - } - }) - .then(origin => { - let updated = origin.replace('m128', 'm320') - return request('HEAD', updated) - .then(response => response.statusCode == 200 ? updated : origin) - .catch(() => origin) - }) - .catch(() => insure().xiami.track(id)) -} - -const check = info => cache(search, info).then(track) - -module.exports = {check, track} \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/request.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/request.js deleted file mode 100644 index cb4ac2934..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/request.js +++ /dev/null @@ -1,96 +0,0 @@ -const zlib = require('zlib') -const http = require('http') -const https = require('https') -const parse = require('url').parse - -const translate = host => (global.hosts || {})[host] || host - -const create = url => global.proxy ? (proxy.protocol == 'https:' ? https.request : http.request) : (url.protocol == 'https:' ? https.request : http.request) - -const configure = (method, url, headers) => { - headers = headers || {} - if('content-length' in headers) delete headers['content-length'] - - let options = {} - options._headers = headers - if(global.proxy && url.protocol == 'https:'){ - options.method = 'CONNECT' - options.headers = Object.keys(headers).filter(key => ['host', 'user-agent'].includes(key)).reduce((result, key) => Object.assign(result, {[key]: headers[key]}), {}) - } - else{ - options.method = method - options.headers = headers - } - - if(global.proxy){ - options.hostname = translate(proxy.hostname) - options.port = proxy.port || ((proxy.protocol == 'https:') ? 443 : 80) - options.path = (url.protocol != 'https:') ? ('http://' + translate(url.hostname) + url.path) : (translate(url.hostname) + ':' + (url.port || 443)) - } - else{ - options.hostname = translate(url.hostname) - options.port = url.port || ((url.protocol == 'https:') ? 443 : 80) - options.path = url.path - } - return options -} - -const request = (method, url, headers, body) => { - url = parse(url) - let options = configure(method, url, Object.assign({ - 'host': url.hostname, - 'accept': 'application/json, text/plain, */*', - 'accept-encoding': 'gzip, deflate', - 'accept-language': 'zh-CN,zh;q=0.9', - 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.181 Safari/537.36' - }, headers)) - - return new Promise((resolve, reject) => { - create(url)(options) - .on('response', response => resolve(response)) - .on('connect', (_, socket) => - https.request({ - method: method, - host: translate(url.hostname), - path: url.path, - headers: options._headers, - socket: socket, - agent: false - }) - .on('response', response => resolve(response)) - .on('error', error => reject(error)) - .end(body) - ) - .on('error', error => reject(error)) - .end(options.method.toUpperCase() === 'CONNECT' ? null : body) - }) - .then(response => { - if([201, 301, 302, 303, 307, 308].includes(response.statusCode)) - return request(method, url.resolve(response.headers.location), headers, body) - else - return Object.assign(response, {url: url, body: raw => read(response, raw), json: () => json(response), jsonp: () => jsonp(response)}) - }) -} - -const read = (connect, raw) => - new Promise((resolve, reject) => { - let chunks = [] - connect - .on('data', chunk => chunks.push(chunk)) - .on('end', () => resolve(Buffer.concat(chunks))) - .on('error', error => reject(error)) - }) - .then(buffer => { - buffer = (buffer.length && ['gzip', 'deflate'].includes(connect.headers['content-encoding'])) ? zlib.unzipSync(buffer) : buffer - return raw == true ? buffer : buffer.toString() - }) - -const json = connect => read(connect, false).then(body => JSON.parse(body)) -const jsonp = connect => read(connect, false).then(body => JSON.parse(body.slice(body.indexOf('(') + 1, -')'.length))) - -request.read = read -request.create = create -request.translate = translate -request.configure = configure - -module.exports = request \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.crt b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.crt deleted file mode 100644 index b58111aee..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDfTCCAmWgAwIBAgIJAKTlW9B59i1HMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV -BAYTAkNOMSQwIgYDVQQDDBtVbmJsb2NrTmV0ZWFzZU11c2ljIFJvb3QgQ0ExHTAb -BgNVBAoMFEdpdEh1Yi5jb20gQG5vbmRhbmVlMB4XDTE5MDUxODE2MDYxOFoXDTIw -MDUxNzE2MDYxOFowezELMAkGA1UEBhMCQ04xETAPBgNVBAcMCEhhbmd6aG91MSww -KgYDVQQKDCNOZXRFYXNlIChIYW5nemhvdSkgTmV0d29yayBDby4sIEx0ZDERMA8G -A1UECwwISVQgRGVwdC4xGDAWBgNVBAMMDyoubXVzaWMuMTYzLmNvbTCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBALobECypwEoe8VqM/FJvBRR3p2T+ZWdi -MSPrwfiRJr5p7OMtWBlLveCBV85+R3feidYbQTXlvVTdToY+GN6mFE1x6zG2dvLD -s4UuRnipmvGcFYhIRTX8J4AJiN8VMtW0TNXscRMudpz/FAVtsRrggRaThYg4f/rI -oAPMqKMsS4JoYhxs9ED6E6/tpj3XmSg1ekaXhgacYSYHeyxizZwoOFVCLH3TG5sF -sD6CYNnukYol8bR+VRpvHftIYss5Yz+DyyhYEAMJm1CfQo+xoGR3D0ozbT3hUnzm -fEoOhmSp3sALrFVE4iJSuajoh2/3xhmcyi3xZdWyq4F8hpb+URyaoW0CAwEAAaMt -MCswKQYDVR0RBCIwIIINbXVzaWMuMTYzLmNvbYIPKi5tdXNpYy4xNjMuY29tMA0G -CSqGSIb3DQEBCwUAA4IBAQB32SVz5jHUYv3ZG7SNF/LFJ904/LI8QlTe9R+Abb9z -bpXmQeo4pvNNOk3LgcTyuSIPQSHEFn32hk/MedB6Q2cKaGVKQq7Usne1jsV0JirG -wMx3PTcKPnX+XexRY8s6v6cNKSx5YlMQNFeH7p8MgKqdM/UX/dNCxT04X/ClmP1K -/rKqonXn4i3wmWprl7Q7Z1wqt0ygQRkNJKqdYKTu4oQcPON8/dRcseYdJzSoK2/G -H6cOJwKrRLzuUqQlphe6wyUsyTIbIJiFu1a1Gml6zB4lhLZhL89H2lYwdS8wWlc+ -M+wYi+XTM/ylNHEIoKsOe2nscnwi/hTfHJOPPchHbEuM ------END CERTIFICATE----- diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.js b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.js deleted file mode 100644 index 8c83fad5d..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.js +++ /dev/null @@ -1,189 +0,0 @@ -const fs = require('fs') -const net = require('net') -const path = require('path') -const parse = require('url').parse - -const hook = require('./hook') -const request = require('./request') - -const proxy = { - core: { - mitm: (req, res) => { - if(req.url == '/proxy.pac'){ - let url = parse('http://' + req.headers.host) - res.writeHead(200, {'Content-Type': 'application/x-ns-proxy-autoconfig'}) - res.end(` - function FindProxyForURL(url, host) { - if (${hook.target.host.map(host => (`host == '${host}'`)).join(' || ')}) { - return 'PROXY ${url.hostname}:${url.port || 80}' - } - return 'DIRECT' - } - `) - } - else{ - const ctx = {res, req} - Promise.resolve() - .then(() => proxy.protect(ctx)) - .then(() => proxy.authenticate(ctx)) - .then(() => hook.request.before(ctx)) - .then(() => proxy.filter(ctx)) - .then(() => proxy.log(ctx)) - .then(() => proxy.mitm.request(ctx)) - .then(() => hook.request.after(ctx)) - .then(() => proxy.mitm.response(ctx)) - .catch(() => proxy.mitm.close(ctx)) - } - }, - tunnel: (req, socket, head) => { - const ctx = {req, socket, head} - Promise.resolve() - .then(() => proxy.protect(ctx)) - .then(() => proxy.authenticate(ctx)) - .then(() => hook.connect.before(ctx)) - .then(() => proxy.filter(ctx)) - .then(() => proxy.log(ctx)) - .then(() => proxy.tunnel.connect(ctx)) - .then(() => proxy.tunnel.handshake(ctx)) - .then(() => proxy.tunnel.pipe(ctx)) - .catch(() => proxy.tunnel.close(ctx)) - } - }, - abort: (socket, from) => { - // console.log('call abort', from) - if(socket) socket.end() - if(socket && !socket.destroyed) socket.destroy() - }, - protect: ctx => { - const req = ctx.req - const res = ctx.res - const socket = ctx.socket - if(req) req.on('error', () => proxy.abort(req.socket, 'req')) - if(res) res.on('error', () => proxy.abort(res.socket, 'res')) - if(socket) socket.on('error', () => proxy.abort(socket, 'socket')) - }, - log: ctx => { - const mark = {close: '|', blank: '-', proxy: '>'}[ctx.decision] || '>' - if(ctx.socket) - console.log('TUNNEL', mark, ctx.req.url) - else - console.log('MITM', mark, parse(ctx.req.url).host, ctx.req.socket.encrypted ? '(ssl)' : '') - }, - authenticate: ctx => { - const req = ctx.req - const res = ctx.res - const socket = ctx.socket - let credential = Buffer.from((req.headers['proxy-authorization'] || '').split(/\s+/).pop() || '', 'base64').toString() - if('proxy-authorization' in req.headers) delete req.headers['proxy-authorization'] - if(server.authentication && credential != server.authentication && (socket || req.url.startsWith('http://'))){ - if(socket) - socket.write('HTTP/1.1 407 Proxy Auth Required\r\nProxy-Authenticate: Basic realm="realm"\r\n\r\n') - else - res.writeHead(407, {'proxy-authenticate': 'Basic realm="realm"'}) - return Promise.reject(ctx.error = 'authenticate') - } - }, - filter: ctx => { - const url = parse((ctx.socket ? 'https://' : '') + ctx.req.url) - const match = pattern => url.href.search(new RegExp(pattern, 'g')) != -1 - if(!(ctx.decision || ctx.req.local)){ - try{ - let allow = server.whitelist.some(match) - let deny = server.blacklist.some(match) - // console.log('allow', allow, 'deny', deny) - if(!allow && deny){ - return Promise.reject(ctx.error = 'filter') - } - } - catch(error){ - ctx.error = error - } - } - }, - mitm: { - request: ctx => new Promise((resolve, reject) => { - if(ctx.decision === 'close') return reject(ctx.error = ctx.decision) - const req = ctx.req - const url = parse(req.url) - const options = request.configure(req.method, url, req.headers) - ctx.proxyReq = request.create(url)(options) - .on('response', proxyRes => { - return resolve(ctx.proxyRes = proxyRes) - }) - .on('error', error => { - return reject(ctx.error = error) - }) - req.readable ? req.pipe(ctx.proxyReq) : ctx.proxyReq.end(req.body) - }), - response: ctx => { - const res = ctx.res - const proxyRes = ctx.proxyRes.on('error', () => proxy.abort(ctx.proxyRes.socket, 'proxyRes')) - res.writeHead(proxyRes.statusCode, proxyRes.headers) - proxyRes.readable ? proxyRes.pipe(res) : res.end(proxyRes.body) - }, - close: ctx => { - proxy.abort(ctx.res.socket, 'mitm') - } - }, - tunnel: { - connect: ctx => new Promise((resolve, reject) => { - if(ctx.decision === 'close') return reject(ctx.error = ctx.decision) - const req = ctx.req - const head = ctx.head - const url = parse('https://' + req.url) - if(global.proxy && !req.local){ - const options = request.configure(req.method, url, req.headers) - request.create(proxy)(options) - .on('connect', (_, proxySocket) => { - return resolve(ctx.proxySocket = proxySocket) - }) - .on('error', error => { - return reject(ctx.error = error) - }) - .end() - } - else{ - const proxySocket = net.connect(url.port || 443, request.translate(url.hostname)) - .on('connect', () => { - proxySocket.write(head) - return resolve(ctx.proxySocket = proxySocket) - }) - .on('error', error => { - return reject(ctx.error = error) - }) - } - }), - handshake: ctx => { - const req = ctx.req - const socket = ctx.socket - const message = `HTTP/${req.httpVersion} 200 Connection established\r\n\r\n` - socket.write(message) - }, - pipe: ctx => { - if(ctx.decision === 'blank') return Promise.reject(ctx.error = ctx.decision) - const socket = ctx.socket - const proxySocket = ctx.proxySocket.on('error', () => proxy.abort(ctx.proxySocket, 'proxySocket')) - socket.pipe(proxySocket) - proxySocket.pipe(socket) - }, - close: ctx => { - proxy.abort(ctx.socket, 'tunnel') - } - } -} - -const options = { - key: fs.readFileSync(path.join(__dirname, 'server.key')), - cert: fs.readFileSync(path.join(__dirname, 'server.crt')) -} - -const server = { - http: require('http').createServer().on('request', proxy.core.mitm).on('connect', proxy.core.tunnel), - https: require('https').createServer(options).on('request', proxy.core.mitm).on('connect', proxy.core.tunnel) -} - -server.whitelist = [] -server.blacklist = ['//127\.\d+\.\d+\.\d+', '//localhost'] -server.authentication = null - -module.exports = server \ No newline at end of file diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.key b/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.key deleted file mode 100644 index ce16c73ad..000000000 --- a/package/lean/luci-app-unblockmusic/root/usr/share/unblockmusic/server.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAuhsQLKnASh7xWoz8Um8FFHenZP5lZ2IxI+vB+JEmvmns4y1Y -GUu94IFXzn5Hd96J1htBNeW9VN1Ohj4Y3qYUTXHrMbZ28sOzhS5GeKma8ZwViEhF -NfwngAmI3xUy1bRM1exxEy52nP8UBW2xGuCBFpOFiDh/+sigA8yooyxLgmhiHGz0 -QPoTr+2mPdeZKDV6RpeGBpxhJgd7LGLNnCg4VUIsfdMbmwWwPoJg2e6RiiXxtH5V -Gm8d+0hiyzljP4PLKFgQAwmbUJ9Cj7GgZHcPSjNtPeFSfOZ8Sg6GZKnewAusVUTi -IlK5qOiHb/fGGZzKLfFl1bKrgXyGlv5RHJqhbQIDAQABAoIBAEmAvtalBMlBh1mY -LV/xcTQwPfDpeOtoILhrOOUPjxnNhD4FfrIe9BNjgmaQAXIadp4VjZ/X6PtHnOfw -RqpJNeOQhq/PvRMMsC59pF+rvQKH/wkgYhV8Ta2IFoLlQHqfB2nGRLKquzYumJ28 -QSK4YMOl6CtxBTrrWiemAUTRDdGm8tARiipJH1SEJrS6d/NoRoJx2vixFgD2eS6X -bjnhGjIzvX/w5FWjctqj+SFITP1UI62b6DyWsPOkoosKNteK+Ulz+K6ZFvOx7day -XgUoTcVpwCVr2dVGhJtOrbKPcl1jYCYHJAHwzUZND4x4yftm1mnnsi3bthYqbtHQ -vxLE9YECgYEA9hiZxwiVvLjSe1xT/D75HbB8S1XSnwzpMmqgzStguxCQ0Qg5yiLI -UKRDY8UZvEDV4i2bQGy7mk8lFvX1q2z7Q30+dtT9r2N9a6ujMk5RMfo2BZg/poI6 -yDWe2tKUg9cTwfgni4TutLOYkpz3VDPIQHs3k2mpNh7f+8X4RIybDqkCgYEAwZhp -uWMV38Bb0WytswHXL1dRuwBskKqALUBY61dtXkyBuocj8AuRRxfxfZpgJRrHFxDX -O9bQ2nxpVlwKsR6DJDUdxU3+kvwyPfseU5XUBey8WdkuAKD7cKZOHMhFVWccks0U -YJzykNrxB+rGTiwVKa0MOhipuJ7boerwwaN2SyUCgYBP9Ow5o4tq9q3EUNoksZ0k -zUuE+oxlCr/VlplKL9bM0HQMxlxoVWa59LTEfKyA4pvbUbAIfYtydlZ5oE5CdTUp -105tM4R88Jk2W1y5ooJ093OH29CKW/OXSvyi4hpIv592vRa0GOupoFRpBkDBhdWB -RcdnyMOmht+FIOwp8XkLiQKBgAUK3j4Y6ZnxXbLfvMp70soF4TgYs7s05a/IDEjc -9xlMrthX6sS22GrcocqeucBdqS/dnW2Ok9QNB4VbUl/4pnvL8mGQPYBAl2Jr5wdQ -ULxyxRkmAf+8MbBmdIRlZwDpdaIRO2Wk0OCbA0osgEvK9CYovrfIqqsHYDsgbnLs -ugkNAoGBAJok06BN05caPXXLQ2pMwI/7mjcZFjcOMxSloYi7LFkxlyvoTqReAeSa -yOb6W/7obS1X8ms/EAkqiyzJuPtNZJCW/nvV0iCoZ/NxLuyHnFaO344GBAweol+S -Jx0MY8KuDCyeGErc2xdz/yr3ld2PSTq71dhBluGyba2YX+peJ2Yv ------END RSA PRIVATE KEY-----