Merge branch '2dust:master' into master

2025-08-29 14:26:20 +00:00 · 2023-06-05 21:35:46 +08:00 · 2023-06-05 21:35:46 +08:00 · 186ad1df6f
commit 186ad1df6f
parent 11dfdab682 1b11425acd
20 changed files with 71 additions and 135 deletions
--- a/v2rayN/ProtosLib/ProtosLib.csproj
+++ b/v2rayN/ProtosLib/ProtosLib.csproj
@ -9,7 +9,7 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.23.0" />
+		<PackageReference Include="Google.Protobuf" Version="3.23.2" />
 		<PackageReference Include="Grpc.Net.Client" Version="2.53.0" />
 		<PackageReference Include="Grpc.Tools" Version="2.54.0">
 			<PrivateAssets>all</PrivateAssets>
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@ -140,7 +140,6 @@ namespace v2rayN.Handler
                config.guiItem = new()
                {
                    enableStatistics = false,
-                    statisticsFreshRate = 1,
                };
            }
            if (config.uiItem == null)
@ -185,11 +184,6 @@ namespace v2rayN.Handler
                config.speedTestItem.speedPingTestUrl = Global.SpeedPingTestUrl;
            }

-            if (config.guiItem.statisticsFreshRate is > 100 or < 1)
-            {
-                config.guiItem.statisticsFreshRate = 1;
-            }
-
            if (config.mux4Sbox == null)
            {
                config.mux4Sbox = new()
@ -331,7 +325,6 @@ namespace v2rayN.Handler
                config.guiItem = new()
                {
                    enableStatistics = configOld.enableStatistics,
-                    statisticsFreshRate = configOld.statisticsFreshRate,
                    keepOlderDedupl = configOld.keepOlderDedupl,
                    ignoreGeoUpdateCore = configOld.ignoreGeoUpdateCore,
                    autoUpdateInterval = configOld.autoUpdateInterval,
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@ -106,30 +106,19 @@ namespace v2rayN.Handler
        private int inbound(SingboxConfig singboxConfig)
        {
            try
-            {
-                if (_config.tunModeItem.enableTun)
            {
                singboxConfig.inbounds.Clear();

-                    if (_config.tunModeItem.mtu <= 0)
+                if (!_config.tunModeItem.enableTun || (_config.tunModeItem.enableTun && _config.tunModeItem.enableExInbound))
                {
-                        _config.tunModeItem.mtu = Convert.ToInt32(Global.TunMtus[0]);
-                    }
-                    if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
+                    var inbound = new Inbound4Sbox()
                    {
-                        _config.tunModeItem.stack = Global.TunStacks[0];
-                    }
+                        type = Global.InboundSocks,
+                        tag = Global.InboundSocks,
+                        listen = Global.Loopback,
+                    };
+                    singboxConfig.inbounds.Add(inbound);

-                    var tunInbound = Utils.FromJson<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName));
-                    tunInbound.mtu = _config.tunModeItem.mtu;
-                    tunInbound.strict_route = _config.tunModeItem.strictRoute;
-                    tunInbound.stack = _config.tunModeItem.stack;
-
-                    singboxConfig.inbounds.Add(tunInbound);
-                }
-                else
-                {
-                    var inbound = singboxConfig.inbounds[0];
                    inbound.listen_port = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
                    inbound.sniff = _config.inbound[0].sniffingEnabled;
                    inbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
@ -174,6 +163,25 @@ namespace v2rayN.Handler
                        }
                    }
                }
+
+                if (_config.tunModeItem.enableTun)
+                {
+                    if (_config.tunModeItem.mtu <= 0)
+                    {
+                        _config.tunModeItem.mtu = Convert.ToInt32(Global.TunMtus[0]);
+                    }
+                    if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
+                    {
+                        _config.tunModeItem.stack = Global.TunStacks[0];
+                    }
+
+                    var tunInbound = Utils.FromJson<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName));
+                    tunInbound.mtu = _config.tunModeItem.mtu;
+                    tunInbound.strict_route = _config.tunModeItem.strictRoute;
+                    tunInbound.stack = _config.tunModeItem.stack;
+
+                    singboxConfig.inbounds.Add(tunInbound);
+                }
            }
            catch (Exception ex)
            {
@ -255,7 +263,6 @@ namespace v2rayN.Handler
                    outbound.type = Global.vlessProtocolLite;

                    outbound.uuid = node.id;
-                    outbound.flow = node.flow;

                    outbound.packet_encoding = "xudp";

@ -263,6 +270,10 @@ namespace v2rayN.Handler
                    {
                        outboundMux(node, outbound);
                    }
+                    else
+                    {
+                        outbound.flow = node.flow;
+                    }
                }
                else if (node.configType == EConfigType.Trojan)
                {
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@ -423,7 +423,6 @@ namespace v2rayN.Handler
                        usersItem = vnextItem.users[0];
                    }
                    usersItem.id = node.id;
