Reworked the queue items.

Reviewed-on: #17

Backend/Handler/ContentFilter.cs

@@ -8,7 +8,8 @@ namespace Backend.Handler;
 
 public class ContentFilter
 {
-    private readonly ConcurrentQueue<QueueItem> _queue;
+    private readonly ConcurrentQueue<Filtered> _queue;
+    private readonly ConcurrentQueue<UnfilteredQueueItem> _unfilteredQueue;
     private readonly DbHandler _dbHandler;
     private readonly string _getDomainPort80;
     private readonly string _getDomainPort443;
@@ -16,12 +17,13 @@ public class ContentFilter
     private int _timeOut;
     private readonly string _basePath;
     
-    public ContentFilter(ConcurrentQueue<QueueItem> queue, DbHandler dbHandler, string basePath)
+    public ContentFilter(ConcurrentQueue<Filtered> queue, ConcurrentQueue<UnfilteredQueueItem> unfilteredQueue, DbHandler dbHandler, string basePath)
     {
         _queue = queue;
         _dbHandler = dbHandler;
         _basePath = basePath;
-        
+        _unfilteredQueue = unfilteredQueue;
+
         _getDomainPort80 = $"{basePath}/Backend/Scripts/GetDomainNamePort80.sh";
         _getDomainPort443 = $"{basePath}/Backend/Scripts/GetDomainNamePort443.sh";
         
@@ -55,37 +57,33 @@ public class ContentFilter
             {
                 if (_stop) break;
                 
-                Unfiltered? unfiltered = _dbHandler.ReadUnfilteredWithId(i);
+                Unfiltered unfiltered = _dbHandler.ReadUnfilteredWithId(i);
                 
-                if (unfiltered is null || unfiltered.Filtered == 1) continue;
+                if (unfiltered.Filtered) continue;
                 
-                unfiltered.Filtered = 1;
+                Ip ip = unfiltered.Ip;
                 
-                QueueItem superUnfilteredObject = new()
+                unfiltered.Filtered = true;
+                
+                UnfilteredQueueItem superUnfilteredObject = new()
                 {
                     Unfiltered = unfiltered,
                     Operations = Operations.Update
                 };
                 
-                _queue.Enqueue(superUnfilteredObject);
+                _unfilteredQueue.Enqueue(superUnfilteredObject);
                 
-                if (_dbHandler.GetFilteredIp(unfiltered.Ip))
+                if (_dbHandler.FilteredIpExists(unfiltered.Ip))
                 {
                     continue;
                 }
                 
-                Filtered filtered = GetSiteData(unfiltered.Ip);
+                Filtered filtered = GetSiteData(ip);
                 
                 filtered.Port1 = unfiltered.Port1;
                 filtered.Port2 = unfiltered.Port2;
                 
-                QueueItem superFilteredObject = new()
+                _queue.Enqueue(filtered);
-                {
-                    Filtered = filtered,
-                    Operations = Operations.Insert
-                };
-                
-                _queue.Enqueue(superFilteredObject);
             }
             
             Thread.Sleep(_timeOut);
@@ -94,7 +92,7 @@ public class ContentFilter
         ((EventWaitHandle) obj).Set();
     }
     
-    private Filtered GetSiteData(string ip)
+    private Filtered GetSiteData(Ip ip)
     {
         StartProcess(ip, 80);
         StartProcess(ip, 443);
@@ -222,7 +220,7 @@ public class ContentFilter
         return siteData;
     }
     
-    private void StartProcess(string ip, int port)
+    private void StartProcess(Ip ip, int port)
     {
         string fileName = port == 80 ? _getDomainPort80 : _getDomainPort443;
         
@@ -230,7 +228,7 @@ public class ContentFilter
         proc.StartInfo = new()
         {
             FileName = "/bin/bash",
-            Arguments = $"{fileName} {ip} {_basePath}/Backend/Scripts/{port}Header.txt",
+            Arguments = $"{fileName} {ip.Ip1}.{ip.Ip2}.{ip.Ip3}.{ip.Ip4} {_basePath}/Backend/Scripts/{port}Header.txt",
             UseShellExecute = false,
             RedirectStandardOutput = false,
             RedirectStandardError = false,

Backend/Handler/IpScanner.cs

@@ -17,18 +17,22 @@ public class ScanSettings
 
 public class IpScanner
 {
-    private readonly ConcurrentQueue<QueueItem> _queue;
     private readonly ConcurrentQueue<Discarded> _discardedQueue;
+    private readonly ConcurrentQueue<UnfilteredQueueItem> _unfilteredQueue;
+    private readonly ConcurrentQueue<ScannerResumeObject> _resumeQueue;
     private readonly DbHandler _dbHandler;
     private bool _stop;
     private int _timeout;
     
-    public IpScanner(ConcurrentQueue<QueueItem> queue, DbHandler dbHandler, ConcurrentQueue<Discarded> discardedQueue)
+    public IpScanner(ConcurrentQueue<UnfilteredQueueItem> unfilteredQueue, ConcurrentQueue<Discarded> discardedQueue,
+        ConcurrentQueue<ScannerResumeObject> resumeQueue, DbHandler dbHandler
+        )
     {
-        _queue = queue;
         _dbHandler = dbHandler;
         _discardedQueue = discardedQueue;
-        
+        _unfilteredQueue = unfilteredQueue;
+        _resumeQueue = resumeQueue;
+
         SetTimeout(128);
     }
     
@@ -127,16 +131,22 @@ public class IpScanner
                             resumeObject.FourthByte = l;
                             break;
                         }
-                        
+
-                        string ip = $"{i}.{j}.{k}.{l}";
+                        Ip ip = new()
-                        
+                        {
+                            Ip1 = i,
+                            Ip2 = j,
+                            Ip3 = k,
+                            Ip4 = l
+                        };
+
                         IPStatus responseCode = IPStatus.Unknown;
                         
                         try
                         {
                             // Sometimes, if the pinger gets a Destination Unreachable Communication administratively prohibited response, the pinger will throw an exception.
                             // https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol?useskin=vector#Control_messages
-                            _ = IPAddress.TryParse(ip, out IPAddress? address);
+                            _ = IPAddress.TryParse(ip.ToString(), out IPAddress? address);
                             if (address is not null)
                             {
                                 responseCode = ping.Send(address, _timeout, buf, null).Status;
@@ -153,7 +163,7 @@ public class IpScanner
                             continue;
                         }
                         
-                        (int, int) ports = TcpClientHelper.CheckPort(ip, 80, 443);
+                        (int, int) ports = TcpClientHelper.CheckPort(ip.ToString(), 80, 443);
                         
                         if (ports is { Item1: 0, Item2: 0 })
                         {
@@ -161,7 +171,7 @@ public class IpScanner
                             continue;
                         }
                         
-                        _queue.Enqueue(CreateUnfilteredQueueItem(ip, (int)responseCode, ports));
+                        _unfilteredQueue.Enqueue(CreateUnfilteredQueueItem(ip, ports));
                     }
                     
                     if (_stop)
@@ -186,46 +196,35 @@ public class IpScanner
             //Console.WriteLine($"Thread ({scanSettings.ThreadNumber}) is at index ({i}) out of ({scanSettings.End}). Remaining ({scanSettings.End - i})");
         }
         
-        QueueItem resume = new()
+        _resumeQueue.Enqueue(resumeObject);
-        {
-            ResumeObject = resumeObject,
-            Operations = Operations.Insert
-        };
-        
-        _queue.Enqueue(resume);
         
         scanSettings.Handle!.Set();
     }
     
-    private static Discarded CreateDiscardedQueueItem(string ip, int responseCode)
+    private static Discarded CreateDiscardedQueueItem(Ip ip, int responseCode)
     {
-        Discarded discarded = new()
+        return new()
         {
             Ip = ip,
             ResponseCode = responseCode
         };
-        
-        return discarded;
     }
     
-    private static QueueItem CreateUnfilteredQueueItem(string ip, int responseCode, (int, int) ports)
+    private static UnfilteredQueueItem CreateUnfilteredQueueItem(Ip ip, (int, int) ports)
     {
         Unfiltered unfiltered = new()
         {
             Ip = ip,
-            ResponseCode = responseCode,
             Port1 = ports.Item1,
             Port2 = ports.Item2,
-            Filtered = 0
+            Filtered = false
         };
         
-        QueueItem superUnfilteredObject = new()
+        return new()
         {
             Unfiltered = unfiltered,
             Operations = Operations.Insert
         };
-        
-        return superUnfilteredObject;
     }
     
     public void Stop()

Backend/Handler/ThreadHandler.cs

@@ -17,12 +17,14 @@ public class ThreadHandler
     
     public ThreadHandler(string path)
     {
-        ConcurrentQueue<QueueItem> contentQueue = new();
+        ConcurrentQueue<Filtered> filteredQueue = new();
         ConcurrentQueue<Discarded> discardedQueue = new();
+        ConcurrentQueue<UnfilteredQueueItem> unfilteredQueue = new();
+        ConcurrentQueue<ScannerResumeObject> scannerResumeQueue = new();
         
-        _dbHandler = new(contentQueue, discardedQueue, path);
+        _dbHandler = new(filteredQueue, discardedQueue, unfilteredQueue, scannerResumeQueue, path);
-        _ipScanner = new(contentQueue, _dbHandler, discardedQueue);
+        _ipScanner = new(unfilteredQueue, discardedQueue, scannerResumeQueue, _dbHandler);
-        _contentFilter = new(contentQueue, _dbHandler, path);
+        _contentFilter = new(filteredQueue, unfilteredQueue, _dbHandler, path);
         _communication = new(_dbHandler, this, _ipScanner, _contentFilter, path);
     }
     
@@ -32,26 +34,32 @@ public class ThreadHandler
         Thread indexer = new(StartContentFilter);
         Thread database = new(StartDbHandler);
         Thread discarded = new(StartDiscardedDbHandler);
+        Thread filtered = new(StartFilteredDbHandler);
+        Thread resume = new(StartResumeDbHandler);
         Thread communication = new(StartCommunicationHandler);
         
         scanner.Start();
         indexer.Start();
         database.Start();
         discarded.Start();
+        filtered.Start();
+        resume.Start();
         communication.Start();
         
         scanner.Join();
         indexer.Join();
         database.Join();
         discarded.Join();
+        filtered.Join();
+        resume.Join();
         communication.Join();
     }
     
     private void StartScanner()
     {
-        Thread.Sleep(10000); // Let the database handler instantiate and warm up first.
+        Thread.Sleep(5000); // Let the database handler instantiate and warm up first.
         
-        WaitHandle[] wait = _ipScanner.Start(4);
+        WaitHandle[] wait = _ipScanner.Start(64);
         
         WaitHandle.WaitAll(wait);
         
@@ -73,7 +81,17 @@ public class ThreadHandler
     
     private void StartDbHandler()
     {
-        _dbHandler.StartContent();
+        _dbHandler.UnfilteredDbHandler();
+    }
+
+    private void StartFilteredDbHandler()
+    {
+        _dbHandler.FilteredDbHandler();
+    }
+
+    private void StartResumeDbHandler()
+    {
+        _dbHandler.ResumeDbHandler();
     }
     
     private void StartDiscardedDbHandler()

Backend/Helper/HttpClientHelper.cs

@@ -1,3 +1,5 @@
+using System.Diagnostics;
+
 namespace Backend.Helper;
 
 public static class HttpClientHelper
@@ -16,6 +18,7 @@ public static class HttpClientHelper
         }
         
         client.DefaultRequestHeaders.Accept.Clear();
