mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-16 23:13:42 +08:00
Compare commits
3 Commits
JI4JUN-fea
...
b72013e9c3
Author | SHA1 | Date | |
---|---|---|---|
|
b72013e9c3 | ||
|
62d32f317d | ||
|
d1baabae14 |
@@ -81,9 +81,3 @@ SILICONFLOW_API_KEY=
|
|||||||
|
|
||||||
### siliconflow Api url (optional)
|
### siliconflow Api url (optional)
|
||||||
SILICONFLOW_URL=
|
SILICONFLOW_URL=
|
||||||
|
|
||||||
### 302.AI Api key (optional)
|
|
||||||
AI302_API_KEY=
|
|
||||||
|
|
||||||
### 302.AI Api url (optional)
|
|
||||||
AI302_URL=
|
|
||||||
|
@@ -4,11 +4,7 @@
|
|||||||
<img src="https://github.com/user-attachments/assets/83bdcc07-ae5e-4954-a53a-ac151ba6ccf3" width="1000" alt="icon"/>
|
<img src="https://github.com/user-attachments/assets/83bdcc07-ae5e-4954-a53a-ac151ba6ccf3" width="1000" alt="icon"/>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a href='https://302.ai/'>
|
|
||||||
<img src="./docs/images/302AI-banner-en.jpg" width=400 alt="icon"/>
|
|
||||||
</a>
|
|
||||||
|
|
||||||
[302.AI](https://302.ai/) is a pay-as-you-go AI application platform that offers the most comprehensive AI APIs and online applications available.
|
|
||||||
|
|
||||||
|
|
||||||
<h1 align="center">NextChat</h1>
|
<h1 align="center">NextChat</h1>
|
||||||
@@ -26,12 +22,12 @@ English / [简体中文](./README_CN.md)
|
|||||||
[![MacOS][MacOS-image]][download-url]
|
[![MacOS][MacOS-image]][download-url]
|
||||||
[![Linux][Linux-image]][download-url]
|
[![Linux][Linux-image]][download-url]
|
||||||
|
|
||||||
[NextChatAI](https://nextchat.club?utm_source=readme) / [iOS APP](https://apps.apple.com/us/app/nextchat-ai/id6743085599) / [Web App Demo](https://app.nextchat.club) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Enterprise Edition](#enterprise-edition)
|
[NextChatAI](https://nextchat.club?utm_source=readme) / [iOS APP](https://apps.apple.com/us/app/nextchat-ai/id6743085599) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Enterprise Edition](#enterprise-edition)
|
||||||
|
|
||||||
|
|
||||||
[saas-url]: https://nextchat.club?utm_source=readme
|
[saas-url]: https://nextchat.club?utm_source=readme
|
||||||
[saas-image]: https://img.shields.io/badge/NextChat-Saas-green?logo=microsoftedge
|
[saas-image]: https://img.shields.io/badge/NextChat-Saas-green?logo=microsoftedge
|
||||||
[web-url]: https://app.nextchat.club/
|
[web-url]: https://app.nextchat.dev/
|
||||||
[download-url]: https://github.com/Yidadaa/ChatGPT-Next-Web/releases
|
[download-url]: https://github.com/Yidadaa/ChatGPT-Next-Web/releases
|
||||||
[Web-image]: https://img.shields.io/badge/Web-PWA-orange?logo=microsoftedge
|
[Web-image]: https://img.shields.io/badge/Web-PWA-orange?logo=microsoftedge
|
||||||
[Windows-image]: https://img.shields.io/badge/-Windows-blue?logo=windows
|
[Windows-image]: https://img.shields.io/badge/-Windows-blue?logo=windows
|
||||||
|
@@ -4,12 +4,6 @@
|
|||||||
<img src="./docs/images/ent.svg" alt="icon"/>
|
<img src="./docs/images/ent.svg" alt="icon"/>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a href='https://302.ai/'>
|
|
||||||
<img src="./docs/images/302AI-banner-zh.jpg" width=400 alt="icon"/>
|
|
||||||
</a>
|
|
||||||
|
|
||||||
[302.AI](https://302.ai/) 是一个按需付费的AI应用平台,提供市面上最全的AI API和AI在线应用。
|
|
||||||
|
|
||||||
<h1 align="center">NextChat</h1>
|
<h1 align="center">NextChat</h1>
|
||||||
|
|
||||||
一键免费部署你的私人 ChatGPT 网页应用,支持 Claude, GPT4 & Gemini Pro 模型。
|
一键免费部署你的私人 ChatGPT 网页应用,支持 Claude, GPT4 & Gemini Pro 模型。
|
||||||
|
@@ -1,12 +1,6 @@
|
|||||||
<div align="center">
|
<div align="center">
|
||||||
<img src="./docs/images/ent.svg" alt="プレビュー"/>
|
<img src="./docs/images/ent.svg" alt="プレビュー"/>
|
||||||
|
|
||||||
<a href='https://302.ai/'>
|
|
||||||
<img src="./docs/images/302AI-banner-jp.jpg" width=400 alt="icon"/>
|
|
||||||
</a>
|
|
||||||
|
|
||||||
[302.AI](https://302.ai/) は、オンデマンドで支払うAIアプリケーションプラットフォームで、最も安全なAI APIとAIオンラインアプリケーションを提供します。
|
|
||||||
|
|
||||||
<h1 align="center">NextChat</h1>
|
<h1 align="center">NextChat</h1>
|
||||||
|
|
||||||
ワンクリックで無料であなた専用の ChatGPT ウェブアプリをデプロイ。GPT3、GPT4 & Gemini Pro モデルをサポート。
|
ワンクリックで無料であなた専用の ChatGPT ウェブアプリをデプロイ。GPT3、GPT4 & Gemini Pro モデルをサポート。
|
||||||
|
128
app/api/302ai.ts
128
app/api/302ai.ts
@@ -1,128 +0,0 @@
|
|||||||
import { getServerSideConfig } from "@/app/config/server";
|
|
||||||
import {
|
|
||||||
AI302_BASE_URL,
|
|
||||||
ApiPath,
|
|
||||||
ModelProvider,
|
|
||||||
ServiceProvider,
|
|
||||||
} from "@/app/constant";
|
|
||||||
import { prettyObject } from "@/app/utils/format";
|
|
||||||
import { NextRequest, NextResponse } from "next/server";
|
|
||||||
import { auth } from "@/app/api/auth";
|
|
||||||
import { isModelNotavailableInServer } from "@/app/utils/model";
|
|
||||||
|
|
||||||
const serverConfig = getServerSideConfig();
|
|
||||||
|
|
||||||
export async function handle(
|
|
||||||
req: NextRequest,
|
|
||||||
{ params }: { params: { path: string[] } },
|
|
||||||
) {
|
|
||||||
console.log("[302.AI Route] params ", params);
|
|
||||||
|
|
||||||
if (req.method === "OPTIONS") {
|
|
||||||
return NextResponse.json({ body: "OK" }, { status: 200 });
|
|
||||||
}
|
|
||||||
|
|
||||||
const authResult = auth(req, ModelProvider["302.AI"]);
|
|
||||||
if (authResult.error) {
|
|
||||||
return NextResponse.json(authResult, {
|
|
||||||
status: 401,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const response = await request(req);
|
|
||||||
return response;
|
|
||||||
} catch (e) {
|
|
||||||
console.error("[302.AI] ", e);
|
|
||||||
return NextResponse.json(prettyObject(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function request(req: NextRequest) {
|
|
||||||
const controller = new AbortController();
|
|
||||||
|
|
||||||
// alibaba use base url or just remove the path
|
|
||||||
let path = `${req.nextUrl.pathname}`.replaceAll(ApiPath["302.AI"], "");
|
|
||||||
|
|
||||||
let baseUrl = serverConfig.ai302Url || AI302_BASE_URL;
|
|
||||||
|
|
||||||
if (!baseUrl.startsWith("http")) {
|
|
||||||
baseUrl = `https://${baseUrl}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (baseUrl.endsWith("/")) {
|
|
||||||
baseUrl = baseUrl.slice(0, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log("[Proxy] ", path);
|
|
||||||
console.log("[Base Url]", baseUrl);
|
|
||||||
|
|
||||||
const timeoutId = setTimeout(
|
|
||||||
() => {
|
|
||||||
controller.abort();
|
|
||||||
},
|
|
||||||
10 * 60 * 1000,
|
|
||||||
);
|
|
||||||
|
|
||||||
const fetchUrl = `${baseUrl}${path}`;
|
|
||||||
const fetchOptions: RequestInit = {
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
Authorization: req.headers.get("Authorization") ?? "",
|
|
||||||
},
|
|
||||||
method: req.method,
|
|
||||||
body: req.body,
|
|
||||||
redirect: "manual",
|
|
||||||
// @ts-ignore
|
|
||||||
duplex: "half",
|
|
||||||
signal: controller.signal,
|
|
||||||
};
|
|
||||||
|
|
||||||
// #1815 try to refuse some request to some models
|
|
||||||
if (serverConfig.customModels && req.body) {
|
|
||||||
try {
|
|
||||||
const clonedBody = await req.text();
|
|
||||||
fetchOptions.body = clonedBody;
|
|
||||||
|
|
||||||
const jsonBody = JSON.parse(clonedBody) as { model?: string };
|
|
||||||
|
|
||||||
// not undefined and is false
|
|
||||||
if (
|
|
||||||
isModelNotavailableInServer(
|
|
||||||
serverConfig.customModels,
|
|
||||||
jsonBody?.model as string,
|
|
||||||
ServiceProvider["302.AI"] as string,
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error: true,
|
|
||||||
message: `you are not allowed to use ${jsonBody?.model} model`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
status: 403,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.error(`[302.AI] filter`, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
const res = await fetch(fetchUrl, fetchOptions);
|
|
||||||
|
|
||||||
// to prevent browser prompt for credentials
|
|
||||||
const newHeaders = new Headers(res.headers);
|
|
||||||
newHeaders.delete("www-authenticate");
|
|
||||||
// to disable nginx buffering
|
|
||||||
newHeaders.set("X-Accel-Buffering", "no");
|
|
||||||
|
|
||||||
return new Response(res.body, {
|
|
||||||
status: res.status,
|
|
||||||
statusText: res.statusText,
|
|
||||||
headers: newHeaders,
|
|
||||||
});
|
|
||||||
} finally {
|
|
||||||
clearTimeout(timeoutId);
|
|
||||||
}
|
|
||||||
}
|
|
@@ -15,7 +15,6 @@ import { handle as siliconflowHandler } from "../../siliconflow";
|
|||||||
import { handle as xaiHandler } from "../../xai";
|
import { handle as xaiHandler } from "../../xai";
|
||||||
import { handle as chatglmHandler } from "../../glm";
|
import { handle as chatglmHandler } from "../../glm";
|
||||||
import { handle as proxyHandler } from "../../proxy";
|
import { handle as proxyHandler } from "../../proxy";
|
||||||
import { handle as ai302Handler } from "../../302ai";
|
|
||||||
|
|
||||||
async function handle(
|
async function handle(
|
||||||
req: NextRequest,
|
req: NextRequest,
|
||||||
@@ -53,8 +52,6 @@ async function handle(
|
|||||||
return siliconflowHandler(req, { params });
|
return siliconflowHandler(req, { params });
|
||||||
case ApiPath.OpenAI:
|
case ApiPath.OpenAI:
|
||||||
return openaiHandler(req, { params });
|
return openaiHandler(req, { params });
|
||||||
case ApiPath["302.AI"]:
|
|
||||||
return ai302Handler(req, { params });
|
|
||||||
default:
|
default:
|
||||||
return proxyHandler(req, { params });
|
return proxyHandler(req, { params });
|
||||||
}
|
}
|
||||||
|
@@ -24,7 +24,6 @@ import { DeepSeekApi } from "./platforms/deepseek";
|
|||||||
import { XAIApi } from "./platforms/xai";
|
import { XAIApi } from "./platforms/xai";
|
||||||
import { ChatGLMApi } from "./platforms/glm";
|
import { ChatGLMApi } from "./platforms/glm";
|
||||||
import { SiliconflowApi } from "./platforms/siliconflow";
|
import { SiliconflowApi } from "./platforms/siliconflow";
|
||||||
import { Ai302Api } from "./platforms/ai302";
|
|
||||||
|
|
||||||
export const ROLES = ["system", "user", "assistant"] as const;
|
export const ROLES = ["system", "user", "assistant"] as const;
|
||||||
export type MessageRole = (typeof ROLES)[number];
|
export type MessageRole = (typeof ROLES)[number];
|
||||||
@@ -174,9 +173,6 @@ export class ClientApi {
|
|||||||
case ModelProvider.SiliconFlow:
|
case ModelProvider.SiliconFlow:
|
||||||
this.llm = new SiliconflowApi();
|
this.llm = new SiliconflowApi();
|
||||||
break;
|
break;
|
||||||
case ModelProvider["302.AI"]:
|
|
||||||
this.llm = new Ai302Api();
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
this.llm = new ChatGPTApi();
|
this.llm = new ChatGPTApi();
|
||||||
}
|
}
|
||||||
@@ -269,7 +265,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
|||||||
const isChatGLM = modelConfig.providerName === ServiceProvider.ChatGLM;
|
const isChatGLM = modelConfig.providerName === ServiceProvider.ChatGLM;
|
||||||
const isSiliconFlow =
|
const isSiliconFlow =
|
||||||
modelConfig.providerName === ServiceProvider.SiliconFlow;
|
modelConfig.providerName === ServiceProvider.SiliconFlow;
|
||||||
const isAI302 = modelConfig.providerName === ServiceProvider["302.AI"];
|
|
||||||
const isEnabledAccessControl = accessStore.enabledAccessControl();
|
const isEnabledAccessControl = accessStore.enabledAccessControl();
|
||||||
const apiKey = isGoogle
|
const apiKey = isGoogle
|
||||||
? accessStore.googleApiKey
|
? accessStore.googleApiKey
|
||||||
@@ -295,8 +290,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
|||||||
? accessStore.iflytekApiKey && accessStore.iflytekApiSecret
|
? accessStore.iflytekApiKey && accessStore.iflytekApiSecret
|
||||||
? accessStore.iflytekApiKey + ":" + accessStore.iflytekApiSecret
|
? accessStore.iflytekApiKey + ":" + accessStore.iflytekApiSecret
|
||||||
: ""
|
: ""
|
||||||
: isAI302
|
|
||||||
? accessStore.ai302ApiKey
|
|
||||||
: accessStore.openaiApiKey;
|
: accessStore.openaiApiKey;
|
||||||
return {
|
return {
|
||||||
isGoogle,
|
isGoogle,
|
||||||
@@ -311,7 +304,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
|||||||
isXAI,
|
isXAI,
|
||||||
isChatGLM,
|
isChatGLM,
|
||||||
isSiliconFlow,
|
isSiliconFlow,
|
||||||
isAI302,
|
|
||||||
apiKey,
|
apiKey,
|
||||||
isEnabledAccessControl,
|
isEnabledAccessControl,
|
||||||
};
|
};
|
||||||
@@ -340,7 +332,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
|
|||||||
isXAI,
|
isXAI,
|
||||||
isChatGLM,
|
isChatGLM,
|
||||||
isSiliconFlow,
|
isSiliconFlow,
|
||||||
isAI302,
|
|
||||||
apiKey,
|
apiKey,
|
||||||
isEnabledAccessControl,
|
isEnabledAccessControl,
|
||||||
} = getConfig();
|
} = getConfig();
|
||||||
@@ -391,8 +382,6 @@ export function getClientApi(provider: ServiceProvider): ClientApi {
|
|||||||
return new ClientApi(ModelProvider.ChatGLM);
|
return new ClientApi(ModelProvider.ChatGLM);
|
||||||
case ServiceProvider.SiliconFlow:
|
case ServiceProvider.SiliconFlow:
|
||||||
return new ClientApi(ModelProvider.SiliconFlow);
|
return new ClientApi(ModelProvider.SiliconFlow);
|
||||||
case ServiceProvider["302.AI"]:
|
|
||||||
return new ClientApi(ModelProvider["302.AI"]);
|
|
||||||
default:
|
default:
|
||||||
return new ClientApi(ModelProvider.GPT);
|
return new ClientApi(ModelProvider.GPT);
|
||||||
}
|
}
|
||||||
|
@@ -1,287 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import {
|
|
||||||
ApiPath,
|
|
||||||
AI302_BASE_URL,
|
|
||||||
DEFAULT_MODELS,
|
|
||||||
AI302,
|
|
||||||
} from "@/app/constant";
|
|
||||||
import {
|
|
||||||
useAccessStore,
|
|
||||||
useAppConfig,
|
|
||||||
useChatStore,
|
|
||||||
ChatMessageTool,
|
|
||||||
usePluginStore,
|
|
||||||
} from "@/app/store";
|
|
||||||
import { preProcessImageContent, streamWithThink } from "@/app/utils/chat";
|
|
||||||
import {
|
|
||||||
ChatOptions,
|
|
||||||
getHeaders,
|
|
||||||
LLMApi,
|
|
||||||
LLMModel,
|
|
||||||
SpeechOptions,
|
|
||||||
} from "../api";
|
|
||||||
import { getClientConfig } from "@/app/config/client";
|
|
||||||
import {
|
|
||||||
getMessageTextContent,
|
|
||||||
getMessageTextContentWithoutThinking,
|
|
||||||
isVisionModel,
|
|
||||||
getTimeoutMSByModel,
|
|
||||||
} from "@/app/utils";
|
|
||||||
import { RequestPayload } from "./openai";
|
|
||||||
|
|
||||||
import { fetch } from "@/app/utils/stream";
|
|
||||||
export interface Ai302ListModelResponse {
|
|
||||||
object: string;
|
|
||||||
data: Array<{
|
|
||||||
id: string;
|
|
||||||
object: string;
|
|
||||||
root: string;
|
|
||||||
}>;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class Ai302Api implements LLMApi {
|
|
||||||
private disableListModels = false;
|
|
||||||
|
|
||||||
path(path: string): string {
|
|
||||||
const accessStore = useAccessStore.getState();
|
|
||||||
|
|
||||||
let baseUrl = "";
|
|
||||||
|
|
||||||
if (accessStore.useCustomConfig) {
|
|
||||||
baseUrl = accessStore.ai302Url;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (baseUrl.length === 0) {
|
|
||||||
const isApp = !!getClientConfig()?.isApp;
|
|
||||||
const apiPath = ApiPath["302.AI"];
|
|
||||||
baseUrl = isApp ? AI302_BASE_URL : apiPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (baseUrl.endsWith("/")) {
|
|
||||||
baseUrl = baseUrl.slice(0, baseUrl.length - 1);
|
|
||||||
}
|
|
||||||
if (
|
|
||||||
!baseUrl.startsWith("http") &&
|
|
||||||
!baseUrl.startsWith(ApiPath["302.AI"])
|
|
||||||
) {
|
|
||||||
baseUrl = "https://" + baseUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log("[Proxy Endpoint] ", baseUrl, path);
|
|
||||||
|
|
||||||
return [baseUrl, path].join("/");
|
|
||||||
}
|
|
||||||
|
|
||||||
extractMessage(res: any) {
|
|
||||||
return res.choices?.at(0)?.message?.content ?? "";
|
|
||||||
}
|
|
||||||
|
|
||||||
speech(options: SpeechOptions): Promise<ArrayBuffer> {
|
|
||||||
throw new Error("Method not implemented.");
|
|
||||||
}
|
|
||||||
|
|
||||||
async chat(options: ChatOptions) {
|
|
||||||
const visionModel = isVisionModel(options.config.model);
|
|
||||||
const messages: ChatOptions["messages"] = [];
|
|
||||||
for (const v of options.messages) {
|
|
||||||
if (v.role === "assistant") {
|
|
||||||
const content = getMessageTextContentWithoutThinking(v);
|
|
||||||
messages.push({ role: v.role, content });
|
|
||||||
} else {
|
|
||||||
const content = visionModel
|
|
||||||
? await preProcessImageContent(v.content)
|
|
||||||
: getMessageTextContent(v);
|
|
||||||
messages.push({ role: v.role, content });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const modelConfig = {
|
|
||||||
...useAppConfig.getState().modelConfig,
|
|
||||||
...useChatStore.getState().currentSession().mask.modelConfig,
|
|
||||||
...{
|
|
||||||
model: options.config.model,
|
|
||||||
providerName: options.config.providerName,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const requestPayload: RequestPayload = {
|
|
||||||
messages,
|
|
||||||
stream: options.config.stream,
|
|
||||||
model: modelConfig.model,
|
|
||||||
temperature: modelConfig.temperature,
|
|
||||||
presence_penalty: modelConfig.presence_penalty,
|
|
||||||
frequency_penalty: modelConfig.frequency_penalty,
|
|
||||||
top_p: modelConfig.top_p,
|
|
||||||
// max_tokens: Math.max(modelConfig.max_tokens, 1024),
|
|
||||||
// Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore.
|
|
||||||
};
|
|
||||||
|
|
||||||
console.log("[Request] openai payload: ", requestPayload);
|
|
||||||
|
|
||||||
const shouldStream = !!options.config.stream;
|
|
||||||
const controller = new AbortController();
|
|
||||||
options.onController?.(controller);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const chatPath = this.path(AI302.ChatPath);
|
|
||||||
const chatPayload = {
|
|
||||||
method: "POST",
|
|
||||||
body: JSON.stringify(requestPayload),
|
|
||||||
signal: controller.signal,
|
|
||||||
headers: getHeaders(),
|
|
||||||
};
|
|
||||||
|
|
||||||
// console.log(chatPayload);
|
|
||||||
|
|
||||||
// Use extended timeout for thinking models as they typically require more processing time
|
|
||||||
const requestTimeoutId = setTimeout(
|
|
||||||
() => controller.abort(),
|
|
||||||
getTimeoutMSByModel(options.config.model),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (shouldStream) {
|
|
||||||
const [tools, funcs] = usePluginStore
|
|
||||||
.getState()
|
|
||||||
.getAsTools(
|
|
||||||
useChatStore.getState().currentSession().mask?.plugin || [],
|
|
||||||
);
|
|
||||||
return streamWithThink(
|
|
||||||
chatPath,
|
|
||||||
requestPayload,
|
|
||||||
getHeaders(),
|
|
||||||
tools as any,
|
|
||||||
funcs,
|
|
||||||
controller,
|
|
||||||
// parseSSE
|
|
||||||
(text: string, runTools: ChatMessageTool[]) => {
|
|
||||||
// console.log("parseSSE", text, runTools);
|
|
||||||
const json = JSON.parse(text);
|
|
||||||
const choices = json.choices as Array<{
|
|
||||||
delta: {
|
|
||||||
content: string | null;
|
|
||||||
tool_calls: ChatMessageTool[];
|
|
||||||
reasoning_content: string | null;
|
|
||||||
};
|
|
||||||
}>;
|
|
||||||
const tool_calls = choices[0]?.delta?.tool_calls;
|
|
||||||
if (tool_calls?.length > 0) {
|
|
||||||
const index = tool_calls[0]?.index;
|
|
||||||
const id = tool_calls[0]?.id;
|
|
||||||
const args = tool_calls[0]?.function?.arguments;
|
|
||||||
if (id) {
|
|
||||||
runTools.push({
|
|
||||||
id,
|
|
||||||
type: tool_calls[0]?.type,
|
|
||||||
function: {
|
|
||||||
name: tool_calls[0]?.function?.name as string,
|
|
||||||
arguments: args,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
// @ts-ignore
|
|
||||||
runTools[index]["function"]["arguments"] += args;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const reasoning = choices[0]?.delta?.reasoning_content;
|
|
||||||
const content = choices[0]?.delta?.content;
|
|
||||||
|
|
||||||
// Skip if both content and reasoning_content are empty or null
|
|
||||||
if (
|
|
||||||
(!reasoning || reasoning.length === 0) &&
|
|
||||||
(!content || content.length === 0)
|
|
||||||
) {
|
|
||||||
return {
|
|
||||||
isThinking: false,
|
|
||||||
content: "",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (reasoning && reasoning.length > 0) {
|
|
||||||
return {
|
|
||||||
isThinking: true,
|
|
||||||
content: reasoning,
|
|
||||||
};
|
|
||||||
} else if (content && content.length > 0) {
|
|
||||||
return {
|
|
||||||
isThinking: false,
|
|
||||||
content: content,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
isThinking: false,
|
|
||||||
content: "",
|
|
||||||
};
|
|
||||||
},
|
|
||||||
// processToolMessage, include tool_calls message and tool call results
|
|
||||||
(
|
|
||||||
requestPayload: RequestPayload,
|
|
||||||
toolCallMessage: any,
|
|
||||||
toolCallResult: any[],
|
|
||||||
) => {
|
|
||||||
// @ts-ignore
|
|
||||||
requestPayload?.messages?.splice(
|
|
||||||
// @ts-ignore
|
|
||||||
requestPayload?.messages?.length,
|
|
||||||
0,
|
|
||||||
toolCallMessage,
|
|
||||||
...toolCallResult,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
options,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
const res = await fetch(chatPath, chatPayload);
|
|
||||||
clearTimeout(requestTimeoutId);
|
|
||||||
|
|
||||||
const resJson = await res.json();
|
|
||||||
const message = this.extractMessage(resJson);
|
|
||||||
options.onFinish(message, res);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.log("[Request] failed to make a chat request", e);
|
|
||||||
options.onError?.(e as Error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
async usage() {
|
|
||||||
return {
|
|
||||||
used: 0,
|
|
||||||
total: 0,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async models(): Promise<LLMModel[]> {
|
|
||||||
if (this.disableListModels) {
|
|
||||||
return DEFAULT_MODELS.slice();
|
|
||||||
}
|
|
||||||
|
|
||||||
const res = await fetch(this.path(AI302.ListModelPath), {
|
|
||||||
method: "GET",
|
|
||||||
headers: {
|
|
||||||
...getHeaders(),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const resJson = (await res.json()) as Ai302ListModelResponse;
|
|
||||||
const chatModels = resJson.data;
|
|
||||||
console.log("[Models]", chatModels);
|
|
||||||
|
|
||||||
if (!chatModels) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
let seq = 1000; //同 Constant.ts 中的排序保持一致
|
|
||||||
return chatModels.map((m) => ({
|
|
||||||
name: m.id,
|
|
||||||
available: true,
|
|
||||||
sorted: seq++,
|
|
||||||
provider: {
|
|
||||||
id: "ai302",
|
|
||||||
providerName: "302.AI",
|
|
||||||
providerType: "ai302",
|
|
||||||
sorted: 15,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
|
@@ -56,7 +56,7 @@ export interface OpenAIListModelResponse {
|
|||||||
|
|
||||||
export interface RequestPayload {
|
export interface RequestPayload {
|
||||||
messages: {
|
messages: {
|
||||||
role: "developer" | "system" | "user" | "assistant";
|
role: "system" | "user" | "assistant";
|
||||||
content: string | MultimodalContent[];
|
content: string | MultimodalContent[];
|
||||||
}[];
|
}[];
|
||||||
stream?: boolean;
|
stream?: boolean;
|
||||||
@@ -238,16 +238,8 @@ export class ChatGPTApi implements LLMApi {
|
|||||||
// Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore.
|
// Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore.
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// O1 使用 max_completion_tokens 控制token数 (https://platform.openai.com/docs/guides/reasoning#controlling-costs)
|
||||||
if (isO1OrO3) {
|
if (isO1OrO3) {
|
||||||
// by default the o1/o3 models will not attempt to produce output that includes markdown formatting
|
|
||||||
// manually add "Formatting re-enabled" developer message to encourage markdown inclusion in model responses
|
|
||||||
// (https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/reasoning?tabs=python-secure#markdown-output)
|
|
||||||
requestPayload["messages"].unshift({
|
|
||||||
role: "developer",
|
|
||||||
content: "Formatting re-enabled",
|
|
||||||
});
|
|
||||||
|
|
||||||
// o1/o3 uses max_completion_tokens to control the number of tokens (https://platform.openai.com/docs/guides/reasoning#controlling-costs)
|
|
||||||
requestPayload["max_completion_tokens"] = modelConfig.max_tokens;
|
requestPayload["max_completion_tokens"] = modelConfig.max_tokens;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -22,11 +22,12 @@ import {
|
|||||||
resumeMcpServer,
|
resumeMcpServer,
|
||||||
} from "../mcp/actions";
|
} from "../mcp/actions";
|
||||||
import {
|
import {
|
||||||
ListToolsResponse,
|
ToolSchema,
|
||||||
McpConfigData,
|
McpConfigData,
|
||||||
PresetServer,
|
PresetServer,
|
||||||
ServerConfig,
|
ServerConfig,
|
||||||
ServerStatusResponse,
|
ServerStatusResponse,
|
||||||
|
isServerStdioConfig,
|
||||||
} from "../mcp/types";
|
} from "../mcp/types";
|
||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
import PlayIcon from "../icons/play.svg";
|
import PlayIcon from "../icons/play.svg";
|
||||||
@@ -46,7 +47,7 @@ export function McpMarketPage() {
|
|||||||
const [searchText, setSearchText] = useState("");
|
const [searchText, setSearchText] = useState("");
|
||||||
const [userConfig, setUserConfig] = useState<Record<string, any>>({});
|
const [userConfig, setUserConfig] = useState<Record<string, any>>({});
|
||||||
const [editingServerId, setEditingServerId] = useState<string | undefined>();
|
const [editingServerId, setEditingServerId] = useState<string | undefined>();
|
||||||
const [tools, setTools] = useState<ListToolsResponse["tools"] | null>(null);
|
const [tools, setTools] = useState<ToolSchema[] | null>(null);
|
||||||
const [viewingServerId, setViewingServerId] = useState<string | undefined>();
|
const [viewingServerId, setViewingServerId] = useState<string | undefined>();
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const [config, setConfig] = useState<McpConfigData>();
|
const [config, setConfig] = useState<McpConfigData>();
|
||||||
@@ -136,7 +137,7 @@ export function McpMarketPage() {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!editingServerId || !config) return;
|
if (!editingServerId || !config) return;
|
||||||
const currentConfig = config.mcpServers[editingServerId];
|
const currentConfig = config.mcpServers[editingServerId];
|
||||||
if (currentConfig) {
|
if (isServerStdioConfig(currentConfig)) {
|
||||||
// 从当前配置中提取用户配置
|
// 从当前配置中提取用户配置
|
||||||
const preset = presetServers.find((s) => s.id === editingServerId);
|
const preset = presetServers.find((s) => s.id === editingServerId);
|
||||||
if (preset?.configSchema) {
|
if (preset?.configSchema) {
|
||||||
@@ -230,7 +231,7 @@ export function McpMarketPage() {
|
|||||||
try {
|
try {
|
||||||
const result = await getClientTools(id);
|
const result = await getClientTools(id);
|
||||||
if (result) {
|
if (result) {
|
||||||
setTools(result);
|
setTools(result?.tools);
|
||||||
} else {
|
} else {
|
||||||
throw new Error("Failed to load tools");
|
throw new Error("Failed to load tools");
|
||||||
}
|
}
|
||||||
@@ -731,17 +732,15 @@ export function McpMarketPage() {
|
|||||||
<div className={styles["tools-list"]}>
|
<div className={styles["tools-list"]}>
|
||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<div>Loading...</div>
|
<div>Loading...</div>
|
||||||
) : tools?.tools ? (
|
) : tools ? (
|
||||||
tools.tools.map(
|
tools.map((tool: ToolSchema, index: number) => (
|
||||||
(tool: ListToolsResponse["tools"], index: number) => (
|
|
||||||
<div key={index} className={styles["tool-item"]}>
|
<div key={index} className={styles["tool-item"]}>
|
||||||
<div className={styles["tool-name"]}>{tool.name}</div>
|
<div className={styles["tool-name"]}>{tool.name}</div>
|
||||||
<div className={styles["tool-description"]}>
|
<div className={styles["tool-description"]}>
|
||||||
{tool.description}
|
{tool.description}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
),
|
))
|
||||||
)
|
|
||||||
) : (
|
) : (
|
||||||
<div>No tools available</div>
|
<div>No tools available</div>
|
||||||
)}
|
)}
|
||||||
|
@@ -75,7 +75,6 @@ import {
|
|||||||
ChatGLM,
|
ChatGLM,
|
||||||
DeepSeek,
|
DeepSeek,
|
||||||
SiliconFlow,
|
SiliconFlow,
|
||||||
AI302,
|
|
||||||
} from "../constant";
|
} from "../constant";
|
||||||
import { Prompt, SearchService, usePromptStore } from "../store/prompt";
|
import { Prompt, SearchService, usePromptStore } from "../store/prompt";
|
||||||
import { ErrorBoundary } from "./error";
|
import { ErrorBoundary } from "./error";
|
||||||
@@ -1459,46 +1458,6 @@ export function Settings() {
|
|||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
||||||
const ai302ConfigComponent = accessStore.provider === ServiceProvider["302.AI"] && (
|
|
||||||
<>
|
|
||||||
<ListItem
|
|
||||||
title={Locale.Settings.Access.AI302.Endpoint.Title}
|
|
||||||
subTitle={
|
|
||||||
Locale.Settings.Access.AI302.Endpoint.SubTitle +
|
|
||||||
AI302.ExampleEndpoint
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-label={Locale.Settings.Access.AI302.Endpoint.Title}
|
|
||||||
type="text"
|
|
||||||
value={accessStore.ai302Url}
|
|
||||||
placeholder={AI302.ExampleEndpoint}
|
|
||||||
onChange={(e) =>
|
|
||||||
accessStore.update(
|
|
||||||
(access) => (access.ai302Url = e.currentTarget.value),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
></input>
|
|
||||||
</ListItem>
|
|
||||||
<ListItem
|
|
||||||
title={Locale.Settings.Access.AI302.ApiKey.Title}
|
|
||||||
subTitle={Locale.Settings.Access.AI302.ApiKey.SubTitle}
|
|
||||||
>
|
|
||||||
<PasswordInput
|
|
||||||
aria-label={Locale.Settings.Access.AI302.ApiKey.Title}
|
|
||||||
value={accessStore.ai302ApiKey}
|
|
||||||
type="text"
|
|
||||||
placeholder={Locale.Settings.Access.AI302.ApiKey.Placeholder}
|
|
||||||
onChange={(e) => {
|
|
||||||
accessStore.update(
|
|
||||||
(access) => (access.ai302ApiKey = e.currentTarget.value),
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</ListItem>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
<div className="window-header" data-tauri-drag-region>
|
<div className="window-header" data-tauri-drag-region>
|
||||||
@@ -1863,7 +1822,6 @@ export function Settings() {
|
|||||||
{XAIConfigComponent}
|
{XAIConfigComponent}
|
||||||
{chatglmConfigComponent}
|
{chatglmConfigComponent}
|
||||||
{siliconflowConfigComponent}
|
{siliconflowConfigComponent}
|
||||||
{ai302ConfigComponent}
|
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
|
@@ -40,6 +40,17 @@ export const getBuildConfig = () => {
|
|||||||
buildMode,
|
buildMode,
|
||||||
isApp,
|
isApp,
|
||||||
template: process.env.DEFAULT_INPUT_TEMPLATE ?? DEFAULT_INPUT_TEMPLATE,
|
template: process.env.DEFAULT_INPUT_TEMPLATE ?? DEFAULT_INPUT_TEMPLATE,
|
||||||
|
|
||||||
|
needCode: !!process.env.CODE,
|
||||||
|
hideUserApiKey: !!process.env.HIDE_USER_API_KEY,
|
||||||
|
baseUrl: process.env.BASE_URL,
|
||||||
|
openaiUrl: process.env.OPENAI_BASE_URL ?? process.env.BASE_URL,
|
||||||
|
disableGPT4: !!process.env.DISABLE_GPT4,
|
||||||
|
useCustomConfig: !!process.env.USE_CUSTOM_CONFIG,
|
||||||
|
hideBalanceQuery: !process.env.ENABLE_BALANCE_QUERY,
|
||||||
|
disableFastLink: !!process.env.DISABLE_FAST_LINK,
|
||||||
|
defaultModel: process.env.DEFAULT_MODEL ?? "",
|
||||||
|
enableMcp: process.env.ENABLE_MCP === "true",
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -88,10 +88,6 @@ declare global {
|
|||||||
SILICONFLOW_URL?: string;
|
SILICONFLOW_URL?: string;
|
||||||
SILICONFLOW_API_KEY?: string;
|
SILICONFLOW_API_KEY?: string;
|
||||||
|
|
||||||
// 302.AI only
|
|
||||||
AI302_URL?: string;
|
|
||||||
AI302_API_KEY?: string;
|
|
||||||
|
|
||||||
// custom template for preprocessing user input
|
// custom template for preprocessing user input
|
||||||
DEFAULT_INPUT_TEMPLATE?: string;
|
DEFAULT_INPUT_TEMPLATE?: string;
|
||||||
|
|
||||||
@@ -167,7 +163,6 @@ export const getServerSideConfig = () => {
|
|||||||
const isXAI = !!process.env.XAI_API_KEY;
|
const isXAI = !!process.env.XAI_API_KEY;
|
||||||
const isChatGLM = !!process.env.CHATGLM_API_KEY;
|
const isChatGLM = !!process.env.CHATGLM_API_KEY;
|
||||||
const isSiliconFlow = !!process.env.SILICONFLOW_API_KEY;
|
const isSiliconFlow = !!process.env.SILICONFLOW_API_KEY;
|
||||||
const isAI302 = !!process.env.AI302_API_KEY;
|
|
||||||
// const apiKeyEnvVar = process.env.OPENAI_API_KEY ?? "";
|
// const apiKeyEnvVar = process.env.OPENAI_API_KEY ?? "";
|
||||||
// const apiKeys = apiKeyEnvVar.split(",").map((v) => v.trim());
|
// const apiKeys = apiKeyEnvVar.split(",").map((v) => v.trim());
|
||||||
// const randomIndex = Math.floor(Math.random() * apiKeys.length);
|
// const randomIndex = Math.floor(Math.random() * apiKeys.length);
|
||||||
@@ -251,10 +246,6 @@ export const getServerSideConfig = () => {
|
|||||||
siliconFlowUrl: process.env.SILICONFLOW_URL,
|
siliconFlowUrl: process.env.SILICONFLOW_URL,
|
||||||
siliconFlowApiKey: getApiKey(process.env.SILICONFLOW_API_KEY),
|
siliconFlowApiKey: getApiKey(process.env.SILICONFLOW_API_KEY),
|
||||||
|
|
||||||
isAI302,
|
|
||||||
ai302Url: process.env.AI302_URL,
|
|
||||||
ai302ApiKey: getApiKey(process.env.AI302_API_KEY),
|
|
||||||
|
|
||||||
gtmId: process.env.GTM_ID,
|
gtmId: process.env.GTM_ID,
|
||||||
gaId: process.env.GA_ID || DEFAULT_GA_ID,
|
gaId: process.env.GA_ID || DEFAULT_GA_ID,
|
||||||
|
|
||||||
|
@@ -36,8 +36,6 @@ export const CHATGLM_BASE_URL = "https://open.bigmodel.cn";
|
|||||||
|
|
||||||
export const SILICONFLOW_BASE_URL = "https://api.siliconflow.cn";
|
export const SILICONFLOW_BASE_URL = "https://api.siliconflow.cn";
|
||||||
|
|
||||||
export const AI302_BASE_URL = "https://api.302.ai";
|
|
||||||
|
|
||||||
export const CACHE_URL_PREFIX = "/api/cache";
|
export const CACHE_URL_PREFIX = "/api/cache";
|
||||||
export const UPLOAD_URL = `${CACHE_URL_PREFIX}/upload`;
|
export const UPLOAD_URL = `${CACHE_URL_PREFIX}/upload`;
|
||||||
|
|
||||||
@@ -74,7 +72,6 @@ export enum ApiPath {
|
|||||||
ChatGLM = "/api/chatglm",
|
ChatGLM = "/api/chatglm",
|
||||||
DeepSeek = "/api/deepseek",
|
DeepSeek = "/api/deepseek",
|
||||||
SiliconFlow = "/api/siliconflow",
|
SiliconFlow = "/api/siliconflow",
|
||||||
"302.AI" = "/api/302ai",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum SlotID {
|
export enum SlotID {
|
||||||
@@ -133,7 +130,6 @@ export enum ServiceProvider {
|
|||||||
ChatGLM = "ChatGLM",
|
ChatGLM = "ChatGLM",
|
||||||
DeepSeek = "DeepSeek",
|
DeepSeek = "DeepSeek",
|
||||||
SiliconFlow = "SiliconFlow",
|
SiliconFlow = "SiliconFlow",
|
||||||
"302.AI" = "302.AI",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Google API safety settings, see https://ai.google.dev/gemini-api/docs/safety-settings
|
// Google API safety settings, see https://ai.google.dev/gemini-api/docs/safety-settings
|
||||||
@@ -160,7 +156,6 @@ export enum ModelProvider {
|
|||||||
ChatGLM = "ChatGLM",
|
ChatGLM = "ChatGLM",
|
||||||
DeepSeek = "DeepSeek",
|
DeepSeek = "DeepSeek",
|
||||||
SiliconFlow = "SiliconFlow",
|
SiliconFlow = "SiliconFlow",
|
||||||
"302.AI" = "302.AI",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Stability = {
|
export const Stability = {
|
||||||
@@ -271,13 +266,6 @@ export const SiliconFlow = {
|
|||||||
ListModelPath: "v1/models?&sub_type=chat",
|
ListModelPath: "v1/models?&sub_type=chat",
|
||||||
};
|
};
|
||||||
|
|
||||||
export const AI302 = {
|
|
||||||
ExampleEndpoint: AI302_BASE_URL,
|
|
||||||
ChatPath: "v1/chat/completions",
|
|
||||||
EmbeddingsPath: "jina/v1/embeddings",
|
|
||||||
ListModelPath: "v1/models?llm=1",
|
|
||||||
};
|
|
||||||
|
|
||||||
export const DEFAULT_INPUT_TEMPLATE = `{{input}}`; // input / time / model / lang
|
export const DEFAULT_INPUT_TEMPLATE = `{{input}}`; // input / time / model / lang
|
||||||
// export const DEFAULT_SYSTEM_TEMPLATE = `
|
// export const DEFAULT_SYSTEM_TEMPLATE = `
|
||||||
// You are ChatGPT, a large language model trained by {{ServiceProvider}}.
|
// You are ChatGPT, a large language model trained by {{ServiceProvider}}.
|
||||||
@@ -535,15 +523,20 @@ const openaiModels = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
const googleModels = [
|
const googleModels = [
|
||||||
|
"gemini-1.0-pro", // Deprecated on 2/15/2025
|
||||||
"gemini-1.5-pro-latest",
|
"gemini-1.5-pro-latest",
|
||||||
"gemini-1.5-pro",
|
"gemini-1.5-pro",
|
||||||
"gemini-1.5-pro-002",
|
"gemini-1.5-pro-002",
|
||||||
|
"gemini-1.5-pro-exp-0827",
|
||||||
"gemini-1.5-flash-latest",
|
"gemini-1.5-flash-latest",
|
||||||
"gemini-1.5-flash-8b-latest",
|
"gemini-1.5-flash-8b-latest",
|
||||||
"gemini-1.5-flash",
|
"gemini-1.5-flash",
|
||||||
"gemini-1.5-flash-8b",
|
"gemini-1.5-flash-8b",
|
||||||
"gemini-1.5-flash-002",
|
"gemini-1.5-flash-002",
|
||||||
|
"gemini-1.5-flash-exp-0827",
|
||||||
"learnlm-1.5-pro-experimental",
|
"learnlm-1.5-pro-experimental",
|
||||||
|
"gemini-exp-1114",
|
||||||
|
"gemini-exp-1121",
|
||||||
"gemini-exp-1206",
|
"gemini-exp-1206",
|
||||||
"gemini-2.0-flash",
|
"gemini-2.0-flash",
|
||||||
"gemini-2.0-flash-exp",
|
"gemini-2.0-flash-exp",
|
||||||
@@ -553,7 +546,6 @@ const googleModels = [
|
|||||||
"gemini-2.0-flash-thinking-exp-01-21",
|
"gemini-2.0-flash-thinking-exp-01-21",
|
||||||
"gemini-2.0-pro-exp",
|
"gemini-2.0-pro-exp",
|
||||||
"gemini-2.0-pro-exp-02-05",
|
"gemini-2.0-pro-exp-02-05",
|
||||||
"gemini-2.5-pro-preview-06-05",
|
|
||||||
];
|
];
|
||||||
|
|
||||||
const anthropicModels = [
|
const anthropicModels = [
|
||||||
@@ -640,18 +632,6 @@ const xAIModes = [
|
|||||||
"grok-2-vision-1212",
|
"grok-2-vision-1212",
|
||||||
"grok-2-vision",
|
"grok-2-vision",
|
||||||
"grok-2-vision-latest",
|
"grok-2-vision-latest",
|
||||||
"grok-3-mini-fast-beta",
|
|
||||||
"grok-3-mini-fast",
|
|
||||||
"grok-3-mini-fast-latest",
|
|
||||||
"grok-3-mini-beta",
|
|
||||||
"grok-3-mini",
|
|
||||||
"grok-3-mini-latest",
|
|
||||||
"grok-3-fast-beta",
|
|
||||||
"grok-3-fast",
|
|
||||||
"grok-3-fast-latest",
|
|
||||||
"grok-3-beta",
|
|
||||||
"grok-3",
|
|
||||||
"grok-3-latest",
|
|
||||||
];
|
];
|
||||||
|
|
||||||
const chatglmModels = [
|
const chatglmModels = [
|
||||||
@@ -691,31 +671,6 @@ const siliconflowModels = [
|
|||||||
"Pro/deepseek-ai/DeepSeek-V3",
|
"Pro/deepseek-ai/DeepSeek-V3",
|
||||||
];
|
];
|
||||||
|
|
||||||
const ai302Models = [
|
|
||||||
"deepseek-chat",
|
|
||||||
"gpt-4o",
|
|
||||||
"chatgpt-4o-latest",
|
|
||||||
"llama3.3-70b",
|
|
||||||
"deepseek-reasoner",
|
|
||||||
"gemini-2.0-flash",
|
|
||||||
"claude-3-7-sonnet-20250219",
|
|
||||||
"claude-3-7-sonnet-latest",
|
|
||||||
"grok-3-beta",
|
|
||||||
"grok-3-mini-beta",
|
|
||||||
"gpt-4.1",
|
|
||||||
"gpt-4.1-mini",
|
|
||||||
"o3",
|
|
||||||
"o4-mini",
|
|
||||||
"qwen3-235b-a22b",
|
|
||||||
"qwen3-32b",
|
|
||||||
"gemini-2.5-pro-preview-05-06",
|
|
||||||
"llama-4-maverick",
|
|
||||||
"gemini-2.5-flash",
|
|
||||||
"claude-sonnet-4-20250514",
|
|
||||||
"claude-opus-4-20250514",
|
|
||||||
"gemini-2.5-pro",
|
|
||||||
];
|
|
||||||
|
|
||||||
let seq = 1000; // 内置的模型序号生成器从1000开始
|
let seq = 1000; // 内置的模型序号生成器从1000开始
|
||||||
export const DEFAULT_MODELS = [
|
export const DEFAULT_MODELS = [
|
||||||
...openaiModels.map((name) => ({
|
...openaiModels.map((name) => ({
|
||||||
@@ -872,17 +827,6 @@ export const DEFAULT_MODELS = [
|
|||||||
sorted: 14,
|
sorted: 14,
|
||||||
},
|
},
|
||||||
})),
|
})),
|
||||||
...ai302Models.map((name) => ({
|
|
||||||
name,
|
|
||||||
available: true,
|
|
||||||
sorted: seq++,
|
|
||||||
provider: {
|
|
||||||
id: "ai302",
|
|
||||||
providerName: "302.AI",
|
|
||||||
providerType: "ai302",
|
|
||||||
sorted: 15,
|
|
||||||
},
|
|
||||||
})),
|
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export const CHAT_PAGE_SIZE = 15;
|
export const CHAT_PAGE_SIZE = 15;
|
||||||
|
@@ -416,17 +416,6 @@ const ar: PartialLocaleType = {
|
|||||||
SubTitle: "مثال:",
|
SubTitle: "مثال:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "مفتاح 302.AI API",
|
|
||||||
SubTitle: "استخدم مفتاح 302.AI API مخصص",
|
|
||||||
Placeholder: "مفتاح 302.AI API",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "عنوان الواجهة",
|
|
||||||
SubTitle: "مثال:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "اسم النموذج المخصص",
|
Title: "اسم النموذج المخصص",
|
||||||
SubTitle: "أضف خيارات نموذج مخصص، مفصولة بفواصل إنجليزية",
|
SubTitle: "أضف خيارات نموذج مخصص، مفصولة بفواصل إنجليزية",
|
||||||
|
@@ -423,17 +423,6 @@ const bn: PartialLocaleType = {
|
|||||||
SubTitle: "উদাহরণ:",
|
SubTitle: "উদাহরণ:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "ইন্টারফেস কী",
|
|
||||||
SubTitle: "স্বনির্ধারিত 302.AI API কী ব্যবহার করুন",
|
|
||||||
Placeholder: "302.AI API কী",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "ইন্টারফেস ঠিকানা",
|
|
||||||
SubTitle: "উদাহরণ:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "স্বনির্ধারিত মডেল নাম",
|
Title: "স্বনির্ধারিত মডেল নাম",
|
||||||
SubTitle:
|
SubTitle:
|
||||||
|
@@ -538,17 +538,6 @@ const cn = {
|
|||||||
Title: "自定义模型名",
|
Title: "自定义模型名",
|
||||||
SubTitle: "增加自定义模型可选项,使用英文逗号隔开",
|
SubTitle: "增加自定义模型可选项,使用英文逗号隔开",
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "接口密钥",
|
|
||||||
SubTitle: "使用自定义302.AI API Key",
|
|
||||||
Placeholder: "302.AI API Key",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "接口地址",
|
|
||||||
SubTitle: "样例:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
Model: "模型 (model)",
|
Model: "模型 (model)",
|
||||||
|
@@ -423,17 +423,6 @@ const cs: PartialLocaleType = {
|
|||||||
SubTitle: "Příklad:",
|
SubTitle: "Příklad:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "Rozhraní klíč",
|
|
||||||
SubTitle: "Použijte vlastní 302.AI API Key",
|
|
||||||
Placeholder: "302.AI API Key",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Adresa rozhraní",
|
|
||||||
SubTitle: "Příklad:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Vlastní názvy modelů",
|
Title: "Vlastní názvy modelů",
|
||||||
SubTitle: "Přidejte možnosti vlastních modelů, oddělené čárkami",
|
SubTitle: "Přidejte možnosti vlastních modelů, oddělené čárkami",
|
||||||
|
@@ -517,17 +517,6 @@ const da: PartialLocaleType = {
|
|||||||
SubTitle: "Vælg et niveau for indholdskontrol",
|
SubTitle: "Vælg et niveau for indholdskontrol",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "302.AI API Key",
|
|
||||||
SubTitle: "Brug en custom 302.AI API Key",
|
|
||||||
Placeholder: "302.AI API Key",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Endpoint-adresse",
|
|
||||||
SubTitle: "Eksempel: ",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
Model: "Model",
|
Model: "Model",
|
||||||
CompressModel: {
|
CompressModel: {
|
||||||
|
@@ -434,17 +434,6 @@ const de: PartialLocaleType = {
|
|||||||
SubTitle: "Beispiel:",
|
SubTitle: "Beispiel:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "Schnittstellenschlüssel",
|
|
||||||
SubTitle: "Verwenden Sie einen benutzerdefinierten 302.AI API-Schlüssel",
|
|
||||||
Placeholder: "302.AI API-Schlüssel",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Endpunktadresse",
|
|
||||||
SubTitle: "Beispiel:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Benutzerdefinierter Modellname",
|
Title: "Benutzerdefinierter Modellname",
|
||||||
SubTitle:
|
SubTitle:
|
||||||
|
@@ -543,17 +543,6 @@ const en: LocaleType = {
|
|||||||
SubTitle: "Select a safety filtering level",
|
SubTitle: "Select a safety filtering level",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "302.AI API Key",
|
|
||||||
SubTitle: "Use a custom 302.AI API Key",
|
|
||||||
Placeholder: "302.AI API Key",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Endpoint Address",
|
|
||||||
SubTitle: "Example: ",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
Model: "Model",
|
Model: "Model",
|
||||||
|
@@ -436,17 +436,6 @@ const es: PartialLocaleType = {
|
|||||||
SubTitle: "Ejemplo:",
|
SubTitle: "Ejemplo:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "Clave de interfaz",
|
|
||||||
SubTitle: "Usa una clave API de 302.AI personalizada",
|
|
||||||
Placeholder: "Clave API de 302.AI",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Dirección del endpoint",
|
|
||||||
SubTitle: "Ejemplo:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Nombre del modelo personalizado",
|
Title: "Nombre del modelo personalizado",
|
||||||
SubTitle:
|
SubTitle:
|
||||||
|
@@ -435,17 +435,6 @@ const fr: PartialLocaleType = {
|
|||||||
SubTitle: "Exemple :",
|
SubTitle: "Exemple :",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "Clé d'interface",
|
|
||||||
SubTitle: "Utiliser une clé API 302.AI personnalisée",
|
|
||||||
Placeholder: "Clé API 302.AI",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Adresse de l'endpoint",
|
|
||||||
SubTitle: "Exemple :",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Nom du modèle personnalisé",
|
Title: "Nom du modèle personnalisé",
|
||||||
SubTitle:
|
SubTitle:
|
||||||
|
@@ -424,17 +424,6 @@ const id: PartialLocaleType = {
|
|||||||
SubTitle: "Contoh:",
|
SubTitle: "Contoh:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "Kunci Antarmuka",
|
|
||||||
SubTitle: "Gunakan 302.AI API Key kustom",
|
|
||||||
Placeholder: "302.AI API Key",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Alamat Antarmuka",
|
|
||||||
SubTitle: "Contoh:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Nama Model Kustom",
|
Title: "Nama Model Kustom",
|
||||||
SubTitle: "Tambahkan opsi model kustom, pisahkan dengan koma",
|
SubTitle: "Tambahkan opsi model kustom, pisahkan dengan koma",
|
||||||
|
@@ -436,17 +436,6 @@ const it: PartialLocaleType = {
|
|||||||
SubTitle: "Esempio:",
|
SubTitle: "Esempio:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "Chiave dell'interfaccia",
|
|
||||||
SubTitle: "Utilizza una chiave API 302.AI personalizzata",
|
|
||||||
Placeholder: "Chiave API 302.AI",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Indirizzo dell'interfaccia",
|
|
||||||
SubTitle: "Esempio:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Nome del modello personalizzato",
|
Title: "Nome del modello personalizzato",
|
||||||
SubTitle:
|
SubTitle:
|
||||||
|
@@ -420,17 +420,6 @@ const jp: PartialLocaleType = {
|
|||||||
SubTitle: "例:",
|
SubTitle: "例:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "APIキー",
|
|
||||||
SubTitle: "カスタム302.AI APIキーを使用",
|
|
||||||
Placeholder: "302.AI APIキー",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "エンドポイント",
|
|
||||||
SubTitle: "例:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "カスタムモデル名",
|
Title: "カスタムモデル名",
|
||||||
SubTitle: "カスタムモデルの選択肢を追加、英語のカンマで区切る",
|
SubTitle: "カスタムモデルの選択肢を追加、英語のカンマで区切る",
|
||||||
|
@@ -421,17 +421,6 @@ const ko: PartialLocaleType = {
|
|||||||
Title: "커스텀 모델 이름",
|
Title: "커스텀 모델 이름",
|
||||||
SubTitle: "커스텀 모델 옵션 추가, 영어 쉼표로 구분",
|
SubTitle: "커스텀 모델 옵션 추가, 영어 쉼표로 구분",
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "엔드포인트 키",
|
|
||||||
SubTitle: "커스텀 302.AI API 키 사용",
|
|
||||||
Placeholder: "302.AI API 키",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "엔드포인트 주소",
|
|
||||||
SubTitle: "예: ",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
Model: "모델 (model)",
|
Model: "모델 (model)",
|
||||||
|
@@ -433,17 +433,6 @@ const no: PartialLocaleType = {
|
|||||||
Title: "Egendefinert modellnavn",
|
Title: "Egendefinert modellnavn",
|
||||||
SubTitle: "Legg til egendefinerte modellalternativer, skill med komma",
|
SubTitle: "Legg til egendefinerte modellalternativer, skill med komma",
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "API-nøkkel",
|
|
||||||
SubTitle: "Bruk egendefinert 302.AI API-nøkkel",
|
|
||||||
Placeholder: "302.AI API-nøkkel",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "API-adresse",
|
|
||||||
SubTitle: "Eksempel:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
Model: "Modell",
|
Model: "Modell",
|
||||||
|
@@ -359,17 +359,6 @@ const pt: PartialLocaleType = {
|
|||||||
SubTitle: "Verifique sua versão API do console Anthropic",
|
SubTitle: "Verifique sua versão API do console Anthropic",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "Chave API 302.AI",
|
|
||||||
SubTitle: "Use uma chave API 302.AI personalizada",
|
|
||||||
Placeholder: "302.AI API Key",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Endpoint Address",
|
|
||||||
SubTitle: "Exemplo: ",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Modelos Personalizados",
|
Title: "Modelos Personalizados",
|
||||||
SubTitle: "Opções de modelo personalizado, separados por vírgula",
|
SubTitle: "Opções de modelo personalizado, separados por vírgula",
|
||||||
|
@@ -426,17 +426,6 @@ const ru: PartialLocaleType = {
|
|||||||
SubTitle: "Пример:",
|
SubTitle: "Пример:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "Ключ интерфейса",
|
|
||||||
SubTitle: "Использовать пользовательский 302.AI API-ключ",
|
|
||||||
Placeholder: "302.AI API-ключ",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Адрес интерфейса",
|
|
||||||
SubTitle: "Пример:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Название пользовательской модели",
|
Title: "Название пользовательской модели",
|
||||||
SubTitle:
|
SubTitle:
|
||||||
|
@@ -381,17 +381,6 @@ const sk: PartialLocaleType = {
|
|||||||
SubTitle: "Vyberte špecifickú verziu časti",
|
SubTitle: "Vyberte špecifickú verziu časti",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "API kľúč",
|
|
||||||
SubTitle: "Použiť vlastný API kľúč 302.AI",
|
|
||||||
Placeholder: "302.AI API kľúč",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Adresa koncového bodu",
|
|
||||||
SubTitle: "Príklad:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
Model: "Model",
|
Model: "Model",
|
||||||
|
@@ -426,17 +426,6 @@ const tr: PartialLocaleType = {
|
|||||||
SubTitle: "Örnek:",
|
SubTitle: "Örnek:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "API Anahtarı",
|
|
||||||
SubTitle: "Özelleştirilmiş 302.AI API Anahtarı kullanın",
|
|
||||||
Placeholder: "302.AI API Anahtarı",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "API Adresi",
|
|
||||||
SubTitle: "Örnek:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Özelleştirilmiş Model Adı",
|
Title: "Özelleştirilmiş Model Adı",
|
||||||
SubTitle:
|
SubTitle:
|
||||||
|
@@ -382,17 +382,6 @@ const tw = {
|
|||||||
SubTitle: "選擇一個特定的 API 版本",
|
SubTitle: "選擇一個特定的 API 版本",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "API 金鑰",
|
|
||||||
SubTitle: "使用自訂 302.AI API 金鑰",
|
|
||||||
Placeholder: "302.AI API 金鑰",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "端點位址",
|
|
||||||
SubTitle: "範例:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "自訂模型名稱",
|
Title: "自訂模型名稱",
|
||||||
SubTitle: "增加自訂模型可選擇項目,使用英文逗號隔開",
|
SubTitle: "增加自訂模型可選擇項目,使用英文逗號隔開",
|
||||||
|
@@ -422,17 +422,6 @@ const vi: PartialLocaleType = {
|
|||||||
SubTitle: "Ví dụ:",
|
SubTitle: "Ví dụ:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
AI302: {
|
|
||||||
ApiKey: {
|
|
||||||
Title: "Khóa API 302.AI",
|
|
||||||
SubTitle: "Sử dụng khóa API 302.AI tùy chỉnh",
|
|
||||||
Placeholder: "302.AI API Key",
|
|
||||||
},
|
|
||||||
Endpoint: {
|
|
||||||
Title: "Địa chỉ giao diện",
|
|
||||||
SubTitle: "Ví dụ:",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
CustomModel: {
|
CustomModel: {
|
||||||
Title: "Tên mô hình tùy chỉnh",
|
Title: "Tên mô hình tùy chỉnh",
|
||||||
SubTitle:
|
SubTitle:
|
||||||
|
491
app/mcp/actions.base.ts
Normal file
491
app/mcp/actions.base.ts
Normal file
@@ -0,0 +1,491 @@
|
|||||||
|
import {
|
||||||
|
createClient,
|
||||||
|
executeRequest,
|
||||||
|
listTools,
|
||||||
|
removeClient,
|
||||||
|
} from "./client";
|
||||||
|
import { MCPClientLogger } from "./logger";
|
||||||
|
import {
|
||||||
|
DEFAULT_MCP_CONFIG,
|
||||||
|
McpClientData,
|
||||||
|
McpConfigData,
|
||||||
|
McpRequestMessage,
|
||||||
|
ServerConfig,
|
||||||
|
ServerStatusResponse,
|
||||||
|
} from "./types";
|
||||||
|
|
||||||
|
const JSON_INDENT = 2;
|
||||||
|
|
||||||
|
const logger = new MCPClientLogger("MCP Actions");
|
||||||
|
|
||||||
|
const getConfigPath = async () => {
|
||||||
|
if (EXPORT_MODE) {
|
||||||
|
return "/mcp/config.json";
|
||||||
|
} else {
|
||||||
|
const path = await import("path");
|
||||||
|
return path.join(process.cwd(), "app/mcp/mcp_config.json");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
class ClientsMap extends Map<string, McpClientData> {
|
||||||
|
toolToClientMap: Map<string, string>;
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
this.toolToClientMap = new Map<string, string>();
|
||||||
|
}
|
||||||
|
|
||||||
|
set(clientId: string, data: McpClientData): this {
|
||||||
|
super.set(clientId, data);
|
||||||
|
|
||||||
|
if (data?.tools?.tools) {
|
||||||
|
for (const tool of data.tools.tools) {
|
||||||
|
if (tool.name) {
|
||||||
|
this.toolToClientMap.set(tool.name, clientId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.purgeToolMappings(clientId);
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
delete(clientId: string): boolean {
|
||||||
|
const ret = clientsMap.delete(clientId);
|
||||||
|
this.purgeToolMappings(clientId);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
clear(): void {
|
||||||
|
super.clear();
|
||||||
|
this.toolToClientMap.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
getByToolName(toolName: string) {
|
||||||
|
const toolClientId = clientsMap.toolToClientMap.get(toolName);
|
||||||
|
if (toolClientId) {
|
||||||
|
return clientsMap.get(toolClientId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private purgeToolMappings(clientId: string) {
|
||||||
|
for (const [tool, mappedId] of this.toolToClientMap.entries()) {
|
||||||
|
if (mappedId === clientId) {
|
||||||
|
this.toolToClientMap.delete(tool);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const clientsMap = new ClientsMap();
|
||||||
|
|
||||||
|
// 获取客户端状态
|
||||||
|
export async function getClientsStatus(): Promise<
|
||||||
|
Record<string, ServerStatusResponse>
|
||||||
|
> {
|
||||||
|
const config = await getMcpConfigFromFile();
|
||||||
|
const result: Record<string, ServerStatusResponse> = {};
|
||||||
|
|
||||||
|
for (const clientId of Object.keys(config.mcpServers)) {
|
||||||
|
const status = clientsMap.get(clientId);
|
||||||
|
const serverConfig = config.mcpServers[clientId];
|
||||||
|
|
||||||
|
if (!serverConfig) {
|
||||||
|
result[clientId] = { status: "undefined", errorMsg: null };
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (serverConfig.status === "paused") {
|
||||||
|
result[clientId] = { status: "paused", errorMsg: null };
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!status) {
|
||||||
|
result[clientId] = { status: "undefined", errorMsg: null };
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
status.client === null &&
|
||||||
|
status.tools === null &&
|
||||||
|
status.errorMsg === null
|
||||||
|
) {
|
||||||
|
result[clientId] = { status: "initializing", errorMsg: null };
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status.errorMsg) {
|
||||||
|
result[clientId] = { status: "error", errorMsg: status.errorMsg };
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status.client) {
|
||||||
|
result[clientId] = { status: "active", errorMsg: null };
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
result[clientId] = { status: "error", errorMsg: "Client not found" };
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取客户端工具
|
||||||
|
export async function getClientTools(clientId: string) {
|
||||||
|
return clientsMap.get(clientId)?.tools ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取可用客户端数量
|
||||||
|
export async function getAvailableClientsCount() {
|
||||||
|
let count = 0;
|
||||||
|
clientsMap.forEach((map) => !map.errorMsg && count++);
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取所有客户端工具
|
||||||
|
export async function getAllTools() {
|
||||||
|
const result = [];
|
||||||
|
for (const [clientId, status] of clientsMap.entries()) {
|
||||||
|
result.push({
|
||||||
|
clientId,
|
||||||
|
tools: status.tools,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化单个客户端
|
||||||
|
async function initializeSingleClient(
|
||||||
|
clientId: string,
|
||||||
|
serverConfig: ServerConfig,
|
||||||
|
) {
|
||||||
|
// 如果服务器状态是暂停,则不初始化
|
||||||
|
if (serverConfig.status === "paused") {
|
||||||
|
logger.info(`Skipping initialization for paused client [${clientId}]`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info(`Initializing client [${clientId}]...`);
|
||||||
|
|
||||||
|
// 先设置初始化状态
|
||||||
|
clientsMap.set(clientId, {
|
||||||
|
client: null,
|
||||||
|
tools: null,
|
||||||
|
errorMsg: null, // null 表示正在初始化
|
||||||
|
});
|
||||||
|
|
||||||
|
// 异步初始化
|
||||||
|
createClient(clientId, serverConfig)
|
||||||
|
.then(async (client) => {
|
||||||
|
const tools = await listTools(client);
|
||||||
|
logger.info(
|
||||||
|
`Supported tools for [${clientId}]: ${JSON.stringify(tools, null, 2)}`,
|
||||||
|
);
|
||||||
|
clientsMap.set(clientId, { client, tools, errorMsg: null });
|
||||||
|
logger.success(`Client [${clientId}] initialized successfully`);
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
clientsMap.set(clientId, {
|
||||||
|
client: null,
|
||||||
|
tools: null,
|
||||||
|
errorMsg: error instanceof Error ? error.message : String(error),
|
||||||
|
});
|
||||||
|
logger.error(`Failed to initialize client [${clientId}]: ${error}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化系统
|
||||||
|
export async function initializeMcpSystem() {
|
||||||
|
logger.info("MCP Actions starting...");
|
||||||
|
try {
|
||||||
|
// 检查是否已有活跃的客户端
|
||||||
|
if (clientsMap.size > 0) {
|
||||||
|
logger.info("MCP system already initialized, skipping...");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = await getMcpConfigFromFile();
|
||||||
|
// 初始化所有客户端
|
||||||
|
for (const [clientId, serverConfig] of Object.entries(config.mcpServers)) {
|
||||||
|
await initializeSingleClient(clientId, serverConfig);
|
||||||
|
}
|
||||||
|
return config;
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to initialize MCP system: ${error}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 添加服务器
|
||||||
|
export async function addMcpServer(clientId: string, config: ServerConfig) {
|
||||||
|
try {
|
||||||
|
const currentConfig = await getMcpConfigFromFile();
|
||||||
|
const isNewServer = !(clientId in currentConfig.mcpServers);
|
||||||
|
|
||||||
|
// 如果是新服务器,设置默认状态为 active
|
||||||
|
if (isNewServer && !config.status) {
|
||||||
|
config.status = "active";
|
||||||
|
}
|
||||||
|
|
||||||
|
const newConfig = {
|
||||||
|
...currentConfig,
|
||||||
|
mcpServers: {
|
||||||
|
...currentConfig.mcpServers,
|
||||||
|
[clientId]: config,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
await updateMcpConfig(newConfig);
|
||||||
|
|
||||||
|
// 只有新服务器或状态为 active 的服务器才初始化
|
||||||
|
if (isNewServer || config.status === "active") {
|
||||||
|
await initializeSingleClient(clientId, config);
|
||||||
|
}
|
||||||
|
|
||||||
|
return newConfig;
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to add server [${clientId}]: ${error}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 暂停服务器
|
||||||
|
export async function pauseMcpServer(clientId: string) {
|
||||||
|
try {
|
||||||
|
const currentConfig = await getMcpConfigFromFile();
|
||||||
|
const serverConfig = currentConfig.mcpServers[clientId];
|
||||||
|
if (!serverConfig) {
|
||||||
|
throw new Error(`Server ${clientId} not found`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 先更新配置
|
||||||
|
const newConfig: McpConfigData = {
|
||||||
|
...currentConfig,
|
||||||
|
mcpServers: {
|
||||||
|
...currentConfig.mcpServers,
|
||||||
|
[clientId]: {
|
||||||
|
...serverConfig,
|
||||||
|
status: "paused",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
await updateMcpConfig(newConfig);
|
||||||
|
|
||||||
|
// 然后关闭客户端
|
||||||
|
const client = clientsMap.get(clientId);
|
||||||
|
if (client?.client) {
|
||||||
|
await removeClient(client.client);
|
||||||
|
}
|
||||||
|
clientsMap.delete(clientId);
|
||||||
|
|
||||||
|
return newConfig;
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to pause server [${clientId}]: ${error}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 恢复服务器
|
||||||
|
export async function resumeMcpServer(clientId: string): Promise<void> {
|
||||||
|
try {
|
||||||
|
const currentConfig = await getMcpConfigFromFile();
|
||||||
|
const serverConfig = currentConfig.mcpServers[clientId];
|
||||||
|
if (!serverConfig) {
|
||||||
|
throw new Error(`Server ${clientId} not found`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 先尝试初始化客户端
|
||||||
|
logger.info(`Trying to initialize client [${clientId}]...`);
|
||||||
|
try {
|
||||||
|
const client = await createClient(clientId, serverConfig);
|
||||||
|
const tools = await listTools(client);
|
||||||
|
clientsMap.set(clientId, { client, tools, errorMsg: null });
|
||||||
|
logger.success(`Client [${clientId}] initialized successfully`);
|
||||||
|
|
||||||
|
// 初始化成功后更新配置
|
||||||
|
const newConfig: McpConfigData = {
|
||||||
|
...currentConfig,
|
||||||
|
mcpServers: {
|
||||||
|
...currentConfig.mcpServers,
|
||||||
|
[clientId]: {
|
||||||
|
...serverConfig,
|
||||||
|
status: "active" as const,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
await updateMcpConfig(newConfig);
|
||||||
|
} catch (error) {
|
||||||
|
const currentConfig = await getMcpConfigFromFile();
|
||||||
|
const serverConfig = currentConfig.mcpServers[clientId];
|
||||||
|
|
||||||
|
// 如果配置中存在该服务器,则更新其状态为 error
|
||||||
|
if (serverConfig) {
|
||||||
|
serverConfig.status = "error";
|
||||||
|
await updateMcpConfig(currentConfig);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化失败
|
||||||
|
clientsMap.set(clientId, {
|
||||||
|
client: null,
|
||||||
|
tools: null,
|
||||||
|
errorMsg: error instanceof Error ? error.message : String(error),
|
||||||
|
});
|
||||||
|
logger.error(`Failed to initialize client [${clientId}]: ${error}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to resume server [${clientId}]: ${error}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 移除服务器
|
||||||
|
export async function removeMcpServer(clientId: string) {
|
||||||
|
try {
|
||||||
|
const currentConfig = await getMcpConfigFromFile();
|
||||||
|
const { [clientId]: _, ...rest } = currentConfig.mcpServers;
|
||||||
|
const newConfig = {
|
||||||
|
...currentConfig,
|
||||||
|
mcpServers: rest,
|
||||||
|
};
|
||||||
|
await updateMcpConfig(newConfig);
|
||||||
|
|
||||||
|
// 关闭并移除客户端
|
||||||
|
const client = clientsMap.get(clientId);
|
||||||
|
if (client?.client) {
|
||||||
|
await removeClient(client.client);
|
||||||
|
}
|
||||||
|
clientsMap.delete(clientId);
|
||||||
|
|
||||||
|
return newConfig;
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to remove server [${clientId}]: ${error}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 重启所有客户端
|
||||||
|
export async function restartAllClients() {
|
||||||
|
logger.info("Restarting all clients...");
|
||||||
|
try {
|
||||||
|
// 关闭所有客户端
|
||||||
|
for (const client of clientsMap.values()) {
|
||||||
|
if (client.client) {
|
||||||
|
await removeClient(client.client);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 清空状态
|
||||||
|
clientsMap.clear();
|
||||||
|
|
||||||
|
// 重新初始化
|
||||||
|
const config = await getMcpConfigFromFile();
|
||||||
|
for (const [clientId, serverConfig] of Object.entries(config.mcpServers)) {
|
||||||
|
await initializeSingleClient(clientId, serverConfig);
|
||||||
|
}
|
||||||
|
return config;
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to restart clients: ${error}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 执行 MCP 请求
|
||||||
|
export async function executeMcpAction(
|
||||||
|
clientId: string,
|
||||||
|
request: McpRequestMessage,
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
let client = clientsMap.get(clientId);
|
||||||
|
if (
|
||||||
|
!client &&
|
||||||
|
request.params?.name &&
|
||||||
|
typeof request.params.name === "string"
|
||||||
|
) {
|
||||||
|
client = clientsMap.getByToolName(request.params.name);
|
||||||
|
}
|
||||||
|
if (!client?.client) {
|
||||||
|
throw new Error(`Client ${clientId} not found`);
|
||||||
|
}
|
||||||
|
logger.info(`Executing request for [${clientId}]`);
|
||||||
|
return await executeRequest(client.client, request);
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to execute request for [${clientId}]: ${error}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取 MCP 配置文件
|
||||||
|
export async function getMcpConfigFromFile(): Promise<McpConfigData> {
|
||||||
|
try {
|
||||||
|
if (EXPORT_MODE) {
|
||||||
|
const res = await fetch(await getConfigPath());
|
||||||
|
const config: McpConfigData = await res.json();
|
||||||
|
const storage = localStorage;
|
||||||
|
const storedConfig_str = storage.getItem("McpConfig");
|
||||||
|
if (storedConfig_str) {
|
||||||
|
const storedConfig: McpConfigData = JSON.parse(storedConfig_str);
|
||||||
|
// Create a merged configuration that combines both sources
|
||||||
|
const merged = { ...config.mcpServers };
|
||||||
|
if (storedConfig.mcpServers) {
|
||||||
|
// Ensure we process all servers from stored config
|
||||||
|
for (const id in storedConfig.mcpServers) {
|
||||||
|
merged[id] = { ...merged[id], ...storedConfig.mcpServers[id] };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
config.mcpServers = merged;
|
||||||
|
}
|
||||||
|
return config;
|
||||||
|
} else {
|
||||||
|
const fs = await import("fs/promises");
|
||||||
|
const configStr = await fs.readFile(await getConfigPath(), "utf-8");
|
||||||
|
return JSON.parse(configStr);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to load MCP config, using default config: ${error}`);
|
||||||
|
return DEFAULT_MCP_CONFIG;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 更新 MCP 配置文件
|
||||||
|
async function updateMcpConfig(config: McpConfigData): Promise<void> {
|
||||||
|
if (EXPORT_MODE) {
|
||||||
|
try {
|
||||||
|
const storage = localStorage;
|
||||||
|
storage.setItem("McpConfig", JSON.stringify(config));
|
||||||
|
} catch (storageError) {
|
||||||
|
logger.warn(`Failed to save MCP config to localStorage: ${storageError}`);
|
||||||
|
// Continue execution without storage
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const fs = await import("fs/promises");
|
||||||
|
const path = await import("path");
|
||||||
|
// 确保目录存在
|
||||||
|
await fs.mkdir(path.dirname(await getConfigPath()), { recursive: true });
|
||||||
|
await fs.writeFile(
|
||||||
|
await getConfigPath(),
|
||||||
|
JSON.stringify(config, null, JSON_INDENT),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查 MCP 是否启用
|
||||||
|
export async function isMcpEnabled() {
|
||||||
|
try {
|
||||||
|
const config = await getMcpConfigFromFile();
|
||||||
|
if (typeof config.enableMcp === "boolean") {
|
||||||
|
return config.enableMcp;
|
||||||
|
}
|
||||||
|
if (EXPORT_MODE) {
|
||||||
|
const { getClientConfig } = await import("../config/client");
|
||||||
|
const clientConfig = getClientConfig();
|
||||||
|
return clientConfig?.enableMcp === true;
|
||||||
|
} else {
|
||||||
|
const { getServerSideConfig } = await import("../config/server");
|
||||||
|
const serverConfig = getServerSideConfig();
|
||||||
|
return serverConfig.enableMcp;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to check MCP status: ${error}`);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
1
app/mcp/actions.client.ts
Normal file
1
app/mcp/actions.client.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export * from "./actions.base";
|
2
app/mcp/actions.server.ts
Normal file
2
app/mcp/actions.server.ts
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
"use server";
|
||||||
|
export * from "./actions.base";
|
@@ -1,385 +1,56 @@
|
|||||||
"use server";
|
import { McpRequestMessage, ServerConfig } from "./types";
|
||||||
import {
|
|
||||||
createClient,
|
|
||||||
executeRequest,
|
|
||||||
listTools,
|
|
||||||
removeClient,
|
|
||||||
} from "./client";
|
|
||||||
import { MCPClientLogger } from "./logger";
|
|
||||||
import {
|
|
||||||
DEFAULT_MCP_CONFIG,
|
|
||||||
McpClientData,
|
|
||||||
McpConfigData,
|
|
||||||
McpRequestMessage,
|
|
||||||
ServerConfig,
|
|
||||||
ServerStatusResponse,
|
|
||||||
} from "./types";
|
|
||||||
import fs from "fs/promises";
|
|
||||||
import path from "path";
|
|
||||||
import { getServerSideConfig } from "../config/server";
|
|
||||||
|
|
||||||
const logger = new MCPClientLogger("MCP Actions");
|
let actionsHost: typeof import("./actions.base") | undefined;
|
||||||
const CONFIG_PATH = path.join(process.cwd(), "app/mcp/mcp_config.json");
|
|
||||||
|
|
||||||
const clientsMap = new Map<string, McpClientData>();
|
const actions = async () => {
|
||||||
|
if (!actionsHost) {
|
||||||
// 获取客户端状态
|
if (EXPORT_MODE) {
|
||||||
export async function getClientsStatus(): Promise<
|
actionsHost = await import("./actions.client");
|
||||||
Record<string, ServerStatusResponse>
|
} else {
|
||||||
> {
|
actionsHost = await import("./actions.server");
|
||||||
const config = await getMcpConfigFromFile();
|
|
||||||
const result: Record<string, ServerStatusResponse> = {};
|
|
||||||
|
|
||||||
for (const clientId of Object.keys(config.mcpServers)) {
|
|
||||||
const status = clientsMap.get(clientId);
|
|
||||||
const serverConfig = config.mcpServers[clientId];
|
|
||||||
|
|
||||||
if (!serverConfig) {
|
|
||||||
result[clientId] = { status: "undefined", errorMsg: null };
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (serverConfig.status === "paused") {
|
|
||||||
result[clientId] = { status: "paused", errorMsg: null };
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!status) {
|
|
||||||
result[clientId] = { status: "undefined", errorMsg: null };
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
status.client === null &&
|
|
||||||
status.tools === null &&
|
|
||||||
status.errorMsg === null
|
|
||||||
) {
|
|
||||||
result[clientId] = { status: "initializing", errorMsg: null };
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status.errorMsg) {
|
|
||||||
result[clientId] = { status: "error", errorMsg: status.errorMsg };
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status.client) {
|
|
||||||
result[clientId] = { status: "active", errorMsg: null };
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
result[clientId] = { status: "error", errorMsg: "Client not found" };
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取客户端工具
|
|
||||||
export async function getClientTools(clientId: string) {
|
|
||||||
return clientsMap.get(clientId)?.tools ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取可用客户端数量
|
|
||||||
export async function getAvailableClientsCount() {
|
|
||||||
let count = 0;
|
|
||||||
clientsMap.forEach((map) => !map.errorMsg && count++);
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取所有客户端工具
|
|
||||||
export async function getAllTools() {
|
|
||||||
const result = [];
|
|
||||||
for (const [clientId, status] of clientsMap.entries()) {
|
|
||||||
result.push({
|
|
||||||
clientId,
|
|
||||||
tools: status.tools,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 初始化单个客户端
|
|
||||||
async function initializeSingleClient(
|
|
||||||
clientId: string,
|
|
||||||
serverConfig: ServerConfig,
|
|
||||||
) {
|
|
||||||
// 如果服务器状态是暂停,则不初始化
|
|
||||||
if (serverConfig.status === "paused") {
|
|
||||||
logger.info(`Skipping initialization for paused client [${clientId}]`);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(`Initializing client [${clientId}]...`);
|
|
||||||
|
|
||||||
// 先设置初始化状态
|
|
||||||
clientsMap.set(clientId, {
|
|
||||||
client: null,
|
|
||||||
tools: null,
|
|
||||||
errorMsg: null, // null 表示正在初始化
|
|
||||||
});
|
|
||||||
|
|
||||||
// 异步初始化
|
|
||||||
createClient(clientId, serverConfig)
|
|
||||||
.then(async (client) => {
|
|
||||||
const tools = await listTools(client);
|
|
||||||
logger.info(
|
|
||||||
`Supported tools for [${clientId}]: ${JSON.stringify(tools, null, 2)}`,
|
|
||||||
);
|
|
||||||
clientsMap.set(clientId, { client, tools, errorMsg: null });
|
|
||||||
logger.success(`Client [${clientId}] initialized successfully`);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
clientsMap.set(clientId, {
|
|
||||||
client: null,
|
|
||||||
tools: null,
|
|
||||||
errorMsg: error instanceof Error ? error.message : String(error),
|
|
||||||
});
|
|
||||||
logger.error(`Failed to initialize client [${clientId}]: ${error}`);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// 初始化系统
|
|
||||||
export async function initializeMcpSystem() {
|
|
||||||
logger.info("MCP Actions starting...");
|
|
||||||
try {
|
|
||||||
// 检查是否已有活跃的客户端
|
|
||||||
if (clientsMap.size > 0) {
|
|
||||||
logger.info("MCP system already initialized, skipping...");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const config = await getMcpConfigFromFile();
|
|
||||||
// 初始化所有客户端
|
|
||||||
for (const [clientId, serverConfig] of Object.entries(config.mcpServers)) {
|
|
||||||
await initializeSingleClient(clientId, serverConfig);
|
|
||||||
}
|
|
||||||
return config;
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to initialize MCP system: ${error}`);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 添加服务器
|
|
||||||
export async function addMcpServer(clientId: string, config: ServerConfig) {
|
|
||||||
try {
|
|
||||||
const currentConfig = await getMcpConfigFromFile();
|
|
||||||
const isNewServer = !(clientId in currentConfig.mcpServers);
|
|
||||||
|
|
||||||
// 如果是新服务器,设置默认状态为 active
|
|
||||||
if (isNewServer && !config.status) {
|
|
||||||
config.status = "active";
|
|
||||||
}
|
|
||||||
|
|
||||||
const newConfig = {
|
|
||||||
...currentConfig,
|
|
||||||
mcpServers: {
|
|
||||||
...currentConfig.mcpServers,
|
|
||||||
[clientId]: config,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
await updateMcpConfig(newConfig);
|
|
||||||
|
|
||||||
// 只有新服务器或状态为 active 的服务器才初始化
|
|
||||||
if (isNewServer || config.status === "active") {
|
|
||||||
await initializeSingleClient(clientId, config);
|
|
||||||
}
|
|
||||||
|
|
||||||
return newConfig;
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to add server [${clientId}]: ${error}`);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 暂停服务器
|
|
||||||
export async function pauseMcpServer(clientId: string) {
|
|
||||||
try {
|
|
||||||
const currentConfig = await getMcpConfigFromFile();
|
|
||||||
const serverConfig = currentConfig.mcpServers[clientId];
|
|
||||||
if (!serverConfig) {
|
|
||||||
throw new Error(`Server ${clientId} not found`);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 先更新配置
|
|
||||||
const newConfig: McpConfigData = {
|
|
||||||
...currentConfig,
|
|
||||||
mcpServers: {
|
|
||||||
...currentConfig.mcpServers,
|
|
||||||
[clientId]: {
|
|
||||||
...serverConfig,
|
|
||||||
status: "paused",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
await updateMcpConfig(newConfig);
|
|
||||||
|
|
||||||
// 然后关闭客户端
|
|
||||||
const client = clientsMap.get(clientId);
|
|
||||||
if (client?.client) {
|
|
||||||
await removeClient(client.client);
|
|
||||||
}
|
|
||||||
clientsMap.delete(clientId);
|
|
||||||
|
|
||||||
return newConfig;
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to pause server [${clientId}]: ${error}`);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 恢复服务器
|
|
||||||
export async function resumeMcpServer(clientId: string): Promise<void> {
|
|
||||||
try {
|
|
||||||
const currentConfig = await getMcpConfigFromFile();
|
|
||||||
const serverConfig = currentConfig.mcpServers[clientId];
|
|
||||||
if (!serverConfig) {
|
|
||||||
throw new Error(`Server ${clientId} not found`);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 先尝试初始化客户端
|
|
||||||
logger.info(`Trying to initialize client [${clientId}]...`);
|
|
||||||
try {
|
|
||||||
const client = await createClient(clientId, serverConfig);
|
|
||||||
const tools = await listTools(client);
|
|
||||||
clientsMap.set(clientId, { client, tools, errorMsg: null });
|
|
||||||
logger.success(`Client [${clientId}] initialized successfully`);
|
|
||||||
|
|
||||||
// 初始化成功后更新配置
|
|
||||||
const newConfig: McpConfigData = {
|
|
||||||
...currentConfig,
|
|
||||||
mcpServers: {
|
|
||||||
...currentConfig.mcpServers,
|
|
||||||
[clientId]: {
|
|
||||||
...serverConfig,
|
|
||||||
status: "active" as const,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
await updateMcpConfig(newConfig);
|
|
||||||
} catch (error) {
|
|
||||||
const currentConfig = await getMcpConfigFromFile();
|
|
||||||
const serverConfig = currentConfig.mcpServers[clientId];
|
|
||||||
|
|
||||||
// 如果配置中存在该服务器,则更新其状态为 error
|
|
||||||
if (serverConfig) {
|
|
||||||
serverConfig.status = "error";
|
|
||||||
await updateMcpConfig(currentConfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 初始化失败
|
|
||||||
clientsMap.set(clientId, {
|
|
||||||
client: null,
|
|
||||||
tools: null,
|
|
||||||
errorMsg: error instanceof Error ? error.message : String(error),
|
|
||||||
});
|
|
||||||
logger.error(`Failed to initialize client [${clientId}]: ${error}`);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to resume server [${clientId}]: ${error}`);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 移除服务器
|
|
||||||
export async function removeMcpServer(clientId: string) {
|
|
||||||
try {
|
|
||||||
const currentConfig = await getMcpConfigFromFile();
|
|
||||||
const { [clientId]: _, ...rest } = currentConfig.mcpServers;
|
|
||||||
const newConfig = {
|
|
||||||
...currentConfig,
|
|
||||||
mcpServers: rest,
|
|
||||||
};
|
|
||||||
await updateMcpConfig(newConfig);
|
|
||||||
|
|
||||||
// 关闭并移除客户端
|
|
||||||
const client = clientsMap.get(clientId);
|
|
||||||
if (client?.client) {
|
|
||||||
await removeClient(client.client);
|
|
||||||
}
|
|
||||||
clientsMap.delete(clientId);
|
|
||||||
|
|
||||||
return newConfig;
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to remove server [${clientId}]: ${error}`);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 重启所有客户端
|
|
||||||
export async function restartAllClients() {
|
|
||||||
logger.info("Restarting all clients...");
|
|
||||||
try {
|
|
||||||
// 关闭所有客户端
|
|
||||||
for (const client of clientsMap.values()) {
|
|
||||||
if (client.client) {
|
|
||||||
await removeClient(client.client);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 清空状态
|
return actionsHost;
|
||||||
clientsMap.clear();
|
};
|
||||||
|
|
||||||
// 重新初始化
|
export const getAvailableClientsCount = async () => {
|
||||||
const config = await getMcpConfigFromFile();
|
return (await actions()).getAvailableClientsCount();
|
||||||
for (const [clientId, serverConfig] of Object.entries(config.mcpServers)) {
|
};
|
||||||
await initializeSingleClient(clientId, serverConfig);
|
export const isMcpEnabled = async () => {
|
||||||
}
|
return (await actions()).isMcpEnabled();
|
||||||
return config;
|
};
|
||||||
} catch (error) {
|
export const initializeMcpSystem = async () => {
|
||||||
logger.error(`Failed to restart clients: ${error}`);
|
return (await actions()).initializeMcpSystem();
|
||||||
throw error;
|
};
|
||||||
}
|
export const addMcpServer = async (clientId: string, config: ServerConfig) => {
|
||||||
}
|
return (await actions()).addMcpServer(clientId, config);
|
||||||
|
};
|
||||||
|
|
||||||
// 执行 MCP 请求
|
export const getClientsStatus = async () => {
|
||||||
export async function executeMcpAction(
|
return (await actions()).getClientsStatus();
|
||||||
|
};
|
||||||
|
export const getClientTools = async (clientId: string) => {
|
||||||
|
return (await actions()).getClientTools(clientId);
|
||||||
|
};
|
||||||
|
export const getMcpConfigFromFile = async () => {
|
||||||
|
return (await actions()).getMcpConfigFromFile();
|
||||||
|
};
|
||||||
|
export const pauseMcpServer = async (clientId: string) => {
|
||||||
|
return (await actions()).pauseMcpServer(clientId);
|
||||||
|
};
|
||||||
|
export const restartAllClients = async () => {
|
||||||
|
return (await actions()).restartAllClients();
|
||||||
|
};
|
||||||
|
export const resumeMcpServer = async (clientId: string) => {
|
||||||
|
return (await actions()).resumeMcpServer(clientId);
|
||||||
|
};
|
||||||
|
export const executeMcpAction = async (
|
||||||
clientId: string,
|
clientId: string,
|
||||||
request: McpRequestMessage,
|
request: McpRequestMessage,
|
||||||
) {
|
) => {
|
||||||
try {
|
return (await actions()).executeMcpAction(clientId, request);
|
||||||
const client = clientsMap.get(clientId);
|
};
|
||||||
if (!client?.client) {
|
export const getAllTools = async () => {
|
||||||
throw new Error(`Client ${clientId} not found`);
|
return (await actions()).getAllTools();
|
||||||
}
|
};
|
||||||
logger.info(`Executing request for [${clientId}]`);
|
|
||||||
return await executeRequest(client.client, request);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to execute request for [${clientId}]: ${error}`);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取 MCP 配置文件
|
|
||||||
export async function getMcpConfigFromFile(): Promise<McpConfigData> {
|
|
||||||
try {
|
|
||||||
const configStr = await fs.readFile(CONFIG_PATH, "utf-8");
|
|
||||||
return JSON.parse(configStr);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to load MCP config, using default config: ${error}`);
|
|
||||||
return DEFAULT_MCP_CONFIG;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 更新 MCP 配置文件
|
|
||||||
async function updateMcpConfig(config: McpConfigData): Promise<void> {
|
|
||||||
try {
|
|
||||||
// 确保目录存在
|
|
||||||
await fs.mkdir(path.dirname(CONFIG_PATH), { recursive: true });
|
|
||||||
await fs.writeFile(CONFIG_PATH, JSON.stringify(config, null, 2));
|
|
||||||
} catch (error) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查 MCP 是否启用
|
|
||||||
export async function isMcpEnabled() {
|
|
||||||
try {
|
|
||||||
const serverConfig = getServerSideConfig();
|
|
||||||
return serverConfig.enableMcp;
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to check MCP status: ${error}`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -1,7 +1,11 @@
|
|||||||
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
||||||
import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
|
|
||||||
import { MCPClientLogger } from "./logger";
|
import { MCPClientLogger } from "./logger";
|
||||||
import { ListToolsResponse, McpRequestMessage, ServerConfig } from "./types";
|
import {
|
||||||
|
ListToolsResponse,
|
||||||
|
McpRequestMessage,
|
||||||
|
ServerConfig,
|
||||||
|
isServerSseConfig,
|
||||||
|
} from "./types";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
const logger = new MCPClientLogger();
|
const logger = new MCPClientLogger();
|
||||||
@@ -12,7 +16,23 @@ export async function createClient(
|
|||||||
): Promise<Client> {
|
): Promise<Client> {
|
||||||
logger.info(`Creating client for ${id}...`);
|
logger.info(`Creating client for ${id}...`);
|
||||||
|
|
||||||
const transport = new StdioClientTransport({
|
let transport;
|
||||||
|
|
||||||
|
if (isServerSseConfig(config)) {
|
||||||
|
const { SSEClientTransport } = await import(
|
||||||
|
"@modelcontextprotocol/sdk/client/sse.js"
|
||||||
|
);
|
||||||
|
transport = new SSEClientTransport(new URL(config.url));
|
||||||
|
} else {
|
||||||
|
if (EXPORT_MODE) {
|
||||||
|
throw new Error(
|
||||||
|
"Cannot use stdio transport in export mode. Please use SSE transport configuration instead.",
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
const { StdioClientTransport } = await import(
|
||||||
|
"@modelcontextprotocol/sdk/client/stdio.js"
|
||||||
|
);
|
||||||
|
transport = new StdioClientTransport({
|
||||||
command: config.command,
|
command: config.command,
|
||||||
args: config.args,
|
args: config.args,
|
||||||
env: {
|
env: {
|
||||||
@@ -24,6 +44,8 @@ export async function createClient(
|
|||||||
...(config.env || {}),
|
...(config.env || {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const client = new Client(
|
const client = new Client(
|
||||||
{
|
{
|
||||||
|
@@ -8,6 +8,7 @@ export interface McpRequestMessage {
|
|||||||
id?: string | number;
|
id?: string | number;
|
||||||
method: "tools/call" | string;
|
method: "tools/call" | string;
|
||||||
params?: {
|
params?: {
|
||||||
|
name?: string;
|
||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -65,12 +66,14 @@ export const McpNotificationsSchema: z.ZodType<McpNotifications> = z.object({
|
|||||||
// Next Chat
|
// Next Chat
|
||||||
////////////
|
////////////
|
||||||
export interface ListToolsResponse {
|
export interface ListToolsResponse {
|
||||||
tools: {
|
tools: ToolSchema[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ToolSchema {
|
||||||
name?: string;
|
name?: string;
|
||||||
description?: string;
|
description?: string;
|
||||||
inputSchema?: object;
|
inputSchema?: object;
|
||||||
[key: string]: any;
|
[key: string]: any;
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export type McpClientData =
|
export type McpClientData =
|
||||||
@@ -110,14 +113,31 @@ export interface ServerStatusResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// MCP 服务器配置相关类型
|
// MCP 服务器配置相关类型
|
||||||
export interface ServerConfig {
|
|
||||||
|
export const isServerSseConfig = (c?: ServerConfig): c is ServerSseConfig =>
|
||||||
|
c !== null && typeof c === "object" && c.type === "sse";
|
||||||
|
export const isServerStdioConfig = (c?: ServerConfig): c is ServerStdioConfig =>
|
||||||
|
c !== null && typeof c === "object" && (!c.type || c.type === "stdio");
|
||||||
|
|
||||||
|
export type ServerConfig = ServerStdioConfig | ServerSseConfig;
|
||||||
|
|
||||||
|
export interface ServerStdioConfig {
|
||||||
|
type?: "stdio";
|
||||||
command: string;
|
command: string;
|
||||||
args: string[];
|
args: string[];
|
||||||
env?: Record<string, string>;
|
env?: Record<string, string>;
|
||||||
status?: "active" | "paused" | "error";
|
status?: "active" | "paused" | "error";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ServerSseConfig {
|
||||||
|
type: "sse";
|
||||||
|
url: string;
|
||||||
|
headers?: Record<string, string>;
|
||||||
|
status?: "active" | "paused" | "error";
|
||||||
|
}
|
||||||
|
|
||||||
export interface McpConfigData {
|
export interface McpConfigData {
|
||||||
|
enableMcp?: boolean;
|
||||||
// MCP Server 的配置
|
// MCP Server 的配置
|
||||||
mcpServers: Record<string, ServerConfig>;
|
mcpServers: Record<string, ServerConfig>;
|
||||||
}
|
}
|
||||||
|
@@ -17,7 +17,6 @@ import {
|
|||||||
XAI_BASE_URL,
|
XAI_BASE_URL,
|
||||||
CHATGLM_BASE_URL,
|
CHATGLM_BASE_URL,
|
||||||
SILICONFLOW_BASE_URL,
|
SILICONFLOW_BASE_URL,
|
||||||
AI302_BASE_URL,
|
|
||||||
} from "../constant";
|
} from "../constant";
|
||||||
import { getHeaders } from "../client/api";
|
import { getHeaders } from "../client/api";
|
||||||
import { getClientConfig } from "../config/client";
|
import { getClientConfig } from "../config/client";
|
||||||
@@ -60,8 +59,6 @@ const DEFAULT_SILICONFLOW_URL = isApp
|
|||||||
? SILICONFLOW_BASE_URL
|
? SILICONFLOW_BASE_URL
|
||||||
: ApiPath.SiliconFlow;
|
: ApiPath.SiliconFlow;
|
||||||
|
|
||||||
const DEFAULT_AI302_URL = isApp ? AI302_BASE_URL : ApiPath["302.AI"];
|
|
||||||
|
|
||||||
const DEFAULT_ACCESS_STATE = {
|
const DEFAULT_ACCESS_STATE = {
|
||||||
accessCode: "",
|
accessCode: "",
|
||||||
useCustomConfig: false,
|
useCustomConfig: false,
|
||||||
@@ -135,10 +132,6 @@ const DEFAULT_ACCESS_STATE = {
|
|||||||
siliconflowUrl: DEFAULT_SILICONFLOW_URL,
|
siliconflowUrl: DEFAULT_SILICONFLOW_URL,
|
||||||
siliconflowApiKey: "",
|
siliconflowApiKey: "",
|
||||||
|
|
||||||
// 302.AI
|
|
||||||
ai302Url: DEFAULT_AI302_URL,
|
|
||||||
ai302ApiKey: "",
|
|
||||||
|
|
||||||
// server config
|
// server config
|
||||||
needCode: true,
|
needCode: true,
|
||||||
hideUserApiKey: false,
|
hideUserApiKey: false,
|
||||||
@@ -250,7 +243,12 @@ export const useAccessStore = createPersistStore(
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
fetch() {
|
fetch() {
|
||||||
if (fetchState > 0 || getClientConfig()?.buildMode === "export") return;
|
const clientConfig = getClientConfig();
|
||||||
|
if (!(fetchState > 0) && clientConfig?.buildMode === "export") {
|
||||||
|
set(clientConfig);
|
||||||
|
fetchState = 2;
|
||||||
|
}
|
||||||
|
if (fetchState > 0 || clientConfig?.buildMode === "export") return;
|
||||||
fetchState = 1;
|
fetchState = 1;
|
||||||
fetch("/api/config", {
|
fetch("/api/config", {
|
||||||
method: "post",
|
method: "post",
|
||||||
|
@@ -1,3 +1,7 @@
|
|||||||
|
declare global {
|
||||||
|
const EXPORT_MODE: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
export type Updater<T> = (updater: (value: T) => void) => void;
|
export type Updater<T> = (updater: (value: T) => void) => void;
|
||||||
|
|
||||||
export const ROLES = ["system", "user", "assistant"] as const;
|
export const ROLES = ["system", "user", "assistant"] as const;
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 82 KiB |
Binary file not shown.
Before Width: | Height: | Size: 84 KiB |
Binary file not shown.
Before Width: | Height: | Size: 76 KiB |
@@ -6,9 +6,15 @@ console.log("[Next] build mode", mode);
|
|||||||
const disableChunk = !!process.env.DISABLE_CHUNK || mode === "export";
|
const disableChunk = !!process.env.DISABLE_CHUNK || mode === "export";
|
||||||
console.log("[Next] build with chunk: ", !disableChunk);
|
console.log("[Next] build with chunk: ", !disableChunk);
|
||||||
|
|
||||||
|
const EXPORT_MODE = mode === "export";
|
||||||
|
|
||||||
|
|
||||||
/** @type {import('next').NextConfig} */
|
/** @type {import('next').NextConfig} */
|
||||||
const nextConfig = {
|
const nextConfig = {
|
||||||
webpack(config) {
|
webpack(config) {
|
||||||
|
config.plugins.push(new webpack.DefinePlugin({
|
||||||
|
EXPORT_MODE: EXPORT_MODE
|
||||||
|
}));
|
||||||
config.module.rules.push({
|
config.module.rules.push({
|
||||||
test: /\.svg$/,
|
test: /\.svg$/,
|
||||||
use: ["@svgr/webpack"],
|
use: ["@svgr/webpack"],
|
||||||
|
12
yarn.lock
12
yarn.lock
@@ -3077,9 +3077,9 @@ camelcase@^6.2.0:
|
|||||||
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
|
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
|
||||||
|
|
||||||
caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001503, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001646:
|
caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001503, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001646:
|
||||||
version "1.0.30001724"
|
version "1.0.30001692"
|
||||||
resolved "https://mirrors.huaweicloud.com/repository/npm/caniuse-lite/-/caniuse-lite-1.0.30001724.tgz"
|
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz"
|
||||||
integrity sha512-WqJo7p0TbHDOythNTqYujmaJTvtYRZrjpP8TCvH6Vb9CYJerJNKamKzIWOM4BkQatWj9H2lYulpdAQNBe7QhNA==
|
integrity sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==
|
||||||
|
|
||||||
ccount@^2.0.0:
|
ccount@^2.0.0:
|
||||||
version "2.0.1"
|
version "2.0.1"
|
||||||
@@ -4334,14 +4334,14 @@ eslint-plugin-react@^7.31.7:
|
|||||||
|
|
||||||
eslint-plugin-unused-imports@^3.2.0:
|
eslint-plugin-unused-imports@^3.2.0:
|
||||||
version "3.2.0"
|
version "3.2.0"
|
||||||
resolved "https://mirrors.huaweicloud.com/repository/npm/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz#63a98c9ad5f622cd9f830f70bc77739f25ccfe0d"
|
resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz#63a98c9ad5f622cd9f830f70bc77739f25ccfe0d"
|
||||||
integrity sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==
|
integrity sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
eslint-rule-composer "^0.3.0"
|
eslint-rule-composer "^0.3.0"
|
||||||
|
|
||||||
eslint-rule-composer@^0.3.0:
|
eslint-rule-composer@^0.3.0:
|
||||||
version "0.3.0"
|
version "0.3.0"
|
||||||
resolved "https://mirrors.huaweicloud.com/repository/npm/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
|
resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
|
||||||
integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
|
integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
|
||||||
|
|
||||||
eslint-scope@5.1.1:
|
eslint-scope@5.1.1:
|
||||||
@@ -8156,7 +8156,7 @@ typed-array-length@^1.0.4:
|
|||||||
|
|
||||||
typescript@5.2.2:
|
typescript@5.2.2:
|
||||||
version "5.2.2"
|
version "5.2.2"
|
||||||
resolved "https://mirrors.huaweicloud.com/repository/npm/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
|
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
|
||||||
integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
|
integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
|
||||||
|
|
||||||
unbox-primitive@^1.0.2:
|
unbox-primitive@^1.0.2:
|
||||||
|
Reference in New Issue
Block a user