🦄 refactor: Refactor class JavetShell

console/build.gradle.kts

@@ -29,6 +29,7 @@ version = "0.1.0"
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10")
     implementation("com.caoccao.javet:javet:3.0.2")
+    implementation("com.caoccao.javet:javenode:0.3.0")
 
     // https://github.com/Kotlin/kotlinx-cli
     // https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-cli-jvm

console/src/main/kotlin/com/caoccao/javet/shell/JavetShell.kt → console/src/main/kotlin/com/caoccao/javet/shell/BaseJavetShell.kt

@@ -21,7 +21,6 @@ import com.caoccao.javet.exceptions.JavetCompilationException
 import com.caoccao.javet.exceptions.JavetExecutionException
 import com.caoccao.javet.interop.V8Host
 import com.caoccao.javet.interop.V8Runtime
-import com.caoccao.javet.interop.callback.JavetBuiltInModuleResolver
 import com.caoccao.javet.shell.constants.Constants
 import com.caoccao.javet.shell.entities.Options
 import com.caoccao.javet.shell.enums.ExitCode
@@ -30,15 +29,17 @@ import java.io.File
 import java.util.*
 import java.util.concurrent.TimeUnit
 
-class JavetShell(
-    private val options: Options,
+abstract class BaseJavetShell(
+    protected val options: Options,
 ) : Runnable {
+    protected var v8Runtime: V8Runtime? = null
+
     private var daemonThread: Thread? = null
 
     @Volatile
     private var running = false
 
-    private var v8Runtime: V8Runtime? = null
+    abstract val prompt: String
 
     fun execute(): ExitCode {
         println("${Constants.Application.NAME} v${Constants.Application.VERSION} (${options.jsRuntimeType.name} ${options.jsRuntimeType.version})")
@@ -47,37 +48,14 @@ class JavetShell(
         V8Host.getInstance(options.jsRuntimeType).createV8Runtime<V8Runtime>().use { v8Runtime ->
             running = true
             this.v8Runtime = v8Runtime
-            if (options.jsRuntimeType.isNode) {
-                v8Runtime.v8ModuleResolver = JavetBuiltInModuleResolver()
-                v8Runtime.getExecutor(
-                    """const process = require('process');
-                                    process.on('unhandledRejection', (reason, promise) => {
-                                        console.error();
-                                        console.error(reason.toString());
-                                        console.error();
-                                    });"""
-                ).executeVoid()
-            } else {
-                v8Runtime.setPromiseRejectCallback { _, _, value ->
-                    println()
-                    println(value.toString())
-                    println()
-                }
-            }
+            registerPromiseRejectCallback()
             daemonThread = Thread(this)
             daemonThread?.start()
             Scanner(System.`in`).use { scanner ->
                 val sb = StringBuilder()
                 var isMultiline = false
                 while (running) {
-                    val prompt = if (isMultiline) {
-                        ">>> "
-                    } else if (options.jsRuntimeType.isNode) {
-                        "N > "
-                    } else {
-                        "V > "
-                    }
-                    print(prompt)
+                    print(if (isMultiline) ">>> " else prompt)
                     try {
                         sb.appendLine(scanner.nextLine())
                         v8Runtime
@@ -118,6 +96,8 @@ class JavetShell(
         return ExitCode.NoError
     }
 
+    protected abstract fun registerPromiseRejectCallback()
+
     override fun run() {
         while (running) {
             v8Runtime?.await(V8AwaitMode.RunOnce)

console/src/main/kotlin/com/caoccao/javet/shell/JavetShellNode.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023. caoccao.com Sam Cao
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.caoccao.javet.shell
+
+import com.caoccao.javet.interop.callback.JavetBuiltInModuleResolver
+import com.caoccao.javet.shell.entities.Options
+
+class JavetShellNode(
+    options: Options,
+) : BaseJavetShell(options) {
+    init {
+        assert(options.jsRuntimeType.isNode) { "JS runtime type must be Node." }
+    }
+
+    override val prompt: String
+        get() = "N > "
+
+    override fun registerPromiseRejectCallback() {
+        v8Runtime?.v8ModuleResolver = JavetBuiltInModuleResolver()
+        v8Runtime?.getExecutor(
+            """const process = require('process');
+                                    process.on('unhandledRejection', (reason, promise) => {
+                                        console.error();
+                                        console.error(reason.toString());
+                                        console.error();
+                                    });"""
+        )?.executeVoid()
+    }
+}

console/src/main/kotlin/com/caoccao/javet/shell/JavetShellV8.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2023. caoccao.com Sam Cao
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.caoccao.javet.shell
+
+import com.caoccao.javet.shell.entities.Options
+
+class JavetShellV8(
+    options: Options,
+) : BaseJavetShell(options) {
+    init {
+        assert(options.jsRuntimeType.isV8) { "JS runtime type must be V8." }
+    }
+
+    override val prompt: String
+        get() = "V > "
+
+    override fun registerPromiseRejectCallback() {
+        v8Runtime?.setPromiseRejectCallback { _, _, value ->
+            System.err.println()
+            System.err.println(value.toString())
+            System.err.println()
+        }
+    }
+}

console/src/main/kotlin/com/caoccao/javet/shell/Main.kt

@@ -48,7 +48,11 @@ fun main(args: Array<String>) {
         module,
         scriptName,
     )
-    val javetShell = JavetShell(options)
+    val javetShell = if (options.jsRuntimeType.isNode) {
+        JavetShellNode(options)
+    } else {
+        JavetShellV8(options)
+    }
     val exitCode =
         try {
             javetShell.execute()