fix #4

MAIF · Nov 18, 2024 · ac0d6c8 · ac0d6c8
1 parent f0327c5
commit ac0d6c8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/main/scala/io/otoroshi/wasm4s/impl/opa.scala b/src/main/scala/io/otoroshi/wasm4s/impl/opa.scala
@@ -167,9 +167,9 @@ object OPA extends AwaitCapable {
     )
   }
 
-  def getLinearMemories(): Seq[LinearMemory] = {
+  def getLinearMemories(size: Int): Seq[LinearMemory] = {
     Seq(
-      new LinearMemory("memory", "env", new LinearMemoryOptions(4, Optional.empty()))
+      new LinearMemory("memory", "env", new LinearMemoryOptions(size, Optional.empty()))
     )
   }
 
@@ -255,7 +255,6 @@ object OPA extends AwaitCapable {
     val ret = plugin.call("opa_eval", ptr, 1)
 
     val memory = plugin.getLinearMemory( "env", "memory")
-
     val offset: Int    = ret.getValue(0).v.i32
     val arraySize: Int = 65356
 

diff --git a/src/main/scala/io/otoroshi/wasm4s/scaladsl/opa.scala b/src/main/scala/io/otoroshi/wasm4s/scaladsl/opa.scala
@@ -14,7 +14,7 @@ object LinearMemories {
     if (config.opa) {
       if (memories.get.isEmpty) {
         memories.set(
-          io.otoroshi.wasm4s.impl.OPA.getLinearMemories()
+          io.otoroshi.wasm4s.impl.OPA.getLinearMemories(config.memoryPages)
         )
       }
       memories.get().toArray

diff --git a/src/test/scala/io/otoroshi/wasm4s/test/WasmSpec.scala b/src/test/scala/io/otoroshi/wasm4s/test/WasmSpec.scala
@@ -2,7 +2,7 @@ package io.otoroshi.wasm4s.test
 
 import io.otoroshi.wasm4s.scaladsl._
 import io.otoroshi.wasm4s.scaladsl.implicits._
-import play.api.libs.json.Json
+import play.api.libs.json.{JsArray, Json}
 
 import scala.concurrent.Await
 import scala.concurrent.duration.DurationInt
@@ -68,13 +68,13 @@ class WasmSpec extends munit.FunSuite {
   }
 
   test("opa manual setup with auto release should work") {
-
     import wasmIntegration.executionContext
-
     val callCtx = Json.obj("request" -> Json.obj("headers" -> Json.obj("foo" -> "bar"))).stringify
+    val cc = callCtx
+    println(s"payload size: ${cc.size}")
     val fu = wasmIntegration.withPooledVm(wasmStore.wasmConfigurationUnsafe("opa")) { vm =>
-      vm.ensureOpaInitialized(callCtx.some).call(
-        WasmFunctionParameters.OPACall("execute", vm.getOpaPointers(), callCtx), None
+      vm.ensureOpaInitialized(cc.some).call(
+        WasmFunctionParameters.OPACall("execute", vm.getOpaPointers(), cc), None
       ).map {
         case Left(error) => println(s"error: ${error.prettify}")
         case Right((out, _)) => {