@lobehub/chat 0.160.3 → 0.160.5

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.160.5](https://github.com/lobehub/lobe-chat/compare/v0.160.4...v0.160.5)
+
+<sup>Released on **2024-05-20**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor analytics env.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor analytics env, closes [#2570](https://github.com/lobehub/lobe-chat/issues/2570) ([d809d3f](https://github.com/lobehub/lobe-chat/commit/d809d3f))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.160.4](https://github.com/lobehub/lobe-chat/compare/v0.160.3...v0.160.4)
+
+<sup>Released on **2024-05-20**</sup>
+
+#### 💄 Styles
+
+- **misc**: Modify bedrock provided model.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Modify bedrock provided model, closes [#2473](https://github.com/lobehub/lobe-chat/issues/2473) ([a1fabf6](https://github.com/lobehub/lobe-chat/commit/a1fabf6))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.160.3](https://github.com/lobehub/lobe-chat/compare/v0.160.2...v0.160.3)
 
 <sup>Released on **2024-05-19**</sup>

package/docs/self-hosting/environment-variables/analytics.mdx

@@ -1,7 +1,5 @@
 ---
-title: >-
-  Integrating Data Analytics Services in LobeChat: Environment Variables and
-  Configuration
+title: Integrating Analytics in LobeChat
 description: >-
   Learn how to configure environment variables for Vercel Analytics, Google
   Analytics, PostHog Analytics, and Umami Analytics in LobeChat for data
@@ -36,44 +34,30 @@ We have integrated several free/open-source data analytics services in LobeChat
 
 ## Google Analytics
 
-### `ENABLE_GOOGLE_ANALYTICS`
-
-- Type: Optional
-- Description: Used to configure the environment variable for Google Analytics. Set to `1` to enable Google Analytics.
-- Default: `-`
-- Example: `1`
-
 ### `GOOGLE_ANALYTICS_MEASUREMENT_ID`
 
 - Type: Required
-- Description: Google Analytics Measurement ID，you can get it from the Google Analytics dashboard.
+- Description: Google Analytics Measurement ID，you can get it from the Google Analytics dashboard. Add it will auto enable Google Analytics.
 - Default: `-`
 - Example: `G-63LP2TV03T`
 
 ## Posthog Analytics
 
-### `NEXT_PUBLIC_ANALYTICS_POSTHOG`
+### `POSTHOG_KEY`
 
-- Type: Optional
-- Description: Used to enable the environment variable for [PostHog Analytics][posthog-analytics-url]. Set to `1` to enable PostHog Analytics.
-- Default: `-`
-- Example: `1`
-
-### `NEXT_PUBLIC_POSTHOG_KEY`
-
-- Type: Optional
-- Description: Set the PostHog project Key.
+- Type: Required
+- Description: Set the PostHog project Key. Add it will auto enable PostHog Analytics.
 - Default: `-`
 - Example: `phc_xxxxxxxx`
 
-### `NEXT_PUBLIC_POSTHOG_HOST`
+### `POSTHOG_HOST`
 
 - Type: Optional
 - Description: Set the deployment address of the PostHog service, defaulting to the official SAAS address.
 - Default: `https://app.posthog.com`
 - Example: `https://example.com`
 
-### `NEXT_PUBLIC_POSTHOG_DEBUG`
+### `DEBUG_POSTHOG_ANALYTICS`
 
 - Type: Optional
 - Description: Enable the debug mode for PostHog.
@@ -82,26 +66,19 @@ We have integrated several free/open-source data analytics services in LobeChat
 
 ## Umami Analytics
 
-### `NEXT_PUBLIC_ANALYTICS_UMAMI`
+### `UMAMI_WEBSITE_ID`
 
-- Type: Optional
-- Description: Used to enable the environment variable for [Umami Analytics][umami-analytics-url]. Set to `1` to enable Umami Analytics.
+- Type: Required
+- Description: Your Umami Website ID. Add it will auto enable Umami Analytics.
 - Default: `-`
-- Example: `1`
+- Example: `E738D82A-EE9E-4806-A81F-0CA3CAE57F65`
 
-### `NEXT_PUBLIC_UMAMI_SCRIPT_URL`
+### `UMAMI_SCRIPT_URL`
 
 - Type: Optional
 - Description: The URL of the Umami script, defaulting to the script URL provided by Umami Cloud.
 - Default: `https://analytics.umami.is/script.js`
 - Example: `https://umami.your-site.com/script.js`
 
-### `NEXT_PUBLIC_UMAMI_WEBSITE_ID`
-
-- Type: Required
-- Description: Your Umami Website ID.
-- Default: `-`
-- Example: `E738D82A-EE9E-4806-A81F-0CA3CAE57F65`
-
 [posthog-analytics-url]: https://posthog.com
 [umami-analytics-url]: https://umami.is

package/docs/self-hosting/environment-variables/analytics.zh-CN.mdx

@@ -32,44 +32,30 @@ tags:
 
 ## Google Analytics
 
-### `ENABLE_GOOGLE_ANALYTICS`
-
-- 类型：必选
-- 描述：用于配置 Google Analytics 的环境变量，当设为 `1` 时开启 Google Analytics
-- 默认值： `-`
-- 示例：`1`
-
 ### `GOOGLE_ANALYTICS_MEASUREMENT_ID`
 
 - 类型：必选
-- 描述：Google Analytics 的 Measurement ID，如果开启了 Google Analytics，此项必填
+- 描述：Google Analytics 的 Measurement ID，填写此项后将自动开启 Google Analytics
 - 默认值： `-`
 - 示例：`G-63LP2TV03T`
 
 ## Posthog Analytics
 
-### `NEXT_PUBLIC_ANALYTICS_POSTHOG`
-
-- 类型：可选
-- 描述：用于开启 [PostHog Analytics][posthog-analytics-url] 的环境变量，设为 `1` 时开启 PostHog Analytics
-- 默认值： `-`
-- 示例：`1`
+### `POSTHOG_KEY`
 
-### `NEXT_PUBLIC_POSTHOG_KEY`
-
-- 类型：可选
-- 描述：设置 PostHog 项目 Key
+- 类型：必选
+- 描述：设置 PostHog 项目 Key，设置此项后将自动开启 PostHog Analytics
 - 默认值： `-`
 - 示例：`phc_xxxxxxxx`
 
-### `NEXT_PUBLIC_POSTHOG_HOST`
+### `POSTHOG_HOST`
 
 - 类型：可选
-- 描述：设置 PostHog 服务的部署地址，默认为官方的 SAAS 地址
+- 描述：设置 PostHog 服务的部署地址，默认为官方的 SaaS 地址
 - 默认值：`https://app.posthog.com`
 - 示例：`https://example.com`
 
-### `NEXT_PUBLIC_POSTHOG_DEBUG`
+### `POSTHOG_DEBUG`
 
 - 类型：可选
 - 描述：开启 PostHog 的调试模式
@@ -78,26 +64,19 @@ tags:
 
 ## Umami Analytics
 
-### `NEXT_PUBLIC_ANALYTICS_UMAMI`
+### `UMAMI_WEBSITE_ID`
 
-- 类型：可选
-- 描述：用于开启 [Umami Analytics][umami-analytics-url] 的环境变量，设为 `1` 时开启 Umami Analytics
-- 默认值： `-`
-- 示例：`1`
+- 类型：必选
+- 描述：你的 Umami 的 Website ID，填写此项后将自动开启 Umami Analytics
+- 默认值：`-`
+- 示例：`E738D82A-EE9E-4806-A81F-0CA3CAE57F65`
 
-### `NEXT_PUBLIC_UMAMI_SCRIPT_URL`
+### `UMAMI_SCRIPT_URL`
 
 - 类型：可选
 - 描述：Umami 脚本的网址，默认为 Umami Cloud 提供的脚本网址
 - 默认值：`https://analytics.umami.is/script.js`
 - 示例：`https://umami.your-site.com/script.js`
 
-### `NEXT_PUBLIC_UMAMI_WEBSITE_ID`
-
-- 类型：必选
-- 描述：你的 Umami 的 Website ID
-- 默认值：`-`
-- 示例：`E738D82A-EE9E-4806-A81F-0CA3CAE57F65`
-
 [posthog-analytics-url]: https://posthog.com
 [umami-analytics-url]: https://umami.is

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.160.3",
+  "version": "0.160.5",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",
@@ -96,7 +96,7 @@
     "@icons-pack/react-simple-icons": "^9.5.0",
     "@lobehub/chat-plugin-sdk": "latest",
     "@lobehub/chat-plugins-gateway": "latest",
-    "@lobehub/icons": "latest",
+    "@lobehub/icons": "^1.21.0",
     "@lobehub/tts": "latest",
     "@lobehub/ui": "^1.138.24",
     "@microsoft/fetch-event-source": "^2.0.1",

package/src/app/layout.tsx

@@ -10,6 +10,8 @@ import AuthProvider from '@/layout/AuthProvider';
 import GlobalProvider from '@/layout/GlobalProvider';
 import { isMobileDevice } from '@/utils/responsive';
 
+const inVercel = process.env.VERCEL === '1';
+
 type RootLayoutProps = {
   children: ReactNode;
   modal: ReactNode;
@@ -31,7 +33,7 @@ const RootLayout = async ({ children, modal }: RootLayoutProps) => {
           </AuthProvider>
         </GlobalProvider>
         <Analytics />
-        <SpeedInsights />
+        {inVercel && <SpeedInsights />}
       </body>
     </html>
   );

package/src/components/Analytics/Clarity.tsx

@@ -0,0 +1,28 @@
+'use client';
+
+import Script from 'next/script';
+import { memo } from 'react';
+
+interface ClarityProps {
+  projectId?: string;
+}
+
+const Clarity = memo<ClarityProps>(
+  ({ projectId }) =>
+    projectId && (
+      <Script
+        dangerouslySetInnerHTML={{
+          __html: `
+              (function(c,l,a,r,i,t,y){
+                  c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
+                  t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
+                  y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
+              })(window, document, "clarity", "script", "${projectId}");
+            `,
+        }}
+        id="clarity-script"
+      />
+    ),
+);
+
+export default Clarity;

package/src/components/Analytics/Google.tsx

@@ -1,14 +1,7 @@
 import { GoogleAnalytics as GA } from '@next/third-parties/google';
 
-import { getServerConfig } from '@/config/server';
+import { analyticsEnv } from '@/config/analytics';
 
-const { GOOGLE_ANALYTICS_MEASUREMENT_ID, ENABLE_GOOGLE_ANALYTICS } = getServerConfig();
-
-if (ENABLE_GOOGLE_ANALYTICS && !GOOGLE_ANALYTICS_MEASUREMENT_ID)
-  throw new Error(
-    'You have enable the google analytics but not provided the google analytics id. Please provide the google analytics id in your env',
-  );
-
-const GoogleAnalytics = () => <GA gaId={GOOGLE_ANALYTICS_MEASUREMENT_ID!} />;
+const GoogleAnalytics = () => <GA gaId={analyticsEnv.GOOGLE_ANALYTICS_MEASUREMENT_ID!} />;
 
 export default GoogleAnalytics;

package/src/components/Analytics/Plausible.tsx

@@ -3,19 +3,14 @@
 import Script from 'next/script';
 import { memo } from 'react';
 
-import { getClientConfig } from '@/config/client';
+interface PlausibleAnalyticsProps {
+  domain?: string;
+  scriptBaseUrl: string;
+}
 
-const { PLAUSIBLE_DOMAIN, PLAUSIBLE_SCRIPT_BASE_URL } = getClientConfig();
-
-const PlausibleAnalytics = memo(
-  () =>
-    PLAUSIBLE_DOMAIN && (
-      <Script
-        data-domain={PLAUSIBLE_DOMAIN}
-        defer
-        src={`${PLAUSIBLE_SCRIPT_BASE_URL}/js/script.js`}
-      />
-    ),
+const PlausibleAnalytics = memo<PlausibleAnalyticsProps>(
+  ({ domain, scriptBaseUrl }) =>
+    domain && <Script data-domain={domain} defer src={`${scriptBaseUrl}/js/script.js`} />,
 );
 
 export default PlausibleAnalytics;

package/src/components/Analytics/Posthog.tsx

@@ -1,20 +1,19 @@
 'use client';
 
 import posthog from 'posthog-js';
-import { FC, memo, useEffect } from 'react';
+import { memo, useEffect } from 'react';
 
-import { getClientConfig } from '@/config/client';
+interface PostHogProps {
+  debug: boolean;
+  host: string;
+  token?: string;
+}
 
-const { POSTHOG_HOST, POSTHOG_KEY, POSTHOG_DEBUG } = getClientConfig();
-
-const PostHog: FC = memo(() => {
+const PostHog = memo<PostHogProps>(({ token, host, debug }) => {
   useEffect(() => {
-    if (!POSTHOG_KEY) return;
+    if (!token) return;
 
-    posthog.init(POSTHOG_KEY, {
-      api_host: POSTHOG_HOST ?? 'https://app.posthog.com',
-      debug: POSTHOG_DEBUG,
-    });
+    posthog.init(token, { api_host: host, debug });
   }, []);
 
   return null;

package/src/components/Analytics/Umami.tsx

@@ -3,13 +3,14 @@
 import Script from 'next/script';
 import { memo } from 'react';
 
-import { getClientConfig } from '@/config/client';
+interface UmamiAnalyticsProps {
+  scriptUrl: string;
+  websiteId?: string;
+}
 
-const { UMAMI_SCRIPT_URL, UMAMI_WEBSITE_ID } = getClientConfig();
-
-const UmamiAnalytics = memo(
-  () =>
-    UMAMI_WEBSITE_ID && <Script data-website-id={UMAMI_WEBSITE_ID} defer src={UMAMI_SCRIPT_URL} />,
+const UmamiAnalytics = memo<UmamiAnalyticsProps>(
+  ({ scriptUrl, websiteId }) =>
+    websiteId && <Script data-website-id={websiteId} defer src={scriptUrl} />,
 );
 
 export default UmamiAnalytics;

package/src/components/Analytics/Vercel.tsx

@@ -1,10 +1,8 @@
 import { Analytics } from '@vercel/analytics/react';
 import { memo } from 'react';
 
-import { getServerConfig } from '@/config/server';
+import { analyticsEnv } from '@/config/analytics';
 
-const { VERCEL_DEBUG } = getServerConfig();
-
-const VercelAnalytics = memo(() => <Analytics debug={VERCEL_DEBUG} />);
+const VercelAnalytics = memo(() => <Analytics debug={analyticsEnv.DEBUG_VERCEL_ANALYTICS} />);
 
 export default VercelAnalytics;

package/src/components/Analytics/index.tsx

@@ -1,27 +1,42 @@
 import dynamic from 'next/dynamic';
 
-import { getClientConfig } from '@/config/client';
-import { getServerConfig } from '@/config/server';
+import { analyticsEnv } from '@/config/analytics';
 
 import Google from './Google';
 import Vercel from './Vercel';
 
-const Plausible = dynamic(() => import('./Plausible'), { ssr: false });
-const Posthog = dynamic(() => import('./Posthog'), { ssr: false });
-const Umami = dynamic(() => import('./Umami'), { ssr: false });
-
-const { ANALYTICS_POSTHOG, ANALYTICS_PLAUSIBLE, ANALYTICS_UMAMI } = getClientConfig();
-
-const { ENABLE_VERCEL_ANALYTICS, ENABLE_GOOGLE_ANALYTICS } = getServerConfig();
+const Plausible = dynamic(() => import('./Plausible'));
+const Posthog = dynamic(() => import('./Posthog'));
+const Umami = dynamic(() => import('./Umami'));
+const Clarity = dynamic(() => import('./Clarity'));
 
 const Analytics = () => {
   return (
     <>
-      {ENABLE_VERCEL_ANALYTICS && <Vercel />}
-      {ENABLE_GOOGLE_ANALYTICS && <Google />}
-      {ANALYTICS_PLAUSIBLE && <Plausible />}
-      {ANALYTICS_POSTHOG && <Posthog />}
-      {ANALYTICS_UMAMI && <Umami />}
+      {analyticsEnv.ENABLE_VERCEL_ANALYTICS && <Vercel />}
+      {analyticsEnv.ENABLE_GOOGLE_ANALYTICS && <Google />}
+      {analyticsEnv.ENABLED_PLAUSIBLE_ANALYTICS && (
+        <Plausible
+          domain={analyticsEnv.PLAUSIBLE_DOMAIN}
+          scriptBaseUrl={analyticsEnv.PLAUSIBLE_SCRIPT_BASE_URL}
+        />
+      )}
+      {analyticsEnv.ENABLED_POSTHOG_ANALYTICS && (
+        <Posthog
+          debug={analyticsEnv.DEBUG_POSTHOG_ANALYTICS}
+          host={analyticsEnv.POSTHOG_HOST!}
+          token={analyticsEnv.POSTHOG_KEY}
+        />
+      )}
+      {analyticsEnv.ENABLED_UMAMI_ANALYTICS && (
+        <Umami
+          scriptUrl={analyticsEnv.UMAMI_SCRIPT_URL}
+          websiteId={analyticsEnv.UMAMI_WEBSITE_ID}
+        />
+      )}
+      {analyticsEnv.ENABLED_CLARITY_ANALYTICS && (
+        <Clarity projectId={analyticsEnv.CLARITY_PROJECT_ID} />
+      )}
     </>
   );
 };

package/src/config/__tests__/analytics.test.ts

@@ -0,0 +1,70 @@
+// @vitest-environment node
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { analyticsEnv, getAnalyticsConfig } from '../analytics';
+
+beforeEach(() => {
+  // 在每个测试用例之前,清除所有的 console.warn mock
+  console.warn = vi.fn();
+});
+
+afterEach(() => {
+  // 在每个测试用例之后,恢复所有的环境变量
+  vi.resetModules();
+});
+
+describe('getAnalyticsConfig', () => {
+  it('should return the correct analytics config', () => {
+    // 设置环境变量
+    process.env.PLAUSIBLE_DOMAIN = 'example.com';
+    process.env.POSTHOG_KEY = 'posthog_key';
+    process.env.UMAMI_WEBSITE_ID = 'umami_id';
+    process.env.CLARITY_PROJECT_ID = 'clarity_id';
+    process.env.ENABLE_VERCEL_ANALYTICS = '1';
+    process.env.GOOGLE_ANALYTICS_MEASUREMENT_ID = 'ga_id';
+
+    const config = getAnalyticsConfig();
+
+    expect(config).toEqual({
+      ENABLED_PLAUSIBLE_ANALYTICS: true,
+      PLAUSIBLE_DOMAIN: 'example.com',
+      PLAUSIBLE_SCRIPT_BASE_URL: 'https://plausible.io',
+      ENABLED_POSTHOG_ANALYTICS: true,
+      POSTHOG_KEY: 'posthog_key',
+      POSTHOG_HOST: 'https://app.posthog.com',
+      DEBUG_POSTHOG_ANALYTICS: false,
+      ENABLED_UMAMI_ANALYTICS: true,
+      UMAMI_SCRIPT_URL: 'https://analytics.umami.is/script.js',
+      UMAMI_WEBSITE_ID: 'umami_id',
+      ENABLED_CLARITY_ANALYTICS: true,
+      CLARITY_PROJECT_ID: 'clarity_id',
+      ENABLE_VERCEL_ANALYTICS: true,
+      DEBUG_VERCEL_ANALYTICS: false,
+      ENABLE_GOOGLE_ANALYTICS: true,
+      GOOGLE_ANALYTICS_MEASUREMENT_ID: 'ga_id',
+    });
+  });
+
+  it('should use deprecated env vars and log warnings', () => {
+    process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN = 'deprecated.com';
+    process.env.NEXT_PUBLIC_POSTHOG_KEY = 'deprecated_key';
+    process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID = 'deprecated_id';
+
+    const config = getAnalyticsConfig();
+
+    expect(config.ENABLED_PLAUSIBLE_ANALYTICS).toBeTruthy();
+    expect(config.ENABLED_POSTHOG_ANALYTICS).toBeTruthy();
+    expect(config.ENABLED_UMAMI_ANALYTICS).toBeTruthy();
+
+    expect(console.warn).toHaveBeenCalledTimes(3);
+    expect(console.warn).toHaveBeenCalledWith(
+      'NEXT_PUBLIC_PLAUSIBLE_DOMAIN is deprecated. Please use PLAUSIBLE_DOMAIN instead. We will remove it in LobeChat 1.0',
+    );
+    expect(console.warn).toHaveBeenCalledWith(
+      'NEXT_PUBLIC_POSTHOG_KEY is deprecated. Please use POSTHOG_KEY instead. We will remove it in LobeChat 1.0',
+    );
+    expect(console.warn).toHaveBeenCalledWith(
+      'NEXT_PUBLIC_UMAMI_WEBSITE_ID is deprecated. Please use UMAMI_WEBSITE_ID instead. We will remove it in LobeChat 1.0',
+    );
+  });
+});

package/src/config/__tests__/client.test.ts

@@ -18,9 +18,6 @@ describe('getClientConfig', () => {
     process.env.NEXT_PUBLIC_I18N_DEBUG_SERVER = '1';
 
     const config = getClientConfig();
-    expect(config.ANALYTICS_PLAUSIBLE).toBe(true);
-    expect(config.ANALYTICS_POSTHOG).toBe(true);
-    expect(config.POSTHOG_DEBUG).toBe(true);
     expect(config.I18N_DEBUG).toBe(true);
     expect(config.I18N_DEBUG_BROWSER).toBe(true);
     expect(config.I18N_DEBUG_SERVER).toBe(true);
@@ -36,9 +33,6 @@ describe('getClientConfig', () => {
 
     const config = getClientConfig();
 
-    expect(config.ANALYTICS_PLAUSIBLE).toBe(false);
-    expect(config.ANALYTICS_POSTHOG).toBe(false);
-    expect(config.POSTHOG_DEBUG).toBe(false);
     expect(config.I18N_DEBUG).toBe(false);
     expect(config.I18N_DEBUG_BROWSER).toBe(false);
     expect(config.I18N_DEBUG_SERVER).toBe(false);

package/src/config/analytics.ts

@@ -0,0 +1,148 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix */
+import { createEnv } from '@t3-oss/env-nextjs';
+import { z } from 'zod';
+
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace NodeJS {
+    interface ProcessEnv {
+      /**
+       * @deprecated
+       */
+      NEXT_PUBLIC_ANALYTICS_PLAUSIBLE?: string;
+      /**
+       * @deprecated
+       */
+      NEXT_PUBLIC_ANALYTICS_POSTHOG: string;
+      /**
+       * @deprecated
+       */
+      NEXT_PUBLIC_PLAUSIBLE_DOMAIN?: string;
+
+      /**
+       * @deprecated
+       */
+      NEXT_PUBLIC_PLAUSIBLE_SCRIPT_BASE_URL?: string;
+      /**
+       * @deprecated
+       */
+      NEXT_PUBLIC_POSTHOG_HOST: string;
+      /**
+       * @deprecated
+       */
+      NEXT_PUBLIC_POSTHOG_KEY: string;
+
+      /**
+       * @deprecated
+       */
+      NEXT_PUBLIC_UMAMI_SCRIPT_URL?: string;
+      /**
+       * @deprecated
+       */
+      NEXT_PUBLIC_UMAMI_WEBSITE_ID?: string;
+    }
+  }
+}
+
+export const getAnalyticsConfig = () => {
+  if (process.env.NEXT_PUBLIC_PLAUSIBLE_SCRIPT_BASE_URL) {
+    console.warn(
+      'NEXT_PUBLIC_PLAUSIBLE_SCRIPT_BASE_URL is deprecated. Please use PLAUSIBLE_SCRIPT_BASE_URL instead. We will remove it in LobeChat 1.0',
+    );
+  }
+  if (process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN) {
+    console.warn(
+      'NEXT_PUBLIC_PLAUSIBLE_DOMAIN is deprecated. Please use PLAUSIBLE_DOMAIN instead. We will remove it in LobeChat 1.0',
+    );
+  }
+
+  if (process.env.NEXT_PUBLIC_POSTHOG_KEY) {
+    console.warn(
+      'NEXT_PUBLIC_POSTHOG_KEY is deprecated. Please use POSTHOG_KEY instead. We will remove it in LobeChat 1.0',
+    );
+  }
+  if (process.env.NEXT_PUBLIC_POSTHOG_HOST) {
+    console.warn(
+      'NEXT_PUBLIC_POSTHOG_HOST is deprecated. Please use POSTHOG_HOST instead. We will remove it in LobeChat 1.0',
+    );
+  }
+
+  if (process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL) {
+    console.warn(
+      'NEXT_PUBLIC_UMAMI_SCRIPT_URL is deprecated. Please use UMAMI_SCRIPT_URL instead. We will remove it in LobeChat 1.0',
+    );
+  }
+  if (process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID) {
+    console.warn(
+      'NEXT_PUBLIC_UMAMI_WEBSITE_ID is deprecated. Please use UMAMI_WEBSITE_ID instead. We will remove it in LobeChat 1.0',
+    );
+  }
+
+  return createEnv({
+    server: {
+      ENABLED_PLAUSIBLE_ANALYTICS: z.boolean(),
+      PLAUSIBLE_SCRIPT_BASE_URL: z.string(),
+      PLAUSIBLE_DOMAIN: z.string().optional(),
+
+      ENABLED_POSTHOG_ANALYTICS: z.boolean(),
+      POSTHOG_KEY: z.string().optional(),
+      POSTHOG_HOST: z.string(),
+      DEBUG_POSTHOG_ANALYTICS: z.boolean(),
+
+      ENABLED_UMAMI_ANALYTICS: z.boolean(),
+      UMAMI_WEBSITE_ID: z.string().optional(),
+      UMAMI_SCRIPT_URL: z.string(),
+
+      ENABLED_CLARITY_ANALYTICS: z.boolean(),
+      CLARITY_PROJECT_ID: z.string().optional(),
+
+      ENABLE_VERCEL_ANALYTICS: z.boolean(),
+      DEBUG_VERCEL_ANALYTICS: z.boolean(),
+
+      ENABLE_GOOGLE_ANALYTICS: z.boolean(),
+      GOOGLE_ANALYTICS_MEASUREMENT_ID: z.string().optional(),
+    },
+    runtimeEnv: {
+      // Plausible Analytics
+      ENABLED_PLAUSIBLE_ANALYTICS:
+        !!process.env.PLAUSIBLE_DOMAIN || !!process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN,
+      PLAUSIBLE_DOMAIN: process.env.PLAUSIBLE_DOMAIN || process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN,
+      PLAUSIBLE_SCRIPT_BASE_URL:
+        process.env.PLAUSIBLE_SCRIPT_BASE_URL ||
+        process.env.NEXT_PUBLIC_PLAUSIBLE_SCRIPT_BASE_URL ||
+        'https://plausible.io',
+
+      // Posthog Analytics
+      ENABLED_POSTHOG_ANALYTICS: !!process.env.POSTHOG_KEY || !!process.env.NEXT_PUBLIC_POSTHOG_KEY,
+      POSTHOG_KEY: process.env.POSTHOG_KEY || process.env.NEXT_PUBLIC_POSTHOG_KEY,
+      POSTHOG_HOST:
+        process.env.POSTHOG_HOST ||
+        process.env.NEXT_PUBLIC_POSTHOG_HOST ||
+        'https://app.posthog.com',
+      DEBUG_POSTHOG_ANALYTICS: process.env.DEBUG_POSTHOG_ANALYTICS === '1',
+
+      // Umami Analytics
+      ENABLED_UMAMI_ANALYTICS:
+        !!process.env.UMAMI_WEBSITE_ID || !!process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID,
+      UMAMI_SCRIPT_URL:
+        process.env.UMAMI_SCRIPT_URL ||
+        process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL ||
+        'https://analytics.umami.is/script.js',
+      UMAMI_WEBSITE_ID: process.env.UMAMI_WEBSITE_ID || process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID,
+
+      // Clarity Analytics
+      ENABLED_CLARITY_ANALYTICS: !!process.env.CLARITY_PROJECT_ID,
+      CLARITY_PROJECT_ID: process.env.CLARITY_PROJECT_ID,
+
+      // Vercel Analytics
+      ENABLE_VERCEL_ANALYTICS: process.env.ENABLE_VERCEL_ANALYTICS === '1',
+      DEBUG_VERCEL_ANALYTICS: process.env.DEBUG_VERCEL_ANALYTICS === '1',
+
+      // Google Analytics
+      ENABLE_GOOGLE_ANALYTICS: !!process.env.GOOGLE_ANALYTICS_MEASUREMENT_ID,
+      GOOGLE_ANALYTICS_MEASUREMENT_ID: process.env.GOOGLE_ANALYTICS_MEASUREMENT_ID,
+    },
+  });
+};
+
+export const analyticsEnv = getAnalyticsConfig();

package/src/config/client.ts

@@ -8,23 +8,6 @@ declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace NodeJS {
     interface ProcessEnv {
-      NEXT_PUBLIC_ANALYTICS_MIXPANEL?: string;
-      NEXT_PUBLIC_MIXPANEL_PROJECT_TOKEN?: string;
-      NEXT_PUBLIC_MIXPANEL_DEBUG?: string;
-
-      NEXT_PUBLIC_ANALYTICS_PLAUSIBLE?: string;
-      NEXT_PUBLIC_PLAUSIBLE_DOMAIN?: string;
-      NEXT_PUBLIC_PLAUSIBLE_SCRIPT_BASE_URL?: string;
-
-      NEXT_PUBLIC_ANALYTICS_POSTHOG: string;
-      NEXT_PUBLIC_POSTHOG_KEY: string;
-      NEXT_PUBLIC_POSTHOG_HOST: string;
-      NEXT_PUBLIC_POSTHOG_DEBUG: string;
-
-      NEXT_PUBLIC_ANALYTICS_UMAMI?: string;
-      NEXT_PUBLIC_UMAMI_SCRIPT_URL?: string;
-      NEXT_PUBLIC_UMAMI_WEBSITE_ID?: string;
-
       NEXT_PUBLIC_I18N_DEBUG: string;
       NEXT_PUBLIC_I18N_DEBUG_BROWSER: string;
       NEXT_PUBLIC_I18N_DEBUG_SERVER: string;
@@ -41,24 +24,6 @@ export const getClientConfig = () => ({
 
   BASE_PATH: process.env.NEXT_PUBLIC_BASE_PATH || '',
 
-  // Plausible Analytics
-  ANALYTICS_PLAUSIBLE: process.env.NEXT_PUBLIC_ANALYTICS_PLAUSIBLE === '1',
-  PLAUSIBLE_DOMAIN: process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN,
-  PLAUSIBLE_SCRIPT_BASE_URL:
-    process.env.NEXT_PUBLIC_PLAUSIBLE_SCRIPT_BASE_URL || 'https://plausible.io',
-
-  // Posthog Analytics
-  ANALYTICS_POSTHOG: process.env.NEXT_PUBLIC_ANALYTICS_POSTHOG === '1',
-  POSTHOG_KEY: process.env.NEXT_PUBLIC_POSTHOG_KEY,
-  POSTHOG_HOST: process.env.NEXT_PUBLIC_POSTHOG_HOST,
-  POSTHOG_DEBUG: process.env.NEXT_PUBLIC_POSTHOG_DEBUG === '1',
-
-  // Umami Analytics
-  ANALYTICS_UMAMI: process.env.NEXT_PUBLIC_ANALYTICS_UMAMI === '1',
-  UMAMI_SCRIPT_URL:
-    process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL || 'https://analytics.umami.is/script.js',
-  UMAMI_WEBSITE_ID: process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID,
-
   // Sentry
   ENABLE_SENTRY: !!process.env.NEXT_PUBLIC_SENTRY_DSN,
 

package/src/config/modelProviders/bedrock.ts

@@ -3,6 +3,11 @@ import { ModelProviderCard } from '@/types/llm';
 // ref https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html
 const Bedrock: ModelProviderCard = {
   chatModels: [
+    {
+      displayName: 'Titan Text G1 - Lite',
+      id: 'amazon.titan-text-lite-v1:0:4k',
+      tokens: 4000,
+    },
     {
       description:
         'Amazon Titan Text G1 - Express v1，上下文长度可达 8000 个 token，适合广泛的用途。',
@@ -10,6 +15,23 @@ const Bedrock: ModelProviderCard = {
       id: 'amazon.titan-text-express-v1:0:8k',
       tokens: 8000,
     },
+    {
+      displayName: 'Titan Text Premier',
+      id: 'amazon.titan-text-premier-v1:0:32K',
+      tokens: 32_000,
+    },
+    {
+      displayName: 'Jurassic-2 Mid',
+      enabled: true,
+      id: 'ai21.j2-mid-v1',
+      tokens: 8192,
+    },
+    {
+      displayName: 'Jurassic-2 Ultra',
+      enabled: true,
+      id: 'ai21.j2-ultra-v1',
+      tokens: 8192,
+    },
     {
       description:
         'Claude 3 Opus 是 Anthropic 最强大的人工智能模型，在处理高度复杂的任务方面具备顶尖性能。该模型能够以非凡的流畅性和类似人类的理解能力引导开放式的提示和未可见的场景。Claude 3 Opus 向我们展示生成式人工智能的美好前景。 Claude 3 Opus 可以处理图像和返回文本输出，并且提供 200K 上下文窗口。',

package/src/config/server/index.ts

@@ -1,4 +1,3 @@
-import { getAnalyticsConfig } from './analytics';
 import { getAppConfig } from './app';
 import { getProviderConfig } from './provider';
 
@@ -9,7 +8,6 @@ export const getServerConfig = () => {
 
   const provider = getProviderConfig();
   const app = getAppConfig();
-  const analytics = getAnalyticsConfig();
 
-  return { ...provider, ...app, ...analytics };
+  return { ...provider, ...app };
 };

package/src/store/market/action.ts

@@ -69,6 +69,7 @@ export const createMarketAction: StateCreator<
             'useFetchAgentList',
           );
         },
+        revalidateOnFocus: false,
       },
     ),
 });

package/src/config/server/analytics.ts

@@ -1,32 +0,0 @@
-/* eslint-disable sort-keys-fix/sort-keys-fix , typescript-sort-keys/interface */
-
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace NodeJS {
-    interface ProcessEnv {
-      // Vercel Analytics
-      ENABLE_VERCEL_ANALYTICS?: string;
-      DEBUG_VERCEL_ANALYTICS?: string;
-
-      // Google Analytics
-      ENABLE_GOOGLE_ANALYTICS?: string;
-      GOOGLE_ANALYTICS_MEASUREMENT_ID?: string;
-    }
-  }
-}
-
-export const getAnalyticsConfig = () => {
-  if (typeof process === 'undefined') {
-    throw new Error('[Server Config] you are importing a server-only module outside of server');
-  }
-
-  return {
-    // Vercel Analytics
-    ENABLE_VERCEL_ANALYTICS: process.env.ENABLE_VERCEL_ANALYTICS === '1',
-    VERCEL_DEBUG: process.env.DEBUG_VERCEL_ANALYTICS === '1',
-
-    // Google Analytics
-    ENABLE_GOOGLE_ANALYTICS: process.env.ENABLE_GOOGLE_ANALYTICS === '1',
-    GOOGLE_ANALYTICS_MEASUREMENT_ID: process.env.GOOGLE_ANALYTICS_MEASUREMENT_ID,
-  };
-};