Update AssemblyInfo.cs

bugfix
Merge pull request #2449 from Miroxyz/master
2022-07-04 20:56:04 +08:00 · 2022-07-04 20:47:39 +08:00 · 2022-07-04 20:43:32 +08:00 · 2022-07-04 14:02:40 +08:00 · 2022-07-03 09:07:48 +08:00
4 changed files with 49 additions and 10 deletions
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -978,7 +978,9 @@ namespace v2rayN.Handler
            else if (clipboardData.IndexOf("server") >= 0
                && clipboardData.IndexOf("up") >= 0
                && clipboardData.IndexOf("down") >= 0
-                && clipboardData.IndexOf("listen") >= 0)
+                && clipboardData.IndexOf("listen") >= 0
+                && clipboardData.IndexOf("<html>") < 0
+                && clipboardData.IndexOf("<body>") < 0)
            {
                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                File.WriteAllText(fileName, clipboardData);
@@ -989,7 +991,9 @@ namespace v2rayN.Handler
            }
            //Is naiveproxy configuration
            else if (clipboardData.IndexOf("listen") >= 0
-                && clipboardData.IndexOf("proxy") >= 0)
+                && clipboardData.IndexOf("proxy") >= 0
+                && clipboardData.IndexOf("<html>") < 0
+                && clipboardData.IndexOf("<body>") < 0)
            {
                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                File.WriteAllText(fileName, clipboardData);
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -66,7 +67,11 @@ namespace v2rayN.Handler
            catch (Exception ex)
            {
                //Utils.SaveLog(ex.Message, ex);
-                Error?.Invoke(this, new ErrorEventArgs(ex));
+                Error?.Invoke(this, new ErrorEventArgs(ex)); 
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
            }
            return 0;
        }
@@ -104,7 +109,11 @@ namespace v2rayN.Handler
            {
                Utils.SaveLog(ex.Message, ex);

-                Error?.Invoke(this, new ErrorEventArgs(ex));
+                Error?.Invoke(this, new ErrorEventArgs(ex)); 
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
            }
        }

@@ -167,6 +176,10 @@ namespace v2rayN.Handler
            {
                Utils.SaveLog(ex.Message, ex);
                Error?.Invoke(this, new ErrorEventArgs(ex));
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
            }
            return null;
        }
@@ -239,13 +252,35 @@ namespace v2rayN.Handler
                return null;
            }
            var httpPort = LazyConfig.Instance.GetConfig().GetLocalPort(Global.InboundHttp);
-            var webProxy = new WebProxy(Global.Loopback, httpPort);
-            if (RunAvailabilityCheck(webProxy) > 0)
+            if (!SocketCheck(Global.Loopback, httpPort))
            {
-                return webProxy;
+                return null;
            }

-            return null;
+            return new WebProxy(Global.Loopback, httpPort);
+        }
+
+        private bool SocketCheck(string ip, int port)
+        {
+            Socket sock = null;
+            try
+            {
+                IPAddress ipa = IPAddress.Parse(ip);
+                IPEndPoint point = new IPEndPoint(ipa, port);
+                sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                sock.Connect(point);
+                return true;
+            }
+            catch { }
+            finally
+            {
+                if (sock != null)
+                {
+                    sock.Close();
+                    sock.Dispose();
+                }
+            }
+            return false;
        }
    }
 }
--- a/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -112,7 +112,7 @@ namespace v2rayN.Handler
            coreInfos.Add(new CoreInfo
            {
                coreType = ECoreType.clash_meta,
-                coreExes = new List<string> { "Clash.Meta-windows-amd64v1", "Clash.Meta-windows-amd64", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
+                coreExes = new List<string> { "Clash.Meta-windows-amd64v1", "Clash.Meta-windows-amd64", "Clash.Meta-windows-amd64-compatible", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
                arguments = "-f config.json",
                coreUrl = Global.clashMetaCoreUrl,
                coreLatestUrl = Global.clashMetaCoreUrl + "/latest",
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("5.28")]
+[assembly: AssemblyFileVersion("5.29")]
Author	SHA1	Message	Date
2dust	6e5781c633	Update AssemblyInfo.cs	2022-07-04 20:56:04 +08:00
2dust	b58e524d78	bugfix	2022-07-04 20:47:39 +08:00
2dust	0d669af44e	Merge pull request #2449 from Miroxyz/master Update Clash.Meta coreExes	2022-07-04 20:43:32 +08:00
Miro11	a331c70233	Update Clash.Meta coreExes	2022-07-04 14:02:40 +08:00
2dust	fd7d688e6b	Improve subscription update	2022-07-03 09:07:48 +08:00