Use serilog for logging (support log to file)

Clean up

TaikoLocalServer/Controllers/Api/CardsController.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Controllers.Api;
-
-namespace TaikoLocalServer.Controllers.Api;
 
 [ApiController]
 [Route("api/[controller]")]

TaikoLocalServer/Controllers/Api/DanBestDataController.cs

@@ -1,7 +1,6 @@
 using SharedProject.Models;
 using SharedProject.Models.Responses;
 using Swan.Mapping;
-using TaikoLocalServer.Services.Interfaces;
 
 namespace TaikoLocalServer.Controllers.Api;
 

TaikoLocalServer/Controllers/Api/DashboardController.cs

@@ -1,7 +1,4 @@
-using SharedProject.Models;
+using SharedProject.Models.Responses;
-using SharedProject.Models.Responses;
-using Swan.Mapping;
-using TaikoLocalServer.Services.Interfaces;
 
 namespace TaikoLocalServer.Controllers.Api;
 

TaikoLocalServer/Controllers/Api/FavoriteSongsController.cs

@@ -1,5 +1,4 @@
 using SharedProject.Models.Requests;
-using TaikoLocalServer.Services.Interfaces;
 
 namespace TaikoLocalServer.Controllers.Api;
 

TaikoLocalServer/Controllers/Api/PlayDataController.cs

@@ -1,5 +1,4 @@
 using SharedProject.Models.Responses;
-using TaikoLocalServer.Services.Interfaces;
 
 namespace TaikoLocalServer.Controllers.Api;
 

TaikoLocalServer/Controllers/Api/UserSettingsController.cs

@@ -1,11 +1,6 @@
-using System.Buffers.Binary;
+using System.Text.Json;
-using System.Text.Json;
 using SharedProject.Models;
-using SharedProject.Models.Responses;
 using SharedProject.Utils;
-using TaikoLocalServer.Services;
-using TaikoLocalServer.Services.Interfaces;
-using Throw;
 
 namespace TaikoLocalServer.Controllers.Api;
 

TaikoLocalServer/Controllers/Game/BaidController.cs

@@ -1,5 +1,4 @@
 using System.Text.Json;
-using TaikoLocalServer.Services.Interfaces;
 using Throw;
 
 namespace TaikoLocalServer.Controllers.Game;
@@ -164,7 +163,7 @@ public class BaidController : BaseController<BaidController>
             IsDispAchievementTypeSet = true,
             LastPlayMode = userData.LastPlayMode,
             IsDispSouuchiOn = true,
-            AiRank = 0,
+            AiRank = 1,
             AiTotalWin = (uint)totalWin,
             Accesstoken = "123456",
             ContentInfo = GZipBytesUtil.GetGZipBytes(new byte[10])

TaikoLocalServer/Controllers/Game/CrownsDataController.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Controllers.Game;
-
-namespace TaikoLocalServer.Controllers.Game;
 
 [Route("/v12r03/chassis/crownsdata.php")]
 [ApiController]

TaikoLocalServer/Controllers/Game/GetAiDataController.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Controllers.Game;
-
-namespace TaikoLocalServer.Controllers.Game;
 
 [Route("/v12r03/chassis/getaidata.php")]
 [ApiController]
@@ -24,7 +22,9 @@ public class GetAiDataController : BaseController<GetAiDataController>
         var response = new GetAiDataResponse
         {
             Result  = 1,
-            TotalWinnings = (uint)totalWin
+            TotalWinnings = (uint)totalWin,
+            InputMedian = "1000",
+            InputVariance = "2000"
         };
 
         return Ok(response);

TaikoLocalServer/Controllers/Game/GetAiScoreController.cs

@@ -1,5 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+using Throw;
-using Throw;
 
 namespace TaikoLocalServer.Controllers.Game;
 

TaikoLocalServer/Controllers/Game/GetDanOdaiController.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Controllers.Game;
-
-namespace TaikoLocalServer.Controllers.Game;
 
 [Route("/v12r03/chassis/getdanodai.php")]
 [ApiController]

TaikoLocalServer/Controllers/Game/GetDanScoreController.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Controllers.Game;
-
-namespace TaikoLocalServer.Controllers.Game;
 
 [Route("/v12r03/chassis/getdanscore.php")]
 [ApiController]

