refactor: Update docker images

.dockerignore

@@ -1,2 +1,3 @@
 node_modules
 .svelte-kit
+Dockerfile*

.gitignore

@@ -3,3 +3,4 @@ node_modules
 dist
 *.old
 *.tsbuildinfo
+logs

README.md

@@ -76,7 +76,6 @@ Before you begin, ensure you have the following installed:
       > This command will output the local Supabase URLs and anon key. Make note of these, especially the DATABASE_URL and SUPABASE_URL (usually http://localhost:54321) and SUPABASE_ANON_KEY (which you'll need for client-side configuration if you were using the Supabase client directly, though your setup abstracts this).
     - **Supabase Cloud:** You'll configure your `.env` variables (see next step) with your Supabase cloud project details.
 4.  **Set Environment Variables:** You'll need to set several environment variables. Create a `.env` file in the project root and add the following:
-
     - **Server-side variables (/apps/server/.env):**
       ```
       CORS_ORIGIN=http://localhost:5173 # Or wherever your frontend is located

apps/server/Dockerfile

@@ -1,36 +1,37 @@
-FROM oven/bun:alpine AS base
+FROM oven/bun:1.1.18-alpine AS base
 
+# --- Building ---
 FROM base AS builder
-
 RUN apk update
-# Set working directory
+
 WORKDIR /app
-RUN bun install -g turbo
 
-# This assumes its being run in the base spookcord directory
 COPY . .
-RUN turbo prune server --docker
 
-# Add lockfile and package.json's of isolated subworkspace
+RUN bunx turbo prune server --docker
+
+# --- Installer ---
 FROM base AS installer
-RUN apk update
+
 WORKDIR /app
 
-# First install dependencies (as they change less often)
 COPY --from=builder /app/out/json/ .
-RUN bun install
-
-# Build the project and its dependencies
 COPY --from=builder /app/out/full/ .
 
-RUN bun turbo compile
+# Install deps & Compile
+RUN bun install --production --ignore-scripts --frozen-lockfile
+RUN bunx turbo compile
 
+# --- Runner ---
 FROM base AS runner
+
 WORKDIR /app
 
-# Don't run production as root
 USER bun
-COPY --from=installer /app/apps/server/server ./server
+
+COPY --from=installer --chown=bun:bun /app/apps/server/server ./server
+COPY --from=installer --chown=bun:bun /app/apps/server/src/db/migrations ./src/db/migrations
 
 EXPOSE 3000/tcp
-CMD ./server
+
+CMD ["./server"]

apps/server/drizzle.config.ts

@@ -18,6 +18,5 @@ export default defineConfig({
 		table: 'journal',
 		schema: 'drizzle'
 	},
-	verbose: true,
-	strict: true
+	verbose: true
 });

apps/server/package.json

@@ -16,9 +16,6 @@
 	"dependencies": {
 		"@orpc/client": "^1.2.0",
 		"@orpc/server": "^1.2.0",
-		"@spookcord/db-schema": "workspace:*",
-		"@spookcord/types": "workspace:*",
-		"@types/jsonwebtoken": "^9.0.9",
 		"better-auth": "^1.2.8",
 		"dotenv": "^16.5.0",
 		"drizzle-orm": "^latest",
@@ -28,7 +25,10 @@
 		"zod": "^3.25.56"
 	},
 	"devDependencies": {
+		"@spookcord/db-schema": "workspace:*",
+		"@spookcord/types": "workspace:*",
 		"@types/bun": "^1.2.13",
+		"@types/jsonwebtoken": "^9.0.9",
 		"@types/pg": "^8.15.2",
 		"drizzle-kit": "^latest",
 		"tsc-alias": "^1.8.16",

apps/server/src/db/index.ts

@@ -3,5 +3,102 @@
 import { drizzle } from 'drizzle-orm/node-postgres';
 
 import * as schema from '@spookcord/db-schema';
+import { migrate } from 'drizzle-orm/postgres-js/migrator';
+import { sql } from 'drizzle-orm';
 
 export const db = drizzle(process.env.DATABASE_URL || '', { schema });
+
+export async function runMigrations() {
+	console.info('[database] Running migrations');
+	try {
+		await migrate(db, { migrationsFolder: './src/db/migrations' });
+		console.log('[database] OK');
+		await checkRealtime();
+	} catch (error) {
+		console.error(
+			'[database] FAIL | Migrations failed \n',
+			error,
+			'\n - This error should be reported. (This is an unrecoverable error)'
+		);
+		process.exit(1);
+	}
+}
+
+async function checkRealtime() {
+	console.log('[database] Checking realtime');
+
+	try {
+		// Check if we already have the function
+		const functionExistsResult = await db.execute(sql`
+      SELECT EXISTS (
+        SELECT 1
+        FROM pg_proc
+        WHERE proname = 'add_table_to_realtime'
+      )
+    `);
+
+		// Do we really need .exists?
+		const functionExists = functionExistsResult.rows[0]?.exists || false;
+
+		if (!functionExists) {
+			// Create the function
+			console.warn("[database] WARN function doesn't exist, created");
+			await db.execute(sql`
+          CREATE OR REPLACE FUNCTION add_table_to_realtime(_table_name text)
+          RETURNS text AS
+          $$
+          BEGIN
+            EXECUTE format('ALTER PUBLICATION supabase_realtime ADD TABLE %I;', _table_name);
+            RETURN 'success';
+          EXCEPTION
+            WHEN duplicate_object THEN
+                RETURN 'Table already exists';
+            WHEN OTHERS THEN
+                RAISE;
+          END
+          $$ LANGUAGE 'plpgsql';
+        `);
+			console.info('[database] OK, created.');
+		} else {
+			console.debug('[database] DBG Function exists');
+		}
+
+		const tableExistsResult = await db.execute(sql`
+      SELECT EXISTS (
+        SELECT 1
+        FROM pg_tables
+        WHERE schemaname = 'public' AND tablename = 'message'
+      )
+    `);
+
+		const tableExists = tableExistsResult.rows[0].exists || false;
+
+		if (tableExists) {
+			const result = await db.execute(sql`
+        SELECT add_table_to_realtime('message');
+      `);
+
+			const status = result.rows[0].add_table_to_realtime || 'unknown';
+
+			switch (status) {
+				case 'success':
+					console.log('[database] OK table successfully added.');
+					break;
+				case 'Table already exists':
+					console.debug('[database] OK table aready exists');
+					break;
+				default:
+					console.error('[database] WARN an unexpected error occurred ', status);
+			}
+			return;
+		}
+
+		console.error("[database] FAIL no table named 'message' found!");
+	} catch (error) {
+		console.error(
+			'[database] FAIL | Realtime table failed\n',
+			error,
+			"\n |-> Continuning anyway, your messages won't appear in realtime."
+		);
+	}
+}

apps/server/src/db/migrations/20250715152007_inital_baseline_schema.sql

@@ -0,0 +1,111 @@
+CREATE TABLE "account" (
+	"id" text PRIMARY KEY NOT NULL,
+	"account_id" text NOT NULL,
+	"provider_id" text NOT NULL,
+	"user_id" text NOT NULL,
+	"access_token" text,
+	"refresh_token" text,
+	"id_token" text,
+	"access_token_expires_at" timestamp,
+	"refresh_token_expires_at" timestamp,
+	"scope" text,
+	"password" text,
+	"created_at" timestamp NOT NULL,
+	"updated_at" timestamp NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "category" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"name" text NOT NULL,
+	"server_id" uuid NOT NULL,
+	"position" serial NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "channel" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"name" text NOT NULL,
+	"category_id" uuid NOT NULL,
+	"type" text DEFAULT 'text' NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "jwks" (
+	"id" text PRIMARY KEY NOT NULL,
+	"public_key" text NOT NULL,
+	"private_key" text NOT NULL,
+	"created_at" timestamp NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "message" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"body" text NOT NULL,
+	"sender_id" text NOT NULL,
+	"channel_id" uuid NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "message" ENABLE ROW LEVEL SECURITY;--> statement-breakpoint
+CREATE TABLE "server" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"name" text NOT NULL,
+	"owner_id" text NOT NULL,
+	"image_url" text DEFAULT '',
+	"invite_code" text NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL,
+	CONSTRAINT "server_invite_code_unique" UNIQUE("invite_code")
+);
+--> statement-breakpoint
+CREATE TABLE "server_members" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"server_id" uuid NOT NULL,
+	"user_id" text NOT NULL,
+	"joined_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "session" (
+	"id" text PRIMARY KEY NOT NULL,
+	"expires_at" timestamp NOT NULL,
+	"token" text NOT NULL,
+	"created_at" timestamp NOT NULL,
+	"updated_at" timestamp NOT NULL,
+	"ip_address" text,
+	"user_agent" text,
+	"user_id" text NOT NULL,
+	CONSTRAINT "session_token_unique" UNIQUE("token")
+);
+--> statement-breakpoint
+CREATE TABLE "user" (
+	"id" text PRIMARY KEY NOT NULL,
+	"name" text NOT NULL,
+	"email" text NOT NULL,
+	"email_verified" boolean NOT NULL,
+	"image" text,
+	"created_at" timestamp NOT NULL,
+	"updated_at" timestamp NOT NULL,
+	CONSTRAINT "user_email_unique" UNIQUE("email")
+);
+--> statement-breakpoint
+CREATE TABLE "verification" (
+	"id" text PRIMARY KEY NOT NULL,
+	"identifier" text NOT NULL,
+	"value" text NOT NULL,
+	"expires_at" timestamp NOT NULL,
+	"created_at" timestamp,
+	"updated_at" timestamp
+);
+--> statement-breakpoint
+ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "category" ADD CONSTRAINT "category_server_id_server_id_fk" FOREIGN KEY ("server_id") REFERENCES "public"."server"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "channel" ADD CONSTRAINT "channel_category_id_category_id_fk" FOREIGN KEY ("category_id") REFERENCES "public"."category"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "message" ADD CONSTRAINT "message_sender_id_user_id_fk" FOREIGN KEY ("sender_id") REFERENCES "public"."user"("id") ON DELETE restrict ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "message" ADD CONSTRAINT "message_channel_id_channel_id_fk" FOREIGN KEY ("channel_id") REFERENCES "public"."channel"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "server" ADD CONSTRAINT "server_owner_id_user_id_fk" FOREIGN KEY ("owner_id") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "server_members" ADD CONSTRAINT "server_members_server_id_server_id_fk" FOREIGN KEY ("server_id") REFERENCES "public"."server"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "server_members" ADD CONSTRAINT "server_members_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE UNIQUE INDEX "server_members_unique_idx" ON "server_members" USING btree ("server_id","user_id");