@lobehub/chat 1.82.10 → 1.83.1

package/src/store/electron/initialState.ts

@@ -1,20 +1,20 @@
-import { ElectronAppState, RemoteServerConfig } from '@lobechat/electron-client-ipc';
+import { DataSyncConfig, ElectronAppState } from '@lobechat/electron-client-ipc';
 
 export type RemoteServerError = 'CONFIG_ERROR' | 'AUTH_ERROR' | 'DISCONNECT_ERROR';
 
 export interface ElectronState {
   appState: ElectronAppState;
+  dataSyncConfig: DataSyncConfig;
   isConnectingServer?: boolean;
   isInitRemoteServerConfig: boolean;
   isSyncActive?: boolean;
-  remoteServerConfig: RemoteServerConfig;
   remoteServerSyncError?: { message?: string; type: RemoteServerError };
 }
 
 export const initialState: ElectronState = {
   appState: {},
+  dataSyncConfig: { storageMode: 'local' },
   isConnectingServer: false,
   isInitRemoteServerConfig: false,
   isSyncActive: false,
-  remoteServerConfig: { active: false, isSelfHosted: false },
 };

package/src/store/electron/selectors/sync.ts

@@ -1,9 +1,12 @@
 import { ElectronState } from '../initialState';
 
-const isSyncActive = (s: ElectronState) => {
-  return s.remoteServerConfig.active;
-};
+const isSyncActive = (s: ElectronState) => s.dataSyncConfig.active;
+
+const storageMode = (s: ElectronState) => s.dataSyncConfig.storageMode;
+const remoteServerUrl = (s: ElectronState) => s.dataSyncConfig.remoteServerUrl || '';
 
 export const electronSyncSelectors = {
   isSyncActive,
+  remoteServerUrl,
+  storageMode,
 };

package/src/store/electron/store.ts

@@ -32,3 +32,5 @@ export const useElectronStore = createWithEqualityFn<ElectronStore>()(
   devtools(createStore),
   shallow,
 );
+
+export const getElectronStoreState = () => useElectronStore.getState();

package/src/store/file/slices/upload/action.ts

@@ -4,9 +4,11 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { message } from '@/components/AntdStaticMethods';
 import { LOBE_CHAT_CLOUD } from '@/const/branding';
-import { isServerMode } from '@/const/version';
+import { isDesktop, isServerMode } from '@/const/version';
 import { fileService } from '@/services/file';
 import { uploadService } from '@/services/upload';
+import { getElectronStoreState } from '@/store/electron';
+import { electronSyncSelectors } from '@/store/electron/selectors';
 import { FileMetadata, UploadFileItem } from '@/types/files';
 
 import { FileStore } from '../../store';
@@ -94,8 +96,14 @@ export const createFileUploadSlice: StateCreator<
     }
     // 2. if file don't exist, need upload files
     else {
-      // if is server mode, upload to server s3, or upload to client s3
-      if (isServerMode) {
+      // only if not enable sync
+      const state = getElectronStoreState();
+      const isSyncActive = electronSyncSelectors.isSyncActive(state);
+
+      if (isDesktop && !isSyncActive) {
+        metadata = await uploadService.uploadToDesktop(file);
+      } else if (isServerMode) {
+        // if is server mode, upload to server s3, or upload to client s3
         metadata = await uploadService.uploadWithProgress(file, {
           onProgress: (status, upload) => {
             onStatusUpdate?.({

package/src/store/tool/selectors/tool.ts

@@ -4,6 +4,8 @@ import { pluginPrompts } from '@/prompts/plugin';
 import { MetaData } from '@/types/meta';
 import { ChatCompletionTool } from '@/types/openai/chat';
 import { LobeToolMeta } from '@/types/tool/tool';
+import { globalAgentContextManager } from '@/utils/client/GlobalAgentContextManager';
+import { hydrationPrompt } from '@/utils/promptTemplate';
 import { genToolCallingName } from '@/utils/toolCall';
 import { convertPluginManifestToToolsCalling } from '@/utils/toolManifest';
 
@@ -36,7 +38,14 @@ const enabledSystemRoles =
         const meta = manifest.meta || {};
 
         const title = pluginHelpers.getPluginTitle(meta) || manifest.identifier;
-        const systemRole = manifest.systemRole || pluginHelpers.getPluginDesc(meta);
+        let systemRole = manifest.systemRole || pluginHelpers.getPluginDesc(meta);
+
+        // Use the global context manager to fill the template
+        if (systemRole) {
+          const context = globalAgentContextManager.getContext();
+
+          systemRole = hydrationPrompt(systemRole, context);
+        }
 
         return {
           apis: manifest.api.map((m) => ({

package/src/utils/fetch/headers.ts

@@ -0,0 +1,27 @@
+/**
+ * 将 HeadersInit 转换为 Record<string, string>
+ * @param headersInit - Headers 初始化对象
+ * @returns 转换后的记录对象
+ */
+// eslint-disable-next-line no-undef
+export const headersToRecord = (headersInit?: HeadersInit): Record<string, string> => {
+  const record: Record<string, string> = {};
+  if (!headersInit) {
+    return record;
+  }
+  if (headersInit instanceof Headers) {
+    headersInit.forEach((value, key) => {
+      record[key] = value;
+    });
+  } else if (Array.isArray(headersInit)) {
+    headersInit.forEach(([key, value]) => {
+      record[key] = value;
+    });
+  } else {
+    Object.assign(record, headersInit);
+  }
+  delete record['host'];
+  delete record['connection'];
+  delete record['content-length'];
+  return record;
+};

package/src/utils/fetch/index.ts

@@ -1,2 +1,4 @@
 export * from './fetchSSE';
+export * from './headers';
 export * from './parseError';
+export * from './request';

package/src/utils/fetch/request.ts

@@ -0,0 +1,28 @@
+/**
+ * 从请求体中获取数据
+ * @param body - 请求体
+ * @returns 转换后的请求体数据
+ */
+export const getRequestBody = async (
+  // eslint-disable-next-line no-undef
+  body?: BodyInit | null,
+): Promise<string | ArrayBuffer | undefined> => {
+  if (!body) {
+    return undefined;
+  }
+  if (typeof body === 'string') {
+    return body;
+  }
+  if (body instanceof ArrayBuffer) {
+    return body;
+  }
+  if (ArrayBuffer.isView(body)) {
+    return body.buffer.slice(body.byteOffset, body.byteOffset + body.byteLength) as ArrayBuffer;
+  }
+  if (body instanceof Blob) {
+    return await body.arrayBuffer();
+  }
+
+  console.warn('不支持的 IPC 代理请求体类型:', typeof body);
+  throw new Error('不支持的 IPC 代理请求体类型');
+};

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

@@ -1,8 +0,0 @@
-/**
- * 远程服务器配置相关的事件
- */
-export interface RemoteServerConfig {
-  active: boolean;
-  isSelfHosted: boolean;
-  remoteServerUrl?: string;
-}