feat: more workspaces, other bug fixes and improvements

incognitotgt · incognitotgt · commit a2a19561bcd1 · 2025-02-08T17:19:08.000-05:00
workspaces: added zen browser and firefox, also fixed emojis
sessions: fix auto node picking logic
other: fix wording in admin dash to be more clear
diff --git a/apps/web/src/app/(main)/admin/workspaces/columns.tsx b/apps/web/src/app/(main)/admin/workspaces/columns.tsx
@@ -70,7 +70,7 @@ export const columns: ColumnDef<SelectWorkspaceRelation & { nodes: string[] }>[]
 									})
 								}
 							>
-								Delete workspace
+								Delete from database
 							</DropdownMenuItem>
 						</DropdownMenuContent>
 					</DropdownMenu>
diff --git a/apps/web/src/lib/session/best-node.ts b/apps/web/src/lib/session/best-node.ts
@@ -7,7 +7,7 @@ import type { NodeConfig } from "@stardust/config/config";
 export async function getBestNode(workspace: string) {
 	const { nodes: configNodes } = getConfig();
 	const nodes: Record<number, number> = {};
-	const nodeMetadata = (
+	const availableNodes = (
 		await Promise.all(
 			configNodes.map(async (n) => {
 				const { data } = await stardustConnector(n).workspaces.index.get();
@@ -18,14 +18,19 @@ export async function getBestNode(workspace: string) {
 				};
 			}),
 		)
-	).filter((n) => n.workspaces.includes(workspace));
-	if (nodeMetadata.length <= 0) throw new Error("No node with the selected workspace found");
+	)
+		.filter((n) => n.workspaces.includes(workspace))
+		.map((d) => d.id);
+	if (availableNodes.length <= 0) throw new Error("No node with the selected workspace found");
 	await Promise.all(
-		configNodes.map(async (n: NodeConfig, i) => {
-			const { data } = await stardustConnector(n).healthcheck.get();
-			nodes[i] = Number(data?.cpu);
-		}),
+		configNodes
+			.filter(({ id }) => availableNodes.includes(id))
+			.map(async (n: NodeConfig, i) => {
+				const { data } = await stardustConnector(n).healthcheck.get();
+				nodes[i] = Number(data?.cpu);
+			}),
 	);
+	console.log(nodes);
 	return Object.keys(nodes)
 		.map(Number)
 		.find((key) => nodes[key] === Math.min(...Object.values(nodes))) as number; // shoot me
diff --git a/apps/web/src/lib/session/create.ts b/apps/web/src/lib/session/create.ts
@@ -60,6 +60,7 @@ export async function createSession(workspace: string, nodeId?: string) {
 			});
 		return { data: dbEntry[0] };
 	} catch (e) {
+		console.log(e);
 		return { error: (e as Error).message, data: null };
 	}
 }
diff --git a/packages/db/seed.ts b/packages/db/seed.ts
@@ -13,6 +13,18 @@ const workspaces = [
 		category: ["Browser"],
 		icon: "https://www.chromium.org/_assets/icon-chromium-96.png",
 	},
+	{
+		dockerImage: "ghcr.io/spaceness/zen",
+		friendlyName: "Zen",
+		category: ["Browser"],
+		icon: "https://raw.githubusercontent.com/zen-browser/.github/refs/heads/main/profile/logo-black.png",
+	},
+	{
+		dockerImage: "ghcr.io/spaceness/firefox",
+		friendlyName: "Firefox",
+		category: ["Browser"],
+		icon: "https://www.mozilla.org/media/protocol/img/logos/firefox/browser/logo.eb1324e44442.svg",
+	},
 ];
 const insertion = await db.insert(workspace).values(workspaces).onConflictDoNothing().returning();
 console.log(`✨Stardust: Seeded ${insertion.map((i) => i.dockerImage).join(", ") || "no images"}`);
diff --git a/workspaces/build.js b/workspaces/build.js
@@ -1,5 +1,5 @@
-const images = ["chromium", "debian"];
-const x64Only = ["pinball"];
+const images = ["chromium", "debian", "zen", "firefox"];
+const x64Only = [];
 
 import { spawn } from "node:child_process";
 import { argv } from "node:process";
diff --git a/workspaces/chromium/Dockerfile b/workspaces/chromium/Dockerfile
@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 COPY ./scripts /opt/stardust/scripts
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
-  xfonts-75dpi xvfb passwd sudo dbus dbus-x11 libxrandr2 libxext-dev libxrender-dev libxtst-dev imagemagick x11-apps build-essential pulseaudio gstreamer1.0* \
+  xfonts-75dpi xvfb passwd sudo dbus dbus-x11 libxrandr2 libxext-dev libxrender-dev libxtst-dev imagemagick x11-apps build-essential pulseaudio gstreamer1.0* fonts-noto-color-emoji \
   python3 python3-pip xterm git procps python3-numpy xfwm4 x11vnc xfce4-terminal xfce4-session xfconf xfce4-notifyd \
   wget curl inetutils-ping vim tigervnc-tools tigervnc-standalone-server tigervnc-common wmctrl \
   chromium gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly
