项目结构优化

BarrageGrab/AppRuntime.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using BarrageGrab.Modles;
+using ColorConsole;
+
+namespace BarrageGrab
+{
+    /// <summary>
+    /// 程序运行时信息
+    /// </summary>
+    public static class AppRuntime
+    {
+        /// <summary>
+        /// Ws弹幕服务示例
+        /// </summary>
+        public static WsBarrageService WssService { get; private set; } = new WsBarrageService();
+
+        /// <summary>
+        /// 程序进程信息
+        /// </summary>
+        public static Process CurrentProcess { get; private set; } = System.Diagnostics.Process.GetCurrentProcess();
+
+
+        static AppRuntime()
+        {
+           
+        }        
+    }
+}

BarrageGrab/ObjectExtension.cs

@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BarrageGrab
+{
+    /// <summary>
+    /// 扩展类
+    /// </summary>
+    public static class ObjectExtension
+    {
+        /// <summary>
+        /// 判断字符串是否为空或空白
+        /// </summary>
+        public static bool IsNullOrWhiteSpace(this string str) => string.IsNullOrWhiteSpace(str);
+
+        /// <summary>
+        /// 判断字符串是否为空
+        /// </summary>
+        public static bool IsNullOrEmpty(this string str) => string.IsNullOrEmpty(str);
+
+        /// <summary>
+        /// 转为Json
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static string ToJson(this object obj)
+        {
+            if (obj is string)
+            {
+                return obj.ToString();
+            }            
+            return JsonConvert.SerializeObject(obj);
+        }
+
+        /// <summary>
+        /// 转为对象
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="json"></param>
+        /// <returns></returns>
+        public static T AsObject<T>(this string json)
+        {
+            return JsonConvert.DeserializeObject<T>(json);
+        }
+
+        /// <summary>
+        /// 获取Value或其Value默认值
+        /// </summary>
+        public static TValue ValueOrDefault<Tkey, TValue>(this IDictionary<Tkey, TValue> dic, Tkey key)
+        {
+            if (dic.ContainsKey(key))
+            {
+                return dic[key];
+            }
+            return default;
+        }
+
+        /// <summary>
+        /// 获取Value或其Value默认值
+        /// </summary>
+        public static TValue ValueOrDefault<Tkey, TValue>(this IDictionary<Tkey, TValue> dic, Tkey key, TValue defaultValue)
+        {
+            if (dic.ContainsKey(key))
+            {
+                return dic[key];
+            }
+            return defaultValue;
+        }
+
+        /// <summary>
+        /// 遍历集合
+        /// </summary>        
+        public static void Foreach<T>(this IEnumerable<T> list, Action<T> func)
+        {
+            foreach (var item in list) func(item);
+        }
+
+        /// <summary>
+        /// 遍历集合
+        /// </summary>    
+        public static void Foreach<T>(this IEnumerable<T> list, Action<T, int> func)
+        {
+            int i = 0;
+            foreach (var item in list) func(item, i++);
+        }
+
+        
+        public static CookieCollection ToCookies(this string cookieStr, string domain)
+        {
+            var cookies = new CookieCollection();
+            if (!string.IsNullOrEmpty(cookieStr))
+            {
+                var cookieArray = cookieStr.Split(';');
+                foreach (var cookie in cookieArray)
+                {
+                    var cookieParts = cookie.Split('=');
+                    if (cookieParts.Length == 2)
+                    {
+                        var cookieName = cookieParts[0].Trim();
+                        var cookieValue = cookieParts[1].Trim();
+                        var newCookie = new Cookie(cookieName, Uri.EscapeDataString(cookieValue));
+                        newCookie.Path = "/";
+                        newCookie.Domain = domain;
+                        cookies.Add(newCookie);
+                    }
+                }
+            }
+            return cookies;
+        }
+        
+        /// <summary>
+        /// 追加另一个字典
+        /// </summary>
+        /// <param name="dic"></param>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        public static IDictionary<string, string> Append(this IEnumerable<KeyValuePair<string, string>> dic, IEnumerable<KeyValuePair<string, string>> other)
+        {
+            var res = new Dictionary<string, string>();
+            foreach (var item in dic)
+            {
+                res.Add(item.Key, item.Value);
+            }
+            foreach (var item in other)
+            {
+                if (res.ContainsKey(item.Key))
+                {
+                    res[item.Key] = item.Value;
+                }
+                else
+                {
+                    res.Add(item.Key, item.Value);
+                }                
+            }
+            return res;
+        }
+        
+
+        /// <summary>
+        /// 转换为Cookie对象列表
+        /// </summary>
+        /// <param name="dic"></param>
+        /// <param name="domain"></param>
+        /// <returns></returns>
+        public static CookieCollection ToCookies(this IDictionary<string, string> dic, string domain)
+        {
+            var cookieCollection = new CookieCollection();
+            foreach (var item in dic)
+            {
+                cookieCollection.Add(new Cookie(item.Key, item.Value, "/", domain));
+            }
+            return cookieCollection;
+        }
+
+        /// <summary>
+        /// 添加Cookie
+        /// </summary>
+        /// <param name="cookies"></param>
+        /// <param name="dic"></param>
+        /// <param name="domain"></param>
+        public static void PushCookies(this CookieContainer cookies, string domain, IDictionary<string, string> dic)
+        {
+            if (cookies == null) return;
+            var cookieCollection = dic.ToCookies(domain);
+            cookies.Add(cookieCollection);
+        }       
+    }
+}

