Begin moving things out of allmsgs.proto

nksrv/LobbyServer/LobbyHandler.cs

@@ -1,6 +1,7 @@
 using ASodium;
 using EmbedIO;
 using Google.Protobuf;
+using nksrv.Net;
 using nksrv.Utils;
 using Swan.Logging;
 

nksrv/LobbyServer/Msgs/Antibot/BattleReportData.cs

@@ -1,4 +1,5 @@
-using nksrv.Utils;
+using nksrv.Net;
+using nksrv.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;

nksrv/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs

@@ -1,9 +1,5 @@
-using nksrv.Utils;
+using nksrv.Net;
-using System;
+using nksrv.Utils;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace nksrv.LobbyServer.Msgs.Antibot
 {

nksrv/LobbyServer/Msgs/Archive/CheckBookmarkScenarioExists.cs

@@ -1,9 +1,4 @@
 using nksrv.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace nksrv.LobbyServer.Msgs.Archive
 {

nksrv/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs

@@ -1,4 +1,5 @@
 using Google.Protobuf;
+using nksrv.Net;
 using nksrv.Utils;
 using System;
 using System.Collections.Generic;

nksrv/LobbyServer/Msgs/Misc/GetResourceHosts2.cs

@@ -1,4 +1,5 @@
-using nksrv.Utils;
+using nksrv.Net;
+using nksrv.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;

nksrv/LobbyServer/Msgs/Misc/GetSentryParams.cs

@@ -1,4 +1,5 @@
-using nksrv.Utils;
+using nksrv.Net;
+using nksrv.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,8 +14,9 @@ namespace nksrv.LobbyServer.Msgs.Misc
         protected override async Task HandleAsync()
         {
             var r = new SentryDataResponse();
-            // TODO check proper response from real server
+            // TODO: figure out a way to disable sentry so that Shift Up devs wouldn't be annoyed by this server
-          await  WriteDataAsync(r);
+
+            await WriteDataAsync(r);
         }
     }
 }

nksrv/LobbyServer/Msgs/Misc/GetServerInfo.cs

