Dartanlla · May 4, 2024 · May 5, 2024 · May 5, 2024 · May 6, 2024 · May 6, 2024
diff --git a/README.md b/README.md
@@ -22,13 +22,14 @@ Open World Server (OWS) is a server instance manager designed to create large wo
 | Project                                                         | Purpose                                                            |
 |-----------------------------------------------------------------|--------------------------------------------------------------------|
 | [Benchmarks](src/OWSBenchmarks)                                 | This project will allow us to configure and run performance testing on the OWS API.  This will be important for comparing the impact of certain changes. |
-| [Character Persistence](src/OWSCharacterPersistence)            | The Character Persistence API will be responsible for storing our player characters and all related data.  This will be important for comparing the impact of certain changes. |
+| [Performance Tests](src/OWS.PerfTests)                                 | This project contains the [K6](https://grafana.com/docs/k6/latest/) load test files. |
 | [Data](src/OWSData)                                             | This is a shared project that houses our data repository access code. |
-| [External Login Providers](src/OWSExternalLoginProviders)       | This project contains code for integrating with external login providers such as Xsolla, Google, Facebook, etc. |
 | [Instance Launcher](src/OWSInstanceLauncher)                    | This project builds our Instance Launcher that replaces the RPG World Server in OWS 1. |
-| [Instance Management](src/OWSInstanceManagement)                | This API manages Zone Instances and the OWS Instance Launchers. |
-| [Public API](src/OWSPublicAPI)                                  | This API handles all API calls that come directly from player clients such as registration, login, and connecting to the game. |
+| [Public API](src/OWSPublicAPI)                                  | This API handles all incoming requests to the service and sends grains to the Silo project to execute |
 | [Shared](src/OWSShared)                                         | This project houses various miscellaneous code that multiple other projects require. |
+| [Silo](src/OWS.API.Silo)                                         | This project provides the compute runtime for our [Orleans silos](https://learn.microsoft.com/en-us/dotnet/orleans/overview), this is where grains are executed. |
+| [Interfaces](src/OWS.Interfaces)                                           | This project is where the contracts are defined for communication from the Public API to the Orleans Silos |
+| [Grains](src/OWS.Grains)                                           | This project is where the implementation for each [Grain](https://learn.microsoft.com/en-us/dotnet/orleans/overview#what-are-grains) is defined.|
 | [Tests](src/OWSTests)                                           | This project provides Unit testing and Functional testing and Benchmark Tools (Development) |
 
 # Contributing

diff --git a/src/.env b/src/.env
@@ -35,7 +35,7 @@ DATABASE_PASSWORD='yourStrong(!)Password'
 # Database Connection String
 
 # MSSQL
-DATABASE_CONNECTION_STRING="Server=host.docker.internal;Database=OpenWorldServer;User Id=SA;Password=${DATABASE_PASSWORD};ConnectRetryCount=0"
+DATABASE_CONNECTION_STRING="Server=host.docker.internal;Database=OpenWorldServer;User Id=SA;Password=${DATABASE_PASSWORD};ConnectRetryCount=0;TrustServerCertificate=True"
 # Postgres
 # DATABASE_CONNECTION_STRING="Host=host.docker.internal;Port=5432;Database=openworldserver;Username=postgres;Password=${DATABASE_PASSWORD};"
 # Mysql

diff --git a/src/OWS.API.Silo/.dockerignore b/src/OWS.API.Silo/.dockerignore
@@ -0,0 +1,2 @@
+bin/
+obj/
diff --git a/src/OWSInstanceManagement/Dockerfile → src/OWS.API.Silo/Dockerfile b/src/OWSInstanceManagement/Dockerfile → src/OWS.API.Silo/Dockerfile
@@ -7,18 +7,19 @@ EXPOSE 443
 
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
-COPY ["OWSInstanceManagement/OWSInstanceManagement.csproj", "OWSInstanceManagement/"]
+COPY ["OWS.API.Silo/OWS.API.Silo.csproj", "OWS.API.Silo/"]
+COPY ["OWSExternalLoginProviders/OWSExternalLoginProviders.csproj", "OWSExternalLoginProviders/"]
 COPY ["OWSShared/OWSShared.csproj", "OWSShared/"]
 COPY ["OWSData/OWSData.csproj", "OWSData/"]
-RUN dotnet restore "OWSInstanceManagement/OWSInstanceManagement.csproj"
+RUN dotnet restore "OWS.API.Silo/OWS.API.Silo.csproj"
 COPY . .
-WORKDIR "/src/OWSInstanceManagement"
-RUN dotnet build "OWSInstanceManagement.csproj" -c Release -o /app/build
+WORKDIR "/src/OWS.API.Silo"
+RUN dotnet build "OWS.API.Silo.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "OWSInstanceManagement.csproj" -c Release -o /app/publish
+RUN dotnet publish "OWS.API.Silo.csproj" -c Release -o /app/publish
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "OWSInstanceManagement.dll"]
+ENTRYPOINT ["dotnet", "OWS.API.Silo.dll"]
diff --git a/src/OWS.API.Silo/OWS.API.Silo.csproj b/src/OWS.API.Silo/OWS.API.Silo.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="appsettings.Development.json" />
+    <None Remove="appsettings.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings.Development.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Clustering.AdoNet" Version="8.1.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansTelemetryConsumers.Counters" Version="3.7.1" />
+    <PackageReference Include="Microsoft.Orleans.Persistence.AdoNet" Version="8.1.0" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="8.1.0" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="8.1.0" />
+    <PackageReference Include="OrleansDashboard" Version="8.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OWS.Grains\OWS.Grains.csproj" />
+    <ProjectReference Include="..\OWS.Interfaces\OWS.Interfaces.csproj" />
+  </ItemGroup>
+  <PropertyGroup>
+    <OrleansGenerateFieldIds>true</OrleansGenerateFieldIds>
+  </PropertyGroup>
+</Project>
diff --git a/src/OWS.API.Silo/Program.cs b/src/OWS.API.Silo/Program.cs
@@ -0,0 +1,78 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using OWSData.Repositories.Interfaces;
+using OWSShared.Options;
+using OWSShared.Implementations;
+using OWSShared.Interfaces;
+
+var configuration = new ConfigurationBuilder()
+    .AddJsonFile("appsettings.json")
+    .AddEnvironmentVariables()
+    .Build();
+
+HostApplicationBuilder builder = Host.CreateApplicationBuilder(args);
+
+builder.Configuration.Sources.Clear();
+builder.Configuration.AddConfiguration(configuration);
+
+OWSStorageConfig storageOptions = new();
+builder.Configuration.GetSection(nameof(OWSStorageConfig)).Bind(storageOptions);
+
+builder.Services.Configure<OWSStorageConfig>(
+    builder.Configuration.GetSection(
+        key: nameof(OWSStorageConfig)));
+
+builder.Services.Configure<OWSShared.Options.RabbitMQOptions>(builder.Configuration.GetSection(RabbitMQOptions.SectionName));
+
+builder.UseOrleans(silo =>
+{
+    //Long term we shouldnt use our main SQL DB for clustering, for development we could use UseLocalhostClustering()
+    //but to be able to demonstrate scaling in docker locally we are using SQL.
+    silo.UseAdoNetClustering(options =>
+    {
+        options.Invariant = "Microsoft.Data.SqlClient";
+        options.ConnectionString = storageOptions.OWSDBConnectionString;
+    });
+
+    //This is currently unused but just to show how you could configure persistence backed by SQL
+    silo.AddAdoNetGrainStorage("OrleansStorage", options =>
+    {
+        options.Invariant = "Microsoft.Data.SqlClient";
+        options.ConnectionString = storageOptions.OWSDBConnectionString;
+    });
+    silo.UseInMemoryReminderService();
+    silo.UseDashboard();
+});
+
+switch (storageOptions.OWSDBBackend)
+{
+    case "postgres":
+        builder.Services.AddScoped<IInstanceManagementRepository, OWSData.Repositories.Implementations.Postgres.InstanceManagementRepository>();
+        builder.Services.AddTransient<ICharactersRepository, OWSData.Repositories.Implementations.Postgres.CharactersRepository>();
+        builder.Services.AddTransient<IUsersRepository, OWSData.Repositories.Implementations.Postgres.UsersRepository>();
+        break;
+    case "mysql":
+        builder.Services.AddScoped<IInstanceManagementRepository, OWSData.Repositories.Implementations.MySQL.InstanceManagementRepository>();
+        builder.Services.AddTransient<ICharactersRepository, OWSData.Repositories.Implementations.MySQL.CharactersRepository>();
+        builder.Services.AddTransient<IUsersRepository, OWSData.Repositories.Implementations.MySQL.UsersRepository>();
+        break;
+    default: // Default to MSSQL
+        builder.Services.AddScoped<IInstanceManagementRepository, OWSData.Repositories.Implementations.MSSQL.InstanceManagementRepository>();
+        builder.Services.AddTransient<ICharactersRepository, OWSData.Repositories.Implementations.MSSQL.CharactersRepository>();
+        builder.Services.AddTransient<IUsersRepository, OWSData.Repositories.Implementations.MSSQL.UsersRepository>();
+        break;
+}
+
+
+builder.Services.AddLogging();
+builder.Logging.AddConsole();
+
+builder.Services.AddSingleton<IZoneServerProcessesRepository, OWSData.Repositories.Implementations.InMemory.ZoneServerProcessesRepository>();
+builder.Services.AddSingleton<IOWSInstanceLauncherDataRepository, OWSData.Repositories.Implementations.InMemory.OWSInstanceLauncherDataRepository>();
+builder.Services.AddSingleton<ICustomCharacterDataSelector, DefaultCustomCharacterDataSelector>();
+builder.Services.AddSingleton<IGetReadOnlyPublicCharacterData, DefaultGetReadOnlyPublicCharacterData>();
+
+using IHost host = builder.Build();
+await host.RunAsync();
diff --git a/src/OWS.API.Silo/appsettings.Development.json b/src/OWS.API.Silo/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/src/OWS.API.Silo/appsettings.json b/src/OWS.API.Silo/appsettings.json
@@ -0,0 +1,12 @@
+{
+  "OWSStorageConfig": {
+    "OWSDBBackend": "mssql",
+    "OWSDBConnectionString": "Server=host.docker.internal;Database=OpenWorldServer;User Id=SA;Password=yourStrong(!)Password;ConnectRetryCount=0;TrustServerCertificate=True"
+  },
+  "RabbitMQOptions": {
+    "RabbitMQHostName": "host.docker.internal",
+    "RabbitMQPort": 5672,
+    "RabbitMQUserName": "dev",
+    "RabbitMQPassword": "test"
+  }
+}
diff --git a/src/OWS.Grains/BaseGrain.cs b/src/OWS.Grains/BaseGrain.cs
@@ -0,0 +1,17 @@
+using Orleans.Runtime;
+
+namespace OWS.Grains
+{
+    public class BaseGrain : Grain
+    {
+        internal static Guid GetCustomerId()
+        {
+            if (!Guid.TryParse(RequestContext.Get("CustomerId").ToString(), out var customerGuid))
+            {
+                throw new ArgumentException("Invalid Customer ID");
+            }
+
+            return customerGuid;
+        }
+    }
+}