TaikoLocalServer/Controllers/Game/GetScoreRankController.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Controllers.Game;
-
-namespace TaikoLocalServer.Controllers.Game;
 
 [Route("/v12r03/chassis/getscorerank.php")]
 [ApiController]

TaikoLocalServer/Controllers/Game/GetSongIntroductionController.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Controllers.Game;
-
-namespace TaikoLocalServer.Controllers.Game;
 
 [Route("/v12r03/chassis/getsongintroduction.php")]
 [ApiController]

TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Controllers.Game;
-
-namespace TaikoLocalServer.Controllers.Game;
 
 [ApiController]
 [Route("/v12r03/chassis/initialdatacheck.php")]

TaikoLocalServer/Controllers/Game/MyDonEntryController.cs

@@ -1,7 +1,4 @@
-using TaikoLocalServer.Services;
+namespace TaikoLocalServer.Controllers.Game;
-using TaikoLocalServer.Services.Interfaces;
-
-namespace TaikoLocalServer.Controllers.Game;
 
 [Route("/v12r03/chassis/mydonentry.php")]
 [ApiController]

TaikoLocalServer/Controllers/Game/PlayResultController.cs

@@ -1,7 +1,6 @@
 using System.Buffers.Binary;
 using System.Globalization;
 using System.Text.Json;
-using TaikoLocalServer.Services.Interfaces;
 using Throw;
 
 namespace TaikoLocalServer.Controllers.Game;

TaikoLocalServer/Controllers/Game/SelfBestController.cs

@@ -1,5 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+using Throw;
-using Throw;
 
 namespace TaikoLocalServer.Controllers.Game;
 

TaikoLocalServer/Controllers/Game/UserDataController.cs

@@ -1,6 +1,5 @@
 using System.Buffers.Binary;
 using System.Text.Json;
-using TaikoLocalServer.Services.Interfaces;
 using Throw;
 
 namespace TaikoLocalServer.Controllers.Game;

TaikoLocalServer/GlobalUsings.cs

@@ -9,4 +9,6 @@ global using TaikoLocalServer.Common;
 global using TaikoLocalServer.Common.Utils;
 global using TaikoLocalServer.Context;
 global using TaikoLocalServer.Entities;
-global using TaikoLocalServer.Models;
+global using TaikoLocalServer.Models;
+global using TaikoLocalServer.Services;
+global using TaikoLocalServer.Services.Interfaces;

TaikoLocalServer/Program.cs

@@ -1,87 +1,121 @@
+using System.Reflection;
 using System.Security.Authentication;
-using Microsoft.AspNetCore.HttpLogging;
 using Microsoft.AspNetCore.HttpOverrides;
 using TaikoLocalServer.Middlewares;
-using TaikoLocalServer.Services;
 using TaikoLocalServer.Services.Extentions;
-using TaikoLocalServer.Services.Interfaces;
 using TaikoLocalServer.Settings;
 using Throw;
+using Serilog;
 
