@lobehub/chat 1.82.10 → 1.83.1

package/packages/electron-client-ipc/src/types/index.ts

@@ -1,6 +1,7 @@
+export * from './dataSync';
 export * from './dispatch';
 export * from './localFile';
-export * from './remoteServer';
+export * from './proxyTRPCRequest';
 export * from './route';
 export * from './shortcut';
 export * from './system';

package/packages/electron-client-ipc/src/types/proxyTRPCRequest.ts

@@ -0,0 +1,21 @@
+export type ProxyTRPCRequestParams = {
+  /** Request body (can be string, ArrayBuffer, or null/undefined) */
+  body?: string | ArrayBuffer;
+  /** Request headers */
+  headers: Record<string, string>;
+  /** The HTTP method (e.g., 'GET', 'POST') */
+  method: string;
+  /** The path and query string of the request (e.g., '/trpc/lambda/...') */
+  urlPath: string;
+};
+
+export interface ProxyTRPCRequestResult {
+  /** Response body (likely as ArrayBuffer or string) */
+  body: ArrayBuffer | string;
+  /** Response headers */
+  headers: Record<string, string>;
+  /** Response status code */
+  status: number;
+  /** Response status text */
+  statusText: string;
+}

package/packages/electron-server-ipc/src/const.ts

@@ -1,5 +1,5 @@
-export const SOCK_FILE = 'lobehub-electron-ipc.sock';
+export const SOCK_FILE = (id: string) => `${id}-electron-ipc.sock`;
 
-export const SOCK_INFO_FILE = 'lobehub-electron-ipc-info.json';
+export const SOCK_INFO_FILE = (id: string) => `${id}-electron-ipc-info.json`;
 
-export const WINDOW_PIPE_FILE = '\\\\.\\pipe\\lobehub-electron-ipc';
+export const WINDOW_PIPE_FILE = (id: string) => `\\\\.\\pipe\\${id}-electron-ipc`;

package/packages/electron-server-ipc/src/ipcClient.test.ts

@@ -12,6 +12,7 @@ vi.mock('node:net');
 vi.mock('node:os');
 vi.mock('node:path');
 
