owner/RSE
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'SearchFunction' (#45) from SearchFunction into main

Browse Source 
Reviewed-on: #45
This commit is contained in:
Rasmus Rasmussen 2025-01-16 10:12:41 +00:00
commit 03e7ebe421
10 changed files with 138 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Backend/Handler/IpScanner.cs
View File

@ -32,7 +32,7 @@ public class IpScanner
_discardedQueue = discardedQueue; _discardedQueue = discardedQueue;
_unfilteredQueue = unfilteredQueue; _unfilteredQueue = unfilteredQueue;
_resumeQueue = resumeQueue; _resumeQueue = resumeQueue;
SetTimeout(64); SetTimeout(64);
} }
@ -48,24 +48,12 @@ public class IpScanner
{ {
threadsAmount = 256 / threads; threadsAmount = 256 / threads;
} }
WaitHandle[] waitHandle1; WaitHandle[] waitHandle = new WaitHandle[64];
WaitHandle[] waitHandle2;
// This is jank. But it was to get it production ready.
if (threads <= 64)
{
waitHandle1 = new WaitHandle[threads];
waitHandle2 = new WaitHandle[threads];
}
else
{
waitHandle1 = new WaitHandle[64];
waitHandle2 = new WaitHandle[64];
}
int counter = 0; int counter = 0;
int counter2 = 0;
List<WaitHandle[]> waitHandles = [];
for (int i = 0; i < threads; i++) for (int i = 0; i < threads; i++)
{ {
@ -79,32 +67,27 @@ public class IpScanner
Handle = handle Handle = handle
}; };
if (i < 64) if (counter < 64)
{ {
waitHandle1[counter] = handle; waitHandle[counter] = handle;
counter++; counter++;
}
else Thread f = new (Scan!);
{ f.Start(scanSettings);
waitHandle2[counter2] = handle;
counter2++; Console.WriteLine($"Scanner thread ({i}) started");
Thread.Sleep(100);
continue;
} }
Thread f = new (Scan!); counter = 0;
f.Start(scanSettings);
Console.WriteLine($"Scanner thread ({i}) started"); waitHandles.Add(waitHandle);
Thread.Sleep(100);
waitHandle = new WaitHandle[64];
} }
List<WaitHandle[]> waitHandles = new();
Console.WriteLine("Waithandle 1 count = " + waitHandle1.Length);
Console.WriteLine("Waithandle 2 count = " + waitHandle2.Length);
waitHandles.Add(waitHandle1);
waitHandles.Add(waitHandle2);
return waitHandles; return waitHandles;
} }
@ -183,7 +166,8 @@ public class IpScanner
_ = IPAddress.TryParse(ip.ToString(), out IPAddress? address); _ = IPAddress.TryParse(ip.ToString(), out IPAddress? address);
if (address is not null) if (address is not null)
{ {
responseCode = ping.Send(address, _timeout, buf, null).Status; responseCode = IPStatus.TimedOut; //ping.Send(address, _timeout, buf, null).Status;
Thread.Sleep(_timeout);
} }
} }
catch catch

4
Backend/Handler/ThreadHandler.cs
View File

@ -59,7 +59,7 @@ public class ThreadHandler
{ {
Thread.Sleep(5000); // Let the database handler instantiate and warm up first. Thread.Sleep(5000); // Let the database handler instantiate and warm up first.
List<WaitHandle[]> wait = _ipScanner.Start(128); List<WaitHandle[]> wait = _ipScanner.Start(256);
for (int i = 0; i < wait.Count; i++) for (int i = 0; i < wait.Count; i++)
{ {
@ -101,7 +101,7 @@ public class ThreadHandler
private void StartDiscardedDbHandler() private void StartDiscardedDbHandler()
{ {
WaitHandle[] wait = _dbHandler.Start(4); WaitHandle[] wait = _dbHandler.Start(5);
WaitHandle.WaitAll(wait); WaitHandle.WaitAll(wait);

36
Backend/Helper/HttpClientHelper.cs
View File

@ -18,11 +18,25 @@ public static partial class HttpClientHelper
if (port == 80) if (port == 80)
{ {
client.BaseAddress = new($"http://{url}"); try
{
client.BaseAddress = new($"http://{url}");
}
catch
{
//
}
} }
else else
{ {
client.BaseAddress = new($"https://{url}"); try
{
client.BaseAddress = new($"https://{url}");
}
catch
{
//
}
} }
client.DefaultRequestHeaders.Accept.Clear(); client.DefaultRequestHeaders.Accept.Clear();
@ -87,11 +101,25 @@ public static partial class HttpClientHelper
if (port == 80) if (port == 80)
{ {
client.BaseAddress = new($"http://{url}"); try
{
client.BaseAddress = new($"http://{url}");
}
catch
{
//
}
} }
else else
{ {
client.BaseAddress = new($"https://{url}"); try
{
client.BaseAddress = new($"https://{url}");
}
catch
{
//
}
} }
client.DefaultRequestHeaders.Accept.Clear(); client.DefaultRequestHeaders.Accept.Clear();

4
Proxy/Program.cs
View File

@ -60,7 +60,7 @@ progressApi.MapGet("/", (IMemoryCache memoryCache) =>
return scanningStatus; return scanningStatus;
}); });
/*
RouteGroupBuilder searchApi = app.MapGroup("/search"); RouteGroupBuilder searchApi = app.MapGroup("/search");
searchApi.MapGet("/{term}", (string term) => searchApi.MapGet("/{term}", (string term) =>
{ {
@ -78,7 +78,7 @@ searchApi.MapGet("/{term}", (string term) =>
return JsonSerializer.Deserialize<SearchResults?>(msg); return JsonSerializer.Deserialize<SearchResults?>(msg);
}); });
*/
app.Run(); app.Run();
[JsonSerializable(typeof(ScanningStatus))] [JsonSerializable(typeof(ScanningStatus))]

10
frontend/app.vue
View File

@ -9,8 +9,12 @@ useHead({
</script> </script>
<template> <template>
<NuxtLayout> <div class="navbar navbar-expand-md navbar-dark bg-dark">
<NuxtPage page-key="static" /> <ul>
</NuxtLayout> <li><nuxt-link to="/">Search</nuxt-link></li>
<li><nuxt-link to="/progress">Progress</nuxt-link></li>
</ul>
</div>
<NuxtPage page-key="static" />
</template> </template>

4
frontend/nuxt.config.ts
View File

@ -13,5 +13,9 @@ export default defineNuxtConfig({
}, },
}, },
nitro: {
static: true,
},
modules: ['@nuxtjs/tailwindcss', 'nuxt-purgecss'], modules: ['@nuxtjs/tailwindcss', 'nuxt-purgecss'],
}); });

