ruflo 3.10.36 → 3.10.38

package/src/ruvocal/src/lib/server/api/__tests__/user.spec.ts

@@ -1,239 +1,239 @@
-import { describe, it, expect, beforeEach } from "vitest";
-import superjson from "superjson";
-import { collections } from "$lib/server/database";
-import { createTestLocals, createTestUser, cleanupTestData } from "./testHelpers";
-import { GET as userGET } from "../../../../routes/api/v2/user/+server";
-import {
-	GET as settingsGET,
-	POST as settingsPOST,
-} from "../../../../routes/api/v2/user/settings/+server";
-
-async function parseResponse<T = unknown>(res: Response): Promise<T> {
-	return superjson.parse(await res.text()) as T;
-}
-
-function mockRequestEvent(locals: App.Locals, overrides?: Record<string, unknown>) {
-	return {
-		locals,
-		url: new URL("http://localhost"),
-		request: new Request("http://localhost"),
-		...overrides,
-	} as Parameters<typeof userGET>[0];
-}
-
-describe("GET /api/v2/user", () => {
-	beforeEach(async () => {
-		await cleanupTestData();
-	}, 20000);
-
-	it("returns user info for authenticated user", async () => {
-		const { user, locals } = await createTestUser();
-
-		const res = await userGET(mockRequestEvent(locals));
-		const data = await parseResponse<Record<string, unknown>>(res);
-
-		expect(data).not.toBeNull();
-		expect(data).toMatchObject({
-			id: user._id.toString(),
-			username: user.username,
-			avatarUrl: user.avatarUrl,
-			isAdmin: false,
-			isEarlyAccess: false,
-		});
-	});
-
-	it("returns null for unauthenticated user", async () => {
-		const locals = createTestLocals();
-
-		const res = await userGET(mockRequestEvent(locals));
-		const data = await parseResponse(res);
-
-		expect(data).toBeNull();
-	});
-});
-
-describe("GET /api/v2/user/settings", () => {
-	beforeEach(async () => {
-		await cleanupTestData();
-	}, 20000);
-
-	it("returns default settings when none exist", async () => {
-		const { locals } = await createTestUser();
-
-		const res = await settingsGET(mockRequestEvent(locals));
-		const data = await parseResponse<Record<string, unknown>>(res);
-
-		expect(data).toMatchObject({
-			welcomeModalSeen: false,
-			welcomeModalSeenAt: null,
-			streamingMode: "smooth",
-			directPaste: false,
-			shareConversationsWithModelAuthors: true,
-			customPrompts: {},
-			multimodalOverrides: {},
-			toolsOverrides: {},
-			providerOverrides: {},
-		});
-	});
-
-	it("returns stored settings with canonical streaming mode", async () => {
-		const { user, locals } = await createTestUser();
-
-		await collections.settings.insertOne({
-			userId: user._id,
-			shareConversationsWithModelAuthors: false,
-			activeModel: "custom-model",
-			streamingMode: "raw",
-			directPaste: true,
-			hapticsEnabled: true,
-			customPrompts: { "my-model": "Be helpful" },
-			multimodalOverrides: {},
-			toolsOverrides: {},
-			hidePromptExamples: {},
-			providerOverrides: {},
-			welcomeModalSeenAt: new Date("2024-01-01"),
-			createdAt: new Date(),
-			updatedAt: new Date(),
-		});
-
-		const res = await settingsGET(mockRequestEvent(locals));
-		const data = await parseResponse<Record<string, unknown>>(res);
-
-		expect(data).toMatchObject({
-			welcomeModalSeen: true,
-			shareConversationsWithModelAuthors: false,
-			streamingMode: "raw",
-			directPaste: true,
-			customPrompts: { "my-model": "Be helpful" },
-		});
-	});
-
-	it("maps legacy stored streamingMode=final to smooth", async () => {
-		const { user, locals } = await createTestUser();
-
-		const legacySettingsWithFinal = {
-			userId: user._id,
-			shareConversationsWithModelAuthors: true,
-			activeModel: "custom-model",
-			streamingMode: "final",
-			directPaste: false,
-			customPrompts: {},
-			multimodalOverrides: {},
-			toolsOverrides: {},
-			hidePromptExamples: {},
-			providerOverrides: {},
-			createdAt: new Date(),
-			updatedAt: new Date(),
-		};
-
-		await collections.settings.insertOne(
-			legacySettingsWithFinal as unknown as Parameters<typeof collections.settings.insertOne>[0]
-		);
-
-		const res = await settingsGET(mockRequestEvent(locals));
-		const data = await parseResponse<Record<string, unknown>>(res);
-
-		expect(data).toMatchObject({
-			streamingMode: "smooth",
-		});
-	});
-});
-
-describe("POST /api/v2/user/settings", () => {
-	beforeEach(async () => {
-		await cleanupTestData();
-	}, 20000);
-
-	it("creates settings with upsert", async () => {
-		const { user, locals } = await createTestUser();
-
-		const body = {
-			shareConversationsWithModelAuthors: false,
-			activeModel: "test-model",
-			customPrompts: {},
-			multimodalOverrides: {},
-			toolsOverrides: {},
-			providerOverrides: {},
-			streamingMode: "raw",
-			directPaste: false,
-			hidePromptExamples: {},
-		};
-
-		const res = await settingsPOST(
-			mockRequestEvent(locals, {
-				request: new Request("http://localhost", {
-					method: "POST",
-					body: JSON.stringify(body),
-					headers: { "Content-Type": "application/json" },
-				}),
-			})
-		);
-
-		expect(res.status).toBe(200);
-
-		const stored = await collections.settings.findOne({ userId: user._id });
-		expect(stored).not.toBeNull();
-		expect(stored?.shareConversationsWithModelAuthors).toBe(false);
-		expect(stored?.streamingMode).toBe("raw");
-		expect(stored?.createdAt).toBeInstanceOf(Date);
-		expect(stored?.updatedAt).toBeInstanceOf(Date);
-	});
-
-	it("sets welcomeModalSeenAt when welcomeModalSeen is true", async () => {
-		const { user, locals } = await createTestUser();
-
-		const body = {
-			welcomeModalSeen: true,
-			shareConversationsWithModelAuthors: true,
-			activeModel: "test-model",
-			customPrompts: {},
-			multimodalOverrides: {},
-			toolsOverrides: {},
-			providerOverrides: {},
-			streamingMode: "smooth",
-			directPaste: false,
-			hidePromptExamples: {},
-		};
-
-		await settingsPOST(
-			mockRequestEvent(locals, {
-				request: new Request("http://localhost", {
-					method: "POST",
-					body: JSON.stringify(body),
-					headers: { "Content-Type": "application/json" },
-				}),
-			})
-		);
-
-		const stored = await collections.settings.findOne({ userId: user._id });
-		expect(stored).not.toBeNull();
-		expect(stored?.welcomeModalSeenAt).toBeInstanceOf(Date);
-	});
-
-	it("validates body with Zod and applies defaults for missing fields", async () => {
-		const { user, locals } = await createTestUser();
-
-		// POST with minimal body — Zod defaults should fill in the rest
-		const body = {};
-
-		const res = await settingsPOST(
-			mockRequestEvent(locals, {
-				request: new Request("http://localhost", {
-					method: "POST",
-					body: JSON.stringify(body),
-					headers: { "Content-Type": "application/json" },
-				}),
-			})
-		);
-
-		expect(res.status).toBe(200);
-
-		const stored = await collections.settings.findOne({ userId: user._id });
-		expect(stored).not.toBeNull();
-		// Zod defaults should be applied
-		expect(stored?.shareConversationsWithModelAuthors).toBe(true);
-		expect(stored?.streamingMode).toBe("smooth");
-		expect(stored?.directPaste).toBe(false);
-		expect(stored?.customPrompts).toEqual({});
-	});
-});
+import { describe, it, expect, beforeEach } from "vitest";
+import superjson from "superjson";
+import { collections } from "$lib/server/database";
+import { createTestLocals, createTestUser, cleanupTestData } from "./testHelpers";
+import { GET as userGET } from "../../../../routes/api/v2/user/+server";
+import {
+	GET as settingsGET,
+	POST as settingsPOST,
+} from "../../../../routes/api/v2/user/settings/+server";
+
+async function parseResponse<T = unknown>(res: Response): Promise<T> {
+	return superjson.parse(await res.text()) as T;
+}
+
+function mockRequestEvent(locals: App.Locals, overrides?: Record<string, unknown>) {
+	return {
+		locals,
+		url: new URL("http://localhost"),
+		request: new Request("http://localhost"),
+		...overrides,
+	} as Parameters<typeof userGET>[0];
+}
+
+describe("GET /api/v2/user", () => {
+	beforeEach(async () => {
+		await cleanupTestData();
+	}, 20000);
+
+	it("returns user info for authenticated user", async () => {
+		const { user, locals } = await createTestUser();
+
+		const res = await userGET(mockRequestEvent(locals));
+		const data = await parseResponse<Record<string, unknown>>(res);
+
+		expect(data).not.toBeNull();
+		expect(data).toMatchObject({
+			id: user._id.toString(),
+			username: user.username,
+			avatarUrl: user.avatarUrl,
+			isAdmin: false,
+			isEarlyAccess: false,
+		});
+	});
+
+	it("returns null for unauthenticated user", async () => {
+		const locals = createTestLocals();
+
+		const res = await userGET(mockRequestEvent(locals));
+		const data = await parseResponse(res);
+
+		expect(data).toBeNull();
+	});
+});
+
+describe("GET /api/v2/user/settings", () => {
+	beforeEach(async () => {
+		await cleanupTestData();
+	}, 20000);
+
+	it("returns default settings when none exist", async () => {
+		const { locals } = await createTestUser();
+
+		const res = await settingsGET(mockRequestEvent(locals));
+		const data = await parseResponse<Record<string, unknown>>(res);
+
+		expect(data).toMatchObject({
+			welcomeModalSeen: false,
+			welcomeModalSeenAt: null,
+			streamingMode: "smooth",
+			directPaste: false,
+			shareConversationsWithModelAuthors: true,
+			customPrompts: {},
+			multimodalOverrides: {},
+			toolsOverrides: {},
+			providerOverrides: {},
+		});
+	});
+
+	it("returns stored settings with canonical streaming mode", async () => {
+		const { user, locals } = await createTestUser();
+
+		await collections.settings.insertOne({
+			userId: user._id,
+			shareConversationsWithModelAuthors: false,
+			activeModel: "custom-model",
+			streamingMode: "raw",
+			directPaste: true,
+			hapticsEnabled: true,
+			customPrompts: { "my-model": "Be helpful" },
+			multimodalOverrides: {},
+			toolsOverrides: {},
+			hidePromptExamples: {},
+			providerOverrides: {},
+			welcomeModalSeenAt: new Date("2024-01-01"),
+			createdAt: new Date(),
+			updatedAt: new Date(),
+		});
+
+		const res = await settingsGET(mockRequestEvent(locals));
+		const data = await parseResponse<Record<string, unknown>>(res);
+
+		expect(data).toMatchObject({
+			welcomeModalSeen: true,
+			shareConversationsWithModelAuthors: false,
+			streamingMode: "raw",
+			directPaste: true,
+			customPrompts: { "my-model": "Be helpful" },
+		});
+	});
+
+	it("maps legacy stored streamingMode=final to smooth", async () => {
+		const { user, locals } = await createTestUser();
+
+		const legacySettingsWithFinal = {
+			userId: user._id,
+			shareConversationsWithModelAuthors: true,
+			activeModel: "custom-model",
+			streamingMode: "final",
+			directPaste: false,
+			customPrompts: {},
+			multimodalOverrides: {},
+			toolsOverrides: {},
+			hidePromptExamples: {},
+			providerOverrides: {},
+			createdAt: new Date(),
+			updatedAt: new Date(),
+		};
+
+		await collections.settings.insertOne(
+			legacySettingsWithFinal as unknown as Parameters<typeof collections.settings.insertOne>[0]
+		);
+
+		const res = await settingsGET(mockRequestEvent(locals));
+		const data = await parseResponse<Record<string, unknown>>(res);
+
+		expect(data).toMatchObject({
+			streamingMode: "smooth",
+		});
+	});
+});
+
+describe("POST /api/v2/user/settings", () => {
+	beforeEach(async () => {
+		await cleanupTestData();
+	}, 20000);
+
+	it("creates settings with upsert", async () => {
+		const { user, locals } = await createTestUser();
+
+		const body = {
+			shareConversationsWithModelAuthors: false,
+			activeModel: "test-model",
+			customPrompts: {},
+			multimodalOverrides: {},
+			toolsOverrides: {},
+			providerOverrides: {},
+			streamingMode: "raw",
+			directPaste: false,
+			hidePromptExamples: {},
+		};
+
+		const res = await settingsPOST(
+			mockRequestEvent(locals, {
+				request: new Request("http://localhost", {
+					method: "POST",
+					body: JSON.stringify(body),
+					headers: { "Content-Type": "application/json" },
+				}),
+			})
+		);
+
+		expect(res.status).toBe(200);
+
+		const stored = await collections.settings.findOne({ userId: user._id });
+		expect(stored).not.toBeNull();
+		expect(stored?.shareConversationsWithModelAuthors).toBe(false);
+		expect(stored?.streamingMode).toBe("raw");
+		expect(stored?.createdAt).toBeInstanceOf(Date);
+		expect(stored?.updatedAt).toBeInstanceOf(Date);
+	});
+
+	it("sets welcomeModalSeenAt when welcomeModalSeen is true", async () => {
+		const { user, locals } = await createTestUser();
+
+		const body = {
+			welcomeModalSeen: true,
+			shareConversationsWithModelAuthors: true,
+			activeModel: "test-model",
+			customPrompts: {},
+			multimodalOverrides: {},
+			toolsOverrides: {},
+			providerOverrides: {},
+			streamingMode: "smooth",
+			directPaste: false,
+			hidePromptExamples: {},
+		};
+
+		await settingsPOST(
+			mockRequestEvent(locals, {
+				request: new Request("http://localhost", {
+					method: "POST",
+					body: JSON.stringify(body),
+					headers: { "Content-Type": "application/json" },
+				}),
+			})
+		);
+
+		const stored = await collections.settings.findOne({ userId: user._id });
+		expect(stored).not.toBeNull();
+		expect(stored?.welcomeModalSeenAt).toBeInstanceOf(Date);
+	});
+
+	it("validates body with Zod and applies defaults for missing fields", async () => {
+		const { user, locals } = await createTestUser();
+
+		// POST with minimal body — Zod defaults should fill in the rest
+		const body = {};
+
+		const res = await settingsPOST(
+			mockRequestEvent(locals, {
+				request: new Request("http://localhost", {
+					method: "POST",
+					body: JSON.stringify(body),
+					headers: { "Content-Type": "application/json" },
+				}),
+			})
+		);
+
+		expect(res.status).toBe(200);
+
+		const stored = await collections.settings.findOne({ userId: user._id });
+		expect(stored).not.toBeNull();
+		// Zod defaults should be applied
+		expect(stored?.shareConversationsWithModelAuthors).toBe(true);
+		expect(stored?.streamingMode).toBe("smooth");
+		expect(stored?.directPaste).toBe(false);
+		expect(stored?.customPrompts).toEqual({});
+	});
+});

