+
diff --git a/src/lib/components/WebGL.svelte b/src/lib/components/WebGL.svelte
index b17551b..a6236e2 100644
--- a/src/lib/components/WebGL.svelte
+++ b/src/lib/components/WebGL.svelte
@@ -29,12 +29,11 @@
-
+ title="Performance Report">
+
diff --git a/src/lib/scripts/nodelauncher.svelte.ts b/src/lib/scripts/nodelauncher.svelte.ts
index 5c662f6..ed59946 100644
--- a/src/lib/scripts/nodelauncher.svelte.ts
+++ b/src/lib/scripts/nodelauncher.svelte.ts
@@ -4,6 +4,8 @@ import type { Child } from "@tauri-apps/plugin-shell";
import { join } from "@tauri-apps/api/path";
import { Command } from "@tauri-apps/plugin-shell";
+const DEFAULT_PORT = 30000;
+
class NodeLauncher {
value = $state({
id: "",
@@ -11,7 +13,7 @@ class NodeLauncher {
notes: "",
foundryPath: "",
dataPath: "",
- port: 30000,
+ port: DEFAULT_PORT,
args: ""
});
@@ -22,7 +24,7 @@ class NodeLauncher {
notes: "",
foundryPath: "",
dataPath: "",
- port: 30000,
+ port: DEFAULT_PORT,
args: ""
};
}
@@ -49,7 +51,7 @@ class NodeStatus {
export const nodeLauncher = new NodeLauncher();
export const nodeStatus = new NodeStatus();
-let child: Child;
+let child: Child | undefined;
export async function launchNodeserver() {
nodeStatus.reset();
@@ -59,13 +61,13 @@ export async function launchNodeserver() {
const normalizedDataPath = server.dataPath ? await join(server.dataPath) : undefined;
const command = Command.create("node", [
- `${normalizedFoundryPath}`,
+ normalizedFoundryPath,
normalizedDataPath ? `--dataPath=${normalizedDataPath}` : "",
`--port=${server.port}`,
- `${server.args || ""}`
+ server.args || ""
]);
- command.on("close", (data: any) => {
+ command.on("close", () => {
nodeStatus.value.status = `Node process finished`;
nodeStatus.value.launched = false;
});
diff --git a/src/lib/scripts/nodeservers.svelte.ts b/src/lib/scripts/nodeservers.svelte.ts
index 3330930..2bb3c65 100644
--- a/src/lib/scripts/nodeservers.svelte.ts
+++ b/src/lib/scripts/nodeservers.svelte.ts
@@ -2,20 +2,22 @@ import { LocalStorage } from "$scripts/storage.svelte.js";
import { nanoid } from "nanoid";
import * as v from "valibot";
+const ERROR_MESSAGES = {
+ serverName: "Please enter a server name",
+ foundryPath: "Please select a path to the Foundry VTT installation directory",
+ validPort: "Please enter a valid port number"
+};
+
const NodeserverSchema = v.object({
id: v.string(),
- label: v.pipe(v.string(), v.trim(), v.minLength(1, "Please enter a server name")),
+ label: v.pipe(v.string(), v.trim(), v.minLength(1, ERROR_MESSAGES.serverName)),
notes: v.optional(v.string()),
- foundryPath: v.pipe(
- v.string(),
- v.trim(),
- v.minLength(1, "Please select a path to the Foundry VTT installation directory")
- ),
+ foundryPath: v.pipe(v.string(), v.trim(), v.minLength(1, ERROR_MESSAGES.foundryPath)),
dataPath: v.optional(v.string()),
port: v.pipe(
v.number(),
- v.minValue(1, "Please enter a valid port number"),
- v.maxValue(65535, "Please enter a valid port number")
+ v.minValue(1, ERROR_MESSAGES.validPort),
+ v.maxValue(65535, ERROR_MESSAGES.validPort)
),
args: v.optional(v.string())
});
@@ -32,51 +34,43 @@ export let nodeservers = $state>(storage);
export function addServer(data: NodeserverPartial) {
const result = v.safeParse(NodeserverPartialSchema, data);
- if (result.success) {
- nodeservers.current.unshift({
- id: nanoid(),
- label: result.output.label,
- notes: result.output.notes,
- foundryPath: result.output.foundryPath,
- dataPath: result.output.dataPath,
- port: result.output.port,
- args: result.output.args
- });
+ if (!result.success) {
+ return result;
}
+ nodeservers.current = [
+ {
+ id: nanoid(),
+ ...result.output
+ },
+ ...nodeservers.current
+ ];
+
return result;
}
export function deleteServer(id: string) {
const result = v.safeParse(v.string(), id);
- if (result.success) {
- nodeservers.current = nodeservers.current.filter((s: Nodeserver) => s.id !== result.output);
+ if (!result.success) {
+ return result;
}
+ nodeservers.current = nodeservers.current.filter((server) => server.id !== result.output);
+
return result;
}
export function updateServer(data: Nodeserver) {
const result = v.safeParse(NodeserverSchema, data);
- if (result.success) {
- nodeservers.current = nodeservers.current.map((s: Nodeserver) => {
- if (s.id !== result.output.id) {
- return s;
- }
-
- return {
- id: result.output.id,
- label: result.output.label,
- notes: result.output.notes,
- foundryPath: result.output.foundryPath,
- dataPath: result.output.dataPath,
- port: result.output.port,
- args: result.output.args
- };
- });
+ if (!result.success) {
+ return result;
}
+ nodeservers.current = nodeservers.current.map((server) =>
+ server.id === result.output.id ? result.output : server
+ );
+
return result;
}
diff --git a/src/lib/scripts/servers.svelte.ts b/src/lib/scripts/servers.svelte.ts
index 1ff8300..5e60e0d 100644
--- a/src/lib/scripts/servers.svelte.ts
+++ b/src/lib/scripts/servers.svelte.ts
@@ -1,15 +1,30 @@
+import { fetch } from "@tauri-apps/plugin-http";
import { LocalStorage } from "$scripts/storage.svelte.js";
import { nanoid } from "nanoid";
import * as v from "valibot";
+export type ServerStatus = {
+ active?: boolean;
+ version?: string;
+ world?: string;
+ system?: string;
+ users?: number;
+ partner?: string;
+};
+
+type StatusResponse = {
+ status: ServerStatus | undefined;
+};
+
+const ERROR_MESSAGES = {
+ serverName: "Please enter a server name",
+ validUrl: "Please enter a correct URL starting with either http:// or https://"
+};
+
const ServerSchema = v.object({
id: v.string(),
- label: v.pipe(v.string(), v.trim(), v.minLength(1, "Please enter a server name")),
- url: v.pipe(
- v.string(),
- v.trim(),
- v.regex(/^https?:\/\//, "Please enter a correct URL starting with either http:// or https://")
- ),
+ label: v.pipe(v.string(), v.trim(), v.minLength(1, ERROR_MESSAGES.serverName)),
+ url: v.pipe(v.string(), v.trim(), v.regex(/^https?:\/\//, ERROR_MESSAGES.validUrl)),
notes: v.optional(v.string())
});
@@ -18,22 +33,31 @@ const ServerPartialSchema = v.omit(ServerSchema, ["id"]);
export type Server = v.InferOutput;
export type ServerPartial = v.InferOutput;
-const storage = new LocalStorage("servers", []);
+const PARTNERS = [
+ { url: "forge-vtt.com", name: "The Forge" },
+ { url: "forgevtt.com", name: "The Forge" },
+ { url: "moltenhosting.com", name: "Molten Hosting" },
+ { url: "foundryserver.com", name: "Foundry Server" }
+];
+const storage = new LocalStorage("servers", []);
export let servers = $state>(storage);
export function addServer(data: ServerPartial) {
const result = v.safeParse(ServerPartialSchema, data);
- if (result.success) {
- servers.current.unshift({
- id: nanoid(),
- label: result.output.label,
- url: result.output.url,
- notes: result.output.notes
- });
+ if (!result.success) {
+ return result;
}
+ servers.current = [
+ {
+ id: nanoid(),
+ ...result.output
+ },
+ ...servers.current
+ ];
+
return result;
}
@@ -50,20 +74,34 @@ export function deleteServer(id: string) {
export function updateServer(data: Server) {
const result = v.safeParse(ServerSchema, data);
- if (result.success) {
- servers.current = servers.current.map((s: Server) => {
- if (s.id !== result.output.id) {
- return s;
- }
-
- return {
- id: result.output.id,
- label: result.output.label,
- url: result.output.url,
- notes: result.output.notes
- };
- });
+ if (!result.success) {
+ return result;
}
+ servers.current = servers.current.map((server) =>
+ server.id === result.output.id ? result.output : server
+ );
+
return result;
}
+
+export async function checkStatus(url: string): Promise {
+ const partner = PARTNERS.find((p) => url.includes(p.url))?.name;
+ if (partner) return { status: { partner } };
+
+ const cleanUrl = url.replace(/\/+$/, "").replace(/\/(game|join)$/, "");
+
+ const response = await fetch(`${cleanUrl}/api/status`, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json"
+ }
+ });
+
+ if (!response.ok) {
+ return { status: undefined };
+ }
+
+ const status = await response.json();
+ return { status: { ...status, partner: undefined } };
+}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 7201570..a675f43 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -2,6 +2,6 @@
import ServerGrid from "$components/ServerGrid.svelte";
-
+
diff --git a/src/routes/node/+page.svelte b/src/routes/node/+page.svelte
index c7d3e1b..828f78d 100644
--- a/src/routes/node/+page.svelte
+++ b/src/routes/node/+page.svelte
@@ -3,7 +3,7 @@
import NodeserverLauncher from "$components/NodeserverLauncher.svelte";
-
+