wonderking/continuity
2
0
Fork 0
Code Issues Pull requests 16 Projects 1 Releases Packages 1 Wiki Activity Actions

revert: back to direct linq queries.

Browse source
This commit is contained in:
Timothy Schenk 2023-11-25 12:20:55 +01:00
parent 0d14701031
commit effe9a5a1d
7 changed files with 65 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
Server/PacketHandlers/ChannelSelectionHandler.CompiledQueries.cs
View file

@ -1,58 +0,0 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Microsoft.EntityFrameworkCore;
using Server.DB;
using Server.DB.Documents;
using Wonderking.Game.Data.Character;
using Wonderking.Packets.Outgoing.Data;
namespace Server.PacketHandlers;
public partial class ChannelSelectionHandler
{
private static readonly Func<WonderkingContext, Guid, Task<bool>> _accountExists = EF.CompileAsyncQuery(
(WonderkingContext context, Guid accountId) =>
context.Accounts.AsNoTracking().Any(a => a.Id == accountId));
private static readonly Func<WonderkingContext, Guid, Task<int>> _getAmountOfCharacters =
EF.CompileAsyncQuery((WonderkingContext context, Guid accountId) =>
context.Characters.AsNoTracking()
.Where(c => c.Account.Id == accountId).Take(3)
.Count());
private static readonly Func<WonderkingContext, Guid, IAsyncEnumerable<string>> _getGuildNames =
EF.CompileAsyncQuery((WonderkingContext context, Guid accountId) =>
context.Characters.AsNoTracking()
.Where(c => c.Account.Id == accountId && c.Guild != null)
.Select(c => c.Guild.Name).Take(3));
private static readonly Func<WonderkingContext, Guid, IAsyncEnumerable<CharacterDataProjection>>
_getCharacters =
EF.CompileAsyncQuery((WonderkingContext context, Guid accountId) =>
context.Characters.AsNoTracking().AsSplitQuery()
.Where(c => c.Account.Id == accountId)
.Select(c => new CharacterDataProjection(
c.Name,
c.JobData,
c.Gender,
c.Level,
c.Experience,
c.BaseStats,
c.Health,
c.Mana,
c.InventoryItems.Select(i => new InventoryItemProjection(i.ItemId, i.Slot, i.InventoryTab))
)).Take(3));
private sealed record InventoryItemProjection(ushort ItemId, byte Slot, InventoryTab InventoryTab);
private sealed record CharacterDataProjection(
string Name,
JobData JobData,
Gender Gender,
ushort Level,
long Experience,
BaseStats BaseStats,
int Health,
int Mana,
IEnumerable<InventoryItemProjection> InventoryItems);
}

24
Server/PacketHandlers/ChannelSelectionHandler.Projections.cs Normal file
View file

@ -0,0 +1,24 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Server.DB.Documents;
using Wonderking.Game.Data.Character;
using Wonderking.Packets.Outgoing.Data;
namespace Server.PacketHandlers;
public partial class ChannelSelectionHandler
{
private sealed record InventoryItemProjection(ushort ItemId, byte Slot, InventoryTab InventoryTab);
private sealed record CharacterDataProjection(
string Name,
JobData JobData,
Gender Gender,
ushort Level,
long Experience,
BaseStats BaseStats,
int Health,
int Mana,
IEnumerable<InventoryItemProjection> InventoryItems);
}

38
Server/PacketHandlers/ChannelSelectionHandler.cs
View file

@ -1,6 +1,7 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using DotNext.Collections.Generic;
using Microsoft.EntityFrameworkCore;
using NetCoreServer;
using Server.DB;
using Server.DB.Documents;
@ -21,13 +22,20 @@ public partial class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPa
public async Task HandleAsync(ChannelSelectionPacket packet, TcpSession session)
{
var authSession = (AuthSession)session;
if (session is not AuthSession authSession)
{
return;
}
ChannelSelectionResponsePacket responsePacket;
var guildNameResponsePacket = new CharacterSelectionSetGuildNamePacket { GuildNames = Array.Empty<string>() };
var accountExists = await _accountExists(_wonderkingContext, authSession.AccountId);
var accountExists =
await _wonderkingContext.Accounts.AsNoTracking().AnyAsync(a => a.Id == authSession.AccountId);
var amountOfCharacter = await _getAmountOfCharacters(_wonderkingContext, authSession.AccountId);
var amountOfCharacter = await _wonderkingContext.Characters.AsNoTracking().Include(c => c.Account)
.Where(c => c.Account.Id == authSession.AccountId).Take(3)
.CountAsync();
if (!accountExists)
{
@ -45,7 +53,10 @@ public partial class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPa
};
guildNameResponsePacket.GuildNames =
await _getGuildNames(_wonderkingContext, authSession.AccountId).ToArrayAsync();
await _wonderkingContext.Characters.AsNoTracking().Include(c => c.Account).Include(c => c.GuildMember)
.ThenInclude(gm => gm.Guild)
.Where(c => c.Account.Id == authSession.AccountId && c.GuildMember.Guild != null)
.Select(c => c.GuildMember.Guild.Name).Take(3).ToArrayAsync();
}
else
{
@ -86,7 +97,23 @@ public partial class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPa
private async IAsyncEnumerable<CharacterData> GetCharacterDataAsync(Guid accountId)
{
await foreach (var c in _getCharacters(_wonderkingContext, accountId))
var characterDataProjections = _wonderkingContext.Characters.AsNoTracking().AsSplitQuery()
.Include(c => c.InventoryItems).Include(c => c.Account)
.Where(c => c.Account.Id == accountId)
.Select(c => new CharacterDataProjection(
c.Name,
c.JobData,
c.Gender,
c.Level,
c.Experience,
c.BaseStats,
c.Health,
c.Mana,
c.InventoryItems.Select(i =>
new InventoryItemProjection(i.ItemId, i.Slot, i.InventoryTab))
)).Take(3);
await foreach (var c in characterDataProjections)
{
yield return new CharacterData
{
@ -107,5 +134,4 @@ public partial class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPa
};
}
}
}

