refactor: init orpc contract (#30885)

Co-authored-by: yyh <yuanyouhuilyz@gmail.com>

web/app/components/plugins/marketplace/utils.ts

@@ -4,14 +4,12 @@ import type {
   MarketplaceCollection,
   PluginsSearchParams,
 } from '@/app/components/plugins/marketplace/types'
-import type { Plugin, PluginsFromMarketplaceResponse } from '@/app/components/plugins/types'
+import type { Plugin } from '@/app/components/plugins/types'
 import { PluginCategoryEnum } from '@/app/components/plugins/types'
 import {
-  APP_VERSION,
-  IS_MARKETPLACE,
   MARKETPLACE_API_PREFIX,
 } from '@/config'
-import { postMarketplace } from '@/service/base'
+import { marketplaceClient } from '@/service/client'
 import { getMarketplaceUrl } from '@/utils/var'
 import { PLUGIN_TYPE_SEARCH_MAP } from './constants'
 
@@ -19,10 +17,6 @@ type MarketplaceFetchOptions = {
   signal?: AbortSignal
 }
 
-const getMarketplaceHeaders = () => new Headers({
-  'X-Dify-Version': !IS_MARKETPLACE ? APP_VERSION : '999.0.0',
-})
-
 export const getPluginIconInMarketplace = (plugin: Plugin) => {
   if (plugin.type === 'bundle')
     return `${MARKETPLACE_API_PREFIX}/bundles/${plugin.org}/${plugin.name}/icon`
@@ -65,24 +59,15 @@ export const getMarketplacePluginsByCollectionId = async (
   let plugins: Plugin[] = []
 
   try {
-    const url = `${MARKETPLACE_API_PREFIX}/collections/${collectionId}/plugins`
-    const headers = getMarketplaceHeaders()
-    const marketplaceCollectionPluginsData = await globalThis.fetch(
-      url,
-      {
-        cache: 'no-store',
-        method: 'POST',
-        headers,
-        signal: options?.signal,
-        body: JSON.stringify({
-          category: query?.category,
-          exclude: query?.exclude,
-          type: query?.type,
-        }),
+    const marketplaceCollectionPluginsDataJson = await marketplaceClient.collectionPlugins({
+      params: {
+        collectionId,
       },
-    )
-    const marketplaceCollectionPluginsDataJson = await marketplaceCollectionPluginsData.json()
-    plugins = (marketplaceCollectionPluginsDataJson.data.plugins || []).map((plugin: Plugin) => getFormattedPlugin(plugin))
+      body: query,
+    }, {
+      signal: options?.signal,
+    })
+    plugins = (marketplaceCollectionPluginsDataJson.data?.plugins || []).map(plugin => getFormattedPlugin(plugin))
   }
   // eslint-disable-next-line unused-imports/no-unused-vars
   catch (e) {
@@ -99,22 +84,16 @@ export const getMarketplaceCollectionsAndPlugins = async (
   let marketplaceCollections: MarketplaceCollection[] = []
   let marketplaceCollectionPluginsMap: Record<string, Plugin[]> = {}
   try {
-    let marketplaceUrl = `${MARKETPLACE_API_PREFIX}/collections?page=1&page_size=100`
-    if (query?.condition)
-      marketplaceUrl += `&condition=${query.condition}`
-    if (query?.type)
-      marketplaceUrl += `&type=${query.type}`
-    const headers = getMarketplaceHeaders()
-    const marketplaceCollectionsData = await globalThis.fetch(
-      marketplaceUrl,
-      {
-        headers,
-        cache: 'no-store',
-        signal: options?.signal,
+    const marketplaceCollectionsDataJson = await marketplaceClient.collections({
+      query: {
+        ...query,
+        page: 1,
+        page_size: 100,
       },
-    )
-    const marketplaceCollectionsDataJson = await marketplaceCollectionsData.json()
-    marketplaceCollections = marketplaceCollectionsDataJson.data.collections || []
+    }, {
+      signal: options?.signal,
+    })
+    marketplaceCollections = marketplaceCollectionsDataJson.data?.collections || []
     await Promise.all(marketplaceCollections.map(async (collection: MarketplaceCollection) => {
       const plugins = await getMarketplacePluginsByCollectionId(collection.name, query, options)
 
@@ -143,42 +122,42 @@ export const getMarketplacePlugins = async (
       plugins: [] as Plugin[],
       total: 0,
       page: 1,
-      pageSize: 40,
+      page_size: 40,
     }
   }
 
   const {
     query,
-    sortBy,
-    sortOrder,
+    sort_by,
+    sort_order,
     category,
     tags,
     type,
-    pageSize = 40,
+    page_size = 40,
   } = queryParams
-  const pluginOrBundle = type === 'bundle' ? 'bundles' : 'plugins'
 
   try {
-    const res = await postMarketplace<{ data: PluginsFromMarketplaceResponse }>(`/${pluginOrBundle}/search/advanced`, {
+    const res = await marketplaceClient.searchAdvanced({
+      params: {
+        kind: type === 'bundle' ? 'bundles' : 'plugins',
+      },
       body: {
         page: pageParam,
-        page_size: pageSize,
+        page_size,
         query,
-        sort_by: sortBy,
-        sort_order: sortOrder,
+        sort_by,
+        sort_order,
         category: category !== 'all' ? category : '',
         tags,
-        type,
       },
-      signal,
-    })
+    }, { signal })
     const resPlugins = res.data.bundles || res.data.plugins || []
 
     return {
       plugins: resPlugins.map(plugin => getFormattedPlugin(plugin)),
       total: res.data.total,
       page: pageParam,
-      pageSize,
+      page_size,
     }
   }
   catch {
@@ -186,7 +165,7 @@ export const getMarketplacePlugins = async (
       plugins: [],
       total: 0,
       page: pageParam,
-      pageSize,
+      page_size,
     }
   }
 }