+        client.Timeout = TimeSpan.FromSeconds(30);
         
         HttpResponseMessage? response = null;
         
@@ -54,8 +57,8 @@ public static class HttpClientHelper
         HttpResponseMessage? response = null;
         
         try
-        {
+        {//
-            response = await client.GetAsync("/robots.txt");
+            response = await client.SendAsync(new(HttpMethod.Head, "/robots.txt"));
         }
         catch
         {

Backend/Sql/DropAndCreateMyDB.sql

@@ -1,19 +0,0 @@
-DROP TABLE Unfiltered;
-DROP TABLE Runtimes;
-
-CREATE TABLE "Unfiltered" (
-	"Id"	INTEGER NOT NULL,
-	"Ip"	TEXT NOT NULL,
-	"ResponseCode"	INTEGER NOT NULL,
-	"Port1"	INTEGER NOT NULL,
-	"Port2"	INTEGER NOT NULL,
-	"Filtered"	INTEGER NOT NULL,
-	CONSTRAINT "PK_Unfiltered" PRIMARY KEY("Id" AUTOINCREMENT)
-);
-
-CREATE TABLE "Runtimes" (
-    "Id" INTEGER NOT NULL CONSTRAINT "PK_Runtimes" PRIMARY KEY AUTOINCREMENT,
-    "StartTime" TEXT NOT NULL,
-    "EndTime" TEXT NOT NULL,
-    "ThreadNumber" INTEGER NOT NULL
-);

Models/Handler/DbHandler.cs

@@ -7,8 +7,10 @@ namespace Models.Handler;
 
 public class DbHandler
 {
-    private readonly ConcurrentQueue<QueueItem> _contentQueue;
+    private readonly ConcurrentQueue<Filtered> _filteredQueue;
+    private readonly ConcurrentQueue<UnfilteredQueueItem> _unfilteredQueue;
     private readonly ConcurrentQueue<Discarded> _discardedQueue;
+    private readonly ConcurrentQueue<ScannerResumeObject> _resumeQueue;
     
     private readonly string _unfilteredConnectionString;
     private readonly string _discardedConnectionString;
@@ -16,16 +18,40 @@ public class DbHandler
     private readonly string _resumeConnectionString;
     private readonly List<string> _discardedConnectionStrings = [];
     
-    private const string InsertStatement = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off; INSERT INTO Unfiltered (Ip, ResponseCode, Port1, Port2, Filtered) VALUES (@ip, @responseCode, @port1, @port2, @filtered)";
+    private const string InsertStatement = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;" +
-    private const string InsertIntoFiltered = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off; INSERT INTO Filtered (Ip, Port1, Port2, Title1, Title2, Description1, Description2, Url1, Url2, ServerType1, ServerType2, RobotsTXT1, RobotsTXT2, HttpVersion1, HttpVersion2, CertificateIssuerCountry, CertificateOrganizationName, IpV6, TlsVersion, CipherSuite, KeyExchangeAlgorithm, PublicKeyType1, PublicKeyType2, PublicKeyType3, AcceptEncoding1, AcceptEncoding2, ALPN, Connection1, Connection2) VALUES (@ip, @port1, @port2, @title1, @title2, @description1, @description2, @url1, @url2, @serverType1, @serverType2, @robotsTXT1, @robotsTXT2, @httpVersion1, @httpVersion2, @certificateIssuerCountry, @certificateOrganizationName, @ipV6, @tlsVersion, @cipherSuite, @keyExchangeAlgorithm, @publicKeyType1, @publicKeyType2, @publicKeyType3, @acceptEncoding1, @acceptEncoding2, @aLPN, @connection1, @connection2)";
+                                           " PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off;" +
-    private const string InsertIntoDiscarded = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off; INSERT INTO Discarded (Ip, ResponseCode) VALUES (@ip, @responseCode)";
+                                           " INSERT INTO Unfiltered (Ip1, Ip2, Ip3, Ip4, Port1, Port2, Filtered)" +
-    private const string InsertIntoResume = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY; PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off; INSERT INTO Resume (ThreadNumber, StartRange, EndRange, FirstByte, SecondByte, ThirdByte, FourthByte) VALUES (@threadNumber, @startRange, @endRange, @firstByte, @secondByte, @thirdByte, @fourthByte);";
+                                           " VALUES (@ip1, @ip2, @ip3, @ip4, @port1, @port2, @filtered)";
+    
+    private const string InsertIntoFiltered = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;" +
+                                              " PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off;" +
+                                              " INSERT INTO Filtered (Ip1, Ip2, Ip3, Ip4, Port1, Port2, Title1, Title2," +
+                                              " Description1, Description2, Url1, Url2, ServerType1, ServerType2," +
+                                              " RobotsTXT1, RobotsTXT2, HttpVersion1, HttpVersion2, CertificateIssuerCountry," +
+                                              " CertificateOrganizationName, IpV6, TlsVersion, CipherSuite, KeyExchangeAlgorithm," +
+                                              " PublicKeyType1, PublicKeyType2, PublicKeyType3, AcceptEncoding1, AcceptEncoding2," +
+                                              " ALPN, Connection1, Connection2) VALUES (@ip1, @ip2, @ip3, @ip4, @port1, @port2," +
+                                              " @title1, @title2, @description1, @description2, @url1, @url2, @serverType1," +
+                                              " @serverType2, @robotsTXT1, @robotsTXT2, @httpVersion1, @httpVersion2," +
+                                              " @certificateIssuerCountry, @certificateOrganizationName, @ipV6, @tlsVersion," +
+                                              " @cipherSuite, @keyExchangeAlgorithm, @publicKeyType1, @publicKeyType2," +
+                                              " @publicKeyType3, @acceptEncoding1, @acceptEncoding2, @aLPN, @connection1, @connection2)";
+    
+    private const string InsertIntoDiscarded = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;" +
+                                               " PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off;" +
+                                               " INSERT INTO Discarded (Ip1, Ip2, Ip3, Ip4, ResponseCode)" +
+                                               " VALUES (@ip1, @ip2, @ip3, @ip4, @responseCode)";
+    
+    private const string InsertIntoResume = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;" +
+                                            " PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off;" +
+                                            " INSERT INTO Resume (ThreadNumber, StartRange, EndRange, FirstByte, SecondByte, ThirdByte, FourthByte)" +
+                                            " VALUES (@threadNumber, @startRange, @endRange, @firstByte, @secondByte, @thirdByte, @fourthByte);";
     
     private const string ReadUnfilteredStatement = "SELECT * FROM Unfiltered WHERE Id = @id;";
     private const string ReadUnfilteredIdsStatement = "SELECT Id FROM Unfiltered WHERE Id != 0 ORDER BY Id DESC LIMIT 1;";
     private const string ReadFilteredStatement = "SELECT Title2, Url2 FROM Filtered WHERE (Url2 NOT NULL AND Url2 != '') AND (Title2 NOT NULL AND Title2 != '') ORDER BY Url2 DESC;";
     private const string ReadFilteredIdsStatement = "SELECT Id FROM Filtered WHERE Id != 0 ORDER BY Id DESC LIMIT 1;";
-    private const string ReadFilteredIpStatement = "SELECT Ip FROM Filtered WHERE Ip == @ip ORDER BY Ip DESC LIMIT 1;";
+    private const string ReadFilteredIpStatement = "SELECT Ip1, Ip2, Ip3, Ip4 FROM Filtered WHERE Ip1 == @ip1 AND Ip2 == @ip1 AND Ip3 == @ip1 AND Ip4 == @ip1 ORDER BY Ip1 DESC LIMIT 1;";
     private const string ReadDiscardedSeqIdsStatement = "SELECT seq FROM sqlite_sequence;";
     private const string ReadAndDeleteResumeStatement = "SELECT * FROM Resume WHERE ThreadNumber == @threadNumber; DELETE FROM RESUME WHERE ThreadNumber == @threadNumber;";
     
@@ -47,12 +73,17 @@ public class DbHandler
 
     private readonly string _basePath;
     
-    public DbHandler(ConcurrentQueue<QueueItem> contentQueue, ConcurrentQueue<Discarded> discardedQueue, string basePath)
+    public DbHandler(ConcurrentQueue<Filtered> filteredQueue, 
+        ConcurrentQueue<Discarded> discardedQueue, 
+        ConcurrentQueue<UnfilteredQueueItem> unfilteredQueue,
+        ConcurrentQueue<ScannerResumeObject> resumeQueue, string basePath)
     {
-        _contentQueue = contentQueue;
+        _filteredQueue = filteredQueue;
         _discardedQueue = discardedQueue;
-        
+        _unfilteredQueue = unfilteredQueue;
-        SetContentWaitTime(10);
+        _resumeQueue = resumeQueue;
+
+        SetContentWaitTime(100);
         SetDiscardedWaitTime(10);
         
         _basePath = basePath;
@@ -73,41 +104,78 @@ public class DbHandler
         _discardedWaitTime = waitTime;
     }
     
-    public void StartContent()
+    public void UnfilteredDbHandler()
     {
-        Console.WriteLine("Content DbHandler started");
+        Console.WriteLine("Unfiltered DbHandler started");
         
         while (!_stop)
         {
-            if (_contentQueue.IsEmpty || _pause)
+            if (_unfilteredQueue.IsEmpty || _pause)
             {
                 Thread.Sleep(_contentWaitTime);
                 _paused = true;
                 continue;
             }
             
-            _contentQueue.TryDequeue(out QueueItem? queueItem);
+            _unfilteredQueue.TryDequeue(out UnfilteredQueueItem queueItem);
             
-            if (queueItem is null) { continue; }
+            if (queueItem.Operations == Operations.Insert)
-            
-            switch (queueItem.Operations)
             {
-                case Operations.Insert when queueItem.Unfiltered is not null:
+                InsertUnfiltered(queueItem.Unfiltered);
-                    InsertUnfiltered(queueItem.Unfiltered);
+            }
-                    break;
+            
-                case Operations.Insert when queueItem.Filtered is not null:
+            else if (queueItem.Operations == Operations.Update)
-                    InsertFiltered(queueItem.Filtered);
+            {
-                    break;
+                UpdateUnfiltered(queueItem.Unfiltered);
-                case Operations.Insert when queueItem.ResumeObject is not null:
-                    InsertResumeObject(queueItem.ResumeObject);
-                    break;
-                case Operations.Update when queueItem.Unfiltered is not null:
-                    UpdateUnfiltered(queueItem.Unfiltered);
-                    break;
             }
         }
         
-        Console.WriteLine("Content DbHandler stopped.");
+        Console.WriteLine("Unfiltered DbHandler stopped.");
+    }
+    
+    public void FilteredDbHandler()
+    {
+        Console.WriteLine("Filtered DB handler started");
+        
+        while (!_stop)
+        {
+            if (_filteredQueue.IsEmpty || _pause)
+            {
+                Thread.Sleep(_contentWaitTime);
+                _paused = true;
+                continue;
+            }
+            
+            _filteredQueue.TryDequeue(out Filtered? queueItem);
+            
+            InsertFiltered(queueItem!);
+        }
+        
+        Console.WriteLine("Filtered DbHandler stopped.");
+    }
+    
+    public void ResumeDbHandler()
+    {
+        Console.WriteLine("Resume DB handler started");
+        
+        while (!_stop)
+        {
+            if (_resumeQueue.IsEmpty || _pause)
+            {
+                Thread.Sleep(_contentWaitTime);
+                _paused = true;
+                continue;
+            }
+            
+            _resumeQueue.TryDequeue(out ScannerResumeObject? queueItem);
+            
+            if (queueItem is not null)
+            {
+                InsertResumeObject(queueItem);
+            }
+        }
+        
+        Console.WriteLine("Resume DbHandler stopped.");
     }
     
     public WaitHandle[] Start(int threads)
@@ -126,7 +194,7 @@ public class DbHandler
             
             waitHandles[i] = handle;
             
-            Thread f = new (RunDiscarded!);
+            Thread f = new (DiscardedDbHandler!);
             f.Start(discardedDbHandlerSetting);
             
             Thread.Sleep(1000);
@@ -135,7 +203,7 @@ public class DbHandler
         return waitHandles;
     }
     
-    private void RunDiscarded(object obj)
+    private void DiscardedDbHandler(object obj)
     {
         DiscardedDbHandlerSetting discardedDbHandlerSetting = (DiscardedDbHandlerSetting)obj;
         Console.WriteLine($"Discarded DbHandler started with thread: ({discardedDbHandlerSetting.ThreadId})");
@@ -151,16 +219,14 @@ public class DbHandler
                 continue;
             }
             
-            _discardedQueue.TryDequeue(out Discarded? queueItem);
+            _discardedQueue.TryDequeue(out Discarded queueItem);
-            
-            if (queueItem is null) { continue; }
             
             InsertDiscarded(queueItem, connectionString);
         }
         
         discardedDbHandlerSetting.Handle!.Set();
         
-        Console.WriteLine("Content DbHandler stopped.");
+        Console.WriteLine("Discarded DbHandler stopped.");
     }
     
     private void InsertUnfiltered(Unfiltered unfiltered)
