Compare commits
5 Commits
feat/ms22-
...
feat/ms22-
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a4d4e750b | |||
| 477d0c8fdf | |||
| 03af39def9 | |||
| dc7e0c805c | |||
| 2b010fadda |
@@ -36,6 +36,7 @@
|
||||
"@nestjs/mapped-types": "^2.1.0",
|
||||
"@nestjs/platform-express": "^11.1.12",
|
||||
"@nestjs/platform-socket.io": "^11.1.12",
|
||||
"@nestjs/schedule": "^6.1.1",
|
||||
"@nestjs/throttler": "^6.5.0",
|
||||
"@nestjs/websockets": "^11.1.12",
|
||||
"@opentelemetry/api": "^1.9.0",
|
||||
|
||||
@@ -2,6 +2,7 @@ import { Module } from "@nestjs/common";
|
||||
import { APP_INTERCEPTOR, APP_GUARD } from "@nestjs/core";
|
||||
import { ThrottlerModule } from "@nestjs/throttler";
|
||||
import { BullModule } from "@nestjs/bullmq";
|
||||
import { ScheduleModule } from "@nestjs/schedule";
|
||||
import { ThrottlerValkeyStorageService, ThrottlerApiKeyGuard } from "./common/throttler";
|
||||
import { CsrfGuard } from "./common/guards/csrf.guard";
|
||||
import { CsrfService } from "./common/services/csrf.service";
|
||||
@@ -53,6 +54,10 @@ import { ConversationArchiveModule } from "./conversation-archive/conversation-a
|
||||
import { RlsContextInterceptor } from "./common/interceptors/rls-context.interceptor";
|
||||
import { AgentConfigModule } from "./agent-config/agent-config.module";
|
||||
import { ContainerLifecycleModule } from "./container-lifecycle/container-lifecycle.module";
|
||||
import { ContainerReaperModule } from "./container-reaper/container-reaper.module";
|
||||
import { FleetSettingsModule } from "./fleet-settings/fleet-settings.module";
|
||||
import { OnboardingModule } from "./onboarding/onboarding.module";
|
||||
import { ChatProxyModule } from "./chat-proxy/chat-proxy.module";
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
@@ -83,6 +88,7 @@ import { ContainerLifecycleModule } from "./container-lifecycle/container-lifecy
|
||||
};
|
||||
})(),
|
||||
}),
|
||||
ScheduleModule.forRoot(),
|
||||
TelemetryModule,
|
||||
PrismaModule,
|
||||
DatabaseModule,
|
||||
@@ -127,6 +133,10 @@ import { ContainerLifecycleModule } from "./container-lifecycle/container-lifecy
|
||||
ConversationArchiveModule,
|
||||
AgentConfigModule,
|
||||
ContainerLifecycleModule,
|
||||
ContainerReaperModule,
|
||||
FleetSettingsModule,
|
||||
OnboardingModule,
|
||||
ChatProxyModule,
|
||||
],
|
||||
controllers: [AppController, CsrfController],
|
||||
providers: [
|
||||
|
||||
72
apps/api/src/chat-proxy/chat-proxy.controller.ts
Normal file
72
apps/api/src/chat-proxy/chat-proxy.controller.ts
Normal file
@@ -0,0 +1,72 @@
|
||||
import { Body, Controller, Post, Req, Res, UnauthorizedException, UseGuards } from "@nestjs/common";
|
||||
import type { Response } from "express";
|
||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
||||
import type { MaybeAuthenticatedRequest } from "../auth/types/better-auth-request.interface";
|
||||
import { ChatStreamDto } from "./chat-proxy.dto";
|
||||
import { ChatProxyService } from "./chat-proxy.service";
|
||||
|
||||
@Controller("chat")
|
||||
@UseGuards(AuthGuard)
|
||||
export class ChatProxyController {
|
||||
constructor(private readonly chatProxyService: ChatProxyService) {}
|
||||
|
||||
// POST /api/chat/stream
|
||||
// Request: { messages: Array<{role, content}> }
|
||||
// Response: SSE stream of chat completion events
|
||||
@Post("stream")
|
||||
async streamChat(
|
||||
@Body() body: ChatStreamDto,
|
||||
@Req() req: MaybeAuthenticatedRequest,
|
||||
@Res() res: Response
|
||||
): Promise<void> {
|
||||
const userId = req.user?.id;
|
||||
if (!userId) {
|
||||
throw new UnauthorizedException("No authenticated user found on request");
|
||||
}
|
||||
|
||||
const abortController = new AbortController();
|
||||
req.once("close", () => {
|
||||
abortController.abort();
|
||||
});
|
||||
|
||||
res.setHeader("Content-Type", "text/event-stream");
|
||||
res.setHeader("Cache-Control", "no-cache");
|
||||
res.setHeader("Connection", "keep-alive");
|
||||
res.setHeader("X-Accel-Buffering", "no");
|
||||
|
||||
try {
|
||||
const upstreamResponse = await this.chatProxyService.proxyChat(
|
||||
userId,
|
||||
body.messages,
|
||||
abortController.signal
|
||||
);
|
||||
|
||||
const upstreamContentType = upstreamResponse.headers.get("content-type");
|
||||
if (upstreamContentType) {
|
||||
res.setHeader("Content-Type", upstreamContentType);
|
||||
}
|
||||
|
||||
if (!upstreamResponse.body) {
|
||||
throw new Error("OpenClaw response did not include a stream body");
|
||||
}
|
||||
|
||||
for await (const chunk of upstreamResponse.body as unknown as AsyncIterable<Uint8Array>) {
|
||||
if (res.writableEnded || res.destroyed) {
|
||||
break;
|
||||
}
|
||||
|
||||
res.write(Buffer.from(chunk));
|
||||
}
|
||||
} catch (error: unknown) {
|
||||
if (!res.writableEnded && !res.destroyed) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
res.write("event: error\n");
|
||||
res.write(`data: ${JSON.stringify({ error: message })}\n\n`);
|
||||
}
|
||||
} finally {
|
||||
if (!res.writableEnded && !res.destroyed) {
|
||||
res.end();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
25
apps/api/src/chat-proxy/chat-proxy.dto.ts
Normal file
25
apps/api/src/chat-proxy/chat-proxy.dto.ts
Normal file
@@ -0,0 +1,25 @@
|
||||
import { Type } from "class-transformer";
|
||||
import { ArrayMinSize, IsArray, IsNotEmpty, IsString, ValidateNested } from "class-validator";
|
||||
|
||||
export interface ChatMessage {
|
||||
role: string;
|
||||
content: string;
|
||||
}
|
||||
|
||||
export class ChatMessageDto implements ChatMessage {
|
||||
@IsString({ message: "role must be a string" })
|
||||
@IsNotEmpty({ message: "role is required" })
|
||||
role!: string;
|
||||
|
||||
@IsString({ message: "content must be a string" })
|
||||
@IsNotEmpty({ message: "content is required" })
|
||||
content!: string;
|
||||
}
|
||||
|
||||
export class ChatStreamDto {
|
||||
@IsArray({ message: "messages must be an array" })
|
||||
@ArrayMinSize(1, { message: "messages must contain at least one message" })
|
||||
@ValidateNested({ each: true })
|
||||
@Type(() => ChatMessageDto)
|
||||
messages!: ChatMessageDto[];
|
||||
}
|
||||
14
apps/api/src/chat-proxy/chat-proxy.module.ts
Normal file
14
apps/api/src/chat-proxy/chat-proxy.module.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import { Module } from "@nestjs/common";
|
||||
import { AgentConfigModule } from "../agent-config/agent-config.module";
|
||||
import { ContainerLifecycleModule } from "../container-lifecycle/container-lifecycle.module";
|
||||
import { PrismaModule } from "../prisma/prisma.module";
|
||||
import { ChatProxyController } from "./chat-proxy.controller";
|
||||
import { ChatProxyService } from "./chat-proxy.service";
|
||||
|
||||
@Module({
|
||||
imports: [PrismaModule, ContainerLifecycleModule, AgentConfigModule],
|
||||
controllers: [ChatProxyController],
|
||||
providers: [ChatProxyService],
|
||||
exports: [ChatProxyService],
|
||||
})
|
||||
export class ChatProxyModule {}
|
||||
107
apps/api/src/chat-proxy/chat-proxy.service.spec.ts
Normal file
107
apps/api/src/chat-proxy/chat-proxy.service.spec.ts
Normal file
@@ -0,0 +1,107 @@
|
||||
import { ServiceUnavailableException } from "@nestjs/common";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { ChatProxyService } from "./chat-proxy.service";
|
||||
|
||||
describe("ChatProxyService", () => {
|
||||
const userId = "user-123";
|
||||
|
||||
const prisma = {
|
||||
userAgentConfig: {
|
||||
findUnique: vi.fn(),
|
||||
},
|
||||
};
|
||||
|
||||
const containerLifecycle = {
|
||||
ensureRunning: vi.fn(),
|
||||
touch: vi.fn(),
|
||||
};
|
||||
|
||||
let service: ChatProxyService;
|
||||
let fetchMock: ReturnType<typeof vi.fn>;
|
||||
|
||||
beforeEach(() => {
|
||||
fetchMock = vi.fn();
|
||||
vi.stubGlobal("fetch", fetchMock);
|
||||
service = new ChatProxyService(prisma as never, containerLifecycle as never);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.unstubAllGlobals();
|
||||
vi.clearAllMocks();
|
||||
});
|
||||
|
||||
describe("getContainerUrl", () => {
|
||||
it("calls ensureRunning and touch for the user", async () => {
|
||||
containerLifecycle.ensureRunning.mockResolvedValue({
|
||||
url: "http://mosaic-user-user-123:19000",
|
||||
token: "gateway-token",
|
||||
});
|
||||
containerLifecycle.touch.mockResolvedValue(undefined);
|
||||
|
||||
const url = await service.getContainerUrl(userId);
|
||||
|
||||
expect(url).toBe("http://mosaic-user-user-123:19000");
|
||||
expect(containerLifecycle.ensureRunning).toHaveBeenCalledWith(userId);
|
||||
expect(containerLifecycle.touch).toHaveBeenCalledWith(userId);
|
||||
});
|
||||
});
|
||||
|
||||
describe("proxyChat", () => {
|
||||
it("forwards the request to the user's OpenClaw container", async () => {
|
||||
containerLifecycle.ensureRunning.mockResolvedValue({
|
||||
url: "http://mosaic-user-user-123:19000",
|
||||
token: "gateway-token",
|
||||
});
|
||||
containerLifecycle.touch.mockResolvedValue(undefined);
|
||||
fetchMock.mockResolvedValue(new Response("event: token\ndata: hello\n\n"));
|
||||
|
||||
const messages = [{ role: "user", content: "Hello from Mosaic" }];
|
||||
const response = await service.proxyChat(userId, messages);
|
||||
|
||||
expect(response).toBeInstanceOf(Response);
|
||||
expect(fetchMock).toHaveBeenCalledWith(
|
||||
"http://mosaic-user-user-123:19000/v1/chat/completions",
|
||||
expect.objectContaining({
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
})
|
||||
);
|
||||
|
||||
const [, request] = fetchMock.mock.calls[0] as [string, RequestInit];
|
||||
const parsedBody = JSON.parse(String(request.body));
|
||||
expect(parsedBody).toEqual({
|
||||
messages,
|
||||
model: "openclaw:default",
|
||||
stream: true,
|
||||
});
|
||||
});
|
||||
|
||||
it("throws ServiceUnavailableException on connection refused errors", async () => {
|
||||
containerLifecycle.ensureRunning.mockResolvedValue({
|
||||
url: "http://mosaic-user-user-123:19000",
|
||||
token: "gateway-token",
|
||||
});
|
||||
containerLifecycle.touch.mockResolvedValue(undefined);
|
||||
fetchMock.mockRejectedValue(new Error("connect ECONNREFUSED 127.0.0.1:19000"));
|
||||
|
||||
await expect(service.proxyChat(userId, [])).rejects.toBeInstanceOf(
|
||||
ServiceUnavailableException
|
||||
);
|
||||
});
|
||||
|
||||
it("throws ServiceUnavailableException on timeout errors", async () => {
|
||||
containerLifecycle.ensureRunning.mockResolvedValue({
|
||||
url: "http://mosaic-user-user-123:19000",
|
||||
token: "gateway-token",
|
||||
});
|
||||
containerLifecycle.touch.mockResolvedValue(undefined);
|
||||
fetchMock.mockRejectedValue(new Error("The operation was aborted due to timeout"));
|
||||
|
||||
await expect(service.proxyChat(userId, [])).rejects.toBeInstanceOf(
|
||||
ServiceUnavailableException
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
89
apps/api/src/chat-proxy/chat-proxy.service.ts
Normal file
89
apps/api/src/chat-proxy/chat-proxy.service.ts
Normal file
@@ -0,0 +1,89 @@
|
||||
import { BadGatewayException, Injectable, ServiceUnavailableException } from "@nestjs/common";
|
||||
import { ContainerLifecycleService } from "../container-lifecycle/container-lifecycle.service";
|
||||
import { PrismaService } from "../prisma/prisma.service";
|
||||
import type { ChatMessage } from "./chat-proxy.dto";
|
||||
|
||||
const DEFAULT_OPENCLAW_MODEL = "openclaw:default";
|
||||
|
||||
@Injectable()
|
||||
export class ChatProxyService {
|
||||
constructor(
|
||||
private readonly prisma: PrismaService,
|
||||
private readonly containerLifecycle: ContainerLifecycleService
|
||||
) {}
|
||||
|
||||
// Get the user's OpenClaw container URL and mark it active.
|
||||
async getContainerUrl(userId: string): Promise<string> {
|
||||
const { url } = await this.containerLifecycle.ensureRunning(userId);
|
||||
await this.containerLifecycle.touch(userId);
|
||||
return url;
|
||||
}
|
||||
|
||||
// Proxy chat request to OpenClaw.
|
||||
async proxyChat(
|
||||
userId: string,
|
||||
messages: ChatMessage[],
|
||||
signal?: AbortSignal
|
||||
): Promise<Response> {
|
||||
const containerUrl = await this.getContainerUrl(userId);
|
||||
const model = await this.getPreferredModel(userId);
|
||||
const requestInit: RequestInit = {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
messages,
|
||||
model,
|
||||
stream: true,
|
||||
}),
|
||||
};
|
||||
|
||||
if (signal) {
|
||||
requestInit.signal = signal;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${containerUrl}/v1/chat/completions`, requestInit);
|
||||
|
||||
if (!response.ok) {
|
||||
const detail = await this.readResponseText(response);
|
||||
const status = `${String(response.status)} ${response.statusText}`.trim();
|
||||
const message = detail
|
||||
? `OpenClaw returned ${status}: ${detail}`
|
||||
: `OpenClaw returned ${status}`;
|
||||
throw new BadGatewayException(message);
|
||||
}
|
||||
|
||||
return response;
|
||||
} catch (error: unknown) {
|
||||
if (error instanceof BadGatewayException) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
throw new ServiceUnavailableException(`Failed to proxy chat to OpenClaw: ${message}`);
|
||||
}
|
||||
}
|
||||
|
||||
private async getPreferredModel(userId: string): Promise<string> {
|
||||
const config = await this.prisma.userAgentConfig.findUnique({
|
||||
where: { userId },
|
||||
select: { primaryModel: true },
|
||||
});
|
||||
|
||||
const primaryModel = config?.primaryModel?.trim();
|
||||
if (!primaryModel) {
|
||||
return DEFAULT_OPENCLAW_MODEL;
|
||||
}
|
||||
|
||||
return primaryModel;
|
||||
}
|
||||
|
||||
private async readResponseText(response: Response): Promise<string | null> {
|
||||
try {
|
||||
const text = (await response.text()).trim();
|
||||
return text.length > 0 ? text : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
10
apps/api/src/container-reaper/container-reaper.module.ts
Normal file
10
apps/api/src/container-reaper/container-reaper.module.ts
Normal file
@@ -0,0 +1,10 @@
|
||||
import { Module } from "@nestjs/common";
|
||||
import { ScheduleModule } from "@nestjs/schedule";
|
||||
import { ContainerLifecycleModule } from "../container-lifecycle/container-lifecycle.module";
|
||||
import { ContainerReaperService } from "./container-reaper.service";
|
||||
|
||||
@Module({
|
||||
imports: [ScheduleModule, ContainerLifecycleModule],
|
||||
providers: [ContainerReaperService],
|
||||
})
|
||||
export class ContainerReaperModule {}
|
||||
@@ -0,0 +1,45 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { ContainerLifecycleService } from "../container-lifecycle/container-lifecycle.service";
|
||||
import { ContainerReaperService } from "./container-reaper.service";
|
||||
|
||||
describe("ContainerReaperService", () => {
|
||||
let service: ContainerReaperService;
|
||||
let containerLifecycle: Pick<ContainerLifecycleService, "reapIdle">;
|
||||
|
||||
beforeEach(() => {
|
||||
containerLifecycle = {
|
||||
reapIdle: vi.fn(),
|
||||
};
|
||||
service = new ContainerReaperService(containerLifecycle as ContainerLifecycleService);
|
||||
});
|
||||
|
||||
it("reapIdleContainers calls containerLifecycle.reapIdle()", async () => {
|
||||
vi.mocked(containerLifecycle.reapIdle).mockResolvedValue({ stopped: [] });
|
||||
|
||||
await service.reapIdleContainers();
|
||||
|
||||
expect(containerLifecycle.reapIdle).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("reapIdleContainers handles errors gracefully", async () => {
|
||||
const error = new Error("reap failure");
|
||||
vi.mocked(containerLifecycle.reapIdle).mockRejectedValue(error);
|
||||
const loggerError = vi.spyOn(service["logger"], "error").mockImplementation(() => {});
|
||||
|
||||
await expect(service.reapIdleContainers()).resolves.toBeUndefined();
|
||||
|
||||
expect(loggerError).toHaveBeenCalledWith(
|
||||
"Failed to reap idle containers",
|
||||
expect.stringContaining("reap failure")
|
||||
);
|
||||
});
|
||||
|
||||
it("reapIdleContainers logs stopped container count", async () => {
|
||||
vi.mocked(containerLifecycle.reapIdle).mockResolvedValue({ stopped: ["user-1", "user-2"] });
|
||||
const loggerLog = vi.spyOn(service["logger"], "log").mockImplementation(() => {});
|
||||
|
||||
await service.reapIdleContainers();
|
||||
|
||||
expect(loggerLog).toHaveBeenCalledWith("Stopped 2 idle containers: user-1, user-2");
|
||||
});
|
||||
});
|
||||
30
apps/api/src/container-reaper/container-reaper.service.ts
Normal file
30
apps/api/src/container-reaper/container-reaper.service.ts
Normal file
@@ -0,0 +1,30 @@
|
||||
import { Injectable, Logger } from "@nestjs/common";
|
||||
import { Cron, CronExpression } from "@nestjs/schedule";
|
||||
import { ContainerLifecycleService } from "../container-lifecycle/container-lifecycle.service";
|
||||
|
||||
@Injectable()
|
||||
export class ContainerReaperService {
|
||||
private readonly logger = new Logger(ContainerReaperService.name);
|
||||
|
||||
constructor(private readonly containerLifecycle: ContainerLifecycleService) {}
|
||||
|
||||
@Cron(CronExpression.EVERY_5_MINUTES)
|
||||
async reapIdleContainers(): Promise<void> {
|
||||
this.logger.log("Running idle container reap cycle...");
|
||||
try {
|
||||
const result = await this.containerLifecycle.reapIdle();
|
||||
if (result.stopped.length > 0) {
|
||||
this.logger.log(
|
||||
`Stopped ${String(result.stopped.length)} idle containers: ${result.stopped.join(", ")}`
|
||||
);
|
||||
} else {
|
||||
this.logger.debug("No idle containers to stop");
|
||||
}
|
||||
} catch (error) {
|
||||
this.logger.error(
|
||||
"Failed to reap idle containers",
|
||||
error instanceof Error ? error.stack : String(error)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
115
apps/api/src/fleet-settings/fleet-settings.controller.ts
Normal file
115
apps/api/src/fleet-settings/fleet-settings.controller.ts
Normal file
@@ -0,0 +1,115 @@
|
||||
import {
|
||||
Body,
|
||||
Controller,
|
||||
Delete,
|
||||
Get,
|
||||
HttpCode,
|
||||
HttpStatus,
|
||||
Param,
|
||||
Patch,
|
||||
Post,
|
||||
Put,
|
||||
UseGuards,
|
||||
} from "@nestjs/common";
|
||||
import type { AuthUser } from "@mosaic/shared";
|
||||
import { CurrentUser } from "../auth/decorators/current-user.decorator";
|
||||
import { AdminGuard } from "../auth/guards/admin.guard";
|
||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
||||
import type {
|
||||
CreateProviderDto,
|
||||
ResetPasswordDto,
|
||||
UpdateAgentConfigDto,
|
||||
UpdateOidcDto,
|
||||
UpdateProviderDto,
|
||||
} from "./fleet-settings.dto";
|
||||
import { FleetSettingsService } from "./fleet-settings.service";
|
||||
|
||||
@Controller("fleet-settings")
|
||||
@UseGuards(AuthGuard)
|
||||
export class FleetSettingsController {
|
||||
constructor(private readonly fleetSettingsService: FleetSettingsService) {}
|
||||
|
||||
// --- Provider endpoints (user-scoped) ---
|
||||
// GET /api/fleet-settings/providers — list user's providers
|
||||
@Get("providers")
|
||||
async listProviders(@CurrentUser() user: AuthUser) {
|
||||
return this.fleetSettingsService.listProviders(user.id);
|
||||
}
|
||||
|
||||
// GET /api/fleet-settings/providers/:id — get single provider
|
||||
@Get("providers/:id")
|
||||
async getProvider(@CurrentUser() user: AuthUser, @Param("id") id: string) {
|
||||
return this.fleetSettingsService.getProvider(user.id, id);
|
||||
}
|
||||
|
||||
// POST /api/fleet-settings/providers — create provider
|
||||
@Post("providers")
|
||||
async createProvider(@CurrentUser() user: AuthUser, @Body() dto: CreateProviderDto) {
|
||||
return this.fleetSettingsService.createProvider(user.id, dto);
|
||||
}
|
||||
|
||||
// PATCH /api/fleet-settings/providers/:id — update provider
|
||||
@Patch("providers/:id")
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async updateProvider(
|
||||
@CurrentUser() user: AuthUser,
|
||||
@Param("id") id: string,
|
||||
@Body() dto: UpdateProviderDto
|
||||
) {
|
||||
await this.fleetSettingsService.updateProvider(user.id, id, dto);
|
||||
}
|
||||
|
||||
// DELETE /api/fleet-settings/providers/:id — delete provider
|
||||
@Delete("providers/:id")
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async deleteProvider(@CurrentUser() user: AuthUser, @Param("id") id: string) {
|
||||
await this.fleetSettingsService.deleteProvider(user.id, id);
|
||||
}
|
||||
|
||||
// --- Agent config endpoints (user-scoped) ---
|
||||
// GET /api/fleet-settings/agent-config — get user's agent config
|
||||
@Get("agent-config")
|
||||
async getAgentConfig(@CurrentUser() user: AuthUser) {
|
||||
return this.fleetSettingsService.getAgentConfig(user.id);
|
||||
}
|
||||
|
||||
// PATCH /api/fleet-settings/agent-config — update user's agent config
|
||||
@Patch("agent-config")
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async updateAgentConfig(@CurrentUser() user: AuthUser, @Body() dto: UpdateAgentConfigDto) {
|
||||
await this.fleetSettingsService.updateAgentConfig(user.id, dto);
|
||||
}
|
||||
|
||||
// --- OIDC endpoints (admin only — use AdminGuard) ---
|
||||
// GET /api/fleet-settings/oidc — get OIDC config
|
||||
@Get("oidc")
|
||||
@UseGuards(AdminGuard)
|
||||
async getOidcConfig() {
|
||||
return this.fleetSettingsService.getOidcConfig();
|
||||
}
|
||||
|
||||
// PUT /api/fleet-settings/oidc — update OIDC config
|
||||
@Put("oidc")
|
||||
@UseGuards(AdminGuard)
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async updateOidcConfig(@Body() dto: UpdateOidcDto) {
|
||||
await this.fleetSettingsService.updateOidcConfig(dto);
|
||||
}
|
||||
|
||||
// DELETE /api/fleet-settings/oidc — remove OIDC config
|
||||
@Delete("oidc")
|
||||
@UseGuards(AdminGuard)
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async deleteOidcConfig() {
|
||||
await this.fleetSettingsService.deleteOidcConfig();
|
||||
}
|
||||
|
||||
// --- Breakglass endpoints (admin only) ---
|
||||
// POST /api/fleet-settings/breakglass/reset-password — reset admin password
|
||||
@Post("breakglass/reset-password")
|
||||
@UseGuards(AdminGuard)
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async resetBreakglassPassword(@Body() dto: ResetPasswordDto) {
|
||||
await this.fleetSettingsService.resetBreakglassPassword(dto.username, dto.newPassword);
|
||||
}
|
||||
}
|
||||
122
apps/api/src/fleet-settings/fleet-settings.dto.ts
Normal file
122
apps/api/src/fleet-settings/fleet-settings.dto.ts
Normal file
@@ -0,0 +1,122 @@
|
||||
import {
|
||||
ArrayNotEmpty,
|
||||
IsArray,
|
||||
IsBoolean,
|
||||
IsNotEmpty,
|
||||
IsObject,
|
||||
IsOptional,
|
||||
IsString,
|
||||
IsUrl,
|
||||
MaxLength,
|
||||
MinLength,
|
||||
} from "class-validator";
|
||||
|
||||
export class CreateProviderDto {
|
||||
@IsString({ message: "name must be a string" })
|
||||
@IsNotEmpty({ message: "name is required" })
|
||||
@MaxLength(100, { message: "name must not exceed 100 characters" })
|
||||
name!: string;
|
||||
|
||||
@IsString({ message: "displayName must be a string" })
|
||||
@IsNotEmpty({ message: "displayName is required" })
|
||||
@MaxLength(255, { message: "displayName must not exceed 255 characters" })
|
||||
displayName!: string;
|
||||
|
||||
@IsString({ message: "type must be a string" })
|
||||
@IsNotEmpty({ message: "type is required" })
|
||||
@MaxLength(100, { message: "type must not exceed 100 characters" })
|
||||
type!: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsUrl(
|
||||
{ require_tld: false },
|
||||
{ message: "baseUrl must be a valid URL (for example: https://api.example.com/v1)" }
|
||||
)
|
||||
baseUrl?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString({ message: "apiKey must be a string" })
|
||||
apiKey?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString({ message: "apiType must be a string" })
|
||||
@MaxLength(100, { message: "apiType must not exceed 100 characters" })
|
||||
apiType?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsArray({ message: "models must be an array" })
|
||||
@IsObject({ each: true, message: "each model must be an object" })
|
||||
models?: Record<string, unknown>[];
|
||||
}
|
||||
|
||||
export class UpdateProviderDto {
|
||||
@IsOptional()
|
||||
@IsString({ message: "displayName must be a string" })
|
||||
@MaxLength(255, { message: "displayName must not exceed 255 characters" })
|
||||
displayName?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsUrl(
|
||||
{ require_tld: false },
|
||||
{ message: "baseUrl must be a valid URL (for example: https://api.example.com/v1)" }
|
||||
)
|
||||
baseUrl?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString({ message: "apiKey must be a string" })
|
||||
apiKey?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsBoolean({ message: "isActive must be a boolean" })
|
||||
isActive?: boolean;
|
||||
|
||||
@IsOptional()
|
||||
@IsArray({ message: "models must be an array" })
|
||||
@IsObject({ each: true, message: "each model must be an object" })
|
||||
models?: Record<string, unknown>[];
|
||||
}
|
||||
|
||||
export class UpdateAgentConfigDto {
|
||||
@IsOptional()
|
||||
@IsString({ message: "primaryModel must be a string" })
|
||||
@MaxLength(255, { message: "primaryModel must not exceed 255 characters" })
|
||||
primaryModel?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsArray({ message: "fallbackModels must be an array" })
|
||||
@ArrayNotEmpty({ message: "fallbackModels cannot be empty" })
|
||||
@IsString({ each: true, message: "each fallback model must be a string" })
|
||||
fallbackModels?: string[];
|
||||
|
||||
@IsOptional()
|
||||
@IsString({ message: "personality must be a string" })
|
||||
personality?: string;
|
||||
}
|
||||
|
||||
export class UpdateOidcDto {
|
||||
@IsString({ message: "issuerUrl must be a string" })
|
||||
@IsNotEmpty({ message: "issuerUrl is required" })
|
||||
@IsUrl(
|
||||
{ require_tld: false },
|
||||
{ message: "issuerUrl must be a valid URL (for example: https://issuer.example.com)" }
|
||||
)
|
||||
issuerUrl!: string;
|
||||
|
||||
@IsString({ message: "clientId must be a string" })
|
||||
@IsNotEmpty({ message: "clientId is required" })
|
||||
clientId!: string;
|
||||
|
||||
@IsString({ message: "clientSecret must be a string" })
|
||||
@IsNotEmpty({ message: "clientSecret is required" })
|
||||
clientSecret!: string;
|
||||
}
|
||||
|
||||
export class ResetPasswordDto {
|
||||
@IsString({ message: "username must be a string" })
|
||||
@IsNotEmpty({ message: "username is required" })
|
||||
username!: string;
|
||||
|
||||
@IsString({ message: "newPassword must be a string" })
|
||||
@MinLength(8, { message: "newPassword must be at least 8 characters" })
|
||||
newPassword!: string;
|
||||
}
|
||||
13
apps/api/src/fleet-settings/fleet-settings.module.ts
Normal file
13
apps/api/src/fleet-settings/fleet-settings.module.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import { Module } from "@nestjs/common";
|
||||
import { PrismaModule } from "../prisma/prisma.module";
|
||||
import { CryptoModule } from "../crypto/crypto.module";
|
||||
import { FleetSettingsController } from "./fleet-settings.controller";
|
||||
import { FleetSettingsService } from "./fleet-settings.service";
|
||||
|
||||
@Module({
|
||||
imports: [PrismaModule, CryptoModule],
|
||||
controllers: [FleetSettingsController],
|
||||
providers: [FleetSettingsService],
|
||||
exports: [FleetSettingsService],
|
||||
})
|
||||
export class FleetSettingsModule {}
|
||||
200
apps/api/src/fleet-settings/fleet-settings.service.spec.ts
Normal file
200
apps/api/src/fleet-settings/fleet-settings.service.spec.ts
Normal file
@@ -0,0 +1,200 @@
|
||||
import { NotFoundException } from "@nestjs/common";
|
||||
import { compare } from "bcryptjs";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { FleetSettingsService } from "./fleet-settings.service";
|
||||
import type { PrismaService } from "../prisma/prisma.service";
|
||||
import type { CryptoService } from "../crypto/crypto.service";
|
||||
|
||||
describe("FleetSettingsService", () => {
|
||||
let service: FleetSettingsService;
|
||||
|
||||
const mockPrisma = {
|
||||
llmProvider: {
|
||||
findMany: vi.fn(),
|
||||
findFirst: vi.fn(),
|
||||
findUnique: vi.fn(),
|
||||
create: vi.fn(),
|
||||
update: vi.fn(),
|
||||
delete: vi.fn(),
|
||||
},
|
||||
userAgentConfig: {
|
||||
findUnique: vi.fn(),
|
||||
upsert: vi.fn(),
|
||||
},
|
||||
systemConfig: {
|
||||
findMany: vi.fn(),
|
||||
upsert: vi.fn(),
|
||||
deleteMany: vi.fn(),
|
||||
},
|
||||
breakglassUser: {
|
||||
findUnique: vi.fn(),
|
||||
update: vi.fn(),
|
||||
},
|
||||
};
|
||||
|
||||
const mockCrypto = {
|
||||
encrypt: vi.fn((value: string) => `enc:${value}`),
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
service = new FleetSettingsService(
|
||||
mockPrisma as unknown as PrismaService,
|
||||
mockCrypto as unknown as CryptoService
|
||||
);
|
||||
});
|
||||
|
||||
it("listProviders returns only providers for the given userId", async () => {
|
||||
mockPrisma.llmProvider.findMany.mockResolvedValue([
|
||||
{
|
||||
id: "prov-1",
|
||||
name: "openai-main",
|
||||
displayName: "OpenAI",
|
||||
type: "openai",
|
||||
baseUrl: "https://api.openai.com/v1",
|
||||
isActive: true,
|
||||
models: [{ id: "gpt-4.1" }],
|
||||
},
|
||||
]);
|
||||
|
||||
const result = await service.listProviders("user-1");
|
||||
|
||||
expect(mockPrisma.llmProvider.findMany).toHaveBeenCalledWith({
|
||||
where: { userId: "user-1" },
|
||||
select: {
|
||||
id: true,
|
||||
name: true,
|
||||
displayName: true,
|
||||
type: true,
|
||||
baseUrl: true,
|
||||
isActive: true,
|
||||
models: true,
|
||||
},
|
||||
orderBy: { createdAt: "asc" },
|
||||
});
|
||||
expect(result).toEqual([
|
||||
{
|
||||
id: "prov-1",
|
||||
name: "openai-main",
|
||||
displayName: "OpenAI",
|
||||
type: "openai",
|
||||
baseUrl: "https://api.openai.com/v1",
|
||||
isActive: true,
|
||||
models: [{ id: "gpt-4.1" }],
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
it("createProvider encrypts apiKey", async () => {
|
||||
mockPrisma.llmProvider.create.mockResolvedValue({
|
||||
id: "prov-2",
|
||||
});
|
||||
|
||||
const result = await service.createProvider("user-1", {
|
||||
name: "zai-main",
|
||||
displayName: "Z.ai",
|
||||
type: "zai",
|
||||
apiKey: "plaintext-key",
|
||||
models: [],
|
||||
});
|
||||
|
||||
expect(mockCrypto.encrypt).toHaveBeenCalledWith("plaintext-key");
|
||||
expect(mockPrisma.llmProvider.create).toHaveBeenCalledWith({
|
||||
data: {
|
||||
userId: "user-1",
|
||||
name: "zai-main",
|
||||
displayName: "Z.ai",
|
||||
type: "zai",
|
||||
baseUrl: null,
|
||||
apiKey: "enc:plaintext-key",
|
||||
apiType: "openai-completions",
|
||||
models: [],
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
},
|
||||
});
|
||||
expect(result).toEqual({ id: "prov-2" });
|
||||
});
|
||||
|
||||
it("updateProvider rejects if not owned by user", async () => {
|
||||
mockPrisma.llmProvider.findFirst.mockResolvedValue(null);
|
||||
|
||||
await expect(
|
||||
service.updateProvider("user-1", "provider-1", {
|
||||
displayName: "New Name",
|
||||
})
|
||||
).rejects.toBeInstanceOf(NotFoundException);
|
||||
|
||||
expect(mockPrisma.llmProvider.update).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("deleteProvider rejects if not owned by user", async () => {
|
||||
mockPrisma.llmProvider.findFirst.mockResolvedValue(null);
|
||||
|
||||
await expect(service.deleteProvider("user-1", "provider-1")).rejects.toBeInstanceOf(
|
||||
NotFoundException
|
||||
);
|
||||
|
||||
expect(mockPrisma.llmProvider.delete).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("getOidcConfig never returns clientSecret", async () => {
|
||||
mockPrisma.systemConfig.findMany.mockResolvedValue([
|
||||
{
|
||||
key: "oidc.issuerUrl",
|
||||
value: "https://issuer.example.com",
|
||||
},
|
||||
{
|
||||
key: "oidc.clientId",
|
||||
value: "client-id-1",
|
||||
},
|
||||
{
|
||||
key: "oidc.clientSecret",
|
||||
value: "enc:very-secret",
|
||||
},
|
||||
]);
|
||||
|
||||
const result = await service.getOidcConfig();
|
||||
|
||||
expect(result).toEqual({
|
||||
issuerUrl: "https://issuer.example.com",
|
||||
clientId: "client-id-1",
|
||||
configured: true,
|
||||
});
|
||||
expect(result).not.toHaveProperty("clientSecret");
|
||||
});
|
||||
|
||||
it("updateOidcConfig encrypts clientSecret", async () => {
|
||||
await service.updateOidcConfig({
|
||||
issuerUrl: "https://issuer.example.com",
|
||||
clientId: "client-id-1",
|
||||
clientSecret: "super-secret",
|
||||
});
|
||||
|
||||
expect(mockCrypto.encrypt).toHaveBeenCalledWith("super-secret");
|
||||
expect(mockPrisma.systemConfig.upsert).toHaveBeenCalledTimes(3);
|
||||
expect(mockPrisma.systemConfig.upsert).toHaveBeenCalledWith({
|
||||
where: { key: "oidc.clientSecret" },
|
||||
update: { value: "enc:super-secret", encrypted: true },
|
||||
create: { key: "oidc.clientSecret", value: "enc:super-secret", encrypted: true },
|
||||
});
|
||||
});
|
||||
|
||||
it("resetBreakglassPassword hashes new password", async () => {
|
||||
mockPrisma.breakglassUser.findUnique.mockResolvedValue({
|
||||
id: "bg-1",
|
||||
username: "admin",
|
||||
passwordHash: "old-hash",
|
||||
});
|
||||
|
||||
await service.resetBreakglassPassword("admin", "new-password-123");
|
||||
|
||||
expect(mockPrisma.breakglassUser.update).toHaveBeenCalledOnce();
|
||||
const updateCall = mockPrisma.breakglassUser.update.mock.calls[0]?.[0];
|
||||
const newHash = updateCall?.data?.passwordHash;
|
||||
expect(newHash).toBeTypeOf("string");
|
||||
expect(newHash).not.toBe("new-password-123");
|
||||
expect(await compare("new-password-123", newHash as string)).toBe(true);
|
||||
});
|
||||
});
|
||||
296
apps/api/src/fleet-settings/fleet-settings.service.ts
Normal file
296
apps/api/src/fleet-settings/fleet-settings.service.ts
Normal file
@@ -0,0 +1,296 @@
|
||||
import { Injectable, NotFoundException } from "@nestjs/common";
|
||||
import { hash } from "bcryptjs";
|
||||
import type { Prisma } from "@prisma/client";
|
||||
import { PrismaService } from "../prisma/prisma.service";
|
||||
import { CryptoService } from "../crypto/crypto.service";
|
||||
import type {
|
||||
CreateProviderDto,
|
||||
ResetPasswordDto,
|
||||
UpdateAgentConfigDto,
|
||||
UpdateOidcDto,
|
||||
UpdateProviderDto,
|
||||
} from "./fleet-settings.dto";
|
||||
|
||||
const BCRYPT_ROUNDS = 12;
|
||||
const DEFAULT_PROVIDER_API_TYPE = "openai-completions";
|
||||
const OIDC_ISSUER_KEY = "oidc.issuerUrl";
|
||||
const OIDC_CLIENT_ID_KEY = "oidc.clientId";
|
||||
const OIDC_CLIENT_SECRET_KEY = "oidc.clientSecret";
|
||||
const OIDC_KEYS = [OIDC_ISSUER_KEY, OIDC_CLIENT_ID_KEY, OIDC_CLIENT_SECRET_KEY] as const;
|
||||
|
||||
export interface FleetProviderResponse {
|
||||
id: string;
|
||||
name: string;
|
||||
displayName: string;
|
||||
type: string;
|
||||
baseUrl: string | null;
|
||||
isActive: boolean;
|
||||
models: unknown;
|
||||
}
|
||||
|
||||
export interface FleetAgentConfigResponse {
|
||||
primaryModel: string | null;
|
||||
fallbackModels: unknown[];
|
||||
personality: string | null;
|
||||
}
|
||||
|
||||
export interface OidcConfigResponse {
|
||||
issuerUrl?: string;
|
||||
clientId?: string;
|
||||
configured: boolean;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class FleetSettingsService {
|
||||
constructor(
|
||||
private readonly prisma: PrismaService,
|
||||
private readonly crypto: CryptoService
|
||||
) {}
|
||||
|
||||
// --- LLM Provider CRUD (per-user scoped) ---
|
||||
|
||||
async listProviders(userId: string): Promise<FleetProviderResponse[]> {
|
||||
return this.prisma.llmProvider.findMany({
|
||||
where: { userId },
|
||||
select: {
|
||||
id: true,
|
||||
name: true,
|
||||
displayName: true,
|
||||
type: true,
|
||||
baseUrl: true,
|
||||
isActive: true,
|
||||
models: true,
|
||||
},
|
||||
orderBy: { createdAt: "asc" },
|
||||
});
|
||||
}
|
||||
|
||||
async getProvider(userId: string, providerId: string): Promise<FleetProviderResponse> {
|
||||
const provider = await this.prisma.llmProvider.findFirst({
|
||||
where: {
|
||||
id: providerId,
|
||||
userId,
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
name: true,
|
||||
displayName: true,
|
||||
type: true,
|
||||
baseUrl: true,
|
||||
isActive: true,
|
||||
models: true,
|
||||
},
|
||||
});
|
||||
|
||||
if (!provider) {
|
||||
throw new NotFoundException(`Provider ${providerId} not found`);
|
||||
}
|
||||
|
||||
return provider;
|
||||
}
|
||||
|
||||
async createProvider(userId: string, data: CreateProviderDto): Promise<{ id: string }> {
|
||||
const provider = await this.prisma.llmProvider.create({
|
||||
data: {
|
||||
userId,
|
||||
name: data.name,
|
||||
displayName: data.displayName,
|
||||
type: data.type,
|
||||
baseUrl: data.baseUrl ?? null,
|
||||
apiKey: data.apiKey ? this.crypto.encrypt(data.apiKey) : null,
|
||||
apiType: data.apiType ?? DEFAULT_PROVIDER_API_TYPE,
|
||||
models: (data.models ?? []) as Prisma.InputJsonValue,
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
},
|
||||
});
|
||||
|
||||
return provider;
|
||||
}
|
||||
|
||||
async updateProvider(userId: string, providerId: string, data: UpdateProviderDto): Promise<void> {
|
||||
await this.assertProviderOwnership(userId, providerId);
|
||||
|
||||
const updateData: Prisma.LlmProviderUpdateInput = {};
|
||||
if (data.displayName !== undefined) {
|
||||
updateData.displayName = data.displayName;
|
||||
}
|
||||
if (data.baseUrl !== undefined) {
|
||||
updateData.baseUrl = data.baseUrl;
|
||||
}
|
||||
if (data.isActive !== undefined) {
|
||||
updateData.isActive = data.isActive;
|
||||
}
|
||||
if (data.models !== undefined) {
|
||||
updateData.models = data.models as Prisma.InputJsonValue;
|
||||
}
|
||||
if (data.apiKey !== undefined) {
|
||||
updateData.apiKey = data.apiKey.length > 0 ? this.crypto.encrypt(data.apiKey) : null;
|
||||
}
|
||||
|
||||
await this.prisma.llmProvider.update({
|
||||
where: { id: providerId },
|
||||
data: updateData,
|
||||
});
|
||||
}
|
||||
|
||||
async deleteProvider(userId: string, providerId: string): Promise<void> {
|
||||
await this.assertProviderOwnership(userId, providerId);
|
||||
|
||||
await this.prisma.llmProvider.delete({
|
||||
where: { id: providerId },
|
||||
});
|
||||
}
|
||||
|
||||
// --- User Agent Config ---
|
||||
|
||||
async getAgentConfig(userId: string): Promise<FleetAgentConfigResponse> {
|
||||
const config = await this.prisma.userAgentConfig.findUnique({
|
||||
where: { userId },
|
||||
select: {
|
||||
primaryModel: true,
|
||||
fallbackModels: true,
|
||||
personality: true,
|
||||
},
|
||||
});
|
||||
|
||||
if (!config) {
|
||||
return {
|
||||
primaryModel: null,
|
||||
fallbackModels: [],
|
||||
personality: null,
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
primaryModel: config.primaryModel,
|
||||
fallbackModels: this.normalizeJsonArray(config.fallbackModels),
|
||||
personality: config.personality,
|
||||
};
|
||||
}
|
||||
|
||||
async updateAgentConfig(userId: string, data: UpdateAgentConfigDto): Promise<void> {
|
||||
const updateData: Prisma.UserAgentConfigUpdateInput = {};
|
||||
if (data.primaryModel !== undefined) {
|
||||
updateData.primaryModel = data.primaryModel;
|
||||
}
|
||||
if (data.personality !== undefined) {
|
||||
updateData.personality = data.personality;
|
||||
}
|
||||
if (data.fallbackModels !== undefined) {
|
||||
updateData.fallbackModels = data.fallbackModels as Prisma.InputJsonValue;
|
||||
}
|
||||
|
||||
const createData: Prisma.UserAgentConfigCreateInput = {
|
||||
userId,
|
||||
fallbackModels: (data.fallbackModels ?? []) as Prisma.InputJsonValue,
|
||||
...(data.primaryModel !== undefined ? { primaryModel: data.primaryModel } : {}),
|
||||
...(data.personality !== undefined ? { personality: data.personality } : {}),
|
||||
};
|
||||
|
||||
await this.prisma.userAgentConfig.upsert({
|
||||
where: { userId },
|
||||
create: createData,
|
||||
update: updateData,
|
||||
});
|
||||
}
|
||||
|
||||
// --- OIDC Config (admin only) ---
|
||||
|
||||
async getOidcConfig(): Promise<OidcConfigResponse> {
|
||||
const entries = await this.prisma.systemConfig.findMany({
|
||||
where: {
|
||||
key: {
|
||||
in: [...OIDC_KEYS],
|
||||
},
|
||||
},
|
||||
select: {
|
||||
key: true,
|
||||
value: true,
|
||||
},
|
||||
});
|
||||
|
||||
const byKey = new Map(entries.map((entry) => [entry.key, entry.value]));
|
||||
const issuerUrl = byKey.get(OIDC_ISSUER_KEY);
|
||||
const clientId = byKey.get(OIDC_CLIENT_ID_KEY);
|
||||
const hasSecret = byKey.has(OIDC_CLIENT_SECRET_KEY);
|
||||
|
||||
return {
|
||||
...(issuerUrl ? { issuerUrl } : {}),
|
||||
...(clientId ? { clientId } : {}),
|
||||
configured: Boolean(issuerUrl && clientId && hasSecret),
|
||||
};
|
||||
}
|
||||
|
||||
async updateOidcConfig(data: UpdateOidcDto): Promise<void> {
|
||||
const encryptedSecret = this.crypto.encrypt(data.clientSecret);
|
||||
|
||||
await Promise.all([
|
||||
this.upsertSystemConfig(OIDC_ISSUER_KEY, data.issuerUrl, false),
|
||||
this.upsertSystemConfig(OIDC_CLIENT_ID_KEY, data.clientId, false),
|
||||
this.upsertSystemConfig(OIDC_CLIENT_SECRET_KEY, encryptedSecret, true),
|
||||
]);
|
||||
}
|
||||
|
||||
async deleteOidcConfig(): Promise<void> {
|
||||
await this.prisma.systemConfig.deleteMany({
|
||||
where: {
|
||||
key: {
|
||||
in: [...OIDC_KEYS],
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// --- Breakglass (admin only) ---
|
||||
|
||||
async resetBreakglassPassword(
|
||||
username: ResetPasswordDto["username"],
|
||||
newPassword: ResetPasswordDto["newPassword"]
|
||||
): Promise<void> {
|
||||
const user = await this.prisma.breakglassUser.findUnique({
|
||||
where: { username },
|
||||
select: { id: true },
|
||||
});
|
||||
|
||||
if (!user) {
|
||||
throw new NotFoundException(`Breakglass user ${username} not found`);
|
||||
}
|
||||
|
||||
const passwordHash = await hash(newPassword, BCRYPT_ROUNDS);
|
||||
|
||||
await this.prisma.breakglassUser.update({
|
||||
where: { id: user.id },
|
||||
data: { passwordHash },
|
||||
});
|
||||
}
|
||||
|
||||
private async assertProviderOwnership(userId: string, providerId: string): Promise<void> {
|
||||
const provider = await this.prisma.llmProvider.findFirst({
|
||||
where: {
|
||||
id: providerId,
|
||||
userId,
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
},
|
||||
});
|
||||
|
||||
if (!provider) {
|
||||
throw new NotFoundException(`Provider ${providerId} not found`);
|
||||
}
|
||||
}
|
||||
|
||||
private async upsertSystemConfig(key: string, value: string, encrypted: boolean): Promise<void> {
|
||||
await this.prisma.systemConfig.upsert({
|
||||
where: { key },
|
||||
update: { value, encrypted },
|
||||
create: { key, value, encrypted },
|
||||
});
|
||||
}
|
||||
|
||||
private normalizeJsonArray(value: unknown): unknown[] {
|
||||
return Array.isArray(value) ? value : [];
|
||||
}
|
||||
}
|
||||
63
apps/api/src/onboarding/onboarding.controller.ts
Normal file
63
apps/api/src/onboarding/onboarding.controller.ts
Normal file
@@ -0,0 +1,63 @@
|
||||
import { Body, Controller, Get, HttpCode, HttpStatus, Post, UseGuards } from "@nestjs/common";
|
||||
import {
|
||||
AddProviderDto,
|
||||
ConfigureOidcDto,
|
||||
CreateBreakglassDto,
|
||||
TestProviderDto,
|
||||
} from "./onboarding.dto";
|
||||
import { OnboardingGuard } from "./onboarding.guard";
|
||||
import { OnboardingService } from "./onboarding.service";
|
||||
|
||||
@Controller("onboarding")
|
||||
export class OnboardingController {
|
||||
constructor(private readonly onboardingService: OnboardingService) {}
|
||||
|
||||
// GET /api/onboarding/status — returns { completed: boolean }
|
||||
@Get("status")
|
||||
async status(): Promise<{ completed: boolean }> {
|
||||
return {
|
||||
completed: await this.onboardingService.isCompleted(),
|
||||
};
|
||||
}
|
||||
|
||||
// POST /api/onboarding/breakglass — body: { username, password } → create admin
|
||||
@Post("breakglass")
|
||||
@UseGuards(OnboardingGuard)
|
||||
async createBreakglass(
|
||||
@Body() body: CreateBreakglassDto
|
||||
): Promise<{ id: string; username: string }> {
|
||||
return this.onboardingService.createBreakglassUser(body.username, body.password);
|
||||
}
|
||||
|
||||
// POST /api/onboarding/oidc — body: { issuerUrl, clientId, clientSecret } → save OIDC
|
||||
@Post("oidc")
|
||||
@UseGuards(OnboardingGuard)
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async configureOidc(@Body() body: ConfigureOidcDto): Promise<void> {
|
||||
await this.onboardingService.configureOidc(body.issuerUrl, body.clientId, body.clientSecret);
|
||||
}
|
||||
|
||||
// POST /api/onboarding/provider — body: { name, displayName, type, baseUrl?, apiKey?, models? } → add provider
|
||||
@Post("provider")
|
||||
@UseGuards(OnboardingGuard)
|
||||
async addProvider(@Body() body: AddProviderDto): Promise<{ id: string }> {
|
||||
const userId = await this.onboardingService.getBreakglassUserId();
|
||||
|
||||
return this.onboardingService.addProvider(userId, body);
|
||||
}
|
||||
|
||||
// POST /api/onboarding/provider/test — body: { type, baseUrl?, apiKey? } → test connection
|
||||
@Post("provider/test")
|
||||
@UseGuards(OnboardingGuard)
|
||||
async testProvider(@Body() body: TestProviderDto): Promise<{ success: boolean; error?: string }> {
|
||||
return this.onboardingService.testProvider(body.type, body.baseUrl, body.apiKey);
|
||||
}
|
||||
|
||||
// POST /api/onboarding/complete — mark done
|
||||
@Post("complete")
|
||||
@UseGuards(OnboardingGuard)
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
async complete(): Promise<void> {
|
||||
await this.onboardingService.complete();
|
||||
}
|
||||
}
|
||||
71
apps/api/src/onboarding/onboarding.dto.ts
Normal file
71
apps/api/src/onboarding/onboarding.dto.ts
Normal file
@@ -0,0 +1,71 @@
|
||||
import { Type } from "class-transformer";
|
||||
import { IsArray, IsOptional, IsString, IsUrl, MinLength, ValidateNested } from "class-validator";
|
||||
|
||||
export class CreateBreakglassDto {
|
||||
@IsString()
|
||||
@MinLength(3)
|
||||
username!: string;
|
||||
|
||||
@IsString()
|
||||
@MinLength(8)
|
||||
password!: string;
|
||||
}
|
||||
|
||||
export class ConfigureOidcDto {
|
||||
@IsString()
|
||||
@IsUrl({ require_tld: false })
|
||||
issuerUrl!: string;
|
||||
|
||||
@IsString()
|
||||
clientId!: string;
|
||||
|
||||
@IsString()
|
||||
clientSecret!: string;
|
||||
}
|
||||
|
||||
export class ProviderModelDto {
|
||||
@IsString()
|
||||
id!: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
name?: string;
|
||||
}
|
||||
|
||||
export class AddProviderDto {
|
||||
@IsString()
|
||||
name!: string;
|
||||
|
||||
@IsString()
|
||||
displayName!: string;
|
||||
|
||||
@IsString()
|
||||
type!: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
baseUrl?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
apiKey?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsArray()
|
||||
@ValidateNested({ each: true })
|
||||
@Type(() => ProviderModelDto)
|
||||
models?: ProviderModelDto[];
|
||||
}
|
||||
|
||||
export class TestProviderDto {
|
||||
@IsString()
|
||||
type!: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
baseUrl?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
apiKey?: string;
|
||||
}
|
||||
17
apps/api/src/onboarding/onboarding.guard.ts
Normal file
17
apps/api/src/onboarding/onboarding.guard.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import { CanActivate, ExecutionContext, ForbiddenException, Injectable } from "@nestjs/common";
|
||||
import { OnboardingService } from "./onboarding.service";
|
||||
|
||||
@Injectable()
|
||||
export class OnboardingGuard implements CanActivate {
|
||||
constructor(private readonly onboardingService: OnboardingService) {}
|
||||
|
||||
async canActivate(_context: ExecutionContext): Promise<boolean> {
|
||||
const completed = await this.onboardingService.isCompleted();
|
||||
|
||||
if (completed) {
|
||||
throw new ForbiddenException("Onboarding already completed");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
15
apps/api/src/onboarding/onboarding.module.ts
Normal file
15
apps/api/src/onboarding/onboarding.module.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
import { Module } from "@nestjs/common";
|
||||
import { ConfigModule } from "@nestjs/config";
|
||||
import { PrismaModule } from "../prisma/prisma.module";
|
||||
import { CryptoModule } from "../crypto/crypto.module";
|
||||
import { OnboardingController } from "./onboarding.controller";
|
||||
import { OnboardingService } from "./onboarding.service";
|
||||
import { OnboardingGuard } from "./onboarding.guard";
|
||||
|
||||
@Module({
|
||||
imports: [PrismaModule, CryptoModule, ConfigModule],
|
||||
controllers: [OnboardingController],
|
||||
providers: [OnboardingService, OnboardingGuard],
|
||||
exports: [OnboardingService],
|
||||
})
|
||||
export class OnboardingModule {}
|
||||
206
apps/api/src/onboarding/onboarding.service.spec.ts
Normal file
206
apps/api/src/onboarding/onboarding.service.spec.ts
Normal file
@@ -0,0 +1,206 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { hash } from "bcryptjs";
|
||||
import { OnboardingService } from "./onboarding.service";
|
||||
import { PrismaService } from "../prisma/prisma.service";
|
||||
import { CryptoService } from "../crypto/crypto.service";
|
||||
|
||||
vi.mock("bcryptjs", () => ({
|
||||
hash: vi.fn(),
|
||||
}));
|
||||
|
||||
describe("OnboardingService", () => {
|
||||
let service: OnboardingService;
|
||||
|
||||
const mockPrismaService = {
|
||||
systemConfig: {
|
||||
findUnique: vi.fn(),
|
||||
upsert: vi.fn(),
|
||||
},
|
||||
breakglassUser: {
|
||||
count: vi.fn(),
|
||||
create: vi.fn(),
|
||||
findFirst: vi.fn(),
|
||||
},
|
||||
llmProvider: {
|
||||
create: vi.fn(),
|
||||
},
|
||||
};
|
||||
|
||||
const mockCryptoService = {
|
||||
encrypt: vi.fn(),
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
|
||||
service = new OnboardingService(
|
||||
mockPrismaService as unknown as PrismaService,
|
||||
mockCryptoService as unknown as CryptoService
|
||||
);
|
||||
});
|
||||
|
||||
it("isCompleted returns false when no config exists", async () => {
|
||||
mockPrismaService.systemConfig.findUnique.mockResolvedValue(null);
|
||||
|
||||
await expect(service.isCompleted()).resolves.toBe(false);
|
||||
expect(mockPrismaService.systemConfig.findUnique).toHaveBeenCalledWith({
|
||||
where: { key: "onboarding.completed" },
|
||||
});
|
||||
});
|
||||
|
||||
it("isCompleted returns true when completed", async () => {
|
||||
mockPrismaService.systemConfig.findUnique.mockResolvedValue({
|
||||
id: "cfg-1",
|
||||
key: "onboarding.completed",
|
||||
value: "true",
|
||||
encrypted: false,
|
||||
updatedAt: new Date(),
|
||||
});
|
||||
|
||||
await expect(service.isCompleted()).resolves.toBe(true);
|
||||
});
|
||||
|
||||
it("createBreakglassUser hashes password and creates record", async () => {
|
||||
const mockedHash = vi.mocked(hash);
|
||||
mockedHash.mockResolvedValue("hashed-password");
|
||||
|
||||
mockPrismaService.breakglassUser.count.mockResolvedValue(0);
|
||||
mockPrismaService.breakglassUser.create.mockResolvedValue({
|
||||
id: "breakglass-1",
|
||||
username: "admin",
|
||||
});
|
||||
|
||||
const result = await service.createBreakglassUser("admin", "supersecret123");
|
||||
|
||||
expect(mockedHash).toHaveBeenCalledWith("supersecret123", 12);
|
||||
expect(mockPrismaService.breakglassUser.create).toHaveBeenCalledWith({
|
||||
data: {
|
||||
username: "admin",
|
||||
passwordHash: "hashed-password",
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
username: true,
|
||||
},
|
||||
});
|
||||
expect(result).toEqual({ id: "breakglass-1", username: "admin" });
|
||||
});
|
||||
|
||||
it("createBreakglassUser rejects if user already exists", async () => {
|
||||
mockPrismaService.breakglassUser.count.mockResolvedValue(1);
|
||||
|
||||
await expect(service.createBreakglassUser("admin", "supersecret123")).rejects.toThrow(
|
||||
"Breakglass user already exists"
|
||||
);
|
||||
});
|
||||
|
||||
it("configureOidc encrypts secret and saves to SystemConfig", async () => {
|
||||
mockCryptoService.encrypt.mockReturnValue("enc:oidc-secret");
|
||||
mockPrismaService.systemConfig.upsert.mockResolvedValue({
|
||||
id: "cfg",
|
||||
key: "oidc.clientSecret",
|
||||
value: "enc:oidc-secret",
|
||||
encrypted: true,
|
||||
updatedAt: new Date(),
|
||||
});
|
||||
|
||||
await service.configureOidc("https://auth.example.com", "client-id", "client-secret");
|
||||
|
||||
expect(mockCryptoService.encrypt).toHaveBeenCalledWith("client-secret");
|
||||
expect(mockPrismaService.systemConfig.upsert).toHaveBeenCalledTimes(3);
|
||||
expect(mockPrismaService.systemConfig.upsert).toHaveBeenCalledWith({
|
||||
where: { key: "oidc.issuerUrl" },
|
||||
create: {
|
||||
key: "oidc.issuerUrl",
|
||||
value: "https://auth.example.com",
|
||||
encrypted: false,
|
||||
},
|
||||
update: {
|
||||
value: "https://auth.example.com",
|
||||
encrypted: false,
|
||||
},
|
||||
});
|
||||
expect(mockPrismaService.systemConfig.upsert).toHaveBeenCalledWith({
|
||||
where: { key: "oidc.clientId" },
|
||||
create: {
|
||||
key: "oidc.clientId",
|
||||
value: "client-id",
|
||||
encrypted: false,
|
||||
},
|
||||
update: {
|
||||
value: "client-id",
|
||||
encrypted: false,
|
||||
},
|
||||
});
|
||||
expect(mockPrismaService.systemConfig.upsert).toHaveBeenCalledWith({
|
||||
where: { key: "oidc.clientSecret" },
|
||||
create: {
|
||||
key: "oidc.clientSecret",
|
||||
value: "enc:oidc-secret",
|
||||
encrypted: true,
|
||||
},
|
||||
update: {
|
||||
value: "enc:oidc-secret",
|
||||
encrypted: true,
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
it("addProvider encrypts apiKey and creates LlmProvider", async () => {
|
||||
mockCryptoService.encrypt.mockReturnValue("enc:api-key");
|
||||
mockPrismaService.llmProvider.create.mockResolvedValue({
|
||||
id: "provider-1",
|
||||
});
|
||||
|
||||
const result = await service.addProvider("breakglass-1", {
|
||||
name: "my-openai",
|
||||
displayName: "OpenAI",
|
||||
type: "openai",
|
||||
baseUrl: "https://api.openai.com/v1",
|
||||
apiKey: "sk-test",
|
||||
models: [{ id: "gpt-4o-mini", name: "GPT-4o Mini" }],
|
||||
});
|
||||
|
||||
expect(mockCryptoService.encrypt).toHaveBeenCalledWith("sk-test");
|
||||
expect(mockPrismaService.llmProvider.create).toHaveBeenCalledWith({
|
||||
data: {
|
||||
userId: "breakglass-1",
|
||||
name: "my-openai",
|
||||
displayName: "OpenAI",
|
||||
type: "openai",
|
||||
baseUrl: "https://api.openai.com/v1",
|
||||
apiKey: "enc:api-key",
|
||||
models: [{ id: "gpt-4o-mini", name: "GPT-4o Mini" }],
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
},
|
||||
});
|
||||
expect(result).toEqual({ id: "provider-1" });
|
||||
});
|
||||
|
||||
it("complete sets SystemConfig flag", async () => {
|
||||
mockPrismaService.systemConfig.upsert.mockResolvedValue({
|
||||
id: "cfg-1",
|
||||
key: "onboarding.completed",
|
||||
value: "true",
|
||||
encrypted: false,
|
||||
updatedAt: new Date(),
|
||||
});
|
||||
|
||||
await service.complete();
|
||||
|
||||
expect(mockPrismaService.systemConfig.upsert).toHaveBeenCalledWith({
|
||||
where: { key: "onboarding.completed" },
|
||||
create: {
|
||||
key: "onboarding.completed",
|
||||
value: "true",
|
||||
encrypted: false,
|
||||
},
|
||||
update: {
|
||||
value: "true",
|
||||
encrypted: false,
|
||||
},
|
||||
});
|
||||
});
|
||||
});
|
||||
191
apps/api/src/onboarding/onboarding.service.ts
Normal file
191
apps/api/src/onboarding/onboarding.service.ts
Normal file
@@ -0,0 +1,191 @@
|
||||
import { BadRequestException, ConflictException, Injectable } from "@nestjs/common";
|
||||
import type { InputJsonValue } from "@prisma/client/runtime/library";
|
||||
import { hash } from "bcryptjs";
|
||||
import { PrismaService } from "../prisma/prisma.service";
|
||||
import { CryptoService } from "../crypto/crypto.service";
|
||||
|
||||
const BCRYPT_ROUNDS = 12;
|
||||
const TEST_PROVIDER_TIMEOUT_MS = 8000;
|
||||
|
||||
const ONBOARDING_COMPLETED_KEY = "onboarding.completed";
|
||||
const OIDC_ISSUER_URL_KEY = "oidc.issuerUrl";
|
||||
const OIDC_CLIENT_ID_KEY = "oidc.clientId";
|
||||
const OIDC_CLIENT_SECRET_KEY = "oidc.clientSecret";
|
||||
|
||||
interface ProviderModelInput {
|
||||
id: string;
|
||||
name?: string;
|
||||
}
|
||||
|
||||
interface AddProviderInput {
|
||||
name: string;
|
||||
displayName: string;
|
||||
type: string;
|
||||
baseUrl?: string;
|
||||
apiKey?: string;
|
||||
models?: ProviderModelInput[];
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class OnboardingService {
|
||||
constructor(
|
||||
private readonly prisma: PrismaService,
|
||||
private readonly crypto: CryptoService
|
||||
) {}
|
||||
|
||||
// Check if onboarding is completed
|
||||
async isCompleted(): Promise<boolean> {
|
||||
const completedFlag = await this.prisma.systemConfig.findUnique({
|
||||
where: { key: ONBOARDING_COMPLETED_KEY },
|
||||
});
|
||||
|
||||
return completedFlag?.value === "true";
|
||||
}
|
||||
|
||||
// Step 1: Create breakglass admin user
|
||||
async createBreakglassUser(
|
||||
username: string,
|
||||
password: string
|
||||
): Promise<{ id: string; username: string }> {
|
||||
const breakglassCount = await this.prisma.breakglassUser.count();
|
||||
if (breakglassCount > 0) {
|
||||
throw new ConflictException("Breakglass user already exists");
|
||||
}
|
||||
|
||||
const passwordHash = await hash(password, BCRYPT_ROUNDS);
|
||||
|
||||
return this.prisma.breakglassUser.create({
|
||||
data: {
|
||||
username,
|
||||
passwordHash,
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
username: true,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// Step 2: Configure OIDC provider (optional)
|
||||
async configureOidc(issuerUrl: string, clientId: string, clientSecret: string): Promise<void> {
|
||||
const encryptedSecret = this.crypto.encrypt(clientSecret);
|
||||
|
||||
await Promise.all([
|
||||
this.upsertSystemConfig(OIDC_ISSUER_URL_KEY, issuerUrl, false),
|
||||
this.upsertSystemConfig(OIDC_CLIENT_ID_KEY, clientId, false),
|
||||
this.upsertSystemConfig(OIDC_CLIENT_SECRET_KEY, encryptedSecret, true),
|
||||
]);
|
||||
}
|
||||
|
||||
// Step 3: Add first LLM provider
|
||||
async addProvider(userId: string, data: AddProviderInput): Promise<{ id: string }> {
|
||||
const encryptedApiKey = data.apiKey ? this.crypto.encrypt(data.apiKey) : undefined;
|
||||
|
||||
return this.prisma.llmProvider.create({
|
||||
data: {
|
||||
userId,
|
||||
name: data.name,
|
||||
displayName: data.displayName,
|
||||
type: data.type,
|
||||
baseUrl: data.baseUrl ?? null,
|
||||
apiKey: encryptedApiKey ?? null,
|
||||
models: (data.models ?? []) as unknown as InputJsonValue,
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// Step 3b: Test LLM provider connection
|
||||
async testProvider(
|
||||
type: string,
|
||||
baseUrl?: string,
|
||||
apiKey?: string
|
||||
): Promise<{ success: boolean; error?: string }> {
|
||||
const normalizedType = type.trim().toLowerCase();
|
||||
if (!normalizedType) {
|
||||
return { success: false, error: "Provider type is required" };
|
||||
}
|
||||
|
||||
let probeUrl: string;
|
||||
try {
|
||||
probeUrl = this.buildProbeUrl(normalizedType, baseUrl);
|
||||
} catch (error: unknown) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
return { success: false, error: message };
|
||||
}
|
||||
|
||||
const headers: Record<string, string> = {
|
||||
Accept: "application/json",
|
||||
};
|
||||
if (apiKey) {
|
||||
headers.Authorization = `Bearer ${apiKey}`;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(probeUrl, {
|
||||
method: "GET",
|
||||
headers,
|
||||
signal: AbortSignal.timeout(TEST_PROVIDER_TIMEOUT_MS),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
return {
|
||||
success: false,
|
||||
error: `Provider returned ${String(response.status)} ${response.statusText}`.trim(),
|
||||
};
|
||||
}
|
||||
|
||||
return { success: true };
|
||||
} catch (error: unknown) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
return { success: false, error: message };
|
||||
}
|
||||
}
|
||||
|
||||
// Step 4: Mark onboarding complete
|
||||
async complete(): Promise<void> {
|
||||
await this.upsertSystemConfig(ONBOARDING_COMPLETED_KEY, "true", false);
|
||||
}
|
||||
|
||||
async getBreakglassUserId(): Promise<string> {
|
||||
const user = await this.prisma.breakglassUser.findFirst({
|
||||
where: { isActive: true },
|
||||
orderBy: { createdAt: "asc" },
|
||||
select: { id: true },
|
||||
});
|
||||
|
||||
if (!user) {
|
||||
throw new BadRequestException("Create a breakglass user before adding a provider");
|
||||
}
|
||||
|
||||
return user.id;
|
||||
}
|
||||
|
||||
private async upsertSystemConfig(key: string, value: string, encrypted: boolean): Promise<void> {
|
||||
await this.prisma.systemConfig.upsert({
|
||||
where: { key },
|
||||
create: { key, value, encrypted },
|
||||
update: { value, encrypted },
|
||||
});
|
||||
}
|
||||
|
||||
private buildProbeUrl(type: string, baseUrl?: string): string {
|
||||
const resolvedBaseUrl = baseUrl ?? this.getDefaultProviderBaseUrl(type);
|
||||
const normalizedBaseUrl = resolvedBaseUrl.endsWith("/")
|
||||
? resolvedBaseUrl
|
||||
: `${resolvedBaseUrl}/`;
|
||||
const endpointPath = type === "ollama" ? "api/tags" : "models";
|
||||
|
||||
return new URL(endpointPath, normalizedBaseUrl).toString();
|
||||
}
|
||||
|
||||
private getDefaultProviderBaseUrl(type: string): string {
|
||||
if (type === "ollama") {
|
||||
return "http://localhost:11434";
|
||||
}
|
||||
|
||||
return "https://api.openai.com/v1";
|
||||
}
|
||||
}
|
||||
3
docker/.env.example
Normal file
3
docker/.env.example
Normal file
@@ -0,0 +1,3 @@
|
||||
DATABASE_URL=postgresql://mosaic:changeme@postgres:5432/mosaic
|
||||
DATABASE_PASSWORD=changeme
|
||||
MOSAIC_SECRET_KEY=your-secret-key-at-least-32-characters-long
|
||||
40
docker/README.md
Normal file
40
docker/README.md
Normal file
@@ -0,0 +1,40 @@
|
||||
# Mosaic Docker (Core Services)
|
||||
|
||||
This folder includes the Compose stack for **core Mosaic services only**:
|
||||
|
||||
- `mosaic-api`
|
||||
- `mosaic-web`
|
||||
- `postgres`
|
||||
|
||||
User OpenClaw containers are **not** defined in Compose. They are created and managed dynamically by the API's `ContainerLifecycleService` through Docker socket access.
|
||||
|
||||
## Start the stack
|
||||
|
||||
```bash
|
||||
docker compose -f docker/mosaic-compose.yml up -d
|
||||
```
|
||||
|
||||
## Required environment variables
|
||||
|
||||
- `DATABASE_URL`
|
||||
- `MOSAIC_SECRET_KEY`
|
||||
- `DATABASE_PASSWORD`
|
||||
|
||||
Use [`docker/.env.example`](./.env.example) as a starting point.
|
||||
|
||||
## Architecture overview
|
||||
|
||||
See the design doc: [`docs/design/MS22-DB-CENTRIC-ARCHITECTURE.md`](../docs/design/MS22-DB-CENTRIC-ARCHITECTURE.md)
|
||||
|
||||
`mosaic-agents` is an internal-only bridge network reserved for dynamically created user containers.
|
||||
|
||||
## OpenClaw entrypoint behavior
|
||||
|
||||
`docker/openclaw-entrypoint.sh` is intended for dynamically created user OpenClaw containers:
|
||||
|
||||
1. Validates required env vars (`MOSAIC_API_URL`, `AGENT_TOKEN`, `AGENT_ID`).
|
||||
2. Fetches agent-specific OpenClaw config from Mosaic API internal endpoint.
|
||||
3. Writes the config to `/tmp/openclaw.json`.
|
||||
4. Starts OpenClaw gateway with `OPENCLAW_CONFIG_PATH=/tmp/openclaw.json`.
|
||||
|
||||
`docker/openclaw-healthcheck.sh` probes `http://localhost:18789/health` for container health.
|
||||
53
docker/mosaic-compose.yml
Normal file
53
docker/mosaic-compose.yml
Normal file
@@ -0,0 +1,53 @@
|
||||
services:
|
||||
mosaic-api:
|
||||
image: mosaic/api:latest
|
||||
environment:
|
||||
DATABASE_URL: ${DATABASE_URL}
|
||||
MOSAIC_SECRET_KEY: ${MOSAIC_SECRET_KEY}
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
networks:
|
||||
- internal
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:4000/api/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
||||
mosaic-web:
|
||||
image: mosaic/web:latest
|
||||
environment:
|
||||
NEXT_PUBLIC_API_URL: http://mosaic-api:4000
|
||||
ports:
|
||||
- "3000:3000"
|
||||
networks:
|
||||
- internal
|
||||
depends_on:
|
||||
mosaic-api:
|
||||
condition: service_healthy
|
||||
|
||||
postgres:
|
||||
image: postgres:17-alpine
|
||||
environment:
|
||||
POSTGRES_DB: mosaic
|
||||
POSTGRES_USER: mosaic
|
||||
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql/data
|
||||
networks:
|
||||
- internal
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U mosaic"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
networks:
|
||||
internal:
|
||||
driver: bridge
|
||||
mosaic-agents:
|
||||
driver: bridge
|
||||
internal: true
|
||||
|
||||
volumes:
|
||||
postgres-data:
|
||||
20
docker/openclaw-entrypoint.sh
Executable file
20
docker/openclaw-entrypoint.sh
Executable file
@@ -0,0 +1,20 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
: "${MOSAIC_API_URL:?MOSAIC_API_URL is required}"
|
||||
: "${AGENT_TOKEN:?AGENT_TOKEN is required}"
|
||||
: "${AGENT_ID:?AGENT_ID is required}"
|
||||
|
||||
echo "[entrypoint] Fetching config for agent ${AGENT_ID}..."
|
||||
HTTP_CODE=$(curl -sf -w "%{http_code}" \
|
||||
"${MOSAIC_API_URL}/api/internal/agent-config/${AGENT_ID}" \
|
||||
-H "Authorization: Bearer ${AGENT_TOKEN}" \
|
||||
-o /tmp/openclaw.json)
|
||||
|
||||
if [ "$HTTP_CODE" != "200" ]; then
|
||||
echo "[entrypoint] ERROR: Config fetch failed with HTTP ${HTTP_CODE}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "[entrypoint] Config loaded. Starting OpenClaw gateway..."
|
||||
export OPENCLAW_CONFIG_PATH=/tmp/openclaw.json
|
||||
exec openclaw gateway run --bind lan --auth token
|
||||
2
docker/openclaw-healthcheck.sh
Executable file
2
docker/openclaw-healthcheck.sh
Executable file
@@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
curl -sf http://localhost:18789/health || exit 1
|
||||
29
pnpm-lock.yaml
generated
29
pnpm-lock.yaml
generated
@@ -102,6 +102,9 @@ importers:
|
||||
'@nestjs/platform-socket.io':
|
||||
specifier: ^11.1.12
|
||||
version: 11.1.12(@nestjs/common@11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.12)(rxjs@7.8.2)
|
||||
'@nestjs/schedule':
|
||||
specifier: ^6.1.1
|
||||
version: 6.1.1(@nestjs/common@11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.12)
|
||||
'@nestjs/throttler':
|
||||
specifier: ^6.5.0
|
||||
version: 6.5.0(@nestjs/common@11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.12)(reflect-metadata@0.2.2)
|
||||
@@ -1741,6 +1744,12 @@ packages:
|
||||
'@nestjs/websockets': ^11.0.0
|
||||
rxjs: ^7.1.0
|
||||
|
||||
'@nestjs/schedule@6.1.1':
|
||||
resolution: {integrity: sha512-kQl1RRgi02GJ0uaUGCrXHCcwISsCsJDciCKe38ykJZgnAeeoeVWs8luWtBo4AqAAXm4nS5K8RlV0smHUJ4+2FA==}
|
||||
peerDependencies:
|
||||
'@nestjs/common': ^10.0.0 || ^11.0.0
|
||||
'@nestjs/core': ^10.0.0 || ^11.0.0
|
||||
|
||||
'@nestjs/schematics@11.0.9':
|
||||
resolution: {integrity: sha512-0NfPbPlEaGwIT8/TCThxLzrlz3yzDNkfRNpbL7FiplKq3w4qXpJg0JYwqgMEJnLQZm3L/L/5XjoyfJHUO3qX9g==}
|
||||
peerDependencies:
|
||||
@@ -3241,6 +3250,9 @@ packages:
|
||||
'@types/linkify-it@5.0.0':
|
||||
resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==}
|
||||
|
||||
'@types/luxon@3.7.1':
|
||||
resolution: {integrity: sha512-H3iskjFIAn5SlJU7OuxUmTEpebK6TKB8rxZShDslBMZJ5u9S//KM1sbdAisiSrqwLQncVjnpi2OK2J51h+4lsg==}
|
||||
|
||||
'@types/markdown-it@13.0.9':
|
||||
resolution: {integrity: sha512-1XPwR0+MgXLWfTn9gCsZ55AHOKW1WN+P9vr0PaQh5aerR9LLQXUbjfEAFhjmEmyoYFWAyuN2Mqkn40MZ4ukjBw==}
|
||||
|
||||
@@ -4251,6 +4263,10 @@ packages:
|
||||
resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==}
|
||||
engines: {node: '>=12.0.0'}
|
||||
|
||||
cron@4.4.0:
|
||||
resolution: {integrity: sha512-fkdfq+b+AHI4cKdhZlppHveI/mgz2qpiYxcm+t5E5TsxX7QrLS1VE0+7GENEk9z0EeGPcpSciGv6ez24duWhwQ==}
|
||||
engines: {node: '>=18.x'}
|
||||
|
||||
cross-spawn@7.0.6:
|
||||
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
|
||||
engines: {node: '>= 8'}
|
||||
@@ -8863,6 +8879,12 @@ snapshots:
|
||||
- supports-color
|
||||
- utf-8-validate
|
||||
|
||||
'@nestjs/schedule@6.1.1(@nestjs/common@11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.12)':
|
||||
dependencies:
|
||||
'@nestjs/common': 11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||
'@nestjs/core': 11.1.12(@nestjs/common@11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.12)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||
cron: 4.4.0
|
||||
|
||||
'@nestjs/schematics@11.0.9(chokidar@4.0.3)(typescript@5.9.3)':
|
||||
dependencies:
|
||||
'@angular-devkit/core': 19.2.17(chokidar@4.0.3)
|
||||
@@ -10593,6 +10615,8 @@ snapshots:
|
||||
|
||||
'@types/linkify-it@5.0.0': {}
|
||||
|
||||
'@types/luxon@3.7.1': {}
|
||||
|
||||
'@types/markdown-it@13.0.9':
|
||||
dependencies:
|
||||
'@types/linkify-it': 3.0.5
|
||||
@@ -11787,6 +11811,11 @@ snapshots:
|
||||
dependencies:
|
||||
luxon: 3.7.2
|
||||
|
||||
cron@4.4.0:
|
||||
dependencies:
|
||||
'@types/luxon': 3.7.1
|
||||
luxon: 3.7.2
|
||||
|
||||
cross-spawn@7.0.6:
|
||||
dependencies:
|
||||
path-key: 3.1.1
|
||||
|
||||
Reference in New Issue
Block a user