[MCP-UI] Proxy and Better Message Handling #5487
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,6 +52,8 @@ import { Recipe } from './recipe'; | |
| import './utils/recipeHash'; | ||
| import { Client, createClient, createConfig } from './api/client'; | ||
| import installExtension, { REACT_DEVELOPER_TOOLS } from 'electron-devtools-installer'; | ||
| import express from 'express'; | ||
michaelneale marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| import http from 'node:http'; | ||
|
|
||
| // Updater functions (moved here to keep updates.ts minimal for release replacement) | ||
| function shouldSetupUpdater(): boolean { | ||
|
|
@@ -1024,6 +1026,13 @@ ipcMain.handle('get-secret-key', () => { | |
| return SERVER_SECRET; | ||
| }); | ||
|
|
||
| ipcMain.handle('get-mcp-ui-proxy-url', () => { | ||
| if (mcpUIProxyServerPort) { | ||
| return `http://localhost:${mcpUIProxyServerPort}/mcp-ui-proxy.html`; | ||
| } | ||
| return undefined; | ||
| }); | ||
|
|
||
| ipcMain.handle('get-goosed-host-port', async (event) => { | ||
| const windowId = BrowserWindow.fromWebContents(event.sender)?.id; | ||
| if (!windowId) { | ||
|
|
@@ -1642,10 +1651,51 @@ const registerGlobalHotkey = (accelerator: string) => { | |
| } | ||
| }; | ||
|
|
||
| // HTTP server for serving MCP proxy files | ||
| let mcpUIProxyServerPort: number | null = null; | ||
| let mcpUIProxyServer: http.Server | null = null; | ||
|
|
||
| async function startMcpUIProxyServer(): Promise<number> { | ||
| return new Promise((resolve, reject) => { | ||
| const expressApp = express(); | ||
|
||
| const staticPath = path.join(__dirname, '../../static'); | ||
|
|
||
| // Serve static files from the static directory | ||
| expressApp.use(express.static(staticPath)); | ||
|
|
||
| // Create HTTP server | ||
| mcpUIProxyServer = http.createServer(expressApp); | ||
|
|
||
| // Listen on a dynamic port (0 = let the OS choose an available port) | ||
| mcpUIProxyServer.listen(0, 'localhost', () => { | ||
| const address = mcpUIProxyServer?.address(); | ||
| if (address && typeof address === 'object') { | ||
| mcpUIProxyServerPort = address.port; | ||
| log.info(`MCP UI Proxy server started on port ${mcpUIProxyServerPort}`); | ||
| resolve(mcpUIProxyServerPort); | ||
| } else { | ||
| reject(new Error('Failed to get server address')); | ||
| } | ||
| }); | ||
|
|
||
| mcpUIProxyServer.on('error', (error) => { | ||
| log.error('MCP Proxy server error:', error); | ||
| reject(error); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| async function appMain() { | ||
| // Ensure Windows shims are available before any MCP processes are spawned | ||
| await ensureWinShims(); | ||
|
|
||
| // Start MCP proxy server | ||
| try { | ||
| await startMcpUIProxyServer(); | ||
| } catch (error) { | ||
| log.error('Failed to start MCP proxy server:', error); | ||
| } | ||
|
|
||
| registerUpdateIpcHandlers(); | ||
|
|
||
| // Handle microphone permission requests | ||
|
|
@@ -2192,6 +2242,13 @@ app.on('will-quit', async () => { | |
| } | ||
| windowPowerSaveBlockers.clear(); | ||
|
|
||
| // Close MCP proxy server | ||
| if (mcpUIProxyServer) { | ||
| mcpUIProxyServer.close(() => { | ||
| log.info('MCP UI Proxy server closed'); | ||
| }); | ||
| } | ||
aharvard marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| // Unregister all shortcuts when quitting | ||
| globalShortcut.unregisterAll(); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just a note regarding the deletions in this file: previously we were over-handling messages form the iframe, upgrading @mcp-ui/client and using a proxy takes most of this off our plate.