-                    usersItem.flow = string.Empty;
                    usersItem.email = Global.userEMail;
                    usersItem.encryption = node.security;

@ -462,7 +461,6 @@ namespace v2rayN.Handler
                    serversItem.address = node.address;
                    serversItem.port = node.port;
                    serversItem.password = node.id;
-                    serversItem.flow = string.Empty;

                    serversItem.ota = false;
                    serversItem.level = 1;
--- a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
@ -61,8 +61,7 @@ namespace v2rayN.Handler
                            _updateFunc(server);
                        }
                    }
-                    var sleep = _config.guiItem.statisticsFreshRate < 1 ? 1 : _config.guiItem.statisticsFreshRate;
-                    await Task.Delay(1000 * sleep);
+                    await Task.Delay(1000);
                    await _channel.ConnectAsync();
                }
                catch
--- a/v2rayN/v2rayN/Mode/ConfigItems.cs
+++ b/v2rayN/v2rayN/Mode/ConfigItems.cs
@ -88,8 +88,6 @@ namespace v2rayN.Mode

        public bool enableStatistics { get; set; }

-        public int statisticsFreshRate { get; set; }
-
        public bool keepOlderDedupl { get; set; }

        public bool ignoreGeoUpdateCore { get; set; } = true;
@ -165,6 +163,7 @@ namespace v2rayN.Mode
        public bool strictRoute { get; set; }
        public string stack { get; set; }
        public int mtu { get; set; }
+        public bool enableExInbound { get; set; }
    }

    [Serializable]
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@ -185,7 +185,7 @@ namespace v2rayN.Mode
        /// <summary>
        /// VLESS
        /// </summary>
-        public string flow { get; set; }
+        public string? flow { get; set; }
    }

    public class Sniffing4Ray
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@ -2761,15 +2761,6 @@ namespace v2rayN.Resx {
            }
        }
        
-        /// <summary>
-        ///   查找类似 Statistics freshrate (second) 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsStatisticsFreshRate {
-            get {
-                return ResourceManager.GetString("TbSettingsStatisticsFreshRate", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   查找类似 Subscription conversion Url 的本地化字符串。
        /// </summary>
--- a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
@ -793,9 +793,6 @@
  <data name="TbSettingsStatistics" xml:space="preserve">
    <value>فعال کردن آمار (نیاز به راه اندازی مجدد)</value>
  </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>نرخ تازه سازی آمار (ثانیه)</value>
-  </data>
  <data name="TbSettingsSubConvert" xml:space="preserve">
    <value>Subscription conversion Url</value>
  </data>
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@ -796,9 +796,6 @@
  <data name="TbSettingsStatistics" xml:space="preserve">
    <value>Enable Statistics (Require restart)</value>
  </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>Statistics freshrate (second)</value>
-  </data>
  <data name="TbSettingsSubConvert" xml:space="preserve">
    <value>Subscription conversion Url</value>
  </data>
--- a/v2rayN/v2rayN/Resx/ResUI.ru.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.ru.resx
@ -796,9 +796,6 @@
  <data name="TbSettingsStatistics" xml:space="preserve">
    <value>Включить статистику (требуется перезагрузка)</value>
  </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>Частота обновления статистики в секундах</value>
-  </data>
  <data name="TbSettingsSubConvert" xml:space="preserve">
    <value>URL-адрес конверсии подписки</value>
  </data>
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@ -796,9 +796,6 @@
  <data name="TbSettingsStatistics" xml:space="preserve">
    <value>启用统计(实时网速显示，需重启)</value>
  </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>统计刷新频率(单位秒)</value>
-  </data>
  <data name="TbSettingsSubConvert" xml:space="preserve">
    <value>订阅转换网址(可选)</value>
  </data>
--- a/v2rayN/v2rayN/Sample/tun_singbox_inbound
+++ b/v2rayN/v2rayN/Sample/tun_singbox_inbound
@ -1,11 +1,12 @@
 {
-   "type":"tun",
-   "tag":"tun-in",
-   "interface_name":"singbox_tun",
-   "inet4_address":"172.19.0.1/30",
-   "mtu":9000,
-   "auto_route":true,
-   "strict_route":false,
-   "stack":"system",
-   "sniff":true
+  "type": "tun",
+  "tag": "tun-in",
+  "interface_name": "singbox_tun",
+  "inet4_address": "172.19.0.1/30",
+  "inet6_address": "fdfe:dcba:9876::1/126",
+  "mtu": 9000,
+  "auto_route": true,
+  "strict_route": false,
+  "stack": "system",
+  "sniff": true
 }
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@ -170,8 +170,8 @@ namespace v2rayN.ViewModels
        [Reactive]
        public ImageSource AppIcon { get; set; }

-        [Reactive]
-        public bool BlShowTrayTip { get; set; }
+        //[Reactive]
+        //public bool BlShowTrayTip { get; set; }

        #endregion Menu

@ -213,8 +213,8 @@ namespace v2rayN.ViewModels
        [Reactive]
        public string RunningServerDisplay { get; set; }

-        [Reactive]
-        public string RunningServerToolTipText { get; set; }
+        //[Reactive]
+        //public string RunningServerToolTipText { get; set; }

        [Reactive]
        public string RunningInfoDisplay { get; set; }
@ -944,12 +944,12 @@ namespace v2rayN.ViewModels
                {
                    var runningSummary = running.GetSummary();
                    RunningServerDisplay = $"{ResUI.menuServers}:{runningSummary}";
-                    RunningServerToolTipText = runningSummary;
+                    //RunningServerToolTipText = runningSummary;
                }
                else
                {
-                    RunningServerDisplay =
-                    RunningServerToolTipText = ResUI.CheckServerSettings;
+                    RunningServerDisplay = ResUI.CheckServerSettings;
+                    //RunningServerToolTipText = ResUI.CheckServerSettings;
                }
            }));
        }