@@ -170,8 +236,10 @@ public class DbHandler
         
         using SqliteCommand command = new(InsertStatement, connection);
         
-        command.Parameters.AddWithValue("@ip", unfiltered.Ip);
+        command.Parameters.AddWithValue("@ip1", unfiltered.Ip.Ip1);
-        command.Parameters.AddWithValue("@responseCode", unfiltered.ResponseCode);
+        command.Parameters.AddWithValue("@ip2", unfiltered.Ip.Ip2);
+        command.Parameters.AddWithValue("@ip3", unfiltered.Ip.Ip3);
+        command.Parameters.AddWithValue("@ip4", unfiltered.Ip.Ip4);
         command.Parameters.AddWithValue("@port1", unfiltered.Port1);
         command.Parameters.AddWithValue("@port2", unfiltered.Port2);
         command.Parameters.AddWithValue("@filtered", unfiltered.Filtered);
@@ -187,7 +255,10 @@ public class DbHandler
         
         using SqliteCommand command = new(InsertIntoDiscarded, connection);
         
-        command.Parameters.AddWithValue("@ip", discarded.Ip);
+        command.Parameters.AddWithValue("@ip1", discarded.Ip.Ip1);
+        command.Parameters.AddWithValue("@ip2", discarded.Ip.Ip2);
+        command.Parameters.AddWithValue("@ip3", discarded.Ip.Ip3);
+        command.Parameters.AddWithValue("@ip4", discarded.Ip.Ip4);
         command.Parameters.AddWithValue("@responseCode", discarded.ResponseCode);
         _ = command.ExecuteNonQuery();
         
