优化

rhino/src/main/java/com/script/AbstractScriptEngine.kt

@@ -3,7 +3,9 @@
  */
 package com.script
 
+import org.mozilla.javascript.Scriptable
 import java.io.Reader
+import java.io.StringReader
 
 abstract class AbstractScriptEngine(val bindings: Bindings? = null) : ScriptEngine {
 
@@ -51,6 +53,15 @@ abstract class AbstractScriptEngine(val bindings: Bindings? = null) : ScriptEngi
         return nn?.get(key)
     }
 
+    override fun eval(script: String, scope: Scriptable): Any? {
+        return this.eval(StringReader(script), scope)
+    }
+
+    @Throws(ScriptException::class)
+    override fun eval(reader: Reader, context: ScriptContext): Any? {
+        return this.eval(reader, getRuntimeScope(context))
+    }
+
     @Throws(ScriptException::class)
     override fun eval(reader: Reader, bindings: Bindings): Any? {
         return this.eval(reader, getScriptContext(bindings))
@@ -71,13 +82,18 @@ abstract class AbstractScriptEngine(val bindings: Bindings? = null) : ScriptEngi
         return this.eval(script, context)
     }
 
-    protected fun getScriptContext(nn: Bindings): ScriptContext {
+    @Throws(ScriptException::class)
+    override fun eval(script: String, context: ScriptContext): Any? {
+        return this.eval(StringReader(script), context)
+    }
+
+    override fun getScriptContext(bindings: Bindings): ScriptContext {
         val ctx = SimpleScriptContext()
         val gs = getBindings(200)
         if (gs != null) {
             ctx.setBindings(gs, 200)
         }
-        ctx.setBindings(nn, 100)
+        ctx.setBindings(bindings, 100)
         ctx.reader = context.reader
         ctx.writer = context.writer
         ctx.errorWriter = context.errorWriter

rhino/src/main/java/com/script/ScriptEngine.kt

@@ -3,6 +3,7 @@
  */
 package com.script
 
+import org.mozilla.javascript.Scriptable
 import java.io.Reader
 
 interface ScriptEngine {
@@ -10,6 +11,12 @@ interface ScriptEngine {
 
     fun createBindings(): Bindings?
 
+    @Throws(ScriptException::class)
+    fun eval(reader: Reader, scope: Scriptable): Any?
+
+    @Throws(ScriptException::class)
+    fun eval(script: String, scope: Scriptable): Any?
+
     @Throws(ScriptException::class)
     fun eval(reader: Reader): Any?
 
@@ -28,6 +35,10 @@ interface ScriptEngine {
     @Throws(ScriptException::class)
     fun eval(script: String, context: ScriptContext): Any?
 
+    fun getRuntimeScope(context: ScriptContext): Scriptable
+
+    fun getScriptContext(bindings: Bindings): ScriptContext
+
     operator fun get(key: String): Any?
 
     fun getBindings(scope: Int): Bindings?

rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt

@@ -48,6 +48,32 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
     private val indexedProps: MutableMap<Any, Any?>
     private val implementor: InterfaceImplementor
 
+    @Throws(ScriptException::class)
+    override fun eval(reader: Reader, scope: Scriptable): Any? {
+        val cx = Context.enter()
+        val ret: Any?
+        try {
+            var filename = this["javax.script.filename"] as? String
+            filename = filename ?: "<Unknown source>"
+            ret = cx.evaluateReader(scope, reader, filename, 1, null)
+        } catch (re: RhinoException) {
+            val line = if (re.lineNumber() == 0) -1 else re.lineNumber()
+            val msg: String = if (re is JavaScriptException) {
+                re.value.toString()
+            } else {
+                re.toString()
+            }
+            val se = ScriptException(msg, re.sourceName(), line)
+            se.initCause(re)
+            throw se
+        } catch (var14: IOException) {
+            throw ScriptException(var14)
+        } finally {
+            Context.exit()
+        }
+        return unwrapReturnValue(ret)
+    }
+
     @Throws(ScriptException::class)
     override fun eval(reader: Reader, context: ScriptContext): Any? {
         val cx = Context.enter()
@@ -75,11 +101,6 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
         return unwrapReturnValue(ret)
     }
 
-    @Throws(ScriptException::class)
-    override fun eval(script: String, context: ScriptContext): Any? {
-        return this.eval(StringReader(script) as Reader, context)
-    }
-
     override fun createBindings(): Bindings {
         return SimpleBindings()
     }
@@ -152,7 +173,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
         }
     }
 
-    fun getRuntimeScope(context: ScriptContext): Scriptable {
+    override fun getRuntimeScope(context: ScriptContext): Scriptable {
         val newScope: Scriptable = ExternalScriptable(context, indexedProps)
         newScope.prototype = topLevel
         newScope.put("context", newScope, context)