From abea3f1be9fd251cf85826d61bd109724209b549 Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 4 Jan 2024 01:35:56 +0100 Subject: [PATCH] Add initial /servers route --- src/lib/components/ServerCard.svelte | 79 +++++++++++---------- src/lib/types/data-types.ts | 15 +++- src/routes/data/servers/+server.ts | 10 +++ src/routes/data/services/+server.ts | 2 +- src/routes/servers/+page.server.ts | 62 ++++++++++++++++ src/routes/servers/+page.svelte | 102 +++++++++++++++++++++++++++ static/data/servers.json | 37 +++++----- 7 files changed, 247 insertions(+), 60 deletions(-) diff --git a/src/lib/components/ServerCard.svelte b/src/lib/components/ServerCard.svelte index cc05270..2d06eef 100644 --- a/src/lib/components/ServerCard.svelte +++ b/src/lib/components/ServerCard.svelte @@ -4,14 +4,14 @@ import { OpenInNewWindow } from 'radix-icons-svelte'; import { quintInOut } from 'svelte/easing'; import { slide } from 'svelte/transition'; - import { IconType, type Service } from '$lib/types/data-types'; + import { IconType, type Server } from '$lib/types/data-types'; import { Skeleton } from '$lib/components/ui/skeleton'; import type { Heartbeat } from '$lib/types/uptime-kuma-types'; - let { service, icons, monitor } = $props<{ - service: Service; + let { server, icons, monitor } = $props<{ + server: Server; icons: Array; - monitor: Heartbeat; + monitor?: Heartbeat; }>(); let status = $state(4); @@ -24,32 +24,36 @@ let img_source: string = $state(''); - function checkForImage(service: Service) { - const rootSplit = service.icon.split('/'); + function checkForImage(server: Server) { + const rootSplit = server.icon.split('/'); const root = rootSplit[rootSplit.length - 1]; - if (icons.includes(`${root}.${service.iconType}`)) { - img_source = `${service.icon}.${service.iconType}`; + if (icons.includes(`${root}.${server.iconType}`)) { + img_source = `${server.icon}.${server.iconType}`; } else { img_source = ''; } } $effect(() => { + if (typeof server.id === 'undefined') { + status = 99; + } if (typeof monitor !== 'undefined') { status = monitor.status; } - if (icons.length != 0) { - const rootSplit = service.icon.split('/'); + if (icons.length != 0 && typeof server.icon !== "undefined") { + const rootSplit = server.icon.split('/'); const root = rootSplit[rootSplit.length - 1]; - if (service.iconType === IconType.SVG) { - checkForImage(service); - } else { - if (icons.includes(`${root}-36.${service.iconType}`)) { - img_source = `${service.icon}-36.${service.iconType}`; + if (server.iconType === IconType.SVG) { + checkForImage(server); + } + else { + if (icons.includes(`${root}-36.${server.iconType}`)) { + img_source = `${server.icon}-36.${server.iconType}`; } else { - checkForImage(service); + checkForImage(server); } } } @@ -58,15 +62,16 @@
@@ -75,22 +80,22 @@ on:mouseover={() => (hover.title = true)} on:mouseleave={() => (hover.title = false)} > - {#if service.icon} + {#if typeof server.icon !== "undefined"} {#if img_source != ''} {service.name} Logo {:else} {/if} {:else}{/if} {service.name}{server.name} {#if hover.title}
-

{service.desc}

-

{service.warn}

-
+

{server.desc}

+

{server.warn}

+
(hover.link = true)} on:mouseleave={() => (hover.link = false)} > @@ -160,10 +167,10 @@
{/if} - {#if service.extLink} + {#if server.extLink} (hover.ext = true)} on:mouseleave={() => (hover.ext = false)} > diff --git a/src/lib/types/data-types.ts b/src/lib/types/data-types.ts index 54aafc5..6a395f6 100644 --- a/src/lib/types/data-types.ts +++ b/src/lib/types/data-types.ts @@ -1,7 +1,7 @@ export type Service = { readonly name: string; - readonly icon: string; - readonly iconType: IconType; + readonly icon?: string; + readonly iconType?: IconType; readonly href: string; readonly desc: string; readonly warn: string; @@ -9,6 +9,17 @@ export type Service = { readonly id: number; }; +export type Server = { + readonly name: string; + readonly icon?: string; + readonly iconType?: IconType; + readonly connection?: string; + readonly href?: string; + readonly desc?: string; + readonly extLink?: string; + readonly id?: number; +}; + export enum IconType { SVG = 'svg', AVIF = 'avif', diff --git a/src/routes/data/servers/+server.ts b/src/routes/data/servers/+server.ts index e69de29..f818daf 100644 --- a/src/routes/data/servers/+server.ts +++ b/src/routes/data/servers/+server.ts @@ -0,0 +1,10 @@ +import * as fs from 'fs'; +import { json } from '@sveltejs/kit'; + +export function GET() { + const content = fs.readFileSync('static/data/servers.json').toString(); + + const data = JSON.parse(content); + + return json(data); +} diff --git a/src/routes/data/services/+server.ts b/src/routes/data/services/+server.ts index f0512f6..44244b9 100644 --- a/src/routes/data/services/+server.ts +++ b/src/routes/data/services/+server.ts @@ -4,7 +4,7 @@ import { json } from '@sveltejs/kit'; export function GET() { const content = fs.readFileSync('static/data/services.json').toString(); - let data = JSON.parse(content); + const data = JSON.parse(content); return json(data); } diff --git a/src/routes/servers/+page.server.ts b/src/routes/servers/+page.server.ts index e69de29..f9ba6b5 100644 --- a/src/routes/servers/+page.server.ts +++ b/src/routes/servers/+page.server.ts @@ -0,0 +1,62 @@ +import { io, Socket } from 'socket.io-client'; +import * as fs from 'fs'; + +export async function load() { + const promise = getJwt(); + + return { + promise + }; +} + +async function getJwt(): Promise { + const socket = io('https://status.neshweb.net/'); + const credFile = './credentials.json'; + let token = ''; + let valid = false; + + if (fs.existsSync(credFile)) { + const content = fs.readFileSync(credFile); + token = content.toString(); + } + + socket.on('connect', async () => { + if (token == '') { + token = await login(socket); + valid = true; + } else { + socket.emit('loginByToken', token, async (res) => { + if (!res.ok) { + token = await login(socket); + } + valid = true; + }); + } + }); + + while (!valid) { + await new Promise((resolve) => setTimeout(resolve, 10)); + } + + fs.writeFileSync(credFile, token); + + return token; +} + +async function login(socket: Socket): Promise { + let token = ''; + socket.emit( + 'login', + { username: process.env.KUMA_USERNAME, password: process.env.KUMA_PASSWORD, token: '' }, + (res: { token: string }) => { + token = res.token; + socket.close(); + } + ); + + while (token == '') { + await new Promise((resolve) => setTimeout(resolve, 10)); + } + + return token; +} diff --git a/src/routes/servers/+page.svelte b/src/routes/servers/+page.svelte index 767e81f..8402984 100644 --- a/src/routes/servers/+page.svelte +++ b/src/routes/servers/+page.svelte @@ -1,4 +1,106 @@ + + + + Servers + +
+ {#each servers as server} + {#if typeof server.id === 'undefined'} + + {:else} + + {/if} + {/each} +
diff --git a/static/data/servers.json b/static/data/servers.json index 5255e18..7bbbb62 100644 --- a/static/data/servers.json +++ b/static/data/servers.json @@ -1,31 +1,26 @@ [ { - "name": "Minecraft", - "icon": "/assets/icons/minecraft-logo", - "iconType": "avif", - "href": "https://minecraft.neshweb.net/", - "desc": "View all currently available Minecraft Servers and their mods" + "name": "Minecraft", + "icon": "/assets/icons/minecraft-logo", + "iconType": "avif", + "connection": "minecraft.neshweb.net", + "href": "https://minecraft.neshweb.net/", + "desc": "View all currently available Minecraft Servers and their mods", + "id": 38 }, { - "name": "Ready or Not", - "icon": "/assets/icons/ron-logo", - "iconType": "avif", - "href": "https://readyornot.neshweb.net/", - "desc": "Collection of Floor Plans for the Game 'Ready or Not'" + "name": "Ready or Not", + "icon": "/assets/icons/ron-logo", + "iconType": "avif", + "connection": "minecraft.neshweb.net", + "href": "https://readyornot.neshweb.net/", + "desc": "Collection of Floor Plans for the Game 'Ready or Not'" }, { - "name": "Zomboid", - "icon": "/assets/icons/zomboid-logo", - "iconType": "avif", - "ip": "91.13.248.30", - "status": "Online" + "name": "Factorio" }, { - "name": "Factorio", - "status": "Online" - }, - { - "name": "Space Engineers", - "status": "Online" + "name": "Space Engineers", + "id": 13 } ] \ No newline at end of file