diff --git a/workspaces/debian/Dockerfile b/workspaces/debian/Dockerfile
@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 COPY ./scripts /opt/stardust/scripts
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
-  xfonts-75dpi xvfb passwd sudo dbus dbus-x11 libxrandr2 libxext-dev libxrender-dev libxtst-dev imagemagick x11-apps build-essential pulseaudio gstreamer1.0* \
+  xfonts-75dpi xvfb passwd sudo dbus dbus-x11 libxrandr2 libxext-dev libxrender-dev libxtst-dev imagemagick x11-apps build-essential pulseaudio gstreamer1.0* fonts-noto-color-emoji \
   python3 python3-pip xterm git procps python3-numpy neofetch \
   xfce4 wget curl xfce4-goodies inetutils-ping firefox-esr chromium gimp remmina remmina-plugin-vnc remmina-plugin-rdp flatpak vim \
   tigervnc-tools tigervnc-standalone-server tigervnc-common gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly wmctrl
diff --git a/workspaces/firefox/Dockerfile b/workspaces/firefox/Dockerfile
@@ -0,0 +1,23 @@
+FROM debian:bookworm
+LABEL org.opencontainers.image.source=https://github.com/spaceness/stardust
+WORKDIR /opt/stardust
+ENV USER=stardust
+ENV PNPM_HOME="/home/stardust/.local/share/pnpm"
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY ./scripts /opt/stardust/scripts
+# idk if all of these are needed someone fix this - @incognitotgt
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  xfonts-75dpi xvfb passwd sudo dbus dbus-x11 libxrandr2 libxext-dev libxrender-dev libxtst-dev imagemagick x11-apps build-essential pulseaudio gstreamer1.0* fonts-noto-color-emoji \
+  python3 python3-pip procps python3-numpy xfwm4 xfce4-terminal xfce4-session xfconf xfce4-notifyd \
+  wget curl inetutils-ping vim tigervnc-tools tigervnc-standalone-server tigervnc-common \
+  firefox-esr
+
+RUN bash /opt/stardust/scripts/prepare.sh
+USER stardust
+COPY ./firefox/xstartup /opt/stardust/xstartup
+RUN bash /opt/stardust/scripts/vnc-setup.sh
+
+WORKDIR /home/stardust
+CMD ["bash", "/opt/stardust/scripts/start.sh"]
+EXPOSE 5901 4713 6080
diff --git a/workspaces/firefox/xstartup b/workspaces/firefox/xstartup
@@ -0,0 +1,11 @@
+#!/bin/bash
+xrdb $HOME/.Xresources
+export DISPLAY=":1"
+startxfce4 &
+sleep 1
+echo "while :
+do
+firefox --no-sandbox
+sleep 2
+done
+" | bash
diff --git a/workspaces/template/Dockerfile b/workspaces/template/Dockerfile
@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 COPY ./scripts /opt/stardust/scripts
 # idk if all of these are needed someone fix this - @incognitotgt
 RUN apt-get update && apt-get install --no-install-recommends -y \
-  xfonts-75dpi xvfb passwd sudo dbus dbus-x11 libxrandr2 libxext-dev libxrender-dev libxtst-dev imagemagick x11-apps build-essential pulseaudio gstreamer1.0* \
+  xfonts-75dpi xvfb passwd sudo dbus dbus-x11 libxrandr2 libxext-dev libxrender-dev libxtst-dev imagemagick x11-apps build-essential pulseaudio gstreamer1.0* fonts-noto-color-emoji \
   python3 python3-pip xterm git procps python3-numpy xfwm4 xfce4-terminal xfce4-session xfconf xfce4-notifyd \
   wget curl inetutils-ping vim tigervnc-tools tigervnc-standalone-server tigervnc-common \
   {{APPLICATION_PACKAGE}}