@ -1814,7 +1814,7 @@ namespace v2rayN.ViewModels
            }
            CurrentFontSize = _config.uiItem.currentFontSize;
            CurrentLanguage = _config.uiItem.currentLanguage;
-            BlShowTrayTip = _config.uiItem.showTrayTip;
+            //BlShowTrayTip = _config.uiItem.showTrayTip;

            this.WhenAnyValue(
                  x => x.ColorModeDark,
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@ -51,7 +51,6 @@ namespace v2rayN.ViewModels

        [Reactive] public bool AutoRun { get; set; }
        [Reactive] public bool EnableStatistics { get; set; }
-        [Reactive] public int StatisticsFreshRate { get; set; }
        [Reactive] public bool KeepOlderDedupl { get; set; }
        [Reactive] public bool IgnoreGeoUpdateCore { get; set; }
        [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
@ -141,7 +140,6 @@ namespace v2rayN.ViewModels

            AutoRun = _config.guiItem.autoRun;
            EnableStatistics = _config.guiItem.enableStatistics;
-            StatisticsFreshRate = _config.guiItem.statisticsFreshRate;
            KeepOlderDedupl = _config.guiItem.keepOlderDedupl;
            IgnoreGeoUpdateCore = _config.guiItem.ignoreGeoUpdateCore;
            EnableAutoAdjustMainLvColWidth = _config.uiItem.enableAutoAdjustMainLvColWidth;
@ -291,11 +289,6 @@ namespace v2rayN.ViewModels
            Utils.SetAutoRun(AutoRun);
            _config.guiItem.autoRun = AutoRun;
            _config.guiItem.enableStatistics = EnableStatistics;
-            _config.guiItem.statisticsFreshRate = StatisticsFreshRate;
-            if (_config.guiItem.statisticsFreshRate > 100 || _config.guiItem.statisticsFreshRate < 1)
-            {
-                _config.guiItem.statisticsFreshRate = 1;
-            }
            _config.guiItem.keepOlderDedupl = KeepOlderDedupl;
            _config.guiItem.ignoreGeoUpdateCore = IgnoreGeoUpdateCore;
            _config.uiItem.enableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@ -867,23 +867,6 @@
                            Header="{x:Static resx:ResUI.menuExit}" />
                    </ContextMenu>
                </tb:TaskbarIcon.ContextMenu>
-                <tb:TaskbarIcon.TrayToolTip>
-                    <Border
-                        x:Name="borTrayToolTip"
-                        Width="Auto"
-                        Height="Auto"
-                        Background="{DynamicResource MaterialDesignLightBackground}"
-                        BorderBrush="{DynamicResource MaterialDesignDarkBackground}"
-                        BorderThickness="0"
-                        CornerRadius="4">
-                        <TextBlock
-                            Margin="8"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource MaterialDesignDarkBackground}"
-                            Text="{Binding Mode=OneWay, Path=ToolTipText}" />
-                    </Border>
-                </tb:TaskbarIcon.TrayToolTip>
            </tb:TaskbarIcon>
            <materialDesign:Snackbar x:Name="MainSnackbar" MessageQueue="{materialDesign:MessageQueue}" />
        </Grid>
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@ -165,10 +165,10 @@ namespace v2rayN.Views
                this.BindCommand(ViewModel, vm => vm.SubUpdateViaProxyCmd, v => v.menuSubUpdateViaProxy2).DisposeWith(disposables);

                this.OneWayBind(ViewModel, vm => vm.NotifyIcon, v => v.tbNotify.Icon).DisposeWith(disposables);
-                this.OneWayBind(ViewModel, vm => vm.RunningServerToolTipText, v => v.tbNotify.ToolTipText).DisposeWith(disposables);
+                //this.OneWayBind(ViewModel, vm => vm.RunningServerToolTipText, v => v.tbNotify.ToolTipText).DisposeWith(disposables);
                this.OneWayBind(ViewModel, vm => vm.NotifyLeftClickCmd, v => v.tbNotify.LeftClickCommand).DisposeWith(disposables);
                this.OneWayBind(ViewModel, vm => vm.AppIcon, v => v.Icon).DisposeWith(disposables);
-                this.OneWayBind(ViewModel, vm => vm.BlShowTrayTip, v => v.borTrayToolTip.Visibility).DisposeWith(disposables);
+                //this.OneWayBind(ViewModel, vm => vm.BlShowTrayTip, v => v.borTrayToolTip.Visibility).DisposeWith(disposables);

                //status bar
                this.OneWayBind(ViewModel, vm => vm.InboundDisplay, v => v.txtInboundDisplay.Text).DisposeWith(disposables);
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
    x:Class="v2rayN.Views.OptionSettingWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
    xmlns:resx="clr-namespace:v2rayN.Resx"
    xmlns:vms="clr-namespace:v2rayN.ViewModels"
    Title="{x:Static resx:ResUI.menuSetting}"
@ -498,21 +498,6 @@
                            Margin="{StaticResource SettingItemMargin}"
                            HorizontalAlignment="Left" />

-                        <TextBlock
-                            Grid.Row="3"
-                            Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
-                            VerticalAlignment="Center"
-                            Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsStatisticsFreshRate}" />
-                        <ComboBox
-                            x:Name="cmbStatisticsFreshRate"
-                            Grid.Row="3"
-                            Grid.Column="1"
-                            Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
-                            Style="{StaticResource DefComboBox}" />
-
                        <TextBlock
                            Grid.Row="4"
                            Grid.Column="0"
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@ -44,10 +44,6 @@ namespace v2rayN.Views
                cmbmux4SboxProtocol.Items.Add(it);
            });

