优化

gedoor · Jan 28, 2024 · 9d8cc72 · 9d8cc72
1 parent e3aa72b
commit 9d8cc72
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 27 deletions.
diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/ContextElement.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/ContextElement.kt
diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoCompiledScript.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoCompiledScript.kt
@@ -28,6 +28,7 @@ import com.script.CompiledScript
 import com.script.ScriptContext
 import com.script.ScriptEngine
 import com.script.ScriptException
+import kotlinx.coroutines.asContextElement
 import kotlinx.coroutines.withContext
 import org.mozilla.javascript.*
 import java.io.IOException
@@ -98,7 +99,7 @@ internal class RhinoCompiledScript(
     override suspend fun evalSuspend(scope: Scriptable): Any? {
         val cx = Context.enter()
         var ret: Any?
-        withContext(ContextElement()) {
+        withContext(VMBridgeReflect.contextLocal.asContextElement()) {
             try {
                 try {
                     ret = cx.executeScriptWithContinuations(script, scope)

diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoScriptEngine.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoScriptEngine.kt
@@ -25,6 +25,7 @@
 package com.script.rhino
 
 import com.script.*
+import kotlinx.coroutines.asContextElement
 import kotlinx.coroutines.withContext
 import org.mozilla.javascript.*
 import org.mozilla.javascript.Function
@@ -87,7 +88,7 @@ object RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
     override suspend fun evalSuspend(reader: Reader, scope: Scriptable): Any? {
         val cx = Context.enter()
         var ret: Any?
-        withContext(ContextElement()) {
+        withContext(VMBridgeReflect.contextLocal.asContextElement()) {
             try {
                 var filename = this@RhinoScriptEngine["javax.script.filename"] as? String
                 filename = filename ?: "<Unknown source>"