@@ -1,10 +1,5 @@
-using Google.Protobuf.WellKnownTypes;
+using nksrv.Utils;
-using nksrv.Utils;
+using nksrv.Net;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace nksrv.LobbyServer.Msgs.Misc
 {
@@ -13,7 +8,7 @@ namespace nksrv.LobbyServer.Msgs.Misc
     {
         protected override async Task HandleAsync()
         {
-            var r = new ResGetServerInfo();
+            var r = new GetServerInfoResponse();
 
             // todo: reimplement this as well
             r.MatchUrl = "https://global-match.nikke-kr.com";

nksrv/LobbyServer/Msgs/Misc/GetStaticDataPack.cs

@@ -1,4 +1,5 @@
 using Google.Protobuf;
+using nksrv.Net;
 using nksrv.StaticInfo;
 using nksrv.Utils;
 
@@ -14,7 +15,7 @@ namespace nksrv.LobbyServer.Msgs.Misc
             var r = new StaticDataPackResponse();
             r.Url = GameConfig.Root.StaticData.Url;
             r.Version = GameConfig.Root.StaticData.Version;
-            r.Size = StaticDataParser.Instance.Size;
+            r.FileSize = StaticDataParser.Instance.Size;
             r.Sha256Sum = ByteString.CopyFrom(StaticDataParser.Instance.Sha256Hash);
             r.Salt1 = ByteString.CopyFrom(Convert.FromBase64String(GameConfig.Root.StaticData.Salt1));
             r.Salt2 = ByteString.CopyFrom(Convert.FromBase64String(GameConfig.Root.StaticData.Salt2));

nksrv/LobbyServer/Msgs/Stage/ClearStage.cs

@@ -1,4 +1,5 @@
-using nksrv.StaticInfo;
+using nksrv.Net;
+using nksrv.StaticInfo;
 using nksrv.Utils;
 using Swan.Logging;
 using System;

nksrv/LobbyServer/Msgs/Stage/GetStage.cs

@@ -1,12 +1,5 @@
-using nksrv.Utils;
+using nksrv.Net;
-using Swan.Logging;
+using nksrv.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static Google.Rpc.Context.AttributeContext.Types;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace nksrv.LobbyServer.Msgs.Stage
 {

nksrv/LobbyServer/Msgs/System/CheckClientVersion.cs

@@ -1,4 +1,5 @@
-using nksrv.Utils;
+using nksrv.Net;
+using nksrv.Utils;
 
 namespace nksrv.LobbyServer.Msgs.System
 {
@@ -9,9 +10,9 @@ namespace nksrv.LobbyServer.Msgs.System
         {
             var req = await ReadData<CheckVersionRequest>();
             var response = new CheckVersionResponse();
-            response.Availability = 0;    // None = 0, Available = 1, Mandatory = 2
+            response.VersionStatus = 0;
 
-          await  WriteDataAsync(response);
+            await WriteDataAsync(response);
         }
     }
 }

nksrv/Protos/allmsgs.proto

@@ -5,61 +5,6 @@ option csharp_namespace = "nksrv";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/Duration.proto";
 
-// Network structure definitions. Note that I have not included field names for anticheat strucures.
-
-
-message SentryDataResponse {
-  double samplingRate = 1;
-  double traceSamplingRate = 2;
-}
-
-message CheckVersionRequest {
-  string version = 1;
-}
-
-message CheckVersionResponse {
-  int32 availability = 1;
-}
-
-message ResGetServerInfo {
-	int32 worldId = 1;
-	string matchUrl = 2;
-}
-
-
-message NetMaintenanceWindow {
-	google.protobuf.Timestamp from = 1;
-	google.protobuf.Timestamp to = 2;
-}
-
-message MaintenanceNoticeResponse {
-	NetMaintenanceWindow window = 1;
-	bool isWhitelisted = 2;
-}
-
-message ResourceHostRequest {
-  string rversion = 1;
-}
-
-message ResourceHostResponse {
-  string version = 1;
-  string baseUrl = 2;
-  map<string, string> coreVersionMap = 3;
-  map<string, string> dataPackVersionMap = 4;
-}
-
-message StaticDataPackRequest {
-}
-
-message StaticDataPackResponse {
-	string url = 1;
-	int64 size = 2;
-	bytes sha256Sum = 3;
-	bytes salt1 = 4;
-	bytes salt2 = 5;
-	string version = 6;
-}
-
 enum BillingPlatform{
 	Unknown = 0;
 	Ios = 1;

nksrv/Protos/system.proto

@@ -0,0 +1,60 @@
+syntax = "proto3";
+
+option csharp_namespace = "nksrv.Net";
+
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/Duration.proto";
+
+message SentryDataResponse {
+  double Unknown1 = 1;
+  double Unknown2 = 2;
+}
+
+message CheckVersionRequest {
+  string Version = 1;
+}
+
+message CheckVersionResponse {
+  int32 VersionStatus = 1; // 0: good, 1: outdated, 2: unsupported
+}
+
+message GetServerInfoRequest {
+
+}
+message GetServerInfoResponse {
+	int32 worldId = 1;
+	string matchUrl = 2;
+}
+
+message NetMaintenanceWindow {
+	google.protobuf.Timestamp from = 1;
+	google.protobuf.Timestamp to = 2;
+}
+
+message MaintenanceNoticeResponse {
+	NetMaintenanceWindow window = 1;
+	bool isWhitelisted = 2;
+}
+
+message ResourceHostRequest {
+  string rversion = 1;
+}
+
+message ResourceHostResponse {
+  string version = 1;
+  string baseUrl = 2;
+  map<string, string> coreVersionMap = 3;
+  map<string, string> dataPackVersionMap = 4;
+}
+
+message StaticDataPackRequest {
+}
+
+message StaticDataPackResponse {
+	string Url = 1;
+	int64 FileSize = 2;
+	bytes Sha256Sum = 3;
+	bytes Salt1 = 4;
+	bytes Salt2 = 5;
+	string Version = 6;
+}

nksrv/Utils/JsonDb.cs

@@ -1,15 +1,8 @@
-using ASodium;
+using Newtonsoft.Json;
-using Newtonsoft.Json;
 using nksrv.LobbyServer;
-using nksrv.LobbyServer.Msgs.Stage;
+using nksrv.Net;
 using nksrv.StaticInfo;
 using Swan.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static Google.Rpc.Context.AttributeContext.Types;
 
 namespace nksrv.Utils
 {

nksrv/Utils/NetUtils.cs

@@ -1,8 +1,6 @@
-
+using nksrv.Net;
-
 using nksrv.StaticInfo;
 using Swan.Logging;
-using System.Reflection;
 
 namespace nksrv.Utils
 {