-            for (int i = 1; i <= 10; i++)
-            {
-                cmbStatisticsFreshRate.Items.Add(i);
-            }
            Global.TunMtus.ForEach(it =>
            {
                cmbMtu.Items.Add(it);
@ -150,7 +146,6 @@ namespace v2rayN.Views

                this.Bind(ViewModel, vm => vm.AutoRun, v => v.togAutoRun.IsChecked).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.EnableStatistics, v => v.togEnableStatistics.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.StatisticsFreshRate, v => v.cmbStatisticsFreshRate.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.IgnoreGeoUpdateCore, v => v.togIgnoreGeoUpdateCore.IsChecked).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@ -10,11 +10,11 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.25</FileVersion>
+		<FileVersion>6.26</FileVersion>
 	</PropertyGroup>

 	<ItemGroup>
-		<PackageReference Include="Downloader" Version="3.0.4" />		
+		<PackageReference Include="Downloader" Version="3.0.5" />		
 		<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
 		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.108" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
@ -25,7 +25,7 @@
 		<PackageReference Include="ReactiveUI.Fody" Version="18.4.1" />
 		<PackageReference Include="ReactiveUI.Validation" Version="3.0.22" />
 		<PackageReference Include="ReactiveUI.WPF" Version="18.4.1" />
-		<PackageReference Include="Splat.NLog" Version="14.6.8" />
+		<PackageReference Include="Splat.NLog" Version="14.6.37" />
 		<PackageReference Include="System.Reactive" Version="5.0.0" />
 	</ItemGroup>