refactor(daemon): switch moduleres to bundler

feat(daemon): more options for config file loading+help message

apps/daemon/index.d.ts

@@ -1 +1 @@
-export { App } from "~/index.ts";
+export { App } from "~/index";

apps/daemon/package.json

@@ -4,6 +4,7 @@
 	"version": "1.0.50",
 	"scripts": {
 		"start": "./stardustd",
+		"build:debug": "bun build src/index.ts --compile --sourcemap --outfile stardustd",
 		"build": "bun build src/index.ts --compile --minify --outfile stardustd",
 		"dev": "bun run --watch src/index.ts",
 		"check-types": "tsc --noEmit",
@@ -26,5 +27,5 @@
 		"bun-types": "latest",
 		"ts-json-schema-generator": "^2.3.0"
 	},
-	"module": "src/index.js"
+	"module": "src/index.ts"
 }

apps/daemon/src/auth-middleware.ts

@@ -1,5 +1,5 @@
 import type { Context } from "elysia";
-import generateToken from "~/lib/auth-token.js";
+import generateToken from "~/lib/auth-token";
 const configuredToken = generateToken();
 export function authCheck(c: Context) {
 	const authHeader = c.request.headers.get("Authorization");

apps/daemon/src/help-message.ts

@@ -0,0 +1,8 @@
+if (process.argv.includes("--help") || process.argv.includes("-h") || process.argv.includes("help")) {
+	console.log(`
+✨ Stardust daemon by spaceness
+Options
+ --config: path to a stardustd config file. Defaults to [executable path]/config.yml or (HOME || XDG_CONFIG_HOME)/.config/stardustd.yml
+`);
+	process.exit(0);
+}

apps/daemon/src/index.ts

@@ -1,17 +1,20 @@
-import "~/lib/config/validate.js";
+import "./help-message";
+import { getConfig, validateConfig } from "~/lib/config";
+if (!validateConfig(getConfig())) {
+	console.error("Invalid configuration");
+	process.exit(1);
+}
 import { Elysia } from "elysia";
-import { docker } from "~/lib/docker.js";
-import checkDockerNetwork from "~/lib/network-check.js";
-import checkSystemService from "~/lib/service-check.js";
-import sessionHandler from "~/session/index.js";
-import { authCheck } from "./auth-middleware.js";
-import { getConfig } from "./lib/config/index.js";
+import { authCheck } from "~/auth-middleware";
+import { docker } from "~/lib/docker";
+import checkDockerNetwork from "~/lib/network-check";
+import checkSystemService from "~/lib/service-check";
+import sessionHandler from "~/session";
 await checkDockerNetwork();
 const config = getConfig();
 if (typeof config.service !== "boolean" || config.service === true) {
 	checkSystemService();
 }
-
 const app = new Elysia()
 	.get("/", async (c) => {
 		return {

apps/daemon/src/lib/auth-token.ts

@@ -1,7 +1,7 @@
 import { randomBytes } from "node:crypto";
 import { dump } from "js-yaml";
-import { getConfig } from "./config/index.js";
-import type { Config } from "./config/types.js";
+import { getConfig } from "./config/index";
+import type { Config } from "./config/types.d.ts";
 
 export default function generateToken() {
 	const config = getConfig();
@@ -17,7 +17,7 @@ export default function generateToken() {
 		token,
 	} satisfies Config);
 	writer.write(`${newConfig}\n`);
-	writer.write("# yaml-language-server: $schema=schema.json");
+	writer.write("# yaml-language-server: $schema=schemaon");
 	writer.end();
 	console.log("✨ Stardust: Token generated: %s", token);
 	return token;

apps/daemon/src/lib/config/index.ts

@@ -1,12 +1,41 @@
+import { parseArgs } from "node:util";
 import { Ajv } from "ajv";
 import { load } from "js-yaml";
 import defaultSchema from "~/../schema.json";
-import type { Config } from "./types.d.ts";
+import type { Config } from "./types";
+const {
+	values: { config: cmdConfig = "" },
+} = parseArgs({
+	args: Bun.argv,
+	options: {
+		config: {
+			type: "string",
+		},
+	},
+	strict: true,
+	allowPositionals: true,
+});
 let loadedConfig: unknown;
 try {
-	loadedConfig = load((await Bun.file(`${process.cwd()}/config.yml`).text()) || "");
-} catch {
-	console.log("Invalid or no config");
+	for (const path of [
+		cmdConfig,
+		`${process.cwd()}/config.yaml`,
+		`${process.cwd()}/config.yml`,
+		`${Bun.env.XDG_CONFIG_HOME || Bun.env.HOME}/.config/stardustd.yaml`,
+		`${Bun.env.XDG_CONFIG_HOME || Bun.env.HOME}/.config/stardustd.yml`,
+	]) {
+		const file = Bun.file(path);
+		if (await file.exists()) {
+			loadedConfig = load(await file.text());
+			console.log("✨ Stardust: Loaded config from %s", path);
+			break;
+		}
+	}
+	if (!loadedConfig) {
+		throw new Error("Config file not found");
+	}
+} catch (e) {
+	console.error("✨ Stardust: Invalid or no config", e);
 	process.exit(1);
 }
 export function getConfig<T = Config>(): T {

apps/daemon/src/lib/docker.ts

@@ -1,5 +1,5 @@
 import Dockerode from "dockerode";
-import { getConfig } from "~/lib/config/index.js";
+import { getConfig } from "~/lib/config";
 const { docker: config } = getConfig();
 const socketConfig: Dockerode.DockerOptions = { socketPath: config.socket || "/var/run/docker.sock" };
 const httpConfig: Dockerode.DockerOptions = {

apps/daemon/src/lib/network-check.ts

@@ -1,5 +1,5 @@
-import { getConfig } from "~/lib/config/index.js";
-import { docker } from "~/lib/docker.js";
+import { getConfig } from "~/lib/config";
+import { docker } from "~/lib/docker";
 const { docker: config } = getConfig();
 
 export default async function checkDockerNetwork() {

apps/daemon/src/session/create.ts

@@ -1,6 +1,6 @@
 import { randomBytes } from "node:crypto";
-import { getConfig } from "~/lib/config/index.js";
-import { docker } from "~/lib/docker.js";
+import { getConfig } from "~/lib/config";
+import { docker } from "~/lib/docker";
 
 export default async function createSession({
 	workspace,

apps/daemon/src/session/delete.ts

@@ -1,4 +1,4 @@
-import { docker } from "~/lib/docker.js";
+import { docker } from "~/lib/docker";
 
 export default async function deleteSession(id: string) {
 	await docker.getContainer(id).remove({ force: true });

apps/daemon/src/session/file.ts

@@ -1,4 +1,4 @@
-import { docker } from "~/lib/docker.js";
+import { docker } from "~/lib/docker";
 
 export async function sendFile(id: string, name: string, file: Uint8Array) {
 	const container = docker.getContainer(id);

apps/daemon/src/session/index.ts

@@ -1,11 +1,11 @@
 import { Elysia, t } from "elysia";
-import { getConfig } from "~/lib/config/index.js";
-import { docker } from "~/lib/docker.js";
-import createSession from "./create.js";
-import deleteSession from "./delete.js";
-import { getFile, listFiles, sendFile } from "./file.js";
-import manageSession from "./manage.js";
-import screenshot from "./screenshot.js";
+import { getConfig } from "~/lib/config";
+import { docker } from "~/lib/docker";
+import createSession from "./create";
+import deleteSession from "./delete";
+import { getFile, listFiles, sendFile } from "./file";
+import manageSession from "./manage";
+import screenshot from "./screenshot";
 export default new Elysia({ prefix: "/sessions" })
 	.put(
 		"/create",

apps/daemon/src/session/manage.ts

@@ -1,5 +1,5 @@
 import type Dockerode from "dockerode";
-import { docker } from "~/lib/docker.js";
+import { docker } from "~/lib/docker";
 export default async function manageSession(id: string, action: keyof Dockerode.Container) {
 	const container = docker.getContainer(id);
 	await container[action]();

apps/daemon/src/session/screenshot.ts

@@ -1,4 +1,4 @@
-import { docker } from "~/lib/docker.js";
+import { docker } from "~/lib/docker";
 export default async function screenshot(id: string) {
 	const container = docker.getContainer(id);
 	const exec = await container.exec({

apps/daemon/tsconfig.json

@@ -1,8 +1,7 @@
 {
 	"extends": "@stardust/tsconfig/base.json",
 	"compilerOptions": {
-		"moduleResolution": "nodenext",
-		"module": "NodeNext",
+		"moduleResolution": "bundler",
 		"resolveJsonModule": true,
 		"paths": {
 			"~/*": ["./src/*"]

apps/web/src/app/(main)/sessions/page.tsx

@@ -32,7 +32,7 @@ const ManageSessionButton = ({
 		action={async () => {
 			"use server";
 			const node = getNode(session);
-			await node.sessions({ id: session.id }).patch({ action });
+			await node.sessions(session).patch({ action });
 			if (redirectToView) redirect(`/view/${session.id}`);
 			else revalidatePath("/sessions");
 		}}

apps/web/src/lib/session/create.ts

@@ -53,7 +53,7 @@ export async function createSession(workspace: string) {
 		})
 		.returning()
 		.catch(async (e) => {
-			await node.sessions({ ...container }).delete();
+			await node.sessions(container).delete();
 			throw e;
 		});
 }