+
+
+
+
+
+
+ {table
+ .getAllColumns()
+ .filter((column) => column.getCanHide())
+ .map((column) => {
+ return (
+ column.toggleVisibility(!!value)}
+ >
+ {column.id}
+
+ );
+ })}
+
+
@@ -69,7 +109,7 @@ export function DataTable({ columns, data }: DataTableProps
-
diff --git a/src/components/vnc-screen.tsx b/src/components/vnc-screen.tsx
index 631ff79..778ff40 100644
--- a/src/components/vnc-screen.tsx
+++ b/src/components/vnc-screen.tsx
@@ -1,7 +1,7 @@
"use client";
import RFB, { type NoVncCredentials, type NoVncEvents, type NoVncOptions } from "@novnc/novnc/core/rfb";
-import { type ReactNode, forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
+import { type ReactNode, useEffect, useImperativeHandle, useRef, useState } from "react";
export type rfbOptions = Partial
;
@@ -66,299 +66,294 @@ export enum Events {
desktopname,
capabilities,
}
-const VncScreen = forwardRef(
- (
- {
- url,
- style,
- className,
- viewOnly,
- rfbOptions,
- focusOnClick,
- clipViewport,
- dragViewport,
- scaleViewport,
- resizeSession,
- showDotCursor,
- background,
- qualityLevel,
- compressionLevel,
- autoConnect = true,
- retryDuration = 3000,
- debug = false,
- loader,
- onConnect,
- onDisconnect,
- onCredentialsRequired,
- onSecurityFailure,
- onClipboard,
- onBell,
- onDesktopName,
- onCapabilities,
+const VncScreen = ({
+ url,
+ style,
+ className,
+ viewOnly,
+ rfbOptions,
+ focusOnClick,
+ clipViewport,
+ dragViewport,
+ scaleViewport,
+ resizeSession,
+ showDotCursor,
+ background,
+ qualityLevel,
+ compressionLevel,
+ autoConnect = true,
+ retryDuration = 3000,
+ debug = false,
+ loader,
+ onConnect,
+ onDisconnect,
+ onCredentialsRequired,
+ onSecurityFailure,
+ onClipboard,
+ onBell,
+ onDesktopName,
+ onCapabilities,
+ ref,
+}: VncViewerProps & { ref: React.Ref }) => {
+ const rfb = useRef(null);
+ const connected = useRef(autoConnect);
+ const timeouts = useRef>>([]);
+ const eventListeners = useRef({});
+ const screen = useRef(null);
+ const [loading, setLoading] = useState(true);
+ const logger = {
+ log: (...args: string[]) => {
+ if (debug) console.log(...args);
},
- ref,
- ) => {
- const rfb = useRef(null);
- const connected = useRef(autoConnect);
- const timeouts = useRef>>([]);
- const eventListeners = useRef({});
- const screen = useRef(null);
- const [loading, setLoading] = useState(true);
- const logger = {
- log: (...args: string[]) => {
- if (debug) console.log(...args);
- },
- info: (...args: string[]) => {
- if (debug) console.info(...args);
- },
- error: (...args: string[]) => {
- if (debug) console.error(...args);
- },
- };
- const getRfb = () => rfb.current;
- // biome-ignore lint: someone was insane, i didn't write most of this
- const setRfb = (_rfb: RFB | null) => (rfb.current = _rfb);
-
- const getConnected = () => connected.current;
-
- // biome-ignore lint: someone was insane, i didn't write most of this
- const setConnected = (state: boolean) => (connected.current = state);
-
- const _onConnect = () => {
- const rfb = getRfb();
-
- if (onConnect) {
- onConnect(rfb ?? undefined);
- setLoading(false);
- }
+ info: (...args: string[]) => {
+ if (debug) console.info(...args);
+ },
+ error: (...args: string[]) => {
+ if (debug) console.error(...args);
+ },
+ };
+ const getRfb = () => rfb.current;
+ // biome-ignore lint: someone was insane, i didn't write most of this
+ const setRfb = (_rfb: RFB | null) => (rfb.current = _rfb);
- logger.info("Connected to remote VNC.");
- setLoading(false);
- };
+ const getConnected = () => connected.current;
- const _onDisconnect = () => {
- const rfb = getRfb();
+ // biome-ignore lint: someone was insane, i didn't write most of this
+ const setConnected = (state: boolean) => (connected.current = state);
- if (onDisconnect) {
- onDisconnect(rfb ?? undefined);
- setLoading(true);
- }
+ const _onConnect = () => {
+ const rfb = getRfb();
- const connected = getConnected();
+ if (onConnect) {
+ onConnect(rfb ?? undefined);
+ setLoading(false);
+ }
- if (connected) {
- logger.info(`Unexpectedly disconnected from remote VNC, retrying in ${retryDuration / 1000} seconds.`);
+ logger.info("Connected to remote VNC.");
+ setLoading(false);
+ };
- timeouts.current.push(setTimeout(connect, retryDuration));
- } else {
- logger.info("Disconnected from remote VNC.");
- }
+ const _onDisconnect = () => {
+ const rfb = getRfb();
+ if (onDisconnect) {
+ onDisconnect(rfb ?? undefined);
setLoading(true);
- };
+ }
- const _onCredentialsRequired = () => {
- const rfb = getRfb();
+ const connected = getConnected();
- if (onCredentialsRequired) onCredentialsRequired(rfb ?? undefined);
+ if (connected) {
+ logger.info(`Unexpectedly disconnected from remote VNC, retrying in ${retryDuration / 1000} seconds.`);
- const password = rfbOptions?.credentials?.password ?? prompt("Password Required:");
+ timeouts.current.push(setTimeout(connect, retryDuration));
+ } else {
+ logger.info("Disconnected from remote VNC.");
+ }
- if (password) rfb?.sendCredentials({ password: password } as NoVncCredentials);
- };
+ setLoading(true);
+ };
- const _onDesktopName = (e: { detail: { name: string } }) => {
- if (onDesktopName) onDesktopName(e);
+ const _onCredentialsRequired = () => {
+ const rfb = getRfb();
- logger.info(`Desktop name is ${e.detail.name}`);
- };
+ if (onCredentialsRequired) onCredentialsRequired(rfb ?? undefined);
- const disconnect = () => {
- let rfb = getRfb();
+ const password = rfbOptions?.credentials?.password ?? prompt("Password Required:");
- try {
- if (rfb) {
- for (const timeout of timeouts.current) {
- clearTimeout(timeout);
- }
- const eventKeys = Object.keys(eventListeners.current) as (keyof typeof Events)[];
-
- for (let i = 0; i < eventKeys.length; i++) {
- const event = eventKeys[i];
- if (eventListeners.current[event]) {
- // biome-ignore lint: lint/suspicious/noExplicitAny
- rfb?.removeEventListener(event, eventListeners.current[event] as any);
- eventListeners.current[event] = undefined;
- }
- }
+ if (password) rfb?.sendCredentials({ password: password } as NoVncCredentials);
+ };
- rfb.disconnect();
- rfb = null;
- setRfb(null);
- setConnected(false);
+ const _onDesktopName = (e: { detail: { name: string } }) => {
+ if (onDesktopName) onDesktopName(e);
- // NOTE: This needs to be called since the event listener is removed.
- // Even if the event listener is removed after rfb.disconnect(), the disconnect
- // event is not fired.
- _onDisconnect();
+ logger.info(`Desktop name is ${e.detail.name}`);
+ };
+
+ const disconnect = () => {
+ let rfb = getRfb();
+
+ try {
+ if (rfb) {
+ for (const timeout of timeouts.current) {
+ clearTimeout(timeout);
}
- } catch (error) {
- logger.error(error as string);
+ const eventKeys = Object.keys(eventListeners.current) as (keyof typeof Events)[];
+
+ for (let i = 0; i < eventKeys.length; i++) {
+ const event = eventKeys[i];
+ if (eventListeners.current[event]) {
+ // biome-ignore lint: lint/suspicious/noExplicitAny
+ rfb?.removeEventListener(event, eventListeners.current[event] as any);
+ eventListeners.current[event] = undefined;
+ }
+ }
+
+ rfb.disconnect();
+ rfb = null;
setRfb(null);
setConnected(false);
+
+ // NOTE: This needs to be called since the event listener is removed.
+ // Even if the event listener is removed after rfb.disconnect(), the disconnect
+ // event is not fired.
+ _onDisconnect();
}
- };
-
- const connect = () => {
- try {
- if (connected && !!rfb) disconnect();
-
- if (screen.current) {
- screen.current.innerHTML = "";
-
- const _rfb = new RFB(
- screen.current,
- `${window.location.protocol.replace("http", "ws")}//${window.location.host}${url}`,
- rfbOptions,
- );
-
- _rfb.viewOnly = viewOnly ?? false;
- _rfb.focusOnClick = focusOnClick ?? true;
- _rfb.clipViewport = clipViewport ?? false;
- _rfb.dragViewport = dragViewport ?? false;
- _rfb.resizeSession = resizeSession ?? false;
- _rfb.scaleViewport = scaleViewport ?? false;
- _rfb.showDotCursor = showDotCursor ?? false;
- _rfb.background = background ?? "";
- _rfb.qualityLevel = qualityLevel ?? 6;
- _rfb.compressionLevel = compressionLevel ?? 2;
- setRfb(_rfb);
-
- eventListeners.current.connect = _onConnect;
- eventListeners.current.disconnect = _onDisconnect;
- eventListeners.current.credentialsrequired = _onCredentialsRequired;
- eventListeners.current.securityfailure = onSecurityFailure;
- eventListeners.current.clipboard = onClipboard;
- eventListeners.current.bell = onBell;
- eventListeners.current.desktopname = _onDesktopName;
- eventListeners.current.capabilities = onCapabilities;
- const eventKeys = Object.keys(eventListeners.current) as (keyof typeof Events)[];
-
- for (let i = 0; i < eventKeys.length; i++) {
- const event = eventKeys[i];
- if (eventListeners.current[event]) {
- // biome-ignore lint: lint/suspicious/noExplicitAny
- _rfb.addEventListener(event as keyof NoVncEvents, eventListeners.current[event] as any);
- }
+ } catch (error) {
+ logger.error(error as string);
+ setRfb(null);
+ setConnected(false);
+ }
+ };
+
+ const connect = () => {
+ try {
+ if (connected && !!rfb) disconnect();
+
+ if (screen.current) {
+ screen.current.innerHTML = "";
+
+ const _rfb = new RFB(
+ screen.current,
+ `${window.location.protocol.replace("http", "ws")}//${window.location.host}${url}`,
+ rfbOptions,
+ );
+
+ _rfb.viewOnly = viewOnly ?? false;
+ _rfb.focusOnClick = focusOnClick ?? true;
+ _rfb.clipViewport = clipViewport ?? false;
+ _rfb.dragViewport = dragViewport ?? false;
+ _rfb.resizeSession = resizeSession ?? false;
+ _rfb.scaleViewport = scaleViewport ?? false;
+ _rfb.showDotCursor = showDotCursor ?? false;
+ _rfb.background = background ?? "";
+ _rfb.qualityLevel = qualityLevel ?? 6;
+ _rfb.compressionLevel = compressionLevel ?? 2;
+ setRfb(_rfb);
+
+ eventListeners.current.connect = _onConnect;
+ eventListeners.current.disconnect = _onDisconnect;
+ eventListeners.current.credentialsrequired = _onCredentialsRequired;
+ eventListeners.current.securityfailure = onSecurityFailure;
+ eventListeners.current.clipboard = onClipboard;
+ eventListeners.current.bell = onBell;
+ eventListeners.current.desktopname = _onDesktopName;
+ eventListeners.current.capabilities = onCapabilities;
+ const eventKeys = Object.keys(eventListeners.current) as (keyof typeof Events)[];
+
+ for (let i = 0; i < eventKeys.length; i++) {
+ const event = eventKeys[i];
+ if (eventListeners.current[event]) {
+ // biome-ignore lint: lint/suspicious/noExplicitAny
+ _rfb.addEventListener(event as keyof NoVncEvents, eventListeners.current[event] as any);
}
-
- setConnected(true);
}
- } catch (error) {
- logger.error(error as string);
+
+ setConnected(true);
}
- };
-
- const sendCredentials = (credentials: NoVncCredentials) => {
- const rfb = getRfb();
- rfb?.sendCredentials(credentials);
- };
-
- const sendKey = (keysym: number, code: string, down?: boolean) => {
- const rfb = getRfb();
- rfb?.sendKey(keysym, code, down);
- };
-
- const sendCtrlAltDel = () => {
- const rfb = getRfb();
- rfb?.sendCtrlAltDel();
- };
-
- const focus = () => {
- const rfb = getRfb();
- rfb?.focus();
- };
-
- const blur = () => {
- const rfb = getRfb();
- rfb?.blur();
- };
-
- const machineShutdown = () => {
- const rfb = getRfb();
- rfb?.machineShutdown();
- };
-
- const machineReboot = () => {
- const rfb = getRfb();
- rfb?.machineReboot();
- };
-
- const machineReset = () => {
- const rfb = getRfb();
- rfb?.machineReset();
- };
-
- const clipboardPaste = (text: string) => {
- const rfb = getRfb();
- rfb?.clipboardPasteFrom(text);
- };
-
- useImperativeHandle(ref, () => ({
- connect,
- disconnect,
- connected: connected.current,
- sendCredentials,
- sendKey,
- sendCtrlAltDel,
- focus,
- blur,
- machineShutdown,
- machineReboot,
- machineReset,
- clipboardPaste,
- rfb: rfb.current,
- eventListeners: eventListeners.current,
- }));
- // biome-ignore lint: correctness/useExhaustiveDependencies
- useEffect(() => {
- if (autoConnect) connect();
-
- return disconnect;
- }, []);
-
- const handleClick = () => {
- const rfb = getRfb();
-
- if (rfb) rfb.focus();
- };
-
- const handleMouseEnter = () => {
- if (document.activeElement && document.activeElement instanceof HTMLElement) document.activeElement.blur();
-
- handleClick();
- };
-
- const handleMouseLeave = () => {
- const rfb = getRfb();
-
- if (rfb) rfb.blur();
- };
- return (
- <>
- {loading || !url ? loader ?? Loading...
: null}
- {url ? (
-
- ) : null}
-
- );
- },
-);
-VncScreen.displayName = "VncScreen";
+ } catch (error) {
+ logger.error(error as string);
+ }
+ };
+
+ const sendCredentials = (credentials: NoVncCredentials) => {
+ const rfb = getRfb();
+ rfb?.sendCredentials(credentials);
+ };
+
+ const sendKey = (keysym: number, code: string, down?: boolean) => {
+ const rfb = getRfb();
+ rfb?.sendKey(keysym, code, down);
+ };
+
+ const sendCtrlAltDel = () => {
+ const rfb = getRfb();
+ rfb?.sendCtrlAltDel();
+ };
+
+ const focus = () => {
+ const rfb = getRfb();
+ rfb?.focus();
+ };
+
+ const blur = () => {
+ const rfb = getRfb();
+ rfb?.blur();
+ };
+
+ const machineShutdown = () => {
+ const rfb = getRfb();
+ rfb?.machineShutdown();
+ };
+
+ const machineReboot = () => {
+ const rfb = getRfb();
+ rfb?.machineReboot();
+ };
+
+ const machineReset = () => {
+ const rfb = getRfb();
+ rfb?.machineReset();
+ };
+
+ const clipboardPaste = (text: string) => {
+ const rfb = getRfb();
+ rfb?.clipboardPasteFrom(text);
+ };
+
+ useImperativeHandle(ref, () => ({
+ connect,
+ disconnect,
+ connected: connected.current,
+ sendCredentials,
+ sendKey,
+ sendCtrlAltDel,
+ focus,
+ blur,
+ machineShutdown,
+ machineReboot,
+ machineReset,
+ clipboardPaste,
+ rfb: rfb.current,
+ eventListeners: eventListeners.current,
+ }));
+ // biome-ignore lint: correctness/useExhaustiveDependencies
+ useEffect(() => {
+ if (autoConnect) connect();
+
+ return disconnect;
+ }, []);
+
+ const handleClick = () => {
+ const rfb = getRfb();
+
+ if (rfb) rfb.focus();
+ };
+
+ const handleMouseEnter = () => {
+ if (document.activeElement && document.activeElement instanceof HTMLElement) document.activeElement.blur();
+
+ handleClick();
+ };
+
+ const handleMouseLeave = () => {
+ const rfb = getRfb();
+
+ if (rfb) rfb.blur();
+ };
+ return (
+ <>
+ {loading || !url ? loader ?? Loading...
: null}
+ {url ? (
+
+ ) : null}
+
+ );
+};
export default VncScreen;
diff --git a/src/lib/drizzle/schema.ts b/src/lib/drizzle/schema.ts
index 6faa098..d63790e 100644
--- a/src/lib/drizzle/schema.ts
+++ b/src/lib/drizzle/schema.ts
@@ -1,5 +1,6 @@
import { relations } from "drizzle-orm";
import { bigint, boolean, pgTable, text } from "drizzle-orm/pg-core";
+import { createInsertSchema } from "drizzle-zod";
export const user = pgTable("User", {
email: text("email").notNull().unique(),
@@ -19,6 +20,7 @@ export const image = pgTable("Image", {
pulled: boolean("pulled").default(false).notNull(),
});
export type SelectImage = typeof user.$inferSelect;
+export const insertImageSchema = createInsertSchema(image);
export const imageRelations = relations(image, ({ many }) => ({
session: many(session),
}));
diff --git a/src/lib/session/get-session.ts b/src/lib/session/get-session.ts
index 0d3afa1..df9ddfc 100644
--- a/src/lib/session/get-session.ts
+++ b/src/lib/session/get-session.ts
@@ -22,10 +22,8 @@ async function getSession(containerId: string, userSession: Session | null) {
.where(and(eq(session.id, containerId), eq(session.userId, userId)));
});
if (!containerSession) return null;
- const ip = await docker
- .getContainer(containerId)
- .inspect()
- .then((data) => data.NetworkSettings.Networks[data.HostConfig.NetworkMode as string].IPAddress);
+ const container = await docker.getContainer(containerId).inspect();
+ const ip = container.NetworkSettings.Networks[container.HostConfig.NetworkMode as string].IPAddress;
return {
ip,
...containerSession,
diff --git a/src/lib/session/index.ts b/src/lib/session/index.ts
index e2dbd11..fdd2f05 100644
--- a/src/lib/session/index.ts
+++ b/src/lib/session/index.ts
@@ -107,7 +107,7 @@ async function deleteSession(containerId: string, admin?: boolean) {
.where(eq(user.email, userSession?.user?.email as string));
if (isAdmin) {
const container = docker.getContainer(containerId);
- const network = await container.inspect().then((container) => container.HostConfig.NetworkMode);
+ const network = (await container.inspect()).HostConfig.NetworkMode;
await container.remove({ force: true });
await docker.getNetwork(network as string).remove({ force: true });
await db.delete(session).where(eq(session.id, containerId));
@@ -119,7 +119,7 @@ async function deleteSession(containerId: string, admin?: boolean) {
if (!id) throw new Error("Session not found");
try {
const container = docker.getContainer(id);
- const network = await container.inspect().then((container) => container.HostConfig.NetworkMode);
+ const network = (await container.inspect()).HostConfig.NetworkMode;
await container.remove({ force: true });
await docker.getNetwork(network as string).remove({ force: true });
await db.delete(session).where(eq(session.id, id));
diff --git a/src/lib/session/purge.ts b/src/lib/session/purge.ts
index 46e32b2..3002e85 100644
--- a/src/lib/session/purge.ts
+++ b/src/lib/session/purge.ts
@@ -1,7 +1,7 @@
-import { db, session } from "@/lib/drizzle/db";
-import { lte, eq } from "drizzle-orm";
import docker from "@/lib/docker";
+import { db, session } from "@/lib/drizzle/db";
import { consola } from "consola";
+import { eq, lte } from "drizzle-orm";
setInterval(async () => {
consola.info("✨ Stardust: Purging stale sessions");
@@ -10,7 +10,7 @@ setInterval(async () => {
await Promise.all(
staleSessions.map(async (s) => {
const container = docker.getContainer(s.id);
- const network = await container.inspect().then((container) => container.HostConfig.NetworkMode);
+ const network = (await container.inspect()).HostConfig.NetworkMode;
await container.remove({ force: true });
await docker.getNetwork(network as string).remove({ force: true });
await tx.delete(session).where(eq(session.id, s.id));
diff --git a/src/lib/session/session-running.ts b/src/lib/session/session-running.ts
index e469e1a..48cf482 100644
--- a/src/lib/session/session-running.ts
+++ b/src/lib/session/session-running.ts
@@ -3,20 +3,18 @@
import { consola } from "consola";
/**
- * While loop for checking if the container is running.
- * @param port The port of the container to check
+ * Promise that resolves when the container is running
+ * @param ip The port of the container to check
*/
async function sessionRunning(ip: string) {
- let containerRunning = await fetch(`http://${ip}:6080/healthcheck`)
- .then((res) => res.json())
- .then((data) => data.message)
- .catch(() => consola.warn(`✨ Stardust: Container on ${ip} not running, retrying...`));
+ let containerRunning = await fetch(`http://${ip}:6080/healthcheck`).catch(() =>
+ consola.warn(`✨ Stardust: Container on ${ip} not running, retrying...`),
+ );
while (!containerRunning) {
await new Promise((resolve) => setTimeout(resolve, 2000));
- containerRunning = await fetch(`http://${ip}:6080/healthcheck`)
- .then((res) => res.json())
- .then((data) => data.message)
- .catch(() => consola.warn(`✨ Stardust: Container on ${ip} not running, retrying...`));
+ containerRunning = await fetch(`http://${ip}:6080/healthcheck`).catch(() =>
+ consola.warn(`✨ Stardust: Container on ${ip} not running, retrying...`),
+ );
}
}
export { sessionRunning };
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index afc6737..28547a1 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,7 +1,7 @@
-import { clsx, type ClassValue } from "clsx";
+import { type ClassValue, clsx } from "clsx";
import { twMerge } from "tailwind-merge";
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
}
-export const fetcher = (url: string) => fetch(url).then((res) => res.json());
+export const fetcher = async (url: string) => (await fetch(url)).json();
diff --git a/src/middleware.ts b/src/middleware.ts
index 3f0b408..aab6595 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -13,7 +13,6 @@ export const middleware = auth(async (req) => {
}
const url = new URL("/auth/login", req.url);
url.searchParams.set("callbackUrl", req.nextUrl.pathname);
- console.log(url.toString());
return NextResponse.redirect(url);
});
export const config = {