9
frontend/pages/index.vue
View File

@ -1,12 +1,15 @@
<script setup lang="ts"> <script setup lang="ts">
const route = useRoute() const value = ref<string | null>(null)
// https://nuxt.com/docs/api/components/nuxt-link#nuxtlink
</script> </script>
<template> <template>
<div class="h-screen flex items-center justify-center"> <div class="h-screen flex items-center justify-center">
<div class="flex space-x-2"> <div class="flex space-x-2">
<input placeholder=".NET C#" class="text-center bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg p-2.5 w-192"/> <input v-model="value" placeholder=".NET C#" class="text-center bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg p-2.5 w-192"/>
<button class="text-gray-900 bg-gray-50 border border-gray-300 px-4 py-2 rounded-lg">Search</button> <nuxt-link :to="`/searchResult?search=${value}`" class="text-gray-900 bg-gray-50 border border-gray-300 px-4 py-2 rounded-lg">Search</nuxt-link>
</div> </div>
</div> </div>
</template> </template>

60
frontend/pages/progress.vue
View File

@ -39,23 +39,51 @@ fetchMyData();
<template> <template>
<div class="h-screen grid place-items-center"> <div class="h-screen grid place-items-center">
<div v-if="dict"> <table class="table-auto border-gray-300">
<table class="table-auto border-gray-300"> <thead>
<thead> <tr>
<tr> <th class="px-4 py-2">Metric</th>
<th class="px-4 py-2">Metric</th> <th class="px-4 py-2">Value</th>
<th class="px-4 py-2">Value</th> </tr>
</tr> </thead>
</thead>
<tbody> <tbody v-if="dict">
<tr v-for="d in dict"> <tr v-for="d in dict">
<td class="px-4 py-2">{{d.description}}</td> <td class="px-4 py-2">{{d.description}}</td>
<td class="px-4 py-2">{{d.value}}</td> <td class="px-4 py-2">{{d.value}}</td>
</tr> </tr>
</tbody> </tbody>
</table> <tbody v-else>
</div> <tr>
<td class="px-4 py-2">Percentage of Ipv4 scanned</td>
<td class="px-4 py-2"></td>
</tr>
<tr>
<td class="px-4 py-2">Total filtered</td>
<td class="px-4 py-2"></td>
</tr>
<tr>
<td class="px-4 py-2">Total Discarded</td>
<td class="px-4 py-2"></td>
</tr>
<tr>
<td class="px-4 py-2">Amount of Ipv4 left</td>
<td class="px-4 py-2"></td>
</tr>
<tr>
<td class="px-4 py-2">Discarded db size</td>
<td class="px-4 py-2"></td>
</tr>
<tr>
<td class="px-4 py-2">Filtered db size</td>
<td class="px-4 py-2"></td>
</tr>
<tr>
<td class="px-4 py-2">Unfiltered db size</td>
<td class="px-4 py-2"></td>
</tr>
</tbody>
</table>
</div> </div>
</template> </template>

8
frontend/pages/searchResult.vue Normal file
View File

@ -0,0 +1,8 @@
<script setup lang="ts">
const route = useRoute();
console.log(route.query);
</script>
<template>
</template>

14
frontend/types/global.d.ts vendored
View File

@ -6,12 +6,22 @@ interface ProgressType {
discardedDbSize: bigint; discardedDbSize: bigint;
filteredDbSize: bigint; filteredDbSize: bigint;
myDbSize: bigint; myDbSize: bigint;
} };
interface ProgressDictionary { interface ProgressDictionary {
description: string; description: string;
value: string; value: string;
} };
interface SearchResult {
title: string;
description: string;
url: string;
};
interface SearchResults {
results: SearchResult[];
};
type CacheEntry<T> = { type CacheEntry<T> = {
data: T; data: T;