From 99c8d50943a7234acce1e9db89fee29d217019d5 Mon Sep 17 00:00:00 2001 From: armv9 <48624112+arm64v8a@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:27:22 +0900 Subject: [PATCH 1/3] add url test button on main window --- translations/fa_IR.ts | 8 ++++++++ translations/ru_RU.ts | 8 ++++++++ translations/zh_CN.ts | 10 +++++++++- ui/mainwindow.cpp | 9 +++++---- ui/mainwindow.h | 2 +- ui/mainwindow.ui | 32 ++++++++++++++++++++++++-------- ui/mainwindow_grpc.cpp | 13 +++++++------ 7 files changed, 62 insertions(+), 20 deletions(-) diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts index d6562f5..9fc28a3 100644 --- a/translations/fa_IR.ts +++ b/translations/fa_IR.ts @@ -1492,6 +1492,10 @@ End: %2 Stop Testing + + URL Test + + ProxyItem @@ -1632,6 +1636,10 @@ Direct: %2 Default پیش فرض + + The last speed test did not exit completely, please wait. If it persists, please restart the program. + + Qv2ray::ui::widgets::AutoCompleteTextEdit diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 880f57a..7abdd86 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -1498,6 +1498,10 @@ End: %2 Stop Testing + + URL Test + + ProxyItem @@ -1645,6 +1649,10 @@ Release note: Default По умолчанию + + The last speed test did not exit completely, please wait. If it persists, please restart the program. + + Qv2ray::ui::widgets::AutoCompleteTextEdit diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 213c6df..8a9f13a 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -1488,7 +1488,7 @@ Split by line. In and Out IP - 入口出口IP + 入口出口 IP Test Options @@ -1498,6 +1498,10 @@ Split by line. Stop Testing 停止测试 + + URL Test + URL 测试 + ProxyItem @@ -1645,6 +1649,10 @@ Release note: Default 默认 + + The last speed test did not exit completely, please wait. If it persists, please restart the program. + 上次速度测试未完全退出，请等待。如果问题仍然存在，请重新启动程序。 + Qv2ray::ui::widgets::AutoCompleteTextEdit diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp index d7ed7c4..920fe14 100644 --- a/ui/mainwindow.cpp +++ b/ui/mainwindow.cpp @@ -103,6 +103,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi connect(ui->toolButton_document, &QToolButton::clicked, this, [=] { QDesktopServices::openUrl(QUrl("https://matsuridayo.github.io/")); }); connect(ui->toolButton_ads, &QToolButton::clicked, this, [=] { QDesktopServices::openUrl(QUrl("https://matsuricom.pages.dev/")); }); connect(ui->toolButton_update, &QToolButton::clicked, this, [=] { runOnNewThread([=] { CheckUpdate(); }); }); + connect(ui->toolButton_url_test, &QToolButton::clicked, this, [=] { speedtest_current_group(1, true); }); // Setup log UI ui->splitter->restoreState(DecodeB64IfValid(NekoGui::dataStore->splitter_state)); @@ -333,10 +334,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi neko_set_spmode_vpn(false); }); connect(ui->menu_qr, &QAction::triggered, this, [=]() { display_qr_link(false); }); - connect(ui->menu_tcp_ping, &QAction::triggered, this, [=]() { speedtest_current_group(0); }); - connect(ui->menu_url_test, &QAction::triggered, this, [=]() { speedtest_current_group(1); }); - connect(ui->menu_full_test, &QAction::triggered, this, [=]() { speedtest_current_group(2); }); - connect(ui->menu_stop_testing, &QAction::triggered, this, [=]() { speedtest_current_group(114514); }); + connect(ui->menu_tcp_ping, &QAction::triggered, this, [=]() { speedtest_current_group(0, false); }); + connect(ui->menu_url_test, &QAction::triggered, this, [=]() { speedtest_current_group(1, false); }); + connect(ui->menu_full_test, &QAction::triggered, this, [=]() { speedtest_current_group(2, false); }); + connect(ui->menu_stop_testing, &QAction::triggered, this, [=]() { speedtest_current_group(114514, false); }); // auto set_selected_or_group = [=](int mode) { // 0=group 1=select 2=unknown(menu is hide) diff --git a/ui/mainwindow.h b/ui/mainwindow.h index 9f95c4d..5ca492d 100644 --- a/ui/mainwindow.h +++ b/ui/mainwindow.h @@ -185,7 +185,7 @@ private: static void setup_grpc(); - void speedtest_current_group(int mode); + void speedtest_current_group(int mode, bool test_group); void speedtest_current(); diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 8618965..585577a 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -205,6 +205,19 @@ + + + + URL Test + + + QToolButton::InstantPopup + + + Qt::ToolButtonTextUnderIcon + + + @@ -665,7 +678,7 @@ Tcp Ping - Ctrl+Shift+T + Ctrl+Alt+T @@ -673,7 +686,7 @@ Url Test - Ctrl+Shift+U + Ctrl+Alt+U @@ -681,7 +694,7 @@ Clear Test Result - Ctrl+Shift+C + Ctrl+Alt+C @@ -726,7 +739,7 @@ Remove Duplicates - Ctrl+Shift+D + Ctrl+Alt+D @@ -774,7 +787,7 @@ Remove Unavailable - Ctrl+Shift+R + Ctrl+Alt+R @@ -782,7 +795,7 @@ Full Test - Ctrl+Shift+F + Ctrl+Alt+F @@ -803,7 +816,7 @@ Copy links of selected (Neko Links) - Ctrl+Alt+C + Ctrl+N @@ -859,7 +872,7 @@ Resolve domain - Ctrl+Shift+I + Ctrl+Alt+I @@ -902,6 +915,9 @@ Stop Testing + + Ctrl+Alt+S + diff --git a/ui/mainwindow_grpc.cpp b/ui/mainwindow_grpc.cpp index 923cc5a..3e9f469 100644 --- a/ui/mainwindow_grpc.cpp +++ b/ui/mainwindow_grpc.cpp @@ -58,8 +58,14 @@ void MainWindow::setup_grpc() { inline bool speedtesting = false; inline QList speedtesting_threads = {}; -void MainWindow::speedtest_current_group(int mode) { +void MainWindow::speedtest_current_group(int mode, bool test_group) { + if (speedtesting) { + MessageBoxWarning(software_name, QObject::tr("The last speed test did not exit completely, please wait. If it persists, please restart the program.")); + return; + } + auto profiles = get_selected_or_group(); + if (test_group) profiles = NekoGui::profileManager->CurrentGroup()->ProfilesWithOrder(); if (profiles.isEmpty()) return; auto group = NekoGui::profileManager->CurrentGroup(); if (group->archive) return; @@ -75,11 +81,6 @@ void MainWindow::speedtest_current_group(int mode) { } #ifndef NKR_NO_GRPC - if (speedtesting) { - MessageBoxWarning(software_name, "The last speed test did not exit completely, please wait. If it persists, please restart the program."); - return; - } - QStringList full_test_flags; if (mode == libcore::FullTest) { auto w = new QDialog(this); From 6de7c588b6b7b5bc31dfd25c344b1a88e3d82cd8 Mon Sep 17 00:00:00 2001 From: armv9 <48624112+arm64v8a@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:30:04 +0900 Subject: [PATCH 2/3] update core --- fmt/Bean2External.cpp | 2 +- go/cmd/nekobox_core/go.mod | 26 ++++++++++----------- go/cmd/nekobox_core/go.sum | 46 ++++++++++++++++++-------------------- libs/get_source.sh | 10 +++++++++ libs/get_source_env.sh | 3 ++- 5 files changed, 48 insertions(+), 39 deletions(-) diff --git a/fmt/Bean2External.cpp b/fmt/Bean2External.cpp index caca35d..a77a102 100644 --- a/fmt/Bean2External.cpp +++ b/fmt/Bean2External.cpp @@ -50,7 +50,7 @@ namespace NekoGui_fmt { return 1; }; - if (!forceExternal && (proxy_type == proxy_TUIC || hopPort.trimmed().isEmpty())) { + if (!forceExternal) { // sing-box support return 0; } else { diff --git a/go/cmd/nekobox_core/go.mod b/go/cmd/nekobox_core/go.mod index 7afab52..6af5b62 100644 --- a/go/cmd/nekobox_core/go.mod +++ b/go/cmd/nekobox_core/go.mod @@ -40,6 +40,7 @@ require ( github.com/libdns/cloudflare v0.1.1 // indirect github.com/libdns/libdns v0.2.2 // indirect github.com/logrusorgru/aurora v2.0.3+incompatible // indirect + github.com/metacubex/tfo-go v0.0.0-20240821025650-e9be0afd5e7d // indirect github.com/mholt/acmez v1.2.0 // indirect github.com/miekg/dns v1.1.59 // indirect github.com/onsi/ginkgo/v2 v2.9.7 // indirect @@ -52,19 +53,18 @@ require ( github.com/sagernet/cloudflare-tls v0.0.0-20231208171750-a4483c1b7cd1 // indirect github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f // indirect github.com/sagernet/netlink v0.0.0-20240523065131-45e60152f9ba // indirect - github.com/sagernet/quic-go v0.45.1-beta.2 // indirect + github.com/sagernet/quic-go v0.47.0-beta.2 // indirect github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 // indirect - github.com/sagernet/sing v0.4.1 // indirect - github.com/sagernet/sing-dns v0.2.1-0.20240624030536-ca4a5f7afb65 // indirect + github.com/sagernet/sing v0.4.3 // indirect + github.com/sagernet/sing-dns v0.2.3 // indirect github.com/sagernet/sing-mux v0.2.0 // indirect - github.com/sagernet/sing-quic v0.2.0-beta.12 // indirect - github.com/sagernet/sing-shadowsocks v0.2.6 // indirect + github.com/sagernet/sing-quic v0.2.2 // indirect + github.com/sagernet/sing-shadowsocks v0.2.7 // indirect github.com/sagernet/sing-shadowsocks2 v0.2.0 // indirect github.com/sagernet/sing-shadowtls v0.1.4 // indirect - github.com/sagernet/sing-tun v0.3.2 // indirect - github.com/sagernet/sing-vmess v0.1.8 // indirect + github.com/sagernet/sing-tun v0.3.3 // indirect + github.com/sagernet/sing-vmess v0.1.12 // indirect github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect - github.com/sagernet/tfo-go v0.0.0-20231209031829-7b5343ac1dc6 // indirect github.com/sagernet/utls v1.5.4 // indirect github.com/sagernet/wireguard-go v0.0.0-20231215174105-89dec3b2f3e8 // indirect github.com/sagernet/ws v0.0.0-20231204124109-acfe8907c854 // indirect @@ -80,16 +80,16 @@ require ( golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect golang.org/x/mod v0.18.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.33.0 // indirect - lukechampine.com/blake3 v1.2.1 // indirect + lukechampine.com/blake3 v1.3.0 // indirect ) replace grpc_server => ../../grpc_server @@ -98,7 +98,7 @@ replace github.com/matsuridayo/libneko => ../../../../libneko replace github.com/sagernet/sing-box => ../../../../sing-box -// replace github.com/sagernet/sing-quic => ../../../../sing-quic +replace github.com/sagernet/sing-quic => ../../../../sing-quic // replace github.com/sagernet/sing => ../../../../sing diff --git a/go/cmd/nekobox_core/go.sum b/go/cmd/nekobox_core/go.sum index 0c1f769..4f99f25 100644 --- a/go/cmd/nekobox_core/go.sum +++ b/go/cmd/nekobox_core/go.sum @@ -94,6 +94,8 @@ github.com/libdns/libdns v0.2.2 h1:O6ws7bAfRPaBsgAYt8MDe2HcNBGC29hkZ9MX2eUSX3s= github.com/libdns/libdns v0.2.2/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ= github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/metacubex/tfo-go v0.0.0-20240821025650-e9be0afd5e7d h1:j9LtzkYstLFoNvXW824QQeN7Y26uPL5249kzWKbzO9U= +github.com/metacubex/tfo-go v0.0.0-20240821025650-e9be0afd5e7d/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts= github.com/mholt/acmez v1.2.0 h1:1hhLxSgY5FvH5HCnGUuwbKY2VQVo8IU7rxXKSnZ7F30= github.com/mholt/acmez v1.2.0/go.mod h1:VT9YwH1xgNX1kmYY89gY8xPJC84BFAisjo8Egigt4kE= github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs= @@ -125,33 +127,29 @@ github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f h1:NkhuupzH5ch7b/Y github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f/go.mod h1:KXmw+ouSJNOsuRpg4wgwwCQuunrGz4yoAqQjsLjc6N0= github.com/sagernet/netlink v0.0.0-20240523065131-45e60152f9ba h1:EY5AS7CCtfmARNv2zXUOrsEMPFDGYxaw65JzA2p51Vk= github.com/sagernet/netlink v0.0.0-20240523065131-45e60152f9ba/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM= -github.com/sagernet/quic-go v0.45.1-beta.2 h1:zkEeCbhdFFkrxKcuIRBtXNKci/1t2J/39QSG/sPvlmc= -github.com/sagernet/quic-go v0.45.1-beta.2/go.mod h1:+N3FqM9DAzOWfe64uxXuBejVJwX7DeW7BslzLO6N/xI= +github.com/sagernet/quic-go v0.47.0-beta.2 h1:1tCGWFOSaXIeuQaHrwOMJIYvlupjTcaVInGQw5ArULU= +github.com/sagernet/quic-go v0.47.0-beta.2/go.mod h1:bLVKvElSEMNv7pu7SZHscW02TYigzQ5lQu3Nh4wNh8Q= github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byLGkEnIYp6grlXfo1QYUfiYFGjewIdc= github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU= github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo= -github.com/sagernet/sing v0.4.1 h1:zVlpE+7k7AFoC2pv6ReqLf0PIHjihL/jsBl5k05PQFk= -github.com/sagernet/sing v0.4.1/go.mod h1:ieZHA/+Y9YZfXs2I3WtuwgyCZ6GPsIR7HdKb1SdEnls= -github.com/sagernet/sing-dns v0.2.1-0.20240624030536-ca4a5f7afb65 h1:lcCe7E1csuyUA3RCvpFcIYOy6FIifDthKaCrUjLG4xA= -github.com/sagernet/sing-dns v0.2.1-0.20240624030536-ca4a5f7afb65/go.mod h1:dArgyPZmK8+zDBVRMjV3r12zHgnTara0ahrWwSe/eQE= +github.com/sagernet/sing v0.4.3 h1:Ty/NAiNnVd6844k7ujlL5lkzydhcTH5Psc432jXA4Y8= +github.com/sagernet/sing v0.4.3/go.mod h1:ieZHA/+Y9YZfXs2I3WtuwgyCZ6GPsIR7HdKb1SdEnls= +github.com/sagernet/sing-dns v0.2.3 h1:YzeBUn2tR38F7HtvGEQ0kLRLmZWMEgi/+7wqa4Twb1k= +github.com/sagernet/sing-dns v0.2.3/go.mod h1:BJpJv6XLnrUbSyIntOT6DG9FW0f4fETmPAHvNjOprLg= github.com/sagernet/sing-mux v0.2.0 h1:4C+vd8HztJCWNYfufvgL49xaOoOHXty2+EAjnzN3IYo= github.com/sagernet/sing-mux v0.2.0/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ= -github.com/sagernet/sing-quic v0.2.0-beta.12 h1:BhvA5mmrDFEyDUQB5eeu+9UhF+ieyuNJ5Rsb0dAG3QY= -github.com/sagernet/sing-quic v0.2.0-beta.12/go.mod h1:YVpLfVi8BvYM7NMrjmnvcRm3E8iMETf1gFQmTQDN9jI= -github.com/sagernet/sing-shadowsocks v0.2.6 h1:xr7ylAS/q1cQYS8oxKKajhuQcchd5VJJ4K4UZrrpp0s= -github.com/sagernet/sing-shadowsocks v0.2.6/go.mod h1:j2YZBIpWIuElPFL/5sJAj470bcn/3QQ5lxZUNKLDNAM= +github.com/sagernet/sing-shadowsocks v0.2.7 h1:zaopR1tbHEw5Nk6FAkM05wCslV6ahVegEZaKMv9ipx8= +github.com/sagernet/sing-shadowsocks v0.2.7/go.mod h1:0rIKJZBR65Qi0zwdKezt4s57y/Tl1ofkaq6NlkzVuyE= github.com/sagernet/sing-shadowsocks2 v0.2.0 h1:wpZNs6wKnR7mh1wV9OHwOyUr21VkS3wKFHi+8XwgADg= github.com/sagernet/sing-shadowsocks2 v0.2.0/go.mod h1:RnXS0lExcDAovvDeniJ4IKa2IuChrdipolPYWBv9hWQ= github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k= github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4= -github.com/sagernet/sing-tun v0.3.2 h1:z0bLUT/YXH9RrJS9DsIpB0Bb9afl2hVJOmHd0zA3HJY= -github.com/sagernet/sing-tun v0.3.2/go.mod h1:DxLIyhjWU/HwGYoX0vNGg2c5QgTQIakphU1MuERR5tQ= -github.com/sagernet/sing-vmess v0.1.8 h1:XVWad1RpTy9b5tPxdm5MCU8cGfrTGdR8qCq6HV2aCNc= -github.com/sagernet/sing-vmess v0.1.8/go.mod h1:vhx32UNzTDUkNwOyIjcZQohre1CaytquC5mPplId8uA= +github.com/sagernet/sing-tun v0.3.3 h1:LZnQNmfGcNG2KPTPkLgc+Lo7k606QJVkPp2DnjriwUk= +github.com/sagernet/sing-tun v0.3.3/go.mod h1:DxLIyhjWU/HwGYoX0vNGg2c5QgTQIakphU1MuERR5tQ= +github.com/sagernet/sing-vmess v0.1.12 h1:2gFD8JJb+eTFMoa8FIVMnknEi+vCSfaiTXTfEYAYAPg= +github.com/sagernet/sing-vmess v0.1.12/go.mod h1:luTSsfyBGAc9VhtCqwjR+dt1QgqBhuYBCONB/POhF8I= github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ= github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo= -github.com/sagernet/tfo-go v0.0.0-20231209031829-7b5343ac1dc6 h1:z3SJQhVyU63FT26Wn/UByW6b7q8QKB0ZkPqsyqcz2PI= -github.com/sagernet/tfo-go v0.0.0-20231209031829-7b5343ac1dc6/go.mod h1:73xRZuxwkFk4aiLw28hG8W6o9cr2UPrGL9pdY2UTbvY= github.com/sagernet/utls v1.5.4 h1:KmsEGbB2dKUtCNC+44NwAdNAqnqQ6GA4pTO0Yik56co= github.com/sagernet/utls v1.5.4/go.mod h1:CTGxPWExIloRipK3XFpYv0OVyhO8kk3XCGW/ieyTh1s= github.com/sagernet/wireguard-go v0.0.0-20231215174105-89dec3b2f3e8 h1:R0OMYAScomNAVpTfbHFpxqJpvwuhxSRi+g6z7gZhABs= @@ -229,8 +227,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -245,15 +243,15 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -296,5 +294,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= -lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= +lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE= +lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= diff --git a/libs/get_source.sh b/libs/get_source.sh index 9564bd6..b416bd7 100755 --- a/libs/get_source.sh +++ b/libs/get_source.sh @@ -18,6 +18,16 @@ popd #### +if [ ! -d "sing-quic" ]; then + git clone --no-checkout https://github.com/MatsuriDayo/sing-quic.git +fi +pushd sing-quic +git checkout "$COMMIT_SING_QUIC" + +popd + +#### + if [ ! -d "libneko" ]; then git clone --no-checkout https://github.com/MatsuriDayo/libneko.git fi diff --git a/libs/get_source_env.sh b/libs/get_source_env.sh index 3ccd4a1..1f35b7a 100644 --- a/libs/get_source_env.sh +++ b/libs/get_source_env.sh @@ -1,2 +1,3 @@ -export COMMIT_SING_BOX="cf36758f11b7c144e1211801753cc91f06ff2906" +export COMMIT_SING_BOX="06557f6cef23160668122a17a818b378b5a216b5" +export COMMIT_SING_QUIC="b49ce60d9b3622d5238fee96bfd3c5f6e3915b42" export COMMIT_LIBNEKO="1c47a3af71990a7b2192e03292b4d246c308ef0b" From 12d6fc24e7de077c2207acb582aed2b4ef902cf4 Mon Sep 17 00:00:00 2001 From: armv9 <48624112+arm64v8a@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:30:22 +0900 Subject: [PATCH 3/3] 4.0-beta4 --- nekoray_version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nekoray_version.txt b/nekoray_version.txt index eabe8a6..f667d02 100644 --- a/nekoray_version.txt +++ b/nekoray_version.txt @@ -1 +1 @@ -4.0-beta3-2024-07-13 +4.0-beta4-2024-10-09