package/src/ruvocal/src/lib/server/api/types.ts

@@ -1,37 +1,37 @@
-import type { BackendModel } from "$lib/server/models";
-
-export type GETModelsResponse = Array<{
-	id: string;
-	name: string;
-	websiteUrl?: string;
-	modelUrl?: string;
-	datasetName?: string;
-	datasetUrl?: string;
-	displayName: string;
-	description?: string;
-	logoUrl?: string;
-	providers?: Array<{ provider: string } & Record<string, unknown>>;
-	promptExamples?: { title: string; prompt: string }[];
-	parameters: BackendModel["parameters"];
-	preprompt?: string;
-	multimodal: boolean;
-	multimodalAcceptedMimetypes?: string[];
-	supportsTools?: boolean;
-	unlisted: boolean;
-	hasInferenceAPI: boolean;
-	isRouter: boolean;
-}>;
-
-export type GETOldModelsResponse = Array<{
-	id: string;
-	name: string;
-	displayName: string;
-	transferTo?: string;
-}>;
-
-export interface FeatureFlags {
-	enableAssistants: boolean;
-	loginEnabled: boolean;
-	isAdmin: boolean;
-	transcriptionEnabled: boolean;
-}
+import type { BackendModel } from "$lib/server/models";
+
+export type GETModelsResponse = Array<{
+	id: string;
+	name: string;
+	websiteUrl?: string;
+	modelUrl?: string;
+	datasetName?: string;
+	datasetUrl?: string;
+	displayName: string;
+	description?: string;
+	logoUrl?: string;
+	providers?: Array<{ provider: string } & Record<string, unknown>>;
+	promptExamples?: { title: string; prompt: string }[];
+	parameters: BackendModel["parameters"];
+	preprompt?: string;
+	multimodal: boolean;
+	multimodalAcceptedMimetypes?: string[];
+	supportsTools?: boolean;
+	unlisted: boolean;
+	hasInferenceAPI: boolean;
+	isRouter: boolean;
+}>;
+
+export type GETOldModelsResponse = Array<{
+	id: string;
+	name: string;
+	displayName: string;
+	transferTo?: string;
+}>;
+
+export interface FeatureFlags {
+	enableAssistants: boolean;
+	loginEnabled: boolean;
+	isAdmin: boolean;
+	transcriptionEnabled: boolean;
+}

