some refactor

.gitignore

@@ -355,3 +355,4 @@ Stat.Itok.Front/dist
 /Stat.Itok.Tests/configs/doc_id_list.txt
 Stat.Itok.Tests/configs/rerun_list.txt
 Stat.Itok.Tests/configs/user_auth_cfg.json
+Stat.Itok.Worker/appsettings.dev.json

Stat.Itok.Core/Handlers/NintendoHandlers.cs

@@ -1,4 +1,4 @@
-using MediatR;
+using Mediator;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
 using Stat.Itok.Core.ApiClients;
@@ -30,7 +30,7 @@ public NintendoPublicHandlers(
     }
 
 
-    public async Task<NinTokenCopyInfo> Handle(ReqGetTokenCopyInfo request, CancellationToken cancellationToken)
+    public async ValueTask<NinTokenCopyInfo> Handle(ReqGetTokenCopyInfo request, CancellationToken cancellationToken)
     {
         var authCode = StatInkHelper.BuildRandomSizedBased64Str(32);
         var authCodeVerifier = StatInkHelper.BuildRandomSizedBased64Str(64);
@@ -42,7 +42,7 @@ public async Task<NinTokenCopyInfo> Handle(ReqGetTokenCopyInfo request, Cancella
         };
     }
 
-    public async Task<NinAuthContext> Handle(ReqGenAuthContext request, CancellationToken cancellationToken)
+    public async ValueTask<NinAuthContext> Handle(ReqGenAuthContext request, CancellationToken cancellationToken)
     {
         var sessionToken = await _mediator.Send(new ReqGetSessionToken()
         {
@@ -59,7 +59,7 @@ public async Task<NinAuthContext> Handle(ReqGenAuthContext request, Cancellation
         }, cancellationToken);
     }
 
-    public async Task<NinAuthContext> Handle(ReqReGenAuthContext request, CancellationToken cancellationToken)
+    public async ValueTask<NinAuthContext> Handle(ReqReGenAuthContext request, CancellationToken cancellationToken)
     {
         var accessTokenInfo = await _mediator.Send(new ReqGetAccessToken()
         {
@@ -101,15 +101,15 @@ public async Task<NinAuthContext> Handle(ReqReGenAuthContext request, Cancellati
         return ctx;
     }
 
-    public async Task<string> Handle(ReqDoGraphQL request, CancellationToken cancellationToken)
+    public async ValueTask<string> Handle(ReqDoGraphQL request, CancellationToken cancellationToken)
     {
         var strResp = await RunWithDefaultPolicy(_api.SendGraphQLRequestAsync(request.AuthContext.GameToken,
             request.AuthContext.BulletToken, request.AuthContext.UserInfo, request.QueryHash, request.VarName,
             request.VarValue));
         return strResp;
     }
 
-    public async Task<RespPreCheck> Handle(ReqPreCheck request, CancellationToken cancellationToken)
+    public async ValueTask<RespPreCheck> Handle(ReqPreCheck request, CancellationToken cancellationToken)
     {
         var checkResp = PreCheckResult.Ok;
         NinAuthContext newAuthContext = request.AuthContext;
@@ -146,7 +146,7 @@ public async Task<RespPreCheck> Handle(ReqPreCheck request, CancellationToken ca
         };
     }
 
-    public async Task<NinMiscConfig> Handle(ReqGetNinMiscConfig request, CancellationToken cancellationToken)
+    public async ValueTask<NinMiscConfig> Handle(ReqGetNinMiscConfig request, CancellationToken cancellationToken)
     {
         return await _api.GetNinMiscConfigAsync();
     }
@@ -167,7 +167,7 @@ public NintendoPrivateHandlers(INintendoApi api)
         _api = api;
     }
 
-    public async Task<string> Handle(ReqGetSessionToken request, CancellationToken cancellationToken)
+    public async ValueTask<string> Handle(ReqGetSessionToken request, CancellationToken cancellationToken)
     {
         var strResp = await RunWithDefaultPolicy(_api.GetSessionTokenAsync(request.TokenCopyInfo.RedirectUrl,
             request.TokenCopyInfo.AuthCodeVerifier));
@@ -176,7 +176,7 @@ public async Task<string> Handle(ReqGetSessionToken request, CancellationToken c
         return jTokenResp["session_token"]!.Value<string>();
     }
 
-    public async Task<NinAccessTokenInfo> Handle(ReqGetAccessToken request, CancellationToken cancellationToken)
+    public async ValueTask<NinAccessTokenInfo> Handle(ReqGetAccessToken request, CancellationToken cancellationToken)
     {
         var strResp = await RunWithDefaultPolicy(_api.GetAccessTokenInfoAsync(request.SessionToken));
         var jTokenResp = strResp.ThrowIfJsonPropNotFound("access_token", "id_token");
@@ -187,7 +187,7 @@ public async Task<NinAccessTokenInfo> Handle(ReqGetAccessToken request, Cancella
         };
     }
 
-    public async Task<NinUserInfo> Handle(ReqGetUserInfo request, CancellationToken cancellationToken)
+    public async ValueTask<NinUserInfo> Handle(ReqGetUserInfo request, CancellationToken cancellationToken)
     {
         var strResp = await RunWithDefaultPolicy(_api.GetUserInfoAsync(request.AccessTokenInfo.AccessToken));
         var jTokenResp = strResp.ThrowIfJsonPropNotFound("id", "country", "language", "nickname", "birthday");
@@ -201,7 +201,7 @@ public async Task<NinUserInfo> Handle(ReqGetUserInfo request, CancellationToken
         };
     }
 
-    public async Task<RespPerGameToken> Handle(ReqGetPreGameToken request, CancellationToken cancellationToken)
+    public async ValueTask<RespPerGameToken> Handle(ReqGetPreGameToken request, CancellationToken cancellationToken)
     {
         var strResp =
             await RunWithDefaultPolicy(_api.GetPreGameTokenAsync(request.AccessTokenInfo.AccessToken, request.User));
@@ -216,7 +216,7 @@ public async Task<RespPerGameToken> Handle(ReqGetPreGameToken request, Cancellat
         };
     }
 
-    public async Task<string> Handle(ReqGetGameToken request, CancellationToken cancellationToken)
+    public async ValueTask<string> Handle(ReqGetGameToken request, CancellationToken cancellationToken)
     {
         var strResp =
             await RunWithDefaultPolicy(_api.GetGameTokenAsync(request.PreGameToken, request.User, request.CoralUserId));
@@ -226,7 +226,7 @@ public async Task<string> Handle(ReqGetGameToken request, CancellationToken canc
         return jTokenResp["result"]!["accessToken"]!.Value<string>();
     }
 
-    public async Task<string> Handle(ReqGetBulletGameToken request, CancellationToken cancellationToken)
+    public async ValueTask<string> Handle(ReqGetBulletGameToken request, CancellationToken cancellationToken)
     {
         var strResp =
             await RunWithDefaultPolicy(_api.GetBulletTokenAsync(request.GameToken, request.User));

Stat.Itok.Core/Handlers/ReqAndResp.cs

@@ -1,4 +1,4 @@
-using MediatR;
+using Mediator;
 
 namespace Stat.Itok.Core.Handlers;
 

Stat.Itok.Core/Handlers/StatInkHandler.cs

@@ -1,4 +1,4 @@
-using MediatR;
+using Mediator;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
 using Stat.Itok.Core.ApiClients;
@@ -23,7 +23,7 @@ public StatInkHandler(IStatInkApi api, ILogger<StatInkHandler> logger)
         _logger = logger;
     }
 
-    public async Task<StatInkPostBodySuccess> Handle(ReqPostBattle request, CancellationToken cancellationToken)
+    public async ValueTask<StatInkPostBodySuccess> Handle(ReqPostBattle request, CancellationToken cancellationToken)
     {
         var strResp = await RunWithDefaultPolicy(_api.PostBattleAsync(request.ApiKey, request.Body));
         var jTokenResp = strResp.ThrowIfJsonPropNotFound("id", "url");
@@ -34,7 +34,7 @@ public async Task<StatInkPostBodySuccess> Handle(ReqPostBattle request, Cancella
         };
     }
 
-    public async Task<Dictionary<string, string>> Handle(ReqGetGearsInfo request, CancellationToken cancellationToken)
+    public async ValueTask<Dictionary<string, string>> Handle(ReqGetGearsInfo request, CancellationToken cancellationToken)
     {
         var strResp = await RunWithDefaultPolicy(_api.GetGearKeyDictAsync());
         return JArray.Parse(strResp).SelectMany(x =>
@@ -52,7 +52,7 @@ public async Task<Dictionary<string, string>> Handle(ReqGetGearsInfo request, Ca
         }).GroupBy(x => x.Item1).ToDictionary(x => x.Key, y => y.First().Item2);
     }
 
-    public async Task<Dictionary<string, string>> Handle(ReqGetSalmonWeaponsInfo request,
+    public async ValueTask<Dictionary<string, string>> Handle(ReqGetSalmonWeaponsInfo request,
         CancellationToken cancellationToken)
     {
         var strResp = await RunWithDefaultPolicy(_api.GetSalmonWeaponKeyDictAsync());
@@ -71,7 +71,7 @@ public async Task<Dictionary<string, string>> Handle(ReqGetSalmonWeaponsInfo req
         }).GroupBy(x => x.Item1).ToDictionary(x => x.Key, y => y.First().Item2);
     }
 
-    public async Task<StatInkPostBodySuccess> Handle(ReqPostSalmon request, CancellationToken cancellationToken)
+    public async ValueTask<StatInkPostBodySuccess> Handle(ReqPostSalmon request, CancellationToken cancellationToken)
     {
         var strResp = await RunWithDefaultPolicy(_api.PostSalmonAsync(request.ApiKey, request.Body));
         var jTokenResp = strResp.ThrowIfJsonPropNotFound("id", "url");
@@ -82,7 +82,7 @@ public async Task<StatInkPostBodySuccess> Handle(ReqPostSalmon request, Cancella
         };
     }
 
-    public async Task<ApiResp<string>> Handle(ReqTestStatApiKey request, CancellationToken cancellationToken)
+    public async ValueTask<ApiResp<string>> Handle(ReqTestStatApiKey request, CancellationToken cancellationToken)
     {
         try
         {

Stat.Itok.Core/Stat.Itok.Core.csproj

@@ -12,7 +12,7 @@
 		<PackageReference Include="Fizzler.Systems.HtmlAgilityPack" Version="1.2.1" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
-		<PackageReference Include="MediatR" Version="11.0.0" />
+		<PackageReference Include="Mediator.Abstractions" Version="2.1.5" />
 		<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.31.2" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />

Stat.Itok.Core/StorageAccess.cs

@@ -70,7 +70,8 @@ public async Task<ItemResponse<CosmosEntity<TEntity>>> UpsertEntityInStoreAsync<
         {
             var cName = _options.Value.CosmosContainerName;
             var container = _client.GetContainer(_options.Value.CosmosDbName, cName);
-            return await container.UpsertItemAsync(CosmosEntity.CreateFrom(CosmosEntity.BuildCosmosRealId<TEntity>(entityId, _options.Value.CosmosDbPkPrefix),
+            return await container.UpsertItemAsync(CosmosEntity.CreateFrom(
+                CosmosEntity.BuildCosmosRealId<TEntity>(entityId, _options.Value.CosmosDbPkPrefix),
                 entity, _options.Value.CosmosDbPkPrefix));
         }
 
@@ -85,21 +86,21 @@ public async Task<TEntity> GetEntityIfExistAsync<TEntity>(string id)
             var container = _client.GetContainer(_options.Value.CosmosDbName, _options.Value.CosmosContainerName);
             try
             {
-                var resp = await container.ReadItemAsync<CosmosEntity<TEntity>>(CosmosEntity.BuildCosmosRealId<TEntity>(id, _options.Value.CosmosDbPkPrefix),
-              new PartitionKey(CosmosEntity.GetPartitionKey<TEntity>(_options.Value.CosmosDbPkPrefix)));
+                var resp = await container.ReadItemAsync<CosmosEntity<TEntity>>(
+                    CosmosEntity.BuildCosmosRealId<TEntity>(id, _options.Value.CosmosDbPkPrefix),
+                    new PartitionKey(CosmosEntity.GetPartitionKey<TEntity>(_options.Value.CosmosDbPkPrefix)));
                 return resp.Resource.Data;
             }
             catch (Exception)
             {
                 return default;
             }
-
         }
     }
 
     public interface IStorageAccessor
     {
-        Task<QueueClient> GeJobRunTaskQueueClientAsync();
+        Task<QueueClient> GetJobRunTaskQueueClientAsync();
         Task<BlobContainerClient> GetBlobContainerClientAsync<T>();
     }
 
@@ -147,9 +148,9 @@ public async Task<TableClient> GetTableClientAsync<T>()
             return tableClient;
         }
 
-        public async Task<QueueClient> GeJobRunTaskQueueClientAsync()
+        public async Task<QueueClient> GetJobRunTaskQueueClientAsync()
         {
-            var serviceClient = new QueueServiceClient(Environment.GetEnvironmentVariable("WorkerQueueConnStr"));
+            var serviceClient = new QueueServiceClient(_options.Value.StorageAccountConnStr);
             var queueClient = serviceClient.GetQueueClient(StatItokConstants.JobRunTaskQueueName);
             await queueClient.CreateIfNotExistsAsync();
             return queueClient;