@lobehub/chat 1.97.17 → 1.98.0

package/src/app/[variants]/(main)/settings/proxy/page.tsx

@@ -0,0 +1,28 @@
+import { notFound } from 'next/navigation';
+
+import { isDesktop } from '@/const/version';
+import { metadataModule } from '@/server/metadata';
+import { translation } from '@/server/translation';
+import { DynamicLayoutProps } from '@/types/next';
+import { RouteVariants } from '@/utils/server/routeVariants';
+
+import Client from './index';
+
+export const generateMetadata = async (props: DynamicLayoutProps) => {
+  const locale = await RouteVariants.getLocale(props);
+  const { t } = await translation('setting', locale);
+
+  return metadataModule.generate({
+    description: t('header.desc'),
+    title: t('tab.proxy'),
+    url: '/settings/proxy',
+  });
+};
+
+const Page = () => {
+  if (!isDesktop) return notFound();
+
+  return <Client />;
+};
+
+export default Page;

package/src/locales/default/electron.ts

@@ -1,4 +1,43 @@
 const electron = {
+  proxy: {
+    auth: '需要认证',
+    authDesc: '如果代理服务器需要用户名和密码',
+    authSettings: '认证设置',
+    basicSettings: '代理设置',
+    basicSettingsDesc: '配置代理服务器的连接参数',
+    bypass: '不使用代理的地址',
+    connectionTest: '连接测试',
+    enable: '启用代理',
+    enableDesc: '开启后将通过代理服务器访问网络',
+    password: '密码',
+    password_placeholder: '请输入密码',
+    port: '端口',
+    resetButton: '重置',
+    saveButton: '保存',
+    saveFailed: '保存失败：{{error}}',
+    saveSuccess: '代理设置保存成功',
+    server: '服务器地址',
+    testButton: '测试连接',
+    testDescription: '使用当前代理配置测试连接，验证配置是否正常工作',
+    testFailed: '连接失败',
+    testSuccessWithTime: '测试连接成功，耗时 {{time}} ms',
+    testUrl: '测试地址',
+    testUrlPlaceholder: '请输入要测试的 URL',
+    testing: '正在测试连接...',
+    type: '代理类型',
+    unsavedChanges: '您有未保存的更改',
+    username: '用户名',
+    username_placeholder: '请输入用户名',
+    validation: {
+      passwordRequired: '启用认证时密码为必填项',
+      portInvalid: '端口必须是 1 到 65535 之间的数字',
+      portRequired: '启用代理时端口为必填项',
+      serverInvalid: '请输入有效的服务器地址（IP 或域名）',
+      serverRequired: '启用代理时服务器地址为必填项',
+      typeRequired: '启用代理时代理类型为必填项',
+      usernameRequired: '启用认证时用户名为必填项',
+    },
+  },
   remoteServer: {
     authError: '授权失败: {{error}}',
     authPending: '请在浏览器中完成授权',

package/src/locales/default/setting.ts

@@ -524,6 +524,7 @@ export default {
     'hotkey': '快捷键',
     'llm': '语言模型',
     'provider': 'AI 服务商',
+    'proxy': '网络代理',
     'storage': '数据存储',
     'sync': '云端同步',
     'system-agent': '系统助手',

package/src/services/electron/settings.ts

@@ -0,0 +1,33 @@
+import { NetworkProxySettings, dispatch } from '@lobechat/electron-client-ipc';
+
+class DesktopSettingsService {
+  /**
+   * 获取远程服务器配置
+   */
+  getProxySettings = async () => {
+    return dispatch('getProxySettings');
+  };
+
+  /**
+   * 设置远程服务器配置
+   */
+  setSettings = async (data: Partial<NetworkProxySettings>) => {
+    return dispatch('setProxySettings', data);
+  };
+
+  /**
+   * 测试代理连接
+   */
+  testProxyConnection = async (url: string) => {
+    return dispatch('testProxyConnection', url);
+  };
+
+  /**
+   * 测试指定的代理配置
+   */
+  testProxyConfig = async (config: NetworkProxySettings, testUrl?: string) => {
+    return dispatch('testProxyConfig', { config, testUrl });
+  };
+}
+
+export const desktopSettingsService = new DesktopSettingsService();

package/src/store/electron/actions/settings.ts

@@ -0,0 +1,55 @@
+import { NetworkProxySettings } from '@lobechat/electron-client-ipc';
+import isEqual from 'fast-deep-equal';
+import useSWR, { SWRResponse, mutate } from 'swr';
+import type { StateCreator } from 'zustand/vanilla';
+
+import { desktopSettingsService } from '@/services/electron/settings';
+
+import type { ElectronStore } from '../store';
+
+/**
+ * 设置操作
+ */
+export interface ElectronSettingsAction {
+  refreshProxySettings: () => Promise<void>;
+  setProxySettings: (params: Partial<NetworkProxySettings>) => Promise<void>;
+  useGetProxySettings: () => SWRResponse;
+}
+
+const ELECTRON_PROXY_SETTINGS_KEY = 'electron:getProxySettings';
+
+export const settingsSlice: StateCreator<
+  ElectronStore,
+  [['zustand/devtools', never]],
+  [],
+  ElectronSettingsAction
+> = (set, get) => ({
+  refreshProxySettings: async () => {
+    await mutate(ELECTRON_PROXY_SETTINGS_KEY);
+  },
+
+  setProxySettings: async (values) => {
+    try {
+      // 更新设置
+      await desktopSettingsService.setSettings(values);
+
+      // 刷新状态
+      await get().refreshProxySettings();
+    } catch (error) {
+      console.error('代理设置更新失败:', error);
+    }
+  },
+
+  useGetProxySettings: () =>
+    useSWR<NetworkProxySettings>(
+      ELECTRON_PROXY_SETTINGS_KEY,
+      async () => desktopSettingsService.getProxySettings(),
+      {
+        onSuccess: (data) => {
+          if (!isEqual(data, get().proxySettings)) {
+            set({ proxySettings: data });
+          }
+        },
+      },
+    ),
+});

package/src/store/electron/initialState.ts

@@ -1,7 +1,16 @@
-import { DataSyncConfig, ElectronAppState } from '@lobechat/electron-client-ipc';
+import { DataSyncConfig, ElectronAppState, NetworkProxySettings } from '@lobechat/electron-client-ipc';
 
 export type RemoteServerError = 'CONFIG_ERROR' | 'AUTH_ERROR' | 'DISCONNECT_ERROR';
 
+export const defaultProxySettings: NetworkProxySettings = {
+  enableProxy: false,
+  proxyBypass: 'localhost, 127.0.0.1, ::1',
+  proxyPort: '',
+  proxyRequireAuth: false,
+  proxyServer: '',
+  proxyType: 'http',
+};
+
 export interface ElectronState {
   appState: ElectronAppState;
   dataSyncConfig: DataSyncConfig;
@@ -9,6 +18,7 @@ export interface ElectronState {
   isConnectingServer?: boolean;
   isInitRemoteServerConfig: boolean;
   isSyncActive?: boolean;
+  proxySettings: NetworkProxySettings;
   remoteServerSyncError?: { message?: string; type: RemoteServerError };
 }
 
@@ -19,4 +29,5 @@ export const initialState: ElectronState = {
   isConnectingServer: false,
   isInitRemoteServerConfig: false,
   isSyncActive: false,
+  proxySettings: defaultProxySettings,
 };

package/src/store/electron/selectors/__tests__/desktopState.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { ElectronState } from '@/store/electron/initialState';
+import { ElectronState, defaultProxySettings } from '@/store/electron/initialState';
 
 import { desktopStateSelectors } from '../desktopState';
 
@@ -25,6 +25,7 @@ describe('desktopStateSelectors', () => {
           storageMode: 'local',
         },
         isInitRemoteServerConfig: false,
+        proxySettings: defaultProxySettings,
       };
 
       expect(desktopStateSelectors.usePath(state)).toEqual({
@@ -47,6 +48,7 @@ describe('desktopStateSelectors', () => {
           storageMode: 'local',
         },
         isInitRemoteServerConfig: false,
+        proxySettings: defaultProxySettings,
       };
 
       expect(desktopStateSelectors.usePath(state)).toBeUndefined();

package/src/store/electron/store.ts

@@ -4,6 +4,7 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { createDevtools } from '../middleware/createDevtools';
 import { type ElectronAppAction, createElectronAppSlice } from './actions/app';
+import { type ElectronSettingsAction, settingsSlice } from './actions/settings';
 import { type ElectronRemoteServerAction, remoteSyncSlice } from './actions/sync';
 import { type ElectronState, initialState } from './initialState';
 
@@ -12,7 +13,8 @@ import { type ElectronState, initialState } from './initialState';
 export interface ElectronStore
   extends ElectronState,
     ElectronRemoteServerAction,
-    ElectronAppAction {
+    ElectronAppAction,
+    ElectronSettingsAction {
   /* empty */
 }
 
@@ -22,6 +24,7 @@ const createStore: StateCreator<ElectronStore, [['zustand/devtools', never]]> =
   ...initialState,
   ...remoteSyncSlice(...parameters),
   ...createElectronAppSlice(...parameters),
+  ...settingsSlice(...parameters),
 });
 
 //  ===============  实装 useStore ============ //

package/src/store/global/initialState.ts

@@ -31,6 +31,7 @@ export enum SettingsTabs {
   Hotkey = 'hotkey',
   LLM = 'llm',
   Provider = 'provider',
+  Proxy = 'proxy',
   Storage = 'storage',
   Sync = 'sync',
   SystemAgent = 'system-agent',

package/apps/desktop/scripts/pglite-server.ts

@@ -1,14 +0,0 @@
-import { PGlite } from "@electric-sql/pglite";
-import { createServer } from "pglite-server";
-
-// 创建或连接到您现有的 PGlite 数据库
-const db = new PGlite("/Users/arvinxx/Library/Application Support/lobehub-desktop/lobehub-local-db");
-await db.waitReady;
-
-// 创建服务器并监听端口
-const PORT = 6543;
-const pgServer = createServer(db);
-
-pgServer.listen(PORT, () => {
-  console.log(`PGlite 服务器已启动，监听端口 ${PORT}`);
-});