From 58ae8b1db9437e6f625dcf8828055a50ce216456 Mon Sep 17 00:00:00 2001 From: "github-action[bot]" Date: Wed, 19 Jun 2024 20:31:57 +0200 Subject: [PATCH] Update On Wed Jun 19 20:31:56 CEST 2024 --- .github/update.log | 1 + clash-meta/go.mod | 2 +- clash-meta/go.sum | 4 +- .../listener/sing_tun/redirect_linux.go | 3 + clash-meta/listener/sing_tun/redirect_stub.go | 5 + clash-meta/listener/sing_tun/server.go | 8 +- .../src/components/proxies/node-list.tsx | 36 +- .../proxies/scroll-current-node.tsx | 26 + .../src/components/proxies/sort-selector.tsx | 11 +- .../frontend/nyanpasu/src/pages/proxies.tsx | 22 +- .../frontend/ui/hooks/use-breakpoint.ts | 4 +- clash-nyanpasu/manifest/version.json | 4 +- clash-nyanpasu/package.json | 2 +- clash-nyanpasu/pnpm-lock.yaml | 19 +- clash-verge-rev/scripts/check.mjs | 12 +- .../scripts/portable-fixed-webview2.mjs | 4 +- clash-verge-rev/scripts/portable.mjs | 4 +- clash-verge-rev/src-tauri/src/config/clash.rs | 2 +- clash-verge-rev/src-tauri/src/config/verge.rs | 2 +- .../src-tauri/src/core/clash_api.rs | 1 + clash-verge-rev/src-tauri/src/core/core.rs | 79 +- clash-verge-rev/src-tauri/src/core/service.rs | 19 +- .../src-tauri/src/enhance/chain.rs | 4 +- clash-verge-rev/src-tauri/tauri.conf.json | 2 +- .../src-tauri/tauri.linux.conf.json | 12 +- .../src-tauri/template/installer.nsi | 32 + .../connection/connection-table.tsx | 8 +- .../src/components/layout/layout-traffic.tsx | 4 +- .../setting/mods/clash-core-viewer.tsx | 6 +- .../components/setting/mods/tun-viewer.tsx | 12 +- clash-verge-rev/src/hooks/use-clash.ts | 2 +- clash-verge-rev/src/main.tsx | 17 +- clash-verge-rev/src/pages/proxies.tsx | 7 +- echo/.github/workflows/nightly.yaml | 2 +- filebrowser/frontend/package-lock.json | 20 +- hysteria/app/go.mod | 4 - hysteria/app/go.sum | 4 - hysteria/core/go.sum | 10 + .../internal/integration_tests/.mockery.yaml | 3 + .../internal/integration_tests/hook_test.go | 145 + .../mocks/mock_RequestHook.go | 188 + hysteria/core/server/config.go | 15 + hysteria/core/server/mock_udpIO.go | 47 + hysteria/core/server/server.go | 40 +- hysteria/core/server/udp.go | 30 +- hysteria/core/server/udp_test.go | 1 + hysteria/extras/go.mod | 5 +- hysteria/extras/go.sum | 9 + .../src/board-jdcloud_ax1800pro.ipq6018 | Bin 0 -> 65644 bytes .../ipq-wifi/src/board-jdcloud_ax6600.ipq6018 | Bin 0 -> 65644 bytes .../arm64/boot/dts/qcom/ipq6000-re-ss-01.dts | 2 +- .../arm64/boot/dts/qcom/ipq6010-re-cs-02.dts | 6 + mihomo/go.mod | 2 +- mihomo/go.sum | 4 +- mihomo/listener/sing_tun/redirect_linux.go | 3 + mihomo/listener/sing_tun/redirect_stub.go | 5 + mihomo/listener/sing_tun/server.go | 8 +- openwrt-packages/lua-maxminddb/Makefile | 9 +- openwrt-packages/lua-maxminddb/README.md | 3 - openwrt-packages/luci-app-koolproxyR/Makefile | 95 - .../luci-app-koolproxyR/README.md | 33 - .../luci-app-koolproxyR/files/bin/arm | Bin 473736 -> 0 bytes .../luci-app-koolproxyR/files/bin/i386 | Bin 605688 -> 0 bytes .../luci-app-koolproxyR/files/bin/mips | Bin 486696 -> 0 bytes .../luci-app-koolproxyR/files/bin/mipsel | Bin 490188 -> 0 bytes .../luci-app-koolproxyR/files/bin/x86_64 | Bin 620560 -> 0 bytes .../files/etc/adblocklist/adblock | 0 .../files/etc/adblocklist/adblockip | 1 - .../files/etc/adblocklist/adbypass | 1 - .../files/etc/adblocklist/adbypassip | 0 .../files/etc/config/koolproxy | 17 - .../files/etc/init.d/koolproxy | 475 - .../files/etc/uci-defaults/luci-koolproxy | 17 - .../files/lib/upgrade/keep.d/koolproxy | 3 - .../usr/lib/lua/luci/controller/koolproxy.lua | 8 - .../usr/lib/lua/luci/i18n/koolproxy.zh-cn.lmo | Bin 2508 -> 0 bytes .../lua/luci/model/cbi/koolproxy/global.lua | 392 - .../lua/luci/model/cbi/koolproxy/rss_rule.lua | 36 - .../lib/lua/luci/view/koolproxy/cadvalue.htm | 8 - .../lib/lua/luci/view/koolproxy/caupload.htm | 5 - .../lib/lua/luci/view/koolproxy/dvalue.htm | 3 - .../usr/lib/lua/luci/view/koolproxy/index.htm | 16 - .../files/usr/sbin/adblockplus | 23 - .../files/usr/share/koolproxy/adblock.conf | 0 .../files/usr/share/koolproxy/camanagement | 66 - .../files/usr/share/koolproxy/data/gen_ca.sh | 29 - .../usr/share/koolproxy/data/openssl.cnf | 132 - .../koolproxy/data/rules/easylistchina.txt | 27813 ---------------- .../usr/share/koolproxy/data/rules/fanboy.txt | 21958 ------------ .../usr/share/koolproxy/data/rules/kp.dat | Bin 37232 -> 0 bytes .../usr/share/koolproxy/data/rules/user.txt | 49 - .../usr/share/koolproxy/data/rules/yhosts.txt | 16687 --------- .../usr/share/koolproxy/data/source.list | 5 - .../files/usr/share/koolproxy/data/user.txt | 49 - .../files/usr/share/koolproxy/dnsmasq.adblock | 5102 --- .../usr/share/koolproxy/koolproxy_ipset.conf | 6584 ---- .../files/usr/share/koolproxy/kpupdate | 602 - .../luci-app-koolproxyR/koolproxy.txt | 194 - .../luci-app-koolproxyR/koolproxyupdate.sh | 13 - openwrt-packages/luci-app-store/API.md | 13 +- openwrt-packages/luci-app-store/Makefile | 4 +- .../luasrc/controller/store.lua | 46 +- .../luci-app-store/luasrc/view/store/main.htm | 4 +- .../luci-app-store/root/bin/is-opkg | 41 +- openwrt-packages/luci-lib-taskd/Makefile | 2 +- .../luci-static/resources/tasks/tasks.js | 3 +- .../RegisterAllocators/LinearScanAllocator.cs | 39 +- .../RegisterAllocators/LiveInterval.cs | 21 + .../Translation/ControlFlowGraph.cs | 11 +- .../src/ARMeilleure/Translation/PTC/Ptc.cs | 2 +- .../ARMeilleure/Translation/RegisterUsage.cs | 13 +- .../crates/shadowsocks-service/src/config.rs | 19 +- .../src/local/loadbalancing/ping_balancer.rs | 10 + shadowsocks-rust/debian/changelog | 14 + sing-box/docs/changelog.md | 2 +- .../clashapi/trafficontrol/tracker.go | 4 +- .../experimental/libbox/command_client.go | 4 +- sing-box/experimental/libbox/command_log.go | 4 +- sing-box/go.mod | 2 +- sing-box/go.sum | 4 +- small/chinadns-ng/Makefile | 35 +- small/shadowsocks-rust/Makefile | 16 +- small/v2raya/Makefile | 6 +- .../.github/workflows/beta_release_main.yml | 449 + v2raya/.github/workflows/pull_request.yml | 14 +- v2raya/.github/workflows/release_main.yml | 358 +- v2raya/.github/workflows/test_build_main.yml | 197 + v2raya/build.sh | 2 +- v2raya/install/aur/v2raya/PKGBUILD | 4 +- .../install/windows-inno/v2rayA-service.xml | 2 +- v2raya/install/windows-inno/windows_arm64.iss | 1 + .../install/windows-inno/windows_x86_64.iss | 1 + v2raya/service/core/v2ray/v2rayTmpl.go | 9 +- v2raya/service/go.mod | 6 +- v2raya/service/go.sum | 19 +- yass/README.md | 2 +- 136 files changed, 1885 insertions(+), 80855 deletions(-) create mode 100644 clash-meta/listener/sing_tun/redirect_linux.go create mode 100644 clash-meta/listener/sing_tun/redirect_stub.go create mode 100644 clash-nyanpasu/frontend/nyanpasu/src/components/proxies/scroll-current-node.tsx create mode 100644 hysteria/core/internal/integration_tests/hook_test.go create mode 100644 hysteria/core/internal/integration_tests/mocks/mock_RequestHook.go create mode 100644 lede/package/firmware/ipq-wifi/src/board-jdcloud_ax1800pro.ipq6018 create mode 100644 lede/package/firmware/ipq-wifi/src/board-jdcloud_ax6600.ipq6018 create mode 100644 mihomo/listener/sing_tun/redirect_linux.go create mode 100644 mihomo/listener/sing_tun/redirect_stub.go delete mode 100644 openwrt-packages/lua-maxminddb/README.md delete mode 100644 openwrt-packages/luci-app-koolproxyR/Makefile delete mode 100644 openwrt-packages/luci-app-koolproxyR/README.md delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/bin/arm delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/bin/i386 delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/bin/mips delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/bin/mipsel delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/bin/x86_64 delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/etc/adblocklist/adblock delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/etc/adblocklist/adblockip delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/etc/adblocklist/adbypass delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/etc/adblocklist/adbypassip delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/etc/config/koolproxy delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/etc/init.d/koolproxy delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/etc/uci-defaults/luci-koolproxy delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/lib/upgrade/keep.d/koolproxy delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/lib/lua/luci/controller/koolproxy.lua delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/lib/lua/luci/i18n/koolproxy.zh-cn.lmo delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/lib/lua/luci/model/cbi/koolproxy/rss_rule.lua delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/lib/lua/luci/view/koolproxy/cadvalue.htm delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/lib/lua/luci/view/koolproxy/caupload.htm delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/lib/lua/luci/view/koolproxy/dvalue.htm delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/lib/lua/luci/view/koolproxy/index.htm delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/usr/sbin/adblockplus delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/adblock.conf delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/camanagement delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/data/gen_ca.sh delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/data/openssl.cnf delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/data/rules/easylistchina.txt delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/data/rules/fanboy.txt delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/data/rules/kp.dat delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/data/rules/user.txt delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/data/rules/yhosts.txt delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/data/source.list delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/data/user.txt delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/dnsmasq.adblock delete mode 100644 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/koolproxy_ipset.conf delete mode 100755 openwrt-packages/luci-app-koolproxyR/files/usr/share/koolproxy/kpupdate delete mode 100644 openwrt-packages/luci-app-koolproxyR/koolproxy.txt delete mode 100755 openwrt-packages/luci-app-koolproxyR/koolproxyupdate.sh create mode 100644 v2raya/.github/workflows/beta_release_main.yml create mode 100644 v2raya/.github/workflows/test_build_main.yml diff --git a/.github/update.log b/.github/update.log index df828e09a1..e1e01de114 100644 --- a/.github/update.log +++ b/.github/update.log @@ -677,3 +677,4 @@ Update On Sat Jun 15 20:30:01 CEST 2024 Update On Sun Jun 16 20:31:07 CEST 2024 Update On Mon Jun 17 20:31:27 CEST 2024 Update On Tue Jun 18 20:32:23 CEST 2024 +Update On Wed Jun 19 20:31:46 CEST 2024 diff --git a/clash-meta/go.mod b/clash-meta/go.mod index 6030dd1e57..3361adf932 100644 --- a/clash-meta/go.mod +++ b/clash-meta/go.mod @@ -24,7 +24,7 @@ require ( github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 github.com/metacubex/sing-shadowsocks v0.2.6 github.com/metacubex/sing-shadowsocks2 v0.2.0 - github.com/metacubex/sing-tun v0.2.7-0.20240617013029-d05cf9df9cfe + github.com/metacubex/sing-tun v0.2.7-0.20240619023810-d442c40abab0 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 diff --git a/clash-meta/go.sum b/clash-meta/go.sum index 7f2f105f23..95e0404f8b 100644 --- a/clash-meta/go.sum +++ b/clash-meta/go.sum @@ -116,8 +116,8 @@ github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwV github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg= github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A= github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8= -github.com/metacubex/sing-tun v0.2.7-0.20240617013029-d05cf9df9cfe h1:NrWjVEkRmEkdREVSpohMgEBoznS0PrRfJDr6iCV4348= -github.com/metacubex/sing-tun v0.2.7-0.20240617013029-d05cf9df9cfe/go.mod h1:WwJGbCx7bQcBzuQXiDOJvZH27R0kIjKNNlISIWsL6kM= +github.com/metacubex/sing-tun v0.2.7-0.20240619023810-d442c40abab0 h1:J7YWMrEaYM9WF4qG8ZaCCHGw/ylbZc8FvIHr4rdOzP8= +github.com/metacubex/sing-tun v0.2.7-0.20240619023810-d442c40abab0/go.mod h1:WwJGbCx7bQcBzuQXiDOJvZH27R0kIjKNNlISIWsL6kM= github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ= github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY= github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0= diff --git a/clash-meta/listener/sing_tun/redirect_linux.go b/clash-meta/listener/sing_tun/redirect_linux.go new file mode 100644 index 0000000000..6ef6fc968a --- /dev/null +++ b/clash-meta/listener/sing_tun/redirect_linux.go @@ -0,0 +1,3 @@ +package sing_tun + +const supportRedirect = true diff --git a/clash-meta/listener/sing_tun/redirect_stub.go b/clash-meta/listener/sing_tun/redirect_stub.go new file mode 100644 index 0000000000..d711af3c70 --- /dev/null +++ b/clash-meta/listener/sing_tun/redirect_stub.go @@ -0,0 +1,5 @@ +//go:build !linux + +package sing_tun + +const supportRedirect = false diff --git a/clash-meta/listener/sing_tun/server.go b/clash-meta/listener/sing_tun/server.go index 53b885280a..e8c2ad286b 100644 --- a/clash-meta/listener/sing_tun/server.go +++ b/clash-meta/listener/sing_tun/server.go @@ -132,7 +132,7 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis if options.GSOMaxSize == 0 { options.GSOMaxSize = 65536 } - if runtime.GOOS != "linux" { + if !supportRedirect { options.AutoRedirect = false } tunName := options.Device @@ -453,12 +453,16 @@ func (l *Listener) ruleUpdateCallback(ruleProvider provider.RuleProvider) { } } +type toIpCidr interface { + ToIpCidr() *netipx.IPSet +} + func (l *Listener) updateRule(ruleProvider provider.RuleProvider, exclude bool, update bool) { l.ruleUpdateMutex.Lock() defer l.ruleUpdateMutex.Unlock() name := ruleProvider.Name() switch rp := ruleProvider.Strategy().(type) { - case interface{ ToIpCidr() *netipx.IPSet }: + case toIpCidr: if !exclude { ipCidr := rp.ToIpCidr() if ipCidr != nil { diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/node-list.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/node-list.tsx index b5469417aa..85c3556d02 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/node-list.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/node-list.tsx @@ -2,16 +2,28 @@ import { Clash, useClashCore, useNyanpasu } from "@nyanpasu/interface"; import { useBreakpoint } from "@nyanpasu/ui"; import { useAtom, useAtomValue } from "jotai"; import { proxyGroupAtom, proxyGroupSortAtom } from "@/store"; -import { useCallback, useEffect, useState, useTransition } from "react"; +import { + forwardRef, + useCallback, + useEffect, + useImperativeHandle, + useRef, + useState, + useTransition, +} from "react"; import { classNames } from "@/utils"; -import { VList } from "virtua"; +import { VList, VListHandle } from "virtua"; import { AnimatePresence, motion } from "framer-motion"; import { filterDelay } from "./utils"; import NodeCard from "./node-card"; type RenderClashProxy = Clash.Proxy & { renderLayoutKey: string }; -export const NodeList = () => { +export interface NodeListRef { + scrollToCurrent: () => void; +} + +export const NodeList = forwardRef(function NodeList({}, ref) { const { data, setGroupProxy, setGlobalProxy, updateProxiesDelay } = useClashCore(); @@ -137,9 +149,25 @@ export const NodeList = () => { const disableMotion = nyanpasuConfig?.lighten_animation_effects; + const vListRef = useRef(null); + + useImperativeHandle(ref, () => ({ + scrollToCurrent: () => { + const index = renderList.findIndex((node) => + node.some((item) => item.name === group?.now), + ); + + vListRef.current?.scrollToIndex(index, { + align: "center", + smooth: true, + }); + }, + })); + return ( { ); -}; +}); diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/scroll-current-node.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/scroll-current-node.tsx new file mode 100644 index 0000000000..a2662d15c8 --- /dev/null +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/scroll-current-node.tsx @@ -0,0 +1,26 @@ +import { Radar } from "@mui/icons-material"; +import { Button, Tooltip, alpha, useTheme } from "@mui/material"; +import { useTranslation } from "react-i18next"; + +export const ScrollCurrentNode = ({ onClick }: { onClick?: () => void }) => { + const { t } = useTranslation(); + + const { palette } = useTheme(); + + return ( + + + + ); +}; + +export default ScrollCurrentNode; diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/sort-selector.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/sort-selector.tsx index 75484fbdb4..adfaf43ab3 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/sort-selector.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/sort-selector.tsx @@ -1,5 +1,5 @@ import { proxyGroupSortAtom } from "@/store"; -import { Button, Menu, MenuItem } from "@mui/material"; +import { Button, Menu, MenuItem, alpha, useTheme } from "@mui/material"; import { useAtom } from "jotai"; import { memo, useState } from "react"; import { useTranslation } from "react-i18next"; @@ -7,6 +7,8 @@ import { useTranslation } from "react-i18next"; export const SortSelector = memo(function SortSelector() { const { t } = useTranslation(); + const { palette } = useTheme(); + const [proxyGroupSort, setProxyGroupSort] = useAtom(proxyGroupSortAtom); type SortType = typeof proxyGroupSort; @@ -28,8 +30,11 @@ export const SortSelector = memo(function SortSelector() { <>