Library Update

The project now uses the new source generator package for the ServerDatabase package. This now allows code to read a full row at a time while using the type safety from the column definitions.

LuskiServer/Classes/TableDef/Categories.cs

@@ -1,4 +1,5 @@
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -12,4 +13,7 @@ public static class Categories
     public static TableColumn<long[]> Channels { get; } = new("channels") { DefaultValue = Array.Empty<long>() };
     public static TableColumn<long[]> RoleOverides { get; } = new("role_overides") { DefaultValue = Array.Empty<long>() };
     public static TableColumn<long[]> UserOverides { get; } = new("member_overides") { DefaultValue = Array.Empty<long>() };
-}
+}
+[TableRow(typeof(Categories))]
+public partial class CategoryRow
+{}

LuskiServer/Classes/TableDef/Channels.cs

@@ -2,6 +2,7 @@ using System.Text;
 using JacobTechEncryption.Enums;
 using LuskiServer.Enums;
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -27,4 +28,8 @@ public static class Channels
         EncoderType.UTF32, EncoderType.ASCII,
         EncoderType.Latin1, EncoderType.BigEndianUnicode 
     } };
-}
+}
+
+[TableRow(typeof(Channels))]
+public partial class ChannelRow
+{}

LuskiServer/Classes/TableDef/Files.cs

@@ -1,5 +1,6 @@
 using JacobTechEncryption.Enums;
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -13,4 +14,11 @@ public static class Files
     public static TableColumn<byte[]> Data { get; } = new("data");
     public static TableColumn<EncryptionType> EncryptionType { get; } = new("encryption_type");
     public static TableColumn<EncoderType> EncoderType { get; } = new("encoder_type");
+    public static TableColumn<EncryptionType> NameEncryptionType { get; } = new("name_encryption_type");
+    public static TableColumn<EncoderType> NameEncoderType { get; } = new("name_encoder_type");
+}
+
+[TableRow(typeof(Files))]
+public partial class FileRow
+{
 }

LuskiServer/Classes/TableDef/Logs.cs

@@ -1,5 +1,6 @@
 using LuskiServer.Enums;
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -8,4 +9,8 @@ public static class Logs
     public static TableColumn<long> ID { get; } = new("id", true);
     public static TableColumn<LogType> Type { get; } = new("type");
     public static TableColumn<string> Message { get; } = new("message");
-}
+}
+
+[TableRow(typeof(Logs))]
+public partial class LogRow
+{}

LuskiServer/Classes/TableDef/Messages.cs

@@ -1,5 +1,6 @@
 using JacobTechEncryption.Enums;
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -13,4 +14,8 @@ public static class Messages
     public static TableColumn<EncryptionType> EncryptionType { get; } = new("encryption_type");
     public static TableColumn<EncoderType> EncoderType { get; } = new("encoder_type");
     public static TableColumn<long[]> Files { get; } = new("files");
-}
+}
+
+[TableRow(typeof(Messages))]
+public partial class MessageRow
+{}

LuskiServer/Classes/TableDef/Roles.cs

@@ -1,5 +1,6 @@
 using LuskiServer.Enums;
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -11,4 +12,8 @@ public static class Roles
     public static TableColumn<string> Description { get; } = new("description");
     public static TableColumn<ServerPermissions[]> ServerPermissions { get; } = new("server_perms");
     public static TableColumn<long[]> MembersList { get; } = new("members_list") {DefaultValue = Array.Empty<long>()};
-}
+}
+
+[TableRow(typeof(Roles))]
+public partial class RoleRow
+{}

LuskiServer/Classes/TableDef/ServerRoleOverides.cs

@@ -1,5 +1,5 @@
-using LuskiServer.Enums;
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -8,4 +8,8 @@ public static class ServerRoleOverides
     public static TableColumn<long> ID { get; } = new("id", true);
     public static TableColumn<long> RoleID { get; } = new("role_id");
     public static TableColumn<string[]> Overides { get; } = new("overides");
-}
+}
+
+[TableRow(typeof(ServerRoleOverides))]
+public partial class ServerRoleOverideRow
+{}

LuskiServer/Classes/TableDef/SessionTokens.cs

