Configure Items

avkviring · Jan 23, 2024 · c41af36 · c41af36
1 parent 70b7bff
commit c41af36
Show file tree

Hide file tree

Showing 72 changed files with 5,739 additions and 490 deletions.
diff --git a/client/Net/Embedded/Src/Src.csproj b/client/Net/Embedded/Src/Src.csproj
@@ -40,8 +40,7 @@
           <Pack>true</Pack>
           <PackagePath>runtimes/osx-x64/native/libcheetah_embedded.dylib</PackagePath>
         </Content>
-        <Protobuf Include="..\..\..\..\proto\shared.proto" GrpcServices="both" CompileOutputs="true" />
-        <Protobuf Include="..\..\..\..\proto\internal.proto" GrpcServices="both" CompileOutputs="true" />
+        <Protobuf Include="..\..\..\..\proto\service.proto" GrpcServices="both" CompileOutputs="true" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />

diff --git a/client/Unity/Packages/games.cheetah.client/Editor/games.cheetah.client.editor.asmdef b/client/Unity/Packages/games.cheetah.client/Editor/games.cheetah.client.editor.asmdef
@@ -3,9 +3,7 @@
   "rootNamespace": "Games.Cheetah.Client",
   "references": [
     "games.cheetah.grpc",
-    "games.cheetah.client",
-    "games.cheetah.grpc.admin",
-    "games.cheetah.grpc.shared"
+    "games.cheetah.client"
   ],
   "includePlatforms": [
     "Editor"

diff --git a/client/Unity/Packages/games.cheetah.client/Tests.meta b/client/Unity/Packages/games.cheetah.client/Tests.meta
diff --git a/client/Unity/Packages/games.cheetah.client/Tests/Server/Helpers/AbstractTest.cs b/client/Unity/Packages/games.cheetah.client/Tests/Server/Helpers/AbstractTest.cs
@@ -5,9 +5,8 @@
 using Games.Cheetah.Client.Codec;
 using Games.Cheetah.Client.Types.Field;
 using Games.Cheetah.EmbeddedServer.API;
-using Games.Cheetah.GRPC.Internal;
+using Games.Cheetah.Realtime.GRPC;
 using NUnit.Framework;
-using FieldType = Games.Cheetah.GRPC.Shared.FieldType;
 
 namespace Games.Cheetah.Client.Tests.Server.Helpers
 {

diff --git a/client/Unity/Packages/games.cheetah.client/Tests/games.cheetah.client.tests.asmdef b/client/Unity/Packages/games.cheetah.client/Tests/games.cheetah.client.tests.asmdef
@@ -7,9 +7,7 @@
     "Unity.Collections",
     "games.cheetah.client",
     "games.cheetah.client.editor",
-    "games.cheetah.grpc.admin",
-    "games.cheetah.grpc.shared",
-    "games.cheetah.grpc.internal",
+    "games.cheetah.realtime.grpc",
     "games.cheetah.embedded-server",
     "games.cheetah.grpc"
   ],

diff --git a/client/Unity/Packages/games.cheetah.client/package.json b/client/Unity/Packages/games.cheetah.client/package.json
@@ -8,7 +8,6 @@
   "repository": "github:cheetah-game-platform/platform",
   "dependencies": {
     "games.cheetah.grpc": "999.999.999",
-    "games.cheetah.grpc.shared": "999.999.999",
     "com.unity.collections": "1.2.4"
   },
   "hideInEditor": false,

diff --git a/client/Unity/Packages/games.cheetah.embedded-server/Runtime/API/EmbeddedServer.cs b/client/Unity/Packages/games.cheetah.embedded-server/Runtime/API/EmbeddedServer.cs
@@ -2,9 +2,9 @@
 using System.Net;
 using System.Net.Http;
 using Games.Cheetah.EmbeddedServer.FFI;
+using Games.Cheetah.Realtime.GRPC;
 using Grpc.Net.Client;
 using Grpc.Net.Client.Web;
-using static Games.Cheetah.GRPC.Internal.Internal;
 using Logger = Games.Cheetah.EmbeddedServer.FFI.Logger;
 
 #if UNITY_5_3_OR_NEWER
@@ -79,15 +79,15 @@ private static unsafe Server.BindSocket NewBindSocket(IPAddress bindAddress, ush
         }
 
 
-        public InternalClient CreateGrpcClient()
+        public RealtimeServerManagementService.RealtimeServerManagementServiceClient CreateGrpcClient()
         {
             var channel = GrpcChannel.ForAddress(
                 GetInternalWebGrpcUri(), new GrpcChannelOptions
                 {
                     HttpHandler = new GrpcWebHandler(new HttpClientHandler()),
                 }
             );
-            return new InternalClient(channel);
+            return new RealtimeServerManagementService.RealtimeServerManagementServiceClient(channel);
         }
 
         public void Destroy()
@@ -102,7 +102,8 @@ public string GetUdpGameHost()
         {
             unsafe
             {
-                return $"{description.gameIp[0]}.{description.gameIp[1]}.{description.gameIp[2]}.{description.gameIp[3]}";
+                return
+                    $"{description.gameIp[0]}.{description.gameIp[1]}.{description.gameIp[2]}.{description.gameIp[3]}";
             }
         }
 

diff --git a/...Unity/Packages/games.cheetah.embedded-server/Runtime/games.cheetah.embedded-server.asmdef b/...Unity/Packages/games.cheetah.embedded-server/Runtime/games.cheetah.embedded-server.asmdef
@@ -4,7 +4,7 @@
   "references": [
     "games.cheetah.grpc",
     "games.cheetah.client",
-    "games.cheetah.grpc.internal"
+    "games.cheetah.realtime.grpc"
   ],
   "allowUnsafeCode": true,
   "overrideReferences": false,

diff --git a/client/Unity/Packages/games.cheetah.embedded-server/Tests/Tests.cs b/client/Unity/Packages/games.cheetah.embedded-server/Tests/Tests.cs
@@ -6,7 +6,7 @@
 using Games.Cheetah.Client.Codec;
 using Games.Cheetah.Client.Types.Network;
 using Games.Cheetah.EmbeddedServer.API;
-using Games.Cheetah.GRPC.Internal;
+using Games.Cheetah.Realtime.GRPC;
 using NUnit.Framework;
 
 namespace Games.Cheetah.EmbeddedServer.Tests

diff --git a/...cheetah.embedded-server/Tests/games.cheetah.matches.realtime.embedded-server.tests.asmdef b/...cheetah.embedded-server/Tests/games.cheetah.matches.realtime.embedded-server.tests.asmdef
@@ -7,7 +7,7 @@
     "games.cheetah.grpc",
     "games.cheetah.client",
     "games.cheetah.embedded-server",
-    "games.cheetah.grpc.internal"
+    "games.cheetah.realtime.grpc"
   ],
   "includePlatforms": [
     "Editor"

diff --git a/client/Unity/Packages/games.cheetah.embedded-server/package.json b/client/Unity/Packages/games.cheetah.embedded-server/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "games.cheetah.grpc": "999.999.999",
     "games.cheetah.client": "999.999.999",
-    "games.cheetah.grpc.internal": "999.999.999"
+    "games.cheetah.realtime.grpc": "999.999.999"
   },
   "hideInEditor": false,
   "type": "library",

