preset JS_QUERY_POOL_SIZE to reserve JS query pool (aws#4385)

* preset JS_QUERY_POOL_SIZE to reserve JS query pool

* revert dedupe

* lint

* more lint

---------

Co-authored-by: manodnyab <[email protected]>

Author: Will-ShaoHua

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

@@ -102,10 +102,10 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
 ) {
     // TODO: confirm if we need such configuration or the default is fine
     override val jcefBrowser = createBrowser(parentDisposable)
-    override val query = JBCefJSQuery.create(jcefBrowser)
+    private val query = JBCefJSQuery.create(jcefBrowser)
     private val objectMapper = jacksonObjectMapper()
 
-    override val handler = Function<String, JBCefJSQuery.Response> {
+    private val handler = Function<String, JBCefJSQuery.Response> {
         val jsonTree = objectMapper.readTree(it)
         val command = jsonTree.get("command").asText()
         LOG.debug { "Data received from Q browser: ${jsonTree.asText()}" }
@@ -185,7 +185,7 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                 ),
             )
 
-        loadWebView()
+        loadWebView(query)
 
         query.addHandler(handler)
     }
@@ -252,6 +252,10 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
         return
     }
 
+    override fun loadWebView(query: JBCefJSQuery) {
+        jcefBrowser.loadHTML(getWebviewHTML(webScriptUri, query))
+    }
+
     companion object {
         private val LOG = getLogger<QWebviewBrowser>()
         private const val WEB_SCRIPT_URI = "http://webview/js/getStart.js"

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/util/JcefBrowserUtil.kt

@@ -8,9 +8,12 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefApp
 import com.intellij.ui.jcef.JBCefBrowserBase
 import com.intellij.ui.jcef.JBCefBrowserBuilder
+import com.intellij.ui.jcef.JBCefClient
 
 fun createBrowser(parent: Disposable): JBCefBrowserBase {
-    val client = JBCefApp.getInstance().createClient()
+    val client = JBCefApp.getInstance().createClient().apply {
+        setProperty(JBCefClient.Properties.JS_QUERY_POOL_SIZE, 5)
+    }
 
     Disposer.register(parent, client)
 

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt

@@ -25,7 +25,6 @@ import software.aws.toolkits.jetbrains.utils.pollFor
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.FeatureId
 import java.util.concurrent.Future
-import java.util.function.Function
 
 data class BrowserState(val feature: FeatureId, val browserCancellable: Boolean = false, val requireReauth: Boolean = false)
 
@@ -35,12 +34,11 @@ abstract class LoginBrowser(
     val webScriptUri: String
 ) {
     abstract val jcefBrowser: JBCefBrowserBase
-    abstract val query: JBCefJSQuery
-    abstract val handler: Function<String, JBCefJSQuery.Response>
 
     protected var currentAuthorization: PendingAuthorization? = null
 
     protected data class BearerConnectionSelectionSettings(val currentSelection: AwsBearerTokenConnection, val onChange: (AwsBearerTokenConnection) -> Unit)
+
     protected val selectionSettings = mutableMapOf<String, BearerConnectionSelectionSettings>()
 
     protected val onPendingToken: (InteractiveBearerTokenProvider) -> Unit = { provider ->
@@ -104,7 +102,7 @@ abstract class LoginBrowser(
         }
     }
 
-    protected fun<T> loginWithBackgroundContext(action: () -> T): Future<T> =
+    protected fun <T> loginWithBackgroundContext(action: () -> T): Future<T> =
         ApplicationManager.getApplication().executeOnPooledThread<T> {
             runBlocking {
                 withBackgroundProgress(project, message("credentials.pending.title")) {
@@ -115,6 +113,12 @@ abstract class LoginBrowser(
             }
         }
 
+    abstract fun loadWebView(query: JBCefJSQuery)
+
+    protected suspend fun pollForAuthorization(provider: InteractiveBearerTokenProvider): PendingAuthorization? = pollFor {
+        provider.pendingAuthorization
+    }
+
     protected fun reauth(connection: ToolkitConnection?) {
         if (connection is AwsBearerTokenConnection) {
             loginWithBackgroundContext {
@@ -123,15 +127,12 @@ abstract class LoginBrowser(
         }
     }
 
-    protected fun loadWebView() {
-        jcefBrowser.loadHTML(getWebviewHTML())
-    }
+    companion object {
+        fun getWebviewHTML(webScriptUri: String, query: JBCefJSQuery): String {
+            val colorMode = if (JBColor.isBright()) "jb-light" else "jb-dark"
+            val postMessageToJavaJsCode = query.inject("JSON.stringify(message)")
 
-    protected fun getWebviewHTML(): String {
-        val colorMode = if (JBColor.isBright()) "jb-light" else "jb-dark"
-        val postMessageToJavaJsCode = query.inject("JSON.stringify(message)")
-
-        val jsScripts = """
+            val jsScripts = """
             <script>
                 (function() {
                     window.ideApi = {
@@ -142,9 +143,9 @@ abstract class LoginBrowser(
                 }())
             </script>
             <script type="text/javascript" src="$webScriptUri"></script>
-        """.trimIndent()
+            """.trimIndent()
 
-        return """
+            return """
             <!DOCTYPE html>
             <html>
                 <head>
@@ -155,10 +156,7 @@ abstract class LoginBrowser(
                     $jsScripts
                 </body>
             </html>
-        """.trimIndent()
-    }
-
-    protected suspend fun pollForAuthorization(provider: InteractiveBearerTokenProvider): PendingAuthorization? = pollFor {
-        provider.pendingAuthorization
+            """.trimIndent()
+        }
     }
 }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt

@@ -23,6 +23,7 @@ import com.intellij.ui.dsl.gridLayout.VerticalAlign
 import com.intellij.ui.jcef.JBCefApp
 import com.intellij.ui.jcef.JBCefBrowserBase
 import com.intellij.ui.jcef.JBCefBrowserBuilder
+import com.intellij.ui.jcef.JBCefClient
 import com.intellij.ui.jcef.JBCefJSQuery
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.awaitClose
@@ -145,18 +146,21 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable:
     ToolkitWebviewBrowser.WEB_SCRIPT_URI
 ) {
     // TODO: confirm if we need such configuration or the default is fine
+    // TODO: move JcefBrowserUtils to core
     override val jcefBrowser: JBCefBrowserBase by lazy {
-        val client = JBCefApp.getInstance().createClient()
+        val client = JBCefApp.getInstance().createClient().apply {
+            setProperty(JBCefClient.Properties.JS_QUERY_POOL_SIZE, 5)
+        }
         Disposer.register(parentDisposable, client)
         JBCefBrowserBuilder()
             .setClient(client)
             .setOffScreenRendering(true)
             .build()
     }
-    override val query: JBCefJSQuery = JBCefJSQuery.create(jcefBrowser)
+    private val query: JBCefJSQuery = JBCefJSQuery.create(jcefBrowser)
     private val objectMapper = jacksonObjectMapper()
 
-    override val handler = Function<String, JBCefJSQuery.Response> {
+    private val handler = Function<String, JBCefJSQuery.Response> {
         val jsonTree = objectMapper.readTree(it)
         val command = jsonTree.get("command").asText()
         LOG.debug { "Data received from Toolkit browser: ${jsonTree.toPrettyString()}" }
@@ -246,7 +250,7 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable:
                 ),
             )
 
-        loadWebView()
+        loadWebView(query)
 
         query.addHandler(handler)
     }
@@ -335,6 +339,10 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable:
         }
     }
 
+    override fun loadWebView(query: JBCefJSQuery) {
+        jcefBrowser.loadHTML(getWebviewHTML(webScriptUri, query))
+    }
+
     fun component(): JComponent? = jcefBrowser.component
 
     companion object {