Revert "Merge pull request 'feat: write oap mcp in local mcp config instead of using oap api' (#170) from oap_remove into main"

This reverts commit 7863a57, reversing
changes made to 5d6d960.

Author: ckaznable

electron/main/ipc/oap.ts

@@ -34,10 +34,6 @@ export function ipcOapHandler(_win: BrowserWindow) {
     return await oapClient.applyMCPServer(ids)
   })
 
-  ipcMain.handle("oap:getMCPServerConfig", async (_, ids: string[]) => {
-    return await oapClient.getMCPServerConfig(ids)
-  })
-
   ipcMain.handle("oap:getMCPTags", async () => {
     return await oapClient.getMCPTags()
   })

electron/main/oap.ts

@@ -185,13 +185,6 @@ class OAPClient {
     })
   }
 
-  getMCPServerConfig(ids: string[]) {
-    return this.fetch<ApiResponse<OAPMCPServer>>("/api/v1/user/mcp/batch", {
-      method: "POST",
-      body: JSON.stringify({ "mcp_ids": ids }),
-    })
-  }
-
   getMe() {
     return this.fetch<ApiResponse<OAPUser>>("/api/v1/user/me")
   }

electron/preload/index.ts

@@ -82,7 +82,6 @@ contextBridge.exposeInMainWorld("ipcRenderer", {
   oapSearchMCPServer: (params: MCPServerSearchParam) => ipcRenderer.invoke("oap:searchMCPServer", params),
   oapModelDescription: (params?: OAPModelDescriptionParam) => ipcRenderer.invoke("oap:modelDescription", params),
   oapApplyMCPServer: (ids: string[]) => ipcRenderer.invoke("oap:applyMCPServer", ids),
-  oapGetMCPServerConfig: (ids: string[]) => ipcRenderer.invoke("oap:getMCPServerConfig", ids),
   oapGetMCPServers: () => ipcRenderer.invoke("oap:getMCPServers"),
   oapGetMe: () => ipcRenderer.invoke("oap:getMe"),
   oapGetUsage: () => ipcRenderer.invoke("oap:getUsage"),

src-tauri/src/command/oap.rs

@@ -45,14 +45,6 @@ pub async fn oap_apply_mcp_server(
     state.apply_mcp_server(ids).await.map_err(|e| e.to_string())
 }
 
-#[tauri::command]
-pub async fn oap_get_mcp_server_config(
-    state: tauri::State<'_, Arc<OAPState>>,
-    ids: Vec<String>,
-) -> Result<serde_json::Value, String> {
-    state.get_mcp_server_config(ids).await.map_err(|e| e.to_string())
-}
-
 #[tauri::command]
 pub async fn oap_get_me(
     state: tauri::State<'_, Arc<OAPState>>,

src-tauri/src/lib.rs

@@ -196,7 +196,6 @@ pub fn run() {
             command::oap::oap_get_mcp_servers,
             command::oap::oap_search_mcp_server,
             command::oap::oap_apply_mcp_server,
-            command::oap::oap_get_mcp_server_config,
             command::oap::oap_get_me,
             command::oap::oap_get_usage,
             command::oap::open_oap_login_page,

src-tauri/src/oap.rs

@@ -201,13 +201,6 @@ impl OAPAPIClient {
         Ok(res)
     }
 
-    pub async fn get_mcp_server_config(&self, id: Vec<String>) -> Result<Value> {
-        let url = self.build_url("/api/v1/user/mcp/batch");
-        let body = serde_json::json!({ "mcp_ids": id });
-        let res = self.fetch(self.client.post(url).json(&body)).await?;
-        Ok(res)
-    }
-
     pub async fn get_me(&self) -> Result<Value> {
         self.get_me_with_token(None).await
     }

src/atoms/oapState.ts

@@ -1,7 +1,6 @@
 import { atom } from "jotai"
-import { oapGetUsage, oapLimiterCheck, oapLogout } from "../ipc"
+import { oapGetMCPServers, oapGetUsage, oapLimiterCheck, oapLogout } from "../ipc"
 import type { OAPMCPServer, OAPUsage, OAPUser } from "../../types/oap"
-import { mcpConfigAtom } from "./toolState"
 
 export const oapUserAtom = atom<OAPUser | null>(null)
 export const oapUsageAtom = atom<OAPUsage | null>(null)
@@ -46,25 +45,15 @@ export const isOAPProAtom = atom((get) => {
   return OAPLevel === "PRO"
 })
 
-//OAP Tool is from local MCP config if extraData.oap.id exists
 export const loadOapToolsAtom = atom(null, async (get, set) => {
-  const mcpConfig = get(mcpConfigAtom)
-  const oapData = Object.entries(mcpConfig.mcpServers)
-    .filter(([_key, mcpServer]) => (mcpServer.extraData?.oap as Record<string, unknown> | undefined)?.id)
-    .map(([key, val]) => {
-      const oap = val.extraData?.oap as Record<string, unknown> | undefined
-      return {
-        id: (oap?.id as string) ?? "",
-        name: key,
-        plan: (oap?.plan as string) ?? val.plan ?? "",
-        description: val.description ?? "",
-        tags: (oap?.tags as string[]) ?? [],
-        transport: (oap?.transport as string) ?? "",
-        url: (oap?.url as string) ?? "",
-        headers: (oap?.headers as Record<string, string>) ?? null,
-      }
-    })
-  set(oapToolsAtom, oapData)
+  if(!get(isLoggedInOAPAtom)) {
+    set(oapToolsAtom, [])
+    return
+  }
+  const oapData = await oapGetMCPServers()
+  if (oapData.status === "success") {
+    set(oapToolsAtom, oapData.data)
+  }
   return oapData
 })
 

src/atoms/toolState.ts

@@ -11,7 +11,6 @@ export interface MCP {
   env?: Record<string, unknown>
   exclude_tools?: string[]
   command?: string
-  extraData?: Record<string, unknown>
 }
 
 export interface MCPConfig {
@@ -39,7 +38,6 @@ export interface Tool {
   has_credential?: boolean
   command?: string
   commandExists?: boolean
-  extraData?: Record<string, any>
 }
 
 export const toolsAtom = atom<Tool[]>([])

src/ipc/oap.ts

@@ -67,14 +67,6 @@ export function oapApplyMCPServer(ids: string[]): Promise<void> {
     return invoke("oap_apply_mcp_server", { ids })
 }
 
-export function oapGetMCPServerConfig(ids: string[]): Promise<any> {
-    if (isElectron) {
-        return window.ipcRenderer.oapGetMCPServerConfig(ids)
-    }
-
-    return invoke("oap_get_mcp_server_config", { ids })
-}
-
 export function oapGetMCPServers(): Promise<ApiResponse<OAPMCPServer[]>> {
     if (isElectron) {
         return window.ipcRenderer.oapGetMCPServers()

src/views/Overlay/Tools/Popup/OAPServerList.tsx

@@ -12,7 +12,7 @@ import { useAtom, useAtomValue, useSetAtom } from "jotai"
 import { isOAPProAtom } from "../../../../atoms/oapState"
 import Tooltip from "../../../../components/Tooltip"
 import { OAP_ROOT_URL } from "../../../../../shared/oap"
-import { imgPrefix, oapGetMCPServerConfig, oapGetMCPTags, oapSearchMCPServer } from "../../../../ipc"
+import { imgPrefix, oapApplyMCPServer, oapGetMCPTags, oapSearchMCPServer } from "../../../../ipc"
 import InfoTooltip from "../../../../components/InfoTooltip"
 import ReactMarkdown from "react-markdown"
 import rehypeRaw from "rehype-raw"
@@ -24,7 +24,6 @@ import remarkGfm from "remark-gfm"
 import { showToastAtom } from "../../../../atoms/toastState"
 import Button from "../../../../components/Button"
 import { openUrl } from "../../../../ipc/util"
-import { createPortal } from "react-dom"
 
 const SearchHightLight = memo(({ text, searchText }: { text: string, searchText: string }) => {
   if (searchText === "") {
@@ -66,7 +65,7 @@ const OAPServerList = ({
   onCancel,
 }: {
   oapTools: { id: string, name: string }[]
-  onConfirm: (selectedOap: Array<any>) => void
+  onConfirm: () => void
   onCancel: () => void
 }) => {
   const oriOapToolsRef = useRef(JSON.parse(JSON.stringify(oapTools)))
@@ -83,7 +82,6 @@ const OAPServerList = ({
   const isInitRef = useRef(false)
   const isFetchingRef = useRef(true)
   const isFetchingNextPageRef = useRef(false)
-  const [isLoading, setIsLoading] = useState(false)
   const [searchText, setSearchText] = useState<string>("")
   const [toolList, setToolList] = useState<ToolItem[]>([])
   const [sort, setSort] = useState("popular")
@@ -311,17 +309,14 @@ const OAPServerList = ({
     if (isSubmitting) {
       return
     }
-    setHighCostList({})
     setIsSubmitting(true)
-    setIsLoading(true)
     const selectedServers = Array.from(
       new Set(oapTools.map(tool => tool.id))
     )
-    const res = await oapGetMCPServerConfig(selectedServers)
-    await onConfirm(res?.data)
-    onCancel()
+    await oapApplyMCPServer(selectedServers)
     setIsSubmitting(false)
-    setIsLoading(false)
+    onConfirm()
+    onCancel()
   }
 
   const handleBannerUrl = (url: string) => {
@@ -733,14 +728,6 @@ const OAPServerList = ({
           </div>
         </PopupConfirm>
       }
-
-      {isLoading && (
-        createPortal(
-          <div className="global-loading-overlay">
-            <div className="loading-spinner"></div>
-          </div>,
-          document.body
-      ))}
     </>
   )
 }