From df6b77d5120aa7926bd385c12aaf61c62e88e1de Mon Sep 17 00:00:00 2001 From: "github-action[bot]" Date: Mon, 19 Aug 2024 20:32:21 +0200 Subject: [PATCH] Update On Mon Aug 19 20:32:20 CEST 2024 --- .github/update.log | 1 + clash-meta/.github/workflows/build.yml | 12 +- clash-meta/adapter/outboundgroup/parser.go | 3 + clash-nyanpasu/.github/workflows/ci.yml | 2 +- .../.github/workflows/deps-build-linux.yaml | 4 +- .../.github/workflows/deps-build-macos.yaml | 4 +- .../workflows/deps-build-windows-nsis.yaml | 3 + clash-nyanpasu/.prettierrc.cjs | 4 +- clash-nyanpasu/backend/Cargo.lock | 511 ++++++++++----- clash-nyanpasu/backend/tauri/Cargo.toml | 4 +- .../tauri/src/core/updater/instance.rs | 19 +- clash-nyanpasu/backend/tauri/src/ipc.rs | 5 + clash-nyanpasu/backend/tauri/src/main.rs | 1 + clash-nyanpasu/backend/tauri/src/utils/net.rs | 14 + .../frontend/interface/package.json | 11 +- .../frontend/interface/{ => src}/index.ts | 0 .../frontend/interface/{ => src}/ipc/index.ts | 0 .../interface/{ => src}/ipc/useClash.ts | 2 +- .../interface/{ => src}/ipc/useClashCore.ts | 0 .../interface/{ => src}/ipc/useClashWS.ts | 0 .../interface/{ => src}/ipc/useNyanpasu.ts | 0 .../{ => src}/openapi/geoip/index.ts | 0 .../interface/{ => src}/openapi/geoip/ipsb.ts | 9 +- .../{ => src}/openapi/healthcheck/index.ts | 0 .../{ => src}/openapi/healthcheck/utils.ts | 0 .../interface/{ => src}/openapi/index.ts | 0 .../interface/{ => src}/service/clash.ts | 0 .../interface/{ => src}/service/core.ts | 0 .../interface/{ => src}/service/index.ts | 0 .../interface/{ => src}/service/tauri.ts | 3 + .../interface/{ => src}/service/types.ts | 0 .../frontend/interface/tsconfig.json | 7 +- clash-nyanpasu/frontend/nyanpasu/package.json | 12 +- .../src/components/app/app-container.tsx | 6 +- .../src/components/app/app-drawer.tsx | 2 +- .../src/components/dashboard/dataline.tsx | 9 +- .../src/components/proxies/group-list.tsx | 2 +- .../src/components/proxies/node-list.tsx | 31 +- .../components/setting/modules/clash-core.tsx | 6 +- .../components/setting/modules/clash-web.tsx | 4 +- .../setting/modules/hotkey-input.tsx | 7 +- .../setting/setting-clash-field.tsx | 2 +- .../components/setting/setting-clash-web.tsx | 2 +- .../nyanpasu/src/hooks/use-profiles.ts | 77 --- .../frontend/nyanpasu/src/pages/_app.tsx | 8 +- .../nyanpasu/src/pages/connections.tsx | 11 +- .../frontend/nyanpasu/src/router.ts | 20 +- .../frontend/nyanpasu/src/store/clash.ts | 2 +- .../frontend/nyanpasu/tailwind.config.mjs | 2 +- .../frontend/nyanpasu/tsconfig.json | 9 +- .../frontend/nyanpasu/vite.config.ts | 6 + clash-nyanpasu/frontend/ui/index.ts | 4 - clash-nyanpasu/frontend/ui/package.json | 22 +- .../frontend/ui/{ => src}/chart/index.ts | 0 .../frontend/ui/{ => src}/chart/sparkline.tsx | 0 .../frontend/ui/{ => src}/hooks/get-system.ts | 6 +- .../frontend/ui/{ => src}/hooks/index.ts | 0 .../ui/{ => src}/hooks/use-breakpoint.ts | 5 +- .../ui/{ => src}/hooks/use-click-position.ts | 0 clash-nyanpasu/frontend/ui/src/index.ts | 9 + .../materialYou/components/baseCard/index.tsx | 0 .../components/baseCard/style.module.scss | 0 .../baseCard/style.module.scss.d.ts | 0 .../components/baseDialog/index.tsx | 4 +- .../components/basePage/baseErrorBoundary.tsx | 0 .../components/basePage/header.tsx | 0 .../materialYou/components/basePage/index.tsx | 6 +- .../components/basePage/style.scss | 0 .../materialYou/components/expand/index.tsx | 0 .../components/expandMore/index.tsx | 0 .../components/floatingButton/index.tsx | 0 .../{ => src}/materialYou/components/index.ts | 1 + .../materialYou/components/item/baseItem.tsx | 0 .../materialYou/components/item/index.ts | 0 .../materialYou/components/item/menuItem.tsx | 0 .../components/item/numberItem.tsx | 0 .../components/item/switchItem.tsx | 0 .../materialYou/components/item/textItem.tsx | 0 .../components/kbd/index.module.scss | 0 .../components/kbd/index.module.scss.d.ts | 0 .../materialYou/components/kbd/index.tsx | 6 +- .../components/lazyImage/index.tsx | 2 +- .../components/loadingButton/index.tsx | 0 .../components/loadingSwitch/index.tsx | 0 .../loadingSwitch/style.module.scss | 0 .../loadingSwitch/style.module.scss.d.ts | 0 .../materialYou/components/sidePage/index.tsx | 0 .../components/sidePage/style.module.scss | 0 .../sidePage/style.module.scss.d.ts | 0 .../ui/{ => src}/materialYou/createTheme.ts | 0 .../ui/{ => src}/materialYou/index.ts | 0 .../materialYou/themeComponents/MuiButton.ts | 0 .../themeComponents/MuiButtonGroup.ts | 0 .../materialYou/themeComponents/MuiCard.ts | 0 .../themeComponents/MuiCardContent.ts | 0 .../materialYou/themeComponents/MuiDialog.ts | 0 .../themeComponents/MuiDialogActions.ts | 0 .../themeComponents/MuiDialogContent.ts | 0 .../themeComponents/MuiDialogTitle.ts | 0 .../themeComponents/MuiLinearProgress.ts | 0 .../materialYou/themeComponents/MuiMenu.ts | 0 .../materialYou/themeComponents/MuiPaper.ts | 0 .../materialYou/themeComponents/MuiSwitch.ts | 0 .../materialYou/themeComponents/index.ts | 0 .../frontend/ui/{ => src}/utils/cn.ts | 0 .../frontend/ui/{ => src}/utils/event.ts | 0 clash-nyanpasu/frontend/ui/src/utils/index.ts | 2 + clash-nyanpasu/frontend/ui/tsconfig.json | 8 +- clash-nyanpasu/frontend/ui/utils/index.ts | 2 - clash-nyanpasu/frontend/ui/vite.config.ts | 25 + clash-nyanpasu/package.json | 2 +- clash-nyanpasu/pnpm-lock.yaml | 610 ++++++++++++++---- clash-nyanpasu/scripts/tsconfig.json | 3 +- clash-nyanpasu/scripts/utils/octokit.ts | 3 +- clash-nyanpasu/tsconfig.json | 15 +- mihomo/.github/workflows/build.yml | 12 +- mihomo/adapter/outboundgroup/parser.go | 3 + openwrt-packages/ddns-go/Makefile | 4 +- .../root/usr/share/passwall/iptables.sh | 25 +- sing-box/.golangci.yml | 20 +- sing-box/.goreleaser.yaml | 9 +- sing-box/README.md | 4 - sing-box/clients/android/app/build.gradle | 18 +- .../sfa/ui/dashboard/GroupsFragment.kt | 13 +- sing-box/clients/android/build.gradle | 8 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- sing-box/clients/android/version.properties | 6 +- .../Service/UIProfileUpdateTask.swift | 35 +- .../Views/Profile/ProfileView.swift | 13 +- .../apple/Library/Network/CommandClient.swift | 3 + .../apple/SFI/ApplicationDelegate.swift | 16 +- .../apple/SFT/ApplicationDelegate.swift | 8 +- .../apple/sing-box.xcodeproj/project.pbxproj | 41 +- .../xcshareddata/swiftpm/Package.resolved | 12 +- sing-box/docs/changelog.md | 28 +- sing-box/docs/clients/apple/index.md | 7 + sing-box/docs/clients/index.md | 4 +- sing-box/docs/clients/index.zh.md | 10 +- sing-box/docs/index.md | 6 + sing-box/docs/support.md | 3 +- sing-box/docs/support.zh.md | 11 +- sing-box/experimental/libbox/dns.go | 16 +- sing-box/go.mod | 6 +- sing-box/go.sum | 12 +- sing-box/route/router.go | 113 ++-- .../root/usr/share/passwall/iptables.sh | 25 +- small/sing-box/Makefile | 4 +- small/v2ray-geodata/Makefile | 4 +- trojan-rs/Cargo.lock | 234 +++---- trojan-rs/Cargo.toml | 8 +- trojan-rs/async_smoltcp/Cargo.lock | 8 +- trojan-rs/async_smoltcp/Cargo.toml | 4 +- trojan-rs/mobile/src-tauri/Cargo.lock | 45 +- trojan-rs/mobile2/backend/Cargo.lock | 45 +- trojan-rs/src/aproxy/mod.rs | 9 +- trojan-rs/src/aserver/mod.rs | 6 +- .../Common/DownloaderHelper.cs | 5 +- .../Common/FileManager.cs | 19 +- .../Common/HttpClientHelper.cs | 6 +- .../{v2rayN => ServiceLib}/Common/Job.cs | 2 +- .../Common/JsonUtils.cs | 7 +- .../{v2rayN => ServiceLib}/Common/Logging.cs | 3 +- .../Common/QueryableExtension.cs | 2 +- .../Common/SemanticVersion.cs | 2 +- .../Common/SqliteHelper.cs | 2 +- .../{v2rayN => ServiceLib}/Common/StringEx.cs | 5 +- .../{v2rayN => ServiceLib}/Common/Utils.cs | 5 +- .../Common/YamlUtils.cs | 4 +- .../Enums/EConfigType.cs | 2 +- .../{v2rayN => ServiceLib}/Enums/ECoreType.cs | 2 +- .../Enums/EGirdOrientation.cs | 2 +- .../Enums/EGlobalHotkey.cs | 2 +- .../Enums/EInboundProtocol.cs | 2 +- .../{v2rayN => ServiceLib}/Enums/EMove.cs | 2 +- .../{v2rayN => ServiceLib}/Enums/ERuleMode.cs | 2 +- .../Enums/EServerColName.cs | 2 +- .../Enums/ESpeedActionType.cs | 2 +- .../Enums/ESysProxyType.cs | 2 +- .../Enums/ETransport.cs | 2 +- .../Enums/EViewAction.cs | 2 +- .../v2rayN/{v2rayN => ServiceLib}/Global.cs | 36 +- v2rayn/v2rayN/ServiceLib/GlobalUsings.cs | 7 + .../Handler/ClashApiHandler.cs | 5 +- .../Handler/ConfigHandler.cs | 11 +- .../Handler/CoreConfig/CoreConfigClash.cs | 10 +- .../Handler/CoreConfig/CoreConfigHandler.cs | 9 +- .../Handler/CoreConfig/CoreConfigSingbox.cs | 8 +- .../Handler/CoreConfig/CoreConfigV2ray.cs | 7 +- .../Handler/CoreHandler.cs | 9 +- .../Handler/CoreInfoHandler.cs | 4 +- .../Handler/DownloadHandler.cs | 8 +- .../Handler/Fmt/BaseFmt.cs | 7 +- .../Handler/Fmt/ClashFmt.cs | 7 +- .../Handler/Fmt/FmtHandler.cs | 8 +- .../Handler/Fmt/Hysteria2Fmt.cs | 8 +- .../Handler/Fmt/NaiveproxyFmt.cs | 7 +- .../Handler/Fmt/ShadowsocksFmt.cs | 7 +- .../Handler/Fmt/SingboxFmt.cs | 7 +- .../Handler/Fmt/SocksFmt.cs | 8 +- .../Handler/Fmt/TrojanFmt.cs | 8 +- .../Handler/Fmt/TuicFmt.cs | 8 +- .../Handler/Fmt/V2rayFmt.cs | 7 +- .../Handler/Fmt/VLESSFmt.cs | 8 +- .../Handler/Fmt/VmessFmt.cs | 8 +- .../Handler/Fmt/WireguardFmt.cs | 8 +- .../Handler/LazyConfig.cs | 6 +- .../Handler/ProfileExHandler.cs | 8 +- .../Handler/SpeedtestHandler.cs | 48 +- .../Handler/Statistics/StatisticsHandler.cs | 6 +- .../Handler/Statistics/StatisticsSingbox.cs | 6 +- .../Handler/Statistics/StatisticsV2ray.cs | 6 +- .../Handler/TaskHandler.cs | 6 +- .../Handler/UpdateHandler.cs | 59 +- .../Models/ClashConnectionModel.cs | 2 +- .../Models/ClashConnections.cs | 2 +- .../Models/ClashProviders.cs | 4 +- .../Models/ClashProxies.cs | 2 +- .../Models/ClashProxyModel.cs | 10 +- .../Models/ComboItem.cs | 2 +- .../{v2rayN => ServiceLib}/Models/Config.cs | 4 +- .../Models/ConfigItems.cs | 4 +- .../{v2rayN => ServiceLib}/Models/CoreInfo.cs | 4 +- .../{v2rayN => ServiceLib}/Models/DNSItem.cs | 3 +- .../Models/GitHubRelease.cs | 2 +- .../Models/ProfileExItem.cs | 2 +- .../Models/ProfileItem.cs | 3 +- .../Models/ProfileItemModel.cs | 2 +- .../Models/RoutingItem.cs | 2 +- .../Models/RoutingItemModel.cs | 2 +- .../Models/RulesItem.cs | 2 +- .../Models/RulesItemModel.cs | 2 +- .../Models/ServerSpeedItem.cs | 2 +- .../Models/ServerStatItem.cs | 2 +- .../Models/ServerTestItem.cs | 6 +- .../Models/SingboxConfig.cs | 2 +- .../Models/SpeedTestResult.cs | 2 +- .../{v2rayN => ServiceLib}/Models/SsSIP008.cs | 2 +- .../{v2rayN => ServiceLib}/Models/SubItem.cs | 2 +- .../Models/SysProxyConfig.cs | 4 +- .../Models/V2rayConfig.cs | 2 +- .../Models/V2rayTcpRequest.cs | 2 +- .../Models/VmessQRCode.cs | 4 +- .../Resx/ResUI.Designer.cs | 6 +- .../Resx/ResUI.fa-Ir.resx | 0 .../{v2rayN => ServiceLib}/Resx/ResUI.resx | 0 .../{v2rayN => ServiceLib}/Resx/ResUI.ru.resx | 0 .../Resx/ResUI.zh-Hans.resx | 0 .../Resx/ResUI.zh-Hant.resx | 0 .../Sample/SampleClientConfig | 0 .../Sample/SampleHttpRequest | 0 .../Sample/SampleHttpResponse | 0 .../Sample/SampleInbound | 0 .../Sample/SampleOutbound | 0 .../Sample/SingboxSampleClientConfig | 0 .../Sample/SingboxSampleOutbound | 0 .../Sample/clash_mixin_yaml | 0 .../Sample/clash_tun_yaml | 0 .../Sample/custom_routing_black | 0 .../Sample/custom_routing_global | 0 .../Sample/custom_routing_locked | 0 .../Sample/custom_routing_rules | 0 .../Sample/custom_routing_white | 0 .../Sample/dns_singbox_normal | 0 .../Sample/dns_v2ray_normal | 0 .../Sample/tun_singbox_dns | 0 .../Sample/tun_singbox_inbound | 0 .../Sample/tun_singbox_rules | 0 v2rayn/v2rayN/ServiceLib/ServiceLib.csproj | 75 +++ v2rayn/v2rayN/v2rayN.sln | 6 + v2rayn/v2rayN/v2rayN/App.xaml | 2 +- v2rayn/v2rayN/v2rayN/App.xaml.cs | 2 - v2rayn/v2rayN/v2rayN/Base/MyReactiveObject.cs | 2 - .../v2rayN/Converters/MaterialDesignFonts.cs | 1 - v2rayn/v2rayN/v2rayN/GlobalUsings.cs | 9 + v2rayn/v2rayN/v2rayN/Handler/HotkeyHandler.cs | 3 - .../v2rayN/v2rayN/Handler/SysProxyHandler.cs | 2 - .../v2rayN/v2rayN/Handler/WindowsHandler.cs | 2 - .../v2rayN/ViewModels/AddServer2ViewModel.cs | 3 - .../v2rayN/ViewModels/AddServerViewModel.cs | 3 - .../ViewModels/ClashConnectionsViewModel.cs | 3 - .../ViewModels/ClashProxiesViewModel.cs | 9 +- .../v2rayN/ViewModels/DNSSettingViewModel.cs | 3 - .../v2rayN/ViewModels/MainWindowViewModel.cs | 27 +- .../ViewModels/OptionSettingViewModel.cs | 3 - .../v2rayN/ViewModels/ProfilesViewModel.cs | 13 +- .../ViewModels/RoutingRuleDetailsViewModel.cs | 3 - .../ViewModels/RoutingRuleSettingViewModel.cs | 3 - .../ViewModels/RoutingSettingViewModel.cs | 3 - .../v2rayN/ViewModels/SubEditViewModel.cs | 3 - .../v2rayN/ViewModels/SubSettingViewModel.cs | 3 - .../ViewModels/ThemeSettingViewModel.cs | 2 - .../v2rayN/v2rayN/Views/AddServer2Window.xaml | 10 +- .../v2rayN/Views/AddServer2Window.xaml.cs | 3 - .../v2rayN/v2rayN/Views/AddServerWindow.xaml | 10 +- .../v2rayN/Views/AddServerWindow.xaml.cs | 4 - .../v2rayN/Views/ClashConnectionsView.xaml | 8 +- .../v2rayN/Views/ClashConnectionsView.xaml.cs | 2 - .../v2rayN/v2rayN/Views/ClashProxiesView.xaml | 10 +- .../v2rayN/Views/ClashProxiesView.xaml.cs | 2 - .../v2rayN/v2rayN/Views/DNSSettingWindow.xaml | 2 +- .../v2rayN/Views/DNSSettingWindow.xaml.cs | 3 - .../Views/GlobalHotkeySettingWindow.xaml | 2 +- .../Views/GlobalHotkeySettingWindow.xaml.cs | 3 - v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml | 2 +- v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs | 5 +- v2rayn/v2rayN/v2rayN/Views/MsgView.xaml | 2 +- v2rayn/v2rayN/v2rayN/Views/MsgView.xaml.cs | 2 - .../v2rayN/Views/OptionSettingWindow.xaml | 2 +- .../v2rayN/Views/OptionSettingWindow.xaml.cs | 3 - v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml | 2 +- .../v2rayN/v2rayN/Views/ProfilesView.xaml.cs | 6 +- v2rayn/v2rayN/v2rayN/Views/QrcodeView.xaml | 2 +- .../Views/RoutingRuleDetailsWindow.xaml | 2 +- .../Views/RoutingRuleDetailsWindow.xaml.cs | 3 - .../Views/RoutingRuleSettingWindow.xaml | 2 +- .../Views/RoutingRuleSettingWindow.xaml.cs | 4 - .../v2rayN/Views/RoutingSettingWindow.xaml | 2 +- .../v2rayN/Views/RoutingSettingWindow.xaml.cs | 4 - v2rayn/v2rayN/v2rayN/Views/SubEditWindow.xaml | 2 +- .../v2rayN/v2rayN/Views/SubEditWindow.xaml.cs | 3 - .../v2rayN/v2rayN/Views/SubSettingWindow.xaml | 2 +- .../v2rayN/Views/SubSettingWindow.xaml.cs | 4 - .../v2rayN/v2rayN/Views/ThemeSettingView.xaml | 2 +- v2rayn/v2rayN/v2rayN/v2rayN.csproj | 82 +-- yass/README.md | 9 +- yass/src/config/config.cpp | 8 + yass/src/config/config_core.cpp | 4 + yass/src/config/config_core.hpp | 5 + yass/src/mac/Base.lproj/Main.storyboard | 160 +++-- yass/src/mac/YassAppDelegate.h | 5 +- yass/src/mac/YassAppDelegate.mm | 23 +- yass/src/mac/YassViewController.h | 3 + yass/src/mac/YassViewController.mm | 24 +- yass/src/mac/YassWindowController.h | 7 +- yass/src/mac/YassWindowController.mm | 46 +- yass/src/mac/en.lproj/Main.strings | 4 + yass/src/mac/zh-Hans.lproj/Main.strings | 4 + yass/third_party/libc++/CMakeLists.txt | 2 +- .../libc++/trunk/docs/Status/Cxx17.rst | 2 +- .../libc++/trunk/include/__math/traits.h | 20 +- yass/third_party/libc++/trunk/include/span | 2 +- .../libc++/trunk/src/filesystem/path.cpp | 5 +- .../views/views.span/span.cons/copy.pass.cpp | 132 ++-- .../path.member/path.compare.pass.cpp | 60 +- .../lexically_relative_and_proximate.pass.cpp | 2 + .../test/std/numerics/c.math/cmath.pass.cpp | 20 +- .../test/std/numerics/c.math/isinf.pass.cpp | 12 + .../test/std/numerics/c.math/isnan.pass.cpp | 12 + .../trunk/test/support/platform_support.h | 2 +- yt-dlp/yt_dlp/extractor/radiko.py | 10 +- yt-dlp/yt_dlp/extractor/twitter.py | 44 +- 351 files changed, 2282 insertions(+), 1702 deletions(-) rename clash-nyanpasu/frontend/interface/{ => src}/index.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/ipc/index.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/ipc/useClash.ts (98%) rename clash-nyanpasu/frontend/interface/{ => src}/ipc/useClashCore.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/ipc/useClashWS.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/ipc/useNyanpasu.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/openapi/geoip/index.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/openapi/geoip/ipsb.ts (62%) rename clash-nyanpasu/frontend/interface/{ => src}/openapi/healthcheck/index.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/openapi/healthcheck/utils.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/openapi/index.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/service/clash.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/service/core.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/service/index.ts (100%) rename clash-nyanpasu/frontend/interface/{ => src}/service/tauri.ts (98%) rename clash-nyanpasu/frontend/interface/{ => src}/service/types.ts (100%) delete mode 100644 clash-nyanpasu/frontend/nyanpasu/src/hooks/use-profiles.ts delete mode 100644 clash-nyanpasu/frontend/ui/index.ts rename clash-nyanpasu/frontend/ui/{ => src}/chart/index.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/chart/sparkline.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/hooks/get-system.ts (67%) rename clash-nyanpasu/frontend/ui/{ => src}/hooks/index.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/hooks/use-breakpoint.ts (93%) rename clash-nyanpasu/frontend/ui/{ => src}/hooks/use-click-position.ts (100%) create mode 100644 clash-nyanpasu/frontend/ui/src/index.ts rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/baseCard/index.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/baseCard/style.module.scss (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/baseCard/style.module.scss.d.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/baseDialog/index.tsx (98%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/basePage/baseErrorBoundary.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/basePage/header.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/basePage/index.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/basePage/style.scss (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/expand/index.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/expandMore/index.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/floatingButton/index.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/index.ts (93%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/item/baseItem.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/item/index.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/item/menuItem.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/item/numberItem.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/item/switchItem.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/item/textItem.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/kbd/index.module.scss (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/kbd/index.module.scss.d.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/kbd/index.tsx (76%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/lazyImage/index.tsx (92%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/loadingButton/index.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/loadingSwitch/index.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/loadingSwitch/style.module.scss (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/loadingSwitch/style.module.scss.d.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/sidePage/index.tsx (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/sidePage/style.module.scss (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/components/sidePage/style.module.scss.d.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/createTheme.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/index.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiButton.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiButtonGroup.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiCard.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiCardContent.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiDialog.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiDialogActions.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiDialogContent.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiDialogTitle.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiLinearProgress.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiMenu.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiPaper.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/MuiSwitch.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/materialYou/themeComponents/index.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/utils/cn.ts (100%) rename clash-nyanpasu/frontend/ui/{ => src}/utils/event.ts (100%) create mode 100644 clash-nyanpasu/frontend/ui/src/utils/index.ts delete mode 100644 clash-nyanpasu/frontend/ui/utils/index.ts create mode 100644 clash-nyanpasu/frontend/ui/vite.config.ts rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/DownloaderHelper.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/FileManager.cs (84%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/HttpClientHelper.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/Job.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/JsonUtils.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/Logging.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/QueryableExtension.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/SemanticVersion.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/SqliteHelper.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/StringEx.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/Utils.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Common/YamlUtils.cs (96%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/EConfigType.cs (89%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/ECoreType.cs (91%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/EGirdOrientation.cs (76%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/EGlobalHotkey.cs (86%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/EInboundProtocol.cs (85%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/EMove.cs (81%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/ERuleMode.cs (80%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/EServerColName.cs (90%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/ESpeedActionType.cs (79%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/ESysProxyType.cs (81%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/ETransport.cs (85%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Enums/EViewAction.cs (96%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Global.cs (90%) create mode 100644 v2rayn/v2rayN/ServiceLib/GlobalUsings.cs rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/ClashApiHandler.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/ConfigHandler.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/CoreConfig/CoreConfigClash.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/CoreConfig/CoreConfigHandler.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/CoreConfig/CoreConfigSingbox.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/CoreConfig/CoreConfigV2ray.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/CoreHandler.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/CoreInfoHandler.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/DownloadHandler.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/BaseFmt.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/ClashFmt.cs (83%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/FmtHandler.cs (96%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/Hysteria2Fmt.cs (96%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/NaiveproxyFmt.cs (83%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/ShadowsocksFmt.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/SingboxFmt.cs (94%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/SocksFmt.cs (96%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/TrojanFmt.cs (91%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/TuicFmt.cs (93%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/V2rayFmt.cs (94%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/VLESSFmt.cs (93%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/VmessFmt.cs (96%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Fmt/WireguardFmt.cs (94%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/LazyConfig.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/ProfileExHandler.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/SpeedtestHandler.cs (92%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Statistics/StatisticsHandler.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Statistics/StatisticsSingbox.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/Statistics/StatisticsV2ray.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/TaskHandler.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Handler/UpdateHandler.cs (91%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ClashConnectionModel.cs (94%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ClashConnections.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ClashProviders.cs (83%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ClashProxies.cs (95%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ClashProxyModel.cs (65%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ComboItem.cs (85%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/Config.cs (97%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ConfigItems.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/CoreInfo.cs (92%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/DNSItem.cs (92%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/GitHubRelease.cs (98%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ProfileExItem.cs (90%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ProfileItem.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ProfileItemModel.cs (94%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/RoutingItem.cs (95%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/RoutingItemModel.cs (80%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/RulesItem.cs (95%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/RulesItemModel.cs (89%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ServerSpeedItem.cs (94%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ServerStatItem.cs (95%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/ServerTestItem.cs (78%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/SingboxConfig.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/SpeedTestResult.cs (86%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/SsSIP008.cs (93%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/SubItem.cs (96%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/SysProxyConfig.cs (86%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/V2rayConfig.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/V2rayTcpRequest.cs (92%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Models/VmessQRCode.cs (95%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Resx/ResUI.Designer.cs (99%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Resx/ResUI.fa-Ir.resx (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Resx/ResUI.resx (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Resx/ResUI.ru.resx (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Resx/ResUI.zh-Hans.resx (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Resx/ResUI.zh-Hant.resx (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/SampleClientConfig (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/SampleHttpRequest (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/SampleHttpResponse (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/SampleInbound (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/SampleOutbound (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/SingboxSampleClientConfig (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/SingboxSampleOutbound (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/clash_mixin_yaml (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/clash_tun_yaml (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/custom_routing_black (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/custom_routing_global (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/custom_routing_locked (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/custom_routing_rules (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/custom_routing_white (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/dns_singbox_normal (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/dns_v2ray_normal (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/tun_singbox_dns (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/tun_singbox_inbound (100%) rename v2rayn/v2rayN/{v2rayN => ServiceLib}/Sample/tun_singbox_rules (100%) create mode 100644 v2rayn/v2rayN/ServiceLib/ServiceLib.csproj create mode 100644 v2rayn/v2rayN/v2rayN/GlobalUsings.cs diff --git a/.github/update.log b/.github/update.log index 26ebf48c2e..9d4eaa3698 100644 --- a/.github/update.log +++ b/.github/update.log @@ -738,3 +738,4 @@ Update On Thu Aug 15 20:37:38 CEST 2024 Update On Fri Aug 16 20:32:54 CEST 2024 Update On Sat Aug 17 20:30:44 CEST 2024 Update On Sun Aug 18 20:30:02 CEST 2024 +Update On Mon Aug 19 20:32:09 CEST 2024 diff --git a/clash-meta/.github/workflows/build.yml b/clash-meta/.github/workflows/build.yml index fb3eb621a4..e0b964f492 100644 --- a/clash-meta/.github/workflows/build.yml +++ b/clash-meta/.github/workflows/build.yml @@ -40,10 +40,10 @@ jobs: - { goos: linux, goarch: arm, goarm: '5', output: armv5 } - { goos: linux, goarch: arm, goarm: '6', output: armv6 } - { goos: linux, goarch: arm, goarm: '7', output: armv7 } - - { goos: linux, goarch: mips, mips: hardfloat, output: mips-hardfloat } - - { goos: linux, goarch: mips, mips: softfloat, output: mips-softfloat } - - { goos: linux, goarch: mipsle, mips: hardfloat, output: mipsle-hardfloat } - - { goos: linux, goarch: mipsle, mips: softfloat, output: mipsle-softfloat } + - { goos: linux, goarch: mips, gomips: hardfloat, output: mips-hardfloat } + - { goos: linux, goarch: mips, gomips: softfloat, output: mips-softfloat } + - { goos: linux, goarch: mipsle, gomips: hardfloat, output: mipsle-hardfloat } + - { goos: linux, goarch: mipsle, gomips: softfloat, output: mipsle-softfloat } - { goos: linux, goarch: mips64, output: mips64 } - { goos: linux, goarch: mips64le, output: mips64le } - { goos: linux, goarch: loong64, output: loong64-abi1, abi: '1' } @@ -219,8 +219,8 @@ jobs: GOOS: ${{matrix.jobs.goos}} GOARCH: ${{matrix.jobs.goarch}} GOAMD64: ${{matrix.jobs.goamd64}} - GOARM: ${{matrix.jobs.arm}} - GOMIPS: ${{matrix.jobs.mips}} + GOARM: ${{matrix.jobs.goarm}} + GOMIPS: ${{matrix.jobs.gomips}} run: | echo $CGO_ENABLED go build -v -tags "with_gvisor" -trimpath -ldflags "${BUILDTAG} -X 'github.com/metacubex/mihomo/constant.Version=${VERSION}' -X 'github.com/metacubex/mihomo/constant.BuildTime=${BUILDTIME}' -w -s -buildid=" diff --git a/clash-meta/adapter/outboundgroup/parser.go b/clash-meta/adapter/outboundgroup/parser.go index efc38aabee..b073c4bba7 100644 --- a/clash-meta/adapter/outboundgroup/parser.go +++ b/clash-meta/adapter/outboundgroup/parser.go @@ -88,6 +88,9 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide } else { groupOption.Proxies = append(groupOption.Proxies, AllProxies...) } + if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 { + groupOption.Proxies = []string{"COMPATIBLE"} + } } if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 { diff --git a/clash-nyanpasu/.github/workflows/ci.yml b/clash-nyanpasu/.github/workflows/ci.yml index e4afa1d336..21aec4463d 100644 --- a/clash-nyanpasu/.github/workflows/ci.yml +++ b/clash-nyanpasu/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: run: pnpm install --no-frozen-lockfile - name: Prepare fronend - run: pnpm web:build # Build frontend + run: pnpm -r build # Build frontend - name: Prepare sidecar and resources run: pnpm check - name: Lint diff --git a/clash-nyanpasu/.github/workflows/deps-build-linux.yaml b/clash-nyanpasu/.github/workflows/deps-build-linux.yaml index 03c1b0c09b..645bccf7d3 100644 --- a/clash-nyanpasu/.github/workflows/deps-build-linux.yaml +++ b/clash-nyanpasu/.github/workflows/deps-build-linux.yaml @@ -71,7 +71,9 @@ jobs: if: ${{ inputs.nightly == true }} run: | pnpm prepare:nightly - + - name: Build UI + run: | + pnpm -F ui build - name: Tauri build uses: tauri-apps/tauri-action@v0 env: diff --git a/clash-nyanpasu/.github/workflows/deps-build-macos.yaml b/clash-nyanpasu/.github/workflows/deps-build-macos.yaml index e1088e0a73..acb0382c3e 100644 --- a/clash-nyanpasu/.github/workflows/deps-build-macos.yaml +++ b/clash-nyanpasu/.github/workflows/deps-build-macos.yaml @@ -99,7 +99,9 @@ jobs: if: ${{ inputs.nightly == true }} run: | pnpm prepare:nightly - + - name: Build UI + run: | + pnpm -F ui build - name: Tauri build if: ${{ inputs.aarch64 == false }} uses: tauri-apps/tauri-action@v0 diff --git a/clash-nyanpasu/.github/workflows/deps-build-windows-nsis.yaml b/clash-nyanpasu/.github/workflows/deps-build-windows-nsis.yaml index 3a8aa8b993..8a088e7c25 100644 --- a/clash-nyanpasu/.github/workflows/deps-build-windows-nsis.yaml +++ b/clash-nyanpasu/.github/workflows/deps-build-windows-nsis.yaml @@ -78,6 +78,9 @@ jobs: if: ${{ inputs.nightly == true }} run: | pnpm prepare:nightly --nsis + - name: Build UI + run: | + pnpm -F ui build - name: Tauri build uses: tauri-apps/tauri-action@v0 diff --git a/clash-nyanpasu/.prettierrc.cjs b/clash-nyanpasu/.prettierrc.cjs index 8bf2ba80b0..1ed653fcb8 100644 --- a/clash-nyanpasu/.prettierrc.cjs +++ b/clash-nyanpasu/.prettierrc.cjs @@ -15,8 +15,8 @@ module.exports = { }, ], importOrder: [ - "^@ui/(.*)$", - "^@interface/(.*)$", + "^@nyanpasu/ui/(.*)$", + "^@nyanpasu/interface/(.*)$", "^@/(.*)$", "^@(.*)$", "^[./]", diff --git a/clash-nyanpasu/backend/Cargo.lock b/clash-nyanpasu/backend/Cargo.lock index 064bc3b11c..be3fc5af8e 100644 --- a/clash-nyanpasu/backend/Cargo.lock +++ b/clash-nyanpasu/backend/Cargo.lock @@ -217,7 +217,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -228,9 +228,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert-unchecked" @@ -435,7 +435,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -470,7 +470,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -511,7 +511,7 @@ checksum = "99e1aca718ea7b89985790c94aad72d77533063fe00bc497bb79a7c2dae6a661" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -538,7 +538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" dependencies = [ "anyhow", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "log 0.4.22", "nom 7.1.3", "num-rational", @@ -551,7 +551,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] @@ -691,7 +691,7 @@ dependencies = [ "regex 1.10.6", "rustc-hash 1.1.0", "shlex", - "syn 2.0.74", + "syn 2.0.75", "which 4.4.2", ] @@ -785,7 +785,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "411558b4cbc7d0303012e26721815e612fed78179313888fd5dd8d6c50d70099" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bitflags 2.6.0", "boa_ast", "boa_gc", @@ -861,7 +861,7 @@ checksum = "25e0097fa69cde4c95f9869654004340fbbe2bcf3ce9189ba2a31a65ac40e0a1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "synstructure", ] @@ -967,22 +967,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.3" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1078,9 +1078,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb8dd288a69fc53a1996d7ecfbf4a20d59065bff137ce7e56bbd620de191189" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ "jobserver", "libc", @@ -1188,9 +1188,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.15" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -1217,7 +1217,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1259,10 +1259,10 @@ dependencies = [ "dyn-clone", "enumflags2", "fast_image_resize", + "flate2", "fs_extra", "futures", "glob", - "gunzip", "hex", "humansize", "image 0.25.2", @@ -1291,7 +1291,7 @@ dependencies = [ "redb", "regex 1.10.6", "relative-path", - "reqwest", + "reqwest 0.12.5", "rfd", "rs-snowflake", "runas", @@ -1324,7 +1324,7 @@ dependencies = [ "url", "uuid", "webview2-com-bridge", - "which 6.0.2", + "which 6.0.3", "whoami", "window-shadows", "window-vibrancy", @@ -1352,8 +1352,8 @@ checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation", - "core-foundation", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", "core-graphics 0.22.3", "foreign-types 0.3.2", "libc", @@ -1368,14 +1368,30 @@ checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation", - "core-foundation", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", "core-graphics 0.23.2", "foreign-types 0.5.0", "libc", "objc", ] +[[package]] +name = "cocoa" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" +dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa-foundation 0.2.0", + "core-foundation 0.10.0", + "core-graphics 0.24.0", + "foreign-types 0.5.0", + "libc", + "objc", +] + [[package]] name = "cocoa-foundation" version = "0.1.2" @@ -1384,8 +1400,22 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "libc", "objc", ] @@ -1443,7 +1473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1492,6 +1522,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -1505,8 +1545,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", "foreign-types 0.3.2", "libc", ] @@ -1518,8 +1558,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "foreign-types 0.5.0", "libc", ] @@ -1531,7 +1584,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "libc", ] @@ -1653,7 +1717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1663,7 +1727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1734,7 +1798,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1745,7 +1809,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1844,7 +1908,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1855,7 +1919,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1876,7 +1940,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1886,7 +1950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1899,7 +1963,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2025,7 +2089,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2144,7 +2208,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2396,7 +2460,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2520,7 +2584,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2892,14 +2956,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "gunzip" -version = "0.1.0" -source = "git+https://github.com/TechHara/gunzip.git#51b00e9c7b1930fc252ae4fcf1a0a9bffdafbb8d" -dependencies = [ - "crc32fast", -] - [[package]] name = "h2" version = "0.3.26" @@ -3190,16 +3246,20 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 0.2.12", - "hyper 0.14.30", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", + "webpki-roots", ] [[package]] @@ -3215,6 +3275,22 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.7" @@ -3383,7 +3459,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3557,7 +3633,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3930,9 +4006,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "374af5f94e54fa97cf75e945cce8a6b201e88a1a07e688b47dfd2a59c66dbd86" [[package]] name = "libfuzzer-sys" @@ -4114,7 +4190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e03d48e8d8c11c297d49ea6d2cf6cc0d7657eb3d175219bba47d59a601b7ca9" dependencies = [ "cc", - "which 6.0.2", + "which 6.0.3", ] [[package]] @@ -4279,7 +4355,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4589,7 +4665,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4670,7 +4746,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4933,7 +5009,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5034,9 +5110,9 @@ checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "oxc_allocator" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05d68ad13b331cb11c7bd272aae9d0ef362a64af757eb4e94b804dc6a0a1733" +checksum = "20afc1d4a7b0b878d28f7b7f9f1f7ab670a7c7e8feb29101fb49eac1faa483fa" dependencies = [ "allocator-api2", "bumpalo", @@ -5044,9 +5120,9 @@ dependencies = [ [[package]] name = "oxc_ast" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9893a73dc2603ef975dc88a1fd2b21b46e2caee3180ef975c90a45ad5494b60c" +checksum = "1599f878d8ac6fcc229be06426f04134f7663dcd5c71046414d8ddd12a20ad3b" dependencies = [ "bitflags 2.6.0", "num-bigint", @@ -5058,20 +5134,20 @@ dependencies = [ [[package]] name = "oxc_ast_macros" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933eda966caeb7ba0809c14371be02d343e3ac12d302fbae3294b56fcb0aeb57" +checksum = "d0a07c44bbe07756ba25605059fa4a94543f6a75730fd8bd1105795d0b3d668d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] name = "oxc_diagnostics" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69620353f047e96064ac42baa4663fdde0a0836a27f9bcb3bbf836aa7459d70" +checksum = "c53d201660e8accd6e53f1af7efda36967316aa4263d0a6847c631bdd8705e0f" dependencies = [ "miette", "owo-colors", @@ -5081,15 +5157,15 @@ dependencies = [ [[package]] name = "oxc_index" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63c14b74e3fe05d75e217de6a152d9d40acc6e8d3a0096bb8bdf34c85cd0fab" +checksum = "fa1d58c483b1ec74c7219b1525648b4b6beea7ff4685b02ad74693190df43308" [[package]] name = "oxc_parser" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea6fb997841162f4e00feaae0461cdfc7043c72561992a8aa2e7a6162d36cc8" +checksum = "77ce38833b8b0d1121779b2ceaa9aa07d4142105ccc6941f73112a8d836b87cd" dependencies = [ "assert-unchecked", "bitflags 2.6.0", @@ -5107,9 +5183,9 @@ dependencies = [ [[package]] name = "oxc_span" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13cc580c6acd555c8828b63ec5a7694123d65c9e402762052cbb604359f74b9" +checksum = "e7a4f6e525a64e61bcfa256e4707e46be54f3261e0b524670d0a1c6827c28931" dependencies = [ "compact_str", "miette", @@ -5119,9 +5195,9 @@ dependencies = [ [[package]] name = "oxc_syntax" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07ce78403ec09c4988b8026c836eac5954517cf8def41dfb9183de080f11a2b" +checksum = "bcb27d1a7e00a63e5d490fa4ee9a008d45e45db3d505ca21f0e63de2097cf743" dependencies = [ "bitflags 2.6.0", "dashmap 6.0.1", @@ -5371,7 +5447,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5418,7 +5494,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5553,7 +5629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5630,7 +5706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5690,6 +5766,54 @@ dependencies = [ "memchr", ] +[[package]] +name = "quinn" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls", + "socket2 0.5.7", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash 2.0.0", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -5788,7 +5912,7 @@ checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" dependencies = [ "arbitrary", "arg_enum_proc_macro", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "av1-grain", "bitstream-io", "built", @@ -5922,7 +6046,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -6022,8 +6146,7 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.30", - "hyper-rustls", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log 0.4.22", @@ -6032,8 +6155,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -6041,6 +6163,54 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log 0.4.22", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "system-configuration", + "tokio", + "tokio-native-tls", "tokio-rustls", "tokio-util", "tower-service", @@ -6050,7 +6220,7 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "winreg 0.50.0", + "winreg 0.52.0", ] [[package]] @@ -6147,7 +6317,7 @@ dependencies = [ "serde", "serde_json", "serde_yml", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -6238,14 +6408,16 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ - "log 0.4.22", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] @@ -6258,12 +6430,29 @@ dependencies = [ ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-pemfile" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -6315,16 +6504,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "security-framework" version = "2.11.1" @@ -6332,7 +6511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", @@ -6418,9 +6597,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.207" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] @@ -6437,13 +6616,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.207" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -6477,7 +6656,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -6528,7 +6707,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -6968,9 +7147,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.74" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ "proc-macro2", "quote", @@ -6997,7 +7176,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -7063,7 +7242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -7113,7 +7292,7 @@ dependencies = [ "cairo-rs", "cc", "cocoa 0.24.1", - "core-foundation", + "core-foundation 0.9.4", "core-graphics 0.22.3", "crossbeam-channel", "dirs-next", @@ -7224,7 +7403,7 @@ dependencies = [ "rand 0.8.5", "raw-window-handle 0.5.2", "regex 1.10.6", - "reqwest", + "reqwest 0.11.27", "rfd", "semver 1.0.23", "serde", @@ -7515,7 +7694,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -7558,7 +7737,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -7672,9 +7851,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.2" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", @@ -7696,7 +7875,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -7711,11 +7890,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] @@ -7884,7 +8064,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -8012,9 +8192,9 @@ dependencies = [ [[package]] name = "typeid" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" [[package]] name = "typenum" @@ -8321,7 +8501,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "wasm-bindgen-shared", ] @@ -8355,7 +8535,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8533,9 +8713,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "webview2-com" @@ -8603,9 +8786,9 @@ dependencies = [ [[package]] name = "which" -version = "6.0.2" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" dependencies = [ "either", "home", @@ -8681,14 +8864,14 @@ dependencies = [ [[package]] name = "window-vibrancy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33082acd404763b315866e14a0d5193f3422c81086657583937a750cdd3ec340" +checksum = "d8cdd6999298d969289d8078dae02ce798ad23452075985cccba8b6326711ecf" dependencies = [ - "cocoa 0.25.0", + "cocoa 0.26.0", "objc", "raw-window-handle 0.6.2", - "windows-sys 0.52.0", + "windows-sys 0.59.0", "windows-version", ] @@ -8842,7 +9025,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -8853,7 +9036,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -8864,7 +9047,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -8875,7 +9058,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -8886,7 +9069,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -8897,7 +9080,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -9469,7 +9652,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "synstructure", ] @@ -9520,7 +9703,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "zvariant_utils", ] @@ -9553,7 +9736,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -9573,7 +9756,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "synstructure", ] @@ -9594,7 +9777,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -9616,7 +9799,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -9756,7 +9939,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "zvariant_utils", ] @@ -9768,5 +9951,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] diff --git a/clash-nyanpasu/backend/tauri/Cargo.toml b/clash-nyanpasu/backend/tauri/Cargo.toml index c591fe5a4e..278a59b8a1 100644 --- a/clash-nyanpasu/backend/tauri/Cargo.toml +++ b/clash-nyanpasu/backend/tauri/Cargo.toml @@ -43,7 +43,7 @@ delay_timer = "0.11.5" parking_lot = { version = "0.12.1" } tokio = { version = "1", features = ["full"] } serde = { version = "1.0", features = ["derive"] } -reqwest = { version = "0.11", features = ["json", "rustls-tls"] } +reqwest = { version = "0.12", features = ["json", "rustls-tls", "stream"] } relative-path = "1.9" tauri = { version = "1.5.4", features = [ "fs-all", @@ -67,7 +67,7 @@ wry = { version = "0.24.6" } semver = "1.0" zip = "2.0.0" zip-extensions = "0.8.0" -gunzip = { version = "0.1.0", git = "https://github.com/TechHara/gunzip.git" } +flate2 = "1.0" tempfile = "3.9.0" glob = "0.3.1" async-trait = "0.1.77" diff --git a/clash-nyanpasu/backend/tauri/src/core/updater/instance.rs b/clash-nyanpasu/backend/tauri/src/core/updater/instance.rs index d7b6262fc4..503849e155 100644 --- a/clash-nyanpasu/backend/tauri/src/core/updater/instance.rs +++ b/clash-nyanpasu/backend/tauri/src/core/updater/instance.rs @@ -115,6 +115,8 @@ impl UpdaterBuilder { download_url.set_path(&download_path); let download_url = crate::utils::candy::parse_gh_url(&mirror, download_url.as_str())?; let file = tokio::fs::File::create(temp_dir.path().join(&artifact)).await?; + tracing::debug!("downloader url: {}", download_url); + tracing::debug!("downloader file: {:?}", file); let (tx, rx) = tokio::sync::mpsc::channel::(1); let callback: Box = Box::new(move |state| { let tx = tx.clone(); @@ -146,6 +148,7 @@ impl UpdaterBuilder { impl Updater { fn dispatch_state(&self, state: UpdaterState) { + tracing::debug!("dispatching updater state: {:?}", state); let mut inner = self.inner.write(); inner.state = state; } @@ -162,8 +165,8 @@ impl Updater { match artifact { fname if fname.ends_with(".gz") => { tracing::debug!("decompressing gz file"); - let mut decompressor = gunzip::Decompressor::new(tmp_file, true); - std::io::copy(&mut decompressor, &mut buff)?; + let mut decoder = flate2::read::GzDecoder::new(&mut tmp_file); + std::io::copy(&mut decoder, &mut buff)?; } fname if fname.ends_with(".zip") => { tracing::debug!("decompressing zip file"); @@ -193,7 +196,11 @@ impl Updater { Ok::<_, anyhow::Error>(buff) }) .await??; - let tmp_core = self.temp_dir.path().join(self.core_type.to_string()); + let tmp_core = self.temp_dir.path().join(format!( + "{}{}", + self.core_type, + std::env::consts::EXE_SUFFIX + )); tracing::debug!("writing core to {:?} ({} bytes)", tmp_core, buff.len()); let mut core_file = tokio::fs::File::create(&tmp_core).await?; tokio::io::copy(&mut buff.as_slice(), &mut core_file).await?; @@ -222,7 +229,11 @@ impl Updater { let core_dir = core_dir.parent().ok_or(anyhow!("failed to get core dir"))?; let target_core = core_dir.join(target_core); tracing::debug!("copying core to {:?}", target_core); - let tmp_core_path = self.temp_dir.path().join(&self.artifact); + let tmp_core_path = self.temp_dir.path().join(format!( + "{}{}", + self.core_type, + std::env::consts::EXE_SUFFIX + )); match tokio::fs::copy(tmp_core_path.clone(), target_core.clone()).await { Ok(_) => {} Err(err) => { diff --git a/clash-nyanpasu/backend/tauri/src/ipc.rs b/clash-nyanpasu/backend/tauri/src/ipc.rs index e3a780262f..dee6ba7cc5 100644 --- a/clash-nyanpasu/backend/tauri/src/ipc.rs +++ b/clash-nyanpasu/backend/tauri/src/ipc.rs @@ -225,6 +225,11 @@ pub async fn url_delay_test(url: &str, expected_status: u16) -> CmdResult