-var builder = WebApplication.CreateBuilder(args);
+Log.Logger = new LoggerConfiguration()
-// Manually enable tls 1.0
+    .WriteTo.Console()
-builder.WebHost.UseKestrel(kestrelOptions =>
+    .CreateBootstrapLogger();
+
+var version = Assembly.GetEntryAssembly()?.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
+    .InformationalVersion;
+Log.Information("TaikoLocalServer version {Version}", version);
+
+Log.Information("Server starting up...");
+
+try
 {
-    kestrelOptions.ConfigureHttpsDefaults(httpsOptions =>
+    var builder = WebApplication.CreateBuilder(args);
+    // Manually enable tls 1.0
+    builder.WebHost.UseKestrel(kestrelOptions =>
     {
-        httpsOptions.SslProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12 | SslProtocols.Tls13;
+        kestrelOptions.ConfigureHttpsDefaults(httpsOptions =>
+        {
+            httpsOptions.SslProtocols =
+                SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12 | SslProtocols.Tls13;
+        });
     });
-});
 
-// Add services to the container.
+    builder.Host.UseSerilog((context, configuration) =>
-builder.Services.AddOptions();
-builder.Services.AddSingleton<IGameDataService, GameDataService>();
-builder.Services.Configure<UrlSettings>(builder.Configuration.GetSection(nameof(UrlSettings)));
-builder.Services.AddControllers().AddProtoBufNet();
-builder.Services.AddDbContext<TaikoDbContext>(option =>
-{
-    var dbName = builder.Configuration["DbFileName"];
-    if (string.IsNullOrEmpty(dbName))
     {
-        dbName = Constants.DEFAULT_DB_NAME;
+        configuration.WriteTo.Console().ReadFrom.Configuration(context.Configuration);
+    });
+
+    // Add services to the container.
+    builder.Services.AddOptions();
+    builder.Services.AddSingleton<IGameDataService, GameDataService>();
+    builder.Services.Configure<UrlSettings>(builder.Configuration.GetSection(nameof(UrlSettings)));
+    builder.Services.AddControllers().AddProtoBufNet();
+    builder.Services.AddDbContext<TaikoDbContext>(option =>
+    {
+        var dbName = builder.Configuration["DbFileName"];
+        if (string.IsNullOrEmpty(dbName))
+        {
+            dbName = Constants.DEFAULT_DB_NAME;
+        }
+
+        var path = Path.Combine(PathHelper.GetRootPath(), dbName);
+        option.UseSqlite($"Data Source={path}");
+    });
+    builder.Services.AddMemoryCache();
+    builder.Services.AddCors(options =>
+    {
+        options.AddPolicy("AllowAllCorsPolicy", policy =>
+        {
+            policy
+                .AllowAnyOrigin()
+                .AllowAnyMethod()
+                .AllowAnyHeader();
+        });
+    });
+    builder.Services.AddTaikoDbServices();
+
+    var app = builder.Build();
+
+    // Migrate db
+    using (var scope = app.Services.CreateScope())
+    {
+        var db = scope.ServiceProvider.GetRequiredService<TaikoDbContext>();
+        db.Database.Migrate();
     }
-    var path = Path.Combine(PathHelper.GetRootPath(), dbName);
+
-    option.UseSqlite($"Data Source={path}");
+    app.UseSerilogRequestLogging(options =>
-});
-builder.Services.AddHttpLogging(options =>
-{
-    options.LoggingFields = HttpLoggingFields.RequestProperties |
-                            HttpLoggingFields.ResponseStatusCode;
-});
-builder.Services.AddMemoryCache();
-builder.Services.AddCors(options =>
-{
-    options.AddPolicy("DevCorsPolicy", policy =>
     {
-        policy
+        options.MessageTemplate = "HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms, " +
-            .AllowAnyOrigin()
+                                  "request host: {RequestHost}";
-            .AllowAnyMethod()
+        options.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>
-            .AllowAnyHeader();
+        {
+            diagnosticContext.Set("RequestHost", httpContext.Request.Host.Value);
+        };
     });
-});
-builder.Services.AddTaikoDbServices();
 
-var app = builder.Build();
+    var gameDataService = app.Services.GetService<IGameDataService>();
+    gameDataService.ThrowIfNull();
+    await gameDataService.InitializeAsync();
 
-// Migrate db
+    // For reverse proxy
-using (var scope = app.Services.CreateScope())
+    app.UseForwardedHeaders(new ForwardedHeadersOptions
-{
+    {
-    var db = scope.ServiceProvider.GetRequiredService<TaikoDbContext>();
+        ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
-    db.Database.Migrate();
+    });
+
+    app.UseCors("AllowAllCorsPolicy");
+    // For blazor hosting
+    app.UseBlazorFrameworkFiles();
+    app.UseStaticFiles();
+    app.UseRouting();
+
+
+    app.UseHttpLogging();
+    app.MapControllers();
+    app.MapFallbackToFile("index.html");
+
+    app.UseWhen(
+        context => context.Request.Path.StartsWithSegments("/sys/servlet/PowerOn", StringComparison.InvariantCulture),
+        applicationBuilder => applicationBuilder.UseAllNetRequestMiddleware());
+
+    app.Run();
 }
-
+catch (Exception ex)
-var gameDataService = app.Services.GetService<IGameDataService>();
-gameDataService.ThrowIfNull();
-await gameDataService.InitializeAsync();
-
-// For reverse proxy
-app.UseForwardedHeaders(new ForwardedHeadersOptions
 {
-    ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
+    Log.Fatal(ex, "Unhandled exception");
-});
+}
-
+finally
-app.UseCors("DevCorsPolicy");
+{
-// For blazor hosting
+    Log.Information("Shut down complete");
-app.UseBlazorFrameworkFiles();
+    Log.CloseAndFlush();
-app.UseStaticFiles();
+}
-app.UseRouting();
-
-
-app.UseHttpLogging();
-app.MapControllers();
-app.MapFallbackToFile("index.html");
-
-app.UseWhen(context => context.Request.Path.StartsWithSegments("/sys/servlet/PowerOn", StringComparison.InvariantCulture),
-            applicationBuilder => applicationBuilder.UseAllNetRequestMiddleware());
-
-app.Run();

TaikoLocalServer/Services/AiDatumService.cs

@@ -1,5 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+using Throw;
-using Throw;
 
 namespace TaikoLocalServer.Services;
 

TaikoLocalServer/Services/CardService.cs

@@ -1,6 +1,5 @@
 using SharedProject.Models;
 using Swan.Mapping;
-using TaikoLocalServer.Services.Interfaces;
 
 namespace TaikoLocalServer.Services;
 

TaikoLocalServer/Services/DanScoreDatumService.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Services;
-
-namespace TaikoLocalServer.Services;
 
 public class DanScoreDatumService : IDanScoreDatumService
 {

TaikoLocalServer/Services/Extentions/ServiceExtensions.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Services.Extentions;
-
-namespace TaikoLocalServer.Services.Extentions;
 
 public static class ServiceExtensions
 {

TaikoLocalServer/Services/GameDataService.cs

@@ -2,7 +2,6 @@
 using System.Text.Json;
 using SharedProject.Models;
 using Swan.Mapping;
-using TaikoLocalServer.Services.Interfaces;
 using Throw;
 
 namespace TaikoLocalServer.Services;

TaikoLocalServer/Services/SongBestDatumService.cs

@@ -1,6 +1,5 @@
 using SharedProject.Models;
 using Swan.Mapping;
-using TaikoLocalServer.Services.Interfaces;
 using Throw;
 
 namespace TaikoLocalServer.Services;

TaikoLocalServer/Services/SongPlayDatumService.cs

@@ -1,6 +1,4 @@
-using TaikoLocalServer.Services.Interfaces;
+namespace TaikoLocalServer.Services;
-
-namespace TaikoLocalServer.Services;
 
 class SongPlayDatumService : ISongPlayDatumService
 {

TaikoLocalServer/Services/UserDatumService.cs

@@ -1,5 +1,4 @@
 using System.Text.Json;
-using TaikoLocalServer.Services.Interfaces;
 using Throw;
 
 namespace TaikoLocalServer.Services;

TaikoLocalServer/TaikoLocalServer.csproj

@@ -4,6 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
+        <Version>0.3.0-alpha</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -20,6 +21,8 @@
         </PackageReference>
         <PackageReference Include="protobuf-net" Version="3.1.17" />
         <PackageReference Include="protobuf-net.AspNetCore" Version="3.1.17" />
+        <PackageReference Include="Serilog.AspNetCore" Version="6.1.0-dev-00281" />
+        <PackageReference Include="Serilog.Expressions" Version="3.4.1-dev-00095" />
         <PackageReference Include="SharpZipLib" Version="1.3.3" />
         <PackageReference Include="Swan.Core" Version="6.0.2-beta.90" />
         <PackageReference Include="Swan.Logging" Version="6.0.2-beta.69" />

TaikoLocalServer/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Information"
-    }
-  }
-}

TaikoLocalServer/appsettings.json

@@ -3,15 +3,36 @@
     "MuchaUrl": "https://v402-front.mucha-prd.nbgi-amnet.jp:10122",
     "GameUrl": "vsapi.taiko-p.jp"
   },
+  
   "DbFileName" : "taiko.db3",
-  "Logging": {
+  
-    "LogLevel": {
+  "Serilog": {
+    "MinimumLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning",
+      "Override": {
-      "Microsoft.AspNetCore.HttpLogging.HttpLoggingMiddleware": "Information"
+        "Microsoft": "Warning",
-    }
+        "Microsoft.AspNetCore": "Warning",
+        "Microsoft.Hosting.Lifetime": "Information"
+      }
+    },
+    "Filter": [
+      {
+        "Name": "ByExcluding",
+        "Args": {
+          "expression": "@mt = 'An unhandled exception has occurred while executing the request.'"
+        }
+      }
+    ],
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": { "path":  "./Logs/log-.txt", "rollingInterval": "Day" }
+      }
+    ]
   },
+  
   "AllowedHosts": "*",
+  
   "Kestrel": {
     "Endpoints": {
       "Server": {