Compare commits
3 Commits
feat/ms22-
...
docs/ms22-
| Author | SHA1 | Date | |
|---|---|---|---|
| a640a2f7b8 | |||
| 3974e08b6c | |||
| 3ceb45c0b2 |
@@ -59,7 +59,6 @@
|
|||||||
"class-validator": "^0.14.3",
|
"class-validator": "^0.14.3",
|
||||||
"cookie-parser": "^1.4.7",
|
"cookie-parser": "^1.4.7",
|
||||||
"discord.js": "^14.25.1",
|
"discord.js": "^14.25.1",
|
||||||
"dockerode": "^4.0.9",
|
|
||||||
"gray-matter": "^4.0.3",
|
"gray-matter": "^4.0.3",
|
||||||
"highlight.js": "^11.11.1",
|
"highlight.js": "^11.11.1",
|
||||||
"ioredis": "^5.9.2",
|
"ioredis": "^5.9.2",
|
||||||
@@ -89,7 +88,6 @@
|
|||||||
"@types/archiver": "^7.0.0",
|
"@types/archiver": "^7.0.0",
|
||||||
"@types/bcryptjs": "^3.0.0",
|
"@types/bcryptjs": "^3.0.0",
|
||||||
"@types/cookie-parser": "^1.4.10",
|
"@types/cookie-parser": "^1.4.10",
|
||||||
"@types/dockerode": "^3.3.47",
|
|
||||||
"@types/express": "^5.0.1",
|
"@types/express": "^5.0.1",
|
||||||
"@types/highlight.js": "^10.1.0",
|
"@types/highlight.js": "^10.1.0",
|
||||||
"@types/node": "^22.13.4",
|
"@types/node": "^22.13.4",
|
||||||
|
|||||||
@@ -1,109 +0,0 @@
|
|||||||
-- CreateTable
|
|
||||||
CREATE TABLE "SystemConfig" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"key" TEXT NOT NULL,
|
|
||||||
"value" TEXT NOT NULL,
|
|
||||||
"encrypted" BOOLEAN NOT NULL DEFAULT false,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "SystemConfig_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "BreakglassUser" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"username" TEXT NOT NULL,
|
|
||||||
"passwordHash" TEXT NOT NULL,
|
|
||||||
"isActive" BOOLEAN NOT NULL DEFAULT true,
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "BreakglassUser_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "LlmProvider" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"userId" TEXT NOT NULL,
|
|
||||||
"name" TEXT NOT NULL,
|
|
||||||
"displayName" TEXT NOT NULL,
|
|
||||||
"type" TEXT NOT NULL,
|
|
||||||
"baseUrl" TEXT,
|
|
||||||
"apiKey" TEXT,
|
|
||||||
"apiType" TEXT NOT NULL DEFAULT 'openai-completions',
|
|
||||||
"models" JSONB NOT NULL DEFAULT '[]',
|
|
||||||
"isActive" BOOLEAN NOT NULL DEFAULT true,
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "LlmProvider_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "UserContainer" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"userId" TEXT NOT NULL,
|
|
||||||
"containerId" TEXT,
|
|
||||||
"containerName" TEXT NOT NULL,
|
|
||||||
"gatewayPort" INTEGER,
|
|
||||||
"gatewayToken" TEXT NOT NULL,
|
|
||||||
"status" TEXT NOT NULL DEFAULT 'stopped',
|
|
||||||
"lastActiveAt" TIMESTAMP(3),
|
|
||||||
"idleTimeoutMin" INTEGER NOT NULL DEFAULT 30,
|
|
||||||
"config" JSONB NOT NULL DEFAULT '{}',
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "UserContainer_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "SystemContainer" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"name" TEXT NOT NULL,
|
|
||||||
"role" TEXT NOT NULL,
|
|
||||||
"containerId" TEXT,
|
|
||||||
"gatewayPort" INTEGER,
|
|
||||||
"gatewayToken" TEXT NOT NULL,
|
|
||||||
"status" TEXT NOT NULL DEFAULT 'stopped',
|
|
||||||
"primaryModel" TEXT NOT NULL,
|
|
||||||
"isActive" BOOLEAN NOT NULL DEFAULT true,
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "SystemContainer_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "UserAgentConfig" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"userId" TEXT NOT NULL,
|
|
||||||
"primaryModel" TEXT,
|
|
||||||
"fallbackModels" JSONB NOT NULL DEFAULT '[]',
|
|
||||||
"personality" TEXT,
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "UserAgentConfig_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "SystemConfig_key_key" ON "SystemConfig"("key");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "BreakglassUser_username_key" ON "BreakglassUser"("username");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "LlmProvider_userId_idx" ON "LlmProvider"("userId");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "LlmProvider_userId_name_key" ON "LlmProvider"("userId", "name");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "UserContainer_userId_key" ON "UserContainer"("userId");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "SystemContainer_name_key" ON "SystemContainer"("name");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "UserAgentConfig_userId_key" ON "UserAgentConfig"("userId");
|
|
||||||
@@ -1625,81 +1625,3 @@ model ConversationArchive {
|
|||||||
@@index([startedAt])
|
@@index([startedAt])
|
||||||
@@map("conversation_archives")
|
@@map("conversation_archives")
|
||||||
}
|
}
|
||||||
|
|
||||||
// ============================================
|
|
||||||
// AGENT FLEET MODULE
|
|
||||||
// ============================================
|
|
||||||
|
|
||||||
model SystemConfig {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
key String @unique
|
|
||||||
value String
|
|
||||||
encrypted Boolean @default(false)
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
}
|
|
||||||
|
|
||||||
model BreakglassUser {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
username String @unique
|
|
||||||
passwordHash String
|
|
||||||
isActive Boolean @default(true)
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
}
|
|
||||||
|
|
||||||
model LlmProvider {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
userId String
|
|
||||||
name String
|
|
||||||
displayName String
|
|
||||||
type String
|
|
||||||
baseUrl String?
|
|
||||||
apiKey String?
|
|
||||||
apiType String @default("openai-completions")
|
|
||||||
models Json @default("[]")
|
|
||||||
isActive Boolean @default(true)
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
|
|
||||||
@@unique([userId, name])
|
|
||||||
@@index([userId])
|
|
||||||
}
|
|
||||||
|
|
||||||
model UserContainer {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
userId String @unique
|
|
||||||
containerId String?
|
|
||||||
containerName String
|
|
||||||
gatewayPort Int?
|
|
||||||
gatewayToken String
|
|
||||||
status String @default("stopped")
|
|
||||||
lastActiveAt DateTime?
|
|
||||||
idleTimeoutMin Int @default(30)
|
|
||||||
config Json @default("{}")
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
}
|
|
||||||
|
|
||||||
model SystemContainer {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
name String @unique
|
|
||||||
role String
|
|
||||||
containerId String?
|
|
||||||
gatewayPort Int?
|
|
||||||
gatewayToken String
|
|
||||||
status String @default("stopped")
|
|
||||||
primaryModel String
|
|
||||||
isActive Boolean @default(true)
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
}
|
|
||||||
|
|
||||||
model UserAgentConfig {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
userId String @unique
|
|
||||||
primaryModel String?
|
|
||||||
fallbackModels Json @default("[]")
|
|
||||||
personality String?
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
import {
|
|
||||||
Controller,
|
|
||||||
ForbiddenException,
|
|
||||||
Get,
|
|
||||||
Param,
|
|
||||||
Req,
|
|
||||||
UnauthorizedException,
|
|
||||||
UseGuards,
|
|
||||||
} from "@nestjs/common";
|
|
||||||
import { AgentConfigService } from "./agent-config.service";
|
|
||||||
import { AgentConfigGuard, type AgentConfigRequest } from "./agent-config.guard";
|
|
||||||
|
|
||||||
@Controller("internal")
|
|
||||||
@UseGuards(AgentConfigGuard)
|
|
||||||
export class AgentConfigController {
|
|
||||||
constructor(private readonly agentConfigService: AgentConfigService) {}
|
|
||||||
|
|
||||||
// GET /api/internal/agent-config/:id
|
|
||||||
// Auth: Bearer token (validated against UserContainer.gatewayToken or SystemContainer.gatewayToken)
|
|
||||||
// Returns: assembled openclaw.json
|
|
||||||
//
|
|
||||||
// The :id param is the container record ID (cuid)
|
|
||||||
// Token must match the container requesting its own config
|
|
||||||
@Get("agent-config/:id")
|
|
||||||
async getAgentConfig(
|
|
||||||
@Param("id") id: string,
|
|
||||||
@Req() request: AgentConfigRequest
|
|
||||||
): Promise<object> {
|
|
||||||
const containerAuth = request.containerAuth;
|
|
||||||
if (!containerAuth) {
|
|
||||||
throw new UnauthorizedException("Missing container authentication context");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (containerAuth.id !== id) {
|
|
||||||
throw new ForbiddenException("Token is not authorized for the requested container");
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.agentConfigService.generateConfigForContainer(containerAuth.type, id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
import { CanActivate, ExecutionContext, Injectable, UnauthorizedException } from "@nestjs/common";
|
|
||||||
import type { Request } from "express";
|
|
||||||
import { AgentConfigService, type ContainerTokenValidation } from "./agent-config.service";
|
|
||||||
|
|
||||||
export interface AgentConfigRequest extends Request {
|
|
||||||
containerAuth?: ContainerTokenValidation;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class AgentConfigGuard implements CanActivate {
|
|
||||||
constructor(private readonly agentConfigService: AgentConfigService) {}
|
|
||||||
|
|
||||||
async canActivate(context: ExecutionContext): Promise<boolean> {
|
|
||||||
const request = context.switchToHttp().getRequest<AgentConfigRequest>();
|
|
||||||
const token = this.extractBearerToken(request.headers.authorization);
|
|
||||||
|
|
||||||
if (!token) {
|
|
||||||
throw new UnauthorizedException("Missing Bearer token");
|
|
||||||
}
|
|
||||||
|
|
||||||
const containerAuth = await this.agentConfigService.validateContainerToken(token);
|
|
||||||
if (!containerAuth) {
|
|
||||||
throw new UnauthorizedException("Invalid container token");
|
|
||||||
}
|
|
||||||
|
|
||||||
request.containerAuth = containerAuth;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private extractBearerToken(headerValue: string | string[] | undefined): string | null {
|
|
||||||
const normalizedHeader = Array.isArray(headerValue) ? headerValue[0] : headerValue;
|
|
||||||
if (!normalizedHeader) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const [scheme, token] = normalizedHeader.split(" ");
|
|
||||||
if (!scheme || !token || scheme.toLowerCase() !== "bearer") {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return token;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { Module } from "@nestjs/common";
|
|
||||||
import { PrismaModule } from "../prisma/prisma.module";
|
|
||||||
import { CryptoModule } from "../crypto/crypto.module";
|
|
||||||
import { AgentConfigController } from "./agent-config.controller";
|
|
||||||
import { AgentConfigService } from "./agent-config.service";
|
|
||||||
import { AgentConfigGuard } from "./agent-config.guard";
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [PrismaModule, CryptoModule],
|
|
||||||
controllers: [AgentConfigController],
|
|
||||||
providers: [AgentConfigService, AgentConfigGuard],
|
|
||||||
exports: [AgentConfigService],
|
|
||||||
})
|
|
||||||
export class AgentConfigModule {}
|
|
||||||
@@ -1,215 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
||||||
import { AgentConfigService } from "./agent-config.service";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { CryptoService } from "../crypto/crypto.service";
|
|
||||||
|
|
||||||
describe("AgentConfigService", () => {
|
|
||||||
let service: AgentConfigService;
|
|
||||||
|
|
||||||
const mockPrismaService = {
|
|
||||||
userAgentConfig: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
},
|
|
||||||
llmProvider: {
|
|
||||||
findMany: vi.fn(),
|
|
||||||
},
|
|
||||||
userContainer: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
findMany: vi.fn(),
|
|
||||||
},
|
|
||||||
systemContainer: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
findMany: vi.fn(),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockCryptoService = {
|
|
||||||
isEncrypted: vi.fn((value: string) => value.startsWith("enc:")),
|
|
||||||
decrypt: vi.fn((value: string) => value.replace(/^enc:/, "")),
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
|
|
||||||
service = new AgentConfigService(
|
|
||||||
mockPrismaService as unknown as PrismaService,
|
|
||||||
mockCryptoService as unknown as CryptoService
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("generateUserConfig returns valid openclaw.json structure", async () => {
|
|
||||||
mockPrismaService.userAgentConfig.findUnique.mockResolvedValue({
|
|
||||||
id: "cfg-1",
|
|
||||||
userId: "user-1",
|
|
||||||
primaryModel: "my-zai/glm-5",
|
|
||||||
});
|
|
||||||
|
|
||||||
mockPrismaService.userContainer.findUnique.mockResolvedValue({
|
|
||||||
id: "container-1",
|
|
||||||
userId: "user-1",
|
|
||||||
gatewayPort: 19001,
|
|
||||||
});
|
|
||||||
|
|
||||||
mockPrismaService.llmProvider.findMany.mockResolvedValue([
|
|
||||||
{
|
|
||||||
id: "provider-1",
|
|
||||||
userId: "user-1",
|
|
||||||
name: "my-zai",
|
|
||||||
displayName: "Z.ai",
|
|
||||||
type: "zai",
|
|
||||||
baseUrl: "https://api.z.ai/v1",
|
|
||||||
apiKey: "enc:secret-zai-key",
|
|
||||||
apiType: "openai-completions",
|
|
||||||
models: [{ id: "glm-5" }],
|
|
||||||
isActive: true,
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const result = await service.generateUserConfig("user-1");
|
|
||||||
|
|
||||||
expect(result).toEqual({
|
|
||||||
gateway: {
|
|
||||||
mode: "local",
|
|
||||||
port: 19001,
|
|
||||||
bind: "lan",
|
|
||||||
auth: { mode: "token" },
|
|
||||||
http: {
|
|
||||||
endpoints: {
|
|
||||||
chatCompletions: { enabled: true },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
agents: {
|
|
||||||
defaults: {
|
|
||||||
model: {
|
|
||||||
primary: "my-zai/glm-5",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
models: {
|
|
||||||
providers: {
|
|
||||||
"my-zai": {
|
|
||||||
apiKey: "secret-zai-key",
|
|
||||||
baseUrl: "https://api.z.ai/v1",
|
|
||||||
models: {
|
|
||||||
"glm-5": {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("generateUserConfig decrypts API keys correctly", async () => {
|
|
||||||
mockPrismaService.userAgentConfig.findUnique.mockResolvedValue({
|
|
||||||
id: "cfg-1",
|
|
||||||
userId: "user-1",
|
|
||||||
primaryModel: "openai-work/gpt-4.1",
|
|
||||||
});
|
|
||||||
|
|
||||||
mockPrismaService.userContainer.findUnique.mockResolvedValue({
|
|
||||||
id: "container-1",
|
|
||||||
userId: "user-1",
|
|
||||||
gatewayPort: 18789,
|
|
||||||
});
|
|
||||||
|
|
||||||
mockPrismaService.llmProvider.findMany.mockResolvedValue([
|
|
||||||
{
|
|
||||||
id: "provider-1",
|
|
||||||
userId: "user-1",
|
|
||||||
name: "openai-work",
|
|
||||||
displayName: "OpenAI Work",
|
|
||||||
type: "openai",
|
|
||||||
baseUrl: "https://api.openai.com/v1",
|
|
||||||
apiKey: "enc:encrypted-openai-key",
|
|
||||||
apiType: "openai-completions",
|
|
||||||
models: [{ id: "gpt-4.1" }],
|
|
||||||
isActive: true,
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const result = await service.generateUserConfig("user-1");
|
|
||||||
|
|
||||||
expect(mockCryptoService.decrypt).toHaveBeenCalledWith("enc:encrypted-openai-key");
|
|
||||||
expect(result.models.providers["openai-work"]?.apiKey).toBe("encrypted-openai-key");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("generateUserConfig handles user with no providers", async () => {
|
|
||||||
mockPrismaService.userAgentConfig.findUnique.mockResolvedValue({
|
|
||||||
id: "cfg-1",
|
|
||||||
userId: "user-2",
|
|
||||||
primaryModel: "openai/gpt-4o-mini",
|
|
||||||
});
|
|
||||||
|
|
||||||
mockPrismaService.userContainer.findUnique.mockResolvedValue({
|
|
||||||
id: "container-2",
|
|
||||||
userId: "user-2",
|
|
||||||
gatewayPort: null,
|
|
||||||
});
|
|
||||||
|
|
||||||
mockPrismaService.llmProvider.findMany.mockResolvedValue([]);
|
|
||||||
|
|
||||||
const result = await service.generateUserConfig("user-2");
|
|
||||||
|
|
||||||
expect(result.models.providers).toEqual({});
|
|
||||||
expect(result.gateway.port).toBe(18789);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("validateContainerToken returns correct type for user container", async () => {
|
|
||||||
mockPrismaService.userContainer.findMany.mockResolvedValue([
|
|
||||||
{
|
|
||||||
id: "user-container-1",
|
|
||||||
gatewayToken: "enc:user-token-1",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
mockPrismaService.systemContainer.findMany.mockResolvedValue([]);
|
|
||||||
|
|
||||||
const result = await service.validateContainerToken("user-token-1");
|
|
||||||
|
|
||||||
expect(result).toEqual({
|
|
||||||
type: "user",
|
|
||||||
id: "user-container-1",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("validateContainerToken returns correct type for system container", async () => {
|
|
||||||
mockPrismaService.userContainer.findMany.mockResolvedValue([]);
|
|
||||||
mockPrismaService.systemContainer.findMany.mockResolvedValue([
|
|
||||||
{
|
|
||||||
id: "system-container-1",
|
|
||||||
gatewayToken: "enc:system-token-1",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const result = await service.validateContainerToken("system-token-1");
|
|
||||||
|
|
||||||
expect(result).toEqual({
|
|
||||||
type: "system",
|
|
||||||
id: "system-container-1",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("validateContainerToken returns null for invalid token", async () => {
|
|
||||||
mockPrismaService.userContainer.findMany.mockResolvedValue([
|
|
||||||
{
|
|
||||||
id: "user-container-1",
|
|
||||||
gatewayToken: "enc:user-token-1",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
mockPrismaService.systemContainer.findMany.mockResolvedValue([
|
|
||||||
{
|
|
||||||
id: "system-container-1",
|
|
||||||
gatewayToken: "enc:system-token-1",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const result = await service.validateContainerToken("no-match");
|
|
||||||
|
|
||||||
expect(result).toBeNull();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,288 +0,0 @@
|
|||||||
import { Injectable, NotFoundException } from "@nestjs/common";
|
|
||||||
import type { LlmProvider } from "@prisma/client";
|
|
||||||
import { timingSafeEqual } from "node:crypto";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { CryptoService } from "../crypto/crypto.service";
|
|
||||||
|
|
||||||
const DEFAULT_GATEWAY_PORT = 18789;
|
|
||||||
const DEFAULT_PRIMARY_MODEL = "openai/gpt-4o-mini";
|
|
||||||
|
|
||||||
type ContainerType = "user" | "system";
|
|
||||||
|
|
||||||
export interface ContainerTokenValidation {
|
|
||||||
type: ContainerType;
|
|
||||||
id: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
type OpenClawModelMap = Record<string, Record<string, never>>;
|
|
||||||
|
|
||||||
interface OpenClawProviderConfig {
|
|
||||||
apiKey?: string;
|
|
||||||
baseUrl?: string;
|
|
||||||
models: OpenClawModelMap;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface OpenClawConfig {
|
|
||||||
gateway: {
|
|
||||||
mode: "local";
|
|
||||||
port: number;
|
|
||||||
bind: "lan";
|
|
||||||
auth: { mode: "token" };
|
|
||||||
http: {
|
|
||||||
endpoints: {
|
|
||||||
chatCompletions: { enabled: true };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
agents: {
|
|
||||||
defaults: {
|
|
||||||
model: {
|
|
||||||
primary: string;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
models: {
|
|
||||||
providers: Record<string, OpenClawProviderConfig>;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class AgentConfigService {
|
|
||||||
constructor(
|
|
||||||
private readonly prisma: PrismaService,
|
|
||||||
private readonly crypto: CryptoService
|
|
||||||
) {}
|
|
||||||
|
|
||||||
// Generate complete openclaw.json for a user container
|
|
||||||
async generateUserConfig(userId: string): Promise<OpenClawConfig> {
|
|
||||||
const [userAgentConfig, providers, userContainer] = await Promise.all([
|
|
||||||
this.prisma.userAgentConfig.findUnique({
|
|
||||||
where: { userId },
|
|
||||||
}),
|
|
||||||
this.prisma.llmProvider.findMany({
|
|
||||||
where: {
|
|
||||||
userId,
|
|
||||||
isActive: true,
|
|
||||||
},
|
|
||||||
orderBy: {
|
|
||||||
createdAt: "asc",
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
this.prisma.userContainer.findUnique({
|
|
||||||
where: { userId },
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
|
|
||||||
if (!userContainer) {
|
|
||||||
throw new NotFoundException(`User container not found for user ${userId}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const primaryModel =
|
|
||||||
userAgentConfig?.primaryModel ??
|
|
||||||
this.resolvePrimaryModelFromProviders(providers) ??
|
|
||||||
DEFAULT_PRIMARY_MODEL;
|
|
||||||
|
|
||||||
return this.buildOpenClawConfig(primaryModel, userContainer.gatewayPort, providers);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate config for a system container
|
|
||||||
async generateSystemConfig(containerId: string): Promise<OpenClawConfig> {
|
|
||||||
const systemContainer = await this.prisma.systemContainer.findUnique({
|
|
||||||
where: { id: containerId },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!systemContainer) {
|
|
||||||
throw new NotFoundException(`System container ${containerId} not found`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.buildOpenClawConfig(
|
|
||||||
systemContainer.primaryModel || DEFAULT_PRIMARY_MODEL,
|
|
||||||
systemContainer.gatewayPort,
|
|
||||||
[]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async generateConfigForContainer(
|
|
||||||
type: ContainerType,
|
|
||||||
containerId: string
|
|
||||||
): Promise<OpenClawConfig> {
|
|
||||||
if (type === "system") {
|
|
||||||
return this.generateSystemConfig(containerId);
|
|
||||||
}
|
|
||||||
|
|
||||||
const userContainer = await this.prisma.userContainer.findUnique({
|
|
||||||
where: { id: containerId },
|
|
||||||
select: { userId: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!userContainer) {
|
|
||||||
throw new NotFoundException(`User container ${containerId} not found`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.generateUserConfig(userContainer.userId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Validate a container's bearer token
|
|
||||||
async validateContainerToken(token: string): Promise<ContainerTokenValidation | null> {
|
|
||||||
if (!token) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const [userContainers, systemContainers] = await Promise.all([
|
|
||||||
this.prisma.userContainer.findMany({
|
|
||||||
select: {
|
|
||||||
id: true,
|
|
||||||
gatewayToken: true,
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
this.prisma.systemContainer.findMany({
|
|
||||||
select: {
|
|
||||||
id: true,
|
|
||||||
gatewayToken: true,
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
|
|
||||||
for (const container of userContainers) {
|
|
||||||
const storedToken = this.decryptContainerToken(container.gatewayToken);
|
|
||||||
if (storedToken && this.tokensEqual(storedToken, token)) {
|
|
||||||
return { type: "user", id: container.id };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const container of systemContainers) {
|
|
||||||
const storedToken = this.decryptContainerToken(container.gatewayToken);
|
|
||||||
if (storedToken && this.tokensEqual(storedToken, token)) {
|
|
||||||
return { type: "system", id: container.id };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private buildOpenClawConfig(
|
|
||||||
primaryModel: string,
|
|
||||||
gatewayPort: number | null,
|
|
||||||
providers: LlmProvider[]
|
|
||||||
): OpenClawConfig {
|
|
||||||
return {
|
|
||||||
gateway: {
|
|
||||||
mode: "local",
|
|
||||||
port: gatewayPort ?? DEFAULT_GATEWAY_PORT,
|
|
||||||
bind: "lan",
|
|
||||||
auth: { mode: "token" },
|
|
||||||
http: {
|
|
||||||
endpoints: {
|
|
||||||
chatCompletions: { enabled: true },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
agents: {
|
|
||||||
defaults: {
|
|
||||||
model: {
|
|
||||||
primary: primaryModel,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
models: {
|
|
||||||
providers: this.buildProviderConfig(providers),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private buildProviderConfig(providers: LlmProvider[]): Record<string, OpenClawProviderConfig> {
|
|
||||||
const providerConfig: Record<string, OpenClawProviderConfig> = {};
|
|
||||||
|
|
||||||
for (const provider of providers) {
|
|
||||||
const config: OpenClawProviderConfig = {
|
|
||||||
models: this.extractModels(provider.models),
|
|
||||||
};
|
|
||||||
|
|
||||||
const apiKey = this.decryptIfNeeded(provider.apiKey);
|
|
||||||
if (apiKey) {
|
|
||||||
config.apiKey = apiKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (provider.baseUrl) {
|
|
||||||
config.baseUrl = provider.baseUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
providerConfig[provider.name] = config;
|
|
||||||
}
|
|
||||||
|
|
||||||
return providerConfig;
|
|
||||||
}
|
|
||||||
|
|
||||||
private extractModels(models: unknown): OpenClawModelMap {
|
|
||||||
const modelMap: OpenClawModelMap = {};
|
|
||||||
|
|
||||||
if (!Array.isArray(models)) {
|
|
||||||
return modelMap;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const modelEntry of models) {
|
|
||||||
if (typeof modelEntry === "string") {
|
|
||||||
modelMap[modelEntry] = {};
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.hasModelId(modelEntry)) {
|
|
||||||
modelMap[modelEntry.id] = {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return modelMap;
|
|
||||||
}
|
|
||||||
|
|
||||||
private resolvePrimaryModelFromProviders(providers: LlmProvider[]): string | null {
|
|
||||||
for (const provider of providers) {
|
|
||||||
const modelIds = Object.keys(this.extractModels(provider.models));
|
|
||||||
const firstModelId = modelIds[0];
|
|
||||||
|
|
||||||
if (firstModelId) {
|
|
||||||
return `${provider.name}/${firstModelId}`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private decryptIfNeeded(value: string | null | undefined): string | undefined {
|
|
||||||
if (!value) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.crypto.isEncrypted(value)) {
|
|
||||||
return this.crypto.decrypt(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private decryptContainerToken(value: string): string | null {
|
|
||||||
try {
|
|
||||||
return this.decryptIfNeeded(value) ?? null;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private tokensEqual(left: string, right: string): boolean {
|
|
||||||
const leftBuffer = Buffer.from(left, "utf8");
|
|
||||||
const rightBuffer = Buffer.from(right, "utf8");
|
|
||||||
|
|
||||||
if (leftBuffer.length !== rightBuffer.length) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return timingSafeEqual(leftBuffer, rightBuffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
private hasModelId(modelEntry: unknown): modelEntry is { id: string } {
|
|
||||||
if (typeof modelEntry !== "object" || modelEntry === null || !("id" in modelEntry)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return typeof (modelEntry as { id?: unknown }).id === "string";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -39,7 +39,6 @@ import { JobStepsModule } from "./job-steps/job-steps.module";
|
|||||||
import { CoordinatorIntegrationModule } from "./coordinator-integration/coordinator-integration.module";
|
import { CoordinatorIntegrationModule } from "./coordinator-integration/coordinator-integration.module";
|
||||||
import { FederationModule } from "./federation/federation.module";
|
import { FederationModule } from "./federation/federation.module";
|
||||||
import { CredentialsModule } from "./credentials/credentials.module";
|
import { CredentialsModule } from "./credentials/credentials.module";
|
||||||
import { CryptoModule } from "./crypto/crypto.module";
|
|
||||||
import { MosaicTelemetryModule } from "./mosaic-telemetry";
|
import { MosaicTelemetryModule } from "./mosaic-telemetry";
|
||||||
import { SpeechModule } from "./speech/speech.module";
|
import { SpeechModule } from "./speech/speech.module";
|
||||||
import { DashboardModule } from "./dashboard/dashboard.module";
|
import { DashboardModule } from "./dashboard/dashboard.module";
|
||||||
@@ -51,9 +50,6 @@ import { TeamsModule } from "./teams/teams.module";
|
|||||||
import { ImportModule } from "./import/import.module";
|
import { ImportModule } from "./import/import.module";
|
||||||
import { ConversationArchiveModule } from "./conversation-archive/conversation-archive.module";
|
import { ConversationArchiveModule } from "./conversation-archive/conversation-archive.module";
|
||||||
import { RlsContextInterceptor } from "./common/interceptors/rls-context.interceptor";
|
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 { FleetSettingsModule } from "./fleet-settings/fleet-settings.module";
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -115,7 +111,6 @@ import { FleetSettingsModule } from "./fleet-settings/fleet-settings.module";
|
|||||||
CoordinatorIntegrationModule,
|
CoordinatorIntegrationModule,
|
||||||
FederationModule,
|
FederationModule,
|
||||||
CredentialsModule,
|
CredentialsModule,
|
||||||
CryptoModule,
|
|
||||||
MosaicTelemetryModule,
|
MosaicTelemetryModule,
|
||||||
SpeechModule,
|
SpeechModule,
|
||||||
DashboardModule,
|
DashboardModule,
|
||||||
@@ -126,9 +121,6 @@ import { FleetSettingsModule } from "./fleet-settings/fleet-settings.module";
|
|||||||
TeamsModule,
|
TeamsModule,
|
||||||
ImportModule,
|
ImportModule,
|
||||||
ConversationArchiveModule,
|
ConversationArchiveModule,
|
||||||
AgentConfigModule,
|
|
||||||
ContainerLifecycleModule,
|
|
||||||
FleetSettingsModule,
|
|
||||||
],
|
],
|
||||||
controllers: [AppController, CsrfController],
|
controllers: [AppController, CsrfController],
|
||||||
providers: [
|
providers: [
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
import { Module } from "@nestjs/common";
|
|
||||||
import { PrismaModule } from "../prisma/prisma.module";
|
|
||||||
import { CryptoModule } from "../crypto/crypto.module";
|
|
||||||
import { ContainerLifecycleService } from "./container-lifecycle.service";
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [PrismaModule, CryptoModule],
|
|
||||||
providers: [ContainerLifecycleService],
|
|
||||||
exports: [ContainerLifecycleService],
|
|
||||||
})
|
|
||||||
export class ContainerLifecycleModule {}
|
|
||||||
@@ -1,593 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
||||||
import type { ConfigService } from "@nestjs/config";
|
|
||||||
import type { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import type { CryptoService } from "../crypto/crypto.service";
|
|
||||||
|
|
||||||
interface MockUserContainerRecord {
|
|
||||||
id: string;
|
|
||||||
userId: string;
|
|
||||||
containerId: string | null;
|
|
||||||
containerName: string;
|
|
||||||
gatewayPort: number | null;
|
|
||||||
gatewayToken: string;
|
|
||||||
status: string;
|
|
||||||
lastActiveAt: Date | null;
|
|
||||||
idleTimeoutMin: number;
|
|
||||||
config: Record<string, unknown>;
|
|
||||||
createdAt: Date;
|
|
||||||
updatedAt: Date;
|
|
||||||
}
|
|
||||||
|
|
||||||
const dockerMock = vi.hoisted(() => {
|
|
||||||
interface MockDockerContainerState {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
running: boolean;
|
|
||||||
port: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
const containers = new Map<string, MockDockerContainerState>();
|
|
||||||
const handles = new Map<
|
|
||||||
string,
|
|
||||||
{
|
|
||||||
inspect: ReturnType<typeof vi.fn>;
|
|
||||||
start: ReturnType<typeof vi.fn>;
|
|
||||||
stop: ReturnType<typeof vi.fn>;
|
|
||||||
}
|
|
||||||
>();
|
|
||||||
|
|
||||||
const ensureHandle = (id: string) => {
|
|
||||||
const existing = handles.get(id);
|
|
||||||
if (existing) {
|
|
||||||
return existing;
|
|
||||||
}
|
|
||||||
|
|
||||||
const handle = {
|
|
||||||
inspect: vi.fn(async () => {
|
|
||||||
const container = containers.get(id);
|
|
||||||
if (!container) {
|
|
||||||
throw { statusCode: 404 };
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
Id: container.id,
|
|
||||||
State: {
|
|
||||||
Running: container.running,
|
|
||||||
},
|
|
||||||
NetworkSettings: {
|
|
||||||
Ports: {
|
|
||||||
"18789/tcp": [{ HostPort: String(container.port) }],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
start: vi.fn(async () => {
|
|
||||||
const container = containers.get(id);
|
|
||||||
if (!container) {
|
|
||||||
throw { statusCode: 404 };
|
|
||||||
}
|
|
||||||
container.running = true;
|
|
||||||
}),
|
|
||||||
stop: vi.fn(async () => {
|
|
||||||
const container = containers.get(id);
|
|
||||||
if (!container) {
|
|
||||||
throw { statusCode: 404 };
|
|
||||||
}
|
|
||||||
container.running = false;
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
|
|
||||||
handles.set(id, handle);
|
|
||||||
return handle;
|
|
||||||
};
|
|
||||||
|
|
||||||
const listContainers = vi.fn(
|
|
||||||
async (options?: { all?: boolean; filters?: { name?: string[] } }) => {
|
|
||||||
const nameFilter = options?.filters?.name?.[0];
|
|
||||||
return [...containers.values()]
|
|
||||||
.filter((container) => (nameFilter ? container.name.includes(nameFilter) : true))
|
|
||||||
.map((container) => ({
|
|
||||||
Id: container.id,
|
|
||||||
Names: [`/${container.name}`],
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
const getContainer = vi.fn((id: string) => ensureHandle(id));
|
|
||||||
|
|
||||||
const createContainer = vi.fn(
|
|
||||||
async (options: {
|
|
||||||
name?: string;
|
|
||||||
HostConfig?: { PortBindings?: Record<string, Array<{ HostPort?: string }>> };
|
|
||||||
}) => {
|
|
||||||
const id = `ctr-${containers.size + 1}`;
|
|
||||||
const name = options.name ?? id;
|
|
||||||
const hostPort = options.HostConfig?.PortBindings?.["18789/tcp"]?.[0]?.HostPort;
|
|
||||||
const port = hostPort ? Number.parseInt(hostPort, 10) : 0;
|
|
||||||
|
|
||||||
containers.set(id, {
|
|
||||||
id,
|
|
||||||
name,
|
|
||||||
running: false,
|
|
||||||
port,
|
|
||||||
});
|
|
||||||
|
|
||||||
return ensureHandle(id);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
const dockerInstance = {
|
|
||||||
listContainers,
|
|
||||||
getContainer,
|
|
||||||
createContainer,
|
|
||||||
};
|
|
||||||
|
|
||||||
const constructorSpy = vi.fn();
|
|
||||||
class DockerConstructorMock {
|
|
||||||
constructor(options?: unknown) {
|
|
||||||
constructorSpy(options);
|
|
||||||
return dockerInstance;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const registerContainer = (container: MockDockerContainerState) => {
|
|
||||||
containers.set(container.id, { ...container });
|
|
||||||
ensureHandle(container.id);
|
|
||||||
};
|
|
||||||
|
|
||||||
const reset = () => {
|
|
||||||
containers.clear();
|
|
||||||
handles.clear();
|
|
||||||
constructorSpy.mockClear();
|
|
||||||
listContainers.mockClear();
|
|
||||||
getContainer.mockClear();
|
|
||||||
createContainer.mockClear();
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
|
||||||
DockerConstructorMock,
|
|
||||||
constructorSpy,
|
|
||||||
createContainer,
|
|
||||||
handles,
|
|
||||||
registerContainer,
|
|
||||||
reset,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
vi.mock("dockerode", () => ({
|
|
||||||
default: dockerMock.DockerConstructorMock,
|
|
||||||
}));
|
|
||||||
|
|
||||||
import { ContainerLifecycleService } from "./container-lifecycle.service";
|
|
||||||
|
|
||||||
function createConfigMock(values: Record<string, string> = {}) {
|
|
||||||
return {
|
|
||||||
get: vi.fn((key: string) => values[key]),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function createCryptoMock() {
|
|
||||||
return {
|
|
||||||
generateToken: vi.fn(() => "generated-token"),
|
|
||||||
encrypt: vi.fn((value: string) => `enc:${value}`),
|
|
||||||
decrypt: vi.fn((value: string) => value.replace(/^enc:/, "")),
|
|
||||||
isEncrypted: vi.fn((value: string) => value.startsWith("enc:")),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function projectRecord(
|
|
||||||
record: MockUserContainerRecord,
|
|
||||||
select?: Record<string, boolean>
|
|
||||||
): Partial<MockUserContainerRecord> {
|
|
||||||
if (!select) {
|
|
||||||
return { ...record };
|
|
||||||
}
|
|
||||||
|
|
||||||
const projection: Partial<MockUserContainerRecord> = {};
|
|
||||||
for (const [field, enabled] of Object.entries(select)) {
|
|
||||||
if (enabled) {
|
|
||||||
const key = field as keyof MockUserContainerRecord;
|
|
||||||
projection[key] = record[key];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return projection;
|
|
||||||
}
|
|
||||||
|
|
||||||
function createPrismaMock(initialRecords: MockUserContainerRecord[] = []) {
|
|
||||||
const records = new Map<string, MockUserContainerRecord>();
|
|
||||||
for (const record of initialRecords) {
|
|
||||||
records.set(record.userId, { ...record });
|
|
||||||
}
|
|
||||||
|
|
||||||
const userContainer = {
|
|
||||||
findUnique: vi.fn(
|
|
||||||
async (args: {
|
|
||||||
where: { userId?: string; id?: string };
|
|
||||||
select?: Record<string, boolean>;
|
|
||||||
}) => {
|
|
||||||
let record: MockUserContainerRecord | undefined;
|
|
||||||
if (args.where.userId) {
|
|
||||||
record = records.get(args.where.userId);
|
|
||||||
} else if (args.where.id) {
|
|
||||||
record = [...records.values()].find((entry) => entry.id === args.where.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!record) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return projectRecord(record, args.select);
|
|
||||||
}
|
|
||||||
),
|
|
||||||
create: vi.fn(
|
|
||||||
async (args: {
|
|
||||||
data: Partial<MockUserContainerRecord> & {
|
|
||||||
userId: string;
|
|
||||||
containerName: string;
|
|
||||||
gatewayToken: string;
|
|
||||||
};
|
|
||||||
}) => {
|
|
||||||
const now = new Date();
|
|
||||||
const next: MockUserContainerRecord = {
|
|
||||||
id: args.data.id ?? `uc-${records.size + 1}`,
|
|
||||||
userId: args.data.userId,
|
|
||||||
containerId: args.data.containerId ?? null,
|
|
||||||
containerName: args.data.containerName,
|
|
||||||
gatewayPort: args.data.gatewayPort ?? null,
|
|
||||||
gatewayToken: args.data.gatewayToken,
|
|
||||||
status: args.data.status ?? "stopped",
|
|
||||||
lastActiveAt: args.data.lastActiveAt ?? null,
|
|
||||||
idleTimeoutMin: args.data.idleTimeoutMin ?? 30,
|
|
||||||
config: args.data.config ?? {},
|
|
||||||
createdAt: now,
|
|
||||||
updatedAt: now,
|
|
||||||
};
|
|
||||||
|
|
||||||
records.set(next.userId, next);
|
|
||||||
return { ...next };
|
|
||||||
}
|
|
||||||
),
|
|
||||||
update: vi.fn(
|
|
||||||
async (args: { where: { userId: string }; data: Partial<MockUserContainerRecord> }) => {
|
|
||||||
const record = records.get(args.where.userId);
|
|
||||||
if (!record) {
|
|
||||||
throw new Error(`Record ${args.where.userId} not found`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const updated: MockUserContainerRecord = {
|
|
||||||
...record,
|
|
||||||
...args.data,
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
records.set(updated.userId, updated);
|
|
||||||
return { ...updated };
|
|
||||||
}
|
|
||||||
),
|
|
||||||
updateMany: vi.fn(
|
|
||||||
async (args: { where: { userId: string }; data: Partial<MockUserContainerRecord> }) => {
|
|
||||||
const record = records.get(args.where.userId);
|
|
||||||
if (!record) {
|
|
||||||
return { count: 0 };
|
|
||||||
}
|
|
||||||
|
|
||||||
const updated: MockUserContainerRecord = {
|
|
||||||
...record,
|
|
||||||
...args.data,
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
records.set(updated.userId, updated);
|
|
||||||
return { count: 1 };
|
|
||||||
}
|
|
||||||
),
|
|
||||||
findMany: vi.fn(
|
|
||||||
async (args?: {
|
|
||||||
where?: {
|
|
||||||
status?: string;
|
|
||||||
lastActiveAt?: { not: null };
|
|
||||||
gatewayPort?: { not: null };
|
|
||||||
};
|
|
||||||
select?: Record<string, boolean>;
|
|
||||||
}) => {
|
|
||||||
let rows = [...records.values()];
|
|
||||||
|
|
||||||
if (args?.where?.status) {
|
|
||||||
rows = rows.filter((record) => record.status === args.where?.status);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args?.where?.lastActiveAt?.not === null) {
|
|
||||||
rows = rows.filter((record) => record.lastActiveAt !== null);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args?.where?.gatewayPort?.not === null) {
|
|
||||||
rows = rows.filter((record) => record.gatewayPort !== null);
|
|
||||||
}
|
|
||||||
|
|
||||||
return rows.map((record) => projectRecord(record, args?.select));
|
|
||||||
}
|
|
||||||
),
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
|
||||||
prisma: {
|
|
||||||
userContainer,
|
|
||||||
},
|
|
||||||
records,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function createRecord(overrides: Partial<MockUserContainerRecord>): MockUserContainerRecord {
|
|
||||||
const now = new Date();
|
|
||||||
return {
|
|
||||||
id: overrides.id ?? "uc-default",
|
|
||||||
userId: overrides.userId ?? "user-default",
|
|
||||||
containerId: overrides.containerId ?? null,
|
|
||||||
containerName: overrides.containerName ?? "mosaic-user-user-default",
|
|
||||||
gatewayPort: overrides.gatewayPort ?? null,
|
|
||||||
gatewayToken: overrides.gatewayToken ?? "enc:token-default",
|
|
||||||
status: overrides.status ?? "stopped",
|
|
||||||
lastActiveAt: overrides.lastActiveAt ?? null,
|
|
||||||
idleTimeoutMin: overrides.idleTimeoutMin ?? 30,
|
|
||||||
config: overrides.config ?? {},
|
|
||||||
createdAt: overrides.createdAt ?? now,
|
|
||||||
updatedAt: overrides.updatedAt ?? now,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("ContainerLifecycleService", () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
dockerMock.reset();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("ensureRunning creates container when none exists", async () => {
|
|
||||||
const { prisma, records } = createPrismaMock();
|
|
||||||
const crypto = createCryptoMock();
|
|
||||||
const config = createConfigMock();
|
|
||||||
const service = new ContainerLifecycleService(
|
|
||||||
prisma as unknown as PrismaService,
|
|
||||||
crypto as unknown as CryptoService,
|
|
||||||
config as unknown as ConfigService
|
|
||||||
);
|
|
||||||
|
|
||||||
const result = await service.ensureRunning("user-1");
|
|
||||||
|
|
||||||
expect(result).toEqual({
|
|
||||||
url: "http://mosaic-user-user-1:19000",
|
|
||||||
token: "generated-token",
|
|
||||||
});
|
|
||||||
|
|
||||||
const updatedRecord = records.get("user-1");
|
|
||||||
expect(updatedRecord?.status).toBe("running");
|
|
||||||
expect(updatedRecord?.containerId).toBe("ctr-1");
|
|
||||||
expect(updatedRecord?.gatewayPort).toBe(19000);
|
|
||||||
expect(updatedRecord?.gatewayToken).toBe("enc:generated-token");
|
|
||||||
|
|
||||||
expect(dockerMock.createContainer).toHaveBeenCalledTimes(1);
|
|
||||||
const [createCall] = dockerMock.createContainer.mock.calls[0] as [
|
|
||||||
{
|
|
||||||
name: string;
|
|
||||||
Image: string;
|
|
||||||
Env: string[];
|
|
||||||
HostConfig: { Binds: string[]; NetworkMode: string };
|
|
||||||
},
|
|
||||||
];
|
|
||||||
expect(createCall.name).toBe("mosaic-user-user-1");
|
|
||||||
expect(createCall.Image).toBe("alpine/openclaw:latest");
|
|
||||||
expect(createCall.HostConfig.Binds).toEqual(["mosaic-user-user-1-state:/home/node/.openclaw"]);
|
|
||||||
expect(createCall.HostConfig.NetworkMode).toBe("mosaic-internal");
|
|
||||||
expect(createCall.Env).toContain("AGENT_TOKEN=generated-token");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("ensureRunning starts existing stopped container", async () => {
|
|
||||||
const { prisma, records } = createPrismaMock([
|
|
||||||
createRecord({
|
|
||||||
id: "uc-1",
|
|
||||||
userId: "user-2",
|
|
||||||
containerId: "ctr-stopped",
|
|
||||||
containerName: "mosaic-user-user-2",
|
|
||||||
gatewayToken: "enc:existing-token",
|
|
||||||
status: "stopped",
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
const crypto = createCryptoMock();
|
|
||||||
const config = createConfigMock();
|
|
||||||
const service = new ContainerLifecycleService(
|
|
||||||
prisma as unknown as PrismaService,
|
|
||||||
crypto as unknown as CryptoService,
|
|
||||||
config as unknown as ConfigService
|
|
||||||
);
|
|
||||||
|
|
||||||
dockerMock.registerContainer({
|
|
||||||
id: "ctr-stopped",
|
|
||||||
name: "mosaic-user-user-2",
|
|
||||||
running: false,
|
|
||||||
port: 19042,
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await service.ensureRunning("user-2");
|
|
||||||
|
|
||||||
expect(result).toEqual({
|
|
||||||
url: "http://mosaic-user-user-2:19042",
|
|
||||||
token: "existing-token",
|
|
||||||
});
|
|
||||||
|
|
||||||
const handle = dockerMock.handles.get("ctr-stopped");
|
|
||||||
expect(handle?.start).toHaveBeenCalledTimes(1);
|
|
||||||
expect(records.get("user-2")?.status).toBe("running");
|
|
||||||
expect(records.get("user-2")?.gatewayPort).toBe(19042);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("ensureRunning returns existing running container", async () => {
|
|
||||||
const { prisma } = createPrismaMock([
|
|
||||||
createRecord({
|
|
||||||
id: "uc-2",
|
|
||||||
userId: "user-3",
|
|
||||||
containerId: "ctr-running",
|
|
||||||
containerName: "mosaic-user-user-3",
|
|
||||||
gatewayPort: 19043,
|
|
||||||
gatewayToken: "enc:running-token",
|
|
||||||
status: "running",
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
const crypto = createCryptoMock();
|
|
||||||
const config = createConfigMock();
|
|
||||||
const service = new ContainerLifecycleService(
|
|
||||||
prisma as unknown as PrismaService,
|
|
||||||
crypto as unknown as CryptoService,
|
|
||||||
config as unknown as ConfigService
|
|
||||||
);
|
|
||||||
|
|
||||||
dockerMock.registerContainer({
|
|
||||||
id: "ctr-running",
|
|
||||||
name: "mosaic-user-user-3",
|
|
||||||
running: true,
|
|
||||||
port: 19043,
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await service.ensureRunning("user-3");
|
|
||||||
|
|
||||||
expect(result).toEqual({
|
|
||||||
url: "http://mosaic-user-user-3:19043",
|
|
||||||
token: "running-token",
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(dockerMock.createContainer).not.toHaveBeenCalled();
|
|
||||||
const handle = dockerMock.handles.get("ctr-running");
|
|
||||||
expect(handle?.start).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("stop gracefully stops container and updates DB", async () => {
|
|
||||||
const { prisma, records } = createPrismaMock([
|
|
||||||
createRecord({
|
|
||||||
id: "uc-stop",
|
|
||||||
userId: "user-stop",
|
|
||||||
containerId: "ctr-stop",
|
|
||||||
containerName: "mosaic-user-user-stop",
|
|
||||||
gatewayPort: 19044,
|
|
||||||
status: "running",
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
const crypto = createCryptoMock();
|
|
||||||
const config = createConfigMock();
|
|
||||||
const service = new ContainerLifecycleService(
|
|
||||||
prisma as unknown as PrismaService,
|
|
||||||
crypto as unknown as CryptoService,
|
|
||||||
config as unknown as ConfigService
|
|
||||||
);
|
|
||||||
|
|
||||||
dockerMock.registerContainer({
|
|
||||||
id: "ctr-stop",
|
|
||||||
name: "mosaic-user-user-stop",
|
|
||||||
running: true,
|
|
||||||
port: 19044,
|
|
||||||
});
|
|
||||||
|
|
||||||
await service.stop("user-stop");
|
|
||||||
|
|
||||||
const handle = dockerMock.handles.get("ctr-stop");
|
|
||||||
expect(handle?.stop).toHaveBeenCalledWith({ t: 10 });
|
|
||||||
|
|
||||||
const updatedRecord = records.get("user-stop");
|
|
||||||
expect(updatedRecord?.status).toBe("stopped");
|
|
||||||
expect(updatedRecord?.containerId).toBeNull();
|
|
||||||
expect(updatedRecord?.gatewayPort).toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("reapIdle stops only containers past their idle timeout", async () => {
|
|
||||||
const now = Date.now();
|
|
||||||
const { prisma, records } = createPrismaMock([
|
|
||||||
createRecord({
|
|
||||||
id: "uc-old",
|
|
||||||
userId: "user-old",
|
|
||||||
containerId: "ctr-old",
|
|
||||||
containerName: "mosaic-user-user-old",
|
|
||||||
gatewayPort: 19045,
|
|
||||||
status: "running",
|
|
||||||
lastActiveAt: new Date(now - 60 * 60 * 1000),
|
|
||||||
idleTimeoutMin: 30,
|
|
||||||
}),
|
|
||||||
createRecord({
|
|
||||||
id: "uc-fresh",
|
|
||||||
userId: "user-fresh",
|
|
||||||
containerId: "ctr-fresh",
|
|
||||||
containerName: "mosaic-user-user-fresh",
|
|
||||||
gatewayPort: 19046,
|
|
||||||
status: "running",
|
|
||||||
lastActiveAt: new Date(now - 5 * 60 * 1000),
|
|
||||||
idleTimeoutMin: 30,
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
const crypto = createCryptoMock();
|
|
||||||
const config = createConfigMock();
|
|
||||||
const service = new ContainerLifecycleService(
|
|
||||||
prisma as unknown as PrismaService,
|
|
||||||
crypto as unknown as CryptoService,
|
|
||||||
config as unknown as ConfigService
|
|
||||||
);
|
|
||||||
|
|
||||||
dockerMock.registerContainer({
|
|
||||||
id: "ctr-old",
|
|
||||||
name: "mosaic-user-user-old",
|
|
||||||
running: true,
|
|
||||||
port: 19045,
|
|
||||||
});
|
|
||||||
dockerMock.registerContainer({
|
|
||||||
id: "ctr-fresh",
|
|
||||||
name: "mosaic-user-user-fresh",
|
|
||||||
running: true,
|
|
||||||
port: 19046,
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await service.reapIdle();
|
|
||||||
|
|
||||||
expect(result).toEqual({
|
|
||||||
stopped: ["user-old"],
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(records.get("user-old")?.status).toBe("stopped");
|
|
||||||
expect(records.get("user-fresh")?.status).toBe("running");
|
|
||||||
|
|
||||||
const oldHandle = dockerMock.handles.get("ctr-old");
|
|
||||||
const freshHandle = dockerMock.handles.get("ctr-fresh");
|
|
||||||
expect(oldHandle?.stop).toHaveBeenCalledTimes(1);
|
|
||||||
expect(freshHandle?.stop).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("touch updates lastActiveAt", async () => {
|
|
||||||
const { prisma, records } = createPrismaMock([
|
|
||||||
createRecord({
|
|
||||||
id: "uc-touch",
|
|
||||||
userId: "user-touch",
|
|
||||||
containerName: "mosaic-user-user-touch",
|
|
||||||
lastActiveAt: null,
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
const crypto = createCryptoMock();
|
|
||||||
const config = createConfigMock();
|
|
||||||
const service = new ContainerLifecycleService(
|
|
||||||
prisma as unknown as PrismaService,
|
|
||||||
crypto as unknown as CryptoService,
|
|
||||||
config as unknown as ConfigService
|
|
||||||
);
|
|
||||||
|
|
||||||
await service.touch("user-touch");
|
|
||||||
|
|
||||||
const updatedRecord = records.get("user-touch");
|
|
||||||
expect(updatedRecord?.lastActiveAt).toBeInstanceOf(Date);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("getStatus returns null for unknown user", async () => {
|
|
||||||
const { prisma } = createPrismaMock();
|
|
||||||
const crypto = createCryptoMock();
|
|
||||||
const config = createConfigMock();
|
|
||||||
const service = new ContainerLifecycleService(
|
|
||||||
prisma as unknown as PrismaService,
|
|
||||||
crypto as unknown as CryptoService,
|
|
||||||
config as unknown as ConfigService
|
|
||||||
);
|
|
||||||
|
|
||||||
const status = await service.getStatus("missing-user");
|
|
||||||
|
|
||||||
expect(status).toBeNull();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,532 +0,0 @@
|
|||||||
import { Injectable, Logger } from "@nestjs/common";
|
|
||||||
import { ConfigService } from "@nestjs/config";
|
|
||||||
import Docker from "dockerode";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { CryptoService } from "../crypto/crypto.service";
|
|
||||||
|
|
||||||
const DEFAULT_DOCKER_SOCKET_PATH = "/var/run/docker.sock";
|
|
||||||
const DEFAULT_DOCKER_TCP_PORT = 2375;
|
|
||||||
const DEFAULT_OPENCLAW_IMAGE = "alpine/openclaw:latest";
|
|
||||||
const DEFAULT_OPENCLAW_NETWORK = "mosaic-internal";
|
|
||||||
const DEFAULT_OPENCLAW_PORT_RANGE_START = 19000;
|
|
||||||
const DEFAULT_MOSAIC_API_URL = "http://mosaic-api:3000/api";
|
|
||||||
const OPENCLAW_GATEWAY_PORT_KEY = "18789/tcp";
|
|
||||||
const OPENCLAW_STATE_PATH = "/home/node/.openclaw";
|
|
||||||
const CONTAINER_STOP_TIMEOUT_SECONDS = 10;
|
|
||||||
|
|
||||||
interface ContainerHandle {
|
|
||||||
inspect(): Promise<DockerInspect>;
|
|
||||||
start(): Promise<void>;
|
|
||||||
stop(options?: { t?: number }): Promise<void>;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface DockerInspect {
|
|
||||||
Id?: string;
|
|
||||||
State?: {
|
|
||||||
Running?: boolean;
|
|
||||||
Health?: {
|
|
||||||
Status?: string;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
NetworkSettings?: {
|
|
||||||
Ports?: Record<string, { HostPort?: string }[] | null>;
|
|
||||||
};
|
|
||||||
HostConfig?: {
|
|
||||||
PortBindings?: Record<string, { HostPort?: string }[] | null>;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
interface UserContainerRecord {
|
|
||||||
id: string;
|
|
||||||
userId: string;
|
|
||||||
containerId: string | null;
|
|
||||||
containerName: string;
|
|
||||||
gatewayPort: number | null;
|
|
||||||
gatewayToken: string;
|
|
||||||
status: string;
|
|
||||||
lastActiveAt: Date | null;
|
|
||||||
idleTimeoutMin: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ContainerLookup {
|
|
||||||
containerId: string | null;
|
|
||||||
containerName: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class ContainerLifecycleService {
|
|
||||||
private readonly logger = new Logger(ContainerLifecycleService.name);
|
|
||||||
private readonly docker: Docker;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private readonly prisma: PrismaService,
|
|
||||||
private readonly crypto: CryptoService,
|
|
||||||
private readonly config: ConfigService
|
|
||||||
) {
|
|
||||||
const dockerHost = this.config.get<string>("DOCKER_HOST");
|
|
||||||
this.docker = this.createDockerClient(dockerHost);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ensure a user's container is running. Creates if needed, starts if stopped.
|
|
||||||
// Returns the container's internal URL and gateway token.
|
|
||||||
async ensureRunning(userId: string): Promise<{ url: string; token: string }> {
|
|
||||||
const containerRecord = await this.getOrCreateContainerRecord(userId);
|
|
||||||
const token = this.getGatewayToken(containerRecord.gatewayToken);
|
|
||||||
const existingContainer = await this.resolveContainer(containerRecord);
|
|
||||||
|
|
||||||
let container: ContainerHandle;
|
|
||||||
if (existingContainer) {
|
|
||||||
container = existingContainer;
|
|
||||||
const inspect = await container.inspect();
|
|
||||||
if (!inspect.State?.Running) {
|
|
||||||
await container.start();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const port = await this.findAvailableGatewayPort();
|
|
||||||
container = await this.createContainer(containerRecord, token, port);
|
|
||||||
await container.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
const inspect = await container.inspect();
|
|
||||||
const containerId = inspect.Id;
|
|
||||||
if (!containerId) {
|
|
||||||
throw new Error(
|
|
||||||
`Docker inspect did not return container ID for ${containerRecord.containerName}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const gatewayPort = this.extractGatewayPort(inspect);
|
|
||||||
if (!gatewayPort) {
|
|
||||||
throw new Error(`Could not determine gateway port for ${containerRecord.containerName}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const now = new Date();
|
|
||||||
await this.prisma.userContainer.update({
|
|
||||||
where: { userId },
|
|
||||||
data: {
|
|
||||||
containerId,
|
|
||||||
gatewayPort,
|
|
||||||
status: "running",
|
|
||||||
lastActiveAt: now,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
url: `http://${containerRecord.containerName}:${String(gatewayPort)}`,
|
|
||||||
token,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stop a user's container
|
|
||||||
async stop(userId: string): Promise<void> {
|
|
||||||
const containerRecord = await this.prisma.userContainer.findUnique({
|
|
||||||
where: { userId },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!containerRecord) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const container = await this.resolveContainer(containerRecord);
|
|
||||||
if (container) {
|
|
||||||
try {
|
|
||||||
await container.stop({ t: CONTAINER_STOP_TIMEOUT_SECONDS });
|
|
||||||
} catch (error) {
|
|
||||||
if (!this.isDockerNotFound(error) && !this.isAlreadyStopped(error)) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.prisma.userContainer.update({
|
|
||||||
where: { userId },
|
|
||||||
data: {
|
|
||||||
status: "stopped",
|
|
||||||
containerId: null,
|
|
||||||
gatewayPort: null,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stop idle containers (called by cron/scheduler)
|
|
||||||
async reapIdle(): Promise<{ stopped: string[] }> {
|
|
||||||
const now = Date.now();
|
|
||||||
const runningContainers = await this.prisma.userContainer.findMany({
|
|
||||||
where: {
|
|
||||||
status: "running",
|
|
||||||
lastActiveAt: { not: null },
|
|
||||||
},
|
|
||||||
select: {
|
|
||||||
userId: true,
|
|
||||||
lastActiveAt: true,
|
|
||||||
idleTimeoutMin: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const stopped: string[] = [];
|
|
||||||
for (const container of runningContainers) {
|
|
||||||
const lastActiveAt = container.lastActiveAt;
|
|
||||||
if (!lastActiveAt) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const idleLimitMs = container.idleTimeoutMin * 60 * 1000;
|
|
||||||
if (now - lastActiveAt.getTime() < idleLimitMs) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
await this.stop(container.userId);
|
|
||||||
stopped.push(container.userId);
|
|
||||||
} catch (error) {
|
|
||||||
this.logger.warn(
|
|
||||||
`Failed to stop idle container for user ${container.userId}: ${this.getErrorMessage(error)}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return { stopped };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Health check all running containers
|
|
||||||
async healthCheckAll(): Promise<{ userId: string; healthy: boolean; error?: string }[]> {
|
|
||||||
const runningContainers = await this.prisma.userContainer.findMany({
|
|
||||||
where: {
|
|
||||||
status: "running",
|
|
||||||
},
|
|
||||||
select: {
|
|
||||||
userId: true,
|
|
||||||
containerId: true,
|
|
||||||
containerName: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const results: { userId: string; healthy: boolean; error?: string }[] = [];
|
|
||||||
for (const containerRecord of runningContainers) {
|
|
||||||
const container = await this.resolveContainer(containerRecord);
|
|
||||||
if (!container) {
|
|
||||||
results.push({
|
|
||||||
userId: containerRecord.userId,
|
|
||||||
healthy: false,
|
|
||||||
error: "Container not found",
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const inspect = await container.inspect();
|
|
||||||
const isRunning = inspect.State?.Running === true;
|
|
||||||
const healthState = inspect.State?.Health?.Status;
|
|
||||||
const healthy = isRunning && healthState !== "unhealthy";
|
|
||||||
|
|
||||||
if (healthy) {
|
|
||||||
results.push({
|
|
||||||
userId: containerRecord.userId,
|
|
||||||
healthy: true,
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
results.push({
|
|
||||||
userId: containerRecord.userId,
|
|
||||||
healthy: false,
|
|
||||||
error:
|
|
||||||
healthState === "unhealthy" ? "Container healthcheck failed" : "Container not running",
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
results.push({
|
|
||||||
userId: containerRecord.userId,
|
|
||||||
healthy: false,
|
|
||||||
error: this.getErrorMessage(error),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return results;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Restart a container with fresh config (for config updates)
|
|
||||||
async restart(userId: string): Promise<void> {
|
|
||||||
await this.stop(userId);
|
|
||||||
await this.ensureRunning(userId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update lastActiveAt timestamp (called on each chat request)
|
|
||||||
async touch(userId: string): Promise<void> {
|
|
||||||
await this.prisma.userContainer.updateMany({
|
|
||||||
where: { userId },
|
|
||||||
data: {
|
|
||||||
lastActiveAt: new Date(),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get container status for a user
|
|
||||||
async getStatus(
|
|
||||||
userId: string
|
|
||||||
): Promise<{ status: string; port?: number; lastActive?: Date } | null> {
|
|
||||||
const container = await this.prisma.userContainer.findUnique({
|
|
||||||
where: { userId },
|
|
||||||
select: {
|
|
||||||
status: true,
|
|
||||||
gatewayPort: true,
|
|
||||||
lastActiveAt: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!container) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const status: { status: string; port?: number; lastActive?: Date } = {
|
|
||||||
status: container.status,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (container.gatewayPort !== null) {
|
|
||||||
status.port = container.gatewayPort;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (container.lastActiveAt !== null) {
|
|
||||||
status.lastActive = container.lastActiveAt;
|
|
||||||
}
|
|
||||||
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
private createDockerClient(dockerHost?: string): Docker {
|
|
||||||
if (!dockerHost || dockerHost.trim().length === 0) {
|
|
||||||
return new Docker({ socketPath: DEFAULT_DOCKER_SOCKET_PATH });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dockerHost.startsWith("unix://")) {
|
|
||||||
return new Docker({ socketPath: dockerHost.slice("unix://".length) });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dockerHost.startsWith("tcp://")) {
|
|
||||||
const parsed = new URL(dockerHost.replace("tcp://", "http://"));
|
|
||||||
return new Docker({
|
|
||||||
host: parsed.hostname,
|
|
||||||
port: this.parseInteger(parsed.port, DEFAULT_DOCKER_TCP_PORT),
|
|
||||||
protocol: "http",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dockerHost.startsWith("http://") || dockerHost.startsWith("https://")) {
|
|
||||||
const parsed = new URL(dockerHost);
|
|
||||||
const protocol = parsed.protocol.replace(":", "");
|
|
||||||
return new Docker({
|
|
||||||
host: parsed.hostname,
|
|
||||||
port: this.parseInteger(parsed.port, DEFAULT_DOCKER_TCP_PORT),
|
|
||||||
protocol: protocol === "https" ? "https" : "http",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Docker({ socketPath: dockerHost });
|
|
||||||
}
|
|
||||||
|
|
||||||
private async getOrCreateContainerRecord(userId: string): Promise<UserContainerRecord> {
|
|
||||||
const existingContainer = await this.prisma.userContainer.findUnique({
|
|
||||||
where: { userId },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (existingContainer) {
|
|
||||||
return existingContainer;
|
|
||||||
}
|
|
||||||
|
|
||||||
const token = this.crypto.generateToken();
|
|
||||||
const containerName = this.getContainerName(userId);
|
|
||||||
return this.prisma.userContainer.create({
|
|
||||||
data: {
|
|
||||||
userId,
|
|
||||||
containerName,
|
|
||||||
gatewayToken: this.crypto.encrypt(token),
|
|
||||||
status: "stopped",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private getContainerName(userId: string): string {
|
|
||||||
return `mosaic-user-${userId}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getVolumeName(userId: string): string {
|
|
||||||
return `mosaic-user-${userId}-state`;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getOpenClawImage(): string {
|
|
||||||
return this.config.get<string>("OPENCLAW_IMAGE") ?? DEFAULT_OPENCLAW_IMAGE;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getOpenClawNetwork(): string {
|
|
||||||
return this.config.get<string>("OPENCLAW_NETWORK") ?? DEFAULT_OPENCLAW_NETWORK;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getMosaicApiUrl(): string {
|
|
||||||
return this.config.get<string>("MOSAIC_API_URL") ?? DEFAULT_MOSAIC_API_URL;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getPortRangeStart(): number {
|
|
||||||
return this.parseInteger(
|
|
||||||
this.config.get<string>("OPENCLAW_PORT_RANGE_START"),
|
|
||||||
DEFAULT_OPENCLAW_PORT_RANGE_START
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async resolveContainer(record: ContainerLookup): Promise<ContainerHandle | null> {
|
|
||||||
if (record.containerId) {
|
|
||||||
const byId = this.docker.getContainer(record.containerId) as unknown as ContainerHandle;
|
|
||||||
if (await this.containerExists(byId)) {
|
|
||||||
return byId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const byName = await this.findContainerByName(record.containerName);
|
|
||||||
if (byName) {
|
|
||||||
return byName;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async findContainerByName(containerName: string): Promise<ContainerHandle | null> {
|
|
||||||
const containers = await this.docker.listContainers({
|
|
||||||
all: true,
|
|
||||||
filters: {
|
|
||||||
name: [containerName],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const match = containers.find((container) => {
|
|
||||||
const names = container.Names;
|
|
||||||
return names.some((name) => name === `/${containerName}` || name.includes(containerName));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!match?.Id) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.docker.getContainer(match.Id) as unknown as ContainerHandle;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async containerExists(container: ContainerHandle): Promise<boolean> {
|
|
||||||
try {
|
|
||||||
await container.inspect();
|
|
||||||
return true;
|
|
||||||
} catch (error) {
|
|
||||||
if (this.isDockerNotFound(error)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async createContainer(
|
|
||||||
containerRecord: UserContainerRecord,
|
|
||||||
token: string,
|
|
||||||
gatewayPort: number
|
|
||||||
): Promise<ContainerHandle> {
|
|
||||||
const container = await this.docker.createContainer({
|
|
||||||
name: containerRecord.containerName,
|
|
||||||
Image: this.getOpenClawImage(),
|
|
||||||
Env: [
|
|
||||||
`MOSAIC_API_URL=${this.getMosaicApiUrl()}`,
|
|
||||||
`AGENT_TOKEN=${token}`,
|
|
||||||
`AGENT_ID=${containerRecord.id}`,
|
|
||||||
],
|
|
||||||
ExposedPorts: {
|
|
||||||
[OPENCLAW_GATEWAY_PORT_KEY]: {},
|
|
||||||
},
|
|
||||||
HostConfig: {
|
|
||||||
Binds: [`${this.getVolumeName(containerRecord.userId)}:${OPENCLAW_STATE_PATH}`],
|
|
||||||
PortBindings: {
|
|
||||||
[OPENCLAW_GATEWAY_PORT_KEY]: [{ HostPort: String(gatewayPort) }],
|
|
||||||
},
|
|
||||||
NetworkMode: this.getOpenClawNetwork(),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return container as unknown as ContainerHandle;
|
|
||||||
}
|
|
||||||
|
|
||||||
private extractGatewayPort(inspect: DockerInspect): number | null {
|
|
||||||
const networkPort = inspect.NetworkSettings?.Ports?.[OPENCLAW_GATEWAY_PORT_KEY]?.[0]?.HostPort;
|
|
||||||
if (networkPort) {
|
|
||||||
return this.parseInteger(networkPort, 0) || null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const hostPort = inspect.HostConfig?.PortBindings?.[OPENCLAW_GATEWAY_PORT_KEY]?.[0]?.HostPort;
|
|
||||||
if (hostPort) {
|
|
||||||
return this.parseInteger(hostPort, 0) || null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async findAvailableGatewayPort(): Promise<number> {
|
|
||||||
const usedPorts = await this.prisma.userContainer.findMany({
|
|
||||||
where: {
|
|
||||||
gatewayPort: { not: null },
|
|
||||||
},
|
|
||||||
select: {
|
|
||||||
gatewayPort: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const takenPorts = new Set<number>();
|
|
||||||
for (const entry of usedPorts) {
|
|
||||||
if (entry.gatewayPort !== null) {
|
|
||||||
takenPorts.add(entry.gatewayPort);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let candidate = this.getPortRangeStart();
|
|
||||||
while (takenPorts.has(candidate)) {
|
|
||||||
candidate += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return candidate;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getGatewayToken(storedToken: string): string {
|
|
||||||
if (this.crypto.isEncrypted(storedToken)) {
|
|
||||||
return this.crypto.decrypt(storedToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
return storedToken;
|
|
||||||
}
|
|
||||||
|
|
||||||
private parseInteger(value: string | undefined, fallback: number): number {
|
|
||||||
if (!value) {
|
|
||||||
return fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
const parsed = Number.parseInt(value, 10);
|
|
||||||
return Number.isFinite(parsed) ? parsed : fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
private isDockerNotFound(error: unknown): boolean {
|
|
||||||
return this.getDockerStatusCode(error) === 404;
|
|
||||||
}
|
|
||||||
|
|
||||||
private isAlreadyStopped(error: unknown): boolean {
|
|
||||||
return this.getDockerStatusCode(error) === 304;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getDockerStatusCode(error: unknown): number | null {
|
|
||||||
if (typeof error !== "object" || error === null || !("statusCode" in error)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const statusCode = error.statusCode;
|
|
||||||
return typeof statusCode === "number" ? statusCode : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getErrorMessage(error: unknown): string {
|
|
||||||
if (error instanceof Error) {
|
|
||||||
return error.message;
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Unknown error";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
import { Module } from "@nestjs/common";
|
|
||||||
import { ConfigModule } from "@nestjs/config";
|
|
||||||
import { CryptoService } from "./crypto.service";
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [ConfigModule],
|
|
||||||
providers: [CryptoService],
|
|
||||||
exports: [CryptoService],
|
|
||||||
})
|
|
||||||
export class CryptoModule {}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
import { describe, it, expect, beforeEach } from "vitest";
|
|
||||||
import { ConfigService } from "@nestjs/config";
|
|
||||||
import { CryptoService } from "./crypto.service";
|
|
||||||
|
|
||||||
function createConfigService(secret?: string): ConfigService {
|
|
||||||
return {
|
|
||||||
get: (key: string) => {
|
|
||||||
if (key === "MOSAIC_SECRET_KEY") {
|
|
||||||
return secret;
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
},
|
|
||||||
} as unknown as ConfigService;
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("CryptoService", () => {
|
|
||||||
let service: CryptoService;
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
service = new CryptoService(createConfigService("this-is-a-test-secret-key-with-32+chars"));
|
|
||||||
});
|
|
||||||
|
|
||||||
it("encrypt -> decrypt roundtrip", () => {
|
|
||||||
const plaintext = "my-secret-api-key";
|
|
||||||
|
|
||||||
const encrypted = service.encrypt(plaintext);
|
|
||||||
const decrypted = service.decrypt(encrypted);
|
|
||||||
|
|
||||||
expect(encrypted.startsWith("enc:")).toBe(true);
|
|
||||||
expect(decrypted).toBe(plaintext);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("decrypt rejects tampered ciphertext", () => {
|
|
||||||
const encrypted = service.encrypt("sensitive-token");
|
|
||||||
const payload = encrypted.slice(4);
|
|
||||||
const bytes = Buffer.from(payload, "base64");
|
|
||||||
|
|
||||||
bytes[bytes.length - 1] = bytes[bytes.length - 1]! ^ 0xff;
|
|
||||||
|
|
||||||
const tampered = `enc:${bytes.toString("base64")}`;
|
|
||||||
|
|
||||||
expect(() => service.decrypt(tampered)).toThrow();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("decrypt rejects non-encrypted string", () => {
|
|
||||||
expect(() => service.decrypt("plain-text-value")).toThrow();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("isEncrypted detects prefix correctly", () => {
|
|
||||||
expect(service.isEncrypted("enc:abc")).toBe(true);
|
|
||||||
expect(service.isEncrypted("ENC:abc")).toBe(false);
|
|
||||||
expect(service.isEncrypted("plain-text")).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("generateToken returns 64-char hex string", () => {
|
|
||||||
const token = service.generateToken();
|
|
||||||
|
|
||||||
expect(token).toMatch(/^[0-9a-f]{64}$/);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("different plaintexts produce different ciphertexts (random IV)", () => {
|
|
||||||
const encryptedA = service.encrypt("value-a");
|
|
||||||
const encryptedB = service.encrypt("value-b");
|
|
||||||
|
|
||||||
expect(encryptedA).not.toBe(encryptedB);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("missing MOSAIC_SECRET_KEY throws on construction", () => {
|
|
||||||
expect(() => new CryptoService(createConfigService(undefined))).toThrow();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
import { Injectable } from "@nestjs/common";
|
|
||||||
import { ConfigService } from "@nestjs/config";
|
|
||||||
import { createCipheriv, createDecipheriv, hkdfSync, randomBytes } from "crypto";
|
|
||||||
|
|
||||||
const ALGORITHM = "aes-256-gcm";
|
|
||||||
const ENCRYPTED_PREFIX = "enc:";
|
|
||||||
const IV_LENGTH = 12;
|
|
||||||
const AUTH_TAG_LENGTH = 16;
|
|
||||||
const DERIVED_KEY_LENGTH = 32;
|
|
||||||
const HKDF_SALT = "mosaic.crypto.v1";
|
|
||||||
const HKDF_INFO = "mosaic-db-secret-encryption";
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class CryptoService {
|
|
||||||
private readonly key: Buffer;
|
|
||||||
|
|
||||||
constructor(private readonly config: ConfigService) {
|
|
||||||
const secret = this.config.get<string>("MOSAIC_SECRET_KEY");
|
|
||||||
|
|
||||||
if (!secret) {
|
|
||||||
throw new Error("MOSAIC_SECRET_KEY environment variable is required");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (secret.length < 32) {
|
|
||||||
throw new Error("MOSAIC_SECRET_KEY must be at least 32 characters");
|
|
||||||
}
|
|
||||||
|
|
||||||
this.key = Buffer.from(
|
|
||||||
hkdfSync(
|
|
||||||
"sha256",
|
|
||||||
Buffer.from(secret, "utf8"),
|
|
||||||
Buffer.from(HKDF_SALT, "utf8"),
|
|
||||||
Buffer.from(HKDF_INFO, "utf8"),
|
|
||||||
DERIVED_KEY_LENGTH
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
encrypt(plaintext: string): string {
|
|
||||||
const iv = randomBytes(IV_LENGTH);
|
|
||||||
const cipher = createCipheriv(ALGORITHM, this.key, iv);
|
|
||||||
const ciphertext = Buffer.concat([cipher.update(plaintext, "utf8"), cipher.final()]);
|
|
||||||
const authTag = cipher.getAuthTag();
|
|
||||||
const payload = Buffer.concat([iv, ciphertext, authTag]).toString("base64");
|
|
||||||
|
|
||||||
return `${ENCRYPTED_PREFIX}${payload}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
decrypt(encrypted: string): string {
|
|
||||||
if (!this.isEncrypted(encrypted)) {
|
|
||||||
throw new Error("Value is not encrypted");
|
|
||||||
}
|
|
||||||
|
|
||||||
const payloadBase64 = encrypted.slice(ENCRYPTED_PREFIX.length);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const payload = Buffer.from(payloadBase64, "base64");
|
|
||||||
if (payload.length < IV_LENGTH + AUTH_TAG_LENGTH) {
|
|
||||||
throw new Error("Encrypted payload is too short");
|
|
||||||
}
|
|
||||||
|
|
||||||
const iv = payload.subarray(0, IV_LENGTH);
|
|
||||||
const authTag = payload.subarray(payload.length - AUTH_TAG_LENGTH);
|
|
||||||
const ciphertext = payload.subarray(IV_LENGTH, payload.length - AUTH_TAG_LENGTH);
|
|
||||||
|
|
||||||
const decipher = createDecipheriv(ALGORITHM, this.key, iv);
|
|
||||||
decipher.setAuthTag(authTag);
|
|
||||||
|
|
||||||
return Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString("utf8");
|
|
||||||
} catch {
|
|
||||||
throw new Error("Failed to decrypt value");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
isEncrypted(value: string): boolean {
|
|
||||||
return value.startsWith(ENCRYPTED_PREFIX);
|
|
||||||
}
|
|
||||||
|
|
||||||
generateToken(): string {
|
|
||||||
return randomBytes(32).toString("hex");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,115 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
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 {}
|
|
||||||
@@ -1,200 +0,0 @@
|
|||||||
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);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,296 +0,0 @@
|
|||||||
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 : [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
114
docs/PRD-MS22.md
114
docs/PRD-MS22.md
@@ -1,114 +0,0 @@
|
|||||||
# PRD: MS22 — Fleet Evolution (DB-Centric Agent Architecture)
|
|
||||||
|
|
||||||
## Metadata
|
|
||||||
|
|
||||||
- Owner: Jason Woltje
|
|
||||||
- Date: 2026-03-01
|
|
||||||
- Status: in-progress
|
|
||||||
- Design Doc: `docs/design/MS22-DB-CENTRIC-ARCHITECTURE.md`
|
|
||||||
|
|
||||||
## Problem Statement
|
|
||||||
|
|
||||||
Mosaic Stack needs a multi-user agent fleet where each user gets their own isolated OpenClaw instance with their own LLM provider credentials and agent config. The system must be Docker-first with minimal environment variables and all configuration managed through the WebUI.
|
|
||||||
|
|
||||||
## Objectives
|
|
||||||
|
|
||||||
1. **Minimal bootstrap** — 2 env vars (`DATABASE_URL`, `MOSAIC_SECRET_KEY`) to start the entire stack
|
|
||||||
2. **DB-centric config** — All runtime config in Postgres, managed via WebUI
|
|
||||||
3. **Per-user isolation** — Each user gets their own OpenClaw container with own API keys, memory, sessions
|
|
||||||
4. **Onboarding wizard** — First-boot experience: breakglass admin → OIDC → LLM provider → agent config
|
|
||||||
5. **Settings UI** — Runtime management of providers, agents, and auth config
|
|
||||||
6. **Mosaic as gatekeeper** — Users never talk to OpenClaw directly; Mosaic proxies all requests
|
|
||||||
7. **Zero cross-user access** — Full container, volume, and DB isolation between users
|
|
||||||
|
|
||||||
## Security Requirements
|
|
||||||
|
|
||||||
- User A cannot access User B's API keys, chat history, or agent memory
|
|
||||||
- All API keys stored encrypted (AES-256-GCM) in database
|
|
||||||
- Breakglass admin always works as OIDC fallback
|
|
||||||
- OIDC config stored in DB (not env vars) — configured via settings UI
|
|
||||||
- Container-to-container communication blocked by default
|
|
||||||
- Admin cannot decrypt other users' API keys
|
|
||||||
|
|
||||||
## Phase 0: Knowledge Layer — COMPLETE
|
|
||||||
|
|
||||||
- Findings API (pgvector, CRUD, similarity search)
|
|
||||||
- AgentMemory API (key/value store)
|
|
||||||
- ConversationArchive API (pgvector, ingest, search)
|
|
||||||
- OpenClaw mosaic skill
|
|
||||||
- Session log ingestion pipeline
|
|
||||||
|
|
||||||
## Phase 1: DB-Centric Agent Fleet
|
|
||||||
|
|
||||||
### Phase 1a: DB Schema — COMPLETE
|
|
||||||
|
|
||||||
- SystemConfig, BreakglassUser, LlmProvider, UserContainer, SystemContainer, UserAgentConfig tables
|
|
||||||
|
|
||||||
### Phase 1b: Encryption Service — COMPLETE
|
|
||||||
|
|
||||||
- CryptoService (AES-256-GCM using MOSAIC_SECRET_KEY)
|
|
||||||
|
|
||||||
### Phase 1c: Internal Config API
|
|
||||||
|
|
||||||
- `GET /api/internal/agent-config/:id` — assembles openclaw.json from DB
|
|
||||||
- Auth: bearer token (container's own gateway token)
|
|
||||||
- Returns complete openclaw.json with decrypted provider credentials
|
|
||||||
|
|
||||||
### Phase 1d: Container Lifecycle Manager
|
|
||||||
|
|
||||||
- Docker API integration via `dockerode` npm package
|
|
||||||
- Start/stop/health-check/reap user containers
|
|
||||||
- Auto-generate gateway tokens, assign ports
|
|
||||||
- Docker socket access required (`/var/run/docker.sock`)
|
|
||||||
|
|
||||||
### Phase 1e: Onboarding API
|
|
||||||
|
|
||||||
- First-boot detection (`SystemConfig.onboarding.completed`)
|
|
||||||
- `POST /api/onboarding/breakglass` — create admin user
|
|
||||||
- `POST /api/onboarding/oidc` — save OIDC provider config
|
|
||||||
- `POST /api/onboarding/provider` — add LLM provider + test connection
|
|
||||||
- `POST /api/onboarding/complete` — mark done
|
|
||||||
|
|
||||||
### Phase 1f: Onboarding Wizard UI
|
|
||||||
|
|
||||||
- Multi-step wizard component
|
|
||||||
- Skip-able OIDC step
|
|
||||||
- LLM provider connection test
|
|
||||||
|
|
||||||
### Phase 1g: Settings API
|
|
||||||
|
|
||||||
- CRUD: LLM providers (per-user scoped)
|
|
||||||
- CRUD: Agent config (model assignments, personalities)
|
|
||||||
- CRUD: OIDC config (admin only)
|
|
||||||
- Breakglass password reset (admin only)
|
|
||||||
|
|
||||||
### Phase 1h: Settings UI
|
|
||||||
|
|
||||||
- Settings/Providers page
|
|
||||||
- Settings/Agent Config page
|
|
||||||
- Settings/Auth page (OIDC + breakglass)
|
|
||||||
|
|
||||||
### Phase 1i: Chat Proxy
|
|
||||||
|
|
||||||
- Route WebUI chat to user's OpenClaw container
|
|
||||||
- SSE streaming pass-through
|
|
||||||
- Ensure container is running before proxying (auto-start)
|
|
||||||
|
|
||||||
### Phase 1j: Docker Compose + Entrypoint
|
|
||||||
|
|
||||||
- Simplified compose (core services only — user containers are dynamic)
|
|
||||||
- Entrypoint: fetch config from API, write openclaw.json, start gateway
|
|
||||||
- Health check integration
|
|
||||||
|
|
||||||
### Phase 1k: Idle Reaper
|
|
||||||
|
|
||||||
- Cron job to stop inactive user containers
|
|
||||||
- Configurable idle timeout (default 30min)
|
|
||||||
- Preserve state volumes
|
|
||||||
|
|
||||||
## Future Phases (out of scope)
|
|
||||||
|
|
||||||
- Phase 2: Agent fleet standup (predefined agent roles)
|
|
||||||
- Phase 3: WebUI chat + task management integration
|
|
||||||
- Phase 4: Multi-LLM provider management UI (advanced)
|
|
||||||
- Team workspaces (shared agent contexts) — explicitly out of scope
|
|
||||||
@@ -71,21 +71,3 @@ Remaining estimate: ~143K tokens (Codex budget).
|
|||||||
| MS22-SKILL-001 | done | p0-knowledge | OpenClaw mosaic skill (agents read/write findings/memory) | TASKS:P0 | stack | feat/ms22-openclaw-skill | MS22-API-001,MS22-API-002 | MS22-VER-P0 | — | — | — | 15K | — | Skill in ~/.agents/skills/mosaic/ |
|
| MS22-SKILL-001 | done | p0-knowledge | OpenClaw mosaic skill (agents read/write findings/memory) | TASKS:P0 | stack | feat/ms22-openclaw-skill | MS22-API-001,MS22-API-002 | MS22-VER-P0 | — | — | — | 15K | — | Skill in ~/.agents/skills/mosaic/ |
|
||||||
| MS22-INGEST-001 | done | p0-knowledge | Session log ingestion pipeline (OpenClaw logs → ConvArchive) | TASKS:P0 | stack | feat/ms22-ingest | MS22-API-004 | MS22-VER-P0 | — | — | — | 20K | — | Script to batch-ingest existing logs |
|
| MS22-INGEST-001 | done | p0-knowledge | Session log ingestion pipeline (OpenClaw logs → ConvArchive) | TASKS:P0 | stack | feat/ms22-ingest | MS22-API-004 | MS22-VER-P0 | — | — | — | 20K | — | Script to batch-ingest existing logs |
|
||||||
| MS22-VER-P0 | done | p0-knowledge | Phase 0 verification: all modules deployed + smoke tested | TASKS:P0 | stack | — | MS22-TEST-001,MS22-SKILL-001,MS22-INGEST-001,MS22-API-003 | — | — | — | — | 5K | — | |
|
| MS22-VER-P0 | done | p0-knowledge | Phase 0 verification: all modules deployed + smoke tested | TASKS:P0 | stack | — | MS22-TEST-001,MS22-SKILL-001,MS22-INGEST-001,MS22-API-003 | — | — | — | — | 5K | — | |
|
||||||
|
|
||||||
## MS22 Phase 1: DB-Centric Agent Fleet (reworked)
|
|
||||||
|
|
||||||
Design doc: `docs/design/MS22-DB-CENTRIC-ARCHITECTURE.md`
|
|
||||||
|
|
||||||
| Task ID | Status | Phase | Description | Issue | Scope | Branch | Depends On | Blocks | Assigned Worker | Started | Completed | Est Tokens | Act Tokens | Notes |
|
|
||||||
| -------- | ----------- | -------- | --------------------------------------------------------------------------------------------------------------------- | ----- | ------- | ---------------------------- | ---------- | --------------- | --------------- | ------- | --------- | ---------- | ---------- | ----- |
|
|
||||||
| MS22-P1a | done | phase-1a | Prisma schema: SystemConfig, BreakglassUser, LlmProvider, UserContainer, SystemContainer, UserAgentConfig + migration | — | api | feat/ms22-p1a-schema | — | P1b,P1c,P1d,P1e | — | — | — | 20K | — | |
|
|
||||||
| MS22-P1b | done | phase-1b | Encryption service (AES-256-GCM) for API keys and tokens | — | api | feat/ms22-p1b-crypto | — | P1c,P1e,P1g | — | — | — | 15K | — | |
|
|
||||||
| MS22-P1c | not-started | phase-1c | Internal config endpoint: assemble openclaw.json from DB | — | api | feat/ms22-p1c-config-api | P1a,P1b | P1i,P1j | — | — | — | 20K | — | |
|
|
||||||
| MS22-P1d | not-started | phase-1d | ContainerLifecycleService: Docker API (dockerode) start/stop/health/reap | — | api | feat/ms22-p1d-container-mgr | P1a | P1i,P1k | — | — | — | 25K | — | |
|
|
||||||
| MS22-P1e | not-started | phase-1e | Onboarding API: breakglass, OIDC, provider, agents, complete | — | api | feat/ms22-p1e-onboarding-api | P1a,P1b | P1f | — | — | — | 20K | — | |
|
|
||||||
| MS22-P1f | not-started | phase-1f | Onboarding wizard WebUI (multi-step form) | — | web | feat/ms22-p1f-onboarding-ui | P1e | — | — | — | — | 25K | — | |
|
|
||||||
| MS22-P1g | not-started | phase-1g | Settings API: CRUD providers, agent config, OIDC, breakglass | — | api | feat/ms22-p1g-settings-api | P1a,P1b | P1h | — | — | — | 20K | — | |
|
|
||||||
| MS22-P1h | not-started | phase-1h | Settings UI: Providers, Agent Config, Auth pages | — | web | feat/ms22-p1h-settings-ui | P1g | — | — | — | — | 25K | — | |
|
|
||||||
| MS22-P1i | not-started | phase-1i | Chat proxy: route WebUI chat to user's OpenClaw container (SSE) | — | api+web | feat/ms22-p1i-chat-proxy | P1c,P1d | — | — | — | — | 20K | — | |
|
|
||||||
| MS22-P1j | not-started | phase-1j | Docker entrypoint + health checks + core compose | — | docker | feat/ms22-p1j-docker | P1c | — | — | — | — | 10K | — | |
|
|
||||||
| MS22-P1k | not-started | phase-1k | Idle reaper cron: stop inactive user containers | — | api | feat/ms22-p1k-idle-reaper | P1d | — | — | — | — | 10K | — | |
|
|
||||||
|
|||||||
7
pnpm-lock.yaml
generated
7
pnpm-lock.yaml
generated
@@ -171,9 +171,6 @@ importers:
|
|||||||
discord.js:
|
discord.js:
|
||||||
specifier: ^14.25.1
|
specifier: ^14.25.1
|
||||||
version: 14.25.1
|
version: 14.25.1
|
||||||
dockerode:
|
|
||||||
specifier: ^4.0.9
|
|
||||||
version: 4.0.9
|
|
||||||
gray-matter:
|
gray-matter:
|
||||||
specifier: ^4.0.3
|
specifier: ^4.0.3
|
||||||
version: 4.0.3
|
version: 4.0.3
|
||||||
@@ -256,9 +253,6 @@ importers:
|
|||||||
'@types/cookie-parser':
|
'@types/cookie-parser':
|
||||||
specifier: ^1.4.10
|
specifier: ^1.4.10
|
||||||
version: 1.4.10(@types/express@5.0.6)
|
version: 1.4.10(@types/express@5.0.6)
|
||||||
'@types/dockerode':
|
|
||||||
specifier: ^3.3.47
|
|
||||||
version: 3.3.47
|
|
||||||
'@types/express':
|
'@types/express':
|
||||||
specifier: ^5.0.1
|
specifier: ^5.0.1
|
||||||
version: 5.0.6
|
version: 5.0.6
|
||||||
@@ -1610,6 +1604,7 @@ packages:
|
|||||||
|
|
||||||
'@mosaicstack/telemetry-client@0.1.1':
|
'@mosaicstack/telemetry-client@0.1.1':
|
||||||
resolution: {integrity: sha512-1udg6p4cs8rhQgQ2pKCfi7EpRlJieRRhA5CIqthRQ6HQZLgQ0wH+632jEulov3rlHSM1iplIQ+AAe5DWrvSkEA==, tarball: https://git.mosaicstack.dev/api/packages/mosaic/npm/%40mosaicstack%2Ftelemetry-client/-/0.1.1/telemetry-client-0.1.1.tgz}
|
resolution: {integrity: sha512-1udg6p4cs8rhQgQ2pKCfi7EpRlJieRRhA5CIqthRQ6HQZLgQ0wH+632jEulov3rlHSM1iplIQ+AAe5DWrvSkEA==, tarball: https://git.mosaicstack.dev/api/packages/mosaic/npm/%40mosaicstack%2Ftelemetry-client/-/0.1.1/telemetry-client-0.1.1.tgz}
|
||||||
|
engines: {node: '>=18'}
|
||||||
|
|
||||||
'@mrleebo/prisma-ast@0.13.1':
|
'@mrleebo/prisma-ast@0.13.1':
|
||||||
resolution: {integrity: sha512-XyroGQXcHrZdvmrGJvsA9KNeOOgGMg1Vg9OlheUsBOSKznLMDl+YChxbkboRHvtFYJEMRYmlV3uoo/njCw05iw==}
|
resolution: {integrity: sha512-XyroGQXcHrZdvmrGJvsA9KNeOOgGMg1Vg9OlheUsBOSKznLMDl+YChxbkboRHvtFYJEMRYmlV3uoo/njCw05iw==}
|
||||||
|
|||||||
Reference in New Issue
Block a user