Merge branch 'feat/plugins' into dev/plugin-deploy

langgenius · Dec 4, 2024 · 44989ae · 44989ae
2 parents 9fc0e65 + 0ac5e53
commit 44989ae
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 17 deletions.
diff --git a/web/app/components/plugins/card/index.tsx b/web/app/components/plugins/card/index.tsx
@@ -44,7 +44,7 @@ const Card = ({
   const locale = localeFromProps ? getLanguage(localeFromProps) : defaultLocale
   const { categoriesMap } = useCategories()
   const { type, category, name, org, label, brief, icon, verified } = payload
-  const cornerMark = type !== 'plugin' ? categoriesMap.bundle?.label : categoriesMap[category]?.label
+  const cornerMark = !['plugin', 'model', 'tool', 'extension'].includes(type) ? categoriesMap.bundle?.label : categoriesMap[category]?.label
   const getLocalizedText = (obj: Record<string, string> | undefined) =>
     obj?.[locale] || obj?.['en-US'] || obj?.en_US || ''
 

diff --git a/web/app/components/plugins/install-plugin/hooks.ts b/web/app/components/plugins/install-plugin/hooks.ts
@@ -2,23 +2,35 @@ import Toast, { type IToastProps } from '@/app/components/base/toast'
 import { uploadGitHub } from '@/service/plugins'
 import { compareVersion, getLatestVersion } from '@/utils/semver'
 import type { GitHubRepoReleaseResponse } from '../types'
+import { GITHUB_ACCESS_TOKEN } from '@/config'
+
+const formatReleases = (releases: any) => {
+  return releases.map((release: any) => ({
+    tag_name: release.tag_name,
+    assets: release.assets.map((asset: any) => ({
+      browser_download_url: asset.browser_download_url,
+      name: asset.name,
+    })),
+  }))
+}
 
 export const useGitHubReleases = () => {
   const fetchReleases = async (owner: string, repo: string) => {
     try {
-      const res = await fetch(`/repos/${owner}/${repo}/releases`)
-      const bodyJson = await res.json()
-      if (bodyJson.status !== 200) throw new Error(bodyJson.data.message)
-
-      const formattedReleases = bodyJson.data.map((release: any) => ({
-        tag_name: release.tag_name,
-        assets: release.assets.map((asset: any) => ({
-          browser_download_url: asset.browser_download_url,
-          name: asset.name,
-        })),
-      }))
-
-      return formattedReleases
+      if (!GITHUB_ACCESS_TOKEN) {
+        // Fetch releases without authentication from client
+        const res = await fetch(`https://api.github.com/repos/${owner}/${repo}/releases`)
+        if (!res.ok) throw new Error('Failed to fetch repository releases')
+        const data = await res.json()
+        return formatReleases(data)
+      }
+      else {
+        // Fetch releases with authentication from server
+        const res = await fetch(`/repos/${owner}/${repo}/releases`)
+        const bodyJson = await res.json()
+        if (bodyJson.status !== 200) throw new Error(bodyJson.data.message)
+        return formatReleases(bodyJson.data)
+      }
     }
     catch (error) {
       if (error instanceof Error) {

diff --git a/web/app/components/plugins/install-plugin/install-from-local-package/steps/install.tsx b/web/app/components/plugins/install-plugin/install-from-local-package/steps/install.tsx
@@ -45,6 +45,7 @@ const Installed: FC<Props> = ({
   useEffect(() => {
     if (hasInstalled && uniqueIdentifier === installedInfoPayload.uniqueIdentifier)
       onInstalled()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [hasInstalled])
 
   const [isInstalling, setIsInstalling] = React.useState(false)

diff --git a/web/app/components/plugins/types.ts b/web/app/components/plugins/types.ts
@@ -107,7 +107,7 @@ export type PluginDetail = {
 }
 
 export type Plugin = {
-  type: 'plugin' | 'bundle'
+  type: 'plugin' | 'bundle' | 'model' | 'extension' | 'tool'
   org: string
   author?: string
   name: string

diff --git a/web/app/layout.tsx b/web/app/layout.tsx
@@ -45,7 +45,6 @@ const LocaleLayout = ({
         data-public-maintenance-notice={process.env.NEXT_PUBLIC_MAINTENANCE_NOTICE}
         data-public-site-about={process.env.NEXT_PUBLIC_SITE_ABOUT}
         data-public-text-generation-timeout-ms={process.env.NEXT_PUBLIC_TEXT_GENERATION_TIMEOUT_MS}
-        data-public-github-access-token={process.env.NEXT_PUBLIC_GITHUB_ACCESS_TOKEN}
       >
         <BrowserInitor>
           <SentryInitor>

diff --git a/web/config/index.ts b/web/config/index.ts
@@ -272,6 +272,6 @@ export const TEXT_GENERATION_TIMEOUT_MS = textGenerationTimeoutMs
 
 export const DISABLE_UPLOAD_IMAGE_AS_ICON = process.env.NEXT_PUBLIC_DISABLE_UPLOAD_IMAGE_AS_ICON === 'true'
 
-export const GITHUB_ACCESS_TOKEN = process.env.NEXT_PUBLIC_GITHUB_ACCESS_TOKEN || globalThis.document?.body?.getAttribute('data-public-github-access-token') || ''
+export const GITHUB_ACCESS_TOKEN = process.env.NEXT_PUBLIC_GITHUB_ACCESS_TOKEN || ''
 
 export const SUPPORT_INSTALL_LOCAL_FILE_EXTENSIONS = '.difypkg,.difybndl'