Skip to content

refac: webview message handling #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Classic298 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refac: webview message handling #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/preload/content-preload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { ipcRenderer, contextBridge } from 'electron'
// This preload is a dumb relay. It passes typed {type, data}
// messages between the embedder (desktop renderer) and the
// Open WebUI page. Business logic lives elsewhere.
// To add new features, just add new event types — this file
// never needs to change.

type EventCallback = (data: any) => void
const eventCallbacks: EventCallback[] = []
Expand Down
17 changes: 6 additions & 11 deletions src/renderer/src/lib/components/Main/Connections/Content.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,19 +197,14 @@
// Handle auth token relay from webview
if (requestData.type === 'token:update' && requestData.token) {
window.electronAPI.setAuthToken?.(requestData.token)
return
}

try {
const response = await window.electronAPI[requestData.type]?.(requestData)
if (requestData._requestId) {
wv.send('desktop:response', {
_responseId: requestData._requestId,
data: response
})
}
} catch (e) {
console.error('webview:send handler error:', e)
// Never dispatch on a guest-supplied type; always reply so its send() promise settles.
if (requestData._requestId) {
wv.send('desktop:response', {
_responseId: requestData._requestId,
data: null
})
}
} else if (event.channel === 'webview:load') {
const page = event.args?.[0]
Expand Down