@lobehub/chat 1.40.4 → 1.42.0

package/src/server/modules/EdgeConfig/index.ts

@@ -0,0 +1,23 @@
+import { EdgeConfigClient, createClient } from '@vercel/edge-config';
+
+import { appEnv } from '@/config/app';
+
+enum EdgeConfigKeys {
+  /**
+   * Assistant whitelist
+   */
+  AssistantWhitelist = 'assistant_whitelist',
+}
+
+export class EdgeConfig {
+  get client(): EdgeConfigClient {
+    if (!appEnv.VERCEL_EDGE_CONFIG) {
+      throw new Error('VERCEL_EDGE_CONFIG is not set');
+    }
+    return createClient(appEnv.VERCEL_EDGE_CONFIG);
+  }
+
+  getAgentWhitelist = async (): Promise<string[] | undefined> => {
+    return this.client.get<string[]>(EdgeConfigKeys.AssistantWhitelist);
+  };
+}

package/src/server/services/discover/index.ts

@@ -50,20 +50,9 @@ export class DiscoverService {
   };
 
   getAssistantList = async (locale: Locales): Promise<DiscoverAssistantItem[]> => {
-    let res = await fetch(this.assistantStore.getAgentIndexUrl(locale), {
-      next: { revalidate },
-    });
-
-    if (!res.ok) {
-      res = await fetch(this.assistantStore.getAgentIndexUrl(DEFAULT_LANG), {
-        next: { revalidate },
-      });
-    }
-
-    if (!res.ok) return [];
-
-    const json = await res.json();
+    const json = await this.assistantStore.getAgentIndex(locale, revalidate);
 
+    // @ts-expect-error 目前类型不一致，未来要统一
     return json.agents;
   };
 

package/src/types/discover.ts

@@ -154,3 +154,23 @@ export interface FilterBy {
   token?: number;
   vision?: boolean;
 }
+
+interface AgentIndexItem {
+  author: string;
+  createAt: string;
+  createdAt: string;
+  homepage: string;
+  identifier: string;
+  meta: {
+    avatar: string;
+    category: string;
+    description: string;
+    tags: string[];
+    title: string;
+  };
+}
+
+export interface AgentStoreIndex {
+  agents: AgentIndexItem[];
+  schemaVersion: number;
+}

package/src/app/@modal/(.)settings/modal/index.tsx

@@ -1,45 +0,0 @@
-'use client';
-
-import dynamic from 'next/dynamic';
-import { memo } from 'react';
-
-import { useQuery } from '@/hooks/useQuery';
-import { SettingsTabs } from '@/store/global/initialState';
-
-import Skeleton from './loading';
-
-const loading = () => <Skeleton />;
-
-const Common = dynamic(() => import('@/app/(main)/settings/common'), { loading, ssr: false });
-const SystemAgent = dynamic(() => import('@/app/(main)/settings/system-agent'), {
-  loading,
-  ssr: false,
-});
-const About = dynamic(() => import('@/app/(main)/settings/about'), { loading, ssr: false });
-const LLM = dynamic(() => import('@/app/(main)/settings/llm'), { loading, ssr: false });
-const TTS = dynamic(() => import('@/app/(main)/settings/tts'), { loading, ssr: false });
-const Agent = dynamic(() => import('@/app/(main)/settings/agent'), { loading, ssr: false });
-const Sync = dynamic(() => import('@/app/(main)/settings/sync'), { loading, ssr: false });
-
-interface SettingsModalProps {
-  browser?: string;
-  mobile?: boolean;
-  os?: string;
-}
-
-const SettingsModal = memo<SettingsModalProps>(({ browser, os, mobile }) => {
-  const { tab = SettingsTabs.Common } = useQuery();
-  return (
-    <>
-      {tab === SettingsTabs.Common && <Common />}
-      {tab === SettingsTabs.SystemAgent && <SystemAgent />}
-      {tab === SettingsTabs.Sync && <Sync browser={browser} mobile={mobile} os={os} />}
-      {tab === SettingsTabs.LLM && <LLM />}
-      {tab === SettingsTabs.TTS && <TTS />}
-      {tab === SettingsTabs.Agent && <Agent />}
-      {tab === SettingsTabs.About && <About mobile={mobile} />}
-    </>
-  );
-});
-
-export default SettingsModal;

package/src/app/@modal/(.)settings/modal/layout.tsx

@@ -1,47 +0,0 @@
-'use client';
-
-import { Skeleton, Tag } from 'antd';
-import dynamic from 'next/dynamic';
-import { PropsWithChildren, memo } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { useActiveSettingsKey } from '@/hooks/useActiveSettingsKey';
-import { SettingsTabs } from '@/store/global/initialState';
-
-import ModalLayout from '../../_layout/ModalLayout';
-import SettingModalLayout from '../../_layout/SettingModalLayout';
-
-const CategoryContent = dynamic(
-  () => import('@/app/(main)/settings/@category/features/CategoryContent'),
-  { loading: () => <Skeleton paragraph={{ rows: 6 }} title={false} />, ssr: false },
-);
-const UpgradeAlert = dynamic(() => import('@/app/(main)/settings/features/UpgradeAlert'), {
-  ssr: false,
-});
-
-const Layout = memo<PropsWithChildren>(({ children }) => {
-  const { t } = useTranslation('setting');
-  const activeKey = useActiveSettingsKey();
-  return (
-    <ModalLayout>
-      <SettingModalLayout
-        activeTitle={
-          <>
-            {t(`tab.${activeKey}`)}
-            {activeKey === SettingsTabs.Sync && <Tag color={'gold'}>{t('tab.experiment')}</Tag>}
-          </>
-        }
-        category={
-          <>
-            <CategoryContent modal />
-            <UpgradeAlert />
-          </>
-        }
-      >
-        {children}
-      </SettingModalLayout>
-    </ModalLayout>
-  );
-});
-
-export default Layout;

package/src/app/@modal/(.)settings/modal/loading.tsx

@@ -1,5 +0,0 @@
-import { Skeleton } from 'antd';
-
-export default () => {
-  return <Skeleton paragraph={{ rows: 6 }} style={{ paddingBlock: 16 }} />;
-};

package/src/app/@modal/(.)settings/modal/page.tsx

@@ -1,19 +0,0 @@
-import { gerServerDeviceInfo, isMobileDevice } from '@/utils/server/responsive';
-
-import SettingsModal from './index';
-
-/**
- * @description: Settings Modal (intercepting route: /settings/modal )
- * @refs: https://github.com/lobehub/lobe-chat/discussions/2295#discussioncomment-9290942
- */
-
-const Page = async () => {
-  const isMobile = await isMobileDevice();
-  const { os, browser } = await gerServerDeviceInfo();
-
-  return <SettingsModal browser={browser} mobile={isMobile} os={os} />;
-};
-
-Page.displayName = 'SettingModal';
-
-export default Page;