feat: enables graal store proxy by default.

outofcoffee · Jul 16, 2024 · 25a4298 · 25a4298
1 parent 12225c3
commit 25a4298
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/.../src/main/java/io/gatehill/imposter/scripting/graalvm/service/GraalvmScriptServiceImpl.kt b/.../src/main/java/io/gatehill/imposter/scripting/graalvm/service/GraalvmScriptServiceImpl.kt
@@ -62,7 +62,6 @@ import org.apache.logging.log4j.LogManager
 import org.graalvm.polyglot.Context
 import org.graalvm.polyglot.Engine
 import org.graalvm.polyglot.HostAccess
-import javax.inject.Inject
 
 
 /**
@@ -87,17 +86,29 @@ class GraalvmScriptServiceImpl : ScriptService, Plugin {
         engine = Engine.newBuilder(JS_LANG_ID).build()
     }
 
-    @Inject
-    fun onPostInject() {
-        if (EnvVars.getEnv(ENV_IMPOSTER_GRAAL_STORE_PROXY)?.toBoolean() == true) {
-            LOGGER.debug("Enabling Graal store proxy")
-            val storeFactory = InjectorUtil.getInstance<StoreFactory>()
-            storeFactory.storeInterceptors += { ObjectProxyingStore(it) }
-        }
+    private val enableStoreProxy = EnvVars.getEnv(ENV_IMPOSTER_GRAAL_STORE_PROXY)?.toBoolean() != false
+    private var checkedStoreProxy = false
+
+    override fun initScript(script: ScriptSource) {
+        checkEnableStoreProxy()
     }
 
     override fun initInlineScript(scriptId: String, scriptCode: String) {
-        LOGGER.trace("No op inline script init for script with ID: $scriptId")
+        checkEnableStoreProxy()
+    }
+
+    fun checkEnableStoreProxy() {
+        if (!checkedStoreProxy) {
+            checkedStoreProxy = true
+
+            if (enableStoreProxy) {
+                LOGGER.trace("Graal store proxy enabled")
+                val storeFactory = InjectorUtil.getInstance<StoreFactory>()
+                storeFactory.storeInterceptors += { ObjectProxyingStore(it) }
+            } else {
+                LOGGER.trace("Graal store proxy disabled")
+            }
+        }
     }
 
     override fun executeScript(

diff --git a/scripting/graalvm/src/test/java/io/gatehill/imposter/service/StoreJsonTest.kt b/scripting/graalvm/src/test/java/io/gatehill/imposter/service/StoreJsonTest.kt
@@ -82,6 +82,9 @@ class StoreJsonTest : AbstractBaseScriptTest() {
 
     @Test
     fun `stringify to JSON`() {
+        // init the store proxy
+        getService().checkEnableStoreProxy()
+
         val pluginConfig = configureScript()
         val resourceConfig = pluginConfig as BasicResourceConfig