package/src/ruvocal/src/lib/server/api/utils/requireAuth.ts

@@ -1,22 +1,22 @@
-import { error } from "@sveltejs/kit";
-
-/**
- * Throws 401 if neither a user._id nor sessionId is present in locals.
- */
-export function requireAuth(locals: App.Locals): void {
-	if (!locals.user?._id && !locals.sessionId) {
-		error(401, "Must have a valid session or user");
-	}
-}
-
-/**
- * Throws 401 if no user/session, 403 if not admin.
- */
-export function requireAdmin(locals: App.Locals): void {
-	if (!locals.user && !locals.sessionId) {
-		error(401, "Unauthorized");
-	}
-	if (!locals.isAdmin) {
-		error(403, "Admin privileges required");
-	}
-}
+import { error } from "@sveltejs/kit";
+
+/**
+ * Throws 401 if neither a user._id nor sessionId is present in locals.
+ */
+export function requireAuth(locals: App.Locals): void {
+	if (!locals.user?._id && !locals.sessionId) {
+		error(401, "Must have a valid session or user");
+	}
+}
+
+/**
+ * Throws 401 if no user/session, 403 if not admin.
+ */
+export function requireAdmin(locals: App.Locals): void {
+	if (!locals.user && !locals.sessionId) {
+		error(401, "Unauthorized");
+	}
+	if (!locals.isAdmin) {
+		error(403, "Admin privileges required");
+	}
+}