“parse” error replaced by “httpError”.

damian-kolakowski · damian-kolakowski · commit f93c22d909c1 · 2017-02-24T22:44:42.000+01:00
Added sample handler for HTTP POST method.
diff --git a/Sources/Error.swift b/Sources/Error.swift
@@ -9,7 +9,6 @@ import Foundation
 
 public enum SwifterError: Error {
     
-    case parse(String)
     case async(String)
     case socketCreation(String)
     case setReUseAddr(String)
diff --git a/Sources/Http+Misc.swift b/Sources/Http+Misc.swift
@@ -1,14 +1,12 @@
 //
-//  HttpPost.swift
+//  Http+Misc.swift
 //  Swifter
 //
-//  Created by Damian Kolakowski on 24/02/2017.
 //  Copyright © 2017 Damian Kołakowski. All rights reserved.
 //
 
 import Foundation
 
-
 extension Request {
     
     public func hasToken(_ token: String, forHeader headerName: String) -> Bool {
diff --git a/Sources/Http.swift b/Sources/Http.swift
@@ -114,7 +114,7 @@ public class HttpIncomingDataPorcessor: Hashable, IncomingDataProcessor {
         case .waitingForHeaders:
             
             guard self.buffer.count + chunk.count < 4096 else {
-                throw SwifterError.parse("Headers size exceeds the limit.")
+                throw SwifterError.httpError("Headers size exceeds the limit.")
             }
             
             var iterator = chunk.makeIterator()
@@ -137,7 +137,7 @@ public class HttpIncomingDataPorcessor: Hashable, IncomingDataProcessor {
         case .waitingForBody:
             
             guard self.request.body.count + chunk.count <= request.contentLength else {
-                throw SwifterError.parse("Peer sent more data then required ('Content-Length' = \(request.contentLength).")
+                throw SwifterError.httpError("Peer sent more data then required ('Content-Length' = \(request.contentLength).")
             }
             
             request.body.append(contentsOf: chunk)
@@ -170,7 +170,7 @@ public class HttpIncomingDataPorcessor: Hashable, IncomingDataProcessor {
         } else if requestLineTokens[2] == [0x48, 0x54,  0x54,  0x50, 0x2f, 0x31, 0x2e, 0x31] {
             request.httpVersion = .http11
         } else {
-            throw SwifterError.parse("Invalid http version: \(requestLineTokens[2])")
+            throw SwifterError.httpError("Invalid http version: \(requestLineTokens[2])")
         }
         
         request.headers = lines
@@ -190,19 +190,19 @@ public class HttpIncomingDataPorcessor: Hashable, IncomingDataProcessor {
             .filter({ $0.0 == "content-length" })
             .first {
             guard let contentLength = Int(value) else {
-                throw SwifterError.parse("Invalid 'Content-Length' header value \(value).")
+                throw SwifterError.httpError("Invalid 'Content-Length' header value \(value).")
             }
             request.contentLength = contentLength
         }
         
         guard let method = String(bytes: requestLineTokens[0], encoding: .ascii) else {
-            throw SwifterError.parse("Invalid 'method' value \(requestLineTokens[0]).")
+            throw SwifterError.httpError("Invalid 'method' value \(requestLineTokens[0]).")
         }
         
         request.method = method
         
         guard let path = String(bytes: requestLineTokens[1], encoding: .ascii) else {
-            throw SwifterError.parse("Invalid 'path' value \(requestLineTokens[1]).")
+            throw SwifterError.httpError("Invalid 'path' value \(requestLineTokens[1]).")
         }
         
         let queryComponents = path.components(separatedBy: "?")
diff --git a/XCode/SwifterSampleOSX/main.swift b/XCode/SwifterSampleOSX/main.swift
@@ -44,6 +44,22 @@ server.get("/background") { _, _, closure in
     
 }
 
+server.post("/post") { _, request, responder in
+    
+    let post = request.parseUrlencodedForm()
+    
+    responder(html(200) {
+        "body" ~ {
+            "h4" ~ "You sent: "
+            "ul" ~ {
+                post.forEach { item in
+                    "li" ~ "\(item.0) -> \(item.1)"
+                }
+            }
+        }
+    })
+}
+
 while true {
     try server.loop()
 }

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public class HttpIncomingDataPorcessor: Hashable, IncomingDataProcessor {`
`114`	`114`	`case .waitingForHeaders:`
`115`	`115`
`116`	`116`	`guard self.buffer.count + chunk.count < 4096 else {`
`117`		`- throw SwifterError.parse("Headers size exceeds the limit.")`
	`117`	`+ throw SwifterError.httpError("Headers size exceeds the limit.")`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`var iterator = chunk.makeIterator()`
`@@ -137,7 +137,7 @@ public class HttpIncomingDataPorcessor: Hashable, IncomingDataProcessor {`
`137`	`137`	`case .waitingForBody:`
`138`	`138`
`139`	`139`	`guard self.request.body.count + chunk.count <= request.contentLength else {`
`140`		`- throw SwifterError.parse("Peer sent more data then required ('Content-Length' = \(request.contentLength).")`
	`140`	`+ throw SwifterError.httpError("Peer sent more data then required ('Content-Length' = \(request.contentLength).")`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`request.body.append(contentsOf: chunk)`
`@@ -170,7 +170,7 @@ public class HttpIncomingDataPorcessor: Hashable, IncomingDataProcessor {`
`170`	`170`	`} else if requestLineTokens[2] == [0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x31] {`
`171`	`171`	`request.httpVersion = .http11`
`172`	`172`	`} else {`
`173`		`- throw SwifterError.parse("Invalid http version: \(requestLineTokens[2])")`
	`173`	`+ throw SwifterError.httpError("Invalid http version: \(requestLineTokens[2])")`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`request.headers = lines`
`@@ -190,19 +190,19 @@ public class HttpIncomingDataPorcessor: Hashable, IncomingDataProcessor {`
`190`	`190`	`.filter({ $0.0 == "content-length" })`
`191`	`191`	`.first {`
`192`	`192`	`guard let contentLength = Int(value) else {`
`193`		`- throw SwifterError.parse("Invalid 'Content-Length' header value \(value).")`
	`193`	`+ throw SwifterError.httpError("Invalid 'Content-Length' header value \(value).")`
`194`	`194`	`}`
`195`	`195`	`request.contentLength = contentLength`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`guard let method = String(bytes: requestLineTokens[0], encoding: .ascii) else {`
`199`		`- throw SwifterError.parse("Invalid 'method' value \(requestLineTokens[0]).")`
	`199`	`+ throw SwifterError.httpError("Invalid 'method' value \(requestLineTokens[0]).")`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`request.method = method`
`203`	`203`
`204`	`204`	`guard let path = String(bytes: requestLineTokens[1], encoding: .ascii) else {`
`205`		`- throw SwifterError.parse("Invalid 'path' value \(requestLineTokens[1]).")`
	`205`	`+ throw SwifterError.httpError("Invalid 'path' value \(requestLineTokens[1]).")`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`let queryComponents = path.components(separatedBy: "?")`