@@ -1,4 +1,5 @@
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -9,4 +10,8 @@ public static class SessionTokens
     public static TableColumn<byte[]> Token { get; } = new("token");
     public static TableColumn<byte[]> AddressFilter { get; } = new("address_filter");
     public static TableColumn<DateTime> TimeFilter { get; } = new("date_filter");
-}
+}
+
+[TableRow(typeof(SessionTokens))]
+public partial class SessionTokenRow
+{}

LuskiServer/Classes/TableDef/UserRoleOverides.cs

@@ -1,5 +1,6 @@
 using LuskiServer.Enums;
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -8,4 +9,8 @@ public static class UserRoleOverides
     public static TableColumn<long> ID { get; } = new("id", true);
     public static TableColumn<long> UserID { get; } = new("user_id");
     public static TableColumn<string[]> Overides { get; } = new("overides");
-}
+}
+
+[TableRow(typeof(UserRoleOverides))]
+public partial class UserRoleOverideRow
+{}

LuskiServer/Classes/TableDef/Users.cs

@@ -1,5 +1,6 @@
 using LuskiServer.Enums;
 using ServerDatabase;
+using ServerDatabase.SourceGenerator;
 
 namespace LuskiServer.Classes.TableDef;
 
@@ -21,4 +22,8 @@ public class Users
     public static TableColumn<string> Token { get; } = new("token");
     public static TableColumn<string[]> OfflineData { get; } = new("offline_data");
     public static TableColumn<string> OffileKey { get; } = new("offline_key") {DefaultValue = string.Empty};
-}
+}
+
+[TableRow(typeof(Users))]
+public partial class UserRow
+{}

LuskiServer/Classes/Tables.cs

@@ -1,17 +1,18 @@
+using LuskiServer.Classes.TableDef;
 using ServerDatabase;
 
 namespace LuskiServer.Classes;
 
 public static class Tables
 {
-    public static Table Users { get; } = new Table("users", null!);
+    public static Table<UserRow> Users { get; } = new Table<UserRow>("users", null!);
-    public static Table Roles { get; } = new Table("roles", null!);
+    public static Table<RoleRow> Roles { get; } = new Table<RoleRow>("roles", null!);
-    public static Table Logs { get; } = new Table("logs", null!);
+    public static Table<LogRow> Logs { get; } = new Table<LogRow>("logs", null!);
-    public static Table Files { get; } = new Table("files", null!);
+    public static Table<FileRow> Files { get; } = new Table<FileRow>("files", null!);
-    public static Table Categories { get; } = new Table("categories", null!);
+    public static Table<CategoryRow> Categories { get; } = new Table<CategoryRow>("categories", null!);
-    public static Table Channels { get; } = new Table("channels", null!);
+    public static Table<ChannelRow> Channels { get; } = new Table<ChannelRow>("channels", null!);
-    public static Table Messages { get; } = new Table("messages", null!);
+    public static Table<MessageRow> Messages { get; } = new Table<MessageRow>("messages", null!);
-    public static Table ServerRoleOverides { get; } = new Table("role_overides", null!);
+    public static Table<ServerRoleOverideRow> ServerRoleOverides { get; } = new Table<ServerRoleOverideRow>("role_overides", null!);
-    public static Table UserRoleOverides { get; } = new Table("user_overides", null!);
+    public static Table<UserRoleOverideRow> UserRoleOverides { get; } = new Table<UserRoleOverideRow>("user_overides", null!);
-    public static Table SessionTokens { get; } = new Table("session_tokens", null!);
+    public static Table<SessionTokenRow> SessionTokens { get; } = new Table<SessionTokenRow>("session_tokens", null!);
 }

LuskiServer/Classes/WebTypes/File.cs

@@ -1,11 +1,16 @@
 using System.Security.Cryptography;
 using JacobTechEncryption;
+using JacobTechEncryption.Enums;
 
 namespace LuskiServer.Classes.WebTypes;
 
 public class File
 {
     public string name { get; set; } = default!;
+    public EncoderType encoder_type { get; set; } = default!;
+    public EncoderType name_encoder_type { get; set; } = default!;
+    public EncryptionType encryption_type { get; set; } = default!;
+    public EncryptionType name_encryption_type { get; set; } = default!;
     public string[] data { get; set; } = default!;
     public ulong? size { get; set; } = default!;
     public long? id { get; set; } = default!;

LuskiServer/Classes/WebTypes/SocketMessage.cs

@@ -1,3 +1,5 @@
+using JacobTechEncryption.Enums;
+
 namespace LuskiServer.Classes.WebTypes;
 
 public class SocketMessage : HTTPResponse
@@ -6,5 +8,7 @@ public class SocketMessage : HTTPResponse
     public long user_id { get; set; } = default!;
     public long id { get; set; } = default!;
     public string content { get; set; } = default!;
+    public EncryptionType encryption_type { get; set; } = default!;
+    public EncoderType encoder_type { get; set; } = default!;
     public File[] files { get; set; } = default!;
 }

