From d05f23ce0d1a4bfee5a3125a7a5305a2e3be0e72 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 9 Aug 2020 14:42:14 +0200 Subject: [PATCH 1/5] bintuils: Pack libctf-nobfd.so in addition readelf is linked against this library on MIPS64BE This fixes a build problem on MIPS64BE. In addition also explicitly activate it in the configure command. Fixes: 60f595daab45 ("binutils: update to version 2.34") Signed-off-by: Hauke Mehrtens --- package/devel/binutils/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile index 6ad326efa0..9f7a0724f4 100644 --- a/package/devel/binutils/Makefile +++ b/package/devel/binutils/Makefile @@ -84,7 +84,8 @@ CONFIGURE_ARGS += \ --target=$(REAL_GNU_TARGET_NAME) \ --enable-shared \ --enable-install-libiberty \ - --enable-install-libbfd + --enable-install-libbfd \ + --enable-install-libctf define Build/Install $(call Build/Install/Default) @@ -106,7 +107,7 @@ endef define Package/libctf/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libctf.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libctf*.so* $(1)/usr/lib/ endef define Package/libopcodes/install From 21a887ee675dced2dedcb89fb4003f789008c8b7 Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Fri, 7 Aug 2020 23:34:56 -0700 Subject: [PATCH 2/5] toolchain/binutils: fix broken build of binutils 2.34 on mips64 Commit 53470bdf32 ("toolchain/binutils: Add binutils 2.34") logs refreshed patches, but also adds a typo causing failed builds on mipsel64 platforms, including the malta subtarget. Update the patch to fix this. This fixes the following build error: make[7]: *** No rule to make target 'elf64ltsmip.o', needed by 'ld-new'. Stop. Fixes: FS#3276 Fixes: 53470bdf32 ("toolchain/binutils: Add binutils 2.34") Signed-off-by: Tony Ambardar --- .../2.34/500-Change-default-emulation-for-mips64-linux.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/binutils/patches/2.34/500-Change-default-emulation-for-mips64-linux.patch b/toolchain/binutils/patches/2.34/500-Change-default-emulation-for-mips64-linux.patch index 24c2afb8be..455ac0001d 100644 --- a/toolchain/binutils/patches/2.34/500-Change-default-emulation-for-mips64-linux.patch +++ b/toolchain/binutils/patches/2.34/500-Change-default-emulation-for-mips64-linux.patch @@ -25,7 +25,7 @@ ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" -+mips64*el-*-linux-*) targ_emul=lf64ltsmip ++mips64*el-*-linux-*) targ_emul=elf64ltsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" targ_extra_libpath=$targ_extra_emuls ;; From 08ef184fc72efdc71a62597d762b54f530f0fd7e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 10 Aug 2020 23:33:00 +0100 Subject: [PATCH 3/5] oxnas: reduce size of ATA DMA descriptor space After years of trying to find the reason for random kernel crashes while both CPU and SATA are under load it has been found. Some odd commented-out #defines in kref's single-port driver [1] which were copied from the vendor driver made me develop a theory: The IO-mapped memory area for DMA descriptors apparetly got some holes just before the alignment boundaries. This feels like an off-by-one bug in the hardware or maybe those fields are used internally by the SATA controller's firmware. Whatever the cause is: they cannot be used and trying to use them results in reading back unexpected stuff and ends up with oopsing Unable to handle kernel paging request at virtual address d085c004 Work around the issue by reducing the area used for bmdma descriptors. This reduces SATA performance (iops) quite a bit, but finally makes things work reliably. Possibly one could optimize this much more by really just skipping the holes in that memory area -- however, that seems to be non-trivial with the driver and libata in it's current form (suggestions are welcome). The 'proper' way to have good SATA performance would be to make use of the hardware RAID features (one can use the JBOD mode to access even just a single disc transparently through the RAID controller integrated in the SATA host instead of accessing the SATA ports 'raw' as we do now). [1]: https://github.com/kref/linux-oxnas/blob/master/drivers/ata/sata_oxnas.c#L25 Signed-off-by: Daniel Golle --- target/linux/oxnas/files/drivers/ata/sata_oxnas.c | 2 +- target/linux/oxnas/image/ox820.mk | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/target/linux/oxnas/files/drivers/ata/sata_oxnas.c b/target/linux/oxnas/files/drivers/ata/sata_oxnas.c index 64afa728a1..ecfbf5f01a 100644 --- a/target/linux/oxnas/files/drivers/ata/sata_oxnas.c +++ b/target/linux/oxnas/files/drivers/ata/sata_oxnas.c @@ -70,7 +70,7 @@ struct sgdma_request { /* Controller information */ enum { - SATA_OXNAS_MAX_PRD = 254, + SATA_OXNAS_MAX_PRD = 63, SATA_OXNAS_DMA_SIZE = SATA_OXNAS_MAX_PRD * sizeof(struct ata_bmdma_prd) + sizeof(struct sgdma_request), diff --git a/target/linux/oxnas/image/ox820.mk b/target/linux/oxnas/image/ox820.mk index de1bfd19fb..363c4a77bf 100644 --- a/target/linux/oxnas/image/ox820.mk +++ b/target/linux/oxnas/image/ox820.mk @@ -64,9 +64,6 @@ define Device/shuttle_kd20 DEVICE_TITLE := Shuttle KD20 SUPPORTED_DEVICES += kd20 KERNEL := kernel-bin | append-dtb | uImage none - KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-factory - KERNEL_INITRAMFS_SUFFIX := .tar.gz - KERNEL_INITRAMFS = kernel-bin | append-dtb | uImage none | omninas-factory | encrypt-3des sohmuntitnlaes DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ata-oxnas-sata kmod-usb-ledtrig-usbport \ kmod-usb3 kmod-i2c-gpio kmod-rtc-pcf8563 kmod-gpio-beeper \ kmod-hwmon-core kmod-hwmon-gpiofan \ From 6cce102ecdf83ce89085a637de8a28da5f4b8c79 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 16 Aug 2020 02:27:44 +0800 Subject: [PATCH 4/5] OpenClash: sync with upstream source --- .../files/etc/config/openclash | 59 ++++++++++++++----- .../files/etc/init.d/openclash | 34 ++++++++--- .../lua/luci/model/cbi/openclash/servers.lua | 7 +++ .../usr/share/openclash/dashboard/index.html | 2 +- .../js/1.bundle.658aa6a6e3feec8f168b.min.js | 2 + ...e.658aa6a6e3feec8f168b.min.js.LICENSE.txt} | 0 .../js/1.bundle.c9560a80b67c63849a45.min.js | 2 - .../js/bundle.658aa6a6e3feec8f168b.min.js | 1 + .../js/bundle.c9560a80b67c63849a45.min.js | 1 - ...9a45.css => main.658aa6a6e3feec8f168b.css} | 0 .../usr/share/openclash/openclash_core.sh | 2 +- .../usr/share/openclash/openclash_update.sh | 6 +- .../openclash/yacd/14.b009c101831cfb4d346c.js | 1 + .../openclash/yacd/8.e3abc5a7c49aa7ea6723.js | 1 - .../yacd/app.376109b701ec59f06065.css | 29 --------- .../yacd/app.5d3ecaf99a6e7dc51d5c.js | 2 - .../yacd/app.5f32612351603f3dc36a.css | 20 +++++++ .../yacd/app.8bd641dadb8c0be21576.js | 2 + ...> app.8bd641dadb8c0be21576.js.LICENSE.txt} | 0 .../yacd/config.185469682369eea7ed5e.js | 1 + .../yacd/config.683c5e4f78100df80abd.css | 2 + .../yacd/conns.a55d943aa09565fccb1a.js | 1 + .../yacd/conns.a8987b95653cf010754d.css | 5 ++ .../yacd/core-js~app.4e0935a458133ffa9ca3.js | 1 - .../yacd/core-js~app.d6acbd497dd781bcb87a.js | 1 + .../files/usr/share/openclash/yacd/index.html | 2 +- .../yacd/logs.367e6b30d27de1213a87.js | 1 + .../yacd/logs.bf8d3190ebe74f5f5c12.css | 2 + .../yacd/proxies.1e31d885e6fe278da534.css | 12 ---- .../yacd/proxies.2054c162aeb581d56063.css | 13 ++++ .../yacd/proxies.beaddeef3e0db08db953.js | 1 - .../yacd/proxies.fe3172e32076eb8749e4.js | 1 + .../yacd/react~app.10618449a8e9b56a1845.js | 2 - .../yacd/react~app.85a6af7ab221658559e3.js | 2 + ...t~app.85a6af7ab221658559e3.js.LICENSE.txt} | 0 .../usr/share/openclash/yacd/report.html | 4 +- .../yacd/rules.3ba17dd53c9d8bd8b221.css | 4 -- .../yacd/rules.c683294879982ba68ae8.js | 1 - .../yacd/rules.ebacd344d22f80adb7f8.css | 5 ++ .../yacd/rules.fe5dbfb2f26ad4211d1e.js | 1 + .../yacd/runtime.41c657849345d551b223.js | 1 + .../yacd/runtime.826e0d5006b75f4ed314.js | 1 - .../vendors~chartjs.c749992ca47ba67623b4.js | 2 + ...artjs.c749992ca47ba67623b4.js.LICENSE.txt} | 0 .../vendors~chartjs.e4543f10556636d64b75.js | 2 - .../vendors~conns.2d8ba1925a9d128867eb.js | 1 + ...onns~proxies~rules.99b1a71b3d76d3035e41.js | 1 + ...vendors~logs~rules.1b69c8ae2dc5929cac38.js | 1 + .../vendors~proxies.34b4cb2526b2e8ed766c.js | 1 - .../vendors~proxies.8fcc0e726f340a602edf.js | 1 + .../usr/share/openclash/yml_proxys_set.sh | 59 ++++++++++++++++++- .../i18n/zh-cn/openclash.zh-cn.po | 6 ++ 52 files changed, 217 insertions(+), 92 deletions(-) create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.658aa6a6e3feec8f168b.min.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/{1.bundle.c9560a80b67c63849a45.min.js.LICENSE.txt => 1.bundle.658aa6a6e3feec8f168b.min.js.LICENSE.txt} (100%) delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.c9560a80b67c63849a45.min.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/bundle.658aa6a6e3feec8f168b.min.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/bundle.c9560a80b67c63849a45.min.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/{main.c9560a80b67c63849a45.css => main.658aa6a6e3feec8f168b.css} (100%) create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/14.b009c101831cfb4d346c.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/8.e3abc5a7c49aa7ea6723.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.376109b701ec59f06065.css delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.5d3ecaf99a6e7dc51d5c.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.5f32612351603f3dc36a.css create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.8bd641dadb8c0be21576.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{app.5d3ecaf99a6e7dc51d5c.js.LICENSE.txt => app.8bd641dadb8c0be21576.js.LICENSE.txt} (100%) create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/config.185469682369eea7ed5e.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/config.683c5e4f78100df80abd.css create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/conns.a55d943aa09565fccb1a.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/conns.a8987b95653cf010754d.css delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/core-js~app.4e0935a458133ffa9ca3.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/core-js~app.d6acbd497dd781bcb87a.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/logs.367e6b30d27de1213a87.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/logs.bf8d3190ebe74f5f5c12.css delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/proxies.1e31d885e6fe278da534.css create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/proxies.2054c162aeb581d56063.css delete 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/proxies.fe3172e32076eb8749e4.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/react~app.10618449a8e9b56a1845.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/react~app.85a6af7ab221658559e3.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{react~app.10618449a8e9b56a1845.js.LICENSE.txt => react~app.85a6af7ab221658559e3.js.LICENSE.txt} (100%) delete 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.c683294879982ba68ae8.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/rules.ebacd344d22f80adb7f8.css create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/rules.fe5dbfb2f26ad4211d1e.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/runtime.41c657849345d551b223.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/runtime.826e0d5006b75f4ed314.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~chartjs.c749992ca47ba67623b4.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{vendors~chartjs.e4543f10556636d64b75.js.LICENSE.txt => vendors~chartjs.c749992ca47ba67623b4.js.LICENSE.txt} (100%) delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~chartjs.e4543f10556636d64b75.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~conns.2d8ba1925a9d128867eb.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~conns~proxies~rules.99b1a71b3d76d3035e41.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~logs~rules.1b69c8ae2dc5929cac38.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~proxies.34b4cb2526b2e8ed766c.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~proxies.8fcc0e726f340a602edf.js diff --git a/package/ctcgfw/luci-app-openclash/files/etc/config/openclash b/package/ctcgfw/luci-app-openclash/files/etc/config/openclash index dcaf098074..ed5ba07143 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/config/openclash +++ b/package/ctcgfw/luci-app-openclash/files/etc/config/openclash @@ -32,36 +32,67 @@ config dns_servers option group 'nameserver' option type 'udp' option ip '114.114.114.114' - option enabled '0' + option enabled '1' config dns_servers option group 'nameserver' option type 'udp' option ip '119.29.29.29' - option enabled '0' + option enabled '1' config dns_servers - option ip '8.8.8.8' + option group 'nameserver' + option type 'udp' + option ip '119.28.28.28' + option enabled '1' + +config dns_servers + option group 'nameserver' + option type 'udp' + option ip '223.5.5.5' + option enabled '1' + +config dns_servers + option enabled '1' + option group 'nameserver' + option ip 'doh.rixcloud.dev/dns-query' + option type 'https' + +config dns_servers + option type 'https' + option group 'fallback' + option enabled '1' + option ip 'cloudflare-dns.com/dns-query' + +config dns_servers + option group 'fallback' + option enabled '1' + option ip 'dns.google/dns-query' + option type 'https' + +config dns_servers + option enabled '1' + option group 'fallback' + option ip 'dns.google' option port '853' option type 'tls' - option enabled '0' - option group 'fallback' config dns_servers - option ip '1.1.1.1/dns-query' + option enabled '1' + option group 'fallback' option type 'https' - option enabled '0' - option group 'fallback' + option ip '1.1.1.1/dns-query' config dns_servers + option enabled '1' + option group 'fallback' option ip '1.1.1.1' option port '853' option type 'tls' - option enabled '0' - option group 'fallback' config dns_servers - option ip 'doh.rixcloud.dev/dns-query' - option type 'https' - option enabled '0' - option group 'fallback' \ No newline at end of file + option enabled '1' + option group 'fallback' + option ip '8.8.8.8' + option port '853' + option type 'tls' 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 7dca6ae4c5..896770c2d8 100755 --- a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash +++ b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash @@ -279,9 +279,12 @@ yml_dns_check() sed -i '/^Proxy:/i\ nameserver:' "$CONFIG_FILE" 2>/dev/null fi 2>/dev/null sed -i "/^ \{0,\}nameserver:/a\ - tls://8.8.8.8:853" "$CONFIG_FILE" 2>/dev/null - sed -i "/^ \{0,\}nameserver:/a\ - https://doh.rixcloud.dev/dns-query" "$CONFIG_FILE" 2>/dev/null + sed -i "/^ \{0,\}nameserver:/a\ - https://1.1.1.1/dns-query" "$CONFIG_FILE" 2>/dev/null + sed -i "/^ \{0,\}nameserver:/a\ - https://dns.google/dns-query" "$CONFIG_FILE" 2>/dev/null + sed -i "/^ \{0,\}nameserver:/a\ - https://cloudflare-dns.com/dns-query" "$CONFIG_FILE" 2>/dev/null sed -i "/^ \{0,\}nameserver:/a\ fallback:" "$CONFIG_FILE" 2>/dev/null - sed -i "/^ \{0,\}nameserver:/a\ - 223.5.5.5" "$CONFIG_FILE" 2>/dev/null + sed -i "/^ \{0,\}nameserver:/a\ - https://doh.rixcloud.dev/dns-query" "$CONFIG_FILE" 2>/dev/null + sed -i "/^ \{0,\}nameserver:/a\ - 119.29.29.29" "$CONFIG_FILE" 2>/dev/null sed -i "/^ \{0,\}nameserver:/a\ - 114.114.114.114" "$CONFIG_FILE" 2>/dev/null fi @@ -505,11 +508,28 @@ yml_dns_custom() sed -i '/cfw-bypass:/,$d' /tmp/fallback.cache 2>/dev/null sed -i '/cfw-latency-timeout:/,$d' /tmp/fallback.cache 2>/dev/null sed -i '/fallback:/,$d' "$2" 2>/dev/null - echo " fallback:" >>"$2" - sed -i '/ fallback:/a\ - 240.0.0.0/4' "$2" 2>/dev/null - sed -i '/ fallback:/a\ ipcidr:' "$2" 2>/dev/null - sed -i '/ fallback:/a\ geoip: true' "$2" 2>/dev/null - sed -i '/ fallback:/a\ fallback-filter:' "$2" 2>/dev/null +cat >> "$2" <<-EOF + fallback: + fallback-filter: + geoip: true + ipcidr: + - 0.0.0.0/8 + - 10.0.0.0/8 + - 100.64.0.0/10 + - 127.0.0.0/8 + - 169.254.0.0/16 + - 172.16.0.0/12 + - 192.0.0.0/24 + - 192.0.2.0/24 + - 192.88.99.0/24 + - 192.168.0.0/16 + - 198.18.0.0/15 + - 198.51.100.0/24 + - 203.0.113.0/24 + - 224.0.0.0/4 + - 240.0.0.0/4 + - 255.255.255.255/32 +EOF sed -i '/ fallback:/r/tmp/fallback.cache' "$2" 2>/dev/null rm -rf /tmp/fallback.cache 2>/dev/null echo "#===================== OpenClash-General-Settings =====================#" >>"$2" 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 f82ef6ac73..000b7475de 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 @@ -28,6 +28,13 @@ o:value("lhie1", translate("lhie1 Rules")) o:value("ConnersHua", translate("ConnersHua(Provider-type) Rules")) o:value("ConnersHua_return", translate("ConnersHua Return Rules")) +o = s:option(ListValue, "mix_proxies", translate("Mix Proxies")) +o.description = font_red .. bold_on .. translate("Mix This Page's Proxies") .. bold_off .. font_off +o:depends("create_config", 1) +o:value("0", translate("Disable")) +o:value("1", translate("Enable")) +o.default=0 + o = s:option(ListValue, "servers_update", translate("Keep Settings")) o.description = font_red .. bold_on .. translate("Only Update Servers Below When Subscription") .. bold_off .. font_off o:value("0", translate("Disable")) 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 309f7bd915..9250ee7223 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.658aa6a6e3feec8f168b.min.js b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.658aa6a6e3feec8f168b.min.js new file mode 100644 index 0000000000..e8981cca79 --- /dev/null +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.658aa6a6e3feec8f168b.min.js @@ -0,0 +1,2 @@ +/*! For license information please see 1.bundle.658aa6a6e3feec8f168b.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)try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(e)}catch(t){console.error(t)}}(),e.exports=n(55)},function(e,t){e.exports=function(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}},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),o=n(88);e.exports=function(e){return"symbol"==typeof e||o(e)&&"[object Symbol]"==r(e)}},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(39)(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 K&&e instanceof Map}function h(e){return Y&&e instanceof Set}function v(e){return e.o||e.t}function m(e){if(Array.isArray(e))return e.slice();var t=ne(e);delete t[Z];for(var n=te(t),r=0;r1&&(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){return null==e||"object"!=typeof e||Object.isFrozen(e)}function w(e){var t=re[e];return t||r(19,e),t}function S(e,t){re[e]=t}function x(){return G}function _(e,t){t&&(w("Patches"),e.u=[],e.s=[],e.v=t)}function E(e){T(e),e.p.forEach(k),e.p=null}function T(e){e===G&&(G=e.l)}function R(e){return G={p:[],l:G,h:e,m:!0,_:0}}function k(e){var t=e[Z];0===t.i||1===t.i?t.j():t.g=!0}function C(e,t){t._=t.p.length;var n=t.p[0],o=void 0!==e&&e!==n;return t.h.O||w("ES5").S(t,e,o),o?(n[Z].P&&(E(t),r(4)),i(e)&&(e=P(t,e),t.l||M(t,e)),t.u&&w("Patches").M(n[Z],e,t.u,t.s)):e=P(t,n,[]),E(t),t.u&&t.v(t.u,t.s),e!==X?e:void 0}function P(e,t,n){if(b(t))return t;var r=t[Z];if(!r)return u(t,(function(o,i){return O(e,r,t,o,i,n)}),!0),t;if(r.A!==e)return t;if(!r.P)return M(e,r.t,!0),r.t;if(!r.I){r.I=!0,r.A._--;var o=4===r.i||5===r.i?r.o=m(r.k):r.o;u(3===r.i?new Set(o):o,(function(t,i){return O(e,r,o,t,i,n)})),M(e,o,!1),n&&e.u&&w("Patches").R(r,n,e.u,e.s)}return r.o}function O(e,t,n,r,a,u){if(o(a)){var l=P(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)&&!b(a)){if(!e.h.N&&e._<1)return;P(e,a),t&&t.A.l||M(e,a)}}function M(e,t,n){void 0===n&&(n=!1),e.h.N&&e.m&&g(t,n)}function A(e,t){var n=e[Z];return(n?v(n):e)[t]}function I(e,t){if(t in e)for(var n=Object.getPrototypeOf(e);n;){var r=Object.getOwnPropertyDescriptor(n,t);if(r)return r;n=Object.getPrototypeOf(n)}}function N(e){e.P||(e.P=!0,e.l&&N(e.l))}function z(e){e.o||(e.o=m(e.t))}function L(e,t,n){var r=p(t)?w("MapSet").T(t,n):h(t)?w("MapSet").F(t,n):e.O?function(e,t){var n=Array.isArray(e),r={i:n?1:0,A:t?t.A:x(),P:!1,I:!1,D:{},l:t,t:e,k:null,o:null,j:null,C:!1},o=r,i=oe;n&&(o=[r],i=ie);var a=Proxy.revocable(o,i),u=a.revoke,l=a.proxy;return r.k=l,r.j=u,l}(t,n):w("ES5").J(t,n);return(n?n.A:x()).p.push(r),r}function F(e){return o(e)||r(22,e),function e(t){if(!i(t))return t;var n,r=t[Z],o=l(t);if(r){if(!r.P&&(r.i<4||!w("ES5").K(r)))return r.t;r.I=!0,n=j(t,o),r.I=!1}else n=j(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 j(e,t){switch(t){case 2:return new Map(e);case 3:return Array.from(e)}return m(e)}function D(){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[Z];return oe.get(t,e)},set:function(t){var n=this[Z];oe.set(n,e,t)}},n}function t(e){for(var t=e.length-1;t>=0;t--){var o=e[t][Z];if(!o.P)switch(o.i){case 5:r(o)&&N(o);break;case 4:n(o)&&N(o)}}}function n(e){for(var t=e.t,n=e.k,r=te(n),o=r.length-1;o>=0;o--){var i=r[o];if(i!==Z){var a=t[i];if(void 0===a&&!s(t,i))return!0;var u=n[i],l=u&&u[Z];if(l?l.t!==a:!d(u,a))return!0}}var c=!!t[Z];return r.length!==te(t).length+(c?0:1)}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={};S("ES5",{J:function(t,n){var r=Array.isArray(t),o=function(t,n){if(t){for(var r=Array(n.length),o=0;o1?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=w("Patches").$;return o(e)?i(e,t):this.produce(e,(function(e){return i(e,t.slice(n+1))}))},e}(),ue=new ae,le=ue.produce,se=ue.produceWithPatches.bind(ue),ce=ue.setAutoFreeze.bind(ue),fe=ue.setUseProxies.bind(ue),de=ue.applyPatches.bind(ue),pe=ue.createDraft.bind(ue),he=ue.finishDraft.bind(ue);t.default=le},,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(17).Symbol;e.exports=r},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="date",c=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?.?(\d{1,3})?$/,f=/\[([^\]]+)]|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,d=function(e,t,n){var r=String(e);return!r||r.length>=t?e:""+Array(t+1-r.length).join(n)+e},p={s:d,z:function(e){var t=-e.utcOffset(),n=Math.abs(t),r=Math.floor(n/60),o=n%60;return(t<=0?"+":"-")+d(r,2,"0")+":"+d(o,2,"0")},m:function e(t,n){if(t.date()-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),u=~~((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 s.get(r)}))}return Promise.resolve(s.get(r))},O=function(e,t,n){var r=T[e];if(e&&r)for(var o=0;o0));return[2,Promise.all(h).then((function(){if(c)throw c;return s.get(o)}))]}if(c)throw c;return[2,l]}}))}))};var A=v.Provider,I=function(){for(var e=this,t=[],n=0;n=1&&(o=t[0]),t.length>2?(i=t[1],u=t[2]):"function"==typeof t[1]?i=t[1]:"object"==typeof t[1]&&(u=t[1]);var l=s.serializeKey(o),c=l[0],h=l[1],y=l[2];u=Object.assign({},f,Object(r.useContext)(v),u),void 0===i&&(i=u.fetcher);var C=s.get(c)||u.initialData,P=s.get(y),A=Object(r.useRef)({data:!1,error:!1,isValidating:!1}),I=Object(r.useRef)({data:C,error:P,isValidating:!1}),N=Object(r.useState)(null)[1],z=Object(r.useCallback)((function(e){var t=!1;for(var n in e)I.current[n]=e[n],A.current[n]&&(t=!0);if(t||u.suspense){if(L.current)return;N({})}}),[]),L=Object(r.useRef)(!1),F=Object(r.useRef)(c),j=Object(r.useRef)({emit:function(e){for(var t=[],n=1;n=0&&(n[r]=n[n.length-1],n.pop())}},U=Object(r.useCallback)((function(t){return void 0===t&&(t={}),m(e,void 0,void 0,(function(){var e,n,r,o,a,l,f;return g(this,(function(d){switch(d.label){case 0:if(!c||!i)return[2,!1];if(L.current)return[2,!1];t=Object.assign({dedupe:!1},t),e=!0,n=void 0!==S[c]&&t.dedupe,d.label=1;case 1:return d.trys.push([1,6,,7]),z({isValidating:!0}),r=void 0,o=void 0,n?(o=x[c],[4,S[c]]):[3,3];case 2:return r=d.sent(),[3,5];case 3:return u.loadingTimeout&&!s.get(c)&&setTimeout((function(){e&&j.current.emit("onLoadingSlow",c,u)}),u.loadingTimeout),S[c]=null!==h?i.apply(void 0,h):i(c),x[c]=o=Date.now(),[4,S[c]];case 4:r=d.sent(),setTimeout((function(){delete S[c],delete x[c]}),u.dedupingInterval),j.current.emit("onSuccess",r,c,u),d.label=5;case 5:return x[c]>o||R[c]&&(o<=R[c]||o<=k[c]||0===k[c])?(z({isValidating:!1}),[2,!1]):(s.set(c,r),s.set(y,void 0),a={isValidating:!1},void 0!==I.current.error&&(a.error=void 0),u.compare(I.current.data,r)||(a.data=r),z(a),n||O(c,r,void 0),[3,7]);case 6:return l=d.sent(),delete S[c],delete x[c],s.set(y,l),I.current.error!==l&&(z({isValidating:!1,error:l}),n||O(c,void 0,l)),j.current.emit("onError",l,c,u),u.shouldRetryOnError&&(f=(t.retryCount||0)+1,j.current.emit("onErrorRetry",l,c,u,U,Object.assign({dedupe:!0},t,{retryCount:f}))),[3,7];case 7:return e=!1,[2,!0]}}))}))}),[c]);if(w((function(){if(c){L.current=!1;var e=I.current.data,t=s.get(c)||u.initialData;F.current===c&&u.compare(e,t)||(z({data:t}),F.current=c);var n,r,o=function(){return U({dedupe:!0})};(u.revalidateOnMount||!u.initialData&&void 0===u.revalidateOnMount)&&(void 0!==t?b(o):o()),u.revalidateOnFocus&&(n=p(o,u.focusThrottleInterval)),u.revalidateOnReconnect&&(r=o);var i=function(e,t,n,r){void 0===e&&(e=!0),void 0===r&&(r=!0);var i={},a=!1;return void 0===t||u.compare(I.current.data,t)||(i.data=t,a=!0),I.current.error!==n&&(i.error=n,a=!0),a&&z(i),!!e&&(r?o():U())};return B(_,n),B(E,r),B(T,i),function(){z=function(){return null},L.current=!0,V(_,n),V(E,r),V(T,i)}}}),[c,U]),w((function(){var t=null,n=function(){return m(e,void 0,void 0,(function(){return g(this,(function(e){switch(e.label){case 0:return I.current.error||!u.refreshWhenHidden&&!a()||!u.refreshWhenOffline&&!d()?[3,2]:[4,U({dedupe:!0})];case 1:e.sent(),e.label=2;case 2:return u.refreshInterval&&(t=setTimeout(n,u.refreshInterval)),[2]}}))}))};return u.refreshInterval&&(t=setTimeout(n,u.refreshInterval)),function(){t&&clearTimeout(t)}}),[u.refreshInterval,u.refreshWhenHidden,u.refreshWhenOffline,U]),u.suspense){var W=s.get(c)||C,H=s.get(y)||P;if(void 0===W&&void 0===H){if(S[c]||U(),S[c]&&"function"==typeof S[c].then)throw S[c];W=S[c]}if(void 0===W&&H)throw H;return{error:H,data:W,revalidate:U,mutate:D,isValidating:I.current.isValidating}}return Object(r.useMemo)((function(){var e={revalidate:U,mutate:D};return Object.defineProperties(e,{error:{get:function(){return A.current.error=!0,F.current===c?I.current.error:P},enumerable:!0},data:{get:function(){return A.current.data=!0,F.current===c?I.current.data:C},enumerable:!0},isValidating:{get:function(){return A.current.isValidating=!0,I.current.isValidating},enumerable:!0}}),e}),[U])},N=function(e,t,n,r){return new(n||(n=Promise))((function(o,i){function a(e){try{l(r.next(e))}catch(t){i(t)}}function u(e){try{l(r.throw(e))}catch(t){i(t)}}function l(e){var t;e.done?o(e.value):(t=e.value,t instanceof n?t:new n((function(e){e(t)}))).then(a,u)}l((r=r.apply(e,t||[])).next())}))},z=function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function u(i){return function(u){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=a.trys,(o=o.length>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]=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 u=(a=Object.assign({},f,Object(r.useContext)(v),a)).initialSize,l=void 0===u?1:u,c=a.revalidateAll,d=void 0!==c&&c,p=a.persistSize,h=void 0!==p&&p,m=a.fetcher,g=L(a,["initialSize","revalidateAll","persistSize","fetcher"]);void 0===i&&(i=m);var y=null;try{y=s.serializeKey(o(0,null))[0]}catch(k){}var b=Object(r.useState)(!1)[1],w=null;y&&(w="context@"+y);var S,x=null;y&&(x="size@"+y,S=s.get(x));var _=Object(r.useRef)(S||l),E=Object(r.useRef)(!1);Object(r.useEffect)((function(){E.current?h||(_.current=l):E.current=!0}),[y]);var T=I(y?["many",y]:null,(function(){return N(e,void 0,void 0,(function(){var e,t,n,r,u,l,c,f,p,h;return z(this,(function(v){switch(v.label){case 0:e=s.get(w)||{},t=e.originalData,n=e.force,r=[],u=null,l=0,v.label=1;case 1:return l<_.current?(c=s.serializeKey(o(l,u)),f=c[0],p=c[1],f?(h=s.get(f),d||n||void 0===n&&0===l||t&&!a.compare(t[l],h)||void 0===h?null===p?[3,3]:[4,i.apply(void 0,p)]:[3,6]):[3,8]):[3,8];case 2:return h=v.sent(),[3,5];case 3:return[4,i(f)];case 4:h=v.sent(),v.label=5;case 5:s.set(f,h),v.label=6;case 6:r.push(h),u=h,v.label=7;case 7:return++l,[3,1];case 8:return s.delete(w),[2,r]}}))}))}),g),R=T.mutate;return T.size=_.current,T.mutate=Object(r.useCallback)((function(e,t){if(void 0===t&&(t=!0),t&&void 0!==e){var n=T.data;s.set(w,{originalData:n,force:!1})}else t&&s.set(w,{force:!0});return R(e,t)}),[R,T.data,w]),T.setSize=Object(r.useCallback)((function(e){return"function"==typeof e?_.current=e(_.current):"number"==typeof e&&(_.current=e),s.set(x,_.current),b((function(e){return!e})),T.mutate((function(e){return e}))}),[T.mutate,x]),T}t.default=I},function(e,t,n){"use strict";n.r(t),n.d(t,"MemoryRouter",(function(){return B})),n.d(t,"Prompt",(function(){return U})),n.d(t,"Redirect",(function(){return G})),n.d(t,"Route",(function(){return Q})),n.d(t,"Router",(function(){return D})),n.d(t,"StaticRouter",(function(){return ne})),n.d(t,"Switch",(function(){return re})),n.d(t,"generatePath",(function(){return $})),n.d(t,"matchPath",(function(){return Y})),n.d(t,"useHistory",(function(){return ae})),n.d(t,"useLocation",(function(){return ue})),n.d(t,"useParams",(function(){return le})),n.d(t,"useRouteMatch",(function(){return se})),n.d(t,"withRouter",(function(){return oe})),n.d(t,"BrowserRouter",(function(){return ce})),n.d(t,"HashRouter",(function(){return fe})),n.d(t,"Link",(function(){return ge})),n.d(t,"NavLink",(function(){return we}));var r=n(3),o=n(0),i=n.n(o),a=(n(14),n(2));function u(e){return"/"===e.charAt(0)}function l(e,t){for(var n=t,r=n+1,o=e.length;r=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 v(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 m(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:m,goBack:function(){m(-1)},goForward:function(){m(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(136))},function(e,t,n){"use strict";var r=n(7),o=n(138),i=n(41),a=n(140),u=n(143),l=n(144),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||"",v=e.auth.password||"";d.Authorization="Basic "+btoa(h+":"+v)}var m=a(e.baseURL,e.url);if(p.open(e.method.toUpperCase(),i(m,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(145),y=(e.withCredentials||l(m))&&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(139);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(34),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),v=l(n),m=0;mO.length&&O.push(e)}function I(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