Fixed some things

TheCGuyGitHub · Jun 30, 2024 · 113c33d · 113c33d
1 parent 5a3540e
commit 113c33d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4,674 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -33,5 +33,5 @@ jobs:
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v2
         with:
-          name: skRedis-Artifact
+          name: CloudNet-Rest-Module
           path: build/libs/CloudNet-Rest-Module-1.0-SNAPSHOT-all.jar
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -39,9 +39,7 @@ dependencies {
     implementation("com.google.code.gson:gson:2.8.9")
 
 }
-tasks.withType<Jar> {
-    destinationDirectory = File("D:\\Christian\\DEV\\LocalWerk\\modules")
-}
+
 
 tasks {
     compileJava {

diff --git a/src/main/kotlin/io/github/thecguy/cloudnet_rest_module/CloudNet-Rest-Module.kt b/src/main/kotlin/io/github/thecguy/cloudnet_rest_module/CloudNet-Rest-Module.kt
@@ -22,7 +22,6 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.jetbrains.annotations.NotNull
 
-
 @Singleton
 class `CloudNet-Rest-Module` : DriverModule() {
 
@@ -51,16 +50,28 @@ class `CloudNet-Rest-Module` : DriverModule() {
     }
 
 
-
-
-
-    private fun json(cloudServiceManager: CloudServiceManager): JSONObject {
+    fun services(cloudServiceManager: CloudServiceManager): JSONObject {
         val ser = cloudServiceManager.services()
-        val thing = JSONObject()
-        thing.put("", 2)
+        val servicesArray = JSONArray()
+
+        ser.forEach { service ->
+            val serviceObject = JSONObject()
+            serviceObject.put("Name", service.name())
+            val addressObject = JSONObject()
+            addressObject.put("host", service.address().host)
+            addressObject.put("port", service.address().port)
+            serviceObject.put("Address", addressObject)
+            serviceObject.put("Connected", service.connected())
+            serviceObject.put("LifeCycle", service.lifeCycle())
+            serviceObject.put("CreationTime", service.creationTime())
+            serviceObject.put("ConnectedTime", service.connectedTime())
+            servicesArray.put(serviceObject)
+        }
 
+        val result = JSONObject()
+        result.put("services", servicesArray)
 
-        return thing
+        return result
     }
 
     private fun main(@NotNull cloudServiceManager: CloudServiceManager,
@@ -84,15 +95,12 @@ class `CloudNet-Rest-Module` : DriverModule() {
                     call.respondText("Welcome to my Rest API!")
                 }
                 get("/services") {
-                    val services = cloudServiceManager.services()
-
-                    val jsonObject = serviceInfoSnapshot.toJson()
-                    println(jsonObject.toString(4))
-
-
-
-                    //val json = json(cloudServiceManager)
-                    //println(json.toString())
+                    val services = services(cloudServiceManager)
+                    call.respondText(
+                        services.toString(4)
+                            .replace("[", "")
+                            .replace("]", "")
+                    )
                 }
 
                 get("/services/{service}") {