14
Server/PacketHandlers/CharacterCreationHandler.CompiledQueries.cs
View file

@ -1,14 +0,0 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Microsoft.EntityFrameworkCore;
using Server.DB;
using Server.DB.Documents;
namespace Server.PacketHandlers;
public partial class CharacterCreationHandler
{
private static readonly Func<WonderkingContext, Guid, Task<Account>> _getAccount =
EF.CompileQuery((WonderkingContext context, Guid accountId) =>
context.Accounts.FirstOrDefaultAsync(a => a.Id == accountId, default));
}

6
Server/PacketHandlers/CharacterCreationHandler.cs
View file

@ -1,5 +1,6 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Microsoft.EntityFrameworkCore;
using NetCoreServer;
using Server.DB;
using Server.DB.Documents;
@ -12,7 +13,7 @@ using Wonderking.Packets.Outgoing.Data;
namespace Server.PacketHandlers;
public partial class CharacterCreationHandler : IPacketHandler<CharacterCreationPacket>
public class CharacterCreationHandler : IPacketHandler<CharacterCreationPacket>
{
private readonly CharacterStatsMappingConfiguration _characterStatsMapping;
private readonly ItemObjectPoolService _itemObjectPoolService;
@ -34,8 +35,7 @@ public partial class CharacterCreationHandler : IPacketHandler<CharacterCreation
return;
}
var account = await
_getAccount(_wonderkingContext, authSession.AccountId);
var account = await _wonderkingContext.Accounts.FirstOrDefaultAsync(a => a.Id == authSession.AccountId);
var firstJobConfig = SelectFirstJobConfig(packet.FirstJob);
var items = CreateDefaultItems(packet, firstJobConfig);

21
Server/PacketHandlers/LoginHandler.CompiledQueries.cs
View file

@ -1,21 +0,0 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.ChangeTracking;
using Server.DB;
using Server.DB.Documents;
namespace Server.PacketHandlers;
public partial class LoginHandler
{
private static readonly Func<WonderkingContext, Account, ValueTask<EntityEntry<Account>>> _addAccount =
EF.CompileQuery((WonderkingContext context, Account account) => context.Accounts.AddAsync(account, default));
private static readonly Func<WonderkingContext, Account, Task<EntityEntry<Account>>> _updateAccount =
EF.CompileAsyncQuery((WonderkingContext context, Account account) => context.Accounts.Update(account));
private static readonly Func<WonderkingContext, string, Task<Account>> _getAccount =
EF.CompileAsyncQuery((WonderkingContext context, string username) =>
context.Accounts.FirstOrDefault(a => a.Username == username));
}

11
Server/PacketHandlers/LoginHandler.cs
View file

@ -5,6 +5,7 @@ using System.Security.Cryptography;
using System.Text;
using DotNext;
using Konscious.Security.Cryptography;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using NetCoreServer;
@ -17,7 +18,7 @@ using Wonderking.Packets.Outgoing.Data;
namespace Server.PacketHandlers;
public partial class LoginHandler : IPacketHandler<LoginInfoPacket>
public class LoginHandler : IPacketHandler<LoginInfoPacket>
{
private readonly IConfiguration _configuration;
private readonly ILogger<LoginHandler> _logger;
@ -35,14 +36,14 @@ public partial class LoginHandler : IPacketHandler<LoginInfoPacket>
{
LoginResponseReason loginResponseReason;
_logger.LoginData(packet.Username, packet.Password);
var account = await _getAccount(_wonderkingContext, packet.Username);
var account = await _wonderkingContext.Accounts.FirstOrDefaultAsync(a => a.Username == packet.Username);
if (account == null)
{
if (_configuration.GetSection("Testing").GetValue<bool>("CreateAccountOnLogin"))
{
loginResponseReason = await CreateAccountOnLoginAsync(packet.Username, packet.Password);
account = await _getAccount(_wonderkingContext, packet.Username);
account = await _wonderkingContext.Accounts.FirstOrDefaultAsync(a => a.Username == packet.Username);
}
else
{
@ -106,12 +107,12 @@ public partial class LoginHandler : IPacketHandler<LoginInfoPacket>
try
{
var salt = RandomNumberGenerator.GetBytes(16);
var finalAccount = await _addAccount(_wonderkingContext, new Account(username,
var finalAccount = await _wonderkingContext.Accounts.AddAsync(new Account(username,
Array.Empty<byte>(), "", 0, salt));
await _wonderkingContext.SaveChangesAsync();
finalAccount.Entity.Password =
await GetPasswordHashAsync(password, salt, finalAccount.Entity.Id);
_updateAccount(_wonderkingContext, finalAccount.Entity);
_wonderkingContext.Accounts.Update(finalAccount.Entity);
loginResponseReason = LoginResponseReason.Ok;
await _wonderkingContext.SaveChangesAsync();