@@ -201,7 +272,10 @@ public class DbHandler
         
         using SqliteCommand command = new(InsertIntoFiltered, connection);
         
-        command.Parameters.AddWithValue("@ip", filtered.Ip);
+        command.Parameters.AddWithValue("@ip1", filtered.Ip.Ip1);
+        command.Parameters.AddWithValue("@ip2", filtered.Ip.Ip2);
+        command.Parameters.AddWithValue("@ip3", filtered.Ip.Ip3);
+        command.Parameters.AddWithValue("@ip4", filtered.Ip.Ip4);
         command.Parameters.AddWithValue("@port1", filtered.Port1);
         command.Parameters.AddWithValue("@port2", filtered.Port2);
         command.Parameters.AddWithValue("@url1", filtered.Url1);
@@ -267,7 +341,7 @@ public class DbHandler
         connection.Close();
     }
     
-    public Unfiltered? ReadUnfilteredWithId(long id)
+    public Unfiltered ReadUnfilteredWithId(long id)
     {
         using SqliteConnection connection = new(_unfilteredConnectionString);
         connection.Open();
@@ -276,19 +350,25 @@ public class DbHandler
         command.Parameters.AddWithValue("@id", id);
         
         using SqliteDataReader reader = command.ExecuteReader();
-        if (!reader.HasRows) return null;
+        if (!reader.HasRows) return new();
         
         Unfiltered unfiltered = new();
+        Ip ip = new();
         
         while (reader.Read())
         {
             unfiltered.Id = reader.GetInt32(0);
-            unfiltered.Ip = reader.GetString(1);
+            ip.Ip1 = reader.GetInt32(1);
-            unfiltered.Port1 = reader.GetInt32(3);
+            ip.Ip2 = reader.GetInt32(2);
-            unfiltered.Port2 = reader.GetInt32(4);
+            ip.Ip3 = reader.GetInt32(3);
-            unfiltered.Filtered = reader.GetInt32(5);
+            ip.Ip4 = reader.GetInt32(4);
+            unfiltered.Port1 = reader.GetInt32(5);
+            unfiltered.Port2 = reader.GetInt32(6);
+            unfiltered.Filtered = reader.GetBoolean(7);
         }
         
+        unfiltered.Ip = ip;
+        
         return unfiltered;
     }
     
