@lobehub/lobehub 2.0.0-next.164 → 2.0.0-next.165

package/src/store/global/actions/general.ts

@@ -39,11 +39,10 @@ export const generalActionSlice: StateCreator<
     if (!isDesktop) return;
 
     try {
-      const { dispatch } = await import('@lobechat/electron-client-ipc');
-
+      const { ensureElectronIpc } = await import('@/utils/electron/ipc');
       const url = `/chat?session=${sessionId}&mode=single`;
 
-      const result = await dispatch('createMultiInstanceWindow', {
+      const result = await ensureElectronIpc().windows.createMultiInstanceWindow({
         path: url,
         templateId: 'chatSingle',
         uniqueId: `chat_${sessionId}`,
@@ -61,11 +60,10 @@ export const generalActionSlice: StateCreator<
     if (!isDesktop) return;
 
     try {
-      const { dispatch } = await import('@lobechat/electron-client-ipc');
-
+      const { ensureElectronIpc } = await import('@/utils/electron/ipc');
       const url = `/chat?session=${sessionId}&topic=${topicId}&mode=single`;
 
-      const result = await dispatch('createMultiInstanceWindow', {
+      const result = await ensureElectronIpc().windows.createMultiInstanceWindow({
         path: url,
         templateId: 'chatSingle',
         uniqueId: `chat_${sessionId}_${topicId}`,
@@ -87,9 +85,9 @@ export const generalActionSlice: StateCreator<
     if (isDesktop && !skipBroadcast) {
       (async () => {
         try {
-          const { dispatch } = await import('@lobechat/electron-client-ipc');
+          const { ensureElectronIpc } = await import('@/utils/electron/ipc');
 
-          await dispatch('updateLocale', locale);
+          await ensureElectronIpc().system.updateLocale(locale);
         } catch (error) {
           console.error('Failed to update locale in main process:', error);
         }
@@ -104,8 +102,8 @@ export const generalActionSlice: StateCreator<
     if (isDesktop && !skipBroadcast) {
       (async () => {
         try {
-          const { dispatch } = await import('@lobechat/electron-client-ipc');
-          await dispatch('updateThemeMode', themeMode);
+          const { ensureElectronIpc } = await import('@/utils/electron/ipc');
+          await ensureElectronIpc().system.updateThemeModeHandler(themeMode);
         } catch (error) {
           console.error('Failed to update theme in main process:', error);
         }

package/src/utils/electron/desktopRemoteRPCFetch.ts

@@ -1,10 +1,11 @@
 import { isDesktop } from '@lobechat/const';
-import { ProxyTRPCRequestParams, dispatch, streamInvoke } from '@lobechat/electron-client-ipc';
+import { ProxyTRPCRequestParams, streamInvoke } from '@lobechat/electron-client-ipc';
 import { getRequestBody, headersToRecord } from '@lobechat/fetch-sse';
 import debug from 'debug';
 
 import { getElectronStoreState } from '@/store/electron';
 import { electronSyncSelectors } from '@/store/electron/selectors';
+import { ensureElectronIpc } from '@/utils/electron/ipc';
 
 const log = debug('utils:desktopRemoteRPCFetch');
 
@@ -30,7 +31,7 @@ export const desktopRemoteRPCFetch = async (input: string, init?: RequestInit) =
         urlPath,
       };
 
-      const ipcResult = await dispatch('proxyTRPCRequest', params);
+      const ipcResult = await ensureElectronIpc().remoteServerSync.proxyTRPCRequest(params);
 
       log(`Received ${url} IPC proxy response:`, { status: ipcResult.status });
       const response = new Response(ipcResult.body, {

package/src/utils/electron/ipc.ts

@@ -0,0 +1,12 @@
+import { getElectronIpc } from '@lobechat/electron-client-ipc';
+import type { DesktopIpcServices } from '@lobehub/desktop-ipc-typings';
+
+export const ensureElectronIpc = (): DesktopIpcServices => {
+  const ipc = getElectronIpc();
+  if (!ipc) {
+    throw new Error(
+      'electronAPI.invoke not found. Ensure the preload exposes invoke via window.electronAPI.invoke',
+    );
+  }
+  return ipc;
+};

package/tsconfig.json

@@ -47,5 +47,10 @@
     ".next/types/**/*.ts",
     "next-env.d.ts",
     ".next/dev/types/**/*.ts"
+  ],
+  "references": [
+    {
+      "path": "./apps/desktop"
+    }
   ]
 }

package/apps/desktop/src/main/types/ipcClientEvent.ts

@@ -1,3 +0,0 @@
-export interface IpcClientEventSender {
-  identifier: string;
-}

package/packages/electron-client-ipc/src/dispatch.ts

@@ -1,41 +0,0 @@
-import { DispatchInvoke, type ProxyTRPCRequestParams } from './types';
-
-interface StreamerCallbacks {
-  onData: (chunk: Uint8Array) => void;
-  onEnd: () => void;
-  onError: (error: Error) => void;
-  onResponse: (response: {
-    headers: Record<string, string>;
-    status: number;
-    statusText: string;
-  }) => void;
-}
-
-interface IElectronAPI {
-  invoke: DispatchInvoke;
-  onStreamInvoke: (params: ProxyTRPCRequestParams, callbacks: StreamerCallbacks) => () => void;
-}
-
-declare global {
-  interface Window {
-    electronAPI: IElectronAPI;
-  }
-}
-
-/**
- * client 端请求 main 端 event 数据的方法
- */
-export const dispatch: DispatchInvoke = async (event, ...data) => {
-  if (!window.electronAPI || !window.electronAPI.invoke)
-    throw new Error(`electronAPI.invoke not found. Please expose \`ipcRenderer.invoke\` to \`window.electronAPI.invoke\` in the preload:
-
-import { contextBridge, ipcRenderer } from 'electron';
-
-const invoke = async (event, ...data) =>
-  ipcRenderer.invoke(event, ...data);
-
-contextBridge.exposeInMainWorld('electronAPI', { invoke });
-`);
-
-  return window.electronAPI.invoke(event, ...data);
-};