diff --git a/client/Unity/Packages/games.cheetah.grpc.internal/Runtime/games.cheetah.grpc.internal.asmdef b/client/Unity/Packages/games.cheetah.grpc.internal/Runtime/games.cheetah.grpc.internal.asmdef
diff --git a/...nity/Packages/games.cheetah.grpc.internal/Runtime/games.cheetah.grpc.internal.asmdef.meta b/...nity/Packages/games.cheetah.grpc.internal/Runtime/games.cheetah.grpc.internal.asmdef.meta
diff --git a/client/Unity/Packages/games.cheetah.grpc.internal/package.json b/client/Unity/Packages/games.cheetah.grpc.internal/package.json
diff --git a/client/Unity/Packages/games.cheetah.grpc.shared/.npmignore b/client/Unity/Packages/games.cheetah.grpc.shared/.npmignore
diff --git a/client/Unity/Packages/games.cheetah.grpc.shared/Runtime.meta b/client/Unity/Packages/games.cheetah.grpc.shared/Runtime.meta
diff --git a/client/Unity/Packages/games.cheetah.grpc.shared/Runtime/.empty b/client/Unity/Packages/games.cheetah.grpc.shared/Runtime/.empty
diff --git a/...nt/Unity/Packages/games.cheetah.grpc.shared/Runtime/games.cheetah.grpc.shared.asmdef.meta b/...nt/Unity/Packages/games.cheetah.grpc.shared/Runtime/games.cheetah.grpc.shared.asmdef.meta
diff --git a/...es/games.cheetah.grpc.internal/.gitignore → ...es/games.cheetah.realtime.grpc/.gitignore b/...es/games.cheetah.grpc.internal/.gitignore → ...es/games.cheetah.realtime.grpc/.gitignore
diff --git a/...es/games.cheetah.grpc.internal/.npmignore → ...es/games.cheetah.realtime.grpc/.npmignore b/...es/games.cheetah.grpc.internal/.npmignore → ...es/games.cheetah.realtime.grpc/.npmignore
diff --git a/.../games.cheetah.grpc.internal/Runtime.meta → .../games.cheetah.realtime.grpc/Runtime.meta b/.../games.cheetah.grpc.internal/Runtime.meta → .../games.cheetah.realtime.grpc/Runtime.meta
diff --git a/...ames.cheetah.grpc.internal/Runtime/.empty → ...ames.cheetah.realtime.grpc/Runtime/.empty b/...ames.cheetah.grpc.internal/Runtime/.empty → ...ames.cheetah.realtime.grpc/Runtime/.empty