@@ -364,13 +444,16 @@ public class DbHandler
         return rowId;
     }
 
-    public bool GetFilteredIp(string ip)
+    public bool FilteredIpExists(Ip ip)
     {
         using SqliteConnection connection = new(_filteredConnectionString);
         connection.Open();
         
         using SqliteCommand command = new(ReadFilteredIpStatement, connection);
-        command.Parameters.AddWithValue("@ip", ip);
+        command.Parameters.AddWithValue("@ip1", ip.Ip1);
+        command.Parameters.AddWithValue("@ip2", ip.Ip2);
+        command.Parameters.AddWithValue("@ip3", ip.Ip3);
+        command.Parameters.AddWithValue("@ip4", ip.Ip4);
         
         using SqliteDataReader reader = command.ExecuteReader();
         
@@ -379,14 +462,37 @@ public class DbHandler
             return false;
         }
         
-        string ipAddress = "";
+        Ip tempIp = new();
         
         while (reader.Read())
         {
-            ipAddress = reader.GetString(0);
+            tempIp.Ip1 = reader.GetInt32(0);
+            tempIp.Ip2 = reader.GetInt32(1);
+            tempIp.Ip3 = reader.GetInt32(2);
+            tempIp.Ip4 = reader.GetInt32(3);
         }
         
