feat: 全栈 Logger 依赖注入 — DB/Route/AI 层传参 + 前端 Logger + 测试更新 + 归档 add-frontend-logger
This commit is contained in:
@@ -11,6 +11,7 @@ import { createNoopLogger } from "../../../src/server/logger";
|
||||
import { createMigratedMemoryTestDatabase } from "../../helpers";
|
||||
|
||||
const MODE: RuntimeMode = "test";
|
||||
const LOG = createNoopLogger();
|
||||
|
||||
void mock.module("ai", () => ({
|
||||
createAgentUIStreamResponse: (opts: {
|
||||
@@ -49,65 +50,73 @@ void mock.module("ai", () => ({
|
||||
|
||||
async function createConversationViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleCreateConversation: h } = await import("../../../src/server/routes/chat/create");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function deleteConversationViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleDeleteConversation: h } = await import("../../../src/server/routes/chat/delete");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function getConversationViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleGetConversation: h } = await import("../../../src/server/routes/chat/get");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function listConversationsViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleListConversations: h } = await import("../../../src/server/routes/chat/list");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function listMessagesViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleListMessages: h } = await import("../../../src/server/routes/chat/messages");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function patchConversationViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleUpdateConversation: h } = await import("../../../src/server/routes/chat/update");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
function seedModel(db: Database, providerId: string, modelName = "GPT-4o", modelId = "gpt-4o"): string {
|
||||
const result = createModel(db, {
|
||||
capabilities: ["text"],
|
||||
modelId,
|
||||
name: modelName,
|
||||
providerId,
|
||||
});
|
||||
const result = createModel(
|
||||
db,
|
||||
{
|
||||
capabilities: ["text"],
|
||||
modelId,
|
||||
name: modelName,
|
||||
providerId,
|
||||
},
|
||||
LOG,
|
||||
);
|
||||
if ("error" in result) throw new Error(result.error);
|
||||
return result.model.id;
|
||||
}
|
||||
|
||||
function seedProject(db: Database, name = "测试项目"): string {
|
||||
const result = createProject(db, { description: "测试", name });
|
||||
const result = createProject(db, { description: "测试", name }, LOG);
|
||||
if ("error" in result) throw new Error(result.error);
|
||||
return result.project.id;
|
||||
}
|
||||
|
||||
function seedProvider(db: Database, name = "测试供应商"): string {
|
||||
const result = createProvider(db, {
|
||||
apiKey: "sk-test",
|
||||
baseUrl: "https://api.test.com/v1",
|
||||
name,
|
||||
type: "openai",
|
||||
});
|
||||
const result = createProvider(
|
||||
db,
|
||||
{
|
||||
apiKey: "sk-test",
|
||||
baseUrl: "https://api.test.com/v1",
|
||||
name,
|
||||
type: "openai",
|
||||
},
|
||||
LOG,
|
||||
);
|
||||
if ("error" in result) throw new Error(result.error);
|
||||
return result.provider.id;
|
||||
}
|
||||
|
||||
async function sendChatViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleSendChat: h } = await import("../../../src/server/routes/chat/send");
|
||||
return h(req, db, MODE, createNoopLogger());
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
describe("聊天 API 路由", () => {
|
||||
|
||||
@@ -4,40 +4,46 @@ import { describe, expect, mock, test } from "bun:test";
|
||||
|
||||
import type { Model, RuntimeMode } from "../../../src/shared/api";
|
||||
|
||||
import { createNoopLogger } from "../../../src/server/logger";
|
||||
import { createMigratedMemoryTestDatabase } from "../../helpers";
|
||||
|
||||
const MODE: RuntimeMode = "test";
|
||||
const LOG = createNoopLogger();
|
||||
|
||||
async function createModelViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleCreateModel: h } = await import("../../../src/server/routes/models/create");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
function createTestModel(db: Database, pName: string, providerId?: string): Model {
|
||||
const pid = providerId ?? seedProvider(db);
|
||||
const result = createModel(db, {
|
||||
capabilities: ["text"],
|
||||
modelId: pName.toLowerCase().replace(/[^a-z0-9-]/g, "-"),
|
||||
name: pName,
|
||||
providerId: pid,
|
||||
});
|
||||
const result = createModel(
|
||||
db,
|
||||
{
|
||||
capabilities: ["text"],
|
||||
modelId: pName.toLowerCase().replace(/[^a-z0-9-]/g, "-"),
|
||||
name: pName,
|
||||
providerId: pid,
|
||||
},
|
||||
LOG,
|
||||
);
|
||||
if ("error" in result) throw new Error(result.error);
|
||||
return result.model;
|
||||
}
|
||||
|
||||
async function deleteModelViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleDeleteModel: h } = await import("../../../src/server/routes/models/delete");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function getModelViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleGetModel: h } = await import("../../../src/server/routes/models/get");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function listModelsViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleListModels: h } = await import("../../../src/server/routes/models/list");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
import { createModel } from "../../../src/server/db/models";
|
||||
@@ -51,24 +57,28 @@ void mock.module("ai", () => ({
|
||||
}));
|
||||
|
||||
function seedProvider(db: Database, name?: string): string {
|
||||
const result = createProvider(db, {
|
||||
apiKey: "sk-test",
|
||||
baseUrl: "https://api.test.com/v1",
|
||||
name: name ?? "TestProvider",
|
||||
type: "openai",
|
||||
});
|
||||
const result = createProvider(
|
||||
db,
|
||||
{
|
||||
apiKey: "sk-test",
|
||||
baseUrl: "https://api.test.com/v1",
|
||||
name: name ?? "TestProvider",
|
||||
type: "openai",
|
||||
},
|
||||
LOG,
|
||||
);
|
||||
if ("error" in result) throw new Error(result.error);
|
||||
return result.provider.id;
|
||||
}
|
||||
|
||||
async function testModelViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleTestModelConfig: h } = await import("../../../src/server/routes/models/test");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function updateModelViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleUpdateModel: h } = await import("../../../src/server/routes/models/update");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function withRouteDb(callback: (db: Database) => Promise<void>): Promise<void> {
|
||||
|
||||
@@ -4,50 +4,52 @@ import { describe, expect, test } from "bun:test";
|
||||
|
||||
import type { Project, RuntimeMode } from "../../../src/shared/api";
|
||||
|
||||
import { createNoopLogger } from "../../../src/server/logger";
|
||||
import { createMigratedMemoryTestDatabase } from "../../helpers";
|
||||
|
||||
const MODE: RuntimeMode = "test";
|
||||
const LOG = createNoopLogger();
|
||||
|
||||
async function archiveProjectViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleArchiveProject: h } = await import("../../../src/server/routes/projects/archive");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
// Inline imports for actual route handler tests (each handler is in separate file)
|
||||
async function createProjectViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleCreateProject: h } = await import("../../../src/server/routes/projects/create");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
function createTestProject(db: Database, name = "测试项目"): Project {
|
||||
const result = createProject(db, { name });
|
||||
const result = createProject(db, { name }, LOG);
|
||||
if ("error" in result) throw new Error(result.error);
|
||||
return result.project;
|
||||
}
|
||||
|
||||
async function deleteProjectViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleDeleteProject: h } = await import("../../../src/server/routes/projects/delete");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function getProjectViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleGetProject: h } = await import("../../../src/server/routes/projects/get");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function listProjectsViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleListProjects: h } = await import("../../../src/server/routes/projects/list");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function restoreProjectViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleRestoreProject: h } = await import("../../../src/server/routes/projects/restore");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function updateProjectViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleUpdateProject: h } = await import("../../../src/server/routes/projects/update");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
// Need db/projects for setup
|
||||
@@ -135,7 +137,7 @@ describe("项目 API 路由", () => {
|
||||
test("POST /api/projects/:id/restore 恢复项目", async () => {
|
||||
await withRouteDb(async (db) => {
|
||||
const project = createTestProject(db, "恢复路由");
|
||||
archiveProject(db, project.id);
|
||||
archiveProject(db, project.id, LOG);
|
||||
|
||||
const req = new Request(`http://localhost/api/projects/${project.id}/restore`, { method: "POST" });
|
||||
const res = await restoreProjectViaHandler(req, db);
|
||||
@@ -148,7 +150,7 @@ describe("项目 API 路由", () => {
|
||||
test("DELETE /api/projects/:id 永久删除已归档项目", async () => {
|
||||
await withRouteDb(async (db) => {
|
||||
const project = createTestProject(db, "删除路由");
|
||||
archiveProject(db, project.id);
|
||||
archiveProject(db, project.id, LOG);
|
||||
|
||||
const req = new Request(`http://localhost/api/projects/${project.id}`, { method: "DELETE" });
|
||||
const res = await deleteProjectViaHandler(req, db);
|
||||
|
||||
@@ -6,9 +6,11 @@ import type { Provider, ProviderOption, RuntimeMode } from "../../../src/shared/
|
||||
|
||||
import { createModel } from "../../../src/server/db/models";
|
||||
import { createProvider } from "../../../src/server/db/providers";
|
||||
import { createNoopLogger } from "../../../src/server/logger";
|
||||
import { createMigratedMemoryTestDatabase } from "../../helpers";
|
||||
|
||||
const MODE: RuntimeMode = "test";
|
||||
const LOG = createNoopLogger();
|
||||
|
||||
void mock.module("ai", () => ({
|
||||
createProviderRegistry: () => ({
|
||||
@@ -18,48 +20,52 @@ void mock.module("ai", () => ({
|
||||
|
||||
async function createProviderViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleCreateProvider: h } = await import("../../../src/server/routes/providers/create");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
function createTestProvider(db: Database, name = "测试供应商", baseUrl = "https://api.test.com/v1"): Provider {
|
||||
const result = createProvider(db, {
|
||||
apiKey: "sk-test",
|
||||
baseUrl,
|
||||
name,
|
||||
type: "openai",
|
||||
});
|
||||
const result = createProvider(
|
||||
db,
|
||||
{
|
||||
apiKey: "sk-test",
|
||||
baseUrl,
|
||||
name,
|
||||
type: "openai",
|
||||
},
|
||||
LOG,
|
||||
);
|
||||
if ("error" in result) throw new Error(result.error);
|
||||
return result.provider;
|
||||
}
|
||||
|
||||
async function deleteProviderViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleDeleteProvider: h } = await import("../../../src/server/routes/providers/delete");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function getProviderViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleGetProvider: h } = await import("../../../src/server/routes/providers/get");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function listProviderOptionsViaHandler(_req: Request, db: Database): Promise<Response> {
|
||||
const { handleListProviderOptions: h } = await import("../../../src/server/routes/providers/options");
|
||||
return h(db, MODE);
|
||||
return h(db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function listProvidersViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleListProviders: h } = await import("../../../src/server/routes/providers/list");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function testProviderConfigViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleTestProviderConfig: h } = await import("../../../src/server/routes/providers/test");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function updateProviderViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleUpdateProvider: h } = await import("../../../src/server/routes/providers/update");
|
||||
return h(req, db, MODE);
|
||||
return h(req, db, MODE, LOG);
|
||||
}
|
||||
|
||||
async function withProviderServer(
|
||||
@@ -182,12 +188,16 @@ describe("供应商 API 路由", () => {
|
||||
test("DELETE /api/providers/:id 存在关联模型时返回 409", async () => {
|
||||
await withRouteDb(async (db) => {
|
||||
const provider = createTestProvider(db, "有关联模型");
|
||||
const modelResult = createModel(db, {
|
||||
capabilities: ["text"],
|
||||
modelId: "gpt-4o",
|
||||
name: "GPT-4o",
|
||||
providerId: provider.id,
|
||||
});
|
||||
const modelResult = createModel(
|
||||
db,
|
||||
{
|
||||
capabilities: ["text"],
|
||||
modelId: "gpt-4o",
|
||||
name: "GPT-4o",
|
||||
providerId: provider.id,
|
||||
},
|
||||
LOG,
|
||||
);
|
||||
if ("error" in modelResult) throw new Error(modelResult.error);
|
||||
|
||||
const req = new Request(`http://localhost/api/providers/${provider.id}`, { method: "DELETE" });
|
||||
|
||||
Reference in New Issue
Block a user