Minor cleanup for Undertow exchange errors

outr · Jun 5, 2024 · d2a5e37 · d2a5e37
1 parent 6713ab5
commit d2a5e37
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "spice"
 ThisBuild / organization := "com.outr"
-ThisBuild / version := "0.5.9"
+ThisBuild / version := "0.5.10-SNAPSHOT"
 
 val scala213: String = "2.13.14"
 

diff --git a/...ementation/undertow/src/main/scala/spice/http/server/undertow/UndertowRequestParser.scala b/...ementation/undertow/src/main/scala/spice/http/server/undertow/UndertowRequestParser.scala
@@ -49,11 +49,15 @@ object UndertowRequestParser {
           }
           Some(FormDataContent(data.toMap))
         case ct =>
-          val stream = fs2.io.readInputStream[IO](
-            fis = IO(new ChannelInputStream(exchange.getRequestChannel)),
-            chunkSize = 1024
-          )
-          Some(StreamContent(stream, ct))
+          Option(exchange.getRequestChannel) match {
+            case Some(channel) =>
+              val stream = fs2.io.readInputStream[IO](
+                fis = IO(new ChannelInputStream(channel)),
+                chunkSize = 1024
+              )
+              Some(StreamContent(stream, ct))
+            case None => throw new NullPointerException(s"Channel is null for request channel. Probably already consumed.")
+          }
       }
     } else {
       None

diff --git a/server/src/main/scala/spice/http/server/rest/Restful.scala b/server/src/main/scala/spice/http/server/rest/Restful.scala
@@ -212,14 +212,16 @@ object Restful {
       Obj(jsonValues ++ fileValues)
     }
     case _ =>
-      content.asString.map { contentString =>
-        val firstChar = contentString.charAt(0)
-        val json = if (Set('"', '{', '[').contains(firstChar)) {
-          JsonParser(contentString)
-        } else {
-          Str(contentString)
-        }
-        json
+      content.asString.map {
+        case "" => obj()
+        case contentString =>
+          val firstChar = contentString.charAt(0)
+          val json = if (Set('"', '{', '[').contains(firstChar)) {
+            JsonParser(contentString)
+          } else {
+            Str(contentString)
+          }
+          json
       }
   }