diff --git a/workspaces/zen/Dockerfile b/workspaces/zen/Dockerfile
@@ -0,0 +1,24 @@
+FROM debian:bookworm
+LABEL org.opencontainers.image.source=https://github.com/spaceness/stardust
+WORKDIR /opt/stardust
+ENV USER=stardust
+ENV PNPM_HOME="/home/stardust/.local/share/pnpm"
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY ./scripts /opt/stardust/scripts
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  xfonts-75dpi xvfb passwd sudo dbus dbus-x11 libxrandr2 libxext-dev libxrender-dev libxtst-dev imagemagick x11-apps build-essential pulseaudio gstreamer1.0* fonts-noto-color-emoji \
+  python3 python3-pip procps python3-numpy xfwm4 xfce4-terminal xfce4-session xfconf xfce4-notifyd \
+  curl inetutils-ping tigervnc-tools tigervnc-standalone-server tigervnc-common
+
+COPY ./zen/install.sh /opt/stardust/scripts/zen-install.sh
+
+RUN bash /opt/stardust/scripts/prepare.sh
+USER stardust
+RUN bash /opt/stardust/scripts/zen-install.sh
+COPY ./zen/xstartup /opt/stardust/xstartup
+RUN bash /opt/stardust/scripts/vnc-setup.sh
+
+WORKDIR /home/stardust
+CMD ["bash", "/opt/stardust/scripts/start.sh"]
+EXPOSE 5901 4713 6080
diff --git a/workspaces/zen/install.sh b/workspaces/zen/install.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+app_name=zen
+literal_name_of_installation_directory=".tarball-installations"
+universal_path_for_installation_directory="/home/stardust/$literal_name_of_installation_directory"
+app_installation_directory="$universal_path_for_installation_directory/zen"
+official_package_location="https://github.com/zen-browser/desktop/releases/latest/download/zen.linux-$(uname -m).tar.xz"
+tar_location=$(mktemp /tmp/zen.XXXXXX.tar.xz)
+open_tar_application_data_location="zen"
+local_bin_path="/home/stardust/.local/bin"
+local_application_path="/home/stardust/.local/share/applications"
+app_bin_in_local_bin="$local_bin_path/$app_name"
+desktop_in_local_applications="$local_application_path/$app_name.desktop"
+icon_path="$app_installation_directory/browser/chrome/icons/default/default128.png"
+executable_path=$app_installation_directory/zen
+
+echo "Welcome to Zen tarball installer, just chill and wait for the installation to complete!"
+
+sleep 1
+
+echo "Checking to see if an older installation exists"
+if [ -f "$app_bin_in_local_bin" ]; then
+  echo "Old bin file detected, removing..."
+  rm "$app_bin_in_local_bin"
+fi
+
+if [ -d "$app_installation_directory" ]; then
+  echo "Old app files are found, removing..."
+  rm -rf "$app_installation_directory"
+fi
+
+if [ -f "$desktop_in_local_applications" ]; then
+  echo "Old app files are found, removing..."
+  rm "$desktop_in_local_applications"
+fi
+
+echo "Installing the latest package"
+curl -L -o $tar_location $official_package_location
+if [ $? -eq 0 ]; then
+  echo OK
+else
+  echo "Installation failed. Curl not found or not installed"
+  exit
+fi
+
+tar -xvJf $tar_location
+
+echo "Installed and untarred successfully"
+
+if [ ! -d $universal_path_for_installation_directory ]; then
+  echo "Creating the $universal_path_for_installation_directory directory for installation"
+  mkdir -p $universal_path_for_installation_directory
+fi
+
+mv $open_tar_application_data_location $app_installation_directory
+
+echo "Zen successfully moved to your safe place!"
+
+rm $tar_location
+
+if [ ! -d $local_bin_path ]; then
+  echo "$local_bin_path not found, creating it for you"
+  mkdir -p $local_bin_path
+fi
+
+touch $app_bin_in_local_bin
+chmod u+x $app_bin_in_local_bin
+echo "#!/bin/bash
+$executable_path" >> $app_bin_in_local_bin
+
+echo "Created executable for your \$PATH if you ever need"
+
+if [ ! -d $local_application_path ]; then
+  echo "Creating the $local_application_path directory for desktop file"
+  mkdir -p $local_application_path
+fi
+
+echo "Installation is successful"
+echo "Done, and done, have fun! 🐷"
diff --git a/workspaces/zen/xstartup b/workspaces/zen/xstartup
@@ -0,0 +1,11 @@
+#!/bin/bash
+xrdb $HOME/.Xresources
+export DISPLAY=":1"
+startxfce4 &
+sleep 1
+echo "while :
+do
+/home/stardust/.local/bin/zen --no-sandbox
+sleep 2
+done
+" | bash

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export const columns: ColumnDef<SelectWorkspaceRelation & { nodes: string[] }>[]`
`70`	`70`	`})`
`71`	`71`	`}`
`72`	`72`	`>`
`73`		`- Delete workspace`
	`73`	`+ Delete from database`
`74`	`74`	`</DropdownMenuItem>`
`75`	`75`	`</DropdownMenuContent>`
`76`	`76`	`</DropdownMenu>`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ export async function createSession(workspace: string, nodeId?: string) {`
`60`	`60`	`});`
`61`	`61`	`return { data: dbEntry[0] };`
`62`	`62`	`} catch (e) {`
	`63`	`+ console.log(e);`
`63`	`64`	`return { error: (e as Error).message, data: null };`
`64`	`65`	`}`
`65`	`66`	`}`