LuskiServer/Controllers/v1/SocketBulkMessageController.cs

@@ -1,6 +1,4 @@
 using Asp.Versioning;
-using JacobTechEncryption;
-using JacobTechEncryption.Enums;
 using LuskiServer.Classes;
 using LuskiServer.Classes.TableDef;
 using LuskiServer.Classes.WebTypes;
@@ -54,89 +52,54 @@ public class SocketBulkMessageController : ControllerBase
                 }
             }
             SocketBulkMessage all = new();
-            ///StartDatabse(MessagesToDownload, Channel_Id, MostRecentID, sign, out SocketMessage[]? mmm);
             SocketMessage[]? mmm = null;
             if (MostRecentID != null)
             {
-                var con2 = Luski.Database.CreateConnection();
+                MessageRow[] rawmsgs = Tables.Messages.ReadRows((uint)MessagesToDownload,
-                con2.Open();
+                    new Order() { Assending = false, Type = Messages.TimeStamp.Name },
-                var cmd2 = con2.CreateCommand();
+                    Messages.TimeStamp.CreateParameter(new Luski.Snowflake(long.Parse(MostRecentID)).Timestamp, sign),
-                Console.WriteLine($"SELECT context,author_id,message_id,files FROM messages WHERE ts {sign} '{new Luski.Snowflake(long.Parse(MostRecentID)).Timestamp}' AND channel_id = '{Channel_Id}' ORDER BY ts DESC LIMIT {MessagesToDownload};");
+                    Messages.ChannelID.CreateParameter(Channel_Id));
-                cmd2.CommandText = $"SELECT context,author_id,message_id,files FROM messages WHERE ts {sign} '{new Luski.Snowflake(long.Parse(MostRecentID)).Timestamp}' AND channel_id = '{Channel_Id}' ORDER BY ts DESC LIMIT {MessagesToDownload};";
+
-                var reader2 = cmd2.ExecuteReader();
+                List<SocketMessage> mmmm = new List<SocketMessage>();
-                //Loop(Messages, Channel_Id, out mmm, reader);
+
-                long current = 0;
+                foreach (MessageRow Row in rawmsgs)
-                var  mmmm = new List<SocketMessage>();
-                while (reader2.Read())
                 {
-                    current++;
+                    SocketMessage temp = new()
-                    if (current <= MessagesToDownload)
                     {
-                        SocketMessage Current = new();
+                        content = Convert.ToBase64String(Row.Context),
-                        //ReadRow(Channel_Id, reader, ref mmm);
+                        encoder_type = Row.EncoderType,
-                        Current.channel_id = Channel_Id;
+                        encryption_type = Row.EncryptionType,
-                        int i2 = 0;
+                        channel_id = Row.ChannelID,
-                        while (i2 < reader2.FieldCount)
+                        user_id = Row.AuthorID,
+                        id = Row.ID,
+                        files = Array.Empty<Classes.WebTypes.File>()
+                    };
+                    if (Row.Files.Any())
+                    {
+                        List<Classes.WebTypes.File> list = new();
+                        foreach (long b in Row.Files)
                         {
-                            //ReadCollume(reader.GetValue(i), ref msg, reader.GetName(i));
+                            FileRow fileraw = Tables.Files.ReadRow(Files.ID.CreateParameter(b));
-                            string name = reader2.GetName(i2);
+                            Classes.WebTypes.File file = new()
-                            object val = reader2.GetValue(i2);
-                            if (name == "context") Current.content = Convert.ToBase64String((byte[])val);
-                            else if (name == "author_id") Current.user_id = long.Parse(val.ToString());
-                            else if (name == "message_id") Current.id = long.Parse(val.ToString());
-                            else if (name == "files")
                             {
-                                if (val is not DBNull)
+                                data = null!,
-                                {
+                                id = b,
-                                    if ((long[]?)val is not null && ((long[])val).Length > 0)
+                                name = Convert.ToBase64String(fileraw.Name),
-                                    {
+                                size = ulong.Parse(fileraw.Size.ToString()),
-                                        List<Classes.WebTypes.File> list = new();
+                                name_encoder_type = fileraw.NameEncoderType,
-                                        foreach (long b in (long[])val)
+                                name_encryption_type = fileraw.NameEncryptionType,
-                                        {
+                                encoder_type = fileraw.EncoderType,
-                                            var con = Luski.Database.CreateConnection();
+                                encryption_type = fileraw.EncryptionType
-                                            con.Open();
+                            };
-                                            var cmd = con.CreateCommand();
+                            list.Add(file);
-                                            cmd.CommandText = $"SELECT name,size FROM files WHERE id = '{b}';";
-                                            var reader = cmd.ExecuteReader();
-                                            int i3 = 0;
-                                            Classes.WebTypes.File file = new()
-                                            {
-                                                data = null!,
-                                                id = b
-                                            };
-                                            while (reader.Read())
-                                            {
-                                                while (i3 < reader.FieldCount)
-                                                {
-                                                    //ReadFileCollume(reader.GetValue(i), ref file, reader.GetName(i));
-                                                    string name2 = reader2.GetName(i3);
-                                                    object val2 = reader2.GetValue(i3);
-                                                    if (name2 == "name") file.name = Convert.ToBase64String((byte[])val2);
-                                                    else if (name2 == "size") file.size = ulong.Parse(val2.ToString());
-                                                    else;
-                                                    i3++;
-                                                }
-                                                if (i3 >= reader.FieldCount) break;
-                                            }
-                        
-                                            list.Add(file);
-                                            con.Close();
-                                        }
-                                        Current.files = list.ToArray();
-                                    }
-                                }
-                            }
-                            i2++;
                         }
-                        if (mmm == null) break;
+
-                        mmmm.Add(Current);
+                        temp.files = list.ToArray();
                     }
-                    else break;
+                    mmmm.Add(temp);
                 }
