@lobehub/chat 0.96.2 → 0.96.4

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.96.4](https://github.com/lobehub/lobe-chat/compare/v0.96.3...v0.96.4)
+
+<sup>Released on **2023-10-29**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix agents market locale fallback to english.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix agents market locale fallback to english, closes [#382](https://github.com/lobehub/lobe-chat/issues/382) ([3814523](https://github.com/lobehub/lobe-chat/commit/3814523))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.96.3](https://github.com/lobehub/lobe-chat/compare/v0.96.2...v0.96.3)
+
+<sup>Released on **2023-10-28**</sup>
+
+#### 💄 Styles
+
+- **misc**: Fix SessionList on mobile.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Fix SessionList on mobile ([e7e7b80](https://github.com/lobehub/lobe-chat/commit/e7e7b80))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.96.2](https://github.com/lobehub/lobe-chat/compare/v0.96.1...v0.96.2)
 
 <sup>Released on **2023-10-28**</sup>
@@ -193,7 +243,7 @@
 
 #### 🐛 Bug Fixes
 
-- **misc**: Fix agent share formate.
+- **misc**: Fix agent share format.
 
 <br/>
 
@@ -202,7 +252,7 @@
 
 #### What's fixed
 
-- **misc**: Fix agent share formate ([56ebc0b](https://github.com/lobehub/lobe-chat/commit/56ebc0b))
+- **misc**: Fix agent share format ([56ebc0b](https://github.com/lobehub/lobe-chat/commit/56ebc0b))
 
 </details>
 
@@ -1004,7 +1054,7 @@
 
 #### 🐛 Bug Fixes
 
-- **misc**: Fix mobile safearea (fix.
+- **misc**: Fix mobile safe area (fix.
 
 <br/>
 
@@ -1013,7 +1063,7 @@
 
 #### What's fixed
 
-- **misc**: Fix mobile safearea (fix, closes [#211](https://github.com/lobehub/lobe-chat/issues/211) ([68775b8](https://github.com/lobehub/lobe-chat/commit/68775b8))
+- **misc**: Fix mobile safe area (fix, closes [#211](https://github.com/lobehub/lobe-chat/issues/211) ([68775b8](https://github.com/lobehub/lobe-chat/commit/68775b8))
 
 </details>
 
@@ -1663,7 +1713,7 @@
 
 #### 💄 Styles
 
-- **misc**: Fix conversation mobile viewarea.
+- **misc**: Fix conversation mobile view area.
 
 <br/>
 
@@ -1672,7 +1722,7 @@
 
 #### Styles
 
-- **misc**: Fix conversation mobile viewarea ([6668e11](https://github.com/lobehub/lobe-chat/commit/6668e11))
+- **misc**: Fix conversation mobile view area ([6668e11](https://github.com/lobehub/lobe-chat/commit/6668e11))
 
 </details>
 
@@ -1713,7 +1763,7 @@
 
 #### 💄 Styles
 
-- **misc**: Fix safeare in mobile.
+- **misc**: Fix safearea in mobile.
 
 <br/>
 
@@ -1722,7 +1772,7 @@
 
 #### Styles
 
-- **misc**: Fix safeare in mobile ([2adfb04](https://github.com/lobehub/lobe-chat/commit/2adfb04))
+- **misc**: Fix safearea in mobile ([2adfb04](https://github.com/lobehub/lobe-chat/commit/2adfb04))
 
 </details>
 
@@ -1763,7 +1813,7 @@
 
 #### 💄 Styles
 
-- **misc**: Optmize PWA style and scroll effect.
+- **misc**: Optimize PWA style and scroll effect.
 
 <br/>
 
@@ -1772,7 +1822,7 @@
 
 #### Styles
 
-- **misc**: Optmize PWA style and scroll effect ([0ae05b8](https://github.com/lobehub/lobe-chat/commit/0ae05b8))
+- **misc**: Optimize PWA style and scroll effect ([0ae05b8](https://github.com/lobehub/lobe-chat/commit/0ae05b8))
 
 </details>
 
@@ -2199,7 +2249,7 @@
 
 #### ✨ Features
 
-- **misc**: Add russian localy, Update Russian and English localy (LLM tab).
+- **misc**: Add russian locally, Update Russian and English locally (LLM tab).
 
 <br/>
 
@@ -2208,8 +2258,8 @@
 
 #### What's improved
 
-- **misc**: Add russian localy ([7b67c9f](https://github.com/lobehub/lobe-chat/commit/7b67c9f))
-- **misc**: Update Russian and English localy (LLM tab) ([3b23e70](https://github.com/lobehub/lobe-chat/commit/3b23e70))
+- **misc**: Add russian locally ([7b67c9f](https://github.com/lobehub/lobe-chat/commit/7b67c9f))
+- **misc**: Update Russian and English locally (LLM tab) ([3b23e70](https://github.com/lobehub/lobe-chat/commit/3b23e70))
 
 </details>
 
@@ -2568,7 +2618,7 @@
 
 #### ♻ Code Refactoring
 
-- **misc**: Mirgrate openai-edge to openai.
+- **misc**: Migrate openai-edge to openai.
 
 <br/>
 
@@ -2577,7 +2627,7 @@
 
 #### Code refactoring
 
-- **misc**: Mirgrate openai-edge to openai, closes [#145](https://github.com/lobehub/lobe-chat/issues/145) ([75ee574](https://github.com/lobehub/lobe-chat/commit/75ee574))
+- **misc**: Migrate openai-edge to openai, closes [#145](https://github.com/lobehub/lobe-chat/issues/145) ([75ee574](https://github.com/lobehub/lobe-chat/commit/75ee574))
 
 </details>
 
@@ -2712,7 +2762,7 @@
 
 #### ✨ Features
 
-- **misc**: Add russian localy.
+- **misc**: Add russian locally.
 
 <br/>
 
@@ -2721,7 +2771,7 @@
 
 #### What's improved
 
-- **misc**: Add russian localy, closes [#137](https://github.com/lobehub/lobe-chat/issues/137) ([785d50f](https://github.com/lobehub/lobe-chat/commit/785d50f))
+- **misc**: Add russian locally, closes [#137](https://github.com/lobehub/lobe-chat/issues/137) ([785d50f](https://github.com/lobehub/lobe-chat/commit/785d50f))
 
 </details>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.96.2",
+  "version": "0.96.4",
   "description": "An open-source, extensible (Function Calling), high-performance chatbot framework. It supports one-click free deployment of your private ChatGPT/LLM web application",
   "keywords": [
     "chatbot",

package/src/app/api/market/[id]/route.ts

@@ -0,0 +1,19 @@
+import { DEFAULT_LANG } from '@/const/locale';
+import { getAgentJSON } from '@/const/url';
+
+export const runtime = 'edge';
+
+export const GET = async (req: Request, { params }: { params: { id: string } }) => {
+  const { searchParams } = new URL(req.url);
+
+  const locale = searchParams.get('locale');
+
+  let res: Response;
+
+  res = await fetch(getAgentJSON(params.id, locale as any));
+  if (res.status === 404) {
+    res = await fetch(getAgentJSON(params.id, DEFAULT_LANG));
+  }
+
+  return res;
+};

package/src/app/api/market/route.ts

@@ -0,0 +1,18 @@
+import { DEFAULT_LANG } from '@/const/locale';
+import { getAgentIndexJSON } from '@/const/url';
+
+export const runtime = 'edge';
+
+export const GET = async (req: Request) => {
+  const locale = new URL(req.url).searchParams.get('locale');
+
+  let res: Response;
+
+  res = await fetch(getAgentIndexJSON(locale as any));
+
+  if (res.status === 404) {
+    res = await fetch(getAgentIndexJSON(DEFAULT_LANG));
+  }
+
+  return res;
+};

package/src/app/chat/features/SessionListContent/CollapseGroup/index.tsx

@@ -4,12 +4,16 @@ import { createStyles } from 'antd-style';
 import { ChevronDown } from 'lucide-react';
 import { memo } from 'react';
 
-const useStyles = createStyles(({ css, prefixCls, token }) => ({
+const useStyles = createStyles(({ css, prefixCls, token, responsive }) => ({
   container: css`
     .${prefixCls}-collapse-header {
-      padding-inline: 16px !important;
+      padding-inline: 16px 10px !important;
       color: ${token.colorTextDescription} !important;
-      border-radius: 8px !important;
+      border-radius: ${token.borderRadius}px !important;
+
+      ${responsive.mobile} {
+        border-radius: 0 !important;
+      }
 
       &:hover {
         color: ${token.colorText} !important;

package/src/app/chat/features/SessionListContent/Inbox/index.tsx

@@ -1,22 +1,16 @@
-import { Avatar, List } from '@lobehub/ui';
-import { useHover } from 'ahooks';
 import { useResponsive } from 'antd-style';
 import Link from 'next/link';
-import { memo, useMemo, useRef } from 'react';
+import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useStyles } from '@/app/chat/features/SessionListContent/List/Item';
 import { DEFAULT_INBOX_AVATAR } from '@/const/meta';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { SESSION_CHAT_URL } from '@/const/url';
 import { useSessionStore } from '@/store/session';
 
-const { Item } = List;
+import ListItem from '../ListItem';
 
 const Inbox = memo(() => {
-  const ref = useRef(null);
-  const { styles } = useStyles();
-  const isHovering = useHover(ref);
   const { t } = useTranslation('chat');
   const { mobile } = useResponsive();
   const [activeId, activeSession, switchSession] = useSessionStore((s) => [
@@ -25,18 +19,6 @@ const Inbox = memo(() => {
     s.switchSession,
   ]);
 
-  const avatarRender = useMemo(
-    () => (
-      <Avatar
-        animation={isHovering}
-        avatar={DEFAULT_INBOX_AVATAR}
-        size={46}
-        style={{ padding: 3 }}
-      />
-    ),
-    [isHovering],
-  );
-
   return (
     <Link
       aria-label={t('inbox.title')}
@@ -47,11 +29,9 @@ const Inbox = memo(() => {
         else activeSession(INBOX_SESSION_ID);
       }}
     >
-      <Item
-        active={mobile ? false : activeId === INBOX_SESSION_ID}
-        avatar={avatarRender}
-        className={styles.container}
-        ref={ref}
+      <ListItem
+        active={activeId === INBOX_SESSION_ID}
+        avatar={DEFAULT_INBOX_AVATAR}
         title={t('inbox.title')}
       />
     </Link>

package/src/app/chat/features/SessionListContent/List/Item/index.tsx

@@ -1,8 +1,6 @@
 import { SiOpenai } from '@icons-pack/react-simple-icons';
-import { Avatar, List, Tag } from '@lobehub/ui';
-import { useHover } from 'ahooks';
-import { createStyles, useResponsive } from 'antd-style';
-import { memo, useMemo, useRef, useState } from 'react';
+import { Tag } from '@lobehub/ui';
+import { memo, useMemo, useState } from 'react';
 import { Flexbox } from 'react-layout-kit';
 import { shallow } from 'zustand/shallow';
 
@@ -10,32 +8,16 @@ import { settingsSelectors, useGlobalStore } from '@/store/global';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors, sessionSelectors } from '@/store/session/selectors';
 
+import ListItem from '../../ListItem';
 import Actions from './Actions';
 
-const { Item } = List;
-
-export const useStyles = createStyles(({ css, token, responsive }) => {
-  return {
-    container: css`
-      position: relative;
-      border-radius: ${token.borderRadius}px;
-      ${responsive.mobile} {
-        border-radius: 0;
-      }
-    `,
-  };
-});
-
 interface SessionItemProps {
   id: string;
 }
 
 const SessionItem = memo<SessionItemProps>(({ id }) => {
   const [open, setOpen] = useState(false);
-  const ref = useRef(null);
-  const isHovering = useHover(ref);
-  const { mobile } = useResponsive();
-  const { styles } = useStyles();
+
   const [defaultModel] = useGlobalStore((s) => [settingsSelectors.defaultAgentConfig(s).model]);
 
   const [
@@ -72,19 +54,6 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
 
   const actions = useMemo(() => <Actions id={id} setOpen={setOpen} />, [id]);
 
-  const avatarRender = useMemo(
-    () => (
-      <Avatar
-        animation={isHovering}
-        avatar={avatar}
-        background={avatarBackground}
-        shape="circle"
-        size={46}
-      />
-    ),
-    [isHovering, avatar, avatarBackground],
-  );
-
   const addon = useMemo(
     () =>
       !showModel ? undefined : (
@@ -96,23 +65,19 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
   );
 
   return (
-    <Flexbox paddingBlock={1}>
-      <Item
-        actions={actions}
-        // needn't active state in mobile
-        active={mobile ? false : active}
-        addon={addon}
-        avatar={avatarRender}
-        className={styles.container}
-        date={updateAt}
-        description={description || systemRole}
-        loading={loading}
-        pin={pin}
-        ref={ref}
-        showAction={open || isHovering}
-        title={title}
-      />
-    </Flexbox>
+    <ListItem
+      actions={actions}
+      active={active}
+      addon={addon}
+      avatar={avatar}
+      avatarBackground={avatarBackground}
+      date={updateAt}
+      description={description || systemRole}
+      loading={loading}
+      pin={pin}
+      showAction={open}
+      title={title}
+    />
   );
 }, shallow);
 

package/src/app/chat/features/SessionListContent/ListItem/index.tsx

@@ -0,0 +1,61 @@
+import { Avatar, List, ListItemProps } from '@lobehub/ui';
+import { useHover } from 'ahooks';
+import { createStyles, useResponsive } from 'antd-style';
+import { memo, useMemo, useRef } from 'react';
+
+const { Item } = List;
+
+const useStyles = createStyles(({ css, token, responsive }) => {
+  return {
+    container: css`
+      position: relative;
+
+      margin-block: 2px;
+      padding-right: 16px;
+      padding-left: 8px;
+
+      border-radius: ${token.borderRadius}px;
+      ${responsive.mobile} {
+        margin-block: 0;
+        padding-left: 12px;
+        border-radius: 0;
+      }
+    `,
+  };
+});
+
+const ListItem = memo<ListItemProps & { avatar: string; avatarBackground?: string }>(
+  ({ avatar, avatarBackground, active, showAction, actions, ...props }) => {
+    const ref = useRef(null);
+    const isHovering = useHover(ref);
+    const { mobile } = useResponsive();
+    const { styles } = useStyles();
+
+    const avatarRender = useMemo(
+      () => (
+        <Avatar
+          animation={isHovering}
+          avatar={avatar}
+          background={avatarBackground}
+          shape="circle"
+          size={46}
+        />
+      ),
+      [isHovering, avatar, avatarBackground],
+    );
+
+    return (
+      <Item
+        actions={actions}
+        active={mobile ? false : active}
+        avatar={avatarRender}
+        className={styles.container}
+        ref={ref}
+        showAction={actions && (isHovering || showAction)}
+        {...(props as any)}
+      />
+    );
+  },
+);
+
+export default ListItem;

package/src/services/_url.ts

@@ -1,4 +1,5 @@
 export const URLS = {
+  market: '/api/market',
   plugins: '/api/plugins',
 };
 

package/src/services/agentMarket.ts

@@ -1,30 +1,21 @@
-import { getAgentIndexJSON, getAgentJSON } from '@/const/url';
-import { getCurrentLanguage } from '@/store/global/helpers';
+import { URLS } from '@/services/_url';
 import { LobeChatAgentsMarketIndex } from '@/types/market';
 
 /**
  * 请求助手列表
  */
-export const getAgentList = async () => {
-  let res: Response;
+export const getAgentList = async (locale: string): Promise<LobeChatAgentsMarketIndex> => {
+  const res = await fetch(`${URLS.market}?locale=${locale}`);
 
-  res = await fetch(getAgentIndexJSON(getCurrentLanguage()));
-
-  if (res.status === 404) {
-    res = await fetch(getAgentIndexJSON('en-US'));
-  }
-
-  const data: LobeChatAgentsMarketIndex = await res.json();
-
-  return data;
+  return res.json();
 };
 
 /**
  * 请求助手 manifest
  */
-export const getAgentManifest = async (identifier?: string) => {
+export const getAgentManifest = async (identifier: string, locale: string) => {
   if (!identifier) return;
-  const res = await fetch(getAgentJSON(identifier, getCurrentLanguage()));
+  const res = await fetch(`${URLS.market}/${identifier}?locale=${locale}`);
 
   return res.json();
 };

package/src/store/market/action.ts

@@ -4,6 +4,7 @@ import useSWR, { SWRResponse } from 'swr';
 import type { StateCreator } from 'zustand/vanilla';
 
 import { getAgentList, getAgentManifest } from '@/services/agentMarket';
+import { getCurrentLanguage } from '@/store/global/helpers';
 import { AgentsMarketItem, LobeChatAgentsMarketIndex } from '@/types/market';
 
 import type { Store } from './store';
@@ -40,16 +41,20 @@ export const createMarketAction: StateCreator<
     set({ agentMap: nextAgentMap }, false, `setAgentMap/${key}`);
   },
   useFetchAgent: (identifier) =>
-    useSWR<AgentsMarketItem>(identifier, getAgentManifest, {
-      onError: () => {
-        get().deactivateAgent();
+    useSWR<AgentsMarketItem>(
+      [identifier, getCurrentLanguage()],
+      ([id, locale]) => getAgentManifest(id, locale as string),
+      {
+        onError: () => {
+          get().deactivateAgent();
+        },
+        onSuccess: (data) => {
+          get().updateAgentMap(identifier, data);
+        },
       },
-      onSuccess: (data, key) => {
-        get().updateAgentMap(key, data);
-      },
-    }),
+    ),
   useFetchAgentList: () =>
-    useSWR<LobeChatAgentsMarketIndex>('fetchAgentList', getAgentList, {
+    useSWR<LobeChatAgentsMarketIndex>(getCurrentLanguage(), getAgentList, {
       onSuccess: (agentMarketIndex) => {
         set({ agentList: agentMarketIndex.agents }, false, 'useFetchAgentList');
       },