Update CSS JsMessageHandler signature (#6560)

landomen · web-flow · commit 4b32ad063acc · 2025-08-12T15:57:24.000+02:00
Task/Issue URL: https://app.asana.com/1/137249556945/project/1203581873609357/task/1211022776812662?focus=true ### Description Updates the signature of the JsMessageHelper.process function to receive an instance of `JsMessaging` which will allow handlers to send a response directly without going through `JsMessageCallback` ### Steps to test this PR - [x] QA optional - [x] Although no changes to the message handler implementations were made, you can verify that Subscriptions, Identity Theft Restoration, DuckPlayer and other features that use Web / Native communication are still working.
diff --git a/breakage-reporting/breakage-reporting-impl/src/main/java/com/duckduckgo/breakagereporting/impl/BreakageContentScopeJsMessageHandler.kt b/breakage-reporting/breakage-reporting-impl/src/main/java/com/duckduckgo/breakagereporting/impl/BreakageContentScopeJsMessageHandler.kt
@@ -21,6 +21,7 @@ import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.js.messaging.api.JsMessage
 import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessageHandler
+import com.duckduckgo.js.messaging.api.JsMessaging
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 
@@ -30,7 +31,7 @@ class BreakageContentScopeJsMessageHandler @Inject constructor() : ContentScopeJ
     override fun getJsMessageHandler(): JsMessageHandler = object : JsMessageHandler {
         override fun process(
             jsMessage: JsMessage,
-            secret: String,
+            jsMessaging: JsMessaging,
             jsMessageCallback: JsMessageCallback?,
         ) {
             jsMessageCallback?.process(featureName, jsMessage.method, jsMessage.id, jsMessage.params)
diff --git a/breakage-reporting/breakage-reporting-impl/src/test/java/com/duckduckgo/breakagereporting/impl/BreakageContentScopeJsMessageHandlerTest.kt b/breakage-reporting/breakage-reporting-impl/src/test/java/com/duckduckgo/breakagereporting/impl/BreakageContentScopeJsMessageHandlerTest.kt
@@ -6,6 +6,7 @@ import kotlinx.coroutines.test.runTest
 import org.json.JSONObject
 import org.junit.Assert.*
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class BreakageContentScopeJsMessageHandlerTest {
     private val handler = BreakageContentScopeJsMessageHandler().getJsMessageHandler()
@@ -20,7 +21,7 @@ class BreakageContentScopeJsMessageHandlerTest {
             params = JSONObject(),
         )
 
-        handler.process(message, "secret", callback)
+        handler.process(message, mock(), callback)
 
         assertEquals(1, callback.counter)
     }
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsJsMessaging.kt b/content-scope-scripts/content-scope-scripts-impl/src/main/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsJsMessaging.kt
@@ -82,7 +82,7 @@ class ContentScopeScriptsJsMessaging @Inject constructor(
                     handlers.getPlugins().map { it.getJsMessageHandler() }.firstOrNull {
                         it.methods.contains(jsMessage.method) && it.featureName == jsMessage.featureName &&
                             (it.allowedDomains.isEmpty() || it.allowedDomains.contains(domain))
-                    }?.process(jsMessage, secret, jsMessageCallback)
+                    }?.process(jsMessage, this, jsMessageCallback)
                 }
             }
         } catch (e: Exception) {
diff --git a/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsJsMessagingTest.kt b/content-scope-scripts/content-scope-scripts-impl/src/test/java/com/duckduckgo/contentscopescripts/impl/messaging/ContentScopeScriptsJsMessagingTest.kt
@@ -26,6 +26,7 @@ import com.duckduckgo.js.messaging.api.JsMessage
 import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessageHandler
 import com.duckduckgo.js.messaging.api.JsMessageHelper
+import com.duckduckgo.js.messaging.api.JsMessaging
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.test.runTest
 import org.json.JSONObject
@@ -59,7 +60,7 @@ class ContentScopeScriptsJsMessagingTest {
                 return object : JsMessageHandler {
                     override fun process(
                         jsMessage: JsMessage,
-                        secret: String,
+                        jsMessaging: JsMessaging,
                         jsMessageCallback: JsMessageCallback?,
                     ) {
                         jsMessageCallback?.process(jsMessage.featureName, jsMessage.method, jsMessage.id, jsMessage.params)
diff --git a/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/messaging/DuckChatContentScopeJsMessageHandler.kt b/duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/messaging/DuckChatContentScopeJsMessageHandler.kt
@@ -22,13 +22,14 @@ import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.js.messaging.api.JsMessage
 import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessageHandler
+import com.duckduckgo.js.messaging.api.JsMessaging
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 
 @ContributesMultibinding(AppScope::class)
 class DuckChatContentScopeJsMessageHandler @Inject constructor() : ContentScopeJsMessageHandlersPlugin {
     override fun getJsMessageHandler(): JsMessageHandler = object : JsMessageHandler {
-        override fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?) {
+        override fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?) {
             jsMessageCallback?.process(featureName, jsMessage.method, jsMessage.id ?: "", jsMessage.params)
         }
 
diff --git a/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/messaging/DuckChatContentScopeJsMessageHandlerTest.kt b/duckchat/duckchat-impl/src/test/kotlin/com/duckduckgo/duckchat/impl/messaging/DuckChatContentScopeJsMessageHandlerTest.kt
@@ -5,6 +5,7 @@ import com.duckduckgo.js.messaging.api.JsMessageCallback
 import org.json.JSONObject
 import org.junit.Assert.*
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class DuckChatContentScopeJsMessageHandlerTest {
     private val handler = DuckChatContentScopeJsMessageHandler().getJsMessageHandler()
@@ -19,7 +20,7 @@ class DuckChatContentScopeJsMessageHandlerTest {
             params = JSONObject(),
         )
 
-        handler.process(message, "secret", callback)
+        handler.process(message, mock(), callback)
 
         assertEquals(1, callback.counter)
     }
diff --git a/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerScriptsJsMessaging.kt b/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerScriptsJsMessaging.kt
@@ -67,7 +67,7 @@ class DuckPlayerScriptsJsMessaging @Inject constructor(
                 if (this.secret == secret && context == jsMessage.context && isUrlAllowed(url)) {
                     handlers.firstOrNull {
                         it.methods.contains(jsMessage.method) && it.featureName == jsMessage.featureName
-                    }?.process(jsMessage, secret, jsMessageCallback)
+                    }?.process(jsMessage, this, jsMessageCallback)
                 }
             }
         } catch (e: Exception) {
@@ -116,7 +116,7 @@ class DuckPlayerScriptsJsMessaging @Inject constructor(
     }
 
     inner class DuckPlayerPageHandler : JsMessageHandler {
-        override fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?) {
+        override fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?) {
             jsMessageCallback?.process(featureName, jsMessage.method, jsMessage.id ?: "", jsMessage.params)
         }
 
diff --git a/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/messaging/DuckPlayerContentScopeJsMessageHandler.kt b/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/messaging/DuckPlayerContentScopeJsMessageHandler.kt
@@ -24,13 +24,14 @@ import com.duckduckgo.duckplayer.api.YOUTUBE_MOBILE_HOST
 import com.duckduckgo.js.messaging.api.JsMessage
 import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessageHandler
+import com.duckduckgo.js.messaging.api.JsMessaging
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 
 @ContributesMultibinding(AppScope::class)
 class DuckPlayerContentScopeJsMessageHandler @Inject constructor() : ContentScopeJsMessageHandlersPlugin {
     override fun getJsMessageHandler(): JsMessageHandler = object : JsMessageHandler {
-        override fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?) {
+        override fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?) {
             jsMessageCallback?.process(featureName, jsMessage.method, jsMessage.id ?: "", jsMessage.params)
         }
 
diff --git a/duckplayer/duckplayer-impl/src/test/kotlin/com/duckduckgo/duckplayer/impl/messaging/DuckPlayerContentScopeJsMessageHandlerTest.kt b/duckplayer/duckplayer-impl/src/test/kotlin/com/duckduckgo/duckplayer/impl/messaging/DuckPlayerContentScopeJsMessageHandlerTest.kt
@@ -5,6 +5,7 @@ import com.duckduckgo.js.messaging.api.JsMessageCallback
 import org.json.JSONObject
 import org.junit.Assert.*
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class DuckPlayerContentScopeJsMessageHandlerTest {
     private val handler = DuckPlayerContentScopeJsMessageHandler().getJsMessageHandler()
@@ -19,7 +20,7 @@ class DuckPlayerContentScopeJsMessageHandlerTest {
             params = JSONObject(),
         )
 
-        handler.process(message, "secret", callback)
+        handler.process(message, mock(), callback)
 
         assertEquals(1, callback.counter)
     }
diff --git a/js-messaging/js-messaging-api/src/main/java/com/duckduckgo/js/messaging/api/JsMessaging.kt b/js-messaging/js-messaging-api/src/main/java/com/duckduckgo/js/messaging/api/JsMessaging.kt
@@ -88,7 +88,7 @@ interface JsMessageHandler {
      * This method processes a [JsMessage] and can return a JsRequestResponse to reply to the message if needed
      * @return `JsRequestResponse` or `null`
      */
-    fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?)
+    fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?)
 
     /**
      * List of domains where we can process the message
diff --git a/pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/scripts/PirMessagingInterface.kt b/pir/pir-internal/src/main/java/com/duckduckgo/pir/internal/scripts/PirMessagingInterface.kt
@@ -81,7 +81,7 @@ class PirMessagingInterface @Inject constructor(
                 if (this.secret == secret && context == jsMessage.context) {
                     handlers.firstOrNull {
                         it.methods.contains(jsMessage.method) && it.featureName == jsMessage.featureName
-                    }?.process(jsMessage, secret, jsMessageCallback)
+                    }?.process(jsMessage, this, jsMessageCallback)
                 }
             }
         } catch (e: Exception) {
@@ -109,7 +109,7 @@ class PirMessagingInterface @Inject constructor(
     inner class BrokerProtectionMessageHandler() : JsMessageHandler {
         override fun process(
             jsMessage: JsMessage,
-            secret: String,
+            jsMessaging: JsMessaging,
             jsMessageCallback: JsMessageCallback?,
         ) {
             logcat { "PIR-CSS: BrokerProtectionMessageHandler: process $jsMessage" }
diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/ItrMessagingInterface.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/ItrMessagingInterface.kt
@@ -69,7 +69,7 @@ class ItrMessagingInterface @Inject constructor(
                 if (this.secret == secret && context == jsMessage.context && isUrlAllowed(url)) {
                     handlers.firstOrNull {
                         it.methods.contains(jsMessage.method) && it.featureName == jsMessage.featureName
-                    }?.process(jsMessage, secret, jsMessageCallback)
+                    }?.process(jsMessage, this, jsMessageCallback)
                 }
             }
         } catch (e: Exception) {
@@ -107,7 +107,7 @@ class ItrMessagingInterface @Inject constructor(
         private val dispatcherProvider: DispatcherProvider,
     ) : JsMessageHandler {
 
-        override fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?) {
+        override fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?) {
             if (jsMessage.id == null) return
 
             val pat: AccessTokenResult = runBlocking(dispatcherProvider.io()) {
diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionMessagingInterface.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionMessagingInterface.kt
@@ -89,7 +89,7 @@ class SubscriptionMessagingInterface @Inject constructor(
                 if (this.secret == secret && context == jsMessage.context && isUrlAllowed(url)) {
                     handlers.firstOrNull {
                         it.methods.contains(jsMessage.method) && it.featureName == jsMessage.featureName
-                    }?.process(jsMessage, secret, jsMessageCallback)
+                    }?.process(jsMessage, this, jsMessageCallback)
                 }
             }
         } catch (e: Exception) {
@@ -138,7 +138,7 @@ class SubscriptionMessagingInterface @Inject constructor(
     }
 
     inner class SubscriptionsHandler : JsMessageHandler {
-        override fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?) {
+        override fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?) {
             jsMessageCallback?.process(featureName, jsMessage.method, jsMessage.id, jsMessage.params)
         }
 
@@ -159,7 +159,7 @@ class SubscriptionMessagingInterface @Inject constructor(
         private val dispatcherProvider: DispatcherProvider,
     ) : JsMessageHandler {
 
-        override fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?) {
+        override fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?) {
             if (jsMessage.id == null) return
 
             val authToken: String? = runBlocking(dispatcherProvider.io()) {
@@ -204,7 +204,7 @@ class SubscriptionMessagingInterface @Inject constructor(
         private val pixelSender: SubscriptionPixelSender,
         private val subscriptionsChecker: SubscriptionsChecker,
     ) : JsMessageHandler {
-        override fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?) {
+        override fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?) {
             try {
                 val token = jsMessage.params.getString("token")
                 appCoroutineScope.launch(dispatcherProvider.io()) {
@@ -233,7 +233,7 @@ class SubscriptionMessagingInterface @Inject constructor(
 
         override fun process(
             jsMessage: JsMessage,
-            secret: String,
+            jsMessaging: JsMessaging,
             jsMessageCallback: JsMessageCallback?,
         ) {
             val (accessToken, refreshToken) = try {
@@ -267,7 +267,7 @@ class SubscriptionMessagingInterface @Inject constructor(
     ) : JsMessageHandler {
         override fun process(
             jsMessage: JsMessage,
-            secret: String,
+            jsMessaging: JsMessaging,
             jsMessageCallback: JsMessageCallback?,
         ) {
             appCoroutineScope.launch {
@@ -324,7 +324,7 @@ class SubscriptionMessagingInterface @Inject constructor(
 
         override fun process(
             jsMessage: JsMessage,
-            secret: String,
+            jsMessaging: JsMessaging,
             jsMessageCallback: JsMessageCallback?,
         ) {
             val jsMessageId = jsMessage.id ?: return
@@ -360,7 +360,7 @@ class SubscriptionMessagingInterface @Inject constructor(
 
         override fun process(
             jsMessage: JsMessage,
-            secret: String,
+            jsMessaging: JsMessaging,
             jsMessageCallback: JsMessageCallback?,
         ) {
             val jsMessageId = jsMessage.id ?: return
@@ -398,7 +398,7 @@ class SubscriptionMessagingInterface @Inject constructor(
     ) : JsMessageHandler {
         override fun process(
             jsMessage: JsMessage,
-            secret: String,
+            jsMessaging: JsMessaging,
             jsMessageCallback: JsMessageCallback?,
         ) {
             val jsMessageId = jsMessage.id ?: return
diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionsContentScopeJsMessageHandler.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionsContentScopeJsMessageHandler.kt
@@ -22,14 +22,15 @@ import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.js.messaging.api.JsMessage
 import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessageHandler
+import com.duckduckgo.js.messaging.api.JsMessaging
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 
 @ContributesMultibinding(AppScope::class)
 class SubscriptionsContentScopeJsMessageHandler @Inject constructor() : ContentScopeJsMessageHandlersPlugin {
 
     override fun getJsMessageHandler(): JsMessageHandler = object : JsMessageHandler {
-        override fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?) {
+        override fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?) {
             jsMessageCallback?.process(featureName, jsMessage.method, jsMessage.id ?: "", jsMessage.params)
         }
 
diff --git a/subscriptions/subscriptions-impl/src/test/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionsContentScopeJsMessageHandlerTest.kt b/subscriptions/subscriptions-impl/src/test/java/com/duckduckgo/subscriptions/impl/messaging/SubscriptionsContentScopeJsMessageHandlerTest.kt
@@ -6,6 +6,7 @@ import kotlinx.coroutines.test.runTest
 import org.json.JSONObject
 import org.junit.Assert.*
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class SubscriptionsContentScopeJsMessageHandlerTest {
     private val handler = SubscriptionsContentScopeJsMessageHandler().getJsMessageHandler()
@@ -20,7 +21,7 @@ class SubscriptionsContentScopeJsMessageHandlerTest {
             params = JSONObject(),
         )
 
-        handler.process(message, "secret", callback)
+        handler.process(message, mock(), callback)
 
         assertEquals(1, callback.counter)
     }
diff --git a/web-compat/web-compat-impl/src/main/java/com/duckduckgo/webcompat/impl/messaging/WebCompatContentScopeJsMessageHandler.kt b/web-compat/web-compat-impl/src/main/java/com/duckduckgo/webcompat/impl/messaging/WebCompatContentScopeJsMessageHandler.kt
@@ -21,6 +21,7 @@ import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.js.messaging.api.JsMessage
 import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessageHandler
+import com.duckduckgo.js.messaging.api.JsMessaging
 import com.squareup.anvil.annotations.ContributesMultibinding
 import javax.inject.Inject
 
@@ -30,7 +31,7 @@ class WebCompatContentScopeJsMessageHandler @Inject constructor() : ContentScope
     override fun getJsMessageHandler(): JsMessageHandler = object : JsMessageHandler {
         override fun process(
             jsMessage: JsMessage,
-            secret: String,
+            jsMessaging: JsMessaging,
             jsMessageCallback: JsMessageCallback?,
         ) {
             if (jsMessage.id == null) return
diff --git a/web-compat/web-compat-impl/src/test/java/com/duckduckgo/webcompat/impl/messaging/WebCompatContentScopeJsMessageHandlerTest.kt b/web-compat/web-compat-impl/src/test/java/com/duckduckgo/webcompat/impl/messaging/WebCompatContentScopeJsMessageHandlerTest.kt
@@ -5,6 +5,7 @@ import com.duckduckgo.js.messaging.api.JsMessageCallback
 import org.json.JSONObject
 import org.junit.Assert.*
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class WebCompatContentScopeJsMessageHandlerTest {
     private val handler = WebCompatContentScopeJsMessageHandler().getJsMessageHandler()
@@ -19,7 +20,7 @@ class WebCompatContentScopeJsMessageHandlerTest {
             params = JSONObject(),
         )
 
-        handler.process(message, "secret", callback)
+        handler.process(message, mock(), callback)
 
         assertEquals(1, callback.counter)
     }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import kotlinx.coroutines.test.runTest`
`6`	`6`	`import org.json.JSONObject`
`7`	`7`	`import org.junit.Assert.*`
`8`	`8`	`import org.junit.Test`
	`9`	`+import org.mockito.kotlin.mock`
`9`	`10`
`10`	`11`	`class BreakageContentScopeJsMessageHandlerTest {`
`11`	`12`	`private val handler = BreakageContentScopeJsMessageHandler().getJsMessageHandler()`
`@@ -20,7 +21,7 @@ class BreakageContentScopeJsMessageHandlerTest {`
`20`	`21`	`params = JSONObject(),`
`21`	`22`	`)`
`22`	`23`
`23`		`- handler.process(message, "secret", callback)`
	`24`	`+ handler.process(message, mock(), callback)`
`24`	`25`
`25`	`26`	`assertEquals(1, callback.counter)`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class ContentScopeScriptsJsMessaging @Inject constructor(`
`82`	`82`	`handlers.getPlugins().map { it.getJsMessageHandler() }.firstOrNull {`
`83`	`83`	`it.methods.contains(jsMessage.method) && it.featureName == jsMessage.featureName &&`
`84`	`84`	`(it.allowedDomains.isEmpty() \|\| it.allowedDomains.contains(domain))`
`85`		`- }?.process(jsMessage, secret, jsMessageCallback)`
	`85`	`+ }?.process(jsMessage, this, jsMessageCallback)`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`} catch (e: Exception) {`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import com.duckduckgo.js.messaging.api.JsMessageCallback`
`5`	`5`	`import org.json.JSONObject`
`6`	`6`	`import org.junit.Assert.*`
`7`	`7`	`import org.junit.Test`
	`8`	`+import org.mockito.kotlin.mock`
`8`	`9`
`9`	`10`	`class DuckChatContentScopeJsMessageHandlerTest {`
`10`	`11`	`private val handler = DuckChatContentScopeJsMessageHandler().getJsMessageHandler()`
`@@ -19,7 +20,7 @@ class DuckChatContentScopeJsMessageHandlerTest {`
`19`	`20`	`params = JSONObject(),`
`20`	`21`	`)`
`21`	`22`
`22`		`- handler.process(message, "secret", callback)`
	`23`	`+ handler.process(message, mock(), callback)`
`23`	`24`
`24`	`25`	`assertEquals(1, callback.counter)`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class DuckPlayerScriptsJsMessaging @Inject constructor(`
`67`	`67`	`if (this.secret == secret && context == jsMessage.context && isUrlAllowed(url)) {`
`68`	`68`	`handlers.firstOrNull {`
`69`	`69`	`it.methods.contains(jsMessage.method) && it.featureName == jsMessage.featureName`
`70`		`- }?.process(jsMessage, secret, jsMessageCallback)`
	`70`	`+ }?.process(jsMessage, this, jsMessageCallback)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`} catch (e: Exception) {`
`@@ -116,7 +116,7 @@ class DuckPlayerScriptsJsMessaging @Inject constructor(`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`inner class DuckPlayerPageHandler : JsMessageHandler {`
`119`		`- override fun process(jsMessage: JsMessage, secret: String, jsMessageCallback: JsMessageCallback?) {`
	`119`	`+ override fun process(jsMessage: JsMessage, jsMessaging: JsMessaging, jsMessageCallback: JsMessageCallback?) {`
`120`	`120`	`jsMessageCallback?.process(featureName, jsMessage.method, jsMessage.id ?: "", jsMessage.params)`
`121`	`121`	`}`
`122`	`122`