wip

SimiaCryptus · Oct 15, 2023 · 85f08a7 · 85f08a7
1 parent a4b92a0
commit 85f08a7
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 180 deletions.
diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/body/AuthenticatedWebsite.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/body/AuthenticatedWebsite.kt
@@ -62,13 +62,8 @@ open class AuthenticatedWebsite(
      * @param context the `WebAppContext` to configure
      */
     open fun configure(context: WebAppContext, addFilter: Boolean = true): WebAppContext {
-        // Create a ServletHolder for the GoogleLoginServlet and add it to the context
-        val googleServletHolder = ServletHolder("googleLogin", GoogleLoginServlet())
-        context.addServlet(googleServletHolder, "/googleLogin")
-        // Create a ServletHolder for the OAuth2CallbackServlet and add it to the context
-        val callbackServletHolder = ServletHolder("oauth2callback", OAuth2CallbackServlet())
-        context.addServlet(callbackServletHolder, "/oauth2callback")
-        // Add a SessionIdFilter to the context that intercepts every request
+        context.addServlet(ServletHolder("googleLogin", GoogleLoginServlet()), "/googleLogin")
+        context.addServlet(ServletHolder("oauth2callback", OAuth2CallbackServlet()), "/oauth2callback")
         if(addFilter) context.addFilter(FilterHolder(SessionIdFilter()), "/*", EnumSet.of(DispatcherType.REQUEST))
         return context
     }

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/body/SkyenetMacroChat.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/body/SkyenetMacroChat.kt
@@ -116,11 +116,12 @@ abstract class SkyenetMacroChat(
             sessionUI: SessionUI,
             sessionDiv: SessionDiv,
             parameters: T,
-            feedbackFn: (msg: T, t: String) -> Unit,
-            fns: Map<String, (t: T) -> Unit>
+            feedbackFn: (msg: T, feedback: String) -> Unit,
+            fns: Map<String, (obj: T) -> Unit> = mapOf(),
+            toString: (obj: T) -> String = JsonUtil::toJson
         ) = sessionDiv.append(
             """
-            <pre>${JsonUtil.toJson(parameters)}</pre>
+            <pre>${toString(parameters)}</pre>
             <br/>
             ${sessionUI.textInput { feedbackFn(parameters, it) }}
             <br/>
@@ -129,6 +130,7 @@ abstract class SkyenetMacroChat(
             }}
             """, false
         )
+
     }
 
 }

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/body/SkyenetSessionServerBase.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/body/SkyenetSessionServerBase.kt
@@ -13,7 +13,7 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
 abstract class SkyenetSessionServerBase(
-    val applicationName: String,
+    override val applicationName: String,
     val oauthConfig: String? = null,
     resourceBase: String = "simpleSession",
     val baseURL: String = "http://localhost:8080",

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/body/WebSocketServer.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/body/WebSocketServer.kt
@@ -17,6 +17,8 @@ import java.util.*
 
 abstract class WebSocketServer(val resourceBase: String) {
 
+    abstract val applicationName: String
+
     inner class NewSessionServlet : HttpServlet() {
         override fun doGet(req: HttpServletRequest, resp: HttpServletResponse) {
             val sessionId = UUID.randomUUID().toString()

diff --git a/webui/src/main/resources/simple/chat.css b/webui/src/main/resources/simple/chat.css
diff --git a/webui/src/main/resources/simple/chat.js b/webui/src/main/resources/simple/chat.js
diff --git a/webui/src/main/resources/simple/index.html b/webui/src/main/resources/simple/index.html
diff --git a/webui/src/test/kotlin/com/simiacryptus/skyenet/body/TestWebSocketServer.kt b/webui/src/test/kotlin/com/simiacryptus/skyenet/body/TestWebSocketServer.kt