Merge branch 'test-ktor-bug'

pom.xml

@@ -100,24 +100,11 @@
     </build>
 
     <dependencies>
-
-        <dependency>
-            <groupId>io.ktor</groupId>
-            <artifactId>ktor-server-core-jvm</artifactId>
-            <version>${ktor_version}</version>
-        </dependency>
         <dependency>
-            <groupId>io.ktor</groupId>
-            <artifactId>ktor-server-netty-jvm</artifactId>
-            <version>${ktor_version}</version>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-core</artifactId>
+            <version>2.9.3</version> <!-- Use the latest version -->
         </dependency>
-        <dependency>
-            <groupId>io.ktor</groupId>
-            <artifactId>ktor-server-tests-jvm</artifactId>
-            <version>${ktor_version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

src/main/kotlin/org/levi/coffee/Window.kt

@@ -6,11 +6,14 @@ import org.levi.coffee.internal.util.FileUtil
 import org.levi.coffee.internal.MethodBinder
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import spark.Spark.staticFiles
+import spark.Spark.init
+import spark.Spark.stop
 import java.util.Base64
 import java.util.function.Consumer
 import kotlin.system.exitProcess
 
-class Window (withDevTools: Boolean = true) {
+class Window (withDevTools: Boolean = true, val isDev: Boolean = false) {
     private val log: Logger = LoggerFactory.getLogger(this::class.java)
 
     private val _webview: Webview = Webview(withDevTools)
@@ -91,8 +94,18 @@ class Window (withDevTools: Boolean = true) {
 
         _beforeStartCallbacks.forEach(Consumer { it.run() })
         Ipc.setWebview(_webview)
-        _webview.loadURL(_url)
+
+        if (isDev) {
+            _webview.loadURL(_url)
+        }
+        else {
+            staticFiles.location("/dist")
+            _webview.loadURL("http://localhost:4567")
+            init()
+        }
+
         _webview.run()
+        stop()
         _onCloseCallbacks.forEach(Consumer { it.run() })
         _webview.close()
     }

src/test/kotlin/Calculator.kt

@@ -0,0 +1,42 @@
+import org.levi.coffee.Ipc
+import org.levi.coffee.annotations.BindMethod
+
+class Calculator {
+    private var calCount = 0
+
+    @BindMethod
+    fun add(a: Double, b: Double): Double {
+        calCount++
+        dispatch()
+        return a + b
+    }
+    @BindMethod
+    fun sub(a: Double, b: Double): Double {
+        calCount++
+        dispatch()
+        return a - b
+    }
+    @BindMethod
+    fun mul(a: Double, b: Double): Double {
+        calCount++
+        dispatch()
+        return a * b
+    }
+    @BindMethod
+    fun div(a: Double, b: Double): Double {
+        calCount++
+        dispatch()
+        return a / b
+    }
+
+    @BindMethod
+    fun get(): Int {
+        return this.calCount
+    }
+
+    private fun dispatch() {
+        if (calCount % 3 == 0) {
+            Ipc.invoke("count")
+        }
+    }
+}

src/test/kotlin/Main.kt

@@ -1,37 +1,14 @@
-import org.levi.coffee.Ipc
 import org.levi.coffee.Window
-import org.levi.coffee.annotations.BindMethod
-import org.levi.coffee.annotations.BindType
 
-@BindType(ignore = ["age"])
-class Person(
-    val name: String = "",
-    var age: Int = 0,
-    val hobbies: List<String> = emptyList(),
-    val string: Map<Person, List<Person>> = emptyMap(),
-) {
-    @BindMethod
-    fun addTwoNumbers(a: Int, b: Int): Int {
-        return a + b;
-    }
-
-    @BindMethod
-    fun incrementAndPrint() {
-//        age++;
-//        println("My age increased to $age")
-//        println("invoking event...")
-        Ipc.invoke("event")
-    }
-}
 
 fun main() {
-    val win = Window()
+    val win = Window(isDev = true)
     win.setSize(700, 700)
     win.setTitle("My first Javatron app!")
 
     win.setURL("http://localhost:5173")
     win.bind(
-        Person(),
+        Calculator(),
     )
 
     win.addBeforeStartCallback { println("Started app...") }

src/test/kotlin/Serve.kt

@@ -1,16 +1,16 @@
-import io.ktor.server.application.*
-import io.ktor.server.engine.*
-import io.ktor.server.http.content.*
-import io.ktor.server.netty.*
-import io.ktor.server.routing.*
-
-fun main() {
-    embeddedServer(Netty, port = 8080, host = "127.0.0.1") {
-        routing {
-            staticResources("/", "dist") {
-                default("index.html")
-                preCompressed(CompressedFileType.GZIP)
-            }
-        }
-    }.start(wait = true)
-}
+//import io.ktor.server.engine.*
+//import io.ktor.server.http.content.*
+//import io.ktor.server.netty.*
+//import io.ktor.server.routing.*
+//
+//fun main() {
+//    embeddedServer(Netty, port = 8080, host = "127.0.0.1") {
+//        routing {
+//            staticResources("/", "dist2") {
+//                default("index.html")
+//                preCompressed(CompressedFileType.GZIP)
+//            }
+//        }
+//    }.start(wait = false)
+//    println("Hello world")
+//}