BarrageGrab/Program.cs

@@ -1,48 +1,49 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Sockets;
+using System.Net;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace BarrageGrab
 {
     public class Program
     {
-        private delegate bool ControlCtrlDelegate(int CtrlType);
-
-        static WsBarrageService server = null;
         static void Main(string[] args)
-        {
-            SetConsoleCtrlHandler(cancelHandler, true);//捕获控制台关闭            
-            Console.Title = "抖音弹幕监听推送";            
-            DisableQuickEditMode();
-            bool exited = false;
-            server = new WsBarrageService();
-            server.StartListen();            
-            server.OnClose += (s, e) =>
+        {            
+            if (CheckAlreadyRunning())
             {
-                //退出程序                
+                Console.WriteLine("已经有一个监听程序在运行，按任意键退出...");
+                Console.ReadKey();
+                return;
+            }
+
+            WinApi.SetConsoleCtrlHandler(cancelHandler, true);//捕获控制台关闭
+            WinApi.DisableQuickEditMode();//禁用控制台快速编辑模式            
+            Console.Title = "抖音弹幕监听推送";
+ 
+            bool exited = false;
+            AppRuntime.WssService.StartListen();
+            AppRuntime.WssService.OnClose += (s, e) =>
+            {
+                //退出程序
                 exited = true;
             };
 
             while (!exited)
-            {                
+            {
                 Thread.Sleep(500);
             }
-            Console.WriteLine("服务器已关闭...");
 
+            Console.WriteLine("服务器已关闭...");
+            
             //退出程序,不显示 按任意键退出
-            Environment.Exit(0);            
+            Environment.Exit(0);
         }
 
-
-        [DllImport("kernel32.dll")]
-        private static extern bool SetConsoleCtrlHandler(ControlCtrlDelegate HandlerRoutine, bool Add);
-        private static ControlCtrlDelegate cancelHandler = new ControlCtrlDelegate(HandlerRoutine);
-
-        public static bool HandlerRoutine(int CtrlType)
+        private static WinApi.ControlCtrlDelegate cancelHandler = new WinApi.ControlCtrlDelegate((CtrlType) =>
         {
             switch (CtrlType)
             {
@@ -52,39 +53,21 @@ namespace BarrageGrab
                     break;
                 case 2:
                     Console.WriteLine("2工具被强制关闭");//按控制台关闭按钮关闭
-                    server.Close();
+                    AppRuntime.WssService.Close();
                     break;
             }
             return false;
-        }
+        });
 
-
-        const int STD_INPUT_HANDLE = -10;
-        const uint ENABLE_QUICK_EDIT_MODE = 0x0040;
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern IntPtr GetStdHandle(int hConsoleHandle);
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern bool GetConsoleMode(IntPtr hConsoleHandle, out uint mode);
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern bool SetConsoleMode(IntPtr hConsoleHandle, uint mode);
-
-        public static void EnableQuickEditMode()
+        //检测程序是否多开
+        private static bool CheckAlreadyRunning()
         {
-            IntPtr hStdin = GetStdHandle(STD_INPUT_HANDLE);
-            uint mode;
-            GetConsoleMode(hStdin, out mode);
-            mode |= ENABLE_QUICK_EDIT_MODE;
-            SetConsoleMode(hStdin, mode);
+            const string mutexName = "DyBarrageGrab";           
+            // Try to create a new named mutex.
+            using (Mutex mutex = new Mutex(true, mutexName, out bool createdNew))
+            {
+                return !createdNew;
+            }
         }
-
-        public static void DisableQuickEditMode()
-        {
-            IntPtr hStdin = GetStdHandle(STD_INPUT_HANDLE);
-            uint mode;
-            GetConsoleMode(hStdin, out mode);
-            mode &= ~ENABLE_QUICK_EDIT_MODE;
-            SetConsoleMode(hStdin, mode);
-        }
-
     }
 }

BarrageGrab/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("LiveCompanionBarrageGrab")]
+[assembly: AssemblyTitle("抖音弹幕监听")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("LiveCompanionBarrageGrab")]
+[assembly: AssemblyCompany("小白不圆")]
+[assembly: AssemblyProduct("抖音弹幕监听器")]
 [assembly: AssemblyCopyright("Copyright ©  2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("a07bb1da-d5c2-4eea-9f3f-e42aadb9c1d6")]
+[assembly: Guid("a07bb1da-d5c2-4bea-9f3f-e42aadb9c1d5")]
 
 // 程序集的版本信息由下列四个值组成: 
 //
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.6.8.0")]
+[assembly: AssemblyFileVersion("2.6.8.0")]

BarrageGrab/WinApi.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarrageGrab
+{
+    public static class WinApi
+    {
+        const int STD_INPUT_HANDLE = -10;
+        const uint ENABLE_QUICK_EDIT_MODE = 0x0040;
+
+        /// <summary>
+        /// 控制台系统操作回调委托
+        /// </summary>
+        public delegate bool ControlCtrlDelegate(int CtrlType);
+
+        /// <summary>
+        /// 设置控制台系统操作回调
+        /// </summary>
+        [DllImport("kernel32.dll")]
+        public static extern bool SetConsoleCtrlHandler(ControlCtrlDelegate HandlerRoutine, bool Add);
+        [DllImport("kernel32.dll", SetLastError = true)]
+        internal static extern IntPtr GetStdHandle(int hConsoleHandle);
+        [DllImport("kernel32.dll", SetLastError = true)]
+        internal static extern bool GetConsoleMode(IntPtr hConsoleHandle, out uint mode);
+        [DllImport("kernel32.dll", SetLastError = true)]
+        internal static extern bool SetConsoleMode(IntPtr hConsoleHandle, uint mode);
+
+        /// <summary>
+        /// 启用控制台快速编辑
+        /// </summary>
+        public static void EnableQuickEditMode()
+        {
+            IntPtr hStdin = GetStdHandle(STD_INPUT_HANDLE);
+            uint mode;
+            GetConsoleMode(hStdin, out mode);
+            mode |= ENABLE_QUICK_EDIT_MODE;
+            SetConsoleMode(hStdin, mode);
+        }
+
+        /// <summary>
+        /// 禁用控制台快速编辑
+        /// </summary>
+        public static void DisableQuickEditMode()
+        {
+            IntPtr hStdin = GetStdHandle(STD_INPUT_HANDLE);
+            uint mode;
+            GetConsoleMode(hStdin, out mode);
+            mode &= ~ENABLE_QUICK_EDIT_MODE;
+            SetConsoleMode(hStdin, mode);
+        }
+    }
+}

BarrageGrab/WsBarrageService.cs

@@ -1,17 +1,22 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Net.WebSockets;
 using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
-using BarrageGrab.JsonEntity;
-using BarrageGrab.ProtoEntity;
 using ColorConsole;
 using Fleck;
 using Newtonsoft.Json;
+using BarrageGrab.Modles;
 using Newtonsoft.Json.Linq;
-using static BarrageGrab.ProtoEntity.Image;
+using System.Net.Http;
+using Org.BouncyCastle.Asn1.Crmf;
+using System.IO.Compression;
+using System.IO;
+using BarrageGrab.Modles.JsonEntity;
+using BarrageGrab.Modles.ProtoEntity;
 
 namespace BarrageGrab
 {
@@ -19,7 +24,7 @@ namespace BarrageGrab
     /// <summary>
     /// 弹幕服务
     /// </summary>
-    internal class WsBarrageService
+    public class WsBarrageService
     {
         WebSocketServer socketServer;
         Dictionary<string, UserState> socketList = new Dictionary<string, UserState>();
@@ -30,8 +35,8 @@ namespace BarrageGrab
         ConsoleWriter console = new ConsoleWriter();
         WssBarrageGrab grab = new WssBarrageGrab();
         Appsetting Appsetting = Appsetting.Current;
-        bool debug = false;
-        
+        bool debug = false;        
+
         /// <summary>
         /// 服务关闭后触发
         /// </summary>
@@ -42,7 +47,7 @@ namespace BarrageGrab
 #if DEBUG
             debug = true;
 #endif
-            var socket = new WebSocketServer($"ws://127.0.0.1:{Appsetting.WsProt}");
+            var socket = new WebSocketServer($"ws://0.0.0.0:{Appsetting.WsProt}");
             socket.RestartAfterListenError = true;//异常重启
 
             dieout.Elapsed += Dieout_Elapsed;
@@ -81,11 +86,12 @@ namespace BarrageGrab
 
         private bool CheckRoomId(long roomid)
         {
-            return Appsetting.RoomIds.Length == 0 || Appsetting.RoomIds.Contains(roomid);
+            if (Appsetting.RoomIds.Length == 0) return true;
+            return Appsetting.RoomIds.Any(a => a == roomid);
         }
-
+        
         //解析用户
-        private MsgUser GetUser(ProtoEntity.User data)
+        private MsgUser GetUser(User data)
         {
             MsgUser user = new MsgUser()
             {
@@ -94,12 +100,12 @@ namespace BarrageGrab
                 Gender = data.Gender,
                 Id = data.Id,
                 Level = data.Level,
-                PayLevel = (int)(data.payGrade?.Level??0),
+                PayLevel = (int)(data.payGrade?.Level ?? 0),
                 Nickname = data.Nickname,
                 HeadImgUrl = data.avatarThumb.urlLists.FirstOrDefault() ?? "",
                 SecUid = data.sec_uid,
                 FollowerCount = data.followInfo.followerCount,
-                FollowingCount = data.followInfo.followingCount,                
+                FollowingCount = data.followInfo.followingCount,
                 FollowStatus = data.followInfo.followStatus,
             };
             user.FansClub = new FansClubInfo()
@@ -118,7 +124,7 @@ namespace BarrageGrab
         }
 
         //粉丝团
-        private void Grab_OnFansclubMessage(object sender, ProtoEntity.FansclubMessage e)
+        private void Grab_OnFansclubMessage(object sender, FansclubMessage e)
         {
             if (!CheckRoomId(e.Common.roomId)) return;
             var enty = new FansclubMsg()
@@ -126,7 +132,7 @@ namespace BarrageGrab
                 MsgId = e.Common.msgId,
                 Content = e.Content,
                 RoomId = e.Common.roomId,
-                Type = e.Type,                
+                Type = e.Type,
                 User = GetUser(e.User)
             };
             enty.Level = enty.User.FansClub.Level;
@@ -137,7 +143,7 @@ namespace BarrageGrab
         }
 
         //统计消息
-        private void Grab_OnRoomUserSeqMessage(object sender, ProtoEntity.RoomUserSeqMessage e)
+        private void Grab_OnRoomUserSeqMessage(object sender, RoomUserSeqMessage e)
         {
             if (!CheckRoomId(e.Common.roomId)) return;
             var enty = new UserSeqMsg()
@@ -158,7 +164,7 @@ namespace BarrageGrab
         }
 
         //礼物
-        private void Grab_OnGiftMessage(object sender, ProtoEntity.GiftMessage e)
+        private void Grab_OnGiftMessage(object sender, GiftMessage e)
         {
             if (!CheckRoomId(e.Common.roomId)) return;
 
@@ -207,7 +213,7 @@ namespace BarrageGrab
             }
             //比上次小，则说明先后顺序出了问题，直接丢掉，应为比它大的消息已经处理过了
             if (backward) return;
-            
+
 
             var count = currCount - lastCount;
 
@@ -224,8 +230,8 @@ namespace BarrageGrab
                 GiftName = e.Gift.Name,
                 User = GetUser(e.User)
             };
-           
-            
+
+
             Print($"{enty.User.GenderToString()}  {enty.Content}", ConsoleColor.Red, BarrageMsgType.礼物消息);
             var pack = new BarrageMsgPack(JsonConvert.SerializeObject(enty), BarrageMsgType.礼物消息);
             var json = JsonConvert.SerializeObject(pack);
@@ -233,7 +239,7 @@ namespace BarrageGrab
         }
 
         //关注
-        private void Grab_OnSocialMessage(object sender, ProtoEntity.SocialMessage e)
+        private void Grab_OnSocialMessage(object sender, SocialMessage e)
         {
             if (!CheckRoomId(e.Common.roomId)) return;
             if (e.Action != 1) return;
@@ -252,7 +258,7 @@ namespace BarrageGrab
         }
 
         //直播间分享
-        private void Grab_OnShardMessage(object sender, ProtoEntity.SocialMessage e)
+        private void Grab_OnShardMessage(object sender, SocialMessage e)
         {
             if (!CheckRoomId(e.Common.roomId)) return;
             if (e.Action != 3) return;
@@ -278,11 +284,11 @@ namespace BarrageGrab
         }
 
         //来了
-        private void Grab_OnMemberMessage(object sender, ProtoEntity.MemberMessage e)
+        private void Grab_OnMemberMessage(object sender, Modles.ProtoEntity.MemberMessage e)
         {
             if (!CheckRoomId(e.Common.roomId)) return;
 
-            var enty = new JsonEntity.MemberMessage()
+            var enty = new Modles.JsonEntity.MemberMessage()
             {
                 MsgId = e.Common.msgId,
                 Content = $"{e.User.Nickname} 来了 直播间人数:{e.memberCount}",
@@ -297,7 +303,7 @@ namespace BarrageGrab
         }
 
         //点赞
-        private void Grab_OnLikeMessage(object sender, ProtoEntity.LikeMessage e)
+        private void Grab_OnLikeMessage(object sender, LikeMessage e)
         {
             if (!CheckRoomId(e.Common.roomId)) return;
 
@@ -317,7 +323,7 @@ namespace BarrageGrab
         }
 
         //弹幕
-        private void Grab_OnChatMessage(object sender, ProtoEntity.ChatMessage e)
+        private void Grab_OnChatMessage(object sender, ChatMessage e)
         {
             if (!CheckRoomId(e.Common.roomId)) return;
 
@@ -335,7 +341,7 @@ namespace BarrageGrab
             {
                 Console.WriteLine(e.User.followInfo.followStatus);
             }
-            
+
             var pack = new BarrageMsgPack(JsonConvert.SerializeObject(enty), BarrageMsgType.弹幕消息);
             var json = JsonConvert.SerializeObject(pack);
             this.Broadcast(json);
@@ -374,7 +380,7 @@ namespace BarrageGrab
             if (Appsetting.PrintBarrage)
             {
                 if (++count > 1000)
-                {                    
+                {
                     Console.Clear();
                     Console.WriteLine("控制台已清理");
                 }
@@ -417,7 +423,7 @@ namespace BarrageGrab
                         this.Close();
                     }
                 }
-                catch (Exception) {}
+                catch (Exception) { }
             };
 
             socket.OnClose = () =>
@@ -441,11 +447,11 @@ namespace BarrageGrab
         {
             foreach (var user in socketList)
             {
-                var socket = user.Value;                
+                var socket = user.Value;
                 socket.Socket.Send(msg);
             }
             //删除掉线的套接字
-            var offlines = socketList.Where(w=>!w.Value.Socket.IsAvailable).Select(s=>s.Key).ToList();
+            var offlines = socketList.Where(w => !w.Value.Socket.IsAvailable).Select(s => s.Key).ToList();
             offlines.ForEach(key => socketList.Remove(key));
         }
 
@@ -470,7 +476,7 @@ namespace BarrageGrab
             socketServer.Dispose();
             grab.Dispose();
 
-            this.OnClose?.Invoke(this, EventArgs.Empty);            
+            this.OnClose?.Invoke(this, EventArgs.Empty);
         }
 
         class UserState

BarrageGrab/WssBarrageGrab.cs

@@ -5,11 +5,11 @@ using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BarrageGrab.ProtoEntity;
 using ProtoBuf;
 using ColorConsole;
 using BarrageGrab.Proxy;
 using BarrageGrab.Proxy.ProxyEventArgs;
+using BarrageGrab.Modles.ProtoEntity;
 
 namespace BarrageGrab
 {
@@ -25,9 +25,6 @@ namespace BarrageGrab
         //解包成功的域名缓存
         List<string> succPackHostNames = new List<string>();
 
-        //已知的弹幕域名服务器
-        string[] wsHostNames = Appsetting.Current.HostNameFilter;
-
         /// <summary>
         /// 进入直播间
         /// </summary>
@@ -71,8 +68,8 @@ namespace BarrageGrab
         public WssBarrageGrab()
         {
             proxy.OnWebSocketData += Proxy_OnWebSocketData;
-            proxy.HostNameFilter = HostNameChecker;            
-        }
+            proxy.OnFetchResponse += Proxy_OnFetchResponse;
+        }        
 
         public void Start()
         {
@@ -81,19 +78,9 @@ namespace BarrageGrab
 
         public void Dispose()
         {
-            proxy.Dispose();            
+            proxy.Dispose();
         }
 
-        //域名过滤器
-        private bool HostNameChecker(string hostName)
-        {
-            if (!Appsetting.Current.FilterHostName) return true;
-            if (hostName.StartsWith("webcast")) return true;
-
-            if (wsHostNames.Any(a => a.ToLower() == hostName.ToLower())) return true;
-
-            return false;
-        }
 
         //gzip解压缩
         private byte[] Decompress(byte[] zippedData)
@@ -120,7 +107,8 @@ namespace BarrageGrab
             if (!appsetting.ProcessFilter.Contains(e.ProcessName)) return;
             var buff = e.Payload;
             if (buff.Length == 0) return;
-            if (buff[0] != 0x08) return;
+            //如果需要Gzip解压缩，但是开头字节不符合Gzip特征字节 则不处理
+            if (e.NeedDecompress && buff[0] != 0x08) return;
 
             try
             {
@@ -130,11 +118,10 @@ namespace BarrageGrab
                 //检测包格式
                 if (!enty.Headers.Any(a => a.Key == "compress_type" && a.Value == "gzip")) return;
 
+                byte[] allBuff;
                 //解压gzip
-                var odata = enty.Payload;
-                var decomp = Decompress(odata);
-
-                var response = Serializer.Deserialize<Response>(new ReadOnlyMemory<byte>(decomp));
+                allBuff = e.NeedDecompress ? Decompress(enty.Payload) : enty.Payload;
+                var response = Serializer.Deserialize<Response>(new ReadOnlyMemory<byte>(allBuff));
 
                 if (!succPackHostNames.Contains(e.HostName))
                 {
@@ -146,16 +133,33 @@ namespace BarrageGrab
             catch (Exception) { }
         }
 
+        //http 数据处理
+        private void Proxy_OnFetchResponse(object sender, HttpResponseEventArgs e)
+        {
+            var payload = e.HttpClient.Response.Body;
+            var response = Serializer.Deserialize<Response>(new ReadOnlyMemory<byte>(payload));
+
+            if (!succPackHostNames.Contains(e.HostName))
+            {
+                succPackHostNames.Add(e.HostName);
+                SaveHostNameCache();
+            }            
+            response.Messages.ForEach(f =>
+            {
+                DoMessage(f);
+            });
+        }        
+
         //用于缓存接收过的消息ID，判断是否重复接收
-        Dictionary<string,List<long>> msgDic = new Dictionary<string,List<long>>();        
+        Dictionary<string, List<long>> msgDic = new Dictionary<string, List<long>>();
 
         //发送事件
         private void DoMessage(Message msg)
-        {            
+        {
             List<long> msgIdList;
             if (msgDic.ContainsKey(msg.Method))
             {
-                msgIdList = msgDic[msg.Method];                
+                msgIdList = msgDic[msg.Method];
             }
             else
             {
@@ -169,7 +173,7 @@ namespace BarrageGrab
 
             msgIdList.Add(msg.msgId);
             if (msgIdList.Count > 300) msgIdList.RemoveAt(0);
-            
+
             try
             {
                 switch (msg.Method)
@@ -211,7 +215,7 @@ namespace BarrageGrab
                             {
                                 if (arg.giftId == 685)
                                 {
-                                    arg.Gift = new ProtoEntity.GiftStruct()
+                                    arg.Gift = new GiftStruct()
                                     {
                                         Id = arg.giftId,
                                         Name = "粉丝灯牌",
@@ -292,7 +296,7 @@ namespace BarrageGrab
                     File.Create(fullPath);
                 }
                 var text = File.ReadAllText(fullPath);
-                var currentHosts = text.Split('\n').Where(w => !string.IsNullOrWhiteSpace(w)).Select(s=>s.Trim().Trim('\r')).ToList();
+                var currentHosts = text.Split('\n').Where(w => !string.IsNullOrWhiteSpace(w)).Select(s => s.Trim().Trim('\r')).ToList();
                 var newHosts = succPackHostNames.Except(currentHosts).ToList();
                 //保存
                 if (newHosts.Count > 0)

BarrageGrab/WssBarrageService.csproj

@@ -13,6 +13,21 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,6 +55,7 @@
   <PropertyGroup>
     <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
@@ -47,6 +63,9 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.8.8.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>..\packages\Portable.BouncyCastle.1.8.8\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.0.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
     <Reference Include="BrotliSharpLib, Version=0.3.2.0, Culture=neutral, PublicKeyToken=3f4e2a1cd615fcb7, processorArchitecture=MSIL">
       <HintPath>..\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll</HintPath>
     </Reference>
@@ -56,12 +75,18 @@
     <Reference Include="Fleck, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Fleck.1.2.0\lib\net45\Fleck.dll</HintPath>
     </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.11.51.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.11.51\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.2.3\lib\net46\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <HintPath>..\packages\protobuf-net.3.1.22\lib\net462\protobuf-net.dll</HintPath>
     </Reference>
@@ -77,8 +102,9 @@
     </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -96,6 +122,7 @@
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -103,12 +130,20 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="Titanium.Web.Proxy, Version=1.0.1.0, Culture=neutral, PublicKeyToken=8e41e1f1c790d7cf, processorArchitecture=MSIL">
-      <HintPath>..\packages\Titanium.Web.Proxy.3.2.0\lib\net461\Titanium.Web.Proxy.dll</HintPath>
+      <HintPath>..\packages\Titanium.Web.Proxy.3.2.2-beta\lib\net461\Titanium.Web.Proxy.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AppRuntime.cs" />
     <Compile Include="Appsetting.cs" />
     <Compile Include="JsonEntity\Command.cs" />
+    <Compile Include="Logger.cs" />
+    <Compile Include="Modles\BusinessExecption.cs" />
+    <Compile Include="Modles\JsonEntity\BarrageMessages.cs" />
+    <Compile Include="Modles\JsonEntity\Command.cs" />
+    <Compile Include="Modles\ProtoEntity\Messages.cs" />
+    <Compile Include="Modles\ProtoEntity\Wss.cs" />
+    <Compile Include="ObjectExtension.cs" />
     <Compile Include="Proxy\EventArgs\HttpResponseEventArgs.cs" />
     <Compile Include="Proxy\EventArgs\WsMessageEventArgs.cs" />
     <Compile Include="Proxy\ISystemProxy.cs" />
@@ -116,22 +151,37 @@
     <Compile Include="Program.cs" />
     <Compile Include="Proxy\SystemProxy.cs" />
     <Compile Include="Proxy\TitaniumProxy.cs" />
+    <Compile Include="WinApi.cs" />
     <Compile Include="WssBarrageGrab.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ProtoEntity\Messages.cs" />
-    <Compile Include="ProtoEntity\Wss.cs" />
     <Compile Include="WsBarrageService.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="nlog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
-    <None Include="proto\message.proto">
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\inject\livePage.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="proto\wss.proto">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

BarrageGrab/packages.config

@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="BouncyCastle.Cryptography" version="2.0.0" targetFramework="net48" />
   <package id="BrotliSharpLib" version="0.3.3" targetFramework="net48" />
   <package id="ColorConsole" version="1.0.1" targetFramework="net48" />
   <package id="Fleck" version="1.2.0" targetFramework="net48" />
+  <package id="HtmlAgilityPack" version="1.11.51" targetFramework="net48" />
   <package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="NLog" version="5.2.3" targetFramework="net48" />
   <package id="Portable.BouncyCastle" version="1.8.8" targetFramework="net48" />
   <package id="protobuf-net" version="3.1.22" targetFramework="net48" />
   <package id="protobuf-net.Core" version="3.1.22" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Collections.Immutable" version="1.7.1" targetFramework="net48" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
   <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net48" />
   <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
-  <package id="Titanium.Web.Proxy" version="3.2.0" targetFramework="net48" />
+  <package id="Titanium.Web.Proxy" version="3.2.2-beta" targetFramework="net48" />
 </packages>