fix: 支持rawtext为空的情况支持

Author: Yukari316

Sora/Entities/MessageContext.cs

@@ -26,7 +26,7 @@ public sealed class MessageContext : BaseModel
     /// <para>Gocq提供的纯文本信息</para>
     /// <para>可能会缺失某些不重要且会在相同消息中不相等的字段</para>
     /// </summary>
-    public string RawText { get; }
+    public string RawText { get; internal set; }
 
     /// <summary>
     /// 消息段列表
@@ -282,7 +282,7 @@ public override bool Equals(object obj)
     /// </summary>
     public override int GetHashCode()
     {
-        return HashCode.Combine(MessageId, RawText, MessageBody, Time, Font, MessageSequence);
+        return HashCode.Combine(MessageId, MessageBody, Time, Font, MessageSequence);
     }
 
 #endregion

Sora/EventArgs/SoraEvent/BaseMessageEventArgs.cs

@@ -9,6 +9,7 @@
 using Sora.Enumeration.ApiType;
 using Sora.Net.Records;
 using Sora.OnebotModel.OnebotEvent.MessageEvent;
+using Sora.Serializer;
 
 namespace Sora.EventArgs.SoraEvent;
 
@@ -71,7 +72,13 @@ internal BaseMessageEventArgs(Guid                   serviceId,
                                      msg.Time,
                                      msg.Font,
                                      null);
-        Sender        = new User(serviceId, connectionId, msg.UserId);
+        
+        //空raw信息兼容
+        if (string.IsNullOrEmpty(msg.RawMessage))
+        {
+            Message.RawText = Message.MessageBody.SerializeToCq();
+        }
+        Sender = new User(serviceId, connectionId, msg.UserId);
         IsSelfMessage = msg.UserId == msg.SelfId;
         IsSuperUser   = msg.UserId is not (0 or -1) && ServiceRecord.IsSuperUser(serviceId, msg.UserId);
     }

Sora/Net/SoraWebsocketClient.cs

@@ -144,7 +144,7 @@ public async ValueTask StartService()
         {
             if (_disposed)
                 return;
-            Event.Adapter(JObject.Parse(msg.Text), ServiceId);
+            Event.Adapter(JObject.Parse(msg.Text ?? "{}"), ServiceId);
         }));
         //连接断开事件
         _subClientDisconnectionHappened = Client.DisconnectionHappened.Subscribe(info => Task.Run(() =>

Sora/Net/SoraWebsocketServer.cs

@@ -82,13 +82,6 @@ internal SoraWebsocketServer(ServerConfig config, Action<Exception> crashAction
         _isReady = false;
         Log.Info("Sora", $"Sora WebSocket服务器初始化... [{ServiceId}]");
         Config = config ?? throw new ArgumentNullException(nameof(config));
-        //检查端口占用
-        if (Helper.IsPortInUse(Config.Port))
-        {
-            InvalidOperationException e = new($"端口{Config.Port}已被占用，请更换其他端口");
-            Log.Fatal(e, "Sora", $"端口{Config.Port}已被占用，请更换其他端口", Config);
-            throw e;
-        }
 
         //写入初始化信息
         if (!ServiceRecord.AddOrUpdateRecord(ServiceId, new ServiceConfig(Config), this))

Sora/OnebotModel/OnebotEvent/MessageEvent/BaseObMessageEventArgs.cs

@@ -42,7 +42,7 @@ internal abstract class BaseObMessageEventArgs : BaseObApiEventArgs
     /// <summary>
     /// 原始消息内容
     /// </summary>
-    [JsonProperty(PropertyName = "raw_message")]
+    [JsonProperty(PropertyName = "raw_message", NullValueHandling = NullValueHandling.Ignore)]
     internal string RawMessage { get; set; }
 
     /// <summary>

Sora/Properties/PublishProfiles/Package.pubxml

@@ -9,7 +9,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\Publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
     <DocumentationFile>.\Sora.xml</DocumentationFile>
+    <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 </Project>

Sora/Util/Helper.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Net.NetworkInformation;
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
@@ -37,20 +36,6 @@ internal static void FriendlyException(UnhandledExceptionEventArgs args)
 
 #endregion
 
-#region 网络
-
-    /// <summary>
-    /// 检查端口占用
-    /// </summary>
-    /// <param name="port">端口号</param>
-    internal static bool IsPortInUse(uint port)
-    {
-        return IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners()
-                                 .Any(ipEndPoint => ipEndPoint.Port == port);
-    }
-
-#endregion
-
 #region 指令优先级转换
 
     internal static List<(int p, List<T> cmds)> ToPriorityList<T>(this List<T> cmdList) where T : BaseCommandInfo

Sora_Test/Properties/PublishProfiles/FolderProfile.pubxml

@@ -6,12 +6,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\net5.0\publish\</PublishDir>
+    <PublishDir>bin\LinuxTest</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>false</PublishReadyToRun>
+    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 </Project>