🦄 refactor: Remove v8Runtime from property

caoccao · Nov 29, 2023 · d21e6d6 · d21e6d6
1 parent ff5976c
commit d21e6d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/console/src/main/kotlin/com/caoccao/javet/shell/BaseJavetShell.kt b/console/src/main/kotlin/com/caoccao/javet/shell/BaseJavetShell.kt
@@ -34,8 +34,6 @@ import java.util.*
 abstract class BaseJavetShell(
     protected val options: Options,
 ) {
-    protected var v8Runtime: V8Runtime? = null
-
     protected abstract val prompt: String
 
     protected abstract fun createEventLoop(v8Runtime: V8Runtime, options: Options): BaseEventLoop
@@ -47,8 +45,7 @@ abstract class BaseJavetShell(
         V8Host.getInstance(options.jsRuntimeType).createV8Runtime<V8Runtime>().use { v8Runtime ->
             v8Runtime.logger = JavetShellLogger()
             createEventLoop(v8Runtime, options).use { eventLoop ->
-                this.v8Runtime = v8Runtime
-                registerPromiseRejectCallback()
+                registerPromiseRejectCallback(v8Runtime)
                 Scanner(System.`in`).use { scanner ->
                     val sb = StringBuilder()
                     var isESM = false
@@ -126,11 +123,10 @@ abstract class BaseJavetShell(
                     }
 
                 }
-                this.v8Runtime = null
             }
         }
         return ExitCode.NoError
     }
 
-    protected abstract fun registerPromiseRejectCallback()
+    protected abstract fun registerPromiseRejectCallback(v8Runtime: V8Runtime)
 }
diff --git a/console/src/main/kotlin/com/caoccao/javet/shell/JavetShellNode.kt b/console/src/main/kotlin/com/caoccao/javet/shell/JavetShellNode.kt
@@ -34,9 +34,9 @@ class JavetShellNode(
         return EventLoopNode(v8Runtime, options)
     }
 
-    override fun registerPromiseRejectCallback() {
-        v8Runtime?.v8ModuleResolver = JavetBuiltInModuleResolver()
-        v8Runtime?.getExecutor(
+    override fun registerPromiseRejectCallback(v8Runtime: V8Runtime) {
+        v8Runtime.v8ModuleResolver = JavetBuiltInModuleResolver()
+        v8Runtime.getExecutor(
             """const process = require('process');
                                     process.on('unhandledRejection', (reason, promise) => {
                                         console.error();

diff --git a/console/src/main/kotlin/com/caoccao/javet/shell/JavetShellV8.kt b/console/src/main/kotlin/com/caoccao/javet/shell/JavetShellV8.kt
@@ -33,8 +33,8 @@ class JavetShellV8(
         return EventLoopV8(v8Runtime, options)
     }
 
-    override fun registerPromiseRejectCallback() {
-        v8Runtime?.setPromiseRejectCallback { _, _, value ->
+    override fun registerPromiseRejectCallback(v8Runtime: V8Runtime) {
+        v8Runtime.setPromiseRejectCallback { _, _, value ->
             println()
             println(value.toString())
             println()