-                mmm = mmmm.ToArray();
-                con2.Close();
             }
-            
+
             if (mmm is not null) all.messages = mmm;
             else all.messages = Array.Empty<SocketMessage>();
             return this.ResponseToResult(all);

LuskiServer/LuskiServer.csproj

@@ -4,6 +4,7 @@
         <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
+        <IncludeBuildOutput>true</IncludeBuildOutput>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -22,7 +23,8 @@
         <PackageReference Include="JacobTechEncryption" Version="1.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.3" />
         <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-        <PackageReference Include="ServerDatabase" Version="2.5.8" />
+        <PackageReference Include="ServerDatabase" Version="2.7.5" />
+        <PackageReference Include="ServerDatabase.SourceGenerator" Version="1.0.1" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
         <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
     </ItemGroup>

LuskiServer/Program.cs

@@ -9,6 +9,7 @@ using LuskiServer.Enums;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using ServerDatabase;
+using ServerDatabase.Utils;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 [assembly: Microsoft.AspNetCore.Mvc.ApiController]
@@ -26,19 +27,19 @@ try
     Luski.Database.ExecuteNonQuery($"CREATE DATABASE {Luski.Config.Database} WITH OWNER = {Luski.Config.Username} ENCODING = 'UTF8' CONNECTION LIMIT = -1 IS_TEMPLATE = False;");
     Console.WriteLine("Database Created");
 }
-catch (Exception e)
+catch
 {
     Console.WriteLine("Database Found");
 }
 
 foreach (PropertyInfo prop in typeof(Tables).GetProperties())
 {
-    Table table = (Table)prop.GetValue(null)!;
+    ITable table = (ITable)prop.GetValue(null)!;
     table.DatabaseHandler = Luski.Database;
     Type t = Type.GetType($"LuskiServer.Classes.TableDef.{prop.Name}")!;
     foreach(PropertyInfo prop2 in t.GetProperties())
     {
-        table.WithColumn((ITableColumn)prop2.GetValue(null)!);
+        table.AddColumn((ITableColumn)prop2.GetValue(null)!, prop2.Name);
     }
     Luski.Database.Tables.Add(table);
 }