+const appId = 'lobehub';
 describe('ElectronIpcClient', () => {
   // Mock data
   const mockTempDir = '/mock/temp/dir';
@@ -54,7 +55,7 @@ describe('ElectronIpcClient', () => {
       vi.mocked(fs.readFileSync).mockReturnValue(JSON.stringify(mockSocketInfo));
 
       // Execute
-      new ElectronIpcClient();
+      new ElectronIpcClient(appId);
 
       // Verify
       expect(fs.existsSync).toHaveBeenCalledWith(mockSocketInfoPath);
@@ -66,7 +67,7 @@ describe('ElectronIpcClient', () => {
       vi.mocked(fs.existsSync).mockReturnValue(false);
 
       // Execute
-      new ElectronIpcClient();
+      new ElectronIpcClient(appId);
 
       // Verify
       expect(fs.existsSync).toHaveBeenCalledWith(mockSocketInfoPath);
@@ -75,7 +76,7 @@ describe('ElectronIpcClient', () => {
       // Test platform-specific behavior
       const originalPlatform = process.platform;
       Object.defineProperty(process, 'platform', { value: 'win32' });
-      new ElectronIpcClient();
+      new ElectronIpcClient(appId);
       Object.defineProperty(process, 'platform', { value: originalPlatform });
     });
 
@@ -86,7 +87,7 @@ describe('ElectronIpcClient', () => {
       });
 
       // Execute
-      new ElectronIpcClient();
+      new ElectronIpcClient(appId);
 
       // Verify
       expect(console.error).toHaveBeenCalledWith(
@@ -103,7 +104,7 @@ describe('ElectronIpcClient', () => {
       // Setup a client with a known socket path
       vi.mocked(fs.existsSync).mockReturnValue(true);
       vi.mocked(fs.readFileSync).mockReturnValue(JSON.stringify(mockSocketInfo));
-      client = new ElectronIpcClient();
+      client = new ElectronIpcClient(appId);
 
       // Reset socket mocks for each test
       mockSocket.on.mockReset();
@@ -170,7 +171,7 @@ describe('ElectronIpcClient', () => {
       // Setup a client with a known socket path
       vi.mocked(fs.existsSync).mockReturnValue(true);
       vi.mocked(fs.readFileSync).mockReturnValue(JSON.stringify(mockSocketInfo));
-      client = new ElectronIpcClient();
+      client = new ElectronIpcClient(appId);
 
       // Setup socket.on
       mockSocket.on.mockImplementation((event, callback) => {

package/packages/electron-server-ipc/src/ipcClient.ts

@@ -20,18 +20,28 @@ export class ElectronIpcClient {
   private connectionAttempts: number = 0;
   private maxConnectionAttempts: number = 5;
   private dataBuffer: string = '';
+  private readonly appId: string;
 
-  constructor() {
-    log('Initializing client');
+  constructor(appId: string) {
+    log('Initializing client', appId);
+    this.appId = appId;
     this.initialize();
   }
 
   // 初始化客户端
   private initialize() {
     try {
-      // 从临时文件读取套接字路径
       const tempDir = os.tmpdir();
-      const socketInfoPath = path.join(tempDir, SOCK_INFO_FILE);
+
+      // Windows 平台强制使用命名管道
+      if (process.platform === 'win32') {
+        this.socketPath = WINDOW_PIPE_FILE(this.appId);
+        log('Using named pipe for Windows: %s', this.socketPath);
+        return;
+      }
+
+      // 其他平台尝试读取 sock info 文件
+      const socketInfoPath = path.join(tempDir, SOCK_INFO_FILE(this.appId));
 
       log('Looking for socket info at: %s', socketInfoPath);
       if (fs.existsSync(socketInfoPath)) {
@@ -39,10 +49,9 @@ export class ElectronIpcClient {
         this.socketPath = socketInfo.socketPath;
         log('Found socket path: %s', this.socketPath);
       } else {
-        // 如果找不到套接字信息，使用默认路径
-        this.socketPath =
-          process.platform === 'win32' ? WINDOW_PIPE_FILE : path.join(os.tmpdir(), SOCK_FILE);
-        log('Socket info not found, using default path: %s', this.socketPath);
+        // 如果找不到套接字信息，使用默认 sock 文件路径
+        this.socketPath = path.join(tempDir, SOCK_FILE(this.appId));
+        log('Socket info not found, using default sock path: %s', this.socketPath);
       }
     } catch (err) {
       console.error('Failed to initialize IPC client:', err);

package/packages/electron-server-ipc/src/ipcServer.ts

@@ -13,12 +13,16 @@ const log = debug('electron-server-ipc:server');
 export class ElectronIPCServer {
   private server: net.Server;
   private socketPath: string;
+  private appId: string;
   private eventHandler: ElectronIPCEventHandler;
 
-  constructor(eventHandler: ElectronIPCEventHandler) {
+  constructor(appId: string, eventHandler: ElectronIPCEventHandler) {
+    this.appId = appId;
     const isWindows = process.platform === 'win32';
     // 创建唯一的套接字路径，避免冲突
-    this.socketPath = isWindows ? WINDOW_PIPE_FILE : path.join(os.tmpdir(), SOCK_FILE);
+    this.socketPath = isWindows
+      ? WINDOW_PIPE_FILE(appId)
+      : path.join(os.tmpdir(), SOCK_FILE(appId));
 
     // 如果是 Unix 套接字，确保文件不存在
     if (!isWindows && fs.existsSync(this.socketPath)) {
@@ -47,7 +51,7 @@ export class ElectronIPCServer {
 
         // 将套接字路径写入临时文件，供 Next.js 服务端读取
         const tempDir = os.tmpdir();
-        const socketInfoPath = path.join(tempDir, SOCK_INFO_FILE);
+        const socketInfoPath = path.join(tempDir, SOCK_INFO_FILE(this.appId));
         log('Writing socket info to: %s', socketInfoPath);
         fs.writeFileSync(socketInfoPath, JSON.stringify({ socketPath: this.socketPath }), 'utf8');
 

package/scripts/electronWorkflow/setDesktopVersion.ts

@@ -2,12 +2,24 @@
 import fs from 'fs-extra';
 import path from 'node:path';
 
+type ReleaseType = 'stable' | 'beta' | 'nightly';
+
 // 获取脚本的命令行参数
 const version = process.argv[2];
-const isPr = process.argv[3] === 'true';
+const releaseType = process.argv[3] as ReleaseType;
+
+// 验证参数
+if (!version || !releaseType) {
+  console.error(
+    'Missing parameters. Usage: bun run setDesktopVersion.ts <version> <stable|beta|nightly>',
+  );
+  process.exit(1);
+}
 
-if (!version) {
-  console.error('Missing version parameter, usage: bun run setDesktopVersion.ts <version> [isPr]');
+if (!['stable', 'beta', 'nightly'].includes(releaseType)) {
+  console.error(
+    `Invalid release type: ${releaseType}. Must be one of 'stable', 'beta', 'nightly'.`,
+  );
   process.exit(1);
 }
 
@@ -16,81 +28,86 @@ const rootDir = path.resolve(__dirname, '../..');
 
 // 桌面应用 package.json 的路径
 const desktopPackageJsonPath = path.join(rootDir, 'apps/desktop/package.json');
+const buildDir = path.join(rootDir, 'apps/desktop/build');
 
 // 更新应用图标
-function updateAppIcon() {
+function updateAppIcon(type: 'beta' | 'nightly') {
+  console.log(`📦 Updating app icon for ${type} version...`);
   try {
-    const buildDir = path.join(rootDir, 'apps/desktop/build');
-
-    // 定义需要处理的图标映射，考虑到大小写敏感性
+    const iconSuffix = type === 'beta' ? 'beta' : 'nightly';
     const iconMappings = [
-      // { ext: '.ico', nightly: 'icon-nightly.ico', normal: 'icon.ico' },
-      { ext: '.png', nightly: 'icon-nightly.png', normal: 'icon.png' },
-      { ext: '.icns', nightly: 'Icon-nightly.icns', normal: 'Icon.icns' },
+      { ext: '.png', source: `icon-${iconSuffix}.png`, target: 'icon.png' },
+      { ext: '.icns', source: `Icon-${iconSuffix}.icns`, target: 'Icon.icns' },
+      { ext: '.ico', source: `icon-${iconSuffix}.ico`, target: 'icon.ico' },
     ];
 
-    // 处理每种图标格式
     for (const mapping of iconMappings) {
-      const sourceFile = path.join(buildDir, mapping.nightly);
-      const targetFile = path.join(buildDir, mapping.normal);
+      const sourceFile = path.join(buildDir, mapping.source);
+      const targetFile = path.join(buildDir, mapping.target);
 
-      // 检查源文件是否存在
       if (fs.existsSync(sourceFile)) {
-        // 只有当源文件和目标文件不同，才进行复制
         if (sourceFile !== targetFile) {
           fs.copyFileSync(sourceFile, targetFile);
-          console.log(`Updated app icon: ${targetFile}`);
+          console.log(`  ✅ Copied ${mapping.source} to ${mapping.target}`);
         }
       } else {
-        console.warn(`Warning: Source icon not found: ${sourceFile}`);
+        console.warn(`  ⚠️ Warning: Source icon not found: ${sourceFile}`);
       }
     }
   } catch (error) {
-    console.error('Error updating icons:', error);
-    // 继续处理，不终止程序
+    console.error('  ❌ Error updating icons:', error);
+    // 不终止程序，继续处理 package.json
   }
 }
 
-function updateVersion() {
+function updatePackageJson() {
+  console.log(`⚙️ Updating ${desktopPackageJsonPath} for ${releaseType} version ${version}...`);
   try {
-    // 确保文件存在
     if (!fs.existsSync(desktopPackageJsonPath)) {
-      console.error(`Error: File not found ${desktopPackageJsonPath}`);
+      console.error(`❌ Error: File not found ${desktopPackageJsonPath}`);
       process.exit(1);
     }
 
-    // 读取 package.json 文件
     const packageJson = fs.readJSONSync(desktopPackageJsonPath);
 
-    // 更新版本号
+    // 始终更新版本号
     packageJson.version = version;
-    packageJson.productName = 'LobeHub';
-    packageJson.name = 'lobehub-desktop';
-
-    // 如果是 PR 构建，设置为 Nightly 版本
-    if (isPr) {
-      // 修改包名，添加 -nightly 后缀
-      if (!packageJson.name.endsWith('-nightly')) {
-        packageJson.name = `${packageJson.name}-nightly`;
-      }
 
-      // 修改产品名称为 LobeHub Nightly
-      packageJson.productName = 'LobeHub-Nightly';
-
-      console.log('🌙 Setting as Nightly version with modified package name and productName');
-
-      // 使用 nightly 图标替换常规图标
-      updateAppIcon();
+    // 根据 releaseType 修改其他字段
+    switch (releaseType) {
+      case 'stable': {
+        packageJson.productName = 'LobeHub';
+        packageJson.name = 'lobehub-desktop';
+        console.log('🌟 Setting as Stable version.');
+        break;
+      }
+      case 'beta': {
+        packageJson.productName = 'LobeHub-Beta'; // Or 'LobeHub-Beta' if preferred
+        packageJson.name = 'lobehub-desktop-beta'; // Or 'lobehub-desktop' if preferred
+        console.log('🧪 Setting as Beta version.');
+        updateAppIcon('beta');
+        break;
+      }
+      case 'nightly': {
+        packageJson.productName = 'LobeHub-Nightly'; // Or 'LobeHub-Nightly'
+        packageJson.name = 'lobehub-desktop-nightly'; // Or 'lobehub-desktop-nightly'
+        console.log('🌙 Setting as Nightly version.');
+        updateAppIcon('nightly');
+        break;
+      }
     }
 
     // 写回文件
     fs.writeJsonSync(desktopPackageJsonPath, packageJson, { spaces: 2 });
 
-    console.log(`Desktop app version updated to: ${version}, isPr: ${isPr}`);
+    console.log(
+      `✅ Desktop app package.json updated successfully for ${releaseType} version ${version}.`,
+    );
   } catch (error) {
-    console.error('Error updating version:', error);
+    console.error('❌ Error updating package.json:', error);
     process.exit(1);
   }
 }
 
-updateVersion();
+// 执行更新
+updatePackageJson();

package/src/app/[variants]/(main)/_layout/Desktop/index.tsx

@@ -9,12 +9,12 @@ import { Flexbox } from 'react-layout-kit';
 
 import { isDesktop } from '@/const/version';
 import { BANNER_HEIGHT } from '@/features/AlertBanner/CloudBanner';
+import TitleBar, { TITLE_BAR_HEIGHT } from '@/features/ElectronTitlebar';
 import HotkeyHelperPanel from '@/features/HotkeyHelperPanel';
 import { usePlatform } from '@/hooks/usePlatform';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { HotkeyScopeEnum } from '@/types/hotkey';
 
-import TitleBar, { TITLE_BAR_HEIGHT } from './ElectronTitlebar';
 import RegisterHotkeys from './RegisterHotkeys';
 import SideBar from './SideBar';
 

package/src/components/Analytics/Desktop.tsx

@@ -0,0 +1,19 @@
+'use client';
+
+import Script from 'next/script';
+import { memo } from 'react';
+import urlJoin from 'url-join';
+
+const DesktopAnalytics = memo(
+  () =>
+    process.env.NEXT_PUBLIC_DESKTOP_PROJECT_ID &&
+    process.env.NEXT_PUBLIC_DESKTOP_UMAMI_BASE_URL && (
+      <Script
+        data-website-id={process.env.NEXT_PUBLIC_DESKTOP_PROJECT_ID}
+        defer
+        src={urlJoin(process.env.NEXT_PUBLIC_DESKTOP_UMAMI_BASE_URL, 'script.js')}
+      />
+    ),
+);
+
+export default DesktopAnalytics;

package/src/components/Analytics/index.tsx

@@ -1,7 +1,9 @@
 import dynamic from 'next/dynamic';
 
 import { analyticsEnv } from '@/config/analytics';
+import { isDesktop } from '@/const/version';
 
+import Desktop from './Desktop';
 import Google from './Google';
 import Vercel from './Vercel';
 
@@ -41,6 +43,7 @@ const Analytics = () => {
       {!!analyticsEnv.REACT_SCAN_MONITOR_API_KEY && (
         <ReactScan apiKey={analyticsEnv.REACT_SCAN_MONITOR_API_KEY} />
       )}
+      {isDesktop && <Desktop />}
     </>
   );
 };

package/src/database/core/db-adaptor.ts

@@ -1,6 +1,9 @@
+import { isDesktop } from '@/const/version';
 import { getDBInstance } from '@/database/core/web-server';
 import { LobeChatDatabase } from '@/database/type';
 
+import { getPgliteInstance } from './electron';
+
 /**
  * 懒加载数据库实例
  * 避免每次模块导入时都初始化数据库
@@ -13,7 +16,7 @@ export const getServerDB = async (): Promise<LobeChatDatabase> => {
 
   try {
     // 根据环境选择合适的数据库实例
-    cachedDB = getDBInstance();
+    cachedDB = isDesktop ? await getPgliteInstance() : getDBInstance();
     return cachedDB;
   } catch (error) {
     console.error('❌ Failed to initialize database:', error);