-        return ipAddress == ip;
+        if (tempIp.Ip1 != ip.Ip1)
+        {
+            return false;
+        }
+        
+        if (tempIp.Ip2 != ip.Ip2)
+        {
+            return false;
+        }
+        
+        if (tempIp.Ip3 != ip.Ip3)
+        {
+            return false;
+        }
+        
+        if (tempIp.Ip4 != ip.Ip4)
+        {
+            return false;
+        }
+        
+        return true;
     }
     
     public List<SearchResult?> GetSearchResults()
@@ -534,7 +640,7 @@ public class DbHandler
     {
         string databaseName = $"Data Source={_basePath}/Models/Discarded{threadNumber}.db";
         
-        const string createStatement = "CREATE TABLE IF NOT EXISTS Discarded (Id INTEGER NOT NULL, Ip TEXT NOT NULL, ResponseCode INTEGER NOT NULL, PRIMARY KEY(Id AUTOINCREMENT))";
+        const string createStatement = "CREATE TABLE IF NOT EXISTS Discarded (Id INTEGER NOT NULL, Ip1 TEXT NOT NULL, Ip2 TEXT NOT NULL, Ip3 TEXT NOT NULL, Ip4 TEXT NOT NULL, ResponseCode INTEGER NOT NULL, PRIMARY KEY(Id AUTOINCREMENT))";
 
         _discardedConnectionStrings.Add(databaseName);
         

Models/Model/Backend/Discarded.cs

@@ -1,7 +1,8 @@
 namespace Models.Model.Backend;
 
-public class Discarded
+public struct Discarded
 {
-    public string Ip { get; set; } = "";
+    public Ip Ip { get; set; }
+    
     public int ResponseCode { get; set; }
 }

Models/Model/Backend/Filtered.cs

@@ -2,7 +2,7 @@ namespace Models.Model.Backend;
 
 public class Filtered
 {
-    public string Ip { get; set; } = "";
+    public Ip Ip { get; set; }
     public string Title1 { get; set; } = "";
     public string Title2 { get; set; } = "";
     public string Description1 { get; set; } = "";

Models/Model/Backend/IP.cs

@@ -0,0 +1,17 @@
+namespace Models.Model.Backend;
+
+public struct Ip
+{
+    public int Ip1 { get; set; }
+    
+    public int Ip2 { get; set; }
+    
+    public int Ip3 { get; set; }
+    
+    public int Ip4 { get; set; }
+
+    public override string ToString()
+    {
+        return $"{Ip1}.{Ip2}.{Ip3}.{Ip4}";
+    }
+}

Models/Model/Backend/Operations.cs

@@ -4,5 +4,4 @@ public enum Operations
 {
     Insert,
     Update,
-    Optimize,
 }

Models/Model/Backend/QueueItem.cs

@@ -1,9 +0,0 @@
-namespace Models.Model.Backend;
-
-public class QueueItem
-{
-    public Unfiltered? Unfiltered { get; init; }
-    public Filtered? Filtered { get; init; }
-    public ScannerResumeObject? ResumeObject { get; init; }
-    public Operations Operations { get; init; }
-}

Models/Model/Backend/Unfiltered.cs

@@ -1,16 +1,14 @@
 namespace Models.Model.Backend;
 
-public class Unfiltered
+public struct Unfiltered
 {
     public int Id { get; set; }
-
+    
-    public string Ip { get; set; } = "";
+    public Ip Ip { get; set; }
-
+    
-    public int ResponseCode { get; init; }
-
     public int Port1 { get; set; }
-
+    
     public int Port2 { get; set; }
-
+    
-    public int Filtered { get; set; }
+    public bool Filtered { get; set; }
 }

Models/Model/Backend/UnfilteredQueueItem.cs

@@ -0,0 +1,7 @@
+namespace Models.Model.Backend;
+
+public struct UnfilteredQueueItem
+{
+    public Unfiltered Unfiltered { get; init; }
+    public Operations Operations { get; init; }
+}

Models/Sql/DropAndCreateMyDB.sql

@@ -0,0 +1,13 @@
+DROP TABLE Unfiltered;
+
+CREATE TABLE "Unfiltered" (
+	"Id"	INTEGER NOT NULL,
+	"Ip1"	INTEGER NOT NULL,
+	"Ip2"   INTEGER NOT NULL,
+	"Ip3"   INTEGER NOT NULL,
+	"Ip4"   INTEGER NOT NULL,
+	"Port1"	INTEGER NOT NULL,
+	"Port2"	INTEGER NOT NULL,
+	"Filtered"	INTEGER NOT NULL,
+	CONSTRAINT "PK_Unfiltered" PRIMARY KEY("Id" AUTOINCREMENT)
+)

RSE.sln.DotSettings.user

@@ -2,8 +2,10 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A02000006pdb6Low_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003FILViewer_003Fd17d4b69379a42eb90f15b17ef6c846a5400_003F39_003F1eeed291_003F02000006pdb6Low_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A02000007pdb1Low_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003FILViewer_003F096da63313a8436fb75089601a728c765200_003Fbb_003Ff6383783_003F02000007pdb1Low_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A02000007pdb1Low_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003FILViewer_003F357247e747614c8297021dd08d79da3d5200_003Ff2_003Fc4ae8c87_003F02000007pdb1Low_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A0200000Fpdb2Low_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003FILViewer_003F069d64e89a7540319e3e5355db9fd8fa8600_003Fac_003F604d330e_003F0200000Fpdb2Low_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A02000010pdb3Low_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003FILViewer_003F80cf8253b0c2409096d0c0e368300af28200_003Fdd_003F8098fc19_003F02000010pdb3Low_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A02000011pdb4Low_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003FILViewer_003F1f6cfdd1e3a14f6390237f6ab98b06af8000_003F0d_003Febdca535_003F02000011pdb4Low_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A02000013pdb13Low_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003FILViewer_003F8d5d3174bfdc4554bbaac3d5e7c564a29800_003F64_003F42d93916_003F02000013pdb13Low_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAttributes_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F9a4cb3a98df697f884fa5f45bc79e4291fa3e948c7f42560e14678e12055e_003FAttributes_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAttribute_002ECoreCLR_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fbb9be2cb8efb72a7d2286fbdd10a293b55b3e2a912f49fac6a7719673268e4b_003FAttribute_002ECoreCLR_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AConcurrentQueue_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fb049a159646b52d2dd6ced21de315f79dff86421243e94ffd4f29c6f7e4df25_003FConcurrentQueue_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -11,6 +13,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFormatters_002EMessagePack_002EGeneratedMessagePackResolver_002EModels_002EModel_002EExternal_002ECommunicationObjectFormatter_002Eg_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F5029ca69753a60cb407b1053f5834320dadee066_003FFormatters_002EMessagePack_002EGeneratedMessagePackResolver_002EModels_002EModel_002EExternal_002ECommunicationObjectFormatter_002Eg_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFormatters_002EMessagePack_002EGeneratedMessagePackResolver_002EModels_002EModel_002EExternal_002ESearchResultsFormatter_002Eg_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F99b5d033f8bfb58a6a753ca88a3d956f2228bd48_003FFormatters_002EMessagePack_002EGeneratedMessagePackResolver_002EModels_002EModel_002EExternal_002ESearchResultsFormatter_002Eg_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFuture_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F13cbfe6856867dd1ed4e39575e46d816dae2a146a8ceec8f76b5897f5e0fe_003FFuture_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpClient_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F60038225224a9318597b3232280390933d3c3fe85d9ed859a7e4825915eb1c_003FHttpClient_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpContent_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F5a55e5df9328b51021ba85b8f12ff49eca8772dba9772c0d61d5e28edf255c_003FHttpContent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpMethodAttribute_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F2e4732e712a98f9ac0d080ac68669b3db6d98781e0d5ad89886cb6bcc890b18_003FHttpMethodAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIFormatterResolver_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fc7d856f45ddf907f9face6c2bdba7836cc70fed4bb2b8ebd83ee6917584af3_003FIFormatterResolver_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>