Skip to content
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.

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

Updated jcef to latest version and KCEF for improved custom request context handler #83

Merged
merged 3 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion webview/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ kotlin {
val desktopMain by getting {
dependencies {
implementation(compose.desktop.common)
api("dev.datlag:kcef:2023.10.13")
api("dev.datlag:kcef:2024.01.07.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:$coroutines")
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.multiplatform.webview.web

import com.multiplatform.webview.setting.WebSettings
import dev.datlag.kcef.KCEFResourceRequestHandler
import org.cef.browser.CefBrowser
import org.cef.browser.CefFrame
import org.cef.browser.CefRequestContext
import org.cef.network.CefRequest

internal fun createModifiedRequestContext(settings: WebSettings): CefRequestContext {
return CefRequestContext.createContext { browser, frame, request, isNavigation, isDownload, requestInitiator, disableDefaultHandling ->
object : KCEFResourceRequestHandler(
getGlobalDefaultHandler(browser, frame, request, isNavigation, isDownload, requestInitiator, disableDefaultHandling),
) {
override fun onBeforeResourceLoad(
browser: CefBrowser?,
frame: CefFrame?,
request: CefRequest?,
): Boolean {
if (request != null) {
settings.customUserAgentString?.let(request::setUserAgentString)
}
return super.onBeforeResourceLoad(browser, frame, request)
}
}
}
}

internal fun CefRequest.setUserAgentString(userAgent: String) {
setHeaderByName("User-Agent", userAgent, true)
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ fun DesktopWebView(
client,
state.webSettings.desktopWebSettings.offScreenRendering,
state.webSettings.desktopWebSettings.transparent,
state.webSettings,
fileContent,
) {
val rendering =
Expand All @@ -97,6 +98,7 @@ fun DesktopWebView(
current.url,
rendering,
state.webSettings.desktopWebSettings.transparent,
createModifiedRequestContext(state.webSettings),
)

is WebContent.Data ->
Expand All @@ -120,6 +122,7 @@ fun DesktopWebView(
KCEFBrowser.BLANK_URI,
rendering,
state.webSettings.desktopWebSettings.transparent,
createModifiedRequestContext(state.webSettings),
)
}
}
Expand Down