From 89b16611a01964c6f198077006aeb93fa42eda31 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 16 Jul 2020 20:48:22 +0800 Subject: [PATCH 1/5] luci-app-jd-dailybonus: add package --- CONTRIBUTED.md | 4 +- .../ctcgfw/luci-app-jd-dailybonus/Makefile | 67 + .../luasrc/controller/jd-dailybonus.lua | 82 + .../luasrc/model/cbi/jd-dailybonus/client.lua | 61 + .../luasrc/model/cbi/jd-dailybonus/log.lua | 20 + .../luasrc/model/cbi/jd-dailybonus/script.lua | 25 + .../view/jd-dailybonus/cookie_tools.htm | 21 + .../view/jd-dailybonus/update_service.htm | 304 +++ .../po/zh-cn/jd-dailybonus.po | 97 + .../luci-app-jd-dailybonus/relnotes.txt | 120 + .../root/etc/config/jd-dailybonus | 8 + .../root/etc/init.d/jd-dailybonus | 33 + .../root/etc/uci-defaults/luci-jd-dailybonus | 11 + .../usr/share/jd-dailybonus/JD_DailyBonus.js | 2215 +++++++++++++++++ .../root/usr/share/jd-dailybonus/newapp.sh | 178 ++ .../root/www/jd-dailybonus/JDCookie.crx | Bin 0 -> 20445 bytes .../root/www/jd-dailybonus/JDCookie.zip | Bin 0 -> 20296 bytes .../root/www/jd-dailybonus/jquery.min.js | 2 + package/ctcgfw/node-request/Makefile | 69 + 19 files changed, 3316 insertions(+), 1 deletion(-) create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/Makefile create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/script.lua create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/po/zh-cn/jd-dailybonus.po create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/relnotes.txt create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/root/etc/config/jd-dailybonus create mode 100755 package/ctcgfw/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/root/etc/uci-defaults/luci-jd-dailybonus create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/JD_DailyBonus.js create mode 100755 package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/root/www/jd-dailybonus/JDCookie.crx create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/root/www/jd-dailybonus/JDCookie.zip create mode 100644 package/ctcgfw/luci-app-jd-dailybonus/root/www/jd-dailybonus/jquery.min.js create mode 100644 package/ctcgfw/node-request/Makefile diff --git a/CONTRIBUTED.md b/CONTRIBUTED.md index e7dff56d8a..eae9be0650 100644 --- a/CONTRIBUTED.md +++ b/CONTRIBUTED.md @@ -50,7 +50,9 @@ MentoHUST source: [KyleRicardo/MentoHUST-OpenWrt-ipk](https://github.com/KyleRic scutclient source: [scutclient/scutclient](https://github.com/scutclient/scutclient).
luci-app-scutclient source: [scutclient/luci-app-scutclient](https://github.com/scutclient/luci-app-scutclient).
luci-theme-Butterfly-dark source: [Leo-Jo-My/luci-theme-Butterfly-dark](https://github.com/Leo-Jo-My/luci-theme-Butterfly-dark).
-luci-theme-argon-mod source: [Leo-Jo-My/luci-theme-argon-mod](https://github.com/Leo-Jo-My/luci-theme-argon-mod). +luci-theme-argon-mod source: [Leo-Jo-My/luci-theme-argon-mod](https://github.com/Leo-Jo-My/luci-theme-argon-mod).
+node-request source: [jerrykuku/node-request](https://github.com/jerrykuku/node-request).
+luci-app-jd-dailybonus source: [jerrykuku/luci-app-jd-dailybonus](https://github.com/jerrykuku/luci-app-jd-dailybonus). ## License ### Depending on their own License. diff --git a/package/ctcgfw/luci-app-jd-dailybonus/Makefile b/package/ctcgfw/luci-app-jd-dailybonus/Makefile new file mode 100644 index 0000000000..eb9953bfa4 --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/Makefile @@ -0,0 +1,67 @@ +# +# Copyright (C) 2008-2014 The LuCI Team +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk +PKG_NAME:=luci-app-jd-dailybonus +LUCI_PKGARCH:=all +PKG_VERSION:=0.8 +PKG_RELEASE:=20200715 + +include $(INCLUDE_DIR)/package.mk + +define Package/luci-app-jd-dailybonus + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=3. Applications + TITLE:=Luci for JD dailybonus Script + PKGARCH:=all + DEPENDS:=+node +node-request +coreutils +coreutils-nohup +wget +endef + +define Build/Prepare +endef + +define Build/Compile +endef + +define Package/luci-app-define Package/jd-dailybonus/conffiles + +endef + +define Package/luci-app-jd-dailybonus/install + $(INSTALL_DIR) $(1)/usr/lib/lua/luci + cp -pR ./luasrc/* $(1)/usr/lib/lua/luci + $(INSTALL_DIR) $(1)/ + cp -pR ./root/* $(1)/ + $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n + po2lmo ./po/zh-cn/jd-dailybonus.po $(1)/usr/lib/lua/luci/i18n/jd-dailybonus.zh-cn.lmo +endef + +define Package/luci-app-jd-dailybonus/postinst +#!/bin/sh +if [ -z "$${IPKG_INSTROOT}" ]; then + ( . /etc/uci-defaults/luci-jd-dailybonus ) && rm -f /etc/uci-defaults/luci-jd-dailybonus + rm -rf /tmp/luci-indexcache + rm -rf /tmp/luci-modulecache/* + chmod +x /etc/init.d/jd-dailybonus >/dev/null 2>&1 + chmod +x /usr/share/jd-dailybonus/newapp.sh >/dev/null 2>&1 + /etc/init.d/jd-dailybonus enable >/dev/null 2>&1 +fi +exit 0 +endef + +define Package/luci-app-jd-dailybonus/prerm +#!/bin/sh +if [ -z "$${IPKG_INSTROOT}" ]; then + /etc/init.d/jd-dailybonus disable + /etc/init.d/jd-dailybonus stop +fi +exit 0 +endef + +$(eval $(call BuildPackage,luci-app-jd-dailybonus)) + +# call BuildPackage - OpenWrt buildroot signature diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua new file mode 100644 index 0000000000..250a7f4a48 --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua @@ -0,0 +1,82 @@ +-- Copyright (C) 2020 jerrykuku +-- Licensed to the public under the GNU General Public License v3. +module("luci.controller.jd-dailybonus", package.seeall) +function index() + if not nixio.fs.access("/etc/config/jd-dailybonus") then + return + end + + entry({"admin", "services", "jd-dailybonus"}, alias("admin", "services", "jd-dailybonus", "client"), _("JD-DailyBonus"), 10).dependent = true -- 首页 + entry({"admin", "services", "jd-dailybonus", "client"}, cbi("jd-dailybonus/client"),_("Client"), 10).leaf = true -- 基本设置 + entry({"admin", "services", "jd-dailybonus", "log"},form("jd-dailybonus/log"),_("Log"), 30).leaf = true -- 日志页面 + entry({"admin", "services", "jd-dailybonus", "script"},form("jd-dailybonus/script"),_("Script"), 20).leaf = true -- 直接配置脚本 + entry({"admin", "services", "jd-dailybonus", "run"}, call("run")) -- 执行程序 + entry({"admin", "services", "jd-dailybonus", "update"}, call("update")) -- 执行更新 + entry({"admin", "services", "jd-dailybonus", "check_update"}, call("check_update")) -- 检查更新 +end + + +-- 执行程序 + +function run() + local e = {} + local uci = luci.model.uci.cursor() + local cookie = luci.http.formvalue("cookies") + local cookie2 = luci.http.formvalue("cookies2") + local auto_update = luci.http.formvalue("auto_update") + local auto_update_time = luci.http.formvalue("auto_update_time") + local auto_run = luci.http.formvalue("auto_run") + local auto_run_time = luci.http.formvalue("auto_run_time") + local stop = luci.http.formvalue("stop") + local serverchan = luci.http.formvalue("serverchan") + local failed = luci.http.formvalue("failed") + local name = "" + uci:foreach("vssr", "global", function(s) name = s[".name"] end) + + if cookie ~= " " then + uci:set("jd-dailybonus", '@global[0]', 'auto_update', auto_update) + uci:set("jd-dailybonus", '@global[0]', 'auto_update_time', auto_update_time) + uci:set("jd-dailybonus", '@global[0]', 'auto_run', auto_run) + uci:set("jd-dailybonus", '@global[0]', 'auto_run_time', auto_run_time) + uci:set("jd-dailybonus", '@global[0]', 'stop', stop) + uci:set("jd-dailybonus", '@global[0]', 'cookie', cookie) + uci:set("jd-dailybonus", '@global[0]', 'cookie2', cookie2) + uci:set("jd-dailybonus", '@global[0]', 'serverchan', serverchan) + uci:set("jd-dailybonus", '@global[0]', 'failed', failed) + uci:save("jd-dailybonus") + uci:commit("jd-dailybonus") + luci.sys.call("/usr/share/jd-dailybonus/newapp.sh -r") + luci.sys.call("/usr/share/jd-dailybonus/newapp.sh -a") + e.error = 0 + else + e.error = 1 + end + + luci.http.prepare_content("application/json") + luci.http.write_json(e) + +end + +--检查更新 +function check_update() + local jd = "jd-dailybonus" + local e = {} + local new_version = luci.sys.exec("/usr/share/jd-dailybonus/newapp.sh -n") + e.new_version = new_version + e.error = 0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) +end + +--执行更新 +function update() + local jd = "jd-dailybonus" + local e = {} + local uci = luci.model.uci.cursor() + local version = luci.http.formvalue("version") + --下载脚本 + local code = luci.sys.exec("/usr/share/jd-dailybonus/newapp.sh -u") + e.error = code + luci.http.prepare_content("application/json") + luci.http.write_json(e) +end \ No newline at end of file diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua new file mode 100644 index 0000000000..4385ae7102 --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua @@ -0,0 +1,61 @@ +local jd = "jd-dailybonus" +local uci = luci.model.uci.cursor() +local sys = require "luci.sys" + +m = Map(jd) +-- [[ 基本设置 ]]-- + +s = m:section(TypedSection, "global", + translate("Base Config")) +s.anonymous = true + +o = s:option(DummyValue, "", "") +o.rawhtml = true +o.template = "jd-dailybonus/cookie_tools" + +o = s:option(Value, "cookie", translate("First Cookie")) +o.rmempty = false + +o = s:option(Value, "cookie2", translate("Second Cookie")) +o.rmempty = true +o.description = translate('双账号用户抓取"账号1"Cookie后, 请勿点击退出账号(可能会导致Cookie失效), 需清除浏览器资料或更换浏览器登录"账号2"抓取.') + +o = s:option(Value, "stop", translate("Execute Delay")) +o.rmempty = false +o.default = 0 +o.datatype = integer +o.description = translate("自定义延迟签到,单位毫秒. 默认分批并发无延迟. (延迟作用于每个签到接口, 如填入延迟则切换顺序签到. ) ") + +o = s:option(Value, "serverchan", translate("ServerChan SCKEY")) +o.rmempty = true +o.description = translate("微信推送，基于Server酱服务，请自行登录 http://sc.ftqq.com/ 绑定并获取 SCKEY (仅在自动签到时推送)") + +o = s:option(Flag, "failed", translate("Failed Push")) +o.rmempty = false +o.description = translate("仅当cookie失效时推送") + +o = s:option(Flag, "auto_update", translate("Auto Update")) +o.rmempty = false +o.description = translate("Auto Update Script Service") + +o =s:option(ListValue, "auto_update_time", translate("Update time (every day)")) +for t = 0, 23 do o:value(t, t .. ":01") end +o.default = 1 +o.rmempty = true +o:depends("auto_update", "1") + +o = s:option(Flag, "auto_run", translate("Auto Run")) +o.rmempty = false +o.description = translate("Auto Run Script Service") + +o =s:option(ListValue, "auto_run_time", translate("Run time (every day)")) +for t = 0, 23 do o:value(t, t .. ":05") end +o.default = 1 +o.rmempty = true +o:depends("auto_run", "1") + +o = s:option(DummyValue, "", "") +o.rawhtml = true +o.version = sys.exec('uci get jd-dailybonus.@global[0].version') +o.template = "jd-dailybonus/update_service" +return m \ No newline at end of file diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua new file mode 100644 index 0000000000..5b5b921c14 --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua @@ -0,0 +1,20 @@ +local fs = require "nixio.fs" +local jd = "jd-dailybonus" +local conffile = "/www/JD_DailyBonus.htm" + +f = SimpleForm("logview") +m = Map(jd) +-- [[ 基本设置 ]]-- + +s = m:section(TypedSection, "global") +s.anonymous = true + +t = s:option(TextValue, "1", nil) +t.rmempty = true +t.rows = 30 +function t.cfgvalue() + return fs.readfile(conffile) or "" +end +t.readonly="readonly" + +return m \ No newline at end of file diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/script.lua b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/script.lua new file mode 100644 index 0000000000..68627cb2d7 --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/script.lua @@ -0,0 +1,25 @@ +local fs = require "nixio.fs" +local jd = "jd-dailybonus" +local uci = luci.model.uci.cursor() + +function sync_value_to_file(value, file) + value = value:gsub("\r\n?", "\n") + local old_value = nixio.fs.readfile(file) + if value ~= old_value then nixio.fs.writefile(file, value) end + +end + +s = SimpleForm("scriptview") + +view_cfg = s:field(TextValue, "conf") +view_cfg.rmempty = false +view_cfg.rows = 43 + +function view_cfg.cfgvalue() + return nixio.fs.readfile("/usr/share/jd-dailybonus/JD_DailyBonus.js") or "" +end +function view_cfg.write(self, section, value) + sync_value_to_file(value, "/usr/share/jd-dailybonus/JD_DailyBonus.js") +end + +return s diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm new file mode 100644 index 0000000000..48576833a1 --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm @@ -0,0 +1,21 @@ +<%+cbi/valueheader%> + + +
+ <%= translate("JDCookie.crx") %> <%= translate("JDCookie.zip") %> +
+ 帮助 + <%= translate("Click to Install copy cookie tools,And click the jd link below. if you can't install the crx extensions,please download the JDCookie.zip,unzip it,and use load Unpacked extensions to install.link:[chrome://extensions/]")%> +
+
+ + +
+ bean.m.jd.com +
+ 帮助 + <%= translate("Sign in ,then click JDCookie button.you will copy JD cookies, paste the cookie below.")%> +
+
+ +<%+cbi/valuefooter%> \ No newline at end of file diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm new file mode 100644 index 0000000000..26790dbbca --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm @@ -0,0 +1,304 @@ +<%+cbi/valueheader%> + + + +
+ "> +
+ +<%+cbi/valuefooter%> +<%+cbi/valueheader%> + +
+
+ v<%=self.version%> +
+ +
+<%+cbi/valuefooter%> + +<%+cbi/valueheader%> + +
+ "> + +
+<%+cbi/valuefooter%> + + diff --git a/package/ctcgfw/luci-app-jd-dailybonus/po/zh-cn/jd-dailybonus.po b/package/ctcgfw/luci-app-jd-dailybonus/po/zh-cn/jd-dailybonus.po new file mode 100644 index 0000000000..2f309b4d53 --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/po/zh-cn/jd-dailybonus.po @@ -0,0 +1,97 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8\n" + +msgid "JD-DailyBonus" +msgstr "京东签到服务" + +msgid "Enable" +msgstr "启用" + +msgid "Disable" +msgstr "停用" + +msgid "Log" +msgstr "日志" + +msgid "Script" +msgstr "脚本" + +msgid "Base Config" +msgstr "基本设置" + +msgid "Cookie Tools" +msgstr "Cookie 工具" + +msgid "First Cookie" +msgstr "主账号Cookie" + +msgid "Second Cookie" +msgstr "第二账号Cookie" + +msgid "Click to Install copy cookie tools,And click the jd link below. if you can't install the crx extensions,please download the JDCookie.zip,unzip it,and use load Unpacked extensions to install.link:[chrome://extensions/]" +msgstr "点击上面的按钮安装Cookie工具，然后点击下面的京东链接。如果浏览器禁止安装crx扩展，请下载第二个 JDCookie.zip，解压后在[chrome://extensions/]中使用加载已解压的扩展程序进行安装。 " + +msgid "JD Url" +msgstr "京东链接" + +msgid "Sign in ,then click JDCookie button.you will copy JD cookies, paste the cookie below." +msgstr "登录后点击JDCookie 扩展工具复制cookie，然后粘贴到下面输入框中。" + +msgid "Auto Update Script Service" +msgstr "自动更新脚本服务" + +msgid "Update time (every day)" +msgstr "更新时间 (每天)" + +msgid "Update Script" +msgstr "更新脚本" + +msgid "Execute Delay" +msgstr "延迟签到" + +msgid "ServerChan SCKEY" +msgstr "Server酱 SCKEY" + +msgid "Failed Push" +msgstr "失效时推送" + + +msgid "Auto Run" +msgstr "自动签到" + +msgid "Run" +msgstr "执行" + +msgid "Auto Run Script Service" +msgstr "自动签到服务" + +msgid "Run time (every day)" +msgstr "签到时间 (每天)" + +msgid "Save Cookies And Run Service" +msgstr "保存Cookie并签到" + +msgid "Sign in info" +msgstr "签到信息" + +msgid "Service is running,Please do not refresh!" +msgstr "服务正在执行中，请勿刷新！" + +msgid "Updating script,please wait ..." +msgstr "正在更新脚本，请稍候 ..." + +msgid "Is currently the latest version" +msgstr "当前已是最新版本。" + +msgid "There is a new version, click to update" +msgstr "有新的版本，请点击更新" + +msgid "Checking the New Version ..." +msgstr "正在检查是否存在新的版本 ..." + +msgid "Check Script Version" +msgstr "手动检查脚本更新" + +msgid "Current Script Version" +msgstr "当前脚本版本" + diff --git a/package/ctcgfw/luci-app-jd-dailybonus/relnotes.txt b/package/ctcgfw/luci-app-jd-dailybonus/relnotes.txt new file mode 100644 index 0000000000..8011b7715d --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/relnotes.txt @@ -0,0 +1,120 @@ +######################################################## +# +# RELEASE NOTES +# +######################################################## + +######################################################## +// +// 0.8 2020-07-15 +// +// +######################################################## + + +Updates + +- NEW: 增加了使用Server酱推送签到结果到微信的功能。 +- NEW: 增加了仅当cookie失效时进行微信推送的功能。 +- NEW: 增加了一个自定义延迟签到的选项，能够避免并发签到带来的负面影响。 +- UPDATE: 修正了在不勾选自动签到或者自动更新选项时，点击保存Cookie并签到无法执行的问题。 +- UPDATE: 代码精简与优化。 + +######################################################## +// +// 0.7.8 2020-07-13 +// +// +######################################################## + + +Updates + +- UPDATE: 修改了签到时间策略，将原来的固定时间修改为，设定时间后的180秒间随机执行（感谢kid424 提供方案）。 + +######################################################## +// +// 0.7.7 2020-07-10 +// 大幅修改，建议卸载后重新安装 +// +######################################################## + + +Updates + +- UPDATE: 对整个插件进行了重构，cookie更新机制做了修改。 +- UPDATE: 增加新的栏目，可以自行编辑脚本的cookie。 +- UPDATE: 增加每天定时开关，可从脚本作者源更新脚本。 +- UPDATE: 将当前的打开插件自动检测版本，修改为手动检查，检查到新版本可点击更新。 + +######################################################## +// +// 0.7.5 2020-06-25 +// 小幅修正 +// +######################################################## + + +Updates + +- BUGFIX: 使用wget取代curl 现在不需要curl依赖了 +- UPDATE: 增加 当前版本显示 + +######################################################## +// +// 0.7.4 2020-06-07 +// 小幅修正 +// +######################################################## + + +Updates + +- BUGFIX: 修正编译依赖 +- BUGFIX: 修正弹窗log无法自动关闭的bug + +######################################################## +// +// 0.7 2020-05-27 +// 小幅修正 +// +######################################################## + + +Updates + +- BUGFIX: 修正部分文字翻译错误 +- UPD: 改善log输出方式 +- UPD: 不再对脚本检测进行锁定，可以强制更新。 + +######################################################## +// +// 0.6 2020-05-09 +// 增加脚本在线版本检测和更新功能 +// +######################################################## + + +Updates + +- UPD: 增加脚本在线版本检测和更新功能 + +######################################################## +// +// 0.5 2020-05-06 +// bug修复 +// +######################################################## + + +Updates + +- UPD: 增加了一个cookie工具zip包，如果crx安装不上，可以解压zip包内容，加载已解压的扩展包。 +- UPD: 增加了第二个账号的cookie，可以实现双签到 +- UPD: 修复部分文字解释 + +########################################################== +// +// END RELEASE NOTES +// +########################################################== diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/etc/config/jd-dailybonus b/package/ctcgfw/luci-app-jd-dailybonus/root/etc/config/jd-dailybonus new file mode 100644 index 0000000000..970728451a --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/root/etc/config/jd-dailybonus @@ -0,0 +1,8 @@ +config global + option version '1.27' + option auto_run_time '1' + option auto_run '1' + option auto_update_time '1' + option auto_update '1' + option stop '0' + option failed '0' \ No newline at end of file diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus b/package/ctcgfw/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus new file mode 100755 index 0000000000..bb16fa803c --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus @@ -0,0 +1,33 @@ +#!/bin/sh /etc/rc.common +# +# Copyright (C) 2020 Jerryk +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# + +USE_PROCD=1 +START=25 + +NAME=jd-dailybonus +CRON_FILE=/etc/crontabs/root +JD_SCRIPT=/usr/share/jd-dailybonus/JD_DailyBonus.js + + + +del_cron() { + sed -i '/jd-dailybonus/d' $CRON_FILE + /etc/init.d/cron restart +} + +start_service(){ + /usr/share/jd-dailybonus/newapp.sh -s +} + +stop_service() { + del_cron +} + +service_triggers() { + procd_add_reload_trigger "jd-dailybonus" +} \ No newline at end of file diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/etc/uci-defaults/luci-jd-dailybonus b/package/ctcgfw/luci-app-jd-dailybonus/root/etc/uci-defaults/luci-jd-dailybonus new file mode 100644 index 0000000000..faf357268f --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/root/etc/uci-defaults/luci-jd-dailybonus @@ -0,0 +1,11 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@jd-dailybonus[-1] + add ucitrack jd-dailybonus + set ucitrack.@jd-dailybonus[-1].init=jd-dailybonus + commit ucitrack +EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/JD_DailyBonus.js b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/JD_DailyBonus.js new file mode 100644 index 0000000000..797795d5ab --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/JD_DailyBonus.js @@ -0,0 +1,2215 @@ +/************************* + +京东多合一签到脚本 + +更新时间: 2020.7.10 0:10 v1.27 +有效接口: 24+ +脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js +电报频道: @NobyDa +问题反馈: @NobyDa_bot +如果转载: 请注明出处 + +************************* +【 JSbox, Node.js 说明 】 : +************************* + +开启抓包app后, Safari浏览器登录 https://bean.m.jd.com 点击签到并且出现签到日历后, 返回抓包app搜索关键字 functionId=signBean 复制请求头Cookie填入以下Key处的单引号内即可 */ + +var Key = ''; //单引号内自行填写您抓取的Cookie + +var DualKey = ''; //如需双账号签到,此处单引号内填写抓取的"账号2"Cookie, 否则请勿填写 + +/* 注1: 以上选项仅针对于JsBox或Node.js, 如果使用QX,Surge,Loon, 请使用脚本获取Cookie. + 注2: 双账号用户抓取"账号1"Cookie后, 请勿点击退出账号(可能会导致Cookie失效), 需清除浏览器资料或更换浏览器登录"账号2"抓取. + 注3: 如果复制的Cookie开头为"Cookie: "请把它删除后填入. + 注4: 如果使用QX,Surge,Loon并获取Cookie后, 再重复填写以上选项, 则签到优先读取以上Cookie. + 注5: 如果使用Node.js, 需自行安装'request'模块. 例: npm install request -g + +************************* +【 QX, Surge, Loon 说明 】 : +************************* + +初次使用时, app配置文件添加脚本配置,并启用Mitm后, Safari浏览器打开登录 https://bean.m.jd.com ,点击签到并且出现签到日历后, 如果通知获得cookie成功, 则可以使用此签到脚本。 注: 请勿在京东APP内获取!!! + +由于cookie的有效性(经测试网页Cookie有效周期最长31天)，如果脚本后续弹出cookie无效的通知，则需要重复上述步骤。 +签到脚本将在每天的凌晨0:05执行, 您可以修改执行时间。 因部分接口京豆限量领取, 建议调整为凌晨签到。 + +************************* +【 配置双京东账号签到说明 】 : +************************* + +正确配置QX、Surge、Loon后, 并使用此脚本获取"账号1"Cookie成功后, 请勿点击退出账号(可能会导致Cookie失效), 需清除浏览器资料或更换浏览器登录"账号2"获取即可. + +注: 获取"账号1"或"账号2"的Cookie后, 后续仅可更新该"账号1"或"账号2"的Cookie. +如需写入其他账号,您可开启脚本内"DeleteCookie"选项以清除Cookie +************************* +【Surge 4.2+ 脚本配置】: +************************* + +[Script] +京东多合一签到 = type=cron,cronexp=5 0 * * *,wake-system=1,timeout=20,script-path=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js + +获取京东Cookie = type=http-request,pattern=https:\/\/api\.m\.jd\.com\/client\.action.*functionId=signBean,script-path=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js + +[MITM] +hostname = api.m.jd.com + +************************* +【Loon 2.1+ 脚本配置】: +************************* + +[Script] +cron "5 0 * * *" tag=京东多合一签到, script-path=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js + +http-request https:\/\/api\.m\.jd\.com\/client\.action.*functionId=signBean tag=获取京东Cookie, script-path=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js + +[MITM] +hostname = api.m.jd.com + +************************* +【 QX 1.0.5+ 脚本配置 】 : +************************* + +[task_local] +# 京东多合一签到 +# 注意此为本地路径, 请根据实际情况自行调整 +5 0 * * * JD_DailyBonus.js + +[rewrite_local] +# 获取京东Cookie. +# 注意此为本地路径, 请根据实际情况自行调整. +https:\/\/api\.m\.jd\.com\/client\.action.*functionId=signBean url script-request-header JD_DailyBonus.js + +[mitm] +hostname = api.m.jd.com + +*************************/ + +var LogDetails = false; //是否开启响应日志, true则开启 + +var stop = 0; //自定义延迟签到,单位毫秒. 默认分批并发无延迟. (延迟作用于每个签到接口, 如填入延迟则切换顺序签到. Surge用户请注意在UI界面调整脚本超时) 注: QX用户将强制使用顺序签到 (即默认stop=1) + +var DeleteCookie = false; //是否清除Cookie, true则开启 + +var out = 6000; //接口超时退出, 用于可能发生的网络不稳定. 建议不少于3000毫秒, 0则关闭. + +var $nobyda = nobyda(); + +let acData = { + // 京东商城-超市 + JDGStore: 'aNCM6yrzD6qp1Vvh5YTzeJtk7cM', + // 京东商城-宠物 + JDPet: '37ta5sh5ocrMZF3Fz5UMJbTsL42', + // 京东商城-图书 + JDBook: '3SC6rw5iBg66qrXPGmZMqFDwcyXi', + // 京东拍拍-二手 + JDShand: '3S28janPLYmtFxypu37AYAGgivfp', + // 京东商城-美妆 + JDMakeup: '2smCxzLNuam5L14zNJHYu43ovbAP', + // 京东商城-清洁 + JDClean: '2Tjm6ay1ZbZ3v7UbriTj6kHy9dn6', + // 京东商城-女装 + JDWomen: 'DpSh7ma8JV7QAxSE2gJNro8Q2h9', + // 京东商城-个护 + JDCare: 'NJ1kd1PJWhwvhtim73VPsD1HwY3', + // 京东商城-美食 + JDFood: '4PzvVmLSBq5K63oq4oxKcDtFtzJo', + // 京东商城-珠宝 + JDJewels: 'zHUHpTHNTaztSRfNBFNVZscyFZU', + // 京东商城-菜场 + JDVege: 'Wcu2LVCFMkBP3HraRvb7pgSpt64' +}; + +async function all() { + if (stop == 0) { + await Promise.all([ + JingDongSpeedUp(stop), //京东天天加速 + JingDongBean(stop), //京东京豆 + JingRongBean(stop), //金融京豆 + JingRongDoll(stop), //金融抓娃娃 + JingRongSteel(stop), //金融钢镚 + JingDongTurn(stop), //京东转盘 + JDFlashSale(stop), //京东闪购 + JDOverseas(stop), //京东国际 + JingDongCash(stop), //京东现金红包 + // JingRSeeAds(stop), //金融看广告 + // JingRongGame(stop), //金融游戏大厅 + // JDMagicCube(stop), //京东小魔方 + JingDongPrize(stop), //京东抽大奖 + JingDongSubsidy(stop), //京东金贴 + JingDongShake(stop) //京东摇一摇 + ]); + await Promise.all([ + JDUserSignPre(stop, 'JDVege', '京东商城-菜场'), //京东菜场 + JDUserSignPre(stop, 'JDFood', '京东商城-美食'), //京东美食馆 + JDUserSignPre(stop, 'JDClean', '京东商城-清洁'), //京东清洁馆 + JDUserSignPre(stop, 'JDCare', '京东商城-个护'), //京东个人护理馆 + JDUserSignPre(stop, 'JDJewels', '京东商城-珠宝'), //京东珠宝馆 + JDUserSignPre(stop, 'JDShand', '京东拍拍-二手') //京东拍拍二手 + ]); + await Promise.all([ + JDUserSignPre(stop, 'JDWomen', '京东商城-女装'), //京东女装馆 + JDUserSignPre(stop, 'JDGStore', '京东商城-超市'), //京东超市 + JDUserSignPre(stop, 'JDPet', '京东商城-宠物'), //京东宠物馆 + JDUserSignPre(stop, 'JDBook', '京东商城-图书'), //京东图书 + JDUserSignPre(stop, 'JDMakeup', '京东商城-美妆') //京东美妆馆 + ]); + } else { + await JingDongSpeedUp(stop); //京东天天加速 + await JingDongBean(stop); //京东京豆 + await JingRongBean(stop); //金融京豆 + await JingRongDoll(stop); //金融抓娃娃 + await JingRongSteel(stop); //金融钢镚 + await JingDongTurn(stop); //京东转盘 + await JDUserSignPre(stop, 'JDGStore', '京东商城-超市'); //京东超市 + await JDUserSignPre(stop, 'JDPet', '京东商城-宠物'); //京东宠物馆 + await JDFlashSale(stop); //京东闪购 + await JDOverseas(stop); //京东国际 + await JDUserSignPre(stop, 'JDBook', '京东商城-图书'); //京东图书 + await JDUserSignPre(stop, 'JDShand', '京东拍拍-二手'); //京东拍拍二手 + await JDUserSignPre(stop, 'JDMakeup', '京东商城-美妆'); //京东美妆馆 + await JDUserSignPre(stop, 'JDWomen', '京东商城-女装'); //京东女装馆 + await JDUserSignPre(stop, 'JDVege', '京东商城-菜场'); //京东菜场 + await JingDongCash(stop); //京东现金红包 + await JDUserSignPre(stop, 'JDFood', '京东商城-美食'); //京东美食馆 + // await JingRSeeAds(stop); //金融看广告 + // await JingRongGame(stop); //金融游戏大厅 + await JDUserSignPre(stop, 'JDClean', '京东商城-清洁'); //京东清洁馆 + await JDUserSignPre(stop, 'JDCare', '京东商城-个护'); //京东个人护理馆 + await JDUserSignPre(stop, 'JDJewels', '京东商城-珠宝'); //京东珠宝馆 + // await JDMagicCube(stop); //京东小魔方 + await JingDongPrize(stop); //京东抽大奖 + await JingDongSubsidy(stop); //京东金贴 + await JingDongShake(stop) //京东摇一摇 + } + await JRDoubleSign(stop); //金融双签 + await Promise.all([ + TotalSteel(), //总钢镚查询 + TotalCash(), //总红包查询 + TotalBean() //总京豆查询 + ]) + await notify(); //通知模块 +} + +function notify() { + return new Promise(resolve => { + try { + var bean = 0; + var steel = 0; + var success = 0; + var fail = 0; + var notify = ''; + for (var i in merge) { + bean += Number(merge[i].bean) + steel += Number(merge[i].steel) + success += Number(merge[i].success) + fail += Number(merge[i].fail) + notify += merge[i].notify ? "\n" + merge[i].notify : "" + } + var Cash = merge.JDCash.TCash ? merge.JDCash.TCash + "红包" : "" + var Steel = merge.JRSteel.TSteel ? merge.JRSteel.TSteel + "钢镚" + (Cash ? ", " : "") : "" + var beans = merge.JDShake.Qbear ? merge.JDShake.Qbear + "京豆" + (Steel || Cash ? ", " : "" ) : "" + var bsc = beans ? "\n" : Steel ? "\n" : Cash ? "\n" : "获取失败\n" + var Tbean = bean ? bean + "京豆" + (steel || merge.JDCash.Cash ? ", " : "") : "" + var TSteel = steel ? steel + "钢镚" + (merge.JDCash.Cash ? ", " : "") : "" + var TCash = merge.JDCash.Cash ? merge.JDCash.Cash + "红包" : "" + var Tbsc = Tbean ? "\n" : TSteel ? "\n" : TCash ? "\n" : "获取失败\n" + var Ts = success ? "成功" + success + "个" + (fail ? ", " : "") : "" + var Tf = fail ? "失败" + fail + "个" : success ? "" : "获取失败" + var one = "【签到概览】: " + Ts + Tf + "\n" + var two = "【签到总计】: " + Tbean + TSteel + TCash + Tbsc + var three = "【账号总计】: " + beans + Steel + Cash + bsc + var four = "【左滑 '查看' 以显示签到详情】\n" + var DName = merge.JDShake.nickname ? merge.JDShake.nickname : "获取失败" + var Name = add ? DualAccount ? "【签到号一】: " + DName + "\n" : "【签到号二】: " + DName + "\n" : "" + console.log("\n" + Name + one + two + three + four + notify) + if ($nobyda.isJSBox) { + if (add && DualAccount) { + Shortcut = Name + one + two + three + "\n" + } else if (!add && DualAccount) { + $intents.finish(Name + one + two + three + four + notify) + } else if (typeof Shortcut != "undefined") { + $intents.finish(Shortcut + Name + one + two + three) + } + } + if (!$nobyda.isNode) $nobyda.notify("", "", Name + one + two + three + four + notify); + if (DualAccount) { + double(); + } else { + $nobyda.time(); + $nobyda.done(); + } + resolve() + } catch (eor) { + $nobyda.notify("通知模块 " + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }); +} + +function ReadCookie() { + initial() + DualAccount = true; + if ($nobyda.isQuanX && stop === 0) stop = 1; + if (DeleteCookie) { + if ($nobyda.isJSBox) { + if ($file.exists("shared://JD_Cookie.txt")) { + if ($file.exists("shared://JD_Cookie2.txt")) { + $file.delete("shared://JD_Cookie2.txt") + } + $file.delete("shared://JD_Cookie.txt") + $nobyda.notify("京东Cookie清除成功 !", "", '请手动关闭脚本内"DeleteCookie"选项') + return + } + } else if ($nobyda.read("CookieJD")) { + $nobyda.write("", "CookieJD") + $nobyda.write("", "CookieJD2") + $nobyda.notify("京东Cookie清除成功 !", "", '请手动关闭脚本内"DeleteCookie"选项') + $nobyda.done() + return + } + $nobyda.notify("脚本终止", "", '未关闭脚本内"DeleteCookie"选项 ‼️') + $nobyda.done() + return + } else if ($nobyda.isRequest) { + GetCookie() + return + } + if ($nobyda.isJSBox) { + add = DualKey || $file.exists("shared://JD_Cookie2.txt") ? true : false + if (DualKey) { + $file.write({ + data: $data({ + string: DualKey + }), + path: "shared://JD_Cookie2.txt" + }) + } + if (Key) { + $file.write({ + data: $data({ + string: Key + }), + path: "shared://JD_Cookie.txt" + }) + KEY = Key + all() + } else if ($file.exists("shared://JD_Cookie.txt")) { + KEY = $file.read("shared://JD_Cookie.txt").string + all() + } else { + $nobyda.notify("京东签到", "", "脚本终止, 未填写Cookie ‼️") + } + } else if (Key || $nobyda.read("CookieJD")) { + add = DualKey || $nobyda.read("CookieJD2") ? true : false + KEY = Key ? Key : $nobyda.read("CookieJD") + all() + } else { + $nobyda.notify("京东签到", "", "脚本终止, 未获取Cookie ‼️") + $nobyda.done() + } +} + +function double() { + initial() + add = true + DualAccount = false + if ($nobyda.isJSBox) { + if (DualKey || $file.exists("shared://JD_Cookie2.txt")) { + KEY = DualKey ? DualKey : $file.read("shared://JD_Cookie2.txt").string + all() + } else { + $nobyda.time(); + } + } else if (DualKey || $nobyda.read("CookieJD2")) { + KEY = DualKey ? DualKey : $nobyda.read("CookieJD2") + all() + } else { + $nobyda.time(); + $nobyda.done(); + } +} + +function JingDongBean(s) { + return new Promise(resolve => { + setTimeout(() => { + const JDBUrl = { + url: 'https://api.m.jd.com/client.action?functionId=signBeanIndex&appid=ld', + headers: { + Cookie: KEY, + } + }; + $nobyda.get(JDBUrl, function(error, response, data) { + try { + if (error) { + merge.JDBean.notify = "京东商城-京豆: 签到接口请求失败 ‼️‼️" + merge.JDBean.fail = 1 + } else { + const cc = JSON.parse(data) + const Details = LogDetails ? "response:\n" + data : ''; + if (cc.code == 3) { + console.log("\n" + "京东商城-京豆Cookie失效 " + Details) + merge.JDBean.notify = "京东商城-京豆: 失败, 原因: Cookie失效‼️" + merge.JDBean.fail = 1 + } else { + if (data.match(/跳转至拼图/)) { + merge.JDBean.notify = "京东商城-京豆: 失败, 原因: 需要拼图验证 ⚠️" + merge.JDBean.fail = 1 + } else { + if (data.match(/\"status\":\"?1\"?/)) { + console.log("\n" + "京东商城-京豆签到成功 " + Details) + if (data.match(/dailyAward/)) { + merge.JDBean.notify = "京东商城-京豆: 成功, 明细: " + cc.data.dailyAward.beanAward.beanCount + "京豆 🐶" + merge.JDBean.bean = cc.data.dailyAward.beanAward.beanCount + merge.JDBean.success = 1 + } else { + if (data.match(/continuityAward/)) { + merge.JDBean.notify = "京东商城-京豆: 成功, 明细: " + cc.data.continuityAward.beanAward.beanCount + "京豆 🐶" + merge.JDBean.bean = cc.data.continuityAward.beanAward.beanCount + merge.JDBean.success = 1 + } else { + if (data.match(/新人签到/)) { + const regex = /beanCount\":\"(\d+)\".+今天/; + const quantity = regex.exec(data)[1]; + merge.JDBean.notify = "京东商城-京豆: 成功, 明细: " + quantity + "京豆 🐶" + merge.JDBean.bean = quantity + merge.JDBean.success = 1 + } else { + merge.JDBean.notify = "京东商城-京豆: 失败, 原因: 未知 ⚠️" + merge.JDBean.fail = 1 + } + } + } + } else { + console.log("\n" + "京东商城-京豆签到失败 " + Details) + if (data.match(/(已签到|新人签到)/)) { + merge.JDBean.notify = "京东商城-京豆: 失败, 原因: 已签过 ⚠️" + merge.JDBean.fail = 1 + } else { + merge.JDBean.notify = "京东商城-京豆: 失败, 原因: 未知 ⚠️" + merge.JDBean.fail = 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东商城-京豆" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingDongTurn(s) { + return new Promise(resolve => { + setTimeout(() => { + const JDTUrl = { + url: 'https://api.m.jd.com/client.action?functionId=lotteryDraw&body=%7B%22actId%22%3A%22jgpqtzjhvaoym%22%2C%22appSource%22%3A%22jdhome%22%2C%22lotteryCode%22%3A%224wwzdq7wkqx2usx4g5i2nu5ho4auto4qxylblkxacm7jqdsltsepmgpn3b2hgyd7hiawzpccizuck%22%7D&appid=ld', + headers: { + Cookie: KEY, + } + }; + $nobyda.get(JDTUrl, async function(error, response, data) { + try { + if (error) { + merge.JDTurn.notify += merge.JDTurn.notify ? "\n京东商城-转盘: 签到接口请求失败 ‼️‼️ (多次)" : "京东商城-转盘: 签到接口请求失败 ‼️‼️" + merge.JDTurn.fail += 1 + } else { + const cc = JSON.parse(data) + const Details = LogDetails ? "response:\n" + data : ''; + if (cc.code == 3) { + console.log("\n" + "京东转盘Cookie失效 " + Details) + merge.JDTurn.notify = "京东商城-转盘: 失败, 原因: Cookie失效‼️" + merge.JDTurn.fail = 1 + } else { + if (data.match(/(\"T216\"|活动结束)/)) { + merge.JDTurn.notify = "京东商城-转盘: 失败, 原因: 活动结束 ⚠️" + merge.JDTurn.fail = 1 + } else { + if (data.match(/(京豆|\"910582\")/)) { + console.log("\n" + "京东商城-转盘签到成功 " + Details) + merge.JDTurn.notify += merge.JDTurn.notify ? "\n京东商城-转盘: 成功, 明细: " + cc.data.prizeSendNumber + "京豆 🐶 (多次)" : "京东商城-转盘: 成功, 明细: " + cc.data.prizeSendNumber + "京豆 🐶" + merge.JDTurn.success += 1 + merge.JDTurn.bean += Number(cc.data.prizeSendNumber) + if (cc.data.chances != "0") { + await JingDongTurn(2000) + } + } else { + console.log("\n" + "京东商城-转盘签到失败 " + Details) + if (data.match(/未中奖/)) { + merge.JDTurn.notify += merge.JDTurn.notify ? "\n京东商城-转盘: 成功, 状态: 未中奖 🐶 (多次)" : "京东商城-转盘: 成功, 状态: 未中奖 🐶" + merge.JDTurn.success += 1 + if (cc.data.chances != "0") { + await JingDongTurn(2000) + } + } else if (data.match(/(T215|次数为0)/)) { + merge.JDTurn.notify = "京东商城-转盘: 失败, 原因: 已转过 ⚠️" + merge.JDTurn.fail = 1 + } else if (data.match(/(T210|密码)/)) { + merge.JDTurn.notify = "京东商城-转盘: 失败, 原因: 无支付密码 ⚠️" + merge.JDTurn.fail = 1 + } else { + merge.JDTurn.notify += merge.JDTurn.notify ? "\n京东商城-转盘: 失败, 原因: 未知 ⚠️ (多次)" : "京东商城-转盘: 失败, 原因: 未知 ⚠️" + merge.JDTurn.fail += 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东商城-转盘" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingRongBean(s) { + return new Promise(resolve => { + setTimeout(() => { + const login = { + url: 'https://ms.jr.jd.com/gw/generic/zc/h5/m/signRecords', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + Referer: "https://jddx.jd.com/m/money/index.html?from=sign", + }, + body: "reqData=%7B%22bizLine%22%3A2%7D" + }; + $nobyda.post(login, async function(error, response, data) { + try { + if (error) { + merge.JRBean.notify = "京东金融-京豆: 登录接口请求失败 ‼️‼️" + merge.JRBean.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/\"login\":true/)) { + console.log("\n" + "京东金融-京豆登录成功 " + Details) + await JRBeanCheckin(200) + } else { + console.log("\n" + "京东金融-京豆登录失败 " + Details) + if (data.match(/\"login\":false/)) { + merge.JRBean.notify = "京东金融-京豆: 失败, 原因: Cookie失效‼️" + merge.JRBean.fail = 1 + } else { + merge.JRBean.notify = "京东金融-京豆: 登录接口需修正 ‼️‼️" + merge.JRBean.fail = 1 + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东金融-京豆登录" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JRBeanCheckin(s) { + return new Promise(resolve => { + setTimeout(() => { + const JRBUrl = { + url: 'https://ms.jr.jd.com/gw/generic/zc/h5/m/signRewardGift', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + Referer: "https://jddx.jd.com/m/jddnew/money/index.html", + }, + body: "reqData=%7B%22bizLine%22%3A2%2C%22signDate%22%3A%221%22%2C%22deviceInfo%22%3A%7B%22os%22%3A%22iOS%22%7D%2C%22clientType%22%3A%22sms%22%2C%22clientVersion%22%3A%2211.0%22%7D" + }; + $nobyda.post(JRBUrl, function(error, response, data) { + try { + if (error) { + merge.JRBean.notify = "京东金融-京豆: 签到接口请求失败 ‼️‼️" + merge.JRBean.fail = 1 + } else { + const c = JSON.parse(data) + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/\"resultCode\":\"00000\"/)) { + console.log("\n" + "京东金融-京豆签到成功 " + Details) + if (c.resultData.data.rewardAmount != "0") { + merge.JRBean.notify = "京东金融-京豆: 成功, 明细: " + c.resultData.data.rewardAmount + "京豆 🐶" + merge.JRBean.success = 1 + merge.JRBean.bean = c.resultData.data.rewardAmount + } else { + merge.JRBean.notify = "京东金融-京豆: 成功, 明细: 无奖励 🐶" + merge.JRBean.success = 1 + } + } else { + console.log("\n" + "京东金融-京豆签到失败 " + Details) + if (data.match(/(发放失败|70111)/)) { + merge.JRBean.notify = "京东金融-京豆: 失败, 原因: 已签过 ⚠️" + merge.JRBean.fail = 1 + } else { + if (data.match(/(\"resultCode\":3|请先登录)/)) { + merge.JRBean.notify = "京东金融-京豆: 失败, 原因: Cookie失效‼️" + merge.JRBean.fail = 1 + } else { + merge.JRBean.notify = "京东金融-京豆: 失败, 原因: 未知 ⚠️" + merge.JRBean.fail = 1 + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东金融-京豆" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingRongSteel(s) { + return new Promise(resolve => { + setTimeout(() => { + const JRSUrl = { + url: 'https://ms.jr.jd.com/gw/generic/gry/h5/m/signIn', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "reqData=%7B%22channelSource%22%3A%22JRAPP%22%2C%22riskDeviceParam%22%3A%22%7B%7D%22%7D" + }; + $nobyda.post(JRSUrl, function(error, response, data) { + try { + if (error) { + merge.JRSteel.notify = "京东金融-钢镚: 签到接口请求失败 ‼️‼️" + merge.JRSteel.fail = 1 + } else { + const cc = JSON.parse(data) + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/\"resBusiCode\":0/)) { + console.log("\n" + "京东金融-钢镚签到成功 " + Details) + const leng = "" + cc.resultData.resBusiData.actualTotalRewardsValue + if (leng.length == 1) { + merge.JRSteel.notify = "京东金融-钢镚: 成功, 明细: " + "0.0" + cc.resultData.resBusiData.actualTotalRewardsValue + "钢镚 💰" + merge.JRSteel.success = 1 + merge.JRSteel.steel = "0.0" + cc.resultData.resBusiData.actualTotalRewardsValue + } else { + merge.JRSteel.notify = "京东金融-钢镚: 成功, 明细: " + "0." + cc.resultData.resBusiData.actualTotalRewardsValue + "钢镚 💰" + merge.JRSteel.success = 1 + merge.JRSteel.steel = "0." + cc.resultData.resBusiData.actualTotalRewardsValue + } + } else { + console.log("\n" + "京东金融-钢镚签到失败 " + Details) + if (data.match(/(已经领取|\"resBusiCode\":15)/)) { + merge.JRSteel.notify = "京东金融-钢镚: 失败, 原因: 已签过 ⚠️" + merge.JRSteel.fail = 1 + } else { + if (data.match(/未实名/)) { + merge.JRSteel.notify = "京东金融-钢镚: 失败, 原因: 账号未实名 ⚠️" + merge.JRSteel.fail = 1 + } else { + if (data.match(/(\"resultCode\":3|请先登录)/)) { + merge.JRSteel.notify = "京东金融-钢镚: 失败, 原因: Cookie失效‼️" + merge.JRSteel.fail = 1 + } else { + merge.JRSteel.notify = "京东金融-钢镚: 失败, 原因: 未知 ⚠️" + merge.JRSteel.fail = 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东金融-钢镚" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JRDoubleSign(s) { + return new Promise(resolve => { + setTimeout(() => { + const JRDSUrl = { + url: 'https://nu.jr.jd.com/gw/generic/jrm/h5/m/process?', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "reqData=%7B%22actCode%22%3A%22FBBFEC496C%22%2C%22type%22%3A3%2C%22riskDeviceParam%22%3A%22%22%7D" + }; + $nobyda.post(JRDSUrl, function(error, response, data) { + try { + if (error) { + merge.JRDSign.notify = "京东金融-双签: 签到接口请求失败 ‼️‼️" + merge.JRDSign.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/\"resultCode\":0/)) { + if (data.match(/\"count\":\d+/)) { + console.log("\n" + "京东金融-双签签到成功 " + Details) + merge.JRDSign.bean = data.match(/\"count\":(\d+)/)[1] + merge.JRDSign.notify = "京东金融-双签: 成功, 明细: " + merge.JRDSign.bean + "京豆 🐶" + merge.JRDSign.success = 1 + } else { + console.log("\n" + "京东金融-双签签到失败 " + Details) + merge.JRDSign.fail = 1 + if (data.match(/已领取/)) { + merge.JRDSign.notify = "京东金融-双签: 失败, 原因: 已签过 ⚠️" + } else if (data.match(/未在/)) { + merge.JRDSign.notify = "京东金融-双签: 失败, 原因: 未在京东签到 ⚠️" + } else { + merge.JRDSign.notify = "京东金融-双签: 失败, 原因: 无奖励 🐶" + } + } + } else { + console.log("\n" + "京东金融-双签签到失败 " + Details) + merge.JRDSign.fail = 1 + if (data.match(/(\"resultCode\":3|请先登录)/)) { + merge.JRDSign.notify = "京东金融-双签: 失败, 原因: Cookie失效‼️" + } else { + merge.JRDSign.notify = "京东金融-双签: 失败, 原因: 未知 ⚠️" + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东金融-双签" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingDongShake(s) { + return new Promise(resolve => { + setTimeout(() => { + const JDSh = { + url: 'https://api.m.jd.com/client.action?appid=vip_h5&functionId=vvipclub_shaking', + headers: { + Cookie: KEY, + } + }; + $nobyda.get(JDSh, async function(error, response, data) { + try { + if (error) { + merge.JDShake.notify += merge.JDShake.notify ? "\n京东商城-摇摇: 签到接口请求失败 ‼️‼️ (多次)\n" + error : "京东商城-摇摇: 签到接口请求失败 ‼️‼️\n" + error + merge.JDShake.fail += 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + const cc = JSON.parse(data) + if (data.match(/prize/)) { + console.log("\n" + "京东商城-摇一摇签到成功 " + Details) + if (cc.data.prizeBean) { + merge.JDShake.notify += merge.JDShake.notify ? "\n京东商城-摇摇: 成功, 明细: " + cc.data.prizeBean.count + "京豆 🐶 (多次)" : "京东商城-摇摇: 成功, 明细: " + cc.data.prizeBean.count + "京豆 🐶" + merge.JDShake.bean += cc.data.prizeBean.count + merge.JDShake.success += 1 + } else { + if (cc.data.prizeCoupon) { + merge.JDShake.notify += merge.JDShake.notify ? "\n京东商城-摇摇(多次): 获得满" + cc.data.prizeCoupon.quota + "减" + cc.data.prizeCoupon.discount + "优惠券→ " + cc.data.prizeCoupon.limitStr : "京东商城-摇摇: 获得满" + cc.data.prizeCoupon.quota + "减" + cc.data.prizeCoupon.discount + "优惠券→ " + cc.data.prizeCoupon.limitStr + merge.JDShake.success += 1 + } else { + merge.JDShake.notify += merge.JDShake.notify ? "\n京东商城-摇摇: 失败, 原因: 未知 ⚠️ (多次)" : "京东商城-摇摇: 失败, 原因: 未知 ⚠️" + merge.JDShake.fail += 1 + } + } + if (cc.data.luckyBox.freeTimes != 0) { + await JingDongShake(s) + } + } else { + console.log("\n" + "京东商城-摇一摇签到失败 " + Details) + if (data.match(/true/)) { + merge.JDShake.notify += merge.JDShake.notify ? "\n京东商城-摇摇: 成功, 明细: 无奖励 🐶 (多次)" : "京东商城-摇摇: 成功, 明细: 无奖励 🐶" + merge.JDShake.success += 1 + if (cc.data.luckyBox.freeTimes != 0) { + await JingDongShake(s) + } + } else { + if (data.match(/(无免费|8000005|9000005)/)) { + merge.JDShake.notify = "京东商城-摇摇: 失败, 原因: 已摇过 ⚠️" + merge.JDShake.fail = 1 + } else if (data.match(/(未登录|101)/)) { + merge.JDShake.notify = "京东商城-摇摇: 失败, 原因: Cookie失效‼️" + merge.JDShake.fail = 1 + } else { + merge.JDShake.notify += merge.JDShake.notify ? "\n京东商城-摇摇: 失败, 原因: 未知 ⚠️ (多次)" : "京东商城-摇摇: 失败, 原因: 未知 ⚠️" + merge.JDShake.fail += 1 + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东商城-摇摇" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JDUserSignPre(s, key, title) { + if ($nobyda.isNode) { + return JDUserSignPre1(s, key, title); + } else if (key == 'JDWomen' || key == 'JDJewels'|| $nobyda.isJSBox) { + return JDUserSignPre2(s, key, title); + } else { + return JDUserSignPre1(s, key, title); + } +} + +function JDUserSignPre1(s, key, title) { + return new Promise((resolve, reject) => { + //setTimeout(() => { + const JDUrl = { + url: 'https://api.m.jd.com/?client=wh5&functionId=qryH5BabelFloors', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: `body={"activityId":"${acData[key]}"}` + }; + $nobyda.post(JDUrl, function(error, response, data) { + try { + if (error) { + merge[key].notify = `${title}: 签到活动获取失败 ‼️‼️` + merge[key].fail = 1 + } else { + if (data.match(/enActK/)) { // 含有签到活动数据 + const od = JSON.parse(data); + let params = (od.floatLayerList || []).filter(o=>o.params && o.params.match(/enActK/)).map(o=>o.params).pop(); + if(!params){ // 第一处找到签到所需数据 + // floatLayerList未找到签到所需数据，从floorList中查找 + let signInfo = (od.floorList || []).filter(o=>o.template=='signIn' && o.signInfos && o.signInfos.params && o.signInfos.params.match(/enActK/)) + .map(o=>o.signInfos).pop(); + if(signInfo){ + if(signInfo.signStat=='1'){ + merge[key].notify = `${title}: 失败, 原因: 已签过 ⚠️` + merge[key].fail = 1 + reject(); + return; + } else { + params = signInfo.params; + } + } + } + if(params){ + resolve({params: params}); // 执行签到处理 + return; + } + } + merge[key].notify = `${title}: 失败, 原因: 不含活动数据 ⚠️` + merge[key].fail = 1 + } + reject() + } catch (eor) { + $nobyda.notify(`${title}${eor.name} ‼️`, JSON.stringify(eor), eor.message) + reject() + } + }) + //}, s) + if (out) setTimeout(reject, out + s) + }).then(data=>{ + return JDUserSign(s, key, title, encodeURIComponent(JSON.stringify(data))); + },()=>{}); +} + +function JDUserSignPre2(s, key, title) { + return new Promise((resolve, reject) => { + //setTimeout(() => { + const JDUrl = { + url: `https://pro.m.jd.com/mall/active/${acData[key]}/index.html`, + headers: { + Cookie: KEY, + } + }; + $nobyda.get(JDUrl, function(error, response, data) { + try { + if (error) { + merge[key].notify = `${title}: 签到活动获取失败 ‼️‼️` + merge[key].fail = 1 + } else { + if (data.match(/"params":"{\\"enActK\\".*?\\"}"/)) { // 含有签到活动数据 + resolve(`{${data.match(/"params":"{\\"enActK\\".*?\\"}"/)}}`); // 执行签到处理 + return; + } + merge[key].notify = `${title}: 失败, 原因: 不含活动数据 ⚠️` + merge[key].fail = 1 + } + reject() + } catch (eor) { + $nobyda.notify(`${title}${eor.name} ‼️`, JSON.stringify(eor), eor.message) + reject() + } + }) + //}, s) + if (out) setTimeout(reject, out + s) + }).then(data=>{ + return JDUserSign(s, key, title, encodeURIComponent(data)); + },()=>{}); +} + +function JDUserSign(s, key, title, body) { + return new Promise(resolve => { + setTimeout(() => { + const JDUrl = { + url: 'https://api.m.jd.com/client.action?functionId=userSign', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: `body=${body}&client=wh5` + }; + $nobyda.post(JDUrl, function(error, response, data) { + try { + if (error) { + merge[key].notify = `${title}: 签到接口请求失败 ‼️‼️` + merge[key].fail = 1 + } else { + const Details = LogDetails ? `response:\n${data}` : ''; + const cc = JSON.parse(data) + if (data.match(/签到成功/)) { + console.log(`\n${title}签到成功${Details}`) + if (data.match(/(\"text\":\"\d+京豆\")/)) { + let beanQuantity = cc.awardList[0].text.match(/\d+/) + merge[key].notify = `${title}: 成功, 明细: ${beanQuantity}京豆 🐶` + merge[key].bean = beanQuantity + merge[key].success = 1 + } else { + merge[key].notify = `${title}: 成功, 明细: 无京豆 🐶` + merge[key].success = 1 + } + } else { + console.log(`\n${title}签到失败 ${Details}`) + if (data.match(/(已签到|已领取)/)) { + merge[key].notify = `${title}: 失败, 原因: 已签过 ⚠️` + merge[key].fail = 1 + } else { + if (data.match(/(不存在|已结束|未开始)/)) { + merge[key].notify = `${title}: 失败, 原因: 活动已结束 ⚠️` + merge[key].fail = 1 + } else { + if (cc.code == 3) { + merge[key].notify = `${title}: 失败, 原因: Cookie失效‼️` + merge[key].fail = 1 + } else { + merge[key].notify = `${title}: 失败, 原因: 未知 ⚠️` + merge[key].fail = 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify(`${title}${eor.name} ‼️`, JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JDFlashSale(s) { + return new Promise(resolve => { + setTimeout(() => { + const JDPETUrl = { + url: 'https://api.m.jd.com/client.action?functionId=partitionJdSgin', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "body=%7B%7D&client=apple&clientVersion=8.4.6&openudid=1fce88cd05c42fe2b054e846f11bdf33f016d676&sign=141ab5f9af92126bb46d50f3e8af758a&st=1579305780511&sv=102" + }; + $nobyda.post(JDPETUrl, async function(error, response, data) { + try { + if (error) { + merge.JDFSale.notify = "京东商城-闪购: 签到接口请求失败 ‼️‼️" + merge.JDFSale.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + const cc = JSON.parse(data) + if (cc.result.code == 0) { + console.log("\n" + "京东商城-闪购签到成功 " + Details) + if (data.match(/(\"count\":\d+)/)) { + merge.JDFSale.notify = "京东商城-闪购: 成功, 明细: " + cc.result.count + "京豆 🐶" + merge.JDFSale.bean = cc.result.count + merge.JDFSale.success = 1 + } else { + merge.JDFSale.notify = "京东商城-闪购: 成功, 明细: 无京豆 🐶" + merge.JDFSale.success = 1 + } + } else { + console.log("\n" + "京东商城-闪购签到失败 " + Details) + if (data.match(/(已签到|已领取|\"2005\")/)) { + merge.JDFSale.notify = "京东商城-闪购: 失败, 原因: 已签过 ⚠️" + merge.JDFSale.fail = 1 + } else { + if (data.match(/(不存在|已结束|\"2008\")/)) { + //merge.JDFSale.notify = "京东商城-闪购: 失败, 原因: 需瓜分 ⚠️" + //merge.JDFSale.fail = 1 + await FlashSaleDivide(s) + } else { + if (data.match(/(\"code\":\"3\"|\"1003\")/)) { + merge.JDFSale.notify = "京东商城-闪购: 失败, 原因: Cookie失效‼️" + merge.JDFSale.fail = 1 + } else { + merge.JDFSale.notify = "京东商城-闪购: 失败, 原因: 未知 ⚠️" + merge.JDFSale.fail = 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东商城-闪购" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function FlashSaleDivide(s) { + return new Promise(resolve => { + setTimeout(() => { + const Url = { + url: 'https://api.m.jd.com/client.action?functionId=partitionJdShare', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "body=%7B%7D&client=apple&clientVersion=8.5.0&d_brand=apple&openudid=1fce88cd05c42fe2b054e846f11bdf33f016d676&sign=958ba0e805094b4b0f6216e86190ab51&st=1582042405636&sv=120&wifiBssid=unknown" + }; + $nobyda.post(Url, function(error, response, data) { + try { + if (error) { + merge.JDFSale.notify = "京东闪购-瓜分: 签到接口请求失败 ‼️‼️" + merge.JDFSale.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + const cc = JSON.parse(data) + if (cc.result.code == 0) { + console.log("\n" + "京东闪购-瓜分签到成功 " + Details) + if (data.match(/(\"jdBeanNum\":\d+)/)) { + merge.JDFSale.notify = "京东闪购-瓜分: 成功, 明细: " + cc.result.jdBeanNum + "京豆 🐶" + merge.JDFSale.bean = cc.result.jdBeanNum + merge.JDFSale.success = 1 + } else { + merge.JDFSale.notify = "京东闪购-瓜分: 成功, 明细: 无京豆 🐶" + merge.JDFSale.success = 1 + } + } else { + console.log("\n" + "京东闪购-瓜分签到失败 " + Details) + if (data.match(/(已参与|已领取|\"2006\")/)) { + merge.JDFSale.notify = "京东闪购-瓜分: 失败, 原因: 已瓜分 ⚠️" + merge.JDFSale.fail = 1 + } else { + if (data.match(/(不存在|已结束|未开始|\"2008\")/)) { + merge.JDFSale.notify = "京东闪购-瓜分: 失败, 原因: 活动已结束 ⚠️" + merge.JDFSale.fail = 1 + } else { + if (data.match(/(\"code\":\"1003\"|未获取)/)) { + merge.JDFSale.notify = "京东闪购-瓜分: 失败, 原因: Cookie失效‼️" + merge.JDFSale.fail = 1 + } else { + merge.JDFSale.notify = "京东闪购-瓜分: 失败, 原因: 未知 ⚠️" + merge.JDFSale.fail = 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东闪购-瓜分" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingDongCash(s) { + return new Promise(resolve => { + setTimeout(() => { + const JDCAUrl = { + url: 'https://api.m.jd.com/client.action?functionId=ccSignInNew', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "body=%7B%22pageClickKey%22%3A%22CouponCenter%22%2C%22eid%22%3A%22O5X6JYMZTXIEX4VBCBWEM5PTIZV6HXH7M3AI75EABM5GBZYVQKRGQJ5A2PPO5PSELSRMI72SYF4KTCB4NIU6AZQ3O6C3J7ZVEP3RVDFEBKVN2RER2GTQ%22%2C%22shshshfpb%22%3A%22v1%5C%2FzMYRjEWKgYe%2BUiNwEvaVlrHBQGVwqLx4CsS9PH1s0s0Vs9AWk%2B7vr9KSHh3BQd5NTukznDTZnd75xHzonHnw%3D%3D%22%2C%22childActivityUrl%22%3A%22openapp.jdmobile%253a%252f%252fvirtual%253fparams%253d%257b%255c%2522category%255c%2522%253a%255c%2522jump%255c%2522%252c%255c%2522des%255c%2522%253a%255c%2522couponCenter%255c%2522%257d%22%2C%22monitorSource%22%3A%22cc_sign_ios_index_config%22%7D&client=apple&clientVersion=8.5.0&d_brand=apple&d_model=iPhone8%2C2&openudid=1fce88cd05c42fe2b054e846f11bdf33f016d676&scope=11&screen=1242%2A2208&sign=1cce8f76d53fc6093b45a466e93044da&st=1581084035269&sv=102" + }; + $nobyda.post(JDCAUrl, function(error, response, data) { + try { + if (error) { + merge.JDCash.notify = "京东现金-红包: 签到接口请求失败 ‼️‼️" + merge.JDCash.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + const cc = JSON.parse(data) + if (cc.busiCode == "0") { + console.log("\n" + "京东现金-红包签到成功 " + Details) + if (cc.result.signResult.signData.amount) { + merge.JDCash.notify = "京东现金-红包: 成功, 明细: " + cc.result.signResult.signData.amount + "红包 🧧" + merge.JDCash.Cash = cc.result.signResult.signData.amount + merge.JDCash.success = 1 + } else { + merge.JDCash.notify = "京东现金-红包: 成功, 明细: 无红包 🧧" + merge.JDCash.success = 1 + } + } else { + console.log("\n" + "京东现金-红包签到失败 " + Details) + if (data.match(/(\"busiCode\":\"1002\"|完成签到)/)) { + merge.JDCash.notify = "京东现金-红包: 失败, 原因: 已签过 ⚠️" + merge.JDCash.fail = 1 + } else { + if (data.match(/(不存在|已结束)/)) { + merge.JDCash.notify = "京东现金-红包: 失败, 原因: 活动已结束 ⚠️" + merge.JDCash.fail = 1 + } else { + if (data.match(/(\"busiCode\":\"3\"|未登录)/)) { + merge.JDCash.notify = "京东现金-红包: 失败, 原因: Cookie失效‼️" + merge.JDCash.fail = 1 + } else { + merge.JDCash.notify = "京东现金-红包: 失败, 原因: 未知 ⚠️" + merge.JDCash.fail = 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东现金-红包" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingRSeeAds(s) { + return new Promise(resolve => { + setTimeout(() => { + const JRAdsUrl = { + url: 'https://ms.jr.jd.com/gw/generic/jrm/h5/m/sendAdGb', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "reqData=%7B%22clientType%22%3A%22ios%22%2C%22actKey%22%3A%22176696%22%2C%22userDeviceInfo%22%3A%7B%22adId%22%3A9999999%7D%2C%22deviceInfoParam%22%3A%7B%22macAddress%22%3A%2202%3A00%3A00%3A00%3A00%3A00%22%2C%22channelInfo%22%3A%22appstore%22%2C%22IPAddress1%22%3A%22%22%2C%22OpenUDID%22%3A%22%22%2C%22clientVersion%22%3A%225.3.30%22%2C%22terminalType%22%3A%2202%22%2C%22osVersion%22%3A%22%22%2C%22appId%22%3A%22com.jd.jinrong%22%2C%22deviceType%22%3A%22iPhone8%2C2%22%2C%22networkType%22%3A%22%22%2C%22startNo%22%3A212%2C%22UUID%22%3A%22%22%2C%22IPAddress%22%3A%22%22%2C%22deviceId%22%3A%22%22%2C%22IDFA%22%3A%22%22%2C%22resolution%22%3A%22%22%2C%22osPlatform%22%3A%22iOS%22%7D%2C%22bussource%22%3A%22%22%7D" + }; + $nobyda.post(JRAdsUrl, function(error, response, data) { + try { + if (error) { + merge.JRSeeAds.notify = "京东金融-广告: 签到接口请求失败 ‼️‼️" + merge.JRSeeAds.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + const cc = JSON.parse(data) + if (data.match(/(\"canGetGb\":true)/)) { + console.log("\n" + "京东金融-广告签到成功 " + Details) + if (data.match(/(\"volumn\"|\"volume\")/)) { + merge.JRSeeAds.notify = "京东金融-广告: 成功, 明细: " + cc.resultData.data.volumn + "京豆 🐶" + merge.JRSeeAds.bean = cc.resultData.data.volumn + merge.JRSeeAds.success = 1 + } else { + merge.JRSeeAds.notify = "京东金融-广告: 成功, 明细: 无京豆 🐶" + merge.JRSeeAds.success = 1 + } + } else { + console.log("\n" + "京东金融-广告签到失败 " + Details) + if (data.match(/(已经发完|已签到|已领取|\"code\":\"2000\")/)) { + merge.JRSeeAds.notify = "京东金融-广告: 失败, 原因: 已签过 ⚠️" + merge.JRSeeAds.fail = 1 + } else { + if (data.match(/(不存在|已结束|未找到)/)) { + merge.JRSeeAds.notify = "京东金融-广告: 失败, 原因: 活动已结束 ⚠️" + merge.JRSeeAds.fail = 1 + } else { + if (data.match(/(\"resultCode\":3|先登录)/)) { + merge.JRSeeAds.notify = "京东金融-广告: 失败, 原因: Cookie失效‼️" + merge.JRSeeAds.fail = 1 + } else { + merge.JRSeeAds.notify = "京东金融-广告: 失败, 原因: 未开始 ⚠️" + merge.JRSeeAds.fail = 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东金融-广告" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingRongGame(s) { + return new Promise(resolve => { + setTimeout(() => { + const JRGamelogin = { + url: 'https://ylc.m.jd.com/sign/signGiftDays', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "channelId=1" + }; + $nobyda.post(JRGamelogin, async function(error, response, data) { + try { + if (error) { + merge.JRGame.notify = "京东金融-游戏: 登录接口请求失败 ‼️‼️" + merge.JRGame.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/(未登录)/)) { + console.log("\n" + "京东金融-游戏登录失败 " + Details) + merge.JRGame.notify = "京东游戏-登录: 失败, 原因: Cookie失效‼️" + merge.JRGame.fail = 1 + } else if (data.match(/(成功)/)) { + console.log("\n" + "京东金融-游戏登录成功 " + Details) + await JRGameCheckin(0) + } else { + merge.JRGame.notify = "京东游戏-登录: 失败, 原因: 未知 ⚠️" + merge.JRGame.fail = 1 + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东游戏-登录" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JRGameCheckin(s) { + return new Promise(resolve => { + setTimeout(() => { + const JRGameUrl = { + url: 'https://ylc.m.jd.com/sign/signDone', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "channelId=1" + }; + $nobyda.post(JRGameUrl, function(error, response, data) { + try { + if (error) { + merge.JRGame.notify = "京东金融-游戏: 签到接口请求失败 ‼️‼️" + merge.JRGame.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + const cc = JSON.parse(data) + if (data.match(/(\"code\":200)/)) { + console.log("\n" + "京东金融-游戏签到成功 " + Details) + if (data.match(/(\"rewardAmount\":\d+)/)) { + merge.JRGame.notify = "京东金融-游戏: 成功, 明细: " + cc.data.rewardAmount + "京豆 🐶" + merge.JRGame.bean = cc.data.rewardAmount + merge.JRGame.success = 1 + } else { + merge.JRGame.notify = "京东金融-游戏: 成功, 明细: 无京豆 🐶" + merge.JRGame.success = 1 + } + } else { + console.log("\n" + "京东金融-游戏签到失败 " + Details) + if (data.match(/(用户重复|重复点击|\"code\":301|\"code\":303)/)) { + merge.JRGame.notify = "京东金融-游戏: 失败, 原因: 已签过 ⚠️" + merge.JRGame.fail = 1 + } else { + if (data.match(/(不存在|已结束|未找到)/)) { + merge.JRGame.notify = "京东金融-游戏: 失败, 原因: 活动已结束 ⚠️" + merge.JRGame.fail = 1 + } else { + if (data.match(/(\"code\":202|未登录)/)) { + merge.JRGame.notify = "京东金融-游戏: 失败, 原因: Cookie失效‼️" + merge.JRGame.fail = 1 + } else { + merge.JRGame.notify = "京东金融-游戏: 失败, 原因: 未知 ⚠️" + merge.JRGame.fail = 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东金融-游戏" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JDMagicCube(s) { + return new Promise(resolve => { + setTimeout(() => { + const JDMCUrl = { + url: 'https://api.m.jd.com/client.action?functionId=getNewsInteractionLotteryInfo&appid=smfe', + headers: { + Cookie: KEY, + } + }; + $nobyda.get(JDMCUrl, function(error, response, data) { + try { + if (error) { + merge.JDCube.notify = "京东商城-魔方: 签到接口请求失败 ‼️‼️" + merge.JDCube.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + const cc = JSON.parse(data) + if (data.match(/(\"name\":)/)) { + console.log("\n" + "京东商城-魔方签到成功 " + Details) + if (data.match(/(\"name\":\"京豆\")/)) { + merge.JDCube.notify = "京东商城-魔方: 成功, 明细: " + cc.result.lotteryInfo.quantity + "京豆 🐶" + merge.JDCube.bean = cc.result.lotteryInfo.quantity + merge.JDCube.success = 1 + } else { + merge.JDCube.notify = "京东商城-魔方: 成功, 明细: " + cc.result.lotteryInfo.name + " 🎉" + merge.JDCube.success = 1 + } + } else { + console.log("\n" + "京东商城-魔方签到失败 " + Details) + if (data.match(/(一闪而过|已签到|已领取)/)) { + merge.JDCube.notify = "京东商城-魔方: 失败, 原因: 无机会 ⚠️" + merge.JDCube.fail = 1 + } else { + if (data.match(/(不存在|已结束)/)) { + merge.JDCube.notify = "京东商城-魔方: 失败, 原因: 活动已结束 ⚠️" + merge.JDCube.fail = 1 + } else { + if (data.match(/(\"code\":3)/)) { + merge.JDCube.notify = "京东商城-魔方: 失败, 原因: Cookie失效‼️" + merge.JDCube.fail = 1 + } else { + merge.JDCube.notify = "京东商城-魔方: 失败, 原因: 未知 ⚠️" + merge.JDCube.fail = 1 + } + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东商城-魔方" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingDongPrize(s) { + return new Promise(resolve => { + setTimeout(() => { + const JDkey = { + url: 'https://api.m.jd.com/client.action?functionId=vvipscdp_raffleAct_index&client=apple&clientVersion=8.1.0&appid=member_benefit_m', + headers: { + Cookie: KEY, + Referer: "https://jdmall.m.jd.com/beansForPrizes", + } + }; + $nobyda.get(JDkey, async function(error, response, data) { + try { + if (error) { + merge.JDPrize.notify = "京东商城-大奖: 查询接口请求失败 ‼️‼️" + merge.JDPrize.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/\"raffleActKey\":\"[a-zA-z0-9]{3,}\"/)) { + const cc = JSON.parse(data) + merge.JDPrize.key = cc.data.floorInfoList[0].detail.raffleActKey + console.log("\n" + "京东商城-大奖查询KEY成功 " + Details) + if (merge.JDPrize.key) { + await JDPrizeCheckin(s) + } else { + merge.JDPrize.notify = "京东商城-大奖: 失败, 原因: 无奖池 ⚠️" + merge.JDPrize.fail = 1 + } + } else { + console.log("\n" + "京东商城-大奖查询KEY失败 " + Details) + if (data.match(/(未登录|\"101\")/)) { + merge.JDPrize.notify = "京东大奖-登录: 失败, 原因: Cookie失效‼️" + merge.JDPrize.fail = 1 + } else { + merge.JDPrize.notify = "京东大奖-登录: 失败, 原因: 未知 ⚠️" + merge.JDPrize.fail = 1 + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东商城-大奖查询KEY" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JDPrizeCheckin(s) { + return new Promise(resolve => { + setTimeout(() => { + const JDPUrl = { + url: 'https://api.m.jd.com/client.action?functionId=vvipscdp_raffleAct_lotteryDraw&body=%7B%22raffleActKey%22%3A%22' + merge.JDPrize.key + '%22%2C%22drawType%22%3A0%2C%22riskInformation%22%3A%7B%7D%7D&client=apple&clientVersion=8.1.0&appid=member_benefit_m', + headers: { + Cookie: KEY, + Referer: "https://jdmall.m.jd.com/beansForPrizes", + } + }; + $nobyda.get(JDPUrl, function(error, response, data) { + try { + if (error) { + merge.JDPrize.notify = "京东商城-大奖: 签到接口请求失败 ‼️‼️" + merge.JDPrize.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + const c = JSON.parse(data) + if (data.match(/\"success\":true/)) { + console.log("\n" + "京东商城-大奖签到成功 " + Details) + if (data.match(/\"beanNumber\":\d+/)) { + merge.JDPrize.notify = "京东商城-大奖: 成功, 明细: " + c.data.beanNumber + "京豆 🐶" + merge.JDPrize.success = 1 + merge.JDPrize.bean = c.data.beanNumber + } else if (data.match(/\"couponInfoVo\"/)) { + if (data.match(/\"limitStr\"/)) { + merge.JDPrize.notify = "京东商城-大奖: 获得满" + c.data.couponInfoVo.quota + "减" + c.data.couponInfoVo.discount + "优惠券→ " + c.data.couponInfoVo.limitStr + merge.JDPrize.success = 1 + } else { + merge.JDPrize.notify = "京东商城-大奖: 成功, 明细: 优惠券" + merge.JDPrize.success = 1 + } + } else if (data.match(/\"pitType\":0/)) { + merge.JDPrize.notify = "京东商城-大奖: 成功, 明细: 未中奖 🐶" + merge.JDPrize.success = 1 + } else { + merge.JDPrize.notify = "京东商城-大奖: 成功, 明细: 未知 🐶" + merge.JDPrize.success = 1 + } + } else { + console.log("\n" + "京东商城-大奖签到失败 " + Details) + if (data.match(/(已用光|7000003)/)) { + merge.JDPrize.notify = "京东商城-大奖: 失败, 原因: 已签过 ⚠️" + merge.JDPrize.fail = 1 + } else { + if (data.match(/(未登录|\"101\")/)) { + merge.JDPrize.notify = "京东商城-大奖: 失败, 原因: Cookie失效‼️" + merge.JDPrize.fail = 1 + } else { + merge.JDPrize.notify = "京东商城-大奖: 失败, 原因: 未知 ⚠️" + merge.JDPrize.fail = 1 + } + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东商城-大奖签到" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingDongSpeedUp(s, id) { + return new Promise(resolve => { + setTimeout(() => { + const GameUrl = { + url: 'https://api.m.jd.com/?appid=memberTaskCenter&functionId=flyTask_' + (id ? 'start&body=%7B%22source%22%3A%22game%22%2C%22source_id%22%3A' + id + '%7D' : 'state&body=%7B%22source%22%3A%22game%22%7D'), + headers: { + Referer: 'https://h5.m.jd.com/babelDiy/Zeus/6yCQo2eDJPbyPXrC3eMCtMWZ9ey/index.html', + Cookie: KEY + } + }; + $nobyda.get(GameUrl, async function(error, response, data) { + try { + if (error) { + merge.SpeedUp.notify = "京东天天-加速: 签到接口请求失败 ‼️‼️" + merge.SpeedUp.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + var cc = JSON.parse(data) + if (!id) { + var status = merge.SpeedUp.success ? "本次" : "" + console.log("\n" + "天天加速-查询" + status + "任务中 " + Details) + } else { + console.log("\n" + "天天加速-开始本次任务 " + Details) + } + if (cc.message == "not login") { + merge.SpeedUp.fail = 1 + merge.SpeedUp.notify = "京东天天-加速: 失败, 原因: Cookie失效‼️" + console.log("\n天天加速-Cookie失效") + } else if (cc.message == "success") { + if (cc.data.task_status == 0 && cc.data.source_id) { + const taskID = cc.data.source_id + await JingDongSpeedUp(s, taskID) + } else if (cc.data.task_status == 1) { + if (!merge.SpeedUp.notify) merge.SpeedUp.fail = 1; + if (!merge.SpeedUp.notify) merge.SpeedUp.notify = "京东天天-加速: 失败, 原因: 加速中 ⚠️"; + const EndTime = cc.data.end_time ? cc.data.end_time : "" + console.log("\n天天加速-目前结束时间: \n" + EndTime) + var step1 = await JDQueryTask(s) + var step2 = await JDReceiveTask(s, step1) + var step3 = await JDQueryTaskID(s, step2) + var step4 = await JDUseProps(s, step3) + } else if (cc.data.task_status == 2) { + if (data.match(/\"beans_num\":\d+/)) { + merge.SpeedUp.notify = "京东天天-加速: 成功, 明细: " + data.match(/\"beans_num\":(\d+)/)[1] + "京豆 🐶" + merge.SpeedUp.bean = data.match(/\"beans_num\":(\d+)/)[1] + } else { + merge.SpeedUp.notify = "京东天天-加速: 成功, 明细: 无京豆 🐶" + } + merge.SpeedUp.success = 1 + console.log("\n天天加速-领取上次奖励成功") + await JingDongSpeedUp(s, null) + } else { + merge.SpeedUp.fail = 1 + merge.SpeedUp.notify = "京东天天-加速: 失败, 原因: 未知 ⚠️" + console.log("\n" + "天天加速-判断状态码失败") + } + } else { + merge.SpeedUp.fail = 1 + merge.SpeedUp.notify = "京东天天-加速: 失败, 原因: 未知 ⚠️" + console.log("\n" + "天天加速-判断状态失败") + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东天天-加速" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JDQueryTask(s) { + return new Promise(resolve => { + setTimeout(() => { + var TaskID = ""; + const QueryUrl = { + url: 'https://api.m.jd.com/?appid=memberTaskCenter&functionId=energyProp_list&body=%7B%22source%22%3A%22game%22%7D', + headers: { + Referer: 'https://h5.m.jd.com/babelDiy/Zeus/6yCQo2eDJPbyPXrC3eMCtMWZ9ey/index.html', + Cookie: KEY + } + }; + $nobyda.get(QueryUrl, async function(error, response, data) { + try { + if (error) { + console.log("\n京东天天-加速: 查询道具请求失败 ‼️‼️") + } else { + const cc = JSON.parse(data) + const Details = LogDetails ? "response:\n" + data : ''; + if (cc.message == "success" && cc.data.length > 0) { + for (var i = 0; i < cc.data.length; i++) { + if (cc.data[i].thaw_time == 0) { + TaskID += cc.data[i].id + ","; + } + } + if (TaskID.length > 0) { + TaskID = TaskID.substr(0, TaskID.length - 1).split(",") + console.log("\n天天加速-查询到" + TaskID.length + "个有效道具" + Details) + } else { + console.log("\n天天加速-暂无有效道具" + Details) + } + } else { + console.log("\n天天加速-查询无道具" + Details) + } + } + resolve(TaskID) + } catch (eor) { + $nobyda.notify("天天加速-查询道具" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve(TaskID) + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JDReceiveTask(s, CID) { + return new Promise(resolve => { + var NumTask = 0 + if (CID) { + setTimeout(() => { + var count = 0 + for (var i = 0; i < CID.length; i++) { + const TUrl = { + url: 'https://api.m.jd.com/?appid=memberTaskCenter&functionId=energyProp_gain&body=%7B%22source%22%3A%22game%22%2C%22energy_id%22%3A' + CID[i] + '%7D', + headers: { + Referer: 'https://h5.m.jd.com/babelDiy/Zeus/6yCQo2eDJPbyPXrC3eMCtMWZ9ey/index.html', + Cookie: KEY + } + }; + $nobyda.get(TUrl, function(error, response, data) { + try { + count += 1 + if (error) { + console.log("\n天天加速-领取道具请求失败 ‼️‼️") + } else { + const cc = JSON.parse(data) + const Details = LogDetails ? "response:\n" + data : ''; + console.log("\n天天加速-尝试领取第" + count + "个道具" + Details) + if (cc.message == 'success') { + NumTask += 1 + } + } + if (CID.length == count) { + console.log("\n天天加速-已成功领取" + NumTask + "个道具") + resolve(NumTask) + } + } catch (eor) { + $nobyda.notify("天天加速-领取道具" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve(NumTask) + } + }) + } + }, s) + if (out) setTimeout(resolve, out + s) + } else { + resolve(NumTask) + } + }); +} + +function JDQueryTaskID(s, EID) { + return new Promise(resolve => { + var TaskCID = "" + if (EID) { + setTimeout(() => { + const EUrl = { + url: 'https://api.m.jd.com/?appid=memberTaskCenter&functionId=energyProp_usalbeList&body=%7B%22source%22%3A%22game%22%7D', + headers: { + Referer: 'https://h5.m.jd.com/babelDiy/Zeus/6yCQo2eDJPbyPXrC3eMCtMWZ9ey/index.html', + Cookie: KEY + } + }; + $nobyda.get(EUrl, function(error, response, data) { + try { + if (error) { + console.log("\n天天加速-查询道具ID请求失败 ‼️‼️") + } else { + const cc = JSON.parse(data) + const Details = LogDetails ? "response:\n" + data : ''; + if (cc.data.length > 0) { + for (var i = 0; i < cc.data.length; i++) { + if (cc.data[i].id) { + TaskCID += cc.data[i].id + ","; + } + } + if (TaskCID.length > 0) { + TaskCID = TaskCID.substr(0, TaskCID.length - 1).split(",") + console.log("\n天天加速-查询成功" + TaskCID.length + "个道具ID" + Details) + } else { + console.log("\n天天加速-暂无有效道具ID" + Details) + } + } else { + console.log("\n天天加速-查询无道具ID" + Details) + } + } + resolve(TaskCID) + } catch (eor) { + $nobyda.notify("天天加速-道具ID" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve(TaskCID) + } + }) + }, s + 200) + if (out) setTimeout(resolve, out + s) + } else { + resolve(TaskCID) + } + }); +} + +function JDUseProps(s, PropID) { + return new Promise(resolve => { + if (PropID) { + setTimeout(() => { + var PropCount = 0 + var PropNumTask = 0 + for (var i = 0; i < PropID.length; i++) { + const PropUrl = { + url: 'https://api.m.jd.com/?appid=memberTaskCenter&functionId=energyProp_use&body=%7B%22source%22%3A%22game%22%2C%22energy_id%22%3A%22' + PropID[i] + '%22%7D', + headers: { + Referer: 'https://h5.m.jd.com/babelDiy/Zeus/6yCQo2eDJPbyPXrC3eMCtMWZ9ey/index.html', + Cookie: KEY + } + }; + $nobyda.get(PropUrl, function(error, response, data) { + try { + PropCount += 1 + if (error) { + console.log("\n天天加速-使用道具请求失败 ‼️‼️") + } else { + const cc = JSON.parse(data) + const Details = LogDetails ? "response:\n" + data : ''; + console.log("\n天天加速-尝试使用第" + PropCount + "个道具" + Details) + if (cc.message == 'success' && cc.success == true) { + PropNumTask += 1 + } + } + if (PropID.length == PropCount) { + console.log("\n天天加速-已成功使用" + PropNumTask + "个道具") + resolve() + } + } catch (eor) { + $nobyda.notify("天天加速-使用道具" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + } + }, s) + if (out) setTimeout(resolve, out + s) + } else { + resolve() + } + }); +} + +function JingDongSubsidy(s) { + return new Promise(resolve => { + setTimeout(() => { + const subsidyUrl = { + url: 'https://ms.jr.jd.com/gw/generic/uc/h5/m/signIn7', + headers: { + Referer: "https://active.jd.com/forever/cashback/index", + Cookie: KEY + } + }; + $nobyda.get(subsidyUrl, function(error, response, data) { + try { + if (error) { + merge.subsidy.notify = "京东商城-金贴: 签到接口请求失败 ‼️‼️" + merge.subsidy.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/\"msg\":\"操作成功\"/)) { + console.log("\n" + "京东商城-金贴签到成功 " + Details) + merge.subsidy.success = 1 + if (data.match(/\"thisAmountStr\":\".+?\"/)) { + var Quantity = data.match(/\"thisAmountStr\":\"(.+?)\"/)[1] + merge.subsidy.notify = "京东商城-金贴: 成功, 明细: " + Quantity + "金贴 💰" + } else { + merge.subsidy.notify = "京东商城-金贴: 成功, 明细: 无金贴 💰" + } + } else { + console.log("\n" + "京东商城-金贴签到失败 " + Details) + merge.subsidy.fail = 1 + if (data.match(/已存在/)) { + merge.subsidy.notify = "京东商城-金贴: 失败, 原因: 已签过 ⚠️" + } else if (data.match(/请先登录/)) { + merge.subsidy.notify = "京东商城-金贴: 失败, 原因: Cookie失效‼️" + } else { + merge.subsidy.notify = "京东商城-金贴: 失败, 原因: 未知 ⚠️" + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东商城-金贴" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JingRongDoll(s, type, num) { + return new Promise(resolve => { + setTimeout(() => { + const DollUrl = { + url: "https://nu.jr.jd.com/gw/generic/jrm/h5/m/process", + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY + }, + body: "reqData=%7B%22actCode%22%3A%22890418F764%22%2C%22type%22%3A" + (type ? type : "3") + "%7D" + }; + $nobyda.post(DollUrl, async function(error, response, data) { + try { + if (error) { + merge.JRDoll.notify = "京东金融-娃娃: " + (type ? "签到" : "领取") + "接口请求失败 ‼️‼️" + merge.JRDoll.fail = 1 + } else { + var cc = JSON.parse(data) + const Details = LogDetails ? "response:\n" + data : ''; + if (cc.resultCode == 0) { + if (cc.resultData.data.businessData != null) { + console.log("\n" + "京东金融-娃娃登录成功 " + Details) + if (cc.resultData.data.businessData.pickStatus == 2) { + if (data.match(/\"rewardPrice\":\"?(\d+)/)) { + var JRDoll_bean = data.match(/\"rewardPrice\":\"?(\d+)/)[1] + await JingRongDoll(s, "4", JRDoll_bean) + } else { + merge.JRDoll.success = 1 + merge.JRDoll.notify = "京东金融-娃娃: 成功, 明细: 无京豆 🐶" + } + } else { + console.log("\n" + "京东金融-娃娃签到失败 " + Details) + merge.JRDoll.notify = "京东金融-娃娃: 失败, 原因: 已签过 ⚠️"; + merge.JRDoll.fail = 1 + } + } else if (cc.resultData.data.businessCode == 200) { + console.log("\n" + "京东金融-娃娃签到成功 " + Details) + merge.JRDoll.bean = num ? num : 0 + merge.JRDoll.success = num ? 1 : 0 + merge.JRDoll.notify = "京东金融-娃娃: 成功, 明细: " + (num ? num + "京豆 🐶" : "无京豆 🐶") + } else { + console.log("\n" + "京东金融-娃娃签到异常 " + Details) + merge.JRDoll.fail = 1; + merge.JRDoll.notify = "京东金融-娃娃: 失败, 原因: 领取异常 ⚠️"; + } + } else if (cc.resultCode == 3) { + console.log("\n" + "京东金融-娃娃签到失败 " + Details) + merge.JRDoll.notify = "京东金融-娃娃: 失败, 原因: Cookie失效‼️" + merge.JRDoll.fail = 1; + } else { + console.log("\n" + "京东金融-娃娃判断失败 " + Details) + merge.JRDoll.notify = "京东金融-娃娃: 失败, 原因: 未知 ⚠️" + merge.JRDoll.fail = 1; + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东金融-娃娃" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function JDOverseas(s) { + return new Promise(resolve => { + setTimeout(() => { + const OverseasUrl = { + url: 'https://api.m.jd.com/client.action?functionId=checkin', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "body=%7B%7D&build=167237&client=apple&clientVersion=9.0.0&openudid=1fce88cd05c42fe2b054e846f11bdf33f016d676&partner=apple&scope=11&sign=e27f8b904040a0e3c99b87fc27e09c87&st=1591730990449&sv=101" + }; + $nobyda.post(OverseasUrl, function(error, response, data) { + try { + if (error) { + merge.Overseas.notify = "京东商城-国际: 签到接口请求失败 ‼️‼️" + merge.Overseas.fail = 1 + } else { + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/\"type\":\d+?,/)) { + console.log("\n" + "京东商城-国际签到成功 " + Details) + merge.Overseas.success = 1 + if (data.match(/\"jdBeanAmount\":[1-9]+/)) { + merge.Overseas.bean = data.match(/\"jdBeanAmount\":(\d+)/)[1] + merge.Overseas.notify = "京东商城-国际: 成功, 明细: " + merge.Overseas.bean + "京豆 🐶" + } else { + merge.Overseas.notify = "京东商城-国际: 成功, 明细: 无京豆 🐶" + } + } else { + console.log("\n" + "京东商城-国际签到失败 " + Details) + merge.Overseas.fail = 1 + if (data.match(/(\"code\":\"13\"|重复签到)/)) { + merge.Overseas.notify = "京东商城-国际: 失败, 原因: 已签过 ⚠️" + } else if (data.match(/\"code\":\"-1\"/)) { + merge.Overseas.notify = "京东商城-国际: 失败, 原因: Cookie失效‼️" + } else { + merge.Overseas.notify = "京东商城-国际: 失败, 原因: 未知 ⚠️" + } + } + } + resolve() + } catch (eor) { + $nobyda.notify("京东商城-国际" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + }, s) + if (out) setTimeout(resolve, out + s) + }); +} + +function TotalSteel() { + return new Promise(resolve => { + const SteelUrl = { + url: 'https://coin.jd.com/m/gb/getBaseInfo.html', + headers: { + Cookie: KEY, + } + }; + $nobyda.get(SteelUrl, function(error, response, data) { + try { + if (!error) { + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/(\"gbBalance\":\d+)/)) { + console.log("\n" + "京东-总钢镚查询成功 " + Details) + const cc = JSON.parse(data) + merge.JRSteel.TSteel = cc.gbBalance + } else { + console.log("\n" + "京东-总钢镚查询失败 " + Details) + } + } else { + console.log("\n" + "京东-总钢镚查询请求失败 ") + } + resolve() + } catch (eor) { + $nobyda.notify("钢镚接口" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + if (out) setTimeout(resolve, out) + }); +} + +function TotalBean() { + return new Promise(resolve => { + const BeanUrl = { + url: 'https://wq.jd.com/user/info/QueryJDUserInfo?sceneval=2', + headers: { + Cookie: KEY, + Referer: "https://wqs.jd.com/my/jingdou/my.shtml?sceneval=2" + } + }; + $nobyda.post(BeanUrl, function(error, response, data) { + try { + if (!error) { + const Details = LogDetails ? "response:\n" + data : ''; + const cc = JSON.parse(data) + if (cc.base.jdNum != 0) { + console.log("\n" + "京东-总京豆查询成功 " + Details) + merge.JDShake.Qbear = cc.base.jdNum + } else { + console.log("\n" + "京东-总京豆查询失败 " + Details) + } + if (data.match(/\"nickname\" ?: ?\"(.+?)\",/)) { + merge.JDShake.nickname = cc.base.nickname + } else if (data.match(/\"no ?login\.?\"/)) { + merge.JDShake.nickname = "Cookie失效 ‼️" + } else { + merge.JDShake.nickname = ''; + } + } else { + console.log("\n" + "京东-总京豆查询请求失败 ") + } + resolve() + } catch (eor) { + $nobyda.notify("京豆接口" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + if (out) setTimeout(resolve, out) + }); +} + +function TotalCash() { + return new Promise(resolve => { + const CashUrl = { + url: 'https://api.m.jd.com/client.action?functionId=myhongbao_balance', + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Cookie: KEY, + }, + body: "body=%7B%22fp%22%3A%22-1%22%2C%22appToken%22%3A%22apphongbao_token%22%2C%22childActivityUrl%22%3A%22-1%22%2C%22country%22%3A%22cn%22%2C%22openId%22%3A%22-1%22%2C%22childActivityId%22%3A%22-1%22%2C%22applicantErp%22%3A%22-1%22%2C%22platformId%22%3A%22appHongBao%22%2C%22isRvc%22%3A%22-1%22%2C%22orgType%22%3A%222%22%2C%22activityType%22%3A%221%22%2C%22shshshfpb%22%3A%22-1%22%2C%22platformToken%22%3A%22apphongbao_token%22%2C%22organization%22%3A%22JD%22%2C%22pageClickKey%22%3A%22-1%22%2C%22platform%22%3A%221%22%2C%22eid%22%3A%22-1%22%2C%22appId%22%3A%22appHongBao%22%2C%22childActiveName%22%3A%22-1%22%2C%22shshshfp%22%3A%22-1%22%2C%22jda%22%3A%22-1%22%2C%22extend%22%3A%22-1%22%2C%22shshshfpa%22%3A%22-1%22%2C%22activityArea%22%3A%22-1%22%2C%22childActivityTime%22%3A%22-1%22%7D&client=apple&clientVersion=8.5.0&d_brand=apple&networklibtype=JDNetworkBaseAF&openudid=1fce88cd05c42fe2b054e846f11bdf33f016d676&sign=fdc04c3ab0ee9148f947d24fb087b55d&st=1581245397648&sv=120" + }; + $nobyda.post(CashUrl, function(error, response, data) { + try { + if (!error) { + const Details = LogDetails ? "response:\n" + data : ''; + if (data.match(/(\"totalBalance\":\d+)/)) { + console.log("\n" + "京东-总红包查询成功 " + Details) + const cc = JSON.parse(data) + merge.JDCash.TCash = cc.totalBalance + } else { + console.log("\n" + "京东-总红包查询失败 " + Details) + } + } else { + console.log("\n" + "京东-总红包查询请求失败 ") + } + resolve() + } catch (eor) { + $nobyda.notify("红包接口" + eor.name + "‼️", JSON.stringify(eor), eor.message) + resolve() + } + }) + if (out) setTimeout(resolve, out) + }); +} + +function initial() { + merge = { + SpeedUp: {}, + JDBean: {}, + JDTurn: {}, + JRBean: {}, + JRDoll: {}, + JRDSign: {}, + JDGStore: {}, + JDPet: {}, + JDFSale: {}, + JDBook: {}, + JDShand: {}, + JDMakeup: {}, + Overseas: {}, + JDWomen: {}, + JRGame: {}, + JRSeeAds: {}, + JDCare: {}, + JDFood: {}, + JDClean: {}, + JDVege: {}, + JDJewels: {}, + JDCube: {}, + JDPrize: {}, + JRSteel: {}, + subsidy: {}, + JDCash: {}, + JDShake: {} + } + for (var i in merge) { + merge[i].success = 0; + merge[i].fail = 0; + merge[i].bean = 0; + merge[i].steel = 0; + merge[i].notify = ''; + merge[i].key = 0; + merge[i].TSteel = 0; + merge[i].Cash = 0; + merge[i].TCash = 0; + merge[i].Qbear = 0; + merge[i].nickname = ''; + } +} + +function GetCookie() { + try { + if ($request.headers && $request.url.match(/api\.m\.jd\.com.*=signBean/)) { + var CV = $request.headers['Cookie'] + if (CV.match(/(pt_key=.+?pt_pin=|pt_pin=.+?pt_key=)/)) { + var CookieValue = CV.match(/pt_key=.+?;/) + CV.match(/pt_pin=.+?;/) + var CK1 = $nobyda.read("CookieJD") + var CK2 = $nobyda.read("CookieJD2") + var AccountOne = CK1 ? CK1.match(/pt_pin=.+?;/) ? CK1.match(/pt_pin=(.+?);/)[1] : null : null + var AccountTwo = CK2 ? CK2.match(/pt_pin=.+?;/) ? CK2.match(/pt_pin=(.+?);/)[1] : null : null + var UserName = CookieValue.match(/pt_pin=(.+?);/)[1] + var DecodeName = decodeURIComponent(UserName) + if (!AccountOne || UserName == AccountOne) { + var CookieName = " [账号一] "; + var CookieKey = "CookieJD"; + } else if (!AccountTwo || UserName == AccountTwo) { + var CookieName = " [账号二] "; + var CookieKey = "CookieJD2"; + } else { + $nobyda.notify("更新京东Cookie失败", "非历史写入账号 ‼️", '请开启脚本内"DeleteCookie"以清空Cookie ‼️') + $nobyda.done() + return + } + } else { + $nobyda.notify("写入京东Cookie失败", "", "请查看脚本内说明, 登录网页获取 ‼️") + $nobyda.done() + return + } + if ($nobyda.read(CookieKey)) { + if ($nobyda.read(CookieKey) != CookieValue) { + var cookie = $nobyda.write(CookieValue, CookieKey); + if (!cookie) { + $nobyda.notify("用户名: " + DecodeName, "", "更新京东" + CookieName + "Cookie失败 ‼️"); + } else { + $nobyda.notify("用户名: " + DecodeName, "", "更新京东" + CookieName + "Cookie成功 🎉"); + } + } + } else { + var cookie = $nobyda.write(CookieValue, CookieKey); + if (!cookie) { + $nobyda.notify("用户名: " + DecodeName, "", "首次写入京东" + CookieName + "Cookie失败 ‼️"); + } else { + $nobyda.notify("用户名: " + DecodeName, "", "首次写入京东" + CookieName + "Cookie成功 🎉"); + } + } + } else { + $nobyda.notify("写入京东Cookie失败", "", "请检查匹配URL或配置内脚本类型 ‼️"); + } + } catch (eor) { + $nobyda.write("", "CookieJD") + $nobyda.write("", "CookieJD2") + $nobyda.notify("写入京东Cookie失败", "", '已尝试清空历史Cookie, 请重试 ⚠️') + console.log(JSON.stringify(eor) + "\n" + eor + "\n" + JSON.stringify($request.headers)) + } + $nobyda.done() +} +// Modified from yichahucha +function nobyda() { + const start = Date.now() + const isRequest = typeof $request != "undefined" + const isSurge = typeof $httpClient != "undefined" + const isQuanX = typeof $task != "undefined" + const isLoon = typeof $loon != "undefined" + const isJSBox = typeof $app != "undefined" && typeof $http != "undefined" + const isNode = typeof require == "function" && !isJSBox; + const node = (() => { + if (isNode) { + const request = require('request'); + return ({ + request + }) + } else { + return (null) + } + })() + const notify = (title, subtitle, message) => { + if (isQuanX) $notify(title, subtitle, message) + if (isSurge) $notification.post(title, subtitle, message) + if (isNode) log(title + subtitle + message) + if (isJSBox) $push.schedule({ + title: title, + body: subtitle ? subtitle + "\n" + message : message + }) + } + const write = (value, key) => { + if (isQuanX) return $prefs.setValueForKey(value, key) + if (isSurge) return $persistentStore.write(value, key) + } + const read = (key) => { + if (isQuanX) return $prefs.valueForKey(key) + if (isSurge) return $persistentStore.read(key) + } + const adapterStatus = (response) => { + if (response) { + if (response.status) { + response["statusCode"] = response.status + } else if (response.statusCode) { + response["status"] = response.statusCode + } + } + return response + } + const get = (options, callback) => { + if (isQuanX) { + if (typeof options == "string") options = { + url: options + } + options["method"] = "GET" + $task.fetch(options).then(response => { + callback(null, adapterStatus(response), response.body) + }, reason => callback(reason.error, null, null)) + } + if (isSurge) $httpClient.get(options, (error, response, body) => { + callback(error, adapterStatus(response), body) + }) + if (isNode) { + node.request(options, (error, response, body) => { + callback(error, adapterStatus(response), body) + }) + } + if (isJSBox) { + if (typeof options == "string") options = { + url: options + } + options["header"] = options["headers"] + options["handler"] = function(resp) { + let error = resp.error; + if (error) error = JSON.stringify(resp.error) + let body = resp.data; + if (typeof body == "object") body = JSON.stringify(resp.data); + callback(error, adapterStatus(resp.response), body) + }; + $http.get(options); + } + } + const post = (options, callback) => { + if (isQuanX) { + if (typeof options == "string") options = { + url: options + } + options["method"] = "POST" + $task.fetch(options).then(response => { + callback(null, adapterStatus(response), response.body) + }, reason => callback(reason.error, null, null)) + } + if (isSurge) { + $httpClient.post(options, (error, response, body) => { + callback(error, adapterStatus(response), body) + }) + } + if (isNode) { + node.request.post(options, (error, response, body) => { + callback(error, adapterStatus(response), body) + }) + } + if (isJSBox) { + if (typeof options == "string") options = { + url: options + } + options["header"] = options["headers"] + options["handler"] = function(resp) { + let error = resp.error; + if (error) error = JSON.stringify(resp.error) + let body = resp.data; + if (typeof body == "object") body = JSON.stringify(resp.data) + callback(error, adapterStatus(resp.response), body) + } + $http.post(options); + } + } + const log = (message) => console.log(message) + const time = () => { + const end = ((Date.now() - start) / 1000).toFixed(2) + return console.log('\n签到用时: ' + end + ' 秒') + } + const done = (value = {}) => { + if (isQuanX) isRequest ? $done(value) : null + if (isSurge) isRequest ? $done(value) : $done() + } + return { + isRequest, + isJSBox, + isSurge, + isQuanX, + isLoon, + isNode, + notify, + write, + read, + get, + post, + log, + time, + done + } +}; +ReadCookie(); diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh new file mode 100755 index 0000000000..37ce062258 --- /dev/null +++ b/package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh @@ -0,0 +1,178 @@ +#!/bin/sh +# +# Copyright (C) 2020 luci-app-jd-dailybonus +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# +# 501 下载脚本出错 +# 101 没有新版本无需更新 +# 0 更新成功 + +NAME=jd-dailybonus +REMOTE_SCRIPT=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js +TEMP_SCRIPT=/tmp/JD_DailyBonus.js +JD_SCRIPT=/usr/share/jd-dailybonus/JD_DailyBonus.js +LOG_HTM=/www/JD_DailyBonus.htm +CRON_FILE=/etc/crontabs/root +usage() { + cat <<-EOF + Usage: app.sh [options] + + Valid options are: + + -a Add Cron + -n Check + -r Run Script + -u Update Script From Server + -s Save Cookie And Add Cron + -w Background Run With Wechat Message + -h Help +EOF + exit $1 +} + +# Common functions + +uci_get_by_name() { + local ret=$(uci get $NAME.$1.$2 2>/dev/null) + echo ${ret:=$3} +} + +uci_get_by_type() { + local ret=$(uci get $NAME.@$1[0].$2 2>/dev/null) + echo ${ret:=$3} +} + +cancel() { + if [ $# -gt 0 ]; then + echo "$1" + fi + exit 1 +} + +fill_cookie() { + cookie1=$(uci_get_by_type global cookie) + if [ ! "$cookie1" = "" ]; then + varb="var Key = '$cookie1';" + sed -i "s/^var Key =.*/$varb/g" $JD_SCRIPT + fi + + cookie2=$(uci_get_by_type global cookie2) + if [ ! "$cookie2" = "" ]; then + varb2="var DualKey = '$cookie2';" + sed -i "s/^var DualKey =.*/$varb2/g" $JD_SCRIPT + fi + + stop=$(uci_get_by_type global stop) + if [ ! "$stop" = "" ]; then + varb3="var stop = $stop;" + sed -i "s/^var stop =.*/$varb3/g" $JD_SCRIPT + fi +} + +remote_ver=$(cat $TEMP_SCRIPT | sed -n '/更新时间/p' | awk '{print $NF}' | sed 's/v//') +local_ver=$(uci_get_by_type global version) + +add_cron() { + sed -i '/jd-dailybonus/d' $CRON_FILE + [ $(uci_get_by_type global auto_run 0) -eq 1 ] && echo '5 '$(uci_get_by_type global auto_run_time)' * * * /bin/bash -c "sleep $[RANDOM % 180]s"; /usr/share/jd-dailybonus/newapp.sh -w' >>$CRON_FILE + [ $(uci_get_by_type global auto_update 0) -eq 1 ] && echo '1 '$(uci_get_by_type global auto_update_time)' * * * /usr/share/jd-dailybonus/newapp.sh -u' >>$CRON_FILE + crontab $CRON_FILE +} + +# Run Script + +serverchan() { + sckey=$(uci_get_by_type global serverchan) + failed=$(uci_get_by_type global failed) + desc=$(cat /www/JD_DailyBonus.htm | sed 's/$/&\n/g' | sed -e '/左滑/d') + if [ $failed -eq 1 ]; then + grep "Cookie失效" /www/JD_DailyBonus.htm > /dev/null + if [ $? -eq 0 ]; then + title="$(date '+%Y年%m月%d日') 京东签到 Cookie 失效" + wget-ssl -q --post-data="text=$title~&desp=$desc" https://sc.ftqq.com/$sckey.send + fi + else + title="$(date '+%Y年%m月%d日') 京东签到" + wget-ssl -q --post-data="text=$title~&desp=$desc" https://sc.ftqq.com/$sckey.send + fi + +} + +run() { + fill_cookie + echo -e $(date '+%Y-%m-%d %H:%M:%S %A') >$LOG_HTM 2>/dev/null + nohup node $JD_SCRIPT >>$LOG_HTM 2>/dev/null & +} + +back_run() { + fill_cookie + echo -e $(date '+%Y-%m-%d %H:%M:%S %A') >$LOG_HTM 2>/dev/null + node $JD_SCRIPT >>$LOG_HTM 2>/dev/null + serverchan +} + +save() { + fill_cookie + add_cron +} + +# Update Script From Server + +check_ver() { + wget-ssl --user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36" --no-check-certificate -t 3 -T 10 -q $REMOTE_SCRIPT -O $TEMP_SCRIPT + if [ $? -ne 0 ]; then + cancel "501" + else + echo $remote_ver + fi +} + +update() { + wget-ssl --user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36" --no-check-certificate -t 3 -T 10 -q $REMOTE_SCRIPT -O $TEMP_SCRIPT + if [ $? -ne 0 ]; then + cancel "501" + fi + if [ $(echo "$local_ver < $remote_ver" | bc) -eq 1 ]; then + cp -r $TEMP_SCRIPT $JD_SCRIPT + fill_cookie + uci set jd-dailybonus.@global[0].version=$remote_ver + uci commit jd-dailybonus + cancel "0" + else + cancel "101" + fi +} + +while getopts ":anruswh" arg; do + case "$arg" in + a) + add_cron + exit 0 + ;; + n) + check_ver + exit 0 + ;; + r) + run + exit 0 + ;; + u) + update + exit 0 + ;; + s) + save + exit 0 + ;; + w) + back_run + exit 0 + ;; + h) + usage 0 + ;; + esac +done diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/www/jd-dailybonus/JDCookie.crx b/package/ctcgfw/luci-app-jd-dailybonus/root/www/jd-dailybonus/JDCookie.crx new file mode 100644 index 0000000000000000000000000000000000000000..c061b9c83c1c206497267eb28a44b06c06c8eb19 GIT binary patch literal 20445 zcmYJ4Lv$`oxMpM9wr$(CZS#w5+qP}nc5;%O*gUb>|LxVQ@1Q0%s=@p0s#@#Wq5u{) zP#_>6aS$LNlv*&DauB9qU=k*H2xyvcsqj~LU|?WyAkbi7M4*GJ;SB0u!ZPKvY?Bv9&{ z7;#H?5OHwl#9SA}Np;P8JgtW9NEY^L}8)pGoC3{Y4 zC|+!2YG;W9!G7_nklxV?@NZZ~Q1}dw7#`31+ST#&uh5p9e-00i;rdSlXLh zAgn@+>QgXrK+vz!mpDyayL}6R6TBz0@XhqXT9C~!Nfw_dlt}KS$$DFoLm^~#X!yMA zJ#_VnrOKhU=-9wv4OHEifaAIgB^9;CxTT?y=$b+kh7paRI{)ywe{-DK?|1Nr5SKRc zb=O{U>zHHK)?Q5A+i<+3^MGmK{N)Bm%Jal7R26?OWKxN6S|Z#d#F3MyYe5LU2Sb5D z;s|rUDNbg2k?@k3PjGhhSCRzngN;j`+MEL_Gg80iC9jsxxp$hCE)wKwS(*$GG_<Kn@AE8 zCJ0I}rjQ<&vk2b)U{HiGb;Ho?56>pRm~`wa>)m2}&v)0=?kRKvwB#&3CuJ47&ZN#; zr4*AdMmwD!`H%A$JpR1e4Fwwsqq_$bpL^{Ye;p%Og>rLG%jm#P9?#-Etp{(KiOhYS zgg%R?3co&I@bYn_8Bd;kC&1Z;%jK)+xU&S<1S=C{Ho6lAwWOi~z4Zhrp{I0;Z*g;Y zf#yQhT+0vW#GOAFKzIx;vSxJ>99FYg~)}L9-`;dlq6)J;c8x4-3 zgb@1kWV?`&koqYI(66teT228y31)AJ4@#|p;&Cq8{YQVDQZArTtMg68)&029%#NB? zNpaAMggZvn`b;o#6593&0N}#QCcnRvjA|*50VL!*CfJ?4bUpX;o8-EORBe{JsyH^H zQ~#p-NkEYQ?Q-ILROXOLf8Q`?XaW--RBMEm4 zVY3=CeV=Nh^(<{MDUrx}UCSXmozr%LQP=ka7nwXR+R4r0pa2|l7wS(&>U!*fgM}Kl z<_YOtlk7w&z_fL9zXFbsMccAUKraCJe=}hbQKsbHbih>#4g^&DUnZdb%Y?P5qXUDJ zgQcH3v=XW%nnIlku)UB_75?lzi%vXQ4lV~d3o$MjG2VeIjFnV6S(urqdk_-3RaGGu z#yBV%EXW~y7{*;ONwE>QN-hk>-$Qk=n94{^`c;@6t;W3g=Yq}e-`CU6U7uf{y?KWy zDBZS2hbsIq5p68I(8;NtsgGV$(f&B(U;=6#6leV#LY;FtdZihQ#JBhkZ(;8e+pu3p$HV1!BW|kBasv+Uu;dO{5l6HFawcD zHRLxB<@;tRpR67E~yPzyP;0(wS*T4~zPZ2u9$T{;ya1jF8$pau(Sh5yu zb!riA6t0w*RFH?`3+Jp%W%wpztZ*&7$Pwd2D2V(zN;Haa0*`{Yz{1Yu zN_He2IYcdcah7!9NFk>e7@iQh7n(+b0&BEQmdR2kAv+4#<%>dXHigNhRL+w7b30I& zDP_DFCYmX)(#~JnwVWyqBJDV&p;T-hHAOH|lEfz_b)7V(z!TCyV~hn&n)K#P73aWA z#`L#gD7v67-*!fybllnr=rDt*c|hB*QK_~<%lU@imkaQ~0 zUF6E8x)#Qbwf#T2vP$KgsA`b7Oa#wO+@crucjHjRmNzLN!`Y0)cW{%;2@$ehAO#}D zKqw@z+=FTZms{-m>l8kGkTnH2F`I3R?Pjlc13Q-<(^~s7e_#)bUIqhs@ zngJ?pV;TkfIGf5!#7_C9hHST|U$T&jp#cAx1`Dayu$0sJ3xeH^rrswPV%4Md0>QwF zg0}=Uf!nT^Imv_SSxe9uc~uz07EwptrODf>fON9ef++iQBFM7g5{g6mIoFbZTxrsu8hqH%PwzD+>qB1{L7$}k!11F zAGfW+gjtqZ;imxb>&RT~xZKEY^$jU^CGK25o-9xEQ}>Q_JjS@Fkvi{Xg#NLS$k{p6 z`*Y3Jzq>BSiz1z%kbzEPhFG9enx#(aO72!D{m%CVIgVxcD=tmB)>Tp|D;ha7vYlqY z=#bg~PiWHa)2$s1@xb(3ictAae}1|krO#AX^Iv{7U1UWRr?=v?Zr2MhswqzfFJZLT zRVL3-vvrAl%w}Eh4^LYA!B*tZwf~UyR-Ipz|HRFLo2eR|R4ZHchzI*p1g0J5OTD2V z<4%*&agqgcoO}E2I5&D5z-}s$?R>ZUIO$-;L6f9lN$={IV@G(k`K9?3HzF~rnbjo) z6_6-s6$UJMqGov?6mB$u4i7mU9SAFX(g_3X~ zNwZyNer5Mg#gmR{*iOA}52qHEwd7VchvdtVhbgN)bIXE938-7MIkADj z&K98}1OhLbfViT&{@pZiA35|(_+cojyY0UWUkll?TSdcv-JU1$G3g1f`uDrM@{Ipr zx6%#t=`%1^f4teBC~g2YjyFa(e3~-*u2RmbmU+*wqR{E##D?ItpHGbcOLDdUNFL7L zL{7v21VqRP1O)g0NN&i?!u3Bi5A$|Y%2RAP1lI&y-}OvUD01y*;(0noKWjavY~0dRf<#w0vhD?;--!p zpgk^#3cY*XV*KxM=0W_B_~&uawf*Ie!=(izQkN%3S9y{*dsE9=D@*&MJ6;PK6sS?n zh@Kyj-<(_+)>2ZVC4i|`Af6#GAiOa%Ato!VFAXxRD-C`_I`p!)FDDwrj#{K_rewDM zn#9^1HvQ41W%)^Usrjy@1F5kT1+@(61^LT%aA|rZc6efGXi9%kGW1gL8s=x`x5T2P z_zf{Kq7P~<0HUm-R)YBA+CqG2WO~MAXlPD!h;ndxXl9I_Xi#owYJO;8e12hkXl!_h zc5;qka!UHXLHKz+C#S5fFg$g3!1p^%tkRC3PY-N!qqnb5yRS zi(C7LL~GkGk8jpjD|fr<*IsyfdS@8^`ViRNz4%R%gVp2Z38|>~;}scCKQ--lrZMGn z0Ogs}+)luP!49wX+Acoc?pLD6$4X24cfrbo-Vl?P1D@8yQjs%e;JLBmDF>V9Xg@KWBk(QB-k$wEl!^2xXJmd=y7jSk~Kmdlec5to_ za5>4_=AX@_tNob+|8=Zi{hdTlb!}mJbaGz-xVyi3Jg?g2@#pT?=jl_Cv3pUUyA3I% z&+p#A{g%EMCh2qq_0`guZ|CAu|B!M9@BhvZpd|qDCZvKb7)}IyKSskkwa7{XWSyp+ z9%b%jq?Ny8Y~T0tJ_Wmye-#+2NSt%LcW*dw9l={Er_>FCYhxMJ&hij-h=C-ynVk zNd|bM*DJR@I^~YN_6+46d5?N2p>$x^UE{15D$Se0lKF*HacN2BCi@az)EM08l4!p` z^OXeZ7dD0D57e5CL`N3`4+I{j&+uCBk6Gs$nwIBnVbD>-TD%_rF;i6XN(3#5(U6AZ zZ$GtFBXsHSu#cmqze+L*`WI>+7avuXN&@$ATcw+&;17E~O7oOn`BazRS5nF3f$snA zt^5WXWu!2IZ+faDH6ER71ne5NjuQRm-1_^?)?)ssHB0vIo% zKNzj9C6Yb|A4VMZOVjle^##KF93UIJjwUxO?fhd;0u7ojZ~d|e;4?ZA)$Ou-Cbb6| zIUe5TEbcGhlYgdIQb~0ihvY4=v?cPN^}*^+g_7R>y$ea*x$Q5Ns&^k=G=cZQ2mjiV zU1!eN-+NG{Ht6nbpf#jO?vJedcWyKvCUcF|S89oz%fms8KTGf%&TB3Np2mFcXU^JC zpV&5%g@wXR#z@18;)(675`0Hh^n0~V0z$0nxT8ro1ru#H-oa2ntTmm$FibGE4$D`8Yx_bByf#MVbLNfP=%{Autat+ZqdC<<% z-h>u4gOxfX@1a++X<`c}_9`Gh_n6hSVQ{8NxbWOYcS#*5l};6FB^k@W*hj*pmu&sK zJ{U&-whBDcJUVFt*5n(>x`J9ee3ZV&sV{xnwwqn-JtRy6#}j3@N`zp=q{tP=%8^1h z30J&u^-a4Fk6?yXIwnI+=xl#A zgWfynZl#$Wa-o#jVon)`@oGDeDq3Bh^zKMr3ddLUj;@cLJE`$L5^X_bf-}gnw@|%X zVuirDzn!$Z@QjvjnZfMif&JuLtcz4IYoyM$51R4{Q_4E-FPT@fMOxeFw_b{atMn)s zh=fPTZK{wzE?FDLBC zaR%L)$B}%i4_mK2J-YSoOo7-B#GkNPL-hiaFlX&;AlW3v?eLJgy_NAwIph^qg@eOG zwTJ2elWfyTW9>y+spIe3Fud$qm1643+1Nd^_(E2>nLyQcyF&%0a?wT{2NpC@J*n; z8}j5VPbJhE@S(a2E^?k)56YuFfbq;)Mq6`D_Nkd_l4 zcbD`~iBwg4G5b}|tPS$_7Fyg6t2X8Y6PG~UD3o<;LVnE9Nt%~U*jQw1*BQAAjoe~X zces}*_eEaMt~F*1y5?3!yY~OZ5U=VMF-mCh zOWFHk0oM|`6`gO>&*N^9;@L&)q5F4Vt+NI0BnijN(&Be%*LdLLkrCqQ46IymeX$5h z?gxL>FN6Jf2|y~TL{YJpiXd4{@!B0!U&?p9^kN|M`~p+~FaQsejo{~VCU%NMgcHz$5>_ZEYp}LmfcZL}EVy>i zbbu785|O$fW5Q~ppSUt~&XvP(@V-nE>ro+eK%Xs2i~^S8Cx99z$n#zE zv^cp)-byWj(k->p`PJJF5$Bi4D6Kmo{UD;4MA=^(27q(Xf%14b?5ifJNC|RN78?EY zH{DK9e0Si%l7ZFfyNC%LB5qJMCn3aeQ@*~t5XRgHj_&m`^E}nwh&+S?9nQ6t6a!x= zO^Vk2PC`sYCx#8wkbHezo?rSo5OEhANsIILhl`eLFisJXRdDIt4o$>IzXnXG%Qgct zGVcQAVwT`%8AeqzpDq{Nj}!YP(?Xfgs2g?kc&gm1=ha*AB@O6eFYI#Rrwrue*`4Np zr1oH7oW|=G{lqW*sRT~;;{LST);2bXsi>Gjuj*5$p2bSlXI|pQc?nh+!lPW1L3NXQ z0`R|89^z&fBA*1Z+3M}W1G4a2K@pAV$|~+(TtZ)S)`2ph2FE$mb>k5+-n&<7IW?0p zd4nrA?N=Ui^+Ft#j-E}(TA}ixNii~ttFG2*;%~Yz964NT8c>nvz^J>+dC7?RETMlvG;dv7cJ09}Yg+5F8b2AalPJLk5b29J`MP zChmLJs2}6`4%-ruN6v9sWL*j;N!JNB{obi{v%yW$5E!hk(JzryE-VqU8q`Fa1_5VE8+f&?A3HsjWqcgl;`IIWUBptbve z!I+4{;#sNHuvXs&jXST*BWKvlRBp$X@Uju?P}J!g{Ke)H!nnWgHm?-S|N2R$mF>hY13Z?aMY7nB=^&+2WKq_4M$u<_i#pZDKR_;I=`xuK!C zK+TkXiSw!Khs&Irn;tar{ML3s-_68R-+3T&zYOF@+^Ii}F`9iJW}yXvaVo6K2s(Za zG$3%VG>5GC%G2S(-etZ|I(zD6FF+q6BmNcA>Y0yF{MD9(^3Va36~BEl+1Nov6q} zgo8NBpdg)!sPphcSw*yc9#sxt@|q$WK0Wlfuf1?VE35J-6t9H?_bcd}y`XEJ$Z>sb zuC0GY^n2ny zaDZ#cISnQbg6~D@$qZ| za-)ux#(Av&lN>Mi;k%_Gkkl2MKDdjb6ivP5m?7jcf#3E?ZANf=M>>z z?4SHa?I}GHPb8hwX!jY7Vp~0>l@@31ER6OA&&@7uB{y+xy#+X3&M`&_o zmp;Z9U#MqFy+<7{KZ;Smhr5_dg0~#BJn-jrT3d>k#&%@l4d4^8`j^T{LD^Hk1`;#SApZAqO*Z~Cj?xgCH1kZ5^A@bD7^T4yEb|VixeF! z`6)BH3kS<{xQp2yj%XhkJpHt|eanXE&{WTq*RIbQfGZj*T{ale+dJ_euf`MZp~9f( z{nJ)=Eigx`5&;^?cF0=BU0?-G!r31^u7YR3{OEGEq#V{uj$^*L^mc)d>7HVD0vA1rg{Ce1#EjkoSbhF=ZJNq(VG0qBw# zlZ=X+07c)+-t9nx!_oqpg!Hr;=HmM^n|aZI;P8f*j^cI{uDtWna;c(DIl!;!oWQ!@ z;?|t(jCR0ddo9gtKJ2s2;}tDC58P$4lpKufI=H9wiivY%d_Y)Q>LK_x`eeq?2tFOj za+A?WFsRISN0{Hw7i523@@1J}BH6mS2zE`3mR}veNOGVw27r)Di?BrbRlzVNZF#!| zLq|gEJ^1;9Mw@@IW!P-^@2gyZOC`+KHz1x-M8pJNCPO%)Nc$r2pX7W^wveg&Uv=Ow zixFOhI(&xTRG}W-@K7zrs}KYFjF#a9_AEhxLHKYe-&*{SaH%v07vLDS? zx|IGCwsr?5K<6sNbH9~`LQ3>Sw66_Zh>v^aS_q=&f1>K?(jJzXUEMXp7$F%B+@RnI5J*fZbru1g`$)H?y`hULK7YNWDrQrqzZRVNFD{x zs^DY>@>Vz41Q6KP8nzVA;TW#2yofEczyxLW*7$HPIG9fh@cnjvH@^=-vz;M3+J(XR zjP729->^BA%=!6_41!>W!6})?@R*stI5@79%ulr`E#NDoJ&m4a&@c@VQQ{aqP{)P5 zz^I?s!0qbdTlYgD^%|Hy6sZ zT^P*FOH(=GD#G4FsPlUwn7V{`AoojWg&21+~h4PNx z3HnGFY&r$)yb8{a5c(p)*W~IIts$3ppWuPTjd%wFd|Z;YZ4F~vznN5<%&_u#t62%V z%jWRa+bOuU3mo@tCK7_h1;U)Iq^Vjzjvbgwu2le&azg_pCu}*tFh1Cz>f@Hdav~y8 zRrbK^q-t8&fp$^}Ql|OiHF<|1=j_lqVM!Wp-CR_@gAaGO*eqi;rp49xJ_062+AhaV zy7y2|LtOfDO%EcCtj}t;?R?QGQf=icu+IUu#4naGt<$!&VLwGCB94eW@V7jTFFGMH z#S*&j74e_<+h;|QEFAAlN2Sq%4LB!c1d)vLXeVE!-8m7}t+H%UerCy{*?u5vIdy~D zC`&GrRV&a$1HZ%m#@wri>3G~|bhysyLOxy^|5CKu&-FN2IQD{NLB#CXLcP<39G&%T z84@m5JB(fKq(7lP-alF9n=t;D`wqn}Nsq6ux&_FL^|DDelc0$eNmr7|?vS`j&QRu` zVB$yL#b!+MSk$tA;)>RW4ObnjUQmRpm1$DR#~xtb9Sm9Q#8IC0l#3eW|1!ttMz}1) z;*7aZQZ8%Va^R;xo7bsajW==}|7-vsN=nvg`OqPuDS4HW@p+^&MO+vAzZ$|ey+7pE z=?$5qLQ*ANvd5GqQ<2&sO@)$-Y7J^bA*yvwtwdNaRX#ySiVaE1nrfRDq(=EVaYRGLzQrc*9B=4=7`wKq} zGrqk2XcM{dkI$hGmO^Ta<+I5N-$wU-a;K6&czj#uyH%lq*FTP4|_FhAQBZ ztPnZT<6LM5=Ii@>R7w2(%V6{IG$fPBX?3Rb_9S2eHbYN8%55nfKzi-L0$1)!E$H;CiLNy@Iq6l*0vWYhcU36xD#S6BBGJu#p&ktFSL6k3hYSx2 zv!o7e{sj{0%(jk?BM-q5U@&aqY2zbL(5MExJ&iH82~Nl5jXKR`t=uaiq7@*Tg~&F? zb#~eO%${=!O3tRhB=mmL8!jf*>pI|+HQF?$Mvi_-k5A%&|I*a(!=2>-=e5V4SFzaF zd1U#pTQaxU^yXeFkaelT z6clqLhjOfg>dC4REXq&-=ec)!(=%-?ICmsqfTLpXu)uK3xQ61zEi*mB9$p>AiLnOD zz4rEOXJ83KU2Qq&+zGNI!55p%bBgN#krP@cY^&EY`IL)uS!FLZ<$+SOhx3|(B8Mj= zl{BoO&~tS(c|KI(!CdrPnY|_s81o{~RnT5=(Yco_uwt@8$33 zS89Ij_(Mob6;1DX-L8C~1y@oGR1S0p4vgjIQ+Xv~#^2+=y}Ex+@aT}U=pl%+pH6=B zv7zF57HC2l#WqTZ6@7a$@#IR&>cXOtF>$51jHK`mX*kF^YU6oM2+B|h%Dsx)M`O3c z0P7wH;*Vd*9iE6v*!Jpz4~}@Rk6(VpT62Q7P4vW_WI2(0{=OJGArr$5R_;rV zn{fy}&A5WtU`+iwUJD;jTg})`fqWek6GeG1*1&`nGz28h2A?utDD9pu^nN<#$ z=8tSJf#sSUwQkqPRBg{cWRE(piEWADz-CqmJ&1VCl=F&_`!z#K*~pytv2vYv&qHm* ztiRzwRLg^w-aoohWflJ&C;M}-*=#>|8!{eHz>P;t|GwRpo2X^7G!asY*~x*{T0 zsp1^rjN`{juGLN{zJQQYZb6Bo2_-&f*27gI_X`aHIXqu)K5u=V?YCs$FDlC^Slx{z z!aNdA=v#Z?(#D~qF~SmfRo;+6*1+5(n!vPq*Rbi9^8G)Sq?c6v+M>*< zoW;wU1S{k6Avu<;W%BJHi=~{XUh41T`JHF~fBosDP&%>f7cEe@5DXHkq=Ro(EU9#yh0i}es@2R@evl59ji*n*=PwJ`zLBm&(=}p}X{5jGG zAQVbZCB^K)9z=3wCU2Rv-5petE}&S%_N&a5JPwBmDmIxQfyS8-IwWk6RV33&Z@aU_Nl%(E&tw&ruJxzeIG6){wN*#DrM3~BlPrRzD+K1i25 zuP{0l>_-yFfhy^Qksn!B%GLF5Kclgr*uuz!MqWzJsYG`D+mdz{ZMaY@90`xA6Z(1! z1#-ae-U0{a!*3Whw*P)(K#}+Sm1RWtXAU)X<=j<$nG|H#9?QfpMoVPvnG-TEsx?V^ z3K}k$(A5qqK*ddj$0QD(&HpmuII^>Q;IMp=Vm|9xO+b`%t*?!^sd+nd7HOoo&agvlyP+>?j!( zfaQtq&-{Xp4EL4Lis`Niiv27&-%;X-Bp;?%zt(rI4R81FzuTuMl_J^k%2yUv7O^nm z#Kk=ON{e}`w@G(3z@KBU(YZ+CzY!H*#$&SC6$`qem7$OdrisFL75l`msyz#Qehzad z9ZCcS6e}L|oM>zhqcy-KgoI@lTgKcBd5yV2QKnYafufR~R%HjDUy7l2})DHX-=(77Xb7^rjnIs<}j6 z#wXv1nphpiRO?<{3S|JzVp!IpDlQ75Vo~S}mpgFp8-GHUIq@k@kjzUkHZmVR9cqa~ zr;(qp_P-F#ysS}Z2y8)8n>=KV0Fi$T@QlA=IgYX2q0N0xc-aa?;*QxigE{*L8OCwV+#}ZZ zA!>uu&ZGJ^hCa7ck@jqeAGTs5m|gF88ekdKZcK~lsq48pWES}ArQ>XFR|0JP9jwRR zS06K@7HQ5y1t_&<(kmc=K9mwS>CB}o-HAcsfHY8VEx756xDEinke}rWt+n$I(*`FQ@JN0^js~aiQ=918}DoL_tD^>-8FFn#cu%p0f z&!YNr+uuc>qUxwS*SFCquCW2VT=fu}hpc7ECScP>>0~S_mqc`ON1+0Eu4F??1^fO~ zK|47T@x>uUw&eaUJG;s9sSdH!k0DP$LC3~3S5chg4>d;CnY7P@fWNjn%Hsy%E)_lZrt^7}JbS%2d>*~lqKPd3a3?AX zJQp_9WKyWE2vyXK8Gg3UrKHLk<2K&*zW9^)nFGrdDjzdlNx^dE{aw}mV8Atk#Voat z{b!#I*=pq!JIR+Pr}E2;;5j$E2TMBWl;7tHzvNj;hJQES^NUlG)_Wn3R?;gur%r4u zi=lLDGRV+x6T}3v4wkvh%)j!CNTYl(8*=5yCzBItVsxE!zR9Kv*I}iXF7%|Da~^~5 zhC}r!yt!Z>wJ#p3!$k&6NYgv|VIPZ_HkHYwIp1y}a8&UJl{5qD9sbF0lPpI@SeVhs zs<@NYN#^KtGyk~Hzel?{tGg0obP288NeY;v6(SIB8P$*wx=dMV(XnqXu`$x{zr<5p&D5lJgUNKsLiRP+RJFjhF)YRb~ewlu_- zGP&z|VCE$fO`E6AV1`5;(v!cAb6lpIY4YVDrpf|ZXG_1zaoT@MObc^aQlV-PFIi`u z_AxIMWrt)Ch%^K5^Lvs*t%V;W4VRPV1lCfW8e9Ld)M2A>GS2gS4`z-OA81pvG#T-g zA6`t0du9I7gzvbi?IJX*ajUqL3|O6Q({N&sbpves2E~|Qme}vAGsRQYq9JuPxG5*q zAc_`x&=@KmJ60*VrUH68NglWtO6d;59k%Wf{+c)CyGp?fVBOj%gTHuG5v^<{*IWjM zW1=FBlaFm61;Oq0>cDZE%h0D9AY{cG@U)r89iKJCC{Zoa7b(17jAox}0 zGDhx=aM3FNc&wFZa?P5Z7(txdQ%$}#`eZBX^gFOpR^gePL+aLZF@#0pIKmtoK1uN9 zSK8udhV>oM>(&zp%Aw8{^dLkn3d&RD1Yp0Qr}M^mx*@jw8v?_FS_y{Ief&VsxQo*6gpDM zXHZn^KvR1(@IMedm>J{qH0n=F#ZF39a=+OQ%xl$oOMyE6$&dmb*>jrY9Wy&Wt7f6>oH*08D)*1%+!u3MZ!+;(EeDJu~nFFi^Rwrr4C9m1zsd@6=}B zl`|ecE=Lx7UF@<3a!JNObp3fKax=@Q$8Rwa-~wR|2X!SMOzOCWez^5X^+&XQ?D8L5 zQS}q%%eqqtbe|RZyZr>pV%k=etH#c9Ky|UYIQBuqPCIs&@otn`RsavF$#_+OA_Irv zL!yN}*4O|~E&P54c+6%|){IfR2pK=ATPtrIZ?oYR&z-C&AvH$@Re}jYVC@j{8PLww z_GO>TwR@=C4DV&F{4_L|&MzKNlWmOsgZqRk;&=j-{hAG&m^J{Q*WU{&yr`9_Zf2uvZexuPhgtB6yZg zww5!;%}3WJEK;iME3Ljngj8zwC$IARM+{Fwt2+af{QmI~ z$xJrx!8r`T$STDHANfW)YF%tlOj5bktLJvx&}^_$Q?`PuqNP2LM$n&-mx-;K(aL&MxFv1-&|Y>uhAhT0)OQN zKYNt$N-H{ww}~N;=;ty%s}BRl?&1LA#!LQMPOvK&?AgP$kPcew=S|>7*x=tCy##tt z>Q-mv8kH4HvR&!X^)W5;Z#z2nh@e$uw@!5;uch<5m^SDf`EtHjN0| zxZn}koj@~)zdO8$6DZQs`A@*pj!;!p@WxTnA>_SIGV| z!IE9n>|uJU)c9KYGcqgU0!vRjo-odTBh#d_`~FYZGup_iyDxdQZ#Aw=6B@TrTxaV# zscRvUr-vxR1Gh3hg$LaeE(!QQOKO&>&&6wKK5_=`X}$VY>>S36(GlJD%!c$npjQT7 z!~;Qc@K))V+EK4h{*(@0&(ISduIqma;Ae5s_hf&rx zwS`LN!FKsjR%p_!vd6;oZ@u0t~FY=#v z6fiL$tR&8EOxifzpU0W*-qvWfw9$#gU-18JlH2^(B%i5Mki`Gb38Mec34;CqO>&O^ zDUx5o-MO5dBp;d>8SOtmIYEOggAmOQL6DsY{wjj0B$L-8lMlUHlb=M1SHZQ`yu+l=c}-@2-L-^hSdFur_?v6(y3)$++jG-HH1I`sSU5QPCwRIi_&7KCxmr26+SpjMLLq1?U1gbU^~4z5RR*F34eFB8(m@%+f!EWtZ~g zw0H0IXQd}^?@VJRB664Ju(M6_XC1UG{}0Hn&SQQer|$e3=a0|YIVG7DVe^}m_qbs{ zX2cGBvN?RYxnR z_qiiZTs8;(#`qhb!LZS$HO}^J4xMR{&=J|c5R(%zHS2Bsc=y>(5A-~;-%LqJL2o?YH#BWCz#mX9bol|54i7k`2ED zW`n0?ZFaBy1Ls!9bw|7(a+iz!#dzf(P=;bcQyWXYIT&AGp{miXOUSDct1_shn5|to zy?eKaNCSO$Nez@o;V#K(LQB`$Brk7uz5&7eM3lQ;tOCt-XPE)5xRg*Zu zN}yNQXBX|W)I~6$|D~wTe-zCP<~xK(00MgXZ~cFYvi)Bj$4}FXYxUncVO*IMO=+zu zo${nCE9dR}p8vY{>b!fX z@$n#+sGB7dG#d%fk%Sv@u-sHAte7py5dC6DOyz%P93sPo3?HF(Nu^DLBmNo|0+|#D zG?dj89E{k%6gLahi^P;dSt`jk8mf~s= z!Y{)M{R1OH#RgLX+RPD=1V0b@jgR@u{Rg=Y`gDnFVt*Q$0XS`G3$j;%N#K5H3~`8n6q7 zT}vqXKXsgCRFvKNhbd`ALZw@}1nKS)q$LHUYluN&5C){Aq(Mdm=^T3KkZuqL1QBG& zVWgWO5AXk+cfJ14^6cl+UhBE`hkNf2&;5JWzVL8wny|hjr%J$B`WqcIFu0&2MkgL& zqI5w_k*fTnHpU@4jC9e+5yGchKbANI!B6uNhF z9F4I~zdZSp7I1r85#a`~v#DQ_(n(04;8 zem<W-`U4M=Zj8 zL!!sj8NN)kS&1sLx_iv+1Alye*JJa@Oewi+e(|K$4|df^iZqg$()hveo)i`cj)9(>omBa+xRXCYrmlU$CN zX?PPcogI`3#F}8y)n<*R7oy z60W`q?7GD24YYsgw7pNiDvlZ{U7EW1A%}-VwIybDfB^1H&kkR+a5S%6`vo>&88u|j zRRx7j2X(;n9-cN*$msHG6p@s2<91`bt-Gc<^x@jna%!EX-`lQ{r|OY`1B-<7ajH-5 z!F?5XB{$xIkYLb|=`8H-^Wup3{9zjM25s!YNm8OfvR zDP&xaj#s56kN!+G(3aiB5T5D^WElE_ukH}2PmZLav4=xNn0Pl?){60Pj??aumUaQ4 zUfCMfj2|U;AJgcza<9RhwYD_g=8Y}W)U~|QGfa&+`exs;zpfxzDFQd5P)Xe`#^+V( z-dfd`!5pTfQ?5Fg)ND$6O0SCkRY0gk>p|+;vK*@ zoCQ3>#!jeq?^7L#*c^FP(Zl-um@1q-M%txmmWSi3hy#>2rra8J&jf#ZJ)lk zyQ&!sKr;Blc|vKl!8fSU$8GyV77g~M9noStP(A$?c40rwgC?MYu$SFQ4Dgl1g<`pd zyWHv|_K1%D9rI-UOzYb5A)^N$M>hw-odsGUQd~8JZDJEp^Ay%B*T>|uBkk_nn7zTu zvg@DJ&|(rtpT!B)$|29g$-WhUQb)d&t=9F@FIt5eZb5gLxVH_9fJ_#1cKQI%UGF-M zBvdc^z>r*{;S(4Fri3!du)mNR-Az~KQ@~69C`WC`c~758D+$Fbw9Yh#6&0R0IIzbO z=ebE0K9TW!%8dO(S<|UlB)ia7p2}6lCsqxo^Y-z&O-V{{RP(AopW`}mYAeyZD(!Tf z@$y{Mvh50glsbO8a4wZ*AA70n$&2VorOGY&N0ubf*GDt)Z~NjO>JJApXU-Aq#Kth` zMMQ^CN21UgUDeO^lB7t3Swb%aWdv;N-yj!@Iy*pekyKp;`7cP*cMvE0(^?B^hZ!E2 zTeZ&d%{xcOQQ5-~V%9vk`7gVzS^$PR(DQ#=v(4Oa|GOyN8-Ot;~R|!X2f!4_SMTgDFFT)dnXm_60~;kr|bScL6nC^!-NPD7onq zmPCg06tT=0+GTyd8#!6I4M8@ztVVNSP#a`oH73zMd@)fOUQgKH-{c)oakfOPuTTE- zU_!*&(gI(-R+K)r#4oiuIRxQ2-3|)$4+Tv6F_SOxmX!v4%vSNGi}yG2s65KbXD_5o z1nMh~P8t*~-3~>cd34R>ym~$a#%Z!ZH zsqSP=n%8*9Mb6dknR0$Ppg9Bkx~9mhpCILQPeih(Sn`VEoHNeo2|qr)!w9mwTU&y% z*W11;Vv<#bC%s~cIUFOKOykS2+O_x>WVikCJwtIE{zKI?-c2b&$68UnHaSVk1HZ4# zx8L$hLV06MB3E)H7T3_}Z)GM>l^J5wij5{CWm@klj_HZPjHihZ@EXHUoOrXkp{9P6q8= zb9PCmTD;e^r`f^_yp~x%#GNMS9ym*52O&nA;H0Evi{As5;@U5(<3y&KR%bQzop$#} z@1~@hRQIXs!NDC&VsNXT zGn4m)N_sw_>`U$e;?X_wol*@x%`uG%_O{ud3V!`|50qf1_S$9XkuC_)i7_0U#he() z#zcF>*75E!xN#XBx#r$x>3g=E81?<(n)*06za(;s9VP&LE>YwBvKWLEGj}+zwy3C* z&HJ$X0T@yEX$u|2jnqu!dc{Uza!@YdO_+Pzu3T3WdBBWD0!GMdSp!p8%Wihg@R<-Q zOR8wxeq$S#3FX%4cW=0|N0$na4!IxQ2OTvvq?$W2p2qkbAY&({+R5@Q+q|7RX6wq@ zN==5B~NQYr$xEYS*fM>1$)+0Z)M-`^~6hWCJ8xY`wxnz#G%)s;_Z!GAD7e za@;@QFxF{HpE0VkXN93Yxy?b{OC|UUShi=6Xj5Bso6y(mLyGjkL?e z@3WkCtdJ+_+Cf_JT0kS;b!%bngo9x6I5u}WDm9k{YtE*jiT>n-{eChI3qASy&j)19rNwZRJn>+nfzdk4|+k|)~Z8iOB5 za_pa99>v4PkQP73&Q^4lPbNuK?HIY_v-^re_nX{!l0#Eja?o^g*!A@$7P-(mG|Vu@ zCC3M^=0RedmJFVRW#FPH1Md7B*BW_DrFqqo-tu*d4tqu)1Ej>x$5?)Db$Nf9ad_=Z zy(;@TbAvx$hbsl@MDFDys!Q|I;sw|!0quGcamo~h1LxiT@D$a}=k7C7L~G*290p|x zxqMpMm!K#JwFyEj;%x5*>z}R>16-)1Hda^n91{aW;MP<1m!rzf8sKDa2lT!*RJj8T z6E!uk;LFeVq|(UaJR*z8(q?xmf=e6BD0L;o(LBoPG{a}k>hFIt z8Q(fTGIC?6C4KE|8rzvfBb@yHAXTZTJcM-9j>+mw4}>}M!p24OG1Fv;HTL2`laL$}G(G*CL9kE><#6kD{khYzWLU?o<|6HTzi7f7gJi zH}UD}V{2X^H5;)?2JM<3@%Pw18Y>XEC^YWd;pO;Y`1^jX7@-y1AR#H2ov#M$;$QjZ z^B5kI^Q001`_hPg$`ty7{YV#ya-FA8nXgZ}=%((>NL1>!XfCcJhNQWYiV#L#?hhz6 zoeOb_X88^aiAE=eQ)$h}-3EeVKJWTrCficYv9muRk!t?#N6jy?0xOhqg)Q=JU&v}l zdrO_|9wJYNXT~@C7cYM79LWITbFQ~0B+T0?|8GCoZTT^7x8gtJ|JlNRNB^Wz`Ww1k z{#I!Bw^ZqO>QBm!f2g0gE~dYzzXcw@lYfe6{~BqUQ!4Qf2$1>@`0tG3 lckoXK^Dpq<#mU$BuVbpCdFM7c#=yY6eT;A4p?~(*>|ZZNPT&9l literal 0 HcmV?d00001 diff --git a/package/ctcgfw/luci-app-jd-dailybonus/root/www/jd-dailybonus/JDCookie.zip b/package/ctcgfw/luci-app-jd-dailybonus/root/www/jd-dailybonus/JDCookie.zip new file mode 100644 index 0000000000000000000000000000000000000000..412f30d8f1287321f38be9c1dc07e8a4fa9000fd GIT binary patch literal 20296 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

E1{wyFK0ea5qUy-|d<@6_>a^B|yG zU0R(2*Ra|vT$FsmnbFEy$?+UM^`&nN%U2&&AK(n<%QD zlbB1q-Bi8Ri+u@mFf=LN5Ag>O|1rY%vREUPwi*87l?uIN0=xW?<$unO1R<|s;y)Nt5)S?BA_GF1VZ5ofo-6F zSU zK;5Wv_{9AK2{L1>ZnEs9+LXZ34<>s0T$1g+2=INU1Pg(st_&w7Qgf2vPL1n4=mB}D z809%k?}HiGTV78wI_uJ7U+3AMUV1MVT0(Lank}2)778abv%W=ph|Ez3N*xVCB36R` z7dggx>W7|P)aUXaZ}blWw!a?{5?m*+egH0R;20(RrAe123eNiHrO!No{}ogAtMpkN zp40o^w(CDa%Pw+O=>7-{yfI4nOZ!^I|K?ug{2uyrk)ud_f%7W@>LMcDLj2*`(D~#f z{x1DXFCuvD37<=$=0&&n0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w(" + + + + + + + + diff --git a/package/ctcgfw/luci-theme-btmod/luasrc/view/themes/btmod/header.htm b/package/ctcgfw/luci-theme-btmod/luasrc/view/themes/btmod/header.htm new file mode 100644 index 0000000000..ee664ed683 --- /dev/null +++ b/package/ctcgfw/luci-theme-btmod/luasrc/view/themes/btmod/header.htm @@ -0,0 +1,237 @@ +<%# + + luci-theme-butongwifi + Copyright 2017 Tracemouse + + Smart Menu: + https://www.smartmenus.org/ + + Font Awesome: + http://fontawesome.io/ + + + luci-theme-material + Copyright 2015 Lutty Yang + + luci-theme-bootstrap: + Copyright 2008 Steven Barth + Copyright 2008 Jo-Philipp Wich + Copyright 2012 David Menting + + MUI: + https://github.com/muicss/mui + + Licensed to the public under the Apache License 2.0 +-%> + +<% + local ver = require "luci.version" + local sys = require "luci.sys" + local util = require "luci.util" + local http = require "luci.http" + local disp = require "luci.dispatcher" + + local boardinfo = util.ubus("system", "board") + + local request = disp.context.path + local request2 = disp.context.request + + local category = request[1] + local cattree = category and disp.node(category) + + local leaf = request2[#request2] + + local tree = disp.node() + local node = disp.context.dispatched + + local categories = disp.node_childs(tree) + + local c = tree + local i, r + + -- tag all nodes leading to this page + for i, r in ipairs(request) do + if c.nodes and c.nodes[r] then + c = c.nodes[r] + c._menu_selected = true + end + end + + -- send as HTML5 + http.prepare_content("text/html") + + local function nodeurl(prefix, name, query) + local url = controller .. prefix .. name .. "/" + if query then + url = url .. http.build_querystring(query) + end + return pcdata(url) + end + + local function subtree(prefix, node, level) + if not level then + level = 1 + end + + local childs = disp.node_childs(node) + if #childs > 0 then + + if level > 2 then +%> +

    + <% + end + + local selected_node + local selected_name + local i, v + + for i, v in ipairs(childs) do + local nnode = node.nodes[v] + if nnode._menu_selected then + selected_node = nnode + selected_name = v + end + if level > 2 then + %> +
  • + <%=striptags(translate(nnode.title))%> +
    • + <% end + end + + if level > 2 then + %> +
+<% end + + if selected_node then + subtree(prefix .. selected_name .. "/", selected_node, level + 1) + end + end + end +-%> + + + + + <%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI + + + + + + + + + + + + + - LuCI"> + - LuCI"> + + + + + + + + + + + + + <% if node and node.css then %> + + <% end -%> + <% if css then %> + + <% end -%> + + + + + + + + +
+
Loading...
+
+
+
+
+ <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> +
+

<%:No password set!%>

+ <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>
+ "><%:Go to password configuration...%> +
+ <%- end -%> + <% if category then subtree("/" .. category .. "/", cattree) end %> + diff --git a/package/ctcgfw/luci-theme-btmod/root/etc/uci-defaults/luci-theme-btmod b/package/ctcgfw/luci-theme-btmod/root/etc/uci-defaults/luci-theme-btmod new file mode 100755 index 0000000000..5e78bcaf2e --- /dev/null +++ b/package/ctcgfw/luci-theme-btmod/root/etc/uci-defaults/luci-theme-btmod @@ -0,0 +1,7 @@ +#!/bin/sh +uci batch <<-EOF + set luci.themes.Btmod=/luci-static/btmod + set luci.main.mediaurlbase=/luci-static/btmod + commit luci +EOF +exit 0 From f9c4a4a48a8d9e696623084b6e756d6b297da11c Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 16 Jul 2020 20:57:55 +0800 Subject: [PATCH 3/5] luci-app-ssr-plus: sync with upstream source --- package/lean/luci-app-ssr-plus/Makefile | 6 +- .../luasrc/controller/shadowsocksr.lua | 123 +- .../model/cbi/shadowsocksr/advanced.lua | 7 +- .../model/cbi/shadowsocksr/client-config.lua | 242 ++-- .../luasrc/model/cbi/shadowsocksr/client.lua | 6 +- .../luasrc/model/cbi/shadowsocksr/control.lua | 92 +- .../luasrc/model/cbi/shadowsocksr/log.lua | 26 +- .../model/cbi/shadowsocksr/server-config.lua | 64 +- .../luasrc/model/cbi/shadowsocksr/server.lua | 77 +- .../luasrc/model/cbi/shadowsocksr/servers.lua | 63 +- .../luasrc/model/cbi/shadowsocksr/status.lua | 129 +- .../luasrc/view/shadowsocksr/ssrurl.htm | 2 + .../luci-app-ssr-plus/po/zh-cn/ssr-plus.po | 18 + .../root/etc/config/black.list | 58 - .../root/etc/config/shadowsocksr | 28 +- .../root/etc/init.d/shadowsocksr | 1073 +++++++++-------- .../root/etc/{ => ssr}/china_ssr.txt | 80 +- .../luci-app-ssr-plus/root/etc/ssr/deny.list | 14 + .../etc/{dnsmasq.ssr => ssr}/gfw_base.conf | 0 .../etc/{dnsmasq.ssr => ssr}/gfw_list.conf | 356 ++---- .../root/etc/{config => ssr}/netflix.list | 0 .../root/etc/{config => ssr}/netflixip.list | 0 .../oversea_list.conf | 0 .../root/etc/uci-defaults/luci-ssr-plus | 48 +- .../root/lib/upgrade/keep.d/luci-app-ssr-plus | 15 +- .../luci-app-ssr-plus/root/usr/bin/ssr-ad | 10 +- .../luci-app-ssr-plus/root/usr/bin/ssr-gfw | 38 +- .../root/usr/bin/ssr-monitor | 50 +- .../luci-app-ssr-plus/root/usr/bin/ssr-rules | 67 +- .../luci-app-ssr-plus/root/usr/bin/ssr-switch | 56 +- .../root/usr/share/shadowsocksr/chinaipset.sh | 12 +- .../usr/share/shadowsocksr/genv2config.lua | 176 +-- .../root/usr/share/shadowsocksr/gfw2ipset.sh | 33 +- .../usr/share/shadowsocksr/ssrplusupdate.sh | 6 +- .../root/usr/share/shadowsocksr/subscribe.lua | 116 +- .../root/usr/share/shadowsocksr/update.lua | 138 +-- 36 files changed, 1521 insertions(+), 1708 deletions(-) delete mode 100644 package/lean/luci-app-ssr-plus/root/etc/config/black.list rename package/lean/luci-app-ssr-plus/root/etc/{ => ssr}/china_ssr.txt (99%) create mode 100644 package/lean/luci-app-ssr-plus/root/etc/ssr/deny.list rename package/lean/luci-app-ssr-plus/root/etc/{dnsmasq.ssr => ssr}/gfw_base.conf (100%) rename package/lean/luci-app-ssr-plus/root/etc/{dnsmasq.ssr => ssr}/gfw_list.conf (97%) rename package/lean/luci-app-ssr-plus/root/etc/{config => ssr}/netflix.list (100%) rename package/lean/luci-app-ssr-plus/root/etc/{config => ssr}/netflixip.list (100%) rename package/lean/luci-app-ssr-plus/root/etc/{dnsmasq.oversea => ssr}/oversea_list.conf (100%) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 431ff9eb0e..4dae5c42a0 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus -PKG_VERSION:=177 +PKG_VERSION:=180 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk @@ -32,10 +32,10 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server default y if i386||x86_64||arm||aarch64 endef -LUCI_TITLE:=SS/SSR/V2Ray/Trojan LuCI interface +LUCI_TITLE:=SS/SSR/V2Ray/Trojan/Socks5/Tun LuCI interface LUCI_PKGARCH:=all LUCI_DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +pdnsd-alt +wget +lua +libuci-lua \ - +microsocks +dns2socks +shadowsocks-libev-ss-local +shadowsocksr-libev-ssr-local +shadowsocks-libev-ss-redir +simple-obfs +tcpping \ + +microsocks +dns2socks +shadowsocks-libev-ss-local +shadowsocksr-libev-ssr-local +shadowsocks-libev-ss-redir +simple-obfs +tcpping +resolveip\ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \ diff --git a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua index 3176ad4562..f0ada633a5 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua @@ -74,105 +74,50 @@ function refresh_data() local set = luci.http.formvalue("set") local uci = luci.model.uci.cursor() local icount = 0 - if set == "gfw_data" then - refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'gfwlist_url', 'https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt') .. ' > /tmp/gfw.b64' + local retstring = 0 + local function update(url, file, type, file2) + local Num = 1 + refresh_cmd = "wget-ssl --no-check-certificate -t 3 -T 10 -O- " .. url .. " > /tmp/ssr-update." .. type sret = luci.sys.call(refresh_cmd .. " 2>/dev/null") if sret == 0 then - luci.sys.call("/usr/bin/ssr-gfw") - icount = luci.sys.exec("cat /tmp/gfwnew.txt | wc -l") - if tonumber(icount) > 1000 then - if nixio.fs.access("/etc/dnsmasq.ssr/gfw_list.conf") then - oldcount = luci.sys.exec("cat /etc/dnsmasq.ssr/gfw_list.conf | wc -l") - else - oldcount = "0" - end - if tonumber(icount) ~= tonumber(oldcount) then - luci.sys.exec("cp -f /tmp/gfwnew.txt /etc/dnsmasq.ssr/gfw_list.conf") - luci.sys.exec("cp -f /tmp/gfwnew.txt /tmp/dnsmasq.ssr/gfw_list.conf") - luci.sys.call("/etc/init.d/dnsmasq restart") - retstring = tostring(tonumber(icount)/2) - else - retstring = "0" - end - else - retstring = "-1" + if type == "gfw_data" then + luci.sys.call("/usr/bin/ssr-gfw " .. type) + Num = 2 + end + if type == "ad_data" then + luci.sys.call("/usr/bin/ssr-ad " .. type) + end + local new_md5 = luci.sys.exec("echo -n $([ -f '/tmp/ssr-update." .. type .. "' ] && md5sum /tmp/ssr-update." .. type .. " | awk '{print $1}')") + local old_md5 = luci.sys.exec("echo -n $([ -f '" .. file .. "' ] && md5sum " .. file .. " | awk '{print $1}')") + if new_md5 == old_md5 then + retstring = "0" + else + icount = luci.sys.exec("cat /tmp/ssr-update." .. type .. " | wc -l") + luci.sys.exec("cp -f /tmp/ssr-update." .. type .. " " .. file) + if file2 then luci.sys.exec("cp -f /tmp/ssr-update." .. type .. " " .. file2) end + retstring = tostring(tonumber(icount)/Num) + if type == "gfw_data" or type == "ad_data" then + luci.sys.exec("/usr/share/shadowsocksr/gfw2ipset.sh gfw_data") + else + luci.sys.exec("/etc/init.d/shadowsocksr restart &") + end end - luci.sys.exec("rm -f /tmp/gfwnew.txt") else retstring = "-1" end + luci.sys.exec("rm -f /tmp/ssr-update." .. type) + end + if set == "gfw_data" then + update(uci:get_first("shadowsocksr", "global", "gfwlist_url", "https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt"), "/etc/ssr/gfw_list.conf", set, "/tmp/dnsmasq.ssr/gfw_list.conf") end if set == "ip_data" then - refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'chnroute_url', 'https://ispip.clang.cn/all_cn.txt') .. " > /tmp/china_ssr.txt" - sret = luci.sys.call(refresh_cmd .. " 2>/dev/null") - icount = luci.sys.exec("cat /tmp/china_ssr.txt | wc -l") - if sret == 0 and tonumber(icount) > 1000 then - if nixio.fs.access("/etc/china_ssr.txt") then - oldcount = luci.sys.exec("cat /etc/china_ssr.txt | wc -l") - else - oldcount = "0" - end - if tonumber(icount) ~= tonumber(oldcount) then - luci.sys.exec("cp -f /tmp/china_ssr.txt /etc/china_ssr.txt") - luci.sys.exec("/etc/init.d/shadowsocksr restart &") - retstring = tostring(tonumber(icount)) - else - retstring = "0" - end - else - retstring = "-1" - end - luci.sys.exec("rm -f /tmp/china_ssr.txt") - end - if set == "nfip_data" then - refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'nfip_url','https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt') .." > /tmp/netflixip.list" - sret = luci.sys.call(refresh_cmd .. " 2>/dev/null") - icount = luci.sys.exec("cat /tmp/netflixip.list | wc -l") - if sret == 0 and tonumber(icount) > 5 then - if nixio.fs.access("/etc/config/netflixip.list") then - oldcount = luci.sys.exec("cat /etc/config/netflixip.list | wc -l") - else - oldcount = "0" - end - if tonumber(icount) ~= tonumber(oldcount) then - luci.sys.exec("cp -f /tmp/netflixip.list /etc/config/netflixip.list") - luci.sys.exec("/etc/init.d/shadowsocksr restart &") - retstring = tostring(tonumber(icount)) - else - retstring = "0" - end - else - retstring = "-1" - end - luci.sys.exec("rm -f /tmp/netflixip.list") + update(uci:get_first("shadowsocksr", "global", "chnroute_url","https://ispip.clang.cn/all_cn.txt"), "/etc/ssr/china_ssr.txt", set) end if set == "ad_data" then - refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'adblock_url','https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt') .." > /tmp/adnew.conf" - sret = luci.sys.call(refresh_cmd .. " 2>/dev/null") - if sret == 0 then - luci.sys.call("/usr/bin/ssr-ad") - icount = luci.sys.exec("cat /tmp/ad.conf | wc -l") - if tonumber(icount) > 100 then - if nixio.fs.access("/etc/dnsmasq.ssr/ad.conf") then - oldcount = luci.sys.exec("cat /etc/dnsmasq.ssr/ad.conf | wc -l") - else - oldcount = "0" - end - if tonumber(icount) ~= tonumber(oldcount) then - luci.sys.exec("cp -f /tmp/ad.conf /etc/dnsmasq.ssr/ad.conf") - luci.sys.exec("cp -f /tmp/ad.conf /tmp/dnsmasq.ssr/ad.conf") - luci.sys.call("/etc/init.d/dnsmasq restart") - retstring = tostring(tonumber(icount)) - else - retstring = "0" - end - else - retstring = "-1" - end - luci.sys.exec("rm -f /tmp/ad.conf") - else - retstring = "-1" - end + update(uci:get_first("shadowsocksr", "global", "adblock_url","https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt"), "/etc/ssr/ad.conf", set, "/tmp/dnsmasq.ssr/ad.conf") + end + if set == "nfip_data" then + update(uci:get_first("shadowsocksr", "global", "nfip_url","https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt"), "/etc/ssr/netflixip.list", set) end luci.http.prepare_content("application/json") luci.http.write_json({ret = retstring,retcount = icount}) diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua index d7908e5e6e..1d409a87ff 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua @@ -61,12 +61,13 @@ o.default = "https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt" o = s:option(Value, "chnroute_url", translate("Chnroute Update url")) o:value("https://ispip.clang.cn/all_cn.txt", translate("Clang.CN")) +o:value("https://ispip.clang.cn/all_cn_cidr.txt", translate("Clang.CN.CIDR")) o.default = "https://ispip.clang.cn/all_cn.txt" o = s:option(Value, "nfip_url", translate("nfip_url")) -o:value("https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt", translate("Netflix IP Only")) -o:value("https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/getflix.txt", translate("Netflix and AWS")) -o.default = "https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt" +o:value("https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/NF_only.txt", translate("Netflix IP Only")) +o:value("https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/getflix.txt", translate("Netflix and AWS")) +o.default = "https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/NF_only.txt" o.description = translate("Customize Netflix IP Url") -- [[ SOCKS5 Proxy ]]-- diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index f42822f580..3bedd5bd30 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -1,122 +1,118 @@ -- Copyright (C) 2017 yushi studio github.com/ywb94 -- Licensed to the public under the GNU General Public License v3. +require "nixio.fs" +require "luci.sys" +require "luci.http" local m, s, o,kcp_enable local shadowsocksr = "shadowsocksr" -local uci = luci.model.uci.cursor() -local fs = require "nixio.fs" -local sys = require "luci.sys" local sid = arg[1] local uuid = luci.sys.exec("cat /proc/sys/kernel/random/uuid") -local http = require "luci.http" local function isKcptun(file) - if not fs.access(file, "rwx", "rx", "rx") then - fs.chmod(file, 755) - end - - local str = sys.exec(file .. " -v | awk '{printf $1}'") - return (str:lower() == "kcptun") +if not nixio.fs.access(file, "rwx", "rx", "rx") then +nixio.fs.chmod(file, 755) +end +local str = luci.sys.exec(file .. " -v | awk '{printf $1}'") +return (str:lower() == "kcptun") end - local server_table = {} local encrypt_methods = { - "none", - "table", - "rc4", - "rc4-md5-6", - "rc4-md5", - "aes-128-cfb", - "aes-192-cfb", - "aes-256-cfb", - "aes-128-ctr", - "aes-192-ctr", - "aes-256-ctr", - "bf-cfb", - "camellia-128-cfb", - "camellia-192-cfb", - "camellia-256-cfb", - "cast5-cfb", - "des-cfb", - "idea-cfb", - "rc2-cfb", - "seed-cfb", - "salsa20", - "chacha20", - "chacha20-ietf", +"none", +"table", +"rc4", +"rc4-md5-6", +"rc4-md5", +"aes-128-cfb", +"aes-192-cfb", +"aes-256-cfb", +"aes-128-ctr", +"aes-192-ctr", +"aes-256-ctr", +"bf-cfb", +"camellia-128-cfb", +"camellia-192-cfb", +"camellia-256-cfb", +"cast5-cfb", +"des-cfb", +"idea-cfb", +"rc2-cfb", +"seed-cfb", +"salsa20", +"chacha20", +"chacha20-ietf", } local encrypt_methods_ss = { - -- aead - "aes-128-gcm", - "aes-192-gcm", - "aes-256-gcm", - "chacha20-ietf-poly1305", - "xchacha20-ietf-poly1305", - -- stream - "table", - "rc4", - "rc4-md5", - "aes-128-cfb", - "aes-192-cfb", - "aes-256-cfb", - "aes-128-ctr", - "aes-192-ctr", - "aes-256-ctr", - "bf-cfb", - "camellia-128-cfb", - "camellia-192-cfb", - "camellia-256-cfb", - "salsa20", - "chacha20", - "chacha20-ietf", +-- aead +"aes-128-gcm", +"aes-192-gcm", +"aes-256-gcm", +"chacha20-ietf-poly1305", +"xchacha20-ietf-poly1305", +-- stream +"table", +"rc4", +"rc4-md5", +"aes-128-cfb", +"aes-192-cfb", +"aes-256-cfb", +"aes-128-ctr", +"aes-192-ctr", +"aes-256-ctr", +"bf-cfb", +"camellia-128-cfb", +"camellia-192-cfb", +"camellia-256-cfb", +"salsa20", +"chacha20", +"chacha20-ietf", } local protocol = { - "origin", - "verify_deflate", - "auth_sha1_v4", - "auth_aes128_sha1", - "auth_aes128_md5", - "auth_chain_a", - "auth_chain_b", - "auth_chain_c", - "auth_chain_d", - "auth_chain_e", - "auth_chain_f", +"origin", +"verify_deflate", +"auth_sha1_v4", +"auth_aes128_sha1", +"auth_aes128_md5", +"auth_chain_a", +"auth_chain_b", +"auth_chain_c", +"auth_chain_d", +"auth_chain_e", +"auth_chain_f", } obfs = { - "plain", - "http_simple", - "http_post", - "random_head", - "tls1.2_ticket_auth", +"plain", +"http_simple", +"http_post", +"random_head", +"tls1.2_ticket_auth", } local securitys = { - "auto", - "none", - "aes-128-gcm", - "chacha20-poly1305" +"auto", +"none", +"aes-128-gcm", +"chacha20-poly1305" } - m = Map(shadowsocksr, translate("Edit ShadowSocksR Server")) m.redirect = luci.dispatcher.build_url("admin/services/shadowsocksr/servers") if m.uci:get(shadowsocksr, sid) ~= "servers" then - luci.http.redirect(m.redirect) - return +luci.http.redirect(m.redirect) +return end -- [[ Servers Setting ]]-- s = m:section(NamedSection, sid, "servers") s.anonymous = true -s.addremove = false +s.addremove = false o = s:option(DummyValue,"ssr_url","SS/SSR/V2RAY/TROJAN URL") -o.rawhtml = true +o.rawhtml = true o.template = "shadowsocksr/ssrurl" o.value =sid @@ -140,8 +136,8 @@ o.description = translate("Using incorrect encryption mothod may causes service o = s:option(Value, "alias", translate("Alias(optional)")) o = s:option(ListValue, "iface", translate("Network interface to use")) -for _, e in ipairs(sys.net.devices()) do - if e ~= "lo" then o:value(e) end +for _, e in ipairs(luci.sys.net.devices()) do +if e ~= "lo" then o:value(e) end end o:depends("type", "tun") o.description = translate("Redirect traffic to this network interface") @@ -250,8 +246,8 @@ o:depends("type", "v2ray") -- TCP伪装 o = s:option(ListValue, "tcp_guise", translate("Camouflage Type")) o:depends("transport", "tcp") -o:value("http", "HTTP") o:value("none", translate("None")) +o:value("http", "HTTP") o.rmempty = true -- HTTP域名 @@ -292,10 +288,10 @@ o.rmempty = true o = s:option(ListValue, "quic_security", translate("QUIC Security")) o:depends("transport", "quic") -o.rmempty = true o:value("none", translate("None")) o:value("aes-128-gcm", translate("aes-128-gcm")) o:value("chacha20-poly1305", translate("chacha20-poly1305")) +o.rmempty = true o = s:option(Value, "quic_key", translate("QUIC Key")) o:depends("transport", "quic") @@ -365,11 +361,11 @@ o.rmempty = true -- [[ allowInsecure ]]-- o = s:option(Flag, "insecure", translate("allowInsecure")) -o.rmempty = true +o.rmempty = false o:depends("type", "v2ray") o:depends("type", "trojan") o.default = "1" - +o.description = translate("If true, allowss insecure connection at TLS client, e.g., TLS server uses unverifiable certificates.") -- [[ TLS ]]-- o = s:option(Flag, "tls", translate("TLS")) o.rmempty = true @@ -409,31 +405,31 @@ o:depends("certificate", 1) cert_dir = "/etc/ssl/private/" local path -http.setfilehandler( - function(meta, chunk, eof) - if not fd then - if (not meta) or (not meta.name) or (not meta.file) then return end - fd = nixio.open(cert_dir .. meta.file, "w") - if not fd then - path = translate("Create upload file error.") - return - end - end - if chunk and fd then - fd:write(chunk) - end - if eof and fd then - fd:close() - fd = nil - path = '/etc/ssl/private/' .. meta.file .. '' - end - end - ) +luci.http.setfilehandler( +function(meta, chunk, eof) +if not fd then +if (not meta) or (not meta.name) or (not meta.file) then return end +fd = nixio.open(cert_dir .. meta.file, "w") +if not fd then +path = translate("Create upload file error.") +return +end +end +if chunk and fd then +fd:write(chunk) +end +if eof and fd then +fd:close() +fd = nil +path = '/etc/ssl/private/' .. meta.file .. '' +end +end +) if luci.http.formvalue("upload") then - local f = luci.http.formvalue("ulfile") - if #f <= 0 then - path = translate("No specify upload file.") - end +local f = luci.http.formvalue("ulfile") +if #f <= 0 then +path = translate("No specify upload file.") +end end o = s:option(Value, "certpath", translate("Current Certificate Path")) @@ -459,7 +455,6 @@ o.default = 1234 o.rmempty = false if nixio.fs.access("/usr/bin/kcptun-client") then - kcp_enable = s:option(Flag, "kcp_enable", translate("KcpTun Enable"), translate("bin:/usr/bin/kcptun-client")) kcp_enable.rmempty = true kcp_enable.default = "0" @@ -470,17 +465,17 @@ o = s:option(Value, "kcp_port", translate("KcpTun Port")) o.datatype = "port" o.default = 4000 function o.validate(self, value, section) - local kcp_file="/usr/bin/kcptun-client" - local enable = kcp_enable:formvalue(section) or kcp_enable.disabled - if enable == kcp_enable.enabled then - if not fs.access(kcp_file) then - return nil, translate("Haven't a Kcptun executable file") - elseif not isKcptun(kcp_file) then - return nil, translate("Not a Kcptun executable file") - end - end +local kcp_file="/usr/bin/kcptun-client" +local enable = kcp_enable:formvalue(section) or kcp_enable.disabled +if enable == kcp_enable.enabled then +if not nixio.fs.access(kcp_file) then +return nil, translate("Haven't a Kcptun executable file") +elseif not isKcptun(kcp_file) then +return nil, translate("Not a Kcptun executable file") +end +end - return value +return value end o:depends("type", "ssr") o:depends("type", "ss") @@ -494,7 +489,6 @@ o = s:option(Value, "kcp_param", translate("KcpTun Param")) o.default = "--nocomp" o:depends("type", "ssr") o:depends("type", "ss") - end return m diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua index c73e5e21dd..f17415f957 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua @@ -5,12 +5,9 @@ local m, s, sec, o, kcp_enable local shadowsocksr = "shadowsocksr" local uci = luci.model.uci.cursor() - -local sys = require "luci.sys" - m = Map(shadowsocksr, translate("ShadowSocksR Plus+ Settings")) -m:section(SimpleSection).template = "shadowsocksr/status" +m:section(SimpleSection).template = "shadowsocksr/status" local server_table = {} uci:foreach(shadowsocksr, "servers", function(s) @@ -106,4 +103,3 @@ o.description = translate("Custom DNS Server format as IP:PORT (default: 8.8.4.4 return m - diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/control.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/control.lua index 7a5e33b63c..ef4a6ba102 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/control.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/control.lua @@ -1,5 +1,6 @@ +require "luci.ip" +require "nixio.fs" local m, s, o -local NXFS = require "nixio.fs" m = Map("shadowsocksr", translate("IP black-and-white list")) @@ -27,9 +28,9 @@ o.rmempty = false o = s:taboption("lan_ac", DynamicList, "lan_ac_ips", translate("LAN Host List")) o.datatype = "ipaddr" luci.ip.neighbors({ family = 4 }, function(entry) - if entry.reachable then - o:value(entry.dest:string()) - end + if entry.reachable then + o:value(entry.dest:string()) + end end) o:depends("lan_ac_mode", "w") o:depends("lan_ac_mode", "b") @@ -37,25 +38,25 @@ o:depends("lan_ac_mode", "b") o = s:taboption("lan_ac", DynamicList, "lan_bp_ips", translate("LAN Bypassed Host List")) o.datatype = "ipaddr" luci.ip.neighbors({ family = 4 }, function(entry) - if entry.reachable then - o:value(entry.dest:string()) - end + if entry.reachable then + o:value(entry.dest:string()) + end end) o = s:taboption("lan_ac", DynamicList, "lan_fp_ips", translate("LAN Force Proxy Host List")) o.datatype = "ipaddr" luci.ip.neighbors({ family = 4 }, function(entry) - if entry.reachable then - o:value(entry.dest:string()) - end + if entry.reachable then + o:value(entry.dest:string()) + end end) o = s:taboption("lan_ac", DynamicList, "lan_gm_ips", translate("Game Mode Host List")) o.datatype = "ipaddr" luci.ip.neighbors({ family = 4 }, function(entry) - if entry.reachable then - o:value(entry.dest:string()) - end + if entry.reachable then + o:value(entry.dest:string()) + end end) -- Part of Self @@ -66,73 +67,68 @@ end) -- o:value("2", translatef("Forwarded Proxy")) -- o.rmempty = false -s:tab("esc", translate("Bypass Domain List")) - -local escconf = "/etc/config/white.list" +s:tab("esc", translate("Bypass Domain List")) +local escconf = "/etc/ssr/white.list" o = s:taboption("esc", TextValue, "escconf") o.rows = 13 o.wrap = "off" o.rmempty = true o.cfgvalue = function(self, section) - return NXFS.readfile(escconf) or "" + return nixio.fs.readfile(escconf) or "" end o.write = function(self, section, value) - NXFS.writefile(escconf, value:gsub("\r\n", "\n")) + nixio.fs.writefile(escconf, value:gsub("\r\n", "\n")) end o.remove = function(self, section, value) - NXFS.writefile(escconf, "") + nixio.fs.writefile(escconf, "") end - -s:tab("block", translate("Black Domain List")) - -local blockconf = "/etc/config/black.list" +s:tab("block", translate("Black Domain List")) +local blockconf = "/etc/ssr/black.list" o = s:taboption("block", TextValue, "blockconf") o.rows = 13 o.wrap = "off" o.rmempty = true o.cfgvalue = function(self, section) - return NXFS.readfile(blockconf) or " " + return nixio.fs.readfile(blockconf) or " " end o.write = function(self, section, value) - NXFS.writefile(blockconf, value:gsub("\r\n", "\n")) + nixio.fs.writefile(blockconf, value:gsub("\r\n", "\n")) end o.remove = function(self, section, value) - NXFS.writefile(blockconf, "") + nixio.fs.writefile(blockconf, "") end -s:tab("netflix", translate("Netflix Domain List")) +s:tab("denydomain", translate("Deny Domain List")) +local denydomainconf = "/etc/ssr/deny.list" +o = s:taboption("denydomain", TextValue, "denydomainconf") +o.rows = 13 +o.wrap = "off" +o.rmempty = true +o.cfgvalue = function(self, section) + return nixio.fs.readfile(denydomainconf) or " " +end +o.write = function(self, section, value) + nixio.fs.writefile(denydomainconf, value:gsub("\r\n", "\n")) +end +o.remove = function(self, section, value) + nixio.fs.writefile(denydomainconf, "") +end -local netflixconf = "/etc/config/netflix.list" +s:tab("netflix", translate("Netflix Domain List")) +local netflixconf = "/etc/ssr/netflix.list" o = s:taboption("netflix", TextValue, "netflixconf") o.rows = 13 o.wrap = "off" o.rmempty = true o.cfgvalue = function(self, section) - return NXFS.readfile(netflixconf) or " " + return nixio.fs.readfile(netflixconf) or " " end o.write = function(self, section, value) - NXFS.writefile(netflixconf, value:gsub("\r\n", "\n")) + nixio.fs.writefile(netflixconf, value:gsub("\r\n", "\n")) end o.remove = function(self, section, value) - NXFS.writefile(netflixconf, "") -end - -s:tab("netflixip", translate("Netflix IP List")) - -local netflixipconf = "/etc/config/netflixip.list" -o = s:taboption("netflixip", TextValue, "netflixipconf") -o.rows = 13 -o.wrap = "off" -o.rmempty = true -o.cfgvalue = function(self, section) - return NXFS.readfile(netflixipconf) or " " -end -o.write = function(self, section, value) - NXFS.writefile(netflixipconf, value:gsub("\r\n", "\n")) -end -o.remove = function(self, section, value) - NXFS.writefile(netflixipconf, "") + nixio.fs.writefile(netflixconf, "") end return m diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/log.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/log.lua index 6c5938ed7f..a71d0003bf 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/log.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/log.lua @@ -1,20 +1,20 @@ -local fs = require "nixio.fs" - +require "luci.util" +require "nixio.fs" f = SimpleForm("logview") - +f.reset = false +f.submit = false t = f:field(TextValue, "conf") t.rmempty = true t.rows = 20 function t.cfgvalue() - if fs.access("/tmp/ssrplus.log") then - local logs = luci.util.execi("cat /tmp/ssrplus.log") - local s = "" - for line in logs do - s = line .. "\n" .. s - end - return s - end + if nixio.fs.access("/tmp/ssrplus.log") then + local logs = luci.util.execi("cat /tmp/ssrplus.log") + local s = "" + for line in logs do + s = line .. "\n" .. s + end + return s + end end t.readonly="readonly" - -return f \ No newline at end of file +return f diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server-config.lua index 29c75a406a..3361f7c36e 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server-config.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server-config.lua @@ -9,38 +9,38 @@ local shadowsocksr = "shadowsocksr" local sid = arg[1] local encrypt_methods = { - "rc4-md5", - "rc4-md5-6", - "rc4", - "table", - "aes-128-cfb", - "aes-192-cfb", - "aes-256-cfb", - "aes-128-ctr", - "aes-192-ctr", - "aes-256-ctr", - "bf-cfb", - "camellia-128-cfb", - "camellia-192-cfb", - "camellia-256-cfb", - "cast5-cfb", - "des-cfb", - "idea-cfb", - "rc2-cfb", - "seed-cfb", - "salsa20", - "chacha20", - "chacha20-ietf", +"rc4-md5", +"rc4-md5-6", +"rc4", +"table", +"aes-128-cfb", +"aes-192-cfb", +"aes-256-cfb", +"aes-128-ctr", +"aes-192-ctr", +"aes-256-ctr", +"bf-cfb", +"camellia-128-cfb", +"camellia-192-cfb", +"camellia-256-cfb", +"cast5-cfb", +"des-cfb", +"idea-cfb", +"rc2-cfb", +"seed-cfb", +"salsa20", +"chacha20", +"chacha20-ietf", } local protocol = { - "origin", +"origin", } obfs = { - "plain", - "http_simple", - "http_post", +"plain", +"http_simple", +"http_post", } m = Map(shadowsocksr, translate("Edit ShadowSocksR Server")) @@ -51,13 +51,10 @@ if m.uci:get(shadowsocksr, sid) ~= "server_config" then return end - - - -- [[ Server Setting ]]-- s = m:section(NamedSection, sid, "server_config") s.anonymous = true -s.addremove = false +s.addremove = false o = s:option(Flag, "enable", translate("Enable")) o.default = 1 @@ -66,14 +63,16 @@ o.rmempty = false o = s:option(ListValue, "type", translate("Server Type")) o:value("socks5", translate("Socks5")) if nixio.fs.access("/usr/bin/ssr-server") then -o:value("ssr", translate("ShadowsocksR")) + o:value("ssr", translate("ShadowsocksR")) end o.default = "socks5" o = s:option(Value, "server_port", translate("Server Port")) o.datatype = "port" -o.default = 8388 +math.randomseed(tostring(os.time()):reverse():sub(1, 7)) +o.default = math.random(10240,20480) o.rmempty = false +o.description = translate("warning! Please do not reuse the port!") o = s:option(Value, "timeout", translate("Connection Timeout")) o.datatype = "uinteger" @@ -99,7 +98,6 @@ for _, v in ipairs(protocol) do o:value(v) end o.rmempty = false o:depends("type", "ssr") - o = s:option(ListValue, "obfs", translate("Obfs")) for _, v in ipairs(obfs) do o:value(v) end o.rmempty = false diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server.lua index ec273e0f3b..a41163e1a5 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server.lua @@ -1,56 +1,53 @@ -- Copyright (C) 2017 yushi studio -- Licensed to the public under the GNU General Public License v3. - +require "luci.http" +require "luci.dispatcher" local m, sec, o local shadowsocksr = "shadowsocksr" -local uci = luci.model.uci.cursor() - - -m = Map(shadowsocksr) - local encrypt_methods = { - "table", - "rc4", - "rc4-md5", - "rc4-md5-6", - "aes-128-cfb", - "aes-192-cfb", - "aes-256-cfb", - "aes-128-ctr", - "aes-192-ctr", - "aes-256-ctr", - "bf-cfb", - "camellia-128-cfb", - "camellia-192-cfb", - "camellia-256-cfb", - "cast5-cfb", - "des-cfb", - "idea-cfb", - "rc2-cfb", - "seed-cfb", - "salsa20", - "chacha20", - "chacha20-ietf", +"table", +"rc4", +"rc4-md5", +"rc4-md5-6", +"aes-128-cfb", +"aes-192-cfb", +"aes-256-cfb", +"aes-128-ctr", +"aes-192-ctr", +"aes-256-ctr", +"bf-cfb", +"camellia-128-cfb", +"camellia-192-cfb", +"camellia-256-cfb", +"cast5-cfb", +"des-cfb", +"idea-cfb", +"rc2-cfb", +"seed-cfb", +"salsa20", +"chacha20", +"chacha20-ietf", } local protocol = { - "origin", - "verify_deflate", - "auth_sha1_v4", - "auth_aes128_sha1", - "auth_aes128_md5", - "auth_chain_a", +"origin", +"verify_deflate", +"auth_sha1_v4", +"auth_aes128_sha1", +"auth_aes128_md5", +"auth_chain_a", } obfs = { - "plain", - "http_simple", - "http_post", - "random_head", - "tls1.2_ticket_auth", - "tls1.2_ticket_fastauth", +"plain", +"http_simple", +"http_post", +"random_head", +"tls1.2_ticket_auth", +"tls1.2_ticket_fastauth", } +m = Map(shadowsocksr) -- [[ Global Setting ]]-- sec = m:section(TypedSection, "server_global", translate("Global Setting")) sec.anonymous = true diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua index d1ca504671..6ab28404a6 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua @@ -1,20 +1,16 @@ -- Licensed to the public under the GNU General Public License v3. - +require "luci.http" +require "luci.dispatcher" +require "luci.model.uci" local m, s, o local shadowsocksr = "shadowsocksr" - local uci = luci.model.uci.cursor() local server_count = 0 uci:foreach("shadowsocksr", "servers", function(s) - server_count = server_count + 1 + server_count = server_count + 1 end) -local fs = require "nixio.fs" -local sys = require "luci.sys" - -local ucic = luci.model.uci.cursor() - -m = Map(shadowsocksr, translate("Servers subscription and manage")) +m = Map(shadowsocksr, translate("Servers subscription and manage")) -- Server Subscribe @@ -28,7 +24,7 @@ o.description = translate("Auto Update Server subscription, GFW list and CHN rou o = s:option(ListValue, "auto_update_time", translate("Update time (every day)")) for t = 0,23 do -o:value(t, t..":00") + o:value(t, t..":00") end o.default=2 o.rmempty = false @@ -44,7 +40,7 @@ o = s:option(Button,"update_Sub",translate("Update Subscribe List")) o.inputstyle = "reload" o.description = translate("Update subscribe url list first") o.write = function() - luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers")) + luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers")) end o = s:option(Flag, "switch", translate("Subscribe Default Auto-Switch")) @@ -58,25 +54,25 @@ o.description = translate("Through proxy update list, Not Recommended ") o = s:option(Button,"subscribe", translate("Update All Subscribe Severs")) -o.rawhtml = true +o.rawhtml = true o.template = "shadowsocksr/subscribe" o = s:option(Button,"delete",translate("Delete All Subscribe Severs")) o.inputstyle = "reset" -o.description = string.format(translate("Server Count") .. ": %d", server_count) +o.description = string.format(translate("Server Count") .. ": %d", server_count) o.write = function() -uci:delete_all("shadowsocksr", "servers", function(s) - if s.hashkey or s.isSubscribe then - return true - else - return false - end -end) -uci:save("shadowsocksr") -uci:commit("shadowsocksr") -luci.sys.exec("/etc/init.d/shadowsocksr restart") -luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers")) -return + uci:delete_all("shadowsocksr", "servers", function(s) + if s.hashkey or s.isSubscribe then + return true + else + return false + end + end) + uci:save("shadowsocksr") + uci:commit("shadowsocksr") + luci.sys.exec("/etc/init.d/shadowsocksr restart") + luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers")) + return end -- [[ Servers Manage ]]-- @@ -85,12 +81,12 @@ s.anonymous = true s.addremove = true s.template = "cbi/tblsection" s.sortable = true -s.extedit = luci.dispatcher.build_url("admin/services/shadowsocksr/servers/%s") +s.extedit = luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers", "%s") function s.create(...) local sid = TypedSection.create(...) if sid then luci.http.redirect(s.extedit % sid) - return + return end end @@ -117,15 +113,14 @@ o = s:option(DummyValue, "server", translate("Ping Latency")) o.template="shadowsocksr/ping" o.width="10%" - node = s:option(Button,"apply_node",translate("Apply")) node.inputstyle = "apply" node.write = function(self, section) - ucic:set("shadowsocksr", '@global[0]', 'global_server', section) - ucic:save("shadowsocksr") - ucic:commit("shadowsocksr") - luci.sys.exec("/etc/init.d/shadowsocksr restart") - luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "client")) + uci:set("shadowsocksr", '@global[0]', 'global_server', section) + uci:save("shadowsocksr") + uci:commit("shadowsocksr") + luci.sys.exec("/etc/init.d/shadowsocksr restart") + luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "client")) end o = s:option(Flag, "switch_enable", translate("Auto Switch")) @@ -136,4 +131,4 @@ end m:append(Template("shadowsocksr/server_list")) -return m \ No newline at end of file +return m diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua index 0ae5219eea..c12fd5e258 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua @@ -1,6 +1,8 @@ -- Copyright (C) 2017 yushi studio -- Licensed to the public under the GNU General Public License v3. - +require "nixio.fs" +require "luci.sys" +require "luci.model.uci" local m, s, o local redir_run=0 local reudp_run=0 @@ -19,72 +21,67 @@ font_blue = [[]] font_off = [[]] bold_on = [[]] bold_off = [[]] - -local fs = require "nixio.fs" -local sys = require "luci.sys" local kcptun_version=translate("Unknown") local kcp_file="/usr/bin/kcptun-client" -if not fs.access(kcp_file) then -kcptun_version=translate("Not exist") +if not nixio.fs.access(kcp_file) then + kcptun_version=translate("Not exist") else -if not fs.access(kcp_file, "rwx", "rx", "rx") then -fs.chmod(kcp_file, 755) -end -kcptun_version=sys.exec(kcp_file .. " -v | awk '{printf $3}'") -if not kcptun_version or kcptun_version == "" then -kcptun_version = translate("Unknown") + if not nixio.fs.access(kcp_file, "rwx", "rx", "rx") then + nixio.fs.chmod(kcp_file, 755) + end + kcptun_version=luci.sys.exec(kcp_file .. " -v | awk '{printf $3}'") + if not kcptun_version or kcptun_version == "" then + kcptun_version = translate("Unknown") + end end +if nixio.fs.access("/etc/ssr/gfw_list.conf") then + gfw_count = tonumber(luci.sys.exec("cat /etc/ssr/gfw_list.conf | wc -l"))/2 end -if nixio.fs.access("/etc/dnsmasq.ssr/gfw_list.conf") then -gfw_count = tonumber(sys.exec("cat /etc/dnsmasq.ssr/gfw_list.conf | wc -l"))/2 +if nixio.fs.access("/etc/ssr/ad.conf") then + ad_count = tonumber(luci.sys.exec("cat /etc/ssr/ad.conf | wc -l")) end -if nixio.fs.access("/etc/dnsmasq.ssr/ad.conf") then -ad_count = tonumber(sys.exec("cat /etc/dnsmasq.ssr/ad.conf | wc -l")) +if nixio.fs.access("/etc/ssr/china_ssr.txt") then + ip_count = tonumber(luci.sys.exec("cat /etc/ssr/china_ssr.txt | wc -l")) end -if nixio.fs.access("/etc/china_ssr.txt") then -ip_count = tonumber(sys.exec("cat /etc/china_ssr.txt | wc -l")) +if nixio.fs.access("/etc/ssr/netflixip.list") then + nfip_count = tonumber(luci.sys.exec("cat /etc/ssr/netflixip.list | wc -l")) end -if nixio.fs.access("/etc/config/netflixip.list") then -nfip_count = tonumber(sys.exec("cat /etc/config/netflixip.list | wc -l")) -end - -local icount=sys.exec("busybox ps -w | grep ssr-reudp |grep -v grep| wc -l") +local icount=luci.sys.exec("busybox ps -w | grep ssr-reudp |grep -v grep| wc -l") if tonumber(icount)>0 then -reudp_run=1 + reudp_run=1 else -icount=sys.exec("busybox ps -w | grep ssr-retcp |grep \"\\-u\"|grep -v grep| wc -l") -if tonumber(icount)>0 then -reudp_run=1 -end + icount=luci.sys.exec("busybox ps -w | grep ssr-retcp |grep \"\\-u\"|grep -v grep| wc -l") + if tonumber(icount)>0 then + reudp_run=1 + end end if luci.sys.call("busybox ps -w | grep ssr-retcp | grep -v grep >/dev/null") == 0 then -redir_run=1 + redir_run=1 end if luci.sys.call("busybox ps -w | grep ssr-local | grep -v ssr-socksdns |grep -v grep >/dev/null") == 0 then -sock5_run=1 + sock5_run=1 end if luci.sys.call("pidof kcptun-client >/dev/null") == 0 then -kcptun_run=1 + kcptun_run=1 end if luci.sys.call("busybox ps -w | grep ssr-server | grep -v grep >/dev/null") == 0 then -server_run=1 -end - -if luci.sys.call("busybox ps -w | grep ssr-tunnel |grep -v grep >/dev/null") == 0 then -tunnel_run=1 + server_run=1 end +-- if luci.sys.call("busybox ps -w | grep ssr-tunnel |grep -v grep >/dev/null") == 0 then +-- tunnel_run=1 +-- end if luci.sys.call("pidof pdnsd >/dev/null") == 0 or (luci.sys.call("busybox ps -w | grep ssr-dns |grep -v grep >/dev/null") == 0 and luci.sys.call("pidof dns2socks >/dev/null") == 0)then -pdnsd_run=1 + pdnsd_run=1 end m = SimpleForm("Version") @@ -94,56 +91,56 @@ m.submit = false s=m:field(DummyValue,"redir_run",translate("Global Client")) s.rawhtml = true if redir_run == 1 then -s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off + s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off else -s.value = translate("Not Running") + s.value = translate("Not Running") end s=m:field(DummyValue,"reudp_run",translate("Game Mode UDP Relay")) s.rawhtml = true if reudp_run == 1 then -s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off + s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off else -s.value = translate("Not Running") + s.value = translate("Not Running") end if uci:get_first(shadowsocksr, 'global', 'pdnsd_enable', '0') ~= '0' then -s=m:field(DummyValue,"pdnsd_run",translate("DNS Anti-pollution")) -s.rawhtml = true -if pdnsd_run == 1 then -s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off -else -s.value = translate("Not Running") -end + s=m:field(DummyValue,"pdnsd_run",translate("DNS Anti-pollution")) + s.rawhtml = true + if pdnsd_run == 1 then + s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off + else + s.value = translate("Not Running") + end end s=m:field(DummyValue,"sock5_run",translate("Global SOCKS5 Proxy Server")) s.rawhtml = true if sock5_run == 1 then -s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off + s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off else -s.value = translate("Not Running") + s.value = translate("Not Running") end s=m:field(DummyValue,"server_run",translate("Local Servers")) s.rawhtml = true if server_run == 1 then -s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off + s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off else -s.value = translate("Not Running") + s.value = translate("Not Running") end if nixio.fs.access("/usr/bin/kcptun-client") then -s=m:field(DummyValue,"kcp_version",translate("KcpTun Version")) -s.rawhtml = true -s.value =kcptun_version -s=m:field(DummyValue,"kcptun_run",translate("KcpTun")) -s.rawhtml = true -if kcptun_run == 1 then -s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off -else -s.value = translate("Not Running") -end + s=m:field(DummyValue,"kcp_version",translate("KcpTun Version")) + s.rawhtml = true + s.value =kcptun_version + s=m:field(DummyValue,"kcptun_run",translate("KcpTun")) + s.rawhtml = true + if kcptun_run == 1 then + s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off + else + s.value = translate("Not Running") + end end s=m:field(DummyValue,"google",translate("Google Connectivity")) @@ -170,10 +167,10 @@ s.template = "shadowsocksr/refresh" s.value = nfip_count .. " " .. translate("Records") if uci:get_first(shadowsocksr, 'global', 'adblock', '0') == '1' then -s=m:field(DummyValue,"ad_data",translate("Advertising Data")) -s.rawhtml = true -s.template = "shadowsocksr/refresh" -s.value = ad_count .. " " .. translate("Records") + s=m:field(DummyValue,"ad_data",translate("Advertising Data")) + s.rawhtml = true + s.template = "shadowsocksr/refresh" + s.value = ad_count .. " " .. translate("Records") end s=m:field(DummyValue,"check_port",translate("Check Server Port")) diff --git a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm index e734af05a8..ac2a27f627 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm +++ b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm @@ -262,6 +262,8 @@ document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].value = ssm.net; document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].dispatchEvent(event); if (ssm.net == "tcp") { + if (ssm.type && ssm.type != "http") {ssm.type = "none"} + document.getElementsByName('cbid.shadowsocksr.' + sid + '.tcp_guise')[0].value = ssm.type; document.getElementsByName('cbid.shadowsocksr.' + sid + '.http_host')[0].value = ssm.host; document.getElementsByName('cbid.shadowsocksr.' + sid + '.http_path')[0].value = ssm.path; } diff --git a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po index 6052702dab..7676547003 100644 --- a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po +++ b/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po @@ -61,9 +61,21 @@ msgstr "密码" msgid "Encrypt Method" msgstr "加密方式" +msgid "Transport" +msgstr "传输协议" + msgid "Protocol" msgstr "传输协议" +msgid "allowInsecure" +msgstr "允许不安全连接" + +msgid "Concurrency" +msgstr "最大并发连接数" + +msgid "If true, allowss insecure connection at TLS client, e.g., TLS server uses unverifiable certificates." +msgstr "是否允许不安全连接。当选择时，将不会检查远端主机所提供的 TLS 证书的有效性。" + msgid "Protocol param(optional)" msgstr "传输协议参数（可选）" @@ -657,3 +669,9 @@ msgstr "本机服务端" msgid "Global SOCKS5 Proxy Server" msgstr "SOCKS5 代理服务端（全局）" + +msgid "warning! Please do not reuse the port!" +msgstr "警告！请不要重复使用端口！" + +msgid "Deny Domain List" +msgstr "禁止连接的域名" diff --git a/package/lean/luci-app-ssr-plus/root/etc/config/black.list b/package/lean/luci-app-ssr-plus/root/etc/config/black.list deleted file mode 100644 index e60cdc3a10..0000000000 --- a/package/lean/luci-app-ssr-plus/root/etc/config/black.list +++ /dev/null @@ -1,58 +0,0 @@ -1dot1dot1dot1.cloudflare-dns.com -91smartyun.pt -adobe.com -amazonaws.com -ampproject.org -apple.news -aws.amazon.com -azureedge.net -backpackers.com.tw -bitfinex.com -buzzfeed.com -clockwise.ee -cloudflare-dns.com -cloudfront.net -coindesk.com -coinsquare.io -cryptocompare.com -dns.google -dns9.quad9.net -doh.opendns.com -dropboxstatic.com -eurecom.fr -gdax.com -github.com -kknews.cc -nutaq.com -openairinterface.org -skype.com -sublimetext.com -textnow.com -textnow.me -trouter.io -uploaded.net -whatsapp.com -whatsapp.net -wsj.net -google.com -google.com.hk -gstatic.com -googleusercontent.com -googlepages.com -googlevideo.com -googlecode.com -googleapis.com -googlesource.com -googledrive.com -ggpht.com -youtube.com -youtu.be -ytimg.com -twitter.com -facebook.com -fastly.net -akamai.net -akamaiedge.net -akamaihd.net -edgesuite.net -edgekey.net diff --git a/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr index 7e2789232a..4329c7839e 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr @@ -6,38 +6,32 @@ config global option dports '2' option pdnsd_enable '1' option monitor_enable '1' - option global_server 'nil' option enable_switch '1' option switch_timeout '5' option switch_time '667' option switch_try_count '3' - option gfwlist_url 'https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt' + option gfwlist_url 'https://cdn.jsdelivr.net/gh/Loukky/gfwlist-by-loukky/gfwlist.txt' option chnroute_url 'https://ispip.clang.cn/all_cn.txt' - option nfip_url 'https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt' + option nfip_url 'https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/getflix.txt' option adblock_url 'https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf' - option netflix_server 'same' option threads '0' - -config socks5_proxy - option socks '0' - option local_port '1080' - option local_address '0.0.0.0' + option global_server 'disable' + option netflix_server 'nil' + option netflix_proxy '0' config access_control - option wan_bp_list '/etc/china_ssr.txt' - option lan_ac_mode 'b' + option lan_ac_mode '0' option router_proxy '1' list wan_fw_ips '149.154.160.0/20' list wan_fw_ips '67.198.55.0/24' list wan_fw_ips '91.108.4.0/22' list wan_fw_ips '91.108.56.0/22' list wan_fw_ips '109.239.140.0/24' - list wan_fw_ips '1.1.1.1/32' - list wan_fw_ips '1.0.0.1/32' - list wan_fw_ips '8.8.8.8/32' - list wan_fw_ips '8.8.4.4/32' - list wan_fw_ips '9.9.9.9/32' - list wan_fw_ips '146.112.41.2/32' + +config socks5_proxy + option socks '0' + option local_port '1080' + option local_address '0.0.0.0' config server_global option enable_server '0' diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index f45565ecd6..aa6f6cf9d7 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -10,10 +10,11 @@ START=95 STOP=15 - SERVICE_DAEMONIZE=1 -NAME=shadowsocksr EXTRA_COMMANDS=rules +MAXFD=32768 +NAME=shadowsocksr +LOCK_FILE=/var/lock/${NAME}.lock CONFIG_FILE=/var/etc/${NAME}.json CONFIG_UDP_FILE=/var/etc/${NAME}_u.json CONFIG_SOCK5_FILE=/var/etc/${NAME}_s.json @@ -28,7 +29,6 @@ kcp_flag=0 pdnsd_enable_flag=0 switch_enable=0 switch_server=$1 -MAXFD=32768 CRON_FILE=/etc/crontabs/root threads=1 @@ -42,33 +42,48 @@ uci_get_by_type() { echo ${ret:=$3} } +uci_set_by_name() { + uci set $NAME.$1.$2=$3 2>/dev/null + uci commit $NAME +} + +uci_set_by_type() { + uci set $NAME.@$1[0].$2=$3 2>/dev/null + uci commit $NAME +} + uci_get_by_cfgid() { local ret=$(uci show $NAME.@$1[0].$2 | awk -F '.' '{print $2}' 2>/dev/null) echo ${ret:=$3} } -check_host() { +get_host_ip() { local host=$1 - if echo $host | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then - hostip=$host - elif [ "$host" != "${host#*:[0-9a-fA-F]}" ]; then - hostip=$host - else - hostip=$(ping $host -W 1 -s 1 -c 1 | grep PING | cut -d'(' -f 2 | cut -d')' -f1) - if echo $hostip | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then - hostip=$hostip + local isip="" + local ip=$host + isip=$(echo $host | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}") + if [ -z "$isip" ]; then + if [ "$host" != "${host#*:[0-9a-fA-F]}" ]; then + ip=$host else - hostip="127.0.0.1" + local ip=$(resolveip -4 -t 3 $host | awk 'NR==1{print}') + [ -z "$ip" ] && ip=$(wget -q -O- http://119.29.29.29/d?dn=$1 | awk -F ';' '{print $1}') fi fi - echo -e $hostip + echo ${ip:="ERROR"} +} + +clean_log() { + logsnum=$(cat /tmp/ssrplus.log 2>/dev/null | wc -l) + [ "$logsnum" -gt 1000 ] && { + echo "$(date "+%Y-%m-%d %H:%M:%S") 日志文件过长，清空处理！" >/tmp/ssrplus.log + } } add_cron() { + touch $CRON_FILE sed -i '/shadowsocksr/d' $CRON_FILE - sed -i '/ssrplus.log/d' $CRON_FILE && echo '0 1 * * * echo "" > /tmp/ssrplus.log' >>$CRON_FILE - [ $(uci_get_by_type server_subscribe auto_update 0) -eq 1 ] && echo "0 $(uci_get_by_type server_subscribe auto_update_time) * * * /usr/share/shadowsocksr/ssrplusupdate.sh >> /tmp/ssrplus.log 2>&1" >>$CRON_FILE - + [ $(uci_get_by_type server_subscribe auto_update 0) -eq 1 ] && echo "0 $(uci_get_by_type server_subscribe auto_update_time) * * * /usr/share/shadowsocksr/ssrplusupdate.sh >>/tmp/ssrplus.log 2>&1" >>$CRON_FILE crontab $CRON_FILE } @@ -76,41 +91,58 @@ del_cron() { sed -i '/shadowsocksr/d' $CRON_FILE sed -i '/ssrplus.log/d' $CRON_FILE /etc/init.d/cron restart + clean_log } -run_mode=$(uci_get_by_type global run_mode) +unlock() { + failcount=1 + while [ "$failcount" -le 10 ]; do + if [ -f "$LOCK_FILE" ]; then + let "failcount++" + sleep 1s + [ "$failcount" -ge 10 ] && rm -f "$LOCK_FILE" + else + break + fi + done +} + +find_bin() { + case "$1" in + ss) ret="/usr/bin/ss-redir" ;; + ss-local) ret="/usr/bin/ss-local" ;; + ssr) ret="/usr/bin/ssr-redir" ;; + ssr-local) ret="/usr/bin/ssr-local" ;; + ssr-server) ret="/usr/bin/ssr-server" ;; + v2ray) ret="/usr/bin/v2ray/v2ray" && [ ! -f "$ret" ] && ret="/usr/bin/v2ray" ;; + trojan) ret="/usr/sbin/trojan" ;; + socks5 | tun) ret="/usr/sbin/redsocks2" ;; + esac + echo $ret +} gen_config_file() { - local host=$(uci_get_by_name $1 server) - if echo $host | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then - hostip=$host - elif [ "$host" != "${host#*:[0-9a-fA-F]}" ]; then - hostip=$host + local hostip=$(get_host_ip $(uci_get_by_name $1 server)) + if [ "$hostip" == "ERROR" ]; then + hostip=$(uci_get_by_name $1 ip) else - hostip=$(ping $host -W 1 -s 1 -c 1 | grep PING | cut -d'(' -f 2 | cut -d')' -f1) - if echo $hostip | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then - hostip=$hostip - else - hostip=$(cat /etc/ssr_ip) - fi + uci_set_by_name $1 ip $hostip fi [ "$2" == "0" -a "$kcp_flag" == "1" ] && hostip="127.0.0.1" - if [ "$2" == "0" ]; then - config_file=$CONFIG_FILE - elif [ "$2" == "1" ]; then - config_file=$CONFIG_UDP_FILE - elif [ "$2" == "2" ]; then - config_file=$CONFIG_NETFLIX_FILE - else - config_file=$CONFIG_SOCK5_FILE - fi + case "$2" in + 0) config_file=$CONFIG_FILE ;; + 1) config_file=$CONFIG_UDP_FILE ;; + 2) config_file=$CONFIG_NETFLIX_FILE ;; + *) config_file=$CONFIG_SOCK5_FILE ;; + esac if [ $(uci_get_by_name $1 fast_open 0) == "1" ]; then fastopen="true" else fastopen="false" fi - local stype=$(uci_get_by_name $1 type) - if [ "$stype" == "ss" ]; then + local type=$(uci_get_by_name $1 type) + case "$type" in + ss) cat <<-EOF >$config_file { "server": "$hostip", @@ -126,16 +158,15 @@ gen_config_file() { EOF local plugin=$(uci_get_by_name $1 plugin) if [ -n "$plugin" ]; then - if [ "$plugin" == "simple-obfs" ]; then - plugin="obfs-local" - fi + [ "$plugin" == "simple-obfs" ] && plugin="obfs-local" if [ -x "/usr/bin/$plugin" ]; then sed -i "s@$hostip\",@$hostip\",\n\"plugin\": \"$plugin\",\n\"plugin_opts\": \"$(uci_get_by_name $1 plugin_opts)\",@" $config_file else echo "$(date "+%Y-%m-%d %H:%M:%S") Warning!!! SIP003 plugin $plugin not found!!!" >>/tmp/ssrplus.log fi fi - elif [ "$stype" == "ssr" ]; then + ;; + ssr) cat <<-EOF >$config_file { "server": "$hostip", @@ -153,357 +184,18 @@ gen_config_file() { "fast_open": $fastopen } EOF - elif [ "$stype" == "v2ray" ]; then + ;; + v2ray) lua /usr/share/shadowsocksr/genv2config.lua $GLOBAL_SERVER tcp $(uci_get_by_name $1 local_port) >/var/etc/v2-ssr-retcp.json sed -i 's/\\//g' /var/etc/v2-ssr-retcp.json - elif [ "$stype" == "trojan" ]; then + ;; + trojan) lua /usr/share/shadowsocksr/gentrojanconfig.lua $GLOBAL_SERVER nat $(uci_get_by_name $1 local_port) >/var/etc/trojan-ssr-retcp.json sed -i 's/\\//g' /var/etc/trojan-ssr-retcp.json - fi -} - -get_arg_out() { - case "$(uci_get_by_type access_control router_proxy 1)" in - 1) echo "-o" ;; - 2) echo "-O" ;; + ;; esac } -start_rules() { - local server=$(uci_get_by_name $GLOBAL_SERVER server) - #resolve name - if echo $server | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then - server=$server - elif [ "$server" != "${server#*:[0-9a-fA-F]}" ]; then - server=$server - else - server=$(ping $server -W 1 -s 1 -c 1 | grep PING | cut -d'(' -f 2 | cut -d')' -f1) - if echo $server | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then - echo $server >/etc/ssr_ip - else - server=$(cat /etc/ssr_ip) - fi - fi - kcp_server=$server - local kcp_enable=$(uci_get_by_name $GLOBAL_SERVER kcp_enable 0) - if [ $kcp_enable == "1" ]; then - kcp_flag=1 - fi - local local_port=$(uci_get_by_name $GLOBAL_SERVER local_port) - local lan_ac_ips=$(uci_get_by_type access_control lan_ac_ips) - local lan_ac_mode=$(uci_get_by_type access_control lan_ac_mode) - local router_proxy=$(uci_get_by_type access_control router_proxy) - if [ "$GLOBAL_SERVER" == "$UDP_RELAY_SERVER" -a "$kcp_flag" == "0" ]; then - ARG_UDP="-u" - elif [ -n "$UDP_RELAY_SERVER" ]; then - ARG_UDP="-U" - local udp_server=$(uci_get_by_name $UDP_RELAY_SERVER server) - local udp_local_port=$(uci_get_by_name $UDP_RELAY_SERVER local_port) - fi - if [ -n "$lan_ac_ips" ]; then - case "$lan_ac_mode" in - w | W | b | B) local ac_ips="$lan_ac_mode$lan_ac_ips" ;; - esac - fi - - #deal gfw firewall rule - local gfwmode="" - if [ "$run_mode" == "gfw" ]; then - gfwmode="-g" - elif [ "$run_mode" == "router" ]; then - gfwmode="-r" - elif [ "$run_mode" == "oversea" ]; then - gfwmode="-c" - elif [ "$run_mode" == "all" ]; then - gfwmode="-z" - fi - local dports=$(uci_get_by_type global dports 1) - if [ $dports == "1" ]; then - proxyport=" " - else - proxyport="-m multiport --dports 22,53,587,465,995,993,143,80,443" - fi - if [ "$NETFLIX_SERVER" != "nil" ]; then - if [ "$NETFLIX_SERVER" != "$GLOBAL_SERVER" ]; then - netflix="1" - else - netflix="2" - fi - else - netflix="0" - fi - netflix_ip=$(check_host $(uci_get_by_name $NETFLIX_SERVER server 127.0.0.1)) - /usr/bin/ssr-rules \ - -s "$server" \ - -l "$local_port" \ - -S "$udp_server" \ - -L "$udp_local_port" \ - -a "$ac_ips" \ - -i "$(uci_get_by_type access_control wan_bp_list)" \ - -b "$(uci_get_by_type access_control wan_bp_ips)" \ - -w "$(uci_get_by_type access_control wan_fw_ips)" \ - -B "$(uci_get_by_type access_control lan_bp_ips)" \ - -p "$(uci_get_by_type access_control lan_fp_ips)" \ - -G "$(uci_get_by_type access_control lan_gm_ips)" \ - -D "$proxyport" \ - -F "$netflix" \ - -N "$netflix_ip" \ - -M "$(uci_get_by_type global netflix_proxy 0)" \ - $(get_arg_out) $gfwmode $ARG_UDP - return $? -} - -start_pdnsd() { - local usr_dns="$1" - local usr_port="$2" - local tcp_dns_list="208.67.222.222, 208.67.220.220" - [ -z "$usr_dns" ] && usr_dns="8.8.8.8" - [ -z "$usr_port" ] && usr_port="53" - [ -d /var/etc ] || mkdir -p /var/etc - if [ ! -d /var/pdnsd ]; then - mkdir -p /var/pdnsd - echo -ne "pd13\000\000\000\000" >/var/pdnsd/pdnsd.cache - chown -R nobody:nogroup /var/pdnsd - fi - cat <<-EOF >/var/etc/pdnsd.conf - global{ - perm_cache=1024; - cache_dir="/var/pdnsd"; - pid_file="/var/run/pdnsd.pid"; - run_as="nobody"; - server_ip=127.0.0.1; - server_port=5335; - status_ctl=on; - query_method=tcp_only; - min_ttl=1h; - max_ttl=1w; - timeout=10; - neg_domain_pol=on; - proc_limit=2; - procq_limit=8; - par_queries=1; - } - server{ - label="ssr-usrdns"; - ip=$usr_dns; - port=$usr_port; - timeout=6; - uptest=none; - interval=10m; - purge_cache=off; - } - EOF - /usr/sbin/pdnsd -c /var/etc/pdnsd.conf & -} - -start_redir() { - case "$(uci_get_by_name $GLOBAL_SERVER auth_enable)" in - 1 | on | true | yes | enabled) ARG_OTA="-A" ;; - *) ARG_OTA="" ;; - esac - #deal kcp - local kcp_enable=$(uci_get_by_name $GLOBAL_SERVER kcp_enable 0) - if [ "$kcp_enable" == "1" ]; then - [ ! -f "/usr/bin/kcptun-client" ] && return 1 - local kcp_str=$(/usr/bin/kcptun-client -v | grep kcptun | wc -l) - [ "0" == "$kcp_str" ] && return 1 - local kcp_port=$(uci_get_by_name $GLOBAL_SERVER kcp_port) - local server_port=$(uci_get_by_name $GLOBAL_SERVER server_port) - local password=$(uci_get_by_name $GLOBAL_SERVER kcp_password) - local kcp_param=$(uci_get_by_name $GLOBAL_SERVER kcp_param) - [ "$password" != "" ] && password="--key "$password - service_start /usr/bin/kcptun-client \ - -r $kcp_server:$kcp_port \ - -l :$server_port $password $kcp_param - kcp_enable_flag=1 - fi - - gen_config_file $GLOBAL_SERVER 0 $(uci_get_by_name $GLOBAL_SERVER local_port 1234) - local stype=$(uci_get_by_name $GLOBAL_SERVER type) - if [ "$stype" == "ss" ]; then - sscmd="/usr/bin/ss-redir" - elif [ "$stype" == "ssr" ]; then - sscmd="/usr/bin/ssr-redir" - elif [ "$stype" == "v2ray" ]; then - sscmd="/usr/bin/v2ray/v2ray" - [ ! -f "$sscmd" ] && sscmd="/usr/bin/v2ray" - elif [ "$stype" == "trojan" ]; then - sscmd="/usr/sbin/trojan" - elif [ "$stype" == "socks5" ]; then - sscmd="/usr/sbin/redsocks2" - elif [ "$stype" == "tun" ]; then - sscmd="/usr/sbin/redsocks2" - fi - - local ntype=$(uci_get_by_name $NETFLIX_SERVER type) - if [ "$ntype" == "ss" ]; then - ncmd="/usr/bin/ss-redir" - sssock="/usr/bin/ss-local" - elif [ "$ntype" == "ssr" ]; then - ncmd="/usr/bin/ssr-redir" - sssock="/usr/bin/ssr-local" - elif [ "$ntype" == "v2ray" ]; then - ncmd="/usr/bin/v2ray/v2ray" - [ ! -f "$ncmd" ] && ncmd="/usr/bin/v2ray" - elif [ "$ntype" == "trojan" ]; then - ncmd="/usr/sbin/trojan" - elif [ "$ntype" == "socks5" ]; then - ncmd="/usr/sbin/redsocks2" - elif [ "$ntype" == "tun" ]; then - ncmd="/usr/sbin/redsocks2" - fi - - local utype=$(uci_get_by_name $UDP_RELAY_SERVER type) - if [ "$utype" == "ss" ]; then - ucmd="/usr/bin/ss-redir" - elif [ "$utype" == "ssr" ]; then - ucmd="/usr/bin/ssr-redir" - elif [ "$utype" == "v2ray" ]; then - ucmd="/usr/bin/v2ray/v2ray" - [ ! -f "$ucmd" ] && ucmd="/usr/bin/v2ray" - elif [ "$utype" == "trojan" ]; then - ucmd="/usr/sbin/trojan" - elif [ "$stype" == "socks5" ]; then - ucmd="/usr/sbin/redsocks2" - elif [ "$stype" == "tun" ]; then - ucmd="/usr/sbin/redsocks2" - fi - if [ "$(uci_get_by_type global threads 0)" == "0" ]; then - threads=$(cat /proc/cpuinfo | grep 'processor' | wc -l) - else - threads=$(uci_get_by_type global threads) - fi - - if [ "$stype" == "ss" -o "$stype" == "ssr" ]; then - local last_config_file=$CONFIG_FILE - local pid_file="/var/run/ssr-retcp.pid" - for i in $(seq 1 $threads); do - $sscmd -c $CONFIG_FILE $ARG_OTA -f /var/run/ssr-retcp_$i.pid >/dev/null 2>&1 - done - echo "$(date "+%Y-%m-%d %H:%M:%S") Shadowsocks/ShadowsocksR $threads Threads Started!" >>/tmp/ssrplus.log - elif [ "$stype" == "v2ray" ]; then - $sscmd -config /var/etc/v2-ssr-retcp.json >/dev/null 2>&1 & - echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd -version | head -1) Started!" >>/tmp/ssrplus.log - elif [ "$stype" == "trojan" ]; then - for i in $(seq 1 $threads); do - $sscmd --config /var/etc/trojan-ssr-retcp.json >/dev/null 2>&1 & - done - echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd --version 2>&1 | head -1) , $threads Threads Started!" >>/tmp/ssrplus.log - elif [ "$stype" == "socks5" ]; then - /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-retcp.conf" socks5 tcp $(uci_get_by_name $GLOBAL_SERVER local_port) \ - $(check_host $(uci_get_by_name $GLOBAL_SERVER server)) $(uci_get_by_name $GLOBAL_SERVER server_port) \ - $(uci_get_by_name $GLOBAL_SERVER auth_enable 0) $(uci_get_by_name $GLOBAL_SERVER username) $(uci_get_by_name $GLOBAL_SERVER password) - for i in $(seq 1 $threads); do - $sscmd -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1 - done - echo "$(date "+%Y-%m-%d %H:%M:%S") Socks5 REDIRECT/TPROXY $threads Threads Started!" >>/tmp/ssrplus.log - elif [ "$stype" == "tun" ]; then - /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-retcp.conf" vpn $(uci_get_by_name $GLOBAL_SERVER iface "br-lan") $(uci_get_by_name $GLOBAL_SERVER local_port) - for i in $(seq 1 $threads); do - $sscmd -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1 - done - echo "$(date "+%Y-%m-%d %H:%M:%S") Network Tunnel REDIRECT $threads Threads Started!" >>/tmp/ssrplus.log - fi - - if [ "$NETFLIX_SERVER" != "nil" ] && [ "$NETFLIX_SERVER" != "$GLOBAL_SERVER" ]; then - if [ "$ntype" == "ss" -o "$ntype" == "ssr" ]; then - gen_config_file $NETFLIX_SERVER 2 4321 - gen_config_file $NETFLIX_SERVER 3 1088 - $sssock -c /var/etc/shadowsocksr_s.json $ARG_OTA -f /var/run/ssr-socksdns.pid >/dev/null 2>&1 - dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & - $ncmd -c /var/etc/shadowsocksr_n.json $ARG_OTA -f /var/run/ssr-netflix.pid >/dev/null 2>&1 - elif [ "$ntype" == "v2ray" ]; then - lua /usr/share/shadowsocksr/genv2config.lua $NETFLIX_SERVER tcp 4321 1088 >/var/etc/v2-ssr-netflix.json - $ncmd -config /var/etc/v2-ssr-netflix.json >/dev/null 2>&1 & - dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & - elif [ "$ntype" == "trojan" ]; then - lua /usr/share/shadowsocksr/gentrojanconfig.lua $NETFLIX_SERVER nat 4321 >/var/etc/trojan-ssr-netflix.json - sed -i 's/\\//g' /var/etc/trojan-ssr-netflix.json - $ncmd --config /var/etc/trojan-ssr-netflix.json >/dev/null 2>&1 & - lua /usr/share/shadowsocksr/gentrojanconfig.lua $NETFLIX_SERVER client 1088 >/var/etc/trojan-ssr-socksdns.json - sed -i 's/\\//g' /var/etc/trojan-ssr-socksdns.json - $ncmd --config /var/etc/trojan-ssr-socksdns.json >/dev/null 2>&1 & - dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & - elif [ "$ntype" == "socks5" ]; then - /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-netflix.conf" socks5 tcp 4321 \ - $(check_host $(uci_get_by_name $NETFLIX_SERVER server)) $(uci_get_by_name $NETFLIX_SERVER server_port) \ - $(uci_get_by_name $NETFLIX_SERVER auth_enable 0) $(uci_get_by_name $NETFLIX_SERVER username) $(uci_get_by_name $NETFLIX_SERVER password) - $ncmd -c /var/etc/redsocks-ssr-netflix.conf >/dev/null 2>&1 - microsocks -i 127.0.0.1 -p 1088 ssr-socksdns >/dev/null 2>&1 & - dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & - elif [ "$ntype" == "tun" ]; then - /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-netflix.conf" vpn $(uci_get_by_name $NETFLIX_SERVER iface "br-lan") 4321 - $ncmd -c /var/etc/redsocks-ssr-netflix.conf >/dev/null 2>&1 - microsocks -i 127.0.0.1 -p 1088 ssr-socksdns >/dev/null 2>&1 & - dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & - fi - fi - - if [ -n "$UDP_RELAY_SERVER" ]; then - if [ "$utype" == "ss" -o "$utype" == "ssr" ]; then - case "$(uci_get_by_name $UDP_RELAY_SERVER auth_enable)" in - 1 | on | true | yes | enabled) ARG_OTA="-A" ;; - *) ARG_OTA="" ;; - esac - gen_config_file $UDP_RELAY_SERVER 1 $(uci_get_by_name $UDP_RELAY_SERVER local_port 1234) - last_config_file=$CONFIG_UDP_FILE - pid_file="/var/run/ssr-reudp.pid" - $ucmd -c $last_config_file $ARG_OTA -U -f /var/run/ssr-reudp.pid >/dev/null 2>&1 - elif [ "$utype" == "v2ray" ]; then - lua /usr/share/shadowsocksr/genv2config.lua $UDP_RELAY_SERVER udp $(uci_get_by_name $UDP_RELAY_SERVER local_port) >/var/etc/v2-ssr-reudp.json - sed -i 's/\\//g' /var/etc/v2-ssr-reudp.json - $ucmd -config /var/etc/v2-ssr-reudp.json >/dev/null 2>&1 & - elif [ "$stype" == "trojan" ]; then - lua /usr/share/shadowsocksr/gentrojanconfig.lua $GLOBAL_SERVER client 10801 >/var/etc/trojan-ssr-reudp.json - sed -i 's/\\//g' /var/etc/trojan-ssr-reudp.json - $ucmd --config /var/etc/trojan-ssr-reudp.json >/dev/null 2>&1 & - ipt2socks -U -b 0.0.0.0 -4 -s 127.0.0.1 -p 10801 -l $(uci_get_by_name $UDP_RELAY_SERVER local_port) >/dev/null 2>&1 & - elif [ "$utype" == "socks5" ]; then - /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-reudp.conf" socks5 udp $(uci_get_by_name $UDP_RELAY_SERVER local_port) \ - $(check_host $(uci_get_by_name $UDP_RELAY_SERVER server)) $(uci_get_by_name $UDP_RELAY_SERVER server_port) \ - $(uci_get_by_name $UDP_RELAY_SERVER auth_enable 0) $(uci_get_by_name $UDP_RELAY_SERVER username) $(uci_get_by_name $UDP_RELAY_SERVER password) - $ucmd -c /var/etc/redsocks-ssr-reudp.conf >/dev/null 2>&1 - elif [ "$stype" == "tun" ]; then - redir_udp=0 - echo "$(date "+%Y-%m-%d %H:%M:%S") Network Tunnel UDP TPROXY Relay not supported!" >>/tmp/ssrplus.log - fi - fi - #deal with dns - local ssr_dns="$(uci_get_by_type global pdnsd_enable 0)" - local dnsstr="$(uci_get_by_type global tunnel_forward 8.8.4.4:53)" - local dnsserver=$(echo "$dnsstr" | awk -F ':' '{print $1}') - local dnsport=$(echo "$dnsstr" | awk -F ':' '{print $2}') - if [ "$ssr_dns" != "0" ]; then # not use custom dns service - if [ "$run_mode" == "gfw" ]; then - ipset add gfwlist $dnsserver 2>/dev/null - elif [ "$run_mode" == "oversea" ]; then - ipset add oversea $dnsserver 2>/dev/null - else - ipset add ss_spec_wan_ac $dnsserver nomatch 2>/dev/null - fi - fi - if [ "$ssr_dns" == "1" ]; then - start_pdnsd $dnsserver $dnsport - pdnsd_enable_flag=1 - elif [ "$ssr_dns" == "2" ]; then - microsocks -i 127.0.0.1 -p 10802 ssr-dns >/dev/null 2>&1 & - dns2socks 127.0.0.1:10802 $dnsserver:$dnsport 127.0.0.1:5335 -q >/dev/null 2>&1 & - pdnsd_enable_flag=2 - fi - if [ "$(uci_get_by_type global enable_switch)" == "1" ]; then - if [ "$(uci_get_by_name $GLOBAL_SERVER switch_enable 1)" == "1" ]; then - if [ -z "$switch_server" ]; then - local switch_time=$(uci_get_by_type global switch_time) - local switch_timeout=$(uci_get_by_type global switch_timeout) - service_start /usr/bin/ssr-switch start $switch_time $switch_timeout - switch_enable=1 - fi - fi - fi - add_cron - return $? -} - gen_service_file() { if [ $(uci_get_by_name $1 fast_open) == "1" ]; then fastopen="true" @@ -526,26 +218,6 @@ gen_service_file() { EOF } -start_service() { - [ $(uci_get_by_name $1 enable 0) == "0" ] && return 1 - let server_count=server_count+1 - if [ "$server_count" == "1" ]; then - if ! (iptables-save -t filter | grep SSR-SERVER-RULE >/dev/null); then - iptables -N SSR-SERVER-RULE && \ - iptables -t filter -I INPUT -j SSR-SERVER-RULE - fi - fi - if [ "$(uci_get_by_name $1 type ssr)" == "ssr" ]; then - gen_service_file $1 /var/etc/${NAME}_$server_count.json - /usr/bin/ssr-server -c /var/etc/${NAME}_$server_count.json -u -f /var/run/ssr-server$server_count.pid >/dev/null 2>&1 - else - microsocks -i :: -p $(uci_get_by_name $1 server_port) -1 -u $(uci_get_by_name $1 username) -P $(uci_get_by_name $1 password) ssr-server$server_count >/dev/null 2>&1 & - fi - iptables -t filter -A SSR-SERVER-RULE -p tcp --dport $(uci_get_by_name $1 server_port) -j ACCEPT - iptables -t filter -A SSR-SERVER-RULE -p udp --dport $(uci_get_by_name $1 server_port) -j ACCEPT - return 0 -} - gen_serv_include() { FWI=$(uci get firewall.shadowsocksr.path 2>/dev/null) [ -n "$FWI" ] || return 0 @@ -565,42 +237,432 @@ gen_serv_include() { EOF } -start_server() { - SERVER_ENABLE=$(uci_get_by_type server_global enable_server 0) - [ "$SERVER_ENABLE" == "0" ] && return 0 - mkdir -p /var/run /var/etc - config_load $NAME - config_foreach start_service server_config - gen_serv_include +start_dns() { + local ssr_dns="$(uci_get_by_type global pdnsd_enable 0)" + local dnsstr="$(uci_get_by_type global tunnel_forward 8.8.4.4:53)" + local dnsserver=$(echo "$dnsstr" | awk -F ':' '{print $1}') + local dnsport=$(echo "$dnsstr" | awk -F ':' '{print $2}') + start_pdnsd() { + local usr_dns="$1" + local usr_port="$2" + [ -z "$usr_dns" ] && usr_dns="8.8.8.8" + [ -z "$usr_port" ] && usr_port="53" + [ -d /var/etc ] || mkdir -p /var/etc + if [ ! -f "/var/pdnsd/pdnsd.cache" ]; then + mkdir -p /var/pdnsd + touch /var/pdnsd/pdnsd.cache + chown -R nobody:nogroup /var/pdnsd + fi + cat <<-EOF >/var/etc/pdnsd.conf + global{ + perm_cache=1024; + cache_dir="/var/pdnsd"; + pid_file="/var/run/pdnsd.pid"; + run_as="nobody"; + server_ip=127.0.0.1; + server_port=5335; + status_ctl=on; + query_method=tcp_only; + min_ttl=1h; + max_ttl=1w; + timeout=10; + neg_domain_pol=on; + proc_limit=2; + procq_limit=8; + par_queries=1; + } + server{ + label="ssr-usrdns"; + ip=$usr_dns; + port=$usr_port; + timeout=6; + uptest=none; + interval=10m; + purge_cache=off; + } + EOF + /usr/sbin/pdnsd -c /var/etc/pdnsd.conf >/dev/null 2>&1 & + } + if [ "$ssr_dns" != "0" ]; then + case "$run_mode" in + gfw) ipset add gfwlist $dnsserver 2>/dev/null ;; + oversea) ipset add oversea $dnsserver 2>/dev/null ;; + *) ipset add ss_spec_wan_ac $dnsserver nomatch 2>/dev/null ;; + esac + fi + case "$ssr_dns" in + 1) + start_pdnsd $dnsserver $dnsport + pdnsd_enable_flag=1 + ;; + 2) + microsocks -i 127.0.0.1 -p 10802 ssr-dns >/dev/null 2>&1 & + dns2socks 127.0.0.1:10802 $dnsserver:$dnsport 127.0.0.1:5335 -q >/dev/null 2>&1 & + pdnsd_enable_flag=2 + ;; + esac +} + +start_redir_tcp() { + local type=$(uci_get_by_name $GLOBAL_SERVER type) + local bin=$(find_bin $type) + [ ! -f "$bin" ] && echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:Can't find $bin program, can't start!" >>/tmp/ssrplus.log && return 1 + case "$(uci_get_by_name $GLOBAL_SERVER auth_enable)" in + 1 | on | true | yes | enabled) ARG_OTA="-A" ;; + *) ARG_OTA="" ;; + esac + local kcp_enable=$(uci_get_by_name $GLOBAL_SERVER kcp_enable 0) + if [ "$kcp_enable" == "1" ]; then + [ ! -f "/usr/bin/kcptun-client" ] && return 1 + local kcp_str=$(/usr/bin/kcptun-client -v | grep kcptun | wc -l) + [ "0" == "$kcp_str" ] && return 1 + local kcp_port=$(uci_get_by_name $GLOBAL_SERVER kcp_port) + local server_port=$(uci_get_by_name $GLOBAL_SERVER server_port) + local password=$(uci_get_by_name $GLOBAL_SERVER kcp_password) + local kcp_param=$(uci_get_by_name $GLOBAL_SERVER kcp_param) + [ "$password" != "" ] && password="--key "$password + service_start /usr/bin/kcptun-client \ + -r $kcp_server:$kcp_port \ + -l :$server_port $password $kcp_param + kcp_enable_flag=1 + fi + gen_config_file $GLOBAL_SERVER 0 $(uci_get_by_name $GLOBAL_SERVER local_port 1234) + if [ "$(uci_get_by_type global threads 0)" == "0" ]; then + threads=$(cat /proc/cpuinfo | grep 'processor' | wc -l) + else + threads=$(uci_get_by_type global threads) + fi + case "$type" in + ss | ssr) + local last_config_file=$CONFIG_FILE + local name="Shadowsocks" + [ "$type" == "ssr" ] && name="ShadowsocksR" + for i in $(seq 1 $threads); do + $bin -c $CONFIG_FILE $ARG_OTA -f /var/run/ssr-retcp_$i.pid >/dev/null 2>&1 + done + echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:$name $threads Threads Started!" >>/tmp/ssrplus.log + ;; + v2ray) + $bin -config /var/etc/v2-ssr-retcp.json >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:$($bin -version | head -1) Started!" >>/tmp/ssrplus.log + ;; + trojan) + for i in $(seq 1 $threads); do + $bin --config /var/etc/trojan-ssr-retcp.json >/dev/null 2>&1 & + done + echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:$($bin --version 2>&1 | head -1) , $threads Threads Started!" >>/tmp/ssrplus.log + ;; + socks5) + /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-retcp.conf" socks5 tcp $(uci_get_by_name $GLOBAL_SERVER local_port) \ + $(get_host_ip $(uci_get_by_name $GLOBAL_SERVER server)) $(uci_get_by_name $GLOBAL_SERVER server_port) \ + $(uci_get_by_name $GLOBAL_SERVER auth_enable 0) $(uci_get_by_name $GLOBAL_SERVER username) $(uci_get_by_name $GLOBAL_SERVER password) + for i in $(seq 1 $threads); do + $bin -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1 + done + echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:Socks5 REDIRECT/TPROXY $threads Threads Started!" >>/tmp/ssrplus.log + ;; + tun) + /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-retcp.conf" vpn $(uci_get_by_name $GLOBAL_SERVER iface "br-lan") $(uci_get_by_name $GLOBAL_SERVER local_port) + for i in $(seq 1 $threads); do + $bin -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1 + done + echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:Network Tunnel REDIRECT $threads Threads Started!" >>/tmp/ssrplus.log + ;; + esac + return 0 +} + +start_redir_udp() { + if [ -n "$UDP_RELAY_SERVER" ]; then + local type=$(uci_get_by_name $UDP_RELAY_SERVER type) + local bin=$(find_bin $type) + [ ! -f "$bin" ] && echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay:Can't find $bin program, can't start!" >>/tmp/ssrplus.log && return 1 + case "$type" in + ss | ssr) + case "$(uci_get_by_name $UDP_RELAY_SERVER auth_enable)" in + 1 | on | true | yes | enabled) ARG_OTA="-A" ;; + *) ARG_OTA="" ;; + esac + local name="Shadowsocks" + [ "$type" == "ssr" ] && name="ShadowsocksR" + gen_config_file $UDP_RELAY_SERVER 1 $(uci_get_by_name $UDP_RELAY_SERVER local_port 1234) + last_config_file=$CONFIG_UDP_FILE + $bin -c $last_config_file $ARG_OTA -U -f /var/run/ssr-reudp.pid >/dev/null 2>&1 + echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay:$name Started!" >>/tmp/ssrplus.log + ;; + v2ray) + lua /usr/share/shadowsocksr/genv2config.lua $UDP_RELAY_SERVER udp $(uci_get_by_name $UDP_RELAY_SERVER local_port) >/var/etc/v2-ssr-reudp.json + sed -i 's/\\//g' /var/etc/v2-ssr-reudp.json + $bin -config /var/etc/v2-ssr-reudp.json >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay:$($bin -version | head -1) Started!" >>/tmp/ssrplus.log + ;; + trojan) + lua /usr/share/shadowsocksr/gentrojanconfig.lua $GLOBAL_SERVER client 10801 >/var/etc/trojan-ssr-reudp.json + sed -i 's/\\//g' /var/etc/trojan-ssr-reudp.json + $bin --config /var/etc/trojan-ssr-reudp.json >/dev/null 2>&1 & + ipt2socks -U -b 0.0.0.0 -4 -s 127.0.0.1 -p 10801 -l $(uci_get_by_name $UDP_RELAY_SERVER local_port) >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay:$($bin --version 2>&1 | head -1) Started!" >>/tmp/ssrplus.log + ;; + socks5) + /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-reudp.conf" socks5 udp $(uci_get_by_name $UDP_RELAY_SERVER local_port) \ + $(get_host_ip $(uci_get_by_name $UDP_RELAY_SERVER server)) $(uci_get_by_name $UDP_RELAY_SERVER server_port) \ + $(uci_get_by_name $UDP_RELAY_SERVER auth_enable 0) $(uci_get_by_name $UDP_RELAY_SERVER username) $(uci_get_by_name $UDP_RELAY_SERVER password) + $bin -c /var/etc/redsocks-ssr-reudp.conf >/dev/null 2>&1 + echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay:Socks5 REDIRECT/TPROXY Started!" >>/tmp/ssrplus.log + ;; + tun) + redir_udp=0 + echo "$(date "+%Y-%m-%d %H:%M:%S") Network Tunnel UDP TPROXY Relay not supported!" >>/tmp/ssrplus.log + ;; + esac + fi + return 0 +} + +start_shunt() { + if [ "$NETFLIX_SERVER" != "nil" ] && [ "$NETFLIX_SERVER" != "$GLOBAL_SERVER" ]; then + local type=$(uci_get_by_name $NETFLIX_SERVER type) + local bin=$(find_bin $type) + [ ! -f "$bin" ] && echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:Can't find $bin program, can't start!" >>/tmp/ssrplus.log && return 1 + case "$type" in + ss | ssr) + local bin2=$(find_bin $type-local) + [ ! -f "$bin2" ] && echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:Can't find $bin2 program, can't start!" >>/tmp/ssrplus.log && return 2 + local name="Shadowsocks" + [ "$type" == "ssr" ] && name="ShadowsocksR" + gen_config_file $NETFLIX_SERVER 2 4321 + gen_config_file $NETFLIX_SERVER 3 1088 + $bin -c /var/etc/shadowsocksr_n.json $ARG_OTA -f /var/run/ssr-netflix.pid >/dev/null 2>&1 + $bin2 -c /var/etc/shadowsocksr_s.json $ARG_OTA -f /var/run/ssr-socksdns.pid >/dev/null 2>&1 + dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:$name Started!" >>/tmp/ssrplus.log + ;; + v2ray) + lua /usr/share/shadowsocksr/genv2config.lua $NETFLIX_SERVER tcp 4321 1088 >/var/etc/v2-ssr-netflix.json + $bin -config /var/etc/v2-ssr-netflix.json >/dev/null 2>&1 & + dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:$($bin -version | head -1) Started!" >>/tmp/ssrplus.log + ;; + trojan) + lua /usr/share/shadowsocksr/gentrojanconfig.lua $NETFLIX_SERVER nat 4321 >/var/etc/trojan-ssr-netflix.json + sed -i 's/\\//g' /var/etc/trojan-ssr-netflix.json + $bin --config /var/etc/trojan-ssr-netflix.json >/dev/null 2>&1 & + lua /usr/share/shadowsocksr/gentrojanconfig.lua $NETFLIX_SERVER client 1088 >/var/etc/trojan-ssr-socksdns.json + sed -i 's/\\//g' /var/etc/trojan-ssr-socksdns.json + $bin --config /var/etc/trojan-ssr-socksdns.json >/dev/null 2>&1 & + dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:$($bin --version 2>&1 | head -1) Started!" >>/tmp/ssrplus.log + ;; + socks5) + /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-netflix.conf" socks5 tcp 4321 \ + $(get_host_ip $(uci_get_by_name $NETFLIX_SERVER server)) $(uci_get_by_name $NETFLIX_SERVER server_port) \ + $(uci_get_by_name $NETFLIX_SERVER auth_enable 0) $(uci_get_by_name $NETFLIX_SERVER username) $(uci_get_by_name $NETFLIX_SERVER password) + $bin -c /var/etc/redsocks-ssr-netflix.conf >/dev/null 2>&1 + microsocks -i 127.0.0.1 -p 1088 ssr-socksdns >/dev/null 2>&1 & + dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:Socks5 Started!" >>/tmp/ssrplus.log + ;; + tun) + /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-netflix.conf" vpn $(uci_get_by_name $NETFLIX_SERVER iface "br-lan") 4321 + $bin -c /var/etc/redsocks-ssr-netflix.conf >/dev/null 2>&1 + microsocks -i 127.0.0.1 -p 1088 ssr-socksdns >/dev/null 2>&1 & + dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:Network Tunnel REDIRECT Started!" >>/tmp/ssrplus.log + ;; + esac + fi return 0 } start_local() { local local_server=$(uci_get_by_type socks5_proxy server nil) - [ "$local_server" == "same" ] && local_server=$GLOBAL_SERVER [ "$local_server" == "nil" ] && return 1 - local local_type=$(uci_get_by_name $local_server type) - mkdir -p /var/run /var/etc - - if [ "$local_type" == "ssr" ]; then + [ "$local_server" == "same" ] && local_server=$GLOBAL_SERVER + local type=$(uci_get_by_name $local_server type) + local bin=$(find_bin $type) + [ ! -f "$bin" ] && echo "$(date "+%Y-%m-%d %H:%M:%S") Global_Socks5:Can't find $bin program, can't start!" >>/tmp/ssrplus.log && return 1 + case "$type" in + ss | ssr) + local name="Shadowsocks" + local bin=$(find_bin $type-local) + [ ! -f "$bin" ] && echo "$(date "+%Y-%m-%d %H:%M:%S") Global_Socks5:Can't find $bin program, can't start!" >>/tmp/ssrplus.log && return 1 + [ "$type" == "ssr" ] && name="ShadowsocksR" gen_config_file $local_server 3 $(uci_get_by_type socks5_proxy local_port 1080) - /usr/bin/ssr-local -c $CONFIG_SOCK5_FILE -u -f /var/run/ssr-local.pid >/dev/null 2>&1 - elif [ "$local_type" == "ss" ]; then - gen_config_file $local_server 3 $(uci_get_by_type socks5_proxy local_port 1080) - /usr/bin/ss-local -c $CONFIG_SOCK5_FILE -u -f /var/run/ssr-local.pid >/dev/null 2>&1 - elif [ "$local_type" == "v2ray" ]; then + $bin -c $CONFIG_SOCK5_FILE -u -f /var/run/ssr-local.pid >/dev/null 2>&1 + echo "$(date "+%Y-%m-%d %H:%M:%S") Global_Socks5:$name Started!" >>/tmp/ssrplus.log + ;; + v2ray) lua /usr/share/shadowsocksr/genv2config.lua $local_server tcp 0 $(uci_get_by_type socks5_proxy local_port 1080) >/var/etc/v2-ssr-local.json sed -i 's/\\//g' /var/etc/v2-ssr-local.json - /usr/bin/v2ray/v2ray -config /var/etc/v2-ssr-local.json >/dev/null 2>&1 & - elif [ "$local_type" == "trojan" ]; then + $bin -config /var/etc/v2-ssr-local.json >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Global_Socks5:$($bin -version | head -1) Started!" >>/tmp/ssrplus.log + ;; + trojan) lua /usr/share/shadowsocksr/gentrojanconfig.lua $local_server client $(uci_get_by_type socks5_proxy local_port 1080) >/var/etc/trojan-ssr-local.json sed -i 's/\\//g' /var/etc/trojan-ssr-local.json - /usr/sbin/trojan --config /var/etc/trojan-ssr-local.json >/dev/null 2>&1 & - else - microsocks -i :: -p $(uci_get_by_type socks5_proxy local_port 1080) ssr-local >/dev/null 2>&1 & - fi - + $bin --config /var/etc/trojan-ssr-local.json >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Global_Socks5:$($bin --version 2>&1 | head -1) Started!" >>/tmp/ssrplus.log + ;; + *) + [ -e /proc/sys/net/ipv6 ] && local listenip='-i ::' + microsocks $listenip -p $(uci_get_by_type socks5_proxy local_port 1080) ssr-local >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Global_Socks5:$type Started!" >>/tmp/ssrplus.log + ;; + esac local_enable=1 + return 0 +} + +start_server() { + SERVER_ENABLE=$(uci_get_by_type server_global enable_server 0) + [ "$SERVER_ENABLE" == "0" ] && return 0 + server_service() { + [ $(uci_get_by_name $1 enable 0) == "0" ] && return 1 + let server_count=server_count+1 + if [ "$server_count" == "1" ]; then + if ! (iptables-save -t filter | grep SSR-SERVER-RULE >/dev/null); then + iptables -N SSR-SERVER-RULE && \ + iptables -t filter -I INPUT -j SSR-SERVER-RULE + fi + fi + if [ "$(uci_get_by_name $1 type ssr)" == "ssr" ]; then + local bin=$(find_bin ssr-server) + [ ! -f "$bin" ] && echo "$(date "+%Y-%m-%d %H:%M:%S") Server:Can't find $bin program, can't start!" >>/tmp/ssrplus.log && return 1 + gen_service_file $1 /var/etc/${NAME}_$server_count.json + $(find_bin ssr-server) -c /var/etc/${NAME}_$server_count.json -u -f /var/run/ssr-server$server_count.pid >/dev/null 2>&1 + echo "$(date "+%Y-%m-%d %H:%M:%S") Server:ShadowsocksR Server$server_count Started!" >>/tmp/ssrplus.log + else + [ -e /proc/sys/net/ipv6 ] && local listenip='-i ::' + microsocks $listenip -p $(uci_get_by_name $1 server_port) -1 -u $(uci_get_by_name $1 username) -P $(uci_get_by_name $1 password) ssr-server$server_count >/dev/null 2>&1 & + echo "$(date "+%Y-%m-%d %H:%M:%S") Server:Socks5 Server$server_count Started!" >>/tmp/ssrplus.log + fi + iptables -t filter -A SSR-SERVER-RULE -p tcp --dport $(uci_get_by_name $1 server_port) -j ACCEPT + iptables -t filter -A SSR-SERVER-RULE -p udp --dport $(uci_get_by_name $1 server_port) -j ACCEPT + return 0 + } + mkdir -p /var/run /var/etc + config_load $NAME + config_foreach server_service server_config + gen_serv_include + return 0 +} + +start_switch() { + if [ "$(uci_get_by_type global enable_switch 0)" == "1" ]; then + if [ -z "$switch_server" ]; then + local switch_time=$(uci_get_by_type global switch_time)s + local switch_timeout=$(uci_get_by_type global switch_timeout) + service_start /usr/bin/ssr-switch start $switch_time $switch_timeout + switch_enable=1 + fi + fi +} + +start_monitor() { + if [ $(uci_get_by_type global monitor_enable 1) == "1" ]; then + let total_count=server_count+redir_tcp+redir_udp+tunnel_enable+kcp_enable_flag+local_enable+pdnsd_enable_flag+switch_enable + if [ $total_count -gt 0 ]; then + service_start /usr/bin/ssr-monitor $server_count $redir_tcp $redir_udp $tunnel_enable $kcp_enable_flag $local_enable $pdnsd_enable_flag $switch_enable + fi + fi +} + +check_server() { + ENABLE_SERVER=$(uci_get_by_type global global_server nil) + if [ "$ENABLE_SERVER" == "nil" ]; then + return 1 + else + local STYPE=$(uci_get_by_name $ENABLE_SERVER type nil) + if [ "$STYPE" == "nil" ]; then + local CFGID=$(uci_get_by_cfgid servers type nil) + if [ "$CFGID" == "nil" ]; then + uci_set_by_type global global_server 'nil' + else + uci_set_by_type global global_server $CFGID + fi + /etc/init.d/shadowsocksr restart + fi + fi +} + +start_rules() { + local server=$(get_host_ip $(uci_get_by_name $GLOBAL_SERVER server)) + if [ "$server" == "ERROR" ]; then + server=$(uci_get_by_name $GLOBAL_SERVER ip) + fi + local kcp_enable=$(uci_get_by_name $GLOBAL_SERVER kcp_enable 0) + if [ $kcp_enable == "1" ]; then + kcp_server=$server + kcp_flag=1 + fi + local local_port=$(uci_get_by_name $GLOBAL_SERVER local_port) + local lan_ac_ips=$(uci_get_by_type access_control lan_ac_ips) + local lan_ac_mode=$(uci_get_by_type access_control lan_ac_mode) + local router_proxy=$(uci_get_by_type access_control router_proxy) + if [ "$GLOBAL_SERVER" == "$UDP_RELAY_SERVER" -a "$kcp_flag" == "0" ]; then + ARG_UDP="-u" + elif [ -n "$UDP_RELAY_SERVER" ]; then + ARG_UDP="-U" + local udp_server=$(uci_get_by_name $UDP_RELAY_SERVER server) + local udp_local_port=$(uci_get_by_name $UDP_RELAY_SERVER local_port) + fi + if [ -n "$lan_ac_ips" ]; then + case "$lan_ac_mode" in + w | W | b | B) local ac_ips="$lan_ac_mode$lan_ac_ips" ;; + esac + fi + #deal gfw firewall rule + local gfwmode="" + case "$run_mode" in + gfw) gfwmode="-g" ;; + router) gfwmode="-r" ;; + oversea) gfwmode="-c" ;; + all) gfwmode="-z" ;; + esac + local dports=$(uci_get_by_type global dports 1) + if [ $dports == "1" ]; then + proxyport=" " + else + proxyport="-m multiport --dports 22,53,587,465,995,993,143,80,443,853" + fi + if [ "$NETFLIX_SERVER" != "nil" ]; then + if [ "$NETFLIX_SERVER" != "$GLOBAL_SERVER" ]; then + netflix="1" + else + netflix="2" + fi + else + netflix="0" + fi + get_arg_out() { + case "$(uci_get_by_type access_control router_proxy 1)" in + 1) echo "-o" ;; + 2) echo "-O" ;; + esac + } + netflix_ip=$(get_host_ip $(uci_get_by_name $NETFLIX_SERVER server)) + if [ "$netflix_ip" == "ERROR" ]; then + netflix_ip=$(uci_get_by_name $NETFLIX_SERVER ip) + fi + /usr/bin/ssr-rules \ + -s "$server" \ + -l "$local_port" \ + -S "$udp_server" \ + -L "$udp_local_port" \ + -a "$ac_ips" \ + -i "/etc/ssr/china_ssr.txt" \ + -b "$(uci_get_by_type access_control wan_bp_ips)" \ + -w "$(uci_get_by_type access_control wan_fw_ips)" \ + -B "$(uci_get_by_type access_control lan_bp_ips)" \ + -p "$(uci_get_by_type access_control lan_fp_ips)" \ + -G "$(uci_get_by_type access_control lan_gm_ips)" \ + -D "$proxyport" \ + -F "$netflix" \ + -N "$netflix_ip" \ + -M "$(uci_get_by_type global netflix_proxy 0)" \ + -I "/etc/ssr/netflixip.list" \ + $(get_arg_out) $gfwmode $ARG_UDP + return $? } rules() { @@ -610,6 +672,7 @@ rules() { redir_tcp=1 fi mkdir -p /var/run /var/etc + run_mode=$(uci_get_by_type global run_mode) UDP_RELAY_SERVER=$(uci_get_by_type global udp_relay_server) [ "$UDP_RELAY_SERVER" == "same" ] && UDP_RELAY_SERVER=$GLOBAL_SERVER [ -n "$UDP_RELAY_SERVER" ] && redir_udp=1 @@ -621,133 +684,81 @@ rules() { } start() { + [ -f "$LOCK_FILE" ] && exit 2 + touch "$LOCK_FILE" + echo "-----------start-----------" >>/tmp/ssrplus.log if [ -z "$switch_server" ]; then - GLOBAL_SERVER=$(uci_get_by_type global global_server) + GLOBAL_SERVER=$(uci_get_by_type global global_server nil) else GLOBAL_SERVER=$switch_server switch_enable=1 fi - NETFLIX_SERVER=$(uci_get_by_type global netflix_server nil) if [ "$NETFLIX_SERVER" == "same" ]; then NETFLIX_SERVER=$GLOBAL_SERVER fi - - if rules; then - start_redir - mkdir -p /tmp/dnsmasq.d && cp -a /etc/dnsmasq.ssr /tmp/ && cp -a /etc/dnsmasq.oversea /tmp/ - if ! [ "$run_mode" == "oversea" ]; then - cat <<-EOF >/tmp/dnsmasq.d/dnsmasq-ssr.conf - conf-dir=/tmp/dnsmasq.ssr - EOF - else - cat <<-EOF >/tmp/dnsmasq.d/dnsmasq-ssr.conf - conf-dir=/tmp/dnsmasq.oversea - EOF - fi - if [ $(uci_get_by_type global adblock 0) == "0" ]; then - rm -f /tmp/dnsmasq.ssr/ad.conf - fi - /usr/share/shadowsocksr/gfw2ipset.sh - - if [ "$NETFLIX_SERVER" != "nil" ]; then - if [ "$NETFLIX_SERVER" != "$GLOBAL_SERVER" ]; then - cat /etc/config/netflix.list | while read line || [ -n "$line" ]; do - sed -i "/$line/d" /tmp/dnsmasq.ssr/gfw_list.conf - done - awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"netflix"'\n",$0)}' /etc/config/netflix.list >/tmp/dnsmasq.ssr/netflix_forward.conf - awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5555"'\n",$0)}' /etc/config/netflix.list >>/tmp/dnsmasq.ssr/netflix_forward.conf - - ipset -N netflix hash:net 2>/dev/null - cat /etc/config/netflixip.list | while read nip || [ -n "$nip" ]; do - ipset add netflix $nip 2>/dev/null - done - else - cat /etc/config/netflix.list | while read line || [ -n "$line" ]; do - sed -i "/$line/d" /tmp/dnsmasq.ssr/gfw_list.conf - done - awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"netflix"'\n",$0)}' /etc/config/netflix.list >/tmp/dnsmasq.ssr/netflix_forward.conf - awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5335"'\n",$0)}' /etc/config/netflix.list >>/tmp/dnsmasq.ssr/netflix_forward.conf - ipset -N netflix hash:net 2>/dev/null - cat /etc/config/netflixip.list | while read nip || [ -n "$nip" ]; do - ipset add netflix $nip 2>/dev/null - done - fi - else - rm -f /tmp/dnsmasq.ssr/netflix_forward.conf - fi - - /etc/init.d/dnsmasq restart >/dev/null 2>&1 + mkdir -p /tmp/dnsmasq.d /tmp/dnsmasq.ssr + cat <<-EOF >/tmp/dnsmasq.d/dnsmasq-ssr.conf + conf-dir=/tmp/dnsmasq.ssr + EOF + if [ "$(uci_get_by_type global adblock 0)" == "1" ]; then + cp -rf /etc/ssr/ad.conf /tmp/dnsmasq.ssr/ + awk '!/^$/&&!/^#/{printf("address=/%s/''\n",$0)}' /etc/ssr/deny.list >/tmp/dnsmasq.ssr/denylist.conf fi + if rules; then + if start_redir_tcp; then + start_redir_udp + start_shunt + start_switch + start_dns + add_cron + if [ "$run_mode" == "oversea" ]; then + cp -rf /etc/ssr/oversea_list.conf /tmp/dnsmasq.ssr/ + else + cp -rf /etc/ssr/gfw_list.conf /tmp/dnsmasq.ssr/ + cp -rf /etc/ssr/gfw_base.conf /tmp/dnsmasq.ssr/ + fi + /usr/share/shadowsocksr/gfw2ipset.sh + else + /usr/bin/ssr-rules -f + fi + fi + /etc/init.d/dnsmasq restart >/dev/null 2>&1 start_server start_local - if [ $(uci_get_by_type global monitor_enable 1) == "1" ]; then - let total_count=server_count+redir_tcp+redir_udp+tunnel_enable+kcp_enable_flag+local_enable+pdnsd_enable_flag+switch_enable - if [ $total_count -gt 0 ]; then - #param:server(count) redir_tcp(0:no,1:yes) redir_udp tunnel kcp local gfw - service_start /usr/bin/ssr-monitor $server_count $redir_tcp $redir_udp $tunnel_enable $kcp_enable_flag $local_enable $pdnsd_enable_flag $switch_enable - fi - fi - - ENABLE_SERVER=$(uci_get_by_type global global_server nil) - if [ "$ENABLE_SERVER" == "nil" ]; then - return 1 - else - STYPE=$(uci_get_by_name $ENABLE_SERVER type nil) - if [ "$STYPE" == "nil" ]; then - CFGID=$(uci_get_by_cfgid servers type nil) - if [ "$CFGID" == "nil" ]; then - uci set shadowsocksr.@global[0].global_server='nil' - else - uci set shadowsocksr.@global[0].global_server=$CFGID - fi - uci commit shadowsocksr - /etc/init.d/shadowsocksr restart - fi - fi + start_monitor + check_server + clean_log + echo "------------end------------" >>/tmp/ssrplus.log + rm -f $LOCK_FILE } boot() { + ulimit -n 65535 (/usr/share/shadowsocksr/chinaipset.sh && sleep 3 && start >/dev/null 2>&1) & } stop() { + unlock /usr/bin/ssr-rules -f - srulecount=$(iptables -L | grep SSR-SERVER-RULE | wc -l) + local srulecount=$(iptables -L | grep SSR-SERVER-RULE | wc -l) if [ $srulecount -gt 0 ]; then iptables -F SSR-SERVER-RULE iptables -t filter -D INPUT -j SSR-SERVER-RULE iptables -X SSR-SERVER-RULE 2>/dev/null fi if [ -z "$switch_server" ]; then - kill -9 $(busybox ps -w | grep ssr-switch | grep -v grep | awk '{print $1}') >/dev/null 2>&1 - fi - if [ $(uci_get_by_type global monitor_enable 0) == "1" ]; then - kill -9 $(busybox ps -w | grep ssr-monitor | grep -v grep | awk '{print $1}') >/dev/null 2>&1 - fi - killall -q -9 ssr-monitor - killall -q -9 ss-redir - killall -q -9 obfs-local - killall -q -9 v2ray-plugin - killall -q -9 ssr-redir - killall -q -9 v2ray - killall -q -9 trojan - killall -q -9 ipt2socks - kill -9 $(busybox ps -w | grep ssr-server | grep -v grep | awk '{print $1}') >/dev/null 2>&1 - kill -9 $(busybox ps -w | grep ssr-local | grep -v grep | awk '{print $1}') >/dev/null 2>&1 - killall -q -9 ssr-local - killall -q -9 ss-local - killall -q -9 kcptun-client - killall -q -9 dns2socks - killall -q -9 microsocks - killall -q -9 redsocks2 - if [ -f /var/run/pdnsd.pid ]; then - kill $(cat /var/run/pdnsd.pid) >/dev/null 2>&1 - else - kill -9 $(busybox ps -w | grep pdnsd | grep -v grep | awk '{print $1}') >/dev/null 2>&1 + ps -w | grep -v "grep" | grep ssr-switch | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + rm -f /var/lock/ssr-switch.lock + killall -q -9 kcptun-client fi + ps -w | grep -v "grep" | grep ssr-monitor | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + ps -w | grep -v "grep" | grep "sleep $(uci_get_by_type global switch_time)s" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + ps -w | grep -v "grep" | grep "sleep 30s" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + killall -q -9 ss-redir ss-local obfs-local ssr-redir ssr-local ssr-server v2ray v2ray-plugin trojan microsocks ipt2socks dns2socks redsocks2 pdnsd + rm -f /var/lock/ssr-chinaipset.lock /var/lock/ssr-monitor.lock if [ -f "/tmp/dnsmasq.d/dnsmasq-ssr.conf" ]; then - rm -f /tmp/dnsmasq.d/dnsmasq-ssr.conf /tmp/dnsmasq.ssr/* /tmp/dnsmasq.oversea/* + rm -rf /tmp/dnsmasq.d/dnsmasq-ssr.conf /tmp/dnsmasq.ssr /tmp/dnsmasq.oversea /etc/init.d/dnsmasq restart >/dev/null 2>&1 fi del_cron diff --git a/package/lean/luci-app-ssr-plus/root/etc/china_ssr.txt b/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt similarity index 99% rename from package/lean/luci-app-ssr-plus/root/etc/china_ssr.txt rename to package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt index c152a07af2..712a2cfa7f 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/china_ssr.txt +++ b/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt @@ -800,7 +800,6 @@ 43.243.144.0/22 43.243.148.0/22 43.243.156.0/22 -43.243.168.0/22 43.243.180.0/22 43.243.188.0/22 43.243.228.0/22 @@ -1030,7 +1029,8 @@ 45.65.28.0/22 45.112.132.0/22 45.112.188.0/22 -45.112.208.0/21 +45.112.208.0/22 +45.112.212.0/22 45.112.216.0/22 45.112.220.0/22 45.112.228.0/22 @@ -1471,6 +1471,9 @@ 45.253.232.0/22 45.253.236.0/22 45.253.240.0/22 +45.253.244.0/22 +45.253.248.0/22 +45.253.252.0/22 45.254.0.0/22 45.254.4.0/22 45.254.8.0/22 @@ -1782,6 +1785,7 @@ 61.29.128.0/18 61.29.192.0/19 61.29.224.0/20 +61.29.240.0/20 61.45.128.0/18 61.45.224.0/20 61.47.128.0/18 @@ -2491,7 +2495,6 @@ 103.38.224.0/22 103.38.228.0/22 103.38.232.0/22 -103.38.252.0/22 103.39.16.0/22 103.39.64.0/22 103.39.88.0/22 @@ -2815,7 +2818,6 @@ 103.56.16.0/22 103.56.20.0/22 103.56.32.0/22 -103.56.52.0/22 103.56.56.0/22 103.56.60.0/22 103.56.72.0/22 @@ -4004,6 +4006,56 @@ 103.149.210.0/23 103.149.214.0/23 103.149.220.0/23 +103.149.242.0/23 +103.149.244.0/23 +103.149.246.0/23 +103.149.248.0/23 +103.150.24.0/23 +103.150.66.0/23 +103.150.72.0/23 +103.150.122.0/23 +103.150.126.0/23 +103.150.128.0/23 +103.150.130.0/23 +103.150.146.0/23 +103.150.164.0/23 +103.150.172.0/23 +103.150.180.0/23 +103.150.200.0/23 +103.150.210.0/23 +103.150.214.0/23 +103.150.216.0/23 +103.150.244.0/23 +103.151.4.0/23 +103.151.44.0/23 +103.151.138.0/23 +103.151.142.0/23 +103.151.148.0/23 +103.151.150.0/23 +103.151.158.0/23 +103.151.178.0/23 +103.151.206.0/23 +103.151.216.0/23 +103.151.228.0/23 +103.152.14.0/23 +103.152.24.0/23 +103.152.28.0/23 +103.152.30.0/23 +103.152.56.0/23 +103.152.76.0/23 +103.152.80.0/23 +103.152.98.0/23 +103.152.112.0/23 +103.152.120.0/23 +103.152.122.0/23 +103.152.132.0/23 +103.152.152.0/23 +103.152.168.0/23 +103.152.170.0/23 +103.152.186.0/23 +103.152.190.0/23 +103.152.192.0/23 +103.152.200.0/23 103.192.0.0/22 103.192.4.0/22 103.192.8.0/22 @@ -4093,6 +4145,7 @@ 103.199.248.0/22 103.199.252.0/22 103.200.28.0/22 +103.200.32.0/22 103.200.52.0/22 103.200.64.0/22 103.200.68.0/22 @@ -5004,7 +5057,6 @@ 103.250.248.0/22 103.250.252.0/22 103.251.32.0/22 -103.251.36.0/22 103.251.84.0/22 103.251.96.0/22 103.251.124.0/22 @@ -5062,8 +5114,7 @@ 106.4.0.0/14 106.8.0.0/15 106.11.0.0/16 -106.12.0.0/15 -106.14.0.0/15 +106.12.0.0/14 106.16.0.0/12 106.32.0.0/12 106.48.0.0/15 @@ -5401,10 +5452,7 @@ 117.32.0.0/13 117.40.0.0/14 117.44.0.0/15 -117.48.0.0/17 -117.48.128.0/17 -117.49.0.0/16 -117.50.0.0/15 +117.48.0.0/14 117.53.48.0/20 117.53.176.0/20 117.57.0.0/16 @@ -5832,8 +5880,7 @@ 124.64.0.0/15 124.66.0.0/17 124.67.0.0/16 -124.68.0.0/15 -124.70.0.0/15 +124.68.0.0/14 124.72.0.0/16 124.73.0.0/16 124.74.0.0/15 @@ -5975,6 +6022,8 @@ 140.249.0.0/16 140.250.0.0/16 140.255.0.0/16 +142.70.0.0/16 +142.86.0.0/16 144.0.0.0/16 144.7.0.0/16 144.12.0.0/16 @@ -6001,6 +6050,7 @@ 146.196.116.0/22 146.196.124.0/22 148.70.0.0/16 +149.41.0.0/16 150.0.0.0/16 150.115.0.0/16 150.121.0.0/16 @@ -6037,12 +6087,12 @@ 150.242.192.0/22 150.242.212.0/22 150.242.224.0/22 -150.242.228.0/22 150.242.232.0/22 150.242.236.0/22 150.242.240.0/22 150.242.244.0/22 150.242.248.0/22 +150.248.0.0/16 150.255.0.0/16 152.104.128.0/17 152.136.0.0/16 @@ -6082,6 +6132,7 @@ 157.148.0.0/16 157.156.0.0/16 157.255.0.0/16 +158.79.0.0/16 159.75.0.0/16 159.226.0.0/16 160.19.208.0/22 @@ -6104,6 +6155,7 @@ 160.202.248.0/22 160.202.252.0/22 160.238.64.0/22 +161.120.0.0/16 161.189.0.0/16 161.207.0.0/16 162.14.0.0/16 diff --git a/package/lean/luci-app-ssr-plus/root/etc/ssr/deny.list b/package/lean/luci-app-ssr-plus/root/etc/ssr/deny.list new file mode 100644 index 0000000000..dc4344e7d7 --- /dev/null +++ b/package/lean/luci-app-ssr-plus/root/etc/ssr/deny.list @@ -0,0 +1,14 @@ +gvod.aiseejapp.atianqi.com +stat.pandora.xiaomi.com +upgrade.mishop.pandora.xiaomi.com +logonext.tv.kuyun.com +config.kuyun.com +mishop.pandora.xiaomi.com +dvb.pandora.xiaomi.com +api.ad.xiaomi.com +de.pandora.xiaomi.com +data.mistat.xiaomi.com +jellyfish.pandora.xiaomi.com +gallery.pandora.xiaomi.com +o2o.api.xiaomi.com +bss.pandora.xiaomi.com \ No newline at end of file diff --git a/package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_base.conf b/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_base.conf similarity index 100% rename from package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_base.conf rename to package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_base.conf diff --git a/package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_list.conf b/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf similarity index 97% rename from package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_list.conf rename to package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf index cfeb42fc82..d9d7e3c310 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_list.conf +++ b/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf @@ -1,5 +1,3 @@ -server=/.030buy.com/127.0.0.1#5335 -ipset=/.030buy.com/gfwlist server=/.0rz.tw/127.0.0.1#5335 ipset=/.0rz.tw/gfwlist server=/.10.tt/127.0.0.1#5335 @@ -76,6 +74,8 @@ server=/.2008xianzhang.info/127.0.0.1#5335 ipset=/.2008xianzhang.info/gfwlist server=/.2017.hk/127.0.0.1#5335 ipset=/.2017.hk/gfwlist +server=/.2049bbs.xyz/127.0.0.1#5335 +ipset=/.2049bbs.xyz/gfwlist server=/.21join.com/127.0.0.1#5335 ipset=/.21join.com/gfwlist server=/.21pron.com/127.0.0.1#5335 @@ -210,14 +210,10 @@ server=/.8news.com.tw/127.0.0.1#5335 ipset=/.8news.com.tw/gfwlist server=/.8z1.net/127.0.0.1#5335 ipset=/.8z1.net/gfwlist -server=/.9001700.com/127.0.0.1#5335 -ipset=/.9001700.com/gfwlist server=/.91porn.com/127.0.0.1#5335 ipset=/.91porn.com/gfwlist server=/.91vps.club/127.0.0.1#5335 ipset=/.91vps.club/gfwlist -server=/.92ccav.com/127.0.0.1#5335 -ipset=/.92ccav.com/gfwlist server=/.991.com/127.0.0.1#5335 ipset=/.991.com/gfwlist server=/.99btgc01.com/127.0.0.1#5335 @@ -236,6 +232,8 @@ server=/.a248.e.akamai.net/127.0.0.1#5335 ipset=/.a248.e.akamai.net/gfwlist server=/.a5.com.ru/127.0.0.1#5335 ipset=/.a5.com.ru/gfwlist +server=/.a771.dscq.akamai.net/127.0.0.1#5335 +ipset=/.a771.dscq.akamai.net/gfwlist server=/.aamacau.com/127.0.0.1#5335 ipset=/.aamacau.com/gfwlist server=/.abc.com/127.0.0.1#5335 @@ -248,8 +246,6 @@ server=/.abc.xyz/127.0.0.1#5335 ipset=/.abc.xyz/gfwlist server=/.abchinese.com/127.0.0.1#5335 ipset=/.abchinese.com/gfwlist -server=/.abclite.net/127.0.0.1#5335 -ipset=/.abclite.net/gfwlist server=/.abebooks.com/127.0.0.1#5335 ipset=/.abebooks.com/gfwlist server=/.abematv.akamaized.net/127.0.0.1#5335 @@ -260,20 +256,12 @@ server=/.aboluowang.com/127.0.0.1#5335 ipset=/.aboluowang.com/gfwlist server=/.about.google/127.0.0.1#5335 ipset=/.about.google/gfwlist -server=/.aboutgfw.com/127.0.0.1#5335 -ipset=/.aboutgfw.com/gfwlist -server=/.abs.edu/127.0.0.1#5335 -ipset=/.abs.edu/gfwlist server=/.ac.jiruan.net/127.0.0.1#5335 ipset=/.ac.jiruan.net/gfwlist -server=/.accim.org/127.0.0.1#5335 -ipset=/.accim.org/gfwlist server=/.aceros-de-hispania.com/127.0.0.1#5335 ipset=/.aceros-de-hispania.com/gfwlist server=/.acevpn.com/127.0.0.1#5335 ipset=/.acevpn.com/gfwlist -server=/.acg18.me/127.0.0.1#5335 -ipset=/.acg18.me/gfwlist server=/.acgkj.com/127.0.0.1#5335 ipset=/.acgkj.com/gfwlist server=/.acmedia365.com/127.0.0.1#5335 @@ -300,8 +288,6 @@ server=/.admob.com/127.0.0.1#5335 ipset=/.admob.com/gfwlist server=/.adpl.org.hk/127.0.0.1#5335 ipset=/.adpl.org.hk/gfwlist -server=/.ads-twitter.com/127.0.0.1#5335 -ipset=/.ads-twitter.com/gfwlist server=/.adsense.com/127.0.0.1#5335 ipset=/.adsense.com/gfwlist server=/.adult-sex-games.com/127.0.0.1#5335 @@ -320,8 +306,6 @@ server=/.aex.com/127.0.0.1#5335 ipset=/.aex.com/gfwlist server=/.af.mil/127.0.0.1#5335 ipset=/.af.mil/gfwlist -server=/.agnesb.fr/127.0.0.1#5335 -ipset=/.agnesb.fr/gfwlist server=/.agoogleaday.com/127.0.0.1#5335 ipset=/.agoogleaday.com/gfwlist server=/.agro.hk/127.0.0.1#5335 @@ -352,8 +336,6 @@ server=/.aiweiweiblog.com/127.0.0.1#5335 ipset=/.aiweiweiblog.com/gfwlist server=/.akiba-online.com/127.0.0.1#5335 ipset=/.akiba-online.com/gfwlist -server=/.akiba-web.com/127.0.0.1#5335 -ipset=/.akiba-web.com/gfwlist server=/.akow.org/127.0.0.1#5335 ipset=/.akow.org/gfwlist server=/.al-islam.com/127.0.0.1#5335 @@ -414,8 +396,6 @@ server=/.alphaporno.com/127.0.0.1#5335 ipset=/.alphaporno.com/gfwlist server=/.alternate-tools.com/127.0.0.1#5335 ipset=/.alternate-tools.com/gfwlist -server=/.altrec.com/127.0.0.1#5335 -ipset=/.altrec.com/gfwlist server=/.alvinalexander.com/127.0.0.1#5335 ipset=/.alvinalexander.com/gfwlist server=/.alwaysdata.com/127.0.0.1#5335 @@ -428,8 +408,8 @@ server=/.am730.com.hk/127.0.0.1#5335 ipset=/.am730.com.hk/gfwlist server=/.amazon.co.jp/127.0.0.1#5335 ipset=/.amazon.co.jp/gfwlist -server=/.ameblo.jp/127.0.0.1#5335 -ipset=/.ameblo.jp/gfwlist +server=/.ameba.jp/127.0.0.1#5335 +ipset=/.ameba.jp/gfwlist server=/.americangreencard.com/127.0.0.1#5335 ipset=/.americangreencard.com/gfwlist server=/.americanunfinished.com/127.0.0.1#5335 @@ -450,6 +430,8 @@ server=/.amnyemachen.org/127.0.0.1#5335 ipset=/.amnyemachen.org/gfwlist server=/.amoiist.com/127.0.0.1#5335 ipset=/.amoiist.com/gfwlist +server=/.ampproject.org/127.0.0.1#5335 +ipset=/.ampproject.org/gfwlist server=/.amtb-taipei.org/127.0.0.1#5335 ipset=/.amtb-taipei.org/gfwlist server=/.anchorfree.com/127.0.0.1#5335 @@ -470,8 +452,6 @@ server=/.andygod.com/127.0.0.1#5335 ipset=/.andygod.com/gfwlist server=/.angela-merkel.de/127.0.0.1#5335 ipset=/.angela-merkel.de/gfwlist -server=/.angola.org/127.0.0.1#5335 -ipset=/.angola.org/gfwlist server=/.angularjs.org/127.0.0.1#5335 ipset=/.angularjs.org/gfwlist server=/.animecrazy.net/127.0.0.1#5335 @@ -518,10 +498,6 @@ server=/.aolchannels.aol.com/127.0.0.1#5335 ipset=/.aolchannels.aol.com/gfwlist server=/.aomiwang.com/127.0.0.1#5335 ipset=/.aomiwang.com/gfwlist -server=/.apartmentratings.com/127.0.0.1#5335 -ipset=/.apartmentratings.com/gfwlist -server=/.apartments.com/127.0.0.1#5335 -ipset=/.apartments.com/gfwlist server=/.apetube.com/127.0.0.1#5335 ipset=/.apetube.com/gfwlist server=/.api-secure.recaptcha.net/127.0.0.1#5335 @@ -598,8 +574,6 @@ server=/.arctosia.com/127.0.0.1#5335 ipset=/.arctosia.com/gfwlist server=/.areca-backup.org/127.0.0.1#5335 ipset=/.areca-backup.org/gfwlist -server=/.arena.taipei/127.0.0.1#5335 -ipset=/.arena.taipei/gfwlist server=/.arethusa.su/127.0.0.1#5335 ipset=/.arethusa.su/gfwlist server=/.arlingtoncemetery.mil/127.0.0.1#5335 @@ -644,16 +618,12 @@ server=/.assembla.com/127.0.0.1#5335 ipset=/.assembla.com/gfwlist server=/.assets.bwbx.io/127.0.0.1#5335 ipset=/.assets.bwbx.io/gfwlist -server=/.assimp.org/127.0.0.1#5335 -ipset=/.assimp.org/gfwlist server=/.astrill.com/127.0.0.1#5335 ipset=/.astrill.com/gfwlist server=/.atc.org.au/127.0.0.1#5335 ipset=/.atc.org.au/gfwlist server=/.atchinese.com/127.0.0.1#5335 ipset=/.atchinese.com/gfwlist -server=/.atdmt.com/127.0.0.1#5335 -ipset=/.atdmt.com/gfwlist server=/.atgfw.org/127.0.0.1#5335 ipset=/.atgfw.org/gfwlist server=/.athenaeizou.com/127.0.0.1#5335 @@ -716,8 +686,6 @@ server=/.azerbaycan.tv/127.0.0.1#5335 ipset=/.azerbaycan.tv/gfwlist server=/.azerimix.com/127.0.0.1#5335 ipset=/.azerimix.com/gfwlist -server=/.azubu.tv/127.0.0.1#5335 -ipset=/.azubu.tv/gfwlist server=/.b0ne.com/127.0.0.1#5335 ipset=/.b0ne.com/gfwlist server=/.babynet.com.hk/127.0.0.1#5335 @@ -732,8 +700,6 @@ server=/.badjojo.com/127.0.0.1#5335 ipset=/.badjojo.com/gfwlist server=/.badoo.com/127.0.0.1#5335 ipset=/.badoo.com/gfwlist -server=/.baidu.jp/127.0.0.1#5335 -ipset=/.baidu.jp/gfwlist server=/.baijie.org/127.0.0.1#5335 ipset=/.baijie.org/gfwlist server=/.bailandaily.com/127.0.0.1#5335 @@ -746,6 +712,8 @@ server=/.banana-vpn.com/127.0.0.1#5335 ipset=/.banana-vpn.com/gfwlist server=/.band.us/127.0.0.1#5335 ipset=/.band.us/gfwlist +server=/.bandpage.com/127.0.0.1#5335 +ipset=/.bandpage.com/gfwlist server=/.bandwagonhost.com/127.0.0.1#5335 ipset=/.bandwagonhost.com/gfwlist server=/.bangbrosnetwork.com/127.0.0.1#5335 @@ -756,14 +724,10 @@ server=/.bangdream.space/127.0.0.1#5335 ipset=/.bangdream.space/gfwlist server=/.bangyoulater.com/127.0.0.1#5335 ipset=/.bangyoulater.com/gfwlist -server=/.bankmobilevibe.com/127.0.0.1#5335 -ipset=/.bankmobilevibe.com/gfwlist server=/.bannedbook.org/127.0.0.1#5335 ipset=/.bannedbook.org/gfwlist server=/.bannednews.org/127.0.0.1#5335 ipset=/.bannednews.org/gfwlist -server=/.banorte.com/127.0.0.1#5335 -ipset=/.banorte.com/gfwlist server=/.baramangaonline.com/127.0.0.1#5335 ipset=/.baramangaonline.com/gfwlist server=/.barenakedislam.com/127.0.0.1#5335 @@ -774,8 +738,6 @@ server=/.barton.de/127.0.0.1#5335 ipset=/.barton.de/gfwlist server=/.bartvpn.com/127.0.0.1#5335 ipset=/.bartvpn.com/gfwlist -server=/.bash-hackers.org/127.0.0.1#5335 -ipset=/.bash-hackers.org/gfwlist server=/.bastillepost.com/127.0.0.1#5335 ipset=/.bastillepost.com/gfwlist server=/.bayvoice.net/127.0.0.1#5335 @@ -786,8 +748,6 @@ server=/.bbc.co.uk/127.0.0.1#5335 ipset=/.bbc.co.uk/gfwlist server=/.bbc.com/127.0.0.1#5335 ipset=/.bbc.com/gfwlist -server=/.bbc.in/127.0.0.1#5335 -ipset=/.bbc.in/gfwlist server=/.bbcchinese.com/127.0.0.1#5335 ipset=/.bbcchinese.com/gfwlist server=/.bbchat.tv/127.0.0.1#5335 @@ -920,8 +880,6 @@ server=/.bfsh.hk/127.0.0.1#5335 ipset=/.bfsh.hk/gfwlist server=/.bgvpn.com/127.0.0.1#5335 ipset=/.bgvpn.com/gfwlist -server=/.bianlei.com/127.0.0.1#5335 -ipset=/.bianlei.com/gfwlist server=/.biantailajiao.com/127.0.0.1#5335 ipset=/.biantailajiao.com/gfwlist server=/.biantailajiao.in/127.0.0.1#5335 @@ -936,6 +894,8 @@ server=/.big.one/127.0.0.1#5335 ipset=/.big.one/gfwlist server=/.bigfools.com/127.0.0.1#5335 ipset=/.bigfools.com/gfwlist +server=/.biggo.com.tw/127.0.0.1#5335 +ipset=/.biggo.com.tw/gfwlist server=/.bigjapanesesex.com/127.0.0.1#5335 ipset=/.bigjapanesesex.com/gfwlist server=/.bigmoney.biz/127.0.0.1#5335 @@ -1122,8 +1082,6 @@ server=/.bolin.netfirms.com/127.0.0.1#5335 ipset=/.bolin.netfirms.com/gfwlist server=/.bonbonme.com/127.0.0.1#5335 ipset=/.bonbonme.com/gfwlist -server=/.bonbonsex.com/127.0.0.1#5335 -ipset=/.bonbonsex.com/gfwlist server=/.bonfoundation.org/127.0.0.1#5335 ipset=/.bonfoundation.org/gfwlist server=/.bongacams.com/127.0.0.1#5335 @@ -1352,8 +1310,6 @@ server=/.castbox.fm/127.0.0.1#5335 ipset=/.castbox.fm/gfwlist server=/.catch22.net/127.0.0.1#5335 ipset=/.catch22.net/gfwlist -server=/.catchgod.com/127.0.0.1#5335 -ipset=/.catchgod.com/gfwlist server=/.catfightpayperview.xxx/127.0.0.1#5335 ipset=/.catfightpayperview.xxx/gfwlist server=/.catholic.org.hk/127.0.0.1#5335 @@ -1522,8 +1478,6 @@ server=/.china-review.com.ua/127.0.0.1#5335 ipset=/.china-review.com.ua/gfwlist server=/.china-week.com/127.0.0.1#5335 ipset=/.china-week.com/gfwlist -server=/.china.hket.com/127.0.0.1#5335 -ipset=/.china.hket.com/gfwlist server=/.china101.com/127.0.0.1#5335 ipset=/.china101.com/gfwlist server=/.china18.org/127.0.0.1#5335 @@ -1602,8 +1556,6 @@ server=/.chinasoul.org/127.0.0.1#5335 ipset=/.chinasoul.org/gfwlist server=/.chinasucks.net/127.0.0.1#5335 ipset=/.chinasucks.net/gfwlist -server=/.chinatimes.com/127.0.0.1#5335 -ipset=/.chinatimes.com/gfwlist server=/.chinatopsex.com/127.0.0.1#5335 ipset=/.chinatopsex.com/gfwlist server=/.chinatown.com.au/127.0.0.1#5335 @@ -1656,8 +1608,6 @@ server=/.chithu.org/127.0.0.1#5335 ipset=/.chithu.org/gfwlist server=/.chn.chosun.com/127.0.0.1#5335 ipset=/.chn.chosun.com/gfwlist -server=/.chobit.cc/127.0.0.1#5335 -ipset=/.chobit.cc/gfwlist server=/.chrdnet.com/127.0.0.1#5335 ipset=/.chrdnet.com/gfwlist server=/.christianfreedom.org/127.0.0.1#5335 @@ -1754,10 +1704,10 @@ server=/.clinica-tibet.ru/127.0.0.1#5335 ipset=/.clinica-tibet.ru/gfwlist server=/.clipfish.de/127.0.0.1#5335 ipset=/.clipfish.de/gfwlist +server=/.clips4sale.com/127.0.0.1#5335 +ipset=/.clips4sale.com/gfwlist server=/.cloakpoint.com/127.0.0.1#5335 ipset=/.cloakpoint.com/gfwlist -server=/.cloud.feedly.com/127.0.0.1#5335 -ipset=/.cloud.feedly.com/gfwlist server=/.cloud.mail.ru/127.0.0.1#5335 ipset=/.cloud.mail.ru/gfwlist server=/.club1069.com/127.0.0.1#5335 @@ -1790,8 +1740,6 @@ server=/.cn.freeones.com/127.0.0.1#5335 ipset=/.cn.freeones.com/gfwlist server=/.cn.ibtimes.com/127.0.0.1#5335 ipset=/.cn.ibtimes.com/gfwlist -server=/.cn.nytstyle.com/127.0.0.1#5335 -ipset=/.cn.nytstyle.com/gfwlist server=/.cn.sandscotaicentral.com/127.0.0.1#5335 ipset=/.cn.sandscotaicentral.com/gfwlist server=/.cn.shafaqna.com/127.0.0.1#5335 @@ -1948,8 +1896,6 @@ server=/.cristyli.com/127.0.0.1#5335 ipset=/.cristyli.com/gfwlist server=/.crocotube.com/127.0.0.1#5335 ipset=/.crocotube.com/gfwlist -server=/.crossfire.co.kr/127.0.0.1#5335 -ipset=/.crossfire.co.kr/gfwlist server=/.crossthewall.net/127.0.0.1#5335 ipset=/.crossthewall.net/gfwlist server=/.crossvpn.net/127.0.0.1#5335 @@ -1978,6 +1924,8 @@ server=/.ctitv.com.tw/127.0.0.1#5335 ipset=/.ctitv.com.tw/gfwlist server=/.cts.com.tw/127.0.0.1#5335 ipset=/.cts.com.tw/gfwlist +server=/.ctwant.com/127.0.0.1#5335 +ipset=/.ctwant.com/gfwlist server=/.cuihua.org/127.0.0.1#5335 ipset=/.cuihua.org/gfwlist server=/.cuiweiping.net/127.0.0.1#5335 @@ -2116,8 +2064,6 @@ server=/.darktech.org/127.0.0.1#5335 ipset=/.darktech.org/gfwlist server=/.darktoy.net/127.0.0.1#5335 ipset=/.darktoy.net/gfwlist -server=/.darpa.mil/127.0.0.1#5335 -ipset=/.darpa.mil/gfwlist server=/.dastrassi.org/127.0.0.1#5335 ipset=/.dastrassi.org/gfwlist server=/.data-vocabulary.org/127.0.0.1#5335 @@ -2130,8 +2076,6 @@ server=/.daum.net/127.0.0.1#5335 ipset=/.daum.net/gfwlist server=/.david-kilgour.com/127.0.0.1#5335 ipset=/.david-kilgour.com/gfwlist -server=/.dawangidc.com/127.0.0.1#5335 -ipset=/.dawangidc.com/gfwlist server=/.daxa.cn/127.0.0.1#5335 ipset=/.daxa.cn/gfwlist server=/.db.tt/127.0.0.1#5335 @@ -2166,6 +2110,8 @@ server=/.deck.ly/127.0.0.1#5335 ipset=/.deck.ly/gfwlist server=/.decodet.co/127.0.0.1#5335 ipset=/.decodet.co/gfwlist +server=/.deepdiscount.com/127.0.0.1#5335 +ipset=/.deepdiscount.com/gfwlist server=/.deepmind.com/127.0.0.1#5335 ipset=/.deepmind.com/gfwlist server=/.deezer.com/127.0.0.1#5335 @@ -2228,8 +2174,6 @@ server=/.diigo.com/127.0.0.1#5335 ipset=/.diigo.com/gfwlist server=/.dilber.se/127.0.0.1#5335 ipset=/.dilber.se/gfwlist -server=/.dingchin.com.tw/127.0.0.1#5335 -ipset=/.dingchin.com.tw/gfwlist server=/.dipity.com/127.0.0.1#5335 ipset=/.dipity.com/gfwlist server=/.directcreative.com/127.0.0.1#5335 @@ -2270,14 +2214,10 @@ server=/.dlsite.com/127.0.0.1#5335 ipset=/.dlsite.com/gfwlist server=/.dlyoutube.com/127.0.0.1#5335 ipset=/.dlyoutube.com/gfwlist -server=/.dm530.net/127.0.0.1#5335 -ipset=/.dm530.net/gfwlist server=/.dmcdn.net/127.0.0.1#5335 ipset=/.dmcdn.net/gfwlist server=/.dmhy.org/127.0.0.1#5335 ipset=/.dmhy.org/gfwlist -server=/.dmm.co.jp/127.0.0.1#5335 -ipset=/.dmm.co.jp/gfwlist server=/.dns-dns.com/127.0.0.1#5335 ipset=/.dns-dns.com/gfwlist server=/.dns-stuff.com/127.0.0.1#5335 @@ -2302,8 +2242,6 @@ server=/.dnsrd.com/127.0.0.1#5335 ipset=/.dnsrd.com/gfwlist server=/.dnssec.net/127.0.0.1#5335 ipset=/.dnssec.net/gfwlist -server=/.dnvod.tv/127.0.0.1#5335 -ipset=/.dnvod.tv/gfwlist server=/.doctorvoice.org/127.0.0.1#5335 ipset=/.doctorvoice.org/gfwlist server=/.documentingreality.com/127.0.0.1#5335 @@ -2338,6 +2276,8 @@ server=/.dontmovetochina.com/127.0.0.1#5335 ipset=/.dontmovetochina.com/gfwlist server=/.dorjeshugden.com/127.0.0.1#5335 ipset=/.dorjeshugden.com/gfwlist +server=/.dotgov.gov/127.0.0.1#5335 +ipset=/.dotgov.gov/gfwlist server=/.dotplane.com/127.0.0.1#5335 ipset=/.dotplane.com/gfwlist server=/.dotsub.com/127.0.0.1#5335 @@ -2438,6 +2378,8 @@ server=/.dupola.net/127.0.0.1#5335 ipset=/.dupola.net/gfwlist server=/.dushi.ca/127.0.0.1#5335 ipset=/.dushi.ca/gfwlist +server=/.duyaoss.com/127.0.0.1#5335 +ipset=/.duyaoss.com/gfwlist server=/.dvdpac.com/127.0.0.1#5335 ipset=/.dvdpac.com/gfwlist server=/.dvorak.org/127.0.0.1#5335 @@ -2554,8 +2496,6 @@ server=/.edubridge.com/127.0.0.1#5335 ipset=/.edubridge.com/gfwlist server=/.edupro.org/127.0.0.1#5335 ipset=/.edupro.org/gfwlist -server=/.eesti.ee/127.0.0.1#5335 -ipset=/.eesti.ee/gfwlist server=/.eevpn.com/127.0.0.1#5335 ipset=/.eevpn.com/gfwlist server=/.efcc.org.hk/127.0.0.1#5335 @@ -2702,8 +2642,6 @@ server=/.eslite.com/127.0.0.1#5335 ipset=/.eslite.com/gfwlist server=/.esmtp.biz/127.0.0.1#5335 ipset=/.esmtp.biz/gfwlist -server=/.esurance.com/127.0.0.1#5335 -ipset=/.esurance.com/gfwlist server=/.etaa.org.au/127.0.0.1#5335 ipset=/.etaa.org.au/gfwlist server=/.etadult.com/127.0.0.1#5335 @@ -2762,6 +2700,8 @@ server=/.exrates.me/127.0.0.1#5335 ipset=/.exrates.me/gfwlist server=/.extmatrix.com/127.0.0.1#5335 ipset=/.extmatrix.com/gfwlist +server=/.extrabux.com/127.0.0.1#5335 +ipset=/.extrabux.com/gfwlist server=/.extremetube.com/127.0.0.1#5335 ipset=/.extremetube.com/gfwlist server=/.exx.com/127.0.0.1#5335 @@ -2910,8 +2850,6 @@ server=/.farwestchina.com/127.0.0.1#5335 ipset=/.farwestchina.com/gfwlist server=/.fast.wistia.com/127.0.0.1#5335 ipset=/.fast.wistia.com/gfwlist -server=/.fastpic.ru/127.0.0.1#5335 -ipset=/.fastpic.ru/gfwlist server=/.fastssh.com/127.0.0.1#5335 ipset=/.fastssh.com/gfwlist server=/.faststone.org/127.0.0.1#5335 @@ -2952,6 +2890,8 @@ server=/.fdc89.jp/127.0.0.1#5335 ipset=/.fdc89.jp/gfwlist server=/.feedburner.com/127.0.0.1#5335 ipset=/.feedburner.com/gfwlist +server=/.feedly.com/127.0.0.1#5335 +ipset=/.feedly.com/gfwlist server=/.feeds.fileforum.com/127.0.0.1#5335 ipset=/.feeds.fileforum.com/gfwlist server=/.feedx.net/127.0.0.1#5335 @@ -2996,16 +2936,12 @@ server=/.fileflyer.com/127.0.0.1#5335 ipset=/.fileflyer.com/gfwlist server=/.files2me.com/127.0.0.1#5335 ipset=/.files2me.com/gfwlist -server=/.filesor.com/127.0.0.1#5335 -ipset=/.filesor.com/gfwlist server=/.fillthesquare.org/127.0.0.1#5335 ipset=/.fillthesquare.org/gfwlist server=/.filmingfortibet.org/127.0.0.1#5335 ipset=/.filmingfortibet.org/gfwlist server=/.filthdump.com/127.0.0.1#5335 ipset=/.filthdump.com/gfwlist -server=/.financetwitter.com/127.0.0.1#5335 -ipset=/.financetwitter.com/gfwlist server=/.finchvpn.com/127.0.0.1#5335 ipset=/.finchvpn.com/gfwlist server=/.findmespot.com/127.0.0.1#5335 @@ -3062,10 +2998,6 @@ server=/.flyvpn.com/127.0.0.1#5335 ipset=/.flyvpn.com/gfwlist server=/.flyzy2005.com/127.0.0.1#5335 ipset=/.flyzy2005.com/gfwlist -server=/.fnac.be/127.0.0.1#5335 -ipset=/.fnac.be/gfwlist -server=/.fnac.com/127.0.0.1#5335 -ipset=/.fnac.com/gfwlist server=/.fochk.org/127.0.0.1#5335 ipset=/.fochk.org/gfwlist server=/.focustaiwan.tw/127.0.0.1#5335 @@ -3208,6 +3140,8 @@ server=/.freeopenvpn.com/127.0.0.1#5335 ipset=/.freeopenvpn.com/gfwlist server=/.freeoz.org/127.0.0.1#5335 ipset=/.freeoz.org/gfwlist +server=/.freeproxylists.net/127.0.0.1#5335 +ipset=/.freeproxylists.net/gfwlist server=/.freessh.us/127.0.0.1#5335 ipset=/.freessh.us/gfwlist server=/.freetcp.com/127.0.0.1#5335 @@ -3318,8 +3252,6 @@ server=/.fw.cm/127.0.0.1#5335 ipset=/.fw.cm/gfwlist server=/.fxcm-chinese.com/127.0.0.1#5335 ipset=/.fxcm-chinese.com/gfwlist -server=/.fxnetworks.com/127.0.0.1#5335 -ipset=/.fxnetworks.com/gfwlist server=/.fzh999.com/127.0.0.1#5335 ipset=/.fzh999.com/gfwlist server=/.fzh999.net/127.0.0.1#5335 @@ -3332,6 +3264,8 @@ server=/.g-queen.com/127.0.0.1#5335 ipset=/.g-queen.com/gfwlist server=/.g.co/127.0.0.1#5335 ipset=/.g.co/gfwlist +server=/.g.kfd.me/127.0.0.1#5335 +ipset=/.g.kfd.me/gfwlist server=/.g0v.social/127.0.0.1#5335 ipset=/.g0v.social/gfwlist server=/.g6hentai.com/127.0.0.1#5335 @@ -3470,10 +3404,6 @@ server=/.getsync.com/127.0.0.1#5335 ipset=/.getsync.com/gfwlist server=/.gettrials.com/127.0.0.1#5335 ipset=/.gettrials.com/gfwlist -server=/.gettyimages.com/127.0.0.1#5335 -ipset=/.gettyimages.com/gfwlist -server=/.getuploader.com/127.0.0.1#5335 -ipset=/.getuploader.com/gfwlist server=/.gfbv.de/127.0.0.1#5335 ipset=/.gfbv.de/gfwlist server=/.gfgold.com.hk/127.0.0.1#5335 @@ -3512,8 +3442,6 @@ server=/.gjczz.com/127.0.0.1#5335 ipset=/.gjczz.com/gfwlist server=/.glass8.eu/127.0.0.1#5335 ipset=/.glass8.eu/gfwlist -server=/.global.bing.com/127.0.0.1#5335 -ipset=/.global.bing.com/gfwlist server=/.globaljihad.net/127.0.0.1#5335 ipset=/.globaljihad.net/gfwlist server=/.globalmediaoutreach.com/127.0.0.1#5335 @@ -3536,8 +3464,6 @@ server=/.gloryhole.com/127.0.0.1#5335 ipset=/.gloryhole.com/gfwlist server=/.glorystar.me/127.0.0.1#5335 ipset=/.glorystar.me/gfwlist -server=/.glype.com/127.0.0.1#5335 -ipset=/.glype.com/gfwlist server=/.gmail.com/127.0.0.1#5335 ipset=/.gmail.com/gfwlist server=/.gmbd.cn/127.0.0.1#5335 @@ -3552,6 +3478,8 @@ server=/.gmozomg.izihost.org/127.0.0.1#5335 ipset=/.gmozomg.izihost.org/gfwlist server=/.gnci.org.hk/127.0.0.1#5335 ipset=/.gnci.org.hk/gfwlist +server=/.gnews.org/127.0.0.1#5335 +ipset=/.gnews.org/gfwlist server=/.go-pki.com/127.0.0.1#5335 ipset=/.go-pki.com/gfwlist server=/.go.nesnode.com/127.0.0.1#5335 @@ -3736,8 +3664,6 @@ server=/.google.vu/127.0.0.1#5335 ipset=/.google.vu/gfwlist server=/.google.ws/127.0.0.1#5335 ipset=/.google.ws/gfwlist -server=/.googleapis.cn/127.0.0.1#5335 -ipset=/.googleapis.cn/gfwlist server=/.googleapis.com/127.0.0.1#5335 ipset=/.googleapis.com/gfwlist server=/.googleapps.com/127.0.0.1#5335 @@ -4106,8 +4032,6 @@ server=/.hitbtc.com/127.0.0.1#5335 ipset=/.hitbtc.com/gfwlist server=/.hitomi.la/127.0.0.1#5335 ipset=/.hitomi.la/gfwlist -server=/.hiwifi.com/127.0.0.1#5335 -ipset=/.hiwifi.com/gfwlist server=/.hizb-ut-tahrir.info/127.0.0.1#5335 ipset=/.hizb-ut-tahrir.info/gfwlist server=/.hizb-ut-tahrir.org/127.0.0.1#5335 @@ -4170,6 +4094,8 @@ server=/.hkdf.org/127.0.0.1#5335 ipset=/.hkdf.org/gfwlist server=/.hkej.com/127.0.0.1#5335 ipset=/.hkej.com/gfwlist +server=/.hket.com/127.0.0.1#5335 +ipset=/.hket.com/gfwlist server=/.hkfaa.com/127.0.0.1#5335 ipset=/.hkfaa.com/gfwlist server=/.hkfreezone.com/127.0.0.1#5335 @@ -4214,10 +4140,6 @@ server=/.hkzone.org/127.0.0.1#5335 ipset=/.hkzone.org/gfwlist server=/.hmonghot.com/127.0.0.1#5335 ipset=/.hmonghot.com/gfwlist -server=/.hmvdigital.ca/127.0.0.1#5335 -ipset=/.hmvdigital.ca/gfwlist -server=/.hmvdigital.com/127.0.0.1#5335 -ipset=/.hmvdigital.com/gfwlist server=/.hnjhj.com/127.0.0.1#5335 ipset=/.hnjhj.com/gfwlist server=/.hnntube.com/127.0.0.1#5335 @@ -4234,8 +4156,6 @@ server=/.holyspiritspeaks.org/127.0.0.1#5335 ipset=/.holyspiritspeaks.org/gfwlist server=/.home.sina.com/127.0.0.1#5335 ipset=/.home.sina.com/gfwlist -server=/.homedepot.com/127.0.0.1#5335 -ipset=/.homedepot.com/gfwlist server=/.homeperversion.com/127.0.0.1#5335 ipset=/.homeperversion.com/gfwlist server=/.homeservershow.com/127.0.0.1#5335 @@ -4248,8 +4168,6 @@ server=/.hongzhi.li/127.0.0.1#5335 ipset=/.hongzhi.li/gfwlist server=/.hootsuite.com/127.0.0.1#5335 ipset=/.hootsuite.com/gfwlist -server=/.hoovers.com/127.0.0.1#5335 -ipset=/.hoovers.com/gfwlist server=/.hopedialogue.org/127.0.0.1#5335 ipset=/.hopedialogue.org/gfwlist server=/.hopto.org/127.0.0.1#5335 @@ -4522,8 +4440,6 @@ server=/.illusionfactory.com/127.0.0.1#5335 ipset=/.illusionfactory.com/gfwlist server=/.ilove80.be/127.0.0.1#5335 ipset=/.ilove80.be/gfwlist -server=/.ilovelongtoes.com/127.0.0.1#5335 -ipset=/.ilovelongtoes.com/gfwlist server=/.im.tv/127.0.0.1#5335 ipset=/.im.tv/gfwlist server=/.im88.tw/127.0.0.1#5335 @@ -4536,8 +4452,6 @@ server=/.imageflea.com/127.0.0.1#5335 ipset=/.imageflea.com/gfwlist server=/.images-gaytube.com/127.0.0.1#5335 ipset=/.images-gaytube.com/gfwlist -server=/.images.comico.tw/127.0.0.1#5335 -ipset=/.images.comico.tw/gfwlist server=/.imageshack.us/127.0.0.1#5335 ipset=/.imageshack.us/gfwlist server=/.imagevenue.com/127.0.0.1#5335 @@ -4664,8 +4578,6 @@ server=/.isaacmao.com/127.0.0.1#5335 ipset=/.isaacmao.com/gfwlist server=/.isasecret.com/127.0.0.1#5335 ipset=/.isasecret.com/gfwlist -server=/.isc.sans.edu/127.0.0.1#5335 -ipset=/.isc.sans.edu/gfwlist server=/.isgreat.org/127.0.0.1#5335 ipset=/.isgreat.org/gfwlist server=/.islahhaber.net/127.0.0.1#5335 @@ -4748,6 +4660,8 @@ server=/.izlesem.org/127.0.0.1#5335 ipset=/.izlesem.org/gfwlist server=/.j.mp/127.0.0.1#5335 ipset=/.j.mp/gfwlist +server=/.jable.tv/127.0.0.1#5335 +ipset=/.jable.tv/gfwlist server=/.jamaat.org/127.0.0.1#5335 ipset=/.jamaat.org/gfwlist server=/.jamyangnorbu.com/127.0.0.1#5335 @@ -4770,18 +4684,18 @@ server=/.jav68.tv/127.0.0.1#5335 ipset=/.jav68.tv/gfwlist server=/.javakiba.org/127.0.0.1#5335 ipset=/.javakiba.org/gfwlist +server=/.javbus.co/127.0.0.1#5335 +ipset=/.javbus.co/gfwlist server=/.javbus.com/127.0.0.1#5335 ipset=/.javbus.com/gfwlist +server=/.javdb.com/127.0.0.1#5335 +ipset=/.javdb.com/gfwlist server=/.javfor.me/127.0.0.1#5335 ipset=/.javfor.me/gfwlist server=/.javhd.com/127.0.0.1#5335 ipset=/.javhd.com/gfwlist server=/.javhip.com/127.0.0.1#5335 ipset=/.javhip.com/gfwlist -server=/.javhub.net/127.0.0.1#5335 -ipset=/.javhub.net/gfwlist -server=/.javhuge.com/127.0.0.1#5335 -ipset=/.javhuge.com/gfwlist server=/.javlibrary.com/127.0.0.1#5335 ipset=/.javlibrary.com/gfwlist server=/.javmobile.net/127.0.0.1#5335 @@ -4804,8 +4718,6 @@ server=/.jbtalks.com/127.0.0.1#5335 ipset=/.jbtalks.com/gfwlist server=/.jbtalks.my/127.0.0.1#5335 ipset=/.jbtalks.my/gfwlist -server=/.jcpenney.com/127.0.0.1#5335 -ipset=/.jcpenney.com/gfwlist server=/.jdwsy.com/127.0.0.1#5335 ipset=/.jdwsy.com/gfwlist server=/.jeanyim.com/127.0.0.1#5335 @@ -4838,8 +4750,6 @@ server=/.jihadology.net/127.0.0.1#5335 ipset=/.jihadology.net/gfwlist server=/.jiji.com/127.0.0.1#5335 ipset=/.jiji.com/gfwlist -server=/.jims.net/127.0.0.1#5335 -ipset=/.jims.net/gfwlist server=/.jinbushe.org/127.0.0.1#5335 ipset=/.jinbushe.org/gfwlist server=/.jingpin.org/127.0.0.1#5335 @@ -4918,6 +4828,10 @@ server=/.justfreevpn.com/127.0.0.1#5335 ipset=/.justfreevpn.com/gfwlist server=/.justicefortenzin.org/127.0.0.1#5335 ipset=/.justicefortenzin.org/gfwlist +server=/.justmysocks.net/127.0.0.1#5335 +ipset=/.justmysocks.net/gfwlist +server=/.justmysocks1.net/127.0.0.1#5335 +ipset=/.justmysocks1.net/gfwlist server=/.justpaste.it/127.0.0.1#5335 ipset=/.justpaste.it/gfwlist server=/.justtristan.com/127.0.0.1#5335 @@ -4974,8 +4888,6 @@ server=/.kawaiikawaii.jp/127.0.0.1#5335 ipset=/.kawaiikawaii.jp/gfwlist server=/.kawase.com/127.0.0.1#5335 ipset=/.kawase.com/gfwlist -server=/.kb.monitorware.com/127.0.0.1#5335 -ipset=/.kb.monitorware.com/gfwlist server=/.kba-tx.org/127.0.0.1#5335 ipset=/.kba-tx.org/gfwlist server=/.kcoolonline.com/127.0.0.1#5335 @@ -4998,12 +4910,8 @@ server=/.kepard.com/127.0.0.1#5335 ipset=/.kepard.com/gfwlist server=/.kex.com/127.0.0.1#5335 ipset=/.kex.com/gfwlist -server=/.keycdn.com/127.0.0.1#5335 -ipset=/.keycdn.com/gfwlist server=/.khabdha.org/127.0.0.1#5335 ipset=/.khabdha.org/gfwlist -server=/.khatrimaza.org/127.0.0.1#5335 -ipset=/.khatrimaza.org/gfwlist server=/.khmusic.com.tw/127.0.0.1#5335 ipset=/.khmusic.com.tw/gfwlist server=/.kichiku-doujinko.com/127.0.0.1#5335 @@ -5034,14 +4942,14 @@ server=/.kir.jp/127.0.0.1#5335 ipset=/.kir.jp/gfwlist server=/.kissbbao.cn/127.0.0.1#5335 ipset=/.kissbbao.cn/gfwlist +server=/.kissjav.com/127.0.0.1#5335 +ipset=/.kissjav.com/gfwlist server=/.kiwi.kz/127.0.0.1#5335 ipset=/.kiwi.kz/gfwlist server=/.kk-whys.co.jp/127.0.0.1#5335 ipset=/.kk-whys.co.jp/gfwlist server=/.kkbox.com/127.0.0.1#5335 ipset=/.kkbox.com/gfwlist -server=/.kknews.cc/127.0.0.1#5335 -ipset=/.kknews.cc/gfwlist server=/.kmuh.org.tw/127.0.0.1#5335 ipset=/.kmuh.org.tw/gfwlist server=/.kobo.com/127.0.0.1#5335 @@ -5108,6 +5016,8 @@ server=/.ladbrokes.com/127.0.0.1#5335 ipset=/.ladbrokes.com/gfwlist server=/.lagranepoca.com/127.0.0.1#5335 ipset=/.lagranepoca.com/gfwlist +server=/.lala.im/127.0.0.1#5335 +ipset=/.lala.im/gfwlist server=/.lalulalu.com/127.0.0.1#5335 ipset=/.lalulalu.com/gfwlist server=/.lama.com.tw/127.0.0.1#5335 @@ -5166,8 +5076,6 @@ server=/.leirentv.ca/127.0.0.1#5335 ipset=/.leirentv.ca/gfwlist server=/.leisurecafe.ca/127.0.0.1#5335 ipset=/.leisurecafe.ca/gfwlist -server=/.leisurepro.com/127.0.0.1#5335 -ipset=/.leisurepro.com/gfwlist server=/.lematin.ch/127.0.0.1#5335 ipset=/.lematin.ch/gfwlist server=/.lemonde.fr/127.0.0.1#5335 @@ -5208,8 +5116,6 @@ server=/.liberal.org.hk/127.0.0.1#5335 ipset=/.liberal.org.hk/gfwlist server=/.libertytimes.com.tw/127.0.0.1#5335 ipset=/.libertytimes.com.tw/gfwlist -server=/.lifemiles.com/127.0.0.1#5335 -ipset=/.lifemiles.com/gfwlist server=/.lighten.org.tw/127.0.0.1#5335 ipset=/.lighten.org.tw/gfwlist server=/.lighti.me/127.0.0.1#5335 @@ -5316,8 +5222,6 @@ server=/.longmusic.com/127.0.0.1#5335 ipset=/.longmusic.com/gfwlist server=/.longtermly.net/127.0.0.1#5335 ipset=/.longtermly.net/gfwlist -server=/.longtoes.com/127.0.0.1#5335 -ipset=/.longtoes.com/gfwlist server=/.lookpic.com/127.0.0.1#5335 ipset=/.lookpic.com/gfwlist server=/.looktoronto.com/127.0.0.1#5335 @@ -5376,8 +5280,6 @@ server=/.m.plixi.com/127.0.0.1#5335 ipset=/.m.plixi.com/gfwlist server=/.m.slandr.net/127.0.0.1#5335 ipset=/.m.slandr.net/gfwlist -server=/.macgamestore.com/127.0.0.1#5335 -ipset=/.macgamestore.com/gfwlist server=/.macrovpn.com/127.0.0.1#5335 ipset=/.macrovpn.com/gfwlist server=/.macts.com.tw/127.0.0.1#5335 @@ -5420,10 +5322,6 @@ server=/.mamingzhe.com/127.0.0.1#5335 ipset=/.mamingzhe.com/gfwlist server=/.manchukuo.net/127.0.0.1#5335 ipset=/.manchukuo.net/gfwlist -server=/.mangafox.com/127.0.0.1#5335 -ipset=/.mangafox.com/gfwlist -server=/.mangafox.me/127.0.0.1#5335 -ipset=/.mangafox.me/gfwlist server=/.maniash.com/127.0.0.1#5335 ipset=/.maniash.com/gfwlist server=/.manicur4ik.ru/127.0.0.1#5335 @@ -5536,6 +5434,8 @@ server=/.meme.yahoo.com/127.0.0.1#5335 ipset=/.meme.yahoo.com/gfwlist server=/.memehk.com/127.0.0.1#5335 ipset=/.memehk.com/gfwlist +server=/.memes.tw/127.0.0.1#5335 +ipset=/.memes.tw/gfwlist server=/.memorybbs.com/127.0.0.1#5335 ipset=/.memorybbs.com/gfwlist server=/.memri.org/127.0.0.1#5335 @@ -5574,8 +5474,6 @@ server=/.meyou.jp/127.0.0.1#5335 ipset=/.meyou.jp/gfwlist server=/.meyul.com/127.0.0.1#5335 ipset=/.meyul.com/gfwlist -server=/.mfxmedia.com/127.0.0.1#5335 -ipset=/.mfxmedia.com/gfwlist server=/.mgoon.com/127.0.0.1#5335 ipset=/.mgoon.com/gfwlist server=/.mgstage.com/127.0.0.1#5335 @@ -5746,8 +5644,6 @@ server=/.moodyz.com/127.0.0.1#5335 ipset=/.moodyz.com/gfwlist server=/.moonbbs.com/127.0.0.1#5335 ipset=/.moonbbs.com/gfwlist -server=/.moonbingo.com/127.0.0.1#5335 -ipset=/.moonbingo.com/gfwlist server=/.morningsun.org/127.0.0.1#5335 ipset=/.morningsun.org/gfwlist server=/.moroneta.com/127.0.0.1#5335 @@ -5824,8 +5720,6 @@ server=/.muzi.com/127.0.0.1#5335 ipset=/.muzi.com/gfwlist server=/.muzi.net/127.0.0.1#5335 ipset=/.muzi.net/gfwlist -server=/.muzu.tv/127.0.0.1#5335 -ipset=/.muzu.tv/gfwlist server=/.mvdis.gov.tw/127.0.0.1#5335 ipset=/.mvdis.gov.tw/gfwlist server=/.mvg.jp/127.0.0.1#5335 @@ -5868,6 +5762,8 @@ server=/.mycnnews.com/127.0.0.1#5335 ipset=/.mycnnews.com/gfwlist server=/.mydad.info/127.0.0.1#5335 ipset=/.mydad.info/gfwlist +server=/.mydati.com/127.0.0.1#5335 +ipset=/.mydati.com/gfwlist server=/.myddns.com/127.0.0.1#5335 ipset=/.myddns.com/gfwlist server=/.myeasytv.com/127.0.0.1#5335 @@ -5890,6 +5786,8 @@ server=/.myftp.name/127.0.0.1#5335 ipset=/.myftp.name/gfwlist server=/.myiphide.com/127.0.0.1#5335 ipset=/.myiphide.com/gfwlist +server=/.myiphider.com/127.0.0.1#5335 +ipset=/.myiphider.com/gfwlist server=/.mykomica.org/127.0.0.1#5335 ipset=/.mykomica.org/gfwlist server=/.mylftv.com/127.0.0.1#5335 @@ -5986,6 +5884,8 @@ server=/.nccwatch.org.tw/127.0.0.1#5335 ipset=/.nccwatch.org.tw/gfwlist server=/.nch.com.tw/127.0.0.1#5335 ipset=/.nch.com.tw/gfwlist +server=/.nchrd.org/127.0.0.1#5335 +ipset=/.nchrd.org/gfwlist server=/.ncn.org/127.0.0.1#5335 ipset=/.ncn.org/gfwlist server=/.nde.de/127.0.0.1#5335 @@ -5996,8 +5896,6 @@ server=/.ned.org/127.0.0.1#5335 ipset=/.ned.org/gfwlist server=/.nekoslovakia.net/127.0.0.1#5335 ipset=/.nekoslovakia.net/gfwlist -server=/.neo-miracle.com/127.0.0.1#5335 -ipset=/.neo-miracle.com/gfwlist server=/.nepusoku.com/127.0.0.1#5335 ipset=/.nepusoku.com/gfwlist server=/.net-fits.pro/127.0.0.1#5335 @@ -6128,8 +6026,6 @@ server=/.nic.cz.cc/127.0.0.1#5335 ipset=/.nic.cz.cc/gfwlist server=/.nic.google/127.0.0.1#5335 ipset=/.nic.google/gfwlist -server=/.nic.gov/127.0.0.1#5335 -ipset=/.nic.gov/gfwlist server=/.nicovideo.jp/127.0.0.1#5335 ipset=/.nicovideo.jp/gfwlist server=/.nighost.org/127.0.0.1#5335 @@ -6176,16 +6072,14 @@ server=/.norbulingka.org/127.0.0.1#5335 ipset=/.norbulingka.org/gfwlist server=/.nordstrom.com/127.0.0.1#5335 ipset=/.nordstrom.com/gfwlist -server=/.nordstromimage.com/127.0.0.1#5335 -ipset=/.nordstromimage.com/gfwlist +server=/.nordstrommedia.com/127.0.0.1#5335 +ipset=/.nordstrommedia.com/gfwlist server=/.nordstromrack.com/127.0.0.1#5335 ipset=/.nordstromrack.com/gfwlist server=/.nordvpn.com/127.0.0.1#5335 ipset=/.nordvpn.com/gfwlist server=/.notify.dropboxapi.com/127.0.0.1#5335 ipset=/.notify.dropboxapi.com/gfwlist -server=/.nottinghampost.com/127.0.0.1#5335 -ipset=/.nottinghampost.com/gfwlist server=/.novelasia.com/127.0.0.1#5335 ipset=/.novelasia.com/gfwlist server=/.now.com/127.0.0.1#5335 @@ -6206,8 +6100,6 @@ server=/.npnt.me/127.0.0.1#5335 ipset=/.npnt.me/gfwlist server=/.nps.gov/127.0.0.1#5335 ipset=/.nps.gov/gfwlist -server=/.npsboost.com/127.0.0.1#5335 -ipset=/.npsboost.com/gfwlist server=/.nradio.me/127.0.0.1#5335 ipset=/.nradio.me/gfwlist server=/.nrk.no/127.0.0.1#5335 @@ -6246,8 +6138,6 @@ server=/.ntdtv.co.kr/127.0.0.1#5335 ipset=/.ntdtv.co.kr/gfwlist server=/.ntdtv.com/127.0.0.1#5335 ipset=/.ntdtv.com/gfwlist -server=/.ntdtv.cz/127.0.0.1#5335 -ipset=/.ntdtv.cz/gfwlist server=/.ntdtv.org/127.0.0.1#5335 ipset=/.ntdtv.org/gfwlist server=/.ntdtv.ru/127.0.0.1#5335 @@ -6260,14 +6150,14 @@ server=/.ntsna.gov.tw/127.0.0.1#5335 ipset=/.ntsna.gov.tw/gfwlist server=/.nubiles.net/127.0.0.1#5335 ipset=/.nubiles.net/gfwlist +server=/.nudezz.com/127.0.0.1#5335 +ipset=/.nudezz.com/gfwlist server=/.nuexpo.com/127.0.0.1#5335 ipset=/.nuexpo.com/gfwlist server=/.nukistream.com/127.0.0.1#5335 ipset=/.nukistream.com/gfwlist server=/.nurgo-software.com/127.0.0.1#5335 ipset=/.nurgo-software.com/gfwlist -server=/.nusatrip.com/127.0.0.1#5335 -ipset=/.nusatrip.com/gfwlist server=/.nutaku.net/127.0.0.1#5335 ipset=/.nutaku.net/gfwlist server=/.nuuvem.com/127.0.0.1#5335 @@ -6382,8 +6272,6 @@ server=/.on.cc/127.0.0.1#5335 ipset=/.on.cc/gfwlist server=/.on2.com/127.0.0.1#5335 ipset=/.on2.com/gfwlist -server=/.onapp.com/127.0.0.1#5335 -ipset=/.onapp.com/gfwlist server=/.onedrive.live.com/127.0.0.1#5335 ipset=/.onedrive.live.com/gfwlist server=/.onedumb.com/127.0.0.1#5335 @@ -6416,8 +6304,6 @@ server=/.onmypc.us/127.0.0.1#5335 ipset=/.onmypc.us/gfwlist server=/.onthehunt.com/127.0.0.1#5335 ipset=/.onthehunt.com/gfwlist -server=/.ontrac.com/127.0.0.1#5335 -ipset=/.ontrac.com/gfwlist server=/.oopsforum.com/127.0.0.1#5335 ipset=/.oopsforum.com/gfwlist server=/.open.com.hk/127.0.0.1#5335 @@ -6440,8 +6326,6 @@ server=/.openvpn.org/127.0.0.1#5335 ipset=/.openvpn.org/gfwlist server=/.openwebster.com/127.0.0.1#5335 ipset=/.openwebster.com/gfwlist -server=/.openwrt.org.cn/127.0.0.1#5335 -ipset=/.openwrt.org.cn/gfwlist server=/.opml.radiotime.com/127.0.0.1#5335 ipset=/.opml.radiotime.com/gfwlist server=/.opus-gaming.com/127.0.0.1#5335 @@ -6552,8 +6436,6 @@ server=/.paradisehill.cc/127.0.0.1#5335 ipset=/.paradisehill.cc/gfwlist server=/.paradisepoker.com/127.0.0.1#5335 ipset=/.paradisepoker.com/gfwlist -server=/.parkansky.com/127.0.0.1#5335 -ipset=/.parkansky.com/gfwlist server=/.partycasino.com/127.0.0.1#5335 ipset=/.partycasino.com/gfwlist server=/.partypoker.com/127.0.0.1#5335 @@ -6606,6 +6488,8 @@ server=/.pearlher.org/127.0.0.1#5335 ipset=/.pearlher.org/gfwlist server=/.peeasian.com/127.0.0.1#5335 ipset=/.peeasian.com/gfwlist +server=/.peing.net/127.0.0.1#5335 +ipset=/.peing.net/gfwlist server=/.pekingduck.org/127.0.0.1#5335 ipset=/.pekingduck.org/gfwlist server=/.pemulihan.or.id/127.0.0.1#5335 @@ -6812,6 +6696,8 @@ server=/.pornhub.com/127.0.0.1#5335 ipset=/.pornhub.com/gfwlist server=/.pornhubdeutsch.net/127.0.0.1#5335 ipset=/.pornhubdeutsch.net/gfwlist +server=/.pornhubpremium.com/127.0.0.1#5335 +ipset=/.pornhubpremium.com/gfwlist server=/.pornmm.net/127.0.0.1#5335 ipset=/.pornmm.net/gfwlist server=/.pornoxo.com/127.0.0.1#5335 @@ -6906,6 +6792,8 @@ server=/.proxomitron.info/127.0.0.1#5335 ipset=/.proxomitron.info/gfwlist server=/.proxpn.com/127.0.0.1#5335 ipset=/.proxpn.com/gfwlist +server=/.proxy.org/127.0.0.1#5335 +ipset=/.proxy.org/gfwlist server=/.proxy1.xyz/127.0.0.1#5335 ipset=/.proxy1.xyz/gfwlist server=/.proxyanonimo.es/127.0.0.1#5335 @@ -6948,6 +6836,8 @@ server=/.pttvan.org/127.0.0.1#5335 ipset=/.pttvan.org/gfwlist server=/.pubu.com.tw/127.0.0.1#5335 ipset=/.pubu.com.tw/gfwlist +server=/.puffin.com/127.0.0.1#5335 +ipset=/.puffin.com/gfwlist server=/.puffinbrowser.com/127.0.0.1#5335 ipset=/.puffinbrowser.com/gfwlist server=/.puffstore.com/127.0.0.1#5335 @@ -6956,8 +6846,6 @@ server=/.pullfolio.com/127.0.0.1#5335 ipset=/.pullfolio.com/gfwlist server=/.pulse.yahoo.com/127.0.0.1#5335 ipset=/.pulse.yahoo.com/gfwlist -server=/.pure18.com/127.0.0.1#5335 -ipset=/.pure18.com/gfwlist server=/.pureconcepts.net/127.0.0.1#5335 ipset=/.pureconcepts.net/gfwlist server=/.pureinsight.org/127.0.0.1#5335 @@ -6984,8 +6872,6 @@ server=/.pwned.com/127.0.0.1#5335 ipset=/.pwned.com/gfwlist server=/.python.com/127.0.0.1#5335 ipset=/.python.com/gfwlist -server=/.pytorch.org/127.0.0.1#5335 -ipset=/.pytorch.org/gfwlist server=/.qanote.com/127.0.0.1#5335 ipset=/.qanote.com/gfwlist server=/.qgirl.com.tw/127.0.0.1#5335 @@ -6996,6 +6882,8 @@ server=/.qi-gong.me/127.0.0.1#5335 ipset=/.qi-gong.me/gfwlist server=/.qiandao.today/127.0.0.1#5335 ipset=/.qiandao.today/gfwlist +server=/.qiangwaikan.com/127.0.0.1#5335 +ipset=/.qiangwaikan.com/gfwlist server=/.qiangyou.org/127.0.0.1#5335 ipset=/.qiangyou.org/gfwlist server=/.qidian.ca/127.0.0.1#5335 @@ -7012,8 +6900,6 @@ server=/.qoos.com/127.0.0.1#5335 ipset=/.qoos.com/gfwlist server=/.qpoe.com/127.0.0.1#5335 ipset=/.qpoe.com/gfwlist -server=/.qq.co.za/127.0.0.1#5335 -ipset=/.qq.co.za/gfwlist server=/.qstatus.com/127.0.0.1#5335 ipset=/.qstatus.com/gfwlist server=/.qtrac.eu/127.0.0.1#5335 @@ -7046,8 +6932,6 @@ server=/.qxbbs.org/127.0.0.1#5335 ipset=/.qxbbs.org/gfwlist server=/.qz.com/127.0.0.1#5335 ipset=/.qz.com/gfwlist -server=/.r18.com/127.0.0.1#5335 -ipset=/.r18.com/gfwlist server=/.ra.gg/127.0.0.1#5335 ipset=/.ra.gg/gfwlist server=/.radicalparty.org/127.0.0.1#5335 @@ -7070,8 +6954,8 @@ server=/.raidtalk.com.tw/127.0.0.1#5335 ipset=/.raidtalk.com.tw/gfwlist server=/.raizoji.or.jp/127.0.0.1#5335 ipset=/.raizoji.or.jp/gfwlist -server=/.ramcity.com.au/127.0.0.1#5335 -ipset=/.ramcity.com.au/gfwlist +server=/.rakuten.co.jp/127.0.0.1#5335 +ipset=/.rakuten.co.jp/gfwlist server=/.rangwang.biz/127.0.0.1#5335 ipset=/.rangwang.biz/gfwlist server=/.rangzen.com/127.0.0.1#5335 @@ -7108,12 +6992,6 @@ server=/.rcinet.ca/127.0.0.1#5335 ipset=/.rcinet.ca/gfwlist server=/.rconversation.blogs.com/127.0.0.1#5335 ipset=/.rconversation.blogs.com/gfwlist -server=/.rd.com/127.0.0.1#5335 -ipset=/.rd.com/gfwlist -server=/.rdio.com/127.0.0.1#5335 -ipset=/.rdio.com/gfwlist -server=/.read01.com/127.0.0.1#5335 -ipset=/.read01.com/gfwlist server=/.read100.com/127.0.0.1#5335 ipset=/.read100.com/gfwlist server=/.readingtimes.com.tw/127.0.0.1#5335 @@ -7126,8 +7004,6 @@ server=/.realcourage.org/127.0.0.1#5335 ipset=/.realcourage.org/gfwlist server=/.realforum.zkiz.com/127.0.0.1#5335 ipset=/.realforum.zkiz.com/gfwlist -server=/.realitykings.com/127.0.0.1#5335 -ipset=/.realitykings.com/gfwlist server=/.realraptalk.com/127.0.0.1#5335 ipset=/.realraptalk.com/gfwlist server=/.realsexpass.com/127.0.0.1#5335 @@ -7298,8 +7174,6 @@ server=/.s-cute.com/127.0.0.1#5335 ipset=/.s-cute.com/gfwlist server=/.s-dragon.org/127.0.0.1#5335 ipset=/.s-dragon.org/gfwlist -server=/.s1.nudezz.com/127.0.0.1#5335 -ipset=/.s1.nudezz.com/gfwlist server=/.s1heng.com/127.0.0.1#5335 ipset=/.s1heng.com/gfwlist server=/.s1s1s1.com/127.0.0.1#5335 @@ -7472,8 +7346,6 @@ server=/.sexinsex.net/127.0.0.1#5335 ipset=/.sexinsex.net/gfwlist server=/.sextvx.com/127.0.0.1#5335 ipset=/.sextvx.com/gfwlist -server=/.sexxxy.biz/127.0.0.1#5335 -ipset=/.sexxxy.biz/gfwlist server=/.sfileydy.com/127.0.0.1#5335 ipset=/.sfileydy.com/gfwlist server=/.sfshibao.com/127.0.0.1#5335 @@ -7514,8 +7386,6 @@ server=/.shapeservices.com/127.0.0.1#5335 ipset=/.shapeservices.com/gfwlist server=/.share.america.gov/127.0.0.1#5335 ipset=/.share.america.gov/gfwlist -server=/.share.dmhy.org/127.0.0.1#5335 -ipset=/.share.dmhy.org/gfwlist server=/.share.youthwant.com.tw/127.0.0.1#5335 ipset=/.share.youthwant.com.tw/gfwlist server=/.sharebee.com/127.0.0.1#5335 @@ -7552,6 +7422,8 @@ server=/.shicheng.org/127.0.0.1#5335 ipset=/.shicheng.org/gfwlist server=/.shiksha.com/127.0.0.1#5335 ipset=/.shiksha.com/gfwlist +server=/.shiksha.ws/127.0.0.1#5335 +ipset=/.shiksha.ws/gfwlist server=/.shinychan.com/127.0.0.1#5335 ipset=/.shinychan.com/gfwlist server=/.shipcamouflage.com/127.0.0.1#5335 @@ -7620,8 +7492,6 @@ server=/.sino-monthly.com/127.0.0.1#5335 ipset=/.sino-monthly.com/gfwlist server=/.sinoants.com/127.0.0.1#5335 ipset=/.sinoants.com/gfwlist -server=/.sinocast.com/127.0.0.1#5335 -ipset=/.sinocast.com/gfwlist server=/.sinocism.com/127.0.0.1#5335 ipset=/.sinocism.com/gfwlist server=/.sinomontreal.ca/127.0.0.1#5335 @@ -7670,8 +7540,6 @@ server=/.skyvegas.com/127.0.0.1#5335 ipset=/.skyvegas.com/gfwlist server=/.skyxvpn.com/127.0.0.1#5335 ipset=/.skyxvpn.com/gfwlist -server=/.slacker.com/127.0.0.1#5335 -ipset=/.slacker.com/gfwlist server=/.slaytizle.com/127.0.0.1#5335 ipset=/.slaytizle.com/gfwlist server=/.sleazydream.com/127.0.0.1#5335 @@ -7812,8 +7680,6 @@ server=/.southnews.com.tw/127.0.0.1#5335 ipset=/.southnews.com.tw/gfwlist server=/.sowers.org.hk/127.0.0.1#5335 ipset=/.sowers.org.hk/gfwlist -server=/.soylentnews.org/127.0.0.1#5335 -ipset=/.soylentnews.org/gfwlist server=/.spaces.hightail.com/127.0.0.1#5335 ipset=/.spaces.hightail.com/gfwlist server=/.spankbang.com/127.0.0.1#5335 @@ -7848,12 +7714,8 @@ server=/.spotflux.com/127.0.0.1#5335 ipset=/.spotflux.com/gfwlist server=/.spotify.com/127.0.0.1#5335 ipset=/.spotify.com/gfwlist -server=/.spreadshirt.es/127.0.0.1#5335 -ipset=/.spreadshirt.es/gfwlist server=/.spring4u.info/127.0.0.1#5335 ipset=/.spring4u.info/gfwlist -server=/.springboardplatform.com/127.0.0.1#5335 -ipset=/.springboardplatform.com/gfwlist server=/.sproutcore.com/127.0.0.1#5335 ipset=/.sproutcore.com/gfwlist server=/.sproxy.info/127.0.0.1#5335 @@ -7876,8 +7738,6 @@ server=/.ssglobal.me/127.0.0.1#5335 ipset=/.ssglobal.me/gfwlist server=/.ssh91.com/127.0.0.1#5335 ipset=/.ssh91.com/gfwlist -server=/.ssl.webpack.de/127.0.0.1#5335 -ipset=/.ssl.webpack.de/gfwlist server=/.ssl443.org/127.0.0.1#5335 ipset=/.ssl443.org/gfwlist server=/.sspanel.net/127.0.0.1#5335 @@ -7910,8 +7770,6 @@ server=/.stat.gov.tw/127.0.0.1#5335 ipset=/.stat.gov.tw/gfwlist server=/.static-economist.com/127.0.0.1#5335 ipset=/.static-economist.com/gfwlist -server=/.static.comico.tw/127.0.0.1#5335 -ipset=/.static.comico.tw/gfwlist server=/.static.shemalez.com/127.0.0.1#5335 ipset=/.static.shemalez.com/gfwlist server=/.static01.nyt.com/127.0.0.1#5335 @@ -7920,6 +7778,8 @@ server=/.staticflickr.com/127.0.0.1#5335 ipset=/.staticflickr.com/gfwlist server=/.statueofdemocracy.org/127.0.0.1#5335 ipset=/.statueofdemocracy.org/gfwlist +server=/.stboy.net/127.0.0.1#5335 +ipset=/.stboy.net/gfwlist server=/.stc.com.sa/127.0.0.1#5335 ipset=/.stc.com.sa/gfwlist server=/.steamcommunity.com/127.0.0.1#5335 @@ -8020,8 +7880,6 @@ server=/.supchina.com/127.0.0.1#5335 ipset=/.supchina.com/gfwlist server=/.superfreevpn.com/127.0.0.1#5335 ipset=/.superfreevpn.com/gfwlist -server=/.superokayama.com/127.0.0.1#5335 -ipset=/.superokayama.com/gfwlist server=/.superpages.com/127.0.0.1#5335 ipset=/.superpages.com/gfwlist server=/.supervpn.net/127.0.0.1#5335 @@ -8044,8 +7902,6 @@ server=/.suyangg.com/127.0.0.1#5335 ipset=/.suyangg.com/gfwlist server=/.svsfx.com/127.0.0.1#5335 ipset=/.svsfx.com/gfwlist -server=/.swagbucks.com/127.0.0.1#5335 -ipset=/.swagbucks.com/gfwlist server=/.swissinfo.ch/127.0.0.1#5335 ipset=/.swissinfo.ch/gfwlist server=/.swissvpn.net/127.0.0.1#5335 @@ -8164,8 +8020,6 @@ server=/.taoism.net/127.0.0.1#5335 ipset=/.taoism.net/gfwlist server=/.taolun.info/127.0.0.1#5335 ipset=/.taolun.info/gfwlist -server=/.tapanwap.com/127.0.0.1#5335 -ipset=/.tapanwap.com/gfwlist server=/.tapatalk.com/127.0.0.1#5335 ipset=/.tapatalk.com/gfwlist server=/.tascn.com.au/127.0.0.1#5335 @@ -9038,8 +8892,6 @@ server=/.twitterrific.com/127.0.0.1#5335 ipset=/.twitterrific.com/gfwlist server=/.twittertim.es/127.0.0.1#5335 ipset=/.twittertim.es/gfwlist -server=/.twitthat.com/127.0.0.1#5335 -ipset=/.twitthat.com/gfwlist server=/.twitturk.com/127.0.0.1#5335 ipset=/.twitturk.com/gfwlist server=/.twitturly.com/127.0.0.1#5335 @@ -9250,14 +9102,14 @@ server=/.uyghurcongress.org/127.0.0.1#5335 ipset=/.uyghurcongress.org/gfwlist server=/.uyghurensemble.co.uk/127.0.0.1#5335 ipset=/.uyghurensemble.co.uk/gfwlist -server=/.uyghurpen.org/127.0.0.1#5335 -ipset=/.uyghurpen.org/gfwlist server=/.uyghurpress.com/127.0.0.1#5335 ipset=/.uyghurpress.com/gfwlist server=/.uyghurstudies.org/127.0.0.1#5335 ipset=/.uyghurstudies.org/gfwlist server=/.uygur.org/127.0.0.1#5335 ipset=/.uygur.org/gfwlist +server=/.v2mm.tech/127.0.0.1#5335 +ipset=/.v2mm.tech/gfwlist server=/.v2ray.com/127.0.0.1#5335 ipset=/.v2ray.com/gfwlist server=/.van001.com/127.0.0.1#5335 @@ -9408,8 +9260,6 @@ server=/.vocn.tv/127.0.0.1#5335 ipset=/.vocn.tv/gfwlist server=/.vod-abematv.akamaized.net/127.0.0.1#5335 ipset=/.vod-abematv.akamaized.net/gfwlist -server=/.vod.wwe.com/127.0.0.1#5335 -ipset=/.vod.wwe.com/gfwlist server=/.vot.org/127.0.0.1#5335 ipset=/.vot.org/gfwlist server=/.vovo2000.com/127.0.0.1#5335 @@ -9502,8 +9352,6 @@ server=/.vpnworldwide.com/127.0.0.1#5335 ipset=/.vpnworldwide.com/gfwlist server=/.vporn.com/127.0.0.1#5335 ipset=/.vporn.com/gfwlist -server=/.vpser.net/127.0.0.1#5335 -ipset=/.vpser.net/gfwlist server=/.vraiesagesse.net/127.0.0.1#5335 ipset=/.vraiesagesse.net/gfwlist server=/.vrmtr.com/127.0.0.1#5335 @@ -9646,6 +9494,8 @@ server=/.wengewang.org/127.0.0.1#5335 ipset=/.wengewang.org/gfwlist server=/.wenhui.ch/127.0.0.1#5335 ipset=/.wenhui.ch/gfwlist +server=/.wenweipo.com/127.0.0.1#5335 +ipset=/.wenweipo.com/gfwlist server=/.wenxuecity.com/127.0.0.1#5335 ipset=/.wenxuecity.com/gfwlist server=/.wenyunchao.com/127.0.0.1#5335 @@ -9672,8 +9522,6 @@ server=/.wezhiyong.org/127.0.0.1#5335 ipset=/.wezhiyong.org/gfwlist server=/.wezone.net/127.0.0.1#5335 ipset=/.wezone.net/gfwlist -server=/.wforum.com/127.0.0.1#5335 -ipset=/.wforum.com/gfwlist server=/.wha.la/127.0.0.1#5335 ipset=/.wha.la/gfwlist server=/.whatblocked.com/127.0.0.1#5335 @@ -9690,8 +9538,6 @@ server=/.wheelockslatin.com/127.0.0.1#5335 ipset=/.wheelockslatin.com/gfwlist server=/.whereiswerner.com/127.0.0.1#5335 ipset=/.whereiswerner.com/gfwlist -server=/.wheretowatch.com/127.0.0.1#5335 -ipset=/.wheretowatch.com/gfwlist server=/.whichav.com/127.0.0.1#5335 ipset=/.whichav.com/gfwlist server=/.whippedass.com/127.0.0.1#5335 @@ -9718,6 +9564,8 @@ server=/.wiki.gamerp.jp/127.0.0.1#5335 ipset=/.wiki.gamerp.jp/gfwlist server=/.wiki.jqueryui.com/127.0.0.1#5335 ipset=/.wiki.jqueryui.com/gfwlist +server=/.wiki.kfd.me/127.0.0.1#5335 +ipset=/.wiki.kfd.me/gfwlist server=/.wiki.moegirl.org/127.0.0.1#5335 ipset=/.wiki.moegirl.org/gfwlist server=/.wiki.oauth.net/127.0.0.1#5335 @@ -9744,6 +9592,8 @@ server=/.wikimapia.org/127.0.0.1#5335 ipset=/.wikimapia.org/gfwlist server=/.wikipedia.org/127.0.0.1#5335 ipset=/.wikipedia.org/gfwlist +server=/.wikiwand.com/127.0.0.1#5335 +ipset=/.wikiwand.com/gfwlist server=/.wikiwiki.jp/127.0.0.1#5335 ipset=/.wikiwiki.jp/gfwlist server=/.wildammo.com/127.0.0.1#5335 @@ -9756,8 +9606,6 @@ server=/.windowsphoneme.com/127.0.0.1#5335 ipset=/.windowsphoneme.com/gfwlist server=/.windscribe.com/127.0.0.1#5335 ipset=/.windscribe.com/gfwlist -server=/.wingamestore.com/127.0.0.1#5335 -ipset=/.wingamestore.com/gfwlist server=/.wingy.site/127.0.0.1#5335 ipset=/.wingy.site/gfwlist server=/.winning11.com/127.0.0.1#5335 @@ -9798,12 +9646,12 @@ server=/.wnacg.org/127.0.0.1#5335 ipset=/.wnacg.org/gfwlist server=/.wo.tc/127.0.0.1#5335 ipset=/.wo.tc/gfwlist +server=/.wo3t.wordpress.com/127.0.0.1#5335 +ipset=/.wo3t.wordpress.com/gfwlist server=/.wo3ttt.wordpress.com/127.0.0.1#5335 ipset=/.wo3ttt.wordpress.com/gfwlist server=/.woeser.com/127.0.0.1#5335 ipset=/.woeser.com/gfwlist -server=/.wokar.org/127.0.0.1#5335 -ipset=/.wokar.org/gfwlist server=/.wolfax.com/127.0.0.1#5335 ipset=/.wolfax.com/gfwlist server=/.woolyss.com/127.0.0.1#5335 @@ -9812,8 +9660,6 @@ server=/.woopie.jp/127.0.0.1#5335 ipset=/.woopie.jp/gfwlist server=/.woopie.tv/127.0.0.1#5335 ipset=/.woopie.tv/gfwlist -server=/.wordpress.com/127.0.0.1#5335 -ipset=/.wordpress.com/gfwlist server=/.workatruna.com/127.0.0.1#5335 ipset=/.workatruna.com/gfwlist server=/.workerdemo.org.hk/127.0.0.1#5335 @@ -9846,8 +9692,6 @@ server=/.woyaolian.org/127.0.0.1#5335 ipset=/.woyaolian.org/gfwlist server=/.wozy.in/127.0.0.1#5335 ipset=/.wozy.in/gfwlist -server=/.wp.com/127.0.0.1#5335 -ipset=/.wp.com/gfwlist server=/.wpoforum.com/127.0.0.1#5335 ipset=/.wpoforum.com/gfwlist server=/.wqyd.org/127.0.0.1#5335 @@ -9870,8 +9714,6 @@ server=/.wtbn.org/127.0.0.1#5335 ipset=/.wtbn.org/gfwlist server=/.wtfpeople.com/127.0.0.1#5335 ipset=/.wtfpeople.com/gfwlist -server=/.wuerkaixi.com/127.0.0.1#5335 -ipset=/.wuerkaixi.com/gfwlist server=/.wufafangwen.com/127.0.0.1#5335 ipset=/.wufafangwen.com/gfwlist server=/.wufi.org.tw/127.0.0.1#5335 @@ -9890,8 +9732,6 @@ server=/.wuyanblog.com/127.0.0.1#5335 ipset=/.wuyanblog.com/gfwlist server=/.wwitv.com/127.0.0.1#5335 ipset=/.wwitv.com/gfwlist -server=/.www.abclite.net/127.0.0.1#5335 -ipset=/.www.abclite.net/gfwlist server=/.www.ajsands.com/127.0.0.1#5335 ipset=/.www.ajsands.com/gfwlist server=/.www.americorps.gov/127.0.0.1#5335 @@ -9934,10 +9774,6 @@ server=/.www.powerpointninja.com/127.0.0.1#5335 ipset=/.www.powerpointninja.com/gfwlist server=/.www.s4miniarchive.com/127.0.0.1#5335 ipset=/.www.s4miniarchive.com/gfwlist -server=/.www.shadowsocks.com/127.0.0.1#5335 -ipset=/.www.shadowsocks.com/gfwlist -server=/.www.shwchurch.org/127.0.0.1#5335 -ipset=/.www.shwchurch.org/gfwlist server=/.www.taup.org.tw/127.0.0.1#5335 ipset=/.www.taup.org.tw/gfwlist server=/.www.wan-press.org/127.0.0.1#5335 @@ -9948,8 +9784,6 @@ server=/.www.websnapr.com/127.0.0.1#5335 ipset=/.www.websnapr.com/gfwlist server=/.www1.biz/127.0.0.1#5335 ipset=/.www1.biz/gfwlist -server=/.wwwhost.biz/127.0.0.1#5335 -ipset=/.wwwhost.biz/gfwlist server=/.x-art.com/127.0.0.1#5335 ipset=/.x-art.com/gfwlist server=/.x-berry.com/127.0.0.1#5335 @@ -10052,6 +9886,8 @@ server=/.xmovies.com/127.0.0.1#5335 ipset=/.xmovies.com/gfwlist server=/.xn--4gq171p.com/127.0.0.1#5335 ipset=/.xn--4gq171p.com/gfwlist +server=/.xn--90wwvt03e.com/127.0.0.1#5335 +ipset=/.xn--90wwvt03e.com/gfwlist server=/.xn--czq75pvv1aj5c.org/127.0.0.1#5335 ipset=/.xn--czq75pvv1aj5c.org/gfwlist server=/.xn--i2ru8q2qg.com/127.0.0.1#5335 @@ -10244,8 +10080,6 @@ server=/.youtubegaming.com/127.0.0.1#5335 ipset=/.youtubegaming.com/gfwlist server=/.youversion.com/127.0.0.1#5335 ipset=/.youversion.com/gfwlist -server=/.youwin.com/127.0.0.1#5335 -ipset=/.youwin.com/gfwlist server=/.youxu.info/127.0.0.1#5335 ipset=/.youxu.info/gfwlist server=/.yt.be/127.0.0.1#5335 @@ -10254,8 +10088,6 @@ server=/.ytht.net/127.0.0.1#5335 ipset=/.ytht.net/gfwlist server=/.ytimg.com/127.0.0.1#5335 ipset=/.ytimg.com/gfwlist -server=/.ytn.co.kr/127.0.0.1#5335 -ipset=/.ytn.co.kr/gfwlist server=/.yuanming.net/127.0.0.1#5335 ipset=/.yuanming.net/gfwlist server=/.yuanzhengtang.org/127.0.0.1#5335 @@ -10352,16 +10184,10 @@ server=/.zhongguorenquan.org/127.0.0.1#5335 ipset=/.zhongguorenquan.org/gfwlist server=/.zhongguotese.net/127.0.0.1#5335 ipset=/.zhongguotese.net/gfwlist -server=/.zhongmeng.org/127.0.0.1#5335 -ipset=/.zhongmeng.org/gfwlist server=/.zhoushuguang.com/127.0.0.1#5335 ipset=/.zhoushuguang.com/gfwlist server=/.zhreader.com/127.0.0.1#5335 ipset=/.zhreader.com/gfwlist -server=/.zhuangbi.me/127.0.0.1#5335 -ipset=/.zhuangbi.me/gfwlist -server=/.zhuanxing.cn/127.0.0.1#5335 -ipset=/.zhuanxing.cn/gfwlist server=/.zhuatieba.com/127.0.0.1#5335 ipset=/.zhuatieba.com/gfwlist server=/.zhuichaguoji.org/127.0.0.1#5335 @@ -10384,8 +10210,6 @@ server=/.zodgame.us/127.0.0.1#5335 ipset=/.zodgame.us/gfwlist server=/.zomobo.net/127.0.0.1#5335 ipset=/.zomobo.net/gfwlist -server=/.zonaeuropa.com/127.0.0.1#5335 -ipset=/.zonaeuropa.com/gfwlist server=/.zonghexinwen.com/127.0.0.1#5335 ipset=/.zonghexinwen.com/gfwlist server=/.zonghexinwen.net/127.0.0.1#5335 @@ -10398,10 +10222,10 @@ server=/.zoozle.net/127.0.0.1#5335 ipset=/.zoozle.net/gfwlist server=/.zorrovpn.com/127.0.0.1#5335 ipset=/.zorrovpn.com/gfwlist -server=/.zozotown.com/127.0.0.1#5335 -ipset=/.zozotown.com/gfwlist server=/.zpn.im/127.0.0.1#5335 ipset=/.zpn.im/gfwlist +server=/.zsdxzk.com/127.0.0.1#5335 +ipset=/.zsdxzk.com/gfwlist server=/.zspeeder.me/127.0.0.1#5335 ipset=/.zspeeder.me/gfwlist server=/.zsrhao.com/127.0.0.1#5335 diff --git a/package/lean/luci-app-ssr-plus/root/etc/config/netflix.list b/package/lean/luci-app-ssr-plus/root/etc/ssr/netflix.list similarity index 100% rename from package/lean/luci-app-ssr-plus/root/etc/config/netflix.list rename to package/lean/luci-app-ssr-plus/root/etc/ssr/netflix.list diff --git a/package/lean/luci-app-ssr-plus/root/etc/config/netflixip.list b/package/lean/luci-app-ssr-plus/root/etc/ssr/netflixip.list similarity index 100% rename from package/lean/luci-app-ssr-plus/root/etc/config/netflixip.list rename to package/lean/luci-app-ssr-plus/root/etc/ssr/netflixip.list diff --git a/package/lean/luci-app-ssr-plus/root/etc/dnsmasq.oversea/oversea_list.conf b/package/lean/luci-app-ssr-plus/root/etc/ssr/oversea_list.conf similarity index 100% rename from package/lean/luci-app-ssr-plus/root/etc/dnsmasq.oversea/oversea_list.conf rename to package/lean/luci-app-ssr-plus/root/etc/ssr/oversea_list.conf diff --git a/package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus b/package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus index bd8d02a512..35aca05fa2 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus +++ b/package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus @@ -1,26 +1,30 @@ #!/bin/sh - uci -q batch <<-EOF >/dev/null - delete ucitrack.@shadowsocksr[-1] - add ucitrack shadowsocksr - set ucitrack.@shadowsocksr[-1].init=shadowsocksr - commit ucitrack - delete firewall.shadowsocksr - set firewall.shadowsocksr=include - set firewall.shadowsocksr.type=script - set firewall.shadowsocksr.path=/var/etc/shadowsocksr.include - set firewall.shadowsocksr.reload=1 - commit firewall +delete ucitrack.@shadowsocksr[-1] +add ucitrack shadowsocksr +set ucitrack.@shadowsocksr[-1].init=shadowsocksr +commit ucitrack +delete firewall.shadowsocksr +set firewall.shadowsocksr=include +set firewall.shadowsocksr.type=script +set firewall.shadowsocksr.path=/var/etc/shadowsocksr.include +set firewall.shadowsocksr.reload=1 +commit firewall EOF - -touch /etc/china_ssr.txt -touch /etc/config/white.list -touch /etc/config/black.list -touch /etc/config/netflix.list -touch /etc/config/netflixip.list -touch /etc/dnsmasq.ssr/ad.conf -touch /etc/dnsmasq.ssr/gfw_list.conf - -rm -rf /tmp/luci-modulecache/* -rm -f /tmp/luci-indexcache +chmod 0755 /etc/init.d/shadowsocksr /usr/bin/ssr-* /usr/share/shadowsocksr/*.sh +chmod 0644 /etc/ssr/* \ +/usr/share/shadowsocksr/*.lua \ +/usr/share/rpcd/acl.d/luci-app-ssr-plus.json \ +/usr/lib/lua/luci/model/cbi/shadowsocksr/*.lua \ +/usr/lib/lua/luci/view/shadowsocksr/*.htm +chmod 0600 /etc/config/shadowsocksr +touch /etc/ssr/china_ssr.txt +touch /etc/ssr/white.list +touch /etc/ssr/black.list +touch /etc/ssr/netflix.list +touch /etc/ssr/netflixip.list +touch /etc/ssr/ad.conf +touch /etc/ssr/gfw_list.conf +touch /etc/ssr/deny.list +rm -rf /tmp/luci-modulecache /tmp/luci-indexcache exit 0 diff --git a/package/lean/luci-app-ssr-plus/root/lib/upgrade/keep.d/luci-app-ssr-plus b/package/lean/luci-app-ssr-plus/root/lib/upgrade/keep.d/luci-app-ssr-plus index 582ed895b4..742fbafc03 100644 --- a/package/lean/luci-app-ssr-plus/root/lib/upgrade/keep.d/luci-app-ssr-plus +++ b/package/lean/luci-app-ssr-plus/root/lib/upgrade/keep.d/luci-app-ssr-plus @@ -1,8 +1,9 @@ -/etc/ssr_ip -/etc/china_ssr.txt /etc/config/shadowsocksr -/etc/config/white.list -/etc/config/black.list -/etc/config/netflix.list -/etc/dnsmasq.ssr/ad.conf -/etc/dnsmasq.ssr/gfw_list.conf +/etc/ssr/china_ssr.txt +/etc/ssr/white.list +/etc/ssr/black.list +/etc/ssr/netflix.list +/etc/ssr/netflixip.list +/etc/ssr/gfw_list.conf +/etc/ssr/ad.conf +/etc/ssr/deny.list diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-ad b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-ad index 2c7ffef057..1523ce6d3d 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-ad +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-ad @@ -1,9 +1,9 @@ #!/bin/sh -e if [ -f /tmp/adnew.conf ]; then - if (grep -wq "address=" /tmp/adnew.conf) ; then - cp /tmp/adnew.conf /tmp/ad.conf - else - cat /tmp/adnew.conf | grep ^\|\|[^\*]*\^$ | sed -e 's:||:address\=\/:' -e 's:\^:/0\.0\.0\.0:' > /tmp/ad.conf - fi + if (grep -wq "address=" /tmp/adnew.conf); then + cp /tmp/adnew.conf /tmp/ssr-update.$1 + else + cat /tmp/adnew.conf | grep ^\|\|[^\*]*\^$ | sed -e 's:||:address\=\/:' -e 's:\^:/0\.0\.0\.0:' >/tmp/ssr-update.$1 + fi fi rm -f /tmp/adnew.conf diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-gfw b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-gfw index 07ee49c458..7a8b33202c 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-gfw +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-gfw @@ -1,25 +1,23 @@ #!/bin/sh -e - generate_china_banned() { - cat $1 | base64 -d >/tmp/gfwlist.txt - rm -f $1 - sed -i '/^@@|/d' /tmp/gfwlist.txt - cat /tmp/gfwlist.txt | sort -u | - sed 's#!.\+##; s#|##g; s#@##g; s#http:\/\/##; s#https:\/\/##;' | - sed '/\*/d; /apple\.com/d; /sina\.cn/d; /sina\.com\.cn/d; /baidu\.com/d; /byr\.cn/d; /jlike\.com/d; /weibo\.com/d; /zhongsou\.com/d; /youdao\.com/d; /sogou\.com/d; /so\.com/d; /soso\.com/d; /aliyun\.com/d; /taobao\.com/d; /jd\.com/d; /qq\.com/d' | - sed '/^[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+$/d' | - grep '^[0-9a-zA-Z\.-]\+$' | grep '\.' | sed 's#^\.\+##' | sort -u | - awk 'BEGIN { prev = "________"; } { - cur = $0; - if (index(cur, prev) == 1 && substr(cur, 1 + length(prev) ,1) == ".") { - } else { - print cur; - prev = cur; - } - }' | sort -u +cat $1 | base64 -d >/tmp/gfwlist.txt +rm -f $1 +sed -i '/^@@|/d' /tmp/gfwlist.txt +cat /tmp/gfwlist.txt | sort -u | +sed 's#!.\+##; s#|##g; s#@##g; s#http:\/\/##; s#https:\/\/##;' | +sed '/\*/d; /apple\.com/d; /sina\.cn/d; /sina\.com\.cn/d; /baidu\.com/d; /byr\.cn/d; /jlike\.com/d; /weibo\.com/d; /zhongsou\.com/d; /youdao\.com/d; /sogou\.com/d; /so\.com/d; /soso\.com/d; /aliyun\.com/d; /taobao\.com/d; /jd\.com/d; /qq\.com/d' | +sed '/^[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+$/d' | +grep '^[0-9a-zA-Z\.-]\+$' | grep '\.' | sed 's#^\.\+##' | sort -u | +awk 'BEGIN { prev = "________"; } { +cur = $0; +if (index(cur, prev) == 1 && substr(cur, 1 + length(prev) ,1) == ".") { +} else { +print cur; +prev = cur; } - -generate_china_banned /tmp/gfw.b64 >/tmp/gfw.txt +}' | sort -u +} +generate_china_banned /tmp/ssr-update.$1 >/tmp/gfw.txt rm -f /tmp/gfwlist.txt -sed '/.*/s/.*/server=\/\.&\/127.0.0.1#5335\nipset=\/\.&\/gfwlist/' /tmp/gfw.txt >/tmp/gfwnew.txt +sed '/.*/s/.*/server=\/\.&\/127.0.0.1#5335\nipset=\/\.&\/gfwlist/' /tmp/gfw.txt >/tmp/ssr-update.$1 rm -f /tmp/gfw.txt diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor index 889f1d119a..77645c48a3 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor @@ -6,7 +6,9 @@ # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # - +LOCK_FILE="/var/lock/ssr-monitor.lock" +[ -f "$LOCK_FILE" ] && exit 2 +touch "$LOCK_FILE" NAME=shadowsocksr uci_get_by_name() { @@ -19,6 +21,23 @@ uci_get_by_type() { echo ${ret:=$3} } +get_host_ip() { + local host=$1 + local isip="" + local ip=$host + isip=$(echo $host | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}") + if [ -z "$isip" ]; then + if [ "$host" != "${host#*:[0-9a-fA-F]}" ]; then + ip=$host + else + local ip=$(resolveip -4 -t 3 $host | awk 'NR==1{print}') + # local hostip=$(ping $host -W 1 -s 1 -c 1 | grep PING | cut -d'(' -f 2 | cut -d')' -f1) + [ -z "$ip" ] && ip=$(wget -q -O- http://119.29.29.29/d?dn=$1 | awk -F ';' '{print $1}') + fi + fi + echo ${ip:="ERROR"} +} + server_process_count=$1 redir_tcp_process=$2 redir_udp_process=$3 @@ -29,30 +48,24 @@ pdnsd_process=$7 if [ -z "$pdnsd_process" ]; then pdnsd_process=0 fi - i=0 - GLOBAL_SERVER=$(uci_get_by_type global global_server) -server=$(uci_get_by_name $GLOBAL_SERVER server) +server=$(get_host_ip $(uci_get_by_name $GLOBAL_SERVER server)) +[ "$server" == "ERROR" ] && hostip=$(uci_get_by_name $GLOBAL_SERVER ip) lkcp_port=$(uci_get_by_name $GLOBAL_SERVER kcp_port) server_port=$(uci_get_by_name $GLOBAL_SERVER server_port) password=$(uci_get_by_name $GLOBAL_SERVER kcp_password) kcp_param=$(uci_get_by_name $GLOBAL_SERVER kcp_param) [ "$password" != "" ] && password="--key "${password} -if echo "$server" | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then - server=${server} -else - server=$(cat /etc/ssr_ip) -fi - while [ "1" == "1" ]; do #死循环 - sleep 30 + sleep 30s #redir tcp if [ "$redir_tcp_process" -gt 0 ]; then icount=$(busybox ps -w | grep ssr-retcp | grep -v grep | wc -l) if [ "$icount" == 0 ]; then logger -t "$NAME" "ssr redir tcp error.restart!" + echo "$(date "+%Y-%m-%d %H:%M:%S") ssr redir tcp error.restart!" >>/tmp/ssrplus.log /etc/init.d/shadowsocksr restart exit 0 fi @@ -62,6 +75,7 @@ while [ "1" == "1" ]; do #死循环 icount=$(busybox ps -w | grep ssr-reudp | grep -v grep | wc -l) if [ "$icount" == 0 ]; then logger -t "$NAME" "ssr redir udp error.restart!" + echo "$(date "+%Y-%m-%d %H:%M:%S") ssr redir udp error.restart!" >>/tmp/ssrplus.log /etc/init.d/shadowsocksr restart exit 0 fi @@ -71,6 +85,7 @@ while [ "1" == "1" ]; do #死循环 icount=$(busybox ps -w | grep ssr-tunnel | grep -v grep | wc -l) if [ "$icount" == 0 ]; then logger -t "$NAME" "ssr tunnel error.restart!" + echo "$(date "+%Y-%m-%d %H:%M:%S") ssr tunnel error.restart!" >>/tmp/ssrplus.log /etc/init.d/shadowsocksr restart exit 0 fi @@ -80,8 +95,10 @@ while [ "1" == "1" ]; do #死循环 icount=$(busybox ps -w | grep ssr-server | grep -v grep | wc -l) if [ "$icount" -lt "$server_process_count" ]; then #如果进程挂掉就重启它 logger -t "$NAME" "ssr server error.restart!" + echo "$(date "+%Y-%m-%d %H:%M:%S") ssr server error.restart!" >>/tmp/ssrplus.log kill -9 $(busybox ps -w | grep ssr-server | grep -v grep | awk '{print $1}') >/dev/null 2>&1 /etc/init.d/shadowsocksr restart + exit 0 fi fi #kcptun @@ -89,6 +106,7 @@ while [ "1" == "1" ]; do #死循环 icount=$(busybox ps -w | grep kcptun-client | grep -v grep | wc -l) if [ "$icount" -lt "$kcp_process" ]; then #如果进程挂掉就重启它 logger -t "$NAME" "ssr kcptun error.restart!" + echo "$(date "+%Y-%m-%d %H:%M:%S") ssr kcptun error.restart!" >>/tmp/ssrplus.log killall -q -9 kcptun-client (/usr/bin/kcptun-client -r $server:$kcp_port -l :$server_port $password $kcp_param &) fi @@ -98,8 +116,10 @@ while [ "1" == "1" ]; do #死循环 icount=$(busybox ps -w | grep ssr-local | grep -v grep | wc -l) if [ "$icount" -lt "$local_process" ]; then #如果进程挂掉就重启它 logger -t "$NAME" "global socks server error.restart!" + echo "$(date "+%Y-%m-%d %H:%M:%S") global socks server error.restart!" >>/tmp/ssrplus.log kill -9 $(busybox ps -w | grep ssr-local | grep -v grep | awk '{print $1}') >/dev/null 2>&1 /etc/init.d/shadowsocksr restart + exit 0 fi fi #pdnsd @@ -107,26 +127,28 @@ while [ "1" == "1" ]; do #死循环 icount=$(busybox ps -w | grep pdnsd | grep -v grep | wc -l) if [ "$icount" -lt "$pdnsd_process" ]; then #如果进程挂掉就重启它 logger -t "$NAME" "pdnsd tunnel error.restart!" + echo "$(date "+%Y-%m-%d %H:%M:%S") pdnsd tunnel error.restart!" >>/tmp/ssrplus.log if [ -f /var/run/pdnsd.pid ]; then kill $(cat /var/run/pdnsd.pid) >/dev/null 2>&1 else kill -9 $(ps | grep pdnsd | grep -v grep | awk '{print $1}') >/dev/null 2>&1 fi - (/usr/sbin/pdnsd -c /var/etc/pdnsd.conf -d &) + (/usr/sbin/pdnsd -c /var/etc/pdnsd.conf >/dev/null 2>&1 &) fi fi #dns2socks if [ "$pdnsd_process" -eq 2 ]; then icount=$(busybox ps -w | grep -e ssr-dns -e dns2socks | grep -v grep | wc -l) if [ "$icount" -lt 2 ]; then #如果进程挂掉就重启它 - logger -t "$NAME" "dns2socks $dnsstr tunnel error.restart!" + logger -t "$NAME" "dns2socks $dnsstr tunnel error.restart!" + echo "$(date "+%Y-%m-%d %H:%M:%S") dns2socks $dnsstr tunnel error.restart!" >>/tmp/ssrplus.log dnsstr=$(uci_get_by_type global tunnel_forward 8.8.4.4:53) dnsserver=$(echo "$dnsstr" | awk -F ':' '{print $1}') dnsport=$(echo "$dnsstr" | awk -F ':' '{print $2}') killall -q -9 dns2socks kill -9 $(busybox ps -w | grep ssr-dns | grep -v grep | awk '{print $1}') >/dev/null 2>&1 microsocks -i 127.0.0.1 -p 10802 ssr-dns >/dev/null 2>&1 & - dns2socks 127.0.0.1:10802 $dnsserver:$dnsport 127.0.0.1:5335 -q >/dev/null 2>&1 & + dns2socks 127.0.0.1:10802 $dnsserver:$dnsport 127.0.0.1:5335 -q >/dev/null 2>&1 & fi fi done diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules index 0279d926a7..9dcf96803e 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules @@ -6,13 +6,11 @@ # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # - TAG="_SS_SPEC_RULE_" # comment tag IPT="iptables -t nat" # alias of iptables FWI=$(uci get firewall.shadowsocksr.path 2>/dev/null) # firewall include file - usage() { - cat <<-EOF +cat <<-EOF Usage: ssr-rules [options] Valid options are: @@ -33,6 +31,7 @@ Valid options are: -F netflix mode -N netflix server IP -M netflix proxy mode + -I a file content is bypassed netflix ip list -e extra options for iptables -o apply the rules to the OUTPUT chain -O apply the global rules to the OUTPUT chain @@ -43,8 +42,8 @@ Valid options are: -g gfw list mode -r return china mode -h show this help message and exit - EOF - exit $1 +EOF +exit $1 } loger() { @@ -82,7 +81,8 @@ flush_r() { ipset_r() { ipset -N gmlan hash:net 2>/dev/null for ip in $LAN_GM_IP; do ipset -! add gmlan $ip; done - if [ "$RUNMODE" == "router" ]; then + case "$RUNMODE" in + router) ipset -! -R <<-EOF || return 1 create ss_spec_wan_ac hash:net $(gen_iplist | sed -e "s/^/add ss_spec_wan_ac /") @@ -92,25 +92,29 @@ ipset_r() { $IPT -I SS_SPEC_WAN_AC -p tcp ! --dport 53 -d $server -j RETURN $IPT -A SS_SPEC_WAN_AC -m set --match-set ss_spec_wan_ac dst -j RETURN $IPT -A SS_SPEC_WAN_AC -j SS_SPEC_WAN_FW - elif [ "$RUNMODE" == "gfw" ]; then + ;; + gfw) ipset -N gfwlist hash:net 2>/dev/null $IPT -N SS_SPEC_WAN_AC $IPT -A SS_SPEC_WAN_AC -m set --match-set gfwlist dst -j SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN $IPT -I SS_SPEC_WAN_AC -p tcp ! --dport 53 -d $server -j RETURN - elif [ "$RUNMODE" == "oversea" ]; then + ;; + oversea) ipset -N oversea hash:net 2>/dev/null $IPT -N SS_SPEC_WAN_AC ipset -N gmlan hash:net 2>/dev/null for ip in $LAN_GM_IP; do ipset -! add gmlan $ip; done $IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j SS_SPEC_WAN_FW $IPT -I SS_SPEC_WAN_AC -p tcp ! --dport 53 -d $server -j RETURN - elif [ "$RUNMODE" == "all" ]; then + ;; + all) $IPT -N SS_SPEC_WAN_AC $IPT -A SS_SPEC_WAN_AC -j SS_SPEC_WAN_FW $IPT -I SS_SPEC_WAN_AC -p tcp ! --dport 53 -d $server -j RETURN - fi + ;; + esac ipset -N fplan hash:net 2>/dev/null for ip in $LAN_FP_IP; do ipset -! add fplan $ip; done $IPT -I SS_SPEC_WAN_AC -m set --match-set fplan src -j SS_SPEC_WAN_FW @@ -121,25 +125,30 @@ ipset_r() { ipset -N blacklist hash:net 2>/dev/null $IPT -I SS_SPEC_WAN_AC -m set --match-set blacklist dst -j SS_SPEC_WAN_FW $IPT -I SS_SPEC_WAN_AC -m set --match-set whitelist dst -j RETURN + if [ $(ipset list music -name -quiet | grep music) ]; then + $IPT -I SS_SPEC_WAN_AC -m set --match-set music dst -j RETURN 2>/dev/null + fi for ip in $WAN_BP_IP; do ipset -! add whitelist $ip; done for ip in $WAN_FW_IP; do ipset -! add blacklist $ip; done - - if [ "$NETFLIX" == "1" ]; then + if [ "$NETFLIX" != "0" ]; then + ipset -N netflix hash:net 2>/dev/null + for ip in $(cat ${NETFLIX_LIST:=/dev/null} 2>/dev/null); do ipset -! add netflix $ip; done + fi + case "$NETFLIX" in + 1) $IPT -I SS_SPEC_WAN_AC -p tcp -m set --match-set netflix dst -j REDIRECT --to-ports 4321 if [ "$NETFLIX_PROXY" == "1" ]; then $IPT -I SS_SPEC_WAN_AC -p tcp -d $NETFLIX_IP -j REDIRECT --to-ports $local_port else ipset -! add whitelist $NETFLIX_IP fi - elif [ "$NETFLIX" == "2" ]; then - $IPT -I SS_SPEC_WAN_AC -p tcp -m set --match-set netflix dst -j REDIRECT --to-ports $local_port - fi - + ;; + 2) $IPT -I SS_SPEC_WAN_AC -p tcp -m set --match-set netflix dst -j REDIRECT --to-ports $local_port ;; + esac return $? } fw_rule() { - ipset -N netflix hash:net 2>/dev/null $IPT -N SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_FW -d 0.0.0.0/8 -j RETURN $IPT -A SS_SPEC_WAN_FW -d 10.0.0.0/8 -j RETURN @@ -216,23 +225,26 @@ tp_rule() { $ipt -A SS_SPEC_TPROXY -p udp -m set --match-set bplan src -j RETURN $ipt -A SS_SPEC_TPROXY -p udp $PROXY_PORTS -m set --match-set fplan src \ -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 - if [ "$RUNMODE" == "router" ]; then + case "$RUNMODE" in + router) $ipt -A SS_SPEC_TPROXY -p udp -m set --match-set gmlan src -m set ! --match-set china dst \ -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 $ipt -A SS_SPEC_TPROXY -p udp $PROXY_PORTS -m set ! --match-set ss_spec_wan_ac dst \ -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 - elif [ "$RUNMODE" == "gfw" ]; then + ;; + gfw) $ipt -A SS_SPEC_TPROXY -p udp -m set --match-set china dst -j RETURN $ipt -A SS_SPEC_TPROXY -p udp -m set --match-set gmlan src -m set ! --match-set china dst \ -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 $ipt -A SS_SPEC_TPROXY -p udp -m set $PROXY_PORTS --match-set gfwlist dst \ -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 - elif [ "$RUNMODE" == "oversea" ]; then + ;; + oversea) $ipt -A SS_SPEC_TPROXY -p udp $PROXY_PORTS -m set --match-set china dst \ -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 - elif [ "$RUNMODE" == "all" ]; then - $ipt -A SS_SPEC_TPROXY -p udp $PROXY_PORTS -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 - fi + ;; + all) $ipt -A SS_SPEC_TPROXY -p udp $PROXY_PORTS -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 ;; + esac $ipt -I PREROUTING 1 ${IFNAME:+-i $IFNAME} -p udp $EXT_ARGS $MATCH_SET \ -m comment --comment "$TAG" -j SS_SPEC_TPROXY return $? @@ -309,7 +321,7 @@ gen_include() { return 0 } -while getopts ":s:l:S:L:i:e:a:B:b:w:p:G:D:F:N:M:oOuUfgrczh" arg; do +while getopts ":s:l:S:L:i:e:a:B:b:w:p:G:D:F:N:M:I:oOuUfgrczh" arg; do case "$arg" in s) server=$OPTARG @@ -359,6 +371,9 @@ while getopts ":s:l:S:L:i:e:a:B:b:w:p:G:D:F:N:M:oOuUfgrczh" arg; do M) NETFLIX_PROXY=$OPTARG ;; + I) + NETFLIX_LIST=$OPTARG + ;; o) OUTPUT=1 ;; @@ -390,9 +405,11 @@ while getopts ":s:l:S:L:i:e:a:B:b:w:p:G:D:F:N:M:oOuUfgrczh" arg; do h) usage 0 ;; esac done + if [ -z "$server" -o -z "$local_port" ]; then usage 2 fi + if [ "$TPROXY" == 1 ]; then SERVER=$server LOCAL_PORT=$local_port @@ -400,7 +417,7 @@ elif [ "$TPROXY" == 2 ]; then : ${SERVER:?"You must assign an ip for the udp relay server."} : ${LOCAL_PORT:?"You must assign a port for the udp relay server."} fi + flush_r && fw_rule && ipset_r && ac_rule && tp_rule && gen_include [ "$?" == 0 ] || loger 3 "Start failed!" exit $? - diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch index 98d91dc962..28a1ecef29 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch @@ -1,4 +1,4 @@ -#!/bin/sh /etc/rc.common +#!/bin/sh /etc/rc.common # # Copyright (C) 2017 openwrt-ssr # Copyright (C) 2017 yushi studio @@ -7,6 +7,9 @@ # See /LICENSE for more information. # +LOCK_FILE="/var/lock/ssr-switch.lock" +[ -f "$LOCK_FILE" ] && exit 2 +touch "$LOCK_FILE" cycle_time=60 switch_time=3 normal_flag=0 @@ -32,6 +35,23 @@ uci_get_by_type() { DEFAULT_SERVER=$(uci_get_by_type global global_server) CURRENT_SERVER=$DEFAULT_SERVER +#解析ip +get_host_ip() { + local host=$1 + local isip="" + local ip=$host + isip=$(echo $host | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}") + if [ -z "$isip" ]; then + if [ "$host" != "${host#*:[0-9a-fA-F]}" ]; then + ip=$host + else + local ip=$(resolveip -4 -t 3 $host | awk 'NR==1{print}') + [ -z "$ip" ] && ip=$(wget -q -O- http://119.29.29.29/d?dn=$1 | awk -F ';' '{print $1}') + fi + fi + echo ${ip:="ERROR"} +} + #判断代理是否正常 check_proxy() { local result=0 @@ -57,18 +77,19 @@ check_proxy() { } test_proxy() { - local servername=$(uci_get_by_name $1 server) + local servername=$(get_host_ip $(uci_get_by_name $1 server)) local serverport=$(uci_get_by_name $1 server_port) - ret=$(ping -c 3 $servername | grep 'loss' | awk -F ',' '{ print $3 }' | awk -F "%" '{ print $1 }') - [ -z "$ret" ] && return 1 - [ "$ret" -gt "50" ] && return 1 ipset add ss_spec_wan_ac $servername 2>/dev/null - ret=$? + ret1=$? + ret=$(tcpping -c 3 -p $serverport $servername | grep 'loss' | awk -F ',' '{ print $3 }' | awk -F "%" '{ print $1 }' | awk -F "." '{ print $1 }') + #echo "$(date "+%Y-%m-%d %H:%M:%S") test_proxy> name: $servername, ret1: $ret1, ret: $ret" >> /tmp/ssrplus.log + if [ -z "$ret" ] || [ "$ret" -gt "50" ]; then + [ "$ret1" == "0" ] && ipset del ss_spec_wan_ac $servername 2>/dev/null + return 1 + fi /usr/bin/ssr-check $servername $serverport $switch_time local ret2=$? - if [ "$ret" == "0" ]; then - ipset del ss_spec_wan_ac $servername 2>/dev/null - fi + [ "$ret1" == "0" ] && ipset del ss_spec_wan_ac $servername 2>/dev/null if [ "$ret2" == "0" ]; then return 0 else @@ -79,18 +100,16 @@ test_proxy() { search_proxy() { let server_count=server_count+1 [ "$normal_flag" == "1" -a "$server_count" -le "$server_locate" ] && return 0 - [ "$(uci_get_by_name $1 switch_enable)" != "1" ] && return 1 + [ "$(uci_get_by_name $1 switch_enable 0)" != "1" ] && return 1 [ $ENABLE_SERVER != nil ] && return 0 [ "$1" == "$CURRENT_SERVER" ] && return 0 - local servername=$(uci_get_by_name $1 server) + local servername=$(get_host_ip $(uci_get_by_name $1 server)) local serverport=$(uci_get_by_name $1 server_port) ipset add ss_spec_wan_ac $servername 2>/dev/null ret=$? /usr/bin/ssr-check $servername $serverport $switch_time local ret2=$? - if [ "$ret" == "0" ]; then - ipset del ss_spec_wan_ac $servername 2>/dev/null - fi + [ "$ret" == "0" ] && ipset del ss_spec_wan_ac $servername 2>/dev/null if [ "$ret2" == "0" ]; then server_locate=$server_count ENABLE_SERVER=$1 @@ -98,8 +117,8 @@ search_proxy() { else return 1 fi - } + #选择可用的代理 select_proxy() { config_load $NAME @@ -118,7 +137,6 @@ switch_proxy() { start() { #不支持kcptun启用时的切换 [ $(uci_get_by_name $DEFAULT_SERVER kcp_enable) = "1" ] && return 1 - while [ "1" == "1" ]; do #死循环 sleep $cycle_time LOGTIME=$(date "+%Y-%m-%d %H:%M:%S") @@ -133,7 +151,7 @@ start() { #缺省服务器正常，切换回来 CURRENT_SERVER=$DEFAULT_SERVER switch_proxy $CURRENT_SERVER - echo "$(date "+%Y-%m-%d %H:%M:%S") switch to default ["$(uci_get_by_name $CURRENT_SERVER server)"] proxy!" >>/tmp/ssrplus.log + echo "$(date "+%Y-%m-%d %H:%M:%S") switch to default "$(uci_get_by_name $CURRENT_SERVER alias)" proxy!" >>/tmp/ssrplus.log else echo "$(date "+%Y-%m-%d %H:%M:%S") Main server is NOT avilable.Continue using current server." >>/tmp/ssrplus.log fi @@ -154,7 +172,7 @@ start() { CURRENT_SERVER=$ENABLE_SERVER switch_proxy $CURRENT_SERVER normal_flag=1 - echo "$(date "+%Y-%m-%d %H:%M:%S") ShadowsocksR server switch OK" >>/tmp/ssrplus.log + echo "$(date "+%Y-%m-%d %H:%M:%S") Switch to "$(uci_get_by_name $CURRENT_SERVER alias)" proxy!" >>/tmp/ssrplus.log else switch_proxy $CURRENT_SERVER normal_flag=1 @@ -162,7 +180,7 @@ start() { fi else normal_flag=0 - echo "$(date "+%Y-%m-%d %H:%M:%S") ShadowsocksR No Problem." >>/tmp/ssrplus.log + # echo "$(date "+%Y-%m-%d %H:%M:%S") ShadowsocksR No Problem." >>/tmp/ssrplus.log fi done } diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/chinaipset.sh b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/chinaipset.sh index 044d524d94..ff3dd2cf16 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/chinaipset.sh +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/chinaipset.sh @@ -1,5 +1,9 @@ -echo "create china hash:net family inet hashsize 1024 maxelem 65536" > /tmp/china.ipset -awk '!/^$/&&!/^#/{printf("add china %s'" "'\n",$0)}' /etc/china_ssr.txt >> /tmp/china.ipset +#!/bin/sh +LOCK_FILE="/var/lock/ssr-chinaipset.lock" +[ -f "$LOCK_FILE" ] && exit 2 +touch "$LOCK_FILE" +echo "create china hash:net family inet hashsize 1024 maxelem 65536" >/tmp/china.ipset +awk '!/^$/&&!/^#/{printf("add china %s'" "'\n",$0)}' /etc/ssr/china_ssr.txt >>/tmp/china.ipset ipset -! flush china -ipset -! restore < /tmp/china.ipset 2>/dev/null -rm -f /tmp/china.ipset +ipset -! restore /dev/null +rm -f /tmp/china.ipset $LOCK_FILE diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua index 2554ebd17b..69d7c74835 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua @@ -4,99 +4,107 @@ local server_section = arg[1] local proto = arg[2] local local_port = arg[3] or "0" local socks_port = arg[4] or "0" - local server = ucursor:get_all("shadowsocksr", server_section) - local v2ray = { log = { - -- error = "/var/ssrplus.log", - loglevel = "warning" +-- error = "/var/ssrplus.log", +loglevel = "warning" }, - -- 传入连接 - inbound = (local_port ~= "0") and { - port = local_port, - protocol = "dokodemo-door", - settings = { - network = proto, - followRedirect = true - }, - sniffing = { - enabled = true, - destOverride = { "http", "tls" } - } - } or nil, - -- 开启 socks 代理 - inboundDetour = (proto == "tcp" and socks_port ~= "0") and { - { - protocol = "socks", - port = socks_port, - settings = { - auth = "noauth", - udp = true - } - } - } or nil, - -- 传出连接 - outbound = { - protocol = "vmess", +-- 传入连接 +inbound = (local_port ~= "0") and { + port = local_port, + protocol = "dokodemo-door", + settings = { + network = proto, + followRedirect = true + }, + sniffing = { + enabled = true, + destOverride = { "http", "tls" } + } +} or nil, +-- 开启 socks 代理 +inboundDetour = (proto == "tcp" and socks_port ~= "0") and { + { + protocol = "socks", + port = socks_port, settings = { - vnext = { - { - address = server.server, - port = tonumber(server.server_port), - users = { - { - id = server.vmess_id, - alterId = tonumber(server.alter_id), - security = server.security - } + auth = "noauth", + udp = true + } + } +} or nil, +-- 传出连接 +outbound = { + protocol = "vmess", + settings = { + vnext = { + { + address = server.server, + port = tonumber(server.server_port), + users = { + { + id = server.vmess_id, + alterId = tonumber(server.alter_id), + security = server.security } } } - }, - -- 底层传输配置 - streamSettings = { - network = server.transport, - security = (server.tls == '1') and "tls" or "none", - tlsSettings = {allowInsecure = (server.insecure ~= "0") and true or false,serverName=server.tls_host,}, - kcpSettings = (server.transport == "kcp") and { - mtu = tonumber(server.mtu), - tti = tonumber(server.tti), - uplinkCapacity = tonumber(server.uplink_capacity), - downlinkCapacity = tonumber(server.downlink_capacity), - congestion = (server.congestion == "1") and true or false, - readBufferSize = tonumber(server.read_buffer_size), - writeBufferSize = tonumber(server.write_buffer_size), - header = { - type = server.kcp_guise - } - } or nil, - wsSettings = (server.transport == "ws") and (server.ws_path ~= nil or server.ws_host ~= nil) and { - path = server.ws_path, - headers = (server.ws_host ~= nil) and { - Host = server.ws_host - } or nil, - } or nil, - httpSettings = (server.transport == "h2") and { - path = server.h2_path, - host = server.h2_host, - } or nil, - quicSettings = (server.transport == "quic") and { - security = server.quic_security, - key = server.quic_key, - header = { - type = server.quic_guise - } - } or nil - }, - mux = { - enabled = (server.mux == "1") and true or false, - concurrency = tonumber(server.concurrency) } }, - - -- 额外传出连接 - outboundDetour = { + -- 底层传输配置 + streamSettings = { + network = server.transport, + security = (server.tls == '1') and "tls" or "none", + tlsSettings = {allowInsecure = (server.insecure ~= "0") and true or false,serverName=server.tls_host,}, + tcpSettings = (server.transport == "tcp") and { + header = { + type = server.tcp_guise, + request = { + path = server.http_path or {"/"}, + headers = { + Host = server.http_host or {} + } + } or {} + } + } or nil, + kcpSettings = (server.transport == "kcp") and { + mtu = tonumber(server.mtu), + tti = tonumber(server.tti), + uplinkCapacity = tonumber(server.uplink_capacity), + downlinkCapacity = tonumber(server.downlink_capacity), + congestion = (server.congestion == "1") and true or false, + readBufferSize = tonumber(server.read_buffer_size), + writeBufferSize = tonumber(server.write_buffer_size), + header = { + type = server.kcp_guise + } + } or nil, + wsSettings = (server.transport == "ws") and (server.ws_path ~= nil or server.ws_host ~= nil) and { + path = server.ws_path, + headers = (server.ws_host ~= nil) and { + Host = server.ws_host + } or nil, + } or nil, + httpSettings = (server.transport == "h2") and { + path = server.h2_path, + host = server.h2_host, + } or nil, + quicSettings = (server.transport == "quic") and { + security = server.quic_security, + key = server.quic_key, + header = { + type = server.quic_guise + } + } or nil + }, + mux = { + enabled = (server.mux == "1") and true or false, + concurrency = tonumber(server.concurrency) + } +}, +-- 额外传出连接 +outboundDetour = { { protocol = "freedom", tag = "direct", @@ -104,4 +112,4 @@ log = { } } } -print(json.stringify(v2ray, 1)) +print(json.stringify(v2ray, 1)) \ No newline at end of file diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gfw2ipset.sh b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gfw2ipset.sh index c5decd28ce..e187c6c1a1 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gfw2ipset.sh +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gfw2ipset.sh @@ -1,5 +1,30 @@ #!/bin/sh -mkdir -p /tmp/dnsmasq.ssr -awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"blacklist"'\n",$0)}' /etc/config/black.list > /tmp/dnsmasq.ssr/blacklist_forward.conf -awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5335"'\n",$0)}' /etc/config/black.list >> /tmp/dnsmasq.ssr/blacklist_forward.conf -awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"whitelist"'\n",$0)}' /etc/config/white.list > /tmp/dnsmasq.ssr/whitelist_forward.conf +NAME=shadowsocksr +uci_get_by_type() { + local ret=$(uci get $NAME.@$1[0].$2 2>/dev/null) + echo ${ret:=$3} +} +GLOBAL_SERVER=$(uci_get_by_type global global_server) +NETFLIX_SERVER=$(uci_get_by_type global netflix_server nil) +[ "$NETFLIX_SERVER" == "same" ] && NETFLIX_SERVER=$GLOBAL_SERVER +if [ "$NETFLIX_SERVER" != "nil" ]; then + netflix() { + if [ -f "tmp/dnsmasq.ssr/gfw_list.conf" ]; then + for line in $(cat /etc/ssr/netflix.list); do sed -i "/$line/d" /tmp/dnsmasq.ssr/gfw_list.conf; done + fi + awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"netflix"'\n",$0)}' /etc/ssr/netflix.list >/tmp/dnsmasq.ssr/netflix_forward.conf + awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#$1"'\n",$0)}' /etc/ssr/netflix.list >>/tmp/dnsmasq.ssr/netflix_forward.conf + } + if [ "$NETFLIX_SERVER" != "$GLOBAL_SERVER" ]; then + netflix 5555 + else + netflix 5335 + fi +else + rm -f /tmp/dnsmasq.ssr/netflix_forward.conf +fi +if [ "$1" == "" ]; then + awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"blacklist"'\n",$0)}' /etc/ssr/black.list >/tmp/dnsmasq.ssr/blacklist_forward.conf + awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5335"'\n",$0)}' /etc/ssr/black.list >>/tmp/dnsmasq.ssr/blacklist_forward.conf + awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"whitelist"'\n",$0)}' /etc/ssr/white.list >/tmp/dnsmasq.ssr/whitelist_forward.conf +fi diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/ssrplusupdate.sh b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/ssrplusupdate.sh index 5db73ff880..818726a98b 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/ssrplusupdate.sh +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/ssrplusupdate.sh @@ -1,6 +1,6 @@ #!/bin/sh - /usr/bin/lua /usr/share/shadowsocksr/update.lua +sleep 2s +/usr/share/shadowsocksr/chinaipset.sh +sleep 2s /usr/bin/lua /usr/share/shadowsocksr/subscribe.lua -sleep 10 -/etc/init.d/shadowsocksr restart \ No newline at end of file diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index 7b05ce5cfc..d78e494dfe 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -3,34 +3,32 @@ -- This file is part of the luci-app-ssr-plus subscribe.lua -- @author William Chan ------------------------------------------------ -require 'nixio' -require 'luci.util' -require 'luci.jsonc' -require 'luci.sys' -require 'uci' +require "luci.model.uci" +require "nixio" +require "luci.util" +require "luci.sys" +require "luci.jsonc" -- these global functions are accessed all the time by the event handler -- so caching them is worth the effort -local luci = luci local tinsert = table.insert local ssub, slen, schar, sbyte, sformat, sgsub = string.sub, string.len, string.char, string.byte, string.format, string.gsub local jsonParse, jsonStringify = luci.jsonc.parse, luci.jsonc.stringify local b64decode = nixio.bin.b64decode local cache = {} -local nodeResult = setmetatable({}, { __index = cache }) -- update result +local nodeResult = setmetatable({}, { __index = cache }) -- update result local name = 'shadowsocksr' local uciType = 'servers' local ucic = luci.model.uci.cursor() local proxy = ucic:get_first(name, 'server_subscribe', 'proxy', '0') local switch = ucic:get_first(name, 'server_subscribe', 'switch', '1') local subscribe_url = ucic:get_first(name, 'server_subscribe', 'subscribe_url', {}) -local filter_words = ucic:get_first(name, 'server_subscribe', 'filter_words', 'QQ群') - +local filter_words = ucic:get_first(name, 'server_subscribe', 'filter_words', '过期时间/剩余流量') local log = function(...) print(os.date("%Y-%m-%d %H:%M:%S ") .. table.concat({ ... }, " ")) end -- 分割字符串 local function split(full, sep) - full = full:gsub("%z", "") -- 这里不是很清楚 有时候结尾带个\0 + full = full:gsub("%z", "") -- 这里不是很清楚 有时候结尾带个\0 local off, result = 1, {} while true do local nStart, nEnd = full:find(sep, off) @@ -74,7 +72,7 @@ local function trim(text) end -- md5 local function md5(content) - local stdout = luci.sys.exec('echo \"' .. urlEncode(content) .. '\" | md5sum | cut -d \" \" -f1') + local stdout = luci.sys.exec('echo \"' .. urlEncode(content) .. '\" | md5sum | cut -d \" \" -f1') -- assert(nixio.errno() == 0) return trim(stdout) end @@ -119,7 +117,7 @@ local function processData(szType, content) result.protocol_param = base64Decode(params.protoparam) local group = base64Decode(params.group) if group then - result.alias = "[" .. group .. "] " + result.alias = "[" .. group .. "] " end result.alias = result.alias .. base64Decode(params.remarks) elseif szType == 'vmess' then @@ -131,7 +129,6 @@ local function processData(szType, content) result.alter_id = info.aid result.vmess_id = info.id result.alias = info.ps - result.insecure = 1 -- result.mux = 1 -- result.concurrency = 8 if info.net == 'ws' then @@ -143,6 +140,9 @@ local function processData(szType, content) result.h2_path = info.path end if info.net == 'tcp' then + if info.type and info.type ~= "http" then + info.type = "none" + end result.tcp_guise = info.type result.http_host = info.host result.http_path = info.path @@ -167,6 +167,7 @@ local function processData(szType, content) if info.tls == "tls" or info.tls == "1" then result.tls = "1" result.tls_host = info.host + result.insecure = 1 else result.tls = "0" end @@ -244,12 +245,10 @@ local function processData(szType, content) local t = split(v, '=') params[t[1]] = t[2] end - if params.peer then -- 未指定peer（sni）默认使用remote addr result.tls_host = params.peer end - if params.allowInsecure == "1" then result.insecure = "1" else @@ -261,7 +260,11 @@ local function processData(szType, content) result.password = password end if not result.alias then - result.alias = result.server .. ':' .. result.server_port + if result.server and result.server_port then + result.alias = result.server .. ':' .. result.server_port + else + result.alias = "NULL" + end end -- alias 不参与 hashkey 计算 local alias = result.alias @@ -280,15 +283,15 @@ local function wget(url) end local function check_filer(result) - do - local filter_word = split(filter_words, "/") - for i, v in pairs(filter_word) do - if result.alias:find(v) then - log('订阅节点关键字过滤:“' .. v ..'” ，该节点被丢弃') - return true - end - end - end + do + local filter_word = split(filter_words, "/") + for i, v in pairs(filter_word) do + if result.alias:find(v) then + log('订阅节点关键字过滤:“' .. v ..'” ，该节点被丢弃') + return true + end + end + end end local execute = function() @@ -313,10 +316,10 @@ local execute = function() nodes = base64Decode(raw:sub(nEnd + 1, #raw)) nodes = jsonParse(nodes) local extra = { - airport = nodes.airport, - port = nodes.port, - encryption = nodes.encryption, - password = nodes.password + airport = nodes.airport, + port = nodes.port, + encryption = nodes.encryption, + password = nodes.password } local servers = {} -- SS里面包着 干脆直接这样 @@ -326,7 +329,7 @@ local execute = function() nodes = servers else -- ssd 外的格式 - nodes = split(base64Decode(raw):gsub(" ", "\n"), "\n") + nodes = split(base64Decode(raw):gsub(" ", "_"), "\n") end for _, v in ipairs(nodes) do if v then @@ -337,8 +340,12 @@ local execute = function() local node = trim(v) local dat = split(node, "://") if dat and dat[1] and dat[2] then + local dat3 = "" + if dat[3] then + dat3 = "://" .. dat[3] + end if dat[1] == 'ss' or dat[1] == 'trojan' then - result = processData(dat[1], dat[2]) + result = processData(dat[1], dat[2] .. dat3) else result = processData(dat[1], base64Decode(dat[2])) end @@ -349,10 +356,12 @@ local execute = function() -- log(result) if result then if - not result.server or - check_filer(result) or - result.server:match("[^0-9a-zA-Z%-%.%s]") -- 中文做地址的 也没有人拿中文域名搞，就算中文域也有Puny Code SB 机场 - then + not result.server or + not result.server_port or + result.alias == "NULL" or + check_filer(result) or + result.server:match("[^0-9a-zA-Z%-%.%s]") -- 中文做地址的 也没有人拿中文域名搞，就算中文域也有Puny Code SB 机场 + then log('丢弃无效节点: ' .. result.type ..' 节点, ' .. result.alias) else log('成功解析: ' .. result.type ..' 节点, ' .. result.alias) @@ -373,6 +382,10 @@ local execute = function() do if next(nodeResult) == nil then log("更新失败，没有可用的节点信息") + if proxy == '0' then + luci.sys.init.start(name) + log('订阅失败, 恢复服务') + end return end local add, del = 0, 0 @@ -385,7 +398,7 @@ local execute = function() local dat = nodeResult[old.grouphashkey][old.hashkey] ucic:tset(name, old['.name'], dat) -- 标记一下 - setmetatable(nodeResult[old.grouphashkey][old.hashkey], { __index = { _ignore = true } }) + setmetatable(nodeResult[old.grouphashkey][old.hashkey], { __index = { _ignore = true } }) end else if not old.alias then @@ -393,7 +406,6 @@ local execute = function() end log('忽略手动添加的节点: ' .. old.alias) end - end) for k, v in ipairs(nodeResult) do for kk, vv in ipairs(v) do @@ -408,22 +420,24 @@ local execute = function() ucic:commit(name) -- 如果原有服务器节点已经不见了就尝试换为第一个节点 local globalServer = ucic:get_first(name, 'global', 'global_server', '') - local firstServer = ucic:get_first(name, uciType) - if firstServer then - if not ucic:get(name, globalServer) then - luci.sys.call("/etc/init.d/" .. name .. " stop > /dev/null 2>&1 &") - ucic:commit(name) - ucic:set(name, ucic:get_first(name, 'global'), 'global_server', ucic:get_first(name, uciType)) - ucic:commit(name) - log('当前主服务器节点已被删除，正在自动更换为第一个节点。') - luci.sys.call("/etc/init.d/" .. name .. " start > /dev/null 2>&1 &") + if globalServer ~= "nil" then + local firstServer = ucic:get_first(name, uciType) + if firstServer then + if not ucic:get(name, globalServer) then + luci.sys.call("/etc/init.d/" .. name .. " stop > /dev/null 2>&1 &") + ucic:commit(name) + ucic:set(name, ucic:get_first(name, 'global'), 'global_server', ucic:get_first(name, uciType)) + ucic:commit(name) + log('当前主服务器节点已被删除，正在自动更换为第一个节点。') + luci.sys.call("/etc/init.d/" .. name .. " start > /dev/null 2>&1 &") + else + log('维持当前主服务器节点。') + luci.sys.call("/etc/init.d/" .. name .." restart > /dev/null 2>&1 &") + end else - log('维持当前主服务器节点。') - luci.sys.call("/etc/init.d/" .. name .." restart > /dev/null 2>&1 &") + log('没有服务器节点了，停止服务') + luci.sys.call("/etc/init.d/" .. name .. " stop > /dev/null 2>&1 &") end - else - log('没有服务器节点了，停止服务') - luci.sys.call("/etc/init.d/" .. name .. " stop > /dev/null 2>&1 &") end log('新增节点数量: ' ..add, '删除节点数量: ' .. del) log('订阅更新成功') diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua index 17341bd84c..a654d6913c 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua @@ -3,123 +3,49 @@ -- This file is part of the luci-app-ssr-plus update.lua -- By Mattraks ------------------------------------------------ -require 'nixio' -require 'luci.util' -require 'luci.jsonc' -require 'luci.sys' +require "luci.sys" +require "luci.model.uci" local icount = 0 local uci = luci.model.uci.cursor() - local log = function(...) print(os.date("%Y-%m-%d %H:%M:%S ") .. table.concat({ ... }, " ")) end -log('正在更新【GFW列表】数据库') -refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'gfwlist_url', 'https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt') .. " > /tmp/gfw.b64" -sret = luci.sys.call(refresh_cmd .. " 2>/dev/null") -if sret == 0 then - luci.sys.call("/usr/bin/ssr-gfw") - icount = luci.sys.exec("cat /tmp/gfwnew.txt | wc -l") - if tonumber(icount) > 1000 then - if nixio.fs.access("/etc/dnsmasq.ssr/gfw_list.conf") then - oldcount = luci.sys.exec("cat /etc/dnsmasq.ssr/gfw_list.conf | wc -l") - else - oldcount = "0" - end - if tonumber(icount) ~= tonumber(oldcount) then - luci.sys.exec("cp -f /tmp/gfwnew.txt /etc/dnsmasq.ssr/gfw_list.conf") - luci.sys.exec("cp -f /tmp/gfwnew.txt /tmp/dnsmasq.ssr/gfw_list.conf") - log('更新成功！ 新的总纪录数：' .. tostring(tonumber(icount)/2)) - else - log('你已经是最新数据，无需更新！') - end - else - log('更新失败！') - end - luci.sys.exec("rm -f /tmp/gfwnew.txt") -else - log('更新失败！') -end - -log('正在更新【国内IP段】数据库') -refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'chnroute_url','https://ispip.clang.cn/all_cn.txt') .. " > /tmp/china_ssr.txt" -sret = luci.sys.call(refresh_cmd .. " 2>/dev/null") -icount = luci.sys.exec("cat /tmp/china_ssr.txt | wc -l") -if sret == 0 then - icount = luci.sys.exec("cat /tmp/china_ssr.txt | wc -l") - if tonumber(icount) > 1000 then - if nixio.fs.access("/etc/china_ssr.txt") then - oldcount = luci.sys.exec("cat /etc/china_ssr.txt | wc -l") - else - oldcount = "0" - end - if tonumber(icount) ~= tonumber(oldcount) then - luci.sys.exec("cp -f /tmp/china_ssr.txt /etc/china_ssr.txt") - log('更新成功！ 新的总纪录数：' .. tostring(tonumber(icount))) - else - log('你已经是最新数据，无需更新！') - end - else - log('更新失败！') - end - luci.sys.exec("rm -f /tmp/china_ssr.txt") -else - log('更新失败！') -end - -if uci:get_first('shadowsocksr', 'global', 'adblock','0') == "1" then - log('正在更新【广告屏蔽】数据库') - refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'adblock_url','https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt') .. " > /tmp/adnew.conf" +local function update(url, file, type, file2) + local Num = 1 + refresh_cmd = "wget-ssl --no-check-certificate -t 3 -T 10 -O- " .. url .. " > /tmp/ssr-update." .. type sret = luci.sys.call(refresh_cmd .. " 2>/dev/null") if sret == 0 then - luci.sys.call("/usr/bin/ssr-ad") - icount = luci.sys.exec("cat /tmp/ad.conf | wc -l") - if tonumber(icount) > 100 then - if nixio.fs.access("/etc/dnsmasq.ssr/ad.conf") then - oldcount = luci.sys.exec("cat /etc/dnsmasq.ssr/ad.conf | wc -l") - else - oldcount = "0" - end - if tonumber(icount) ~= tonumber(oldcount) then - luci.sys.exec("cp -f /tmp/ad.conf /etc/dnsmasq.ssr/ad.conf") - luci.sys.exec("cp -f /tmp/ad.conf /tmp/dnsmasq.ssr/ad.conf") - log('更新成功！ 新的总纪录数：' .. tostring(tonumber(icount))) - else - log('你已经是最新数据，无需更新！') - end - else - log('更新失败！') + if type == "gfw_data" then + luci.sys.call("/usr/bin/ssr-gfw " .. type) + Num = 2 + end + if type == "ad_data" then + luci.sys.call("/usr/bin/ssr-ad " .. type) + end + local new_md5 = luci.sys.exec("echo -n $([ -f '/tmp/ssr-update." .. type .. "' ] && md5sum /tmp/ssr-update." .. type .. " | awk '{print $1}')") + local old_md5 = luci.sys.exec("echo -n $([ -f '" .. file .. "' ] && md5sum " .. file .. " | awk '{print $1}')") + if new_md5 == old_md5 then + log("你已经是最新数据，无需更新！") + else + icount = luci.sys.exec("cat /tmp/ssr-update." .. type .. " | wc -l") + luci.sys.exec("cp -f /tmp/ssr-update." .. type .. " " .. file) + if file2 then luci.sys.exec("cp -f /tmp/ssr-update." .. type .. " " .. file2) end + log("更新成功！ 新的总纪录数：" .. tostring(tonumber(icount)/Num)) end - luci.sys.exec("rm -f /tmp/ad.conf") else - log('更新失败！') + log("更新失败！") end + luci.sys.exec("rm -f /tmp/ssr-update." .. type) end ---[[ -log('正在更新【Netflix IP段】数据库') -refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'nfip_url','https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt') .. " > /tmp/netflixip.list" -sret = luci.sys.call(refresh_cmd .. " 2>/dev/null") -if sret == 0 then - luci.sys.call("/usr/bin/ssr-gfw") - icount = luci.sys.exec("cat /tmp/netflixip.list | wc -l") - if tonumber(icount) > 5 then - if nixio.fs.access("/etc/config/netflixip.list") then - oldcount = luci.sys.exec("cat /etc/config/netflixip.list | wc -l") - else - oldcount = "0" - end - if tonumber(icount) ~= tonumber(oldcount) then - luci.sys.exec("cp -f /tmp/netflixip.list /etc/config/netflixip.list") - log('更新成功！ 新的总纪录数：' .. tostring(tonumber(icount))) - else - log('你已经是最新数据，无需更新！') - end - else - log('更新失败！') - end - luci.sys.exec("rm -f /tmp/netflixip.list") -else - log('更新失败！') +log("正在更新【GFW列表】数据库") +update(uci:get_first("shadowsocksr", "global", "gfwlist_url", "https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt"), "/etc/ssr/gfw_list.conf", "gfw_data", "/tmp/dnsmasq.ssr/gfw_list.conf") +log("正在更新【国内IP段】数据库") +update(uci:get_first("shadowsocksr", "global", "chnroute_url","https://ispip.clang.cn/all_cn.txt"), "/etc/ssr/china_ssr.txt", "cnip") +if uci:get_first("shadowsocksr", "global", "adblock","0") == "1" then + log("正在更新【广告屏蔽】数据库") + update(uci:get_first("shadowsocksr", "global", "adblock_url","https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt"), "/etc/ssr/ad.conf", "ad_data", "/tmp/dnsmasq.ssr/ad.conf") end ---]] +-- log("正在更新【Netflix IP段】数据库") +-- update(uci:get_first("shadowsocksr", "global", "nfip_url","https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt"), "/etc/ssr/netflixip.list", "nfip_data") From 5baf9b8af695070831c83c8d20714fd4c695c60b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 16 Jul 2020 21:03:56 +0800 Subject: [PATCH 4/5] luci-app-clash: sync with upstream source --- .../root/usr/share/clash/game.sh | 3 +- .../root/usr/share/clash/load_groups.sh | 46 +++++++++---------- .../root/usr/share/clash/yum_change.sh | 3 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package/ntlf9t/luci-app-clash/root/usr/share/clash/game.sh b/package/ntlf9t/luci-app-clash/root/usr/share/clash/game.sh index 2b21c73231..a3f46121ef 100755 --- a/package/ntlf9t/luci-app-clash/root/usr/share/clash/game.sh +++ b/package/ntlf9t/luci-app-clash/root/usr/share/clash/game.sh @@ -94,9 +94,10 @@ fi sed -i '/GAMERULESTART/r/tmp/yaml_game_rule_group.yaml' "$CLASH_CONFIG" 2>/dev/null mv $CLASH_CONFIG $CONFIG_YAML 2>/dev/null fi - +rm -rf $GAME_RULE_FILE 2>/dev/null else sed -i '/#GAMERULESTART#/,/#GAMERULEEND#/d' "$CONFIG_YAML" 2>/dev/null +rm -rf $GAME_RULE_FILE 2>/dev/null fi diff --git a/package/ntlf9t/luci-app-clash/root/usr/share/clash/load_groups.sh b/package/ntlf9t/luci-app-clash/root/usr/share/clash/load_groups.sh index c021344e96..9d7ae6901c 100755 --- a/package/ntlf9t/luci-app-clash/root/usr/share/clash/load_groups.sh +++ b/package/ntlf9t/luci-app-clash/root/usr/share/clash/load_groups.sh @@ -2,7 +2,7 @@ . /lib/functions.sh lang=$(uci get luci.main.lang 2>/dev/null) -load="/etc/clash/config.yaml" +load="/tmp/config.yaml" CONFIG_YAML_PATH=$(uci get clash.config.use_config 2>/dev/null) @@ -26,26 +26,20 @@ rm -rf /tmp/Proxy_Group /tmp/group_*.yaml /tmp/yaml_group.yaml 2>/dev/null echo "Start updating policy group config" >$REAL_LOG fi - sleep 1 + sed -i 's/^Proxy Group:/proxy-groups:/g' "$load" + sed -i 's/^proxy-provider:/proxy-providers:/g' "$load" + sed -i 's/^Proxy:/proxies:/g' "$load" + sed -i 's/^Rule:/rules:/g' "$load" + sed -i 's/^rule-provider:/rule-providers:/g' "$load" + - sed -i "/^ \{0,\}proxy-groups:/c\Proxy Group:" "$load" 2>/dev/null - - sed -i "/^ \{0,\}proxy-providers:/c\proxy-provider:" "$load" 2>/dev/null - - sed -i "s/^proxies:/Proxy:/" "$load" 2>/dev/null - - sed -i "/^ \{0,\}rules:/c\Rule:" "$load" 2>/dev/null - - - - - group_len=$(sed -n '/^ \{0,\}Proxy Group:/=' "$load" 2>/dev/null) - provider_len=$(sed -n '/^ \{0,\}proxy-provider:/=' "$load" 2>/dev/null) + group_len=$(sed -n '/^ \{0,\}proxy-groups:/=' "$load" 2>/dev/null) + provider_len=$(sed -n '/^ \{0,\}proxy-providers:/=' "$load" 2>/dev/null) if [ "$provider_len" -ge "$group_len" ]; then - awk '/Proxy:/,/proxy-provider:/{print}' "$load" 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed 's/\t/ /g' 2>/dev/null |grep name: |awk -F 'name:' '{print $2}' |sed 's/,.*//' |sed 's/^ \{0,\}//' 2>/dev/null |sed 's/ \{0,\}$//' 2>/dev/null |sed 's/ \{0,\}\}\{0,\}$//g' 2>/dev/null >/tmp/Proxy_Group 2>&1 - sed -i "s/proxy-provider://g" /tmp/Proxy_Group 2>&1 + awk '/proxies:/,/proxy-providers:/{print}' "$load" 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed 's/\t/ /g' 2>/dev/null |grep name: |awk -F 'name:' '{print $2}' |sed 's/,.*//' |sed 's/^ \{0,\}//' 2>/dev/null |sed 's/ \{0,\}$//' 2>/dev/null |sed 's/ \{0,\}\}\{0,\}$//g' 2>/dev/null >/tmp/Proxy_Group 2>&1 + sed -i "s/proxy-providers://g" /tmp/Proxy_Group 2>&1 else - awk '/Proxy:/,/Rule:/{print}' "$load" 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed 's/\t/ /g' 2>/dev/null |grep name: |awk -F 'name:' '{print $2}' |sed 's/,.*//' |sed 's/^ \{0,\}//' 2>/dev/null |sed 's/ \{0,\}$//' 2>/dev/null |sed 's/ \{0,\}\}\{0,\}$//g' 2>/dev/null >/tmp/Proxy_Group 2>&1 + awk '/proxies:/,/rules:/{print}' "$load" 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed 's/\t/ /g' 2>/dev/null |grep name: |awk -F 'name:' '{print $2}' |sed 's/,.*//' |sed 's/^ \{0,\}//' 2>/dev/null |sed 's/ \{0,\}$//' 2>/dev/null |sed 's/ \{0,\}\}\{0,\}$//g' 2>/dev/null >/tmp/Proxy_Group 2>&1 fi @@ -63,13 +57,17 @@ rm -rf /tmp/Proxy_Group /tmp/group_*.yaml /tmp/yaml_group.yaml 2>/dev/null -group_len=$(sed -n '/^ \{0,\}Proxy Group:/=' "$load" 2>/dev/null) -provider_len=$(sed -n '/^ \{0,\}proxy-provider:/=' "$load" 2>/dev/null) +group_len=$(sed -n '/^ \{0,\}proxy-groups:/=' "$load" 2>/dev/null) +provider_len=$(sed -n '/^ \{0,\}proxy-providers:/=' "$load" 2>/dev/null) +ruleprovider_len=$(sed -n '/^ \{0,\}rule-providers:/=' "$load" 2>/dev/null) if [ "$provider_len" -ge "$group_len" ]; then - awk '/Proxy Group:/,/proxy-provider:/{print}' "$load" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\t/ /g' 2>/dev/null >/tmp/yaml_group.yaml 2>&1 - sed -i "s/proxy-provider://g" /tmp/yaml_group.yaml 2>&1 + awk '/proxy-groups:/,/proxy-providers:/{print}' "$load" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\t/ /g' 2>/dev/null >/tmp/yaml_group.yaml 2>&1 + sed -i "s/proxy-providers://g" /tmp/yaml_group.yaml 2>&1 +elif [ "$ruleprovider_len" -ge "$group_len" ]; then + awk '/proxy-groups:/,/rule-providers:/{print}' "$load" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\t/ /g' 2>/dev/null >/tmp/yaml_group.yaml 2>&1 + sed -i "s/rule-providers://g" /tmp/yaml_group.yaml 2>&1 else - awk '/Proxy Group:/,/Rule:/{print}' "$load" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\t/ /g' 2>/dev/null >/tmp/yaml_group.yaml 2>&1 + awk '/proxy-groups:/,/Rule:/{print}' "$load" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\t/ /g' 2>/dev/null >/tmp/yaml_group.yaml 2>&1 fi @@ -153,6 +151,6 @@ uci commit clash echo "Clash for OpenWRT" >$REAL_LOG fi -rm -rf /tmp/Proxy_Group /tmp/group_*.yaml /tmp/yaml_group.yaml 2>/dev/null +rm -rf /tmp/Proxy_Group /tmp/group_*.yaml /tmp/yaml_group.yaml $load 2>/dev/null fi #######READ GROUPS END \ No newline at end of file diff --git a/package/ntlf9t/luci-app-clash/root/usr/share/clash/yum_change.sh b/package/ntlf9t/luci-app-clash/root/usr/share/clash/yum_change.sh index 4f444342d5..31e2d5e7f0 100755 --- a/package/ntlf9t/luci-app-clash/root/usr/share/clash/yum_change.sh +++ b/package/ntlf9t/luci-app-clash/root/usr/share/clash/yum_change.sh @@ -351,6 +351,7 @@ rm -rf /tmp/tun.yaml /tmp/enable_dns.yaml /tmp/fallback.yaml /tmp/nameservers.ya rm -rf /etc/clash/dns.yaml sed -i '/#=============/ d' $CONFIG_YAML 2>/dev/null fi + rm -rf $TEMP_FILE 2>/dev/null add_address(){ servers_get() @@ -429,4 +430,4 @@ add_address(){ sed -i '/fake-ip-filter:/r/usr/share/clash/fake_filter.list' "/etc/clash/config.yaml" 2>/dev/null fi fi - + From b75f46844a0dc831e65d6bc0e0334781d83562f9 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 16 Jul 2020 21:07:14 +0800 Subject: [PATCH 5/5] OpenClash: sync with upstream source --- package/ctcgfw/luci-app-openclash/Makefile | 6 +- .../files/etc/init.d/openclash | 101 +- .../files/etc/openclash/ConnersHua.yaml | 1232 +---------------- .../etc/openclash/ConnersHua_provider.yaml | 97 -- .../files/etc/openclash/default.yaml | 12 +- .../files/etc/openclash/openclash_version | 4 +- .../openclash/rule_provider/IP-Blackhole.yaml | 46 - .../lua/luci/model/cbi/openclash/servers.lua | 3 +- .../lua/luci/model/cbi/openclash/settings.lua | 19 +- .../usr/share/openclash/dashboard/index.html | 2 +- .../js/1.bundle.0f871e89a0b8ff683256.min.js | 2 - .../js/1.bundle.10742ccbbcb6e6c7018f.min.js | 2 + ...e.10742ccbbcb6e6c7018f.min.js.LICENSE.txt} | 0 .../js/bundle.0f871e89a0b8ff683256.min.js | 1 - .../js/bundle.10742ccbbcb6e6c7018f.min.js | 1 + ...3256.css => main.10742ccbbcb6e6c7018f.css} | 2 +- .../usr/share/openclash/openclash_rule.sh | 9 +- ...497e7acca.js => 9.e5ebc45c57147750a8b7.js} | 2 +- .../yacd/app.09d100e5dacbf4f76606.js | 2 - .../yacd/app.2710ac87312332833aa4.js | 2 + ...> app.2710ac87312332833aa4.js.LICENSE.txt} | 0 ...5f5f9.css => app.bb773b8bdd4263de9ffd.css} | 2 +- .../yacd/core-js~app.36c6f0077ac1e602b325.js | 1 - .../yacd/core-js~app.4e0935a458133ffa9ca3.js | 1 + .../files/usr/share/openclash/yacd/index.html | 2 +- .../yacd/proxies.77fef0018a8d1766e6eb.js | 1 - .../yacd/proxies.beaddeef3e0db08db953.js | 1 + .../usr/share/openclash/yacd/report.html | 4 +- .../yacd/rules.3ba17dd53c9d8bd8b221.css | 4 + .../yacd/rules.664f8b737878361937cb.css | 1 - .../yacd/rules.90faad053acc32c74a88.js | 1 + .../yacd/rules.efd650d64b4afda8d49b.js | 1 - .../yacd/runtime.2f322c031bcb67b98af2.js | 1 - .../yacd/runtime.30479c2b09f71505cee3.js | 1 + .../vendors~rules.b2e93c21da80f9dc4a80.js | 1 + .../usr/share/openclash/yml_proxys_set.sh | 89 +- .../usr/share/openclash/yml_rules_change.sh | 52 +- 37 files changed, 173 insertions(+), 1535 deletions(-) delete mode 100644 package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua_provider.yaml delete mode 100644 package/ctcgfw/luci-app-openclash/files/etc/openclash/rule_provider/IP-Blackhole.yaml delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.0f871e89a0b8ff683256.min.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.10742ccbbcb6e6c7018f.min.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/{1.bundle.0f871e89a0b8ff683256.min.js.LICENSE.txt => 1.bundle.10742ccbbcb6e6c7018f.min.js.LICENSE.txt} (100%) delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/bundle.0f871e89a0b8ff683256.min.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/bundle.10742ccbbcb6e6c7018f.min.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/{main.0f871e89a0b8ff683256.css => main.10742ccbbcb6e6c7018f.css} (99%) rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{8.872bd111e9c497e7acca.js => 9.e5ebc45c57147750a8b7.js} (62%) delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.09d100e5dacbf4f76606.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.2710ac87312332833aa4.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{app.09d100e5dacbf4f76606.js.LICENSE.txt => app.2710ac87312332833aa4.js.LICENSE.txt} (100%) rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{app.b814d6460bc4d015f5f9.css => app.bb773b8bdd4263de9ffd.css} (98%) delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/core-js~app.36c6f0077ac1e602b325.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/core-js~app.4e0935a458133ffa9ca3.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/proxies.77fef0018a8d1766e6eb.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/proxies.beaddeef3e0db08db953.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/rules.3ba17dd53c9d8bd8b221.css delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/rules.664f8b737878361937cb.css create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/rules.90faad053acc32c74a88.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/rules.efd650d64b4afda8d49b.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/runtime.2f322c031bcb67b98af2.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/runtime.30479c2b09f71505cee3.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~rules.b2e93c21da80f9dc4a80.js diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile index d2040075c7..5206c25f62 100644 --- a/package/ctcgfw/luci-app-openclash/Makefile +++ b/package/ctcgfw/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.39.2 +PKG_VERSION:=0.39.3 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong @@ -99,8 +99,8 @@ if [ -f "/tmp/openclash.bak" ]; then mv "/tmp/openclash_custom_hosts.list.bak" "/etc/openclash/custom/openclash_custom_hosts.list" >/dev/null 2>&1 mv "/tmp/openclash_custom_fake_filter.list.bak" "/etc/openclash/custom/openclash_custom_fake_filter.list" >/dev/null 2>&1 if [ -d "/tmp/openclash_history/" ]; then - rm -rf "/etc/openclash/history" >/dev/null 2>&1 - mv "/tmp/openclash_history" "/etc/openclash/history" >/dev/null 2>&1 + cp -a "/tmp/openclash_history/." "/etc/openclash/history" >/dev/null 2>&1 + rm -rf "/tmp/openclash_history" >/dev/null 2>&1 fi fi if [ -f "/tmp/config.yaml" ]; then diff --git a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash index a3a05ecf71..8e08a647c2 100755 --- a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash +++ b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash @@ -50,39 +50,46 @@ del_cron() } change_dns() { - if [ "$1" -ne "0" ]; then + if [ "$1" -eq "1" ]; then uci del dhcp.@dnsmasq[-1].server >/dev/null 2>&1 uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#"$dns_port" - uci delete dhcp.@dnsmasq[0].resolvfile - uci set dhcp.@dnsmasq[0].noresolv=1 + uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null + uci set dhcp.@dnsmasq[0].noresolv=1 2>/dev/null uci set openclash.config.redirect_dns=1 else - uci delete openclash.config.redirect_dns + uci delete openclash.config.redirect_dns 2>/dev/null fi if [ "$2" -eq "1" ]; then - uci set dhcp.@dnsmasq[0].cachesize=0 - uci set openclash.config.masq_cache=1 - else - uci delete openclash.config.masq_cache + uci set dhcp.@dnsmasq[0].cachesize=0 2>/dev/null fi uci commit dhcp uci commit openclash } revert_dns() { - uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#"$3" >/dev/null 2>&1 - [ "$1" = "1" ] && { - if [ -s "/tmp/resolv.conf.d/resolv.conf.auto" ]; then - uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto >/dev/null 2>&1 - elif [ -s "/tmp/resolv.conf.auto" ]; then - uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto >/dev/null 2>&1 + [ "$1" -eq "0" ] && { + if [ "$(uci get openclash.config.dns_revert 2>/dev/null)" != "1" ]; then + uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#"$3" >/dev/null 2>&1 + if [ -s "/tmp/resolv.conf.d/resolv.conf.auto" ]; then + uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto >/dev/null 2>&1 + elif [ -s "/tmp/resolv.conf.auto" ]; then + uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto >/dev/null 2>&1 + fi + uci set dhcp.@dnsmasq[0].noresolv=0 >/dev/null 2>&1 + uci set openclash.config.dns_revert=1 2>/dev/null fi - uci set dhcp.@dnsmasq[0].noresolv=0 >/dev/null 2>&1 } - [ "$2" = "1" ] && { + [ "$1" -eq "1" ] && { + uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#"$3" >/dev/null 2>&1 + uci set openclash.config.dns_revert=0 2>/dev/null + } + + [ "$(uci get dhcp.@dnsmasq[0].cachesize 2>/dev/null)" -eq "0" ] && { uci delete dhcp.@dnsmasq[0].cachesize >/dev/null 2>&1 - } + } 2>/dev/null + uci commit dhcp + uci commit openclash rm -rf /tmp/dnsmasq.d/dnsmasq_openclash.conf >/dev/null 2>&1 } @@ -915,6 +922,24 @@ lan_ac() } +firewall_redirect_exclude() +{ + local section="$1" + local src_dport + config_get "src_dport" "$section" "src_dport" "" + + if [ -z "$src_dport" ]; then + return + fi + + if [ -z "$en_mode_tun" ]; then + iptables -t mangle -A openclash -p udp --dport "$src_dport" -j RETURN >/dev/null 2>&1 + else + iptables -t mangle -A openclash -p tcp --dport "$src_dport" -j RETURN >/dev/null 2>&1 + iptables -t mangle -A openclash -p udp --dport "$src_dport" -j RETURN >/dev/null 2>&1 + fi +} + #配置文件选择 config_choose() { @@ -998,7 +1023,7 @@ do_run_core() core_type="Game" fi - if [ "$proxy_mode" = "Script" ] || [ "$rule_source" = "ConnersHua_provider" ]; then + if [ "$proxy_mode" = "Script" ] || [ "$rule_source" = "ConnersHua" ]; then ln -s /etc/openclash/core/clash_tun /etc/openclash/clash 2>/dev/null core_type="Tun" fi @@ -1103,6 +1128,10 @@ if [ -z "$en_mode_tun" ]; then iptables -t mangle -A openclash -m set --match-set localnetwork dst -j RETURN iptables -t mangle -A openclash -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 iptables -t mangle -A openclash -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 + iptables -t mangle -A openclash -p udp --dport 53 -j RETURN >/dev/null 2>&1 + #端口转发 + config_load "firewall" + config_foreach firewall_redirect_exclude "redirect" iptables -t mangle -A openclash -p udp -j TPROXY --on-port "$proxy_port" --on-ip 0.0.0.0 --tproxy-mark "$PROXY_FWMARK" iptables -t mangle -A PREROUTING -p udp -j openclash fi @@ -1158,17 +1187,25 @@ else fi ip rule add fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" #设置防火墙 + iptables -t mangle -N openclash_output + iptables -t mangle -F openclash_output + iptables -t mangle -A openclash_output -m set --match-set localnetwork dst -j RETURN + if [ "$en_mode" = "fake-ip" ]; then + iptables -t mangle -A openclash_output -d 198.18.0.0/16 -j MARK --set-mark "$PROXY_FWMARK" + fi + iptables -t mangle -I OUTPUT -j openclash_output iptables -t mangle -N openclash iptables -t mangle -F openclash - iptables -t mangle -A openclash -m set --match-set localnetwork dst -j RETURN - if [ "$en_mode" = "fake-ip" ]; then - iptables -t mangle -A openclash -d 198.18.0.0/16 -j MARK --set-mark "$PROXY_FWMARK" - fi - iptables -t mangle -I OUTPUT -j openclash - iptables -t mangle -I PREROUTING -m set ! --match-set localnetwork dst -j MARK --set-mark "$PROXY_FWMARK" - iptables -t mangle -I PREROUTING -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 - iptables -t mangle -I PREROUTING -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 + #端口转发 + config_load "firewall" + config_foreach firewall_redirect_exclude "redirect" + #其他流量 + iptables -t mangle -A openclash -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 + iptables -t mangle -A openclash -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 + iptables -t mangle -A openclash -m set ! --match-set localnetwork dst -j MARK --set-mark "$PROXY_FWMARK" + iptables -t mangle -I PREROUTING -j openclash iptables -t nat -I PREROUTING -p tcp --dport 53 -j ACCEPT + #ipv6 # if [ "$ipv6_enable" -eq 1 ]; then # ip6tables -t mangle -I PREROUTING -j MARK --set-mark "$PROXY_FWMARK" @@ -1232,12 +1269,12 @@ revert_firewall() ip link set dev clash0 down >/dev/null 2>&1 ip tuntap del clash0 mode tun >/dev/null 2>&1 - iptables -t mangle -D OUTPUT -j openclash >/dev/null 2>&1 - iptables -t mangle -D PREROUTING -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 - iptables -t mangle -D PREROUTING -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 - iptables -t mangle -D PREROUTING -m set ! --match-set localnetwork dst -j MARK --set-mark "$PROXY_FWMARK" >/dev/null 2>&1 + iptables -t mangle -D OUTPUT -j openclash_output >/dev/null 2>&1 + iptables -t mangle -D PREROUTING -j openclash iptables -t mangle -F openclash >/dev/null 2>&1 iptables -t mangle -X openclash >/dev/null 2>&1 + iptables -t mangle -F openclash_output >/dev/null 2>&1 + iptables -t mangle -X openclash_output >/dev/null 2>&1 #ip6tables -t mangle -D PREROUTING -j MARK --set-mark "$PROXY_FWMARK" >/dev/null 2>&1 @@ -1311,8 +1348,8 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then yml_auth_custom "$CONFIG_FILE" yml_cut "$CHANGE_FILE" "$RULE_FILE" "$DNS_FILE" "$CONFIG_FILE" "$PROXY_FILE" "$PROXY_PROVIDER_FILE" "$GROUP_FILE" yml_dns_custom "$enable_custom_dns" "$DNS_FILE" - sh /usr/share/openclash/yml_change.sh >/dev/null 2>&1 "$LOGTIME" "$en_mode" "$enable_custom_dns" "$da_password" "$cn_port" "$proxy_port" "$CHANGE_FILE" "$ipv6_enable" "$http_port" "$socks_port" "$lan_ip" "$log_level" "$proxy_mode" "$intranet_allowed" "$en_mode_tun" "$stack_type" & - sh /usr/share/openclash/yml_rules_change.sh >/dev/null 2>&1 "$LOGTIME" "$rule_source" "$enable_custom_clash_rules" "$RULE_FILE" "$set_rule_file" "$en_mode" "$enable_rule_proxy" "$BACKUP_FILE" "$RULE_PROVIDER_FILE" & + /usr/share/openclash/yml_change.sh >/dev/null 2>&1 "$LOGTIME" "$en_mode" "$enable_custom_dns" "$da_password" "$cn_port" "$proxy_port" "$CHANGE_FILE" "$ipv6_enable" "$http_port" "$socks_port" "$lan_ip" "$log_level" "$proxy_mode" "$intranet_allowed" "$en_mode_tun" "$stack_type" & + /usr/share/openclash/yml_rules_change.sh >/dev/null 2>&1 "$LOGTIME" "$rule_source" "$enable_custom_clash_rules" "$RULE_FILE" "$set_rule_file" "$en_mode" "$enable_rule_proxy" "$BACKUP_FILE" "$RULE_PROVIDER_FILE" & wait yml_provider_path "$PROXY_PROVIDER_FILE" "proxy_provider" yml_provider_path "$RULE_PROVIDER_FILE" "rule_provider" diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml b/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml index 9bfe12a74b..4b139049ac 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua.yaml @@ -1,1181 +1,71 @@ +rule-providers: +# name: # Provider 名称 +# type: http # http 或 file +# behavior: classical # 或 ipcidr、domain +# path: # 文件路径 +# url: # 只有当类型为 HTTP 时才可用，您不需要在本地空间中创建新文件。 +# interval: # 自动更新间隔，仅在类型为 HTTP 时可用 + + Unbreak: + type: http + behavior: classical + path: ./RuleSet/Unbreak.yaml + url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/Unbreak.yaml + interval: 86400 + + Streaming: + type: http + behavior: classical + path: ./RuleSet/StreamingMedia/Streaming.yaml + url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Streaming.yaml + interval: 86400 + + StreamingSE: + type: http + behavior: classical + path: ./RuleSet/StreamingMedia/StreamingSE.yaml + url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/StreamingSE.yaml + interval: 86400 + + Global: + type: http + behavior: classical + path: ./RuleSet/Global.yaml + url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/Global.yaml + interval: 86400 + + China: + type: http + behavior: classical + path: ./RuleSet/China.yaml + url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/China.yaml + interval: 86400 + + ChinaIP: + type: http + behavior: ipcidr + path: ./RuleSet/Extra/ChinaIP.yaml + url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/Extra/ChinaIP.yaml + interval: 86400 + +# 规则 rules: -##source:ConnersHua # Unbreak - - DOMAIN-SUFFIX,googletraveladservices.com,DIRECT - - DOMAIN,dl.google.com,DIRECT - - DOMAIN,mtalk.google.com,DIRECT + - RULE-SET,Unbreak,DIRECT # Global Area Network - # Streaming Media - # (Podcast) - # > Himalaya - # USER-AGENT,Himalaya*,GlobalMedia - - DOMAIN-SUFFIX,himalaya.com,GlobalMedia - # (Music) - # > Deezer - # USER-AGENT,Deezer*,GlobalMedia - - DOMAIN-SUFFIX,deezer.com,GlobalMedia - - DOMAIN-SUFFIX,dzcdn.net,GlobalMedia - # > JOOX - # USER-AGENT,JOOX*,GlobalMedia - # USER-AGENT,WeMusic*,GlobalMedia - - DOMAIN-SUFFIX,joox.com,GlobalMedia - - DOMAIN-KEYWORD,jooxweb-api,GlobalMedia - # > KKBOX - - DOMAIN-SUFFIX,kkbox.com,GlobalMedia - - DOMAIN-SUFFIX,kkbox.com.tw,GlobalMedia - - DOMAIN-SUFFIX,kfs.io,GlobalMedia - # > Pandora - # USER-AGENT,Pandora*,GlobalMedia - - DOMAIN-SUFFIX,pandora.com,GlobalMedia - # > SoundCloud - # USER-AGENT,SoundCloud*,GlobalMedia - - DOMAIN-SUFFIX,p-cdn.us,GlobalMedia - - DOMAIN-SUFFIX,sndcdn.com,GlobalMedia - - DOMAIN-SUFFIX,soundcloud.com,GlobalMedia - # > Spotify - # USER-AGENT,Spotify*,GlobalMedia - - DOMAIN-SUFFIX,pscdn.co,GlobalMedia - - DOMAIN-SUFFIX,scdn.co,GlobalMedia - - DOMAIN-SUFFIX,spotify.com,GlobalMedia - - DOMAIN-SUFFIX,spoti.fi,GlobalMedia - - DOMAIN-KEYWORD,spotify.com,GlobalMedia - - DOMAIN-KEYWORD,-spotify-com,GlobalMedia - # > TIDAL - # USER-AGENT,TIDAL*,GlobalMedia - - DOMAIN-SUFFIX,tidal.com,GlobalMedia - # > YouTubeMusic - # USER-AGENT,com.google.ios.youtubemusic*,GlobalMedia - # USER-AGENT,YouTubeMusic*,GlobalMedia -# (Video) - # > AbemaTV - # USER-AGENT,AbemaTV*,GlobalMedia - - DOMAIN-SUFFIX,abema.io,GlobalMedia - - DOMAIN-SUFFIX,abema.tv,GlobalMedia - - DOMAIN-SUFFIX,ameba.jp,GlobalMedia - - DOMAIN-SUFFIX,hayabusa.io,GlobalMedia - - DOMAIN-KEYWORD,abematv.akamaized.net,GlobalMedia - # > All 4 - # USER-AGENT,All4*,GlobalMedia - - DOMAIN-SUFFIX,c4assets.com,GlobalMedia - - DOMAIN-SUFFIX,channel4.com,GlobalMedia - # > Amazon Prime Video - # USER-AGENT,InstantVideo.US*,GlobalMedia - # USER-AGENT,Prime%20Video*,GlobalMedia - - DOMAIN-SUFFIX,aiv-cdn.net,GlobalMedia - - DOMAIN-SUFFIX,aiv-delivery.net,GlobalMedia - - DOMAIN-SUFFIX,amazonvideo.com,GlobalMedia - - DOMAIN-SUFFIX,primevideo.com,GlobalMedia - - DOMAIN,avodmp4s3ww-a.akamaihd.net,GlobalMedia - - DOMAIN,d25xi40x97liuc.cloudfront.net,GlobalMedia - - DOMAIN,dmqdd6hw24ucf.cloudfront.net,GlobalMedia - - DOMAIN,dmqdd6hw24ucf.cloudfront.net,GlobalMedia - - DOMAIN,d22qjgkvxw22r6.cloudfront.net,GlobalMedia - - DOMAIN,d1v5ir2lpwr8os.cloudfront.net,GlobalMedia - - DOMAIN-KEYWORD,avoddashs,GlobalMedia - # > Apple TV - - DOMAIN-SUFFIX,tv.apple.com,GlobalMedia - - DOMAIN,hls.itunes.apple.com,GlobalMedia - - DOMAIN,hls-amt.itunes.apple.com,GlobalMedia - - DOMAIN,play-edge.itunes.apple.com,GlobalMedia - # > Bahamut - # USER-AGENT,Anime*,GlobalMedia - - DOMAIN-SUFFIX,bahamut.com.tw,GlobalMedia - - DOMAIN-SUFFIX,gamer.com.tw,GlobalMedia - - DOMAIN,gamer-cds.cdn.hinet.net,GlobalMedia - - DOMAIN,gamer2-cds.cdn.hinet.net,GlobalMedia - # > BBC iPlayer - # USER-AGENT,BBCiPlayer*,GlobalMedia - - DOMAIN-SUFFIX,bbc.co.uk,GlobalMedia - - DOMAIN-SUFFIX,bbci.co.uk,GlobalMedia - - DOMAIN-KEYWORD,bbcfmt,GlobalMedia - - DOMAIN-KEYWORD,uk-live,GlobalMedia - # > DAZN - # USER-AGENT,DAZN*,GlobalMedia - - DOMAIN-SUFFIX,dazn.com,GlobalMedia - - DOMAIN-SUFFIX,dazn-api.com,GlobalMedia - - DOMAIN,d151l6v8er5bdm.cloudfront.net,GlobalMedia - - DOMAIN-KEYWORD,voddazn,GlobalMedia - # > Disney+ - # USER-AGENT,Disney+*,GlobalMedia - - DOMAIN-SUFFIX,disney-plus.net,GlobalMedia - - DOMAIN-SUFFIX,disneyplus.com,GlobalMedia - - DOMAIN-SUFFIX,dssott.com,GlobalMedia - - DOMAIN,cdn.registerdisney.go.com,GlobalMedia - - DOMAIN,global.edge.bamgrid.com,GlobalMedia - # > encoreTVB - # USER-AGENT,encoreTVB*,GlobalMedia - - DOMAIN-SUFFIX,encoretvb.com,GlobalMedia - - DOMAIN,edge.api.brightcove.com,GlobalMedia - - DOMAIN,bcbolt446c5271-a.akamaihd.net,GlobalMedia - # > FOX NOW - # USER-AGENT,FOX%20NOW*,GlobalMedia - - DOMAIN-SUFFIX,fox.com,GlobalMedia - - DOMAIN-SUFFIX,foxdcg.com,GlobalMedia - - DOMAIN-SUFFIX,theplatform.com,GlobalMedia - - DOMAIN-SUFFIX,uplynk.com,GlobalMedia - # > FOX+ - - DOMAIN-SUFFIX,foxplus.com,GlobalMedia -# - DOMAIN-SUFFIX,theplatform.com,GlobalMedia - - DOMAIN,cdn-fox-networks-group-green.akamaized.net,GlobalMedia - - DOMAIN,d3cv4a9a9wh0bt.cloudfront.net,GlobalMedia - - DOMAIN,foxsports01-i.akamaihd.net,GlobalMedia - - DOMAIN,foxsports02-i.akamaihd.net,GlobalMedia - - DOMAIN,foxsports03-i.akamaihd.net,GlobalMedia - - DOMAIN,staticasiafox.akamaized.net,GlobalMedia - # > HBO NOW & Max - # USER-AGENT,HBO%20NOW*,GlobalMedia - - DOMAIN-SUFFIX,hbo.com,GlobalMedia - - DOMAIN-SUFFIX,hbogo.com,GlobalMedia - - DOMAIN-SUFFIX,hbonow.com,GlobalMedia - # USER-AGENT,HBOMAX*,GlobalMedia - - DOMAIN-SUFFIX,hbomax.com,GlobalMedia - # > HBO GO HKG - # USER-AGENT,HBO%20GO%20PROD%20HKG*,GlobalMedia - - DOMAIN-SUFFIX,hbogoasia.com,GlobalMedia - - DOMAIN-SUFFIX,hbogoasia.hk,GlobalMedia - - DOMAIN,bcbolthboa-a.akamaihd.net,GlobalMedia - - DOMAIN,players.brightcove.net,GlobalMedia - - DOMAIN,s3-ap-southeast-1.amazonaws.com,GlobalMedia - - DOMAIN,dai3fd1oh325y.cloudfront.net,GlobalMedia - - DOMAIN,44wilhpljf.execute-api.ap-southeast-1.amazonaws.com,GlobalMedia - - DOMAIN,hboasia1-i.akamaihd.net,GlobalMedia - - DOMAIN,hboasia2-i.akamaihd.net,GlobalMedia - - DOMAIN,hboasia3-i.akamaihd.net,GlobalMedia - - DOMAIN,hboasia4-i.akamaihd.net,GlobalMedia - - DOMAIN,hboasia5-i.akamaihd.net,GlobalMedia - - DOMAIN,cf-images.ap-southeast-1.prod.boltdns.net,GlobalMedia - # > 华文电视 - # USER-AGENT,HWTVMobile*,GlobalMedia - - DOMAIN-SUFFIX,5itv.tv,GlobalMedia - - DOMAIN-SUFFIX,ocnttv.com,GlobalMedia - # > Hulu - - DOMAIN-SUFFIX,hulu.com,GlobalMedia - - DOMAIN-SUFFIX,huluim.com,GlobalMedia - - DOMAIN-SUFFIX,hulustream.com,GlobalMedia - # > Hulu / フールー - - DOMAIN-SUFFIX,happyon.jp,GlobalMedia - - DOMAIN-SUFFIX,hulu.jp,GlobalMedia - # > ITV - # USER-AGENT,ITV_Player*,GlobalMedia - - DOMAIN-SUFFIX,itv.com,GlobalMedia - - DOMAIN-SUFFIX,itvstatic.com,GlobalMedia - - DOMAIN,itvpnpmobile-a.akamaihd.net,GlobalMedia - # > KKTV - # USER-AGENT,KKTV*,GlobalMedia - # USER-AGENT,com.kktv.ios.kktv*,GlobalMedia - - DOMAIN-SUFFIX,kktv.com.tw,GlobalMedia - - DOMAIN-SUFFIX,kktv.me,GlobalMedia - - DOMAIN,kktv-theater.kk.stream,GlobalMedia - # > LINE TV - # USER-AGENT,LINE%20TV*,GlobalMedia - - DOMAIN-SUFFIX,linetv.tw,GlobalMedia - - DOMAIN,d3c7rimkq79yfu.cloudfront.net,GlobalMedia - # > LiTV - - DOMAIN-SUFFIX,litv.tv,GlobalMedia - - DOMAIN,litvfreemobile-hichannel.cdn.hinet.net,GlobalMedia - # > My5 - # USER-AGENT,My5*,GlobalMedia - - DOMAIN-SUFFIX,channel5.com,GlobalMedia - - DOMAIN-SUFFIX,my5.tv,GlobalMedia - - DOMAIN,d349g9zuie06uo.cloudfront.net,GlobalMedia - # > myTV SUPER - # USER-AGENT,mytv*,GlobalMedia - - DOMAIN-SUFFIX,mytvsuper.com,GlobalMedia - - DOMAIN-SUFFIX,tvb.com,GlobalMedia - # > Netflix - # USER-AGENT,Argo*,GlobalMedia - - DOMAIN-SUFFIX,netflix.com,GlobalMedia - - DOMAIN-SUFFIX,netflix.net,GlobalMedia - - DOMAIN-SUFFIX,nflxext.com,GlobalMedia - - DOMAIN-SUFFIX,nflximg.com,GlobalMedia - - DOMAIN-SUFFIX,nflximg.net,GlobalMedia - - DOMAIN-SUFFIX,nflxso.net,GlobalMedia - - DOMAIN-SUFFIX,nflxvideo.net,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest0.com,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest1.com,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest2.com,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest3.com,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest4.com,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest5.com,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest6.com,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest7.com,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest8.com,GlobalMedia - - DOMAIN-SUFFIX,netflixdnstest9.com,GlobalMedia - - IP-CIDR,23.246.0.0/18,GlobalMedia,no-resolve - - IP-CIDR,37.77.184.0/21,GlobalMedia,no-resolve - - IP-CIDR,45.57.0.0/17,GlobalMedia,no-resolve - - IP-CIDR,64.120.128.0/17,GlobalMedia,no-resolve - - IP-CIDR,66.197.128.0/17,GlobalMedia,no-resolve - - IP-CIDR,108.175.32.0/20,GlobalMedia,no-resolve - - IP-CIDR,192.173.64.0/18,GlobalMedia,no-resolve - - IP-CIDR,198.38.96.0/19,GlobalMedia,no-resolve - - IP-CIDR,198.45.48.0/20,GlobalMedia,no-resolve - # > niconico - # USER-AGENT,Niconico*,GlobalMedia - - DOMAIN-SUFFIX,dmc.nico,GlobalMedia - - DOMAIN-SUFFIX,nicovideo.jp,GlobalMedia - - DOMAIN-SUFFIX,nimg.jp,GlobalMedia - - DOMAIN-SUFFIX,socdm.com,GlobalMedia - # > Now E - - DOMAIN-SUFFIX,nowe.com,GlobalMedia - - DOMAIN-SUFFIX,nowestatic.com,GlobalMedia - # > PBS - # USER-AGENT,PBS*,GlobalMedia - - DOMAIN-SUFFIX,pbs.org,GlobalMedia - # > Pornhub - - DOMAIN-SUFFIX,phncdn.com,GlobalMedia - - DOMAIN-SUFFIX,phprcdn.com,GlobalMedia - - DOMAIN-SUFFIX,pornhub.com,GlobalMedia - - DOMAIN-SUFFIX,pornhubpremium.com,GlobalMedia - # > 台湾好 - # USER-AGENT,TaiwanGood*,GlobalMedia - - DOMAIN-SUFFIX,skyking.com.tw,GlobalMedia - - DOMAIN,hamifans.emome.net,GlobalMedia - # > TikTok - # USER-AGENT,TikTok*,GlobalMedia - - DOMAIN-SUFFIX,byteoversea.com,GlobalMedia - - DOMAIN-SUFFIX,ibytedtos.com,GlobalMedia - - DOMAIN-SUFFIX,muscdn.com,GlobalMedia - - DOMAIN-SUFFIX,musical.ly,GlobalMedia - - DOMAIN-SUFFIX,tiktokcdn.com,GlobalMedia - - DOMAIN-SUFFIX,tiktokv.com,GlobalMedia - - DOMAIN-KEYWORD,-tiktokcdn-com,GlobalMedia - # > Twitch - - DOMAIN-SUFFIX,jtvnw.net,GlobalMedia - - DOMAIN-SUFFIX,ttvnw.net,GlobalMedia - - DOMAIN-SUFFIX,twitch.tv,GlobalMedia - - DOMAIN-SUFFIX,twitchcdn.net,GlobalMedia - # > ViuTV - # USER-AGENT,Viu*,GlobalMedia - - DOMAIN-SUFFIX,viu.com,GlobalMedia - - DOMAIN-SUFFIX,viu.tv,GlobalMedia - - DOMAIN,api.viu.now.com,GlobalMedia - - DOMAIN,d1k2us671qcoau.cloudfront.net,GlobalMedia - - DOMAIN,d2anahhhmp1ffz.cloudfront.net,GlobalMedia - - DOMAIN,dfp6rglgjqszk.cloudfront.net,GlobalMedia - # > YouTube - # USER-AGENT,com.google.ios.youtube*,GlobalMedia - # USER-AGENT,YouTube*,GlobalMedia - - DOMAIN-SUFFIX,googlevideo.com,GlobalMedia - - DOMAIN-SUFFIX,youtube.com,GlobalMedia - - DOMAIN,youtubei.googleapis.com,GlobalMedia - # > bilibili - - DOMAIN-SUFFIX,biliapi.net,HKMTMedia - - DOMAIN,api.bilibili.com,HKMTMedia - - DOMAIN,www.bilibili.com,HKMTMedia - - DOMAIN,upos-hz-mirrorakam.akamaized.net,HKMTMedia - # > 愛奇藝台灣站 - - DOMAIN,cache.video.iqiyi.com,HKMTMedia - # > 芒果TV国际 - - DOMAIN-SUFFIX,api.mgtv.com,HKMTMedia - # > WeTV - - DOMAIN-SUFFIX,wetv.vip,HKMTMedia - - DOMAIN-SUFFIX,wetvinfo.com,HKMTMedia + # (Streaming Media) + - RULE-SET,Streaming,Streaming -# (DNS Cache Pollution) - # > Google - - DOMAIN-SUFFIX,appspot.com,PROXY - - DOMAIN-SUFFIX,blogger.com,PROXY - - DOMAIN-SUFFIX,getoutline.org,PROXY - - DOMAIN-SUFFIX,gvt0.com,PROXY - - DOMAIN-SUFFIX,gvt1.com,PROXY - - DOMAIN-SUFFIX,gvt3.com,PROXY - - DOMAIN-SUFFIX,xn--ngstr-lra8j.com,PROXY - - DOMAIN-KEYWORD,google,PROXY - - DOMAIN-KEYWORD,blogspot,PROXY - # > Microsoft - - DOMAIN-SUFFIX,onedrive.live.com,PROXY - - DOMAIN,az416426.vo.msecnd.net,PROXY - - DOMAIN,az668014.vo.msecnd.net,PROXY - # > Facebook - - DOMAIN-SUFFIX,cdninstagram.com,PROXY - - DOMAIN-SUFFIX,fb.com,PROXY - - DOMAIN-SUFFIX,fb.me,PROXY - - DOMAIN-SUFFIX,fbaddins.com,PROXY - - DOMAIN-SUFFIX,fbcdn.net,PROXY - - DOMAIN-SUFFIX,fbsbx.com,PROXY - - DOMAIN-SUFFIX,fbworkmail.com,PROXY - - DOMAIN-SUFFIX,instagram.com,PROXY - - DOMAIN-SUFFIX,m.me,PROXY - - DOMAIN-SUFFIX,messenger.com,PROXY - - DOMAIN-SUFFIX,oculus.com,PROXY - - DOMAIN-SUFFIX,oculuscdn.com,PROXY - - DOMAIN-SUFFIX,rocksdb.org,PROXY - - DOMAIN-SUFFIX,whatsapp.com,PROXY - - DOMAIN-SUFFIX,whatsapp.net,PROXY - - DOMAIN-KEYWORD,facebook,PROXY - # > Twitter - - DOMAIN-SUFFIX,periscope.tv,PROXY - - DOMAIN-SUFFIX,pscp.tv,PROXY - - DOMAIN-SUFFIX,t.co,PROXY - - DOMAIN-SUFFIX,twimg.co,PROXY - - DOMAIN-SUFFIX,twimg.com,PROXY - - DOMAIN-SUFFIX,twitpic.com,PROXY - - DOMAIN-SUFFIX,twitter.com,PROXY - - DOMAIN-SUFFIX,vine.co,PROXY - # > Telegram - - DOMAIN-SUFFIX,telegra.ph,PROXY - - DOMAIN-SUFFIX,telegram.org,PROXY - - IP-CIDR,91.108.4.0/22,PROXY,no-resolve - - IP-CIDR,91.108.8.0/22,PROXY,no-resolve - - IP-CIDR,91.108.12.0/22,PROXY,no-resolve - - IP-CIDR,91.108.16.0/22,PROXY,no-resolve - - IP-CIDR,91.108.56.0/22,PROXY,no-resolve - - IP-CIDR,149.154.160.0/20,PROXY,no-resolve - - IP-CIDR,2001:b28:f23d::/48,PROXY,no-resolve - - IP-CIDR,2001:b28:f23f::/48,PROXY,no-resolve - - IP-CIDR,2001:67c:4e8::/48,PROXY,no-resolve - # > Line - - DOMAIN-SUFFIX,line.me,PROXY - - DOMAIN-SUFFIX,line-apps.com,PROXY - - DOMAIN-SUFFIX,line-scdn.net,PROXY - - DOMAIN-SUFFIX,naver.jp,PROXY - - IP-CIDR,103.2.30.0/23,PROXY,no-resolve - - IP-CIDR,125.209.208.0/20,PROXY,no-resolve - - IP-CIDR,147.92.128.0/17,PROXY,no-resolve - - IP-CIDR,203.104.144.0/21,PROXY,no-resolve - # > Akamai - - DOMAIN,a248.e.akamai.net,PROXY - - DOMAIN,a771.dscq.akamai.net,PROXY - # > Amazon CloudFront - - DOMAIN,d3c33hcgiwev3.cloudfront.net,PROXY - # > Others - - DOMAIN-SUFFIX,4shared.com,PROXY - - DOMAIN-SUFFIX,9cache.com,PROXY - - DOMAIN-SUFFIX,9gag.com,PROXY - - DOMAIN-SUFFIX,abc.com,PROXY - - DOMAIN-SUFFIX,abc.net.au,PROXY - - DOMAIN-SUFFIX,abebooks.com,PROXY - - DOMAIN-SUFFIX,amazon.co.jp,PROXY - - DOMAIN-SUFFIX,apigee.com,PROXY - - DOMAIN-SUFFIX,apkcombo.com,PROXY - - DOMAIN-SUFFIX,apk-dl.com,PROXY - - DOMAIN-SUFFIX,apkfind.com,PROXY - - DOMAIN-SUFFIX,apkmirror.com,PROXY - - DOMAIN-SUFFIX,apkmonk.com,PROXY - - DOMAIN-SUFFIX,apkpure.com,PROXY - - DOMAIN-SUFFIX,aptoide.com,PROXY - - DOMAIN-SUFFIX,archive.is,PROXY - - DOMAIN-SUFFIX,archive.org,PROXY - - DOMAIN-SUFFIX,archiveofourown.org,PROXY - - DOMAIN-SUFFIX,arte.tv,PROXY - - DOMAIN-SUFFIX,artstation.com,PROXY - - DOMAIN-SUFFIX,arukas.io,PROXY - - DOMAIN-SUFFIX,ask.com,PROXY - - DOMAIN-SUFFIX,avg.com,PROXY - - DOMAIN-SUFFIX,avgle.com,PROXY - - DOMAIN-SUFFIX,badoo.com,PROXY - - DOMAIN-SUFFIX,bandwagonhost.com,PROXY - - DOMAIN-SUFFIX,bangkokpost.com,PROXY - - DOMAIN-SUFFIX,bbc.com,PROXY - - DOMAIN-SUFFIX,behance.net,PROXY - - DOMAIN-SUFFIX,bibox.com,PROXY - - DOMAIN-SUFFIX,biggo.com.tw,PROXY - - DOMAIN-SUFFIX,binance.com,PROXY - - DOMAIN-SUFFIX,bitcointalk.org,PROXY - - DOMAIN-SUFFIX,bitfinex.com,PROXY - - DOMAIN-SUFFIX,bitmex.com,PROXY - - DOMAIN-SUFFIX,bit-z.com,PROXY - - DOMAIN-SUFFIX,bloglovin.com,PROXY - - DOMAIN-SUFFIX,bloomberg.cn,PROXY - - DOMAIN-SUFFIX,bloomberg.com,PROXY - - DOMAIN-SUFFIX,blubrry.com,PROXY - - DOMAIN-SUFFIX,book.com.tw,PROXY - - DOMAIN-SUFFIX,booklive.jp,PROXY - - DOMAIN-SUFFIX,books.com.tw,PROXY - - DOMAIN-SUFFIX,boslife.net,PROXY - - DOMAIN-SUFFIX,box.com,PROXY - - DOMAIN-SUFFIX,brave.com,PROXY - - DOMAIN-SUFFIX,businessinsider.com,PROXY - - DOMAIN-SUFFIX,buzzfeed.com,PROXY - - DOMAIN-SUFFIX,bwh1.net,PROXY - - DOMAIN-SUFFIX,castbox.fm,PROXY - - DOMAIN-SUFFIX,cbc.ca,PROXY - - DOMAIN-SUFFIX,cdw.com,PROXY - - DOMAIN-SUFFIX,change.org,PROXY - - DOMAIN-SUFFIX,channelnewsasia.com,PROXY - - DOMAIN-SUFFIX,ck101.com,PROXY - - DOMAIN-SUFFIX,clarionproject.org,PROXY - - DOMAIN-SUFFIX,cloudcone.com,PROXY - - DOMAIN-SUFFIX,clyp.it,PROXY - - DOMAIN-SUFFIX,cna.com.tw,PROXY - - DOMAIN-SUFFIX,comparitech.com,PROXY - - DOMAIN-SUFFIX,conoha.jp,PROXY - - DOMAIN-SUFFIX,crucial.com,PROXY - - DOMAIN-SUFFIX,cts.com.tw,PROXY - - DOMAIN-SUFFIX,cw.com.tw,PROXY - - DOMAIN-SUFFIX,cyberctm.com,PROXY - - DOMAIN-SUFFIX,dailymotion.com,PROXY - - DOMAIN-SUFFIX,dailyview.tw,PROXY - - DOMAIN-SUFFIX,daum.net,PROXY - - DOMAIN-SUFFIX,daumcdn.net,PROXY - - DOMAIN-SUFFIX,dcard.tw,PROXY - - DOMAIN-SUFFIX,deadline.com,PROXY - - DOMAIN-SUFFIX,deepdiscount.com,PROXY - - DOMAIN-SUFFIX,depositphotos.com,PROXY - - DOMAIN-SUFFIX,deviantart.com,PROXY - - DOMAIN-SUFFIX,disconnect.me,PROXY - - DOMAIN-SUFFIX,discordapp.com,PROXY - - DOMAIN-SUFFIX,discordapp.net,PROXY - - DOMAIN-SUFFIX,disqus.com,PROXY - - DOMAIN-SUFFIX,dlercloud.com,PROXY - - DOMAIN-SUFFIX,dmhy.org,PROXY - - DOMAIN-SUFFIX,dns2go.com,PROXY - - DOMAIN-SUFFIX,dowjones.com,PROXY - - DOMAIN-SUFFIX,dropbox.com,PROXY - - DOMAIN-SUFFIX,dropboxapi.com,PROXY - - DOMAIN-SUFFIX,dropboxusercontent.com,PROXY - - DOMAIN-SUFFIX,duckduckgo.com,PROXY - - DOMAIN-SUFFIX,duyaoss.com,PROXY - - DOMAIN-SUFFIX,dw.com,PROXY - - DOMAIN-SUFFIX,dynu.com,PROXY - - DOMAIN-SUFFIX,earthcam.com,PROXY - - DOMAIN-SUFFIX,ebookservice.tw,PROXY - - DOMAIN-SUFFIX,economist.com,PROXY - - DOMAIN-SUFFIX,edgecastcdn.net,PROXY - - DOMAIN-SUFFIX,edu,PROXY - - DOMAIN-SUFFIX,edx-cdn.org,PROXY - - DOMAIN-SUFFIX,elpais.com,PROXY - - DOMAIN-SUFFIX,enanyang.my,PROXY - - DOMAIN-SUFFIX,encyclopedia.com,PROXY - - DOMAIN-SUFFIX,esoir.be,PROXY - - DOMAIN-SUFFIX,etherscan.io,PROXY - - DOMAIN-SUFFIX,euronews.com,PROXY - - DOMAIN-SUFFIX,evozi.com,PROXY - - DOMAIN-SUFFIX,exblog.jp,PROXY - - DOMAIN-SUFFIX,feeder.co,PROXY - - DOMAIN-SUFFIX,feedly.com,PROXY - - DOMAIN-SUFFIX,feedx.net,PROXY - - DOMAIN-SUFFIX,firech.at,PROXY - - DOMAIN-SUFFIX,flickr.com,PROXY - - DOMAIN-SUFFIX,flipboard.com,PROXY - - DOMAIN-SUFFIX,flitto.com,PROXY - - DOMAIN-SUFFIX,foreignpolicy.com,PROXY - - DOMAIN-SUFFIX,fortawesome.com,PROXY - - DOMAIN-SUFFIX,freetls.fastly.net,PROXY - - DOMAIN-SUFFIX,friday.tw,PROXY - - DOMAIN-SUFFIX,ft.com,PROXY - - DOMAIN-SUFFIX,ftchinese.com,PROXY - - DOMAIN-SUFFIX,ftimg.net,PROXY - - DOMAIN-SUFFIX,gate.io,PROXY - - DOMAIN-SUFFIX,getlantern.org,PROXY - - DOMAIN-SUFFIX,getsync.com,PROXY - - DOMAIN-SUFFIX,github.com,PROXY - - DOMAIN-SUFFIX,github.io,PROXY - - DOMAIN-SUFFIX,githubusercontent.com,PROXY - - DOMAIN-SUFFIX,globalvoices.org,PROXY - - DOMAIN-SUFFIX,goo.ne.jp,PROXY - - DOMAIN-SUFFIX,goodreads.com,PROXY - - DOMAIN-SUFFIX,gov,PROXY - - DOMAIN-SUFFIX,gov.tw,PROXY - - DOMAIN-SUFFIX,greatfire.org,PROXY - - DOMAIN-SUFFIX,gumroad.com,PROXY - - DOMAIN-SUFFIX,hbg.com,PROXY - - DOMAIN-SUFFIX,heroku.com,PROXY - - DOMAIN-SUFFIX,hightail.com,PROXY - - DOMAIN-SUFFIX,hk01.com,PROXY - - DOMAIN-SUFFIX,hkbf.org,PROXY - - DOMAIN-SUFFIX,hkbookcity.com,PROXY - - DOMAIN-SUFFIX,hkej.com,PROXY - - DOMAIN-SUFFIX,hket.com,PROXY - - DOMAIN-SUFFIX,hootsuite.com,PROXY - - DOMAIN-SUFFIX,hudson.org,PROXY - - DOMAIN-SUFFIX,hyread.com.tw,PROXY - - DOMAIN-SUFFIX,ibtimes.com,PROXY - - DOMAIN-SUFFIX,i-cable.com,PROXY - - DOMAIN-SUFFIX,icij.org,PROXY - - DOMAIN-SUFFIX,icoco.com,PROXY - - DOMAIN-SUFFIX,imgur.com,PROXY - - DOMAIN-SUFFIX,initiummall.com,PROXY - - DOMAIN-SUFFIX,inoreader.com,PROXY - - DOMAIN-SUFFIX,insecam.org,PROXY - - DOMAIN-SUFFIX,ipfs.io,PROXY - - DOMAIN-SUFFIX,issuu.com,PROXY - - DOMAIN-SUFFIX,istockphoto.com,PROXY - - DOMAIN-SUFFIX,japantimes.co.jp,PROXY - - DOMAIN-SUFFIX,jiji.com,PROXY - - DOMAIN-SUFFIX,jinx.com,PROXY - - DOMAIN-SUFFIX,jkforum.net,PROXY - - DOMAIN-SUFFIX,joinmastodon.org,PROXY - - DOMAIN-SUFFIX,justmysocks.net,PROXY - - DOMAIN-SUFFIX,justpaste.it,PROXY - - DOMAIN-SUFFIX,kadokawa.co.jp,PROXY - - DOMAIN-SUFFIX,kakao.com,PROXY - - DOMAIN-SUFFIX,kakaocorp.com,PROXY - - DOMAIN-SUFFIX,kik.com,PROXY - - DOMAIN-SUFFIX,kingkong.com.tw,PROXY - - DOMAIN-SUFFIX,kobo.com,PROXY - - DOMAIN-SUFFIX,kobobooks.com,PROXY - - DOMAIN-SUFFIX,kodingen.com,PROXY - - DOMAIN-SUFFIX,lemonde.fr,PROXY - - DOMAIN-SUFFIX,lepoint.fr,PROXY - - DOMAIN-SUFFIX,lihkg.com,PROXY - - DOMAIN-SUFFIX,limbopro.xyz,PROXY - - DOMAIN-SUFFIX,listennotes.com,PROXY - - DOMAIN-SUFFIX,livestream.com,PROXY - - DOMAIN-SUFFIX,logimg.jp,PROXY - - DOMAIN-SUFFIX,logmein.com,PROXY - - DOMAIN-SUFFIX,mail.ru,PROXY - - DOMAIN-SUFFIX,mailchimp.com,PROXY - - DOMAIN-SUFFIX,marc.info,PROXY - - DOMAIN-SUFFIX,matters.news,PROXY - - DOMAIN-SUFFIX,maying.co,PROXY - - DOMAIN-SUFFIX,medium.com,PROXY - - DOMAIN-SUFFIX,mega.nz,PROXY - - DOMAIN-SUFFIX,mergersandinquisitions.com,PROXY - - DOMAIN-SUFFIX,mil,PROXY - - DOMAIN-SUFFIX,mingpao.com,PROXY - - DOMAIN-SUFFIX,mixi.jp,PROXY - - DOMAIN-SUFFIX,mobile01.com,PROXY - - DOMAIN-SUFFIX,mubi.com,PROXY - - DOMAIN-SUFFIX,myspace.com,PROXY - - DOMAIN-SUFFIX,myspacecdn.com,PROXY - - DOMAIN-SUFFIX,nanyang.com,PROXY - - DOMAIN-SUFFIX,nationalinterest.org,PROXY - - DOMAIN-SUFFIX,naver.com,PROXY - - DOMAIN-SUFFIX,neowin.net,PROXY - - DOMAIN-SUFFIX,newstapa.org,PROXY - - DOMAIN-SUFFIX,nexitally.com,PROXY - - DOMAIN-SUFFIX,nhk.or.jp,PROXY - - DOMAIN-SUFFIX,nii.ac.jp,PROXY - - DOMAIN-SUFFIX,nikkei.com,PROXY - - DOMAIN-SUFFIX,nofile.io,PROXY - - DOMAIN-SUFFIX,notion.so,PROXY - - DOMAIN-SUFFIX,now.com,PROXY - - DOMAIN-SUFFIX,nrk.no,PROXY - - DOMAIN-SUFFIX,nuget.org,PROXY - - DOMAIN-SUFFIX,nyaa.si,PROXY - - DOMAIN-SUFFIX,nyaa.si,PROXY - - DOMAIN-SUFFIX,nyt.com,PROXY - - DOMAIN-SUFFIX,nytchina.com,PROXY - - DOMAIN-SUFFIX,nytcn.me,PROXY - - DOMAIN-SUFFIX,nytco.com,PROXY - - DOMAIN-SUFFIX,nytimes.com,PROXY - - DOMAIN-SUFFIX,nytimg.com,PROXY - - DOMAIN-SUFFIX,nytlog.com,PROXY - - DOMAIN-SUFFIX,nytstyle.com,PROXY - - DOMAIN-SUFFIX,ok.ru,PROXY - - DOMAIN-SUFFIX,okex.com,PROXY - - DOMAIN-SUFFIX,on.cc,PROXY - - DOMAIN-SUFFIX,orientaldaily.com.my,PROXY - - DOMAIN-SUFFIX,overcast.fm,PROXY - - DOMAIN-SUFFIX,paltalk.com,PROXY - - DOMAIN-SUFFIX,parsevideo.com,PROXY - - DOMAIN-SUFFIX,pawoo.net,PROXY - - DOMAIN-SUFFIX,pbxes.com,PROXY - - DOMAIN-SUFFIX,pcdvd.com.tw,PROXY - - DOMAIN-SUFFIX,pchome.com.tw,PROXY - - DOMAIN-SUFFIX,pcloud.com,PROXY - - DOMAIN-SUFFIX,picacomic.com,PROXY - - DOMAIN-SUFFIX,pinimg.com,PROXY - - DOMAIN-SUFFIX,pixiv.net,PROXY - - DOMAIN-SUFFIX,player.fm,PROXY - - DOMAIN-SUFFIX,plurk.com,PROXY - - DOMAIN-SUFFIX,po18.tw,PROXY - - DOMAIN-SUFFIX,potato.im,PROXY - - DOMAIN-SUFFIX,potatso.com,PROXY - - DOMAIN-SUFFIX,prism-break.org,PROXY - - DOMAIN-SUFFIX,proxifier.com,PROXY - - DOMAIN-SUFFIX,pt.im,PROXY - - DOMAIN-SUFFIX,pts.org.tw,PROXY - - DOMAIN-SUFFIX,pubu.com.tw,PROXY - - DOMAIN-SUFFIX,pubu.tw,PROXY - - DOMAIN-SUFFIX,pureapk.com,PROXY - - DOMAIN-SUFFIX,quora.com,PROXY - - DOMAIN-SUFFIX,quoracdn.net,PROXY - - DOMAIN-SUFFIX,qz.com,PROXY - - DOMAIN-SUFFIX,rakuten.co.jp,PROXY - - DOMAIN-SUFFIX,rarbgprx.org,PROXY - - DOMAIN-SUFFIX,readingtimes.com.tw,PROXY - - DOMAIN-SUFFIX,readmoo.com,PROXY - - DOMAIN-SUFFIX,redbubble.com,PROXY - - DOMAIN-SUFFIX,redd.it,PROXY - - DOMAIN-SUFFIX,reddit.com,PROXY - - DOMAIN-SUFFIX,redditmedia.com,PROXY - - DOMAIN-SUFFIX,resilio.com,PROXY - - DOMAIN-SUFFIX,reuters.com,PROXY - - DOMAIN-SUFFIX,reutersmedia.net,PROXY - - DOMAIN-SUFFIX,rfi.fr,PROXY - - DOMAIN-SUFFIX,rixcloud.com,PROXY - - DOMAIN-SUFFIX,roadshow.hk,PROXY - - DOMAIN-SUFFIX,rsshub.app,PROXY - - DOMAIN-SUFFIX,scmp.com,PROXY - - DOMAIN-SUFFIX,scribd.com,PROXY - - DOMAIN-SUFFIX,seatguru.com,PROXY - - DOMAIN-SUFFIX,shadowsocks.org,PROXY - - DOMAIN-SUFFIX,shindanmaker.com,PROXY - - DOMAIN-SUFFIX,shopee.tw,PROXY - - DOMAIN-SUFFIX,slideshare.net,PROXY - - DOMAIN-SUFFIX,softfamous.com,PROXY - - DOMAIN-SUFFIX,ssrcloud.org,PROXY - - DOMAIN-SUFFIX,startpage.com,PROXY - - DOMAIN-SUFFIX,steamcommunity.com,PROXY - - DOMAIN-SUFFIX,steemit.com,PROXY - - DOMAIN-SUFFIX,steemitwallet.com,PROXY - - DOMAIN-SUFFIX,straitstimes.com,PROXY - - DOMAIN-SUFFIX,streema.com,PROXY - - DOMAIN-SUFFIX,t66y.com,PROXY - - DOMAIN-SUFFIX,tapatalk.com,PROXY - - DOMAIN-SUFFIX,teco-hk.org,PROXY - - DOMAIN-SUFFIX,teco-mo.org,PROXY - - DOMAIN-SUFFIX,teddysun.com,PROXY - - DOMAIN-SUFFIX,textnow.me,PROXY - - DOMAIN-SUFFIX,theguardian.com,PROXY - - DOMAIN-SUFFIX,theinitium.com,PROXY - - DOMAIN-SUFFIX,themoviedb.org,PROXY - - DOMAIN-SUFFIX,thetvdb.com,PROXY - - DOMAIN-SUFFIX,tineye.com,PROXY - - DOMAIN-SUFFIX,tiny.cc,PROXY - - DOMAIN-SUFFIX,tinyurl.com,PROXY - - DOMAIN-SUFFIX,torproject.org,PROXY - - DOMAIN-SUFFIX,tumblr.com,PROXY - - DOMAIN-SUFFIX,turbobit.net,PROXY - - DOMAIN-SUFFIX,tutanota.com,PROXY - - DOMAIN-SUFFIX,tvboxnow.com,PROXY - - DOMAIN-SUFFIX,udn.com,PROXY - - DOMAIN-SUFFIX,unseen.is,PROXY - - DOMAIN-SUFFIX,upmedia.mg,PROXY - - DOMAIN-SUFFIX,uptodown.com,PROXY - - DOMAIN-SUFFIX,urbandictionary.com,PROXY - - DOMAIN-SUFFIX,ustream.tv,PROXY - - DOMAIN-SUFFIX,uwants.com,PROXY - - DOMAIN-SUFFIX,v2ray.com,PROXY - - DOMAIN-SUFFIX,viber.com,PROXY - - DOMAIN-SUFFIX,videopress.com,PROXY - - DOMAIN-SUFFIX,vimeo.com,PROXY - - DOMAIN-SUFFIX,voachinese.com,PROXY - - DOMAIN-SUFFIX,voanews.com,PROXY - - DOMAIN-SUFFIX,voxer.com,PROXY - - DOMAIN-SUFFIX,vzw.com,PROXY - - DOMAIN-SUFFIX,w3schools.com,PROXY - - DOMAIN-SUFFIX,washingtonpost.com,PROXY - - DOMAIN-SUFFIX,wattpad.com,PROXY - - DOMAIN-SUFFIX,whoer.net,PROXY - - DOMAIN-SUFFIX,wikileaks.org,PROXY - - DOMAIN-SUFFIX,wikimapia.org,PROXY - - DOMAIN-SUFFIX,wikimedia.org,PROXY - - DOMAIN-SUFFIX,wikinews.org,PROXY - - DOMAIN-SUFFIX,wikipedia.org,PROXY - - DOMAIN-SUFFIX,wikiquote.org,PROXY - - DOMAIN-SUFFIX,wikiwand.com,PROXY - - DOMAIN-SUFFIX,winudf.com,PROXY - - DOMAIN-SUFFIX,wire.com,PROXY - - DOMAIN-SUFFIX,wn.com,PROXY - - DOMAIN-SUFFIX,wordpress.com,PROXY - - DOMAIN-SUFFIX,workflow.is,PROXY - - DOMAIN-SUFFIX,worldcat.org,PROXY - - DOMAIN-SUFFIX,wsj.com,PROXY - - DOMAIN-SUFFIX,wsj.net,PROXY - - DOMAIN-SUFFIX,xhamster.com,PROXY - - DOMAIN-SUFFIX,xn--90wwvt03e.com,PROXY - - DOMAIN-SUFFIX,xn--i2ru8q2qg.com,PROXY - - DOMAIN-SUFFIX,xnxx.com,PROXY - - DOMAIN-SUFFIX,xvideos.com,PROXY - - DOMAIN-SUFFIX,yahoo.com,PROXY - - DOMAIN-SUFFIX,yandex.ru,PROXY - - DOMAIN-SUFFIX,ycombinator.com,PROXY - - DOMAIN-SUFFIX,yesasia.com,PROXY - - DOMAIN-SUFFIX,yes-news.com,PROXY - - DOMAIN-SUFFIX,yomiuri.co.jp,PROXY - - DOMAIN-SUFFIX,you-get.org,PROXY - - DOMAIN-SUFFIX,zaobao.com,PROXY - - DOMAIN-SUFFIX,zb.com,PROXY - - DOMAIN-SUFFIX,zello.com,PROXY - - DOMAIN-SUFFIX,zeronet.io,PROXY - - DOMAIN-SUFFIX,zoom.us,PROXY + # (StreamingSE) + - RULE-SET,StreamingSE,StreamingSE - - DOMAIN,cc.tvbs.com.tw,PROXY - - DOMAIN,ocsp.int-x3.letsencrypt.org,PROXY - - DOMAIN,payments-jp.amazon.com,PROXY - - DOMAIN,s3-ap-northeast-1.amazonaws.com,PROXY - - DOMAIN,s3-ap-southeast-2.amazonaws.com,PROXY - - DOMAIN,search.avira.com,PROXY - - - DOMAIN-KEYWORD,jav,PROXY - - DOMAIN-KEYWORD,pinterest,PROXY - - DOMAIN-KEYWORD,porn,PROXY - -# (IP Blackhole) - # > Google - - DOMAIN-SUFFIX,abc.xyz,PROXY - - DOMAIN-SUFFIX,advertisercommunity.com,PROXY - - DOMAIN-SUFFIX,ampproject.org,PROXY - - DOMAIN-SUFFIX,android.com,PROXY - - DOMAIN-SUFFIX,androidify.com,PROXY - - DOMAIN-SUFFIX,dialogflow.com,PROXY - - DOMAIN-SUFFIX,autodraw.com,PROXY - - DOMAIN-SUFFIX,capitalg.com,PROXY - - DOMAIN-SUFFIX,certificate-transparency.org,PROXY - - DOMAIN-SUFFIX,chrome.com,PROXY - - DOMAIN-SUFFIX,chromeexperiments.com,PROXY - - DOMAIN-SUFFIX,chromestatus.com,PROXY - - DOMAIN-SUFFIX,chromium.org,PROXY - - DOMAIN-SUFFIX,creativelab5.com,PROXY - - DOMAIN-SUFFIX,debug.com,PROXY - - DOMAIN-SUFFIX,deepmind.com,PROXY - - DOMAIN-SUFFIX,firebaseio.com,PROXY - - DOMAIN-SUFFIX,getmdl.io,PROXY - - DOMAIN-SUFFIX,ggpht.com,PROXY - - DOMAIN-SUFFIX,gmail.com,PROXY - - DOMAIN-SUFFIX,gmodules.com,PROXY - - DOMAIN-SUFFIX,godoc.org,PROXY - - DOMAIN-SUFFIX,golang.org,PROXY - - DOMAIN-SUFFIX,gstatic.com,PROXY - - DOMAIN-SUFFIX,gv.com,PROXY - - DOMAIN-SUFFIX,gwtproject.org,PROXY - - DOMAIN-SUFFIX,itasoftware.com,PROXY - - DOMAIN-SUFFIX,madewithcode.com,PROXY - - DOMAIN-SUFFIX,material.io,PROXY - - DOMAIN-SUFFIX,page.link,PROXY - - DOMAIN-SUFFIX,polymer-project.org,PROXY - - DOMAIN-SUFFIX,admin.recaptcha.net,PROXY - - DOMAIN-SUFFIX,recaptcha.net,PROXY - - DOMAIN-SUFFIX,shattered.io,PROXY - - DOMAIN-SUFFIX,synergyse.com,PROXY - - DOMAIN-SUFFIX,telephony.goog,PROXY - - DOMAIN-SUFFIX,tensorflow.org,PROXY - - DOMAIN-SUFFIX,tfhub.dev,PROXY - - DOMAIN-SUFFIX,tiltbrush.com,PROXY - - DOMAIN-SUFFIX,waveprotocol.org,PROXY - - DOMAIN-SUFFIX,waymo.com,PROXY - - DOMAIN-SUFFIX,webmproject.org,PROXY - - DOMAIN-SUFFIX,webrtc.org,PROXY - - DOMAIN-SUFFIX,whatbrowser.org,PROXY - - DOMAIN-SUFFIX,widevine.com,PROXY - - DOMAIN-SUFFIX,x.company,PROXY - - DOMAIN-SUFFIX,youtu.be,PROXY - - DOMAIN-SUFFIX,yt.be,PROXY - - DOMAIN-SUFFIX,ytimg.com,PROXY - # > Telegram - - DOMAIN-SUFFIX,t.me,PROXY - - DOMAIN-SUFFIX,tdesktop.com,PROXY - - DOMAIN-SUFFIX,telegram.me,PROXY - - DOMAIN-SUFFIX,telesco.pe,PROXY - # > Others - - DOMAIN-SUFFIX,noxinfluencer.com,PROXY - - DOMAIN-SUFFIX,smartmailcloud.com,PROXY - - DOMAIN-SUFFIX,twitter.jp,PROXY - - DOMAIN-SUFFIX,weebly.com,PROXY - -# (Region-Restricted Access Denied) -# ---(Apple)--- - # > Apple URL Shortener - - DOMAIN-SUFFIX,appsto.re,PROXY - # > iBooks Store download - - DOMAIN,books.itunes.apple.com,PROXY - # > App Store Preview - - DOMAIN,apps.apple.com,PROXY - - DOMAIN,itunes.apple.com,PROXY - # > Spotlight - - DOMAIN,api-glb-sea.smoot.apple.com,PROXY - # > Look Up - - DOMAIN,lookup-api.apple.com,PROXY - - DOMAIN-SUFFIX,smoot.apple.com,PROXY - # > Apple Music Web - - DOMAIN,beta.music.apple.com,PROXY -# ------ - # > Others - - DOMAIN-SUFFIX,bing.com,PROXY - - DOMAIN-SUFFIX,cccat.io,PROXY - - DOMAIN-SUFFIX,ifixit.com,PROXY - - DOMAIN-SUFFIX,mangakakalot.com,PROXY - - DOMAIN-SUFFIX,shopeemobile.com,PROXY - - # (Network Jitter) - # > Fix download or update is stuck in App Store,and when change the Apple ID region,the payment information can be selected by none. - - DOMAIN-KEYWORD,buy.itunes.apple.com,PROXY - # - DOMAIN-SUFFIX,evernote.com,PROXY - - DOMAIN-SUFFIX,inkbunny.net,PROXY - - DOMAIN-SUFFIX,metapix.net,PROXY - - DOMAIN-SUFFIX,s3.amazonaws.com,PROXY - - DOMAIN-SUFFIX,wp.com,PROXY - - DOMAIN-SUFFIX,zaobao.com.sg,PROXY + # (DNS Cache Pollution) / (IP Blackhole) / (Region-Restricted Access Denied) / (Network Jitter) + - RULE-SET,Global,PROXY # China Area Network - # > 360 - - DOMAIN-SUFFIX,qhres.com,DIRECT - - DOMAIN-SUFFIX,qhimg.com,DIRECT - # > Alibaba - # USER-AGENT,%E4%BC%98%E9%85%B7*,DIRECT - - DOMAIN-SUFFIX,alibaba.com,DIRECT - - DOMAIN-SUFFIX,alibabausercontent.com,DIRECT - - DOMAIN-SUFFIX,alicdn.com,DIRECT - - DOMAIN-SUFFIX,alikunlun.com,DIRECT - - DOMAIN-SUFFIX,alipay.com,DIRECT - - DOMAIN-SUFFIX,amap.com,DIRECT - - DOMAIN-SUFFIX,autonavi.com,DIRECT - - DOMAIN-SUFFIX,dingtalk.com,DIRECT - - DOMAIN-SUFFIX,mxhichina.com,DIRECT - - DOMAIN-SUFFIX,soku.com,DIRECT - - DOMAIN-SUFFIX,taobao.com,DIRECT - - DOMAIN-SUFFIX,tmall.com,DIRECT - - DOMAIN-SUFFIX,tmall.hk,DIRECT - - DOMAIN-SUFFIX,ykimg.com,DIRECT - - DOMAIN-SUFFIX,youku.com,DIRECT - - DOMAIN-SUFFIX,xiami.com,DIRECT - - DOMAIN-SUFFIX,xiami.net,DIRECT - # > Apple - - DOMAIN-SUFFIX,aaplimg.com,DIRECT - - DOMAIN-SUFFIX,apple.co,DIRECT - - DOMAIN-SUFFIX,apple.com,DIRECT - - DOMAIN-SUFFIX,apple-cloudkit.com,DIRECT - - DOMAIN-SUFFIX,appstore.com,DIRECT - - DOMAIN-SUFFIX,cdn-apple.com,DIRECT - - DOMAIN-SUFFIX,icloud.com,DIRECT - - DOMAIN-SUFFIX,icloud-content.com,DIRECT - - DOMAIN-SUFFIX,me.com,DIRECT - - DOMAIN-SUFFIX,mzstatic.com,DIRECT - - DOMAIN-KEYWORD,apple.com.akadns.net,DIRECT - - DOMAIN-KEYWORD,icloud.com.akadns.net,DIRECT - # > Baidu - - DOMAIN-SUFFIX,baidu.com,DIRECT - - DOMAIN-SUFFIX,baidubcr.com,DIRECT - - DOMAIN-SUFFIX,bdstatic.com,DIRECT - - DOMAIN-SUFFIX,yunjiasu-cdn.net,DIRECT - # > bilibili - - DOMAIN-SUFFIX,acgvideo.com,DIRECT - - DOMAIN-SUFFIX,biliapi.com,DIRECT - - DOMAIN-SUFFIX,biliapi.net,DIRECT - - DOMAIN-SUFFIX,bilibili.com,DIRECT - - DOMAIN-SUFFIX,bilibili.tv,DIRECT - - DOMAIN-SUFFIX,hdslb.com,DIRECT - # > ByteDance - - DOMAIN-SUFFIX,feiliao.com,DIRECT - - DOMAIN-SUFFIX,pstatp.com,DIRECT - - DOMAIN-SUFFIX,snssdk.com,DIRECT - - DOMAIN-SUFFIX,iesdouyin.com,DIRECT - - DOMAIN-SUFFIX,toutiao.com,DIRECT - # > CCTV - - DOMAIN-SUFFIX,cctv.com,DIRECT - - DOMAIN-SUFFIX,cctvpic.com,DIRECT - - DOMAIN-SUFFIX,livechina.com,DIRECT - # > DiDi - - DOMAIN-SUFFIX,didialift.com,DIRECT - - DOMAIN-SUFFIX,didiglobal.com,DIRECT - - DOMAIN-SUFFIX,udache.com,DIRECT - # > 蛋蛋赞 - - DOMAIN-SUFFIX,343480.com,DIRECT - - DOMAIN-SUFFIX,baduziyuan.com,DIRECT - - DOMAIN-SUFFIX,com-hs-hkdy.com,DIRECT - - DOMAIN-SUFFIX,czybjz.com,DIRECT - - DOMAIN-SUFFIX,dandanzan.com,DIRECT - - DOMAIN-SUFFIX,fjhps.com,DIRECT - - DOMAIN-SUFFIX,kuyunbo.club,DIRECT - - DOMAIN-SUFFIX,youkutv.cc,DIRECT - # > ChinaTelecom - - DOMAIN-SUFFIX,21cn.com,DIRECT - # > HunanTV - - DOMAIN-SUFFIX,hitv.com,DIRECT - - DOMAIN-SUFFIX,mgtv.com,DIRECT - # > iQiyi - - DOMAIN-SUFFIX,iqiyi.com,DIRECT - - DOMAIN-SUFFIX,iqiyipic.com,DIRECT - - DOMAIN-SUFFIX,71.am,DIRECT - # > JD - - DOMAIN-SUFFIX,jd.com,DIRECT - - DOMAIN-SUFFIX,jd.hk,DIRECT - - DOMAIN-SUFFIX,jdpay.com,DIRECT - - DOMAIN-SUFFIX,360buyimg.com,DIRECT - # > Kingsoft - - DOMAIN-SUFFIX,iciba.com,DIRECT - - DOMAIN-SUFFIX,ksosoft.com,DIRECT - # > Meitu - - DOMAIN-SUFFIX,meitu.com,DIRECT - - DOMAIN-SUFFIX,meitudata.com,DIRECT - - DOMAIN-SUFFIX,meitustat.com,DIRECT - - DOMAIN-SUFFIX,meipai.com,DIRECT - # > MI - - DOMAIN-SUFFIX,duokan.com,DIRECT - - DOMAIN-SUFFIX,mi.com,DIRECT - - DOMAIN-SUFFIX,mi-img.com,DIRECT - - DOMAIN-SUFFIX,miui.com,DIRECT - - DOMAIN-SUFFIX,miwifi.com,DIRECT - - DOMAIN-SUFFIX,xiaomi.com,DIRECT - - DOMAIN-SUFFIX,xiaomi.net,DIRECT - # > Microsoft - - DOMAIN-SUFFIX,microsoft.com,DIRECT - - DOMAIN-SUFFIX,msecnd.net,DIRECT - - DOMAIN-SUFFIX,office365.com,DIRECT - - DOMAIN-SUFFIX,outlook.com,DIRECT - - DOMAIN-SUFFIX,s-microsoft.com,DIRECT - - DOMAIN-SUFFIX,visualstudio.com,DIRECT - - DOMAIN-SUFFIX,windows.com,DIRECT - - DOMAIN-SUFFIX,windowsupdate.com,DIRECT -# - DOMAIN-KEYWORD,-microsoft-com.akamaized.net,DIRECT - # > NetEase - # USER-AGENT,NeteaseMusic*,DIRECT - # USER-AGENT,%E7%BD%91%E6%98%93%E4%BA%91%E9%9F%B3%E4%B9%90*,DIRECT - - DOMAIN-SUFFIX,163.com,DIRECT - - DOMAIN-SUFFIX,126.com,DIRECT - - DOMAIN-SUFFIX,126.net,DIRECT - - DOMAIN-SUFFIX,127.net,DIRECT - - DOMAIN-SUFFIX,163yun.com,DIRECT - - DOMAIN-SUFFIX,lofter.com,DIRECT - - DOMAIN-SUFFIX,netease.com,DIRECT - - DOMAIN-SUFFIX,ydstatic.com,DIRECT - # > PayPal - # USER-AGENT,PayPal*,DIRECT - - DOMAIN-SUFFIX,paypal.com,DIRECT - - DOMAIN-SUFFIX,paypal.me,DIRECT - - DOMAIN-SUFFIX,paypalobjects.com,DIRECT - # > Sina - - DOMAIN-SUFFIX,sina.com,DIRECT - - DOMAIN-SUFFIX,weibo.com,DIRECT - - DOMAIN-SUFFIX,weibocdn.com,DIRECT - # > Sohu - - DOMAIN-SUFFIX,sohu.com,DIRECT - - DOMAIN-SUFFIX,sohucs.com,DIRECT - - DOMAIN-SUFFIX,sohu-inc.com,DIRECT - - DOMAIN-SUFFIX,v-56.com,DIRECT - # > Sogo - - DOMAIN-SUFFIX,sogo.com,DIRECT - - DOMAIN-SUFFIX,sogou.com,DIRECT - - DOMAIN-SUFFIX,sogoucdn.com,DIRECT - # > Tencent - # USER-AGENT,MicroMessenger%20Client,DIRECT - # USER-AGENT,WeChat*,DIRECT - # USER-AGENT,%E4%BC%81%E4%B8%9A%E5%BE%AE%E4%BF%A1*,DIRECT - - DOMAIN-SUFFIX,gtimg.com,DIRECT - - DOMAIN-SUFFIX,idqqimg.com,DIRECT - - DOMAIN-SUFFIX,igamecj.com,DIRECT - - DOMAIN-SUFFIX,myapp.com,DIRECT - - DOMAIN-SUFFIX,myqcloud.com,DIRECT - - DOMAIN-SUFFIX,qq.com,DIRECT - - DOMAIN-SUFFIX,qqmail.com,DIRECT - - DOMAIN-SUFFIX,servicewechat.com,DIRECT - - DOMAIN-SUFFIX,tencent.com,DIRECT - - DOMAIN-SUFFIX,tencent-cloud.net,DIRECT - - DOMAIN-SUFFIX,tenpay.com,DIRECT - - DOMAIN-SUFFIX,wechat.com,DIRECT - - DOMAIN,file-igamecj.akamaized.net,DIRECT - # > Content Delivery Network - - DOMAIN-SUFFIX,ccgslb.com,DIRECT - - DOMAIN-SUFFIX,ccgslb.net,DIRECT - - DOMAIN-SUFFIX,chinanetcenter.com,DIRECT - - DOMAIN-SUFFIX,meixincdn.com,DIRECT - - DOMAIN-SUFFIX,ourdvs.com,DIRECT - - DOMAIN-SUFFIX,staticdn.net,DIRECT - - DOMAIN-SUFFIX,wangsu.com,DIRECT - # > IP Query - - DOMAIN-SUFFIX,ipip.net,DIRECT - - DOMAIN-SUFFIX,ip.la,DIRECT - - DOMAIN-SUFFIX,ip.sb,DIRECT - - DOMAIN-SUFFIX,ip-cdn.com,DIRECT - - DOMAIN-SUFFIX,ipv6-test.com,DIRECT - - DOMAIN-SUFFIX,test-ipv6.com,DIRECT - - DOMAIN-SUFFIX,whatismyip.com,DIRECT - - DOMAIN,ip.istatmenus.app,DIRECT - # > Speed Test - # - DOMAIN-SUFFIX,speedtest.net,DIRECT - - DOMAIN-SUFFIX,netspeedtestmaster.com,DIRECT - - DOMAIN,speedtest.macpaw.com,DIRECT - # > Private Tracker - - DOMAIN-SUFFIX,animebytes.tv,DIRECT - - DOMAIN-SUFFIX,awesome-hd.me,DIRECT - - DOMAIN-SUFFIX,broadcasthe.net,DIRECT - - DOMAIN-SUFFIX,chdbits.co,DIRECT - - DOMAIN-SUFFIX,classix-unlimited.co.uk,DIRECT - - DOMAIN-SUFFIX,empornium.me,DIRECT - - DOMAIN-SUFFIX,gazellegames.net,DIRECT - - DOMAIN-SUFFIX,hdchina.org,DIRECT - - DOMAIN-SUFFIX,hdsky.me,DIRECT - - DOMAIN-SUFFIX,hdhome.org,DIRECT - - DOMAIN-SUFFIX,hdbits.org,DIRECT - - DOMAIN-SUFFIX,icetorrent.org,DIRECT - - DOMAIN-SUFFIX,jpopsuki.eu,DIRECT - - DOMAIN-SUFFIX,keepfrds.com,DIRECT - - DOMAIN-SUFFIX,madsrevolution.net,DIRECT - - DOMAIN-SUFFIX,myanonamouse.net,DIRECT - - DOMAIN-SUFFIX,m-team.cc,DIRECT - - DOMAIN-SUFFIX,morethan.tv,DIRECT - - DOMAIN-SUFFIX,nanyangpt.com,DIRECT - - DOMAIN-SUFFIX,ncore.cc,DIRECT - - DOMAIN-SUFFIX,open.cd,DIRECT - - DOMAIN-SUFFIX,ourbits.club,DIRECT - - DOMAIN-SUFFIX,passthepopcorn.me,DIRECT - - DOMAIN-SUFFIX,privatehd.to,DIRECT - - DOMAIN-SUFFIX,pterclub.com,DIRECT - - DOMAIN-SUFFIX,redacted.ch,DIRECT - - DOMAIN-SUFFIX,springsunday.net,DIRECT - - DOMAIN-SUFFIX,tjupt.org,DIRECT - - DOMAIN-SUFFIX,totheglory.im,DIRECT - # > Scholar - - DOMAIN-SUFFIX,acm.org,DIRECT - - DOMAIN-SUFFIX,acs.org,DIRECT - - DOMAIN-SUFFIX,aip.org,DIRECT - - DOMAIN-SUFFIX,ams.org,DIRECT - - DOMAIN-SUFFIX,annualreviews.org,DIRECT - - DOMAIN-SUFFIX,aps.org,DIRECT - - DOMAIN-SUFFIX,ascelibrary.org,DIRECT - - DOMAIN-SUFFIX,asm.org,DIRECT - - DOMAIN-SUFFIX,asme.org,DIRECT - - DOMAIN-SUFFIX,astm.org,DIRECT - - DOMAIN-SUFFIX,bmj.com,DIRECT - - DOMAIN-SUFFIX,cambridge.org,DIRECT - - DOMAIN-SUFFIX,cas.org,DIRECT - - DOMAIN-SUFFIX,clarivate.com,DIRECT - - DOMAIN-SUFFIX,ebscohost.com,DIRECT - - DOMAIN-SUFFIX,emerald.com,DIRECT - - DOMAIN-SUFFIX,engineeringvillage.com,DIRECT - - DOMAIN-SUFFIX,icevirtuallibrary.com,DIRECT - - DOMAIN-SUFFIX,ieee.org,DIRECT - - DOMAIN-SUFFIX,imf.org,DIRECT - - DOMAIN-SUFFIX,iop.org,DIRECT - - DOMAIN-SUFFIX,jamanetwork.com,DIRECT - - DOMAIN-SUFFIX,jhu.edu,DIRECT - - DOMAIN-SUFFIX,jstor.org,DIRECT - - DOMAIN-SUFFIX,karger.com,DIRECT - - DOMAIN-SUFFIX,libguides.com,DIRECT - - DOMAIN-SUFFIX,madsrevolution.net,DIRECT - - DOMAIN-SUFFIX,mpg.de,DIRECT - - DOMAIN-SUFFIX,myilibrary.com,DIRECT - - DOMAIN-SUFFIX,nature.com,DIRECT - - DOMAIN-SUFFIX,oecd-ilibrary.org,DIRECT - - DOMAIN-SUFFIX,osapublishing.org,DIRECT - - DOMAIN-SUFFIX,oup.com,DIRECT - - DOMAIN-SUFFIX,ovid.com,DIRECT - - DOMAIN-SUFFIX,oxfordartonline.com,DIRECT - - DOMAIN-SUFFIX,oxfordbibliographies.com,DIRECT - - DOMAIN-SUFFIX,oxfordmusiconline.com,DIRECT - - DOMAIN-SUFFIX,pnas.org,DIRECT - - DOMAIN-SUFFIX,proquest.com,DIRECT - - DOMAIN-SUFFIX,rsc.org,DIRECT - - DOMAIN-SUFFIX,sagepub.com,DIRECT - - DOMAIN-SUFFIX,sciencedirect.com,DIRECT - - DOMAIN-SUFFIX,sciencemag.org,DIRECT - - DOMAIN-SUFFIX,scopus.com,DIRECT - - DOMAIN-SUFFIX,siam.org,DIRECT - - DOMAIN-SUFFIX,spiedigitallibrary.org,DIRECT - - DOMAIN-SUFFIX,springer.com,DIRECT - - DOMAIN-SUFFIX,springerlink.com,DIRECT - - DOMAIN-SUFFIX,tandfonline.com,DIRECT - - DOMAIN-SUFFIX,un.org,DIRECT - - DOMAIN-SUFFIX,uni-bielefeld.de,DIRECT - - DOMAIN-SUFFIX,webofknowledge.com,DIRECT - - DOMAIN-SUFFIX,westlaw.com,DIRECT - - DOMAIN-SUFFIX,wiley.com,DIRECT - - DOMAIN-SUFFIX,worldbank.org,DIRECT - - DOMAIN-SUFFIX,worldscientific.com,DIRECT - # > Other - - DOMAIN-SUFFIX,cn,DIRECT - # - DOMAIN-SUFFIX,vmware.com,DIRECT - - DOMAIN-SUFFIX,115.com,DIRECT - - DOMAIN-SUFFIX,360in.com,DIRECT - - DOMAIN-SUFFIX,51ym.me,DIRECT - - DOMAIN-SUFFIX,8686c.com,DIRECT - - DOMAIN-SUFFIX,abchina.com,DIRECT - - DOMAIN-SUFFIX,accuweather.com,DIRECT - - DOMAIN-SUFFIX,aicoinstorge.com,DIRECT - - DOMAIN-SUFFIX,air-matters.com,DIRECT - - DOMAIN-SUFFIX,air-matters.io,DIRECT - - DOMAIN-SUFFIX,aixifan.com,DIRECT - - DOMAIN-SUFFIX,amd.com,DIRECT - - DOMAIN-SUFFIX,b612.net,DIRECT - - DOMAIN-SUFFIX,bdatu.com,DIRECT - - DOMAIN-SUFFIX,beitaichufang.com,DIRECT - - DOMAIN-SUFFIX,bjango.com,DIRECT - - DOMAIN-SUFFIX,booking.com,DIRECT - - DOMAIN-SUFFIX,bstatic.com,DIRECT - - DOMAIN-SUFFIX,cailianpress.com,DIRECT - - DOMAIN-SUFFIX,camera360.com,DIRECT - - DOMAIN-SUFFIX,chaoxing.com,DIRECT - - DOMAIN-SUFFIX,chinaso.com,DIRECT - - DOMAIN-SUFFIX,chuimg.com,DIRECT - - DOMAIN-SUFFIX,chunyu.mobi,DIRECT - - DOMAIN-SUFFIX,chushou.tv,DIRECT - - DOMAIN-SUFFIX,cmbchina.com,DIRECT - - DOMAIN-SUFFIX,cmbimg.com,DIRECT - - DOMAIN-SUFFIX,ctrip.com,DIRECT - - DOMAIN-SUFFIX,dfcfw.com,DIRECT - - DOMAIN-SUFFIX,docschina.org,DIRECT - - DOMAIN-SUFFIX,douban.com,DIRECT - - DOMAIN-SUFFIX,doubanio.com,DIRECT - - DOMAIN-SUFFIX,douyu.com,DIRECT - - DOMAIN-SUFFIX,dxycdn.com,DIRECT - - DOMAIN-SUFFIX,dytt8.net,DIRECT - - DOMAIN-SUFFIX,eastmoney.com,DIRECT - - DOMAIN-SUFFIX,eudic.net,DIRECT - - DOMAIN-SUFFIX,feng.com,DIRECT - - DOMAIN-SUFFIX,fengkongcloud.com,DIRECT - - DOMAIN-SUFFIX,frdic.com,DIRECT - - DOMAIN-SUFFIX,futu5.com,DIRECT - - DOMAIN-SUFFIX,futunn.com,DIRECT - - DOMAIN-SUFFIX,gandi.net,DIRECT - - DOMAIN-SUFFIX,gcores.com,DIRECT - - DOMAIN-SUFFIX,geilicdn.com,DIRECT - - DOMAIN-SUFFIX,getpricetag.com,DIRECT - - DOMAIN-SUFFIX,gifshow.com,DIRECT - - DOMAIN-SUFFIX,godic.net,DIRECT - - DOMAIN-SUFFIX,hicloud.com,DIRECT - - DOMAIN-SUFFIX,hongxiu.com,DIRECT - - DOMAIN-SUFFIX,hostbuf.com,DIRECT - - DOMAIN-SUFFIX,huxiucdn.com,DIRECT - - DOMAIN-SUFFIX,huya.com,DIRECT - - DOMAIN-SUFFIX,ibm.com,DIRECT - - DOMAIN-SUFFIX,infinitynewtab.com,DIRECT - - DOMAIN-SUFFIX,ithome.com,DIRECT - - DOMAIN-SUFFIX,java.com,DIRECT - - DOMAIN-SUFFIX,jianguoyun.com,DIRECT - - DOMAIN-SUFFIX,jianshu.io,DIRECT - - DOMAIN-SUFFIX,jidian.im,DIRECT - - DOMAIN-SUFFIX,kaiyanapp.com,DIRECT - - DOMAIN-SUFFIX,kaspersky-labs.com,DIRECT - - DOMAIN-SUFFIX,keepcdn.com,DIRECT - - DOMAIN-SUFFIX,kkmh.com,DIRECT - - DOMAIN-SUFFIX,licdn.com,DIRECT - - DOMAIN-SUFFIX,linkedin.com,DIRECT - - DOMAIN-SUFFIX,loli.net,DIRECT - - DOMAIN-SUFFIX,luojilab.com,DIRECT - - DOMAIN-SUFFIX,maoyan.com,DIRECT - - DOMAIN-SUFFIX,maoyun.tv,DIRECT - - DOMAIN-SUFFIX,meituan.com,DIRECT - - DOMAIN-SUFFIX,meituan.net,DIRECT - - DOMAIN-SUFFIX,mls-cdn.com,DIRECT - - DOMAIN-SUFFIX,mobike.com,DIRECT - - DOMAIN-SUFFIX,moke.com,DIRECT - - DOMAIN-SUFFIX,mubu.com,DIRECT - - DOMAIN-SUFFIX,myzaker.com,DIRECT - - DOMAIN-SUFFIX,nim-lang-cn.org,DIRECT - - DOMAIN-SUFFIX,nvidia.com,DIRECT - - DOMAIN-SUFFIX,oracle.com,DIRECT - - DOMAIN-SUFFIX,plex.tv,DIRECT - - DOMAIN-SUFFIX,qdaily.com,DIRECT - - DOMAIN-SUFFIX,qidian.com,DIRECT - - DOMAIN-SUFFIX,qyer.com,DIRECT - - DOMAIN-SUFFIX,qyerstatic.com,DIRECT - - DOMAIN-SUFFIX,raychase.net,DIRECT - - DOMAIN-SUFFIX,ronghub.com,DIRECT - - DOMAIN-SUFFIX,ruguoapp.com,DIRECT - - DOMAIN-SUFFIX,sankuai.com,DIRECT - - DOMAIN-SUFFIX,scomper.me,DIRECT - - DOMAIN-SUFFIX,seafile.com,DIRECT - - DOMAIN-SUFFIX,sm.ms,DIRECT - - DOMAIN-SUFFIX,smzdm.com,DIRECT - - DOMAIN-SUFFIX,snapdrop.net,DIRECT - - DOMAIN-SUFFIX,snwx.com,DIRECT - - DOMAIN-SUFFIX,s-reader.com,DIRECT - - DOMAIN-SUFFIX,sspai.com,DIRECT - - DOMAIN-SUFFIX,takungpao.com,DIRECT - - DOMAIN-SUFFIX,teamviewer.com,DIRECT - - DOMAIN-SUFFIX,tianyancha.com,DIRECT - - DOMAIN-SUFFIX,udacity.com,DIRECT - - DOMAIN-SUFFIX,uning.com,DIRECT - - DOMAIN-SUFFIX,weather.com,DIRECT - - DOMAIN-SUFFIX,weico.cc,DIRECT - - DOMAIN-SUFFIX,weidian.com,DIRECT - - DOMAIN-SUFFIX,xiachufang.com,DIRECT - - DOMAIN-SUFFIX,ximalaya.com,DIRECT - - DOMAIN-SUFFIX,xinhuanet.com,DIRECT - - DOMAIN-SUFFIX,xmcdn.com,DIRECT - - DOMAIN-SUFFIX,yangkeduo.com,DIRECT - - DOMAIN-SUFFIX,zhangzishi.cc,DIRECT - - DOMAIN-SUFFIX,zhihu.com,DIRECT - - DOMAIN-SUFFIX,zhimg.com,DIRECT - - DOMAIN-SUFFIX,zhuihd.com,DIRECT - - DOMAIN,download.jetbrains.com,DIRECT - - DOMAIN,images-cn.ssl-images-amazon.com,DIRECT + - RULE-SET,China,DIRECT # Local Area Network - IP-CIDR,192.168.0.0/16,DIRECT @@ -1185,10 +75,12 @@ rules: - IP-CIDR,100.64.0.0/10,DIRECT - IP-CIDR,224.0.0.0/4,DIRECT + # （可选）使用来自 ipipdotnet 的 ChinaIP 以解决数据不准确的问题，使用 ChinaIP.yaml 时可禁用下列直至（包括）「GEOIP,CN」规则 + # - RULE-SET,ChinaIP,DIRECT # Tencent - IP-CIDR,119.28.28.28/32,DIRECT - IP-CIDR,182.254.116.0/24,DIRECT # GeoIP China - GEOIP,CN,DIRECT - - MATCH,MATCH + - MATCH,MATCH \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua_provider.yaml b/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua_provider.yaml deleted file mode 100644 index ec64e8c12f..0000000000 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/ConnersHua_provider.yaml +++ /dev/null @@ -1,97 +0,0 @@ -rule-providers: -# name: # Provider 名称 -# type: http # http 或 file -# behavior: classical # 或 ipcidr、domain -# path: # 文件路径 -# url: # 只有当类型为 HTTP 时才可用，您不需要在本地空间中创建新文件。 -# interval: # 自动更新间隔，仅在类型为 HTTP 时可用 - - Unbreak: - type: http - behavior: classical - path: ./RuleSet/Unbreak.yaml - url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/Unbreak.yaml - interval: 86400 - - Streaming: - type: http - behavior: classical - path: ./RuleSet/StreamingMedia/Streaming.yaml - url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Streaming.yaml - interval: 86400 - - StreamingSE: - type: http - behavior: classical - path: ./RuleSet/StreamingMedia/StreamingSE.yaml - url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/StreamingSE.yaml - interval: 86400 - - Global: - type: http - behavior: classical - path: ./RuleSet/Global.yaml - url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/Global.yaml - interval: 86400 - - China: - type: http - behavior: classical - path: ./RuleSet/China.yaml - url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/China.yaml - interval: 86400 - - IP-Blackhole: - type: http - behavior: ipcidr - path: ./RuleSet/Extra/IP-Blackhole.yaml - url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/Extra/IP-Blackhole.yaml - interval: 86400 - - ChinaIP: - type: http - behavior: ipcidr - path: ./RuleSet/Extra/ChinaIP.yaml - url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/Extra/ChinaIP.yaml - interval: 86400 - -# 规则 -rules: -##source:ConnersHua_provider - # Unbreak - - RULE-SET,Unbreak,DIRECT - - # Global Area Network - - # (Streaming Media) - - RULE-SET,Streaming,Streaming - - # (StreamingSE) - - RULE-SET,StreamingSE,StreamingSE - - # (DNS Cache Pollution) / (IP Blackhole) / (Region-Restricted Access Denied) / (Network Jitter) - - RULE-SET,Global,PROXY - - # China Area Network - - RULE-SET,China,DIRECT - - # Local Area Network - - IP-CIDR,192.168.0.0/16,DIRECT - - IP-CIDR,10.0.0.0/8,DIRECT - - IP-CIDR,172.16.0.0/12,DIRECT - - IP-CIDR,127.0.0.0/8,DIRECT - - IP-CIDR,100.64.0.0/10,DIRECT - - IP-CIDR,224.0.0.0/4,DIRECT - - # IP Blackhole - - RULE-SET,IP-Blackhole,PROXY - - # Tencent - - IP-CIDR,119.28.28.28/32,DIRECT - - IP-CIDR,182.254.116.0/24,DIRECT - # 使用来自 ipipdotnet 的 ChinaIP 以解决数据不准确的问题，使用 ChinaIP.yaml 时禁用「GEOIP,CN」规则 - # - RULE-SET,ChinaIP,DIRECT - # GeoIP China - - GEOIP,CN,DIRECT - - - MATCH,MATCH diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/default.yaml b/package/ctcgfw/luci-app-openclash/files/etc/openclash/default.yaml index 456057096d..6c24fe3221 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/default.yaml +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/default.yaml @@ -18,8 +18,8 @@ allow-lan: true # 此项将被接管为true # "[aaaa::a8aa:ff:fe09:57d8]": bind a single IPv6 address bind-address: "*" # HTTP(S)\SOCKS5 监听地址，此项将被接管为all -# Rule / Global/ Direct (default is Rule) -mode: Rule # 此项将被接管 +# rule / global / direct (default is rule) +mode: rule # 此项将被接管 # set log level to stdout (default is info) # info / warning / error / debug / silent @@ -35,10 +35,6 @@ external-ui: "/usr/share/openclash/dashboard" # 此项将被接管 # Secret for RESTful API (Optional) secret: '123456' # 此项将被接管 -# experimental feature -experimental: - ignore-resolve-fail: true # ignore dns resolve fail, default value is true - # authentication of local SOCKS5/HTTP(S) server authentication: # 此项将被接管 - "user1:pass1" @@ -283,7 +279,7 @@ proxy-groups: # 此参数必须保留,不能删除 #rule-providers: # name: # name of the provider # type: http # type of the provider, it can be a HTTP or a File -# behavior: ipcidr # or domain +# behavior: classical # or ipcidr、domain # path: # where is the file, ./ relative to clash home # url: # only available when type is HTTP, where to download a file. You don't need to create a new file in local space. # interval: # auto-update interval, only available when type is HTTP @@ -316,6 +312,4 @@ rules: # 此参数必须保留,不能删除 - SRC-PORT,7777,DIRECT # or use rule with provider - RULE-SET,name,Proxy -# FINAL would remove after prerelease -# you also can use `FINAL,Proxy` or `FINAL,,Proxy` now - MATCH,auto \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version index 3bb3c12fc2..ea79ace438 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version @@ -1,2 +1,2 @@ -v0.39.2-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkExOEUzN0FEQjExNzExRUFBN0EzQUMwNzMzQjZGNzA2IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkExOEUzN0FFQjExNzExRUFBN0EzQUMwNzMzQjZGNzA2Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QTE4RTM3QUJCMTE3MTFFQUE3QTNBQzA3MzNCNkY3MDYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QTE4RTM3QUNCMTE3MTFFQUE3QTNBQzA3MzNCNkY3MDYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6vmb1mAAADAFBMVEXB1eAHZp3R0dFtbW1Jns49PT2EvN2EhIQ1dZq6urokhLtFmspknr6UxeE6lspTiqmGv98HXpGizOVYpdKCgoIJeLienp7a2tqlpaUGVYJ4eHh2ttqx0ePf39/R5vLn5+c/Pz/GxsahoaHOzs4kapJpaWkHW4tilLGStcgJca2RkZEJZZkKaqFxcXEFXI6/v79GRkasrKy1tbUXYo1mrdYFbanR4uzKysrw9fcFcK2jwNFiYmIEU4Bkq9MKdrVHi7JLS0tDQ0Pg4ODC2eaLi4sFYJWDs84Xgb5Fkbx2dnaz1eoGdLLAwMCcnJwrjsYEWorCwsJBQUEneKZCQkJFgKImcJuDrcW2trajxdmXl5dHnMyUvtYFaaJlZWUnicGNjY02kcYFZZtzobuxzdwJWIUHVoTR3+gFcrCDqsEIbKSBudmvr69gYGCiyd8chsMZdapyn7iUlJSSutCjzuYJYZQEYph0dHSyytiTvtcJcKuJweIwk8t0sdUUX4kJdbMahME1hbJDfqEHV4YRgsMCc7QBcrNRUVFUVFRVVVVSUlILfL0Ke7xWVlYHeLkFdrcEdrYOgMAOf8ADdLQDdbUDdLUEdbYSg8NXV1cSg8QShMQThMUAcrIGd7gOf78Nfr8Nfr4Mfb4Mfb0Je7sJersIebkJero6OjqqqqrU1NTV1dWrq6tISEipqak7OzuAgIB+fn7w9/vC3u5JSUmBgYGCqcDq6urz8/NMTEz19fXh7/eDvNz09PTv9Pd/f38HcKvA1N/B3e2Fvt7g6u/B3e6JiYmErMLo6Oh0s9jC3++hv9ALerng6vCDq8LB3u6Du9yEtNDD3+8LdK8Fa6bW1tZGm8sIaJ+Evd0FZ5/g7vbg7/cEWIgZg8Dv9voKebgLb6gGdbRGhKcVaJcIWYgnbZWDr8hVos+ErcUEVYMHcq9or9czeqOyz+BkmbdGibB1qMVTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////+ncqwAAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADDVJREFUeNrsVwlUFOcdH4R1UQRFzIJrhFU0IEYcUOLBmuwiHhFrJdF4RH1ixCMmRmPUGGsO24rA2qYnPUyaIC6nYUFOIeJ9J0aTqNHcR7Vt7LbWBsTwo//vm9ndmQUMr8nzvd3n7z3m+5+//8zvm50ZhNbWmhWDr3sD/uQB2PicrbVVaE1ad9078EePwMbwVqFmWJOX4A+egY02YYW3SN70ew/Bc8Kwb70FP/UQbBS+vaP57YYXaf5vT4Hwjdfgjua3H//yFAj/9Rrc0fz242VPgfAfr8GvPAXtaq6Ni4uL8f3hVZmv1c53Or5abWd69Fp9J9lf6RBB/Xr1C3IPvrwypFevXn5Of9rflJ6yqG3vK73Q65X/G8I1dyTOqgFH0pzEa98T2jityq/BHKc9FaM6Q/Eu3u3ksFc7wMp3+OW8s1IVnSZFURsi+YGS59duUXiQGydp3tG4V/16+b16S7TRXF8JhBbpdJE0Svt9NY9DnNK1DEeSc2uBmB9W8790gGO4r8cDPe7DMVXUD1hy+PDY0YAfc9dg9D8fiBove4oigRfZVqo592N/R+NumeMQbqqRmIQqXw2DSVfV5+b3BGmu8ocBvrI5B1WZnaEQNWInh73WPkbi5IjFixePGI2RyrDf2C8Ws/BJrOFFo6lo8+axqG2nyH80+qlJSdfXOsKtchxCG5WqEjXmcpNJ1Ggsgzurrb6Panv69PFtX/PiCAyUzULMapGL9e0zJrpp7qsekuiocOD19jEFi4I/PvNx8GFMUYbPLF4cfO+9Qz8/jGPkHUP058vPbHiGdiZEXfQMK4rmRQqQrq+/Ps0vSBHyc3g85wyqaiS4a14DnWELtywmZhRiN/d2o1A+zkkCim4WoSixiB5DLFvEXgA1RbwOSORuYSJ3JDjZt+hQKQtId3wOCTeV5SuTb6rIbw6s5GFGWQSJOJmHpibKlb68cZby1LNkhKBWtmoRkpVlw6cnyD7xKWxZCpwZej9bTjyNJ2mBVJQ1VMD+tkXP/xVl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 \ No newline at end of file +v0.39.3-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjc2NjhFNjBBQzFERTExRUE5ODFDRUFEQTU3Rjg2M0NFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjc2NjhFNjBCQzFERTExRUE5ODFDRUFEQTU3Rjg2M0NFIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NzY2OEU2MDhDMURFMTFFQTk4MUNFQURBNTdGODYzQ0UiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzY2OEU2MDlDMURFMTFFQTk4MUNFQURBNTdGODYzQ0UiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4d9ffWAAADAFBMVEVISEiCqcAGcKxFmsrR0dFJns7B1eBtbW09PT2Gv9+EvN2EhIS6uroHXpEkhLsGVYKStcmTu9OUxeFYpdIJeLiCgoJlnr6enp7a2tokapKlpaV4eHgJdbTf399jlLHR5vLn5+c/Pz/GxsYIXIyhoaHOzs45lclpaWkIca0FbamRkZEEXI5mrdWizOVxcXG/v79FRUWsrKw0dJp2ttq1tbUKaqEwk8vR4uwFYJWy1urKysoEU4BiYmJGirFFgKIXYo02kcVkq9NLS0tDQ0Pg4ODC2eaLi4sIZJkGdLKDs86iwNEEWIh2dnbAwMCcnJzCwsJBQUFFkbyx0ePw9fcXgL0neKZXlbkFaaJCQkImcJuDrcW2trajx9yXl5dHnMwHbKVlZWUnicGNjY2yytgJaJ4FcrAJWIVzobuxzdwJbqgHZ51yn7ikzuavr6+hv9B0p8RgYGCiyd8rjsc1hrQZdaqUlJQJYZMGZJpGg6YEYph0dHQdh8NVjKtSiagJcKuJweJ0sdUahMFDfqEHV4cRgsMCc7QBcrNRUVFUVFRVVVVSUlILfL1WVlYFdrcKe7wHeLkOgMAEdrYDdLUOf8ADdbUEdbYDdLQSg8MSg8RXV1cShMQThMUAcrIGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkJe7sJersJero6OjqqqqrU1NTV1dWrq6upqak7OzuAgIB+fn7w9/sHVoTC3u6BgYHq6upMTEzh7/f19fXz8/P09PSDvNzA1N9/f3/v9Pfg6u+Fvt7g6vDB3e3B3e50s9iJiYno6OgLerkUXomErMIFZZsFZ5+EtNCEvd3W1tbB3u4Fa6bC3+/g7vbD3+8LdK8FZ6Dg7/dGm8tVos+CutsEV4cZg8Dv9vqDr8gGdbTR3+gKeLcIWYjg7vcEVYMVaJdjpsxor9czeqNkmbc2g66ErcXP5PEmbZWyz+DB2+ujxdhTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////90FWljAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADEJJREFUeNrsVwlUFOcdH0BgdUUQoousAiuCCKiLolEXrwUBNVaMJsRYr6diPHNqvBNjWxEI9m5pa9IEdLkMC3JKQLwhkmhiTnObtmlrm02tLYjhR//fN7O7MwsYXpPne7vP33vM9z9//5nfNzszCJ2d1ZtG3nAF/N4JMPEZc2en0Jm444Zr4HdOgYkhnUL1mDYXwW+dAxPNwiZXkbztN06CZ4Qx37gKfuQkmCh8c1fzOw0X0vxfzgLhvy6Du5rfeXztLBD+4zK4q/mdx0+dBcK/XQa/cBZ0q7k6NjY2yvv7V2WFWr3C5nir1b3p0aq1vWR/oSd8HTH+mfERXcI7A/r27etpc5/4s9yzwZOKAnY6Rvui7wv/N4TrjohfUg2OxKXx178j1LFqhV+NpTZ7Hqb0huJ1vN7LYS/2gJ1v8ct5a6ci+oQYRVWA6PuLnqeyd6NYZO7rwEma9zTuRc++ni/eFl0011YAgcUaTTiNUn9XzWMRK3ezxyLRtrVA1Per+R97wCXcO3jq4HtxSRH1BD5papqzEPBk7kYsfHTqg7Mkzwag0a/JrxE4oeQ84RjoZY5DuKVEfCJqvFUMRk3NoFvfEaS5wh8DeEvmUtRk9oZCr9L3cthL3SMGjdPT09OnL0SMPOw551o6CzdiIy9ayIrS56BK0ey1jUXTVzmEXyJdX+oJt8txCF1UqolXJQhGo16lyh7ZW221gxTbM2iQd/eaC6EYIZlFWNIhFWu7Z4x30NxbOSTeWmHFy91jMtb6rLu8zqcJk+Xhy+npWydMSP6sCZfIuwS/z5Zf3rOVdiZAXpWeHrZ6wuqwbYCSlHR9+eUnPCNkIU+rx3O2oKJGhKPm1dDo9nMr28iMIhzj3jEUSceliUDxrWIUxxfTY4hli9kLoLqY1wHx3C2K544IG/t+DSokAemOzyXh5rF8RdItBfmtERU8zCiLIRIn8dC8eKnSmzcukZ96loQAVElWFQKysszYdo7sc9tgzpLhcvKnbDk3EI/TArEoK9kL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 \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/rule_provider/IP-Blackhole.yaml b/package/ctcgfw/luci-app-openclash/files/etc/openclash/rule_provider/IP-Blackhole.yaml deleted file mode 100644 index 14cd18e265..0000000000 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/rule_provider/IP-Blackhole.yaml +++ /dev/null @@ -1,46 +0,0 @@ -payload: - # IP Blackhole - # > Facebook - - '31.13.24.0/21' - - '31.13.64.0/18' - - '45.64.40.0/22' - - '66.220.144.0/20' - - '69.63.176.0/20' - - '69.171.224.0/19' - - '74.119.76.0/22' - - '103.4.96.0/22' - - '129.134.0.0/17' - - '157.240.0.0/17' - - '173.252.64.0/19' - - '173.252.96.0/19' - - '179.60.192.0/22' - - '185.60.216.0/22' - - '204.15.20.0/22' - # > Google - - '35.190.247.0/24' - - '64.233.160.0/19' - - '66.102.0.0/20' - - '66.249.80.0/20' - - '72.14.192.0/18' - - '74.125.0.0/16' - - '108.177.8.0/21' - - '172.217.0.0/16' - - '173.194.0.0/16' - - '209.85.128.0/17' - - '216.58.192.0/19' - - '216.239.32.0/19' - # > Twitter - - '69.195.160.0/19' - - '104.244.42.0/21' - - '192.133.76.0/22' - - '199.16.156.0/22' - - '199.59.148.0/22' - - '199.96.56.0/21' - - '202.160.128.0/22' - - '209.237.192.0/19' - # > Wikimedia - - '91.198.174.0/24' - - '103.102.166.0/24' - - '185.15.56.0/22' - - '198.35.26.0/23' - - '208.80.152.0/22' \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/servers.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/servers.lua index cf6c493b6a..f82ef6ac73 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/servers.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/servers.lua @@ -25,8 +25,7 @@ o = s:option(ListValue, "rule_sources", translate("Choose Template For Create Co o.description = translate("Use Other Rules To Create Config") o:depends("create_config", 1) o:value("lhie1", translate("lhie1 Rules")) -o:value("ConnersHua", translate("ConnersHua Rules")) -o:value("ConnersHua_provider", translate("ConnersHua(Provider-type) Rules")) +o:value("ConnersHua", translate("ConnersHua(Provider-type) Rules")) o:value("ConnersHua_return", translate("ConnersHua Return Rules")) o = s:option(ListValue, "servers_update", translate("Keep Settings")) diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua index 029b5b113c..6b3cff5366 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua @@ -75,11 +75,11 @@ o.default = "system" o = s:taboption("op_mode", ListValue, "proxy_mode", font_red..bold_on..translate("Proxy Mode")..bold_off..font_off) o.description = translate("Select Proxy Mode") -o:value("Rule", translate("Rule Proxy Mode")) -o:value("Global", translate("Global Proxy Mode")) -o:value("Direct", translate("Direct Proxy Mode")) -o:value("Script", translate("Script Proxy Mode (Tun Core Only)")) -o.default = "Rule" +o:value("rule", translate("Rule Proxy Mode")) +o:value("global", translate("Global Proxy Mode")) +o:value("direct", translate("Direct Proxy Mode")) +o:value("script", translate("Script Proxy Mode (Tun Core Only)")) +o.default = "rule" o = s:taboption("op_mode", Button, translate("Switch Operation Mode")) o.title = translate("Switch Operation Mode") @@ -256,8 +256,7 @@ o = s:taboption("rules", ListValue, "rule_source", translate("Enable Other Rules o.description = translate("Use Other Rules") o:value("0", translate("Disable Other Rules")) o:value("lhie1", translate("lhie1 Rules")) -o:value("ConnersHua", translate("ConnersHua Rules")) -o:value("ConnersHua_provider", translate("ConnersHua(Provider-type) Rules")) +o:value("ConnersHua", translate("ConnersHua(Provider-type) Rules")) o:value("ConnersHua_return", translate("ConnersHua Return Rules")) if not fs.isfile("/tmp/Proxy_Group") then @@ -268,7 +267,6 @@ file = io.open("/tmp/Proxy_Group", "r"); o = s:taboption("rules", ListValue, "GlobalTV", translate("GlobalTV")) o:depends("rule_source", "lhie1") o:depends("rule_source", "ConnersHua") -o:depends("rule_source", "ConnersHua_provider") for l in file:lines() do o:value(l) end @@ -276,7 +274,6 @@ o:depends("rule_source", "ConnersHua_provider") o = s:taboption("rules", ListValue, "AsianTV", translate("AsianTV")) o:depends("rule_source", "lhie1") o:depends("rule_source", "ConnersHua") -o:depends("rule_source", "ConnersHua_provider") for l in file:lines() do o:value(l) end @@ -284,7 +281,6 @@ o:depends("rule_source", "ConnersHua_provider") o = s:taboption("rules", ListValue, "Proxy", translate("Proxy")) o:depends("rule_source", "lhie1") o:depends("rule_source", "ConnersHua") -o:depends("rule_source", "ConnersHua_provider") o:depends("rule_source", "ConnersHua_return") for l in file:lines() do o:value(l) @@ -346,7 +342,6 @@ o:depends("rule_source", "lhie1") file:seek("set") o = s:taboption("rules", ListValue, "AdBlock", translate("AdBlock")) o:depends("rule_source", "lhie1") ---o:depends("rule_source", "ConnersHua_provider") for l in file:lines() do o:value(l) end @@ -354,7 +349,6 @@ o:depends("rule_source", "lhie1") o = s:taboption("rules", ListValue, "Domestic", translate("Domestic")) o:depends("rule_source", "lhie1") o:depends("rule_source", "ConnersHua") -o:depends("rule_source", "ConnersHua_provider") for l in file:lines() do o:value(l) end @@ -362,7 +356,6 @@ o:depends("rule_source", "ConnersHua_provider") o = s:taboption("rules", ListValue, "Others", translate("Others")) o:depends("rule_source", "lhie1") o:depends("rule_source", "ConnersHua") -o:depends("rule_source", "ConnersHua_provider") o:depends("rule_source", "ConnersHua_return") o.description = translate("Choose Proxy Group, Base On Your Servers Group in config.yaml") for l in file:lines() do diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/index.html b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/index.html index 5f269a30f5..b0628c6457 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/index.html +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/index.html @@ -1 +1 @@ -Clash
\ No newline at end of file +Clash
\ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.0f871e89a0b8ff683256.min.js b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.0f871e89a0b8ff683256.min.js deleted file mode 100644 index 5ca16adc9f..0000000000 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.0f871e89a0b8ff683256.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! For license information please see 1.bundle.0f871e89a0b8ff683256.min.js.LICENSE.txt */ -(window.webpackJsonp=window.webpackJsonp||[]).push([[1],[function(e,t,n){"use strict";e.exports=n(54)},function(e,t,n){var r;!function(){"use strict";var n={}.hasOwnProperty;function o(){for(var e=[],t=0;t=0||(o[n]=e[n]);return o}n.d(t,"a",(function(){return r}))},,,,function(e,t,n){"use strict";!function e(){if("undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE){0;try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(e)}catch(t){console.error(t)}}}(),e.exports=n(55)},function(e,t,n){e.exports=n(58)()},function(e,t,n){"use strict";e.exports=n(62)},function(e,t,n){var r=n(38)(Object,"create");e.exports=r},function(e,t,n){var r=n(109);e.exports=function(e,t){for(var n=e.length;n--;)if(r(e[n][0],t))return n;return-1}},function(e,t,n){var r=n(115);e.exports=function(e,t){var n=e.__data__;return r(t)?n["string"==typeof t?"string":"hash"]:n.map}},function(e,t,n){"use strict";function r(e){for(var t=arguments.length,n=Array(t>1?t-1:0),r=1;r3?t.i-4:t.i:Array.isArray(e)?1:p(e)?2:h(e)?3:0}function s(e,t){return 2===l(e)?e.has(t):Object.prototype.hasOwnProperty.call(e,t)}function c(e,t){return 2===l(e)?e.get(t):e[t]}function f(e,t,n){var r=l(e);2===r?e.set(t,n):3===r?(e.delete(t),e.add(n)):e[t]=n}function d(e,t){return e===t?0!==e||1/e==1/t:e!=e&&t!=t}function p(e){return G&&e instanceof Map}function h(e){return q&&e instanceof Set}function m(e){return e.o||e.t}function v(e){if(Array.isArray(e))return e.slice();var t=Object.getOwnPropertyDescriptors(e);for(var n in delete t[X],t){var r=t[n];!1===r.writable&&(r.writable=!0,r.configurable=!0),(r.get||r.set)&&(t[n]={configurable:!0,writable:!0,enumerable:r.enumerable,value:e[n]})}return Object.create(Object.getPrototypeOf(e),t)}function g(e,t){Object.isFrozen(e)||o(e)||!i(e)||(l(e)>1&&(e.set=e.add=e.clear=e.delete=y),Object.freeze(e),t&&u(e,(function(e,t){return g(t,!0)}),!0))}function y(){r(2)}function b(e){var t=ee[e];return t||r(19,e),t}function w(e,t){ee[e]=t}function S(){return H}function x(e,t){t&&(b("Patches"),e.u=[],e.s=[],e.p=t)}function _(e){E(e),e.v.forEach(k),e.v=null}function E(e){e===H&&(H=e.l)}function T(e){return H={v:[],l:H,h:e,m:!0,_:0}}function k(e){var t=e[X];0===t.i||1===t.i?t.j():t.O=!0}function C(e,t){t._=t.v.length;var n=t.v[0],o=void 0!==e&&e!==n;return t.h.g||b("ES5").S(t,e,o),o?(n[X].P&&(_(t),r(4)),i(e)&&(e=R(t,e),t.l||O(t,e)),t.u&&b("Patches").M(n[X],e,t.u,t.s)):e=R(t,n,[]),_(t),t.u&&t.p(t.u,t.s),e!==K?e:void 0}function R(e,t,n){if(null==(r=t)||"object"!=typeof r||Object.isFrozen(r))return t;var r,o=t[X];if(!o)return u(t,(function(r,i){return P(e,o,t,r,i,n)}),!0),t;if(o.A!==e)return t;if(!o.P)return O(e,o.t,!0),o.t;if(!o.I){o.I=!0,o.A._--;var i=4===o.i||5===o.i?o.o=v(o.k):o.o;u(i,(function(t,r){return P(e,o,i,t,r,n)})),O(e,i,!1),n&&e.u&&b("Patches").R(o,n,e.u,e.s)}return o.o}function P(e,t,n,r,a,u){if(o(a)){var l=R(e,a,u&&t&&3!==t.i&&!s(t.D,r)?u.concat(r):void 0);if(f(n,r,l),!o(l))return;e.m=!1}if(i(a)&&!Object.isFrozen(a)){if(!e.h.N&&e._<1)return;R(e,a),t&&t.A.l||O(e,a)}}function O(e,t,n){void 0===n&&(n=!1),e.h.N&&e.m&&g(t,n)}function M(e,t){var n=e[X];return(n?m(n):e)[t]}function I(e){e.P||(e.P=!0,e.l&&I(e.l))}function A(e){e.o||(e.o=v(e.t))}function N(e,t,n){var r=p(t)?b("MapSet").T(t,n):h(t)?b("MapSet").F(t,n):e.g?function(e,t){var n=Array.isArray(e),r={i:n?1:0,A:t?t.A:S(),P:!1,I:!1,D:{},l:t,t:e,k:null,o:null,j:null,C:!1},o=r,i=te;n&&(o=[r],i=ne);var a=Proxy.revocable(o,i),u=a.revoke,l=a.proxy;return r.k=l,r.j=u,l}(t,n):b("ES5").J(t,n);return(n?n.A:S()).v.push(r),r}function z(e){return o(e)||r(22,e),function e(t){if(!i(t))return t;var n,r=t[X],o=l(t);if(r){if(!r.P&&(r.i<4||!b("ES5").K(r)))return r.t;r.I=!0,n=F(t,o),r.I=!1}else n=F(t,o);return u(n,(function(t,o){r&&c(r.t,t)===o||f(n,t,e(o))})),3===o?new Set(n):n}(e)}function F(e,t){switch(t){case 2:return new Map(e);case 3:return Array.from(e)}return v(e)}function L(){function e(e,t){var n=i[e];return n?n.enumerable=t:i[e]=n={configurable:!0,enumerable:t,get:function(){var t=this[X];return te.get(t,e)},set:function(t){var n=this[X];te.set(n,e,t)}},n}function t(e){for(var t=e.length-1;t>=0;t--){var o=e[t][X];if(!o.P)switch(o.i){case 5:r(o)&&I(o);break;case 4:n(o)&&I(o)}}}function n(e){for(var t=e.t,n=e.k,r=Object.keys(n),o=r.length-1;o>=0;o--){var i=r[o],a=t[i];if(void 0===a&&!s(t,i))return!0;var u=n[i],l=u&&u[X];if(l?l.t!==a:!d(u,a))return!0}return r.length!==Object.keys(t).length}function r(e){var t=e.k;if(t.length!==e.t.length)return!0;var n=Object.getOwnPropertyDescriptor(t,t.length-1);return!(!n||n.get)}var i={};w("ES5",{J:function(t,n){var r=Array.isArray(t),o=function(t,n){var r=Object.getOwnPropertyDescriptors(n);for(var o in t&&delete r.length,delete r[X],r)r[o]=e(o,t||!!r[o].enumerable);if(t){var i=Array(n.length);return Object.defineProperties(i,r),i}return Object.create(Object.getPrototypeOf(n),r)}(r,t),i={i:r?5:4,A:n?n.A:S(),P:!1,I:!1,D:{},l:n,t:t,k:o,o:null,O:!1,C:!1};return Object.defineProperty(o,X,{value:i,writable:!0}),o},S:function(e,n,i){i?o(n)&&n[X].A===e&&t(e.v):(e.u&&function e(t){if(t&&"object"==typeof t){var n=t[X];if(n){var o=n.t,i=n.k,a=n.D,l=n.i;if(4===l)u(i,(function(t){t!==X&&(void 0!==o[t]||s(o,t)?a[t]||e(i[t]):(a[t]=!0,I(n)))})),u(o,(function(e){void 0!==i[e]||s(i,e)||(a[e]=!1,I(n))}));else if(5===l){if(r(n)&&(I(n),a.length=!0),i.length1?r-1:0),u=1;u1?n-1:0),i=1;i=0;n--){var r=t[n];if(0===r.path.length&&"replace"===r.op){e=r.value;break}}var i=b("Patches").$;return o(e)?i(e,t):this.produce(e,(function(e){return i(e,t.slice(n+1))}))},e}(),oe=new re,ie=oe.produce,ae=oe.produceWithPatches.bind(oe),ue=oe.setAutoFreeze.bind(oe),le=oe.setUseProxies.bind(oe),se=oe.applyPatches.bind(oe),ce=oe.createDraft.bind(oe),fe=oe.finishDraft.bind(oe);t.default=ie},,function(e,t){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(r){"object"==typeof window&&(n=window)}e.exports=n},function(e,t){var n=Array.isArray;e.exports=n},function(e,t,n){var r=n(37),o=n(88);e.exports=function(e){return"symbol"==typeof e||o(e)&&"[object Symbol]"==r(e)}},function(e,t,n){var r=n(24).Symbol;e.exports=r},function(e,t,n){var r=n(85),o="object"==typeof self&&self&&self.Object===Object&&self,i=r||o||Function("return this")();e.exports=i},function(e,t,n){var r=n(119);e.exports=function(e){return null==e?"":r(e)}},,function(e,t,n){e.exports=function(){"use strict";var e="millisecond",t="second",n="minute",r="hour",o="day",i="week",a="month",u="quarter",l="year",s=/^(\d{4})-?(\d{1,2})-?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?.?(\d{1,3})?$/,c=/\[([^\]]+)]|Y{2,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,f=function(e,t,n){var r=String(e);return!r||r.length>=t?e:""+Array(t+1-r.length).join(n)+e},d={s:f,z:function(e){var t=-e.utcOffset(),n=Math.abs(t),r=Math.floor(n/60),o=n%60;return(t<=0?"+":"-")+f(r,2,"0")+":"+f(o,2,"0")},m:function(e,t){var n=12*(t.year()-e.year())+(t.month()-e.month()),r=e.clone().add(n,a),o=t-r<0,i=e.clone().add(n+(o?-1:1),a);return Number(-(n+(t-r)/(o?r-i:i-r))||0)},a:function(e){return e<0?Math.ceil(e)||0:Math.floor(e)},p:function(s){return{M:a,y:l,w:i,d:o,D:"date",h:r,m:n,s:t,ms:e,Q:u}[s]||String(s||"").toLowerCase().replace(/s$/,"")},u:function(e){return void 0===e}},p={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_")},h="en",m={};m[h]=p;var v=function(e){return e instanceof w},g=function(e,t,n){var r;if(!e)return h;if("string"==typeof e)m[e]&&(r=e),t&&(m[e]=t,r=e);else{var o=e.name;m[o]=e,r=o}return!n&&r&&(h=r),r||!n&&h},y=function(e,t){if(v(e))return e.clone();var n="object"==typeof t?t:{};return n.date=e,n.args=arguments,new w(n)},b=d;b.l=g,b.i=v,b.w=function(e,t){return y(e,{locale:t.$L,utc:t.$u,$offset:t.$offset})};var w=function(){function f(e){this.$L=this.$L||g(e.locale,null,!0),this.parse(e)}var d=f.prototype;return d.parse=function(e){this.$d=function(e){var t=e.date,n=e.utc;if(null===t)return new Date(NaN);if(b.u(t))return new Date;if(t instanceof Date)return new Date(t);if("string"==typeof t&&!/Z$/i.test(t)){var r=t.match(s);if(r)return n?new Date(Date.UTC(r[1],r[2]-1,r[3]||1,r[4]||0,r[5]||0,r[6]||0,r[7]||0)):new Date(r[1],r[2]-1,r[3]||1,r[4]||0,r[5]||0,r[6]||0,r[7]||0)}return new Date(t)}(e),this.init()},d.init=function(){var e=this.$d;this.$y=e.getFullYear(),this.$M=e.getMonth(),this.$D=e.getDate(),this.$W=e.getDay(),this.$H=e.getHours(),this.$m=e.getMinutes(),this.$s=e.getSeconds(),this.$ms=e.getMilliseconds()},d.$utils=function(){return b},d.isValid=function(){return!("Invalid Date"===this.$d.toString())},d.isSame=function(e,t){var n=y(e);return this.startOf(t)<=n&&n<=this.endOf(t)},d.isAfter=function(e,t){return y(e)-1&&(t.__listeners[r]=t.__listeners[t.__listeners.length-1],t.__listeners.length--)}}},e.prototype.notify=function(){for(var e=0,t=this.__listeners;en.errorRetryCount)){var i=Math.min(o.retryCount||0,8),a=~~((Math.random()+.5)*(1<0&&o[o.length-1])||6!==i[0]&&2!==i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0));return Promise.all(l).then((function(){return f.get(r)}))}return Promise.resolve(f.get(r))},O=function(e,t,n){var r=m[e];if(e&&r)for(var o=0;o0));return[2,Promise.all(d).then((function(){return f.get(r)}))]}if(i)throw i;return[2,o]}}))}))};var I=E.Provider,A=function(){for(var e=this,t=[],n=0;n=1&&(o=t[0]),t.length>2?(i=t[1],a=t[2]):"function"==typeof t[1]?i=t[1]:"object"==typeof t[1]&&(a=t[1]);var s=f.serializeKey(o),c=s[0],g=s[1],y=s[2];a=Object.assign({},S,Object(r.useContext)(E),a),void 0===i&&(i=a.fetcher);var b=f.get(c)||a.initialData,w=f.get(y),_=Object(r.useRef)({data:!1,error:!1,isValidating:!1}),P=Object(r.useRef)({data:b,error:w,isValidating:!1}),I=Object(r.useState)(null)[1],A=Object(r.useCallback)((function(e){var t=!1;for(var n in e)P.current[n]=e[n],_.current[n]&&(t=!0);(t||a.suspense)&&I({})}),[]),N=Object(r.useRef)(!1),z=Object(r.useRef)(c),F=Object(r.useRef)({emit:function(e){for(var t=[],n=1;n=0&&(e[t]=e[e.length-1],e.pop()));m[c]&&((t=(e=m[c]).indexOf(o))>=0&&(e[t]=e[e.length-1],e.pop()));!C&&window.removeEventListener&&null!==i&&window.removeEventListener("online",i)}}}),[c,j]),R((function(){var t=null,n=function(){return T(e,void 0,void 0,(function(){return k(this,(function(e){switch(e.label){case 0:return P.current.error||!a.refreshWhenHidden&&!u()||!a.refreshWhenOffline&&!l()?[3,2]:[4,j({dedupe:!0})];case 1:e.sent(),e.label=2;case 2:return a.refreshInterval&&(t=setTimeout(n,a.refreshInterval)),[2]}}))}))};return a.refreshInterval&&(t=setTimeout(n,a.refreshInterval)),function(){t&&clearTimeout(t)}}),[a.refreshInterval,a.refreshWhenHidden,a.refreshWhenOffline,j]),a.suspense){var D=f.get(c)||b,B=f.get(y)||w;if(void 0===D&&void 0===B){if(d[c]||j(),d[c]&&"function"==typeof d[c].then)throw d[c];D=d[c]}if(void 0===D&&B)throw B;return{error:B,data:D,revalidate:j,mutate:L,isValidating:P.current.isValidating}}return Object(r.useMemo)((function(){var e={revalidate:j,mutate:L};return Object.defineProperties(e,{error:{get:function(){return _.current.error=!0,z.current===c?P.current.error:w},enumerable:!0},data:{get:function(){return _.current.data=!0,z.current===c?P.current.data:b},enumerable:!0},isValidating:{get:function(){return _.current.isValidating=!0,P.current.isValidating},enumerable:!0}}),e}),[j])},N=function(){for(var e=0,t=0,n=arguments.length;t=0;d--){var p=o[d];"."===p?l(o,d):".."===p?(l(o,d),f++):f&&(l(o,d),f--)}if(!s)for(;f--;f)o.unshift("..");!s||""===o[0]||o[0]&&u(o[0])||o.unshift("");var h=o.join("/");return n&&"/"!==h.substr(-1)&&(h+="/"),h};function c(e){return e.valueOf?e.valueOf():Object.prototype.valueOf.call(e)}var f=function e(t,n){if(t===n)return!0;if(null==t||null==n)return!1;if(Array.isArray(t))return Array.isArray(n)&&t.length===n.length&&t.every((function(t,r){return e(t,n[r])}));if("object"==typeof t||"object"==typeof n){var r=c(t),o=c(n);return r!==t||o!==n?e(r,o):Object.keys(Object.assign({},t,n)).every((function(r){return e(t[r],n[r])}))}return!1};var d=function(e,t){if(!e)throw new Error("Invariant failed")};function p(e){return"/"===e.charAt(0)?e:"/"+e}function h(e){return"/"===e.charAt(0)?e.substr(1):e}function m(e,t){return function(e,t){return 0===e.toLowerCase().indexOf(t.toLowerCase())&&-1!=="/?#".indexOf(e.charAt(t.length))}(e,t)?e.substr(t.length):e}function v(e){return"/"===e.charAt(e.length-1)?e.slice(0,-1):e}function g(e){var t=e.pathname,n=e.search,r=e.hash,o=t||"/";return n&&"?"!==n&&(o+="?"===n.charAt(0)?n:"?"+n),r&&"#"!==r&&(o+="#"===r.charAt(0)?r:"#"+r),o}function y(e,t,n,r){var o;"string"==typeof e?(o=function(e){var t=e||"/",n="",r="",o=t.indexOf("#");-1!==o&&(r=t.substr(o),t=t.substr(0,o));var i=t.indexOf("?");return-1!==i&&(n=t.substr(i),t=t.substr(0,i)),{pathname:t,search:"?"===n?"":n,hash:"#"===r?"":r}}(e)).state=t:(void 0===(o=Object(a.a)({},e)).pathname&&(o.pathname=""),o.search?"?"!==o.search.charAt(0)&&(o.search="?"+o.search):o.search="",o.hash?"#"!==o.hash.charAt(0)&&(o.hash="#"+o.hash):o.hash="",void 0!==t&&void 0===o.state&&(o.state=t));try{o.pathname=decodeURI(o.pathname)}catch(i){throw i instanceof URIError?new URIError('Pathname "'+o.pathname+'" could not be decoded. This is likely caused by an invalid percent-encoding.'):i}return n&&(o.key=n),r?o.pathname?"/"!==o.pathname.charAt(0)&&(o.pathname=s(o.pathname,r.pathname)):o.pathname=r.pathname:o.pathname||(o.pathname="/"),o}function b(){var e=null;var t=[];return{setPrompt:function(t){return e=t,function(){e===t&&(e=null)}},confirmTransitionTo:function(t,n,r,o){if(null!=e){var i="function"==typeof e?e(t,n):e;"string"==typeof i?"function"==typeof r?r(i,o):o(!0):o(!1!==i)}else o(!0)},appendListener:function(e){var n=!0;function r(){n&&e.apply(void 0,arguments)}return t.push(r),function(){n=!1,t=t.filter((function(e){return e!==r}))}},notifyListeners:function(){for(var e=arguments.length,n=new Array(e),r=0;rt?n.splice(t,n.length-t,r):n.push(r),f({action:"PUSH",location:r,index:t,entries:n})}}))},replace:function(e,t){var r=y(e,t,d(),w.location);c.confirmTransitionTo(r,"REPLACE",n,(function(e){e&&(w.entries[w.index]=r,f({action:"REPLACE",location:r}))}))},go:v,goBack:function(){v(-1)},goForward:function(){v(1)},canGo:function(e){var t=w.index+e;return t>=0&&t=200&&e<300}};l.headers={common:{Accept:"application/json, text/plain, */*"}},r.forEach(["delete","get","head"],(function(e){l.headers[e]={}})),r.forEach(["post","put","patch"],(function(e){l.headers[e]=r.merge(i)})),e.exports=l}).call(this,n(132))},function(e,t,n){"use strict";var r=n(7),o=n(134),i=n(41),a=n(136),u=n(139),l=n(140),s=n(45);e.exports=function(e){return new Promise((function(t,c){var f=e.data,d=e.headers;r.isFormData(f)&&delete d["Content-Type"];var p=new XMLHttpRequest;if(e.auth){var h=e.auth.username||"",m=e.auth.password||"";d.Authorization="Basic "+btoa(h+":"+m)}var v=a(e.baseURL,e.url);if(p.open(e.method.toUpperCase(),i(v,e.params,e.paramsSerializer),!0),p.timeout=e.timeout,p.onreadystatechange=function(){if(p&&4===p.readyState&&(0!==p.status||p.responseURL&&0===p.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in p?u(p.getAllResponseHeaders()):null,r={data:e.responseType&&"text"!==e.responseType?p.response:p.responseText,status:p.status,statusText:p.statusText,headers:n,config:e,request:p};o(t,c,r),p=null}},p.onabort=function(){p&&(c(s("Request aborted",e,"ECONNABORTED",p)),p=null)},p.onerror=function(){c(s("Network Error",e,null,p)),p=null},p.ontimeout=function(){var t="timeout of "+e.timeout+"ms exceeded";e.timeoutErrorMessage&&(t=e.timeoutErrorMessage),c(s(t,e,"ECONNABORTED",p)),p=null},r.isStandardBrowserEnv()){var g=n(141),y=(e.withCredentials||l(v))&&e.xsrfCookieName?g.read(e.xsrfCookieName):void 0;y&&(d[e.xsrfHeaderName]=y)}if("setRequestHeader"in p&&r.forEach(d,(function(e,t){void 0===f&&"content-type"===t.toLowerCase()?delete d[t]:p.setRequestHeader(t,e)})),r.isUndefined(e.withCredentials)||(p.withCredentials=!!e.withCredentials),e.responseType)try{p.responseType=e.responseType}catch(b){if("json"!==e.responseType)throw b}"function"==typeof e.onDownloadProgress&&p.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&p.upload&&p.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then((function(e){p&&(p.abort(),c(e),p=null)})),void 0===f&&(f=null),p.send(f)}))}},function(e,t,n){"use strict";var r=n(135);e.exports=function(e,t,n,o,i){var a=new Error(e);return r(a,t,n,o,i)}},function(e,t,n){"use strict";var r=n(7);e.exports=function(e,t){t=t||{};var n={},o=["url","method","params","data"],i=["headers","auth","proxy"],a=["baseURL","url","transformRequest","transformResponse","paramsSerializer","timeout","withCredentials","adapter","responseType","xsrfCookieName","xsrfHeaderName","onUploadProgress","onDownloadProgress","maxContentLength","validateStatus","maxRedirects","httpAgent","httpsAgent","cancelToken","socketPath"];r.forEach(o,(function(e){void 0!==t[e]&&(n[e]=t[e])})),r.forEach(i,(function(o){r.isObject(t[o])?n[o]=r.deepMerge(e[o],t[o]):void 0!==t[o]?n[o]=t[o]:r.isObject(e[o])?n[o]=r.deepMerge(e[o]):void 0!==e[o]&&(n[o]=e[o])})),r.forEach(a,(function(r){void 0!==t[r]?n[r]=t[r]:void 0!==e[r]&&(n[r]=e[r])}));var u=o.concat(i).concat(a),l=Object.keys(t).filter((function(e){return-1===u.indexOf(e)}));return r.forEach(l,(function(r){void 0!==t[r]?n[r]=t[r]:void 0!==e[r]&&(n[r]=e[r])})),n}},function(e,t,n){"use strict";function r(e){this.message=e}r.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},r.prototype.__CANCEL__=!0,e.exports=r},,function(e,t){var n=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\ufe0e\\ufe0f]");e.exports=function(e){return n.test(e)}},function(e,t,n){"use strict";var r=n(33),o={childContextTypes:!0,contextType:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,getDerivedStateFromError:!0,getDerivedStateFromProps:!0,mixins:!0,propTypes:!0,type:!0},i={name:!0,length:!0,prototype:!0,caller:!0,callee:!0,arguments:!0,arity:!0},a={$$typeof:!0,compare:!0,defaultProps:!0,displayName:!0,propTypes:!0,type:!0},u={};function l(e){return r.isMemo(e)?a:u[e.$$typeof]||o}u[r.ForwardRef]={$$typeof:!0,render:!0,defaultProps:!0,displayName:!0,propTypes:!0},u[r.Memo]=a;var s=Object.defineProperty,c=Object.getOwnPropertyNames,f=Object.getOwnPropertySymbols,d=Object.getOwnPropertyDescriptor,p=Object.getPrototypeOf,h=Object.prototype;e.exports=function e(t,n,r){if("string"!=typeof n){if(h){var o=p(n);o&&o!==h&&e(t,o,r)}var a=c(n);f&&(a=a.concat(f(n)));for(var u=l(t),m=l(n),v=0;vO.length&&O.push(e)}function A(e,t,n){return null==e?0:function e(t,n,r,o){var u=typeof t;"undefined"!==u&&"boolean"!==u||(t=null);var l=!1;if(null===t)l=!0;else switch(u){case"string":case"number":l=!0;break;case"object":switch(t.$$typeof){case i:case a:l=!0}}if(l)return r(o,t,""===n?"."+N(t,0):n),1;if(l=0,n=""===n?".":n+":",Array.isArray(t))for(var s=0;s